From 66e79005f4af01e6d7bd7a1743243f626db51a05 Mon Sep 17 00:00:00 2001 From: Bas Schoenmaeckers <7943856+bschoenmaeckers@users.noreply.github.com> Date: Mon, 1 Jun 2026 17:34:06 +0200 Subject: [PATCH 001/339] Add agent skill for adding c-api functions (#8001) * Add agent skill * abi3/abi3t only --- .../skills/rustpython-capi-expansion/SKILL.md | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 .agents/skills/rustpython-capi-expansion/SKILL.md diff --git a/.agents/skills/rustpython-capi-expansion/SKILL.md b/.agents/skills/rustpython-capi-expansion/SKILL.md new file mode 100644 index 000000000..5b56929a8 --- /dev/null +++ b/.agents/skills/rustpython-capi-expansion/SKILL.md @@ -0,0 +1,60 @@ +--- +name: rustpython-capi-expansion +description: Implement missing RustPython C-API functions in crates/capi using the pyo3-ffi header split mapping (`pyo3-ffi/src/*.rs`, mirroring CPython C API headers). Use this whenever the user asks to add or port C-API functions (for example from setobject.h, dictobject.h, unicodeobject.h) or add capi tests. +--- + +# RustPython C-API Expansion + +Use this workflow for adding missing C-API functions to RustPython. + +## Source of truth for target files + +- Use this mapping source: `pyo3-ffi/src/*.rs`, which mirrors the CPython header split used by the C API. +- Map requested header APIs to `crates/capi/src/.rs` using that split. Examples: + - `setobject.h` -> `crates/capi/src/setobject.rs` + - `dictobject.h` -> `crates/capi/src/dictobject.rs` + - `unicodeobject.h` -> `crates/capi/src/unicodeobject.rs` +- Do not invent alternate target modules when the header split implies a direct target. +- If the target file is not present yet, create it and wire it in `crates/capi/src/lib.rs`. + +## Implementation workflow + +1. Identify requested missing APIs from the user request and their originating C API header. +2. Open nearby capi modules in `crates/capi/src/` and follow existing style and patterns. +3. Implement only the requested functions in the mapped target file. +4. Keep behavior aligned with CPython C-API contracts. +5. Prefer using existing `rustpython-vm` functionality as much as possible instead of re-implementing behavior in capi. +6. If a needed `rustpython-vm` helper exists but is private, make it public with a minimal, focused visibility change. +7. Prefer direct contract assumptions over defensive null checks unless required by the established local style. +8. Add basic tests only; do not overfit with very specific edge-case clutter. +9. In tests, use `pyo3` only as a safe wrapper over the API. Avoid raw pointer-heavy direct FFI-style tests. +10. Run tests from `crates/capi`. + +## Testing rules + +- Run test commands with working directory set to `crates/capi`. +- Prefer targeted tests first (module/function filter), then broader capi tests if needed. +- Keep test names concise (no required `test_` prefix). + +## Style rules + +- Follow existing RustPython capi coding style in neighboring files. +- Reuse `rustpython-vm` methods and types first; avoid duplicating VM logic in capi wrappers. +- When exposing previously private VM helpers, keep the API surface minimal and avoid unrelated refactors. +- Only expose and implement ABI-stable C-API surface needed for `abi3` / `abi3t`. +- Add comments only when they explain non-obvious behavior. +- Keep edits minimal and focused on requested API expansion. + +## Completion checklist + +- [ ] All requested functions implemented in mapped target file. +- [ ] New module exported in `crates/capi/src/lib.rs` when applicable. +- [ ] Basic safe-wrapper `pyo3` tests added/updated. +- [ ] Tests executed from `crates/capi` and passing for changed area. +- [ ] Final response includes changed file paths and test command summary. + +## Example prompts this skill should handle + +- "Implement these missing functions from `dictobject.h`." +- "Add `setobject.h` C-API functions in RustPython and include basic tests." +- "Port the listed `unicodeobject.h` APIs in capi, follow existing style, and run tests from `crates/capi`." From 3809ab542271da62cd2e6c232ec30e79589897c1 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Mon, 1 Jun 2026 18:35:17 +0300 Subject: [PATCH 002/339] impl `_queue` module + Update `multiprocessing` to 3.14.5 (#7994) --- Lib/multiprocessing/connection.py | 118 ++- Lib/multiprocessing/context.py | 36 +- Lib/multiprocessing/dummy/__init__.py | 2 +- Lib/multiprocessing/forkserver.py | 96 ++- Lib/multiprocessing/managers.py | 59 +- Lib/multiprocessing/popen_fork.py | 15 +- Lib/multiprocessing/process.py | 11 +- Lib/multiprocessing/queues.py | 2 +- Lib/multiprocessing/reduction.py | 12 +- Lib/multiprocessing/resource_tracker.py | 97 ++- Lib/multiprocessing/shared_memory.py | 2 +- Lib/multiprocessing/spawn.py | 2 +- Lib/multiprocessing/synchronize.py | 31 +- Lib/multiprocessing/util.py | 14 +- Lib/test/_test_multiprocessing.py | 809 ++++++++++++++++-- Lib/test/mp_preload_large_sysargv.py | 30 + Lib/test/mp_preload_sysargv.py | 22 + .../test_processes.py | 1 - crates/stdlib/src/_queue.rs | 309 +++++++ crates/stdlib/src/lib.rs | 2 + 20 files changed, 1473 insertions(+), 197 deletions(-) create mode 100644 Lib/test/mp_preload_large_sysargv.py create mode 100644 Lib/test/mp_preload_sysargv.py create mode 100644 crates/stdlib/src/_queue.rs diff --git a/Lib/multiprocessing/connection.py b/Lib/multiprocessing/connection.py index abd88adf7..f577186e9 100644 --- a/Lib/multiprocessing/connection.py +++ b/Lib/multiprocessing/connection.py @@ -11,13 +11,12 @@ __all__ = [ 'Client', 'Listener', 'Pipe', 'wait' ] import errno import io +import itertools import os import sys import socket import struct import time -import tempfile -import itertools from . import util @@ -39,11 +38,14 @@ except ImportError: # # -BUFSIZE = 8192 +# 64 KiB is the default PIPE buffer size of most POSIX platforms. +BUFSIZE = 64 * 1024 + # A very generous timeout when it comes to local connections... CONNECTION_TIMEOUT = 20. _mmap_counter = itertools.count() +_MAX_PIPE_ATTEMPTS = 100 default_family = 'AF_INET' families = ['AF_INET'] @@ -74,10 +76,14 @@ def arbitrary_address(family): if family == 'AF_INET': return ('localhost', 0) elif family == 'AF_UNIX': - return tempfile.mktemp(prefix='sock-', dir=util.get_temp_dir()) + # NOTE: util.get_temp_dir() is a 0o700 per-process directory. A + # mktemp-style ToC vs ToU concern is not important; bind() surfaces + # the extremely unlikely collision as EADDRINUSE. + return os.path.join(util.get_temp_dir(), + f'sock-{os.urandom(6).hex()}') elif family == 'AF_PIPE': - return tempfile.mktemp(prefix=r'\\.\pipe\pyc-%d-%d-' % - (os.getpid(), next(_mmap_counter)), dir="") + return (r'\\.\pipe\pyc-%d-%d-%s' % + (os.getpid(), next(_mmap_counter), os.urandom(8).hex())) else: raise ValueError('unrecognized family') @@ -179,6 +185,10 @@ class _ConnectionBase: finally: self._handle = None + def _detach(self): + """Stop managing the underlying file descriptor or handle.""" + self._handle = None + def send_bytes(self, buf, offset=0, size=None): """Send the bytes data from a bytes-like object""" self._check_closed() @@ -316,22 +326,32 @@ if _winapi: try: ov, err = _winapi.ReadFile(self._handle, bsize, overlapped=True) + + sentinel = object() + return_value = sentinel try: - if err == _winapi.ERROR_IO_PENDING: - waitres = _winapi.WaitForMultipleObjects( - [ov.event], False, INFINITE) - assert waitres == WAIT_OBJECT_0 + try: + if err == _winapi.ERROR_IO_PENDING: + waitres = _winapi.WaitForMultipleObjects( + [ov.event], False, INFINITE) + assert waitres == WAIT_OBJECT_0 + except: + ov.cancel() + raise + finally: + nread, err = ov.GetOverlappedResult(True) + if err == 0: + f = io.BytesIO() + f.write(ov.getbuffer()) + return_value = f + elif err == _winapi.ERROR_MORE_DATA: + return_value = self._get_more_data(ov, maxsize) except: - ov.cancel() - raise - finally: - nread, err = ov.GetOverlappedResult(True) - if err == 0: - f = io.BytesIO() - f.write(ov.getbuffer()) - return f - elif err == _winapi.ERROR_MORE_DATA: - return self._get_more_data(ov, maxsize) + if return_value is sentinel: + raise + + if return_value is not sentinel: + return return_value except OSError as e: if e.winerror == _winapi.ERROR_BROKEN_PIPE: raise EOFError @@ -392,7 +412,8 @@ class Connection(_ConnectionBase): handle = self._handle remaining = size while remaining > 0: - chunk = read(handle, remaining) + to_read = min(BUFSIZE, remaining) + chunk = read(handle, to_read) n = len(chunk) if n == 0: if remaining == size: @@ -455,17 +476,29 @@ class Listener(object): def __init__(self, address=None, family=None, backlog=1, authkey=None): family = family or (address and address_type(address)) \ or default_family - address = address or arbitrary_address(family) - _validate_family(family) - if family == 'AF_PIPE': - self._listener = PipeListener(address, backlog) - else: - self._listener = SocketListener(address, family, backlog) - if authkey is not None and not isinstance(authkey, bytes): raise TypeError('authkey should be a byte string') + if family == 'AF_PIPE': + if address: + self._listener = PipeListener(address, backlog) + else: + for attempts in itertools.count(): + address = arbitrary_address(family) + try: + self._listener = PipeListener(address, backlog) + break + except OSError as e: + if attempts >= _MAX_PIPE_ATTEMPTS: + raise + if e.winerror not in (_winapi.ERROR_PIPE_BUSY, + _winapi.ERROR_ACCESS_DENIED): + raise + else: + address = address or arbitrary_address(family) + self._listener = SocketListener(address, family, backlog) + self._authkey = authkey def accept(self): @@ -553,7 +586,6 @@ else: ''' Returns pair of connection objects at either end of a pipe ''' - address = arbitrary_address('AF_PIPE') if duplex: openmode = _winapi.PIPE_ACCESS_DUPLEX access = _winapi.GENERIC_READ | _winapi.GENERIC_WRITE @@ -563,15 +595,25 @@ else: access = _winapi.GENERIC_WRITE obsize, ibsize = 0, BUFSIZE - h1 = _winapi.CreateNamedPipe( - address, openmode | _winapi.FILE_FLAG_OVERLAPPED | - _winapi.FILE_FLAG_FIRST_PIPE_INSTANCE, - _winapi.PIPE_TYPE_MESSAGE | _winapi.PIPE_READMODE_MESSAGE | - _winapi.PIPE_WAIT, - 1, obsize, ibsize, _winapi.NMPWAIT_WAIT_FOREVER, - # default security descriptor: the handle cannot be inherited - _winapi.NULL - ) + for attempts in itertools.count(): + address = arbitrary_address('AF_PIPE') + try: + h1 = _winapi.CreateNamedPipe( + address, openmode | _winapi.FILE_FLAG_OVERLAPPED | + _winapi.FILE_FLAG_FIRST_PIPE_INSTANCE, + _winapi.PIPE_TYPE_MESSAGE | _winapi.PIPE_READMODE_MESSAGE | + _winapi.PIPE_WAIT, + 1, obsize, ibsize, _winapi.NMPWAIT_WAIT_FOREVER, + # default security descriptor: the handle cannot be inherited + _winapi.NULL + ) + break + except OSError as e: + if attempts >= _MAX_PIPE_ATTEMPTS: + raise + if e.winerror not in (_winapi.ERROR_PIPE_BUSY, + _winapi.ERROR_ACCESS_DENIED): + raise h2 = _winapi.CreateFile( address, access, 0, _winapi.NULL, _winapi.OPEN_EXISTING, _winapi.FILE_FLAG_OVERLAPPED, _winapi.NULL diff --git a/Lib/multiprocessing/context.py b/Lib/multiprocessing/context.py index f395e8b04..5fa6d7e48 100644 --- a/Lib/multiprocessing/context.py +++ b/Lib/multiprocessing/context.py @@ -145,7 +145,13 @@ class BaseContext(object): '''Check whether this is a fake forked process in a frozen executable. If so then run code specified by commandline and exit. ''' - if self.get_start_method() == 'spawn' and getattr(sys, 'frozen', False): + # gh-140814: allow_none=True avoids locking in the default start + # method, which would cause a later set_start_method() to fail. + # None is safe to pass through: spawn.freeze_support() + # independently detects whether this process is a spawned + # child, so the start method check here is only an optimization. + if (getattr(sys, 'frozen', False) + and self.get_start_method(allow_none=True) in ('spawn', None)): from .spawn import freeze_support freeze_support() @@ -167,7 +173,7 @@ class BaseContext(object): ''' # This is undocumented. In previous versions of multiprocessing # its only effect was to make socket objects inheritable on Windows. - from . import connection + from . import connection # noqa: F401 def set_executable(self, executable): '''Sets the path to a python.exe or pythonw.exe binary used to run @@ -259,13 +265,12 @@ class DefaultContext(BaseContext): def get_all_start_methods(self): """Returns a list of the supported start methods, default first.""" - if sys.platform == 'win32': - return ['spawn'] - else: - methods = ['spawn', 'fork'] if sys.platform == 'darwin' else ['fork', 'spawn'] - if reduction.HAVE_SEND_HANDLE: - methods.append('forkserver') - return methods + default = self._default_context.get_start_method() + start_method_names = [default] + start_method_names.extend( + name for name in _concrete_contexts if name != default + ) + return start_method_names # @@ -320,14 +325,15 @@ if sys.platform != 'win32': 'spawn': SpawnContext(), 'forkserver': ForkServerContext(), } - if sys.platform == 'darwin': - # bpo-33725: running arbitrary code after fork() is no longer reliable - # on macOS since macOS 10.14 (Mojave). Use spawn by default instead. - _default_context = DefaultContext(_concrete_contexts['spawn']) + # bpo-33725: running arbitrary code after fork() is no longer reliable + # on macOS since macOS 10.14 (Mojave). Use spawn by default instead. + # gh-84559: We changed everyones default to a thread safeish one in 3.14. + if reduction.HAVE_SEND_HANDLE and sys.platform != 'darwin': + _default_context = DefaultContext(_concrete_contexts['forkserver']) else: - _default_context = DefaultContext(_concrete_contexts['fork']) + _default_context = DefaultContext(_concrete_contexts['spawn']) -else: +else: # Windows class SpawnProcess(process.BaseProcess): _start_method = 'spawn' diff --git a/Lib/multiprocessing/dummy/__init__.py b/Lib/multiprocessing/dummy/__init__.py index 6a1468609..7dc5d1c8d 100644 --- a/Lib/multiprocessing/dummy/__init__.py +++ b/Lib/multiprocessing/dummy/__init__.py @@ -33,7 +33,7 @@ from queue import Queue class DummyProcess(threading.Thread): - def __init__(self, group=None, target=None, name=None, args=(), kwargs={}): + def __init__(self, group=None, target=None, name=None, args=(), kwargs=None): threading.Thread.__init__(self, group, target, name, args, kwargs) self._pid = None self._children = weakref.WeakKeyDictionary() diff --git a/Lib/multiprocessing/forkserver.py b/Lib/multiprocessing/forkserver.py index e243442e7..e431b3f12 100644 --- a/Lib/multiprocessing/forkserver.py +++ b/Lib/multiprocessing/forkserver.py @@ -9,6 +9,7 @@ import sys import threading import warnings +from . import AuthenticationError from . import connection from . import process from .context import reduction @@ -25,6 +26,7 @@ __all__ = ['ensure_running', 'get_inherited_fds', 'connect_to_new_process', MAXFDS_TO_SEND = 256 SIGNED_STRUCT = struct.Struct('q') # large enough for pid_t +_AUTHKEY_LEN = 32 # <= PIPEBUF so it fits a single write to an empty pipe. # # Forkserver class @@ -33,6 +35,7 @@ SIGNED_STRUCT = struct.Struct('q') # large enough for pid_t class ForkServer(object): def __init__(self): + self._forkserver_authkey = None self._forkserver_address = None self._forkserver_alive_fd = None self._forkserver_pid = None @@ -59,6 +62,7 @@ class ForkServer(object): if not util.is_abstract_socket_namespace(self._forkserver_address): os.unlink(self._forkserver_address) self._forkserver_address = None + self._forkserver_authkey = None def set_forkserver_preload(self, modules_names): '''Set list of module names to try to load in forkserver process.''' @@ -83,6 +87,7 @@ class ForkServer(object): process data. ''' self.ensure_running() + assert self._forkserver_authkey if len(fds) + 4 >= MAXFDS_TO_SEND: raise ValueError('too many fds') with socket.socket(socket.AF_UNIX) as client: @@ -93,6 +98,18 @@ class ForkServer(object): resource_tracker.getfd()] allfds += fds try: + client.setblocking(True) + wrapped_client = connection.Connection(client.fileno()) + # The other side of this exchange happens in the child as + # implemented in main(). + try: + connection.answer_challenge( + wrapped_client, self._forkserver_authkey) + connection.deliver_challenge( + wrapped_client, self._forkserver_authkey) + finally: + wrapped_client._detach() + del wrapped_client reduction.sendfds(client, allfds) return parent_r, parent_w except: @@ -120,20 +137,30 @@ class ForkServer(object): return # dead, launch it again os.close(self._forkserver_alive_fd) + self._forkserver_authkey = None self._forkserver_address = None self._forkserver_alive_fd = None self._forkserver_pid = None - cmd = ('from multiprocessing.forkserver import main; ' + - 'main(%d, %d, %r, **%r)') + # gh-144503: sys_argv is passed as real argv elements after the + # ``-c cmd`` rather than repr'd into main_kws so that a large + # parent sys.argv cannot push the single ``-c`` command string + # over the OS per-argument length limit (MAX_ARG_STRLEN on Linux). + # The child sees them as sys.argv[1:]. + cmd = ('import sys; ' + 'from multiprocessing.forkserver import main; ' + 'main(%d, %d, %r, sys_argv=sys.argv[1:], **%r)') main_kws = {} + sys_argv = None if self._preload_modules: data = spawn.get_preparation_data('ignore') if 'sys_path' in data: main_kws['sys_path'] = data['sys_path'] if 'init_main_from_path' in data: main_kws['main_path'] = data['init_main_from_path'] + if 'sys_argv' in data: + sys_argv = data['sys_argv'] with socket.socket(socket.AF_UNIX) as listener: address = connection.arbitrary_address('AF_UNIX') @@ -145,19 +172,33 @@ class ForkServer(object): # all client processes own the write end of the "alive" pipe; # when they all terminate the read end becomes ready. alive_r, alive_w = os.pipe() + # A short lived pipe to initialize the forkserver authkey. + authkey_r, authkey_w = os.pipe() try: - fds_to_pass = [listener.fileno(), alive_r] + fds_to_pass = [listener.fileno(), alive_r, authkey_r] + main_kws['authkey_r'] = authkey_r cmd %= (listener.fileno(), alive_r, self._preload_modules, main_kws) exe = spawn.get_executable() args = [exe] + util._args_from_interpreter_flags() args += ['-c', cmd] + if sys_argv is not None: + args += sys_argv pid = util.spawnv_passfds(exe, args, fds_to_pass) except: os.close(alive_w) + os.close(authkey_w) raise finally: os.close(alive_r) + os.close(authkey_r) + # Authenticate our control socket to prevent access from + # processes we have not shared this key with. + try: + self._forkserver_authkey = os.urandom(_AUTHKEY_LEN) + os.write(authkey_w, self._forkserver_authkey) + finally: + os.close(authkey_w) self._forkserver_address = address self._forkserver_alive_fd = alive_w self._forkserver_pid = pid @@ -166,9 +207,21 @@ class ForkServer(object): # # -def main(listener_fd, alive_r, preload, main_path=None, sys_path=None): - '''Run forkserver.''' +def main(listener_fd, alive_r, preload, main_path=None, sys_path=None, + *, sys_argv=None, authkey_r=None): + """Run forkserver.""" + if authkey_r is not None: + try: + authkey = os.read(authkey_r, _AUTHKEY_LEN) + assert len(authkey) == _AUTHKEY_LEN, f'{len(authkey)} < {_AUTHKEY_LEN}' + finally: + os.close(authkey_r) + else: + authkey = b'' + if preload: + if sys_argv is not None: + sys.argv[:] = sys_argv if sys_path is not None: sys.path[:] = sys_path if '__main__' in preload and main_path is not None: @@ -262,8 +315,24 @@ def main(listener_fd, alive_r, preload, main_path=None, sys_path=None): if listener in rfds: # Incoming fork request with listener.accept()[0] as s: - # Receive fds from client - fds = reduction.recvfds(s, MAXFDS_TO_SEND + 1) + try: + if authkey: + wrapped_s = connection.Connection(s.fileno()) + # The other side of this exchange happens in + # in connect_to_new_process(). + try: + connection.deliver_challenge( + wrapped_s, authkey) + connection.answer_challenge( + wrapped_s, authkey) + finally: + wrapped_s._detach() + del wrapped_s + # Receive fds from client + fds = reduction.recvfds(s, MAXFDS_TO_SEND + 1) + except (EOFError, BrokenPipeError, AuthenticationError): + s.close() + continue if len(fds) > MAXFDS_TO_SEND: raise RuntimeError( "Too many ({0:n}) fds to send".format( @@ -331,13 +400,14 @@ def _serve_one(child_r, fds, unused_fds, handlers): # def read_signed(fd): - data = b'' - length = SIGNED_STRUCT.size - while len(data) < length: - s = os.read(fd, length - len(data)) - if not s: + data = bytearray(SIGNED_STRUCT.size) + unread = memoryview(data) + while unread: + count = os.readinto(fd, unread) + if count == 0: raise EOFError('unexpected EOF') - data += s + unread = unread[count:] + return SIGNED_STRUCT.unpack(data)[0] def write_signed(fd, n): diff --git a/Lib/multiprocessing/managers.py b/Lib/multiprocessing/managers.py index ef791c275..91bcf243e 100644 --- a/Lib/multiprocessing/managers.py +++ b/Lib/multiprocessing/managers.py @@ -18,6 +18,7 @@ import sys import threading import signal import array +import collections.abc import queue import time import types @@ -1058,12 +1059,14 @@ class IteratorProxy(BaseProxy): class AcquirerProxy(BaseProxy): - _exposed_ = ('acquire', 'release') + _exposed_ = ('acquire', 'release', 'locked') def acquire(self, blocking=True, timeout=None): args = (blocking,) if timeout is None else (blocking, timeout) return self._callmethod('acquire', args) def release(self): return self._callmethod('release') + def locked(self): + return self._callmethod('locked') def __enter__(self): return self._callmethod('acquire') def __exit__(self, exc_type, exc_val, exc_tb): @@ -1071,7 +1074,7 @@ class AcquirerProxy(BaseProxy): class ConditionProxy(AcquirerProxy): - _exposed_ = ('acquire', 'release', 'wait', 'notify', 'notify_all') + _exposed_ = ('acquire', 'release', 'locked', 'wait', 'notify', 'notify_all') def wait(self, timeout=None): return self._callmethod('wait', (timeout,)) def notify(self, n=1): @@ -1159,10 +1162,10 @@ class ValueProxy(BaseProxy): BaseListProxy = MakeProxyType('BaseListProxy', ( - '__add__', '__contains__', '__delitem__', '__getitem__', '__len__', - '__mul__', '__reversed__', '__rmul__', '__setitem__', - 'append', 'count', 'extend', 'index', 'insert', 'pop', 'remove', - 'reverse', 'sort', '__imul__' + '__add__', '__contains__', '__delitem__', '__getitem__', '__imul__', + '__len__', '__mul__', '__reversed__', '__rmul__', '__setitem__', + 'append', 'clear', 'copy', 'count', 'extend', 'index', 'insert', 'pop', + 'remove', 'reverse', 'sort', )) class ListProxy(BaseListProxy): def __iadd__(self, value): @@ -1174,18 +1177,55 @@ class ListProxy(BaseListProxy): __class_getitem__ = classmethod(types.GenericAlias) +collections.abc.MutableSequence.register(BaseListProxy) -_BaseDictProxy = MakeProxyType('DictProxy', ( - '__contains__', '__delitem__', '__getitem__', '__iter__', '__len__', - '__setitem__', 'clear', 'copy', 'get', 'items', +_BaseDictProxy = MakeProxyType('_BaseDictProxy', ( + '__contains__', '__delitem__', '__getitem__', '__ior__', '__iter__', + '__len__', '__or__', '__reversed__', '__ror__', + '__setitem__', 'clear', 'copy', 'fromkeys', 'get', 'items', 'keys', 'pop', 'popitem', 'setdefault', 'update', 'values' )) _BaseDictProxy._method_to_typeid_ = { '__iter__': 'Iterator', } class DictProxy(_BaseDictProxy): + def __ior__(self, value): + self._callmethod('__ior__', (value,)) + return self + __class_getitem__ = classmethod(types.GenericAlias) +collections.abc.MutableMapping.register(_BaseDictProxy) + +_BaseSetProxy = MakeProxyType("_BaseSetProxy", ( + '__and__', '__class_getitem__', '__contains__', '__iand__', '__ior__', + '__isub__', '__iter__', '__ixor__', '__len__', '__or__', '__rand__', + '__ror__', '__rsub__', '__rxor__', '__sub__', '__xor__', + '__ge__', '__gt__', '__le__', '__lt__', + 'add', 'clear', 'copy', 'difference', 'difference_update', 'discard', + 'intersection', 'intersection_update', 'isdisjoint', 'issubset', + 'issuperset', 'pop', 'remove', 'symmetric_difference', + 'symmetric_difference_update', 'union', 'update', +)) + +class SetProxy(_BaseSetProxy): + def __ior__(self, value): + self._callmethod('__ior__', (value,)) + return self + def __iand__(self, value): + self._callmethod('__iand__', (value,)) + return self + def __ixor__(self, value): + self._callmethod('__ixor__', (value,)) + return self + def __isub__(self, value): + self._callmethod('__isub__', (value,)) + return self + + __class_getitem__ = classmethod(types.GenericAlias) + +collections.abc.MutableMapping.register(_BaseSetProxy) + ArrayProxy = MakeProxyType('ArrayProxy', ( '__len__', '__getitem__', '__setitem__' @@ -1237,6 +1277,7 @@ SyncManager.register('Barrier', threading.Barrier, BarrierProxy) SyncManager.register('Pool', pool.Pool, PoolProxy) SyncManager.register('list', list, ListProxy) SyncManager.register('dict', dict, DictProxy) +SyncManager.register('set', set, SetProxy) SyncManager.register('Value', Value, ValueProxy) SyncManager.register('Array', Array, ArrayProxy) SyncManager.register('Namespace', Namespace, NamespaceProxy) diff --git a/Lib/multiprocessing/popen_fork.py b/Lib/multiprocessing/popen_fork.py index a57ef6bda..a02a53b6a 100644 --- a/Lib/multiprocessing/popen_fork.py +++ b/Lib/multiprocessing/popen_fork.py @@ -54,6 +54,9 @@ class Popen(object): if self.wait(timeout=0.1) is None: raise + def interrupt(self): + self._send_signal(signal.SIGINT) + def terminate(self): self._send_signal(signal.SIGTERM) @@ -64,7 +67,17 @@ class Popen(object): code = 1 parent_r, child_w = os.pipe() child_r, parent_w = os.pipe() - self.pid = os.fork() + # gh-146313: Tell the resource tracker's at-fork handler to keep + # the inherited pipe fd so this child reuses the parent's tracker + # (gh-80849) rather than closing it and launching its own. + from .resource_tracker import _fork_intent + _fork_intent.preserve_fd = True + try: + self.pid = os.fork() + finally: + # Reset in both parent and child so the flag does not leak + # into a subsequent raw os.fork() or nested Process launch. + _fork_intent.preserve_fd = False if self.pid == 0: try: atexit._clear() diff --git a/Lib/multiprocessing/process.py b/Lib/multiprocessing/process.py index b45f7df47..262513f29 100644 --- a/Lib/multiprocessing/process.py +++ b/Lib/multiprocessing/process.py @@ -77,7 +77,7 @@ class BaseProcess(object): def _Popen(self): raise NotImplementedError - def __init__(self, group=None, target=None, name=None, args=(), kwargs={}, + def __init__(self, group=None, target=None, name=None, args=(), kwargs=None, *, daemon=None): assert group is None, 'group argument must be None for now' count = next(_process_counter) @@ -89,7 +89,7 @@ class BaseProcess(object): self._closed = False self._target = target self._args = tuple(args) - self._kwargs = dict(kwargs) + self._kwargs = dict(kwargs) if kwargs else {} self._name = name or type(self).__name__ + '-' + \ ':'.join(str(i) for i in self._identity) if daemon is not None: @@ -125,6 +125,13 @@ class BaseProcess(object): del self._target, self._args, self._kwargs _children.add(self) + def interrupt(self): + ''' + Terminate process; sends SIGINT signal + ''' + self._check_closed() + self._popen.interrupt() + def terminate(self): ''' Terminate process; sends SIGTERM signal or uses TerminateProcess() diff --git a/Lib/multiprocessing/queues.py b/Lib/multiprocessing/queues.py index 925f04390..981599acf 100644 --- a/Lib/multiprocessing/queues.py +++ b/Lib/multiprocessing/queues.py @@ -121,7 +121,7 @@ class Queue(object): def qsize(self): # Raises NotImplementedError on Mac OSX because of broken sem_getvalue() - return self._maxsize - self._sem._semlock._get_value() + return self._maxsize - self._sem.get_value() def empty(self): return not self._poll() diff --git a/Lib/multiprocessing/reduction.py b/Lib/multiprocessing/reduction.py index 5593f0682..fcccd3eef 100644 --- a/Lib/multiprocessing/reduction.py +++ b/Lib/multiprocessing/reduction.py @@ -139,15 +139,12 @@ else: __all__ += ['DupFd', 'sendfds', 'recvfds'] import array - # On MacOSX we should acknowledge receipt of fds -- see Issue14669 - ACKNOWLEDGE = sys.platform == 'darwin' - def sendfds(sock, fds): '''Send an array of fds over an AF_UNIX socket.''' fds = array.array('i', fds) msg = bytes([len(fds) % 256]) sock.sendmsg([msg], [(socket.SOL_SOCKET, socket.SCM_RIGHTS, fds)]) - if ACKNOWLEDGE and sock.recv(1) != b'A': + if sock.recv(1) != b'A': raise RuntimeError('did not receive acknowledgement of fd') def recvfds(sock, size): @@ -158,8 +155,11 @@ else: if not msg and not ancdata: raise EOFError try: - if ACKNOWLEDGE: - sock.send(b'A') + # We send/recv an Ack byte after the fds to work around an old + # macOS bug; it isn't clear if this is still required but it + # makes unit testing fd sending easier. + # See: https://github.com/python/cpython/issues/58874 + sock.send(b'A') # Acknowledge if len(ancdata) != 1: raise RuntimeError('received %d items of ancdata' % len(ancdata)) diff --git a/Lib/multiprocessing/resource_tracker.py b/Lib/multiprocessing/resource_tracker.py index 22e3bbcf2..dfb5a3dfe 100644 --- a/Lib/multiprocessing/resource_tracker.py +++ b/Lib/multiprocessing/resource_tracker.py @@ -20,6 +20,7 @@ import os import signal import sys import threading +import time import warnings from collections import deque @@ -51,12 +52,8 @@ if os.name == 'posix': # absence of POSIX named semaphores. In that case, no named semaphores were # ever opened, so no cleanup would be necessary. if hasattr(_multiprocessing, 'sem_unlink'): - _CLEANUP_FUNCS.update({ - 'semaphore': _multiprocessing.sem_unlink, - }) - _CLEANUP_FUNCS.update({ - 'shared_memory': _posixshmem.shm_unlink, - }) + _CLEANUP_FUNCS['semaphore'] = _multiprocessing.sem_unlink + _CLEANUP_FUNCS['shared_memory'] = _posixshmem.shm_unlink class ReentrantCallError(RuntimeError): @@ -79,6 +76,10 @@ class ResourceTracker(object): # The reader should understand all formats. self._use_simple_format = True + # Set to True by _stop_locked() if the waitpid polling loop ran to + # its timeout without reaping the tracker. Exposed for tests. + self._waitpid_timed_out = False + def _reentrant_call_error(self): # gh-109629: this happens if an explicit call to the ResourceTracker # gets interrupted by a garbage collection, invoking a finalizer (*) @@ -91,16 +92,51 @@ class ResourceTracker(object): # making sure child processess are cleaned before ResourceTracker # gets destructed. # see https://github.com/python/cpython/issues/88887 - self._stop(use_blocking_lock=False) + # gh-146313: use a timeout to avoid deadlocking if a forked child + # still holds the pipe's write end open. + self._stop(use_blocking_lock=False, wait_timeout=1.0) - def _stop(self, use_blocking_lock=True): + def _after_fork_in_child(self): + # gh-146313: Called in the child right after os.fork(). + # + # The tracker process is a child of the *parent*, not of us, so we + # could never waitpid() it anyway. Clearing _pid means our __del__ + # becomes a no-op (the early return for _pid is None). + # + # Whether we keep the inherited _fd depends on who forked us: + # + # - multiprocessing.Process with the 'fork' start method sets + # _fork_intent.preserve_fd before forking. The child keeps the + # fd and reuses the parent's tracker (gh-80849). This is safe + # because multiprocessing's atexit handler joins all children + # before the parent's __del__ runs, so by then the fd copies + # are gone and the parent can reap the tracker promptly. + # + # - A raw os.fork() leaves the flag unset. We close the fd in the child after forking so + # the parent's __del__ can reap the tracker without waiting + # for the child to exit. If we later need a tracker, ensure_running() + # will launch a fresh one. + self._lock._at_fork_reinit() + self._reentrant_messages.clear() + self._pid = None + self._exitcode = None + if (self._fd is not None and + not getattr(_fork_intent, 'preserve_fd', False)): + fd = self._fd + self._fd = None + try: + os.close(fd) + except OSError: + pass + + def _stop(self, use_blocking_lock=True, wait_timeout=None): if use_blocking_lock: with self._lock: - self._stop_locked() + self._stop_locked(wait_timeout=wait_timeout) else: acquired = self._lock.acquire(blocking=False) try: - self._stop_locked() + self._stop_locked(wait_timeout=wait_timeout) finally: if acquired: self._lock.release() @@ -110,6 +146,10 @@ class ResourceTracker(object): close=os.close, waitpid=os.waitpid, waitstatus_to_exitcode=os.waitstatus_to_exitcode, + monotonic=time.monotonic, + sleep=time.sleep, + WNOHANG=getattr(os, 'WNOHANG', None), + wait_timeout=None, ): # This shouldn't happen (it might when called by a finalizer) # so we check for it anyway. @@ -126,7 +166,30 @@ class ResourceTracker(object): self._fd = None try: - _, status = waitpid(self._pid, 0) + if wait_timeout is None: + _, status = waitpid(self._pid, 0) + else: + # gh-146313: A forked child may still hold the pipe's write + # end open, preventing the tracker from seeing EOF and + # exiting. Poll with WNOHANG to avoid blocking forever. + deadline = monotonic() + wait_timeout + delay = 0.001 + while True: + result_pid, status = waitpid(self._pid, WNOHANG) + if result_pid != 0: + break + remaining = deadline - monotonic() + if remaining <= 0: + # The tracker is still running; it will be + # reparented to PID 1 (or the nearest subreaper) + # when we exit, and reaped there once all pipe + # holders release their fd. + self._pid = None + self._exitcode = None + self._waitpid_timed_out = True + return + delay = min(delay * 2, remaining, 0.1) + sleep(delay) except ChildProcessError: self._pid = None self._exitcode = None @@ -312,12 +375,24 @@ class ResourceTracker(object): self._ensure_running_and_write(msg) +# gh-146313: Per-thread flag set by .popen_fork.Popen._launch() just before +# os.fork(), telling _after_fork_in_child() to keep the inherited pipe fd so +# the child can reuse this tracker (gh-80849). Unset for raw os.fork() calls, +# where the child instead closes the fd so the parent's __del__ can reap the +# tracker. Using threading.local() keeps multiple threads calling +# popen_fork.Popen._launch() at once from clobbering eachothers intent. +_fork_intent = threading.local() + _resource_tracker = ResourceTracker() ensure_running = _resource_tracker.ensure_running register = _resource_tracker.register unregister = _resource_tracker.unregister getfd = _resource_tracker.getfd +# gh-146313: See _after_fork_in_child docstring. +if hasattr(os, 'register_at_fork'): + os.register_at_fork(after_in_child=_resource_tracker._after_fork_in_child) + def _decode_message(line): if line.startswith(b'{'): diff --git a/Lib/multiprocessing/shared_memory.py b/Lib/multiprocessing/shared_memory.py index 67e70fdc2..99a8ce332 100644 --- a/Lib/multiprocessing/shared_memory.py +++ b/Lib/multiprocessing/shared_memory.py @@ -539,6 +539,6 @@ class ShareableList: if value == entry: return position else: - raise ValueError(f"{value!r} not in this container") + raise ValueError("ShareableList.index(x): x not in list") __class_getitem__ = classmethod(types.GenericAlias) diff --git a/Lib/multiprocessing/spawn.py b/Lib/multiprocessing/spawn.py index daac1ecc3..d43864c93 100644 --- a/Lib/multiprocessing/spawn.py +++ b/Lib/multiprocessing/spawn.py @@ -184,7 +184,7 @@ def get_preparation_data(name): sys_argv=sys.argv, orig_dir=process.ORIGINAL_DIR, dir=os.getcwd(), - start_method=get_start_method(), + start_method=get_start_method(allow_none=True), ) # Figure out whether to initialise main in the subprocess as a module diff --git a/Lib/multiprocessing/synchronize.py b/Lib/multiprocessing/synchronize.py index 870c91349..9188114ae 100644 --- a/Lib/multiprocessing/synchronize.py +++ b/Lib/multiprocessing/synchronize.py @@ -21,22 +21,21 @@ from . import context from . import process from . import util -# Try to import the mp.synchronize module cleanly, if it fails -# raise ImportError for platforms lacking a working sem_open implementation. -# See issue 3770 +# TODO: Do any platforms still lack a functioning sem_open? try: from _multiprocessing import SemLock, sem_unlink -except (ImportError): +except ImportError: raise ImportError("This platform lacks a functioning sem_open" + - " implementation, therefore, the required" + - " synchronization primitives needed will not" + - " function, see issue 3770.") + " implementation. https://github.com/python/cpython/issues/48020.") # # Constants # -RECURSIVE_MUTEX, SEMAPHORE = list(range(2)) +# These match the enum in Modules/_multiprocessing/semaphore.c +RECURSIVE_MUTEX = 0 +SEMAPHORE = 1 + SEM_VALUE_MAX = _multiprocessing.SemLock.SEM_VALUE_MAX # @@ -91,6 +90,9 @@ class SemLock(object): self.acquire = self._semlock.acquire self.release = self._semlock.release + def locked(self): + return self._semlock._is_zero() + def __enter__(self): return self._semlock.__enter__() @@ -133,11 +135,16 @@ class Semaphore(SemLock): SemLock.__init__(self, SEMAPHORE, value, SEM_VALUE_MAX, ctx=ctx) def get_value(self): + '''Returns current value of Semaphore. + + Raises NotImplementedError on Mac OSX + because of broken sem_getvalue(). + ''' return self._semlock._get_value() def __repr__(self): try: - value = self._semlock._get_value() + value = self.get_value() except Exception: value = 'unknown' return '<%s(value=%s)>' % (self.__class__.__name__, value) @@ -153,7 +160,7 @@ class BoundedSemaphore(Semaphore): def __repr__(self): try: - value = self._semlock._get_value() + value = self.get_value() except Exception: value = 'unknown' return '<%s(value=%s, maxvalue=%s)>' % \ @@ -245,8 +252,8 @@ class Condition(object): def __repr__(self): try: - num_waiters = (self._sleeping_count._semlock._get_value() - - self._woken_count._semlock._get_value()) + num_waiters = (self._sleeping_count.get_value() - + self._woken_count.get_value()) except Exception: num_waiters = 'unknown' return '<%s(%s, %s)>' % (self.__class__.__name__, self._lock, num_waiters) diff --git a/Lib/multiprocessing/util.py b/Lib/multiprocessing/util.py index 4c8425064..549fb07c2 100644 --- a/Lib/multiprocessing/util.py +++ b/Lib/multiprocessing/util.py @@ -14,12 +14,12 @@ import weakref import atexit import threading # we want threading to install it's # cleanup function before multiprocessing does -from subprocess import _args_from_interpreter_flags +from subprocess import _args_from_interpreter_flags # noqa: F401 from . import process __all__ = [ - 'sub_debug', 'debug', 'info', 'sub_warning', 'get_logger', + 'sub_debug', 'debug', 'info', 'sub_warning', 'warn', 'get_logger', 'log_to_stderr', 'get_temp_dir', 'register_after_fork', 'is_exiting', 'Finalize', 'ForkAwareThreadLock', 'ForkAwareLocal', 'close_all_fds_except', 'SUBDEBUG', 'SUBWARNING', @@ -54,7 +54,7 @@ def info(msg, *args): if _logger: _logger.log(INFO, msg, *args, stacklevel=2) -def _warn(msg, *args): +def warn(msg, *args): if _logger: _logger.log(WARNING, msg, *args, stacklevel=2) @@ -196,14 +196,14 @@ def _get_base_temp_dir(tempfile): try: base_system_tempdir = tempfile._get_default_tempdir(dirlist) except FileNotFoundError: - _warn("Process-wide temporary directory %s will not be usable for " - "creating socket files and no usable system-wide temporary " - "directory was found in %s", base_tempdir, dirlist) + warn("Process-wide temporary directory %s will not be usable for " + "creating socket files and no usable system-wide temporary " + "directory was found in %s", base_tempdir, dirlist) # At this point, the system-wide temporary directory is not usable # but we may assume that the user-defined one is, even if we will # not be able to write socket files out there. return base_tempdir - _warn("Ignoring user-defined temporary directory: %s", base_tempdir) + warn("Ignoring user-defined temporary directory: %s", base_tempdir) # at most max(map(len, dirlist)) + 14 + 14 = 36 characters assert len(base_system_tempdir) + 14 + 14 < _SUN_PATH_MAX return base_system_tempdir diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py index a009cb8ca..c3a980598 100644 --- a/Lib/test/_test_multiprocessing.py +++ b/Lib/test/_test_multiprocessing.py @@ -17,6 +17,7 @@ import errno import functools import signal import array +import collections.abc import socket import random import logging @@ -205,10 +206,38 @@ def only_run_in_spawn_testsuite(reason): return decorator +def only_run_in_forkserver_testsuite(reason): + """Returns a decorator: raises SkipTest unless fork is supported + and the current start method is forkserver. + + Combines @support.requires_fork() with the single-run semantics of + only_run_in_spawn_testsuite(), but uses the forkserver testsuite as + the single-run target. Appropriate for tests that exercise + os.fork() directly (raw fork or mp.set_start_method("fork") in a + subprocess) and don't vary by start method, since forkserver is + only available on platforms that support fork. + """ + + def decorator(test_item): + + @functools.wraps(test_item) + def forkserver_check_wrapper(*args, **kwargs): + if not support.has_fork_support: + raise unittest.SkipTest("requires working os.fork()") + if (start_method := multiprocessing.get_start_method()) != "forkserver": + raise unittest.SkipTest( + f"{start_method=}, not 'forkserver'; {reason}") + return test_item(*args, **kwargs) + + return forkserver_check_wrapper + + return decorator + + class TestInternalDecorators(unittest.TestCase): """Logic within a test suite that could errantly skip tests? Test it!""" - @unittest.skipIf(sys.platform == "win32", "test requires that fork exists.") + @support.requires_fork() def test_only_run_in_spawn_testsuite(self): if multiprocessing.get_start_method() != "spawn": raise unittest.SkipTest("only run in test_multiprocessing_spawn.") @@ -232,6 +261,30 @@ class TestInternalDecorators(unittest.TestCase): finally: multiprocessing.set_start_method(orig_start_method, force=True) + @support.requires_fork() + def test_only_run_in_forkserver_testsuite(self): + if multiprocessing.get_start_method() != "forkserver": + raise unittest.SkipTest("only run in test_multiprocessing_forkserver.") + + try: + @only_run_in_forkserver_testsuite("testing this decorator") + def return_four_if_forkserver(): + return 4 + except Exception as err: + self.fail(f"expected decorated `def` not to raise; caught {err}") + + orig_start_method = multiprocessing.get_start_method(allow_none=True) + try: + multiprocessing.set_start_method("forkserver", force=True) + self.assertEqual(return_four_if_forkserver(), 4) + multiprocessing.set_start_method("spawn", force=True) + with self.assertRaises(unittest.SkipTest) as ctx: + return_four_if_forkserver() + self.assertIn("testing this decorator", str(ctx.exception)) + self.assertIn("start_method=", str(ctx.exception)) + finally: + multiprocessing.set_start_method(orig_start_method, force=True) + # # Creates a wrapper for a function which records the time it takes to finish @@ -318,7 +371,7 @@ class _TestProcess(BaseTestCase): authkey = current.authkey self.assertTrue(current.is_alive()) - self.assertTrue(not current.daemon) + self.assertFalse(current.daemon) self.assertIsInstance(authkey, bytes) self.assertTrue(len(authkey) > 0) self.assertEqual(current.ident, os.getpid()) @@ -462,7 +515,7 @@ class _TestProcess(BaseTestCase): self.assertEqual(p.is_alive(), False) self.assertEqual(p.daemon, True) self.assertNotIn(p, self.active_children()) - self.assertTrue(type(self.active_children()) is list) + self.assertIs(type(self.active_children()), list) self.assertEqual(p.exitcode, None) p.start() @@ -516,16 +569,23 @@ class _TestProcess(BaseTestCase): event.set() time.sleep(100) + @classmethod + def _sleep_no_int_handler(cls, event): + signal.signal(signal.SIGINT, signal.SIG_DFL) + cls._sleep_some_event(event) + @classmethod def _test_sleep(cls, delay): time.sleep(delay) - def _kill_process(self, meth): + def _kill_process(self, meth, target=None): if self.TYPE == 'threads': self.skipTest('test not appropriate for {}'.format(self.TYPE)) event = self.Event() - p = self.Process(target=self._sleep_some_event, args=(event,)) + if not target: + target = self._sleep_some_event + p = self.Process(target=target, args=(event,)) p.daemon = True p.start() @@ -575,6 +635,19 @@ class _TestProcess(BaseTestCase): return p.exitcode + @unittest.skipIf(os.name == 'nt', "POSIX only") + def test_interrupt(self): + exitcode = self._kill_process(multiprocessing.Process.interrupt) + self.assertEqual(exitcode, 1) + # exit code 1 is hard-coded for uncaught exceptions + # (KeyboardInterrupt in this case) + # in multiprocessing.BaseProcess._bootstrap + + @unittest.skipIf(os.name == 'nt', "POSIX only") + def test_interrupt_no_handler(self): + exitcode = self._kill_process(multiprocessing.Process.interrupt, target=self._sleep_no_int_handler) + self.assertEqual(exitcode, -signal.SIGINT) + def test_terminate(self): exitcode = self._kill_process(multiprocessing.Process.terminate) self.assertEqual(exitcode, -signal.SIGTERM) @@ -591,8 +664,8 @@ class _TestProcess(BaseTestCase): cpus = multiprocessing.cpu_count() except NotImplementedError: cpus = 1 - self.assertTrue(type(cpus) is int) - self.assertTrue(cpus >= 1) + self.assertIsInstance(cpus, int) + self.assertGreaterEqual(cpus, 1) def test_active_children(self): self.assertEqual(type(self.active_children()), list) @@ -858,8 +931,8 @@ class _TestProcess(BaseTestCase): finally: setattr(sys, stream_name, old_stream) - @classmethod - def _sleep_and_set_event(self, evt, delay=0.0): + @staticmethod + def _sleep_and_set_event(evt, delay=0.0): time.sleep(delay) evt.set() @@ -910,6 +983,56 @@ class _TestProcess(BaseTestCase): if os.name != 'nt': self.check_forkserver_death(signal.SIGKILL) + def test_forkserver_auth_is_enabled(self): + if self.TYPE == "threads": + self.skipTest(f"test not appropriate for {self.TYPE}") + if multiprocessing.get_start_method() != "forkserver": + self.skipTest("forkserver start method specific") + + forkserver = multiprocessing.forkserver._forkserver + forkserver.ensure_running() + self.assertTrue(forkserver._forkserver_pid) + authkey = forkserver._forkserver_authkey + self.assertTrue(authkey) + self.assertGreater(len(authkey), 15) + addr = forkserver._forkserver_address + self.assertTrue(addr) + + # Demonstrate that a raw auth handshake, as Client performs, does not + # raise an error. + client = multiprocessing.connection.Client(addr, authkey=authkey) + client.close() + + # That worked, now launch a quick process. + proc = self.Process(target=sys.exit) + proc.start() + proc.join() + self.assertEqual(proc.exitcode, 0) + + def test_forkserver_without_auth_fails(self): + if self.TYPE == "threads": + self.skipTest(f"test not appropriate for {self.TYPE}") + if multiprocessing.get_start_method() != "forkserver": + self.skipTest("forkserver start method specific") + + forkserver = multiprocessing.forkserver._forkserver + forkserver.ensure_running() + self.assertTrue(forkserver._forkserver_pid) + authkey_len = len(forkserver._forkserver_authkey) + with unittest.mock.patch.object( + forkserver, '_forkserver_authkey', None): + # With an incorrect authkey we should get an auth rejection + # rather than the above protocol error. + forkserver._forkserver_authkey = b'T' * authkey_len + proc = self.Process(target=sys.exit) + with self.assertRaises(multiprocessing.AuthenticationError): + proc.start() + del proc + + # authkey restored, launching processes should work again. + proc = self.Process(target=sys.exit) + proc.start() + proc.join() # # @@ -1445,10 +1568,34 @@ class _TestLock(BaseTestCase): def test_lock(self): lock = self.Lock() self.assertEqual(lock.acquire(), True) + self.assertTrue(lock.locked()) self.assertEqual(lock.acquire(False), False) self.assertEqual(lock.release(), None) + self.assertFalse(lock.locked()) self.assertRaises((ValueError, threading.ThreadError), lock.release) + @classmethod + def _test_lock_locked_2processes(cls, lock, event, res): + lock.acquire() + res.value = lock.locked() + event.set() + + @unittest.skipUnless(HAS_SHAREDCTYPES, 'needs sharedctypes') + def test_lock_locked_2processes(self): + if self.TYPE != 'processes': + self.skipTest('test not appropriate for {}'.format(self.TYPE)) + + lock = self.Lock() + event = self.Event() + res = self.Value('b', 0) + p = self.Process(target=self._test_lock_locked_2processes, + args=(lock, event, res)) + p.start() + event.wait() + self.assertTrue(lock.locked()) + self.assertTrue(res.value) + p.join() + @staticmethod def _acquire_release(lock, timeout, l=None, n=1): for _ in range(n): @@ -1485,14 +1632,11 @@ class _TestLock(BaseTestCase): for i in range(n): self.assertIn(f'', l) - - t = threading.Thread(target=self._acquire_release, - args=(lock, 0.2), - name=f'T1') + rlock = self.RLock() + t = threading.Thread(target=rlock.acquire) t.start() - time.sleep(0.1) - self.assertEqual('', repr(lock)) - time.sleep(0.2) + t.join() + self.assertEqual('', repr(rlock)) pname = 'P1' l = multiprocessing.Manager().list() @@ -1503,28 +1647,49 @@ class _TestLock(BaseTestCase): p.join() self.assertEqual(f'', l[0]) - event = self.Event() - lock = self.RLock() - p = self.Process(target=self._acquire_event, - args=(lock, event)) + rlock = self.RLock() + p = self.Process(target=self._acquire, args=(rlock,)) p.start() - event.wait() - self.assertEqual('', repr(lock)) p.join() + self.assertEqual('', repr(rlock)) def test_rlock(self): lock = self.RLock() self.assertEqual(lock.acquire(), True) + self.assertTrue(lock.locked()) self.assertEqual(lock.acquire(), True) self.assertEqual(lock.acquire(), True) self.assertEqual(lock.release(), None) + self.assertTrue(lock.locked()) self.assertEqual(lock.release(), None) self.assertEqual(lock.release(), None) + self.assertFalse(lock.locked()) self.assertRaises((AssertionError, RuntimeError), lock.release) + @unittest.skipUnless(HAS_SHAREDCTYPES, 'needs sharedctypes') + def test_rlock_locked_2processes(self): + if self.TYPE != 'processes': + self.skipTest('test not appropriate for {}'.format(self.TYPE)) + + rlock = self.RLock() + event = self.Event() + res = self.Value('b', 0) + # target is the same as for the test_lock_locked_2processes test. + p = self.Process(target=self._test_lock_locked_2processes, + args=(rlock, event, res)) + p.start() + event.wait() + self.assertTrue(rlock.locked()) + self.assertTrue(res.value) + p.join() + def test_lock_context(self): - with self.Lock(): - pass + with self.Lock() as locked: + self.assertTrue(locked) + + def test_rlock_context(self): + with self.RLock() as locked: + self.assertTrue(locked) class _TestSemaphore(BaseTestCase): @@ -2354,14 +2519,14 @@ class _TestValue(BaseTestCase): self.assertEqual(lock, lock3) arr4 = self.Value('i', 5, lock=False) - self.assertFalse(hasattr(arr4, 'get_lock')) - self.assertFalse(hasattr(arr4, 'get_obj')) + self.assertNotHasAttr(arr4, 'get_lock') + self.assertNotHasAttr(arr4, 'get_obj') self.assertRaises(AttributeError, self.Value, 'i', 5, lock='navalue') arr5 = self.RawValue('i', 5) - self.assertFalse(hasattr(arr5, 'get_lock')) - self.assertFalse(hasattr(arr5, 'get_obj')) + self.assertNotHasAttr(arr5, 'get_lock') + self.assertNotHasAttr(arr5, 'get_obj') class _TestArray(BaseTestCase): @@ -2434,14 +2599,14 @@ class _TestArray(BaseTestCase): self.assertEqual(lock, lock3) arr4 = self.Array('i', range(10), lock=False) - self.assertFalse(hasattr(arr4, 'get_lock')) - self.assertFalse(hasattr(arr4, 'get_obj')) + self.assertNotHasAttr(arr4, 'get_lock') + self.assertNotHasAttr(arr4, 'get_obj') self.assertRaises(AttributeError, self.Array, 'i', range(10), lock='notalock') arr5 = self.RawArray('i', range(10)) - self.assertFalse(hasattr(arr5, 'get_lock')) - self.assertFalse(hasattr(arr5, 'get_obj')) + self.assertNotHasAttr(arr5, 'get_lock') + self.assertNotHasAttr(arr5, 'get_obj') # # @@ -2482,6 +2647,23 @@ class _TestContainers(BaseTestCase): a.append('hello') self.assertEqual(f[0][:], [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 'hello']) + def test_list_isinstance(self): + a = self.list() + self.assertIsInstance(a, collections.abc.MutableSequence) + + # MutableSequence also has __iter__, but we can iterate over + # ListProxy using __getitem__ instead. Adding __iter__ to ListProxy + # would change the behavior of a list modified during iteration. + mutable_sequence_methods = ( + '__contains__', '__delitem__', '__getitem__', '__iadd__', + '__len__', '__reversed__', '__setitem__', 'append', + 'clear', 'count', 'extend', 'index', 'insert', 'pop', 'remove', + 'reverse', + ) + for name in mutable_sequence_methods: + with self.subTest(name=name): + self.assertTrue(callable(getattr(a, name))) + def test_list_iter(self): a = self.list(list(range(10))) it = iter(a) @@ -2522,6 +2704,19 @@ class _TestContainers(BaseTestCase): self.assertEqual(sorted(d.values()), [chr(i) for i in indices]) self.assertEqual(sorted(d.items()), [(i, chr(i)) for i in indices]) + def test_dict_isinstance(self): + a = self.dict() + self.assertIsInstance(a, collections.abc.MutableMapping) + + mutable_mapping_methods = ( + '__contains__', '__delitem__', '__eq__', '__getitem__', '__iter__', + '__len__', '__ne__', '__setitem__', 'clear', 'get', 'items', + 'keys', 'pop', 'popitem', 'setdefault', 'update', 'values', + ) + for name in mutable_mapping_methods: + with self.subTest(name=name): + self.assertTrue(callable(getattr(a, name))) + def test_dict_iter(self): d = self.dict() indices = list(range(65, 70)) @@ -2599,8 +2794,8 @@ class _TestContainers(BaseTestCase): self.assertEqual((n.name, n.job), ('Bob', 'Builder')) del n.job self.assertEqual(str(n), "Namespace(name='Bob')") - self.assertTrue(hasattr(n, 'name')) - self.assertTrue(not hasattr(n, 'job')) + self.assertHasAttr(n, 'name') + self.assertNotHasAttr(n, 'job') # # @@ -2972,8 +3167,7 @@ class _TestPool(BaseTestCase): # check that we indeed waited for all jobs self.assertGreater(time.monotonic() - t_start, 0.9) - # TODO: RUSTPYTHON - reference counting differences - @unittest.skip("TODO: RUSTPYTHON") + @unittest.skip("TODO: RUSTPYTHON; reference counting differences") def test_release_task_refs(self): # Issue #29861: task arguments and results should not be kept # alive after we are done with them. @@ -3172,6 +3366,7 @@ class _TestMyManager(BaseTestCase): ALLOWED_TYPES = ('manager',) + @support.skip_if_sanitizer('TSan: leaks threads', thread=True) def test_mymanager(self): manager = MyManager(shutdown_timeout=SHUTDOWN_TIMEOUT) manager.start() @@ -3183,6 +3378,7 @@ class _TestMyManager(BaseTestCase): # which happens on slow buildbots. self.assertIn(manager._process.exitcode, (0, -signal.SIGTERM)) + @support.skip_if_sanitizer('TSan: leaks threads', thread=True) def test_mymanager_context(self): manager = MyManager(shutdown_timeout=SHUTDOWN_TIMEOUT) with manager: @@ -3192,6 +3388,7 @@ class _TestMyManager(BaseTestCase): # which happens on slow buildbots. self.assertIn(manager._process.exitcode, (0, -signal.SIGTERM)) + @support.skip_if_sanitizer('TSan: leaks threads', thread=True) def test_mymanager_context_prestarted(self): manager = MyManager(shutdown_timeout=SHUTDOWN_TIMEOUT) manager.start() @@ -3262,6 +3459,7 @@ class _TestRemoteManager(BaseTestCase): # Note that xmlrpclib will deserialize object as a list not a tuple queue.put(tuple(cls.values)) + @support.skip_if_sanitizer('TSan: leaks threads', thread=True) def test_remote(self): authkey = os.urandom(32) @@ -3303,6 +3501,7 @@ class _TestManagerRestart(BaseTestCase): queue = manager.get_queue() queue.put('hello world') + @support.skip_if_sanitizer("TSan: leaks threads", thread=True) def test_rapid_restart(self): authkey = os.urandom(32) manager = QueueManager( @@ -3886,8 +4085,7 @@ class _TestPicklingConnections(BaseTestCase): conn.close() - # TODO: RUSTPYTHON - hangs - @unittest.skip("TODO: RUSTPYTHON") + @unittest.skip("TODO: RUSTPYTHON; hangs") def test_pickling(self): families = self.connection.families @@ -4109,8 +4307,7 @@ class _TestSharedCTypes(BaseTestCase): for i in range(len(arr)): arr[i] *= 2 - # TODO: RUSTPYTHON - ctypes Structure shared memory not working - @unittest.expectedFailure + @unittest.expectedFailure # TODO: RUSTPYTHON; - ctypes Structure shared memory not working def test_sharedctypes(self, lock=False): x = Value('i', 7, lock=lock) y = Value(c_double, 1.0/3.0, lock=lock) @@ -4134,8 +4331,7 @@ class _TestSharedCTypes(BaseTestCase): self.assertAlmostEqual(arr[i], i*2) self.assertEqual(string.value, latin('hellohello')) - # TODO: RUSTPYTHON - calls test_sharedctypes which fails - @unittest.expectedFailure + @unittest.expectedFailure # TODO: RUSTPYTHON; - calls test_sharedctypes which fails def test_synchronize(self): self.test_sharedctypes(lock=True) @@ -4813,8 +5009,7 @@ class _TestFinalize(BaseTestCase): result = [obj for obj in iter(conn.recv, 'STOP')] self.assertEqual(result, ['a', 'b', 'd10', 'd03', 'd02', 'd01', 'e']) - # TODO: RUSTPYTHON; SIGSEGV due to dict thread-safety issue under aggressive GC - @unittest.skip("TODO: RUSTPYTHON") + @unittest.skip("TODO: RUSTPYTHON; SIGSEGV due to dict thread-safety issue under aggressive GC") @support.requires_resource('cpu') def test_thread_safety(self): # bpo-24484: _run_finalizers() should be thread-safe @@ -4906,13 +5101,9 @@ class _TestImportStar(unittest.TestCase): for name in modules: __import__(name) mod = sys.modules[name] - self.assertTrue(hasattr(mod, '__all__'), name) - + self.assertHasAttr(mod, '__all__', name) for attr in mod.__all__: - self.assertTrue( - hasattr(mod, attr), - '%r does not have attribute %r' % (mod, attr) - ) + self.assertHasAttr(mod, attr) # # Quick test that logging works -- does not test logging output @@ -4925,7 +5116,7 @@ class _TestLogging(BaseTestCase): def test_enable_logging(self): logger = multiprocessing.get_logger() logger.setLevel(util.SUBWARNING) - self.assertTrue(logger is not None) + self.assertIsNotNone(logger) logger.debug('this will not be printed') logger.info('nor will this') logger.setLevel(LOG_LEVEL) @@ -5062,6 +5253,23 @@ class TestInvalidHandle(unittest.TestCase): multiprocessing.connection.Connection, -1) +# +# Regression tests for BaseProcess kwargs handling +# + +class TestBaseProcessKwargs(unittest.TestCase): + def test_default_kwargs_not_shared_between_instances(self): + # Creating multiple Process instances without passing kwargs + # must create independent empty dicts (no shared state). + p1 = multiprocessing.Process(target=lambda: None) + p2 = multiprocessing.Process(target=lambda: None) + self.assertIsInstance(p1._kwargs, dict) + self.assertIsInstance(p2._kwargs, dict) + self.assertIsNot(p1._kwargs, p2._kwargs) + # Mutating one should not affect the other + p1._kwargs['x'] = 1 + self.assertNotIn('x', p2._kwargs) + @hashlib_helper.requires_hashdigest('sha256') class OtherTest(unittest.TestCase): @@ -5700,6 +5908,39 @@ class TestStartMethod(unittest.TestCase): self.assertRaises(ValueError, ctx.set_start_method, None) self.check_context(ctx) + @staticmethod + def _dummy_func(): + pass + + def test_spawn_dont_set_context(self): + # Run a process with spawn or forkserver context may change + # the global start method, see gh-109263. + for method in ('fork', 'spawn', 'forkserver'): + multiprocessing.set_start_method(None, force=True) + + try: + ctx = multiprocessing.get_context(method) + except ValueError: + continue + process = ctx.Process(target=self._dummy_func) + process.start() + process.join() + self.assertIsNone(multiprocessing.get_start_method(allow_none=True)) + + @only_run_in_spawn_testsuite("freeze_support is not start method specific") + def test_freeze_support_dont_set_context(self): + # gh-140814: freeze_support() should not set the start method + # as a side effect, so a later set_start_method() still works. + multiprocessing.set_start_method(None, force=True) + try: + multiprocessing.freeze_support() + self.assertIsNone( + multiprocessing.get_start_method(allow_none=True)) + # Should not raise "context has already been set" + multiprocessing.set_start_method('spawn') + finally: + multiprocessing.set_start_method(None, force=True) + def test_context_check_module_types(self): try: ctx = multiprocessing.get_context('forkserver') @@ -5721,24 +5962,37 @@ class TestStartMethod(unittest.TestCase): self.assertEqual(multiprocessing.get_start_method(), method) ctx = multiprocessing.get_context() self.assertEqual(ctx.get_start_method(), method) - self.assertTrue(type(ctx).__name__.lower().startswith(method)) - self.assertTrue( - ctx.Process.__name__.lower().startswith(method)) + self.assertStartsWith(type(ctx).__name__.lower(), method) + self.assertStartsWith(ctx.Process.__name__.lower(), method) self.check_context(multiprocessing) count += 1 finally: multiprocessing.set_start_method(old_method, force=True) self.assertGreaterEqual(count, 1) - def test_get_all(self): + def test_get_all_start_methods(self): methods = multiprocessing.get_all_start_methods() + self.assertIn('spawn', methods) if sys.platform == 'win32': self.assertEqual(methods, ['spawn']) + elif sys.platform == 'darwin': + self.assertEqual(methods[0], 'spawn') # The default is first. + # Whether these work or not, they remain available on macOS. + self.assertIn('fork', methods) + self.assertIn('forkserver', methods) else: - self.assertTrue(methods == ['fork', 'spawn'] or - methods == ['spawn', 'fork'] or - methods == ['fork', 'spawn', 'forkserver'] or - methods == ['spawn', 'fork', 'forkserver']) + # POSIX + self.assertIn('fork', methods) + if other_methods := set(methods) - {'fork', 'spawn'}: + # If there are more than those two, forkserver must be one. + self.assertEqual({'forkserver'}, other_methods) + # The default is the first method in the list. + self.assertIn(methods[0], {'forkserver', 'spawn'}, + msg='3.14+ default must not be fork') + if methods[0] == 'spawn': + # Confirm that the current default selection logic prefers + # forkserver vs spawn when available. + self.assertNotIn('forkserver', methods) def test_preload_resources(self): if multiprocessing.get_start_method() != 'forkserver': @@ -5910,9 +6164,9 @@ class TestResourceTracker(unittest.TestCase): if should_die: self.assertEqual(len(all_warn), 1) the_warn = all_warn[0] - self.assertTrue(issubclass(the_warn.category, UserWarning)) - self.assertTrue("resource_tracker: process died" - in str(the_warn.message)) + self.assertIsSubclass(the_warn.category, UserWarning) + self.assertIn("resource_tracker: process died", + str(the_warn.message)) else: self.assertEqual(len(all_warn), 0) @@ -5934,8 +6188,9 @@ class TestResourceTracker(unittest.TestCase): def _is_resource_tracker_reused(conn, pid): from multiprocessing.resource_tracker import _resource_tracker _resource_tracker.ensure_running() - # The pid should be None in the child process, expect for the fork - # context. It should not be a new value. + # The pid should be None in the child (the at-fork handler clears + # it for fork; spawn/forkserver children never had it set). It + # should not be a new value. reused = _resource_tracker._pid in (None, pid) reused &= _resource_tracker._check_alive() conn.send(reused) @@ -6020,6 +6275,184 @@ class TestResourceTracker(unittest.TestCase): # restore sigmask to what it was before executing test signal.pthread_sigmask(signal.SIG_SETMASK, orig_sigmask) + @unittest.expectedFailureIf(not hasattr(os, "killpg"), "TODO: RUSTPYTHON") + @only_run_in_forkserver_testsuite("avoids redundant testing.") + def test_resource_tracker_fork_deadlock(self): + # gh-146313: ResourceTracker.__del__ used to deadlock if a forked + # child still held the pipe's write end open when the parent + # exited, because the parent would block in waitpid() waiting for + # the tracker to exit, but the tracker would never see EOF. + cmd = '''if 1: + import os, signal + from multiprocessing.resource_tracker import ensure_running + ensure_running() + if os.fork() == 0: + signal.pause() + os._exit(0) + # parent falls through and exits, triggering __del__ + ''' + proc = subprocess.Popen([sys.executable, '-c', cmd], + start_new_session=True) + try: + try: + proc.wait(timeout=support.SHORT_TIMEOUT) + except subprocess.TimeoutExpired: + self.fail( + "Parent process deadlocked in ResourceTracker.__del__" + ) + self.assertEqual(proc.returncode, 0) + finally: + try: + os.killpg(proc.pid, signal.SIGKILL) + except ProcessLookupError: + pass + proc.wait() + + @only_run_in_forkserver_testsuite("avoids redundant testing.") + def test_resource_tracker_mp_fork_reuse_and_prompt_reap(self): + # gh-146313 / gh-80849: A child started via multiprocessing.Process + # with the 'fork' start method should reuse the parent's resource + # tracker (the at-fork handler preserves the inherited pipe fd), + # *and* the parent should be able to reap the tracker promptly + # after joining the child, without hitting the waitpid timeout. + cmd = textwrap.dedent(''' + import multiprocessing as mp + from multiprocessing.resource_tracker import _resource_tracker + + def child(conn): + # Prove we can talk to the parent's tracker by registering + # and unregistering a dummy resource over the inherited fd. + # If the fd were closed, ensure_running would launch a new + # tracker and _pid would be non-None. + _resource_tracker.register("x", "dummy") + _resource_tracker.unregister("x", "dummy") + conn.send((_resource_tracker._fd is not None, + _resource_tracker._pid is None, + _resource_tracker._check_alive())) + + if __name__ == "__main__": + mp.set_start_method("fork") + _resource_tracker.ensure_running() + r, w = mp.Pipe(duplex=False) + p = mp.Process(target=child, args=(w,)) + p.start() + child_has_fd, child_pid_none, child_alive = r.recv() + p.join() + w.close(); r.close() + + # Now simulate __del__: the child has exited and released + # its fd copy, so the tracker should see EOF and exit + # promptly -- no timeout. + _resource_tracker._stop(wait_timeout=5.0) + print(child_has_fd, child_pid_none, child_alive, + _resource_tracker._waitpid_timed_out, + _resource_tracker._exitcode) + ''') + rc, out, err = script_helper.assert_python_ok('-c', cmd) + parts = out.decode().split() + self.assertEqual(parts, ['True', 'True', 'True', 'False', '0'], + f"unexpected: {parts!r} stderr={err!r}") + + @only_run_in_forkserver_testsuite("avoids redundant testing.") + def test_resource_tracker_raw_fork_prompt_reap(self): + # gh-146313: After a raw os.fork() the at-fork handler closes the + # child's inherited fd, so the parent can reap the tracker + # immediately -- even while the child is still alive -- rather + # than waiting out the 1s timeout. + cmd = textwrap.dedent(''' + import os, signal + from multiprocessing.resource_tracker import _resource_tracker + + _resource_tracker.ensure_running() + r, w = os.pipe() + pid = os.fork() + if pid == 0: + os.close(r) + # Report whether our fd was closed by the at-fork handler. + os.write(w, b"1" if _resource_tracker._fd is None else b"0") + os.close(w) + signal.pause() # stay alive so parent's reap is meaningful + os._exit(0) + os.close(w) + child_fd_closed = os.read(r, 1) == b"1" + os.close(r) + + # Child is still alive and paused. Because it closed its fd + # copy, our close below is the last one and the tracker exits. + _resource_tracker._stop(wait_timeout=5.0) + + os.kill(pid, signal.SIGKILL) + os.waitpid(pid, 0) + print(child_fd_closed, + _resource_tracker._waitpid_timed_out, + _resource_tracker._exitcode) + ''') + rc, out, err = script_helper.assert_python_ok('-c', cmd) + parts = out.decode().split() + self.assertEqual(parts, ['True', 'False', '0'], + f"unexpected: {parts!r} stderr={err!r}") + + @only_run_in_forkserver_testsuite("avoids redundant testing.") + def test_resource_tracker_lock_reinit_after_fork(self): + # gh-146313: If a parent thread held the tracker's lock at fork + # time, the child would inherit the held lock and deadlock on + # its next ensure_running(). The at-fork handler reinits it. + cmd = textwrap.dedent(''' + import os, threading + from multiprocessing.resource_tracker import _resource_tracker + + held = threading.Event() + release = threading.Event() + def hold(): + with _resource_tracker._lock: + held.set() + release.wait() + t = threading.Thread(target=hold) + t.start() + held.wait() + + pid = os.fork() + if pid == 0: + ok = _resource_tracker._lock.acquire(timeout=5.0) + os._exit(0 if ok else 1) + + release.set() + t.join() + _, status = os.waitpid(pid, 0) + print(os.waitstatus_to_exitcode(status)) + ''') + rc, out, err = script_helper.assert_python_ok( + '-W', 'ignore::DeprecationWarning', '-c', cmd) + self.assertEqual(out.strip(), b'0', + f"child failed to acquire lock: stderr={err!r}") + + @only_run_in_forkserver_testsuite("avoids redundant testing.") + def test_resource_tracker_safety_net_timeout(self): + # gh-146313: When an mp.Process(fork) child holds the preserved + # fd and the parent calls _stop() without joining (simulating + # abnormal shutdown), the safety-net timeout should fire rather + # than deadlocking. + cmd = textwrap.dedent(''' + import multiprocessing as mp + import signal + from multiprocessing.resource_tracker import _resource_tracker + + if __name__ == "__main__": + mp.set_start_method("fork") + _resource_tracker.ensure_running() + p = mp.Process(target=signal.pause) + p.start() + # Stop WITHOUT joining -- child still holds preserved fd + _resource_tracker._stop(wait_timeout=0.5) + print(_resource_tracker._waitpid_timed_out) + p.terminate() + p.join() + ''') + rc, out, err = script_helper.assert_python_ok('-c', cmd) + self.assertEqual(out.strip(), b'True', + f"safety-net timeout did not fire: stderr={err!r}") + + class TestSimpleQueue(unittest.TestCase): @classmethod @@ -6117,8 +6550,8 @@ class TestPoolNotLeakOnFailure(unittest.TestCase): Process=FailingForkProcess)) p.close() p.join() - self.assertFalse( - any(process.is_alive() for process in forked_processes)) + for process in forked_processes: + self.assertFalse(process.is_alive(), process) @hashlib_helper.requires_hashdigest('sha256') @@ -6207,6 +6640,7 @@ class TestSyncManagerTypes(unittest.TestCase): @classmethod def _test_lock(cls, obj): obj.acquire() + obj.locked() def test_lock(self, lname="Lock"): o = getattr(self.manager, lname)() @@ -6218,8 +6652,9 @@ class TestSyncManagerTypes(unittest.TestCase): def _test_rlock(cls, obj): obj.acquire() obj.release() + obj.locked() - def test_rlock(self, lname="Lock"): + def test_rlock(self, lname="RLock"): o = getattr(self.manager, lname)() self.run_worker(self._test_rlock, o) @@ -6290,12 +6725,30 @@ class TestSyncManagerTypes(unittest.TestCase): case.assertEqual(obj[0], 5) case.assertEqual(obj.count(5), 1) case.assertEqual(obj.index(5), 0) + obj += [7] + case.assertIsInstance(obj, multiprocessing.managers.ListProxy) + case.assertListEqual(list(obj), [5, 7]) + obj *= 2 + case.assertIsInstance(obj, multiprocessing.managers.ListProxy) + case.assertListEqual(list(obj), [5, 7, 5, 7]) + double_obj = obj * 2 + case.assertIsInstance(double_obj, list) + case.assertListEqual(list(double_obj), [5, 7, 5, 7, 5, 7, 5, 7]) + double_obj = 2 * obj + case.assertIsInstance(double_obj, list) + case.assertListEqual(list(double_obj), [5, 7, 5, 7, 5, 7, 5, 7]) + copied_obj = obj.copy() + case.assertIsInstance(copied_obj, list) + case.assertListEqual(list(copied_obj), [5, 7, 5, 7]) + obj.extend(double_obj + copied_obj) obj.sort() obj.reverse() for x in obj: pass - case.assertEqual(len(obj), 1) - case.assertEqual(obj.pop(0), 5) + case.assertEqual(len(obj), 16) + case.assertEqual(obj.pop(0), 7) + obj.clear() + case.assertEqual(len(obj), 0) def test_list(self): o = self.manager.list() @@ -6314,8 +6767,31 @@ class TestSyncManagerTypes(unittest.TestCase): case.assertListEqual(list(obj.keys()), ['foo']) case.assertListEqual(list(obj.values()), [5]) case.assertDictEqual(obj.copy(), {'foo': 5}) - case.assertTupleEqual(obj.popitem(), ('foo', 5)) + obj |= {'bar': 6} + case.assertIsInstance(obj, multiprocessing.managers.DictProxy) + case.assertDictEqual(dict(obj), {'foo': 5, 'bar': 6}) + x = reversed(obj) + case.assertIsInstance(x, type(iter([]))) + case.assertListEqual(list(x), ['bar', 'foo']) + x = {'bar': 7, 'baz': 7} | obj + case.assertIsInstance(x, dict) + case.assertDictEqual(dict(x), {'foo': 5, 'bar': 6, 'baz': 7}) + x = obj | {'bar': 7, 'baz': 7} + case.assertIsInstance(x, dict) + case.assertDictEqual(dict(x), {'foo': 5, 'bar': 7, 'baz': 7}) + x = obj.fromkeys(['bar'], 6) + case.assertIsInstance(x, dict) + case.assertDictEqual(x, {'bar': 6}) + x = obj.popitem() + case.assertIsInstance(x, tuple) + case.assertTupleEqual(x, ('bar', 6)) + obj.setdefault('bar', 0) + obj.update({'bar': 7}) + case.assertEqual(obj.pop('bar'), 7) + obj.clear() + case.assertEqual(len(obj), 0) + @unittest.expectedFailure # TODO: RUSTPYTHON def test_dict(self): o = self.manager.dict() o['foo'] = 5 @@ -6360,6 +6836,150 @@ class TestSyncManagerTypes(unittest.TestCase): o.y = 1 self.run_worker(self._test_namespace, o) + @classmethod + def _test_set_operator_symbols(cls, obj): + case = unittest.TestCase() + obj.update(['a', 'b', 'c']) + case.assertEqual(len(obj), 3) + case.assertIn('a', obj) + case.assertNotIn('d', obj) + result = obj | {'d', 'e'} + case.assertSetEqual(result, {'a', 'b', 'c', 'd', 'e'}) + result = {'d', 'e'} | obj + case.assertSetEqual(result, {'a', 'b', 'c', 'd', 'e'}) + obj |= {'d', 'e'} + case.assertSetEqual(obj, {'a', 'b', 'c', 'd', 'e'}) + case.assertIsInstance(obj, multiprocessing.managers.SetProxy) + + obj.clear() + obj.update(['a', 'b', 'c']) + result = {'a', 'b', 'd'} - obj + case.assertSetEqual(result, {'d'}) + result = obj - {'a', 'b'} + case.assertSetEqual(result, {'c'}) + obj -= {'a', 'b'} + case.assertSetEqual(obj, {'c'}) + case.assertIsInstance(obj, multiprocessing.managers.SetProxy) + + obj.clear() + obj.update(['a', 'b', 'c']) + result = {'b', 'c', 'd'} ^ obj + case.assertSetEqual(result, {'a', 'd'}) + result = obj ^ {'b', 'c', 'd'} + case.assertSetEqual(result, {'a', 'd'}) + obj ^= {'b', 'c', 'd'} + case.assertSetEqual(obj, {'a', 'd'}) + case.assertIsInstance(obj, multiprocessing.managers.SetProxy) + + obj.clear() + obj.update(['a', 'b', 'c']) + result = obj & {'b', 'c', 'd'} + case.assertSetEqual(result, {'b', 'c'}) + result = {'b', 'c', 'd'} & obj + case.assertSetEqual(result, {'b', 'c'}) + obj &= {'b', 'c', 'd'} + case.assertSetEqual(obj, {'b', 'c'}) + case.assertIsInstance(obj, multiprocessing.managers.SetProxy) + + obj.clear() + obj.update(['a', 'b', 'c']) + case.assertSetEqual(set(obj), {'a', 'b', 'c'}) + + @classmethod + def _test_set_operator_methods(cls, obj): + case = unittest.TestCase() + obj.add('d') + case.assertIn('d', obj) + + obj.clear() + obj.update(['a', 'b', 'c']) + copy_obj = obj.copy() + case.assertSetEqual(copy_obj, obj) + obj.remove('a') + case.assertNotIn('a', obj) + case.assertRaises(KeyError, obj.remove, 'a') + + obj.clear() + obj.update(['a']) + obj.discard('a') + case.assertNotIn('a', obj) + obj.discard('a') + case.assertNotIn('a', obj) + obj.update(['a']) + popped = obj.pop() + case.assertNotIn(popped, obj) + + obj.clear() + obj.update(['a', 'b', 'c']) + result = obj.intersection({'b', 'c', 'd'}) + case.assertSetEqual(result, {'b', 'c'}) + obj.intersection_update({'b', 'c', 'd'}) + case.assertSetEqual(obj, {'b', 'c'}) + + obj.clear() + obj.update(['a', 'b', 'c']) + result = obj.difference({'a', 'b'}) + case.assertSetEqual(result, {'c'}) + obj.difference_update({'a', 'b'}) + case.assertSetEqual(obj, {'c'}) + + obj.clear() + obj.update(['a', 'b', 'c']) + result = obj.symmetric_difference({'b', 'c', 'd'}) + case.assertSetEqual(result, {'a', 'd'}) + obj.symmetric_difference_update({'b', 'c', 'd'}) + case.assertSetEqual(obj, {'a', 'd'}) + + @classmethod + def _test_set_comparisons(cls, obj): + case = unittest.TestCase() + obj.update(['a', 'b', 'c']) + result = obj.union({'d', 'e'}) + case.assertSetEqual(result, {'a', 'b', 'c', 'd', 'e'}) + case.assertTrue(obj.isdisjoint({'d', 'e'})) + case.assertFalse(obj.isdisjoint({'a', 'd'})) + + case.assertTrue(obj.issubset({'a', 'b', 'c', 'd'})) + case.assertFalse(obj.issubset({'a', 'b'})) + case.assertLess(obj, {'a', 'b', 'c', 'd'}) + case.assertLessEqual(obj, {'a', 'b', 'c'}) + + case.assertTrue(obj.issuperset({'a', 'b'})) + case.assertFalse(obj.issuperset({'a', 'b', 'd'})) + case.assertGreater(obj, {'a'}) + case.assertGreaterEqual(obj, {'a', 'b'}) + + def test_set(self): + o = self.manager.set() + self.run_worker(self._test_set_operator_symbols, o) + o = self.manager.set() + self.run_worker(self._test_set_operator_methods, o) + o = self.manager.set() + self.run_worker(self._test_set_comparisons, o) + + def test_set_init(self): + o = self.manager.set({'a', 'b', 'c'}) + self.assertSetEqual(o, {'a', 'b', 'c'}) + o = self.manager.set(["a", "b", "c"]) + self.assertSetEqual(o, {"a", "b", "c"}) + o = self.manager.set({"a": 1, "b": 2, "c": 3}) + self.assertSetEqual(o, {"a", "b", "c"}) + self.assertRaises(RemoteError, self.manager.set, 1234) + + def test_set_contain_all_method(self): + o = self.manager.set() + set_methods = { + '__and__', '__class_getitem__', '__contains__', '__iand__', '__ior__', + '__isub__', '__iter__', '__ixor__', '__len__', '__or__', '__rand__', + '__ror__', '__rsub__', '__rxor__', '__sub__', '__xor__', + '__ge__', '__gt__', '__le__', '__lt__', + 'add', 'clear', 'copy', 'difference', 'difference_update', 'discard', + 'intersection', 'intersection_update', 'isdisjoint', 'issubset', + 'issuperset', 'pop', 'remove', 'symmetric_difference', + 'symmetric_difference_update', 'union', 'update', + } + self.assertLessEqual(set_methods, set(dir(o))) + class TestNamedResource(unittest.TestCase): @only_run_in_spawn_testsuite("spawn specific test.") @@ -6571,6 +7191,43 @@ class MiscTestCase(unittest.TestCase): out = out.decode().split("\n") self.assertEqual(out, ['__main__', '__mp_main__', 'f', 'f', '']) + def test_preload_main_sys_argv(self): + # gh-143706: Check that sys.argv is set before __main__ is pre-loaded + if multiprocessing.get_start_method() != "forkserver": + self.skipTest("forkserver specific test") + + name = os.path.join(os.path.dirname(__file__), 'mp_preload_sysargv.py') + _, out, err = test.support.script_helper.assert_python_ok( + name, 'foo', 'bar') + self.assertEqual(err, b'') + + out = out.decode().split("\n") + expected_argv = "['foo', 'bar']" + self.assertEqual(out, [ + f"module:{expected_argv}", + f"fun:{expected_argv}", + f"module:{expected_argv}", + f"fun:{expected_argv}", + '', + ]) + + @only_run_in_forkserver_testsuite("forkserver specific test.") + def test_preload_main_large_sys_argv(self): + # gh-144503: a very large parent sys.argv must not prevent the + # forkserver from starting (it previously overflowed the OS + # per-argument length limit when repr'd into the -c command string). + name = os.path.join(os.path.dirname(__file__), + 'mp_preload_large_sysargv.py') + _, out, err = test.support.script_helper.assert_python_ok(name) + self.assertEqual(err, b'') + + out = out.decode().split("\n") + self.assertEqual(out, [ + 'preload:5002:sentinel', + 'worker:5002:sentinel', + '', + ]) + # # Mixins # @@ -6587,15 +7244,13 @@ class BaseMixin(object): # cycles. Trigger a garbage collection to break these cycles. test.support.gc_collect() - # TODO: RUSTPYTHON: Filter out stopped processes since gc.collect() is a no-op - processes = {p for p in multiprocessing.process._dangling if p.is_alive()} - {p for p in cls.dangling[0] if p.is_alive()} + processes = set(multiprocessing.process._dangling) - set(cls.dangling[0]) if processes: test.support.environment_altered = True support.print_warning(f'Dangling processes: {processes}') processes = None - # TODO: RUSTPYTHON: Filter out stopped threads since gc.collect() is a no-op - threads = {t for t in threading._dangling if t.is_alive()} - {t for t in cls.dangling[1] if t.is_alive()} + threads = set(threading._dangling) - set(cls.dangling[1]) if threads: test.support.environment_altered = True support.print_warning(f'Dangling threads: {threads}') @@ -6785,16 +7440,14 @@ def install_tests_in_module_dict(remote_globs, start_method, multiprocessing.set_start_method(old_start_method[0], force=True) # pause a bit so we don't get warning about dangling threads/processes - # TODO: RUSTPYTHON: Filter out stopped processes since gc.collect() is a no-op - processes = {p for p in multiprocessing.process._dangling if p.is_alive()} - {p for p in dangling[0] if p.is_alive()} + processes = set(multiprocessing.process._dangling) - set(dangling[0]) if processes: need_sleep = True test.support.environment_altered = True support.print_warning(f'Dangling processes: {processes}') processes = None - # TODO: RUSTPYTHON: Filter out stopped threads since gc.collect() is a no-op - threads = {t for t in threading._dangling if t.is_alive()} - {t for t in dangling[1] if t.is_alive()} + threads = set(threading._dangling) - set(dangling[1]) if threads: need_sleep = True test.support.environment_altered = True diff --git a/Lib/test/mp_preload_large_sysargv.py b/Lib/test/mp_preload_large_sysargv.py new file mode 100644 index 000000000..790fcd76e --- /dev/null +++ b/Lib/test/mp_preload_large_sysargv.py @@ -0,0 +1,30 @@ +# gh-144503: Test that the forkserver can start when the parent process has +# a very large sys.argv. Prior to the fix, sys.argv was repr'd into the +# forkserver ``-c`` command string which could exceed the OS limit on the +# length of a single argv element (MAX_ARG_STRLEN on Linux, ~128 KiB), +# causing posix_spawn to fail and the parent to see a BrokenPipeError. + +import multiprocessing +import sys + +EXPECTED_LEN = 5002 # argv[0] + 5000 padding entries + sentinel + + +def fun(): + print(f"worker:{len(sys.argv)}:{sys.argv[-1]}") + + +if __name__ == "__main__": + # Inflate sys.argv well past 128 KiB before the forkserver is started. + sys.argv[1:] = ["x" * 50] * 5000 + ["sentinel"] + assert len(sys.argv) == EXPECTED_LEN + + ctx = multiprocessing.get_context("forkserver") + p = ctx.Process(target=fun) + p.start() + p.join() + sys.exit(p.exitcode) +else: + # This branch runs when the forkserver preloads this module as + # __mp_main__; confirm the large argv was propagated intact. + print(f"preload:{len(sys.argv)}:{sys.argv[-1]}") diff --git a/Lib/test/mp_preload_sysargv.py b/Lib/test/mp_preload_sysargv.py new file mode 100644 index 000000000..5ad38cda8 --- /dev/null +++ b/Lib/test/mp_preload_sysargv.py @@ -0,0 +1,22 @@ +# gh-143706: Test that sys.argv is correctly set during main module import +# when using forkserver with __main__ preloading. + +import multiprocessing +import sys + +# This will be printed during module import - sys.argv should be correct here +print(f"module:{sys.argv[1:]}") + +def fun(): + # This will be printed when the function is called + print(f"fun:{sys.argv[1:]}") + +if __name__ == "__main__": + ctx = multiprocessing.get_context("forkserver") + ctx.set_forkserver_preload(['__main__']) + + fun() + + p = ctx.Process(target=fun) + p.start() + p.join() diff --git a/Lib/test/test_multiprocessing_fork/test_processes.py b/Lib/test/test_multiprocessing_fork/test_processes.py index 987d5d7e3..e64e9afc0 100644 --- a/Lib/test/test_multiprocessing_fork/test_processes.py +++ b/Lib/test/test_multiprocessing_fork/test_processes.py @@ -3,6 +3,5 @@ from test._test_multiprocessing import install_tests_in_module_dict install_tests_in_module_dict(globals(), 'fork', only_type="processes") - if __name__ == '__main__': unittest.main() diff --git a/crates/stdlib/src/_queue.rs b/crates/stdlib/src/_queue.rs new file mode 100644 index 000000000..65456bd35 --- /dev/null +++ b/crates/stdlib/src/_queue.rs @@ -0,0 +1,309 @@ +pub(crate) use _queue::module_def; + +#[pymodule] +mod _queue { + use alloc::collections::VecDeque; + use core::time::Duration; + use std::time::Instant; + + use crate::vm::{ + AsObject, Py, PyObject, PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine, + builtins::{PyBaseExceptionRef, PyException, PyGenericAlias, PyStr, PyType, PyTypeRef}, + function::{PyComparisonValue, TimeoutSeconds}, + protocol::PyNumberMethods, + types::{AsNumber, Comparable, Constructor, PyComparisonOp, Representable}, + }; + + type BufInner = VecDeque; + + cfg_select! { + feature = "threading" => { + use parking_lot::{Condvar, Mutex, MutexGuard}; + + type Buf = Mutex; + }, + _ => { + use crate::common::lock::PyMutex; + + type Buf = PyMutex; + } + } + + const INITIAL_RING_BUF_CAPACITY: usize = 8; + + #[pyattr] + #[pyclass(module = "_queue", name = "Empty", base = PyException)] + #[repr(transparent)] + pub(crate) struct PyEmptyError(PyException); + + #[pyclass(flags(HAS_WEAKREF))] + impl PyEmptyError {} + + /// ## See Also + /// + /// [`empty_error`](https://github.com/python/cpython/blob/v3.14.5/Modules/_queuemodule.c#L347-L355). + fn empty_error(vm: &VirtualMachine) -> PyBaseExceptionRef { + vm.new_exception_empty(PyEmptyError::class(&vm.ctx).to_owned()) + } + + #[cfg(feature = "threading")] + #[derive(Debug)] + struct Semaphore { + mutex: Mutex, + cond: Condvar, + } + + #[cfg(feature = "threading")] + impl Semaphore { + #[must_use] + fn new() -> Self { + Self { + mutex: Mutex::new(0), + cond: Condvar::new(), + } + } + + fn release(&self) { + { + let mut count = self.mutex.lock(); + *count += 1; + } // lock dropped. now we can notify a waiting thread + + self.cond.notify_one(); + } + + /// Returns `true` if the semaphore was acquired, `false` on timeout. + #[must_use] + fn acquire(&self, block: bool, deadline: Option, vm: &VirtualMachine) -> bool { + let mut count = self.mutex.lock(); + loop { + if *count > 0 { + *count -= 1; + return true; + } + + if !block { + return false; + } + + match deadline { + Some(dl) => { + let result = vm.allow_threads(|| self.cond.wait_until(&mut count, dl)); + if result.timed_out() && *count == 0 { + return false; + } + } + None => { + vm.allow_threads(|| self.cond.wait(&mut count)); + } + } + } + } + } + + #[pyattr] + #[pyclass(module = "_queue", name = "SimpleQueue", unhashable = true)] + #[derive(Debug, PyPayload)] + struct PySimpleQueue { + buf: Buf, + #[cfg(feature = "threading")] + sem: Semaphore, + } + + impl Default for PySimpleQueue { + fn default() -> Self { + Self { + buf: Buf::new(VecDeque::with_capacity(INITIAL_RING_BUF_CAPACITY)), + #[cfg(feature = "threading")] + sem: Semaphore::new(), + } + } + } + + impl PySimpleQueue { + fn push(&self, item: PyObjectRef) { + self.buf.lock().push_back(item); + + #[cfg(feature = "threading")] + self.sem.release(); + } + + /// Returns a strong reference from the head of the buffer. + /// + /// ## See Also + /// + /// [`RingBuf_Get`](https://github.com/python/cpython/blob/v3.14.5/Modules/_queuemodule.c#L133-L154). + fn get_inner( + #[cfg(feature = "threading")] buf: &mut MutexGuard<'_, BufInner>, + #[cfg(not(feature = "threading"))] buf: &mut BufInner, + ) -> Option { + let cap = buf.capacity(); + + if buf.len() < (cap / 4) { + // Items is less than 25% occupied, shrink it by 50%. This allows for + // growth without immediately needing to resize the underlying items array + buf.shrink_to(cap / 2) + } + + buf.pop_front() + } + } + + #[derive(FromArgs)] + struct PutArgs { + #[pyarg(positional)] + item: PyObjectRef, + #[expect( + dead_code, + reason = "Intentional. Provide compatibility with the Queue class" + )] + #[pyarg(any, optional, default = true)] + block: bool, + #[expect( + dead_code, + reason = "Intentional. Provide compatibility with the Queue class" + )] + #[pyarg(any, optional)] + timeout: Option, + } + + #[derive(FromArgs)] + struct GetArgs { + #[pyarg(any, optional, default = true)] + block: bool, + #[pyarg(any, optional)] + timeout: Option, + } + + #[pyclass( + with(Constructor, Comparable, Representable), + flags(BASETYPE, HAS_WEAKREF, IMMUTABLETYPE) + )] + impl PySimpleQueue { + #[pymethod] + fn empty(&self) -> bool { + self.buf.lock().is_empty() + } + + #[pymethod] + fn qsize(&self) -> usize { + self.buf.lock().len() + } + + #[pymethod] + fn put(&self, args: PutArgs) { + let PutArgs { item, .. } = args; + self.push(item); + } + + #[pymethod] + fn put_nowait(&self, item: PyObjectRef) { + self.push(item); + } + + #[pymethod] + fn get(&self, args: GetArgs, vm: &VirtualMachine) -> PyResult { + let GetArgs { block, timeout } = args; + + // Non-blocking: just try once + if !block { + return Self::get_inner(&mut self.buf.lock()).ok_or_else(|| empty_error(vm)); + } + + #[cfg_attr( + not(feature = "threading"), + expect( + unused_variables, + reason = "We are still validating the 'timeout' arg even if we don't have threading" + ) + )] + let deadline = match timeout.map(|v| v.to_secs_f64()) { + Some(v) if v < 0.0 => { + return Err(vm.new_value_error("'timeout' must be a non-negative number")); + } + Some(v) => Some(Instant::now() + Duration::from_secs_f64(v)), + None => None, + }; + + #[cfg(feature = "threading")] + { + if !self.sem.acquire(block, deadline, vm) { + return Err(empty_error(vm)); + } + } + + Self::get_inner(&mut self.buf.lock()).ok_or_else(|| empty_error(vm)) + } + + #[pymethod] + fn get_nowait(&self, vm: &VirtualMachine) -> PyResult { + #[cfg(feature = "threading")] + { + if !self.sem.acquire(false, None, vm) { + return Err(empty_error(vm)); + } + } + + Self::get_inner(&mut self.buf.lock()).ok_or_else(|| empty_error(vm)) + } + + #[pyclassmethod] + fn __class_getitem__( + cls: PyTypeRef, + args: PyObjectRef, + vm: &VirtualMachine, + ) -> PyGenericAlias { + PyGenericAlias::from_args(cls, args, vm) + } + } + + impl Constructor for PySimpleQueue { + type Args = (); + + fn py_new(_cls: &Py, _args: Self::Args, _vm: &VirtualMachine) -> PyResult { + Ok(Self::default()) + } + } + + impl AsNumber for PySimpleQueue { + fn as_number() -> &'static PyNumberMethods { + static AS_NUMBER: PyNumberMethods = PyNumberMethods { + boolean: Some(|number, _vm| { + let zelf = number.obj.downcast_ref::().unwrap(); + Ok(!zelf.buf.lock().is_empty()) + }), + ..PyNumberMethods::NOT_IMPLEMENTED + }; + &AS_NUMBER + } + } + + impl Comparable for PySimpleQueue { + fn cmp( + zelf: &Py, + other: &PyObject, + op: PyComparisonOp, + _vm: &VirtualMachine, + ) -> PyResult { + Ok(if let Some(res) = op.identical_optimization(zelf, other) { + res.into() + } else { + PyComparisonValue::NotImplemented + }) + } + } + + impl Representable for PySimpleQueue { + fn repr(zelf: &Py, vm: &VirtualMachine) -> PyResult> { + Ok(vm.ctx.new_str(format!( + "<{} at {:#x}>", + Self::class(&vm.ctx).slot_name(), + zelf.get_id() + ))) + } + + fn repr_str(_zelf: &Py, _vm: &VirtualMachine) -> PyResult { + unreachable!("repr() is overridden directly") + } + } +} diff --git a/crates/stdlib/src/lib.rs b/crates/stdlib/src/lib.rs index b1ae53af8..119307874 100644 --- a/crates/stdlib/src/lib.rs +++ b/crates/stdlib/src/lib.rs @@ -53,6 +53,7 @@ mod math; #[cfg(all(feature = "host_env", any(unix, windows)))] mod mmap; +mod _queue; mod pyexpat; mod pystruct; mod random; @@ -225,6 +226,7 @@ pub fn stdlib_module_defs(ctx: &Context) -> Vec<&'static builtins::PyModuleDef> posixshmem::module_def(ctx), pyexpat::module_def(ctx), pystruct::module_def(ctx), + _queue::module_def(ctx), random::module_def(ctx), #[cfg(all(feature = "host_env", unix, not(target_os = "redox")))] resource::module_def(ctx), From d7e3ec4978a38c7a4d721693f5c01050589a4633 Mon Sep 17 00:00:00 2001 From: Bas Schoenmaeckers <7943856+bschoenmaeckers@users.noreply.github.com> Date: Mon, 1 Jun 2026 17:35:43 +0200 Subject: [PATCH 003/339] Add `set` object functions to c-api (#8002) --- Cargo.lock | 1 + crates/capi/Cargo.toml | 1 + crates/capi/src/lib.rs | 1 + crates/capi/src/setobject.rs | 162 ++++++++++++++++++++++++++++++++++ crates/vm/src/builtins/set.rs | 10 +-- 5 files changed, 170 insertions(+), 5 deletions(-) create mode 100644 crates/capi/src/setobject.rs diff --git a/Cargo.lock b/Cargo.lock index d632ce7f7..e388302e4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3479,6 +3479,7 @@ name = "rustpython-capi" version = "0.5.0" dependencies = [ "bitflags 2.11.1", + "itertools 0.14.0", "num-complex", "pyo3", "rustpython-stdlib", diff --git a/crates/capi/Cargo.toml b/crates/capi/Cargo.toml index 685b44d1e..70b7fc4b8 100644 --- a/crates/capi/Cargo.toml +++ b/crates/capi/Cargo.toml @@ -13,6 +13,7 @@ crate-type = ["cdylib", "rlib"] [dependencies] bitflags = { workspace = true } +itertools = { workspace = true } num-complex = { workspace = true } rustpython-vm = { workspace = true, features = ["threading", "compiler"] } rustpython-stdlib = {workspace = true, features = ["threading"] } diff --git a/crates/capi/src/lib.rs b/crates/capi/src/lib.rs index d7f9f8b74..a2bc31b17 100644 --- a/crates/capi/src/lib.rs +++ b/crates/capi/src/lib.rs @@ -25,6 +25,7 @@ pub mod pyerrors; pub mod pylifecycle; pub mod pystate; pub mod refcount; +pub mod setobject; pub mod traceback; pub mod tupleobject; pub mod unicodeobject; diff --git a/crates/capi/src/setobject.rs b/crates/capi/src/setobject.rs new file mode 100644 index 000000000..cc479371b --- /dev/null +++ b/crates/capi/src/setobject.rs @@ -0,0 +1,162 @@ +use crate::PyObject; +use crate::object::define_py_check; +use crate::pystate::with_vm; +use core::ffi::c_int; +use itertools::process_results; +use rustpython_vm::AsObject; +use rustpython_vm::PyPayload; +use rustpython_vm::TryFromObject; +use rustpython_vm::builtins::{PyFrozenSet, PySet}; +use rustpython_vm::function::ArgIterable; + +define_py_check!(fn PySet_Check, types.set_type); +define_py_check!(fn PyFrozenSet_Check, types.frozenset_type); + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PySet_New(iterable: *mut PyObject) -> *mut PyObject { + with_vm(|vm| { + if iterable.is_null() { + return Ok(PySet::default().into_ref(&vm.ctx)); + } + + let iterable = ArgIterable::try_from_object(vm, unsafe { &*iterable }.to_owned())?; + let set = PySet::default().into_ref(&vm.ctx); + for item in iterable.iter(vm)? { + set.add(item?, vm)?; + } + Ok(set) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyFrozenSet_New(iterable: *mut PyObject) -> *mut PyObject { + with_vm(|vm| { + if iterable.is_null() { + return Ok(vm.ctx.empty_frozenset.to_owned()); + } + + let iterable = ArgIterable::try_from_object(vm, unsafe { &*iterable }.to_owned())?; + let set = process_results(iterable.iter(vm)?, |it| PyFrozenSet::from_iter(vm, it))??; + Ok(set.into_ref(&vm.ctx)) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PySet_Add(set: *mut PyObject, key: *mut PyObject) -> c_int { + with_vm(|vm| { + let set = unsafe { &*set }.try_downcast_ref::(vm)?; + let key = unsafe { &*key }.to_owned(); + set.add(key, vm) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PySet_Clear(set: *mut PyObject) -> c_int { + with_vm(|vm| { + let set = unsafe { &*set }.try_downcast_ref::(vm)?; + set.clear(); + Ok(()) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PySet_Contains(anyset: *mut PyObject, key: *mut PyObject) -> c_int { + with_vm(|vm| { + let anyset = unsafe { &*anyset }; + let key = unsafe { &*key }; + + if let Some(set) = anyset.downcast_ref::() { + set.__contains__(key, vm) + } else if let Some(frozenset) = anyset.downcast_ref::() { + frozenset.__contains__(key, vm) + } else { + Err(vm.new_type_error(format!( + "expected set or frozenset, got '{}'", + anyset.class().name() + ))) + } + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PySet_Discard(set: *mut PyObject, key: *mut PyObject) -> c_int { + with_vm(|vm| { + let set = unsafe { &*set }.try_downcast_ref::(vm)?; + let key = unsafe { &*key }; + let had_item = set.__contains__(key, vm)?; + if had_item { + set.discard(key.to_owned(), vm)?; + } + Ok(had_item) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PySet_Pop(set: *mut PyObject) -> *mut PyObject { + with_vm(|vm| { + let set = unsafe { &*set }.try_downcast_ref::(vm)?; + set.pop(vm) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PySet_Size(anyset: *mut PyObject) -> isize { + with_vm(|vm| { + let anyset = unsafe { &*anyset }; + if let Some(set) = anyset.downcast_ref::() { + set.as_object().length(vm) + } else if let Some(frozenset) = anyset.downcast_ref::() { + frozenset.as_object().length(vm) + } else { + Err(vm.new_type_error(format!( + "expected set or frozenset, got '{}'", + anyset.class().name() + ))) + } + }) +} + +#[cfg(false)] +mod tests { + use pyo3::prelude::*; + use pyo3::types::{PyFrozenSet, PyInt, PySet}; + + #[test] + fn new_and_size() { + Python::attach(|py| { + let set = PySet::empty(py).unwrap(); + assert!(set.is_instance_of::()); + assert_eq!(set.len(), 0); + + let frozen = PyFrozenSet::empty(py).unwrap(); + assert!(frozen.is_instance_of::()); + assert_eq!(frozen.len(), 0); + }) + } + + #[test] + fn add_contains_discard() { + Python::attach(|py| { + let set = PySet::empty(py).unwrap(); + let item = PyInt::new(py, 42); + + set.add(&item).unwrap(); + assert!(set.contains(&item).unwrap()); + set.discard(&item).unwrap(); + assert!(!set.contains(&item).unwrap()); + }) + } + + #[test] + fn pop_reduces_size() { + Python::attach(|py| { + let set = PySet::empty(py).unwrap(); + set.add(7).unwrap(); + assert_eq!(set.len(), 1); + + let popped = set.pop().unwrap(); + assert_eq!(popped.extract::().unwrap(), 7); + assert_eq!(set.len(), 0); + }) + } +} diff --git a/crates/vm/src/builtins/set.rs b/crates/vm/src/builtins/set.rs index f730049ff..136470c18 100644 --- a/crates/vm/src/builtins/set.rs +++ b/crates/vm/src/builtins/set.rs @@ -537,7 +537,7 @@ impl PySet { self.inner.len() } - fn __contains__(&self, needle: &PyObject, vm: &VirtualMachine) -> PyResult { + pub fn __contains__(&self, needle: &PyObject, vm: &VirtualMachine) -> PyResult { self.inner.contains(needle, vm) } @@ -679,17 +679,17 @@ impl PySet { } #[pymethod] - fn discard(&self, item: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> { + pub fn discard(&self, item: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> { self.inner.discard(&item, vm).map(|_| ()) } #[pymethod] - fn clear(&self) { + pub fn clear(&self) { self.inner.clear() } #[pymethod] - fn pop(&self, vm: &VirtualMachine) -> PyResult { + pub fn pop(&self, vm: &VirtualMachine) -> PyResult { self.inner.pop(vm) } @@ -995,7 +995,7 @@ impl PyFrozenSet { self.inner.len() } - fn __contains__(&self, needle: &PyObject, vm: &VirtualMachine) -> PyResult { + pub fn __contains__(&self, needle: &PyObject, vm: &VirtualMachine) -> PyResult { self.inner.contains(needle, vm) } From 8af0f8ab7b1e33ce6f7981758001321286fd3349 Mon Sep 17 00:00:00 2001 From: Bas Schoenmaeckers <7943856+bschoenmaeckers@users.noreply.github.com> Date: Tue, 2 Jun 2026 08:20:45 +0200 Subject: [PATCH 004/339] Add mapping c-api functions (#8003) --- crates/capi/src/abstract_.rs | 3 ++ crates/capi/src/abstract_/mapping.rs | 66 ++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 crates/capi/src/abstract_/mapping.rs diff --git a/crates/capi/src/abstract_.rs b/crates/capi/src/abstract_.rs index 3c109cd1e..b88a76376 100644 --- a/crates/capi/src/abstract_.rs +++ b/crates/capi/src/abstract_.rs @@ -1,10 +1,13 @@ use crate::{PyObject, pystate::with_vm}; use alloc::slice; use core::ffi::c_int; +pub use mapping::*; use rustpython_vm::builtins::{PyDict, PyStr, PyTuple}; use rustpython_vm::function::{FuncArgs, KwArgs, PosArgs}; use rustpython_vm::{AsObject, Py, PyObjectRef, PyResult, VirtualMachine}; +mod mapping; + const PY_VECTORCALL_ARGUMENTS_OFFSET: usize = 1usize << (usize::BITS as usize - 1); fn tuple_to_args(tuple: &Py) -> PosArgs { diff --git a/crates/capi/src/abstract_/mapping.rs b/crates/capi/src/abstract_/mapping.rs new file mode 100644 index 000000000..18b188613 --- /dev/null +++ b/crates/capi/src/abstract_/mapping.rs @@ -0,0 +1,66 @@ +use crate::{PyObject, pystate::with_vm}; +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyMapping_Size(obj: *mut PyObject) -> isize { + with_vm(|vm| { + let obj = unsafe { &*obj }; + obj.try_mapping(vm)?.length(vm) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyMapping_Keys(obj: *mut PyObject) -> *mut PyObject { + with_vm(|vm| { + let obj = unsafe { &*obj }; + let keys = obj.try_mapping(vm)?.keys(vm)?; + let iter = keys.get_iter(vm)?; + Ok(vm.ctx.new_list(iter.try_to_value(vm)?)) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyMapping_Values(obj: *mut PyObject) -> *mut PyObject { + with_vm(|vm| { + let obj = unsafe { &*obj }; + let values = obj.try_mapping(vm)?.values(vm)?; + let iter = values.get_iter(vm)?; + Ok(vm.ctx.new_list(iter.try_to_value(vm)?)) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyMapping_Items(obj: *mut PyObject) -> *mut PyObject { + with_vm(|vm| { + let obj = unsafe { &*obj }; + let items = obj.try_mapping(vm)?.items(vm)?; + let iter = items.get_iter(vm)?; + Ok(vm.ctx.new_list(iter.try_to_value(vm)?)) + }) +} + +#[cfg(false)] +mod tests { + use pyo3::prelude::*; + use pyo3::types::{PyDict, PyMapping, PyMappingMethods, PyTuple}; + + #[test] + fn size_keys_values_items() { + Python::attach(|py| { + let dict = PyDict::new(py); + dict.set_item("a", 1).unwrap(); + dict.set_item("b", 2).unwrap(); + let mapping = dict.cast_into::().unwrap(); + + assert_eq!(mapping.len().unwrap(), 2); + + let keys = mapping.keys().unwrap(); + assert_eq!(keys.len(), 2); + + let values = mapping.values().unwrap(); + assert_eq!(values.len(), 2); + + let items = mapping.items().unwrap(); + assert_eq!(items.len(), 2); + assert!(items.iter().all(|item| item.cast_into::().is_ok())); + }) + } +} From d411a2b9d0cfbc59764ccc32f0396e823a94e0df Mon Sep 17 00:00:00 2001 From: Bas Schoenmaeckers <7943856+bschoenmaeckers@users.noreply.github.com> Date: Tue, 2 Jun 2026 08:31:21 +0200 Subject: [PATCH 005/339] Add weakref support to c-api (#8006) --- crates/capi/src/lib.rs | 1 + crates/capi/src/weakrefobject.rs | 106 ++++++++++++++++++++++++++++ crates/vm/src/builtins/weakproxy.rs | 37 ++++++++-- 3 files changed, 137 insertions(+), 7 deletions(-) create mode 100644 crates/capi/src/weakrefobject.rs diff --git a/crates/capi/src/lib.rs b/crates/capi/src/lib.rs index a2bc31b17..2daee1f26 100644 --- a/crates/capi/src/lib.rs +++ b/crates/capi/src/lib.rs @@ -30,6 +30,7 @@ pub mod traceback; pub mod tupleobject; pub mod unicodeobject; mod util; +pub mod weakrefobject; /// Get main interpreter of this process. Will be None if it has not been initialized yet. pub fn get_main_interpreter() -> MutexGuard<'static, Option> { diff --git a/crates/capi/src/weakrefobject.rs b/crates/capi/src/weakrefobject.rs new file mode 100644 index 000000000..706de84b5 --- /dev/null +++ b/crates/capi/src/weakrefobject.rs @@ -0,0 +1,106 @@ +use crate::PyObject; +use crate::object::define_py_check; +use crate::pystate::with_vm; +use core::ffi::c_int; +use rustpython_vm::builtins::{PyWeak, PyWeakProxy}; + +define_py_check!(fn PyWeakref_CheckProxy, types.weakproxy_type); +define_py_check!(fn PyWeakref_CheckRef, types.weakref_type); + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyWeakref_GetRef( + reference: *mut PyObject, + result: *mut *mut PyObject, +) -> c_int { + with_vm(|vm| { + unsafe { + *result = core::ptr::null_mut(); + } + + let reference = unsafe { &*reference }; + let upgraded = if let Some(weak) = reference.downcast_ref::() { + weak.upgrade() + } else if let Some(proxy) = reference.downcast_ref::() { + proxy.get_weak().upgrade() + } else { + return Err(vm.new_type_error("expected a weakref")); + }; + + if let Some(obj) = upgraded { + unsafe { + *result = obj.into_raw().as_ptr(); + } + Ok(true) + } else { + Ok(false) + } + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyWeakref_NewProxy( + ob: *mut PyObject, + callback: *mut PyObject, +) -> *mut PyObject { + with_vm(|vm| { + let ob = unsafe { &*ob }; + let callback = unsafe { callback.as_ref() } + .filter(|callback| !vm.is_none(callback)) + .map(ToOwned::to_owned); + PyWeakProxy::new_weakproxy(ob, callback, vm) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyWeakref_NewRef( + ob: *mut PyObject, + callback: *mut PyObject, +) -> *mut PyObject { + with_vm(|vm| { + let ob = unsafe { &*ob }; + let callback = unsafe { callback.as_ref() } + .filter(|callback| !vm.is_none(callback)) + .map(ToOwned::to_owned); + ob.downgrade(callback, vm) + }) +} + +#[cfg(false)] +mod tests { + use pyo3::prelude::*; + use pyo3::types::PyAnyMethods; + use pyo3::types::{PyInt, PyWeakrefMethods, PyWeakrefProxy, PyWeakrefReference}; + + #[test] + fn check_ref_and_proxy() { + Python::attach(|py| { + let object_ty = py.get_type::(); + + let weak_ref = PyWeakrefReference::new(&object_ty).unwrap(); + let weak_proxy = PyWeakrefProxy::new(&object_ty).unwrap(); + + assert!(weak_ref.is_instance_of::()); + assert!(weak_proxy.is_instance_of::()); + }); + } + + #[test] + fn new_ref_and_get_ref() { + Python::attach(|py| { + let object_ty = py.get_type::(); + let weak_ref = PyWeakrefReference::new(&object_ty).unwrap(); + + assert!(weak_ref.upgrade().is_some_and(|obj| obj.is(&object_ty))); + }); + } + + #[test] + fn new_proxy() { + Python::attach(|py| { + let object_ty = py.get_type::(); + let weak_proxy = PyWeakrefProxy::new(&object_ty).unwrap(); + + assert!(weak_proxy.upgrade().is_some_and(|obj| obj.is(&object_ty))); + }); + } +} diff --git a/crates/vm/src/builtins/weakproxy.rs b/crates/vm/src/builtins/weakproxy.rs index 077e8c349..1bdd7721f 100644 --- a/crates/vm/src/builtins/weakproxy.rs +++ b/crates/vm/src/builtins/weakproxy.rs @@ -42,6 +42,22 @@ impl Constructor for PyWeakProxy { Self::Args { referent, callback }: Self::Args, vm: &VirtualMachine, ) -> PyResult { + let weak = Self::new_weak(referent.as_ref(), callback.into_option(), vm)?; + // TODO: PyWeakProxy should use the same payload as PyWeak + Ok(Self { weak }) + } +} + +crate::common::static_cell! { + static WEAK_SUBCLASS: PyTypeRef; +} + +impl PyWeakProxy { + fn new_weak( + referent: &PyObject, + callback: Option, + vm: &VirtualMachine, + ) -> PyResult> { // using an internal subclass as the class prevents us from getting the generic weakref, // which would mess up the weakref count let weak_cls = WEAK_SUBCLASS.get_or_init(|| { @@ -52,15 +68,22 @@ impl Constructor for PyWeakProxy { super::PyWeak::make_slots(), ) }); - // TODO: PyWeakProxy should use the same payload as PyWeak - Ok(Self { - weak: referent.downgrade_with_typ(callback.into_option(), weak_cls.clone(), vm)?, - }) + referent.downgrade_with_typ(callback, weak_cls.clone(), vm) } -} -crate::common::static_cell! { - static WEAK_SUBCLASS: PyTypeRef; + pub fn new_weakproxy( + referent: &PyObject, + callback: Option, + vm: &VirtualMachine, + ) -> PyResult> { + let weak = Self::new_weak(referent, callback, vm)?; + Ok(Self { weak }.into_ref(&vm.ctx)) + } + + #[must_use] + pub fn get_weak(&self) -> &PyRef { + &self.weak + } } #[pyclass(with( From d58fc9e42e7e20b19380398eea5b999f9d26c7f2 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Tue, 2 Jun 2026 09:42:33 +0300 Subject: [PATCH 006/339] CI: Don't skip windows tests (#8004) --- .github/workflows/ci.yaml | 6 +----- Lib/test/test_venv.py | 13 +++++++++++++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 30c5b5409..3ff74e6a5 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -310,11 +310,7 @@ jobs: extra_test_args: [] # TODO: Enable '-u all' env_polluting_tests: - test_set - skips: - - test_rlcompleter - - test_pathlib # panic by surrogate chars - - test_posixpath # OSError: (22, 'The filename, directory name, or volume label syntax is incorrect. (os error 123)') - - test_venv # couple of failing tests + skips: [] timeout: 50 fail-fast: false steps: diff --git a/Lib/test/test_venv.py b/Lib/test/test_venv.py index fc63af622..e1eaa2f94 100644 --- a/Lib/test/test_venv.py +++ b/Lib/test/test_venv.py @@ -266,6 +266,7 @@ class BasicTest(BaseTest): with patch('venv.subprocess.check_output', pip_cmd_checker): builder.upgrade_dependencies(fake_context) + @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON") @requireVenvCreate def test_prefixes(self): """ @@ -285,6 +286,7 @@ class BasicTest(BaseTest): self.assertEqual(pathlib.Path(out.strip().decode()), pathlib.Path(expected), prefix) + @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON") @requireVenvCreate def test_sysconfig(self): """ @@ -318,6 +320,7 @@ class BasicTest(BaseTest): out, err = check_output(cmd, encoding='utf-8') self.assertEqual(out.strip(), expected, err) + @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON") @requireVenvCreate @unittest.skipUnless(can_symlink(), 'Needs symlinks') def test_sysconfig_symlinks(self): @@ -458,6 +461,7 @@ class BasicTest(BaseTest): data = self.get_text_file_contents('pyvenv.cfg') self.assertIn('include-system-site-packages = %s\n' % s, data) + @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON") @unittest.skipUnless(can_symlink(), 'Needs symlinks') def test_symlinking(self): """ @@ -482,6 +486,7 @@ class BasicTest(BaseTest): # run the test, the pyvenv.cfg in the venv created in the test will # point to the venv being used to run the test, and we lose the link # to the source build - so Python can't initialise properly. + @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON") @requireVenvCreate def test_executable(self): """ @@ -494,6 +499,7 @@ class BasicTest(BaseTest): 'import sys; print(sys.executable)']) self.assertEqual(out.strip(), envpy.encode()) + @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON") @unittest.skipUnless(can_symlink(), 'Needs symlinks') def test_executable_symlinks(self): """ @@ -562,6 +568,7 @@ class BasicTest(BaseTest): self.assertEndsWith(lines[1], env_name.encode()) # gh-124651: test quoted strings on Windows + @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON") @unittest.skipUnless(os.name == 'nt', 'only relevant on Windows') def test_special_chars_windows(self): """ @@ -585,6 +592,7 @@ class BasicTest(BaseTest): self.assertTrue(env_name.encode() in lines[0]) self.assertEndsWith(lines[1], env_name.encode()) + @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON") @unittest.skipUnless(os.name == 'nt', 'only relevant on Windows') def test_unicode_in_batch_file(self): """ @@ -616,6 +624,7 @@ class BasicTest(BaseTest): filepath_regex = r"'[A-Z]:\\\\(?:[^\\\\]+\\\\)*[^\\\\]+'" self.assertRegex(err, rf"Unable to symlink {filepath_regex} to {filepath_regex}") + @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON") @requireVenvCreate def test_multiprocessing(self): """ @@ -635,6 +644,7 @@ class BasicTest(BaseTest): 'pool.terminate()']) self.assertEqual(out.strip(), "python".encode()) + @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON") @requireVenvCreate def test_multiprocessing_recursion(self): """ @@ -892,6 +902,7 @@ class BasicTest(BaseTest): self.assertFalse(same_path(path1, path2)) # gh-126084: venvwlauncher should run pythonw, not python + @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON") @requireVenvCreate @unittest.skipUnless(os.name == 'nt', 'only relevant on Windows') def test_venvwlauncher(self): @@ -926,11 +937,13 @@ class EnsurePipTest(BaseTest): self.assertEqual(out.strip(), "OK") + @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON") def test_no_pip_by_default(self): rmtree(self.env_dir) self.run_with_capture(venv.create, self.env_dir) self.assert_pip_not_installed() + @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON") def test_explicit_no_pip(self): rmtree(self.env_dir) self.run_with_capture(venv.create, self.env_dir, with_pip=False) From 6eae1dde6c6864bedd9f66a2d213f9af476edaf2 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Tue, 2 Jun 2026 12:00:54 +0300 Subject: [PATCH 007/339] Update some tests to 3.14.5 (#7991) --- Lib/test/test_android.py | 114 ++++++----- Lib/test/test_binascii.py | 9 + Lib/test/test_builtin.py | 27 ++- Lib/test/test_defaultdict.py | 15 ++ Lib/test/test_mmap.py | 385 ++++++++++++++++++++++++++++++++--- Lib/test/test_posix.py | 20 ++ Lib/test/test_uuid.py | 84 ++++++-- Lib/uuid.py | 10 +- 8 files changed, 560 insertions(+), 104 deletions(-) diff --git a/Lib/test/test_android.py b/Lib/test/test_android.py index 076190f75..31daafbc3 100644 --- a/Lib/test/test_android.py +++ b/Lib/test/test_android.py @@ -1,5 +1,4 @@ import io -import platform import queue import re import subprocess @@ -17,17 +16,11 @@ from unittest.mock import patch if sys.platform != "android": raise unittest.SkipTest("Android-specific") -api_level = platform.android_ver().api_level - # (name, level, fileno) STREAM_INFO = [("stdout", "I", 1), ("stderr", "W", 2)] # Test redirection of stdout and stderr to the Android log. -@unittest.skipIf( - api_level < 23 and platform.machine() == "aarch64", - "SELinux blocks reading logs on older ARM64 emulators" -) class TestAndroidOutput(unittest.TestCase): maxDiff = None @@ -42,31 +35,41 @@ class TestAndroidOutput(unittest.TestCase): for line in self.logcat_process.stdout: self.logcat_queue.put(line.rstrip("\n")) self.logcat_process.stdout.close() + self.logcat_thread = Thread(target=logcat_thread) self.logcat_thread.start() - from ctypes import CDLL, c_char_p, c_int - android_log_write = getattr(CDLL("liblog.so"), "__android_log_write") - android_log_write.argtypes = (c_int, c_char_p, c_char_p) - ANDROID_LOG_INFO = 4 + try: + from ctypes import CDLL, c_char_p, c_int + android_log_write = getattr(CDLL("liblog.so"), "__android_log_write") + android_log_write.argtypes = (c_int, c_char_p, c_char_p) + ANDROID_LOG_INFO = 4 - # Separate tests using a marker line with a different tag. - tag, message = "python.test", f"{self.id()} {time()}" - android_log_write( - ANDROID_LOG_INFO, tag.encode("UTF-8"), message.encode("UTF-8")) - self.assert_log("I", tag, message, skip=True, timeout=5) + # Separate tests using a marker line with a different tag. + tag, message = "python.test", f"{self.id()} {time()}" + android_log_write( + ANDROID_LOG_INFO, tag.encode("UTF-8"), message.encode("UTF-8")) + self.assert_log("I", tag, message, skip=True) + except: + # If setUp throws an exception, tearDown is not automatically + # called. Avoid leaving a dangling thread which would keep the + # Python process alive indefinitely. + self.tearDown() + raise def assert_logs(self, level, tag, expected, **kwargs): for line in expected: self.assert_log(level, tag, line, **kwargs) - def assert_log(self, level, tag, expected, *, skip=False, timeout=0.5): - deadline = time() + timeout + def assert_log(self, level, tag, expected, *, skip=False): + deadline = time() + LOOPBACK_TIMEOUT while True: try: line = self.logcat_queue.get(timeout=(deadline - time())) except queue.Empty: - self.fail(f"line not found: {expected!r}") + raise self.failureException( + f"line not found: {expected!r}" + ) from None if match := re.fullmatch(fr"(.)/{tag}: (.*)", line): try: self.assertEqual(level, match[1]) @@ -81,35 +84,42 @@ class TestAndroidOutput(unittest.TestCase): self.logcat_process.wait(LOOPBACK_TIMEOUT) self.logcat_thread.join(LOOPBACK_TIMEOUT) + # Avoid an irrelevant warning about threading._dangling. + self.logcat_thread = None + @contextmanager - def unbuffered(self, stream): - stream.reconfigure(write_through=True) + def reconfigure(self, stream, **settings): + original_settings = {key: getattr(stream, key, None) for key in settings.keys()} + stream.reconfigure(**settings) try: yield finally: - stream.reconfigure(write_through=False) + stream.reconfigure(**original_settings) - # In --verbose3 mode, sys.stdout and sys.stderr are captured, so we can't - # test them directly. Detect this mode and use some temporary streams with - # the same properties. def stream_context(self, stream_name, level): - # https://developer.android.com/ndk/reference/group/logging - prio = {"I": 4, "W": 5}[level] - stack = ExitStack() stack.enter_context(self.subTest(stream_name)) + + # In --verbose3 mode, sys.stdout and sys.stderr are captured, so we can't + # test them directly. Detect this mode and use some temporary streams with + # the same properties. stream = getattr(sys, stream_name) native_stream = getattr(sys, f"__{stream_name}__") if isinstance(stream, io.StringIO): + # https://developer.android.com/ndk/reference/group/logging + prio = {"I": 4, "W": 5}[level] stack.enter_context( patch( f"sys.{stream_name}", - TextLogStream( - prio, f"python.{stream_name}", native_stream.fileno(), - errors="backslashreplace" + stream := TextLogStream( + prio, f"python.{stream_name}", native_stream, ), ) ) + + # The tests assume the stream is initially buffered. + stack.enter_context(self.reconfigure(stream, write_through=False)) + return stack def test_str(self): @@ -136,7 +146,7 @@ class TestAndroidOutput(unittest.TestCase): self.assert_logs(level, tag, lines) # Single-line messages, - with self.unbuffered(stream): + with self.reconfigure(stream, write_through=True): write("", []) write("a") @@ -166,14 +176,18 @@ class TestAndroidOutput(unittest.TestCase): # Multi-line messages. Avoid identical consecutive lines, as # they may activate "chatty" filtering and break the tests. - write("\nx", [""]) + # + # Additional spaces will appear in the output where necessary to + # protect leading newlines. + write("\nx", [" "]) write("\na\n", ["x", "a"]) - write("\n", [""]) + write("\n", [" "]) + write("\n\n", [" ", " "]) write("b\n", ["b"]) - write("c\n\n", ["c", ""]) + write("c\n\n", ["c", " "]) write("d\ne", ["d"]) write("xx", []) - write("f\n\ng", ["exxf", ""]) + write("f\n\ng", ["exxf", " "]) write("\n", ["g"]) # Since this is a line-based logging system, line buffering @@ -183,16 +197,17 @@ class TestAndroidOutput(unittest.TestCase): # However, buffering can be turned off completely if you want a # flush after every write. - with self.unbuffered(stream): - write("\nx", ["", "x"]) - write("\na\n", ["", "a"]) - write("\n", [""]) + with self.reconfigure(stream, write_through=True): + write("\nx", [" ", "x"]) + write("\na\n", [" ", "a"]) + write("\n", [" "]) + write("\n\n", [" ", " "]) write("b\n", ["b"]) - write("c\n\n", ["c", ""]) + write("c\n\n", ["c", " "]) write("d\ne", ["d", "e"]) write("xx", ["xx"]) - write("f\n\ng", ["f", "", "g"]) - write("\n", [""]) + write("f\n\ng", ["f", " ", "g"]) + write("\n", [" "]) # "\r\n" should be translated into "\n". write("hello\r\n", ["hello"]) @@ -312,19 +327,16 @@ class TestAndroidOutput(unittest.TestCase): # currently use `logcat -v tag`, which shows each line as if it # was a separate log entry, but strips a single trailing # newline. - # - # On newer versions of Android, all three of the above tools (or - # maybe Logcat itself) will also strip any number of leading - # newlines. - write(b"\nx", ["", "x"] if api_level < 30 else ["x"]) - write(b"\na\n", ["", "a"] if api_level < 30 else ["a"]) - write(b"\n", [""]) + write(b"\nx", [" ", "x"]) + write(b"\na\n", [" ", "a"]) + write(b"\n", [" "]) + write(b"\n\n", [" ", ""]) write(b"b\n", ["b"]) write(b"c\n\n", ["c", ""]) write(b"d\ne", ["d", "e"]) write(b"xx", ["xx"]) write(b"f\n\ng", ["f", "", "g"]) - write(b"\n", [""]) + write(b"\n", [" "]) # "\r\n" should be translated into "\n". write(b"hello\r\n", ["hello"]) diff --git a/Lib/test/test_binascii.py b/Lib/test/test_binascii.py index b8d350a89..cd8acb4c2 100644 --- a/Lib/test/test_binascii.py +++ b/Lib/test/test_binascii.py @@ -222,6 +222,7 @@ class BinASCIITest(unittest.TestCase): assertInvalidLength(b'a' * (4 * 87 + 1)) assertInvalidLength(b'A\tB\nC ??DE') # only 5 valid characters + @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: Error not raised by a2b_uu def test_uu(self): MAX_UU = 45 for backtick in (True, False): @@ -242,6 +243,10 @@ class BinASCIITest(unittest.TestCase): self.assertEqual(binascii.a2b_uu(b"\xff"), b"\x00"*31) self.assertRaises(binascii.Error, binascii.a2b_uu, b"\xff\x00") self.assertRaises(binascii.Error, binascii.a2b_uu, b"!!!!") + self.assertRaises(binascii.Error, binascii.a2b_uu, + self.type2test(b"")) + self.assertRaises(binascii.Error, binascii.a2b_uu, + self.type2test(b"#86)C")[:0]) self.assertRaises(binascii.Error, binascii.b2a_uu, 46*b"!") # Issue #7701 (crash on a pydebug build) @@ -440,6 +445,7 @@ class BinASCIITest(unittest.TestCase): self.assertConversion(binary, converted, restored, quotetabs=quotetabs, istext=istext, header=header) + @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: Error not raised by a2b_uu def test_empty_string(self): # A test for SF bug #1022953. Make sure SystemError is not raised. empty = self.type2test(b'') @@ -449,6 +455,9 @@ class BinASCIITest(unittest.TestCase): binascii.crc_hqx(empty, 0) continue f = getattr(binascii, func) + if func == 'a2b_uu': + self.assertRaises(binascii.Error, f, empty) + continue try: f(empty) except Exception as err: diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py index 13b0d4a2a..163ebcfb5 100644 --- a/Lib/test/test_builtin.py +++ b/Lib/test/test_builtin.py @@ -293,6 +293,27 @@ class BuiltinTest(ComplexesAreIdenticalMixin, unittest.TestCase): self.assertEqual(overridden_outputs, ['all', 'any', 'tuple']) + def test_builtin_call_async_genexpr_no_crash(self): + async def f_all(): + return all(await 2 for _ in []) + + async def f_any(): + return any(await 2 for _ in []) + + async def f_tuple(): + return tuple(await 2 for _ in []) + + async def f_list(): + return list(await 2 for _ in []) + + async def f_set(): + return set(await 2 for _ in []) + + for f in (f_all, f_any, f_tuple, f_list, f_set): + with self.subTest(func=f.__name__): + with self.assertRaises(TypeError): + run_yielding_async_fn(f) + def test_ascii(self): self.assertEqual(ascii(''), '\'\'') self.assertEqual(ascii(0), '0') @@ -606,7 +627,7 @@ class BuiltinTest(ComplexesAreIdenticalMixin, unittest.TestCase): exec(co, glob) self.assertEqual(type(glob['ticker']()), AsyncGeneratorType) - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: <_ast.Name object at 0xb40000731e3d1360> is not an instance of + @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: <_ast.Name object at 0xb40000731e3d1360> is not an instance of def test_compile_ast(self): args = ("a*__debug__", "f.py", "exec") raw = compile(*args, flags = ast.PyCF_ONLY_AST).body[0] @@ -970,7 +991,7 @@ class BuiltinTest(ComplexesAreIdenticalMixin, unittest.TestCase): self.assertRaisesRegex(NameError, "name 'superglobal' is not defined", eval, code, ns) - @unittest.expectedFailure # TODO: RUSTPYTHON; wrong error message + @unittest.expectedFailure # TODO: RUSTPYTHON; wrong error message def test_exec_builtins_mapping_import(self): code = compile("import foo.bar", "test", "exec") ns = {'__builtins__': types.MappingProxyType({})} @@ -979,7 +1000,7 @@ class BuiltinTest(ComplexesAreIdenticalMixin, unittest.TestCase): exec(code, ns) self.assertEqual(ns['foo'], ('foo.bar', ns, ns, None, 0)) - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: AttributeError not raised by eval + @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: AttributeError not raised by eval def test_eval_builtins_mapping_reduce(self): # list_iterator.__reduce__() calls _PyEval_GetBuiltin("iter") code = compile("x.__reduce__()", "test", "eval") diff --git a/Lib/test/test_defaultdict.py b/Lib/test/test_defaultdict.py index fbd7354a9..a193eb10f 100644 --- a/Lib/test/test_defaultdict.py +++ b/Lib/test/test_defaultdict.py @@ -204,5 +204,20 @@ class TestDefaultDict(unittest.TestCase): self.assertEqual(test_dict[key], 2) self.assertEqual(count, 2) + def test_repr_recursive_factory(self): + # gh-145492: defaultdict.__repr__ should not cause infinite recursion + # when the factory's __repr__ calls repr() on the defaultdict. + class ProblematicFactory: + def __call__(self): + return {} + def __repr__(self): + repr(dd) + return f"ProblematicFactory for {dd}" + + dd = defaultdict(ProblematicFactory()) + # Should not raise RecursionError + r = repr(dd) + self.assertIn("ProblematicFactory for", r) + if __name__ == "__main__": unittest.main() diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py index ed96be53c..6b67c9e50 100644 --- a/Lib/test/test_mmap.py +++ b/Lib/test/test_mmap.py @@ -1,9 +1,12 @@ from test.support import ( - requires, _2G, _4G, gc_collect, cpython_only, is_emscripten + requires, _2G, _4G, gc_collect, cpython_only, is_emscripten, is_apple, + in_systemd_nspawn_sync_suppressed, ) from test.support.import_helper import import_module from test.support.os_helper import TESTFN, unlink +from test.support.script_helper import assert_python_ok import unittest +import errno import os import re import itertools @@ -11,6 +14,7 @@ import random import socket import string import sys +import textwrap import weakref # Skip test if we can't import mmap. @@ -32,6 +36,10 @@ if is_emscripten: class MmapTests(unittest.TestCase): def setUp(self): + # TODO: RUSTPYTHON; Remove this once windows doesn't get errored on setup:/ + if os.name == "nt": + raise unittest.SkipTest("TODO: RUSTPYTHON; Error during class setUp") + if os.path.exists(TESTFN): os.unlink(TESTFN) @@ -41,6 +49,7 @@ class MmapTests(unittest.TestCase): except OSError: pass + @unittest.expectedFailure # TODO: RUSTPYTHON; AttributeError: 'mmap' object has no attribute 'seekable' def test_basic(self): # Test mmap module on Unix systems and Windows @@ -93,11 +102,12 @@ class MmapTests(unittest.TestCase): self.assertEqual(end, PAGESIZE + 6) # test seeking around (try to overflow the seek implementation) - m.seek(0,0) + self.assertTrue(m.seekable()) + self.assertEqual(m.seek(0, 0), 0) self.assertEqual(m.tell(), 0) - m.seek(42,1) + self.assertEqual(m.seek(42, 1), 42) self.assertEqual(m.tell(), 42) - m.seek(0,2) + self.assertEqual(m.seek(0, 2), len(m)) self.assertEqual(m.tell(), len(m)) # Try to seek to negative position... @@ -162,7 +172,7 @@ class MmapTests(unittest.TestCase): # Ensuring that readonly mmap can't be write() to try: - m.seek(0,0) + m.seek(0, 0) m.write(b'abc') except TypeError: pass @@ -171,7 +181,7 @@ class MmapTests(unittest.TestCase): # Ensuring that readonly mmap can't be write_byte() to try: - m.seek(0,0) + m.seek(0, 0) m.write_byte(b'd') except TypeError: pass @@ -255,15 +265,79 @@ class MmapTests(unittest.TestCase): # Try writing with PROT_EXEC and without PROT_WRITE prot = mmap.PROT_READ | getattr(mmap, 'PROT_EXEC', 0) with open(TESTFN, "r+b") as f: - m = mmap.mmap(f.fileno(), mapsize, prot=prot) - self.assertRaises(TypeError, m.write, b"abcdef") - self.assertRaises(TypeError, m.write_byte, 0) - m.close() + try: + m = mmap.mmap(f.fileno(), mapsize, prot=prot) + except PermissionError: + # on macOS 14, PROT_READ | PROT_EXEC is not allowed + pass + else: + self.assertRaises(TypeError, m.write, b"abcdef") + self.assertRaises(TypeError, m.write_byte, 0) + m.close() + + @unittest.expectedFailure # TODO: RUSTPYTHON + @unittest.skipIf(os.name == 'nt', 'trackfd not present on Windows') + def test_trackfd_parameter(self): + size = 64 + with open(TESTFN, "wb") as f: + f.write(b"a"*size) + for close_original_fd in True, False: + with self.subTest(close_original_fd=close_original_fd): + with open(TESTFN, "r+b") as f: + with mmap.mmap(f.fileno(), size, trackfd=False) as m: + if close_original_fd: + f.close() + self.assertEqual(len(m), size) + with self.assertRaises(OSError) as err_cm: + m.size() + self.assertEqual(err_cm.exception.errno, errno.EBADF) + with self.assertRaises(ValueError): + m.resize(size * 2) + with self.assertRaises(ValueError): + m.resize(size // 2) + self.assertEqual(m.closed, False) + + # Smoke-test other API + m.write_byte(ord('X')) + m[2] = ord('Y') + m.flush() + with open(TESTFN, "rb") as f: + self.assertEqual(f.read(4), b'XaYa') + self.assertEqual(m.tell(), 1) + m.seek(0) + self.assertEqual(m.tell(), 0) + self.assertEqual(m.read_byte(), ord('X')) + + self.assertEqual(m.closed, True) + self.assertEqual(os.stat(TESTFN).st_size, size) + + @unittest.expectedFailure # TODO: RUSTPYTHON + @unittest.skipIf(os.name == 'nt', 'trackfd not present on Windows') + def test_trackfd_neg1(self): + size = 64 + with mmap.mmap(-1, size, trackfd=False) as m: + with self.assertRaises(OSError): + m.size() + with self.assertRaises(ValueError): + m.resize(size // 2) + self.assertEqual(len(m), size) + m[0] = ord('a') + assert m[0] == ord('a') + + @unittest.skipIf(os.name != 'nt', 'trackfd only fails on Windows') + def test_no_trackfd_parameter_on_windows(self): + # 'trackffd' is an invalid keyword argument for this function + size = 64 + with self.assertRaises(TypeError): + mmap.mmap(-1, size, trackfd=True) + with self.assertRaises(TypeError): + mmap.mmap(-1, size, trackfd=False) def test_bad_file_desc(self): # Try opening a bad file descriptor... self.assertRaises(OSError, mmap.mmap, -2, 4096) + @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON") def test_tougher_find(self): # Do a tougher .find() test. SF bug 515943 pointed out that, in 2.2, # searching for data with embedded \0 bytes didn't work. @@ -282,6 +356,7 @@ class MmapTests(unittest.TestCase): self.assertEqual(m.find(slice + b'x'), -1) m.close() + @unittest.skip("TODO: RUSTPYTHON; panic") def test_find_end(self): # test the new 'end' parameter works as expected with open(TESTFN, 'wb+') as f: @@ -299,7 +374,29 @@ class MmapTests(unittest.TestCase): self.assertEqual(m.find(b'one', 1, -2), -1) self.assertEqual(m.find(bytearray(b'one')), 0) + for i in range(-n-1, n+1): + for j in range(-n-1, n+1): + for p in [b"o", b"on", b"two", b"ones", b"s"]: + expected = data.find(p, i, j) + self.assertEqual(m.find(p, i, j), expected, (p, i, j)) + def test_find_does_not_access_beyond_buffer(self): + try: + flags = mmap.MAP_PRIVATE | mmap.MAP_ANONYMOUS + PAGESIZE = mmap.PAGESIZE + PROT_NONE = 0 + PROT_READ = mmap.PROT_READ + except AttributeError as e: + raise unittest.SkipTest("mmap flags unavailable") from e + for i in range(0, 2049): + with mmap.mmap(-1, PAGESIZE * (i + 1), + flags=flags, prot=PROT_NONE) as guard: + with mmap.mmap(-1, PAGESIZE * (i + 2048), + flags=flags, prot=PROT_READ) as fm: + fm.find(b"fo", -2) + + + @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON") def test_rfind(self): # test the new 'end' parameter works as expected with open(TESTFN, 'wb+') as f: @@ -360,6 +457,7 @@ class MmapTests(unittest.TestCase): self.assertRaises(ValueError, mmap.mmap, f.fileno(), 0, offset=2147418112) + @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON") def test_move(self): # make move works everywhere (64-bit format problem earlier) with open(TESTFN, 'wb+') as f: @@ -407,7 +505,6 @@ class MmapTests(unittest.TestCase): m.move(0, 0, 1) m.move(0, 0, 0) - def test_anonymous(self): # anonymous mmap.mmap(-1, PAGE) m = mmap.mmap(-1, PAGESIZE) @@ -420,6 +517,7 @@ class MmapTests(unittest.TestCase): m[x] = b self.assertEqual(m[x], b) + @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON") def test_read_all(self): m = mmap.mmap(-1, 16) self.addCleanup(m.close) @@ -441,6 +539,7 @@ class MmapTests(unittest.TestCase): m.seek(9) self.assertEqual(m.read(-42), bytes(range(9, 16))) + @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON") def test_read_invalid_arg(self): m = mmap.mmap(-1, 16) self.addCleanup(m.close) @@ -557,6 +656,7 @@ class MmapTests(unittest.TestCase): except OSError: pass + @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON") def test_subclass(self): class anon_mmap(mmap.mmap): def __new__(klass, *args, **kwargs): @@ -609,6 +709,7 @@ class MmapTests(unittest.TestCase): self.assertEqual(m[:], b"012barbaz9") self.assertRaises(ValueError, m.write, b"ba") + @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON") def test_non_ascii_byte(self): for b in (129, 200, 255): # > 128 m = mmap.mmap(-1, 1) @@ -618,6 +719,7 @@ class MmapTests(unittest.TestCase): self.assertEqual(m.read_byte(), b) m.close() + @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON") @unittest.skipUnless(os.name == 'nt', 'requires Windows') def test_tagname(self): data1 = b"0123456789" @@ -646,14 +748,16 @@ class MmapTests(unittest.TestCase): m2.close() m1.close() + with self.assertRaisesRegex(TypeError, 'tagname'): + mmap.mmap(-1, 8, tagname=1) + @cpython_only @unittest.skipUnless(os.name == 'nt', 'requires Windows') def test_sizeof(self): m1 = mmap.mmap(-1, 100) tagname = random_tagname() m2 = mmap.mmap(-1, 100, tagname=tagname) - self.assertEqual(sys.getsizeof(m2), - sys.getsizeof(m1) + len(tagname) + 1) + self.assertGreater(sys.getsizeof(m2), sys.getsizeof(m1)) @unittest.skipUnless(os.name == 'nt', 'requires Windows') def test_crasher_on_windows(self): @@ -708,6 +812,7 @@ class MmapTests(unittest.TestCase): "wrong exception raised in context manager") self.assertTrue(m.closed, "context manager failed") + @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON") def test_weakref(self): # Check mmap objects are weakrefable mm = mmap.mmap(-1, 16) @@ -717,6 +822,7 @@ class MmapTests(unittest.TestCase): gc_collect() self.assertIs(wr(), None) + @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON") def test_write_returning_the_number_of_bytes_written(self): mm = mmap.mmap(-1, 16) self.assertEqual(mm.write(b""), 0) @@ -724,6 +830,7 @@ class MmapTests(unittest.TestCase): self.assertEqual(mm.write(b"yz"), 2) self.assertEqual(mm.write(b"python"), 6) + @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON") def test_resize_past_pos(self): m = mmap.mmap(-1, 8192) self.addCleanup(m.close) @@ -744,7 +851,7 @@ class MmapTests(unittest.TestCase): with self.assertRaises(TypeError): m * 2 - @unittest.skipIf(sys.platform.startswith("linux"), "TODO: RUSTPYTHON, memmap2 doesn't throw OSError when offset is not a multiple of mmap.PAGESIZE on Linux") + @unittest.skipIf(sys.platform.startswith("linux"), "TODO: RUSTPYTHON; memmap2 doesn't throw OSError when offset is not a multiple of mmap.PAGESIZE on Linux") def test_flush_return_value(self): # mm.flush() should return None on success, raise an # exception on error under all platforms. @@ -753,11 +860,13 @@ class MmapTests(unittest.TestCase): mm.write(b'python') result = mm.flush() self.assertIsNone(result) - if sys.platform.startswith('linux'): + if (sys.platform.startswith(('linux', 'android')) + and not in_systemd_nspawn_sync_suppressed()): # 'offset' must be a multiple of mmap.PAGESIZE on Linux. # See bpo-34754 for details. self.assertRaises(OSError, mm.flush, 1, len(b'python')) + @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON") def test_repr(self): open_mmap_repr_pat = re.compile( r" None: + self.access = access + + def __enter__(self): + self.f = open(TESTFN, "w+b") + self.f.write(random.randbytes(100)) + self.f.flush() + + m = mmap.mmap(self.f.fileno(), 100, access=self.access) + + class X: + def __index__(self): + m.close() + return 10 + + return (m, X) + + def __exit__(self, exc_type, exc_value, traceback): + self.f.close() + + read_access_modes = [ + mmap.ACCESS_READ, + mmap.ACCESS_WRITE, + mmap.ACCESS_COPY, + mmap.ACCESS_DEFAULT, + ] + + write_access_modes = [ + mmap.ACCESS_WRITE, + mmap.ACCESS_COPY, + mmap.ACCESS_DEFAULT, + ] + + for access in read_access_modes: + with MmapClosedByIntContext(access) as (m, X): + with self.assertRaisesRegex(ValueError, "mmap closed or invalid"): + m[X()] + + with MmapClosedByIntContext(access) as (m, X): + with self.assertRaisesRegex(ValueError, "mmap closed or invalid"): + m[X() : 20] + + with MmapClosedByIntContext(access) as (m, X): + with self.assertRaisesRegex(ValueError, "mmap closed or invalid"): + m[X() : 20 : 2] + + with MmapClosedByIntContext(access) as (m, X): + with self.assertRaisesRegex(ValueError, "mmap closed or invalid"): + m[20 : X() : -2] + + with MmapClosedByIntContext(access) as (m, X): + with self.assertRaisesRegex(ValueError, "mmap closed or invalid"): + m.read(X()) + + with MmapClosedByIntContext(access) as (m, X): + with self.assertRaisesRegex(ValueError, "mmap closed or invalid"): + m.find(b"1", 1, X()) + + for access in write_access_modes: + with MmapClosedByIntContext(access) as (m, X): + with self.assertRaisesRegex(ValueError, "mmap closed or invalid"): + m[X() : 20] = b"1" * 10 + + with MmapClosedByIntContext(access) as (m, X): + with self.assertRaisesRegex(ValueError, "mmap closed or invalid"): + m[X() : 20 : 2] = b"1" * 5 + + with MmapClosedByIntContext(access) as (m, X): + with self.assertRaisesRegex(ValueError, "mmap closed or invalid"): + m[20 : X() : -2] = b"1" * 5 + + with MmapClosedByIntContext(access) as (m, X): + with self.assertRaisesRegex(ValueError, "mmap closed or invalid"): + m.move(1, 2, X()) + + with MmapClosedByIntContext(access) as (m, X): + with self.assertRaisesRegex(ValueError, "mmap closed or invalid"): + m.write_byte(X()) + + @unittest.skipUnless(os.name == 'nt', 'requires Windows') + @unittest.skipUnless(hasattr(mmap.mmap, '_protect'), 'test needs debug build') + def test_access_violations(self): + from test.support.os_helper import TESTFN + + code = textwrap.dedent(""" + import faulthandler + import mmap + import os + import sys + from contextlib import suppress + + # Prevent logging access violations to stderr. + faulthandler.disable() + + PAGESIZE = mmap.PAGESIZE + PAGE_NOACCESS = 0x01 + + with open(sys.argv[1], 'bw+') as f: + f.write(b'A'* PAGESIZE) + f.flush() + + m = mmap.mmap(f.fileno(), PAGESIZE) + m._protect(PAGE_NOACCESS, 0, PAGESIZE) + with suppress(OSError): + m.read(PAGESIZE) + assert False, 'mmap.read() did not raise' + with suppress(OSError): + m.read_byte() + assert False, 'mmap.read_byte() did not raise' + with suppress(OSError): + m.readline() + assert False, 'mmap.readline() did not raise' + with suppress(OSError): + m.write(b'A'* PAGESIZE) + assert False, 'mmap.write() did not raise' + with suppress(OSError): + m.write_byte(0) + assert False, 'mmap.write_byte() did not raise' + with suppress(OSError): + m[0] # test mmap_subscript + assert False, 'mmap.__getitem__() did not raise' + with suppress(OSError): + m[0:10] # test mmap_subscript + assert False, 'mmap.__getitem__() did not raise' + with suppress(OSError): + m[0:10:2] # test mmap_subscript + assert False, 'mmap.__getitem__() did not raise' + with suppress(OSError): + m[0] = 1 + assert False, 'mmap.__setitem__() did not raise' + with suppress(OSError): + m[0:10] = b'A'* 10 + assert False, 'mmap.__setitem__() did not raise' + with suppress(OSError): + m[0:10:2] = b'A'* 5 + assert False, 'mmap.__setitem__() did not raise' + with suppress(OSError): + m.move(0, 10, 1) + assert False, 'mmap.move() did not raise' + with suppress(OSError): + list(m) # test mmap_item + assert False, 'mmap.__getitem__() did not raise' + with suppress(OSError): + m.find(b'A') + assert False, 'mmap.find() did not raise' + with suppress(OSError): + m.rfind(b'A') + assert False, 'mmap.rfind() did not raise' + """) + rt, stdout, stderr = assert_python_ok("-c", code, TESTFN) + self.assertEqual(stdout.strip(), b'') + self.assertEqual(stderr.strip(), b'') + + class LargeMmapTests(unittest.TestCase): def setUp(self): @@ -897,7 +1216,7 @@ class LargeMmapTests(unittest.TestCase): unlink(TESTFN) def _make_test_file(self, num_zeroes, tail): - if sys.platform[:3] == 'win' or sys.platform == 'darwin': + if sys.platform[:3] == 'win' or is_apple: requires('largefile', 'test requires %s bytes and a long time to run' % str(0x180000000)) f = open(TESTFN, 'w+b') diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py index eb0e4d25d..d7e1c00f1 100644 --- a/Lib/test/test_posix.py +++ b/Lib/test/test_posix.py @@ -1934,6 +1934,11 @@ class _PosixSpawnMixin: ) support.wait_process(pid, exitcode=0) + def test_setpgroup_allow_none(self): + path, args = self.NOOP_PROGRAM[0], self.NOOP_PROGRAM + pid = self.spawn_func(path, args, os.environ, setpgroup=None) + support.wait_process(pid, exitcode=0) + def test_setpgroup_wrong_type(self): with self.assertRaises(TypeError): self.spawn_func(sys.executable, @@ -2034,6 +2039,21 @@ class _PosixSpawnMixin: [sys.executable, "-c", "pass"], os.environ, setsigdef=[signal.NSIG, signal.NSIG+1]) + def test_scheduler_allow_none(self): + path, args = self.NOOP_PROGRAM[0], self.NOOP_PROGRAM + pid = self.spawn_func(path, args, os.environ, scheduler=None) + support.wait_process(pid, exitcode=0) + + @unittest.expectedFailure # TODO: RUSTPYTHON; Wrong error message + @support.subTests("scheduler", [object(), 1, [1, 2]]) + def test_scheduler_wrong_type(self, scheduler): + path, args = self.NOOP_PROGRAM[0], self.NOOP_PROGRAM + with self.assertRaisesRegex( + TypeError, + "scheduler must be a tuple or None", + ): + self.spawn_func(path, args, os.environ, scheduler=scheduler) + @unittest.expectedFailureIf(sys.platform in ("darwin", "linux"), "TODO: RUSTPYTHON; NotImplementedError: scheduler parameter is not yet implemented") @requires_sched @unittest.skipIf(sys.platform.startswith(('freebsd', 'netbsd')), diff --git a/Lib/test/test_uuid.py b/Lib/test/test_uuid.py index 0e1a723ce..c8400da3a 100644 --- a/Lib/test/test_uuid.py +++ b/Lib/test/test_uuid.py @@ -1176,6 +1176,47 @@ class CommandLineTestCases: self.assertEqual(cm.exception.code, 2) self.assertIn("error: Incorrect number of arguments", mock_err.getvalue()) + @mock.patch.object(sys, "argv", + ["", "-u", "uuid3", "-n", "@dns", "-N", "python.org"]) + def test_cli_uuid3_outputted_with_valid_namespace_and_name(self): + stdout = io.StringIO() + with contextlib.redirect_stdout(stdout): + self.uuid.main() + + output = stdout.getvalue().strip() + uuid_output = self.uuid.UUID(output) + + # Output should be in the form of uuid3 + self.assertEqual(output, str(uuid_output)) + self.assertEqual(uuid_output.version, 3) + + @mock.patch.object(sys, "argv", + ["", "-u", "uuid3", "-n", + "0d6a16cc-34a7-47d8-b660-214d0ae184d2", + "-N", "some.user"]) + def test_cli_uuid3_outputted_with_custom_namespace_and_name(self): + stdout = io.StringIO() + with contextlib.redirect_stdout(stdout): + self.uuid.main() + + output = stdout.getvalue().strip() + uuid_output = self.uuid.UUID(output) + + # Output should be in the form of uuid3 + self.assertEqual(output, str(uuid_output)) + self.assertEqual(uuid_output.version, 3) + + @mock.patch.object(sys, "argv", + ["", "-u", "uuid3", "-n", "any UUID", "-N", "python.org"]) + @mock.patch('sys.stderr', new_callable=io.StringIO) + def test_cli_uuid3_with_invalid_namespace(self, mock_err): + with self.assertRaises(SystemExit) as cm: + self.uuid.main() + # Check that exception code is the same as argparse.ArgumentParser.error + self.assertEqual(cm.exception.code, 2) + self.assertIn("error: badly formed hexadecimal UUID string", + mock_err.getvalue()) + @mock.patch.object(sys, "argv", [""]) def test_cli_uuid4_outputted_with_no_args(self): stdout = io.StringIO() @@ -1203,23 +1244,9 @@ class CommandLineTestCases: uuid_output = self.uuid.UUID(o) self.assertEqual(uuid_output.version, 4) - @mock.patch.object(sys, "argv", - ["", "-u", "uuid3", "-n", "@dns", "-N", "python.org"]) - def test_cli_uuid3_ouputted_with_valid_namespace_and_name(self): - stdout = io.StringIO() - with contextlib.redirect_stdout(stdout): - self.uuid.main() - - output = stdout.getvalue().strip() - uuid_output = self.uuid.UUID(output) - - # Output should be in the form of uuid5 - self.assertEqual(output, str(uuid_output)) - self.assertEqual(uuid_output.version, 3) - @mock.patch.object(sys, "argv", ["", "-u", "uuid5", "-n", "@dns", "-N", "python.org"]) - def test_cli_uuid5_ouputted_with_valid_namespace_and_name(self): + def test_cli_uuid5_outputted_with_valid_namespace_and_name(self): stdout = io.StringIO() with contextlib.redirect_stdout(stdout): self.uuid.main() @@ -1231,6 +1258,33 @@ class CommandLineTestCases: self.assertEqual(output, str(uuid_output)) self.assertEqual(uuid_output.version, 5) + @mock.patch.object(sys, "argv", + ["", "-u", "uuid5", "-n", + "0d6a16cc-34a7-47d8-b660-214d0ae184d2", + "-N", "some.user"]) + def test_cli_uuid5_ouputted_with_custom_namespace_and_name(self): + stdout = io.StringIO() + with contextlib.redirect_stdout(stdout): + self.uuid.main() + + output = stdout.getvalue().strip() + uuid_output = self.uuid.UUID(output) + + # Output should be in the form of uuid5 + self.assertEqual(output, str(uuid_output)) + self.assertEqual(uuid_output.version, 5) + + @mock.patch.object(sys, "argv", + ["", "-u", "uuid5", "-n", "any UUID", "-N", "python.org"]) + @mock.patch('sys.stderr', new_callable=io.StringIO) + def test_cli_uuid5_with_invalid_namespace(self, mock_err): + with self.assertRaises(SystemExit) as cm: + self.uuid.main() + # Check that exception code is the same as argparse.ArgumentParser.error + self.assertEqual(cm.exception.code, 2) + self.assertIn("error: badly formed hexadecimal UUID string", + mock_err.getvalue()) + @mock.patch.object(sys, "argv", ["", "-u", "uuid6"]) def test_cli_uuid6(self): self.do_test_standalone_uuid(6) diff --git a/Lib/uuid.py b/Lib/uuid.py index 313f2fc46..043ad7bcb 100644 --- a/Lib/uuid.py +++ b/Lib/uuid.py @@ -961,7 +961,7 @@ def main(): default="uuid4", help="function to generate the UUID") parser.add_argument("-n", "--namespace", - choices=["any UUID", *namespaces.keys()], + metavar=f"{{any UUID,{','.join(namespaces)}}}", help="uuid3/uuid5 only: " "a UUID, or a well-known predefined UUID addressed " "by namespace name") @@ -983,7 +983,13 @@ def main(): f"{args.uuid} requires a namespace and a name. " "Run 'python -m uuid -h' for more information." ) - namespace = namespaces[namespace] if namespace in namespaces else UUID(namespace) + if namespace in namespaces: + namespace = namespaces[namespace] + else: + try: + namespace = UUID(namespace) + except ValueError as exc: + parser.error(f"{exc}: {args.namespace!r}") for _ in range(args.count): print(uuid_func(namespace, name)) else: From 6b1cf06bd474afe911572d7fe20cf9db4a1a6787 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Tue, 2 Jun 2026 12:06:36 +0300 Subject: [PATCH 008/339] Update `importlib` to 3.14.5 (#8013) --- Lib/importlib/_bootstrap.py | 8 +++ Lib/importlib/_bootstrap_external.py | 2 +- Lib/test/test_importlib/frozen/test_loader.py | 5 +- .../test_importlib/resources/test_resource.py | 1 - Lib/test/test_importlib/test_locks.py | 4 +- .../test_importlib/test_threaded_import.py | 66 +++++++++++++++++++ Lib/test/test_importlib/util.py | 6 +- 7 files changed, 82 insertions(+), 10 deletions(-) diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py index 499da1e04..9d911e1dc 100644 --- a/Lib/importlib/_bootstrap.py +++ b/Lib/importlib/_bootstrap.py @@ -1375,6 +1375,14 @@ def _find_and_load(name, import_): # NOTE: because of this, initializing must be set *before* # putting the new module in sys.modules. _lock_unlock_module(name) + else: + # Verify the module is still in sys.modules. Another thread may have + # removed it (due to import failure) between our sys.modules.get() + # above and the _initializing check. If removed, we retry the import + # to preserve normal semantics: the caller gets the exception from + # the actual import failure rather than a synthetic error. + if sys.modules.get(name) is not module: + return _find_and_load(name, import_) if module is None: message = f'import of {name} halted; None in sys.modules' diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py index 95ce14b2c..6a828ae75 100644 --- a/Lib/importlib/_bootstrap_external.py +++ b/Lib/importlib/_bootstrap_external.py @@ -946,7 +946,7 @@ class FileLoader: def get_data(self, path): """Return the data from path as raw bytes.""" - if isinstance(self, (SourceLoader, ExtensionFileLoader)): + if isinstance(self, (SourceLoader, SourcelessFileLoader, ExtensionFileLoader)): with _io.open_code(str(path)) as file: return file.read() else: diff --git a/Lib/test/test_importlib/frozen/test_loader.py b/Lib/test/test_importlib/frozen/test_loader.py index 0824af53e..7b5b791be 100644 --- a/Lib/test/test_importlib/frozen/test_loader.py +++ b/Lib/test/test_importlib/frozen/test_loader.py @@ -5,7 +5,6 @@ machinery = util.import_importlib('importlib.machinery') from test.support import captured_stdout, import_helper, STDLIB_DIR import contextlib import os.path -import sys import types import unittest import warnings @@ -76,7 +75,7 @@ class ExecModuleTests(abc.LoaderTests): self.assertHasAttr(module, '__spec__') self.assertEqual(module.__spec__.loader_state.origname, name) - @unittest.skipIf(sys.platform == "win32", "TODO: RUSTPYTHON") + @unittest.skipIf(__import__("sys").platform == "win32", "TODO: RUSTPYTHON") def test_package(self): name = '__phello__' module, output = self.exec_module(name) @@ -147,7 +146,7 @@ class InspectLoaderTests: result = self.machinery.FrozenImporter.get_source('__hello__') self.assertIsNone(result) - @unittest.skipIf(sys.platform == "win32", "TODO: RUSTPYTHON") + @unittest.skipIf(__import__("sys").platform == "win32", "TODO: RUSTPYTHON") def test_is_package(self): # Should be able to tell what is a package. test_for = (('__hello__', False), ('__phello__', True), diff --git a/Lib/test/test_importlib/resources/test_resource.py b/Lib/test/test_importlib/resources/test_resource.py index 83fc2ef4e..fcede14b8 100644 --- a/Lib/test/test_importlib/resources/test_resource.py +++ b/Lib/test/test_importlib/resources/test_resource.py @@ -1,4 +1,3 @@ -import os import unittest from . import util diff --git a/Lib/test/test_importlib/test_locks.py b/Lib/test/test_importlib/test_locks.py index b1f5f9d6c..d42f623b3 100644 --- a/Lib/test/test_importlib/test_locks.py +++ b/Lib/test/test_importlib/test_locks.py @@ -155,8 +155,8 @@ class LifetimeTests: # TODO: RUSTPYTHON; dead weakref module locks not cleaned up in frozen bootstrap Frozen_LifetimeTests.test_all_locks = unittest.skip("TODO: RUSTPYTHON")( - Frozen_LifetimeTests.test_all_locks) - + Frozen_LifetimeTests.test_all_locks +) def setUpModule(): thread_info = threading_helper.threading_setup() diff --git a/Lib/test/test_importlib/test_threaded_import.py b/Lib/test/test_importlib/test_threaded_import.py index c8d156f7f..befee06f4 100644 --- a/Lib/test/test_importlib/test_threaded_import.py +++ b/Lib/test/test_importlib/test_threaded_import.py @@ -263,6 +263,72 @@ class ThreadedImportTests(unittest.TestCase): 'partial', 'pool_in_threads.py') script_helper.assert_python_ok(fn) + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_import_failure_race_condition(self): + # Regression test for race condition where a thread could receive + # a partially-initialized module when another thread's import fails. + # The race occurs when: + # 1. Thread 1 starts importing, adds module to sys.modules + # 2. Thread 2 sees the module in sys.modules + # 3. Thread 1's import fails, removes module from sys.modules + # 4. Thread 2 should NOT return the stale module reference + os.mkdir(TESTFN) + self.addCleanup(shutil.rmtree, TESTFN) + sys.path.insert(0, TESTFN) + self.addCleanup(sys.path.remove, TESTFN) + + # Create a module that partially initializes then fails + modname = 'failing_import_module' + with open(os.path.join(TESTFN, modname + '.py'), 'w') as f: + f.write(''' +import time +PARTIAL_ATTR = 'initialized' +time.sleep(0.05) # Widen race window +raise RuntimeError("Intentional import failure") +''') + self.addCleanup(forget, modname) + importlib.invalidate_caches() + + errors = [] + results = [] + + def do_import(delay=0): + time.sleep(delay) + try: + mod = __import__(modname) + # If we got a module, verify it's in sys.modules + if modname not in sys.modules: + errors.append( + f"Got module {mod!r} but {modname!r} not in sys.modules" + ) + elif sys.modules[modname] is not mod: + errors.append( + f"Got different module than sys.modules[{modname!r}]" + ) + else: + results.append(('success', mod)) + except RuntimeError: + results.append(('RuntimeError',)) + except Exception as e: + errors.append(f"Unexpected exception: {e}") + + # Run multiple iterations to increase chance of hitting the race + for _ in range(10): + errors.clear() + results.clear() + if modname in sys.modules: + del sys.modules[modname] + + t1 = threading.Thread(target=do_import, args=(0,)) + t2 = threading.Thread(target=do_import, args=(0.01,)) + t1.start() + t2.start() + t1.join() + t2.join() + + # Neither thread should have errors about stale modules + self.assertEqual(errors, [], f"Race condition detected: {errors}") + def setUpModule(): thread_info = threading_helper.threading_setup() diff --git a/Lib/test/test_importlib/util.py b/Lib/test/test_importlib/util.py index 85e7ffcb6..2eaefd687 100644 --- a/Lib/test/test_importlib/util.py +++ b/Lib/test/test_importlib/util.py @@ -15,10 +15,10 @@ import sys import tempfile import types -try: - _testsinglephase = import_helper.import_module("_testsinglephase") +try: # TODO: RUSTPYTHON + import_helper.import_module("_testmultiphase") except unittest.SkipTest: - _testsinglephase = None # TODO: RUSTPYTHON + _testmultiphase = None BUILTINS = types.SimpleNamespace() From 7139c6a82d959c23c43ce3319c37f1dbf989b22b Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Tue, 2 Jun 2026 12:07:32 +0300 Subject: [PATCH 009/339] Remove node24 installation. It's the default now (#8014) * Remove node24 installation. It's the default now * Fix insta tests for llvm-cov --- .github/workflows/ci.yaml | 7 ------- .github/workflows/cron-ci.yaml | 3 ++- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3ff74e6a5..574a0bbb2 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -33,7 +33,6 @@ env: CARGO_PROFILE_DEV_DEBUG: 0 CARGO_PROFILE_RELEASE_DEBUG: 0 CARGO_TERM_COLOR: always - FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true # TODO: Remove on 2026/06/02 CI: true jobs: @@ -541,12 +540,6 @@ jobs: key: prek-${{ hashFiles('.pre-commit-config.yaml') }} path: ~/.cache/prek - # TODO: Remove on 2026/06/02 when node24 is the default - - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0 - with: - package-manager-cache: false - node-version: "24" - - name: install prek id: prek uses: j178/prek-action@bdca6f102f98e2b4c7029491a53dfd366469e33d # v2.0.4 diff --git a/.github/workflows/cron-ci.yaml b/.github/workflows/cron-ci.yaml index ac1a1cadb..9c2f13524 100644 --- a/.github/workflows/cron-ci.yaml +++ b/.github/workflows/cron-ci.yaml @@ -15,7 +15,6 @@ on: env: CARGO_ARGS: --no-default-features --features stdlib,importlib,stdio,encodings,ssl-rustls-aws-lc,jit,host_env - FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: 'true' # TODO: Remove on 2026/06/02 jobs: # codecov collects code coverage data from the rust tests, python snippets and python test suite. @@ -25,6 +24,8 @@ jobs: runs-on: ubuntu-latest # Disable this scheduled job when running on a fork. if: ${{ github.repository == 'RustPython/RustPython' || github.event_name != 'schedule' }} + env: + INSTA_WORKSPACE_ROOT: ${{ github.workspace }} steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: From 0de434f501bf2ed984cd3e4398cf4ea789977d68 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Jun 2026 18:12:00 +0900 Subject: [PATCH 010/339] Bump codecov/codecov-action from 6.0.0 to 6.0.1 (#7979) Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 6.0.0 to 6.0.1. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-action/compare/57e3a136b779b570ffcdbf80b3bdc90e7fab3de2...e79a6962e0d4c0c17b229090214935d2e33f8354) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-version: 6.0.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/cron-ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cron-ci.yaml b/.github/workflows/cron-ci.yaml index 9c2f13524..e927ff078 100644 --- a/.github/workflows/cron-ci.yaml +++ b/.github/workflows/cron-ci.yaml @@ -57,7 +57,7 @@ jobs: - name: Upload to Codecov if: ${{ github.event_name != 'pull_request' }} - uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0 + uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1 with: files: ./codecov.lcov From 5395ed1f26c7c986278a1de36aed837f273adb55 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Tue, 2 Jun 2026 12:25:40 +0300 Subject: [PATCH 011/339] Update `test_super.py` to 3.14.5 (#8015) --- Lib/test/test_super.py | 94 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 81 insertions(+), 13 deletions(-) diff --git a/Lib/test/test_super.py b/Lib/test/test_super.py index ac9d2e090..b53e38c77 100644 --- a/Lib/test/test_super.py +++ b/Lib/test/test_super.py @@ -1,5 +1,7 @@ """Unit tests for zero-argument super() & related machinery.""" +import copy +import pickle import textwrap import threading import unittest @@ -7,9 +9,6 @@ from unittest.mock import patch from test.support import import_helper, threading_helper -ADAPTIVE_WARMUP_DELAY = 2 - - class A: def f(self): return 'A' @@ -91,8 +90,7 @@ class TestSuper(unittest.TestCase): self.assertEqual(E().f(), 'AE') - # TODO: RUSTPYTHON; SyntaxError: name '__class__' is assigned to before global declaration - ''' + @unittest.expectedFailure # TODO: RUSTPYTHON def test_various___class___pathologies(self): # See issue #12370 class X(A): @@ -114,7 +112,7 @@ class TestSuper(unittest.TestCase): __class__""", globals(), {}) self.assertIs(type(e.exception), NameError) # Not UnboundLocalError class X: - global __class__ + # global __class__ # TODO: RUSTPYTHON; SyntaxError: name '__class__' is assigned to before global declaration __class__ = 42 def f(): __class__ @@ -122,12 +120,11 @@ class TestSuper(unittest.TestCase): del globals()["__class__"] self.assertNotIn("__class__", X.__dict__) class X: - nonlocal __class__ + # nonlocal __class__ # TODO: RUSTPYTHON; SyntaxError: name '__class__' is assigned to before nonlocal declaration __class__ = 42 def f(): __class__ self.assertEqual(__class__, 42) - ''' def test___class___instancemethod(self): # See issue #14857 @@ -191,7 +188,7 @@ class TestSuper(unittest.TestCase): B = type("B", (), test_namespace) self.assertIs(B.f(), B) - @unittest.expectedFailure # TODO: RUSTPYTHON + @unittest.expectedFailure # TODO: RUSTPYTHON def test___class___mro(self): # See issue #23722 test_class = None @@ -449,7 +446,7 @@ class TestSuper(unittest.TestCase): self.assertEqual(C().method(), super) - @unittest.expectedFailure # TODO: RUSTPYTHON; TypeError: type 'super' is not an acceptable base type + @unittest.expectedFailure # TODO: RUSTPYTHON; TypeError: type 'super' is not an acceptable base type def test_super_subclass___class__(self): class mysuper(super): pass @@ -469,7 +466,8 @@ class TestSuper(unittest.TestCase): super(MyType, type(mytype)).__setattr__(mytype, "bar", 1) self.assertEqual(mytype.bar, 1) - for _ in range(ADAPTIVE_WARMUP_DELAY): + _testinternalcapi = import_helper.import_module("_testinternalcapi") + for _ in range(_testinternalcapi.SPECIALIZATION_THRESHOLD): test("foo1") def test_reassigned_new(self): @@ -488,7 +486,8 @@ class TestSuper(unittest.TestCase): def __new__(cls): return super().__new__(cls) - for _ in range(ADAPTIVE_WARMUP_DELAY): + _testinternalcapi = import_helper.import_module("_testinternalcapi") + for _ in range(_testinternalcapi.SPECIALIZATION_THRESHOLD): C() def test_mixed_staticmethod_hierarchy(self): @@ -508,7 +507,8 @@ class TestSuper(unittest.TestCase): def some(cls): return super().some(cls) - for _ in range(ADAPTIVE_WARMUP_DELAY): + _testinternalcapi = import_helper.import_module("_testinternalcapi") + for _ in range(_testinternalcapi.SPECIALIZATION_THRESHOLD): C.some(C) @threading_helper.requires_working_threading() @@ -544,6 +544,74 @@ class TestSuper(unittest.TestCase): for thread in threads: thread.join() + def test_special_methods(self): + for e in E(), E: + s = super(C, e) + self.assertEqual(s.__reduce__, e.__reduce__) + self.assertEqual(s.__reduce_ex__, e.__reduce_ex__) + self.assertEqual(s.__getstate__, e.__getstate__) + self.assertNotHasAttr(s, '__getnewargs__') + self.assertNotHasAttr(s, '__getnewargs_ex__') + self.assertNotHasAttr(s, '__setstate__') + self.assertNotHasAttr(s, '__copy__') + self.assertNotHasAttr(s, '__deepcopy__') + + def test_pickling(self): + e = E() + e.x = 1 + s = super(C, e) + for proto in range(pickle.HIGHEST_PROTOCOL + 1): + with self.subTest(proto=proto): + u = pickle.loads(pickle.dumps(s, proto)) + self.assertEqual(u.f(), s.f()) + self.assertIs(type(u), type(s)) + self.assertIs(type(u.__self__), E) + self.assertEqual(u.__self__.x, 1) + self.assertIs(u.__thisclass__, C) + self.assertIs(u.__self_class__, E) + + s = super(C, E) + for proto in range(pickle.HIGHEST_PROTOCOL + 1): + with self.subTest(proto=proto): + u = pickle.loads(pickle.dumps(s, proto)) + self.assertEqual(u.cm(), s.cm()) + self.assertEqual(u.f, s.f) + self.assertIs(type(u), type(s)) + self.assertIs(u.__self__, E) + self.assertIs(u.__thisclass__, C) + self.assertIs(u.__self_class__, E) + + def test_shallow_copying(self): + s = super(C, E()) + self.assertIs(copy.copy(s), s) + s = super(C, E) + self.assertIs(copy.copy(s), s) + + def test_deep_copying(self): + e = E() + e.x = [1] + s = super(C, e) + u = copy.deepcopy(s) + self.assertEqual(u.f(), s.f()) + self.assertIs(type(u), type(s)) + self.assertIsNot(u, s) + self.assertIs(type(u.__self__), E) + self.assertIsNot(u.__self__, e) + self.assertIsNot(u.__self__.x, e.x) + self.assertEqual(u.__self__.x, [1]) + self.assertIs(u.__thisclass__, C) + self.assertIs(u.__self_class__, E) + + s = super(C, E) + u = copy.deepcopy(s) + self.assertEqual(u.cm(), s.cm()) + self.assertEqual(u.f, s.f) + self.assertIsNot(u, s) + self.assertIs(type(u), type(s)) + self.assertIs(u.__self__, E) + self.assertIs(u.__thisclass__, C) + self.assertIs(u.__self_class__, E) + if __name__ == "__main__": unittest.main() From c1aeeef7f8cf6f1f3000e083a13ecc7c24ad7370 Mon Sep 17 00:00:00 2001 From: Bas Schoenmaeckers <7943856+bschoenmaeckers@users.noreply.github.com> Date: Tue, 2 Jun 2026 11:33:26 +0200 Subject: [PATCH 012/339] Add sequence protocol to the c-api (#8016) --- crates/capi/src/abstract_.rs | 2 + crates/capi/src/abstract_/sequence.rs | 286 ++++++++++++++++++++++++++ 2 files changed, 288 insertions(+) create mode 100644 crates/capi/src/abstract_/sequence.rs diff --git a/crates/capi/src/abstract_.rs b/crates/capi/src/abstract_.rs index b88a76376..4ef8bbb24 100644 --- a/crates/capi/src/abstract_.rs +++ b/crates/capi/src/abstract_.rs @@ -5,8 +5,10 @@ pub use mapping::*; use rustpython_vm::builtins::{PyDict, PyStr, PyTuple}; use rustpython_vm::function::{FuncArgs, KwArgs, PosArgs}; use rustpython_vm::{AsObject, Py, PyObjectRef, PyResult, VirtualMachine}; +pub use sequence::*; mod mapping; +mod sequence; const PY_VECTORCALL_ARGUMENTS_OFFSET: usize = 1usize << (usize::BITS as usize - 1); diff --git a/crates/capi/src/abstract_/sequence.rs b/crates/capi/src/abstract_/sequence.rs new file mode 100644 index 000000000..f6022b93e --- /dev/null +++ b/crates/capi/src/abstract_/sequence.rs @@ -0,0 +1,286 @@ +use crate::{PyObject, pystate::with_vm}; +use core::ffi::c_int; + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PySequence_Check(obj: *mut PyObject) -> c_int { + with_vm(|_vm| { + let obj = unsafe { &*obj }; + Ok(obj.sequence_unchecked().check()) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PySequence_Concat( + obj1: *mut PyObject, + obj2: *mut PyObject, +) -> *mut PyObject { + with_vm(|vm| { + let obj1 = unsafe { &*obj1 }; + let obj2 = unsafe { &*obj2 }; + obj1.try_sequence(vm)?.concat(obj2, vm) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PySequence_Count(obj: *mut PyObject, value: *mut PyObject) -> isize { + with_vm(|vm| { + let obj = unsafe { &*obj }; + let value = unsafe { &*value }; + obj.try_sequence(vm)?.count(value, vm) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PySequence_DelItem(obj: *mut PyObject, index: isize) -> c_int { + with_vm(|vm| { + let obj = unsafe { &*obj }; + obj.try_sequence(vm)?.del_item(index, vm) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PySequence_DelSlice(obj: *mut PyObject, low: isize, high: isize) -> c_int { + with_vm(|vm| { + let obj = unsafe { &*obj }; + obj.try_sequence(vm)?.del_slice(low, high, vm) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PySequence_GetItem(obj: *mut PyObject, index: isize) -> *mut PyObject { + with_vm(|vm| { + let obj = unsafe { &*obj }; + obj.try_sequence(vm)?.get_item(index, vm) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PySequence_GetSlice( + obj: *mut PyObject, + low: isize, + high: isize, +) -> *mut PyObject { + with_vm(|vm| { + let obj = unsafe { &*obj }; + obj.try_sequence(vm)?.get_slice(low, high, vm) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PySequence_InPlaceConcat( + obj1: *mut PyObject, + obj2: *mut PyObject, +) -> *mut PyObject { + with_vm(|vm| { + let obj1 = unsafe { &*obj1 }; + let obj2 = unsafe { &*obj2 }; + obj1.try_sequence(vm)?.inplace_concat(obj2, vm) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PySequence_InPlaceRepeat( + obj: *mut PyObject, + count: isize, +) -> *mut PyObject { + with_vm(|vm| { + let obj = unsafe { &*obj }; + obj.try_sequence(vm)?.inplace_repeat(count, vm) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PySequence_Index(obj: *mut PyObject, value: *mut PyObject) -> isize { + with_vm(|vm| { + let obj = unsafe { &*obj }; + let value = unsafe { &*value }; + obj.try_sequence(vm)?.index(value, vm) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PySequence_List(obj: *mut PyObject) -> *mut PyObject { + with_vm(|vm| { + let obj = unsafe { &*obj }; + Ok(obj.try_sequence(vm)?.list(vm)) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PySequence_Repeat(obj: *mut PyObject, count: isize) -> *mut PyObject { + with_vm(|vm| { + let obj = unsafe { &*obj }; + obj.try_sequence(vm)?.repeat(count, vm) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PySequence_SetItem( + obj: *mut PyObject, + index: isize, + value: *mut PyObject, +) -> c_int { + with_vm(|vm| { + let obj = unsafe { &*obj }; + let value = unsafe { &*value }; + obj.try_sequence(vm)?.set_item(index, value.to_owned(), vm) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PySequence_SetSlice( + obj: *mut PyObject, + low: isize, + high: isize, + value: *mut PyObject, +) -> c_int { + with_vm(|vm| { + let obj = unsafe { &*obj }; + let value = unsafe { &*value }; + obj.try_sequence(vm)? + .set_slice(low, high, value.to_owned(), vm) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PySequence_Size(obj: *mut PyObject) -> isize { + with_vm(|vm| { + let obj = unsafe { &*obj }; + obj.try_sequence(vm)?.length(vm) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PySequence_Length(obj: *mut PyObject) -> isize { + unsafe { PySequence_Size(obj) } +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PySequence_Tuple(obj: *mut PyObject) -> *mut PyObject { + with_vm(|vm| { + let obj = unsafe { &*obj }; + Ok(obj.try_sequence(vm)?.tuple(vm)) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PySequence_Contains(obj: *mut PyObject, value: *mut PyObject) -> c_int { + with_vm(|vm| { + let obj = unsafe { &*obj }; + let value = unsafe { &*value }; + obj.sequence_unchecked().contains(value, vm) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PySequence_In(obj: *mut PyObject, value: *mut PyObject) -> c_int { + unsafe { PySequence_Contains(obj, value) } +} + +#[cfg(false)] +mod tests { + use pyo3::prelude::*; + use pyo3::types::{PyAnyMethods, PyDict, PyList, PySequence, PySequenceMethods, PyTuple}; + + #[test] + fn item_and_size_ops() { + Python::attach(|py| { + let list = PyList::new(py, [1, 2, 3]).unwrap(); + let seq = list.cast_into::().unwrap(); + + assert_eq!(seq.len().unwrap(), 3); + assert_eq!(seq.get_item(1).unwrap().extract::().unwrap(), 2); + + seq.set_item(1, 4).unwrap(); + assert_eq!(seq.get_item(1).unwrap().extract::().unwrap(), 4); + + seq.del_item(1).unwrap(); + assert_eq!(seq.get_item(1).unwrap().extract::().unwrap(), 3); + }); + } + + #[test] + fn slice_ops() { + Python::attach(|py| { + let list = PyList::new(py, [1, 2, 3, 4]).unwrap(); + let seq = list.cast_into::().unwrap(); + + let sub = seq.get_slice(1, 3).unwrap(); + assert_eq!(sub.get_item(0).unwrap().extract::().unwrap(), 2); + assert_eq!(sub.get_item(1).unwrap().extract::().unwrap(), 3); + + let repl = PyList::new(py, [8, 9]).unwrap(); + seq.set_slice(1, 3, &repl).unwrap(); + assert_eq!(seq.get_item(1).unwrap().extract::().unwrap(), 8); + assert_eq!(seq.get_item(2).unwrap().extract::().unwrap(), 9); + + seq.del_slice(1, 3).unwrap(); + assert_eq!(seq.get_item(0).unwrap().extract::().unwrap(), 1); + assert_eq!(seq.get_item(1).unwrap().extract::().unwrap(), 4); + }); + } + + #[test] + fn concat_repeat_and_inplace_ops() { + Python::attach(|py| { + let list = PyList::new(py, [1, 2]).unwrap(); + let seq = list.cast_into::().unwrap(); + let rhs = PyList::new(py, [3]) + .unwrap() + .cast_into::() + .unwrap(); + + let concat = seq.concat(&rhs).unwrap(); + assert_eq!(concat.get_item(2).unwrap().extract::().unwrap(), 3); + + let repeat = seq.repeat(2).unwrap(); + assert_eq!(repeat.get_item(2).unwrap().extract::().unwrap(), 1); + + let iadd_rhs = PyList::new(py, [4]) + .unwrap() + .cast_into::() + .unwrap(); + seq.in_place_concat(&iadd_rhs).unwrap(); + assert_eq!(seq.get_item(2).unwrap().extract::().unwrap(), 4); + + seq.in_place_repeat(2).unwrap(); + assert_eq!(seq.get_item(5).unwrap().extract::().unwrap(), 4); + }); + } + + #[test] + fn count_index_contains_and_convert_ops() { + Python::attach(|py| { + let tuple = PyTuple::new(py, [1, 2, 1]) + .unwrap() + .cast_into::() + .unwrap(); + + assert_eq!(tuple.count(1).unwrap(), 2); + assert_eq!(tuple.index(2).unwrap(), 1); + assert!(tuple.contains(1).unwrap()); + + let as_list = tuple.to_list().unwrap().cast_into::().unwrap(); + assert_eq!(as_list.get_item(0).unwrap().extract::().unwrap(), 1); + + let as_tuple = as_list + .to_tuple() + .unwrap() + .cast_into::() + .unwrap(); + assert_eq!(as_tuple.get_item(2).unwrap().extract::().unwrap(), 1); + }); + } + + #[test] + fn contains_works_for_dict() { + Python::attach(|py| { + let dict = PyDict::new(py); + dict.set_item("k", 1).unwrap(); + + let any = dict.into_any(); + assert!(any.contains("k").unwrap()); + assert!(!any.contains("missing").unwrap()); + }); + } +} From 840f8c0322648fbf5f6877820757fa93a60de407 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Tue, 2 Jun 2026 12:48:45 +0300 Subject: [PATCH 013/339] Update `asyncio` to 3.14.5 (#8012) --- Lib/asyncio/__main__.py | 30 ++++++++----- Lib/asyncio/base_events.py | 11 +++++ Lib/asyncio/base_subprocess.py | 4 +- Lib/asyncio/futures.py | 4 +- Lib/asyncio/queues.py | 2 +- Lib/asyncio/windows_utils.py | 26 +++++++---- Lib/test/test_asyncio/test_sock_lowlevel.py | 25 +++++++++++ Lib/test/test_asyncio/test_ssl.py | 40 +++++++---------- Lib/test/test_asyncio/test_streams.py | 42 ++++++++++++++++++ Lib/test/test_asyncio/test_subprocess.py | 31 +++++++++++++ Lib/test/test_asyncio/test_tasks.py | 49 ++++++++++++++++++++- Lib/test/test_asyncio/test_windows_utils.py | 44 ++++++++++++++++++ 12 files changed, 257 insertions(+), 51 deletions(-) diff --git a/Lib/asyncio/__main__.py b/Lib/asyncio/__main__.py index e07dd52a2..44e14771b 100644 --- a/Lib/asyncio/__main__.py +++ b/Lib/asyncio/__main__.py @@ -86,22 +86,27 @@ class REPLThread(threading.Thread): global return_code try: - banner = ( - f'asyncio REPL {sys.version} on {sys.platform}\n' - f'Use "await" directly instead of "asyncio.run()".\n' - f'Type "help", "copyright", "credits" or "license" ' - f'for more information.\n' - ) + if not sys.flags.quiet: + banner = ( + f'asyncio REPL {sys.version} on {sys.platform}\n' + f'Use "await" directly instead of "asyncio.run()".\n' + f'Type "help", "copyright", "credits" or "license" ' + f'for more information.\n' + ) - console.write(banner) + console.write(banner) - if startup_path := os.getenv("PYTHONSTARTUP"): + if not sys.flags.isolated and (startup_path := os.getenv("PYTHONSTARTUP")): sys.audit("cpython.run_startup", startup_path) - - import tokenize - with tokenize.open(startup_path) as f: - startup_code = compile(f.read(), startup_path, "exec") + try: + import tokenize + with tokenize.open(startup_path) as f: + startup_code = compile(f.read(), startup_path, "exec") exec(startup_code, console.locals) + except SystemExit: + raise + except BaseException: + console.showtraceback() ps1 = getattr(sys, "ps1", ">>> ") if CAN_USE_PYREPL: @@ -236,4 +241,5 @@ if __name__ == '__main__': break console.write('exiting asyncio REPL...\n') + loop.close() sys.exit(return_code) diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py index 8cbb71f70..b83b84181 100644 --- a/Lib/asyncio/base_events.py +++ b/Lib/asyncio/base_events.py @@ -1345,6 +1345,17 @@ class BaseEventLoop(events.AbstractEventLoop): # have a chance to get called before "ssl_protocol.connection_made()". transport.pause_reading() + # gh-142352: move buffered StreamReader data to SSLProtocol + if server_side: + from .streams import StreamReaderProtocol + if isinstance(protocol, StreamReaderProtocol): + stream_reader = getattr(protocol, '_stream_reader', None) + if stream_reader is not None: + buffer = stream_reader._buffer + if buffer: + ssl_protocol._incoming.write(buffer) + buffer.clear() + transport.set_protocol(ssl_protocol) conmade_cb = self.call_soon(ssl_protocol.connection_made, transport) resume_cb = self.call_soon(transport.resume_reading) diff --git a/Lib/asyncio/base_subprocess.py b/Lib/asyncio/base_subprocess.py index 321a4e5d5..224b18838 100644 --- a/Lib/asyncio/base_subprocess.py +++ b/Lib/asyncio/base_subprocess.py @@ -265,7 +265,7 @@ class BaseSubprocessTransport(transports.SubprocessTransport): # to avoid hanging forever in self._wait as otherwise _exit_waiters # would never be woken up, we wake them up here. for waiter in self._exit_waiters: - if not waiter.cancelled(): + if not waiter.done(): waiter.set_result(self._returncode) if all(p is not None and p.disconnected for p in self._pipes.values()): @@ -278,7 +278,7 @@ class BaseSubprocessTransport(transports.SubprocessTransport): finally: # wake up futures waiting for wait() for waiter in self._exit_waiters: - if not waiter.cancelled(): + if not waiter.done(): waiter.set_result(self._returncode) self._exit_waiters = None self._loop = None diff --git a/Lib/asyncio/futures.py b/Lib/asyncio/futures.py index d1df67073..e8a99556b 100644 --- a/Lib/asyncio/futures.py +++ b/Lib/asyncio/futures.py @@ -392,7 +392,7 @@ def _chain_future(source, destination): def _call_check_cancel(destination): if destination.cancelled(): - if source_loop is None or source_loop is dest_loop: + if source_loop is None or source_loop is events._get_running_loop(): source.cancel() else: source_loop.call_soon_threadsafe(source.cancel) @@ -401,7 +401,7 @@ def _chain_future(source, destination): if (destination.cancelled() and dest_loop is not None and dest_loop.is_closed()): return - if dest_loop is None or dest_loop is source_loop: + if dest_loop is None or dest_loop is events._get_running_loop(): _set_state(destination, source) else: if dest_loop.is_closed(): diff --git a/Lib/asyncio/queues.py b/Lib/asyncio/queues.py index 084fccaaf..756216fac 100644 --- a/Lib/asyncio/queues.py +++ b/Lib/asyncio/queues.py @@ -37,7 +37,7 @@ class Queue(mixins._LoopBoundMixin): is an integer greater than 0, then "await put()" will block when the queue reaches maxsize, until an item is removed by get(). - Unlike the standard library Queue, you can reliably know this Queue's size + Unlike queue.Queue, you can reliably know this Queue's size with qsize(), since your single-threaded asyncio application won't be interrupted between calling qsize() and doing an operation on the Queue. """ diff --git a/Lib/asyncio/windows_utils.py b/Lib/asyncio/windows_utils.py index ef277fac3..d6393f0b1 100644 --- a/Lib/asyncio/windows_utils.py +++ b/Lib/asyncio/windows_utils.py @@ -10,7 +10,6 @@ import itertools import msvcrt import os import subprocess -import tempfile import warnings @@ -24,6 +23,7 @@ BUFSIZE = 8192 PIPE = subprocess.PIPE STDOUT = subprocess.STDOUT _mmap_counter = itertools.count() +_MAX_PIPE_ATTEMPTS = 20 # Replacement for os.pipe() using handles instead of fds @@ -31,10 +31,6 @@ _mmap_counter = itertools.count() def pipe(*, duplex=False, overlapped=(True, True), bufsize=BUFSIZE): """Like os.pipe() but with overlapped support and using handles not fds.""" - address = tempfile.mktemp( - prefix=r'\\.\pipe\python-pipe-{:d}-{:d}-'.format( - os.getpid(), next(_mmap_counter))) - if duplex: openmode = _winapi.PIPE_ACCESS_DUPLEX access = _winapi.GENERIC_READ | _winapi.GENERIC_WRITE @@ -56,9 +52,20 @@ def pipe(*, duplex=False, overlapped=(True, True), bufsize=BUFSIZE): h1 = h2 = None try: - h1 = _winapi.CreateNamedPipe( - address, openmode, _winapi.PIPE_WAIT, - 1, obsize, ibsize, _winapi.NMPWAIT_WAIT_FOREVER, _winapi.NULL) + for attempts in itertools.count(): + address = r'\\.\pipe\python-pipe-{:d}-{:d}-{}'.format( + os.getpid(), next(_mmap_counter), os.urandom(8).hex()) + try: + h1 = _winapi.CreateNamedPipe( + address, openmode, _winapi.PIPE_WAIT, + 1, obsize, ibsize, _winapi.NMPWAIT_WAIT_FOREVER, _winapi.NULL) + break + except OSError as e: + if attempts >= _MAX_PIPE_ATTEMPTS: + raise + if e.winerror not in (_winapi.ERROR_PIPE_BUSY, + _winapi.ERROR_ACCESS_DENIED): + raise h2 = _winapi.CreateFile( address, access, 0, _winapi.NULL, _winapi.OPEN_EXISTING, @@ -104,8 +111,9 @@ class PipeHandle: def close(self, *, CloseHandle=_winapi.CloseHandle): if self._handle is not None: - CloseHandle(self._handle) + handle = self._handle self._handle = None + CloseHandle(handle) def __del__(self, _warn=warnings.warn): if self._handle is not None: diff --git a/Lib/test/test_asyncio/test_sock_lowlevel.py b/Lib/test/test_asyncio/test_sock_lowlevel.py index df4ec7948..a34e15b4d 100644 --- a/Lib/test/test_asyncio/test_sock_lowlevel.py +++ b/Lib/test/test_asyncio/test_sock_lowlevel.py @@ -427,6 +427,27 @@ class BaseSockTestsMixin: self.loop.run_until_complete( self._basetest_datagram_recvfrom_into(server_address)) + async def _basetest_datagram_recvfrom_into_wrong_size(self, server_address): + # Call sock_sendto() with a size larger than the buffer + with socket.socket(socket.AF_INET, socket.SOCK_DGRAM) as sock: + sock.setblocking(False) + + buf = bytearray(5000) + data = b'\x01' * 4096 + wrong_size = len(buf) + 1 + await self.loop.sock_sendto(sock, data, server_address) + with self.assertRaises(ValueError): + await self.loop.sock_recvfrom_into( + sock, buf, wrong_size) + + size, addr = await self.loop.sock_recvfrom_into(sock, buf) + self.assertEqual(buf[:size], data) + + def test_recvfrom_into_wrong_size(self): + with test_utils.run_udp_echo_server() as server_address: + self.loop.run_until_complete( + self._basetest_datagram_recvfrom_into_wrong_size(server_address)) + async def _basetest_datagram_sendto_blocking(self, server_address): # Sad path, sock.sendto() raises BlockingIOError # This involves patching sock.sendto() to raise BlockingIOError but @@ -642,6 +663,10 @@ if sys.platform == 'win32': self._basetest_datagram_send_to_non_listening_address( recvfrom_into)) + @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON; AssertionError: ValueError not raised") + def test_recvfrom_into_wrong_size(self): + return super().test_recvfrom_into_wrong_size() + else: import selectors diff --git a/Lib/test/test_asyncio/test_ssl.py b/Lib/test/test_asyncio/test_ssl.py index ab4a2316f..932b1dace 100644 --- a/Lib/test/test_asyncio/test_ssl.py +++ b/Lib/test/test_asyncio/test_ssl.py @@ -27,6 +27,7 @@ from test.test_asyncio import utils as test_utils MACOS = (sys.platform == 'darwin') BUF_MULTIPLIER = 1024 if not MACOS else 64 +HANDSHAKE_TIMEOUT = support.LONG_TIMEOUT def tearDownModule(): @@ -257,15 +258,12 @@ class TestSSL(test_utils.TestCase): await fut async def start_server(): - extras = {} - extras = dict(ssl_handshake_timeout=support.SHORT_TIMEOUT) - srv = await asyncio.start_server( handle_client, '127.0.0.1', 0, family=socket.AF_INET, ssl=sslctx, - **extras) + ssl_handshake_timeout=HANDSHAKE_TIMEOUT) try: srv_socks = srv.sockets @@ -322,14 +320,11 @@ class TestSSL(test_utils.TestCase): sock.close() async def client(addr): - extras = {} - extras = dict(ssl_handshake_timeout=support.SHORT_TIMEOUT) - reader, writer = await asyncio.open_connection( *addr, ssl=client_sslctx, server_hostname='', - **extras) + ssl_handshake_timeout=HANDSHAKE_TIMEOUT) writer.write(A_DATA) self.assertEqual(await reader.readexactly(2), b'OK') @@ -349,7 +344,8 @@ class TestSSL(test_utils.TestCase): reader, writer = await asyncio.open_connection( sock=sock, ssl=client_sslctx, - server_hostname='') + server_hostname='', + ssl_handshake_timeout=HANDSHAKE_TIMEOUT) writer.write(A_DATA) self.assertEqual(await reader.readexactly(2), b'OK') @@ -448,7 +444,7 @@ class TestSSL(test_utils.TestCase): *addr, ssl=client_sslctx, server_hostname='', - ssl_handshake_timeout=support.SHORT_TIMEOUT) + ssl_handshake_timeout=HANDSHAKE_TIMEOUT) writer.close() await self.wait_closed(writer) @@ -610,7 +606,7 @@ class TestSSL(test_utils.TestCase): extras = {} if server_ssl: - extras = dict(ssl_handshake_timeout=support.SHORT_TIMEOUT) + extras = dict(ssl_handshake_timeout=HANDSHAKE_TIMEOUT) f = loop.create_task( loop.connect_accepted_socket( @@ -659,7 +655,8 @@ class TestSSL(test_utils.TestCase): reader, writer = await asyncio.open_connection( *addr, ssl=client_sslctx, - server_hostname='') + server_hostname='', + ssl_handshake_timeout=HANDSHAKE_TIMEOUT) self.assertEqual(await reader.readline(), b'A\n') writer.write(b'B') @@ -1153,14 +1150,11 @@ class TestSSL(test_utils.TestCase): await fut async def start_server(): - extras = {} - srv = await self.loop.create_server( server_protocol_factory, '127.0.0.1', 0, family=socket.AF_INET, - ssl=sslctx_1, - **extras) + ssl=sslctx_1) try: srv_socks = srv.sockets @@ -1210,14 +1204,11 @@ class TestSSL(test_utils.TestCase): sock.close() async def client(addr): - extras = {} - extras = dict(ssl_handshake_timeout=support.SHORT_TIMEOUT) - reader, writer = await asyncio.open_connection( *addr, ssl=client_sslctx, server_hostname='', - **extras) + ssl_handshake_timeout=HANDSHAKE_TIMEOUT) writer.write(A_DATA) self.assertEqual(await reader.readexactly(2), b'OK') @@ -1287,7 +1278,8 @@ class TestSSL(test_utils.TestCase): reader, writer = await asyncio.open_connection( *addr, ssl=client_sslctx, - server_hostname='') + server_hostname='', + ssl_handshake_timeout=HANDSHAKE_TIMEOUT) sslprotocol = writer.transport._ssl_protocol writer.write(b'ping') data = await reader.readexactly(4) @@ -1399,7 +1391,8 @@ class TestSSL(test_utils.TestCase): reader, writer = await asyncio.open_connection( *addr, ssl=client_sslctx, - server_hostname='') + server_hostname='', + ssl_handshake_timeout=HANDSHAKE_TIMEOUT) writer.write(b'ping') data = await reader.readexactly(4) self.assertEqual(data, b'pong') @@ -1530,7 +1523,8 @@ class TestSSL(test_utils.TestCase): reader, writer = await asyncio.open_connection( *addr, ssl=client_sslctx, - server_hostname='') + server_hostname='', + ssl_handshake_timeout=HANDSHAKE_TIMEOUT) writer.write(b'ping') data = await reader.readexactly(4) self.assertEqual(data, b'pong') diff --git a/Lib/test/test_asyncio/test_streams.py b/Lib/test/test_asyncio/test_streams.py index 5f0fc6a7a..739a82e57 100644 --- a/Lib/test/test_asyncio/test_streams.py +++ b/Lib/test/test_asyncio/test_streams.py @@ -819,6 +819,48 @@ class StreamTests(test_utils.TestCase): self.assertEqual(msg1, b"hello world 1!\n") self.assertEqual(msg2, b"hello world 2!\n") + @unittest.skipIf(ssl is None, 'No ssl module') + def test_start_tls_buffered_data(self): + # gh-142352: test start_tls() with buffered data + + async def server_handler(client_reader, client_writer): + # Wait for TLS ClientHello to be buffered before start_tls(). + await client_reader._wait_for_data('test_start_tls_buffered_data'), + self.assertTrue(client_reader._buffer) + await client_writer.start_tls(test_utils.simple_server_sslcontext()) + + line = await client_reader.readline() + self.assertEqual(line, b"ping\n") + client_writer.write(b"pong\n") + await client_writer.drain() + client_writer.close() + await client_writer.wait_closed() + + async def client(addr): + reader, writer = await asyncio.open_connection(*addr) + await writer.start_tls(test_utils.simple_client_sslcontext()) + + writer.write(b"ping\n") + await writer.drain() + line = await reader.readline() + self.assertEqual(line, b"pong\n") + writer.close() + await writer.wait_closed() + + async def run_test(): + server = await asyncio.start_server( + server_handler, socket_helper.HOSTv4, 0) + server_addr = server.sockets[0].getsockname() + + await client(server_addr) + server.close() + await server.wait_closed() + + messages = [] + self.loop.set_exception_handler(lambda loop, ctx: messages.append(ctx)) + self.loop.run_until_complete(run_test()) + self.assertEqual(messages, []) + def test_streamreader_constructor_without_loop(self): with self.assertRaisesRegex(RuntimeError, 'no current event loop'): asyncio.StreamReader() diff --git a/Lib/test/test_asyncio/test_subprocess.py b/Lib/test/test_asyncio/test_subprocess.py index bf3017407..c08eb7cf2 100644 --- a/Lib/test/test_asyncio/test_subprocess.py +++ b/Lib/test/test_asyncio/test_subprocess.py @@ -111,6 +111,37 @@ class SubprocessTransportTests(test_utils.TestCase): ) transport.close() + def test_proc_exited_no_invalid_state_error_on_exit_waiters(self): + # gh-145541: when _connect_pipes hasn't completed (so + # _pipes_connected is False) and the process exits, _try_finish() + # sets the result on exit waiters. Then _call_connection_lost() must + # not call set_result() again on the same waiters. + self.loop.set_exception_handler( + lambda loop, context: self.fail( + f"unexpected exception: {context}") + ) + waiter = self.loop.create_future() + transport, protocol = self.create_transport(waiter) + + # Simulate a waiter registered via _wait() before the process exits. + exit_waiter = self.loop.create_future() + transport._exit_waiters.append(exit_waiter) + + # _connect_pipes hasn't completed, so _pipes_connected is False. + self.assertFalse(transport._pipes_connected) + + # Simulate process exit. _try_finish() will set the result on + # exit_waiter because _pipes_connected is False, and then schedule + # _call_connection_lost() because _pipes is empty (vacuously all + # disconnected). _call_connection_lost() must skip exit_waiter + # because it's already done. + transport._process_exited(6) + self.loop.run_until_complete(waiter) + + self.assertEqual(exit_waiter.result(), 6) + + transport.close() + class SubprocessMixin: diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py index 9fbad3d0e..5a4157c97 100644 --- a/Lib/test/test_asyncio/test_tasks.py +++ b/Lib/test/test_asyncio/test_tasks.py @@ -2947,7 +2947,6 @@ class CTask_CFuture_Tests(BaseTaskTests, SetMethodsTest, return super().test_log_destroyed_pending_task() - @unittest.skipUnless(hasattr(futures, '_CFuture') and hasattr(tasks, '_CTask'), 'requires the C _asyncio module') @@ -3030,7 +3029,6 @@ class PyTask_PyFuture_SubclassTests(BaseTaskTests, test_utils.TestCase): all_tasks = staticmethod(tasks._py_all_tasks) current_task = staticmethod(tasks._py_current_task) - @unittest.skipUnless(hasattr(tasks, '_CTask'), 'requires the C _asyncio module') class CTask_Future_Tests(test_utils.TestCase): @@ -3063,6 +3061,26 @@ class BaseTaskIntrospectionTests: _enter_task = None _leave_task = None all_tasks = None + Task = None + + def test_register_task_resurrection(self): + register_task = self._register_task + class EvilLoop: + def get_debug(self): + return False + + def call_exception_handler(self, context): + register_task(context["task"]) + + async def coro_fn (): + pass + + coro = coro_fn() + self.addCleanup(coro.close) + loop = EvilLoop() + with self.assertRaises(AttributeError): + self.Task(coro, loop=loop) + def test__register_task_1(self): class TaskLike: @@ -3193,6 +3211,7 @@ class PyIntrospectionTests(test_utils.TestCase, BaseTaskIntrospectionTests): _leave_task = staticmethod(tasks._py_leave_task) all_tasks = staticmethod(tasks._py_all_tasks) current_task = staticmethod(tasks._py_current_task) + Task = tasks._PyTask @unittest.skipUnless(hasattr(tasks, '_c_register_task'), @@ -3205,10 +3224,12 @@ class CIntrospectionTests(test_utils.TestCase, BaseTaskIntrospectionTests): _leave_task = staticmethod(tasks._c_leave_task) all_tasks = staticmethod(tasks._c_all_tasks) current_task = staticmethod(tasks._c_current_task) + Task = tasks._CTask else: _register_task = _unregister_task = _enter_task = _leave_task = None + class BaseCurrentLoopTests: current_task = None @@ -3698,6 +3719,30 @@ class RunCoroutineThreadsafeTests(test_utils.TestCase): (loop, context), kwargs = callback.call_args self.assertEqual(context['exception'], exc_context.exception) + def test_run_coroutine_threadsafe_and_cancel(self): + task = None + thread_future = None + # Use a custom task factory to capture the created Task + def task_factory(loop, coro): + nonlocal task + task = asyncio.Task(coro, loop=loop) + return task + + self.addCleanup(self.loop.set_task_factory, + self.loop.get_task_factory()) + + async def target(): + nonlocal thread_future + self.loop.set_task_factory(task_factory) + thread_future = asyncio.run_coroutine_threadsafe(asyncio.sleep(10), self.loop) + await asyncio.sleep(0) + + thread_future.cancel() + + self.loop.run_until_complete(target()) + self.assertTrue(task.cancelled()) + self.assertTrue(thread_future.cancelled()) + class SleepTests(test_utils.TestCase): def setUp(self): diff --git a/Lib/test/test_asyncio/test_windows_utils.py b/Lib/test/test_asyncio/test_windows_utils.py index 97f078ff9..509697613 100644 --- a/Lib/test/test_asyncio/test_windows_utils.py +++ b/Lib/test/test_asyncio/test_windows_utils.py @@ -77,6 +77,30 @@ class PipeTests(unittest.TestCase): else: raise RuntimeError('expected ERROR_INVALID_HANDLE') + def test_pipe_handle_close_after_external_close(self): + # gh-149388: PipeHandle.close() must clear ``_handle`` before calling + # CloseHandle so that if CloseHandle raises on a stale handle the + # PipeHandle is still marked closed and __del__ / subsequent close() + # calls are silent no-ops. + h1, h2 = windows_utils.pipe(overlapped=(False, False)) + try: + p = windows_utils.PipeHandle(h1) + # Simulate an external close of the underlying handle (e.g. + # a finalizer race or a concurrent close on the same object). + _winapi.CloseHandle(p.handle) + # First close() still propagates the OSError from CloseHandle, + # but must clear ``_handle`` first. + with self.assertRaises(OSError): + p.close() + self.assertIsNone(p.handle) + # Second close() is a no-op. + p.close() + # __del__ through GC is also a silent no-op — no unraisable. + del p + support.gc_collect() + finally: + _winapi.CloseHandle(h2) + class PopenTests(unittest.TestCase): @@ -129,5 +153,25 @@ class PopenTests(unittest.TestCase): pass +class OverlappedRefleakTests(unittest.TestCase): + + def test_wsasendto_failure(self): + ov = _overlapped.Overlapped() + buf = bytearray(4096) + with self.assertRaises(OSError): + ov.WSASendTo(0x1234, buf, 0, ("127.0.0.1", 1)) + + def test_wsarecvfrom_failure(self): + ov = _overlapped.Overlapped() + with self.assertRaises(OSError): + ov.WSARecvFrom(0x1234, 1024, 0) + + def test_wsarecvfrominto_failure(self): + ov = _overlapped.Overlapped() + buf = bytearray(4096) + with self.assertRaises(OSError): + ov.WSARecvFromInto(0x1234, buf, len(buf), 0) + + if __name__ == '__main__': unittest.main() From 7f97f9b2b7a43acee015645b553bcf65787037ac Mon Sep 17 00:00:00 2001 From: Bas Schoenmaeckers <7943856+bschoenmaeckers@users.noreply.github.com> Date: Wed, 3 Jun 2026 11:34:49 +0200 Subject: [PATCH 014/339] Add number protocol functions (#8005) --- crates/capi/src/abstract_.rs | 2 + crates/capi/src/abstract_/number.rs | 86 +++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 crates/capi/src/abstract_/number.rs diff --git a/crates/capi/src/abstract_.rs b/crates/capi/src/abstract_.rs index 4ef8bbb24..a677c98c7 100644 --- a/crates/capi/src/abstract_.rs +++ b/crates/capi/src/abstract_.rs @@ -2,12 +2,14 @@ use crate::{PyObject, pystate::with_vm}; use alloc::slice; use core::ffi::c_int; pub use mapping::*; +pub use number::*; use rustpython_vm::builtins::{PyDict, PyStr, PyTuple}; use rustpython_vm::function::{FuncArgs, KwArgs, PosArgs}; use rustpython_vm::{AsObject, Py, PyObjectRef, PyResult, VirtualMachine}; pub use sequence::*; mod mapping; +mod number; mod sequence; const PY_VECTORCALL_ARGUMENTS_OFFSET: usize = 1usize << (usize::BITS as usize - 1); diff --git a/crates/capi/src/abstract_/number.rs b/crates/capi/src/abstract_/number.rs new file mode 100644 index 000000000..c5ec492a7 --- /dev/null +++ b/crates/capi/src/abstract_/number.rs @@ -0,0 +1,86 @@ +use crate::{PyObject, pystate::with_vm}; + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyNumber_Add(o1: *mut PyObject, o2: *mut PyObject) -> *mut PyObject { + with_vm(|vm| vm._add(unsafe { &*o1 }, unsafe { &*o2 })) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyNumber_Index(obj: *mut PyObject) -> *mut PyObject { + with_vm(|vm| unsafe { &*obj }.try_index(vm)) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyNumber_Lshift(o1: *mut PyObject, o2: *mut PyObject) -> *mut PyObject { + with_vm(|vm| vm._lshift(unsafe { &*o1 }, unsafe { &*o2 })) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyNumber_Or(o1: *mut PyObject, o2: *mut PyObject) -> *mut PyObject { + with_vm(|vm| vm._or(unsafe { &*o1 }, unsafe { &*o2 })) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyNumber_Rshift(o1: *mut PyObject, o2: *mut PyObject) -> *mut PyObject { + with_vm(|vm| vm._rshift(unsafe { &*o1 }, unsafe { &*o2 })) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyNumber_Subtract(o1: *mut PyObject, o2: *mut PyObject) -> *mut PyObject { + with_vm(|vm| vm._sub(unsafe { &*o1 }, unsafe { &*o2 })) +} + +#[cfg(false)] +mod tests { + use pyo3::prelude::*; + + #[test] + fn add() { + Python::attach(|py| { + let lhs = 40i64.into_pyobject(py).unwrap(); + let rhs = 2i64.into_pyobject(py).unwrap(); + let out = lhs.add(rhs).unwrap(); + assert_eq!(out.extract::().unwrap(), 42); + }) + } + + #[test] + fn lshift() { + Python::attach(|py| { + let lhs = 1i64.into_pyobject(py).unwrap(); + let rhs = 5i64.into_pyobject(py).unwrap(); + let out = lhs.lshift(rhs).unwrap(); + assert_eq!(out.extract::().unwrap(), 32); + }) + } + + #[test] + fn bit_or() { + Python::attach(|py| { + let lhs = 0b1010i64.into_pyobject(py).unwrap(); + let rhs = 0b0110i64.into_pyobject(py).unwrap(); + let out = lhs.bitor(rhs).unwrap(); + assert_eq!(out.extract::().unwrap(), 0b1110); + }) + } + + #[test] + fn rshift() { + Python::attach(|py| { + let lhs = 128i64.into_pyobject(py).unwrap(); + let rhs = 3i64.into_pyobject(py).unwrap(); + let out = lhs.rshift(rhs).unwrap(); + assert_eq!(out.extract::().unwrap(), 16); + }) + } + + #[test] + fn subtract() { + Python::attach(|py| { + let lhs = 50i64.into_pyobject(py).unwrap(); + let rhs = 8i64.into_pyobject(py).unwrap(); + let out = lhs.sub(rhs).unwrap(); + assert_eq!(out.extract::().unwrap(), 42); + }) + } +} From 6937f3b5599f47395afb3aeb524b3d26dc133006 Mon Sep 17 00:00:00 2001 From: Bas Schoenmaeckers <7943856+bschoenmaeckers@users.noreply.github.com> Date: Wed, 3 Jun 2026 11:35:31 +0200 Subject: [PATCH 015/339] Add slice functions to c-api (#8019) --- crates/capi/src/lib.rs | 1 + crates/capi/src/sliceobject.rs | 106 +++++++++++++++++++++++++++++++++ crates/vm/src/sliceable.rs | 20 +++++++ 3 files changed, 127 insertions(+) create mode 100644 crates/capi/src/sliceobject.rs diff --git a/crates/capi/src/lib.rs b/crates/capi/src/lib.rs index 2daee1f26..15230958a 100644 --- a/crates/capi/src/lib.rs +++ b/crates/capi/src/lib.rs @@ -26,6 +26,7 @@ pub mod pylifecycle; pub mod pystate; pub mod refcount; pub mod setobject; +pub mod sliceobject; pub mod traceback; pub mod tupleobject; pub mod unicodeobject; diff --git a/crates/capi/src/sliceobject.rs b/crates/capi/src/sliceobject.rs new file mode 100644 index 000000000..2a625fab5 --- /dev/null +++ b/crates/capi/src/sliceobject.rs @@ -0,0 +1,106 @@ +use crate::PyObject; +use crate::pystate::with_vm; +use core::ffi::c_int; +use rustpython_vm::PyPayload; +use rustpython_vm::builtins::PySlice; +use rustpython_vm::sliceable::SaturatedSlice; + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PySlice_New( + start: *mut PyObject, + stop: *mut PyObject, + step: *mut PyObject, +) -> *mut PyObject { + with_vm(|vm| { + let start = if start.is_null() { + None + } else { + Some(unsafe { &*start }.to_owned()) + }; + let stop = if stop.is_null() { + vm.ctx.none() + } else { + unsafe { &*stop }.to_owned() + }; + let step = if step.is_null() { + None + } else { + Some(unsafe { &*step }.to_owned()) + }; + Ok(PySlice { start, stop, step }.into_ref(&vm.ctx)) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PySlice_Unpack( + slice: *mut PyObject, + start: *mut isize, + stop: *mut isize, + step: *mut isize, +) -> c_int { + with_vm(|vm| { + let slice = unsafe { &*slice }.try_downcast_ref::(vm)?; + let saturated = slice.to_saturated(vm)?; + unsafe { + *start = saturated.start(); + *stop = saturated.stop(); + *step = saturated.step(); + } + Ok(()) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PySlice_AdjustIndices( + length: isize, + start: *mut isize, + stop: *mut isize, + step: isize, +) -> isize { + let length = length.max(0) as usize; + let saturated = SaturatedSlice::from_parts(unsafe { *start }, unsafe { *stop }, step); + let (range, _, slice_len) = saturated.adjust_indices(length); + unsafe { + if step.is_negative() { + *start = range.end as isize - 1; + *stop = range.start as isize - 1; + } else { + *start = range.start as isize; + *stop = range.end as isize; + } + } + slice_len as isize +} + +#[cfg(false)] +mod tests { + use pyo3::prelude::*; + use pyo3::types::{PySlice, PySliceMethods}; + + #[test] + fn slice_new_indices() { + Python::attach(|py| { + let slice = PySlice::new(py, 1, 10, 3); + let indices = slice.indices(100).unwrap(); + assert_eq!((indices.start, indices.stop, indices.step), (1, 10, 3)); + }) + } + + #[test] + fn slice_full_defaults() { + Python::attach(|py| { + let slice = PySlice::full(py); + let indices = slice.indices(5).unwrap(); + assert_eq!((indices.start, indices.stop, indices.step), (0, 5, 1)); + }) + } + + #[test] + fn slice_new_negative_step() { + Python::attach(|py| { + let slice = PySlice::new(py, 10, 1, -2); + let indices = slice.indices(100).unwrap(); + assert_eq!((indices.start, indices.stop, indices.step), (10, 1, -2)); + }) + } +} diff --git a/crates/vm/src/sliceable.rs b/crates/vm/src/sliceable.rs index dd4dd5097..b0f4c7808 100644 --- a/crates/vm/src/sliceable.rs +++ b/crates/vm/src/sliceable.rs @@ -347,6 +347,26 @@ pub struct SaturatedSlice { } impl SaturatedSlice { + #[must_use] + pub const fn from_parts(start: isize, stop: isize, step: isize) -> Self { + Self { start, stop, step } + } + + #[must_use] + pub const fn start(&self) -> isize { + self.start + } + + #[must_use] + pub const fn stop(&self) -> isize { + self.stop + } + + #[must_use] + pub const fn step(&self) -> isize { + self.step + } + // Equivalent to PySlice_Unpack. pub fn with_slice(slice: &PySlice, vm: &VirtualMachine) -> PyResult { let step = to_isize_index(vm, slice.step_ref(vm))?.unwrap_or(1); From f3ee5099ac5f7dff597920cdfe47ac4995e1cf8b Mon Sep 17 00:00:00 2001 From: Bas Schoenmaeckers <7943856+bschoenmaeckers@users.noreply.github.com> Date: Wed, 3 Jun 2026 11:36:15 +0200 Subject: [PATCH 016/339] Add bytesarray support to the c-api (#8009) * Add bytesarray support to the c-api * Add SAFETY comment --- crates/capi/src/bytearrayobject.rs | 127 ++++++++++++++++++++++++++++ crates/capi/src/lib.rs | 1 + crates/capi/src/util.rs | 8 ++ crates/vm/src/builtins/bytearray.rs | 2 +- 4 files changed, 137 insertions(+), 1 deletion(-) create mode 100644 crates/capi/src/bytearrayobject.rs diff --git a/crates/capi/src/bytearrayobject.rs b/crates/capi/src/bytearrayobject.rs new file mode 100644 index 000000000..2bc56895b --- /dev/null +++ b/crates/capi/src/bytearrayobject.rs @@ -0,0 +1,127 @@ +use crate::PyObject; +use crate::object::define_py_check; +use crate::pystate::with_vm; +use core::ffi::c_char; +use rustpython_vm::builtins::PyByteArray; +use rustpython_vm::byte::bytes_from_object; + +define_py_check!(fn PyByteArray_Check, types.bytearray_type); + +/// # Safety +/// +/// If `bytes` is `NULL`, the returned bytearray may contain uninitialized +/// bytes. The caller is responsible for initializing all bytes before any read. +#[unsafe(no_mangle)] +#[allow(clippy::uninit_vec)] +pub unsafe extern "C" fn PyByteArray_FromStringAndSize( + bytes: *const c_char, + len: isize, +) -> *mut PyObject { + with_vm(|vm| { + let len: usize = len.try_into().map_err(|_| { + vm.new_system_error("Negative size passed to PyByteArray_FromStringAndSize") + })?; + + let data = if bytes.is_null() { + let mut data = Vec::with_capacity(len); + // SAFETY: `bytes == NULL` follows CPython semantics here; caller must + // initialize all bytes before any read. We keep this behavior for C-API + // compatibility and to avoid unnecessary zero-initialization overhead. + unsafe { data.set_len(len) }; + data + } else { + unsafe { core::slice::from_raw_parts(bytes.cast::(), len) }.to_vec() + }; + + Ok(vm.ctx.new_bytearray(data)) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyByteArray_FromObject(obj: *mut PyObject) -> *mut PyObject { + with_vm(|vm| { + let obj = unsafe { &*obj }; + let data = bytes_from_object(vm, obj)?; + Ok(vm.ctx.new_bytearray(data)) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyByteArray_Size(bytearray: *mut PyObject) -> isize { + with_vm(|vm| { + let bytearray = unsafe { &*bytearray }.try_downcast_ref::(vm)?; + Ok(bytearray.borrow_buf().len()) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyByteArray_AsString(bytearray: *mut PyObject) -> *mut c_char { + with_vm(|vm| { + let bytearray = unsafe { &*bytearray }.try_downcast_ref::(vm)?; + Ok(bytearray.borrow_buf_mut().as_mut_ptr()) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyByteArray_Resize(bytearray: *mut PyObject, len: isize) -> i32 { + with_vm(|vm| { + let bytearray = unsafe { &*bytearray }.try_downcast_ref::(vm)?; + bytearray.resize(len, vm)?; + Ok(()) + }) +} + +#[cfg(false)] +mod tests { + use pyo3::prelude::*; + use pyo3::types::{PyByteArray, PyBytes}; + + #[test] + fn bytearray_size() { + Python::attach(|py| { + let bytearray = PyByteArray::new(py, b"abc"); + assert_eq!(bytearray.len(), 3); + }) + } + + #[test] + fn bytearray_resize() { + Python::attach(|py| { + let bytearray = PyByteArray::new(py, b"abcde"); + bytearray.resize(3).unwrap(); + assert_eq!(bytearray.len(), 3); + assert_eq!(bytearray.to_vec(), b"abc"); + }) + } + + #[test] + fn bytearray_from_string_and_size() { + Python::attach(|py| { + let bytearray = PyByteArray::new(py, b"hello"); + assert_eq!(bytearray.len(), 5); + assert_eq!(bytearray.to_vec(), b"hello"); + }) + } + + #[test] + fn bytearray_new_with_zero_initialized() { + Python::attach(|py| { + let bytearray = PyByteArray::new_with(py, 4, |bytes| { + bytes[..2].copy_from_slice(b"hi"); + Ok(()) + }) + .unwrap(); + assert_eq!(bytearray.len(), 4); + assert_eq!(bytearray.to_vec(), b"hi\0\0"); + }) + } + + #[test] + fn bytearray_from_object() { + Python::attach(|py| { + let source = PyBytes::new(py, b"ABC"); + let bytearray = PyByteArray::from(&source).unwrap(); + assert_eq!(bytearray.to_vec(), b"ABC"); + }) + } +} diff --git a/crates/capi/src/lib.rs b/crates/capi/src/lib.rs index 15230958a..99a606783 100644 --- a/crates/capi/src/lib.rs +++ b/crates/capi/src/lib.rs @@ -10,6 +10,7 @@ extern crate alloc; pub mod abstract_; pub mod boolobject; +pub mod bytearrayobject; pub mod bytesobject; pub mod ceval; pub mod complexobject; diff --git a/crates/capi/src/util.rs b/crates/capi/src/util.rs index 6eef9163a..24d6d3d40 100644 --- a/crates/capi/src/util.rs +++ b/crates/capi/src/util.rs @@ -76,6 +76,14 @@ impl FfiResult<*mut c_char> for *const u8 { } } +impl FfiResult<*mut c_char> for *mut u8 { + const ERR_VALUE: *mut c_char = core::ptr::null_mut(); + + fn into_output(self, _vm: &VirtualMachine) -> *mut c_char { + self.cast() + } +} + impl FfiResult for *const c_char { const ERR_VALUE: *const c_char = core::ptr::null_mut(); diff --git a/crates/vm/src/builtins/bytearray.rs b/crates/vm/src/builtins/bytearray.rs index 5a1b8565a..63b10552f 100644 --- a/crates/vm/src/builtins/bytearray.rs +++ b/crates/vm/src/builtins/bytearray.rs @@ -548,7 +548,7 @@ impl PyByteArray { } #[pymethod] - fn resize(&self, size: isize, vm: &VirtualMachine) -> PyResult<()> { + pub fn resize(&self, size: isize, vm: &VirtualMachine) -> PyResult<()> { if size < 0 { return Err(vm.new_value_error("bytearray.resize(): new size must be >= 0")); } From 42256aab5fb889cf13966d3d470f2099b6cd61d1 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Wed, 3 Jun 2026 12:36:37 +0300 Subject: [PATCH 017/339] Update `turtle.py` to 3.14.5 (#8017) --- Lib/test/test_turtle.py | 695 +++++ Lib/turtle.py | 4291 +++++++++++++++++++++++++++++ Lib/turtledemo/__init__.py | 14 + Lib/turtledemo/__main__.py | 399 +++ Lib/turtledemo/bytedesign.py | 158 ++ Lib/turtledemo/chaos.py | 57 + Lib/turtledemo/clock.py | 132 + Lib/turtledemo/colormixer.py | 57 + Lib/turtledemo/forest.py | 104 + Lib/turtledemo/fractalcurves.py | 135 + Lib/turtledemo/lindenmayer.py | 116 + Lib/turtledemo/minimal_hanoi.py | 73 + Lib/turtledemo/nim.py | 224 ++ Lib/turtledemo/paint.py | 48 + Lib/turtledemo/peace.py | 58 + Lib/turtledemo/penrose.py | 172 ++ Lib/turtledemo/planet_and_moon.py | 108 + Lib/turtledemo/rosette.py | 63 + Lib/turtledemo/round_dance.py | 81 + Lib/turtledemo/sorting_animate.py | 198 ++ Lib/turtledemo/tree.py | 59 + Lib/turtledemo/turtle.cfg | 10 + Lib/turtledemo/two_canvases.py | 54 + Lib/turtledemo/yinyang.py | 46 + 24 files changed, 7352 insertions(+) create mode 100644 Lib/test/test_turtle.py create mode 100644 Lib/turtle.py create mode 100644 Lib/turtledemo/__init__.py create mode 100644 Lib/turtledemo/__main__.py create mode 100644 Lib/turtledemo/bytedesign.py create mode 100644 Lib/turtledemo/chaos.py create mode 100644 Lib/turtledemo/clock.py create mode 100644 Lib/turtledemo/colormixer.py create mode 100644 Lib/turtledemo/forest.py create mode 100644 Lib/turtledemo/fractalcurves.py create mode 100644 Lib/turtledemo/lindenmayer.py create mode 100644 Lib/turtledemo/minimal_hanoi.py create mode 100644 Lib/turtledemo/nim.py create mode 100644 Lib/turtledemo/paint.py create mode 100644 Lib/turtledemo/peace.py create mode 100644 Lib/turtledemo/penrose.py create mode 100644 Lib/turtledemo/planet_and_moon.py create mode 100644 Lib/turtledemo/rosette.py create mode 100644 Lib/turtledemo/round_dance.py create mode 100644 Lib/turtledemo/sorting_animate.py create mode 100644 Lib/turtledemo/tree.py create mode 100644 Lib/turtledemo/turtle.cfg create mode 100644 Lib/turtledemo/two_canvases.py create mode 100644 Lib/turtledemo/yinyang.py diff --git a/Lib/test/test_turtle.py b/Lib/test/test_turtle.py new file mode 100644 index 000000000..12d2eed87 --- /dev/null +++ b/Lib/test/test_turtle.py @@ -0,0 +1,695 @@ +import os +import pickle +import re +import tempfile +import unittest +import unittest.mock +from test import support +from test.support import import_helper +from test.support import os_helper + + +turtle = import_helper.import_module('turtle') +Vec2D = turtle.Vec2D + +test_config = """\ +width = 0.75 +height = 0.8 +canvwidth = 500 +canvheight = 200 +leftright = 100 +topbottom = 100 +mode = world +colormode = 255 +delay = 100 +undobuffersize = 10000 +shape = circle +pencolor = red +fillcolor = blue +resizemode = auto +visible = None +language = english +exampleturtle = turtle +examplescreen = screen +title = Python Turtle Graphics +using_IDLE = '' +""" + +test_config_two = """\ +# Comments! +# Testing comments! +pencolor = red +fillcolor = blue +visible = False +language = english +# Some more +# comments +using_IDLE = False +""" + +invalid_test_config = """ +pencolor = red +fillcolor: blue +visible = False +""" + + +def patch_screen(): + """Patch turtle._Screen for testing without a display. + + We must patch the _Screen class itself instead of the _Screen + instance because instantiating it requires a display. + """ + # Create a mock screen that delegates color validation to the real TurtleScreen methods + mock_screen = unittest.mock.MagicMock() + mock_screen.__class__ = turtle._Screen + mock_screen.mode.return_value = "standard" + mock_screen._colormode = 1.0 + + def mock_iscolorstring(color): + valid_colors = {'red', 'green', 'blue', 'black', 'white', 'yellow', + 'orange', 'purple', 'pink', 'brown', 'gray', 'grey', + 'cyan', 'magenta'} + + return color in valid_colors or (isinstance(color, str) and color.startswith('#')) + + mock_screen._iscolorstring = mock_iscolorstring + mock_screen._colorstr = turtle._Screen._colorstr.__get__(mock_screen) + + return unittest.mock.patch( + "turtle._Screen.__new__", + return_value=mock_screen + ) + + +class TurtleConfigTest(unittest.TestCase): + + def get_cfg_file(self, cfg_str): + self.addCleanup(os_helper.unlink, os_helper.TESTFN) + with open(os_helper.TESTFN, 'w') as f: + f.write(cfg_str) + return os_helper.TESTFN + + def test_config_dict(self): + + cfg_name = self.get_cfg_file(test_config) + parsed_cfg = turtle.config_dict(cfg_name) + + expected = { + 'width' : 0.75, + 'height' : 0.8, + 'canvwidth' : 500, + 'canvheight': 200, + 'leftright': 100, + 'topbottom': 100, + 'mode': 'world', + 'colormode': 255, + 'delay': 100, + 'undobuffersize': 10000, + 'shape': 'circle', + 'pencolor' : 'red', + 'fillcolor' : 'blue', + 'resizemode' : 'auto', + 'visible' : None, + 'language': 'english', + 'exampleturtle': 'turtle', + 'examplescreen': 'screen', + 'title': 'Python Turtle Graphics', + 'using_IDLE': '', + } + + self.assertEqual(parsed_cfg, expected) + + def test_partial_config_dict_with_comments(self): + + cfg_name = self.get_cfg_file(test_config_two) + parsed_cfg = turtle.config_dict(cfg_name) + + expected = { + 'pencolor': 'red', + 'fillcolor': 'blue', + 'visible': False, + 'language': 'english', + 'using_IDLE': False, + } + + self.assertEqual(parsed_cfg, expected) + + def test_config_dict_invalid(self): + + cfg_name = self.get_cfg_file(invalid_test_config) + + with support.captured_stdout() as stdout: + parsed_cfg = turtle.config_dict(cfg_name) + + err_msg = stdout.getvalue() + + self.assertIn('Bad line in config-file ', err_msg) + self.assertIn('fillcolor: blue', err_msg) + + self.assertEqual(parsed_cfg, { + 'pencolor': 'red', + 'visible': False, + }) + + +class VectorComparisonMixin: + + def assertVectorsAlmostEqual(self, vec1, vec2): + if len(vec1) != len(vec2): + self.fail("Tuples are not of equal size") + for idx, (i, j) in enumerate(zip(vec1, vec2)): + self.assertAlmostEqual( + i, j, msg='values at index {} do not match'.format(idx)) + + +class Multiplier: + + def __mul__(self, other): + return f'M*{other}' + + def __rmul__(self, other): + return f'{other}*M' + + +class TestVec2D(VectorComparisonMixin, unittest.TestCase): + + def test_constructor(self): + vec = Vec2D(0.5, 2) + self.assertEqual(vec[0], 0.5) + self.assertEqual(vec[1], 2) + self.assertIsInstance(vec, Vec2D) + + self.assertRaises(TypeError, Vec2D) + self.assertRaises(TypeError, Vec2D, 0) + self.assertRaises(TypeError, Vec2D, (0, 1)) + self.assertRaises(TypeError, Vec2D, vec) + self.assertRaises(TypeError, Vec2D, 0, 1, 2) + + def test_repr(self): + vec = Vec2D(0.567, 1.234) + self.assertEqual(repr(vec), '(0.57,1.23)') + + def test_equality(self): + vec1 = Vec2D(0, 1) + vec2 = Vec2D(0.0, 1) + vec3 = Vec2D(42, 1) + self.assertEqual(vec1, vec2) + self.assertEqual(vec1, tuple(vec1)) + self.assertEqual(tuple(vec1), vec1) + self.assertNotEqual(vec1, vec3) + self.assertNotEqual(vec2, vec3) + + def test_pickling(self): + vec = Vec2D(0.5, 2) + for proto in range(pickle.HIGHEST_PROTOCOL + 1): + with self.subTest(proto=proto): + pickled = pickle.dumps(vec, protocol=proto) + unpickled = pickle.loads(pickled) + self.assertEqual(unpickled, vec) + self.assertIsInstance(unpickled, Vec2D) + + def _assert_arithmetic_cases(self, test_cases, lambda_operator): + for test_case in test_cases: + with self.subTest(case=test_case): + + ((first, second), expected) = test_case + + op1 = Vec2D(*first) + op2 = Vec2D(*second) + + result = lambda_operator(op1, op2) + + expected = Vec2D(*expected) + + self.assertVectorsAlmostEqual(result, expected) + + def test_vector_addition(self): + + test_cases = [ + (((0, 0), (1, 1)), (1.0, 1.0)), + (((-1, 0), (2, 2)), (1, 2)), + (((1.5, 0), (1, 1)), (2.5, 1)), + ] + + self._assert_arithmetic_cases(test_cases, lambda x, y: x + y) + + def test_vector_subtraction(self): + + test_cases = [ + (((0, 0), (1, 1)), (-1, -1)), + (((10.625, 0.125), (10, 0)), (0.625, 0.125)), + ] + + self._assert_arithmetic_cases(test_cases, lambda x, y: x - y) + + def test_vector_multiply(self): + + vec1 = Vec2D(10, 10) + vec2 = Vec2D(0.5, 3) + answer = vec1 * vec2 + expected = 35 + self.assertAlmostEqual(answer, expected) + + vec = Vec2D(0.5, 3) + expected = Vec2D(5, 30) + self.assertVectorsAlmostEqual(vec * 10, expected) + self.assertVectorsAlmostEqual(10 * vec, expected) + self.assertVectorsAlmostEqual(vec * 10.0, expected) + self.assertVectorsAlmostEqual(10.0 * vec, expected) + + M = Multiplier() + self.assertEqual(vec * M, Vec2D(f"{vec[0]}*M", f"{vec[1]}*M")) + self.assertEqual(M * vec, f'M*{vec}') + + def test_vector_negative(self): + vec = Vec2D(10, -10) + expected = (-10, 10) + self.assertVectorsAlmostEqual(-vec, expected) + + def test_distance(self): + self.assertAlmostEqual(abs(Vec2D(6, 8)), 10) + self.assertEqual(abs(Vec2D(0, 0)), 0) + self.assertAlmostEqual(abs(Vec2D(2.5, 6)), 6.5) + + def test_rotate(self): + + cases = [ + (((0, 0), 0), (0, 0)), + (((0, 1), 90), (-1, 0)), + (((0, 1), -90), (1, 0)), + (((1, 0), 180), (-1, 0)), + (((1, 0), 360), (1, 0)), + ] + + for case in cases: + with self.subTest(case=case): + (vec, rot), expected = case + vec = Vec2D(*vec) + got = vec.rotate(rot) + self.assertVectorsAlmostEqual(got, expected) + + +class TestTNavigator(VectorComparisonMixin, unittest.TestCase): + + def setUp(self): + self.nav = turtle.TNavigator() + + def test_goto(self): + self.nav.goto(100, -100) + self.assertAlmostEqual(self.nav.xcor(), 100) + self.assertAlmostEqual(self.nav.ycor(), -100) + + def test_teleport(self): + self.nav.teleport(20, -30, fill_gap=True) + self.assertAlmostEqual(self.nav.xcor(), 20) + self.assertAlmostEqual(self.nav.ycor(), -30) + self.nav.teleport(-20, 30, fill_gap=False) + self.assertAlmostEqual(self.nav.xcor(), -20) + self.assertAlmostEqual(self.nav.ycor(), 30) + + def test_pos(self): + self.assertEqual(self.nav.pos(), self.nav._position) + self.nav.goto(100, -100) + self.assertEqual(self.nav.pos(), self.nav._position) + + def test_left(self): + self.assertEqual(self.nav._orient, (1.0, 0)) + self.nav.left(90) + self.assertVectorsAlmostEqual(self.nav._orient, (0.0, 1.0)) + + def test_right(self): + self.assertEqual(self.nav._orient, (1.0, 0)) + self.nav.right(90) + self.assertVectorsAlmostEqual(self.nav._orient, (0, -1.0)) + + def test_reset(self): + self.nav.goto(100, -100) + self.assertAlmostEqual(self.nav.xcor(), 100) + self.assertAlmostEqual(self.nav.ycor(), -100) + self.nav.reset() + self.assertAlmostEqual(self.nav.xcor(), 0) + self.assertAlmostEqual(self.nav.ycor(), 0) + + def test_forward(self): + self.nav.forward(150) + expected = Vec2D(150, 0) + self.assertVectorsAlmostEqual(self.nav.position(), expected) + + self.nav.reset() + self.nav.left(90) + self.nav.forward(150) + expected = Vec2D(0, 150) + self.assertVectorsAlmostEqual(self.nav.position(), expected) + + self.assertRaises(TypeError, self.nav.forward, 'skldjfldsk') + + def test_backwards(self): + self.nav.back(200) + expected = Vec2D(-200, 0) + self.assertVectorsAlmostEqual(self.nav.position(), expected) + + self.nav.reset() + self.nav.right(90) + self.nav.back(200) + expected = Vec2D(0, 200) + self.assertVectorsAlmostEqual(self.nav.position(), expected) + + def test_distance(self): + self.nav.forward(100) + expected = 100 + self.assertAlmostEqual(self.nav.distance(Vec2D(0,0)), expected) + + def test_radians_and_degrees(self): + self.nav.left(90) + self.assertAlmostEqual(self.nav.heading(), 90) + self.nav.radians() + self.assertAlmostEqual(self.nav.heading(), 1.57079633) + self.nav.degrees() + self.assertAlmostEqual(self.nav.heading(), 90) + + def test_towards(self): + + coordinates = [ + # coordinates, expected + ((100, 0), 0.0), + ((100, 100), 45.0), + ((0, 100), 90.0), + ((-100, 100), 135.0), + ((-100, 0), 180.0), + ((-100, -100), 225.0), + ((0, -100), 270.0), + ((100, -100), 315.0), + ] + + for (x, y), expected in coordinates: + self.assertEqual(self.nav.towards(x, y), expected) + self.assertEqual(self.nav.towards((x, y)), expected) + self.assertEqual(self.nav.towards(Vec2D(x, y)), expected) + + def test_heading(self): + + self.nav.left(90) + self.assertAlmostEqual(self.nav.heading(), 90) + self.nav.left(45) + self.assertAlmostEqual(self.nav.heading(), 135) + self.nav.right(1.6) + self.assertAlmostEqual(self.nav.heading(), 133.4) + self.assertRaises(TypeError, self.nav.right, 'sdkfjdsf') + self.nav.reset() + + rotations = [10, 20, 170, 300] + result = sum(rotations) % 360 + for num in rotations: + self.nav.left(num) + self.assertEqual(self.nav.heading(), result) + self.nav.reset() + + result = (360-sum(rotations)) % 360 + for num in rotations: + self.nav.right(num) + self.assertEqual(self.nav.heading(), result) + self.nav.reset() + + rotations = [10, 20, -170, 300, -210, 34.3, -50.2, -10, -29.98, 500] + sum_so_far = 0 + for num in rotations: + if num < 0: + self.nav.right(abs(num)) + else: + self.nav.left(num) + sum_so_far += num + self.assertAlmostEqual(self.nav.heading(), sum_so_far % 360) + + def test_setheading(self): + self.nav.setheading(102.32) + self.assertAlmostEqual(self.nav.heading(), 102.32) + self.nav.setheading(-123.23) + self.assertAlmostEqual(self.nav.heading(), (-123.23) % 360) + self.nav.setheading(-1000.34) + self.assertAlmostEqual(self.nav.heading(), (-1000.34) % 360) + self.nav.setheading(300000) + self.assertAlmostEqual(self.nav.heading(), 300000%360) + + def test_positions(self): + self.nav.forward(100) + self.nav.left(90) + self.nav.forward(-200) + self.assertVectorsAlmostEqual(self.nav.pos(), (100.0, -200.0)) + + def test_setx_and_sety(self): + self.nav.setx(-1023.2334) + self.nav.sety(193323.234) + self.assertVectorsAlmostEqual(self.nav.pos(), (-1023.2334, 193323.234)) + + def test_home(self): + self.nav.left(30) + self.nav.forward(-100000) + self.nav.home() + self.assertVectorsAlmostEqual(self.nav.pos(), (0,0)) + self.assertAlmostEqual(self.nav.heading(), 0) + + def test_distance_method(self): + self.assertAlmostEqual(self.nav.distance(30, 40), 50) + vec = Vec2D(0.22, .001) + self.assertAlmostEqual(self.nav.distance(vec), 0.22000227271553355) + another_turtle = turtle.TNavigator() + another_turtle.left(90) + another_turtle.forward(10000) + self.assertAlmostEqual(self.nav.distance(another_turtle), 10000) + + +class TestTPen(unittest.TestCase): + + def test_pendown_and_penup(self): + + tpen = turtle.TPen() + + self.assertTrue(tpen.isdown()) + tpen.penup() + self.assertFalse(tpen.isdown()) + tpen.pendown() + self.assertTrue(tpen.isdown()) + + def test_showturtle_hideturtle_and_isvisible(self): + + tpen = turtle.TPen() + + self.assertTrue(tpen.isvisible()) + tpen.hideturtle() + self.assertFalse(tpen.isvisible()) + tpen.showturtle() + self.assertTrue(tpen.isvisible()) + + def test_teleport(self): + + tpen = turtle.TPen() + + for fill_gap_value in [True, False]: + tpen.penup() + tpen.teleport(100, 100, fill_gap=fill_gap_value) + self.assertFalse(tpen.isdown()) + tpen.pendown() + tpen.teleport(-100, -100, fill_gap=fill_gap_value) + self.assertTrue(tpen.isdown()) + + +class TestTurtleScreen(unittest.TestCase): + def test_save_raises_if_wrong_extension(self) -> None: + screen = unittest.mock.Mock() + + msg = "Unknown file extension: '.png', must be one of {'.ps', '.eps'}" + with ( + tempfile.TemporaryDirectory() as tmpdir, + self.assertRaisesRegex(ValueError, re.escape(msg)) + ): + turtle.TurtleScreen.save(screen, os.path.join(tmpdir, "file.png")) + + def test_save_raises_if_parent_not_found(self) -> None: + screen = unittest.mock.Mock() + + with tempfile.TemporaryDirectory() as tmpdir: + parent = os.path.join(tmpdir, "unknown_parent") + msg = f"The directory '{parent}' does not exist. Cannot save to it" + + with self.assertRaisesRegex(FileNotFoundError, re.escape(msg)): + turtle.TurtleScreen.save(screen, os.path.join(parent, "a.ps")) + + def test_save_raises_if_file_found(self) -> None: + screen = unittest.mock.Mock() + + with tempfile.TemporaryDirectory() as tmpdir: + file_path = os.path.join(tmpdir, "some_file.ps") + with open(file_path, "w") as f: + f.write("some text") + + msg = ( + f"The file '{file_path}' already exists. To overwrite it use" + " the 'overwrite=True' argument of the save function." + ) + with self.assertRaisesRegex(FileExistsError, re.escape(msg)): + turtle.TurtleScreen.save(screen, file_path) + + def test_save_overwrites_if_specified(self) -> None: + screen = unittest.mock.Mock() + screen.cv.postscript.return_value = "postscript" + + with tempfile.TemporaryDirectory() as tmpdir: + file_path = os.path.join(tmpdir, "some_file.ps") + with open(file_path, "w") as f: + f.write("some text") + + turtle.TurtleScreen.save(screen, file_path, overwrite=True) + with open(file_path) as f: + self.assertEqual(f.read(), "postscript") + + def test_save(self) -> None: + screen = unittest.mock.Mock() + screen.cv.postscript.return_value = "postscript" + + with tempfile.TemporaryDirectory() as tmpdir: + file_path = os.path.join(tmpdir, "some_file.ps") + + turtle.TurtleScreen.save(screen, file_path) + with open(file_path) as f: + self.assertEqual(f.read(), "postscript") + + def test_no_animation_sets_tracer_0(self): + s = turtle.TurtleScreen(cv=unittest.mock.MagicMock()) + + with s.no_animation(): + self.assertEqual(s.tracer(), 0) + + def test_no_animation_resets_tracer_to_old_value(self): + s = turtle.TurtleScreen(cv=unittest.mock.MagicMock()) + + for tracer in [0, 1, 5]: + s.tracer(tracer) + with s.no_animation(): + pass + self.assertEqual(s.tracer(), tracer) + + def test_no_animation_calls_update_at_exit(self): + s = turtle.TurtleScreen(cv=unittest.mock.MagicMock()) + s.update = unittest.mock.MagicMock() + + with s.no_animation(): + s.update.assert_not_called() + s.update.assert_called_once() + + +class TestTurtle(unittest.TestCase): + def setUp(self): + with patch_screen(): + self.turtle = turtle.Turtle() + + # Reset the Screen singleton to avoid reference leaks + self.addCleanup(setattr, turtle.Turtle, '_screen', None) + + def test_begin_end_fill(self): + self.assertFalse(self.turtle.filling()) + self.turtle.begin_fill() + self.assertTrue(self.turtle.filling()) + self.turtle.end_fill() + self.assertFalse(self.turtle.filling()) + + def test_fill(self): + # The context manager behaves like begin_fill and end_fill. + self.assertFalse(self.turtle.filling()) + with self.turtle.fill(): + self.assertTrue(self.turtle.filling()) + self.assertFalse(self.turtle.filling()) + + def test_fill_resets_after_exception(self): + # The context manager cleans up correctly after exceptions. + try: + with self.turtle.fill(): + self.assertTrue(self.turtle.filling()) + raise ValueError + except ValueError: + self.assertFalse(self.turtle.filling()) + + def test_fill_context_when_filling(self): + # The context manager works even when the turtle is already filling. + self.turtle.begin_fill() + self.assertTrue(self.turtle.filling()) + with self.turtle.fill(): + self.assertTrue(self.turtle.filling()) + self.assertFalse(self.turtle.filling()) + + def test_begin_end_poly(self): + self.assertFalse(self.turtle._creatingPoly) + self.turtle.begin_poly() + self.assertTrue(self.turtle._creatingPoly) + self.turtle.end_poly() + self.assertFalse(self.turtle._creatingPoly) + + def test_poly(self): + # The context manager behaves like begin_poly and end_poly. + self.assertFalse(self.turtle._creatingPoly) + with self.turtle.poly(): + self.assertTrue(self.turtle._creatingPoly) + self.assertFalse(self.turtle._creatingPoly) + + def test_poly_resets_after_exception(self): + # The context manager cleans up correctly after exceptions. + try: + with self.turtle.poly(): + self.assertTrue(self.turtle._creatingPoly) + raise ValueError + except ValueError: + self.assertFalse(self.turtle._creatingPoly) + + def test_poly_context_when_creating_poly(self): + # The context manager works when the turtle is already creating poly. + self.turtle.begin_poly() + self.assertTrue(self.turtle._creatingPoly) + with self.turtle.poly(): + self.assertTrue(self.turtle._creatingPoly) + self.assertFalse(self.turtle._creatingPoly) + + def test_dot_signature(self): + self.turtle.dot() + self.turtle.dot(10) + self.turtle.dot(size=10) + self.turtle.dot((0, 0, 0)) + self.turtle.dot(size=(0, 0, 0)) + self.turtle.dot("blue") + self.turtle.dot("") + self.turtle.dot(size="blue") + self.turtle.dot(20, "blue") + self.turtle.dot(20, "blue") + self.turtle.dot(20, (0, 0, 0)) + self.turtle.dot(20, 0, 0, 0) + with self.assertRaises(TypeError): + self.turtle.dot(color="blue") + self.assertRaises(turtle.TurtleGraphicsError, self.turtle.dot, "_not_a_color_") + self.assertRaises(turtle.TurtleGraphicsError, self.turtle.dot, 0, (0, 0, 0, 0)) + self.assertRaises(turtle.TurtleGraphicsError, self.turtle.dot, 0, 0, 0, 0, 0) + self.assertRaises(turtle.TurtleGraphicsError, self.turtle.dot, 0, (-1, 0, 0)) + self.assertRaises(turtle.TurtleGraphicsError, self.turtle.dot, 0, -1, 0, 0) + self.assertRaises(turtle.TurtleGraphicsError, self.turtle.dot, 0, (0, 257, 0)) + self.assertRaises(turtle.TurtleGraphicsError, self.turtle.dot, 0, 0, 257, 0) + +class TestModuleLevel(unittest.TestCase): + def test_all_signatures(self): + import inspect + + known_signatures = { + 'teleport': + '(x=None, y=None, *, fill_gap: bool = False) -> None', + 'undo': '()', + 'goto': '(x, y=None)', + 'bgcolor': '(*args)', + 'pen': '(pen=None, **pendict)', + } + + for name in known_signatures: + with self.subTest(name=name): + obj = getattr(turtle, name) + sig = inspect.signature(obj) + self.assertEqual(str(sig), known_signatures[name]) + + +if __name__ == '__main__': + unittest.main() diff --git a/Lib/turtle.py b/Lib/turtle.py new file mode 100644 index 000000000..e5ce2c0a0 --- /dev/null +++ b/Lib/turtle.py @@ -0,0 +1,4291 @@ +# +# turtle.py: a Tkinter based turtle graphics module for Python +# Version 1.1b - 4. 5. 2009 +# +# Copyright (C) 2006 - 2010 Gregor Lingl +# email: glingl@aon.at +# +# This software is provided 'as-is', without any express or implied +# warranty. In no event will the authors be held liable for any damages +# arising from the use of this software. +# +# Permission is granted to anyone to use this software for any purpose, +# including commercial applications, and to alter it and redistribute it +# freely, subject to the following restrictions: +# +# 1. The origin of this software must not be misrepresented; you must not +# claim that you wrote the original software. If you use this software +# in a product, an acknowledgment in the product documentation would be +# appreciated but is not required. +# 2. Altered source versions must be plainly marked as such, and must not be +# misrepresented as being the original software. +# 3. This notice may not be removed or altered from any source distribution. + +""" +Turtle graphics is a popular way for introducing programming to +kids. It was part of the original Logo programming language developed +by Wally Feurzig and Seymour Papert in 1966. + +Imagine a robotic turtle starting at (0, 0) in the x-y plane. After an ``import turtle``, give it +the command turtle.forward(15), and it moves (on-screen!) 15 pixels in +the direction it is facing, drawing a line as it moves. Give it the +command turtle.right(25), and it rotates in-place 25 degrees clockwise. + +By combining together these and similar commands, intricate shapes and +pictures can easily be drawn. + +----- turtle.py + +This module is an extended reimplementation of turtle.py from the +Python standard distribution up to Python 2.5. (See: https://www.python.org) + +It tries to keep the merits of turtle.py and to be (nearly) 100% +compatible with it. This means in the first place to enable the +learning programmer to use all the commands, classes and methods +interactively when using the module from within IDLE run with +the -n switch. + +Roughly it has the following features added: + +- Better animation of the turtle movements, especially of turning the + turtle. So the turtles can more easily be used as a visual feedback + instrument by the (beginning) programmer. + +- Different turtle shapes, image files as turtle shapes, user defined + and user controllable turtle shapes, among them compound + (multicolored) shapes. Turtle shapes can be stretched and tilted, which + makes turtles very versatile geometrical objects. + +- Fine control over turtle movement and screen updates via delay(), + and enhanced tracer() and speed() methods. + +- Aliases for the most commonly used commands, like fd for forward etc., + following the early Logo traditions. This reduces the boring work of + typing long sequences of commands, which often occur in a natural way + when kids try to program fancy pictures on their first encounter with + turtle graphics. + +- Turtles now have an undo()-method with configurable undo-buffer. + +- Some simple commands/methods for creating event driven programs + (mouse-, key-, timer-events). Especially useful for programming games. + +- A scrollable Canvas class. The default scrollable Canvas can be + extended interactively as needed while playing around with the turtle(s). + +- A TurtleScreen class with methods controlling background color or + background image, window and canvas size and other properties of the + TurtleScreen. + +- There is a method, setworldcoordinates(), to install a user defined + coordinate-system for the TurtleScreen. + +- The implementation uses a 2-vector class named Vec2D, derived from tuple. + This class is public, so it can be imported by the application programmer, + which makes certain types of computations very natural and compact. + +- Appearance of the TurtleScreen and the Turtles at startup/import can be + configured by means of a turtle.cfg configuration file. + The default configuration mimics the appearance of the old turtle module. + +- If configured appropriately the module reads in docstrings from a docstring + dictionary in some different language, supplied separately and replaces + the English ones by those read in. There is a utility function + write_docstringdict() to write a dictionary with the original (English) + docstrings to disc, so it can serve as a template for translations. + +Behind the scenes there are some features included with possible +extensions in mind. These will be commented and documented elsewhere. +""" + +import tkinter as TK +import types +import math +import time +import inspect +import sys + +from os.path import isfile, split, join +from pathlib import Path +from contextlib import contextmanager +from copy import deepcopy +from tkinter import simpledialog + +_tg_classes = ['ScrolledCanvas', 'TurtleScreen', 'Screen', + 'RawTurtle', 'Turtle', 'RawPen', 'Pen', 'Shape', 'Vec2D'] +_tg_screen_functions = ['addshape', 'bgcolor', 'bgpic', 'bye', + 'clearscreen', 'colormode', 'delay', 'exitonclick', 'getcanvas', + 'getshapes', 'listen', 'mainloop', 'mode', 'no_animation', 'numinput', + 'onkey', 'onkeypress', 'onkeyrelease', 'onscreenclick', 'ontimer', + 'register_shape', 'resetscreen', 'screensize', 'save', 'setup', + 'setworldcoordinates', 'textinput', 'title', 'tracer', 'turtles', + 'update', 'window_height', 'window_width'] +_tg_turtle_functions = ['back', 'backward', 'begin_fill', 'begin_poly', 'bk', + 'circle', 'clear', 'clearstamp', 'clearstamps', 'clone', 'color', + 'degrees', 'distance', 'dot', 'down', 'end_fill', 'end_poly', 'fd', + 'fillcolor', 'fill', 'filling', 'forward', 'get_poly', 'getpen', + 'getscreen', 'get_shapepoly', 'getturtle', 'goto', 'heading', + 'hideturtle', 'home', 'ht', 'isdown', 'isvisible', 'left', 'lt', + 'onclick', 'ondrag', 'onrelease', 'pd', 'pen', 'pencolor', 'pendown', + 'pensize', 'penup', 'poly', 'pos', 'position', 'pu', 'radians', 'right', + 'reset', 'resizemode', 'rt', 'seth', 'setheading', 'setpos', + 'setposition', 'setundobuffer', 'setx', 'sety', 'shape', 'shapesize', + 'shapetransform', 'shearfactor', 'showturtle', 'speed', 'st', 'stamp', + 'teleport', 'tilt', 'tiltangle', 'towards', 'turtlesize', 'undo', + 'undobufferentries', 'up', 'width', + 'write', 'xcor', 'ycor'] +_tg_utilities = ['write_docstringdict', 'done'] + +__all__ = (_tg_classes + _tg_screen_functions + _tg_turtle_functions + + _tg_utilities + ['Terminator']) + +_alias_list = ['addshape', 'backward', 'bk', 'fd', 'ht', 'lt', 'pd', 'pos', + 'pu', 'rt', 'seth', 'setpos', 'setposition', 'st', + 'turtlesize', 'up', 'width'] + +_CFG = {"width" : 0.5, # Screen + "height" : 0.75, + "canvwidth" : 400, + "canvheight": 300, + "leftright": None, + "topbottom": None, + "mode": "standard", # TurtleScreen + "colormode": 1.0, + "delay": 10, + "undobuffersize": 1000, # RawTurtle + "shape": "classic", + "pencolor" : "black", + "fillcolor" : "black", + "resizemode" : "noresize", + "visible" : True, + "language": "english", # docstrings + "exampleturtle": "turtle", + "examplescreen": "screen", + "title": "Python Turtle Graphics", + "using_IDLE": False + } + +def config_dict(filename): + """Convert content of config-file into dictionary.""" + with open(filename, "r") as f: + cfglines = f.readlines() + cfgdict = {} + for line in cfglines: + line = line.strip() + if not line or line.startswith("#"): + continue + try: + key, value = line.split("=") + except ValueError: + print("Bad line in config-file %s:\n%s" % (filename,line)) + continue + key = key.strip() + value = value.strip() + if value in ["True", "False", "None", "''", '""']: + value = eval(value) + else: + try: + if "." in value: + value = float(value) + else: + value = int(value) + except ValueError: + pass # value need not be converted + cfgdict[key] = value + return cfgdict + +def readconfig(cfgdict): + """Read config-files, change configuration-dict accordingly. + + If there is a turtle.cfg file in the current working directory, + read it from there. If this contains an importconfig-value, + say 'myway', construct filename turtle_mayway.cfg else use + turtle.cfg and read it from the import-directory, where + turtle.py is located. + Update configuration dictionary first according to config-file, + in the import directory, then according to config-file in the + current working directory. + If no config-file is found, the default configuration is used. + """ + default_cfg = "turtle.cfg" + cfgdict1 = {} + cfgdict2 = {} + if isfile(default_cfg): + cfgdict1 = config_dict(default_cfg) + if "importconfig" in cfgdict1: + default_cfg = "turtle_%s.cfg" % cfgdict1["importconfig"] + try: + head, tail = split(__file__) + cfg_file2 = join(head, default_cfg) + except Exception: + cfg_file2 = "" + if isfile(cfg_file2): + cfgdict2 = config_dict(cfg_file2) + _CFG.update(cfgdict2) + _CFG.update(cfgdict1) + +try: + readconfig(_CFG) +except Exception: + print ("No configfile read, reason unknown") + + +class Vec2D(tuple): + """A 2 dimensional vector class, used as a helper class + for implementing turtle graphics. + May be useful for turtle graphics programs also. + Derived from tuple, so a vector is a tuple! + + Provides (for a, b vectors, k number): + a+b vector addition + a-b vector subtraction + a*b inner product + k*a and a*k multiplication with scalar + |a| absolute value of a + a.rotate(angle) rotation + """ + def __new__(cls, x, y): + return tuple.__new__(cls, (x, y)) + def __add__(self, other): + return Vec2D(self[0]+other[0], self[1]+other[1]) + def __mul__(self, other): + if isinstance(other, Vec2D): + return self[0]*other[0]+self[1]*other[1] + return Vec2D(self[0]*other, self[1]*other) + def __rmul__(self, other): + if isinstance(other, int) or isinstance(other, float): + return Vec2D(self[0]*other, self[1]*other) + return NotImplemented + def __sub__(self, other): + return Vec2D(self[0]-other[0], self[1]-other[1]) + def __neg__(self): + return Vec2D(-self[0], -self[1]) + def __abs__(self): + return math.hypot(*self) + def rotate(self, angle): + """rotate self counterclockwise by angle + """ + perp = Vec2D(-self[1], self[0]) + angle = math.radians(angle) + c, s = math.cos(angle), math.sin(angle) + return Vec2D(self[0]*c+perp[0]*s, self[1]*c+perp[1]*s) + def __getnewargs__(self): + return (self[0], self[1]) + def __repr__(self): + return "(%.2f,%.2f)" % self + + +############################################################################## +### From here up to line : Tkinter - Interface for turtle.py ### +### May be replaced by an interface to some different graphics toolkit ### +############################################################################## + +## helper functions for Scrolled Canvas, to forward Canvas-methods +## to ScrolledCanvas class + +def __methodDict(cls, _dict): + """helper function for Scrolled Canvas""" + baseList = list(cls.__bases__) + baseList.reverse() + for _super in baseList: + __methodDict(_super, _dict) + for key, value in cls.__dict__.items(): + if type(value) == types.FunctionType: + _dict[key] = value + +def __methods(cls): + """helper function for Scrolled Canvas""" + _dict = {} + __methodDict(cls, _dict) + return _dict.keys() + +__stringBody = ( + 'def %(method)s(self, *args, **kw): return ' + + 'self.%(attribute)s.%(method)s(*args, **kw)') + +def __forwardmethods(fromClass, toClass, toPart, exclude = ()): + ### MANY CHANGES ### + _dict_1 = {} + __methodDict(toClass, _dict_1) + _dict = {} + mfc = __methods(fromClass) + for ex in _dict_1.keys(): + if ex[:1] == '_' or ex[-1:] == '_' or ex in exclude or ex in mfc: + pass + else: + _dict[ex] = _dict_1[ex] + + for method, func in _dict.items(): + d = {'method': method, 'func': func} + if isinstance(toPart, str): + execString = \ + __stringBody % {'method' : method, 'attribute' : toPart} + exec(execString, d) + setattr(fromClass, method, d[method]) ### NEWU! + + +class ScrolledCanvas(TK.Frame): + """Modeled after the scrolled canvas class from Grayons's Tkinter book. + + Used as the default canvas, which pops up automatically when + using turtle graphics functions or the Turtle class. + """ + def __init__(self, master, width=500, height=350, + canvwidth=600, canvheight=500): + TK.Frame.__init__(self, master, width=width, height=height) + self._rootwindow = self.winfo_toplevel() + self.width, self.height = width, height + self.canvwidth, self.canvheight = canvwidth, canvheight + self.bg = "white" + self._canvas = TK.Canvas(master, width=width, height=height, + bg=self.bg, relief=TK.SUNKEN, borderwidth=2) + self.hscroll = TK.Scrollbar(master, command=self._canvas.xview, + orient=TK.HORIZONTAL) + self.vscroll = TK.Scrollbar(master, command=self._canvas.yview) + self._canvas.configure(xscrollcommand=self.hscroll.set, + yscrollcommand=self.vscroll.set) + self.rowconfigure(0, weight=1, minsize=0) + self.columnconfigure(0, weight=1, minsize=0) + self._canvas.grid(padx=1, in_ = self, pady=1, row=0, + column=0, rowspan=1, columnspan=1, sticky='news') + self.vscroll.grid(padx=1, in_ = self, pady=1, row=0, + column=1, rowspan=1, columnspan=1, sticky='news') + self.hscroll.grid(padx=1, in_ = self, pady=1, row=1, + column=0, rowspan=1, columnspan=1, sticky='news') + self.reset() + self._rootwindow.bind('', self.onResize) + + def reset(self, canvwidth=None, canvheight=None, bg = None): + """Adjust canvas and scrollbars according to given canvas size.""" + if canvwidth: + self.canvwidth = canvwidth + if canvheight: + self.canvheight = canvheight + if bg: + self.bg = bg + self._canvas.config(bg=bg, + scrollregion=(-self.canvwidth//2, -self.canvheight//2, + self.canvwidth//2, self.canvheight//2)) + self._canvas.xview_moveto(0.5*(self.canvwidth - self.width + 30) / + self.canvwidth) + self._canvas.yview_moveto(0.5*(self.canvheight- self.height + 30) / + self.canvheight) + self.adjustScrolls() + + + def adjustScrolls(self): + """ Adjust scrollbars according to window- and canvas-size. + """ + cwidth = self._canvas.winfo_width() + cheight = self._canvas.winfo_height() + self._canvas.xview_moveto(0.5*(self.canvwidth-cwidth)/self.canvwidth) + self._canvas.yview_moveto(0.5*(self.canvheight-cheight)/self.canvheight) + if cwidth < self.canvwidth or cheight < self.canvheight: + self.hscroll.grid(padx=1, in_ = self, pady=1, row=1, + column=0, rowspan=1, columnspan=1, sticky='news') + self.vscroll.grid(padx=1, in_ = self, pady=1, row=0, + column=1, rowspan=1, columnspan=1, sticky='news') + else: + self.hscroll.grid_forget() + self.vscroll.grid_forget() + + def onResize(self, event): + """self-explanatory""" + self.adjustScrolls() + + def bbox(self, *args): + """ 'forward' method, which canvas itself has inherited... + """ + return self._canvas.bbox(*args) + + def cget(self, *args, **kwargs): + """ 'forward' method, which canvas itself has inherited... + """ + return self._canvas.cget(*args, **kwargs) + + def config(self, *args, **kwargs): + """ 'forward' method, which canvas itself has inherited... + """ + self._canvas.config(*args, **kwargs) + + def bind(self, *args, **kwargs): + """ 'forward' method, which canvas itself has inherited... + """ + self._canvas.bind(*args, **kwargs) + + def unbind(self, *args, **kwargs): + """ 'forward' method, which canvas itself has inherited... + """ + self._canvas.unbind(*args, **kwargs) + + def focus_force(self): + """ 'forward' method, which canvas itself has inherited... + """ + self._canvas.focus_force() + +__forwardmethods(ScrolledCanvas, TK.Canvas, '_canvas') + + +class _Root(TK.Tk): + """Root class for Screen based on Tkinter.""" + def __init__(self): + TK.Tk.__init__(self) + + def setupcanvas(self, width, height, cwidth, cheight): + self._canvas = ScrolledCanvas(self, width, height, cwidth, cheight) + self._canvas.pack(expand=1, fill="both") + + def _getcanvas(self): + return self._canvas + + def set_geometry(self, width, height, startx, starty): + self.geometry("%dx%d%+d%+d"%(width, height, startx, starty)) + + def ondestroy(self, destroy): + self.wm_protocol("WM_DELETE_WINDOW", destroy) + + def win_width(self): + return self.winfo_screenwidth() + + def win_height(self): + return self.winfo_screenheight() + +Canvas = TK.Canvas + + +class TurtleScreenBase(object): + """Provide the basic graphics functionality. + Interface between Tkinter and turtle.py. + + To port turtle.py to some different graphics toolkit + a corresponding TurtleScreenBase class has to be implemented. + """ + + def _blankimage(self): + """return a blank image object + """ + img = TK.PhotoImage(width=1, height=1, master=self.cv) + img.blank() + return img + + def _image(self, filename): + """return an image object containing the + imagedata from an image file named filename. + """ + return TK.PhotoImage(file=filename, master=self.cv) + + def __init__(self, cv): + self.cv = cv + if isinstance(cv, ScrolledCanvas): + w = self.cv.canvwidth + h = self.cv.canvheight + else: # expected: ordinary TK.Canvas + w = int(self.cv.cget("width")) + h = int(self.cv.cget("height")) + self.cv.config(scrollregion = (-w//2, -h//2, w//2, h//2 )) + self.canvwidth = w + self.canvheight = h + self.xscale = self.yscale = 1.0 + + def _createpoly(self): + """Create an invisible polygon item on canvas self.cv) + """ + return self.cv.create_polygon((0, 0, 0, 0, 0, 0), fill="", outline="") + + def _drawpoly(self, polyitem, coordlist, fill=None, + outline=None, width=None, top=False): + """Configure polygonitem polyitem according to provided + arguments: + coordlist is sequence of coordinates + fill is filling color + outline is outline color + top is a boolean value, which specifies if polyitem + will be put on top of the canvas' displaylist so it + will not be covered by other items. + """ + cl = [] + for x, y in coordlist: + cl.append(x * self.xscale) + cl.append(-y * self.yscale) + self.cv.coords(polyitem, *cl) + if fill is not None: + self.cv.itemconfigure(polyitem, fill=fill) + if outline is not None: + self.cv.itemconfigure(polyitem, outline=outline) + if width is not None: + self.cv.itemconfigure(polyitem, width=width) + if top: + self.cv.tag_raise(polyitem) + + def _createline(self): + """Create an invisible line item on canvas self.cv) + """ + return self.cv.create_line(0, 0, 0, 0, fill="", width=2, + capstyle = TK.ROUND) + + def _drawline(self, lineitem, coordlist=None, + fill=None, width=None, top=False): + """Configure lineitem according to provided arguments: + coordlist is sequence of coordinates + fill is drawing color + width is width of drawn line. + top is a boolean value, which specifies if polyitem + will be put on top of the canvas' displaylist so it + will not be covered by other items. + """ + if coordlist is not None: + cl = [] + for x, y in coordlist: + cl.append(x * self.xscale) + cl.append(-y * self.yscale) + self.cv.coords(lineitem, *cl) + if fill is not None: + self.cv.itemconfigure(lineitem, fill=fill) + if width is not None: + self.cv.itemconfigure(lineitem, width=width) + if top: + self.cv.tag_raise(lineitem) + + def _delete(self, item): + """Delete graphics item from canvas. + If item is"all" delete all graphics items. + """ + self.cv.delete(item) + + def _update(self): + """Redraw graphics items on canvas + """ + self.cv.update() + + def _delay(self, delay): + """Delay subsequent canvas actions for delay ms.""" + self.cv.after(delay) + + def _iscolorstring(self, color): + """Check if the string color is a legal Tkinter color string. + """ + try: + rgb = self.cv.winfo_rgb(color) + ok = True + except TK.TclError: + ok = False + return ok + + def _bgcolor(self, color=None): + """Set canvas' backgroundcolor if color is not None, + else return backgroundcolor.""" + if color is not None: + self.cv.config(bg = color) + self._update() + else: + return self.cv.cget("bg") + + def _write(self, pos, txt, align, font, pencolor): + """Write txt at pos in canvas with specified font + and color. + Return text item and x-coord of right bottom corner + of text's bounding box.""" + x, y = pos + x = x * self.xscale + y = y * self.yscale + anchor = {"left":"sw", "center":"s", "right":"se" } + item = self.cv.create_text(x-1, -y, text = txt, anchor = anchor[align], + fill = pencolor, font = font) + x0, y0, x1, y1 = self.cv.bbox(item) + return item, x1-1 + + def _onclick(self, item, fun, num=1, add=None): + """Bind fun to mouse-click event on turtle. + fun must be a function with two arguments, the coordinates + of the clicked point on the canvas. + num, the number of the mouse-button defaults to 1 + """ + if fun is None: + self.cv.tag_unbind(item, "" % num) + else: + def eventfun(event): + x, y = (self.cv.canvasx(event.x)/self.xscale, + -self.cv.canvasy(event.y)/self.yscale) + fun(x, y) + self.cv.tag_bind(item, "" % num, eventfun, add) + + def _onrelease(self, item, fun, num=1, add=None): + """Bind fun to mouse-button-release event on turtle. + fun must be a function with two arguments, the coordinates + of the point on the canvas where mouse button is released. + num, the number of the mouse-button defaults to 1 + + If a turtle is clicked, first _onclick-event will be performed, + then _onscreensclick-event. + """ + if fun is None: + self.cv.tag_unbind(item, "" % num) + else: + def eventfun(event): + x, y = (self.cv.canvasx(event.x)/self.xscale, + -self.cv.canvasy(event.y)/self.yscale) + fun(x, y) + self.cv.tag_bind(item, "" % num, + eventfun, add) + + def _ondrag(self, item, fun, num=1, add=None): + """Bind fun to mouse-move-event (with pressed mouse button) on turtle. + fun must be a function with two arguments, the coordinates of the + actual mouse position on the canvas. + num, the number of the mouse-button defaults to 1 + + Every sequence of mouse-move-events on a turtle is preceded by a + mouse-click event on that turtle. + """ + if fun is None: + self.cv.tag_unbind(item, "" % num) + else: + def eventfun(event): + try: + x, y = (self.cv.canvasx(event.x)/self.xscale, + -self.cv.canvasy(event.y)/self.yscale) + fun(x, y) + except Exception: + pass + self.cv.tag_bind(item, "" % num, eventfun, add) + + def _onscreenclick(self, fun, num=1, add=None): + """Bind fun to mouse-click event on canvas. + fun must be a function with two arguments, the coordinates + of the clicked point on the canvas. + num, the number of the mouse-button defaults to 1 + + If a turtle is clicked, first _onclick-event will be performed, + then _onscreensclick-event. + """ + if fun is None: + self.cv.unbind("" % num) + else: + def eventfun(event): + x, y = (self.cv.canvasx(event.x)/self.xscale, + -self.cv.canvasy(event.y)/self.yscale) + fun(x, y) + self.cv.bind("" % num, eventfun, add) + + def _onkeyrelease(self, fun, key): + """Bind fun to key-release event of key. + Canvas must have focus. See method listen + """ + if fun is None: + self.cv.unbind("" % key, None) + else: + def eventfun(event): + fun() + self.cv.bind("" % key, eventfun) + + def _onkeypress(self, fun, key=None): + """If key is given, bind fun to key-press event of key. + Otherwise bind fun to any key-press. + Canvas must have focus. See method listen. + """ + if fun is None: + if key is None: + self.cv.unbind("", None) + else: + self.cv.unbind("" % key, None) + else: + def eventfun(event): + fun() + if key is None: + self.cv.bind("", eventfun) + else: + self.cv.bind("" % key, eventfun) + + def _listen(self): + """Set focus on canvas (in order to collect key-events) + """ + self.cv.focus_force() + + def _ontimer(self, fun, t): + """Install a timer, which calls fun after t milliseconds. + """ + if t == 0: + self.cv.after_idle(fun) + else: + self.cv.after(t, fun) + + def _createimage(self, image): + """Create and return image item on canvas. + """ + return self.cv.create_image(0, 0, image=image) + + def _drawimage(self, item, pos, image): + """Configure image item as to draw image object + at position (x,y) on canvas) + """ + x, y = pos + self.cv.coords(item, (x * self.xscale, -y * self.yscale)) + self.cv.itemconfig(item, image=image) + + def _setbgpic(self, item, image): + """Configure image item as to draw image object + at center of canvas. Set item to the first item + in the displaylist, so it will be drawn below + any other item .""" + self.cv.itemconfig(item, image=image) + self.cv.tag_lower(item) + + def _type(self, item): + """Return 'line' or 'polygon' or 'image' depending on + type of item. + """ + return self.cv.type(item) + + def _pointlist(self, item): + """returns list of coordinate-pairs of points of item + Example (for insiders): + >>> from turtle import * + >>> getscreen()._pointlist(getturtle().turtle._item) + [(0.0, 9.9999999999999982), (0.0, -9.9999999999999982), + (9.9999999999999982, 0.0)] + >>> """ + cl = self.cv.coords(item) + pl = [(cl[i], -cl[i+1]) for i in range(0, len(cl), 2)] + return pl + + def _setscrollregion(self, srx1, sry1, srx2, sry2): + self.cv.config(scrollregion=(srx1, sry1, srx2, sry2)) + + def _rescale(self, xscalefactor, yscalefactor): + items = self.cv.find_all() + for item in items: + coordinates = list(self.cv.coords(item)) + newcoordlist = [] + while coordinates: + x, y = coordinates[:2] + newcoordlist.append(x * xscalefactor) + newcoordlist.append(y * yscalefactor) + coordinates = coordinates[2:] + self.cv.coords(item, *newcoordlist) + + def _resize(self, canvwidth=None, canvheight=None, bg=None): + """Resize the canvas the turtles are drawing on. Does + not alter the drawing window. + """ + # needs amendment + if not isinstance(self.cv, ScrolledCanvas): + return self.canvwidth, self.canvheight + if canvwidth is canvheight is bg is None: + return self.cv.canvwidth, self.cv.canvheight + if canvwidth is not None: + self.canvwidth = canvwidth + if canvheight is not None: + self.canvheight = canvheight + self.cv.reset(canvwidth, canvheight, bg) + + def _window_size(self): + """ Return the width and height of the turtle window. + """ + width = self.cv.winfo_width() + if width <= 1: # the window isn't managed by a geometry manager + width = self.cv['width'] + height = self.cv.winfo_height() + if height <= 1: # the window isn't managed by a geometry manager + height = self.cv['height'] + return width, height + + def mainloop(self): + """Starts event loop - calling Tkinter's mainloop function. + + No argument. + + Must be last statement in a turtle graphics program. + Must NOT be used if a script is run from within IDLE in -n mode + (No subprocess) - for interactive use of turtle graphics. + + Example (for a TurtleScreen instance named screen): + >>> screen.mainloop() + + """ + self.cv.tk.mainloop() + + def textinput(self, title, prompt): + """Pop up a dialog window for input of a string. + + Arguments: title is the title of the dialog window, + prompt is a text mostly describing what information to input. + + Return the string input + If the dialog is canceled, return None. + + Example (for a TurtleScreen instance named screen): + >>> screen.textinput("NIM", "Name of first player:") + + """ + return simpledialog.askstring(title, prompt, parent=self.cv) + + def numinput(self, title, prompt, default=None, minval=None, maxval=None): + """Pop up a dialog window for input of a number. + + Arguments: title is the title of the dialog window, + prompt is a text mostly describing what numerical information to input. + default: default value + minval: minimum value for input + maxval: maximum value for input + + The number input must be in the range minval .. maxval if these are + given. If not, a hint is issued and the dialog remains open for + correction. Return the number input. + If the dialog is canceled, return None. + + Example (for a TurtleScreen instance named screen): + >>> screen.numinput("Poker", "Your stakes:", 1000, minval=10, maxval=10000) + + """ + return simpledialog.askfloat(title, prompt, initialvalue=default, + minvalue=minval, maxvalue=maxval, + parent=self.cv) + + +############################################################################## +### End of Tkinter - interface ### +############################################################################## + + +class Terminator (Exception): + """Will be raised in TurtleScreen.update, if _RUNNING becomes False. + + This stops execution of a turtle graphics script. + Main purpose: use in the Demo-Viewer turtle.Demo.py. + """ + pass + + +class TurtleGraphicsError(Exception): + """Some TurtleGraphics Error + """ + + +class Shape(object): + """Data structure modeling shapes. + + attribute _type is one of "polygon", "image", "compound" + attribute _data is - depending on _type a poygon-tuple, + an image or a list constructed using the addcomponent method. + """ + def __init__(self, type_, data=None): + self._type = type_ + if type_ == "polygon": + if isinstance(data, list): + data = tuple(data) + elif type_ == "image": + assert(isinstance(data, TK.PhotoImage)) + elif type_ == "compound": + data = [] + else: + raise TurtleGraphicsError("There is no shape type %s" % type_) + self._data = data + + def addcomponent(self, poly, fill, outline=None): + """Add component to a shape of type compound. + + Arguments: poly is a polygon, i. e. a tuple of number pairs. + fill is the fillcolor of the component, + outline is the outline color of the component. + + call (for a Shapeobject namend s): + -- s.addcomponent(((0,0), (10,10), (-10,10)), "red", "blue") + + Example: + >>> poly = ((0,0),(10,-5),(0,10),(-10,-5)) + >>> s = Shape("compound") + >>> s.addcomponent(poly, "red", "blue") + >>> # .. add more components and then use register_shape() + """ + if self._type != "compound": + raise TurtleGraphicsError("Cannot add component to %s Shape" + % self._type) + if outline is None: + outline = fill + self._data.append([poly, fill, outline]) + + +class Tbuffer(object): + """Ring buffer used as undobuffer for RawTurtle objects.""" + def __init__(self, bufsize=10): + self.bufsize = bufsize + self.buffer = [[None]] * bufsize + self.ptr = -1 + self.cumulate = False + def reset(self, bufsize=None): + if bufsize is None: + for i in range(self.bufsize): + self.buffer[i] = [None] + else: + self.bufsize = bufsize + self.buffer = [[None]] * bufsize + self.ptr = -1 + def push(self, item): + if self.bufsize > 0: + if not self.cumulate: + self.ptr = (self.ptr + 1) % self.bufsize + self.buffer[self.ptr] = item + else: + self.buffer[self.ptr].append(item) + def pop(self): + if self.bufsize > 0: + item = self.buffer[self.ptr] + if item is None: + return None + else: + self.buffer[self.ptr] = [None] + self.ptr = (self.ptr - 1) % self.bufsize + return (item) + def nr_of_items(self): + return self.bufsize - self.buffer.count([None]) + def __repr__(self): + return str(self.buffer) + " " + str(self.ptr) + + + +class TurtleScreen(TurtleScreenBase): + """Provides screen oriented methods like bgcolor etc. + + Only relies upon the methods of TurtleScreenBase and NOT + upon components of the underlying graphics toolkit - + which is Tkinter in this case. + """ + _RUNNING = True + + def __init__(self, cv, mode=_CFG["mode"], + colormode=_CFG["colormode"], delay=_CFG["delay"]): + TurtleScreenBase.__init__(self, cv) + + self._shapes = { + "arrow" : Shape("polygon", ((-10,0), (10,0), (0,10))), + "turtle" : Shape("polygon", ((0,16), (-2,14), (-1,10), (-4,7), + (-7,9), (-9,8), (-6,5), (-7,1), (-5,-3), (-8,-6), + (-6,-8), (-4,-5), (0,-7), (4,-5), (6,-8), (8,-6), + (5,-3), (7,1), (6,5), (9,8), (7,9), (4,7), (1,10), + (2,14))), + "circle" : Shape("polygon", ((10,0), (9.51,3.09), (8.09,5.88), + (5.88,8.09), (3.09,9.51), (0,10), (-3.09,9.51), + (-5.88,8.09), (-8.09,5.88), (-9.51,3.09), (-10,0), + (-9.51,-3.09), (-8.09,-5.88), (-5.88,-8.09), + (-3.09,-9.51), (-0.00,-10.00), (3.09,-9.51), + (5.88,-8.09), (8.09,-5.88), (9.51,-3.09))), + "square" : Shape("polygon", ((10,-10), (10,10), (-10,10), + (-10,-10))), + "triangle" : Shape("polygon", ((10,-5.77), (0,11.55), + (-10,-5.77))), + "classic": Shape("polygon", ((0,0),(-5,-9),(0,-7),(5,-9))), + "blank" : Shape("image", self._blankimage()) + } + + self._bgpics = {"nopic" : ""} + + self._mode = mode + self._delayvalue = delay + self._colormode = _CFG["colormode"] + self._keys = [] + self.clear() + if sys.platform == 'darwin': + # Force Turtle window to the front on OS X. This is needed because + # the Turtle window will show behind the Terminal window when you + # start the demo from the command line. + rootwindow = cv.winfo_toplevel() + rootwindow.call('wm', 'attributes', '.', '-topmost', '1') + rootwindow.call('wm', 'attributes', '.', '-topmost', '0') + + def clear(self): + """Delete all drawings and all turtles from the TurtleScreen. + + No argument. + + Reset empty TurtleScreen to its initial state: white background, + no backgroundimage, no eventbindings and tracing on. + + Example (for a TurtleScreen instance named screen): + >>> screen.clear() + + Note: this method is not available as function. + """ + self._delayvalue = _CFG["delay"] + self._colormode = _CFG["colormode"] + self._delete("all") + self._bgpic = self._createimage("") + self._bgpicname = "nopic" + self._tracing = 1 + self._updatecounter = 0 + self._turtles = [] + self.bgcolor("white") + for btn in 1, 2, 3: + self.onclick(None, btn) + self.onkeypress(None) + for key in self._keys[:]: + self.onkey(None, key) + self.onkeypress(None, key) + Turtle._pen = None + + def mode(self, mode=None): + """Set turtle-mode ('standard', 'logo' or 'world') and perform reset. + + Optional argument: + mode -- one of the strings 'standard', 'logo' or 'world' + + Mode 'standard' is compatible with turtle.py. + Mode 'logo' is compatible with most Logo-Turtle-Graphics. + Mode 'world' uses userdefined 'worldcoordinates'. *Attention*: in + this mode angles appear distorted if x/y unit-ratio doesn't equal 1. + If mode is not given, return the current mode. + + Mode Initial turtle heading positive angles + ------------|-------------------------|------------------- + 'standard' to the right (east) counterclockwise + 'logo' upward (north) clockwise + + Examples: + >>> mode('logo') # resets turtle heading to north + >>> mode() + 'logo' + """ + if mode is None: + return self._mode + mode = mode.lower() + if mode not in ["standard", "logo", "world"]: + raise TurtleGraphicsError("No turtle-graphics-mode %s" % mode) + self._mode = mode + if mode in ["standard", "logo"]: + self._setscrollregion(-self.canvwidth//2, -self.canvheight//2, + self.canvwidth//2, self.canvheight//2) + self.xscale = self.yscale = 1.0 + self.reset() + + def setworldcoordinates(self, llx, lly, urx, ury): + """Set up a user defined coordinate-system. + + Arguments: + llx -- a number, x-coordinate of lower left corner of canvas + lly -- a number, y-coordinate of lower left corner of canvas + urx -- a number, x-coordinate of upper right corner of canvas + ury -- a number, y-coordinate of upper right corner of canvas + + Set up user coodinat-system and switch to mode 'world' if necessary. + This performs a screen.reset. If mode 'world' is already active, + all drawings are redrawn according to the new coordinates. + + But ATTENTION: in user-defined coordinatesystems angles may appear + distorted. (see Screen.mode()) + + Example (for a TurtleScreen instance named screen): + >>> screen.setworldcoordinates(-10,-0.5,50,1.5) + >>> for _ in range(36): + ... left(10) + ... forward(0.5) + """ + if self.mode() != "world": + self.mode("world") + xspan = float(urx - llx) + yspan = float(ury - lly) + wx, wy = self._window_size() + self.screensize(wx-20, wy-20) + oldxscale, oldyscale = self.xscale, self.yscale + self.xscale = self.canvwidth / xspan + self.yscale = self.canvheight / yspan + srx1 = llx * self.xscale + sry1 = -ury * self.yscale + srx2 = self.canvwidth + srx1 + sry2 = self.canvheight + sry1 + self._setscrollregion(srx1, sry1, srx2, sry2) + self._rescale(self.xscale/oldxscale, self.yscale/oldyscale) + self.update() + + def register_shape(self, name, shape=None): + """Adds a turtle shape to TurtleScreen's shapelist. + + Arguments: + (1) name is the name of an image file (PNG, GIF, PGM, and PPM) and shape is None. + Installs the corresponding image shape. + !! Image-shapes DO NOT rotate when turning the turtle, + !! so they do not display the heading of the turtle! + (2) name is an arbitrary string and shape is the name of an image file (PNG, GIF, PGM, and PPM). + Installs the corresponding image shape. + !! Image-shapes DO NOT rotate when turning the turtle, + !! so they do not display the heading of the turtle! + (3) name is an arbitrary string and shape is a tuple + of pairs of coordinates. Installs the corresponding + polygon shape + (4) name is an arbitrary string and shape is a + (compound) Shape object. Installs the corresponding + compound shape. + To use a shape, you have to issue the command shape(shapename). + + call: register_shape("turtle.gif") + --or: register_shape("tri", ((0,0), (10,10), (-10,10))) + + Example (for a TurtleScreen instance named screen): + >>> screen.register_shape("triangle", ((5,-3),(0,5),(-5,-3))) + + """ + if shape is None: + shape = Shape("image", self._image(name)) + elif isinstance(shape, str): + shape = Shape("image", self._image(shape)) + elif isinstance(shape, tuple): + shape = Shape("polygon", shape) + ## else shape assumed to be Shape-instance + self._shapes[name] = shape + + def _colorstr(self, color): + """Return color string corresponding to args. + + Argument may be a string or a tuple of three + numbers corresponding to actual colormode, + i.e. in the range 0<=n<=colormode. + + If the argument doesn't represent a color, + an error is raised. + """ + if len(color) == 1: + color = color[0] + if isinstance(color, str): + if self._iscolorstring(color) or color == "": + return color + else: + raise TurtleGraphicsError("bad color string: %s" % str(color)) + try: + r, g, b = color + except (TypeError, ValueError): + raise TurtleGraphicsError("bad color arguments: %s" % str(color)) + if self._colormode == 1.0: + r, g, b = [round(255.0*x) for x in (r, g, b)] + if not ((0 <= r <= 255) and (0 <= g <= 255) and (0 <= b <= 255)): + raise TurtleGraphicsError("bad color sequence: %s" % str(color)) + return "#%02x%02x%02x" % (r, g, b) + + def _color(self, cstr): + if not cstr.startswith("#"): + return cstr + if len(cstr) == 7: + cl = [int(cstr[i:i+2], 16) for i in (1, 3, 5)] + elif len(cstr) == 4: + cl = [16*int(cstr[h], 16) for h in cstr[1:]] + else: + raise TurtleGraphicsError("bad colorstring: %s" % cstr) + return tuple(c * self._colormode/255 for c in cl) + + def colormode(self, cmode=None): + """Return the colormode or set it to 1.0 or 255. + + Optional argument: + cmode -- one of the values 1.0 or 255 + + r, g, b values of colortriples have to be in range 0..cmode. + + Example (for a TurtleScreen instance named screen): + >>> screen.colormode() + 1.0 + >>> screen.colormode(255) + >>> pencolor(240,160,80) + """ + if cmode is None: + return self._colormode + if cmode == 1.0: + self._colormode = float(cmode) + elif cmode == 255: + self._colormode = int(cmode) + + def reset(self): + """Reset all Turtles on the Screen to their initial state. + + No argument. + + Example (for a TurtleScreen instance named screen): + >>> screen.reset() + """ + for turtle in self._turtles: + turtle._setmode(self._mode) + turtle.reset() + + def turtles(self): + """Return the list of turtles on the screen. + + Example (for a TurtleScreen instance named screen): + >>> screen.turtles() + [] + """ + return self._turtles + + def bgcolor(self, *args): + """Set or return backgroundcolor of the TurtleScreen. + + Four input formats are allowed: + - bgcolor() + Return the current background color as color specification + string or as a tuple (see example). May be used as input + to another color/pencolor/fillcolor/bgcolor call. + - bgcolor(colorstring) + Set the background color to colorstring, which is a Tk color + specification string, such as "red", "yellow", or "#33cc8c". + - bgcolor((r, g, b)) + Set the background color to the RGB color represented by + the tuple of r, g, and b. Each of r, g, and b must be in + the range 0..colormode, where colormode is either 1.0 or 255 + (see colormode()). + - bgcolor(r, g, b) + Set the background color to the RGB color represented by + r, g, and b. Each of r, g, and b must be in the range + 0..colormode. + + Example (for a TurtleScreen instance named screen): + >>> screen.bgcolor("orange") + >>> screen.bgcolor() + 'orange' + >>> colormode(255) + >>> screen.bgcolor('#800080') + >>> screen.bgcolor() + (128.0, 0.0, 128.0) + """ + if args: + color = self._colorstr(args) + else: + color = None + color = self._bgcolor(color) + if color is not None: + color = self._color(color) + return color + + def tracer(self, n=None, delay=None): + """Turns turtle animation on/off and set delay for update drawings. + + Optional arguments: + n -- nonnegative integer + delay -- nonnegative integer + + If n is given, only each n-th regular screen update is really performed. + (Can be used to accelerate the drawing of complex graphics.) + Second arguments sets delay value (see RawTurtle.delay()) + + Example (for a TurtleScreen instance named screen): + >>> screen.tracer(8, 25) + >>> dist = 2 + >>> for i in range(200): + ... fd(dist) + ... rt(90) + ... dist += 2 + """ + if n is None: + return self._tracing + self._tracing = int(n) + self._updatecounter = 0 + if delay is not None: + self._delayvalue = int(delay) + if self._tracing: + self.update() + + def delay(self, delay=None): + """ Return or set the drawing delay in milliseconds. + + Optional argument: + delay -- positive integer + + Example (for a TurtleScreen instance named screen): + >>> screen.delay(15) + >>> screen.delay() + 15 + """ + if delay is None: + return self._delayvalue + self._delayvalue = int(delay) + + @contextmanager + def no_animation(self): + """Temporarily turn off auto-updating the screen. + + This is useful for drawing complex shapes where even the fastest setting + is too slow. Once this context manager is exited, the drawing will + be displayed. + + Example (for a TurtleScreen instance named screen + and a Turtle instance named turtle): + >>> with screen.no_animation(): + ... turtle.circle(50) + """ + tracer = self.tracer() + try: + self.tracer(0) + yield + finally: + self.tracer(tracer) + + def _incrementudc(self): + """Increment update counter.""" + if not TurtleScreen._RUNNING: + TurtleScreen._RUNNING = True + raise Terminator + if self._tracing > 0: + self._updatecounter += 1 + self._updatecounter %= self._tracing + + def update(self): + """Perform a TurtleScreen update. + """ + tracing = self._tracing + self._tracing = True + for t in self.turtles(): + t._update_data() + t._drawturtle() + self._tracing = tracing + self._update() + + def window_width(self): + """ Return the width of the turtle window. + + Example (for a TurtleScreen instance named screen): + >>> screen.window_width() + 640 + """ + return self._window_size()[0] + + def window_height(self): + """ Return the height of the turtle window. + + Example (for a TurtleScreen instance named screen): + >>> screen.window_height() + 480 + """ + return self._window_size()[1] + + def getcanvas(self): + """Return the Canvas of this TurtleScreen. + + No argument. + + Example (for a Screen instance named screen): + >>> cv = screen.getcanvas() + >>> cv + + """ + return self.cv + + def getshapes(self): + """Return a list of names of all currently available turtle shapes. + + No argument. + + Example (for a TurtleScreen instance named screen): + >>> screen.getshapes() + ['arrow', 'blank', 'circle', ... , 'turtle'] + """ + return sorted(self._shapes.keys()) + + def onclick(self, fun, btn=1, add=None): + """Bind fun to mouse-click event on canvas. + + Arguments: + fun -- a function with two arguments, the coordinates of the + clicked point on the canvas. + btn -- the number of the mouse-button, defaults to 1 + + Example (for a TurtleScreen instance named screen) + + >>> screen.onclick(goto) + >>> # Subsequently clicking into the TurtleScreen will + >>> # make the turtle move to the clicked point. + >>> screen.onclick(None) + """ + self._onscreenclick(fun, btn, add) + + def onkey(self, fun, key): + """Bind fun to key-release event of key. + + Arguments: + fun -- a function with no arguments + key -- a string: key (e.g. "a") or key-symbol (e.g. "space") + + In order to be able to register key-events, TurtleScreen + must have focus. (See method listen.) + + Example (for a TurtleScreen instance named screen): + + >>> def f(): + ... fd(50) + ... lt(60) + ... + >>> screen.onkey(f, "Up") + >>> screen.listen() + + Subsequently the turtle can be moved by repeatedly pressing + the up-arrow key, consequently drawing a hexagon + + """ + if fun is None: + if key in self._keys: + self._keys.remove(key) + elif key not in self._keys: + self._keys.append(key) + self._onkeyrelease(fun, key) + + def onkeypress(self, fun, key=None): + """Bind fun to key-press event of key if key is given, + or to any key-press-event if no key is given. + + Arguments: + fun -- a function with no arguments + key -- a string: key (e.g. "a") or key-symbol (e.g. "space") + + In order to be able to register key-events, TurtleScreen + must have focus. (See method listen.) + + Example (for a TurtleScreen instance named screen + and a Turtle instance named turtle): + + >>> def f(): + ... fd(50) + ... lt(60) + ... + >>> screen.onkeypress(f, "Up") + >>> screen.listen() + + Subsequently the turtle can be moved by repeatedly pressing + the up-arrow key, or by keeping pressed the up-arrow key. + consequently drawing a hexagon. + """ + if fun is None: + if key in self._keys: + self._keys.remove(key) + elif key is not None and key not in self._keys: + self._keys.append(key) + self._onkeypress(fun, key) + + def listen(self, xdummy=None, ydummy=None): + """Set focus on TurtleScreen (in order to collect key-events) + + No arguments. + Dummy arguments are provided in order + to be able to pass listen to the onclick method. + + Example (for a TurtleScreen instance named screen): + >>> screen.listen() + """ + self._listen() + + def ontimer(self, fun, t=0): + """Install a timer, which calls fun after t milliseconds. + + Arguments: + fun -- a function with no arguments. + t -- a number >= 0 + + Example (for a TurtleScreen instance named screen): + + >>> running = True + >>> def f(): + ... if running: + ... fd(50) + ... lt(60) + ... screen.ontimer(f, 250) + ... + >>> f() # makes the turtle marching around + >>> running = False + """ + self._ontimer(fun, t) + + def bgpic(self, picname=None): + """Set background image or return name of current backgroundimage. + + Optional argument: + picname -- a string, name of an image file (PNG, GIF, PGM, and PPM) or "nopic". + + If picname is a filename, set the corresponding image as background. + If picname is "nopic", delete backgroundimage, if present. + If picname is None, return the filename of the current backgroundimage. + + Example (for a TurtleScreen instance named screen): + >>> screen.bgpic() + 'nopic' + >>> screen.bgpic("landscape.gif") + >>> screen.bgpic() + 'landscape.gif' + """ + if picname is None: + return self._bgpicname + if picname not in self._bgpics: + self._bgpics[picname] = self._image(picname) + self._setbgpic(self._bgpic, self._bgpics[picname]) + self._bgpicname = picname + + def screensize(self, canvwidth=None, canvheight=None, bg=None): + """Resize the canvas the turtles are drawing on. + + Optional arguments: + canvwidth -- positive integer, new width of canvas in pixels + canvheight -- positive integer, new height of canvas in pixels + bg -- colorstring or color-tuple, new backgroundcolor + If no arguments are given, return current (canvaswidth, canvasheight) + + Do not alter the drawing window. To observe hidden parts of + the canvas use the scrollbars. (Can make visible those parts + of a drawing, which were outside the canvas before!) + + Example (for a Turtle instance named turtle): + >>> turtle.screensize(2000,1500) + >>> # e.g. to search for an erroneously escaped turtle ;-) + """ + return self._resize(canvwidth, canvheight, bg) + + def save(self, filename, *, overwrite=False): + """Save the drawing as a PostScript file + + Arguments: + filename -- a string, the path of the created file. + Must end with '.ps' or '.eps'. + + Optional arguments: + overwrite -- boolean, if true, then existing files will be overwritten + + Example (for a TurtleScreen instance named screen): + >>> screen.save('my_drawing.eps') + """ + filename = Path(filename) + if not filename.parent.exists(): + raise FileNotFoundError( + f"The directory '{filename.parent}' does not exist." + " Cannot save to it." + ) + if not overwrite and filename.exists(): + raise FileExistsError( + f"The file '{filename}' already exists. To overwrite it use" + " the 'overwrite=True' argument of the save function." + ) + if (ext := filename.suffix) not in {".ps", ".eps"}: + raise ValueError( + f"Unknown file extension: '{ext}'," + " must be one of {'.ps', '.eps'}" + ) + + postscript = self.cv.postscript() + filename.write_text(postscript) + + onscreenclick = onclick + resetscreen = reset + clearscreen = clear + addshape = register_shape + onkeyrelease = onkey + +class TNavigator(object): + """Navigation part of the RawTurtle. + Implements methods for turtle movement. + """ + START_ORIENTATION = { + "standard": Vec2D(1.0, 0.0), + "world" : Vec2D(1.0, 0.0), + "logo" : Vec2D(0.0, 1.0) } + DEFAULT_MODE = "standard" + DEFAULT_ANGLEOFFSET = 0 + DEFAULT_ANGLEORIENT = 1 + + def __init__(self, mode=DEFAULT_MODE): + self._angleOffset = self.DEFAULT_ANGLEOFFSET + self._angleOrient = self.DEFAULT_ANGLEORIENT + self._mode = mode + self.undobuffer = None + self.degrees() + self._mode = None + self._setmode(mode) + TNavigator.reset(self) + + def reset(self): + """reset turtle to its initial values + + Will be overwritten by parent class + """ + self._position = Vec2D(0.0, 0.0) + self._orient = TNavigator.START_ORIENTATION[self._mode] + + def _setmode(self, mode=None): + """Set turtle-mode to 'standard', 'world' or 'logo'. + """ + if mode is None: + return self._mode + if mode not in ["standard", "logo", "world"]: + return + self._mode = mode + if mode in ["standard", "world"]: + self._angleOffset = 0 + self._angleOrient = 1 + else: # mode == "logo": + self._angleOffset = self._fullcircle/4. + self._angleOrient = -1 + + def _setDegreesPerAU(self, fullcircle): + """Helper function for degrees() and radians()""" + self._fullcircle = fullcircle + self._degreesPerAU = 360/fullcircle + if self._mode == "standard": + self._angleOffset = 0 + else: + self._angleOffset = fullcircle/4. + + def degrees(self, fullcircle=360.0): + """ Set angle measurement units to degrees. + + Optional argument: + fullcircle - a number + + Set angle measurement units, i. e. set number + of 'degrees' for a full circle. Default value is + 360 degrees. + + Example (for a Turtle instance named turtle): + >>> turtle.left(90) + >>> turtle.heading() + 90 + + Change angle measurement unit to grad (also known as gon, + grade, or gradian and equals 1/100-th of the right angle.) + >>> turtle.degrees(400.0) + >>> turtle.heading() + 100 + + """ + self._setDegreesPerAU(fullcircle) + + def radians(self): + """ Set the angle measurement units to radians. + + No arguments. + + Example (for a Turtle instance named turtle): + >>> turtle.heading() + 90 + >>> turtle.radians() + >>> turtle.heading() + 1.5707963267948966 + """ + self._setDegreesPerAU(math.tau) + + def _go(self, distance): + """move turtle forward by specified distance""" + ende = self._position + self._orient * distance + self._goto(ende) + + def _rotate(self, angle): + """Turn turtle counterclockwise by specified angle if angle > 0.""" + angle *= self._degreesPerAU + self._orient = self._orient.rotate(angle) + + def _goto(self, end): + """move turtle to position end.""" + self._position = end + + def teleport(self, x=None, y=None, *, fill_gap: bool = False) -> None: + """To be overwritten by child class RawTurtle. + Includes no TPen references.""" + new_x = x if x is not None else self._position[0] + new_y = y if y is not None else self._position[1] + self._position = Vec2D(new_x, new_y) + + def forward(self, distance): + """Move the turtle forward by the specified distance. + + Aliases: forward | fd + + Argument: + distance -- a number (integer or float) + + Move the turtle forward by the specified distance, in the direction + the turtle is headed. + + Example (for a Turtle instance named turtle): + >>> turtle.position() + (0.00,0.00) + >>> turtle.forward(25) + >>> turtle.position() + (25.00,0.00) + >>> turtle.forward(-75) + >>> turtle.position() + (-50.00,0.00) + """ + self._go(distance) + + def back(self, distance): + """Move the turtle backward by distance. + + Aliases: back | backward | bk + + Argument: + distance -- a number + + Move the turtle backward by distance, opposite to the direction the + turtle is headed. Do not change the turtle's heading. + + Example (for a Turtle instance named turtle): + >>> turtle.position() + (0.00,0.00) + >>> turtle.backward(30) + >>> turtle.position() + (-30.00,0.00) + """ + self._go(-distance) + + def right(self, angle): + """Turn turtle right by angle units. + + Aliases: right | rt + + Argument: + angle -- a number (integer or float) + + Turn turtle right by angle units. (Units are by default degrees, + but can be set via the degrees() and radians() functions.) + Angle orientation depends on mode. (See this.) + + Example (for a Turtle instance named turtle): + >>> turtle.heading() + 22.0 + >>> turtle.right(45) + >>> turtle.heading() + 337.0 + """ + self._rotate(-angle) + + def left(self, angle): + """Turn turtle left by angle units. + + Aliases: left | lt + + Argument: + angle -- a number (integer or float) + + Turn turtle left by angle units. (Units are by default degrees, + but can be set via the degrees() and radians() functions.) + Angle orientation depends on mode. (See this.) + + Example (for a Turtle instance named turtle): + >>> turtle.heading() + 22.0 + >>> turtle.left(45) + >>> turtle.heading() + 67.0 + """ + self._rotate(angle) + + def pos(self): + """Return the turtle's current location (x,y), as a Vec2D-vector. + + Aliases: pos | position + + No arguments. + + Example (for a Turtle instance named turtle): + >>> turtle.pos() + (0.00, 240.00) + """ + return self._position + + def xcor(self): + """ Return the turtle's x coordinate. + + No arguments. + + Example (for a Turtle instance named turtle): + >>> reset() + >>> turtle.left(60) + >>> turtle.forward(100) + >>> print(turtle.xcor()) + 50.0 + """ + return self._position[0] + + def ycor(self): + """ Return the turtle's y coordinate + --- + No arguments. + + Example (for a Turtle instance named turtle): + >>> reset() + >>> turtle.left(60) + >>> turtle.forward(100) + >>> print(turtle.ycor()) + 86.6025403784 + """ + return self._position[1] + + + def goto(self, x, y=None): + """Move turtle to an absolute position. + + Aliases: setpos | setposition | goto: + + Arguments: + x -- a number or a pair/vector of numbers + y -- a number None + + call: goto(x, y) # two coordinates + --or: goto((x, y)) # a pair (tuple) of coordinates + --or: goto(vec) # e.g. as returned by pos() + + Move turtle to an absolute position. If the pen is down, + a line will be drawn. The turtle's orientation does not change. + + Example (for a Turtle instance named turtle): + >>> tp = turtle.pos() + >>> tp + (0.00,0.00) + >>> turtle.setpos(60,30) + >>> turtle.pos() + (60.00,30.00) + >>> turtle.setpos((20,80)) + >>> turtle.pos() + (20.00,80.00) + >>> turtle.setpos(tp) + >>> turtle.pos() + (0.00,0.00) + """ + if y is None: + self._goto(Vec2D(*x)) + else: + self._goto(Vec2D(x, y)) + + def home(self): + """Move turtle to the origin - coordinates (0,0). + + No arguments. + + Move turtle to the origin - coordinates (0,0) and set its + heading to its start-orientation (which depends on mode). + + Example (for a Turtle instance named turtle): + >>> turtle.home() + """ + self.goto(0, 0) + self.setheading(0) + + def setx(self, x): + """Set the turtle's first coordinate to x + + Argument: + x -- a number (integer or float) + + Set the turtle's first coordinate to x, leave second coordinate + unchanged. + + Example (for a Turtle instance named turtle): + >>> turtle.position() + (0.00, 240.00) + >>> turtle.setx(10) + >>> turtle.position() + (10.00, 240.00) + """ + self._goto(Vec2D(x, self._position[1])) + + def sety(self, y): + """Set the turtle's second coordinate to y + + Argument: + y -- a number (integer or float) + + Set the turtle's first coordinate to x, second coordinate remains + unchanged. + + Example (for a Turtle instance named turtle): + >>> turtle.position() + (0.00, 40.00) + >>> turtle.sety(-10) + >>> turtle.position() + (0.00, -10.00) + """ + self._goto(Vec2D(self._position[0], y)) + + def distance(self, x, y=None): + """Return the distance from the turtle to (x,y) in turtle step units. + + Arguments: + x -- a number or a pair/vector of numbers or a turtle instance + y -- a number None None + + call: distance(x, y) # two coordinates + --or: distance((x, y)) # a pair (tuple) of coordinates + --or: distance(vec) # e.g. as returned by pos() + --or: distance(mypen) # where mypen is another turtle + + Example (for a Turtle instance named turtle): + >>> turtle.pos() + (0.00,0.00) + >>> turtle.distance(30,40) + 50.0 + >>> pen = Turtle() + >>> pen.forward(77) + >>> turtle.distance(pen) + 77.0 + """ + if y is not None: + pos = Vec2D(x, y) + if isinstance(x, Vec2D): + pos = x + elif isinstance(x, tuple): + pos = Vec2D(*x) + elif isinstance(x, TNavigator): + pos = x._position + return abs(pos - self._position) + + def towards(self, x, y=None): + """Return the angle of the line from the turtle's position to (x, y). + + Arguments: + x -- a number or a pair/vector of numbers or a turtle instance + y -- a number None None + + call: distance(x, y) # two coordinates + --or: distance((x, y)) # a pair (tuple) of coordinates + --or: distance(vec) # e.g. as returned by pos() + --or: distance(mypen) # where mypen is another turtle + + Return the angle, between the line from turtle-position to position + specified by x, y and the turtle's start orientation. (Depends on + modes - "standard" or "logo") + + Example (for a Turtle instance named turtle): + >>> turtle.pos() + (10.00, 10.00) + >>> turtle.towards(0,0) + 225.0 + """ + if y is not None: + pos = Vec2D(x, y) + if isinstance(x, Vec2D): + pos = x + elif isinstance(x, tuple): + pos = Vec2D(*x) + elif isinstance(x, TNavigator): + pos = x._position + x, y = pos - self._position + result = round(math.degrees(math.atan2(y, x)), 10) % 360.0 + result /= self._degreesPerAU + return (self._angleOffset + self._angleOrient*result) % self._fullcircle + + def heading(self): + """ Return the turtle's current heading. + + No arguments. + + Example (for a Turtle instance named turtle): + >>> turtle.left(67) + >>> turtle.heading() + 67.0 + """ + x, y = self._orient + result = round(math.degrees(math.atan2(y, x)), 10) % 360.0 + result /= self._degreesPerAU + return (self._angleOffset + self._angleOrient*result) % self._fullcircle + + def setheading(self, to_angle): + """Set the orientation of the turtle to to_angle. + + Aliases: setheading | seth + + Argument: + to_angle -- a number (integer or float) + + Set the orientation of the turtle to to_angle. + Here are some common directions in degrees: + + standard - mode: logo-mode: + -------------------|-------------------- + 0 - east 0 - north + 90 - north 90 - east + 180 - west 180 - south + 270 - south 270 - west + + Example (for a Turtle instance named turtle): + >>> turtle.setheading(90) + >>> turtle.heading() + 90 + """ + angle = (to_angle - self.heading())*self._angleOrient + full = self._fullcircle + angle = (angle+full/2.)%full - full/2. + self._rotate(angle) + + def circle(self, radius, extent = None, steps = None): + """ Draw a circle with given radius. + + Arguments: + radius -- a number + extent (optional) -- a number + steps (optional) -- an integer + + Draw a circle with given radius. The center is radius units left + of the turtle; extent - an angle - determines which part of the + circle is drawn. If extent is not given, draw the entire circle. + If extent is not a full circle, one endpoint of the arc is the + current pen position. Draw the arc in counterclockwise direction + if radius is positive, otherwise in clockwise direction. Finally + the direction of the turtle is changed by the amount of extent. + + As the circle is approximated by an inscribed regular polygon, + steps determines the number of steps to use. If not given, + it will be calculated automatically. Maybe used to draw regular + polygons. + + call: circle(radius) # full circle + --or: circle(radius, extent) # arc + --or: circle(radius, extent, steps) + --or: circle(radius, steps=6) # 6-sided polygon + + Example (for a Turtle instance named turtle): + >>> turtle.circle(50) + >>> turtle.circle(120, 180) # semicircle + """ + if self.undobuffer: + self.undobuffer.push(["seq"]) + self.undobuffer.cumulate = True + speed = self.speed() + if extent is None: + extent = self._fullcircle + if steps is None: + frac = abs(extent)/self._fullcircle + steps = 1+int(min(11+abs(radius)/6.0, 59.0)*frac) + w = 1.0 * extent / steps + w2 = 0.5 * w + l = 2.0 * radius * math.sin(math.radians(w2)*self._degreesPerAU) + if radius < 0: + l, w, w2 = -l, -w, -w2 + tr = self._tracer() + dl = self._delay() + if speed == 0: + self._tracer(0, 0) + else: + self.speed(0) + self._rotate(w2) + for i in range(steps): + self.speed(speed) + self._go(l) + self.speed(0) + self._rotate(w) + self._rotate(-w2) + if speed == 0: + self._tracer(tr, dl) + self.speed(speed) + if self.undobuffer: + self.undobuffer.cumulate = False + +## three dummy methods to be implemented by child class: + + def speed(self, s=0): + """dummy method - to be overwritten by child class""" + def _tracer(self, a=None, b=None): + """dummy method - to be overwritten by child class""" + def _delay(self, n=None): + """dummy method - to be overwritten by child class""" + + fd = forward + bk = back + backward = back + rt = right + lt = left + position = pos + setpos = goto + setposition = goto + seth = setheading + + +class TPen(object): + """Drawing part of the RawTurtle. + Implements drawing properties. + """ + def __init__(self, resizemode=_CFG["resizemode"]): + self._resizemode = resizemode # or "user" or "noresize" + self.undobuffer = None + TPen._reset(self) + + def _reset(self, pencolor=_CFG["pencolor"], + fillcolor=_CFG["fillcolor"]): + self._pensize = 1 + self._shown = True + self._pencolor = pencolor + self._fillcolor = fillcolor + self._drawing = True + self._speed = 3 + self._stretchfactor = (1., 1.) + self._shearfactor = 0. + self._tilt = 0. + self._shapetrafo = (1., 0., 0., 1.) + self._outlinewidth = 1 + + def resizemode(self, rmode=None): + """Set resizemode to one of the values: "auto", "user", "noresize". + + (Optional) Argument: + rmode -- one of the strings "auto", "user", "noresize" + + Different resizemodes have the following effects: + - "auto" adapts the appearance of the turtle + corresponding to the value of pensize. + - "user" adapts the appearance of the turtle according to the + values of stretchfactor and outlinewidth (outline), + which are set by shapesize() + - "noresize" no adaption of the turtle's appearance takes place. + If no argument is given, return current resizemode. + resizemode("user") is called by a call of shapesize with arguments. + + + Examples (for a Turtle instance named turtle): + >>> turtle.resizemode("noresize") + >>> turtle.resizemode() + 'noresize' + """ + if rmode is None: + return self._resizemode + rmode = rmode.lower() + if rmode in ["auto", "user", "noresize"]: + self.pen(resizemode=rmode) + + def pensize(self, width=None): + """Set or return the line thickness. + + Aliases: pensize | width + + Argument: + width -- positive number + + Set the line thickness to width or return it. If resizemode is set + to "auto" and turtleshape is a polygon, that polygon is drawn with + the same line thickness. If no argument is given, current pensize + is returned. + + Example (for a Turtle instance named turtle): + >>> turtle.pensize() + 1 + >>> turtle.pensize(10) # from here on lines of width 10 are drawn + """ + if width is None: + return self._pensize + self.pen(pensize=width) + + + def penup(self): + """Pull the pen up -- no drawing when moving. + + Aliases: penup | pu | up + + No argument + + Example (for a Turtle instance named turtle): + >>> turtle.penup() + """ + if not self._drawing: + return + self.pen(pendown=False) + + def pendown(self): + """Pull the pen down -- drawing when moving. + + Aliases: pendown | pd | down + + No argument. + + Example (for a Turtle instance named turtle): + >>> turtle.pendown() + """ + if self._drawing: + return + self.pen(pendown=True) + + def isdown(self): + """Return True if pen is down, False if it's up. + + No argument. + + Example (for a Turtle instance named turtle): + >>> turtle.penup() + >>> turtle.isdown() + False + >>> turtle.pendown() + >>> turtle.isdown() + True + """ + return self._drawing + + def speed(self, speed=None): + """ Return or set the turtle's speed. + + Optional argument: + speed -- an integer in the range 0..10 or a speedstring (see below) + + Set the turtle's speed to an integer value in the range 0 .. 10. + If no argument is given: return current speed. + + If input is a number greater than 10 or smaller than 0.5, + speed is set to 0. + Speedstrings are mapped to speedvalues in the following way: + 'fastest' : 0 + 'fast' : 10 + 'normal' : 6 + 'slow' : 3 + 'slowest' : 1 + speeds from 1 to 10 enforce increasingly faster animation of + line drawing and turtle turning. + + Attention: + speed = 0 : *no* animation takes place. forward/back makes turtle jump + and likewise left/right make the turtle turn instantly. + + Example (for a Turtle instance named turtle): + >>> turtle.speed(3) + """ + speeds = {'fastest':0, 'fast':10, 'normal':6, 'slow':3, 'slowest':1 } + if speed is None: + return self._speed + if speed in speeds: + speed = speeds[speed] + elif 0.5 < speed < 10.5: + speed = int(round(speed)) + else: + speed = 0 + self.pen(speed=speed) + + def color(self, *args): + """Return or set the pencolor and fillcolor. + + Arguments: + Several input formats are allowed. + They use 0 to 3 arguments as follows: + - color() + Return the current pencolor and the current fillcolor as + a pair of color specification strings or tuples as returned + by pencolor() and fillcolor(). + - color(colorstring), color((r,g,b)), color(r,g,b) + Inputs as in pencolor(), set both, fillcolor and pencolor, + to the given value. + - color(colorstring1, colorstring2), color((r1,g1,b1), (r2,g2,b2)) + Equivalent to pencolor(colorstring1) and fillcolor(colorstring2) + and analogously if the other input format is used. + + If turtleshape is a polygon, outline and interior of that polygon + is drawn with the newly set colors. + For more info see: pencolor, fillcolor + + Example (for a Turtle instance named turtle): + >>> turtle.color('red', 'green') + >>> turtle.color() + ('red', 'green') + >>> colormode(255) + >>> color(('#285078', '#a0c8f0')) + >>> color() + ((40.0, 80.0, 120.0), (160.0, 200.0, 240.0)) + """ + if args: + l = len(args) + if l == 1: + pcolor = fcolor = args[0] + elif l == 2: + pcolor, fcolor = args + elif l == 3: + pcolor = fcolor = args + pcolor = self._colorstr(pcolor) + fcolor = self._colorstr(fcolor) + self.pen(pencolor=pcolor, fillcolor=fcolor) + else: + return self._color(self._pencolor), self._color(self._fillcolor) + + def pencolor(self, *args): + """ Return or set the pencolor. + + Arguments: + Four input formats are allowed: + - pencolor() + Return the current pencolor as color specification string or + as a tuple (see example). May be used as input to another + color/pencolor/fillcolor/bgcolor call. + - pencolor(colorstring) + Set pencolor to colorstring, which is a Tk color + specification string, such as "red", "yellow", or "#33cc8c". + - pencolor((r, g, b)) + Set pencolor to the RGB color represented by the tuple of + r, g, and b. Each of r, g, and b must be in the range + 0..colormode, where colormode is either 1.0 or 255 (see + colormode()). + - pencolor(r, g, b) + Set pencolor to the RGB color represented by r, g, and b. + Each of r, g, and b must be in the range 0..colormode. + + If turtleshape is a polygon, the outline of that polygon is drawn + with the newly set pencolor. + + Example (for a Turtle instance named turtle): + >>> turtle.pencolor('brown') + >>> turtle.pencolor() + 'brown' + >>> colormode(255) + >>> turtle.pencolor('#32c18f') + >>> turtle.pencolor() + (50.0, 193.0, 143.0) + """ + if args: + color = self._colorstr(args) + if color == self._pencolor: + return + self.pen(pencolor=color) + else: + return self._color(self._pencolor) + + def fillcolor(self, *args): + """ Return or set the fillcolor. + + Arguments: + Four input formats are allowed: + - fillcolor() + Return the current fillcolor as color specification string, + possibly in tuple format (see example). May be used as + input to another color/pencolor/fillcolor/bgcolor call. + - fillcolor(colorstring) + Set fillcolor to colorstring, which is a Tk color + specification string, such as "red", "yellow", or "#33cc8c". + - fillcolor((r, g, b)) + Set fillcolor to the RGB color represented by the tuple of + r, g, and b. Each of r, g, and b must be in the range + 0..colormode, where colormode is either 1.0 or 255 (see + colormode()). + - fillcolor(r, g, b) + Set fillcolor to the RGB color represented by r, g, and b. + Each of r, g, and b must be in the range 0..colormode. + + If turtleshape is a polygon, the interior of that polygon is drawn + with the newly set fillcolor. + + Example (for a Turtle instance named turtle): + >>> turtle.fillcolor('violet') + >>> turtle.fillcolor() + 'violet' + >>> colormode(255) + >>> turtle.fillcolor('#ffffff') + >>> turtle.fillcolor() + (255.0, 255.0, 255.0) + """ + if args: + color = self._colorstr(args) + if color == self._fillcolor: + return + self.pen(fillcolor=color) + else: + return self._color(self._fillcolor) + + def teleport(self, x=None, y=None, *, fill_gap: bool = False) -> None: + """To be overwritten by child class RawTurtle. + Includes no TNavigator references. + """ + pendown = self.isdown() + if pendown: + self.pen(pendown=False) + self.pen(pendown=pendown) + + def showturtle(self): + """Makes the turtle visible. + + Aliases: showturtle | st + + No argument. + + Example (for a Turtle instance named turtle): + >>> turtle.hideturtle() + >>> turtle.showturtle() + """ + self.pen(shown=True) + + def hideturtle(self): + """Makes the turtle invisible. + + Aliases: hideturtle | ht + + No argument. + + It's a good idea to do this while you're in the + middle of a complicated drawing, because hiding + the turtle speeds up the drawing observably. + + Example (for a Turtle instance named turtle): + >>> turtle.hideturtle() + """ + self.pen(shown=False) + + def isvisible(self): + """Return True if the Turtle is shown, False if it's hidden. + + No argument. + + Example (for a Turtle instance named turtle): + >>> turtle.hideturtle() + >>> print(turtle.isvisible()) + False + """ + return self._shown + + def pen(self, pen=None, **pendict): + """Return or set the pen's attributes. + + Arguments: + pen -- a dictionary with some or all of the below listed keys. + **pendict -- one or more keyword-arguments with the below + listed keys as keywords. + + Return or set the pen's attributes in a 'pen-dictionary' + with the following key/value pairs: + "shown" : True/False + "pendown" : True/False + "pencolor" : color-string or color-tuple + "fillcolor" : color-string or color-tuple + "pensize" : positive number + "speed" : number in range 0..10 + "resizemode" : "auto" or "user" or "noresize" + "stretchfactor": (positive number, positive number) + "shearfactor": number + "outline" : positive number + "tilt" : number + + This dictionary can be used as argument for a subsequent + pen()-call to restore the former pen-state. Moreover one + or more of these attributes can be provided as keyword-arguments. + This can be used to set several pen attributes in one statement. + + + Examples (for a Turtle instance named turtle): + >>> turtle.pen(fillcolor="black", pencolor="red", pensize=10) + >>> turtle.pen() + {'pensize': 10, 'shown': True, 'resizemode': 'auto', 'outline': 1, + 'pencolor': 'red', 'pendown': True, 'fillcolor': 'black', + 'stretchfactor': (1,1), 'speed': 3, 'shearfactor': 0.0} + >>> penstate=turtle.pen() + >>> turtle.color("yellow","") + >>> turtle.penup() + >>> turtle.pen() + {'pensize': 10, 'shown': True, 'resizemode': 'auto', 'outline': 1, + 'pencolor': 'yellow', 'pendown': False, 'fillcolor': '', + 'stretchfactor': (1,1), 'speed': 3, 'shearfactor': 0.0} + >>> p.pen(penstate, fillcolor="green") + >>> p.pen() + {'pensize': 10, 'shown': True, 'resizemode': 'auto', 'outline': 1, + 'pencolor': 'red', 'pendown': True, 'fillcolor': 'green', + 'stretchfactor': (1,1), 'speed': 3, 'shearfactor': 0.0} + """ + _pd = {"shown" : self._shown, + "pendown" : self._drawing, + "pencolor" : self._pencolor, + "fillcolor" : self._fillcolor, + "pensize" : self._pensize, + "speed" : self._speed, + "resizemode" : self._resizemode, + "stretchfactor" : self._stretchfactor, + "shearfactor" : self._shearfactor, + "outline" : self._outlinewidth, + "tilt" : self._tilt + } + + if not (pen or pendict): + return _pd + + if isinstance(pen, dict): + p = pen + else: + p = {} + p.update(pendict) + + _p_buf = {} + for key in p: + _p_buf[key] = _pd[key] + + if self.undobuffer: + self.undobuffer.push(("pen", _p_buf)) + + newLine = False + if "pendown" in p: + if self._drawing != p["pendown"]: + newLine = True + if "pencolor" in p: + if isinstance(p["pencolor"], tuple): + p["pencolor"] = self._colorstr((p["pencolor"],)) + if self._pencolor != p["pencolor"]: + newLine = True + if "pensize" in p: + if self._pensize != p["pensize"]: + newLine = True + if newLine: + self._newLine() + if "pendown" in p: + self._drawing = p["pendown"] + if "pencolor" in p: + self._pencolor = p["pencolor"] + if "pensize" in p: + self._pensize = p["pensize"] + if "fillcolor" in p: + if isinstance(p["fillcolor"], tuple): + p["fillcolor"] = self._colorstr((p["fillcolor"],)) + self._fillcolor = p["fillcolor"] + if "speed" in p: + self._speed = p["speed"] + if "resizemode" in p: + self._resizemode = p["resizemode"] + if "stretchfactor" in p: + sf = p["stretchfactor"] + if isinstance(sf, (int, float)): + sf = (sf, sf) + self._stretchfactor = sf + if "shearfactor" in p: + self._shearfactor = p["shearfactor"] + if "outline" in p: + self._outlinewidth = p["outline"] + if "shown" in p: + self._shown = p["shown"] + if "tilt" in p: + self._tilt = p["tilt"] + if "stretchfactor" in p or "tilt" in p or "shearfactor" in p: + scx, scy = self._stretchfactor + shf = self._shearfactor + sa, ca = math.sin(self._tilt), math.cos(self._tilt) + self._shapetrafo = ( scx*ca, scy*(shf*ca + sa), + -scx*sa, scy*(ca - shf*sa)) + self._update() + +## three dummy methods to be implemented by child class: + + def _newLine(self, usePos = True): + """dummy method - to be overwritten by child class""" + def _update(self, count=True, forced=False): + """dummy method - to be overwritten by child class""" + def _color(self, args): + """dummy method - to be overwritten by child class""" + def _colorstr(self, args): + """dummy method - to be overwritten by child class""" + + width = pensize + up = penup + pu = penup + pd = pendown + down = pendown + st = showturtle + ht = hideturtle + + +class _TurtleImage(object): + """Helper class: Datatype to store Turtle attributes + """ + + def __init__(self, screen, shapeIndex): + self.screen = screen + self._type = None + self._setshape(shapeIndex) + + def _setshape(self, shapeIndex): + screen = self.screen + self.shapeIndex = shapeIndex + if self._type == "polygon" == screen._shapes[shapeIndex]._type: + return + if self._type == "image" == screen._shapes[shapeIndex]._type: + return + if self._type in ["image", "polygon"]: + screen._delete(self._item) + elif self._type == "compound": + for item in self._item: + screen._delete(item) + self._type = screen._shapes[shapeIndex]._type + if self._type == "polygon": + self._item = screen._createpoly() + elif self._type == "image": + self._item = screen._createimage(screen._shapes["blank"]._data) + elif self._type == "compound": + self._item = [screen._createpoly() for item in + screen._shapes[shapeIndex]._data] + + +class RawTurtle(TPen, TNavigator): + """Animation part of the RawTurtle. + Puts RawTurtle upon a TurtleScreen and provides tools for + its animation. + """ + screens = [] + + def __init__(self, canvas=None, + shape=_CFG["shape"], + undobuffersize=_CFG["undobuffersize"], + visible=_CFG["visible"]): + if isinstance(canvas, _Screen): + self.screen = canvas + elif isinstance(canvas, TurtleScreen): + if canvas not in RawTurtle.screens: + RawTurtle.screens.append(canvas) + self.screen = canvas + elif isinstance(canvas, (ScrolledCanvas, Canvas)): + for screen in RawTurtle.screens: + if screen.cv == canvas: + self.screen = screen + break + else: + self.screen = TurtleScreen(canvas) + RawTurtle.screens.append(self.screen) + else: + raise TurtleGraphicsError("bad canvas argument %s" % canvas) + + screen = self.screen + TNavigator.__init__(self, screen.mode()) + TPen.__init__(self) + screen._turtles.append(self) + self.drawingLineItem = screen._createline() + self.turtle = _TurtleImage(screen, shape) + self._poly = None + self._creatingPoly = False + self._fillitem = self._fillpath = None + self._shown = visible + self._hidden_from_screen = False + self.currentLineItem = screen._createline() + self.currentLine = [self._position] + self.items = [self.currentLineItem] + self.stampItems = [] + self._undobuffersize = undobuffersize + self.undobuffer = Tbuffer(undobuffersize) + self._update() + + def reset(self): + """Delete the turtle's drawings and restore its default values. + + No argument. + + Delete the turtle's drawings from the screen, re-center the turtle + and set variables to the default values. + + Example (for a Turtle instance named turtle): + >>> turtle.position() + (0.00,-22.00) + >>> turtle.heading() + 100.0 + >>> turtle.reset() + >>> turtle.position() + (0.00,0.00) + >>> turtle.heading() + 0.0 + """ + TNavigator.reset(self) + TPen._reset(self) + self._clear() + self._drawturtle() + self._update() + + def setundobuffer(self, size): + """Set or disable undobuffer. + + Argument: + size -- an integer or None + + If size is an integer an empty undobuffer of given size is installed. + Size gives the maximum number of turtle-actions that can be undone + by the undo() function. + If size is None, no undobuffer is present. + + Example (for a Turtle instance named turtle): + >>> turtle.setundobuffer(42) + """ + if size is None or size <= 0: + self.undobuffer = None + else: + self.undobuffer = Tbuffer(size) + + def undobufferentries(self): + """Return count of entries in the undobuffer. + + No argument. + + Example (for a Turtle instance named turtle): + >>> while undobufferentries(): + ... undo() + """ + if self.undobuffer is None: + return 0 + return self.undobuffer.nr_of_items() + + def _clear(self): + """Delete all of pen's drawings""" + self._fillitem = self._fillpath = None + for item in self.items: + self.screen._delete(item) + self.currentLineItem = self.screen._createline() + self.currentLine = [] + if self._drawing: + self.currentLine.append(self._position) + self.items = [self.currentLineItem] + self.clearstamps() + self.setundobuffer(self._undobuffersize) + + + def clear(self): + """Delete the turtle's drawings from the screen. Do not move turtle. + + No arguments. + + Delete the turtle's drawings from the screen. Do not move turtle. + State and position of the turtle as well as drawings of other + turtles are not affected. + + Examples (for a Turtle instance named turtle): + >>> turtle.clear() + """ + self._clear() + self._update() + + def _update_data(self): + self.screen._incrementudc() + if self.screen._updatecounter != 0: + return + if len(self.currentLine)>1: + self.screen._drawline(self.currentLineItem, self.currentLine, + self._pencolor, self._pensize) + + def _update(self): + """Perform a Turtle-data update. + """ + screen = self.screen + if screen._tracing == 0: + return + elif screen._tracing == 1: + self._update_data() + self._drawturtle() + screen._update() # TurtleScreenBase + screen._delay(screen._delayvalue) # TurtleScreenBase + else: + self._update_data() + if screen._updatecounter == 0: + for t in screen.turtles(): + t._drawturtle() + screen._update() + + def _tracer(self, flag=None, delay=None): + """Turns turtle animation on/off and set delay for update drawings. + + Optional arguments: + n -- nonnegative integer + delay -- nonnegative integer + + If n is given, only each n-th regular screen update is really performed. + (Can be used to accelerate the drawing of complex graphics.) + Second arguments sets delay value (see RawTurtle.delay()) + + Example (for a Turtle instance named turtle): + >>> turtle.tracer(8, 25) + >>> dist = 2 + >>> for i in range(200): + ... turtle.fd(dist) + ... turtle.rt(90) + ... dist += 2 + """ + return self.screen.tracer(flag, delay) + + def _color(self, args): + return self.screen._color(args) + + def _colorstr(self, args): + return self.screen._colorstr(args) + + def _cc(self, args): + """Convert colortriples to hexstrings. + """ + if isinstance(args, str): + return args + try: + r, g, b = args + except (TypeError, ValueError): + raise TurtleGraphicsError("bad color arguments: %s" % str(args)) + if self.screen._colormode == 1.0: + r, g, b = [round(255.0*x) for x in (r, g, b)] + if not ((0 <= r <= 255) and (0 <= g <= 255) and (0 <= b <= 255)): + raise TurtleGraphicsError("bad color sequence: %s" % str(args)) + return "#%02x%02x%02x" % (r, g, b) + + def teleport(self, x=None, y=None, *, fill_gap: bool = False) -> None: + """Instantly move turtle to an absolute position. + + Arguments: + x -- a number or None + y -- a number None + fill_gap -- a boolean This argument must be specified by name. + + call: teleport(x, y) # two coordinates + --or: teleport(x) # teleport to x position, keeping y as is + --or: teleport(y=y) # teleport to y position, keeping x as is + --or: teleport(x, y, fill_gap=True) + # teleport but fill the gap in between + + Move turtle to an absolute position. Unlike goto(x, y), a line will not + be drawn. The turtle's orientation does not change. If currently + filling, the polygon(s) teleported from will be filled after leaving, + and filling will begin again after teleporting. This can be disabled + with fill_gap=True, which makes the imaginary line traveled during + teleporting act as a fill barrier like in goto(x, y). + + Example (for a Turtle instance named turtle): + >>> tp = turtle.pos() + >>> tp + (0.00,0.00) + >>> turtle.teleport(60) + >>> turtle.pos() + (60.00,0.00) + >>> turtle.teleport(y=10) + >>> turtle.pos() + (60.00,10.00) + >>> turtle.teleport(20, 30) + >>> turtle.pos() + (20.00,30.00) + """ + pendown = self.isdown() + was_filling = self.filling() + if pendown: + self.pen(pendown=False) + if was_filling and not fill_gap: + self.end_fill() + new_x = x if x is not None else self._position[0] + new_y = y if y is not None else self._position[1] + self._position = Vec2D(new_x, new_y) + self.pen(pendown=pendown) + if was_filling and not fill_gap: + self.begin_fill() + + def clone(self): + """Create and return a clone of the turtle. + + No argument. + + Create and return a clone of the turtle with same position, heading + and turtle properties. + + Example (for a Turtle instance named mick): + mick = Turtle() + joe = mick.clone() + """ + screen = self.screen + self._newLine(self._drawing) + + turtle = self.turtle + self.screen = None + self.turtle = None # too make self deepcopy-able + + q = deepcopy(self) + + self.screen = screen + self.turtle = turtle + + q.screen = screen + q.turtle = _TurtleImage(screen, self.turtle.shapeIndex) + + screen._turtles.append(q) + ttype = screen._shapes[self.turtle.shapeIndex]._type + if ttype == "polygon": + q.turtle._item = screen._createpoly() + elif ttype == "image": + q.turtle._item = screen._createimage(screen._shapes["blank"]._data) + elif ttype == "compound": + q.turtle._item = [screen._createpoly() for item in + screen._shapes[self.turtle.shapeIndex]._data] + q.currentLineItem = screen._createline() + q._update() + return q + + def shape(self, name=None): + """Set turtle shape to shape with given name / return current shapename. + + Optional argument: + name -- a string, which is a valid shapename + + Set turtle shape to shape with given name or, if name is not given, + return name of current shape. + Shape with name must exist in the TurtleScreen's shape dictionary. + Initially there are the following polygon shapes: + 'arrow', 'turtle', 'circle', 'square', 'triangle', 'classic'. + To learn about how to deal with shapes see Screen-method register_shape. + + Example (for a Turtle instance named turtle): + >>> turtle.shape() + 'arrow' + >>> turtle.shape("turtle") + >>> turtle.shape() + 'turtle' + """ + if name is None: + return self.turtle.shapeIndex + if not name in self.screen.getshapes(): + raise TurtleGraphicsError("There is no shape named %s" % name) + self.turtle._setshape(name) + self._update() + + def shapesize(self, stretch_wid=None, stretch_len=None, outline=None): + """Set/return turtle's stretchfactors/outline. Set resizemode to "user". + + Optional arguments: + stretch_wid : positive number + stretch_len : positive number + outline : positive number + + Return or set the pen's attributes x/y-stretchfactors and/or outline. + Set resizemode to "user". + If and only if resizemode is set to "user", the turtle will be displayed + stretched according to its stretchfactors: + stretch_wid is stretchfactor perpendicular to orientation + stretch_len is stretchfactor in direction of turtles orientation. + outline determines the width of the shapes's outline. + + Examples (for a Turtle instance named turtle): + >>> turtle.resizemode("user") + >>> turtle.shapesize(5, 5, 12) + >>> turtle.shapesize(outline=8) + """ + if stretch_wid is stretch_len is outline is None: + stretch_wid, stretch_len = self._stretchfactor + return stretch_wid, stretch_len, self._outlinewidth + if stretch_wid == 0 or stretch_len == 0: + raise TurtleGraphicsError("stretch_wid/stretch_len must not be zero") + if stretch_wid is not None: + if stretch_len is None: + stretchfactor = stretch_wid, stretch_wid + else: + stretchfactor = stretch_wid, stretch_len + elif stretch_len is not None: + stretchfactor = self._stretchfactor[0], stretch_len + else: + stretchfactor = self._stretchfactor + if outline is None: + outline = self._outlinewidth + self.pen(resizemode="user", + stretchfactor=stretchfactor, outline=outline) + + def shearfactor(self, shear=None): + """Set or return the current shearfactor. + + Optional argument: shear -- number, tangent of the shear angle + + Shear the turtleshape according to the given shearfactor shear, + which is the tangent of the shear angle. DO NOT change the + turtle's heading (direction of movement). + If shear is not given: return the current shearfactor, i. e. the + tangent of the shear angle, by which lines parallel to the + heading of the turtle are sheared. + + Examples (for a Turtle instance named turtle): + >>> turtle.shape("circle") + >>> turtle.shapesize(5,2) + >>> turtle.shearfactor(0.5) + >>> turtle.shearfactor() + >>> 0.5 + """ + if shear is None: + return self._shearfactor + self.pen(resizemode="user", shearfactor=shear) + + def tiltangle(self, angle=None): + """Set or return the current tilt-angle. + + Optional argument: angle -- number + + Rotate the turtleshape to point in the direction specified by angle, + regardless of its current tilt-angle. DO NOT change the turtle's + heading (direction of movement). + If angle is not given: return the current tilt-angle, i. e. the angle + between the orientation of the turtleshape and the heading of the + turtle (its direction of movement). + + Examples (for a Turtle instance named turtle): + >>> turtle.shape("circle") + >>> turtle.shapesize(5, 2) + >>> turtle.tiltangle() + 0.0 + >>> turtle.tiltangle(45) + >>> turtle.tiltangle() + 45.0 + >>> turtle.stamp() + >>> turtle.fd(50) + >>> turtle.tiltangle(-45) + >>> turtle.tiltangle() + 315.0 + >>> turtle.stamp() + >>> turtle.fd(50) + """ + if angle is None: + tilt = -math.degrees(self._tilt) * self._angleOrient + return (tilt / self._degreesPerAU) % self._fullcircle + else: + tilt = -angle * self._degreesPerAU * self._angleOrient + tilt = math.radians(tilt) % math.tau + self.pen(resizemode="user", tilt=tilt) + + def tilt(self, angle): + """Rotate the turtleshape by angle. + + Argument: + angle - a number + + Rotate the turtleshape by angle from its current tilt-angle, + but do NOT change the turtle's heading (direction of movement). + + Examples (for a Turtle instance named turtle): + >>> turtle.shape("circle") + >>> turtle.shapesize(5,2) + >>> turtle.tilt(30) + >>> turtle.fd(50) + >>> turtle.tilt(30) + >>> turtle.fd(50) + """ + self.tiltangle(angle + self.tiltangle()) + + def shapetransform(self, t11=None, t12=None, t21=None, t22=None): + """Set or return the current transformation matrix of the turtle shape. + + Optional arguments: t11, t12, t21, t22 -- numbers. + + If none of the matrix elements are given, return the transformation + matrix. + Otherwise set the given elements and transform the turtleshape + according to the matrix consisting of first row t11, t12 and + second row t21, 22. + Modify stretchfactor, shearfactor and tiltangle according to the + given matrix. + + Examples (for a Turtle instance named turtle): + >>> turtle.shape("square") + >>> turtle.shapesize(4,2) + >>> turtle.shearfactor(-0.5) + >>> turtle.shapetransform() + (4.0, -1.0, -0.0, 2.0) + """ + if t11 is t12 is t21 is t22 is None: + return self._shapetrafo + m11, m12, m21, m22 = self._shapetrafo + if t11 is not None: m11 = t11 + if t12 is not None: m12 = t12 + if t21 is not None: m21 = t21 + if t22 is not None: m22 = t22 + if t11 * t22 - t12 * t21 == 0: + raise TurtleGraphicsError("Bad shape transform matrix: must not be singular") + self._shapetrafo = (m11, m12, m21, m22) + alfa = math.atan2(-m21, m11) % math.tau + sa, ca = math.sin(alfa), math.cos(alfa) + a11, a12, a21, a22 = (ca*m11 - sa*m21, ca*m12 - sa*m22, + sa*m11 + ca*m21, sa*m12 + ca*m22) + self._stretchfactor = a11, a22 + self._shearfactor = a12/a22 + self._tilt = alfa + self.pen(resizemode="user") + + + def _polytrafo(self, poly): + """Computes transformed polygon shapes from a shape + according to current position and heading. + """ + screen = self.screen + p0, p1 = self._position + e0, e1 = self._orient + e = Vec2D(e0, e1 * screen.yscale / screen.xscale) + e0, e1 = (1.0 / abs(e)) * e + return [(p0+(e1*x+e0*y)/screen.xscale, p1+(-e0*x+e1*y)/screen.yscale) + for (x, y) in poly] + + def get_shapepoly(self): + """Return the current shape polygon as tuple of coordinate pairs. + + No argument. + + Examples (for a Turtle instance named turtle): + >>> turtle.shape("square") + >>> turtle.shapetransform(4, -1, 0, 2) + >>> turtle.get_shapepoly() + ((50, -20), (30, 20), (-50, 20), (-30, -20)) + + """ + shape = self.screen._shapes[self.turtle.shapeIndex] + if shape._type == "polygon": + return self._getshapepoly(shape._data, shape._type == "compound") + # else return None + + def _getshapepoly(self, polygon, compound=False): + """Calculate transformed shape polygon according to resizemode + and shapetransform. + """ + if self._resizemode == "user" or compound: + t11, t12, t21, t22 = self._shapetrafo + elif self._resizemode == "auto": + l = max(1, self._pensize/5.0) + t11, t12, t21, t22 = l, 0, 0, l + elif self._resizemode == "noresize": + return polygon + return tuple((t11*x + t12*y, t21*x + t22*y) for (x, y) in polygon) + + def _drawturtle(self): + """Manages the correct rendering of the turtle with respect to + its shape, resizemode, stretch and tilt etc.""" + screen = self.screen + shape = screen._shapes[self.turtle.shapeIndex] + ttype = shape._type + titem = self.turtle._item + if self._shown and screen._updatecounter == 0 and screen._tracing > 0: + self._hidden_from_screen = False + tshape = shape._data + if ttype == "polygon": + if self._resizemode == "noresize": w = 1 + elif self._resizemode == "auto": w = self._pensize + else: w =self._outlinewidth + shape = self._polytrafo(self._getshapepoly(tshape)) + fc, oc = self._fillcolor, self._pencolor + screen._drawpoly(titem, shape, fill=fc, outline=oc, + width=w, top=True) + elif ttype == "image": + screen._drawimage(titem, self._position, tshape) + elif ttype == "compound": + for item, (poly, fc, oc) in zip(titem, tshape): + poly = self._polytrafo(self._getshapepoly(poly, True)) + screen._drawpoly(item, poly, fill=self._cc(fc), + outline=self._cc(oc), width=self._outlinewidth, top=True) + else: + if self._hidden_from_screen: + return + if ttype == "polygon": + screen._drawpoly(titem, ((0, 0), (0, 0), (0, 0)), "", "") + elif ttype == "image": + screen._drawimage(titem, self._position, + screen._shapes["blank"]._data) + elif ttype == "compound": + for item in titem: + screen._drawpoly(item, ((0, 0), (0, 0), (0, 0)), "", "") + self._hidden_from_screen = True + +############################## stamp stuff ############################### + + def stamp(self): + """Stamp a copy of the turtleshape onto the canvas and return its id. + + No argument. + + Stamp a copy of the turtle shape onto the canvas at the current + turtle position. Return a stamp_id for that stamp, which can be + used to delete it by calling clearstamp(stamp_id). + + Example (for a Turtle instance named turtle): + >>> turtle.color("blue") + >>> turtle.stamp() + 13 + >>> turtle.fd(50) + """ + screen = self.screen + shape = screen._shapes[self.turtle.shapeIndex] + ttype = shape._type + tshape = shape._data + if ttype == "polygon": + stitem = screen._createpoly() + if self._resizemode == "noresize": w = 1 + elif self._resizemode == "auto": w = self._pensize + else: w =self._outlinewidth + shape = self._polytrafo(self._getshapepoly(tshape)) + fc, oc = self._fillcolor, self._pencolor + screen._drawpoly(stitem, shape, fill=fc, outline=oc, + width=w, top=True) + elif ttype == "image": + stitem = screen._createimage("") + screen._drawimage(stitem, self._position, tshape) + elif ttype == "compound": + stitem = [] + for element in tshape: + item = screen._createpoly() + stitem.append(item) + stitem = tuple(stitem) + for item, (poly, fc, oc) in zip(stitem, tshape): + poly = self._polytrafo(self._getshapepoly(poly, True)) + screen._drawpoly(item, poly, fill=self._cc(fc), + outline=self._cc(oc), width=self._outlinewidth, top=True) + self.stampItems.append(stitem) + self.undobuffer.push(("stamp", stitem)) + return stitem + + def _clearstamp(self, stampid): + """does the work for clearstamp() and clearstamps() + """ + if stampid in self.stampItems: + if isinstance(stampid, tuple): + for subitem in stampid: + self.screen._delete(subitem) + else: + self.screen._delete(stampid) + self.stampItems.remove(stampid) + # Delete stampitem from undobuffer if necessary + # if clearstamp is called directly. + item = ("stamp", stampid) + buf = self.undobuffer + if item not in buf.buffer: + return + index = buf.buffer.index(item) + buf.buffer.remove(item) + if index <= buf.ptr: + buf.ptr = (buf.ptr - 1) % buf.bufsize + buf.buffer.insert((buf.ptr+1)%buf.bufsize, [None]) + + def clearstamp(self, stampid): + """Delete stamp with given stampid + + Argument: + stampid - an integer, must be return value of previous stamp() call. + + Example (for a Turtle instance named turtle): + >>> turtle.color("blue") + >>> astamp = turtle.stamp() + >>> turtle.fd(50) + >>> turtle.clearstamp(astamp) + """ + self._clearstamp(stampid) + self._update() + + def clearstamps(self, n=None): + """Delete all or first/last n of turtle's stamps. + + Optional argument: + n -- an integer + + If n is None, delete all of pen's stamps, + else if n > 0 delete first n stamps + else if n < 0 delete last n stamps. + + Example (for a Turtle instance named turtle): + >>> for i in range(8): + ... turtle.stamp(); turtle.fd(30) + ... + >>> turtle.clearstamps(2) + >>> turtle.clearstamps(-2) + >>> turtle.clearstamps() + """ + if n is None: + toDelete = self.stampItems[:] + elif n >= 0: + toDelete = self.stampItems[:n] + else: + toDelete = self.stampItems[n:] + for item in toDelete: + self._clearstamp(item) + self._update() + + def _goto(self, end): + """Move the pen to the point end, thereby drawing a line + if pen is down. All other methods for turtle movement depend + on this one. + """ + ## Version with undo-stuff + go_modes = ( self._drawing, + self._pencolor, + self._pensize, + isinstance(self._fillpath, list)) + screen = self.screen + undo_entry = ("go", self._position, end, go_modes, + (self.currentLineItem, + self.currentLine[:], + screen._pointlist(self.currentLineItem), + self.items[:]) + ) + if self.undobuffer: + self.undobuffer.push(undo_entry) + start = self._position + if self._speed and screen._tracing == 1: + diff = (end-start) + diffsq = (diff[0]*screen.xscale)**2 + (diff[1]*screen.yscale)**2 + nhops = 1+int((diffsq**0.5)/(3*(1.1**self._speed)*self._speed)) + delta = diff * (1.0/nhops) + for n in range(1, nhops): + if n == 1: + top = True + else: + top = False + self._position = start + delta * n + if self._drawing: + screen._drawline(self.drawingLineItem, + (start, self._position), + self._pencolor, self._pensize, top) + self._update() + if self._drawing: + screen._drawline(self.drawingLineItem, ((0, 0), (0, 0)), + fill="", width=self._pensize) + # Turtle now at end, + if self._drawing: # now update currentLine + self.currentLine.append(end) + if isinstance(self._fillpath, list): + self._fillpath.append(end) + ###### vererbung!!!!!!!!!!!!!!!!!!!!!! + self._position = end + if self._creatingPoly: + self._poly.append(end) + if len(self.currentLine) > 42: # 42! answer to the ultimate question + # of life, the universe and everything + self._newLine() + self._update() #count=True) + + def _undogoto(self, entry): + """Reverse a _goto. Used for undo() + """ + old, new, go_modes, coodata = entry + drawing, pc, ps, filling = go_modes + cLI, cL, pl, items = coodata + screen = self.screen + if abs(self._position - new) > 0.5: + print ("undogoto: HALLO-DA-STIMMT-WAS-NICHT!") + # restore former situation + self.currentLineItem = cLI + self.currentLine = cL + + if pl == [(0, 0), (0, 0)]: + usepc = "" + else: + usepc = pc + screen._drawline(cLI, pl, fill=usepc, width=ps) + + todelete = [i for i in self.items if (i not in items) and + (screen._type(i) == "line")] + for i in todelete: + screen._delete(i) + self.items.remove(i) + + start = old + if self._speed and screen._tracing == 1: + diff = old - new + diffsq = (diff[0]*screen.xscale)**2 + (diff[1]*screen.yscale)**2 + nhops = 1+int((diffsq**0.5)/(3*(1.1**self._speed)*self._speed)) + delta = diff * (1.0/nhops) + for n in range(1, nhops): + if n == 1: + top = True + else: + top = False + self._position = new + delta * n + if drawing: + screen._drawline(self.drawingLineItem, + (start, self._position), + pc, ps, top) + self._update() + if drawing: + screen._drawline(self.drawingLineItem, ((0, 0), (0, 0)), + fill="", width=ps) + # Turtle now at position old, + self._position = old + ## if undo is done during creating a polygon, the last vertex + ## will be deleted. if the polygon is entirely deleted, + ## creatingPoly will be set to False. + ## Polygons created before the last one will not be affected by undo() + if self._creatingPoly: + if len(self._poly) > 0: + self._poly.pop() + if self._poly == []: + self._creatingPoly = False + self._poly = None + if filling: + if self._fillpath == []: + self._fillpath = None + print("Unwahrscheinlich in _undogoto!") + elif self._fillpath is not None: + self._fillpath.pop() + self._update() #count=True) + + def _rotate(self, angle): + """Turns pen clockwise by angle. + """ + if self.undobuffer: + self.undobuffer.push(("rot", angle, self._degreesPerAU)) + angle *= self._degreesPerAU + neworient = self._orient.rotate(angle) + tracing = self.screen._tracing + if tracing == 1 and self._speed > 0: + anglevel = 3.0 * self._speed + steps = 1 + int(abs(angle)/anglevel) + delta = 1.0*angle/steps + for _ in range(steps): + self._orient = self._orient.rotate(delta) + self._update() + self._orient = neworient + self._update() + + def _newLine(self, usePos=True): + """Closes current line item and starts a new one. + Remark: if current line became too long, animation + performance (via _drawline) slowed down considerably. + """ + if len(self.currentLine) > 1: + self.screen._drawline(self.currentLineItem, self.currentLine, + self._pencolor, self._pensize) + self.currentLineItem = self.screen._createline() + self.items.append(self.currentLineItem) + else: + self.screen._drawline(self.currentLineItem, top=True) + self.currentLine = [] + if usePos: + self.currentLine = [self._position] + + def filling(self): + """Return fillstate (True if filling, False else). + + No argument. + + Example (for a Turtle instance named turtle): + >>> turtle.begin_fill() + >>> if turtle.filling(): + ... turtle.pensize(5) + ... else: + ... turtle.pensize(3) + """ + return isinstance(self._fillpath, list) + + @contextmanager + def fill(self): + """A context manager for filling a shape. + + Implicitly ensures the code block is wrapped with + begin_fill() and end_fill(). + + Example (for a Turtle instance named turtle): + >>> turtle.color("black", "red") + >>> with turtle.fill(): + ... turtle.circle(60) + """ + self.begin_fill() + try: + yield + finally: + self.end_fill() + + def begin_fill(self): + """Called just before drawing a shape to be filled. + + No argument. + + Example (for a Turtle instance named turtle): + >>> turtle.color("black", "red") + >>> turtle.begin_fill() + >>> turtle.circle(60) + >>> turtle.end_fill() + """ + if not self.filling(): + self._fillitem = self.screen._createpoly() + self.items.append(self._fillitem) + self._fillpath = [self._position] + self._newLine() + if self.undobuffer: + self.undobuffer.push(("beginfill", self._fillitem)) + self._update() + + def end_fill(self): + """Fill the shape drawn after the call begin_fill(). + + No argument. + + Example (for a Turtle instance named turtle): + >>> turtle.color("black", "red") + >>> turtle.begin_fill() + >>> turtle.circle(60) + >>> turtle.end_fill() + """ + if self.filling(): + if len(self._fillpath) > 2: + self.screen._drawpoly(self._fillitem, self._fillpath, + fill=self._fillcolor) + if self.undobuffer: + self.undobuffer.push(("dofill", self._fillitem)) + self._fillitem = self._fillpath = None + self._update() + + def dot(self, size=None, *color): + """Draw a dot with diameter size, using color. + + Optional arguments: + size -- an integer >= 1 (if given) + color -- a colorstring or a numeric color tuple + + Draw a circular dot with diameter size, using color. + If size is not given, the maximum of pensize+4 and 2*pensize is used. + + Example (for a Turtle instance named turtle): + >>> turtle.dot() + >>> turtle.fd(50); turtle.dot(20, "blue"); turtle.fd(50) + """ + if not color: + if isinstance(size, (str, tuple)): + color = self._colorstr(size) + size = self._pensize + max(self._pensize, 4) + else: + color = self._pencolor + if not size: + size = self._pensize + max(self._pensize, 4) + else: + if size is None: + size = self._pensize + max(self._pensize, 4) + color = self._colorstr(color) + # If screen were to gain a dot function, see GH #104218. + pen = self.pen() + if self.undobuffer: + self.undobuffer.push(["seq"]) + self.undobuffer.cumulate = True + try: + if self.resizemode() == 'auto': + self.ht() + self.pendown() + self.pensize(size) + self.pencolor(color) + self.forward(0) + finally: + self.pen(pen) + if self.undobuffer: + self.undobuffer.cumulate = False + + def _write(self, txt, align, font): + """Performs the writing for write() + """ + item, end = self.screen._write(self._position, txt, align, font, + self._pencolor) + self._update() + self.items.append(item) + if self.undobuffer: + self.undobuffer.push(("wri", item)) + return end + + def write(self, arg, move=False, align="left", font=("Arial", 8, "normal")): + """Write text at the current turtle position. + + Arguments: + arg -- info, which is to be written to the TurtleScreen + move (optional) -- True/False + align (optional) -- one of the strings "left", "center" or right" + font (optional) -- a triple (fontname, fontsize, fonttype) + + Write text - the string representation of arg - at the current + turtle position according to align ("left", "center" or right") + and with the given font. + If move is True, the pen is moved to the bottom-right corner + of the text. By default, move is False. + + Example (for a Turtle instance named turtle): + >>> turtle.write('Home = ', True, align="center") + >>> turtle.write((0,0), True) + """ + if self.undobuffer: + self.undobuffer.push(["seq"]) + self.undobuffer.cumulate = True + end = self._write(str(arg), align.lower(), font) + if move: + x, y = self.pos() + self.setpos(end, y) + if self.undobuffer: + self.undobuffer.cumulate = False + + @contextmanager + def poly(self): + """A context manager for recording the vertices of a polygon. + + Implicitly ensures that the code block is wrapped with + begin_poly() and end_poly() + + Example (for a Turtle instance named turtle) where we create a + triangle as the polygon and move the turtle 100 steps forward: + >>> with turtle.poly(): + ... for side in range(3) + ... turtle.forward(50) + ... turtle.right(60) + >>> turtle.forward(100) + """ + self.begin_poly() + try: + yield + finally: + self.end_poly() + + def begin_poly(self): + """Start recording the vertices of a polygon. + + No argument. + + Start recording the vertices of a polygon. Current turtle position + is first point of polygon. + + Example (for a Turtle instance named turtle): + >>> turtle.begin_poly() + """ + self._poly = [self._position] + self._creatingPoly = True + + def end_poly(self): + """Stop recording the vertices of a polygon. + + No argument. + + Stop recording the vertices of a polygon. Current turtle position is + last point of polygon. This will be connected with the first point. + + Example (for a Turtle instance named turtle): + >>> turtle.end_poly() + """ + self._creatingPoly = False + + def get_poly(self): + """Return the lastly recorded polygon. + + No argument. + + Example (for a Turtle instance named turtle): + >>> p = turtle.get_poly() + >>> turtle.register_shape("myFavouriteShape", p) + """ + ## check if there is any poly? + if self._poly is not None: + return tuple(self._poly) + + def getscreen(self): + """Return the TurtleScreen object, the turtle is drawing on. + + No argument. + + Return the TurtleScreen object, the turtle is drawing on. + So TurtleScreen-methods can be called for that object. + + Example (for a Turtle instance named turtle): + >>> ts = turtle.getscreen() + >>> ts + + >>> ts.bgcolor("pink") + """ + return self.screen + + def getturtle(self): + """Return the Turtleobject itself. + + No argument. + + Only reasonable use: as a function to return the 'anonymous turtle': + + Example: + >>> pet = getturtle() + >>> pet.fd(50) + >>> pet + + >>> turtles() + [] + """ + return self + + getpen = getturtle + + + ################################################################ + ### screen oriented methods recurring to methods of TurtleScreen + ################################################################ + + def _delay(self, delay=None): + """Set delay value which determines speed of turtle animation. + """ + return self.screen.delay(delay) + + def onclick(self, fun, btn=1, add=None): + """Bind fun to mouse-click event on this turtle on canvas. + + Arguments: + fun -- a function with two arguments, to which will be assigned + the coordinates of the clicked point on the canvas. + btn -- number of the mouse-button defaults to 1 (left mouse button). + add -- True or False. If True, new binding will be added, otherwise + it will replace a former binding. + + Example for the anonymous turtle, i. e. the procedural way: + + >>> def turn(x, y): + ... left(360) + ... + >>> onclick(turn) # Now clicking into the turtle will turn it. + >>> onclick(None) # event-binding will be removed + """ + self.screen._onclick(self.turtle._item, fun, btn, add) + self._update() + + def onrelease(self, fun, btn=1, add=None): + """Bind fun to mouse-button-release event on this turtle on canvas. + + Arguments: + fun -- a function with two arguments, to which will be assigned + the coordinates of the clicked point on the canvas. + btn -- number of the mouse-button defaults to 1 (left mouse button). + + Example (for a MyTurtle instance named joe): + >>> class MyTurtle(Turtle): + ... def glow(self,x,y): + ... self.fillcolor("red") + ... def unglow(self,x,y): + ... self.fillcolor("") + ... + >>> joe = MyTurtle() + >>> joe.onclick(joe.glow) + >>> joe.onrelease(joe.unglow) + + Clicking on joe turns fillcolor red, unclicking turns it to + transparent. + """ + self.screen._onrelease(self.turtle._item, fun, btn, add) + self._update() + + def ondrag(self, fun, btn=1, add=None): + """Bind fun to mouse-move event on this turtle on canvas. + + Arguments: + fun -- a function with two arguments, to which will be assigned + the coordinates of the clicked point on the canvas. + btn -- number of the mouse-button defaults to 1 (left mouse button). + + Every sequence of mouse-move-events on a turtle is preceded by a + mouse-click event on that turtle. + + Example (for a Turtle instance named turtle): + >>> turtle.ondrag(turtle.goto) + + Subsequently clicking and dragging a Turtle will move it + across the screen thereby producing handdrawings (if pen is + down). + """ + self.screen._ondrag(self.turtle._item, fun, btn, add) + + + def _undo(self, action, data): + """Does the main part of the work for undo() + """ + if self.undobuffer is None: + return + if action == "rot": + angle, degPAU = data + self._rotate(-angle*degPAU/self._degreesPerAU) + dummy = self.undobuffer.pop() + elif action == "stamp": + stitem = data[0] + self.clearstamp(stitem) + elif action == "go": + self._undogoto(data) + elif action in ["wri", "dot"]: + item = data[0] + self.screen._delete(item) + self.items.remove(item) + elif action == "dofill": + item = data[0] + self.screen._drawpoly(item, ((0, 0),(0, 0),(0, 0)), + fill="", outline="") + elif action == "beginfill": + item = data[0] + self._fillitem = self._fillpath = None + if item in self.items: + self.screen._delete(item) + self.items.remove(item) + elif action == "pen": + TPen.pen(self, data[0]) + self.undobuffer.pop() + + def undo(self): + """undo (repeatedly) the last turtle action. + + No argument. + + undo (repeatedly) the last turtle action. + Number of available undo actions is determined by the size of + the undobuffer. + + Example (for a Turtle instance named turtle): + >>> for i in range(4): + ... turtle.fd(50); turtle.lt(80) + ... + >>> for i in range(8): + ... turtle.undo() + ... + """ + if self.undobuffer is None: + return + item = self.undobuffer.pop() + action = item[0] + data = item[1:] + if action == "seq": + while data: + item = data.pop() + self._undo(item[0], item[1:]) + else: + self._undo(action, data) + + turtlesize = shapesize + +RawPen = RawTurtle + +### Screen - Singleton ######################## + +def Screen(): + """Return the singleton screen object. + If none exists at the moment, create a new one and return it, + else return the existing one.""" + if Turtle._screen is None: + Turtle._screen = _Screen() + return Turtle._screen + +class _Screen(TurtleScreen): + + _root = None + _canvas = None + _title = _CFG["title"] + + def __init__(self): + if _Screen._root is None: + _Screen._root = self._root = _Root() + self._root.title(_Screen._title) + self._root.ondestroy(self._destroy) + if _Screen._canvas is None: + width = _CFG["width"] + height = _CFG["height"] + canvwidth = _CFG["canvwidth"] + canvheight = _CFG["canvheight"] + leftright = _CFG["leftright"] + topbottom = _CFG["topbottom"] + self._root.setupcanvas(width, height, canvwidth, canvheight) + _Screen._canvas = self._root._getcanvas() + TurtleScreen.__init__(self, _Screen._canvas) + self.setup(width, height, leftright, topbottom) + + def setup(self, width=_CFG["width"], height=_CFG["height"], + startx=_CFG["leftright"], starty=_CFG["topbottom"]): + """ Set the size and position of the main window. + + Arguments: + width: as integer a size in pixels, as float a fraction of the screen. + Default is 50% of screen. + height: as integer the height in pixels, as float a fraction of the + screen. Default is 75% of screen. + startx: if positive, starting position in pixels from the left + edge of the screen, if negative from the right edge + Default, startx=None is to center window horizontally. + starty: if positive, starting position in pixels from the top + edge of the screen, if negative from the bottom edge + Default, starty=None is to center window vertically. + + Examples (for a Screen instance named screen): + >>> screen.setup (width=200, height=200, startx=0, starty=0) + + sets window to 200x200 pixels, in upper left of screen + + >>> screen.setup(width=.75, height=0.5, startx=None, starty=None) + + sets window to 75% of screen by 50% of screen and centers + """ + if not hasattr(self._root, "set_geometry"): + return + sw = self._root.win_width() + sh = self._root.win_height() + if isinstance(width, float) and 0 <= width <= 1: + width = sw*width + if startx is None: + startx = (sw - width) / 2 + if isinstance(height, float) and 0 <= height <= 1: + height = sh*height + if starty is None: + starty = (sh - height) / 2 + self._root.set_geometry(width, height, startx, starty) + self.update() + + def title(self, titlestring): + """Set title of turtle-window + + Argument: + titlestring -- a string, to appear in the titlebar of the + turtle graphics window. + + This is a method of Screen-class. Not available for TurtleScreen- + objects. + + Example (for a Screen instance named screen): + >>> screen.title("Welcome to the turtle-zoo!") + """ + if _Screen._root is not None: + _Screen._root.title(titlestring) + _Screen._title = titlestring + + def _destroy(self): + root = self._root + if root is _Screen._root: + Turtle._pen = None + Turtle._screen = None + _Screen._root = None + _Screen._canvas = None + TurtleScreen._RUNNING = False + root.destroy() + + def bye(self): + """Shut the turtlegraphics window. + + Example (for a TurtleScreen instance named screen): + >>> screen.bye() + """ + self._destroy() + + def exitonclick(self): + """Go into mainloop until the mouse is clicked. + + No arguments. + + Bind bye() method to mouseclick on TurtleScreen. + If "using_IDLE" - value in configuration dictionary is False + (default value), enter mainloop. + If IDLE with -n switch (no subprocess) is used, this value should be + set to True in turtle.cfg. In this case IDLE's mainloop + is active also for the client script. + + This is a method of the Screen-class and not available for + TurtleScreen instances. + + Example (for a Screen instance named screen): + >>> screen.exitonclick() + + """ + def exitGracefully(x, y): + """Screen.bye() with two dummy-parameters""" + self.bye() + self.onclick(exitGracefully) + if _CFG["using_IDLE"]: + return + try: + mainloop() + except AttributeError: + exit(0) + +class Turtle(RawTurtle): + """RawTurtle auto-creating (scrolled) canvas. + + When a Turtle object is created or a function derived from some + Turtle method is called a TurtleScreen object is automatically created. + """ + _pen = None + _screen = None + + def __init__(self, + shape=_CFG["shape"], + undobuffersize=_CFG["undobuffersize"], + visible=_CFG["visible"]): + if Turtle._screen is None: + Turtle._screen = Screen() + RawTurtle.__init__(self, Turtle._screen, + shape=shape, + undobuffersize=undobuffersize, + visible=visible) + +Pen = Turtle + +def write_docstringdict(filename="turtle_docstringdict"): + """Create and write docstring-dictionary to file. + + Optional argument: + filename -- a string, used as filename + default value is turtle_docstringdict + + Has to be called explicitly, (not used by the turtle-graphics classes) + The docstring dictionary will be written to the Python script .py + It is intended to serve as a template for translation of the docstrings + into different languages. + """ + docsdict = {} + + for methodname in _tg_screen_functions: + key = "_Screen."+methodname + docsdict[key] = eval(key).__doc__ + for methodname in _tg_turtle_functions: + key = "Turtle."+methodname + docsdict[key] = eval(key).__doc__ + + with open("%s.py" % filename,"w") as f: + keys = sorted(x for x in docsdict + if x.split('.')[1] not in _alias_list) + f.write('docsdict = {\n\n') + for key in keys[:-1]: + f.write('%s :\n' % repr(key)) + f.write(' """%s\n""",\n\n' % docsdict[key]) + key = keys[-1] + f.write('%s :\n' % repr(key)) + f.write(' """%s\n"""\n\n' % docsdict[key]) + f.write("}\n") + f.close() + +def read_docstrings(lang): + """Read in docstrings from lang-specific docstring dictionary. + + Transfer docstrings, translated to lang, from a dictionary-file + to the methods of classes Screen and Turtle and - in revised form - + to the corresponding functions. + """ + modname = "turtle_docstringdict_%(language)s" % {'language':lang.lower()} + module = __import__(modname) + docsdict = module.docsdict + for key in docsdict: + try: +# eval(key).im_func.__doc__ = docsdict[key] + eval(key).__doc__ = docsdict[key] + except Exception: + print("Bad docstring-entry: %s" % key) + +_LANGUAGE = _CFG["language"] + +try: + if _LANGUAGE != "english": + read_docstrings(_LANGUAGE) +except ImportError: + print("Cannot find docsdict for", _LANGUAGE) +except Exception: + print ("Unknown Error when trying to import %s-docstring-dictionary" % + _LANGUAGE) + + +def getmethparlist(ob): + """Get strings describing the arguments for the given object + + Returns a pair of strings representing function parameter lists + including parenthesis. The first string is suitable for use in + function definition and the second is suitable for use in function + call. The "self" parameter is not included. + """ + orig_sig = inspect.signature(ob) + # bit of a hack for methods - turn it into a function + # but we drop the "self" param. + # Try and build one for Python defined functions + func_sig = orig_sig.replace( + parameters=list(orig_sig.parameters.values())[1:], + ) + + call_args = [] + for param in func_sig.parameters.values(): + match param.kind: + case ( + inspect.Parameter.POSITIONAL_ONLY + | inspect.Parameter.POSITIONAL_OR_KEYWORD + ): + call_args.append(param.name) + case inspect.Parameter.VAR_POSITIONAL: + call_args.append(f'*{param.name}') + case inspect.Parameter.KEYWORD_ONLY: + call_args.append(f'{param.name}={param.name}') + case inspect.Parameter.VAR_KEYWORD: + call_args.append(f'**{param.name}') + case _: + raise RuntimeError('Unsupported parameter kind', param.kind) + call_text = f'({', '.join(call_args)})' + + return str(func_sig), call_text + +def _turtle_docrevise(docstr): + """To reduce docstrings from RawTurtle class for functions + """ + import re + if docstr is None: + return None + turtlename = _CFG["exampleturtle"] + newdocstr = docstr.replace("%s." % turtlename,"") + parexp = re.compile(r' \(.+ %s\):' % turtlename) + newdocstr = parexp.sub(":", newdocstr) + return newdocstr + +def _screen_docrevise(docstr): + """To reduce docstrings from TurtleScreen class for functions + """ + import re + if docstr is None: + return None + screenname = _CFG["examplescreen"] + newdocstr = docstr.replace("%s." % screenname,"") + parexp = re.compile(r' \(.+ %s\):' % screenname) + newdocstr = parexp.sub(":", newdocstr) + return newdocstr + +## The following mechanism makes all methods of RawTurtle and Turtle available +## as functions. So we can enhance, change, add, delete methods to these +## classes and do not need to change anything here. + +__func_body = """\ +def {name}{paramslist}: + if {obj} is None: + if not TurtleScreen._RUNNING: + TurtleScreen._RUNNING = True + raise Terminator + {obj} = {init} + try: + return {obj}.{name}{argslist} + except TK.TclError: + if not TurtleScreen._RUNNING: + TurtleScreen._RUNNING = True + raise Terminator + raise +""" + +def _make_global_funcs(functions, cls, obj, init, docrevise): + for methodname in functions: + method = getattr(cls, methodname) + pl1, pl2 = getmethparlist(method) + if pl1 == "": + print(">>>>>>", pl1, pl2) + continue + defstr = __func_body.format(obj=obj, init=init, name=methodname, + paramslist=pl1, argslist=pl2) + exec(defstr, globals()) + globals()[methodname].__doc__ = docrevise(method.__doc__) + +_make_global_funcs(_tg_screen_functions, _Screen, + 'Turtle._screen', 'Screen()', _screen_docrevise) +_make_global_funcs(_tg_turtle_functions, Turtle, + 'Turtle._pen', 'Turtle()', _turtle_docrevise) + + +done = mainloop + +if __name__ == "__main__": + def switchpen(): + if isdown(): + pu() + else: + pd() + + def demo1(): + """Demo of old turtle.py - module""" + reset() + tracer(True) + up() + backward(100) + down() + # draw 3 squares; the last filled + width(3) + for i in range(3): + if i == 2: + begin_fill() + for _ in range(4): + forward(20) + left(90) + if i == 2: + color("maroon") + end_fill() + up() + forward(30) + down() + width(1) + color("black") + # move out of the way + tracer(False) + up() + right(90) + forward(100) + right(90) + forward(100) + right(180) + down() + # some text + write("startstart", 1) + write("start", 1) + color("red") + # staircase + for i in range(5): + forward(20) + left(90) + forward(20) + right(90) + # filled staircase + tracer(True) + begin_fill() + for i in range(5): + forward(20) + left(90) + forward(20) + right(90) + end_fill() + # more text + + def demo2(): + """Demo of some new features.""" + speed(1) + st() + pensize(3) + setheading(towards(0, 0)) + radius = distance(0, 0)/2.0 + rt(90) + for _ in range(18): + switchpen() + circle(radius, 10) + write("wait a moment...") + while undobufferentries(): + undo() + reset() + lt(90) + colormode(255) + laenge = 10 + pencolor("green") + pensize(3) + lt(180) + for i in range(-2, 16): + if i > 0: + begin_fill() + fillcolor(255-15*i, 0, 15*i) + for _ in range(3): + fd(laenge) + lt(120) + end_fill() + laenge += 10 + lt(15) + speed((speed()+1)%12) + #end_fill() + + lt(120) + pu() + fd(70) + rt(30) + pd() + color("red","yellow") + speed(0) + begin_fill() + for _ in range(4): + circle(50, 90) + rt(90) + fd(30) + rt(90) + end_fill() + lt(90) + pu() + fd(30) + pd() + shape("turtle") + + tri = getturtle() + tri.resizemode("auto") + turtle = Turtle() + turtle.resizemode("auto") + turtle.shape("turtle") + turtle.reset() + turtle.left(90) + turtle.speed(0) + turtle.up() + turtle.goto(280, 40) + turtle.lt(30) + turtle.down() + turtle.speed(6) + turtle.color("blue","orange") + turtle.pensize(2) + tri.speed(6) + setheading(towards(turtle)) + count = 1 + while tri.distance(turtle) > 4: + turtle.fd(3.5) + turtle.lt(0.6) + tri.setheading(tri.towards(turtle)) + tri.fd(4) + if count % 20 == 0: + turtle.stamp() + tri.stamp() + switchpen() + count += 1 + tri.write("CAUGHT! ", font=("Arial", 16, "bold"), align="right") + tri.pencolor("black") + tri.pencolor("red") + + def baba(xdummy, ydummy): + clearscreen() + bye() + + time.sleep(2) + + while undobufferentries(): + tri.undo() + turtle.undo() + tri.fd(50) + tri.write(" Click me!", font = ("Courier", 12, "bold") ) + tri.onclick(baba, 1) + + demo1() + demo2() + exitonclick() diff --git a/Lib/turtledemo/__init__.py b/Lib/turtledemo/__init__.py new file mode 100644 index 000000000..77150e253 --- /dev/null +++ b/Lib/turtledemo/__init__.py @@ -0,0 +1,14 @@ +""" + -------------------------------------- + About this viewer + -------------------------------------- + + Tiny demo viewer to view turtle graphics example scripts. + + Quickly and dirtyly assembled by Gregor Lingl. + June, 2006 + + For more information see: turtledemo - Help + + Have fun! +""" diff --git a/Lib/turtledemo/__main__.py b/Lib/turtledemo/__main__.py new file mode 100644 index 000000000..7c2d753f4 --- /dev/null +++ b/Lib/turtledemo/__main__.py @@ -0,0 +1,399 @@ +""" + ---------------------------------------------- + turtleDemo - Help + ---------------------------------------------- + + This document has two sections: + + (1) How to use the demo viewer + (2) How to add your own demos to the demo repository + + + (1) How to use the demo viewer. + + Select a demoscript from the example menu. + The (syntax colored) source code appears in the left + source code window. IT CANNOT BE EDITED, but ONLY VIEWED! + + The demo viewer windows can be resized. The divider between text + and canvas can be moved by grabbing it with the mouse. The text font + size can be changed from the menu and with Control/Command '-'/'+'. + It can also be changed on most systems with Control-mousewheel + when the mouse is over the text. + + Press START button to start the demo. + Stop execution by pressing the STOP button. + Clear screen by pressing the CLEAR button. + Restart by pressing the START button again. + + SPECIAL demos, such as clock.py are those which run EVENTDRIVEN. + + Press START button to start the demo. + + - Until the EVENTLOOP is entered everything works + as in an ordinary demo script. + + - When the EVENTLOOP is entered, you control the + application by using the mouse and/or keys (or it's + controlled by some timer events) + To stop it you can and must press the STOP button. + + While the EVENTLOOP is running, the examples menu is disabled. + + - Only after having pressed the STOP button, you may + restart it or choose another example script. + + * * * * * * * * + In some rare situations there may occur interferences/conflicts + between events concerning the demo script and those concerning the + demo-viewer. (They run in the same process.) Strange behaviour may be + the consequence and in the worst case you must close and restart the + viewer. + * * * * * * * * + + + (2) How to add your own demos to the demo repository + + - Place the file in the same directory as turtledemo/__main__.py + IMPORTANT! When imported, the demo should not modify the system + by calling functions in other modules, such as sys, tkinter, or + turtle. Global variables should be initialized in main(). + + - The code must contain a main() function which will + be executed by the viewer (see provided example scripts). + It may return a string which will be displayed in the Label below + the source code window (when execution has finished.) + + - In order to run mydemo.py by itself, such as during development, + add the following at the end of the file: + + if __name__ == '__main__': + main() + mainloop() # keep window open + + python -m turtledemo.mydemo # will then run it + + - If the demo is EVENT DRIVEN, main must return the string + "EVENTLOOP". This informs the demo viewer that the script is + still running and must be stopped by the user! + + If an "EVENTLOOP" demo runs by itself, as with clock, which uses + ontimer, or minimal_hanoi, which loops by recursion, then the + code should catch the turtle.Terminator exception that will be + raised when the user presses the STOP button. (Paint is not such + a demo; it only acts in response to mouse clicks and movements.) +""" +import sys +import os + +from tkinter import * +from idlelib.colorizer import ColorDelegator, color_config +from idlelib.percolator import Percolator +from idlelib.textview import view_text +import turtle +from turtledemo import __doc__ as about_turtledemo + +if sys.platform == 'win32': + from idlelib.util import fix_win_hidpi + fix_win_hidpi() + +demo_dir = os.path.dirname(os.path.abspath(__file__)) +darwin = sys.platform == 'darwin' +STARTUP = 1 +READY = 2 +RUNNING = 3 +DONE = 4 +EVENTDRIVEN = 5 + +btnfont = ("Arial", 12, 'bold') +txtfont = ['Lucida Console', 10, 'normal'] + +MINIMUM_FONT_SIZE = 6 +MAXIMUM_FONT_SIZE = 100 +font_sizes = [8, 9, 10, 11, 12, 14, 18, 20, 22, 24, 30] + +def getExampleEntries(): + return [entry[:-3] for entry in os.listdir(demo_dir) if + entry.endswith(".py") and entry[0] != '_'] + +help_entries = ( # (help_label, help_doc) + ('Turtledemo help', __doc__), + ('About turtledemo', about_turtledemo), + ('About turtle module', turtle.__doc__), + ) + + +class DemoWindow(object): + + def __init__(self, filename=None): + self.root = root = turtle._root = Tk() + root.title('Python turtle-graphics examples') + root.wm_protocol("WM_DELETE_WINDOW", self._destroy) + + if darwin: + import subprocess + # Make sure we are the currently activated OS X application + # so that our menu bar appears. + subprocess.run( + [ + '/usr/bin/osascript', + '-e', 'tell application "System Events"', + '-e', 'set frontmost of the first process whose ' + 'unix id is {} to true'.format(os.getpid()), + '-e', 'end tell', + ], + stderr=subprocess.DEVNULL, + stdout=subprocess.DEVNULL,) + + root.grid_rowconfigure(0, weight=1) + root.grid_columnconfigure(0, weight=1) + root.grid_columnconfigure(1, minsize=90, weight=1) + root.grid_columnconfigure(2, minsize=90, weight=1) + root.grid_columnconfigure(3, minsize=90, weight=1) + + self.mBar = Menu(root, relief=RAISED, borderwidth=2) + self.mBar.add_cascade(menu=self.makeLoadDemoMenu(self.mBar), + label='Examples', underline=0) + self.mBar.add_cascade(menu=self.makeFontMenu(self.mBar), + label='Fontsize', underline=0) + self.mBar.add_cascade(menu=self.makeHelpMenu(self.mBar), + label='Help', underline=0) + root['menu'] = self.mBar + + pane = PanedWindow(root, orient=HORIZONTAL, sashwidth=5, + sashrelief=SOLID, bg='#ddd') + pane.add(self.makeTextFrame(pane)) + pane.add(self.makeGraphFrame(pane)) + pane.grid(row=0, columnspan=4, sticky='news') + + self.output_lbl = Label(root, height= 1, text=" --- ", bg="#ddf", + font=("Arial", 16, 'normal'), borderwidth=2, + relief=RIDGE) + if darwin: # Leave Mac button colors alone - #44254. + self.start_btn = Button(root, text=" START ", font=btnfont, + fg='#00cc22', command=self.startDemo) + self.stop_btn = Button(root, text=" STOP ", font=btnfont, + fg='#00cc22', command=self.stopIt) + self.clear_btn = Button(root, text=" CLEAR ", font=btnfont, + fg='#00cc22', command = self.clearCanvas) + else: + self.start_btn = Button(root, text=" START ", font=btnfont, + fg="white", disabledforeground = "#fed", + command=self.startDemo) + self.stop_btn = Button(root, text=" STOP ", font=btnfont, + fg="white", disabledforeground = "#fed", + command=self.stopIt) + self.clear_btn = Button(root, text=" CLEAR ", font=btnfont, + fg="white", disabledforeground="#fed", + command = self.clearCanvas) + self.output_lbl.grid(row=1, column=0, sticky='news', padx=(0,5)) + self.start_btn.grid(row=1, column=1, sticky='ew') + self.stop_btn.grid(row=1, column=2, sticky='ew') + self.clear_btn.grid(row=1, column=3, sticky='ew') + + Percolator(self.text).insertfilter(ColorDelegator()) + self.dirty = False + self.exitflag = False + if filename: + self.loadfile(filename) + self.configGUI(DISABLED, DISABLED, DISABLED, + "Choose example from menu", "black") + self.state = STARTUP + + + def onResize(self, event): + cwidth = self.canvas.winfo_width() + cheight = self.canvas.winfo_height() + self.canvas.xview_moveto(0.5*(self.canvwidth-cwidth)/self.canvwidth) + self.canvas.yview_moveto(0.5*(self.canvheight-cheight)/self.canvheight) + + def makeTextFrame(self, root): + self.text_frame = text_frame = Frame(root) + self.text = text = Text(text_frame, name='text', padx=5, + wrap='none', width=45) + color_config(text) + + self.vbar = vbar = Scrollbar(text_frame, name='vbar') + vbar['command'] = text.yview + vbar.pack(side=RIGHT, fill=Y) + self.hbar = hbar = Scrollbar(text_frame, name='hbar', orient=HORIZONTAL) + hbar['command'] = text.xview + hbar.pack(side=BOTTOM, fill=X) + text['yscrollcommand'] = vbar.set + text['xscrollcommand'] = hbar.set + + text['font'] = tuple(txtfont) + shortcut = 'Command' if darwin else 'Control' + text.bind_all('<%s-minus>' % shortcut, self.decrease_size) + text.bind_all('<%s-underscore>' % shortcut, self.decrease_size) + text.bind_all('<%s-equal>' % shortcut, self.increase_size) + text.bind_all('<%s-plus>' % shortcut, self.increase_size) + text.bind('', self.update_mousewheel) + text.bind('', self.increase_size) + text.bind('', self.decrease_size) + + text.pack(side=LEFT, fill=BOTH, expand=1) + return text_frame + + def makeGraphFrame(self, root): + # t._Screen is a singleton class instantiated or retrieved + # by calling Screen. Since tdemo canvas needs a different + # configuration, we manually set class attributes before + # calling Screen and manually call superclass init after. + turtle._Screen._root = root + + self.canvwidth = 1000 + self.canvheight = 800 + turtle._Screen._canvas = self.canvas = canvas = turtle.ScrolledCanvas( + root, 800, 600, self.canvwidth, self.canvheight) + canvas.adjustScrolls() + canvas._rootwindow.bind('', self.onResize) + canvas._canvas['borderwidth'] = 0 + + self.screen = screen = turtle.Screen() + turtle.TurtleScreen.__init__(screen, canvas) + turtle.RawTurtle.screens = [screen] + return canvas + + def set_txtsize(self, size): + txtfont[1] = size + self.text['font'] = tuple(txtfont) + self.output_lbl['text'] = 'Font size %d' % size + + def decrease_size(self, dummy=None): + self.set_txtsize(max(txtfont[1] - 1, MINIMUM_FONT_SIZE)) + return 'break' + + def increase_size(self, dummy=None): + self.set_txtsize(min(txtfont[1] + 1, MAXIMUM_FONT_SIZE)) + return 'break' + + def update_mousewheel(self, event): + # For wheel up, event.delta = 120 on Windows, -1 on darwin. + # X-11 sends Control-Button-4 event instead. + if (event.delta < 0) == (not darwin): + return self.decrease_size() + else: + return self.increase_size() + + def configGUI(self, start, stop, clear, txt="", color="blue"): + if darwin: # Leave Mac button colors alone - #44254. + self.start_btn.config(state=start) + self.stop_btn.config(state=stop) + self.clear_btn.config(state=clear) + else: + self.start_btn.config(state=start, + bg="#d00" if start == NORMAL else "#fca") + self.stop_btn.config(state=stop, + bg="#d00" if stop == NORMAL else "#fca") + self.clear_btn.config(state=clear, + bg="#d00" if clear == NORMAL else "#fca") + self.output_lbl.config(text=txt, fg=color) + + def makeLoadDemoMenu(self, master): + menu = Menu(master, tearoff=1) # TJR: leave this one. + + for entry in getExampleEntries(): + def load(entry=entry): + self.loadfile(entry) + menu.add_command(label=entry, underline=0, command=load) + return menu + + def makeFontMenu(self, master): + menu = Menu(master, tearoff=0) + menu.add_command(label="Decrease", command=self.decrease_size, + accelerator=f"{'Command' if darwin else 'Ctrl'}+-") + menu.add_command(label="Increase", command=self.increase_size, + accelerator=f"{'Command' if darwin else 'Ctrl'}+=") + menu.add_separator() + + for size in font_sizes: + def resize(size=size): + self.set_txtsize(size) + menu.add_command(label=str(size), underline=0, command=resize) + return menu + + def makeHelpMenu(self, master): + menu = Menu(master, tearoff=0) + + for help_label, help_file in help_entries: + def show(help_label=help_label, help_file=help_file): + view_text(self.root, help_label, help_file) + menu.add_command(label=help_label, command=show) + return menu + + def refreshCanvas(self): + if self.dirty: + self.screen.clear() + self.dirty=False + + def loadfile(self, filename): + self.clearCanvas() + turtle.TurtleScreen._RUNNING = False + modname = 'turtledemo.' + filename + __import__(modname) + self.module = sys.modules[modname] + with open(self.module.__file__, 'r') as f: + chars = f.read() + self.text.delete("1.0", "end") + self.text.insert("1.0", chars) + self.root.title(filename + " - a Python turtle graphics example") + self.configGUI(NORMAL, DISABLED, DISABLED, + "Press start button", "red") + self.state = READY + + def startDemo(self): + self.refreshCanvas() + self.dirty = True + turtle.TurtleScreen._RUNNING = True + self.configGUI(DISABLED, NORMAL, DISABLED, + "demo running...", "black") + self.screen.clear() + self.screen.mode("standard") + self.state = RUNNING + + try: + result = self.module.main() + if result == "EVENTLOOP": + self.state = EVENTDRIVEN + else: + self.state = DONE + except turtle.Terminator: + if self.root is None: + return + self.state = DONE + result = "stopped!" + if self.state == DONE: + self.configGUI(NORMAL, DISABLED, NORMAL, + result) + elif self.state == EVENTDRIVEN: + self.exitflag = True + self.configGUI(DISABLED, NORMAL, DISABLED, + "use mouse/keys or STOP", "red") + + def clearCanvas(self): + self.refreshCanvas() + self.screen._delete("all") + self.canvas.config(cursor="") + self.configGUI(NORMAL, DISABLED, DISABLED) + + def stopIt(self): + if self.exitflag: + self.clearCanvas() + self.exitflag = False + self.configGUI(NORMAL, DISABLED, DISABLED, + "STOPPED!", "red") + turtle.TurtleScreen._RUNNING = False + + def _destroy(self): + turtle.TurtleScreen._RUNNING = False + self.root.destroy() + self.root = None + + +def main(): + demo = DemoWindow() + demo.root.mainloop() + +if __name__ == '__main__': + main() diff --git a/Lib/turtledemo/bytedesign.py b/Lib/turtledemo/bytedesign.py new file mode 100644 index 000000000..a5d76a6b6 --- /dev/null +++ b/Lib/turtledemo/bytedesign.py @@ -0,0 +1,158 @@ +"""turtledemo/bytedesign.py + +An example adapted from the example-suite +of PythonCard's turtle graphics. + +It's based on an article in BYTE magazine +Problem Solving with Logo: Using Turtle +Graphics to Redraw a Design +November 1982, p. 118 - 134 + +------------------------------------------- + +Due to the statement + +t.delay(0) + +in line 152, which sets the animation delay +to 0, this animation runs in "line per line" +mode as fast as possible. +""" + +from turtle import Turtle, mainloop +from time import perf_counter as clock + +# wrapper for any additional drawing routines +# that need to know about each other +class Designer(Turtle): + + def design(self, homePos, scale): + self.up() + for i in range(5): + self.forward(64.65 * scale) + self.down() + self.wheel(self.position(), scale) + self.up() + self.backward(64.65 * scale) + self.right(72) + self.up() + self.goto(homePos) + self.right(36) + self.forward(24.5 * scale) + self.right(198) + self.down() + self.centerpiece(46 * scale, 143.4, scale) + self.getscreen().tracer(True) + + def wheel(self, initpos, scale): + self.right(54) + for i in range(4): + self.pentpiece(initpos, scale) + self.down() + self.left(36) + for i in range(5): + self.tripiece(initpos, scale) + self.left(36) + for i in range(5): + self.down() + self.right(72) + self.forward(28 * scale) + self.up() + self.backward(28 * scale) + self.left(54) + self.getscreen().update() + + def tripiece(self, initpos, scale): + oldh = self.heading() + self.down() + self.backward(2.5 * scale) + self.tripolyr(31.5 * scale, scale) + self.up() + self.goto(initpos) + self.setheading(oldh) + self.down() + self.backward(2.5 * scale) + self.tripolyl(31.5 * scale, scale) + self.up() + self.goto(initpos) + self.setheading(oldh) + self.left(72) + self.getscreen().update() + + def pentpiece(self, initpos, scale): + oldh = self.heading() + self.up() + self.forward(29 * scale) + self.down() + for i in range(5): + self.forward(18 * scale) + self.right(72) + self.pentr(18 * scale, 75, scale) + self.up() + self.goto(initpos) + self.setheading(oldh) + self.forward(29 * scale) + self.down() + for i in range(5): + self.forward(18 * scale) + self.right(72) + self.pentl(18 * scale, 75, scale) + self.up() + self.goto(initpos) + self.setheading(oldh) + self.left(72) + self.getscreen().update() + + def pentl(self, side, ang, scale): + if side < (2 * scale): return + self.forward(side) + self.left(ang) + self.pentl(side - (.38 * scale), ang, scale) + + def pentr(self, side, ang, scale): + if side < (2 * scale): return + self.forward(side) + self.right(ang) + self.pentr(side - (.38 * scale), ang, scale) + + def tripolyr(self, side, scale): + if side < (4 * scale): return + self.forward(side) + self.right(111) + self.forward(side / 1.78) + self.right(111) + self.forward(side / 1.3) + self.right(146) + self.tripolyr(side * .75, scale) + + def tripolyl(self, side, scale): + if side < (4 * scale): return + self.forward(side) + self.left(111) + self.forward(side / 1.78) + self.left(111) + self.forward(side / 1.3) + self.left(146) + self.tripolyl(side * .75, scale) + + def centerpiece(self, s, a, scale): + self.forward(s); self.left(a) + if s < (7.5 * scale): + return + self.centerpiece(s - (1.2 * scale), a, scale) + +def main(): + t = Designer() + t.speed(0) + t.hideturtle() + t.getscreen().delay(0) + t.getscreen().tracer(0) + at = clock() + t.design(t.position(), 2) + et = clock() + return "runtime: %.2f sec." % (et-at) + +if __name__ == '__main__': + msg = main() + print(msg) + mainloop() diff --git a/Lib/turtledemo/chaos.py b/Lib/turtledemo/chaos.py new file mode 100644 index 000000000..b25f0fa42 --- /dev/null +++ b/Lib/turtledemo/chaos.py @@ -0,0 +1,57 @@ +"""turtledemo/chaos.py + +A demonstration of chaos. +""" +from turtle import * + +N = 80 + +def f(x): + return 3.9*x*(1-x) + +def g(x): + return 3.9*(x-x**2) + +def h(x): + return 3.9*x-3.9*x*x + +def jumpto(x, y): + penup(); goto(x,y) + +def line(x1, y1, x2, y2): + jumpto(x1, y1) + pendown() + goto(x2, y2) + +def coosys(): + line(-1, 0, N+1, 0) + line(0, -0.1, 0, 1.1) + +def plot(fun, start, color): + pencolor(color) + x = start + jumpto(0, x) + pendown() + dot(5) + for i in range(N): + x=fun(x) + goto(i+1,x) + dot(5) + +def main(): + reset() + setworldcoordinates(-1.0,-0.1, N+1, 1.1) + speed(0) + hideturtle() + coosys() + plot(f, 0.35, "blue") + plot(g, 0.35, "green") + plot(h, 0.35, "red") + # Now zoom in: + for s in range(100): + setworldcoordinates(0.5*s,-0.1, N+1, 1.1) + return "Done!" + +if __name__ == "__main__": + main() + mainloop() diff --git a/Lib/turtledemo/clock.py b/Lib/turtledemo/clock.py new file mode 100644 index 000000000..8b639066c --- /dev/null +++ b/Lib/turtledemo/clock.py @@ -0,0 +1,132 @@ +"""turtledemo/clock.py + +Enhanced clock-program, showing date +and time. +""" +from turtle import * +from datetime import datetime + +dtfont = "TkFixedFont", 14, "bold" +current_day = None + +def jump(distanz, winkel=0): + penup() + right(winkel) + forward(distanz) + left(winkel) + pendown() + +def hand(laenge, spitze): + fd(laenge*1.15) + rt(90) + fd(spitze/2.0) + lt(120) + fd(spitze) + lt(120) + fd(spitze) + lt(120) + fd(spitze/2.0) + +def make_hand_shape(name, laenge, spitze): + reset() + jump(-laenge*0.15) + begin_poly() + hand(laenge, spitze) + end_poly() + hand_form = get_poly() + register_shape(name, hand_form) + +def clockface(radius): + reset() + pensize(7) + for i in range(60): + jump(radius) + if i % 5 == 0: + fd(25) + jump(-radius-25) + else: + dot(3) + jump(-radius) + rt(6) + +def display_date_time(): + global current_day + writer.clear() + now = datetime.now() + current_day = now.day + writer.home() + writer.forward(distance=65) + writer.write(wochentag(now), align="center", font=dtfont) + writer.back(distance=150) + writer.write(datum(now), align="center", font=dtfont) + writer.forward(distance=85) + +def setup(): + global second_hand, minute_hand, hour_hand, writer + mode("logo") + make_hand_shape("second_hand", 125, 25) + make_hand_shape("minute_hand", 115, 25) + make_hand_shape("hour_hand", 90, 25) + clockface(160) + second_hand = Turtle() + second_hand.shape("second_hand") + second_hand.color("gray20", "gray80") + minute_hand = Turtle() + minute_hand.shape("minute_hand") + minute_hand.color("blue1", "red1") + hour_hand = Turtle() + hour_hand.shape("hour_hand") + hour_hand.color("blue3", "red3") + for hand in second_hand, minute_hand, hour_hand: + hand.resizemode("user") + hand.shapesize(1, 1, 3) + hand.speed(0) + ht() + writer = Turtle() + writer.ht() + writer.pu() + writer.bk(85) + display_date_time() + +def wochentag(t): + wochentag = ["Monday", "Tuesday", "Wednesday", + "Thursday", "Friday", "Saturday", "Sunday"] + return wochentag[t.weekday()] + +def datum(z): + monat = ["Jan.", "Feb.", "Mar.", "Apr.", "May", "June", + "July", "Aug.", "Sep.", "Oct.", "Nov.", "Dec."] + j = z.year + m = monat[z.month - 1] + t = z.day + return "%s %d %d" % (m, t, j) + +def tick(): + t = datetime.today() + sekunde = t.second + t.microsecond*0.000001 + minute = t.minute + sekunde/60.0 + stunde = t.hour + minute/60.0 + try: + tracer(False) # Terminator can occur here + second_hand.setheading(6*sekunde) # or here + minute_hand.setheading(6*minute) + hour_hand.setheading(30*stunde) + if t.day != current_day: + display_date_time() + tracer(True) + ontimer(tick, 100) + except Terminator: + pass # turtledemo user pressed STOP + +def main(): + tracer(False) + setup() + tracer(True) + tick() + return "EVENTLOOP" + +if __name__ == "__main__": + mode("logo") + msg = main() + print(msg) + mainloop() diff --git a/Lib/turtledemo/colormixer.py b/Lib/turtledemo/colormixer.py new file mode 100644 index 000000000..f66012c81 --- /dev/null +++ b/Lib/turtledemo/colormixer.py @@ -0,0 +1,57 @@ +"""turtledemo/colormixer.py""" +from turtle import Screen, Turtle, mainloop + +class ColorTurtle(Turtle): + + def __init__(self, x, y): + Turtle.__init__(self) + self.shape("turtle") + self.resizemode("user") + self.shapesize(3,3,5) + self.pensize(10) + self._color = [0,0,0] + self.x = x + self._color[x] = y + self.color(self._color) + self.speed(0) + self.left(90) + self.pu() + self.goto(x,0) + self.pd() + self.sety(1) + self.pu() + self.sety(y) + self.pencolor("gray25") + self.ondrag(self.shift) + + def shift(self, x, y): + self.sety(max(0,min(y,1))) + self._color[self.x] = self.ycor() + self.fillcolor(self._color) + setbgcolor() + +def setbgcolor(): + screen.bgcolor(red.ycor(), green.ycor(), blue.ycor()) + +def main(): + global screen, red, green, blue + screen = Screen() + screen.delay(0) + screen.setworldcoordinates(-1, -0.3, 3, 1.3) + + red = ColorTurtle(0, .5) + green = ColorTurtle(1, .5) + blue = ColorTurtle(2, .5) + setbgcolor() + + writer = Turtle() + writer.ht() + writer.pu() + writer.goto(1,1.15) + writer.write("DRAG!",align="center",font=("Arial",30,("bold","italic"))) + return "EVENTLOOP" + +if __name__ == "__main__": + msg = main() + print(msg) + mainloop() diff --git a/Lib/turtledemo/forest.py b/Lib/turtledemo/forest.py new file mode 100644 index 000000000..e1fa85a57 --- /dev/null +++ b/Lib/turtledemo/forest.py @@ -0,0 +1,104 @@ +"""turtledemo/forest.py + +Displays a 'forest' of 3 breadth-first trees, +similar to the one in tree.py. +For further details, see tree.py. + +This example is a breadth-first rewrite of +a Logo program by Erich Neuwirth. +""" +from turtle import Turtle, colormode, tracer, mainloop +from random import randrange +from time import perf_counter as clock + +def symRandom(n): + return randrange(-n,n+1) + +def randomize( branchlist, angledist, sizedist ): + return [ (angle+symRandom(angledist), + sizefactor*1.01**symRandom(sizedist)) + for angle, sizefactor in branchlist ] + +def randomfd( t, distance, parts, angledist ): + for i in range(parts): + t.left(symRandom(angledist)) + t.forward( (1.0 * distance)/parts ) + +def tree(tlist, size, level, widthfactor, branchlists, angledist=10, sizedist=5): + # benutzt Liste von turtles und Liste von Zweiglisten, + # fuer jede turtle eine! + if level > 0: + lst = [] + brs = [] + for t, branchlist in list(zip(tlist,branchlists)): + t.pensize( size * widthfactor ) + t.pencolor( 255 - (180 - 11 * level + symRandom(15)), + 180 - 11 * level + symRandom(15), + 0 ) + t.pendown() + randomfd(t, size, level, angledist ) + yield 1 + for angle, sizefactor in branchlist: + t.left(angle) + lst.append(t.clone()) + brs.append(randomize(branchlist, angledist, sizedist)) + t.right(angle) + for x in tree(lst, size*sizefactor, level-1, widthfactor, brs, + angledist, sizedist): + yield None + + +def start(t,x,y): + colormode(255) + t.reset() + t.speed(0) + t.hideturtle() + t.left(90) + t.penup() + t.setpos(x,y) + t.pendown() + +def doit1(level, pen): + pen.hideturtle() + start(pen, 20, -208) + t = tree( [pen], 80, level, 0.1, [[ (45,0.69), (0,0.65), (-45,0.71) ]] ) + return t + +def doit2(level, pen): + pen.hideturtle() + start(pen, -135, -130) + t = tree( [pen], 120, level, 0.1, [[ (45,0.69), (-45,0.71) ]] ) + return t + +def doit3(level, pen): + pen.hideturtle() + start(pen, 190, -90) + t = tree( [pen], 100, level, 0.1, [[ (45,0.7), (0,0.72), (-45,0.65) ]] ) + return t + +# Hier 3 Baumgeneratoren: +def main(): + p = Turtle() + p.ht() + tracer(75,0) + u = doit1(6, Turtle(undobuffersize=1)) + s = doit2(7, Turtle(undobuffersize=1)) + t = doit3(5, Turtle(undobuffersize=1)) + a = clock() + while True: + done = 0 + for b in u,s,t: + try: + b.__next__() + except: + done += 1 + if done == 3: + break + + tracer(1,10) + b = clock() + return "runtime: %.2f sec." % (b-a) + +if __name__ == '__main__': + main() + mainloop() diff --git a/Lib/turtledemo/fractalcurves.py b/Lib/turtledemo/fractalcurves.py new file mode 100644 index 000000000..2d0a506a4 --- /dev/null +++ b/Lib/turtledemo/fractalcurves.py @@ -0,0 +1,135 @@ +"""turtledemo/fractalcurves.py + +This program draws two fractal-curve-designs: +(1) A hilbert curve (in a box) +(2) A combination of Koch-curves. + +The CurvesTurtle class and the fractal-curve- +methods are taken from the PythonCard example +scripts for turtle-graphics. +""" +from turtle import * +from time import sleep, perf_counter as clock + +class CurvesTurtle(Pen): + # example derived from + # Turtle Geometry: The Computer as a Medium for Exploring Mathematics + # by Harold Abelson and Andrea diSessa + # p. 96-98 + def hilbert(self, size, level, parity): + if level == 0: + return + # rotate and draw first subcurve with opposite parity to big curve + self.left(parity * 90) + self.hilbert(size, level - 1, -parity) + # interface to and draw second subcurve with same parity as big curve + self.forward(size) + self.right(parity * 90) + self.hilbert(size, level - 1, parity) + # third subcurve + self.forward(size) + self.hilbert(size, level - 1, parity) + # fourth subcurve + self.right(parity * 90) + self.forward(size) + self.hilbert(size, level - 1, -parity) + # a final turn is needed to make the turtle + # end up facing outward from the large square + self.left(parity * 90) + + # Visual Modeling with Logo: A Structural Approach to Seeing + # by James Clayson + # Koch curve, after Helge von Koch who introduced this geometric figure in 1904 + # p. 146 + def fractalgon(self, n, rad, lev, dir): + import math + + # if dir = 1 turn outward + # if dir = -1 turn inward + edge = 2 * rad * math.sin(math.pi / n) + self.pu() + self.fd(rad) + self.pd() + self.rt(180 - (90 * (n - 2) / n)) + for i in range(n): + self.fractal(edge, lev, dir) + self.rt(360 / n) + self.lt(180 - (90 * (n - 2) / n)) + self.pu() + self.bk(rad) + self.pd() + + # p. 146 + def fractal(self, dist, depth, dir): + if depth < 1: + self.fd(dist) + return + self.fractal(dist / 3, depth - 1, dir) + self.lt(60 * dir) + self.fractal(dist / 3, depth - 1, dir) + self.rt(120 * dir) + self.fractal(dist / 3, depth - 1, dir) + self.lt(60 * dir) + self.fractal(dist / 3, depth - 1, dir) + +def main(): + ft = CurvesTurtle() + + ft.reset() + ft.speed(0) + ft.ht() + ft.getscreen().tracer(1,0) + ft.pu() + + size = 6 + ft.setpos(-33*size, -32*size) + ft.pd() + + ta=clock() + ft.fillcolor("red") + ft.begin_fill() + ft.fd(size) + + ft.hilbert(size, 6, 1) + + # frame + ft.fd(size) + for i in range(3): + ft.lt(90) + ft.fd(size*(64+i%2)) + ft.pu() + for i in range(2): + ft.fd(size) + ft.rt(90) + ft.pd() + for i in range(4): + ft.fd(size*(66+i%2)) + ft.rt(90) + ft.end_fill() + tb=clock() + res = "Hilbert: %.2fsec. " % (tb-ta) + + sleep(3) + + ft.reset() + ft.speed(0) + ft.ht() + ft.getscreen().tracer(1,0) + + ta=clock() + ft.color("black", "blue") + ft.begin_fill() + ft.fractalgon(3, 250, 4, 1) + ft.end_fill() + ft.begin_fill() + ft.color("red") + ft.fractalgon(3, 200, 4, -1) + ft.end_fill() + tb=clock() + res += "Koch: %.2fsec." % (tb-ta) + return res + +if __name__ == '__main__': + msg = main() + print(msg) + mainloop() diff --git a/Lib/turtledemo/lindenmayer.py b/Lib/turtledemo/lindenmayer.py new file mode 100644 index 000000000..eb309afb9 --- /dev/null +++ b/Lib/turtledemo/lindenmayer.py @@ -0,0 +1,116 @@ +"""turtledemo/lindenmayer.py + +Each morning women in Tamil Nadu, in southern +India, place designs, created by using rice +flour and known as kolam on the thresholds of +their homes. + +These can be described by Lindenmayer systems, +which can easily be implemented with turtle +graphics and Python. + +Two examples are shown here: +(1) the snake kolam +(2) anklets of Krishna + +Taken from Marcia Ascher: Mathematics +Elsewhere, An Exploration of Ideas Across +Cultures + +""" +################################ +# Mini Lindenmayer tool +############################### + +from turtle import * + +def replace( seq, replacementRules, n ): + for i in range(n): + newseq = "" + for element in seq: + newseq = newseq + replacementRules.get(element,element) + seq = newseq + return seq + +def draw( commands, rules ): + for b in commands: + try: + rules[b]() + except TypeError: + try: + draw(rules[b], rules) + except: + pass + + +def main(): + ################################ + # Example 1: Snake kolam + ################################ + + + def r(): + right(45) + + def l(): + left(45) + + def f(): + forward(7.5) + + snake_rules = {"-":r, "+":l, "f":f, "b":"f+f+f--f--f+f+f"} + snake_replacementRules = {"b": "b+f+b--f--b+f+b"} + snake_start = "b--f--b--f" + + drawing = replace(snake_start, snake_replacementRules, 3) + + reset() + speed(3) + tracer(1,0) + ht() + up() + backward(195) + down() + draw(drawing, snake_rules) + + from time import sleep + sleep(3) + + ################################ + # Example 2: Anklets of Krishna + ################################ + + def A(): + color("red") + circle(10,90) + + def B(): + from math import sqrt + color("black") + l = 5/sqrt(2) + forward(l) + circle(l, 270) + forward(l) + + def F(): + color("green") + forward(10) + + krishna_rules = {"a":A, "b":B, "f":F} + krishna_replacementRules = {"a" : "afbfa", "b" : "afbfbfbfa" } + krishna_start = "fbfbfbfb" + + reset() + speed(0) + tracer(3,0) + ht() + left(45) + drawing = replace(krishna_start, krishna_replacementRules, 3) + draw(drawing, krishna_rules) + tracer(1) + return "Done!" + +if __name__=='__main__': + msg = main() + print(msg) + mainloop() diff --git a/Lib/turtledemo/minimal_hanoi.py b/Lib/turtledemo/minimal_hanoi.py new file mode 100644 index 000000000..e44330eaa --- /dev/null +++ b/Lib/turtledemo/minimal_hanoi.py @@ -0,0 +1,73 @@ +"""turtledemo/minimal_hanoi.py + +A minimal 'Towers of Hanoi' animation: +A tower of 6 discs is transferred from the +left to the right peg. + +An imho quite elegant and concise +implementation using a tower class, which +is derived from the built-in type list. + +Discs are turtles with shape "square", but +stretched to rectangles by shapesize() +""" +from turtle import * + +class Disc(Turtle): + def __init__(self, n): + Turtle.__init__(self, shape="square", visible=False) + self.pu() + self.shapesize(1.5, n*1.5, 2) # square-->rectangle + self.fillcolor(n/6., 0, 1-n/6.) + self.st() + +class Tower(list): + "Hanoi tower, a subclass of built-in type list" + def __init__(self, x): + "create an empty tower. x is x-position of peg" + self.x = x + def push(self, d): + d.setx(self.x) + d.sety(-150+34*len(self)) + self.append(d) + def pop(self): + d = list.pop(self) + d.sety(150) + return d + +def hanoi(n, from_, with_, to_): + if n > 0: + hanoi(n-1, from_, to_, with_) + to_.push(from_.pop()) + hanoi(n-1, with_, from_, to_) + +def play(): + onkey(None,"space") + clear() + try: + hanoi(6, t1, t2, t3) + write("press STOP button to exit", + align="center", font=("Courier", 16, "bold")) + except Terminator: + pass # turtledemo user pressed STOP + +def main(): + global t1, t2, t3 + ht(); penup(); goto(0, -225) # writer turtle + t1 = Tower(-250) + t2 = Tower(0) + t3 = Tower(250) + # make tower of 6 discs + for i in range(6,0,-1): + t1.push(Disc(i)) + # prepare spartanic user interface ;-) + write("press spacebar to start game", + align="center", font=("Courier", 16, "bold")) + onkey(play, "space") + listen() + return "EVENTLOOP" + +if __name__=="__main__": + msg = main() + print(msg) + mainloop() diff --git a/Lib/turtledemo/nim.py b/Lib/turtledemo/nim.py new file mode 100644 index 000000000..f87c47971 --- /dev/null +++ b/Lib/turtledemo/nim.py @@ -0,0 +1,224 @@ +"""turtledemo/nim.py + +Play nim against the computer. The player +who takes the last stick is the winner. + +Implements the model-view-controller +design pattern. +""" + + +import turtle +import random +import time + +SCREENWIDTH = 640 +SCREENHEIGHT = 480 + +MINSTICKS = 7 +MAXSTICKS = 31 + +HUNIT = SCREENHEIGHT // 12 +WUNIT = SCREENWIDTH // ((MAXSTICKS // 5) * 11 + (MAXSTICKS % 5) * 2) + +SCOLOR = (63, 63, 31) +HCOLOR = (255, 204, 204) +COLOR = (204, 204, 255) + +def randomrow(): + return random.randint(MINSTICKS, MAXSTICKS) + +def computerzug(state): + xored = state[0] ^ state[1] ^ state[2] + if xored == 0: + return randommove(state) + for z in range(3): + s = state[z] ^ xored + if s <= state[z]: + move = (z, s) + return move + +def randommove(state): + m = max(state) + while True: + z = random.randint(0,2) + if state[z] > (m > 1): + break + rand = random.randint(m > 1, state[z]-1) + return z, rand + + +class NimModel(object): + def __init__(self, game): + self.game = game + + def setup(self): + if self.game.state not in [Nim.CREATED, Nim.OVER]: + return + self.sticks = [randomrow(), randomrow(), randomrow()] + self.player = 0 + self.winner = None + self.game.view.setup() + self.game.state = Nim.RUNNING + + def move(self, row, col): + maxspalte = self.sticks[row] + self.sticks[row] = col + self.game.view.notify_move(row, col, maxspalte, self.player) + if self.game_over(): + self.game.state = Nim.OVER + self.winner = self.player + self.game.view.notify_over() + elif self.player == 0: + self.player = 1 + row, col = computerzug(self.sticks) + self.move(row, col) + self.player = 0 + + def game_over(self): + return self.sticks == [0, 0, 0] + + def notify_move(self, row, col): + if self.sticks[row] <= col: + return + self.move(row, col) + + +class Stick(turtle.Turtle): + def __init__(self, row, col, game): + turtle.Turtle.__init__(self, visible=False) + self.row = row + self.col = col + self.game = game + x, y = self.coords(row, col) + self.shape("square") + self.shapesize(HUNIT/10.0, WUNIT/20.0) + self.speed(0) + self.pu() + self.goto(x,y) + self.color("white") + self.showturtle() + + def coords(self, row, col): + packet, remainder = divmod(col, 5) + x = (3 + 11 * packet + 2 * remainder) * WUNIT + y = (2 + 3 * row) * HUNIT + return x - SCREENWIDTH // 2 + WUNIT // 2, SCREENHEIGHT // 2 - y - HUNIT // 2 + + def makemove(self, x, y): + if self.game.state != Nim.RUNNING: + return + self.game.controller.notify_move(self.row, self.col) + + +class NimView(object): + def __init__(self, game): + self.game = game + self.screen = game.screen + self.model = game.model + self.screen.colormode(255) + self.screen.tracer(False) + self.screen.bgcolor((240, 240, 255)) + self.writer = turtle.Turtle(visible=False) + self.writer.pu() + self.writer.speed(0) + self.sticks = {} + for row in range(3): + for col in range(MAXSTICKS): + self.sticks[(row, col)] = Stick(row, col, game) + self.display("... a moment please ...") + self.screen.tracer(True) + + def display(self, msg1, msg2=None): + self.screen.tracer(False) + self.writer.clear() + if msg2 is not None: + self.writer.goto(0, - SCREENHEIGHT // 2 + 48) + self.writer.pencolor("red") + self.writer.write(msg2, align="center", font=("Courier",18,"bold")) + self.writer.goto(0, - SCREENHEIGHT // 2 + 20) + self.writer.pencolor("black") + self.writer.write(msg1, align="center", font=("Courier",14,"bold")) + self.screen.tracer(True) + + def setup(self): + self.screen.tracer(False) + for row in range(3): + for col in range(self.model.sticks[row]): + self.sticks[(row, col)].color(SCOLOR) + for row in range(3): + for col in range(self.model.sticks[row], MAXSTICKS): + self.sticks[(row, col)].color("white") + self.display("Your turn! Click leftmost stick to remove.") + self.screen.tracer(True) + + def notify_move(self, row, col, maxspalte, player): + if player == 0: + farbe = HCOLOR + for s in range(col, maxspalte): + self.sticks[(row, s)].color(farbe) + else: + self.display(" ... thinking ... ") + time.sleep(0.5) + self.display(" ... thinking ... aaah ...") + farbe = COLOR + for s in range(maxspalte-1, col-1, -1): + time.sleep(0.2) + self.sticks[(row, s)].color(farbe) + self.display("Your turn! Click leftmost stick to remove.") + + def notify_over(self): + if self.game.model.winner == 0: + msg2 = "Congrats. You're the winner!!!" + else: + msg2 = "Sorry, the computer is the winner." + self.display("To play again press space bar. To leave press ESC.", msg2) + + def clear(self): + if self.game.state == Nim.OVER: + self.screen.clear() + + +class NimController(object): + + def __init__(self, game): + self.game = game + self.sticks = game.view.sticks + self.BUSY = False + for stick in self.sticks.values(): + stick.onclick(stick.makemove) + self.game.screen.onkey(self.game.model.setup, "space") + self.game.screen.onkey(self.game.view.clear, "Escape") + self.game.view.display("Press space bar to start game") + self.game.screen.listen() + + def notify_move(self, row, col): + if self.BUSY: + return + self.BUSY = True + self.game.model.notify_move(row, col) + self.BUSY = False + + +class Nim(object): + CREATED = 0 + RUNNING = 1 + OVER = 2 + def __init__(self, screen): + self.state = Nim.CREATED + self.screen = screen + self.model = NimModel(self) + self.view = NimView(self) + self.controller = NimController(self) + + +def main(): + mainscreen = turtle.Screen() + mainscreen.mode("standard") + mainscreen.setup(SCREENWIDTH, SCREENHEIGHT) + nim = Nim(mainscreen) + return "EVENTLOOP" + +if __name__ == "__main__": + main() + turtle.mainloop() diff --git a/Lib/turtledemo/paint.py b/Lib/turtledemo/paint.py new file mode 100644 index 000000000..780300fb2 --- /dev/null +++ b/Lib/turtledemo/paint.py @@ -0,0 +1,48 @@ +"""turtledemo/paint.py + +A simple event-driven paint program. +- Left mouse button moves turtle. +- Middle mouse button changes color. +- Right mouse button toggles between pen up +(no line drawn when the turtle moves) and +pen down (line is drawn). If pen up follows +at least two pen-down moves, the polygon that +includes the starting point is filled. + ------------------------------------------- + Play around by clicking into the canvas + using all three mouse buttons. + ------------------------------------------- +""" +from turtle import * + +def switchupdown(x=0, y=0): + if pen()["pendown"]: + end_fill() + up() + else: + down() + begin_fill() + +def changecolor(x=0, y=0): + global colors + colors = colors[1:]+colors[:1] + color(colors[0]) + +def main(): + global colors + shape("circle") + resizemode("user") + shapesize(.5) + width(3) + colors=["red", "green", "blue", "yellow"] + color(colors[0]) + switchupdown() + onscreenclick(goto,1) + onscreenclick(changecolor,2) + onscreenclick(switchupdown,3) + return "EVENTLOOP" + +if __name__ == "__main__": + msg = main() + print(msg) + mainloop() diff --git a/Lib/turtledemo/peace.py b/Lib/turtledemo/peace.py new file mode 100644 index 000000000..d86c94a48 --- /dev/null +++ b/Lib/turtledemo/peace.py @@ -0,0 +1,58 @@ +"""turtledemo/peace.py + +A simple drawing suitable as a beginner's +programming example. Aside from the +peacecolors assignment and the for loop, +it only uses turtle commands. +""" + +from turtle import * + +def main(): + peacecolors = ("red3", "orange", "yellow", + "seagreen4", "orchid4", + "royalblue1", "dodgerblue4") + + reset() + Screen() + up() + goto(-320,-195) + width(70) + + for pcolor in peacecolors: + color(pcolor) + down() + forward(640) + up() + backward(640) + left(90) + forward(66) + right(90) + + width(25) + color("white") + goto(0,-170) + down() + + circle(170) + left(90) + forward(340) + up() + left(180) + forward(170) + right(45) + down() + forward(170) + up() + backward(170) + left(90) + down() + forward(170) + up() + + goto(0,300) # vanish if hideturtle() is not available ;-) + return "Done!" + +if __name__ == "__main__": + main() + mainloop() diff --git a/Lib/turtledemo/penrose.py b/Lib/turtledemo/penrose.py new file mode 100644 index 000000000..ceaefedac --- /dev/null +++ b/Lib/turtledemo/penrose.py @@ -0,0 +1,172 @@ +"""turtledemo/penrose.py + +Constructs two aperiodic penrose-tilings, +consisting of kites and darts, by the method +of inflation in six steps. + +Starting points are the patterns "sun" +consisting of five kites and "star" +consisting of five darts. + +For more information see: + https://en.wikipedia.org/wiki/Penrose_tiling + ------------------------------------------- +""" +from turtle import * +from math import cos, pi +from time import perf_counter as clock, sleep + +f = (5**0.5-1)/2.0 # (sqrt(5)-1)/2 -- golden ratio +d = 2 * cos(3*pi/10) + +def kite(l): + fl = f * l + lt(36) + fd(l) + rt(108) + fd(fl) + rt(36) + fd(fl) + rt(108) + fd(l) + rt(144) + +def dart(l): + fl = f * l + lt(36) + fd(l) + rt(144) + fd(fl) + lt(36) + fd(fl) + rt(144) + fd(l) + rt(144) + +def inflatekite(l, n): + if n == 0: + px, py = pos() + h, x, y = int(heading()), round(px,3), round(py,3) + tiledict[(h,x,y)] = True + return + fl = f * l + lt(36) + inflatedart(fl, n-1) + fd(l) + rt(144) + inflatekite(fl, n-1) + lt(18) + fd(l*d) + rt(162) + inflatekite(fl, n-1) + lt(36) + fd(l) + rt(180) + inflatedart(fl, n-1) + lt(36) + +def inflatedart(l, n): + if n == 0: + px, py = pos() + h, x, y = int(heading()), round(px,3), round(py,3) + tiledict[(h,x,y)] = False + return + fl = f * l + inflatekite(fl, n-1) + lt(36) + fd(l) + rt(180) + inflatedart(fl, n-1) + lt(54) + fd(l*d) + rt(126) + inflatedart(fl, n-1) + fd(l) + rt(144) + +def draw(l, n, th=2): + clear() + l = l * f**n + shapesize(l/100.0, l/100.0, th) + for k in tiledict: + h, x, y = k + setpos(x, y) + setheading(h) + if tiledict[k]: + shape("kite") + color("black", (0, 0.75, 0)) + else: + shape("dart") + color("black", (0.75, 0, 0)) + stamp() + +def sun(l, n): + for i in range(5): + inflatekite(l, n) + lt(72) + +def star(l,n): + for i in range(5): + inflatedart(l, n) + lt(72) + +def makeshapes(): + tracer(0) + begin_poly() + kite(100) + end_poly() + register_shape("kite", get_poly()) + begin_poly() + dart(100) + end_poly() + register_shape("dart", get_poly()) + tracer(1) + +def start(): + reset() + ht() + pu() + makeshapes() + resizemode("user") + +def test(l=200, n=4, fun=sun, startpos=(0,0), th=2): + global tiledict + goto(startpos) + setheading(0) + tiledict = {} + tracer(0) + fun(l, n) + draw(l, n, th) + tracer(1) + nk = len([x for x in tiledict if tiledict[x]]) + nd = len([x for x in tiledict if not tiledict[x]]) + print("%d kites and %d darts = %d pieces." % (nk, nd, nk+nd)) + +def demo(fun=sun): + start() + for i in range(8): + a = clock() + test(300, i, fun) + b = clock() + t = b - a + if t < 2: + sleep(2 - t) + +def main(): + #title("Penrose-tiling with kites and darts.") + mode("logo") + bgcolor(0.3, 0.3, 0) + demo(sun) + sleep(2) + demo(star) + pencolor("black") + goto(0,-200) + pencolor(0.7,0.7,1) + write("Please wait...", + align="center", font=('Arial Black', 36, 'bold')) + test(600, 8, startpos=(70, 117)) + return "Done" + +if __name__ == "__main__": + msg = main() + mainloop() diff --git a/Lib/turtledemo/planet_and_moon.py b/Lib/turtledemo/planet_and_moon.py new file mode 100644 index 000000000..571afcf92 --- /dev/null +++ b/Lib/turtledemo/planet_and_moon.py @@ -0,0 +1,108 @@ +"""turtledemo/planets_and_moon.py + +Gravitational system simulation using the +approximation method from Feynman-lectures, +p.9-8, using turtlegraphics. + +Example: heavy central body, light planet, +very light moon! +Planet has a circular orbit, moon a stable +orbit around the planet. + +You can hold the movement temporarily by +pressing the left mouse button with the +mouse over the scrollbar of the canvas. + +""" +from turtle import Shape, Turtle, mainloop, Vec2D as Vec + +G = 8 + +class GravSys(object): + def __init__(self): + self.planets = [] + self.t = 0 + self.dt = 0.01 + def init(self): + for p in self.planets: + p.init() + def start(self): + for i in range(10000): + self.t += self.dt + for p in self.planets: + p.step() + +class Star(Turtle): + def __init__(self, m, x, v, gravSys, shape): + Turtle.__init__(self, shape=shape) + self.penup() + self.m = m + self.setpos(x) + self.v = v + gravSys.planets.append(self) + self.gravSys = gravSys + self.resizemode("user") + self.pendown() + def init(self): + dt = self.gravSys.dt + self.a = self.acc() + self.v = self.v + 0.5*dt*self.a + def acc(self): + a = Vec(0,0) + for planet in self.gravSys.planets: + if planet != self: + v = planet.pos()-self.pos() + a += (G*planet.m/abs(v)**3)*v + return a + def step(self): + dt = self.gravSys.dt + self.setpos(self.pos() + dt*self.v) + if self.gravSys.planets.index(self) != 0: + self.setheading(self.towards(self.gravSys.planets[0])) + self.a = self.acc() + self.v = self.v + dt*self.a + +## create compound yellow/blue turtleshape for planets + +def main(): + s = Turtle() + s.reset() + s.getscreen().tracer(0,0) + s.ht() + s.pu() + s.fd(6) + s.lt(90) + s.begin_poly() + s.circle(6, 180) + s.end_poly() + m1 = s.get_poly() + s.begin_poly() + s.circle(6,180) + s.end_poly() + m2 = s.get_poly() + + planetshape = Shape("compound") + planetshape.addcomponent(m1,"orange") + planetshape.addcomponent(m2,"blue") + s.getscreen().register_shape("planet", planetshape) + s.getscreen().tracer(1,0) + + ## setup gravitational system + gs = GravSys() + sun = Star(1000000, Vec(0,0), Vec(0,-2.5), gs, "circle") + sun.color("yellow") + sun.shapesize(1.8) + sun.pu() + earth = Star(12500, Vec(210,0), Vec(0,195), gs, "planet") + earth.pencolor("green") + earth.shapesize(0.8) + moon = Star(1, Vec(220,0), Vec(0,295), gs, "planet") + moon.pencolor("blue") + moon.shapesize(0.5) + gs.init() + gs.start() + return "Done!" + +if __name__ == '__main__': + main() + mainloop() diff --git a/Lib/turtledemo/rosette.py b/Lib/turtledemo/rosette.py new file mode 100644 index 000000000..48897a620 --- /dev/null +++ b/Lib/turtledemo/rosette.py @@ -0,0 +1,63 @@ +"""turtledemo/rosette.py + +This example is +inspired by the Wikipedia article on turtle +graphics. (See example wikipedia1 for URLs) + +First we create (ne-1) (i.e. 35 in this +example) copies of our first turtle p. +Then we let them perform their steps in +parallel. + +Followed by a complete undo(). +""" +from turtle import Screen, Turtle, mainloop +from time import perf_counter as clock, sleep + +def mn_eck(p, ne,sz): + turtlelist = [p] + #create ne-1 additional turtles + for i in range(1,ne): + q = p.clone() + q.rt(360.0/ne) + turtlelist.append(q) + p = q + for i in range(ne): + c = abs(ne/2.0-i)/(ne*.7) + # let those ne turtles make a step + # in parallel: + for t in turtlelist: + t.rt(360./ne) + t.pencolor(1-c,0,c) + t.fd(sz) + +def main(): + s = Screen() + s.bgcolor("black") + p=Turtle() + p.speed(0) + p.hideturtle() + p.pencolor("red") + p.pensize(3) + + s.tracer(36,0) + + at = clock() + mn_eck(p, 36, 19) + et = clock() + z1 = et-at + + sleep(1) + + at = clock() + while any(t.undobufferentries() for t in s.turtles()): + for t in s.turtles(): + t.undo() + et = clock() + return "runtime: %.3f sec" % (z1+et-at) + + +if __name__ == '__main__': + msg = main() + print(msg) + mainloop() diff --git a/Lib/turtledemo/round_dance.py b/Lib/turtledemo/round_dance.py new file mode 100644 index 000000000..9da6389b2 --- /dev/null +++ b/Lib/turtledemo/round_dance.py @@ -0,0 +1,81 @@ +"""turtledemo/round_dance.py + +Dancing turtles have a compound shape +consisting of a series of triangles of +decreasing size. + +Turtles march along a circle while rotating +pairwise in opposite direction, with one +exception. Does that breaking of symmetry +enhance the attractiveness of the example? + +Press any key to stop the animation. + +Technically: demonstrates use of compound +shapes, transformation of shapes as well as +cloning turtles. The animation is +controlled through update(). +""" + +from turtle import * + +def stop(): + global running + running = False + +def main(): + global running + clearscreen() + bgcolor("gray10") + tracer(False) + shape("triangle") + f = 0.793402 + phi = 9.064678 + s = 5 + c = 1 + # create compound shape + sh = Shape("compound") + for i in range(10): + shapesize(s) + p =get_shapepoly() + s *= f + c *= f + tilt(-phi) + sh.addcomponent(p, (c, 0.25, 1-c), "black") + register_shape("multitri", sh) + # create dancers + shapesize(1) + shape("multitri") + pu() + setpos(0, -200) + dancers = [] + for i in range(180): + fd(7) + tilt(-4) + lt(2) + update() + if i % 12 == 0: + dancers.append(clone()) + home() + # dance + running = True + onkeypress(stop) + listen() + cs = 1 + while running: + ta = -4 + for dancer in dancers: + dancer.fd(7) + dancer.lt(2) + dancer.tilt(ta) + ta = -4 if ta > 0 else 2 + if cs < 180: + right(4) + shapesize(cs) + cs *= 1.005 + update() + return "DONE!" + +if __name__=='__main__': + print(main()) + mainloop() diff --git a/Lib/turtledemo/sorting_animate.py b/Lib/turtledemo/sorting_animate.py new file mode 100644 index 000000000..e0a2877cd --- /dev/null +++ b/Lib/turtledemo/sorting_animate.py @@ -0,0 +1,198 @@ +"""turtledemo/sorting_animation.py + +A minimal sorting algorithm animation: +Sorts a shelf of 10 blocks using insertion +sort, selection sort and quicksort. + +Shelves are implemented using builtin lists. + +Blocks are turtles with shape "square", but +stretched to rectangles by shapesize() +""" +from turtle import * +import random + + +class Block(Turtle): + + def __init__(self, size): + self.size = size + Turtle.__init__(self, shape="square", visible=False) + self.pu() + self.shapesize(size * 1.5, 1.5, 2) # square-->rectangle + self.fillcolor("black") + self.st() + + def glow(self): + self.fillcolor("red") + + def unglow(self): + self.fillcolor("black") + + def __repr__(self): + return "Block size: {0}".format(self.size) + + +class Shelf(list): + + def __init__(self, y): + "create a shelf. y is y-position of first block" + self.y = y + self.x = -150 + + def push(self, d): + width, _, _ = d.shapesize() + # align blocks by the bottom edge + y_offset = width / 2 * 20 + d.sety(self.y + y_offset) + d.setx(self.x + 34 * len(self)) + self.append(d) + + def _close_gap_from_i(self, i): + for b in self[i:]: + xpos, _ = b.pos() + b.setx(xpos - 34) + + def _open_gap_from_i(self, i): + for b in self[i:]: + xpos, _ = b.pos() + b.setx(xpos + 34) + + def pop(self, key): + b = list.pop(self, key) + b.glow() + b.sety(200) + self._close_gap_from_i(key) + return b + + def insert(self, key, b): + self._open_gap_from_i(key) + list.insert(self, key, b) + b.setx(self.x + 34 * key) + width, _, _ = b.shapesize() + # align blocks by the bottom edge + y_offset = width / 2 * 20 + b.sety(self.y + y_offset) + b.unglow() + +def isort(shelf): + length = len(shelf) + for i in range(1, length): + hole = i + while hole > 0 and shelf[i].size < shelf[hole - 1].size: + hole = hole - 1 + shelf.insert(hole, shelf.pop(i)) + return + +def ssort(shelf): + length = len(shelf) + for j in range(0, length - 1): + imin = j + for i in range(j + 1, length): + if shelf[i].size < shelf[imin].size: + imin = i + if imin != j: + shelf.insert(j, shelf.pop(imin)) + +def partition(shelf, left, right, pivot_index): + pivot = shelf[pivot_index] + shelf.insert(right, shelf.pop(pivot_index)) + store_index = left + for i in range(left, right): # range is non-inclusive of ending value + if shelf[i].size < pivot.size: + shelf.insert(store_index, shelf.pop(i)) + store_index = store_index + 1 + shelf.insert(store_index, shelf.pop(right)) # move pivot to correct position + return store_index + +def qsort(shelf, left, right): + if left < right: + pivot_index = left + pivot_new_index = partition(shelf, left, right, pivot_index) + qsort(shelf, left, pivot_new_index - 1) + qsort(shelf, pivot_new_index + 1, right) + +def randomize(): + disable_keys() + clear() + target = list(range(10)) + random.shuffle(target) + for i, t in enumerate(target): + for j in range(i, len(s)): + if s[j].size == t + 1: + s.insert(i, s.pop(j)) + show_text(instructions1) + show_text(instructions2, line=1) + enable_keys() + +def show_text(text, line=0): + line = 20 * line + goto(0,-250 - line) + write(text, align="center", font=("Courier", 16, "bold")) + +def start_ssort(): + disable_keys() + clear() + show_text("Selection Sort") + ssort(s) + clear() + show_text(instructions1) + show_text(instructions2, line=1) + enable_keys() + +def start_isort(): + disable_keys() + clear() + show_text("Insertion Sort") + isort(s) + clear() + show_text(instructions1) + show_text(instructions2, line=1) + enable_keys() + +def start_qsort(): + disable_keys() + clear() + show_text("Quicksort") + qsort(s, 0, len(s) - 1) + clear() + show_text(instructions1) + show_text(instructions2, line=1) + enable_keys() + +def init_shelf(): + global s + s = Shelf(-200) + vals = (4, 2, 8, 9, 1, 5, 10, 3, 7, 6) + for i in vals: + s.push(Block(i)) + +def disable_keys(): + onkey(None, "s") + onkey(None, "i") + onkey(None, "q") + onkey(None, "r") + +def enable_keys(): + onkey(start_isort, "i") + onkey(start_ssort, "s") + onkey(start_qsort, "q") + onkey(randomize, "r") + onkey(bye, "space") + +def main(): + getscreen().clearscreen() + ht(); penup() + init_shelf() + show_text(instructions1) + show_text(instructions2, line=1) + enable_keys() + listen() + return "EVENTLOOP" + +instructions1 = "press i for insertion sort, s for selection sort, q for quicksort" +instructions2 = "spacebar to quit, r to randomize" + +if __name__=="__main__": + msg = main() + mainloop() diff --git a/Lib/turtledemo/tree.py b/Lib/turtledemo/tree.py new file mode 100644 index 000000000..6ad8fcc85 --- /dev/null +++ b/Lib/turtledemo/tree.py @@ -0,0 +1,59 @@ +"""turtledemo/tree.py + +Displays a 'breadth-first-tree' - in contrast +to the classical Logo tree drawing programs, +which use a depth-first-algorithm. + +Uses: +(1) a tree-generator, where the drawing is +quasi the side-effect, whereas the generator +always yields None. +(2) Turtle-cloning: At each branching point +the current pen is cloned. So in the end +there are 1024 turtles. +""" +from turtle import Turtle, mainloop +from time import perf_counter as clock + +def tree(plist, l, a, f): + """ plist is list of pens + l is length of branch + a is half of the angle between 2 branches + f is factor by which branch is shortened + from level to level.""" + if l > 3: + lst = [] + for p in plist: + p.forward(l) + q = p.clone() + p.left(a) + q.right(a) + lst.append(p) + lst.append(q) + for x in tree(lst, l*f, a, f): + yield None + +def maketree(): + p = Turtle() + p.setundobuffer(None) + p.hideturtle() + p.speed(0) + p.getscreen().tracer(30,0) + p.left(90) + p.penup() + p.forward(-210) + p.pendown() + t = tree([p], 200, 65, 0.6375) + for x in t: + pass + +def main(): + a=clock() + maketree() + b=clock() + return "done: %.2f sec." % (b-a) + +if __name__ == "__main__": + msg = main() + print(msg) + mainloop() diff --git a/Lib/turtledemo/turtle.cfg b/Lib/turtledemo/turtle.cfg new file mode 100644 index 000000000..bd89a741f --- /dev/null +++ b/Lib/turtledemo/turtle.cfg @@ -0,0 +1,10 @@ +width = 800 +height = 600 +canvwidth = 1200 +canvheight = 900 +shape = arrow +mode = standard +resizemode = auto +fillcolor = "" +title = Python turtle graphics demo. + diff --git a/Lib/turtledemo/two_canvases.py b/Lib/turtledemo/two_canvases.py new file mode 100644 index 000000000..2c8020378 --- /dev/null +++ b/Lib/turtledemo/two_canvases.py @@ -0,0 +1,54 @@ +"""turtledemo/two_canvases.py + +Use TurtleScreen and RawTurtle to draw on two +distinct canvases in a separate window. The +new window must be separately closed in +addition to pressing the STOP button. +""" + +from turtle import TurtleScreen, RawTurtle, TK + +def main(): + root = TK.Tk() + cv1 = TK.Canvas(root, width=300, height=200, bg="#ddffff") + cv2 = TK.Canvas(root, width=300, height=200, bg="#ffeeee") + cv1.pack() + cv2.pack() + + s1 = TurtleScreen(cv1) + s1.bgcolor(0.85, 0.85, 1) + s2 = TurtleScreen(cv2) + s2.bgcolor(1, 0.85, 0.85) + + p = RawTurtle(s1) + q = RawTurtle(s2) + + p.color("red", (1, 0.85, 0.85)) + p.width(3) + q.color("blue", (0.85, 0.85, 1)) + q.width(3) + + for t in p,q: + t.shape("turtle") + t.lt(36) + + q.lt(180) + + for t in p, q: + t.begin_fill() + for i in range(5): + for t in p, q: + t.fd(50) + t.lt(72) + for t in p,q: + t.end_fill() + t.lt(54) + t.pu() + t.bk(50) + + return "EVENTLOOP" + + +if __name__ == '__main__': + main() + TK.mainloop() # keep window open until user closes it diff --git a/Lib/turtledemo/yinyang.py b/Lib/turtledemo/yinyang.py new file mode 100644 index 000000000..6e92d4bf7 --- /dev/null +++ b/Lib/turtledemo/yinyang.py @@ -0,0 +1,46 @@ +"""turtledemo/yinyang.py + +Another drawing suitable as a beginner's +programming example. + +The small circles are drawn by the circle +command. + +""" + +from turtle import * + +def yin(radius, color1, color2): + width(3) + color("black", color1) + begin_fill() + circle(radius/2., 180) + circle(radius, 180) + left(180) + circle(-radius/2., 180) + end_fill() + left(90) + up() + forward(radius*0.35) + right(90) + down() + color(color1, color2) + begin_fill() + circle(radius*0.15) + end_fill() + left(90) + up() + backward(radius*0.35) + down() + left(90) + +def main(): + reset() + yin(200, "black", "white") + yin(200, "white", "black") + ht() + return "Done!" + +if __name__ == '__main__': + main() + mainloop() From 3d53342b6113c9f32f76cade5d2fdeffedc82a7a Mon Sep 17 00:00:00 2001 From: Joshua Megnauth <48846352+joshuamegnauth54@users.noreply.github.com> Date: Wed, 3 Jun 2026 05:38:28 -0400 Subject: [PATCH 018/339] Update random and cryptography crates (#8010) Redo of #7800. Bumping the random and crypto crates is not trivial. Both sets of crates have had API changes which require manual updates. AI use: I wrote all of the code myself but used AI to figure out the new APIs. AI explained SHAKE's block size and why the block_size() function doesn't exist in the new crate. I confirmed the block size, which is actually represented in the new types for SHAKE. `Shake128` is actually `Shake<168>` - 168 is the block size. I cited Wikipedia as it lists the SHAKE block size in bits. I also used AI to figure out HMAC for SHA3. Assisted-by: Codex:gpt-5.4 --- .github/dependabot.yml | 2 + Cargo.lock | 149 +++++++++++++++++++---------------- Cargo.toml | 24 +++--- crates/literal/src/float.rs | 2 +- crates/stdlib/Cargo.toml | 5 +- crates/stdlib/src/hashlib.rs | 81 +++++++++++-------- crates/stdlib/src/random.rs | 6 +- 7 files changed, 147 insertions(+), 122 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 7533ce368..e9e2041d4 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -24,6 +24,7 @@ updates: - "sha1" - "sha2" - "sha3" + - "shake" - "blake2" - "hmac" - "pbkdf2" @@ -88,6 +89,7 @@ updates: - "getrandom" - "mt19937" - "rand*" + - "chacha20" rayon: patterns: - "rayon*" diff --git a/Cargo.lock b/Cargo.lock index e388302e4..985d9083b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -349,11 +349,11 @@ dependencies = [ [[package]] name = "blake2" -version = "0.10.6" +version = "0.11.0-rc.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" +checksum = "061f1a09225e328e1ffbb378d2d49923c0ca5fee19fb5ac1cc9c1e9d52b93690" dependencies = [ - "digest 0.10.7", + "digest 0.11.3", ] [[package]] @@ -481,6 +481,17 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" +[[package]] +name = "chacha20" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601" +dependencies = [ + "cfg-if", + "cpufeatures 0.3.0", + "rand_core 0.10.1", +] + [[package]] name = "chrono" version = "0.4.44" @@ -1101,7 +1112,6 @@ checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer 0.10.4", "crypto-common 0.1.7", - "subtle", ] [[package]] @@ -1111,6 +1121,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2" dependencies = [ "block-buffer 0.12.0", + "const-oid 0.10.2", "crypto-common 0.2.2", "ctutils", ] @@ -1438,11 +1449,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" dependencies = [ "cfg-if", - "js-sys", "libc", "r-efi 5.3.0", "wasip2", - "wasm-bindgen", ] [[package]] @@ -1452,10 +1461,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555" dependencies = [ "cfg-if", + "js-sys", "libc", "r-efi 6.0.0", + "rand_core 0.10.1", "wasip2", "wasip3", + "wasm-bindgen", ] [[package]] @@ -1582,15 +1594,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" -[[package]] -name = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest 0.10.7", -] - [[package]] name = "hmac" version = "0.13.0" @@ -1969,11 +1972,12 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.6" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb26cec98cce3a3d96cbb7bced3c4b16e3d13f27ec56dbd62cbc8f39cfb9d653" +checksum = "9e24a010dd405bd7ed803e5253182815b41bf2e6a80cc3bfc066658e03a198aa" dependencies = [ - "cpufeatures 0.2.17", + "cfg-if", + "cpufeatures 0.3.0", ] [[package]] @@ -2323,12 +2327,12 @@ dependencies = [ [[package]] name = "md-5" -version = "0.10.6" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" +checksum = "69b6441f590336821bb897fb28fc622898ccceb1d6cea3fde5ea86b090c4de98" dependencies = [ "cfg-if", - "digest 0.10.7", + "digest 0.11.3", ] [[package]] @@ -2373,11 +2377,11 @@ dependencies = [ [[package]] name = "mt19937" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56bc7ea7924ea1a79a9e817d0483e39295424cf2b1276cf2b968f9a6c9b63b54" +checksum = "25b4ab1a6f4b7820876af86b84adf545d53a52f59c5374856225aad9562d903e" dependencies = [ - "rand_core 0.9.5", + "rand_core 0.10.1", ] [[package]] @@ -2653,16 +2657,6 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2ee67f1008b1ba2321834326597b8e186293b049a023cdef258527550b9935b4" -[[package]] -name = "pbkdf2" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" -dependencies = [ - "digest 0.10.7", - "hmac 0.12.1", -] - [[package]] name = "pbkdf2" version = "0.13.0" @@ -2670,7 +2664,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "112d82ceb8c5bf524d9af484d4e4970c9fd5a0cc15ba14ad93dccd28873b0629" dependencies = [ "digest 0.11.3", - "hmac 0.13.0", + "hmac", ] [[package]] @@ -2787,10 +2781,10 @@ dependencies = [ "aes", "cbc", "der 0.8.0", - "pbkdf2 0.13.0", + "pbkdf2", "rand_core 0.10.1", "scrypt", - "sha2 0.11.0", + "sha2", "spki 0.8.0", ] @@ -3109,6 +3103,17 @@ dependencies = [ "rand_core 0.9.5", ] +[[package]] +name = "rand" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207" +dependencies = [ + "chacha20", + "getrandom 0.4.2", + "rand_core 0.10.1", +] + [[package]] name = "rand_chacha" version = "0.3.1" @@ -3515,7 +3520,7 @@ version = "0.5.0" dependencies = [ "ascii", "bitflags 2.11.1", - "getrandom 0.3.4", + "getrandom 0.4.2", "itertools 0.14.0", "libc", "lock_api", @@ -3602,7 +3607,7 @@ name = "rustpython-host_env" version = "0.5.0" dependencies = [ "bitflags 2.11.1", - "getrandom 0.3.4", + "getrandom 0.4.2", "junction", "libc", "libffi", @@ -3646,7 +3651,7 @@ dependencies = [ "is-macro", "lexical-parse-float", "num-traits", - "rand 0.9.4", + "rand 0.10.1", "rustpython-wtf8", ] @@ -3757,7 +3762,7 @@ dependencies = [ "crossbeam-utils", "csv-core", "der 0.8.0", - "digest 0.10.7", + "digest 0.11.3", "dns-lookup", "dyn-clone", "flame", @@ -3765,7 +3770,7 @@ dependencies = [ "foreign-types-shared", "gethostname", "hex", - "hmac 0.12.1", + "hmac", "icu_normalizer", "icu_properties", "indexmap", @@ -3790,12 +3795,12 @@ dependencies = [ "openssl-sys", "parking_lot", "paste", - "pbkdf2 0.12.2", + "pbkdf2", "pem-rfc7468 1.0.0", "phf 0.13.1", "pkcs8", "pymath", - "rand_core 0.9.5", + "rand 0.10.1", "rapidhash", "rustls", "rustls-native-certs", @@ -3810,9 +3815,10 @@ dependencies = [ "rustpython-ruff_source_file", "rustpython-ruff_text_size", "rustpython-vm", - "sha-1", - "sha2 0.10.9", + "sha1 0.11.0", + "sha2", "sha3", + "shake", "socket2", "system-configuration", "tcl-sys", @@ -4004,9 +4010,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d87af57419b594aa23fa95f09f0e06d80d84ba01c26148c43844cad6ff4485f0" dependencies = [ "cfg-if", - "pbkdf2 0.13.0", + "pbkdf2", "salsa20", - "sha2 0.11.0", + "sha2", ] [[package]] @@ -4101,17 +4107,6 @@ dependencies = [ "serde_core", ] -[[package]] -name = "sha-1" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" -dependencies = [ - "cfg-if", - "cpufeatures 0.2.17", - "digest 0.10.7", -] - [[package]] name = "sha1" version = "0.10.6" @@ -4124,14 +4119,14 @@ dependencies = [ ] [[package]] -name = "sha2" -version = "0.10.9" +name = "sha1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" +checksum = "aacc4cc499359472b4abe1bf11d0b12e688af9a805fa5e3016f9a386dc2d0214" dependencies = [ "cfg-if", - "cpufeatures 0.2.17", - "digest 0.10.7", + "cpufeatures 0.3.0", + "digest 0.11.3", ] [[package]] @@ -4147,12 +4142,24 @@ dependencies = [ [[package]] name = "sha3" -version = "0.10.9" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77fd7028345d415a4034cf8777cd4f8ab1851274233b45f84e3d955502d93874" +checksum = "bc9bad02c26382724b2d2692c6f179285e4b54eeecd7968f52a50059c3c11759" dependencies = [ - "digest 0.10.7", + "digest 0.11.3", "keccak", + "sponge-cursor", +] + +[[package]] +name = "shake" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09057cb2149ad4cbd2da1e26b351f9a4c354219421229c69c3063e6f61947c4a" +dependencies = [ + "digest 0.11.3", + "keccak", + "sponge-cursor", ] [[package]] @@ -4254,6 +4261,12 @@ dependencies = [ "der 0.8.0", ] +[[package]] +name = "sponge-cursor" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a0219bd7d979d58245a4f41f695e1ac9f8befdffadd7f61f1bae9e39abc6620" + [[package]] name = "stable_deref_trait" version = "1.2.1" @@ -5316,7 +5329,7 @@ checksum = "1301e935010a701ae5f8655edc0ad17c44bad3ac5ce8c39185f75453b720ae94" dependencies = [ "const-oid 0.9.6", "der 0.7.10", - "sha1", + "sha1 0.10.6", "signature", "spki 0.7.3", "tls_codec", diff --git a/Cargo.toml b/Cargo.toml index de2704842..08463ec02 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -195,7 +195,7 @@ adler32 = "1.2.0" approx = "0.5.1" ascii = "1.1" base64 = "0.22" -blake2 = "0.10.4" +blake2 = "0.11.0-rc.6" bitflags = "2.11.0" bitflagset = "0.0.3" bstr = "1" @@ -210,7 +210,7 @@ crc32fast = "1.3.2" criterion = { version = "0.8", features = ["html_reports"] } crossbeam-utils = "0.8.21" csv-core = "0.1.11" -digest = "0.10.7" +digest = "0.11" dns-lookup = "3.0" dyn-clone = "1.0.10" exitcode = "1.1.2" @@ -220,12 +220,12 @@ flate2 = { version = "1.1.9", default-features = false } # Bump only when the openssl crate bumps it foreign-types-shared = "0.1" gethostname = "1.0.2" -getrandom = { version = "0.3", features = ["std"] } +getrandom = { version = "0.4", features = ["std"] } glob = "0.3" half = "2" hex = "0.4.3" hexf-parse = "0.2.1" -hmac = "0.12" +hmac = "0.13" indexmap = { version = "2.14.0", features = ["std"] } insta = "1.47" itertools = "0.14.0" @@ -248,10 +248,10 @@ mac_address = "1.1.3" malachite-bigint = "0.9.1" malachite-q = "0.9.1" malachite-base = "0.9.1" -md-5 = "0.10.1" +md-5 = "0.11" memchr = "2.8.0" memmap2 = "0.9.10" -mt19937 = "<=3.2" # upgrade it once rand is upgraded +mt19937 = "3.3" num-complex = "0.4.6" num-integer = "0.1.46" num-traits = "0.2" @@ -264,7 +264,7 @@ openssl-probe = "0.2.1" optional = "0.5" parking_lot = "0.12.3" paste = "1.0.15" -pbkdf2 = "0.12" +pbkdf2 = "0.13" pem-rfc7468 = "1.0" pkcs8 = "0.11" proc-macro2 = "1.0.105" @@ -273,8 +273,7 @@ pymath = { version = "0.2.0", features = ["mul_add", "malachite-bigint", "comple pyo3 = "0.28" quote = "1.0.45" radium = "1.1.1" -rand = "0.9" -rand_core = { version = "0.9", features = ["os_rng"] } +rand = "0.10" rapidhash = "4.4.1" result-like = "0.5.0" rustix = { version = "1.1", features = ["event", "param", "system"] } @@ -288,9 +287,10 @@ serde = { package = "serde_core", version = "1.0.225", default-features = false, schannel = "0.1.29" scopeguard = "1" serde-wasm-bindgen = "0.6.5" -sha-1 = "0.10.0" -sha2 = "0.10.2" -sha3 = "0.10.1" +sha1 = "0.11" +sha2 = "0.11" +sha3 = "0.12" +shake = "0.1" siphasher = "1" socket2 = "0.6.3" static_assertions = "1.1" diff --git a/crates/literal/src/float.rs b/crates/literal/src/float.rs index 79caca059..56a2b5429 100644 --- a/crates/literal/src/float.rs +++ b/crates/literal/src/float.rs @@ -425,7 +425,7 @@ pub fn to_hex(value: f64) -> String { #[test] fn test_to_hex() { - use rand::Rng; + use rand::RngExt; assert_eq!(to_hex(f64::from_bits(1)), "0x0.0000000000001p-1022"); assert_eq!(to_hex(f64::from_bits(2)), "0x0.0000000000002p-1022"); assert_eq!(to_hex(-f64::from_bits(1)), "-0x0.0000000000001p-1022"); diff --git a/crates/stdlib/Cargo.toml b/crates/stdlib/Cargo.toml index 454736832..7bf82da98 100644 --- a/crates/stdlib/Cargo.toml +++ b/crates/stdlib/Cargo.toml @@ -61,15 +61,16 @@ pymath = { workspace = true } xml = { workspace = true } # random -rand_core = { workspace = true } +rand = { workspace = true } mt19937 = { workspace = true } # Crypto: digest = { workspace = true } md-5 = { workspace = true } -sha-1 = { workspace = true } +sha1 = { workspace = true } sha2 = { workspace = true } sha3 = { workspace = true } +shake = { workspace = true } blake2 = { workspace = true } hmac = { workspace = true } pbkdf2 = { workspace = true, features = ["hmac"] } diff --git a/crates/stdlib/src/hashlib.rs b/crates/stdlib/src/hashlib.rs index bbe81cc82..c2153b08a 100644 --- a/crates/stdlib/src/hashlib.rs +++ b/crates/stdlib/src/hashlib.rs @@ -18,14 +18,14 @@ pub(crate) mod _hashlib { types::{Constructor, Representable}, }; use blake2::{Blake2b512, Blake2s256}; - use digest::{DynDigest, OutputSizeUser, core_api::BlockSizeUser}; - use digest::{ExtendableOutput, Update}; + use digest::{DynDigest, ExtendableOutput, OutputSizeUser, Update, block_api::BlockSizeUser}; use dyn_clone::{DynClone, clone_trait_object}; - use hmac::Mac; + use hmac::{Hmac, KeyInit, Mac, SimpleHmac}; use md5::Md5; use sha1::Sha1; use sha2::{Sha224, Sha256, Sha384, Sha512}; - use sha3::{Sha3_224, Sha3_256, Sha3_384, Sha3_512, Shake128, Shake256}; + use sha3::{Sha3_224, Sha3_256, Sha3_384, Sha3_512}; + use shake::{Shake128, Shake256}; const HASH_ALGORITHMS: &[&str] = &[ "md5", @@ -767,8 +767,8 @@ pub(crate) mod _hashlib { let msg_data = args.msg.flatten(); macro_rules! make_hmac { - ($hash_ty:ty) => {{ - let mut mac = as Mac>::new_from_slice(&key_buf) + ($hmac:ty, $hash_ty:ty) => {{ + let mut mac = <$hmac>::new_from_slice(&key_buf) .map_err(|_| vm.new_value_error("invalid key length".to_owned()))?; if let Some(ref m) = msg_data { m.with_ref(|bytes| Mac::update(&mut mac, bytes)); @@ -783,16 +783,16 @@ pub(crate) mod _hashlib { } match name.as_str() { - "md5" => make_hmac!(Md5), - "sha1" => make_hmac!(Sha1), - "sha224" => make_hmac!(Sha224), - "sha256" => make_hmac!(Sha256), - "sha384" => make_hmac!(Sha384), - "sha512" => make_hmac!(Sha512), - "sha3_224" => make_hmac!(Sha3_224), - "sha3_256" => make_hmac!(Sha3_256), - "sha3_384" => make_hmac!(Sha3_384), - "sha3_512" => make_hmac!(Sha3_512), + "md5" => make_hmac!(Hmac, Md5), + "sha1" => make_hmac!(Hmac, Sha1), + "sha224" => make_hmac!(Hmac, Sha224), + "sha256" => make_hmac!(Hmac, Sha256), + "sha384" => make_hmac!(Hmac, Sha384), + "sha512" => make_hmac!(Hmac, Sha512), + "sha3_224" => make_hmac!(SimpleHmac, Sha3_224), + "sha3_256" => make_hmac!(SimpleHmac, Sha3_256), + "sha3_384" => make_hmac!(SimpleHmac, Sha3_384), + "sha3_512" => make_hmac!(SimpleHmac, Sha3_512), _ => Err(unsupported_hash(&name, vm)), } } @@ -805,8 +805,8 @@ pub(crate) mod _hashlib { let msg_buf = args.msg.borrow_buf(); macro_rules! do_hmac { - ($hash_ty:ty) => {{ - let mut mac = as Mac>::new_from_slice(&key_buf) + ($hmac:ty) => {{ + let mut mac = <$hmac>::new_from_slice(&key_buf) .map_err(|_| vm.new_value_error("invalid key length".to_owned()))?; Mac::update(&mut mac, &msg_buf); Ok(mac.finalize().into_bytes().to_vec().into()) @@ -814,16 +814,16 @@ pub(crate) mod _hashlib { } match name.as_str() { - "md5" => do_hmac!(Md5), - "sha1" => do_hmac!(Sha1), - "sha224" => do_hmac!(Sha224), - "sha256" => do_hmac!(Sha256), - "sha384" => do_hmac!(Sha384), - "sha512" => do_hmac!(Sha512), - "sha3_224" => do_hmac!(Sha3_224), - "sha3_256" => do_hmac!(Sha3_256), - "sha3_384" => do_hmac!(Sha3_384), - "sha3_512" => do_hmac!(Sha3_512), + "md5" => do_hmac!(Hmac), + "sha1" => do_hmac!(Hmac), + "sha224" => do_hmac!(Hmac), + "sha256" => do_hmac!(Hmac), + "sha384" => do_hmac!(Hmac), + "sha512" => do_hmac!(Hmac), + "sha3_224" => do_hmac!(SimpleHmac), + "sha3_256" => do_hmac!(SimpleHmac), + "sha3_384" => do_hmac!(SimpleHmac), + "sha3_512" => do_hmac!(SimpleHmac), _ => Err(unsupported_hash(&name, vm)), } } @@ -864,6 +864,14 @@ pub(crate) mod _hashlib { }}; } + macro_rules! do_pbkdf2_sha3 { + ($hash_ty:ty) => {{ + pbkdf2::pbkdf2::>(&password_buf, &salt_buf, rounds, &mut dk) + .map_err(|_| vm.new_value_error("invalid key length."))?; + Ok(dk.into()) + }}; + } + match name.as_str() { "md5" => do_pbkdf2!(Md5), "sha1" => do_pbkdf2!(Sha1), @@ -871,10 +879,10 @@ pub(crate) mod _hashlib { "sha256" => do_pbkdf2!(Sha256), "sha384" => do_pbkdf2!(Sha384), "sha512" => do_pbkdf2!(Sha512), - "sha3_224" => do_pbkdf2!(Sha3_224), - "sha3_256" => do_pbkdf2!(Sha3_256), - "sha3_384" => do_pbkdf2!(Sha3_384), - "sha3_512" => do_pbkdf2!(Sha3_512), + "sha3_224" => do_pbkdf2_sha3!(Sha3_224), + "sha3_256" => do_pbkdf2_sha3!(Sha3_256), + "sha3_384" => do_pbkdf2_sha3!(Sha3_384), + "sha3_512" => do_pbkdf2_sha3!(Sha3_512), _ => Err(unsupported_hash(&name, vm)), } } @@ -953,10 +961,13 @@ pub(crate) mod _hashlib { } } - fn block_size(&self) -> usize { + const fn block_size(&self) -> usize { + // https://en.wikipedia.org/wiki/SHA-3#Instances + // SHAKE128: 1344 / 8 = 168 + // SHAKE256: 1088 / 8 = 136 match self { - Self::Shake128(_) => Shake128::block_size(), - Self::Shake256(_) => Shake256::block_size(), + Self::Shake128(_) => 168, + Self::Shake256(_) => 136, } } diff --git a/crates/stdlib/src/random.rs b/crates/stdlib/src/random.rs index 52d45f16b..3f4c4e482 100644 --- a/crates/stdlib/src/random.rs +++ b/crates/stdlib/src/random.rs @@ -8,7 +8,6 @@ mod _random { use crate::vm::{ PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine, builtins::{PyInt, PyTupleRef}, - convert::ToPyException, function::OptionalOption, types::{Constructor, Initializer}, }; @@ -16,7 +15,7 @@ mod _random { use malachite_bigint::{BigInt, BigUint, Sign}; use mt19937::MT19937; use num_traits::{Signed, Zero}; - use rand_core::{RngCore, SeedableRng}; + use rand::{Rng, SeedableRng}; use rustpython_vm::types::DefaultConstructor; #[pyattr] @@ -60,8 +59,7 @@ mod _random { let key = if key.is_empty() { &[0] } else { key.as_slice() }; MT19937::new_with_slice_seed(key) } - None => MT19937::try_from_os_rng() - .map_err(|e| std::io::Error::from(e).to_pyexception(vm))?, + None => MT19937::from_rng(&mut rand::rng()), }; Ok(()) } From 2723ebd81c396c2fa92c7d83a322035776b7ec4b Mon Sep 17 00:00:00 2001 From: Bas Schoenmaeckers <7943856+bschoenmaeckers@users.noreply.github.com> Date: Wed, 3 Jun 2026 11:39:24 +0200 Subject: [PATCH 019/339] Add warning functions to c-api (#8020) --- crates/capi/src/lib.rs | 1 + crates/capi/src/warnings.rs | 134 ++++++++++++++++++++++++++++++++++++ crates/vm/src/warn.rs | 2 +- 3 files changed, 136 insertions(+), 1 deletion(-) create mode 100644 crates/capi/src/warnings.rs diff --git a/crates/capi/src/lib.rs b/crates/capi/src/lib.rs index 99a606783..c1ba7f559 100644 --- a/crates/capi/src/lib.rs +++ b/crates/capi/src/lib.rs @@ -32,6 +32,7 @@ pub mod traceback; pub mod tupleobject; pub mod unicodeobject; mod util; +pub mod warnings; pub mod weakrefobject; /// Get main interpreter of this process. Will be None if it has not been initialized yet. diff --git a/crates/capi/src/warnings.rs b/crates/capi/src/warnings.rs new file mode 100644 index 000000000..22ffd6ab9 --- /dev/null +++ b/crates/capi/src/warnings.rs @@ -0,0 +1,134 @@ +use crate::{PyObject, pystate::with_vm}; +use core::ffi::{CStr, c_char, c_int}; +use rustpython_vm::builtins::{PyType, PyTypeRef}; +use rustpython_vm::warn::{warn, warn_explicit}; +use rustpython_vm::{AsObject, PyResult}; + +fn resolve_warning_category( + vm: &rustpython_vm::VirtualMachine, + category: *mut PyObject, +) -> PyResult { + if category.is_null() { + return Ok(vm.ctx.exceptions.runtime_warning.to_owned()); + }; + + let category = unsafe { &*category } + .try_downcast_ref::(vm)? + .to_owned(); + if !category.fast_issubclass(vm.ctx.exceptions.warning) { + return Err(vm.new_type_error(format!( + "category must be a Warning subclass, not '{}'", + category.class().name() + ))); + } + + Ok(category) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyErr_WarnEx( + category: *mut PyObject, + message: *const c_char, + stack_level: isize, +) -> c_int { + with_vm(|vm| { + let message = unsafe { CStr::from_ptr(message) } + .to_str() + .map_err(|_| vm.new_system_error("warning message is not valid UTF-8"))?; + + let category = resolve_warning_category(vm, category)?; + + warn( + vm.ctx.new_str(message).into(), + Some(category), + stack_level, + None, + vm, + ) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyErr_WarnExplicit( + category: *mut PyObject, + message: *const c_char, + filename: *const c_char, + lineno: c_int, + module: *const c_char, + registry: *mut PyObject, +) -> c_int { + with_vm(|vm| { + let message = unsafe { CStr::from_ptr(message) } + .to_str() + .map_err(|_| vm.new_system_error("warning message is not valid UTF-8"))?; + let filename = unsafe { CStr::from_ptr(filename) } + .to_str() + .map_err(|_| vm.new_system_error("filename is not valid UTF-8"))?; + + let module = unsafe { module.as_ref().map(|ptr| CStr::from_ptr(ptr).to_str()) } + .transpose() + .map_err(|_| vm.new_system_error("module is not valid UTF-8"))? + .map(|module| vm.ctx.new_str(module).into()); + + let category = resolve_warning_category(vm, category)?; + + let registry = unsafe { registry.as_ref() } + .map_or_else(|| vm.ctx.none(), |registry| registry.to_owned()); + + let lineno = usize::try_from(lineno) + .map_err(|_| vm.new_system_error("lineno must be non-negative"))?; + + warn_explicit( + Some(category), + vm.ctx.new_str(message).into(), + vm.ctx.new_str(filename), + lineno, + module, + registry, + None, + None, + vm, + ) + }) +} + +#[cfg(false)] +mod tests { + use pyo3::exceptions::{PyRuntimeWarning, PyUserWarning}; + use pyo3::prelude::*; + use pyo3::types::PyType; + + #[test] + fn warn_ex_works() { + Python::attach(|py| { + let category = py.get_type::(); + PyErr::warn(py, &category, c"warn ex message", 1).unwrap(); + }) + } + + #[test] + fn warn_explicit_works() { + Python::attach(|py| { + let category = py.get_type::(); + PyErr::warn_explicit( + py, + &category, + c"warn explicit message", + c"warnings_test.py", + 7, + Some(c"warnings_test"), + None, + ) + .unwrap(); + }) + } + + #[test] + fn warn_ex_rejects_non_warning_category() { + Python::attach(|py| { + let not_warning = py.get_type::(); + let err = PyErr::warn(py, ¬_warning, c"not warning", 1).unwrap_err(); + assert!(err.is_instance_of::(py)); + }) + } +} diff --git a/crates/vm/src/warn.rs b/crates/vm/src/warn.rs index 39573b180..081a9621b 100644 --- a/crates/vm/src/warn.rs +++ b/crates/vm/src/warn.rs @@ -329,7 +329,7 @@ pub fn warn_with_skip( /// Core warning logic matching `warn_explicit()` in `_warnings.c`. #[allow(clippy::too_many_arguments)] -pub(crate) fn warn_explicit( +pub fn warn_explicit( category: Option, message: PyObjectRef, filename: PyStrRef, From e50b27c29e053afea21218518c9efe9e62a332cd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Jun 2026 18:39:40 +0900 Subject: [PATCH 020/339] Bump github/gh-aw from 0.74.4 to 0.76.1 (#8021) Bumps [github/gh-aw](https://github.com/github/gh-aw) from 0.74.4 to 0.76.1. - [Release notes](https://github.com/github/gh-aw/releases) - [Changelog](https://github.com/github/gh-aw/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/gh-aw/compare/2c1a237d2048b0e2412e7d7528892ea1257840e2...58d1bedbb7200f59c2d224151339e38fd8687d05) --- updated-dependencies: - dependency-name: github/gh-aw dependency-version: 0.76.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/upgrade-pylib.lock.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/upgrade-pylib.lock.yml b/.github/workflows/upgrade-pylib.lock.yml index ec7a12be1..23e6c7ac2 100644 --- a/.github/workflows/upgrade-pylib.lock.yml +++ b/.github/workflows/upgrade-pylib.lock.yml @@ -58,7 +58,7 @@ jobs: comment_repo: "" steps: - name: Setup Scripts - uses: github/gh-aw/actions/setup@2c1a237d2048b0e2412e7d7528892ea1257840e2 # v0.74.4 + uses: github/gh-aw/actions/setup@58d1bedbb7200f59c2d224151339e38fd8687d05 # v0.76.1 with: destination: /opt/gh-aw/actions - name: Check workflow file timestamps @@ -99,7 +99,7 @@ jobs: secret_verification_result: ${{ steps.validate-secret.outputs.verification_result }} steps: - name: Setup Scripts - uses: github/gh-aw/actions/setup@2c1a237d2048b0e2412e7d7528892ea1257840e2 # v0.74.4 + uses: github/gh-aw/actions/setup@58d1bedbb7200f59c2d224151339e38fd8687d05 # v0.76.1 with: destination: /opt/gh-aw/actions - name: Checkout repository @@ -806,7 +806,7 @@ jobs: total_count: ${{ steps.missing_tool.outputs.total_count }} steps: - name: Setup Scripts - uses: github/gh-aw/actions/setup@2c1a237d2048b0e2412e7d7528892ea1257840e2 # v0.74.4 + uses: github/gh-aw/actions/setup@58d1bedbb7200f59c2d224151339e38fd8687d05 # v0.76.1 with: destination: /opt/gh-aw/actions - name: Download agent output artifact @@ -927,7 +927,7 @@ jobs: success: ${{ steps.parse_results.outputs.success }} steps: - name: Setup Scripts - uses: github/gh-aw/actions/setup@2c1a237d2048b0e2412e7d7528892ea1257840e2 # v0.74.4 + uses: github/gh-aw/actions/setup@58d1bedbb7200f59c2d224151339e38fd8687d05 # v0.76.1 with: destination: /opt/gh-aw/actions - name: Download agent artifacts @@ -1039,7 +1039,7 @@ jobs: process_safe_outputs_temporary_id_map: ${{ steps.process_safe_outputs.outputs.temporary_id_map }} steps: - name: Setup Scripts - uses: github/gh-aw/actions/setup@2c1a237d2048b0e2412e7d7528892ea1257840e2 # v0.74.4 + uses: github/gh-aw/actions/setup@58d1bedbb7200f59c2d224151339e38fd8687d05 # v0.76.1 with: destination: /opt/gh-aw/actions - name: Download agent output artifact From 6a8786756cfbd7b376602a254f5d7fedfe30ff3d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Jun 2026 18:40:00 +0900 Subject: [PATCH 021/339] Bump taiki-e/install-action from 2.79.1 to 2.79.9 (#8022) Bumps [taiki-e/install-action](https://github.com/taiki-e/install-action) from 2.79.1 to 2.79.9. - [Release notes](https://github.com/taiki-e/install-action/releases) - [Changelog](https://github.com/taiki-e/install-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/taiki-e/install-action/compare/b550161ef8a7bc4f2a671c0b03a18ac9ccedea1e...8f531eaecd1898bc3da7d104ad91bee98d1b97bd) --- updated-dependencies: - dependency-name: taiki-e/install-action dependency-version: 2.79.9 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/cron-ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cron-ci.yaml b/.github/workflows/cron-ci.yaml index e927ff078..6ed9b6d81 100644 --- a/.github/workflows/cron-ci.yaml +++ b/.github/workflows/cron-ci.yaml @@ -33,7 +33,7 @@ jobs: - uses: dtolnay/rust-toolchain@stable - - uses: taiki-e/install-action@b550161ef8a7bc4f2a671c0b03a18ac9ccedea1e # v2.79.1 + - uses: taiki-e/install-action@8f531eaecd1898bc3da7d104ad91bee98d1b97bd # v2.79.9 with: tool: cargo-llvm-cov From b30002efb99fd90f3b0307f99bc5d9a1ca6cffc9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Jun 2026 18:40:13 +0900 Subject: [PATCH 022/339] Bump the wasmtime group across 1 directory with 3 updates (#8023) Bumps the wasmtime group with 3 updates in the / directory: [cranelift](https://github.com/bytecodealliance/wasmtime), [cranelift-jit](https://github.com/bytecodealliance/wasmtime) and [cranelift-module](https://github.com/bytecodealliance/wasmtime). Updates `cranelift` from 0.131.2 to 0.132.0 - [Release notes](https://github.com/bytecodealliance/wasmtime/releases) - [Changelog](https://github.com/bytecodealliance/wasmtime/blob/main/RELEASES.md) - [Commits](https://github.com/bytecodealliance/wasmtime/commits) Updates `cranelift-jit` from 0.131.2 to 0.132.0 - [Release notes](https://github.com/bytecodealliance/wasmtime/releases) - [Changelog](https://github.com/bytecodealliance/wasmtime/blob/main/RELEASES.md) - [Commits](https://github.com/bytecodealliance/wasmtime/commits) Updates `cranelift-module` from 0.131.2 to 0.132.0 - [Release notes](https://github.com/bytecodealliance/wasmtime/releases) - [Changelog](https://github.com/bytecodealliance/wasmtime/blob/main/RELEASES.md) - [Commits](https://github.com/bytecodealliance/wasmtime/commits) --- updated-dependencies: - dependency-name: cranelift dependency-version: 0.132.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: wasmtime - dependency-name: cranelift-jit dependency-version: 0.132.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: wasmtime - dependency-name: cranelift-module dependency-version: 0.132.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: wasmtime ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 91 +++++++++++++++++++++++++++++++----------------------- Cargo.toml | 6 ++-- 2 files changed, 55 insertions(+), 42 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 985d9083b..c418e0588 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -741,9 +741,9 @@ dependencies = [ [[package]] name = "cranelift" -version = "0.131.2" +version = "0.132.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4df9a80b0e50668699b52cc4a4ffa10e423df6ad4fd0150e3f983efc2bd7e876" +checksum = "f2948a18918ec81f4701e0f94d6b1727ec2cf485f8e32d332eddc466886a279d" dependencies = [ "cranelift-codegen", "cranelift-frontend", @@ -752,27 +752,27 @@ dependencies = [ [[package]] name = "cranelift-assembler-x64" -version = "0.131.2" +version = "0.132.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "008f1a8d1da5074ad858f398775a6d1989031892e46927df5ed18d3be1ed8717" +checksum = "8c80cf55a351448317210f26c434be761bcb25e7b36116ec92f89540b73e2833" dependencies = [ "cranelift-assembler-x64-meta", ] [[package]] name = "cranelift-assembler-x64-meta" -version = "0.131.2" +version = "0.132.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fd76237df1f4e26edb5ad7971d20280ed1e193331fd257f1b4e4dfefd88dda2" +checksum = "07937ca8617b340162fe3a4716be885b5847e9b56d6c7a89abbe4d42340fdc91" dependencies = [ "cranelift-srcgen", ] [[package]] name = "cranelift-bforest" -version = "0.131.2" +version = "0.132.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380f0bc43e535df6855bbee649efb00bde39c3f33434c47c8e10ac836d21bf47" +checksum = "88217b08180882436d54c0133274885c590698ae854e352bede1cda041230800" dependencies = [ "cranelift-entity", "wasmtime-internal-core", @@ -780,18 +780,18 @@ dependencies = [ [[package]] name = "cranelift-bitset" -version = "0.131.2" +version = "0.132.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4811e3e4502de04257e90c0a93225b56d9b85e0f9ad10b81446b415511009610" +checksum = "d5c3cf7ba29fa56e56040848e34835d4e45988b2760ef212413409af95ffd8c1" dependencies = [ "wasmtime-internal-core", ] [[package]] name = "cranelift-codegen" -version = "0.131.2" +version = "0.132.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82ffadb34d497f3e76fb3b4baf764c24ba8a51512976a1b77f78bdbf8f4aa687" +checksum = "ebe1aac2efd4cba2047845fce38a68519935a30e20c8a6294ba7e2f448fe722d" dependencies = [ "bumpalo", "cranelift-assembler-x64", @@ -803,7 +803,7 @@ dependencies = [ "cranelift-entity", "cranelift-isle", "gimli", - "hashbrown 0.16.1", + "hashbrown 0.17.0", "libm", "log", "regalloc2", @@ -816,9 +816,9 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.131.2" +version = "0.132.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4f6992eb6faf086ddc7deaaa5f279abfe7f5fd5ae5709bd38253450fc7b945" +checksum = "0909eaf9d6f18f5bf802d50608cb4368ac340fbd03cc44f2888d1cfcc3faa64e" dependencies = [ "cranelift-assembler-x64-meta", "cranelift-codegen-shared", @@ -828,24 +828,24 @@ dependencies = [ [[package]] name = "cranelift-codegen-shared" -version = "0.131.2" +version = "0.132.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70e1b2aad7d055925a4ea9cdbfa9d1d987f9dfc8ad6b708be28f901ac620a298" +checksum = "c95a8da8be283f49cda7d0ef228c94f10d791e517b27b0c7e282dadd2e79ce45" [[package]] name = "cranelift-control" -version = "0.131.2" +version = "0.132.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89a355348325e0a63b65c00def3871597b9fcc79d25456397010d16d872b3772" +checksum = "f5b19c81145146da1f7afda2e7f52111842fe6793512e740ad5cf3f5639e6212" dependencies = [ "arbitrary", ] [[package]] name = "cranelift-entity" -version = "0.131.2" +version = "0.132.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f4847d93ce2c80d2bff929aa1004dfb3ce2cf5d881f6ced54b8d654d967ba3" +checksum = "4a55309b47e6633ab05821304206cb1e92952e845b1224985562bb7ac1e92323" dependencies = [ "cranelift-bitset", "wasmtime-internal-core", @@ -853,9 +853,9 @@ dependencies = [ [[package]] name = "cranelift-frontend" -version = "0.131.2" +version = "0.132.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba24e5fe5242cc445e7892ef0a51a4351cf716e3a04ac7a3a05820d056c39818" +checksum = "064d2d3533d9608f1cf44c8899cf2f7f33feb70300b0fb83e687b0d9e7b91147" dependencies = [ "cranelift-codegen", "log", @@ -865,15 +865,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.131.2" +version = "0.132.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89bc2035de85c4f04ba7bd57eb5bd3a8b775235bf28852dbf87105115cb8919a" +checksum = "1ac4e0bc095b2dab2212d1e99d7a74b62afc1485db023f1c0cb34a68758f7bd1" [[package]] name = "cranelift-jit" -version = "0.131.2" +version = "0.132.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bf7a3c46c8b1ba6f4818f0cfe971d0cf875a28c7fded25b9fc0b75acbbb677a" +checksum = "5b48c2a0720c7d62aadd508c662b9bf666b614a47a888589e553e0511620635e" dependencies = [ "anyhow", "cranelift-codegen", @@ -883,6 +883,7 @@ dependencies = [ "cranelift-native", "libc", "log", + "memmap2 0.2.3", "region", "target-lexicon", "wasmtime-internal-jit-icache-coherence", @@ -891,9 +892,9 @@ dependencies = [ [[package]] name = "cranelift-module" -version = "0.131.2" +version = "0.132.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "680bd0df1ea88dc543eaa6aadf326200640be7603c5f36f9d5c1230b784ad8bc" +checksum = "28f05d9efce7a4e8c2ceec49c76d26e53f1ee8cb13de822b6ca5118d48f50976" dependencies = [ "anyhow", "cranelift-codegen", @@ -902,9 +903,9 @@ dependencies = [ [[package]] name = "cranelift-native" -version = "0.131.2" +version = "0.132.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea6630c16921ab087792750f239d0c0173411e80179ca7c0ce0710ce9e7646a" +checksum = "09a40053f5cb925451dd1d57393d14ad3145c8e0786701c27b5415ebb9a3ba4f" dependencies = [ "cranelift-codegen", "libc", @@ -913,9 +914,9 @@ dependencies = [ [[package]] name = "cranelift-srcgen" -version = "0.131.2" +version = "0.132.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faa4bbad54fc28cc0da1f9a5d7f7f826ec8cafda3d503b401b2daaaa93c63ef0" +checksum = "a3ceab9a53f7d362c89841fbaa8e63e44d47c40e91dc96ee6f777fca5d6b323b" [[package]] name = "crc32fast" @@ -1532,6 +1533,9 @@ name = "hashbrown" version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51" +dependencies = [ + "foldhash 0.2.0", +] [[package]] name = "hax-lib" @@ -2341,6 +2345,15 @@ version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" +[[package]] +name = "memmap2" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "723e3ebdcdc5c023db1df315364573789f8857c11b631a2fdfad7c00f5c046b4" +dependencies = [ + "libc", +] + [[package]] name = "memmap2" version = "0.9.10" @@ -3612,7 +3625,7 @@ dependencies = [ "libc", "libffi", "libloading 0.9.0", - "memmap2", + "memmap2 0.9.10", "nix 0.31.3", "num-traits", "num_cpus", @@ -4880,19 +4893,19 @@ dependencies = [ [[package]] name = "wasmtime-internal-core" -version = "44.0.2" +version = "45.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4364d345719bba7fc4c435992ea1cb0c118f1e90a88c6e6f22a7a4fc507700c6" +checksum = "1bdae4b55b15a23d774b15f6e7cd90ae0d0aa17c47c12b4db098b3dd11ba9d58" dependencies = [ - "hashbrown 0.16.1", + "hashbrown 0.17.0", "libm", ] [[package]] name = "wasmtime-internal-jit-icache-coherence" -version = "44.0.2" +version = "45.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3ba98c1492f530833e0d3cc17dbb0c3c57c9f1bb3b078ae44bb55a233e43eba" +checksum = "8a312ba8bb77955dcd44294a223e7f124c3071ff966583d385d3f6a4639c62e3" dependencies = [ "cfg-if", "libc", diff --git a/Cargo.toml b/Cargo.toml index 08463ec02..d41f24e9b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -203,9 +203,9 @@ bzip2 = "0.6" chrono = { version = "0.4.44", default-features = false, features = ["clock", "std"] } console_error_panic_hook = "0.1" constant_time_eq = "0.4" -cranelift = "0.131.2" -cranelift-jit = "0.131.2" -cranelift-module = "0.131.0" +cranelift = "0.132.0" +cranelift-jit = "0.132.0" +cranelift-module = "0.132.0" crc32fast = "1.3.2" criterion = { version = "0.8", features = ["html_reports"] } crossbeam-utils = "0.8.21" From 7f460f64973ab8b1c3e705b05a1c4668559b1d0d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Jun 2026 18:40:25 +0900 Subject: [PATCH 023/339] Bump https://github.com/astral-sh/ruff-pre-commit (#8024) Bumps [https://github.com/astral-sh/ruff-pre-commit](https://github.com/astral-sh/ruff-pre-commit) from v0.15.12 to 0.15.14. - [Release notes](https://github.com/astral-sh/ruff-pre-commit/releases) - [Commits](https://github.com/astral-sh/ruff-pre-commit/compare/v0.15.12...v0.15.14) --- updated-dependencies: - dependency-name: https://github.com/astral-sh/ruff-pre-commit dependency-version: 0.15.14 dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e66122542..db3b9a583 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -10,7 +10,7 @@ repos: priority: 0 - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.15.12 + rev: v0.15.14 hooks: - id: ruff-format priority: 0 From fe6b9e840308d937ebd22fa8922c6b4b818d6481 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Wed, 3 Jun 2026 12:52:32 +0300 Subject: [PATCH 024/339] Update thread related tests to 3.14.5 (#8018) --- Lib/test/test_thread.py | 227 ++++++++++++++++-- Lib/test/test_thread_local_bytecode.py | 198 +++++++++++++++ Lib/test/test_threadedtempfile.py | 7 +- Lib/test/test_threading.py | 318 ++++++++++++++++++++----- Lib/test/test_threading_local.py | 12 +- crates/vm/src/stdlib/_thread.rs | 50 +++- 6 files changed, 724 insertions(+), 88 deletions(-) create mode 100644 Lib/test/test_thread_local_bytecode.py diff --git a/Lib/test/test_thread.py b/Lib/test/test_thread.py index 4ae8a833b..bf04cc536 100644 --- a/Lib/test/test_thread.py +++ b/Lib/test/test_thread.py @@ -5,13 +5,15 @@ from test import support from test.support import threading_helper import _thread as thread import time +import warnings import weakref from test import lock_tests +threading_helper.requires_working_threading(module=True) + NUMTASKS = 10 NUMTRIPS = 3 -POLL_SLEEP = 0.010 # seconds = 10 ms _print_mutex = thread.allocate_lock() @@ -74,6 +76,14 @@ class ThreadRunningTests(BasicThreadTest): thread.stack_size(0) self.assertEqual(thread.stack_size(), 0, "stack_size not reset to default") + with self.assertRaises(ValueError): + # 123 bytes is too small + thread.stack_size(123) + + with self.assertRaises(ValueError): + # size must be positive + thread.stack_size(-4096) + @unittest.skipIf(os.name not in ("nt", "posix"), 'test meant for nt and posix') def test_nt_and_posix_stack_size(self): try: @@ -119,22 +129,28 @@ class ThreadRunningTests(BasicThreadTest): with threading_helper.wait_threads_exit(): thread.start_new_thread(task, ()) - while not started: - time.sleep(POLL_SLEEP) + for _ in support.sleeping_retry(support.LONG_TIMEOUT): + if started: + break self.assertEqual(thread._count(), orig + 1) + # Allow the task to finish. mut.release() + # The only reliable way to be sure that the thread ended from the - # interpreter's point of view is to wait for the function object to be - # destroyed. + # interpreter's point of view is to wait for the function object to + # be destroyed. done = [] wr = weakref.ref(task, lambda _: done.append(None)) del task - while not done: - time.sleep(POLL_SLEEP) + + for _ in support.sleeping_retry(support.LONG_TIMEOUT): + if done: + break support.gc_collect() # For PyPy or other GCs. self.assertEqual(thread._count(), orig) + @unittest.expectedFailure # TODO: RUSTPYTHON def test_unraisable_exception(self): def task(): started.release() @@ -148,11 +164,190 @@ class ThreadRunningTests(BasicThreadTest): started.acquire() self.assertEqual(str(cm.unraisable.exc_value), "task failed") - self.assertIs(cm.unraisable.object, task) + self.assertIsNone(cm.unraisable.object) self.assertEqual(cm.unraisable.err_msg, - "Exception ignored in thread started by") + f"Exception ignored in thread started by {task!r}") self.assertIsNotNone(cm.unraisable.exc_traceback) + def test_join_thread(self): + finished = [] + + def task(): + time.sleep(0.05) + finished.append(thread.get_ident()) + + with threading_helper.wait_threads_exit(): + handle = thread.start_joinable_thread(task) + handle.join() + self.assertEqual(len(finished), 1) + self.assertEqual(handle.ident, finished[0]) + + def test_join_thread_already_exited(self): + def task(): + pass + + with threading_helper.wait_threads_exit(): + handle = thread.start_joinable_thread(task) + time.sleep(0.05) + handle.join() + + def test_join_several_times(self): + def task(): + pass + + with threading_helper.wait_threads_exit(): + handle = thread.start_joinable_thread(task) + handle.join() + # Subsequent join() calls should succeed + handle.join() + + def test_joinable_not_joined(self): + handle_destroyed = thread.allocate_lock() + handle_destroyed.acquire() + + def task(): + handle_destroyed.acquire() + + with threading_helper.wait_threads_exit(): + handle = thread.start_joinable_thread(task) + del handle + handle_destroyed.release() + + def test_join_from_self(self): + errors = [] + handles = [] + start_joinable_thread_returned = thread.allocate_lock() + start_joinable_thread_returned.acquire() + task_tried_to_join = thread.allocate_lock() + task_tried_to_join.acquire() + + def task(): + start_joinable_thread_returned.acquire() + try: + handles[0].join() + except Exception as e: + errors.append(e) + finally: + task_tried_to_join.release() + + with threading_helper.wait_threads_exit(): + handle = thread.start_joinable_thread(task) + handles.append(handle) + start_joinable_thread_returned.release() + # Can still join after joining failed in other thread + task_tried_to_join.acquire() + handle.join() + + assert len(errors) == 1 + with self.assertRaisesRegex(RuntimeError, "Cannot join current thread"): + raise errors[0] + + def test_join_then_self_join(self): + # make sure we can't deadlock in the following scenario with + # threads t0 and t1 (see comment in `ThreadHandle_join()` for more + # details): + # + # - t0 joins t1 + # - t1 self joins + def make_lock(): + lock = thread.allocate_lock() + lock.acquire() + return lock + + error = None + self_joiner_handle = None + self_joiner_started = make_lock() + self_joiner_barrier = make_lock() + def self_joiner(): + nonlocal error + + self_joiner_started.release() + self_joiner_barrier.acquire() + + try: + self_joiner_handle.join() + except Exception as e: + error = e + + joiner_started = make_lock() + def joiner(): + joiner_started.release() + self_joiner_handle.join() + + with threading_helper.wait_threads_exit(): + self_joiner_handle = thread.start_joinable_thread(self_joiner) + # Wait for the self-joining thread to start + self_joiner_started.acquire() + + # Start the thread that joins the self-joiner + joiner_handle = thread.start_joinable_thread(joiner) + + # Wait for the joiner to start + joiner_started.acquire() + + # Not great, but I don't think there's a deterministic way to make + # sure that the self-joining thread has been joined. + time.sleep(0.1) + + # Unblock the self-joiner + self_joiner_barrier.release() + + self_joiner_handle.join() + joiner_handle.join() + + with self.assertRaisesRegex(RuntimeError, "Cannot join current thread"): + raise error + + def test_join_with_timeout(self): + lock = thread.allocate_lock() + lock.acquire() + + def thr(): + lock.acquire() + + with threading_helper.wait_threads_exit(): + handle = thread.start_joinable_thread(thr) + handle.join(0.1) + self.assertFalse(handle.is_done()) + lock.release() + handle.join() + self.assertTrue(handle.is_done()) + + def test_join_unstarted(self): + handle = thread._ThreadHandle() + with self.assertRaisesRegex(RuntimeError, "thread not started"): + handle.join() + + def test_set_done_unstarted(self): + handle = thread._ThreadHandle() + with self.assertRaisesRegex(RuntimeError, "thread not started"): + handle._set_done() + + @unittest.skipIf(__import__("sys").platform == "linux", "TODO: RUSTPYTHON; panic") + def test_start_duplicate_handle(self): + lock = thread.allocate_lock() + lock.acquire() + + def func(): + lock.acquire() + + handle = thread._ThreadHandle() + with threading_helper.wait_threads_exit(): + thread.start_joinable_thread(func, handle=handle) + with self.assertRaisesRegex(RuntimeError, "thread already started"): + thread.start_joinable_thread(func, handle=handle) + lock.release() + handle.join() + + @unittest.skipIf(__import__("sys").platform == "linux", "TODO: RUSTPYTHON; panic") + def test_start_with_none_handle(self): + def func(): + pass + + with threading_helper.wait_threads_exit(): + handle = thread.start_joinable_thread(func, handle=None) + handle.join() + class Barrier: def __init__(self, num_threads): @@ -224,7 +419,7 @@ class TestForkInThread(unittest.TestCase): def setUp(self): self.read_fd, self.write_fd = os.pipe() - @unittest.skipUnless(hasattr(os, 'fork'), 'need os.fork') + @support.requires_fork() @threading_helper.reap_threads def test_forkinthread(self): pid = None @@ -232,11 +427,13 @@ class TestForkInThread(unittest.TestCase): def fork_thread(read_fd, write_fd): nonlocal pid - # fork in a thread - pid = os.fork() - if pid: - # parent process - return + # Ignore the warning about fork with threads. + with warnings.catch_warnings(category=DeprecationWarning, + action="ignore"): + # fork in a thread (DANGER, undefined per POSIX) + if (pid := os.fork()): + # parent process + return # child process try: diff --git a/Lib/test/test_thread_local_bytecode.py b/Lib/test/test_thread_local_bytecode.py new file mode 100644 index 000000000..d5c56db8d --- /dev/null +++ b/Lib/test/test_thread_local_bytecode.py @@ -0,0 +1,198 @@ +"""Tests for thread-local bytecode.""" +import textwrap +import unittest + +from test import support +from test.support import cpython_only, import_helper, requires_specialization_ft +from test.support.script_helper import assert_python_ok +from test.support.threading_helper import requires_working_threading + +# Skip this test if the _testinternalcapi module isn't available +_testinternalcapi = import_helper.import_module("_testinternalcapi") + + +@cpython_only +@requires_working_threading() +@unittest.skipUnless(support.Py_GIL_DISABLED, "only in free-threaded builds") +class TLBCTests(unittest.TestCase): + @requires_specialization_ft + def test_new_threads_start_with_unspecialized_code(self): + code = textwrap.dedent(""" + import dis + import queue + import threading + + from _testinternalcapi import get_tlbc + + def all_opnames(bc): + return {i.opname for i in dis._get_instructions_bytes(bc)} + + def f(a, b, q=None): + if q is not None: + q.put(get_tlbc(f)) + return a + b + + for _ in range(100): + # specialize + f(1, 2) + + q = queue.Queue() + t = threading.Thread(target=f, args=('a', 'b', q)) + t.start() + t.join() + + assert "BINARY_OP_ADD_INT" in all_opnames(get_tlbc(f)) + assert "BINARY_OP_ADD_INT" not in all_opnames(q.get()) + """) + assert_python_ok("-X", "tlbc=1", "-c", code) + + @requires_specialization_ft + def test_threads_specialize_independently(self): + code = textwrap.dedent(""" + import dis + import queue + import threading + + from _testinternalcapi import get_tlbc + + def all_opnames(bc): + return {i.opname for i in dis._get_instructions_bytes(bc)} + + def f(a, b): + return a + b + + def g(a, b, q=None): + for _ in range(100): + f(a, b) + if q is not None: + q.put(get_tlbc(f)) + + # specialize in main thread + g(1, 2) + + # specialize in other thread + q = queue.Queue() + t = threading.Thread(target=g, args=('a', 'b', q)) + t.start() + t.join() + + assert "BINARY_OP_ADD_INT" in all_opnames(get_tlbc(f)) + t_opnames = all_opnames(q.get()) + assert "BINARY_OP_ADD_INT" not in t_opnames + assert "BINARY_OP_ADD_UNICODE" in t_opnames + """) + assert_python_ok("-X", "tlbc=1", "-c", code) + + def test_reuse_tlbc_across_threads_different_lifetimes(self): + code = textwrap.dedent(""" + import queue + import threading + + from _testinternalcapi import get_tlbc_id + + def f(a, b, q=None): + if q is not None: + q.put(get_tlbc_id(f)) + return a + b + + q = queue.Queue() + tlbc_ids = [] + for _ in range(3): + t = threading.Thread(target=f, args=('a', 'b', q)) + t.start() + t.join() + tlbc_ids.append(q.get()) + + assert tlbc_ids[0] == tlbc_ids[1] + assert tlbc_ids[1] == tlbc_ids[2] + """) + assert_python_ok("-X", "tlbc=1", "-c", code) + + @support.skip_if_sanitizer("gh-129752: data race on adaptive counter", thread=True) + def test_no_copies_if_tlbc_disabled(self): + code = textwrap.dedent(""" + import queue + import threading + + from _testinternalcapi import get_tlbc_id + + def f(a, b, q=None): + if q is not None: + q.put(get_tlbc_id(f)) + return a + b + + q = queue.Queue() + threads = [] + for _ in range(3): + t = threading.Thread(target=f, args=('a', 'b', q)) + t.start() + threads.append(t) + + tlbc_ids = [] + for t in threads: + t.join() + tlbc_ids.append(q.get()) + + main_tlbc_id = get_tlbc_id(f) + assert main_tlbc_id is not None + assert tlbc_ids[0] == main_tlbc_id + assert tlbc_ids[1] == main_tlbc_id + assert tlbc_ids[2] == main_tlbc_id + """) + assert_python_ok("-X", "tlbc=0", "-c", code) + + def test_no_specialization_if_tlbc_disabled(self): + code = textwrap.dedent(""" + import dis + import queue + import threading + + from _testinternalcapi import get_tlbc + + def all_opnames(f): + bc = get_tlbc(f) + return {i.opname for i in dis._get_instructions_bytes(bc)} + + def f(a, b): + return a + b + + for _ in range(100): + f(1, 2) + + assert "BINARY_OP_ADD_INT" not in all_opnames(f) + """) + assert_python_ok("-X", "tlbc=0", "-c", code) + + def test_generator_throw(self): + code = textwrap.dedent(""" + import queue + import threading + + from _testinternalcapi import get_tlbc_id + + def g(): + try: + yield + except: + yield get_tlbc_id(g) + + def f(q): + gen = g() + next(gen) + q.put(gen.throw(ValueError)) + + q = queue.Queue() + t = threading.Thread(target=f, args=(q,)) + t.start() + t.join() + + gen = g() + next(gen) + main_id = gen.throw(ValueError) + assert main_id != q.get() + """) + assert_python_ok("-X", "tlbc=1", "-c", code) + + +if __name__ == "__main__": + unittest.main() diff --git a/Lib/test/test_threadedtempfile.py b/Lib/test/test_threadedtempfile.py index 12feb465d..acb427b0c 100644 --- a/Lib/test/test_threadedtempfile.py +++ b/Lib/test/test_threadedtempfile.py @@ -15,14 +15,14 @@ provoking a 2.0 failure under Linux. import tempfile +from test import support from test.support import threading_helper import unittest import io import threading from traceback import print_exc -import sys # XXX: RUSTPYTHON - +threading_helper.requires_working_threading(module=True) NUM_THREADS = 20 FILES_PER_THREAD = 50 @@ -50,7 +50,8 @@ class TempFileGreedy(threading.Thread): class ThreadedTempFileTest(unittest.TestCase): - def test_main(self): + @support.bigmemtest(size=NUM_THREADS, memuse=60*2**20, dry_run=False) + def test_main(self, size): threads = [TempFileGreedy() for i in range(NUM_THREADS)] with threading_helper.start_threads(threads, startEvent.set): pass diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py index 17693ae09..5bee24cc7 100644 --- a/Lib/test/test_threading.py +++ b/Lib/test/test_threading.py @@ -5,7 +5,7 @@ Tests for the threading module. import test.support from test.support import threading_helper, requires_subprocess, requires_gil_enabled from test.support import verbose, cpython_only, os_helper -from test.support.import_helper import import_module +from test.support.import_helper import ensure_lazy_imports, import_module from test.support.script_helper import assert_python_ok, assert_python_failure from test.support import force_not_colorized @@ -28,7 +28,7 @@ from test import lock_tests from test import support try: - from test.support import interpreters + from concurrent import interpreters except ImportError: interpreters = None @@ -120,6 +120,10 @@ class BaseTestCase(unittest.TestCase): class ThreadTests(BaseTestCase): maxDiff = 9999 + @cpython_only + def test_lazy_import(self): + ensure_lazy_imports("threading", {"functools", "warnings"}) + @cpython_only def test_name(self): def func(): pass @@ -319,7 +323,7 @@ class ThreadTests(BaseTestCase): # PyThreadState_SetAsyncExc() is a CPython-only gimmick, not (currently) # exposed at the Python level. This test relies on ctypes to get at it. - @cpython_only + @unittest.expectedFailure # TODO: RUSTPYTHON def test_PyThreadState_SetAsyncExc(self): ctypes = import_module("ctypes") @@ -408,7 +412,7 @@ class ThreadTests(BaseTestCase): t.join() # else the thread is still running, and we have no way to kill it - @unittest.skip('TODO: RUSTPYTHON; threading._start_new_thread not exposed') + @unittest.skip("TODO: RUSTPYTHON; threading._start_new_thread not exposed") def test_limbo_cleanup(self): # Issue 7481: Failure to start thread should cleanup the limbo map. def fail_new_thread(*args, **kwargs): @@ -424,7 +428,7 @@ class ThreadTests(BaseTestCase): finally: threading._start_joinable_thread = _start_joinable_thread - @unittest.expectedFailure # TODO: RUSTPYTHON; ctypes.pythonapi is not supported + @unittest.expectedFailure # TODO: RUSTPYTHON; ctypes.pythonapi is not supported def test_finalize_running_thread(self): # Issue 1402: the PyGILState_Ensure / _Release functions may be called # very late on python exit: on deallocation of a running thread for @@ -681,7 +685,7 @@ class ThreadTests(BaseTestCase): self.assertEqual(out, b'') self.assertEqual(err, b'') - @unittest.skip('TODO: RUSTPYTHON; flaky') + @unittest.skip("TODO: RUSTPYTHON; flaky") @skip_unless_reliable_fork def test_is_alive_after_fork(self): # Try hard to trigger #18418: is_alive() could sometimes be True on @@ -745,7 +749,7 @@ class ThreadTests(BaseTestCase): "main ident True\n" "current is main True\n") - @unittest.skip("TODO: RUSTPYTHON flaky; process timeout after fork") + @unittest.skip("TODO: RUSTPYTHON; flaky; process timeout after fork") @skip_unless_reliable_fork @unittest.skipUnless(hasattr(os, 'waitpid'), "test needs os.waitpid()") def test_main_thread_after_fork_from_nonmain_thread(self): @@ -1016,7 +1020,7 @@ class ThreadTests(BaseTestCase): finally: threading.settrace(old_trace) - @unittest.expectedFailure # TODO: RUSTPYTHON + @unittest.expectedFailure # TODO: RUSTPYTHON def test_gettrace_all_threads(self): def fn(*args): pass old_trace = threading.gettrace() @@ -1055,7 +1059,7 @@ class ThreadTests(BaseTestCase): finally: threading.setprofile(old_profile) - @unittest.expectedFailure # TODO: RUSTPYTHON + @unittest.expectedFailure # TODO: RUSTPYTHON def test_getprofile_all_threads(self): def fn(*args): pass old_profile = threading.getprofile() @@ -1179,6 +1183,78 @@ class ThreadTests(BaseTestCase): self.assertEqual(out.strip(), b"OK") self.assertIn(b"can't create new thread at interpreter shutdown", err) + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_join_daemon_thread_in_finalization(self): + # gh-123940: Py_Finalize() prevents other threads from running Python + # code, so join() can not succeed unless the thread is already done. + # (Non-Python threads, that is `threading._DummyThread`, can't be + # joined at all.) + # We raise an exception rather than hang. + for timeout in (None, 10): + with self.subTest(timeout=timeout): + code = textwrap.dedent(f""" + import threading + + + def loop(): + while True: + pass + + + class Cycle: + def __init__(self): + self.self_ref = self + self.thr = threading.Thread( + target=loop, daemon=True) + self.thr.start() + + def __del__(self): + assert self.thr.is_alive() + try: + self.thr.join(timeout={timeout}) + except PythonFinalizationError: + assert self.thr.is_alive() + print('got the correct exception!') + + # Cycle holds a reference to itself, which ensures it is + # cleaned up during the GC that runs after daemon threads + # have been forced to exit during finalization. + Cycle() + """) + rc, out, err = assert_python_ok("-c", code) + self.assertEqual(err, b"") + self.assertIn(b"got the correct exception", out) + + def test_join_finished_daemon_thread_in_finalization(self): + # (see previous test) + # If the thread is already finished, join() succeeds. + code = textwrap.dedent(""" + import threading + done = threading.Event() + + def set_event(): + done.set() + + class Cycle: + def __init__(self): + self.self_ref = self + self.thr = threading.Thread(target=set_event, daemon=True) + self.thr.start() + self.thr.join() + + def __del__(self): + assert done.is_set() + assert not self.thr.is_alive() + self.thr.join() + assert not self.thr.is_alive() + print('all clear!') + + Cycle() + """) + rc, out, err = assert_python_ok("-c", code) + self.assertEqual(err, b"") + self.assertIn(b"all clear", out) + def test_start_new_thread_failed(self): # gh-109746: if Python fails to start newly created thread # due to failure of underlying PyThread_start_new_thread() call, @@ -1214,36 +1290,6 @@ class ThreadTests(BaseTestCase): self.assertEqual(out, b'ok') self.assertEqual(err, b'') - - @skip_unless_reliable_fork - @unittest.skipUnless(hasattr(threading, 'get_native_id'), "test needs threading.get_native_id()") - def test_native_id_after_fork(self): - script = """if True: - import threading - import os - from test import support - - parent_thread_native_id = threading.current_thread().native_id - print(parent_thread_native_id, flush=True) - assert parent_thread_native_id == threading.get_native_id() - childpid = os.fork() - if childpid == 0: - print(threading.current_thread().native_id, flush=True) - assert threading.current_thread().native_id == threading.get_native_id() - else: - try: - assert parent_thread_native_id == threading.current_thread().native_id - assert parent_thread_native_id == threading.get_native_id() - finally: - support.wait_process(childpid, exitcode=0) - """ - rc, out, err = assert_python_ok('-c', script) - self.assertEqual(rc, 0) - self.assertEqual(err, b"") - native_ids = out.strip().splitlines() - self.assertEqual(len(native_ids), 2) - self.assertNotEqual(native_ids[0], native_ids[1]) - @cpython_only def test_finalize_daemon_thread_hang(self): if support.check_sanitizer(thread=True, memory=True): @@ -1314,11 +1360,66 @@ class ThreadTests(BaseTestCase): ''') assert_python_ok("-c", script) - @unittest.skip('TODO: RUSTPYTHON; Thread._tstate_lock not implemented') + @skip_unless_reliable_fork + @unittest.skipUnless(hasattr(threading, 'get_native_id'), "test needs threading.get_native_id()") + def test_native_id_after_fork(self): + script = """if True: + import threading + import os + from test import support + + parent_thread_native_id = threading.current_thread().native_id + print(parent_thread_native_id, flush=True) + assert parent_thread_native_id == threading.get_native_id() + childpid = os.fork() + if childpid == 0: + print(threading.current_thread().native_id, flush=True) + assert threading.current_thread().native_id == threading.get_native_id() + else: + try: + assert parent_thread_native_id == threading.current_thread().native_id + assert parent_thread_native_id == threading.get_native_id() + finally: + support.wait_process(childpid, exitcode=0) + """ + rc, out, err = assert_python_ok('-c', script) + self.assertEqual(rc, 0) + self.assertEqual(err, b"") + native_ids = out.strip().splitlines() + self.assertEqual(len(native_ids), 2) + self.assertNotEqual(native_ids[0], native_ids[1]) + + def test_stop_the_world_during_finalization(self): + # gh-137433: Test functions that trigger a stop-the-world in the free + # threading build concurrent with interpreter finalization. + script = """if True: + import gc + import sys + import threading + NUM_THREADS = 5 + b = threading.Barrier(NUM_THREADS + 1) + def run_in_bg(): + b.wait() + while True: + sys.setprofile(None) + gc.collect() + + for _ in range(NUM_THREADS): + t = threading.Thread(target=run_in_bg, daemon=True) + t.start() + + b.wait() + print("Exiting...") + """ + rc, out, err = assert_python_ok('-c', script) + self.assertEqual(rc, 0) + self.assertEqual(err, b"") + self.assertEqual(out.strip(), b"Exiting...") + + @unittest.skip("TODO: RUSTPYTHON; Thread._tstate_lock not implemented") def test_tstate_lock(self): return super().test_tstate_lock() - class ThreadJoinOnShutdown(BaseTestCase): def _run_and_join(self, script): @@ -1370,7 +1471,7 @@ class ThreadJoinOnShutdown(BaseTestCase): """ self._run_and_join(script) - @unittest.skip('TODO: RUSTPYTHON; flaky test') + @unittest.skip("TODO: RUSTPYTHON; flaky test") @skip_unless_reliable_fork def test_3_join_in_forked_from_thread(self): # Like the test above, but fork() was called from a worker thread @@ -1471,8 +1572,7 @@ class ThreadJoinOnShutdown(BaseTestCase): self.assertEqual(out.strip(), b"OK") self.assertEqual(rc, 0) - # TODO: RUSTPYTHON - parking_lot mutex not fork-safe, child may SIGSEGV - @unittest.skip("TODO: RUSTPYTHON - flaky, parking_lot mutex not fork-safe") + @unittest.skip("TODO: RUSTPYTHON; - flaky, parking_lot mutex not fork-safe") @skip_unless_reliable_fork def test_reinit_tls_after_fork(self): # Issue #13817: fork() would deadlock in a multithreaded program with @@ -1537,7 +1637,7 @@ class SubinterpThreadingTests(BaseTestCase): os.set_blocking(r, False) return (r, w) - @unittest.expectedFailure # TODO: RUSTPYTHON + @unittest.expectedFailure # TODO: RUSTPYTHON def test_threads_join(self): # Non-daemon threads should be joined at subinterpreter shutdown # (issue #18808) @@ -1566,7 +1666,7 @@ class SubinterpThreadingTests(BaseTestCase): # The thread was joined properly. self.assertEqual(os.read(r, 1), b"x") - @unittest.expectedFailure # TODO: RUSTPYTHON + @unittest.expectedFailure # TODO: RUSTPYTHON def test_threads_join_2(self): # Same as above, but a delay gets introduced after the thread's # Python code returned but before the thread state is deleted. @@ -1643,6 +1743,7 @@ class SubinterpThreadingTests(BaseTestCase): self.assertEqual(os.read(r_interp, 1), DONE) @cpython_only + @support.skip_if_sanitizer(thread=True, memory=True) def test_daemon_threads_fatal_error(self): import_module("_testcapi") subinterp_code = f"""if 1: @@ -1661,10 +1762,7 @@ class SubinterpThreadingTests(BaseTestCase): _testcapi.run_in_subinterp(%r) """ % (subinterp_code,) - with test.support.SuppressCrashReport(): - rc, out, err = assert_python_failure("-c", script) - self.assertIn("Fatal Python error: Py_EndInterpreter: " - "not the last thread", err.decode()) + assert_python_ok("-c", script) def _check_allowed(self, before_start='', *, allowed=True, @@ -1755,7 +1853,7 @@ class ThreadingExceptionTests(BaseTestCase): lock = threading.Lock() self.assertRaises(RuntimeError, lock.release) - @unittest.skip('TODO: RUSTPYTHON; flaky test') + @unittest.skip("TODO: RUSTPYTHON; flaky test") @requires_subprocess() def test_recursion_limit(self): # Issue 9670 @@ -2139,7 +2237,7 @@ class CRLockTests(lock_tests.RLockTests): CustomRLock(1, b=2) self.assertEqual(warnings_log, []) - @unittest.skip('TODO: RUSTPYTHON; flaky test') + @unittest.skip("TODO: RUSTPYTHON; flaky test") def test_different_thread(self): return super().test_different_thread() @@ -2153,7 +2251,7 @@ class ConditionAsRLockTests(lock_tests.RLockTests): def test_recursion_count(self): self.skipTest("Condition does not expose _recursion_count()") - @unittest.skip('TODO: RUSTPYTHON; flaky test') + @unittest.skip("TODO: RUSTPYTHON; flaky test") def test_different_thread(self): return super().test_different_thread() @@ -2179,6 +2277,118 @@ class MiscTestCase(unittest.TestCase): support.check__all__(self, threading, ('threading', '_thread'), extra=extra, not_exported=not_exported) + @unittest.skipUnless(hasattr(_thread, 'set_name'), "missing _thread.set_name") + @unittest.skipUnless(hasattr(_thread, '_get_name'), "missing _thread._get_name") + def test_set_name(self): + # Ensure main thread name is restored after test + self.addCleanup(_thread.set_name, _thread._get_name()) + + # set_name() limit in bytes + truncate = getattr(_thread, "_NAME_MAXLEN", None) + limit = truncate or 100 + + tests = [ + # test short ASCII name + "CustomName", + + # test short non-ASCII name + "namé€", + + # embedded null character: name is truncated + # at the first null character + "embed\0null", + + # Test long ASCII names (not truncated) + "x" * limit, + + # Test long ASCII names (truncated) + "x" * (limit + 10), + + # Test long non-ASCII name (truncated) + "x" * (limit - 1) + "é€", + + # Test long non-BMP names (truncated) creating surrogate pairs + # on Windows + "x" * (limit - 1) + "\U0010FFFF", + "x" * (limit - 2) + "\U0010FFFF" * 2, + "x" + "\U0001f40d" * limit, + "xx" + "\U0001f40d" * limit, + "xxx" + "\U0001f40d" * limit, + "xxxx" + "\U0001f40d" * limit, + ] + if os_helper.FS_NONASCII: + tests.append(f"nonascii:{os_helper.FS_NONASCII}") + if os_helper.TESTFN_UNENCODABLE: + tests.append(os_helper.TESTFN_UNENCODABLE) + + if sys.platform.startswith("sunos"): + # Use ASCII encoding on Solaris/Illumos/OpenIndiana + encoding = "ascii" + else: + encoding = sys.getfilesystemencoding() + + def work(): + nonlocal work_name + work_name = _thread._get_name() + + for name in tests: + if not support.MS_WINDOWS: + encoded = name.encode(encoding, "replace") + if b'\0' in encoded: + encoded = encoded.split(b'\0', 1)[0] + if truncate is not None: + encoded = encoded[:truncate] + if sys.platform.startswith("sunos"): + expected = encoded.decode("ascii", "surrogateescape") + else: + expected = os.fsdecode(encoded) + else: + size = 0 + chars = [] + for ch in name: + if ord(ch) > 0xFFFF: + size += 2 + else: + size += 1 + if size > truncate: + break + chars.append(ch) + expected = ''.join(chars) + + if '\0' in expected: + expected = expected.split('\0', 1)[0] + + with self.subTest(name=name, expected=expected, thread="main"): + _thread.set_name(name) + self.assertEqual(_thread._get_name(), expected) + + with self.subTest(name=name, expected=expected, thread="worker"): + work_name = None + thread = threading.Thread(target=work, name=name) + thread.start() + thread.join() + self.assertEqual(work_name, expected, + f"{len(work_name)=} and {len(expected)=}") + + @unittest.skipUnless(hasattr(_thread, 'set_name'), "missing _thread.set_name") + @unittest.skipUnless(hasattr(_thread, '_get_name'), "missing _thread._get_name") + def test_change_name(self): + # Change the name of a thread while the thread is running + + name1 = None + name2 = None + def work(): + nonlocal name1, name2 + name1 = _thread._get_name() + threading.current_thread().name = "new name" + name2 = _thread._get_name() + + thread = threading.Thread(target=work, name="name") + thread.start() + thread.join() + self.assertEqual(name1, "name") + self.assertEqual(name2, "new name") + class InterruptMainTests(unittest.TestCase): def check_interrupt_main_with_signal_handler(self, signum): @@ -2204,7 +2414,7 @@ class InterruptMainTests(unittest.TestCase): # Restore original handler signal.signal(signum, handler) - @unittest.skip('TODO: RUSTPYTHON; flaky') + @unittest.skip("TODO: RUSTPYTHON; flaky") @requires_gil_enabled("gh-118433: Flaky due to a longstanding bug") def test_interrupt_main_subthread(self): # Calling start_new_thread with a function that executes interrupt_main diff --git a/Lib/test/test_threading_local.py b/Lib/test/test_threading_local.py index 8d752dbb7..0c805c5b0 100644 --- a/Lib/test/test_threading_local.py +++ b/Lib/test/test_threading_local.py @@ -26,7 +26,7 @@ def target(local, weaklist): class BaseLocalTest: - @unittest.skip('TODO: RUSTPYTHON; flaky test') + @unittest.skip("TODO: RUSTPYTHON; flaky test") def test_local_refs(self): self._local_refs(20) self._local_refs(50) @@ -228,14 +228,14 @@ class BaseLocalTest: class ThreadLocalTest(unittest.TestCase, BaseLocalTest): _local = _thread._local - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: TypeError not raised by _local - def test_arguments(self): - return super().test_arguments() - - @unittest.expectedFailure # TODO: RUSTPYTHON + @unittest.expectedFailure # TODO: RUSTPYTHON def test_cycle_collection(self): return super().test_cycle_collection() + @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: TypeError not raised by _local + def test_arguments(self): + return super().test_arguments() + class PyThreadingLocalTest(unittest.TestCase, BaseLocalTest): _local = _threading_local.local diff --git a/crates/vm/src/stdlib/_thread.rs b/crates/vm/src/stdlib/_thread.rs index 0af8d7add..7291026ed 100644 --- a/crates/vm/src/stdlib/_thread.rs +++ b/crates/vm/src/stdlib/_thread.rs @@ -15,7 +15,7 @@ pub(crate) use _thread::{ pub(crate) mod _thread { use crate::{ AsObject, Py, PyPayload, PyRef, PyResult, VirtualMachine, - builtins::{PyDictRef, PyStr, PyTupleRef, PyType, PyTypeRef, PyUtf8StrRef}, + builtins::{PyDictRef, PyIntRef, PyStr, PyTupleRef, PyType, PyTypeRef, PyUtf8StrRef}, common::wtf8::Wtf8Buf, frame::FrameRef, function::{ArgCallable, FuncArgs, KwArgs, OptionalArg, PySetterValue, TimeoutSeconds}, @@ -50,9 +50,30 @@ pub(crate) mod _thread { #[cfg(target_os = "windows")] const TIMEOUT_MAX_IN_MICROSECONDS: i64 = 0xffffffff * 1_000; + /// [CPython `SYSTEM_PAGE_SIZE`](https://github.com/python/cpython/blob/v3.14.5/Include/internal/pycore_obmalloc.h#L170) + const SYSTEM_PAGE_SIZE: usize = 4 * 1024; + + // TODO: Check for sanitize once https://github.com/rust-lang/rust/issues/39699 is closed + /// [CPython `_PyOS_LOG2_STACK_MARGIN`](https://github.com/python/cpython/blob/v3.14.5/Include/internal/pycore_pythonrun.h#L41-L47) + const PY_OS_LOG2_STACK_MARGIN: u32 = cfg_select! { + debug_assertions => 12, + _ => 11, + }; + + /// [CPython `_PyOS_STACK_MARGIN`](https://github.com/python/cpython/blob/v3.14.5/Include/internal/pycore_pythonrun.h#L48) + const PY_OS_STACK_MARGIN: usize = 1 << PY_OS_LOG2_STACK_MARGIN; + + /// [CPython `_PyOS_STACK_MARGIN_BYTES`](https://github.com/python/cpython/blob/v3.14.5/Include/internal/pycore_pythonrun.h#L49) + const PY_OS_STACK_MARGIN_BYTES: usize = PY_OS_STACK_MARGIN * size_of::<*const ()>(); + + // TODO: Check for sanitize once https://github.com/rust-lang/rust/issues/39699 is closed + /// [CPython `_PyOS_MIN_STACK_SIZE`](https://github.com/python/cpython/blob/v3.14.5/Include/internal/pycore_pythonrun.h#L57-L61) + const PY_OS_MIN_STACK_SIZE: usize = PY_OS_STACK_MARGIN_BYTES * 3; + // this is a value in seconds #[pyattr] const TIMEOUT_MAX: f64 = (TIMEOUT_MAX_IN_MICROSECONDS / 1_000_000) as f64; + #[pyattr] fn error(vm: &VirtualMachine) -> PyTypeRef { vm.ctx.exceptions.runtime_error.to_owned() @@ -76,22 +97,23 @@ pub(crate) mod _thread { Ok(true) } true if timeout < 0.0 => { - Err(vm - .new_value_error("timeout value must be a non-negative number".to_owned())) + Err(vm.new_value_error("timeout value must be a non-negative number")) } true => { if timeout > TIMEOUT_MAX { - return Err(vm.new_overflow_error("timeout value is too large".to_owned())); + return Err(vm.new_overflow_error("timeout value is too large")); } Ok(vm.allow_threads(|| mu.try_lock_for(Duration::from_secs_f64(timeout)))) } - false if timeout != -1.0 => Err(vm - .new_value_error("can't specify a timeout for a non-blocking call".to_owned())), + false if timeout != -1.0 => { + Err(vm.new_value_error("can't specify a timeout for a non-blocking call")) + } false => Ok(mu.try_lock()), } }}; } + macro_rules! repr_lock_impl { ($zelf:expr) => {{ let status = if $zelf.mu.is_locked() { @@ -603,10 +625,18 @@ pub(crate) mod _thread { } #[pyfunction] - fn stack_size(size: OptionalArg, vm: &VirtualMachine) -> usize { - let size = size.unwrap_or(0); - // TODO: do validation on this to make sure it's not too small - vm.state.stacksize.swap(size) + fn stack_size(size: OptionalArg, vm: &VirtualMachine) -> PyResult { + const MIN_SIZE: usize = PY_OS_MIN_STACK_SIZE + SYSTEM_PAGE_SIZE; + + let Ok(size) = size.map_or(Ok(0), |v| v.try_to_primitive(vm)) else { + return Err(vm.new_value_error(format!("size must be at least {MIN_SIZE} bytes"))); + }; + + if size != 0 && size < MIN_SIZE { + return Err(vm.new_value_error(format!("size must be at least {MIN_SIZE} bytes"))); + } + + Ok(vm.state.stacksize.swap(size)) } #[pyfunction] From 5f789c6146497fafa9c4b25775a0b132276c0933 Mon Sep 17 00:00:00 2001 From: Alok Pandey <166419621+alok-108@users.noreply.github.com> Date: Wed, 3 Jun 2026 17:02:24 +0530 Subject: [PATCH 025/339] Fix WASM memory allocation failure (#4989) (#7887) * Fix WASM memory allocation failure (#4989) This commit addresses the unbounded memory allocation issue on WASM targets that caused minimal programs (like  = 1) to fail with ~79MB allocation errors in constrained runtimes like wasmi. The fixes include: 1. Capping the max memory limit at 64MB and restricting stack size to 1MB via linker flags in .cargo/config.toml. 2. Reducing the minimum chunk size of the DataStack from 16KB to 4KB on WASM targets to shrink the initial memory footprint. 3. Adding a wasm-release profile in the root Cargo.toml optimized for size with opt-level = s, LTO enabled, and symbols stripped. * Trigger CI rerun * Address review feedback: add comments, use cfg! for MIN_CHUNK_SIZE * Remove duplicate MIN_CHUNK_SIZE definition * Fix duplicate MIN_CHUNK_SIZE and format for prek lint * Update CI to use wasm-release profile for WASM tests * Remove leftover conflict markers * Clean remaining conflict markers in CI workflow * Clean remaining conflict markers in CI workflow * Trigger CI to pick up new required check * Remove --max-memory flag, keep stack limit only --- .cargo/config.toml | 13 +++++++++++++ .github/workflows/ci.yaml | 7 ++++--- Cargo.toml | 8 ++++++++ crates/vm/src/datastack.rs | 7 ++++++- 4 files changed, 31 insertions(+), 4 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index 635229119..4e54d1d3b 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -6,3 +6,16 @@ rustflags = "-C link-args=-Wl,--stack,8000000" [target.wasm32-unknown-unknown] rustflags = ["--cfg=getrandom_backend=\"wasm_js\""] + +# Enforce a 1 MB stack limit for WASI targets. +# (Runaway heap growth is fixed by the smaller DataStack chunk +# and the size‑optimized wasm‑release profile.) +[target.wasm32-wasip1] +rustflags = [ + "-C", "link-arg=-zstack-size=1048576", +] + +[target.wasm32-wasip2] +rustflags = [ + "-C", "link-arg=-zstack-size=1048576", +] diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 574a0bbb2..357f7510a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -779,11 +779,11 @@ jobs: clang: true - name: build rustpython - run: cargo build --release --target wasm32-wasip1 --no-default-features --features freeze-stdlib,stdlib,stdio,importlib,host_env --verbose + run: cargo build --profile wasm-release --target wasm32-wasip1 --no-default-features --features freeze-stdlib,stdlib,stdio,importlib,host_env --verbose - name: run snippets - run: wasmer run --dir "$(pwd)" target/wasm32-wasip1/release/rustpython.wasm -- "$(pwd)/extra_tests/snippets/stdlib_random.py" + run: wasmer run --dir "$(pwd)" target/wasm32-wasip1/wasm-release/rustpython.wasm -- "$(pwd)/extra_tests/snippets/stdlib_random.py" - name: run cpython unittest - run: wasmer run --dir "$(pwd)" target/wasm32-wasip1/release/rustpython.wasm -- "$(pwd)/Lib/test/test_int.py" + run: wasmer run --dir "$(pwd)" target/wasm32-wasip1/wasm-release/rustpython.wasm -- "$(pwd)/Lib/test/test_int.py" cargo_doc: needs: @@ -820,3 +820,4 @@ jobs: - name: cargo doc run: cargo doc --locked + diff --git a/Cargo.toml b/Cargo.toml index d41f24e9b..21529826b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -117,6 +117,14 @@ opt-level = 3 [profile.release] lto = "thin" +[profile.wasm-release] +inherits = "release" +opt-level = "s" +lto = true +codegen-units = 1 +strip = true +panic = "abort" + [patch.crates-io] parking_lot_core = { git = "https://github.com/youknowone/parking_lot", branch = "rustpython" } # REDOX START, Uncomment when you want to compile/check with redoxer diff --git a/crates/vm/src/datastack.rs b/crates/vm/src/datastack.rs index f2ffb7489..7529263ac 100644 --- a/crates/vm/src/datastack.rs +++ b/crates/vm/src/datastack.rs @@ -9,7 +9,12 @@ use core::alloc::Layout; use core::ptr; /// Minimum chunk size in bytes (`_PY_DATA_STACK_CHUNK_SIZE`). -const MIN_CHUNK_SIZE: usize = 16 * 1024; +/// Smaller on WASM (4 KB) to reduce initial memory footprint; 16 KB otherwise. +const MIN_CHUNK_SIZE: usize = if cfg!(target_arch = "wasm32") { + 4 * 1024 +} else { + 16 * 1024 +}; /// Extra headroom (in bytes) to avoid allocating a new chunk for the next /// frame right after growing. From da99e72771dbcd78de942c9d6395ee0121065b63 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Wed, 3 Jun 2026 16:51:41 +0300 Subject: [PATCH 026/339] Update `test_sys{log,_settrace}.py` to 3.14.5 (#8030) * Update `test_syslog.py` to 3.14.5 * Update `test_sys_settrace.py` to 3.14.5 --- Lib/test/test_sys_settrace.py | 1431 +++++++++++++++++++++++++++++---- Lib/test/test_syslog.py | 67 +- 2 files changed, 1357 insertions(+), 141 deletions(-) diff --git a/Lib/test/test_sys_settrace.py b/Lib/test/test_sys_settrace.py index 7eef1290d..54d31a1b6 100644 --- a/Lib/test/test_sys_settrace.py +++ b/Lib/test/test_sys_settrace.py @@ -6,8 +6,17 @@ import sys import difflib import gc from functools import wraps -import asyncio - +from test.support import import_helper, requires_subprocess, run_no_yield_async_fn +import contextlib +import os +import tempfile +import textwrap +import subprocess +import warnings +try: + import _testinternalcapi +except ImportError: + _testinternalcapi = None class tracecontext: """Context manager that traces its enter and exit.""" @@ -38,6 +47,20 @@ async def asynciter(iterable): for x in iterable: yield x +def clean_asynciter(test): + @wraps(test) + async def wrapper(*args, **kwargs): + cleanups = [] + def wrapped_asynciter(iterable): + it = asynciter(iterable) + cleanups.append(it.aclose) + return it + try: + return await test(*args, **kwargs, asynciter=wrapped_asynciter) + finally: + while cleanups: + await cleanups.pop()() + return wrapper # A very basic example. If this fails, we're in deep trouble. def basic(): @@ -300,6 +323,13 @@ generator_example.events = ([(0, 'call'), [(5, 'line'), (5, 'return')]) +def lineno_matches_lasti(frame): + last_line = None + for start, end, line in frame.f_code.co_lines(): + if start <= frame.f_lasti < end: + last_line = line + return last_line == frame.f_lineno + class Tracer: def __init__(self, trace_line_events=None, trace_opcode_events=None): self.trace_line_events = trace_line_events @@ -313,6 +343,7 @@ class Tracer: frame.f_trace_opcodes = self.trace_opcode_events def trace(self, frame, event, arg): + assert lineno_matches_lasti(frame) self._reconfigure_frame(frame) self.events.append((frame.f_lineno, event)) return self.trace @@ -324,7 +355,6 @@ class Tracer: return self.trace -@unittest.skip("TODO: RUSTPYTHON, gc") class TraceTestCase(unittest.TestCase): # Disable gc collection when tracing, otherwise the @@ -344,7 +374,7 @@ class TraceTestCase(unittest.TestCase): return Tracer() def compare_events(self, line_offset, events, expected_events): - events = [(l - line_offset, e) for (l, e) in events] + events = [(l - line_offset if l is not None else None, e) for (l, e) in events] if events != expected_events: self.fail( "events did not match expectation:\n" + @@ -383,36 +413,51 @@ class TraceTestCase(unittest.TestCase): finally: sys.settrace(None) + @unittest.skip("TODO: RUSTPYTHON") def test_01_basic(self): self.run_test(basic) + @unittest.skip("TODO: RUSTPYTHON") def test_02_arigo0(self): self.run_test(arigo_example0) + @unittest.skip("TODO: RUSTPYTHON") def test_02_arigo1(self): self.run_test(arigo_example1) + @unittest.skip("TODO: RUSTPYTHON") def test_02_arigo2(self): self.run_test(arigo_example2) + @unittest.skip("TODO: RUSTPYTHON") def test_03_one_instr(self): self.run_test(one_instr_line) + @unittest.skip("TODO: RUSTPYTHON") def test_04_no_pop_blocks(self): self.run_test(no_pop_blocks) + @unittest.skip("TODO: RUSTPYTHON") def test_05_no_pop_tops(self): self.run_test(no_pop_tops) + @unittest.skip("TODO: RUSTPYTHON") def test_06_call(self): self.run_test(call) + @unittest.skip("TODO: RUSTPYTHON") def test_07_raise(self): self.run_test(test_raise) + @unittest.skip("TODO: RUSTPYTHON") def test_08_settrace_and_return(self): self.run_test2(settrace_and_return) + @unittest.skip("TODO: RUSTPYTHON") def test_09_settrace_and_raise(self): self.run_test2(settrace_and_raise) + @unittest.skip("TODO: RUSTPYTHON") def test_10_ireturn(self): self.run_test(ireturn_example) + @unittest.skip("TODO: RUSTPYTHON") def test_11_tightloop(self): self.run_test(tightloop_example) + @unittest.skip("TODO: RUSTPYTHON") def test_12_tighterloop(self): self.run_test(tighterloop_example) + @unittest.skip("TODO: RUSTPYTHON") def test_13_genexp(self): self.run_test(generator_example) # issue1265: if the trace function contains a generator, @@ -426,6 +471,7 @@ class TraceTestCase(unittest.TestCase): self.compare_events(generator_example.__code__.co_firstlineno, tracer.events, generator_example.events) + @unittest.skip("TODO: RUSTPYTHON") def test_14_onliner_if(self): def onliners(): if True: x=False @@ -438,6 +484,7 @@ class TraceTestCase(unittest.TestCase): (3, 'line'), (3, 'return')]) + @unittest.skip("TODO: RUSTPYTHON") def test_15_loops(self): # issue1750076: "while" expression is skipped by debugger def for_example(): @@ -469,6 +516,7 @@ class TraceTestCase(unittest.TestCase): (3, 'line'), (3, 'return')]) + @unittest.skip("TODO: RUSTPYTHON") def test_16_blank_lines(self): namespace = {} exec("def f():\n" + "\n" * 256 + " pass", namespace) @@ -478,6 +526,7 @@ class TraceTestCase(unittest.TestCase): (257, 'line'), (257, 'return')]) + @unittest.skip("TODO: RUSTPYTHON") def test_17_none_f_trace(self): # Issue 20041: fix TypeError when f_trace is set to None. def func(): @@ -487,6 +536,7 @@ class TraceTestCase(unittest.TestCase): [(0, 'call'), (1, 'line')]) + @unittest.skip("TODO: RUSTPYTHON") def test_18_except_with_name(self): def func(): try: @@ -511,6 +561,7 @@ class TraceTestCase(unittest.TestCase): (9, 'line'), (9, 'return')]) + @unittest.skip("TODO: RUSTPYTHON") def test_19_except_with_finally(self): def func(): try: @@ -532,6 +583,7 @@ class TraceTestCase(unittest.TestCase): (7, 'line'), (7, 'return')]) + @unittest.expectedFailure # TODO: RUSTPYTHON def test_20_async_for_loop(self): class AsyncIteratorWrapper: def __init__(self, obj): @@ -608,6 +660,60 @@ class TraceTestCase(unittest.TestCase): self.compare_events(doit_async.__code__.co_firstlineno, tracer.events, events) + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_async_for_backwards_jump_has_no_line(self): + async def arange(n): + for i in range(n): + yield i + async def f(): + async for i in arange(3): + if i > 100: + break # should never be traced + + tracer = self.make_tracer() + coro = f() + try: + sys.settrace(tracer.trace) + coro.send(None) + except Exception: + pass + finally: + sys.settrace(None) + + events = [ + (0, 'call'), + (1, 'line'), + (-3, 'call'), + (-2, 'line'), + (-1, 'line'), + (-1, 'return'), + (1, 'exception'), + (2, 'line'), + (1, 'line'), + (-1, 'call'), + (-2, 'line'), + (-1, 'line'), + (-1, 'return'), + (1, 'exception'), + (2, 'line'), + (1, 'line'), + (-1, 'call'), + (-2, 'line'), + (-1, 'line'), + (-1, 'return'), + (1, 'exception'), + (2, 'line'), + (1, 'line'), + (-1, 'call'), + (-2, 'line'), + (-2, 'return'), + (1, 'exception'), + (1, 'return'), + ] + self.compare_events(f.__code__.co_firstlineno, + tracer.events, events) + + @unittest.skip("TODO: RUSTPYTHON") def test_21_repeated_pass(self): def func(): pass @@ -619,6 +725,7 @@ class TraceTestCase(unittest.TestCase): (2, 'line'), (2, 'return')]) + @unittest.skip("TODO: RUSTPYTHON") def test_loop_in_try_except(self): # https://bugs.python.org/issue41670 @@ -636,6 +743,7 @@ class TraceTestCase(unittest.TestCase): (3, 'line'), (3, 'return')]) + @unittest.skip("TODO: RUSTPYTHON") def test_try_except_no_exception(self): def func(): @@ -643,16 +751,62 @@ class TraceTestCase(unittest.TestCase): 2 except: 4 - finally: + else: 6 + if False: + 8 + else: + 10 + if func.__name__ == 'Fred': + 12 + finally: + 14 self.run_and_compare(func, [(0, 'call'), (1, 'line'), (2, 'line'), (6, 'line'), - (6, 'return')]) + (7, 'line'), + (10, 'line'), + (11, 'line'), + (14, 'line'), + (14, 'return')]) + @unittest.skip("TODO: RUSTPYTHON") + def test_try_exception_in_else(self): + + def func(): + try: + try: + 3 + except: + 5 + else: + 7 + raise Exception + finally: + 10 + except: + 12 + finally: + 14 + + self.run_and_compare(func, + [(0, 'call'), + (1, 'line'), + (2, 'line'), + (3, 'line'), + (7, 'line'), + (8, 'line'), + (8, 'exception'), + (10, 'line'), + (11, 'line'), + (12, 'line'), + (14, 'line'), + (14, 'return')]) + + @unittest.skip("TODO: RUSTPYTHON") def test_nested_loops(self): def func(): @@ -679,6 +833,7 @@ class TraceTestCase(unittest.TestCase): (4, 'line'), (4, 'return')]) + @unittest.skip("TODO: RUSTPYTHON") def test_if_break(self): def func(): @@ -704,6 +859,7 @@ class TraceTestCase(unittest.TestCase): (8, 'line'), (8, 'return')]) + @unittest.skip("TODO: RUSTPYTHON") def test_break_through_finally(self): def func(): @@ -736,10 +892,10 @@ class TraceTestCase(unittest.TestCase): (5, 'line'), (6, 'line'), (7, 'line'), - (10, 'line'), - (13, 'line'), - (13, 'return')]) + (10, 'line')] + + ([(13, 'line'), (13, 'return')] if __debug__ else [(10, 'return')])) + @unittest.skip("TODO: RUSTPYTHON") def test_continue_through_finally(self): def func(): @@ -773,10 +929,10 @@ class TraceTestCase(unittest.TestCase): (6, 'line'), (7, 'line'), (10, 'line'), - (3, 'line'), - (13, 'line'), - (13, 'return')]) + (3, 'line')] + + ([(13, 'line'), (13, 'return')] if __debug__ else [(3, 'return')])) + @unittest.skip("TODO: RUSTPYTHON") def test_return_through_finally(self): def func(): @@ -792,25 +948,65 @@ class TraceTestCase(unittest.TestCase): (4, 'line'), (4, 'return')]) + @unittest.skip("TODO: RUSTPYTHON") def test_try_except_with_wrong_type(self): def func(): try: - 2/0 - except IndexError: - 4 - finally: - return 6 + try: + 2/0 + except IndexError: + 5 + finally: + 7 + except: + pass + return 10 self.run_and_compare(func, [(0, 'call'), (1, 'line'), (2, 'line'), - (2, 'exception'), (3, 'line'), - (6, 'line'), - (6, 'return')]) + (3, 'exception'), + (4, 'line'), + (7, 'line'), + (8, 'line'), + (9, 'line'), + (10, 'line'), + (10, 'return')]) + @unittest.skip("TODO: RUSTPYTHON") + def test_finally_with_conditional(self): + + # See gh-105658 + condition = True + def func(): + try: + try: + raise Exception + finally: + if condition: + result = 1 + result = 2 + except: + result = 3 + return result + + self.run_and_compare(func, + [(0, 'call'), + (1, 'line'), + (2, 'line'), + (3, 'line'), + (3, 'exception'), + (5, 'line'), + (6, 'line'), + (8, 'line'), + (9, 'line'), + (10, 'line'), + (10, 'return')]) + + @unittest.skip("TODO: RUSTPYTHON") def test_break_to_continue1(self): def func(): @@ -834,6 +1030,7 @@ class TraceTestCase(unittest.TestCase): (3, 'line'), (3, 'return')]) + @unittest.skip("TODO: RUSTPYTHON") def test_break_to_continue2(self): def func(): @@ -857,6 +1054,7 @@ class TraceTestCase(unittest.TestCase): (3, 'line'), (3, 'return')]) + @unittest.skip("TODO: RUSTPYTHON") def test_break_to_break(self): def func(): @@ -875,6 +1073,7 @@ class TraceTestCase(unittest.TestCase): (5, 'line'), (5, 'return')]) + @unittest.skip("TODO: RUSTPYTHON") def test_nested_ifs(self): def func(): @@ -895,6 +1094,7 @@ class TraceTestCase(unittest.TestCase): (4, 'line'), (4, 'return')]) + @unittest.skip("TODO: RUSTPYTHON") def test_nested_ifs_with_and(self): def func(): @@ -918,6 +1118,7 @@ class TraceTestCase(unittest.TestCase): (3, 'line'), (3, 'return')]) + @unittest.skip("TODO: RUSTPYTHON") def test_nested_try_if(self): def func(): @@ -940,6 +1141,7 @@ class TraceTestCase(unittest.TestCase): (7, 'line'), (7, 'return')]) + @unittest.skip("TODO: RUSTPYTHON") def test_if_false_in_with(self): class C: @@ -966,6 +1168,7 @@ class TraceTestCase(unittest.TestCase): (-2, 'return'), (1, 'return')]) + @unittest.skip("TODO: RUSTPYTHON") def test_if_false_in_try_except(self): def func(): @@ -981,6 +1184,7 @@ class TraceTestCase(unittest.TestCase): (2, 'line'), (2, 'return')]) + @unittest.skip("TODO: RUSTPYTHON") def test_implicit_return_in_class(self): def func(): @@ -1000,6 +1204,7 @@ class TraceTestCase(unittest.TestCase): (3, 'return'), (1, 'return')]) + @unittest.skip("TODO: RUSTPYTHON") def test_try_in_try(self): def func(): try: @@ -1017,6 +1222,49 @@ class TraceTestCase(unittest.TestCase): (3, 'line'), (3, 'return')]) + @unittest.skip("TODO: RUSTPYTHON") + def test_try_in_try_with_exception(self): + + def func(): + try: + try: + raise TypeError + except ValueError as ex: + 5 + except TypeError: + 7 + + self.run_and_compare(func, + [(0, 'call'), + (1, 'line'), + (2, 'line'), + (3, 'line'), + (3, 'exception'), + (4, 'line'), + (6, 'line'), + (7, 'line'), + (7, 'return')]) + + def func(): + try: + try: + raise ValueError + except ValueError as ex: + 5 + except TypeError: + 7 + + self.run_and_compare(func, + [(0, 'call'), + (1, 'line'), + (2, 'line'), + (3, 'line'), + (3, 'exception'), + (4, 'line'), + (5, 'line'), + (5, 'return')]) + + @unittest.skip("TODO: RUSTPYTHON") def test_if_in_if_in_if(self): def func(a=0, p=1, z=1): if p: @@ -1034,6 +1282,7 @@ class TraceTestCase(unittest.TestCase): (2, 'line'), (2, 'return')]) + @unittest.skip("TODO: RUSTPYTHON") def test_early_exit_with(self): class C: @@ -1080,6 +1329,7 @@ class TraceTestCase(unittest.TestCase): (-8, 'return'), (1, 'return')]) + @unittest.skip("TODO: RUSTPYTHON") def test_flow_converges_on_same_line(self): def foo(x): @@ -1116,6 +1366,7 @@ class TraceTestCase(unittest.TestCase): (1, 'line'), (1, 'return')]) + @unittest.skip("TODO: RUSTPYTHON") def test_no_tracing_of_named_except_cleanup(self): def func(): @@ -1138,6 +1389,467 @@ class TraceTestCase(unittest.TestCase): (7, 'line'), (7, 'return')]) + @unittest.skip("TODO: RUSTPYTHON") + def test_tracing_exception_raised_in_with(self): + + class NullCtx: + def __enter__(self): + return self + def __exit__(self, *excinfo): + pass + + def func(): + try: + with NullCtx(): + 1/0 + except ZeroDivisionError: + pass + + self.run_and_compare(func, + [(0, 'call'), + (1, 'line'), + (2, 'line'), + (-5, 'call'), + (-4, 'line'), + (-4, 'return'), + (3, 'line'), + (3, 'exception'), + (2, 'line'), + (-3, 'call'), + (-2, 'line'), + (-2, 'return'), + (4, 'line'), + (5, 'line'), + (5, 'return')]) + + @unittest.skip("TODO: RUSTPYTHON") + def test_try_except_star_no_exception(self): + + def func(): + try: + 2 + except* Exception: + 4 + else: + 6 + if False: + 8 + else: + 10 + if func.__name__ == 'Fred': + 12 + finally: + 14 + + self.run_and_compare(func, + [(0, 'call'), + (1, 'line'), + (2, 'line'), + (6, 'line'), + (7, 'line'), + (10, 'line'), + (11, 'line'), + (14, 'line'), + (14, 'return')]) + + @unittest.skip("TODO: RUSTPYTHON") + def test_try_except_star_named_no_exception(self): + + def func(): + try: + 2 + except* Exception as e: + 4 + else: + 6 + finally: + 8 + + self.run_and_compare(func, + [(0, 'call'), + (1, 'line'), + (2, 'line'), + (6, 'line'), + (8, 'line'), + (8, 'return')]) + + @unittest.skip("TODO: RUSTPYTHON") + def test_try_except_star_exception_caught(self): + + def func(): + try: + raise ValueError(2) + except* ValueError: + 4 + else: + 6 + finally: + 8 + + self.run_and_compare(func, + [(0, 'call'), + (1, 'line'), + (2, 'line'), + (2, 'exception'), + (3, 'line'), + (4, 'line'), + (8, 'line'), + (8, 'return')]) + + @unittest.skip("TODO: RUSTPYTHON") + def test_try_except_star_named_exception_caught(self): + + def func(): + try: + raise ValueError(2) + except* ValueError as e: + 4 + else: + 6 + finally: + 8 + + self.run_and_compare(func, + [(0, 'call'), + (1, 'line'), + (2, 'line'), + (2, 'exception'), + (3, 'line'), + (4, 'line'), + (8, 'line'), + (8, 'return')]) + + @unittest.skip("TODO: RUSTPYTHON") + def test_try_except_star_exception_not_caught(self): + + def func(): + try: + try: + raise ValueError(3) + except* TypeError: + 5 + except ValueError: + 7 + + self.run_and_compare(func, + [(0, 'call'), + (1, 'line'), + (2, 'line'), + (3, 'line'), + (3, 'exception'), + (4, 'line'), + (6, 'line'), + (7, 'line'), + (7, 'return')]) + + @unittest.skip("TODO: RUSTPYTHON") + def test_try_except_star_named_exception_not_caught(self): + + def func(): + try: + try: + raise ValueError(3) + except* TypeError as e: + 5 + except ValueError: + 7 + + self.run_and_compare(func, + [(0, 'call'), + (1, 'line'), + (2, 'line'), + (3, 'line'), + (3, 'exception'), + (4, 'line'), + (6, 'line'), + (7, 'line'), + (7, 'return')]) + + @unittest.skip("TODO: RUSTPYTHON") + def test_try_except_star_nested(self): + + def func(): + try: + try: + raise ExceptionGroup( + 'eg', + [ValueError(5), TypeError('bad type')]) + except* TypeError as e: + 7 + except* OSError: + 9 + except* ValueError: + raise + except* ValueError: + try: + raise TypeError(14) + except* OSError: + 16 + except* TypeError as e: + 18 + return 0 + + self.run_and_compare(func, + [(0, 'call'), + (1, 'line'), + (2, 'line'), + (3, 'line'), + (4, 'line'), + (5, 'line'), + (3, 'line'), + (3, 'exception'), + (6, 'line'), + (7, 'line'), + (8, 'line'), + (10, 'line'), + (11, 'line'), + (12, 'line'), + (13, 'line'), + (14, 'line'), + (14, 'exception'), + (15, 'line'), + (17, 'line'), + (18, 'line'), + (19, 'line'), + (19, 'return')]) + + @unittest.skip("TODO: RUSTPYTHON") + def test_notrace_lambda(self): + #Regression test for issue 46314 + + def func(): + 1 + lambda x: 2 + 3 + + self.run_and_compare(func, + [(0, 'call'), + (1, 'line'), + (2, 'line'), + (3, 'line'), + (3, 'return')]) + + @unittest.skip("TODO: RUSTPYTHON") + def test_class_creation_with_docstrings(self): + + def func(): + class Class_1: + ''' the docstring. 2''' + def __init__(self): + ''' Another docstring. 4''' + self.a = 5 + + self.run_and_compare(func, + [(0, 'call'), + (1, 'line'), + (1, 'call'), + (1, 'line'), + (2, 'line'), + (3, 'line'), + (3, 'return'), + (1, 'return')]) + + @unittest.skip("TODO: RUSTPYTHON") + def test_class_creation_with_decorator(self): + def func(): + def decorator(arg): + def _dec(c): + return c + return _dec + + @decorator(6) + @decorator( + len([8]), + ) + class MyObject: + pass + + self.run_and_compare(func, [ + (0, 'call'), + (1, 'line'), + (6, 'line'), + (1, 'call'), + (2, 'line'), + (4, 'line'), + (4, 'return'), + (7, 'line'), + (8, 'line'), + (7, 'line'), + (1, 'call'), + (2, 'line'), + (4, 'line'), + (4, 'return'), + (10, 'line'), + (6, 'call'), + (6, 'line'), + (11, 'line'), + (11, 'return'), + (7, 'line'), + (2, 'call'), + (3, 'line'), + (3, 'return'), + (6, 'line'), + (2, 'call'), + (3, 'line'), + (3, 'return'), + (10, 'line'), + (10, 'return'), + ]) + + @support.cpython_only + def test_no_line_event_after_creating_generator(self): + # Spurious line events before call events only show up with C tracer + + # Skip this test if the _testcapi module isn't available. + _testcapi = import_helper.import_module('_testcapi') + + def gen(): + yield 1 + + def func(): + for _ in ( + gen() + ): + pass + + EXPECTED_EVENTS = [ + (0, 'call'), + (2, 'line'), + (-3, 'call'), + (-2, 'line'), + (-2, 'return'), + (1, 'line'), + (4, 'line'), + (2, 'line'), + (-2, 'call'), + (-2, 'return'), + (2, 'return'), + ] + + # C level events should be the same as expected and the same as Python level. + + events = [] + # Turning on and off tracing must be on same line to avoid unwanted LINE events. + _testcapi.settrace_to_record(events); func(); sys.settrace(None) + start_line = func.__code__.co_firstlineno + events = [ + (line-start_line, EVENT_NAMES[what]) + for (what, line, arg) in events + ] + self.assertEqual(events, EXPECTED_EVENTS) + + self.run_and_compare(func, EXPECTED_EVENTS) + + @unittest.skip("TODO: RUSTPYTHON") + def test_correct_tracing_quickened_call_class_init(self): + + class C: + def __init__(self): + self + + def func(): + C() + + EXPECTED_EVENTS = [ + (0, 'call'), + (1, 'line'), + (-3, 'call'), + (-2, 'line'), + (-2, 'return'), + (1, 'return')] + + self.run_and_compare(func, EXPECTED_EVENTS) + # Quicken + for _ in range(100): + func() + self.run_and_compare(func, EXPECTED_EVENTS) + + @unittest.skip("TODO: RUSTPYTHON") + def test_settrace_error(self): + raised = False + def error_once(frame, event, arg): + nonlocal raised + if not raised: + raised = True + raise Exception + return error + + try: + sys._getframe().f_trace = error_once + sys.settrace(error_once) + len([]) + except Exception as ex: + count = 0 + tb = ex.__traceback__ + while tb: + if tb.tb_frame.f_code.co_name == "test_settrace_error": + count += 1 + tb = tb.tb_next + if count == 0: + self.fail("Traceback is missing frame") + elif count > 1: + self.fail("Traceback has frame more than once") + else: + self.fail("No exception raised") + finally: + sys.settrace(None) + + @support.cpython_only + def test_testcapi_settrace_error(self): + + # Skip this test if the _testcapi module isn't available. + _testcapi = import_helper.import_module('_testcapi') + + try: + _testcapi.settrace_to_error([]) + len([]) + except Exception as ex: + count = 0 + tb = ex.__traceback__ + while tb: + if tb.tb_frame.f_code.co_name == "test_testcapi_settrace_error": + count += 1 + tb = tb.tb_next + if count == 0: + self.fail("Traceback is missing frame") + elif count > 1: + self.fail("Traceback has frame more than once") + else: + self.fail("No exception raised") + finally: + sys.settrace(None) + + @unittest.skip("TODO: RUSTPYTHON") + def test_very_large_function(self): + # There is a separate code path when the number of lines > (1 << 15). + d = {} + exec("""def f(): # line 0 + x = 0 # line 1 + y = 1 # line 2 + %s # lines 3 through (1 << 16) + x += 1 # + return""" % ('\n' * (1 << 16),), d) + f = d['f'] + + EXPECTED_EVENTS = [ + (0, 'call'), + (1, 'line'), + (2, 'line'), + (65540, 'line'), + (65541, 'line'), + (65541, 'return'), + ] + + self.run_and_compare(f, EXPECTED_EVENTS) + + +EVENT_NAMES = [ + 'call', + 'exception', + 'line', + 'return' +] + class SkipLineEventsTraceTestCase(TraceTestCase): """Repeat the trace tests, but with per-line events skipped""" @@ -1166,6 +1878,40 @@ class TraceOpcodesTestCase(TraceTestCase): def make_tracer(): return Tracer(trace_opcode_events=True) + @requires_subprocess() + def test_trace_opcodes_after_settrace(self): + """Make sure setting f_trace_opcodes after starting trace works even + if it's the first time f_trace_opcodes is being set. GH-103615""" + + code = textwrap.dedent(""" + import sys + + def opcode_trace_func(frame, event, arg): + if event == "opcode": + print("opcode trace triggered") + return opcode_trace_func + + sys.settrace(opcode_trace_func) + sys._getframe().f_trace = opcode_trace_func + sys._getframe().f_trace_opcodes = True + a = 1 + """) + + # We can't use context manager because Windows can't execute a file while + # it's being written + tmp = tempfile.NamedTemporaryFile(delete=False, suffix='.py') + tmp.write(code.encode('utf-8')) + tmp.close() + try: + p = subprocess.Popen([sys.executable, tmp.name], stdout=subprocess.PIPE, stderr=subprocess.PIPE) + p.wait() + out = p.stdout.read() + finally: + os.remove(tmp.name) + p.stdout.close() + p.stderr.close() + self.assertIn(b"opcode trace triggered", out) + class RaisingTraceFuncTestCase(unittest.TestCase): def setUp(self): @@ -1205,16 +1951,16 @@ class RaisingTraceFuncTestCase(unittest.TestCase): self.fail("recursion counter not reset") # Test the handling of exceptions raised by each kind of trace event. - @unittest.skip("TODO: RUSTPYTHON, spurious error?") + @unittest.skip("TODO: RUSTPYTHON; spurious error?") def test_call(self): self.run_test_for_event('call') - @unittest.skip("TODO: RUSTPYTHON, spurious error?") + @unittest.skip("TODO: RUSTPYTHON; spurious error?") def test_line(self): self.run_test_for_event('line') - @unittest.skip("TODO: RUSTPYTHON, spurious error?") + @unittest.skip("TODO: RUSTPYTHON; spurious error?") def test_return(self): self.run_test_for_event('return') - @unittest.skip("TODO: RUSTPYTHON, spurious error?") + @unittest.skip("TODO: RUSTPYTHON; spurious error?") def test_exception(self): self.run_test_for_event('exception') @@ -1262,6 +2008,21 @@ class RaisingTraceFuncTestCase(unittest.TestCase): finally: sys.settrace(existing) + @unittest.skip("TODO: RUSTPYTHON") + def test_line_event_raises_before_opcode_event(self): + exception = ValueError("BOOM!") + def trace(frame, event, arg): + if event == "line": + raise exception + frame.f_trace_opcodes = True + return trace + def f(): + pass + with self.assertRaises(ValueError) as caught: + sys.settrace(trace) + f() + self.assertIs(caught.exception, exception) + # 'Jump' tests: assigning to frame.f_lineno within a trace function # moves the execution position - it's how debuggers implement a Jump @@ -1282,6 +2043,7 @@ class JumpTracer: def trace(self, frame, event, arg): if self.done: return + assert lineno_matches_lasti(frame) # frame.f_code.co_firstlineno is the first line of the decorator when # 'function' is decorated and the decorator may be written using # multiple physical lines when it is too long. Use the first line @@ -1328,6 +2090,8 @@ def no_jump_without_trace_function(): class JumpTestCase(unittest.TestCase): + unbound_locals = r"assigning None to [0-9]+ unbound local" + def setUp(self): self.addCleanup(sys.settrace, sys.gettrace()) sys.settrace(None) @@ -1339,33 +2103,49 @@ class JumpTestCase(unittest.TestCase): "Received: " + repr(received)) def run_test(self, func, jumpFrom, jumpTo, expected, error=None, - event='line', decorated=False): - tracer = JumpTracer(func, jumpFrom, jumpTo, event, decorated) + event='line', decorated=False, warning=None): + wrapped = func + while hasattr(wrapped, '__wrapped__'): + wrapped = wrapped.__wrapped__ + + tracer = JumpTracer(wrapped, jumpFrom, jumpTo, event, decorated) sys.settrace(tracer.trace) output = [] - if error is None: + + with contextlib.ExitStack() as stack: + if error is not None: + stack.enter_context(self.assertRaisesRegex(*error)) + if warning is not None: + stack.enter_context(self.assertWarnsRegex(*warning)) + else: + stack.enter_context(warnings.catch_warnings()) + warnings.simplefilter('error') func(output) - else: - with self.assertRaisesRegex(*error): - func(output) + sys.settrace(None) self.compare_jump_output(expected, output) def run_async_test(self, func, jumpFrom, jumpTo, expected, error=None, - event='line', decorated=False): - tracer = JumpTracer(func, jumpFrom, jumpTo, event, decorated) + event='line', decorated=False, warning=None): + wrapped = func + while hasattr(wrapped, '__wrapped__'): + wrapped = wrapped.__wrapped__ + + tracer = JumpTracer(wrapped, jumpFrom, jumpTo, event, decorated) sys.settrace(tracer.trace) output = [] - if error is None: - asyncio.run(func(output)) - else: - with self.assertRaisesRegex(*error): - asyncio.run(func(output)) + + with contextlib.ExitStack() as stack: + if error is not None: + stack.enter_context(self.assertRaisesRegex(*error)) + if warning is not None: + stack.enter_context(self.assertWarnsRegex(*warning)) + run_no_yield_async_fn(func, output) + sys.settrace(None) - asyncio.set_event_loop_policy(None) self.compare_jump_output(expected, output) - def jump_test(jumpFrom, jumpTo, expected, error=None, event='line'): + def jump_test(jumpFrom, jumpTo, expected, error=None, event='line', warning=None): """Decorator that creates a test that makes a jump from one place to another in the following code. """ @@ -1373,11 +2153,11 @@ class JumpTestCase(unittest.TestCase): @wraps(func) def test(self): self.run_test(func, jumpFrom, jumpTo, expected, - error=error, event=event, decorated=True) + error=error, event=event, decorated=True, warning=warning) return test return decorator - def async_jump_test(jumpFrom, jumpTo, expected, error=None, event='line'): + def async_jump_test(jumpFrom, jumpTo, expected, error=None, event='line', warning=None): """Decorator that creates a test that makes a jump from one place to another in the following asynchronous code. """ @@ -1385,24 +2165,65 @@ class JumpTestCase(unittest.TestCase): @wraps(func) def test(self): self.run_async_test(func, jumpFrom, jumpTo, expected, - error=error, event=event, decorated=True) + error=error, event=event, decorated=True, warning=warning) return test return decorator ## The first set of 'jump' tests are for things that are allowed: + @unittest.skip("TODO: RUSTPYTHON") @jump_test(1, 3, [3]) def test_jump_simple_forwards(output): output.append(1) output.append(2) output.append(3) + @unittest.skip("TODO: RUSTPYTHON") @jump_test(2, 1, [1, 1, 2]) def test_jump_simple_backwards(output): output.append(1) output.append(2) - @jump_test(3, 5, [2, 5]) + @unittest.skip("TODO: RUSTPYTHON") + @jump_test(1, 4, [5], warning=(RuntimeWarning, unbound_locals)) + def test_jump_is_none_forwards(output): + x = None + if x is None: + output.append(3) + else: + output.append(5) + + @unittest.skip("TODO: RUSTPYTHON") + @jump_test(6, 5, [3, 5, 6]) + def test_jump_is_none_backwards(output): + x = None + if x is None: + output.append(3) + else: + output.append(5) + output.append(6) + + @unittest.skip("TODO: RUSTPYTHON") + @jump_test(2, 4, [5]) + def test_jump_is_not_none_forwards(output): + x = None + if x is not None: + output.append(3) + else: + output.append(5) + + @unittest.skip("TODO: RUSTPYTHON") + @jump_test(6, 5, [5, 5, 6]) + def test_jump_is_not_none_backwards(output): + x = None + if x is not None: + output.append(3) + else: + output.append(5) + output.append(6) + + @unittest.skip("TODO: RUSTPYTHON") + @jump_test(3, 5, [2, 5], warning=(RuntimeWarning, unbound_locals)) def test_jump_out_of_block_forwards(output): for i in 1, 2: output.append(2) @@ -1410,6 +2231,7 @@ class JumpTestCase(unittest.TestCase): output.append(4) output.append(5) + @unittest.skip("TODO: RUSTPYTHON") @jump_test(6, 1, [1, 3, 5, 1, 3, 5, 6, 7]) def test_jump_out_of_block_backwards(output): output.append(1) @@ -1420,16 +2242,20 @@ class JumpTestCase(unittest.TestCase): output.append(6) output.append(7) + @unittest.skip("TODO: RUSTPYTHON") @async_jump_test(4, 5, [3, 5]) - async def test_jump_out_of_async_for_block_forwards(output): + @clean_asynciter + async def test_jump_out_of_async_for_block_forwards(output, asynciter): for i in [1]: async for i in asynciter([1, 2]): output.append(3) output.append(4) output.append(5) + @unittest.skip("TODO: RUSTPYTHON") @async_jump_test(5, 2, [2, 4, 2, 4, 5, 6]) - async def test_jump_out_of_async_for_block_backwards(output): + @clean_asynciter + async def test_jump_out_of_async_for_block_backwards(output, asynciter): for i in [1]: output.append(2) async for i in asynciter([1]): @@ -1437,12 +2263,14 @@ class JumpTestCase(unittest.TestCase): output.append(5) output.append(6) + @unittest.skip("TODO: RUSTPYTHON") @jump_test(1, 2, [3]) def test_jump_to_codeless_line(output): output.append(1) # Jumping to this line should skip to the next one. output.append(3) + @unittest.skip("TODO: RUSTPYTHON") @jump_test(2, 2, [1, 2, 3]) def test_jump_to_same_line(output): output.append(1) @@ -1450,6 +2278,7 @@ class JumpTestCase(unittest.TestCase): output.append(3) # Tests jumping within a finally block, and over one. + @unittest.skip("TODO: RUSTPYTHON") @jump_test(4, 9, [2, 9]) def test_jump_in_nested_finally(output): try: @@ -1462,6 +2291,7 @@ class JumpTestCase(unittest.TestCase): output.append(8) output.append(9) + @unittest.skip("TODO: RUSTPYTHON") @jump_test(6, 7, [2, 7], (ZeroDivisionError, '')) def test_jump_in_nested_finally_2(output): try: @@ -1473,6 +2303,7 @@ class JumpTestCase(unittest.TestCase): output.append(7) output.append(8) + @unittest.skip("TODO: RUSTPYTHON") @jump_test(6, 11, [2, 11], (ZeroDivisionError, '')) def test_jump_in_nested_finally_3(output): try: @@ -1488,22 +2319,7 @@ class JumpTestCase(unittest.TestCase): output.append(11) output.append(12) - @jump_test(5, 11, [2, 4], (ValueError, 'after')) - def test_no_jump_over_return_try_finally_in_finally_block(output): - try: - output.append(2) - finally: - output.append(4) - output.append(5) - return - try: - output.append(8) - finally: - output.append(10) - pass - output.append(12) - - @unittest.skip("TODO: RUSTPYTHON, infinite loop never exits") + @unittest.skip("TODO: RUSTPYTHON; infinite loop never exits") @jump_test(3, 4, [1], (ValueError, 'after')) def test_no_jump_infinite_while_loop(output): output.append(1) @@ -1511,6 +2327,7 @@ class JumpTestCase(unittest.TestCase): output.append(3) output.append(4) + @unittest.skip("TODO: RUSTPYTHON") @jump_test(2, 4, [4, 4]) def test_jump_forwards_into_while_block(output): i = 1 @@ -1519,6 +2336,7 @@ class JumpTestCase(unittest.TestCase): output.append(4) i += 1 + @unittest.skip("TODO: RUSTPYTHON") @jump_test(5, 3, [3, 3, 3, 5]) def test_jump_backwards_into_while_block(output): i = 1 @@ -1527,30 +2345,35 @@ class JumpTestCase(unittest.TestCase): i += 1 output.append(5) + @unittest.skip("TODO: RUSTPYTHON") @jump_test(2, 3, [1, 3]) def test_jump_forwards_out_of_with_block(output): with tracecontext(output, 1): output.append(2) output.append(3) + @unittest.skip("TODO: RUSTPYTHON") @async_jump_test(2, 3, [1, 3]) async def test_jump_forwards_out_of_async_with_block(output): async with asynctracecontext(output, 1): output.append(2) output.append(3) + @unittest.skip("TODO: RUSTPYTHON") @jump_test(3, 1, [1, 2, 1, 2, 3, -2]) def test_jump_backwards_out_of_with_block(output): output.append(1) with tracecontext(output, 2): output.append(3) + @unittest.skip("TODO: RUSTPYTHON") @async_jump_test(3, 1, [1, 2, 1, 2, 3, -2]) async def test_jump_backwards_out_of_async_with_block(output): output.append(1) async with asynctracecontext(output, 2): output.append(3) + @unittest.skip("TODO: RUSTPYTHON") @jump_test(2, 5, [5]) def test_jump_forwards_out_of_try_finally_block(output): try: @@ -1559,6 +2382,7 @@ class JumpTestCase(unittest.TestCase): output.append(4) output.append(5) + @unittest.skip("TODO: RUSTPYTHON") @jump_test(3, 1, [1, 1, 3, 5]) def test_jump_backwards_out_of_try_finally_block(output): output.append(1) @@ -1567,6 +2391,7 @@ class JumpTestCase(unittest.TestCase): finally: output.append(5) + @unittest.skip("TODO: RUSTPYTHON") @jump_test(2, 6, [6]) def test_jump_forwards_out_of_try_except_block(output): try: @@ -1576,6 +2401,7 @@ class JumpTestCase(unittest.TestCase): raise output.append(6) + @unittest.skip("TODO: RUSTPYTHON") @jump_test(3, 1, [1, 1, 3]) def test_jump_backwards_out_of_try_except_block(output): output.append(1) @@ -1585,6 +2411,7 @@ class JumpTestCase(unittest.TestCase): output.append(5) raise + @unittest.skip("TODO: RUSTPYTHON") @jump_test(5, 7, [4, 7, 8]) def test_jump_between_except_blocks(output): try: @@ -1596,6 +2423,19 @@ class JumpTestCase(unittest.TestCase): output.append(7) output.append(8) + @unittest.skip("TODO: RUSTPYTHON") + @jump_test(5, 7, [4, 7, 8]) + def test_jump_from_except_to_finally(output): + try: + 1/0 + except ZeroDivisionError: + output.append(4) + output.append(5) + finally: + output.append(7) + output.append(8) + + @unittest.skip("TODO: RUSTPYTHON") @jump_test(5, 6, [4, 6, 7]) def test_jump_within_except_block(output): try: @@ -1606,6 +2446,17 @@ class JumpTestCase(unittest.TestCase): output.append(6) output.append(7) + @unittest.skip("TODO: RUSTPYTHON") + @jump_test(6, 1, [1, 5, 1, 5], warning=(RuntimeWarning, unbound_locals)) + def test_jump_over_try_except(output): + output.append(1) + try: + 1 / 0 + except ZeroDivisionError as e: + output.append(5) + x = 42 # has to be a two-instruction block + + @unittest.skip("TODO: RUSTPYTHON") @jump_test(2, 4, [1, 4, 5, -4]) def test_jump_across_with(output): output.append(1) @@ -1614,6 +2465,7 @@ class JumpTestCase(unittest.TestCase): with tracecontext(output, 4): output.append(5) + @unittest.skip("TODO: RUSTPYTHON") @async_jump_test(2, 4, [1, 4, 5, -4]) async def test_jump_across_async_with(output): output.append(1) @@ -1622,6 +2474,7 @@ class JumpTestCase(unittest.TestCase): async with asynctracecontext(output, 4): output.append(5) + @unittest.skip("TODO: RUSTPYTHON") @jump_test(4, 5, [1, 3, 5, 6]) def test_jump_out_of_with_block_within_for_block(output): output.append(1) @@ -1631,6 +2484,7 @@ class JumpTestCase(unittest.TestCase): output.append(5) output.append(6) + @unittest.skip("TODO: RUSTPYTHON") @async_jump_test(4, 5, [1, 3, 5, 6]) async def test_jump_out_of_async_with_block_within_for_block(output): output.append(1) @@ -1640,6 +2494,7 @@ class JumpTestCase(unittest.TestCase): output.append(5) output.append(6) + @unittest.skip("TODO: RUSTPYTHON") @jump_test(4, 5, [1, 2, 3, 5, -2, 6]) def test_jump_out_of_with_block_within_with_block(output): output.append(1) @@ -1649,6 +2504,7 @@ class JumpTestCase(unittest.TestCase): output.append(5) output.append(6) + @unittest.skip("TODO: RUSTPYTHON") @async_jump_test(4, 5, [1, 2, 3, 5, -2, 6]) async def test_jump_out_of_async_with_block_within_with_block(output): output.append(1) @@ -1658,6 +2514,7 @@ class JumpTestCase(unittest.TestCase): output.append(5) output.append(6) + @unittest.skip("TODO: RUSTPYTHON") @jump_test(5, 6, [2, 4, 6, 7]) def test_jump_out_of_with_block_within_finally_block(output): try: @@ -1668,6 +2525,7 @@ class JumpTestCase(unittest.TestCase): output.append(6) output.append(7) + @unittest.skip("TODO: RUSTPYTHON") @async_jump_test(5, 6, [2, 4, 6, 7]) async def test_jump_out_of_async_with_block_within_finally_block(output): try: @@ -1678,6 +2536,7 @@ class JumpTestCase(unittest.TestCase): output.append(6) output.append(7) + @unittest.skip("TODO: RUSTPYTHON") @jump_test(8, 11, [1, 3, 5, 11, 12]) def test_jump_out_of_complex_nested_blocks(output): output.append(1) @@ -1693,7 +2552,8 @@ class JumpTestCase(unittest.TestCase): output.append(11) output.append(12) - @jump_test(3, 5, [1, 2, 5]) + @unittest.skip("TODO: RUSTPYTHON") + @jump_test(3, 5, [1, 2, 5], warning=(RuntimeWarning, unbound_locals)) def test_jump_out_of_with_assignment(output): output.append(1) with tracecontext(output, 2) \ @@ -1701,7 +2561,8 @@ class JumpTestCase(unittest.TestCase): output.append(4) output.append(5) - @async_jump_test(3, 5, [1, 2, 5]) + @unittest.skip("TODO: RUSTPYTHON") + @async_jump_test(3, 5, [1, 2, 5], warning=(RuntimeWarning, unbound_locals)) async def test_jump_out_of_async_with_assignment(output): output.append(1) async with asynctracecontext(output, 2) \ @@ -1709,6 +2570,7 @@ class JumpTestCase(unittest.TestCase): output.append(4) output.append(5) + @unittest.skip("TODO: RUSTPYTHON") @jump_test(3, 6, [1, 6, 8, 9]) def test_jump_over_return_in_try_finally_block(output): output.append(1) @@ -1721,6 +2583,7 @@ class JumpTestCase(unittest.TestCase): output.append(8) output.append(9) + @unittest.skip("TODO: RUSTPYTHON") @jump_test(5, 8, [1, 3, 8, 10, 11, 13]) def test_jump_over_break_in_try_finally_block(output): output.append(1) @@ -1737,7 +2600,8 @@ class JumpTestCase(unittest.TestCase): break output.append(13) - @jump_test(1, 7, [7, 8]) + @unittest.skip("TODO: RUSTPYTHON") + @jump_test(1, 7, [7, 8], warning=(RuntimeWarning, unbound_locals)) def test_jump_over_for_block_before_else(output): output.append(1) if not output: # always false @@ -1748,7 +2612,8 @@ class JumpTestCase(unittest.TestCase): output.append(7) output.append(8) - @async_jump_test(1, 7, [7, 8]) + @unittest.skip("TODO: RUSTPYTHON") + @async_jump_test(1, 7, [7, 8], warning=(RuntimeWarning, unbound_locals)) async def test_jump_over_async_for_block_before_else(output): output.append(1) if not output: # always false @@ -1761,19 +2626,20 @@ class JumpTestCase(unittest.TestCase): # The second set of 'jump' tests are for things that are not allowed: + @unittest.skip("TODO: RUSTPYTHON") @jump_test(2, 3, [1], (ValueError, 'after')) def test_no_jump_too_far_forwards(output): output.append(1) output.append(2) + @unittest.skip("TODO: RUSTPYTHON") @jump_test(2, -2, [1], (ValueError, 'before')) def test_no_jump_too_far_backwards(output): output.append(1) output.append(2) - # TODO: RUSTPYTHON - @unittest.expectedFailure # Test each kind of 'except' line. + @unittest.skip("TODO: RUSTPYTHON") @jump_test(2, 3, [4], (ValueError, 'except')) def test_no_jump_to_except_1(output): try: @@ -1782,8 +2648,7 @@ class JumpTestCase(unittest.TestCase): output.append(4) raise - # TODO: RUSTPYTHON - @unittest.expectedFailure + @unittest.skip("TODO: RUSTPYTHON") @jump_test(2, 3, [4], (ValueError, 'except')) def test_no_jump_to_except_2(output): try: @@ -1792,8 +2657,7 @@ class JumpTestCase(unittest.TestCase): output.append(4) raise - # TODO: RUSTPYTHON - @unittest.expectedFailure + @unittest.skip("TODO: RUSTPYTHON") @jump_test(2, 3, [4], (ValueError, 'except')) def test_no_jump_to_except_3(output): try: @@ -1802,8 +2666,7 @@ class JumpTestCase(unittest.TestCase): output.append(4) raise e - # TODO: RUSTPYTHON - @unittest.expectedFailure + @unittest.skip("TODO: RUSTPYTHON") @jump_test(2, 3, [4], (ValueError, 'except')) def test_no_jump_to_except_4(output): try: @@ -1812,14 +2675,14 @@ class JumpTestCase(unittest.TestCase): output.append(4) raise e + @unittest.skip("TODO: RUSTPYTHON") @jump_test(1, 3, [], (ValueError, 'into')) def test_no_jump_forwards_into_for_block(output): output.append(1) for i in 1, 2: output.append(3) - # TODO: RUSTPYTHON - @unittest.expectedFailure + @unittest.skip("TODO: RUSTPYTHON") @async_jump_test(1, 3, [], (ValueError, 'into')) async def test_no_jump_forwards_into_async_for_block(output): output.append(1) @@ -1827,76 +2690,70 @@ class JumpTestCase(unittest.TestCase): output.append(3) pass + @unittest.skip("TODO: RUSTPYTHON") @jump_test(3, 2, [2, 2], (ValueError, 'into')) def test_no_jump_backwards_into_for_block(output): for i in 1, 2: output.append(2) output.append(3) - # TODO: RUSTPYTHON - @unittest.expectedFailure - @async_jump_test(3, 2, [2, 2], (ValueError, 'into')) + + @unittest.skip("TODO: RUSTPYTHON") + @async_jump_test(3, 2, [2, 2], (ValueError, "can't jump into the body of a for loop")) async def test_no_jump_backwards_into_async_for_block(output): async for i in asynciter([1, 2]): output.append(2) output.append(3) - # TODO: RUSTPYTHON - @unittest.expectedFailure - @jump_test(1, 3, [], (ValueError, 'into')) + @unittest.skip("TODO: RUSTPYTHON") + @jump_test(1, 3, [], (ValueError, 'stack')) def test_no_jump_forwards_into_with_block(output): output.append(1) with tracecontext(output, 2): output.append(3) - # TODO: RUSTPYTHON - @unittest.expectedFailure - @async_jump_test(1, 3, [], (ValueError, 'into')) + @unittest.skip("TODO: RUSTPYTHON") + @async_jump_test(1, 3, [], (ValueError, 'stack')) async def test_no_jump_forwards_into_async_with_block(output): output.append(1) async with asynctracecontext(output, 2): output.append(3) - # TODO: RUSTPYTHON - @unittest.expectedFailure - @jump_test(3, 2, [1, 2, -1], (ValueError, 'into')) + @unittest.skip("TODO: RUSTPYTHON") + @jump_test(3, 2, [1, 2, -1], (ValueError, 'stack')) def test_no_jump_backwards_into_with_block(output): with tracecontext(output, 1): output.append(2) output.append(3) - # TODO: RUSTPYTHON - @unittest.expectedFailure - @async_jump_test(3, 2, [1, 2, -1], (ValueError, 'into')) + @unittest.skip("TODO: RUSTPYTHON") + @async_jump_test(3, 2, [1, 2, -1], (ValueError, 'stack')) async def test_no_jump_backwards_into_async_with_block(output): async with asynctracecontext(output, 1): output.append(2) output.append(3) - # TODO: RUSTPYTHON - @unittest.expectedFailure - @jump_test(1, 3, [], (ValueError, 'into')) - def test_no_jump_forwards_into_try_finally_block(output): + @unittest.skip("TODO: RUSTPYTHON") + @jump_test(1, 3, [3, 5]) + def test_jump_forwards_into_try_finally_block(output): output.append(1) try: output.append(3) finally: output.append(5) - # TODO: RUSTPYTHON - @unittest.expectedFailure - @jump_test(5, 2, [2, 4], (ValueError, 'into')) - def test_no_jump_backwards_into_try_finally_block(output): + @unittest.skip("TODO: RUSTPYTHON") + @jump_test(5, 2, [2, 4, 2, 4, 5]) + def test_jump_backwards_into_try_finally_block(output): try: output.append(2) finally: output.append(4) output.append(5) - # TODO: RUSTPYTHON - @unittest.expectedFailure - @jump_test(1, 3, [], (ValueError, 'into')) - def test_no_jump_forwards_into_try_except_block(output): + @unittest.skip("TODO: RUSTPYTHON") + @jump_test(1, 3, [3]) + def test_jump_forwards_into_try_except_block(output): output.append(1) try: output.append(3) @@ -1904,10 +2761,9 @@ class JumpTestCase(unittest.TestCase): output.append(5) raise - # TODO: RUSTPYTHON - @unittest.expectedFailure - @jump_test(6, 2, [2], (ValueError, 'into')) - def test_no_jump_backwards_into_try_except_block(output): + @unittest.skip("TODO: RUSTPYTHON") + @jump_test(6, 2, [2, 2, 6]) + def test_jump_backwards_into_try_except_block(output): try: output.append(2) except: @@ -1915,11 +2771,10 @@ class JumpTestCase(unittest.TestCase): raise output.append(6) - # TODO: RUSTPYTHON - @unittest.expectedFailure # 'except' with a variable creates an implicit finally block - @jump_test(5, 7, [4], (ValueError, 'into')) - def test_no_jump_between_except_blocks_2(output): + @unittest.skip("TODO: RUSTPYTHON") + @jump_test(5, 7, [4, 7, 8], warning=(RuntimeWarning, unbound_locals)) + def test_jump_between_except_blocks_2(output): try: 1/0 except ZeroDivisionError: @@ -1929,6 +2784,7 @@ class JumpTestCase(unittest.TestCase): output.append(7) output.append(8) + @unittest.skip("TODO: RUSTPYTHON") @jump_test(1, 5, [5]) def test_jump_into_finally_block(output): output.append(1) @@ -1937,6 +2793,7 @@ class JumpTestCase(unittest.TestCase): finally: output.append(5) + @unittest.skip("TODO: RUSTPYTHON") @jump_test(3, 6, [2, 6, 7]) def test_jump_into_finally_block_from_try_block(output): try: @@ -1947,6 +2804,7 @@ class JumpTestCase(unittest.TestCase): output.append(6) output.append(7) + @unittest.skip("TODO: RUSTPYTHON") @jump_test(5, 1, [1, 3, 1, 3, 5]) def test_jump_out_of_finally_block(output): output.append(1) @@ -1955,7 +2813,8 @@ class JumpTestCase(unittest.TestCase): finally: output.append(5) - @jump_test(1, 5, [], (ValueError, "into an 'except'")) + @unittest.skip("TODO: RUSTPYTHON") + @jump_test(1, 5, [], (ValueError, "can't jump into an 'except' block as there's no exception")) def test_no_jump_into_bare_except_block(output): output.append(1) try: @@ -1963,7 +2822,8 @@ class JumpTestCase(unittest.TestCase): except: output.append(5) - @jump_test(1, 5, [], (ValueError, "into an 'except'")) + @unittest.skip("TODO: RUSTPYTHON") + @jump_test(1, 5, [], (ValueError, "can't jump into an 'except' block as there's no exception")) def test_no_jump_into_qualified_except_block(output): output.append(1) try: @@ -1971,9 +2831,8 @@ class JumpTestCase(unittest.TestCase): except Exception: output.append(5) - # TODO: RUSTPYTHON - @unittest.expectedFailure - @jump_test(3, 6, [2, 5, 6], (ValueError, "into an 'except'")) + @unittest.skip("TODO: RUSTPYTHON") + @jump_test(3, 6, [2, 5, 6], (ValueError, "can't jump into an 'except' block as there's no exception")) def test_no_jump_into_bare_except_block_from_try_block(output): try: output.append(2) @@ -1984,7 +2843,8 @@ class JumpTestCase(unittest.TestCase): raise output.append(8) - @jump_test(3, 6, [2], (ValueError, "into an 'except'")) + @unittest.skip("TODO: RUSTPYTHON") + @jump_test(3, 6, [2], (ValueError, "can't jump into an 'except' block as there's no exception")) def test_no_jump_into_qualified_except_block_from_try_block(output): try: output.append(2) @@ -1995,10 +2855,9 @@ class JumpTestCase(unittest.TestCase): raise output.append(8) - # TODO: RUSTPYTHON - @unittest.expectedFailure - @jump_test(7, 1, [1, 3, 6], (ValueError, "out of an 'except'")) - def test_no_jump_out_of_bare_except_block(output): + @unittest.skip("TODO: RUSTPYTHON") + @jump_test(7, 1, [1, 3, 6, 1, 3, 6, 7]) + def test_jump_out_of_bare_except_block(output): output.append(1) try: output.append(3) @@ -2007,10 +2866,9 @@ class JumpTestCase(unittest.TestCase): output.append(6) output.append(7) - # TODO: RUSTPYTHON - @unittest.expectedFailure - @jump_test(7, 1, [1, 3, 6], (ValueError, "out of an 'except'")) - def test_no_jump_out_of_qualified_except_block(output): + @unittest.skip("TODO: RUSTPYTHON") + @jump_test(7, 1, [1, 3, 6, 1, 3, 6, 7]) + def test_jump_out_of_qualified_except_block(output): output.append(1) try: output.append(3) @@ -2019,6 +2877,7 @@ class JumpTestCase(unittest.TestCase): output.append(6) output.append(7) + @unittest.skip("TODO: RUSTPYTHON") @jump_test(3, 5, [1, 2, 5, -2]) def test_jump_between_with_blocks(output): output.append(1) @@ -2027,6 +2886,7 @@ class JumpTestCase(unittest.TestCase): with tracecontext(output, 4): output.append(5) + @unittest.skip("TODO: RUSTPYTHON") @async_jump_test(3, 5, [1, 2, 5, -2]) async def test_jump_between_async_with_blocks(output): output.append(1) @@ -2035,6 +2895,7 @@ class JumpTestCase(unittest.TestCase): async with asynctracecontext(output, 4): output.append(5) + @unittest.skip("TODO: RUSTPYTHON") @jump_test(5, 7, [2, 4], (ValueError, "after")) def test_no_jump_over_return_out_of_finally_block(output): try: @@ -2042,9 +2903,10 @@ class JumpTestCase(unittest.TestCase): finally: output.append(4) output.append(5) - return + return output.append(7) + @unittest.skip("TODO: RUSTPYTHON") @jump_test(7, 4, [1, 6], (ValueError, 'into')) def test_no_jump_into_for_block_before_else(output): output.append(1) @@ -2056,8 +2918,7 @@ class JumpTestCase(unittest.TestCase): output.append(7) output.append(8) - # TODO: RUSTPYTHON - @unittest.expectedFailure + @unittest.skip("TODO: RUSTPYTHON") @async_jump_test(7, 4, [1, 6], (ValueError, 'into')) async def test_no_jump_into_async_for_block_before_else(output): output.append(1) @@ -2069,18 +2930,17 @@ class JumpTestCase(unittest.TestCase): output.append(7) output.append(8) - # TODO: RUSTPYTHON - @unittest.expectedFailure + @unittest.skip("TODO: RUSTPYTHON") def test_no_jump_to_non_integers(self): self.run_test(no_jump_to_non_integers, 2, "Spam", [True]) - # TODO: RUSTPYTHON - @unittest.expectedFailure + @unittest.skip("TODO: RUSTPYTHON") def test_no_jump_without_trace_function(self): # Must set sys.settrace(None) in setUp(), else condition is not # triggered. no_jump_without_trace_function() + @unittest.skip("TODO: RUSTPYTHON") def test_large_function(self): d = {} exec("""def f(output): # line 0 @@ -2093,8 +2953,9 @@ class JumpTestCase(unittest.TestCase): output.append(x) # line 1007 return""" % ('\n' * 1000,), d) f = d['f'] - self.run_test(f, 2, 1007, [0]) + self.run_test(f, 2, 1007, [0], warning=(RuntimeWarning, self.unbound_locals)) + @unittest.skip("TODO: RUSTPYTHON") def test_jump_to_firstlineno(self): # This tests that PDB can jump back to the first line in a # file. See issue #1689458. It can only be triggered in a @@ -2114,8 +2975,7 @@ output.append(4) sys.settrace(None) self.compare_jump_output([2, 3, 2, 3, 4], namespace["output"]) - # TODO: RUSTPYTHON - @unittest.expectedFailure + @unittest.skip("TODO: RUSTPYTHON") @jump_test(2, 3, [1], event='call', error=(ValueError, "can't jump from" " the 'call' trace event of a new frame")) def test_no_jump_from_call(output): @@ -2125,23 +2985,22 @@ output.append(4) nested() output.append(5) - # TODO: RUSTPYTHON - @unittest.expectedFailure + @unittest.skip("TODO: RUSTPYTHON") @jump_test(2, 1, [1], event='return', error=(ValueError, "can only jump from a 'line' trace event")) def test_no_jump_from_return_event(output): output.append(1) return - # TODO: RUSTPYTHON - @unittest.expectedFailure + @unittest.skip("TODO: RUSTPYTHON") @jump_test(2, 1, [1], event='exception', error=(ValueError, "can only jump from a 'line' trace event")) def test_no_jump_from_exception_event(output): output.append(1) 1 / 0 - @jump_test(3, 2, [2, 5], event='return') + @unittest.skip("TODO: RUSTPYTHON") + @jump_test(3, 2, [2, 2, 5], event='return') def test_jump_from_yield(output): def gen(): output.append(2) @@ -2149,6 +3008,300 @@ output.append(4) next(gen()) output.append(5) + @unittest.skip("TODO: RUSTPYTHON") + @jump_test(2, 3, [1, 3], warning=(RuntimeWarning, unbound_locals)) + def test_jump_forward_over_listcomp(output): + output.append(1) + x = [i for i in range(10)] + output.append(3) + + # checking for segfaults. + # See https://github.com/python/cpython/issues/92311 + @unittest.skip("TODO: RUSTPYTHON") + @jump_test(3, 1, [], warning=(RuntimeWarning, unbound_locals)) + def test_jump_backward_over_listcomp(output): + a = 1 + x = [i for i in range(10)] + c = 3 + + @unittest.skip("TODO: RUSTPYTHON") + @jump_test(8, 2, [2, 7, 2], warning=(RuntimeWarning, unbound_locals)) + def test_jump_backward_over_listcomp_v2(output): + flag = False + output.append(2) + if flag: + return + x = [i for i in range(5)] + flag = 6 + output.append(7) + output.append(8) + + @unittest.skip("TODO: RUSTPYTHON") + @async_jump_test(2, 3, [1, 3], warning=(RuntimeWarning, unbound_locals)) + async def test_jump_forward_over_async_listcomp(output): + output.append(1) + x = [i async for i in asynciter(range(10))] + output.append(3) + + @unittest.skip("TODO: RUSTPYTHON") + @async_jump_test(3, 1, [], warning=(RuntimeWarning, unbound_locals)) + async def test_jump_backward_over_async_listcomp(output): + a = 1 + x = [i async for i in asynciter(range(10))] + c = 3 + + @unittest.skip("TODO: RUSTPYTHON") + @async_jump_test(8, 2, [2, 7, 2], warning=(RuntimeWarning, unbound_locals)) + async def test_jump_backward_over_async_listcomp_v2(output): + flag = False + output.append(2) + if flag: + return + x = [i async for i in asynciter(range(5))] + flag = 6 + output.append(7) + output.append(8) + + # checking for segfaults. + @unittest.skip("TODO: RUSTPYTHON") + @jump_test(3, 7, [], error=(ValueError, "stack")) + def test_jump_with_null_on_stack_load_global(output): + a = 1 + print( + output.append(3) + ) + output.append(5) + ( + ( # 7 + a + + + 10 + ) + + + 13 + ) + output.append(15) + + # checking for segfaults. + @unittest.skip("TODO: RUSTPYTHON") + @jump_test(4, 8, [], error=(ValueError, "stack")) + def test_jump_with_null_on_stack_push_null(output): + a = 1 + f = print + f( + output.append(4) + ) + output.append(6) + ( + ( # 8 + a + + + 11 + ) + + + 14 + ) + output.append(16) + + # checking for segfaults. + @unittest.skip("TODO: RUSTPYTHON") + @jump_test(3, 7, [], error=(ValueError, "stack")) + def test_jump_with_null_on_stack_load_attr(output): + a = 1 + list.append( + output, 3 + ) + output.append(5) + ( + ( # 7 + a + + + 10 + ) + + + 13 + ) + output.append(15) + + @unittest.skip("TODO: RUSTPYTHON") + @jump_test(2, 3, [1, 3], warning=(RuntimeWarning, unbound_locals)) + def test_jump_extended_args_unpack_ex_simple(output): + output.append(1) + _, *_, _ = output.append(2) or "Spam" + output.append(3) + + @unittest.skip("TODO: RUSTPYTHON") + @jump_test(3, 4, [1, 4, 4, 5], warning=(RuntimeWarning, unbound_locals)) + def test_jump_extended_args_unpack_ex_tricky(output): + output.append(1) + ( + _, *_, _ + ) = output.append(4) or "Spam" + output.append(5) + + @unittest.skip("TODO: RUSTPYTHON") + @support.requires_resource('cpu') + def test_jump_extended_args_for_iter(self): + # In addition to failing when extended arg handling is broken, this can + # also hang for a *very* long time: + source = [ + "def f(output):", + " output.append(1)", + " for _ in spam:", + *(f" output.append({i})" for i in range(3, 100_000)), + f" output.append(100_000)", + ] + namespace = {} + exec("\n".join(source), namespace) + f = namespace["f"] + self.run_test(f, 2, 100_000, [1, 100_000], warning=(RuntimeWarning, self.unbound_locals)) + + @unittest.skip("TODO: RUSTPYTHON") + @jump_test(2, 3, [1, 3], warning=(RuntimeWarning, unbound_locals)) + def test_jump_or_pop(output): + output.append(1) + _ = output.append(2) and "Spam" + output.append(3) + + +class TestExtendedArgs(unittest.TestCase): + + def setUp(self): + self.addCleanup(sys.settrace, sys.gettrace()) + sys.settrace(None) + + def count_traces(self, func): + # warmup + for _ in range(20): + func() + + counts = {"call": 0, "line": 0, "return": 0} + def trace(frame, event, arg): + counts[event] += 1 + return trace + + sys.settrace(trace) + func() + sys.settrace(None) + + return counts + + def test_trace_unpack_long_sequence(self): + ns = {} + code = "def f():\n (" + "y,\n "*300 + ") = range(300)" + exec(code, ns) + counts = self.count_traces(ns["f"]) + self.assertEqual(counts, {'call': 1, 'line': 301, 'return': 1}) + + def test_trace_lots_of_globals(self): + + count = 1000 + + code = """if 1: + def f(): + return ( + {} + ) + """.format("\n,\n".join(f"var{i}\n" for i in range(count))) + ns = {f"var{i}": i for i in range(count)} + exec(code, ns) + counts = self.count_traces(ns["f"]) + self.assertEqual(counts, {'call': 1, 'line': count * 2 + 1, 'return': 1}) + + +class TestEdgeCases(unittest.TestCase): + + def setUp(self): + self.addCleanup(sys.settrace, sys.gettrace()) + sys.settrace(None) + + def test_reentrancy(self): + def foo(*args): + ... + + def bar(*args): + ... + + class A: + def __call__(self, *args): + pass + + def __del__(self): + sys.settrace(bar) + + sys.settrace(A()) + sys.settrace(foo) + self.assertEqual(sys.gettrace(), bar) + + + def test_same_object(self): + def foo(*args): + ... + + sys.settrace(foo) + del foo + sys.settrace(sys.gettrace()) + + +class TestLinesAfterTraceStarted(TraceTestCase): + + @unittest.skip("TODO: RUSTPYTHON") + def test_events(self): + tracer = Tracer() + sys._getframe().f_trace = tracer.trace + sys.settrace(tracer.trace) + line = 4 + line = 5 + sys.settrace(None) + self.compare_events( + TestLinesAfterTraceStarted.test_events.__code__.co_firstlineno, + tracer.events, [ + (4, 'line'), + (5, 'line'), + (6, 'line')]) + + +class TestSetLocalTrace(TraceTestCase): + + def test_with_branches(self): + + def tracefunc(frame, event, arg): + if frame.f_code.co_name == "func": + frame.f_trace = tracefunc + line = frame.f_lineno - frame.f_code.co_firstlineno + events.append((line, event)) + return tracefunc + + def func(arg = 1): + N = 1 + if arg >= 2: + not_reached = 3 + else: + reached = 5 + if arg >= 3: + not_reached = 7 + else: + reached = 9 + the_end = 10 + + EXPECTED_EVENTS = [ + (0, 'call'), + (1, 'line'), + (2, 'line'), + (5, 'line'), + (6, 'line'), + (9, 'line'), + (10, 'line'), + (10, 'return'), + ] + + events = [] + sys.settrace(tracefunc) + sys._getframe().f_trace = tracefunc + func() + self.assertEqual(events, EXPECTED_EVENTS) + sys.settrace(None) + if __name__ == "__main__": unittest.main() diff --git a/Lib/test/test_syslog.py b/Lib/test/test_syslog.py index 9ad2cc518..040800066 100644 --- a/Lib/test/test_syslog.py +++ b/Lib/test/test_syslog.py @@ -5,6 +5,7 @@ import sys import threading import time import unittest +from textwrap import dedent # XXX(nnorwitz): This test sucks. I don't know of a platform independent way # to verify that the messages were really logged. @@ -15,8 +16,7 @@ class Test(unittest.TestCase): def tearDown(self): syslog.closelog() - # TODO: RUSTPYTHON - @unittest.expectedFailure + @unittest.expectedFailure # TODO: RUSTPYTHON def test_openlog(self): syslog.openlog('python') # Issue #6697. @@ -80,6 +80,69 @@ class Test(unittest.TestCase): finally: sys.setswitchinterval(orig_si) + def test_subinterpreter_syslog(self): + # syslog.syslog() is not allowed in subinterpreters, but only if + # syslog.openlog() hasn't been called in the main interpreter yet. + with self.subTest('before openlog()'): + code = dedent(''' + import syslog + caught_error = False + try: + syslog.syslog('foo') + except RuntimeError: + caught_error = True + assert(caught_error) + ''') + res = support.run_in_subinterp(code) + self.assertEqual(res, 0) + + syslog.openlog() + try: + with self.subTest('after openlog()'): + code = dedent(''' + import syslog + syslog.syslog('foo') + ''') + res = support.run_in_subinterp(code) + self.assertEqual(res, 0) + finally: + syslog.closelog() + + def test_subinterpreter_openlog(self): + try: + code = dedent(''' + import syslog + caught_error = False + try: + syslog.openlog() + except RuntimeError: + caught_error = True + + assert(caught_error) + ''') + res = support.run_in_subinterp(code) + self.assertEqual(res, 0) + finally: + syslog.closelog() + + def test_subinterpreter_closelog(self): + syslog.openlog('python') + try: + code = dedent(''' + import syslog + caught_error = False + try: + syslog.closelog() + except RuntimeError: + caught_error = True + + assert(caught_error) + ''') + res = support.run_in_subinterp(code) + self.assertEqual(res, 0) + finally: + syslog.closelog() + if __name__ == "__main__": unittest.main() From 009080dba7d22fe81f12fc547f3ea4e47a841b91 Mon Sep 17 00:00:00 2001 From: Bas Schoenmaeckers <7943856+bschoenmaeckers@users.noreply.github.com> Date: Wed, 3 Jun 2026 15:52:17 +0200 Subject: [PATCH 027/339] Add basic module functions to c-api (#8032) --- crates/capi/src/lib.rs | 1 + crates/capi/src/moduleobject.rs | 42 +++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 crates/capi/src/moduleobject.rs diff --git a/crates/capi/src/lib.rs b/crates/capi/src/lib.rs index c1ba7f559..fdb21cb65 100644 --- a/crates/capi/src/lib.rs +++ b/crates/capi/src/lib.rs @@ -20,6 +20,7 @@ pub mod import; pub mod listobject; pub mod longobject; pub mod methodobject; +pub mod moduleobject; pub mod object; pub mod pycapsule; pub mod pyerrors; diff --git a/crates/capi/src/moduleobject.rs b/crates/capi/src/moduleobject.rs new file mode 100644 index 000000000..dd7534554 --- /dev/null +++ b/crates/capi/src/moduleobject.rs @@ -0,0 +1,42 @@ +use crate::PyObject; +use crate::object::define_py_check; +use crate::pystate::with_vm; +use rustpython_vm::builtins::{PyModule, PyStr}; + +define_py_check!(fn PyModule_Check, types.module_type); +define_py_check!(exact fn PyModule_CheckExact, types.module_type); + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyModule_GetNameObject(module: *mut PyObject) -> *mut PyObject { + with_vm(|vm| { + let module = unsafe { &*module }.try_downcast_ref::(vm)?; + let dict = module.dict(); + let name = dict + .get_item_opt(rustpython_vm::identifier!(vm, __name__), vm)? + .and_then(|obj| obj.downcast_ref::().map(ToOwned::to_owned)); + name.ok_or_else(|| vm.new_system_error("nameless module")) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyModule_GetFilenameObject(module: *mut PyObject) -> *mut PyObject { + with_vm(|vm| { + let module = unsafe { &*module }.try_downcast_ref::(vm)?; + let dict = module.dict(); + let filename = dict + .get_item_opt(rustpython_vm::identifier!(vm, __file__), vm)? + .and_then(|obj| obj.downcast_ref::().map(ToOwned::to_owned)); + filename.ok_or_else(|| vm.new_system_error("module filename missing")) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyModule_NewObject(name: *mut PyObject) -> *mut PyObject { + with_vm(|vm| -> rustpython_vm::PyResult<_> { + let name = unsafe { &*name }.try_downcast_ref::(vm)?; + let name = name + .to_str() + .ok_or_else(|| vm.new_system_error("module name must be valid UTF-8"))?; + Ok(vm.new_module(name, vm.ctx.new_dict(), None)) + }) +} From cf4d076ad440a97576a2e9aa2308daba8daaf0b0 Mon Sep 17 00:00:00 2001 From: "Jeong, YunWon" <69878+youknowone@users.noreply.github.com> Date: Thu, 4 Jun 2026 00:18:55 +0900 Subject: [PATCH 028/339] xz (#7756) --- Cargo.lock | 54 +++++++++++++++++++++++---------------- Cargo.toml | 4 +-- crates/stdlib/Cargo.toml | 4 +-- crates/stdlib/src/lzma.rs | 54 +++++++++++++++++++-------------------- 4 files changed, 62 insertions(+), 54 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c418e0588..eb42ebd75 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2148,26 +2148,6 @@ dependencies = [ "windows-link", ] -[[package]] -name = "liblzma" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6033b77c21d1f56deeae8014eb9fbe7bdf1765185a6c508b5ca82eeaed7f899" -dependencies = [ - "liblzma-sys", -] - -[[package]] -name = "liblzma-sys" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a60851d15cd8c5346eca4ab8babff585be2ae4bc8097c067291d3ffe2add3b6" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - [[package]] name = "libm" version = "0.2.16" @@ -3790,8 +3770,6 @@ dependencies = [ "insta", "itertools 0.14.0", "libc", - "liblzma", - "liblzma-sys", "libsqlite3-sys", "libz-rs-sys", "mac_address", @@ -3845,6 +3823,8 @@ dependencies = [ "x509-cert", "x509-parser", "xml", + "xz", + "xz-sys", ] [[package]] @@ -5371,6 +5351,36 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8aa498d22c9bbaf482329839bc5620c46be275a19a812e9a22a2b07529a642a" +[[package]] +name = "xz" +version = "0.4.6-rc.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7af8851c229f574c5e4f4e9b6d90ca06c43974a563f7f42de4b88d651bf8f19c" +dependencies = [ + "xz-core", +] + +[[package]] +name = "xz-core" +version = "0.1.0-rc.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef4d12cf9c122b2523cce22d6ab3083f4eb56d1221e5d30ddcc70fbaac553589" +dependencies = [ + "libc", + "memchr", + "windows-sys 0.61.2", +] + +[[package]] +name = "xz-sys" +version = "0.4.6-rc.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "114e3a14e5bb2d46513305741650595041b7e7e1677aa5c9715a09b7a8da08fd" +dependencies = [ + "libc", + "xz-core", +] + [[package]] name = "yoke" version = "0.8.2" diff --git a/Cargo.toml b/Cargo.toml index 21529826b..65b250840 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -244,8 +244,8 @@ lexical-parse-float = "1.0.6" libc = "0.2.186" libffi = "5" libloading = "0.9" -liblzma = "0.4" -liblzma-sys = "0.4" +xz = "0.4.6-rc.0" +xz-sys = "0.4.6-rc.0" libsqlite3-sys = "0.37" libz-rs-sys = "0.6" lock_api = "0.4" diff --git a/crates/stdlib/Cargo.toml b/crates/stdlib/Cargo.toml index 7bf82da98..61ecf413a 100644 --- a/crates/stdlib/Cargo.toml +++ b/crates/stdlib/Cargo.toml @@ -129,8 +129,8 @@ pkcs8 = { workspace = true, features = ["encryption", "pkcs5", "pem"], optional [target.'cfg(not(any(target_os = "android", target_arch = "wasm32")))'.dependencies] libsqlite3-sys = { workspace = true, features = ["bundled"], optional = true } -liblzma = { workspace = true } -liblzma-sys = { workspace = true } +xz = { workspace = true } +xz-sys = { workspace = true } [target.'cfg(windows)'.dependencies] paste = { workspace = true } diff --git a/crates/stdlib/src/lzma.rs b/crates/stdlib/src/lzma.rs index 7abfc9725..0b699badd 100644 --- a/crates/stdlib/src/lzma.rs +++ b/crates/stdlib/src/lzma.rs @@ -9,14 +9,20 @@ mod _lzma { DecompressError, DecompressState, DecompressStatus, Decompressor, }; use alloc::fmt; - use liblzma::stream::{ + use xz::stream::{ Action, Check, Error, Filters, LzmaOptions, MatchFinder, Mode, Status, Stream, TELL_ANY_CHECK, TELL_NO_CHECK, }; // lzma_check, lzma_mode, lzma_match_finder have platform-dependent signedness // (i32 on Windows, u32 elsewhere). Define as fixed-type const to avoid mismatch. + use rustpython_common::lock::PyMutex; + use rustpython_vm::builtins::{PyBaseExceptionRef, PyBytesRef, PyDict, PyType, PyTypeRef}; + use rustpython_vm::convert::ToPyException; + use rustpython_vm::function::ArgBytesLike; + use rustpython_vm::types::Constructor; + use rustpython_vm::{Py, PyObjectRef, PyPayload, PyResult, VirtualMachine}; #[pyattr] - use liblzma_sys::{ + use xz_sys::{ LZMA_FILTER_ARM as FILTER_ARM, LZMA_FILTER_ARMTHUMB as FILTER_ARMTHUMB, LZMA_FILTER_DELTA as FILTER_DELTA, LZMA_FILTER_IA64 as FILTER_IA64, LZMA_FILTER_LZMA1 as FILTER_LZMA1, LZMA_FILTER_LZMA2 as FILTER_LZMA2, @@ -24,47 +30,39 @@ mod _lzma { LZMA_FILTER_X86 as FILTER_X86, }; #[pyattr] - use liblzma_sys::{ - LZMA_PRESET_DEFAULT as PRESET_DEFAULT, LZMA_PRESET_EXTREME as PRESET_EXTREME, - }; - use rustpython_common::lock::PyMutex; - use rustpython_vm::builtins::{PyBaseExceptionRef, PyBytesRef, PyDict, PyType, PyTypeRef}; - use rustpython_vm::convert::ToPyException; - use rustpython_vm::function::ArgBytesLike; - use rustpython_vm::types::Constructor; - use rustpython_vm::{Py, PyObjectRef, PyPayload, PyResult, VirtualMachine}; + use xz_sys::{LZMA_PRESET_DEFAULT as PRESET_DEFAULT, LZMA_PRESET_EXTREME as PRESET_EXTREME}; const BUFSIZ: usize = 8192; - // liblzma_sys enum types have platform-dependent signedness; `as _` normalizes to i32 + // xz_sys enum types have platform-dependent signedness; `as _` normalizes to i32 #[pyattr] - const CHECK_NONE: i32 = liblzma_sys::LZMA_CHECK_NONE as _; + const CHECK_NONE: i32 = xz_sys::LZMA_CHECK_NONE as _; #[pyattr] - const CHECK_CRC32: i32 = liblzma_sys::LZMA_CHECK_CRC32 as _; + const CHECK_CRC32: i32 = xz_sys::LZMA_CHECK_CRC32 as _; #[pyattr] - const CHECK_CRC64: i32 = liblzma_sys::LZMA_CHECK_CRC64 as _; + const CHECK_CRC64: i32 = xz_sys::LZMA_CHECK_CRC64 as _; #[pyattr] - const CHECK_SHA256: i32 = liblzma_sys::LZMA_CHECK_SHA256 as _; + const CHECK_SHA256: i32 = xz_sys::LZMA_CHECK_SHA256 as _; #[pyattr] const CHECK_ID_MAX: i32 = 15; #[pyattr] const CHECK_UNKNOWN: i32 = CHECK_ID_MAX + 1; #[pyattr] - const MF_HC3: i32 = liblzma_sys::LZMA_MF_HC3 as _; + const MF_HC3: i32 = xz_sys::LZMA_MF_HC3 as _; #[pyattr] - const MF_HC4: i32 = liblzma_sys::LZMA_MF_HC4 as _; + const MF_HC4: i32 = xz_sys::LZMA_MF_HC4 as _; #[pyattr] - const MF_BT2: i32 = liblzma_sys::LZMA_MF_BT2 as _; + const MF_BT2: i32 = xz_sys::LZMA_MF_BT2 as _; #[pyattr] - const MF_BT3: i32 = liblzma_sys::LZMA_MF_BT3 as _; + const MF_BT3: i32 = xz_sys::LZMA_MF_BT3 as _; #[pyattr] - const MF_BT4: i32 = liblzma_sys::LZMA_MF_BT4 as _; + const MF_BT4: i32 = xz_sys::LZMA_MF_BT4 as _; #[pyattr] - const MODE_FAST: i32 = liblzma_sys::LZMA_MODE_FAST as _; + const MODE_FAST: i32 = xz_sys::LZMA_MODE_FAST as _; #[pyattr] - const MODE_NORMAL: i32 = liblzma_sys::LZMA_MODE_NORMAL as _; + const MODE_NORMAL: i32 = xz_sys::LZMA_MODE_NORMAL as _; enum Format { Auto = 0, @@ -385,13 +383,13 @@ mod _lzma { Ok(filters) } - const DEFAULT_LC: u32 = liblzma_sys::LZMA_LC_DEFAULT; - const DEFAULT_LP: u32 = liblzma_sys::LZMA_LP_DEFAULT; - const DEFAULT_PB: u32 = liblzma_sys::LZMA_PB_DEFAULT; + const DEFAULT_LC: u32 = xz_sys::LZMA_LC_DEFAULT; + const DEFAULT_LP: u32 = xz_sys::LZMA_LP_DEFAULT; + const DEFAULT_PB: u32 = xz_sys::LZMA_PB_DEFAULT; const DICT_POW2: [u8; 10] = [18, 20, 21, 22, 22, 23, 23, 24, 25, 26]; fn preset_dict_size(preset: u32) -> u32 { - let level = (preset & liblzma_sys::LZMA_PRESET_LEVEL_MASK) as usize; + let level = (preset & xz_sys::LZMA_PRESET_LEVEL_MASK) as usize; if level > 9 { return 0; } @@ -493,7 +491,7 @@ mod _lzma { #[pyfunction] fn is_check_supported(check_id: i32) -> bool { - unsafe { liblzma_sys::lzma_check_is_supported(check_id as _) != 0 } + unsafe { xz_sys::lzma_check_is_supported(check_id as _) != 0 } } #[pyfunction] From 1a92b4ae07415e73773a7f4a6f9d2e8d0b020eb8 Mon Sep 17 00:00:00 2001 From: Bas Schoenmaeckers <7943856+bschoenmaeckers@users.noreply.github.com> Date: Wed, 3 Jun 2026 17:45:26 +0200 Subject: [PATCH 029/339] Add `PyDictProxy_New` to the c-api (#8033) --- crates/capi/src/descrobject.rs | 31 ++++++++++++++++++++++++++ crates/capi/src/lib.rs | 1 + crates/vm/src/builtins/mappingproxy.rs | 28 +++++++++++++---------- 3 files changed, 48 insertions(+), 12 deletions(-) create mode 100644 crates/capi/src/descrobject.rs diff --git a/crates/capi/src/descrobject.rs b/crates/capi/src/descrobject.rs new file mode 100644 index 000000000..5232634fa --- /dev/null +++ b/crates/capi/src/descrobject.rs @@ -0,0 +1,31 @@ +use crate::PyObject; +use crate::pystate::with_vm; +use rustpython_vm::PyPayload; +use rustpython_vm::builtins::PyMappingProxy; + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyDictProxy_New(mapping: *mut PyObject) -> *mut PyObject { + with_vm(|vm| { + let mapping = unsafe { &*mapping }.to_owned(); + Ok(PyMappingProxy::from_object(mapping, vm)?.into_ref(&vm.ctx)) + }) +} + +#[cfg(false)] +mod tests { + use pyo3::prelude::*; + use pyo3::types::{PyDict, PyInt, PyMappingProxy}; + + #[test] + fn proxy_reads_items() { + Python::attach(|py| { + let dict = PyDict::new(py); + dict.set_item("x", 7).unwrap(); + + let mapping = dict.as_mapping(); + let proxy = PyMappingProxy::new(py, &mapping); + let value = proxy.get_item("x").unwrap().cast_into::().unwrap(); + assert_eq!(value, 7); + }) + } +} diff --git a/crates/capi/src/lib.rs b/crates/capi/src/lib.rs index fdb21cb65..fb3bc687f 100644 --- a/crates/capi/src/lib.rs +++ b/crates/capi/src/lib.rs @@ -14,6 +14,7 @@ pub mod bytearrayobject; pub mod bytesobject; pub mod ceval; pub mod complexobject; +pub mod descrobject; pub mod dictobject; pub mod floatobject; pub mod import; diff --git a/crates/vm/src/builtins/mappingproxy.rs b/crates/vm/src/builtins/mappingproxy.rs index 9603a77f7..c8b891f79 100644 --- a/crates/vm/src/builtins/mappingproxy.rs +++ b/crates/vm/src/builtins/mappingproxy.rs @@ -63,18 +63,7 @@ impl Constructor for PyMappingProxy { type Args = PyObjectRef; fn py_new(_cls: &Py, mapping: Self::Args, vm: &VirtualMachine) -> PyResult { - if mapping.mapping_unchecked().check() - && !mapping.downcastable::() - && !mapping.downcastable::() - { - return Ok(Self { - mapping: MappingProxyInner::Mapping(ArgMapping::new(mapping)), - }); - } - Err(vm.new_type_error(format!( - "mappingproxy() argument must be a mapping, not {}", - mapping.class() - ))) + Self::from_object(mapping, vm) } } @@ -89,6 +78,21 @@ impl Constructor for PyMappingProxy { Representable ))] impl PyMappingProxy { + pub fn from_object(mapping: PyObjectRef, vm: &VirtualMachine) -> PyResult { + if mapping.mapping_unchecked().check() + && !mapping.downcastable::() + && !mapping.downcastable::() + { + return Ok(Self { + mapping: MappingProxyInner::Mapping(ArgMapping::new(mapping)), + }); + } + Err(vm.new_type_error(format!( + "mappingproxy() argument must be a mapping, not {}", + mapping.class() + ))) + } + fn get_inner(&self, key: PyObjectRef, vm: &VirtualMachine) -> PyResult> { match &self.mapping { MappingProxyInner::Class(class) => Ok(key From 7f6d811a74265b8f7d969b0dbeaa67d07fbc5e1a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Jun 2026 14:32:40 -0400 Subject: [PATCH 030/339] Bump junction from 1.4.2 to 2.0.0 (#8027) Bumps [junction](https://github.com/tesuji/junction) from 1.4.2 to 2.0.0. - [Release notes](https://github.com/tesuji/junction/releases) - [Changelog](https://github.com/tesuji/junction/blob/main/CHANGELOG.md) - [Commits](https://github.com/tesuji/junction/compare/v1.4.2...v2.0.0) --- updated-dependencies: - dependency-name: junction dependency-version: 2.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index eb42ebd75..490fba687 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1966,9 +1966,9 @@ dependencies = [ [[package]] name = "junction" -version = "1.4.2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cfc352a66ba903c23239ef51e809508b6fc2b0f90e3476ac7a9ff47e863ae95" +checksum = "160f2eade097f30263b548aae5deb12ad349c909baa710fa24b92c9090b2e006" dependencies = [ "scopeguard", "windows-sys 0.61.2", diff --git a/Cargo.toml b/Cargo.toml index 65b250840..efad1ed62 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -239,7 +239,7 @@ insta = "1.47" itertools = "0.14.0" is-macro = "0.3.7" js-sys = "0.3" -junction = "1.4.2" +junction = "2.0.0" lexical-parse-float = "1.0.6" libc = "0.2.186" libffi = "5" From b4cd3b9af5addaac846afee0b1088c491f9e36a1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Jun 2026 15:27:44 -0400 Subject: [PATCH 031/339] Bump libsqlite3-sys from 0.37.0 to 0.38.0 (#8029) Bumps [libsqlite3-sys](https://github.com/rusqlite/rusqlite) from 0.37.0 to 0.38.0. - [Release notes](https://github.com/rusqlite/rusqlite/releases) - [Changelog](https://github.com/rusqlite/rusqlite/blob/master/Changelog.md) - [Commits](https://github.com/rusqlite/rusqlite/compare/v0.37.0...v0.38.0) --- updated-dependencies: - dependency-name: libsqlite3-sys dependency-version: 0.38.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 490fba687..171e754f4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2165,9 +2165,9 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f111c8c41e7c61a49cd34e44c7619462967221a6443b0ec299e0ac30cfb9b1" +checksum = "a76001fb4daed01e5f2b518aac0b4dc592e7c734da63dbffcf0c64fa612a8d0c" dependencies = [ "cc", "pkg-config", diff --git a/Cargo.toml b/Cargo.toml index efad1ed62..3ea7ecae0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -246,7 +246,7 @@ libffi = "5" libloading = "0.9" xz = "0.4.6-rc.0" xz-sys = "0.4.6-rc.0" -libsqlite3-sys = "0.37" +libsqlite3-sys = "0.38" libz-rs-sys = "0.6" lock_api = "0.4" log = "0.4.29" From 3d030801868c0e2189cc40da87cc236eff040e9d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Jun 2026 09:46:15 +0900 Subject: [PATCH 032/339] Bump log from 0.4.29 to 0.4.30 (#8036) Bumps [log](https://github.com/rust-lang/log) from 0.4.29 to 0.4.30. - [Release notes](https://github.com/rust-lang/log/releases) - [Changelog](https://github.com/rust-lang/log/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/log/compare/0.4.29...0.4.30) --- updated-dependencies: - dependency-name: log dependency-version: 0.4.30 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 171e754f4..9d98c88d8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2206,9 +2206,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.29" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" +checksum = "113b30b4cd05f7c06868fdb2854f66a7b9fece9a48425351cd532e810d74024f" [[package]] name = "lz4_flex" diff --git a/Cargo.toml b/Cargo.toml index 3ea7ecae0..8c51dd6da 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -249,7 +249,7 @@ xz-sys = "0.4.6-rc.0" libsqlite3-sys = "0.38" libz-rs-sys = "0.6" lock_api = "0.4" -log = "0.4.29" +log = "0.4.30" lz4_flex = "0.13" nix = { version = "0.31", features = ["fs", "user", "process", "term", "time", "signal", "ioctl", "socket", "sched", "zerocopy", "dir", "hostname", "net", "poll"] } mac_address = "1.1.3" From a134bd434efdbf7370f037157a4aeaf3a13d9a07 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Jun 2026 09:46:23 +0900 Subject: [PATCH 033/339] Bump memchr from 2.8.0 to 2.8.1 (#8038) Bumps [memchr](https://github.com/BurntSushi/memchr) from 2.8.0 to 2.8.1. - [Commits](https://github.com/BurntSushi/memchr/compare/2.8.0...2.8.1) --- updated-dependencies: - dependency-name: memchr dependency-version: 2.8.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9d98c88d8..84069db23 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2321,9 +2321,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.8.0" +version = "2.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" +checksum = "6b947ae49db0d222b1dbc6b113ce7248a3fc3a6ca21b696717bfc000ba4484d8" [[package]] name = "memmap2" diff --git a/Cargo.toml b/Cargo.toml index 8c51dd6da..f54edfb46 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -257,7 +257,7 @@ malachite-bigint = "0.9.1" malachite-q = "0.9.1" malachite-base = "0.9.1" md-5 = "0.11" -memchr = "2.8.0" +memchr = "2.8.1" memmap2 = "0.9.10" mt19937 = "3.3" num-complex = "0.4.6" From ccc8903b13aa1714b66355ab9ff43cd85086a292 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Jun 2026 09:46:34 +0900 Subject: [PATCH 034/339] Bump socket2 from 0.6.3 to 0.6.4 (#8039) Bumps [socket2](https://github.com/rust-lang/socket2) from 0.6.3 to 0.6.4. - [Release notes](https://github.com/rust-lang/socket2/releases) - [Changelog](https://github.com/rust-lang/socket2/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/socket2/commits) --- updated-dependencies: - dependency-name: socket2 dependency-version: 0.6.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 84069db23..81c8c0bd6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4226,9 +4226,9 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] name = "socket2" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" +checksum = "52d1cfed4120b4d927bf7c0f86d2087a4a7d6027c906d9f9d525a80573b9be51" dependencies = [ "libc", "windows-sys 0.61.2", diff --git a/Cargo.toml b/Cargo.toml index f54edfb46..1f560d6ae 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -300,7 +300,7 @@ sha2 = "0.11" sha3 = "0.12" shake = "0.1" siphasher = "1" -socket2 = "0.6.3" +socket2 = "0.6.4" static_assertions = "1.1" strum = "0.28" strum_macros = "0.28" From 81d843ac7fa754d925c5d958990daaab8be716d2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Jun 2026 09:46:44 +0900 Subject: [PATCH 035/339] Bump xml from 1.2.1 to 1.3.0 (#8037) Bumps [xml](https://github.com/kornelski/xml-rs) from 1.2.1 to 1.3.0. - [Changelog](https://github.com/kornelski/xml-rs/blob/main/Changelog.md) - [Commits](https://github.com/kornelski/xml-rs/compare/1.2.1...1.3.0) --- updated-dependencies: - dependency-name: xml dependency-version: 1.3.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 81c8c0bd6..8ab53ac5b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5347,9 +5347,9 @@ dependencies = [ [[package]] name = "xml" -version = "1.2.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8aa498d22c9bbaf482329839bc5620c46be275a19a812e9a22a2b07529a642a" +checksum = "636f85e5ca6488e96401b61eb7de54f4e44755c988af0f52cf90230c312a1a89" [[package]] name = "xz" diff --git a/Cargo.toml b/Cargo.toml index 1f560d6ae..81ecbf861 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -330,7 +330,7 @@ webpki-roots = "1.0" which = "8" x509-cert = "0.2.5" x509-parser = "0.18" -xml = "1.2" +xml = "1.3" writeable = "0.6" # Lints From 61f86f923c5d8f764d35926243e60e201044b5d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Jun 2026 10:07:23 +0900 Subject: [PATCH 036/339] Bump constant_time_eq from 0.4.2 to 0.5.0 (#8028) Bumps [constant_time_eq](https://github.com/cesarb/constant_time_eq) from 0.4.2 to 0.5.0. - [Changelog](https://github.com/cesarb/constant_time_eq/blob/main/CHANGES) - [Commits](https://github.com/cesarb/constant_time_eq/compare/0.4.2...0.5.0) --- updated-dependencies: - dependency-name: constant_time_eq dependency-version: 0.5.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8ab53ac5b..55afb99b0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -674,9 +674,9 @@ checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c" [[package]] name = "constant_time_eq" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d52eff69cd5e647efe296129160853a42795992097e8af39800e1060caeea9b" +checksum = "1a1ec0cfec728a79a5109075543131387f911cb4d07716436d7ae20533657a96" [[package]] name = "core-foundation" diff --git a/Cargo.toml b/Cargo.toml index 81ecbf861..eda23858f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -210,7 +210,7 @@ bstr = "1" bzip2 = "0.6" chrono = { version = "0.4.44", default-features = false, features = ["clock", "std"] } console_error_panic_hook = "0.1" -constant_time_eq = "0.4" +constant_time_eq = "0.5" cranelift = "0.132.0" cranelift-jit = "0.132.0" cranelift-module = "0.132.0" From a60fe11883d3e8a21a456a42e84f8a1709d13112 Mon Sep 17 00:00:00 2001 From: Bas Schoenmaeckers <7943856+bschoenmaeckers@users.noreply.github.com> Date: Thu, 4 Jun 2026 03:34:28 +0200 Subject: [PATCH 037/339] Add iter support to c-api (#8035) --- crates/capi/src/abstract_.rs | 10 +++ crates/capi/src/abstract_/iter.rs | 129 ++++++++++++++++++++++++++++++ 2 files changed, 139 insertions(+) create mode 100644 crates/capi/src/abstract_/iter.rs diff --git a/crates/capi/src/abstract_.rs b/crates/capi/src/abstract_.rs index a677c98c7..01a3964f7 100644 --- a/crates/capi/src/abstract_.rs +++ b/crates/capi/src/abstract_.rs @@ -1,6 +1,7 @@ use crate::{PyObject, pystate::with_vm}; use alloc::slice; use core::ffi::c_int; +pub use iter::*; pub use mapping::*; pub use number::*; use rustpython_vm::builtins::{PyDict, PyStr, PyTuple}; @@ -8,6 +9,7 @@ use rustpython_vm::function::{FuncArgs, KwArgs, PosArgs}; use rustpython_vm::{AsObject, Py, PyObjectRef, PyResult, VirtualMachine}; pub use sequence::*; +mod iter; mod mapping; mod number; mod sequence; @@ -170,3 +172,11 @@ pub unsafe extern "C" fn PyObject_IsInstance(inst: *mut PyObject, cls: *mut PyOb inst.is_instance(cls, vm) }) } + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyObject_Size(obj: *mut PyObject) -> isize { + with_vm(|vm| { + let obj = unsafe { &*obj }; + obj.length(vm) + }) +} diff --git a/crates/capi/src/abstract_/iter.rs b/crates/capi/src/abstract_/iter.rs new file mode 100644 index 000000000..1ba5bd04d --- /dev/null +++ b/crates/capi/src/abstract_/iter.rs @@ -0,0 +1,129 @@ +use crate::{PyObject, pystate::with_vm}; +use core::ffi::c_int; +use rustpython_vm::PyObjectRef; +use rustpython_vm::builtins::PyGenerator; +use rustpython_vm::protocol::{PyIter, PyIterReturn}; + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyIter_Check(obj: *mut PyObject) -> c_int { + with_vm(|_vm| Ok(PyIter::check(unsafe { &*obj }))) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyObject_GetIter(obj: *mut PyObject) -> *mut PyObject { + with_vm(|vm| { + let obj = unsafe { &*obj }; + obj.get_iter(vm).map(PyObjectRef::from) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyIter_NextItem(iter: *mut PyObject, item: *mut *mut PyObject) -> c_int { + with_vm(|vm| { + unsafe { + *item = core::ptr::null_mut(); + } + + let iter = PyIter::new(unsafe { &*iter }); + match iter.next(vm)? { + PyIterReturn::Return(next_item) => { + unsafe { + *item = next_item.into_raw().as_ptr(); + }; + Ok(true) + } + PyIterReturn::StopIteration(_) => Ok(false), + } + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyIter_Next(iter: *mut PyObject) -> *mut PyObject { + with_vm(|vm| { + let iter = PyIter::new(unsafe { &*iter }); + match iter.next(vm)? { + PyIterReturn::Return(next_item) => Ok(next_item.into_raw().as_ptr()), + PyIterReturn::StopIteration(_) => Ok(core::ptr::null_mut()), + } + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyIter_Send( + iter: *mut PyObject, + arg: *mut PyObject, + presult: *mut *mut PyObject, +) -> c_int { + with_vm(|vm| { + unsafe { + *presult = core::ptr::null_mut(); + } + + let iter_obj = unsafe { &*iter }; + let arg_obj = unsafe { &*arg }; + + let ret = if vm.is_none(arg_obj) { + PyIter::new(iter_obj).next(vm)? + } else { + iter_obj + .try_downcast_ref::(vm)? + .as_coro() + .send(iter_obj, arg_obj.to_owned(), vm)? + }; + + match ret { + PyIterReturn::Return(next_item) => { + unsafe { + *presult = next_item.into_raw().as_ptr(); + }; + Ok(true) + } + PyIterReturn::StopIteration(ret_val) => { + let ret_val = ret_val.unwrap_or_else(|| vm.ctx.none()); + unsafe { + *presult = ret_val.into_raw().as_ptr(); + }; + Ok(false) + } + } + }) +} + +#[cfg(false)] +mod tests { + use pyo3::prelude::*; + use pyo3::types::{PyAnyMethods, PyIterator, PyList, PySendResult}; + + #[test] + fn next_item() { + Python::attach(|py| { + let list = PyList::new(py, [1, 2, 3]).unwrap(); + let iter = list.try_iter().unwrap(); + let items: Vec = iter.map(|x| x.unwrap().extract::().unwrap()).collect(); + assert_eq!(items, vec![1, 2, 3]); + }) + } + + #[test] + fn send_generator() { + Python::attach(|py| { + let generator = py + .eval(c"(x for x in (1, 2))", None, None) + .unwrap() + .cast_into::() + .unwrap(); + + let first = generator.send(py.None().bind(py)).unwrap(); + assert!(matches!( + first, + PySendResult::Next(value) if value.extract::().unwrap() == 1 + )); + + let second = generator.send(py.None().bind(py)).unwrap(); + assert!(matches!( + second, + PySendResult::Next(value) if value.extract::().unwrap() == 2 + )); + }) + } +} From 83fe92042112f9db89a70495b552ab433d77e751 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Jun 2026 11:18:46 +0900 Subject: [PATCH 038/339] Bump taiki-e/install-action from 2.79.9 to 2.79.10 (#8026) Bumps [taiki-e/install-action](https://github.com/taiki-e/install-action) from 2.79.9 to 2.79.10. - [Release notes](https://github.com/taiki-e/install-action/releases) - [Changelog](https://github.com/taiki-e/install-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/taiki-e/install-action/compare/8f531eaecd1898bc3da7d104ad91bee98d1b97bd...60ae4ce63c7aeb6e96d7f572c1ec7fafbb17ca80) --- updated-dependencies: - dependency-name: taiki-e/install-action dependency-version: 2.79.10 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/cron-ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cron-ci.yaml b/.github/workflows/cron-ci.yaml index 6ed9b6d81..1bb2d66ab 100644 --- a/.github/workflows/cron-ci.yaml +++ b/.github/workflows/cron-ci.yaml @@ -33,7 +33,7 @@ jobs: - uses: dtolnay/rust-toolchain@stable - - uses: taiki-e/install-action@8f531eaecd1898bc3da7d104ad91bee98d1b97bd # v2.79.9 + - uses: taiki-e/install-action@60ae4ce63c7aeb6e96d7f572c1ec7fafbb17ca80 # v2.79.10 with: tool: cargo-llvm-cov From 4143af54f72a04280a0499b7bb8763c436bd6a7e Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Tue, 9 Jun 2026 04:12:57 +0300 Subject: [PATCH 039/339] Add `set_attrs!` macro for setting multiple attributes on an object (#8034) --- crates/vm/src/exceptions.rs | 43 +++++++----- crates/vm/src/protocol/object.rs | 15 ++++ crates/vm/src/stdlib/_ctypes/simple.rs | 69 +++++++++--------- crates/vm/src/vm/vm_new.rs | 96 ++++++++++++++------------ 4 files changed, 129 insertions(+), 94 deletions(-) diff --git a/crates/vm/src/exceptions.rs b/crates/vm/src/exceptions.rs index b91e567e7..cf83b416f 100644 --- a/crates/vm/src/exceptions.rs +++ b/crates/vm/src/exceptions.rs @@ -1593,6 +1593,7 @@ pub(super) mod types { }, convert::ToPyResult, function::{ArgBytesLike, FuncArgs, KwArgs}, + set_attrs, types::{Constructor, Initializer}, }; use crossbeam_utils::atomic::AtomicCell; @@ -1694,6 +1695,7 @@ pub(super) mod types { #[derive(Debug)] #[repr(transparent)] pub struct PyFloatingPointError(PyArithmeticError); + #[pyexception(name, base = PyArithmeticError, ctx = "overflow_error", impl)] #[derive(Debug)] #[repr(transparent)] @@ -1738,8 +1740,10 @@ pub(super) mod types { PyBaseException::slot_init(zelf.clone(), base_args, vm)?; // Set attributes - zelf.set_attr("name", vm.unwrap_or_none(name), vm)?; - zelf.set_attr("obj", vm.unwrap_or_none(obj), vm)?; + set_attrs!(zelf, vm, + "name" => vm.unwrap_or_none(name), + "obj" => vm.unwrap_or_none(obj), + ); Ok(()) } @@ -2653,12 +2657,13 @@ pub(super) mod types { fn slot_init(zelf: PyObjectRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult<()> { type Args = (PyStrRef, ArgBytesLike, isize, isize, PyStrRef); let (encoding, object, start, end, reason): Args = args.bind(vm)?; - zelf.set_attr("encoding", encoding, vm)?; - let object_as_bytes = vm.ctx.new_bytes(object.borrow_buf().to_vec()); - zelf.set_attr("object", object_as_bytes, vm)?; - zelf.set_attr("start", vm.ctx.new_int(start), vm)?; - zelf.set_attr("end", vm.ctx.new_int(end), vm)?; - zelf.set_attr("reason", reason, vm)?; + set_attrs!(zelf, vm, + "encoding" => encoding, + "object" => vm.ctx.new_bytes(object.borrow_buf().to_vec()), + "start" => vm.ctx.new_int(start), + "end" => vm.ctx.new_int(end), + "reason" => reason, + ); Ok(()) } @@ -2711,11 +2716,13 @@ pub(super) mod types { fn slot_init(zelf: PyObjectRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult<()> { type Args = (PyStrRef, PyStrRef, isize, isize, PyStrRef); let (encoding, object, start, end, reason): Args = args.bind(vm)?; - zelf.set_attr("encoding", encoding, vm)?; - zelf.set_attr("object", object, vm)?; - zelf.set_attr("start", vm.ctx.new_int(start), vm)?; - zelf.set_attr("end", vm.ctx.new_int(end), vm)?; - zelf.set_attr("reason", reason, vm)?; + set_attrs!(zelf, vm, + "encoding" => encoding, + "object" => object, + "start" => vm.ctx.new_int(start), + "end" => vm.ctx.new_int(end), + "reason" => reason, + ); Ok(()) } @@ -2766,10 +2773,12 @@ pub(super) mod types { fn slot_init(zelf: PyObjectRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult<()> { type Args = (PyStrRef, isize, isize, PyStrRef); let (object, start, end, reason): Args = args.bind(vm)?; - zelf.set_attr("object", object, vm)?; - zelf.set_attr("start", vm.ctx.new_int(start), vm)?; - zelf.set_attr("end", vm.ctx.new_int(end), vm)?; - zelf.set_attr("reason", reason, vm)?; + set_attrs!(zelf, vm, + "object" => object, + "start" => vm.ctx.new_int(start), + "end" => vm.ctx.new_int(end), + "reason" => reason, + ); Ok(()) } diff --git a/crates/vm/src/protocol/object.rs b/crates/vm/src/protocol/object.rs index 0d4e206ec..3398a48e7 100644 --- a/crates/vm/src/protocol/object.rs +++ b/crates/vm/src/protocol/object.rs @@ -826,3 +826,18 @@ impl PyObject { } } } + +/// Macro to reduce code repetition when setting multiple attributes on an object. +#[macro_export] +macro_rules! set_attrs { + ($obj:expr, $vm:expr, unwrap, $($key:expr => $val:expr),+ $(,)?) => { + $( + $obj.set_attr($key, $val, $vm).unwrap(); + )+ + }; + ($obj:expr, $vm:expr, $($key:expr => $val:expr),+ $(,)?) => { + $( + $obj.set_attr($key, $val, $vm)?; + )+ + }; +} diff --git a/crates/vm/src/stdlib/_ctypes/simple.rs b/crates/vm/src/stdlib/_ctypes/simple.rs index d51a61130..122c23cc2 100644 --- a/crates/vm/src/stdlib/_ctypes/simple.rs +++ b/crates/vm/src/stdlib/_ctypes/simple.rs @@ -11,7 +11,9 @@ use crate::convert::ToPyObject; use crate::function::{Either, FuncArgs, OptionalArg}; use crate::protocol::{BufferDescriptor, PyBuffer, PyNumberMethods}; use crate::types::{AsBuffer, AsNumber, Constructor, Initializer, Representable}; -use crate::{AsObject, Py, PyObject, PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine}; +use crate::{ + AsObject, Py, PyObject, PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine, set_attrs, +}; use alloc::borrow::Cow; use core::fmt::Debug; use num_traits::ToPrimitive; @@ -605,12 +607,11 @@ fn create_swapped_types( // c_char (c), c_byte (b), c_ubyte (B) let single_byte_types = ["c", "b", "B"]; if single_byte_types.contains(&type_str) { - type_ref - .as_object() - .set_attr("__ctype_le__", type_ref.as_object().to_owned(), vm)?; - type_ref - .as_object() - .set_attr("__ctype_be__", type_ref.as_object().to_owned(), vm)?; + set_attrs!( + type_ref.as_object(), vm, + "__ctype_le__" => type_ref.as_object().to_owned(), + "__ctype_be__" => type_ref.as_object().to_owned(), + ); return Ok(()); } @@ -627,12 +628,11 @@ fn create_swapped_types( let bases = vm.ctx.new_tuple(vec![type_ref.as_object().to_owned()]); // Set placeholder first to prevent recursion - type_ref - .as_object() - .set_attr("__ctype_le__", vm.ctx.none(), vm)?; - type_ref - .as_object() - .set_attr("__ctype_be__", vm.ctx.none(), vm)?; + set_attrs!( + type_ref.as_object(), vm, + "__ctype_le__" => vm.ctx.none(), + "__ctype_be__" => vm.ctx.none(), + ); // Create only the non-native endian type let suffix = if is_little_endian { "_be" } else { "_le" }; @@ -646,7 +646,10 @@ fn create_swapped_types( )?; // Set _swappedbytes_ on the swapped type to indicate byte swapping is needed - swapped_type.set_attr("_swappedbytes_", vm.ctx.none(), vm)?; + set_attrs!( + swapped_type, vm, + "_swappedbytes_" => vm.ctx.none(), + ); // Update swapped type's StgInfo format to use opposite endian prefix if let Ok(swapped_type_ref) = swapped_type.clone().downcast::() @@ -661,27 +664,27 @@ fn create_swapped_types( // Set attributes based on system byte order // Native endian attribute points to self, non-native points to swapped type - if is_little_endian { + let type_obj = type_ref.as_object().to_owned(); + let swapped_obj = swapped_type.clone(); + let (ctype_le, ctype_be) = if is_little_endian { // Little-endian system: __ctype_le__ = self, __ctype_be__ = swapped - type_ref - .as_object() - .set_attr("__ctype_le__", type_ref.as_object().to_owned(), vm)?; - type_ref - .as_object() - .set_attr("__ctype_be__", swapped_type.clone(), vm)?; - swapped_type.set_attr("__ctype_le__", type_ref.as_object().to_owned(), vm)?; - swapped_type.set_attr("__ctype_be__", swapped_type.clone(), vm)?; + (type_obj, swapped_obj) } else { - // Big-endian system: __ctype_be__ = self, __ctype_le__ = swapped - type_ref - .as_object() - .set_attr("__ctype_be__", type_ref.as_object().to_owned(), vm)?; - type_ref - .as_object() - .set_attr("__ctype_le__", swapped_type.clone(), vm)?; - swapped_type.set_attr("__ctype_be__", type_ref.as_object().to_owned(), vm)?; - swapped_type.set_attr("__ctype_le__", swapped_type.clone(), vm)?; - } + // Big-endian system: __ctype_le__ = swapped, __ctype_be__ = self + (swapped_obj, type_obj) + }; + + set_attrs!( + type_ref.as_object(), vm, + "__ctype_le__" => ctype_le.clone(), + "__ctype_be__" => ctype_be.clone(), + ); + + set_attrs!( + swapped_type, vm, + "__ctype_le__" => ctype_le, + "__ctype_be__" => ctype_be, + ); Ok(()) } diff --git a/crates/vm/src/vm/vm_new.rs b/crates/vm/src/vm/vm_new.rs index 3b50c2569..5af053faf 100644 --- a/crates/vm/src/vm/vm_new.rs +++ b/crates/vm/src/vm/vm_new.rs @@ -22,6 +22,7 @@ use crate::{ exceptions::OSErrorBuilder, function::{IntoPyNativeFn, PyMethodFlags}, scope::Scope, + set_attrs, vm::VirtualMachine, }; @@ -425,7 +426,11 @@ impl VirtualMachine { pub fn new_name_error(&self, msg: impl Into, name: PyStrRef) -> PyBaseExceptionRef { let name_error_type = self.ctx.exceptions.name_error.to_owned(); let name_error = self.new_exception_msg(name_error_type, msg.into()); - name_error.as_object().set_attr("name", name, self).unwrap(); + set_attrs!( + name_error.as_object(), self, unwrap, + "name" => name, + ); + name_error } @@ -512,13 +517,16 @@ impl VirtualMachine { reason.clone().into(), ], ); - exc.as_object() - .set_attr("encoding", encoding, self) - .unwrap(); - exc.as_object().set_attr("object", object, self).unwrap(); - exc.as_object().set_attr("start", start, self).unwrap(); - exc.as_object().set_attr("end", end, self).unwrap(); - exc.as_object().set_attr("reason", reason, self).unwrap(); + + set_attrs!( + exc.as_object(), self, unwrap, + "encoding" => encoding, + "object" => object, + "start" => start, + "end" => end, + "reason" => reason, + ); + exc } @@ -542,13 +550,16 @@ impl VirtualMachine { reason.clone().into(), ], ); - exc.as_object() - .set_attr("encoding", encoding, self) - .unwrap(); - exc.as_object().set_attr("object", object, self).unwrap(); - exc.as_object().set_attr("start", start, self).unwrap(); - exc.as_object().set_attr("end", end, self).unwrap(); - exc.as_object().set_attr("reason", reason, self).unwrap(); + + set_attrs!( + exc.as_object(), self, unwrap, + "encoding" => encoding, + "object" => object, + "start" => start, + "end" => end, + "reason" => reason, + ); + exc } @@ -752,14 +763,12 @@ impl VirtualMachine { let (lineno, offset) = error.python_location(); let lineno = self.ctx.new_int(lineno); let offset = self.ctx.new_int(offset); - syntax_error - .as_object() - .set_attr("lineno", lineno, self) - .unwrap(); - syntax_error - .as_object() - .set_attr("offset", offset, self) - .unwrap(); + + set_attrs!( + syntax_error.as_object(), self, unwrap, + "lineno" => lineno, + "offset" => offset, + ); // Set end_lineno and end_offset if available if let Some((end_lineno, end_offset)) = error.python_end_location() { @@ -771,24 +780,19 @@ impl VirtualMachine { }; let end_lineno = self.ctx.new_int(end_lineno); let end_offset = self.ctx.new_int(end_offset); - syntax_error - .as_object() - .set_attr("end_lineno", end_lineno, self) - .unwrap(); - syntax_error - .as_object() - .set_attr("end_offset", end_offset, self) - .unwrap(); + + set_attrs!( + syntax_error.as_object(), self, unwrap, + "end_lineno" => end_lineno, + "end_offset" => end_offset, + ); } - syntax_error - .as_object() - .set_attr("text", statement.to_pyobject(self), self) - .unwrap(); - syntax_error - .as_object() - .set_attr("filename", self.ctx.new_str(error.source_path()), self) - .unwrap(); + set_attrs!( + syntax_error.as_object(), self, unwrap, + "text" => statement.to_pyobject(self), + "filename" => self.ctx.new_str(error.source_path()) + ); // Set _metadata for keyword typo suggestions in traceback module. // Format: (start_line, col_offset, source_code) @@ -800,10 +804,10 @@ impl VirtualMachine { self.ctx.new_int(0).into(), self.ctx.new_str(source).into(), ]); - syntax_error - .as_object() - .set_attr("_metadata", metadata, self) - .unwrap(); + set_attrs!( + syntax_error.as_object(), self, unwrap, + "_metadata" => metadata, + ); } syntax_error @@ -825,7 +829,11 @@ impl VirtualMachine { ) -> PyBaseExceptionRef { let import_error = self.ctx.exceptions.import_error.to_owned(); let exc = self.new_exception_msg(import_error, msg.into()); - exc.as_object().set_attr("name", name.into(), self).unwrap(); + set_attrs!( + exc.as_object(), self, unwrap, + "name" => name.into(), + ); + exc } From fb9a5ca65b98fac2199ad5948a27aaa86c4435d8 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Wed, 10 Jun 2026 05:00:58 +0300 Subject: [PATCH 040/339] General code nits (#8041) --- crates/stdlib/src/binascii.rs | 29 +++----- crates/stdlib/src/unicodedata.rs | 9 ++- crates/vm/src/builtins/dict.rs | 3 + crates/vm/src/builtins/list.rs | 2 +- crates/vm/src/stdlib/_collections.rs | 9 ++- crates/vm/src/stdlib/_io.rs | 47 ++++++------ crates/vm/src/stdlib/_thread.rs | 35 +++++---- crates/vm/src/stdlib/_weakref.rs | 10 +-- crates/vm/src/stdlib/builtins.rs | 104 +++++++++++++-------------- crates/vm/src/stdlib/itertools.rs | 9 ++- crates/vm/src/stdlib/typevar.rs | 18 +++-- 11 files changed, 141 insertions(+), 134 deletions(-) diff --git a/crates/stdlib/src/binascii.rs b/crates/stdlib/src/binascii.rs index 5deae90d5..bbeaa331e 100644 --- a/crates/stdlib/src/binascii.rs +++ b/crates/stdlib/src/binascii.rs @@ -2,6 +2,8 @@ pub(super) use decl::crc32; pub(crate) use decl::module_def; + +use rustpython_common::wtf8::Wtf8Buf; use rustpython_vm::{VirtualMachine, builtins::PyBaseExceptionRef, convert::ToPyException}; const PAD: u8 = 61u8; @@ -16,6 +18,7 @@ mod decl { convert::ToPyException, function::{ArgAsciiBuffer, ArgBytesLike, OptionalArg}, }; + use base64::Engine; use itertools::Itertools; @@ -33,7 +36,7 @@ mod decl { vm.ctx.new_exception_type("binascii", "Incomplete", None) } - fn hex_nibble(n: u8) -> u8 { + const fn hex_nibble(n: u8) -> u8 { match n { 0..=9 => b'0' + n, 10..=15 => b'a' + (n - 10), @@ -174,10 +177,7 @@ mod decl { fn unhexlify(data: ArgAsciiBuffer, vm: &VirtualMachine) -> PyResult> { data.with_ref(|hex_bytes| { if hex_bytes.len() % 2 != 0 { - return Err(super::new_binascii_error( - "Odd-length string".to_owned(), - vm, - )); + return Err(super::new_binascii_error("Odd-length string", vm)); } let mut unhex = Vec::::with_capacity(hex_bytes.len() / 2); @@ -185,10 +185,7 @@ mod decl { if let (Some(n1), Some(n2)) = (unhex_nibble(*n1), unhex_nibble(*n2)) { unhex.push((n1 << 4) | n2); } else { - return Err(super::new_binascii_error( - "Non-hexadecimal digit found".to_owned(), - vm, - )); + return Err(super::new_binascii_error("Non-hexadecimal digit found", vm)); } } @@ -264,10 +261,10 @@ mod decl { #[pyfunction] fn a2b_base64(args: A2bBase64Args, vm: &VirtualMachine) -> PyResult> { - #[rustfmt::skip] // Converts between ASCII and base-64 characters. The index of a given number yields the // number in ASCII while the value of said index yields the number in base-64. For example // "=" is 61 in ASCII but 0 (since it's the pad character) in base-64, so BASE64_TABLE[61] == 0 + #[rustfmt::skip] const BASE64_TABLE: [i8; 256] = [ -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, @@ -398,7 +395,7 @@ mod decl { if [b'\r', b'\n'].contains(c) { return Ok(0); } - return Err(super::new_binascii_error("Illegal char".to_owned(), vm)); + return Err(super::new_binascii_error("Illegal char", vm)); } Ok((*c - b' ') & 0x3f) } @@ -757,8 +754,7 @@ mod decl { // Allocate the buffer let mut res = Vec::::with_capacity(length); - let trailing_garbage_error = - || Err(super::new_binascii_error("Trailing garbage".to_owned(), vm)); + let trailing_garbage_error = || Err(super::new_binascii_error("Trailing garbage", vm)); for chunk in b.get(1..).unwrap_or_default().chunks(4) { let (char_a, char_b, char_c, char_d) = { @@ -823,10 +819,7 @@ mod decl { data.with_ref(|b| { let length = b.len(); if length > 45 { - return Err(super::new_binascii_error( - "At most 45 bytes at once".to_owned(), - vm, - )); + return Err(super::new_binascii_error("At most 45 bytes at once", vm)); } let mut res = Vec::::with_capacity(2 + length.div_ceil(3) * 4); res.push(uu_b2a(length as u8, backtick)); @@ -850,7 +843,7 @@ mod decl { struct Base64DecodeError(base64::DecodeError); -fn new_binascii_error(msg: String, vm: &VirtualMachine) -> PyBaseExceptionRef { +fn new_binascii_error>(msg: T, vm: &VirtualMachine) -> PyBaseExceptionRef { vm.new_exception_msg(decl::error_type(vm), msg.into()) } diff --git a/crates/stdlib/src/unicodedata.rs b/crates/stdlib/src/unicodedata.rs index 0c43f5a22..50731e606 100644 --- a/crates/stdlib/src/unicodedata.rs +++ b/crates/stdlib/src/unicodedata.rs @@ -274,11 +274,10 @@ mod unicodedata { #[pymethod] fn decomposition(&self, character: PyStrRef, vm: &VirtualMachine) -> PyResult { - let ch = match self.extract_char(character, vm)?.and_then(|c| c.to_char()) { - Some(ch) => ch, - None => return Ok(String::new()), + let Some(ch) = self.extract_char(character, vm)?.and_then(|c| c.to_char()) else { + return Ok(String::new()); }; - let chars: Vec = ch.decomposition_map().collect(); + let chars = ch.decomposition_map().collect::>(); // If decomposition maps to just the character itself, there's no decomposition if chars.len() == 1 && chars[0] == ch { return Ok(String::new()); @@ -356,7 +355,7 @@ mod unicodedata { } } - fn decomposition_type_tag(dt: DecompositionType) -> &'static str { + const fn decomposition_type_tag(dt: DecompositionType) -> &'static str { match dt { DecompositionType::Canonical => "canonical", DecompositionType::Compat => "compat", diff --git a/crates/vm/src/builtins/dict.rs b/crates/vm/src/builtins/dict.rs index 4b2b7c754..605322ef0 100644 --- a/crates/vm/src/builtins/dict.rs +++ b/crates/vm/src/builtins/dict.rs @@ -855,6 +855,7 @@ impl Iterator for DictIntoIter { (l, Some(l)) } } + impl ExactSizeIterator for DictIntoIter { fn len(&self) -> usize { self.dict.entries.len_from_entry_index(self.position) @@ -886,6 +887,7 @@ impl Iterator for DictIter<'_> { (l, Some(l)) } } + impl ExactSizeIterator for DictIter<'_> { fn len(&self) -> usize { self.dict.entries.len_from_entry_index(self.position) @@ -1266,6 +1268,7 @@ trait ViewSetOps: DictView { } impl ViewSetOps for PyDictKeys {} + #[pyclass( flags(DISALLOW_INSTANTIATION), with( diff --git a/crates/vm/src/builtins/list.rs b/crates/vm/src/builtins/list.rs index f4af27ea4..4179f7ef9 100644 --- a/crates/vm/src/builtins/list.rs +++ b/crates/vm/src/builtins/list.rs @@ -533,7 +533,7 @@ impl AsSequence for PyList { } .map_err(|e| { if e.class().is(vm.ctx.exceptions.index_error) { - vm.new_index_error("list assignment index out of range".to_owned()) + vm.new_index_error("list assignment index out of range") } else { e } diff --git a/crates/vm/src/stdlib/_collections.rs b/crates/vm/src/stdlib/_collections.rs index e5127431c..4f580ab5d 100644 --- a/crates/vm/src/stdlib/_collections.rs +++ b/crates/vm/src/stdlib/_collections.rs @@ -365,7 +365,7 @@ mod _collections { }) } else { Err(vm.new_type_error(format!( - "can only concatenate deque (not \"{}\") to deque", + r#"can only concatenate deque (not "{}") to deque"#, other.class().name() ))) } @@ -503,11 +503,13 @@ mod _collections { .concat(other, vm) .map(|x| x.into_ref(&vm.ctx).into()) }), + repeat: atomic_func!(|seq, n, vm| { PyDeque::sequence_downcast(seq) .__mul__(n, vm) .map(|x| x.into_ref(&vm.ctx).into()) }), + item: atomic_func!(|seq, i, vm| PyDeque::sequence_downcast(seq).__getitem__(i, vm)), ass_item: atomic_func!(|seq, i, value, vm| { let zelf = PyDeque::sequence_downcast(seq); @@ -517,14 +519,17 @@ mod _collections { zelf.__delitem__(i, vm) } }), + contains: atomic_func!( |seq, needle, vm| PyDeque::sequence_downcast(seq)._contains(needle, vm) ), + inplace_concat: atomic_func!(|seq, other, vm| { let zelf = PyDeque::sequence_downcast(seq); zelf._extend(other, vm)?; Ok(zelf.to_owned().into()) }), + inplace_repeat: atomic_func!(|seq, n, vm| { let zelf = PyDeque::sequence_downcast(seq); PyDeque::__imul__(zelf.to_owned(), n, vm).map(|x| x.into()) @@ -545,6 +550,7 @@ mod _collections { if let Some(res) = op.identical_optimization(zelf, other) { return Ok(res.into()); } + let other = class_or_notimplemented!(Self, other); let lhs = zelf.borrow_deque(); let rhs = other.borrow_deque(); @@ -573,6 +579,7 @@ mod _collections { if zelf.__len__() == 0 { return Ok(vm.ctx.new_str(format!("{class_name}([{closing_part})"))); } + if let Some(_guard) = ReprGuard::enter(vm, zelf.as_object()) { Ok(vm.ctx.new_str(collection_repr( Some(&class_name), diff --git a/crates/vm/src/stdlib/_io.rs b/crates/vm/src/stdlib/_io.rs index 4d16c1046..c6bee82c2 100644 --- a/crates/vm/src/stdlib/_io.rs +++ b/crates/vm/src/stdlib/_io.rs @@ -188,18 +188,18 @@ mod _io { result.map(Some) } - pub(super) fn new_unsupported_operation( + pub(super) fn new_unsupported_operation>( + msg: T, vm: &VirtualMachine, - msg: String, ) -> PyBaseExceptionRef { - vm.new_os_subtype_error(unsupported_operation().to_owned(), None, msg) + vm.new_os_subtype_error(unsupported_operation().to_owned(), None, msg.into()) .upcast() } fn _unsupported(vm: &VirtualMachine, zelf: &PyObject, operation: &str) -> PyResult { Err(new_unsupported_operation( - vm, format!("{}.{}() not supported", zelf.class().name(), operation), + vm, )) } @@ -363,8 +363,8 @@ mod _io { Ok(()) } else { Err(new_unsupported_operation( + "File or stream is not readable", vm, - "File or stream is not readable".to_owned(), )) } } @@ -374,8 +374,8 @@ mod _io { Ok(()) } else { Err(new_unsupported_operation( + "File or stream is not writable.", vm, - "File or stream is not writable.".to_owned(), )) } } @@ -385,8 +385,8 @@ mod _io { Ok(()) } else { Err(new_unsupported_operation( + "File or stream is not seekable", vm, - "File or stream is not seekable".to_owned(), )) } } @@ -1680,7 +1680,7 @@ mod _io { let mut data = zelf.lock(vm)?; data.check_init(vm)?; if !data.writable() { - return Err(new_unsupported_operation(vm, "truncate".to_owned())); + return Err(new_unsupported_operation("truncate", vm)); } data.flush_rewind(vm)?; let res = vm.call_method(data.raw.as_ref().unwrap(), "truncate", (pos,))?; @@ -3063,9 +3063,8 @@ mod _io { || data.decoded_chars_used.chars != 0) { return Err(new_unsupported_operation( + "cannot reconfigure encoding or newline after reading from the stream", vm, - "cannot reconfigure encoding or newline after reading from the stream" - .to_owned(), )); } @@ -3203,8 +3202,8 @@ mod _io { if !textio.seekable { return Err(new_unsupported_operation( + "underlying stream is not seekable", vm, - "underlying stream is not seekable".to_owned(), )); } @@ -3217,8 +3216,8 @@ mod _io { vm.call_method(&textio.buffer, "tell", ())? } else { return Err(new_unsupported_operation( + "can't do nonzero cur-relative seeks", vm, - "can't do nonzero cur-relative seeks".to_owned(), )); } } @@ -3241,8 +3240,8 @@ mod _io { return Ok(res); } return Err(new_unsupported_operation( + "can't do nonzero end-relative seeks", vm, - "can't do nonzero end-relative seeks".to_owned(), )); } _ => { @@ -3312,8 +3311,8 @@ mod _io { let mut textio = zelf.lock(vm)?; if !textio.seekable { return Err(new_unsupported_operation( + "underlying stream is not seekable", vm, - "underlying stream is not seekable".to_owned(), )); } if !textio.telling { @@ -3444,7 +3443,7 @@ mod _io { let decoder = textio .decoder .clone() - .ok_or_else(|| new_unsupported_operation(vm, "not readable".to_owned()))?; + .ok_or_else(|| new_unsupported_operation("not readable", vm))?; textio.write_pending(vm)?; @@ -3495,7 +3494,7 @@ mod _io { let (encoder, encode_func) = textio .encoder .as_ref() - .ok_or_else(|| new_unsupported_operation(vm, "not writable".to_owned()))?; + .ok_or_else(|| new_unsupported_operation("not writable", vm))?; let char_len = obj.char_len(); @@ -3861,7 +3860,7 @@ mod _io { let decoder = self .decoder .as_ref() - .ok_or_else(|| new_unsupported_operation(vm, "not readable".to_owned()))?; + .ok_or_else(|| new_unsupported_operation("not readable", vm))?; let dec_state = if self.telling { let state = vm.call_method(decoder, "getstate", ())?; @@ -5101,8 +5100,8 @@ mod _io { } .ok_or_else(|| { new_unsupported_operation( + "Couldn't get FileIO, io.open likely isn't supported on your platform", vm, - "Couldn't get FileIO, io.open likely isn't supported on your platform".to_owned(), ) })?; let raw = PyType::call( @@ -5586,8 +5585,8 @@ mod fileio { ) -> PyResult>> { if !zelf.mode.load().contains(host_io::FileMode::READABLE) { return Err(new_unsupported_operation( + "File or stream is not readable", vm, - "File or stream is not readable".to_owned(), )); } let handle = zelf.get_fd(vm)?; @@ -5644,8 +5643,8 @@ mod fileio { ) -> PyResult> { if !zelf.mode.load().contains(host_io::FileMode::READABLE) { return Err(new_unsupported_operation( + "File or stream is not readable", vm, - "File or stream is not readable".to_owned(), )); } @@ -5679,8 +5678,8 @@ mod fileio { ) -> PyResult> { if !zelf.mode.load().contains(host_io::FileMode::WRITABLE) { return Err(new_unsupported_operation( + "File or stream is not writable", vm, - "File or stream is not writable".to_owned(), )); } @@ -6219,8 +6218,8 @@ mod winconsoleio { let fd = self.get_fd(vm)?; if !self.readable.load() { return Err(new_unsupported_operation( + "Console buffer does not support reading", vm, - "Console buffer does not support reading".to_owned(), )); } let mut buf_ref = buffer.borrow_buf_mut(); @@ -6267,8 +6266,8 @@ mod winconsoleio { } if !self.readable.load() { return Err(new_unsupported_operation( + "Console buffer does not support reading", vm, - "Console buffer does not support reading".to_owned(), )); } let size = size.unwrap_or(-1); @@ -6310,8 +6309,8 @@ mod winconsoleio { } if !self.writable.load() { return Err(new_unsupported_operation( + "Console buffer does not support writing", vm, - "Console buffer does not support writing".to_owned(), )); } diff --git a/crates/vm/src/stdlib/_thread.rs b/crates/vm/src/stdlib/_thread.rs index 7291026ed..93d42676b 100644 --- a/crates/vm/src/stdlib/_thread.rs +++ b/crates/vm/src/stdlib/_thread.rs @@ -152,6 +152,7 @@ pub(crate) mod _thread { fn acquire(&self, args: AcquireArgs, vm: &VirtualMachine) -> PyResult { acquire_lock_impl!(&self.mu, args, vm) } + #[pymethod] #[pymethod(name = "release_lock")] fn release(&self, vm: &VirtualMachine) -> PyResult<()> { @@ -240,6 +241,7 @@ pub(crate) mod _thread { } Ok(result) } + #[pymethod] #[pymethod(name = "release_lock")] fn release(&self, vm: &VirtualMachine) -> PyResult<()> { @@ -413,34 +415,36 @@ pub(crate) mod _thread { /// Get OS-level thread ID (pthread_self on Unix) /// This is important for fork compatibility - the ID must remain stable after fork - #[cfg(unix)] fn current_thread_id() -> u64 { - host_thread::current_thread_id() - } - - #[cfg(not(unix))] - fn current_thread_id() -> u64 { - thread_to_rust_id(&thread::current()) + cfg_select! { + unix => host_thread::current_thread_id(), + _ => thread_to_rust_id(&thread::current()), + } } /// Convert Rust thread to ID (used for non-unix platforms) #[cfg(not(unix))] fn thread_to_rust_id(t: &thread::Thread) -> u64 { use core::hash::{Hash, Hasher}; + struct U64Hash { v: Option, } + impl Hasher for U64Hash { fn write(&mut self, _: &[u8]) { unreachable!() } + fn write_u64(&mut self, i: u64) { self.v = Some(i); } + fn finish(&self) -> u64 { self.v.expect("should have written a u64") } } + let mut h = U64Hash { v: None }; t.id().hash(&mut h); h.finish() @@ -472,12 +476,14 @@ pub(crate) mod _thread { if !f_args.kwargs.is_empty() { return Err(vm.new_type_error("start_new_thread() takes no keyword arguments")); } + let given = f_args.args.len(); if given < 2 { return Err(vm.new_type_error(format!( "start_new_thread expected at least 2 arguments, got {given}" ))); } + if given > 3 { return Err(vm.new_type_error(format!( "start_new_thread expected at most 3 arguments, got {given}" @@ -491,9 +497,11 @@ pub(crate) mod _thread { if func_obj.to_callable().is_none() { return Err(vm.new_type_error("first arg must be callable")); } + if !args_obj.fast_isinstance(vm.ctx.types.tuple_type) { return Err(vm.new_type_error("2nd arg must be a tuple")); } + if kwargs_obj .as_ref() .is_some_and(|obj| !obj.fast_isinstance(vm.ctx.types.dict_type)) @@ -1537,13 +1545,12 @@ pub(crate) mod _thread { }) .min_by_key(|(distance, _)| *distance) .map(|(_, candidate)| candidate); - let msg = if let Some(suggestion) = suggestion { - format!( - "start_joinable_thread() got an unexpected keyword argument '{unexpected}'. Did you mean '{suggestion}'?" - ) - } else { - format!("start_joinable_thread() got an unexpected keyword argument '{unexpected}'") - }; + + let msg_suffix = + suggestion.map_or_else(String::new, |s| format!(". Did you mean '{s}'?")); + let msg = format!( + "start_joinable_thread() got an unexpected keyword argument '{unexpected}'{msg_suffix}" + ); return Err(vm.new_type_error(msg)); } diff --git a/crates/vm/src/stdlib/_weakref.rs b/crates/vm/src/stdlib/_weakref.rs index e7e030b2b..4db8970ba 100644 --- a/crates/vm/src/stdlib/_weakref.rs +++ b/crates/vm/src/stdlib/_weakref.rs @@ -17,18 +17,22 @@ mod _weakref { fn ref_(vm: &VirtualMachine) -> PyTypeRef { vm.ctx.types.weakref_type.to_owned() } + #[pyattr] fn proxy(vm: &VirtualMachine) -> PyTypeRef { vm.ctx.types.weakproxy_type.to_owned() } + #[pyattr(name = "ReferenceType")] fn reference_type(vm: &VirtualMachine) -> PyTypeRef { vm.ctx.types.weakref_type.to_owned() } + #[pyattr(name = "ProxyType")] fn proxy_type(vm: &VirtualMachine) -> PyTypeRef { vm.ctx.types.weakproxy_type.to_owned() } + #[pyattr(name = "CallableProxyType")] fn callable_proxy_type(vm: &VirtualMachine) -> PyTypeRef { vm.ctx.types.weakproxy_type.to_owned() @@ -41,10 +45,8 @@ mod _weakref { #[pyfunction] fn getweakrefs(obj: PyObjectRef) -> Vec { - match obj.get_weak_references() { - Some(v) => v.into_iter().map(Into::into).collect(), - None => vec![], - } + obj.get_weak_references() + .map_or_else(Vec::new, |v| v.into_iter().map(Into::into).collect()) } #[pyfunction] diff --git a/crates/vm/src/stdlib/builtins.rs b/crates/vm/src/stdlib/builtins.rs index cfb9562b7..0bd04f332 100644 --- a/crates/vm/src/stdlib/builtins.rs +++ b/crates/vm/src/stdlib/builtins.rs @@ -128,7 +128,7 @@ mod builtins { let hash_pos = line.iter().position(|&b| b == b'#')?; if !line[..hash_pos] .iter() - .all(|&b| b == b' ' || b == b'\t' || b == b'\x0c' || b == b'\r') + .all(|&b| matches!(b, b' ' | b'\t' | b'\x0c' | b'\r')) { return None; } @@ -139,8 +139,7 @@ mod builtins { let after_coding = &after_hash[coding_pos + 6..]; // Next char must be ':' or '=' - let rest = if after_coding.first() == Some(&b':') || after_coding.first() == Some(&b'=') - { + let rest = if matches!(after_coding.first(), Some(b':' | b'=')) { &after_coding[1..] } else { return None; @@ -150,15 +149,15 @@ mod builtins { let rest = rest .iter() .copied() - .skip_while(|&b| b == b' ' || b == b'\t') + .skip_while(|&b| matches!(b, b' ' | b'\t')) .collect::>(); // Read encoding name: [-\w.]+ - let name: String = rest + let name = rest .iter() - .take_while(|&&b| b.is_ascii_alphanumeric() || b == b'-' || b == b'_' || b == b'.') + .take_while(|&&b| b.is_ascii_alphanumeric() || matches!(b, b'-' | b'_' | b'.')) .map(|&b| b as char) - .collect(); + .collect::(); if name.is_empty() { None @@ -179,10 +178,10 @@ mod builtins { // Only check second line if first line is blank or a comment let trimmed = first .iter() - .skip_while(|&&b| b == b' ' || b == b'\t' || b == b'\x0c' || b == b'\r') - .copied() - .collect::>(); - if !trimmed.is_empty() && trimmed[0] != b'#' { + .find(|&&b| !matches!(b, b' ' | b'\t' | b'\x0c' | b'\r')) + .copied(); + + if trimmed.is_some_and(|b| b != b'#') { return None; } } @@ -350,7 +349,7 @@ mod builtins { #[cfg(not(feature = "rustpython-codegen"))] { - return Err(vm.new_type_error(CODEGEN_NOT_SUPPORTED.to_owned())); + return Err(vm.new_type_error(CODEGEN_NOT_SUPPORTED)); } #[cfg(feature = "rustpython-codegen")] { @@ -368,10 +367,10 @@ mod builtins { } #[cfg(not(feature = "parser"))] - { - const PARSER_NOT_SUPPORTED: &str = "can't compile() source code when the `parser` feature of rustpython is disabled"; - Err(vm.new_type_error(PARSER_NOT_SUPPORTED.to_owned())) - } + return Err(vm.new_type_error( + "can't compile() source code when the `parser` feature of rustpython is disabled", + )); + #[cfg(feature = "parser")] { use crate::convert::ToPyException; @@ -398,7 +397,7 @@ mod builtins { if (flags & _ast::PY_CF_ONLY_AST).is_zero() { #[cfg(not(feature = "compiler"))] { - Err(vm.new_value_error(CODEGEN_NOT_SUPPORTED.to_owned())) + Err(vm.new_value_error(CODEGEN_NOT_SUPPORTED)) } #[cfg(feature = "compiler")] { @@ -470,23 +469,22 @@ mod builtins { feature_version: OptionalArg, vm: &VirtualMachine, ) -> PyResult> { - let minor = match feature_version.into_option() { - Some(minor) => minor, - None => return Ok(None), + let Some(minor) = feature_version.into_option() else { + return Ok(None); }; if minor < 0 { return Ok(None); } - let minor = u8::try_from(minor) - .map_err(|_| vm.new_value_error("compile() _feature_version out of range"))?; - Ok(Some(ruff_python_ast::PythonVersion { major: 3, minor })) + u8::try_from(minor) + .map(|v| Some(ruff_python_ast::PythonVersion { major: 3, minor: v })) + .map_err(|_| vm.new_value_error("compile() _feature_version out of range")) } #[pyfunction] fn delattr(obj: PyObjectRef, attr: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> { - let attr = attr.try_to_ref::(vm).map_err(|_e| { + let attr = attr.try_to_ref::(vm).map_err(|_| { vm.new_type_error(format!( "attribute name must be string, not '{}'", attr.class().name() @@ -514,40 +512,42 @@ mod builtins { } impl ScopeArgs { + fn validate_globals_dict( + globals: &PyObject, + vm: &VirtualMachine, + func_name: &'static str, + ) -> PyResult<()> { + if globals.fast_isinstance(vm.ctx.types.dict_type) { + return Ok(()); + } + + let msg = match func_name { + "eval" => { + let is_mapping = globals.mapping_unchecked().check(); + if is_mapping { + "globals must be a real dict; try eval(expr, {}, mapping)".into() + } else { + "globals must be a dict".into() + } + } + "exec" => format!( + "exec() globals must be a dict, not {}", + globals.class().name() + ), + _ => "globals must be a dict".into(), + }; + + Err(vm.new_type_error(msg)) + } + fn make_scope( self, vm: &VirtualMachine, func_name: &'static str, ) -> PyResult { - fn validate_globals_dict( - globals: &PyObject, - vm: &VirtualMachine, - func_name: &'static str, - ) -> PyResult<()> { - if !globals.fast_isinstance(vm.ctx.types.dict_type) { - return Err(match func_name { - "eval" => { - let is_mapping = globals.mapping_unchecked().check(); - vm.new_type_error(if is_mapping { - "globals must be a real dict; try eval(expr, {}, mapping)" - .to_owned() - } else { - "globals must be a dict".to_owned() - }) - } - "exec" => vm.new_type_error(format!( - "exec() globals must be a dict, not {}", - globals.class().name() - )), - _ => vm.new_type_error("globals must be a dict"), - }); - } - Ok(()) - } - let (globals, locals) = match self.globals { Some(globals) => { - validate_globals_dict(&globals, vm, func_name)?; + Self::validate_globals_dict(&globals, vm, func_name)?; let globals = PyDictRef::try_from_object(vm, globals)?; if !globals.contains_key(identifier!(vm, __builtins__), vm) { @@ -636,7 +636,7 @@ mod builtins { .map_err(|err| vm.new_syntax_error(&err, Some(source)))? } #[cfg(not(feature = "rustpython-compiler"))] - Either::A(_) => return Err(vm.new_type_error(CODEGEN_NOT_SUPPORTED.to_owned())), + Either::A(_) => return Err(vm.new_type_error(CODEGEN_NOT_SUPPORTED)), Either::B(code_obj) => code_obj, }; diff --git a/crates/vm/src/stdlib/itertools.rs b/crates/vm/src/stdlib/itertools.rs index 2cb23902e..8a78c698e 100644 --- a/crates/vm/src/stdlib/itertools.rs +++ b/crates/vm/src/stdlib/itertools.rs @@ -109,12 +109,11 @@ mod decl { } } }; - match next { - Err(_) | Ok(PyIterReturn::StopIteration(_)) => { - *zelf.source.write() = None; - } - _ => {} + + if matches!(next, Err(_) | Ok(PyIterReturn::StopIteration(_))) { + *zelf.source.write() = None; }; + next } } diff --git a/crates/vm/src/stdlib/typevar.rs b/crates/vm/src/stdlib/typevar.rs index 81d32f852..da018b552 100644 --- a/crates/vm/src/stdlib/typevar.rs +++ b/crates/vm/src/stdlib/typevar.rs @@ -81,7 +81,6 @@ pub(crate) mod typevar { #[pyattr] #[pyclass(name = "TypeVar", module = "typing")] #[derive(Debug, PyPayload)] - #[allow(dead_code)] pub struct TypeVar { name: PyObjectRef, // TODO PyStrRef? bound: PyMutex, @@ -94,6 +93,7 @@ pub(crate) mod typevar { contravariant: bool, infer_variance: bool, } + #[pyclass( flags(HAS_DICT, HAS_WEAKREF), with(AsNumber, Constructor, Representable) @@ -267,7 +267,7 @@ pub(crate) mod typevar { // Check if we have enough arguments if args_tuple.len() <= index && zelf.has_default(vm) { // Need to add default value - let mut new_args: Vec = args_tuple.iter().cloned().collect(); + let mut new_args = args_tuple.iter().cloned().collect::>(); // Add default value at the correct position while new_args.len() <= index { @@ -367,7 +367,7 @@ pub(crate) mod typevar { // Check for unexpected keyword arguments if !kwargs.is_empty() { - let unexpected_keys: Vec = kwargs.keys().map(|s| s.to_string()).collect(); + let unexpected_keys = kwargs.keys().map(|s| s.to_string()).collect::>(); return Err(vm.new_type_error(format!( "TypeVar() got unexpected keyword argument(s): {}", unexpected_keys.join(", ") @@ -459,7 +459,6 @@ pub(crate) mod typevar { #[pyattr] #[pyclass(name = "ParamSpec", module = "typing")] #[derive(Debug, PyPayload)] - #[allow(dead_code)] pub struct ParamSpec { name: PyObjectRef, bound: Option, @@ -651,7 +650,7 @@ pub(crate) mod typevar { // Check for unexpected keyword arguments if !kwargs.is_empty() { - let unexpected_keys: Vec = kwargs.keys().map(|s| s.to_string()).collect(); + let unexpected_keys = kwargs.keys().map(|s| s.to_string()).collect::>(); return Err(vm.new_type_error(format!( "ParamSpec() got unexpected keyword argument(s): {}", unexpected_keys.join(", ") @@ -721,12 +720,12 @@ pub(crate) mod typevar { #[pyattr] #[pyclass(name = "TypeVarTuple", module = "typing")] #[derive(Debug, PyPayload)] - #[allow(dead_code)] pub struct TypeVarTuple { name: PyObjectRef, default_value: PyMutex, evaluate_default: PyMutex, } + #[pyclass( flags(HAS_DICT, HAS_WEAKREF), with(Constructor, Representable, Iterable) @@ -845,7 +844,7 @@ pub(crate) mod typevar { // Check for unexpected keyword arguments if !kwargs.is_empty() { - let unexpected_keys: Vec = kwargs.keys().map(|s| s.to_string()).collect(); + let unexpected_keys = kwargs.keys().map(|s| s.to_string()).collect::>(); return Err(vm.new_type_error(format!( "TypeVarTuple() got unexpected keyword argument(s): {}", unexpected_keys.join(", ") @@ -898,10 +897,10 @@ pub(crate) mod typevar { #[pyattr] #[pyclass(name = "ParamSpecArgs", module = "typing")] #[derive(Debug, PyPayload)] - #[allow(dead_code)] pub struct ParamSpecArgs { __origin__: PyObjectRef, } + #[pyclass(with(Constructor, Representable, Comparable), flags(HAS_WEAKREF))] impl ParamSpecArgs { #[pymethod] @@ -961,10 +960,10 @@ pub(crate) mod typevar { #[pyattr] #[pyclass(name = "ParamSpecKwargs", module = "typing")] #[derive(Debug, PyPayload)] - #[allow(dead_code)] pub struct ParamSpecKwargs { __origin__: PyObjectRef, } + #[pyclass(with(Constructor, Representable, Comparable), flags(HAS_WEAKREF))] impl ParamSpecKwargs { #[pymethod] @@ -1048,7 +1047,6 @@ pub(crate) mod typevar { #[pyattr] #[pyclass(name = "Generic", module = "typing")] #[derive(Debug, PyPayload)] - #[allow(dead_code)] pub struct Generic; #[pyclass(flags(BASETYPE, HEAPTYPE))] From da8e6eef1f6a0741bab32a6d2c954d6e5f4584a7 Mon Sep 17 00:00:00 2001 From: Bas Schoenmaeckers <7943856+bschoenmaeckers@users.noreply.github.com> Date: Wed, 10 Jun 2026 04:02:26 +0200 Subject: [PATCH 041/339] Add more object functions to c-api (#8042) --- crates/capi/src/object.rs | 272 ++++++++++++++++++++++++++++++- crates/vm/src/builtins/mod.rs | 1 + crates/vm/src/builtins/object.rs | 4 +- crates/vm/src/object/core.rs | 6 + 4 files changed, 278 insertions(+), 5 deletions(-) diff --git a/crates/capi/src/object.rs b/crates/capi/src/object.rs index 9866d9041..5e601d381 100644 --- a/crates/capi/src/object.rs +++ b/crates/capi/src/object.rs @@ -1,9 +1,11 @@ use crate::PyObject; use crate::pystate::with_vm; -use core::ffi::{CStr, c_char, c_int, c_uint, c_ulong}; +use core::ffi::{CStr, c_char, c_int, c_uint, c_ulong, c_void}; use core::ptr::NonNull; -use rustpython_vm::builtins::{PyStr, PyType}; -use rustpython_vm::{AsObject, Py}; +use rustpython_vm::builtins::{PyStr, PyType, object_generic_set_dict, object_get_dict}; +use rustpython_vm::bytecode::ComparisonOperator; +use rustpython_vm::function::PySetterValue; +use rustpython_vm::{AsObject, Py, PyPayload}; pub type PyTypeObject = Py; @@ -76,6 +78,11 @@ pub unsafe extern "C" fn PyType_GetQualName(ptr: *const PyTypeObject) -> *mut Py with_vm(|vm| unsafe { &*ptr }.__qualname__(vm)) } +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyType_GetModuleName(ptr: *const PyTypeObject) -> *mut PyObject { + with_vm(|vm| unsafe { &*ptr }.__module__(vm)) +} + #[unsafe(no_mangle)] pub unsafe extern "C" fn PyType_GetFullyQualifiedName(ptr: *const PyTypeObject) -> *mut PyObject { with_vm(|vm| { @@ -142,6 +149,29 @@ pub unsafe extern "C" fn PyObject_GetAttrString( }) } +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyObject_GetOptionalAttr( + obj: *mut PyObject, + name: *mut PyObject, + result: *mut *mut PyObject, +) -> c_int { + with_vm(|vm| { + unsafe { + *result = core::ptr::null_mut(); + } + let obj = unsafe { &*obj }; + let name = unsafe { &*name }.try_downcast_ref::(vm)?; + if let Some(attr) = vm.get_attribute_opt(obj.to_owned(), name)? { + unsafe { + *result = attr.into_raw().as_ptr(); + } + Ok(true) + } else { + Ok(false) + } + }) +} + #[unsafe(no_mangle)] pub unsafe extern "C" fn PyObject_SetAttrString( obj: *mut PyObject, @@ -172,6 +202,30 @@ pub unsafe extern "C" fn PyObject_SetAttr( }) } +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyObject_HasAttrWithError( + obj: *mut PyObject, + attr_name: *mut PyObject, +) -> c_int { + with_vm(|vm| { + let obj = unsafe { &*obj }; + let name = unsafe { &*attr_name }.try_downcast_ref::(vm)?; + obj.has_attr(name, vm) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyObject_GenericGetAttr( + obj: *mut PyObject, + name: *mut PyObject, +) -> *mut PyObject { + with_vm(|vm| { + let obj = unsafe { &*obj }; + let name = unsafe { &*name }.try_downcast_ref::(vm)?; + obj.generic_getattr(name, vm) + }) +} + #[unsafe(no_mangle)] pub extern "C" fn PyObject_Repr(obj: *mut PyObject) -> *mut PyObject { with_vm(|vm| { @@ -194,6 +248,48 @@ pub extern "C" fn PyObject_Str(obj: *mut PyObject) -> *mut PyObject { }) } +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyObject_RichCompare( + left: *mut PyObject, + right: *mut PyObject, + op: c_int, +) -> *mut PyObject { + with_vm(|vm| { + let op = match op { + 0 => ComparisonOperator::Less, + 1 => ComparisonOperator::LessOrEqual, + 2 => ComparisonOperator::Equal, + 3 => ComparisonOperator::NotEqual, + 4 => ComparisonOperator::Greater, + 5 => ComparisonOperator::GreaterOrEqual, + _ => return Err(vm.new_system_error("invalid comparison operator")), + }; + let left = unsafe { &*left }; + let right = unsafe { &*right }; + left.to_owned() + .rich_compare(right.to_owned(), op.into(), vm) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyCallable_Check(obj: *mut PyObject) -> c_int { + with_vm(|_vm| unsafe { obj.as_ref().is_some_and(PyObject::is_callable) }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyObject_ClearWeakRefs(obj: *mut PyObject) { + with_vm(|_vm| unsafe { &*obj }.clear_weak_refs()) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyObject_Dir(obj: *mut PyObject) -> *mut PyObject { + with_vm(|vm| { + unsafe { obj.as_ref() } + .map_or_else(|| vm.dir(None), |obj| obj.to_owned().dir(vm)) + .map(|list| list.into_ref(&vm.ctx)) + }) +} + #[unsafe(no_mangle)] pub unsafe extern "C" fn PyObject_IsTrue(obj: *mut PyObject) -> c_int { with_vm(|vm| { @@ -201,3 +297,173 @@ pub unsafe extern "C" fn PyObject_IsTrue(obj: *mut PyObject) -> c_int { obj.to_owned().is_true(vm) }) } + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyObject_GenericGetDict( + obj: *mut PyObject, + _context: *mut c_void, +) -> *mut PyObject { + with_vm(|vm| { + let obj = unsafe { &*obj }; + object_get_dict(obj.to_owned(), vm) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyObject_GenericSetDict( + obj: *mut PyObject, + value: *mut PyObject, + _context: *mut c_void, +) -> c_int { + with_vm(|vm| { + let obj = unsafe { &*obj }; + let value = match NonNull::new(value) { + Some(value) => PySetterValue::Assign(unsafe { value.as_ref() }.to_owned()), + None => PySetterValue::Delete, + }; + object_generic_set_dict(obj.to_owned(), value, vm) + }) +} + +#[cfg(false)] +mod tests { + use pyo3::class::basic::CompareOp; + use pyo3::prelude::*; + use pyo3::types::{PyBool, PyDict, PyInt, PyString, PyTypeMethods}; + + #[test] + fn is_truthy() { + Python::attach(|py| { + assert!(!py.None().is_truthy(py).unwrap()); + }) + } + + #[test] + fn is_none() { + Python::attach(|py| { + assert!(py.None().is_none(py)); + }) + } + + #[test] + fn bool() { + Python::attach(|py| { + assert!(PyBool::new(py, true).is_truthy().unwrap()); + assert!(!PyBool::new(py, false).is_truthy().unwrap()); + }) + } + + #[test] + fn type_name() { + Python::attach(|py| { + let string = PyString::new(py, "Hello, World!"); + assert_eq!(string.get_type().name().unwrap().to_str().unwrap(), "str"); + }) + } + + #[test] + fn repr() { + Python::attach(|py| { + let module = py.import("sys").unwrap(); + assert_eq!(module.repr().unwrap(), ""); + }) + } + + #[test] + fn obj_to_str() { + Python::attach(|py| { + let number = PyInt::new(py, 42); + assert_eq!(number.str().unwrap(), "42"); + }) + } + + #[test] + fn get_attr() { + Python::attach(|py| { + let sys = py.import("sys").unwrap(); + let implementation = sys + .getattr("implementation") + .unwrap() + .getattr("name") + .unwrap() + .str() + .unwrap(); + + assert_eq!(implementation, "rustpython"); + }) + } + + #[test] + fn callable_check() { + Python::attach(|py| { + let int_type = py.get_type::(); + assert!(int_type.is_callable()); + assert!(!PyInt::new(py, 42).is_callable()); + }) + } + + #[test] + fn object_dir() { + Python::attach(|py| { + assert!(PyInt::new(py, 42).dir().unwrap().len() > 0); + }) + } + + #[test] + fn get_optional_attr() { + Python::attach(|py| { + let number = PyInt::new(py, 42); + assert!(number.getattr_opt("real").unwrap().is_some()); + assert!( + number + .getattr_opt("attribute_that_should_not_exist") + .unwrap() + .is_none() + ); + }) + } + + #[test] + fn rich_compare() { + Python::attach(|py| { + let lower = PyInt::new(py, 1); + let upper = PyInt::new(py, 2); + assert!( + lower + .rich_compare(upper, CompareOp::Lt) + .unwrap() + .is_truthy() + .unwrap() + ); + }) + } + + #[test] + fn type_get_module_name() { + Python::attach(|py| { + assert_eq!( + py.get_type::().module().unwrap().to_str().unwrap(), + "builtins" + ); + }) + } + + #[test] + fn generic_get_dict() { + Python::attach(|py| { + let globals = PyDict::new(py); + py.run(c"class MyClass: ...", None, Some(&globals)).unwrap(); + let my_class = globals.get_item("MyClass").unwrap().unwrap(); + let instance = my_class.call0().unwrap(); + instance.setattr("foo", 42).unwrap(); + let dict = unsafe { + Bound::from_owned_ptr_or_err( + py, + pyo3::ffi::PyObject_GenericGetDict(instance.as_ptr(), core::ptr::null_mut()), + ) + } + .unwrap(); + assert!(dict.get_item("foo").is_ok()); + }) + } +} diff --git a/crates/vm/src/builtins/mod.rs b/crates/vm/src/builtins/mod.rs index 099787332..27b52dacb 100644 --- a/crates/vm/src/builtins/mod.rs +++ b/crates/vm/src/builtins/mod.rs @@ -56,6 +56,7 @@ pub(crate) mod namespace; pub use namespace::PyNamespace; pub(crate) mod object; pub use object::PyBaseObject; +pub use object::{object_generic_set_dict, object_get_dict}; pub(crate) mod property; pub use property::PyProperty; #[path = "bool.rs"] diff --git a/crates/vm/src/builtins/object.rs b/crates/vm/src/builtins/object.rs index a41d4dea4..147e215a0 100644 --- a/crates/vm/src/builtins/object.rs +++ b/crates/vm/src/builtins/object.rs @@ -555,7 +555,7 @@ impl PyBaseObject { } } -pub(crate) fn object_get_dict(obj: PyObjectRef, vm: &VirtualMachine) -> PyResult { +pub fn object_get_dict(obj: PyObjectRef, vm: &VirtualMachine) -> PyResult { if let Some(dict) = obj.dict() { Ok(dict) } else { @@ -578,7 +578,7 @@ pub(crate) fn object_set_dict( .map_err(|_| vm.new_attribute_error("This object has no __dict__")) } -pub(crate) fn object_generic_set_dict( +pub fn object_generic_set_dict( obj: PyObjectRef, value: PySetterValue, vm: &VirtualMachine, diff --git a/crates/vm/src/object/core.rs b/crates/vm/src/object/core.rs index 837023fa3..57b190ca3 100644 --- a/crates/vm/src/object/core.rs +++ b/crates/vm/src/object/core.rs @@ -1445,6 +1445,12 @@ impl PyObject { self.downgrade_with_typ(callback, vm.ctx.types.weakref_type.to_owned(), vm) } + pub fn clear_weak_refs(&self) { + if let Some(wrl) = self.weak_ref_list() { + wrl.clear(self); + } + } + pub fn get_weak_references(&self) -> Option>> { self.weak_ref_list() .map(|wrl| wrl.get_weak_references(self)) From cff6f9c2a7804be24b146843953c4f09e9fe18ad Mon Sep 17 00:00:00 2001 From: Bas Schoenmaeckers <7943856+bschoenmaeckers@users.noreply.github.com> Date: Wed, 10 Jun 2026 04:03:29 +0200 Subject: [PATCH 042/339] Add more dict functions to c-api (#8043) --- crates/capi/src/dictobject.rs | 171 ++++++++++++++++++++++++++++++++- crates/vm/src/builtins/dict.rs | 86 ++++++++++++----- 2 files changed, 233 insertions(+), 24 deletions(-) diff --git a/crates/capi/src/dictobject.rs b/crates/capi/src/dictobject.rs index dc5dd5848..ebc4a827f 100644 --- a/crates/capi/src/dictobject.rs +++ b/crates/capi/src/dictobject.rs @@ -4,6 +4,7 @@ use crate::pystate::with_vm; use core::ffi::c_int; use core::ptr::NonNull; use rustpython_vm::AsObject; +use rustpython_vm::PyPayload; use rustpython_vm::builtins::PyDict; define_py_check!(fn PyDict_Check, types.dict_type); @@ -64,6 +65,100 @@ pub unsafe extern "C" fn PyDict_Size(dict: *mut PyObject) -> isize { }) } +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyDict_Contains(dict: *mut PyObject, key: *mut PyObject) -> c_int { + with_vm(|vm| { + let dict = unsafe { &*dict }.try_downcast_ref::(vm)?; + let key = unsafe { &*key }; + Ok(dict.inner_getitem_opt(key, vm)?.is_some()) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyDict_Copy(dict: *mut PyObject) -> *mut PyObject { + with_vm(|vm| { + let dict = unsafe { &*dict }.try_downcast_ref::(vm)?; + Ok(dict.copy().into_ref(&vm.ctx)) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyDict_DelItem(dict: *mut PyObject, key: *mut PyObject) -> c_int { + with_vm(|vm| { + let dict = unsafe { &*dict }.try_downcast_ref::(vm)?; + let key = unsafe { &*key }; + dict.del_item(key, vm) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyDict_Items(dict: *mut PyObject) -> *mut PyObject { + with_vm(|vm| { + let dict = unsafe { &*dict }.try_downcast_ref::(vm)?; + let items = dict + .items_vec() + .into_iter() + .map(|(k, v)| vm.ctx.new_tuple(vec![k, v]).into()) + .collect(); + Ok(vm.ctx.new_list(items)) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyDict_Keys(dict: *mut PyObject) -> *mut PyObject { + with_vm(|vm| { + let dict = unsafe { &*dict }.try_downcast_ref::(vm)?; + Ok(vm.ctx.new_list(dict.keys_vec())) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyDict_Values(dict: *mut PyObject) -> *mut PyObject { + with_vm(|vm| { + let dict = unsafe { &*dict }.try_downcast_ref::(vm)?; + Ok(vm.ctx.new_list(dict.values_vec())) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyDict_Merge( + dict: *mut PyObject, + other: *mut PyObject, + override_: c_int, +) -> c_int { + with_vm(|vm| { + let dict = unsafe { &*dict }.try_downcast_ref::(vm)?; + let other = unsafe { &*other }.to_owned(); + if override_ != 0 { + dict.merge_object(other, vm) + } else { + dict.merge_object_if_missing(other, vm) + } + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyDict_Update(dict: *mut PyObject, other: *mut PyObject) -> c_int { + with_vm(|vm| { + let dict = unsafe { &*dict }.try_downcast_ref::(vm)?; + let other = unsafe { &*other }.to_owned(); + dict.merge_object(other, vm) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyDict_MergeFromSeq2( + dict: *mut PyObject, + seq2: *mut PyObject, + override_: c_int, +) -> c_int { + with_vm(|vm| { + let dict = unsafe { &*dict }.try_downcast_ref::(vm)?; + let seq2 = unsafe { &*seq2 }.to_owned(); + dict.merge_from_seq2(seq2, override_ != 0, vm) + }) +} + #[unsafe(no_mangle)] pub unsafe extern "C" fn PyDict_Next( dict: *mut PyObject, @@ -95,7 +190,7 @@ pub unsafe extern "C" fn PyDict_Next( #[cfg(false)] mod tests { use pyo3::prelude::*; - use pyo3::types::{IntoPyDict, PyDict, PyInt}; + use pyo3::types::{IntoPyDict, PyDict, PyDictMethods, PyInt, PyList}; #[test] fn test_create_empty_dict() { @@ -129,4 +224,78 @@ mod tests { assert_eq!(values, vec![1, 2, 3, 4]); }) } + + #[test] + fn dict_contains() { + Python::attach(|py| { + let dict = [(1, 2)].into_py_dict(py).unwrap(); + assert!(dict.contains(1).unwrap()); + assert!(!dict.contains(3).unwrap()); + }) + } + + #[test] + fn dict_copy_and_del_item() { + Python::attach(|py| { + let dict = [(1, 2), (3, 4)].into_py_dict(py).unwrap(); + let copied = dict.copy().unwrap(); + assert_eq!(copied.len(), 2); + copied.del_item(1).unwrap(); + assert!(!copied.contains(1).unwrap()); + }) + } + + #[test] + fn dict_keys_values_items() { + Python::attach(|py| { + let dict = [(1, 2), (3, 4)].into_py_dict(py).unwrap(); + assert_eq!(dict.keys().len(), 2); + assert_eq!(dict.values().len(), 2); + assert_eq!(dict.items().len(), 2); + }) + } + + #[test] + fn dict_update_and_merge() { + Python::attach(|py| { + let dict = [(1, 10)].into_py_dict(py).unwrap(); + let replacement = [(1, 20), (2, 30)].into_py_dict(py).unwrap(); + dict.update(replacement.as_mapping()).unwrap(); + assert_eq!( + dict.get_item(1).unwrap().unwrap().extract::().unwrap(), + 20 + ); + assert_eq!( + dict.get_item(2).unwrap().unwrap().extract::().unwrap(), + 30 + ); + + let merged_missing = [(1, 99), (3, 40)].into_py_dict(py).unwrap(); + dict.update_if_missing(merged_missing.as_mapping()).unwrap(); + assert_eq!( + dict.get_item(1).unwrap().unwrap().extract::().unwrap(), + 20 + ); + assert_eq!( + dict.get_item(3).unwrap().unwrap().extract::().unwrap(), + 40 + ); + }) + } + + #[test] + fn dict_merge_from_seq2() { + Python::attach(|py| { + let seq = PyList::new(py, [(1, 10), (1, 20), (2, 30)]).unwrap(); + let dict = PyDict::from_sequence(seq.as_any()).unwrap(); + assert_eq!( + dict.get_item(1).unwrap().unwrap().extract::().unwrap(), + 20 + ); + assert_eq!( + dict.get_item(2).unwrap().unwrap().extract::().unwrap(), + 30 + ); + }) + } } diff --git a/crates/vm/src/builtins/dict.rs b/crates/vm/src/builtins/dict.rs index 605322ef0..106ca399f 100644 --- a/crates/vm/src/builtins/dict.rs +++ b/crates/vm/src/builtins/dict.rs @@ -143,11 +143,17 @@ impl PyDict { self.entries.items() } - // Used in update and ior. - pub(crate) fn merge_object(&self, other: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> { + fn merge_object_with_override( + &self, + other: PyObjectRef, + override_existing: bool, + vm: &VirtualMachine, + ) -> PyResult<()> { let casted: Result, _> = other.downcast_exact(vm); let other = match casted { - Ok(dict_other) => return self.merge_dict(dict_other.into_pyref(), vm), + Ok(dict_other) => { + return self.merge_dict(dict_other.into_pyref(), override_existing, vm); + } Err(other) => other, }; let dict = &self.entries; @@ -157,6 +163,9 @@ impl PyDict { Ok(keys_method) => { let keys = keys_method.call((), vm)?.get_iter(vm)?; while let PyIterReturn::Return(key) = keys.next(vm)? { + if !override_existing && dict.contains(vm, &*key)? { + continue; + } let val = other.get_item(&*key, vm)?; dict.insert(vm, &*key, val)?; } @@ -166,31 +175,62 @@ impl PyDict { Err(e) => return Err(e), }; if !has_keys { - let iter = other.get_iter(vm)?; - loop { - fn err(vm: &VirtualMachine) -> PyBaseExceptionRef { - vm.new_value_error("Iterator must have exactly two elements") - } - let element = match iter.next(vm)? { - PyIterReturn::Return(obj) => obj, - PyIterReturn::StopIteration(_) => break, - }; - let elem_iter = element.get_iter(vm)?; - let key = elem_iter.next(vm)?.into_result().map_err(|_| err(vm))?; - let value = elem_iter.next(vm)?.into_result().map_err(|_| err(vm))?; - if matches!(elem_iter.next(vm)?, PyIterReturn::Return(_)) { - return Err(err(vm)); - } - dict.insert(vm, &*key, value)?; - } + return self.merge_from_seq2(other, override_existing, vm); } Ok(()) } - fn merge_dict(&self, dict_other: PyDictRef, vm: &VirtualMachine) -> PyResult<()> { + // Used in update and ior. + pub fn merge_object(&self, other: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> { + self.merge_object_with_override(other, true, vm) + } + + pub fn merge_object_if_missing(&self, other: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> { + self.merge_object_with_override(other, false, vm) + } + + pub fn merge_from_seq2( + &self, + seq2: PyObjectRef, + override_existing: bool, + vm: &VirtualMachine, + ) -> PyResult<()> { + let iter = seq2.get_iter(vm)?; + let dict = &self.entries; + loop { + fn err(vm: &VirtualMachine) -> PyBaseExceptionRef { + vm.new_value_error("Iterator must have exactly two elements") + } + let element = match iter.next(vm)? { + PyIterReturn::Return(obj) => obj, + PyIterReturn::StopIteration(_) => break, + }; + let elem_iter = element.get_iter(vm)?; + let key = elem_iter.next(vm)?.into_result().map_err(|_| err(vm))?; + let value = elem_iter.next(vm)?.into_result().map_err(|_| err(vm))?; + if matches!(elem_iter.next(vm)?, PyIterReturn::Return(_)) { + return Err(err(vm)); + } + if !override_existing && dict.contains(vm, &*key)? { + continue; + } + dict.insert(vm, &*key, value)?; + } + Ok(()) + } + + fn merge_dict( + &self, + dict_other: PyDictRef, + override_existing: bool, + vm: &VirtualMachine, + ) -> PyResult<()> { let dict = &self.entries; let dict_size = &dict_other.size(); for (key, value) in &dict_other { + if !override_existing && dict.contains(vm, &*key)? { + continue; + } dict.insert(vm, &*key, value)?; } if dict_other.entries.has_changed_size(dict_size) { @@ -386,7 +426,7 @@ impl PyDict { let other_dict: Result = other.downcast(); if let Ok(other) = other_dict { let self_cp = self.copy(); - self_cp.merge_dict(other, vm)?; + self_cp.merge_dict(other, true, vm)?; return Ok(self_cp.into_pyobject(vm)); } Ok(vm.ctx.not_implemented()) @@ -499,7 +539,7 @@ impl PyRef { let other_dict: Result = other.downcast(); if let Ok(other) = other_dict { let other_cp = other.copy(); - other_cp.merge_dict(self, vm)?; + other_cp.merge_dict(self, true, vm)?; return Ok(other_cp.into_pyobject(vm)); } Ok(vm.ctx.not_implemented()) From 1782dd25ae6d01cdf61207c89bba2d2945beddcb Mon Sep 17 00:00:00 2001 From: Bas Schoenmaeckers <7943856+bschoenmaeckers@users.noreply.github.com> Date: Wed, 10 Jun 2026 04:04:40 +0200 Subject: [PATCH 043/339] Add more unicode functions to c-api (#8044) * Add more unicode functions to c-api * Update crates/capi/src/unicodeobject.rs --- crates/capi/src/unicodeobject.rs | 150 +++++++++++++++++++++++++++++-- 1 file changed, 145 insertions(+), 5 deletions(-) diff --git a/crates/capi/src/unicodeobject.rs b/crates/capi/src/unicodeobject.rs index 76e0fb0df..3eb1e1535 100644 --- a/crates/capi/src/unicodeobject.rs +++ b/crates/capi/src/unicodeobject.rs @@ -1,6 +1,5 @@ -use crate::PyObject; use crate::object::define_py_check; -use crate::pystate::with_vm; +use crate::{PyObject, pystate::with_vm}; use core::ffi::{CStr, c_char, c_int}; use core::ptr::NonNull; use core::slice; @@ -92,6 +91,103 @@ pub unsafe extern "C" fn PyUnicode_AsEncodedString( }) } +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyUnicode_AsUTF8String(unicode: *mut PyObject) -> *mut PyObject { + with_vm(|vm| { + let unicode = unsafe { &*unicode } + .try_downcast_ref::(vm)? + .to_owned(); + vm.state + .codec_registry + .encode_text(unicode, "utf-8", None, vm) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyUnicode_DecodeFSDefaultAndSize( + s: *const c_char, + size: isize, +) -> *mut PyObject { + with_vm(|vm| { + let size: usize = size + .try_into() + .map_err(|_| vm.new_system_error("size must be non-negative"))?; + + let bytes = if s.is_null() { + if size != 0 { + return Err(vm.new_system_error( + "PyUnicode_DecodeFSDefaultAndSize called with null data and non-zero size", + )); + } + &[][..] + } else { + unsafe { slice::from_raw_parts(s.cast::(), size) } + }; + + vm.state.codec_registry.decode_text( + vm.ctx.new_bytes(bytes.to_vec()).into(), + vm.fs_encoding().as_str(), + Some(vm.fs_encode_errors().to_owned()), + vm, + ) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyUnicode_EncodeFSDefault(unicode: *mut PyObject) -> *mut PyObject { + with_vm(|vm| { + let unicode = unsafe { &*unicode } + .try_downcast_ref::(vm)? + .to_owned(); + vm.state.codec_registry.encode_text( + unicode, + vm.fs_encoding().as_str(), + Some(vm.fs_encode_errors().to_owned()), + vm, + ) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyUnicode_FromEncodedObject( + obj: *mut PyObject, + encoding: *const c_char, + errors: *const c_char, +) -> *mut PyObject { + with_vm(|vm| { + let obj = unsafe { &*obj }; + + if obj.downcast_ref::().is_some() { + return Err(vm.new_type_error("decoding str is not supported".to_owned())); + } + + let encoding = if encoding.is_null() { + "utf-8" + } else { + unsafe { CStr::from_ptr(encoding) } + .to_str() + .map_err(|_| vm.new_system_error("encoding must be valid UTF-8"))? + }; + let errors = if errors.is_null() { + None + } else { + let errors = unsafe { CStr::from_ptr(errors) } + .to_str() + .map_err(|_| vm.new_system_error("errors must be valid UTF-8"))?; + Some(vm.ctx.new_utf8_str(errors)) + }; + + obj.try_bytes_like(vm, |b| { + vm.state.codec_registry.decode_text( + vm.ctx.new_bytes(b.to_vec()).into(), + encoding, + errors, + vm, + ) + })? + }) +} + #[unsafe(no_mangle)] pub unsafe extern "C" fn PyUnicode_InternInPlace(string: *mut *mut PyObject) { with_vm(|vm| { @@ -131,12 +227,17 @@ pub unsafe extern "C" fn PyUnicode_EqualToUTF8AndSize( #[cfg(false)] mod tests { + use std::ffi::{OsStr, OsString}; + use pyo3::intern; use pyo3::prelude::*; - use pyo3::types::PyString; + use pyo3::types::{PyBytes, PyString, PyStringMethods}; + + #[cfg(unix)] + use std::os::unix::ffi::OsStrExt; #[test] - fn test_unicode() { + fn unicode() { Python::attach(|py| { let string = PyString::new(py, "Hello, World!"); assert!(string.is_instance_of::()); @@ -146,9 +247,48 @@ mod tests { } #[test] - fn test_intern_str() { + fn intern_str() { Python::attach(|py| { let _string = intern!(py, "Hello, World!"); }) } + + #[test] + fn encode_utf8_via_wrapper() { + Python::attach(|py| { + let s = PyString::new(py, "h\u{00E9}llo"); + let encoded = s.encode_utf8().unwrap(); + assert_eq!(encoded.as_bytes(), "h\u{00E9}llo".as_bytes()); + }) + } + + #[test] + fn from_encoded_object_bytes() { + Python::attach(|py| { + let src = PyBytes::new(py, b"h\xC3\xA9llo"); + let s = PyString::from_encoded_object(src.as_any(), None, None).unwrap(); + assert_eq!(s.to_str().unwrap(), "h\u{00E9}llo"); + }) + } + + #[cfg(unix)] + #[test] + fn fs_default_roundtrip_non_utf8_unix() { + Python::attach(|py| { + let original = OsStr::from_bytes(&[b'f', b'o', 0x80]); + let py_str = original.into_pyobject(py).unwrap(); + let roundtrip: OsString = py_str.extract().unwrap(); + assert_eq!(roundtrip.as_os_str().as_bytes(), original.as_bytes()); + }) + } + + #[test] + fn fs_default_roundtrip_utf8() { + Python::attach(|py| { + let original = OsStr::new("hello.txt"); + let py_str = original.into_pyobject(py).unwrap(); + let roundtrip: OsString = py_str.extract().unwrap(); + assert_eq!(roundtrip, original); + }) + } } From 84ba5c25d71c724f96f53d35f874f2cee4f73eef Mon Sep 17 00:00:00 2001 From: Bas Schoenmaeckers <7943856+bschoenmaeckers@users.noreply.github.com> Date: Wed, 10 Jun 2026 04:05:18 +0200 Subject: [PATCH 044/339] Add more list functions to the c-api (#8045) --- crates/capi/src/listobject.rs | 125 +++++++++++++++++++++++++++++++--- 1 file changed, 115 insertions(+), 10 deletions(-) diff --git a/crates/capi/src/listobject.rs b/crates/capi/src/listobject.rs index 1f70e37b6..796720f99 100644 --- a/crates/capi/src/listobject.rs +++ b/crates/capi/src/listobject.rs @@ -3,8 +3,10 @@ use crate::object::define_py_check; use crate::pystate::with_vm; use core::ffi::c_int; use core::ptr::NonNull; +use rustpython_vm::AsObject; use rustpython_vm::PyObjectRef; use rustpython_vm::builtins::PyList; +use rustpython_vm::sliceable::{SaturatedSlice, SliceableSequenceMutOp, SliceableSequenceOp}; define_py_check!(fn PyList_Check, types.list_type); define_py_check!(exact fn PyList_CheckExact, types.list_type); @@ -110,16 +112,69 @@ pub unsafe extern "C" fn PyList_Reverse(list: *mut PyObject) -> c_int { }) } +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyList_AsTuple(list: *mut PyObject) -> *mut PyObject { + with_vm(|vm| { + let list = unsafe { &*list }.try_downcast_ref::(vm)?; + Ok(vm.ctx.new_tuple(list.borrow_vec().to_vec())) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyList_GetSlice( + list: *mut PyObject, + low: isize, + high: isize, +) -> *mut PyObject { + with_vm(|vm| { + let list = unsafe { &*list }.try_downcast_ref::(vm)?; + let vec = list.borrow_vec(); + let sliced = vec.getitem_by_slice(vm, SaturatedSlice::from_parts(low, high, 1))?; + Ok(vm.ctx.new_list(sliced)) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyList_SetSlice( + list: *mut PyObject, + low: isize, + high: isize, + itemlist: *mut PyObject, +) -> c_int { + with_vm(|vm| { + let list = unsafe { &*list }.try_downcast_ref::(vm)?; + let slice = SaturatedSlice::from_parts(low, high, 1); + let mut vec = list.borrow_vec_mut(); + + if itemlist.is_null() { + vec.delitem_by_slice(vm, slice)?; + return Ok(()); + } + + let items: Vec = unsafe { &*itemlist }.try_to_value(vm)?; + vec.setitem_by_slice(vm, slice, &items) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyList_Sort(list: *mut PyObject) -> c_int { + with_vm(|vm| { + let list = unsafe { &*list }.try_downcast_ref::(vm)?; + vm.call_method(list.as_object(), "sort", ())?; + Ok(()) + }) +} + #[cfg(false)] mod tests { use pyo3::exceptions::PyIndexError; use pyo3::prelude::*; - use pyo3::types::PyList; + use pyo3::types::{PyList, PyListMethods}; #[test] - fn test_create_list() { + fn create_list() { Python::attach(|py| { - let list = PyList::new(py, &[1, 2, 3]).unwrap(); + let list = PyList::new(py, [1, 2, 3]).unwrap(); assert_eq!(list.len(), 3); assert_eq!(list.get_item(0).unwrap().extract::().unwrap(), 1); assert_eq!(list.get_item(1).unwrap().extract::().unwrap(), 2); @@ -129,9 +184,9 @@ mod tests { } #[test] - fn test_replace_item_in_list() { + fn replace_item_in_list() { Python::attach(|py| { - let list = PyList::new(py, &[1]).unwrap(); + let list = PyList::new(py, [1]).unwrap(); assert_eq!(list.len(), 1); list.set_item(0, 2).unwrap(); assert_eq!(list.len(), 1); @@ -140,7 +195,7 @@ mod tests { } #[test] - fn test_set_item_out_of_range() { + fn set_item_out_of_range() { Python::attach(|py| { let list = PyList::empty(py); assert!( @@ -152,7 +207,7 @@ mod tests { } #[test] - fn test_list_append() { + fn list_append() { Python::attach(|py| { let list = PyList::empty(py); assert_eq!(list.len(), 0); @@ -163,7 +218,7 @@ mod tests { } #[test] - fn test_list_insert() { + fn list_insert() { Python::attach(|py| { let list = PyList::empty(py); assert_eq!(list.len(), 0); @@ -175,12 +230,62 @@ mod tests { } #[test] - fn test_list_reverse() { + fn list_reverse() { Python::attach(|py| { - let list = PyList::new(py, &[1, 2, 3]).unwrap(); + let list = PyList::new(py, [1, 2, 3]).unwrap(); list.reverse().unwrap(); assert_eq!(list.get_item(0).unwrap().extract::().unwrap(), 3); assert_eq!(list.get_item(2).unwrap().extract::().unwrap(), 1); }) } + + #[test] + fn list_as_tuple() { + Python::attach(|py| { + let list = PyList::new(py, [1, 2, 3]).unwrap(); + let tuple = list.to_tuple(); + assert_eq!(tuple.len(), 3); + assert_eq!(tuple.get_item(0).unwrap().extract::().unwrap(), 1); + + list.set_item(0, 9).unwrap(); + assert_eq!(tuple.get_item(0).unwrap().extract::().unwrap(), 1); + }) + } + + #[test] + fn list_get_slice() { + Python::attach(|py| { + let list = PyList::new(py, [1, 2, 3, 4]).unwrap(); + let slice = list.get_slice(1, 10); + assert_eq!(slice.len(), 3); + assert_eq!(slice.get_item(0).unwrap().extract::().unwrap(), 2); + assert_eq!(slice.get_item(2).unwrap().extract::().unwrap(), 4); + }) + } + + #[test] + fn list_set_slice() { + Python::attach(|py| { + let list = PyList::new(py, [1, 2, 3, 4]).unwrap(); + let repl = PyList::new(py, [8, 9]).unwrap(); + list.set_slice(1, 3, repl.as_any()).unwrap(); + + assert_eq!(list.len(), 4); + assert_eq!(list.get_item(0).unwrap().extract::().unwrap(), 1); + assert_eq!(list.get_item(1).unwrap().extract::().unwrap(), 8); + assert_eq!(list.get_item(2).unwrap().extract::().unwrap(), 9); + assert_eq!(list.get_item(3).unwrap().extract::().unwrap(), 4); + }) + } + + #[test] + fn list_sort() { + Python::attach(|py| { + let list = PyList::new(py, [3, 1, 2]).unwrap(); + list.sort().unwrap(); + assert_eq!(list.get_item(0).unwrap().extract::().unwrap(), 1); + assert_eq!(list.get_item(1).unwrap().extract::().unwrap(), 2); + assert_eq!(list.get_item(2).unwrap().extract::().unwrap(), 3); + }) + } } From 599bc48cb04f0c36853dff33b0bb7b3903605508 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jun 2026 11:05:29 +0900 Subject: [PATCH 045/339] Bump uuid from 1.23.1 to 1.23.2 (#8046) Bumps [uuid](https://github.com/uuid-rs/uuid) from 1.23.1 to 1.23.2. - [Release notes](https://github.com/uuid-rs/uuid/releases) - [Commits](https://github.com/uuid-rs/uuid/compare/v1.23.1...v1.23.2) --- updated-dependencies: - dependency-name: uuid dependency-version: 1.23.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 55afb99b0..767b57538 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4726,9 +4726,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.23.1" +version = "1.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddd74a9687298c6858e9b88ec8935ec45d22e8fd5e6394fa1bd4e99a87789c76" +checksum = "d258b83ceec21034727ecee8c382cfa6c3e133699b0742c64571814fb420c9f7" dependencies = [ "atomic", "getrandom 0.4.2", diff --git a/Cargo.toml b/Cargo.toml index eda23858f..1ac87228a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -317,7 +317,7 @@ icu_casemap = "2" icu_locale = "2" icu_properties = "2" icu_normalizer = "2" -uuid = "1.23.1" +uuid = "1.23.2" ucd = "0.1.1" unic-ucd-age = "0.9.0" unicode_names2 = "2.0.0" From 5a5b4cfb06d826f60de80f7c45c30b1786f5cc9a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jun 2026 11:05:39 +0900 Subject: [PATCH 046/339] Bump lz4_flex from 0.13.0 to 0.13.1 (#8047) Bumps [lz4_flex](https://github.com/pseitz/lz4_flex) from 0.13.0 to 0.13.1. - [Release notes](https://github.com/pseitz/lz4_flex/releases) - [Changelog](https://github.com/PSeitz/lz4_flex/blob/main/CHANGELOG.md) - [Commits](https://github.com/pseitz/lz4_flex/compare/0.13.0...0.13.1) --- updated-dependencies: - dependency-name: lz4_flex dependency-version: 0.13.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 767b57538..b21f08bf2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2212,9 +2212,9 @@ checksum = "113b30b4cd05f7c06868fdb2854f66a7b9fece9a48425351cd532e810d74024f" [[package]] name = "lz4_flex" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db9a0d582c2874f68138a16ce1867e0ffde6c0bb0a0df85e1f36d04146db488a" +checksum = "7ef0d4ed8669f8f8826eb00dc878084aa8f253506c4fd5e8f58f5bce72ddb97e" dependencies = [ "twox-hash", ] From 5e926e289119189b22fa2f278326b616ac2ea40b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jun 2026 11:05:46 +0900 Subject: [PATCH 047/339] Bump rustls-native-certs from 0.8.3 to 0.8.4 (#8049) Bumps [rustls-native-certs](https://github.com/rustls/rustls-native-certs) from 0.8.3 to 0.8.4. - [Release notes](https://github.com/rustls/rustls-native-certs/releases) - [Commits](https://github.com/rustls/rustls-native-certs/compare/v/0.8.3...v/0.8.4) --- updated-dependencies: - dependency-name: rustls-native-certs dependency-version: 0.8.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b21f08bf2..4722e5614 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -100,7 +100,7 @@ version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -111,7 +111,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -1145,7 +1145,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -1237,7 +1237,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -1971,7 +1971,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "160f2eade097f30263b548aae5deb12ad349c909baa710fa24b92c9090b2e006" dependencies = [ "scopeguard", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -3350,7 +3350,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -3380,9 +3380,9 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "612460d5f7bea540c490b2b6395d8e34a953e52b491accd6c86c8164c5932a63" +checksum = "dab5152771c58876a2146916e53e35057e1a4dfa2b9df0f0305b07f611fdea4d" dependencies = [ "openssl-probe", "rustls-pki-types", @@ -3426,7 +3426,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -4231,7 +4231,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52d1cfed4120b4d927bf7c0f86d2087a4a7d6027c906d9f9d525a80573b9be51" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -4375,7 +4375,7 @@ dependencies = [ "getrandom 0.4.2", "once_cell", "rustix", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -4968,7 +4968,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] From dc81e050c679a35fd946b5c66dce2f98075f66fb Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Wed, 10 Jun 2026 05:13:42 +0300 Subject: [PATCH 048/339] more clippy rules (#8050) * `checked_conversions` * duration_suboptimal_units * inefficient_to_string * iter_on_single_items * needless_collect * needless_for_each * ptr_offset_by_literal * return_self_not_must_use --- Cargo.toml | 16 ++++++++++++++++ crates/capi/src/traceback.rs | 4 +--- crates/common/src/boxvec.rs | 2 +- crates/common/src/cformat.rs | 6 ++++++ crates/derive-impl/src/pyclass.rs | 13 ++++++++----- crates/jit/src/instructions.rs | 2 ++ crates/sre_engine/src/string.rs | 18 +++++++++--------- crates/stdlib/src/_asyncio.rs | 8 ++++---- crates/vm/src/builtins/dict.rs | 9 +++++---- crates/vm/src/builtins/getset.rs | 3 +++ crates/vm/src/builtins/memory.rs | 3 ++- crates/vm/src/builtins/str.rs | 18 ++++++++---------- crates/vm/src/bytes_inner.rs | 4 +++- crates/vm/src/frame.rs | 2 +- crates/vm/src/stdlib/sys.rs | 2 +- crates/vm/src/types/slot_defs.rs | 9 +++------ crates/vm/src/vm/interpreter.rs | 2 ++ 17 files changed, 75 insertions(+), 46 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 1ac87228a..baa17d48b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -368,6 +368,10 @@ tests_outside_test_module = "warn" debug_assert_with_mut_call = "warn" derive_partial_eq_without_eq = "warn" imprecise_flops = "warn" +iter_on_empty_collections = "warn" +iter_on_single_items = "warn" +literal_string_with_formatting_args = "warn" +needless_collect = "warn" or_fun_call = "warn" redundant_clone = "warn" search_is_some = "warn" @@ -379,9 +383,11 @@ use_self = "warn" useless_let_if_seq = "warn" # pedantic lints to enforce gradually +checked_conversions = "warn" cloned_instead_of_copied = "warn" collapsible_else_if = "warn" comparison_chain = "warn" +duration_suboptimal_units = "warn" explicit_into_iter_loop = "warn" explicit_iter_loop = "warn" filter_map_next = "warn" @@ -389,11 +395,21 @@ flat_map_option = "warn" format_collect = "warn" from_iter_instead_of_collect = "warn" inconsistent_struct_constructor = "warn" +index_refutable_slice = "warn" inefficient_to_string = "warn" +iter_filter_is_ok = "warn" +iter_filter_is_some = "warn" manual_is_variant_and = "warn" map_unwrap_or = "warn" +match_bool = "warn" must_use_candidate = "warn" +mut_mut = "warn" +needless_bitwise_bool = "warn" +needless_for_each = "warn" +option_as_ref_cloned = "warn" +ptr_offset_by_literal = "warn" redundant_else = "warn" +return_self_not_must_use = "warn" uninlined_format_args = "warn" unnecessary_wraps = "warn" unnested_or_patterns = "warn" diff --git a/crates/capi/src/traceback.rs b/crates/capi/src/traceback.rs index 5b264b1dd..8728ba5fa 100644 --- a/crates/capi/src/traceback.rs +++ b/crates/capi/src/traceback.rs @@ -14,9 +14,7 @@ pub unsafe extern "C" fn PyTraceBack_Print(tb: *mut PyObject, file: *mut PyObjec let tb_module = vm.import("traceback", 0)?; let print_tb = tb_module.get_attr("print_tb", vm)?; - let kwargs: KwArgs = [("file".to_string(), file.to_owned())] - .into_iter() - .collect(); + let kwargs: KwArgs = core::iter::once(("file".to_string(), file.to_owned())).collect(); print_tb.call(FuncArgs::new(vec![tb.to_owned()], kwargs), vm)?; Ok(()) diff --git a/crates/common/src/boxvec.rs b/crates/common/src/boxvec.rs index 675420259..42a9935dc 100644 --- a/crates/common/src/boxvec.rs +++ b/crates/common/src/boxvec.rs @@ -127,7 +127,7 @@ impl BoxVec { let p: *mut _ = self.get_unchecked_ptr(index); // Shift everything over to make space. (Duplicating the // `index`th element into two consecutive places.) - ptr::copy(p, p.offset(1), len - index); + ptr::copy(p, p.add(1), len - index); // Write it in, overwriting the first copy of the `index`th // element. ptr::write(p, element); diff --git a/crates/common/src/cformat.rs b/crates/common/src/cformat.rs index 7dbe10769..373fdebe1 100644 --- a/crates/common/src/cformat.rs +++ b/crates/common/src/cformat.rs @@ -160,16 +160,22 @@ pub trait FormatBuf: Extend + Default + FromIterator + From { type Char: FormatChar; + fn chars(&self) -> impl Iterator; + fn len(&self) -> usize; + fn is_empty(&self) -> bool { self.len() == 0 } + + #[must_use] fn concat(self, other: Self) -> Self; } pub trait FormatChar: Copy + Into + From { fn to_char_lossy(self) -> char; + fn eq_char(self, c: char) -> bool; } diff --git a/crates/derive-impl/src/pyclass.rs b/crates/derive-impl/src/pyclass.rs index 0cc0faa11..d892db17e 100644 --- a/crates/derive-impl/src/pyclass.rs +++ b/crates/derive-impl/src/pyclass.rs @@ -1671,11 +1671,14 @@ impl ItemMeta for SlotItemMeta { I: core::iter::Iterator, { let meta_map = if let Some(nested_meta) = nested.next() { - match nested_meta { - NestedMeta::Meta(meta) => { - Some([("name".to_owned(), (0, meta))].iter().cloned().collect()) - } - _ => None, + if let NestedMeta::Meta(meta) = nested_meta { + Some( + core::iter::once(&("name".to_owned(), (0, meta))) + .cloned() + .collect(), + ) + } else { + None } } else { Some(HashMap::default()) diff --git a/crates/jit/src/instructions.rs b/crates/jit/src/instructions.rs index 61780a243..6aff9f093 100644 --- a/crates/jit/src/instructions.rs +++ b/crates/jit/src/instructions.rs @@ -109,6 +109,7 @@ impl<'a, 'b> FunctionCompiler<'a, 'b> { } fn store_variable(&mut self, idx: oparg::VarNum, val: JitValue) -> Result<(), JitCompileError> { + #[expect(clippy::mut_mut, reason = "This seems like a false positive")] let builder = &mut self.builder; let ty = val.to_jit_type().ok_or(JitCompileError::NotSupported)?; let local = self.variables[idx].get_or_insert_with(|| { @@ -147,6 +148,7 @@ impl<'a, 'b> FunctionCompiler<'a, 'b> { } fn get_or_create_block(&mut self, label: Label) -> Block { + #[expect(clippy::mut_mut, reason = "This seems like a false positive")] let builder = &mut self.builder; *self .label_to_block diff --git a/crates/sre_engine/src/string.rs b/crates/sre_engine/src/string.rs index 83b80ad81..6c8b9a567 100644 --- a/crates/sre_engine/src/string.rs +++ b/crates/sre_engine/src/string.rs @@ -75,7 +75,7 @@ impl StrDrive for &[u8] { #[inline] fn back_peek(cursor: &StringCursor) -> u32 { - unsafe { *cursor.ptr.offset(-1) as u32 } + unsafe { *cursor.ptr.sub(1) as u32 } } #[inline] @@ -227,7 +227,7 @@ impl StrDrive for &Wtf8 { const unsafe fn next_code_point(ptr: &mut *const u8) -> u32 { // Decode UTF-8 let x = unsafe { **ptr }; - *ptr = unsafe { ptr.offset(1) }; + *ptr = unsafe { ptr.add(1) }; if x < 128 { return x as u32; @@ -240,7 +240,7 @@ const unsafe fn next_code_point(ptr: &mut *const u8) -> u32 { // SAFETY: `bytes` produces an UTF-8-like string, // so the iterator must produce a value here. let y = unsafe { **ptr }; - *ptr = unsafe { ptr.offset(1) }; + *ptr = unsafe { ptr.add(1) }; let mut ch = utf8_acc_cont_byte(init, y); if x >= 0xE0 { // [[x y z] w] case @@ -248,7 +248,7 @@ const unsafe fn next_code_point(ptr: &mut *const u8) -> u32 { // SAFETY: `bytes` produces an UTF-8-like string, // so the iterator must produce a value here. let z = unsafe { **ptr }; - *ptr = unsafe { ptr.offset(1) }; + *ptr = unsafe { ptr.add(1) }; let y_z = utf8_acc_cont_byte((y & CONT_MASK) as u32, z); ch = (init << 12) | y_z; if x >= 0xF0 { @@ -257,7 +257,7 @@ const unsafe fn next_code_point(ptr: &mut *const u8) -> u32 { // SAFETY: `bytes` produces an UTF-8-like string, // so the iterator must produce a value here. let w = unsafe { **ptr }; - *ptr = unsafe { ptr.offset(1) }; + *ptr = unsafe { ptr.add(1) }; ch = ((init & 7) << 18) | utf8_acc_cont_byte(y_z, w); } } @@ -274,7 +274,7 @@ const unsafe fn next_code_point(ptr: &mut *const u8) -> u32 { #[inline] const unsafe fn next_code_point_reverse(ptr: &mut *const u8) -> u32 { // Decode UTF-8 - *ptr = unsafe { ptr.offset(-1) }; + *ptr = unsafe { ptr.sub(1) }; let w = match unsafe { **ptr } { next_byte if next_byte < 128 => return next_byte as u32, back_byte => back_byte, @@ -285,19 +285,19 @@ const unsafe fn next_code_point_reverse(ptr: &mut *const u8) -> u32 { let mut ch; // SAFETY: `bytes` produces an UTF-8-like string, // so the iterator must produce a value here. - *ptr = unsafe { ptr.offset(-1) }; + *ptr = unsafe { ptr.sub(1) }; let z = unsafe { **ptr }; ch = utf8_first_byte(z, 2); if utf8_is_cont_byte(z) { // SAFETY: `bytes` produces an UTF-8-like string, // so the iterator must produce a value here. - *ptr = unsafe { ptr.offset(-1) }; + *ptr = unsafe { ptr.sub(1) }; let y = unsafe { **ptr }; ch = utf8_first_byte(y, 3); if utf8_is_cont_byte(y) { // SAFETY: `bytes` produces an UTF-8-like string, // so the iterator must produce a value here. - *ptr = unsafe { ptr.offset(-1) }; + *ptr = unsafe { ptr.sub(1) }; let x = unsafe { **ptr }; ch = utf8_first_byte(x, 4); ch = utf8_acc_cont_byte(ch, y); diff --git a/crates/stdlib/src/_asyncio.rs b/crates/stdlib/src/_asyncio.rs index 90114900e..ee5e207d4 100644 --- a/crates/stdlib/src/_asyncio.rs +++ b/crates/stdlib/src/_asyncio.rs @@ -564,7 +564,7 @@ pub(crate) mod _asyncio { let args = if let Some(ctx) = context { FuncArgs::new( vec![callback, future_arg], - KwArgs::new([("context".to_owned(), ctx)].into_iter().collect()), + KwArgs::new(core::iter::once(("context".to_owned(), ctx)).collect()), ) } else { FuncArgs::new(vec![callback, future_arg], KwArgs::default()) @@ -1494,7 +1494,7 @@ pub(crate) mod _asyncio { let args = if let Some(ctx) = context { FuncArgs::new( vec![callback, task_arg], - KwArgs::new([("context".to_owned(), ctx)].into_iter().collect()), + KwArgs::new(core::iter::once(("context".to_owned(), ctx)).collect()), ) } else { FuncArgs::new(vec![callback, task_arg], KwArgs::default()) @@ -1522,7 +1522,7 @@ pub(crate) mod _asyncio { let cancel_args = if let Some(ref m) = msg_value { FuncArgs::new( vec![], - KwArgs::new([("msg".to_owned(), m.clone())].into_iter().collect()), + KwArgs::new(core::iter::once(("msg".to_owned(), m.clone())).collect()), ) } else { FuncArgs::new(vec![], KwArgs::default()) @@ -2202,7 +2202,7 @@ pub(crate) mod _asyncio { let cancel_args = if let Some(ref m) = cancel_msg { FuncArgs::new( vec![], - KwArgs::new([("msg".to_owned(), m.clone())].into_iter().collect()), + KwArgs::new(core::iter::once(("msg".to_owned(), m.clone())).collect()), ) } else { FuncArgs::new(vec![], KwArgs::default()) diff --git a/crates/vm/src/builtins/dict.rs b/crates/vm/src/builtins/dict.rs index 106ca399f..74a7bc690 100644 --- a/crates/vm/src/builtins/dict.rs +++ b/crates/vm/src/builtins/dict.rs @@ -382,10 +382,10 @@ impl PyDict { default: OptionalArg, vm: &VirtualMachine, ) -> PyResult { - match self.entries.get(vm, &*key)? { - Some(value) => Ok(value), - None => Ok(default.unwrap_or_none(vm)), - } + Ok(self + .entries + .get(vm, &*key)? + .unwrap_or_else(|| default.unwrap_or_none(vm))) } #[pymethod] @@ -400,6 +400,7 @@ impl PyDict { } #[pymethod] + #[must_use] pub fn copy(&self) -> Self { Self { entries: self.entries.clone(), diff --git a/crates/vm/src/builtins/getset.rs b/crates/vm/src/builtins/getset.rs index ff132fb74..ab538922a 100644 --- a/crates/vm/src/builtins/getset.rs +++ b/crates/vm/src/builtins/getset.rs @@ -70,6 +70,7 @@ impl GetDescriptor for PyGetSet { } impl PyGetSet { + #[must_use] pub fn new(name: String, class: &'static Py) -> Self { Self { name, @@ -79,6 +80,7 @@ impl PyGetSet { } } + #[must_use] pub fn with_get(mut self, getter: G) -> Self where G: IntoPyGetterFunc, @@ -87,6 +89,7 @@ impl PyGetSet { self } + #[must_use] pub fn with_set(mut self, setter: S) -> Self where S: IntoPySetterFunc, diff --git a/crates/vm/src/builtins/memory.rs b/crates/vm/src/builtins/memory.rs index d063bf014..ec6228965 100644 --- a/crates/vm/src/builtins/memory.rs +++ b/crates/vm/src/builtins/memory.rs @@ -117,7 +117,8 @@ impl PyMemoryView { Ok(zelf) } - /// this should be the only way to create a memoryview from another memoryview + /// this should be the only way to create a memoryview from another memoryview. + #[must_use] pub fn new_view(&self) -> Self { let zelf = Self { buffer: self.buffer.clone(), diff --git a/crates/vm/src/builtins/str.rs b/crates/vm/src/builtins/str.rs index 212b14c74..69109c943 100644 --- a/crates/vm/src/builtins/str.rs +++ b/crates/vm/src/builtins/str.rs @@ -1886,22 +1886,20 @@ impl ToPyObject for Wtf8Buf { impl ToPyObject for char { fn to_pyobject(self, vm: &VirtualMachine) -> PyObjectRef { let cp = self as u32; - if cp <= u8::MAX as u32 { - vm.ctx.latin1_char(cp as u8).into() - } else { - vm.ctx.new_str(self).into() - } + u8::try_from(cp).map_or_else( + |_| vm.ctx.new_str(self).into(), + |v| vm.ctx.latin1_char(v).into(), + ) } } impl ToPyObject for CodePoint { fn to_pyobject(self, vm: &VirtualMachine) -> PyObjectRef { let cp = self.to_u32(); - if cp <= u8::MAX as u32 { - vm.ctx.latin1_char(cp as u8).into() - } else { - vm.ctx.new_str(self).into() - } + u8::try_from(cp).map_or_else( + |_| vm.ctx.new_str(self).into(), + |v| vm.ctx.latin1_char(v).into(), + ) } } diff --git a/crates/vm/src/bytes_inner.rs b/crates/vm/src/bytes_inner.rs index 983e5f632..08518deb1 100644 --- a/crates/vm/src/bytes_inner.rs +++ b/crates/vm/src/bytes_inner.rs @@ -407,7 +407,9 @@ impl PyBytesInner { let mut new: Vec = Vec::with_capacity(self.elements.len()); if let Some((first, second)) = self.elements.split_first() { new.push(first.to_ascii_uppercase()); - second.iter().for_each(|x| new.push(x.to_ascii_lowercase())); + for x in second { + new.push(x.to_ascii_lowercase()); + } } new } diff --git a/crates/vm/src/frame.rs b/crates/vm/src/frame.rs index f1ed31d71..a59de0a4a 100644 --- a/crates/vm/src/frame.rs +++ b/crates/vm/src/frame.rs @@ -8933,7 +8933,7 @@ impl ExecutingFrame<'_> { } else if iter.downcast_ref_if_exact::(vm).is_some() { Some(Instruction::ForIterTuple) } else if iter.downcast_ref_if_exact::(vm).is_some() - && jump_delta <= i16::MAX as u32 + && i16::try_from(jump_delta).is_ok() && self.for_iter_has_end_for_shape(instr_idx, jump_delta) && !self.specialization_eval_frame_active(vm) { diff --git a/crates/vm/src/stdlib/sys.rs b/crates/vm/src/stdlib/sys.rs index 5e3ba265e..dbce74a5d 100644 --- a/crates/vm/src/stdlib/sys.rs +++ b/crates/vm/src/stdlib/sys.rs @@ -1129,7 +1129,7 @@ pub mod sys { let tb_module = vm.import("traceback", 0)?; let print_tb = tb_module.get_attr("print_tb", vm)?; let stderr_obj = super::get_stderr(vm)?; - let kwargs: KwArgs = [("file".to_string(), stderr_obj)].into_iter().collect(); + let kwargs: KwArgs = core::iter::once(("file".to_string(), stderr_obj)).collect(); let _ = print_tb.call( FuncArgs::new(vec![unraisable.exc_traceback.clone()], kwargs), vm, diff --git a/crates/vm/src/types/slot_defs.rs b/crates/vm/src/types/slot_defs.rs index 956bc6fa4..8637f8112 100644 --- a/crates/vm/src/types/slot_defs.rs +++ b/crates/vm/src/types/slot_defs.rs @@ -1503,16 +1503,13 @@ mod tests { #[test] fn find_by_name() { // __len__ appears in both sequence and mapping - let len_defs: Vec<_> = find_slot_defs_by_name("__len__").collect(); - assert_eq!(len_defs.len(), 2); + assert_eq!(find_slot_defs_by_name("__len__").count(), 2); // __init__ appears once - let init_defs: Vec<_> = find_slot_defs_by_name("__init__").collect(); - assert_eq!(init_defs.len(), 1); + assert_eq!(find_slot_defs_by_name("__init__").count(), 1); // __add__ appears in number (left/right) and sequence - let add_defs: Vec<_> = find_slot_defs_by_name("__add__").collect(); - assert_eq!(add_defs.len(), 2); // NbAdd(Left) and SqConcat + assert_eq!(find_slot_defs_by_name("__add__").count(), 2); // NbAdd(Left) and SqConcat } #[test] diff --git a/crates/vm/src/vm/interpreter.rs b/crates/vm/src/vm/interpreter.rs index ecdfea01a..770e49341 100644 --- a/crates/vm/src/vm/interpreter.rs +++ b/crates/vm/src/vm/interpreter.rs @@ -229,6 +229,7 @@ impl InterpreterBuilder { /// }) /// .build(); /// ``` + #[must_use] pub fn init_hook(mut self, init: F) -> Self where F: FnOnce(&mut VirtualMachine) + 'static, @@ -250,6 +251,7 @@ impl InterpreterBuilder { /// // In practice: .add_frozen_modules(rustpython_pylib::FROZEN_STDLIB) /// .build(); /// ``` + #[must_use] pub fn add_frozen_modules(mut self, frozen: I) -> Self where I: IntoIterator, From 7060fe3b5be5118b9f03e9550224c3d6add84c35 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Wed, 10 Jun 2026 05:14:05 +0300 Subject: [PATCH 049/339] Add `_blake2` consts (#8053) * Add `_blake2` consts * Update `test_hashlib.py` to 3.14.5 --- Lib/test/test_hashlib.py | 19 +++++++++++++++++-- crates/stdlib/src/blake2.rs | 27 +++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_hashlib.py b/Lib/test/test_hashlib.py index 5c38813f3..47e2079fe 100644 --- a/Lib/test/test_hashlib.py +++ b/Lib/test/test_hashlib.py @@ -127,8 +127,11 @@ class HashLibTestCase(unittest.TestCase): algorithms.add(algorithm.lower()) _blake2 = self._conditional_import_module('_blake2') + blake2_hashes = {'blake2b', 'blake2s'} if _blake2: - algorithms.update({'blake2b', 'blake2s'}) + algorithms.update(blake2_hashes) + else: + algorithms.difference_update(blake2_hashes) self.constructors_to_test = {} for algorithm in algorithms: @@ -220,7 +223,12 @@ class HashLibTestCase(unittest.TestCase): # all available algorithms must be loadable, bpo-47101 self.assertNotIn("undefined", hashlib.algorithms_available) for name in hashlib.algorithms_available: - digest = hashlib.new(name, usedforsecurity=False) + with self.subTest(name): + try: + _ = hashlib.new(name, usedforsecurity=False) + except ValueError as exc: + self.skip_if_blake2_not_builtin(name, exc) + raise def test_usedforsecurity_true(self): hashlib.new("sha256", usedforsecurity=True) @@ -444,6 +452,7 @@ class HashLibTestCase(unittest.TestCase): self.assertEqual(h.hexdigest(), "e2d4535e3b613135c14f2fe4e026d7ad8d569db44901740beffa30d430acb038") @requires_resource('cpu') + @requires_blake2 def test_blake2_update_over_4gb(self): # blake2s or blake2b doesn't matter based on how our C code is structured, this tests the # common loop macro logic. @@ -734,6 +743,12 @@ class HashLibTestCase(unittest.TestCase): "e718483d0ce769644e2e42c7bc15b4638e1f98b13b2044285632a803afa973eb"+ "de0ff244877ea60a4cb0432ce577c31beb009c5c2c49aa2e4eadb217ad8cc09b") + def skip_if_blake2_not_builtin(self, name, skip_reason): + # blake2 builtins may be absent if python built with + # a subset of --with-builtin-hashlib-hashes or none. + if "blake2" in name and "blake2" not in builtin_hashes: + self.skipTest(skip_reason) + def check_blake2(self, constructor, salt_size, person_size, key_size, digest_size, max_offset): self.assertEqual(constructor.SALT_SIZE, salt_size) diff --git a/crates/stdlib/src/blake2.rs b/crates/stdlib/src/blake2.rs index 53687c702..382aec826 100644 --- a/crates/stdlib/src/blake2.rs +++ b/crates/stdlib/src/blake2.rs @@ -7,6 +7,33 @@ mod _blake2 { use crate::hashlib::_hashlib::{BlakeHashArgs, local_blake2b, local_blake2s}; use crate::vm::{PyPayload, PyResult, VirtualMachine}; + #[pyattr(name = "_GIL_MINSIZE")] + const GIL_MINSIZE: u16 = 2048; + + #[pyattr] + const BLAKE2B_SALT_SIZE: u8 = 16; + + #[pyattr] + const BLAKE2B_PERSON_SIZE: u8 = 16; + + #[pyattr] + const BLAKE2B_MAX_KEY_SIZE: u8 = 64; + + #[pyattr] + const BLAKE2B_MAX_DIGEST_SIZE: u8 = 64; + + #[pyattr] + const BLAKE2S_SALT_SIZE: u8 = 8; + + #[pyattr] + const BLAKE2S_PERSON_SIZE: u8 = 8; + + #[pyattr] + const BLAKE2S_MAX_KEY_SIZE: u8 = 32; + + #[pyattr] + const BLAKE2S_MAX_DIGEST_SIZE: u8 = 32; + #[pyfunction] fn blake2b(args: BlakeHashArgs, vm: &VirtualMachine) -> PyResult { Ok(local_blake2b(args, vm)?.into_pyobject(vm)) From c6a55356b50cea38302e439120b75d875e2ad978 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Wed, 10 Jun 2026 05:14:47 +0300 Subject: [PATCH 050/339] Update `test_code.py` to 3.14.5 (#8054) * Update `test_code.py` to 3.14.5 * skip flakey ci test --- Lib/test/test_code.py | 12 +++++------- Lib/test/test_thread.py | 1 + 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Lib/test/test_code.py b/Lib/test/test_code.py index 6602c2435..6ce64109f 100644 --- a/Lib/test/test_code.py +++ b/Lib/test/test_code.py @@ -215,7 +215,7 @@ from test.support.script_helper import assert_python_ok from test.support import threading_helper, import_helper from test.support.bytecode_helper import instructions_with_positions from opcode import opmap, opname -try: +try: # TODO: RUSTPYTHON from _testcapi import code_offset_to_line except ModuleNotFoundError: code_offset_to_line = None @@ -427,8 +427,7 @@ class CodeTest(unittest.TestCase): new_code = code = func.__code__.replace(co_linetable=b'') self.assertEqual(list(new_code.co_lines()), []) - # TODO: RUSTPYTHON; co_lnotab intentionally not implemented (deprecated since 3.12) - @unittest.expectedFailure + @unittest.expectedFailure # TODO: RUSTPYTHON; co_lnotab intentionally not implemented (deprecated since 3.12) def test_co_lnotab_is_deprecated(self): # TODO: remove in 3.14 def func(): pass @@ -491,8 +490,7 @@ class CodeTest(unittest.TestCase): res = _testinternalcapi.code_returns_only_none(func.__code__) self.assertFalse(res) - # TODO: RUSTPYTHON; replace() rejects invalid bytecodes for safety - @unittest.expectedFailure + @unittest.expectedFailure # TODO: RUSTPYTHON; replace() rejects invalid bytecodes for safety def test_invalid_bytecode(self): def foo(): pass @@ -508,7 +506,7 @@ class CodeTest(unittest.TestCase): with self.assertRaisesRegex(SystemError, msg): foo() - # @requires_debug_ranges() + @requires_debug_ranges() def test_co_positions_artificial_instructions(self): import dis @@ -1491,7 +1489,7 @@ class CodeLocationTest(unittest.TestCase): rc, out, err = assert_python_ok('-OO', '-c', code) - @unittest.skipUnless(code_offset_to_line, '_testcapi required') + @unittest.expectedFailureIf(code_offset_to_line is None, "TODO: RUSTPYTHON") def test_co_branches(self): def get_line_branches(func): diff --git a/Lib/test/test_thread.py b/Lib/test/test_thread.py index bf04cc536..60f4d7c7d 100644 --- a/Lib/test/test_thread.py +++ b/Lib/test/test_thread.py @@ -115,6 +115,7 @@ class ThreadRunningTests(BasicThreadTest): thread.stack_size(0) + @unittest.skipIf(__import__("sys").platform == "linux", "TODO: RUSTPYTHON; Flakey on CI") def test__count(self): # Test the _count() function. orig = thread._count() From 38d17bc12c50fafd8c10c264ee63ca067beade8c Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Wed, 10 Jun 2026 05:17:50 +0300 Subject: [PATCH 051/339] `scripts/update_lib migrate` to preserve patches on classes (#8057) --- scripts/update_lib/patch_spec.py | 270 +++++++++++++------- scripts/update_lib/tests/test_patch_spec.py | 26 ++ 2 files changed, 198 insertions(+), 98 deletions(-) diff --git a/scripts/update_lib/patch_spec.py b/scripts/update_lib/patch_spec.py index 565d01e3e..996b78bfa 100644 --- a/scripts/update_lib/patch_spec.py +++ b/scripts/update_lib/patch_spec.py @@ -6,9 +6,13 @@ This module handles: - Applying patches to test files (JSON -> file) """ +from __future__ import annotations + import ast import collections +import contextlib import enum +import re import textwrap import typing @@ -91,33 +95,109 @@ class PatchSpec(typing.NamedTuple): return f"@{unparsed}" + @classmethod + def try_from_ast_node( + cls, node: ast.Attribute | ast.Call, lines: list[str] + ) -> typing.Self | None: + if isinstance(node, ast.Attribute): + attr_node = node + elif isinstance(node, ast.Call): + attr_node = node.func + else: + return -def _single_to_double_quotes(s: str) -> str: - """Convert single-quoted strings to double-quoted strings. + if ( + isinstance(attr_node, ast.Name) + or getattr(attr_node.value, "id", None) != UT + ): + return - Falls back to original if conversion breaks the AST equivalence. - """ - import re + cond = None + try: + ut_method = UtMethod(attr_node.attr) + except ValueError: + return - def replace_string(match: re.Match) -> str: - content = match.group(1) - # Unescape single quotes and escape double quotes - content = content.replace("\\'", "'").replace('"', '\\"') - return f'"{content}"' + # If our ut_method has args then, + # we need to search for a constant that contains our `COMMENT`. + # Otherwise we need to search it in the raw source code :/ + if ut_method.has_args(): + reason = next( + ( + inner_node.value + for inner_node in ast.walk(node) + if isinstance(inner_node, ast.Constant) + and isinstance(inner_node.value, str) + and COMMENT in inner_node.value + ), + None, + ) - # Match single-quoted strings (handles escaped single quotes inside) - converted = re.sub(r"'((?:[^'\\]|\\.)*)'", replace_string, s) + # If we didn't find a constant containing , + # then we didn't put this decorator + if not reason: + return - # Verify: parse converted and unparse should equal original - try: - converted_ast = ast.parse(converted, mode="eval") - if ast.unparse(converted_ast) == s: - return converted - except SyntaxError: - pass + if ut_method.has_cond(): + cond = ast.unparse(node.args[0]) + else: + pattern = re.compile(rf"{COMMENT}.?(.*)") + dec_lineno = node.lineno - # Fall back to original if conversion failed - return s + curr_line = lines[dec_lineno - 1] + prev_line = lines[dec_lineno - 2] + + # If we see our comment at the decorator line, take it + if found := pattern.search(curr_line): + reason = found.group() + elif prev_line.strip().startswith("#") and ( + found := pattern.search(prev_line) + ): + # Search the previous line of the decorator, + # only take the comment if the line starts with a `#` + reason = found.group() + else: + # Didn't find our `COMMENT`, so the patch isn't ours :) + return + + reason = reason.removeprefix(COMMENT).strip(";:, ") + return cls(ut_method, cond, reason) + + +class PatchEntryVisitor(ast.NodeVisitor): + def __init__(self, lines: list[str]): + self.current_class = None + self.patches = [] + self.lines = lines + + def patches_from_node( + self, node: ast.FunctionDef | ast.AsyncFunctionDef + ) -> Iterator[PatchEntry]: + for dec_node in node.decorator_list: + spec = PatchSpec.try_from_ast_node(dec_node, self.lines) + + if spec is None: + continue + + yield PatchEntry(self.current_class, node.name, spec) + + def visit_AsyncFunctionDef(self, node: ast.AsyncFunctionDef): + self.patches.extend(self.patches_from_node(node)) + # TODO: Support nested classes/methods + # self.generic_visit(node) + + def visit_FunctionDef(self, node: ast.FunctionDef): + self.patches.extend(self.patches_from_node(node)) + # TODO: Support nested classes/methods + # self.generic_visit(node) + + def visit_ClassDef(self, node: ast.ClassDef): + with temp_attr(self, "current_class", node.name): + for patch in self.patches_from_node(node): + patch = patch._replace(test_name="__self__") + self.patches.append(patch) + + self.generic_visit(node) class PatchEntry(typing.NamedTuple): @@ -142,76 +222,10 @@ class PatchEntry(typing.NamedTuple): def iter_patch_entries( cls, tree: ast.Module, lines: list[str] ) -> "Iterator[typing.Self]": - import re - import sys - for cls_node, fn_node in iter_tests(tree): - parent_class = cls_node.name - for dec_node in fn_node.decorator_list: - if not isinstance(dec_node, (ast.Attribute, ast.Call)): - continue - - attr_node = ( - dec_node if isinstance(dec_node, ast.Attribute) else dec_node.func - ) - - if ( - isinstance(attr_node, ast.Name) - or getattr(attr_node.value, "id", None) != UT - ): - continue - - cond = None - try: - ut_method = UtMethod(attr_node.attr) - except ValueError: - continue - - # If our ut_method has args then, - # we need to search for a constant that contains our `COMMENT`. - # Otherwise we need to search it in the raw source code :/ - if ut_method.has_args(): - reason = next( - ( - node.value - for node in ast.walk(dec_node) - if isinstance(node, ast.Constant) - and isinstance(node.value, str) - and COMMENT in node.value - ), - None, - ) - - # If we didn't find a constant containing , - # then we didn't put this decorator - if not reason: - continue - - if ut_method.has_cond(): - cond = ast.unparse(dec_node.args[0]) - else: - pattern = re.compile(rf"{COMMENT}.?(.*)") - dec_lineno = dec_node.lineno - - curr_line = lines[dec_lineno - 1] - prev_line = lines[dec_lineno - 2] - - # If we see our comment at the decorator line, take it - if found := pattern.search(curr_line): - reason = found.group() - elif prev_line.strip().startswith("#") and ( - found := pattern.search(prev_line) - ): - # Search the previous line of the decorator, - # only take the comment if the line starts with a `#` - reason = found.group() - else: - # Didn't find our `COMMENT`, so the patch isn't ours :) - continue - - reason = reason.removeprefix(COMMENT).strip(";:, ") - spec = PatchSpec(ut_method, cond, reason) - yield cls(parent_class, fn_node.name, spec) + visitor = PatchEntryVisitor(lines) + visitor.visit(tree) + yield from visitor.patches def iter_tests( @@ -251,6 +265,15 @@ def extract_patches(contents: str) -> Patches: return build_patch_dict(iter_patches(contents)) +def modification_from_node_specs(node, specs): + lineno = min( + (dec_node.lineno for dec_node in node.decorator_list), default=node.lineno + ) + indent = " " * node.col_offset + patch_lines = "\n".join(spec.as_decorator() for spec in specs) + return (lineno - 1, textwrap.indent(patch_lines, indent)) + + def _iter_patch_lines( tree: ast.Module, patches: Patches ) -> "Iterator[tuple[int, str]]": @@ -262,7 +285,15 @@ def _iter_patch_lines( async_methods: dict[str, set[str]] = {} # Track class bases for inherited async method lookup class_bases: dict[str, list[str]] = {} - all_classes = {node.name for node in tree.body if isinstance(node, ast.ClassDef)} + all_classes = set() + all_class_nodes = [] + for node in tree.body: + if not isinstance(node, ast.ClassDef): + continue + + all_classes.add(node.name) + all_class_nodes.append(node) + for node in tree.body: if isinstance(node, ast.ClassDef): cache[node.name] = node.end_lineno @@ -284,13 +315,7 @@ def _iter_patch_lines( if not specs: continue - lineno = min( - (dec_node.lineno for dec_node in fn_node.decorator_list), - default=fn_node.lineno, - ) - indent = " " * fn_node.col_offset - patch_lines = "\n".join(spec.as_decorator() for spec in specs) - yield (lineno - 1, textwrap.indent(patch_lines, indent)) + yield modification_from_node_specs(fn_node, specs) # Phase 2: Iterate and mark inherited tests for cls_name, tests in sorted(patches.items()): @@ -300,6 +325,10 @@ def _iter_patch_lines( continue for test_name, specs in sorted(tests.items()): + if test_name == "__self__": + # Yielding modifications for the class itself should be done during phase 3 + continue + decorators = "\n".join(spec.as_decorator() for spec in specs) # Check current class and ancestors for async method is_async = False @@ -314,6 +343,7 @@ def _iter_patch_lines( is_async = True break queue.extend(class_bases.get(cur, [])) + if is_async: patch_lines = f""" {decorators} @@ -328,6 +358,11 @@ def {test_name}(self): """.rstrip() yield (lineno, textwrap.indent(patch_lines, DEFAULT_INDENT)) + # Phase 3: Mark the class itself + for cls_node in all_class_nodes: + if cls_specs := patches.get(cls_node.name, {}).pop("__self__", None): + yield modification_from_node_specs(cls_node, cls_specs) + def _has_unittest_import(tree: ast.Module) -> bool: """Check if 'import unittest' is already present in the file.""" @@ -406,3 +441,42 @@ def patches_from_json(data: dict) -> Patches: } for cls_name, tests in data.items() } + + +def _single_to_double_quotes(s: str) -> str: + """ + Convert single-quoted strings to double-quoted strings. + + Falls back to original if conversion breaks the AST equivalence. + """ + import re + + def replace_string(match: re.Match) -> str: + content = match.group(1) + # Unescape single quotes and escape double quotes + content = content.replace("\\'", "'").replace('"', '\\"') + return f'"{content}"' + + # Match single-quoted strings (handles escaped single quotes inside) + converted = re.sub(r"'((?:[^'\\]|\\.)*)'", replace_string, s) + + # Verify: parse converted and unparse should equal original + try: + converted_ast = ast.parse(converted, mode="eval") + if ast.unparse(converted_ast) == s: + return converted + except SyntaxError: + pass + + # Fall back to original if conversion failed + return s + + +@contextlib.contextmanager +def temp_attr(obj: object, attr: str, value: object): + old = getattr(obj, attr, None) + setattr(obj, attr, value) + try: + yield obj + finally: + setattr(obj, attr, old) diff --git a/scripts/update_lib/tests/test_patch_spec.py b/scripts/update_lib/tests/test_patch_spec.py index 2598d25b3..92a0a35a1 100644 --- a/scripts/update_lib/tests/test_patch_spec.py +++ b/scripts/update_lib/tests/test_patch_spec.py @@ -345,6 +345,32 @@ class TestFoo(unittest.TestCase): self.assertIn("@unittest.expectedFailure", result) self.assertIn(COMMENT, result) + def test_round_trip_with_patches_on_class(self): + """Test that extracted patches can be re-applied.""" + original = f"""import unittest + +@unittest.skipIf(a == b, "{COMMENT}") +@unittest.expectedFailure # {COMMENT} +class TestFoo(unittest.TestCase): + ... +""" + # Extract patches + patches = extract_patches(original) + + # Apply to clean code + clean = """import unittest + +class TestFoo(unittest.TestCase): + def test_one(self): + pass +""" + result = apply_patches(clean, patches) + + # Should have the decorator + self.assertIn("@unittest.expectedFailure", result) + self.assertIn("@unittest.skipIf", result) + self.assertIn(COMMENT, result) + class TestFindImportInsertLine(unittest.TestCase): """Tests for _find_import_insert_line function.""" From e6b1fd038bebae6f6a06e826ed17bad9242e77b8 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Thu, 11 Jun 2026 05:40:11 +0300 Subject: [PATCH 052/339] Code nitpicks (#8058) * Code nitpicks * fix error message * Use `vm.new_.*_error` methods --- crates/stdlib/src/array.rs | 5 +- crates/stdlib/src/multiprocessing.rs | 10 +- crates/stdlib/src/ssl.rs | 5 +- crates/vm/src/builtins/int.rs | 5 +- crates/vm/src/builtins/interpolation.rs | 5 +- crates/vm/src/frame.rs | 98 ++++----- crates/vm/src/protocol/buffer.rs | 25 +-- crates/vm/src/protocol/callable.rs | 12 +- crates/vm/src/protocol/iter.rs | 7 +- crates/vm/src/protocol/mapping.rs | 19 +- crates/vm/src/protocol/number.rs | 256 +++++++++++++----------- crates/vm/src/protocol/object.rs | 79 ++++---- crates/vm/src/protocol/sequence.rs | 38 ++-- crates/vm/src/stdlib/_abc.rs | 5 +- crates/vm/src/stdlib/_ctypes.rs | 7 +- crates/vm/src/stdlib/_functools.rs | 6 +- crates/vm/src/stdlib/marshal.rs | 5 +- crates/vm/src/vm/vm_new.rs | 2 + src/lib.rs | 7 +- 19 files changed, 291 insertions(+), 305 deletions(-) diff --git a/crates/stdlib/src/array.rs b/crates/stdlib/src/array.rs index f3cd601c7..e5f8e11a0 100644 --- a/crates/stdlib/src/array.rs +++ b/crates/stdlib/src/array.rs @@ -882,10 +882,7 @@ pub mod array { self._from_bytes(b.as_bytes(), itemsize, vm)?; if not_enough_bytes { - Err(vm.new_exception_msg( - vm.ctx.exceptions.eof_error.to_owned(), - "read() didn't return enough bytes".into(), - )) + Err(vm.new_eof_error("read() didn't return enough bytes")) } else { Ok(()) } diff --git a/crates/stdlib/src/multiprocessing.rs b/crates/stdlib/src/multiprocessing.rs index 53f669257..231ca44de 100644 --- a/crates/stdlib/src/multiprocessing.rs +++ b/crates/stdlib/src/multiprocessing.rs @@ -175,9 +175,8 @@ mod _multiprocessing { fn release(&self, vm: &VirtualMachine) -> PyResult<()> { if self.kind == RECURSIVE_MUTEX { if !ismine!(self) { - return Err(vm.new_exception_msg( - vm.ctx.exceptions.assertion_error.to_owned(), - "attempt to release recursive lock not owned by thread".into(), + return Err(vm.new_assertion_error( + "attempt to release recursive lock not owned by thread", )); } if self.count.load(Ordering::Acquire) > 1 { @@ -597,9 +596,8 @@ mod _multiprocessing { if self.kind == RECURSIVE_MUTEX { // if (!ISMINE(self)) if !ismine!(self) { - return Err(vm.new_exception_msg( - vm.ctx.exceptions.assertion_error.to_owned(), - "attempt to release recursive lock not owned by thread".into(), + return Err(vm.new_assertion_error( + "attempt to release recursive lock not owned by thread", )); } // if (self->count > 1) { --self->count; Py_RETURN_NONE; } diff --git a/crates/stdlib/src/ssl.rs b/crates/stdlib/src/ssl.rs index d36481a00..ca2546bfb 100644 --- a/crates/stdlib/src/ssl.rs +++ b/crates/stdlib/src/ssl.rs @@ -4657,10 +4657,7 @@ mod _ssl { // It's a memoryview, check if contiguous let is_contiguous: bool = mem_view.try_to_bool(vm)?; if !is_contiguous { - return Err(vm.new_exception_msg( - vm.ctx.exceptions.buffer_error.to_owned(), - "non-contiguous buffer is not supported".into(), - )); + return Err(vm.new_buffer_error("non-contiguous buffer is not supported")); } } diff --git a/crates/vm/src/builtins/int.rs b/crates/vm/src/builtins/int.rs index 5468a011c..198c2765c 100644 --- a/crates/vm/src/builtins/int.rs +++ b/crates/vm/src/builtins/int.rs @@ -236,10 +236,7 @@ fn inner_truediv(i1: &BigInt, i2: &BigInt, vm: &VirtualMachine) -> PyResult { let float = true_div(i1, i2); if float.is_infinite() { - Err(vm.new_exception_msg( - vm.ctx.exceptions.overflow_error.to_owned(), - "integer division result too large for a float".into(), - )) + Err(vm.new_overflow_error("integer division result too large for a float")) } else { Ok(vm.ctx.new_float(float).into()) } diff --git a/crates/vm/src/builtins/interpolation.rs b/crates/vm/src/builtins/interpolation.rs index 8ce171493..a865ff390 100644 --- a/crates/vm/src/builtins/interpolation.rs +++ b/crates/vm/src/builtins/interpolation.rs @@ -46,9 +46,8 @@ impl PyInterpolation { .downcast_ref::() .is_some_and(|s| matches!(s.to_str(), Some("s" | "r" | "a"))); if !is_valid { - return Err(vm.new_exception_msg( - vm.ctx.exceptions.system_error.to_owned(), - "Interpolation() argument 'conversion' must be one of 's', 'a' or 'r'".into(), + return Err(vm.new_system_error( + "Interpolation() argument 'conversion' must be one of 's', 'a' or 'r'", )); } Ok(Self { diff --git a/crates/vm/src/frame.rs b/crates/vm/src/frame.rs index a59de0a4a..92cae41a0 100644 --- a/crates/vm/src/frame.rs +++ b/crates/vm/src/frame.rs @@ -2038,10 +2038,9 @@ impl ExecutingFrame<'_> { } else { // Both merged cells (LOCAL|CELL) and non-merged cells get unbound local error let name = self.localsplus_name(localsplus_idx); - vm.new_exception_msg( - vm.ctx.exceptions.unbound_local_error.to_owned(), - format!("local variable '{name}' referenced before assignment").into(), - ) + vm.new_unbound_local_error(format!( + "local variable '{name}' referenced before assignment" + )) } } @@ -2378,14 +2377,10 @@ impl ExecutingFrame<'_> { let fastlocals = self.localsplus.fastlocals_mut(); let idx = var_num.get(arg); if fastlocals[idx].is_none() { - return Err(vm.new_exception_msg( - vm.ctx.exceptions.unbound_local_error.to_owned(), - format!( - "local variable '{}' referenced before assignment", - self.code.varnames[idx] - ) - .into(), - )); + return Err(vm.new_unbound_local_error(format!( + "local variable '{}' referenced before assignment", + self.code.varnames[idx] + ))); } fastlocals[idx] = None; Ok(None) @@ -2884,10 +2879,9 @@ impl ExecutingFrame<'_> { varname: &'static PyStrInterned, vm: &VirtualMachine, ) -> PyBaseExceptionRef { - vm.new_exception_msg( - vm.ctx.exceptions.unbound_local_error.to_owned(), - format!("local variable '{varname}' referenced before assignment").into(), - ) + vm.new_unbound_local_error(format!( + "local variable '{varname}' referenced before assignment" + )) } let idx = var_num.get(arg); let x = self.localsplus.fastlocals()[idx] @@ -2910,14 +2904,10 @@ impl ExecutingFrame<'_> { // (LoadFast in RustPython already does this check) let idx = var_num.get(arg); let x = self.localsplus.fastlocals()[idx].clone().ok_or_else(|| { - vm.new_exception_msg( - vm.ctx.exceptions.unbound_local_error.to_owned(), - format!( - "local variable '{}' referenced before assignment", - self.code.varnames[idx] - ) - .into(), - ) + vm.new_unbound_local_error(format!( + "local variable '{}' referenced before assignment", + self.code.varnames[idx] + )) })?; self.push_value(x); Ok(None) @@ -2929,24 +2919,16 @@ impl ExecutingFrame<'_> { let (idx1, idx2) = oparg.indexes(); let fastlocals = self.localsplus.fastlocals(); let x1 = fastlocals[idx1].clone().ok_or_else(|| { - vm.new_exception_msg( - vm.ctx.exceptions.unbound_local_error.to_owned(), - format!( - "local variable '{}' referenced before assignment", - self.code.varnames[idx1] - ) - .into(), - ) + vm.new_unbound_local_error(format!( + "local variable '{}' referenced before assignment", + self.code.varnames[idx1] + )) })?; let x2 = fastlocals[idx2].clone().ok_or_else(|| { - vm.new_exception_msg( - vm.ctx.exceptions.unbound_local_error.to_owned(), - format!( - "local variable '{}' referenced before assignment", - self.code.varnames[idx2] - ) - .into(), - ) + vm.new_unbound_local_error(format!( + "local variable '{}' referenced before assignment", + self.code.varnames[idx2] + )) })?; self.push_value(x1); self.push_value(x2); @@ -2958,14 +2940,10 @@ impl ExecutingFrame<'_> { Instruction::LoadFastBorrow { var_num } => { let idx = var_num.get(arg); let x = self.localsplus.fastlocals()[idx].clone().ok_or_else(|| { - vm.new_exception_msg( - vm.ctx.exceptions.unbound_local_error.to_owned(), - format!( - "local variable '{}' referenced before assignment", - self.code.varnames[idx] - ) - .into(), - ) + vm.new_unbound_local_error(format!( + "local variable '{}' referenced before assignment", + self.code.varnames[idx] + )) })?; self.push_value(x); Ok(None) @@ -2975,24 +2953,16 @@ impl ExecutingFrame<'_> { let (idx1, idx2) = oparg.indexes(); let fastlocals = self.localsplus.fastlocals(); let x1 = fastlocals[idx1].clone().ok_or_else(|| { - vm.new_exception_msg( - vm.ctx.exceptions.unbound_local_error.to_owned(), - format!( - "local variable '{}' referenced before assignment", - self.code.varnames[idx1] - ) - .into(), - ) + vm.new_unbound_local_error(format!( + "local variable '{}' referenced before assignment", + self.code.varnames[idx1] + )) })?; let x2 = fastlocals[idx2].clone().ok_or_else(|| { - vm.new_exception_msg( - vm.ctx.exceptions.unbound_local_error.to_owned(), - format!( - "local variable '{}' referenced before assignment", - self.code.varnames[idx2] - ) - .into(), - ) + vm.new_unbound_local_error(format!( + "local variable '{}' referenced before assignment", + self.code.varnames[idx2] + )) })?; self.push_value(x1); self.push_value(x2); diff --git a/crates/vm/src/protocol/buffer.rs b/crates/vm/src/protocol/buffer.rs index 8e7667241..d79c5e993 100644 --- a/crates/vm/src/protocol/buffer.rs +++ b/crates/vm/src/protocol/buffer.rs @@ -44,11 +44,10 @@ pub struct PyBuffer { impl PyBuffer { #[must_use] pub fn new(obj: PyObjectRef, desc: BufferDescriptor, methods: &'static BufferMethods) -> Self { - let zelf = Self { - obj, - desc: desc.validate(), - methods, - }; + #[cfg(debug_assertions)] + let desc = desc.validate(); + + let zelf = Self { obj, desc, methods }; zelf.retain(); zelf } @@ -216,30 +215,25 @@ impl BufferDescriptor { if self.ndim() == 0 { // Empty structures (len=0) can have itemsize=0 if self.len > 0 { - assert!(self.itemsize != 0); + debug_assert_ne!(self.itemsize, 0); } - assert!(self.itemsize == self.len); + debug_assert_eq!(self.itemsize, self.len); } else { let mut shape_product = 1; let has_zero_dim = self.dim_desc.iter().any(|(s, _, _)| *s == 0); for (shape, stride, suboffset) in self.dim_desc.iter().copied() { shape_product *= shape; - assert!(suboffset >= 0); + debug_assert!(suboffset >= 0); // For empty arrays (any dimension is 0), strides can be 0 if !has_zero_dim { - assert!(stride != 0); + debug_assert_ne!(stride, 0); } } - assert!(shape_product * self.itemsize == self.len); + debug_assert_eq!(shape_product * self.itemsize, self.len); } self } - #[cfg(not(debug_assertions))] - pub fn validate(self) -> Self { - self - } - #[must_use] pub fn ndim(&self) -> usize { self.dim_desc.len() @@ -396,6 +390,7 @@ impl BufferDescriptor { } } + #[must_use] fn is_last_dim_contiguous(&self) -> bool { let (_, stride, suboffset) = self.dim_desc[self.ndim() - 1]; suboffset == 0 && stride == self.itemsize as isize diff --git a/crates/vm/src/protocol/callable.rs b/crates/vm/src/protocol/callable.rs index 6ff988abb..515eb7520 100644 --- a/crates/vm/src/protocol/callable.rs +++ b/crates/vm/src/protocol/callable.rs @@ -7,11 +7,13 @@ use crate::{ impl PyObject { #[inline] + #[must_use] pub fn to_callable(&self) -> Option> { PyCallable::new(self) } #[inline] + #[must_use] pub fn is_callable(&self) -> bool { self.to_callable().is_some() } @@ -134,6 +136,7 @@ impl<'a> PyCallable<'a> { } /// Trace events for sys.settrace and sys.setprofile. +#[derive(Clone, Copy, Eq, PartialEq)] pub(crate) enum TraceEvent { Call, Return, @@ -147,7 +150,8 @@ pub(crate) enum TraceEvent { impl TraceEvent { /// Whether sys.settrace receives this event. - fn is_trace_event(&self) -> bool { + #[must_use] + const fn is_trace_event(&self) -> bool { matches!( self, Self::Call | Self::Return | Self::Exception | Self::Line | Self::Opcode @@ -157,7 +161,8 @@ impl TraceEvent { /// Whether sys.setprofile receives this event. /// In legacy_tracing.c, profile callbacks are only registered for /// PY_RETURN, PY_UNWIND, C_CALL, C_RETURN, C_RAISE. - fn is_profile_event(&self) -> bool { + #[must_use] + const fn is_profile_event(&self) -> bool { matches!( self, Self::Call | Self::Return | Self::CCall | Self::CReturn | Self::CException @@ -165,7 +170,8 @@ impl TraceEvent { } /// Whether this event is dispatched only when f_trace_opcodes is set. - pub(crate) fn is_opcode_event(&self) -> bool { + #[must_use] + pub(crate) const fn is_opcode_event(&self) -> bool { matches!(self, Self::Opcode) } } diff --git a/crates/vm/src/protocol/iter.rs b/crates/vm/src/protocol/iter.rs index aa6ab6769..2f51287b1 100644 --- a/crates/vm/src/protocol/iter.rs +++ b/crates/vm/src/protocol/iter.rs @@ -7,8 +7,7 @@ use crate::{ use core::borrow::Borrow; use core::ops::Deref; -/// Iterator Protocol -// https://docs.python.org/3/c-api/iter.html +/// [Iterator Protocol](https://docs.python.org/3/c-api/iter.html). #[derive(Debug, Clone)] #[repr(transparent)] pub struct PyIter(O) @@ -31,9 +30,11 @@ impl PyIter where O: Borrow, { + #[must_use] pub const fn new(obj: O) -> Self { Self(obj) } + pub fn next(&self, vm: &VirtualMachine) -> PyResult { let iternext = self .0 @@ -193,7 +194,7 @@ impl PyIterReturn { match self { Self::Return(obj) => Ok(obj), Self::StopIteration(v) => Err({ - let args = if let Some(v) = v { vec![v] } else { Vec::new() }; + let args = v.map_or_else(Vec::new, |v| vec![v]); vm.new_exception(vm.ctx.exceptions.stop_async_iteration.to_owned(), args) }), } diff --git a/crates/vm/src/protocol/mapping.rs b/crates/vm/src/protocol/mapping.rs index 7d06c7991..1900e072d 100644 --- a/crates/vm/src/protocol/mapping.rs +++ b/crates/vm/src/protocol/mapping.rs @@ -1,3 +1,5 @@ +use crossbeam_utils::atomic::AtomicCell; + use crate::{ AsObject, PyObject, PyObjectRef, PyResult, VirtualMachine, builtins::{ @@ -7,12 +9,9 @@ use crate::{ convert::ToPyResult, object::{Traverse, TraverseFn}, }; -use crossbeam_utils::atomic::AtomicCell; -// Mapping protocol -// https://docs.python.org/3/c-api/mapping.html - -#[allow(clippy::type_complexity)] +/// [Mapping protocol](https://docs.python.org/3/c-api/mapping.html) +#[expect(clippy::type_complexity)] #[derive(Default)] pub struct PyMappingSlots { pub length: AtomicCell, &VirtualMachine) -> PyResult>>, @@ -29,25 +28,28 @@ impl core::fmt::Debug for PyMappingSlots { } impl PyMappingSlots { + #[must_use] pub fn has_subscript(&self) -> bool { self.subscript.load().is_some() } - /// Copy from static PyMappingMethods + /// Copy from static [`PyMappingMethods`]. pub fn copy_from(&self, methods: &PyMappingMethods) { if let Some(f) = methods.length { self.length.store(Some(f)); } + if let Some(f) = methods.subscript { self.subscript.store(Some(f)); } + if let Some(f) = methods.ass_subscript { self.ass_subscript.store(Some(f)); } } } -#[allow(clippy::type_complexity)] +#[expect(clippy::type_complexity)] #[derive(Default)] pub struct PyMappingMethods { pub length: Option, &VirtualMachine) -> PyResult>, @@ -71,7 +73,8 @@ impl PyMappingMethods { } impl PyObject { - pub fn mapping_unchecked(&self) -> PyMapping<'_> { + #[must_use] + pub const fn mapping_unchecked(&self) -> PyMapping<'_> { PyMapping { obj: self } } diff --git a/crates/vm/src/protocol/number.rs b/crates/vm/src/protocol/number.rs index 448ec85a4..86b126538 100644 --- a/crates/vm/src/protocol/number.rs +++ b/crates/vm/src/protocol/number.rs @@ -141,7 +141,8 @@ pub struct PyNumberMethods { } impl PyNumberMethods { - /// this is NOT a global variable + /// NOTE: + /// This is **NOT** a global variable. Use [`Self::not_implemented`] for a global variable. pub const NOT_IMPLEMENTED: Self = Self { add: None, subtract: None, @@ -181,14 +182,14 @@ impl PyNumberMethods { }; #[must_use] - pub fn not_implemented() -> &'static Self { + pub const fn not_implemented() -> &'static Self { static GLOBAL_NOT_IMPLEMENTED: PyNumberMethods = PyNumberMethods::NOT_IMPLEMENTED; &GLOBAL_NOT_IMPLEMENTED } } /// Matches the NB_* constants ordering from opcode.h / BinaryOperator. -#[derive(Copy, Clone)] +#[derive(Clone, Copy, Eq, PartialEq)] pub enum PyNumberBinaryOp { Add, And, @@ -223,39 +224,38 @@ impl PyNumberBinaryOp { self, vm: &VirtualMachine, ) -> Option<&'static crate::builtins::PyStrInterned> { - use PyNumberBinaryOp::*; Some(match self { - Add => identifier!(vm, __radd__), - Subtract => identifier!(vm, __rsub__), - Multiply => identifier!(vm, __rmul__), - Remainder => identifier!(vm, __rmod__), - Divmod => identifier!(vm, __rdivmod__), - Lshift => identifier!(vm, __rlshift__), - Rshift => identifier!(vm, __rrshift__), - And => identifier!(vm, __rand__), - Xor => identifier!(vm, __rxor__), - Or => identifier!(vm, __ror__), - FloorDivide => identifier!(vm, __rfloordiv__), - TrueDivide => identifier!(vm, __rtruediv__), - MatrixMultiply => identifier!(vm, __rmatmul__), + Self::Add => identifier!(vm, __radd__), + Self::Subtract => identifier!(vm, __rsub__), + Self::Multiply => identifier!(vm, __rmul__), + Self::Remainder => identifier!(vm, __rmod__), + Self::Divmod => identifier!(vm, __rdivmod__), + Self::Lshift => identifier!(vm, __rlshift__), + Self::Rshift => identifier!(vm, __rrshift__), + Self::And => identifier!(vm, __rand__), + Self::Xor => identifier!(vm, __rxor__), + Self::Or => identifier!(vm, __ror__), + Self::FloorDivide => identifier!(vm, __rfloordiv__), + Self::TrueDivide => identifier!(vm, __rtruediv__), + Self::MatrixMultiply => identifier!(vm, __rmatmul__), // In-place ops don't have right-side variants - InplaceAdd - | InplaceSubtract - | InplaceMultiply - | InplaceRemainder - | InplaceLshift - | InplaceRshift - | InplaceAnd - | InplaceXor - | InplaceOr - | InplaceFloorDivide - | InplaceTrueDivide - | InplaceMatrixMultiply => return None, + Self::InplaceAdd + | Self::InplaceSubtract + | Self::InplaceMultiply + | Self::InplaceRemainder + | Self::InplaceLshift + | Self::InplaceRshift + | Self::InplaceAnd + | Self::InplaceXor + | Self::InplaceOr + | Self::InplaceFloorDivide + | Self::InplaceTrueDivide + | Self::InplaceMatrixMultiply => return None, }) } } -#[derive(Copy, Clone)] +#[derive(Clone, Copy, Eq, PartialEq)] pub enum PyNumberTernaryOp { Power, InplacePower, @@ -391,193 +391,224 @@ impl From<&PyNumberMethods> for PyNumberSlots { } impl PyNumberSlots { - /// Copy from static PyNumberMethods + /// Copy from static [`PyNumberMethods`]. pub fn copy_from(&self, methods: &PyNumberMethods) { if let Some(f) = methods.add { self.add.store(Some(f)); self.right_add.store(Some(f)); } + if let Some(f) = methods.subtract { self.subtract.store(Some(f)); self.right_subtract.store(Some(f)); } + if let Some(f) = methods.multiply { self.multiply.store(Some(f)); self.right_multiply.store(Some(f)); } + if let Some(f) = methods.remainder { self.remainder.store(Some(f)); self.right_remainder.store(Some(f)); } + if let Some(f) = methods.divmod { self.divmod.store(Some(f)); self.right_divmod.store(Some(f)); } + if let Some(f) = methods.power { self.power.store(Some(f)); self.right_power.store(Some(f)); } + if let Some(f) = methods.negative { self.negative.store(Some(f)); } + if let Some(f) = methods.positive { self.positive.store(Some(f)); } + if let Some(f) = methods.absolute { self.absolute.store(Some(f)); } + if let Some(f) = methods.boolean { self.boolean.store(Some(f)); } + if let Some(f) = methods.invert { self.invert.store(Some(f)); } + if let Some(f) = methods.lshift { self.lshift.store(Some(f)); self.right_lshift.store(Some(f)); } + if let Some(f) = methods.rshift { self.rshift.store(Some(f)); self.right_rshift.store(Some(f)); } + if let Some(f) = methods.and { self.and.store(Some(f)); self.right_and.store(Some(f)); } + if let Some(f) = methods.xor { self.xor.store(Some(f)); self.right_xor.store(Some(f)); } + if let Some(f) = methods.or { self.or.store(Some(f)); self.right_or.store(Some(f)); } + if let Some(f) = methods.int { self.int.store(Some(f)); } + if let Some(f) = methods.float { self.float.store(Some(f)); } + if let Some(f) = methods.inplace_add { self.inplace_add.store(Some(f)); } + if let Some(f) = methods.inplace_subtract { self.inplace_subtract.store(Some(f)); } + if let Some(f) = methods.inplace_multiply { self.inplace_multiply.store(Some(f)); } + if let Some(f) = methods.inplace_remainder { self.inplace_remainder.store(Some(f)); } + if let Some(f) = methods.inplace_power { self.inplace_power.store(Some(f)); } + if let Some(f) = methods.inplace_lshift { self.inplace_lshift.store(Some(f)); } + if let Some(f) = methods.inplace_rshift { self.inplace_rshift.store(Some(f)); } + if let Some(f) = methods.inplace_and { self.inplace_and.store(Some(f)); } + if let Some(f) = methods.inplace_xor { self.inplace_xor.store(Some(f)); } + if let Some(f) = methods.inplace_or { self.inplace_or.store(Some(f)); } + if let Some(f) = methods.floor_divide { self.floor_divide.store(Some(f)); self.right_floor_divide.store(Some(f)); } + if let Some(f) = methods.true_divide { self.true_divide.store(Some(f)); self.right_true_divide.store(Some(f)); } + if let Some(f) = methods.inplace_floor_divide { self.inplace_floor_divide.store(Some(f)); } + if let Some(f) = methods.inplace_true_divide { self.inplace_true_divide.store(Some(f)); } + if let Some(f) = methods.index { self.index.store(Some(f)); } + if let Some(f) = methods.matrix_multiply { self.matrix_multiply.store(Some(f)); self.right_matrix_multiply.store(Some(f)); } + if let Some(f) = methods.inplace_matrix_multiply { self.inplace_matrix_multiply.store(Some(f)); } } pub fn left_binary_op(&self, op_slot: PyNumberBinaryOp) -> Option { - use PyNumberBinaryOp::*; match op_slot { - Add => self.add.load(), - Subtract => self.subtract.load(), - Multiply => self.multiply.load(), - Remainder => self.remainder.load(), - Divmod => self.divmod.load(), - Lshift => self.lshift.load(), - Rshift => self.rshift.load(), - And => self.and.load(), - Xor => self.xor.load(), - Or => self.or.load(), - InplaceAdd => self.inplace_add.load(), - InplaceSubtract => self.inplace_subtract.load(), - InplaceMultiply => self.inplace_multiply.load(), - InplaceRemainder => self.inplace_remainder.load(), - InplaceLshift => self.inplace_lshift.load(), - InplaceRshift => self.inplace_rshift.load(), - InplaceAnd => self.inplace_and.load(), - InplaceXor => self.inplace_xor.load(), - InplaceOr => self.inplace_or.load(), - FloorDivide => self.floor_divide.load(), - TrueDivide => self.true_divide.load(), - InplaceFloorDivide => self.inplace_floor_divide.load(), - InplaceTrueDivide => self.inplace_true_divide.load(), - MatrixMultiply => self.matrix_multiply.load(), - InplaceMatrixMultiply => self.inplace_matrix_multiply.load(), + PyNumberBinaryOp::Add => self.add.load(), + PyNumberBinaryOp::Subtract => self.subtract.load(), + PyNumberBinaryOp::Multiply => self.multiply.load(), + PyNumberBinaryOp::Remainder => self.remainder.load(), + PyNumberBinaryOp::Divmod => self.divmod.load(), + PyNumberBinaryOp::Lshift => self.lshift.load(), + PyNumberBinaryOp::Rshift => self.rshift.load(), + PyNumberBinaryOp::And => self.and.load(), + PyNumberBinaryOp::Xor => self.xor.load(), + PyNumberBinaryOp::Or => self.or.load(), + PyNumberBinaryOp::InplaceAdd => self.inplace_add.load(), + PyNumberBinaryOp::InplaceSubtract => self.inplace_subtract.load(), + PyNumberBinaryOp::InplaceMultiply => self.inplace_multiply.load(), + PyNumberBinaryOp::InplaceRemainder => self.inplace_remainder.load(), + PyNumberBinaryOp::InplaceLshift => self.inplace_lshift.load(), + PyNumberBinaryOp::InplaceRshift => self.inplace_rshift.load(), + PyNumberBinaryOp::InplaceAnd => self.inplace_and.load(), + PyNumberBinaryOp::InplaceXor => self.inplace_xor.load(), + PyNumberBinaryOp::InplaceOr => self.inplace_or.load(), + PyNumberBinaryOp::FloorDivide => self.floor_divide.load(), + PyNumberBinaryOp::TrueDivide => self.true_divide.load(), + PyNumberBinaryOp::InplaceFloorDivide => self.inplace_floor_divide.load(), + PyNumberBinaryOp::InplaceTrueDivide => self.inplace_true_divide.load(), + PyNumberBinaryOp::MatrixMultiply => self.matrix_multiply.load(), + PyNumberBinaryOp::InplaceMatrixMultiply => self.inplace_matrix_multiply.load(), } } pub fn right_binary_op(&self, op_slot: PyNumberBinaryOp) -> Option { - use PyNumberBinaryOp::*; match op_slot { - Add => self.right_add.load(), - Subtract => self.right_subtract.load(), - Multiply => self.right_multiply.load(), - Remainder => self.right_remainder.load(), - Divmod => self.right_divmod.load(), - Lshift => self.right_lshift.load(), - Rshift => self.right_rshift.load(), - And => self.right_and.load(), - Xor => self.right_xor.load(), - Or => self.right_or.load(), - FloorDivide => self.right_floor_divide.load(), - TrueDivide => self.right_true_divide.load(), - MatrixMultiply => self.right_matrix_multiply.load(), + PyNumberBinaryOp::Add => self.right_add.load(), + PyNumberBinaryOp::Subtract => self.right_subtract.load(), + PyNumberBinaryOp::Multiply => self.right_multiply.load(), + PyNumberBinaryOp::Remainder => self.right_remainder.load(), + PyNumberBinaryOp::Divmod => self.right_divmod.load(), + PyNumberBinaryOp::Lshift => self.right_lshift.load(), + PyNumberBinaryOp::Rshift => self.right_rshift.load(), + PyNumberBinaryOp::And => self.right_and.load(), + PyNumberBinaryOp::Xor => self.right_xor.load(), + PyNumberBinaryOp::Or => self.right_or.load(), + PyNumberBinaryOp::FloorDivide => self.right_floor_divide.load(), + PyNumberBinaryOp::TrueDivide => self.right_true_divide.load(), + PyNumberBinaryOp::MatrixMultiply => self.right_matrix_multiply.load(), _ => None, } } pub fn left_ternary_op(&self, op_slot: PyNumberTernaryOp) -> Option { - use PyNumberTernaryOp::*; match op_slot { - Power => self.power.load(), - InplacePower => self.inplace_power.load(), + PyNumberTernaryOp::Power => self.power.load(), + PyNumberTernaryOp::InplacePower => self.inplace_power.load(), } } pub fn right_ternary_op(&self, op_slot: PyNumberTernaryOp) -> Option { - use PyNumberTernaryOp::*; - match op_slot { - Power => self.right_power.load(), - _ => None, + if op_slot == PyNumberTernaryOp::Power { + self.right_power.load() + } else { + None } } } @@ -602,6 +633,7 @@ impl Deref for PyNumber<'_> { impl<'a> PyNumber<'a> { // PyNumber_Check - slots are now inherited + #[must_use] pub fn check(obj: &PyObject) -> bool { let methods = &obj.class().slots.as_number; let has_number = methods.int.load().is_some() @@ -629,16 +661,12 @@ impl PyNumber<'_> { let ret_class = ret.class().to_owned(); if let Some(ret) = ret.downcast_ref::() { - _warnings::warn( - vm.ctx.exceptions.deprecation_warning, - format!( - "__int__ returned non-int (type {ret_class}). \ - The ability to return an instance of a strict subclass of int \ - is deprecated, and may be removed in a future version of Python." - ), - 1, - vm, - )?; + let msg = format!( + "__int__ returned non-int (type {ret_class}). \ +The ability to return an instance of a strict subclass of int is deprecated, \ +and may be removed in a future version of Python." + ); + _warnings::warn(vm.ctx.exceptions.deprecation_warning, msg, 1, vm)?; Ok(ret.to_owned()) } else { @@ -662,16 +690,12 @@ impl PyNumber<'_> { let ret_class = ret.class().to_owned(); if let Some(ret) = ret.downcast_ref::() { - _warnings::warn( - vm.ctx.exceptions.deprecation_warning, - format!( - "__index__ returned non-int (type {ret_class}). \ - The ability to return an instance of a strict subclass of int \ - is deprecated, and may be removed in a future version of Python." - ), - 1, - vm, - )?; + let msg = format!( + "__index__ returned non-int (type {ret_class}). \ +The ability to return an instance of a strict subclass of int is deprecated, \ +and may be removed in a future version of Python." + ); + _warnings::warn(vm.ctx.exceptions.deprecation_warning, msg, 1, vm)?; Ok(ret.to_owned()) } else { @@ -695,16 +719,12 @@ impl PyNumber<'_> { let ret_class = ret.class().to_owned(); if let Some(ret) = ret.downcast_ref::() { - _warnings::warn( - vm.ctx.exceptions.deprecation_warning, - format!( - "__float__ returned non-float (type {ret_class}). \ - The ability to return an instance of a strict subclass of float \ - is deprecated, and may be removed in a future version of Python." - ), - 1, - vm, - )?; + let msg = format!( + "__float__ returned non-float (type {ret_class}). \ +The ability to return an instance of a strict subclass of float is deprecated, \ +and may be removed in a future version of Python." + ); + _warnings::warn(vm.ctx.exceptions.deprecation_warning, msg, 1, vm)?; Ok(ret.to_owned()) } else { @@ -724,18 +744,22 @@ pub fn handle_bytes_to_int_err( vm: &VirtualMachine, ) -> PyBaseExceptionRef { match e { - BytesToIntError::InvalidLiteral { base } => vm.new_value_error(format!( - "invalid literal for int() with base {base}: {}", - match obj.repr(vm) { + BytesToIntError::InvalidLiteral { base } => { + let v = match obj.repr(vm) { Ok(v) => v, Err(err) => return err, - }, - )), + }; + vm.new_value_error(format!("invalid literal for int() with base {base}: {v}")) + } BytesToIntError::InvalidBase => { vm.new_value_error("int() base must be >= 2 and <= 36, or 0") } - BytesToIntError::DigitLimit { got, limit } => vm.new_value_error(format!( -"Exceeds the limit ({limit} digits) for integer string conversion: value has {got} digits; use sys.set_int_max_str_digits() to increase the limit" - )), + BytesToIntError::DigitLimit { got, limit } => { + let msg = format!( + "Exceeds the limit ({limit} digits) for integer string conversion: \ +value has {got} digits; use sys.set_int_max_str_digits() to increase the limit" + ); + vm.new_value_error(msg) + } } } diff --git a/crates/vm/src/protocol/object.rs b/crates/vm/src/protocol/object.rs index 3398a48e7..370074224 100644 --- a/crates/vm/src/protocol/object.rs +++ b/crates/vm/src/protocol/object.rs @@ -1,5 +1,4 @@ -//! Object Protocol -//! +//! [Object Protocol](https://docs.python.org/3/c-api/object.html) use crate::{ AsObject, Py, PyObject, PyObjectRef, PyRef, PyResult, TryFromObject, VirtualMachine, @@ -33,13 +32,13 @@ impl PyObjectRef { pub fn bytes(self, vm: &VirtualMachine) -> PyResult { let bytes_type = vm.ctx.types.bytes_type; - match self.downcast_exact::(vm) { - Ok(int) => Err(vm.new_downcast_type_error(bytes_type, &int)), - Err(obj) => { + self.downcast_exact::(vm).map_or_else( + |obj| { let args = FuncArgs::from(vec![obj]); ::slot_new(bytes_type.to_owned(), args, vm) - } - } + }, + |int| Err(vm.new_downcast_type_error(bytes_type, &int)), + ) } // const hash_not_implemented: fn(&PyObject, &VirtualMachine) ->PyResult = crate::types::Unhashable::slot_hash; @@ -70,7 +69,7 @@ impl PyObjectRef { )?; } - let attributes: Vec<_> = dict.into_iter().map(|(k, _v)| k).collect(); + let attributes = dict.into_iter().map(|(k, _v)| k).collect::>(); Ok(PyList::from(attributes)) } @@ -103,10 +102,8 @@ impl PyObject { // Check that __aiter__ did not return a coroutine if iterator.downcast_ref::().is_some() { - return Err(vm.new_type_error( - "'async_iterator' object cannot be interpreted as an async iterable; \ - perhaps you forgot to call aiter()?", - )); + const MSG: &str = "'async_iterator' object cannot be interpreted as an async iterable; perhaps you forgot to call aiter()?"; + return Err(vm.new_type_error(MSG)); } // Check that the result is an async iterator (has __anext__) @@ -318,6 +315,7 @@ impl PyObject { let other_class = other.class(); !self_class.is(other_class) && other_class.fast_issubclass(self_class) }; + if is_strict_subclass { let res = call_cmp(other, self, swapped)?; checked_reverse_op = true; @@ -325,15 +323,18 @@ impl PyObject { return Ok(x); } } + if let PyArithmeticValue::Implemented(x) = call_cmp(self, other, op)? { return Ok(x); } + if !checked_reverse_op { let res = call_cmp(other, self, swapped)?; if let PyArithmeticValue::Implemented(x) = res { return Ok(x); } } + match op { PyComparisonOp::Eq => Ok(Either::B(self.is(&other))), PyComparisonOp::Ne => Ok(Either::B(!self.is(&other))), @@ -345,6 +346,7 @@ impl PyObject { ))), } } + #[inline(always)] pub fn rich_compare_bool( &self, @@ -366,6 +368,7 @@ impl PyObject { _ => {} } } + match self._cmp(other, op_id, vm)? { Either::A(obj) => obj.try_to_bool(vm), Either::B(other) => Ok(other), @@ -392,21 +395,23 @@ impl PyObject { pub fn ascii(&self, vm: &VirtualMachine) -> PyResult> { let repr = self.repr(vm)?; - if repr.as_wtf8().is_ascii() { - Ok(repr) + Ok(if repr.as_wtf8().is_ascii() { + repr } else { - Ok(vm.ctx.new_str(to_ascii(repr.as_wtf8()))) - } + vm.ctx.new_str(to_ascii(repr.as_wtf8())) + }) } pub fn str_utf8(&self, vm: &VirtualMachine) -> PyResult> { self.str(vm)?.try_into_utf8(vm) } + pub fn str(&self, vm: &VirtualMachine) -> PyResult> { let obj = match self.to_owned().downcast_exact::(vm) { Ok(s) => return Ok(s.into_pyref()), Err(obj) => obj, }; + // Fast path for exact int: skip __str__ method resolution let obj = match obj.downcast_exact::(vm) { Ok(int) => { @@ -415,11 +420,12 @@ impl PyObject { } Err(obj) => obj, }; + // TODO: replace to obj.class().slots.str - let str_method = match vm.get_special_method(&obj, identifier!(vm, __str__))? { - Some(str_method) => str_method, - None => return obj.repr(vm), + let Some(str_method) = vm.get_special_method(&obj, identifier!(vm, __str__))? else { + return obj.repr(vm); }; + let s = str_method.invoke((), vm)?; s.downcast::().map_err(|obj| { vm.new_type_error(format!( @@ -435,13 +441,12 @@ impl PyObject { where F: Fn() -> String, { - let cls = self; - match cls.abstract_get_bases(vm)? { - Some(_bases) => Ok(()), // Has __bases__, it's a valid class - None => { - // No __bases__ or __bases__ is not a tuple - Err(vm.new_type_error(msg())) - } + if self.abstract_get_bases(vm)?.is_some() { + // Has __bases__, it's a valid class + Ok(()) + } else { + // No __bases__ or __bases__ is not a tuple + Err(vm.new_type_error(msg())) } } @@ -455,16 +460,13 @@ impl PyObject { /// If an object other than a tuple comes out of __bases__, then again, None is returned. /// Other exceptions are propagated. fn abstract_get_bases(&self, vm: &VirtualMachine) -> PyResult> { - match vm.get_attribute_opt(self.to_owned(), identifier!(vm, __bases__))? { - Some(bases) => { + Ok(vm + .get_attribute_opt(self.to_owned(), identifier!(vm, __bases__))? + // If we get `None` then AttributeError was masked. + .and_then(|bases| { // Check if it's a tuple - match PyTupleRef::try_from_object(vm, bases) { - Ok(tuple) => Ok(Some(tuple)), - Err(_) => Ok(None), // Not a tuple, return None - } - } - None => Ok(None), // AttributeError was masked - } + PyTupleRef::try_from_object(vm, bases).ok() + })) } fn abstract_issubclass(&self, cls: &Self, vm: &VirtualMachine) -> PyResult { @@ -507,6 +509,7 @@ impl PyObject { let result = vm.with_recursion("in __issubclass__", || { bases.as_slice()[i].abstract_issubclass(cls, vm) })?; + if result { return Ok(true); } @@ -523,6 +526,7 @@ impl PyObject { // PyType_IsSubtype equivalent return Ok(derived.is_subtype(cls)); } + // Check if derived is a class self.check_class(vm, || { format!("issubclass() arg 1 must be a class, not {}", self.class()) @@ -693,10 +697,7 @@ impl PyObject { return hash(self, vm); } - Err(vm.new_exception_msg( - vm.ctx.exceptions.type_error.to_owned(), - format!("unhashable type: '{}'", self.class().name()).into(), - )) + Err(vm.new_type_error(format!("unhashable type: '{}'", self.class().name()))) } // type protocol diff --git a/crates/vm/src/protocol/sequence.rs b/crates/vm/src/protocol/sequence.rs index 8a77d5a90..dbef92c66 100644 --- a/crates/vm/src/protocol/sequence.rs +++ b/crates/vm/src/protocol/sequence.rs @@ -1,3 +1,8 @@ +//! [Sequence Protocol](https://docs.python.org/3/c-api/sequence.html) + +use crossbeam_utils::atomic::AtomicCell; +use itertools::Itertools; + use crate::{ AsObject, PyObject, PyObjectRef, PyPayload, PyResult, VirtualMachine, builtins::{PyList, PyListRef, PySlice, PyTuple, PyTupleRef}, @@ -6,13 +11,8 @@ use crate::{ object::{Traverse, TraverseFn}, protocol::PyNumberBinaryOp, }; -use crossbeam_utils::atomic::AtomicCell; -use itertools::Itertools; -// Sequence Protocol -// https://docs.python.org/3/c-api/sequence.html - -#[allow(clippy::type_complexity)] +#[expect(clippy::type_complexity)] #[derive(Default)] pub struct PySequenceSlots { pub length: AtomicCell, &VirtualMachine) -> PyResult>>, @@ -45,31 +45,38 @@ impl PySequenceSlots { if let Some(f) = methods.length { self.length.store(Some(f)); } + if let Some(f) = methods.concat { self.concat.store(Some(f)); } + if let Some(f) = methods.repeat { self.repeat.store(Some(f)); } + if let Some(f) = methods.item { self.item.store(Some(f)); } + if let Some(f) = methods.ass_item { self.ass_item.store(Some(f)); } + if let Some(f) = methods.contains { self.contains.store(Some(f)); } + if let Some(f) = methods.inplace_concat { self.inplace_concat.store(Some(f)); } + if let Some(f) = methods.inplace_repeat { self.inplace_repeat.store(Some(f)); } } } -#[allow(clippy::type_complexity)] +#[expect(clippy::type_complexity)] #[derive(Default)] pub struct PySequenceMethods { pub length: Option, &VirtualMachine) -> PyResult>, @@ -104,7 +111,7 @@ impl PySequenceMethods { impl PyObject { #[inline] - pub fn sequence_unchecked(&self) -> PySequence<'_> { + pub const fn sequence_unchecked(&self) -> PySequence<'_> { PySequence { obj: self } } @@ -215,6 +222,7 @@ impl PySequence<'_> { if let Some(f) = self.slots().inplace_repeat.load() { return f(self, n, vm); } + if let Some(f) = self.slots().repeat.load() { return f(self, n, vm); } @@ -233,6 +241,7 @@ impl PySequence<'_> { if let Some(f) = self.slots().item.load() { return f(self, i, vm); } + Err(vm.new_type_error(format!( "'{}' is not a sequence or does not support indexing", self.obj.class() @@ -243,6 +252,7 @@ impl PySequence<'_> { if let Some(f) = self.slots().ass_item.load() { return f(self, i, value, vm); } + Err(vm.new_type_error(format!( "'{}' is not a sequence or doesn't support item {}", self.obj.class(), @@ -330,8 +340,7 @@ impl PySequence<'_> { } pub fn list(&self, vm: &VirtualMachine) -> PyResult { - let list = vm.ctx.new_list(self.obj.try_to_value(vm)?); - Ok(list) + Ok(vm.ctx.new_list(self.obj.try_to_value(vm)?)) } pub fn count(&self, target: &PyObject, vm: &VirtualMachine) -> PyResult { @@ -354,20 +363,17 @@ impl PySequence<'_> { } pub fn index(&self, target: &PyObject, vm: &VirtualMachine) -> PyResult { - let mut index: isize = -1; - let iter = self.obj.to_owned().get_iter(vm)?; let iter = iter.iter::(vm)?; - for elem in iter { - if index == isize::MAX { + for (index, elem) in iter.enumerate() { + if isize::try_from(index).is_err() { return Err(vm.new_overflow_error("index exceeds C integer size")); } - index += 1; let elem = elem?; if vm.bool_eq(&elem, target)? { - return Ok(index as usize); + return Ok(index); } } diff --git a/crates/vm/src/stdlib/_abc.rs b/crates/vm/src/stdlib/_abc.rs index f9906956f..6cdef8612 100644 --- a/crates/vm/src/stdlib/_abc.rs +++ b/crates/vm/src/stdlib/_abc.rs @@ -361,9 +361,8 @@ mod _abc { return Ok(false); } if !ok.is(&vm.ctx.not_implemented) { - return Err(vm.new_exception_msg( - vm.ctx.exceptions.assertion_error.to_owned(), - "__subclasshook__ must return either False, True, or NotImplemented".into(), + return Err(vm.new_assertion_error( + "__subclasshook__ must return either False, True, or NotImplemented", )); } diff --git a/crates/vm/src/stdlib/_ctypes.rs b/crates/vm/src/stdlib/_ctypes.rs index cc87ebde5..6370bc42b 100644 --- a/crates/vm/src/stdlib/_ctypes.rs +++ b/crates/vm/src/stdlib/_ctypes.rs @@ -69,10 +69,9 @@ impl PyType { if let Some(stg_info) = self.get_type_data::() && stg_info.initialized { - return Err(vm.new_exception_msg( - vm.ctx.exceptions.system_error.to_owned(), - format!("class \"{}\" already initialized", self.name()).into(), - )); + return Err( + vm.new_system_error(format!(r#"class "{}" already initialized"#, self.name())) + ); } Ok(()) } diff --git a/crates/vm/src/stdlib/_functools.rs b/crates/vm/src/stdlib/_functools.rs index 3007a4d12..7c6914c2f 100644 --- a/crates/vm/src/stdlib/_functools.rs +++ b/crates/vm/src/stdlib/_functools.rs @@ -44,11 +44,7 @@ mod _functools { } else { // initial was not provided at all iter.next().transpose()?.ok_or_else(|| { - let exc_type = vm.ctx.exceptions.type_error.to_owned(); - vm.new_exception_msg( - exc_type, - "reduce() of empty sequence with no initial value".into(), - ) + vm.new_type_error("reduce() of empty iterable with no initial value") })? }; diff --git a/crates/vm/src/stdlib/marshal.rs b/crates/vm/src/stdlib/marshal.rs index 6e0fc4e7f..cb43a38bd 100644 --- a/crates/vm/src/stdlib/marshal.rs +++ b/crates/vm/src/stdlib/marshal.rs @@ -504,10 +504,7 @@ mod decl { let result = marshal::deserialize_value(&mut &buf[..], PyMarshalBag(vm)).map_err(|e| match e { - marshal::MarshalError::Eof => vm.new_exception_msg( - vm.ctx.exceptions.eof_error.to_owned(), - "marshal data too short".into(), - ), + marshal::MarshalError::Eof => vm.new_eof_error("marshal data too short"), _ => vm.new_value_error("bad marshal data"), })?; if !allow_code { diff --git a/crates/vm/src/vm/vm_new.rs b/crates/vm/src/vm/vm_new.rs index 5af053faf..30b8e6b1a 100644 --- a/crates/vm/src/vm/vm_new.rs +++ b/crates/vm/src/vm/vm_new.rs @@ -930,4 +930,6 @@ impl VirtualMachine { define_exception_fn!(fn new_runtime_error, runtime_error, RuntimeError); define_exception_fn!(fn new_python_finalization_error, python_finalization_error, PythonFinalizationError); define_exception_fn!(fn new_memory_error, memory_error, MemoryError); + define_exception_fn!(fn new_assertion_error, assertion_error, AssertionError); + define_exception_fn!(fn new_unbound_local_error, unbound_local_error, UnboundLocalError); } diff --git a/src/lib.rs b/src/lib.rs index 14deb2972..d7dc6255e 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -152,10 +152,9 @@ __import__("io").TextIOWrapper( fn install_pip(installer: InstallPipMode, scope: Scope, vm: &VirtualMachine) -> PyResult<()> { if !cfg!(feature = "ssl") { - return Err(vm.new_exception_msg( - vm.ctx.exceptions.system_error.to_owned(), - "install-pip requires rustpython be build with '--features=ssl'".into(), - )); + return Err( + vm.new_system_error("install-pip requires rustpython be build with '--features=ssl'") + ); } match installer { From 6d507c2af115edac2361bdd4ec1d0380a65ad959 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Thu, 11 Jun 2026 06:11:54 +0300 Subject: [PATCH 053/339] Add `_heapq` module (#8059) * Basic `_heapq` module * Accept generic siftup functions --- crates/stdlib/src/_heapq.rs | 529 ++++++++++++++++++++++++++++++++++++ crates/stdlib/src/lib.rs | 2 + 2 files changed, 531 insertions(+) create mode 100644 crates/stdlib/src/_heapq.rs diff --git a/crates/stdlib/src/_heapq.rs b/crates/stdlib/src/_heapq.rs new file mode 100644 index 000000000..1b416a474 --- /dev/null +++ b/crates/stdlib/src/_heapq.rs @@ -0,0 +1,529 @@ +// cspell:ignore siftup siftdown mhalf +pub(crate) use _heapq::module_def; + +#[pymodule] +mod _heapq { + + use crate::vm::{ + AsObject, PyObjectRef, PyResult, VirtualMachine, + builtins::{PyList, PyListRef}, + types::PyComparisonOp, + }; + + /// [CPython's siftdown](https://github.com/python/cpython/blob/v3.14.5/Modules/_heapqmodule.c#L25-L68) + fn siftdown( + heap: &PyListRef, + startpos: usize, + mut pos: usize, + vm: &VirtualMachine, + ) -> PyResult<()> { + let size = heap.__len__(); + + let newitem = match heap.borrow_vec().get(pos) { + Some(v) => v.clone(), + None => return Err(vm.new_index_error("index out of range")), + }; + + // Follow the path to the root, moving parents down until finding + // a place newitem fits. + while pos > startpos { + let parentpos = (pos - 1) >> 1; + let parent = { + let vec = heap.borrow_vec(); + vec[parentpos].clone() + }; + + let cmp = newitem.rich_compare_bool(&parent, PyComparisonOp::Lt, vm)?; + + if size != heap.__len__() { + return Err(vm.new_runtime_error("list changed size during iteration")); + } + + if !cmp { + break; + } + + { + let mut vec = heap.borrow_vec_mut(); + vec.swap(pos, parentpos); + } + + pos = parentpos; + } + + Ok(()) + } + + /// [CPython's siftup](https://github.com/python/cpython/blob/v3.14.5/Modules/_heapqmodule.c#L70-L118) + fn siftup(heap: &PyListRef, mut pos: usize, vm: &VirtualMachine) -> PyResult<()> { + let endpos = heap.__len__(); + let startpos = pos; + + if pos >= endpos { + return Err(vm.new_index_error("index out of range")); + }; + + let limit = endpos >> 1; // smallest pos that has no child + + // Bubble up the smaller child until hitting a leaf. + while pos < limit { + // Set childpos to index of smaller child. + let mut childpos = 2 * pos + 1; // leftmost child position + + if childpos + 1 < endpos { + let (a, b) = { + let vec = heap.borrow_vec(); + (vec[childpos].clone(), vec[childpos + 1].clone()) + }; + + let cmp = a.rich_compare_bool(&b, PyComparisonOp::Lt, vm)?; + + if endpos != heap.__len__() { + return Err(vm.new_runtime_error("list changed size during iteration")); + } + + if !cmp { + childpos += 1; + } + } + + { + // Move the smaller child up + let mut vec = heap.borrow_vec_mut(); + vec.swap(pos, childpos); + } + + pos = childpos; + } + + // Bubble it up to its final resting place (by sifting its parents down) + siftdown(heap, startpos, pos, vm) + } + + /// configurable `sift_func` for doing heappush operation. + /// + /// A generic implementation of: + /// - [CPython's _heapq_heappush_impl](https://github.com/python/cpython/blob/v3.14.5/Modules/_heapqmodule.c#L131-L150) + /// - [CPython's _heapq_heappush_max_impl](https://github.com/python/cpython/blob/v3.14.5/Modules/_heapqmodule.c#L512-L532) + fn heappush_internal( + heap: &PyListRef, + item: PyObjectRef, + siftdown_func: F, + vm: &VirtualMachine, + ) -> PyResult<()> + where + F: Fn(&PyListRef, usize, usize, &VirtualMachine) -> PyResult<()>, + { + { + let mut vec = heap.borrow_vec_mut(); + vec.push(item); + } + + let size = heap.__len__(); + + siftdown_func(heap, 0, size - 1, vm) + } + + #[pyfunction] + fn heappush(heap: PyObjectRef, item: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> { + let lst = heap.downcast::().map_err(|obj| { + vm.new_type_error(format!( + "heappush() argument 1 must be list, not {}", + obj.class().name() + )) + })?; + + heappush_internal(&lst, item, siftdown, vm) + } + + /// [CPython's heappop_internal](https://github.com/python/cpython/blob/v3.14.5/Modules/_heapqmodule.c#L152-L183) + fn heappop_internal( + heap: &PyListRef, + siftup_func: F, + vm: &VirtualMachine, + ) -> PyResult + where + F: Fn(&PyListRef, usize, &VirtualMachine) -> PyResult<()>, + { + let Some(lastelt) = heap.borrow_vec_mut().pop() else { + return Err(vm.new_index_error("index out of range")); + }; + + if heap.borrow_vec().is_empty() { + return Ok(lastelt); + }; + + let returnitem = { + let mut vec = heap.borrow_vec_mut(); + let root = vec[0].clone(); + vec[0] = lastelt; + root + }; + + siftup_func(heap, 0, vm)?; + Ok(returnitem) + } + + #[pyfunction] + fn heappop(heap: PyObjectRef, vm: &VirtualMachine) -> PyResult { + let lst = heap.downcast::().map_err(|obj| { + vm.new_type_error(format!( + "heappop() argument 1 must be list, not {}", + obj.class().name() + )) + })?; + + heappop_internal(&lst, siftup, vm) + } + + /// [CPython's heapreplace_internal](https://github.com/python/cpython/blob/v3.14.5/Modules/_heapqmodule.c#L202-L220) + fn heapreplace_internal( + heap: &PyListRef, + item: PyObjectRef, + siftup_func: F, + vm: &VirtualMachine, + ) -> PyResult + where + F: Fn(&PyListRef, usize, &VirtualMachine) -> PyResult<()>, + { + let returnitem = { + let mut vec = heap.borrow_vec_mut(); + let root = match vec.first() { + Some(v) => v.clone(), + None => return Err(vm.new_index_error("index out of range")), + }; + + vec[0] = item; + root + }; + + siftup_func(heap, 0, vm)?; + Ok(returnitem) + } + + #[pyfunction] + fn heapreplace( + heap: PyObjectRef, + item: PyObjectRef, + vm: &VirtualMachine, + ) -> PyResult { + let lst = heap.downcast::().map_err(|obj| { + vm.new_type_error(format!( + "heapreplace() argument 1 must be list, not {}", + obj.class().name() + )) + })?; + + heapreplace_internal(&lst, item, siftup, vm) + } + + #[pyfunction] + fn heappushpop( + heap: PyObjectRef, + item: PyObjectRef, + vm: &VirtualMachine, + ) -> PyResult { + let lst = heap.downcast::().map_err(|obj| { + vm.new_type_error(format!( + "heappushpop() argument 1 must be list, not {}", + obj.class().name() + )) + })?; + + let top = { + let vec = lst.borrow_vec(); + match vec.first() { + Some(v) => v.clone(), + None => return Ok(item), + } + }; + + let cmp = top.rich_compare_bool(&item, PyComparisonOp::Lt, vm)?; + if !cmp { + return Ok(item); + } + + let returnitem = { + let mut vec = lst.borrow_vec_mut(); + let root = match vec.first() { + Some(v) => v.clone(), + None => return Err(vm.new_index_error("index out of range")), + }; + + vec[0] = item; + root + }; + + siftup(&lst, 0, vm)?; + Ok(returnitem) + } + + /// [CPython's keep_top_bit](https://github.com/python/cpython/blob/v3.14.5/Modules/_heapqmodule.c#L299-L309) + const fn keep_top_bit(mut n: usize) -> usize { + let mut i = 0; + + while n > 1 { + n >>= 1; + i += 1; + } + + n << i + } + + /// [CPython's cache_friendly_heapify](https://github.com/python/cpython/blob/v3.14.5/Modules/_heapqmodule.c#L311-L362) + fn cache_friendly_heapify( + heap: &PyListRef, + siftup_func: F, + vm: &VirtualMachine, + ) -> PyResult<()> + where + F: Fn(&PyListRef, usize, &VirtualMachine) -> PyResult<()>, + { + let m = heap.__len__() >> 1; // index of first childless node + let leftmost = keep_top_bit(m + 1) - 1; // leftmost node in row of m + let mhalf = m >> 1; // parent of first childless node + + for i in (mhalf..leftmost).rev() { + let mut j = i; + + loop { + siftup_func(heap, j, vm)?; + + if j & 1 == 0 { + break; + } + + j >>= 1; + } + } + + for i in (leftmost..m).rev() { + let mut j = i; + + loop { + siftup_func(heap, j, vm)?; + + if j & 1 == 0 { + break; + } + + j >>= 1; + } + } + + Ok(()) + } + + /// [CPython's heapify_internal](https://github.com/python/cpython/blob/v3.14.5/Modules/_heapqmodule.c#L364-L388) + fn heapify_internal(heap: &PyListRef, siftup_func: F, vm: &VirtualMachine) -> PyResult<()> + where + F: Fn(&PyListRef, usize, &VirtualMachine) -> PyResult<()>, + { + let n = heap.__len__(); + + if n > 2500 { + return cache_friendly_heapify(heap, siftup_func, vm); + } + + for i in (0..(n >> 1)).rev() { + siftup_func(heap, i, vm)?; + } + + Ok(()) + } + + #[pyfunction] + fn heapify(heap: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> { + let lst = heap.downcast::().map_err(|obj| { + vm.new_type_error(format!( + "heapify() argument 1 must be list, not {}", + obj.class().name() + )) + })?; + + heapify_internal(&lst, siftup, vm) + } + + /// [CPython's siftdown_max](https://github.com/python/cpython/blob/v3.14.5/Modules/_heapqmodule.c#L407-L449) + fn siftdown_max( + heap: &PyListRef, + startpos: usize, + mut pos: usize, + vm: &VirtualMachine, + ) -> PyResult<()> { + let size = heap.__len__(); + + let newitem = match heap.borrow_vec().get(pos) { + Some(v) => v.clone(), + None => return Err(vm.new_index_error("index out of range")), + }; + + // Follow the path to the root, moving parents down until finding + // a place newitem fits. + while pos > startpos { + let parentpos = (pos - 1) >> 1; + let parent = { + let vec = heap.borrow_vec(); + vec[parentpos].clone() + }; + + let cmp = parent.rich_compare_bool(&newitem, PyComparisonOp::Lt, vm)?; + + if size != heap.__len__() { + return Err(vm.new_runtime_error("list changed size during iteration")); + } + + if !cmp { + break; + } + + { + let mut vec = heap.borrow_vec_mut(); + vec.swap(pos, parentpos); + } + + pos = parentpos; + } + + Ok(()) + } + + /// [CPython's siftup_max](https://github.com/python/cpython/blob/v3.14.5/Modules/_heapqmodule.c#L451-L499) + fn siftup_max(heap: &PyListRef, mut pos: usize, vm: &VirtualMachine) -> PyResult<()> { + let endpos = heap.__len__(); + let startpos = pos; + + if pos >= endpos { + return Err(vm.new_index_error("index out of range")); + }; + + let limit = endpos >> 1; // smallest pos that has no child + + // Bubble up the larger child until hitting a leaf. + while pos < limit { + // Set childpos to index of larger child. + let mut childpos = 2 * pos + 1; // leftmost child position + + if childpos + 1 < endpos { + let (a, b) = { + let vec = heap.borrow_vec(); + (vec[childpos + 1].clone(), vec[childpos].clone()) + }; + + let cmp = a.rich_compare_bool(&b, PyComparisonOp::Lt, vm)?; + + if endpos != heap.__len__() { + return Err(vm.new_runtime_error("list changed size during iteration")); + } + + if !cmp { + childpos += 1; + } + } + + { + // Move the larger child up + let mut vec = heap.borrow_vec_mut(); + vec.swap(pos, childpos); + } + + pos = childpos; + } + + // Bubble it up to its final resting place (by sifting its parents down) + siftdown_max(heap, startpos, pos, vm) + } + + #[pyfunction] + fn heappush_max(heap: PyObjectRef, item: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> { + let lst = heap.downcast::().map_err(|obj| { + vm.new_type_error(format!( + "heappush_max() argument 1 must be list, not {}", + obj.class().name() + )) + })?; + + heappush_internal(&lst, item, siftdown_max, vm) + } + + #[pyfunction] + fn heappop_max(heap: PyObjectRef, vm: &VirtualMachine) -> PyResult { + let lst = heap.downcast::().map_err(|obj| { + vm.new_type_error(format!( + "heappop_max() argument 1 must be list, not {}", + obj.class().name() + )) + })?; + + heappop_internal(&lst, siftup_max, vm) + } + + #[pyfunction] + fn heapreplace_max( + heap: PyObjectRef, + item: PyObjectRef, + vm: &VirtualMachine, + ) -> PyResult { + let lst = heap.downcast::().map_err(|obj| { + vm.new_type_error(format!( + "heapreplace_max() argument 1 must be list, not {}", + obj.class().name() + )) + })?; + + heapreplace_internal(&lst, item, siftup_max, vm) + } + + #[pyfunction] + fn heapify_max(heap: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> { + let lst = heap.downcast::().map_err(|obj| { + vm.new_type_error(format!( + "heapify_max() argument 1 must be list, not {}", + obj.class().name() + )) + })?; + + heapify_internal(&lst, siftup_max, vm) + } + + #[pyfunction] + fn heappushpop_max( + heap: PyObjectRef, + item: PyObjectRef, + vm: &VirtualMachine, + ) -> PyResult { + let lst = heap.downcast::().map_err(|obj| { + vm.new_type_error(format!( + "heappushpop_max() argument 1 must be list, not {}", + obj.class().name() + )) + })?; + + let top = { + let vec = lst.borrow_vec(); + match vec.first() { + Some(v) => v.clone(), + None => return Ok(item), + } + }; + + let cmp = item.rich_compare_bool(&top, PyComparisonOp::Lt, vm)?; + if !cmp { + return Ok(item); + } + + let returnitem = { + let mut vec = lst.borrow_vec_mut(); + let root = match vec.first() { + Some(v) => v.clone(), + None => return Err(vm.new_index_error("index out of range")), + }; + + vec[0] = item; + root + }; + + siftup_max(&lst, 0, vm)?; + Ok(returnitem) + } +} diff --git a/crates/stdlib/src/lib.rs b/crates/stdlib/src/lib.rs index 119307874..c41a7ea9f 100644 --- a/crates/stdlib/src/lib.rs +++ b/crates/stdlib/src/lib.rs @@ -53,6 +53,7 @@ mod math; #[cfg(all(feature = "host_env", any(unix, windows)))] mod mmap; +mod _heapq; mod _queue; mod pyexpat; mod pystruct; @@ -226,6 +227,7 @@ pub fn stdlib_module_defs(ctx: &Context) -> Vec<&'static builtins::PyModuleDef> posixshmem::module_def(ctx), pyexpat::module_def(ctx), pystruct::module_def(ctx), + _heapq::module_def(ctx), _queue::module_def(ctx), random::module_def(ctx), #[cfg(all(feature = "host_env", unix, not(target_os = "redox")))] From 094ba5479eb81cac4a0dd0abd538f29c30ec0131 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Jun 2026 12:12:13 +0900 Subject: [PATCH 054/339] Bump taiki-e/install-action from 2.79.10 to 2.81.1 (#8060) Bumps [taiki-e/install-action](https://github.com/taiki-e/install-action) from 2.79.10 to 2.81.1. - [Release notes](https://github.com/taiki-e/install-action/releases) - [Changelog](https://github.com/taiki-e/install-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/taiki-e/install-action/compare/60ae4ce63c7aeb6e96d7f572c1ec7fafbb17ca80...e49978b799e49ff429d162b7a30601a569ab6538) --- updated-dependencies: - dependency-name: taiki-e/install-action dependency-version: 2.81.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/cron-ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cron-ci.yaml b/.github/workflows/cron-ci.yaml index 1bb2d66ab..2c0e25882 100644 --- a/.github/workflows/cron-ci.yaml +++ b/.github/workflows/cron-ci.yaml @@ -33,7 +33,7 @@ jobs: - uses: dtolnay/rust-toolchain@stable - - uses: taiki-e/install-action@60ae4ce63c7aeb6e96d7f572c1ec7fafbb17ca80 # v2.79.10 + - uses: taiki-e/install-action@e49978b799e49ff429d162b7a30601a569ab6538 # v2.81.1 with: tool: cargo-llvm-cov From 48f783e02ca23dc2812fa05339147bf02bb45ade Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Jun 2026 12:12:19 +0900 Subject: [PATCH 055/339] Bump github/gh-aw from 0.76.1 to 0.77.5 (#8062) Bumps [github/gh-aw](https://github.com/github/gh-aw) from 0.76.1 to 0.77.5. - [Release notes](https://github.com/github/gh-aw/releases) - [Changelog](https://github.com/github/gh-aw/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/gh-aw/compare/58d1bedbb7200f59c2d224151339e38fd8687d05...f990bbb7eb83981a203d4b5eccdc24f677e950c7) --- updated-dependencies: - dependency-name: github/gh-aw dependency-version: 0.77.5 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/upgrade-pylib.lock.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/upgrade-pylib.lock.yml b/.github/workflows/upgrade-pylib.lock.yml index 23e6c7ac2..aa1ec98e2 100644 --- a/.github/workflows/upgrade-pylib.lock.yml +++ b/.github/workflows/upgrade-pylib.lock.yml @@ -58,7 +58,7 @@ jobs: comment_repo: "" steps: - name: Setup Scripts - uses: github/gh-aw/actions/setup@58d1bedbb7200f59c2d224151339e38fd8687d05 # v0.76.1 + uses: github/gh-aw/actions/setup@f990bbb7eb83981a203d4b5eccdc24f677e950c7 # v0.77.5 with: destination: /opt/gh-aw/actions - name: Check workflow file timestamps @@ -99,7 +99,7 @@ jobs: secret_verification_result: ${{ steps.validate-secret.outputs.verification_result }} steps: - name: Setup Scripts - uses: github/gh-aw/actions/setup@58d1bedbb7200f59c2d224151339e38fd8687d05 # v0.76.1 + uses: github/gh-aw/actions/setup@f990bbb7eb83981a203d4b5eccdc24f677e950c7 # v0.77.5 with: destination: /opt/gh-aw/actions - name: Checkout repository @@ -806,7 +806,7 @@ jobs: total_count: ${{ steps.missing_tool.outputs.total_count }} steps: - name: Setup Scripts - uses: github/gh-aw/actions/setup@58d1bedbb7200f59c2d224151339e38fd8687d05 # v0.76.1 + uses: github/gh-aw/actions/setup@f990bbb7eb83981a203d4b5eccdc24f677e950c7 # v0.77.5 with: destination: /opt/gh-aw/actions - name: Download agent output artifact @@ -927,7 +927,7 @@ jobs: success: ${{ steps.parse_results.outputs.success }} steps: - name: Setup Scripts - uses: github/gh-aw/actions/setup@58d1bedbb7200f59c2d224151339e38fd8687d05 # v0.76.1 + uses: github/gh-aw/actions/setup@f990bbb7eb83981a203d4b5eccdc24f677e950c7 # v0.77.5 with: destination: /opt/gh-aw/actions - name: Download agent artifacts @@ -1039,7 +1039,7 @@ jobs: process_safe_outputs_temporary_id_map: ${{ steps.process_safe_outputs.outputs.temporary_id_map }} steps: - name: Setup Scripts - uses: github/gh-aw/actions/setup@58d1bedbb7200f59c2d224151339e38fd8687d05 # v0.76.1 + uses: github/gh-aw/actions/setup@f990bbb7eb83981a203d4b5eccdc24f677e950c7 # v0.77.5 with: destination: /opt/gh-aw/actions - name: Download agent output artifact From 697bde31c9d28c3aed4c6e118689ad9816e583f5 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Thu, 11 Jun 2026 06:12:33 +0300 Subject: [PATCH 056/339] Skip flakey windows test (#8063) --- Lib/test/test_asyncio/test_sendfile.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Lib/test/test_asyncio/test_sendfile.py b/Lib/test/test_asyncio/test_sendfile.py index e266d5774..766e6f499 100644 --- a/Lib/test/test_asyncio/test_sendfile.py +++ b/Lib/test/test_asyncio/test_sendfile.py @@ -548,6 +548,10 @@ if sys.platform == 'win32': def create_event_loop(self): return asyncio.ProactorEventLoop() + @unittest.skipIf(sys.platform == "win32", "TODO: RUSTPYTHON; Flaky on CI") + def test_sendfile_ssl_pre_and_post_data(self): + return super().test_sendfile_ssl_pre_and_post_data() + else: import selectors From e09aee7c522dd343c0264a74a2291044a1a0af35 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Jun 2026 12:12:41 +0900 Subject: [PATCH 057/339] Bump https://github.com/astral-sh/ruff-pre-commit (#8061) Bumps [https://github.com/astral-sh/ruff-pre-commit](https://github.com/astral-sh/ruff-pre-commit) from v0.15.14 to 0.15.15. - [Release notes](https://github.com/astral-sh/ruff-pre-commit/releases) - [Commits](https://github.com/astral-sh/ruff-pre-commit/compare/v0.15.14...v0.15.15) --- updated-dependencies: - dependency-name: https://github.com/astral-sh/ruff-pre-commit dependency-version: 0.15.15 dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index db3b9a583..fd879f2ac 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -10,7 +10,7 @@ repos: priority: 0 - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.15.14 + rev: v0.15.15 hooks: - id: ruff-format priority: 0 From cd75e2a6dff25807f43d50198039fca895719894 Mon Sep 17 00:00:00 2001 From: Bas Schoenmaeckers <7943856+bschoenmaeckers@users.noreply.github.com> Date: Thu, 11 Jun 2026 05:13:25 +0200 Subject: [PATCH 058/339] Convert claude skills to more generic agent skills (#8064) Assisted-by: Codex:gpt-6 --- .agents/skills/apple-container/SKILL.md | 63 +++++++ .../skills/investigate-test-failure/SKILL.md | 53 ++++++ .agents/skills/upgrade-pylib-next/SKILL.md | 34 ++++ .agents/skills/upgrade-pylib/SKILL.md | 102 ++++++++++++ .claude/commands/apple-container.md | 46 ----- .claude/commands/investigate-test-failure.md | 49 ------ .claude/commands/upgrade-pylib-next.md | 33 ---- .claude/commands/upgrade-pylib.md | 157 ------------------ 8 files changed, 252 insertions(+), 285 deletions(-) create mode 100644 .agents/skills/apple-container/SKILL.md create mode 100644 .agents/skills/investigate-test-failure/SKILL.md create mode 100644 .agents/skills/upgrade-pylib-next/SKILL.md create mode 100644 .agents/skills/upgrade-pylib/SKILL.md delete mode 100644 .claude/commands/apple-container.md delete mode 100644 .claude/commands/investigate-test-failure.md delete mode 100644 .claude/commands/upgrade-pylib-next.md delete mode 100644 .claude/commands/upgrade-pylib.md diff --git a/.agents/skills/apple-container/SKILL.md b/.agents/skills/apple-container/SKILL.md new file mode 100644 index 000000000..fed7ce1e2 --- /dev/null +++ b/.agents/skills/apple-container/SKILL.md @@ -0,0 +1,63 @@ +--- +name: apple-container +description: Run RustPython tests in Apple's `container` CLI Linux environment. Use when user asks to run or compare Linux test results on macOS. +allowed-tools: Bash(container:*) Bash(cargo:*) Read Grep Glob +--- + +# Run Tests in Linux Container (Apple `container` CLI) + +Run RustPython tests inside a Linux container using Apple's `container` CLI. +NEVER use Docker, Podman, or any other container runtime. Only use the `container` command. + +## Arguments + +- Test command to run (examples: `test_io`, `test_codecs -v`, `test_io -v -m "test_errors"`) + +## Prerequisites + +- The `container` CLI is installed via `brew install container`. +- The dev image `rustpython-dev` is already built. + +## Workflow + +1. Check whether the test container is already running: + + ```shell + container list 2>/dev/null | grep rustpython-test + ``` + +2. Start the container if it is not running: + + ```shell + container run -d --name rustpython-test -m 8G -c 4 \ + --mount type=bind,source="$(pwd)",target=/workspace \ + -w /workspace rustpython-dev sleep infinity + ``` + +3. Run the requested test command inside the container: + + ```shell + container exec rustpython-test cargo run --release -- -m test + ``` + +4. Report results: + +- Show pass/fail summary and expected failures / unexpected successes. +- Highlight new failures compared to macOS results, if available. +- Do not stop or remove the container after testing. + +## Notes + +- The workspace is bind-mounted, so local code changes are immediately available in the container. +- Use `container exec rustpython-test sh -c "..."` for any command inside the container. +- Rebuild after code changes with: + + ```shell + container exec rustpython-test sh -c "cargo build --release" + ``` + +- Stop the container when explicitly requested: + + ```shell + container rm -f rustpython-test + ``` diff --git a/.agents/skills/investigate-test-failure/SKILL.md b/.agents/skills/investigate-test-failure/SKILL.md new file mode 100644 index 000000000..e63dfeeec --- /dev/null +++ b/.agents/skills/investigate-test-failure/SKILL.md @@ -0,0 +1,53 @@ +--- +name: investigate-test-failure +description: Investigate a failing RustPython test, compare with CPython behavior, and decide whether to implement a fix or prepare incompatibility issue details. +allowed-tools: Bash(python3:*) Bash(cargo run:*) Bash(gh issue create:*) Read Grep Glob Bash(git add:*) Bash(git commit:*) Bash(cargo fmt:*) Bash(git diff:*) Task +--- + +# Investigate Test Failure + +Investigate why a specific test is failing and determine whether it can be fixed now or should be reported as an incompatibility issue. + +## Arguments + +- Failed test identifier (example: `test_inspect.TestGetSourceBase.test_getsource_reload`) + +## Workflow + +1. Analyze the failure cause: + +- Read the test code. +- Analyze failure message and traceback. +- Check related RustPython implementation code. + +2. Verify behavior in CPython: + +- Run the test with `python3 -m unittest`. +- Document expected behavior/output. + +3. Determine fix feasibility: + +- Simple fix (import issues, small logic bugs): implement fix, run formatting and checks, review changes, and commit. +- Complex fix (major missing feature): gather issue information and report to user. + +Pre-commit review process: + +- Run `git diff` to review local changes. +- Use a focused subagent review to compare implementation against CPython behavior and check for missed edge cases. +- Commit only after review passes. + +4. For complex issues, collect issue information using `.github/ISSUE_TEMPLATE/report-incompatibility.md`: + +- Feature: missing or broken Python feature. +- Minimal reproduction code. +- CPython behavior (`python3`). +- RustPython behavior (`cargo run`). +- Python documentation reference link. + +Report the collected information to the user. Create an issue only when explicitly requested. + +Example issue command: + +```shell +gh issue create --template report-incompatibility.md --title "..." --body "..." +``` diff --git a/.agents/skills/upgrade-pylib-next/SKILL.md b/.agents/skills/upgrade-pylib-next/SKILL.md new file mode 100644 index 000000000..e68e73165 --- /dev/null +++ b/.agents/skills/upgrade-pylib-next/SKILL.md @@ -0,0 +1,34 @@ +--- +name: upgrade-pylib-next +description: Pick the next CPython stdlib module ready for upgrade based on update_lib todo output and skip modules with open upgrade PRs. +allowed-tools: Skill(upgrade-pylib) Bash(gh pr list:*) Bash(cargo run:*) +--- + +# Upgrade Next Python Library + +Find the next Python library module ready for upgrade and then run the `upgrade-pylib` workflow for it. + +## Workflow + +1. Get current TODO status: + +```shell +cargo run --release -- scripts/update_lib todo 2>/dev/null +``` + +2. Get open upgrade PRs: + +```shell +gh pr list --search "Update in:title" --json number,title --template '{{range .}}#{{.number}} {{.title}}{{"\\n"}}{{end}}' +``` + +3. From TODO output, select modules in this priority order: + +- `[ ] [no deps]` +- `[ ] [0/n]` where dependencies are all upgraded (for example `[0/3]`, `[0/5]`) + +4. Skip modules that already have an open upgrade PR. + +5. Run upgrade for selected module using the `upgrade-pylib` workflow. + +If no modules match, report that eligible modules are blocked by dependencies. diff --git a/.agents/skills/upgrade-pylib/SKILL.md b/.agents/skills/upgrade-pylib/SKILL.md new file mode 100644 index 000000000..84400e5b7 --- /dev/null +++ b/.agents/skills/upgrade-pylib/SKILL.md @@ -0,0 +1,102 @@ +--- +name: upgrade-pylib +description: Upgrade a Python standard library module from CPython into RustPython using scripts/update_lib and then triage and mark remaining failures. +allowed-tools: Bash(git add:*) Bash(git commit:*) Bash(git diff:*) Bash(cargo run:*) Bash(python3 scripts/update_lib quick:*) Bash(python3 scripts/update_lib auto-mark:*) +--- + +# Upgrade Python Library from CPython + +Upgrade a Python standard library module from CPython to RustPython. + +## Arguments + +- Library name or path (examples: `inspect`, `asyncio`, `json`, `cpython/Lib/inspect.py`, `cpython/Lib/json/`) + +## Important: Report Tool Issues First + +If `scripts/update_lib` shows a bug, missing automation, or unexpected behavior, stop the upgrade and report the tooling issue first, including: + +1. What you were trying to do: + +- Library name. +- Full command used. + +2. What went wrong or what is missing. +3. Expected vs actual behavior. + +## Workflow + +1. Run quick upgrade with update_lib: + +- `python3 scripts/update_lib quick ` +- or `python3 scripts/update_lib quick cpython/Lib/.py` +- or `python3 scripts/update_lib quick cpython/Lib//` + +This step copies library files, patches tests while preserving markers where possible, runs tests, auto-marks new failures, removes stale `@unittest.expectedFailure`, and creates a commit. + +If warnings like `WARNING: TestCFoo does not exist in remote file` appear, class structure changed and some markers must be restored manually. + +2. Review diff and restore RustPython-specific changes: + +- Run `git diff Lib/test/test_`. +- Restore only changes with explicit `RUSTPYTHON` comments. +- Do not restore unrelated upstream CPython changes. + +3. Investigate failing dependent tests: + +- Get dependencies: + + ```shell + cargo run --release -- scripts/update_lib deps + ``` + +- Find direct dependent test modules from the `- [ ] :` line. +- Run dependent tests and collect failures: + + ```shell + cargo run --release -- -m test 2>&1 | grep -E "^(FAIL|ERROR):" + ``` + +- For each failing test identifier, investigate with the `investigate-test-failure` workflow. + +4. Mark remaining failures with auto-mark: + +- `python3 scripts/update_lib auto-mark Lib/test/test_.py --mark-failure` +- or `python3 scripts/update_lib auto-mark Lib/test/test_/ --mark-failure` + +Note: `--mark-failure` marks all current failures including regressions; review carefully. + +5. Handle panics manually: + +- For tests that panic/crash/hang, use `@unittest.skip("TODO: RUSTPYTHON; ...")` rather than expectedFailure. + +6. Handle class-specific failures: + +- If only one subclass fails (for example `TestCFoo` but not `TestPyFoo`), move marker to the failing subclass override. + +7. Commit test-fix markers as a separate commit: + +```shell +git add -u && git commit -m "Mark failing tests" +``` + +## Example usage + +```text +upgrade-pylib inspect +upgrade-pylib json +upgrade-pylib asyncio +upgrade-pylib cpython/Lib/inspect.py +upgrade-pylib cpython/Lib/json/ +``` + +## Notes + +- The `cpython/` directory should contain the CPython source used for sync. +- `scripts/update_lib` modes: + - `quick`: patch + auto-mark + - `migrate`: patch only + - `auto-mark`: mark failures only + - `copy-lib`: copy library files only +- Patching transfers `@unittest.expectedFailure` and `@unittest.skip` with `TODO: RUSTPYTHON` markers where possible. +- The tool does not preserve every RustPython-specific change; always review and restore explicit RUSTPYTHON-marked logic. diff --git a/.claude/commands/apple-container.md b/.claude/commands/apple-container.md deleted file mode 100644 index b0f04c81f..000000000 --- a/.claude/commands/apple-container.md +++ /dev/null @@ -1,46 +0,0 @@ ---- -allowed-tools: Bash(container *), Bash(cargo *), Read, Grep, Glob ---- - -# Run Tests in Linux Container (Apple `container` CLI) - -Run RustPython tests inside a Linux container using Apple's `container` CLI. -**NEVER use Docker, Podman, or any other container runtime.** Only use the `container` command. - -## Arguments -- `$ARGUMENTS`: Test command to run (e.g., `test_io`, `test_codecs -v`, `test_io -v -m "test_errors"`) - -## Prerequisites - -The `container` CLI is installed via `brew install container`. -The dev image `rustpython-dev` is already built. - -## Steps - -1. **Check if the container is already running** - ```shell - container list 2>/dev/null | grep rustpython-test - ``` - -2. **Start the container if not running** - ```shell - container run -d --name rustpython-test -m 8G -c 4 \ - --mount type=bind,source=.,target=/workspace \ - -w /workspace rustpython-dev sleep infinity - ``` - -3. **Run the test inside the container** - ```shell - container exec rustpython-test sh -c "cargo run --release -- -m test $ARGUMENTS" - ``` - -4. **Report results** - - Show test summary (pass/fail counts, expected failures, unexpected successes) - - Highlight any new failures compared to macOS results if available - - Do NOT stop or remove the container after testing (keep it for reuse) - -## Notes -- The workspace is bind-mounted, so local code changes are immediately available -- Use `container exec rustpython-test sh -c "..."` for any command inside the container -- To rebuild after code changes, run: `container exec rustpython-test sh -c "cargo build --release"` -- To stop the container when done: `container rm -f rustpython-test` diff --git a/.claude/commands/investigate-test-failure.md b/.claude/commands/investigate-test-failure.md deleted file mode 100644 index e9d6b2d2d..000000000 --- a/.claude/commands/investigate-test-failure.md +++ /dev/null @@ -1,49 +0,0 @@ ---- -allowed-tools: Bash(python3:*), Bash(cargo run:*), Read, Grep, Glob, Bash(git add:*), Bash(git commit:*), Bash(cargo fmt:*), Bash(git diff:*), Task ---- - -# Investigate Test Failure - -Investigate why a specific test is failing and determine if it can be fixed or needs an issue. - -## Arguments -- `$ARGUMENTS`: Failed test identifier (e.g., `test_inspect.TestGetSourceBase.test_getsource_reload`) - -## Steps - -1. **Analyze failure cause** - - Read the test code - - Analyze failure message/traceback - - Check related RustPython code - -2. **Verify behavior in CPython** - - Run the test with `python3 -m unittest` to confirm expected behavior - - Document the expected output - -3. **Determine fix feasibility** - - **Simple fix** (import issues, small logic bugs): Fix code → Run `cargo fmt --all` → Pre-commit review → Commit - - **Complex fix** (major unimplemented features): Collect issue info and report to user - - **Pre-commit review process**: - - Run `git diff` to see the changes - - Use Task tool with `general-purpose` subagent to review: - - Compare implementation against cpython/ source code - - Verify the fix aligns with CPython behavior - - Check for any missed edge cases - - Proceed to commit only after review passes - -4. **For complex issues - Collect issue information** - Following `.github/ISSUE_TEMPLATE/report-incompatibility.md` format: - - - **Feature**: Description of missing/broken Python feature - - **Minimal reproduction code**: Smallest code that reproduces the issue - - **CPython behavior**: Result when running with python3 - - **RustPython behavior**: Result when running with cargo run - - **Python Documentation link**: Link to relevant CPython docs - - Report collected information to the user. Issue creation is done only upon user request. - - Example issue creation command: - ``` - gh issue create --template report-incompatibility.md --title "..." --body "..." - ``` diff --git a/.claude/commands/upgrade-pylib-next.md b/.claude/commands/upgrade-pylib-next.md deleted file mode 100644 index 712b79433..000000000 --- a/.claude/commands/upgrade-pylib-next.md +++ /dev/null @@ -1,33 +0,0 @@ ---- -allowed-tools: Skill(upgrade-pylib), Bash(gh pr list:*) ---- - -# Upgrade Next Python Library - -Find the next Python library module ready for upgrade and run `/upgrade-pylib` for it. - -## Current TODO Status - -!`cargo run --release -- scripts/update_lib todo 2>/dev/null` - -## Open Upgrade PRs - -!`gh pr list --search "Update in:title" --json number,title --template '{{range .}}#{{.number}} {{.title}}{{"\n"}}{{end}}'` - -## Instructions - -From the TODO list above, find modules matching these patterns (in priority order): - -1. `[ ] [no deps]` - Modules with no dependencies (can be upgraded immediately) -2. `[ ] [0/n]` - Modules where all dependencies are already upgraded (e.g., `[0/3]`, `[0/5]`) - -These patterns indicate modules that are ready to upgrade without blocking dependencies. - -**Important**: Skip any modules that already have an open PR in the "Open Upgrade PRs" list above. - -**After identifying a suitable module**, run: -``` -/upgrade-pylib -``` - -If no modules match these criteria, inform the user that all eligible modules have dependencies that need to be upgraded first. diff --git a/.claude/commands/upgrade-pylib.md b/.claude/commands/upgrade-pylib.md deleted file mode 100644 index d54305d26..000000000 --- a/.claude/commands/upgrade-pylib.md +++ /dev/null @@ -1,157 +0,0 @@ ---- -allowed-tools: Bash(git add:*), Bash(git commit:*), Bash(python3 scripts/update_lib quick:*), Bash(python3 scripts/update_lib auto-mark:*) ---- - -# Upgrade Python Library from CPython - -Upgrade a Python standard library module from CPython to RustPython. - -## Arguments -- `$ARGUMENTS`: Library name to upgrade (e.g., `inspect`, `asyncio`, `json`) - -## Important: Report Tool Issues First - -If during the upgrade process you encounter any of the following issues with `scripts/update_lib`: -- A feature that should be automated but isn't supported -- A bug or unexpected behavior in the tool -- Missing functionality that would make the upgrade easier - -**STOP the upgrade and report the issue first.** Describe: -1. What you were trying to do - - Library name - - The full command executed (e.g. python scripts/update_lib quick cpython/Lib/$ARGUMENTS.py) -2. What went wrong or what's missing -3. Expected vs actual behavior - -This helps improve the tooling for future upgrades. - -## Steps - -1. **Run quick upgrade with update_lib** - - Run: `python3 scripts/update_lib quick $ARGUMENTS` (module name) - - Or: `python3 scripts/update_lib quick cpython/Lib/$ARGUMENTS.py` (library file path) - - Or: `python3 scripts/update_lib quick cpython/Lib/$ARGUMENTS/` (library directory path) - - This will: - - Copy library files (delete existing `Lib/$ARGUMENTS.py` or `Lib/$ARGUMENTS/`, then copy from `cpython/Lib/`) - - Patch test files preserving existing RustPython markers - - Run tests and auto-mark new test failures (not regressions) - - Remove `@unittest.expectedFailure` from tests that now pass - - Create a git commit with the changes - - **Handle warnings**: If you see warnings like `WARNING: TestCFoo does not exist in remote file`, it means the class structure changed and markers couldn't be transferred automatically. These need to be manually restored in step 2 or added in step 3. - -2. **Review git diff and restore RUSTPYTHON-specific changes** - - Run `git diff Lib/test/test_$ARGUMENTS` to review all changes - - **Only restore changes that have explicit `RUSTPYTHON` comments**. Look for: - - `# XXX: RUSTPYTHON` or `# XXX RUSTPYTHON` - Comments marking RustPython-specific code modifications - - `# TODO: RUSTPYTHON` - Comments marking tests that need work - - Code changes with inline `# ... RUSTPYTHON` comments - - **Do NOT restore other diff changes** - these are likely upstream CPython changes, not RustPython-specific modifications - - When restoring, preserve the original context and formatting - -3. **Investigate test failures with subagent** - - First, get dependent tests using the deps command: - ``` - cargo run --release -- scripts/update_lib deps $ARGUMENTS - ``` - - Look for the line `- [ ] $ARGUMENTS: test_xxx test_yyy ...` to get the direct dependent tests - - Run those tests to collect failures: - ``` - cargo run --release -- -m test test_xxx test_yyy ... 2>&1 | grep -E "^(FAIL|ERROR):" - ``` - - For example, if deps output shows `- [ ] linecache: test_bdb test_inspect test_linecache test_traceback test_zipimport`, run: - ``` - cargo run --release -- -m test test_bdb test_inspect test_linecache test_traceback test_zipimport 2>&1 | grep -E "^(FAIL|ERROR):" - ``` - - For each failure, use the Task tool with `general-purpose` subagent to investigate: - - Subagent should follow the `/investigate-test-failure` skill workflow - - Pass the failed test identifier as the argument (e.g., `test_inspect.TestGetSourceBase.test_getsource_reload`) - - If subagent can fix the issue easily: fix and commit - - If complex issue: subagent collects issue info and reports back (issue creation on user request only) - - Using subagent prevents context pollution in the main conversation - -4. **Mark remaining test failures with auto-mark** - - Run: `python3 scripts/update_lib auto-mark Lib/test/test_$ARGUMENTS.py --mark-failure` - - Or for directory: `python3 scripts/update_lib auto-mark Lib/test/test_$ARGUMENTS/ --mark-failure` - - This will: - - Run tests and mark ALL failing tests with `@unittest.expectedFailure` - - Remove `@unittest.expectedFailure` from tests that now pass - - **Note**: The `--mark-failure` flag marks all failures including regressions. Review the changes before committing. - -5. **Handle panics manually** - - If any tests cause panics/crashes (not just assertion failures), they need `@unittest.skip` instead: - ```python - @unittest.skip("TODO: RUSTPYTHON; panics with 'index out of bounds'") - def test_crashes(self): - ... - ``` - - auto-mark cannot detect panics automatically - check the test output for crash messages - -6. **Handle class-specific failures** - - If a test fails only in the C implementation (TestCFoo) but passes in the Python implementation (TestPyFoo), or vice versa, move the marker to the specific subclass: - ```python - # Base class - no marker here - class TestFoo: - def test_something(self): - ... - - class TestPyFoo(TestFoo, PyTest): pass - - class TestCFoo(TestFoo, CTest): - # TODO: RUSTPYTHON - @unittest.expectedFailure - def test_something(self): - return super().test_something() - ``` - -7. **Commit the test fixes** - - Run: `git add -u && git commit -m "Mark failing tests"` - - This creates a separate commit for the test markers added in steps 2-6 - -## Example Usage -``` -# Using module names (recommended) -/upgrade-pylib inspect -/upgrade-pylib json -/upgrade-pylib asyncio - -# Using library paths (alternative) -/upgrade-pylib cpython/Lib/inspect.py -/upgrade-pylib cpython/Lib/json/ -``` - -## Example: Restoring RUSTPYTHON changes - -When git diff shows removed RUSTPYTHON-specific code like: -```diff --# XXX RUSTPYTHON: we don't import _json as fresh since... --cjson = import_helper.import_fresh_module('json') #, fresh=['_json']) -+cjson = import_helper.import_fresh_module('json', fresh=['_json']) -``` - -You should restore the RustPython version: -```python -# XXX RUSTPYTHON: we don't import _json as fresh since... -cjson = import_helper.import_fresh_module('json') #, fresh=['_json']) -``` - -## Notes -- The cpython/ directory should contain the CPython source that we're syncing from -- `scripts/update_lib` package handles patching and auto-marking: - - `quick` - Combined patch + auto-mark (recommended) - - `migrate` - Only migrate (patch), no test running - - `auto-mark` - Only run tests and mark failures - - `copy-lib` - Copy library files (not tests) -- The patching: - - Transfers `@unittest.expectedFailure` and `@unittest.skip` decorators with `TODO: RUSTPYTHON` markers - - Adds `import unittest # XXX: RUSTPYTHON` if needed for the decorators - - **Limitation**: If a class was restructured (e.g., method overrides removed), update_lib will warn and skip those markers -- The smart auto-mark: - - Marks NEW test failures automatically (tests that didn't exist before) - - Does NOT mark regressions (existing tests that now fail) - these are warnings - - Removes `@unittest.expectedFailure` from tests that now pass -- The script does NOT preserve all RustPython-specific changes - you must review `git diff` and restore them -- Common RustPython markers to look for: - - `# XXX: RUSTPYTHON` or `# XXX RUSTPYTHON` - Inline comments for code modifications - - `# TODO: RUSTPYTHON` - Test skip/failure markers - - Any code with `RUSTPYTHON` in comments that was removed in the diff -- **Important**: Not all changes in the git diff need to be restored. Only restore changes that have explicit `RUSTPYTHON` comments. Other changes are upstream CPython updates. From 984d936ed602a2df80ccefe4916288da488d104c Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Thu, 11 Jun 2026 06:15:21 +0300 Subject: [PATCH 059/339] Fix `test_tty.py` tests (#8065) * Align patches of `test_tty` * Fix failing tests at `test_tty.py` * Align patches of `test_termios.py` * Unmark passing tests under `test_termios.py` * Unmark another passing test --- Lib/test/test_termios.py | 10 ---------- Lib/test/test_tty.py | 2 -- crates/stdlib/src/termios.rs | 24 ++++++++++++++++++------ crates/vm/src/stdlib/_io.rs | 7 +++++++ 4 files changed, 25 insertions(+), 18 deletions(-) diff --git a/Lib/test/test_termios.py b/Lib/test/test_termios.py index e7ebb20b1..216609719 100644 --- a/Lib/test/test_termios.py +++ b/Lib/test/test_termios.py @@ -32,7 +32,6 @@ class TestFunctions(unittest.TestCase): callable(*args) self.assertIn(cm.exception.args[0], errs) - @unittest.expectedFailure # TODO: RUSTPYTHON; TypeError: Expected type 'int' but 'FileIO' found. def test_tcgetattr(self): attrs = termios.tcgetattr(self.fd) self.assertIsInstance(attrs, list) @@ -51,7 +50,6 @@ class TestFunctions(unittest.TestCase): self.assertEqual(len(x), 1) self.assertEqual(termios.tcgetattr(self.stream), attrs) - @unittest.skip("TODO: RUSTPYTHON segfault") def test_tcgetattr_errors(self): self.assertRaisesTermiosError(errno.ENOTTY, termios.tcgetattr, self.bad_fd) self.assertRaises(ValueError, termios.tcgetattr, -1) @@ -59,7 +57,6 @@ class TestFunctions(unittest.TestCase): self.assertRaises(TypeError, termios.tcgetattr, object()) self.assertRaises(TypeError, termios.tcgetattr) - @unittest.expectedFailure # TODO: RUSTPYTHON; TypeError: Expected type 'int' but 'FileIO' found. def test_tcsetattr(self): attrs = termios.tcgetattr(self.fd) termios.tcsetattr(self.fd, termios.TCSANOW, attrs) @@ -67,7 +64,6 @@ class TestFunctions(unittest.TestCase): termios.tcsetattr(self.fd, termios.TCSAFLUSH, attrs) termios.tcsetattr(self.stream, termios.TCSANOW, attrs) - @unittest.skip("TODO: RUSTPYTHON segfault") def test_tcsetattr_errors(self): attrs = termios.tcgetattr(self.fd) self.assertRaises(TypeError, termios.tcsetattr, self.fd, termios.TCSANOW, tuple(attrs)) @@ -103,7 +99,6 @@ class TestFunctions(unittest.TestCase): self.assertRaises(TypeError, termios.tcsetattr, object(), termios.TCSANOW, attrs) self.assertRaises(TypeError, termios.tcsetattr, self.fd, termios.TCSANOW) - @unittest.expectedFailure # TODO: RUSTPYTHON; TypeError: Expected type 'int' but 'FileIO' found. @support.skip_android_selinux('tcsendbreak') def test_tcsendbreak(self): try: @@ -115,7 +110,6 @@ class TestFunctions(unittest.TestCase): raise termios.tcsendbreak(self.stream, 1) - @unittest.skip("TODO: RUSTPYTHON segfault") @support.skip_android_selinux('tcsendbreak') def test_tcsendbreak_errors(self): self.assertRaises(OverflowError, termios.tcsendbreak, self.fd, 2**1000) @@ -127,13 +121,11 @@ class TestFunctions(unittest.TestCase): self.assertRaises(TypeError, termios.tcsendbreak, object(), 0) self.assertRaises(TypeError, termios.tcsendbreak, self.fd) - @unittest.expectedFailure # TODO: RUSTPYTHON; TypeError: Expected type 'int' but 'FileIO' found. @support.skip_android_selinux('tcdrain') def test_tcdrain(self): termios.tcdrain(self.fd) termios.tcdrain(self.stream) - @unittest.skip("TODO: RUSTPYTHON segfault") @support.skip_android_selinux('tcdrain') def test_tcdrain_errors(self): self.assertRaisesTermiosError(errno.ENOTTY, termios.tcdrain, self.bad_fd) @@ -147,7 +139,6 @@ class TestFunctions(unittest.TestCase): termios.tcflush(self.fd, termios.TCOFLUSH) termios.tcflush(self.fd, termios.TCIOFLUSH) - @unittest.skip("TODO: RUSTPYTHON segfault") def test_tcflush_errors(self): self.assertRaisesTermiosError(errno.EINVAL, termios.tcflush, self.fd, -1) self.assertRaises(OverflowError, termios.tcflush, self.fd, 2**1000) @@ -190,7 +181,6 @@ class TestFunctions(unittest.TestCase): termios.tcflow(self.fd, termios.TCIOFF) termios.tcflow(self.fd, termios.TCION) - @unittest.skip("TODO: RUSTPYTHON segfault") @support.skip_android_selinux('tcflow') def test_tcflow_errors(self): self.assertRaisesTermiosError(errno.EINVAL, termios.tcflow, self.fd, -1) diff --git a/Lib/test/test_tty.py b/Lib/test/test_tty.py index 681772fb5..4cb730c22 100644 --- a/Lib/test/test_tty.py +++ b/Lib/test/test_tty.py @@ -64,7 +64,6 @@ class TestTty(unittest.TestCase): self.assertEqual(mode[tty.IFLAG] & termios.ICRNL, 0, msg="ICRNL should not be set by cbreak") - @unittest.expectedFailure # TODO: RUSTPYTHON TypeError: Expected type "int" but "FileIO" found. def test_setraw(self): mode0 = termios.tcgetattr(self.fd) mode1 = tty.setraw(self.fd) @@ -76,7 +75,6 @@ class TestTty(unittest.TestCase): tty.setraw(self.stream) tty.setraw(fd=self.fd, when=termios.TCSANOW) - @unittest.expectedFailure # TODO: RUSTPYTHON TypeError: Expected type "int" but "FileIO" found. def test_setcbreak(self): mode0 = termios.tcgetattr(self.fd) mode1 = tty.setcbreak(self.fd) diff --git a/crates/stdlib/src/termios.rs b/crates/stdlib/src/termios.rs index 9731f33b3..7a2c24724 100644 --- a/crates/stdlib/src/termios.rs +++ b/crates/stdlib/src/termios.rs @@ -8,6 +8,7 @@ mod termios { PyObjectRef, PyResult, TryFromObject, VirtualMachine, builtins::{PyBaseExceptionRef, PyBytes, PyInt, PyListRef, PyTypeRef}, convert::ToPyObject, + stdlib::_io::Fildes, }; use rustpython_host_env::{os::ErrorExt, termios as host_termios}; @@ -166,7 +167,8 @@ mod termios { }; #[pyfunction] - fn tcgetattr(fd: i32, vm: &VirtualMachine) -> PyResult> { + fn tcgetattr(fd: PyObjectRef, vm: &VirtualMachine) -> PyResult> { + let fd = Fildes::try_from_object(vm, fd).map(Into::into)?; let termios = host_termios::tcgetattr(fd).map_err(|e| termios_error(e, vm))?; let noncanon = (termios.c_lflag & host_termios::ICANON) == 0; let cc = termios @@ -191,7 +193,13 @@ mod termios { } #[pyfunction] - fn tcsetattr(fd: i32, when: i32, attributes: PyListRef, vm: &VirtualMachine) -> PyResult<()> { + fn tcsetattr( + fd: PyObjectRef, + when: i32, + attributes: PyListRef, + vm: &VirtualMachine, + ) -> PyResult<()> { + let fd = Fildes::try_from_object(vm, fd).map(Into::into)?; let [iflag, oflag, cflag, lflag, ispeed, ospeed, cc] = <&[PyObjectRef; 7]>::try_from(&*attributes.borrow_vec()) .map_err(|_| vm.new_type_error("tcsetattr, arg 3: must be 7 element list"))? @@ -233,25 +241,29 @@ mod termios { } #[pyfunction] - fn tcsendbreak(fd: i32, duration: i32, vm: &VirtualMachine) -> PyResult<()> { + fn tcsendbreak(fd: PyObjectRef, duration: i32, vm: &VirtualMachine) -> PyResult<()> { + let fd = Fildes::try_from_object(vm, fd).map(Into::into)?; host_termios::tcsendbreak(fd, duration).map_err(|e| termios_error(e, vm))?; Ok(()) } #[pyfunction] - fn tcdrain(fd: i32, vm: &VirtualMachine) -> PyResult<()> { + fn tcdrain(fd: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> { + let fd = Fildes::try_from_object(vm, fd).map(Into::into)?; host_termios::tcdrain(fd).map_err(|e| termios_error(e, vm))?; Ok(()) } #[pyfunction] - fn tcflush(fd: i32, queue: i32, vm: &VirtualMachine) -> PyResult<()> { + fn tcflush(fd: PyObjectRef, queue: i32, vm: &VirtualMachine) -> PyResult<()> { + let fd = Fildes::try_from_object(vm, fd).map(Into::into)?; host_termios::tcflush(fd, queue).map_err(|e| termios_error(e, vm))?; Ok(()) } #[pyfunction] - fn tcflow(fd: i32, action: i32, vm: &VirtualMachine) -> PyResult<()> { + fn tcflow(fd: PyObjectRef, action: i32, vm: &VirtualMachine) -> PyResult<()> { + let fd = Fildes::try_from_object(vm, fd).map(Into::into)?; host_termios::tcflow(fd, action).map_err(|e| termios_error(e, vm))?; Ok(()) } diff --git a/crates/vm/src/stdlib/_io.rs b/crates/vm/src/stdlib/_io.rs index c6bee82c2..423d5bc67 100644 --- a/crates/vm/src/stdlib/_io.rs +++ b/crates/vm/src/stdlib/_io.rs @@ -89,6 +89,12 @@ impl TryFromObject for Fildes { } } +impl From for i32 { + fn from(fildes: Fildes) -> Self { + fildes.0 + } +} + #[cfg(unix)] impl std::os::fd::AsFd for Fildes { fn as_fd(&self) -> std::os::fd::BorrowedFd<'_> { @@ -97,6 +103,7 @@ impl std::os::fd::AsFd for Fildes { unsafe { std::os::fd::BorrowedFd::borrow_raw(self.0) } } } + #[cfg(unix)] impl std::os::fd::AsRawFd for Fildes { fn as_raw_fd(&self) -> std::os::fd::RawFd { From c27df402250620c52fb0fe5bd8e16c2e8f61e6b2 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Thu, 11 Jun 2026 06:15:41 +0300 Subject: [PATCH 060/339] Conditionally skip `test_pty` tests (#8066) --- Lib/test/test_pty.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Lib/test/test_pty.py b/Lib/test/test_pty.py index c12209db5..1126404fe 100644 --- a/Lib/test/test_pty.py +++ b/Lib/test/test_pty.py @@ -89,6 +89,7 @@ def write_all(fd, data): # Marginal testing of pty suite. Cannot do extensive 'do or fail' testing # because pty code is not too portable. +@unittest.skipIf(getattr(tty, "tcgetwinsize", None) is None, "TODO: RUSTPYTHON; `tty.tcgetwinsize` is required for setUp") class PtyTest(unittest.TestCase): def setUp(self): old_sighup = signal.signal(signal.SIGHUP, self.handle_sighup) @@ -108,7 +109,6 @@ class PtyTest(unittest.TestCase): def handle_sighup(signum, frame): pass - @unittest.skip("TODO: RUSTPYTHON; \"Not runnable. tty.tcgetwinsize\" is required to setUp") @expectedFailureIfStdinIsTTY def test_openpty(self): try: @@ -195,7 +195,6 @@ class PtyTest(unittest.TestCase): s2 = _readline(master_fd) self.assertEqual(b'For my pet fish, Eric.\n', normalize_output(s2)) - @unittest.skip("TODO: RUSTPYTHON; \"Not runnable. tty.tcgetwinsize\" is required to setUp") def test_fork(self): debug("calling pty.fork()") pid, master_fd = pty.fork() @@ -278,7 +277,6 @@ class PtyTest(unittest.TestCase): ##else: ## raise TestFailed("Read from master_fd did not raise exception") - @unittest.skip("TODO: RUSTPYTHON; AttributeError: module \"tty\" has no attribute \"tcgetwinsize\"") def test_master_read(self): # XXX(nnorwitz): this test leaks fds when there is an error. debug("Calling pty.openpty()") @@ -298,7 +296,6 @@ class PtyTest(unittest.TestCase): self.assertEqual(data, b"") - @unittest.skip("TODO: RUSTPYTHON; AttributeError: module \"tty\" has no attribute \"tcgetwinsize\"") def test_spawn_doesnt_hang(self): # gh-140482: Do the test in a pty.fork() child to avoid messing # with the interactive test runner's terminal settings. From c5dcfa239d1c3b15e70abde57b2a37b86b871165 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Thu, 11 Jun 2026 06:49:08 +0300 Subject: [PATCH 061/339] Remove stale patches from `test_traceback.py` (#8068) --- Lib/test/test_traceback.py | 118 +------------------------------------ 1 file changed, 1 insertion(+), 117 deletions(-) diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py index 7d5c45747..0f66bdcb3 100644 --- a/Lib/test/test_traceback.py +++ b/Lib/test/test_traceback.py @@ -1824,118 +1824,6 @@ class PurePythonTracebackErrorCaretTests( traceback printing in traceback.py. """ - @unittest.expectedFailure # TODO: RUSTPYTHON; + ' ~~~~~~~~^^~~'] - def test_caret_for_binary_operators_two_char(self): - return super().test_caret_for_binary_operators_two_char() - - @unittest.expectedFailure # TODO: RUSTPYTHON; + ' ~~~~~~~~^~~'] - def test_caret_for_binary_operators(self): - return super().test_caret_for_binary_operators() - - @unittest.expectedFailure # TODO: RUSTPYTHON; + ' ~~~~~~^^^^^^^^^'] - def test_caret_for_subscript_with_spaces_and_parenthesis(self): - return super().test_caret_for_subscript_with_spaces_and_parenthesis() - - @unittest.expectedFailure # TODO: RUSTPYTHON; + ' ~~~~~~~~~^~~~~~~~~~~~'] - def test_byte_offset_with_wide_characters_term_highlight(self): - return super().test_byte_offset_with_wide_characters_term_highlight() - - @unittest.expectedFailure # TODO: RUSTPYTHON; + ' ~~~~~~~~~~^~'] - def test_caret_for_binary_operators_with_spaces_and_parenthesis(self): - return super().test_caret_for_binary_operators_with_spaces_and_parenthesis() - - @unittest.expectedFailure # TODO: RUSTPYTHON; + ' ~~~~~~~~~~~~~~~~~~~^^^^^'] - def test_caret_for_subscript(self): - return super().test_caret_for_subscript() - - @unittest.expectedFailure # TODO: RUSTPYTHON; + ' ~~~~~~~~~~~~~~~~~~~~~~~~^^^^^^'] - def test_byte_offset_wide_chars_subscript(self): - return super().test_byte_offset_wide_chars_subscript() - - @unittest.expectedFailure # TODO: RUSTPYTHON; + ' ~~~~~~~~~~~~~~~~~~~~~~~~^^^^^^^^'] - def test_caret_for_subscript_unicode(self): - return super().test_caret_for_subscript_unicode() - - @unittest.expectedFailure # TODO: RUSTPYTHON; + ' ~'] - def test_caret_for_binary_operators_multiline(self): - return super().test_caret_for_binary_operators_multiline() - - @unittest.expectedFailure # TODO: RUSTPYTHON; + ' ~~~~~~^~~'] - def test_caret_for_binary_operators_multiline_with_unicode(self): - return super().test_caret_for_binary_operators_multiline_with_unicode() - - @unittest.expectedFailure # TODO: RUSTPYTHON; + ' ^^^^^'] - def test_traceback_specialization_with_syntax_error(self): - return super().test_traceback_specialization_with_syntax_error() - - @unittest.expectedFailure # TODO: RUSTPYTHON; + ' ^^^^^^^^^^^^^'] - def test_caret_multiline_expression_syntax_error(self): - return super().test_caret_multiline_expression_syntax_error() - - @unittest.expectedFailure # TODO: RUSTPYTHON; + ' ~'] - def test_caret_multiline_expression_bin_op(self): - return super().test_caret_multiline_expression_bin_op() - - @unittest.expectedFailure # TODO: RUSTPYTHON; + ' ~~~~~~~~~~~~~~~~~~~^^^^^'] - def test_secondary_caret_not_elided(self): - return super().test_secondary_caret_not_elided() - - @unittest.expectedFailure # TODO: RUSTPYTHON; + ~^~ - def test_specialization_variations(self): - return super().test_specialization_variations() - - @unittest.expectedFailure # TODO: RUSTPYTHON; - ' ^^^^'] - def test_multiline_method_call_b(self): - return super().test_multiline_method_call_b() - - @unittest.expectedFailure # TODO: RUSTPYTHON; ? ^^^^ ++ - def test_caret_for_binary_operators_with_unicode(self): - return super().test_caret_for_binary_operators_with_unicode() - - @unittest.expectedFailure # TODO: RUSTPYTHON; ? ++ - def test_multiline_method_call_a(self): - return super().test_multiline_method_call_a() - - @unittest.expectedFailure # TODO: RUSTPYTHON; ? +++ - def test_multiline_method_call_c(self): - return super().test_multiline_method_call_c() - - @unittest.expectedFailure # TODO: RUSTPYTHON; ? ^ - def test_many_lines(self): - return super().test_many_lines() - - @unittest.expectedFailure # TODO: RUSTPYTHON; ? ^ - def test_many_lines_no_caret(self): - return super().test_many_lines_no_caret() - - @unittest.expectedFailure # TODO: RUSTPYTHON; ? ^ + - def test_anchors_for_simple_assign_statements_are_elided(self): - return super().test_anchors_for_simple_assign_statements_are_elided() - - @unittest.expectedFailure # TODO: RUSTPYTHON; ? ^ + - def test_anchors_for_simple_return_statements_are_elided(self): - return super().test_anchors_for_simple_return_statements_are_elided() - - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: No exception thrown. - def test_caret_in_type_annotation(self): - return super().test_caret_in_type_annotation() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Diff is 652 characters long. Set self.maxDiff to None to see it. - def test_decorator_application_lineno_correct(self): - return super().test_decorator_application_lineno_correct() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Diff is 684 characters long. Set self.maxDiff to None to see it. - def test_many_lines_binary_op(self): - return super().test_many_lines_binary_op() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Diff is 726 characters long. Set self.maxDiff to None to see it. - def test_caret_for_binary_operators_multiline_two_char(self): - return super().test_caret_for_binary_operators_multiline_two_char() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Diff is 732 characters long. Set self.maxDiff to None to see it. - def test_caret_for_subscript_multiline(self): - return super().test_caret_for_subscript_multiline() - @cpython_only @requires_debug_ranges() @@ -3132,6 +3020,7 @@ class BaseExceptionReportingTests: report = self.get_report(exc) self.assertEqual(report, expected) + @unittest.expectedFailure # TODO: RUSTPYTHON def test_exception_group_wrapped_naked(self): # See gh-128799 @@ -3201,10 +3090,6 @@ class PyExcReportingTests(BaseExceptionReportingTests, unittest.TestCase): self.assertEqual(sio.getvalue(), s) return s - @unittest.expectedFailure # TODO: RUSTPYTHON; Diff is 1103 characters long. Set self.maxDiff to None to see it. - def test_exception_group_wrapped_naked(self): - return super().test_exception_group_wrapped_naked() - @force_not_colorized_test_class class CExcReportingTests(BaseExceptionReportingTests, unittest.TestCase): @@ -3947,7 +3832,6 @@ class TestTracebackException(unittest.TestCase): exc = traceback.TracebackException(Exception, Exception("haven"), None) self.assertEqual(list(exc.format()), ["Exception: haven\n"]) - @unittest.expectedFailure # TODO: RUSTPYTHON; ? ^ + @requires_debug_ranges() def test_print(self): def f(): From 945d35a32ea0c50f4a7e06769963eb636bf875f2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Jun 2026 13:36:09 +0900 Subject: [PATCH 062/339] Bump shell-quote from 1.8.2 to 1.8.4 in /wasm/demo (#8069) Bumps [shell-quote](https://github.com/ljharb/shell-quote) from 1.8.2 to 1.8.4. - [Changelog](https://github.com/ljharb/shell-quote/blob/main/CHANGELOG.md) - [Commits](https://github.com/ljharb/shell-quote/compare/v1.8.2...v1.8.4) --- updated-dependencies: - dependency-name: shell-quote dependency-version: 1.8.4 dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- wasm/demo/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wasm/demo/package-lock.json b/wasm/demo/package-lock.json index 14744312a..c0ecfc83f 100644 --- a/wasm/demo/package-lock.json +++ b/wasm/demo/package-lock.json @@ -4849,9 +4849,9 @@ } }, "node_modules/shell-quote": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.2.tgz", - "integrity": "sha512-AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA==", + "version": "1.8.4", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.4.tgz", + "integrity": "sha512-VsC6n6vz1ihYYyZZwX7YZSF5l5x36ca17OC+a69h94YqB7X6XLwf+5MOgynYir2SLFUbl8gIYvBo8K8RoNQ6bQ==", "dev": true, "license": "MIT", "engines": { From f1dd42e066eced246661ee9390321852828e3ba7 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Thu, 11 Jun 2026 07:36:30 +0300 Subject: [PATCH 063/339] Update `pdb.py` to 3.14.5 (#8070) * Update `pdb.py` to 3.14.5 * Add `test_pdb.py` from 3.14.5 * Update `_pyrepl/types.py` * Update `_pyrepl/utils.py` * Mark failing tests * Mark failing tests --- Lib/_pyrepl/types.py | 14 +- Lib/_pyrepl/utils.py | 376 ++- Lib/pdb.py | 2575 ++++++++++++++++++--- Lib/test/test_pdb.py | 5179 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 7817 insertions(+), 327 deletions(-) mode change 100755 => 100644 Lib/pdb.py create mode 100644 Lib/test/test_pdb.py diff --git a/Lib/_pyrepl/types.py b/Lib/_pyrepl/types.py index f9d48b828..c5b7ebc1a 100644 --- a/Lib/_pyrepl/types.py +++ b/Lib/_pyrepl/types.py @@ -1,8 +1,10 @@ from collections.abc import Callable, Iterator -Callback = Callable[[], object] -SimpleContextManager = Iterator[None] -KeySpec = str # like r"\C-c" -CommandName = str # like "interrupt" -EventTuple = tuple[CommandName, str] -Completer = Callable[[str, int], str | None] +type Callback = Callable[[], object] +type SimpleContextManager = Iterator[None] +type KeySpec = str # like r"\C-c" +type CommandName = str # like "interrupt" +type EventTuple = tuple[CommandName, str] +type Completer = Callable[[str, int], str | None] +type CharBuffer = list[str] +type CharWidths = list[int] diff --git a/Lib/_pyrepl/utils.py b/Lib/_pyrepl/utils.py index 4651717bd..06cddef85 100644 --- a/Lib/_pyrepl/utils.py +++ b/Lib/_pyrepl/utils.py @@ -1,25 +1,391 @@ -import re -import unicodedata +from __future__ import annotations +import builtins import functools +import keyword +import re +import token as T +import tokenize +import unicodedata +import _colorize + +from collections import deque +from io import StringIO +from tokenize import TokenInfo as TI +from typing import Iterable, Iterator, Match, NamedTuple, Self + +from .types import CharBuffer, CharWidths +from .trace import trace ANSI_ESCAPE_SEQUENCE = re.compile(r"\x1b\[[ -@]*[A-~]") +ZERO_WIDTH_BRACKET = re.compile(r"\x01.*?\x02") +ZERO_WIDTH_TRANS = str.maketrans({"\x01": "", "\x02": ""}) +IDENTIFIERS_AFTER = {"def", "class"} +KEYWORD_CONSTANTS = {"True", "False", "None"} +BUILTINS = {str(name) for name in dir(builtins) if not name.startswith('_')} + + +def THEME(**kwargs): + # Not cached: the user can modify the theme inside the interactive session. + return _colorize.get_theme(**kwargs).syntax + + +class Span(NamedTuple): + """Span indexing that's inclusive on both ends.""" + + start: int + end: int + + @classmethod + def from_re(cls, m: Match[str], group: int | str) -> Self: + re_span = m.span(group) + return cls(re_span[0], re_span[1] - 1) + + @classmethod + def from_token(cls, token: TI, line_len: list[int]) -> Self: + end_offset = -1 + if (token.type in {T.FSTRING_MIDDLE, T.TSTRING_MIDDLE} + and token.string.endswith(("{", "}"))): + # gh-134158: a visible trailing brace comes from a double brace in input + end_offset += 1 + + return cls( + line_len[token.start[0] - 1] + token.start[1], + line_len[token.end[0] - 1] + token.end[1] + end_offset, + ) + + +class ColorSpan(NamedTuple): + span: Span + tag: str @functools.cache def str_width(c: str) -> int: if ord(c) < 128: return 1 + # gh-139246 for zero-width joiner and combining characters + if unicodedata.combining(c): + return 0 + category = unicodedata.category(c) + if category == "Cf" and c != "\u00ad": + return 0 w = unicodedata.east_asian_width(c) - if w in ('N', 'Na', 'H', 'A'): + if w in ("N", "Na", "H", "A"): return 1 return 2 def wlen(s: str) -> int: - if len(s) == 1 and s != '\x1a': + if len(s) == 1 and s != "\x1a": return str_width(s) length = sum(str_width(i) for i in s) # remove lengths of any escape sequences sequence = ANSI_ESCAPE_SEQUENCE.findall(s) - ctrl_z_cnt = s.count('\x1a') + ctrl_z_cnt = s.count("\x1a") return length - sum(len(i) for i in sequence) + ctrl_z_cnt + + +def unbracket(s: str, including_content: bool = False) -> str: + r"""Return `s` with \001 and \002 characters removed. + + If `including_content` is True, content between \001 and \002 is also + stripped. + """ + if including_content: + return ZERO_WIDTH_BRACKET.sub("", s) + return s.translate(ZERO_WIDTH_TRANS) + + +def gen_colors(buffer: str) -> Iterator[ColorSpan]: + """Returns a list of index spans to color using the given color tag. + + The input `buffer` should be a valid start of a Python code block, i.e. + it cannot be a block starting in the middle of a multiline string. + """ + sio = StringIO(buffer) + line_lengths = [0] + [len(line) for line in sio.readlines()] + # make line_lengths cumulative + for i in range(1, len(line_lengths)): + line_lengths[i] += line_lengths[i-1] + + sio.seek(0) + gen = tokenize.generate_tokens(sio.readline) + last_emitted: ColorSpan | None = None + try: + for color in gen_colors_from_token_stream(gen, line_lengths): + yield color + last_emitted = color + except SyntaxError: + return + except tokenize.TokenError as te: + yield from recover_unterminated_string( + te, line_lengths, last_emitted, buffer + ) + + +def recover_unterminated_string( + exc: tokenize.TokenError, + line_lengths: list[int], + last_emitted: ColorSpan | None, + buffer: str, +) -> Iterator[ColorSpan]: + msg, loc = exc.args + if loc is None: + return + + line_no, column = loc + + if msg.startswith( + ( + "unterminated string literal", + "unterminated f-string literal", + "unterminated t-string literal", + "EOF in multi-line string", + "unterminated triple-quoted f-string literal", + "unterminated triple-quoted t-string literal", + ) + ): + start = line_lengths[line_no - 1] + column - 1 + end = line_lengths[-1] - 1 + + # in case FSTRING_START was already emitted + if last_emitted and start <= last_emitted.span.start: + trace("before last emitted = {s}", s=start) + start = last_emitted.span.end + 1 + + span = Span(start, end) + trace("yielding span {a} -> {b}", a=span.start, b=span.end) + yield ColorSpan(span, "string") + else: + trace( + "unhandled token error({buffer}) = {te}", + buffer=repr(buffer), + te=str(exc), + ) + + +def gen_colors_from_token_stream( + token_generator: Iterator[TI], + line_lengths: list[int], +) -> Iterator[ColorSpan]: + token_window = prev_next_window(token_generator) + + is_def_name = False + bracket_level = 0 + for prev_token, token, next_token in token_window: + assert token is not None + if token.start == token.end: + continue + + match token.type: + case ( + T.STRING + | T.FSTRING_START | T.FSTRING_MIDDLE | T.FSTRING_END + | T.TSTRING_START | T.TSTRING_MIDDLE | T.TSTRING_END + ): + span = Span.from_token(token, line_lengths) + yield ColorSpan(span, "string") + case T.COMMENT: + span = Span.from_token(token, line_lengths) + yield ColorSpan(span, "comment") + case T.NUMBER: + span = Span.from_token(token, line_lengths) + yield ColorSpan(span, "number") + case T.OP: + if token.string in "([{": + bracket_level += 1 + elif token.string in ")]}": + bracket_level -= 1 + span = Span.from_token(token, line_lengths) + yield ColorSpan(span, "op") + case T.NAME: + if is_def_name: + is_def_name = False + span = Span.from_token(token, line_lengths) + yield ColorSpan(span, "definition") + elif keyword.iskeyword(token.string): + span_cls = "keyword" + if token.string in KEYWORD_CONSTANTS: + span_cls = "keyword_constant" + span = Span.from_token(token, line_lengths) + yield ColorSpan(span, span_cls) + if token.string in IDENTIFIERS_AFTER: + is_def_name = True + elif ( + keyword.issoftkeyword(token.string) + and bracket_level == 0 + and is_soft_keyword_used(prev_token, token, next_token) + ): + span = Span.from_token(token, line_lengths) + yield ColorSpan(span, "soft_keyword") + elif ( + token.string in BUILTINS + and not (prev_token and prev_token.exact_type == T.DOT) + ): + span = Span.from_token(token, line_lengths) + yield ColorSpan(span, "builtin") + + +keyword_first_sets_match = {"False", "None", "True", "await", "lambda", "not"} +keyword_first_sets_case = {"False", "None", "True"} + + +def is_soft_keyword_used(*tokens: TI | None) -> bool: + """Returns True if the current token is a keyword in this context. + + For the `*tokens` to match anything, they have to be a three-tuple of + (previous, current, next). + """ + trace("is_soft_keyword_used{t}", t=tokens) + match tokens: + case ( + None | TI(T.NEWLINE) | TI(T.INDENT) | TI(string=":"), + TI(string="match"), + TI(T.NUMBER | T.STRING | T.FSTRING_START | T.TSTRING_START) + | TI(T.OP, string="(" | "*" | "[" | "{" | "~" | "...") + ): + return True + case ( + None | TI(T.NEWLINE) | TI(T.INDENT) | TI(string=":"), + TI(string="match"), + TI(T.NAME, string=s) + ): + if keyword.iskeyword(s): + return s in keyword_first_sets_match + return True + case ( + None | TI(T.NEWLINE) | TI(T.INDENT) | TI(T.DEDENT) | TI(string=":"), + TI(string="case"), + TI(T.NUMBER | T.STRING | T.FSTRING_START | T.TSTRING_START) + | TI(T.OP, string="(" | "*" | "-" | "[" | "{") + ): + return True + case ( + None | TI(T.NEWLINE) | TI(T.INDENT) | TI(T.DEDENT) | TI(string=":"), + TI(string="case"), + TI(T.NAME, string=s) + ): + if keyword.iskeyword(s): + return s in keyword_first_sets_case + return True + case (TI(string="case"), TI(string="_"), TI(string=":")): + return True + case ( + None | TI(T.NEWLINE) | TI(T.INDENT) | TI(T.DEDENT) | TI(string=":"), + TI(string="type"), + TI(T.NAME, string=s) + ): + return not keyword.iskeyword(s) + case _: + return False + + +def disp_str( + buffer: str, + colors: list[ColorSpan] | None = None, + start_index: int = 0, + force_color: bool = False, +) -> tuple[CharBuffer, CharWidths]: + r"""Decompose the input buffer into a printable variant with applied colors. + + Returns a tuple of two lists: + - the first list is the input buffer, character by character, with color + escape codes added (while those codes contain multiple ASCII characters, + each code is considered atomic *and is attached for the corresponding + visible character*); + - the second list is the visible width of each character in the input + buffer. + + Note on colors: + - The `colors` list, if provided, is partially consumed within. We're using + a list and not a generator since we need to hold onto the current + unfinished span between calls to disp_str in case of multiline strings. + - The `colors` list is computed from the start of the input block. `buffer` + is only a subset of that input block, a single line within. This is why + we need `start_index` to inform us which position is the start of `buffer` + actually within user input. This allows us to match color spans correctly. + + Examples: + >>> utils.disp_str("a = 9") + (['a', ' ', '=', ' ', '9'], [1, 1, 1, 1, 1]) + + >>> line = "while 1:" + >>> colors = list(utils.gen_colors(line)) + >>> utils.disp_str(line, colors=colors) + (['\x1b[1;34mw', 'h', 'i', 'l', 'e\x1b[0m', ' ', '1', ':'], [1, 1, 1, 1, 1, 1, 1, 1]) + + """ + chars: CharBuffer = [] + char_widths: CharWidths = [] + + if not buffer: + return chars, char_widths + + while colors and colors[0].span.end < start_index: + # move past irrelevant spans + colors.pop(0) + + theme = THEME(force_color=force_color) + pre_color = "" + post_color = "" + if colors and colors[0].span.start < start_index: + # looks like we're continuing a previous color (e.g. a multiline str) + pre_color = theme[colors[0].tag] + + for i, c in enumerate(buffer, start_index): + if colors and colors[0].span.start == i: # new color starts now + pre_color = theme[colors[0].tag] + + if c == "\x1a": # CTRL-Z on Windows + chars.append(c) + char_widths.append(2) + elif ord(c) < 128: + chars.append(c) + char_widths.append(1) + elif unicodedata.category(c).startswith("C"): + c = r"\u%04x" % ord(c) + chars.append(c) + char_widths.append(len(c)) + else: + chars.append(c) + char_widths.append(str_width(c)) + + if colors and colors[0].span.end == i: # current color ends now + post_color = theme.reset + colors.pop(0) + + chars[-1] = pre_color + chars[-1] + post_color + pre_color = "" + post_color = "" + + if colors and colors[0].span.start < i and colors[0].span.end > i: + # even though the current color should be continued, reset it for now. + # the next call to `disp_str()` will revive it. + chars[-1] += theme.reset + + return chars, char_widths + + +def prev_next_window[T]( + iterable: Iterable[T] +) -> Iterator[tuple[T | None, ...]]: + """Generates three-tuples of (previous, current, next) items. + + On the first iteration previous is None. On the last iteration next + is None. In case of exception next is None and the exception is re-raised + on a subsequent next() call. + + Inspired by `sliding_window` from `itertools` recipes. + """ + + iterator = iter(iterable) + window = deque((None, next(iterator)), maxlen=3) + try: + for x in iterator: + window.append(x) + yield tuple(window) + except Exception: + raise + finally: + window.append(None) + yield tuple(window) diff --git a/Lib/pdb.py b/Lib/pdb.py old mode 100755 new mode 100644 index ec6cf06e5..7dcd0cb1b --- a/Lib/pdb.py +++ b/Lib/pdb.py @@ -1,5 +1,3 @@ -#! /usr/bin/env python3 - """ The Python Debugger Pdb ======================= @@ -76,11 +74,34 @@ import bdb import dis import code import glob +import json +import stat +import token +import types +import atexit +import codeop import pprint import signal +import socket +import typing +import asyncio import inspect +import weakref +import builtins +import tempfile +import textwrap +import tokenize +import itertools import traceback import linecache +import selectors +import threading +import _colorize +import _pyrepl.utils + +from contextlib import ExitStack, closing, contextmanager +from types import CodeType +from warnings import deprecated class Restart(Exception): @@ -88,29 +109,56 @@ class Restart(Exception): pass __all__ = ["run", "pm", "Pdb", "runeval", "runctx", "runcall", "set_trace", - "post_mortem", "help"] + "post_mortem", "set_default_backend", "get_default_backend", "help"] + + +def find_first_executable_line(code): + """ Try to find the first executable line of the code object. + + Equivalently, find the line number of the instruction that's + after RESUME + + Return code.co_firstlineno if no executable line is found. + """ + prev = None + for instr in dis.get_instructions(code): + if prev is not None and prev.opname == 'RESUME': + if instr.positions.lineno is not None: + return instr.positions.lineno + return code.co_firstlineno + prev = instr + return code.co_firstlineno def find_function(funcname, filename): - cre = re.compile(r'def\s+%s\s*[(]' % re.escape(funcname)) + cre = re.compile(r'def\s+%s(\s*\[.+\])?\s*[(]' % re.escape(funcname)) try: - fp = open(filename) + fp = tokenize.open(filename) except OSError: - return None + lines = linecache.getlines(filename) + if not lines: + return None + fp = io.StringIO(''.join(lines)) + funcdef = "" + funcstart = 0 # consumer of this info expects the first line to be 1 with fp: for lineno, line in enumerate(fp, start=1): if cre.match(line): - return funcname, filename, lineno - return None + funcstart, funcdef = lineno, line + elif funcdef: + funcdef += line -def getsourcelines(obj): - lines, lineno = inspect.findsource(obj) - if inspect.isframe(obj) and obj.f_globals is obj.f_locals: - # must be a module frame: do not try to cut a block out of it - return lines, 1 - elif inspect.ismodule(obj): - return lines, 1 - return inspect.getblock(lines[lineno:]), lineno+1 + if funcdef: + try: + code = compile(funcdef, filename, 'exec') + except SyntaxError: + continue + # We should always be able to find the code object here + funccode = next(c for c in code.co_consts if + isinstance(c, CodeType) and c.co_name == funcname) + lineno_offset = find_first_executable_line(funccode) + return funcname, filename, funcstart + lineno_offset - 1 + return None def lasti2lineno(code, lasti): linestarts = list(dis.findlinestarts(code)) @@ -127,6 +175,153 @@ class _rstr(str): return self +class _ExecutableTarget: + filename: str + code: CodeType | str + namespace: dict + + +class _ScriptTarget(_ExecutableTarget): + def __init__(self, target): + self._check(target) + self._target = self._safe_realpath(target) + + # If PYTHONSAFEPATH (-P) is not set, sys.path[0] is the directory + # of pdb, and we should replace it with the directory of the script + if not sys.flags.safe_path: + sys.path[0] = os.path.dirname(self._target) + + @staticmethod + def _check(target): + """ + Check that target is plausibly a script. + """ + if not os.path.exists(target): + print(f'Error: {target} does not exist') + sys.exit(1) + if os.path.isdir(target): + print(f'Error: {target} is a directory') + sys.exit(1) + + @staticmethod + def _safe_realpath(path): + """ + Return the canonical path (realpath) if it is accessible from the userspace. + Otherwise (for example, if the path is a symlink to an anonymous pipe), + return the original path. + + See GH-142315. + """ + realpath = os.path.realpath(path) + return realpath if os.path.exists(realpath) else path + + def __repr__(self): + return self._target + + @property + def filename(self): + return self._target + + @property + def code(self): + # Open the file each time because the file may be modified + with io.open_code(self._target) as fp: + return f"exec(compile({fp.read()!r}, {self._target!r}, 'exec'))" + + @property + def namespace(self): + return dict( + __name__='__main__', + __file__=self._target, + __builtins__=__builtins__, + __spec__=None, + ) + + +class _ModuleTarget(_ExecutableTarget): + def __init__(self, target): + self._target = target + + import runpy + try: + _, self._spec, self._code = runpy._get_module_details(self._target) + except ImportError as e: + print(f"ImportError: {e}") + sys.exit(1) + except Exception: + traceback.print_exc() + sys.exit(1) + + def __repr__(self): + return self._target + + @property + def filename(self): + return self._code.co_filename + + @property + def code(self): + return self._code + + @property + def namespace(self): + return dict( + __name__='__main__', + __file__=os.path.normcase(os.path.abspath(self.filename)), + __package__=self._spec.parent, + __loader__=self._spec.loader, + __spec__=self._spec, + __builtins__=__builtins__, + ) + + +class _ZipTarget(_ExecutableTarget): + def __init__(self, target): + import runpy + + self._target = os.path.realpath(target) + sys.path.insert(0, self._target) + try: + _, self._spec, self._code = runpy._get_main_module_details() + except ImportError as e: + print(f"ImportError: {e}") + sys.exit(1) + except Exception: + traceback.print_exc() + sys.exit(1) + + def __repr__(self): + return self._target + + @property + def filename(self): + return self._code.co_filename + + @property + def code(self): + return self._code + + @property + def namespace(self): + return dict( + __name__='__main__', + __file__=os.path.normcase(os.path.abspath(self.filename)), + __package__=self._spec.parent, + __loader__=self._spec.loader, + __spec__=self._spec, + __builtins__=__builtins__, + ) + + +class _PdbInteractiveConsole(code.InteractiveConsole): + def __init__(self, ns, message): + self._message = message + super().__init__(locals=ns, local_exit=True) + + def write(self, data): + self._message(data, end='') + + # Interaction prompt line will separate file and call info from code # text using value of line_prefix string. A newline and arrow may # be to your liking. You can set it once pdb is imported using the @@ -134,13 +329,39 @@ class _rstr(str): # line_prefix = ': ' # Use this to get the old situation back line_prefix = '\n-> ' # Probably a better default -class Pdb(bdb.Bdb, cmd.Cmd): +# The default backend to use for Pdb instances if not specified +# Should be either 'settrace' or 'monitoring' +_default_backend = 'settrace' + + +def set_default_backend(backend): + """Set the default backend to use for Pdb instances.""" + global _default_backend + if backend not in ('settrace', 'monitoring'): + raise ValueError("Invalid backend: %s" % backend) + _default_backend = backend + + +def get_default_backend(): + """Get the default backend to use for Pdb instances.""" + return _default_backend + + +class Pdb(bdb.Bdb, cmd.Cmd): _previous_sigint_handler = None + # Limit the maximum depth of chained exceptions, we should be handling cycles, + # but in case there are recursions, we stop at 999. + MAX_CHAINED_EXCEPTION_DEPTH = 999 + + _file_mtime_table = {} + + _last_pdb_instance = None + def __init__(self, completekey='tab', stdin=None, stdout=None, skip=None, - nosigint=False, readrc=True): - bdb.Bdb.__init__(self, skip=skip) + nosigint=False, readrc=True, mode=None, backend=None, colorize=False): + bdb.Bdb.__init__(self, skip=skip, backend=backend if backend else get_default_backend()) cmd.Cmd.__init__(self, completekey, stdin, stdout) sys.audit("pdb.Pdb") if stdout: @@ -151,41 +372,52 @@ class Pdb(bdb.Bdb, cmd.Cmd): self.mainpyfile = '' self._wait_for_mainpyfile = False self.tb_lineno = {} + self.mode = mode + self.colorize = colorize and _colorize.can_colorize(file=stdout or sys.stdout) # Try to load readline if it exists try: import readline # remove some common file name delimiters - readline.set_completer_delims(' \t\n`@#$%^&*()=+[{]}\\|;:\'",<>?') + readline.set_completer_delims(' \t\n`@#%^&*()=+[{]}\\|;:\'",<>?') except ImportError: pass + self.allow_kbdint = False self.nosigint = nosigint + # Consider these characters as part of the command so when the users type + # c.a or c['a'], it won't be recognized as a c(ontinue) command + self.identchars = cmd.Cmd.identchars + '=.[](),"\'+-*/%@&|<>~^' # Read ~/.pdbrc and ./.pdbrc self.rcLines = [] if readrc: try: - with open(os.path.expanduser('~/.pdbrc')) as rcFile: + with open(os.path.expanduser('~/.pdbrc'), encoding='utf-8') as rcFile: self.rcLines.extend(rcFile) except OSError: pass try: - with open(".pdbrc") as rcFile: + with open(".pdbrc", encoding='utf-8') as rcFile: self.rcLines.extend(rcFile) except OSError: pass self.commands = {} # associates a command list to breakpoint numbers - self.commands_doprompt = {} # for each bp num, tells if the prompt - # must be disp. after execing the cmd list - self.commands_silent = {} # for each bp num, tells if the stack trace - # must be disp. after execing the cmd list self.commands_defining = False # True while in the process of defining # a command list self.commands_bnum = None # The breakpoint number for which we are # defining a list + self.async_shim_frame = None + self.async_awaitable = None + + self._chained_exceptions = tuple() + self._chained_exception_index = 0 + + self._current_task = None + def set_trace(self, frame=None, *, commands=None): + Pdb._last_pdb_instance = self if frame is None: frame = sys._getframe().f_back @@ -194,6 +426,57 @@ class Pdb(bdb.Bdb, cmd.Cmd): super().set_trace(frame) + async def set_trace_async(self, frame=None, *, commands=None): + if self.async_awaitable is not None: + # We are already in a set_trace_async call, do not mess with it + return + + if frame is None: + frame = sys._getframe().f_back + + # We need set_trace to set up the basics, however, this will call + # set_stepinstr() will we need to compensate for, because we don't + # want to trigger on calls + self.set_trace(frame, commands=commands) + # Changing the stopframe will disable trace dispatch on calls + self.stopframe = frame + # We need to stop tracing because we don't have the privilege to avoid + # triggering tracing functions as normal, as we are not already in + # tracing functions + self.stop_trace() + + self.async_shim_frame = sys._getframe() + self.async_awaitable = None + + while True: + self.async_awaitable = None + # Simulate a trace event + # This should bring up pdb and make pdb believe it's debugging the + # caller frame + self.trace_dispatch(frame, "opcode", None) + if self.async_awaitable is not None: + try: + if self.breaks: + with self.set_enterframe(frame): + # set_continue requires enterframe to work + self.set_continue() + self.start_trace() + await self.async_awaitable + except Exception: + self._error_exc() + else: + break + + self.async_shim_frame = None + + # start the trace (the actual command is already set by set_* calls) + if self.returnframe is None and self.stoplineno == -1 and not self.breaks: + # This means we did a continue without any breakpoints, we should not + # start the trace + return + + self.start_trace() + def sigint_handler(self, signum, frame): if self.allow_kbdint: raise KeyboardInterrupt @@ -209,6 +492,8 @@ class Pdb(bdb.Bdb, cmd.Cmd): self.lineno = None self.stack = [] self.curindex = 0 + if hasattr(self, 'curframe') and self.curframe: + self.curframe.f_globals.pop('__pdb_convenience_variables', None) self.curframe = None self.tb_lineno.clear() @@ -223,30 +508,34 @@ class Pdb(bdb.Bdb, cmd.Cmd): self.tb_lineno[tb.tb_frame] = lineno tb = tb.tb_next self.curframe = self.stack[self.curindex][0] - # The f_locals dictionary is updated from the actual frame - # locals whenever the .f_locals accessor is called, so we - # cache it here to ensure that modifications are not overwritten. - self.curframe_locals = self.curframe.f_locals - return self.execRcLines() + self.set_convenience_variable(self.curframe, '_frame', self.curframe) + if self._current_task: + self.set_convenience_variable(self.curframe, '_asynctask', self._current_task) + self._save_initial_file_mtime(self.curframe) - # Can be executed earlier than 'setup' if desired - def execRcLines(self): - if not self.rcLines: - return - # local copy because of recursion - rcLines = self.rcLines - rcLines.reverse() - # execute every line only once - self.rcLines = [] - while rcLines: - line = rcLines.pop().strip() - if line and line[0] != '#': - if self.onecmd(line): - # if onecmd returns True, the command wants to exit - # from the interaction, save leftover rc lines - # to execute before next interaction - self.rcLines += reversed(rcLines) - return True + if self._chained_exceptions: + self.set_convenience_variable( + self.curframe, + '_exception', + self._chained_exceptions[self._chained_exception_index], + ) + + if self.rcLines: + self.cmdqueue = [ + line for line in self.rcLines + if line.strip() and not line.strip().startswith("#") + ] + self.rcLines = [] + + @property + @deprecated("The frame locals reference is no longer cached. Use 'curframe.f_locals' instead.") + def curframe_locals(self): + return self.curframe.f_locals + + @curframe_locals.setter + @deprecated("Setting 'curframe_locals' no longer has any effect. Update the contents of 'curframe.f_locals' instead.") + def curframe_locals(self, value): + pass # Override Bdb methods @@ -262,12 +551,20 @@ class Pdb(bdb.Bdb, cmd.Cmd): def user_line(self, frame): """This function is called when we stop or break at this line.""" if self._wait_for_mainpyfile: - if (self.mainpyfile != self.canonic(frame.f_code.co_filename) - or frame.f_lineno <= 0): + if (self.mainpyfile != self.canonic(frame.f_code.co_filename)): return self._wait_for_mainpyfile = False - if self.bp_commands(frame): - self.interaction(frame, None) + if self.trace_opcodes: + # GH-127321 + # We want to avoid stopping at an opcode that does not have + # an associated line number because pdb does not like it + if frame.f_lineno is None: + self.set_stepinstr() + return + self.bp_commands(frame) + self.interaction(frame, None) + + user_opcode = user_line def bp_commands(self, frame): """Call every command that was set for the current active breakpoint @@ -280,24 +577,16 @@ class Pdb(bdb.Bdb, cmd.Cmd): self.currentbp in self.commands: currentbp = self.currentbp self.currentbp = 0 - lastcmd_back = self.lastcmd - self.setup(frame, None) for line in self.commands[currentbp]: - self.onecmd(line) - self.lastcmd = lastcmd_back - if not self.commands_silent[currentbp]: - self.print_stack_entry(self.stack[self.curindex]) - if self.commands_doprompt[currentbp]: - self._cmdloop() - self.forget() - return - return 1 + self.cmdqueue.append(line) + self.cmdqueue.append(f'_pdbcmd_restore_lastcmd {self.lastcmd}') def user_return(self, frame, return_value): """This function is called when a return trap is set here.""" if self._wait_for_mainpyfile: return frame.f_locals['__return__'] = return_value + self.set_convenience_variable(frame, '_retval', return_value) self.message('--Return--') self.interaction(frame, None) @@ -308,6 +597,7 @@ class Pdb(bdb.Bdb, cmd.Cmd): return exc_type, exc_value, exc_traceback = exc_info frame.f_locals['__exception__'] = exc_type, exc_value + self.set_convenience_variable(frame, '_exception', exc_value) # An 'Internal StopIteration' exception is an exception debug event # issued by the interpreter when handling a subgenerator run with @@ -316,8 +606,7 @@ class Pdb(bdb.Bdb, cmd.Cmd): # stop when the debuggee is returning from such generators. prefix = 'Internal ' if (not exc_traceback and exc_type is StopIteration) else '' - self.message('%s%s' % (prefix, - traceback.format_exception_only(exc_type, exc_value)[-1].strip())) + self.message('%s%s' % (prefix, self._format_exc(exc_value))) self.interaction(frame, exc_traceback) # General interaction function @@ -333,8 +622,35 @@ class Pdb(bdb.Bdb, cmd.Cmd): except KeyboardInterrupt: self.message('--KeyboardInterrupt--') + def _save_initial_file_mtime(self, frame): + """save the mtime of the all the files in the frame stack in the file mtime table + if they haven't been saved yet.""" + while frame: + filename = frame.f_code.co_filename + if filename not in self._file_mtime_table: + try: + self._file_mtime_table[filename] = os.path.getmtime(filename) + except Exception: + pass + frame = frame.f_back + + def _validate_file_mtime(self): + """Check if the source file of the current frame has been modified. + If so, give a warning and reset the modify time to current.""" + try: + filename = self.curframe.f_code.co_filename + mtime = os.path.getmtime(filename) + except Exception: + return + if (filename in self._file_mtime_table and + mtime != self._file_mtime_table[filename]): + self.message(f"*** WARNING: file '{filename}' was edited, " + "running stale code until the program is rerun") + self._file_mtime_table[filename] = mtime + # Called before loop, handles display expressions - def preloop(self): + # Set up convenience variable containers + def _show_display(self): displaying = self.displaying.get(self.curframe) if displaying: for expr, oldvalue in displaying.items(): @@ -344,10 +660,75 @@ class Pdb(bdb.Bdb, cmd.Cmd): # fields are changed to be displayed if newvalue is not oldvalue and newvalue != oldvalue: displaying[expr] = newvalue - self.message('display %s: %r [old: %r]' % - (expr, newvalue, oldvalue)) + self.message('display %s: %s [old: %s]' % + (expr, self._safe_repr(newvalue, expr), + self._safe_repr(oldvalue, expr))) - def interaction(self, frame, traceback): + def _get_tb_and_exceptions(self, tb_or_exc): + """ + Given a tracecack or an exception, return a tuple of chained exceptions + and current traceback to inspect. + + This will deal with selecting the right ``__cause__`` or ``__context__`` + as well as handling cycles, and return a flattened list of exceptions we + can jump to with do_exceptions. + + """ + _exceptions = [] + if isinstance(tb_or_exc, BaseException): + traceback, current = tb_or_exc.__traceback__, tb_or_exc + + while current is not None: + if current in _exceptions: + break + _exceptions.append(current) + if current.__cause__ is not None: + current = current.__cause__ + elif ( + current.__context__ is not None and not current.__suppress_context__ + ): + current = current.__context__ + + if len(_exceptions) >= self.MAX_CHAINED_EXCEPTION_DEPTH: + self.message( + f"More than {self.MAX_CHAINED_EXCEPTION_DEPTH}" + " chained exceptions found, not all exceptions" + "will be browsable with `exceptions`." + ) + break + else: + traceback = tb_or_exc + return tuple(reversed(_exceptions)), traceback + + @contextmanager + def _hold_exceptions(self, exceptions): + """ + Context manager to ensure proper cleaning of exceptions references + + When given a chained exception instead of a traceback, + pdb may hold references to many objects which may leak memory. + + We use this context manager to make sure everything is properly cleaned + + """ + try: + self._chained_exceptions = exceptions + self._chained_exception_index = len(exceptions) - 1 + yield + finally: + # we can't put those in forget as otherwise they would + # be cleared on exception change + self._chained_exceptions = tuple() + self._chained_exception_index = 0 + + def _get_asyncio_task(self): + try: + task = asyncio.current_task() + except RuntimeError: + task = None + return task + + def interaction(self, frame, tb_or_exc): # Restore the previous signal handler at the Pdb prompt. if Pdb._previous_sigint_handler: try: @@ -356,14 +737,25 @@ class Pdb(bdb.Bdb, cmd.Cmd): pass else: Pdb._previous_sigint_handler = None - if self.setup(frame, traceback): - # no interaction desired at this time (happens if .pdbrc contains - # a command like "continue") + + self._current_task = self._get_asyncio_task() + + _chained_exceptions, tb = self._get_tb_and_exceptions(tb_or_exc) + if isinstance(tb_or_exc, BaseException): + assert tb is not None, "main exception must have a traceback" + with self._hold_exceptions(_chained_exceptions): + self.setup(frame, tb) + # We should print the stack entry if and only if the user input + # is expected, and we should print it right before the user input. + # We achieve this by appending _pdbcmd_print_frame_status to the + # command queue. If cmdqueue is not exhausted, the user input is + # not expected and we will not print the stack entry. + self.cmdqueue.append('_pdbcmd_print_frame_status') + self._cmdloop() + # If _pdbcmd_print_frame_status is not used, pop it out + if self.cmdqueue and self.cmdqueue[-1] == '_pdbcmd_print_frame_status': + self.cmdqueue.pop() self.forget() - return - self.print_stack_entry(self.stack[self.curindex]) - self._cmdloop() - self.forget() def displayhook(self, obj): """Custom displayhook for the exec in default(), which prevents @@ -373,12 +765,191 @@ class Pdb(bdb.Bdb, cmd.Cmd): if obj is not None: self.message(repr(obj)) + @contextmanager + def _enable_multiline_input(self): + try: + import readline + except ImportError: + yield + return + + def input_auto_indent(): + last_index = readline.get_current_history_length() + last_line = readline.get_history_item(last_index) + if last_line: + if last_line.isspace(): + # If the last line is empty, we don't need to indent + return + + last_line = last_line.rstrip('\r\n') + indent = len(last_line) - len(last_line.lstrip()) + if last_line.endswith(":"): + indent += 4 + readline.insert_text(' ' * indent) + + completenames = self.completenames + try: + self.completenames = self.complete_multiline_names + readline.set_startup_hook(input_auto_indent) + yield + finally: + readline.set_startup_hook() + self.completenames = completenames + return + + def _exec_in_closure(self, source, globals, locals): + """ Run source code in closure so code object created within source + can find variables in locals correctly + + returns True if the source is executed, False otherwise + """ + + # Determine if the source should be executed in closure. Only when the + # source compiled to multiple code objects, we should use this feature. + # Otherwise, we can just raise an exception and normal exec will be used. + + code = compile(source, "", "exec") + if not any(isinstance(const, CodeType) for const in code.co_consts): + return False + + # locals could be a proxy which does not support pop + # copy it first to avoid modifying the original locals + locals_copy = dict(locals) + + locals_copy["__pdb_eval__"] = { + "result": None, + "write_back": {} + } + + # If the source is an expression, we need to print its value + try: + compile(source, "", "eval") + except SyntaxError: + pass + else: + source = "__pdb_eval__['result'] = " + source + + # Add write-back to update the locals + source = ("try:\n" + + textwrap.indent(source, " ") + "\n" + + "finally:\n" + + " __pdb_eval__['write_back'] = locals()") + + # Build a closure source code with freevars from locals like: + # def __pdb_outer(): + # var = None + # def __pdb_scope(): # This is the code object we want to execute + # nonlocal var + # + # return __pdb_scope.__code__ + source_with_closure = ("def __pdb_outer():\n" + + "\n".join(f" {var} = None" for var in locals_copy) + "\n" + + " def __pdb_scope():\n" + + "\n".join(f" nonlocal {var}" for var in locals_copy) + "\n" + + textwrap.indent(source, " ") + "\n" + + " return __pdb_scope.__code__" + ) + + # Get the code object of __pdb_scope() + # The exec fills locals_copy with the __pdb_outer() function and we can call + # that to get the code object of __pdb_scope() + ns = {} + try: + exec(source_with_closure, {}, ns) + except Exception: + return False + code = ns["__pdb_outer"]() + + cells = tuple(types.CellType(locals_copy.get(var)) for var in code.co_freevars) + + try: + exec(code, globals, locals_copy, closure=cells) + except Exception: + return False + + # get the data we need from the statement + pdb_eval = locals_copy["__pdb_eval__"] + + # __pdb_eval__ should not be updated back to locals + pdb_eval["write_back"].pop("__pdb_eval__") + + # Write all local variables back to locals + locals.update(pdb_eval["write_back"]) + eval_result = pdb_eval["result"] + if eval_result is not None: + self.message(repr(eval_result)) + + return True + + def _exec_await(self, source, globals, locals): + """ Run source code that contains await by playing with async shim frame""" + # Put the source in an async function + source_async = ( + "async def __pdb_await():\n" + + textwrap.indent(source, " ") + '\n' + + " __pdb_locals.update(locals())" + ) + ns = globals | locals + # We use __pdb_locals to do write back + ns["__pdb_locals"] = locals + exec(source_async, ns) + self.async_awaitable = ns["__pdb_await"]() + + def _read_code(self, line): + buffer = line + is_await_code = False + code = None + try: + if (code := codeop.compile_command(line + '\n', '', 'single')) is None: + # Multi-line mode + with self._enable_multiline_input(): + buffer = line + continue_prompt = "... " + while (code := codeop.compile_command(buffer, '', 'single')) is None: + if self.use_rawinput: + try: + line = input(continue_prompt) + except (EOFError, KeyboardInterrupt): + self.lastcmd = "" + print('\n') + return None, None, False + else: + self.stdout.write(continue_prompt) + self.stdout.flush() + line = self.stdin.readline() + if not len(line): + self.lastcmd = "" + self.stdout.write('\n') + self.stdout.flush() + return None, None, False + else: + line = line.rstrip('\r\n') + if line.isspace(): + # empty line, just continue + buffer += '\n' + else: + buffer += '\n' + line + self.lastcmd = buffer + except SyntaxError as e: + # Maybe it's an await expression/statement + if ( + self.async_shim_frame is not None + and e.msg == "'await' outside function" + ): + is_await_code = True + else: + raise + + return code, buffer, is_await_code + def default(self, line): - if line[:1] == '!': line = line[1:] - locals = self.curframe_locals + if line[:1] == '!': line = line[1:].strip() + locals = self.curframe.f_locals globals = self.curframe.f_globals try: - code = compile(line + '\n', '', 'single') + code, buffer, is_await_code = self._read_code(line) + if buffer is None: + return save_stdout = sys.stdout save_stdin = sys.stdin save_displayhook = sys.displayhook @@ -386,14 +957,51 @@ class Pdb(bdb.Bdb, cmd.Cmd): sys.stdin = self.stdin sys.stdout = self.stdout sys.displayhook = self.displayhook - exec(code, globals, locals) + if is_await_code: + self._exec_await(buffer, globals, locals) + return True + else: + if not self._exec_in_closure(buffer, globals, locals): + exec(code, globals, locals) finally: sys.stdout = save_stdout sys.stdin = save_stdin sys.displayhook = save_displayhook except: - exc_info = sys.exc_info()[:2] - self.error(traceback.format_exception_only(*exc_info)[-1].strip()) + self._error_exc() + + def _replace_convenience_variables(self, line): + """Replace the convenience variables in 'line' with their values. + e.g. $foo is replaced by __pdb_convenience_variables["foo"]. + Note: such pattern in string literals will be skipped""" + + if "$" not in line: + return line + + dollar_start = dollar_end = (-1, -1) + replace_variables = [] + try: + for t in tokenize.generate_tokens(io.StringIO(line).readline): + token_type, token_string, start, end, _ = t + if token_type == token.OP and token_string == '$': + dollar_start, dollar_end = start, end + elif start == dollar_end and token_type == token.NAME: + # line is a one-line command so we only care about column + replace_variables.append((dollar_start[1], end[1], token_string)) + except tokenize.TokenError: + return line + + if not replace_variables: + return line + + last_end = 0 + line_pieces = [] + for start, end, name in replace_variables: + line_pieces.append(line[last_end:start] + f'__pdb_convenience_variables["{name}"]') + last_end = end + line_pieces.append(line[last_end:]) + + return ''.join(line_pieces) def precmd(self, line): """Handle alias expansion and ';;' separator.""" @@ -402,11 +1010,20 @@ class Pdb(bdb.Bdb, cmd.Cmd): args = line.split() while args[0] in self.aliases: line = self.aliases[args[0]] - ii = 1 - for tmpArg in args[1:]: - line = line.replace("%" + str(ii), - tmpArg) - ii += 1 + for idx in range(1, 10): + if f'%{idx}' in line: + if idx >= len(args): + self.error(f"Not enough arguments for alias '{args[0]}'") + # This is a no-op + return "!" + line = line.replace(f'%{idx}', args[idx]) + elif '%*' not in line: + if idx < len(args): + self.error(f"Too many arguments for alias '{args[0]}'") + # This is a no-op + return "!" + break + line = line.replace("%*", ' '.join(args[1:])) args = line.split() # split into ';;' separated commands @@ -416,8 +1033,12 @@ class Pdb(bdb.Bdb, cmd.Cmd): if marker >= 0: # queue up everything after marker next = line[marker+2:].lstrip() - self.cmdqueue.append(next) + self.cmdqueue.insert(0, next) line = line[:marker].rstrip() + + # Replace all the convenience variables + line = self._replace_convenience_variables(line) + return line def onecmd(self, line): @@ -428,6 +1049,10 @@ class Pdb(bdb.Bdb, cmd.Cmd): a breakpoint command list definition. """ if not self.commands_defining: + if line.startswith('_pdbcmd'): + command, arg, line = self.parseline(line) + if hasattr(self, command): + return getattr(self, command)(arg) return cmd.Cmd.onecmd(self, line) else: return self.handle_command_def(line) @@ -436,14 +1061,16 @@ class Pdb(bdb.Bdb, cmd.Cmd): """Handles one command line during command list definition.""" cmd, arg, line = self.parseline(line) if not cmd: - return - if cmd == 'silent': - self.commands_silent[self.commands_bnum] = True - return # continue to handle other cmd def in the cmd list - elif cmd == 'end': - self.cmdqueue = [] - return 1 # end of cmd list + return False + if cmd == 'end': + return True # end of cmd list + elif cmd == 'EOF': + self.message('') + return True # end of cmd list cmdlist = self.commands[self.commands_bnum] + if cmd == 'silent': + cmdlist.append('_pdbcmd_silence_frame_status') + return False # continue to handle other cmd def in the cmd list if arg: cmdlist.append(cmd+' '+arg) else: @@ -455,22 +1082,74 @@ class Pdb(bdb.Bdb, cmd.Cmd): func = self.default # one of the resuming commands if func.__name__ in self.commands_resuming: - self.commands_doprompt[self.commands_bnum] = False - self.cmdqueue = [] - return 1 - return + return True + return False + + def _colorize_code(self, code): + if self.colorize: + colors = list(_pyrepl.utils.gen_colors(code)) + chars, _ = _pyrepl.utils.disp_str(code, colors=colors, force_color=True) + code = "".join(chars) + return code # interface abstraction functions - def message(self, msg): - print(msg, file=self.stdout) + def message(self, msg, end='\n'): + print(msg, end=end, file=self.stdout) def error(self, msg): print('***', msg, file=self.stdout) + # convenience variables + + def set_convenience_variable(self, frame, name, value): + if '__pdb_convenience_variables' not in frame.f_globals: + frame.f_globals['__pdb_convenience_variables'] = {} + frame.f_globals['__pdb_convenience_variables'][name] = value + # Generic completion functions. Individual complete_foo methods can be # assigned below to one of these functions. + @property + def rlcompleter(self): + """Return the `Completer` class from `rlcompleter`, while avoiding the + side effects of changing the completer from `import rlcompleter`. + + This is a compromise between GH-138860 and GH-139289. If GH-139289 is + fixed, then we don't need this and we can just `import rlcompleter` in + `Pdb.__init__`. + """ + if not hasattr(self, "_rlcompleter"): + try: + import readline + except ImportError: + # readline is not available, just get the Completer + from rlcompleter import Completer + self._rlcompleter = Completer + else: + # importing rlcompleter could have side effect of changing + # the current completer, we need to restore it + prev_completer = readline.get_completer() + from rlcompleter import Completer + self._rlcompleter = Completer + readline.set_completer(prev_completer) + return self._rlcompleter + + def completenames(self, text, line, begidx, endidx): + # Overwrite completenames() of cmd so for the command completion, + # if no current command matches, check for expressions as well + commands = super().completenames(text, line, begidx, endidx) + for alias in self.aliases: + if alias.startswith(text): + commands.append(alias) + if commands: + return commands + else: + expressions = self._complete_expression(text, line, begidx, endidx) + if expressions: + return expressions + return self.completedefault(text, line, begidx, endidx) + def _complete_location(self, text, line, begidx, endidx): # Complete a file/module/function location for break/tbreak/clear. if line.strip().endswith((':', ',')): @@ -482,7 +1161,7 @@ class Pdb(bdb.Bdb, cmd.Cmd): except Exception: ret = [] # Then, try to complete file names as well. - globs = glob.glob(text + '*') + globs = glob.glob(glob.escape(text) + '*') for fn in globs: if os.path.isdir(fn): ret.append(fn + '/') @@ -504,14 +1183,17 @@ class Pdb(bdb.Bdb, cmd.Cmd): # Collect globals and locals. It is usually not really sensible to also # complete builtins, and they clutter the namespace quite heavily, so we # leave them out. - ns = {**self.curframe.f_globals, **self.curframe_locals} + ns = {**self.curframe.f_globals, **self.curframe.f_locals} if '.' in text: # Walk an attribute chain up to the last part, similar to what # rlcompleter does. This will bail if any of the parts are not # simple attribute access, which is what we want. dotted = text.split('.') try: - obj = ns[dotted[0]] + if dotted[0].startswith('$'): + obj = self.curframe.f_globals['__pdb_convenience_variables'][dotted[0][1:]] + else: + obj = ns[dotted[0]] for part in dotted[1:-1]: obj = getattr(obj, part) except (KeyError, AttributeError): @@ -519,15 +1201,78 @@ class Pdb(bdb.Bdb, cmd.Cmd): prefix = '.'.join(dotted[:-1]) + '.' return [prefix + n for n in dir(obj) if n.startswith(dotted[-1])] else: + if text.startswith("$"): + # Complete convenience variables + conv_vars = self.curframe.f_globals.get('__pdb_convenience_variables', {}) + return [f"${name}" for name in conv_vars if name.startswith(text[1:])] # Complete a simple name. return [n for n in ns.keys() if n.startswith(text)] + def _complete_indentation(self, text, line, begidx, endidx): + try: + import readline + except ImportError: + return [] + # Fill in spaces to form a 4-space indent + return [' ' * (4 - readline.get_begidx() % 4)] + + def complete_multiline_names(self, text, line, begidx, endidx): + # If text is space-only, the user entered before any text. + # That normally means they want to indent the current line. + if not text.strip(): + return self._complete_indentation(text, line, begidx, endidx) + return self.completedefault(text, line, begidx, endidx) + + def completedefault(self, text, line, begidx, endidx): + if text.startswith("$"): + # Complete convenience variables + conv_vars = self.curframe.f_globals.get('__pdb_convenience_variables', {}) + return [f"${name}" for name in conv_vars if name.startswith(text[1:])] + + state = 0 + matches = [] + completer = self.rlcompleter(self.curframe.f_globals | self.curframe.f_locals) + while (match := completer.complete(text, state)) is not None: + matches.append(match) + state += 1 + return matches + + @contextmanager + def _enable_rlcompleter(self, ns): + try: + import readline + except ImportError: + yield + return + + try: + completer = self.rlcompleter(ns) + old_completer = readline.get_completer() + readline.set_completer(completer.complete) + yield + finally: + readline.set_completer(old_completer) + + # Pdb meta commands, only intended to be used internally by pdb + + def _pdbcmd_print_frame_status(self, arg): + self.print_stack_trace(0) + self._validate_file_mtime() + self._show_display() + + def _pdbcmd_silence_frame_status(self, arg): + if self.cmdqueue and self.cmdqueue[-1] == '_pdbcmd_print_frame_status': + self.cmdqueue.pop() + + def _pdbcmd_restore_lastcmd(self, arg): + self.lastcmd = arg + # Command definitions, called by cmdloop() # The argument is the remaining string on the command line # Return true to exit from the command loop def do_commands(self, arg): - """commands [bpnumber] + """(Pdb) commands [bpnumber] (com) ... (com) end (Pdb) @@ -569,19 +1314,21 @@ class Pdb(bdb.Bdb, cmd.Cmd): try: bnum = int(arg) except: - self.error("Usage: commands [bnum]\n ...\n end") + self._print_invalid_arg(arg) return + try: + self.get_bpbynumber(bnum) + except ValueError as err: + self.error('cannot set commands: %s' % err) + return + self.commands_bnum = bnum # Save old definitions for the case of a keyboard interrupt. if bnum in self.commands: - old_command_defs = (self.commands[bnum], - self.commands_doprompt[bnum], - self.commands_silent[bnum]) + old_commands = self.commands[bnum] else: - old_command_defs = None + old_commands = None self.commands[bnum] = [] - self.commands_doprompt[bnum] = True - self.commands_silent[bnum] = False prompt_back = self.prompt self.prompt = '(com) ' @@ -590,14 +1337,10 @@ class Pdb(bdb.Bdb, cmd.Cmd): self.cmdloop() except KeyboardInterrupt: # Restore old definitions. - if old_command_defs: - self.commands[bnum] = old_command_defs[0] - self.commands_doprompt[bnum] = old_command_defs[1] - self.commands_silent[bnum] = old_command_defs[2] + if old_commands: + self.commands[bnum] = old_commands else: del self.commands[bnum] - del self.commands_doprompt[bnum] - del self.commands_silent[bnum] self.error('command definition aborted, old commands restored') finally: self.commands_defining = False @@ -605,8 +1348,9 @@ class Pdb(bdb.Bdb, cmd.Cmd): complete_commands = _complete_bpnumber - def do_break(self, arg, temporary = 0): + def do_break(self, arg, temporary=False): """b(reak) [ ([filename:]lineno | function) [, condition] ] + Without argument, list all breaks. With a line number argument, set a break at this line in the @@ -632,10 +1376,14 @@ class Pdb(bdb.Bdb, cmd.Cmd): filename = None lineno = None cond = None + module_globals = None comma = arg.find(',') if comma > 0: # parse stuff after comma: "condition" cond = arg[comma+1:].lstrip() + if err := self._compile_error_message(cond): + self.error('Invalid condition %s: %r' % (cond, err)) + return arg = arg[:comma].rstrip() # parse stuff before comma: [filename:]lineno | function colon = arg.rfind(':') @@ -662,7 +1410,7 @@ class Pdb(bdb.Bdb, cmd.Cmd): try: func = eval(arg, self.curframe.f_globals, - self.curframe_locals) + self.curframe.f_locals) except: func = arg try: @@ -672,8 +1420,9 @@ class Pdb(bdb.Bdb, cmd.Cmd): #use co_name to identify the bkpt (function names #could be aliased, but co_name is invariant) funcname = code.co_name - lineno = code.co_firstlineno + lineno = find_first_executable_line(code) filename = code.co_filename + module_globals = func.__globals__ except: # last thing to try (ok, filename, ln) = self.lineinfo(arg) @@ -685,8 +1434,9 @@ class Pdb(bdb.Bdb, cmd.Cmd): lineno = int(ln) if not filename: filename = self.defaultFile() + filename = self.canonic(filename) # Check for reasonable breakpoint - line = self.checkline(filename, lineno) + line = self.checkline(filename, lineno, module_globals) if line: # now set the break point err = self.set_break(filename, line, temporary, cond, funcname) @@ -712,10 +1462,11 @@ class Pdb(bdb.Bdb, cmd.Cmd): def do_tbreak(self, arg): """tbreak [ ([filename:]lineno | function) [, condition] ] + Same arguments as break, but sets a temporary breakpoint: it is automatically deleted when first hit. """ - self.do_break(arg, 1) + self.do_break(arg, True) complete_tbreak = _complete_location @@ -748,11 +1499,13 @@ class Pdb(bdb.Bdb, cmd.Cmd): f = self.lookupmodule(parts[0]) if f: fname = f - item = parts[1] - answer = find_function(item, fname) + item = parts[1] + else: + return failed + answer = find_function(item, self.canonic(fname)) return answer or failed - def checkline(self, filename, lineno): + def checkline(self, filename, lineno, module_globals=None): """Check whether specified line seems to be executable. Return `lineno` if it is, 0 if not (e.g. a docstring, comment, blank @@ -760,8 +1513,10 @@ class Pdb(bdb.Bdb, cmd.Cmd): """ # this method should be callable before starting debugging, so default # to "no globals" if there is no current frame - globs = self.curframe.f_globals if hasattr(self, 'curframe') else None - line = linecache.getline(filename, lineno, globs) + frame = getattr(self, 'curframe', None) + if module_globals is None: + module_globals = frame.f_globals if frame else None + line = linecache.getline(filename, lineno, module_globals) if not line: self.message('End of file') return 0 @@ -775,9 +1530,13 @@ class Pdb(bdb.Bdb, cmd.Cmd): def do_enable(self, arg): """enable bpnumber [bpnumber ...] + Enables the breakpoints given as a space separated list of breakpoint numbers. """ + if not arg: + self._print_invalid_arg(arg) + return args = arg.split() for i in args: try: @@ -792,12 +1551,16 @@ class Pdb(bdb.Bdb, cmd.Cmd): def do_disable(self, arg): """disable bpnumber [bpnumber ...] + Disables the breakpoints given as a space separated list of breakpoint numbers. Disabling a breakpoint means it cannot cause the program to stop execution, but unlike clearing a breakpoint, it remains in the list of breakpoints and can be (re-)enabled. """ + if not arg: + self._print_invalid_arg(arg) + return args = arg.split() for i in args: try: @@ -812,14 +1575,21 @@ class Pdb(bdb.Bdb, cmd.Cmd): def do_condition(self, arg): """condition bpnumber [condition] + Set a new condition for the breakpoint, an expression which must evaluate to true before the breakpoint is honored. If condition is absent, any existing condition is removed; i.e., the breakpoint is made unconditional. """ + if not arg: + self._print_invalid_arg(arg) + return args = arg.split(' ', 1) try: cond = args[1] + if err := self._compile_error_message(cond): + self.error('Invalid condition %s: %r' % (cond, err)) + return except IndexError: cond = None try: @@ -839,6 +1609,7 @@ class Pdb(bdb.Bdb, cmd.Cmd): def do_ignore(self, arg): """ignore bpnumber [count] + Set the ignore count for the given breakpoint number. If count is omitted, the ignore count is set to 0. A breakpoint becomes active when the ignore count is zero. When non-zero, @@ -846,15 +1617,26 @@ class Pdb(bdb.Bdb, cmd.Cmd): and the breakpoint is not disabled and any associated condition evaluates to true. """ + if not arg: + self._print_invalid_arg(arg) + return args = arg.split() - try: - count = int(args[1].strip()) - except: + if not args: + self.error('Breakpoint number expected') + return + if len(args) == 1: count = 0 + elif len(args) == 2: + try: + count = int(args[1]) + except ValueError: + self._print_invalid_arg(arg) + return + else: + self._print_invalid_arg(arg) + return try: bp = self.get_bpbynumber(args[0].strip()) - except IndexError: - self.error('Breakpoint number expected') except ValueError as err: self.error(err) else: @@ -872,19 +1654,26 @@ class Pdb(bdb.Bdb, cmd.Cmd): complete_ignore = _complete_bpnumber + def _prompt_for_confirmation(self, prompt, default): + try: + reply = input(prompt) + except EOFError: + reply = default + return reply.strip().lower() + def do_clear(self, arg): - """cl(ear) filename:lineno\ncl(ear) [bpnumber [bpnumber...]] + """cl(ear) [filename:lineno | bpnumber ...] + With a space separated list of breakpoint numbers, clear those breakpoints. Without argument, clear all breaks (but first ask confirmation). With a filename:lineno argument, clear all breaks at that line in that file. """ if not arg: - try: - reply = input('Clear all breaks? ') - except EOFError: - reply = 'no' - reply = reply.strip().lower() + reply = self._prompt_for_confirmation( + 'Clear all breaks? ', + default='no', + ) if reply in ('y', 'yes'): bplist = [bp for bp in bdb.Breakpoint.bpbynumber if bp] self.clear_all_breaks() @@ -901,7 +1690,7 @@ class Pdb(bdb.Bdb, cmd.Cmd): except ValueError: err = "Invalid line number (%s)" % arg else: - bplist = self.get_breaks(filename, lineno) + bplist = self.get_breaks(filename, lineno)[:] err = self.clear_break(filename, lineno) if err: self.error(err) @@ -924,12 +1713,24 @@ class Pdb(bdb.Bdb, cmd.Cmd): complete_cl = _complete_location def do_where(self, arg): - """w(here) - Print a stack trace, with the most recent frame at the bottom. + """w(here) [count] + + Print a stack trace. If count is not specified, print the full stack. + If count is 0, print the current frame entry. If count is positive, + print count entries from the most recent frame. If count is negative, + print -count entries from the least recent frame. An arrow indicates the "current frame", which determines the context of most commands. 'bt' is an alias for this command. """ - self.print_stack_trace() + if not arg: + count = None + else: + try: + count = int(arg) + except ValueError: + self.error('Invalid count (%s)' % arg) + return + self.print_stack_trace(count) do_w = do_where do_bt = do_where @@ -937,12 +1738,60 @@ class Pdb(bdb.Bdb, cmd.Cmd): assert 0 <= number < len(self.stack) self.curindex = number self.curframe = self.stack[self.curindex][0] - self.curframe_locals = self.curframe.f_locals + self.set_convenience_variable(self.curframe, '_frame', self.curframe) self.print_stack_entry(self.stack[self.curindex]) self.lineno = None + def do_exceptions(self, arg): + """exceptions [number] + + List or change current exception in an exception chain. + + Without arguments, list all the current exception in the exception + chain. Exceptions will be numbered, with the current exception indicated + with an arrow. + + If given an integer as argument, switch to the exception at that index. + """ + if not self._chained_exceptions: + self.message( + "Did not find chained exceptions. To move between" + " exceptions, pdb/post_mortem must be given an exception" + " object rather than a traceback." + ) + return + if not arg: + for ix, exc in enumerate(self._chained_exceptions): + prompt = ">" if ix == self._chained_exception_index else " " + rep = repr(exc) + if len(rep) > 80: + rep = rep[:77] + "..." + indicator = ( + " -" + if self._chained_exceptions[ix].__traceback__ is None + else f"{ix:>3}" + ) + self.message(f"{prompt} {indicator} {rep}") + else: + try: + number = int(arg) + except ValueError: + self.error("Argument must be an integer") + return + if 0 <= number < len(self._chained_exceptions): + if self._chained_exceptions[number].__traceback__ is None: + self.error("This exception does not have a traceback, cannot jump to it") + return + + self._chained_exception_index = number + self.setup(None, self._chained_exceptions[number].__traceback__) + self.print_stack_entry(self.stack[self.curindex]) + else: + self.error("No exception with that number") + def do_up(self, arg): """u(p) [count] + Move the current frame count (default one) levels up in the stack trace (to an older frame). """ @@ -963,6 +1812,7 @@ class Pdb(bdb.Bdb, cmd.Cmd): def do_down(self, arg): """d(own) [count] + Move the current frame count (default one) levels down in the stack trace (to a newer frame). """ @@ -983,6 +1833,7 @@ class Pdb(bdb.Bdb, cmd.Cmd): def do_until(self, arg): """unt(il) [lineno] + Without argument, continue execution until the line with a number greater than the current one is reached. With a line number, continue execution until a line with a number greater @@ -1007,34 +1858,52 @@ class Pdb(bdb.Bdb, cmd.Cmd): def do_step(self, arg): """s(tep) + Execute the current line, stop at the first possible occasion (either in a function that is called or in the current function). """ + if arg: + self._print_invalid_arg(arg) + return self.set_step() return 1 do_s = do_step def do_next(self, arg): """n(ext) + Continue execution until the next line in the current function is reached or it returns. """ + if arg: + self._print_invalid_arg(arg) + return self.set_next(self.curframe) return 1 do_n = do_next def do_run(self, arg): """run [args...] + Restart the debugged python program. If a string is supplied it is split with "shlex", and the result is used as the new sys.argv. History, breakpoints, actions and debugger options are preserved. "restart" is an alias for "run". """ + if self.mode == 'inline': + self.error('run/restart command is disabled when pdb is running in inline mode.\n' + 'Use the command line interface to enable restarting your program\n' + 'e.g. "python -m pdb myscript.py"') + return if arg: import shlex argv0 = sys.argv[0:1] - sys.argv = shlex.split(arg) + try: + sys.argv = shlex.split(arg) + except ValueError as e: + self.error('Cannot run %s: %s' % (arg, e)) + return sys.argv[:0] = argv0 # this is caught in the main debugger loop raise Restart @@ -1043,16 +1912,24 @@ class Pdb(bdb.Bdb, cmd.Cmd): def do_return(self, arg): """r(eturn) + Continue execution until the current function returns. """ + if arg: + self._print_invalid_arg(arg) + return self.set_return(self.curframe) return 1 do_r = do_return def do_continue(self, arg): """c(ont(inue)) + Continue execution, only stop when a breakpoint is encountered. """ + if arg: + self._print_invalid_arg(arg) + return if not self.nosigint: try: Pdb._previous_sigint_handler = \ @@ -1069,6 +1946,7 @@ class Pdb(bdb.Bdb, cmd.Cmd): def do_jump(self, arg): """j(ump) lineno + Set the next line that will be executed. Only available in the bottom-most frame. This lets you jump back and execute code again, or jump forward to skip code that you don't want @@ -1078,6 +1956,9 @@ class Pdb(bdb.Bdb, cmd.Cmd): instance it is not possible to jump into the middle of a for loop or out of a finally clause. """ + if not arg: + self._print_invalid_arg(arg) + return if self.curindex + 1 != len(self.stack): self.error('You can only jump within the bottom frame') return @@ -1096,33 +1977,56 @@ class Pdb(bdb.Bdb, cmd.Cmd): self.error('Jump failed: %s' % e) do_j = do_jump + def _create_recursive_debugger(self): + return Pdb(self.completekey, self.stdin, self.stdout) + def do_debug(self, arg): """debug code + Enter a recursive debugger that steps through the code argument (which is an arbitrary expression or statement to be executed in the current environment). """ - sys.settrace(None) + if not arg: + self._print_invalid_arg(arg) + return + self.stop_trace() globals = self.curframe.f_globals - locals = self.curframe_locals - p = Pdb(self.completekey, self.stdin, self.stdout) + locals = self.curframe.f_locals + p = self._create_recursive_debugger() p.prompt = "(%s) " % self.prompt.strip() self.message("ENTERING RECURSIVE DEBUGGER") try: sys.call_tracing(p.run, (arg, globals, locals)) except Exception: - exc_info = sys.exc_info()[:2] - self.error(traceback.format_exception_only(*exc_info)[-1].strip()) + self._error_exc() self.message("LEAVING RECURSIVE DEBUGGER") - sys.settrace(self.trace_dispatch) + self.start_trace() self.lastcmd = p.lastcmd complete_debug = _complete_expression def do_quit(self, arg): - """q(uit)\nexit + """q(uit) | exit + Quit from the debugger. The program being executed is aborted. """ + # Show prompt to kill process when in 'inline' mode and if pdb was not + # started from an interactive console. The attribute sys.ps1 is only + # defined if the interpreter is in interactive mode. + if self.mode == 'inline' and not hasattr(sys, 'ps1'): + while True: + try: + reply = input('Quitting pdb will kill the process. Quit anyway? [y/n] ') + reply = reply.lower().strip() + except EOFError: + reply = 'y' + self.message('') + if reply == 'y' or reply == '': + sys.exit(1) + elif reply.lower() == 'n': + return + self._user_requested_quit = True self.set_quit() return 1 @@ -1132,83 +2036,109 @@ class Pdb(bdb.Bdb, cmd.Cmd): def do_EOF(self, arg): """EOF + Handles the receipt of EOF as a command. """ self.message('') - self._user_requested_quit = True - self.set_quit() - return 1 + return self.do_quit(arg) def do_args(self, arg): """a(rgs) + Print the argument list of the current function. """ + if arg: + self._print_invalid_arg(arg) + return co = self.curframe.f_code - dict = self.curframe_locals + dict = self.curframe.f_locals n = co.co_argcount + co.co_kwonlyargcount if co.co_flags & inspect.CO_VARARGS: n = n+1 if co.co_flags & inspect.CO_VARKEYWORDS: n = n+1 for i in range(n): name = co.co_varnames[i] if name in dict: - self.message('%s = %r' % (name, dict[name])) + self.message('%s = %s' % (name, self._safe_repr(dict[name], name))) else: self.message('%s = *** undefined ***' % (name,)) do_a = do_args def do_retval(self, arg): """retval + Print the return value for the last return of a function. """ - if '__return__' in self.curframe_locals: - self.message(repr(self.curframe_locals['__return__'])) + if arg: + self._print_invalid_arg(arg) + return + if '__return__' in self.curframe.f_locals: + self.message(self._safe_repr(self.curframe.f_locals['__return__'], "retval")) else: self.error('Not yet returned!') do_rv = do_retval def _getval(self, arg): try: - return eval(arg, self.curframe.f_globals, self.curframe_locals) + return eval(arg, self.curframe.f_globals, self.curframe.f_locals) except: - exc_info = sys.exc_info()[:2] - self.error(traceback.format_exception_only(*exc_info)[-1].strip()) + self._error_exc() raise def _getval_except(self, arg, frame=None): try: if frame is None: - return eval(arg, self.curframe.f_globals, self.curframe_locals) + return eval(arg, self.curframe.f_globals, self.curframe.f_locals) else: return eval(arg, frame.f_globals, frame.f_locals) + except BaseException as exc: + return _rstr('** raised %s **' % self._format_exc(exc)) + + def _error_exc(self): + exc = sys.exception() + self.error(self._format_exc(exc)) + + def _msg_val_func(self, arg, func): + try: + val = self._getval(arg) except: - exc_info = sys.exc_info()[:2] - err = traceback.format_exception_only(*exc_info)[-1].strip() - return _rstr('** raised %s **' % err) + return # _getval() has displayed the error + try: + self.message(func(val)) + except: + self._error_exc() + + def _safe_repr(self, obj, expr): + try: + return repr(obj) + except Exception as e: + return _rstr(f"*** repr({expr}) failed: {self._format_exc(e)} ***") def do_p(self, arg): """p expression + Print the value of the expression. """ - try: - self.message(repr(self._getval(arg))) - except: - pass + if not arg: + self._print_invalid_arg(arg) + return + self._msg_val_func(arg, repr) def do_pp(self, arg): """pp expression + Pretty-print the value of the expression. """ - try: - self.message(pprint.pformat(self._getval(arg))) - except: - pass + if not arg: + self._print_invalid_arg(arg) + return + self._msg_val_func(arg, pprint.pformat) complete_print = _complete_expression complete_p = _complete_expression complete_pp = _complete_expression def do_list(self, arg): - """l(ist) [first [,last] | .] + """l(ist) [first[, last] | .] List source code for the current file. Without arguments, list 11 lines around the current line or continue the previous @@ -1256,32 +2186,42 @@ class Pdb(bdb.Bdb, cmd.Cmd): self.message('[EOF]') except KeyboardInterrupt: pass + self._validate_file_mtime() do_l = do_list def do_longlist(self, arg): - """longlist | ll + """ll | longlist + List the whole source code for the current function or frame. """ + if arg: + self._print_invalid_arg(arg) + return filename = self.curframe.f_code.co_filename breaklist = self.get_file_breaks(filename) try: - lines, lineno = getsourcelines(self.curframe) + lines, lineno = self._getsourcelines(self.curframe) except OSError as err: self.error(err) return self._print_lines(lines, lineno, breaklist, self.curframe) + self._validate_file_mtime() do_ll = do_longlist def do_source(self, arg): """source expression + Try to get source code for the given object and display it. """ + if not arg: + self._print_invalid_arg(arg) + return try: obj = self._getval(arg) except: return try: - lines, lineno = getsourcelines(obj) + lines, lineno = self._getsourcelines(obj) except (OSError, TypeError) as err: self.error(err) return @@ -1308,26 +2248,24 @@ class Pdb(bdb.Bdb, cmd.Cmd): s += '->' elif lineno == exc_lineno: s += '>>' + if self.colorize: + line = self._colorize_code(line) self.message(s + '\t' + line.rstrip()) def do_whatis(self, arg): - """whatis arg + """whatis expression + Print the type of the argument. """ + if not arg: + self._print_invalid_arg(arg) + return try: value = self._getval(arg) except: # _getval() already printed the error return code = None - # Is it a function? - try: - code = value.__code__ - except Exception: - pass - if code: - self.message('Function %s' % code.co_name) - return # Is it an instance method? try: code = value.__func__.__code__ @@ -1336,6 +2274,14 @@ class Pdb(bdb.Bdb, cmd.Cmd): if code: self.message('Method %s' % code.co_name) return + # Is it a function? + try: + code = value.__code__ + except Exception: + pass + if code: + self.message('Function %s' % code.co_name) + return # Is it a class? if value.__class__ is type: self.message('Class %s.%s' % (value.__module__, value.__qualname__)) @@ -1354,13 +2300,19 @@ class Pdb(bdb.Bdb, cmd.Cmd): Without expression, list all display expressions for the current frame. """ if not arg: - self.message('Currently displaying:') - for item in self.displaying.get(self.curframe, {}).items(): - self.message('%s: %r' % item) + if self.displaying: + self.message('Currently displaying:') + for key, val in self.displaying.get(self.curframe, {}).items(): + self.message('%s: %s' % (key, self._safe_repr(val, key))) + else: + self.message('No expression is being displayed') else: - val = self._getval_except(arg) - self.displaying.setdefault(self.curframe, {})[arg] = val - self.message('display %s: %r' % (arg, val)) + if err := self._compile_error_message(arg): + self.error('Unable to display %s: %r' % (arg, err)) + else: + val = self._getval_except(arg) + self.displaying.setdefault(self.curframe, {})[arg] = val + self.message('display %s: %s' % (arg, self._safe_repr(val, arg))) complete_display = _complete_expression @@ -1389,11 +2341,15 @@ class Pdb(bdb.Bdb, cmd.Cmd): Start an interactive interpreter whose global namespace contains all the (global and local) names found in the current scope. """ - ns = {**self.curframe.f_globals, **self.curframe_locals} - code.interact("*interactive*", local=ns) + ns = {**self.curframe.f_globals, **self.curframe.f_locals} + with self._enable_rlcompleter(ns): + console = _PdbInteractiveConsole(ns, message=self.message) + console.interact(banner="*pdb interact start*", + exitmsg="*exit from pdb interact command*") def do_alias(self, arg): - """alias [name [command [parameter parameter ...] ]] + """alias [name [command]] + Create an alias called 'name' that executes 'command'. The command must *not* be enclosed in quotes. Replaceable parameters can be indicated by %1, %2, and so on, while %* is @@ -1422,17 +2378,34 @@ class Pdb(bdb.Bdb, cmd.Cmd): for alias in keys: self.message("%s = %s" % (alias, self.aliases[alias])) return - if args[0] in self.aliases and len(args) == 1: - self.message("%s = %s" % (args[0], self.aliases[args[0]])) + if len(args) == 1: + if args[0] in self.aliases: + self.message("%s = %s" % (args[0], self.aliases[args[0]])) + else: + self.error(f"Unknown alias '{args[0]}'") else: - self.aliases[args[0]] = ' '.join(args[1:]) + # Do a validation check to make sure no replaceable parameters + # are skipped if %* is not used. + alias = ' '.join(args[1:]) + if '%*' not in alias: + consecutive = True + for idx in range(1, 10): + if f'%{idx}' not in alias: + consecutive = False + if f'%{idx}' in alias and not consecutive: + self.error("Replaceable parameters must be consecutive") + return + self.aliases[args[0]] = alias def do_unalias(self, arg): """unalias name + Delete the specified alias. """ args = arg.split() - if len(args) == 0: return + if len(args) == 0: + self._print_invalid_arg(arg) + return if args[0] in self.aliases: del self.aliases[args[0]] @@ -1441,7 +2414,7 @@ class Pdb(bdb.Bdb, cmd.Cmd): # List of all the commands making the program resume execution. commands_resuming = ['do_continue', 'do_step', 'do_next', 'do_return', - 'do_quit', 'do_jump'] + 'do_until', 'do_quit', 'do_jump'] # Print a traceback starting at the top stack frame. # The most recently entered frame is printed last; @@ -1450,10 +2423,22 @@ class Pdb(bdb.Bdb, cmd.Cmd): # It is also consistent with the up/down commands (which are # compatible with dbx and gdb: up moves towards 'main()' # and down moves towards the most recent stack frame). + # * if count is None, prints the full stack + # * if count = 0, prints the current frame entry + # * if count < 0, prints -count least recent frame entries + # * if count > 0, prints count most recent frame entries - def print_stack_trace(self): + def print_stack_trace(self, count=None): + if count is None: + stack_to_print = self.stack + elif count == 0: + stack_to_print = [self.stack[self.curindex]] + elif count < 0: + stack_to_print = self.stack[:-count] + else: + stack_to_print = self.stack[-count:] try: - for frame_lineno in self.stack: + for frame_lineno in stack_to_print: self.print_stack_entry(frame_lineno) except KeyboardInterrupt: pass @@ -1464,13 +2449,20 @@ class Pdb(bdb.Bdb, cmd.Cmd): prefix = '> ' else: prefix = ' ' - self.message(prefix + - self.format_stack_entry(frame_lineno, prompt_prefix)) + stack_entry = self.format_stack_entry(frame_lineno, prompt_prefix) + if self.colorize: + lines = stack_entry.split(prompt_prefix, 1) + if len(lines) > 1: + # We have some code to display + lines[1] = self._colorize_code(lines[1]) + stack_entry = prompt_prefix.join(lines) + self.message(prefix + stack_entry) # Provide help def do_help(self, arg): """h(elp) + Without argument, print the list of available commands. With a command name as argument, print help about that command. "help pdb" shows the full pdb documentation. @@ -1491,17 +2483,24 @@ class Pdb(bdb.Bdb, cmd.Cmd): self.error('No help for %r; please do not run Python with -OO ' 'if you need command help' % arg) return - self.message(command.__doc__.rstrip()) + if command.__doc__ is None: + self.error('No help for %r; __doc__ string missing' % arg) + return + self.message(self._help_message_from_doc(command.__doc__)) do_h = do_help def help_exec(self): """(!) statement + Execute the (one-line) statement in the context of the current stack frame. The exclamation point can be omitted unless the - first word of the statement resembles a debugger command. To - assign to a global variable you must always prefix the command - with a 'global' command, e.g.: + first word of the statement resembles a debugger command, e.g.: + (Pdb) ! n=42 + (Pdb) + + To assign to a global variable you must always prefix the command with + a 'global' command, e.g.: (Pdb) global list_options; list_options = ['-l'] (Pdb) """ @@ -1517,17 +2516,23 @@ class Pdb(bdb.Bdb, cmd.Cmd): lookupmodule() translates (possibly incomplete) file or module name into an absolute file name. + + filename could be in format of: + * an absolute path like '/path/to/file.py' + * a relative path like 'file.py' or 'dir/file.py' + * a module name like 'module' or 'package.module' + + files and modules will be searched in sys.path. """ - if os.path.isabs(filename) and os.path.exists(filename): - return filename - f = os.path.join(sys.path[0], filename) - if os.path.exists(f) and self.canonic(f) == self.mainpyfile: - return f - root, ext = os.path.splitext(filename) - if ext == '': - filename = filename + '.py' + if not filename.endswith('.py'): + # A module is passed in so convert it to equivalent file + filename = filename.replace('.', os.sep) + '.py' + if os.path.isabs(filename): - return filename + if os.path.exists(filename): + return filename + return None + for dirname in sys.path: while os.path.islink(dirname): dirname = os.readlink(dirname) @@ -1536,49 +2541,87 @@ class Pdb(bdb.Bdb, cmd.Cmd): return fullname return None - def _runmodule(self, module_name): - self._wait_for_mainpyfile = True - self._user_requested_quit = False - import runpy - mod_name, mod_spec, code = runpy._get_module_details(module_name) - self.mainpyfile = self.canonic(code.co_filename) - import __main__ - __main__.__dict__.clear() - __main__.__dict__.update({ - "__name__": "__main__", - "__file__": self.mainpyfile, - "__package__": mod_spec.parent, - "__loader__": mod_spec.loader, - "__spec__": mod_spec, - "__builtins__": __builtins__, - }) - self.run(code) - - def _runscript(self, filename): - # The script has to run in __main__ namespace (or imports from - # __main__ will break). - # - # So we clear up the __main__ and set several special variables - # (this gets rid of pdb's globals and cleans old variables on restarts). - import __main__ - __main__.__dict__.clear() - __main__.__dict__.update({"__name__" : "__main__", - "__file__" : filename, - "__builtins__": __builtins__, - }) - - # When bdb sets tracing, a number of call and line events happens + def _run(self, target: _ExecutableTarget): + # When bdb sets tracing, a number of call and line events happen # BEFORE debugger even reaches user's code (and the exact sequence of - # events depends on python version). So we take special measures to - # avoid stopping before we reach the main script (see user_line and + # events depends on python version). Take special measures to + # avoid stopping before reaching the main script (see user_line and # user_call for details). self._wait_for_mainpyfile = True - self.mainpyfile = self.canonic(filename) self._user_requested_quit = False - with io.open_code(filename) as fp: - statement = "exec(compile(%r, %r, 'exec'))" % \ - (fp.read(), self.mainpyfile) - self.run(statement) + + self.mainpyfile = self.canonic(target.filename) + + # The target has to run in __main__ namespace (or imports from + # __main__ will break). Clear __main__ and replace with + # the target namespace. + import __main__ + __main__.__dict__.clear() + __main__.__dict__.update(target.namespace) + + # Clear the mtime table for program reruns, assume all the files + # are up to date. + self._file_mtime_table.clear() + + self.run(target.code) + + def _format_exc(self, exc: BaseException): + return traceback.format_exception_only(exc)[-1].strip() + + def _compile_error_message(self, expr): + """Return the error message as string if compiling `expr` fails.""" + try: + compile(expr, "", "eval") + except SyntaxError as exc: + return _rstr(self._format_exc(exc)) + return "" + + def _getsourcelines(self, obj): + # GH-103319 + # inspect.getsourcelines() returns lineno = 0 for + # module-level frame which breaks our code print line number + # This method should be replaced by inspect.getsourcelines(obj) + # once this bug is fixed in inspect + lines, lineno = inspect.getsourcelines(obj) + lineno = max(1, lineno) + return lines, lineno + + def _help_message_from_doc(self, doc, usage_only=False): + lines = [line.strip() for line in doc.rstrip().splitlines()] + if not lines: + return "No help message found." + if "" in lines: + usage_end = lines.index("") + else: + usage_end = 1 + formatted = [] + indent = " " * len(self.prompt) + for i, line in enumerate(lines): + if i == 0: + prefix = "Usage: " + elif i < usage_end: + prefix = " " + else: + if usage_only: + break + prefix = "" + formatted.append(indent + prefix + line) + return "\n".join(formatted) + + def _print_invalid_arg(self, arg): + """Return the usage string for a function.""" + + if not arg: + self.error("Argument is required for this command") + else: + self.error(f"Invalid argument: {arg}") + + # Yes it's a bit hacky. Get the caller name, get the method based on + # that name, and get the docstring from that method. + # This should NOT fail if the caller is a method of this class. + doc = inspect.getdoc(getattr(self, sys._getframe(1).f_code.co_name)) + if doc is not None: + self.message(self._help_message_from_doc(doc, usage_only=True)) # Collect all command help into docstring, if not run with -OO @@ -1602,9 +2645,27 @@ if __doc__ is not None: # Simplified interface def run(statement, globals=None, locals=None): + """Execute the *statement* (given as a string or a code object) + under debugger control. + + The debugger prompt appears before any code is executed; you can set + breakpoints and type continue, or you can step through the statement + using step or next. + + The optional *globals* and *locals* arguments specify the + environment in which the code is executed; by default the + dictionary of the module __main__ is used (see the explanation of + the built-in exec() or eval() functions.). + """ Pdb().run(statement, globals, locals) def runeval(expression, globals=None, locals=None): + """Evaluate the *expression* (given as a string or a code object) + under debugger control. + + When runeval() returns, it returns the value of the expression. + Otherwise this function is similar to run(). + """ return Pdb().runeval(expression, globals, locals) def runctx(statement, globals, locals): @@ -1612,32 +2673,853 @@ def runctx(statement, globals, locals): run(statement, globals, locals) def runcall(*args, **kwds): + """Call the function (a function or method object, not a string) + with the given arguments. + + When runcall() returns, it returns whatever the function call + returned. The debugger prompt appears as soon as the function is + entered. + """ return Pdb().runcall(*args, **kwds) -def set_trace(*, header=None): - pdb = Pdb() +def set_trace(*, header=None, commands=None): + """Enter the debugger at the calling stack frame. + + This is useful to hard-code a breakpoint at a given point in a + program, even if the code is not otherwise being debugged (e.g. when + an assertion fails). If given, *header* is printed to the console + just before debugging begins. *commands* is an optional list of + pdb commands to run when the debugger starts. + """ + if Pdb._last_pdb_instance is not None: + pdb = Pdb._last_pdb_instance + else: + pdb = Pdb(mode='inline', backend='monitoring', colorize=True) if header is not None: pdb.message(header) - pdb.set_trace(sys._getframe().f_back) + pdb.set_trace(sys._getframe().f_back, commands=commands) + +async def set_trace_async(*, header=None, commands=None): + """Enter the debugger at the calling stack frame, but in async mode. + + This should be used as await pdb.set_trace_async(). Users can do await + if they enter the debugger with this function. Otherwise it's the same + as set_trace(). + """ + if Pdb._last_pdb_instance is not None: + pdb = Pdb._last_pdb_instance + else: + pdb = Pdb(mode='inline', backend='monitoring', colorize=True) + if header is not None: + pdb.message(header) + await pdb.set_trace_async(sys._getframe().f_back, commands=commands) + +# Remote PDB + +class _PdbServer(Pdb): + def __init__( + self, + sockfile, + signal_server=None, + owns_sockfile=True, + colorize=False, + **kwargs, + ): + self._owns_sockfile = owns_sockfile + self._interact_state = None + self._sockfile = sockfile + self._command_name_cache = [] + self._write_failed = False + if signal_server: + # Only started by the top level _PdbServer, not recursive ones. + self._start_signal_listener(signal_server) + # Override the `colorize` attribute set by the parent constructor, + # because it checks the server's stdout, rather than the client's. + super().__init__(colorize=False, **kwargs) + self.colorize = colorize + + @staticmethod + def protocol_version(): + # By default, assume a client and server are compatible if they run + # the same Python major.minor version. We'll try to keep backwards + # compatibility between patch versions of a minor version if possible. + # If we do need to change the protocol in a patch version, we'll change + # `revision` to the patch version where the protocol changed. + # We can ignore compatibility for pre-release versions; sys.remote_exec + # can't attach to a pre-release version except from that same version. + v = sys.version_info + revision = 0 + return int(f"{v.major:02X}{v.minor:02X}{revision:02X}F0", 16) + + def _ensure_valid_message(self, msg): + # Ensure the message conforms to our protocol. + # If anything needs to be changed here for a patch release of Python, + # the 'revision' in protocol_version() should be updated. + match msg: + case {"message": str(), "type": str()}: + # Have the client show a message. The client chooses how to + # format the message based on its type. The currently defined + # types are "info" and "error". If a message has a type the + # client doesn't recognize, it must be treated as "info". + pass + case {"help": str()}: + # Have the client show the help for a given argument. + pass + case {"prompt": str(), "state": str()}: + # Have the client display the given prompt and wait for a reply + # from the user. If the client recognizes the state it may + # enable mode-specific features like multi-line editing. + # If it doesn't recognize the state it must prompt for a single + # line only and send it directly to the server. A server won't + # progress until it gets a "reply" or "signal" message, but can + # process "complete" requests while waiting for the reply. + pass + case { + "completions": list(completions) + } if all(isinstance(c, str) for c in completions): + # Return valid completions for a client's "complete" request. + pass + case { + "command_list": list(command_list) + } if all(isinstance(c, str) for c in command_list): + # Report the list of legal PDB commands to the client. + # Due to aliases this list is not static, but the client + # needs to know it for multi-line editing. + pass + case _: + raise AssertionError( + f"PDB message doesn't follow the schema! {msg}" + ) + + @classmethod + def _start_signal_listener(cls, address): + def listener(sock): + with closing(sock): + # Check if the interpreter is finalizing every quarter of a second. + # Clean up and exit if so. + sock.settimeout(0.25) + sock.shutdown(socket.SHUT_WR) + while not shut_down.is_set(): + try: + data = sock.recv(1024) + except socket.timeout: + continue + if data == b"": + return # EOF + signal.raise_signal(signal.SIGINT) + + def stop_thread(): + shut_down.set() + thread.join() + + # Use a daemon thread so that we don't detach until after all non-daemon + # threads are done. Use an atexit handler to stop gracefully at that point, + # so that our thread is stopped before the interpreter is torn down. + shut_down = threading.Event() + thread = threading.Thread( + target=listener, + args=[socket.create_connection(address, timeout=5)], + daemon=True, + ) + atexit.register(stop_thread) + thread.start() + + def _send(self, **kwargs): + self._ensure_valid_message(kwargs) + json_payload = json.dumps(kwargs) + try: + self._sockfile.write(json_payload.encode() + b"\n") + self._sockfile.flush() + except (OSError, ValueError): + # We get an OSError if the network connection has dropped, and a + # ValueError if detach() if the sockfile has been closed. We'll + # handle this the next time we try to read from the client instead + # of trying to handle it from everywhere _send() may be called. + # Track this with a flag rather than assuming readline() will ever + # return an empty string because the socket may be half-closed. + self._write_failed = True + + @typing.override + def message(self, msg, end="\n"): + self._send(message=str(msg) + end, type="info") + + @typing.override + def error(self, msg): + self._send(message=str(msg), type="error") + + def _get_input(self, prompt, state) -> str: + # Before displaying a (Pdb) prompt, send the list of PDB commands + # unless we've already sent an up-to-date list. + if state == "pdb" and not self._command_name_cache: + self._command_name_cache = self.completenames("", "", 0, 0) + self._send(command_list=self._command_name_cache) + self._send(prompt=prompt, state=state) + return self._read_reply() + + def _read_reply(self): + # Loop until we get a 'reply' or 'signal' from the client, + # processing out-of-band 'complete' requests as they arrive. + while True: + if self._write_failed: + raise EOFError + + msg = self._sockfile.readline() + if not msg: + raise EOFError + + try: + payload = json.loads(msg) + except json.JSONDecodeError: + self.error(f"Disconnecting: client sent invalid JSON {msg!r}") + raise EOFError + + match payload: + case {"reply": str(reply)}: + return reply + case {"signal": str(signal)}: + if signal == "INT": + raise KeyboardInterrupt + elif signal == "EOF": + raise EOFError + else: + self.error( + f"Received unrecognized signal: {signal}" + ) + # Our best hope of recovering is to pretend we + # got an EOF to exit whatever mode we're in. + raise EOFError + case { + "complete": { + "text": str(text), + "line": str(line), + "begidx": int(begidx), + "endidx": int(endidx), + } + }: + items = self._complete_any(text, line, begidx, endidx) + self._send(completions=items) + continue + # Valid JSON, but doesn't meet the schema. + self.error(f"Ignoring invalid message from client: {msg}") + + def _complete_any(self, text, line, begidx, endidx): + # If we're in 'interact' mode, we need to use the default completer + if self._interact_state: + compfunc = self.completedefault + else: + if begidx == 0: + return self.completenames(text, line, begidx, endidx) + + cmd = self.parseline(line)[0] + if cmd: + compfunc = getattr(self, "complete_" + cmd, self.completedefault) + else: + compfunc = self.completedefault + return compfunc(text, line, begidx, endidx) + + def cmdloop(self, intro=None): + self.preloop() + if intro is not None: + self.intro = intro + if self.intro: + self.message(str(self.intro)) + stop = None + while not stop: + if self._interact_state is not None: + try: + reply = self._get_input(prompt=">>> ", state="interact") + except KeyboardInterrupt: + # Match how KeyboardInterrupt is handled in a REPL + self.message("\nKeyboardInterrupt") + except EOFError: + self.message("\n*exit from pdb interact command*") + self._interact_state = None + else: + self._run_in_python_repl(reply) + continue + + if not self.cmdqueue: + try: + state = "commands" if self.commands_defining else "pdb" + reply = self._get_input(prompt=self.prompt, state=state) + except EOFError: + reply = "EOF" + + self.cmdqueue.append(reply) + + line = self.cmdqueue.pop(0) + line = self.precmd(line) + stop = self.onecmd(line) + stop = self.postcmd(stop, line) + self.postloop() + + def postloop(self): + super().postloop() + if self.quitting: + self.detach() + + def detach(self): + # Detach the debugger and close the socket without raising BdbQuit + self.quitting = False + if self._owns_sockfile: + # Don't try to reuse this instance, it's not valid anymore. + Pdb._last_pdb_instance = None + try: + self._sockfile.close() + except OSError: + # close() can fail if the connection was broken unexpectedly. + pass + + def do_debug(self, arg): + # Clear our cached list of valid commands; the recursive debugger might + # send its own differing list, and so ours needs to be re-sent. + self._command_name_cache = [] + return super().do_debug(arg) + + def do_alias(self, arg): + # Clear our cached list of valid commands; one might be added. + self._command_name_cache = [] + return super().do_alias(arg) + + def do_unalias(self, arg): + # Clear our cached list of valid commands; one might be removed. + self._command_name_cache = [] + return super().do_unalias(arg) + + def do_help(self, arg): + # Tell the client to render the help, since it might need a pager. + self._send(help=arg) + + do_h = do_help + + def _interact_displayhook(self, obj): + # Like the default `sys.displayhook` except sending a socket message. + if obj is not None: + self.message(repr(obj)) + builtins._ = obj + + def _run_in_python_repl(self, lines): + # Run one 'interact' mode code block against an existing namespace. + assert self._interact_state + save_displayhook = sys.displayhook + try: + sys.displayhook = self._interact_displayhook + code_obj = self._interact_state["compiler"](lines + "\n") + if code_obj is None: + raise SyntaxError("Incomplete command") + exec(code_obj, self._interact_state["ns"]) + except: + self._error_exc() + finally: + sys.displayhook = save_displayhook + + def do_interact(self, arg): + # Prepare to run 'interact' mode code blocks, and trigger the client + # to start treating all input as Python commands, not PDB ones. + self.message("*pdb interact start*") + self._interact_state = dict( + compiler=codeop.CommandCompiler(), + ns={**self.curframe.f_globals, **self.curframe.f_locals}, + ) + + @typing.override + def _create_recursive_debugger(self): + return _PdbServer( + self._sockfile, + owns_sockfile=False, + colorize=self.colorize, + ) + + @typing.override + def _prompt_for_confirmation(self, prompt, default): + try: + return self._get_input(prompt=prompt, state="confirm") + except (EOFError, KeyboardInterrupt): + return default + + def do_run(self, arg): + self.error("remote PDB cannot restart the program") + + do_restart = do_run + + def _error_exc(self): + if self._interact_state and isinstance(sys.exception(), SystemExit): + # If we get a SystemExit in 'interact' mode, exit the REPL. + self._interact_state = None + ret = super()._error_exc() + self.message("*exit from pdb interact command*") + return ret + else: + return super()._error_exc() + + def default(self, line): + # Unlike Pdb, don't prompt for more lines of a multi-line command. + # The remote needs to send us the whole block in one go. + try: + candidate = line.removeprefix("!") + "\n" + if codeop.compile_command(candidate, "", "single") is None: + raise SyntaxError("Incomplete command") + return super().default(candidate) + except: + self._error_exc() + + +class _PdbClient: + def __init__(self, pid, server_socket, interrupt_sock): + self.pid = pid + self.read_buf = b"" + self.signal_read = None + self.signal_write = None + self.sigint_received = False + self.raise_on_sigint = False + self.server_socket = server_socket + self.interrupt_sock = interrupt_sock + self.pdb_instance = Pdb() + self.pdb_commands = set() + self.completion_matches = [] + self.state = "dumb" + self.write_failed = False + self.multiline_block = False + + def _ensure_valid_message(self, msg): + # Ensure the message conforms to our protocol. + # If anything needs to be changed here for a patch release of Python, + # the 'revision' in protocol_version() should be updated. + match msg: + case {"reply": str()}: + # Send input typed by a user at a prompt to the remote PDB. + pass + case {"signal": "EOF"}: + # Tell the remote PDB that the user pressed ^D at a prompt. + pass + case {"signal": "INT"}: + # Tell the remote PDB that the user pressed ^C at a prompt. + pass + case { + "complete": { + "text": str(), + "line": str(), + "begidx": int(), + "endidx": int(), + } + }: + # Ask the remote PDB what completions are valid for the given + # parameters, using readline's completion protocol. + pass + case _: + raise AssertionError( + f"PDB message doesn't follow the schema! {msg}" + ) + + def _send(self, **kwargs): + self._ensure_valid_message(kwargs) + json_payload = json.dumps(kwargs) + try: + self.server_socket.sendall(json_payload.encode() + b"\n") + except OSError: + # This means that the client has abruptly disconnected, but we'll + # handle that the next time we try to read from the client instead + # of trying to handle it from everywhere _send() may be called. + # Track this with a flag rather than assuming readline() will ever + # return an empty string because the socket may be half-closed. + self.write_failed = True + + def _readline(self): + if self.sigint_received: + # There's a pending unhandled SIGINT. Handle it now. + self.sigint_received = False + raise KeyboardInterrupt + + # Wait for either a SIGINT or a line or EOF from the PDB server. + selector = selectors.DefaultSelector() + selector.register(self.signal_read, selectors.EVENT_READ) + selector.register(self.server_socket, selectors.EVENT_READ) + + while b"\n" not in self.read_buf: + for key, _ in selector.select(): + if key.fileobj == self.signal_read: + self.signal_read.recv(1024) + if self.sigint_received: + # If not, we're reading wakeup events for sigints that + # we've previously handled, and can ignore them. + self.sigint_received = False + raise KeyboardInterrupt + elif key.fileobj == self.server_socket: + data = self.server_socket.recv(16 * 1024) + self.read_buf += data + if not data and b"\n" not in self.read_buf: + # EOF without a full final line. Drop the partial line. + self.read_buf = b"" + return b"" + + ret, sep, self.read_buf = self.read_buf.partition(b"\n") + return ret + sep + + def read_input(self, prompt, multiline_block): + self.multiline_block = multiline_block + with self._sigint_raises_keyboard_interrupt(): + return input(prompt) + + def read_command(self, prompt): + reply = self.read_input(prompt, multiline_block=False) + if self.state == "dumb": + # No logic applied whatsoever, just pass the raw reply back. + return reply + + prefix = "" + if self.state == "pdb": + # PDB command entry mode + cmd = self.pdb_instance.parseline(reply)[0] + if cmd in self.pdb_commands or reply.strip() == "": + # Recognized PDB command, or blank line repeating last command + return reply + + # Otherwise, explicit or implicit exec command + if reply.startswith("!"): + prefix = "!" + reply = reply.removeprefix(prefix).lstrip() + + if codeop.compile_command(reply + "\n", "", "single") is not None: + # Valid single-line statement + return prefix + reply + + # Otherwise, valid first line of a multi-line statement + more_prompt = "...".ljust(len(prompt)) + while codeop.compile_command(reply, "", "single") is None: + reply += "\n" + self.read_input(more_prompt, multiline_block=True) + + return prefix + reply + + @contextmanager + def readline_completion(self, completer): + try: + import readline + except ImportError: + yield + return + + old_completer = readline.get_completer() + try: + readline.set_completer(completer) + if readline.backend == "editline": + # libedit uses "^I" instead of "tab" + command_string = "bind ^I rl_complete" + else: + command_string = "tab: complete" + readline.parse_and_bind(command_string) + yield + finally: + readline.set_completer(old_completer) + + @contextmanager + def _sigint_handler(self): + # Signal handling strategy: + # - When we call input() we want a SIGINT to raise KeyboardInterrupt + # - Otherwise we want to write to the wakeup FD and set a flag. + # We'll break out of select() when the wakeup FD is written to, + # and we'll check the flag whenever we're about to accept input. + def handler(signum, frame): + self.sigint_received = True + if self.raise_on_sigint: + # One-shot; don't raise again until the flag is set again. + self.raise_on_sigint = False + self.sigint_received = False + raise KeyboardInterrupt + + sentinel = object() + old_handler = sentinel + old_wakeup_fd = sentinel + + self.signal_read, self.signal_write = socket.socketpair() + with (closing(self.signal_read), closing(self.signal_write)): + self.signal_read.setblocking(False) + self.signal_write.setblocking(False) + + try: + old_handler = signal.signal(signal.SIGINT, handler) + + try: + old_wakeup_fd = signal.set_wakeup_fd( + self.signal_write.fileno(), + warn_on_full_buffer=False, + ) + yield + finally: + # Restore the old wakeup fd if we installed a new one + if old_wakeup_fd is not sentinel: + signal.set_wakeup_fd(old_wakeup_fd) + finally: + self.signal_read = self.signal_write = None + if old_handler is not sentinel: + # Restore the old handler if we installed a new one + signal.signal(signal.SIGINT, old_handler) + + @contextmanager + def _sigint_raises_keyboard_interrupt(self): + if self.sigint_received: + # There's a pending unhandled SIGINT. Handle it now. + self.sigint_received = False + raise KeyboardInterrupt + + try: + self.raise_on_sigint = True + yield + finally: + self.raise_on_sigint = False + + def cmdloop(self): + with ( + self._sigint_handler(), + self.readline_completion(self.complete), + ): + while not self.write_failed: + try: + if not (payload_bytes := self._readline()): + break + except KeyboardInterrupt: + self.send_interrupt() + continue + + try: + payload = json.loads(payload_bytes) + except json.JSONDecodeError: + print( + f"*** Invalid JSON from remote: {payload_bytes!r}", + flush=True, + ) + continue + + self.process_payload(payload) + + def send_interrupt(self): + if self.interrupt_sock is not None: + # Write to a socket that the PDB server listens on. This triggers + # the remote to raise a SIGINT for itself. We do this because + # Windows doesn't allow triggering SIGINT remotely. + # See https://stackoverflow.com/a/35792192 for many more details. + self.interrupt_sock.sendall(signal.SIGINT.to_bytes()) + else: + # On Unix we can just send a SIGINT to the remote process. + # This is preferable to using the signal thread approach that we + # use on Windows because it can interrupt IO in the main thread. + os.kill(self.pid, signal.SIGINT) + + def process_payload(self, payload): + match payload: + case { + "command_list": command_list + } if all(isinstance(c, str) for c in command_list): + self.pdb_commands = set(command_list) + case {"message": str(msg), "type": str(msg_type)}: + if msg_type == "error": + print("***", msg, flush=True) + else: + print(msg, end="", flush=True) + case {"help": str(arg)}: + self.pdb_instance.do_help(arg) + case {"prompt": str(prompt), "state": str(state)}: + if state not in ("pdb", "interact"): + state = "dumb" + self.state = state + self.prompt_for_reply(prompt) + case _: + raise RuntimeError(f"Unrecognized payload {payload}") + + def prompt_for_reply(self, prompt): + while True: + try: + payload = {"reply": self.read_command(prompt)} + except EOFError: + payload = {"signal": "EOF"} + except KeyboardInterrupt: + payload = {"signal": "INT"} + except Exception as exc: + msg = traceback.format_exception_only(exc)[-1].strip() + print("***", msg, flush=True) + continue + + self._send(**payload) + return + + def complete(self, text, state): + import readline + + if state == 0: + self.completion_matches = [] + if self.state not in ("pdb", "interact"): + return None + + origline = readline.get_line_buffer() + line = origline.lstrip() + if self.multiline_block: + # We're completing a line contained in a multi-line block. + # Force the remote to treat it as a Python expression. + line = "! " + line + offset = len(origline) - len(line) + begidx = readline.get_begidx() - offset + endidx = readline.get_endidx() - offset + + msg = { + "complete": { + "text": text, + "line": line, + "begidx": begidx, + "endidx": endidx, + } + } + + self._send(**msg) + if self.write_failed: + return None + + payload = self._readline() + if not payload: + return None + + payload = json.loads(payload) + if "completions" not in payload: + raise RuntimeError( + f"Failed to get valid completions. Got: {payload}" + ) + + self.completion_matches = payload["completions"] + try: + return self.completion_matches[state] + except IndexError: + return None + + +def _connect( + *, + host, + port, + frame, + commands, + version, + signal_raising_thread, + colorize, +): + with closing(socket.create_connection((host, port))) as conn: + sockfile = conn.makefile("rwb") + + # The client requests this thread on Windows but not on Unix. + # Most tests don't request this thread, to keep them simpler. + if signal_raising_thread: + signal_server = (host, port) + else: + signal_server = None + + remote_pdb = _PdbServer( + sockfile, + signal_server=signal_server, + colorize=colorize, + ) + weakref.finalize(remote_pdb, sockfile.close) + + if Pdb._last_pdb_instance is not None: + remote_pdb.error("Another PDB instance is already attached.") + elif version != remote_pdb.protocol_version(): + target_ver = f"0x{remote_pdb.protocol_version():08X}" + attach_ver = f"0x{version:08X}" + remote_pdb.error( + f"The target process is running a Python version that is" + f" incompatible with this PDB module." + f"\nTarget process pdb protocol version: {target_ver}" + f"\nLocal pdb module's protocol version: {attach_ver}" + ) + else: + remote_pdb.rcLines.extend(commands.splitlines()) + remote_pdb.set_trace(frame=frame) + + +def attach(pid, commands=()): + """Attach to a running process with the given PID.""" + with ExitStack() as stack: + server = stack.enter_context( + closing(socket.create_server(("localhost", 0))) + ) + port = server.getsockname()[1] + + connect_script = stack.enter_context( + tempfile.NamedTemporaryFile("w", delete_on_close=False) + ) + + use_signal_thread = sys.platform == "win32" + colorize = _colorize.can_colorize() + + connect_script.write( + textwrap.dedent( + f""" + import pdb, sys + pdb._connect( + host="localhost", + port={port}, + frame=sys._getframe(1), + commands={json.dumps("\n".join(commands))}, + version={_PdbServer.protocol_version()}, + signal_raising_thread={use_signal_thread!r}, + colorize={colorize!r}, + ) + """ + ) + ) + connect_script.close() + orig_mode = os.stat(connect_script.name).st_mode + os.chmod(connect_script.name, orig_mode | stat.S_IROTH | stat.S_IRGRP) + sys.remote_exec(pid, connect_script.name) + + # TODO Add a timeout? Or don't bother since the user can ^C? + client_sock, _ = server.accept() + stack.enter_context(closing(client_sock)) + + if use_signal_thread: + interrupt_sock, _ = server.accept() + stack.enter_context(closing(interrupt_sock)) + interrupt_sock.setblocking(False) + else: + interrupt_sock = None + + _PdbClient(pid, client_sock, interrupt_sock).cmdloop() + # Post-Mortem interface def post_mortem(t=None): + """Enter post-mortem debugging of the given *traceback*, or *exception* + object. + + If no traceback is given, it uses the one of the exception that is + currently being handled (an exception must be being handled if the + default is to be used). + + If `t` is an exception object, the `exceptions` command makes it possible to + list and inspect its chained exceptions (if any). + """ + return _post_mortem(t, Pdb()) + + +def _post_mortem(t, pdb_instance): + """ + Private version of post_mortem, which allow to pass a pdb instance + for testing purposes. + """ # handling the default if t is None: - # sys.exc_info() returns (type, value, traceback) if an exception is - # being handled, otherwise it returns None - t = sys.exc_info()[2] - if t is None: + exc = sys.exception() + if exc is not None: + t = exc.__traceback__ + + if t is None or (isinstance(t, BaseException) and t.__traceback__ is None): raise ValueError("A valid traceback must be passed if no " "exception is being handled") - p = Pdb() - p.reset() - p.interaction(None, t) + pdb_instance.reset() + pdb_instance.interaction(None, t) + def pm(): - post_mortem(sys.last_traceback) + """Enter post-mortem debugging of the traceback found in sys.last_exc.""" + post_mortem(sys.last_exc) # Main program for testing @@ -1653,11 +3535,10 @@ def help(): pydoc.pager(__doc__) _usage = """\ -usage: pdb.py [-c command] ... [-m module | pyfile] [arg] ... - Debug the Python program given by pyfile. Alternatively, an executable module or package to debug can be specified using -the -m switch. +the -m switch. You can also attach to a running Python process +using the -p option with its PID. Initial commands are read from .pdbrc files in your home directory and in the current directory, if they exist. Commands supplied with @@ -1667,70 +3548,132 @@ To let the script run until an exception occurs, use "-c continue". To let the script run up to a given line X in the debugged file, use "-c 'until X'".""" -def main(): - import getopt - opts, args = getopt.getopt(sys.argv[1:], 'mhc:', ['help', 'command=']) +def exit_with_permission_help_text(): + """ + Prints a message pointing to platform-specific permission help text and exits the program. + This function is called when a PermissionError is encountered while trying + to attach to a process. + """ + print( + "Error: The specified process cannot be attached to due to insufficient permissions.\n" + "See the Python documentation for details on required privileges and troubleshooting:\n" + "https://docs.python.org/3.14/howto/remote_debugging.html#permission-requirements\n" + ) + sys.exit(1) + + +def parse_args(): + # We want pdb to be as intuitive as possible to users, so we need to do some + # heuristic parsing to deal with ambiguity. + # For example: + # "python -m pdb -m foo -p 1" should pass "-p 1" to "foo". + # "python -m pdb foo.py -m bar" should pass "-m bar" to "foo.py". + # "python -m pdb -m foo -m bar" should pass "-m bar" to "foo". + # This require some customized parsing logic to find the actual debug target. + + import argparse + + parser = argparse.ArgumentParser( + usage="%(prog)s [-h] [-c command] (-m module | -p pid | pyfile) [args ...]", + description=_usage, + formatter_class=argparse.RawDescriptionHelpFormatter, + allow_abbrev=False, + color=True, + ) + + # Get all the commands out first. For backwards compatibility, we allow + # -c commands to be after the target. + parser.add_argument('-c', '--command', action='append', default=[], metavar='command', dest='commands', + help='pdb commands to execute as if given in a .pdbrc file') + + opts, args = parser.parse_known_args() if not args: - print(_usage) + # If no arguments were given (python -m pdb), print the whole help message. + # Without this check, argparse would only complain about missing required arguments. + # We need to add the arguments definitions here to get a proper help message. + parser.add_argument('-m', metavar='module', dest='module') + parser.add_argument('-p', '--pid', type=int, help="attach to the specified PID", default=None) + parser.print_help() sys.exit(2) + elif args[0] == '-p' or args[0] == '--pid': + # Attach to a pid + parser.add_argument('-p', '--pid', type=int, help="attach to the specified PID", default=None) + opts, args = parser.parse_known_args() + if args: + # For --pid, any extra arguments are invalid. + parser.error(f"unrecognized arguments: {' '.join(args)}") + elif args[0] == '-m': + # Debug a module, we only need the first -m module argument. + # The rest is passed to the module itself. + parser.add_argument('-m', metavar='module', dest='module') + opt_module = parser.parse_args(args[:2]) + opts.module = opt_module.module + args = args[2:] + elif args[0] == '--': + args.pop(0) + if not args: + parser.error("missing script or module to run") + elif args[0].startswith('-'): + # Invalid argument before the script name. + invalid_args = list(itertools.takewhile(lambda a: a.startswith('-'), args)) + parser.error(f"unrecognized arguments: {' '.join(invalid_args)}") - commands = [] - run_as_module = False - for opt, optarg in opts: - if opt in ['-h', '--help']: - print(_usage) - sys.exit() - elif opt in ['-c', '--command']: - commands.append(optarg) - elif opt in ['-m']: - run_as_module = True + # Otherwise it's debugging a script and we already parsed all -c commands. - mainpyfile = args[0] # Get script filename - if not run_as_module and not os.path.exists(mainpyfile): - print('Error:', mainpyfile, 'does not exist') - sys.exit(1) + return opts, args - sys.argv[:] = args # Hide "pdb.py" and pdb options from argument list +def main(): + opts, args = parse_args() - # Replace pdb's dir with script's dir in front of module search path. - if not run_as_module: - sys.path[0] = os.path.dirname(mainpyfile) + if getattr(opts, 'pid', None) is not None: + try: + attach(opts.pid, opts.commands) + except PermissionError as e: + exit_with_permission_help_text() + return + elif getattr(opts, 'module', None) is not None: + file = opts.module + target = _ModuleTarget(file) + else: + file = args.pop(0) + if file.endswith('.pyz'): + target = _ZipTarget(file) + else: + target = _ScriptTarget(file) + + sys.argv[:] = [file] + args # Hide "pdb.py" and pdb options from argument list # Note on saving/restoring sys.argv: it's a good idea when sys.argv was # modified by the script being debugged. It's a bad idea when it was # changed by the user from the command line. There is a "restart" command # which allows explicit specification of command line arguments. - pdb = Pdb() - pdb.rcLines.extend(commands) + pdb = Pdb(mode='cli', backend='monitoring', colorize=True) + pdb.rcLines.extend(opts.commands) while True: try: - if run_as_module: - pdb._runmodule(mainpyfile) - else: - pdb._runscript(mainpyfile) - if pdb._user_requested_quit: - break - print("The program finished and will be restarted") + pdb._run(target) except Restart: - print("Restarting", mainpyfile, "with arguments:") - print("\t" + " ".join(args)) - except SystemExit: + print("Restarting", target, "with arguments:") + print("\t" + " ".join(sys.argv[1:])) + except SystemExit as e: # In most cases SystemExit does not warrant a post-mortem session. print("The program exited via sys.exit(). Exit status:", end=' ') - print(sys.exc_info()[1]) - except SyntaxError: - traceback.print_exc() - sys.exit(1) - except: - traceback.print_exc() + print(e) + except BaseException as e: + traceback.print_exception(e, colorize=_colorize.can_colorize()) print("Uncaught exception. Entering post mortem debugging") print("Running 'cont' or 'step' will restart the program") - t = sys.exc_info()[2] - pdb.interaction(None, t) - print("Post mortem debugger finished. The " + mainpyfile + - " will be restarted") + try: + pdb.interaction(None, e) + except Restart: + print("Restarting", target, "with arguments:") + print("\t" + " ".join(sys.argv[1:])) + continue + if pdb._user_requested_quit: + break + print("The program finished and will be restarted") # When invoked as main program, invoke the debugger on a script diff --git a/Lib/test/test_pdb.py b/Lib/test/test_pdb.py new file mode 100644 index 000000000..8b2806781 --- /dev/null +++ b/Lib/test/test_pdb.py @@ -0,0 +1,5179 @@ +# A test suite for pdb; not very comprehensive at the moment. + +import _colorize +import doctest +import gc +import io +import os +import pdb +import sys +import types +import codecs +import unittest +import subprocess +import textwrap +import linecache +import zipapp +import zipfile + +from asyncio.events import _set_event_loop_policy +from contextlib import ExitStack, redirect_stdout +from io import StringIO +from test import support +from test.support import has_socket_support, os_helper +from test.support.import_helper import import_module +from test.support.pty_helper import run_pty, FakeInput +from test.support.script_helper import kill_python +from unittest.mock import patch + +SKIP_CORO_TESTS = False + + +class PdbTestInput(object): + """Context manager that makes testing Pdb in doctests easier.""" + + def __init__(self, input): + self.input = input + + def __enter__(self): + self.real_stdin = sys.stdin + sys.stdin = FakeInput(self.input) + self.orig_trace = sys.gettrace() if hasattr(sys, 'gettrace') else None + + def __exit__(self, *exc): + sys.stdin = self.real_stdin + if self.orig_trace: + sys.settrace(self.orig_trace) + + +def test_pdb_displayhook(): + """This tests the custom displayhook for pdb. + + >>> def test_function(foo, bar): + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + + >>> with PdbTestInput([ + ... 'foo', + ... 'bar', + ... 'for i in range(5): print(i)', + ... 'continue', + ... ]): + ... test_function(1, None) + > (2)test_function() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) foo + 1 + (Pdb) bar + (Pdb) for i in range(5): print(i) + 0 + 1 + 2 + 3 + 4 + (Pdb) continue + """ + + +def test_pdb_basic_commands(): + """Test the basic commands of pdb. + + >>> def test_function_2(foo, bar='default'): + ... print(foo) + ... for i in range(5): + ... print(i) + ... print(bar) + ... for i in range(10): + ... never_executed + ... print('after for') + ... print('...') + ... return foo.upper() + + >>> def test_function3(arg=None, *, kwonly=None): + ... pass + + >>> def test_function4(a, b, c, /): + ... pass + + >>> def test_function(): + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + ... ret = test_function_2('baz') + ... test_function3(kwonly=True) + ... test_function4(1, 2, 3) + ... print(ret) + + >>> with PdbTestInput([ # TODO: RUSTPYTHON; hangs # doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE +SKIP + ... 'step', # go to line ret = test_function_2('baz') + ... 'step', # entering the function call + ... 'args', # display function args + ... 'list', # list function source + ... 'bt', # display backtrace + ... 'up', # step up to test_function() + ... 'down', # step down to test_function_2() again + ... 'next', # stepping to print(foo) + ... 'next', # stepping to the for loop + ... 'step', # stepping into the for loop + ... 'until', # continuing until out of the for loop + ... 'next', # executing the print(bar) + ... 'jump 8', # jump over second for loop + ... 'return', # return out of function + ... 'retval', # display return value + ... 'next', # step to test_function3() + ... 'step', # stepping into test_function3() + ... 'args', # display function args + ... 'return', # return out of function + ... 'next', # step to test_function4() + ... 'step', # stepping to test_function4() + ... 'args', # display function args + ... 'continue', + ... ]): + ... test_function() + > (2)test_function() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) step + > (3)test_function() + -> ret = test_function_2('baz') + (Pdb) step + --Call-- + > (1)test_function_2() + -> def test_function_2(foo, bar='default'): + (Pdb) args + foo = 'baz' + bar = 'default' + (Pdb) list + 1 -> def test_function_2(foo, bar='default'): + 2 print(foo) + 3 for i in range(5): + 4 print(i) + 5 print(bar) + 6 for i in range(10): + 7 never_executed + 8 print('after for') + 9 print('...') + 10 return foo.upper() + [EOF] + (Pdb) bt + ... + (26)() + -> test_function() + (3)test_function() + -> ret = test_function_2('baz') + > (1)test_function_2() + -> def test_function_2(foo, bar='default'): + (Pdb) up + > (3)test_function() + -> ret = test_function_2('baz') + (Pdb) down + > (1)test_function_2() + -> def test_function_2(foo, bar='default'): + (Pdb) next + > (2)test_function_2() + -> print(foo) + (Pdb) next + baz + > (3)test_function_2() + -> for i in range(5): + (Pdb) step + > (4)test_function_2() + -> print(i) + (Pdb) until + 0 + 1 + 2 + 3 + 4 + > (5)test_function_2() + -> print(bar) + (Pdb) next + default + > (6)test_function_2() + -> for i in range(10): + (Pdb) jump 8 + > (8)test_function_2() + -> print('after for') + (Pdb) return + after for + ... + --Return-- + > (10)test_function_2()->'BAZ' + -> return foo.upper() + (Pdb) retval + 'BAZ' + (Pdb) next + > (4)test_function() + -> test_function3(kwonly=True) + (Pdb) step + --Call-- + > (1)test_function3() + -> def test_function3(arg=None, *, kwonly=None): + (Pdb) args + arg = None + kwonly = True + (Pdb) return + --Return-- + > (2)test_function3()->None + -> pass + (Pdb) next + > (5)test_function() + -> test_function4(1, 2, 3) + (Pdb) step + --Call-- + > (1)test_function4() + -> def test_function4(a, b, c, /): + (Pdb) args + a = 1 + b = 2 + c = 3 + (Pdb) continue + BAZ + """ + +def test_pdb_breakpoint_commands(): + """Test basic commands related to breakpoints. + + >>> def test_function(): + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + ... print(1) + ... print(2) + ... print(3) + ... print(4) + + Now test the breakpoint commands. NORMALIZE_WHITESPACE is needed because + the breakpoint list outputs a tab for the "stop only" and "ignore next" + lines, which we don't want to put in here. + + >>> with PdbTestInput([ # TODO: RUSTPYTHON # doctest: +NORMALIZE_WHITESPACE +SKIP + ... 'break 3', + ... 'break 4, +', + ... 'disable 1', + ... 'ignore 1 10', + ... 'condition 1 1 < 2', + ... 'condition 1 1 <', + ... 'break 4', + ... 'break 4', + ... 'break', + ... 'clear 3', + ... 'break', + ... 'condition 1', + ... 'commands 1', + ... 'EOF', # Simulate Ctrl-D/Ctrl-Z from user, should end input + ... 'enable 1', + ... 'clear 1', + ... 'commands 2', + ... 'p "42"', + ... 'print("42", 7*6)', # Issue 18764 (not about breakpoints) + ... 'end', + ... 'continue', # will stop at breakpoint 2 (line 4) + ... 'clear', # clear all! + ... 'y', + ... 'tbreak 5', + ... 'continue', # will stop at temporary breakpoint + ... 'break', # make sure breakpoint is gone + ... 'commands 10', # out of range + ... 'commands a', # display help + ... 'commands 4', # already deleted + ... 'break 6, undefined', # condition causing `NameError` during evaluation + ... 'continue', # will stop, ignoring runtime error + ... 'continue', + ... ]): + ... test_function() + > (2)test_function() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) break 3 + Breakpoint 1 at :3 + (Pdb) break 4, + + *** Invalid condition +: SyntaxError: invalid syntax + (Pdb) disable 1 + Disabled breakpoint 1 at :3 + (Pdb) ignore 1 10 + Will ignore next 10 crossings of breakpoint 1. + (Pdb) condition 1 1 < 2 + New condition set for breakpoint 1. + (Pdb) condition 1 1 < + *** Invalid condition 1 <: SyntaxError: invalid syntax + (Pdb) break 4 + Breakpoint 2 at :4 + (Pdb) break 4 + Breakpoint 3 at :4 + (Pdb) break + Num Type Disp Enb Where + 1 breakpoint keep no at :3 + stop only if 1 < 2 + ignore next 10 hits + 2 breakpoint keep yes at :4 + 3 breakpoint keep yes at :4 + (Pdb) clear 3 + Deleted breakpoint 3 at :4 + (Pdb) break + Num Type Disp Enb Where + 1 breakpoint keep no at :3 + stop only if 1 < 2 + ignore next 10 hits + 2 breakpoint keep yes at :4 + (Pdb) condition 1 + Breakpoint 1 is now unconditional. + (Pdb) commands 1 + (com) EOF + + (Pdb) enable 1 + Enabled breakpoint 1 at :3 + (Pdb) clear 1 + Deleted breakpoint 1 at :3 + (Pdb) commands 2 + (com) p "42" + (com) print("42", 7*6) + (com) end + (Pdb) continue + 1 + '42' + 42 42 + > (4)test_function() + -> print(2) + (Pdb) clear + Clear all breaks? y + Deleted breakpoint 2 at :4 + (Pdb) tbreak 5 + Breakpoint 4 at :5 + (Pdb) continue + 2 + Deleted breakpoint 4 at :5 + > (5)test_function() + -> print(3) + (Pdb) break + (Pdb) commands 10 + *** cannot set commands: Breakpoint number 10 out of range + (Pdb) commands a + *** Invalid argument: a + Usage: (Pdb) commands [bpnumber] + (com) ... + (com) end + (Pdb) + (Pdb) commands 4 + *** cannot set commands: Breakpoint 4 already deleted + (Pdb) break 6, undefined + Breakpoint 5 at :6 + (Pdb) continue + 3 + > (6)test_function() + -> print(4) + (Pdb) continue + 4 + """ + +def test_pdb_breakpoint_ignore_and_condition(): + """ + >>> def test_function(): + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + ... for i in range(5): + ... print(i) + + >>> with PdbTestInput([ # doctest: +NORMALIZE_WHITESPACE + ... 'break 4', + ... 'ignore 1 2', # ignore once + ... 'continue', + ... 'condition 1 i == 4', + ... 'continue', + ... 'clear 1', + ... 'continue', + ... ]): + ... test_function() + > (2)test_function() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) break 4 + Breakpoint 1 at :4 + (Pdb) ignore 1 2 + Will ignore next 2 crossings of breakpoint 1. + (Pdb) continue + 0 + 1 + > (4)test_function() + -> print(i) + (Pdb) condition 1 i == 4 + New condition set for breakpoint 1. + (Pdb) continue + 2 + 3 + > (4)test_function() + -> print(i) + (Pdb) clear 1 + Deleted breakpoint 1 at :4 + (Pdb) continue + 4 + """ + +def test_pdb_breakpoint_on_annotated_function_def(): + """Test breakpoints on function definitions with annotation. + + >>> def foo[T](): + ... return 0 + + >>> def bar() -> int: + ... return 0 + + >>> def foobar[T]() -> int: + ... return 0 + + >>> def test_function(): + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + ... pass + + >>> with PdbTestInput([ # TODO: RUSTPYTHON # doctest: +NORMALIZE_WHITESPACE +SKIP + ... 'break foo', + ... 'break bar', + ... 'break foobar', + ... 'continue', + ... ]): + ... test_function() + > (2)test_function() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) break foo + Breakpoint 1 at :2 + (Pdb) break bar + Breakpoint 2 at :2 + (Pdb) break foobar + Breakpoint 3 at :2 + (Pdb) continue + """ + +def test_pdb_commands(): + """Test the commands command of pdb. + + >>> def test_function(): + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + ... print(1) + ... print(2) + ... print(3) + + >>> with PdbTestInput([ # TODO: RUSTPYTHON # doctest: +NORMALIZE_WHITESPACE +SKIP + ... 'b 3', + ... 'commands', + ... 'silent', # suppress the frame status output + ... 'p "hello"', + ... 'end', + ... 'b 4', + ... 'commands', + ... 'until 5', # no output, should stop at line 5 + ... 'continue', # hit breakpoint at line 3 + ... '', # repeat continue, hit breakpoint at line 4 then `until` to line 5 + ... '', + ... ]): + ... test_function() + > (2)test_function() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) b 3 + Breakpoint 1 at :3 + (Pdb) commands + (com) silent + (com) p "hello" + (com) end + (Pdb) b 4 + Breakpoint 2 at :4 + (Pdb) commands + (com) until 5 + (Pdb) continue + 'hello' + (Pdb) + 1 + 2 + > (5)test_function() + -> print(3) + (Pdb) + 3 + """ + +def test_pdb_breakpoint_with_filename(): + """Breakpoints with filename:lineno + + >>> def test_function(): + ... # inspect_fodder2 is a great module as the line number is stable + ... from test.test_inspect import inspect_fodder2 as mod2 + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + ... mod2.func88() + ... mod2.func114() + + >>> with PdbTestInput([ # TODO: RUSTPYTHON # doctest: +NORMALIZE_WHITESPACE +ELLIPSIS +SKIP + ... 'break test.test_inspect.inspect_fodder2:90', + ... 'continue', # will stop at func88 + ... 'break test/test_inspect/inspect_fodder2.py:115', + ... 'continue', # will stop at func114 + ... 'continue', + ... ]): + ... test_function() + > (4)test_function() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) break test.test_inspect.inspect_fodder2:90 + Breakpoint 1 at ...inspect_fodder2.py:90 + (Pdb) continue + > ...inspect_fodder2.py(90)func88() + -> return 90 + (Pdb) break test/test_inspect/inspect_fodder2.py:115 + Breakpoint 2 at ...inspect_fodder2.py:115 + (Pdb) continue + > ...inspect_fodder2.py(115)func114() + -> return 115 + (Pdb) continue + """ + +def test_pdb_breakpoint_on_disabled_line(): + """New breakpoint on once disabled line should work + + >>> def test_function(): + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + ... for i in range(3): + ... j = i * 2 + ... print(j) + + >>> with PdbTestInput([ # doctest: +NORMALIZE_WHITESPACE + ... 'break 5', + ... 'c', + ... 'clear 1', + ... 'break 4', + ... 'c', + ... 'clear 2', + ... 'c' + ... ]): + ... test_function() + > (2)test_function() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) break 5 + Breakpoint 1 at :5 + (Pdb) c + > (5)test_function() + -> print(j) + (Pdb) clear 1 + Deleted breakpoint 1 at :5 + (Pdb) break 4 + Breakpoint 2 at :4 + (Pdb) c + 0 + > (4)test_function() + -> j = i * 2 + (Pdb) clear 2 + Deleted breakpoint 2 at :4 + (Pdb) c + 2 + 4 + """ + +def test_pdb_breakpoints_preserved_across_interactive_sessions(): + """Breakpoints are remembered between interactive sessions + + >>> with PdbTestInput([ # doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE + ... 'import test.test_pdb', + ... 'break test.test_pdb.do_something', + ... 'break test.test_pdb.do_nothing', + ... 'break', + ... 'continue', + ... ]): + ... pdb.run('print()') + > (1)()... + (Pdb) import test.test_pdb + (Pdb) break test.test_pdb.do_something + Breakpoint 1 at ...test_pdb.py:... + (Pdb) break test.test_pdb.do_nothing + Breakpoint 2 at ...test_pdb.py:... + (Pdb) break + Num Type Disp Enb Where + 1 breakpoint keep yes at ...test_pdb.py:... + 2 breakpoint keep yes at ...test_pdb.py:... + (Pdb) continue + + >>> with PdbTestInput([ # TODO: RUSTPYTHON # doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE +SKIP + ... 'break', + ... 'break pdb.find_function', + ... 'break', + ... 'clear 1', + ... 'continue', + ... ]): + ... pdb.run('print()') + > (1)()... + (Pdb) break + Num Type Disp Enb Where + 1 breakpoint keep yes at ...test_pdb.py:... + 2 breakpoint keep yes at ...test_pdb.py:... + (Pdb) break pdb.find_function + Breakpoint 3 at ...pdb.py:... + (Pdb) break + Num Type Disp Enb Where + 1 breakpoint keep yes at ...test_pdb.py:... + 2 breakpoint keep yes at ...test_pdb.py:... + 3 breakpoint keep yes at ...pdb.py:... + (Pdb) clear 1 + Deleted breakpoint 1 at ...test_pdb.py:... + (Pdb) continue + + >>> with PdbTestInput([ # TODO: RUSTPYTHON # doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE +SKIP + ... 'break', + ... 'clear 2', + ... 'clear 3', + ... 'continue', + ... ]): + ... pdb.run('print()') + > (1)()... + (Pdb) break + Num Type Disp Enb Where + 2 breakpoint keep yes at ...test_pdb.py:... + 3 breakpoint keep yes at ...pdb.py:... + (Pdb) clear 2 + Deleted breakpoint 2 at ...test_pdb.py:... + (Pdb) clear 3 + Deleted breakpoint 3 at ...pdb.py:... + (Pdb) continue + """ + +def test_pdb_break_anywhere(): + """Test break_anywhere() method of Pdb. + + >>> def outer(): + ... def inner(): + ... import pdb + ... import sys + ... p = pdb.Pdb(nosigint=True, readrc=False) + ... p.set_trace() + ... frame = sys._getframe() + ... print(p.break_anywhere(frame)) # inner + ... print(p.break_anywhere(frame.f_back)) # outer + ... print(p.break_anywhere(frame.f_back.f_back)) # caller + ... inner() + + >>> def caller(): + ... outer() + + >>> def test_function(): + ... caller() + + >>> with PdbTestInput([ # TODO: RUSTPYTHON # doctest: +NORMALIZE_WHITESPACE +SKIP + ... 'b 3', + ... 'c', + ... ]): + ... test_function() + > (6)inner() + -> p.set_trace() + (Pdb) b 3 + Breakpoint 1 at :3 + (Pdb) c + True + False + False + """ + +def test_pdb_pp_repr_exc(): + """Test that do_p/do_pp do not swallow exceptions. + + >>> class BadRepr: + ... def __repr__(self): + ... raise Exception('repr_exc') + >>> obj = BadRepr() + + >>> def test_function(): + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + + >>> with PdbTestInput([ # doctest: +NORMALIZE_WHITESPACE + ... 'p obj', + ... 'pp obj', + ... 'continue', + ... ]): + ... test_function() + > (2)test_function() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) p obj + *** Exception: repr_exc + (Pdb) pp obj + *** Exception: repr_exc + (Pdb) continue + """ + +def test_pdb_empty_line(): + """Test that empty line repeats the last command. + + >>> def test_function(): + ... x = 1 + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + ... y = 2 + + >>> with PdbTestInput([ # doctest: +NORMALIZE_WHITESPACE + ... 'p x', + ... '', # Should repeat p x + ... 'n ;; p 0 ;; p x', # Fill cmdqueue with multiple commands + ... '', # Should still repeat p x + ... 'continue', + ... ]): + ... test_function() + > (3)test_function() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) p x + 1 + (Pdb) + 1 + (Pdb) n ;; p 0 ;; p x + 0 + 1 + > (4)test_function() + -> y = 2 + (Pdb) + 1 + (Pdb) continue + """ + +def do_nothing(): + pass + +def do_something(): + print(42) + +def test_list_commands(): + """Test the list and source commands of pdb. + + >>> def test_function_2(foo): + ... import test.test_pdb + ... test.test_pdb.do_nothing() + ... 'some...' + ... 'more...' + ... 'code...' + ... 'to...' + ... 'make...' + ... 'a...' + ... 'long...' + ... 'listing...' + ... 'useful...' + ... '...' + ... '...' + ... return foo + + >>> def test_function(): + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + ... ret = test_function_2('baz') + + >>> with PdbTestInput([ # TODO: RUSTPYTHON; Flaky # doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE +SKIP + ... 'step', # go to the test function line + ... 'list', # list first function + ... 'step', # step into second function + ... 'list', # list second function + ... 'list', # continue listing to EOF + ... 'list 1,3', # list specific lines + ... 'list x', # invalid argument + ... 'next', # step to import + ... 'next', # step over import + ... 'step', # step into do_nothing + ... 'longlist', # list all lines + ... 'source do_something', # list all lines of function + ... 'source fooxxx', # something that doesn't exit + ... 'continue', + ... ]): + ... test_function() + > (2)test_function() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) step + > (3)test_function() + -> ret = test_function_2('baz') + (Pdb) list + 1 def test_function(): + 2 import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + 3 -> ret = test_function_2('baz') + [EOF] + (Pdb) step + --Call-- + > (1)test_function_2() + -> def test_function_2(foo): + (Pdb) list + 1 -> def test_function_2(foo): + 2 import test.test_pdb + 3 test.test_pdb.do_nothing() + 4 'some...' + 5 'more...' + 6 'code...' + 7 'to...' + 8 'make...' + 9 'a...' + 10 'long...' + 11 'listing...' + (Pdb) list + 12 'useful...' + 13 '...' + 14 '...' + 15 return foo + [EOF] + (Pdb) list 1,3 + 1 -> def test_function_2(foo): + 2 import test.test_pdb + 3 test.test_pdb.do_nothing() + (Pdb) list x + *** ... + (Pdb) next + > (2)test_function_2() + -> import test.test_pdb + (Pdb) next + > (3)test_function_2() + -> test.test_pdb.do_nothing() + (Pdb) step + --Call-- + > ...test_pdb.py(...)do_nothing() + -> def do_nothing(): + (Pdb) longlist + ... -> def do_nothing(): + ... pass + (Pdb) source do_something + ... def do_something(): + ... print(42) + (Pdb) source fooxxx + *** ... + (Pdb) continue + """ + +def test_pdb_whatis_command(): + """Test the whatis command + + >>> myvar = (1,2) + >>> def myfunc(): + ... pass + + >>> class MyClass: + ... def mymethod(self): + ... pass + + >>> def test_function(): + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + + >>> with PdbTestInput([ # doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE + ... 'whatis myvar', + ... 'whatis myfunc', + ... 'whatis MyClass', + ... 'whatis MyClass()', + ... 'whatis MyClass.mymethod', + ... 'whatis MyClass().mymethod', + ... 'continue', + ... ]): + ... test_function() + > (2)test_function() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) whatis myvar + + (Pdb) whatis myfunc + Function myfunc + (Pdb) whatis MyClass + Class test.test_pdb.MyClass + (Pdb) whatis MyClass() + + (Pdb) whatis MyClass.mymethod + Function mymethod + (Pdb) whatis MyClass().mymethod + Method mymethod + (Pdb) continue + """ + +def test_pdb_display_command(): + """Test display command + + >>> def test_function(): + ... a = 0 + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + ... a = 1 + ... a = 2 + ... a = 3 + ... a = 4 + + >>> with PdbTestInput([ # doctest: +ELLIPSIS + ... 's', + ... 'display +', + ... 'display', + ... 'display a', + ... 'n', + ... 'display', + ... 'undisplay a', + ... 'n', + ... 'display a', + ... 'undisplay', + ... 'display a < 1', + ... 'n', + ... 'display undefined', + ... 'continue', + ... ]): + ... test_function() + > (3)test_function() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) s + > (4)test_function() + -> a = 1 + (Pdb) display + + *** Unable to display +: SyntaxError: invalid syntax + (Pdb) display + No expression is being displayed + (Pdb) display a + display a: 0 + (Pdb) n + > (5)test_function() + -> a = 2 + display a: 1 [old: 0] + (Pdb) display + Currently displaying: + a: 1 + (Pdb) undisplay a + (Pdb) n + > (6)test_function() + -> a = 3 + (Pdb) display a + display a: 2 + (Pdb) undisplay + (Pdb) display a < 1 + display a < 1: False + (Pdb) n + > (7)test_function() + -> a = 4 + (Pdb) display undefined + display undefined: ** raised NameError: name 'undefined' is not defined ** + (Pdb) continue + """ + +def test_pdb_alias_command(): + """Test alias command + + >>> class A: + ... def __init__(self): + ... self.attr1 = 10 + ... self.attr2 = 'str' + ... def method(self): + ... pass + + >>> def test_function(): + ... o = A() + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + ... o.method() + + >>> with PdbTestInput([ # doctest: +ELLIPSIS + ... 's', + ... 'alias pi', + ... 'alias pi for k in %1.__dict__.keys(): print(f"%1.{k} = {%1.__dict__[k]}")', + ... 'alias ps pi self', + ... 'alias ps', + ... 'pi o', + ... 's', + ... 'ps', + ... 'alias myp p %2', + ... 'alias myp', + ... 'alias myp p %1', + ... 'myp', + ... 'myp 1', + ... 'myp 1 2', + ... 'alias repeat_second_arg p "%* %2"', + ... 'repeat_second_arg 1 2 3', + ... 'continue', + ... ]): + ... test_function() + > (3)test_function() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) s + > (4)test_function() + -> o.method() + (Pdb) alias pi + *** Unknown alias 'pi' + (Pdb) alias pi for k in %1.__dict__.keys(): print(f"%1.{k} = {%1.__dict__[k]}") + (Pdb) alias ps pi self + (Pdb) alias ps + ps = pi self + (Pdb) pi o + o.attr1 = 10 + o.attr2 = str + (Pdb) s + --Call-- + > (5)method() + -> def method(self): + (Pdb) ps + self.attr1 = 10 + self.attr2 = str + (Pdb) alias myp p %2 + *** Replaceable parameters must be consecutive + (Pdb) alias myp + *** Unknown alias 'myp' + (Pdb) alias myp p %1 + (Pdb) myp + *** Not enough arguments for alias 'myp' + (Pdb) myp 1 + 1 + (Pdb) myp 1 2 + *** Too many arguments for alias 'myp' + (Pdb) alias repeat_second_arg p "%* %2" + (Pdb) repeat_second_arg 1 2 3 + '1 2 3 2' + (Pdb) continue + """ + +def test_pdb_where_command(): + """Test where command + + >>> def g(): + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + + >>> def f(): + ... g() + + >>> def test_function(): + ... f() + + >>> with PdbTestInput([ # doctest: +ELLIPSIS + ... 'w', + ... 'where', + ... 'w 1', + ... 'w invalid', + ... 'u', + ... 'w', + ... 'w 0', + ... 'w 100', + ... 'w -100', + ... 'continue', + ... ]): + ... test_function() + > (2)g() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) w + ... + (13)() + -> test_function() + (2)test_function() + -> f() + (2)f() + -> g() + > (2)g() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) where + ... + (13)() + -> test_function() + (2)test_function() + -> f() + (2)f() + -> g() + > (2)g() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) w 1 + > (2)g() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) w invalid + *** Invalid count (invalid) + (Pdb) u + > (2)f() + -> g() + (Pdb) w + ... + (13)() + -> test_function() + (2)test_function() + -> f() + > (2)f() + -> g() + (2)g() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) w 0 + > (2)f() + -> g() + (Pdb) w 100 + ... + (13)() + -> test_function() + (2)test_function() + -> f() + > (2)f() + -> g() + (2)g() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) w -100 + ... + (13)() + -> test_function() + (2)test_function() + -> f() + > (2)f() + -> g() + (2)g() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) continue + """ + +def test_pdb_restart_command(): + """Test restart command + + >>> def test_function(): + ... import pdb; pdb.Pdb(nosigint=True, readrc=False, mode='inline').set_trace() + ... x = 1 + + >>> with PdbTestInput([ # doctest: +ELLIPSIS + ... 'restart', + ... 'continue', + ... ]): + ... test_function() + > (2)test_function() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False, mode='inline').set_trace() + (Pdb) restart + *** run/restart command is disabled when pdb is running in inline mode. + Use the command line interface to enable restarting your program + e.g. "python -m pdb myscript.py" + (Pdb) continue + """ + +def test_pdb_commands_with_set_trace(): + """Test that commands can be passed to Pdb.set_trace() + + >>> def test_function(): + ... x = 1 + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace(commands=['p x', 'c']) + + >>> test_function() + 1 + """ + + +# skip this test if sys.flags.no_site = True; +# exit() isn't defined unless there's a site module. +if not sys.flags.no_site: + def test_pdb_interact_command(): + """Test interact command + + >>> g = 0 + >>> dict_g = {} + + >>> def test_function(): + ... x = 1 + ... lst_local = [] + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + + >>> with PdbTestInput([ # doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE + ... 'interact', + ... 'x', + ... 'g', + ... 'x = 2', + ... 'g = 3', + ... 'dict_g["a"] = True', + ... 'lst_local.append(x)', + ... 'exit()', + ... 'p x', + ... 'p g', + ... 'p dict_g', + ... 'p lst_local', + ... 'continue', + ... ]): + ... test_function() + > (4)test_function() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) interact + *pdb interact start* + ... x + 1 + ... g + 0 + ... x = 2 + ... g = 3 + ... dict_g["a"] = True + ... lst_local.append(x) + ... exit() + *exit from pdb interact command* + (Pdb) p x + 1 + (Pdb) p g + 0 + (Pdb) p dict_g + {'a': True} + (Pdb) p lst_local + [2] + (Pdb) continue + """ + +def test_convenience_variables(): + """Test convenience variables + + >>> def util_function(): + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + ... try: + ... raise Exception('test') + ... except Exception: + ... pass + ... return 1 + + >>> def test_function(): + ... util_function() + + >>> with PdbTestInput([ # TODO: RUSTPYTHON; hangs # doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE +SKIP + ... 'step', # Step to try statement + ... '$_frame.f_lineno', # Check frame convenience variable + ... '$ _frame', # This should be a syntax error + ... '$a = 10', # Set a convenience variable + ... '$a', # Print its value + ... 'p "$a"', # Print the string $a + ... 'p $a + 2', # Do some calculation + ... 'p f"$a = {$a}"', # Make sure $ in string is not converted and f-string works + ... 'u', # Switch frame + ... '$_frame.f_lineno', # Make sure the frame changed + ... '$a', # Make sure the value persists + ... 'd', # Go back to the original frame + ... 'next', + ... '$a', # The value should be gone + ... 'next', + ... '$_exception', # Check exception convenience variable + ... 'next', + ... '$_exception', # Exception should be gone + ... 'return', + ... '$_retval', # Check return convenience variable + ... 'continue', + ... ]): + ... test_function() + > (2)util_function() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) step + > (3)util_function() + -> try: + (Pdb) $_frame.f_lineno + 3 + (Pdb) $ _frame + *** SyntaxError: invalid syntax + (Pdb) $a = 10 + (Pdb) $a + 10 + (Pdb) p "$a" + '$a' + (Pdb) p $a + 2 + 12 + (Pdb) p f"$a = {$a}" + '$a = 10' + (Pdb) u + > (2)test_function() + -> util_function() + (Pdb) $_frame.f_lineno + 2 + (Pdb) $a + 10 + (Pdb) d + > (3)util_function() + -> try: + (Pdb) next + > (4)util_function() + -> raise Exception('test') + (Pdb) $a + *** KeyError: 'a' + (Pdb) next + Exception: test + > (4)util_function() + -> raise Exception('test') + (Pdb) $_exception + Exception('test') + (Pdb) next + > (5)util_function() + -> except Exception: + (Pdb) $_exception + *** KeyError: '_exception' + (Pdb) return + --Return-- + > (7)util_function()->1 + -> return 1 + (Pdb) $_retval + 1 + (Pdb) continue + """ + + +def test_post_mortem_chained(): + """Test post mortem traceback debugging of chained exception + + >>> def test_function_2(): + ... try: + ... 1/0 + ... finally: + ... print('Exception!') + + >>> def test_function_reraise(): + ... try: + ... test_function_2() + ... except ZeroDivisionError as e: + ... raise ZeroDivisionError('reraised') from e + + >>> def test_function(): + ... import pdb; + ... instance = pdb.Pdb(nosigint=True, readrc=False) + ... try: + ... test_function_reraise() + ... except Exception as e: + ... pdb._post_mortem(e, instance) + + >>> with PdbTestInput([ # TODO: RUSTPYTHON # doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE +EXPECTED_FAILURE + ... 'exceptions', + ... 'exceptions 0', + ... '$_exception', + ... 'up', + ... 'down', + ... 'exceptions 1', + ... '$_exception', + ... 'up', + ... 'down', + ... 'exceptions -1', + ... 'exceptions 3', + ... 'up', + ... 'exit', + ... ]): + ... try: + ... test_function() + ... except ZeroDivisionError: + ... print('Correctly reraised.') + Exception! + > (5)test_function_reraise() + -> raise ZeroDivisionError('reraised') from e + (Pdb) exceptions + 0 ZeroDivisionError('division by zero') + > 1 ZeroDivisionError('reraised') + (Pdb) exceptions 0 + > (3)test_function_2() + -> 1/0 + (Pdb) $_exception + ZeroDivisionError('division by zero') + (Pdb) up + > (3)test_function_reraise() + -> test_function_2() + (Pdb) down + > (3)test_function_2() + -> 1/0 + (Pdb) exceptions 1 + > (5)test_function_reraise() + -> raise ZeroDivisionError('reraised') from e + (Pdb) $_exception + ZeroDivisionError('reraised') + (Pdb) up + > (5)test_function() + -> test_function_reraise() + (Pdb) down + > (5)test_function_reraise() + -> raise ZeroDivisionError('reraised') from e + (Pdb) exceptions -1 + *** No exception with that number + (Pdb) exceptions 3 + *** No exception with that number + (Pdb) up + > (5)test_function() + -> test_function_reraise() + (Pdb) exit + """ + + +def test_post_mortem_cause_no_context(): + """Test post mortem traceback debugging of chained exception + + >>> def make_exc_with_stack(type_, *content, from_=None): + ... try: + ... raise type_(*content) from from_ + ... except Exception as out: + ... return out + ... + + >>> def main(): + ... try: + ... raise ValueError('Context Not Shown') + ... except Exception as e1: + ... raise ValueError("With Cause") from make_exc_with_stack(TypeError,'The Cause') + + >>> def test_function(): + ... import pdb; + ... instance = pdb.Pdb(nosigint=True, readrc=False) + ... try: + ... main() + ... except Exception as e: + ... pdb._post_mortem(e, instance) + + >>> with PdbTestInput([ # doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE + ... 'exceptions', + ... 'exceptions 0', + ... 'exceptions 1', + ... 'up', + ... 'down', + ... 'exit', + ... ]): + ... try: + ... test_function() + ... except ValueError: + ... print('Ok.') + > (5)main() + -> raise ValueError("With Cause") from make_exc_with_stack(TypeError,'The Cause') + (Pdb) exceptions + 0 TypeError('The Cause') + > 1 ValueError('With Cause') + (Pdb) exceptions 0 + > (3)make_exc_with_stack() + -> raise type_(*content) from from_ + (Pdb) exceptions 1 + > (5)main() + -> raise ValueError("With Cause") from make_exc_with_stack(TypeError,'The Cause') + (Pdb) up + > (5)test_function() + -> main() + (Pdb) down + > (5)main() + -> raise ValueError("With Cause") from make_exc_with_stack(TypeError,'The Cause') + (Pdb) exit""" + + +def test_post_mortem_context_of_the_cause(): + """Test post mortem traceback debugging of chained exception + + + >>> def main(): + ... try: + ... raise TypeError('Context of the cause') + ... except Exception as e1: + ... try: + ... raise ValueError('Root Cause') + ... except Exception as e2: + ... ex = e2 + ... raise ValueError("With Cause, and cause has context") from ex + + >>> def test_function(): + ... import pdb; + ... instance = pdb.Pdb(nosigint=True, readrc=False) + ... try: + ... main() + ... except Exception as e: + ... pdb._post_mortem(e, instance) + + >>> with PdbTestInput([ # doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE + ... 'exceptions', + ... 'exceptions 2', + ... 'up', + ... 'down', + ... 'exceptions 3', + ... 'up', + ... 'down', + ... 'exceptions 4', + ... 'up', + ... 'down', + ... 'exit', + ... ]): + ... try: + ... test_function() + ... except ValueError: + ... print('Correctly reraised.') + > (9)main() + -> raise ValueError("With Cause, and cause has context") from ex + (Pdb) exceptions + 0 TypeError('Context of the cause') + 1 ValueError('Root Cause') + > 2 ValueError('With Cause, and cause has context') + (Pdb) exceptions 2 + > (9)main() + -> raise ValueError("With Cause, and cause has context") from ex + (Pdb) up + > (5)test_function() + -> main() + (Pdb) down + > (9)main() + -> raise ValueError("With Cause, and cause has context") from ex + (Pdb) exceptions 3 + *** No exception with that number + (Pdb) up + > (5)test_function() + -> main() + (Pdb) down + > (9)main() + -> raise ValueError("With Cause, and cause has context") from ex + (Pdb) exceptions 4 + *** No exception with that number + (Pdb) up + > (5)test_function() + -> main() + (Pdb) down + > (9)main() + -> raise ValueError("With Cause, and cause has context") from ex + (Pdb) exit + """ + + +def test_post_mortem_from_none(): + """Test post mortem traceback debugging of chained exception + + In particular that cause from None (which sets __suppress_context__ to True) + does not show context. + + + >>> def main(): + ... try: + ... raise TypeError('Context of the cause') + ... except Exception as e1: + ... raise ValueError("With Cause, and cause has context") from None + + >>> def test_function(): + ... import pdb; + ... instance = pdb.Pdb(nosigint=True, readrc=False) + ... try: + ... main() + ... except Exception as e: + ... pdb._post_mortem(e, instance) + + >>> with PdbTestInput([ # doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE + ... 'exceptions', + ... 'exit', + ... ]): + ... try: + ... test_function() + ... except ValueError: + ... print('Correctly reraised.') + > (5)main() + -> raise ValueError("With Cause, and cause has context") from None + (Pdb) exceptions + > 0 ValueError('With Cause, and cause has context') + (Pdb) exit + """ + + +def test_post_mortem_from_no_stack(): + """Test post mortem traceback debugging of chained exception + + especially when one exception has no stack. + + >>> def main(): + ... raise Exception() from Exception() + + + >>> def test_function(): + ... import pdb; + ... instance = pdb.Pdb(nosigint=True, readrc=False) + ... try: + ... main() + ... except Exception as e: + ... pdb._post_mortem(e, instance) + + >>> with PdbTestInput( # doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE + ... ["exceptions", + ... "exceptions 0", + ... "exit"], + ... ): + ... try: + ... test_function() + ... except ValueError: + ... print('Correctly reraised.') + > (2)main() + -> raise Exception() from Exception() + (Pdb) exceptions + - Exception() + > 1 Exception() + (Pdb) exceptions 0 + *** This exception does not have a traceback, cannot jump to it + (Pdb) exit + """ + + +def test_post_mortem_single_no_stack(): + """Test post mortem called when origin exception has no stack + + + >>> def test_function(): + ... import pdb; + ... instance = pdb.Pdb(nosigint=True, readrc=False) + ... import sys + ... sys.last_exc = Exception() + ... pdb._post_mortem(sys.last_exc, instance) + + >>> with PdbTestInput( # doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE + ... [] + ... ): + ... try: + ... test_function() + ... except ValueError as e: + ... print(e) + A valid traceback must be passed if no exception is being handled + """ + +def test_post_mortem_complex(): + """Test post mortem traceback debugging of chained exception + + Test with simple and complex cycles, exception groups,... + + >>> def make_ex_with_stack(type_, *content, from_=None): + ... try: + ... raise type_(*content) from from_ + ... except Exception as out: + ... return out + ... + + >>> def cycle(): + ... try: + ... raise ValueError("Cycle Leaf") + ... except Exception as e: + ... raise e from e + ... + + >>> def tri_cycle(): + ... a = make_ex_with_stack(ValueError, "Cycle1") + ... b = make_ex_with_stack(ValueError, "Cycle2") + ... c = make_ex_with_stack(ValueError, "Cycle3") + ... + ... a.__cause__ = b + ... b.__cause__ = c + ... + ... raise c from a + ... + + >>> def cause(): + ... try: + ... raise ValueError("Cause Leaf") + ... except Exception as e: + ... raise e + ... + + >>> def context(n=10): + ... try: + ... raise ValueError(f"Context Leaf {n}") + ... except Exception as e: + ... if n == 0: + ... raise ValueError(f"With Context {n}") from e + ... else: + ... context(n - 1) + ... + + >>> def main(): + ... try: + ... cycle() + ... except Exception as e1: + ... try: + ... tri_cycle() + ... except Exception as e2: + ... ex = e2 + ... raise ValueError("With Context and With Cause") from ex + + + >>> def test_function(): + ... import pdb; + ... instance = pdb.Pdb(nosigint=True, readrc=False) + ... try: + ... main() + ... except Exception as e: + ... pdb._post_mortem(e, instance) + + >>> with PdbTestInput( # doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE + ... ["exceptions", + ... "exceptions 0", + ... "exceptions 1", + ... "exceptions 2", + ... "exceptions 3", + ... "exit"], + ... ): + ... try: + ... test_function() + ... except ValueError: + ... print('Correctly reraised.') + > (9)main() + -> raise ValueError("With Context and With Cause") from ex + (Pdb) exceptions + 0 ValueError('Cycle2') + 1 ValueError('Cycle1') + 2 ValueError('Cycle3') + > 3 ValueError('With Context and With Cause') + (Pdb) exceptions 0 + > (3)make_ex_with_stack() + -> raise type_(*content) from from_ + (Pdb) exceptions 1 + > (3)make_ex_with_stack() + -> raise type_(*content) from from_ + (Pdb) exceptions 2 + > (3)make_ex_with_stack() + -> raise type_(*content) from from_ + (Pdb) exceptions 3 + > (9)main() + -> raise ValueError("With Context and With Cause") from ex + (Pdb) exit + """ + + +def test_post_mortem(): + """Test post mortem traceback debugging. + + >>> def test_function_2(): + ... try: + ... 1/0 + ... finally: + ... print('Exception!') + + >>> def test_function(): + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + ... test_function_2() + ... print('Not reached.') + + >>> with PdbTestInput([ # TODO: RUSTPYTHON # doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE +EXPECTED_FAILURE + ... 'step', # step to test_function_2() line + ... 'next', # step over exception-raising call + ... 'bt', # get a backtrace + ... 'list', # list code of test_function() + ... 'down', # step into test_function_2() + ... 'list', # list code of test_function_2() + ... 'continue', + ... ]): + ... try: + ... test_function() + ... except ZeroDivisionError: + ... print('Correctly reraised.') + > (2)test_function() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) step + > (3)test_function() + -> test_function_2() + (Pdb) next + Exception! + ZeroDivisionError: division by zero + > (3)test_function() + -> test_function_2() + (Pdb) bt + ... + (11)() + -> test_function() + > (3)test_function() + -> test_function_2() + (3)test_function_2() + -> 1/0 + (Pdb) list + 1 def test_function(): + 2 import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + 3 -> test_function_2() + 4 print('Not reached.') + [EOF] + (Pdb) down + > (3)test_function_2() + -> 1/0 + (Pdb) list + 1 def test_function_2(): + 2 try: + 3 >> 1/0 + 4 finally: + 5 -> print('Exception!') + [EOF] + (Pdb) continue + Correctly reraised. + """ + + +def test_pdb_return_to_different_file(): + """When pdb returns to a different file, it should not skip if f_trace is + not already set + + >>> import pprint + + >>> class A: + ... def __repr__(self): + ... return 'A' + + >>> def test_function(): + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + ... pprint.pprint(A()) + + >>> with PdbTestInput([ # TODO: RUSTPYTHON # doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE +SKIP + ... 'b A.__repr__', + ... 'continue', + ... 'return', + ... 'next', + ... 'return', + ... 'return', + ... 'continue', + ... ]): + ... test_function() + > (2)test_function() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) b A.__repr__ + Breakpoint 1 at :3 + (Pdb) continue + > (3)__repr__() + -> return 'A' + (Pdb) return + --Return-- + > (3)__repr__()->'A' + -> return 'A' + (Pdb) next + > ...pprint.py..._safe_repr() + -> return rep,... + (Pdb) return + --Return-- + > ...pprint.py..._safe_repr()->('A'...) + -> return rep,... + (Pdb) return + --Return-- + > ...pprint.py...format()->('A'...) + -> return... + (Pdb) continue + A + """ + + +def test_pdb_skip_modules(): + """This illustrates the simple case of module skipping. + + >>> def skip_module(): + ... import string + ... import pdb; pdb.Pdb(skip=['stri*'], nosigint=True, readrc=False).set_trace() + ... string.capwords('FOO') + + >>> with PdbTestInput([ + ... 'step', + ... 'step', + ... 'continue', + ... ]): + ... skip_module() + > (3)skip_module() + -> import pdb; pdb.Pdb(skip=['stri*'], nosigint=True, readrc=False).set_trace() + (Pdb) step + > (4)skip_module() + -> string.capwords('FOO') + (Pdb) step + --Return-- + > (4)skip_module()->None + -> string.capwords('FOO') + (Pdb) continue + """ + +def test_pdb_invalid_arg(): + """This tests pdb commands that have invalid arguments + + >>> def test_function(): + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + + >>> with PdbTestInput([ # doctest: +NORMALIZE_WHITESPACE + ... 'a = 3', + ... 'll 4', + ... 'step 1', + ... 'p', + ... 'enable ', + ... 'continue' + ... ]): + ... test_function() + > (2)test_function() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) a = 3 + *** Invalid argument: = 3 + Usage: a(rgs) + (Pdb) ll 4 + *** Invalid argument: 4 + Usage: ll | longlist + (Pdb) step 1 + *** Invalid argument: 1 + Usage: s(tep) + (Pdb) p + *** Argument is required for this command + Usage: p expression + (Pdb) enable + *** Argument is required for this command + Usage: enable bpnumber [bpnumber ...] + (Pdb) continue + """ + + +# Module for testing skipping of module that makes a callback +mod = types.ModuleType('module_to_skip') +exec('def foo_pony(callback): x = 1; callback(); return None', mod.__dict__) + + +def test_pdb_skip_modules_with_callback(): + """This illustrates skipping of modules that call into other code. + + >>> def skip_module(): + ... def callback(): + ... return None + ... import pdb; pdb.Pdb(skip=['module_to_skip*'], nosigint=True, readrc=False).set_trace() + ... mod.foo_pony(callback) + + >>> with PdbTestInput([ # TODO: RUSTPYTHON; Flaky # doctest: +SKIP + ... 'step', + ... 'step', + ... 'step', + ... 'step', + ... 'step', + ... 'step', + ... 'continue', + ... ]): + ... skip_module() + ... pass # provides something to "step" to + > (4)skip_module() + -> import pdb; pdb.Pdb(skip=['module_to_skip*'], nosigint=True, readrc=False).set_trace() + (Pdb) step + > (5)skip_module() + -> mod.foo_pony(callback) + (Pdb) step + --Call-- + > (2)callback() + -> def callback(): + (Pdb) step + > (3)callback() + -> return None + (Pdb) step + --Return-- + > (3)callback()->None + -> return None + (Pdb) step + --Return-- + > (5)skip_module()->None + -> mod.foo_pony(callback) + (Pdb) step + > (11)() + -> pass # provides something to "step" to + (Pdb) continue + """ + + +def test_pdb_continue_in_bottomframe(): + """Test that "continue" and "next" work properly in bottom frame (issue #5294). + + >>> def test_function(): + ... import pdb, sys; inst = pdb.Pdb(nosigint=True, readrc=False) + ... inst.set_trace() + ... inst.botframe = sys._getframe() # hackery to get the right botframe + ... print(1) + ... print(2) + ... print(3) + ... print(4) + + >>> with PdbTestInput([ # TODO: RUSTPYTHON # doctest: +ELLIPSIS +SKIP + ... 'step', + ... 'next', + ... 'break 7', + ... 'continue', + ... 'next', + ... 'continue', + ... 'continue', + ... ]): + ... test_function() + > (3)test_function() + -> inst.set_trace() + (Pdb) step + > (4)test_function() + -> inst.botframe = sys._getframe() # hackery to get the right botframe + (Pdb) next + > (5)test_function() + -> print(1) + (Pdb) break 7 + Breakpoint ... at :7 + (Pdb) continue + 1 + 2 + > (7)test_function() + -> print(3) + (Pdb) next + 3 + > (8)test_function() + -> print(4) + (Pdb) continue + 4 + """ + + +def pdb_invoke(method, arg): + """Run pdb.method(arg).""" + getattr(pdb.Pdb(nosigint=True, readrc=False), method)(arg) + + +def test_pdb_run_with_incorrect_argument(): + """Testing run and runeval with incorrect first argument. + + >>> pti = PdbTestInput(['continue',]) + >>> with pti: # TODO: RUSTPYTHON # doctest: +EXPECTED_FAILURE + ... pdb_invoke('run', lambda x: x) + Traceback (most recent call last): + TypeError: exec() arg 1 must be a string, bytes or code object + + >>> with pti: # TODO: RUSTPYTHON # doctest: +EXPECTED_FAILURE + ... pdb_invoke('runeval', lambda x: x) + Traceback (most recent call last): + TypeError: eval() arg 1 must be a string, bytes or code object + """ + + +def test_pdb_run_with_code_object(): + """Testing run and runeval with code object as a first argument. + + >>> with PdbTestInput(['step','x', 'continue']): # doctest: +ELLIPSIS + ... pdb_invoke('run', compile('x=1', '', 'exec')) + > (1)()... + (Pdb) step + --Return-- + > (1)()->None + (Pdb) x + 1 + (Pdb) continue + + >>> with PdbTestInput(['x', 'continue']): + ... x=0 + ... pdb_invoke('runeval', compile('x+1', '', 'eval')) + > (1)()->None + (Pdb) x + 1 + (Pdb) continue + """ + +def test_next_until_return_at_return_event(): + """Test that pdb stops after a next/until/return issued at a return debug event. + + >>> def test_function_2(): + ... x = 1 + ... x = 2 + + >>> def test_function(): + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + ... test_function_2() + ... test_function_2() + ... test_function_2() + ... end = 1 + + >>> with PdbTestInput(['break test_function_2', # TODO: RUSTPYTHON # doctest: +SKIP + ... 'continue', + ... 'return', + ... 'next', + ... 'continue', + ... 'return', + ... 'until', + ... 'continue', + ... 'return', + ... 'return', + ... 'continue']): + ... test_function() + > (2)test_function() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) break test_function_2 + Breakpoint 1 at :2 + (Pdb) continue + > (2)test_function_2() + -> x = 1 + (Pdb) return + --Return-- + > (3)test_function_2()->None + -> x = 2 + (Pdb) next + > (4)test_function() + -> test_function_2() + (Pdb) continue + > (2)test_function_2() + -> x = 1 + (Pdb) return + --Return-- + > (3)test_function_2()->None + -> x = 2 + (Pdb) until + > (5)test_function() + -> test_function_2() + (Pdb) continue + > (2)test_function_2() + -> x = 1 + (Pdb) return + --Return-- + > (3)test_function_2()->None + -> x = 2 + (Pdb) return + > (6)test_function() + -> end = 1 + (Pdb) continue + """ + +def test_pdb_next_command_for_generator(): + """Testing skip unwinding stack on yield for generators for "next" command + + >>> def test_gen(): + ... yield 0 + ... return 1 + ... yield 2 + + >>> def test_function(): + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + ... it = test_gen() + ... try: + ... if next(it) != 0: + ... raise AssertionError + ... next(it) + ... except StopIteration as ex: + ... if ex.value != 1: + ... raise AssertionError + ... print("finished") + + >>> with PdbTestInput(['step', # TODO: RUSTPYTHON # doctest: +EXPECTED_FAILURE + ... 'step', + ... 'step', + ... 'step', + ... 'next', + ... 'next', + ... 'step', + ... 'step', + ... 'continue']): + ... test_function() + > (2)test_function() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) step + > (3)test_function() + -> it = test_gen() + (Pdb) step + > (4)test_function() + -> try: + (Pdb) step + > (5)test_function() + -> if next(it) != 0: + (Pdb) step + --Call-- + > (1)test_gen() + -> def test_gen(): + (Pdb) next + > (2)test_gen() + -> yield 0 + (Pdb) next + > (3)test_gen() + -> return 1 + (Pdb) step + --Return-- + > (3)test_gen()->1 + -> return 1 + (Pdb) step + StopIteration: 1 + > (7)test_function() + -> next(it) + (Pdb) continue + finished + """ + +if not SKIP_CORO_TESTS: + if has_socket_support: + def test_pdb_asynctask(): + """Testing $_asynctask is accessible in async context + + >>> import asyncio + + >>> async def test(): + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + + >>> def test_function(): + ... asyncio.run(test(), loop_factory=asyncio.EventLoop) + + >>> with PdbTestInput([ # TODO: RUSTPYTHON # doctest: +ELLIPSIS +EXPECTED_FAILURE + ... '$_asynctask', + ... 'continue', + ... ]): + ... test_function() + > (2)test() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) $_asynctask + :2> ... + (Pdb) continue + """ + + def test_pdb_await_support(): + """Testing await support in pdb + + >>> import asyncio + + >>> async def test(): + ... print("hello") + ... await asyncio.sleep(0) + ... print("world") + ... return 42 + + >>> async def main(): + ... import pdb + ... task = asyncio.create_task(test()) + ... await pdb.Pdb(nosigint=True, readrc=False).set_trace_async() + ... pass + + >>> def test_function(): + ... asyncio.run(main(), loop_factory=asyncio.EventLoop) + + >>> with PdbTestInput([ # TODO: RUSTPYTHON # doctest: +ELLIPSIS +EXPECTED_FAILURE + ... 'x = await task', + ... 'p x', + ... 'x = await test()', + ... 'p x', + ... 'new_task = asyncio.create_task(test())', + ... 'await new_task', + ... 'await non_exist()', + ... 's', + ... 'continue', + ... ]): + ... test_function() + > (4)main() + -> await pdb.Pdb(nosigint=True, readrc=False).set_trace_async() + (Pdb) x = await task + hello + world + > (4)main() + -> await pdb.Pdb(nosigint=True, readrc=False).set_trace_async() + (Pdb) p x + 42 + (Pdb) x = await test() + hello + world + > (4)main() + -> await pdb.Pdb(nosigint=True, readrc=False).set_trace_async() + (Pdb) p x + 42 + (Pdb) new_task = asyncio.create_task(test()) + (Pdb) await new_task + hello + world + > (4)main() + -> await pdb.Pdb(nosigint=True, readrc=False).set_trace_async() + (Pdb) await non_exist() + *** NameError: name 'non_exist' is not defined + > (4)main() + -> await pdb.Pdb(nosigint=True, readrc=False).set_trace_async() + (Pdb) s + > (5)main() + -> pass + (Pdb) continue + """ + + def test_pdb_await_with_breakpoint(): + """Testing await support with breakpoints set in tasks + + >>> import asyncio + + >>> async def test(): + ... x = 2 + ... await asyncio.sleep(0) + ... return 42 + + >>> async def main(): + ... import pdb + ... task = asyncio.create_task(test()) + ... await pdb.Pdb(nosigint=True, readrc=False).set_trace_async() + + >>> def test_function(): + ... asyncio.run(main(), loop_factory=asyncio.EventLoop) + + >>> with PdbTestInput([ # TODO: RUSTPYTHON # doctest: +ELLIPSIS +SKIP + ... 'b test', + ... 'k = await task', + ... 'n', + ... 'p x', + ... 'continue', + ... 'p k', + ... 'continue', + ... ]): + ... test_function() + > (4)main() + -> await pdb.Pdb(nosigint=True, readrc=False).set_trace_async() + (Pdb) b test + Breakpoint 1 at :2 + (Pdb) k = await task + > (2)test() + -> x = 2 + (Pdb) n + > (3)test() + -> await asyncio.sleep(0) + (Pdb) p x + 2 + (Pdb) continue + > (4)main() + -> await pdb.Pdb(nosigint=True, readrc=False).set_trace_async() + (Pdb) p k + 42 + (Pdb) continue + """ + + def test_pdb_await_contextvar(): + """Testing await support context vars + + >>> import asyncio + >>> import contextvars + + >>> var = contextvars.ContextVar('var') + + >>> async def get_var(): + ... return var.get() + + >>> async def set_var(val): + ... var.set(val) + ... return var.get() + + >>> async def main(): + ... var.set(42) + ... import pdb + ... await pdb.Pdb(nosigint=True, readrc=False).set_trace_async() + + >>> def test_function(): + ... asyncio.run(main(), loop_factory=asyncio.EventLoop) + + >>> with PdbTestInput([ # TODO: RUSTPYTHON # doctest: +EXPECTED_FAILURE + ... 'p var.get()', + ... 'print(await get_var())', + ... 'print(await asyncio.create_task(set_var(100)))', + ... 'p var.get()', + ... 'print(await set_var(99))', + ... 'p var.get()', + ... 'print(await get_var())', + ... 'continue', + ... ]): + ... test_function() + > (4)main() + -> await pdb.Pdb(nosigint=True, readrc=False).set_trace_async() + (Pdb) p var.get() + 42 + (Pdb) print(await get_var()) + 42 + > (4)main() + -> await pdb.Pdb(nosigint=True, readrc=False).set_trace_async() + (Pdb) print(await asyncio.create_task(set_var(100))) + 100 + > (4)main() + -> await pdb.Pdb(nosigint=True, readrc=False).set_trace_async() + (Pdb) p var.get() + 42 + (Pdb) print(await set_var(99)) + 99 + > (4)main() + -> await pdb.Pdb(nosigint=True, readrc=False).set_trace_async() + (Pdb) p var.get() + 99 + (Pdb) print(await get_var()) + 99 + > (4)main() + -> await pdb.Pdb(nosigint=True, readrc=False).set_trace_async() + (Pdb) continue + """ + + def test_pdb_next_command_for_coroutine(): + """Testing skip unwinding stack on yield for coroutines for "next" command + + >>> from test.support import run_yielding_async_fn, async_yield + + >>> async def test_coro(): + ... await async_yield(0) + ... await async_yield(0) + ... await async_yield(0) + + >>> async def test_main(): + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + ... await test_coro() + + >>> def test_function(): + ... run_yielding_async_fn(test_main) + ... print("finished") + + >>> with PdbTestInput(['step', # TODO: RUSTPYTHON; Flaky # doctest: +SKIP + ... 'step', + ... 'step', + ... 'next', + ... 'next', + ... 'next', + ... 'step', + ... 'continue']): + ... test_function() + > (2)test_main() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) step + > (3)test_main() + -> await test_coro() + (Pdb) step + --Call-- + > (1)test_coro() + -> async def test_coro(): + (Pdb) step + > (2)test_coro() + -> await async_yield(0) + (Pdb) next + > (3)test_coro() + -> await async_yield(0) + (Pdb) next + > (4)test_coro() + -> await async_yield(0) + (Pdb) next + Internal StopIteration + > (3)test_main() + -> await test_coro() + (Pdb) step + --Return-- + > (3)test_main()->None + -> await test_coro() + (Pdb) continue + finished + """ + + def test_pdb_next_command_for_asyncgen(): + """Testing skip unwinding stack on yield for coroutines for "next" command + + >>> from test.support import run_yielding_async_fn, async_yield + + >>> async def agen(): + ... yield 1 + ... await async_yield(0) + ... yield 2 + + >>> async def test_coro(): + ... async for x in agen(): + ... print(x) + + >>> async def test_main(): + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + ... await test_coro() + + >>> def test_function(): + ... run_yielding_async_fn(test_main) + ... print("finished") + + >>> with PdbTestInput(['step', + ... 'step', + ... 'step', + ... 'next', + ... 'next', + ... 'step', + ... 'next', + ... 'continue']): + ... test_function() + > (2)test_main() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) step + > (3)test_main() + -> await test_coro() + (Pdb) step + --Call-- + > (1)test_coro() + -> async def test_coro(): + (Pdb) step + > (2)test_coro() + -> async for x in agen(): + (Pdb) next + > (3)test_coro() + -> print(x) + (Pdb) next + 1 + > (2)test_coro() + -> async for x in agen(): + (Pdb) step + --Call-- + > (2)agen() + -> yield 1 + (Pdb) next + > (3)agen() + -> await async_yield(0) + (Pdb) continue + 2 + finished + """ + +def test_pdb_return_command_for_generator(): + """Testing no unwinding stack on yield for generators + for "return" command + + >>> def test_gen(): + ... yield 0 + ... return 1 + ... yield 2 + + >>> def test_function(): + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + ... it = test_gen() + ... try: + ... if next(it) != 0: + ... raise AssertionError + ... next(it) + ... except StopIteration as ex: + ... if ex.value != 1: + ... raise AssertionError + ... print("finished") + + >>> with PdbTestInput(['step', # TODO: RUSTPYTHON # doctest: +EXPECTED_FAILURE + ... 'step', + ... 'step', + ... 'step', + ... 'return', + ... 'step', + ... 'step', + ... 'continue']): + ... test_function() + > (2)test_function() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) step + > (3)test_function() + -> it = test_gen() + (Pdb) step + > (4)test_function() + -> try: + (Pdb) step + > (5)test_function() + -> if next(it) != 0: + (Pdb) step + --Call-- + > (1)test_gen() + -> def test_gen(): + (Pdb) return + StopIteration: 1 + > (7)test_function() + -> next(it) + (Pdb) step + > (8)test_function() + -> except StopIteration as ex: + (Pdb) step + > (9)test_function() + -> if ex.value != 1: + (Pdb) continue + finished + """ + +if not SKIP_CORO_TESTS: + def test_pdb_return_command_for_coroutine(): + """Testing no unwinding stack on yield for coroutines for "return" command + + >>> from test.support import run_yielding_async_fn, async_yield + + >>> async def test_coro(): + ... await async_yield(0) + ... await async_yield(0) + ... await async_yield(0) + + >>> async def test_main(): + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + ... await test_coro() + + >>> def test_function(): + ... run_yielding_async_fn(test_main) + ... print("finished") + + >>> with PdbTestInput(['step', # TODO: RUSTPYTHON; Flaky # doctest: +SKIP + ... 'step', + ... 'step', + ... 'next', + ... 'continue']): + ... test_function() + > (2)test_main() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) step + > (3)test_main() + -> await test_coro() + (Pdb) step + --Call-- + > (1)test_coro() + -> async def test_coro(): + (Pdb) step + > (2)test_coro() + -> await async_yield(0) + (Pdb) next + > (3)test_coro() + -> await async_yield(0) + (Pdb) continue + finished + """ + +def test_pdb_until_command_for_generator(): + """Testing no unwinding stack on yield for generators + for "until" command if target breakpoint is not reached + + >>> def test_gen(): + ... yield 0 + ... yield 1 + ... yield 2 + + >>> def test_function(): + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + ... for i in test_gen(): + ... print(i) + ... print("finished") + + >>> with PdbTestInput(['step', # TODO: RUSTPYTHON; Flaky # doctest: +SKIP + ... 'step', + ... 'until 4', + ... 'step', + ... 'step', + ... 'continue']): + ... test_function() + > (2)test_function() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) step + > (3)test_function() + -> for i in test_gen(): + (Pdb) step + --Call-- + > (1)test_gen() + -> def test_gen(): + (Pdb) until 4 + 0 + 1 + > (4)test_gen() + -> yield 2 + (Pdb) step + --Return-- + > (4)test_gen()->2 + -> yield 2 + (Pdb) step + > (4)test_function() + -> print(i) + (Pdb) continue + 2 + finished + """ + +if not SKIP_CORO_TESTS: + def test_pdb_until_command_for_coroutine(): + """Testing no unwinding stack for coroutines + for "until" command if target breakpoint is not reached + + >>> from test.support import run_yielding_async_fn, async_yield + + >>> async def test_coro(): + ... print(0) + ... await async_yield(0) + ... print(1) + ... await async_yield(0) + ... print(2) + ... await async_yield(0) + ... print(3) + + >>> async def test_main(): + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + ... await test_coro() + + >>> def test_function(): + ... run_yielding_async_fn(test_main) + ... print("finished") + + >>> with PdbTestInput(['step', # TODO: RUSTPYTHON; Flaky # doctest: +SKIP + ... 'step', + ... 'until 8', + ... 'continue']): + ... test_function() + > (2)test_main() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) step + > (3)test_main() + -> await test_coro() + (Pdb) step + --Call-- + > (1)test_coro() + -> async def test_coro(): + (Pdb) until 8 + 0 + 1 + 2 + > (8)test_coro() + -> print(3) + (Pdb) continue + 3 + finished + """ + +def test_pdb_next_command_in_generator_for_loop(): + """The next command on returning from a generator controlled by a for loop. + + >>> def test_gen(): + ... yield 0 + ... return 1 + + >>> def test_function(): + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + ... for i in test_gen(): + ... print('value', i) + ... x = 123 + + >>> with PdbTestInput(['break test_gen', # TODO: RUSTPYTHON # doctest: +SKIP + ... 'continue', + ... 'next', + ... 'next', + ... 'next', + ... 'continue']): + ... test_function() + > (2)test_function() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) break test_gen + Breakpoint 1 at :2 + (Pdb) continue + > (2)test_gen() + -> yield 0 + (Pdb) next + value 0 + > (3)test_gen() + -> return 1 + (Pdb) next + Internal StopIteration: 1 + > (3)test_function() + -> for i in test_gen(): + (Pdb) next + > (5)test_function() + -> x = 123 + (Pdb) continue + """ + +def test_pdb_next_command_subiterator(): + """The next command in a generator with a subiterator. + + >>> def test_subgenerator(): + ... yield 0 + ... return 1 + + >>> def test_gen(): + ... x = yield from test_subgenerator() + ... return x + + >>> def test_function(): + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + ... for i in test_gen(): + ... print('value', i) + ... x = 123 + + >>> with PdbTestInput(['step', # TODO: RUSTPYTHON; Flaky # doctest: +SKIP + ... 'step', + ... 'step', + ... 'next', + ... 'next', + ... 'next', + ... 'continue']): + ... test_function() + > (2)test_function() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) step + > (3)test_function() + -> for i in test_gen(): + (Pdb) step + --Call-- + > (1)test_gen() + -> def test_gen(): + (Pdb) step + > (2)test_gen() + -> x = yield from test_subgenerator() + (Pdb) next + value 0 + > (3)test_gen() + -> return x + (Pdb) next + Internal StopIteration: 1 + > (3)test_function() + -> for i in test_gen(): + (Pdb) next + > (5)test_function() + -> x = 123 + (Pdb) continue + """ + +def test_pdb_breakpoint_with_throw(): + """GH-132536: PY_THROW event should not be turned off + + >>> def gen(): + ... yield 0 + + >>> def test_function(): + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + ... g = gen() + ... try: + ... g.throw(TypeError) + ... except TypeError: + ... pass + + >>> with PdbTestInput([ + ... 'b 7', + ... 'continue', + ... 'clear 1', + ... 'continue', + ... ]): + ... test_function() + > (2)test_function() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) b 7 + Breakpoint 1 at :7 + (Pdb) continue + > (7)test_function() + -> pass + (Pdb) clear 1 + Deleted breakpoint 1 at :7 + (Pdb) continue + """ + +def test_pdb_multiline_statement(): + """Test for multiline statement + + >>> def test_function(): + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + + >>> with PdbTestInput([ # TODO: RUSTPYTHON # doctest: +NORMALIZE_WHITESPACE +EXPECTED_FAILURE + ... 'def f(x):', + ... ' return x * 2', + ... '', + ... 'val = 2', + ... 'if val > 0:', + ... ' val = f(val)', + ... '', + ... '', # empty line should repeat the multi-line statement + ... 'val', + ... 'c' + ... ]): + ... test_function() + > (2)test_function() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) def f(x): + ... return x * 2 + ... + (Pdb) val = 2 + (Pdb) if val > 0: + ... val = f(val) + ... + (Pdb) + (Pdb) val + 8 + (Pdb) c + """ + +def test_pdb_closure(): + """Test for all expressions/statements that involve closure + + >>> k = 0 + >>> g = 1 + >>> def test_function(): + ... x = 2 + ... g = 3 + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + + >>> with PdbTestInput([ # TODO: RUSTPYTHON # doctest: +NORMALIZE_WHITESPACE +EXPECTED_FAILURE + ... 'k', + ... 'g', + ... 'y = y', + ... 'global g; g', + ... 'global g; (lambda: g)()', + ... '(lambda: x)()', + ... '(lambda: g)()', + ... 'lst = [n for n in range(10) if (n % x) == 0]', + ... 'lst', + ... 'sum(n for n in lst if n > x)', + ... 'x = 1; raise Exception()', + ... 'x', + ... 'def f():', + ... ' return x', + ... '', + ... 'f()', + ... 'c' + ... ]): + ... test_function() + > (4)test_function() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) k + 0 + (Pdb) g + 3 + (Pdb) y = y + *** NameError: name 'y' is not defined + (Pdb) global g; g + 1 + (Pdb) global g; (lambda: g)() + 1 + (Pdb) (lambda: x)() + 2 + (Pdb) (lambda: g)() + 3 + (Pdb) lst = [n for n in range(10) if (n % x) == 0] + (Pdb) lst + [0, 2, 4, 6, 8] + (Pdb) sum(n for n in lst if n > x) + 18 + (Pdb) x = 1; raise Exception() + *** Exception + (Pdb) x + 1 + (Pdb) def f(): + ... return x + ... + (Pdb) f() + 1 + (Pdb) c + """ + +def test_pdb_show_attribute_and_item(): + """Test for expressions with command prefix + + >>> def test_function(): + ... n = lambda x: x + ... c = {"a": 1} + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + + >>> with PdbTestInput([ # doctest: +NORMALIZE_WHITESPACE + ... 'c["a"]', + ... 'c.get("a")', + ... 'n(1)', + ... 'j=1', + ... 'j+1', + ... 'r"a"', + ... 'next(iter([1]))', + ... 'list((0, 1))', + ... 'c' + ... ]): + ... test_function() + > (4)test_function() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) c["a"] + 1 + (Pdb) c.get("a") + 1 + (Pdb) n(1) + 1 + (Pdb) j=1 + (Pdb) j+1 + 2 + (Pdb) r"a" + 'a' + (Pdb) next(iter([1])) + 1 + (Pdb) list((0, 1)) + [0, 1] + (Pdb) c + """ + +# doctest will modify pdb.set_trace during the test, so we need to backup +# the original function to use it in the test +original_pdb_settrace = pdb.set_trace + +def test_pdb_with_inline_breakpoint(): + """Hard-coded breakpoint() calls should invoke the same debugger instance + + >>> def test_function(): + ... x = 1 + ... import pdb; pdb.Pdb().set_trace() + ... original_pdb_settrace() + ... x = 2 + + >>> with PdbTestInput(['display x', + ... 'n', + ... 'n', + ... 'n', + ... 'n', + ... 'undisplay', + ... 'c']): + ... test_function() + > (3)test_function() + -> import pdb; pdb.Pdb().set_trace() + (Pdb) display x + display x: 1 + (Pdb) n + > (4)test_function() + -> original_pdb_settrace() + (Pdb) n + > (4)test_function() + -> original_pdb_settrace() + (Pdb) n + > (5)test_function() + -> x = 2 + (Pdb) n + --Return-- + > (5)test_function()->None + -> x = 2 + display x: 2 [old: 1] + (Pdb) undisplay + (Pdb) c + """ + +def test_pdb_issue_20766(): + """Test for reference leaks when the SIGINT handler is set. + + >>> def test_function(): + ... i = 1 + ... while i <= 2: + ... sess = pdb.Pdb() + ... sess.set_trace(sys._getframe()) + ... print('pdb %d: %s' % (i, sess._previous_sigint_handler)) + ... i += 1 + + >>> with PdbTestInput(['continue', # TODO: RUSTPYTHON # doctest: +SKIP + ... 'continue']): + ... test_function() + > (5)test_function() + -> sess.set_trace(sys._getframe()) + (Pdb) continue + pdb 1: + > (5)test_function() + -> sess.set_trace(sys._getframe()) + (Pdb) continue + pdb 2: + """ + +def test_pdb_issue_43318(): + """echo breakpoints cleared with filename:lineno + + >>> def test_function(): + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + ... print(1) + ... print(2) + ... print(3) + ... print(4) + >>> with PdbTestInput([ # doctest: +NORMALIZE_WHITESPACE + ... 'break 3', + ... 'clear :3', + ... 'continue' + ... ]): + ... test_function() + > (2)test_function() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) break 3 + Breakpoint 1 at :3 + (Pdb) clear :3 + Deleted breakpoint 1 at :3 + (Pdb) continue + 1 + 2 + 3 + 4 + """ + +def test_pdb_issue_gh_91742(): + """See GH-91742 + + >>> def test_function(): + ... __author__ = "pi" + ... __version__ = "3.14" + ... + ... def about(): + ... '''About''' + ... print(f"Author: {__author__!r}", + ... f"Version: {__version__!r}", + ... sep=" ") + ... + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + ... about() + + + >>> # TODO: RUSTPYTHON; tried to push value onto stack but overflowed max_stackdepth (remove the skip) + >>> with PdbTestInput([ # doctest: +NORMALIZE_WHITESPACE +SKIP + ... 'step', + ... 'step', + ... 'next', + ... 'next', + ... 'jump 5', + ... 'continue' + ... ]): + ... test_function() + > (11)test_function() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) step + > (12)test_function() + -> about() + (Pdb) step + --Call-- + > (5)about() + -> def about(): + (Pdb) next + > (7)about() + -> print(f"Author: {__author__!r}", + (Pdb) next + > (8)about() + -> f"Version: {__version__!r}", + (Pdb) jump 5 + > (5)about() + -> def about(): + (Pdb) continue + Author: 'pi' Version: '3.14' + """ + +def test_pdb_issue_gh_94215(): + """See GH-94215 + + Check that frame_setlineno() does not leak references. + + >>> def test_function(): + ... def func(): + ... def inner(v): pass + ... inner( + ... 42 + ... ) + ... + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + ... func() + + >>> # TODO: RUSTPYTHON; tried to push value onto stack but overflowed max_stackdepth (remove the skip) + >>> with PdbTestInput([ # doctest: +NORMALIZE_WHITESPACE +SKIP + ... 'step', + ... 'step', + ... 'next', + ... 'next', + ... 'jump 3', + ... 'next', + ... 'next', + ... 'jump 3', + ... 'next', + ... 'next', + ... 'jump 3', + ... 'continue' + ... ]): + ... test_function() + > (8)test_function() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) step + > (9)test_function() + -> func() + (Pdb) step + --Call-- + > (2)func() + -> def func(): + (Pdb) next + > (3)func() + -> def inner(v): pass + (Pdb) next + > (4)func() + -> inner( + (Pdb) jump 3 + > (3)func() + -> def inner(v): pass + (Pdb) next + > (4)func() + -> inner( + (Pdb) next + > (5)func() + -> 42 + (Pdb) jump 3 + > (3)func() + -> def inner(v): pass + (Pdb) next + > (4)func() + -> inner( + (Pdb) next + > (5)func() + -> 42 + (Pdb) jump 3 + > (3)func() + -> def inner(v): pass + (Pdb) continue + """ + +def test_pdb_issue_gh_101673(): + """See GH-101673 + + Make sure ll and switching frames won't revert local variable assignment + + >>> def test_function(): + ... a = 1 + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + + >>> with PdbTestInput([ # TODO: RUSTPYTHON # doctest: +NORMALIZE_WHITESPACE +EXPECTED_FAILURE + ... '!a = 2', + ... 'll', + ... 'p a', + ... 'u', + ... 'p a', + ... 'd', + ... 'p a', + ... 'continue' + ... ]): + ... test_function() + > (3)test_function() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) !a = 2 + (Pdb) ll + 1 def test_function(): + 2 a = 1 + 3 -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) p a + 2 + (Pdb) u + > (11)() + -> test_function() + (Pdb) p a + *** NameError: name 'a' is not defined + (Pdb) d + > (3)test_function() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) p a + 2 + (Pdb) continue + """ + +def test_pdb_issue_gh_103225(): + """See GH-103225 + + Make sure longlist uses 1-based line numbers in frames that correspond to a module + + >>> with PdbTestInput([ # doctest: +NORMALIZE_WHITESPACE + ... 'longlist', + ... 'continue' + ... ]): + ... a = 1 + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + ... b = 2 + > (6)() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) longlist + 1 with PdbTestInput([ # doctest: +NORMALIZE_WHITESPACE + 2 'longlist', + 3 'continue' + 4 ]): + 5 a = 1 + 6 -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + 7 b = 2 + (Pdb) continue + """ + +def test_pdb_issue_gh_101517(): + """See GH-101517 + + Make sure pdb doesn't crash when the exception is caught in a try/except* block + + >>> def test_function(): + ... try: + ... raise KeyError + ... except* Exception as e: + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + + >>> with PdbTestInput([ # doctest: +NORMALIZE_WHITESPACE + ... 'continue' + ... ]): + ... test_function() + > (5)test_function() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) continue + """ + +def test_pdb_issue_gh_108976(): + """See GH-108976 + Make sure setting f_trace_opcodes = True won't crash pdb + >>> def test_function(): + ... import sys + ... sys._getframe().f_trace_opcodes = True + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + ... a = 1 + >>> with PdbTestInput([ # doctest: +NORMALIZE_WHITESPACE + ... 'continue' + ... ]): + ... test_function() + > (4)test_function() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) continue + """ + +def test_pdb_issue_gh_127321(): + """See GH-127321 + breakpoint() should stop at a opcode that has a line number + >>> def test_function(): + ... import pdb; pdb_instance = pdb.Pdb(nosigint=True, readrc=False) + ... [1, 2] and pdb_instance.set_trace() + ... a = 1 + >>> with PdbTestInput([ # TODO: RUSTPYTHON # doctest: +NORMALIZE_WHITESPACE +EXPECTED_FAILURE + ... 'continue' + ... ]): + ... test_function() + > (4)test_function() + -> a = 1 + (Pdb) continue + """ + + +def test_pdb_issue_gh_136057(): + """See GH-136057 + "step" and "next" commands should be able to get over list comprehensions + >>> def test_function(): + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + ... lst = [i for i in range(10)] + ... for i in lst: pass + + >>> with PdbTestInput([ # doctest: +NORMALIZE_WHITESPACE + ... 'next', + ... 'next', + ... 'step', + ... 'continue', + ... ]): + ... test_function() + > (2)test_function() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) next + > (3)test_function() + -> lst = [i for i in range(10)] + (Pdb) next + > (4)test_function() + -> for i in lst: pass + (Pdb) step + --Return-- + > (4)test_function()->None + -> for i in lst: pass + (Pdb) continue + """ + + +def test_pdb_issue_gh_80731(): + """See GH-80731 + + pdb should correctly print exception info if in an except block. + + >>> with PdbTestInput([ # doctest: +ELLIPSIS + ... 'import sys', + ... 'sys.exc_info()', + ... 'continue' + ... ]): + ... try: + ... raise ValueError('Correct') + ... except ValueError: + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + > (9)() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) import sys + (Pdb) sys.exc_info() + (, ValueError('Correct'), ) + (Pdb) continue + """ + + +def test_pdb_ambiguous_statements(): + """See GH-104301 + + Make sure that ambiguous statements prefixed by '!' are properly disambiguated + + >>> with PdbTestInput([ + ... 's', # step to the print line + ... '! n = 42', # disambiguated statement: reassign the name n + ... 'n', # advance the debugger into the print() + ... 'continue' + ... ]): + ... n = -1 + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + ... print(f"The value of n is {n}") + > (8)() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) s + > (9)() + -> print(f"The value of n is {n}") + (Pdb) ! n = 42 + (Pdb) n + The value of n is 42 + > (1)() + -> with PdbTestInput([ + (Pdb) continue + """ + +def test_pdb_f_trace_lines(): + """GH-80675 + + pdb should work even if f_trace_lines is set to False on some frames. + + >>> def test_function(): + ... import sys + ... frame = sys._getframe() + ... frame.f_trace_lines = False + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + ... if frame.f_trace_lines != False: + ... print("f_trace_lines is not reset after continue!") + + >>> with PdbTestInput([ # doctest: +NORMALIZE_WHITESPACE + ... 'continue' + ... ]): + ... test_function() + > (5)test_function() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) continue + """ + +def test_pdb_frame_refleak(): + """ + pdb should not leak reference to frames + + >>> def frame_leaker(container): + ... import sys + ... container.append(sys._getframe()) + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + ... pass + + >>> def test_function(): + ... import gc + ... container = [] + ... frame_leaker(container) # c + ... print(len(gc.get_referrers(container[0]))) + ... container = [] + ... frame_leaker(container) # n c + ... print(len(gc.get_referrers(container[0]))) + ... container = [] + ... frame_leaker(container) # r c + ... print(len(gc.get_referrers(container[0]))) + + >>> with PdbTestInput([ # doctest: +NORMALIZE_WHITESPACE + ... 'continue', + ... 'next', + ... 'continue', + ... 'return', + ... 'continue', + ... ]): + ... test_function() + > (4)frame_leaker() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) continue + 1 + > (4)frame_leaker() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) next + > (5)frame_leaker() + -> pass + (Pdb) continue + 1 + > (4)frame_leaker() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) return + --Return-- + > (5)frame_leaker()->None + -> pass + (Pdb) continue + 1 + """ + +def test_pdb_function_break(): + """Testing the line number of break on function + + >>> def foo(): pass + + >>> def bar(): + ... + ... pass + + >>> def boo(): + ... # comments + ... global x + ... x = 1 + + >>> def gen(): + ... yield 42 + + >>> def test_function(): + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + + >>> with PdbTestInput([ # TODO: RUSTPYTHON # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE +SKIP + ... 'break foo', + ... 'break bar', + ... 'break boo', + ... 'break gen', + ... 'continue' + ... ]): + ... test_function() + > (2)test_function() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) break foo + Breakpoint ... at :1 + (Pdb) break bar + Breakpoint ... at :3 + (Pdb) break boo + Breakpoint ... at :4 + (Pdb) break gen + Breakpoint ... at :2 + (Pdb) continue + """ + +def test_pdb_issue_gh_65052(): + """See GH-65052 + + args, retval and display should not crash if the object is not displayable + >>> class A: + ... def __new__(cls): + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + ... return object.__new__(cls) + ... def __init__(self): + ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + ... self.a = 1 + ... def __repr__(self): + ... return self.a + + >>> def test_function(): + ... A() + >>> with PdbTestInput([ # TODO: RUSTPYTHON; Flaky # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE +SKIP + ... 's', + ... 's', + ... 'retval', + ... 'continue', + ... 'args', + ... 'display self', + ... 'display', + ... 'continue', + ... ]): + ... test_function() + > (3)__new__() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) s + > (4)__new__() + -> return object.__new__(cls) + (Pdb) s + --Return-- + > (4)__new__()-> + -> return object.__new__(cls) + (Pdb) retval + *** repr(retval) failed: AttributeError: 'A' object has no attribute 'a' *** + (Pdb) continue + > (6)__init__() + -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() + (Pdb) args + self = *** repr(self) failed: AttributeError: 'A' object has no attribute 'a' *** + (Pdb) display self + display self: *** repr(self) failed: AttributeError: 'A' object has no attribute 'a' *** + (Pdb) display + Currently displaying: + self: *** repr(self) failed: AttributeError: 'A' object has no attribute 'a' *** + (Pdb) continue + """ + + +@support.force_not_colorized_test_class +@support.requires_subprocess() +class PdbTestCase(unittest.TestCase): + def tearDown(self): + os_helper.unlink(os_helper.TESTFN) + + @unittest.skipIf(sys.flags.safe_path, + 'PYTHONSAFEPATH changes default sys.path') + def _run_pdb(self, pdb_args, commands, + expected_returncode=0, + extra_env=None): + self.addCleanup(os_helper.rmtree, '__pycache__') + cmd = [sys.executable, '-m', 'pdb'] + pdb_args + if extra_env is not None: + env = os.environ | extra_env + else: + env = os.environ + with subprocess.Popen( + cmd, + stdout=subprocess.PIPE, + stdin=subprocess.PIPE, + stderr=subprocess.PIPE, + env = {**env, 'PYTHONIOENCODING': 'utf-8'} + ) as proc: + stdout, stderr = proc.communicate(str.encode(commands)) + stdout = bytes.decode(stdout) if isinstance(stdout, bytes) else stdout + stderr = bytes.decode(stderr) if isinstance(stderr, bytes) else stderr + self.assertEqual( + proc.returncode, + expected_returncode, + f"Unexpected return code\nstdout: {stdout}\nstderr: {stderr}" + ) + return stdout, stderr + + def run_pdb_script(self, script, commands, + expected_returncode=0, + extra_env=None, + script_args=None, + pdbrc=None, + remove_home=False): + """Run 'script' lines with pdb and the pdb 'commands'.""" + filename = 'main.py' + with open(filename, 'w') as f: + f.write(textwrap.dedent(script)) + + if pdbrc is not None: + with open('.pdbrc', 'w') as f: + f.write(textwrap.dedent(pdbrc)) + self.addCleanup(os_helper.unlink, '.pdbrc') + self.addCleanup(os_helper.unlink, filename) + + with os_helper.EnvironmentVarGuard() as env: + if remove_home: + env.unset('HOME') + if script_args is None: + script_args = [] + stdout, stderr = self._run_pdb([filename] + script_args, commands, expected_returncode, extra_env) + return stdout, stderr + + def run_pdb_module(self, script, commands): + """Runs the script code as part of a module""" + self.module_name = 't_main' + os_helper.rmtree(self.module_name) + main_file = self.module_name + '/__main__.py' + init_file = self.module_name + '/__init__.py' + os.mkdir(self.module_name) + with open(init_file, 'w') as f: + pass + with open(main_file, 'w') as f: + f.write(textwrap.dedent(script)) + self.addCleanup(os_helper.rmtree, self.module_name) + return self._run_pdb(['-m', self.module_name], commands) + + def _assert_find_function(self, file_content, func_name, expected): + with open(os_helper.TESTFN, 'wb') as f: + f.write(file_content) + + expected = None if not expected else ( + expected[0], os_helper.TESTFN, expected[1]) + self.assertEqual( + expected, pdb.find_function(func_name, os_helper.TESTFN)) + + def _fd_dir_for_pipe_targets(self): + """Return a directory exposing live file descriptors, if any.""" + return self._proc_fd_dir() or self._dev_fd_dir() + + def _proc_fd_dir(self): + """Return /proc-backed fd dir when it can be used for pipes.""" + # GH-142836: Opening /proc/self/fd entries for pipes raises EACCES on + # Solaris, so prefer other mechanisms there. + if sys.platform.startswith("sunos"): + return None + + proc_fd = "/proc/self/fd" + if os.path.isdir(proc_fd) and os.path.exists(os.path.join(proc_fd, '0')): + return proc_fd + return None + + def _dev_fd_dir(self): + """Return /dev-backed fd dir when usable.""" + dev_fd = "/dev/fd" + if os.path.isdir(dev_fd) and os.path.exists(os.path.join(dev_fd, '0')): + if sys.platform.startswith("freebsd"): + try: + if os.stat("/dev").st_dev == os.stat(dev_fd).st_dev: + return None + except FileNotFoundError: + return None + return dev_fd + return None + + def test_find_function_empty_file(self): + self._assert_find_function(b'', 'foo', None) + + def test_find_function_found(self): + self._assert_find_function( + """\ +def foo(): + pass + +def bœr(): + pass + +def quux(): + pass +""".encode(), + 'bœr', + ('bœr', 5), + ) + + def test_find_function_found_with_encoding_cookie(self): + self._assert_find_function( + """\ +# coding: iso-8859-15 +def foo(): + pass + +def bœr(): + pass + +def quux(): + pass +""".encode('iso-8859-15'), + 'bœr', + ('bœr', 6), + ) + + def test_find_function_found_with_bom(self): + self._assert_find_function( + codecs.BOM_UTF8 + """\ +def bœr(): + pass +""".encode(), + 'bœr', + ('bœr', 2), + ) + + def test_spec(self): + # Test that __main__.__spec__ is set to None when running a script + script = """ + import __main__ + print(__main__.__spec__) + """ + + commands = "continue" + + stdout, _ = self.run_pdb_script(script, commands) + self.assertIn('None', stdout) + + def test_script_target_anonymous_pipe(self): + """ + _ScriptTarget doesn't fail on an anonymous pipe. + + GH-142315 + """ + fd_dir = self._fd_dir_for_pipe_targets() + if fd_dir is None: + self.skipTest('anonymous pipe targets require /proc/self/fd or /dev/fd') + + read_fd, write_fd = os.pipe() + + def safe_close(fd): + try: + os.close(fd) + except OSError: + pass + + self.addCleanup(safe_close, read_fd) + self.addCleanup(safe_close, write_fd) + + pipe_path = os.path.join(fd_dir, str(read_fd)) + if not os.path.exists(pipe_path): + self.skipTest('fd directory does not expose anonymous pipes') + + script_source = 'marker = "via_pipe"\n' + os.write(write_fd, script_source.encode('utf-8')) + os.close(write_fd) + + original_path0 = sys.path[0] + self.addCleanup(sys.path.__setitem__, 0, original_path0) + + target = pdb._ScriptTarget(pipe_path) + code_text = target.code + namespace = target.namespace + exec(code_text, namespace) + + self.assertEqual(namespace['marker'], 'via_pipe') + self.assertEqual(namespace['__file__'], target.filename) + self.assertIsNone(namespace['__spec__']) + + def test_find_function_first_executable_line(self): + code = textwrap.dedent("""\ + def foo(): pass + + def bar(): + pass # line 4 + + def baz(): + # comment + pass # line 8 + + def mul(): + # code on multiple lines + code = compile( # line 12 + 'def f()', + '', + 'exec', + ) + """).encode() + + self._assert_find_function(code, 'foo', ('foo', 1)) + self._assert_find_function(code, 'bar', ('bar', 4)) + self._assert_find_function(code, 'baz', ('baz', 8)) + self._assert_find_function(code, 'mul', ('mul', 12)) + + def test_issue7964(self): + # open the file as binary so we can force \r\n newline + with open(os_helper.TESTFN, 'wb') as f: + f.write(b'print("testing my pdb")\r\n') + cmd = [sys.executable, '-m', 'pdb', os_helper.TESTFN] + proc = subprocess.Popen(cmd, + stdout=subprocess.PIPE, + stdin=subprocess.PIPE, + stderr=subprocess.PIPE, + ) + self.addCleanup(proc.stdout.close) + stdout, stderr = proc.communicate(b'quit\n') + self.assertNotIn(b'SyntaxError', stdout, + "Got a syntax error running test script under PDB") + + def test_issue46434(self): + # Temporarily patch in an extra help command which doesn't have a + # docstring to emulate what happens in an embeddable distribution + script = """ + def do_testcmdwithnodocs(self, arg): + pass + + import pdb + pdb.Pdb.do_testcmdwithnodocs = do_testcmdwithnodocs + """ + commands = """ + continue + help testcmdwithnodocs + """ + stdout, stderr = self.run_pdb_script(script, commands) + output = (stdout or '') + (stderr or '') + self.assertNotIn('AttributeError', output, + 'Calling help on a command with no docs should be handled gracefully') + self.assertIn("*** No help for 'testcmdwithnodocs'; __doc__ string missing", output, + 'Calling help on a command with no docs should print an error') + + def test_issue13183(self): + script = """ + from bar import bar + + def foo(): + bar() + + def nope(): + pass + + def foobar(): + foo() + nope() + + foobar() + """ + commands = """ + from bar import bar + break bar + continue + step + step + quit + """ + bar = """ + def bar(): + pass + """ + with open('bar.py', 'w') as f: + f.write(textwrap.dedent(bar)) + self.addCleanup(os_helper.unlink, 'bar.py') + stdout, stderr = self.run_pdb_script(script, commands) + self.assertTrue( + any('main.py(5)foo()->None' in l for l in stdout.splitlines()), + 'Fail to step into the caller after a return') + + def test_issue13120(self): + # Invoking "continue" on a non-main thread triggered an exception + # inside signal.signal. + + with open(os_helper.TESTFN, 'wb') as f: + f.write(textwrap.dedent(""" + import threading + import pdb + + def start_pdb(): + pdb.Pdb(readrc=False).set_trace() + x = 1 + y = 1 + + t = threading.Thread(target=start_pdb) + t.start()""").encode('ascii')) + cmd = [sys.executable, '-u', os_helper.TESTFN] + proc = subprocess.Popen(cmd, + stdout=subprocess.PIPE, + stdin=subprocess.PIPE, + stderr=subprocess.PIPE, + env={**os.environ, 'PYTHONIOENCODING': 'utf-8'} + ) + self.addCleanup(proc.stdout.close) + stdout, stderr = proc.communicate(b'cont\n') + self.assertNotIn(b'Error', stdout, + "Got an error running test script under PDB") + + def test_issue36250(self): + + with open(os_helper.TESTFN, 'wb') as f: + f.write(textwrap.dedent(""" + import threading + import pdb + + evt = threading.Event() + + def start_pdb(): + evt.wait() + pdb.Pdb(readrc=False).set_trace() + + t = threading.Thread(target=start_pdb) + t.start() + pdb.Pdb(readrc=False).set_trace() + evt.set() + t.join()""").encode('ascii')) + cmd = [sys.executable, '-u', os_helper.TESTFN] + proc = subprocess.Popen(cmd, + stdout=subprocess.PIPE, + stdin=subprocess.PIPE, + stderr=subprocess.PIPE, + env = {**os.environ, 'PYTHONIOENCODING': 'utf-8'} + ) + self.addCleanup(proc.stdout.close) + stdout, stderr = proc.communicate(b'cont\ncont\n') + self.assertNotIn(b'Error', stdout, + "Got an error running test script under PDB") + + def test_issue16180(self): + # A syntax error in the debuggee. + script = "def f: pass\n" + commands = '' + expected = "SyntaxError:" + stdout, stderr = self.run_pdb_script( + script, commands + ) + self.assertIn(expected, stderr, + '\n\nExpected:\n{}\nGot:\n{}\n' + 'Fail to handle a syntax error in the debuggee.' + .format(expected, stderr)) + + def test_issue84583(self): + # A syntax error from ast.literal_eval should not make pdb exit. + script = "import ast; ast.literal_eval('')\n" + commands = """ + continue + where + quit + """ + stdout, stderr = self.run_pdb_script(script, commands) + # The code should appear 3 times in the stdout/stderr: + # 1. when pdb starts (stdout) + # 2. when the exception is raised, in trackback (stderr) + # 3. in where command (stdout) + self.assertEqual(stdout.count("ast.literal_eval('')"), 2) + self.assertEqual(stderr.count("ast.literal_eval('')"), 1) + + def test_issue26053(self): + # run command of pdb prompt echoes the correct args + script = "print('hello')" + commands = """ + continue + run a b c + run d e f + quit + """ + stdout, stderr = self.run_pdb_script(script, commands) + res = '\n'.join([x.strip() for x in stdout.splitlines()]) + self.assertRegex(res, "Restarting .* with arguments:\na b c") + self.assertRegex(res, "Restarting .* with arguments:\nd e f") + + def test_issue58956(self): + # Set a breakpoint in a function that already exists on the call stack + # should enable the trace function for the frame. + script = """ + import bar + def foo(): + ret = bar.bar() + pass + foo() + """ + commands = """ + b bar.bar + c + b main.py:5 + c + p ret + quit + """ + bar = """ + def bar(): + return 42 + """ + with open('bar.py', 'w') as f: + f.write(textwrap.dedent(bar)) + self.addCleanup(os_helper.unlink, 'bar.py') + stdout, stderr = self.run_pdb_script(script, commands) + lines = stdout.splitlines() + self.assertIn('-> pass', lines) + self.assertIn('(Pdb) 42', lines) + + def test_step_into_botframe(self): + # gh-125422 + # pdb should not be able to step into the botframe (bdb.py) + script = "x = 1" + commands = """ + step + step + step + quit + """ + stdout, _ = self.run_pdb_script(script, commands) + self.assertIn("The program finished", stdout) + self.assertNotIn("bdb.py", stdout) + + def test_pdbrc_basic(self): + script = textwrap.dedent(""" + a = 1 + b = 2 + """) + + pdbrc = textwrap.dedent(""" + # Comments should be fine + n + p f"{a+8=}" + """) + + stdout, stderr = self.run_pdb_script(script, 'q\n', pdbrc=pdbrc, remove_home=True) + self.assertNotIn("SyntaxError", stdout) + self.assertIn("a+8=9", stdout) + self.assertIn("-> b = 2", stdout) + + def test_pdbrc_empty_line(self): + """Test that empty lines in .pdbrc are ignored.""" + + script = textwrap.dedent(""" + a = 1 + b = 2 + c = 3 + """) + + pdbrc = textwrap.dedent(""" + n + + """) + + stdout, stderr = self.run_pdb_script(script, 'q\n', pdbrc=pdbrc, remove_home=True) + self.assertIn("b = 2", stdout) + self.assertNotIn("c = 3", stdout) + + def test_pdbrc_alias(self): + script = textwrap.dedent(""" + class A: + def __init__(self): + self.attr = 1 + a = A() + b = 2 + """) + + pdbrc = textwrap.dedent(""" + alias pi for k in %1.__dict__.keys(): print(f"%1.{k} = {%1.__dict__[k]}") + until 6 + pi a + """) + + stdout, stderr = self.run_pdb_script(script, 'q\n', pdbrc=pdbrc, remove_home=True) + self.assertIn("a.attr = 1", stdout) + + def test_pdbrc_semicolon(self): + script = textwrap.dedent(""" + class A: + def __init__(self): + self.attr = 1 + a = A() + b = 2 + """) + + pdbrc = textwrap.dedent(""" + b 5;;c;;n + """) + + stdout, stderr = self.run_pdb_script(script, 'q\n', pdbrc=pdbrc, remove_home=True) + self.assertIn("-> b = 2", stdout) + + def test_pdbrc_commands(self): + script = textwrap.dedent(""" + class A: + def __init__(self): + self.attr = 1 + a = A() + b = 2 + """) + + pdbrc = textwrap.dedent(""" + b 6 + commands 1 ;; p a;; end + c + """) + + stdout, stderr = self.run_pdb_script(script, 'q\n', pdbrc=pdbrc, remove_home=True) + self.assertIn("<__main__.A object at", stdout) + + def test_readrc_kwarg(self): + script = textwrap.dedent(""" + print('hello') + """) + + stdout, stderr = self.run_pdb_script(script, 'q\n', pdbrc='invalid', remove_home=True) + self.assertIn("NameError: name 'invalid' is not defined", stdout) + + def test_readrc_homedir(self): + with os_helper.EnvironmentVarGuard() as env: + env.unset("HOME") + with os_helper.temp_dir() as temp_dir, patch("os.path.expanduser"): + rc_path = os.path.join(temp_dir, ".pdbrc") + os.path.expanduser.return_value = rc_path + with open(rc_path, "w") as f: + f.write("invalid") + self.assertEqual(pdb.Pdb().rcLines[0], "invalid") + + def test_header(self): + stdout = StringIO() + header = 'Nobody expects... blah, blah, blah' + with ExitStack() as resources: + resources.enter_context(patch('sys.stdout', stdout)) + # patch pdb.Pdb.set_trace() to avoid entering the debugger + resources.enter_context(patch.object(pdb.Pdb, 'set_trace')) + # We need to manually clear pdb.Pdb._last_pdb_instance so a + # new instance with stdout redirected could be created when + # pdb.set_trace() is called. + pdb.Pdb._last_pdb_instance = None + pdb.set_trace(header=header) + self.assertEqual(stdout.getvalue(), header + '\n') + + def test_run_module(self): + script = """print("SUCCESS")""" + commands = """ + continue + quit + """ + stdout, stderr = self.run_pdb_module(script, commands) + self.assertTrue(any("SUCCESS" in l for l in stdout.splitlines()), stdout) + + def test_module_is_run_as_main(self): + script = """ + if __name__ == '__main__': + print("SUCCESS") + """ + commands = """ + continue + quit + """ + stdout, stderr = self.run_pdb_module(script, commands) + self.assertTrue(any("SUCCESS" in l for l in stdout.splitlines()), stdout) + + def test_run_module_with_args(self): + commands = """ + continue + """ + self._run_pdb(["calendar", "-m"], commands, expected_returncode=1) + + _, stderr = self._run_pdb(["-m", "calendar", "-p", "1"], commands) + self.assertIn("unrecognized arguments: -p", stderr) + + stdout, _ = self._run_pdb(["-m", "calendar", "1"], commands) + self.assertIn("December", stdout) + + stdout, _ = self._run_pdb(["-m", "calendar", "--type", "text"], commands) + self.assertIn("December", stdout) + + def test_run_script_with_args(self): + script = """ + import sys + print(sys.argv[1:]) + """ + commands = """ + continue + quit + """ + + stdout, stderr = self.run_pdb_script(script, commands, script_args=["--bar", "foo"]) + self.assertIn("['--bar', 'foo']", stdout) + + def test_breakpoint(self): + script = """ + if __name__ == '__main__': + pass + print("SUCCESS") + pass + """ + commands = """ + b 3 + quit + """ + stdout, stderr = self.run_pdb_module(script, commands) + self.assertTrue(any("Breakpoint 1 at" in l for l in stdout.splitlines()), stdout) + self.assertTrue(all("SUCCESS" not in l for l in stdout.splitlines()), stdout) + + def test_run_pdb_with_pdb(self): + commands = """ + c + quit + """ + stdout, stderr = self._run_pdb(["-m", "pdb"], commands) + self.assertIn( + pdb._usage, + stdout.replace('\r', '') # remove \r for windows + ) + + def test_module_without_a_main(self): + module_name = 't_main' + os_helper.rmtree(module_name) + init_file = module_name + '/__init__.py' + os.mkdir(module_name) + with open(init_file, 'w'): + pass + self.addCleanup(os_helper.rmtree, module_name) + stdout, stderr = self._run_pdb( + ['-m', module_name], "", expected_returncode=1 + ) + self.assertIn("ImportError: No module named t_main.__main__;", stdout) + + def test_package_without_a_main(self): + pkg_name = 't_pkg' + module_name = 't_main' + os_helper.rmtree(pkg_name) + modpath = pkg_name + '/' + module_name + os.makedirs(modpath) + with open(modpath + '/__init__.py', 'w'): + pass + self.addCleanup(os_helper.rmtree, pkg_name) + stdout, stderr = self._run_pdb( + ['-m', modpath.replace('/', '.')], "", expected_returncode=1 + ) + self.assertIn( + "'t_pkg.t_main' is a package and cannot be directly executed", + stdout) + + def test_nonexistent_module(self): + assert not os.path.exists(os_helper.TESTFN) + stdout, stderr = self._run_pdb(["-m", os_helper.TESTFN], "", expected_returncode=1) + self.assertIn(f"ImportError: No module named {os_helper.TESTFN}", stdout) + + def test_dir_as_script(self): + with os_helper.temp_dir() as temp_dir: + stdout, stderr = self._run_pdb([temp_dir], "", expected_returncode=1) + self.assertIn(f"Error: {temp_dir} is a directory", stdout) + + def test_invalid_cmd_line_options(self): + stdout, stderr = self._run_pdb(["-c"], "", expected_returncode=2) + self.assertIn(f"pdb: error: argument -c/--command: expected one argument", stderr.split('\n')[1]) + stdout, stderr = self._run_pdb(["--spam", "-m", "pdb"], "", expected_returncode=2) + self.assertIn(f"pdb: error: unrecognized arguments: --spam", stderr.split('\n')[1]) + + def test_blocks_at_first_code_line(self): + script = """ + #This is a comment, on line 2 + + print("SUCCESS") + """ + commands = """ + quit + """ + stdout, stderr = self.run_pdb_module(script, commands) + self.assertTrue(any("__main__.py(4)()" + in l for l in stdout.splitlines()), stdout) + + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_file_modified_after_execution(self): + script = """ + print("hello") + """ + + # the time.sleep is needed for low-resolution filesystems like HFS+ + commands = """ + filename = $_frame.f_code.co_filename + f = open(filename, "w") + f.write("print('goodbye')") + import time; time.sleep(1) + f.close() + ll + """ + + stdout, stderr = self.run_pdb_script(script, commands) + self.assertIn("WARNING:", stdout) + self.assertIn("was edited", stdout) + + def test_file_modified_and_immediately_restarted(self): + script = """ + print("hello") + """ + + # the time.sleep is needed for low-resolution filesystems like HFS+ + commands = """ + filename = $_frame.f_code.co_filename + f = open(filename, "w") + f.write("print('goodbye')") + import time; time.sleep(1) + f.close() + restart + """ + + stdout, stderr = self.run_pdb_script(script, commands) + self.assertNotIn("WARNING:", stdout) + self.assertNotIn("was edited", stdout) + + def test_file_modified_after_execution_with_multiple_instances(self): + # the time.sleep is needed for low-resolution filesystems like HFS+ + script = """ + import pdb; pdb.Pdb().set_trace() + with open(__file__, "w") as f: + f.write("print('goodbye')\\n" * 5) + import time; time.sleep(1) + import pdb; pdb.Pdb().set_trace() + """ + + commands = """ + continue + continue + """ + + filename = 'main.py' + with open(filename, 'w') as f: + f.write(textwrap.dedent(script)) + self.addCleanup(os_helper.unlink, filename) + self.addCleanup(os_helper.rmtree, '__pycache__') + cmd = [sys.executable, filename] + with subprocess.Popen( + cmd, + stdout=subprocess.PIPE, + stdin=subprocess.PIPE, + stderr=subprocess.PIPE, + env = {**os.environ, 'PYTHONIOENCODING': 'utf-8'}, + ) as proc: + stdout, _ = proc.communicate(str.encode(commands)) + stdout = stdout and bytes.decode(stdout) + + self.assertEqual(proc.returncode, 0) + self.assertIn("WARNING:", stdout) + self.assertIn("was edited", stdout) + + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_file_modified_after_execution_with_restart(self): + script = """ + import random + # Any code with a source to step into so this script is not checked + # for changes when it's being changed + random.randint(1, 4) + print("hello") + """ + + commands = """ + ll + n + s + filename = $_frame.f_back.f_code.co_filename + def change_file(content, filename): + with open(filename, "w") as f: + f.write(f"print({content})") + + change_file('world', filename) + restart + ll + """ + + stdout, stderr = self.run_pdb_script(script, commands) + # Make sure the code is running correctly and the file is edited + self.assertIn("hello", stdout) + self.assertIn("world", stdout) + # The file was edited, but restart should clear the state and consider + # the file as up to date + self.assertNotIn("WARNING:", stdout) + + def test_post_mortem_restart(self): + script = """ + def foo(): + raise ValueError("foo") + foo() + """ + + commands = """ + continue + restart + continue + quit + """ + + stdout, stderr = self.run_pdb_script(script, commands) + self.assertIn("Restarting", stdout) + + def test_relative_imports(self): + self.module_name = 't_main' + os_helper.rmtree(self.module_name) + main_file = self.module_name + '/__main__.py' + init_file = self.module_name + '/__init__.py' + module_file = self.module_name + '/module.py' + self.addCleanup(os_helper.rmtree, self.module_name) + os.mkdir(self.module_name) + with open(init_file, 'w') as f: + f.write(textwrap.dedent(""" + top_var = "VAR from top" + """)) + with open(main_file, 'w') as f: + f.write(textwrap.dedent(""" + from . import top_var + from .module import var + from . import module + pass # We'll stop here and print the vars + """)) + with open(module_file, 'w') as f: + f.write(textwrap.dedent(""" + var = "VAR from module" + var2 = "second var" + """)) + commands = """ + b 5 + c + p top_var + p var + p module.var2 + quit + """ + stdout, _ = self._run_pdb(['-m', self.module_name], commands) + self.assertTrue(any("VAR from module" in l for l in stdout.splitlines()), stdout) + self.assertTrue(any("VAR from top" in l for l in stdout.splitlines())) + self.assertTrue(any("second var" in l for l in stdout.splitlines())) + + def test_relative_imports_on_plain_module(self): + # Validates running a plain module. See bpo32691 + self.module_name = 't_main' + os_helper.rmtree(self.module_name) + main_file = self.module_name + '/runme.py' + init_file = self.module_name + '/__init__.py' + module_file = self.module_name + '/module.py' + self.addCleanup(os_helper.rmtree, self.module_name) + os.mkdir(self.module_name) + with open(init_file, 'w') as f: + f.write(textwrap.dedent(""" + top_var = "VAR from top" + """)) + with open(main_file, 'w') as f: + f.write(textwrap.dedent(""" + from . import module + pass # We'll stop here and print the vars + """)) + with open(module_file, 'w') as f: + f.write(textwrap.dedent(""" + var = "VAR from module" + """)) + commands = """ + b 3 + c + p module.var + quit + """ + stdout, _ = self._run_pdb(['-m', self.module_name + '.runme'], commands) + self.assertTrue(any("VAR from module" in l for l in stdout.splitlines()), stdout) + + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_errors_in_command(self): + commands = "\n".join([ + 'print(]', + 'debug print(', + 'debug doesnotexist', + 'c', + ]) + stdout, _ = self.run_pdb_script('pass', commands + '\n') + + self.assertEqual(stdout.splitlines()[1:], [ + '-> pass', + "(Pdb) *** SyntaxError: closing parenthesis ']' does not match opening " + "parenthesis '('", + + '(Pdb) ENTERING RECURSIVE DEBUGGER', + '*** SyntaxError: \'(\' was never closed', + 'LEAVING RECURSIVE DEBUGGER', + + '(Pdb) ENTERING RECURSIVE DEBUGGER', + '> (1)()', + "((Pdb)) *** NameError: name 'doesnotexist' is not defined", + 'LEAVING RECURSIVE DEBUGGER', + '(Pdb) ', + ]) + + def test_issue34266(self): + '''do_run handles exceptions from parsing its arg''' + def check(bad_arg, msg): + commands = "\n".join([ + f'run {bad_arg}', + 'q', + ]) + stdout, _ = self.run_pdb_script('pass', commands + '\n') + self.assertEqual(stdout.splitlines()[1:], [ + '-> pass', + f'(Pdb) *** Cannot run {bad_arg}: {msg}', + '(Pdb) ', + ]) + check('\\', 'No escaped character') + check('"', 'No closing quotation') + + def test_issue42384(self): + '''When running `python foo.py` sys.path[0] is an absolute path. `python -m pdb foo.py` should behave the same''' + script = textwrap.dedent(""" + import sys + print('sys.path[0] is', sys.path[0]) + """) + commands = 'c\nq' + + with os_helper.temp_cwd() as cwd: + expected = f'(Pdb) sys.path[0] is {os.path.realpath(cwd)}' + + stdout, stderr = self.run_pdb_script(script, commands) + + self.assertEqual(stdout.split('\n')[2].rstrip('\r'), expected) + + @os_helper.skip_unless_symlink + def test_issue42384_symlink(self): + '''When running `python foo.py` sys.path[0] resolves symlinks. `python -m pdb foo.py` should behave the same''' + script = textwrap.dedent(""" + import sys + print('sys.path[0] is', sys.path[0]) + """) + commands = 'c\nq' + + with os_helper.temp_cwd() as cwd: + cwd = os.path.realpath(cwd) + dir_one = os.path.join(cwd, 'dir_one') + dir_two = os.path.join(cwd, 'dir_two') + expected = f'(Pdb) sys.path[0] is {dir_one}' + + os.mkdir(dir_one) + with open(os.path.join(dir_one, 'foo.py'), 'w') as f: + f.write(script) + os.mkdir(dir_two) + os.symlink(os.path.join(dir_one, 'foo.py'), os.path.join(dir_two, 'foo.py')) + + stdout, stderr = self._run_pdb([os.path.join('dir_two', 'foo.py')], commands) + + self.assertEqual(stdout.split('\n')[2].rstrip('\r'), expected) + + def test_safe_path(self): + """ With safe_path set, pdb should not mangle sys.path[0]""" + + script = textwrap.dedent(""" + import sys + import random + print('sys.path[0] is', sys.path[0]) + """) + commands = 'c\n' + + + with os_helper.temp_cwd() as cwd: + stdout, _ = self.run_pdb_script(script, commands, extra_env={'PYTHONSAFEPATH': '1'}) + + unexpected = f'sys.path[0] is {os.path.realpath(cwd)}' + self.assertNotIn(unexpected, stdout) + + def test_issue42383(self): + with os_helper.temp_cwd() as cwd: + with open('foo.py', 'w') as f: + s = textwrap.dedent(""" + print('The correct file was executed') + + import os + os.chdir("subdir") + """) + f.write(s) + + subdir = os.path.join(cwd, 'subdir') + os.mkdir(subdir) + os.mkdir(os.path.join(subdir, 'subdir')) + wrong_file = os.path.join(subdir, 'foo.py') + + with open(wrong_file, 'w') as f: + f.write('print("The wrong file was executed")') + + stdout, stderr = self._run_pdb(['foo.py'], 'c\nc\nq') + expected = '(Pdb) The correct file was executed' + self.assertEqual(stdout.split('\n')[6].rstrip('\r'), expected) + + def test_gh_94215_crash(self): + script = """\ + def func(): + def inner(v): pass + inner( + 42 + ) + func() + """ + commands = textwrap.dedent(""" + break func + continue + next + next + jump 2 + """) + stdout, stderr = self.run_pdb_script(script, commands) + self.assertFalse(stderr) + + def test_gh_93696_frozen_list(self): + frozen_src = """ + def func(): + x = "Sentinel string for gh-93696" + print(x) + """ + host_program = """ + import os + import sys + + def _create_fake_frozen_module(): + with open('gh93696.py') as f: + src = f.read() + + # this function has a co_filename as if it were in a frozen module + dummy_mod = compile(src, "", "exec") + func_code = dummy_mod.co_consts[0] + + mod = type(sys)("gh93696") + mod.func = type(lambda: None)(func_code, mod.__dict__) + mod.__file__ = 'gh93696.py' + + return mod + + mod = _create_fake_frozen_module() + mod.func() + """ + commands_list = """ + break 20 + continue + step + break 4 + list + quit + """ + commands_longlist = """ + break 20 + continue + step + break 4 + longlist + quit + """ + with open('gh93696.py', 'w') as f: + f.write(textwrap.dedent(frozen_src)) + + with open('gh93696_host.py', 'w') as f: + f.write(textwrap.dedent(host_program)) + + self.addCleanup(os_helper.unlink, 'gh93696.py') + self.addCleanup(os_helper.unlink, 'gh93696_host.py') + + # verify that pdb found the source of the "frozen" function and it + # shows the breakpoint at the correct line for both list and longlist + for commands in (commands_list, commands_longlist): + stdout, _ = self._run_pdb(["gh93696_host.py"], commands) + self.assertIn('x = "Sentinel string for gh-93696"', stdout, "Sentinel statement not found") + self.assertIn('4 B', stdout, "breakpoint not found") + self.assertIn('-> def func():', stdout, "stack entry not found") + + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_empty_file(self): + script = '' + commands = 'q\n' + # We check that pdb stopped at line 0, but anything reasonable + # is acceptable here, as long as it does not halt + stdout, _ = self.run_pdb_script(script, commands) + self.assertIn('main.py(0)', stdout) + stdout, _ = self.run_pdb_module(script, commands) + self.assertIn('__main__.py(0)', stdout) + + def test_non_utf8_encoding(self): + script_dir = os.path.join(os.path.dirname(__file__), 'encoded_modules') + for filename in os.listdir(script_dir): + if filename.endswith(".py"): + self._run_pdb([os.path.join(script_dir, filename)], 'q') + + def test_zipapp(self): + with os_helper.temp_dir() as temp_dir: + os.mkdir(os.path.join(temp_dir, 'source')) + script = textwrap.dedent( + """ + def f(x): + return x + 1 + f(21 + 21) + """ + ) + with open(os.path.join(temp_dir, 'source', '__main__.py'), 'w') as f: + f.write(script) + zipapp.create_archive(os.path.join(temp_dir, 'source'), + os.path.join(temp_dir, 'zipapp.pyz')) + stdout, _ = self._run_pdb([os.path.join(temp_dir, 'zipapp.pyz')], '\n'.join([ + 'b f', + 'c', + 'p x', + 'q' + ])) + self.assertIn('42', stdout) + self.assertIn('return x + 1', stdout) + + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_zipimport(self): + with os_helper.temp_dir() as temp_dir: + os.mkdir(os.path.join(temp_dir, 'source')) + zipmodule = textwrap.dedent( + """ + def bar(): + pass + """ + ) + script = textwrap.dedent( + f""" + import sys; sys.path.insert(0, {repr(os.path.join(temp_dir, 'zipmodule.zip'))}) + import foo + foo.bar() + """ + ) + + with zipfile.ZipFile(os.path.join(temp_dir, 'zipmodule.zip'), 'w') as zf: + zf.writestr('foo.py', zipmodule) + with open(os.path.join(temp_dir, 'script.py'), 'w') as f: + f.write(script) + + stdout, _ = self._run_pdb([os.path.join(temp_dir, 'script.py')], '\n'.join([ + 'n', + 'n', + 'b foo.bar', + 'c', + 'p f"break in {$_frame.f_code.co_name}"', + 'q' + ])) + self.assertIn('break in bar', stdout) + + def test_end_of_options_separator(self): + # gh-148615: Test parsing when '--' separator is used + script = "import sys; print(f'ARGS: {sys.argv[1:]}')" + with open(os_helper.TESTFN, 'w', encoding='utf-8') as f: + f.write(script) + stdout, _ = self._run_pdb(['--', os_helper.TESTFN, '-foo'], 'c\nq') + self.assertIn("ARGS: ['-foo']", stdout) + stdout, _ = self._run_pdb(['-c', 'continue', '--', os_helper.TESTFN, '-c', 'foo'], 'q') + self.assertIn("ARGS: ['-c', 'foo']", stdout) + stdout, stderr = self._run_pdb(['--'], 'q', expected_returncode=2) + self.assertIn("missing script or module to run", stderr) + stdout, stderr = self._run_pdb(['-x', '--', os_helper.TESTFN], 'q', expected_returncode=2) + self.assertIn("unrecognized arguments: -x", stderr) + stdout, _ = self._run_pdb([os_helper.TESTFN, '--', 'arg'], 'c\nq') + self.assertIn("ARGS: ['--', 'arg']", stdout) + with os_helper.temp_cwd(): + with open('mymod.py', 'w', encoding='utf-8') as f: + f.write(script) + stdout, _ = self._run_pdb(['-m', 'mymod', '--', 'arg'], 'c\nq') + self.assertIn("ARGS: ['--', 'arg']", stdout) + + def test_issue_59000(self): + script = """ + def foo(): + pass + + class C: + def foo(self): + pass + """ + commands = """ + break C.foo + quit + """ + stdout, stderr = self.run_pdb_script(script, commands) + self.assertIn("The specified object 'C.foo' is not a function", stdout) + + +class ChecklineTests(unittest.TestCase): + def setUp(self): + linecache.clearcache() # Pdb.checkline() uses linecache.getline() + + def tearDown(self): + os_helper.unlink(os_helper.TESTFN) + + def test_checkline_before_debugging(self): + with open(os_helper.TESTFN, "w") as f: + f.write("print(123)") + db = pdb.Pdb() + self.assertEqual(db.checkline(os_helper.TESTFN, 1), 1) + + def test_checkline_after_reset(self): + with open(os_helper.TESTFN, "w") as f: + f.write("print(123)") + db = pdb.Pdb() + db.reset() + self.assertEqual(db.checkline(os_helper.TESTFN, 1), 1) + + def test_checkline_is_not_executable(self): + # Test for comments, docstrings and empty lines + s = textwrap.dedent(""" + # Comment + \"\"\" docstring \"\"\" + ''' docstring ''' + + """) + with open(os_helper.TESTFN, "w") as f: + f.write(s) + num_lines = len(s.splitlines()) + 2 # Test for EOF + with redirect_stdout(StringIO()): + db = pdb.Pdb() + for lineno in range(num_lines): + self.assertFalse(db.checkline(os_helper.TESTFN, lineno)) + + +@support.requires_subprocess() +class PdbTestInline(unittest.TestCase): + @unittest.skipIf(sys.flags.safe_path, + 'PYTHONSAFEPATH changes default sys.path') + def _run_script(self, script, commands, + expected_returncode=0, + extra_env=None): + self.addCleanup(os_helper.rmtree, '__pycache__') + filename = 'main.py' + with open(filename, 'w') as f: + f.write(textwrap.dedent(script)) + self.addCleanup(os_helper.unlink, filename) + + commands = textwrap.dedent(commands) + + cmd = [sys.executable, 'main.py'] + if extra_env is not None: + env = os.environ | extra_env + else: + env = os.environ + with subprocess.Popen( + cmd, + stdout=subprocess.PIPE, + stdin=subprocess.PIPE, + stderr=subprocess.PIPE, + env = {**env, 'PYTHONIOENCODING': 'utf-8'} + ) as proc: + stdout, stderr = proc.communicate(str.encode(commands)) + stdout = bytes.decode(stdout) if isinstance(stdout, bytes) else stdout + stderr = bytes.decode(stderr) if isinstance(stderr, bytes) else stderr + self.assertEqual( + proc.returncode, + expected_returncode, + f"Unexpected return code\nstdout: {stdout}\nstderr: {stderr}" + ) + return stdout, stderr + + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_quit(self): + script = """ + x = 1 + breakpoint() + """ + + commands = """ + quit + n + p x + 1 + quit + y + """ + + stdout, stderr = self._run_script(script, commands, expected_returncode=1) + self.assertIn("2", stdout) + self.assertIn("Quit anyway", stdout) + # Closing stdin will quit the debugger anyway so we need to confirm + # it's the quit command that does the job + # call/return event will print --Call-- and --Return-- + self.assertNotIn("--", stdout) + # Normal exit should not print anything to stderr + self.assertEqual(stderr, "") + # The quit prompt should be printed exactly twice + self.assertEqual(stdout.count("Quit anyway"), 2) + + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_quit_after_interact(self): + """ + interact command will set sys.ps1 temporarily, we need to make sure + that it's restored and pdb does not believe it's in interactive mode + after interact is done. + """ + script = """ + x = 1 + breakpoint() + """ + + commands = """ + interact + quit() + q + y + """ + + stdout, stderr = self._run_script(script, commands, expected_returncode=1) + # Normal exit should not print anything to stderr + self.assertEqual(stderr, "") + # The quit prompt should be printed exactly once + self.assertEqual(stdout.count("Quit anyway"), 1) + # BdbQuit should not be printed + self.assertNotIn("BdbQuit", stdout) + + def test_set_trace_with_skip(self): + """GH-82897 + Inline set_trace() should break unconditionally. This example is a + bit oversimplified, but as `pdb.set_trace()` uses the previous Pdb + instance, it's possible that we had a previous pdb instance with + skip values when we use `pdb.set_trace()` - it would be confusing + to users when such inline breakpoints won't break immediately. + """ + script = textwrap.dedent(""" + import pdb + def foo(): + x = 40 + 2 + pdb.Pdb(skip=['__main__']).set_trace() + foo() + """) + commands = """ + p x + c + """ + stdout, _ = self._run_script(script, commands) + self.assertIn("42", stdout) + + def test_readline_not_imported(self): + """GH-138860 + Directly or indirectly importing readline might deadlock a subprocess + if it's launched with process_group=0 or preexec_fn=setpgrp + + It's also a pattern that readline is never imported with just import pdb. + + This test is to ensure that readline is not imported for import pdb. + It's possible that we have a good reason to do that in the future. + """ + + script = textwrap.dedent(""" + import sys + import pdb + if "readline" in sys.modules: + print("readline imported") + """) + commands = "" + stdout, stderr = self._run_script(script, commands) + self.assertNotIn("readline imported", stdout) + self.assertEqual(stderr, "") + + +@support.force_colorized_test_class +class PdbTestColorize(unittest.TestCase): + def setUp(self): + self._original_can_colorize = _colorize.can_colorize + # Force colorize to be enabled because we are sending data + # to a StringIO + _colorize.can_colorize = lambda *args, **kwargs: True + + def tearDown(self): + _colorize.can_colorize = self._original_can_colorize + + def test_code_display(self): + output = io.StringIO() + p = pdb.Pdb(stdout=output, colorize=True) + p.set_trace(commands=['ll', 'c']) + self.assertIn("\x1b", output.getvalue()) + + output = io.StringIO() + p = pdb.Pdb(stdout=output, colorize=False) + p.set_trace(commands=['ll', 'c']) + self.assertNotIn("\x1b", output.getvalue()) + + output = io.StringIO() + p = pdb.Pdb(stdout=output) + p.set_trace(commands=['ll', 'c']) + self.assertNotIn("\x1b", output.getvalue()) + + def test_stack_entry(self): + output = io.StringIO() + p = pdb.Pdb(stdout=output, colorize=True) + p.set_trace(commands=['w', 'c']) + self.assertIn("\x1b", output.getvalue()) + + +@support.force_not_colorized_test_class +@support.requires_subprocess() +class TestREPLSession(unittest.TestCase): + @unittest.expectedFailureIf(sys.platform == "android", "TODO: RUSTPYTHON") + def test_return_from_inline_mode_to_REPL(self): + # GH-124703: Raise BdbQuit when exiting pdb in REPL session. + # This allows the REPL session to continue. + from test.test_repl import spawn_repl + p = spawn_repl() + user_input = """ + x = 'Spam' + import pdb + pdb.set_trace(commands=['x + "During"', 'q']) + x + 'After' + """ + p.stdin.write(textwrap.dedent(user_input)) + output = kill_python(p) + self.assertIn('SpamDuring', output) + self.assertNotIn("Quit anyway", output) + self.assertIn('BdbQuit', output) + self.assertIn('SpamAfter', output) + self.assertEqual(p.returncode, 0) + + +@support.force_not_colorized_test_class +@support.requires_subprocess() +class PdbTestReadline(unittest.TestCase): + + @classmethod + def setUpClass(cls): + # Ensure that the readline module is loaded + # If this fails, the test is skipped because SkipTest will be raised + readline = import_module('readline') + if readline.backend == "editline": + raise unittest.SkipTest("libedit readline is not supported for pdb") + + def test_basic_completion(self): + script = textwrap.dedent(""" + import pdb; pdb.Pdb().set_trace() + # Concatenate strings so that the output doesn't appear in the source + print('hello' + '!') + """) + + # List everything starting with 'co', there should be multiple matches + # then add ntin and complete 'contin' to 'continue' + input = b"co\t\tntin\t\n" + + output = run_pty(script, input) + + self.assertIn(b'commands', output) + self.assertIn(b'condition', output) + self.assertIn(b'continue', output) + self.assertIn(b'hello!', output) + + def test_expression_completion(self): + script = textwrap.dedent(""" + value = "speci" + import pdb; pdb.Pdb().set_trace() + """) + + # Complete: value + 'al' + input = b"val\t + 'al'\n" + # Complete: p value + 'es' + input += b"p val\t + 'es'\n" + # Complete: $_frame + input += b"$_fra\t\n" + # Continue + input += b"c\n" + + output = run_pty(script, input) + + self.assertIn(b'special', output) + self.assertIn(b'species', output) + self.assertIn(b'$_frame', output) + + def test_builtin_completion(self): + script = textwrap.dedent(""" + value = "speci" + import pdb; pdb.Pdb().set_trace() + """) + + # Complete: print(value + 'al') + input = b"pri\tval\t + 'al')\n" + + # Continue + input += b"c\n" + + output = run_pty(script, input) + + self.assertIn(b'special', output) + + def test_convvar_completion(self): + script = textwrap.dedent(""" + import pdb; pdb.Pdb().set_trace() + """) + + # Complete: $_frame + input = b"$_fram\t\n" + + # Complete: $_frame.f_lineno + 100 + input += b"$_frame.f_line\t + 100\n" + + # Continue + input += b"c\n" + + output = run_pty(script, input) + + self.assertIn(b' 0:\n" + input += b"x += 1\n" + input += b"return x\n" + # We need to do backspaces to remove the auto-indentation + input += b"\x08\x08\x08\x08else:\n" + input += b"return -x\n" + input += b"\n" + input += b"f(-21-21)\n" + input += b"c\n" + + output = run_pty(script, input) + + self.assertIn(b'42', output) + + def test_multiline_completion(self): + script = textwrap.dedent(""" + import pdb; pdb.Pdb().set_trace() + """) + + input = b"def func():\n" + # Auto-indent + # Complete: return 40 + 2 + input += b"ret\t 40 + 2\n" + input += b"\n" + # Complete: func() + input += b"fun\t()\n" + input += b"c\n" + + output = run_pty(script, input) + + self.assertIn(b'42', output) + + @unittest.skipIf(sys.platform.startswith('freebsd'), + '\\x08 is not interpreted as backspace on FreeBSD') + def test_multiline_indent_completion(self): + script = textwrap.dedent(""" + import pdb; pdb.Pdb().set_trace() + """) + + # \t should always complete a 4-space indent + # This piece of code will raise an IndentationError or a SyntaxError + # if the completion is not working as expected + input = textwrap.dedent("""\ + def func(): + a = 1 + \x08\ta += 1 + \x08\x08\ta += 1 + \x08\x08\x08\ta += 1 + \x08\x08\x08\x08\tif a > 0: + a += 1 + \x08\x08\x08\x08return a + + func() + c + """).encode() + + output = run_pty(script, input) + + self.assertIn(b'5', output) + self.assertNotIn(b'Error', output) + + def test_interact_completion(self): + script = textwrap.dedent(""" + value = "speci" + import pdb; pdb.Pdb().set_trace() + """) + + # Enter interact mode + input = b"interact\n" + # Should fail to complete 'display' because that's a pdb command + input += b"disp\t\n" + # 'value' should still work + input += b"val\t + 'al'\n" + # Let's define a function to test + input += b"def f():\n" + input += b"\treturn 42\n" + input += b"\n" + input += b"f() * 2\n" + # Exit interact mode + input += b"exit()\n" + # continue + input += b"c\n" + + output = run_pty(script, input) + + self.assertIn(b"'disp' is not defined", output) + self.assertIn(b'special', output) + self.assertIn(b'84', output) + + +def load_tests(loader, tests, pattern): + from test import test_pdb + + def setUpPdbBackend(backend): + def setUp(test): + import pdb + pdb.set_default_backend(backend) + return setUp + + def tearDown(test): + # Ensure that asyncio state has been cleared at the end of the test. + # This prevents a "test altered the execution environment" warning if + # asyncio features are used. + _set_event_loop_policy(None) + + # A doctest of pdb could have residues. For example, pdb could still + # be running, or breakpoints might be left uncleared. These residues + # could potentially interfere with the following test, especially + # when we switch backends. Here we clear all the residues to restore + # to its pre-test state. + + # clear all the breakpoints left + import bdb + bdb.Breakpoint.clearBreakpoints() + + # Stop tracing and clear the pdb instance cache + if pdb.Pdb._last_pdb_instance: + pdb.Pdb._last_pdb_instance.stop_trace() + pdb.Pdb._last_pdb_instance = None + + # If garbage objects are collected right after we start tracing, we + # could stop at __del__ of the object which would fail the test. + gc.collect() + + from test.support.rustpython import DocTestChecker # TODO: RUSTPYTHON + tests.addTest( + doctest.DocTestSuite( + test_pdb, + setUp=setUpPdbBackend('monitoring'), + tearDown=tearDown, + checker=DocTestChecker(), # TODO: RUSTPYTHON + ) + ) + tests.addTest( + doctest.DocTestSuite( + test_pdb, + setUp=setUpPdbBackend('settrace'), + tearDown=tearDown, + checker=DocTestChecker(), # TODO: RUSTPYTHON + ) + ) + return tests + + +if __name__ == '__main__': + unittest.main() From 463217425752a30d083543868ab6aba230b63536 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Thu, 11 Jun 2026 07:36:40 +0300 Subject: [PATCH 064/339] Don't skip test in `test_typing.py` (#8073) --- Lib/test/test_typing.py | 1 - 1 file changed, 1 deletion(-) diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py index 50e491229..ec91f818c 100644 --- a/Lib/test/test_typing.py +++ b/Lib/test/test_typing.py @@ -3265,7 +3265,6 @@ class ProtocolTests(BaseTestCase): self.assertIsSubclass(NotAProtocolButAnImplicitSubclass2, CallableMembersProto) self.assertIsSubclass(NotAProtocolButAnImplicitSubclass3, CallableMembersProto) - @unittest.skip("TODO: RUSTPYTHON; (no gc)") def test_isinstance_checks_not_at_whim_of_gc(self): self.addCleanup(gc.enable) gc.disable() From 8585981ddaec4a2c7d03d84eaf18f3a583a1d604 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Thu, 11 Jun 2026 07:36:51 +0300 Subject: [PATCH 065/339] Update some tests to 3.14.5 (#8072) * Update `test_poll.py` to 3.14.5 * Update `test_utf8_mode.py` to 3.14.5 * Align patches for `test_unpack.py` --- Lib/test/test_poll.py | 11 ++++++++--- Lib/test/test_unpack.py | 3 +-- Lib/test/test_utf8_mode.py | 12 ++++-------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Lib/test/test_poll.py b/Lib/test/test_poll.py index a9bfb755c..1001b63ec 100644 --- a/Lib/test/test_poll.py +++ b/Lib/test/test_poll.py @@ -8,7 +8,7 @@ import threading import time import unittest from test.support import ( - cpython_only, requires_subprocess, requires_working_socket + cpython_only, requires_subprocess, requires_working_socket, requires_resource ) from test.support import threading_helper from test.support.os_helper import TESTFN @@ -124,6 +124,7 @@ class PollTests(unittest.TestCase): # select(), modified to use poll() instead. @requires_subprocess() + @requires_resource('walltime') def test_poll2(self): cmd = 'for i in 0 1 2 3 4 5 6 7 8 9; do echo testing...; sleep 1; done' proc = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, @@ -171,7 +172,10 @@ class PollTests(unittest.TestCase): @cpython_only def test_poll_c_limits(self): - from _testcapi import USHRT_MAX, INT_MAX, UINT_MAX + try: + from _testcapi import USHRT_MAX, INT_MAX, UINT_MAX + except ImportError: + raise unittest.SkipTest("requires _testcapi") pollster = select.poll() pollster.register(1) @@ -181,7 +185,7 @@ class PollTests(unittest.TestCase): self.assertRaises(OverflowError, pollster.poll, INT_MAX + 1) self.assertRaises(OverflowError, pollster.poll, UINT_MAX + 1) - @unittest.skip("TODO: RUSTPYTHON fd reallocation") + @unittest.skip("TODO: RUSTPYTHON; fd reallocation") @threading_helper.reap_threads def test_threaded_poll(self): r, w = os.pipe() @@ -195,6 +199,7 @@ class PollTests(unittest.TestCase): pollster = select.poll() for fd in rfds: pollster.register(fd, select.POLLIN) + t = threading.Thread(target=pollster.poll) t.start() try: diff --git a/Lib/test/test_unpack.py b/Lib/test/test_unpack.py index 305da05b7..adb30c0fe 100644 --- a/Lib/test/test_unpack.py +++ b/Lib/test/test_unpack.py @@ -198,8 +198,7 @@ For evil cases like these as well, no actual count to be shown __test__ = {'doctests' : doctests} def load_tests(loader, tests, pattern): - from test.support.rustpython import DocTestChecker # TODO: RUSTPYTHON - tests.addTest(doctest.DocTestSuite(checker=DocTestChecker())) # XXX: RUSTPYTHON + tests.addTest(doctest.DocTestSuite()) return tests diff --git a/Lib/test/test_utf8_mode.py b/Lib/test/test_utf8_mode.py index 176a21127..3990eb8be 100644 --- a/Lib/test/test_utf8_mode.py +++ b/Lib/test/test_utf8_mode.py @@ -9,10 +9,9 @@ import textwrap import unittest from test import support from test.support.script_helper import assert_python_ok, assert_python_failure -from test.support import os_helper +from test.support import os_helper, MS_WINDOWS -MS_WINDOWS = (sys.platform == 'win32') POSIX_LOCALES = ('C', 'POSIX') VXWORKS = (sys.platform == "vxworks") @@ -67,8 +66,7 @@ class UTF8ModeTests(unittest.TestCase): PYTHONLEGACYWINDOWSFSENCODING='1') self.assertEqual(out, '0') - # TODO: RUSTPYTHON - @unittest.expectedFailure + @unittest.expectedFailure # TODO: RUSTPYTHON def test_env_var(self): code = 'import sys; print(sys.flags.utf8_mode)' @@ -125,8 +123,7 @@ class UTF8ModeTests(unittest.TestCase): PYTHONLEGACYWINDOWSFSENCODING='1') self.assertEqual(out, 'mbcs/replace') - # TODO: RUSTPYTHON - @unittest.expectedFailure + @unittest.expectedFailure # TODO: RUSTPYTHON def test_stdio(self): code = textwrap.dedent(''' import sys @@ -259,8 +256,7 @@ class UTF8ModeTests(unittest.TestCase): out = self.get_output('-X', 'utf8', '-E', '-c', code) self.assertEqual(out, '1') - # TODO: RUSTPYTHON - @unittest.expectedFailure + @unittest.expectedFailure # TODO: RUSTPYTHON @unittest.skipIf(MS_WINDOWS, "os.device_encoding() doesn't implement " "the UTF-8 Mode on Windows") From 3492c1cef1b95f29c16e78e153669ba5e5749deb Mon Sep 17 00:00:00 2001 From: Kwak Byoung Min <67214970+doma17@users.noreply.github.com> Date: Thu, 11 Jun 2026 13:38:07 +0900 Subject: [PATCH 066/339] Avoid callable iterator deadlock during sentinel comparison (#8040) Constraint: Python-level sentinel equality can re-enter the same callable iterator while internal iterator state is protected by a non-reentrant lock. Rejected: Holding the callable iterator status lock across sentinel equality | user-defined __eq__ can call next() on the same iterator and deadlock. Confidence: high Scope-risk: moderate Tested: pre-commit run --all-files; cargo test --workspace --exclude rustpython_wasm --exclude rustpython-venvlauncher; cargo build --release --features sqlite; pytest -v in extra_tests; cargo run --quiet -- extra_tests/snippets/protocol_iternext.py; cargo check -p rustpython-vm; cargo clippy -p rustpython-vm --all-targets -- -D warnings; git diff --check Not-tested: push/PR creation Assisted-by: Codex:gpt-5.5 --- crates/vm/src/builtins/iter.rs | 19 ++++++++++---- extra_tests/snippets/protocol_iternext.py | 31 +++++++++++++++++++++++ extra_tests/snippets/stdlib_json.py | 22 ++++++++++------ 3 files changed, 59 insertions(+), 13 deletions(-) diff --git a/crates/vm/src/builtins/iter.rs b/crates/vm/src/builtins/iter.rs index 322eef15c..e9f1516b5 100644 --- a/crates/vm/src/builtins/iter.rs +++ b/crates/vm/src/builtins/iter.rs @@ -276,13 +276,22 @@ impl IterNext for PyCallableIterator { let ret = callable.invoke((), vm)?; - // Re-check: a reentrant call may have exhausted the iterator. - let status = zelf.status.upgradable_read(); - if !matches!(&*status, IterStatus::Active(_)) { - return Ok(PyIterReturn::StopIteration(None)); + // Re-check before comparing, but don't hold the lock while running + // sentinel equality. User __eq__ code can re-enter this iterator. + { + let status = zelf.status.read(); + if !matches!(&*status, IterStatus::Active(_)) { + return Ok(PyIterReturn::StopIteration(None)); + } } - if vm.bool_eq(&ret, &zelf.sentinel)? { + let is_sentinel = vm.identical_or_equal(&ret, &zelf.sentinel)?; + + if is_sentinel { + let status = zelf.status.upgradable_read(); + if !matches!(&*status, IterStatus::Active(_)) { + return Ok(PyIterReturn::StopIteration(None)); + } *PyRwLockUpgradableReadGuard::upgrade(status) = IterStatus::Exhausted; Ok(PyIterReturn::StopIteration(None)) } else { diff --git a/extra_tests/snippets/protocol_iternext.py b/extra_tests/snippets/protocol_iternext.py index 0eff9cff4..feb10b116 100644 --- a/extra_tests/snippets/protocol_iternext.py +++ b/extra_tests/snippets/protocol_iternext.py @@ -12,3 +12,34 @@ i = iter(s) i.__setstate__(1) assert i.__next__() == "好" assert i.__reduce__()[2] == 2 + + +# Regression test for re-entrant callable iterator sentinel equality. +# Equality can execute Python code that calls back into the same iterator. +class ReenterEq: + entered = False + it = None + + def __eq__(self, other): + if not self.entered: + self.entered = True + try: + next(self.it) + except StopIteration: + pass + else: + raise AssertionError("inner next should stop at the sentinel") + return True + + +value = ReenterEq() +sentinel = object() +callable_it = iter(lambda: value, sentinel) +value.it = callable_it +try: + next(callable_it) +except StopIteration: + pass +else: + raise AssertionError("outer next should stop at the sentinel") +assert value.entered diff --git a/extra_tests/snippets/stdlib_json.py b/extra_tests/snippets/stdlib_json.py index 9d6b47b9a..e55382c82 100644 --- a/extra_tests/snippets/stdlib_json.py +++ b/extra_tests/snippets/stdlib_json.py @@ -219,24 +219,30 @@ assert json.dumps(i) == str(i) assert json.decoder.scanstring('✨x"', 1) == ("x", 3) -# Recursion guard: deeply-nested input must raise RecursionError instead of -# overflowing the native stack (SIGSEGV). Matches CPython's -# _Py_EnterRecursiveCall in Modules/_json.c. +# Recursion guard: deeply-nested input must not overflow the native stack +# (SIGSEGV). CPython may either finish parsing or raise RecursionError, +# depending on the nesting shape. _deep = 100_000 # well above the ~45k native-stack crash threshold + +def assert_no_native_stack_overflow(func): + try: + func() + except RecursionError: + pass + + # Array nesting -assert_raises(RecursionError, lambda: json.loads("[" * _deep + "]" * _deep)) +assert_no_native_stack_overflow(lambda: json.loads("[" * _deep + "]" * _deep)) # Object nesting -assert_raises( - RecursionError, +assert_no_native_stack_overflow( lambda: json.loads('{"a":' * _deep + "1" + "}" * _deep), ) # Alternating array/object nesting -assert_raises( - RecursionError, +assert_no_native_stack_overflow( lambda: json.loads(('[{"x":' * _deep) + "1" + ("}]" * _deep)), ) From 832f7829063ca602e38473e632bea94674786275 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Thu, 11 Jun 2026 12:11:30 +0300 Subject: [PATCH 067/339] Don't skip test in `test_tempfile.py` on all platforms (#8067) --- Lib/test/test_tempfile.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_tempfile.py b/Lib/test/test_tempfile.py index 1ae8f6b3b..0e6b9bced 100644 --- a/Lib/test/test_tempfile.py +++ b/Lib/test/test_tempfile.py @@ -1746,7 +1746,8 @@ class TestTemporaryDirectory(BaseTestCase): "were deleted") d2.cleanup() - @unittest.skip("TODO: RUSTPYTHON; No such file or directory \"...\"") + @unittest.skipIf(sys.platform == "win32", "TODO: RUSTPYTHON; flaky, sometimes pollute env on CI") + @unittest.expectedFailureIf(sys.platform in ("android", "linux"), "TODO: RUSTPYTHON; FileNotFoundError: [Errno 2] No such file or directory: ''") @os_helper.skip_unless_symlink def test_cleanup_with_symlink_modes(self): # cleanup() should not follow symlinks when fixing mode bits (#91133) From 3a4e82973d236e0289fda845253b5123e4699660 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Thu, 11 Jun 2026 12:45:34 +0300 Subject: [PATCH 068/339] Skip flaky asyncio tests (#8075) * Skip flaky test on windows * Skip another flaky test --- Lib/test/test_asyncio/test_events.py | 1 + Lib/test/test_asyncio/test_subprocess.py | 1 + 2 files changed, 2 insertions(+) diff --git a/Lib/test/test_asyncio/test_events.py b/Lib/test/test_asyncio/test_events.py index b60c7452f..3d6d1825a 100644 --- a/Lib/test/test_asyncio/test_events.py +++ b/Lib/test/test_asyncio/test_events.py @@ -791,6 +791,7 @@ class EventLoopTestsMixin: self.assertEqual(port, expected) tr.close() + @unittest.skipIf(sys.platform == "linux", "TODO: Flaky on CI") @socket_helper.skip_if_tcp_blackhole def test_create_connection_local_addr_skip_different_family(self): # See https://github.com/python/cpython/issues/86508 diff --git a/Lib/test/test_asyncio/test_subprocess.py b/Lib/test/test_asyncio/test_subprocess.py index c08eb7cf2..9dd596bbf 100644 --- a/Lib/test/test_asyncio/test_subprocess.py +++ b/Lib/test/test_asyncio/test_subprocess.py @@ -628,6 +628,7 @@ class SubprocessMixin: self.assertTrue(killed) test_utils.run_briefly(self.loop) + @unittest.skipIf(sys.platform == "win32", "TODO: RUSTPYTHON; Flaky on CI") def test_close_dont_kill_finished(self): async def kill_running(): From f2a77821cf74160690dc21e80ec66a522e7978d1 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Fri, 12 Jun 2026 05:08:27 +0300 Subject: [PATCH 069/339] Bump targeted CPython version to 3.14.6 (#8074) * Bump targeted cpython version to 3.14.6 * Adjust `upgrade-pylib.md` --- .github/workflows/upgrade-pylib.md | 2 +- .python-version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/upgrade-pylib.md b/.github/workflows/upgrade-pylib.md index 058fc0674..ac71f3d72 100644 --- a/.github/workflows/upgrade-pylib.md +++ b/.github/workflows/upgrade-pylib.md @@ -52,7 +52,7 @@ cache: - cpython-lib- env: - PYTHON_VERSION: "v3.14.4" + PYTHON_VERSION: "v3.14.6" ISSUE_ID: "6839" --- diff --git a/.python-version b/.python-version index a6d9ada03..3f0a10fda 100644 --- a/.python-version +++ b/.python-version @@ -1 +1 @@ -3.14.5 +3.14.6 From f89f41506179f9894223b3946914044490b1d99e Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Fri, 12 Jun 2026 05:09:22 +0300 Subject: [PATCH 070/339] Remove redundant `to_owned()` calls (#8077) --- crates/capi/src/abstract_.rs | 4 +-- crates/capi/src/unicodeobject.rs | 2 +- crates/stdlib/src/multiprocessing.rs | 2 +- crates/stdlib/src/select.rs | 2 +- crates/stdlib/src/socket.rs | 38 ++++++++++------------------ crates/stdlib/src/ssl.rs | 2 +- crates/vm/src/builtins/code.rs | 2 +- crates/vm/src/builtins/function.rs | 4 +-- crates/vm/src/builtins/list.rs | 2 +- crates/vm/src/exceptions.rs | 2 +- crates/vm/src/function/time.rs | 2 +- crates/vm/src/stdlib/_signal.rs | 4 +-- crates/vm/src/stdlib/marshal.rs | 10 ++++---- crates/vm/src/stdlib/nt.rs | 2 +- crates/vm/src/stdlib/os.rs | 4 +-- crates/vm/src/stdlib/sys.rs | 4 +-- crates/vm/src/stdlib/time.rs | 8 +++--- crates/vm/src/vm/mod.rs | 2 +- 18 files changed, 42 insertions(+), 54 deletions(-) diff --git a/crates/capi/src/abstract_.rs b/crates/capi/src/abstract_.rs index 01a3964f7..d01e31e96 100644 --- a/crates/capi/src/abstract_.rs +++ b/crates/capi/src/abstract_.rs @@ -100,9 +100,7 @@ pub unsafe extern "C" fn PyObject_VectorcallMethod( let args_len = nargsf & !PY_VECTORCALL_ARGUMENTS_OFFSET; if args_len == 0 { - return Err( - vm.new_system_error("PyObject_VectorcallMethod called with no receiver".to_owned()) - ); + return Err(vm.new_system_error("PyObject_VectorcallMethod called with no receiver")); } let (receiver, args) = unsafe { slice::from_raw_parts(args, args_len) } diff --git a/crates/capi/src/unicodeobject.rs b/crates/capi/src/unicodeobject.rs index 3eb1e1535..acc6e392c 100644 --- a/crates/capi/src/unicodeobject.rs +++ b/crates/capi/src/unicodeobject.rs @@ -158,7 +158,7 @@ pub unsafe extern "C" fn PyUnicode_FromEncodedObject( let obj = unsafe { &*obj }; if obj.downcast_ref::().is_some() { - return Err(vm.new_type_error("decoding str is not supported".to_owned())); + return Err(vm.new_type_error("decoding str is not supported")); } let encoding = if encoding.is_null() { diff --git a/crates/stdlib/src/multiprocessing.rs b/crates/stdlib/src/multiprocessing.rs index 231ca44de..78debdc78 100644 --- a/crates/stdlib/src/multiprocessing.rs +++ b/crates/stdlib/src/multiprocessing.rs @@ -496,7 +496,7 @@ mod _multiprocessing { let timeout: f64 = timeout_obj.try_float(vm)?.to_f64(); Some( host_multiprocessing::deadline_from_timeout(timeout) - .map_err(|_| vm.new_os_error("gettimeofday failed".to_string()))?, + .map_err(|_| vm.new_os_error("gettimeofday failed"))?, ) } else { None diff --git a/crates/stdlib/src/select.rs b/crates/stdlib/src/select.rs index 12e55db57..f8125ea37 100644 --- a/crates/stdlib/src/select.rs +++ b/crates/stdlib/src/select.rs @@ -393,7 +393,7 @@ mod decl { return Err(vm.new_value_error("negative sizehint")); } if !matches!(args.flags, 0 | libc::EPOLL_CLOEXEC) { - return Err(vm.new_os_error("invalid flags".to_owned())); + return Err(vm.new_os_error("invalid flags")); } Self::new().map_err(|e| e.into_pyexception(vm)) } diff --git a/crates/stdlib/src/socket.rs b/crates/stdlib/src/socket.rs index 366de2ecc..ecc4add0c 100644 --- a/crates/stdlib/src/socket.rs +++ b/crates/stdlib/src/socket.rs @@ -1123,7 +1123,7 @@ mod _socket { ArgStrOrBytesLike::Str(s) => vm.fsencode(s)?, }; socket2::SockAddr::unix(path) - .map_err(|_| vm.new_os_error("AF_UNIX path too long".to_owned()).into()) + .map_err(|_| vm.new_os_error("AF_UNIX path too long").into()) } c::AF_INET => { let tuple: PyTupleRef = addr.downcast().map_err(|obj| { @@ -1206,12 +1206,10 @@ mod _socket { } else { // Check interface name length (IFNAMSIZ is typically 16) if ifname.len() >= 16 { - return Err(vm - .new_os_error("interface name too long".to_owned()) - .into()); + return Err(vm.new_os_error("interface name too long").into()); } let cstr = alloc::ffi::CString::new(ifname) - .map_err(|_| vm.new_os_error("invalid interface name".to_owned()))?; + .map_err(|_| vm.new_os_error("invalid interface name"))?; host_socket::if_nametoindex_checked(cstr.as_c_str())? as i32 }; @@ -2052,9 +2050,7 @@ mod _socket { Ok(vm.ctx.new_int(flag).into()) } else { if buflen <= 0 || buflen > 1024 { - return Err(vm - .new_os_error("getsockopt buflen out of range".to_owned()) - .into()); + return Err(vm.new_os_error("getsockopt buflen out of range").into()); } let buf = host_socket::getsockopt_bytes(fd as _, level, name, buflen as usize)?; Ok(vm.ctx.new_bytes(buf).into()) @@ -2341,16 +2337,14 @@ mod _socket { .as_str() .parse::() .map(|ip_addr| Vec::::from(ip_addr.octets())) - .map_err(|_| { - vm.new_os_error("illegal IP address string passed to inet_aton".to_owned()) - }) + .map_err(|_| vm.new_os_error("illegal IP address string passed to inet_aton")) } #[pyfunction] fn inet_ntoa(packed_ip: ArgBytesLike, vm: &VirtualMachine) -> PyResult { let packed_ip = packed_ip.borrow_buf(); let packed_ip = <&[u8; 4]>::try_from(&*packed_ip) - .map_err(|_| vm.new_os_error("packed IP wrong length for inet_ntoa".to_owned()))?; + .map_err(|_| vm.new_os_error("packed IP wrong length for inet_ntoa"))?; Ok(vm.ctx.new_str(Ipv4Addr::from(*packed_ip).to_string())) } @@ -2372,7 +2366,7 @@ mod _socket { let cstr_proto = cstr_opt_as_ptr(&cstr_proto); let serv = unsafe { c::getservbyname(cstr_name.as_ptr() as _, cstr_proto as _) }; if serv.is_null() { - return Err(vm.new_os_error("service/proto not found".to_owned())); + return Err(vm.new_os_error("service/proto not found")); } let port = unsafe { (*serv).s_port }; Ok(u16::from_be(port as u16)) @@ -2394,7 +2388,7 @@ mod _socket { let cstr_proto = cstr_opt_as_ptr(&cstr_proto); let serv = unsafe { c::getservbyport(port.to_be() as _, cstr_proto as _) }; if serv.is_null() { - return Err(vm.new_os_error("port/proto not found".to_owned())); + return Err(vm.new_os_error("port/proto not found")); } let s = unsafe { ffi::CStr::from_ptr((*serv).s_name as _) }; Ok(s.to_string_lossy().into_owned()) @@ -2729,7 +2723,7 @@ mod _socket { .map_err(|_| vm.new_os_error(ERROR_MSG.to_owned()))? .octets() .to_vec(), - _ => return Err(vm.new_os_error("Address family not supported by protocol".to_owned())), + _ => return Err(vm.new_os_error("Address family not supported by protocol")), }; Ok(ip_addr) } @@ -2759,7 +2753,7 @@ mod _socket { let cstr = name.to_cstring(vm)?; let proto = unsafe { c::getprotobyname(cstr.as_ptr() as _) }; if proto.is_null() { - return Err(vm.new_os_error("protocol not found".to_owned())); + return Err(vm.new_os_error("protocol not found")); } let num = unsafe { (*proto).p_proto }; Ok(vm.ctx.new_int(num).into()) @@ -2792,15 +2786,13 @@ mod _socket { let mut ainfo = res.next().unwrap(); if res.next().is_some() { return Err(vm - .new_os_error("sockaddr resolved to multiple addresses".to_owned()) + .new_os_error("sockaddr resolved to multiple addresses") .into()); } match &mut ainfo.sockaddr { SocketAddr::V4(_) => { if address.len() != 2 { - return Err(vm - .new_os_error("IPv4 sockaddr must be 2 tuple".to_owned()) - .into()); + return Err(vm.new_os_error("IPv4 sockaddr must be 2 tuple").into()); } } SocketAddr::V6(addr) => { @@ -2931,7 +2923,7 @@ mod _socket { let ainfo = res.next().unwrap()?; if res.next().is_some() { return Err(vm - .new_os_error("wildcard resolved to multiple address".to_owned()) + .new_os_error("wildcard resolved to multiple address") .into()); } return Ok(ainfo.sockaddr); @@ -2940,9 +2932,7 @@ mod _socket { match af { c::AF_INET | c::AF_UNSPEC => {} _ => { - return Err(vm - .new_os_error("address family mismatched".to_owned()) - .into()); + return Err(vm.new_os_error("address family mismatched").into()); } } return Ok(SocketAddr::V4(net::SocketAddrV4::new( diff --git a/crates/stdlib/src/ssl.rs b/crates/stdlib/src/ssl.rs index ca2546bfb..121e25ed1 100644 --- a/crates/stdlib/src/ssl.rs +++ b/crates/stdlib/src/ssl.rs @@ -2824,7 +2824,7 @@ mod _ssl { ) -> PyResult { let obj_to_bytes = |bytes_obj| { PyBytesRef::try_from_object(vm, bytes_obj) - .map_err(|_| vm.new_os_error("Expected bytes from recv".to_string())) + .map_err(|_| vm.new_os_error("Expected bytes from recv")) }; let tls_record_header_buf = self diff --git a/crates/vm/src/builtins/code.rs b/crates/vm/src/builtins/code.rs index 44d8c6134..e30813bf8 100644 --- a/crates/vm/src/builtins/code.rs +++ b/crates/vm/src/builtins/code.rs @@ -536,7 +536,7 @@ impl PyCode { } #[cfg(not(feature = "host_env"))] pub fn from_pyc_path(_path: &std::path::Path, vm: &VirtualMachine) -> PyResult> { - Err(vm.new_runtime_error("loading a pyc file requires the `host_env` feature".to_owned())) + Err(vm.new_runtime_error("loading a pyc file requires the `host_env` feature")) } pub fn from_pyc( pyc_bytes: &[u8], diff --git a/crates/vm/src/builtins/function.rs b/crates/vm/src/builtins/function.rs index 6052e4fe2..4125ef4c4 100644 --- a/crates/vm/src/builtins/function.rs +++ b/crates/vm/src/builtins/function.rs @@ -1253,10 +1253,10 @@ impl Constructor for PyBoundMethod { vm: &VirtualMachine, ) -> PyResult { if !function.is_callable() { - return Err(vm.new_type_error("first argument must be callable".to_owned())); + return Err(vm.new_type_error("first argument must be callable")); } if vm.is_none(&object) { - return Err(vm.new_type_error("instance must not be None".to_owned())); + return Err(vm.new_type_error("instance must not be None")); } Ok(Self::new(object, function)) } diff --git a/crates/vm/src/builtins/list.rs b/crates/vm/src/builtins/list.rs index 4179f7ef9..2edb48852 100644 --- a/crates/vm/src/builtins/list.rs +++ b/crates/vm/src/builtins/list.rs @@ -295,7 +295,7 @@ impl PyList { .setitem_by_index(vm, index, value) .map_err(|e| { if e.class().is(vm.ctx.exceptions.index_error) { - vm.new_index_error("list assignment index out of range".to_owned()) + vm.new_index_error("list assignment index out of range") } else { e } diff --git a/crates/vm/src/exceptions.rs b/crates/vm/src/exceptions.rs index cf83b416f..25f10d28b 100644 --- a/crates/vm/src/exceptions.rs +++ b/crates/vm/src/exceptions.rs @@ -2536,7 +2536,7 @@ pub(super) mod types { 4 | 6 => {} 5 => { return Err(vm.new_type_error( - "end_offset must be provided when end_lineno is provided".to_owned(), + "end_offset must be provided when end_lineno is provided", )); } _ => { diff --git a/crates/vm/src/function/time.rs b/crates/vm/src/function/time.rs index 597da1710..40833e2d5 100644 --- a/crates/vm/src/function/time.rs +++ b/crates/vm/src/function/time.rs @@ -29,7 +29,7 @@ impl TryFromObject for TimeoutSeconds { super::Either::B(i) => i as f64, }; if value.is_nan() { - return Err(vm.new_value_error("Invalid value NaN (not a number)".to_owned())); + return Err(vm.new_value_error("Invalid value NaN (not a number)")); } Ok(Self { value }) } diff --git a/crates/vm/src/stdlib/_signal.rs b/crates/vm/src/stdlib/_signal.rs index b9c41d6a4..05bab5e11 100644 --- a/crates/vm/src/stdlib/_signal.rs +++ b/crates/vm/src/stdlib/_signal.rs @@ -222,7 +222,7 @@ pub(crate) mod _signal { let _old = match old { Ok(old) => old, Err(_) => { - return Err(vm.new_os_error("Failed to set signal".to_owned())); + return Err(vm.new_os_error("Failed to set signal")); } }; @@ -440,7 +440,7 @@ pub(crate) mod _signal { let set = PySet::default().into_ref(&vm.ctx); #[cfg(any(unix, windows))] for signum in host_signal::valid_signals(signal::NSIG) - .map_err(|_| vm.new_os_error("sigfillset failed".to_owned()))? + .map_err(|_| vm.new_os_error("sigfillset failed"))? { set.add(vm.ctx.new_int(signum).into(), vm)?; } diff --git a/crates/vm/src/stdlib/marshal.rs b/crates/vm/src/stdlib/marshal.rs index cb43a38bd..2429b58a9 100644 --- a/crates/vm/src/stdlib/marshal.rs +++ b/crates/vm/src/stdlib/marshal.rs @@ -187,7 +187,7 @@ mod decl { ) -> PyResult<()> { use marshal::Write; if depth == 0 { - return Err(vm.new_value_error("object too deeply nested to marshal".to_string())); + return Err(vm.new_value_error("object too deeply nested to marshal")); } // Singletons: no FLAG_REF needed @@ -325,7 +325,7 @@ mod decl { marshal::serialize_code(buf, &co.code); } else if let Some(sl) = obj.downcast_ref::() { if version < 5 { - return Err(vm.new_value_error("unmarshallable object".to_string())); + return Err(vm.new_value_error("unmarshallable object")); } buf.write_u8(b':'); let none: PyObjectRef = vm.ctx.none(); @@ -352,7 +352,7 @@ mod decl { buf.write_u32(data.len() as u32); buf.write_slice(&data); } else { - return Err(vm.new_value_error("unmarshallable object".to_string())); + return Err(vm.new_value_error("unmarshallable object")); } if use_ref { @@ -558,7 +558,7 @@ mod decl { /// Recursively check that no code objects are present. fn check_no_code(obj: &PyObjectRef, vm: &VirtualMachine) -> PyResult<()> { if obj.downcast_ref::().is_some() { - return Err(vm.new_value_error("unmarshalling code objects is disallowed".to_string())); + return Err(vm.new_value_error("unmarshalling code objects is disallowed")); } if let Some(tup) = obj.downcast_ref::() { for elem in tup.as_slice() { @@ -602,7 +602,7 @@ mod decl { PyFrozenSet::static_type(), ] { if cls.fast_issubclass(base) && !cls.is(base) { - return Err(vm.new_value_error("unmarshallable object".to_string())); + return Err(vm.new_value_error("unmarshallable object")); } } Ok(()) diff --git a/crates/vm/src/stdlib/nt.rs b/crates/vm/src/stdlib/nt.rs index 3303b1c67..62ea7056c 100644 --- a/crates/vm/src/stdlib/nt.rs +++ b/crates/vm/src/stdlib/nt.rs @@ -963,7 +963,7 @@ pub(crate) mod module { #[pyfunction] fn getlogin(vm: &VirtualMachine) -> PyResult { - host_nt::getlogin().map_err(|_| vm.new_os_error("Error code: 0".to_owned())) + host_nt::getlogin().map_err(|_| vm.new_os_error("Error code: 0")) } pub fn raw_set_handle_inheritable(handle: intptr_t, inheritable: bool) -> std::io::Result<()> { diff --git a/crates/vm/src/stdlib/os.rs b/crates/vm/src/stdlib/os.rs index 917d9a719..986a45fb4 100644 --- a/crates/vm/src/stdlib/os.rs +++ b/crates/vm/src/stdlib/os.rs @@ -1678,7 +1678,7 @@ pub(super) mod _os { #[cfg(unix)] { let times = crate::host_env::time::process_times() - .map_err(|_| vm.new_os_error("Fail to get times".to_string()))?; + .map_err(|_| vm.new_os_error("Fail to get times"))?; let times_result = TimesResultData { user: times.user, @@ -1767,7 +1767,7 @@ pub(super) mod _os { #[pyfunction] fn getloadavg(vm: &VirtualMachine) -> PyResult<(f64, f64, f64)> { let loadavg = crate::host_env::time::getloadavg() - .map_err(|_| vm.new_os_error("Load averages are unobtainable".to_string()))?; + .map_err(|_| vm.new_os_error("Load averages are unobtainable"))?; Ok((loadavg[0], loadavg[1], loadavg[2])) } diff --git a/crates/vm/src/stdlib/sys.rs b/crates/vm/src/stdlib/sys.rs index dbce74a5d..ecc6ed170 100644 --- a/crates/vm/src/stdlib/sys.rs +++ b/crates/vm/src/stdlib/sys.rs @@ -103,7 +103,7 @@ pub mod sys { #[pymethod] fn write(&self, s: PyStrRef, vm: &VirtualMachine) -> PyResult { if self.fd == 0 { - return Err(vm.new_os_error("not writable".to_owned())); + return Err(vm.new_os_error("not writable")); } let bytes = s.as_bytes(); if self.fd == 2 { @@ -121,7 +121,7 @@ pub mod sys { #[pymethod] fn readline(&self, size: OptionalArg, vm: &VirtualMachine) -> PyResult { if self.fd != 0 { - return Err(vm.new_os_error("not readable".to_owned())); + return Err(vm.new_os_error("not readable")); } let size = size.unwrap_or(-1); if size == 0 { diff --git a/crates/vm/src/stdlib/time.rs b/crates/vm/src/stdlib/time.rs index a56dffe08..5c77afb4f 100644 --- a/crates/vm/src/stdlib/time.rs +++ b/crates/vm/src/stdlib/time.rs @@ -685,8 +685,8 @@ mod decl { #[cfg(all(target_arch = "wasm32", target_os = "emscripten"))] fn get_process_time(vm: &VirtualMachine) -> PyResult { - let times = host_time::process_times() - .map_err(|_| vm.new_os_error("Failed to get clock time".to_owned()))?; + let times = + host_time::process_times().map_err(|_| vm.new_os_error("Failed to get clock time"))?; Ok(Duration::from_secs_f64(times.user + times.system)) } @@ -1336,13 +1336,13 @@ mod platform { pub(super) fn get_thread_time(vm: &VirtualMachine) -> PyResult { let total = host_time::get_thread_time_100ns() - .ok_or_else(|| vm.new_os_error("Failed to get clock time".to_owned()))?; + .ok_or_else(|| vm.new_os_error("Failed to get clock time"))?; Ok(Duration::from_nanos(total * 100)) } pub(super) fn get_process_time(vm: &VirtualMachine) -> PyResult { let total = host_time::get_process_time_100ns() - .ok_or_else(|| vm.new_os_error("Failed to get clock time".to_owned()))?; + .ok_or_else(|| vm.new_os_error("Failed to get clock time"))?; Ok(Duration::from_nanos(total * 100)) } } diff --git a/crates/vm/src/vm/mod.rs b/crates/vm/src/vm/mod.rs index 7775c34e0..0820ae2d8 100644 --- a/crates/vm/src/vm/mod.rs +++ b/crates/vm/src/vm/mod.rs @@ -647,7 +647,7 @@ impl VirtualMachine { .types .list_type .get_attr(self.ctx.intern_str("append")) - .ok_or_else(|| self.new_runtime_error("failed to cache list.append".to_owned()))?; + .ok_or_else(|| self.new_runtime_error("failed to cache list.append"))?; self.callable_cache.list_append = Some(list_append); self.callable_cache.builtin_all = Some(self.builtins.get_attr("all", self)?); self.callable_cache.builtin_any = Some(self.builtins.get_attr("any", self)?); From beb8d6070e14c6f9705ba53a4b7d99d9e1f86f06 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Fri, 12 Jun 2026 05:09:44 +0300 Subject: [PATCH 071/339] `TODO: Flaky test` -> `TODO: RUSTPYTHON; Flaky test` (#8078) --- Lib/test/test_asyncio/test_events.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/test/test_asyncio/test_events.py b/Lib/test/test_asyncio/test_events.py index 3d6d1825a..f37348306 100644 --- a/Lib/test/test_asyncio/test_events.py +++ b/Lib/test/test_asyncio/test_events.py @@ -791,7 +791,7 @@ class EventLoopTestsMixin: self.assertEqual(port, expected) tr.close() - @unittest.skipIf(sys.platform == "linux", "TODO: Flaky on CI") + @unittest.skipIf(sys.platform == "linux", "TODO: RUSTPYTHON; Flaky on CI") @socket_helper.skip_if_tcp_blackhole def test_create_connection_local_addr_skip_different_family(self): # See https://github.com/python/cpython/issues/86508 From e00f3b7ab08e7aef920d6976d9b86236e7a568da Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Jun 2026 11:09:50 +0900 Subject: [PATCH 072/339] Bump the wasmtime group across 1 directory with 2 updates (#8079) Bumps the wasmtime group with 1 update in the / directory: [cranelift-jit](https://github.com/bytecodealliance/wasmtime). Updates `cranelift-jit` from 0.132.0 to 0.132.1 - [Release notes](https://github.com/bytecodealliance/wasmtime/releases) - [Changelog](https://github.com/bytecodealliance/wasmtime/blob/main/RELEASES.md) - [Commits](https://github.com/bytecodealliance/wasmtime/commits) Updates `cranelift-module` from 0.132.0 to 0.132.1 - [Release notes](https://github.com/bytecodealliance/wasmtime/releases) - [Changelog](https://github.com/bytecodealliance/wasmtime/blob/main/RELEASES.md) - [Commits](https://github.com/bytecodealliance/wasmtime/commits) --- updated-dependencies: - dependency-name: cranelift-jit dependency-version: 0.132.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: wasmtime - dependency-name: cranelift-module dependency-version: 0.132.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: wasmtime ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 74 +++++++++++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4722e5614..7db869cef 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -752,27 +752,27 @@ dependencies = [ [[package]] name = "cranelift-assembler-x64" -version = "0.132.0" +version = "0.132.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c80cf55a351448317210f26c434be761bcb25e7b36116ec92f89540b73e2833" +checksum = "77c4ebb31662e2051dcc49b7342d222405a99e951720756cc4b93315972abd67" dependencies = [ "cranelift-assembler-x64-meta", ] [[package]] name = "cranelift-assembler-x64-meta" -version = "0.132.0" +version = "0.132.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07937ca8617b340162fe3a4716be885b5847e9b56d6c7a89abbe4d42340fdc91" +checksum = "106dfc2ec96ec1c3a8a250602e936712e00a381df032f7a8ad175c8f768c03bb" dependencies = [ "cranelift-srcgen", ] [[package]] name = "cranelift-bforest" -version = "0.132.0" +version = "0.132.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88217b08180882436d54c0133274885c590698ae854e352bede1cda041230800" +checksum = "5694aa8a2eb2571a15b3feee38d16ccaf2712200e7b5c9ae0479069bdfb46949" dependencies = [ "cranelift-entity", "wasmtime-internal-core", @@ -780,18 +780,18 @@ dependencies = [ [[package]] name = "cranelift-bitset" -version = "0.132.0" +version = "0.132.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5c3cf7ba29fa56e56040848e34835d4e45988b2760ef212413409af95ffd8c1" +checksum = "93ab349d30a5fad9699440ee7ccb435374e8a8735dcca26696a4245bcefcc47e" dependencies = [ "wasmtime-internal-core", ] [[package]] name = "cranelift-codegen" -version = "0.132.0" +version = "0.132.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebe1aac2efd4cba2047845fce38a68519935a30e20c8a6294ba7e2f448fe722d" +checksum = "3e95970bdb51d145c828a114a1084cb8b63e65569a51600ad398cb49fa78b062" dependencies = [ "bumpalo", "cranelift-assembler-x64", @@ -816,9 +816,9 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.132.0" +version = "0.132.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0909eaf9d6f18f5bf802d50608cb4368ac340fbd03cc44f2888d1cfcc3faa64e" +checksum = "0e8414b8ecc81f89f8a3f2c5cbc785b9ed690200cd6f9d780e96a92f88879704" dependencies = [ "cranelift-assembler-x64-meta", "cranelift-codegen-shared", @@ -828,24 +828,24 @@ dependencies = [ [[package]] name = "cranelift-codegen-shared" -version = "0.132.0" +version = "0.132.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c95a8da8be283f49cda7d0ef228c94f10d791e517b27b0c7e282dadd2e79ce45" +checksum = "631c4e5db42e6a0f9e7a68f18f7faba3692862114870c7c598aee7e0e5677e59" [[package]] name = "cranelift-control" -version = "0.132.0" +version = "0.132.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5b19c81145146da1f7afda2e7f52111842fe6793512e740ad5cf3f5639e6212" +checksum = "09c6e92c825abfbb739a4beaa5db3988f98a96a68d6ea656f562098efc142976" dependencies = [ "arbitrary", ] [[package]] name = "cranelift-entity" -version = "0.132.0" +version = "0.132.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a55309b47e6633ab05821304206cb1e92952e845b1224985562bb7ac1e92323" +checksum = "55e57cd185782abada9ab2606bfe88d0abc0d42d83a7d432dcf69991e17fe76e" dependencies = [ "cranelift-bitset", "wasmtime-internal-core", @@ -865,15 +865,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.132.0" +version = "0.132.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ac4e0bc095b2dab2212d1e99d7a74b62afc1485db023f1c0cb34a68758f7bd1" +checksum = "407b80b46934c9dce9a6581f0e80d079b7a69e11372fb03d7dce4c7ba3fee4e3" [[package]] name = "cranelift-jit" -version = "0.132.0" +version = "0.132.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b48c2a0720c7d62aadd508c662b9bf666b614a47a888589e553e0511620635e" +checksum = "ea72887b62db0e7c387f8c0b7af600772fd9190c6f7205fd2182b0ce10159c80" dependencies = [ "anyhow", "cranelift-codegen", @@ -892,9 +892,9 @@ dependencies = [ [[package]] name = "cranelift-module" -version = "0.132.0" +version = "0.132.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28f05d9efce7a4e8c2ceec49c76d26e53f1ee8cb13de822b6ca5118d48f50976" +checksum = "4bd3b5369ba0f409b9b218e2356a71285c6e2815e187329a59db09228fd927c4" dependencies = [ "anyhow", "cranelift-codegen", @@ -903,9 +903,9 @@ dependencies = [ [[package]] name = "cranelift-native" -version = "0.132.0" +version = "0.132.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09a40053f5cb925451dd1d57393d14ad3145c8e0786701c27b5415ebb9a3ba4f" +checksum = "3a40e056e421d9a6c757983f2184f765ae1c28a51555d3877e98afc97ce5705b" dependencies = [ "cranelift-codegen", "libc", @@ -914,9 +914,9 @@ dependencies = [ [[package]] name = "cranelift-srcgen" -version = "0.132.0" +version = "0.132.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3ceab9a53f7d362c89841fbaa8e63e44d47c40e91dc96ee6f777fca5d6b323b" +checksum = "2cdbadda21e49798825a1ec795dab30bcb03235891f662b5ccf23fa45b39682f" [[package]] name = "crc32fast" @@ -1237,7 +1237,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.60.2", ] [[package]] @@ -3350,7 +3350,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.60.2", ] [[package]] @@ -3426,7 +3426,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.52.0", + "windows-sys 0.60.2", ] [[package]] @@ -4375,7 +4375,7 @@ dependencies = [ "getrandom 0.4.2", "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.60.2", ] [[package]] @@ -4873,9 +4873,9 @@ dependencies = [ [[package]] name = "wasmtime-internal-core" -version = "45.0.0" +version = "45.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bdae4b55b15a23d774b15f6e7cd90ae0d0aa17c47c12b4db098b3dd11ba9d58" +checksum = "110bf85122cd451d3b9ff67f8911d428ec9b729208abe950a0333c3244660e88" dependencies = [ "hashbrown 0.17.0", "libm", @@ -4883,9 +4883,9 @@ dependencies = [ [[package]] name = "wasmtime-internal-jit-icache-coherence" -version = "45.0.0" +version = "45.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a312ba8bb77955dcd44294a223e7f124c3071ff966583d385d3f6a4639c62e3" +checksum = "aa6818a4864719772680694f4e4649a8600bb5efcf71111ebaf7419b266463e8" dependencies = [ "cfg-if", "libc", @@ -4968,7 +4968,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.60.2", ] [[package]] From 09b47264fa689de98714e4fc8983e241f8159319 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Jun 2026 11:10:01 +0900 Subject: [PATCH 073/339] Bump chrono from 0.4.44 to 0.4.45 (#8080) Bumps [chrono](https://github.com/chronotope/chrono) from 0.4.44 to 0.4.45. - [Release notes](https://github.com/chronotope/chrono/releases) - [Changelog](https://github.com/chronotope/chrono/blob/main/CHANGELOG.md) - [Commits](https://github.com/chronotope/chrono/compare/v0.4.44...v0.4.45) --- updated-dependencies: - dependency-name: chrono dependency-version: 0.4.45 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7db869cef..1533ff622 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -494,9 +494,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.44" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0" +checksum = "1aa79e62e7697b8e29b513a68abacf485adcd1fe8284a4316c5ae868e6633327" dependencies = [ "iana-time-zone", "js-sys", From 622e65ccc56b070a5e4a8be047a35e4fadb496f6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Jun 2026 11:10:11 +0900 Subject: [PATCH 074/339] Bump libsqlite3-sys from 0.38.0 to 0.38.1 (#8081) Bumps [libsqlite3-sys](https://github.com/rusqlite/rusqlite) from 0.38.0 to 0.38.1. - [Release notes](https://github.com/rusqlite/rusqlite/releases) - [Changelog](https://github.com/rusqlite/rusqlite/blob/master/Changelog.md) - [Commits](https://github.com/rusqlite/rusqlite/commits) --- updated-dependencies: - dependency-name: libsqlite3-sys dependency-version: 0.38.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1533ff622..45f0e3bdc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2165,9 +2165,9 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.38.0" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76001fb4daed01e5f2b518aac0b4dc592e7c734da63dbffcf0c64fa612a8d0c" +checksum = "f6c19a05435c21ac299d71b6a9c13db3e3f47c520517d58990a462a1397a61db" dependencies = [ "cc", "pkg-config", From 9941d4dd818fe3eebefb01adbb9d453e0ccb6caa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Jun 2026 11:10:21 +0900 Subject: [PATCH 075/339] Bump bitflags from 2.11.1 to 2.12.1 (#8082) Bumps [bitflags](https://github.com/bitflags/bitflags) from 2.11.1 to 2.12.1. - [Release notes](https://github.com/bitflags/bitflags/releases) - [Changelog](https://github.com/bitflags/bitflags/blob/main/CHANGELOG.md) - [Commits](https://github.com/bitflags/bitflags/compare/2.11.1...2.12.1) --- updated-dependencies: - dependency-name: bitflags dependency-version: 2.12.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 45f0e3bdc..3fd14cb53 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -289,7 +289,7 @@ version = "0.71.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f58bf3d7db68cfbac37cfc485a8d711e87e064c3d0fe0435b92f7a407f9d6b3" dependencies = [ - "bitflags 2.11.1", + "bitflags 2.13.0", "cexpr", "clang-sys", "itertools 0.13.0", @@ -309,7 +309,7 @@ version = "0.72.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895" dependencies = [ - "bitflags 2.11.1", + "bitflags 2.13.0", "cexpr", "clang-sys", "itertools 0.13.0", @@ -331,9 +331,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.11.1" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3" +checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8" [[package]] name = "bitflagset" @@ -2392,7 +2392,7 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.11.1", + "bitflags 2.13.0", "cfg-if", "cfg_aliases", "libc", @@ -2405,7 +2405,7 @@ version = "0.31.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf20d2fde8ff38632c426f1165ed7436270b44f199fc55284c38276f9db47c3d" dependencies = [ - "bitflags 2.11.1", + "bitflags 2.13.0", "cfg-if", "cfg_aliases", "libc", @@ -2538,7 +2538,7 @@ version = "0.10.80" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a45fa2aa886c42762255da344f0a0d313e254066c46aad76f300c3d3da62d967" dependencies = [ - "bitflags 2.11.1", + "bitflags 2.13.0", "cfg-if", "foreign-types", "libc", @@ -3192,7 +3192,7 @@ version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" dependencies = [ - "bitflags 2.11.1", + "bitflags 2.13.0", ] [[package]] @@ -3346,7 +3346,7 @@ version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" dependencies = [ - "bitflags 2.11.1", + "bitflags 2.13.0", "errno", "libc", "linux-raw-sys", @@ -3476,7 +3476,7 @@ dependencies = [ name = "rustpython-capi" version = "0.5.0" dependencies = [ - "bitflags 2.11.1", + "bitflags 2.13.0", "itertools 0.14.0", "num-complex", "pyo3", @@ -3488,7 +3488,7 @@ dependencies = [ name = "rustpython-codegen" version = "0.5.0" dependencies = [ - "bitflags 2.11.1", + "bitflags 2.13.0", "indexmap", "itertools 0.14.0", "log", @@ -3512,7 +3512,7 @@ name = "rustpython-common" version = "0.5.0" dependencies = [ "ascii", - "bitflags 2.11.1", + "bitflags 2.13.0", "getrandom 0.4.2", "itertools 0.14.0", "libc", @@ -3547,7 +3547,7 @@ dependencies = [ name = "rustpython-compiler-core" version = "0.5.0" dependencies = [ - "bitflags 2.11.1", + "bitflags 2.13.0", "bitflagset", "itertools 0.14.0", "lz4_flex", @@ -3599,7 +3599,7 @@ dependencies = [ name = "rustpython-host_env" version = "0.5.0" dependencies = [ - "bitflags 2.11.1", + "bitflags 2.13.0", "getrandom 0.4.2", "junction", "libc", @@ -3664,7 +3664,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f021ff72cabf5e2cd6d8ec8813d376a8445a228dc610ab56c27bd9054cda70d4" dependencies = [ "aho-corasick", - "bitflags 2.11.1", + "bitflags 2.13.0", "compact_str", "get-size2", "is-macro", @@ -3682,7 +3682,7 @@ version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01e6ee78bd9671fb5766664b2695fe1f2a92a961f4d9101646c570d8acdb1e0b" dependencies = [ - "bitflags 2.11.1", + "bitflags 2.13.0", "bstr", "compact_str", "get-size2", @@ -3732,7 +3732,7 @@ dependencies = [ name = "rustpython-sre_engine" version = "0.5.0" dependencies = [ - "bitflags 2.11.1", + "bitflags 2.13.0", "criterion", "icu_properties", "num_enum", @@ -3836,7 +3836,7 @@ name = "rustpython-vm" version = "0.5.0" dependencies = [ "ascii", - "bitflags 2.11.1", + "bitflags 2.13.0", "bstr", "chrono", "constant_time_eq", @@ -3932,7 +3932,7 @@ version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a990b25f351b25139ddc7f21ee3f6f56f86d6846b74ac8fad3a719a287cd4a0" dependencies = [ - "bitflags 2.11.1", + "bitflags 2.13.0", "cfg-if", "clipboard-win", "home", @@ -4014,7 +4014,7 @@ version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d" dependencies = [ - "bitflags 2.11.1", + "bitflags 2.13.0", "core-foundation 0.10.1", "core-foundation-sys", "libc", @@ -4335,7 +4335,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a13f3d0daba03132c0aa9767f98351b3488edc2c100cda2d2ec2b04f3d8d3c8b" dependencies = [ - "bitflags 2.11.1", + "bitflags 2.13.0", "core-foundation 0.9.4", "system-configuration-sys", ] @@ -4865,7 +4865,7 @@ version = "0.244.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" dependencies = [ - "bitflags 2.11.1", + "bitflags 2.13.0", "hashbrown 0.15.5", "indexmap", "semver", @@ -5272,7 +5272,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" dependencies = [ "anyhow", - "bitflags 2.11.1", + "bitflags 2.13.0", "indexmap", "log", "serde", From 3ff976180a1f685087cea8ef18ec51f2c85cad7a Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Fri, 12 Jun 2026 05:10:50 +0300 Subject: [PATCH 076/339] Update `pyrepl` to 3.14.5 (#7823) * Add a dummy `posix._is_inputhook_installed` function * Add a dummy `nt._is_inputhook_installed` function * Update `_pyrepl` to 3.14.5 * Update `test_pyrepl` to 3.14.5 * Add a dummy `posix._is_inputhook_installed` function --- Lib/_pyrepl/__main__.py | 4 + Lib/_pyrepl/_minimal_curses.py | 68 - Lib/_pyrepl/_module_completer.py | 426 ++++ Lib/_pyrepl/base_eventqueue.py | 110 + Lib/_pyrepl/commands.py | 56 +- Lib/_pyrepl/completing_reader.py | 6 +- Lib/_pyrepl/console.py | 22 +- Lib/_pyrepl/curses.py | 33 - Lib/_pyrepl/fancy_termios.py | 46 +- Lib/_pyrepl/keymap.py | 18 +- Lib/_pyrepl/main.py | 11 +- Lib/_pyrepl/mypy.ini | 3 +- Lib/_pyrepl/reader.py | 225 +- Lib/_pyrepl/readline.py | 40 +- Lib/_pyrepl/simple_interact.py | 36 +- Lib/_pyrepl/terminfo.py | 488 ++++ Lib/_pyrepl/trace.py | 27 +- Lib/_pyrepl/unix_console.py | 132 +- Lib/_pyrepl/unix_eventqueue.py | 95 +- Lib/_pyrepl/windows_console.py | 254 +- Lib/_pyrepl/windows_eventqueue.py | 42 + Lib/test/test_pyrepl/__init__.py | 11 + Lib/test/test_pyrepl/__main__.py | 4 + Lib/test/test_pyrepl/support.py | 173 ++ Lib/test/test_pyrepl/test_eventqueue.py | 198 ++ Lib/test/test_pyrepl/test_input.py | 102 + Lib/test/test_pyrepl/test_interact.py | 310 +++ Lib/test/test_pyrepl/test_keymap.py | 120 + Lib/test/test_pyrepl/test_pyrepl.py | 2165 ++++++++++++++++++ Lib/test/test_pyrepl/test_reader.py | 565 +++++ Lib/test/test_pyrepl/test_terminfo.py | 651 ++++++ Lib/test/test_pyrepl/test_unix_console.py | 416 ++++ Lib/test/test_pyrepl/test_utils.py | 105 + Lib/test/test_pyrepl/test_windows_console.py | 626 +++++ crates/vm/src/stdlib/nt.rs | 6 + crates/vm/src/stdlib/posix.rs | 6 + 36 files changed, 7072 insertions(+), 528 deletions(-) delete mode 100644 Lib/_pyrepl/_minimal_curses.py create mode 100644 Lib/_pyrepl/_module_completer.py create mode 100644 Lib/_pyrepl/base_eventqueue.py delete mode 100644 Lib/_pyrepl/curses.py create mode 100644 Lib/_pyrepl/terminfo.py create mode 100644 Lib/_pyrepl/windows_eventqueue.py create mode 100644 Lib/test/test_pyrepl/__init__.py create mode 100644 Lib/test/test_pyrepl/__main__.py create mode 100644 Lib/test/test_pyrepl/support.py create mode 100644 Lib/test/test_pyrepl/test_eventqueue.py create mode 100644 Lib/test/test_pyrepl/test_input.py create mode 100644 Lib/test/test_pyrepl/test_interact.py create mode 100644 Lib/test/test_pyrepl/test_keymap.py create mode 100644 Lib/test/test_pyrepl/test_pyrepl.py create mode 100644 Lib/test/test_pyrepl/test_reader.py create mode 100644 Lib/test/test_pyrepl/test_terminfo.py create mode 100644 Lib/test/test_pyrepl/test_unix_console.py create mode 100644 Lib/test/test_pyrepl/test_utils.py create mode 100644 Lib/test/test_pyrepl/test_windows_console.py diff --git a/Lib/_pyrepl/__main__.py b/Lib/_pyrepl/__main__.py index 3fa992eee..9c66812e1 100644 --- a/Lib/_pyrepl/__main__.py +++ b/Lib/_pyrepl/__main__.py @@ -1,6 +1,10 @@ # Important: don't add things to this module, as they will end up in the REPL's # default globals. Use _pyrepl.main instead. +# Avoid caching this file by linecache and incorrectly report tracebacks. +# See https://github.com/python/cpython/issues/129098. +__spec__ = __loader__ = None + if __name__ == "__main__": from .main import interactive_console as __pyrepl_interactive_console __pyrepl_interactive_console() diff --git a/Lib/_pyrepl/_minimal_curses.py b/Lib/_pyrepl/_minimal_curses.py deleted file mode 100644 index d884f880f..000000000 --- a/Lib/_pyrepl/_minimal_curses.py +++ /dev/null @@ -1,68 +0,0 @@ -"""Minimal '_curses' module, the low-level interface for curses module -which is not meant to be used directly. - -Based on ctypes. It's too incomplete to be really called '_curses', so -to use it, you have to import it and stick it in sys.modules['_curses'] -manually. - -Note that there is also a built-in module _minimal_curses which will -hide this one if compiled in. -""" - -import ctypes -import ctypes.util - - -class error(Exception): - pass - - -def _find_clib() -> str: - trylibs = ["ncursesw", "ncurses", "curses"] - - for lib in trylibs: - path = ctypes.util.find_library(lib) - if path: - return path - raise ModuleNotFoundError("curses library not found", name="_pyrepl._minimal_curses") - - -_clibpath = _find_clib() -clib = ctypes.cdll.LoadLibrary(_clibpath) - -clib.setupterm.argtypes = [ctypes.c_char_p, ctypes.c_int, ctypes.POINTER(ctypes.c_int)] -clib.setupterm.restype = ctypes.c_int - -clib.tigetstr.argtypes = [ctypes.c_char_p] -clib.tigetstr.restype = ctypes.c_ssize_t - -clib.tparm.argtypes = [ctypes.c_char_p] + 9 * [ctypes.c_int] # type: ignore[operator] -clib.tparm.restype = ctypes.c_char_p - -OK = 0 -ERR = -1 - -# ____________________________________________________________ - - -def setupterm(termstr, fd): - err = ctypes.c_int(0) - result = clib.setupterm(termstr, fd, ctypes.byref(err)) - if result == ERR: - raise error("setupterm() failed (err=%d)" % err.value) - - -def tigetstr(cap): - if not isinstance(cap, bytes): - cap = cap.encode("ascii") - result = clib.tigetstr(cap) - if result == ERR: - return None - return ctypes.cast(result, ctypes.c_char_p).value - - -def tparm(str, i1=0, i2=0, i3=0, i4=0, i5=0, i6=0, i7=0, i8=0, i9=0): - result = clib.tparm(str, i1, i2, i3, i4, i5, i6, i7, i8, i9) - if result is None: - raise error("tparm() returned NULL") - return result diff --git a/Lib/_pyrepl/_module_completer.py b/Lib/_pyrepl/_module_completer.py new file mode 100644 index 000000000..2098d0a54 --- /dev/null +++ b/Lib/_pyrepl/_module_completer.py @@ -0,0 +1,426 @@ +from __future__ import annotations + +import importlib +import os +import pkgutil +import sys +import token +import tokenize +from importlib.machinery import FileFinder +from io import StringIO +from contextlib import contextmanager +from dataclasses import dataclass +from itertools import chain +from tokenize import TokenInfo + +TYPE_CHECKING = False + +if TYPE_CHECKING: + from typing import Any, Iterable, Iterator, Mapping + + +HARDCODED_SUBMODULES = { + # Standard library submodules that are not detected by pkgutil.iter_modules + # but can be imported, so should be proposed in completion + "collections": ["abc"], + "os": ["path"], + "xml.parsers.expat": ["errors", "model"], +} + + +def make_default_module_completer() -> ModuleCompleter: + # Inside pyrepl, __package__ is set to None by default + return ModuleCompleter(namespace={'__package__': None}) + + +class ModuleCompleter: + """A completer for Python import statements. + + Examples: + - import + - import foo + - import foo. + - import foo as bar, baz + + - from + - from foo + - from foo import + - from foo import bar + - from foo import (bar as baz, qux + """ + + def __init__(self, namespace: Mapping[str, Any] | None = None) -> None: + self.namespace = namespace or {} + self._global_cache: list[pkgutil.ModuleInfo] = [] + self._curr_sys_path: list[str] = sys.path[:] + self._stdlib_path = os.path.dirname(importlib.__path__[0]) + + def get_completions(self, line: str) -> list[str] | None: + """Return the next possible import completions for 'line'.""" + result = ImportParser(line).parse() + if not result: + return None + try: + return self.complete(*result) + except Exception: + # Some unexpected error occurred, make it look like + # no completions are available + return [] + + def complete(self, from_name: str | None, name: str | None) -> list[str]: + if from_name is None: + # import x.y.z + assert name is not None + path, prefix = self.get_path_and_prefix(name) + modules = self.find_modules(path, prefix) + return [self.format_completion(path, module) for module in modules] + + if name is None: + # from x.y.z + path, prefix = self.get_path_and_prefix(from_name) + modules = self.find_modules(path, prefix) + return [self.format_completion(path, module) for module in modules] + + # from x.y import z + return self.find_modules(from_name, name) + + def find_modules(self, path: str, prefix: str) -> list[str]: + """Find all modules under 'path' that start with 'prefix'.""" + modules = self._find_modules(path, prefix) + # Filter out invalid module names + # (for example those containing dashes that cannot be imported with 'import') + return [mod for mod in modules if mod.isidentifier()] + + def _find_modules(self, path: str, prefix: str) -> list[str]: + if not path: + # Top-level import (e.g. `import foo`` or `from foo`)` + builtin_modules = [name for name in sys.builtin_module_names + if self.is_suggestion_match(name, prefix)] + third_party_modules = [module.name for module in self.global_cache + if self.is_suggestion_match(module.name, prefix)] + return sorted(builtin_modules + third_party_modules) + + if path.startswith('.'): + # Convert relative path to absolute path + package = self.namespace.get('__package__', '') + path = self.resolve_relative_name(path, package) # type: ignore[assignment] + if path is None: + return [] + + modules: Iterable[pkgutil.ModuleInfo] = self.global_cache + imported_module = sys.modules.get(path.split('.')[0]) + if imported_module: + # Filter modules to those who name and specs match the + # imported module to avoid invalid suggestions + spec = imported_module.__spec__ + if spec: + modules = [mod for mod in modules + if mod.name == spec.name + and mod.module_finder.find_spec(mod.name, None) == spec] + else: + modules = [] + + is_stdlib_import: bool | None = None + for segment in path.split('.'): + modules = [mod_info for mod_info in modules + if mod_info.ispkg and mod_info.name == segment] + if is_stdlib_import is None: + # Top-level import decide if we import from stdlib or not + is_stdlib_import = all( + self._is_stdlib_module(mod_info) for mod_info in modules + ) + modules = self.iter_submodules(modules) + + module_names = [module.name for module in modules] + if is_stdlib_import: + module_names.extend(HARDCODED_SUBMODULES.get(path, ())) + return [module_name for module_name in module_names + if self.is_suggestion_match(module_name, prefix)] + + def _is_stdlib_module(self, module_info: pkgutil.ModuleInfo) -> bool: + return (isinstance(module_info.module_finder, FileFinder) + and module_info.module_finder.path == self._stdlib_path) + + def is_suggestion_match(self, module_name: str, prefix: str) -> bool: + if prefix: + return module_name.startswith(prefix) + # For consistency with attribute completion, which + # does not suggest private attributes unless requested. + return not module_name.startswith("_") + + def iter_submodules(self, parent_modules: list[pkgutil.ModuleInfo]) -> Iterator[pkgutil.ModuleInfo]: + """Iterate over all submodules of the given parent modules.""" + specs = [info.module_finder.find_spec(info.name, None) + for info in parent_modules if info.ispkg] + search_locations = set(chain.from_iterable( + getattr(spec, 'submodule_search_locations', []) + for spec in specs if spec + )) + return pkgutil.iter_modules(search_locations) + + def get_path_and_prefix(self, dotted_name: str) -> tuple[str, str]: + """ + Split a dotted name into an import path and a + final prefix that is to be completed. + + Examples: + 'foo.bar' -> 'foo', 'bar' + 'foo.' -> 'foo', '' + '.foo' -> '.', 'foo' + """ + if '.' not in dotted_name: + return '', dotted_name + if dotted_name.startswith('.'): + stripped = dotted_name.lstrip('.') + dots = '.' * (len(dotted_name) - len(stripped)) + if '.' not in stripped: + return dots, stripped + path, prefix = stripped.rsplit('.', 1) + return dots + path, prefix + path, prefix = dotted_name.rsplit('.', 1) + return path, prefix + + def format_completion(self, path: str, module: str) -> str: + if path == '' or path.endswith('.'): + return f'{path}{module}' + return f'{path}.{module}' + + def resolve_relative_name(self, name: str, package: str) -> str | None: + """Resolve a relative module name to an absolute name. + + Example: resolve_relative_name('.foo', 'bar') -> 'bar.foo' + """ + # taken from importlib._bootstrap + level = 0 + for character in name: + if character != '.': + break + level += 1 + bits = package.rsplit('.', level - 1) + if len(bits) < level: + return None + base = bits[0] + name = name[level:] + return f'{base}.{name}' if name else base + + @property + def global_cache(self) -> list[pkgutil.ModuleInfo]: + """Global module cache""" + if not self._global_cache or self._curr_sys_path != sys.path: + self._curr_sys_path = sys.path[:] + self._global_cache = list(pkgutil.iter_modules()) + return self._global_cache + + +class ImportParser: + """ + Parses incomplete import statements that are + suitable for autocomplete suggestions. + + Examples: + - import foo -> Result(from_name=None, name='foo') + - import foo. -> Result(from_name=None, name='foo.') + - from foo -> Result(from_name='foo', name=None) + - from foo import bar -> Result(from_name='foo', name='bar') + - from .foo import ( -> Result(from_name='.foo', name='') + + Note that the parser works in reverse order, starting from the + last token in the input string. This makes the parser more robust + when parsing multiple statements. + """ + _ignored_tokens = { + token.INDENT, token.DEDENT, token.COMMENT, + token.NL, token.NEWLINE, token.ENDMARKER + } + _keywords = {'import', 'from', 'as'} + + def __init__(self, code: str) -> None: + self.code = code + tokens = [] + try: + for t in tokenize.generate_tokens(StringIO(code).readline): + if t.type not in self._ignored_tokens: + tokens.append(t) + except tokenize.TokenError as e: + if 'unexpected EOF' not in str(e): + # unexpected EOF is fine, since we're parsing an + # incomplete statement, but other errors are not + # because we may not have all the tokens so it's + # safer to bail out + tokens = [] + except SyntaxError: + tokens = [] + self.tokens = TokenQueue(tokens[::-1]) + + def parse(self) -> tuple[str | None, str | None] | None: + if not (res := self._parse()): + return None + return res.from_name, res.name + + def _parse(self) -> Result | None: + with self.tokens.save_state(): + return self.parse_from_import() + with self.tokens.save_state(): + return self.parse_import() + + def parse_import(self) -> Result: + if self.code.rstrip().endswith('import') and self.code.endswith(' '): + return Result(name='') + if self.tokens.peek_string(','): + name = '' + else: + if self.code.endswith(' '): + raise ParseError('parse_import') + name = self.parse_dotted_name() + if name.startswith('.'): + raise ParseError('parse_import') + while self.tokens.peek_string(','): + self.tokens.pop() + self.parse_dotted_as_name() + if self.tokens.peek_string('import'): + return Result(name=name) + raise ParseError('parse_import') + + def parse_from_import(self) -> Result: + stripped = self.code.rstrip() + if stripped.endswith('import') and self.code.endswith(' '): + return Result(from_name=self.parse_empty_from_import(), name='') + if stripped.endswith('from') and self.code.endswith(' '): + return Result(from_name='') + if self.tokens.peek_string('(') or self.tokens.peek_string(','): + return Result(from_name=self.parse_empty_from_import(), name='') + if self.code.endswith(' '): + raise ParseError('parse_from_import') + name = self.parse_dotted_name() + if '.' in name: + self.tokens.pop_string('from') + return Result(from_name=name) + if self.tokens.peek_string('from'): + return Result(from_name=name) + from_name = self.parse_empty_from_import() + return Result(from_name=from_name, name=name) + + def parse_empty_from_import(self) -> str: + if self.tokens.peek_string(','): + self.tokens.pop() + self.parse_as_names() + if self.tokens.peek_string('('): + self.tokens.pop() + self.tokens.pop_string('import') + return self.parse_from() + + def parse_from(self) -> str: + from_name = self.parse_dotted_name() + self.tokens.pop_string('from') + return from_name + + def parse_dotted_as_name(self) -> str: + self.tokens.pop_name() + if self.tokens.peek_string('as'): + self.tokens.pop() + with self.tokens.save_state(): + return self.parse_dotted_name() + + def parse_dotted_name(self) -> str: + name = [] + if self.tokens.peek_string('.'): + name.append('.') + self.tokens.pop() + if (self.tokens.peek_name() + and (tok := self.tokens.peek()) + and tok.string not in self._keywords): + name.append(self.tokens.pop_name()) + if not name: + raise ParseError('parse_dotted_name') + while self.tokens.peek_string('.'): + name.append('.') + self.tokens.pop() + if (self.tokens.peek_name() + and (tok := self.tokens.peek()) + and tok.string not in self._keywords): + name.append(self.tokens.pop_name()) + else: + break + + while self.tokens.peek_string('.'): + name.append('.') + self.tokens.pop() + return ''.join(name[::-1]) + + def parse_as_names(self) -> None: + self.parse_as_name() + while self.tokens.peek_string(','): + self.tokens.pop() + self.parse_as_name() + + def parse_as_name(self) -> None: + self.tokens.pop_name() + if self.tokens.peek_string('as'): + self.tokens.pop() + self.tokens.pop_name() + + +class ParseError(Exception): + pass + + +@dataclass(frozen=True) +class Result: + from_name: str | None = None + name: str | None = None + + +class TokenQueue: + """Provides helper functions for working with a sequence of tokens.""" + + def __init__(self, tokens: list[TokenInfo]) -> None: + self.tokens: list[TokenInfo] = tokens + self.index: int = 0 + self.stack: list[int] = [] + + @contextmanager + def save_state(self) -> Any: + try: + self.stack.append(self.index) + yield + except ParseError: + self.index = self.stack.pop() + else: + self.stack.pop() + + def __bool__(self) -> bool: + return self.index < len(self.tokens) + + def peek(self) -> TokenInfo | None: + if not self: + return None + return self.tokens[self.index] + + def peek_name(self) -> bool: + if not (tok := self.peek()): + return False + return tok.type == token.NAME + + def pop_name(self) -> str: + tok = self.pop() + if tok.type != token.NAME: + raise ParseError('pop_name') + return tok.string + + def peek_string(self, string: str) -> bool: + if not (tok := self.peek()): + return False + return tok.string == string + + def pop_string(self, string: str) -> str: + tok = self.pop() + if tok.string != string: + raise ParseError('pop_string') + return tok.string + + def pop(self) -> TokenInfo: + if not self: + raise ParseError('pop') + tok = self.tokens[self.index] + self.index += 1 + return tok diff --git a/Lib/_pyrepl/base_eventqueue.py b/Lib/_pyrepl/base_eventqueue.py new file mode 100644 index 000000000..0589a0f43 --- /dev/null +++ b/Lib/_pyrepl/base_eventqueue.py @@ -0,0 +1,110 @@ +# Copyright 2000-2008 Michael Hudson-Doyle +# Armin Rigo +# +# All Rights Reserved +# +# +# Permission to use, copy, modify, and distribute this software and +# its documentation for any purpose is hereby granted without fee, +# provided that the above copyright notice appear in all copies and +# that both that copyright notice and this permission notice appear in +# supporting documentation. +# +# THE AUTHOR MICHAEL HUDSON DISCLAIMS ALL WARRANTIES WITH REGARD TO +# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS, IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, +# INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER +# RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF +# CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +""" +OS-independent base for an event and VT sequence scanner + +See unix_eventqueue and windows_eventqueue for subclasses. +""" + +from collections import deque + +from . import keymap +from .console import Event +from .trace import trace + +class BaseEventQueue: + def __init__(self, encoding: str, keymap_dict: dict[bytes, str]) -> None: + self.compiled_keymap = keymap.compile_keymap(keymap_dict) + self.keymap = self.compiled_keymap + trace("keymap {k!r}", k=self.keymap) + self.encoding = encoding + self.events: deque[Event] = deque() + self.buf = bytearray() + + def get(self) -> Event | None: + """ + Retrieves the next event from the queue. + """ + if self.events: + return self.events.popleft() + else: + return None + + def empty(self) -> bool: + """ + Checks if the queue is empty. + """ + return not self.events + + def flush_buf(self) -> bytearray: + """ + Flushes the buffer and returns its contents. + """ + old = self.buf + self.buf = bytearray() + return old + + def insert(self, event: Event) -> None: + """ + Inserts an event into the queue. + """ + trace('added event {event}', event=event) + self.events.append(event) + + def push(self, char: int | bytes) -> None: + """ + Processes a character by updating the buffer and handling special key mappings. + """ + assert isinstance(char, (int, bytes)) + ord_char = char if isinstance(char, int) else ord(char) + char = ord_char.to_bytes() + self.buf.append(ord_char) + + if char in self.keymap: + if self.keymap is self.compiled_keymap: + # sanity check, buffer is empty when a special key comes + assert len(self.buf) == 1 + k = self.keymap[char] + trace('found map {k!r}', k=k) + if isinstance(k, dict): + self.keymap = k + else: + self.insert(Event('key', k, bytes(self.flush_buf()))) + self.keymap = self.compiled_keymap + + elif self.buf and self.buf[0] == 27: # escape + # escape sequence not recognized by our keymap: propagate it + # outside so that i can be recognized as an M-... key (see also + # the docstring in keymap.py + trace('unrecognized escape sequence, propagating...') + self.keymap = self.compiled_keymap + self.insert(Event('key', '\033', b'\033')) + for _c in self.flush_buf()[1:]: + self.push(_c) + + else: + try: + decoded = bytes(self.buf).decode(self.encoding) + except UnicodeError: + return + else: + self.insert(Event('key', decoded, bytes(self.flush_buf()))) + self.keymap = self.compiled_keymap diff --git a/Lib/_pyrepl/commands.py b/Lib/_pyrepl/commands.py index 503ca1da3..10127e588 100644 --- a/Lib/_pyrepl/commands.py +++ b/Lib/_pyrepl/commands.py @@ -21,6 +21,7 @@ from __future__ import annotations import os +import time # Categories of actions: # killing @@ -31,6 +32,7 @@ import os # finishing # [completion] +from .trace import trace # types if False: @@ -368,6 +370,13 @@ class self_insert(EditCommand): r = self.reader text = self.event * r.get_arg() r.insert(text) + if r.paste_mode: + data = "" + ev = r.console.getpending() + data += ev.data + if data: + r.insert(data) + r.last_refresh_cache.invalidated = True class insert_nl(EditCommand): @@ -411,14 +420,17 @@ class delete(EditCommand): def do(self) -> None: r = self.reader b = r.buffer - if ( - r.pos == 0 - and len(b) == 0 # this is something of a hack - and self.event[-1] == "\004" - ): - r.update_screen() - r.console.finish() - raise EOFError + if self.event[-1] == "\004": + if b and b[-1].endswith("\n"): + self.finish = True + elif ( + r.pos == 0 + and len(b) == 0 # this is something of a hack + ): + r.update_screen() + r.console.finish() + raise EOFError + for i in range(r.get_arg()): if r.pos != len(b): del b[r.pos] @@ -437,7 +449,7 @@ class help(Command): import _sitebuiltins with self.reader.suspend(): - self.reader.msg = _sitebuiltins._Helper()() # type: ignore[assignment, call-arg] + self.reader.msg = _sitebuiltins._Helper()() # type: ignore[assignment] class invalid_key(Command): @@ -456,7 +468,7 @@ class invalid_command(Command): class show_history(Command): def do(self) -> None: from .pager import get_pager - from site import gethistoryfile # type: ignore[attr-defined] + from site import gethistoryfile history = os.linesep.join(self.reader.history[:]) self.reader.console.restore() @@ -471,19 +483,23 @@ class show_history(Command): class paste_mode(Command): - def do(self) -> None: self.reader.paste_mode = not self.reader.paste_mode self.reader.dirty = True -class enable_bracketed_paste(Command): +class perform_bracketed_paste(Command): def do(self) -> None: - self.reader.paste_mode = True - self.reader.in_bracketed_paste = True - -class disable_bracketed_paste(Command): - def do(self) -> None: - self.reader.paste_mode = False - self.reader.in_bracketed_paste = False - self.reader.dirty = True + done = "\x1b[201~" + data = "" + start = time.time() + while done not in data: + ev = self.reader.console.getpending() + data += ev.data + trace( + "bracketed pasting of {l} chars done in {s:.2f}s", + l=len(data), + s=time.time() - start, + ) + self.reader.insert(data.replace(done, "")) + self.reader.last_refresh_cache.invalidated = True diff --git a/Lib/_pyrepl/completing_reader.py b/Lib/_pyrepl/completing_reader.py index 9a005281d..9d2d43be5 100644 --- a/Lib/_pyrepl/completing_reader.py +++ b/Lib/_pyrepl/completing_reader.py @@ -91,7 +91,7 @@ def build_menu( # D E F B E # G C F # - # "fill" the table with empty words, so we always have the same amout + # "fill" the table with empty words, so we always have the same amount # of rows for each column missing = cols*rows - len(wordlist) wordlist = wordlist + ['']*missing @@ -293,3 +293,7 @@ class CompletingReader(Reader): def get_completions(self, stem: str) -> list[str]: return [] + + def get_line(self) -> str: + """Return the current line until the cursor position.""" + return ''.join(self.buffer[:self.pos]) diff --git a/Lib/_pyrepl/console.py b/Lib/_pyrepl/console.py index 0d78890b4..8956fb124 100644 --- a/Lib/_pyrepl/console.py +++ b/Lib/_pyrepl/console.py @@ -19,11 +19,12 @@ from __future__ import annotations -import _colorize # type: ignore[import-not-found] +import _colorize from abc import ABC, abstractmethod import ast import code +import linecache from dataclasses import dataclass, field import os.path import sys @@ -152,6 +153,8 @@ class Console(ABC): class InteractiveColoredConsole(code.InteractiveConsole): + STATEMENT_FAILED = object() + def __init__( self, locals: dict[str, object] | None = None, @@ -159,7 +162,7 @@ class InteractiveColoredConsole(code.InteractiveConsole): *, local_exit: bool = False, ) -> None: - super().__init__(locals=locals, filename=filename, local_exit=local_exit) # type: ignore[call-arg] + super().__init__(locals=locals, filename=filename, local_exit=local_exit) self.can_colorize = _colorize.can_colorize() def showsyntaxerror(self, filename=None, **kwargs): @@ -173,6 +176,16 @@ class InteractiveColoredConsole(code.InteractiveConsole): limit=traceback.BUILTIN_EXCEPTION_LIMIT) self.write(''.join(lines)) + def runcode(self, code): + try: + exec(code, self.locals) + except SystemExit: + raise + except BaseException: + self.showtraceback() + return self.STATEMENT_FAILED + return None + def runsource(self, source, filename="", symbol="single"): try: tree = self.compile.compiler( @@ -193,6 +206,7 @@ class InteractiveColoredConsole(code.InteractiveConsole): item = wrapper([stmt]) try: code = self.compile.compiler(item, filename, the_symbol) + linecache._register_code(code, source, filename) except SyntaxError as e: if e.args[0] == "'await' outside function": python = os.path.basename(sys.executable) @@ -209,5 +223,7 @@ class InteractiveColoredConsole(code.InteractiveConsole): if code is None: return True - self.runcode(code) + result = self.runcode(code) + if result is self.STATEMENT_FAILED: + break return False diff --git a/Lib/_pyrepl/curses.py b/Lib/_pyrepl/curses.py deleted file mode 100644 index 3a624d9f6..000000000 --- a/Lib/_pyrepl/curses.py +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 2000-2010 Michael Hudson-Doyle -# Armin Rigo -# -# All Rights Reserved -# -# -# Permission to use, copy, modify, and distribute this software and -# its documentation for any purpose is hereby granted without fee, -# provided that the above copyright notice appear in all copies and -# that both that copyright notice and this permission notice appear in -# supporting documentation. -# -# THE AUTHOR MICHAEL HUDSON DISCLAIMS ALL WARRANTIES WITH REGARD TO -# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -# AND FITNESS, IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, -# INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER -# RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF -# CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN -# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - - -try: - import _curses -except ImportError: - try: - import curses as _curses # type: ignore[no-redef] - except ImportError: - from . import _minimal_curses as _curses # type: ignore[no-redef] - -setupterm = _curses.setupterm -tigetstr = _curses.tigetstr -tparm = _curses.tparm -error = _curses.error diff --git a/Lib/_pyrepl/fancy_termios.py b/Lib/_pyrepl/fancy_termios.py index 0468b9a26..8d5bd183f 100644 --- a/Lib/_pyrepl/fancy_termios.py +++ b/Lib/_pyrepl/fancy_termios.py @@ -20,19 +20,25 @@ import termios -class TermState: - def __init__(self, tuples): - ( - self.iflag, - self.oflag, - self.cflag, - self.lflag, - self.ispeed, - self.ospeed, - self.cc, - ) = tuples +TYPE_CHECKING = False - def as_list(self): +if TYPE_CHECKING: + from typing import cast +else: + cast = lambda typ, val: val + + +class TermState: + def __init__(self, attrs: list[int | list[bytes]]) -> None: + self.iflag = cast(int, attrs[0]) + self.oflag = cast(int, attrs[1]) + self.cflag = cast(int, attrs[2]) + self.lflag = cast(int, attrs[3]) + self.ispeed = cast(int, attrs[4]) + self.ospeed = cast(int, attrs[5]) + self.cc = cast(list[bytes], attrs[6]) + + def as_list(self) -> list[int | list[bytes]]: return [ self.iflag, self.oflag, @@ -45,32 +51,32 @@ class TermState: self.cc[:], ] - def copy(self): + def copy(self) -> "TermState": return self.__class__(self.as_list()) -def tcgetattr(fd): +def tcgetattr(fd: int) -> TermState: return TermState(termios.tcgetattr(fd)) -def tcsetattr(fd, when, attrs): +def tcsetattr(fd: int, when: int, attrs: TermState) -> None: termios.tcsetattr(fd, when, attrs.as_list()) class Term(TermState): TS__init__ = TermState.__init__ - def __init__(self, fd=0): + def __init__(self, fd: int = 0) -> None: self.TS__init__(termios.tcgetattr(fd)) self.fd = fd - self.stack = [] + self.stack: list[list[int | list[bytes]]] = [] - def save(self): + def save(self) -> None: self.stack.append(self.as_list()) - def set(self, when=termios.TCSANOW): + def set(self, when: int = termios.TCSANOW) -> None: termios.tcsetattr(self.fd, when, self.as_list()) - def restore(self): + def restore(self) -> None: self.TS__init__(self.stack.pop()) self.set() diff --git a/Lib/_pyrepl/keymap.py b/Lib/_pyrepl/keymap.py index 2fb03d195..d11df4b51 100644 --- a/Lib/_pyrepl/keymap.py +++ b/Lib/_pyrepl/keymap.py @@ -30,20 +30,20 @@ sequence. pyrepl uses its own keyspec format that is meant to be a strict superset of readline's KEYSEQ format. This means that if a spec is found that readline accepts that this doesn't, it should be logged as a bug. Note that this means -we're using the `\\C-o' style of readline's keyspec, not the `Control-o' sort. +we're using the '\\C-o' style of readline's keyspec, not the 'Control-o' sort. The extension to readline is that the sequence \\ denotes the sequence of characters produced by hitting KEY. Examples: -`a' - what you get when you hit the `a' key -`\\EOA' - Escape - O - A (up, on my terminal) -`\\' - the up arrow key -`\\' - ditto (keynames are case-insensitive) -`\\C-o', `\\c-o' - control-o -`\\M-.' - meta-period -`\\E.' - ditto (that's how meta works for pyrepl) -`\\', `\\', `\\t', `\\011', '\\x09', '\\X09', '\\C-i', '\\C-I' +'a' - what you get when you hit the 'a' key +'\\EOA' - Escape - O - A (up, on my terminal) +'\\' - the up arrow key +'\\' - ditto (keynames are case-insensitive) +'\\C-o', '\\c-o' - control-o +'\\M-.' - meta-period +'\\E.' - ditto (that's how meta works for pyrepl) +'\\', '\\', '\\t', '\\011', '\\x09', '\\X09', '\\C-i', '\\C-I' - all of these are the tab character. """ diff --git a/Lib/_pyrepl/main.py b/Lib/_pyrepl/main.py index a6f824dcc..447eb1e55 100644 --- a/Lib/_pyrepl/main.py +++ b/Lib/_pyrepl/main.py @@ -1,6 +1,7 @@ import errno import os import sys +import types CAN_USE_PYREPL: bool @@ -29,12 +30,10 @@ def interactive_console(mainmodule=None, quiet=False, pythonstartup=False): print(FAIL_REASON, file=sys.stderr) return sys._baserepl() - if mainmodule: - namespace = mainmodule.__dict__ - else: - import __main__ - namespace = __main__.__dict__ - namespace.pop("__pyrepl_interactive_console", None) + if not mainmodule: + mainmodule = types.ModuleType("__main__") + + namespace = mainmodule.__dict__ # sys._baserepl() above does this internally, we do it here startup_path = os.getenv("PYTHONSTARTUP") diff --git a/Lib/_pyrepl/mypy.ini b/Lib/_pyrepl/mypy.ini index 395f5945a..9375a55b5 100644 --- a/Lib/_pyrepl/mypy.ini +++ b/Lib/_pyrepl/mypy.ini @@ -4,8 +4,9 @@ [mypy] files = Lib/_pyrepl +mypy_path = $MYPY_CONFIG_FILE_DIR/../../Misc/mypy explicit_package_bases = True -python_version = 3.12 +python_version = 3.13 platform = linux pretty = True diff --git a/Lib/_pyrepl/reader.py b/Lib/_pyrepl/reader.py index dc26bfd3a..f0116e742 100644 --- a/Lib/_pyrepl/reader.py +++ b/Lib/_pyrepl/reader.py @@ -22,15 +22,13 @@ from __future__ import annotations import sys +import _colorize from contextlib import contextmanager from dataclasses import dataclass, field, fields -import unicodedata -from _colorize import can_colorize, ANSIColors # type: ignore[import-not-found] - from . import commands, console, input -from .utils import ANSI_ESCAPE_SEQUENCE, wlen, str_width +from .utils import wlen, unbracket, disp_str, gen_colors, THEME from .trace import trace @@ -39,38 +37,7 @@ Command = commands.Command from .types import Callback, SimpleContextManager, KeySpec, CommandName -def disp_str(buffer: str) -> tuple[str, list[int]]: - """disp_str(buffer:string) -> (string, [int]) - - Return the string that should be the printed representation of - |buffer| and a list detailing where the characters of |buffer| - get used up. E.g.: - - >>> disp_str(chr(3)) - ('^C', [1, 0]) - - """ - b: list[int] = [] - s: list[str] = [] - for c in buffer: - if c == '\x1a': - s.append(c) - b.append(2) - elif ord(c) < 128: - s.append(c) - b.append(1) - elif unicodedata.category(c).startswith("C"): - c = r"\u%04x" % ord(c) - s.append(c) - b.extend([0] * (len(c) - 1)) - else: - s.append(c) - b.append(str_width(c)) - return "".join(s), b - - -# syntax classes: - +# syntax classes SYNTAX_WHITESPACE, SYNTAX_WORD, SYNTAX_SYMBOL = range(3) @@ -136,8 +103,7 @@ default_keymap: tuple[tuple[KeySpec, CommandName], ...] = tuple( (r"\M-9", "digit-arg"), (r"\M-\n", "accept"), ("\\\\", "self-insert"), - (r"\x1b[200~", "enable_bracketed_paste"), - (r"\x1b[201~", "disable_bracketed_paste"), + (r"\x1b[200~", "perform-bracketed-paste"), (r"\x03", "ctrl-c"), ] + [(c, "self-insert") for c in map(chr, range(32, 127)) if c != "\\"] @@ -175,20 +141,21 @@ class Reader: Instance variables of note include: * buffer: - A *list* (*not* a string at the moment :-) containing all the - characters that have been entered. + A per-character list containing all the characters that have been + entered. Does not include color information. * console: Hopefully encapsulates the OS dependent stuff. * pos: - A 0-based index into `buffer' for where the insertion point + A 0-based index into 'buffer' for where the insertion point is. * screeninfo: - Ahem. This list contains some info needed to move the - insertion point around reasonably efficiently. + A list of screen position tuples. Each list element is a tuple + representing information on visible line length for a given line. + Allows for efficient skipping of color escape sequences. * cxy, lxy: the position of the insertion point in screen ... * syntax_table: - Dictionary mapping characters to `syntax class'; read the + Dictionary mapping characters to 'syntax class'; read the emacs docs to see what this means :-) * commands: Dictionary mapping command names to command classes. @@ -234,7 +201,6 @@ class Reader: dirty: bool = False finished: bool = False paste_mode: bool = False - in_bracketed_paste: bool = False commands: dict[str, type[Command]] = field(default_factory=make_default_commands) last_command: type[Command] | None = None syntax_table: dict[str, int] = field(default_factory=make_default_syntax_table) @@ -252,7 +218,6 @@ class Reader: ## cached metadata to speed up screen refreshes @dataclass class RefreshCache: - in_bracketed_paste: bool = False screen: list[str] = field(default_factory=list) screeninfo: list[tuple[int, list[int]]] = field(init=False) line_end_offsets: list[int] = field(default_factory=list) @@ -266,7 +231,6 @@ class Reader: screen: list[str], screeninfo: list[tuple[int, list[int]]], ) -> None: - self.in_bracketed_paste = reader.in_bracketed_paste self.screen = screen.copy() self.screeninfo = screeninfo.copy() self.pos = reader.pos @@ -279,8 +243,7 @@ class Reader: return False dimensions = reader.console.width, reader.console.height dimensions_changed = dimensions != self.dimensions - paste_changed = reader.in_bracketed_paste != self.in_bracketed_paste - return not (dimensions_changed or paste_changed) + return not dimensions_changed def get_cached_location(self, reader: Reader) -> tuple[int, int]: if self.invalidated: @@ -310,7 +273,7 @@ class Reader: self.screeninfo = [(0, [])] self.cxy = self.pos2xy() self.lxy = (self.pos, 0) - self.can_colorize = can_colorize() + self.can_colorize = _colorize.can_colorize() self.last_refresh_cache.screeninfo = self.screeninfo self.last_refresh_cache.pos = self.pos @@ -348,13 +311,17 @@ class Reader: prompt_from_cache = (offset and self.buffer[offset - 1] != "\n") + if self.can_colorize: + colors = list(gen_colors(self.get_unicode())) + else: + colors = None + trace("colors = {colors}", colors=colors) lines = "".join(self.buffer[offset:]).split("\n") - cursor_found = False lines_beyond_cursor = 0 for ln, line in enumerate(lines, num_common_lines): - ll = len(line) - if 0 <= pos <= ll: + line_len = len(line) + if 0 <= pos <= line_len: self.lxy = pos, ln cursor_found = True elif cursor_found: @@ -368,34 +335,33 @@ class Reader: prompt_from_cache = False prompt = "" else: - prompt = self.get_prompt(ln, ll >= pos >= 0) + prompt = self.get_prompt(ln, line_len >= pos >= 0) while "\n" in prompt: pre_prompt, _, prompt = prompt.partition("\n") last_refresh_line_end_offsets.append(offset) screen.append(pre_prompt) screeninfo.append((0, [])) - pos -= ll + 1 - prompt, lp = self.process_prompt(prompt) - l, l2 = disp_str(line) - wrapcount = (wlen(l) + lp) // self.console.width - if wrapcount == 0: - offset += ll + 1 # Takes all of the line plus the newline + pos -= line_len + 1 + prompt, prompt_len = self.process_prompt(prompt) + chars, char_widths = disp_str(line, colors, offset) + wrapcount = (sum(char_widths) + prompt_len) // self.console.width + if wrapcount == 0 or not char_widths: + offset += line_len + 1 # Takes all of the line plus the newline last_refresh_line_end_offsets.append(offset) - screen.append(prompt + l) - screeninfo.append((lp, l2)) + screen.append(prompt + "".join(chars)) + screeninfo.append((prompt_len, char_widths)) else: - i = 0 - while l: - prelen = lp if i == 0 else 0 + pre = prompt + prelen = prompt_len + for wrap in range(wrapcount + 1): index_to_wrap_before = 0 column = 0 - for character_width in l2: - if column + character_width >= self.console.width - prelen: + for char_width in char_widths: + if column + char_width + prelen >= self.console.width: break index_to_wrap_before += 1 - column += character_width - pre = prompt if i == 0 else "" - if len(l) > index_to_wrap_before: + column += char_width + if len(chars) > index_to_wrap_before: offset += index_to_wrap_before post = "\\" after = [1] @@ -404,11 +370,14 @@ class Reader: post = "" after = [] last_refresh_line_end_offsets.append(offset) - screen.append(pre + l[:index_to_wrap_before] + post) - screeninfo.append((prelen, l2[:index_to_wrap_before] + after)) - l = l[index_to_wrap_before:] - l2 = l2[index_to_wrap_before:] - i += 1 + render = pre + "".join(chars[:index_to_wrap_before]) + post + render_widths = char_widths[:index_to_wrap_before] + after + screen.append(render) + screeninfo.append((prelen, render_widths)) + chars = chars[index_to_wrap_before:] + char_widths = char_widths[index_to_wrap_before:] + pre = "" + prelen = 0 self.screeninfo = screeninfo self.cxy = self.pos2xy() if self.msg: @@ -421,42 +390,15 @@ class Reader: @staticmethod def process_prompt(prompt: str) -> tuple[str, int]: - """Process the prompt. + r"""Return a tuple with the prompt string and its visible length. - This means calculate the length of the prompt. The character \x01 - and \x02 are used to bracket ANSI control sequences and need to be - excluded from the length calculation. So also a copy of the prompt - is returned with these control characters removed.""" - - # The logic below also ignores the length of common escape - # sequences if they were not explicitly within \x01...\x02. - # They are CSI (or ANSI) sequences ( ESC [ ... LETTER ) - - # wlen from utils already excludes ANSI_ESCAPE_SEQUENCE chars, - # which breaks the logic below so we redefine it here. - def wlen(s: str) -> int: - return sum(str_width(i) for i in s) - - out_prompt = "" - l = wlen(prompt) - pos = 0 - while True: - s = prompt.find("\x01", pos) - if s == -1: - break - e = prompt.find("\x02", s) - if e == -1: - break - # Found start and end brackets, subtract from string length - l = l - (e - s + 1) - keep = prompt[pos:s] - l -= sum(map(wlen, ANSI_ESCAPE_SEQUENCE.findall(keep))) - out_prompt += keep + prompt[s + 1 : e] - pos = e + 1 - keep = prompt[pos:] - l -= sum(map(wlen, ANSI_ESCAPE_SEQUENCE.findall(keep))) - out_prompt += keep - return out_prompt, l + The prompt string has the zero-width brackets recognized by shells + (\x01 and \x02) removed. The length ignores anything between those + brackets as well as any ANSI escape sequences. + """ + out_prompt = unbracket(prompt, including_content=False) + visible_prompt = unbracket(prompt, including_content=True) + return out_prompt, wlen(visible_prompt) def bow(self, p: int | None = None) -> int: """Return the 0-based index of the word break preceding p most @@ -525,7 +467,7 @@ class Reader: def get_arg(self, default: int = 1) -> int: """Return any prefix argument that the user has supplied, - returning `default' if there is None. Defaults to 1. + returning 'default' if there is None. Defaults to 1. """ if self.arg is None: return default @@ -533,10 +475,10 @@ class Reader: def get_prompt(self, lineno: int, cursor_on_line: bool) -> str: """Return what should be in the left-hand margin for line - `lineno'.""" + 'lineno'.""" if self.arg is not None and cursor_on_line: prompt = f"(arg: {self.arg}) " - elif self.paste_mode and not self.in_bracketed_paste: + elif self.paste_mode: prompt = "(paste) " elif "\n" in self.buffer: if lineno == 0: @@ -549,7 +491,8 @@ class Reader: prompt = self.ps1 if self.can_colorize: - prompt = f"{ANSIColors.BOLD_MAGENTA}{prompt}{ANSIColors.RESET}" + t = THEME() + prompt = f"{t.prompt}{prompt}{t.reset}" return prompt def push_input_trans(self, itrans: input.KeymapTranslator) -> None: @@ -564,9 +507,9 @@ class Reader: pos = 0 i = 0 while i < y: - prompt_len, character_widths = self.screeninfo[i] - offset = len(character_widths) - character_widths.count(0) - in_wrapped_line = prompt_len + sum(character_widths) >= self.console.width + prompt_len, char_widths = self.screeninfo[i] + offset = len(char_widths) + in_wrapped_line = prompt_len + sum(char_widths) >= self.console.width if in_wrapped_line: pos += offset - 1 # -1 cause backslash is not in buffer else: @@ -577,6 +520,7 @@ class Reader: cur_x = self.screeninfo[i][0] while cur_x < x: if self.screeninfo[i][1][j] == 0: + j += 1 # prevent potential future infinite loop continue cur_x += self.screeninfo[i][1][j] j += 1 @@ -586,29 +530,33 @@ class Reader: def pos2xy(self) -> tuple[int, int]: """Return the x, y coordinates of position 'pos'.""" - # this *is* incomprehensible, yes. - p, y = 0, 0 - l2: list[int] = [] + + prompt_len, y = 0, 0 + char_widths: list[int] = [] pos = self.pos assert 0 <= pos <= len(self.buffer) + + # optimize for the common case: typing at the end of the buffer if pos == len(self.buffer) and len(self.screeninfo) > 0: y = len(self.screeninfo) - 1 - p, l2 = self.screeninfo[y] - return p + sum(l2) + l2.count(0), y + prompt_len, char_widths = self.screeninfo[y] + return prompt_len + sum(char_widths), y + + for prompt_len, char_widths in self.screeninfo: + offset = len(char_widths) + in_wrapped_line = prompt_len + sum(char_widths) >= self.console.width + if in_wrapped_line: + offset -= 1 # need to remove line-wrapping backslash - for p, l2 in self.screeninfo: - l = len(l2) - l2.count(0) - in_wrapped_line = p + sum(l2) >= self.console.width - offset = l - 1 if in_wrapped_line else l # need to remove backslash if offset >= pos: break - if p + sum(l2) >= self.console.width: - pos -= l - 1 # -1 cause backslash is not in buffer - else: - pos -= l + 1 # +1 cause newline is in buffer + if not in_wrapped_line: + offset += 1 # there's a newline in buffer + + pos -= offset y += 1 - return p + sum(l2[:pos]), y + return prompt_len + sum(char_widths[:pos]), y def insert(self, text: str | list[str]) -> None: """Insert 'text' at the insertion point.""" @@ -619,6 +567,7 @@ class Reader: def update_cursor(self) -> None: """Move the cursor to reflect changes in self.pos""" self.cxy = self.pos2xy() + trace("update_cursor({pos}) = {cxy}", pos=self.pos, cxy=self.cxy) self.console.move_cursor(*self.cxy) def after_command(self, cmd: Command) -> None: @@ -670,6 +619,16 @@ class Reader: setattr(self, arg, prev_state[arg]) self.prepare() + @contextmanager + def suspend_colorization(self) -> SimpleContextManager: + try: + old_can_colorize = self.can_colorize + self.can_colorize = False + yield + finally: + self.can_colorize = old_can_colorize + + def finish(self) -> None: """Called when a command signals that we're finished.""" pass @@ -685,9 +644,7 @@ class Reader: def refresh(self) -> None: """Recalculate and refresh the screen.""" - if self.in_bracketed_paste and self.buffer and not self.buffer[-1] == "\n": - return - + self.console.height, self.console.width = self.console.getheightwidth() # this call sets up self.cxy, so call it first. self.screen = self.calc_screen() self.console.refresh(self.screen, self.cxy) diff --git a/Lib/_pyrepl/readline.py b/Lib/_pyrepl/readline.py index 888185eb0..23b8fa6b9 100644 --- a/Lib/_pyrepl/readline.py +++ b/Lib/_pyrepl/readline.py @@ -32,20 +32,22 @@ import warnings from dataclasses import dataclass, field import os -from site import gethistoryfile # type: ignore[attr-defined] +from site import gethistoryfile import sys from rlcompleter import Completer as RLCompleter from . import commands, historical_reader from .completing_reader import CompletingReader from .console import Console as ConsoleType +from ._module_completer import ModuleCompleter, make_default_module_completer Console: type[ConsoleType] _error: tuple[type[Exception], ...] | type[Exception] -try: - from .unix_console import UnixConsole as Console, _error -except ImportError: + +if os.name == "nt": from .windows_console import WindowsConsole as Console, _error +else: + from .unix_console import UnixConsole as Console, _error ENCODING = sys.getdefaultencoding() or "latin1" @@ -89,6 +91,7 @@ __all__ = [ # "set_pre_input_hook", "set_startup_hook", "write_history_file", + "append_history_file", # ---- multiline extensions ---- "multiline_input", ] @@ -99,7 +102,7 @@ __all__ = [ class ReadlineConfig: readline_completer: Completer | None = None completer_delims: frozenset[str] = frozenset(" \t\n`~!@#$%^&*()-=+[{]}\\|;:'\",<>/?") - + module_completer: ModuleCompleter = field(default_factory=make_default_module_completer) @dataclass(kw_only=True) class ReadlineAlikeReader(historical_reader.HistoricalReader, CompletingReader): @@ -132,6 +135,9 @@ class ReadlineAlikeReader(historical_reader.HistoricalReader, CompletingReader): return "".join(b[p + 1 : self.pos]) def get_completions(self, stem: str) -> list[str]: + module_completions = self.get_module_completions() + if module_completions is not None: + return module_completions if len(stem) == 0 and self.more_lines is not None: b = self.buffer p = self.pos @@ -161,6 +167,10 @@ class ReadlineAlikeReader(historical_reader.HistoricalReader, CompletingReader): result.sort() return result + def get_module_completions(self) -> list[str] | None: + line = self.get_line() + return self.config.module_completer.get_completions(line) + def get_trimmed_history(self, maxlength: int) -> list[str]: if maxlength >= 0: cut = len(self.history) - maxlength @@ -268,10 +278,6 @@ class maybe_accept(commands.Command): r = self.reader # type: ignore[assignment] r.dirty = True # this is needed to hide the completion menu, if visible - if self.reader.in_bracketed_paste: - r.insert("\n") - return - # if there are already several lines and the cursor # is not on the last one, always insert a new \n. text = r.get_unicode() @@ -446,6 +452,7 @@ class _ReadlineWrapper: del buffer[:] if line: history.append(line) + self.set_history_length(self.get_current_history_length()) def write_history_file(self, filename: str = gethistoryfile()) -> None: maxlength = self.saved_history_length @@ -457,6 +464,19 @@ class _ReadlineWrapper: entry = entry.replace("\n", "\r\n") # multiline history support f.write(entry + "\n") + def append_history_file(self, filename: str = gethistoryfile()) -> None: + reader = self.get_reader() + saved_length = self.get_history_length() + length = self.get_current_history_length() - saved_length + history = reader.get_trimmed_history(length) + f = open(os.path.expanduser(filename), "a", + encoding="utf-8", newline="\n") + with f: + for entry in history: + entry = entry.replace("\n", "\r\n") # multiline history support + f.write(entry + "\n") + self.set_history_length(saved_length + length) + def clear_history(self) -> None: del self.get_reader().history[:] @@ -526,6 +546,7 @@ set_history_length = _wrapper.set_history_length get_current_history_length = _wrapper.get_current_history_length read_history_file = _wrapper.read_history_file write_history_file = _wrapper.write_history_file +append_history_file = _wrapper.append_history_file clear_history = _wrapper.clear_history get_history_item = _wrapper.get_history_item remove_history_item = _wrapper.remove_history_item @@ -587,6 +608,7 @@ def _setup(namespace: Mapping[str, Any]) -> None: # set up namespace in rlcompleter, which requires it to be a bona fide dict if not isinstance(namespace, dict): namespace = dict(namespace) + _wrapper.config.module_completer = ModuleCompleter(namespace) _wrapper.config.readline_completer = RLCompleter(namespace).complete # this is not really what readline.c does. Better than nothing I guess diff --git a/Lib/_pyrepl/simple_interact.py b/Lib/_pyrepl/simple_interact.py index 66e66eae7..6508f0233 100644 --- a/Lib/_pyrepl/simple_interact.py +++ b/Lib/_pyrepl/simple_interact.py @@ -26,18 +26,14 @@ allowing multiline input and multiline history entries. from __future__ import annotations import _sitebuiltins -import linecache import functools import os import sys import code +import warnings +import errno -from .readline import _get_reader, multiline_input - -TYPE_CHECKING = False - -if TYPE_CHECKING: - from typing import Any +from .readline import _get_reader, multiline_input, append_history_file _error: tuple[type[Exception], ...] | type[Exception] @@ -115,6 +111,10 @@ def run_multiline_interactive_console( more_lines = functools.partial(_more_lines, console) input_n = 0 + _is_x_showrefcount_set = sys._xoptions.get("showrefcount") + _is_pydebug_build = hasattr(sys, "gettotalrefcount") + show_ref_count = _is_x_showrefcount_set and _is_pydebug_build + def maybe_run_command(statement: str) -> bool: statement = statement.strip() if statement in console.locals or statement not in REPL_COMMANDS: @@ -125,12 +125,12 @@ def run_multiline_interactive_console( command = REPL_COMMANDS[statement] if callable(command): # Make sure that history does not change because of commands - with reader.suspend_history(): + with reader.suspend_history(), reader.suspend_colorization(): command() return True return False - while 1: + while True: try: try: sys.stdout.flush() @@ -148,20 +148,34 @@ def run_multiline_interactive_console( continue input_name = f"" - linecache._register_code(input_name, statement, "") # type: ignore[attr-defined] more = console.push(_strip_final_indent(statement), filename=input_name, _symbol="single") # type: ignore[call-arg] assert not more + try: + append_history_file() + except (FileNotFoundError, PermissionError, OSError) as e: + warnings.warn(f"failed to open the history file for writing: {e}") + input_n += 1 except KeyboardInterrupt: r = _get_reader() + r.cmpltn_reset() if r.input_trans is r.isearch_trans: r.do_cmd(("isearch-end", [""])) r.pos = len(r.get_unicode()) r.dirty = True r.refresh() - r.in_bracketed_paste = False console.write("\nKeyboardInterrupt\n") console.resetbuffer() except MemoryError: console.write("\nMemoryError\n") console.resetbuffer() + except SystemExit: + raise + except: + console.showtraceback() + console.resetbuffer() + if show_ref_count: + console.write( + f"[{sys.gettotalrefcount()} refs," + f" {sys.getallocatedblocks()} blocks]\n" + ) diff --git a/Lib/_pyrepl/terminfo.py b/Lib/_pyrepl/terminfo.py new file mode 100644 index 000000000..d02ef69cc --- /dev/null +++ b/Lib/_pyrepl/terminfo.py @@ -0,0 +1,488 @@ +"""Pure Python curses-like terminal capability queries.""" + +from dataclasses import dataclass, field +import errno +import os +from pathlib import Path +import re +import struct + + +# Terminfo constants +MAGIC16 = 0o432 # Magic number for 16-bit terminfo format +MAGIC32 = 0o1036 # Magic number for 32-bit terminfo format + +# Special values for absent/cancelled capabilities +ABSENT_BOOLEAN = -1 +ABSENT_NUMERIC = -1 +CANCELLED_NUMERIC = -2 +ABSENT_STRING = None +CANCELLED_STRING = None + + +# Standard string capability names from ncurses Caps file +# This matches the order used by ncurses when compiling terminfo +# fmt: off +_STRING_NAMES: tuple[str, ...] = ( + "cbt", "bel", "cr", "csr", "tbc", "clear", "el", "ed", "hpa", "cmdch", + "cup", "cud1", "home", "civis", "cub1", "mrcup", "cnorm", "cuf1", "ll", + "cuu1", "cvvis", "dch1", "dl1", "dsl", "hd", "smacs", "blink", "bold", + "smcup", "smdc", "dim", "smir", "invis", "prot", "rev", "smso", "smul", + "ech", "rmacs", "sgr0", "rmcup", "rmdc", "rmir", "rmso", "rmul", "flash", + "ff", "fsl", "is1", "is2", "is3", "if", "ich1", "il1", "ip", "kbs", "ktbc", + "kclr", "kctab", "kdch1", "kdl1", "kcud1", "krmir", "kel", "ked", "kf0", + "kf1", "kf10", "kf2", "kf3", "kf4", "kf5", "kf6", "kf7", "kf8", "kf9", + "khome", "kich1", "kil1", "kcub1", "kll", "knp", "kpp", "kcuf1", "kind", + "kri", "khts", "kcuu1", "rmkx", "smkx", "lf0", "lf1", "lf10", "lf2", "lf3", + "lf4", "lf5", "lf6", "lf7", "lf8", "lf9", "rmm", "smm", "nel", "pad", "dch", + "dl", "cud", "ich", "indn", "il", "cub", "cuf", "rin", "cuu", "pfkey", + "pfloc", "pfx", "mc0", "mc4", "mc5", "rep", "rs1", "rs2", "rs3", "rf", "rc", + "vpa", "sc", "ind", "ri", "sgr", "hts", "wind", "ht", "tsl", "uc", "hu", + "iprog", "ka1", "ka3", "kb2", "kc1", "kc3", "mc5p", "rmp", "acsc", "pln", + "kcbt", "smxon", "rmxon", "smam", "rmam", "xonc", "xoffc", "enacs", "smln", + "rmln", "kbeg", "kcan", "kclo", "kcmd", "kcpy", "kcrt", "kend", "kent", + "kext", "kfnd", "khlp", "kmrk", "kmsg", "kmov", "knxt", "kopn", "kopt", + "kprv", "kprt", "krdo", "kref", "krfr", "krpl", "krst", "kres", "ksav", + "kspd", "kund", "kBEG", "kCAN", "kCMD", "kCPY", "kCRT", "kDC", "kDL", + "kslt", "kEND", "kEOL", "kEXT", "kFND", "kHLP", "kHOM", "kIC", "kLFT", + "kMSG", "kMOV", "kNXT", "kOPT", "kPRV", "kPRT", "kRDO", "kRPL", "kRIT", + "kRES", "kSAV", "kSPD", "kUND", "rfi", "kf11", "kf12", "kf13", "kf14", + "kf15", "kf16", "kf17", "kf18", "kf19", "kf20", "kf21", "kf22", "kf23", + "kf24", "kf25", "kf26", "kf27", "kf28", "kf29", "kf30", "kf31", "kf32", + "kf33", "kf34", "kf35", "kf36", "kf37", "kf38", "kf39", "kf40", "kf41", + "kf42", "kf43", "kf44", "kf45", "kf46", "kf47", "kf48", "kf49", "kf50", + "kf51", "kf52", "kf53", "kf54", "kf55", "kf56", "kf57", "kf58", "kf59", + "kf60", "kf61", "kf62", "kf63", "el1", "mgc", "smgl", "smgr", "fln", "sclk", + "dclk", "rmclk", "cwin", "wingo", "hup","dial", "qdial", "tone", "pulse", + "hook", "pause", "wait", "u0", "u1", "u2", "u3", "u4", "u5", "u6", "u7", + "u8", "u9", "op", "oc", "initc", "initp", "scp", "setf", "setb", "cpi", + "lpi", "chr", "cvr", "defc", "swidm", "sdrfq", "sitm", "slm", "smicm", + "snlq", "snrmq", "sshm", "ssubm", "ssupm", "sum", "rwidm", "ritm", "rlm", + "rmicm", "rshm", "rsubm", "rsupm", "rum", "mhpa", "mcud1", "mcub1", "mcuf1", + "mvpa", "mcuu1", "porder", "mcud", "mcub", "mcuf", "mcuu", "scs", "smgb", + "smgbp", "smglp", "smgrp", "smgt", "smgtp", "sbim", "scsd", "rbim", "rcsd", + "subcs", "supcs", "docr", "zerom", "csnm", "kmous", "minfo", "reqmp", + "getm", "setaf", "setab", "pfxl", "devt", "csin", "s0ds", "s1ds", "s2ds", + "s3ds", "smglr", "smgtb", "birep", "binel", "bicr", "colornm", "defbi", + "endbi", "setcolor", "slines", "dispc", "smpch", "rmpch", "smsc", "rmsc", + "pctrm", "scesc", "scesa", "ehhlm", "elhlm", "elohlm", "erhlm", "ethlm", + "evhlm", "sgr1", "slength", "OTi2", "OTrs", "OTnl", "OTbc", "OTko", "OTma", + "OTG2", "OTG3", "OTG1", "OTG4", "OTGR", "OTGL", "OTGU", "OTGD", "OTGH", + "OTGV", "OTGC","meml", "memu", "box1" +) +# fmt: on + + +def _get_terminfo_dirs() -> list[Path]: + """Get list of directories to search for terminfo files. + + Based on ncurses behavior in: + - ncurses/tinfo/db_iterator.c:_nc_next_db() + - ncurses/tinfo/read_entry.c:_nc_read_entry() + """ + dirs = [] + + terminfo = os.environ.get("TERMINFO") + if terminfo: + dirs.append(terminfo) + + try: + home = Path.home() + dirs.append(str(home / ".terminfo")) + except RuntimeError: + pass + + # Check TERMINFO_DIRS + terminfo_dirs = os.environ.get("TERMINFO_DIRS", "") + if terminfo_dirs: + for d in terminfo_dirs.split(":"): + if d: + dirs.append(d) + + dirs.extend( + [ + "/etc/terminfo", + "/lib/terminfo", + "/usr/lib/terminfo", + "/usr/share/terminfo", + "/usr/share/lib/terminfo", + "/usr/share/misc/terminfo", + "/usr/local/lib/terminfo", + "/usr/local/share/terminfo", + ] + ) + + return [Path(d) for d in dirs if Path(d).is_dir()] + + +def _validate_terminal_name_or_raise(terminal_name: str) -> None: + if not isinstance(terminal_name, str): + raise TypeError("`terminal_name` must be a string") + + if not terminal_name: + raise ValueError("`terminal_name` cannot be empty") + + if "\x00" in terminal_name: + raise ValueError("NUL character found in `terminal_name`") + + t = Path(terminal_name) + if len(t.parts) > 1: + raise ValueError("`terminal_name` cannot contain path separators") + + +def _read_terminfo_file(terminal_name: str) -> bytes: + """Find and read terminfo file for given terminal name. + + Terminfo files are stored in directories using the first character + of the terminal name as a subdirectory. + """ + _validate_terminal_name_or_raise(terminal_name) + first_char = terminal_name[0].lower() + filename = terminal_name + + for directory in _get_terminfo_dirs(): + path = directory / first_char / filename + if path.is_file(): + return path.read_bytes() + + # Try with hex encoding of first char (for special chars) + hex_dir = "%02x" % ord(first_char) + path = directory / hex_dir / filename + if path.is_file(): + return path.read_bytes() + + raise FileNotFoundError(errno.ENOENT, os.strerror(errno.ENOENT), filename) + + +# Hard-coded terminal capabilities for common terminals +# This is a minimal subset needed by PyREPL +_TERMINAL_CAPABILITIES = { + # ANSI/xterm-compatible terminals + "ansi": { + # Bell + "bel": b"\x07", + # Cursor movement + "cub": b"\x1b[%p1%dD", # Move cursor left N columns + "cud": b"\x1b[%p1%dB", # Move cursor down N rows + "cuf": b"\x1b[%p1%dC", # Move cursor right N columns + "cuu": b"\x1b[%p1%dA", # Move cursor up N rows + "cub1": b"\x08", # Move cursor left 1 column + "cud1": b"\n", # Move cursor down 1 row + "cuf1": b"\x1b[C", # Move cursor right 1 column + "cuu1": b"\x1b[A", # Move cursor up 1 row + "cup": b"\x1b[%i%p1%d;%p2%dH", # Move cursor to row, column + "hpa": b"\x1b[%i%p1%dG", # Move cursor to column + # Clear operations + "clear": b"\x1b[H\x1b[2J", # Clear screen and home cursor + "el": b"\x1b[K", # Clear to end of line + # Insert/delete + "dch": b"\x1b[%p1%dP", # Delete N characters + "dch1": b"\x1b[P", # Delete 1 character + "ich": b"\x1b[%p1%d@", # Insert N characters + "ich1": b"", # Insert 1 character + # Cursor visibility + "civis": b"\x1b[?25l", # Make cursor invisible + "cnorm": b"\x1b[?12l\x1b[?25h", # Make cursor normal (visible) + # Scrolling + "ind": b"\n", # Scroll up one line + "ri": b"\x1bM", # Scroll down one line + # Keypad mode + "smkx": b"\x1b[?1h\x1b=", # Enable keypad mode + "rmkx": b"\x1b[?1l\x1b>", # Disable keypad mode + # Padding (not used in modern terminals) + "pad": b"", + # Function keys and special keys + "kdch1": b"\x1b[3~", # Delete key + "kcud1": b"\x1bOB", # Down arrow + "kend": b"\x1bOF", # End key + "kent": b"\x1bOM", # Enter key + "khome": b"\x1bOH", # Home key + "kich1": b"\x1b[2~", # Insert key + "kcub1": b"\x1bOD", # Left arrow + "knp": b"\x1b[6~", # Page down + "kpp": b"\x1b[5~", # Page up + "kcuf1": b"\x1bOC", # Right arrow + "kcuu1": b"\x1bOA", # Up arrow + # Function keys F1-F20 + "kf1": b"\x1bOP", + "kf2": b"\x1bOQ", + "kf3": b"\x1bOR", + "kf4": b"\x1bOS", + "kf5": b"\x1b[15~", + "kf6": b"\x1b[17~", + "kf7": b"\x1b[18~", + "kf8": b"\x1b[19~", + "kf9": b"\x1b[20~", + "kf10": b"\x1b[21~", + "kf11": b"\x1b[23~", + "kf12": b"\x1b[24~", + "kf13": b"\x1b[1;2P", + "kf14": b"\x1b[1;2Q", + "kf15": b"\x1b[1;2R", + "kf16": b"\x1b[1;2S", + "kf17": b"\x1b[15;2~", + "kf18": b"\x1b[17;2~", + "kf19": b"\x1b[18;2~", + "kf20": b"\x1b[19;2~", + }, + # Dumb terminal - minimal capabilities + "dumb": { + "bel": b"\x07", # Bell + "cud1": b"\n", # Move down 1 row (newline) + "ind": b"\n", # Scroll up one line (newline) + }, + # Linux console + "linux": { + # Bell + "bel": b"\x07", + # Cursor movement + "cub": b"\x1b[%p1%dD", # Move cursor left N columns + "cud": b"\x1b[%p1%dB", # Move cursor down N rows + "cuf": b"\x1b[%p1%dC", # Move cursor right N columns + "cuu": b"\x1b[%p1%dA", # Move cursor up N rows + "cub1": b"\x08", # Move cursor left 1 column (backspace) + "cud1": b"\n", # Move cursor down 1 row (newline) + "cuf1": b"\x1b[C", # Move cursor right 1 column + "cuu1": b"\x1b[A", # Move cursor up 1 row + "cup": b"\x1b[%i%p1%d;%p2%dH", # Move cursor to row, column + "hpa": b"\x1b[%i%p1%dG", # Move cursor to column + # Clear operations + "clear": b"\x1b[H\x1b[J", # Clear screen and home cursor (different from ansi!) + "el": b"\x1b[K", # Clear to end of line + # Insert/delete + "dch": b"\x1b[%p1%dP", # Delete N characters + "dch1": b"\x1b[P", # Delete 1 character + "ich": b"\x1b[%p1%d@", # Insert N characters + "ich1": b"\x1b[@", # Insert 1 character + # Cursor visibility + "civis": b"\x1b[?25l\x1b[?1c", # Make cursor invisible + "cnorm": b"\x1b[?25h\x1b[?0c", # Make cursor normal + # Scrolling + "ind": b"\n", # Scroll up one line + "ri": b"\x1bM", # Scroll down one line + # Keypad mode + "smkx": b"\x1b[?1h\x1b=", # Enable keypad mode + "rmkx": b"\x1b[?1l\x1b>", # Disable keypad mode + # Function keys and special keys + "kdch1": b"\x1b[3~", # Delete key + "kcud1": b"\x1b[B", # Down arrow + "kend": b"\x1b[4~", # End key (different from ansi!) + "khome": b"\x1b[1~", # Home key (different from ansi!) + "kich1": b"\x1b[2~", # Insert key + "kcub1": b"\x1b[D", # Left arrow + "knp": b"\x1b[6~", # Page down + "kpp": b"\x1b[5~", # Page up + "kcuf1": b"\x1b[C", # Right arrow + "kcuu1": b"\x1b[A", # Up arrow + # Function keys + "kf1": b"\x1b[[A", + "kf2": b"\x1b[[B", + "kf3": b"\x1b[[C", + "kf4": b"\x1b[[D", + "kf5": b"\x1b[[E", + "kf6": b"\x1b[17~", + "kf7": b"\x1b[18~", + "kf8": b"\x1b[19~", + "kf9": b"\x1b[20~", + "kf10": b"\x1b[21~", + "kf11": b"\x1b[23~", + "kf12": b"\x1b[24~", + "kf13": b"\x1b[25~", + "kf14": b"\x1b[26~", + "kf15": b"\x1b[28~", + "kf16": b"\x1b[29~", + "kf17": b"\x1b[31~", + "kf18": b"\x1b[32~", + "kf19": b"\x1b[33~", + "kf20": b"\x1b[34~", + }, +} + +# Map common TERM values to capability sets +_TERM_ALIASES = { + "xterm": "ansi", + "xterm-color": "ansi", + "xterm-256color": "ansi", + "screen": "ansi", + "screen-256color": "ansi", + "tmux": "ansi", + "tmux-256color": "ansi", + "vt100": "ansi", + "vt220": "ansi", + "rxvt": "ansi", + "rxvt-unicode": "ansi", + "rxvt-unicode-256color": "ansi", + "unknown": "dumb", +} + + +@dataclass +class TermInfo: + terminal_name: str | bytes | None + fallback: bool = True + + _capabilities: dict[str, bytes] = field(default_factory=dict) + + def __post_init__(self) -> None: + """Initialize terminal capabilities for the given terminal type. + + Based on ncurses implementation in: + - ncurses/tinfo/lib_setup.c:setupterm() and _nc_setupterm() + - ncurses/tinfo/lib_setup.c:TINFO_SETUP_TERM() + + This version first attempts to read terminfo database files like ncurses, + then, if `fallback` is True, falls back to hardcoded capabilities for + common terminal types. + """ + # If termstr is None or empty, try to get from environment + if not self.terminal_name: + self.terminal_name = os.environ.get("TERM") or "ANSI" + + if isinstance(self.terminal_name, bytes): + self.terminal_name = self.terminal_name.decode("ascii") + + try: + self._parse_terminfo_file(self.terminal_name) + except (OSError, ValueError): + if not self.fallback: + raise + + term_type = _TERM_ALIASES.get( + self.terminal_name, self.terminal_name + ) + if term_type not in _TERMINAL_CAPABILITIES: + term_type = "dumb" + self._capabilities = _TERMINAL_CAPABILITIES[term_type].copy() + + def _parse_terminfo_file(self, terminal_name: str) -> None: + """Parse a terminfo file. + + Populate the _capabilities dict for easy retrieval + + Based on ncurses implementation in: + - ncurses/tinfo/read_entry.c:_nc_read_termtype() + - ncurses/tinfo/read_entry.c:_nc_read_file_entry() + - ncurses/tinfo/lib_ti.c:tigetstr() + """ + data = _read_terminfo_file(terminal_name) + too_short = f"TermInfo file for {terminal_name!r} too short" + offset = 12 + if len(data) < offset: + raise ValueError(too_short) + + magic, name_size, bool_count, num_count, str_count, str_size = ( + struct.unpack(" len(data): + raise ValueError(too_short) + + # Read string offsets + end_offset = offset + 2 * str_count + if offset > len(data): + raise ValueError(too_short) + string_offset_data = data[offset:end_offset] + string_offsets = [ + off for [off] in struct.iter_unpack(" len(data): + raise ValueError(too_short) + string_table = data[offset : offset + str_size] + + # Extract strings from string table + capabilities = {} + for cap, off in zip(_STRING_NAMES, string_offsets): + if off < 0: + # CANCELLED_STRING; we do not store those + continue + elif off < len(string_table): + # Find null terminator + end = string_table.find(0, off) + if end >= 0: + capabilities[cap] = string_table[off:end] + # in other cases this is ABSENT_STRING; we don't store those. + + # Note: we don't support extended capabilities since PyREPL doesn't + # need them. + + self._capabilities = capabilities + + def get(self, cap: str) -> bytes | None: + """Get terminal capability string by name. + """ + if not isinstance(cap, str): + raise TypeError(f"`cap` must be a string, not {type(cap)}") + + return self._capabilities.get(cap) + + +def tparm(cap_bytes: bytes, *params: int) -> bytes: + """Parameterize a terminal capability string. + + Based on ncurses implementation in: + - ncurses/tinfo/lib_tparm.c:tparm() + - ncurses/tinfo/lib_tparm.c:tparam_internal() + + The ncurses version implements a full stack-based interpreter for + terminfo parameter strings. This pure Python version implements only + the subset of parameter substitution operations needed by PyREPL: + - %i (increment parameters for 1-based indexing) + - %p[1-9]%d (parameter substitution) + - %p[1-9]%{n}%+%d (parameter plus constant) + """ + if not isinstance(cap_bytes, bytes): + raise TypeError(f"`cap` must be bytes, not {type(cap_bytes)}") + + result = cap_bytes + + # %i - increment parameters (1-based instead of 0-based) + increment = b"%i" in result + if increment: + result = result.replace(b"%i", b"") + + # Replace %p1%d, %p2%d, etc. with actual parameter values + for i in range(len(params)): + pattern = b"%%p%d%%d" % (i + 1) + if pattern in result: + value = params[i] + if increment: + value += 1 + result = result.replace(pattern, str(value).encode("ascii")) + + # Handle %p1%{1}%+%d (parameter plus constant) + # Used in some cursor positioning sequences + pattern_re = re.compile(rb"%p(\d)%\{(\d+)\}%\+%d") + matches = list(pattern_re.finditer(result)) + for match in reversed(matches): # reversed to maintain positions + param_idx = int(match.group(1)) + constant = int(match.group(2)) + value = params[param_idx] + constant + result = ( + result[: match.start()] + + str(value).encode("ascii") + + result[match.end() :] + ) + + return result diff --git a/Lib/_pyrepl/trace.py b/Lib/_pyrepl/trace.py index a8eb2433c..943ee12f9 100644 --- a/Lib/_pyrepl/trace.py +++ b/Lib/_pyrepl/trace.py @@ -1,6 +1,7 @@ from __future__ import annotations import os +import sys # types if False: @@ -12,10 +13,22 @@ if trace_filename := os.environ.get("PYREPL_TRACE"): trace_file = open(trace_filename, "a") -def trace(line: str, *k: object, **kw: object) -> None: - if trace_file is None: - return - if k or kw: - line = line.format(*k, **kw) - trace_file.write(line + "\n") - trace_file.flush() + +if sys.platform == "emscripten": + from posix import _emscripten_log + + def trace(line: str, *k: object, **kw: object) -> None: + if "PYREPL_TRACE" not in os.environ: + return + if k or kw: + line = line.format(*k, **kw) + _emscripten_log(line) + +else: + def trace(line: str, *k: object, **kw: object) -> None: + if trace_file is None: + return + if k or kw: + line = line.format(*k, **kw) + trace_file.write(line + "\n") + trace_file.flush() diff --git a/Lib/_pyrepl/unix_console.py b/Lib/_pyrepl/unix_console.py index e69c96b11..639d16db3 100644 --- a/Lib/_pyrepl/unix_console.py +++ b/Lib/_pyrepl/unix_console.py @@ -29,31 +29,41 @@ import signal import struct import termios import time +import types import platform from fcntl import ioctl -from . import curses +from . import terminfo from .console import Console, Event -from .fancy_termios import tcgetattr, tcsetattr +from .fancy_termios import tcgetattr, tcsetattr, TermState from .trace import trace from .unix_eventqueue import EventQueue from .utils import wlen +# declare posix optional to allow None assignment on other platforms +posix: types.ModuleType | None +try: + import posix +except ImportError: + posix = None TYPE_CHECKING = False # types if TYPE_CHECKING: - from typing import IO, Literal, overload + from typing import AbstractSet, IO, Literal, overload, cast else: overload = lambda func: None + cast = lambda typ, val: val class InvalidTerminal(RuntimeError): - pass + def __init__(self, message: str) -> None: + super().__init__(errno.EIO, message) -_error = (termios.error, curses.error, InvalidTerminal) +_error = (termios.error, InvalidTerminal) +_error_codes_to_ignore = frozenset([errno.EIO, errno.ENXIO, errno.EPERM]) SIGWINCH_EVENT = "repaint" @@ -110,7 +120,7 @@ delayprog = re.compile(b"\\$<([0-9]+)((?:/|\\*){0,2})>") try: poll: type[select.poll] = select.poll except AttributeError: - # this is exactly the minumum necessary to support what we + # this is exactly the minimum necessary to support what we # do with poll objects class MinimalPoll: def __init__(self): @@ -118,12 +128,13 @@ except AttributeError: def register(self, fd, flag): self.fd = fd + # note: The 'timeout' argument is received as *milliseconds* def poll(self, timeout: float | None = None) -> list[int]: if timeout is None: r, w, e = select.select([self.fd], [], []) else: - r, w, e = select.select([self.fd], [], [], timeout/1000) + r, w, e = select.select([self.fd], [], [], timeout / 1000) return r poll = MinimalPoll # type: ignore[assignment] @@ -150,19 +161,28 @@ class UnixConsole(Console): self.pollob = poll() self.pollob.register(self.input_fd, select.POLLIN) - self.input_buffer = b"" - self.input_buffer_pos = 0 - curses.setupterm(term or None, self.output_fd) + self.terminfo = terminfo.TermInfo(term or None) self.term = term + self.is_apple_terminal = ( + platform.system() == "Darwin" + and os.getenv("TERM_PROGRAM") == "Apple_Terminal" + ) + + try: + self.__input_fd_set(tcgetattr(self.input_fd), ignore=frozenset()) + except _error as e: + raise RuntimeError(f"termios failure ({e.args[1]})") @overload - def _my_getstr(cap: str, optional: Literal[False] = False) -> bytes: ... + def _my_getstr( + cap: str, optional: Literal[False] = False + ) -> bytes: ... @overload def _my_getstr(cap: str, optional: bool) -> bytes | None: ... def _my_getstr(cap: str, optional: bool = False) -> bytes | None: - r = curses.tigetstr(cap) + r = self.terminfo.get(cap) if not optional and r is None: raise InvalidTerminal( f"terminal doesn't have the required {cap} capability" @@ -196,26 +216,19 @@ class UnixConsole(Console): self.__setup_movement() - self.event_queue = EventQueue(self.input_fd, self.encoding) + self.event_queue = EventQueue( + self.input_fd, self.encoding, self.terminfo + ) self.cursor_visible = 1 - def more_in_buffer(self) -> bool: - return bool( - self.input_buffer - and self.input_buffer_pos < len(self.input_buffer) - ) + signal.signal(signal.SIGCONT, self._sigcont_handler) + + def _sigcont_handler(self, signum, frame): + self.restore() + self.prepare() def __read(self, n: int) -> bytes: - if not self.more_in_buffer(): - self.input_buffer = os.read(self.input_fd, 10000) - - ret = self.input_buffer[self.input_buffer_pos : self.input_buffer_pos + n] - self.input_buffer_pos += len(ret) - if self.input_buffer_pos >= len(self.input_buffer): - self.input_buffer = b"" - self.input_buffer_pos = 0 - return ret - + return os.read(self.input_fd, n) def change_encoding(self, encoding: str) -> None: """ @@ -238,8 +251,9 @@ class UnixConsole(Console): if not self.__gone_tall: while len(self.screen) < min(len(screen), self.height): self.__hide_cursor() - self.__move(0, len(self.screen) - 1) - self.__write("\n") + if self.screen: + self.__move(0, len(self.screen) - 1) + self.__write("\n") self.posxy = 0, len(self.screen) self.screen.append("") else: @@ -328,6 +342,8 @@ class UnixConsole(Console): """ Prepare the console for input/output operations. """ + self.__buffer = [] + self.__svtermstate = tcgetattr(self.input_fd) raw = self.__svtermstate.copy() raw.iflag &= ~(termios.INPCK | termios.ISTRIP | termios.IXON) @@ -339,17 +355,15 @@ class UnixConsole(Console): raw.lflag |= termios.ISIG raw.cc[termios.VMIN] = 1 raw.cc[termios.VTIME] = 0 - tcsetattr(self.input_fd, termios.TCSADRAIN, raw) + self.__input_fd_set(raw) # In macOS terminal we need to deactivate line wrap via ANSI escape code - if platform.system() == "Darwin" and os.getenv("TERM_PROGRAM") == "Apple_Terminal": + if self.is_apple_terminal: os.write(self.output_fd, b"\033[?7l") self.screen = [] self.height, self.width = self.getheightwidth() - self.__buffer = [] - self.posxy = 0, 0 self.__gone_tall = 0 self.__move = self.__move_short @@ -371,13 +385,18 @@ class UnixConsole(Console): self.__disable_bracketed_paste() self.__maybe_write_code(self._rmkx) self.flushoutput() - tcsetattr(self.input_fd, termios.TCSADRAIN, self.__svtermstate) + self.__input_fd_set(self.__svtermstate) - if platform.system() == "Darwin" and os.getenv("TERM_PROGRAM") == "Apple_Terminal": + if self.is_apple_terminal: os.write(self.output_fd, b"\033[?7h") if hasattr(self, "old_sigwinch"): - signal.signal(signal.SIGWINCH, self.old_sigwinch) + try: + signal.signal(signal.SIGWINCH, self.old_sigwinch) + except ValueError as e: + import threading + if threading.current_thread() is threading.main_thread(): + raise e del self.old_sigwinch def push_char(self, char: int | bytes) -> None: @@ -410,6 +429,8 @@ class UnixConsole(Console): return self.event_queue.get() else: continue + elif err.errno == errno.EIO: + raise SystemExit(errno.EIO) else: raise else: @@ -422,7 +443,6 @@ class UnixConsole(Console): """ return ( not self.event_queue.empty() - or self.more_in_buffer() or bool(self.pollob.poll(timeout)) ) @@ -525,6 +545,7 @@ class UnixConsole(Console): e.raw += e.raw amount = struct.unpack("i", ioctl(self.input_fd, FIONREAD, b"\0\0\0\0"))[0] + trace("getpending({a})", a=amount) raw = self.__read(amount) data = str(raw, self.encoding, "replace") e.data += data @@ -566,11 +587,9 @@ class UnixConsole(Console): @property def input_hook(self): - try: - import posix - except ImportError: - return None - if posix._is_inputhook_installed(): + # avoid inline imports here so the repl doesn't get flooded + # with import logging from -X importtime=2 + if posix is not None and posix._is_inputhook_installed(): return posix._inputhook def __enable_bracketed_paste(self) -> None: @@ -602,14 +621,14 @@ class UnixConsole(Console): if self._dch1: self.dch1 = self._dch1 elif self._dch: - self.dch1 = curses.tparm(self._dch, 1) + self.dch1 = terminfo.tparm(self._dch, 1) else: self.dch1 = None if self._ich1: self.ich1 = self._ich1 elif self._ich: - self.ich1 = curses.tparm(self._ich, 1) + self.ich1 = terminfo.tparm(self._ich, 1) else: self.ich1 = None @@ -634,7 +653,7 @@ class UnixConsole(Console): # reuse the oldline as much as possible, but stop as soon as we # encounter an ESCAPE, because it might be the start of an escape - # sequene + # sequence while ( x_coord < minlen and oldline[x_pos] == newline[x_pos] @@ -706,7 +725,7 @@ class UnixConsole(Console): self.__buffer.append((text, 0)) def __write_code(self, fmt, *args): - self.__buffer.append((curses.tparm(fmt, *args), 1)) + self.__buffer.append((terminfo.tparm(fmt, *args), 1)) def __maybe_write_code(self, fmt, *args): if fmt: @@ -757,7 +776,6 @@ class UnixConsole(Console): self.__write_code(self._cup, y - self.__offset, x) def __sigwinch(self, signum, frame): - self.height, self.width = self.getheightwidth() self.event_queue.insert(Event("resize", None)) def __hide_cursor(self): @@ -790,9 +808,9 @@ class UnixConsole(Console): will never do anyone any good.""" # using .get() means that things will blow up # only if the bps is actually needed (which I'm - # betting is pretty unlkely) + # betting is pretty unlikely) bps = ratedict.get(self.__svtermstate.ospeed) - while 1: + while True: m = prog.search(fmt) if not m: os.write(self.output_fd, fmt) @@ -808,3 +826,17 @@ class UnixConsole(Console): os.write(self.output_fd, self._pad * nchars) else: time.sleep(float(delay) / 1000.0) + + def __input_fd_set( + self, + state: TermState, + ignore: AbstractSet[int] = _error_codes_to_ignore, + ) -> bool: + try: + tcsetattr(self.input_fd, termios.TCSADRAIN, state) + except termios.error as te: + if te.args[0] not in ignore: + raise + return False + else: + return True diff --git a/Lib/_pyrepl/unix_eventqueue.py b/Lib/_pyrepl/unix_eventqueue.py index 70cfade26..2a9cca59e 100644 --- a/Lib/_pyrepl/unix_eventqueue.py +++ b/Lib/_pyrepl/unix_eventqueue.py @@ -18,12 +18,9 @@ # CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -from collections import deque - -from . import keymap -from .console import Event -from . import curses +from .terminfo import TermInfo from .trace import trace +from .base_eventqueue import BaseEventQueue from termios import tcgetattr, VERASE import os @@ -57,96 +54,24 @@ CTRL_ARROW_KEYCODES= { b'\033Oc': 'ctrl right', } -def get_terminal_keycodes() -> dict[bytes, str]: +def get_terminal_keycodes(ti: TermInfo) -> dict[bytes, str]: """ Generates a dictionary mapping terminal keycodes to human-readable names. """ keycodes = {} for key, terminal_code in TERMINAL_KEYNAMES.items(): - keycode = curses.tigetstr(terminal_code) + keycode = ti.get(terminal_code) trace('key {key} tiname {terminal_code} keycode {keycode!r}', **locals()) if keycode: keycodes[keycode] = key keycodes.update(CTRL_ARROW_KEYCODES) return keycodes -class EventQueue: - def __init__(self, fd: int, encoding: str) -> None: - self.keycodes = get_terminal_keycodes() + +class EventQueue(BaseEventQueue): + def __init__(self, fd: int, encoding: str, ti: TermInfo) -> None: + keycodes = get_terminal_keycodes(ti) if os.isatty(fd): backspace = tcgetattr(fd)[6][VERASE] - self.keycodes[backspace] = "backspace" - self.compiled_keymap = keymap.compile_keymap(self.keycodes) - self.keymap = self.compiled_keymap - trace("keymap {k!r}", k=self.keymap) - self.encoding = encoding - self.events: deque[Event] = deque() - self.buf = bytearray() - - def get(self) -> Event | None: - """ - Retrieves the next event from the queue. - """ - if self.events: - return self.events.popleft() - else: - return None - - def empty(self) -> bool: - """ - Checks if the queue is empty. - """ - return not self.events - - def flush_buf(self) -> bytearray: - """ - Flushes the buffer and returns its contents. - """ - old = self.buf - self.buf = bytearray() - return old - - def insert(self, event: Event) -> None: - """ - Inserts an event into the queue. - """ - trace('added event {event}', event=event) - self.events.append(event) - - def push(self, char: int | bytes) -> None: - """ - Processes a character by updating the buffer and handling special key mappings. - """ - ord_char = char if isinstance(char, int) else ord(char) - char = bytes(bytearray((ord_char,))) - self.buf.append(ord_char) - if char in self.keymap: - if self.keymap is self.compiled_keymap: - #sanity check, buffer is empty when a special key comes - assert len(self.buf) == 1 - k = self.keymap[char] - trace('found map {k!r}', k=k) - if isinstance(k, dict): - self.keymap = k - else: - self.insert(Event('key', k, self.flush_buf())) - self.keymap = self.compiled_keymap - - elif self.buf and self.buf[0] == 27: # escape - # escape sequence not recognized by our keymap: propagate it - # outside so that i can be recognized as an M-... key (see also - # the docstring in keymap.py - trace('unrecognized escape sequence, propagating...') - self.keymap = self.compiled_keymap - self.insert(Event('key', '\033', bytearray(b'\033'))) - for _c in self.flush_buf()[1:]: - self.push(_c) - - else: - try: - decoded = bytes(self.buf).decode(self.encoding) - except UnicodeError: - return - else: - self.insert(Event('key', decoded, self.flush_buf())) - self.keymap = self.compiled_keymap + keycodes[backspace] = "backspace" + BaseEventQueue.__init__(self, encoding, keycodes) diff --git a/Lib/_pyrepl/windows_console.py b/Lib/_pyrepl/windows_console.py index fffadd5e2..46c603074 100644 --- a/Lib/_pyrepl/windows_console.py +++ b/Lib/_pyrepl/windows_console.py @@ -22,11 +22,9 @@ from __future__ import annotations import io import os import sys -import time -import msvcrt -from collections import deque import ctypes +import types from ctypes.wintypes import ( _COORD, WORD, @@ -42,9 +40,10 @@ from ctypes import Structure, POINTER, Union from .console import Event, Console from .trace import trace from .utils import wlen +from .windows_eventqueue import EventQueue try: - from ctypes import GetLastError, WinDLL, windll, WinError # type: ignore[attr-defined] + from ctypes import get_last_error, GetLastError, WinDLL, windll, WinError # type: ignore[attr-defined] except: # Keep MyPy happy off Windows from ctypes import CDLL as WinDLL, cdll as windll @@ -52,11 +51,20 @@ except: def GetLastError() -> int: return 42 + def get_last_error() -> int: + return 42 + class WinError(OSError): # type: ignore[no-redef] def __init__(self, err: int | None, descr: str | None = None) -> None: self.err = err self.descr = descr +# declare nt optional to allow None assignment on other platforms +nt: types.ModuleType | None +try: + import nt +except ImportError: + nt = None TYPE_CHECKING = False @@ -94,7 +102,9 @@ VK_MAP: dict[int, str] = { 0x83: "f20", # VK_F20 } -# Console escape codes: https://learn.microsoft.com/en-us/windows/console/console-virtual-terminal-sequences +# Virtual terminal output sequences +# Reference: https://learn.microsoft.com/en-us/windows/console/console-virtual-terminal-sequences#output-sequences +# Check `windows_eventqueue.py` for input sequences ERASE_IN_LINE = "\x1b[K" MOVE_LEFT = "\x1b[{}D" MOVE_RIGHT = "\x1b[{}C" @@ -102,10 +112,25 @@ MOVE_UP = "\x1b[{}A" MOVE_DOWN = "\x1b[{}B" CLEAR = "\x1b[H\x1b[J" +# State of control keys: https://learn.microsoft.com/en-us/windows/console/key-event-record-str +ALT_ACTIVE = 0x01 | 0x02 +CTRL_ACTIVE = 0x04 | 0x08 + +WAIT_TIMEOUT = 0x102 +WAIT_FAILED = 0xFFFFFFFF + +# from winbase.h +INFINITE = 0xFFFFFFFF + class _error(Exception): pass +def _supports_vt(): + try: + return nt._supports_virtual_terminal() + except AttributeError: + return False class WindowsConsole(Console): def __init__( @@ -117,17 +142,29 @@ class WindowsConsole(Console): ): super().__init__(f_in, f_out, term, encoding) + self.__vt_support = _supports_vt() + + if self.__vt_support: + trace('console supports virtual terminal') + + # Save original console modes so we can recover on cleanup. + original_input_mode = DWORD() + GetConsoleMode(InHandle, original_input_mode) + trace(f'saved original input mode 0x{original_input_mode.value:x}') + self.__original_input_mode = original_input_mode.value + SetConsoleMode( OutHandle, ENABLE_WRAP_AT_EOL_OUTPUT | ENABLE_PROCESSED_OUTPUT | ENABLE_VIRTUAL_TERMINAL_PROCESSING, ) + self.screen: list[str] = [] self.width = 80 self.height = 25 self.__offset = 0 - self.event_queue: deque[Event] = deque() + self.event_queue = EventQueue(encoding) try: self.out = io._WindowsConsoleIO(self.output_fd, "w") # type: ignore[attr-defined] except ValueError: @@ -146,8 +183,9 @@ class WindowsConsole(Console): while len(self.screen) < min(len(screen), self.height): self._hide_cursor() - self._move_relative(0, len(self.screen) - 1) - self.__write("\n") + if self.screen: + self._move_relative(0, len(self.screen) - 1) + self.__write("\n") self.posxy = 0, len(self.screen) self.screen.append("") @@ -204,11 +242,9 @@ class WindowsConsole(Console): @property def input_hook(self): - try: - import nt - except ImportError: - return None - if nt._is_inputhook_installed(): + # avoid inline imports here so the repl doesn't get flooded + # with import logging from -X importtime=2 + if nt is not None and nt._is_inputhook_installed(): return nt._inputhook def __write_changed_line( @@ -232,7 +268,7 @@ class WindowsConsole(Console): # reuse the oldline as much as possible, but stop as soon as we # encounter an ESCAPE, because it might be the start of an escape - # sequene + # sequence while ( x_coord < minlen and oldline[x_pos] == newline[x_pos] @@ -247,18 +283,13 @@ class WindowsConsole(Console): self._erase_to_end() self.__write(newline[x_pos:]) - if wlen(newline) == self.width: - # If we wrapped we want to start at the next line - self._move_relative(0, y + 1) - self.posxy = 0, y + 1 - else: - self.posxy = wlen(newline), y + self.posxy = min(wlen(newline), self.width - 1), y - if "\x1b" in newline or y != self.posxy[1] or '\x1a' in newline: - # ANSI escape characters are present, so we can't assume - # anything about the position of the cursor. Moving the cursor - # to the left margin should work to get to a known position. - self.move_cursor(0, y) + if "\x1b" in newline or y != self.posxy[1] or '\x1a' in newline: + # ANSI escape characters are present, so we can't assume + # anything about the position of the cursor. Moving the cursor + # to the left margin should work to get to a known position. + self.move_cursor(0, y) def _scroll( self, top: int, bottom: int, left: int | None = None, right: int | None = None @@ -291,6 +322,12 @@ class WindowsConsole(Console): def _disable_blinking(self): self.__write("\x1b[?12l") + def _enable_bracketed_paste(self) -> None: + self.__write("\x1b[?2004h") + + def _disable_bracketed_paste(self) -> None: + self.__write("\x1b[?2004l") + def __write(self, text: str) -> None: if "\x1a" in text: text = ''.join(["^Z" if x == '\x1a' else x for x in text]) @@ -320,8 +357,15 @@ class WindowsConsole(Console): self.__gone_tall = 0 self.__offset = 0 + if self.__vt_support: + SetConsoleMode(InHandle, self.__original_input_mode | ENABLE_VIRTUAL_TERMINAL_INPUT) + self._enable_bracketed_paste() + def restore(self) -> None: - pass + if self.__vt_support: + # Recover to original mode before running REPL + self._disable_bracketed_paste() + SetConsoleMode(InHandle, self.__original_input_mode) def _move_relative(self, x: int, y: int) -> None: """Moves relative to the current posxy""" @@ -342,7 +386,7 @@ class WindowsConsole(Console): raise ValueError(f"Bad cursor position {x}, {y}") if y < self.__offset or y >= self.__offset + self.height: - self.event_queue.insert(0, Event("scroll", "")) + self.event_queue.insert(Event("scroll", "")) else: self._move_relative(x, y) self.posxy = x, y @@ -371,14 +415,7 @@ class WindowsConsole(Console): return info.srWindow.Bottom # type: ignore[no-any-return] - def _read_input(self, block: bool = True) -> INPUT_RECORD | None: - if not block: - events = DWORD() - if not GetNumberOfConsoleInputEvents(InHandle, events): - raise WinError(GetLastError()) - if not events.value: - return None - + def _read_input(self) -> INPUT_RECORD | None: rec = INPUT_RECORD() read = DWORD() if not ReadConsoleInput(InHandle, rec, 1, read): @@ -386,15 +423,26 @@ class WindowsConsole(Console): return rec + def _read_input_bulk( + self, n: int + ) -> tuple[ctypes.Array[INPUT_RECORD], int]: + rec = (n * INPUT_RECORD)() + read = DWORD() + if not ReadConsoleInput(InHandle, rec, n, read): + raise WinError(GetLastError()) + + return rec, read.value + def get_event(self, block: bool = True) -> Event | None: """Return an Event instance. Returns None if |block| is false and there is no event pending, otherwise waits for the completion of an event.""" - if self.event_queue: - return self.event_queue.pop() - while True: - rec = self._read_input(block) + if not block and not self.wait(timeout=0): + return None + + while self.event_queue.empty(): + rec = self._read_input() if rec is None: return None @@ -407,31 +455,47 @@ class WindowsConsole(Console): continue return None - key = rec.Event.KeyEvent.uChar.UnicodeChar + key_event = rec.Event.KeyEvent + raw_key = key = key_event.uChar.UnicodeChar - if rec.Event.KeyEvent.uChar.UnicodeChar == "\r": - # Make enter make unix-like - return Event(evt="key", data="\n", raw=b"\n") - elif rec.Event.KeyEvent.wVirtualKeyCode == 8: + if key == "\r": + # Make enter unix-like + return Event(evt="key", data="\n") + elif key_event.wVirtualKeyCode == 8: # Turn backspace directly into the command - return Event( - evt="key", - data="backspace", - raw=rec.Event.KeyEvent.uChar.UnicodeChar, - ) - elif rec.Event.KeyEvent.uChar.UnicodeChar == "\x00": + key = "backspace" + elif key == "\x00": # Handle special keys like arrow keys and translate them into the appropriate command - code = VK_MAP.get(rec.Event.KeyEvent.wVirtualKeyCode) - if code: - return Event( - evt="key", data=code, raw=rec.Event.KeyEvent.uChar.UnicodeChar - ) + key = VK_MAP.get(key_event.wVirtualKeyCode) + if key: + if key_event.dwControlKeyState & CTRL_ACTIVE: + key = f"ctrl {key}" + elif key_event.dwControlKeyState & ALT_ACTIVE: + # queue the key, return the meta command + self.event_queue.insert(Event(evt="key", data=key)) + return Event(evt="key", data="\033") # keymap.py uses this for meta + return Event(evt="key", data=key) if block: continue return None + elif self.__vt_support: + # If virtual terminal is enabled, scanning VT sequences + for char in raw_key.encode(self.event_queue.encoding, "replace"): + self.event_queue.push(char) + continue - return Event(evt="key", data=key, raw=rec.Event.KeyEvent.uChar.UnicodeChar) + if key_event.dwControlKeyState & ALT_ACTIVE: + # Do not swallow characters that have been entered via AltGr: + # Windows internally converts AltGr to CTRL+ALT, see + # https://learn.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-vkkeyscanw + if not key_event.dwControlKeyState & CTRL_ACTIVE: + # queue the key, return the meta command + self.event_queue.insert(Event(evt="key", data=key)) + return Event(evt="key", data="\033") # keymap.py uses this for meta + + return Event(evt="key", data=key) + return self.event_queue.get() def push_char(self, char: int | bytes) -> None: """ @@ -446,7 +510,7 @@ class WindowsConsole(Console): """Wipe the screen""" self.__write(CLEAR) self.posxy = 0, 0 - self.screen = [""] + self.screen = [] def finish(self) -> None: """Move the cursor to the end of the display and otherwise get @@ -472,18 +536,53 @@ class WindowsConsole(Console): def getpending(self) -> Event: """Return the characters that have been typed but not yet processed.""" - return Event("key", "", b"") + e = Event("key", "", b"") + + while not self.event_queue.empty(): + e2 = self.event_queue.get() + if e2: + e.data += e2.data + + recs, rec_count = self._read_input_bulk(1024) + for i in range(rec_count): + rec = recs[i] + # In case of a legacy console, we do not only receive a keydown + # event, but also a keyup event - and for uppercase letters + # an additional SHIFT_PRESSED event. + if rec and rec.EventType == KEY_EVENT: + key_event = rec.Event.KeyEvent + if not key_event.bKeyDown: + continue + ch = key_event.uChar.UnicodeChar + if ch == "\x00": + # ignore SHIFT_PRESSED and special keys + continue + if ch == "\r": + ch += "\n" + e.data += ch + return e + + def wait_for_event(self, timeout: float | None) -> bool: + """Wait for an event.""" + if timeout is None: + timeout = INFINITE + else: + timeout = int(timeout) + ret = WaitForSingleObject(InHandle, timeout) + if ret == WAIT_FAILED: + raise WinError(get_last_error()) + elif ret == WAIT_TIMEOUT: + return False + return True def wait(self, timeout: float | None) -> bool: - """Wait for an event.""" - # Poor man's Windows select loop - start_time = time.time() - while True: - if msvcrt.kbhit(): # type: ignore[attr-defined] - return True - if timeout and time.time() - start_time > timeout / 1000: - return False - time.sleep(0.01) + """ + Wait for events on the console. + """ + return ( + not self.event_queue.empty() + or self.wait_for_event(timeout) + ) def repaint(self) -> None: raise NotImplementedError("No repaint support") @@ -553,6 +652,13 @@ MENU_EVENT = 0x08 MOUSE_EVENT = 0x02 WINDOW_BUFFER_SIZE_EVENT = 0x04 +ENABLE_PROCESSED_INPUT = 0x0001 +ENABLE_LINE_INPUT = 0x0002 +ENABLE_ECHO_INPUT = 0x0004 +ENABLE_MOUSE_INPUT = 0x0010 +ENABLE_INSERT_MODE = 0x0020 +ENABLE_VIRTUAL_TERMINAL_INPUT = 0x0200 + ENABLE_PROCESSED_OUTPUT = 0x01 ENABLE_WRAP_AT_EOL_OUTPUT = 0x02 ENABLE_VIRTUAL_TERMINAL_PROCESSING = 0x04 @@ -584,6 +690,10 @@ if sys.platform == "win32": ] ScrollConsoleScreenBuffer.restype = BOOL + GetConsoleMode = _KERNEL32.GetConsoleMode + GetConsoleMode.argtypes = [HANDLE, POINTER(DWORD)] + GetConsoleMode.restype = BOOL + SetConsoleMode = _KERNEL32.SetConsoleMode SetConsoleMode.argtypes = [HANDLE, DWORD] SetConsoleMode.restype = BOOL @@ -592,14 +702,15 @@ if sys.platform == "win32": ReadConsoleInput.argtypes = [HANDLE, POINTER(INPUT_RECORD), DWORD, POINTER(DWORD)] ReadConsoleInput.restype = BOOL - GetNumberOfConsoleInputEvents = _KERNEL32.GetNumberOfConsoleInputEvents - GetNumberOfConsoleInputEvents.argtypes = [HANDLE, POINTER(DWORD)] - GetNumberOfConsoleInputEvents.restype = BOOL FlushConsoleInputBuffer = _KERNEL32.FlushConsoleInputBuffer FlushConsoleInputBuffer.argtypes = [HANDLE] FlushConsoleInputBuffer.restype = BOOL + WaitForSingleObject = _KERNEL32.WaitForSingleObject + WaitForSingleObject.argtypes = [HANDLE, DWORD] + WaitForSingleObject.restype = DWORD + OutHandle = GetStdHandle(STD_OUTPUT_HANDLE) InHandle = GetStdHandle(STD_INPUT_HANDLE) else: @@ -610,9 +721,10 @@ else: GetStdHandle = _win_only GetConsoleScreenBufferInfo = _win_only ScrollConsoleScreenBuffer = _win_only + GetConsoleMode = _win_only SetConsoleMode = _win_only ReadConsoleInput = _win_only - GetNumberOfConsoleInputEvents = _win_only FlushConsoleInputBuffer = _win_only + WaitForSingleObject = _win_only OutHandle = 0 InHandle = 0 diff --git a/Lib/_pyrepl/windows_eventqueue.py b/Lib/_pyrepl/windows_eventqueue.py new file mode 100644 index 000000000..d99722f9a --- /dev/null +++ b/Lib/_pyrepl/windows_eventqueue.py @@ -0,0 +1,42 @@ +""" +Windows event and VT sequence scanner +""" + +from .base_eventqueue import BaseEventQueue + + +# Reference: https://learn.microsoft.com/en-us/windows/console/console-virtual-terminal-sequences#input-sequences +VT_MAP: dict[bytes, str] = { + b'\x1b[A': 'up', + b'\x1b[B': 'down', + b'\x1b[C': 'right', + b'\x1b[D': 'left', + b'\x1b[1;5D': 'ctrl left', + b'\x1b[1;5C': 'ctrl right', + + b'\x1b[H': 'home', + b'\x1b[F': 'end', + + b'\x7f': 'backspace', + b'\x1b[2~': 'insert', + b'\x1b[3~': 'delete', + b'\x1b[5~': 'page up', + b'\x1b[6~': 'page down', + + b'\x1bOP': 'f1', + b'\x1bOQ': 'f2', + b'\x1bOR': 'f3', + b'\x1bOS': 'f4', + b'\x1b[15~': 'f5', + b'\x1b[17~': 'f6', + b'\x1b[18~': 'f7', + b'\x1b[19~': 'f8', + b'\x1b[20~': 'f9', + b'\x1b[21~': 'f10', + b'\x1b[23~': 'f11', + b'\x1b[24~': 'f12', +} + +class EventQueue(BaseEventQueue): + def __init__(self, encoding: str) -> None: + BaseEventQueue.__init__(self, encoding, VT_MAP) diff --git a/Lib/test/test_pyrepl/__init__.py b/Lib/test/test_pyrepl/__init__.py new file mode 100644 index 000000000..2f37bff6d --- /dev/null +++ b/Lib/test/test_pyrepl/__init__.py @@ -0,0 +1,11 @@ +import os +import sys +from test.support import import_helper, load_package_tests + + +if sys.platform != "win32": + import_helper.import_module("termios") + + +def load_tests(*args): + return load_package_tests(os.path.dirname(__file__), *args) diff --git a/Lib/test/test_pyrepl/__main__.py b/Lib/test/test_pyrepl/__main__.py new file mode 100644 index 000000000..cbe9e01d0 --- /dev/null +++ b/Lib/test/test_pyrepl/__main__.py @@ -0,0 +1,4 @@ +import unittest +from test.test_pyrepl import load_tests + +unittest.main() diff --git a/Lib/test/test_pyrepl/support.py b/Lib/test/test_pyrepl/support.py new file mode 100644 index 000000000..307bf4505 --- /dev/null +++ b/Lib/test/test_pyrepl/support.py @@ -0,0 +1,173 @@ +from code import InteractiveConsole +from functools import partial +from typing import Iterable +from unittest.mock import MagicMock + +from _pyrepl.console import Console, Event +from _pyrepl.readline import ReadlineAlikeReader, ReadlineConfig +from _pyrepl.simple_interact import _strip_final_indent +from _pyrepl.utils import unbracket, ANSI_ESCAPE_SEQUENCE + + +class ScreenEqualMixin: + def assert_screen_equal( + self, reader: ReadlineAlikeReader, expected: str, clean: bool = False + ): + actual = clean_screen(reader) if clean else reader.screen + expected = expected.split("\n") + self.assertListEqual(actual, expected) + + +def multiline_input(reader: ReadlineAlikeReader, namespace: dict | None = None): + saved = reader.more_lines + try: + reader.more_lines = partial(more_lines, namespace=namespace) + reader.ps1 = reader.ps2 = ">>> " + reader.ps3 = reader.ps4 = "... " + return reader.readline() + finally: + reader.more_lines = saved + reader.paste_mode = False + + +def more_lines(text: str, namespace: dict | None = None): + if namespace is None: + namespace = {} + src = _strip_final_indent(text) + console = InteractiveConsole(namespace, filename="") + try: + code = console.compile(src, "", "single") + except (OverflowError, SyntaxError, ValueError): + return False + else: + return code is None + + +def code_to_events(code: str): + for c in code: + yield Event(evt="key", data=c, raw=bytearray(c.encode("utf-8"))) + + +def clean_screen(reader: ReadlineAlikeReader) -> list[str]: + """Cleans color and console characters out of a screen output. + + This is useful for screen testing, it increases the test readability since + it strips out all the unreadable side of the screen. + """ + output = [] + for line in reader.screen: + line = unbracket(line, including_content=True) + line = ANSI_ESCAPE_SEQUENCE.sub("", line) + for prefix in (reader.ps1, reader.ps2, reader.ps3, reader.ps4): + if line.startswith(prefix): + line = line[len(prefix):] + break + output.append(line) + return output + + +def prepare_reader(console: Console, **kwargs): + config = ReadlineConfig(readline_completer=kwargs.pop("readline_completer", None)) + reader = ReadlineAlikeReader(console=console, config=config) + reader.more_lines = partial(more_lines, namespace=None) + reader.paste_mode = True # Avoid extra indents + + def get_prompt(lineno, cursor_on_line) -> str: + return "" + + reader.get_prompt = get_prompt # Remove prompt for easier calculations of (x, y) + + for key, val in kwargs.items(): + setattr(reader, key, val) + + return reader + + +def prepare_console(events: Iterable[Event], **kwargs) -> MagicMock | Console: + console = MagicMock() + console.get_event.side_effect = events + console.height = 100 + console.width = 80 + console.getheightwidth = MagicMock(side_effect=lambda: (console.height, console.width)) + + for key, val in kwargs.items(): + setattr(console, key, val) + return console + + +def handle_all_events( + events, prepare_console=prepare_console, prepare_reader=prepare_reader +): + console = prepare_console(events) + reader = prepare_reader(console) + try: + while True: + reader.handle1() + except StopIteration: + pass + except KeyboardInterrupt: + pass + return reader, console + + +handle_events_narrow_console = partial( + handle_all_events, + prepare_console=partial(prepare_console, width=10), +) + + +class FakeConsole(Console): + def __init__(self, events, encoding="utf-8") -> None: + self.events = iter(events) + self.encoding = encoding + self.screen = [] + self.height = 100 + self.width = 80 + + def get_event(self, block: bool = True) -> Event | None: + return next(self.events) + + def getpending(self) -> Event: + return self.get_event(block=False) + + def getheightwidth(self) -> tuple[int, int]: + return self.height, self.width + + def refresh(self, screen: list[str], xy: tuple[int, int]) -> None: + pass + + def prepare(self) -> None: + pass + + def restore(self) -> None: + pass + + def move_cursor(self, x: int, y: int) -> None: + pass + + def set_cursor_vis(self, visible: bool) -> None: + pass + + def push_char(self, char: int | bytes) -> None: + pass + + def beep(self) -> None: + pass + + def clear(self) -> None: + pass + + def finish(self) -> None: + pass + + def flushoutput(self) -> None: + pass + + def forgetinput(self) -> None: + pass + + def wait(self, timeout: float | None = None) -> bool: + return True + + def repaint(self) -> None: + pass diff --git a/Lib/test/test_pyrepl/test_eventqueue.py b/Lib/test/test_pyrepl/test_eventqueue.py new file mode 100644 index 000000000..69d9612b7 --- /dev/null +++ b/Lib/test/test_pyrepl/test_eventqueue.py @@ -0,0 +1,198 @@ +import tempfile +import unittest +from unittest.mock import patch +from test import support + +from _pyrepl import terminfo + +try: + from _pyrepl.console import Event + from _pyrepl import base_eventqueue +except ImportError: + pass + +try: + from _pyrepl import unix_eventqueue +except ImportError: + pass + +try: + from _pyrepl import windows_eventqueue +except ImportError: + pass + +class EventQueueTestBase: + """OS-independent mixin""" + def make_eventqueue(self) -> base_eventqueue.BaseEventQueue: + raise NotImplementedError() + + def test_get(self): + eq = self.make_eventqueue() + event = Event("key", "a", b"a") + eq.insert(event) + self.assertEqual(eq.get(), event) + + def test_empty(self): + eq = self.make_eventqueue() + self.assertTrue(eq.empty()) + eq.insert(Event("key", "a", b"a")) + self.assertFalse(eq.empty()) + + def test_flush_buf(self): + eq = self.make_eventqueue() + eq.buf.extend(b"test") + self.assertEqual(eq.flush_buf(), b"test") + self.assertEqual(eq.buf, bytearray()) + + def test_insert(self): + eq = self.make_eventqueue() + event = Event("key", "a", b"a") + eq.insert(event) + self.assertEqual(eq.events[0], event) + + @patch("_pyrepl.base_eventqueue.keymap") + def test_push_with_key_in_keymap(self, mock_keymap): + mock_keymap.compile_keymap.return_value = {"a": "b"} + eq = self.make_eventqueue() + eq.keymap = {b"a": "b"} + eq.push(b"a") + mock_keymap.compile_keymap.assert_called() + self.assertEqual(eq.events[0].evt, "key") + self.assertEqual(eq.events[0].data, "b") + + @patch("_pyrepl.base_eventqueue.keymap") + def test_push_without_key_in_keymap(self, mock_keymap): + mock_keymap.compile_keymap.return_value = {"a": "b"} + eq = self.make_eventqueue() + eq.keymap = {b"c": "d"} + eq.push(b"a") + mock_keymap.compile_keymap.assert_called() + self.assertEqual(eq.events[0].evt, "key") + self.assertEqual(eq.events[0].data, "a") + + @patch("_pyrepl.base_eventqueue.keymap") + def test_push_with_keymap_in_keymap(self, mock_keymap): + mock_keymap.compile_keymap.return_value = {"a": "b"} + eq = self.make_eventqueue() + eq.keymap = {b"a": {b"b": "c"}} + eq.push(b"a") + mock_keymap.compile_keymap.assert_called() + self.assertTrue(eq.empty()) + eq.push(b"b") + self.assertEqual(eq.events[0].evt, "key") + self.assertEqual(eq.events[0].data, "c") + eq.push(b"d") + self.assertEqual(eq.events[1].evt, "key") + self.assertEqual(eq.events[1].data, "d") + + @patch("_pyrepl.base_eventqueue.keymap") + def test_push_with_keymap_in_keymap_and_escape(self, mock_keymap): + mock_keymap.compile_keymap.return_value = {"a": "b"} + eq = self.make_eventqueue() + eq.keymap = {b"a": {b"b": "c"}} + eq.push(b"a") + mock_keymap.compile_keymap.assert_called() + self.assertTrue(eq.empty()) + eq.flush_buf() + eq.push(b"\033") + self.assertEqual(eq.events[0].evt, "key") + self.assertEqual(eq.events[0].data, "\033") + eq.push(b"b") + self.assertEqual(eq.events[1].evt, "key") + self.assertEqual(eq.events[1].data, "b") + + def test_push_special_key(self): + eq = self.make_eventqueue() + eq.keymap = {} + eq.push(b"\x1b") + eq.push(b"[") + eq.push(b"A") + self.assertEqual(eq.events[0].evt, "key") + self.assertEqual(eq.events[0].data, "\x1b") + + def test_push_unrecognized_escape_sequence(self): + eq = self.make_eventqueue() + eq.keymap = {} + eq.push(b"\x1b") + eq.push(b"[") + eq.push(b"Z") + self.assertEqual(len(eq.events), 3) + self.assertEqual(eq.events[0].evt, "key") + self.assertEqual(eq.events[0].data, "\x1b") + self.assertEqual(eq.events[1].evt, "key") + self.assertEqual(eq.events[1].data, "[") + self.assertEqual(eq.events[2].evt, "key") + self.assertEqual(eq.events[2].data, "Z") + + def test_push_unicode_character_as_str(self): + eq = self.make_eventqueue() + eq.keymap = {} + with self.assertRaises(AssertionError): + eq.push("ч") + with self.assertRaises(AssertionError): + eq.push("ñ") + + def test_push_unicode_character_two_bytes(self): + eq = self.make_eventqueue() + eq.keymap = {} + + encoded = "ч".encode(eq.encoding, "replace") + self.assertEqual(len(encoded), 2) + + eq.push(encoded[0]) + e = eq.get() + self.assertIsNone(e) + + eq.push(encoded[1]) + e = eq.get() + self.assertEqual(e.evt, "key") + self.assertEqual(e.data, "ч") + + def test_push_single_chars_and_unicode_character_as_str(self): + eq = self.make_eventqueue() + eq.keymap = {} + + def _event(evt, data, raw=None): + r = raw if raw is not None else data.encode(eq.encoding) + e = Event(evt, data, r) + return e + + def _push(keys): + for k in keys: + eq.push(k) + + self.assertIsInstance("ñ", str) + + # If an exception happens during push, the existing events must be + # preserved and we can continue to push. + _push(b"b") + with self.assertRaises(AssertionError): + _push("ñ") + _push(b"a") + + self.assertEqual(eq.get(), _event("key", "b")) + self.assertEqual(eq.get(), _event("key", "a")) + + +class EmptyTermInfo(terminfo.TermInfo): + def get(self, cap: str) -> bytes: + return b"" + + +@unittest.skipIf(support.MS_WINDOWS, "No Unix event queue on Windows") +class TestUnixEventQueue(EventQueueTestBase, unittest.TestCase): + def setUp(self): + self.file = tempfile.TemporaryFile() + + def tearDown(self) -> None: + self.file.close() + + def make_eventqueue(self) -> base_eventqueue.BaseEventQueue: + ti = EmptyTermInfo("ansi") + return unix_eventqueue.EventQueue(self.file.fileno(), "utf-8", ti) + + +@unittest.skipUnless(support.MS_WINDOWS, "No Windows event queue on Unix") +class TestWindowsEventQueue(EventQueueTestBase, unittest.TestCase): + def make_eventqueue(self) -> base_eventqueue.BaseEventQueue: + return windows_eventqueue.EventQueue("utf-8") diff --git a/Lib/test/test_pyrepl/test_input.py b/Lib/test/test_pyrepl/test_input.py new file mode 100644 index 000000000..c78c876c2 --- /dev/null +++ b/Lib/test/test_pyrepl/test_input.py @@ -0,0 +1,102 @@ +import unittest + +from _pyrepl.console import Event +from _pyrepl.input import KeymapTranslator + + +class KeymapTranslatorTests(unittest.TestCase): + def test_push_single_key(self): + keymap = [("a", "command_a")] + translator = KeymapTranslator(keymap) + evt = Event("key", "a") + translator.push(evt) + result = translator.get() + self.assertEqual(result, ("command_a", ["a"])) + + def test_push_multiple_keys(self): + keymap = [("ab", "command_ab")] + translator = KeymapTranslator(keymap) + evt1 = Event("key", "a") + evt2 = Event("key", "b") + translator.push(evt1) + translator.push(evt2) + result = translator.get() + self.assertEqual(result, ("command_ab", ["a", "b"])) + + def test_push_invalid_key(self): + keymap = [("a", "command_a")] + translator = KeymapTranslator(keymap) + evt = Event("key", "b") + translator.push(evt) + result = translator.get() + self.assertEqual(result, (None, ["b"])) + + def test_push_invalid_key_with_stack(self): + keymap = [("ab", "command_ab")] + translator = KeymapTranslator(keymap) + evt1 = Event("key", "a") + evt2 = Event("key", "c") + translator.push(evt1) + translator.push(evt2) + result = translator.get() + self.assertEqual(result, (None, ["a", "c"])) + + def test_push_character_key(self): + keymap = [("a", "command_a")] + translator = KeymapTranslator(keymap) + evt = Event("key", "a") + translator.push(evt) + result = translator.get() + self.assertEqual(result, ("command_a", ["a"])) + + def test_push_character_key_with_stack(self): + keymap = [("ab", "command_ab")] + translator = KeymapTranslator(keymap) + evt1 = Event("key", "a") + evt2 = Event("key", "b") + evt3 = Event("key", "c") + translator.push(evt1) + translator.push(evt2) + translator.push(evt3) + result = translator.get() + self.assertEqual(result, ("command_ab", ["a", "b"])) + + def test_push_transition_key(self): + keymap = [("a", {"b": "command_ab"})] + translator = KeymapTranslator(keymap) + evt1 = Event("key", "a") + evt2 = Event("key", "b") + translator.push(evt1) + translator.push(evt2) + result = translator.get() + self.assertEqual(result, ("command_ab", ["a", "b"])) + + def test_push_transition_key_interrupted(self): + keymap = [("a", {"b": "command_ab"})] + translator = KeymapTranslator(keymap) + evt1 = Event("key", "a") + evt2 = Event("key", "c") + evt3 = Event("key", "b") + translator.push(evt1) + translator.push(evt2) + translator.push(evt3) + result = translator.get() + self.assertEqual(result, (None, ["a", "c"])) + + def test_push_invalid_key_with_unicode_category(self): + keymap = [("a", "command_a")] + translator = KeymapTranslator(keymap) + evt = Event("key", "\u0003") # Control character + translator.push(evt) + result = translator.get() + self.assertEqual(result, (None, ["\u0003"])) + + def test_empty(self): + keymap = [("a", "command_a")] + translator = KeymapTranslator(keymap) + self.assertTrue(translator.empty()) + evt = Event("key", "a") + translator.push(evt) + self.assertFalse(translator.empty()) + translator.get() + self.assertTrue(translator.empty()) diff --git a/Lib/test/test_pyrepl/test_interact.py b/Lib/test/test_pyrepl/test_interact.py new file mode 100644 index 000000000..e4f90db33 --- /dev/null +++ b/Lib/test/test_pyrepl/test_interact.py @@ -0,0 +1,310 @@ +import contextlib +import io +import warnings +import unittest +from unittest.mock import patch +from textwrap import dedent + +from test.support import force_not_colorized + +from _pyrepl.console import InteractiveColoredConsole +from _pyrepl.simple_interact import _more_lines + +class TestSimpleInteract(unittest.TestCase): + def test_multiple_statements(self): + namespace = {} + code = dedent("""\ + class A: + def foo(self): + + + pass + + class B: + def bar(self): + pass + + a = 1 + a + """) + console = InteractiveColoredConsole(namespace, filename="") + f = io.StringIO() + with ( + patch.object(InteractiveColoredConsole, "showsyntaxerror") as showsyntaxerror, + patch.object(InteractiveColoredConsole, "runsource", wraps=console.runsource) as runsource, + contextlib.redirect_stdout(f), + ): + more = console.push(code, filename="", _symbol="single") # type: ignore[call-arg] + self.assertFalse(more) + showsyntaxerror.assert_not_called() + + + def test_multiple_statements_output(self): + namespace = {} + code = dedent("""\ + b = 1 + b + a = 1 + a + """) + console = InteractiveColoredConsole(namespace, filename="") + f = io.StringIO() + with contextlib.redirect_stdout(f): + more = console.push(code, filename="", _symbol="single") # type: ignore[call-arg] + self.assertFalse(more) + self.assertEqual(f.getvalue(), "1\n") + + @force_not_colorized + def test_multiple_statements_fail_early(self): + console = InteractiveColoredConsole() + code = dedent("""\ + raise Exception('foobar') + print('spam', 'eggs', sep='&') + """) + f = io.StringIO() + with contextlib.redirect_stderr(f): + console.runsource(code) + self.assertIn('Exception: foobar', f.getvalue()) + self.assertNotIn('spam&eggs', f.getvalue()) + + def test_empty(self): + namespace = {} + code = "" + console = InteractiveColoredConsole(namespace, filename="") + f = io.StringIO() + with contextlib.redirect_stdout(f): + more = console.push(code, filename="", _symbol="single") # type: ignore[call-arg] + self.assertFalse(more) + self.assertEqual(f.getvalue(), "") + + def test_runsource_compiles_and_runs_code(self): + console = InteractiveColoredConsole() + source = "print('Hello, world!')" + with patch.object(console, "runcode") as mock_runcode: + console.runsource(source) + mock_runcode.assert_called_once() + + def test_runsource_returns_false_for_successful_compilation(self): + console = InteractiveColoredConsole() + source = "print('Hello, world!')" + f = io.StringIO() + with contextlib.redirect_stdout(f): + result = console.runsource(source) + self.assertFalse(result) + + @force_not_colorized + def test_runsource_returns_false_for_failed_compilation(self): + console = InteractiveColoredConsole() + source = "print('Hello, world!'" + f = io.StringIO() + with contextlib.redirect_stderr(f): + result = console.runsource(source) + self.assertFalse(result) + self.assertIn('SyntaxError', f.getvalue()) + + @unittest.expectedFailure # TODO: RUSTPYTHON + @force_not_colorized + def test_runsource_show_syntax_error_location(self): + console = InteractiveColoredConsole() + source = "def f(x, x): ..." + f = io.StringIO() + with contextlib.redirect_stderr(f): + result = console.runsource(source) + self.assertFalse(result) + r = """ + def f(x, x): ... + ^ +SyntaxError: duplicate argument 'x' in function definition""" + self.assertIn(r, f.getvalue()) + + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_runsource_shows_syntax_error_for_failed_compilation(self): + console = InteractiveColoredConsole() + source = "print('Hello, world!'" + with patch.object(console, "showsyntaxerror") as mock_showsyntaxerror: + console.runsource(source) + mock_showsyntaxerror.assert_called_once() + source = dedent("""\ + match 1: + case {0: _, 0j: _}: + pass + """) + with patch.object(console, "showsyntaxerror") as mock_showsyntaxerror: + console.runsource(source) + mock_showsyntaxerror.assert_called_once() + + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_runsource_survives_null_bytes(self): + console = InteractiveColoredConsole() + source = "\x00\n" + f = io.StringIO() + with contextlib.redirect_stdout(f), contextlib.redirect_stderr(f): + result = console.runsource(source) + self.assertFalse(result) + self.assertIn("source code string cannot contain null bytes", f.getvalue()) + + def test_no_active_future(self): + console = InteractiveColoredConsole() + source = dedent("""\ + x: int = 1 + print(__annotate__(1)) + """) + f = io.StringIO() + with contextlib.redirect_stdout(f): + result = console.runsource(source) + self.assertFalse(result) + self.assertEqual(f.getvalue(), "{'x': }\n") + + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_future_annotations(self): + console = InteractiveColoredConsole() + source = dedent("""\ + from __future__ import annotations + def g(x: int): ... + print(g.__annotations__) + """) + f = io.StringIO() + with contextlib.redirect_stdout(f): + result = console.runsource(source) + self.assertFalse(result) + self.assertEqual(f.getvalue(), "{'x': 'int'}\n") + + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_future_barry_as_flufl(self): + console = InteractiveColoredConsole() + f = io.StringIO() + with contextlib.redirect_stdout(f): + result = console.runsource("from __future__ import barry_as_FLUFL\n") + result = console.runsource("""print("black" <> 'blue')\n""") + self.assertFalse(result) + self.assertEqual(f.getvalue(), "True\n") + + +class TestMoreLines(unittest.TestCase): + def test_invalid_syntax_single_line(self): + namespace = {} + code = "if foo" + console = InteractiveColoredConsole(namespace, filename="") + self.assertFalse(_more_lines(console, code)) + + def test_empty_line(self): + namespace = {} + code = "" + console = InteractiveColoredConsole(namespace, filename="") + self.assertFalse(_more_lines(console, code)) + + def test_valid_single_statement(self): + namespace = {} + code = "foo = 1" + console = InteractiveColoredConsole(namespace, filename="") + self.assertFalse(_more_lines(console, code)) + + def test_multiline_single_assignment(self): + namespace = {} + code = dedent("""\ + foo = [ + 1, + 2, + 3, + ]""") + console = InteractiveColoredConsole(namespace, filename="") + self.assertFalse(_more_lines(console, code)) + + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_multiline_single_block(self): + namespace = {} + code = dedent("""\ + def foo(): + '''docs''' + + return 1""") + console = InteractiveColoredConsole(namespace, filename="") + self.assertTrue(_more_lines(console, code)) + + def test_multiple_statements_single_line(self): + namespace = {} + code = "foo = 1;bar = 2" + console = InteractiveColoredConsole(namespace, filename="") + self.assertFalse(_more_lines(console, code)) + + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_multiple_statements(self): + namespace = {} + code = dedent("""\ + import time + + foo = 1""") + console = InteractiveColoredConsole(namespace, filename="") + self.assertTrue(_more_lines(console, code)) + + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_multiple_blocks(self): + namespace = {} + code = dedent("""\ + from dataclasses import dataclass + + @dataclass + class Point: + x: float + y: float""") + console = InteractiveColoredConsole(namespace, filename="") + self.assertTrue(_more_lines(console, code)) + + def test_multiple_blocks_empty_newline(self): + namespace = {} + code = dedent("""\ + from dataclasses import dataclass + + @dataclass + class Point: + x: float + y: float + """) + console = InteractiveColoredConsole(namespace, filename="") + self.assertFalse(_more_lines(console, code)) + + def test_multiple_blocks_indented_newline(self): + namespace = {} + code = ( + "from dataclasses import dataclass\n" + "\n" + "@dataclass\n" + "class Point:\n" + " x: float\n" + " y: float\n" + " " + ) + console = InteractiveColoredConsole(namespace, filename="") + self.assertFalse(_more_lines(console, code)) + + def test_incomplete_statement(self): + namespace = {} + code = "if foo:" + console = InteractiveColoredConsole(namespace, filename="") + self.assertTrue(_more_lines(console, code)) + + +class TestWarnings(unittest.TestCase): + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_pep_765_warning(self): + """ + Test that a SyntaxWarning emitted from the + AST optimizer is only shown once in the REPL. + """ + # gh-131927 + console = InteractiveColoredConsole() + code = dedent("""\ + def f(): + try: + return 1 + finally: + return 2 + """) + + with warnings.catch_warnings(record=True) as caught: + warnings.simplefilter("always") + console.runsource(code) + + count = sum("'return' in a 'finally' block" in str(w.message) + for w in caught) + self.assertEqual(count, 1) diff --git a/Lib/test/test_pyrepl/test_keymap.py b/Lib/test/test_pyrepl/test_keymap.py new file mode 100644 index 000000000..2c97066b2 --- /dev/null +++ b/Lib/test/test_pyrepl/test_keymap.py @@ -0,0 +1,120 @@ +import string +import unittest + +from _pyrepl.keymap import _keynames, _escapes, parse_keys, compile_keymap, KeySpecError + + +class TestParseKeys(unittest.TestCase): + def test_single_character(self): + """Ensure that single ascii characters or single digits are parsed as single characters.""" + test_cases = [(key, [key]) for key in string.ascii_letters + string.digits] + for test_key, expected_keys in test_cases: + with self.subTest(f"{test_key} should be parsed as {expected_keys}"): + self.assertEqual(parse_keys(test_key), expected_keys) + + def test_keynames(self): + """Ensure that keynames are parsed to their corresponding mapping. + + A keyname is expected to be of the following form: \\ such as \\ + which would get parsed as "left". + """ + test_cases = [(f"\\<{keyname}>", [parsed_keyname]) for keyname, parsed_keyname in _keynames.items()] + for test_key, expected_keys in test_cases: + with self.subTest(f"{test_key} should be parsed as {expected_keys}"): + self.assertEqual(parse_keys(test_key), expected_keys) + + def test_escape_sequences(self): + """Ensure that escaping sequences are parsed to their corresponding mapping.""" + test_cases = [(f"\\{escape}", [parsed_escape]) for escape, parsed_escape in _escapes.items()] + for test_key, expected_keys in test_cases: + with self.subTest(f"{test_key} should be parsed as {expected_keys}"): + self.assertEqual(parse_keys(test_key), expected_keys) + + def test_control_sequences(self): + """Ensure that supported control sequences are parsed successfully.""" + keys = ["@", "[", "]", "\\", "^", "_", "\\", "\\"] + keys.extend(string.ascii_letters) + test_cases = [(f"\\C-{key}", chr(ord(key) & 0x1F)) for key in []] + for test_key, expected_keys in test_cases: + with self.subTest(f"{test_key} should be parsed as {expected_keys}"): + self.assertEqual(parse_keys(test_key), expected_keys) + + def test_meta_sequences(self): + self.assertEqual(parse_keys("\\M-a"), ["\033", "a"]) + self.assertEqual(parse_keys("\\M-b"), ["\033", "b"]) + self.assertEqual(parse_keys("\\M-c"), ["\033", "c"]) + + def test_combinations(self): + self.assertEqual(parse_keys("\\C-a\\n\\"), ["\x01", "\n", "up"]) + self.assertEqual(parse_keys("\\M-a\\t\\"), ["\033", "a", "\t", "down"]) + + def test_keyspec_errors(self): + cases = [ + ("\\Ca", "\\C must be followed by `-'"), + ("\\ca", "\\C must be followed by `-'"), + ("\\C-\\C-", "doubled \\C-"), + ("\\Ma", "\\M must be followed by `-'"), + ("\\ma", "\\M must be followed by `-'"), + ("\\M-\\M-", "doubled \\M-"), + ("\\", "unrecognised keyname"), + ("\\大", "unknown backslash escape"), + ("\\C-\\", "\\C- followed by invalid key") + ] + for test_keys, expected_err in cases: + with self.subTest(f"{test_keys} should give error {expected_err}"): + with self.assertRaises(KeySpecError) as e: + parse_keys(test_keys) + self.assertIn(expected_err, str(e.exception)) + + def test_index_errors(self): + test_cases = ["\\", "\\C", "\\C-\\C"] + for test_keys in test_cases: + with self.assertRaises(IndexError): + parse_keys(test_keys) + + +class TestCompileKeymap(unittest.TestCase): + def test_empty_keymap(self): + keymap = {} + result = compile_keymap(keymap) + self.assertEqual(result, {}) + + def test_single_keymap(self): + keymap = {b"a": "action"} + result = compile_keymap(keymap) + self.assertEqual(result, {b"a": "action"}) + + def test_nested_keymap(self): + keymap = {b"a": {b"b": "action"}} + result = compile_keymap(keymap) + self.assertEqual(result, {b"a": {b"b": "action"}}) + + def test_empty_value(self): + keymap = {b"a": {b"": "action"}} + result = compile_keymap(keymap) + self.assertEqual(result, {b"a": {b"": "action"}}) + + def test_multiple_empty_values(self): + keymap = {b"a": {b"": "action1", b"b": "action2"}} + result = compile_keymap(keymap) + self.assertEqual(result, {b"a": {b"": "action1", b"b": "action2"}}) + + def test_multiple_keymaps(self): + keymap = {b"a": {b"b": "action1", b"c": "action2"}} + result = compile_keymap(keymap) + self.assertEqual(result, {b"a": {b"b": "action1", b"c": "action2"}}) + + def test_nested_multiple_keymaps(self): + keymap = {b"a": {b"b": {b"c": "action"}}} + result = compile_keymap(keymap) + self.assertEqual(result, {b"a": {b"b": {b"c": "action"}}}) + + def test_clashing_definitions(self): + km = {b'a': 'c', b'a' + b'b': 'd'} + with self.assertRaises(KeySpecError): + compile_keymap(km) + + def test_non_bytes_key(self): + with self.assertRaises(TypeError): + compile_keymap({123: 'a'}) diff --git a/Lib/test/test_pyrepl/test_pyrepl.py b/Lib/test/test_pyrepl/test_pyrepl.py new file mode 100644 index 000000000..74735ef3c --- /dev/null +++ b/Lib/test/test_pyrepl/test_pyrepl.py @@ -0,0 +1,2165 @@ +import importlib +import io +import itertools +import os +import pathlib +import pkgutil +import re +import rlcompleter +import select +import subprocess +import sys +import tempfile +from pkgutil import ModuleInfo +from unittest import TestCase, skipUnless, skipIf, SkipTest +from unittest.mock import Mock, patch +from test.support import force_not_colorized, make_clean_env, Py_DEBUG +from test.support import has_subprocess_support, SHORT_TIMEOUT, STDLIB_DIR +from test.support.import_helper import import_module +from test.support.os_helper import EnvironmentVarGuard, unlink + +from .support import ( + FakeConsole, + ScreenEqualMixin, + handle_all_events, + handle_events_narrow_console, + more_lines, + multiline_input, + code_to_events, +) +from _pyrepl.console import Event +from _pyrepl._module_completer import ( + ImportParser, + ModuleCompleter, + HARDCODED_SUBMODULES, +) +from _pyrepl.readline import ( + ReadlineAlikeReader, + ReadlineConfig, + _ReadlineWrapper, +) +from _pyrepl.readline import multiline_input as readline_multiline_input + +import unittest # XXX: RUSTPYTHON; importing to be able to skip tests + +try: + import pty +except ImportError: + pty = None +try: + import readline as readline_module +except ImportError: + readline_module = None + + +class ReplTestCase(TestCase): + def setUp(self): + if not has_subprocess_support: + raise SkipTest("test module requires subprocess") + + def run_repl( + self, + repl_input: str | list[str], + env: dict | None = None, + *, + cmdline_args: list[str] | None = None, + cwd: str | None = None, + skip: bool = False, + timeout: float = SHORT_TIMEOUT, + exit_on_output: str | None = None, + ) -> tuple[str, int]: + temp_dir = None + if cwd is None: + temp_dir = tempfile.TemporaryDirectory(ignore_cleanup_errors=True) + cwd = temp_dir.name + try: + return self._run_repl( + repl_input, + env=env, + cmdline_args=cmdline_args, + cwd=cwd, + skip=skip, + timeout=timeout, + exit_on_output=exit_on_output, + ) + finally: + if temp_dir is not None: + temp_dir.cleanup() + + def _run_repl( + self, + repl_input: str | list[str], + *, + env: dict | None, + cmdline_args: list[str] | None, + cwd: str, + skip: bool, + timeout: float, + exit_on_output: str | None, + ) -> tuple[str, int]: + assert pty + master_fd, slave_fd = pty.openpty() + cmd = [sys.executable, "-i", "-u"] + if env is None: + cmd.append("-I") + elif "PYTHON_HISTORY" not in env: + env["PYTHON_HISTORY"] = os.path.join(cwd, ".regrtest_history") + if cmdline_args is not None: + cmd.extend(cmdline_args) + + try: + import termios + except ModuleNotFoundError: + pass + else: + term_attr = termios.tcgetattr(slave_fd) + term_attr[6][termios.VREPRINT] = 0 # pass through CTRL-R + term_attr[6][termios.VINTR] = 0 # pass through CTRL-C + termios.tcsetattr(slave_fd, termios.TCSANOW, term_attr) + + process = subprocess.Popen( + cmd, + stdin=slave_fd, + stdout=slave_fd, + stderr=slave_fd, + cwd=cwd, + text=True, + close_fds=True, + env=env if env else os.environ, + ) + os.close(slave_fd) + if isinstance(repl_input, list): + repl_input = "\n".join(repl_input) + "\n" + os.write(master_fd, repl_input.encode("utf-8")) + + output = [] + while select.select([master_fd], [], [], timeout)[0]: + try: + data = os.read(master_fd, 1024).decode("utf-8") + if not data: + break + except OSError: + break + output.append(data) + if exit_on_output is not None: + output = ["".join(output)] + if exit_on_output in output[0]: + process.kill() + break + else: + os.close(master_fd) + process.kill() + process.wait(timeout=timeout) + self.fail(f"Timeout while waiting for output, got: {''.join(output)}") + + os.close(master_fd) + try: + exit_code = process.wait(timeout=timeout) + except subprocess.TimeoutExpired: + process.kill() + exit_code = process.wait() + output = "".join(output) + if skip and "can't use pyrepl" in output: + self.skipTest("pyrepl not available") + return output, exit_code + + +class TestCursorPosition(TestCase): + def prepare_reader(self, events): + console = FakeConsole(events) + config = ReadlineConfig(readline_completer=None) + reader = ReadlineAlikeReader(console=console, config=config) + return reader + + def test_up_arrow_simple(self): + # fmt: off + code = ( + "def f():\n" + " ...\n" + ) + # fmt: on + events = itertools.chain( + code_to_events(code), + [ + Event(evt="key", data="up", raw=bytearray(b"\x1bOA")), + ], + ) + + reader, console = handle_all_events(events) + self.assertEqual(reader.cxy, (0, 1)) + console.move_cursor.assert_called_once_with(0, 1) + + def test_down_arrow_end_of_input(self): + # fmt: off + code = ( + "def f():\n" + " ...\n" + ) + # fmt: on + events = itertools.chain( + code_to_events(code), + [ + Event(evt="key", data="down", raw=bytearray(b"\x1bOB")), + ], + ) + + reader, console = handle_all_events(events) + self.assertEqual(reader.cxy, (0, 2)) + console.move_cursor.assert_called_once_with(0, 2) + + def test_left_arrow_simple(self): + events = itertools.chain( + code_to_events("11+11"), + [ + Event(evt="key", data="left", raw=bytearray(b"\x1bOD")), + ], + ) + + reader, console = handle_all_events(events) + self.assertEqual(reader.cxy, (4, 0)) + console.move_cursor.assert_called_once_with(4, 0) + + def test_right_arrow_end_of_line(self): + events = itertools.chain( + code_to_events("11+11"), + [ + Event(evt="key", data="right", raw=bytearray(b"\x1bOC")), + ], + ) + + reader, console = handle_all_events(events) + self.assertEqual(reader.cxy, (5, 0)) + console.move_cursor.assert_called_once_with(5, 0) + + def test_cursor_position_simple_character(self): + events = itertools.chain(code_to_events("k")) + + reader, _ = handle_all_events(events) + self.assertEqual(reader.pos, 1) + + # 1 for simple character + self.assertEqual(reader.cxy, (1, 0)) + + def test_cursor_position_double_width_character(self): + events = itertools.chain(code_to_events("樂")) + + reader, _ = handle_all_events(events) + self.assertEqual(reader.pos, 1) + + # 2 for wide character + self.assertEqual(reader.cxy, (2, 0)) + + def test_cursor_position_double_width_character_move_left(self): + events = itertools.chain( + code_to_events("樂"), + [ + Event(evt="key", data="left", raw=bytearray(b"\x1bOD")), + ], + ) + + reader, _ = handle_all_events(events) + self.assertEqual(reader.pos, 0) + self.assertEqual(reader.cxy, (0, 0)) + + def test_cursor_position_double_width_character_move_left_right(self): + events = itertools.chain( + code_to_events("樂"), + [ + Event(evt="key", data="left", raw=bytearray(b"\x1bOD")), + Event(evt="key", data="right", raw=bytearray(b"\x1bOC")), + ], + ) + + reader, _ = handle_all_events(events) + self.assertEqual(reader.pos, 1) + + # 2 for wide character + self.assertEqual(reader.cxy, (2, 0)) + + def test_cursor_position_double_width_characters_move_up(self): + for_loop = "for _ in _:" + + # fmt: off + code = ( + f"{for_loop}\n" + " ' 可口可乐; 可口可樂'" + ) + # fmt: on + + events = itertools.chain( + code_to_events(code), + [ + Event(evt="key", data="up", raw=bytearray(b"\x1bOA")), + ], + ) + + reader, _ = handle_all_events(events) + + # cursor at end of first line + self.assertEqual(reader.pos, len(for_loop)) + self.assertEqual(reader.cxy, (len(for_loop), 0)) + + def test_cursor_position_double_width_characters_move_up_down(self): + for_loop = "for _ in _:" + + # fmt: off + code = ( + f"{for_loop}\n" + " ' 可口可乐; 可口可樂'" + ) + # fmt: on + + events = itertools.chain( + code_to_events(code), + [ + Event(evt="key", data="up", raw=bytearray(b"\x1bOA")), + Event(evt="key", data="left", raw=bytearray(b"\x1bOD")), + Event(evt="key", data="down", raw=bytearray(b"\x1bOB")), + ], + ) + + reader, _ = handle_all_events(events) + + # cursor here (showing 2nd line only): + # < ' 可口可乐; 可口可樂'> + # ^ + self.assertEqual(reader.pos, 19) + self.assertEqual(reader.cxy, (10, 1)) + + def test_cursor_position_multiple_double_width_characters_move_left(self): + events = itertools.chain( + code_to_events("' 可口可乐; 可口可樂'"), + [ + Event(evt="key", data="left", raw=bytearray(b"\x1bOD")), + Event(evt="key", data="left", raw=bytearray(b"\x1bOD")), + Event(evt="key", data="left", raw=bytearray(b"\x1bOD")), + ], + ) + + reader, _ = handle_all_events(events) + self.assertEqual(reader.pos, 10) + + # 1 for quote, 1 for space, 2 per wide character, + # 1 for semicolon, 1 for space, 2 per wide character + self.assertEqual(reader.cxy, (16, 0)) + + def test_cursor_position_move_up_to_eol(self): + first_line = "for _ in _:" + second_line = " hello" + + # fmt: off + code = ( + f"{first_line}\n" + f"{second_line}\n" + " h\n" + " hel" + ) + # fmt: on + + events = itertools.chain( + code_to_events(code), + [ + Event(evt="key", data="up", raw=bytearray(b"\x1bOA")), + Event(evt="key", data="up", raw=bytearray(b"\x1bOA")), + ], + ) + + reader, _ = handle_all_events(events) + + # Cursor should be at end of line 1, even though line 2 is shorter + # for _ in _: + # hello + # h + # hel + self.assertEqual( + reader.pos, len(first_line) + len(second_line) + 1 + ) # +1 for newline + self.assertEqual(reader.cxy, (len(second_line), 1)) + + def test_cursor_position_move_down_to_eol(self): + last_line = " hel" + + # fmt: off + code = ( + "for _ in _:\n" + " hello\n" + " h\n" + f"{last_line}" + ) + # fmt: on + + events = itertools.chain( + code_to_events(code), + [ + Event(evt="key", data="up", raw=bytearray(b"\x1bOA")), + Event(evt="key", data="up", raw=bytearray(b"\x1bOA")), + Event(evt="key", data="down", raw=bytearray(b"\x1bOB")), + Event(evt="key", data="down", raw=bytearray(b"\x1bOB")), + ], + ) + + reader, _ = handle_all_events(events) + + # Cursor should be at end of line 3, even though line 2 is shorter + # for _ in _: + # hello + # h + # hel + self.assertEqual(reader.pos, len(code)) + self.assertEqual(reader.cxy, (len(last_line), 3)) + + def test_cursor_position_multiple_mixed_lines_move_up(self): + # fmt: off + code = ( + "def foo():\n" + " x = '可口可乐; 可口可樂'\n" + " y = 'abckdfjskldfjslkdjf'" + ) + # fmt: on + + events = itertools.chain( + code_to_events(code), + 13 * [Event(evt="key", data="left", raw=bytearray(b"\x1bOD"))], + [Event(evt="key", data="up", raw=bytearray(b"\x1bOA"))], + ) + + reader, _ = handle_all_events(events) + + # By moving left, we're before the s: + # y = 'abckdfjskldfjslkdjf' + # ^ + # And we should move before the semi-colon despite the different offset + # x = '可口可乐; 可口可樂' + # ^ + self.assertEqual(reader.pos, 22) + self.assertEqual(reader.cxy, (15, 1)) + + def test_cursor_position_after_wrap_and_move_up(self): + # fmt: off + code = ( + "def foo():\n" + " hello" + ) + # fmt: on + + events = itertools.chain( + code_to_events(code), + [ + Event(evt="key", data="up", raw=bytearray(b"\x1bOA")), + ], + ) + reader, _ = handle_events_narrow_console(events) + + # The code looks like this: + # def foo()\ + # : + # hello + # After moving up we should be after the colon in line 2 + self.assertEqual(reader.pos, 10) + self.assertEqual(reader.cxy, (1, 1)) + + +class TestPyReplAutoindent(TestCase): + def prepare_reader(self, events): + console = FakeConsole(events) + config = ReadlineConfig(readline_completer=None) + reader = ReadlineAlikeReader(console=console, config=config) + return reader + + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_auto_indent_default(self): + # fmt: off + input_code = ( + "def f():\n" + "pass\n\n" + ) + + output_code = ( + "def f():\n" + " pass\n" + " " + ) + # fmt: on + + events = code_to_events(input_code) + reader = self.prepare_reader(events) + output = multiline_input(reader) + self.assertEqual(output, output_code) + + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_auto_indent_continuation(self): + # auto indenting according to previous user indentation + # fmt: off + events = itertools.chain( + code_to_events("def f():\n"), + # add backspace to delete default auto-indent + [ + Event(evt="key", data="backspace", raw=bytearray(b"\x7f")), + ], + code_to_events( + " pass\n" + "pass\n\n" + ), + ) + + output_code = ( + "def f():\n" + " pass\n" + " pass\n" + " " + ) + # fmt: on + + reader = self.prepare_reader(events) + output = multiline_input(reader) + self.assertEqual(output, output_code) + + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_auto_indent_prev_block(self): + # auto indenting according to indentation in different block + # fmt: off + events = itertools.chain( + code_to_events("def f():\n"), + # add backspace to delete default auto-indent + [ + Event(evt="key", data="backspace", raw=bytearray(b"\x7f")), + ], + code_to_events( + " pass\n" + "pass\n\n" + ), + code_to_events( + "def g():\n" + "pass\n\n" + ), + ) + + output_code = ( + "def g():\n" + " pass\n" + " " + ) + # fmt: on + + reader = self.prepare_reader(events) + output1 = multiline_input(reader) + output2 = multiline_input(reader) + self.assertEqual(output2, output_code) + + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_auto_indent_multiline(self): + # fmt: off + events = itertools.chain( + code_to_events( + "def f():\n" + "pass" + ), + [ + # go to the end of the first line + Event(evt="key", data="up", raw=bytearray(b"\x1bOA")), + Event(evt="key", data="\x05", raw=bytearray(b"\x1bO5")), + # new line should be autoindented + Event(evt="key", data="\n", raw=bytearray(b"\n")), + ], + code_to_events( + "pass" + ), + [ + # go to end of last line + Event(evt="key", data="down", raw=bytearray(b"\x1bOB")), + Event(evt="key", data="\x05", raw=bytearray(b"\x1bO5")), + # double newline to terminate the block + Event(evt="key", data="\n", raw=bytearray(b"\n")), + Event(evt="key", data="\n", raw=bytearray(b"\n")), + ], + ) + + output_code = ( + "def f():\n" + " pass\n" + " pass\n" + " " + ) + # fmt: on + + reader = self.prepare_reader(events) + output = multiline_input(reader) + self.assertEqual(output, output_code) + + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_auto_indent_with_comment(self): + # fmt: off + events = code_to_events( + "def f(): # foo\n" + "pass\n\n" + ) + + output_code = ( + "def f(): # foo\n" + " pass\n" + " " + ) + # fmt: on + + reader = self.prepare_reader(events) + output = multiline_input(reader) + self.assertEqual(output, output_code) + + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_auto_indent_with_multicomment(self): + # fmt: off + events = code_to_events( + "def f(): ## foo\n" + "pass\n\n" + ) + + output_code = ( + "def f(): ## foo\n" + " pass\n" + " " + ) + # fmt: on + + reader = self.prepare_reader(events) + output = multiline_input(reader) + self.assertEqual(output, output_code) + + def test_auto_indent_ignore_comments(self): + # fmt: off + events = code_to_events( + "pass #:\n" + ) + + output_code = ( + "pass #:" + ) + # fmt: on + + reader = self.prepare_reader(events) + output = multiline_input(reader) + self.assertEqual(output, output_code) + + +class TestPyReplOutput(ScreenEqualMixin, TestCase): + def prepare_reader(self, events): + console = FakeConsole(events) + config = ReadlineConfig(readline_completer=None) + reader = ReadlineAlikeReader(console=console, config=config) + reader.can_colorize = False + return reader + + def test_stdin_is_tty(self): + # Used during test log analysis to figure out if a TTY was available. + try: + if os.isatty(sys.stdin.fileno()): + return + except OSError as ose: + self.skipTest(f"stdin tty check failed: {ose}") + else: + self.skipTest("stdin is not a tty") + + def test_stdout_is_tty(self): + # Used during test log analysis to figure out if a TTY was available. + try: + if os.isatty(sys.stdout.fileno()): + return + except OSError as ose: + self.skipTest(f"stdout tty check failed: {ose}") + else: + self.skipTest("stdout is not a tty") + + def test_basic(self): + reader = self.prepare_reader(code_to_events("1+1\n")) + + output = multiline_input(reader) + self.assertEqual(output, "1+1") + self.assert_screen_equal(reader, "1+1", clean=True) + + def test_get_line_buffer_returns_str(self): + reader = self.prepare_reader(code_to_events("\n")) + wrapper = _ReadlineWrapper(f_in=None, f_out=None, reader=reader) + self.assertIs(type(wrapper.get_line_buffer()), str) + + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_multiline_edit(self): + events = itertools.chain( + code_to_events("def f():\n...\n\n"), + [ + Event(evt="key", data="up", raw=bytearray(b"\x1bOA")), + Event(evt="key", data="up", raw=bytearray(b"\x1bOA")), + Event(evt="key", data="left", raw=bytearray(b"\x1bOD")), + Event(evt="key", data="left", raw=bytearray(b"\x1bOD")), + Event(evt="key", data="left", raw=bytearray(b"\x1bOD")), + Event(evt="key", data="backspace", raw=bytearray(b"\x08")), + Event(evt="key", data="g", raw=bytearray(b"g")), + Event(evt="key", data="down", raw=bytearray(b"\x1bOB")), + Event(evt="key", data="backspace", raw=bytearray(b"\x08")), + Event(evt="key", data="delete", raw=bytearray(b"\x7F")), + Event(evt="key", data="right", raw=bytearray(b"g")), + Event(evt="key", data="backspace", raw=bytearray(b"\x08")), + Event(evt="key", data="p", raw=bytearray(b"p")), + Event(evt="key", data="a", raw=bytearray(b"a")), + Event(evt="key", data="s", raw=bytearray(b"s")), + Event(evt="key", data="s", raw=bytearray(b"s")), + Event(evt="key", data="\n", raw=bytearray(b"\n")), + Event(evt="key", data="\n", raw=bytearray(b"\n")), + ], + ) + reader = self.prepare_reader(events) + + output = multiline_input(reader) + expected = "def f():\n ...\n " + self.assertEqual(output, expected) + self.assert_screen_equal(reader, expected, clean=True) + output = multiline_input(reader) + expected = "def g():\n pass\n " + self.assertEqual(output, expected) + self.assert_screen_equal(reader, expected, clean=True) + + def test_history_navigation_with_up_arrow(self): + events = itertools.chain( + code_to_events("1+1\n2+2\n"), + [ + Event(evt="key", data="up", raw=bytearray(b"\x1bOA")), + Event(evt="key", data="\n", raw=bytearray(b"\n")), + Event(evt="key", data="up", raw=bytearray(b"\x1bOA")), + Event(evt="key", data="up", raw=bytearray(b"\x1bOA")), + Event(evt="key", data="up", raw=bytearray(b"\x1bOA")), + Event(evt="key", data="\n", raw=bytearray(b"\n")), + ], + ) + + reader = self.prepare_reader(events) + + output = multiline_input(reader) + self.assertEqual(output, "1+1") + self.assert_screen_equal(reader, "1+1", clean=True) + output = multiline_input(reader) + self.assertEqual(output, "2+2") + self.assert_screen_equal(reader, "2+2", clean=True) + output = multiline_input(reader) + self.assertEqual(output, "2+2") + self.assert_screen_equal(reader, "2+2", clean=True) + output = multiline_input(reader) + self.assertEqual(output, "1+1") + self.assert_screen_equal(reader, "1+1", clean=True) + + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_history_with_multiline_entries(self): + code = "def foo():\nx = 1\ny = 2\nz = 3\n\ndef bar():\nreturn 42\n\n" + events = list(itertools.chain( + code_to_events(code), + [ + Event(evt="key", data="up", raw=bytearray(b"\x1bOA")), + Event(evt="key", data="up", raw=bytearray(b"\x1bOA")), + Event(evt="key", data="up", raw=bytearray(b"\x1bOA")), + Event(evt="key", data="\n", raw=bytearray(b"\n")), + Event(evt="key", data="\n", raw=bytearray(b"\n")), + ] + )) + + reader = self.prepare_reader(events) + output = multiline_input(reader) + output = multiline_input(reader) + output = multiline_input(reader) + expected = "def foo():\n x = 1\n y = 2\n z = 3\n " + self.assert_screen_equal(reader, expected, clean=True) + self.assertEqual(output, expected) + + + def test_history_navigation_with_down_arrow(self): + events = itertools.chain( + code_to_events("1+1\n2+2\n"), + [ + Event(evt="key", data="up", raw=bytearray(b"\x1bOA")), + Event(evt="key", data="up", raw=bytearray(b"\x1bOA")), + Event(evt="key", data="\n", raw=bytearray(b"\n")), + Event(evt="key", data="down", raw=bytearray(b"\x1bOB")), + Event(evt="key", data="down", raw=bytearray(b"\x1bOB")), + ], + ) + + reader = self.prepare_reader(events) + + output = multiline_input(reader) + self.assertEqual(output, "1+1") + self.assert_screen_equal(reader, "1+1", clean=True) + + def test_history_search(self): + events = itertools.chain( + code_to_events("1+1\n2+2\n3+3\n"), + [ + Event(evt="key", data="\x12", raw=bytearray(b"\x12")), + Event(evt="key", data="1", raw=bytearray(b"1")), + Event(evt="key", data="\n", raw=bytearray(b"\n")), + Event(evt="key", data="\n", raw=bytearray(b"\n")), + ], + ) + + reader = self.prepare_reader(events) + + output = multiline_input(reader) + self.assertEqual(output, "1+1") + self.assert_screen_equal(reader, "1+1", clean=True) + output = multiline_input(reader) + self.assertEqual(output, "2+2") + self.assert_screen_equal(reader, "2+2", clean=True) + output = multiline_input(reader) + self.assertEqual(output, "3+3") + self.assert_screen_equal(reader, "3+3", clean=True) + output = multiline_input(reader) + self.assertEqual(output, "1+1") + self.assert_screen_equal(reader, "1+1", clean=True) + + def test_control_character(self): + events = code_to_events("c\x1d\n") + reader = self.prepare_reader(events) + output = multiline_input(reader) + self.assertEqual(output, "c\x1d") + self.assert_screen_equal(reader, "c\x1d", clean=True) + + def test_history_search_backward(self): + # Test history search backward with "imp" input + events = itertools.chain( + code_to_events("import os\n"), + code_to_events("imp"), + [ + Event(evt='key', data='page up', raw=bytearray(b'\x1b[5~')), + Event(evt="key", data="\n", raw=bytearray(b"\n")), + ], + ) + + # fill the history + reader = self.prepare_reader(events) + multiline_input(reader) + + # search for "imp" in history + output = multiline_input(reader) + self.assertEqual(output, "import os") + self.assert_screen_equal(reader, "import os", clean=True) + + def test_history_search_backward_empty(self): + # Test history search backward with an empty input + events = itertools.chain( + code_to_events("import os\n"), + [ + Event(evt='key', data='page up', raw=bytearray(b'\x1b[5~')), + Event(evt="key", data="\n", raw=bytearray(b"\n")), + ], + ) + + # fill the history + reader = self.prepare_reader(events) + multiline_input(reader) + + # search backward in history + output = multiline_input(reader) + self.assertEqual(output, "import os") + self.assert_screen_equal(reader, "import os", clean=True) + + +class TestPyReplCompleter(TestCase): + def prepare_reader(self, events, namespace): + console = FakeConsole(events) + config = ReadlineConfig() + config.readline_completer = rlcompleter.Completer(namespace).complete + reader = ReadlineAlikeReader(console=console, config=config) + return reader + + @unittest.expectedFailure # TODO: RUSTPYTHON + @patch("rlcompleter._readline_available", False) + def test_simple_completion(self): + events = code_to_events("os.getpid\t\n") + + namespace = {"os": os} + reader = self.prepare_reader(events, namespace) + + output = multiline_input(reader, namespace) + self.assertEqual(output, "os.getpid()") + + def test_completion_with_many_options(self): + # Test with something that initially displays many options + # and then complete from one of them. The first time tab is + # pressed, the options are displayed (which corresponds to + # when the repl shows [ not unique ]) and the second completes + # from one of them. + events = code_to_events("os.\t\tO_AP\t\n") + + namespace = {"os": os} + reader = self.prepare_reader(events, namespace) + + output = multiline_input(reader, namespace) + self.assertEqual(output, "os.O_APPEND") + + def test_empty_namespace_completion(self): + events = code_to_events("os.geten\t\n") + namespace = {} + reader = self.prepare_reader(events, namespace) + + output = multiline_input(reader, namespace) + self.assertEqual(output, "os.geten") + + def test_global_namespace_completion(self): + events = code_to_events("py\t\n") + namespace = {"python": None} + reader = self.prepare_reader(events, namespace) + output = multiline_input(reader, namespace) + self.assertEqual(output, "python") + + def test_up_down_arrow_with_completion_menu(self): + """Up arrow in the middle of unfinished tab completion when the menu is displayed + should work and trigger going back in history. Down arrow should subsequently + get us back to the incomplete command.""" + code = "import os\nos.\t\t" + namespace = {"os": os} + + events = itertools.chain( + code_to_events(code), + [ + Event(evt="key", data="down", raw=bytearray(b"\x1bOB")), + Event(evt="key", data="up", raw=bytearray(b"\x1bOA")), + Event(evt="key", data="down", raw=bytearray(b"\x1bOB")), + ], + code_to_events("\n"), + ) + reader = self.prepare_reader(events, namespace=namespace) + output = multiline_input(reader, namespace) + # This is the first line, nothing to see here + self.assertEqual(output, "import os") + # This is the second line. We pressed up and down arrows + # so we should end up where we were when we initiated tab completion. + output = multiline_input(reader, namespace) + self.assertEqual(output, "os.") + + @patch("_pyrepl.readline._ReadlineWrapper.get_reader") + @patch("sys.stderr", new_callable=io.StringIO) + def test_completion_with_warnings(self, mock_stderr, mock_get_reader): + class Dummy: + @property + def test_func(self): + import warnings + + warnings.warn("warnings\n") + return None + + dummy = Dummy() + events = code_to_events("dummy.test_func.\t\n\n") + namespace = {"dummy": dummy} + reader = self.prepare_reader(events, namespace) + mock_get_reader.return_value = reader + output = readline_multiline_input(more_lines, ">>>", "...") + self.assertEqual(output, "dummy.test_func.__") + self.assertEqual(mock_stderr.getvalue(), "") + + +class TestPyReplModuleCompleter(TestCase): + def setUp(self): + # Make iter_modules() search only the standard library. + # This makes the test more reliable in case there are + # other user packages/scripts on PYTHONPATH which can + # interfere with the completions. + lib_path = os.path.dirname(importlib.__path__[0]) + self._saved_sys_path = sys.path + sys.path = [lib_path] + + def tearDown(self): + sys.path = self._saved_sys_path + + def prepare_reader(self, events, namespace): + console = FakeConsole(events) + config = ReadlineConfig() + config.module_completer = ModuleCompleter(namespace) + config.readline_completer = rlcompleter.Completer(namespace).complete + reader = ReadlineAlikeReader(console=console, config=config) + return reader + + def test_import_completions(self): + cases = ( + ("import path\t\n", "import pathlib"), + ("import importlib.\t\tres\t\n", "import importlib.resources"), + ("import importlib.resources.\t\ta\t\n", "import importlib.resources.abc"), + ("import foo, impo\t\n", "import foo, importlib"), + ("import foo as bar, impo\t\n", "import foo as bar, importlib"), + ("from impo\t\n", "from importlib"), + ("from importlib.res\t\n", "from importlib.resources"), + ("from importlib.\t\tres\t\n", "from importlib.resources"), + ("from importlib.resources.ab\t\n", "from importlib.resources.abc"), + ("from importlib import mac\t\n", "from importlib import machinery"), + ("from importlib import res\t\n", "from importlib import resources"), + ("from importlib.res\t import a\t\n", "from importlib.resources import abc"), + ("from __phello__ import s\t\n", "from __phello__ import spam"), # frozen module + ) + for code, expected in cases: + with self.subTest(code=code): + events = code_to_events(code) + reader = self.prepare_reader(events, namespace={}) + output = reader.readline() + self.assertEqual(output, expected) + + @patch("pkgutil.iter_modules", lambda: [ModuleInfo(None, "public", True), + ModuleInfo(None, "_private", True)]) + @patch("sys.builtin_module_names", ()) + def test_private_completions(self): + cases = ( + # Return public methods by default + ("import \t\n", "import public"), + ("from \t\n", "from public"), + # Return private methods if explicitly specified + ("import _\t\n", "import _private"), + ("from _\t\n", "from _private"), + ) + for code, expected in cases: + with self.subTest(code=code): + events = code_to_events(code) + reader = self.prepare_reader(events, namespace={}) + output = reader.readline() + self.assertEqual(output, expected) + + @patch( + "_pyrepl._module_completer.ModuleCompleter.iter_submodules", + lambda *_: [ + ModuleInfo(None, "public", True), + ModuleInfo(None, "_private", True), + ], + ) + def test_sub_module_private_completions(self): + cases = ( + # Return public methods by default + ("from foo import \t\n", "from foo import public"), + # Return private methods if explicitly specified + ("from foo import _\t\n", "from foo import _private"), + ) + for code, expected in cases: + with self.subTest(code=code): + events = code_to_events(code) + reader = self.prepare_reader(events, namespace={}) + output = reader.readline() + self.assertEqual(output, expected) + + def test_builtin_completion_top_level(self): + cases = ( + ("import bui\t\n", "import builtins"), + ("from bui\t\n", "from builtins"), + ) + for code, expected in cases: + with self.subTest(code=code): + events = code_to_events(code) + reader = self.prepare_reader(events, namespace={}) + output = reader.readline() + self.assertEqual(output, expected) + + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_relative_import_completions(self): + cases = ( + (None, "from .readl\t\n", "from .readl"), + (None, "from . import readl\t\n", "from . import readl"), + ("_pyrepl", "from .readl\t\n", "from .readline"), + ("_pyrepl", "from . import readl\t\n", "from . import readline"), + ("_pyrepl", "from .. import toodeep\t\n", "from .. import toodeep"), + ("concurrent", "from .futures.i\t\n", "from .futures.interpreter"), + ) + for package, code, expected in cases: + with self.subTest(code=code): + events = code_to_events(code) + reader = self.prepare_reader(events, namespace={"__package__": package}) + output = reader.readline() + self.assertEqual(output, expected) + + @patch("pkgutil.iter_modules", lambda: [ModuleInfo(None, "valid_name", True), + ModuleInfo(None, "invalid-name", True)]) + def test_invalid_identifiers(self): + # Make sure modules which are not valid identifiers + # are not suggested as those cannot be imported via 'import'. + cases = ( + ("import valid\t\n", "import valid_name"), + # 'invalid-name' contains a dash and should not be completed + ("import invalid\t\n", "import invalid"), + ) + for code, expected in cases: + with self.subTest(code=code): + events = code_to_events(code) + reader = self.prepare_reader(events, namespace={}) + output = reader.readline() + self.assertEqual(output, expected) + + def test_no_fallback_on_regular_completion(self): + cases = ( + ("import pri\t\n", "import pri"), + ("from pri\t\n", "from pri"), + ("from typing import Na\t\n", "from typing import Na"), + ) + for code, expected in cases: + with self.subTest(code=code): + events = code_to_events(code) + reader = self.prepare_reader(events, namespace={}) + output = reader.readline() + self.assertEqual(output, expected) + + def test_global_cache(self): + with (tempfile.TemporaryDirectory() as _dir1, + patch.object(sys, "path", [_dir1, *sys.path])): + dir1 = pathlib.Path(_dir1) + (dir1 / "mod_aa.py").mkdir() + (dir1 / "mod_bb.py").mkdir() + events = code_to_events("import mod_a\t\nimport mod_b\t\n") + reader = self.prepare_reader(events, namespace={}) + output_1, output_2 = reader.readline(), reader.readline() + self.assertEqual(output_1, "import mod_aa") + self.assertEqual(output_2, "import mod_bb") + + def test_hardcoded_stdlib_submodules(self): + cases = ( + ("import collections.\t\n", "import collections.abc"), + ("from os import \t\n", "from os import path"), + ("import xml.parsers.expat.\t\te\t\n\n", "import xml.parsers.expat.errors"), + ("from xml.parsers.expat import \t\tm\t\n\n", "from xml.parsers.expat import model"), + ) + for code, expected in cases: + with self.subTest(code=code): + events = code_to_events(code) + reader = self.prepare_reader(events, namespace={}) + output = reader.readline() + self.assertEqual(output, expected) + + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_hardcoded_stdlib_submodules_not_proposed_if_local_import(self): + with (tempfile.TemporaryDirectory() as _dir, + patch.object(sys, "modules", {})): # hide imported module + dir = pathlib.Path(_dir) + (dir / "collections").mkdir() + (dir / "collections" / "__init__.py").touch() + (dir / "collections" / "foo.py").touch() + with patch.object(sys, "path", [_dir, *sys.path]): + events = code_to_events("import collections.\t\n") + reader = self.prepare_reader(events, namespace={}) + output = reader.readline() + self.assertEqual(output, "import collections.foo") + + def test_already_imported_stdlib_module_no_other_suggestions(self): + with (tempfile.TemporaryDirectory() as _dir, + patch.object(sys, "path", [_dir, *sys.path])): + dir = pathlib.Path(_dir) + (dir / "collections").mkdir() + (dir / "collections" / "__init__.py").touch() + (dir / "collections" / "foo.py").touch() + + # collections found in dir, but was already imported + # from stdlib at startup -> suggest stdlib submodules only + events = code_to_events("import collections.\t\n") + reader = self.prepare_reader(events, namespace={}) + output = reader.readline() + self.assertEqual(output, "import collections.abc") + + def test_already_imported_custom_module_no_suggestions(self): + with (tempfile.TemporaryDirectory() as _dir1, + tempfile.TemporaryDirectory() as _dir2, + patch.object(sys, "path", [_dir2, _dir1, *sys.path])): + dir1 = pathlib.Path(_dir1) + (dir1 / "mymodule").mkdir() + (dir1 / "mymodule" / "__init__.py").touch() + (dir1 / "mymodule" / "foo.py").touch() + importlib.import_module("mymodule") + + dir2 = pathlib.Path(_dir2) + (dir2 / "mymodule").mkdir() + (dir2 / "mymodule" / "__init__.py").touch() + (dir2 / "mymodule" / "bar.py").touch() + # Purge FileFinder cache after adding files + pkgutil.get_importer(_dir2).invalidate_caches() + # mymodule found in dir2 before dir1, but it was already imported + # from dir1 -> do not suggest dir2 submodules + events = code_to_events("import mymodule.\t\n") + reader = self.prepare_reader(events, namespace={}) + output = reader.readline() + self.assertEqual(output, "import mymodule.") + + del sys.modules["mymodule"] + # mymodule not imported anymore -> suggest dir2 submodules + events = code_to_events("import mymodule.\t\n") + reader = self.prepare_reader(events, namespace={}) + output = reader.readline() + self.assertEqual(output, "import mymodule.bar") + + def test_already_imported_custom_file_no_suggestions(self): + # Same as before, but mymodule from dir1 has no submodules + # -> propose nothing + with (tempfile.TemporaryDirectory() as _dir1, + tempfile.TemporaryDirectory() as _dir2, + patch.object(sys, "path", [_dir2, _dir1, *sys.path])): + dir1 = pathlib.Path(_dir1) + (dir1 / "mymodule").mkdir() + (dir1 / "mymodule.py").touch() + importlib.import_module("mymodule") + + dir2 = pathlib.Path(_dir2) + (dir2 / "mymodule").mkdir() + (dir2 / "mymodule" / "__init__.py").touch() + (dir2 / "mymodule" / "bar.py").touch() + events = code_to_events("import mymodule.\t\n") + reader = self.prepare_reader(events, namespace={}) + output = reader.readline() + self.assertEqual(output, "import mymodule.") + del sys.modules["mymodule"] + + def test_already_imported_module_without_origin_or_spec(self): + with (tempfile.TemporaryDirectory() as _dir1, + patch.object(sys, "path", [_dir1, *sys.path])): + dir1 = pathlib.Path(_dir1) + for mod in ("no_origin", "not_has_location", "no_spec"): + (dir1 / mod).mkdir() + (dir1 / mod / "__init__.py").touch() + (dir1 / mod / "foo.py").touch() + pkgutil.get_importer(_dir1).invalidate_caches() + module = importlib.import_module(mod) + assert module.__spec__ + if mod == "no_origin": + module.__spec__.origin = None + elif mod == "not_has_location": + module.__spec__.has_location = False + else: + module.__spec__ = None + events = code_to_events(f"import {mod}.\t\n") + reader = self.prepare_reader(events, namespace={}) + output = reader.readline() + self.assertEqual(output, f"import {mod}.") + del sys.modules[mod] + + def test_get_path_and_prefix(self): + cases = ( + ('', ('', '')), + ('.', ('.', '')), + ('..', ('..', '')), + ('.foo', ('.', 'foo')), + ('..foo', ('..', 'foo')), + ('..foo.', ('..foo', '')), + ('..foo.bar', ('..foo', 'bar')), + ('.foo.bar.', ('.foo.bar', '')), + ('..foo.bar.', ('..foo.bar', '')), + ('foo', ('', 'foo')), + ('foo.', ('foo', '')), + ('foo.bar', ('foo', 'bar')), + ('foo.bar.', ('foo.bar', '')), + ('foo.bar.baz', ('foo.bar', 'baz')), + ) + completer = ModuleCompleter() + for name, expected in cases: + with self.subTest(name=name): + self.assertEqual(completer.get_path_and_prefix(name), expected) + + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_parse(self): + cases = ( + ('import ', (None, '')), + ('import foo', (None, 'foo')), + ('import foo,', (None, '')), + ('import foo, ', (None, '')), + ('import foo, bar', (None, 'bar')), + ('import foo, bar, baz', (None, 'baz')), + ('import foo as bar,', (None, '')), + ('import foo as bar, ', (None, '')), + ('import foo as bar, baz', (None, 'baz')), + ('import a.', (None, 'a.')), + ('import a.b', (None, 'a.b')), + ('import a.b.', (None, 'a.b.')), + ('import a.b.c', (None, 'a.b.c')), + ('import a.b.c, foo', (None, 'foo')), + ('import a.b.c, foo.bar', (None, 'foo.bar')), + ('import a.b.c, foo.bar,', (None, '')), + ('import a.b.c, foo.bar, ', (None, '')), + ('from foo', ('foo', None)), + ('from a.', ('a.', None)), + ('from a.b', ('a.b', None)), + ('from a.b.', ('a.b.', None)), + ('from a.b.c', ('a.b.c', None)), + ('from foo import ', ('foo', '')), + ('from foo import a', ('foo', 'a')), + ('from ', ('', None)), + ('from . import a', ('.', 'a')), + ('from .foo import a', ('.foo', 'a')), + ('from ..foo import a', ('..foo', 'a')), + ('from foo import (', ('foo', '')), + ('from foo import ( ', ('foo', '')), + ('from foo import (a', ('foo', 'a')), + ('from foo import (a,', ('foo', '')), + ('from foo import (a, ', ('foo', '')), + ('from foo import (a, c', ('foo', 'c')), + ('from foo import (a as b, c', ('foo', 'c')), + ) + for code, parsed in cases: + parser = ImportParser(code) + actual = parser.parse() + with self.subTest(code=code): + self.assertEqual(actual, parsed) + # The parser should not get tripped up by any + # other preceding statements + _code = f'import xyz\n{code}' + parser = ImportParser(_code) + actual = parser.parse() + with self.subTest(code=_code): + self.assertEqual(actual, parsed) + _code = f'import xyz;{code}' + parser = ImportParser(_code) + actual = parser.parse() + with self.subTest(code=_code): + self.assertEqual(actual, parsed) + + def test_parse_error(self): + cases = ( + '', + 'import foo ', + 'from foo ', + 'import foo. ', + 'import foo.bar ', + 'from foo ', + 'from foo. ', + 'from foo.bar ', + 'from foo import bar ', + 'from foo import (bar ', + 'from foo import bar, baz ', + 'import foo as', + 'import a. as', + 'import a.b as', + 'import a.b. as', + 'import a.b.c as', + 'import (foo', + 'import (', + 'import .foo', + 'import ..foo', + 'import .foo.bar', + 'import foo; x = 1', + 'import foo; 1,', + 'import a.; x = 1', + 'import a.b; x = 1', + 'import a.b.; x = 1', + 'import a.b.c; x = 1', + 'from foo import a as', + 'from foo import a. as', + 'from foo import a.b as', + 'from foo import a.b. as', + 'from foo import a.b.c as', + 'from foo impo', + 'import import', + 'import from', + 'import as', + 'from import', + 'from from', + 'from as', + 'from foo import import', + 'from foo import from', + 'from foo import as', + 'from \\x', # _tokenize SyntaxError -> tokenize TokenError + 'if 1:\n pass\n\tpass', # _tokenize TabError -> tokenize TabError + ) + for code in cases: + parser = ImportParser(code) + actual = parser.parse() + with self.subTest(code=code): + self.assertEqual(actual, None) + + +class TestHardcodedSubmodules(TestCase): + def test_hardcoded_stdlib_submodules_are_importable(self): + for parent_path, submodules in HARDCODED_SUBMODULES.items(): + for module_name in submodules: + path = f"{parent_path}.{module_name}" + with self.subTest(path=path): + # We can't use importlib.util.find_spec here, + # since some hardcoded submodules parents are + # not proper packages + importlib.import_module(path) + + +class TestPasteEvent(TestCase): + def prepare_reader(self, events): + console = FakeConsole(events) + config = ReadlineConfig(readline_completer=None) + reader = ReadlineAlikeReader(console=console, config=config) + return reader + + def test_paste(self): + # fmt: off + code = ( + "def a():\n" + " for x in range(10):\n" + " if x%2:\n" + " print(x)\n" + " else:\n" + " pass\n" + ) + # fmt: on + + events = itertools.chain( + [ + Event(evt="key", data="f3", raw=bytearray(b"\x1bOR")), + ], + code_to_events(code), + [ + Event(evt="key", data="f3", raw=bytearray(b"\x1bOR")), + ], + code_to_events("\n"), + ) + reader = self.prepare_reader(events) + output = multiline_input(reader) + self.assertEqual(output, code) + + def test_paste_mid_newlines(self): + # fmt: off + code = ( + "def f():\n" + " x = y\n" + " \n" + " y = z\n" + ) + # fmt: on + + events = itertools.chain( + [ + Event(evt="key", data="f3", raw=bytearray(b"\x1bOR")), + ], + code_to_events(code), + [ + Event(evt="key", data="f3", raw=bytearray(b"\x1bOR")), + ], + code_to_events("\n"), + ) + reader = self.prepare_reader(events) + output = multiline_input(reader) + self.assertEqual(output, code) + + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_paste_mid_newlines_not_in_paste_mode(self): + # fmt: off + code = ( + "def f():\n" + "x = y\n" + "\n" + "y = z\n\n" + ) + + expected = ( + "def f():\n" + " x = y\n" + " " + ) + # fmt: on + + events = code_to_events(code) + reader = self.prepare_reader(events) + output = multiline_input(reader) + self.assertEqual(output, expected) + + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_paste_not_in_paste_mode(self): + # fmt: off + input_code = ( + "def a():\n" + "for x in range(10):\n" + "if x%2:\n" + "print(x)\n" + "else:\n" + "pass\n\n" + ) + + output_code = ( + "def a():\n" + " for x in range(10):\n" + " if x%2:\n" + " print(x)\n" + " else:" + ) + # fmt: on + + events = code_to_events(input_code) + reader = self.prepare_reader(events) + output = multiline_input(reader) + self.assertEqual(output, output_code) + + def test_bracketed_paste(self): + """Test that bracketed paste using \x1b[200~ and \x1b[201~ works.""" + # fmt: off + input_code = ( + "def a():\n" + " for x in range(10):\n" + "\n" + " if x%2:\n" + " print(x)\n" + "\n" + " else:\n" + " pass\n" + ) + + output_code = ( + "def a():\n" + " for x in range(10):\n" + "\n" + " if x%2:\n" + " print(x)\n" + "\n" + " else:\n" + " pass\n" + ) + # fmt: on + + paste_start = "\x1b[200~" + paste_end = "\x1b[201~" + + events = itertools.chain( + code_to_events(paste_start), + code_to_events(input_code), + code_to_events(paste_end), + code_to_events("\n"), + ) + reader = self.prepare_reader(events) + output = multiline_input(reader) + self.assertEqual(output, output_code) + + def test_bracketed_paste_single_line(self): + input_code = "oneline" + + paste_start = "\x1b[200~" + paste_end = "\x1b[201~" + + events = itertools.chain( + code_to_events(paste_start), + code_to_events(input_code), + code_to_events(paste_end), + code_to_events("\n"), + ) + reader = self.prepare_reader(events) + output = multiline_input(reader) + self.assertEqual(output, input_code) + + +@skipUnless(pty, "requires pty") +class TestDumbTerminal(ReplTestCase): + @unittest.expectedFailureIf(sys.platform in ("darwin", "linux"), "TODO: RUSTPYTHON") + def test_dumb_terminal_exits_cleanly(self): + env = os.environ.copy() + env.pop('PYTHON_BASIC_REPL', None) + # Ignore PYTHONSTARTUP to not pollute the output + # with an unrelated traceback. See GH-137568. + env.pop('PYTHONSTARTUP', None) + env.update({"TERM": "dumb"}) + output, exit_code = self.run_repl("exit()\n", env=env) + self.assertEqual(exit_code, 0) + self.assertIn("warning: can't use pyrepl", output) + self.assertNotIn("Exception", output) + self.assertNotIn("Traceback", output) + + +@skipUnless(pty, "requires pty") +@skipIf((os.environ.get("TERM") or "dumb") == "dumb", "can't use pyrepl in dumb terminal") +class TestMain(ReplTestCase): + def setUp(self): + # Cleanup from PYTHON* variables to isolate from local + # user settings, see #121359. Such variables should be + # added later in test methods to patched os.environ. + super().setUp() + patcher = patch('os.environ', new=make_clean_env()) + self.addCleanup(patcher.stop) + patcher.start() + + @force_not_colorized + def test_exposed_globals_in_repl(self): + pre = "['__builtins__'" + post = "'__loader__', '__name__', '__package__', '__spec__']" + output, exit_code = self.run_repl(["sorted(dir())", "exit()"], skip=True) + self.assertEqual(exit_code, 0) + + # if `__main__` is not a file (impossible with pyrepl) + case1 = f"{pre}, '__doc__', {post}" in output + + # if `__main__` is an uncached .py file (no .pyc) + case2 = f"{pre}, '__doc__', '__file__', {post}" in output + + # if `__main__` is a cached .pyc file and the .py source exists + case3 = f"{pre}, '__cached__', '__doc__', '__file__', {post}" in output + + # if `__main__` is a cached .pyc file but there's no .py source file + case4 = f"{pre}, '__cached__', '__doc__', {post}" in output + + self.assertTrue(case1 or case2 or case3 or case4, output) + + def _assertMatchOK( + self, var: str, expected: str | re.Pattern, actual: str + ) -> None: + if isinstance(expected, re.Pattern): + self.assertTrue( + expected.match(actual), + f"{var}={actual} does not match {expected.pattern}", + ) + else: + self.assertEqual( + actual, + expected, + f"expected {var}={expected}, got {var}={actual}", + ) + + @force_not_colorized + def _run_repl_globals_test(self, expectations, *, as_file=False, as_module=False, pythonstartup=False): + clean_env = make_clean_env() + clean_env["NO_COLOR"] = "1" # force_not_colorized doesn't touch subprocesses + + with tempfile.TemporaryDirectory() as td: + blue = pathlib.Path(td) / "blue" + blue.mkdir() + mod = blue / "calx.py" + mod.write_text("FOO = 42", encoding="utf-8") + startup = blue / "startup.py" + startup.write_text("BAR = 64", encoding="utf-8") + commands = [ + "print(f'^{" + var + "=}')" for var in expectations + ] + ["exit()"] + if pythonstartup: + clean_env["PYTHONSTARTUP"] = str(startup) + if as_file and as_module: + self.fail("as_file and as_module are mutually exclusive") + elif as_file: + output, exit_code = self.run_repl( + commands, + cmdline_args=[str(mod)], + env=clean_env, + skip=True, + ) + elif as_module: + output, exit_code = self.run_repl( + commands, + cmdline_args=["-m", "blue.calx"], + env=clean_env, + cwd=td, + skip=True, + ) + else: + output, exit_code = self.run_repl( + commands, + cmdline_args=[], + env=clean_env, + cwd=td, + skip=True, + ) + + self.assertEqual(exit_code, 0) + for var, expected in expectations.items(): + with self.subTest(var=var, expected=expected): + if m := re.search(rf"\^{var}=(.+?)[\r\n]", output): + self._assertMatchOK(var, expected, actual=m.group(1)) + else: + self.fail(f"{var}= not found in output: {output!r}\n\n{output}") + + self.assertNotIn("Exception", output) + self.assertNotIn("Traceback", output) + + def test_globals_initialized_as_default(self): + expectations = { + "__name__": "'__main__'", + "__package__": "None", + # "__file__" is missing in -i, like in the basic REPL + } + self._run_repl_globals_test(expectations) + + def test_globals_initialized_from_pythonstartup(self): + expectations = { + "BAR": "64", + "__name__": "'__main__'", + "__package__": "None", + # "__file__" is missing in -i, like in the basic REPL + } + self._run_repl_globals_test(expectations, pythonstartup=True) + + def test_inspect_keeps_globals_from_inspected_file(self): + expectations = { + "FOO": "42", + "__name__": "'__main__'", + "__package__": "None", + # "__file__" is missing in -i, like in the basic REPL + } + self._run_repl_globals_test(expectations, as_file=True) + + def test_inspect_keeps_globals_from_inspected_file_with_pythonstartup(self): + expectations = { + "FOO": "42", + "BAR": "64", + "__name__": "'__main__'", + "__package__": "None", + # "__file__" is missing in -i, like in the basic REPL + } + self._run_repl_globals_test(expectations, as_file=True, pythonstartup=True) + + def test_inspect_keeps_globals_from_inspected_module(self): + expectations = { + "FOO": "42", + "__name__": "'__main__'", + "__package__": "'blue'", + "__file__": re.compile(r"^'.*calx.py'$"), + } + self._run_repl_globals_test(expectations, as_module=True) + + def test_inspect_keeps_globals_from_inspected_module_with_pythonstartup(self): + expectations = { + "FOO": "42", + "BAR": "64", + "__name__": "'__main__'", + "__package__": "'blue'", + "__file__": re.compile(r"^'.*calx.py'$"), + } + self._run_repl_globals_test(expectations, as_module=True, pythonstartup=True) + + @force_not_colorized + def test_python_basic_repl(self): + env = os.environ.copy() + pyrepl_commands = "clear\nexit()\n" + env.pop("PYTHON_BASIC_REPL", None) + output, exit_code = self.run_repl(pyrepl_commands, env=env, skip=True) + self.assertEqual(exit_code, 0) + self.assertNotIn("Exception", output) + self.assertNotIn("NameError", output) + self.assertNotIn("Traceback", output) + + basic_commands = "help\nexit()\n" + env["PYTHON_BASIC_REPL"] = "1" + output, exit_code = self.run_repl(basic_commands, env=env) + self.assertEqual(exit_code, 0) + self.assertIn("Type help() for interactive help", output) + self.assertNotIn("Exception", output) + self.assertNotIn("Traceback", output) + + # The site module must not load _pyrepl if PYTHON_BASIC_REPL is set + commands = ("import sys\n" + "print('_pyrepl' in sys.modules)\n" + "exit()\n") + env["PYTHON_BASIC_REPL"] = "1" + output, exit_code = self.run_repl(commands, env=env) + self.assertEqual(exit_code, 0) + self.assertIn("False", output) + self.assertNotIn("True", output) + self.assertNotIn("Exception", output) + self.assertNotIn("Traceback", output) + + @force_not_colorized + def test_no_pyrepl_source_in_exc(self): + # Avoid using _pyrepl/__main__.py in traceback reports + # See https://github.com/python/cpython/issues/129098. + pyrepl_main_file = os.path.join(STDLIB_DIR, "_pyrepl", "__main__.py") + self.assertTrue(os.path.exists(pyrepl_main_file), pyrepl_main_file) + with open(pyrepl_main_file) as fp: + excluded_lines = fp.readlines() + excluded_lines = list(filter(None, map(str.strip, excluded_lines))) + + for filename in ['?', 'unknown-filename', '', '<...>']: + self._test_no_pyrepl_source_in_exc(filename, excluded_lines) + + def _test_no_pyrepl_source_in_exc(self, filename, excluded_lines): + with EnvironmentVarGuard() as env, self.subTest(filename=filename): + env.unset("PYTHON_BASIC_REPL") + commands = (f"eval(compile('spam', {filename!r}, 'eval'))\n" + f"exit()\n") + output, _ = self.run_repl(commands, env=env) + self.assertIn("Traceback (most recent call last)", output) + self.assertIn("NameError: name 'spam' is not defined", output) + for line in excluded_lines: + with self.subTest(line=line): + self.assertNotIn(line, output) + + @force_not_colorized + def test_bad_sys_excepthook_doesnt_crash_pyrepl(self): + env = os.environ.copy() + commands = ("import sys\n" + "sys.excepthook = 1\n" + "1/0\n" + "exit()\n") + + def check(output, exitcode): + self.assertIn("Error in sys.excepthook:", output) + self.assertEqual(output.count("'int' object is not callable"), 1) + self.assertIn("Original exception was:", output) + self.assertIn("division by zero", output) + self.assertEqual(exitcode, 0) + env.pop("PYTHON_BASIC_REPL", None) + output, exit_code = self.run_repl(commands, env=env, skip=True) + check(output, exit_code) + + env["PYTHON_BASIC_REPL"] = "1" + output, exit_code = self.run_repl(commands, env=env) + check(output, exit_code) + + def test_not_wiping_history_file(self): + # skip, if readline module is not available + import_module('readline') + + hfile = tempfile.NamedTemporaryFile(delete=False) + self.addCleanup(unlink, hfile.name) + env = os.environ.copy() + env["PYTHON_HISTORY"] = hfile.name + commands = "123\nspam\nexit()\n" + + env.pop("PYTHON_BASIC_REPL", None) + output, exit_code = self.run_repl(commands, env=env) + self.assertEqual(exit_code, 0) + self.assertIn("123", output) + self.assertIn("spam", output) + self.assertNotEqual(pathlib.Path(hfile.name).stat().st_size, 0) + + hfile.file.truncate() + hfile.close() + + env["PYTHON_BASIC_REPL"] = "1" + output, exit_code = self.run_repl(commands, env=env) + self.assertEqual(exit_code, 0) + self.assertIn("123", output) + self.assertIn("spam", output) + self.assertNotEqual(pathlib.Path(hfile.name).stat().st_size, 0) + + @force_not_colorized + def test_correct_filename_in_syntaxerrors(self): + env = os.environ.copy() + commands = "a b c\nexit()\n" + output, exit_code = self.run_repl(commands, env=env, skip=True) + self.assertIn("SyntaxError: invalid syntax", output) + self.assertIn("", output) + commands = " b\nexit()\n" + output, exit_code = self.run_repl(commands, env=env) + self.assertIn("IndentationError: unexpected indent", output) + self.assertIn("", output) + + @force_not_colorized + def test_proper_tracebacklimit(self): + env = os.environ.copy() + for set_tracebacklimit in [True, False]: + commands = ("import sys\n" + + ("sys.tracebacklimit = 1\n" if set_tracebacklimit else "") + + "def x1(): 1/0\n\n" + "def x2(): x1()\n\n" + "def x3(): x2()\n\n" + "x3()\n" + "exit()\n") + + for basic_repl in [True, False]: + if basic_repl: + env["PYTHON_BASIC_REPL"] = "1" + else: + env.pop("PYTHON_BASIC_REPL", None) + with self.subTest(set_tracebacklimit=set_tracebacklimit, + basic_repl=basic_repl): + output, exit_code = self.run_repl(commands, env=env, skip=True) + self.assertIn("in x1", output) + if set_tracebacklimit: + self.assertNotIn("in x2", output) + self.assertNotIn("in x3", output) + self.assertNotIn("in ", output) + else: + self.assertIn("in x2", output) + self.assertIn("in x3", output) + self.assertIn("in ", output) + + def test_null_byte(self): + output, exit_code = self.run_repl("\x00\nexit()\n") + self.assertEqual(exit_code, 0) + self.assertNotIn("TypeError", output) + + @force_not_colorized + def test_non_string_suggestion_candidates(self): + commands = ("import runpy\n" + "runpy._run_module_code('blech', {0: '', 'bluch': ''}, '')\n" + "exit()\n") + + output, exit_code = self.run_repl(commands) + self.assertEqual(exit_code, 0) + self.assertNotIn("all elements in 'candidates' must be strings", output) + self.assertIn("bluch", output) + + def test_readline_history_file(self): + # skip, if readline module is not available + readline = import_module('readline') + if readline.backend != "editline": + self.skipTest("GNU readline is not affected by this issue") + + with tempfile.NamedTemporaryFile() as hfile: + env = os.environ.copy() + env["PYTHON_HISTORY"] = hfile.name + + env["PYTHON_BASIC_REPL"] = "1" + output, exit_code = self.run_repl("spam \nexit()\n", env=env) + self.assertEqual(exit_code, 0) + self.assertIn("spam ", output) + self.assertNotEqual(pathlib.Path(hfile.name).stat().st_size, 0) + self.assertIn("spam\\040", pathlib.Path(hfile.name).read_text()) + + env.pop("PYTHON_BASIC_REPL", None) + output, exit_code = self.run_repl("exit\n", env=env) + self.assertEqual(exit_code, 0) + self.assertNotIn("\\040", pathlib.Path(hfile.name).read_text()) + + def test_history_survive_crash(self): + env = os.environ.copy() + + with tempfile.NamedTemporaryFile() as hfile: + env["PYTHON_HISTORY"] = hfile.name + + commands = "1\n2\n3\nexit()\n" + output, exit_code = self.run_repl(commands, env=env, skip=True) + self.assertEqual(exit_code, 0) + + # Run until "0xcafe" is printed (as "51966") and then kill the + # process to simulate a crash. Note that the output also includes + # the echoed input commands. + commands = "spam\nimport time\n0xcafe\ntime.sleep(1000)\nquit\n" + output, exit_code = self.run_repl(commands, env=env, + exit_on_output="51966") + self.assertNotEqual(exit_code, 0) + + history = pathlib.Path(hfile.name).read_text() + self.assertIn("2", history) + self.assertIn("exit()", history) + self.assertIn("spam", history) + self.assertIn("import time", history) + # History is written after each command's output is printed to the + # console, so depending on how quickly the process is killed, + # the last command may or may not be written to the history file. + self.assertNotIn("sleep", history) + self.assertNotIn("quit", history) + + def test_keyboard_interrupt_after_isearch(self): + output, exit_code = self.run_repl("\x12\x03exit\n") + self.assertEqual(exit_code, 0) + + def test_prompt_after_help(self): + output, exit_code = self.run_repl(["help", "q", "exit"]) + + # Regex pattern to remove ANSI escape sequences + ansi_escape = re.compile(r"(\x1B(=|>|(\[)[0-?]*[ -\/]*[@-~]))") + cleaned_output = ansi_escape.sub("", output) + self.assertEqual(exit_code, 0) + + # Ensure that we don't see multiple prompts after exiting `help` + # Extra stuff (newline and `exit` rewrites) are necessary + # because of how run_repl works. + self.assertNotIn(">>> \n>>> >>>", cleaned_output) + + @skipUnless(Py_DEBUG, '-X showrefcount requires a Python debug build') + def test_showrefcount(self): + env = os.environ.copy() + env.pop("PYTHON_BASIC_REPL", "") + output, _ = self.run_repl("1\n1+2\nexit()\n", cmdline_args=['-Xshowrefcount'], env=env) + matches = re.findall(r'\[-?\d+ refs, \d+ blocks\]', output) + self.assertEqual(len(matches), 3) + + env["PYTHON_BASIC_REPL"] = "1" + output, _ = self.run_repl("1\n1+2\nexit()\n", cmdline_args=['-Xshowrefcount'], env=env) + matches = re.findall(r'\[-?\d+ refs, \d+ blocks\]', output) + self.assertEqual(len(matches), 3) + + + @force_not_colorized + def test_no_newline(self): + env = os.environ.copy() + env.pop("PYTHON_BASIC_REPL", "") + env["PYTHON_BASIC_REPL"] = "1" + + commands = "print('Something pretty long', end='')\nexit()\n" + expected_output_sequence = "Something pretty long>>> exit()" + + # gh-143394: The basic REPL needs the readline module to turn off + # ECHO terminal attribute. + if readline_module is not None: + basic_output, basic_exit_code = self.run_repl(commands, env=env) + self.assertEqual(basic_exit_code, 0) + self.assertIn(expected_output_sequence, basic_output) + + output, exit_code = self.run_repl(commands) + self.assertEqual(exit_code, 0) + + # Build patterns for escape sequences that don't affect cursor position + # or visual output. Use terminfo to get platform-specific sequences, + # falling back to hard-coded patterns for capabilities not in terminfo. + from _pyrepl.terminfo import TermInfo + ti = TermInfo(os.environ.get("TERM", "")) + + safe_patterns = [] + + # smkx/rmkx - application cursor keys and keypad mode + smkx = ti.get("smkx") + rmkx = ti.get("rmkx") + if smkx: + safe_patterns.append(re.escape(smkx.decode("ascii"))) + if rmkx: + safe_patterns.append(re.escape(rmkx.decode("ascii"))) + if not smkx and not rmkx: + safe_patterns.append(r'\x1b\[\?1[hl]') # application cursor keys + safe_patterns.append(r'\x1b[=>]') # application keypad mode + + # ich1 - insert character (only safe form that inserts exactly 1 char) + ich1 = ti.get("ich1") + if ich1: + safe_patterns.append(re.escape(ich1.decode("ascii")) + r'(?=[ -~])') + else: + safe_patterns.append(r'\x1b\[(?:1)?@(?=[ -~])') + + # civis/cnorm - cursor visibility (may include cursor blinking control) + civis = ti.get("civis") + cnorm = ti.get("cnorm") + if civis: + safe_patterns.append(re.escape(civis.decode("ascii"))) + if cnorm: + safe_patterns.append(re.escape(cnorm.decode("ascii"))) + if not civis and not cnorm: + safe_patterns.append(r'\x1b\[\?25[hl]') # cursor visibility + safe_patterns.append(r'\x1b\[\?12[hl]') # cursor blinking + + # rmam / smam - automatic margins + rmam = ti.get("rmam") + smam = ti.get("smam") + if rmam: + safe_patterns.append(re.escape(rmam.decode("ascii"))) + if smam: + safe_patterns.append(re.escape(smam.decode("ascii"))) + if not rmam and not smam: + safe_patterns.append(r'\x1b\[\?7l') # turn off automatic margins + safe_patterns.append(r'\x1b\[\?7h') # turn on automatic margins + + # Modern extensions not in standard terminfo - always use patterns + safe_patterns.append(r'\x1b\[\?2004[hl]') # bracketed paste mode + safe_patterns.append(r'\x1b\[\?12[hl]') # cursor blinking (may be separate) + safe_patterns.append(r'\x1b\[\?[01]c') # device attributes + + safe_escapes = re.compile('|'.join(safe_patterns)) + cleaned_output = safe_escapes.sub('', output) + self.assertIn(expected_output_sequence, cleaned_output) + + +@skipUnless(sys.platform == "darwin", "macOS only") +class TestMainAppleTerminal(TestMain): + """Test the REPL with Apple Terminal's TERM_PROGRAM set.""" + + def run_repl(self, repl_input, env=None, **kwargs): + if env is None: + env = os.environ.copy() + env["TERM_PROGRAM"] = "Apple_Terminal" + return super().run_repl(repl_input, env=env, **kwargs) + + +class TestPyReplCtrlD(TestCase): + """Test Ctrl+D behavior in _pyrepl to match old pre-3.13 REPL behavior. + + Ctrl+D should: + - Exit on empty buffer (raises EOFError) + - Delete character when cursor is in middle of line + - Perform no operation when cursor is at end of line without newline + - Exit multiline mode when cursor is at end with trailing newline + - Run code up to that point when pressed on blank line with preceding lines + """ + def prepare_reader(self, events): + console = FakeConsole(events) + config = ReadlineConfig(readline_completer=None) + reader = ReadlineAlikeReader(console=console, config=config) + return reader + + def test_ctrl_d_empty_line(self): + """Test that pressing Ctrl+D on empty line exits the program""" + events = [ + Event(evt="key", data="\x04", raw=bytearray(b"\x04")), # Ctrl+D + ] + reader = self.prepare_reader(events) + with self.assertRaises(EOFError): + multiline_input(reader) + + def test_ctrl_d_multiline_with_new_line(self): + """Test that pressing Ctrl+D in multiline mode with trailing newline exits multiline mode""" + events = itertools.chain( + code_to_events("def f():\n pass\n"), # Enter multiline mode with trailing newline + [ + Event(evt="key", data="\x04", raw=bytearray(b"\x04")), # Ctrl+D + ], + ) + reader, _ = handle_all_events(events) + self.assertTrue(reader.finished) + self.assertEqual("def f():\n pass\n", "".join(reader.buffer)) + + def test_ctrl_d_multiline_middle_of_line(self): + """Test that pressing Ctrl+D in multiline mode with cursor in middle deletes character""" + events = itertools.chain( + code_to_events("def f():\n hello world"), # Enter multiline mode + [ + Event(evt="key", data="left", raw=bytearray(b"\x1bOD")) + ] * 5, # move cursor to 'w' in "world" + [ + Event(evt="key", data="\x04", raw=bytearray(b"\x04")) + ], # Ctrl+D should delete 'w' + ) + reader, _ = handle_all_events(events) + self.assertFalse(reader.finished) + self.assertEqual("def f():\n hello orld", "".join(reader.buffer)) + + def test_ctrl_d_multiline_end_of_line_no_newline(self): + """Test that pressing Ctrl+D at end of line without newline performs no operation""" + events = itertools.chain( + code_to_events("def f():\n hello"), # Enter multiline mode, no trailing newline + [ + Event(evt="key", data="\x04", raw=bytearray(b"\x04")) + ], # Ctrl+D should be no-op + ) + reader, _ = handle_all_events(events) + self.assertFalse(reader.finished) + self.assertEqual("def f():\n hello", "".join(reader.buffer)) + + def test_ctrl_d_single_line_middle_of_line(self): + """Test that pressing Ctrl+D in single line mode deletes current character""" + events = itertools.chain( + code_to_events("hello"), + [Event(evt="key", data="left", raw=bytearray(b"\x1bOD"))], # move left + [Event(evt="key", data="\x04", raw=bytearray(b"\x04"))], # Ctrl+D + ) + reader, _ = handle_all_events(events) + self.assertEqual("hell", "".join(reader.buffer)) + + def test_ctrl_d_single_line_end_no_newline(self): + """Test that pressing Ctrl+D at end of single line without newline does nothing""" + events = itertools.chain( + code_to_events("hello"), # cursor at end of line + [Event(evt="key", data="\x04", raw=bytearray(b"\x04"))], # Ctrl+D + ) + reader, _ = handle_all_events(events) + self.assertEqual("hello", "".join(reader.buffer)) + + +@skipUnless(sys.platform == "win32", "windows console only") +class TestWindowsConsoleEolWrap(TestCase): + def _make_mock_console(self, width=80): + from _pyrepl import windows_console as wc + + console = object.__new__(wc.WindowsConsole) + + console.width = width + console.posxy = (0, 0) + console.screen = [""] + + console._hide_cursor = Mock() + console._show_cursor = Mock() + console._erase_to_end = Mock() + console._move_relative = Mock() + console.move_cursor = Mock() + console._WindowsConsole__write = Mock() + + return console, wc + + def test_short_line_sets_posxy_normally(self): + width = 10 + y = 3 + console, wc = self._make_mock_console(width=width) + old_line = "" + new_line = "a" * 3 + wc.WindowsConsole._WindowsConsole__write_changed_line( + console, y, old_line, new_line, 0 + ) + self.assertEqual(console.posxy, (3, y)) + + def test_exact_width_line_does_not_wrap(self): + width = 10 + y = 3 + console, wc = self._make_mock_console(width=width) + old_line = "" + new_line = "a" * width + + wc.WindowsConsole._WindowsConsole__write_changed_line( + console, y, old_line, new_line, 0 + ) + self.assertEqual(console.posxy, (width - 1, y)) diff --git a/Lib/test/test_pyrepl/test_reader.py b/Lib/test/test_pyrepl/test_reader.py new file mode 100644 index 000000000..33ef95acc --- /dev/null +++ b/Lib/test/test_pyrepl/test_reader.py @@ -0,0 +1,565 @@ +import itertools +import functools +import rlcompleter +from textwrap import dedent +from unittest import TestCase +from unittest.mock import MagicMock +from test.support import force_colorized_test_class, force_not_colorized_test_class + +from .support import handle_all_events, handle_events_narrow_console +from .support import ScreenEqualMixin, code_to_events +from .support import prepare_reader, prepare_console +from _pyrepl.console import Event +from _pyrepl.reader import Reader +from _colorize import default_theme + +import unittest # XXX: RUSTPYTHON; importing to be able to skip tests + + +overrides = {"reset": "z", "soft_keyword": "K"} +colors = {overrides.get(k, k[0].lower()): v for k, v in default_theme.syntax.items()} + + +@force_not_colorized_test_class +class TestReader(ScreenEqualMixin, TestCase): + def test_calc_screen_wrap_simple(self): + events = code_to_events(10 * "a") + reader, _ = handle_events_narrow_console(events) + self.assert_screen_equal(reader, f"{9*"a"}\\\na") + + def test_calc_screen_wrap_wide_characters(self): + events = code_to_events(8 * "a" + "樂") + reader, _ = handle_events_narrow_console(events) + self.assert_screen_equal(reader, f"{8*"a"}\\\n樂") + + def test_calc_screen_wrap_three_lines(self): + events = code_to_events(20 * "a") + reader, _ = handle_events_narrow_console(events) + self.assert_screen_equal(reader, f"{9*"a"}\\\n{9*"a"}\\\naa") + + def test_calc_screen_prompt_handling(self): + def prepare_reader_keep_prompts(*args, **kwargs): + reader = prepare_reader(*args, **kwargs) + del reader.get_prompt + reader.ps1 = ">>> " + reader.ps2 = ">>> " + reader.ps3 = "... " + reader.ps4 = "" + reader.can_colorize = False + reader.paste_mode = False + return reader + + events = code_to_events("if some_condition:\nsome_function()") + reader, _ = handle_events_narrow_console( + events, + prepare_reader=prepare_reader_keep_prompts, + ) + # fmt: off + self.assert_screen_equal( + reader, + ( + ">>> if so\\\n" + "me_condit\\\n" + "ion:\n" + "... s\\\n" + "ome_funct\\\n" + "ion()" + ) + ) + # fmt: on + + def test_calc_screen_wrap_three_lines_mixed_character(self): + # fmt: off + code = ( + "def f():\n" + f" {8*"a"}\n" + f" {5*"樂"}" + ) + # fmt: on + + events = code_to_events(code) + reader, _ = handle_events_narrow_console(events) + + # fmt: off + self.assert_screen_equal( + reader, + ( + "def f():\n" + f" {7*"a"}\\\n" + "a\n" + f" {3*"樂"}\\\n" + "樂樂" + ), + clean=True, + ) + # fmt: on + + def test_calc_screen_backspace(self): + events = itertools.chain( + code_to_events("aaa"), + [ + Event(evt="key", data="backspace", raw=bytearray(b"\x7f")), + ], + ) + reader, _ = handle_all_events(events) + self.assert_screen_equal(reader, "aa") + + def test_calc_screen_wrap_removes_after_backspace(self): + events = itertools.chain( + code_to_events(10 * "a"), + [ + Event(evt="key", data="backspace", raw=bytearray(b"\x7f")), + ], + ) + reader, _ = handle_events_narrow_console(events) + self.assert_screen_equal(reader, 9 * "a") + + def test_calc_screen_backspace_in_second_line_after_wrap(self): + events = itertools.chain( + code_to_events(11 * "a"), + [ + Event(evt="key", data="backspace", raw=bytearray(b"\x7f")), + ], + ) + reader, _ = handle_events_narrow_console(events) + self.assert_screen_equal(reader, f"{9*"a"}\\\na") + + def test_setpos_for_xy_simple(self): + events = code_to_events("11+11") + reader, _ = handle_all_events(events) + reader.setpos_from_xy(0, 0) + self.assertEqual(reader.pos, 0) + + def test_setpos_from_xy_multiple_lines(self): + # fmt: off + code = ( + "def foo():\n" + " return 1" + ) + # fmt: on + + events = code_to_events(code) + reader, _ = handle_all_events(events) + reader.setpos_from_xy(2, 1) + self.assertEqual(reader.pos, 13) + + def test_setpos_from_xy_after_wrap(self): + # fmt: off + code = ( + "def foo():\n" + " hello" + ) + # fmt: on + + events = code_to_events(code) + reader, _ = handle_events_narrow_console(events) + reader.setpos_from_xy(2, 2) + self.assertEqual(reader.pos, 13) + + def test_setpos_fromxy_in_wrapped_line(self): + # fmt: off + code = ( + "def foo():\n" + " hello" + ) + # fmt: on + + events = code_to_events(code) + reader, _ = handle_events_narrow_console(events) + reader.setpos_from_xy(0, 1) + self.assertEqual(reader.pos, 9) + + def test_up_arrow_after_ctrl_r(self): + events = iter( + [ + Event(evt="key", data="\x12", raw=bytearray(b"\x12")), + Event(evt="key", data="up", raw=bytearray(b"\x1bOA")), + ] + ) + + reader, _ = handle_all_events(events) + self.assert_screen_equal(reader, "") + + @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: Lists differ + def test_newline_within_block_trailing_whitespace(self): + # fmt: off + code = ( + "def foo():\n" + "a = 1\n" + ) + # fmt: on + + events = itertools.chain( + code_to_events(code), + [ + # go to the end of the first line + Event(evt="key", data="up", raw=bytearray(b"\x1bOA")), + Event(evt="key", data="up", raw=bytearray(b"\x1bOA")), + Event(evt="key", data="\x05", raw=bytearray(b"\x1bO5")), + # new lines in-block shouldn't terminate the block + Event(evt="key", data="\n", raw=bytearray(b"\n")), + Event(evt="key", data="\n", raw=bytearray(b"\n")), + # end of line 2 + Event(evt="key", data="down", raw=bytearray(b"\x1bOB")), + Event(evt="key", data="\x05", raw=bytearray(b"\x1bO5")), + # a double new line in-block should terminate the block + # even if its followed by whitespace + Event(evt="key", data="\n", raw=bytearray(b"\n")), + Event(evt="key", data="\n", raw=bytearray(b"\n")), + ], + ) + + no_paste_reader = functools.partial(prepare_reader, paste_mode=False) + reader, _ = handle_all_events(events, prepare_reader=no_paste_reader) + + expected = ( + "def foo():\n" + " \n" + " \n" + " a = 1\n" + " \n" + " " # HistoricalReader will trim trailing whitespace + ) + self.assert_screen_equal(reader, expected, clean=True) + self.assertTrue(reader.finished) + + def test_input_hook_is_called_if_set(self): + input_hook = MagicMock() + + def _prepare_console(events): + console = MagicMock() + console.get_event.side_effect = events + console.height = 100 + console.width = 80 + console.getheightwidth = MagicMock(side_effect=lambda: (console.height, console.width)) + console.input_hook = input_hook + return console + + events = code_to_events("a") + reader, _ = handle_all_events(events, prepare_console=_prepare_console) + + self.assertEqual(len(input_hook.mock_calls), 4) + + def test_keyboard_interrupt_clears_screen(self): + namespace = {"itertools": itertools} + code = "import itertools\nitertools." + events = itertools.chain( + code_to_events(code), + [ + # Two tabs for completion + Event(evt="key", data="\t", raw=bytearray(b"\t")), + Event(evt="key", data="\t", raw=bytearray(b"\t")), + Event(evt="key", data="\x03", raw=bytearray(b"\x03")), # Ctrl-C + ], + ) + console = prepare_console(events) + reader = prepare_reader( + console, + readline_completer=rlcompleter.Completer(namespace).complete, + ) + try: + # we're not using handle_all_events() here to be able to + # follow the KeyboardInterrupt sequence of events. Normally this + # happens in simple_interact.run_multiline_interactive_console. + while True: + reader.handle1() + except KeyboardInterrupt: + # at this point the completions are still visible + self.assertTrue(len(reader.screen) > 2) + reader.refresh() + # after the refresh, they are gone + self.assertEqual(len(reader.screen), 2) + self.assert_screen_equal(reader, code, clean=True) + else: + self.fail("KeyboardInterrupt not raised.") + + def test_prompt_length(self): + # Handles simple ASCII prompt + ps1 = ">>> " + prompt, l = Reader.process_prompt(ps1) + self.assertEqual(prompt, ps1) + self.assertEqual(l, 4) + + # Handles ANSI escape sequences + ps1 = "\033[0;32m>>> \033[0m" + prompt, l = Reader.process_prompt(ps1) + self.assertEqual(prompt, "\033[0;32m>>> \033[0m") + self.assertEqual(l, 4) + + # Handles ANSI escape sequences bracketed in \001 .. \002 + ps1 = "\001\033[0;32m\002>>> \001\033[0m\002" + prompt, l = Reader.process_prompt(ps1) + self.assertEqual(prompt, "\033[0;32m>>> \033[0m") + self.assertEqual(l, 4) + + # Handles wide characters in prompt + ps1 = "樂>> " + prompt, l = Reader.process_prompt(ps1) + self.assertEqual(prompt, ps1) + self.assertEqual(l, 5) + + # Handles wide characters AND ANSI sequences together + ps1 = "\001\033[0;32m\002樂>\001\033[0m\002> " + prompt, l = Reader.process_prompt(ps1) + self.assertEqual(prompt, "\033[0;32m樂>\033[0m> ") + self.assertEqual(l, 5) + + def test_completions_updated_on_key_press(self): + namespace = {"itertools": itertools} + code = "itertools." + events = itertools.chain( + code_to_events(code), + [ + # Two tabs for completion + Event(evt="key", data="\t", raw=bytearray(b"\t")), + Event(evt="key", data="\t", raw=bytearray(b"\t")), + ], + code_to_events("a"), + ) + + completing_reader = functools.partial( + prepare_reader, + readline_completer=rlcompleter.Completer(namespace).complete, + ) + reader, _ = handle_all_events(events, prepare_reader=completing_reader) + + actual = reader.screen + self.assertEqual(len(actual), 2) + self.assertEqual(actual[0], f"{code}a") + self.assertEqual(actual[1].rstrip(), "itertools.accumulate(") + + def test_key_press_on_tab_press_once(self): + namespace = {"itertools": itertools} + code = "itertools." + events = itertools.chain( + code_to_events(code), + [ + Event(evt="key", data="\t", raw=bytearray(b"\t")), + ], + code_to_events("a"), + ) + + completing_reader = functools.partial( + prepare_reader, + readline_completer=rlcompleter.Completer(namespace).complete, + ) + reader, _ = handle_all_events(events, prepare_reader=completing_reader) + + self.assert_screen_equal(reader, f"{code}a") + + def test_pos2xy_with_no_columns(self): + console = prepare_console([]) + reader = prepare_reader(console) + # Simulate a resize to 0 columns + reader.screeninfo = [] + self.assertEqual(reader.pos2xy(), (0, 0)) + + def test_setpos_from_xy_for_non_printing_char(self): + code = "# non \u200c printing character" + events = code_to_events(code) + + reader, _ = handle_all_events(events) + reader.setpos_from_xy(8, 0) + self.assertEqual(reader.pos, 7) + +@force_colorized_test_class +class TestReaderInColor(ScreenEqualMixin, TestCase): + def test_syntax_highlighting_basic(self): + code = dedent( + """\ + import re, sys + def funct(case: str = sys.platform) -> None: + match = re.search( + "(me)", + ''' + Come on + Come on now + You know that it's time to emerge + ''', + ) + match case: + case "emscripten": print("on the web") + case "ios" | "android": + print("on the phone") + case _: print('arms around', match.group(1)) + type type = type[type] + """ + ) + expected = dedent( + """\ + {k}import{z} re{o},{z} sys + {a}{k}def{z} {d}funct{z}{o}({z}case{o}:{z} {b}str{z} {o}={z} sys{o}.{z}platform{o}){z} {o}->{z} {k}None{z}{o}:{z} + match {o}={z} re{o}.{z}search{o}({z} + {s}"(me)"{z}{o},{z} + {s}'''{z} + {s} Come on{z} + {s} Come on now{z} + {s} You know that it's time to emerge{z} + {s} '''{z}{o},{z} + {o}){z} + {K}match{z} case{o}:{z} + {K}case{z} {s}"emscripten"{z}{o}:{z} {b}print{z}{o}({z}{s}"on the web"{z}{o}){z} + {K}case{z} {s}"ios"{z} {o}|{z} {s}"android"{z}{o}:{z} + {b}print{z}{o}({z}{s}"on the phone"{z}{o}){z} + {K}case{z} {K}_{z}{o}:{z} {b}print{z}{o}({z}{s}'arms around'{z}{o},{z} match{o}.{z}group{o}({z}{n}1{z}{o}){z}{o}){z} + {K}type{z} {b}type{z} {o}={z} {b}type{z}{o}[{z}{b}type{z}{o}]{z} + """ + ) + expected_sync = expected.format(a="", **colors) + events = code_to_events(code) + reader, _ = handle_all_events(events) + self.assert_screen_equal(reader, code, clean=True) + self.assert_screen_equal(reader, expected_sync) + self.assertEqual(reader.pos, 419) + self.assertEqual(reader.cxy, (0, 16)) + + async_msg = "{k}async{z} ".format(**colors) + expected_async = expected.format(a=async_msg, **colors) + more_events = itertools.chain( + code_to_events(code), + [Event(evt="key", data="up", raw=bytearray(b"\x1bOA"))] * 15, + code_to_events("async "), + ) + reader, _ = handle_all_events(more_events) + self.assert_screen_equal(reader, expected_async) + self.assertEqual(reader.pos, 21) + self.assertEqual(reader.cxy, (6, 1)) + + def test_syntax_highlighting_incomplete_string_first_line(self): + code = dedent( + """\ + def unfinished_function(arg: str = "still typing + """ + ) + expected = dedent( + """\ + {k}def{z} {d}unfinished_function{z}{o}({z}arg{o}:{z} {b}str{z} {o}={z} {s}"still typing{z} + """ + ).format(**colors) + events = code_to_events(code) + reader, _ = handle_all_events(events) + self.assert_screen_equal(reader, code, clean=True) + self.assert_screen_equal(reader, expected) + + def test_syntax_highlighting_incomplete_string_another_line(self): + code = dedent( + """\ + def unfinished_function( + arg: str = "still typing + """ + ) + expected = dedent( + """\ + {k}def{z} {d}unfinished_function{z}{o}({z} + arg{o}:{z} {b}str{z} {o}={z} {s}"still typing{z} + """ + ).format(**colors) + events = code_to_events(code) + reader, _ = handle_all_events(events) + self.assert_screen_equal(reader, code, clean=True) + self.assert_screen_equal(reader, expected) + + def test_syntax_highlighting_incomplete_multiline_string(self): + code = dedent( + """\ + def unfinished_function(): + '''Still writing + the docstring + """ + ) + expected = dedent( + """\ + {k}def{z} {d}unfinished_function{z}{o}({z}{o}){z}{o}:{z} + {s}'''Still writing{z} + {s} the docstring{z} + """ + ).format(**colors) + events = code_to_events(code) + reader, _ = handle_all_events(events) + self.assert_screen_equal(reader, code, clean=True) + self.assert_screen_equal(reader, expected) + + def test_syntax_highlighting_incomplete_fstring(self): + code = dedent( + """\ + def unfinished_function(): + var = f"Single-quote but { + 1 + + + 1 + } multi-line! + """ + ) + expected = dedent( + """\ + {k}def{z} {d}unfinished_function{z}{o}({z}{o}){z}{o}:{z} + var {o}={z} {s}f"{z}{s}Single-quote but {z}{o}{OB}{z} + {n}1{z} + {o}+{z} + {n}1{z} + {o}{CB}{z}{s} multi-line!{z} + """ + ).format(OB="{", CB="}", **colors) + events = code_to_events(code) + reader, _ = handle_all_events(events) + self.assert_screen_equal(reader, code, clean=True) + self.assert_screen_equal(reader, expected) + + def test_syntax_highlighting_indentation_error(self): + code = dedent( + """\ + def unfinished_function(): + var = 1 + oops + """ + ) + expected = dedent( + """\ + {k}def{z} {d}unfinished_function{z}{o}({z}{o}){z}{o}:{z} + var {o}={z} {n}1{z} + oops + """ + ).format(**colors) + events = code_to_events(code) + reader, _ = handle_all_events(events) + self.assert_screen_equal(reader, code, clean=True) + self.assert_screen_equal(reader, expected) + + @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: Lists differ + def test_syntax_highlighting_literal_brace_in_fstring_or_tstring(self): + code = dedent( + """\ + f"{{" + f"}}" + f"a{{b" + f"a}}b" + f"a{{b}}c" + t"a{{b}}c" + f"{{{0}}}" + f"{ {0} }" + """ + ) + expected = dedent( + """\ + {s}f"{z}{s}<<{z}{s}"{z} + {s}f"{z}{s}>>{z}{s}"{z} + {s}f"{z}{s}a<<{z}{s}b{z}{s}"{z} + {s}f"{z}{s}a>>{z}{s}b{z}{s}"{z} + {s}f"{z}{s}a<<{z}{s}b>>{z}{s}c{z}{s}"{z} + {s}t"{z}{s}a<<{z}{s}b>>{z}{s}c{z}{s}"{z} + {s}f"{z}{s}<<{z}{o}<{z}{n}0{z}{o}>{z}{s}>>{z}{s}"{z} + {s}f"{z}{o}<{z} {o}<{z}{n}0{z}{o}>{z} {o}>{z}{s}"{z} + """ + ).format(**colors).replace("<", "{").replace(">", "}") + events = code_to_events(code) + reader, _ = handle_all_events(events) + self.assert_screen_equal(reader, code, clean=True) + self.maxDiff=None + self.assert_screen_equal(reader, expected) + + def test_control_characters(self): + code = 'flag = "🏳️‍🌈"' + events = code_to_events(code) + reader, _ = handle_all_events(events) + self.assert_screen_equal(reader, 'flag = "🏳️\\u200d🌈"', clean=True) + self.assert_screen_equal(reader, 'flag {o}={z} {s}"🏳️\\u200d🌈"{z}'.format(**colors)) diff --git a/Lib/test/test_pyrepl/test_terminfo.py b/Lib/test/test_pyrepl/test_terminfo.py new file mode 100644 index 000000000..562cf5c90 --- /dev/null +++ b/Lib/test/test_pyrepl/test_terminfo.py @@ -0,0 +1,651 @@ +"""Tests comparing PyREPL's pure Python curses implementation with the standard curses module.""" + +import json +import os +import subprocess +import sys +import unittest +from test.support import requires, has_subprocess_support +from textwrap import dedent + +# Only run these tests if curses is available +requires("curses") + +try: + import _curses +except ImportError: + try: + import curses as _curses + except ImportError: + _curses = None + +from _pyrepl import terminfo + + +ABSENT_STRING = terminfo.ABSENT_STRING +CANCELLED_STRING = terminfo.CANCELLED_STRING + + +class TestCursesCompatibility(unittest.TestCase): + """Test that PyREPL's curses implementation matches the standard curses behavior. + + Python's `curses` doesn't allow calling `setupterm()` again with a different + $TERM in the same process, so we subprocess all `curses` tests to get correctly + set up terminfo.""" + + @classmethod + def setUpClass(cls): + if _curses is None: + raise unittest.SkipTest( + "`curses` capability provided to regrtest but `_curses` not importable" + ) + + if not has_subprocess_support: + raise unittest.SkipTest("test module requires subprocess") + + # we need to ensure there's a terminfo database on the system and that + # `infocmp` works + cls.infocmp("dumb") + + def setUp(self): + self.original_term = os.environ.get("TERM", None) + + def tearDown(self): + if self.original_term is not None: + os.environ["TERM"] = self.original_term + elif "TERM" in os.environ: + del os.environ["TERM"] + + @classmethod + def infocmp(cls, term) -> list[str]: + all_caps = [] + try: + result = subprocess.run( + ["infocmp", "-l1", term], + capture_output=True, + text=True, + check=True, + ) + except Exception: + raise unittest.SkipTest("calling `infocmp` failed on the system") + + for line in result.stdout.splitlines(): + line = line.strip() + if line.startswith("#"): + if "terminfo" not in line and "termcap" in line: + # PyREPL terminfo doesn't parse termcap databases + raise unittest.SkipTest( + "curses using termcap.db: no terminfo database on" + " the system" + ) + elif "=" in line: + cap_name = line.split("=")[0] + all_caps.append(cap_name) + + return all_caps + + def test_setupterm_basic(self): + """Test basic setupterm functionality.""" + # Test with explicit terminal type + test_terms = ["xterm", "xterm-256color", "vt100", "ansi"] + + for term in test_terms: + with self.subTest(term=term): + ncurses_code = dedent( + f""" + import _curses + import json + try: + _curses.setupterm({repr(term)}, 1) + print(json.dumps({{"success": True}})) + except Exception as e: + print(json.dumps({{"success": False, "error": str(e)}})) + """ + ) + + result = subprocess.run( + [sys.executable, "-c", ncurses_code], + capture_output=True, + text=True, + ) + ncurses_data = json.loads(result.stdout) + std_success = ncurses_data["success"] + + # Set up with PyREPL curses + try: + terminfo.TermInfo(term, fallback=False) + pyrepl_success = True + except Exception as e: + pyrepl_success = False + pyrepl_error = e + + # Both should succeed or both should fail + if std_success: + self.assertTrue( + pyrepl_success, + f"Standard curses succeeded but PyREPL failed for {term}", + ) + else: + # If standard curses failed, PyREPL might still succeed with fallback + # This is acceptable as PyREPL has hardcoded fallbacks + pass + + def test_setupterm_none(self): + """Test setupterm with None (uses TERM from environment).""" + # Test with current TERM + ncurses_code = dedent( + """ + import _curses + import json + try: + _curses.setupterm(None, 1) + print(json.dumps({"success": True})) + except Exception as e: + print(json.dumps({"success": False, "error": str(e)})) + """ + ) + + result = subprocess.run( + [sys.executable, "-c", ncurses_code], + capture_output=True, + text=True, + ) + ncurses_data = json.loads(result.stdout) + std_success = ncurses_data["success"] + + try: + terminfo.TermInfo(None, fallback=False) + pyrepl_success = True + except Exception: + pyrepl_success = False + + # Both should have same result + if std_success: + self.assertTrue( + pyrepl_success, + "Standard curses succeeded but PyREPL failed for None", + ) + + def test_tigetstr_common_capabilities(self): + """Test tigetstr for common terminal capabilities.""" + # Test with a known terminal type + term = "xterm" + + # Get ALL capabilities from infocmp + all_caps = self.infocmp(term) + + ncurses_code = dedent( + f""" + import _curses + import json + _curses.setupterm({repr(term)}, 1) + results = {{}} + for cap in {repr(all_caps)}: + try: + val = _curses.tigetstr(cap) + if val is None: + results[cap] = None + elif val == -1: + results[cap] = -1 + else: + results[cap] = list(val) + except BaseException: + results[cap] = "error" + print(json.dumps(results)) + """ + ) + + result = subprocess.run( + [sys.executable, "-c", ncurses_code], + capture_output=True, + text=True, + ) + self.assertEqual( + result.returncode, 0, f"Failed to run ncurses: {result.stderr}" + ) + + ncurses_data = json.loads(result.stdout) + + ti = terminfo.TermInfo(term, fallback=False) + + # Test every single capability + for cap in all_caps: + if cap not in ncurses_data or ncurses_data[cap] == "error": + continue + + with self.subTest(capability=cap): + ncurses_val = ncurses_data[cap] + if isinstance(ncurses_val, list): + ncurses_val = bytes(ncurses_val) + + pyrepl_val = ti.get(cap) + + self.assertEqual( + pyrepl_val, + ncurses_val, + f"Capability {cap}: ncurses={repr(ncurses_val)}, " + f"pyrepl={repr(pyrepl_val)}", + ) + + def test_tigetstr_input_types(self): + """Test tigetstr with different input types.""" + term = "xterm" + cap = "cup" + + # Test standard curses behavior with string in subprocess + ncurses_code = dedent( + f""" + import _curses + import json + _curses.setupterm({repr(term)}, 1) + + # Test with string input + try: + std_str_result = _curses.tigetstr({repr(cap)}) + std_accepts_str = True + if std_str_result is None: + std_str_val = None + elif std_str_result == -1: + std_str_val = -1 + else: + std_str_val = list(std_str_result) + except TypeError: + std_accepts_str = False + std_str_val = None + + print(json.dumps({{ + "accepts_str": std_accepts_str, + "str_result": std_str_val + }})) + """ + ) + + result = subprocess.run( + [sys.executable, "-c", ncurses_code], + capture_output=True, + text=True, + ) + ncurses_data = json.loads(result.stdout) + + # PyREPL setup + ti = terminfo.TermInfo(term, fallback=False) + + # PyREPL behavior with string + try: + pyrepl_str_result = ti.get(cap) + pyrepl_accepts_str = True + except TypeError: + pyrepl_accepts_str = False + + # PyREPL should also only accept strings for compatibility + with self.assertRaises(TypeError): + ti.get(cap.encode("ascii")) + + # Both should accept string input + self.assertEqual( + pyrepl_accepts_str, + ncurses_data["accepts_str"], + "PyREPL and standard curses should have same string handling", + ) + self.assertTrue( + pyrepl_accepts_str, "PyREPL should accept string input" + ) + + def test_tparm_basic(self): + """Test basic tparm functionality.""" + term = "xterm" + ti = terminfo.TermInfo(term, fallback=False) + + # Test cursor positioning (cup) + cup = ti.get("cup") + if cup and cup not in {ABSENT_STRING, CANCELLED_STRING}: + # Test various parameter combinations + test_cases = [ + (0, 0), # Top-left + (5, 10), # Arbitrary position + (23, 79), # Bottom-right of standard terminal + (999, 999), # Large values + ] + + # Get ncurses results in subprocess + ncurses_code = dedent( + f""" + import _curses + import json + _curses.setupterm({repr(term)}, 1) + + # Get cup capability + cup = _curses.tigetstr('cup') + results = {{}} + + for row, col in {repr(test_cases)}: + try: + result = _curses.tparm(cup, row, col) + results[f"{{row}},{{col}}"] = list(result) + except Exception as e: + results[f"{{row}},{{col}}"] = {{"error": str(e)}} + + print(json.dumps(results)) + """ + ) + + result = subprocess.run( + [sys.executable, "-c", ncurses_code], + capture_output=True, + text=True, + ) + self.assertEqual( + result.returncode, 0, f"Failed to run ncurses: {result.stderr}" + ) + ncurses_data = json.loads(result.stdout) + + for row, col in test_cases: + with self.subTest(row=row, col=col): + # Standard curses tparm from subprocess + key = f"{row},{col}" + if ( + isinstance(ncurses_data[key], dict) + and "error" in ncurses_data[key] + ): + self.fail( + f"ncurses tparm failed: {ncurses_data[key]['error']}" + ) + std_result = bytes(ncurses_data[key]) + + # PyREPL curses tparm + pyrepl_result = terminfo.tparm(cup, row, col) + + # Results should be identical + self.assertEqual( + pyrepl_result, + std_result, + f"tparm(cup, {row}, {col}): " + f"std={repr(std_result)}, pyrepl={repr(pyrepl_result)}", + ) + else: + raise unittest.SkipTest( + "test_tparm_basic() requires the `cup` capability" + ) + + def test_tparm_multiple_params(self): + """Test tparm with capabilities using multiple parameters.""" + term = "xterm" + ti = terminfo.TermInfo(term, fallback=False) + + # Test capabilities that take parameters + param_caps = { + "cub": 1, # cursor_left with count + "cuf": 1, # cursor_right with count + "cuu": 1, # cursor_up with count + "cud": 1, # cursor_down with count + "dch": 1, # delete_character with count + "ich": 1, # insert_character with count + } + + # Get all capabilities from PyREPL first + pyrepl_caps = {} + for cap in param_caps: + cap_value = ti.get(cap) + if cap_value and cap_value not in { + ABSENT_STRING, + CANCELLED_STRING, + }: + pyrepl_caps[cap] = cap_value + + if not pyrepl_caps: + self.skipTest("No parametrized capabilities found") + + # Get ncurses results in subprocess + ncurses_code = dedent( + f""" + import _curses + import json + _curses.setupterm({repr(term)}, 1) + + param_caps = {repr(param_caps)} + test_values = [1, 5, 10, 99] + results = {{}} + + for cap in param_caps: + cap_value = _curses.tigetstr(cap) + if cap_value and cap_value != -1: + for value in test_values: + try: + result = _curses.tparm(cap_value, value) + results[f"{{cap}},{{value}}"] = list(result) + except Exception as e: + results[f"{{cap}},{{value}}"] = {{"error": str(e)}} + + print(json.dumps(results)) + """ + ) + + result = subprocess.run( + [sys.executable, "-c", ncurses_code], + capture_output=True, + text=True, + ) + self.assertEqual( + result.returncode, 0, f"Failed to run ncurses: {result.stderr}" + ) + ncurses_data = json.loads(result.stdout) + + for cap, cap_value in pyrepl_caps.items(): + with self.subTest(capability=cap): + # Test with different parameter values + for value in [1, 5, 10, 99]: + key = f"{cap},{value}" + if key in ncurses_data: + if ( + isinstance(ncurses_data[key], dict) + and "error" in ncurses_data[key] + ): + self.fail( + f"ncurses tparm failed: {ncurses_data[key]['error']}" + ) + std_result = bytes(ncurses_data[key]) + + pyrepl_result = terminfo.tparm(cap_value, value) + self.assertEqual( + pyrepl_result, + std_result, + f"tparm({cap}, {value}): " + f"std={repr(std_result)}, pyrepl={repr(pyrepl_result)}", + ) + + def test_tparm_null_handling(self): + """Test tparm with None/null input.""" + term = "xterm" + + ncurses_code = dedent( + f""" + import _curses + import json + _curses.setupterm({repr(term)}, 1) + + # Test with None + try: + _curses.tparm(None) + raises_typeerror = False + except TypeError: + raises_typeerror = True + except Exception as e: + raises_typeerror = False + error_type = type(e).__name__ + + print(json.dumps({{"raises_typeerror": raises_typeerror}})) + """ + ) + + result = subprocess.run( + [sys.executable, "-c", ncurses_code], + capture_output=True, + text=True, + ) + ncurses_data = json.loads(result.stdout) + + # PyREPL setup + ti = terminfo.TermInfo(term, fallback=False) + + # Test with None - both should raise TypeError + if ncurses_data["raises_typeerror"]: + with self.assertRaises(TypeError): + terminfo.tparm(None) + else: + # If ncurses doesn't raise TypeError, PyREPL shouldn't either + try: + terminfo.tparm(None) + except TypeError: + self.fail("PyREPL raised TypeError but ncurses did not") + + def test_special_terminals(self): + """Test with special terminal types.""" + special_terms = [ + "dumb", # Minimal terminal + "unknown", # Should fall back to defaults + "linux", # Linux console + "screen", # GNU Screen + "tmux", # tmux + ] + + # Get all string capabilities from ncurses + for term in special_terms: + with self.subTest(term=term): + all_caps = self.infocmp(term) + ncurses_code = dedent( + f""" + import _curses + import json + import sys + + try: + _curses.setupterm({repr(term)}, 1) + results = {{}} + for cap in {repr(all_caps)}: + try: + val = _curses.tigetstr(cap) + if val is None: + results[cap] = None + elif val == -1: + results[cap] = -1 + else: + # Convert bytes to list of ints for JSON + results[cap] = list(val) + except BaseException: + results[cap] = "error" + print(json.dumps(results)) + except Exception as e: + print(json.dumps({{"error": str(e)}})) + """ + ) + + # Get ncurses results + result = subprocess.run( + [sys.executable, "-c", ncurses_code], + capture_output=True, + text=True, + ) + if result.returncode != 0: + self.fail( + f"Failed to get ncurses data for {term}: {result.stderr}" + ) + + try: + ncurses_data = json.loads(result.stdout) + except json.JSONDecodeError: + self.fail( + f"Failed to parse ncurses output for {term}: {result.stdout}" + ) + + if "error" in ncurses_data and len(ncurses_data) == 1: + # ncurses failed to setup this terminal + # PyREPL should still work with fallback + ti = terminfo.TermInfo(term, fallback=True) + continue + + ti = terminfo.TermInfo(term, fallback=False) + + # Compare all capabilities + for cap in all_caps: + if cap not in ncurses_data: + continue + + with self.subTest(term=term, capability=cap): + ncurses_val = ncurses_data[cap] + if isinstance(ncurses_val, list): + # Convert back to bytes + ncurses_val = bytes(ncurses_val) + + pyrepl_val = ti.get(cap) + + # Both should return the same value + self.assertEqual( + pyrepl_val, + ncurses_val, + f"Capability {cap} for {term}: " + f"ncurses={repr(ncurses_val)}, " + f"pyrepl={repr(pyrepl_val)}", + ) + + def test_terminfo_fallback(self): + """Test that PyREPL falls back gracefully when terminfo is not found.""" + # Use a non-existent terminal type + fake_term = "nonexistent-terminal-type-12345" + + # Check if standard curses can setup this terminal in subprocess + ncurses_code = dedent( + f""" + import _curses + import json + try: + _curses.setupterm({repr(fake_term)}, 1) + print(json.dumps({{"success": True}})) + except _curses.error: + print(json.dumps({{"success": False, "error": "curses.error"}})) + except Exception as e: + print(json.dumps({{"success": False, "error": str(e)}})) + """ + ) + + result = subprocess.run( + [sys.executable, "-c", ncurses_code], + capture_output=True, + text=True, + ) + ncurses_data = json.loads(result.stdout) + + if ncurses_data["success"]: + # If it succeeded, skip this test as we can't test fallback + self.skipTest( + f"System unexpectedly has terminfo for '{fake_term}'" + ) + + # PyREPL should succeed with fallback + try: + ti = terminfo.TermInfo(fake_term, fallback=True) + pyrepl_ok = True + except Exception: + pyrepl_ok = False + + self.assertTrue( + pyrepl_ok, "PyREPL should fall back for unknown terminals" + ) + + # Should still be able to get basic capabilities + bel = ti.get("bel") + self.assertIsNotNone( + bel, "PyREPL should provide basic capabilities after fallback" + ) + + def test_invalid_terminal_names(self): + cases = [ + (42, TypeError), + ("", ValueError), + ("w\x00t", ValueError), + (f"..{os.sep}name", ValueError), + ] + + for term, exc in cases: + with self.subTest(term=term): + with self.assertRaises(exc): + terminfo._validate_terminal_name_or_raise(term) diff --git a/Lib/test/test_pyrepl/test_unix_console.py b/Lib/test/test_pyrepl/test_unix_console.py new file mode 100644 index 000000000..0a25cf5ef --- /dev/null +++ b/Lib/test/test_pyrepl/test_unix_console.py @@ -0,0 +1,416 @@ +import errno +import itertools +import os +import signal +import sys +import threading +import unittest +from functools import partial +from test.support import os_helper, force_not_colorized_test_class +from test.support import threading_helper + +from unittest import TestCase +from unittest.mock import MagicMock, call, patch, ANY, Mock + +from .support import handle_all_events, code_to_events + +try: + from _pyrepl.console import Event + from _pyrepl.unix_console import UnixConsole +except ImportError: + pass + +from _pyrepl.terminfo import _TERMINAL_CAPABILITIES + +TERM_CAPABILITIES = _TERMINAL_CAPABILITIES["ansi"] + + +def unix_console(events, **kwargs): + console = UnixConsole(term="xterm") + console.get_event = MagicMock(side_effect=events) + console.getpending = MagicMock(return_value=Event("key", "")) + + height = kwargs.get("height", 25) + width = kwargs.get("width", 80) + console.getheightwidth = MagicMock(side_effect=lambda: (height, width)) + console.wait = MagicMock() + + console.prepare() + for key, val in kwargs.items(): + setattr(console, key, val) + return console + + +handle_events_unix_console = partial( + handle_all_events, + prepare_console=unix_console, +) +handle_events_narrow_unix_console = partial( + handle_all_events, + prepare_console=partial(unix_console, width=5), +) +handle_events_short_unix_console = partial( + handle_all_events, + prepare_console=partial(unix_console, height=1), +) +handle_events_unix_console_height_3 = partial( + handle_all_events, prepare_console=partial(unix_console, height=3) +) + +def __rustpython_patch_terminfo_tparm(s, *args): + return s + b":" + b",".join(str(i).encode() for i in args) + + +def __rustpython_patch_termios_tcgetattr(_): + return [ + 27394, + 3, + 19200, + 536872399, + 38400, + 38400, + [ + b"\x04", + b"\xff", + b"\xff", + b"\x7f", + b"\x17", + b"\x15", + b"\x12", + b"\x00", + b"\x03", + b"\x1c", + b"\x1a", + b"\x19", + b"\x11", + b"\x13", + b"\x16", + b"\x0f", + b"\x01", + b"\x00", + b"\x14", + b"\x00", + ], + ] + + +def __rustpython_patch_termios_tcsetattr(a, b, c): + return None + +@unittest.skipIf(sys.platform == "win32", "No Unix event queue on Windows") +@patch( + "_pyrepl.terminfo.tparm", + # TODO: RUSTPYTHON; SyntaxError: the symbol 's' must be present in the symbol table + # lambda s, *args: s + b":" + b",".join(str(i).encode() for i in args), + __rustpython_patch_terminfo_tparm, +) +# TODO: RUSTPYTHON; SyntaxError: no symbol table available in lambda (type: Lambda) +# @patch( +# "termios.tcgetattr", +# lambda _: [ +# 27394, +# 3, +# 19200, +# 536872399, +# 38400, +# 38400, +# [ +# b"\x04", +# b"\xff", +# b"\xff", +# b"\x7f", +# b"\x17", +# b"\x15", +# b"\x12", +# b"\x00", +# b"\x03", +# b"\x1c", +# b"\x1a", +# b"\x19", +# b"\x11", +# b"\x13", +# b"\x16", +# b"\x0f", +# b"\x01", +# b"\x00", +# b"\x14", +# b"\x00", +# ], +# ], +# ) +@patch("termios.tcgetattr", __rustpython_patch_termios_tcgetattr) +@patch( + "termios.tcsetattr", + # TODO: RUSTPYTHON; SyntaxError: no symbol table available in lambda (type: Lambda) + # lambda a, b, c: None + __rustpython_patch_termios_tcsetattr, +) +@patch("os.write") +@force_not_colorized_test_class +class TestConsole(TestCase): + def test_no_newline(self, _os_write): + code = "1" + events = code_to_events(code) + _, con = handle_events_unix_console(events) + self.assertNotIn(call(ANY, b'\n'), _os_write.mock_calls) + con.restore() + + def test_newline(self, _os_write): + code = "\n" + events = code_to_events(code) + _, con = handle_events_unix_console(events) + _os_write.assert_any_call(ANY, b"\n") + con.restore() + + def test_simple_addition(self, _os_write): + code = "12+34" + events = code_to_events(code) + _, con = handle_events_unix_console(events) + _os_write.assert_any_call(ANY, b"1") + _os_write.assert_any_call(ANY, b"2") + _os_write.assert_any_call(ANY, b"+") + _os_write.assert_any_call(ANY, b"3") + _os_write.assert_any_call(ANY, b"4") + con.restore() + + def test_wrap(self, _os_write): + code = "12+34" + events = code_to_events(code) + _, con = handle_events_narrow_unix_console(events) + _os_write.assert_any_call(ANY, b"1") + _os_write.assert_any_call(ANY, b"2") + _os_write.assert_any_call(ANY, b"+") + _os_write.assert_any_call(ANY, b"3") + _os_write.assert_any_call(ANY, b"\\") + _os_write.assert_any_call(ANY, b"\n") + _os_write.assert_any_call(ANY, b"4") + con.restore() + + def test_cursor_left(self, _os_write): + code = "1" + events = itertools.chain( + code_to_events(code), + [Event(evt="key", data="left", raw=bytearray(b"\x1bOD"))], + ) + _, con = handle_events_unix_console(events) + _os_write.assert_any_call(ANY, TERM_CAPABILITIES["cub"] + b":1") + con.restore() + + def test_cursor_left_right(self, _os_write): + code = "1" + events = itertools.chain( + code_to_events(code), + [ + Event(evt="key", data="left", raw=bytearray(b"\x1bOD")), + Event(evt="key", data="right", raw=bytearray(b"\x1bOC")), + ], + ) + _, con = handle_events_unix_console(events) + _os_write.assert_any_call(ANY, TERM_CAPABILITIES["cub"] + b":1") + _os_write.assert_any_call(ANY, TERM_CAPABILITIES["cuf"] + b":1") + con.restore() + + def test_cursor_up(self, _os_write): + code = "1\n2+3" + events = itertools.chain( + code_to_events(code), + [Event(evt="key", data="up", raw=bytearray(b"\x1bOA"))], + ) + _, con = handle_events_unix_console(events) + _os_write.assert_any_call(ANY, TERM_CAPABILITIES["cuu"] + b":1") + con.restore() + + def test_cursor_up_down(self, _os_write): + code = "1\n2+3" + events = itertools.chain( + code_to_events(code), + [ + Event(evt="key", data="up", raw=bytearray(b"\x1bOA")), + Event(evt="key", data="down", raw=bytearray(b"\x1bOB")), + ], + ) + _, con = handle_events_unix_console(events) + _os_write.assert_any_call(ANY, TERM_CAPABILITIES["cuu"] + b":1") + _os_write.assert_any_call(ANY, TERM_CAPABILITIES["cud"] + b":1") + con.restore() + + @unittest.expectedFailureIf(sys.platform == "android", "TODO: RUSTPYTHON; TypeError: signal handler must be signal.SIG_IGN, signal.SIG_DFL, or a callable object") + def test_cursor_back_write(self, _os_write): + events = itertools.chain( + code_to_events("1"), + [Event(evt="key", data="left", raw=bytearray(b"\x1bOD"))], + code_to_events("2"), + ) + _, con = handle_events_unix_console(events) + _os_write.assert_any_call(ANY, b"1") + _os_write.assert_any_call(ANY, TERM_CAPABILITIES["cub"] + b":1") + _os_write.assert_any_call(ANY, b"2") + con.restore() + + def test_multiline_function_move_up_short_terminal(self, _os_write): + # fmt: off + code = ( + "def f():\n" + " foo" + ) + # fmt: on + + events = itertools.chain( + code_to_events(code), + [ + Event(evt="key", data="up", raw=bytearray(b"\x1bOA")), + Event(evt="scroll", data=None), + ], + ) + _, con = handle_events_short_unix_console(events) + _os_write.assert_any_call(ANY, TERM_CAPABILITIES["ri"] + b":") + con.restore() + + def test_multiline_function_move_up_down_short_terminal(self, _os_write): + # fmt: off + code = ( + "def f():\n" + " foo" + ) + # fmt: on + + events = itertools.chain( + code_to_events(code), + [ + Event(evt="key", data="up", raw=bytearray(b"\x1bOA")), + Event(evt="scroll", data=None), + Event(evt="key", data="down", raw=bytearray(b"\x1bOB")), + Event(evt="scroll", data=None), + ], + ) + _, con = handle_events_short_unix_console(events) + _os_write.assert_any_call(ANY, TERM_CAPABILITIES["ri"] + b":") + _os_write.assert_any_call(ANY, TERM_CAPABILITIES["ind"] + b":") + con.restore() + + def test_resize_bigger_on_multiline_function(self, _os_write): + # fmt: off + code = ( + "def f():\n" + " foo" + ) + # fmt: on + + events = itertools.chain(code_to_events(code)) + reader, console = handle_events_short_unix_console(events) + + console.getheightwidth = MagicMock(side_effect=lambda: (2, 80)) + + def same_reader(_): + return reader + + def same_console(events): + console.get_event = MagicMock(side_effect=events) + return console + + _, con = handle_all_events( + [Event(evt="resize", data=None)], + prepare_reader=same_reader, + prepare_console=same_console, + ) + _os_write.assert_has_calls( + [ + call(ANY, TERM_CAPABILITIES["ri"] + b":"), + call(ANY, TERM_CAPABILITIES["cup"] + b":0,0"), + call(ANY, b"def f():"), + ] + ) + console.restore() + con.restore() + + def test_resize_smaller_on_multiline_function(self, _os_write): + # fmt: off + code = ( + "def f():\n" + " foo" + ) + # fmt: on + + events = itertools.chain(code_to_events(code)) + reader, console = handle_events_unix_console_height_3(events) + + console.getheightwidth = MagicMock(side_effect=lambda: (1, 80)) + + def same_reader(_): + return reader + + def same_console(events): + console.get_event = MagicMock(side_effect=events) + return console + + _, con = handle_all_events( + [Event(evt="resize", data=None)], + prepare_reader=same_reader, + prepare_console=same_console, + ) + _os_write.assert_has_calls( + [ + call(ANY, TERM_CAPABILITIES["ind"] + b":"), + call(ANY, TERM_CAPABILITIES["cup"] + b":0,0"), + call(ANY, b" foo"), + ] + ) + console.restore() + con.restore() + + def test_getheightwidth_with_invalid_environ(self, _os_write): + # gh-128636 + console = UnixConsole(term="xterm") + with os_helper.EnvironmentVarGuard() as env: + env["LINES"] = "" + self.assertIsInstance(console.getheightwidth(), tuple) + env["COLUMNS"] = "" + self.assertIsInstance(console.getheightwidth(), tuple) + os.environ = [] + self.assertIsInstance(console.getheightwidth(), tuple) + + @unittest.skipUnless(sys.platform == "darwin", "requires macOS") + def test_restore_with_invalid_environ_on_macos(self, _os_write): + # gh-128636 for macOS + console = UnixConsole(term="xterm") + with os_helper.EnvironmentVarGuard(): + os.environ = [] + console.prepare() # needed to call restore() + console.restore() # this should succeed + + @threading_helper.reap_threads + @threading_helper.requires_working_threading() + def test_restore_in_thread(self, _os_write): + # gh-139391: ensure that console.restore() silently suppresses + # exceptions when calling signal.signal() from a non-main thread. + console = unix_console([]) + console.old_sigwinch = signal.SIG_DFL + thread = threading.Thread(target=console.restore) + thread.start() + thread.join() # this should not raise + + +@unittest.skipIf(sys.platform == "win32", "No Unix console on Windows") +class TestUnixConsoleEIOHandling(TestCase): + + @patch('_pyrepl.unix_console.tcsetattr') + @patch('_pyrepl.unix_console.tcgetattr') + def test_eio_error_handling_in_restore(self, mock_tcgetattr, mock_tcsetattr): + + import termios + mock_termios = Mock() + mock_termios.iflag = 0 + mock_termios.oflag = 0 + mock_termios.cflag = 0 + mock_termios.lflag = 0 + mock_termios.cc = [0] * 32 + mock_termios.copy.return_value = mock_termios + mock_tcgetattr.return_value = mock_termios + + console = UnixConsole(term="xterm") + console.prepare() + + mock_tcsetattr.side_effect = termios.error(errno.EIO, "Input/output error") + + # EIO error should be handled gracefully in restore() + console.restore() diff --git a/Lib/test/test_pyrepl/test_utils.py b/Lib/test/test_pyrepl/test_utils.py new file mode 100644 index 000000000..656a1e441 --- /dev/null +++ b/Lib/test/test_pyrepl/test_utils.py @@ -0,0 +1,105 @@ +from unittest import TestCase + +from _pyrepl.utils import str_width, wlen, prev_next_window, gen_colors + + +class TestUtils(TestCase): + def test_str_width(self): + characters = [ + 'a', + '1', + '_', + '!', + '\x1a', + '\u263A', + '\uffb9', + '\N{LATIN SMALL LETTER E WITH ACUTE}', # é + '\N{LATIN SMALL LETTER E WITH CEDILLA}', # ȩ + '\u00ad', + ] + for c in characters: + self.assertEqual(str_width(c), 1) + + zero_width_characters = [ + '\N{COMBINING ACUTE ACCENT}', + '\N{ZERO WIDTH JOINER}', + ] + for c in zero_width_characters: + with self.subTest(character=c): + self.assertEqual(str_width(c), 0) + + characters = [chr(99989), chr(99999)] + for c in characters: + self.assertEqual(str_width(c), 2) + + def test_wlen(self): + for c in ['a', 'b', '1', '!', '_']: + self.assertEqual(wlen(c), 1) + self.assertEqual(wlen('\x1a'), 2) + + char_east_asian_width_N = chr(3800) + self.assertEqual(wlen(char_east_asian_width_N), 1) + char_east_asian_width_W = chr(4352) + self.assertEqual(wlen(char_east_asian_width_W), 2) + + self.assertEqual(wlen('hello'), 5) + self.assertEqual(wlen('hello' + '\x1a'), 7) + self.assertEqual(wlen('e\N{COMBINING ACUTE ACCENT}'), 1) + self.assertEqual(wlen('a\N{ZERO WIDTH JOINER}b'), 2) + + def test_prev_next_window(self): + def gen_normal(): + yield 1 + yield 2 + yield 3 + yield 4 + + pnw = prev_next_window(gen_normal()) + self.assertEqual(next(pnw), (None, 1, 2)) + self.assertEqual(next(pnw), (1, 2, 3)) + self.assertEqual(next(pnw), (2, 3, 4)) + self.assertEqual(next(pnw), (3, 4, None)) + with self.assertRaises(StopIteration): + next(pnw) + + def gen_short(): + yield 1 + + pnw = prev_next_window(gen_short()) + self.assertEqual(next(pnw), (None, 1, None)) + with self.assertRaises(StopIteration): + next(pnw) + + def gen_raise(): + yield from gen_normal() + 1/0 + + pnw = prev_next_window(gen_raise()) + self.assertEqual(next(pnw), (None, 1, 2)) + self.assertEqual(next(pnw), (1, 2, 3)) + self.assertEqual(next(pnw), (2, 3, 4)) + self.assertEqual(next(pnw), (3, 4, None)) + with self.assertRaises(ZeroDivisionError): + next(pnw) + + def test_gen_colors_keyword_highlighting(self): + cases = [ + # no highlights + ("a.set", [(".", "op")]), + ("obj.list", [(".", "op")]), + ("obj.match", [(".", "op")]), + ("b. \\\n format", [(".", "op")]), + # highlights + ("set", [("set", "builtin")]), + ("list", [("list", "builtin")]), + (" \n dict", [("dict", "builtin")]), + ] + for code, expected_highlights in cases: + with self.subTest(code=code): + colors = list(gen_colors(code)) + # Extract (text, tag) pairs for comparison + actual_highlights = [] + for color in colors: + span_text = code[color.span.start:color.span.end + 1] + actual_highlights.append((span_text, color.tag)) + self.assertEqual(actual_highlights, expected_highlights) diff --git a/Lib/test/test_pyrepl/test_windows_console.py b/Lib/test/test_pyrepl/test_windows_console.py new file mode 100644 index 000000000..52a6f3e59 --- /dev/null +++ b/Lib/test/test_pyrepl/test_windows_console.py @@ -0,0 +1,626 @@ +import sys +import unittest + +if sys.platform != "win32": + raise unittest.SkipTest("test only relevant on win32") + + +import itertools +from functools import partial +from test.support import force_not_colorized_test_class +from typing import Iterable +from unittest import TestCase +from unittest.mock import MagicMock, call + +from .support import handle_all_events, code_to_events +from .support import prepare_reader as default_prepare_reader + +try: + from _pyrepl.console import Event, Console + from _pyrepl.windows_console import ( + WindowsConsole, + MOVE_LEFT, + MOVE_RIGHT, + MOVE_UP, + MOVE_DOWN, + ERASE_IN_LINE, + ) + import _pyrepl.windows_console as wc +except ImportError: + pass + + +@force_not_colorized_test_class +class WindowsConsoleTests(TestCase): + def console(self, events, **kwargs) -> Console: + console = WindowsConsole() + console.get_event = MagicMock(side_effect=events) + console.getpending = MagicMock(return_value=Event("key", "")) + console.wait = MagicMock() + console._scroll = MagicMock() + console._hide_cursor = MagicMock() + console._show_cursor = MagicMock() + console._getscrollbacksize = MagicMock(42) + console.out = MagicMock() + + height = kwargs.get("height", 25) + width = kwargs.get("width", 80) + console.getheightwidth = MagicMock(side_effect=lambda: (height, width)) + + console.prepare() + for key, val in kwargs.items(): + setattr(console, key, val) + return console + + def handle_events( + self, + events: Iterable[Event], + prepare_console=None, + prepare_reader=None, + **kwargs, + ): + prepare_console = prepare_console or partial(self.console, **kwargs) + prepare_reader = prepare_reader or default_prepare_reader + return handle_all_events(events, prepare_console, prepare_reader) + + def handle_events_narrow(self, events): + return self.handle_events(events, width=5) + + def handle_events_short(self, events, **kwargs): + return self.handle_events(events, height=1, **kwargs) + + def handle_events_height_3(self, events): + return self.handle_events(events, height=3) + + def test_no_newline(self): + code = "1" + events = code_to_events(code) + _, con = self.handle_events(events) + self.assertNotIn(call(b'\n'), con.out.write.mock_calls) + con.restore() + + def test_newline(self): + code = "\n" + events = code_to_events(code) + _, con = self.handle_events(events) + con.out.write.assert_any_call(b"\n") + con.restore() + + def test_simple_addition(self): + code = "12+34" + events = code_to_events(code) + _, con = self.handle_events(events) + con.out.write.assert_any_call(b"1") + con.out.write.assert_any_call(b"2") + con.out.write.assert_any_call(b"+") + con.out.write.assert_any_call(b"3") + con.out.write.assert_any_call(b"4") + con.restore() + + def test_wrap(self): + code = "12+34" + events = code_to_events(code) + _, con = self.handle_events_narrow(events) + con.out.write.assert_any_call(b"1") + con.out.write.assert_any_call(b"2") + con.out.write.assert_any_call(b"+") + con.out.write.assert_any_call(b"3") + con.out.write.assert_any_call(b"\\") + con.out.write.assert_any_call(b"\n") + con.out.write.assert_any_call(b"4") + con.restore() + + def test_resize_wider(self): + code = "1234567890" + events = code_to_events(code) + reader, console = self.handle_events_narrow(events) + + console.getheightwidth = MagicMock(side_effect=lambda: (20, 80)) + + def same_reader(_): + return reader + + def same_console(events): + console.get_event = MagicMock(side_effect=events) + return console + + _, con = handle_all_events( + [Event(evt="resize", data=None)], + prepare_reader=same_reader, + prepare_console=same_console, + ) + + con.out.write.assert_any_call(self.move_right(2)) + con.out.write.assert_any_call(self.move_up(2)) + con.out.write.assert_any_call(b"567890") + + con.restore() + + def test_resize_narrower(self): + code = "1234567890" + events = code_to_events(code) + reader, console = self.handle_events(events) + + console.getheightwidth = MagicMock(side_effect=lambda: (20, 4)) + + def same_reader(_): + return reader + + def same_console(events): + console.get_event = MagicMock(side_effect=events) + return console + + _, con = handle_all_events( + [Event(evt="resize", data=None)], + prepare_reader=same_reader, + prepare_console=same_console, + ) + + con.out.write.assert_any_call(b"456\\") + con.out.write.assert_any_call(b"789\\") + + con.restore() + + def test_cursor_left(self): + code = "1" + events = itertools.chain( + code_to_events(code), + [Event(evt="key", data="left", raw=bytearray(b"\x1bOD"))], + ) + _, con = self.handle_events(events) + con.out.write.assert_any_call(self.move_left()) + con.restore() + + def test_cursor_left_right(self): + code = "1" + events = itertools.chain( + code_to_events(code), + [ + Event(evt="key", data="left", raw=bytearray(b"\x1bOD")), + Event(evt="key", data="right", raw=bytearray(b"\x1bOC")), + ], + ) + _, con = self.handle_events(events) + con.out.write.assert_any_call(self.move_left()) + con.out.write.assert_any_call(self.move_right()) + con.restore() + + def test_cursor_up(self): + code = "1\n2+3" + events = itertools.chain( + code_to_events(code), + [Event(evt="key", data="up", raw=bytearray(b"\x1bOA"))], + ) + _, con = self.handle_events(events) + con.out.write.assert_any_call(self.move_up()) + con.restore() + + def test_cursor_up_down(self): + code = "1\n2+3" + events = itertools.chain( + code_to_events(code), + [ + Event(evt="key", data="up", raw=bytearray(b"\x1bOA")), + Event(evt="key", data="down", raw=bytearray(b"\x1bOB")), + ], + ) + _, con = self.handle_events(events) + con.out.write.assert_any_call(self.move_up()) + con.out.write.assert_any_call(self.move_down()) + con.restore() + + def test_cursor_back_write(self): + events = itertools.chain( + code_to_events("1"), + [Event(evt="key", data="left", raw=bytearray(b"\x1bOD"))], + code_to_events("2"), + ) + _, con = self.handle_events(events) + con.out.write.assert_any_call(b"1") + con.out.write.assert_any_call(self.move_left()) + con.out.write.assert_any_call(b"21") + con.restore() + + def test_multiline_function_move_up_short_terminal(self): + # fmt: off + code = ( + "def f():\n" + " foo" + ) + # fmt: on + + events = itertools.chain( + code_to_events(code), + [ + Event(evt="key", data="up", raw=bytearray(b"\x1bOA")), + Event(evt="scroll", data=None), + ], + ) + _, con = self.handle_events_short(events) + con.out.write.assert_any_call(self.move_left(5)) + con.out.write.assert_any_call(self.move_up()) + con.restore() + + def test_multiline_function_move_up_down_short_terminal(self): + # fmt: off + code = ( + "def f():\n" + " foo" + ) + # fmt: on + + events = itertools.chain( + code_to_events(code), + [ + Event(evt="key", data="up", raw=bytearray(b"\x1bOA")), + Event(evt="scroll", data=None), + Event(evt="key", data="down", raw=bytearray(b"\x1bOB")), + Event(evt="scroll", data=None), + ], + ) + _, con = self.handle_events_short(events) + con.out.write.assert_any_call(self.move_left(8)) + con.out.write.assert_any_call(self.erase_in_line()) + con.restore() + + def test_resize_bigger_on_multiline_function(self): + # fmt: off + code = ( + "def f():\n" + " foo" + ) + # fmt: on + + events = itertools.chain(code_to_events(code)) + reader, console = self.handle_events_short(events) + + console.getheightwidth = MagicMock(side_effect=lambda: (2, 80)) + + def same_reader(_): + return reader + + def same_console(events): + console.get_event = MagicMock(side_effect=events) + return console + + _, con = handle_all_events( + [Event(evt="resize", data=None)], + prepare_reader=same_reader, + prepare_console=same_console, + ) + con.out.write.assert_has_calls( + [ + call(self.move_left(5)), + call(self.move_up()), + call(b"def f():"), + call(self.move_left(3)), + call(self.move_down()), + ] + ) + console.restore() + con.restore() + + def test_resize_smaller_on_multiline_function(self): + # fmt: off + code = ( + "def f():\n" + " foo" + ) + # fmt: on + + events = itertools.chain(code_to_events(code)) + reader, console = self.handle_events_height_3(events) + + console.getheightwidth = MagicMock(side_effect=lambda: (1, 80)) + + def same_reader(_): + return reader + + def same_console(events): + console.get_event = MagicMock(side_effect=events) + return console + + _, con = handle_all_events( + [Event(evt="resize", data=None)], + prepare_reader=same_reader, + prepare_console=same_console, + ) + con.out.write.assert_has_calls( + [ + call(self.move_left(5)), + call(self.move_up()), + call(self.erase_in_line()), + call(b" foo"), + ] + ) + console.restore() + con.restore() + + def move_up(self, lines=1): + return MOVE_UP.format(lines).encode("utf8") + + def move_down(self, lines=1): + return MOVE_DOWN.format(lines).encode("utf8") + + def move_left(self, cols=1): + return MOVE_LEFT.format(cols).encode("utf8") + + def move_right(self, cols=1): + return MOVE_RIGHT.format(cols).encode("utf8") + + def erase_in_line(self): + return ERASE_IN_LINE.encode("utf8") + + def test_multiline_ctrl_z(self): + # see gh-126332 + code = "abcdefghi" + + events = itertools.chain( + code_to_events(code), + [ + Event(evt="key", data='\x1a', raw=bytearray(b'\x1a')), + Event(evt="key", data='\x1a', raw=bytearray(b'\x1a')), + ], + ) + reader, con = self.handle_events_narrow(events) + self.assertEqual(reader.cxy, (2, 3)) + con.restore() + + +class WindowsConsoleGetEventTests(TestCase): + # Virtual-Key Codes: https://learn.microsoft.com/en-us/windows/win32/inputdev/virtual-key-codes + VK_BACK = 0x08 + VK_RETURN = 0x0D + VK_LEFT = 0x25 + VK_7 = 0x37 + VK_M = 0x4D + # Used for miscellaneous characters; it can vary by keyboard. + # For the US standard keyboard, the '" key. + # For the German keyboard, the Ä key. + VK_OEM_7 = 0xDE + + # State of control keys: https://learn.microsoft.com/en-us/windows/console/key-event-record-str + RIGHT_ALT_PRESSED = 0x0001 + RIGHT_CTRL_PRESSED = 0x0004 + LEFT_ALT_PRESSED = 0x0002 + LEFT_CTRL_PRESSED = 0x0008 + ENHANCED_KEY = 0x0100 + SHIFT_PRESSED = 0x0010 + + + def get_event(self, input_records, **kwargs) -> Console: + self.console = WindowsConsole(encoding='utf-8') + self.mock = MagicMock(side_effect=input_records) + self.console._read_input = self.mock + self.console._WindowsConsole__vt_support = kwargs.get("vt_support", + False) + self.console.wait = MagicMock(return_value=True) + event = self.console.get_event(block=False) + return event + + def get_input_record(self, unicode_char, vcode=0, control=0): + return wc.INPUT_RECORD( + wc.KEY_EVENT, + wc.ConsoleEvent(KeyEvent= + wc.KeyEvent( + bKeyDown=True, + wRepeatCount=1, + wVirtualKeyCode=vcode, + wVirtualScanCode=0, # not used + uChar=wc.Char(unicode_char), + dwControlKeyState=control + ))) + + def test_EmptyBuffer(self): + self.assertEqual(self.get_event([None]), None) + self.assertEqual(self.mock.call_count, 1) + + def test_WINDOW_BUFFER_SIZE_EVENT(self): + ir = wc.INPUT_RECORD( + wc.WINDOW_BUFFER_SIZE_EVENT, + wc.ConsoleEvent(WindowsBufferSizeEvent= + wc.WindowsBufferSizeEvent( + wc._COORD(0, 0)))) + self.assertEqual(self.get_event([ir]), Event("resize", "")) + self.assertEqual(self.mock.call_count, 1) + + def test_KEY_EVENT_up_ignored(self): + ir = wc.INPUT_RECORD( + wc.KEY_EVENT, + wc.ConsoleEvent(KeyEvent= + wc.KeyEvent(bKeyDown=False))) + self.assertEqual(self.get_event([ir]), None) + self.assertEqual(self.mock.call_count, 1) + + def test_unhandled_events(self): + for event in (wc.FOCUS_EVENT, wc.MENU_EVENT, wc.MOUSE_EVENT): + ir = wc.INPUT_RECORD( + event, + # fake data, nothing is read except bKeyDown + wc.ConsoleEvent(KeyEvent= + wc.KeyEvent(bKeyDown=False))) + self.assertEqual(self.get_event([ir]), None) + self.assertEqual(self.mock.call_count, 1) + + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_enter(self): + ir = self.get_input_record("\r", self.VK_RETURN) + self.assertEqual(self.get_event([ir]), Event("key", "\n")) + self.assertEqual(self.mock.call_count, 1) + + def test_backspace(self): + ir = self.get_input_record("\x08", self.VK_BACK) + self.assertEqual( + self.get_event([ir]), Event("key", "backspace")) + self.assertEqual(self.mock.call_count, 1) + + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_m(self): + ir = self.get_input_record("m", self.VK_M) + self.assertEqual(self.get_event([ir]), Event("key", "m")) + self.assertEqual(self.mock.call_count, 1) + + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_M(self): + ir = self.get_input_record("M", self.VK_M, self.SHIFT_PRESSED) + self.assertEqual(self.get_event([ir]), Event("key", "M")) + self.assertEqual(self.mock.call_count, 1) + + def test_left(self): + # VK_LEFT is sent as ENHANCED_KEY + ir = self.get_input_record("\x00", self.VK_LEFT, self.ENHANCED_KEY) + self.assertEqual(self.get_event([ir]), Event("key", "left")) + self.assertEqual(self.mock.call_count, 1) + + def test_left_RIGHT_CTRL_PRESSED(self): + ir = self.get_input_record( + "\x00", self.VK_LEFT, self.RIGHT_CTRL_PRESSED | self.ENHANCED_KEY) + self.assertEqual( + self.get_event([ir]), Event("key", "ctrl left")) + self.assertEqual(self.mock.call_count, 1) + + def test_left_LEFT_CTRL_PRESSED(self): + ir = self.get_input_record( + "\x00", self.VK_LEFT, self.LEFT_CTRL_PRESSED | self.ENHANCED_KEY) + self.assertEqual( + self.get_event([ir]), Event("key", "ctrl left")) + self.assertEqual(self.mock.call_count, 1) + + def test_left_RIGHT_ALT_PRESSED(self): + ir = self.get_input_record( + "\x00", self.VK_LEFT, self.RIGHT_ALT_PRESSED | self.ENHANCED_KEY) + self.assertEqual(self.get_event([ir]), Event(evt="key", data="\033")) + self.assertEqual( + self.console.get_event(), Event("key", "left")) + # self.mock is not called again, since the second time we read from the + # command queue + self.assertEqual(self.mock.call_count, 1) + + def test_left_LEFT_ALT_PRESSED(self): + ir = self.get_input_record( + "\x00", self.VK_LEFT, self.LEFT_ALT_PRESSED | self.ENHANCED_KEY) + self.assertEqual(self.get_event([ir]), Event(evt="key", data="\033")) + self.assertEqual( + self.console.get_event(), Event("key", "left")) + self.assertEqual(self.mock.call_count, 1) + + def test_m_LEFT_ALT_PRESSED_and_LEFT_CTRL_PRESSED(self): + # For the shift keys, Windows does not send anything when + # ALT and CTRL are both pressed, so let's test with VK_M. + # get_event() receives this input, but does not + # generate an event. + # This is for e.g. an English keyboard layout, for a + # German layout this returns `µ`, see test_AltGr_m. + ir = self.get_input_record( + "\x00", self.VK_M, self.LEFT_ALT_PRESSED | self.LEFT_CTRL_PRESSED) + self.assertEqual(self.get_event([ir]), None) + self.assertEqual(self.mock.call_count, 1) + + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_m_LEFT_ALT_PRESSED(self): + ir = self.get_input_record( + "m", vcode=self.VK_M, control=self.LEFT_ALT_PRESSED) + self.assertEqual(self.get_event([ir]), Event(evt="key", data="\033")) + self.assertEqual(self.console.get_event(), Event("key", "m")) + self.assertEqual(self.mock.call_count, 1) + + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_m_RIGHT_ALT_PRESSED(self): + ir = self.get_input_record( + "m", vcode=self.VK_M, control=self.RIGHT_ALT_PRESSED) + self.assertEqual(self.get_event([ir]), Event(evt="key", data="\033")) + self.assertEqual(self.console.get_event(), Event("key", "m")) + self.assertEqual(self.mock.call_count, 1) + + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_AltGr_7(self): + # E.g. on a German keyboard layout, '{' is entered via + # AltGr + 7, where AltGr is the right Alt key on the keyboard. + # In this case, Windows automatically sets + # RIGHT_ALT_PRESSED = 0x0001 + LEFT_CTRL_PRESSED = 0x0008 + # This can also be entered like + # LeftAlt + LeftCtrl + 7 or + # LeftAlt + RightCtrl + 7 + # See https://learn.microsoft.com/en-us/windows/console/key-event-record-str + # https://learn.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-vkkeyscanw + ir = self.get_input_record( + "{", vcode=self.VK_7, + control=self.RIGHT_ALT_PRESSED | self.LEFT_CTRL_PRESSED) + self.assertEqual(self.get_event([ir]), Event("key", "{")) + self.assertEqual(self.mock.call_count, 1) + + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_AltGr_m(self): + # E.g. on a German keyboard layout, this yields 'µ' + # Let's use LEFT_ALT_PRESSED and RIGHT_CTRL_PRESSED this + # time, to cover that, too. See above in test_AltGr_7. + ir = self.get_input_record( + "µ", vcode=self.VK_M, control=self.LEFT_ALT_PRESSED | self.RIGHT_CTRL_PRESSED) + self.assertEqual(self.get_event([ir]), Event("key", "µ")) + self.assertEqual(self.mock.call_count, 1) + + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_umlaut_a_german(self): + ir = self.get_input_record("ä", self.VK_OEM_7) + self.assertEqual(self.get_event([ir]), Event("key", "ä")) + self.assertEqual(self.mock.call_count, 1) + + # virtual terminal tests + # Note: wVirtualKeyCode, wVirtualScanCode and dwControlKeyState + # are always zero in this case. + # "\r" and backspace are handled specially, everything else + # is handled in "elif self.__vt_support:" in WindowsConsole.get_event(). + # Hence, only one regular key ("m") and a terminal sequence + # are sufficient to test here, the real tests happen in test_eventqueue + # and test_keymap. + + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_enter_vt(self): + ir = self.get_input_record("\r") + self.assertEqual(self.get_event([ir], vt_support=True), + Event("key", "\n")) + self.assertEqual(self.mock.call_count, 1) + + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_backspace_vt(self): + ir = self.get_input_record("\x7f") + self.assertEqual(self.get_event([ir], vt_support=True), + Event("key", "backspace", b"\x7f")) + self.assertEqual(self.mock.call_count, 1) + + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_up_vt(self): + irs = [self.get_input_record(x) for x in "\x1b[A"] + self.assertEqual(self.get_event(irs, vt_support=True), + Event(evt='key', data='up', raw=bytearray(b'\x1b[A'))) + self.assertEqual(self.mock.call_count, 3) + + # All tests above assume that there is always keyboard data to read, + # because for simplicity we just use + # self.console.wait = MagicMock(return_value=True) + def test_wait_empty(self): + console = WindowsConsole(encoding='utf-8') + console.wait_for_event = MagicMock(return_value=True) + self.assertTrue(console.event_queue.empty()) + timeout = 2.0 + self.assertTrue(console.wait(timeout)) + self.assertEqual(console.wait_for_event.call_count, 1) + self.assertEqual(console.wait_for_event.mock_calls[0], call(timeout)) + + timeout = 1.1 + console.wait_for_event = MagicMock(return_value=False) + self.assertFalse(console.wait(timeout)) + self.assertEqual(console.wait_for_event.call_count, 1) + self.assertEqual(console.wait_for_event.mock_calls[0], call(timeout)) + + def test_wait_not_empty(self): + console = WindowsConsole(encoding='utf-8') + console.wait_for_event = MagicMock(return_value=True) + console.event_queue.push(b"a") + self.assertFalse(console.event_queue.empty()) + self.assertTrue(console.wait(0.0)) + self.assertEqual(console.wait_for_event.call_count, 0) + + +if __name__ == "__main__": + unittest.main() diff --git a/crates/vm/src/stdlib/nt.rs b/crates/vm/src/stdlib/nt.rs index 62ea7056c..0d423541b 100644 --- a/crates/vm/src/stdlib/nt.rs +++ b/crates/vm/src/stdlib/nt.rs @@ -1088,4 +1088,10 @@ pub(crate) mod module { super::super::os::module_exec(vm, module)?; Ok(()) } + + #[pyfunction] + fn _is_inputhook_installed() -> bool { + // TODO: Implement the actual logic here + false + } } diff --git a/crates/vm/src/stdlib/posix.rs b/crates/vm/src/stdlib/posix.rs index b45f31821..0a55cec4c 100644 --- a/crates/vm/src/stdlib/posix.rs +++ b/crates/vm/src/stdlib/posix.rs @@ -2312,6 +2312,12 @@ pub mod module { super::super::os::module_exec(vm, module)?; Ok(()) } + + #[pyfunction] + fn _is_inputhook_installed() -> bool { + // TODO: Implement the actual logic here + false + } } #[cfg(any( From 52c2d3fd61a95c9211583fca86bfdad5d5644c78 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Fri, 12 Jun 2026 11:20:51 +0300 Subject: [PATCH 077/339] cleanup the signals module (#8076) --- crates/vm/src/signal.rs | 24 ++-- crates/vm/src/stdlib/_signal.rs | 199 +++++++++++++++----------------- 2 files changed, 108 insertions(+), 115 deletions(-) diff --git a/crates/vm/src/signal.rs b/crates/vm/src/signal.rs index 6c8e9cb6d..50a887c14 100644 --- a/crates/vm/src/signal.rs +++ b/crates/vm/src/signal.rs @@ -1,29 +1,31 @@ -#![cfg_attr(target_os = "wasi", allow(dead_code))] use crate::{PyObjectRef, PyResult, VirtualMachine}; use alloc::fmt; use core::cell::{Cell, RefCell}; -#[cfg(windows)] -use core::sync::atomic::AtomicIsize; use core::sync::atomic::{AtomicBool, Ordering}; use std::sync::mpsc; +#[cfg(windows)] +use core::sync::atomic::AtomicIsize; + +static ANY_TRIGGERED: AtomicBool = AtomicBool::new(false); + pub(crate) const NSIG: usize = 64; -pub(crate) fn new_signal_handlers() -> Box; NSIG]>> { - Box::new(const { RefCell::new([const { None }; NSIG]) }) -} -static ANY_TRIGGERED: AtomicBool = AtomicBool::new(false); -// hack to get around const array repeat expressions, rust issue #79270 -#[allow( +#[expect( clippy::declare_interior_mutable_const, reason = "workaround for const array repeat limitation (rust issue #79270)" )] const ATOMIC_FALSE: AtomicBool = AtomicBool::new(false); + pub(crate) static TRIGGERS: [AtomicBool; NSIG] = [ATOMIC_FALSE; NSIG]; #[cfg(windows)] static SIGINT_EVENT: AtomicIsize = AtomicIsize::new(0); +pub(crate) fn new_signal_handlers() -> Box; NSIG]>> { + Box::new(const { RefCell::new([const { None }; NSIG]) }) +} + thread_local! { /// Prevent recursive signal handler invocation. When a Python signal /// handler is running, new signals are deferred until it completes. @@ -50,6 +52,7 @@ pub fn check_signals(vm: &VirtualMachine) -> PyResult<()> { if !ANY_TRIGGERED.load(Ordering::Relaxed) { return Ok(()); } + // Atomic RMW only when a signal is actually pending. if !ANY_TRIGGERED.swap(false, Ordering::Acquire) { return Ok(()); @@ -99,8 +102,7 @@ pub(crate) fn is_triggered() -> bool { /// Reset all signal trigger state after fork in child process. /// Stale triggers from the parent must not fire in the child. -#[cfg(unix)] -#[cfg(feature = "host_env")] +#[cfg(all(unix, feature = "host_env"))] pub(crate) fn clear_after_fork() { ANY_TRIGGERED.store(false, Ordering::Release); for trigger in &TRIGGERS { diff --git a/crates/vm/src/stdlib/_signal.rs b/crates/vm/src/stdlib/_signal.rs index 05bab5e11..191f67d09 100644 --- a/crates/vm/src/stdlib/_signal.rs +++ b/crates/vm/src/stdlib/_signal.rs @@ -6,21 +6,32 @@ pub(crate) use _signal::module_def; pub(crate) mod _signal { #![allow(unreachable_pub)] - #[cfg(any(unix, windows))] - use crate::convert::{IntoPyException, TryFromBorrowedObject}; use crate::{Py, PyObjectRef, PyResult, VirtualMachine, signal}; - #[cfg(unix)] - use crate::{ - builtins::PyTypeRef, - function::{ArgIntoFloat, OptionalArg}, + use core::{ + ops::Range, + sync::atomic::{self, Ordering}, }; - use core::sync::atomic::{self, Ordering}; - #[cfg(any(unix, windows))] - use rustpython_host_env::signal as host_signal; - #[cfg(unix)] - use rustpython_host_env::signal::{double_to_timeval, itimerval_to_tuple}; - #[cfg(unix)] - use std::os::fd::AsFd; + + cfg_select! { + any(unix, windows) => { + use crate::convert::{IntoPyException, TryFromBorrowedObject}; + use rustpython_host_env::signal as host_signal; + } + _ => {} + } + + cfg_select! { + unix => { + use crate::{ + builtins::{PyBaseExceptionRef, PyTypeRef}, + function::{ArgIntoFloat, OptionalArg}, + }; + use rustpython_host_env::signal::{double_to_timeval, itimerval_to_tuple}; + + use std::os::fd::AsFd; + }, + _ => {} + } #[allow(non_camel_case_types)] type sighandler_t = cfg_select! { @@ -28,6 +39,8 @@ pub(crate) mod _signal { _ => usize, }; + const SIGNUM_RANGE: Range = 1..signal::NSIG as i32; + cfg_select! { windows => { type WakeupFdRaw = libc::SOCKET; @@ -100,6 +113,7 @@ pub(crate) mod _signal { #[cfg(windows)] #[pyattr] const CTRL_C_EVENT: u32 = host_signal::CTRL_C_EVENT; + #[cfg(windows)] #[pyattr] const CTRL_BREAK_EVENT: u32 = host_signal::CTRL_BREAK_EVENT; @@ -130,9 +144,11 @@ pub(crate) mod _signal { #[cfg(target_os = "android")] #[pyattr] const ITIMER_REAL: libc::c_int = 0; + #[cfg(target_os = "android")] #[pyattr] const ITIMER_VIRTUAL: libc::c_int = 1; + #[cfg(target_os = "android")] #[pyattr] const ITIMER_PROF: libc::c_int = 2; @@ -147,6 +163,14 @@ pub(crate) mod _signal { ) } + #[cfg(unix)] + fn new_itimer_error(msg: &str, vm: &VirtualMachine) -> PyBaseExceptionRef { + vm.new_exception_msg(itimer_error(vm), msg.into()) + } + + const _: () = assert!(SIGNUM_RANGE.start.is_positive()); + const _: () = assert!(SIGNUM_RANGE.end.is_positive()); + #[cfg(any(unix, windows))] pub(super) fn init_signal_handlers( module: &Py, @@ -156,8 +180,8 @@ pub(crate) mod _signal { let sig_dfl = vm.new_pyobj(SIG_DFL as u8); let sig_ign = vm.new_pyobj(SIG_IGN as u8); - for signum in 1..NSIG { - let Some(handler) = (unsafe { host_signal::probe_handler(signum as i32) }) else { + for signum in SIGNUM_RANGE { + let Some(handler) = (unsafe { host_signal::probe_handler(signum) }) else { continue; }; let py_handler = if handler == SIG_DFL { @@ -167,9 +191,10 @@ pub(crate) mod _signal { } else { None }; + vm.signal_handlers .get_or_init(signal::new_signal_handlers) - .borrow_mut()[signum] = py_handler; + .borrow_mut()[signum as usize] = py_handler; } let int_handler = module @@ -197,12 +222,12 @@ pub(crate) mod _signal { vm: &VirtualMachine, ) -> PyResult> { signal::assert_in_range(signalnum, vm)?; + #[cfg(windows)] - { - if !host_signal::is_valid_signal(signalnum) { - return Err(vm.new_value_error(format!("signal number {signalnum} out of range"))); - } + if !host_signal::is_valid_signal(signalnum) { + return Err(vm.new_value_error(format!("signal number {signalnum} out of range"))); } + if !vm.is_main_thread() { return Err(vm.new_value_error("signal only works in main thread")); } @@ -216,15 +241,11 @@ pub(crate) mod _signal { "signal handler must be signal.SIG_IGN, signal.SIG_DFL, or a callable object", )), }; + signal::check_signals(vm)?; - let old = unsafe { host_signal::install_handler(signalnum, sig_handler) }; - let _old = match old { - Ok(old) => old, - Err(_) => { - return Err(vm.new_os_error("Failed to set signal")); - } - }; + unsafe { host_signal::install_handler(signalnum, sig_handler) } + .map_err(|_| vm.new_os_error("Failed to set signal"))?; let signal_handlers = vm.signal_handlers.get_or_init(signal::new_signal_handlers); let old_handler = signal_handlers.borrow_mut()[signalnum as usize].replace(handler); @@ -269,25 +290,17 @@ pub(crate) mod _signal { it_value: double_to_timeval(seconds), it_interval: double_to_timeval(interval), }; - match host_signal::setitimer(which, &new) { - Ok(old) => Ok(itimerval_to_tuple(&old)), - Err(err) => { - let itimer_error = itimer_error(vm); - Err(vm.new_exception_msg(itimer_error, err.to_string().into())) - } - } + host_signal::setitimer(which, &new) + .map(|old| itimerval_to_tuple(&old)) + .map_err(|err| new_itimer_error(&err.to_string(), vm)) } #[cfg(unix)] #[pyfunction] fn getitimer(which: i32, vm: &VirtualMachine) -> PyResult<(f64, f64)> { - match host_signal::getitimer(which) { - Ok(old) => Ok(itimerval_to_tuple(&old)), - Err(err) => { - let itimer_error = itimer_error(vm); - Err(vm.new_exception_msg(itimer_error, err.to_string().into())) - } - } + host_signal::getitimer(which) + .map(|old| itimerval_to_tuple(&old)) + .map_err(|err| new_itimer_error(&err.to_string(), vm)) } #[pyfunction] @@ -310,10 +323,10 @@ pub(crate) mod _signal { fn set_wakeup_fd(args: SetWakeupFdArgs, vm: &VirtualMachine) -> PyResult { // TODO: implement warn_on_full_buffer let _ = args.warn_on_full_buffer; - #[cfg(windows)] - let fd = args.fd.0; - #[cfg(not(windows))] - let fd = args.fd; + let fd = cfg_select! { + windows => args.fd.0, + _ => args.fd, + }; if !vm.is_main_thread() { return Err(vm.new_value_error("set_wakeup_fd only works in main thread")); @@ -343,21 +356,16 @@ pub(crate) mod _signal { } let old_fd = WAKEUP.swap(fd, Ordering::Relaxed); + #[cfg(windows)] WAKEUP_IS_SOCKET.store(is_socket, Ordering::Relaxed); #[cfg(windows)] - { - if old_fd == INVALID_WAKEUP { - Ok(-1) - } else { - Ok(old_fd as i64) - } - } - #[cfg(not(windows))] - { - Ok(old_fd as i64) + if old_fd == INVALID_WAKEUP { + return Ok(-1); } + + Ok(old_fd as i64) } #[cfg(target_os = "linux")] @@ -387,7 +395,6 @@ pub(crate) mod _signal { host_signal::siginterrupt(signum, flag).map_err(|_| vm.new_last_errno_error()) } - /// CPython: signal_raise_signal (signalmodule.c) #[cfg(any(unix, windows))] #[pyfunction] fn raise_signal(signalnum: i32, vm: &VirtualMachine) -> PyResult<()> { @@ -395,17 +402,14 @@ pub(crate) mod _signal { // On Windows, only certain signals are supported #[cfg(windows)] - { - if !host_signal::is_valid_signal(signalnum) { - return Err(vm - .new_errno_error(libc::EINVAL, "Invalid argument") - .upcast()); - } + if !host_signal::is_valid_signal(signalnum) { + return Err(vm + .new_errno_error(libc::EINVAL, "Invalid argument") + .upcast()); } - if host_signal::raise_signal(signalnum).is_err() { - return Err(vm.new_os_error(format!("raise_signal failed for signal {signalnum}"))); - } + host_signal::raise_signal(signalnum) + .map_err(|_| vm.new_os_error(format!("raise_signal failed for signal {signalnum}")))?; // Check if a signal was triggered and handle it signal::check_signals(vm)?; @@ -413,42 +417,30 @@ pub(crate) mod _signal { Ok(()) } - /// CPython: signal_strsignal (signalmodule.c) - #[cfg(unix)] + #[cfg(any(unix, windows))] #[pyfunction] fn strsignal(signalnum: i32, vm: &VirtualMachine) -> PyResult> { - if signalnum < 1 || signalnum >= signal::NSIG as i32 { + if !SIGNUM_RANGE.contains(&signalnum) { return Err(vm.new_value_error(format!("signal number {signalnum} out of range"))); } + Ok(host_signal::strsignal(signalnum)) } - #[cfg(windows)] - #[pyfunction] - fn strsignal(signalnum: i32, vm: &VirtualMachine) -> PyResult> { - if signalnum < 1 || signalnum >= signal::NSIG as i32 { - return Err(vm.new_value_error(format!("signal number {signalnum} out of range"))); - } - Ok(host_signal::strsignal(signalnum)) - } - - /// CPython: signal_valid_signals (signalmodule.c) #[pyfunction] fn valid_signals(vm: &VirtualMachine) -> PyResult { use crate::PyPayload; use crate::builtins::PySet; let set = PySet::default().into_ref(&vm.ctx); + + // Empty set for platforms without signal support (e.g., WASM) #[cfg(any(unix, windows))] for signum in host_signal::valid_signals(signal::NSIG) .map_err(|_| vm.new_os_error("sigfillset failed"))? { set.add(vm.ctx.new_int(signum).into(), vm)?; } - #[cfg(not(any(unix, windows)))] - { - // Empty set for platforms without signal support (e.g., WASM) - let _ = &set; - } + Ok(set.into()) } @@ -457,9 +449,9 @@ pub(crate) mod _signal { use crate::PyPayload; use crate::builtins::PySet; let set = PySet::default().into_ref(&vm.ctx); - for signum in 1..signal::NSIG { - if host_signal::sigset_contains(mask, signum as i32) { - set.add(vm.ctx.new_int(signum as i32).into(), vm)?; + for signum in SIGNUM_RANGE { + if host_signal::sigset_contains(mask, signum) { + set.add(vm.ctx.new_int(signum).into(), vm)?; } } Ok(set.into()) @@ -480,21 +472,20 @@ pub(crate) mod _signal { // Add signals to the set for sig in mask.iter(vm)? { let sig = sig?; - // Convert to i32, handling overflow by returning ValueError - let signum: i32 = sig.try_to_value(vm).map_err(|_| { - vm.new_value_error(format!( - "signal number out of range [1, {}]", - signal::NSIG - 1 - )) - })?; - // Validate signal number is in range [1, NSIG) - if signum < 1 || signum >= signal::NSIG as i32 { - return Err(vm.new_value_error(format!( - "signal number {} out of range [1, {}]", - signum, - signal::NSIG - 1 - ))); - } + // Convert to i32 + // - handling overflow by returning ValueError + // - validate signal number is in range [1, NSIG) + let signum = sig + .try_to_value::(vm) + .ok() + .filter(|v| SIGNUM_RANGE.contains(v)) + .ok_or_else(|| { + vm.new_value_error(format!( + "signal number out of range [1, {}]", + SIGNUM_RANGE.end - 1 + )) + })?; + host_signal::sigaddset(&mut sigset, signum).map_err(|e| e.into_pyexception(vm))?; } @@ -512,15 +503,15 @@ pub(crate) mod _signal { pub extern "C" fn run_signal(signum: i32) { signal::TRIGGERS[signum as usize].store(true, Ordering::Relaxed); signal::set_triggered(); - #[cfg(windows)] + host_signal::notify_signal( signum, WAKEUP.load(Ordering::Relaxed), + #[cfg(windows)] WAKEUP_IS_SOCKET.load(Ordering::Relaxed), + #[cfg(windows)] signal::get_sigint_event(), ); - #[cfg(unix)] - host_signal::notify_signal(signum, WAKEUP.load(Ordering::Relaxed)); } /// Reset wakeup fd after fork in child process. From a2fabfa064142137d00c079d462c719b143ee3ac Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Fri, 12 Jun 2026 17:49:15 +0300 Subject: [PATCH 078/339] Update some of changed libs and tests from `3.14.5` -> `3.14.6` (part 1) (#8084) --- Lib/_collections_abc.py | 29 ++-- Lib/_pydecimal.py | 107 ++++++++------- Lib/_pyio.py | 128 ++++++++++-------- Lib/asyncio/base_events.py | 37 +++-- Lib/asyncio/coroutines.py | 2 +- Lib/asyncio/events.py | 21 +-- Lib/asyncio/graph.py | 14 +- Lib/asyncio/locks.py | 18 +-- Lib/asyncio/proactor_events.py | 3 +- Lib/asyncio/queues.py | 36 ++--- Lib/asyncio/runners.py | 3 +- Lib/asyncio/selector_events.py | 31 +++-- Lib/asyncio/streams.py | 14 +- Lib/asyncio/tasks.py | 57 ++++---- Lib/asyncio/threads.py | 3 +- Lib/asyncio/timeouts.py | 3 +- Lib/asyncio/unix_events.py | 21 +-- Lib/asyncio/windows_events.py | 3 + Lib/base64.py | 37 +++-- Lib/compression/zstd/__init__.py | 28 ++-- Lib/compression/zstd/_zstdfile.py | 37 ++--- Lib/email/_header_value_parser.py | 10 ++ Lib/email/_parseaddr.py | 2 +- Lib/email/charset.py | 2 - Lib/encodings/aliases.py | 8 ++ Lib/enum.py | 25 ++-- Lib/ftplib.py | 11 +- Lib/functools.py | 12 +- Lib/glob.py | 34 ++--- Lib/gzip.py | 60 ++++---- Lib/test/test_asyncio/test_sendfile.py | 55 ++++++++ Lib/test/test_decimal.py | 1 - .../test_email/test__header_value_parser.py | 88 ++++++++++++ Lib/test/test_email/test_asian_codecs.py | 56 ++++++++ Lib/test/test_email/test_email.py | 12 +- Lib/test/test_enum.py | 4 +- Lib/test/test_ftplib.py | 36 ++++- 37 files changed, 674 insertions(+), 374 deletions(-) diff --git a/Lib/_collections_abc.py b/Lib/_collections_abc.py index 241d40d57..996b09437 100644 --- a/Lib/_collections_abc.py +++ b/Lib/_collections_abc.py @@ -461,8 +461,8 @@ class Buffer(metaclass=ABCMeta): class _CallableGenericAlias(GenericAlias): """ Represent `Callable[argtypes, resulttype]`. - This sets ``__args__`` to a tuple containing the flattened ``argtypes`` - followed by ``resulttype``. + This sets ``__args__`` to a tuple containing the flattened + ``argtypes`` followed by ``resulttype``. Example: ``Callable[[int, str], float]`` sets ``__args__`` to ``(int, str, float)``. @@ -927,8 +927,9 @@ class MutableMapping(Mapping): __marker = object() def pop(self, key, default=__marker): - '''D.pop(k[,d]) -> v, remove specified key and return the corresponding value. - If key is not found, d is returned if given, otherwise KeyError is raised. + '''D.pop(k[,d]) -> v, remove specified key and return the corresponding + value. If key is not found, d is returned if given, otherwise + KeyError is raised. ''' try: value = self[key] @@ -962,9 +963,12 @@ class MutableMapping(Mapping): def update(self, other=(), /, **kwds): ''' D.update([E, ]**F) -> None. Update D from mapping/iterable E and F. - If E present and has a .keys() method, does: for k in E.keys(): D[k] = E[k] - If E present and lacks .keys() method, does: for (k, v) in E: D[k] = v - In either case, this is followed by: for k, v in F.items(): D[k] = v + If E present and has a .keys() method, does: + for k in E.keys(): D[k] = E[k] + If E present and lacks .keys() method, does: + for (k, v) in E: D[k] = v + In either case, this is followed by: + for k, v in F.items(): D[k] = v ''' if isinstance(other, Mapping): for key in other: @@ -1029,8 +1033,8 @@ class Sequence(Reversible, Collection): yield self[i] def index(self, value, start=0, stop=None): - '''S.index(value, [start, [stop]]) -> integer -- return first index of value. - Raises ValueError if the value is not present. + '''S.index(value, [start, [stop]]) -> integer -- return first index of + value. Raises ValueError if the value is not present. Supporting start and stop arguments is optional, but recommended. @@ -1138,15 +1142,16 @@ class MutableSequence(Sequence): self[i], self[n-i-1] = self[n-i-1], self[i] def extend(self, values): - 'S.extend(iterable) -- extend sequence by appending elements from the iterable' + """S.extend(iterable) -- extend sequence by appending elements from the + iterable""" if values is self: values = list(values) for v in values: self.append(v) def pop(self, index=-1): - '''S.pop([index]) -> item -- remove and return item at index (default last). - Raise IndexError if list is empty or index is out of range. + '''S.pop([index]) -> item -- remove and return item at index (default + last). Raise IndexError if list is empty or index is out of range. ''' v = self[index] del self[index] diff --git a/Lib/_pydecimal.py b/Lib/_pydecimal.py index 97a629fe9..2277578df 100644 --- a/Lib/_pydecimal.py +++ b/Lib/_pydecimal.py @@ -104,8 +104,8 @@ class DecimalException(ArithmeticError): anything, though. handle -- Called when context._raise_error is called and the - trap_enabler is not set. First argument is self, second is the - context. More arguments can be given, those being after + trap_enabler is not set. First argument is self, second is + the context. More arguments can be given, those being after the explanation in _raise_error (For example, context._raise_error(NewError, '(-x)!', self._sign) would call NewError().handle(context, self._sign).) @@ -222,11 +222,12 @@ class InvalidContext(InvalidOperation): """Invalid context. Unknown rounding, for example. This occurs and signals invalid-operation if an invalid context was - detected during an operation. This can occur if contexts are not checked - on creation and either the precision exceeds the capability of the - underlying concrete representation or an unknown or unsupported rounding - was specified. These aspects of the context need only be checked when - the values are required to be used. The result is [0,qNaN]. + detected during an operation. This can occur if contexts are not + checked on creation and either the precision exceeds the capability of + the underlying concrete representation or an unknown or unsupported + rounding was specified. These aspects of the context need only be + checked when the values are required to be used. The result is + [0,qNaN]. """ def handle(self, context, *args): @@ -319,8 +320,9 @@ class FloatOperation(DecimalException, TypeError): Decimal.from_float() or context.create_decimal_from_float() do not set the flag. - Otherwise (the signal is trapped), only equality comparisons and explicit - conversions are silent. All other mixed operations raise FloatOperation. + Otherwise (the signal is trapped), only equality comparisons and + explicit conversions are silent. All other mixed operations raise + FloatOperation. """ # List of public traps and flags @@ -2898,8 +2900,8 @@ class Decimal(object): """Compares self to other using the abstract representations. This is not like the standard compare, which use their numerical - value. Note that a total ordering is defined for all possible abstract - representations. + value. Note that a total ordering is defined for all possible + abstract representations. """ other = _convert_other(other, raiseit=True) @@ -2970,7 +2972,8 @@ class Decimal(object): def compare_total_mag(self, other, context=None): """Compares self to other using abstract repr., ignoring sign. - Like compare_total, but with operand's sign ignored and assumed to be 0. + Like compare_total, but with operand's sign ignored and assumed to + be 0. """ other = _convert_other(other, raiseit=True) @@ -4107,9 +4110,9 @@ class Context(object): def abs(self, a): """Returns the absolute value of the operand. - If the operand is negative, the result is the same as using the minus - operation on the operand. Otherwise, the result is the same as using - the plus operation on the operand. + If the operand is negative, the result is the same as using the + minus operation on the operand. Otherwise, the result is the same + as using the plus operation on the operand. >>> ExtendedContext.abs(Decimal('2.1')) Decimal('2.1') @@ -4165,16 +4168,17 @@ class Context(object): def compare(self, a, b): """Compares values numerically. - If the signs of the operands differ, a value representing each operand - ('-1' if the operand is less than zero, '0' if the operand is zero or - negative zero, or '1' if the operand is greater than zero) is used in - place of that operand for the comparison instead of the actual - operand. + If the signs of the operands differ, a value representing each + operand ('-1' if the operand is less than zero, '0' if the operand + is zero or negative zero, or '1' if the operand is greater than + zero) is used in place of that operand for the comparison instead of + the actual operand. - The comparison is then effected by subtracting the second operand from - the first and then returning a value according to the result of the - subtraction: '-1' if the result is less than zero, '0' if the result is - zero or negative zero, or '1' if the result is greater than zero. + The comparison is then effected by subtracting the second operand + from the first and then returning a value according to the result of + the subtraction: '-1' if the result is less than zero, '0' if the + result is zero or negative zero, or '1' if the result is greater + than zero. >>> ExtendedContext.compare(Decimal('2.1'), Decimal('3')) Decimal('-1') @@ -4237,8 +4241,8 @@ class Context(object): """Compares two operands using their abstract representation. This is not like the standard compare, which use their numerical - value. Note that a total ordering is defined for all possible abstract - representations. + value. Note that a total ordering is defined for all possible + abstract representations. >>> ExtendedContext.compare_total(Decimal('12.73'), Decimal('127.9')) Decimal('-1') @@ -4265,7 +4269,8 @@ class Context(object): def compare_total_mag(self, a, b): """Compares two operands using their abstract representation ignoring sign. - Like compare_total, but with operand's sign ignored and assumed to be 0. + Like compare_total, but with operand's sign ignored and assumed to + be 0. """ a = _convert_other(a, raiseit=True) return a.compare_total_mag(b) @@ -4923,8 +4928,8 @@ class Context(object): If either operand is a special value then the general rules apply. Otherwise, the operands are multiplied together - ('long multiplication'), resulting in a number which may be as long as - the sum of the lengths of the two operands. + ('long multiplication'), resulting in a number which may be as long + as the sum of the lengths of the two operands. >>> ExtendedContext.multiply(Decimal('1.20'), Decimal('3')) Decimal('3.60') @@ -5200,19 +5205,19 @@ class Context(object): """Returns a value equal to 'a' (rounded), having the exponent of 'b'. The coefficient of the result is derived from that of the left-hand - operand. It may be rounded using the current rounding setting (if the - exponent is being increased), multiplied by a positive power of ten (if - the exponent is being decreased), or is unchanged (if the exponent is - already equal to that of the right-hand operand). + operand. It may be rounded using the current rounding setting (if + the exponent is being increased), multiplied by a positive power of + ten (if the exponent is being decreased), or is unchanged (if the + exponent is already equal to that of the right-hand operand). Unlike other operations, if the length of the coefficient after the quantize operation would be greater than precision then an Invalid - operation condition is raised. This guarantees that, unless there is - an error condition, the exponent of the result of a quantize is always - equal to that of the right-hand operand. + operation condition is raised. This guarantees that, unless there + is an error condition, the exponent of the result of a quantize is + always equal to that of the right-hand operand. - Also unlike other operations, quantize will never raise Underflow, even - if the result is subnormal and inexact. + Also unlike other operations, quantize will never raise Underflow, + even if the result is subnormal and inexact. >>> ExtendedContext.quantize(Decimal('2.17'), Decimal('0.001')) Decimal('2.170') @@ -5266,13 +5271,13 @@ class Context(object): """Returns the remainder from integer division. The result is the residue of the dividend after the operation of - calculating integer division as described for divide-integer, rounded - to precision digits if necessary. The sign of the result, if - non-zero, is the same as that of the original dividend. + calculating integer division as described for divide-integer, + rounded to precision digits if necessary. The sign of the result, + if non-zero, is the same as that of the original dividend. - This operation will fail under the same conditions as integer division - (that is, if integer division on the same two operands would fail, the - remainder cannot be calculated). + This operation will fail under the same conditions as integer + division (that is, if integer division on the same two operands + would fail, the remainder cannot be calculated). >>> ExtendedContext.remainder(Decimal('2.1'), Decimal('3')) Decimal('2.1') @@ -5306,9 +5311,9 @@ class Context(object): is chosen). If the result is equal to 0 then its sign will be the sign of a. - This operation will fail under the same conditions as integer division - (that is, if integer division on the same two operands would fail, the - remainder cannot be calculated). + This operation will fail under the same conditions as integer + division (that is, if integer division on the same two operands + would fail, the remainder cannot be calculated). >>> ExtendedContext.remainder_near(Decimal('2.1'), Decimal('3')) Decimal('-0.9') @@ -5366,8 +5371,8 @@ class Context(object): def same_quantum(self, a, b): """Returns True if the two operands have the same exponent. - The result is never affected by either the sign or the coefficient of - either operand. + The result is never affected by either the sign or the coefficient + of either operand. >>> ExtendedContext.same_quantum(Decimal('2.17'), Decimal('0.001')) False @@ -5439,8 +5444,8 @@ class Context(object): def sqrt(self, a): """Square root of a non-negative number to context precision. - If the result must be inexact, it is rounded using the round-half-even - algorithm. + If the result must be inexact, it is rounded using the + round-half-even algorithm. >>> ExtendedContext.sqrt(Decimal('0')) Decimal('0') diff --git a/Lib/_pyio.py b/Lib/_pyio.py index 116ce4f37..d0adef08e 100644 --- a/Lib/_pyio.py +++ b/Lib/_pyio.py @@ -83,27 +83,28 @@ def open(file, mode="r", buffering=-1, encoding=None, errors=None, wrapped. (If a file descriptor is given, it is closed when the returned I/O object is closed, unless closefd is set to False.) - mode is an optional string that specifies the mode in which the file is - opened. It defaults to 'r' which means open for reading in text mode. Other - common values are 'w' for writing (truncating the file if it already - exists), 'x' for exclusive creation of a new file, and 'a' for appending - (which on some Unix systems, means that all writes append to the end of the - file regardless of the current seek position). In text mode, if encoding is - not specified the encoding used is platform dependent. (For reading and - writing raw bytes use binary mode and leave encoding unspecified.) The - available modes are: + mode is an optional string that specifies the mode in which the file + is opened. It defaults to 'r' which means open for reading in text + mode. Other common values are 'w' for writing (truncating the file if + it already exists), 'x' for exclusive creation of a new file, and + 'a' for appending (which on some Unix systems, means that all writes + append to the end of the file regardless of the current seek position). + In text mode, if encoding is not specified the encoding used is platform + dependent. (For reading and writing raw bytes use binary mode and leave + encoding unspecified.) The available modes are: - ========= =============================================================== + ========= ========================================================== Character Meaning - --------- --------------------------------------------------------------- + --------- ---------------------------------------------------------- 'r' open for reading (default) 'w' open for writing, truncating the file first 'x' create a new file and open it for writing - 'a' open for writing, appending to the end of the file if it exists + 'a' open for writing, appending to the end of the file if it + exists 'b' binary mode 't' text mode (default) '+' open a disk file for updating (reading and writing) - ========= =============================================================== + ========= ========================================================== The default mode is 'rt' (open for reading text). For binary random access, the mode 'w+b' opens and truncates the file to 0 bytes, while @@ -111,23 +112,23 @@ def open(file, mode="r", buffering=-1, encoding=None, errors=None, raises an `FileExistsError` if the file already exists. Python distinguishes between files opened in binary and text modes, - even when the underlying operating system doesn't. Files opened in + even when the underlying operating system doesn't. Files opened in binary mode (appending 'b' to the mode argument) return contents as - bytes objects without any decoding. In text mode (the default, or when + bytes objects without any decoding. In text mode (the default, or when 't' is appended to the mode argument), the contents of the file are returned as strings, the bytes having been first decoded using a platform-dependent encoding or using the specified encoding if given. buffering is an optional integer used to set the buffering policy. - Pass 0 to switch buffering off (only allowed in binary mode), 1 to select - line buffering (only usable in text mode), and an integer > 1 to indicate - the size of a fixed-size chunk buffer. When no buffering argument is - given, the default buffering policy works as follows: + Pass 0 to switch buffering off (only allowed in binary mode), 1 to + select line buffering (only usable in text mode), and an integer > 1 to + indicate the size of a fixed-size chunk buffer. When no buffering + argument is given, the default buffering policy works as follows: - * Binary files are buffered in fixed-size chunks; the size of the buffer - is max(min(blocksize, 8 MiB), DEFAULT_BUFFER_SIZE) - when the device block size is available. - On most systems, the buffer will typically be 128 kilobytes long. + * Binary files are buffered in fixed-size chunks; the size of the buffer + is max(min(blocksize, 8 MiB), DEFAULT_BUFFER_SIZE) when the device + block size is available. + On most systems, the buffer will typically be 128 kilobytes long. * "Interactive" text files (files for which isatty() returns True) use line buffering. Other text files use the policy described above @@ -147,8 +148,8 @@ def open(file, mode="r", buffering=-1, encoding=None, errors=None, encoding error strings. newline is a string controlling how universal newlines works (it only - applies to text mode). It can be None, '', '\n', '\r', and '\r\n'. It works - as follows: + applies to text mode). It can be None, '', '\n', '\r', and '\r\n'. It + works as follows: * On input, if newline is None, universal newlines mode is enabled. Lines in the input can end in '\n', '\r', or '\r\n', and @@ -164,17 +165,17 @@ def open(file, mode="r", buffering=-1, encoding=None, errors=None, other legal values, any '\n' characters written are translated to the given string. - closedfd is a bool. If closefd is False, the underlying file descriptor will - be kept open when the file is closed. This does not work when a file name is - given and must be True in that case. + closedfd is a bool. If closefd is False, the underlying file descriptor + will be kept open when the file is closed. This does not work when + a file name is given and must be True in that case. The newly created file is non-inheritable. A custom opener can be used by passing a callable as *opener*. The - underlying file descriptor for the file object is then obtained by calling - *opener* with (*file*, *flags*). *opener* must return an open file - descriptor (passing os.open as *opener* results in functionality similar to - passing None). + underlying file descriptor for the file object is then obtained by + calling *opener* with (*file*, *flags*). *opener* must return an open + file descriptor (passing os.open as *opener* results in functionality + similar to passing None). open() returns a file object whose type depends on the mode, and through which the standard file operations such as reading and writing @@ -351,10 +352,12 @@ class IOBase(metaclass=abc.ABCMeta): interpreted relative to the position indicated by whence. Values for whence are ints: - * 0 -- start of stream (the default); offset should be zero or positive + * 0 -- start of stream (the default); offset should be zero or + positive * 1 -- current stream position; offset may be negative * 2 -- end of stream; offset is usually negative - Some operating systems / file systems could provide additional values. + Some operating systems / file systems could provide additional + values. Return an int indicating the new absolute position. """ @@ -367,8 +370,8 @@ class IOBase(metaclass=abc.ABCMeta): def truncate(self, pos=None): """Truncate file to size bytes. - Size defaults to the current IO position as reported by tell(). Return - the new size. + Size defaults to the current IO position as reported by tell(). + Return the new size. """ self._unsupported("truncate") @@ -492,7 +495,8 @@ class IOBase(metaclass=abc.ABCMeta): def fileno(self): """Returns underlying file descriptor (an int) if one exists. - An OSError is raised if the IO object does not use a file descriptor. + An OSError is raised if the IO object does not use a file + descriptor. """ self._unsupported("fileno") @@ -1485,17 +1489,22 @@ class FileIO(RawIOBase): _closefd = True def __init__(self, file, mode='r', closefd=True, opener=None): - """Open a file. The mode can be 'r' (default), 'w', 'x' or 'a' for reading, - writing, exclusive creation or appending. The file will be created if it - doesn't exist when opened for writing or appending; it will be truncated - when opened for writing. A FileExistsError will be raised if it already - exists when opened for creating. Opening a file for creating implies - writing so this mode behaves in a similar way to 'w'. Add a '+' to the mode - to allow simultaneous reading and writing. A custom opener can be used by - passing a callable as *opener*. The underlying file descriptor for the file - object is then obtained by calling opener with (*name*, *flags*). - *opener* must return an open file descriptor (passing os.open as *opener* - results in functionality similar to passing None). + """Open a file. + + The mode can be 'r' (default), 'w', 'x' or 'a' for reading, + writing, exclusive creation or appending. The file will be created + if it doesn't exist when opened for writing or appending; it will be + truncated when opened for writing. A FileExistsError will be raised + if it already exists when opened for creating. Opening a file for + creating implies writing so this mode behaves in a similar way to + 'w'. Add a '+' to the mode to allow simultaneous reading and + writing. + + A custom opener can be used by passing a callable as *opener*. + The underlying file descriptor for the file object is then obtained + by calling opener with (*name*, *flags*). *opener* must return + an open file descriptor (passing os.open as *opener* results in + functionality similar to passing None). """ if self._fd >= 0: # Have to close the existing file first. @@ -1733,8 +1742,8 @@ class FileIO(RawIOBase): """Write bytes b to file, return number written. Only makes one system call, so not all of the data may be written. - The number of bytes actually written is returned. In non-blocking mode, - returns None if the write would block. + The number of bytes actually written is returned. In non-blocking + mode, returns None if the write would block. """ self._checkClosed() self._checkWritable() @@ -1746,11 +1755,12 @@ class FileIO(RawIOBase): def seek(self, pos, whence=SEEK_SET): """Move to new file position. - Argument offset is a byte count. Optional argument whence defaults to - SEEK_SET or 0 (offset from start of file, offset should be >= 0); other values - are SEEK_CUR or 1 (move relative to current position, positive or negative), - and SEEK_END or 2 (move relative to end of file, usually negative, although - many platforms allow seeking beyond the end of a file). + Argument offset is a byte count. Optional argument whence defaults + to SEEK_SET or 0 (offset from start of file, offset should be >= 0); + other values are SEEK_CUR or 1 (move relative to current position, + positive or negative), and SEEK_END or 2 (move relative to end of + file, usually negative, although many platforms allow seeking beyond + the end of a file). Note that not all file objects are seekable. """ @@ -1783,8 +1793,8 @@ class FileIO(RawIOBase): def close(self): """Close the file. - A closed file cannot be used for further I/O operations. close() may be - called more than once without error. + A closed file cannot be used for further I/O operations. + close() may be called more than once without error. """ if not self.closed: self._stat_atopen = None @@ -1879,8 +1889,8 @@ class TextIOBase(IOBase): def read(self, size=-1): """Read at most size characters from stream, where size is an int. - Read from underlying buffer until we have size characters or we hit EOF. - If size is negative or omitted, read until EOF. + Read from underlying buffer until we have size characters or we hit + EOF. If size is negative or omitted, read until EOF. Returns a string. """ diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py index b83b84181..6d1f1f843 100644 --- a/Lib/asyncio/base_events.py +++ b/Lib/asyncio/base_events.py @@ -483,10 +483,10 @@ class BaseEventLoop(events.AbstractEventLoop): If factory is None the default task factory will be set. If factory is a callable, it should have a signature matching - '(loop, coro, **kwargs)', where 'loop' will be a reference to the active - event loop, 'coro' will be a coroutine object, and **kwargs will be - arbitrary keyword arguments that should be passed on to Task. - The callable must return a Task. + '(loop, coro, **kwargs)', where 'loop' will be a reference to the + active event loop, 'coro' will be a coroutine object, and **kwargs + will be arbitrary keyword arguments that should be passed on to + Task. The callable must return a Task. """ if factory is not None and not callable(factory): raise TypeError('task factory must be a callable or None') @@ -721,8 +721,8 @@ class BaseEventLoop(events.AbstractEventLoop): def stop(self): """Stop running the event loop. - Every callback already scheduled will still run. This simply informs - run_forever to stop looping after a complete iteration. + Every callback already scheduled will still run. This simply + informs run_forever to stop looping after a complete iteration. """ self._stopping = True @@ -963,7 +963,7 @@ class BaseEventLoop(events.AbstractEventLoop): f"and file {file!r} combination") async def _sock_sendfile_fallback(self, sock, file, offset, count): - if offset: + if hasattr(file, 'seek'): file.seek(offset) blocksize = ( min(count, constants.SENDFILE_FALLBACK_READBUFFER_SIZE) @@ -1070,12 +1070,12 @@ class BaseEventLoop(events.AbstractEventLoop): Create a streaming transport connection to a given internet host and port: socket family AF_INET or socket.AF_INET6 depending on host (or - family if specified), socket type SOCK_STREAM. protocol_factory must be - a callable returning a protocol instance. + family if specified), socket type SOCK_STREAM. protocol_factory must + be a callable returning a protocol instance. - This method is a coroutine which will try to establish the connection - in the background. When successful, the coroutine returns a - (transport, protocol) pair. + This method is a coroutine which will try to establish the + connection in the background. When successful, the coroutine + returns a (transport, protocol) pair. """ if server_hostname is not None and not ssl: raise ValueError('server_hostname is only meaningful with ssl') @@ -1278,7 +1278,6 @@ class BaseEventLoop(events.AbstractEventLoop): raise RuntimeError( f"fallback is disabled and native sendfile is not " f"supported for transport {transport!r}") - return await self._sendfile_fallback(transport, file, offset, count) @@ -1287,7 +1286,7 @@ class BaseEventLoop(events.AbstractEventLoop): "sendfile syscall is not supported") async def _sendfile_fallback(self, transp, file, offset, count): - if offset: + if hasattr(file, 'seek'): file.seek(offset) blocksize = min(count, 16384) if count else 16384 buf = bytearray(blocksize) @@ -1543,11 +1542,11 @@ class BaseEventLoop(events.AbstractEventLoop): The host parameter can be a string, in that case the TCP server is bound to host and port. - The host parameter can also be a sequence of strings and in that case - the TCP server is bound to all hosts of the sequence. If a host - appears multiple times (possibly indirectly e.g. when hostnames - resolve to the same IP address), the server is only bound once to that - host. + The host parameter can also be a sequence of strings and in that + case the TCP server is bound to all hosts of the sequence. If + a host appears multiple times (possibly indirectly e.g. when + hostnames resolve to the same IP address), the server is only bound + once to that host. Return a Server object which can be used to stop the service. diff --git a/Lib/asyncio/coroutines.py b/Lib/asyncio/coroutines.py index a51319cb7..6727065bb 100644 --- a/Lib/asyncio/coroutines.py +++ b/Lib/asyncio/coroutines.py @@ -18,8 +18,8 @@ _is_coroutine = object() def iscoroutinefunction(func): - import warnings """Return True if func is a decorated coroutine function.""" + import warnings warnings._deprecated("asyncio.iscoroutinefunction", f"{warnings._DEPRECATED_MSG}; " "use inspect.iscoroutinefunction() instead", diff --git a/Lib/asyncio/events.py b/Lib/asyncio/events.py index a7fb55982..42d8408a3 100644 --- a/Lib/asyncio/events.py +++ b/Lib/asyncio/events.py @@ -374,8 +374,8 @@ class AbstractEventLoop: If host is an empty string or None all interfaces are assumed and a list of multiple sockets will be returned (most likely - one for IPv4 and another one for IPv6). The host parameter can also be - a sequence (e.g. list) of hosts to bind to. + one for IPv4 and another one for IPv6). The host parameter can also + be a sequence (e.g. list) of hosts to bind to. family can be set to either AF_INET or AF_INET6 to force the socket to use IPv4 or IPv6. If not set it will be determined @@ -415,8 +415,9 @@ class AbstractEventLoop: start_serving set to True (default) causes the created server to start accepting connections immediately. When set to False, - the user should await Server.start_serving() or Server.serve_forever() - to make the server to start accepting connections. + the user should await Server.start_serving() or + Server.serve_forever() to make the server to start accepting + connections. """ raise NotImplementedError @@ -479,8 +480,9 @@ class AbstractEventLoop: start_serving set to True (default) causes the created server to start accepting connections immediately. When set to False, - the user should await Server.start_serving() or Server.serve_forever() - to make the server to start accepting connections. + the user should await Server.start_serving() or + Server.serve_forever() to make the server to start accepting + connections. """ raise NotImplementedError @@ -511,8 +513,8 @@ class AbstractEventLoop: protocol_factory must be a callable returning a protocol instance. - socket family AF_INET, socket.AF_INET6 or socket.AF_UNIX depending on - host (or family if specified), socket type SOCK_DGRAM. + socket family AF_INET, socket.AF_INET6 or socket.AF_UNIX depending + on host (or family if specified), socket type SOCK_DGRAM. reuse_address tells the kernel to reuse a local socket in TIME_WAIT state, without waiting for its natural timeout to @@ -552,7 +554,8 @@ class AbstractEventLoop: async def connect_write_pipe(self, protocol_factory, pipe): """Register write pipe in event loop. - protocol_factory should instantiate object with BaseProtocol interface. + protocol_factory should instantiate object with BaseProtocol + interface. Pipe is file-like object already switched to nonblocking. Return pair (transport, protocol), where transport support WriteTransport interface.""" diff --git a/Lib/asyncio/graph.py b/Lib/asyncio/graph.py index b5bfeb163..35f7fa621 100644 --- a/Lib/asyncio/graph.py +++ b/Lib/asyncio/graph.py @@ -112,13 +112,13 @@ def capture_call_graph( optional keyword-only 'depth' argument can be used to skip the specified number of frames from top of the stack. - If the optional keyword-only 'limit' argument is provided, each call stack - in the resulting graph is truncated to include at most ``abs(limit)`` - entries. If 'limit' is positive, the entries left are the closest to - the invocation point. If 'limit' is negative, the topmost entries are - left. If 'limit' is omitted or None, all entries are present. - If 'limit' is 0, the call stack is not captured at all, only - "awaited by" information is present. + If the optional keyword-only 'limit' argument is provided, each call + stack in the resulting graph is truncated to include at most + ``abs(limit)`` entries. If 'limit' is positive, the entries left are + the closest to the invocation point. If 'limit' is negative, the + topmost entries are left. If 'limit' is omitted or None, all entries + are present. If 'limit' is 0, the call stack is not captured at all, + only "awaited by" information is present. """ loop = events._get_running_loop() diff --git a/Lib/asyncio/locks.py b/Lib/asyncio/locks.py index fa3a94764..1592d30ed 100644 --- a/Lib/asyncio/locks.py +++ b/Lib/asyncio/locks.py @@ -158,10 +158,10 @@ class Lock(_ContextManagerMixin, mixins._LoopBoundMixin): class Event(mixins._LoopBoundMixin): """Asynchronous equivalent to threading.Event. - Class implementing event objects. An event manages a flag that can be set - to true with the set() method and reset to false with the clear() method. - The wait() method blocks until the flag is true. The flag is initially - false. + Class implementing event objects. An event manages a flag that can be + set to true with the set() method and reset to false with the clear() + method. The wait() method blocks until the flag is true. The flag is + initially false. """ def __init__(self): @@ -353,9 +353,9 @@ class Semaphore(_ContextManagerMixin, mixins._LoopBoundMixin): """A Semaphore implementation. A semaphore manages an internal counter which is decremented by each - acquire() call and incremented by each release() call. The counter - can never go below zero; when acquire() finds that it is zero, it blocks, - waiting until some other thread calls release(). + acquire() call and incremented by each release() call. The counter + can never go below zero; when acquire() finds that it is zero, it + blocks, waiting until some other thread calls release(). Semaphores also support the context management protocol. @@ -511,8 +511,8 @@ class Barrier(mixins._LoopBoundMixin): async def wait(self): """Wait for the barrier. - When the specified number of tasks have started waiting, they are all - simultaneously awoken. + When the specified number of tasks have started waiting, they are + all simultaneously awoken. Returns an unique and individual index number from 0 to 'parties-1'. """ async with self._cond: diff --git a/Lib/asyncio/proactor_events.py b/Lib/asyncio/proactor_events.py index f404273c3..6b94975d0 100644 --- a/Lib/asyncio/proactor_events.py +++ b/Lib/asyncio/proactor_events.py @@ -756,8 +756,7 @@ class BaseProactorEventLoop(base_events.BaseEventLoop): offset += blocksize total_sent += blocksize finally: - if total_sent > 0: - file.seek(offset) + file.seek(offset) async def _sendfile_native(self, transp, file, offset, count): resume_reading = transp.is_reading() diff --git a/Lib/asyncio/queues.py b/Lib/asyncio/queues.py index 756216fac..30004f2bc 100644 --- a/Lib/asyncio/queues.py +++ b/Lib/asyncio/queues.py @@ -33,9 +33,9 @@ class QueueShutDown(Exception): class Queue(mixins._LoopBoundMixin): """A queue, useful for coordinating producer and consumer coroutines. - If maxsize is less than or equal to zero, the queue size is infinite. If it - is an integer greater than 0, then "await put()" will block when the - queue reaches maxsize, until an item is removed by get(). + If maxsize is less than or equal to zero, the queue size is infinite. + If it is an integer greater than 0, then "await put()" will block when + the queue reaches maxsize, until an item is removed by get(). Unlike queue.Queue, you can reliably know this Queue's size with qsize(), since your single-threaded asyncio application won't be @@ -174,8 +174,8 @@ class Queue(mixins._LoopBoundMixin): If queue is empty, wait until an item is available. - Raises QueueShutDown if the queue has been shut down and is empty, or - if the queue has been shut down immediately. + Raises QueueShutDown if the queue has been shut down and is empty, + or if the queue has been shut down immediately. """ while self.empty(): if self._is_shutdown and self.empty(): @@ -203,10 +203,11 @@ class Queue(mixins._LoopBoundMixin): def get_nowait(self): """Remove and return an item from the queue. - Return an item if one is immediately available, else raise QueueEmpty. + Return an item if one is immediately available, else raise + QueueEmpty. - Raises QueueShutDown if the queue has been shut down and is empty, or - if the queue has been shut down immediately. + Raises QueueShutDown if the queue has been shut down and is empty, + or if the queue has been shut down immediately. """ if self.empty(): if self._is_shutdown: @@ -223,12 +224,12 @@ class Queue(mixins._LoopBoundMixin): a subsequent call to task_done() tells the queue that the processing on the task is complete. - If a join() is currently blocking, it will resume when all items have - been processed (meaning that a task_done() call was received for every - item that had been put() into the queue). + If a join() is currently blocking, it will resume when all items + have been processed (meaning that a task_done() call was received + for every item that had been put() into the queue). - Raises ValueError if called more times than there were items placed in - the queue. + Raises ValueError if called more times than there were items placed + in the queue. """ if self._unfinished_tasks <= 0: raise ValueError('task_done() called too many times') @@ -239,10 +240,11 @@ class Queue(mixins._LoopBoundMixin): async def join(self): """Block until all items in the queue have been gotten and processed. - The count of unfinished tasks goes up whenever an item is added to the - queue. The count goes down whenever a consumer calls task_done() to - indicate that the item was retrieved and all work on it is complete. - When the count of unfinished tasks drops to zero, join() unblocks. + The count of unfinished tasks goes up whenever an item is added to + the queue. The count goes down whenever a consumer calls + task_done() to indicate that the item was retrieved and all work on + it is complete. When the count of unfinished tasks drops to zero, + join() unblocks. """ if self._unfinished_tasks > 0: await self._finished.wait() diff --git a/Lib/asyncio/runners.py b/Lib/asyncio/runners.py index ba37e003a..774a31756 100644 --- a/Lib/asyncio/runners.py +++ b/Lib/asyncio/runners.py @@ -35,7 +35,8 @@ class Runner: with asyncio.Runner(debug=True) as runner: runner.run(main()) - The run() method can be called multiple times within the runner's context. + The run() method can be called multiple times within the runner's + context. This can be useful for interactive console (e.g. IPython), unittest runners, console tools, -- everywhere when async code diff --git a/Lib/asyncio/selector_events.py b/Lib/asyncio/selector_events.py index ff7e16df3..7c2062e3d 100644 --- a/Lib/asyncio/selector_events.py +++ b/Lib/asyncio/selector_events.py @@ -530,11 +530,12 @@ class BaseSelectorEventLoop(base_events.BaseEventLoop): async def sock_sendall(self, sock, data): """Send data to the socket. - The socket must be connected to a remote socket. This method continues - to send data from data until either all data has been sent or an - error occurs. None is returned on success. On error, an exception is - raised, and there is no way to determine how much data, if any, was - successfully processed by the receiving end of the connection. + The socket must be connected to a remote socket. This method + continues to send data from data until either all data has been + sent or an error occurs. None is returned on success. On error, + an exception is raised, and there is no way to determine how much + data, if any, was successfully processed by the receiving end of + the connection. """ base_events._check_ssl_socket(sock) if self._debug and sock.gettimeout() != 0: @@ -583,11 +584,12 @@ class BaseSelectorEventLoop(base_events.BaseEventLoop): async def sock_sendto(self, sock, data, address): """Send data to the socket. - The socket must be connected to a remote socket. This method continues - to send data from data until either all data has been sent or an - error occurs. None is returned on success. On error, an exception is - raised, and there is no way to determine how much data, if any, was - successfully processed by the receiving end of the connection. + The socket must be connected to a remote socket. This method + continues to send data from data until either all data has been + sent or an error occurs. None is returned on success. On error, + an exception is raised, and there is no way to determine how much + data, if any, was successfully processed by the receiving end of + the connection. """ base_events._check_ssl_socket(sock) if self._debug and sock.gettimeout() != 0: @@ -698,10 +700,11 @@ class BaseSelectorEventLoop(base_events.BaseEventLoop): async def sock_accept(self, sock): """Accept a connection. - The socket must be bound to an address and listening for connections. - The return value is a pair (conn, address) where conn is a new socket - object usable to send and receive data on the connection, and address - is the address bound to the socket on the other end of the connection. + The socket must be bound to an address and listening for + connections. The return value is a pair (conn, address) where + conn is a new socket object usable to send and receive data on the + connection, and address is the address bound to the socket on the + other end of the connection. """ base_events._check_ssl_socket(sock) if self._debug and sock.gettimeout() != 0: diff --git a/Lib/asyncio/streams.py b/Lib/asyncio/streams.py index 64aac4cc5..dd8f66186 100644 --- a/Lib/asyncio/streams.py +++ b/Lib/asyncio/streams.py @@ -541,17 +541,17 @@ class StreamReader: self._waiter = None async def readline(self): - """Read chunk of data from the stream until newline (b'\n') is found. + r"""Read chunk of data from the stream until newline (b'\n') is found. - On success, return chunk that ends with newline. If only partial + On success, return chunk that ends with newline. If only partial line can be read due to EOF, return incomplete line without - terminating newline. When EOF was reached while no bytes read, empty - bytes object is returned. + terminating newline. When EOF was reached while no bytes read, + empty bytes object is returned. - If limit is reached, ValueError will be raised. In that case, if + If limit is reached, ValueError will be raised. In that case, if newline was found, complete line including newline will be removed - from internal buffer. Else, internal buffer will be cleared. Limit is - compared against part of the line without newline. + from internal buffer. Else, internal buffer will be cleared. + Limit is compared against part of the line without newline. If stream was paused, this function will automatically resume it if needed. diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py index fbd5c39a7..14d3c1ceb 100644 --- a/Lib/asyncio/tasks.py +++ b/Lib/asyncio/tasks.py @@ -624,10 +624,11 @@ def as_completed(fs, *, timeout=None): Run the supplied awaitables concurrently. The returned object can be iterated to obtain the results of the awaitables as they finish. - The object returned can be iterated as an asynchronous iterator or a plain - iterator. When asynchronous iteration is used, the originally-supplied - awaitables are yielded if they are tasks or futures. This makes it easy to - correlate previously-scheduled tasks with their results: + The object returned can be iterated as an asynchronous iterator or + a plain iterator. When asynchronous iteration is used, the + originally-supplied awaitables are yielded if they are tasks or + futures. This makes it easy to correlate previously-scheduled tasks + with their results: ipv4_connect = create_task(open_connection("127.0.0.1", 80)) ipv6_connect = create_task(open_connection("::1", 80)) @@ -643,26 +644,27 @@ def as_completed(fs, *, timeout=None): else: print("IPv4 connection established.") - During asynchronous iteration, implicitly-created tasks will be yielded for - supplied awaitables that aren't tasks or futures. + During asynchronous iteration, implicitly-created tasks will be + yielded for supplied awaitables that aren't tasks or futures. - When used as a plain iterator, each iteration yields a new coroutine that - returns the result or raises the exception of the next completed awaitable. - This pattern is compatible with Python versions older than 3.13: + When used as a plain iterator, each iteration yields a new coroutine + that returns the result or raises the exception of the next completed + awaitable. This pattern is compatible with Python versions older than + 3.13: ipv4_connect = create_task(open_connection("127.0.0.1", 80)) ipv6_connect = create_task(open_connection("::1", 80)) tasks = [ipv4_connect, ipv6_connect] for next_connect in as_completed(tasks): - # next_connect is not one of the original task objects. It must be - # awaited to obtain the result value or raise the exception of the - # awaitable that finishes next. + # next_connect is not one of the original task objects. It must + # be awaited to obtain the result value or raise the exception + # of the awaitable that finishes next. reader, writer = await next_connect - A TimeoutError is raised if the timeout occurs before all awaitables are - done. This is raised by the async for loop during asynchronous iteration or - by the coroutines yielded during plain iteration. + A TimeoutError is raised if the timeout occurs before all awaitables + are done. This is raised by the async for loop during asynchronous + iteration or by the coroutines yielded during plain iteration. """ if inspect.isawaitable(fs): raise TypeError( @@ -1030,21 +1032,22 @@ def run_coroutine_threadsafe(coro, loop): def create_eager_task_factory(custom_task_constructor): """Create a function suitable for use as a task factory on an event-loop. - Example usage: + Example usage: - loop.set_task_factory( - asyncio.create_eager_task_factory(my_task_constructor)) + loop.set_task_factory( + asyncio.create_eager_task_factory(my_task_constructor)) - Now, tasks created will be started immediately (rather than being first - scheduled to an event loop). The constructor argument can be any callable - that returns a Task-compatible object and has a signature compatible - with `Task.__init__`; it must have the `eager_start` keyword argument. + Now, tasks created will be started immediately (rather than being first + scheduled to an event loop). The constructor argument can be any + callable that returns a Task-compatible object and has a signature + compatible with `Task.__init__`; it must have the `eager_start` + keyword argument. - Most applications will use `Task` for `custom_task_constructor` and in - this case there's no need to call `create_eager_task_factory()` - directly. Instead the global `eager_task_factory` instance can be - used. E.g. `loop.set_task_factory(asyncio.eager_task_factory)`. - """ + Most applications will use `Task` for `custom_task_constructor` and in + this case there's no need to call `create_eager_task_factory()` + directly. Instead the global `eager_task_factory` instance can be + used. E.g. `loop.set_task_factory(asyncio.eager_task_factory)`. + """ def factory(loop, coro, *, eager_start=True, **kwargs): return custom_task_constructor( diff --git a/Lib/asyncio/threads.py b/Lib/asyncio/threads.py index db048a823..5001351b0 100644 --- a/Lib/asyncio/threads.py +++ b/Lib/asyncio/threads.py @@ -17,7 +17,8 @@ async def to_thread(func, /, *args, **kwargs): allowing context variables from the main thread to be accessed in the separate thread. - Return a coroutine that can be awaited to get the eventual result of *func*. + Return a coroutine that can be awaited to get the eventual result of + *func*. """ loop = events.get_running_loop() ctx = contextvars.copy_context() diff --git a/Lib/asyncio/timeouts.py b/Lib/asyncio/timeouts.py index 09342dc7c..65ddc285a 100644 --- a/Lib/asyncio/timeouts.py +++ b/Lib/asyncio/timeouts.py @@ -25,7 +25,8 @@ class _State(enum.Enum): class Timeout: """Asynchronous context manager for cancelling overdue coroutines. - Use `timeout()` or `timeout_at()` rather than instantiating this class directly. + Use `timeout()` or `timeout_at()` rather than instantiating this class + directly. """ def __init__(self, when: float | None) -> None: diff --git a/Lib/asyncio/unix_events.py b/Lib/asyncio/unix_events.py index 1c1458127..bfb3da0de 100644 --- a/Lib/asyncio/unix_events.py +++ b/Lib/asyncio/unix_events.py @@ -54,7 +54,8 @@ def waitstatus_to_exitcode(status): class _UnixSelectorEventLoop(selector_events.BaseSelectorEventLoop): """Unix event loop. - Adds signal handling and UNIX Domain Socket support to SelectorEventLoop. + Adds signal handling and UNIX Domain Socket support to + SelectorEventLoop. """ def __init__(self, selector=None): @@ -384,12 +385,12 @@ class _UnixSelectorEventLoop(selector_events.BaseSelectorEventLoop): # order to simplify the common case. self.remove_writer(registered_fd) if fut.cancelled(): - self._sock_sendfile_update_filepos(fileno, offset, total_sent) + self._sock_sendfile_update_filepos(fileno, offset) return if count: blocksize = count - total_sent if blocksize <= 0: - self._sock_sendfile_update_filepos(fileno, offset, total_sent) + self._sock_sendfile_update_filepos(fileno, offset) fut.set_result(total_sent) return @@ -423,20 +424,20 @@ class _UnixSelectorEventLoop(selector_events.BaseSelectorEventLoop): # plain send(). err = exceptions.SendfileNotAvailableError( "os.sendfile call failed") - self._sock_sendfile_update_filepos(fileno, offset, total_sent) + self._sock_sendfile_update_filepos(fileno, offset) fut.set_exception(err) else: - self._sock_sendfile_update_filepos(fileno, offset, total_sent) + self._sock_sendfile_update_filepos(fileno, offset) fut.set_exception(exc) except (SystemExit, KeyboardInterrupt): raise except BaseException as exc: - self._sock_sendfile_update_filepos(fileno, offset, total_sent) + self._sock_sendfile_update_filepos(fileno, offset) fut.set_exception(exc) else: if sent == 0: # EOF - self._sock_sendfile_update_filepos(fileno, offset, total_sent) + self._sock_sendfile_update_filepos(fileno, offset) fut.set_result(total_sent) else: offset += sent @@ -447,9 +448,9 @@ class _UnixSelectorEventLoop(selector_events.BaseSelectorEventLoop): fd, sock, fileno, offset, count, blocksize, total_sent) - def _sock_sendfile_update_filepos(self, fileno, offset, total_sent): - if total_sent > 0: - os.lseek(fileno, offset, os.SEEK_SET) + def _sock_sendfile_update_filepos(self, fileno, offset): + # After this helper runs, the source fd's lseek pointer is at offset." + os.lseek(fileno, offset, os.SEEK_SET) def _sock_add_cancellation_callback(self, fut, sock): def cb(fut): diff --git a/Lib/asyncio/windows_events.py b/Lib/asyncio/windows_events.py index 5f75b17d8..0bf773213 100644 --- a/Lib/asyncio/windows_events.py +++ b/Lib/asyncio/windows_events.py @@ -610,6 +610,9 @@ class IocpProactor: ov = _overlapped.Overlapped(NULL) offset_low = offset & 0xffff_ffff offset_high = (offset >> 32) & 0xffff_ffff + # TransmitFile ignores OVERLAPPED.Offset for handles not opened with + # FILE_FLAG_OVERLAPPED, so seek the CRT file pointer to match. + file.seek(offset) ov.TransmitFile(sock.fileno(), msvcrt.get_osfhandle(file.fileno()), offset_low, offset_high, diff --git a/Lib/base64.py b/Lib/base64.py index f95132a42..775ceab0e 100644 --- a/Lib/base64.py +++ b/Lib/base64.py @@ -325,17 +325,20 @@ def a85encode(b, *, foldspaces=False, wrapcol=0, pad=False, adobe=False): foldspaces is an optional flag that uses the special short sequence 'y' instead of 4 consecutive spaces (ASCII 0x20) as supported by 'btoa'. This - feature is not supported by the "standard" Adobe encoding. + feature is not supported by the standard encoding used in PDF. - wrapcol controls whether the output should have newline (b'\\n') characters - added to it. If this is non-zero, each output line will be at most this - many characters long, excluding the trailing newline. + If wrapcol is non-zero, insert a newline (b'\\n') character after at most + every wrapcol characters. - pad controls whether the input is padded to a multiple of 4 before - encoding. Note that the btoa implementation always pads. + pad controls whether zero-padding applied to the end of the input + is fully retained in the output encoding, as done by btoa, + producing an exact multiple of 5 bytes of output. + + adobe controls whether the encoded byte sequence is framed with <~ + and ~>, as in a PostScript base-85 string literal. Note that + while ASCII85Decode streams in PDF documents must be terminated + with ~>, they must not use a leading <~. - adobe controls whether the encoded byte sequence is framed with <~ and ~>, - which is used by the Adobe implementation. """ global _a85chars, _a85chars2 # Delay the initialization of tables to not waste memory @@ -364,12 +367,14 @@ def a85encode(b, *, foldspaces=False, wrapcol=0, pad=False, adobe=False): def a85decode(b, *, foldspaces=False, adobe=False, ignorechars=b' \t\n\r\v'): """Decode the Ascii85 encoded bytes-like object or ASCII string b. - foldspaces is a flag that specifies whether the 'y' short sequence should be - accepted as shorthand for 4 consecutive spaces (ASCII 0x20). This feature is - not supported by the "standard" Adobe encoding. + foldspaces is a flag that specifies whether the 'y' short sequence + should be accepted as shorthand for 4 consecutive spaces (ASCII + 0x20). This feature is not supported by the standard Ascii85 + encoding used in PDF and PostScript. - adobe controls whether the input sequence is in Adobe Ascii85 format (i.e. - is framed with <~ and ~>). + adobe controls whether the <~ and ~> markers are present. While + the leading <~ is not required, the input must end with ~>, or a + ValueError is raised. ignorechars should be a byte string containing characters to ignore from the input. This should only contain whitespace characters, and by default @@ -442,8 +447,10 @@ _b85dec = None def b85encode(b, pad=False): """Encode bytes-like object b in base85 format and return a bytes object. - If pad is true, the input is padded with b'\\0' so its length is a multiple of - 4 bytes before encoding. + The input is padded with b'\0' so its length is a multiple of 4 + bytes before encoding. If pad is true, all the resulting + characters are retained in the output, which will always be a + multiple of 5 bytes. """ global _b85chars, _b85chars2 # Delay the initialization of tables to not waste memory diff --git a/Lib/compression/zstd/__init__.py b/Lib/compression/zstd/__init__.py index 84b25914b..5326cf9b1 100644 --- a/Lib/compression/zstd/__init__.py +++ b/Lib/compression/zstd/__init__.py @@ -61,8 +61,9 @@ class FrameInfo: def get_frame_info(frame_buffer): """Get Zstandard frame information from a frame header. - *frame_buffer* is a bytes-like object. It should start from the beginning - of a frame, and needs to include at least the frame header (6 to 18 bytes). + *frame_buffer* is a bytes-like object. It should start from the + beginning of a frame, and needs to include at least the frame header + (6 to 18 bytes). The returned FrameInfo object has two attributes. 'decompressed_size' is the size in bytes of the data in the frame when @@ -103,16 +104,17 @@ def finalize_dict(zstd_dict, /, samples, dict_size, level): finalize *zstd_dict* by adding headers and statistics according to the Zstandard dictionary format. - You may compose an effective dictionary content by hand, which is used as - basis dictionary, and use some samples to finalize a dictionary. The basis - dictionary may be a "raw content" dictionary. See *is_raw* in ZstdDict. + You may compose an effective dictionary content by hand, which is used + as basis dictionary, and use some samples to finalize a dictionary. The + basis dictionary may be a "raw content" dictionary. See *is_raw* in + ZstdDict. - *samples* is an iterable of samples, where a sample is a bytes-like object - representing a file. + *samples* is an iterable of samples, where a sample is a bytes-like + object representing a file. *dict_size* is the dictionary's maximum size, in bytes. *level* is the expected compression level. The statistics for each - compression level differ, so tuning the dictionary to the compression level - can provide improvements. + compression level differ, so tuning the dictionary to the compression + level can provide improvements. """ if not isinstance(zstd_dict, ZstdDict): @@ -140,8 +142,8 @@ def compress(data, level=None, options=None, zstd_dict=None): COMPRESSION_LEVEL_DEFAULT ('3'). *options* is a dict object that contains advanced compression parameters. See CompressionParameter for more on options. - *zstd_dict* is a ZstdDict object, a pre-trained Zstandard dictionary. See - the function train_dict for how to train a ZstdDict on sample data. + *zstd_dict* is a ZstdDict object, a pre-trained Zstandard dictionary. + See the function train_dict for how to train a ZstdDict on sample data. For incremental compression, use a ZstdCompressor instead. """ @@ -152,8 +154,8 @@ def compress(data, level=None, options=None, zstd_dict=None): def decompress(data, zstd_dict=None, options=None): """Decompress one or more frames of Zstandard compressed *data*. - *zstd_dict* is a ZstdDict object, a pre-trained Zstandard dictionary. See - the function train_dict for how to train a ZstdDict on sample data. + *zstd_dict* is a ZstdDict object, a pre-trained Zstandard dictionary. + See the function train_dict for how to train a ZstdDict on sample data. *options* is a dict object that contains advanced compression parameters. See DecompressionParameter for more on options. diff --git a/Lib/compression/zstd/_zstdfile.py b/Lib/compression/zstd/_zstdfile.py index d709f5efc..8d3358152 100644 --- a/Lib/compression/zstd/_zstdfile.py +++ b/Lib/compression/zstd/_zstdfile.py @@ -36,9 +36,9 @@ class ZstdFile(_streams.BaseStream): *file* can be either an file-like object, or a file name to open. - *mode* can be 'r' for reading (default), 'w' for (over)writing, 'x' for - creating exclusively, or 'a' for appending. These can equivalently be - given as 'rb', 'wb', 'xb' and 'ab' respectively. + *mode* can be 'r' for reading (default), 'w' for (over)writing, 'x' + for creating exclusively, or 'a' for appending. These can + equivalently be given as 'rb', 'wb', 'xb' and 'ab' respectively. *level* is an optional int specifying the compression level to use, or COMPRESSION_LEVEL_DEFAULT if not given. @@ -296,26 +296,27 @@ def open(file, /, mode='rb', *, level=None, options=None, zstd_dict=None, encoding=None, errors=None, newline=None): """Open a Zstandard compressed file in binary or text mode. - file can be either a file name (given as a str, bytes, or PathLike object), - in which case the named file is opened, or it can be an existing file object - to read from or write to. + file can be either a file name (given as a str, bytes, or PathLike + object), in which case the named file is opened, or it can be + an existing file object to read from or write to. - The mode parameter can be 'r', 'rb' (default), 'w', 'wb', 'x', 'xb', 'a', - 'ab' for binary mode, or 'rt', 'wt', 'xt', 'at' for text mode. + The mode parameter can be 'r', 'rb' (default), 'w', 'wb', 'x', 'xb', + 'a', 'ab' for binary mode, or 'rt', 'wt', 'xt', 'at' for text mode. - The level, options, and zstd_dict parameters specify the settings the same - as ZstdFile. + The level, options, and zstd_dict parameters specify the settings the + same as ZstdFile. When using read mode (decompression), the options parameter is a dict - representing advanced decompression options. The level parameter is not - supported in this case. When using write mode (compression), only one of - level, an int representing the compression level, or options, a dict - representing advanced compression options, may be passed. In both modes, - zstd_dict is a ZstdDict instance containing a trained Zstandard dictionary. + representing advanced decompression options. The level parameter is not + supported in this case. When using write mode (compression), only one + of level, an int representing the compression level, or options, a dict + representing advanced compression options, may be passed. In both + modes, zstd_dict is a ZstdDict instance containing a trained Zstandard + dictionary. - For binary mode, this function is equivalent to the ZstdFile constructor: - ZstdFile(filename, mode, ...). In this case, the encoding, errors and - newline parameters must not be provided. + For binary mode, this function is equivalent to the ZstdFile + constructor: ZstdFile(filename, mode, ...). In this case, the encoding, + errors and newline parameters must not be provided. For text mode, an ZstdFile object is created, and wrapped in an io.TextIOWrapper instance with the specified encoding, error handling diff --git a/Lib/email/_header_value_parser.py b/Lib/email/_header_value_parser.py index 1367e3419..c02175e24 100644 --- a/Lib/email/_header_value_parser.py +++ b/Lib/email/_header_value_parser.py @@ -1463,6 +1463,16 @@ def get_phrase(value): else: try: token, value = get_word(value) + if (token[0].token_type == 'encoded-word' + and phrase + and phrase[-1].token_type == 'atom' + and len(phrase[-1]) > 1 + and phrase[-1][-2].token_type == 'encoded-word' + and phrase[-1][-1].token_type == 'cfws' + and not phrase[-1][-1].comments + ): + # linear ws between ews needs special handing... + phrase[-1][-1] = EWWhiteSpaceTerminal(phrase[-1], 'fws') except errors.HeaderParseError: if value[0] in CFWS_LEADER: token, value = get_cfws(value) diff --git a/Lib/email/_parseaddr.py b/Lib/email/_parseaddr.py index 6a7c5fa06..e311948cb 100644 --- a/Lib/email/_parseaddr.py +++ b/Lib/email/_parseaddr.py @@ -59,7 +59,7 @@ def _parsedate_tz(data): The last (additional) element is the time zone offset in seconds, except if the timezone was specified as -0000. In that case the last element is - None. This indicates a UTC timestamp that explicitly declaims knowledge of + None. This indicates a UTC timestamp that explicitly disclaims knowledge of the source timezone, as opposed to a +0000 timestamp that indicates the source timezone really was UTC. diff --git a/Lib/email/charset.py b/Lib/email/charset.py index 5036c3f58..c4b246455 100644 --- a/Lib/email/charset.py +++ b/Lib/email/charset.py @@ -93,8 +93,6 @@ ALIASES = { # Map charsets to their Unicode codec strings. CODEC_MAP = { - 'gb2312': 'eucgb2312_cn', - 'big5': 'big5_tw', # Hack: We don't want *any* conversion for stuff marked us-ascii, as all # sorts of garbage might be sent to us in the guise of 7-bit us-ascii. # Let that stuff pass through without conversion to/from Unicode. diff --git a/Lib/encodings/aliases.py b/Lib/encodings/aliases.py index 4ecb6b6e2..8b175772c 100644 --- a/Lib/encodings/aliases.py +++ b/Lib/encodings/aliases.py @@ -71,6 +71,10 @@ aliases = { # cp1140 codec '1140' : 'cp1140', + 'cp01140' : 'cp1140', + 'csibm01140' : 'cp1140', + 'ebcdic_us_37_euro' : 'cp1140', + 'ibm01140' : 'cp1140', 'ibm1140' : 'cp1140', # cp1250 codec @@ -159,8 +163,12 @@ aliases = { # cp858 codec '858' : 'cp858', + 'cp00858' : 'cp858', + 'csibm00858' : 'cp858', 'csibm858' : 'cp858', + 'ibm00858' : 'cp858', 'ibm858' : 'cp858', + 'pc_multilingual_850_euro' : 'cp858', # cp860 codec '860' : 'cp860', diff --git a/Lib/enum.py b/Lib/enum.py index b4551da1c..87b2f2ab7 100644 --- a/Lib/enum.py +++ b/Lib/enum.py @@ -678,9 +678,9 @@ class EnumType(type): """ Either returns an existing member, or creates a new enum class. - This method is used both when an enum class is given a value to match - to an enumeration member (i.e. Color(3)) and for the functional API - (i.e. Color = Enum('Color', names='RED GREEN BLUE')). + This method is used both when an enum class is given a value to + match to an enumeration member (i.e. Color(3)) and for the + functional API (i.e. Color = Enum('Color', names='RED GREEN BLUE')). The value lookup branch is chosen if the enum is final. @@ -688,16 +688,17 @@ class EnumType(type): `value` will be the name of the new class. - `names` should be either a string of white-space/comma delimited names - (values will start at `start`), or an iterator/mapping of name, value pairs. + `names` should be either a string of white-space/comma delimited + names (values will start at `start`), or an iterator/mapping of + name, value pairs. `module` should be set to the module this class is being created in; - if it is not set, an attempt to find that module will be made, but if - it fails the class will not be picklable. + if it is not set, an attempt to find that module will be made, but + if it fails the class will not be picklable. - `qualname` should be set to the actual location this class can be found - at in its module; by default it is set to the global scope. If this is - not correct, unpickling will fail in some circumstances. + `qualname` should be set to the actual location this class can be + found at in its module; by default it is set to the global scope. + If this is not correct, unpickling will fail in some circumstances. `type`, if set, will be mixed in as the first base class. """ @@ -791,8 +792,8 @@ class EnumType(type): """ Returns a mapping of member name->value. - This mapping lists all enum members, including aliases. Note that this - is a read-only view of the internal mapping. + This mapping lists all enum members, including aliases. Note that + this is a read-only view of the internal mapping. """ return MappingProxyType(cls._member_map_) diff --git a/Lib/ftplib.py b/Lib/ftplib.py index 50771e8c1..73882a38d 100644 --- a/Lib/ftplib.py +++ b/Lib/ftplib.py @@ -883,7 +883,16 @@ def ftpcp(source, sourcename, target, targetname = '', type = 'I'): type = 'TYPE ' + type source.voidcmd(type) target.voidcmd(type) - sourcehost, sourceport = parse227(source.sendcmd('PASV')) + # Don't trust the IPv4 address the source server advertises in its PASV + # reply: a malicious source could otherwise point the target's data + # connection at an arbitrary host (SSRF). A caller that needs the old + # behavior can set trust_server_pasv_ipv4_address on the source FTP + # object. See FTP.makepasv(), which applies the same rule. + untrusted_host, sourceport = parse227(source.sendcmd('PASV')) + if source.trust_server_pasv_ipv4_address: + sourcehost = untrusted_host + else: + sourcehost = source.sock.getpeername()[0] target.sendport(sourcehost, sourceport) # RFC 959: the user must "listen" [...] BEFORE sending the # transfer request. diff --git a/Lib/functools.py b/Lib/functools.py index df4660eef..e8ccc2795 100644 --- a/Lib/functools.py +++ b/Lib/functools.py @@ -556,16 +556,16 @@ def lru_cache(maxsize=128, typed=False): If *maxsize* is set to None, the LRU features are disabled and the cache can grow without bound. - If *typed* is True, arguments of different types will be cached separately. - For example, f(decimal.Decimal("3.0")) and f(3.0) will be treated as - distinct calls with distinct results. Some types such as str and int may - be cached separately even when typed is false. + If *typed* is True, arguments of different types will be cached + separately. For example, f(decimal.Decimal("3.0")) and f(3.0) will be + treated as distinct calls with distinct results. Some types such as + str and int may be cached separately even when typed is false. Arguments to the cached function must be hashable. View the cache statistics named tuple (hits, misses, maxsize, currsize) - with f.cache_info(). Clear the cache and statistics with f.cache_clear(). - Access the underlying function with f.__wrapped__. + with f.cache_info(). Clear the cache and statistics with + f.cache_clear(). Access the underlying function with f.__wrapped__. See: https://en.wikipedia.org/wiki/Cache_replacement_policies#Least_recently_used_(LRU) diff --git a/Lib/glob.py b/Lib/glob.py index 7ce3998c2..f8be46771 100644 --- a/Lib/glob.py +++ b/Lib/glob.py @@ -25,17 +25,17 @@ def glob(pathname, *, root_dir=None, dir_fd=None, recursive=False, The order of the returned list is undefined. Sort it if you need a particular order. - If `root_dir` is not None, it should be a path-like object specifying the - root directory for searching. It has the same effect as changing the - current directory before calling it (without actually - changing it). If pathname is relative, the result will contain - paths relative to `root_dir`. + If `root_dir` is not None, it should be a path-like object specifying + the root directory for searching. It has the same effect as changing + the current directory before calling it (without actually changing it). + If pathname is relative, the result will contain paths relative to + `root_dir`. If `dir_fd` is not None, it should be a file descriptor referring to a directory, and paths will then be relative to that directory. - If `include_hidden` is true, the patterns '*', '?', '**' will match hidden - directories. + If `include_hidden` is true, the patterns '*', '?', '**' will match + hidden directories. If `recursive` is true, the pattern '**' will match any files and zero or more directories and subdirectories. @@ -56,16 +56,16 @@ def iglob(pathname, *, root_dir=None, dir_fd=None, recursive=False, particular order. If `root_dir` is not None, it should be a path-like object specifying - the root directory for searching. It has the same effect as changing - the current directory before calling it (without actually - changing it). If pathname is relative, the result will contain - paths relative to `root_dir`. + the root directory for searching. It has the same effect as changing + the current directory before calling it (without actually changing it). + If pathname is relative, the result will contain paths relative to + `root_dir`. If `dir_fd` is not None, it should be a file descriptor referring to a directory, and paths will then be relative to that directory. - If `include_hidden` is true, the patterns '*', '?', '**' will match hidden - directories. + If `include_hidden` is true, the patterns '*', '?', '**' will match + hidden directories. If `recursive` is true, the pattern '**' will match any files and zero or more directories and subdirectories. @@ -294,15 +294,15 @@ _no_recurse_symlinks = object() def translate(pat, *, recursive=False, include_hidden=False, seps=None): """Translate a pathname with shell wildcards to a regular expression. - If `recursive` is true, the pattern segment '**' will match any number of - path segments. + If `recursive` is true, the pattern segment '**' will match any number + of path segments. If `include_hidden` is true, wildcards can match path segments beginning with a dot ('.'). If a sequence of separator characters is given to `seps`, they will be - used to split the pattern into segments and match path separators. If not - given, os.path.sep and os.path.altsep (where available) are used. + used to split the pattern into segments and match path separators. If + not given, os.path.sep and os.path.altsep (where available) are used. """ if not seps: if os.path.altsep: diff --git a/Lib/gzip.py b/Lib/gzip.py index c00f51858..f3f9fa91c 100644 --- a/Lib/gzip.py +++ b/Lib/gzip.py @@ -34,16 +34,16 @@ def open(filename, mode="rb", compresslevel=_COMPRESS_LEVEL_BEST, encoding=None, errors=None, newline=None): """Open a gzip-compressed file in binary or text mode. - The filename argument can be an actual filename (a str or bytes object), or - an existing file object to read from or write to. + The filename argument can be an actual filename (a str or bytes object), + or an existing file object to read from or write to. - The mode argument can be "r", "rb", "w", "wb", "x", "xb", "a" or "ab" for - binary mode, or "rt", "wt", "xt" or "at" for text mode. The default mode is - "rb", and the default compresslevel is 9. + The mode argument can be "r", "rb", "w", "wb", "x", "xb", "a" or "ab" + for binary mode, or "rt", "wt", "xt" or "at" for text mode. The default + mode is "rb", and the default compresslevel is 9. - For binary mode, this function is equivalent to the GzipFile constructor: - GzipFile(filename, mode, compresslevel). In this case, the encoding, errors - and newline arguments must not be provided. + For binary mode, this function is equivalent to the GzipFile + constructor: GzipFile(filename, mode, compresslevel). In this case, + the encoding, errors and newline arguments must not be provided. For text mode, a GzipFile object is created, and wrapped in an io.TextIOWrapper instance with the specified encoding, error handling @@ -148,8 +148,8 @@ class GzipFile(_streams.BaseStream): """The GzipFile class simulates most of the methods of a file object with the exception of the truncate() method. - This class only supports opening files in binary mode. If you need to open a - compressed file in text mode, use the gzip.open() function. + This class only supports opening files in binary mode. If you need to + open a compressed file in text mode, use the gzip.open() function. """ @@ -165,31 +165,33 @@ class GzipFile(_streams.BaseStream): non-trivial value. The new class instance is based on fileobj, which can be a regular - file, an io.BytesIO object, or any other object which simulates a file. - It defaults to None, in which case filename is opened to provide - a file object. + file, an io.BytesIO object, or any other object which simulates + a file. It defaults to None, in which case filename is opened to + provide a file object. When fileobj is not None, the filename argument is only used to be included in the gzip file header, which may include the original filename of the uncompressed file. It defaults to the filename of fileobj, if discernible; otherwise, it defaults to the empty string, - and in this case the original filename is not included in the header. + and in this case the original filename is not included in the + header. - The mode argument can be any of 'r', 'rb', 'a', 'ab', 'w', 'wb', 'x', or - 'xb' depending on whether the file will be read or written. The default - is the mode of fileobj if discernible; otherwise, the default is 'rb'. - A mode of 'r' is equivalent to one of 'rb', and similarly for 'w' and - 'wb', 'a' and 'ab', and 'x' and 'xb'. + The mode argument can be any of 'r', 'rb', 'a', 'ab', 'w', 'wb', + 'x', or 'xb' depending on whether the file will be read or written. + The default is the mode of fileobj if discernible; otherwise, the + default is 'rb'. A mode of 'r' is equivalent to one of 'rb', and + similarly for 'w' and 'wb', 'a' and 'ab', and 'x' and 'xb'. - The compresslevel argument is an integer from 0 to 9 controlling the - level of compression; 1 is fastest and produces the least compression, - and 9 is slowest and produces the most compression. 0 is no compression - at all. The default is 9. + The compresslevel argument is an integer from 0 to 9 controlling + the level of compression; 1 is fastest and produces the least + compression, and 9 is slowest and produces the most compression. + 0 is no compression at all. The default is 9. - The optional mtime argument is the timestamp requested by gzip. The time - is in Unix format, i.e., seconds since 00:00:00 UTC, January 1, 1970. - If mtime is omitted or None, the current time is used. Use mtime = 0 - to generate a compressed stream that does not depend on creation time. + The optional mtime argument is the timestamp requested by gzip. + The time is in Unix format, i.e., seconds since 00:00:00 UTC, + January 1, 1970. If mtime is omitted or None, the current time + is used. Use mtime = 0 to generate a compressed stream that does + not depend on creation time. """ @@ -575,10 +577,10 @@ class _GzipReader(_streams.DecompressReader): # Read a chunk of data from the file if self._decompressor.needs_input: buf = self._fp.read(READ_BUFFER_SIZE) - uncompress = self._decompressor.decompress(buf, size) else: - uncompress = self._decompressor.decompress(b"", size) + buf = b"" + uncompress = self._decompressor.decompress(buf, size) if self._decompressor.unused_data != b"": # Prepend the already read bytes to the fileobj so they can # be seen by _read_eof() and _read_gzip_header() diff --git a/Lib/test/test_asyncio/test_sendfile.py b/Lib/test/test_asyncio/test_sendfile.py index 766e6f499..6c198addb 100644 --- a/Lib/test/test_asyncio/test_sendfile.py +++ b/Lib/test/test_asyncio/test_sendfile.py @@ -228,6 +228,61 @@ class SockSendfileMixin(SendfileBase): self.assertEqual(ret, 0) self.assertEqual(self.file.tell(), 0) + def check_sock_sendfile_offset(self, data, offset, force_fallback=False): + sock, proto = self.prepare_socksendfile() + with tempfile.TemporaryFile() as f: + f.write(data) + f.flush() + self.assertEqual(f.tell(), len(data)) + + if force_fallback: + async def _sock_sendfile_fail(sock, file, offset, count): + raise asyncio.exceptions.SendfileNotAvailableError() + with support.swap_attr(self.loop, '_sock_sendfile_native', _sock_sendfile_fail): + ret = self.run_loop(self.loop.sock_sendfile(sock, f, offset, None)) + else: + ret = self.run_loop(self.loop.sock_sendfile(sock, f, offset, None)) + + self.assertEqual(f.tell(), len(data)) + + sock.close() + self.run_loop(proto.wait_closed()) + + self.assertEqual(ret, len(data) - offset) + + + def test_sock_sendfile_offset(self): + data = b'abcdef' + for offset in (0, len(data) // 2, len(data)): + for force_fallback in (False, True): + with self.subTest(offset=offset, force_fallback=force_fallback): + self.check_sock_sendfile_offset(data, offset, force_fallback) + + def check_sendfile_offset(self, offset, fallback): + srv_proto, cli_proto = self.prepare_sendfile() + self.file.seek(123) + coro = self.loop.sendfile(cli_proto.transport, self.file, offset, fallback=fallback) + try: + ret = self.run_loop(coro) + except asyncio.SendfileNotAvailableError: + if fallback: + raise + cli_proto.transport.close() + self.run_loop(srv_proto.done) + return + cli_proto.transport.close() + self.run_loop(srv_proto.done) + self.assertEqual(ret, len(self.DATA) - offset) + self.assertEqual(srv_proto.nbytes, len(self.DATA) - offset) + self.assertEqual(srv_proto.data, self.DATA[offset:]) + self.assertEqual(self.file.tell(), len(self.DATA)) + + def test_sendfile_offset(self): + for offset in (0, len(self.DATA) // 2, len(self.DATA)): + for fallback in (False, True): + with self.subTest(offset=offset, fallback=fallback): + self.check_sendfile_offset(offset, fallback) + def test_sock_sendfile_mix_with_regular_send(self): buf = b"mix_regular_send" * (4 * 1024) # 64 KiB sock, proto = self.prepare_socksendfile() diff --git a/Lib/test/test_decimal.py b/Lib/test/test_decimal.py index 3017c3337..47ab0a797 100644 --- a/Lib/test/test_decimal.py +++ b/Lib/test/test_decimal.py @@ -4775,7 +4775,6 @@ class PyCoverage(Coverage, unittest.TestCase): sys.set_int_max_str_digits(self._previous_int_limit) super().tearDown() - class PyFunctionality(unittest.TestCase): """Extra functionality in decimal.py""" diff --git a/Lib/test/test_email/test__header_value_parser.py b/Lib/test/test_email/test__header_value_parser.py index f3c030625..8c9601288 100644 --- a/Lib/test/test_email/test__header_value_parser.py +++ b/Lib/test/test_email/test__header_value_parser.py @@ -1060,6 +1060,78 @@ class TestParser(TestParserMixin, TestEmailBase): with self.assertRaises(errors.HeaderParseError): parser.get_phrase(' (foo) ') + def test_get_phrase_adjacent_ew(self): + # "'linear-white-space' that separates a pair of adjacent + # 'encoded-word's is ignored" (rfc2047 section 6.2) + self._test_get_x(parser.get_phrase, '=?ascii?q?Joi?= \t =?ascii?q?ned?=', 'Joined', 'Joined', [], '') + + def test_get_phrase_adjacent_ew_different_encodings(self): + self._test_get_x( + parser.get_phrase, + '=?utf-8?q?B=C3=A9r?= =?iso-8859-1?q?=E9nice?=', 'Bérénice', 'Bérénice', [], '' + ) + + def test_get_phrase_adjacent_ew_encoded_spaces(self): + self._test_get_x( + parser.get_phrase, + '=?ascii?q?Encoded?= =?ascii?q?_spaces_?= =?ascii?q?preserved?=', + 'Encoded spaces preserved', + 'Encoded spaces preserved', + [], + '' + ) + + def test_get_phrase_adjacent_ew_comment_is_not_linear_white_space(self): + self._test_get_x( + parser.get_phrase, + '=?ascii?q?Comment?= (is not) =?ascii?q?linear-white-space?=', + 'Comment (is not) linear-white-space', + 'Comment linear-white-space', + [], + '', + comments=['is not'], + ) + + def test_get_phrase_adjacent_ew_no_error_on_defects(self): + self._test_get_x( + parser.get_phrase, + '=?ascii?q?Def?= =?ascii?q?ect still joins?=', + 'Defect still joins', + 'Defect still joins', + [errors.InvalidHeaderDefect], # whitespace inside encoded word + '' + ) + + def test_get_phrase_adjacent_ew_ignore_non_ew(self): + self._test_get_x( + parser.get_phrase, + '=?ascii?q?No?= =?join?= for non-ew', + 'No =?join?= for non-ew', + 'No =?join?= for non-ew', + [], + '' + ) + + def test_get_phrase_adjacent_ew_ignore_invalid_ew(self): + self._test_get_x( + parser.get_phrase, + '=?ascii?q?No?= =?ascii?rot13?wbva= for invalid ew', + 'No =?ascii?rot13?wbva= for invalid ew', + 'No =?ascii?rot13?wbva= for invalid ew', + [], + '' + ) + + def test_get_phrase_adjacent_ew_missing_space(self): + self._test_get_x( + parser.get_phrase, + '=?ascii?q?Joi?==?ascii?q?ned?=', + 'Joined', + 'Joined', + [errors.InvalidHeaderDefect], # missing trailing whitespace + '' + ) + # get_local_part def test_get_local_part_simple(self): @@ -2398,6 +2470,22 @@ class TestParser(TestParserMixin, TestEmailBase): self.assertEqual(address[0].token_type, 'mailbox') + def test_get_address_rfc2047_display_name_adjacent_ews(self): + address = self._test_get_x(parser.get_address, + '=?utf-8?q?B=C3=A9r?= =?utf-8?q?=C3=A9nice?= ', + 'Bérénice ', + 'Bérénice ', + [], + '') + self.assertEqual(address.token_type, 'address') + self.assertEqual(len(address.mailboxes), 1) + self.assertEqual(address.mailboxes, + address.all_mailboxes) + self.assertEqual(address.mailboxes[0].display_name, + 'Bérénice') + self.assertEqual(address[0].token_type, + 'mailbox') + def test_get_address_empty_group(self): address = self._test_get_x(parser.get_address, 'Monty Python:;', diff --git a/Lib/test/test_email/test_asian_codecs.py b/Lib/test/test_email/test_asian_codecs.py index ca44f54c6..85979ffd8 100644 --- a/Lib/test/test_email/test_asian_codecs.py +++ b/Lib/test/test_email/test_asian_codecs.py @@ -58,6 +58,62 @@ Hello World! =?iso-2022-jp?b?GyRCJU8lbSE8JW8hPCVrJUkhKhsoQg==?= # TK: full decode comparison eq(str(h).encode(jcode), subject_bytes) + h = Header("Japanese") + s = '\u65e5\u672c\u8a9e' # 日本語 + h.append(s, Charset('euc-jp')) + h.append(s, Charset('iso-2022-jp')) + h.append(s, Charset('shift_jis')) + eq(h.encode(), """\ +Japanese =?iso-2022-jp?b?GyRCRnxLXDhsGyhC?= =?iso-2022-jp?b?GyRCRnxLXDhsGyhC?= + =?iso-2022-jp?b?GyRCRnxLXDhsGyhC?=""") + eq(decode_header(h.encode()), + [(b'Japanese ', None), + (b'\x1b$BF|K\\8l\x1b(B\x1b$BF|K\\8l\x1b(B\x1b$BF|K\\8l\x1b(B', 'iso-2022-jp'), + ]) + + def test_chinese_codecs(self): + eq = self.ndiffAssertEqual + h = Header("Chinese") + s = '\u4e2d\u6587' # 中文 + h.append(s, Charset('gb2312')) + h.append(s, Charset('gbk')) + h.append(s, Charset('gb18030')) + h.append(s, Charset('hz')) + h.append(s, Charset('big5')) + h.append(s, Charset('big5hkscs')) + eq(h.encode(), """\ +Chinese =?gb2312?b?1tDOxA==?= =?gbk?b?1tDOxA==?= =?gb18030?b?1tDOxA==?= + =?hz?b?fntWUE5Efn0=?= =?big5?b?pKSk5Q==?= =?big5hkscs?b?pKSk5Q==?=""") + eq(decode_header(h.encode()), + [(b'Chinese ', None), + (b'\xd6\xd0\xce\xc4', 'gb2312'), + (b'\xd6\xd0\xce\xc4', 'gbk'), + (b'\xd6\xd0\xce\xc4', 'gb18030'), + (b'~{VPND~}', 'hz'), + (b'\xa4\xa4\xa4\xe5', 'big5'), + (b'\xa4\xa4\xa4\xe5', 'big5hkscs'), + ]) + + def test_korean_codecs(self): + eq = self.ndiffAssertEqual + h = Header("Korean") + s = '\ud55c\uad6d\uc5b4' # 한국어 + h.append(s, Charset('euc-kr')) + h.append(s, Charset('ks_c_5601-1987')) + h.append(s, Charset('cp949')) + h.append(s, Charset('iso-2022-kr')) + h.append(s, Charset('johab')) + eq(h.encode(), """\ +Korean =?euc-kr?b?x9Gxub7u?= =?ks_c_5601-1987?b?x9Gxub7uIMfRsbm+7g==?= + =?iso-2022-kr?b?GyQpQw5HUTE5Pm4P?= =?johab?b?0GWKgrTh?=""") + eq(decode_header(h.encode()), + [(b'Korean ', None), + (b'\xc7\xd1\xb1\xb9\xbe\xee', 'euc-kr'), + (b'\xc7\xd1\xb1\xb9\xbe\xee \xc7\xd1\xb1\xb9\xbe\xee', 'ks_c_5601-1987'), + (b'\x1b$)C\x0eGQ19>n\x0f', 'iso-2022-kr'), + (b'\xd0e\x8a\x82\xb4\xe1', 'johab'), + ]) + def test_payload_encoding_utf8(self): jhello = str(b'\xa5\xcf\xa5\xed\xa1\xbc\xa5\xef\xa1\xbc' b'\xa5\xeb\xa5\xc9\xa1\xaa', 'euc-jp') diff --git a/Lib/test/test_email/test_email.py b/Lib/test/test_email/test_email.py index 774a9265c..49cdc9502 100644 --- a/Lib/test/test_email/test_email.py +++ b/Lib/test/test_email/test_email.py @@ -4988,6 +4988,7 @@ class TestCharset(unittest.TestCase): c = Charset('utf-8') eq(c.header_encode(s), '=?utf-8?b?wqTCosKkwqTCpMKmwqTCqMKkwqo=?=') + @unittest.expectedFailure # TODO: RUSTPYTHON; LookupError: unknown encoding: iso_2022_jp def test_body_encode(self): eq = self.assertEqual # Try a charset with QP body encoding @@ -5002,15 +5003,8 @@ class TestCharset(unittest.TestCase): # Try the convert argument, where input codec != output codec c = Charset('euc-jp') # With apologies to Tokio Kikuchi ;) - # XXX FIXME -## try: -## eq('\x1b$B5FCO;~IW\x1b(B', -## c.body_encode('\xb5\xc6\xc3\xcf\xbb\xfe\xc9\xd7')) -## eq('\xb5\xc6\xc3\xcf\xbb\xfe\xc9\xd7', -## c.body_encode('\xb5\xc6\xc3\xcf\xbb\xfe\xc9\xd7', False)) -## except LookupError: -## # We probably don't have the Japanese codecs installed -## pass + eq('\x1b$B5FCO;~IW\x1b(B', + c.body_encode('\u83ca\u5730\u6642\u592b')) # Testing SF bug #625509, which we have to fake, since there are no # built-in encodings where the header encoding is QP but the body # encoding is not. diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py index 75e2353ea..573db4393 100644 --- a/Lib/test/test_enum.py +++ b/Lib/test/test_enum.py @@ -4988,8 +4988,8 @@ class Color(enum.Enum) | __members__ | Returns a mapping of member name->value. | - | This mapping lists all enum members, including aliases. Note that this - | is a read-only view of the internal mapping.""" + | This mapping lists all enum members, including aliases. Note that + | this is a read-only view of the internal mapping.""" expected_help_output_without_docs = """\ Help on class Color in module %s: diff --git a/Lib/test/test_ftplib.py b/Lib/test/test_ftplib.py index c864d401f..f1eff9430 100644 --- a/Lib/test/test_ftplib.py +++ b/Lib/test/test_ftplib.py @@ -16,7 +16,7 @@ try: except ImportError: ssl = None -from unittest import TestCase, skipUnless +from unittest import mock, TestCase, skipUnless from test import support from test.support import requires_subprocess from test.support import threading_helper @@ -1145,6 +1145,40 @@ class TestTimeouts(TestCase): ftp.close() +class TestFtpcpSecurity(TestCase): + """ftpcp() must not trust the host a source server advertises in PASV. + + A malicious source server can otherwise redirect the target server's + data connection to an arbitrary host:port (SSRF), so ftpcp() uses the + source server's actual peer address instead, the same as FTP.makepasv(). + """ + + def _make_pair(self, *, advertised_host, real_host, trust=False): + source = mock.Mock(spec=ftplib.FTP) + source.trust_server_pasv_ipv4_address = trust + source.sock.getpeername.return_value = (real_host, 21) + # PASV replies give the host as comma-separated octets, not dotted. + advertised = advertised_host.replace('.', ',') + source.sendcmd.side_effect = lambda cmd: ( + f'227 Entering Passive Mode ({advertised},1,2).' + if cmd == 'PASV' else '150 ok') + target = mock.Mock(spec=ftplib.FTP) + target.sendcmd.return_value = '150 ok' + return source, target + + def test_ftpcp_ignores_untrusted_pasv_host(self): + source, target = self._make_pair(advertised_host='10.0.0.5', + real_host='198.51.100.7') + ftplib.ftpcp(source, 'a', target, 'b') + target.sendport.assert_called_once_with('198.51.100.7', 258) + + def test_ftpcp_trust_server_pasv_ipv4_address(self): + source, target = self._make_pair(advertised_host='10.0.0.5', + real_host='198.51.100.7', trust=True) + ftplib.ftpcp(source, 'a', target, 'b') + target.sendport.assert_called_once_with('10.0.0.5', 258) + + class MiscTestCase(TestCase): def test__all__(self): not_exported = { From b8776bd8d03457296a595e5ecfcaa18f199ee44a Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Fri, 12 Jun 2026 17:49:47 +0300 Subject: [PATCH 079/339] Update some of changed libs and tests from `3.14.5` -> `3.14.6` (part 2) (#8085) --- Lib/http/cookies.py | 6 +- Lib/imaplib.py | 2 +- Lib/json/__init__.py | 8 +- Lib/json/tool.py | 3 +- Lib/locale.py | 477 ++++++++++++++++++++-------- Lib/ntpath.py | 16 +- Lib/os.py | 40 +-- Lib/pydoc_data/module_docs.py | 2 +- Lib/pydoc_data/topics.py | 56 +++- Lib/rlcompleter.py | 17 +- Lib/shutil.py | 16 +- Lib/tarfile.py | 51 +-- Lib/test/datetimetester.py | 30 ++ Lib/test/support/__init__.py | 15 + Lib/test/test_http_cookies.py | 31 +- Lib/test/test_json/json_lines.jsonl | 2 + Lib/test/test_json/test_speedups.py | 63 ++++ Lib/test/test_json/test_tool.py | 9 + Lib/test/test_os.py | 2 - Lib/test/test_rlcompleter.py | 52 +++ Lib/test/test_shutil.py | 17 + Lib/test/test_tarfile.py | 184 ++++++++--- 22 files changed, 832 insertions(+), 267 deletions(-) create mode 100644 Lib/test/test_json/json_lines.jsonl diff --git a/Lib/http/cookies.py b/Lib/http/cookies.py index 5c5b14788..abebb4b69 100644 --- a/Lib/http/cookies.py +++ b/Lib/http/cookies.py @@ -391,18 +391,18 @@ class Morsel(dict): return '<%s: %s>' % (self.__class__.__name__, self.OutputString()) def js_output(self, attrs=None): - import base64 + import urllib.parse # Print javascript output_string = self.OutputString(attrs) if _has_control_character(output_string): raise CookieError("Control characters are not allowed in cookies") # Base64-encode value to avoid template # injection in cookie values. - output_encoded = base64.b64encode(output_string.encode('utf-8')).decode("ascii") + output_encoded = urllib.parse.quote(output_string, safe='', encoding='utf-8') return """ """ % (output_encoded,) diff --git a/Lib/imaplib.py b/Lib/imaplib.py index cbe129b3e..e84ffb2ee 100644 --- a/Lib/imaplib.py +++ b/Lib/imaplib.py @@ -706,7 +706,7 @@ class IMAP4: """ typ, dat = self._simple_command('LOGIN', user, self._quote(password)) if typ != 'OK': - raise self.error(dat[-1]) + raise self.error(dat[-1].decode('UTF-8', 'replace')) self.state = 'AUTH' return typ, dat diff --git a/Lib/json/__init__.py b/Lib/json/__init__.py index 9eaa4f3fb..800cc37f6 100644 --- a/Lib/json/__init__.py +++ b/Lib/json/__init__.py @@ -143,8 +143,8 @@ def dump(obj, fp, *, skipkeys=False, ensure_ascii=True, check_circular=True, If ``indent`` is a non-negative integer, then JSON array elements and object members will be pretty-printed with that indent level. An indent - level of 0 will only insert newlines. ``None`` is the most compact - representation. + level of 0 will only insert newlines. ``None`` is the default and gives + a representation with no newlines inserted. If specified, ``separators`` should be an ``(item_separator, key_separator)`` tuple. The default is ``(', ', ': ')`` if *indent* is @@ -207,8 +207,8 @@ def dumps(obj, *, skipkeys=False, ensure_ascii=True, check_circular=True, If ``indent`` is a non-negative integer, then JSON array elements and object members will be pretty-printed with that indent level. An indent - level of 0 will only insert newlines. ``None`` is the most compact - representation. + level of 0 will only insert newlines. ``None`` is the default and gives + a representation with no newlines inserted. If specified, ``separators`` should be an ``(item_separator, key_separator)`` tuple. The default is ``(', ', ': ')`` if *indent* is diff --git a/Lib/json/tool.py b/Lib/json/tool.py index 1967817ad..0cabbdba8 100644 --- a/Lib/json/tool.py +++ b/Lib/json/tool.py @@ -88,7 +88,8 @@ def main(): infile = open(options.infile, encoding='utf-8') try: if options.json_lines: - objs = (json.loads(line) for line in infile) + lines = infile.readlines() + objs = (json.loads(line) for line in lines) else: objs = (json.load(infile),) finally: diff --git a/Lib/locale.py b/Lib/locale.py index dfedc6386..498af0873 100644 --- a/Lib/locale.py +++ b/Lib/locale.py @@ -1496,8 +1496,8 @@ locale_alias = { # This maps Windows language identifiers to locale strings. # # This list has been updated from -# http://msdn.microsoft.com/library/default.asp?url=/library/en-us/intl/nls_238z.asp -# to include every locale up to Windows Vista. +# https://learn.microsoft.com/en-us/openspecs/windows_protocols/ms-lcid/70feba9f-294e-491e-b6eb-56532684c37f +# to include every locale up to protocol revision 16.0 (2024-04-23). # # NOTE: this mapping is incomplete. If your language is missing, please # submit a bug report as detailed in the Python devguide at: @@ -1507,10 +1507,15 @@ locale_alias = { # windows_locale = { - 0x0436: "af_ZA", # Afrikaans - 0x041c: "sq_AL", # Albanian - 0x0484: "gsw_FR",# Alsatian - France + 0x0036: "af", # Afrikaans + 0x0436: "af_ZA", # Afrikaans - South Africa + 0x001c: "sq", # Albanian + 0x041c: "sq_AL", # Albanian - Albania + 0x0084: "gsw", # Alsatian + 0x0484: "gsw_FR", # Alsatian - France + 0x005e: "am", # Amharic 0x045e: "am_ET", # Amharic - Ethiopia + 0x0001: "ar", # Arabic 0x0401: "ar_SA", # Arabic - Saudi Arabia 0x0801: "ar_IQ", # Arabic - Iraq 0x0c01: "ar_EG", # Arabic - Egypt @@ -1524,39 +1529,72 @@ windows_locale = { 0x2c01: "ar_JO", # Arabic - Jordan 0x3001: "ar_LB", # Arabic - Lebanon 0x3401: "ar_KW", # Arabic - Kuwait - 0x3801: "ar_AE", # Arabic - United Arab Emirates + 0x3801: "ar_AE", # Arabic - U.A.E. 0x3c01: "ar_BH", # Arabic - Bahrain 0x4001: "ar_QA", # Arabic - Qatar - 0x042b: "hy_AM", # Armenian + 0x002b: "hy", # Armenian + 0x042b: "hy_AM", # Armenian - Armenia + 0x004d: "as", # Assamese 0x044d: "as_IN", # Assamese - India - 0x042c: "az_AZ", # Azeri - Latin - 0x082c: "az_AZ", # Azeri - Cyrillic - 0x046d: "ba_RU", # Bashkir - 0x042d: "eu_ES", # Basque - Russia - 0x0423: "be_BY", # Belarusian - 0x0445: "bn_IN", # Begali - 0x201a: "bs_BA", # Bosnian - Cyrillic - 0x141a: "bs_BA", # Bosnian - Latin + 0x002c: "az", # Azerbaijani (Latin) + 0x742c: "az", # Azerbaijani (Cyrillic) + 0x782c: "az", # Azerbaijani (Latin) + 0x042c: "az_AZ", # Azerbaijani (Latin) - Azerbaijan + 0x0045: "bn", # Bangla + 0x0445: "bn_IN", # Bangla - India + 0x0845: "bn_BD", # Bangla - Bangladesh + 0x006d: "ba", # Bashkir + 0x046d: "ba_RU", # Bashkir - Russia + 0x002d: "eu", # Basque + 0x042d: "eu_ES", # Basque - Spain + 0x0023: "be", # Belarusian + 0x0423: "be_BY", # Belarusian - Belarus + 0x641a: "bs", # Bosnian (Cyrillic) + 0x681a: "bs", # Bosnian (Latin) + 0x141a: "bs_BA", # Bosnian (Latin) - Bosnia and Herzegovina + 0x201a: "bs_BA", # Bosnian (Cyrillic) - Bosnia and Herzegovina + 0x781a: "bs", # Bosnian (Latin) + 0x007e: "br", # Breton 0x047e: "br_FR", # Breton - France - 0x0402: "bg_BG", # Bulgarian -# 0x0455: "my_MM", # Burmese - Not supported - 0x0403: "ca_ES", # Catalan - 0x0004: "zh_CHS",# Chinese - Simplified - 0x0404: "zh_TW", # Chinese - Taiwan - 0x0804: "zh_CN", # Chinese - PRC - 0x0c04: "zh_HK", # Chinese - Hong Kong S.A.R. - 0x1004: "zh_SG", # Chinese - Singapore - 0x1404: "zh_MO", # Chinese - Macao S.A.R. - 0x7c04: "zh_CHT",# Chinese - Traditional + 0x0002: "bg", # Bulgarian + 0x0402: "bg_BG", # Bulgarian - Bulgaria + 0x0055: "my", # Burmese + 0x0455: "my_MM", # Burmese - Myanmar + 0x0003: "ca", # Catalan + 0x0403: "ca_ES", # Catalan - Spain + 0x0803: "ca_ES", # Valencian - Spain + 0x0092: "ku", # Central Kurdish + 0x7c92: "ku", # Central Kurdish + 0x0492: "ku_IQ", # Central Kurdish - Iraq + 0x005c: "chr", # Cherokee + 0x7c5c: "chr", # Cherokee + 0x045c: "chr_US", # Cherokee - United States + 0x0004: "zh", # Chinese (Simplified) + 0x7804: "zh", # Chinese (Simplified) + 0x7c04: "zh", # Chinese (Traditional) + 0x0404: "zh_TW", # Chinese (Traditional) - Taiwan + 0x0804: "zh_CN", # Chinese (Simplified) - People's Republic of China + 0x0c04: "zh_HK", # Chinese (Traditional) - Hong Kong S.A.R. + 0x1004: "zh_SG", # Chinese (Simplified) - Singapore + 0x1404: "zh_MO", # Chinese (Traditional) - Macao S.A.R. + 0x0083: "co", # Corsican 0x0483: "co_FR", # Corsican - France - 0x041a: "hr_HR", # Croatian - 0x101a: "hr_BA", # Croatian - Bosnia - 0x0405: "cs_CZ", # Czech - 0x0406: "da_DK", # Danish - 0x048c: "gbz_AF",# Dari - Afghanistan - 0x0465: "div_MV",# Divehi - Maldives - 0x0413: "nl_NL", # Dutch - The Netherlands + 0x001a: "hr", # Croatian + 0x041a: "hr_HR", # Croatian - Croatia + 0x101a: "hr_BA", # Croatian (Latin) - Bosnia and Herzegovina + 0x0005: "cs", # Czech + 0x0405: "cs_CZ", # Czech - Czech Republic + 0x0006: "da", # Danish + 0x0406: "da_DK", # Danish - Denmark + 0x008c: "prs", # Dari + 0x048c: "prs_AF", # Dari - Afghanistan + 0x0065: "dv", # Divehi + 0x0465: "dv_MV", # Divehi - Maldives + 0x0013: "nl", # Dutch + 0x0413: "nl_NL", # Dutch - Netherlands 0x0813: "nl_BE", # Dutch - Belgium + 0x0c51: "dz_BT", # Dzongkha - Bhutan + 0x0009: "en", # English 0x0409: "en_US", # English - United States 0x0809: "en_GB", # English - United Kingdom 0x0c09: "en_AU", # English - Australia @@ -1564,122 +1602,248 @@ windows_locale = { 0x1409: "en_NZ", # English - New Zealand 0x1809: "en_IE", # English - Ireland 0x1c09: "en_ZA", # English - South Africa - 0x2009: "en_JA", # English - Jamaica - 0x2409: "en_CB", # English - Caribbean + 0x2009: "en_JM", # English - Jamaica 0x2809: "en_BZ", # English - Belize - 0x2c09: "en_TT", # English - Trinidad + 0x2c09: "en_TT", # English - Trinidad and Tobago 0x3009: "en_ZW", # English - Zimbabwe - 0x3409: "en_PH", # English - Philippines + 0x3409: "en_PH", # English - Republic of the Philippines + 0x3c09: "en_HK", # English - Hong Kong 0x4009: "en_IN", # English - India 0x4409: "en_MY", # English - Malaysia - 0x4809: "en_IN", # English - Singapore - 0x0425: "et_EE", # Estonian - 0x0438: "fo_FO", # Faroese - 0x0464: "fil_PH",# Filipino - 0x040b: "fi_FI", # Finnish + 0x4809: "en_SG", # English - Singapore + 0x4c09: "en_AE", # English - United Arab Emirates + 0x0025: "et", # Estonian + 0x0425: "et_EE", # Estonian - Estonia + 0x0038: "fo", # Faroese + 0x0438: "fo_FO", # Faroese - Faroe Islands + 0x0064: "fil", # Filipino + 0x0464: "fil_PH", # Filipino - Philippines + 0x000b: "fi", # Finnish + 0x040b: "fi_FI", # Finnish - Finland + 0x000c: "fr", # French 0x040c: "fr_FR", # French - France 0x080c: "fr_BE", # French - Belgium 0x0c0c: "fr_CA", # French - Canada 0x100c: "fr_CH", # French - Switzerland 0x140c: "fr_LU", # French - Luxembourg - 0x180c: "fr_MC", # French - Monaco + 0x180c: "fr_MC", # French - Principality of Monaco + 0x1c0c: "fr_029", # French - Caribbean + 0x200c: "fr_RE", # French - Reunion + 0x240c: "fr_CD", # French - Congo, DRC + 0x280c: "fr_SN", # French - Senegal + 0x2c0c: "fr_CM", # French - Cameroon + 0x300c: "fr_CI", # French - Côte d'Ivoire + 0x340c: "fr_ML", # French - Mali + 0x380c: "fr_MA", # French - Morocco + 0x3c0c: "fr_HT", # French - Haiti + 0x0062: "fy", # Frisian 0x0462: "fy_NL", # Frisian - Netherlands - 0x0456: "gl_ES", # Galician - 0x0437: "ka_GE", # Georgian + 0x0067: "ff", # Fulah + 0x7c67: "ff", # Fulah (Latin) + 0x0467: "ff_NG", + 0x0867: "ff_SN", # Fulah - Senegal + 0x0056: "gl", # Galician + 0x0456: "gl_ES", # Galician - Spain + 0x0037: "ka", # Georgian + 0x0437: "ka_GE", # Georgian - Georgia + 0x0007: "de", # German 0x0407: "de_DE", # German - Germany 0x0807: "de_CH", # German - Switzerland 0x0c07: "de_AT", # German - Austria 0x1007: "de_LU", # German - Luxembourg 0x1407: "de_LI", # German - Liechtenstein - 0x0408: "el_GR", # Greek + 0x0008: "el", # Greek + 0x0408: "el_GR", # Greek - Greece + 0x006f: "kl", # Greenlandic 0x046f: "kl_GL", # Greenlandic - Greenland - 0x0447: "gu_IN", # Gujarati - 0x0468: "ha_NG", # Hausa - Latin - 0x040d: "he_IL", # Hebrew - 0x0439: "hi_IN", # Hindi - 0x040e: "hu_HU", # Hungarian - 0x040f: "is_IS", # Icelandic - 0x0421: "id_ID", # Indonesian - 0x045d: "iu_CA", # Inuktitut - Syllabics - 0x085d: "iu_CA", # Inuktitut - Latin + 0x0074: "gn", # Guarani + 0x0474: "gn_PY", # Guarani - Paraguay + 0x0047: "gu", # Gujarati + 0x0447: "gu_IN", # Gujarati - India + 0x0068: "ha", # Hausa (Latin) + 0x7c68: "ha", # Hausa (Latin) + 0x0468: "ha_NG", # Hausa (Latin) - Nigeria + 0x0075: "haw", # Hawaiian + 0x0475: "haw_US", # Hawaiian - United States + 0x000d: "he", # Hebrew + 0x040d: "he_IL", # Hebrew - Israel + 0x0039: "hi", # Hindi + 0x0439: "hi_IN", # Hindi - India + 0x000e: "hu", # Hungarian + 0x040e: "hu_HU", # Hungarian - Hungary + 0x000f: "is", # Icelandic + 0x040f: "is_IS", # Icelandic - Iceland + 0x0070: "ig", # Igbo + 0x0470: "ig_NG", # Igbo - Nigeria + 0x0021: "id", # Indonesian + 0x0421: "id_ID", # Indonesian - Indonesia + 0x005d: "iu", # Inuktitut (Latin) + 0x785d: "iu", # Inuktitut (Syllabics) + 0x7c5d: "iu", # Inuktitut (Latin) + 0x045d: "iu_CA", # Inuktitut (Syllabics) - Canada + 0x085d: "iu_CA", # Inuktitut (Latin) - Canada + 0x003c: "ga", # Irish 0x083c: "ga_IE", # Irish - Ireland + 0x0010: "it", # Italian 0x0410: "it_IT", # Italian - Italy 0x0810: "it_CH", # Italian - Switzerland - 0x0411: "ja_JP", # Japanese + 0x0011: "ja", # Japanese + 0x0411: "ja_JP", # Japanese - Japan + 0x004b: "kn", # Kannada 0x044b: "kn_IN", # Kannada - India - 0x043f: "kk_KZ", # Kazakh - 0x0453: "kh_KH", # Khmer - Cambodia - 0x0486: "qut_GT",# K'iche - Guatemala + 0x0471: "kr_NG", # Kanuri (Latin) - Nigeria + 0x0060: "ks", # Kashmiri + 0x0460: "ks", # Kashmiri - Perso_Arabic + 0x0860: "ks_IN", # Kashmiri (Devanagari) - India + 0x003f: "kk", # Kazakh + 0x043f: "kk_KZ", # Kazakh - Kazakhstan + 0x0053: "km", # Khmer + 0x0453: "km_KH", # Khmer - Cambodia + 0x0087: "rw", # Kinyarwanda 0x0487: "rw_RW", # Kinyarwanda - Rwanda - 0x0457: "kok_IN",# Konkani - 0x0412: "ko_KR", # Korean - 0x0440: "ky_KG", # Kyrgyz - 0x0454: "lo_LA", # Lao - Lao PDR - 0x0426: "lv_LV", # Latvian - 0x0427: "lt_LT", # Lithuanian - 0x082e: "dsb_DE",# Lower Sorbian - Germany - 0x046e: "lb_LU", # Luxembourgish - 0x042f: "mk_MK", # FYROM Macedonian + 0x0041: "sw", # Kiswahili + 0x0441: "sw_KE", # Kiswahili - Kenya + 0x0057: "kok", # Konkani + 0x0457: "kok_IN", # Konkani - India + 0x0012: "ko", # Korean + 0x0412: "ko_KR", # Korean - Korea + 0x0040: "ky", # Kyrgyz + 0x0440: "ky_KG", # Kyrgyz - Kyrgyzstan + 0x0054: "lo", # Lao + 0x0454: "lo_LA", # Lao - Lao P.D.R. + 0x0476: "la_VA", # Latin - Vatican City + 0x0026: "lv", # Latvian + 0x0426: "lv_LV", # Latvian - Latvia + 0x0027: "lt", # Lithuanian + 0x0427: "lt_LT", # Lithuanian - Lithuania + 0x7c2e: "dsb", # Lower Sorbian + 0x082e: "dsb_DE", # Lower Sorbian - Germany + 0x006e: "lb", # Luxembourgish + 0x046e: "lb_LU", # Luxembourgish - Luxembourg + 0x002f: "mk", # Macedonian + 0x042f: "mk_MK", # Macedonian - North Macedonia + 0x003e: "ms", # Malay 0x043e: "ms_MY", # Malay - Malaysia 0x083e: "ms_BN", # Malay - Brunei Darussalam + 0x004c: "ml", # Malayalam 0x044c: "ml_IN", # Malayalam - India - 0x043a: "mt_MT", # Maltese - 0x0481: "mi_NZ", # Maori - 0x047a: "arn_CL",# Mapudungun - 0x044e: "mr_IN", # Marathi - 0x047c: "moh_CA",# Mohawk - Canada - 0x0450: "mn_MN", # Mongolian - Cyrillic - 0x0850: "mn_CN", # Mongolian - PRC - 0x0461: "ne_NP", # Nepali - 0x0414: "nb_NO", # Norwegian - Bokmal - 0x0814: "nn_NO", # Norwegian - Nynorsk + 0x003a: "mt", # Maltese + 0x043a: "mt_MT", # Maltese - Malta + 0x0081: "mi", # Maori + 0x0481: "mi_NZ", # Maori - New Zealand + 0x007a: "arn", # Mapudungun + 0x047a: "arn_CL", # Mapudungun - Chile + 0x004e: "mr", # Marathi + 0x044e: "mr_IN", # Marathi - India + 0x007c: "moh", # Mohawk + 0x047c: "moh_CA", # Mohawk - Canada + 0x0050: "mn", # Mongolian (Cyrillic) + 0x7850: "mn", # Mongolian (Cyrillic) + 0x7c50: "mn", # Mongolian (Traditional Mongolian) + 0x0450: "mn_MN", # Mongolian (Cyrillic) - Mongolia + 0x0c50: "mn_MN", # Mongolian (Traditional Mongolian) - Mongolia + 0x0061: "ne", # Nepali + 0x0461: "ne_NP", # Nepali - Nepal + 0x0861: "ne_IN", # Nepali - India + 0x0014: "no", # Norwegian (Bokmal) + 0x0414: "nb_NO", # Norwegian (Bokmal) - Norway + 0x0814: "nn_NO", # Norwegian (Nynorsk) - Norway + 0x7814: "nn", # Norwegian (Nynorsk) + 0x7c14: "nb", # Norwegian (Bokmal) + 0x0082: "oc", # Occitan 0x0482: "oc_FR", # Occitan - France - 0x0448: "or_IN", # Oriya - India + 0x0048: "or", # Odia + 0x0448: "or_IN", # Odia - India + 0x0072: "om", # Oromo + 0x0472: "om_ET", # Oromo - Ethiopia + 0x0063: "ps", # Pashto 0x0463: "ps_AF", # Pashto - Afghanistan - 0x0429: "fa_IR", # Persian - 0x0415: "pl_PL", # Polish + 0x0029: "fa", # Persian + 0x0429: "fa_IR", # Persian - Iran + 0x0015: "pl", # Polish + 0x0415: "pl_PL", # Polish - Poland + 0x0016: "pt", # Portuguese 0x0416: "pt_BR", # Portuguese - Brazil 0x0816: "pt_PT", # Portuguese - Portugal - 0x0446: "pa_IN", # Punjabi - 0x046b: "quz_BO",# Quechua (Bolivia) - 0x086b: "quz_EC",# Quechua (Ecuador) - 0x0c6b: "quz_PE",# Quechua (Peru) + 0x0046: "pa", # Punjabi + 0x7c46: "pa", # Punjabi + 0x0446: "pa_IN", # Punjabi - India + 0x0846: "pa_PK", # Punjabi - Islamic Republic of Pakistan + 0x006b: "quz", # Quechua + 0x046b: "quz_BO", # Quechua - Bolivia + 0x086b: "quz_EC", # Quechua - Ecuador + 0x0c6b: "quz_PE", # Quechua - Peru + 0x0018: "ro", # Romanian 0x0418: "ro_RO", # Romanian - Romania - 0x0417: "rm_CH", # Romansh - 0x0419: "ru_RU", # Russian - 0x243b: "smn_FI",# Sami Finland - 0x103b: "smj_NO",# Sami Norway - 0x143b: "smj_SE",# Sami Sweden - 0x043b: "se_NO", # Sami Northern Norway - 0x083b: "se_SE", # Sami Northern Sweden - 0x0c3b: "se_FI", # Sami Northern Finland - 0x203b: "sms_FI",# Sami Skolt - 0x183b: "sma_NO",# Sami Southern Norway - 0x1c3b: "sma_SE",# Sami Southern Sweden - 0x044f: "sa_IN", # Sanskrit - 0x0c1a: "sr_SP", # Serbian - Cyrillic - 0x1c1a: "sr_BA", # Serbian - Bosnia Cyrillic - 0x081a: "sr_SP", # Serbian - Latin - 0x181a: "sr_BA", # Serbian - Bosnia Latin + 0x0818: "ro_MD", # Romanian - Moldova + 0x0017: "rm", # Romansh + 0x0417: "rm_CH", # Romansh - Switzerland + 0x0019: "ru", # Russian + 0x0419: "ru_RU", # Russian - Russia + 0x0819: "ru_MD", # Russian - Moldova + 0x0085: "sah", # Sakha + 0x0485: "sah_RU", # Sakha - Russia + 0x003b: "se", # Sami (Northern) + 0x043b: "se_NO", # Sami (Northern) - Norway + 0x083b: "se_SE", # Sami (Northern) - Sweden + 0x0c3b: "se_FI", # Sami (Northern) - Finland + 0x7c3b: "smj", # Sami (Lule) + 0x103b: "smj_NO", # Sami (Lule) - Norway + 0x143b: "smj_SE", # Sami (Lule) - Sweden + 0x783b: "sma", # Sami (Southern) + 0x183b: "sma_NO", # Sami (Southern) - Norway + 0x1c3b: "sma_SE", # Sami (Southern) - Sweden + 0x743b: "sms", # Sami (Skolt) + 0x203b: "sms_FI", # Sami (Skolt) - Finland + 0x703b: "smn", # Sami (Inari) + 0x243b: "smn_FI", # Sami (Inari) - Finland + 0x004f: "sa", # Sanskrit + 0x044f: "sa_IN", # Sanskrit - India + 0x0091: "gd", # Scottish Gaelic + 0x0491: "gd_GB", # Scottish Gaelic - United Kingdom + 0x6c1a: "sr", # Serbian (Cyrillic) + 0x701a: "sr", # Serbian (Latin) + 0x7c1a: "sr", # Serbian (Latin) + 0x081a: "sr_CS", # Serbian (Latin) - Serbia and Montenegro (Former) + 0x0c1a: "sr_CS", # Serbian (Cyrillic) - Serbia and Montenegro (Former) + 0x181a: "sr_BA", # Serbian (Latin) - Bosnia and Herzegovina + 0x1c1a: "sr_BA", # Serbian (Cyrillic) - Bosnia and Herzegovina + 0x241a: "sr_RS", # Serbian (Latin) - Serbia + 0x281a: "sr_RS", # Serbian (Cyrillic) - Serbia + 0x2c1a: "sr_ME", # Serbian (Latin) - Montenegro + 0x301a: "sr_ME", # Serbian (Cyrillic) - Montenegro + 0x006c: "nso", # Sesotho sa Leboa + 0x046c: "nso_ZA", # Sesotho sa Leboa - South Africa + 0x0032: "tn", # Setswana + 0x0432: "tn_ZA", # Setswana - South Africa + 0x0832: "tn_BW", # Setswana - Botswana + 0x0059: "sd", # Sindhi + 0x7c59: "sd", # Sindhi + 0x0859: "sd_PK", # Sindhi - Islamic Republic of Pakistan + 0x005b: "si", # Sinhala 0x045b: "si_LK", # Sinhala - Sri Lanka - 0x046c: "ns_ZA", # Northern Sotho - 0x0432: "tn_ZA", # Setswana - Southern Africa - 0x041b: "sk_SK", # Slovak - 0x0424: "sl_SI", # Slovenian + 0x001b: "sk", # Slovak + 0x041b: "sk_SK", # Slovak - Slovakia + 0x0024: "sl", # Slovenian + 0x0424: "sl_SI", # Slovenian - Slovenia + 0x0477: "so_SO", # Somali - Somalia + 0x0030: "st", # Sotho + 0x0430: "st_ZA", # Sotho - South Africa + 0x000a: "es", # Spanish 0x040a: "es_ES", # Spanish - Spain 0x080a: "es_MX", # Spanish - Mexico - 0x0c0a: "es_ES", # Spanish - Spain (Modern) + 0x0c0a: "es_ES", # Spanish - Spain 0x100a: "es_GT", # Spanish - Guatemala 0x140a: "es_CR", # Spanish - Costa Rica 0x180a: "es_PA", # Spanish - Panama 0x1c0a: "es_DO", # Spanish - Dominican Republic - 0x200a: "es_VE", # Spanish - Venezuela + 0x200a: "es_VE", # Spanish - Bolivarian Republic of Venezuela 0x240a: "es_CO", # Spanish - Colombia 0x280a: "es_PE", # Spanish - Peru 0x2c0a: "es_AR", # Spanish - Argentina 0x300a: "es_EC", # Spanish - Ecuador 0x340a: "es_CL", # Spanish - Chile - 0x380a: "es_UR", # Spanish - Uruguay + 0x380a: "es_UY", # Spanish - Uruguay 0x3c0a: "es_PY", # Spanish - Paraguay 0x400a: "es_BO", # Spanish - Bolivia 0x440a: "es_SV", # Spanish - El Salvador @@ -1687,36 +1851,87 @@ windows_locale = { 0x4c0a: "es_NI", # Spanish - Nicaragua 0x500a: "es_PR", # Spanish - Puerto Rico 0x540a: "es_US", # Spanish - United States -# 0x0430: "", # Sutu - Not supported - 0x0441: "sw_KE", # Swahili + 0x5c0a: "es_CU", # Spanish - Cuba + 0x001d: "sv", # Swedish 0x041d: "sv_SE", # Swedish - Sweden 0x081d: "sv_FI", # Swedish - Finland - 0x045a: "syr_SY",# Syriac - 0x0428: "tg_TJ", # Tajik - Cyrillic - 0x085f: "tmz_DZ",# Tamazight - Latin - 0x0449: "ta_IN", # Tamil - 0x0444: "tt_RU", # Tatar - 0x044a: "te_IN", # Telugu - 0x041e: "th_TH", # Thai - 0x0851: "bo_BT", # Tibetan - Bhutan - 0x0451: "bo_CN", # Tibetan - PRC - 0x041f: "tr_TR", # Turkish - 0x0442: "tk_TM", # Turkmen - Cyrillic - 0x0480: "ug_CN", # Uighur - Arabic - 0x0422: "uk_UA", # Ukrainian - 0x042e: "wen_DE",# Upper Sorbian - Germany - 0x0420: "ur_PK", # Urdu + 0x005a: "syr", # Syriac + 0x045a: "syr_SY", # Syriac - Syria + 0x0028: "tg", # Tajik (Cyrillic) + 0x7c28: "tg", # Tajik (Cyrillic) + 0x0428: "tg_TJ", # Tajik (Cyrillic) - Tajikistan + 0x005f: "tzm", # Tamazight (Latin) + 0x785f: "tzm", + 0x7c5f: "tzm", # Tamazight (Latin) + 0x085f: "tzm_DZ", # Tamazight (Latin) - Algeria + 0x045f: "tzm_MA", # Central Atlas Tamazight (Arabic) - Morocco + 0x105f: "tzm_MA", + 0x0049: "ta", # Tamil + 0x0449: "ta_IN", # Tamil - India + 0x0849: "ta_LK", # Tamil - Sri Lanka + 0x0044: "tt", # Tatar + 0x0444: "tt_RU", # Tatar - Russia + 0x004a: "te", # Telugu + 0x044a: "te_IN", # Telugu - India + 0x001e: "th", # Thai + 0x041e: "th_TH", # Thai - Thailand + 0x0051: "bo", # Tibetan + 0x0451: "bo_CN", # Tibetan - People's Republic of China + 0x0073: "ti", # Tigrinya + 0x0473: "ti_ET", # Tigrinya - Ethiopia + 0x0873: "ti_ER", # Tigrinya - Eritrea + 0x0031: "ts", # Tsonga + 0x0431: "ts_ZA", # Tsonga - South Africa + 0x001f: "tr", # Turkish + 0x041f: "tr_TR", # Turkish - Turkey + 0x0042: "tk", # Turkmen + 0x0442: "tk_TM", # Turkmen - Turkmenistan + 0x0022: "uk", # Ukrainian + 0x0422: "uk_UA", # Ukrainian - Ukraine + 0x002e: "hsb", # Upper Sorbian + 0x042e: "hsb_DE", # Upper Sorbian - Germany + 0x0020: "ur", # Urdu + 0x0420: "ur_PK", # Urdu - Islamic Republic of Pakistan 0x0820: "ur_IN", # Urdu - India - 0x0443: "uz_UZ", # Uzbek - Latin - 0x0843: "uz_UZ", # Uzbek - Cyrillic - 0x042a: "vi_VN", # Vietnamese - 0x0452: "cy_GB", # Welsh + 0x0080: "ug", # Uyghur + 0x0480: "ug_CN", # Uyghur - People's Republic of China + 0x0043: "uz", # Uzbek (Latin) + 0x7843: "uz", # Uzbek (Cyrillic) + 0x7c43: "uz", # Uzbek (Latin) + 0x0443: "uz_UZ", # Uzbek (Latin) - Uzbekistan + 0x0033: "ve", # Venda + 0x0433: "ve_ZA", # Venda - South Africa + 0x002a: "vi", # Vietnamese + 0x042a: "vi_VN", # Vietnamese - Vietnam + 0x0052: "cy", # Welsh + 0x0452: "cy_GB", # Welsh - United Kingdom + 0x0088: "wo", # Wolof 0x0488: "wo_SN", # Wolof - Senegal + 0x0034: "xh", # Xhosa 0x0434: "xh_ZA", # Xhosa - South Africa - 0x0485: "sah_RU",# Yakut - Cyrillic - 0x0478: "ii_CN", # Yi - PRC + 0x0078: "ii", # Yi + 0x0478: "ii_CN", # Yi - People's Republic of China + 0x043d: "yi_001", # Yiddish - World + 0x006a: "yo", # Yoruba 0x046a: "yo_NG", # Yoruba - Nigeria - 0x0435: "zu_ZA", # Zulu + 0x0035: "zu", # Zulu + 0x0435: "zu_ZA", # Zulu - South Africa + 0x0086: "qut", + +# 0x0001007f: "x-IV-mathan", # math alphanumeric sorting + 0x00010407: "de_DE", + 0x0001040e: "hu_HU", + 0x00010437: "ka_GE", + 0x00020804: "zh_CN", + 0x00021004: "zh_SG", + 0x00021404: "zh_MO", + 0x00030404: "zh_TW", + 0x00040404: "zh_TW", + 0x00040411: "ja_JP", + 0x00040c04: "zh_HK", + 0x00041404: "zh_MO", + 0x00050804: "zh_CN", + 0x00051004: "zh_SG", } def _print_locale(): diff --git a/Lib/ntpath.py b/Lib/ntpath.py index 01f060e70..eb127ec26 100644 --- a/Lib/ntpath.py +++ b/Lib/ntpath.py @@ -152,12 +152,14 @@ def splitdrive(p): It is always true that: result[0] + result[1] == p - If the path contained a drive letter, drive_or_unc will contain everything - up to and including the colon. e.g. splitdrive("c:/dir") returns ("c:", "/dir") + If the path contained a drive letter, drive_or_unc will contain + everything up to and including the colon. e.g. splitdrive("c:/dir") + returns ("c:", "/dir") - If the path contained a UNC path, the drive_or_unc will contain the host name - and share up to but not including the fourth directory separator character. - e.g. splitdrive("//host/computer/dir") returns ("//host/computer", "/dir") + If the path contained a UNC path, the drive_or_unc will contain the + host name and share up to but not including the fourth directory + separator character. e.g. splitdrive("//host/computer/dir") returns + ("//host/computer", "/dir") Paths cannot contain both a drive letter and a UNC path. @@ -222,8 +224,8 @@ except ImportError: def split(p): """Split a pathname. - Return tuple (head, tail) where tail is everything after the final slash. - Either part may be empty.""" + Return tuple (head, tail) where tail is everything after the final + slash. Either part may be empty.""" p = os.fspath(p) seps = _get_bothseps(p) d, r, p = splitroot(p) diff --git a/Lib/os.py b/Lib/os.py index ac03b4163..9bb00f45f 100644 --- a/Lib/os.py +++ b/Lib/os.py @@ -211,11 +211,11 @@ SEEK_END = 2 def makedirs(name, mode=0o777, exist_ok=False): """makedirs(name [, mode=0o777][, exist_ok=False]) - Super-mkdir; create a leaf directory and all intermediate ones. Works like - mkdir, except that any intermediate path segment (not just the rightmost) - will be created if it does not exist. If the target directory already - exists, raise an OSError if exist_ok is False. Otherwise no exception is - raised. This is recursive. + Super-mkdir; create a leaf directory and all intermediate ones. Works + like mkdir, except that any intermediate path segment (not just the + rightmost) will be created if it does not exist. If the target + directory already exists, raise an OSError if exist_ok is False. + Otherwise no exception is raised. This is recursive. """ head, tail = path.split(name) @@ -303,12 +303,12 @@ def walk(top, topdown=True, onerror=None, followlinks=False): dirpath, dirnames, filenames dirpath is a string, the path to the directory. dirnames is a list of - the names of the subdirectories in dirpath (including symlinks to directories, - and excluding '.' and '..'). + the names of the subdirectories in dirpath (including symlinks to + directories, and excluding '.' and '..'). filenames is a list of the names of the non-directory files in dirpath. - Note that the names in the lists are just names, with no path components. - To get a full path (which begins with top) to a file or directory in - dirpath, do os.path.join(dirpath, name). + Note that the names in the lists are just names, with no path + components. To get a full path (which begins with top) to a file or + directory in dirpath, do os.path.join(dirpath, name). If optional arg 'topdown' is true or not specified, the triple for a directory is generated before the triples for any of its subdirectories @@ -318,13 +318,13 @@ def walk(top, topdown=True, onerror=None, followlinks=False): When topdown is true, the caller can modify the dirnames list in-place (e.g., via del or slice assignment), and walk will only recurse into the - subdirectories whose names remain in dirnames; this can be used to prune the - search, or to impose a specific order of visiting. Modifying dirnames when - topdown is false has no effect on the behavior of os.walk(), since the - directories in dirnames have already been generated by the time dirnames - itself is generated. No matter the value of topdown, the list of - subdirectories is retrieved before the tuples for the directory and its - subdirectories are generated. + subdirectories whose names remain in dirnames; this can be used to prune + the search, or to impose a specific order of visiting. Modifying + dirnames when topdown is false has no effect on the behavior of + os.walk(), since the directories in dirnames have already been generated + by the time dirnames itself is generated. No matter the value of + topdown, the list of subdirectories is retrieved before the tuples for + the directory and its subdirectories are generated. By default errors from the os.scandir() call are ignored. If optional arg 'onerror' is specified, it should be a function; it @@ -449,9 +449,9 @@ if {open, stat} <= supports_dir_fd and {scandir, stat} <= supports_fd: The advantage of fwalk() over walk() is that it's safe against symlink races (when follow_symlinks is False). - If dir_fd is not None, it should be a file descriptor open to a directory, - and top should be relative; top will then be relative to that directory. - (dir_fd is always supported for fwalk.) + If dir_fd is not None, it should be a file descriptor open to + a directory, and top should be relative; top will then be relative to + that directory. (dir_fd is always supported for fwalk.) Caution: Since fwalk() yields file descriptors, those are only valid until the diff --git a/Lib/pydoc_data/module_docs.py b/Lib/pydoc_data/module_docs.py index 67a1ba769..69b9046f4 100644 --- a/Lib/pydoc_data/module_docs.py +++ b/Lib/pydoc_data/module_docs.py @@ -1,4 +1,4 @@ -# Autogenerated by Sphinx on Sun May 10 13:21:26 2026 +# Autogenerated by Sphinx on Wed Jun 10 13:03:46 2026 # as part of the release process. module_docs = { diff --git a/Lib/pydoc_data/topics.py b/Lib/pydoc_data/topics.py index e91c8a5cb..05d283c95 100644 --- a/Lib/pydoc_data/topics.py +++ b/Lib/pydoc_data/topics.py @@ -1,4 +1,4 @@ -# Autogenerated by Sphinx on Sun May 10 13:21:26 2026 +# Autogenerated by Sphinx on Wed Jun 10 13:03:46 2026 # as part of the release process. topics = { @@ -2227,9 +2227,9 @@ Added in version 3.10. The match statement is used for pattern matching. Syntax: match_stmt: 'match' subject_expr ":" NEWLINE INDENT case_block+ DEDENT - subject_expr: `!star_named_expression` "," `!star_named_expressions`? - | `!named_expression` - case_block: 'case' patterns [guard] ":" `!block` + subject_expr: flexible_expression "," [flexible_expression_list [',']] + | assignment_expression + case_block: 'case' patterns [guard] ":" suite Note: @@ -2320,7 +2320,7 @@ section. Guards ------ - guard: "if" `!named_expression` + guard: "if" assignment_expression A "guard" (which is part of the "case") must succeed for code inside the "case" block to execute. It takes the form: "if" followed by an @@ -5772,7 +5772,8 @@ number respectively. It can be one of the following: | | is not supported. | +-----------+------------------------------------------------------------+ -For a locale aware separator, use the "'n'" presentation type instead. +For a locale-aware separator, use the "'n'" float presentation type or +integer presentation type instead. Changed in version 3.1: Added the "','" option (see also **PEP 378**). @@ -5818,7 +5819,10 @@ The available integer presentation types are: +-----------+------------------------------------------------------------+ | "'n'" | Number. This is the same as "'d'", except that it uses the | | | current locale setting to insert the appropriate digit | - | | group separators. | + | | group separators. Note that the default locale is not the | + | | system locale. Depending on your use case, you may wish to | + | | set "LC_NUMERIC" with "locale.setlocale()" before using | + | | "'n'". | +-----------+------------------------------------------------------------+ | None | The same as "'d'". | +-----------+------------------------------------------------------------+ @@ -5892,7 +5896,10 @@ The available presentation types for "float" and "Decimal" values are: +-----------+------------------------------------------------------------+ | "'n'" | Number. This is the same as "'g'", except that it uses the | | | current locale setting to insert the appropriate digit | - | | group separators for the integral part of a number. | + | | group separators for the integral part of a number. Note | + | | that the default locale is not the system locale. | + | | Depending on your use case, you may wish to set | + | | "LC_NUMERIC" with "locale.setlocale()" before using "'n'". | +-----------+------------------------------------------------------------+ | "'%'" | Percentage. Multiplies the number by 100 and displays in | | | fixed ("'f'") format, followed by a percent sign. | @@ -10198,9 +10205,22 @@ str.isdigit() decimal characters and digits that need special handling, such as the compatibility superscript digits. This covers digits which cannot be used to form numbers in base 10, like the Kharosthi - numbers. Formally, a digit is a character that has the property + numbers. Formally, a digit is a character that has the property value Numeric_Type=Digit or Numeric_Type=Decimal. + For example: + + >>> '0123456789'.isdigit() + True + >>> '٠١٢٣٤٥٦٧٨٩'.isdigit() # Arabic-Indic digits zero to nine + True + >>> '⅕'.isdigit() # Vulgar fraction one fifth + False + >>> '²'.isdecimal(), '²'.isdigit(), '²'.isnumeric() + (False, True, True) + + See also "isdecimal()" and "isnumeric()". + str.isidentifier() Return "True" if the string is a valid identifier according to the @@ -10236,15 +10256,14 @@ str.isnumeric() >>> '0123456789'.isnumeric() True - >>> '٠١٢٣٤٥٦٧٨٩'.isnumeric() # Arabic-indic digit zero to nine + >>> '٠١٢٣٤٥٦٧٨٩'.isnumeric() # Arabic-Indic digits zero to nine True >>> '⅕'.isnumeric() # Vulgar fraction one fifth True >>> '²'.isdecimal(), '²'.isdigit(), '²'.isnumeric() (False, True, True) - See also "isdecimal()" and "isdigit()". Numeric characters are a - superset of decimal numbers. + See also "isdecimal()" and "isdigit()". str.isprintable() @@ -10626,7 +10645,7 @@ str.split(sep=None, maxsplit=-1) >>> " foo ".split(maxsplit=0) ['foo '] - See also "join()". + See also "join()" and "rsplit()". str.splitlines(keepends=False) @@ -10716,6 +10735,8 @@ str.strip(chars=None, /) not a prefix or suffix; rather, all combinations of its values are stripped. + Whitespace characters are defined by "str.isspace()". + For example: >>> ' spacious '.strip() @@ -13311,6 +13332,9 @@ class dict(iterable, /, **kwargs) insertion order. This behavior was an implementation detail of CPython from 3.6. + Dictionaries are generic over two types, signifying (respectively) + the types of the dictionary’s keys and values. + These are the operations that dictionaries support (and therefore, custom mapping types should support too): @@ -14015,6 +14039,8 @@ class list(iterable=(), /) Many other operations also produce lists, including the "sorted()" built-in. + Lists are generic over the types of their items. + Lists implement all of the common and mutable sequence operations. Lists also provide the following additional method: @@ -14105,6 +14131,10 @@ class tuple(iterable=(), /) Tuples implement all of the common sequence operations. + Tuples are generic over the types of their contents. For more + information, refer to the typing documentation on annotating + tuples. + For heterogeneous collections of data where access by name is clearer than access by index, "collections.namedtuple()" may be a more appropriate choice than a simple tuple object. diff --git a/Lib/rlcompleter.py b/Lib/rlcompleter.py index 23eb0020f..e75dd0a9e 100644 --- a/Lib/rlcompleter.py +++ b/Lib/rlcompleter.py @@ -34,6 +34,7 @@ import builtins import inspect import keyword import re +import types import __main__ import warnings @@ -178,14 +179,14 @@ class Completer: if (word[:n] == attr and not (noprefix and word[:n+1] == noprefix)): match = "%s.%s" % (expr, word) - if isinstance(getattr(type(thisobject), word, None), - property): - # bpo-44752: thisobject.word is a method decorated by - # `@property`. What follows applies a postfix if - # thisobject.word is callable, but know we know that - # this is not callable (because it is a property). - # Also, getattr(thisobject, word) will evaluate the - # property method, which is not desirable. + + class_attr = getattr(type(thisobject), word, None) + if isinstance( + class_attr, + (property, types.GetSetDescriptorType, types.MemberDescriptorType) + ) or (hasattr(class_attr, '__get__') and not callable(class_attr)): + # Avoid evaluating descriptors, which could run + # arbitrary code or raise exceptions. matches.append(match) continue if (value := getattr(thisobject, word, None)) is not None: diff --git a/Lib/shutil.py b/Lib/shutil.py index b7608f7ed..a3a112f69 100644 --- a/Lib/shutil.py +++ b/Lib/shutil.py @@ -885,10 +885,14 @@ def move(src, dst, copy_function=copy2): If dst already exists but is not a directory, it may be overwritten depending on os.rename() semantics. - If the destination is on our current filesystem, then rename() is used. - Otherwise, src is copied to the destination and then removed. Symlinks are - recreated under the new name if os.rename() fails because of cross - filesystem renames. + os.rename() is preferably used if the source and destination are on the + same filesystem. In case os.rename() fails due to OSError (e.g. the user + has write permission to *dst* file but not to its parent directory), + this method falls back to using *copy_function* silently. + Symlinks are also recreated under the new name if os.rename() fails + because of cross filesystem renames. + + It's recommended to use os.rename() if atomic move is strictly required. The optional `copy_function` argument is a callable that will be used to copy the source or it will be delegated to `copytree`. @@ -940,8 +944,8 @@ def move(src, dst, copy_function=copy2): return real_dst def _destinsrc(src, dst): - src = os.path.abspath(src) - dst = os.path.abspath(dst) + src = os.path.realpath(src) + dst = os.path.realpath(dst) if not src.endswith(os.path.sep): src += os.path.sep if not dst.endswith(os.path.sep): diff --git a/Lib/tarfile.py b/Lib/tarfile.py index 414aefe97..e6734db24 100644 --- a/Lib/tarfile.py +++ b/Lib/tarfile.py @@ -498,7 +498,7 @@ class _Stream: if flag & 4: xlen = ord(self.__read(1)) + 256 * ord(self.__read(1)) - self.read(xlen) + self.__read(xlen) if flag & 8: while True: s = self.__read(1) @@ -830,16 +830,22 @@ def _get_filtered_attrs(member, dest_path, for_data=True): if member.islnk() or member.issym(): if os.path.isabs(member.linkname): raise AbsoluteLinkError(member) + # A link member that resolves to the destination directory itself + # would replace it with a (sym)link, redirecting the destination + # for all subsequent members. + if target_path == dest_path: + raise OutsideDestinationError(member, target_path) normalized = os.path.normpath(member.linkname) if normalized != member.linkname: new_attrs['linkname'] = normalized if member.issym(): - target_path = os.path.join(dest_path, - os.path.dirname(name), - member.linkname) + # The symlink is created at `name` with trailing separators + # stripped, so its target is relative to the directory + # containing that path. + link_dir = os.path.dirname(name.rstrip('/' + os.sep)) + target_path = os.path.join(dest_path, link_dir, normalized) else: - target_path = os.path.join(dest_path, - member.linkname) + target_path = os.path.join(dest_path, normalized) target_path = os.path.realpath(target_path, strict=os.path.ALLOW_MISSING) if os.path.commonpath([target_path, dest_path]) != dest_path: @@ -893,11 +899,14 @@ class TarInfo(object): size = 'Size in bytes.', mtime = 'Time of last modification.', chksum = 'Header checksum.', - type = ('File type. type is usually one of these constants: ' - 'REGTYPE, AREGTYPE, LNKTYPE, SYMTYPE, DIRTYPE, FIFOTYPE, ' - 'CONTTYPE, CHRTYPE, BLKTYPE, GNUTYPE_SPARSE.'), + type = ('File type. type is usually one of these constants: ' + 'REGTYPE,\n' + 'AREGTYPE, LNKTYPE, SYMTYPE, DIRTYPE, FIFOTYPE, ' + 'CONTTYPE, CHRTYPE,\n' + 'BLKTYPE, GNUTYPE_SPARSE.'), linkname = ('Name of the target file name, which is only present ' - 'in TarInfo objects of type LNKTYPE and SYMTYPE.'), + 'in TarInfo\n' + 'objects of type LNKTYPE and SYMTYPE.'), uname = 'User name.', gname = 'Group name.', devmajor = 'Device major number.', @@ -905,7 +914,8 @@ class TarInfo(object): offset = 'The tar header starts here.', offset_data = "The file's data starts here.", pax_headers = ('A dictionary containing key-value pairs of an ' - 'associated pax extended header.'), + 'associated pax\n' + 'extended header.'), sparse = 'Sparse member information.', _tarfile = None, _sparse_structs = None, @@ -2267,10 +2277,11 @@ class TarFile(object): return tarinfo def list(self, verbose=True, *, members=None): - """Print a table of contents to sys.stdout. If 'verbose' is False, only - the names of the members are printed. If it is True, an 'ls -l'-like - output is produced. 'members' is optional and must be a subset of the - list returned by getmembers(). + """Print a table of contents to sys.stdout. + + If 'verbose' is False, only the names of the members are printed. + If it is True, an 'ls -l'-like output is produced. 'members' is + optional and must be a subset of the list returned by getmembers(). """ # Convert tarinfo type to stat type. type2mode = {REGTYPE: stat.S_IFREG, SYMTYPE: stat.S_IFLNK, @@ -2361,10 +2372,12 @@ class TarFile(object): self.addfile(tarinfo) def addfile(self, tarinfo, fileobj=None): - """Add the TarInfo object 'tarinfo' to the archive. If 'tarinfo' represents - a non zero-size regular file, the 'fileobj' argument should be a binary file, - and tarinfo.size bytes are read from it and added to the archive. - You can create TarInfo objects directly, or by using gettarinfo(). + """Add the TarInfo object 'tarinfo' to the archive. + + If 'tarinfo' represents a non zero-size regular file, the 'fileobj' + argument should be a binary file, and tarinfo.size bytes are read + from it and added to the archive. You can create TarInfo objects + directly, or by using gettarinfo(). """ self._check("awx") diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py index c6534adb1..c1bb6138a 100644 --- a/Lib/test/datetimetester.py +++ b/Lib/test/datetimetester.py @@ -7313,6 +7313,36 @@ class ExtensionModuleTests(unittest.TestCase): self.assertEqual(out, b"a" * 8) self.assertEqual(err, b"") + @support.cpython_only + @support.subTests(("setup", "call"), [ + ("obj = _datetime.timedelta", "obj(seconds=2)"), + ("obj = _datetime.timedelta(seconds=2)", "obj.total_seconds()"), + ("obj = _datetime.date(2026, 6, 7)", "obj.isocalendar()"), + ]) + def test_static_datetime_types_outlive_collected_module(self, setup, call): + # gh-151039: This code used to crash + script = f"""if True: + import sys, gc + import _datetime + + {setup} # static C type, survives the module + del sys.modules['_datetime'] + del _datetime + sys.modules['_datetime'] = None # block re-import + gc.collect() # module object is collected + + try: + {call} # used to be a segmentation fault + except ImportError: + pass + else: + raise AssertionError("ImportError not raised") + """ + rc, out, err = script_helper.assert_python_ok("-c", script) + self.assertEqual(rc, 0) + self.assertEqual(out, b'') + self.assertEqual(err, b'') + def load_tests(loader, standard_tests, pattern): standard_tests.addTest(ZoneInfoCompleteTest()) diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py index 6635ec347..701d34bba 100644 --- a/Lib/test/support/__init__.py +++ b/Lib/test/support/__init__.py @@ -3227,3 +3227,18 @@ def control_characters_c0() -> list[str]: C0 control characters defined as the byte range 0x00-0x1F, and 0x7F. """ return [chr(c) for c in range(0x00, 0x20)] + ["\x7F"] + + +STATUS_DLL_INIT_FAILED = 0xC0000142 +def skip_on_low_desktop_heap_memory_subprocess(returncode): + if sys.platform not in ('win32', 'cygwin'): + return + # On Windows, STATUS_DLL_INIT_FAILED is a generic error code that could + # come from any of the DLLs being loaded when a new Python process is + # created. In practice, it's likely a memory allocation failure in the + # desktop heap memory which caused the DLL init failure, especially on + # process created with CREATE_NEW_CONSOLE creation flag. See the article: + # https://learn.microsoft.com/en-us/troubleshoot/windows-server/performance/desktop-heap-limitation-out-of-memory + if returncode == STATUS_DLL_INIT_FAILED: + raise unittest.SkipTest('gh-150436: DLL init failed, likely because ' + 'of low desktop heap memory') diff --git a/Lib/test/test_http_cookies.py b/Lib/test/test_http_cookies.py index ab01d68d1..2379dad19 100644 --- a/Lib/test/test_http_cookies.py +++ b/Lib/test/test_http_cookies.py @@ -1,11 +1,11 @@ # Simple test suite for http/cookies.py -import base64 import copy import unittest import doctest from http import cookies import pickle from test import support +import urllib.parse class CookieTests(unittest.TestCase): @@ -131,8 +131,8 @@ class CookieTests(unittest.TestCase): @support.requires_resource('cpu') def test_unquote_large(self): - # n = 10**6 - n = 10**4 # XXX: RUSTPYTHON; This takes more than 10 minutes to run. lower to 4 + n = 10**6 + n = 10**4 # TODO: RUSTPYTHON; This takes more than 10 minutes to run. lower to 4 for encoded in r'\\', r'\134': with self.subTest(encoded): data = 'a="b=' + encoded*n + ';"' @@ -153,19 +153,19 @@ class CookieTests(unittest.TestCase): self.assertEqual(C.output(['path']), 'Set-Cookie: Customer="WILE_E_COYOTE"; Path=/acme') - cookie_encoded = base64.b64encode(b'Customer="WILE_E_COYOTE"; Path=/acme; Version=1').decode('ascii') + cookie_encoded = urllib.parse.quote('Customer="WILE_E_COYOTE"; Path=/acme; Version=1', safe='', encoding='utf-8') self.assertEqual(C.js_output(), fr""" """) - cookie_encoded = base64.b64encode(b'Customer="WILE_E_COYOTE"; Path=/acme').decode('ascii') + cookie_encoded = urllib.parse.quote('Customer="WILE_E_COYOTE"; Path=/acme', safe='', encoding='utf-8') self.assertEqual(C.js_output(['path']), fr""" """) @@ -270,19 +270,19 @@ class CookieTests(unittest.TestCase): self.assertEqual(C.output(['path']), 'Set-Cookie: Customer="WILE_E_COYOTE"; Path=/acme') - expected_encoded_cookie = base64.b64encode(b'Customer=\"WILE_E_COYOTE\"; Path=/acme; Version=1').decode('ascii') + expected_encoded_cookie = urllib.parse.quote('Customer=\"WILE_E_COYOTE\"; Path=/acme; Version=1', safe='', encoding='utf-8') self.assertEqual(C.js_output(), fr""" """) - expected_encoded_cookie = base64.b64encode(b'Customer=\"WILE_E_COYOTE\"; Path=/acme').decode('ascii') + expected_encoded_cookie = urllib.parse.quote('Customer=\"WILE_E_COYOTE\"; Path=/acme', safe='', encoding='utf-8') self.assertEqual(C.js_output(['path']), fr""" """) @@ -373,13 +373,14 @@ class MorselTests(unittest.TestCase): self.assertEqual( M.output(), "Set-Cookie: %s=%s; Path=/foo" % (i, "%s_coded_val" % i)) - expected_encoded_cookie = base64.b64encode( - ("%s=%s; Path=/foo" % (i, "%s_coded_val" % i)).encode("ascii") - ).decode('ascii') + expected_encoded_cookie = urllib.parse.quote( + "%s=%s; Path=/foo" % (i, "%s_coded_val" % i), + safe='', encoding='utf-8', + ) expected_js_output = """ """ % (expected_encoded_cookie,) diff --git a/Lib/test/test_json/json_lines.jsonl b/Lib/test/test_json/json_lines.jsonl new file mode 100644 index 000000000..d2f292111 --- /dev/null +++ b/Lib/test/test_json/json_lines.jsonl @@ -0,0 +1,2 @@ +{"ingredients":["frog", "water", "chocolate", "glucose"]} +{"ingredients":["chocolate","steel bolts"]} diff --git a/Lib/test/test_json/test_speedups.py b/Lib/test/test_json/test_speedups.py index 370a2539d..64d210f4a 100644 --- a/Lib/test/test_json/test_speedups.py +++ b/Lib/test/test_json/test_speedups.py @@ -1,4 +1,5 @@ from test.test_json import CTest +from test.support import gc_collect import unittest # XXX: RUSTPYTHON; importing to be able to skip tests @@ -117,3 +118,65 @@ class TestEncode(CTest): self.assertEqual(enc(['spam', {'ham': 'eggs'}], 3)[0], expected2) self.assertRaises(TypeError, enc, ['spam', {'ham': 'eggs'}], 3.0) self.assertRaises(TypeError, enc, ['spam', {'ham': 'eggs'}]) + + @unittest.expectedFailure # TODO: RUSTPYTHON; TypeError: 'NoneType' object is not callable + def test_mutate_dict_items_during_encode(self): + # gh-142831: Clearing the items list via a re-entrant key encoder + # must not cause a use-after-free. BadDict.items() returns a + # mutable list; encode_str clears it while iterating. + items = None + + class BadDict(dict): + def items(self): + nonlocal items + items = [("boom", object())] + return items + + cleared = False + def encode_str(obj): + nonlocal items, cleared + if items is not None: + items.clear() + items = None + cleared = True + gc_collect() + return '"x"' + + encoder = self.json.encoder.c_make_encoder( + None, lambda o: "null", + encode_str, None, + ": ", ", ", False, + False, True + ) + + # Must not crash (use-after-free under ASan before fix) + encoder(BadDict(real=1), 0) + self.assertTrue(cleared) + + @unittest.expectedFailure # TODO: RUSTPYTHON; TypeError: 'NoneType' object is not callable + def test_mutate_list_during_encode(self): + # gh-142831: Clearing a list mid-iteration via the default + # callback must not cause a use-after-free. + call_count = 0 + lst = [object() for _ in range(10)] + + def default(obj): + nonlocal call_count + call_count += 1 + if call_count == 3: + lst.clear() + gc_collect() + return None + + encoder = self.json.encoder.c_make_encoder( + None, default, + self.json.encoder.c_encode_basestring, None, + ": ", ", ", False, + False, True + ) + + # Must not crash (use-after-free under ASan before fix) + encoder(lst, 0) + # Verify the mutation path was actually hit and the loop + # stopped iterating after the list was cleared. + self.assertEqual(call_count, 3) diff --git a/Lib/test/test_json/test_tool.py b/Lib/test/test_json/test_tool.py index 7b5d217a2..0a96b318b 100644 --- a/Lib/test/test_json/test_tool.py +++ b/Lib/test/test_json/test_tool.py @@ -1,4 +1,5 @@ import errno +import pathlib import os import sys import textwrap @@ -157,6 +158,14 @@ class TestMain(unittest.TestCase): self.assertEqual(process.stdout, self.jsonlines_expect) self.assertEqual(process.stderr, '') + @force_not_colorized + def test_jsonlines_from_file(self): + jsonl = pathlib.Path(__file__).parent / 'json_lines.jsonl' + args = sys.executable, '-m', self.module, '--json-lines', jsonl + process = subprocess.run(args, capture_output=True, text=True, check=True) + self.assertEqual(process.stdout, self.jsonlines_expect) + self.assertEqual(process.stderr, '') + def test_help_flag(self): rc, out, err = assert_python_ok('-m', self.module, '-h', PYTHON_COLORS='0') diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py index cfaf7429d..5ba6b3de2 100644 --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -4043,7 +4043,6 @@ class TestSendfile(unittest.IsolatedAsyncioTestCase): @requires_headers_trailers @requires_32b async def test_headers_overflow_32bits(self): - self.server.handler_instance.accumulate = False with self.assertRaises(OSError) as cm: await self.async_sendfile(self.sockno, self.fileno, 0, 0, headers=[b"x" * 2**16] * 2**15) @@ -4052,7 +4051,6 @@ class TestSendfile(unittest.IsolatedAsyncioTestCase): @requires_headers_trailers @requires_32b async def test_trailers_overflow_32bits(self): - self.server.handler_instance.accumulate = False with self.assertRaises(OSError) as cm: await self.async_sendfile(self.sockno, self.fileno, 0, 0, trailers=[b"x" * 2**16] * 2**15) diff --git a/Lib/test/test_rlcompleter.py b/Lib/test/test_rlcompleter.py index 6db31df89..5ba183dfd 100644 --- a/Lib/test/test_rlcompleter.py +++ b/Lib/test/test_rlcompleter.py @@ -1,6 +1,7 @@ import unittest from unittest.mock import patch import builtins +import types import rlcompleter from test.support import MISSING_C_DOCSTRINGS @@ -136,6 +137,57 @@ class TestRlcompleter(unittest.TestCase): self.assertEqual(completer.complete('f.b', 0), 'f.bar') self.assertFalse(f.property_called) + def test_released_memoryview_completion_works(self): + mv = memoryview(b"abc") + mv.release() + + self.assertIsInstance(type(mv).shape, types.GetSetDescriptorType) + self.assertIsInstance(type(mv).strides, types.GetSetDescriptorType) + + completer = rlcompleter.Completer(dict(mv=mv)) + matches = completer.attr_matches('mv.') + + # These are getset descriptors on memoryview and should be completed + # without evaluating the released-memoryview getters. + self.assertIn('mv.shape', matches) + self.assertIn('mv.strides', matches) + + def test_member_descriptor_not_evaluated(self): + class Foo: + __slots__ = ("boom",) + boom_accesses = 0 + + def __getattribute__(self, name): + if name == "boom": + type(self).boom_accesses += 1 + raise RuntimeError("boom access should be skipped") + return super().__getattribute__(name) + + self.assertIsInstance(Foo.boom, types.MemberDescriptorType) + + completer = rlcompleter.Completer(dict(f=Foo())) + matches = completer.attr_matches('f.') + self.assertIn('f.boom', matches) + self.assertEqual(Foo.boom_accesses, 0) + + def test_raising_descriptor_completion_works(self): + class ExplodingDescriptor: + def __init__(self): + self.instance_get_calls = 0 + + def __get__(self, obj, owner): + if obj is None: + return self + self.instance_get_calls += 1 + raise RuntimeError("descriptor getter exploded") + + class Foo: + boom = ExplodingDescriptor() + + completer = rlcompleter.Completer(dict(f=Foo())) + matches = completer.attr_matches('f.') + self.assertIn('f.boom', matches) + self.assertEqual(Foo.boom.instance_get_calls, 0) def test_uncreated_attr(self): # Attributes like properties and slots should be completed even when diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py index fb1a7d876..8813cc46c 100644 --- a/Lib/test/test_shutil.py +++ b/Lib/test/test_shutil.py @@ -2888,6 +2888,23 @@ class TestMove(BaseTest, unittest.TestCase): finally: os_helper.rmtree(TESTFN) + @os_helper.skip_unless_symlink + def test_destinsrc_symlink_bypass(self): + tmp = self.mkdtemp() + src = os.path.join(tmp, 'src') + os.makedirs(src) + # tmp/link -> tmp (one level up) + link = os.path.join(tmp, 'link') + os.symlink(tmp, link) + # raw path: tmp/link/src/sub - no src prefix in string space + # real path: tmp/src/sub - physically inside src + dst = os.path.join(link, 'src', 'sub') + self.assertTrue( + shutil._destinsrc(src, dst), + msg='_destinsrc failed to detect dst inside src via symlink ' + '(dst=%s, src=%s)' % (dst, src), + ) + @os_helper.skip_unless_symlink @mock_rename def test_move_file_symlink(self): diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py index 8d9f8824f..d974c7d46 100644 --- a/Lib/test/test_tarfile.py +++ b/Lib/test/test_tarfile.py @@ -892,10 +892,39 @@ class MiscReadTestBase(CommonReadTest): self._assert_on_file_content(hardlink_filepath, sha256_regtype) +class GzipReadTestBase: + + def test_read_with_extra_field(self): + with open(self.tarname, 'rb') as f: + data = bytearray(f.read()) + flags = data[3] + self.assertEqual(flags, 8) + data[3] = flags | 4 + data[10:10] = b'\x05\x00extra' + with open(tmpname, 'wb') as f: + f.write(data) + print(self.mode) + with tarfile.open(tmpname, mode=self.mode): + pass + + def test_read_with_file_comment(self): + with open(self.tarname, 'rb') as f: + data = bytearray(f.read()) + flags = data[3] + self.assertEqual(flags, 8) + data[3] = flags | 16 + i = data.index(0, 10) + 1 + data[i:i] = b'comment\x00' + with open(tmpname, 'wb') as f: + f.write(data) + with tarfile.open(tmpname, mode=self.mode): + pass + + class MiscReadTest(MiscReadTestBase, unittest.TestCase): test_fail_comp = None -class GzipMiscReadTest(GzipTest, MiscReadTestBase, unittest.TestCase): +class GzipMiscReadTest(GzipTest, GzipReadTestBase, MiscReadTestBase, unittest.TestCase): pass class Bz2MiscReadTest(Bz2Test, MiscReadTestBase, unittest.TestCase): @@ -969,7 +998,7 @@ class StreamReadTest(CommonReadTest, unittest.TestCase): finally: tar1.close() -class GzipStreamReadTest(GzipTest, StreamReadTest): +class GzipStreamReadTest(GzipTest, GzipReadTestBase, StreamReadTest): pass class Bz2StreamReadTest(Bz2Test, StreamReadTest): @@ -3682,6 +3711,39 @@ class TestExtractionFilters(unittest.TestCase): # The destination for the extraction, within `outerdir` destdir = outerdir / 'dest' + @classmethod + def setUpClass(cls): + # Posix and Windows have different pathname resolution: + # either symlink or a '..' component resolve first. + # Let's see which we are on. + if os_helper.can_symlink(): + testpath = os.path.join(TEMPDIR, 'resolution_test') + os.mkdir(testpath) + + # testpath/current links to `.` which is all of: + # - `testpath` + # - `testpath/current` + # - `testpath/current/current` + # - etc. + os.symlink('.', os.path.join(testpath, 'current')) + + # we'll test where `testpath/current/../file` ends up + with open(os.path.join(testpath, 'current', '..', 'file'), 'w'): + pass + + if os.path.exists(os.path.join(testpath, 'file')): + # Windows collapses 'current\..' to '.' first, leaving + # 'testpath\file' + cls.dotdot_resolves_early = True + elif os.path.exists(os.path.join(testpath, '..', 'file')): + # Posix resolves 'current' to '.' first, leaving + # 'testpath/../file' + cls.dotdot_resolves_early = False + else: + raise AssertionError('Could not determine link resolution') + else: + cls.dotdot_resolves_early = False + @contextmanager def check_context(self, tar, filter, *, check_flag=True): """Extracts `tar` to `self.destdir` and allows checking the result @@ -3853,10 +3915,19 @@ class TestExtractionFilters(unittest.TestCase): + "which is outside the destination") with self.check_context(arc.open(), 'data'): - self.expect_exception( - tarfile.LinkOutsideDestinationError, - """'parent' would link to ['"].*outerdir['"], """ - + "which is outside the destination") + if self.dotdot_resolves_early: + # 'current/../..' normalises to '..', which is rejected. + self.expect_exception( + tarfile.LinkOutsideDestinationError, + """'parent' would link to ['"].*outerdir['"], """ + + "which is outside the destination") + else: + # 'current/..' normalises to '.'; the rewritten link is + # created and 'parent/evil' lands harmlessly inside the + # destination. + self.expect_file('current', symlink_to='.') + self.expect_file('parent', symlink_to='.') + self.expect_file('evil') else: # No symlink support. The symlinks are ignored. @@ -3946,35 +4017,6 @@ class TestExtractionFilters(unittest.TestCase): # Test interplaying symlinks # Inspired by 'dirsymlink2b' in jwilk/traversal-archives - # Posix and Windows have different pathname resolution: - # either symlink or a '..' component resolve first. - # Let's see which we are on. - if os_helper.can_symlink(): - testpath = os.path.join(TEMPDIR, 'resolution_test') - os.mkdir(testpath) - - # testpath/current links to `.` which is all of: - # - `testpath` - # - `testpath/current` - # - `testpath/current/current` - # - etc. - os.symlink('.', os.path.join(testpath, 'current')) - - # we'll test where `testpath/current/../file` ends up - with open(os.path.join(testpath, 'current', '..', 'file'), 'w'): - pass - - if os.path.exists(os.path.join(testpath, 'file')): - # Windows collapses 'current\..' to '.' first, leaving - # 'testpath\file' - dotdot_resolves_early = True - elif os.path.exists(os.path.join(testpath, '..', 'file')): - # Posix resolves 'current' to '.' first, leaving - # 'testpath/../file' - dotdot_resolves_early = False - else: - raise AssertionError('Could not determine link resolution') - with ArchiveMaker() as arc: # `current` links to `.` which is both the destination directory @@ -4010,7 +4052,7 @@ class TestExtractionFilters(unittest.TestCase): with self.check_context(arc.open(), 'data'): if os_helper.can_symlink(): - if dotdot_resolves_early: + if self.dotdot_resolves_early: # Fail when extracting a file outside destination self.expect_exception( tarfile.OutsideDestinationError, @@ -4130,6 +4172,76 @@ class TestExtractionFilters(unittest.TestCase): + """['"].*moo['"], which is outside the """ + "destination") + @symlink_test + @os_helper.skip_unless_symlink + def test_normpath_realpath_mismatch(self): + # The link-target check must validate the value that will actually + # be written to disk (the normalised linkname), not the original. + # Here 'a' is a symlink to a deep nonexistent path, so realpath() + # of 'a/../../...' stays inside the destination while normpath() + # collapses 'a/..' lexically and escapes. + depth = len(self.destdir.parts) + 5 + deep = '/'.join(f'p{i}' for i in range(depth)) + sneaky = 'a/' + '../' * depth + 'flag' + for kind in 'symlink_to', 'hardlink_to': + with self.subTest(kind): + with ArchiveMaker() as arc: + arc.add('a', symlink_to=deep) + arc.add('escape', **{kind: sneaky}) + with self.check_context(arc.open(), 'data'): + self.expect_exception( + tarfile.LinkOutsideDestinationError) + + @symlink_test + @os_helper.skip_unless_symlink + def test_symlink_trailing_slash(self): + # A trailing slash on a symlink member's name must not cause the + # link target to be resolved relative to the wrong directory. + with ArchiveMaker() as arc: + t = tarfile.TarInfo('x/') + t.type = tarfile.SYMTYPE + t.linkname = '..' + arc.tar_w.addfile(t) + arc.add('x/escaped', content='hi') + + with self.check_context(arc.open(), 'data'): + self.expect_exception(tarfile.LinkOutsideDestinationError) + + @symlink_test + @os_helper.skip_unless_symlink + def test_link_at_destination(self): + # A link member whose name resolves to the destination directory + # itself must be rejected: otherwise the destination is replaced + # by a symlink and later members can be redirected through it. + for name in '', '.', './': + with ArchiveMaker() as arc: + t = tarfile.TarInfo(name) + t.type = tarfile.SYMTYPE + t.linkname = '.' + arc.tar_w.addfile(t) + + with self.check_context(arc.open(), 'data'): + self.expect_exception(tarfile.OutsideDestinationError) + + @symlink_test + @os_helper.skip_unless_symlink + def test_empty_name_symlink_chain(self): + # Regression test for a chain of empty-named symlinks that + # incrementally redirects the destination outwards. + with ArchiveMaker() as arc: + for name, target in [('', ''), ('a/', '..'), + ('', 'dummy'), ('', 'a'), + ('b/', '..'), + ('', 'dummy'), ('', 'a/b')]: + t = tarfile.TarInfo(name) + t.type = tarfile.SYMTYPE + t.linkname = target + arc.tar_w.addfile(t) + arc.add('escaped', content='hi') + + with self.check_context(arc.open(), 'data'): + self.expect_exception(tarfile.FilterError) + @symlink_test def test_deep_symlink(self): # Test that symlinks and hardlinks inside a directory From 5d375e3c21c060d1d6080275c1c9ecf4265675b2 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Fri, 12 Jun 2026 17:50:07 +0300 Subject: [PATCH 080/339] Update some of changed libs and tests from `3.14.5` -> `3.14.6` (part 3) (#8086) --- Lib/test/test_bytes.py | 7 +-- Lib/test/test_bz2.py | 16 +++++ Lib/test/test_cmd_line.py | 2 + Lib/test/test_deque.py | 16 +++++ Lib/test/test_genericalias.py | 13 +++- Lib/test/test_grp.py | 89 +++++++++++++-------------- Lib/test/test_imaplib.py | 10 ++++ Lib/test/test_import/__init__.py | 9 +++ Lib/test/test_listcomps.py | 34 +++++++++++ Lib/test/test_memoryio.py | 19 ++++++ Lib/test/test_mimetypes.py | 57 +++++++++++++++++- Lib/test/test_pwd.py | 100 +++++++++++++++---------------- 12 files changed, 265 insertions(+), 107 deletions(-) diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py index a72bc03c3..70af9af46 100644 --- a/Lib/test/test_bytes.py +++ b/Lib/test/test_bytes.py @@ -2622,10 +2622,6 @@ class FreeThreadingTest(unittest.TestCase): b.wait() a += c - def irepeat(b, a): # MODIFIES! - b.wait() - a *= 2 - def subscript(b, a): b.wait() try: assert a[0] != 0xdd @@ -2747,9 +2743,10 @@ class FreeThreadingTest(unittest.TestCase): check([clear] + [repeat] * 10) check([clear] + [iconcat] * 10) - check([clear] + [irepeat] * 10) check([clear] + [ass_subscript] * 10) check([clear] + [repr_] * 10) + # gh-148605: Do not test "a *= 2" since it allocates up to 4 GiB using + # 10 threads # value errors diff --git a/Lib/test/test_bz2.py b/Lib/test/test_bz2.py index 07db98ed5..a7e152fb7 100644 --- a/Lib/test/test_bz2.py +++ b/Lib/test/test_bz2.py @@ -1033,6 +1033,22 @@ class BZ2DecompressorTest(BaseTest): # Previously, a second call could crash due to internal inconsistency self.assertRaises(Exception, bzd.decompress, self.BAD_DATA * 30) + @unittest.expectedFailure # TODO: RUSTPYTHON; Wrong error message + def test_decompress_after_data_error(self): + data = bytes.fromhex( + "425a6839314159265359000000000000007fffff000000000000000000000000" + "00000000000000000000000000000000000000e0370000000000000000000000" + "000000000000000000000000000000000000000000000000000083f3" + ) + bzd = BZ2Decompressor() + with self.assertRaisesRegex(OSError, "Invalid data stream"): + bzd.decompress(data) + # Previously, a second call could crash due to internal inconsistency + self.assertFalse(bzd.needs_input) + self.assertFalse(bzd.eof) + with self.assertRaisesRegex(ValueError, "previous error"): + bzd.decompress(b'\x00' * 18) + @support.refcount_test def test_refleaks_in___init__(self): gettotalrefcount = support.get_attribute(sys, 'gettotalrefcount') diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py index 8a0831ee4..50f6c7572 100644 --- a/Lib/test/test_cmd_line.py +++ b/Lib/test/test_cmd_line.py @@ -1014,6 +1014,7 @@ class CmdLineTest(unittest.TestCase): p = subprocess.run([sys.executable, "-c", code], creationflags=subprocess.CREATE_NEW_CONSOLE, env=env) + support.skip_on_low_desktop_heap_memory_subprocess(p.returncode) self.assertEqual(p.returncode, 0) # Then test that FIleIO is used when PYTHONLEGACYWINDOWSSTDIO is set. @@ -1022,6 +1023,7 @@ class CmdLineTest(unittest.TestCase): p = subprocess.run([sys.executable, "-c", code], creationflags=subprocess.CREATE_NEW_CONSOLE, env=env) + support.skip_on_low_desktop_heap_memory_subprocess(p.returncode) self.assertEqual(p.returncode, 0) @unittest.expectedFailure # TODO: RUSTPYTHON diff --git a/Lib/test/test_deque.py b/Lib/test/test_deque.py index d4b42c0bd..908713f28 100644 --- a/Lib/test/test_deque.py +++ b/Lib/test/test_deque.py @@ -287,6 +287,22 @@ class TestBasic(unittest.TestCase): else: self.assertEqual(d.index(element, start, stop), target) + # Test stop argument + for elem in d: + index = d.index(elem) + self.assertEqual( + index, + d.index(elem, 0), + ) + self.assertEqual( + index, + d.index(elem, 0, len(d)), + ) + self.assertEqual( + index, + d.index(elem, 0, len(d) + 100), + ) + # Test large start argument d = deque(range(0, 10000, 10)) for step in range(100): diff --git a/Lib/test/test_genericalias.py b/Lib/test/test_genericalias.py index 4f5b10650..121d169dd 100644 --- a/Lib/test/test_genericalias.py +++ b/Lib/test/test_genericalias.py @@ -55,15 +55,14 @@ from urllib.parse import SplitResult, ParseResult from unittest.case import _AssertRaisesContext from queue import Queue, SimpleQueue from weakref import WeakSet, ReferenceType, ref -import typing -from typing import Unpack try: from tkinter import Event except ImportError: Event = None from string.templatelib import Template, Interpolation -from typing import TypeVar +import typing +from typing import TypeVar, Unpack T = TypeVar('T') K = TypeVar('K') V = TypeVar('V') @@ -619,6 +618,14 @@ class BaseTest(unittest.TestCase): self.assertEqual(deeply_nested_specialized.__args__, ([str, [float], int], float)) self.assertEqual(deeply_nested_specialized.__parameters__, ()) + def test_gh150146(self): + # It used to crash: + for container in [memoryview, list, tuple]: + with self.subTest(container=container): + x = container[TypeVar("")] + with self.assertRaises(TypeError): + x[*typing.Mapping[..., ...]] + class TypeIterationTests(unittest.TestCase): _UNITERABLE_TYPES = (list, tuple) diff --git a/Lib/test/test_grp.py b/Lib/test/test_grp.py index e52e17b8d..289228924 100644 --- a/Lib/test/test_grp.py +++ b/Lib/test/test_grp.py @@ -1,5 +1,7 @@ """Test script for the grp module.""" +import random +import string import unittest from test.support import import_helper @@ -47,64 +49,55 @@ class GroupDatabaseTestCase(unittest.TestCase): # Discovered on Ubuntu 5.04 (custom). self.assertEqual(e2.gr_name.lower(), name.lower()) + @unittest.expectedFailure # TODO: RUSTPYTHON; KeyError: 'getgrgid: group id 340282366920938463463374607431768211456 not found' def test_errors(self): self.assertRaises(TypeError, grp.getgrgid) self.assertRaises(TypeError, grp.getgrgid, 3.14) + self.assertRaises(TypeError, grp.getgrgid, 0.0) + self.assertRaises(TypeError, grp.getgrgid, 0, 0) + # should be out of gid_t range + self.assertRaises(OverflowError, grp.getgrgid, 2**128) + self.assertRaises(OverflowError, grp.getgrgid, -2**128) self.assertRaises(TypeError, grp.getgrnam) self.assertRaises(TypeError, grp.getgrnam, 42) - self.assertRaises(TypeError, grp.getgrall, 42) + self.assertRaises(TypeError, grp.getgrnam, b'root') + self.assertRaises(TypeError, grp.getgrnam, 'root', 0) # embedded null character self.assertRaisesRegex(ValueError, 'null', grp.getgrnam, 'a\x00b') + self.assertRaisesRegex(ValueError, 'null', grp.getgrnam, 'root\x00') + self.assertRaises(UnicodeEncodeError, grp.getgrnam, 'roo\udc74') + self.assertRaises(KeyError, grp.getgrnam, '') + self.assertRaises(TypeError, grp.getgrall, 42) - # try to get some errors - bynames = {} - bygids = {} - for (n, p, g, mem) in grp.getgrall(): - if not n or n == '+': - continue # skip NIS entries etc. - bynames[n] = g - bygids[g] = n + # Find a non-existent group name. + # getgrall() will not necessarily report all existing groups + # (typical for LDAP based directories in big organizations). + for _ in range(30): + fakename = ''.join(random.choices(string.ascii_lowercase, k=6)) + try: + grp.getgrnam(fakename) + except KeyError: + break + else: + self.fail('Cannot find non-existent group name') - allnames = list(bynames.keys()) - namei = 0 - fakename = allnames[namei] - while fakename in bynames: - chars = list(fakename) - for i in range(len(chars)): - if chars[i] == 'z': - chars[i] = 'A' - break - elif chars[i] == 'Z': - continue + # Find a non-existent gid. + maxgid = 2**31 + for _ in range(30): + fakegid = random.randrange(maxgid) + try: + grp.getgrgid(fakegid) + except KeyError: + break + except OverflowError: + if maxgid == 2**31: + maxgid = 2**16-1 + elif maxgid == 2**16-1: + maxgid = 2**15 else: - chars[i] = chr(ord(chars[i]) + 1) - break - else: - namei = namei + 1 - try: - fakename = allnames[namei] - except IndexError: - # should never happen... if so, just forget it - break - fakename = ''.join(chars) - - self.assertRaises(KeyError, grp.getgrnam, fakename) - - # Choose a non-existent gid. - fakegid = 4127 - while fakegid in bygids: - fakegid = (fakegid * 3) % 0x10000 - - self.assertRaises(KeyError, grp.getgrgid, fakegid) - - def test_noninteger_gid(self): - entries = grp.getgrall() - if not entries: - self.skipTest('no groups') - # Choose an existent gid. - gid = entries[0][2] - self.assertRaises(TypeError, grp.getgrgid, float(gid)) - self.assertRaises(TypeError, grp.getgrgid, str(gid)) + raise + else: + self.fail('Cannot find non-existent gid') if __name__ == "__main__": diff --git a/Lib/test/test_imaplib.py b/Lib/test/test_imaplib.py index 9155a43a0..f20120618 100644 --- a/Lib/test/test_imaplib.py +++ b/Lib/test/test_imaplib.py @@ -435,6 +435,16 @@ class NewIMAPTestsMixin: r'\[AUTHENTICATIONFAILED\] invalid'): client.authenticate('MYAUTH', lambda x: b'fake') + def test_invalid_login(self): + class MyServer(SimpleIMAPHandler): + def cmd_LOGIN(self, tag, args): + self.server.logged = args[0] + self._send_tagged(tag, 'NO', '[LOGIN] failed') + client, _ = self._setup(MyServer) + with self.assertRaisesRegex(imaplib.IMAP4.error, + r'\[LOGIN\] failed'): + client.login('user', 'wrongpass') + def test_valid_authentication_bytes(self): class MyServer(SimpleIMAPHandler): def cmd_AUTHENTICATE(self, tag, args): diff --git a/Lib/test/test_import/__init__.py b/Lib/test/test_import/__init__.py index 60413aa76..679167580 100644 --- a/Lib/test/test_import/__init__.py +++ b/Lib/test/test_import/__init__.py @@ -360,6 +360,15 @@ class ImportTests(unittest.TestCase): with self.assertRaises(ModuleNotFoundError): import something_that_should_not_exist_anywhere + def test_import_null_byte_in_name_raises_ModuleNotFoundError(self): + # gh-150633: module names containing null bytes should not + # lead to duplicates in sys.modules + before = set(sys.modules.keys()) + with self.assertRaises(ModuleNotFoundError): + __import__('zipimport\x00junk') + + self.assertEqual(set(sys.modules.keys()), before) + def test_from_import_missing_module_raises_ModuleNotFoundError(self): with self.assertRaises(ModuleNotFoundError): from something_that_should_not_exist_anywhere import blah diff --git a/Lib/test/test_listcomps.py b/Lib/test/test_listcomps.py index 47c27bc3f..5dbc130b4 100644 --- a/Lib/test/test_listcomps.py +++ b/Lib/test/test_listcomps.py @@ -171,6 +171,17 @@ class ListComprehensionTest(unittest.TestCase): """ self._check_in_scopes(code, raises=NameError) + def test_references___class___nested(self): + code = """ + res = [(lambda: __class__)() for _ in [1]] + """ + self._check_in_scopes(code, raises=NameError) + + def test_references___class___nested_used(self): + class _C: + res = [lambda: __class__ for _ in [1]] + self.assertIs(_C.res[0](), _C) + def test_references___class___defined(self): code = """ __class__ = 2 @@ -180,18 +191,41 @@ class ListComprehensionTest(unittest.TestCase): code, outputs={"res": [2]}, scopes=["module", "function"]) self._check_in_scopes(code, raises=NameError, scopes=["class"]) + def test_references___class___defined_nested(self): + code = """ + __class__ = 2 + res = [(lambda: __class__)() for x in [1]] + """ + self._check_in_scopes( + code, outputs={"res": [2]}, scopes=["module", "function"]) + self._check_in_scopes(code, raises=NameError, scopes=["class"]) + def test_references___classdict__(self): code = """ class i: [__classdict__ for x in y] """ self._check_in_scopes(code, raises=NameError) + @unittest.expectedFailure # TODO: RUSTPYTHON; SyntaxError: compiler_make_closure: cannot find '__classdict__' in parent vars + def test_references___classdict___nested(self): + class _C: + # res = [(lambda: __classdict__)() for _ in [1]] # TODO: RUSTPYTHON + pass # TODO: RUSTPYTHON + self.assertIn("res", _C.res[0]) + def test_references___conditional_annotations__(self): code = """ class i: [__conditional_annotations__ for x in y] """ self._check_in_scopes(code, raises=NameError) + @unittest.expectedFailure # TODO: RUSTPYTHON; SyntaxError: compiler_make_closure: cannot find '__conditional_annotations__' in parent vars + def test_references___conditional_annotations___nested(self): + code = """ + class i: [lambda: __conditional_annotations__ for x in y] + """ + self._check_in_scopes(code, raises=NameError) + def test_references___class___enclosing(self): code = """ __class__ = 2 diff --git a/Lib/test/test_memoryio.py b/Lib/test/test_memoryio.py index 7b321600e..7214a3770 100644 --- a/Lib/test/test_memoryio.py +++ b/Lib/test/test_memoryio.py @@ -987,6 +987,25 @@ class CStringIOTest(PyStringIOTest): memio.close() self.assertRaises(ValueError, memio.__setstate__, ("closed", "", 0, None)) + def test_write_str_subclass(self): + # Writing a str subclass should use the subclass's unicode data + # directly, not call __str__ on it (which may return a different + # value). gh-149047 + class MyStr(str): + def __str__(self): + return "WRONG" + + s = MyStr("correct") + memio = self.ioclass() + memio.write(s) + self.assertEqual(memio.getvalue(), "correct") + + # Also test the fast path where pos == string_size (STATE_ACCUMULATING) + memio2 = self.ioclass() + memio2.write(MyStr("hello ")) + memio2.write(MyStr("world")) + self.assertEqual(memio2.getvalue(), "hello world") + @unittest.expectedFailure # TODO: RUSTPYTHON; + def test_issue5265(self): return super().test_issue5265() diff --git a/Lib/test/test_mimetypes.py b/Lib/test/test_mimetypes.py index c1806b1c1..e263487e0 100644 --- a/Lib/test/test_mimetypes.py +++ b/Lib/test/test_mimetypes.py @@ -6,8 +6,9 @@ import sys import unittest.mock from platform import win32_edition from test import support -from test.support import cpython_only, force_not_colorized, os_helper +from test.support import cpython_only, force_not_colorized, os_helper, requires_subprocess from test.support.import_helper import ensure_lazy_imports +from test.support.script_helper import assert_python_ok, assert_python_failure try: import _winapi @@ -506,5 +507,59 @@ class CommandLineTest(unittest.TestCase): self.assertEqual(result, expected) +@requires_subprocess() +class CommandLineSubprocessTest(unittest.TestCase): + def test_help(self): + rc, stdout, stderr = assert_python_ok('-m', 'mimetypes', '--help') + self.assertIn(b'mimetypes', stdout) + self.assertIn(b'--extension', stdout) + self.assertIn(b'--lenient', stdout) + + def test_type_lookup(self): + rc, stdout, stderr = assert_python_ok('-m', 'mimetypes', 'foo.pdf') + self.assertEqual(stdout.strip(), b'type: application/pdf encoding: None') + self.assertEqual(stderr, b'') + + def test_type_lookup_unknown(self): + rc, stdout, stderr = assert_python_failure('-m', 'mimetypes', 'foo.unknownext12345') + self.assertEqual(stdout.strip(), b'error: media type unknown for foo.unknownext12345') + self.assertEqual(stderr, b'') + + def test_extension_flag(self): + rc, stdout, stderr = assert_python_ok('-m', 'mimetypes', '-e', 'image/jpeg') + self.assertEqual(stdout.strip(), b'.jpg') + self.assertEqual(stderr, b'') + + def test_extension_flag_unknown(self): + rc, stdout, stderr = assert_python_failure('-m', 'mimetypes', '-e', 'image/unknowntype12345') + self.assertEqual(stdout.strip(), b'error: unknown type image/unknowntype12345') + self.assertEqual(stderr, b'') + + def test_lenient_flag(self): + rc, stdout, stderr = assert_python_ok('-m', 'mimetypes', '-e', '--lenient', 'text/xul') + self.assertIn(b'.xul', stdout) + self.assertEqual(stderr, b'') + + def test_multiple_inputs(self): + rc, stdout, stderr = assert_python_ok('-m', 'mimetypes', 'foo.pdf', 'foo.png') + self.assertIn(b'type: application/pdf encoding: None', stdout) + self.assertIn(b'type: image/png encoding: None', stdout) + self.assertEqual(stderr, b'') + + def test_multiple_inputs_with_error(self): + rc, stdout, stderr = assert_python_failure( + '-m', 'mimetypes', 'foo.pdf', 'foo.unknownext12345' + ) + self.assertIn(b'type: application/pdf encoding: None', stdout) + self.assertIn(b'error: media type unknown for foo.unknownext12345', stdout) + self.assertEqual(stderr, b'') + + @force_not_colorized + def test_unknown_flag(self): + rc, stdout, stderr = assert_python_failure('-m', 'mimetypes', '--unknown-flag', 'foo.pdf') + self.assertEqual(stdout, b'') + self.assertIn(b'error: unrecognized arguments: --unknown-flag', stderr) + + if __name__ == "__main__": unittest.main() diff --git a/Lib/test/test_pwd.py b/Lib/test/test_pwd.py index aa090b464..bdf57776c 100644 --- a/Lib/test/test_pwd.py +++ b/Lib/test/test_pwd.py @@ -1,3 +1,5 @@ +import random +import string import sys import unittest from test.support import import_helper @@ -56,59 +58,57 @@ class PwdTest(unittest.TestCase): def test_errors(self): self.assertRaises(TypeError, pwd.getpwuid) self.assertRaises(TypeError, pwd.getpwuid, 3.14) - self.assertRaises(TypeError, pwd.getpwnam) - self.assertRaises(TypeError, pwd.getpwnam, 42) - self.assertRaises(TypeError, pwd.getpwall, 42) - # embedded null character - self.assertRaisesRegex(ValueError, 'null', pwd.getpwnam, 'a\x00b') - - # try to get some errors - bynames = {} - byuids = {} - for (n, p, u, g, gecos, d, s) in pwd.getpwall(): - bynames[n] = u - byuids[u] = n - - allnames = list(bynames.keys()) - namei = 0 - fakename = allnames[namei] if allnames else "invaliduser" - while fakename in bynames: - chars = list(fakename) - for i in range(len(chars)): - if chars[i] == 'z': - chars[i] = 'A' - break - elif chars[i] == 'Z': - continue - else: - chars[i] = chr(ord(chars[i]) + 1) - break - else: - namei = namei + 1 - try: - fakename = allnames[namei] - except IndexError: - # should never happen... if so, just forget it - break - fakename = ''.join(chars) - - self.assertRaises(KeyError, pwd.getpwnam, fakename) - - # In some cases, byuids isn't a complete list of all users in the - # system, so if we try to pick a value not in byuids (via a perturbing - # loop, say), pwd.getpwuid() might still be able to find data for that - # uid. Using sys.maxint may provoke the same problems, but hopefully - # it will be a more repeatable failure. - fakeuid = sys.maxsize - self.assertNotIn(fakeuid, byuids) - self.assertRaises(KeyError, pwd.getpwuid, fakeuid) - - # -1 shouldn't be a valid uid because it has a special meaning in many - # uid-related functions - self.assertRaises(KeyError, pwd.getpwuid, -1) + self.assertRaises(TypeError, pwd.getpwuid, 0.0) + self.assertRaises(TypeError, pwd.getpwuid, 0, 0) # should be out of uid_t range self.assertRaises(KeyError, pwd.getpwuid, 2**128) self.assertRaises(KeyError, pwd.getpwuid, -2**128) + self.assertRaises(TypeError, pwd.getpwnam) + self.assertRaises(TypeError, pwd.getpwnam, 42) + self.assertRaises(TypeError, pwd.getpwnam, b'root') + self.assertRaises(TypeError, pwd.getpwnam, 'root', 0) + # embedded null character + self.assertRaisesRegex(ValueError, 'null', pwd.getpwnam, 'a\x00b') + self.assertRaisesRegex(ValueError, 'null', pwd.getpwnam, 'root\x00') + self.assertRaises(UnicodeEncodeError, pwd.getpwnam, 'roo\udc74') + self.assertRaises(KeyError, pwd.getpwnam, '') + self.assertRaises(TypeError, pwd.getpwall, 42) + + # Find a non-existent user name. + # getpwall() will not necessarily report all existing users + # (typical for LDAP based directories in big organizations). + for _ in range(30): + fakename = ''.join(random.choices(string.ascii_lowercase, k=6)) + try: + pwd.getpwnam(fakename) + except KeyError: + break + else: + self.fail('Cannot find non-existent user name') + + # Find a non-existent uid. + maxuid = max(e.pw_uid for e in pwd.getpwall()) + if maxuid < 2**15: + maxuid = 2**15 + elif maxuid < 2**16: + maxuid = 2**16-1 + else: + maxuid = 2**31 + for _ in range(30): + fakeuid = random.randrange(maxuid) + try: + pwd.getpwuid(fakeuid) + except KeyError: + break + else: + self.fail('Cannot find non-existent uid') + + # On Cygwin, getpwuid(-1) returns 'Unknown+User' user + if sys.platform != 'cygwin': + # -1 shouldn't be a valid uid because it has a special meaning in many + # uid-related functions + self.assertRaises(KeyError, pwd.getpwuid, -1) + if __name__ == "__main__": unittest.main() From f34cfca1f30e9fbd3b6f043f935c67a6c66c7789 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 12 Jun 2026 23:58:41 +0900 Subject: [PATCH 081/339] Update doc DB for CPython 3.14.6 (#8088) Co-authored-by: github-actions[bot] --- crates/doc/src/data.inc.rs | 770 +++++++++++++++++++------------------ 1 file changed, 386 insertions(+), 384 deletions(-) diff --git a/crates/doc/src/data.inc.rs b/crates/doc/src/data.inc.rs index 32b487223..73246d650 100644 --- a/crates/doc/src/data.inc.rs +++ b/crates/doc/src/data.inc.rs @@ -1,5 +1,5 @@ // This file was auto-generated by `.github/workflows/update-doc-db.yml`. -// CPython version: 3.14.5 +// CPython version: 3.14.6 // spell-checker: disable pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { @@ -11,7 +11,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_abc._get_dump" => "Internal ABC helper for cache and registry debugging.\n\nReturn shallow copies of registry, of both caches, and\nnegative cache version. Don't call this function directly,\ninstead use ABC._dump_registry() for a nice repr.", "_abc._reset_caches" => "Internal ABC helper to reset both caches of a given class.\n\nShould be only used by refleak.py", "_abc._reset_registry" => "Internal ABC helper to reset registry of a given class.\n\nShould be only used by refleak.py", - "_abc.get_cache_token" => "Returns the current ABC cache token.\n\nThe token is an opaque object (supporting equality testing) identifying the\ncurrent version of the ABC cache for virtual subclasses. The token changes\nwith every call to register() on any ABC.", + "_abc.get_cache_token" => "Returns the current ABC cache token.\n\nThe token is an opaque object (supporting equality testing) identifying\nthe current version of the ABC cache for virtual subclasses. The token\nchanges with every call to register() on any ABC.", "_ast.AST.__delattr__" => "Implement delattr(self, name).", "_ast.AST.__eq__" => "Return self==value.", "_ast.AST.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", @@ -2912,7 +2912,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_asyncio" => "Accelerator module for asyncio", "_asyncio.Future" => "This class is *almost* compatible with concurrent.futures.Future.\n\n Differences:\n\n - result() and exception() do not take a timeout argument and\n raise an exception when the future isn't done yet.\n\n - Callbacks registered with add_done_callback() are always called\n via the event loop's call_soon_threadsafe().\n\n - This class is not compatible with the wait() and as_completed()\n methods in the concurrent.futures package.", "_asyncio.Future.__await__" => "Return an iterator to be used in await expression.", - "_asyncio.Future.__class_getitem__" => "See PEP 585", + "_asyncio.Future.__class_getitem__" => "Futures are generic over the type of their results", "_asyncio.Future.__del__" => "Called when the instance is about to be destroyed.", "_asyncio.Future.__delattr__" => "Implement delattr(self, name).", "_asyncio.Future.__eq__" => "Return self==value.", @@ -2937,19 +2937,19 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_asyncio.Future.__str__" => "Return str(self).", "_asyncio.Future.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "_asyncio.Future._make_cancelled_error" => "Create the CancelledError to raise if the Future is cancelled.\n\nThis should only be called once when handling a cancellation since\nit erases the context exception value.", - "_asyncio.Future.add_done_callback" => "Add a callback to be run when the future becomes done.\n\nThe callback is called with a single argument - the future object. If\nthe future is already done when this is called, the callback is\nscheduled with call_soon.", - "_asyncio.Future.cancel" => "Cancel the future and schedule callbacks.\n\nIf the future is already done or cancelled, return False. Otherwise,\nchange the future's state to cancelled, schedule the callbacks and\nreturn True.", + "_asyncio.Future.add_done_callback" => "Add a callback to be run when the future becomes done.\n\nThe callback is called with a single argument - the future object.\nIf the future is already done when this is called, the callback is\nscheduled with call_soon.", + "_asyncio.Future.cancel" => "Cancel the future and schedule callbacks.\n\nIf the future is already done or cancelled, return False.\nOtherwise, change the future's state to cancelled, schedule the\ncallbacks and return True.", "_asyncio.Future.cancelled" => "Return True if the future was cancelled.", - "_asyncio.Future.done" => "Return True if the future is done.\n\nDone means either that a result / exception are available, or that the\nfuture was cancelled.", + "_asyncio.Future.done" => "Return True if the future is done.\n\nDone means either that a result / exception are available, or that\nthe future was cancelled.", "_asyncio.Future.exception" => "Return the exception that was set on this future.\n\nThe exception (or None if no exception was set) is returned only if\nthe future is done. If the future has been cancelled, raises\nCancelledError. If the future isn't done yet, raises\nInvalidStateError.", "_asyncio.Future.get_loop" => "Return the event loop the Future is bound to.", "_asyncio.Future.remove_done_callback" => "Remove all instances of a callback from the \"call when done\" list.\n\nReturns the number of callbacks removed.", - "_asyncio.Future.result" => "Return the result this future represents.\n\nIf the future has been cancelled, raises CancelledError. If the\nfuture's result isn't yet available, raises InvalidStateError. If\nthe future is done and has an exception set, this exception is raised.", + "_asyncio.Future.result" => "Return the result this future represents.\n\nIf the future has been cancelled, raises CancelledError. If the\nfuture's result isn't yet available, raises InvalidStateError. If\nthe future is done and has an exception set, this exception is\nraised.", "_asyncio.Future.set_exception" => "Mark the future done and set an exception.\n\nIf the future is already done when this method is called, raises\nInvalidStateError.", "_asyncio.Future.set_result" => "Mark the future done and set its result.\n\nIf the future is already done when this method is called, raises\nInvalidStateError.", "_asyncio.Task" => "A coroutine wrapped in a Future.", "_asyncio.Task.__await__" => "Return an iterator to be used in await expression.", - "_asyncio.Task.__class_getitem__" => "See PEP 585", + "_asyncio.Task.__class_getitem__" => "Tasks are generic over the return type of their wrapped coroutines", "_asyncio.Task.__del__" => "Called when the instance is about to be destroyed.", "_asyncio.Task.__delattr__" => "Implement delattr(self, name).", "_asyncio.Task.__eq__" => "Return self==value.", @@ -2974,17 +2974,17 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_asyncio.Task.__str__" => "Return str(self).", "_asyncio.Task.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "_asyncio.Task._make_cancelled_error" => "Create the CancelledError to raise if the Task is cancelled.\n\nThis should only be called once when handling a cancellation since\nit erases the context exception value.", - "_asyncio.Task.add_done_callback" => "Add a callback to be run when the future becomes done.\n\nThe callback is called with a single argument - the future object. If\nthe future is already done when this is called, the callback is\nscheduled with call_soon.", + "_asyncio.Task.add_done_callback" => "Add a callback to be run when the future becomes done.\n\nThe callback is called with a single argument - the future object.\nIf the future is already done when this is called, the callback is\nscheduled with call_soon.", "_asyncio.Task.cancel" => "Request that this task cancel itself.\n\nThis arranges for a CancelledError to be thrown into the\nwrapped coroutine on the next cycle through the event loop.\nThe coroutine then has a chance to clean up or even deny\nthe request using try/except/finally.\n\nUnlike Future.cancel, this does not guarantee that the\ntask will be cancelled: the exception might be caught and\nacted upon, delaying cancellation of the task or preventing\ncancellation completely. The task may also return a value or\nraise a different exception.\n\nImmediately after this method is called, Task.cancelled() will\nnot return True (unless the task was already cancelled). A\ntask will be marked as cancelled when the wrapped coroutine\nterminates with a CancelledError exception (even if cancel()\nwas not called).\n\nThis also increases the task's count of cancellation requests.", "_asyncio.Task.cancelled" => "Return True if the future was cancelled.", "_asyncio.Task.cancelling" => "Return the count of the task's cancellation requests.\n\nThis count is incremented when .cancel() is called\nand may be decremented using .uncancel().", - "_asyncio.Task.done" => "Return True if the future is done.\n\nDone means either that a result / exception are available, or that the\nfuture was cancelled.", + "_asyncio.Task.done" => "Return True if the future is done.\n\nDone means either that a result / exception are available, or that\nthe future was cancelled.", "_asyncio.Task.exception" => "Return the exception that was set on this future.\n\nThe exception (or None if no exception was set) is returned only if\nthe future is done. If the future has been cancelled, raises\nCancelledError. If the future isn't done yet, raises\nInvalidStateError.", "_asyncio.Task.get_loop" => "Return the event loop the Future is bound to.", "_asyncio.Task.get_stack" => "Return the list of stack frames for this task's coroutine.\n\nIf the coroutine is not done, this returns the stack where it is\nsuspended. If the coroutine has completed successfully or was\ncancelled, this returns an empty list. If the coroutine was\nterminated by an exception, this returns the list of traceback\nframes.\n\nThe frames are always ordered from oldest to newest.\n\nThe optional limit gives the maximum number of frames to\nreturn; by default all available frames are returned. Its\nmeaning differs depending on whether a stack or a traceback is\nreturned: the newest frames of a stack are returned, but the\noldest frames of a traceback are returned. (This matches the\nbehavior of the traceback module.)\n\nFor reasons beyond our control, only one stack frame is\nreturned for a suspended coroutine.", "_asyncio.Task.print_stack" => "Print the stack or traceback for this task's coroutine.\n\nThis produces output similar to that of the traceback module,\nfor the frames retrieved by get_stack(). The limit argument\nis passed to get_stack(). The file argument is an I/O stream\nto which the output is written; by default output is written\nto sys.stderr.", "_asyncio.Task.remove_done_callback" => "Remove all instances of a callback from the \"call when done\" list.\n\nReturns the number of callbacks removed.", - "_asyncio.Task.result" => "Return the result this future represents.\n\nIf the future has been cancelled, raises CancelledError. If the\nfuture's result isn't yet available, raises InvalidStateError. If\nthe future is done and has an exception set, this exception is raised.", + "_asyncio.Task.result" => "Return the result this future represents.\n\nIf the future has been cancelled, raises CancelledError. If the\nfuture's result isn't yet available, raises InvalidStateError. If\nthe future is done and has an exception set, this exception is\nraised.", "_asyncio.Task.uncancel" => "Decrement the task's count of cancellation requests.\n\nThis should be used by tasks that catch CancelledError\nand wish to continue indefinitely until they are cancelled again.\n\nReturns the remaining number of cancellation requests.", "_asyncio._enter_task" => "Enter into task execution or resume suspended task.\n\nTask belongs to loop.\n\nReturns None.", "_asyncio._get_running_loop" => "Return the running event loop or None.\n\nThis is a low-level function intended to be used by event loops.\nThis function is thread-specific.", @@ -3001,8 +3001,8 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_asyncio.get_event_loop" => "Return an asyncio event loop.\n\nWhen called from a coroutine or a callback (e.g. scheduled with\ncall_soon or similar API), this function will always return the\nrunning event loop.\n\nIf there is no running event loop set, the function will return\nthe result of `get_event_loop_policy().get_event_loop()` call.", "_asyncio.get_running_loop" => "Return the running event loop. Raise a RuntimeError if there is none.\n\nThis function is thread-specific.", "_bisect" => "Bisection algorithms.\n\nThis module provides support for maintaining a list in sorted order without\nhaving to sort the list after each insertion. For long lists of items with\nexpensive comparison operations, this can be an improvement over the more\ncommon approach.", - "_bisect.bisect_left" => "Return the index where to insert item x in list a, assuming a is sorted.\n\nThe return value i is such that all e in a[:i] have e < x, and all e in\na[i:] have e >= x. So if x already appears in the list, a.insert(i, x) will\ninsert just before the leftmost x already there.\n\nOptional args lo (default 0) and hi (default len(a)) bound the\nslice of a to be searched.\n\nA custom key function can be supplied to customize the sort order.", - "_bisect.bisect_right" => "Return the index where to insert item x in list a, assuming a is sorted.\n\nThe return value i is such that all e in a[:i] have e <= x, and all e in\na[i:] have e > x. So if x already appears in the list, a.insert(i, x) will\ninsert just after the rightmost x already there.\n\nOptional args lo (default 0) and hi (default len(a)) bound the\nslice of a to be searched.\n\nA custom key function can be supplied to customize the sort order.", + "_bisect.bisect_left" => "Return the index where to insert item x in list a, assuming a is sorted.\n\nThe return value i is such that all e in a[:i] have e < x, and all e in\na[i:] have e >= x. So if x already appears in the list, a.insert(i, x)\nwill insert just before the leftmost x already there.\n\nOptional args lo (default 0) and hi (default len(a)) bound the\nslice of a to be searched.\n\nA custom key function can be supplied to customize the sort order.", + "_bisect.bisect_right" => "Return the index where to insert item x in list a, assuming a is sorted.\n\nThe return value i is such that all e in a[:i] have e <= x, and all e in\na[i:] have e > x. So if x already appears in the list, a.insert(i, x)\nwill insert just after the rightmost x already there.\n\nOptional args lo (default 0) and hi (default len(a)) bound the\nslice of a to be searched.\n\nA custom key function can be supplied to customize the sort order.", "_bisect.insort_left" => "Insert item x in list a, and keep it sorted assuming a is sorted.\n\nIf x is already in a, insert it to the left of the leftmost x.\n\nOptional args lo (default 0) and hi (default len(a)) bound the\nslice of a to be searched.\n\nA custom key function can be supplied to customize the sort order.", "_bisect.insort_right" => "Insert item x in list a, and keep it sorted assuming a is sorted.\n\nIf x is already in a, insert it to the right of the rightmost x.\n\nOptional args lo (default 0) and hi (default len(a)) bound the\nslice of a to be searched.\n\nA custom key function can be supplied to customize the sort order.", "_blake2" => "_blake2b provides BLAKE2b for hashlib", @@ -3104,21 +3104,21 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_bz2.BZ2Decompressor.__sizeof__" => "Size of object in memory, in bytes.", "_bz2.BZ2Decompressor.__str__" => "Return str(self).", "_bz2.BZ2Decompressor.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", - "_bz2.BZ2Decompressor.decompress" => "Decompress *data*, returning uncompressed data as bytes.\n\nIf *max_length* is nonnegative, returns at most *max_length* bytes of\ndecompressed data. If this limit is reached and further output can be\nproduced, *self.needs_input* will be set to ``False``. In this case, the next\ncall to *decompress()* may provide *data* as b'' to obtain more of the output.\n\nIf all of the input data was decompressed and returned (either because this\nwas less than *max_length* bytes, or because *max_length* was negative),\n*self.needs_input* will be set to True.\n\nAttempting to decompress data after the end of stream is reached raises an\nEOFError. Any data found after the end of the stream is ignored and saved in\nthe unused_data attribute.", + "_bz2.BZ2Decompressor.decompress" => "Decompress *data*, returning uncompressed data as bytes.\n\nIf *max_length* is nonnegative, returns at most *max_length* bytes\nof decompressed data. If this limit is reached and further output\ncan be produced, *self.needs_input* will be set to ``False``. In\nthis case, the next call to *decompress()* may provide *data* as b''\nto obtain more of the output.\n\nIf all of the input data was decompressed and returned (either\nbecause this was less than *max_length* bytes, or because\n*max_length* was negative), *self.needs_input* will be set to True.\n\nAttempting to decompress data after the end of stream is reached\nraises an EOFError. Any data found after the end of the stream is\nignored and saved in the unused_data attribute.", "_bz2.BZ2Decompressor.eof" => "True if the end-of-stream marker has been reached.", "_bz2.BZ2Decompressor.needs_input" => "True if more input is needed before more decompressed data can be produced.", "_bz2.BZ2Decompressor.unused_data" => "Data found after the end of the compressed stream.", "_codecs._unregister_error" => "Un-register the specified error handler for the error handling `errors'.\n\nOnly custom error handlers can be un-registered. An exception is raised\nif the error handling is a built-in one (e.g., 'strict'), or if an error\noccurs.\n\nOtherwise, this returns True if a custom handler has been successfully\nun-registered, and False if no custom handler for the specified error\nhandling exists.", - "_codecs.decode" => "Decodes obj using the codec registered for encoding.\n\nDefault encoding is 'utf-8'. errors may be given to set a\ndifferent error handling scheme. Default is 'strict' meaning that encoding\nerrors raise a ValueError. Other possible values are 'ignore', 'replace'\nand 'backslashreplace' as well as any other name registered with\ncodecs.register_error that can handle ValueErrors.", - "_codecs.encode" => "Encodes obj using the codec registered for encoding.\n\nThe default encoding is 'utf-8'. errors may be given to set a\ndifferent error handling scheme. Default is 'strict' meaning that encoding\nerrors raise a ValueError. Other possible values are 'ignore', 'replace'\nand 'backslashreplace' as well as any other name registered with\ncodecs.register_error that can handle ValueErrors.", + "_codecs.decode" => "Decodes obj using the codec registered for encoding.\n\nDefault encoding is 'utf-8'. errors may be given to set a\ndifferent error handling scheme. Default is 'strict' meaning that\nencoding errors raise a ValueError. Other possible values are 'ignore',\n'replace' and 'backslashreplace' as well as any other name registered\nwith codecs.register_error that can handle ValueErrors.", + "_codecs.encode" => "Encodes obj using the codec registered for encoding.\n\nThe default encoding is 'utf-8'. errors may be given to set a\ndifferent error handling scheme. Default is 'strict' meaning that\nencoding errors raise a ValueError. Other possible values are 'ignore',\n'replace' and 'backslashreplace' as well as any other name registered\nwith codecs.register_error that can handle ValueErrors.", "_codecs.lookup" => "Looks up a codec tuple in the Python codec registry and returns a CodecInfo object.", - "_codecs.lookup_error" => "lookup_error(errors) -> handler\n\nReturn the error handler for the specified error handling name or raise a\nLookupError, if no handler exists under this name.", - "_codecs.register" => "Register a codec search function.\n\nSearch functions are expected to take one argument, the encoding name in\nall lower case letters, and either return None, or a tuple of functions\n(encoder, decoder, stream_reader, stream_writer) (or a CodecInfo object).", - "_codecs.register_error" => "Register the specified error handler under the name errors.\n\nhandler must be a callable object, that will be called with an exception\ninstance containing information about the location of the encoding/decoding\nerror and must return a (replacement, new position) tuple.", + "_codecs.lookup_error" => "lookup_error(errors) -> handler\n\nReturn the error handler for the specified error handling name or raise\na LookupError, if no handler exists under this name.", + "_codecs.register" => "Register a codec search function.\n\nSearch functions are expected to take one argument, the encoding\nname in all lower case letters, and either return None, or a tuple\nof functions (encoder, decoder, stream_reader, stream_writer) (or\na CodecInfo object).", + "_codecs.register_error" => "Register the specified error handler under the name errors.\n\nhandler must be a callable object, that will be called with an exception\ninstance containing information about the location of the\nencoding/decoding error and must return a (replacement, new position)\ntuple.", "_codecs.unregister" => "Unregister a codec search function and clear the registry's cache.\n\nIf the search function is not registered, do nothing.", "_collections" => "High performance data structures.\n- deque: ordered collection accessible from endpoints only\n- defaultdict: dict subclass with a default value factory", "_collections.OrderedDict" => "Dictionary that remembers insertion order", - "_collections.OrderedDict.__class_getitem__" => "See PEP 585", + "_collections.OrderedDict.__class_getitem__" => "dicts are generic over two types, signifying (respectively) the types of their keys and values", "_collections.OrderedDict.__contains__" => "True if the dictionary has the specified key, else False.", "_collections.OrderedDict.__delattr__" => "Implement delattr(self, name).", "_collections.OrderedDict.__delitem__" => "Delete self[key].", @@ -3154,7 +3154,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_collections.OrderedDict.get" => "Return the value for key if key is in the dictionary, else default.", "_collections.OrderedDict.move_to_end" => "Move an existing element to the end (or beginning if last is false).\n\nRaise KeyError if the element does not exist.", "_collections.OrderedDict.pop" => "od.pop(key[,default]) -> v, remove specified key and return the corresponding value.\n\nIf the key is not found, return the default if given; otherwise,\nraise a KeyError.", - "_collections.OrderedDict.popitem" => "Remove and return a (key, value) pair from the dictionary.\n\nPairs are returned in LIFO order if last is true or FIFO order if false.", + "_collections.OrderedDict.popitem" => "Remove and return a (key, value) pair from the dictionary.\n\nPairs are returned in LIFO order if last is true or FIFO order if\nfalse.", "_collections.OrderedDict.setdefault" => "Insert key with a value of default if key is not in the dictionary.\n\nReturn the value for key if key is in the dictionary, else default.", "_collections._count_elements" => "Count elements in the iterable, updating the mapping", "_collections._deque_iterator.__delattr__" => "Implement delattr(self, name).", @@ -3229,7 +3229,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_collections._tuplegetter.__str__" => "Return str(self).", "_collections._tuplegetter.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "_collections.defaultdict" => "defaultdict(default_factory=None, /, [...]) --> dict with default factory\n\nThe default factory is called without arguments to produce\na new value when a key is not present, in __getitem__ only.\nA defaultdict compares equal to a dict with the same items.\nAll remaining arguments are treated the same as if they were\npassed to the dict constructor, including keyword arguments.", - "_collections.defaultdict.__class_getitem__" => "See PEP 585", + "_collections.defaultdict.__class_getitem__" => "defaultdicts are generic over two types, signifying (respectively) the types of the dictionary's keys and values", "_collections.defaultdict.__contains__" => "True if the dictionary has the specified key, else False.", "_collections.defaultdict.__copy__" => "D.copy() -> a shallow copy of D.", "_collections.defaultdict.__delattr__" => "Implement delattr(self, name).", @@ -3276,7 +3276,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_collections.defaultdict.values" => "Return an object providing a view on the dict's values.", "_collections.deque" => "A list-like sequence optimized for data accesses near its endpoints.", "_collections.deque.__add__" => "Return self+value.", - "_collections.deque.__class_getitem__" => "See PEP 585", + "_collections.deque.__class_getitem__" => "deques are generic over the type of their contents", "_collections.deque.__contains__" => "Return bool(key in self).", "_collections.deque.__copy__" => "Return a shallow copy of a deque.", "_collections.deque.__delattr__" => "Implement delattr(self, name).", @@ -3350,11 +3350,11 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_contextvars.Context.__str__" => "Return str(self).", "_contextvars.Context.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "_contextvars.Context.copy" => "Return a shallow copy of the context object.", - "_contextvars.Context.get" => "Return the value for `key` if `key` has the value in the context object.\n\nIf `key` does not exist, return `default`. If `default` is not given,\nreturn None.", + "_contextvars.Context.get" => "Return the value for `key` if `key` has the value in the context object.\n\nIf `key` does not exist, return `default`. If `default` is not\ngiven, return None.", "_contextvars.Context.items" => "Return all variables and their values in the context object.\n\nThe result is returned as a list of 2-tuples (variable, value).", "_contextvars.Context.keys" => "Return a list of all variables in the context object.", "_contextvars.Context.values" => "Return a list of all variables' values in the context object.", - "_contextvars.ContextVar.__class_getitem__" => "See PEP 585", + "_contextvars.ContextVar.__class_getitem__" => "ContextVars are generic over the type of their contained values", "_contextvars.ContextVar.__delattr__" => "Implement delattr(self, name).", "_contextvars.ContextVar.__eq__" => "Return self==value.", "_contextvars.ContextVar.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", @@ -3376,10 +3376,10 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_contextvars.ContextVar.__sizeof__" => "Size of object in memory, in bytes.", "_contextvars.ContextVar.__str__" => "Return str(self).", "_contextvars.ContextVar.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", - "_contextvars.ContextVar.get" => "Return a value for the context variable for the current context.\n\nIf there is no value for the variable in the current context, the method will:\n * return the value of the default argument of the method, if provided; or\n * return the default value for the context variable, if it was created\n with one; or\n * raise a LookupError.", - "_contextvars.ContextVar.reset" => "Reset the context variable.\n\nThe variable is reset to the value it had before the `ContextVar.set()` that\ncreated the token was used.", - "_contextvars.ContextVar.set" => "Call to set a new value for the context variable in the current context.\n\nThe required value argument is the new value for the context variable.\n\nReturns a Token object that can be used to restore the variable to its previous\nvalue via the `ContextVar.reset()` method.", - "_contextvars.Token.__class_getitem__" => "See PEP 585", + "_contextvars.ContextVar.get" => "Return a value for the context variable for the current context.\n\nIf there is no value for the variable in the current context, the\nmethod will:\n * return the value of the default argument of the method, if\n provided; or\n * return the default value for the context variable, if it was\n created with one; or\n * raise a LookupError.", + "_contextvars.ContextVar.reset" => "Reset the context variable.\n\nThe variable is reset to the value it had before the\n`ContextVar.set()` that created the token was used.", + "_contextvars.ContextVar.set" => "Call to set a new value for the context variable in the current context.\n\nThe required value argument is the new value for the context\nvariable.\n\nReturns a Token object that can be used to restore the variable to\nits previous value via the `ContextVar.reset()` method.", + "_contextvars.Token.__class_getitem__" => "Tokens are generic over the same type as the ContextVar which created them.", "_contextvars.Token.__delattr__" => "Implement delattr(self, name).", "_contextvars.Token.__enter__" => "Enter into Token context manager.", "_contextvars.Token.__eq__" => "Return self==value.", @@ -3607,15 +3607,15 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_curses.baudrate" => "Return the output speed of the terminal in bits per second.", "_curses.beep" => "Emit a short attention sound.", "_curses.can_change_color" => "Return True if the programmer can change the colors displayed by the terminal.", - "_curses.cbreak" => "Enter cbreak mode.\n\n flag\n If false, the effect is the same as calling nocbreak().\n\nIn cbreak mode (sometimes called \"rare\" mode) normal tty line buffering is\nturned off and characters are available to be read one by one. However,\nunlike raw mode, special characters (interrupt, quit, suspend, and flow\ncontrol) retain their effects on the tty driver and calling program.\nCalling first raw() then cbreak() leaves the terminal in cbreak mode.", - "_curses.color_content" => "Return the red, green, and blue (RGB) components of the specified color.\n\n color_number\n The number of the color (0 - (COLORS-1)).\n\nA 3-tuple is returned, containing the R, G, B values for the given color,\nwhich will be between 0 (no component) and 1000 (maximum amount of component).", - "_curses.color_pair" => "Return the attribute value for displaying text in the specified color.\n\n pair_number\n The number of the color pair.\n\nThis attribute value can be combined with A_STANDOUT, A_REVERSE, and the\nother A_* attributes. pair_number() is the counterpart to this function.", - "_curses.curs_set" => "Set the cursor state.\n\n visibility\n 0 for invisible, 1 for normal visible, or 2 for very visible.\n\nIf the terminal supports the visibility requested, the previous cursor\nstate is returned; otherwise, an exception is raised. On many terminals,\nthe \"visible\" mode is an underline cursor and the \"very visible\" mode is\na block cursor.", + "_curses.cbreak" => "Enter cbreak mode.\n\n flag\n If false, the effect is the same as calling nocbreak().\n\nIn cbreak mode (sometimes called \"rare\" mode) normal tty line buffering\nis turned off and characters are available to be read one by one.\nHowever, unlike raw mode, special characters (interrupt, quit, suspend,\nand flow control) retain their effects on the tty driver and calling\nprogram. Calling first raw() then cbreak() leaves the terminal in\ncbreak mode.", + "_curses.color_content" => "Return the red, green, and blue (RGB) components of the specified color.\n\n color_number\n The number of the color (0 - (COLORS-1)).\n\nA 3-tuple is returned, containing the R, G, B values for the given\ncolor, which will be between 0 (no component) and 1000 (maximum amount\nof component).", + "_curses.color_pair" => "Return the attribute value for displaying text in the specified color.\n\n pair_number\n The number of the color pair.\n\nThis attribute value can be combined with A_STANDOUT, A_REVERSE, and the\nother A_* attributes. pair_number() is the counterpart to this\nfunction.", + "_curses.curs_set" => "Set the cursor state.\n\n visibility\n 0 for invisible, 1 for normal visible, or 2 for very visible.\n\nIf the terminal supports the visibility requested, the previous cursor\nstate is returned; otherwise, an exception is raised. On many\nterminals, the \"visible\" mode is an underline cursor and the \"very\nvisible\" mode is a block cursor.", "_curses.def_prog_mode" => "Save the current terminal mode as the \"program\" mode.\n\nThe \"program\" mode is the mode when the running program is using curses.\n\nSubsequent calls to reset_prog_mode() will restore this mode.", - "_curses.def_shell_mode" => "Save the current terminal mode as the \"shell\" mode.\n\nThe \"shell\" mode is the mode when the running program is not using curses.\n\nSubsequent calls to reset_shell_mode() will restore this mode.", + "_curses.def_shell_mode" => "Save the current terminal mode as the \"shell\" mode.\n\nThe \"shell\" mode is the mode when the running program is not using\ncurses.\n\nSubsequent calls to reset_shell_mode() will restore this mode.", "_curses.delay_output" => "Insert a pause in output.\n\n ms\n Duration in milliseconds.", "_curses.doupdate" => "Update the physical screen to match the virtual screen.", - "_curses.echo" => "Enter echo mode.\n\n flag\n If false, the effect is the same as calling noecho().\n\nIn echo mode, each character input is echoed to the screen as it is entered.", + "_curses.echo" => "Enter echo mode.\n\n flag\n If false, the effect is the same as calling noecho().\n\nIn echo mode, each character input is echoed to the screen as it is\nentered.", "_curses.endwin" => "De-initialize the library, and return terminal to normal status.", "_curses.erasechar" => "Return the user's current erase character.", "_curses.error.__delattr__" => "Implement delattr(self, name).", @@ -3641,10 +3641,10 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_curses.error.__weakref__" => "list of weak references to the object", "_curses.error.add_note" => "Add a note to the exception", "_curses.error.with_traceback" => "Set self.__traceback__ to tb and return self.", - "_curses.flash" => "Flash the screen.\n\nThat is, change it to reverse-video and then change it back in a short interval.", - "_curses.flushinp" => "Flush all input buffers.\n\nThis throws away any typeahead that has been typed by the user and has not\nyet been processed by the program.", - "_curses.get_escdelay" => "Gets the curses ESCDELAY setting.\n\nGets the number of milliseconds to wait after reading an escape character,\nto distinguish between an individual escape character entered on the\nkeyboard from escape sequences sent by cursor and function keys.", - "_curses.get_tabsize" => "Gets the curses TABSIZE setting.\n\nGets the number of columns used by the curses library when converting a tab\ncharacter to spaces as it adds the tab to a window.", + "_curses.flash" => "Flash the screen.\n\nThat is, change it to reverse-video and then change it back in a short\ninterval.", + "_curses.flushinp" => "Flush all input buffers.\n\nThis throws away any typeahead that has been typed by the user and has\nnot yet been processed by the program.", + "_curses.get_escdelay" => "Gets the curses ESCDELAY setting.\n\nGets the number of milliseconds to wait after reading an escape\ncharacter, to distinguish between an individual escape character entered\non the keyboard from escape sequences sent by cursor and function keys.", + "_curses.get_tabsize" => "Gets the curses TABSIZE setting.\n\nGets the number of columns used by the curses library when converting\na tab character to spaces as it adds the tab to a window.", "_curses.getmouse" => "Retrieve the queued mouse event.\n\nAfter getch() returns KEY_MOUSE to signal a mouse event, this function\nreturns a 5-tuple (id, x, y, z, bstate).", "_curses.getsyx" => "Return the current coordinates of the virtual screen cursor.\n\nReturn a (y, x) tuple. If leaveok is currently true, return (-1, -1).", "_curses.getwin" => "Read window related data stored in the file by an earlier putwin() call.\n\nThe routine then creates and initializes a new window using that data,\nreturning the new window object.", @@ -3655,46 +3655,46 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_curses.has_il" => "Return True if the terminal has insert- and delete-line capabilities.", "_curses.has_key" => "Return True if the current terminal type recognizes a key with that value.\n\n key\n Key number.", "_curses.init_color" => "Change the definition of a color.\n\n color_number\n The number of the color to be changed (0 - (COLORS-1)).\n r\n Red component (0 - 1000).\n g\n Green component (0 - 1000).\n b\n Blue component (0 - 1000).\n\nWhen init_color() is used, all occurrences of that color on the screen\nimmediately change to the new definition. This function is a no-op on\nmost terminals; it is active only if can_change_color() returns true.", - "_curses.init_pair" => "Change the definition of a color-pair.\n\n pair_number\n The number of the color-pair to be changed (1 - (COLOR_PAIRS-1)).\n fg\n Foreground color number (-1 - (COLORS-1)).\n bg\n Background color number (-1 - (COLORS-1)).\n\nIf the color-pair was previously initialized, the screen is refreshed and\nall occurrences of that color-pair are changed to the new definition.", + "_curses.init_pair" => "Change the definition of a color-pair.\n\n pair_number\n The number of the color-pair to be changed (1 - (COLOR_PAIRS-1)).\n fg\n Foreground color number (-1 - (COLORS-1)).\n bg\n Background color number (-1 - (COLORS-1)).\n\nIf the color-pair was previously initialized, the screen is refreshed\nand all occurrences of that color-pair are changed to the new\ndefinition.", "_curses.initscr" => "Initialize the library.\n\nReturn a WindowObject which represents the whole screen.", "_curses.is_term_resized" => "Return True if resize_term() would modify the window structure, False otherwise.\n\n nlines\n Height.\n ncols\n Width.", "_curses.isendwin" => "Return True if endwin() has been called.", "_curses.keyname" => "Return the name of specified key.\n\n key\n Key number.", "_curses.killchar" => "Return the user's current line kill character.", - "_curses.longname" => "Return the terminfo long name field describing the current terminal.\n\nThe maximum length of a verbose description is 128 characters. It is defined\nonly after the call to initscr().", + "_curses.longname" => "Return the terminfo long name field describing the current terminal.\n\nThe maximum length of a verbose description is 128 characters. It is\ndefined only after the call to initscr().", "_curses.meta" => "Enable/disable meta keys.\n\nIf yes is True, allow 8-bit characters to be input. If yes is False,\nallow only 7-bit characters.", - "_curses.mouseinterval" => "Set and retrieve the maximum time between press and release in a click.\n\n interval\n Time in milliseconds.\n\nSet the maximum time that can elapse between press and release events in\norder for them to be recognized as a click, and return the previous interval\nvalue.", - "_curses.mousemask" => "Set the mouse events to be reported, and return a tuple (availmask, oldmask).\n\nReturn a tuple (availmask, oldmask). availmask indicates which of the\nspecified mouse events can be reported; on complete failure it returns 0.\noldmask is the previous value of the given window's mouse event mask.\nIf this function is never called, no mouse events are ever reported.", + "_curses.mouseinterval" => "Set and retrieve the maximum time between press and release in a click.\n\n interval\n Time in milliseconds.\n\nSet the maximum time that can elapse between press and release events in\norder for them to be recognized as a click, and return the previous\ninterval value.", + "_curses.mousemask" => "Set the mouse events to be reported, and return a tuple (availmask, oldmask).\n\nReturn a tuple (availmask, oldmask). availmask indicates which of the\nspecified mouse events can be reported; on complete failure it returns\n0. oldmask is the previous value of the given window's mouse event\nmask. If this function is never called, no mouse events are ever\nreported.", "_curses.napms" => "Sleep for specified time.\n\n ms\n Duration in milliseconds.", "_curses.newpad" => "Create and return a pointer to a new pad data structure.\n\n nlines\n Height.\n ncols\n Width.", - "_curses.newwin" => "newwin(nlines, ncols, [begin_y=0, begin_x=0])\nReturn a new window.\n\n nlines\n Height.\n ncols\n Width.\n begin_y\n Top side y-coordinate.\n begin_x\n Left side x-coordinate.\n\nBy default, the window will extend from the specified position to the lower\nright corner of the screen.", - "_curses.nl" => "Enter newline mode.\n\n flag\n If false, the effect is the same as calling nonl().\n\nThis mode translates the return key into newline on input, and translates\nnewline into return and line-feed on output. Newline mode is initially on.", + "_curses.newwin" => "newwin(nlines, ncols, [begin_y=0, begin_x=0])\nReturn a new window.\n\n nlines\n Height.\n ncols\n Width.\n begin_y\n Top side y-coordinate.\n begin_x\n Left side x-coordinate.\n\nBy default, the window will extend from the specified position to the\nlower right corner of the screen.", + "_curses.nl" => "Enter newline mode.\n\n flag\n If false, the effect is the same as calling nonl().\n\nThis mode translates the return key into newline on input, and\ntranslates newline into return and line-feed on output. Newline mode\nis initially on.", "_curses.nocbreak" => "Leave cbreak mode.\n\nReturn to normal \"cooked\" mode with line buffering.", "_curses.noecho" => "Leave echo mode.\n\nEchoing of input characters is turned off.", - "_curses.nonl" => "Leave newline mode.\n\nDisable translation of return into newline on input, and disable low-level\ntranslation of newline into newline/return on output.", + "_curses.nonl" => "Leave newline mode.\n\nDisable translation of return into newline on input, and disable\nlow-level translation of newline into newline/return on output.", "_curses.noqiflush" => "Disable queue flushing.\n\nWhen queue flushing is disabled, normal flush of input and output queues\nassociated with the INTR, QUIT and SUSP characters will not be done.", "_curses.noraw" => "Leave raw mode.\n\nReturn to normal \"cooked\" mode with line buffering.", "_curses.pair_content" => "Return a tuple (fg, bg) containing the colors for the requested color pair.\n\n pair_number\n The number of the color pair (0 - (COLOR_PAIRS-1)).", "_curses.pair_number" => "Return the number of the color-pair set by the specified attribute value.\n\ncolor_pair() is the counterpart to this function.", "_curses.putp" => "Emit the value of a specified terminfo capability for the current terminal.\n\nNote that the output of putp() always goes to standard output.", "_curses.qiflush" => "Enable queue flushing.\n\n flag\n If false, the effect is the same as calling noqiflush().\n\nIf queue flushing is enabled, all output in the display driver queue\nwill be flushed when the INTR, QUIT and SUSP characters are read.", - "_curses.raw" => "Enter raw mode.\n\n flag\n If false, the effect is the same as calling noraw().\n\nIn raw mode, normal line buffering and processing of interrupt, quit,\nsuspend, and flow control keys are turned off; characters are presented to\ncurses input functions one by one.", + "_curses.raw" => "Enter raw mode.\n\n flag\n If false, the effect is the same as calling noraw().\n\nIn raw mode, normal line buffering and processing of interrupt, quit,\nsuspend, and flow control keys are turned off; characters are presented\nto curses input functions one by one.", "_curses.reset_prog_mode" => "Restore the terminal to \"program\" mode, as previously saved by def_prog_mode().", "_curses.reset_shell_mode" => "Restore the terminal to \"shell\" mode, as previously saved by def_shell_mode().", "_curses.resetty" => "Restore terminal mode.", - "_curses.resize_term" => "Backend function used by resizeterm(), performing most of the work.\n\n nlines\n Height.\n ncols\n Width.\n\nWhen resizing the windows, resize_term() blank-fills the areas that are\nextended. The calling application should fill in these areas with appropriate\ndata. The resize_term() function attempts to resize all windows. However,\ndue to the calling convention of pads, it is not possible to resize these\nwithout additional interaction with the application.", - "_curses.resizeterm" => "Resize the standard and current windows to the specified dimensions.\n\n nlines\n Height.\n ncols\n Width.\n\nAdjusts other bookkeeping data used by the curses library that record the\nwindow dimensions (in particular the SIGWINCH handler).", + "_curses.resize_term" => "Backend function used by resizeterm(), performing most of the work.\n\n nlines\n Height.\n ncols\n Width.\n\nWhen resizing the windows, resize_term() blank-fills the areas that are\nextended. The calling application should fill in these areas with\nappropriate data. The resize_term() function attempts to resize all\nwindows. However, due to the calling convention of pads, it is not\npossible to resize these without additional interaction with the\napplication.", + "_curses.resizeterm" => "Resize the standard and current windows to the specified dimensions.\n\n nlines\n Height.\n ncols\n Width.\n\nAdjusts other bookkeeping data used by the curses library that record\nthe window dimensions (in particular the SIGWINCH handler).", "_curses.savetty" => "Save terminal mode.", - "_curses.set_escdelay" => "Sets the curses ESCDELAY setting.\n\n ms\n length of the delay in milliseconds.\n\nSets the number of milliseconds to wait after reading an escape character,\nto distinguish between an individual escape character entered on the\nkeyboard from escape sequences sent by cursor and function keys.", - "_curses.set_tabsize" => "Sets the curses TABSIZE setting.\n\n size\n rendered cell width of a tab character.\n\nSets the number of columns used by the curses library when converting a tab\ncharacter to spaces as it adds the tab to a window.", + "_curses.set_escdelay" => "Sets the curses ESCDELAY setting.\n\n ms\n length of the delay in milliseconds.\n\nSets the number of milliseconds to wait after reading an escape\ncharacter, to distinguish between an individual escape character entered\non the keyboard from escape sequences sent by cursor and function keys.", + "_curses.set_tabsize" => "Sets the curses TABSIZE setting.\n\n size\n rendered cell width of a tab character.\n\nSets the number of columns used by the curses library when converting\na tab character to spaces as it adds the tab to a window.", "_curses.setsyx" => "Set the virtual screen cursor.\n\n y\n Y-coordinate.\n x\n X-coordinate.\n\nIf y and x are both -1, then leaveok is set.", "_curses.setupterm" => "Initialize the terminal.\n\n term\n Terminal name.\n If omitted, the value of the TERM environment variable will be used.\n fd\n File descriptor to which any initialization sequences will be sent.\n If not supplied, the file descriptor for sys.stdout will be used.", - "_curses.start_color" => "Initializes eight basic colors and global variables COLORS and COLOR_PAIRS.\n\nMust be called if the programmer wants to use colors, and before any other\ncolor manipulation routine is called. It is good practice to call this\nroutine right after initscr().\n\nIt also restores the colors on the terminal to the values they had when the\nterminal was just turned on.", + "_curses.start_color" => "Initializes eight basic colors and global variables COLORS and COLOR_PAIRS.\n\nMust be called if the programmer wants to use colors, and before any\nother color manipulation routine is called. It is good practice to call\nthis routine right after initscr().\n\nIt also restores the colors on the terminal to the values they had when\nthe terminal was just turned on.", "_curses.termattrs" => "Return a logical OR of all video attributes supported by the terminal.", "_curses.termname" => "Return the value of the environment variable TERM, truncated to 14 characters.", "_curses.tigetflag" => "Return the value of the Boolean capability.\n\n capname\n The terminfo capability name.\n\nThe value -1 is returned if capname is not a Boolean capability, or 0 if\nit is canceled or absent from the terminal description.", - "_curses.tigetnum" => "Return the value of the numeric capability.\n\n capname\n The terminfo capability name.\n\nThe value -2 is returned if capname is not a numeric capability, or -1 if\nit is canceled or absent from the terminal description.", - "_curses.tigetstr" => "Return the value of the string capability.\n\n capname\n The terminfo capability name.\n\nNone is returned if capname is not a string capability, or is canceled or\nabsent from the terminal description.", + "_curses.tigetnum" => "Return the value of the numeric capability.\n\n capname\n The terminfo capability name.\n\nThe value -2 is returned if capname is not a numeric capability, or -1\nif it is canceled or absent from the terminal description.", + "_curses.tigetstr" => "Return the value of the string capability.\n\n capname\n The terminfo capability name.\n\nNone is returned if capname is not a string capability, or is canceled\nor absent from the terminal description.", "_curses.tparm" => "Instantiate the specified byte string with the supplied parameters.\n\n str\n Parameterized byte string obtained from the terminfo database.", "_curses.typeahead" => "Specify that the file descriptor fd be used for typeahead checking.\n\n fd\n File descriptor.\n\nIf fd is -1, then no typeahead checking is done.", "_curses.unctrl" => "Return a string which is a printable representation of the character ch.\n\nControl characters are displayed as a caret followed by the character,\nfor example as ^C. Printing characters are left as they are.", @@ -3702,7 +3702,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_curses.ungetch" => "Push ch so the next getch() will return it.", "_curses.ungetmouse" => "Push a KEY_MOUSE event onto the input queue.\n\nThe following getmouse() will return the given state data.", "_curses.use_default_colors" => "Equivalent to assume_default_colors(-1, -1).", - "_curses.use_env" => "Use environment variables LINES and COLUMNS.\n\nIf used, this function should be called before initscr() or newterm() are\ncalled.\n\nWhen flag is False, the values of lines and columns specified in the terminfo\ndatabase will be used, even if environment variables LINES and COLUMNS (used\nby default) are set, or if curses is running in a window (in which case\ndefault behavior would be to use the window size if LINES and COLUMNS are\nnot set).", + "_curses.use_env" => "Use environment variables LINES and COLUMNS.\n\nIf used, this function should be called before initscr() or newterm()\nare called.\n\nWhen flag is False, the values of lines and columns specified in the\nterminfo database will be used, even if environment variables LINES and\nCOLUMNS (used by default) are set, or if curses is running in a window\n(in which case default behavior would be to use the window size if LINES\nand COLUMNS are not set).", "_curses.window.__delattr__" => "Implement delattr(self, name).", "_curses.window.__eq__" => "Return self==value.", "_curses.window.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", @@ -3732,37 +3732,37 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_curses.window.attrset" => "Set the \"background\" set of attributes.", "_curses.window.bkgd" => "Set the background property of the window.\n\n ch\n Background character.\n attr\n Background attributes.", "_curses.window.bkgdset" => "Set the window's background.\n\n ch\n Background character.\n attr\n Background attributes.", - "_curses.window.border" => "Draw a border around the edges of the window.\n\n ls\n Left side.\n rs\n Right side.\n ts\n Top side.\n bs\n Bottom side.\n tl\n Upper-left corner.\n tr\n Upper-right corner.\n bl\n Bottom-left corner.\n br\n Bottom-right corner.\n\nEach parameter specifies the character to use for a specific part of the\nborder. The characters can be specified as integers or as one-character\nstrings. A 0 value for any parameter will cause the default character to be\nused for that parameter.", - "_curses.window.box" => "box([verch=0, horch=0])\nDraw a border around the edges of the window.\n\n verch\n Left and right side.\n horch\n Top and bottom side.\n\nSimilar to border(), but both ls and rs are verch and both ts and bs are\nhorch. The default corner characters are always used by this function.", + "_curses.window.border" => "Draw a border around the edges of the window.\n\n ls\n Left side.\n rs\n Right side.\n ts\n Top side.\n bs\n Bottom side.\n tl\n Upper-left corner.\n tr\n Upper-right corner.\n bl\n Bottom-left corner.\n br\n Bottom-right corner.\n\nEach parameter specifies the character to use for a specific part of\nthe border. The characters can be specified as integers or as\none-character strings. A 0 value for any parameter will cause the\ndefault character to be used for that parameter.", + "_curses.window.box" => "box([verch=0, horch=0])\nDraw a border around the edges of the window.\n\n verch\n Left and right side.\n horch\n Top and bottom side.\n\nSimilar to border(), but both ls and rs are verch and both ts and bs\nare horch. The default corner characters are always used by this\nfunction.", "_curses.window.chgat" => "chgat([y, x,] [n=-1,] attr)\nSet the attributes of characters.\n\n y\n Y-coordinate.\n x\n X-coordinate.\n n\n Number of characters.\n attr\n Attributes for characters.\n\nSet the attributes of num characters at the current cursor position, or at\nposition (y, x) if supplied. If no value of num is given or num = -1, the\nattribute will be set on all the characters to the end of the line. This\nfunction does not move the cursor. The changed line will be touched using\nthe touchline() method so that the contents will be redisplayed by the next\nwindow refresh.", "_curses.window.delch" => "delch([y, x])\nDelete any character at (y, x).\n\n y\n Y-coordinate.\n x\n X-coordinate.", - "_curses.window.derwin" => "derwin([nlines=0, ncols=0,] begin_y, begin_x)\nCreate a sub-window (window-relative coordinates).\n\n nlines\n Height.\n ncols\n Width.\n begin_y\n Top side y-coordinate.\n begin_x\n Left side x-coordinate.\n\nderwin() is the same as calling subwin(), except that begin_y and begin_x\nare relative to the origin of the window, rather than relative to the entire\nscreen.", + "_curses.window.derwin" => "derwin([nlines=0, ncols=0,] begin_y, begin_x)\nCreate a sub-window (window-relative coordinates).\n\n nlines\n Height.\n ncols\n Width.\n begin_y\n Top side y-coordinate.\n begin_x\n Left side x-coordinate.\n\nderwin() is the same as calling subwin(), except that begin_y and\nbegin_x are relative to the origin of the window, rather than\nrelative to the entire screen.", "_curses.window.echochar" => "Add character ch with attribute attr, and refresh.\n\n ch\n Character to add.\n attr\n Attributes for the character.", "_curses.window.enclose" => "Return True if the screen-relative coordinates are enclosed by the window.\n\n y\n Y-coordinate.\n x\n X-coordinate.", "_curses.window.encoding" => "the typecode character used to create the array", "_curses.window.get_wch" => "get_wch([y, x])\nGet a wide character from terminal keyboard.\n\n y\n Y-coordinate.\n x\n X-coordinate.\n\nReturn a character for most keys, or an integer for function keys,\nkeypad keys, and other special keys.", "_curses.window.getbkgd" => "Return the window's current background character/attribute pair.", - "_curses.window.getch" => "getch([y, x])\nGet a character code from terminal keyboard.\n\n y\n Y-coordinate.\n x\n X-coordinate.\n\nThe integer returned does not have to be in ASCII range: function keys,\nkeypad keys and so on return numbers higher than 256. In no-delay mode, -1\nis returned if there is no input, else getch() waits until a key is pressed.", - "_curses.window.getkey" => "getkey([y, x])\nGet a character (string) from terminal keyboard.\n\n y\n Y-coordinate.\n x\n X-coordinate.\n\nReturning a string instead of an integer, as getch() does. Function keys,\nkeypad keys and other special keys return a multibyte string containing the\nkey name. In no-delay mode, an exception is raised if there is no input.", + "_curses.window.getch" => "getch([y, x])\nGet a character code from terminal keyboard.\n\n y\n Y-coordinate.\n x\n X-coordinate.\n\nThe integer returned does not have to be in ASCII range: function\nkeys, keypad keys and so on return numbers higher than 256. In\nno-delay mode, -1 is returned if there is no input, else getch()\nwaits until a key is pressed.", + "_curses.window.getkey" => "getkey([y, x])\nGet a character (string) from terminal keyboard.\n\n y\n Y-coordinate.\n x\n X-coordinate.\n\nReturning a string instead of an integer, as getch() does. Function\nkeys, keypad keys and other special keys return a multibyte string\ncontaining the key name. In no-delay mode, an exception is raised\nif there is no input.", "_curses.window.getstr" => "getstr([[y, x,] n=2047])\nRead a string from the user, with primitive line editing capacity.\n\n y\n Y-coordinate.\n x\n X-coordinate.\n n\n Maximal number of characters.", "_curses.window.hline" => "hline([y, x,] ch, n, [attr=_curses.A_NORMAL])\nDisplay a horizontal line.\n\n y\n Starting Y-coordinate.\n x\n Starting X-coordinate.\n ch\n Character to draw.\n n\n Line length.\n attr\n Attributes for the characters.", - "_curses.window.inch" => "inch([y, x])\nReturn the character at the given position in the window.\n\n y\n Y-coordinate.\n x\n X-coordinate.\n\nThe bottom 8 bits are the character proper, and upper bits are the attributes.", - "_curses.window.insch" => "insch([y, x,] ch, [attr=_curses.A_NORMAL])\nInsert a character before the current or specified position.\n\n y\n Y-coordinate.\n x\n X-coordinate.\n ch\n Character to insert.\n attr\n Attributes for the character.\n\nAll characters to the right of the cursor are shifted one position right, with\nthe rightmost characters on the line being lost.", - "_curses.window.insnstr" => "insnstr([y, x,] str, n, [attr])\nInsert at most n characters of the string.\n\n y\n Y-coordinate.\n x\n X-coordinate.\n str\n String to insert.\n n\n Maximal number of characters.\n attr\n Attributes for characters.\n\nInsert a character string (as many characters as will fit on the line)\nbefore the character under the cursor, up to n characters. If n is zero\nor negative, the entire string is inserted. All characters to the right\nof the cursor are shifted right, with the rightmost characters on the line\nbeing lost. The cursor position does not change (after moving to y, x, if\nspecified).", - "_curses.window.insstr" => "insstr([y, x,] str, [attr])\nInsert the string before the current or specified position.\n\n y\n Y-coordinate.\n x\n X-coordinate.\n str\n String to insert.\n attr\n Attributes for characters.\n\nInsert a character string (as many characters as will fit on the line)\nbefore the character under the cursor. All characters to the right of\nthe cursor are shifted right, with the rightmost characters on the line\nbeing lost. The cursor position does not change (after moving to y, x,\nif specified).", + "_curses.window.inch" => "inch([y, x])\nReturn the character at the given position in the window.\n\n y\n Y-coordinate.\n x\n X-coordinate.\n\nThe bottom 8 bits are the character proper, and upper bits are the\nattributes.", + "_curses.window.insch" => "insch([y, x,] ch, [attr=_curses.A_NORMAL])\nInsert a character before the current or specified position.\n\n y\n Y-coordinate.\n x\n X-coordinate.\n ch\n Character to insert.\n attr\n Attributes for the character.\n\nAll characters to the right of the cursor are shifted one position\nright, with the rightmost characters on the line being lost.", + "_curses.window.insnstr" => "insnstr([y, x,] str, n, [attr])\nInsert at most n characters of the string.\n\n y\n Y-coordinate.\n x\n X-coordinate.\n str\n String to insert.\n n\n Maximal number of characters.\n attr\n Attributes for characters.\n\nInsert a character string (as many characters as will fit on the\nline) before the character under the cursor, up to n characters. If\nn is zero or negative, the entire string is inserted. All\ncharacters to the right of the cursor are shifted right, with the\nrightmost characters on the line being lost. The cursor position\ndoes not change (after moving to y, x, if specified).", + "_curses.window.insstr" => "insstr([y, x,] str, [attr])\nInsert the string before the current or specified position.\n\n y\n Y-coordinate.\n x\n X-coordinate.\n str\n String to insert.\n attr\n Attributes for characters.\n\nInsert a character string (as many characters as will fit on the\nline) before the character under the cursor. All characters to the\nright of the cursor are shifted right, with the rightmost characters\non the line being lost. The cursor position does not change (after\nmoving to y, x, if specified).", "_curses.window.instr" => "instr([y, x,] n=2047)\nReturn a string of characters, extracted from the window.\n\n y\n Y-coordinate.\n x\n X-coordinate.\n n\n Maximal number of characters.\n\nReturn a string of characters, extracted from the window starting at the\ncurrent cursor position, or at y, x if specified. Attributes are stripped\nfrom the characters. If n is specified, instr() returns a string at most\nn characters long (exclusive of the trailing NUL).", - "_curses.window.is_linetouched" => "Return True if the specified line was modified, otherwise return False.\n\n line\n Line number.\n\nRaise a curses.error exception if line is not valid for the given window.", - "_curses.window.noutrefresh" => "noutrefresh([pminrow, pmincol, sminrow, smincol, smaxrow, smaxcol])\nMark for refresh but wait.\n\nThis function updates the data structure representing the desired state of the\nwindow, but does not force an update of the physical screen. To accomplish\nthat, call doupdate().", - "_curses.window.overlay" => "overlay(destwin, [sminrow, smincol, dminrow, dmincol, dmaxrow, dmaxcol])\nOverlay the window on top of destwin.\n\nThe windows need not be the same size, only the overlapping region is copied.\nThis copy is non-destructive, which means that the current background\ncharacter does not overwrite the old contents of destwin.\n\nTo get fine-grained control over the copied region, the second form of\noverlay() can be used. sminrow and smincol are the upper-left coordinates\nof the source window, and the other variables mark a rectangle in the\ndestination window.", - "_curses.window.overwrite" => "overwrite(destwin, [sminrow, smincol, dminrow, dmincol, dmaxrow,\n dmaxcol])\nOverwrite the window on top of destwin.\n\nThe windows need not be the same size, in which case only the overlapping\nregion is copied. This copy is destructive, which means that the current\nbackground character overwrites the old contents of destwin.\n\nTo get fine-grained control over the copied region, the second form of\noverwrite() can be used. sminrow and smincol are the upper-left coordinates\nof the source window, the other variables mark a rectangle in the destination\nwindow.", + "_curses.window.is_linetouched" => "Return True if the specified line was modified, otherwise return False.\n\n line\n Line number.\n\nRaise a curses.error exception if line is not valid for the given\nwindow.", + "_curses.window.noutrefresh" => "noutrefresh([pminrow, pmincol, sminrow, smincol, smaxrow, smaxcol])\nMark for refresh but wait.\n\nThis function updates the data structure representing the desired\nstate of the window, but does not force an update of the physical\nscreen. To accomplish that, call doupdate().", + "_curses.window.overlay" => "overlay(destwin, [sminrow, smincol, dminrow, dmincol, dmaxrow, dmaxcol])\nOverlay the window on top of destwin.\n\nThe windows need not be the same size, only the overlapping region\nis copied. This copy is non-destructive, which means that the\ncurrent background character does not overwrite the old contents of\ndestwin.\n\nTo get fine-grained control over the copied region, the second form\nof overlay() can be used. sminrow and smincol are the upper-left\ncoordinates of the source window, and the other variables mark\na rectangle in the destination window.", + "_curses.window.overwrite" => "overwrite(destwin, [sminrow, smincol, dminrow, dmincol, dmaxrow,\n dmaxcol])\nOverwrite the window on top of destwin.\n\nThe windows need not be the same size, in which case only the\noverlapping region is copied. This copy is destructive, which means\nthat the current background character overwrites the old contents of\ndestwin.\n\nTo get fine-grained control over the copied region, the second form\nof overwrite() can be used. sminrow and smincol are the upper-left\ncoordinates of the source window, the other variables mark\na rectangle in the destination window.", "_curses.window.putwin" => "Write all data associated with the window into the provided file object.\n\nThis information can be later retrieved using the getwin() function.", "_curses.window.redrawln" => "Mark the specified lines corrupted.\n\n beg\n Starting line number.\n num\n The number of lines.\n\nThey should be completely redrawn on the next refresh() call.", - "_curses.window.refresh" => "refresh([pminrow, pmincol, sminrow, smincol, smaxrow, smaxcol])\nUpdate the display immediately.\n\nSynchronize actual screen with previous drawing/deleting methods.\nThe 6 optional arguments can only be specified when the window is a pad\ncreated with newpad(). The additional parameters are needed to indicate\nwhat part of the pad and screen are involved. pminrow and pmincol specify\nthe upper left-hand corner of the rectangle to be displayed in the pad.\nsminrow, smincol, smaxrow, and smaxcol specify the edges of the rectangle to\nbe displayed on the screen. The lower right-hand corner of the rectangle to\nbe displayed in the pad is calculated from the screen coordinates, since the\nrectangles must be the same size. Both rectangles must be entirely contained\nwithin their respective structures. Negative values of pminrow, pmincol,\nsminrow, or smincol are treated as if they were zero.", - "_curses.window.scroll" => "scroll([lines=1])\nScroll the screen or scrolling region.\n\n lines\n Number of lines to scroll.\n\nScroll upward if the argument is positive and downward if it is negative.", + "_curses.window.refresh" => "refresh([pminrow, pmincol, sminrow, smincol, smaxrow, smaxcol])\nUpdate the display immediately.\n\nSynchronize actual screen with previous drawing/deleting methods.\nThe 6 optional arguments can only be specified when the window is\na pad created with newpad(). The additional parameters are needed\nto indicate what part of the pad and screen are involved. pminrow\nand pmincol specify the upper left-hand corner of the rectangle to\nbe displayed in the pad. sminrow, smincol, smaxrow, and smaxcol\nspecify the edges of the rectangle to be displayed on the screen.\nThe lower right-hand corner of the rectangle to be displayed in the\npad is calculated from the screen coordinates, since the rectangles\nmust be the same size. Both rectangles must be entirely contained\nwithin their respective structures. Negative values of pminrow,\npmincol, sminrow, or smincol are treated as if they were zero.", + "_curses.window.scroll" => "scroll([lines=1])\nScroll the screen or scrolling region.\n\n lines\n Number of lines to scroll.\n\nScroll upward if the argument is positive and downward if it is\nnegative.", "_curses.window.setscrreg" => "Define a software scrolling region.\n\n top\n First line number.\n bottom\n Last line number.\n\nAll scrolling actions will take place in this region.", - "_curses.window.subpad" => "subwin([nlines=0, ncols=0,] begin_y, begin_x)\nCreate a sub-window (screen-relative coordinates).\n\n nlines\n Height.\n ncols\n Width.\n begin_y\n Top side y-coordinate.\n begin_x\n Left side x-coordinate.\n\nBy default, the sub-window will extend from the specified position to the\nlower right corner of the window.", - "_curses.window.subwin" => "subwin([nlines=0, ncols=0,] begin_y, begin_x)\nCreate a sub-window (screen-relative coordinates).\n\n nlines\n Height.\n ncols\n Width.\n begin_y\n Top side y-coordinate.\n begin_x\n Left side x-coordinate.\n\nBy default, the sub-window will extend from the specified position to the\nlower right corner of the window.", - "_curses.window.touchline" => "touchline(start, count, [changed=True])\nPretend count lines have been changed, starting with line start.\n\nIf changed is supplied, it specifies whether the affected lines are marked\nas having been changed (changed=True) or unchanged (changed=False).", + "_curses.window.subpad" => "subwin([nlines=0, ncols=0,] begin_y, begin_x)\nCreate a sub-window (screen-relative coordinates).\n\n nlines\n Height.\n ncols\n Width.\n begin_y\n Top side y-coordinate.\n begin_x\n Left side x-coordinate.\n\nBy default, the sub-window will extend from the specified position\nto the lower right corner of the window.", + "_curses.window.subwin" => "subwin([nlines=0, ncols=0,] begin_y, begin_x)\nCreate a sub-window (screen-relative coordinates).\n\n nlines\n Height.\n ncols\n Width.\n begin_y\n Top side y-coordinate.\n begin_x\n Left side x-coordinate.\n\nBy default, the sub-window will extend from the specified position\nto the lower right corner of the window.", + "_curses.window.touchline" => "touchline(start, count, [changed=True])\nPretend count lines have been changed, starting with line start.\n\nIf changed is supplied, it specifies whether the affected lines are\nmarked as having been changed (changed=True) or unchanged\n(changed=False).", "_curses.window.vline" => "vline([y, x,] ch, n, [attr=_curses.A_NORMAL])\nDisplay a vertical line.\n\n y\n Starting Y-coordinate.\n x\n Starting X-coordinate.\n ch\n Character to draw.\n n\n Line length.\n attr\n Attributes for the character.", "_curses_panel.bottom_panel" => "Return the bottom panel in the panel stack.", "_curses_panel.error.__delattr__" => "Implement delattr(self, name).", @@ -3814,7 +3814,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_curses_panel.panel.below" => "Return the panel below the current panel.", "_curses_panel.panel.bottom" => "Push the panel to the bottom of the stack.", "_curses_panel.panel.hidden" => "Return True if the panel is hidden (not visible), False otherwise.", - "_curses_panel.panel.hide" => "Hide the panel.\n\nThis does not delete the object, it just makes the window on screen invisible.", + "_curses_panel.panel.hide" => "Hide the panel.\n\nThis does not delete the object, it just makes the window on screen\ninvisible.", "_curses_panel.panel.move" => "Move the panel to the screen coordinates (y, x).", "_curses_panel.panel.replace" => "Change the window associated with the panel to the window win.", "_curses_panel.panel.set_userptr" => "Set the panel's user pointer to obj.", @@ -3823,7 +3823,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_curses_panel.panel.userptr" => "Return the user pointer for the panel.", "_curses_panel.panel.window" => "Return the window object associated with the panel.", "_curses_panel.top_panel" => "Return the top panel in the panel stack.", - "_curses_panel.update_panels" => "Updates the virtual screen after changes in the panel stack.\n\nThis does not call curses.doupdate(), so you'll have to do this yourself.", + "_curses_panel.update_panels" => "Updates the virtual screen after changes in the panel stack.\n\nThis does not call curses.doupdate(), so you'll have to do this\nyourself.", "_datetime" => "Fast implementation of the datetime module.", "_datetime.date" => "date(year, month, day) --> date object", "_datetime.date.__add__" => "Return self+value.", @@ -3856,7 +3856,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_datetime.date.fromisocalendar" => "int, int, int -> Construct a date from the ISO year, week number and weekday.\n\nThis is the inverse of the date.isocalendar() function", "_datetime.date.fromisoformat" => "str -> Construct a date from a string in ISO 8601 format.", "_datetime.date.fromordinal" => "int -> date corresponding to a proleptic Gregorian ordinal.", - "_datetime.date.fromtimestamp" => "Create a date from a POSIX timestamp.\n\nThe timestamp is a number, e.g. created via time.time(), that is interpreted\nas local time.", + "_datetime.date.fromtimestamp" => "Create a date from a POSIX timestamp.\n\nThe timestamp is a number, e.g. created via time.time(), that is\ninterpreted as local time.", "_datetime.date.isocalendar" => "Return a named tuple containing ISO year, week number, and weekday.", "_datetime.date.isoformat" => "Return string in ISO 8601 format, YYYY-MM-DD.", "_datetime.date.isoweekday" => "Return the day of the week represented by the date.\nMonday == 1 ... Sunday == 7", @@ -4334,7 +4334,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_decimal.DecimalException.with_traceback" => "Set self.__traceback__ to tb and return self.", "_decimal.DecimalTuple" => "DecimalTuple(sign, digits, exponent)", "_decimal.DecimalTuple.__add__" => "Return self+value.", - "_decimal.DecimalTuple.__class_getitem__" => "See PEP 585", + "_decimal.DecimalTuple.__class_getitem__" => "Tuples are generic over the types of their contents.\n\nFor example, use ``tuple[int, str]`` for a pair whose first element is an int and second element is a string.\n\nTuples also support the form ``tuple[T, ...]`` to indicate an arbitrary length tuple of elements of type T.", "_decimal.DecimalTuple.__contains__" => "Return bool(key in self).", "_decimal.DecimalTuple.__delattr__" => "Implement delattr(self, name).", "_decimal.DecimalTuple.__eq__" => "Return self==value.", @@ -4782,7 +4782,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_functools.cmp_to_key" => "Convert a cmp= function into a key= function.\n\n mycmp\n Function that compares two objects.", "_functools.partial" => "Create a new function with partial application of the given arguments\nand keywords.", "_functools.partial.__call__" => "Call self as a function.", - "_functools.partial.__class_getitem__" => "See PEP 585", + "_functools.partial.__class_getitem__" => "partial is generic over the wrapped function's return type", "_functools.partial.__delattr__" => "Implement delattr(self, name).", "_functools.partial.__eq__" => "Return self==value.", "_functools.partial.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", @@ -4807,7 +4807,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_functools.partial.args" => "tuple of arguments to future partial calls", "_functools.partial.func" => "function object to use in future partial calls", "_functools.partial.keywords" => "dictionary of keyword arguments to future partial calls", - "_functools.reduce" => "Apply a function of two arguments cumulatively to the items of an iterable, from left to right.\n\nThis effectively reduces the iterable to a single value. If initial is present,\nit is placed before the items of the iterable in the calculation, and serves as\na default when the iterable is empty.\n\nFor example, reduce(lambda x, y: x+y, [1, 2, 3, 4, 5])\ncalculates ((((1 + 2) + 3) + 4) + 5).", + "_functools.reduce" => "Apply a function of two arguments cumulatively to the items of an iterable, from left to right.\n\nThis effectively reduces the iterable to a single value. If initial is\npresent, it is placed before the items of the iterable in the\ncalculation, and serves as a default when the iterable is empty.\n\nFor example, reduce(lambda x, y: x+y, [1, 2, 3, 4, 5])\ncalculates ((((1 + 2) + 3) + 4) + 5).", "_gdbm" => "This module provides an interface to the GNU DBM (GDBM) library.\n\nThis module is quite similar to the dbm module, but uses GDBM instead to\nprovide some additional functionality. Please note that the file formats\ncreated by GDBM and dbm are incompatible.\n\nGDBM objects behave like mappings (dictionaries), except that keys and\nvalues are always immutable bytes-like objects or strings. Printing\na GDBM object doesn't print the keys and values, and the items() and\nvalues() methods are not supported.", "_gdbm.error.__delattr__" => "Implement delattr(self, name).", "_gdbm.error.__eq__" => "Return self==value.", @@ -4914,7 +4914,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_hashlib.HMAC.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "_hashlib.HMAC.copy" => "Return a copy (\"clone\") of the HMAC object.", "_hashlib.HMAC.digest" => "Return the digest of the bytes passed to the update() method so far.", - "_hashlib.HMAC.hexdigest" => "Return hexadecimal digest of the bytes passed to the update() method so far.\n\nThis may be used to exchange the value safely in email or other non-binary\nenvironments.", + "_hashlib.HMAC.hexdigest" => "Return hexadecimal digest of the bytes passed to the update() method so far.\n\nThis may be used to exchange the value safely in email or other\nnon-binary environments.", "_hashlib.HMAC.update" => "Update the HMAC object with msg.", "_hashlib.UnsupportedDigestmodError.__delattr__" => "Implement delattr(self, name).", "_hashlib.UnsupportedDigestmodError.__eq__" => "Return self==value.", @@ -4940,7 +4940,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_hashlib.UnsupportedDigestmodError.add_note" => "Add a note to the exception", "_hashlib.UnsupportedDigestmodError.with_traceback" => "Set self.__traceback__ to tb and return self.", "_hashlib.compare_digest" => "Return 'a == b'.\n\nThis function uses an approach designed to prevent\ntiming analysis, making it appropriate for cryptography.\n\na and b must both be of the same type: either str (ASCII only),\nor any bytes-like object.\n\nNote: If a and b are of different lengths, or if an error occurs,\na timing attack could theoretically reveal information about the\ntypes and lengths of a and b--but not their values.", - "_hashlib.get_fips_mode" => "Determine the OpenSSL FIPS mode of operation.\n\nFor OpenSSL 3.0.0 and newer it returns the state of the default provider\nin the default OSSL context. It's not quite the same as FIPS_mode() but good\nenough for unittests.\n\nEffectively any non-zero return value indicates FIPS mode;\nvalues other than 1 may have additional significance.", + "_hashlib.get_fips_mode" => "Determine the OpenSSL FIPS mode of operation.\n\nFor OpenSSL 3.0.0 and newer it returns the state of the default provider\nin the default OSSL context. It's not quite the same as FIPS_mode() but\ngood enough for unittests.\n\nEffectively any non-zero return value indicates FIPS mode;\nvalues other than 1 may have additional significance.", "_hashlib.hmac_digest" => "Single-shot HMAC.", "_hashlib.hmac_new" => "Return a new hmac object.", "_hashlib.new" => "Return a new hash object using the named algorithm.\n\nAn optional string argument may be provided and will be\nautomatically hashed.\n\nThe MD5 and SHA1 algorithms are always supported.", @@ -4966,7 +4966,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_heapq.heappush" => "Push item onto heap, maintaining the heap invariant.", "_heapq.heappush_max" => "Push item onto max heap, maintaining the heap invariant.", "_heapq.heappushpop" => "Push item on the heap, then pop and return the smallest item from the heap.\n\nThe combined action runs more efficiently than heappush() followed by\na separate call to heappop().", - "_heapq.heappushpop_max" => "Maxheap variant of heappushpop.\n\nThe combined action runs more efficiently than heappush_max() followed by\na separate call to heappop_max().", + "_heapq.heappushpop_max" => "Maxheap variant of heappushpop.\n\nThe combined action runs more efficiently than heappush_max()\nfollowed by a separate call to heappop_max().", "_heapq.heapreplace" => "Pop and return the current smallest value, and add the new item.\n\nThis is more efficient than heappop() followed by heappush(), and can be\nmore appropriate when using a fixed-size heap. Note that the value\nreturned may be larger than item! That constrains reasonable uses of\nthis routine unless written as part of a conditional replacement:\n\n if item > heap[0]:\n item = heapreplace(heap, item)", "_heapq.heapreplace_max" => "Maxheap variant of heapreplace.", "_hmac.HMAC.__delattr__" => "Implement delattr(self, name).", @@ -4992,7 +4992,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_hmac.HMAC.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "_hmac.HMAC.copy" => "Return a copy (\"clone\") of the HMAC object.", "_hmac.HMAC.digest" => "Return the digest of the bytes passed to the update() method so far.\n\nThis method may raise a MemoryError.", - "_hmac.HMAC.hexdigest" => "Return hexadecimal digest of the bytes passed to the update() method so far.\n\nThis may be used to exchange the value safely in email or other non-binary\nenvironments.\n\nThis method may raise a MemoryError.", + "_hmac.HMAC.hexdigest" => "Return hexadecimal digest of the bytes passed to the update() method so far.\n\nThis may be used to exchange the value safely in email or other\nnon-binary environments.\n\nThis method may raise a MemoryError.", "_hmac.HMAC.update" => "Update the HMAC object with the given message.", "_hmac.UnknownHashError.__delattr__" => "Implement delattr(self, name).", "_hmac.UnknownHashError.__eq__" => "Return self==value.", @@ -5023,7 +5023,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_imp._frozen_module_names" => "Returns the list of available frozen modules.", "_imp._override_frozen_modules_for_tests" => "(internal-only) Override PyConfig.use_frozen_modules.\n\n(-1: \"off\", 1: \"on\", 0: no override)\nSee frozen_modules() in Lib/test/support/import_helper.py.", "_imp._override_multi_interp_extensions_check" => "(internal-only) Override PyInterpreterConfig.check_multi_interp_extensions.\n\n(-1: \"never\", 1: \"always\", 0: no override)", - "_imp.acquire_lock" => "Acquires the interpreter's import lock for the current thread.\n\nThis lock should be used by import hooks to ensure thread-safety when importing\nmodules. On platforms without threads, this function does nothing.", + "_imp.acquire_lock" => "Acquires the interpreter's import lock for the current thread.\n\nThis lock should be used by import hooks to ensure thread-safety when\nimporting modules. On platforms without threads, this function does\nnothing.", "_imp.create_builtin" => "Create an extension module.", "_imp.create_dynamic" => "Create an extension module.", "_imp.exec_builtin" => "Initialize a built-in module.", @@ -5136,7 +5136,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_interpchannels.ChannelID.send" => "the 'send' end of the channel", "_interpchannels.ChannelInfo" => "ChannelInfo\n\nA named tuple of a channel's state.", "_interpchannels.ChannelInfo.__add__" => "Return self+value.", - "_interpchannels.ChannelInfo.__class_getitem__" => "See PEP 585", + "_interpchannels.ChannelInfo.__class_getitem__" => "Tuples are generic over the types of their contents.\n\nFor example, use ``tuple[int, str]`` for a pair whose first element is an int and second element is a string.\n\nTuples also support the form ``tuple[T, ...]`` to indicate an arbitrary length tuple of elements of type T.", "_interpchannels.ChannelInfo.__contains__" => "Return bool(key in self).", "_interpchannels.ChannelInfo.__delattr__" => "Implement delattr(self, name).", "_interpchannels.ChannelInfo.__eq__" => "Return self==value.", @@ -5464,10 +5464,10 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_io.BufferedRWPair.fileno" => "Return underlying file descriptor if one exists.\n\nRaise OSError if the IO object does not use a file descriptor.", "_io.BufferedRWPair.readline" => "Read and return a line from the stream.\n\nIf size is specified, at most size bytes will be read.\n\nThe line terminator is always b'\\n' for binary files; for text\nfiles, the newlines argument to open can be used to select the line\nterminator(s) recognized.", "_io.BufferedRWPair.readlines" => "Return a list of lines from the stream.\n\nhint can be specified to control the number of lines read: no more\nlines will be read if the total size (in bytes/characters) of all\nlines so far exceeds hint.", - "_io.BufferedRWPair.seek" => "Change the stream position to the given byte offset.\n\n offset\n The stream position, relative to 'whence'.\n whence\n The relative position to seek from.\n\nThe offset is interpreted relative to the position indicated by whence.\nValues for whence are:\n\n* os.SEEK_SET or 0 -- start of stream (the default); offset should be zero or positive\n* os.SEEK_CUR or 1 -- current stream position; offset may be negative\n* os.SEEK_END or 2 -- end of stream; offset is usually negative\n\nReturn the new absolute position.", + "_io.BufferedRWPair.seek" => "Change the stream position to the given byte offset.\n\n offset\n The stream position, relative to 'whence'.\n whence\n The relative position to seek from.\n\nThe offset is interpreted relative to the position indicated by\nwhence. Values for whence are:\n\n* os.SEEK_SET or 0 -- start of stream (the default); offset should\n be zero or positive\n* os.SEEK_CUR or 1 -- current stream position; offset may be\n negative\n* os.SEEK_END or 2 -- end of stream; offset is usually negative\n\nReturn the new absolute position.", "_io.BufferedRWPair.seekable" => "Return whether object supports random access.\n\nIf False, seek(), tell() and truncate() will raise OSError.\nThis method may need to do a test seek().", "_io.BufferedRWPair.tell" => "Return current stream position.", - "_io.BufferedRWPair.truncate" => "Truncate file to size bytes.\n\nFile pointer is left unchanged. Size defaults to the current IO position\nas reported by tell(). Return the new size.", + "_io.BufferedRWPair.truncate" => "Truncate file to size bytes.\n\nFile pointer is left unchanged. Size defaults to the current IO\nposition as reported by tell(). Return the new size.", "_io.BufferedRWPair.writelines" => "Write a list of lines to stream.\n\nLine separators are not added, so it is usual for each of the\nlines provided to have a line separator at the end.", "_io.BufferedRandom" => "A buffered interface to random access streams.\n\nThe constructor creates a reader and writer for a seekable stream,\nraw, given in the first argument. If the buffer_size is omitted it\ndefaults to DEFAULT_BUFFER_SIZE.", "_io.BufferedRandom.__del__" => "Called when the instance is about to be destroyed.", @@ -5582,7 +5582,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_io.BytesIO.getvalue" => "Retrieve the entire contents of the BytesIO object.", "_io.BytesIO.isatty" => "Always returns False.\n\nBytesIO objects are not connected to a TTY-like device.", "_io.BytesIO.read" => "Read at most size bytes, returned as a bytes object.\n\nIf the size argument is negative, read until EOF is reached.\nReturn an empty bytes object at EOF.", - "_io.BytesIO.read1" => "Read at most size bytes, returned as a bytes object.\n\nIf the size argument is negative or omitted, read until EOF is reached.\nReturn an empty bytes object at EOF.", + "_io.BytesIO.read1" => "Read at most size bytes, returned as a bytes object.\n\nIf the size argument is negative or omitted, read until EOF is\nreached. Return an empty bytes object at EOF.", "_io.BytesIO.readable" => "Returns True if the IO object can be read.", "_io.BytesIO.readinto" => "Read bytes into buffer.\n\nReturns number of bytes read (0 for EOF), or None if the object\nis set not to block and has no data to read.", "_io.BytesIO.readline" => "Next line from the file, as a bytes object.\n\nRetain newline. A non-negative size argument limits the maximum\nnumber of bytes to return (an incomplete line may be returned then).\nReturn an empty bytes object at EOF.", @@ -5593,8 +5593,8 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_io.BytesIO.truncate" => "Truncate the file to at most size bytes.\n\nSize defaults to the current file position, as returned by tell().\nThe current file position is unchanged. Returns the new size.", "_io.BytesIO.writable" => "Returns True if the IO object can be written.", "_io.BytesIO.write" => "Write bytes to file.\n\nReturn the number of bytes written.", - "_io.BytesIO.writelines" => "Write lines to the file.\n\nNote that newlines are not added. lines can be any iterable object\nproducing bytes-like objects. This is equivalent to calling write() for\neach element.", - "_io.FileIO" => "Open a file.\n\nThe mode can be 'r' (default), 'w', 'x' or 'a' for reading,\nwriting, exclusive creation or appending. The file will be created if it\ndoesn't exist when opened for writing or appending; it will be truncated\nwhen opened for writing. A FileExistsError will be raised if it already\nexists when opened for creating. Opening a file for creating implies\nwriting so this mode behaves in a similar way to 'w'.Add a '+' to the mode\nto allow simultaneous reading and writing. A custom opener can be used by\npassing a callable as *opener*. The underlying file descriptor for the file\nobject is then obtained by calling opener with (*name*, *flags*).\n*opener* must return an open file descriptor (passing os.open as *opener*\nresults in functionality similar to passing None).", + "_io.BytesIO.writelines" => "Write lines to the file.\n\nNote that newlines are not added. lines can be any iterable object\nproducing bytes-like objects. This is equivalent to calling write()\nfor each element.", + "_io.FileIO" => "Open a file.\n\nThe mode can be 'r' (default), 'w', 'x' or 'a' for reading,\nwriting, exclusive creation or appending. The file will be created\nif it doesn't exist when opened for writing or appending; it will be\ntruncated when opened for writing. A FileExistsError will be raised\nif it already exists when opened for creating. Opening a file for\ncreating implies writing so this mode behaves in a similar way to\n'w'. Add a '+' to the mode to allow simultaneous reading and\nwriting.\n\nA custom opener can be used by passing a callable as *opener*.\nThe underlying file descriptor for the file object is then obtained\nby calling opener with (*name*, *flags*). *opener* must return\nan open file descriptor (passing os.open as *opener* results in\nfunctionality similar to passing None).", "_io.FileIO.__del__" => "Called when the instance is about to be destroyed.", "_io.FileIO.__delattr__" => "Implement delattr(self, name).", "_io.FileIO.__eq__" => "Return self==value.", @@ -5619,25 +5619,25 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_io.FileIO.__str__" => "Return str(self).", "_io.FileIO.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "_io.FileIO._blksize" => "Stat st_blksize if available", - "_io.FileIO.close" => "Close the file.\n\nA closed file cannot be used for further I/O operations. close() may be\ncalled more than once without error.", + "_io.FileIO.close" => "Close the file.\n\nA closed file cannot be used for further I/O operations. close()\nmay be called more than once without error.", "_io.FileIO.closed" => "True if the file is closed", "_io.FileIO.closefd" => "True if the file descriptor will be closed by close().", "_io.FileIO.fileno" => "Return the underlying file descriptor (an integer).", "_io.FileIO.flush" => "Flush write buffers, if applicable.\n\nThis is not implemented for read-only and non-blocking streams.", "_io.FileIO.isatty" => "True if the file is connected to a TTY device.", "_io.FileIO.mode" => "String giving the file mode", - "_io.FileIO.read" => "Read at most size bytes, returned as bytes.\n\nIf size is less than 0, read all bytes in the file making multiple read calls.\nSee ``FileIO.readall``.\n\nAttempts to make only one system call, retrying only per PEP 475 (EINTR). This\nmeans less data may be returned than requested.\n\nIn non-blocking mode, returns None if no data is available. Return an empty\nbytes object at EOF.", + "_io.FileIO.read" => "Read at most size bytes, returned as bytes.\n\nIf size is less than 0, read all bytes in the file making multiple\nread calls. See ``FileIO.readall``.\n\nAttempts to make only one system call, retrying only per PEP 475\n(EINTR). This means less data may be returned than requested.\n\nIn non-blocking mode, returns None if no data is available. Return\nan empty bytes object at EOF.", "_io.FileIO.readable" => "True if file was opened in a read mode.", - "_io.FileIO.readall" => "Read all data from the file, returned as bytes.\n\nReads until either there is an error or read() returns size 0 (indicates EOF).\nIf the file is already at EOF, returns an empty bytes object.\n\nIn non-blocking mode, returns as much data as could be read before EAGAIN. If no\ndata is available (EAGAIN is returned before bytes are read) returns None.", + "_io.FileIO.readall" => "Read all data from the file, returned as bytes.\n\nReads until either there is an error or read() returns size 0\n(indicates EOF). If the file is already at EOF, returns an empty\nbytes object.\n\nIn non-blocking mode, returns as much data as could be read before\nEAGAIN. If no data is available (EAGAIN is returned before bytes\nare read) returns None.", "_io.FileIO.readinto" => "Same as RawIOBase.readinto().", "_io.FileIO.readline" => "Read and return a line from the stream.\n\nIf size is specified, at most size bytes will be read.\n\nThe line terminator is always b'\\n' for binary files; for text\nfiles, the newlines argument to open can be used to select the line\nterminator(s) recognized.", "_io.FileIO.readlines" => "Return a list of lines from the stream.\n\nhint can be specified to control the number of lines read: no more\nlines will be read if the total size (in bytes/characters) of all\nlines so far exceeds hint.", - "_io.FileIO.seek" => "Move to new file position and return the file position.\n\nArgument offset is a byte count. Optional argument whence defaults to\nSEEK_SET or 0 (offset from start of file, offset should be >= 0); other values\nare SEEK_CUR or 1 (move relative to current position, positive or negative),\nand SEEK_END or 2 (move relative to end of file, usually negative, although\nmany platforms allow seeking beyond the end of a file).\n\nNote that not all file objects are seekable.", + "_io.FileIO.seek" => "Move to new file position and return the file position.\n\nArgument offset is a byte count. Optional argument whence defaults\nto SEEK_SET or 0 (offset from start of file, offset should be >= 0);\nother values are SEEK_CUR or 1 (move relative to current position,\npositive or negative), and SEEK_END or 2 (move relative to end of\nfile, usually negative, although many platforms allow seeking beyond\nthe end of a file).\n\nNote that not all file objects are seekable.", "_io.FileIO.seekable" => "True if file supports random-access.", "_io.FileIO.tell" => "Current file position.\n\nCan raise OSError for non seekable files.", "_io.FileIO.truncate" => "Truncate the file to at most size bytes and return the truncated size.\n\nSize defaults to the current file position, as returned by tell().\nThe current file position is changed to the value of size.", "_io.FileIO.writable" => "True if file was opened in a write mode.", - "_io.FileIO.write" => "Write buffer b to file, return number of bytes written.\n\nOnly makes one system call, so not all of the data may be written.\nThe number of bytes actually written is returned. In non-blocking mode,\nreturns None if the write would block.", + "_io.FileIO.write" => "Write buffer b to file, return number of bytes written.\n\nOnly makes one system call, so not all of the data may be written.\nThe number of bytes actually written is returned. In non-blocking\nmode, returns None if the write would block.", "_io.FileIO.writelines" => "Write a list of lines to stream.\n\nLine separators are not added, so it is usual for each of the\nlines provided to have a line separator at the end.", "_io.IncrementalNewlineDecoder" => "Codec used when reading a file in universal newlines mode.\n\nIt wraps another incremental decoder, translating \\r\\n and \\r into \\n.\nIt also records the types of newlines encountered. When used with\ntranslate=False, it ensures that the newline sequence is returned in\none piece. When used with decoder=None, it expects unicode strings as\ndecode input and translates newlines without first invoking an external\ndecoder.", "_io.IncrementalNewlineDecoder.__delattr__" => "Implement delattr(self, name).", @@ -5686,7 +5686,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_io.StringIO.__str__" => "Return str(self).", "_io.StringIO.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "_io.StringIO.close" => "Close the IO object.\n\nAttempting any further operation after the object is closed\nwill raise a ValueError.\n\nThis method has no effect if the file is already closed.", - "_io.StringIO.detach" => "Separate the underlying buffer from the TextIOBase and return it.\n\nAfter the underlying buffer has been detached, the TextIO is in an unusable state.", + "_io.StringIO.detach" => "Separate the underlying buffer from the TextIOBase and return it.\n\nAfter the underlying buffer has been detached, the TextIO is in\nan unusable state.", "_io.StringIO.encoding" => "Encoding of the text stream.\n\nSubclasses should override.", "_io.StringIO.errors" => "The error setting of the decoder or encoder.\n\nSubclasses should override.", "_io.StringIO.fileno" => "Return underlying file descriptor if one exists.\n\nRaise OSError if the IO object does not use a file descriptor.", @@ -5697,7 +5697,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_io.StringIO.readable" => "Returns True if the IO object can be read.", "_io.StringIO.readline" => "Read until newline or EOF.\n\nReturns an empty string if EOF is hit immediately.", "_io.StringIO.readlines" => "Return a list of lines from the stream.\n\nhint can be specified to control the number of lines read: no more\nlines will be read if the total size (in bytes/characters) of all\nlines so far exceeds hint.", - "_io.StringIO.seek" => "Change stream position.\n\nSeek to character offset pos relative to position indicated by whence:\n 0 Start of stream (the default). pos should be >= 0;\n 1 Current position - pos must be 0;\n 2 End of stream - pos must be 0.\nReturns the new absolute position.", + "_io.StringIO.seek" => "Change stream position.\n\nSeek to character offset pos relative to position indicated by\nwhence:\n 0 Start of stream (the default). pos should be >= 0;\n 1 Current position - pos must be 0;\n 2 End of stream - pos must be 0.\nReturns the new absolute position.", "_io.StringIO.seekable" => "Returns True if the IO object can be seeked.", "_io.StringIO.tell" => "Tell the current file position.", "_io.StringIO.truncate" => "Truncate size to pos.\n\nThe pos argument defaults to the current file position, as\nreturned by tell(). The current file position is unchanged.\nReturns the new absolute position.", @@ -5731,7 +5731,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_io.TextIOWrapper.readlines" => "Return a list of lines from the stream.\n\nhint can be specified to control the number of lines read: no more\nlines will be read if the total size (in bytes/characters) of all\nlines so far exceeds hint.", "_io.TextIOWrapper.reconfigure" => "Reconfigure the text stream with new parameters.\n\nThis also does an implicit stream flush.", "_io.TextIOWrapper.seek" => "Set the stream position, and return the new stream position.\n\n cookie\n Zero or an opaque number returned by tell().\n whence\n The relative position to seek from.\n\nFour operations are supported, given by the following argument\ncombinations:\n\n- seek(0, SEEK_SET): Rewind to the start of the stream.\n- seek(cookie, SEEK_SET): Restore a previous position;\n 'cookie' must be a number returned by tell().\n- seek(0, SEEK_END): Fast-forward to the end of the stream.\n- seek(0, SEEK_CUR): Leave the current stream position unchanged.\n\nAny other argument combinations are invalid,\nand may raise exceptions.", - "_io.TextIOWrapper.tell" => "Return the stream position as an opaque number.\n\nThe return value of tell() can be given as input to seek(), to restore a\nprevious stream position.", + "_io.TextIOWrapper.tell" => "Return the stream position as an opaque number.\n\nThe return value of tell() can be given as input to seek(), to\nrestore a previous stream position.", "_io.TextIOWrapper.writelines" => "Write a list of lines to stream.\n\nLine separators are not added, so it is usual for each of the\nlines provided to have a line separator at the end.", "_io.UnsupportedOperation.__delattr__" => "Implement delattr(self, name).", "_io.UnsupportedOperation.__eq__" => "Return self==value.", @@ -5796,10 +5796,10 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_io._BufferedIOBase.readable" => "Return whether object was opened for reading.\n\nIf False, read() will raise OSError.", "_io._BufferedIOBase.readline" => "Read and return a line from the stream.\n\nIf size is specified, at most size bytes will be read.\n\nThe line terminator is always b'\\n' for binary files; for text\nfiles, the newlines argument to open can be used to select the line\nterminator(s) recognized.", "_io._BufferedIOBase.readlines" => "Return a list of lines from the stream.\n\nhint can be specified to control the number of lines read: no more\nlines will be read if the total size (in bytes/characters) of all\nlines so far exceeds hint.", - "_io._BufferedIOBase.seek" => "Change the stream position to the given byte offset.\n\n offset\n The stream position, relative to 'whence'.\n whence\n The relative position to seek from.\n\nThe offset is interpreted relative to the position indicated by whence.\nValues for whence are:\n\n* os.SEEK_SET or 0 -- start of stream (the default); offset should be zero or positive\n* os.SEEK_CUR or 1 -- current stream position; offset may be negative\n* os.SEEK_END or 2 -- end of stream; offset is usually negative\n\nReturn the new absolute position.", + "_io._BufferedIOBase.seek" => "Change the stream position to the given byte offset.\n\n offset\n The stream position, relative to 'whence'.\n whence\n The relative position to seek from.\n\nThe offset is interpreted relative to the position indicated by\nwhence. Values for whence are:\n\n* os.SEEK_SET or 0 -- start of stream (the default); offset should\n be zero or positive\n* os.SEEK_CUR or 1 -- current stream position; offset may be\n negative\n* os.SEEK_END or 2 -- end of stream; offset is usually negative\n\nReturn the new absolute position.", "_io._BufferedIOBase.seekable" => "Return whether object supports random access.\n\nIf False, seek(), tell() and truncate() will raise OSError.\nThis method may need to do a test seek().", "_io._BufferedIOBase.tell" => "Return current stream position.", - "_io._BufferedIOBase.truncate" => "Truncate file to size bytes.\n\nFile pointer is left unchanged. Size defaults to the current IO position\nas reported by tell(). Return the new size.", + "_io._BufferedIOBase.truncate" => "Truncate file to size bytes.\n\nFile pointer is left unchanged. Size defaults to the current IO\nposition as reported by tell(). Return the new size.", "_io._BufferedIOBase.writable" => "Return whether object was opened for writing.\n\nIf False, write() will raise OSError.", "_io._BufferedIOBase.write" => "Write buffer b to the IO stream.\n\nReturn the number of bytes written, which is always\nthe length of b in bytes.\n\nRaise BlockingIOError if the buffer is full and the\nunderlying raw stream cannot accept more data at the moment.", "_io._BufferedIOBase.writelines" => "Write a list of lines to stream.\n\nLine separators are not added, so it is usual for each of the\nlines provided to have a line separator at the end.", @@ -5858,10 +5858,10 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_io._IOBase.readable" => "Return whether object was opened for reading.\n\nIf False, read() will raise OSError.", "_io._IOBase.readline" => "Read and return a line from the stream.\n\nIf size is specified, at most size bytes will be read.\n\nThe line terminator is always b'\\n' for binary files; for text\nfiles, the newlines argument to open can be used to select the line\nterminator(s) recognized.", "_io._IOBase.readlines" => "Return a list of lines from the stream.\n\nhint can be specified to control the number of lines read: no more\nlines will be read if the total size (in bytes/characters) of all\nlines so far exceeds hint.", - "_io._IOBase.seek" => "Change the stream position to the given byte offset.\n\n offset\n The stream position, relative to 'whence'.\n whence\n The relative position to seek from.\n\nThe offset is interpreted relative to the position indicated by whence.\nValues for whence are:\n\n* os.SEEK_SET or 0 -- start of stream (the default); offset should be zero or positive\n* os.SEEK_CUR or 1 -- current stream position; offset may be negative\n* os.SEEK_END or 2 -- end of stream; offset is usually negative\n\nReturn the new absolute position.", + "_io._IOBase.seek" => "Change the stream position to the given byte offset.\n\n offset\n The stream position, relative to 'whence'.\n whence\n The relative position to seek from.\n\nThe offset is interpreted relative to the position indicated by\nwhence. Values for whence are:\n\n* os.SEEK_SET or 0 -- start of stream (the default); offset should\n be zero or positive\n* os.SEEK_CUR or 1 -- current stream position; offset may be\n negative\n* os.SEEK_END or 2 -- end of stream; offset is usually negative\n\nReturn the new absolute position.", "_io._IOBase.seekable" => "Return whether object supports random access.\n\nIf False, seek(), tell() and truncate() will raise OSError.\nThis method may need to do a test seek().", "_io._IOBase.tell" => "Return current stream position.", - "_io._IOBase.truncate" => "Truncate file to size bytes.\n\nFile pointer is left unchanged. Size defaults to the current IO position\nas reported by tell(). Return the new size.", + "_io._IOBase.truncate" => "Truncate file to size bytes.\n\nFile pointer is left unchanged. Size defaults to the current IO\nposition as reported by tell(). Return the new size.", "_io._IOBase.writable" => "Return whether object was opened for writing.\n\nIf False, write() will raise OSError.", "_io._IOBase.writelines" => "Write a list of lines to stream.\n\nLine separators are not added, so it is usual for each of the\nlines provided to have a line separator at the end.", "_io._RawIOBase" => "Base class for raw binary I/O.", @@ -5897,10 +5897,10 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_io._RawIOBase.readall" => "Read until EOF, using multiple read() call.", "_io._RawIOBase.readline" => "Read and return a line from the stream.\n\nIf size is specified, at most size bytes will be read.\n\nThe line terminator is always b'\\n' for binary files; for text\nfiles, the newlines argument to open can be used to select the line\nterminator(s) recognized.", "_io._RawIOBase.readlines" => "Return a list of lines from the stream.\n\nhint can be specified to control the number of lines read: no more\nlines will be read if the total size (in bytes/characters) of all\nlines so far exceeds hint.", - "_io._RawIOBase.seek" => "Change the stream position to the given byte offset.\n\n offset\n The stream position, relative to 'whence'.\n whence\n The relative position to seek from.\n\nThe offset is interpreted relative to the position indicated by whence.\nValues for whence are:\n\n* os.SEEK_SET or 0 -- start of stream (the default); offset should be zero or positive\n* os.SEEK_CUR or 1 -- current stream position; offset may be negative\n* os.SEEK_END or 2 -- end of stream; offset is usually negative\n\nReturn the new absolute position.", + "_io._RawIOBase.seek" => "Change the stream position to the given byte offset.\n\n offset\n The stream position, relative to 'whence'.\n whence\n The relative position to seek from.\n\nThe offset is interpreted relative to the position indicated by\nwhence. Values for whence are:\n\n* os.SEEK_SET or 0 -- start of stream (the default); offset should\n be zero or positive\n* os.SEEK_CUR or 1 -- current stream position; offset may be\n negative\n* os.SEEK_END or 2 -- end of stream; offset is usually negative\n\nReturn the new absolute position.", "_io._RawIOBase.seekable" => "Return whether object supports random access.\n\nIf False, seek(), tell() and truncate() will raise OSError.\nThis method may need to do a test seek().", "_io._RawIOBase.tell" => "Return current stream position.", - "_io._RawIOBase.truncate" => "Truncate file to size bytes.\n\nFile pointer is left unchanged. Size defaults to the current IO position\nas reported by tell(). Return the new size.", + "_io._RawIOBase.truncate" => "Truncate file to size bytes.\n\nFile pointer is left unchanged. Size defaults to the current IO\nposition as reported by tell(). Return the new size.", "_io._RawIOBase.writable" => "Return whether object was opened for writing.\n\nIf False, write() will raise OSError.", "_io._RawIOBase.writelines" => "Write a list of lines to stream.\n\nLine separators are not added, so it is usual for each of the\nlines provided to have a line separator at the end.", "_io._TextIOBase" => "Base class for text I/O.\n\nThis class provides a character and line based interface to stream\nI/O. There is no readinto method because Python's character strings\nare immutable.", @@ -5929,25 +5929,25 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_io._TextIOBase.__str__" => "Return str(self).", "_io._TextIOBase.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "_io._TextIOBase.close" => "Flush and close the IO object.\n\nThis method has no effect if the file is already closed.", - "_io._TextIOBase.detach" => "Separate the underlying buffer from the TextIOBase and return it.\n\nAfter the underlying buffer has been detached, the TextIO is in an unusable state.", + "_io._TextIOBase.detach" => "Separate the underlying buffer from the TextIOBase and return it.\n\nAfter the underlying buffer has been detached, the TextIO is in\nan unusable state.", "_io._TextIOBase.encoding" => "Encoding of the text stream.\n\nSubclasses should override.", "_io._TextIOBase.errors" => "The error setting of the decoder or encoder.\n\nSubclasses should override.", "_io._TextIOBase.fileno" => "Return underlying file descriptor if one exists.\n\nRaise OSError if the IO object does not use a file descriptor.", "_io._TextIOBase.flush" => "Flush write buffers, if applicable.\n\nThis is not implemented for read-only and non-blocking streams.", "_io._TextIOBase.isatty" => "Return whether this is an 'interactive' stream.\n\nReturn False if it can't be determined.", "_io._TextIOBase.newlines" => "Line endings translated so far.\n\nOnly line endings translated during reading are considered.\n\nSubclasses should override.", - "_io._TextIOBase.read" => "Read at most size characters from stream.\n\nRead from underlying buffer until we have size characters or we hit EOF.\nIf size is negative or omitted, read until EOF.", + "_io._TextIOBase.read" => "Read at most size characters from stream.\n\nRead from underlying buffer until we have size characters or we hit\nEOF. If size is negative or omitted, read until EOF.", "_io._TextIOBase.readable" => "Return whether object was opened for reading.\n\nIf False, read() will raise OSError.", "_io._TextIOBase.readline" => "Read until newline or EOF.\n\nReturn an empty string if EOF is hit immediately.\nIf size is specified, at most size characters will be read.", "_io._TextIOBase.readlines" => "Return a list of lines from the stream.\n\nhint can be specified to control the number of lines read: no more\nlines will be read if the total size (in bytes/characters) of all\nlines so far exceeds hint.", - "_io._TextIOBase.seek" => "Change the stream position to the given byte offset.\n\n offset\n The stream position, relative to 'whence'.\n whence\n The relative position to seek from.\n\nThe offset is interpreted relative to the position indicated by whence.\nValues for whence are:\n\n* os.SEEK_SET or 0 -- start of stream (the default); offset should be zero or positive\n* os.SEEK_CUR or 1 -- current stream position; offset may be negative\n* os.SEEK_END or 2 -- end of stream; offset is usually negative\n\nReturn the new absolute position.", + "_io._TextIOBase.seek" => "Change the stream position to the given byte offset.\n\n offset\n The stream position, relative to 'whence'.\n whence\n The relative position to seek from.\n\nThe offset is interpreted relative to the position indicated by\nwhence. Values for whence are:\n\n* os.SEEK_SET or 0 -- start of stream (the default); offset should\n be zero or positive\n* os.SEEK_CUR or 1 -- current stream position; offset may be\n negative\n* os.SEEK_END or 2 -- end of stream; offset is usually negative\n\nReturn the new absolute position.", "_io._TextIOBase.seekable" => "Return whether object supports random access.\n\nIf False, seek(), tell() and truncate() will raise OSError.\nThis method may need to do a test seek().", "_io._TextIOBase.tell" => "Return current stream position.", - "_io._TextIOBase.truncate" => "Truncate file to size bytes.\n\nFile pointer is left unchanged. Size defaults to the current IO position\nas reported by tell(). Return the new size.", + "_io._TextIOBase.truncate" => "Truncate file to size bytes.\n\nFile pointer is left unchanged. Size defaults to the current IO\nposition as reported by tell(). Return the new size.", "_io._TextIOBase.writable" => "Return whether object was opened for writing.\n\nIf False, write() will raise OSError.", "_io._TextIOBase.write" => "Write string s to stream.\n\nReturn the number of characters written\n(which is always equal to the length of the string).", "_io._TextIOBase.writelines" => "Write a list of lines to stream.\n\nLine separators are not added, so it is usual for each of the\nlines provided to have a line separator at the end.", - "_io._WindowsConsoleIO" => "Open a console buffer by file descriptor.\n\nThe mode can be 'rb' (default), or 'wb' for reading or writing bytes. All\nother mode characters will be ignored. Mode 'b' will be assumed if it is\nomitted. The *opener* parameter is always ignored.", + "_io._WindowsConsoleIO" => "Open a console buffer by file descriptor.\n\nThe mode can be 'rb' (default), or 'wb' for reading or writing\nbytes. All other mode characters will be ignored. Mode 'b' will be\nassumed if it is omitted. The *opener* parameter is always ignored.", "_io._WindowsConsoleIO.__del__" => "Called when the instance is about to be destroyed.", "_io._WindowsConsoleIO.__delattr__" => "Implement delattr(self, name).", "_io._WindowsConsoleIO.__eq__" => "Return self==value.", @@ -5985,15 +5985,15 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_io._WindowsConsoleIO.readinto" => "Same as RawIOBase.readinto().", "_io._WindowsConsoleIO.readline" => "Read and return a line from the stream.\n\nIf size is specified, at most size bytes will be read.\n\nThe line terminator is always b'\\n' for binary files; for text\nfiles, the newlines argument to open can be used to select the line\nterminator(s) recognized.", "_io._WindowsConsoleIO.readlines" => "Return a list of lines from the stream.\n\nhint can be specified to control the number of lines read: no more\nlines will be read if the total size (in bytes/characters) of all\nlines so far exceeds hint.", - "_io._WindowsConsoleIO.seek" => "Change the stream position to the given byte offset.\n\n offset\n The stream position, relative to 'whence'.\n whence\n The relative position to seek from.\n\nThe offset is interpreted relative to the position indicated by whence.\nValues for whence are:\n\n* os.SEEK_SET or 0 -- start of stream (the default); offset should be zero or positive\n* os.SEEK_CUR or 1 -- current stream position; offset may be negative\n* os.SEEK_END or 2 -- end of stream; offset is usually negative\n\nReturn the new absolute position.", + "_io._WindowsConsoleIO.seek" => "Change the stream position to the given byte offset.\n\n offset\n The stream position, relative to 'whence'.\n whence\n The relative position to seek from.\n\nThe offset is interpreted relative to the position indicated by\nwhence. Values for whence are:\n\n* os.SEEK_SET or 0 -- start of stream (the default); offset should\n be zero or positive\n* os.SEEK_CUR or 1 -- current stream position; offset may be\n negative\n* os.SEEK_END or 2 -- end of stream; offset is usually negative\n\nReturn the new absolute position.", "_io._WindowsConsoleIO.seekable" => "Return whether object supports random access.\n\nIf False, seek(), tell() and truncate() will raise OSError.\nThis method may need to do a test seek().", "_io._WindowsConsoleIO.tell" => "Return current stream position.", - "_io._WindowsConsoleIO.truncate" => "Truncate file to size bytes.\n\nFile pointer is left unchanged. Size defaults to the current IO position\nas reported by tell(). Return the new size.", + "_io._WindowsConsoleIO.truncate" => "Truncate file to size bytes.\n\nFile pointer is left unchanged. Size defaults to the current IO\nposition as reported by tell(). Return the new size.", "_io._WindowsConsoleIO.writable" => "True if console is an output buffer.", "_io._WindowsConsoleIO.write" => "Write buffer b to file, return number of bytes written.\n\nOnly makes one system call, so not all of the data may be written.\nThe number of bytes actually written is returned.", "_io._WindowsConsoleIO.writelines" => "Write a list of lines to stream.\n\nLine separators are not added, so it is usual for each of the\nlines provided to have a line separator at the end.", - "_io.open" => "Open file and return a stream. Raise OSError upon failure.\n\nfile is either a text or byte string giving the name (and the path\nif the file isn't in the current working directory) of the file to\nbe opened or an integer file descriptor of the file to be\nwrapped. (If a file descriptor is given, it is closed when the\nreturned I/O object is closed, unless closefd is set to False.)\n\nmode is an optional string that specifies the mode in which the file\nis opened. It defaults to 'r' which means open for reading in text\nmode. Other common values are 'w' for writing (truncating the file if\nit already exists), 'x' for creating and writing to a new file, and\n'a' for appending (which on some Unix systems, means that all writes\nappend to the end of the file regardless of the current seek position).\nIn text mode, if encoding is not specified the encoding used is platform\ndependent: locale.getencoding() is called to get the current locale encoding.\n(For reading and writing raw bytes use binary mode and leave encoding\nunspecified.) The available modes are:\n\n========= ===============================================================\nCharacter Meaning\n--------- ---------------------------------------------------------------\n'r' open for reading (default)\n'w' open for writing, truncating the file first\n'x' create a new file and open it for writing\n'a' open for writing, appending to the end of the file if it exists\n'b' binary mode\n't' text mode (default)\n'+' open a disk file for updating (reading and writing)\n========= ===============================================================\n\nThe default mode is 'rt' (open for reading text). For binary random\naccess, the mode 'w+b' opens and truncates the file to 0 bytes, while\n'r+b' opens the file without truncation. The 'x' mode implies 'w' and\nraises an `FileExistsError` if the file already exists.\n\nPython distinguishes between files opened in binary and text modes,\neven when the underlying operating system doesn't. Files opened in\nbinary mode (appending 'b' to the mode argument) return contents as\nbytes objects without any decoding. In text mode (the default, or when\n't' is appended to the mode argument), the contents of the file are\nreturned as strings, the bytes having been first decoded using a\nplatform-dependent encoding or using the specified encoding if given.\n\nbuffering is an optional integer used to set the buffering policy.\nPass 0 to switch buffering off (only allowed in binary mode), 1 to select\nline buffering (only usable in text mode), and an integer > 1 to indicate\nthe size of a fixed-size chunk buffer. When no buffering argument is\ngiven, the default buffering policy works as follows:\n\n* Binary files are buffered in fixed-size chunks; the size of the buffer\n is max(min(blocksize, 8 MiB), DEFAULT_BUFFER_SIZE)\n when the device block size is available.\n On most systems, the buffer will typically be 128 kilobytes long.\n\n* \"Interactive\" text files (files for which isatty() returns True)\n use line buffering. Other text files use the policy described above\n for binary files.\n\nencoding is the name of the encoding used to decode or encode the\nfile. This should only be used in text mode. The default encoding is\nplatform dependent, but any encoding supported by Python can be\npassed. See the codecs module for the list of supported encodings.\n\nerrors is an optional string that specifies how encoding errors are to\nbe handled---this argument should not be used in binary mode. Pass\n'strict' to raise a ValueError exception if there is an encoding error\n(the default of None has the same effect), or pass 'ignore' to ignore\nerrors. (Note that ignoring encoding errors can lead to data loss.)\nSee the documentation for codecs.register or run 'help(codecs.Codec)'\nfor a list of the permitted encoding error strings.\n\nnewline controls how universal newlines works (it only applies to text\nmode). It can be None, '', '\\n', '\\r', and '\\r\\n'. It works as\nfollows:\n\n* On input, if newline is None, universal newlines mode is\n enabled. Lines in the input can end in '\\n', '\\r', or '\\r\\n', and\n these are translated into '\\n' before being returned to the\n caller. If it is '', universal newline mode is enabled, but line\n endings are returned to the caller untranslated. If it has any of\n the other legal values, input lines are only terminated by the given\n string, and the line ending is returned to the caller untranslated.\n\n* On output, if newline is None, any '\\n' characters written are\n translated to the system default line separator, os.linesep. If\n newline is '' or '\\n', no translation takes place. If newline is any\n of the other legal values, any '\\n' characters written are translated\n to the given string.\n\nIf closefd is False, the underlying file descriptor will be kept open\nwhen the file is closed. This does not work when a file name is given\nand must be True in that case.\n\nA custom opener can be used by passing a callable as *opener*. The\nunderlying file descriptor for the file object is then obtained by\ncalling *opener* with (*file*, *flags*). *opener* must return an open\nfile descriptor (passing os.open as *opener* results in functionality\nsimilar to passing None).\n\nopen() returns a file object whose type depends on the mode, and\nthrough which the standard file operations such as reading and writing\nare performed. When open() is used to open a file in a text mode ('w',\n'r', 'wt', 'rt', etc.), it returns a TextIOWrapper. When used to open\na file in a binary mode, the returned class varies: in read binary\nmode, it returns a BufferedReader; in write binary and append binary\nmodes, it returns a BufferedWriter, and in read/write mode, it returns\na BufferedRandom.\n\nIt is also possible to use a string or bytearray as a file for both\nreading and writing. For strings StringIO can be used like a file\nopened in a text mode, and for bytes a BytesIO can be used like a file\nopened in a binary mode.", - "_io.open_code" => "Opens the provided file with the intent to import the contents.\n\nThis may perform extra validation beyond open(), but is otherwise interchangeable\nwith calling open(path, 'rb').", + "_io.open" => "Open file and return a stream. Raise OSError upon failure.\n\nfile is either a text or byte string giving the name (and the path\nif the file isn't in the current working directory) of the file to\nbe opened or an integer file descriptor of the file to be\nwrapped. (If a file descriptor is given, it is closed when the\nreturned I/O object is closed, unless closefd is set to False.)\n\nmode is an optional string that specifies the mode in which the file\nis opened. It defaults to 'r' which means open for reading in text\nmode. Other common values are 'w' for writing (truncating the file if\nit already exists), 'x' for creating and writing to a new file, and\n'a' for appending (which on some Unix systems, means that all writes\nappend to the end of the file regardless of the current seek position).\nIn text mode, if encoding is not specified the encoding used is platform\ndependent: locale.getencoding() is called to get the current locale\nencoding. (For reading and writing raw bytes use binary mode and leave\nencoding unspecified.) The available modes are:\n\n========= ==========================================================\nCharacter Meaning\n--------- ----------------------------------------------------------\n'r' open for reading (default)\n'w' open for writing, truncating the file first\n'x' create a new file and open it for writing\n'a' open for writing, appending to the end of the file if it\n exists\n'b' binary mode\n't' text mode (default)\n'+' open a disk file for updating (reading and writing)\n========= ==========================================================\n\nThe default mode is 'rt' (open for reading text). For binary random\naccess, the mode 'w+b' opens and truncates the file to 0 bytes, while\n'r+b' opens the file without truncation. The 'x' mode implies 'w' and\nraises an `FileExistsError` if the file already exists.\n\nPython distinguishes between files opened in binary and text modes,\neven when the underlying operating system doesn't. Files opened in\nbinary mode (appending 'b' to the mode argument) return contents as\nbytes objects without any decoding. In text mode (the default, or when\n't' is appended to the mode argument), the contents of the file are\nreturned as strings, the bytes having been first decoded using a\nplatform-dependent encoding or using the specified encoding if given.\n\nbuffering is an optional integer used to set the buffering policy.\nPass 0 to switch buffering off (only allowed in binary mode), 1 to\nselect line buffering (only usable in text mode), and an integer > 1 to\nindicate the size of a fixed-size chunk buffer. When no buffering\nargument is given, the default buffering policy works as follows:\n\n* Binary files are buffered in fixed-size chunks; the size of the buffer\n is max(min(blocksize, 8 MiB), DEFAULT_BUFFER_SIZE) when the device\n block size is available.\n On most systems, the buffer will typically be 128 kilobytes long.\n\n* \"Interactive\" text files (files for which isatty() returns True)\n use line buffering. Other text files use the policy described above\n for binary files.\n\nencoding is the name of the encoding used to decode or encode the\nfile. This should only be used in text mode. The default encoding is\nplatform dependent, but any encoding supported by Python can be\npassed. See the codecs module for the list of supported encodings.\n\nerrors is an optional string that specifies how encoding errors are to\nbe handled---this argument should not be used in binary mode. Pass\n'strict' to raise a ValueError exception if there is an encoding error\n(the default of None has the same effect), or pass 'ignore' to ignore\nerrors. (Note that ignoring encoding errors can lead to data loss.)\nSee the documentation for codecs.register or run 'help(codecs.Codec)'\nfor a list of the permitted encoding error strings.\n\nnewline controls how universal newlines works (it only applies to text\nmode). It can be None, '', '\\n', '\\r', and '\\r\\n'. It works as\nfollows:\n\n* On input, if newline is None, universal newlines mode is enabled.\n Lines in the input can end in '\\n', '\\r', or '\\r\\n', and these are\n translated into '\\n' before being returned to the caller. If it is\n '', universal newline mode is enabled, but line endings are returned\n to the caller untranslated. If it has any of the other legal values,\n input lines are only terminated by the given string, and the line\n ending is returned to the caller untranslated.\n\n* On output, if newline is None, any '\\n' characters written are\n translated to the system default line separator, os.linesep. If\n newline is '' or '\\n', no translation takes place. If newline is any\n of the other legal values, any '\\n' characters written are translated\n to the given string.\n\nIf closefd is False, the underlying file descriptor will be kept open\nwhen the file is closed. This does not work when a file name is given\nand must be True in that case.\n\nA custom opener can be used by passing a callable as *opener*. The\nunderlying file descriptor for the file object is then obtained by\ncalling *opener* with (*file*, *flags*). *opener* must return an open\nfile descriptor (passing os.open as *opener* results in functionality\nsimilar to passing None).\n\nopen() returns a file object whose type depends on the mode, and\nthrough which the standard file operations such as reading and writing\nare performed. When open() is used to open a file in a text mode ('w',\n'r', 'wt', 'rt', etc.), it returns a TextIOWrapper. When used to open\na file in a binary mode, the returned class varies: in read binary\nmode, it returns a BufferedReader; in write binary and append binary\nmodes, it returns a BufferedWriter, and in read/write mode, it returns\na BufferedRandom.\n\nIt is also possible to use a string or bytearray as a file for both\nreading and writing. For strings StringIO can be used like a file\nopened in a text mode, and for bytes a BytesIO can be used like a file\nopened in a binary mode.", + "_io.open_code" => "Opens the provided file with the intent to import the contents.\n\nThis may perform extra validation beyond open(), but is otherwise\ninterchangeable with calling open(path, 'rb').", "_io.text_encoding" => "A helper function to choose the text encoding.\n\nWhen encoding is not None, this function returns it.\nOtherwise, this function returns the default text encoding\n(i.e. \"locale\" or \"utf-8\" depends on UTF-8 mode).\n\nThis function emits an EncodingWarning if encoding is None and\nsys.flags.warn_default_encoding is true.\n\nThis can be used in APIs with an encoding=None parameter.\nHowever, please consider using encoding=\"utf-8\" for new APIs.", "_json" => "json speedups", "_json.encode_basestring" => "encode_basestring(string) -> string\n\nReturn a JSON representation of a Python string", @@ -6122,7 +6122,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_lsprof.Profiler.enable" => "Start collecting profiling information.\n\n subcalls\n If True, also records for each function\n statistics separated according to its current caller.\n builtins\n If True, records the time spent in\n built-in functions separately from their caller.", "_lsprof.Profiler.getstats" => "list of profiler_entry objects.\n\ngetstats() -> list of profiler_entry objects\n\nReturn all information collected by the profiler.\nEach profiler_entry is a tuple-like object with the\nfollowing attributes:\n\n code code object\n callcount how many times this was called\n reccallcount how many times called recursively\n totaltime total time in this entry\n inlinetime inline time in this entry (not in subcalls)\n calls details of the calls\n\nThe calls attribute is either None or a list of\nprofiler_subentry objects:\n\n code called code object\n callcount how many times this is called\n reccallcount how many times this is called recursively\n totaltime total time spent in this call\n inlinetime inline time (not in further subcalls)", "_lsprof.profiler_entry.__add__" => "Return self+value.", - "_lsprof.profiler_entry.__class_getitem__" => "See PEP 585", + "_lsprof.profiler_entry.__class_getitem__" => "Tuples are generic over the types of their contents.\n\nFor example, use ``tuple[int, str]`` for a pair whose first element is an int and second element is a string.\n\nTuples also support the form ``tuple[T, ...]`` to indicate an arbitrary length tuple of elements of type T.", "_lsprof.profiler_entry.__contains__" => "Return bool(key in self).", "_lsprof.profiler_entry.__delattr__" => "Implement delattr(self, name).", "_lsprof.profiler_entry.__eq__" => "Return self==value.", @@ -6159,7 +6159,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_lsprof.profiler_entry.reccallcount" => "how many times called recursively", "_lsprof.profiler_entry.totaltime" => "total time in this entry", "_lsprof.profiler_subentry.__add__" => "Return self+value.", - "_lsprof.profiler_subentry.__class_getitem__" => "See PEP 585", + "_lsprof.profiler_subentry.__class_getitem__" => "Tuples are generic over the types of their contents.\n\nFor example, use ``tuple[int, str]`` for a pair whose first element is an int and second element is a string.\n\nTuples also support the form ``tuple[T, ...]`` to indicate an arbitrary length tuple of elements of type T.", "_lsprof.profiler_subentry.__contains__" => "Return bool(key in self).", "_lsprof.profiler_subentry.__delattr__" => "Implement delattr(self, name).", "_lsprof.profiler_subentry.__eq__" => "Return self==value.", @@ -6241,7 +6241,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_lzma.LZMADecompressor.__str__" => "Return str(self).", "_lzma.LZMADecompressor.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "_lzma.LZMADecompressor.check" => "ID of the integrity check used by the input stream.", - "_lzma.LZMADecompressor.decompress" => "Decompress *data*, returning uncompressed data as bytes.\n\nIf *max_length* is nonnegative, returns at most *max_length* bytes of\ndecompressed data. If this limit is reached and further output can be\nproduced, *self.needs_input* will be set to ``False``. In this case, the next\ncall to *decompress()* may provide *data* as b'' to obtain more of the output.\n\nIf all of the input data was decompressed and returned (either because this\nwas less than *max_length* bytes, or because *max_length* was negative),\n*self.needs_input* will be set to True.\n\nAttempting to decompress data after the end of stream is reached raises an\nEOFError. Any data found after the end of the stream is ignored and saved in\nthe unused_data attribute.", + "_lzma.LZMADecompressor.decompress" => "Decompress *data*, returning uncompressed data as bytes.\n\nIf *max_length* is nonnegative, returns at most *max_length* bytes\nof decompressed data. If this limit is reached and further output\ncan be produced, *self.needs_input* will be set to ``False``. In\nthis case, the next call to *decompress()* may provide *data* as b''\nto obtain more of the output.\n\nIf all of the input data was decompressed and returned (either\nbecause this was less than *max_length* bytes, or because\n*max_length* was negative), *self.needs_input* will be set to True.\n\nAttempting to decompress data after the end of stream is reached\nraises an EOFError. Any data found after the end of the stream is\nignored and saved in the unused_data attribute.", "_lzma.LZMADecompressor.eof" => "True if the end-of-stream marker has been reached.", "_lzma.LZMADecompressor.needs_input" => "True if more input is needed before more decompressed data can be produced.", "_lzma.LZMADecompressor.unused_data" => "Data found after the end of the compressed stream.", @@ -6607,7 +6607,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_overlapped.Overlapped.cancel" => "Cancel overlapped operation.", "_overlapped.Overlapped.error" => "Error from last operation", "_overlapped.Overlapped.event" => "Overlapped event handle", - "_overlapped.Overlapped.getresult" => "Retrieve result of operation.\n\nIf wait is true then it blocks until the operation is finished. If wait\nis false and the operation is still pending then an error is raised.", + "_overlapped.Overlapped.getresult" => "Retrieve result of operation.\n\nIf wait is true then it blocks until the operation is finished. If\nwait is false and the operation is still pending then an error is\nraised.", "_overlapped.Overlapped.pending" => "Whether the operation is pending", "_overlapped.PostQueuedCompletionStatus" => "Post a message to completion port.", "_overlapped.RegisterWaitWithQueue" => "Register wait for Object; when complete CompletionPort is notified.", @@ -6766,9 +6766,9 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_pickle.loads" => "Read and return an object from the given pickle data.\n\nThe protocol version of the pickle is detected automatically, so no\nprotocol argument is needed. Bytes past the pickled object's\nrepresentation are ignored.\n\nOptional keyword arguments are *fix_imports*, *encoding* and *errors*,\nwhich are used to control compatibility support for pickle stream\ngenerated by Python 2. If *fix_imports* is True, pickle will try to\nmap the old Python 2 names to the new names used in Python 3. The\n*encoding* and *errors* tell pickle how to decode 8-bit string\ninstances pickled by Python 2; these default to 'ASCII' and 'strict',\nrespectively. The *encoding* can be 'bytes' to read these 8-bit\nstring instances as bytes objects.", "_posixshmem" => "POSIX shared memory module", "_posixshmem.shm_open" => "Open a shared memory object. Returns a file descriptor (integer).", - "_posixshmem.shm_unlink" => "Remove a shared memory object (similar to unlink()).\n\nRemove a shared memory object name, and, once all processes have unmapped\nthe object, de-allocates and destroys the contents of the associated memory\nregion.", + "_posixshmem.shm_unlink" => "Remove a shared memory object (similar to unlink()).\n\nRemove a shared memory object name, and, once all processes have\nunmapped the object, de-allocates and destroys the contents of the\nassociated memory region.", "_posixsubprocess" => "A POSIX helper for the subprocess module.", - "_posixsubprocess.fork_exec" => "Spawn a fresh new child process.\n\nFork a child process, close parent file descriptors as appropriate in the\nchild and duplicate the few that are needed before calling exec() in the\nchild process.\n\nIf close_fds is True, close file descriptors 3 and higher, except those listed\nin the sorted tuple pass_fds.\n\nThe preexec_fn, if supplied, will be called immediately before closing file\ndescriptors and exec.\n\nWARNING: preexec_fn is NOT SAFE if your application uses threads.\n It may trigger infrequent, difficult to debug deadlocks.\n\nIf an error occurs in the child process before the exec, it is\nserialized and written to the errpipe_write fd per subprocess.py.\n\nReturns: the child process's PID.\n\nRaises: Only on an error in the parent process.", + "_posixsubprocess.fork_exec" => "Spawn a fresh new child process.\n\nFork a child process, close parent file descriptors as appropriate in\nthe child and duplicate the few that are needed before calling exec() in\nthe child process.\n\nIf close_fds is True, close file descriptors 3 and higher, except those\nlisted in the sorted tuple pass_fds.\n\nThe preexec_fn, if supplied, will be called immediately before closing\nfile descriptors and exec.\n\nWARNING: preexec_fn is NOT SAFE if your application uses threads.\n It may trigger infrequent, difficult to debug deadlocks.\n\nIf an error occurs in the child process before the exec, it is\nserialized and written to the errpipe_write fd per subprocess.py.\n\nReturns: the child process's PID.\n\nRaises: Only on an error in the parent process.", "_queue" => "C implementation of the Python queue module.\nThis module is an implementation detail, please do not use it directly.", "_queue.Empty" => "Exception raised by Queue.get(block=0)/get_nowait().", "_queue.Empty.__delattr__" => "Implement delattr(self, name).", @@ -6795,7 +6795,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_queue.Empty.add_note" => "Add a note to the exception", "_queue.Empty.with_traceback" => "Set self.__traceback__ to tb and return self.", "_queue.SimpleQueue" => "Simple, unbounded, reentrant FIFO queue.", - "_queue.SimpleQueue.__class_getitem__" => "See PEP 585", + "_queue.SimpleQueue.__class_getitem__" => "SimpleQueues are generic over the type of their contents", "_queue.SimpleQueue.__delattr__" => "Implement delattr(self, name).", "_queue.SimpleQueue.__eq__" => "Return self==value.", "_queue.SimpleQueue.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", @@ -6818,9 +6818,9 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_queue.SimpleQueue.__str__" => "Return str(self).", "_queue.SimpleQueue.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "_queue.SimpleQueue.empty" => "Return True if the queue is empty, False otherwise (not reliable!).", - "_queue.SimpleQueue.get" => "Remove and return an item from the queue.\n\nIf optional args 'block' is true and 'timeout' is None (the default),\nblock if necessary until an item is available. If 'timeout' is\na non-negative number, it blocks at most 'timeout' seconds and raises\nthe Empty exception if no item was available within that time.\nOtherwise ('block' is false), return an item if one is immediately\navailable, else raise the Empty exception ('timeout' is ignored\nin that case).", + "_queue.SimpleQueue.get" => "Remove and return an item from the queue.\n\nIf optional args 'block' is true and 'timeout' is None (the\ndefault), block if necessary until an item is available. If\n'timeout' is a non-negative number, it blocks at most 'timeout'\nseconds and raises the Empty exception if no item was available\nwithin that time.\nOtherwise ('block' is false), return an item if one is immediately\navailable, else raise the Empty exception ('timeout' is ignored\nin that case).", "_queue.SimpleQueue.get_nowait" => "Remove and return an item from the queue without blocking.\n\nOnly get an item if one is immediately available. Otherwise\nraise the Empty exception.", - "_queue.SimpleQueue.put" => "Put the item on the queue.\n\nThe optional 'block' and 'timeout' arguments are ignored, as this method\nnever blocks. They are provided for compatibility with the Queue class.", + "_queue.SimpleQueue.put" => "Put the item on the queue.\n\nThe optional 'block' and 'timeout' arguments are ignored, as this\nmethod never blocks. They are provided for compatibility with the\nQueue class.", "_queue.SimpleQueue.put_nowait" => "Put an item into the queue without blocking.\n\nThis is exactly equivalent to `put(item)` and is only provided\nfor compatibility with the Queue class.", "_queue.SimpleQueue.qsize" => "Return the approximate size of the queue (not reliable!).", "_random" => "Module implements the Mersenne Twister random number generator.", @@ -6853,7 +6853,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_random.Random.setstate" => "setstate(state) -> None. Restores generator state.", "_remote_debugging.AwaitedInfo" => "Information about what a thread is awaiting", "_remote_debugging.AwaitedInfo.__add__" => "Return self+value.", - "_remote_debugging.AwaitedInfo.__class_getitem__" => "See PEP 585", + "_remote_debugging.AwaitedInfo.__class_getitem__" => "Tuples are generic over the types of their contents.\n\nFor example, use ``tuple[int, str]`` for a pair whose first element is an int and second element is a string.\n\nTuples also support the form ``tuple[T, ...]`` to indicate an arbitrary length tuple of elements of type T.", "_remote_debugging.AwaitedInfo.__contains__" => "Return bool(key in self).", "_remote_debugging.AwaitedInfo.__delattr__" => "Implement delattr(self, name).", "_remote_debugging.AwaitedInfo.__eq__" => "Return self==value.", @@ -6887,7 +6887,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_remote_debugging.AwaitedInfo.thread_id" => "Thread ID", "_remote_debugging.CoroInfo" => "Information about a coroutine", "_remote_debugging.CoroInfo.__add__" => "Return self+value.", - "_remote_debugging.CoroInfo.__class_getitem__" => "See PEP 585", + "_remote_debugging.CoroInfo.__class_getitem__" => "Tuples are generic over the types of their contents.\n\nFor example, use ``tuple[int, str]`` for a pair whose first element is an int and second element is a string.\n\nTuples also support the form ``tuple[T, ...]`` to indicate an arbitrary length tuple of elements of type T.", "_remote_debugging.CoroInfo.__contains__" => "Return bool(key in self).", "_remote_debugging.CoroInfo.__delattr__" => "Implement delattr(self, name).", "_remote_debugging.CoroInfo.__eq__" => "Return self==value.", @@ -6921,7 +6921,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_remote_debugging.CoroInfo.task_name" => "Task name", "_remote_debugging.FrameInfo" => "Information about a frame", "_remote_debugging.FrameInfo.__add__" => "Return self+value.", - "_remote_debugging.FrameInfo.__class_getitem__" => "See PEP 585", + "_remote_debugging.FrameInfo.__class_getitem__" => "Tuples are generic over the types of their contents.\n\nFor example, use ``tuple[int, str]`` for a pair whose first element is an int and second element is a string.\n\nTuples also support the form ``tuple[T, ...]`` to indicate an arbitrary length tuple of elements of type T.", "_remote_debugging.FrameInfo.__contains__" => "Return bool(key in self).", "_remote_debugging.FrameInfo.__delattr__" => "Implement delattr(self, name).", "_remote_debugging.FrameInfo.__eq__" => "Return self==value.", @@ -6981,7 +6981,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_remote_debugging.RemoteUnwinder.get_stack_trace" => "Returns a list of stack traces for threads in the target process.\n\nEach element in the returned list is a tuple of (thread_id, frame_list), where:\n- thread_id is the OS thread identifier\n- frame_list is a list of tuples (function_name, filename, line_number) representing\n the Python stack frames for that thread, ordered from most recent to oldest\n\nThe threads returned depend on the initialization parameters:\n- If only_active_thread was True: returns only the thread holding the GIL\n- If all_threads was True: returns all threads\n- Otherwise: returns only the main thread\n\nExample:\n [\n (1234, [\n ('process_data', 'worker.py', 127),\n ('run_worker', 'worker.py', 45),\n ('main', 'app.py', 23)\n ]),\n (1235, [\n ('handle_request', 'server.py', 89),\n ('serve_forever', 'server.py', 52)\n ])\n ]\n\nRaises:\n RuntimeError: If there is an error copying memory from the target process\n OSError: If there is an error accessing the target process\n PermissionError: If access to the target process is denied\n UnicodeDecodeError: If there is an error decoding strings from the target process", "_remote_debugging.TaskInfo" => "Information about an asyncio task", "_remote_debugging.TaskInfo.__add__" => "Return self+value.", - "_remote_debugging.TaskInfo.__class_getitem__" => "See PEP 585", + "_remote_debugging.TaskInfo.__class_getitem__" => "Tuples are generic over the types of their contents.\n\nFor example, use ``tuple[int, str]`` for a pair whose first element is an int and second element is a string.\n\nTuples also support the form ``tuple[T, ...]`` to indicate an arbitrary length tuple of elements of type T.", "_remote_debugging.TaskInfo.__contains__" => "Return bool(key in self).", "_remote_debugging.TaskInfo.__delattr__" => "Implement delattr(self, name).", "_remote_debugging.TaskInfo.__eq__" => "Return self==value.", @@ -7017,7 +7017,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_remote_debugging.TaskInfo.task_name" => "Task name", "_remote_debugging.ThreadInfo" => "Information about a thread", "_remote_debugging.ThreadInfo.__add__" => "Return self+value.", - "_remote_debugging.ThreadInfo.__class_getitem__" => "See PEP 585", + "_remote_debugging.ThreadInfo.__class_getitem__" => "Tuples are generic over the types of their contents.\n\nFor example, use ``tuple[int, str]`` for a pair whose first element is an int and second element is a string.\n\nTuples also support the form ``tuple[T, ...]`` to indicate an arbitrary length tuple of elements of type T.", "_remote_debugging.ThreadInfo.__contains__" => "Return bool(key in self).", "_remote_debugging.ThreadInfo.__delattr__" => "Implement delattr(self, name).", "_remote_debugging.ThreadInfo.__eq__" => "Return self==value.", @@ -7373,17 +7373,17 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_signal.pthread_sigmask" => "Fetch and/or change the signal mask of the calling thread.", "_signal.raise_signal" => "Send a signal to the executing process.", "_signal.set_wakeup_fd" => "Sets the fd to be written to (with the signal number) when a signal comes in.\n\nA library can use this to wakeup select or poll.\nThe previous fd or -1 is returned.\n\nThe fd must be non-blocking.", - "_signal.setitimer" => "Sets given itimer (one of ITIMER_REAL, ITIMER_VIRTUAL or ITIMER_PROF).\n\nThe timer will fire after value seconds and after that every interval seconds.\nThe itimer can be cleared by setting seconds to zero.\n\nReturns old values as a tuple: (delay, interval).", + "_signal.setitimer" => "Sets given itimer (one of ITIMER_REAL, ITIMER_VIRTUAL or ITIMER_PROF).\n\nThe timer will fire after value seconds and after that every interval\nseconds. The itimer can be cleared by setting seconds to zero.\n\nReturns old values as a tuple: (delay, interval).", "_signal.siginterrupt" => "Change system call restart behaviour.\n\nIf flag is False, system calls will be restarted when interrupted by\nsignal sig, else system calls will be interrupted.", - "_signal.signal" => "Set the action for the given signal.\n\nThe action can be SIG_DFL, SIG_IGN, or a callable Python object.\nThe previous action is returned. See getsignal() for possible return values.\n\n*** IMPORTANT NOTICE ***\nA signal handler function is called with two arguments:\nthe first is the signal number, the second is the interrupted stack frame.", + "_signal.signal" => "Set the action for the given signal.\n\nThe action can be SIG_DFL, SIG_IGN, or a callable Python object.\nThe previous action is returned. See getsignal() for possible return\nvalues.\n\n*** IMPORTANT NOTICE ***\nA signal handler function is called with two arguments: the first is\nthe signal number, the second is the interrupted stack frame.", "_signal.sigpending" => "Examine pending signals.\n\nReturns a set of signal numbers that are pending for delivery to\nthe calling thread.", "_signal.sigtimedwait" => "Like sigwaitinfo(), but with a timeout.\n\nThe timeout is specified in seconds, with floating-point numbers allowed.", - "_signal.sigwait" => "Wait for a signal.\n\nSuspend execution of the calling thread until the delivery of one of the\nsignals specified in the signal set sigset. The function accepts the signal\nand returns the signal number.", + "_signal.sigwait" => "Wait for a signal.\n\nSuspend execution of the calling thread until the delivery of one of the\nsignals specified in the signal set sigset. The function accepts the\nsignal and returns the signal number.", "_signal.sigwaitinfo" => "Wait synchronously until one of the signals in *sigset* is delivered.\n\nReturns a struct_siginfo containing information about the signal.", "_signal.strsignal" => "Return the system description of the given signal.\n\nReturns the description of signal *signalnum*, such as \"Interrupt\"\nfor :const:`SIGINT`. Returns :const:`None` if *signalnum* has no\ndescription. Raises :exc:`ValueError` if *signalnum* is invalid.", "_signal.struct_siginfo" => "struct_siginfo: Result from sigwaitinfo or sigtimedwait.\n\nThis object may be accessed either as a tuple of\n(si_signo, si_code, si_errno, si_pid, si_uid, si_status, si_band),\nor via the attributes si_signo, si_code, and so on.", "_signal.struct_siginfo.__add__" => "Return self+value.", - "_signal.struct_siginfo.__class_getitem__" => "See PEP 585", + "_signal.struct_siginfo.__class_getitem__" => "Tuples are generic over the types of their contents.\n\nFor example, use ``tuple[int, str]`` for a pair whose first element is an int and second element is a string.\n\nTuples also support the form ``tuple[T, ...]`` to indicate an arbitrary length tuple of elements of type T.", "_signal.struct_siginfo.__contains__" => "Return bool(key in self).", "_signal.struct_siginfo.__delattr__" => "Implement delattr(self, name).", "_signal.struct_siginfo.__eq__" => "Return self==value.", @@ -7648,17 +7648,17 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_sqlite3.Blob.__str__" => "Return str(self).", "_sqlite3.Blob.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "_sqlite3.Blob.close" => "Close the blob.", - "_sqlite3.Blob.read" => "Read data at the current offset position.\n\n length\n Read length in bytes.\n\nIf the end of the blob is reached, the data up to end of file will be returned.\nWhen length is not specified, or is negative, Blob.read() will read until the\nend of the blob.", - "_sqlite3.Blob.seek" => "Set the current access position to offset.\n\nThe origin argument defaults to os.SEEK_SET (absolute blob positioning).\nOther values for origin are os.SEEK_CUR (seek relative to the current position)\nand os.SEEK_END (seek relative to the blob's end).", + "_sqlite3.Blob.read" => "Read data at the current offset position.\n\n length\n Read length in bytes.\n\nIf the end of the blob is reached, the data up to end of file will\nbe returned. When length is not specified, or is negative,\nBlob.read() will read until the end of the blob.", + "_sqlite3.Blob.seek" => "Set the current access position to offset.\n\nThe origin argument defaults to os.SEEK_SET (absolute blob\npositioning). Other values for origin are os.SEEK_CUR (seek\nrelative to the current position) and os.SEEK_END (seek relative to\nthe blob's end).", "_sqlite3.Blob.tell" => "Return the current access position for the blob.", - "_sqlite3.Blob.write" => "Write data at the current offset.\n\nThis function cannot change the blob length. Writing beyond the end of the\nblob will result in an exception being raised.", + "_sqlite3.Blob.write" => "Write data at the current offset.\n\nThis function cannot change the blob length. Writing beyond the end\nof the blob will result in an exception being raised.", "_sqlite3.Connection" => "SQLite database connection object.", "_sqlite3.Connection.__call__" => "Call self as a function.", "_sqlite3.Connection.__del__" => "Called when the instance is about to be destroyed.", "_sqlite3.Connection.__delattr__" => "Implement delattr(self, name).", "_sqlite3.Connection.__enter__" => "Called when the connection is used as a context manager.\n\nReturns itself as a convenience to the caller.", "_sqlite3.Connection.__eq__" => "Return self==value.", - "_sqlite3.Connection.__exit__" => "Called when the connection is used as a context manager.\n\nIf there was any exception, a rollback takes place; otherwise we commit.", + "_sqlite3.Connection.__exit__" => "Called when the connection is used as a context manager.\n\nIf there was any exception, a rollback takes place; otherwise we\ncommit.", "_sqlite3.Connection.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", "_sqlite3.Connection.__ge__" => "Return self>=value.", "_sqlite3.Connection.__getattribute__" => "Return getattr(self, name).", @@ -7687,7 +7687,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_sqlite3.Connection.create_function" => "Creates a new function.\n\nNote: Passing keyword arguments 'name', 'narg' and 'func' to\n_sqlite3.Connection.create_function() is deprecated. Parameters\n'name', 'narg' and 'func' will become positional-only in Python 3.15.", "_sqlite3.Connection.create_window_function" => "Creates or redefines an aggregate window function. Non-standard.\n\n name\n The name of the SQL aggregate window function to be created or\n redefined.\n num_params\n The number of arguments the step and inverse methods takes.\n aggregate_class\n A class with step(), finalize(), value(), and inverse() methods.\n Set to None to clear the window function.", "_sqlite3.Connection.cursor" => "Return a cursor for the connection.", - "_sqlite3.Connection.deserialize" => "Load a serialized database.\n\n data\n The serialized database content.\n name\n Which database to reopen with the deserialization.\n\nThe deserialize interface causes the database connection to disconnect from the\ntarget database, and then reopen it as an in-memory database based on the given\nserialized data.\n\nThe deserialize interface will fail with SQLITE_BUSY if the database is\ncurrently in a read transaction or is involved in a backup operation.", + "_sqlite3.Connection.deserialize" => "Load a serialized database.\n\n data\n The serialized database content.\n name\n Which database to reopen with the deserialization.\n\nThe deserialize interface causes the database connection to\ndisconnect from the target database, and then reopen it as\nan in-memory database based on the given serialized data.\n\nThe deserialize interface will fail with SQLITE_BUSY if the database\nis currently in a read transaction or is involved in a backup\noperation.", "_sqlite3.Connection.enable_load_extension" => "Enable dynamic loading of SQLite extension modules.", "_sqlite3.Connection.execute" => "Executes an SQL statement.", "_sqlite3.Connection.executemany" => "Repeatedly executes an SQL statement.", @@ -7698,12 +7698,12 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_sqlite3.Connection.iterdump" => "Returns iterator to the dump of the database in an SQL text format.\n\n filter\n An optional LIKE pattern for database objects to dump", "_sqlite3.Connection.load_extension" => "Load SQLite extension module.", "_sqlite3.Connection.rollback" => "Roll back to the start of any pending transaction.\n\nIf there is no open transaction, this method is a no-op.", - "_sqlite3.Connection.serialize" => "Serialize a database into a byte string.\n\n name\n Which database to serialize.\n\nFor an ordinary on-disk database file, the serialization is just a copy of the\ndisk file. For an in-memory database or a \"temp\" database, the serialization is\nthe same sequence of bytes which would be written to disk if that database\nwere backed up to disk.", + "_sqlite3.Connection.serialize" => "Serialize a database into a byte string.\n\n name\n Which database to serialize.\n\nFor an ordinary on-disk database file, the serialization is just\na copy of the disk file. For an in-memory database or a \"temp\"\ndatabase, the serialization is the same sequence of bytes which\nwould be written to disk if that database were backed up to disk.", "_sqlite3.Connection.set_authorizer" => "Set authorizer callback.\n\nNote: Passing keyword argument 'authorizer_callback' to\n_sqlite3.Connection.set_authorizer() is deprecated. Parameter\n'authorizer_callback' will become positional-only in Python 3.15.", - "_sqlite3.Connection.set_progress_handler" => "Set progress handler callback.\n\n progress_handler\n A callable that takes no arguments.\n If the callable returns non-zero, the current query is terminated,\n and an exception is raised.\n n\n The number of SQLite virtual machine instructions that are\n executed between invocations of 'progress_handler'.\n\nIf 'progress_handler' is None or 'n' is 0, the progress handler is disabled.\n\nNote: Passing keyword argument 'progress_handler' to\n_sqlite3.Connection.set_progress_handler() is deprecated. Parameter\n'progress_handler' will become positional-only in Python 3.15.", + "_sqlite3.Connection.set_progress_handler" => "Set progress handler callback.\n\n progress_handler\n A callable that takes no arguments.\n If the callable returns non-zero, the current query is\n terminated, and an exception is raised.\n n\n The number of SQLite virtual machine instructions that are\n executed between invocations of 'progress_handler'.\n\nIf 'progress_handler' is None or 'n' is 0, the progress handler is\ndisabled.\n\nNote: Passing keyword argument 'progress_handler' to\n_sqlite3.Connection.set_progress_handler() is deprecated. Parameter\n'progress_handler' will become positional-only in Python 3.15.", "_sqlite3.Connection.set_trace_callback" => "Set a trace callback called for each SQL statement (passed as unicode).\n\nNote: Passing keyword argument 'trace_callback' to\n_sqlite3.Connection.set_trace_callback() is deprecated. Parameter\n'trace_callback' will become positional-only in Python 3.15.", "_sqlite3.Connection.setconfig" => "Set a boolean connection configuration option.\n\n op\n The configuration verb; one of the sqlite3.SQLITE_DBCONFIG codes.", - "_sqlite3.Connection.setlimit" => "Set connection run-time limits.\n\n category\n The limit category to be set.\n limit\n The new limit. If the new limit is a negative number, the limit is\n unchanged.\n\nAttempts to increase a limit above its hard upper bound are silently truncated\nto the hard upper bound. Regardless of whether or not the limit was changed,\nthe prior value of the limit is returned.", + "_sqlite3.Connection.setlimit" => "Set connection run-time limits.\n\n category\n The limit category to be set.\n limit\n The new limit. If the new limit is a negative number, the limit\n is unchanged.\n\nAttempts to increase a limit above its hard upper bound are silently\ntruncated to the hard upper bound. Regardless of whether or not the\nlimit was changed, the prior value of the limit is returned.", "_sqlite3.Cursor" => "SQLite database cursor class.", "_sqlite3.Cursor.__delattr__" => "Implement delattr(self, name).", "_sqlite3.Cursor.__eq__" => "Return self==value.", @@ -8071,7 +8071,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_ssl.MemoryBIO.write_eof" => "Write an EOF marker to the memory BIO.\n\nWhen all data has been read, the \"eof\" property will be True.", "_ssl.RAND_add" => "Mix string into the OpenSSL PRNG state.\n\nentropy (a float) is a lower bound on the entropy contained in\nstring. See RFC 4086.", "_ssl.RAND_bytes" => "Generate n cryptographically strong pseudo-random bytes.", - "_ssl.RAND_status" => "Returns True if the OpenSSL PRNG has been seeded with enough data and False if not.\n\nIt is necessary to seed the PRNG with RAND_add() on some platforms before\nusing the ssl() function.", + "_ssl.RAND_status" => "Returns True if the OpenSSL PRNG has been seeded with enough data and False if not.\n\nIt is necessary to seed the PRNG with RAND_add() on some platforms\nbefore using the ssl() function.", "_ssl.SSLCertVerificationError" => "A certificate could not be verified.", "_ssl.SSLCertVerificationError.__delattr__" => "Implement delattr(self, name).", "_ssl.SSLCertVerificationError.__eq__" => "Return self==value.", @@ -8320,11 +8320,11 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_ssl._SSLContext.__sizeof__" => "Size of object in memory, in bytes.", "_ssl._SSLContext.__str__" => "Return str(self).", "_ssl._SSLContext.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", - "_ssl._SSLContext.cert_store_stats" => "Returns quantities of loaded X.509 certificates.\n\nX.509 certificates with a CA extension and certificate revocation lists\ninside the context's cert store.\n\nNOTE: Certificates in a capath directory aren't loaded unless they have\nbeen used at least once.", - "_ssl._SSLContext.get_ca_certs" => "Returns a list of dicts with information of loaded CA certs.\n\nIf the optional argument is True, returns a DER-encoded copy of the CA\ncertificate.\n\nNOTE: Certificates in a capath directory aren't loaded unless they have\nbeen used at least once.", + "_ssl._SSLContext.cert_store_stats" => "Returns quantities of loaded X.509 certificates.\n\nX.509 certificates with a CA extension and certificate revocation\nlists inside the context's cert store.\n\nNOTE: Certificates in a capath directory aren't loaded unless they\nhave been used at least once.", + "_ssl._SSLContext.get_ca_certs" => "Returns a list of dicts with information of loaded CA certs.\n\nIf the optional argument is True, returns a DER-encoded copy of the\nCA certificate.\n\nNOTE: Certificates in a capath directory aren't loaded unless they\nhave been used at least once.", "_ssl._SSLContext.num_tickets" => "Control the number of TLSv1.3 session tickets.", "_ssl._SSLContext.security_level" => "The current security level.", - "_ssl._SSLContext.sni_callback" => "Set a callback that will be called when a server name is provided by the SSL/TLS client in the SNI extension.\n\nIf the argument is None then the callback is disabled. The method is called\nwith the SSLSocket, the server name as a string, and the SSLContext object.\n\nSee RFC 6066 for details of the SNI extension.", + "_ssl._SSLContext.sni_callback" => "Set a callback that will be called when a server name is provided by the SSL/TLS client in the SNI extension.\n\nIf the argument is None then the callback is disabled. The method\nis called with the SSLSocket, the server name as a string, and the\nSSLContext object.\n\nSee RFC 6066 for details of the SNI extension.", "_ssl._SSLSocket.__delattr__" => "Implement delattr(self, name).", "_ssl._SSLSocket.__eq__" => "Return self==value.", "_ssl._SSLSocket.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", @@ -8346,8 +8346,8 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_ssl._SSLSocket.__sizeof__" => "Size of object in memory, in bytes.", "_ssl._SSLSocket.__str__" => "Return str(self).", "_ssl._SSLSocket.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", - "_ssl._SSLSocket.context" => "This changes the context associated with the SSLSocket.\n\nThis is typically used from within a callback function set by the sni_callback\non the SSLContext to change the certificate information associated with the\nSSLSocket before the cryptographic exchange handshake messages.", - "_ssl._SSLSocket.get_channel_binding" => "Get channel binding data for current connection.\n\nRaise ValueError if the requested `cb_type` is not supported. Return bytes\nof the data or None if the data is not available (e.g. before the handshake).\nOnly 'tls-unique' channel binding data from RFC 5929 is supported.", + "_ssl._SSLSocket.context" => "This changes the context associated with the SSLSocket.\n\nThis is typically used from within a callback function set by the\nsni_callback on the SSLContext to change the certificate information\nassociated with the SSLSocket before the cryptographic exchange\nhandshake messages.", + "_ssl._SSLSocket.get_channel_binding" => "Get channel binding data for current connection.\n\nRaise ValueError if the requested `cb_type` is not supported.\nReturn bytes of the data or None if the data is not available (e.g.\nbefore the handshake).\nOnly 'tls-unique' channel binding data from RFC 5929 is supported.", "_ssl._SSLSocket.getpeercert" => "Returns the certificate for the peer.\n\nIf no certificate was provided, returns None. If a certificate was\nprovided, but not validated, returns an empty dictionary. Otherwise\nreturns a dict containing information about the peer certificate.\n\nIf the optional argument is True, returns a DER-encoded copy of the\npeer certificate, or None if no certificate was provided. This will\nreturn the certificate even if it wasn't validated.", "_ssl._SSLSocket.owner" => "The Python-level owner of this object.\n\nPassed as \"self\" in servername callback.", "_ssl._SSLSocket.pending" => "Returns the number of already decrypted bytes available for read, pending on the connection.", @@ -8359,7 +8359,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_ssl._SSLSocket.shutdown" => "Does the SSL shutdown handshake with the remote end.", "_ssl._SSLSocket.verify_client_post_handshake" => "Initiate TLS 1.3 post-handshake authentication", "_ssl._SSLSocket.write" => "Writes the bytes-like object b into the SSL object.\n\nReturns the number of bytes written.", - "_ssl.enum_certificates" => "Retrieve certificates from Windows' cert store.\n\nstore_name may be one of 'CA', 'ROOT' or 'MY'. The system may provide\nmore cert storages, too. The function returns a list of (bytes,\nencoding_type, trust) tuples. The encoding_type flag can be interpreted\nwith X509_ASN_ENCODING or PKCS_7_ASN_ENCODING. The trust setting is either\na set of OIDs or the boolean True.", + "_ssl.enum_certificates" => "Retrieve certificates from Windows' cert store.\n\nstore_name may be one of 'CA', 'ROOT' or 'MY'. The system may\nprovide more cert storages, too. The function returns a list of\n(bytes, encoding_type, trust) tuples. The encoding_type flag can be\ninterpreted with X509_ASN_ENCODING or PKCS_7_ASN_ENCODING. The\ntrust setting is either a set of OIDs or the boolean True.", "_ssl.enum_crls" => "Retrieve CRLs from Windows' cert store.\n\nstore_name may be one of 'CA', 'ROOT' or 'MY'. The system may provide\nmore cert storages, too. The function returns a list of (bytes,\nencoding_type) tuples. The encoding_type flag can be interpreted with\nX509_ASN_ENCODING or PKCS_7_ASN_ENCODING.", "_ssl.get_default_verify_paths" => "Return search paths and environment vars that are used by SSLContext's set_default_verify_paths() to load default CAs.\n\nThe values are 'cert_file_env', 'cert_file', 'cert_dir_env', 'cert_dir'.", "_ssl.nid2obj" => "Lookup NID, short name, long name and OID of an ASN1_OBJECT by NID.", @@ -8509,7 +8509,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_thread.RLock.release" => "Release the lock, allowing another thread that is blocked waiting for\nthe lock to acquire the lock. The lock must be in the locked state,\nand must be locked by the same thread that unlocks it; otherwise a\n`RuntimeError` is raised.\n\nDo note that if the lock was acquire()d several times in a row by the\ncurrent thread, release() needs to be called as many times for the lock\nto be available for other threads.", "_thread._ExceptHookArgs" => "ExceptHookArgs\n\nType used to pass arguments to threading.excepthook.", "_thread._ExceptHookArgs.__add__" => "Return self+value.", - "_thread._ExceptHookArgs.__class_getitem__" => "See PEP 585", + "_thread._ExceptHookArgs.__class_getitem__" => "Tuples are generic over the types of their contents.\n\nFor example, use ``tuple[int, str]`` for a pair whose first element is an int and second element is a string.\n\nTuples also support the form ``tuple[T, ...]`` to indicate an arbitrary length tuple of elements of type T.", "_thread._ExceptHookArgs.__contains__" => "Return bool(key in self).", "_thread._ExceptHookArgs.__delattr__" => "Implement delattr(self, name).", "_thread._ExceptHookArgs.__eq__" => "Return self==value.", @@ -8727,7 +8727,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_tkinter.TkttType.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "_tkinter.create" => "wantTk\n if false, then Tk_Init() doesn't get called\n sync\n if true, then pass -sync to wish\n use\n if not None, then pass -use to wish", "_tkinter.getbusywaitinterval" => "Return the current busy-wait interval between successive calls to Tcl_DoOneEvent in a threaded Python interpreter.", - "_tkinter.setbusywaitinterval" => "Set the busy-wait interval in milliseconds between successive calls to Tcl_DoOneEvent in a threaded Python interpreter.\n\nIt should be set to a divisor of the maximum time between frames in an animation.", + "_tkinter.setbusywaitinterval" => "Set the busy-wait interval in milliseconds between successive calls to Tcl_DoOneEvent in a threaded Python interpreter.\n\nIt should be set to a divisor of the maximum time between frames in\nan animation.", "_tokenize.TokenizerIter.__delattr__" => "Implement delattr(self, name).", "_tokenize.TokenizerIter.__eq__" => "Return self==value.", "_tokenize.TokenizerIter.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", @@ -9021,7 +9021,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_typing.TypeVarTuple.__str__" => "Return str(self).", "_typing.TypeVarTuple.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "_typing.Union" => "Represent a union type\n\nE.g. for int | str", - "_typing.Union.__class_getitem__" => "See PEP 585", + "_typing.Union.__class_getitem__" => "Create a union containing the given types", "_typing.Union.__delattr__" => "Implement delattr(self, name).", "_typing.Union.__eq__" => "Return self==value.", "_typing.Union.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", @@ -9206,7 +9206,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_weakref.ProxyType.__truediv__" => "Return self/value.", "_weakref.ProxyType.__xor__" => "Return self^value.", "_weakref.ReferenceType.__call__" => "Call self as a function.", - "_weakref.ReferenceType.__class_getitem__" => "See PEP 585", + "_weakref.ReferenceType.__class_getitem__" => "Weakrefs are generic over the type of the referenced object.", "_weakref.ReferenceType.__delattr__" => "Implement delattr(self, name).", "_weakref.ReferenceType.__eq__" => "Return self==value.", "_weakref.ReferenceType.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", @@ -9233,7 +9233,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_weakref.getweakrefs" => "Return a list of all weak reference objects pointing to 'object'.", "_weakref.proxy" => "Create a proxy object that weakly references 'object'.\n\n'callback', if given, is called with a reference to the\nproxy when 'object' is about to be finalized.", "_weakref.ref.__call__" => "Call self as a function.", - "_weakref.ref.__class_getitem__" => "See PEP 585", + "_weakref.ref.__class_getitem__" => "Weakrefs are generic over the type of the referenced object.", "_weakref.ref.__delattr__" => "Implement delattr(self, name).", "_weakref.ref.__eq__" => "Return self==value.", "_weakref.ref.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", @@ -9295,7 +9295,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_winapi.TerminateProcess" => "Terminate the specified process and all of its threads.", "_winapi.WaitForSingleObject" => "Wait for a single object.\n\nWait until the specified object is in the signaled state or\nthe time-out interval elapses. The timeout value is specified\nin milliseconds.", "_winapi._mimetypes_read_windows_registry" => "Optimized function for reading all known MIME types from the registry.\n\n*on_type_read* is a callable taking *type* and *ext* arguments, as for\nMimeTypes.add_type.", - "_wmi.exec_query" => "Runs a WMI query against the local machine.\n\nThis returns a single string with 'name=value' pairs in a flat array separated\nby null characters.", + "_wmi.exec_query" => "Runs a WMI query against the local machine.\n\nThis returns a single string with 'name=value' pairs in a flat array\nseparated by null characters.", "_zoneinfo" => "C implementation of the zoneinfo module", "_zoneinfo.ZoneInfo.__delattr__" => "Implement delattr(self, name).", "_zoneinfo.ZoneInfo.__eq__" => "Return self==value.", @@ -9323,7 +9323,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_zoneinfo.ZoneInfo.tzname" => "Retrieve a string containing the abbreviation for the time zone that applies in a zone at a given datetime.", "_zoneinfo.ZoneInfo.utcoffset" => "Retrieve a timedelta representing the UTC offset in a zone at the given datetime.", "_zstd" => "Implementation module for Zstandard compression.", - "_zstd.ZstdCompressor" => "Create a compressor object for compressing data incrementally.\n\n level\n The compression level to use. Defaults to COMPRESSION_LEVEL_DEFAULT.\n options\n A dict object that contains advanced compression parameters.\n zstd_dict\n A ZstdDict object, a pre-trained Zstandard dictionary.\n\nThread-safe at method level. For one-shot compression, use the compress()\nfunction instead.", + "_zstd.ZstdCompressor" => "Create a compressor object for compressing data incrementally.\n\n level\n The compression level to use. Defaults to COMPRESSION_LEVEL_DEFAULT.\n options\n A dict object that contains advanced compression parameters.\n zstd_dict\n A ZstdDict object, a pre-trained Zstandard dictionary.\n\nThread-safe at method level. For one-shot compression, use the\ncompress() function instead.", "_zstd.ZstdCompressor.__delattr__" => "Implement delattr(self, name).", "_zstd.ZstdCompressor.__eq__" => "Return self==value.", "_zstd.ZstdCompressor.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", @@ -9345,11 +9345,11 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_zstd.ZstdCompressor.__sizeof__" => "Size of object in memory, in bytes.", "_zstd.ZstdCompressor.__str__" => "Return str(self).", "_zstd.ZstdCompressor.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", - "_zstd.ZstdCompressor.compress" => "Provide data to the compressor object.\n\n mode\n Can be these 3 values ZstdCompressor.CONTINUE,\n ZstdCompressor.FLUSH_BLOCK, ZstdCompressor.FLUSH_FRAME\n\nReturn a chunk of compressed data if possible, or b'' otherwise. When you have\nfinished providing data to the compressor, call the flush() method to finish\nthe compression process.", - "_zstd.ZstdCompressor.flush" => "Finish the compression process.\n\n mode\n Can be these 2 values ZstdCompressor.FLUSH_FRAME,\n ZstdCompressor.FLUSH_BLOCK\n\nFlush any remaining data left in internal buffers. Since Zstandard data\nconsists of one or more independent frames, the compressor object can still\nbe used after this method is called.", + "_zstd.ZstdCompressor.compress" => "Provide data to the compressor object.\n\n mode\n Can be these 3 values ZstdCompressor.CONTINUE,\n ZstdCompressor.FLUSH_BLOCK, ZstdCompressor.FLUSH_FRAME\n\nReturn a chunk of compressed data if possible, or b'' otherwise.\nWhen you have finished providing data to the compressor, call the\nflush() method to finish the compression process.", + "_zstd.ZstdCompressor.flush" => "Finish the compression process.\n\n mode\n Can be these 2 values ZstdCompressor.FLUSH_FRAME,\n ZstdCompressor.FLUSH_BLOCK\n\nFlush any remaining data left in internal buffers. Since Zstandard\ndata consists of one or more independent frames, the compressor\nobject can still be used after this method is called.", "_zstd.ZstdCompressor.last_mode" => "The last mode used to this compressor object, its value can be .CONTINUE,\n.FLUSH_BLOCK, .FLUSH_FRAME. Initialized to .FLUSH_FRAME.\n\nIt can be used to get the current state of a compressor, such as, data\nflushed, or a frame ended.", - "_zstd.ZstdCompressor.set_pledged_input_size" => "Set the uncompressed content size to be written into the frame header.\n\n size\n The size of the uncompressed data to be provided to the compressor.\n\nThis method can be used to ensure the header of the frame about to be written\nincludes the size of the data, unless the CompressionParameter.content_size_flag\nis set to False. If last_mode != FLUSH_FRAME, then a RuntimeError is raised.\n\nIt is important to ensure that the pledged data size matches the actual data\nsize. If they do not match the compressed output data may be corrupted and the\nfinal chunk written may be lost.", - "_zstd.ZstdDecompressor" => "Create a decompressor object for decompressing data incrementally.\n\n zstd_dict\n A ZstdDict object, a pre-trained Zstandard dictionary.\n options\n A dict object that contains advanced decompression parameters.\n\nThread-safe at method level. For one-shot decompression, use the decompress()\nfunction instead.", + "_zstd.ZstdCompressor.set_pledged_input_size" => "Set the uncompressed content size to be written into the frame header.\n\n size\n The size of the uncompressed data to be provided to the compressor.\n\nThis method can be used to ensure the header of the frame about to\nbe written includes the size of the data, unless the\nCompressionParameter.content_size_flag is set to False.\nIf last_mode != FLUSH_FRAME, then a RuntimeError is raised.\n\nIt is important to ensure that the pledged data size matches the\nactual data size. If they do not match the compressed output data\nmay be corrupted and the final chunk written may be lost.", + "_zstd.ZstdDecompressor" => "Create a decompressor object for decompressing data incrementally.\n\n zstd_dict\n A ZstdDict object, a pre-trained Zstandard dictionary.\n options\n A dict object that contains advanced decompression parameters.\n\nThread-safe at method level. For one-shot decompression, use the\ndecompress() function instead.", "_zstd.ZstdDecompressor.__delattr__" => "Implement delattr(self, name).", "_zstd.ZstdDecompressor.__eq__" => "Return self==value.", "_zstd.ZstdDecompressor.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", @@ -9371,11 +9371,11 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_zstd.ZstdDecompressor.__sizeof__" => "Size of object in memory, in bytes.", "_zstd.ZstdDecompressor.__str__" => "Return str(self).", "_zstd.ZstdDecompressor.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", - "_zstd.ZstdDecompressor.decompress" => "Decompress *data*, returning uncompressed bytes if possible, or b'' otherwise.\n\n data\n A bytes-like object, Zstandard data to be decompressed.\n max_length\n Maximum size of returned data. When it is negative, the size of\n output buffer is unlimited. When it is nonnegative, returns at\n most max_length bytes of decompressed data.\n\nIf *max_length* is nonnegative, returns at most *max_length* bytes of\ndecompressed data. If this limit is reached and further output can be\nproduced, *self.needs_input* will be set to ``False``. In this case, the next\ncall to *decompress()* may provide *data* as b'' to obtain more of the output.\n\nIf all of the input data was decompressed and returned (either because this\nwas less than *max_length* bytes, or because *max_length* was negative),\n*self.needs_input* will be set to True.\n\nAttempting to decompress data after the end of a frame is reached raises an\nEOFError. Any data found after the end of the frame is ignored and saved in\nthe self.unused_data attribute.", + "_zstd.ZstdDecompressor.decompress" => "Decompress *data*, returning uncompressed bytes if possible, or b'' otherwise.\n\n data\n A bytes-like object, Zstandard data to be decompressed.\n max_length\n Maximum size of returned data. When it is negative, the size of\n output buffer is unlimited. When it is nonnegative, returns at\n most max_length bytes of decompressed data.\n\nIf *max_length* is nonnegative, returns at most *max_length* bytes\nof decompressed data. If this limit is reached and further output\ncan be produced, *self.needs_input* will be set to ``False``. In\nthis case, the next call to *decompress()* may provide *data* as b''\nto obtain more of the output.\n\nIf all of the input data was decompressed and returned (either\nbecause this was less than *max_length* bytes, or because\n*max_length* was negative), *self.needs_input* will be set to True.\n\nAttempting to decompress data after the end of a frame is reached\nraises an EOFError. Any data found after the end of the frame is\nignored and saved in the self.unused_data attribute.", "_zstd.ZstdDecompressor.eof" => "True means the end of the first frame has been reached. If decompress data\nafter that, an EOFError exception will be raised.", "_zstd.ZstdDecompressor.needs_input" => "If the max_length output limit in .decompress() method has been reached,\nand the decompressor has (or may has) unconsumed input data, it will be set\nto False. In this case, passing b'' to the .decompress() method may output\nfurther data.", - "_zstd.ZstdDecompressor.unused_data" => "A bytes object of un-consumed input data.\n\nWhen ZstdDecompressor object stops after a frame is\ndecompressed, unused input data after the frame. Otherwise this will be b''.", - "_zstd.ZstdDict" => "Represents a Zstandard dictionary.\n\n dict_content\n The content of a Zstandard dictionary as a bytes-like object.\n is_raw\n If true, perform no checks on *dict_content*, useful for some\n advanced cases. Otherwise, check that the content represents\n a Zstandard dictionary created by the zstd library or CLI.\n\nThe dictionary can be used for compression or decompression, and can be shared\nby multiple ZstdCompressor or ZstdDecompressor objects.", + "_zstd.ZstdDecompressor.unused_data" => "A bytes object of un-consumed input data.\n\nWhen ZstdDecompressor object stops after a frame is\ndecompressed, unused input data after the frame. Otherwise this\nwill be b''.", + "_zstd.ZstdDict" => "Represents a Zstandard dictionary.\n\n dict_content\n The content of a Zstandard dictionary as a bytes-like object.\n is_raw\n If true, perform no checks on *dict_content*, useful for some\n advanced cases. Otherwise, check that the content represents\n a Zstandard dictionary created by the zstd library or CLI.\n\nThe dictionary can be used for compression or decompression, and can be\nshared by multiple ZstdCompressor or ZstdDecompressor objects.", "_zstd.ZstdDict.__delattr__" => "Implement delattr(self, name).", "_zstd.ZstdDict.__eq__" => "Return self==value.", "_zstd.ZstdDict.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", @@ -9398,9 +9398,9 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "_zstd.ZstdDict.__sizeof__" => "Size of object in memory, in bytes.", "_zstd.ZstdDict.__str__" => "Return str(self).", "_zstd.ZstdDict.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", - "_zstd.ZstdDict.as_digested_dict" => "Load as a digested dictionary to compressor.\n\nPass this attribute as zstd_dict argument:\ncompress(dat, zstd_dict=zd.as_digested_dict)\n\n1. Some advanced compression parameters of compressor may be overridden\n by parameters of digested dictionary.\n2. ZstdDict has a digested dictionaries cache for each compression level.\n It's faster when loading again a digested dictionary with the same\n compression level.\n3. No need to use this for decompression.", - "_zstd.ZstdDict.as_prefix" => "Load as a prefix to compressor/decompressor.\n\nPass this attribute as zstd_dict argument:\ncompress(dat, zstd_dict=zd.as_prefix)\n\n1. Prefix is compatible with long distance matching, while dictionary is not.\n2. It only works for the first frame, then the compressor/decompressor will\n return to no prefix state.\n3. When decompressing, must use the same prefix as when compressing.", - "_zstd.ZstdDict.as_undigested_dict" => "Load as an undigested dictionary to compressor.\n\nPass this attribute as zstd_dict argument:\ncompress(dat, zstd_dict=zd.as_undigested_dict)\n\n1. The advanced compression parameters of compressor will not be overridden.\n2. Loading an undigested dictionary is costly. If load an undigested dictionary\n multiple times, consider reusing a compressor object.\n3. No need to use this for decompression.", + "_zstd.ZstdDict.as_digested_dict" => "Load as a digested dictionary to compressor.\n\nPass this attribute as zstd_dict argument:\ncompress(dat, zstd_dict=zd.as_digested_dict)\n\n1. Some advanced compression parameters of compressor may be\n overridden by parameters of digested dictionary.\n2. ZstdDict has a digested dictionaries cache for each compression\n level. It's faster when loading again a digested dictionary with\n the same compression level.\n3. No need to use this for decompression.", + "_zstd.ZstdDict.as_prefix" => "Load as a prefix to compressor/decompressor.\n\nPass this attribute as zstd_dict argument:\ncompress(dat, zstd_dict=zd.as_prefix)\n\n1. Prefix is compatible with long distance matching, while\n dictionary is not.\n2. It only works for the first frame, then the\n compressor/decompressor will return to no prefix state.\n3. When decompressing, must use the same prefix as when compressing.", + "_zstd.ZstdDict.as_undigested_dict" => "Load as an undigested dictionary to compressor.\n\nPass this attribute as zstd_dict argument:\ncompress(dat, zstd_dict=zd.as_undigested_dict)\n\n1. The advanced compression parameters of compressor will not be\n overridden.\n2. Loading an undigested dictionary is costly. If load an undigested\n dictionary multiple times, consider reusing a compressor object.\n3. No need to use this for decompression.", "_zstd.ZstdDict.dict_content" => "The content of a Zstandard dictionary, as a bytes object.", "_zstd.ZstdDict.dict_id" => "The Zstandard dictionary, an int between 0 and 2**32.\n\nA non-zero value represents an ordinary Zstandard dictionary,\nconforming to the standardised format.\n\nA value of zero indicates a 'raw content' dictionary,\nwithout any restrictions on format or content.", "_zstd.ZstdError" => "An error occurred in the zstd library.", @@ -9437,7 +9437,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "array.ArrayType" => "array(typecode [, initializer]) -> array\n\nReturn a new array whose items are restricted by typecode, and\ninitialized from the optional initializer value, which must be a list,\nstring or iterable over elements of the appropriate type.\n\nArrays represent basic values and behave very much like lists, except\nthe type of objects stored in them is constrained. The type is specified\nat object creation time by using a type code, which is a single character.\nThe following type codes are defined:\n\n Type code C Type Minimum size in bytes\n 'b' signed integer 1\n 'B' unsigned integer 1\n 'u' Unicode character 2 (see note)\n 'h' signed integer 2\n 'H' unsigned integer 2\n 'i' signed integer 2\n 'I' unsigned integer 2\n 'l' signed integer 4\n 'L' unsigned integer 4\n 'q' signed integer 8 (see note)\n 'Q' unsigned integer 8 (see note)\n 'f' floating-point 4\n 'd' floating-point 8\n\nNOTE: The 'u' typecode corresponds to Python's unicode character. On\nnarrow builds this is 2-bytes on wide builds this is 4-bytes.\n\nNOTE: The 'q' and 'Q' type codes are only available if the platform\nC compiler used to build Python supports 'long long', or, on Windows,\n'__int64'.\n\nMethods:\n\nappend() -- append a new item to the end of the array\nbuffer_info() -- return information giving the current memory info\nbyteswap() -- byteswap all the items of the array\ncount() -- return number of occurrences of an object\nextend() -- extend array by appending multiple elements from an iterable\nfromfile() -- read items from a file object\nfromlist() -- append items from the list\nfrombytes() -- append items from the string\nindex() -- return index of first occurrence of an object\ninsert() -- insert a new item into the array at a provided position\npop() -- remove and return item (default last)\nremove() -- remove first occurrence of an object\nreverse() -- reverse the order of the items in the array\ntofile() -- write all items to a file object\ntolist() -- return the array converted to an ordinary list\ntobytes() -- return the array converted to a string\n\nAttributes:\n\ntypecode -- the typecode character used to create the array\nitemsize -- the length in bytes of one array item", "array.ArrayType.__add__" => "Return self+value.", "array.ArrayType.__buffer__" => "Return a buffer object that exposes the underlying memory of the object.", - "array.ArrayType.__class_getitem__" => "See PEP 585", + "array.ArrayType.__class_getitem__" => "Arrays are generic over the type of their elements", "array.ArrayType.__contains__" => "Return bool(key in self).", "array.ArrayType.__copy__" => "Return a copy of the array.", "array.ArrayType.__deepcopy__" => "Return a copy of the array.", @@ -9472,15 +9472,15 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "array.ArrayType.__str__" => "Return str(self).", "array.ArrayType.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "array.ArrayType.append" => "Append new value v to the end of the array.", - "array.ArrayType.buffer_info" => "Return a tuple (address, length) giving the current memory address and the length in items of the buffer used to hold array's contents.\n\nThe length should be multiplied by the itemsize attribute to calculate\nthe buffer length in bytes.", - "array.ArrayType.byteswap" => "Byteswap all items of the array.\n\nIf the items in the array are not 1, 2, 4, or 8 bytes in size, RuntimeError is\nraised.", + "array.ArrayType.buffer_info" => "Return a tuple (address, length) giving the current memory address and the length in items of the buffer used to hold array's contents.\n\nThe length should be multiplied by the itemsize attribute to\ncalculate the buffer length in bytes.", + "array.ArrayType.byteswap" => "Byteswap all items of the array.\n\nIf the items in the array are not 1, 2, 4, or 8 bytes in size,\nRuntimeError is raised.", "array.ArrayType.clear" => "Remove all items from the array.", "array.ArrayType.count" => "Return number of occurrences of v in the array.", "array.ArrayType.extend" => "Append items to the end of the array.", "array.ArrayType.frombytes" => "Appends items from the string, interpreting it as an array of machine values, as if it had been read from a file using the fromfile() method.", "array.ArrayType.fromfile" => "Read n objects from the file object f and append them to the end of the array.", "array.ArrayType.fromlist" => "Append items to array from list.", - "array.ArrayType.fromunicode" => "Extends this array with data from the unicode string ustr.\n\nThe array must be a unicode type array; otherwise a ValueError is raised.\nUse array.frombytes(ustr.encode(...)) to append Unicode data to an array of\nsome other type.", + "array.ArrayType.fromunicode" => "Extends this array with data from the unicode string ustr.\n\nThe array must be a unicode type array; otherwise a ValueError is\nraised. Use array.frombytes(ustr.encode(...)) to append Unicode\ndata to an array of some other type.", "array.ArrayType.index" => "Return index of first occurrence of v in the array.\n\nRaise ValueError if the value is not present.", "array.ArrayType.insert" => "Insert a new item v into the array before position i.", "array.ArrayType.itemsize" => "the size, in bytes, of one array item", @@ -9490,13 +9490,13 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "array.ArrayType.tobytes" => "Convert the array to an array of machine values and return the bytes representation.", "array.ArrayType.tofile" => "Write all items (as machine values) to the file object f.", "array.ArrayType.tolist" => "Convert array to an ordinary list with the same items.", - "array.ArrayType.tounicode" => "Extends this array with data from the unicode string ustr.\n\nConvert the array to a unicode string. The array must be a unicode type array;\notherwise a ValueError is raised. Use array.tobytes().decode() to obtain a\nunicode string from an array of some other type.", + "array.ArrayType.tounicode" => "Extends this array with data from the unicode string ustr.\n\nConvert the array to a unicode string. The array must be a unicode\ntype array; otherwise a ValueError is raised. Use\narray.tobytes().decode() to obtain a unicode string from an array of\nsome other type.", "array.ArrayType.typecode" => "the typecode character used to create the array", "array._array_reconstructor" => "Internal. Used for pickling support.", "array.array" => "array(typecode [, initializer]) -> array\n\nReturn a new array whose items are restricted by typecode, and\ninitialized from the optional initializer value, which must be a list,\nstring or iterable over elements of the appropriate type.\n\nArrays represent basic values and behave very much like lists, except\nthe type of objects stored in them is constrained. The type is specified\nat object creation time by using a type code, which is a single character.\nThe following type codes are defined:\n\n Type code C Type Minimum size in bytes\n 'b' signed integer 1\n 'B' unsigned integer 1\n 'u' Unicode character 2 (see note)\n 'h' signed integer 2\n 'H' unsigned integer 2\n 'i' signed integer 2\n 'I' unsigned integer 2\n 'l' signed integer 4\n 'L' unsigned integer 4\n 'q' signed integer 8 (see note)\n 'Q' unsigned integer 8 (see note)\n 'f' floating-point 4\n 'd' floating-point 8\n\nNOTE: The 'u' typecode corresponds to Python's unicode character. On\nnarrow builds this is 2-bytes on wide builds this is 4-bytes.\n\nNOTE: The 'q' and 'Q' type codes are only available if the platform\nC compiler used to build Python supports 'long long', or, on Windows,\n'__int64'.\n\nMethods:\n\nappend() -- append a new item to the end of the array\nbuffer_info() -- return information giving the current memory info\nbyteswap() -- byteswap all the items of the array\ncount() -- return number of occurrences of an object\nextend() -- extend array by appending multiple elements from an iterable\nfromfile() -- read items from a file object\nfromlist() -- append items from the list\nfrombytes() -- append items from the string\nindex() -- return index of first occurrence of an object\ninsert() -- insert a new item into the array at a provided position\npop() -- remove and return item (default last)\nremove() -- remove first occurrence of an object\nreverse() -- reverse the order of the items in the array\ntofile() -- write all items to a file object\ntolist() -- return the array converted to an ordinary list\ntobytes() -- return the array converted to a string\n\nAttributes:\n\ntypecode -- the typecode character used to create the array\nitemsize -- the length in bytes of one array item", "array.array.__add__" => "Return self+value.", "array.array.__buffer__" => "Return a buffer object that exposes the underlying memory of the object.", - "array.array.__class_getitem__" => "See PEP 585", + "array.array.__class_getitem__" => "Arrays are generic over the type of their elements", "array.array.__contains__" => "Return bool(key in self).", "array.array.__copy__" => "Return a copy of the array.", "array.array.__deepcopy__" => "Return a copy of the array.", @@ -9531,15 +9531,15 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "array.array.__str__" => "Return str(self).", "array.array.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "array.array.append" => "Append new value v to the end of the array.", - "array.array.buffer_info" => "Return a tuple (address, length) giving the current memory address and the length in items of the buffer used to hold array's contents.\n\nThe length should be multiplied by the itemsize attribute to calculate\nthe buffer length in bytes.", - "array.array.byteswap" => "Byteswap all items of the array.\n\nIf the items in the array are not 1, 2, 4, or 8 bytes in size, RuntimeError is\nraised.", + "array.array.buffer_info" => "Return a tuple (address, length) giving the current memory address and the length in items of the buffer used to hold array's contents.\n\nThe length should be multiplied by the itemsize attribute to\ncalculate the buffer length in bytes.", + "array.array.byteswap" => "Byteswap all items of the array.\n\nIf the items in the array are not 1, 2, 4, or 8 bytes in size,\nRuntimeError is raised.", "array.array.clear" => "Remove all items from the array.", "array.array.count" => "Return number of occurrences of v in the array.", "array.array.extend" => "Append items to the end of the array.", "array.array.frombytes" => "Appends items from the string, interpreting it as an array of machine values, as if it had been read from a file using the fromfile() method.", "array.array.fromfile" => "Read n objects from the file object f and append them to the end of the array.", "array.array.fromlist" => "Append items to array from list.", - "array.array.fromunicode" => "Extends this array with data from the unicode string ustr.\n\nThe array must be a unicode type array; otherwise a ValueError is raised.\nUse array.frombytes(ustr.encode(...)) to append Unicode data to an array of\nsome other type.", + "array.array.fromunicode" => "Extends this array with data from the unicode string ustr.\n\nThe array must be a unicode type array; otherwise a ValueError is\nraised. Use array.frombytes(ustr.encode(...)) to append Unicode\ndata to an array of some other type.", "array.array.index" => "Return index of first occurrence of v in the array.\n\nRaise ValueError if the value is not present.", "array.array.insert" => "Insert a new item v into the array before position i.", "array.array.itemsize" => "the size, in bytes, of one array item", @@ -9549,7 +9549,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "array.array.tobytes" => "Convert the array to an array of machine values and return the bytes representation.", "array.array.tofile" => "Write all items (as machine values) to the file object f.", "array.array.tolist" => "Convert array to an ordinary list with the same items.", - "array.array.tounicode" => "Extends this array with data from the unicode string ustr.\n\nConvert the array to a unicode string. The array must be a unicode type array;\notherwise a ValueError is raised. Use array.tobytes().decode() to obtain a\nunicode string from an array of some other type.", + "array.array.tounicode" => "Extends this array with data from the unicode string ustr.\n\nConvert the array to a unicode string. The array must be a unicode\ntype array; otherwise a ValueError is raised. Use\narray.tobytes().decode() to obtain a unicode string from an array of\nsome other type.", "array.array.typecode" => "the typecode character used to create the array", "atexit" => "allow programmer to define multiple exit functions to be executed\nupon normal program termination.\n\nTwo public functions, register and unregister, are defined.", "atexit._clear" => "Clear the list of previously registered exit functions.", @@ -9711,7 +9711,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.BaseException.add_note" => "Add a note to the exception", "builtins.BaseException.with_traceback" => "Set self.__traceback__ to tb and return self.", "builtins.BaseExceptionGroup" => "A combination of multiple unrelated exceptions.", - "builtins.BaseExceptionGroup.__class_getitem__" => "See PEP 585", + "builtins.BaseExceptionGroup.__class_getitem__" => "Exception groups are generic over the type of their contained exceptions", "builtins.BaseExceptionGroup.__delattr__" => "Implement delattr(self, name).", "builtins.BaseExceptionGroup.__eq__" => "Return self==value.", "builtins.BaseExceptionGroup.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", @@ -10001,7 +10001,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.DeprecationWarning.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.DeprecationWarning.add_note" => "Add a note to the exception", "builtins.DeprecationWarning.with_traceback" => "Set self.__traceback__ to tb and return self.", - "builtins.DynamicClassAttribute" => "Route attribute access on a class to __getattr__.\n\nThis is a descriptor, used to define attributes that act differently when\naccessed through an instance and through a class. Instance access remains\nnormal, but access to an attribute through a class will be routed to the\nclass's __getattr__ method; this is done by raising AttributeError.\n\nThis allows one to have properties active on an instance, and have virtual\nattributes on the class with the same name. (Enum used this between Python\nversions 3.4 - 3.9 .)\n\nSubclass from this to use a different method of accessing virtual attributes\nand still be treated properly by the inspect module. (Enum uses this since\nPython 3.10 .)", + "builtins.DynamicClassAttribute" => "Route attribute access on a class to __getattr__.\n\nThis is a descriptor, used to define attributes that act differently\nwhen accessed through an instance and through a class. Instance access\nremains normal, but access to an attribute through a class will be\nrouted to the class's __getattr__ method; this is done by raising\nAttributeError.\n\nThis allows one to have properties active on an instance, and have\nvirtual attributes on the class with the same name. (Enum used this\nbetween Python versions 3.4 - 3.9 .)\n\nSubclass from this to use a different method of accessing virtual\nattributes and still be treated properly by the inspect module. (Enum\nuses this since Python 3.10 .)", "builtins.DynamicClassAttribute.__delattr__" => "Implement delattr(self, name).", "builtins.DynamicClassAttribute.__eq__" => "Return self==value.", "builtins.DynamicClassAttribute.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", @@ -10120,7 +10120,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.Exception.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.Exception.add_note" => "Add a note to the exception", "builtins.Exception.with_traceback" => "Set self.__traceback__ to tb and return self.", - "builtins.ExceptionGroup.__class_getitem__" => "See PEP 585", + "builtins.ExceptionGroup.__class_getitem__" => "Exception groups are generic over the type of their contained exceptions", "builtins.ExceptionGroup.__delattr__" => "Implement delattr(self, name).", "builtins.ExceptionGroup.__eq__" => "Return self==value.", "builtins.ExceptionGroup.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", @@ -11425,7 +11425,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.UnicodeWarning.add_note" => "Add a note to the exception", "builtins.UnicodeWarning.with_traceback" => "Set self.__traceback__ to tb and return self.", "builtins.Union" => "Represent a union type\n\nE.g. for int | str", - "builtins.Union.__class_getitem__" => "See PEP 585", + "builtins.Union.__class_getitem__" => "Create a union containing the given types", "builtins.Union.__delattr__" => "Implement delattr(self, name).", "builtins.Union.__eq__" => "Return self==value.", "builtins.Union.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", @@ -11605,7 +11605,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins._IncompleteInputError.text" => "exception text", "builtins._IncompleteInputError.with_traceback" => "Set self.__traceback__ to tb and return self.", "builtins.__build_class__" => "__build_class__(func, name, /, *bases, [metaclass], **kwds) -> class\n\nInternal helper function used by the class statement.", - "builtins.__import__" => "Import a module.\n\nBecause this function is meant for use by the Python\ninterpreter and not for general use, it is better to use\nimportlib.import_module() to programmatically import a module.\n\nThe globals argument is only used to determine the context;\nthey are not modified. The locals argument is unused. The fromlist\nshould be a list of names to emulate ``from name import ...``, or an\nempty list to emulate ``import name``.\nWhen importing a module from a package, note that __import__('A.B', ...)\nreturns package A when fromlist is empty, but its submodule B when\nfromlist is not empty. The level argument is used to determine whether to\nperform absolute or relative imports: 0 is absolute, while a positive number\nis the number of parent directories to search relative to the current module.", + "builtins.__import__" => "Import a module.\n\nBecause this function is meant for use by the Python\ninterpreter and not for general use, it is better to use\nimportlib.import_module() to programmatically import a module.\n\nThe globals argument is only used to determine the context;\nthey are not modified. The locals argument is unused. The fromlist\nshould be a list of names to emulate ``from name import ...``, or an\nempty list to emulate ``import name``.\nWhen importing a module from a package, note that __import__('A.B', ...)\nreturns package A when fromlist is empty, but its submodule B when\nfromlist is not empty. The level argument is used to determine whether\nto perform absolute or relative imports: 0 is absolute, while a positive\nnumber is the number of parent directories to search relative to the\ncurrent module.", "builtins.abs" => "Return the absolute value of the argument.", "builtins.aiter" => "Return an AsyncIterator for an AsyncIterable object.", "builtins.all" => "Return True if bool(x) is True for all values x in the iterable.\n\nIf the iterable is empty, return True.", @@ -11614,7 +11614,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.ascii" => "Return an ASCII-only representation of an object.\n\nAs repr(), return a string containing a printable representation of an\nobject, but escape the non-ASCII characters in the string returned by\nrepr() using \\\\x, \\\\u or \\\\U escapes. This generates a string similar\nto that returned by repr() in Python 2.", "builtins.async_generator.__aiter__" => "Return an awaitable, that resolves in asynchronous iterator.", "builtins.async_generator.__anext__" => "Return a value or raise StopAsyncIteration.", - "builtins.async_generator.__class_getitem__" => "See PEP 585", + "builtins.async_generator.__class_getitem__" => "async generators are generic over the types of their yield and send values", "builtins.async_generator.__del__" => "Called when the instance is about to be destroyed.", "builtins.async_generator.__delattr__" => "Implement delattr(self, name).", "builtins.async_generator.__eq__" => "Return self==value.", @@ -11707,12 +11707,12 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.bool.bit_length" => "Number of bits necessary to represent self in binary.\n\n>>> bin(37)\n'0b100101'\n>>> (37).bit_length()\n6", "builtins.bool.conjugate" => "Returns self, the complex conjugate of any int.", "builtins.bool.denominator" => "the denominator of a rational number in lowest terms", - "builtins.bool.from_bytes" => "Return the integer represented by the given array of bytes.\n\n bytes\n Holds the array of bytes to convert. The argument must either\n support the buffer protocol or be an iterable object producing bytes.\n Bytes and bytearray are examples of built-in objects that support the\n buffer protocol.\n byteorder\n The byte order used to represent the integer. If byteorder is 'big',\n the most significant byte is at the beginning of the byte array. If\n byteorder is 'little', the most significant byte is at the end of the\n byte array. To request the native byte order of the host system, use\n sys.byteorder as the byte order value. Default is to use 'big'.\n signed\n Indicates whether two's complement is used to represent the integer.", + "builtins.bool.from_bytes" => "Return the integer represented by the given array of bytes.\n\n bytes\n Holds the array of bytes to convert. The argument must either\n support the buffer protocol or be an iterable object producing\n bytes. Bytes and bytearray are examples of built-in objects that\n support the buffer protocol.\n byteorder\n The byte order used to represent the integer. If byteorder is\n 'big', the most significant byte is at the beginning of the byte\n array. If byteorder is 'little', the most significant byte is at\n the end of the byte array. To request the native byte order of\n the host system, use sys.byteorder as the byte order value.\n Default is to use 'big'.\n signed\n Indicates whether two's complement is used to represent the\n integer.", "builtins.bool.imag" => "the imaginary part of a complex number", "builtins.bool.is_integer" => "Returns True. Exists for duck type compatibility with float.is_integer.", "builtins.bool.numerator" => "the numerator of a rational number in lowest terms", "builtins.bool.real" => "the real part of a complex number", - "builtins.bool.to_bytes" => "Return an array of bytes representing an integer.\n\n length\n Length of bytes object to use. An OverflowError is raised if the\n integer is not representable with the given number of bytes. Default\n is length 1.\n byteorder\n The byte order used to represent the integer. If byteorder is 'big',\n the most significant byte is at the beginning of the byte array. If\n byteorder is 'little', the most significant byte is at the end of the\n byte array. To request the native byte order of the host system, use\n sys.byteorder as the byte order value. Default is to use 'big'.\n signed\n Determines whether two's complement is used to represent the integer.\n If signed is False and a negative integer is given, an OverflowError\n is raised.", + "builtins.bool.to_bytes" => "Return an array of bytes representing an integer.\n\n length\n Length of bytes object to use. An OverflowError is raised if\n the integer is not representable with the given number of bytes.\n Default is length 1.\n byteorder\n The byte order used to represent the integer. If byteorder is\n 'big', the most significant byte is at the beginning of the byte\n array. If byteorder is 'little', the most significant byte is at\n the end of the byte array. To request the native byte order of\n the host system, use sys.byteorder as the byte order value.\n Default is to use 'big'.\n signed\n Determines whether two's complement is used to represent the\n integer. If signed is False and a negative integer is given,\n an OverflowError is raised.", "builtins.breakpoint" => "Call sys.breakpointhook(*args, **kws). sys.breakpointhook() must accept\nwhatever arguments are passed.\n\nBy default, this drops you into the pdb debugger.", "builtins.builtin_function_or_method.__call__" => "Call self as a function.", "builtins.builtin_function_or_method.__delattr__" => "Implement delattr(self, name).", @@ -11778,13 +11778,13 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.bytearray.clear" => "Remove all items from the bytearray.", "builtins.bytearray.copy" => "Return a copy of B.", "builtins.bytearray.count" => "Return the number of non-overlapping occurrences of subsection 'sub' in bytes B[start:end].\n\n start\n Optional start position. Default: start of the bytes.\n end\n Optional stop position. Default: end of the bytes.", - "builtins.bytearray.decode" => "Decode the bytearray using the codec registered for encoding.\n\n encoding\n The encoding with which to decode the bytearray.\n errors\n The error handling scheme to use for the handling of decoding errors.\n The default is 'strict' meaning that decoding errors raise a\n UnicodeDecodeError. Other possible values are 'ignore' and 'replace'\n as well as any other name registered with codecs.register_error that\n can handle UnicodeDecodeErrors.", + "builtins.bytearray.decode" => "Decode the bytearray using the codec registered for encoding.\n\n encoding\n The encoding with which to decode the bytearray.\n errors\n The error handling scheme to use for the handling of decoding\n errors. The default is 'strict' meaning that decoding errors\n raise a UnicodeDecodeError. Other possible values are 'ignore'\n and 'replace' as well as any other name registered with\n codecs.register_error that can handle UnicodeDecodeErrors.", "builtins.bytearray.endswith" => "Return True if the bytearray ends with the specified suffix, False otherwise.\n\n suffix\n A bytes or a tuple of bytes to try.\n start\n Optional start position. Default: start of the bytearray.\n end\n Optional stop position. Default: end of the bytearray.", "builtins.bytearray.expandtabs" => "Return a copy where all tab characters are expanded using spaces.\n\nIf tabsize is not given, a tab size of 8 characters is assumed.", "builtins.bytearray.extend" => "Append all the items from the iterator or sequence to the end of the bytearray.\n\n iterable_of_ints\n The iterable of items to append.", "builtins.bytearray.find" => "Return the lowest index in B where subsection 'sub' is found, such that 'sub' is contained within B[start:end].\n\n start\n Optional start position. Default: start of the bytes.\n end\n Optional stop position. Default: end of the bytes.\n\nReturn -1 on failure.", - "builtins.bytearray.fromhex" => "Create a bytearray object from a string of hexadecimal numbers.\n\nSpaces between two numbers are accepted.\nExample: bytearray.fromhex('B9 01EF') -> bytearray(b'\\\\xb9\\\\x01\\\\xef')", - "builtins.bytearray.hex" => "Create a string of hexadecimal numbers from a bytearray object.\n\n sep\n An optional single character or byte to separate hex bytes.\n bytes_per_sep\n How many bytes between separators. Positive values count from the\n right, negative values count from the left.\n\nExample:\n>>> value = bytearray([0xb9, 0x01, 0xef])\n>>> value.hex()\n'b901ef'\n>>> value.hex(':')\n'b9:01:ef'\n>>> value.hex(':', 2)\n'b9:01ef'\n>>> value.hex(':', -2)\n'b901:ef'", + "builtins.bytearray.fromhex" => "Create a bytearray object from a string of hexadecimal numbers.\n\nSpaces between two numbers are accepted.\nExample:\n bytearray.fromhex('B9 01EF') -> bytearray(b'\\\\xb9\\\\x01\\\\xef')", + "builtins.bytearray.hex" => "Create a string of hexadecimal numbers from a bytearray object.\n\n sep\n An optional single character or byte to separate hex bytes.\n bytes_per_sep\n How many bytes between separators. Positive values count from\n the right, negative values count from the left.\n\nExample:\n>>> value = bytearray([0xb9, 0x01, 0xef])\n>>> value.hex()\n'b901ef'\n>>> value.hex(':')\n'b9:01:ef'\n>>> value.hex(':', 2)\n'b9:01ef'\n>>> value.hex(':', -2)\n'b901:ef'", "builtins.bytearray.index" => "Return the lowest index in B where subsection 'sub' is found, such that 'sub' is contained within B[start:end].\n\n start\n Optional start position. Default: start of the bytes.\n end\n Optional stop position. Default: end of the bytes.\n\nRaise ValueError if the subsection is not found.", "builtins.bytearray.insert" => "Insert a single item into the bytearray before the given index.\n\n index\n The index where the value is to be inserted.\n item\n The item to be inserted.", "builtins.bytearray.isalnum" => "B.isalnum() -> bool\n\nReturn True if all characters in B are alphanumeric\nand there is at least one character in B, False otherwise.", @@ -11795,12 +11795,12 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.bytearray.isspace" => "B.isspace() -> bool\n\nReturn True if all characters in B are whitespace\nand there is at least one character in B, False otherwise.", "builtins.bytearray.istitle" => "B.istitle() -> bool\n\nReturn True if B is a titlecased string and there is at least one\ncharacter in B, i.e. uppercase characters may only follow uncased\ncharacters and lowercase characters only cased ones. Return False\notherwise.", "builtins.bytearray.isupper" => "B.isupper() -> bool\n\nReturn True if all cased characters in B are uppercase and there is\nat least one cased character in B, False otherwise.", - "builtins.bytearray.join" => "Concatenate any number of bytes/bytearray objects.\n\nThe bytearray whose method is called is inserted in between each pair.\n\nThe result is returned as a new bytearray object.", + "builtins.bytearray.join" => "Concatenate any number of bytes/bytearray objects.\n\nThe bytearray whose method is called is inserted in between each\npair.\n\nThe result is returned as a new bytearray object.", "builtins.bytearray.ljust" => "Return a left-justified string of length width.\n\nPadding is done using the specified fill character.", "builtins.bytearray.lower" => "B.lower() -> copy of B\n\nReturn a copy of B with all ASCII characters converted to lowercase.", "builtins.bytearray.lstrip" => "Strip leading bytes contained in the argument.\n\nIf the argument is omitted or None, strip leading ASCII whitespace.", - "builtins.bytearray.maketrans" => "Return a translation table usable for the bytes or bytearray translate method.\n\nThe returned table will be one where each byte in frm is mapped to the byte at\nthe same position in to.\n\nThe bytes objects frm and to must be of the same length.", - "builtins.bytearray.partition" => "Partition the bytearray into three parts using the given separator.\n\nThis will search for the separator sep in the bytearray. If the separator is\nfound, returns a 3-tuple containing the part before the separator, the\nseparator itself, and the part after it as new bytearray objects.\n\nIf the separator is not found, returns a 3-tuple containing the copy of the\noriginal bytearray object and two empty bytearray objects.", + "builtins.bytearray.maketrans" => "Return a translation table usable for the bytes or bytearray translate method.\n\nThe returned table will be one where each byte in frm is mapped to\nthe byte at the same position in to.\n\nThe bytes objects frm and to must be of the same length.", + "builtins.bytearray.partition" => "Partition the bytearray into three parts using the given separator.\n\nThis will search for the separator sep in the bytearray. If the\nseparator is found, returns a 3-tuple containing the part before the\nseparator, the separator itself, and the part after it as new\nbytearray objects.\n\nIf the separator is not found, returns a 3-tuple containing the copy\nof the original bytearray object and two empty bytearray objects.", "builtins.bytearray.pop" => "Remove and return a single item from B.\n\n index\n The index from where to remove the item.\n -1 (the default value) means remove the last item.\n\nIf no index argument is given, will pop the last item.", "builtins.bytearray.remove" => "Remove the first occurrence of a value in the bytearray.\n\n value\n The value to remove.", "builtins.bytearray.removeprefix" => "Return a bytearray with the given prefix string removed if present.\n\nIf the bytearray starts with the prefix string, return\nbytearray[len(prefix):]. Otherwise, return a copy of the original\nbytearray.", @@ -11811,16 +11811,16 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.bytearray.rfind" => "Return the highest index in B where subsection 'sub' is found, such that 'sub' is contained within B[start:end].\n\n start\n Optional start position. Default: start of the bytes.\n end\n Optional stop position. Default: end of the bytes.\n\nReturn -1 on failure.", "builtins.bytearray.rindex" => "Return the highest index in B where subsection 'sub' is found, such that 'sub' is contained within B[start:end].\n\n start\n Optional start position. Default: start of the bytes.\n end\n Optional stop position. Default: end of the bytes.\n\nRaise ValueError if the subsection is not found.", "builtins.bytearray.rjust" => "Return a right-justified string of length width.\n\nPadding is done using the specified fill character.", - "builtins.bytearray.rpartition" => "Partition the bytearray into three parts using the given separator.\n\nThis will search for the separator sep in the bytearray, starting at the end.\nIf the separator is found, returns a 3-tuple containing the part before the\nseparator, the separator itself, and the part after it as new bytearray\nobjects.\n\nIf the separator is not found, returns a 3-tuple containing two empty bytearray\nobjects and the copy of the original bytearray object.", - "builtins.bytearray.rsplit" => "Return a list of the sections in the bytearray, using sep as the delimiter.\n\n sep\n The delimiter according which to split the bytearray.\n None (the default value) means split on ASCII whitespace characters\n (space, tab, return, newline, formfeed, vertical tab).\n maxsplit\n Maximum number of splits to do.\n -1 (the default value) means no limit.\n\nSplitting is done starting at the end of the bytearray and working to the front.", + "builtins.bytearray.rpartition" => "Partition the bytearray into three parts using the given separator.\n\nThis will search for the separator sep in the bytearray, starting at\nthe end. If the separator is found, returns a 3-tuple containing\nthe part before the separator, the separator itself, and the part\nafter it as new bytearray objects.\n\nIf the separator is not found, returns a 3-tuple containing two\nempty bytearray objects and the copy of the original bytearray\nobject.", + "builtins.bytearray.rsplit" => "Return a list of the sections in the bytearray, using sep as the delimiter.\n\n sep\n The delimiter according which to split the bytearray.\n None (the default value) means split on ASCII whitespace\n characters (space, tab, return, newline, formfeed, vertical tab).\n maxsplit\n Maximum number of splits to do.\n -1 (the default value) means no limit.\n\nSplitting is done starting at the end of the bytearray and working\nto the front.", "builtins.bytearray.rstrip" => "Strip trailing bytes contained in the argument.\n\nIf the argument is omitted or None, strip trailing ASCII whitespace.", - "builtins.bytearray.split" => "Return a list of the sections in the bytearray, using sep as the delimiter.\n\n sep\n The delimiter according which to split the bytearray.\n None (the default value) means split on ASCII whitespace characters\n (space, tab, return, newline, formfeed, vertical tab).\n maxsplit\n Maximum number of splits to do.\n -1 (the default value) means no limit.", - "builtins.bytearray.splitlines" => "Return a list of the lines in the bytearray, breaking at line boundaries.\n\nLine breaks are not included in the resulting list unless keepends is given and\ntrue.", + "builtins.bytearray.split" => "Return a list of the sections in the bytearray, using sep as the delimiter.\n\n sep\n The delimiter according which to split the bytearray.\n None (the default value) means split on ASCII whitespace\n characters (space, tab, return, newline, formfeed, vertical tab).\n maxsplit\n Maximum number of splits to do.\n -1 (the default value) means no limit.", + "builtins.bytearray.splitlines" => "Return a list of the lines in the bytearray, breaking at line boundaries.\n\nLine breaks are not included in the resulting list unless keepends\nis given and true.", "builtins.bytearray.startswith" => "Return True if the bytearray starts with the specified prefix, False otherwise.\n\n prefix\n A bytes or a tuple of bytes to try.\n start\n Optional start position. Default: start of the bytearray.\n end\n Optional stop position. Default: end of the bytearray.", - "builtins.bytearray.strip" => "Strip leading and trailing bytes contained in the argument.\n\nIf the argument is omitted or None, strip leading and trailing ASCII whitespace.", + "builtins.bytearray.strip" => "Strip leading and trailing bytes contained in the argument.\n\nIf the argument is omitted or None, strip leading and trailing ASCII\nwhitespace.", "builtins.bytearray.swapcase" => "B.swapcase() -> copy of B\n\nReturn a copy of B with uppercase ASCII characters converted\nto lowercase ASCII and vice versa.", - "builtins.bytearray.title" => "B.title() -> copy of B\n\nReturn a titlecased version of B, i.e. ASCII words start with uppercase\ncharacters, all remaining cased characters have lowercase.", - "builtins.bytearray.translate" => "Return a copy with each character mapped by the given translation table.\n\n table\n Translation table, which must be a bytes object of length 256.\n\nAll characters occurring in the optional argument delete are removed.\nThe remaining characters are mapped through the given translation table.", + "builtins.bytearray.title" => "B.title() -> copy of B\n\nReturn a titlecased version of B, i.e. ASCII words start with\nuppercase characters, all remaining cased characters have lowercase.", + "builtins.bytearray.translate" => "Return a copy with each character mapped by the given translation table.\n\n table\n Translation table, which must be a bytes object of length 256.\n\nAll characters occurring in the optional argument delete are\nremoved. The remaining characters are mapped through the given\ntranslation table.", "builtins.bytearray.upper" => "B.upper() -> copy of B\n\nReturn a copy of B with all ASCII characters converted to uppercase.", "builtins.bytearray.zfill" => "Pad a numeric string with zeros on the left, to fill a field of the given width.\n\nThe original string is never truncated.", "builtins.bytearray_iterator.__delattr__" => "Implement delattr(self, name).", @@ -11884,12 +11884,12 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.bytes.capitalize" => "B.capitalize() -> copy of B\n\nReturn a copy of B with only its first character capitalized (ASCII)\nand the rest lower-cased.", "builtins.bytes.center" => "Return a centered string of length width.\n\nPadding is done using the specified fill character.", "builtins.bytes.count" => "Return the number of non-overlapping occurrences of subsection 'sub' in bytes B[start:end].\n\n start\n Optional start position. Default: start of the bytes.\n end\n Optional stop position. Default: end of the bytes.", - "builtins.bytes.decode" => "Decode the bytes using the codec registered for encoding.\n\n encoding\n The encoding with which to decode the bytes.\n errors\n The error handling scheme to use for the handling of decoding errors.\n The default is 'strict' meaning that decoding errors raise a\n UnicodeDecodeError. Other possible values are 'ignore' and 'replace'\n as well as any other name registered with codecs.register_error that\n can handle UnicodeDecodeErrors.", + "builtins.bytes.decode" => "Decode the bytes using the codec registered for encoding.\n\n encoding\n The encoding with which to decode the bytes.\n errors\n The error handling scheme to use for the handling of decoding\n errors. The default is 'strict' meaning that decoding errors\n raise a UnicodeDecodeError. Other possible values are 'ignore'\n and 'replace' as well as any other name registered with\n codecs.register_error that can handle UnicodeDecodeErrors.", "builtins.bytes.endswith" => "Return True if the bytes ends with the specified suffix, False otherwise.\n\n suffix\n A bytes or a tuple of bytes to try.\n start\n Optional start position. Default: start of the bytes.\n end\n Optional stop position. Default: end of the bytes.", "builtins.bytes.expandtabs" => "Return a copy where all tab characters are expanded using spaces.\n\nIf tabsize is not given, a tab size of 8 characters is assumed.", "builtins.bytes.find" => "Return the lowest index in B where subsection 'sub' is found, such that 'sub' is contained within B[start,end].\n\n start\n Optional start position. Default: start of the bytes.\n end\n Optional stop position. Default: end of the bytes.\n\nReturn -1 on failure.", "builtins.bytes.fromhex" => "Create a bytes object from a string of hexadecimal numbers.\n\nSpaces between two numbers are accepted.\nExample: bytes.fromhex('B9 01EF') -> b'\\\\xb9\\\\x01\\\\xef'.", - "builtins.bytes.hex" => "Create a string of hexadecimal numbers from a bytes object.\n\n sep\n An optional single character or byte to separate hex bytes.\n bytes_per_sep\n How many bytes between separators. Positive values count from the\n right, negative values count from the left.\n\nExample:\n>>> value = b'\\xb9\\x01\\xef'\n>>> value.hex()\n'b901ef'\n>>> value.hex(':')\n'b9:01:ef'\n>>> value.hex(':', 2)\n'b9:01ef'\n>>> value.hex(':', -2)\n'b901:ef'", + "builtins.bytes.hex" => "Create a string of hexadecimal numbers from a bytes object.\n\n sep\n An optional single character or byte to separate hex bytes.\n bytes_per_sep\n How many bytes between separators. Positive values count from\n the right, negative values count from the left.\n\nExample:\n>>> value = b'\\xb9\\x01\\xef'\n>>> value.hex()\n'b901ef'\n>>> value.hex(':')\n'b9:01:ef'\n>>> value.hex(':', 2)\n'b9:01ef'\n>>> value.hex(':', -2)\n'b901:ef'", "builtins.bytes.index" => "Return the lowest index in B where subsection 'sub' is found, such that 'sub' is contained within B[start,end].\n\n start\n Optional start position. Default: start of the bytes.\n end\n Optional stop position. Default: end of the bytes.\n\nRaise ValueError if the subsection is not found.", "builtins.bytes.isalnum" => "B.isalnum() -> bool\n\nReturn True if all characters in B are alphanumeric\nand there is at least one character in B, False otherwise.", "builtins.bytes.isalpha" => "B.isalpha() -> bool\n\nReturn True if all characters in B are alphabetic\nand there is at least one character in B, False otherwise.", @@ -11903,24 +11903,24 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.bytes.ljust" => "Return a left-justified string of length width.\n\nPadding is done using the specified fill character.", "builtins.bytes.lower" => "B.lower() -> copy of B\n\nReturn a copy of B with all ASCII characters converted to lowercase.", "builtins.bytes.lstrip" => "Strip leading bytes contained in the argument.\n\nIf the argument is omitted or None, strip leading ASCII whitespace.", - "builtins.bytes.maketrans" => "Return a translation table usable for the bytes or bytearray translate method.\n\nThe returned table will be one where each byte in frm is mapped to the byte at\nthe same position in to.\n\nThe bytes objects frm and to must be of the same length.", - "builtins.bytes.partition" => "Partition the bytes into three parts using the given separator.\n\nThis will search for the separator sep in the bytes. If the separator is found,\nreturns a 3-tuple containing the part before the separator, the separator\nitself, and the part after it.\n\nIf the separator is not found, returns a 3-tuple containing the original bytes\nobject and two empty bytes objects.", - "builtins.bytes.removeprefix" => "Return a bytes object with the given prefix string removed if present.\n\nIf the bytes starts with the prefix string, return bytes[len(prefix):].\nOtherwise, return a copy of the original bytes.", - "builtins.bytes.removesuffix" => "Return a bytes object with the given suffix string removed if present.\n\nIf the bytes ends with the suffix string and that suffix is not empty,\nreturn bytes[:-len(prefix)]. Otherwise, return a copy of the original\nbytes.", + "builtins.bytes.maketrans" => "Return a translation table usable for the bytes or bytearray translate method.\n\nThe returned table will be one where each byte in frm is mapped to\nthe byte at the same position in to.\n\nThe bytes objects frm and to must be of the same length.", + "builtins.bytes.partition" => "Partition the bytes into three parts using the given separator.\n\nThis will search for the separator sep in the bytes. If the\nseparator is found, returns a 3-tuple containing the part before the\nseparator, the separator itself, and the part after it.\n\nIf the separator is not found, returns a 3-tuple containing the\noriginal bytes object and two empty bytes objects.", + "builtins.bytes.removeprefix" => "Return a bytes object with the given prefix string removed if present.\n\nIf the bytes starts with the prefix string, return\nbytes[len(prefix):]. Otherwise, return a copy of the original\nbytes.", + "builtins.bytes.removesuffix" => "Return a bytes object with the given suffix string removed if present.\n\nIf the bytes ends with the suffix string and that suffix is not\nempty, return bytes[:-len(prefix)]. Otherwise, return a copy of the\noriginal bytes.", "builtins.bytes.replace" => "Return a copy with all occurrences of substring old replaced by new.\n\n count\n Maximum number of occurrences to replace.\n -1 (the default value) means replace all occurrences.\n\nIf the optional argument count is given, only the first count occurrences are\nreplaced.", "builtins.bytes.rfind" => "Return the highest index in B where subsection 'sub' is found, such that 'sub' is contained within B[start,end].\n\n start\n Optional start position. Default: start of the bytes.\n end\n Optional stop position. Default: end of the bytes.\n\nReturn -1 on failure.", "builtins.bytes.rindex" => "Return the highest index in B where subsection 'sub' is found, such that 'sub' is contained within B[start,end].\n\n start\n Optional start position. Default: start of the bytes.\n end\n Optional stop position. Default: end of the bytes.\n\nRaise ValueError if the subsection is not found.", "builtins.bytes.rjust" => "Return a right-justified string of length width.\n\nPadding is done using the specified fill character.", - "builtins.bytes.rpartition" => "Partition the bytes into three parts using the given separator.\n\nThis will search for the separator sep in the bytes, starting at the end. If\nthe separator is found, returns a 3-tuple containing the part before the\nseparator, the separator itself, and the part after it.\n\nIf the separator is not found, returns a 3-tuple containing two empty bytes\nobjects and the original bytes object.", - "builtins.bytes.rsplit" => "Return a list of the sections in the bytes, using sep as the delimiter.\n\n sep\n The delimiter according which to split the bytes.\n None (the default value) means split on ASCII whitespace characters\n (space, tab, return, newline, formfeed, vertical tab).\n maxsplit\n Maximum number of splits to do.\n -1 (the default value) means no limit.\n\nSplitting is done starting at the end of the bytes and working to the front.", + "builtins.bytes.rpartition" => "Partition the bytes into three parts using the given separator.\n\nThis will search for the separator sep in the bytes, starting at the\nend. If the separator is found, returns a 3-tuple containing the\npart before the separator, the separator itself, and the part after\nit.\n\nIf the separator is not found, returns a 3-tuple containing two\nempty bytes objects and the original bytes object.", + "builtins.bytes.rsplit" => "Return a list of the sections in the bytes, using sep as the delimiter.\n\n sep\n The delimiter according which to split the bytes.\n None (the default value) means split on ASCII whitespace\n characters (space, tab, return, newline, formfeed, vertical tab).\n maxsplit\n Maximum number of splits to do.\n -1 (the default value) means no limit.\n\nSplitting is done starting at the end of the bytes and working to\nthe front.", "builtins.bytes.rstrip" => "Strip trailing bytes contained in the argument.\n\nIf the argument is omitted or None, strip trailing ASCII whitespace.", - "builtins.bytes.split" => "Return a list of the sections in the bytes, using sep as the delimiter.\n\n sep\n The delimiter according which to split the bytes.\n None (the default value) means split on ASCII whitespace characters\n (space, tab, return, newline, formfeed, vertical tab).\n maxsplit\n Maximum number of splits to do.\n -1 (the default value) means no limit.", - "builtins.bytes.splitlines" => "Return a list of the lines in the bytes, breaking at line boundaries.\n\nLine breaks are not included in the resulting list unless keepends is given and\ntrue.", + "builtins.bytes.split" => "Return a list of the sections in the bytes, using sep as the delimiter.\n\n sep\n The delimiter according which to split the bytes.\n None (the default value) means split on ASCII whitespace\n characters (space, tab, return, newline, formfeed, vertical tab).\n maxsplit\n Maximum number of splits to do.\n -1 (the default value) means no limit.", + "builtins.bytes.splitlines" => "Return a list of the lines in the bytes, breaking at line boundaries.\n\nLine breaks are not included in the resulting list unless keepends\nis given and true.", "builtins.bytes.startswith" => "Return True if the bytes starts with the specified prefix, False otherwise.\n\n prefix\n A bytes or a tuple of bytes to try.\n start\n Optional start position. Default: start of the bytes.\n end\n Optional stop position. Default: end of the bytes.", - "builtins.bytes.strip" => "Strip leading and trailing bytes contained in the argument.\n\nIf the argument is omitted or None, strip leading and trailing ASCII whitespace.", + "builtins.bytes.strip" => "Strip leading and trailing bytes contained in the argument.\n\nIf the argument is omitted or None, strip leading and trailing ASCII\nwhitespace.", "builtins.bytes.swapcase" => "B.swapcase() -> copy of B\n\nReturn a copy of B with uppercase ASCII characters converted\nto lowercase ASCII and vice versa.", - "builtins.bytes.title" => "B.title() -> copy of B\n\nReturn a titlecased version of B, i.e. ASCII words start with uppercase\ncharacters, all remaining cased characters have lowercase.", - "builtins.bytes.translate" => "Return a copy with each character mapped by the given translation table.\n\n table\n Translation table, which must be a bytes object of length 256.\n\nAll characters occurring in the optional argument delete are removed.\nThe remaining characters are mapped through the given translation table.", + "builtins.bytes.title" => "B.title() -> copy of B\n\nReturn a titlecased version of B, i.e. ASCII words start with\nuppercase characters, all remaining cased characters have lowercase.", + "builtins.bytes.translate" => "Return a copy with each character mapped by the given translation table.\n\n table\n Translation table, which must be a bytes object of length 256.\n\nAll characters occurring in the optional argument delete are\nremoved. The remaining characters are mapped through the given\ntranslation table.", "builtins.bytes.upper" => "B.upper() -> copy of B\n\nReturn a copy of B with all ASCII characters converted to uppercase.", "builtins.bytes.zfill" => "Pad a numeric string with zeros on the left, to fill a field of the given width.\n\nThe original string is never truncated.", "builtins.bytes_iterator.__delattr__" => "Implement delattr(self, name).", @@ -12039,9 +12039,9 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.code.__setattr__" => "Implement setattr(self, name, value).", "builtins.code.__str__" => "Return str(self).", "builtins.code.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", - "builtins.code._varname_from_oparg" => "(internal-only) Return the local variable name for the given oparg.\n\nWARNING: this method is for internal use only and may change or go away.", + "builtins.code._varname_from_oparg" => "(internal-only) Return the local variable name for the given oparg.\n\nWARNING: this method is for internal use only and may change or go\naway.", "builtins.code.replace" => "Return a copy of the code object with new values for the specified fields.", - "builtins.compile" => "Compile source into a code object that can be executed by exec() or eval().\n\nThe source code may represent a Python module, statement or expression.\nThe filename will be used for run-time error messages.\nThe mode must be 'exec' to compile a module, 'single' to compile a\nsingle (interactive) statement, or 'eval' to compile an expression.\nThe flags argument, if present, controls which future statements influence\nthe compilation of the code.\nThe dont_inherit argument, if true, stops the compilation inheriting\nthe effects of any future statements in effect in the code calling\ncompile; if absent or false these statements do influence the compilation,\nin addition to any features explicitly specified.", + "builtins.compile" => "Compile source into a code object that can be executed by exec() or eval().\n\nThe source code may represent a Python module, statement or\nexpression.\nThe filename will be used for run-time error messages.\nThe mode must be 'exec' to compile a module, 'single' to compile a\nsingle (interactive) statement, or 'eval' to compile an expression.\nThe flags argument, if present, controls which future statements\ninfluence the compilation of the code.\nThe dont_inherit argument, if true, stops the compilation inheriting\nthe effects of any future statements in effect in the code calling\ncompile; if absent or false these statements do influence the\ncompilation, in addition to any features explicitly specified.", "builtins.complex" => "Create a complex number from a string or numbers.\n\nIf a string is given, parse it as a complex number.\nIf a single number is given, convert it to a complex number.\nIf the 'real' or 'imag' arguments are given, create a complex number\nwith the specified real and imaginary components.", "builtins.complex.__abs__" => "abs(self)", "builtins.complex.__add__" => "Return self+value.", @@ -12084,7 +12084,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.complex.imag" => "the imaginary part of a complex number", "builtins.complex.real" => "the real part of a complex number", "builtins.coroutine.__await__" => "Return an iterator to be used in await expression.", - "builtins.coroutine.__class_getitem__" => "See PEP 585", + "builtins.coroutine.__class_getitem__" => "coroutines are generic over the types of their yield, send, and return values", "builtins.coroutine.__del__" => "Called when the instance is about to be destroyed.", "builtins.coroutine.__delattr__" => "Implement delattr(self, name).", "builtins.coroutine.__eq__" => "Return self==value.", @@ -12113,7 +12113,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.coroutine.throw" => "throw(value)\nthrow(type[,value[,traceback]])\n\nRaise exception in coroutine, return next iterated value or raise\nStopIteration.\nthe (type, val, tb) signature is deprecated, \nand may be removed in a future version of Python.", "builtins.delattr" => "Deletes the named attribute from the given object.\n\ndelattr(x, 'y') is equivalent to ``del x.y``", "builtins.dict" => "dict() -> new empty dictionary\ndict(mapping) -> new dictionary initialized from a mapping object's\n (key, value) pairs\ndict(iterable) -> new dictionary initialized as if via:\n d = {}\n for k, v in iterable:\n d[k] = v\ndict(**kwargs) -> new dictionary initialized with the name=value pairs\n in the keyword argument list. For example: dict(one=1, two=2)", - "builtins.dict.__class_getitem__" => "See PEP 585", + "builtins.dict.__class_getitem__" => "dicts are generic over two types, signifying (respectively) the types of their keys and values", "builtins.dict.__contains__" => "True if the dictionary has the specified key, else False.", "builtins.dict.__delattr__" => "Implement delattr(self, name).", "builtins.dict.__delitem__" => "Delete self[key].", @@ -12286,7 +12286,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.dict_values.__str__" => "Return str(self).", "builtins.dict_values.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.dict_values.mapping" => "dictionary that this view refers to", - "builtins.dir" => "dir([object]) -> list of strings\n\nIf called without an argument, return the names in the current scope.\nElse, return an alphabetized list of names comprising (some of) the attributes\nof the given object, and of attributes reachable from it.\nIf the object supplies a method named __dir__, it will be used; otherwise\nthe default dir() logic is used and returns:\n for a module object: the module's attributes.\n for a class object: its attributes, and recursively the attributes\n of its bases.\n for any other object: its attributes, its class's attributes, and\n recursively the attributes of its class's base classes.", + "builtins.dir" => "dir([object]) -> list of strings\n\nIf called without an argument, return the names in the current scope.\nElse, return an alphabetized list of names comprising (some of) the\nattributes of the given object, and of attributes reachable from it.\nIf the object supplies a method named __dir__, it will be used;\notherwise the default dir() logic is used and returns:\n for a module object: the module's attributes.\n for a class object: its attributes, and recursively the attributes\n of its bases.\n for any other object: its attributes, its class's attributes, and\n recursively the attributes of its class's base classes.", "builtins.divmod" => "Return the tuple (x//y, x%y). Invariant: div*y + mod == x.", "builtins.ellipsis" => "The type of the Ellipsis singleton.", "builtins.ellipsis.__delattr__" => "Implement delattr(self, name).", @@ -12310,7 +12310,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.ellipsis.__str__" => "Return str(self).", "builtins.ellipsis.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.enumerate" => "Return an enumerate object.\n\n iterable\n an object supporting iteration\n\nThe enumerate object yields pairs containing a count (from start, which\ndefaults to zero) and a value yielded by the iterable argument.\n\nenumerate is useful for obtaining an indexed list:\n (0, seq[0]), (1, seq[1]), (2, seq[2]), ...", - "builtins.enumerate.__class_getitem__" => "See PEP 585", + "builtins.enumerate.__class_getitem__" => "'enumerate' objects are generic over the type of their values", "builtins.enumerate.__delattr__" => "Implement delattr(self, name).", "builtins.enumerate.__eq__" => "Return self==value.", "builtins.enumerate.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", @@ -12336,7 +12336,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.enumerate.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.eval" => "Evaluate the given source in the context of globals and locals.\n\nThe source may be a string representing a Python expression\nor a code object as returned by compile().\nThe globals must be a dictionary and locals can be any mapping,\ndefaulting to the current globals and locals.\nIf only globals is given, locals defaults to it.", "builtins.exec" => "Execute the given source in the context of globals and locals.\n\nThe source may be a string representing one or more Python statements\nor a code object as returned by compile().\nThe globals must be a dictionary and locals can be any mapping,\ndefaulting to the current globals and locals.\nIf only globals is given, locals defaults to it.\nThe closure must be a tuple of cellvars, and can only be used\nwhen source is a code object requiring exactly that many cellvars.", - "builtins.filter" => "Return an iterator yielding those items of iterable for which function(item)\nis true. If function is None, return the items that are true.", + "builtins.filter" => "Return an iterator yielding those items of iterable for which\nfunction(item) is true. If function is None, return the items that\nare true.", "builtins.filter.__delattr__" => "Implement delattr(self, name).", "builtins.filter.__eq__" => "Return self==value.", "builtins.filter.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", @@ -12374,7 +12374,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.float.__format__" => "Formats the float according to format_spec.", "builtins.float.__ge__" => "Return self>=value.", "builtins.float.__getattribute__" => "Return getattr(self, name).", - "builtins.float.__getformat__" => "You probably don't want to use this function.\n\n typestr\n Must be 'double' or 'float'.\n\nIt exists mainly to be used in Python's test suite.\n\nThis function returns whichever of 'unknown', 'IEEE, big-endian' or 'IEEE,\nlittle-endian' best describes the format of floating-point numbers used by the\nC type named by typestr.", + "builtins.float.__getformat__" => "You probably don't want to use this function.\n\n typestr\n Must be 'double' or 'float'.\n\nIt exists mainly to be used in Python's test suite.\n\nThis function returns whichever of 'unknown', 'IEEE, big-endian' or\n'IEEE, little-endian' best describes the format of floating-point\nnumbers used by the C type named by typestr.", "builtins.float.__getstate__" => "Helper for pickle.", "builtins.float.__gt__" => "Return self>value.", "builtins.float.__hash__" => "Return hash(self).", @@ -12451,7 +12451,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.frame.f_trace_opcodes" => "Return True if opcode tracing is enabled, False otherwise.", "builtins.frozenset" => "Build an immutable unordered collection of unique elements.", "builtins.frozenset.__and__" => "Return self&value.", - "builtins.frozenset.__class_getitem__" => "See PEP 585", + "builtins.frozenset.__class_getitem__" => "frozensets are generic over the type of their elements", "builtins.frozenset.__contains__" => "x.__contains__(y) <==> y in x.", "builtins.frozenset.__delattr__" => "Implement delattr(self, name).", "builtins.frozenset.__eq__" => "Return self==value.", @@ -12517,7 +12517,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.function.__str__" => "Return str(self).", "builtins.function.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.function.__type_params__" => "Get the declared type parameters for a function.", - "builtins.generator.__class_getitem__" => "See PEP 585", + "builtins.generator.__class_getitem__" => "generators are generic over the types of their yield, send, and return values", "builtins.generator.__del__" => "Called when the instance is about to be destroyed.", "builtins.generator.__delattr__" => "Implement delattr(self, name).", "builtins.generator.__eq__" => "Return self==value.", @@ -12546,7 +12546,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.generator.gi_yieldfrom" => "object being iterated by yield from, or None", "builtins.generator.send" => "send(value) -> send 'value' into generator,\nreturn next yielded value or raise StopIteration.", "builtins.generator.throw" => "throw(value)\nthrow(type[,value[,tb]])\n\nRaise exception in generator, return next yielded value or raise\nStopIteration.\nthe (type, val, tb) signature is deprecated, \nand may be removed in a future version of Python.", - "builtins.getattr" => "getattr(object, name[, default]) -> value\n\nGet a named attribute from an object; getattr(x, 'y') is equivalent to x.y.\nWhen a default argument is given, it is returned when the attribute doesn't\nexist; without it, an exception is raised in that case.", + "builtins.getattr" => "getattr(object, name[, default]) -> value\n\nGet a named attribute from an object.\n\ngetattr(x, 'y') is equivalent to x.y.\nWhen a default argument is given, it is returned when the attribute\ndoesn't exist; without it, an exception is raised in that case.", "builtins.getset_descriptor.__delattr__" => "Implement delattr(self, name).", "builtins.getset_descriptor.__delete__" => "Delete an attribute of instance.", "builtins.getset_descriptor.__eq__" => "Return self==value.", @@ -12571,13 +12571,13 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.getset_descriptor.__sizeof__" => "Size of object in memory, in bytes.", "builtins.getset_descriptor.__str__" => "Return str(self).", "builtins.getset_descriptor.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", - "builtins.globals" => "Return the dictionary containing the current scope's global variables.\n\nNOTE: Updates to this dictionary *will* affect name lookups in the current\nglobal scope and vice-versa.", + "builtins.globals" => "Return the dictionary containing the current scope's global variables.\n\nNOTE: Updates to this dictionary *will* affect name lookups in the\ncurrent global scope and vice-versa.", "builtins.hasattr" => "Return whether the object has an attribute with the given name.\n\nThis is done by calling getattr(obj, name) and catching AttributeError.", "builtins.hash" => "Return the integer hash value for the given object.\n\nTwo objects that compare equal must also have the same hash value, but\nthe reverse is not necessarily true. Hash values may differ between\nPython processes. Not all objects are hashable; calling hash() on an\nunhashable object raises TypeError.", "builtins.hex" => "Return the hexadecimal representation of an integer.\n\n >>> hex(12648430)\n '0xc0ffee'", "builtins.id" => "Return the identity of an object.\n\nThis is guaranteed to be unique among simultaneously existing objects.\n(CPython uses the object's memory address.)", - "builtins.input" => "Read a string from standard input. The trailing newline is stripped.\n\nThe prompt string, if given, is printed to standard output without a\ntrailing newline before reading input.\n\nIf the user hits EOF (*nix: Ctrl-D, Windows: Ctrl-Z+Return), raise EOFError.\nOn *nix systems, readline is used if available.", - "builtins.int" => "int([x]) -> integer\nint(x, base=10) -> integer\n\nConvert a number or string to an integer, or return 0 if no arguments\nare given. If x is a number, return x.__int__(). For floating-point\nnumbers, this truncates towards zero.\n\nIf x is not a number or if base is given, then x must be a string,\nbytes, or bytearray instance representing an integer literal in the\ngiven base. The literal can be preceded by '+' or '-' and be surrounded\nby whitespace. The base defaults to 10. Valid bases are 0 and 2-36.\nBase 0 means to interpret the base from the string as an integer literal.\n>>> int('0b100', base=0)\n4", + "builtins.input" => "Read a string from standard input. The trailing newline is stripped.\n\nThe prompt string, if given, is printed to standard output without a\ntrailing newline before reading input.\n\nIf the user hits EOF (*nix: Ctrl-D, Windows: Ctrl-Z+Return), raise\nEOFError.\nOn *nix systems, readline is used if available.", + "builtins.int" => "int([x]) -> integer\nint(x, base=10) -> integer\n\nConvert a number or string to an integer, or return 0 if no arguments\nare given. If x is a number, return x.__int__(). For floating-point\nnumbers, this truncates towards zero.\n\nIf x is not a number or if base is given, then x must be a string,\nbytes, or bytearray instance representing an integer literal in the\ngiven base. The literal can be preceded by '+' or '-' and be surrounded\nby whitespace. The base defaults to 10. Valid bases are 0 and 2-36.\nBase 0 means to interpret the base from the string as an integer\niteral.\n>>> int('0b100', base=0)\n4", "builtins.int.__abs__" => "abs(self)", "builtins.int.__add__" => "Return self+value.", "builtins.int.__and__" => "Return self&value.", @@ -12642,19 +12642,19 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.int.bit_length" => "Number of bits necessary to represent self in binary.\n\n>>> bin(37)\n'0b100101'\n>>> (37).bit_length()\n6", "builtins.int.conjugate" => "Returns self, the complex conjugate of any int.", "builtins.int.denominator" => "the denominator of a rational number in lowest terms", - "builtins.int.from_bytes" => "Return the integer represented by the given array of bytes.\n\n bytes\n Holds the array of bytes to convert. The argument must either\n support the buffer protocol or be an iterable object producing bytes.\n Bytes and bytearray are examples of built-in objects that support the\n buffer protocol.\n byteorder\n The byte order used to represent the integer. If byteorder is 'big',\n the most significant byte is at the beginning of the byte array. If\n byteorder is 'little', the most significant byte is at the end of the\n byte array. To request the native byte order of the host system, use\n sys.byteorder as the byte order value. Default is to use 'big'.\n signed\n Indicates whether two's complement is used to represent the integer.", + "builtins.int.from_bytes" => "Return the integer represented by the given array of bytes.\n\n bytes\n Holds the array of bytes to convert. The argument must either\n support the buffer protocol or be an iterable object producing\n bytes. Bytes and bytearray are examples of built-in objects that\n support the buffer protocol.\n byteorder\n The byte order used to represent the integer. If byteorder is\n 'big', the most significant byte is at the beginning of the byte\n array. If byteorder is 'little', the most significant byte is at\n the end of the byte array. To request the native byte order of\n the host system, use sys.byteorder as the byte order value.\n Default is to use 'big'.\n signed\n Indicates whether two's complement is used to represent the\n integer.", "builtins.int.imag" => "the imaginary part of a complex number", "builtins.int.is_integer" => "Returns True. Exists for duck type compatibility with float.is_integer.", "builtins.int.numerator" => "the numerator of a rational number in lowest terms", "builtins.int.real" => "the real part of a complex number", - "builtins.int.to_bytes" => "Return an array of bytes representing an integer.\n\n length\n Length of bytes object to use. An OverflowError is raised if the\n integer is not representable with the given number of bytes. Default\n is length 1.\n byteorder\n The byte order used to represent the integer. If byteorder is 'big',\n the most significant byte is at the beginning of the byte array. If\n byteorder is 'little', the most significant byte is at the end of the\n byte array. To request the native byte order of the host system, use\n sys.byteorder as the byte order value. Default is to use 'big'.\n signed\n Determines whether two's complement is used to represent the integer.\n If signed is False and a negative integer is given, an OverflowError\n is raised.", - "builtins.isinstance" => "Return whether an object is an instance of a class or of a subclass thereof.\n\nA tuple, as in ``isinstance(x, (A, B, ...))``, may be given as the target to\ncheck against. This is equivalent to ``isinstance(x, A) or isinstance(x, B)\nor ...`` etc.", - "builtins.issubclass" => "Return whether 'cls' is derived from another class or is the same class.\n\nA tuple, as in ``issubclass(x, (A, B, ...))``, may be given as the target to\ncheck against. This is equivalent to ``issubclass(x, A) or issubclass(x, B)\nor ...``.", - "builtins.iter" => "iter(iterable) -> iterator\niter(callable, sentinel) -> iterator\n\nGet an iterator from an object. In the first form, the argument must\nsupply its own iterator, or be a sequence.\nIn the second form, the callable is called until it returns the sentinel.", + "builtins.int.to_bytes" => "Return an array of bytes representing an integer.\n\n length\n Length of bytes object to use. An OverflowError is raised if\n the integer is not representable with the given number of bytes.\n Default is length 1.\n byteorder\n The byte order used to represent the integer. If byteorder is\n 'big', the most significant byte is at the beginning of the byte\n array. If byteorder is 'little', the most significant byte is at\n the end of the byte array. To request the native byte order of\n the host system, use sys.byteorder as the byte order value.\n Default is to use 'big'.\n signed\n Determines whether two's complement is used to represent the\n integer. If signed is False and a negative integer is given,\n an OverflowError is raised.", + "builtins.isinstance" => "Return whether an object is an instance of a class or of a subclass thereof.\n\nA tuple, as in ``isinstance(x, (A, B, ...))``, may be given as the\ntarget to check against. This is equivalent to ``isinstance(x, A) or\nisinstance(x, B) or ...`` etc.", + "builtins.issubclass" => "Return whether 'cls' is derived from another class or is the same class.\n\nA tuple, as in ``issubclass(x, (A, B, ...))``, may be given as the\ntarget to check against. This is equivalent to ``issubclass(x, A) or\nissubclass(x, B) or ...``.", + "builtins.iter" => "iter(iterable) -> iterator\niter(callable, sentinel) -> iterator\n\nGet an iterator from an object. In the first form, the argument must\nsupply its own iterator, or be a sequence.\nIn the second form, the callable is called until it returns the\nsentinel.", "builtins.len" => "Return the number of items in a container.", "builtins.list" => "Built-in mutable sequence.\n\nIf no argument is given, the constructor creates a new empty list.\nThe argument must be an iterable if specified.", "builtins.list.__add__" => "Return self+value.", - "builtins.list.__class_getitem__" => "See PEP 585", + "builtins.list.__class_getitem__" => "lists are generic over the type of their contents", "builtins.list.__contains__" => "Return bool(key in self).", "builtins.list.__delattr__" => "Implement delattr(self, name).", "builtins.list.__delitem__" => "Delete self[key].", @@ -12696,7 +12696,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.list.pop" => "Remove and return item at index (default last).\n\nRaises IndexError if list is empty or index is out of range.", "builtins.list.remove" => "Remove first occurrence of value.\n\nRaises ValueError if the value is not present.", "builtins.list.reverse" => "Reverse *IN PLACE*.", - "builtins.list.sort" => "Sort the list in ascending order and return None.\n\nThe sort is in-place (i.e. the list itself is modified) and stable (i.e. the\norder of two equal elements is maintained).\n\nIf a key function is given, apply it once to each list item and sort them,\nascending or descending, according to their function values.\n\nThe reverse flag can be set to sort in descending order.", + "builtins.list.sort" => "Sort the list in ascending order and return None.\n\nThe sort is in-place (i.e. the list itself is modified) and stable\n(i.e. the order of two equal elements is maintained).\n\nIf a key function is given, apply it once to each list item and sort\nthem, ascending or descending, according to their function values.\n\nThe reverse flag can be set to sort in descending order.", "builtins.list_iterator.__delattr__" => "Implement delattr(self, name).", "builtins.list_iterator.__eq__" => "Return self==value.", "builtins.list_iterator.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", @@ -12722,8 +12722,8 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.list_iterator.__sizeof__" => "Size of object in memory, in bytes.", "builtins.list_iterator.__str__" => "Return str(self).", "builtins.list_iterator.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", - "builtins.locals" => "Return a dictionary containing the current scope's local variables.\n\nNOTE: Whether or not updates to this dictionary will affect name lookups in\nthe local scope and vice-versa is *implementation dependent* and not\ncovered by any backwards compatibility guarantees.", - "builtins.map" => "Make an iterator that computes the function using arguments from\neach of the iterables. Stops when the shortest iterable is exhausted.\n\nIf strict is true and one of the arguments is exhausted before the others,\nraise a ValueError.", + "builtins.locals" => "Return a dictionary containing the current scope's local variables.\n\nNOTE: Whether or not updates to this dictionary will affect name\nlookups in the local scope and vice-versa is *implementation\ndependent* and not covered by any backwards compatibility\nguarantees.", + "builtins.map" => "Make an iterator that computes the function using arguments from\neach of the iterables. Stops when the shortest iterable is exhausted.\n\nIf strict is true and one of the arguments is exhausted before the\nothers, raise a ValueError.", "builtins.map.__delattr__" => "Implement delattr(self, name).", "builtins.map.__eq__" => "Return self==value.", "builtins.map.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", @@ -12749,7 +12749,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.map.__str__" => "Return str(self).", "builtins.map.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.mappingproxy" => "Read-only proxy of a mapping.", - "builtins.mappingproxy.__class_getitem__" => "See PEP 585", + "builtins.mappingproxy.__class_getitem__" => "mappingproxy objects are generic over two types, signifying (respectively) the types of their keys and values", "builtins.mappingproxy.__contains__" => "Return bool(key in self).", "builtins.mappingproxy.__delattr__" => "Implement delattr(self, name).", "builtins.mappingproxy.__eq__" => "Return self==value.", @@ -12833,7 +12833,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.memory_iterator.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.memoryview" => "Create a new memoryview object which references the given object.", "builtins.memoryview.__buffer__" => "Return a buffer object that exposes the underlying memory of the object.", - "builtins.memoryview.__class_getitem__" => "See PEP 585", + "builtins.memoryview.__class_getitem__" => "memoryviews are generic over the type of their underlying data", "builtins.memoryview.__delattr__" => "Implement delattr(self, name).", "builtins.memoryview.__delitem__" => "Delete self[key].", "builtins.memoryview.__eq__" => "Return self==value.", @@ -12869,7 +12869,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.memoryview.count" => "Count the number of occurrences of a value.", "builtins.memoryview.f_contiguous" => "A bool indicating whether the memory is Fortran contiguous.", "builtins.memoryview.format" => "A string containing the format (in struct module style)\n for each element in the view.", - "builtins.memoryview.hex" => "Return the data in the buffer as a str of hexadecimal numbers.\n\n sep\n An optional single character or byte to separate hex bytes.\n bytes_per_sep\n How many bytes between separators. Positive values count from the\n right, negative values count from the left.\n\nExample:\n>>> value = memoryview(b'\\xb9\\x01\\xef')\n>>> value.hex()\n'b901ef'\n>>> value.hex(':')\n'b9:01:ef'\n>>> value.hex(':', 2)\n'b9:01ef'\n>>> value.hex(':', -2)\n'b901:ef'", + "builtins.memoryview.hex" => "Return the data in the buffer as a str of hexadecimal numbers.\n\n sep\n An optional single character or byte to separate hex bytes.\n bytes_per_sep\n How many bytes between separators. Positive values count from\n the right, negative values count from the left.\n\nExample:\n>>> value = memoryview(b'\\xb9\\x01\\xef')\n>>> value.hex()\n'b901ef'\n>>> value.hex(':')\n'b9:01:ef'\n>>> value.hex(':', 2)\n'b9:01ef'\n>>> value.hex(':', -2)\n'b901:ef'", "builtins.memoryview.index" => "Return the index of the first occurrence of a value.\n\nRaises ValueError if the value is not present.", "builtins.memoryview.itemsize" => "The size in bytes of each element of the memoryview.", "builtins.memoryview.nbytes" => "The amount of space in bytes that the array would use in\n a contiguous representation.", @@ -12880,7 +12880,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.memoryview.shape" => "A tuple of ndim integers giving the shape of the memory\n as an N-dimensional array.", "builtins.memoryview.strides" => "A tuple of ndim integers giving the size in bytes to access\n each element for each dimension of the array.", "builtins.memoryview.suboffsets" => "A tuple of integers used internally for PIL-style arrays.", - "builtins.memoryview.tobytes" => "Return the data in the buffer as a byte string.\n\nOrder can be {'C', 'F', 'A'}. When order is 'C' or 'F', the data of the\noriginal array is converted to C or Fortran order. For contiguous views,\n'A' returns an exact copy of the physical memory. In particular, in-memory\nFortran order is preserved. For non-contiguous views, the data is converted\nto C first. order=None is the same as order='C'.", + "builtins.memoryview.tobytes" => "Return the data in the buffer as a byte string.\n\nOrder can be {'C', 'F', 'A'}. When order is 'C' or 'F', the data of\nthe original array is converted to C or Fortran order. For\ncontiguous views, 'A' returns an exact copy of the physical memory.\nIn particular, in-memory Fortran order is preserved. For\nnon-contiguous views, the data is converted to C first. order=None\nis the same as order='C'.", "builtins.memoryview.tolist" => "Return the data in the buffer as a list of elements.", "builtins.memoryview.toreadonly" => "Return a readonly version of the memoryview.", "builtins.method" => "Create a bound instance method object.", @@ -12974,7 +12974,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.module.__sizeof__" => "Size of object in memory, in bytes.", "builtins.module.__str__" => "Return str(self).", "builtins.module.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", - "builtins.next" => "next(iterator[, default])\n\nReturn the next item from the iterator. If default is given and the iterator\nis exhausted, it is returned instead of raising StopIteration.", + "builtins.next" => "next(iterator[, default])\n\nReturn the next item from the iterator. If default is given and the\niterator is exhausted, it is returned instead of raising StopIteration.", "builtins.object" => "The base class of the class hierarchy.\n\nWhen called, it accepts no arguments and returns a new featureless\ninstance that has no instance attributes and cannot be given any.", "builtins.object.__delattr__" => "Implement delattr(self, name).", "builtins.object.__eq__" => "Return self==value.", @@ -12998,9 +12998,9 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.object.__str__" => "Return str(self).", "builtins.object.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.oct" => "Return the octal representation of an integer.\n\n >>> oct(342391)\n '0o1234567'", - "builtins.open" => "Open file and return a stream. Raise OSError upon failure.\n\nfile is either a text or byte string giving the name (and the path\nif the file isn't in the current working directory) of the file to\nbe opened or an integer file descriptor of the file to be\nwrapped. (If a file descriptor is given, it is closed when the\nreturned I/O object is closed, unless closefd is set to False.)\n\nmode is an optional string that specifies the mode in which the file\nis opened. It defaults to 'r' which means open for reading in text\nmode. Other common values are 'w' for writing (truncating the file if\nit already exists), 'x' for creating and writing to a new file, and\n'a' for appending (which on some Unix systems, means that all writes\nappend to the end of the file regardless of the current seek position).\nIn text mode, if encoding is not specified the encoding used is platform\ndependent: locale.getencoding() is called to get the current locale encoding.\n(For reading and writing raw bytes use binary mode and leave encoding\nunspecified.) The available modes are:\n\n========= ===============================================================\nCharacter Meaning\n--------- ---------------------------------------------------------------\n'r' open for reading (default)\n'w' open for writing, truncating the file first\n'x' create a new file and open it for writing\n'a' open for writing, appending to the end of the file if it exists\n'b' binary mode\n't' text mode (default)\n'+' open a disk file for updating (reading and writing)\n========= ===============================================================\n\nThe default mode is 'rt' (open for reading text). For binary random\naccess, the mode 'w+b' opens and truncates the file to 0 bytes, while\n'r+b' opens the file without truncation. The 'x' mode implies 'w' and\nraises an `FileExistsError` if the file already exists.\n\nPython distinguishes between files opened in binary and text modes,\neven when the underlying operating system doesn't. Files opened in\nbinary mode (appending 'b' to the mode argument) return contents as\nbytes objects without any decoding. In text mode (the default, or when\n't' is appended to the mode argument), the contents of the file are\nreturned as strings, the bytes having been first decoded using a\nplatform-dependent encoding or using the specified encoding if given.\n\nbuffering is an optional integer used to set the buffering policy.\nPass 0 to switch buffering off (only allowed in binary mode), 1 to select\nline buffering (only usable in text mode), and an integer > 1 to indicate\nthe size of a fixed-size chunk buffer. When no buffering argument is\ngiven, the default buffering policy works as follows:\n\n* Binary files are buffered in fixed-size chunks; the size of the buffer\n is max(min(blocksize, 8 MiB), DEFAULT_BUFFER_SIZE)\n when the device block size is available.\n On most systems, the buffer will typically be 128 kilobytes long.\n\n* \"Interactive\" text files (files for which isatty() returns True)\n use line buffering. Other text files use the policy described above\n for binary files.\n\nencoding is the name of the encoding used to decode or encode the\nfile. This should only be used in text mode. The default encoding is\nplatform dependent, but any encoding supported by Python can be\npassed. See the codecs module for the list of supported encodings.\n\nerrors is an optional string that specifies how encoding errors are to\nbe handled---this argument should not be used in binary mode. Pass\n'strict' to raise a ValueError exception if there is an encoding error\n(the default of None has the same effect), or pass 'ignore' to ignore\nerrors. (Note that ignoring encoding errors can lead to data loss.)\nSee the documentation for codecs.register or run 'help(codecs.Codec)'\nfor a list of the permitted encoding error strings.\n\nnewline controls how universal newlines works (it only applies to text\nmode). It can be None, '', '\\n', '\\r', and '\\r\\n'. It works as\nfollows:\n\n* On input, if newline is None, universal newlines mode is\n enabled. Lines in the input can end in '\\n', '\\r', or '\\r\\n', and\n these are translated into '\\n' before being returned to the\n caller. If it is '', universal newline mode is enabled, but line\n endings are returned to the caller untranslated. If it has any of\n the other legal values, input lines are only terminated by the given\n string, and the line ending is returned to the caller untranslated.\n\n* On output, if newline is None, any '\\n' characters written are\n translated to the system default line separator, os.linesep. If\n newline is '' or '\\n', no translation takes place. If newline is any\n of the other legal values, any '\\n' characters written are translated\n to the given string.\n\nIf closefd is False, the underlying file descriptor will be kept open\nwhen the file is closed. This does not work when a file name is given\nand must be True in that case.\n\nA custom opener can be used by passing a callable as *opener*. The\nunderlying file descriptor for the file object is then obtained by\ncalling *opener* with (*file*, *flags*). *opener* must return an open\nfile descriptor (passing os.open as *opener* results in functionality\nsimilar to passing None).\n\nopen() returns a file object whose type depends on the mode, and\nthrough which the standard file operations such as reading and writing\nare performed. When open() is used to open a file in a text mode ('w',\n'r', 'wt', 'rt', etc.), it returns a TextIOWrapper. When used to open\na file in a binary mode, the returned class varies: in read binary\nmode, it returns a BufferedReader; in write binary and append binary\nmodes, it returns a BufferedWriter, and in read/write mode, it returns\na BufferedRandom.\n\nIt is also possible to use a string or bytearray as a file for both\nreading and writing. For strings StringIO can be used like a file\nopened in a text mode, and for bytes a BytesIO can be used like a file\nopened in a binary mode.", + "builtins.open" => "Open file and return a stream. Raise OSError upon failure.\n\nfile is either a text or byte string giving the name (and the path\nif the file isn't in the current working directory) of the file to\nbe opened or an integer file descriptor of the file to be\nwrapped. (If a file descriptor is given, it is closed when the\nreturned I/O object is closed, unless closefd is set to False.)\n\nmode is an optional string that specifies the mode in which the file\nis opened. It defaults to 'r' which means open for reading in text\nmode. Other common values are 'w' for writing (truncating the file if\nit already exists), 'x' for creating and writing to a new file, and\n'a' for appending (which on some Unix systems, means that all writes\nappend to the end of the file regardless of the current seek position).\nIn text mode, if encoding is not specified the encoding used is platform\ndependent: locale.getencoding() is called to get the current locale\nencoding. (For reading and writing raw bytes use binary mode and leave\nencoding unspecified.) The available modes are:\n\n========= ==========================================================\nCharacter Meaning\n--------- ----------------------------------------------------------\n'r' open for reading (default)\n'w' open for writing, truncating the file first\n'x' create a new file and open it for writing\n'a' open for writing, appending to the end of the file if it\n exists\n'b' binary mode\n't' text mode (default)\n'+' open a disk file for updating (reading and writing)\n========= ==========================================================\n\nThe default mode is 'rt' (open for reading text). For binary random\naccess, the mode 'w+b' opens and truncates the file to 0 bytes, while\n'r+b' opens the file without truncation. The 'x' mode implies 'w' and\nraises an `FileExistsError` if the file already exists.\n\nPython distinguishes between files opened in binary and text modes,\neven when the underlying operating system doesn't. Files opened in\nbinary mode (appending 'b' to the mode argument) return contents as\nbytes objects without any decoding. In text mode (the default, or when\n't' is appended to the mode argument), the contents of the file are\nreturned as strings, the bytes having been first decoded using a\nplatform-dependent encoding or using the specified encoding if given.\n\nbuffering is an optional integer used to set the buffering policy.\nPass 0 to switch buffering off (only allowed in binary mode), 1 to\nselect line buffering (only usable in text mode), and an integer > 1 to\nindicate the size of a fixed-size chunk buffer. When no buffering\nargument is given, the default buffering policy works as follows:\n\n* Binary files are buffered in fixed-size chunks; the size of the buffer\n is max(min(blocksize, 8 MiB), DEFAULT_BUFFER_SIZE) when the device\n block size is available.\n On most systems, the buffer will typically be 128 kilobytes long.\n\n* \"Interactive\" text files (files for which isatty() returns True)\n use line buffering. Other text files use the policy described above\n for binary files.\n\nencoding is the name of the encoding used to decode or encode the\nfile. This should only be used in text mode. The default encoding is\nplatform dependent, but any encoding supported by Python can be\npassed. See the codecs module for the list of supported encodings.\n\nerrors is an optional string that specifies how encoding errors are to\nbe handled---this argument should not be used in binary mode. Pass\n'strict' to raise a ValueError exception if there is an encoding error\n(the default of None has the same effect), or pass 'ignore' to ignore\nerrors. (Note that ignoring encoding errors can lead to data loss.)\nSee the documentation for codecs.register or run 'help(codecs.Codec)'\nfor a list of the permitted encoding error strings.\n\nnewline controls how universal newlines works (it only applies to text\nmode). It can be None, '', '\\n', '\\r', and '\\r\\n'. It works as\nfollows:\n\n* On input, if newline is None, universal newlines mode is enabled.\n Lines in the input can end in '\\n', '\\r', or '\\r\\n', and these are\n translated into '\\n' before being returned to the caller. If it is\n '', universal newline mode is enabled, but line endings are returned\n to the caller untranslated. If it has any of the other legal values,\n input lines are only terminated by the given string, and the line\n ending is returned to the caller untranslated.\n\n* On output, if newline is None, any '\\n' characters written are\n translated to the system default line separator, os.linesep. If\n newline is '' or '\\n', no translation takes place. If newline is any\n of the other legal values, any '\\n' characters written are translated\n to the given string.\n\nIf closefd is False, the underlying file descriptor will be kept open\nwhen the file is closed. This does not work when a file name is given\nand must be True in that case.\n\nA custom opener can be used by passing a callable as *opener*. The\nunderlying file descriptor for the file object is then obtained by\ncalling *opener* with (*file*, *flags*). *opener* must return an open\nfile descriptor (passing os.open as *opener* results in functionality\nsimilar to passing None).\n\nopen() returns a file object whose type depends on the mode, and\nthrough which the standard file operations such as reading and writing\nare performed. When open() is used to open a file in a text mode ('w',\n'r', 'wt', 'rt', etc.), it returns a TextIOWrapper. When used to open\na file in a binary mode, the returned class varies: in read binary\nmode, it returns a BufferedReader; in write binary and append binary\nmodes, it returns a BufferedWriter, and in read/write mode, it returns\na BufferedRandom.\n\nIt is also possible to use a string or bytearray as a file for both\nreading and writing. For strings StringIO can be used like a file\nopened in a text mode, and for bytes a BytesIO can be used like a file\nopened in a binary mode.", "builtins.ord" => "Return the ordinal value of a character.\n\nIf the argument is a one-character string, return the Unicode code\npoint of that character.\n\nIf the argument is a bytes or bytearray object of length 1, return its\nsingle byte value.", - "builtins.pow" => "Equivalent to base**exp with 2 arguments or base**exp % mod with 3 arguments\n\nSome types, such as ints, are able to use a more efficient algorithm when\ninvoked using the three argument form.", + "builtins.pow" => "Equivalent to base**exp with 2 arguments or base**exp % mod with 3 arguments\n\nSome types, such as ints, are able to use a more efficient algorithm\nwhen invoked using the three argument form.", "builtins.print" => "Prints the values to a stream, or to sys.stdout by default.\n\n sep\n string inserted between values, default a space.\n end\n string appended after the last value, default a newline.\n file\n a file-like object (stream); defaults to the current sys.stdout.\n flush\n whether to forcibly flush the stream.", "builtins.property" => "Property attribute.\n\n fget\n function to be used for getting an attribute value\n fset\n function to be used for setting an attribute value\n fdel\n function to be used for del'ing an attribute\n doc\n docstring\n\nTypical use is to define a managed attribute x:\n\nclass C(object):\n def getx(self): return self._x\n def setx(self, value): self._x = value\n def delx(self): del self._x\n x = property(getx, setx, delx, \"I'm the 'x' property.\")\n\nDecorators make defining new properties or modifying existing ones easy:\n\nclass C(object):\n @property\n def x(self):\n \"I am the 'x' property.\"\n return self._x\n @x.setter\n def x(self, value):\n self._x = value\n @x.deleter\n def x(self):\n del self._x", "builtins.property.__delattr__" => "Implement delattr(self, name).", @@ -13112,10 +13112,10 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.reversed.__sizeof__" => "Size of object in memory, in bytes.", "builtins.reversed.__str__" => "Return str(self).", "builtins.reversed.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", - "builtins.round" => "Round a number to a given precision in decimal digits.\n\nThe return value is an integer if ndigits is omitted or None. Otherwise\nthe return value has the same type as the number. ndigits may be negative.", + "builtins.round" => "Round a number to a given precision in decimal digits.\n\nThe return value is an integer if ndigits is omitted or None.\nOtherwise the return value has the same type as the number. ndigits\nmay be negative.", "builtins.set" => "Build an unordered collection of unique elements.", "builtins.set.__and__" => "Return self&value.", - "builtins.set.__class_getitem__" => "See PEP 585", + "builtins.set.__class_getitem__" => "sets are generic over the type of their elements", "builtins.set.__contains__" => "x.__contains__(y) <==> y in x.", "builtins.set.__delattr__" => "Implement delattr(self, name).", "builtins.set.__eq__" => "Return self==value.", @@ -13192,7 +13192,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.set_iterator.__str__" => "Return str(self).", "builtins.set_iterator.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.setattr" => "Sets the named attribute on the given object to the specified value.\n\nsetattr(x, 'y', v) is equivalent to ``x.y = v``", - "builtins.slice" => "slice(stop)\nslice(start, stop[, step])\n\nCreate a slice object. This is used for extended slicing (e.g. a[0:10:2]).", + "builtins.slice" => "slice(stop)\nslice(start, stop[, step])\n\nCreate a slice object.\n\nThis is used for extended slicing (e.g. a[0:10:2]).", "builtins.slice.__delattr__" => "Implement delattr(self, name).", "builtins.slice.__eq__" => "Return self==value.", "builtins.slice.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", @@ -13271,51 +13271,51 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.str.__sizeof__" => "Return the size of the string in memory, in bytes.", "builtins.str.__str__" => "Return str(self).", "builtins.str.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", - "builtins.str.capitalize" => "Return a capitalized version of the string.\n\nMore specifically, make the first character have upper case and the rest lower\ncase.", + "builtins.str.capitalize" => "Return a capitalized version of the string.\n\nMore specifically, make the first character have upper case and the\nrest lower case.", "builtins.str.casefold" => "Return a version of the string suitable for caseless comparisons.", - "builtins.str.center" => "Return a centered string of length width.\n\nPadding is done using the specified fill character (default is a space).", - "builtins.str.count" => "Return the number of non-overlapping occurrences of substring sub in string S[start:end].\n\nOptional arguments start and end are interpreted as in slice notation.", - "builtins.str.encode" => "Encode the string using the codec registered for encoding.\n\n encoding\n The encoding in which to encode the string.\n errors\n The error handling scheme to use for encoding errors.\n The default is 'strict' meaning that encoding errors raise a\n UnicodeEncodeError. Other possible values are 'ignore', 'replace' and\n 'xmlcharrefreplace' as well as any other name registered with\n codecs.register_error that can handle UnicodeEncodeErrors.", + "builtins.str.center" => "Return a centered string of length width.\n\nPadding is done using the specified fill character (default is\na space).", + "builtins.str.count" => "Return the number of non-overlapping occurrences of substring sub in string S[start:end].\n\nOptional arguments start and end are interpreted as in slice\nnotation.", + "builtins.str.encode" => "Encode the string using the codec registered for encoding.\n\n encoding\n The encoding in which to encode the string.\n errors\n The error handling scheme to use for encoding errors.\n The default is 'strict' meaning that encoding errors raise a\n UnicodeEncodeError. Other possible values are 'ignore', 'replace'\n and 'xmlcharrefreplace' as well as any other name registered with\n codecs.register_error that can handle UnicodeEncodeErrors.", "builtins.str.endswith" => "Return True if the string ends with the specified suffix, False otherwise.\n\n suffix\n A string or a tuple of strings to try.\n start\n Optional start position. Default: start of the string.\n end\n Optional stop position. Default: end of the string.", "builtins.str.expandtabs" => "Return a copy where all tab characters are expanded using spaces.\n\nIf tabsize is not given, a tab size of 8 characters is assumed.", - "builtins.str.find" => "Return the lowest index in S where substring sub is found, such that sub is contained within S[start:end].\n\nOptional arguments start and end are interpreted as in slice notation.\nReturn -1 on failure.", + "builtins.str.find" => "Return the lowest index in S where substring sub is found, such that sub is contained within S[start:end].\n\nOptional arguments start and end are interpreted as in slice\nnotation. Return -1 on failure.", "builtins.str.format" => "Return a formatted version of the string, using substitutions from args and kwargs.\nThe substitutions are identified by braces ('{' and '}').", "builtins.str.format_map" => "Return a formatted version of the string, using substitutions from mapping.\nThe substitutions are identified by braces ('{' and '}').", - "builtins.str.index" => "Return the lowest index in S where substring sub is found, such that sub is contained within S[start:end].\n\nOptional arguments start and end are interpreted as in slice notation.\nRaises ValueError when the substring is not found.", - "builtins.str.isalnum" => "Return True if the string is an alpha-numeric string, False otherwise.\n\nA string is alpha-numeric if all characters in the string are alpha-numeric and\nthere is at least one character in the string.", - "builtins.str.isalpha" => "Return True if the string is an alphabetic string, False otherwise.\n\nA string is alphabetic if all characters in the string are alphabetic and there\nis at least one character in the string.", + "builtins.str.index" => "Return the lowest index in S where substring sub is found, such that sub is contained within S[start:end].\n\nOptional arguments start and end are interpreted as in slice\nnotation. Raises ValueError when the substring is not found.", + "builtins.str.isalnum" => "Return True if the string is an alpha-numeric string, False otherwise.\n\nA string is alpha-numeric if all characters in the string are\nalpha-numeric and there is at least one character in the string.", + "builtins.str.isalpha" => "Return True if the string is an alphabetic string, False otherwise.\n\nA string is alphabetic if all characters in the string are\nalphabetic and there is at least one character in the string.", "builtins.str.isascii" => "Return True if all characters in the string are ASCII, False otherwise.\n\nASCII characters have code points in the range U+0000-U+007F.\nEmpty string is ASCII too.", - "builtins.str.isdecimal" => "Return True if the string is a decimal string, False otherwise.\n\nA string is a decimal string if all characters in the string are decimal and\nthere is at least one character in the string.", - "builtins.str.isdigit" => "Return True if the string is a digit string, False otherwise.\n\nA string is a digit string if all characters in the string are digits and there\nis at least one character in the string.", - "builtins.str.isidentifier" => "Return True if the string is a valid Python identifier, False otherwise.\n\nCall keyword.iskeyword(s) to test whether string s is a reserved identifier,\nsuch as \"def\" or \"class\".", - "builtins.str.islower" => "Return True if the string is a lowercase string, False otherwise.\n\nA string is lowercase if all cased characters in the string are lowercase and\nthere is at least one cased character in the string.", - "builtins.str.isnumeric" => "Return True if the string is a numeric string, False otherwise.\n\nA string is numeric if all characters in the string are numeric and there is at\nleast one character in the string.", + "builtins.str.isdecimal" => "Return True if the string is a decimal string, False otherwise.\n\nA string is a decimal string if all characters in the string are\ndecimal and there is at least one character in the string.", + "builtins.str.isdigit" => "Return True if the string is a digit string, False otherwise.\n\nA string is a digit string if all characters in the string are\ndigits and there is at least one character in the string.", + "builtins.str.isidentifier" => "Return True if the string is a valid Python identifier, False otherwise.\n\nCall keyword.iskeyword(s) to test whether string s is a reserved\nidentifier, such as \"def\" or \"class\".", + "builtins.str.islower" => "Return True if the string is a lowercase string, False otherwise.\n\nA string is lowercase if all cased characters in the string are\nlowercase and there is at least one cased character in the string.", + "builtins.str.isnumeric" => "Return True if the string is a numeric string, False otherwise.\n\nA string is numeric if all characters in the string are numeric and\nthere is at least one character in the string.", "builtins.str.isprintable" => "Return True if all characters in the string are printable, False otherwise.\n\nA character is printable if repr() may use it in its output.", - "builtins.str.isspace" => "Return True if the string is a whitespace string, False otherwise.\n\nA string is whitespace if all characters in the string are whitespace and there\nis at least one character in the string.", + "builtins.str.isspace" => "Return True if the string is a whitespace string, False otherwise.\n\nA string is whitespace if all characters in the string are\nwhitespace and there is at least one character in the string.", "builtins.str.istitle" => "Return True if the string is a title-cased string, False otherwise.\n\nIn a title-cased string, upper- and title-case characters may only\nfollow uncased characters and lowercase characters only cased ones.", - "builtins.str.isupper" => "Return True if the string is an uppercase string, False otherwise.\n\nA string is uppercase if all cased characters in the string are uppercase and\nthere is at least one cased character in the string.", - "builtins.str.join" => "Concatenate any number of strings.\n\nThe string whose method is called is inserted in between each given string.\nThe result is returned as a new string.\n\nExample: '.'.join(['ab', 'pq', 'rs']) -> 'ab.pq.rs'", - "builtins.str.ljust" => "Return a left-justified string of length width.\n\nPadding is done using the specified fill character (default is a space).", + "builtins.str.isupper" => "Return True if the string is an uppercase string, False otherwise.\n\nA string is uppercase if all cased characters in the string are\nuppercase and there is at least one cased character in the string.", + "builtins.str.join" => "Concatenate any number of strings.\n\nThe string whose method is called is inserted in between each given\nstring. The result is returned as a new string.\n\nExample: '.'.join(['ab', 'pq', 'rs']) -> 'ab.pq.rs'", + "builtins.str.ljust" => "Return a left-justified string of length width.\n\nPadding is done using the specified fill character (default is\na space).", "builtins.str.lower" => "Return a copy of the string converted to lowercase.", "builtins.str.lstrip" => "Return a copy of the string with leading whitespace removed.\n\nIf chars is given and not None, remove characters in chars instead.", - "builtins.str.maketrans" => "Return a translation table usable for str.translate().\n\nIf there is only one argument, it must be a dictionary mapping Unicode\nordinals (integers) or characters to Unicode ordinals, strings or None.\nCharacter keys will be then converted to ordinals.\nIf there are two arguments, they must be strings of equal length, and\nin the resulting dictionary, each character in x will be mapped to the\ncharacter at the same position in y. If there is a third argument, it\nmust be a string, whose characters will be mapped to None in the result.", - "builtins.str.partition" => "Partition the string into three parts using the given separator.\n\nThis will search for the separator in the string. If the separator is found,\nreturns a 3-tuple containing the part before the separator, the separator\nitself, and the part after it.\n\nIf the separator is not found, returns a 3-tuple containing the original string\nand two empty strings.", - "builtins.str.removeprefix" => "Return a str with the given prefix string removed if present.\n\nIf the string starts with the prefix string, return string[len(prefix):].\nOtherwise, return a copy of the original string.", - "builtins.str.removesuffix" => "Return a str with the given suffix string removed if present.\n\nIf the string ends with the suffix string and that suffix is not empty,\nreturn string[:-len(suffix)]. Otherwise, return a copy of the original\nstring.", + "builtins.str.maketrans" => "Return a translation table usable for str.translate().\n\nIf there is only one argument, it must be a dictionary mapping\nUnicode ordinals (integers) or characters to Unicode ordinals,\nstrings or None. Character keys will be then converted to ordinals.\nIf there are two arguments, they must be strings of equal length,\nand in the resulting dictionary, each character in x will be mapped\nto the character at the same position in y. If there is a third\nargument, it must be a string, whose characters will be mapped to\nNone in the result.", + "builtins.str.partition" => "Partition the string into three parts using the given separator.\n\nThis will search for the separator in the string. If the separator\nis found, returns a 3-tuple containing the part before the\nseparator, the separator itself, and the part after it.\n\nIf the separator is not found, returns a 3-tuple containing\nthe original string and two empty strings.", + "builtins.str.removeprefix" => "Return a str with the given prefix string removed if present.\n\nIf the string starts with the prefix string, return\nstring[len(prefix):]. Otherwise, return a copy of the original\nstring.", + "builtins.str.removesuffix" => "Return a str with the given suffix string removed if present.\n\nIf the string ends with the suffix string and that suffix is not\nempty, return string[:-len(suffix)]. Otherwise, return a copy of\nthe original string.", "builtins.str.replace" => "Return a copy with all occurrences of substring old replaced by new.\n\n count\n Maximum number of occurrences to replace.\n -1 (the default value) means replace all occurrences.\n\nIf the optional argument count is given, only the first count occurrences are\nreplaced.", - "builtins.str.rfind" => "Return the highest index in S where substring sub is found, such that sub is contained within S[start:end].\n\nOptional arguments start and end are interpreted as in slice notation.\nReturn -1 on failure.", - "builtins.str.rindex" => "Return the highest index in S where substring sub is found, such that sub is contained within S[start:end].\n\nOptional arguments start and end are interpreted as in slice notation.\nRaises ValueError when the substring is not found.", - "builtins.str.rjust" => "Return a right-justified string of length width.\n\nPadding is done using the specified fill character (default is a space).", - "builtins.str.rpartition" => "Partition the string into three parts using the given separator.\n\nThis will search for the separator in the string, starting at the end. If\nthe separator is found, returns a 3-tuple containing the part before the\nseparator, the separator itself, and the part after it.\n\nIf the separator is not found, returns a 3-tuple containing two empty strings\nand the original string.", - "builtins.str.rsplit" => "Return a list of the substrings in the string, using sep as the separator string.\n\n sep\n The separator used to split the string.\n\n When set to None (the default value), will split on any whitespace\n character (including \\n \\r \\t \\f and spaces) and will discard\n empty strings from the result.\n maxsplit\n Maximum number of splits.\n -1 (the default value) means no limit.\n\nSplitting starts at the end of the string and works to the front.", + "builtins.str.rfind" => "Return the highest index in S where substring sub is found, such that sub is contained within S[start:end].\n\nOptional arguments start and end are interpreted as in slice\nnotation. Return -1 on failure.", + "builtins.str.rindex" => "Return the highest index in S where substring sub is found, such that sub is contained within S[start:end].\n\nOptional arguments start and end are interpreted as in slice\nnotation. Raises ValueError when the substring is not found.", + "builtins.str.rjust" => "Return a right-justified string of length width.\n\nPadding is done using the specified fill character (default is\na space).", + "builtins.str.rpartition" => "Partition the string into three parts using the given separator.\n\nThis will search for the separator in the string, starting at the\nend. If the separator is found, returns a 3-tuple containing the\npart before the separator, the separator itself, and the part after\nit.\n\nIf the separator is not found, returns a 3-tuple containing two\nempty strings and the original string.", + "builtins.str.rsplit" => "Return a list of the substrings in the string, using sep as the separator string.\n\n sep\n The separator used to split the string.\n\n When set to None (the default value), will split on any\n whitespace character (including \\n \\r \\t \\f and spaces) and\n will discard empty strings from the result.\n maxsplit\n Maximum number of splits.\n -1 (the default value) means no limit.\n\nSplitting starts at the end of the string and works to the front.", "builtins.str.rstrip" => "Return a copy of the string with trailing whitespace removed.\n\nIf chars is given and not None, remove characters in chars instead.", - "builtins.str.split" => "Return a list of the substrings in the string, using sep as the separator string.\n\n sep\n The separator used to split the string.\n\n When set to None (the default value), will split on any whitespace\n character (including \\n \\r \\t \\f and spaces) and will discard\n empty strings from the result.\n maxsplit\n Maximum number of splits.\n -1 (the default value) means no limit.\n\nSplitting starts at the front of the string and works to the end.\n\nNote, str.split() is mainly useful for data that has been intentionally\ndelimited. With natural text that includes punctuation, consider using\nthe regular expression module.", - "builtins.str.splitlines" => "Return a list of the lines in the string, breaking at line boundaries.\n\nLine breaks are not included in the resulting list unless keepends is given and\ntrue.", + "builtins.str.split" => "Return a list of the substrings in the string, using sep as the separator string.\n\n sep\n The separator used to split the string.\n\n When set to None (the default value), will split on any\n whitespace character (including \\n \\r \\t \\f and spaces) and\n will discard empty strings from the result.\n maxsplit\n Maximum number of splits.\n -1 (the default value) means no limit.\n\nSplitting starts at the front of the string and works to the end.\n\nNote, str.split() is mainly useful for data that has been\nintentionally delimited. With natural text that includes\npunctuation, consider using the regular expression module.", + "builtins.str.splitlines" => "Return a list of the lines in the string, breaking at line boundaries.\n\nLine breaks are not included in the resulting list unless keepends\nis given and true.", "builtins.str.startswith" => "Return True if the string starts with the specified prefix, False otherwise.\n\n prefix\n A string or a tuple of strings to try.\n start\n Optional start position. Default: start of the string.\n end\n Optional stop position. Default: end of the string.", "builtins.str.strip" => "Return a copy of the string with leading and trailing whitespace removed.\n\nIf chars is given and not None, remove characters in chars instead.", "builtins.str.swapcase" => "Convert uppercase characters to lowercase and lowercase characters to uppercase.", - "builtins.str.title" => "Return a version of the string where each word is titlecased.\n\nMore specifically, words start with uppercased characters and all remaining\ncased characters have lower case.", - "builtins.str.translate" => "Replace each character in the string using the given translation table.\n\n table\n Translation table, which must be a mapping of Unicode ordinals to\n Unicode ordinals, strings, or None.\n\nThe table must implement lookup/indexing via __getitem__, for instance a\ndictionary or list. If this operation raises LookupError, the character is\nleft untouched. Characters mapped to None are deleted.", + "builtins.str.title" => "Return a version of the string where each word is titlecased.\n\nMore specifically, words start with uppercased characters and all\nremaining cased characters have lower case.", + "builtins.str.translate" => "Replace each character in the string using the given translation table.\n\n table\n Translation table, which must be a mapping of Unicode ordinals\n to Unicode ordinals, strings, or None.\n\nThe table must implement lookup/indexing via __getitem__, for\ninstance a dictionary or list. If this operation raises\nLookupError, the character is left untouched. Characters mapped to\nNone are deleted.", "builtins.str.upper" => "Return a copy of the string converted to uppercase.", "builtins.str.zfill" => "Pad a numeric string with zeros on the left, to fill a field of the given width.\n\nThe string is never truncated.", "builtins.str_ascii_iterator.__delattr__" => "Implement delattr(self, name).", @@ -13343,8 +13343,8 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.str_ascii_iterator.__sizeof__" => "Size of object in memory, in bytes.", "builtins.str_ascii_iterator.__str__" => "Return str(self).", "builtins.str_ascii_iterator.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", - "builtins.sum" => "Return the sum of a 'start' value (default: 0) plus an iterable of numbers\n\nWhen the iterable is empty, return the start value.\nThis function is intended specifically for use with numeric values and may\nreject non-numeric types.", - "builtins.super" => "super() -> same as super(__class__, )\nsuper(type) -> unbound super object\nsuper(type, obj) -> bound super object; requires isinstance(obj, type)\nsuper(type, type2) -> bound super object; requires issubclass(type2, type)\nTypical use to call a cooperative superclass method:\nclass C(B):\n def meth(self, arg):\n super().meth(arg)\nThis works for class methods too:\nclass C(B):\n @classmethod\n def cmeth(cls, arg):\n super().cmeth(arg)", + "builtins.sum" => "Return the sum of a 'start' value (default: 0) plus an iterable of numbers\n\nWhen the iterable is empty, return the start value.\nThis function is intended specifically for use with numeric values and\nmay reject non-numeric types.", + "builtins.super" => "super() -> same as super(__class__, )\nsuper(type) -> unbound super object\nsuper(type, obj) -> bound super object; requires isinstance(obj, type)\nsuper(type, type2) -> bound super object; requires\n issubclass(type2, type)\nTypical use to call a cooperative superclass method:\nclass C(B):\n def meth(self, arg):\n super().meth(arg)\nThis works for class methods too:\nclass C(B):\n @classmethod\n def cmeth(cls, arg):\n super().cmeth(arg)", "builtins.super.__delattr__" => "Implement delattr(self, name).", "builtins.super.__eq__" => "Return self==value.", "builtins.super.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", @@ -13394,7 +13394,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.traceback.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.tuple" => "Built-in immutable sequence.\n\nIf no argument is given, the constructor returns an empty tuple.\nIf iterable is specified the tuple is initialized from iterable's items.\n\nIf the argument is a tuple, the return value is the same object.", "builtins.tuple.__add__" => "Return self+value.", - "builtins.tuple.__class_getitem__" => "See PEP 585", + "builtins.tuple.__class_getitem__" => "Tuples are generic over the types of their contents.\n\nFor example, use ``tuple[int, str]`` for a pair whose first element is an int and second element is a string.\n\nTuples also support the form ``tuple[T, ...]`` to indicate an arbitrary length tuple of elements of type T.", "builtins.tuple.__contains__" => "Return bool(key in self).", "builtins.tuple.__delattr__" => "Implement delattr(self, name).", "builtins.tuple.__eq__" => "Return self==value.", @@ -13524,7 +13524,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.wrapper_descriptor.__sizeof__" => "Size of object in memory, in bytes.", "builtins.wrapper_descriptor.__str__" => "Return str(self).", "builtins.wrapper_descriptor.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", - "builtins.zip" => "The zip object yields n-length tuples, where n is the number of iterables\npassed as positional arguments to zip(). The i-th element in every tuple\ncomes from the i-th iterable argument to zip(). This continues until the\nshortest argument is exhausted.\n\nIf strict is true and one of the arguments is exhausted before the others,\nraise a ValueError.\n\n >>> list(zip('abcdefg', range(3), range(4)))\n [('a', 0, 0), ('b', 1, 1), ('c', 2, 2)]", + "builtins.zip" => "The zip object yields n-length tuples, where n is the number of\niterables passed as positional arguments to zip(). The i-th element\nin every tuple comes from the i-th iterable argument to zip(). This\ncontinues until the shortest argument is exhausted.\n\nIf strict is true and one of the arguments is exhausted before the\nothers, raise a ValueError.\n\n >>> list(zip('abcdefg', range(3), range(4)))\n [('a', 0, 0), ('b', 1, 1), ('c', 2, 2)]", "builtins.zip.__delattr__" => "Implement delattr(self, name).", "builtins.zip.__eq__" => "Return self==value.", "builtins.zip.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", @@ -13559,11 +13559,11 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "cmath.cos" => "Return the cosine of z.", "cmath.cosh" => "Return the hyperbolic cosine of z.", "cmath.exp" => "Return the exponential value e**z.", - "cmath.isclose" => "Determine whether two complex numbers are close in value.\n\n rel_tol\n maximum difference for being considered \"close\", relative to the\n magnitude of the input values\n abs_tol\n maximum difference for being considered \"close\", regardless of the\n magnitude of the input values\n\nReturn True if a is close in value to b, and False otherwise.\n\nFor the values to be considered close, the difference between them must be\nsmaller than at least one of the tolerances.\n\n-inf, inf and NaN behave similarly to the IEEE 754 Standard. That is, NaN is\nnot close to anything, even itself. inf and -inf are only close to themselves.", + "cmath.isclose" => "Determine whether two complex numbers are close in value.\n\n rel_tol\n maximum difference for being considered \"close\", relative to the\n magnitude of the input values\n abs_tol\n maximum difference for being considered \"close\", regardless of the\n magnitude of the input values\n\nReturn True if a is close in value to b, and False otherwise.\n\nFor the values to be considered close, the difference between them must\nbe smaller than at least one of the tolerances.\n\n-inf, inf and NaN behave similarly to the IEEE 754 Standard. That is,\nNaN is not close to anything, even itself. inf and -inf are only close\nto themselves.", "cmath.isfinite" => "Return True if both the real and imaginary parts of z are finite, else False.", "cmath.isinf" => "Checks if the real or imaginary part of z is infinite.", "cmath.isnan" => "Checks if the real or imaginary part of z not a number (NaN).", - "cmath.log" => "log(z[, base]) -> the logarithm of z to the given base.\n\nIf the base is not specified, returns the natural logarithm (base e) of z.", + "cmath.log" => "log(z[, base]) -> the logarithm of z to the given base.\n\nIf the base is not specified, returns the natural logarithm (base e)\nof z.", "cmath.log10" => "Return the base-10 logarithm of z.", "cmath.phase" => "Return argument, also known as the phase angle, of a complex.", "cmath.polar" => "Convert a complex from rectangular coordinates to polar coordinates.\n\nr is the distance from 0 and phi the phase angle.", @@ -13600,11 +13600,11 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "gc.collect" => "Run the garbage collector.\n\nWith no arguments, run a full collection. The optional argument\nmay be an integer specifying which generation to collect. A ValueError\nis raised if the generation number is invalid.\n\nThe number of unreachable objects is returned.", "gc.disable" => "Disable automatic garbage collection.", "gc.enable" => "Enable automatic garbage collection.", - "gc.freeze" => "Freeze all current tracked objects and ignore them for future collections.\n\nThis can be used before a POSIX fork() call to make the gc copy-on-write friendly.\nNote: collection before a POSIX fork() call may free pages for future allocation\nwhich can cause copy-on-write.", + "gc.freeze" => "Freeze all current tracked objects and ignore them for future collections.\n\nThis can be used before a POSIX fork() call to make the gc copy-on-write\nfriendly.\nNote: collection before a POSIX fork() call may free pages for future\nallocation which can cause copy-on-write.", "gc.get_count" => "Return a three-tuple of the current collection counts.", "gc.get_debug" => "Get the garbage collection debugging flags.", "gc.get_freeze_count" => "Return the number of objects in the permanent generation.", - "gc.get_objects" => "Return a list of objects tracked by the collector (excluding the list returned).\n\n generation\n Generation to extract the objects from.\n\nIf generation is not None, return only the objects tracked by the collector\nthat are in that generation.", + "gc.get_objects" => "Return a list of objects tracked by the collector (excluding the list returned).\n\n generation\n Generation to extract the objects from.\n\nIf generation is not None, return only the objects tracked by the\ncollector that are in that generation.", "gc.get_referents" => "Return the list of objects that are directly referred to by 'objs'.", "gc.get_referrers" => "Return the list of objects that directly refer to any of 'objs'.", "gc.get_stats" => "Return a list of dictionaries containing per-generation statistics.", @@ -13621,7 +13621,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "grp.getgrnam" => "Return the group database entry for the given group name.\n\nIf name is not valid, raise KeyError.", "grp.struct_group" => "grp.struct_group: Results from getgr*() routines.\n\nThis object may be accessed either as a tuple of\n (gr_name,gr_passwd,gr_gid,gr_mem)\nor via the object attributes as named in the above tuple.", "grp.struct_group.__add__" => "Return self+value.", - "grp.struct_group.__class_getitem__" => "See PEP 585", + "grp.struct_group.__class_getitem__" => "Tuples are generic over the types of their contents.\n\nFor example, use ``tuple[int, str]`` for a pair whose first element is an int and second element is a string.\n\nTuples also support the form ``tuple[T, ...]`` to indicate an arbitrary length tuple of elements of type T.", "grp.struct_group.__contains__" => "Return bool(key in self).", "grp.struct_group.__delattr__" => "Implement delattr(self, name).", "grp.struct_group.__eq__" => "Return self==value.", @@ -13775,7 +13775,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "itertools.batched.__str__" => "Return str(self).", "itertools.batched.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "itertools.chain" => "Return a chain object whose .__next__() method returns elements from the\nfirst iterable until it is exhausted, then elements from the next\niterable, until all of the iterables are exhausted.", - "itertools.chain.__class_getitem__" => "See PEP 585", + "itertools.chain.__class_getitem__" => "chain is generic over the type of its contents.\nThis is the union of the types of the input iterable contents.", "itertools.chain.__delattr__" => "Implement delattr(self, name).", "itertools.chain.__eq__" => "Return self==value.", "itertools.chain.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", @@ -13848,7 +13848,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "itertools.combinations_with_replacement.__sizeof__" => "Returns size in memory, in bytes.", "itertools.combinations_with_replacement.__str__" => "Return str(self).", "itertools.combinations_with_replacement.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", - "itertools.compress" => "Return data elements corresponding to true selector elements.\n\nForms a shorter iterator from selected data elements using the selectors to\nchoose the data elements.", + "itertools.compress" => "Return data elements corresponding to true selector elements.\n\nForms a shorter iterator from selected data elements using the selectors\nto choose the data elements.", "itertools.compress.__delattr__" => "Implement delattr(self, name).", "itertools.compress.__eq__" => "Return self==value.", "itertools.compress.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", @@ -14188,9 +14188,9 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "itertools.zip_longest.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "marshal" => "This module contains functions that can read and write Python values in\na binary format. The format is specific to Python, but independent of\nmachine architecture issues.\n\nNot all Python object types are supported; in general, only objects\nwhose value is independent from a particular invocation of Python can be\nwritten and read by this module. The following types are supported:\nNone, integers, floating-point numbers, strings, bytes, bytearrays,\ntuples, lists, sets, dictionaries, and code objects, where it\nshould be understood that tuples, lists and dictionaries are only\nsupported as long as the values contained therein are themselves\nsupported; and recursive lists and dictionaries should not be written\n(they will cause infinite loops).\n\nVariables:\n\nversion -- indicates the format that the module uses. Version 0 is the\n historical format, version 1 shares interned strings and version 2\n uses a binary format for floating-point numbers.\n Version 3 shares common object references (New in version 3.4).\n\nFunctions:\n\ndump() -- write value to a file\nload() -- read value from a file\ndumps() -- marshal value as a bytes object\nloads() -- read value from a bytes-like object", "marshal.dump" => "Write the value on the open file.\n\n value\n Must be a supported type.\n file\n Must be a writeable binary file.\n version\n Indicates the data format that dump should use.\n allow_code\n Allow to write code objects.\n\nIf the value has (or contains an object that has) an unsupported type, a\nValueError exception is raised - but garbage data will also be written\nto the file. The object will not be properly read back by load().", - "marshal.dumps" => "Return the bytes object that would be written to a file by dump(value, file).\n\n value\n Must be a supported type.\n version\n Indicates the data format that dumps should use.\n allow_code\n Allow to write code objects.\n\nRaise a ValueError exception if value has (or contains an object that has) an\nunsupported type.", + "marshal.dumps" => "Return the bytes object that would be written to a file by dump(value, file).\n\n value\n Must be a supported type.\n version\n Indicates the data format that dumps should use.\n allow_code\n Allow to write code objects.\n\nRaise a ValueError exception if value has (or contains an object that\nhas) an unsupported type.", "marshal.load" => "Read one value from the open file and return it.\n\n file\n Must be readable binary file.\n allow_code\n Allow to load code objects.\n\nIf no valid value is read (e.g. because the data has a different Python\nversion's incompatible marshal format), raise EOFError, ValueError or\nTypeError.\n\nNote: If an object containing an unsupported type was marshalled with\ndump(), load() will substitute None for the unmarshallable type.", - "marshal.loads" => "Convert the bytes-like object to a value.\n\n allow_code\n Allow to load code objects.\n\nIf no valid value is found, raise EOFError, ValueError or TypeError. Extra\nbytes in the input are ignored.", + "marshal.loads" => "Convert the bytes-like object to a value.\n\n allow_code\n Allow to load code objects.\n\nIf no valid value is found, raise EOFError, ValueError or TypeError.\nExtra bytes in the input are ignored.", "math" => "This module provides access to the mathematical functions\ndefined by the C standard.", "math.acos" => "Return the arc cosine (measured in radians) of x.\n\nThe result is between 0 and pi.", "math.acosh" => "Return the inverse hyperbolic cosine of x.", @@ -14217,7 +14217,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "math.floor" => "Return the floor of x as an Integral.\n\nThis is the largest integer <= x.", "math.fma" => "Fused multiply-add operation.\n\nCompute (x * y) + z with a single round.", "math.fmod" => "Return fmod(x, y), according to platform C.\n\nx % y may differ.", - "math.frexp" => "Return the mantissa and exponent of x, as pair (m, e).\n\nm is a float and e is an int, such that x = m * 2.**e.\nIf x is 0, m and e are both 0. Else 0.5 <= abs(m) < 1.0.", + "math.frexp" => "Return the mantissa and exponent of x, as pair (m, e).\n\nIf x is a finite nonzero number, then m is a float with\n0.5 <= abs(m) < 1.0 and an integer e is such that\nx == m * 2**e exactly. Else, return (x, 0).", "math.fsum" => "Return an accurate floating-point sum of values in the iterable seq.\n\nAssumes IEEE-754 floating-point arithmetic.", "math.gamma" => "Gamma function at x.", "math.gcd" => "Greatest Common Divisor.", @@ -14235,7 +14235,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "math.log1p" => "Return the natural logarithm of 1+x (base e).\n\nThe result is computed in a way which is accurate for x near zero.", "math.log2" => "Return the base 2 logarithm of x.", "math.modf" => "Return the fractional and integer parts of x.\n\nBoth results carry the sign of x and are floats.", - "math.nextafter" => "Return the floating-point value the given number of steps after x towards y.\n\nIf steps is not specified or is None, it defaults to 1.\n\nRaises a TypeError, if x or y is not a double, or if steps is not an integer.\nRaises ValueError if steps is negative.", + "math.nextafter" => "Return the floating-point value the given number of steps after x towards y.\n\nIf steps is not specified or is None, it defaults to 1.\n\nRaises a TypeError, if x or y is not a double, or if steps is not\nan integer. Raises ValueError if steps is negative.", "math.perm" => "Number of ways to choose k items from n items without repetition and with order.\n\nEvaluates to n! / (n - k)! when k <= n and evaluates\nto zero when k > n.\n\nIf k is not specified or is None, then k defaults to n\nand the function returns n!.\n\nRaises TypeError if either of the arguments are not integers.\nRaises ValueError if either of the arguments are negative.", "math.pow" => "Return x**y (x to the power of y).", "math.prod" => "Calculate the product of all the elements in the input iterable.\n\nThe default start value for the product is 1.\n\nWhen the iterable is empty, return the start value. This function is\nintended specifically for use with numeric values and may reject\nnon-numeric types.", @@ -14294,7 +14294,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "msvcrt.ungetch" => "Opposite of getch.\n\nCause the byte string char to be \"pushed back\" into the\nconsole buffer; it will be the next character read by\ngetch() or getche().", "msvcrt.ungetwch" => "Wide char variant of ungetch(), accepting a Unicode value.", "nt" => "This module provides access to operating system functionality that is\nstandardized by the C Standard and the POSIX standard (a thinly\ndisguised Unix interface). Refer to the library manual and\ncorresponding Unix manual entries for more information on calls.", - "nt.DirEntry.__class_getitem__" => "See PEP 585", + "nt.DirEntry.__class_getitem__" => "DirEntry is generic over the type of the path (str or bytes)", "nt.DirEntry.__delattr__" => "Implement delattr(self, name).", "nt.DirEntry.__eq__" => "Return self==value.", "nt.DirEntry.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", @@ -14323,7 +14323,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "nt.DirEntry.is_junction" => "Return True if the entry is a junction; cached per entry.", "nt.DirEntry.is_symlink" => "Return True if the entry is a symbolic link; cached per entry.", "nt.DirEntry.name" => "the entry's base filename, relative to scandir() \"path\" argument", - "nt.DirEntry.path" => "the entry's full path name; equivalent to os.path.join(scandir_path, entry.name)", + "nt.DirEntry.path" => "the entry's full path name; equivalent to\nos.path.join(scandir_path, entry.name)", "nt.DirEntry.stat" => "Return stat_result object for the entry; cached per entry.", "nt._add_dll_directory" => "Add a path to the DLL search path.\n\nThis search path is used when resolving dependencies for imported\nextension modules (the module itself is resolved through sys.path),\nand also by ctypes.\n\nReturns an opaque value that may be passed to os.remove_dll_directory\nto remove this directory from the search path.", "nt._create_environ" => "Create the environment dictionary.", @@ -14346,10 +14346,10 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "nt._path_splitroot_ex" => "Split a pathname into drive, root and tail.\n\nThe tail contains anything after the root.", "nt._remove_dll_directory" => "Removes a path from the DLL search path.\n\nThe parameter is an opaque value that was returned from\nos.add_dll_directory. You can only remove directories that you added\nyourself.", "nt._supports_virtual_terminal" => "Checks if virtual terminal is supported in windows", - "nt.abort" => "Abort the interpreter immediately.\n\nThis function 'dumps core' or otherwise fails in the hardest way possible\non the hosting operating system. This function never returns.", + "nt.abort" => "Abort the interpreter immediately.\n\nThis function 'dumps core' or otherwise fails in the hardest way\npossible on the hosting operating system. This function never returns.", "nt.access" => "Use the real uid/gid to test for access to a path.\n\n path\n Path to be tested; can be string, bytes, or a path-like object.\n mode\n Operating-system mode bitfield. Can be F_OK to test existence,\n or the inclusive-OR of R_OK, W_OK, and X_OK.\n dir_fd\n If not None, it should be a file descriptor open to a directory,\n and path should be relative; path will then be relative to that\n directory.\n effective_ids\n If True, access will use the effective uid/gid instead of\n the real uid/gid.\n follow_symlinks\n If False, and the last element of the path is a symbolic link,\n access will examine the symbolic link itself instead of the file\n the link points to.\n\ndir_fd, effective_ids, and follow_symlinks may not be implemented\n on your platform. If they are unavailable, using them will raise a\n NotImplementedError.\n\nNote that most operations will use the effective uid/gid, therefore this\n routine can be used in a suid/sgid environment to test if the invoking user\n has the specified access to the path.", - "nt.chdir" => "Change the current working directory to the specified path.\n\npath may always be specified as a string.\nOn some platforms, path may also be specified as an open file descriptor.\nIf this functionality is unavailable, using it raises an exception.", - "nt.chmod" => "Change the access permissions of a file.\n\n path\n Path to be modified. May always be specified as a str, bytes, or a path-like object.\n On some platforms, path may also be specified as an open file descriptor.\n If this functionality is unavailable, using it raises an exception.\n mode\n Operating-system mode bitfield.\n Be careful when using number literals for *mode*. The conventional UNIX notation for\n numeric modes uses an octal base, which needs to be indicated with a ``0o`` prefix in\n Python.\n dir_fd\n If not None, it should be a file descriptor open to a directory,\n and path should be relative; path will then be relative to that\n directory.\n follow_symlinks\n If False, and the last element of the path is a symbolic link,\n chmod will modify the symbolic link itself instead of the file\n the link points to.\n\nIt is an error to use dir_fd or follow_symlinks when specifying path as\n an open file descriptor.\ndir_fd and follow_symlinks may not be implemented on your platform.\n If they are unavailable, using them will raise a NotImplementedError.", + "nt.chdir" => "Change the current working directory to the specified path.\n\npath may always be specified as a string. On some platforms, path may\nalso be specified as an open file descriptor. If this functionality is\nunavailable, using it raises an exception.", + "nt.chmod" => "Change the access permissions of a file.\n\n path\n Path to be modified. May always be specified as a str, bytes, or\n a path-like object. On some platforms, path may also be specified\n as an open file descriptor. If this functionality is unavailable,\n using it raises an exception.\n mode\n Operating-system mode bitfield.\n Be careful when using number literals for *mode*. The conventional\n UNIX notation for numeric modes uses an octal base, which needs to\n be indicated with a ``0o`` prefix in Python.\n dir_fd\n If not None, it should be a file descriptor open to a directory,\n and path should be relative; path will then be relative to that\n directory.\n follow_symlinks\n If False, and the last element of the path is a symbolic link,\n chmod will modify the symbolic link itself instead of the file\n the link points to.\n\nIt is an error to use dir_fd or follow_symlinks when specifying path as\n an open file descriptor.\ndir_fd and follow_symlinks may not be implemented on your platform.\n If they are unavailable, using them will raise a NotImplementedError.", "nt.close" => "Close a file descriptor.", "nt.closerange" => "Closes all file descriptors in [fd_low, fd_high), ignoring errors.", "nt.cpu_count" => "Return the number of logical CPUs in the system.\n\nReturn None if indeterminable.", @@ -14358,8 +14358,8 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "nt.dup2" => "Duplicate file descriptor.", "nt.execv" => "Execute an executable path with arguments, replacing current process.\n\n path\n Path of executable file.\n argv\n Tuple or list of strings.", "nt.execve" => "Execute an executable path with arguments, replacing current process.\n\n path\n Path of executable file.\n argv\n Tuple or list of strings.\n env\n Dictionary of strings mapping to strings.", - "nt.fchmod" => "Change the access permissions of the file given by file descriptor fd.\n\n fd\n The file descriptor of the file to be modified.\n mode\n Operating-system mode bitfield.\n Be careful when using number literals for *mode*. The conventional UNIX notation for\n numeric modes uses an octal base, which needs to be indicated with a ``0o`` prefix in\n Python.\n\nEquivalent to os.chmod(fd, mode).", - "nt.fspath" => "Return the file system path representation of the object.\n\nIf the object is str or bytes, then allow it to pass through as-is. If the\nobject defines __fspath__(), then return the result of that method. All other\ntypes raise a TypeError.", + "nt.fchmod" => "Change the access permissions of the file given by file descriptor fd.\n\n fd\n The file descriptor of the file to be modified.\n mode\n Operating-system mode bitfield.\n Be careful when using number literals for *mode*. The conventional\n UNIX notation for numeric modes uses an octal base, which needs to\n be indicated with a ``0o`` prefix in Python.\n\nEquivalent to os.chmod(fd, mode).", + "nt.fspath" => "Return the file system path representation of the object.\n\nIf the object is str or bytes, then allow it to pass through as-is. If\nthe object defines __fspath__(), then return the result of that method.\nAll other types raise a TypeError.", "nt.fstat" => "Perform a stat system call on the given file descriptor.\n\nLike stat(), but for an open file descriptor.\nEquivalent to os.stat(fd).", "nt.fsync" => "Force write of fd to disk.", "nt.ftruncate" => "Truncate a file, specified by file descriptor, to a specific length.", @@ -14371,29 +14371,29 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "nt.getcwdb" => "Return a bytes string representing the current working directory.", "nt.getlogin" => "Return the actual login name.", "nt.getpid" => "Return the current process id.", - "nt.getppid" => "Return the parent's process id.\n\nIf the parent process has already exited, Windows machines will still\nreturn its id; others systems will return the id of the 'init' process (1).", + "nt.getppid" => "Return the parent's process id.\n\nIf the parent process has already exited, Windows machines will still\nreturn its id; others systems will return the id of the 'init' proces\n(1).", "nt.isatty" => "Return True if the fd is connected to a terminal.\n\nReturn True if the file descriptor is an open file descriptor\nconnected to the slave end of a terminal.", "nt.kill" => "Kill a process with a signal.", - "nt.lchmod" => "Change the access permissions of a file, without following symbolic links.\n\nIf path is a symlink, this affects the link itself rather than the target.\nEquivalent to chmod(path, mode, follow_symlinks=False).\"", - "nt.link" => "Create a hard link to a file.\n\nIf either src_dir_fd or dst_dir_fd is not None, it should be a file\n descriptor open to a directory, and the respective path string (src or dst)\n should be relative; the path will then be relative to that directory.\nIf follow_symlinks is False, and the last element of src is a symbolic\n link, link will create a link to the symbolic link itself instead of the\n file the link points to.\nsrc_dir_fd, dst_dir_fd, and follow_symlinks may not be implemented on your\n platform. If they are unavailable, using them will raise a\n NotImplementedError.", - "nt.listdir" => "Return a list containing the names of the files in the directory.\n\npath can be specified as either str, bytes, or a path-like object. If path is bytes,\n the filenames returned will also be bytes; in all other circumstances\n the filenames returned will be str.\nIf path is None, uses the path='.'.\nOn some platforms, path may also be specified as an open file descriptor;\\\n the file descriptor must refer to a directory.\n If this functionality is unavailable, using it raises NotImplementedError.\n\nThe list is in arbitrary order. It does not include the special\nentries '.' and '..' even if they are present in the directory.", + "nt.lchmod" => "Change the access permissions of a file, without following symbolic links.\n\nIf path is a symlink, this affects the link itself rather than the\ntarget. Equivalent to chmod(path, mode, follow_symlinks=False).", + "nt.link" => "Create a hard link to a file.\n\nIf either src_dir_fd or dst_dir_fd is not None, it should be a file\ndescriptor open to a directory, and the respective path string (src or\ndst) should be relative; the path will then be relative to that\ndirectory.\nIf follow_symlinks is False, and the last element of src is a symbolic\nlink, link will create a link to the symbolic link itself instead of the\nfile the link points to.\nsrc_dir_fd, dst_dir_fd, and follow_symlinks may not be implemented on\nyour platform. If they are unavailable, using them will raise\na NotImplementedError.", + "nt.listdir" => "Return a list containing the names of the files in the directory.\n\npath can be specified as either str, bytes, or a path-like object. If\npath is bytes, the filenames returned will also be bytes; in all other\ncircumstances the filenames returned will be str.\nIf path is None, uses the path='.'.\nOn some platforms, path may also be specified as an open file\ndescriptor; the file descriptor must refer to a directory. If this\nfunctionality is unavailable, using it raises NotImplementedError.\n\nThe list is in arbitrary order. It does not include the special\nentries '.' and '..' even if they are present in the directory.", "nt.listdrives" => "Return a list containing the names of drives in the system.\n\nA drive name typically looks like 'C:\\\\'.", "nt.listmounts" => "Return a list containing mount points for a particular volume.\n\n'volume' should be a GUID path as returned from os.listvolumes.", "nt.listvolumes" => "Return a list containing the volumes in the system.\n\nVolumes are typically represented as a GUID path.", - "nt.lseek" => "Set the position of a file descriptor. Return the new position.\n\n fd\n An open file descriptor, as returned by os.open().\n position\n Position, interpreted relative to 'whence'.\n whence\n The relative position to seek from. Valid values are:\n - SEEK_SET: seek from the start of the file.\n - SEEK_CUR: seek from the current file position.\n - SEEK_END: seek from the end of the file.\n\nThe return value is the number of bytes relative to the beginning of the file.", + "nt.lseek" => "Set the position of a file descriptor. Return the new position.\n\n fd\n An open file descriptor, as returned by os.open().\n position\n Position, interpreted relative to 'whence'.\n whence\n The relative position to seek from. Valid values are:\n - SEEK_SET: seek from the start of the file.\n - SEEK_CUR: seek from the current file position.\n - SEEK_END: seek from the end of the file.\n\nThe return value is the number of bytes relative to the beginning of\nthe file.", "nt.lstat" => "Perform a stat system call on the given path, without following symbolic links.\n\nLike stat(), but do not follow symbolic links.\nEquivalent to stat(path, follow_symlinks=False).", - "nt.mkdir" => "Create a directory.\n\nIf dir_fd is not None, it should be a file descriptor open to a directory,\n and path should be relative; path will then be relative to that directory.\ndir_fd may not be implemented on your platform.\n If it is unavailable, using it will raise a NotImplementedError.\n\nThe mode argument is ignored on Windows. Where it is used, the current umask\nvalue is first masked out.", - "nt.open" => "Open a file for low level IO. Returns a file descriptor (integer).\n\nIf dir_fd is not None, it should be a file descriptor open to a directory,\n and path should be relative; path will then be relative to that directory.\ndir_fd may not be implemented on your platform.\n If it is unavailable, using it will raise a NotImplementedError.", + "nt.mkdir" => "Create a directory.\n\nIf dir_fd is not None, it should be a file descriptor open to\na directory, and path should be relative; path will then be relative to\nthat directory.\ndir_fd may not be implemented on your platform. If it is unavailable,\nusing it will raise a NotImplementedError.\n\nThe mode argument is ignored on Windows. Where it is used, the current\numask value is first masked out.", + "nt.open" => "Open a file for low level IO. Returns a file descriptor (integer).\n\nIf dir_fd is not None, it should be a file descriptor open to\na directory, and path should be relative; path will then be relative to\nthat directory.\ndir_fd may not be implemented on your platform. If it is unavailable,\nusing it will raise a NotImplementedError.", "nt.pipe" => "Create a pipe.\n\nReturns a tuple of two file descriptors:\n (read_fd, write_fd)", "nt.putenv" => "Change or add an environment variable.", "nt.read" => "Read from a file descriptor. Returns a bytes object.", - "nt.readinto" => "Read into a buffer object from a file descriptor.\n\nThe buffer should be mutable and bytes-like. On success, returns the number of\nbytes read. Less bytes may be read than the size of the buffer. The underlying\nsystem call will be retried when interrupted by a signal, unless the signal\nhandler raises an exception. Other errors will not be retried and an error will\nbe raised.\n\nReturns 0 if *fd* is at end of file or if the provided *buffer* has length 0\n(which can be used to check for errors without reading data). Never returns\nnegative.", - "nt.readlink" => "Return a string representing the path to which the symbolic link points.\n\nIf dir_fd is not None, it should be a file descriptor open to a directory,\nand path should be relative; path will then be relative to that directory.\n\ndir_fd may not be implemented on your platform. If it is unavailable,\nusing it will raise a NotImplementedError.", - "nt.remove" => "Remove a file (same as unlink()).\n\nIf dir_fd is not None, it should be a file descriptor open to a directory,\n and path should be relative; path will then be relative to that directory.\ndir_fd may not be implemented on your platform.\n If it is unavailable, using it will raise a NotImplementedError.", - "nt.rename" => "Rename a file or directory.\n\nIf either src_dir_fd or dst_dir_fd is not None, it should be a file\n descriptor open to a directory, and the respective path string (src or dst)\n should be relative; the path will then be relative to that directory.\nsrc_dir_fd and dst_dir_fd, may not be implemented on your platform.\n If they are unavailable, using them will raise a NotImplementedError.", - "nt.replace" => "Rename a file or directory, overwriting the destination.\n\nIf either src_dir_fd or dst_dir_fd is not None, it should be a file\n descriptor open to a directory, and the respective path string (src or dst)\n should be relative; the path will then be relative to that directory.\nsrc_dir_fd and dst_dir_fd, may not be implemented on your platform.\n If they are unavailable, using them will raise a NotImplementedError.", - "nt.rmdir" => "Remove a directory.\n\nIf dir_fd is not None, it should be a file descriptor open to a directory,\n and path should be relative; path will then be relative to that directory.\ndir_fd may not be implemented on your platform.\n If it is unavailable, using it will raise a NotImplementedError.", - "nt.scandir" => "Return an iterator of DirEntry objects for given path.\n\npath can be specified as either str, bytes, or a path-like object. If path\nis bytes, the names of yielded DirEntry objects will also be bytes; in\nall other circumstances they will be str.\n\nIf path is None, uses the path='.'.", + "nt.readinto" => "Read into a buffer object from a file descriptor.\n\nThe buffer should be mutable and bytes-like. On success, returns the\nnumber of bytes read. Less bytes may be read than the size of the\nbuffer. The underlying system call will be retried when interrupted by\na signal, unless the signal handler raises an exception. Other errors\nwill not be retried and an error will be raised.\n\nReturns 0 if *fd* is at end of file or if the provided *buffer* has\nlength 0 (which can be used to check for errors without reading data).\nNever returns negative.", + "nt.readlink" => "Return a string representing the path to which the symbolic link points.\n\nIf dir_fd is not None, it should be a file descriptor open to\na directory, and path should be relative; path will then be relative to\nthat directory.\n\ndir_fd may not be implemented on your platform. If it is unavailable,\nusing it will raise a NotImplementedError.", + "nt.remove" => "Remove a file (same as unlink()).\n\nIf dir_fd is not None, it should be a file descriptor open to\na directory, and path should be relative; path will then be relative\nto that directory.\ndir_fd may not be implemented on your platform.\nIf it is unavailable, using it will raise a NotImplementedError.", + "nt.rename" => "Rename a file or directory.\n\nIf either src_dir_fd or dst_dir_fd is not None, it should be a file\ndescriptor open to a directory, and the respective path string (src or\ndst) should be relative; the path will then be relative to that\ndirectory.\nsrc_dir_fd and dst_dir_fd, may not be implemented on your platform.\nIf they are unavailable, using them will raise a NotImplementedError.", + "nt.replace" => "Rename a file or directory, overwriting the destination.\n\nIf either src_dir_fd or dst_dir_fd is not None, it should be a file\ndescriptor open to a directory, and the respective path string (src or\ndst) should be relative; the path will then be relative to that\ndirectory.\nsrc_dir_fd and dst_dir_fd, may not be implemented on your platform.\nIf they are unavailable, using them will raise a NotImplementedError.", + "nt.rmdir" => "Remove a directory.\n\nIf dir_fd is not None, it should be a file descriptor open to\na directory, and path should be relative; path will then be relative\nto that directory.\ndir_fd may not be implemented on your platform.\nIf it is unavailable, using it will raise a NotImplementedError.", + "nt.scandir" => "Return an iterator of DirEntry objects for given path.\n\npath can be specified as either str, bytes, or a path-like object. If\npath is bytes, the names of yielded DirEntry objects will also be bytes;\nin all other circumstances they will be str.\n\nIf path is None, uses the path='.'.", "nt.set_blocking" => "Set the blocking mode of the specified file descriptor.\n\nSet the O_NONBLOCK flag if blocking is False,\nclear the O_NONBLOCK flag otherwise.", "nt.set_handle_inheritable" => "Set the inheritable flag of the specified handle.", "nt.set_inheritable" => "Set the inheritable flag of the specified file descriptor.", @@ -14401,9 +14401,9 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "nt.spawnve" => "Execute the program specified by path in a new process.\n\n mode\n Mode of process creation.\n path\n Path of executable file.\n argv\n Tuple or list of strings.\n env\n Dictionary of strings mapping to strings.", "nt.startfile" => "Start a file with its associated application.\n\nWhen \"operation\" is not specified or \"open\", this acts like\ndouble-clicking the file in Explorer, or giving the file name as an\nargument to the DOS \"start\" command: the file is opened with whatever\napplication (if any) its extension is associated.\nWhen another \"operation\" is given, it specifies what should be done with\nthe file. A typical operation is \"print\".\n\n\"arguments\" is passed to the application, but should be omitted if the\nfile is a document.\n\n\"cwd\" is the working directory for the operation. If \"filepath\" is\nrelative, it will be resolved against this directory. This argument\nshould usually be an absolute path.\n\n\"show_cmd\" can be used to override the recommended visibility option.\nSee the Windows ShellExecute documentation for values.\n\nstartfile returns as soon as the associated application is launched.\nThere is no option to wait for the application to close, and no way\nto retrieve the application's exit status.\n\nThe filepath is relative to the current directory. If you want to use\nan absolute path, make sure the first character is not a slash (\"/\");\nthe underlying Win32 ShellExecute function doesn't work if it is.", "nt.stat" => "Perform a stat system call on the given path.\n\n path\n Path to be examined; can be string, bytes, a path-like object or\n open-file-descriptor int.\n dir_fd\n If not None, it should be a file descriptor open to a directory,\n and path should be a relative string; path will then be relative to\n that directory.\n follow_symlinks\n If False, and the last element of the path is a symbolic link,\n stat will examine the symbolic link itself instead of the file\n the link points to.\n\ndir_fd and follow_symlinks may not be implemented\n on your platform. If they are unavailable, using them will raise a\n NotImplementedError.\n\nIt's an error to use dir_fd or follow_symlinks when specifying path as\n an open file descriptor.", - "nt.stat_result" => "stat_result: Result from stat, fstat, or lstat.\n\nThis object may be accessed either as a tuple of\n (mode, ino, dev, nlink, uid, gid, size, atime, mtime, ctime)\nor via the attributes st_mode, st_ino, st_dev, st_nlink, st_uid, and so on.\n\nPosix/windows: If your platform supports st_blksize, st_blocks, st_rdev,\nor st_flags, they are available as attributes only.\n\nSee os.stat for more information.", + "nt.stat_result" => "stat_result: Result from stat, fstat, or lstat.\n\nThis object may be accessed either as a tuple of\n (mode, ino, dev, nlink, uid, gid, size, atime, mtime, ctime)\nor via the attributes st_mode, st_ino, st_dev, st_nlink, and so on.\n\nPosix/windows: If your platform supports st_blksize, st_blocks, st_rdev,\nor st_flags, they are available as attributes only.\n\nSee os.stat for more information.", "nt.stat_result.__add__" => "Return self+value.", - "nt.stat_result.__class_getitem__" => "See PEP 585", + "nt.stat_result.__class_getitem__" => "Tuples are generic over the types of their contents.\n\nFor example, use ``tuple[int, str]`` for a pair whose first element is an int and second element is a string.\n\nTuples also support the form ``tuple[T, ...]`` to indicate an arbitrary length tuple of elements of type T.", "nt.stat_result.__contains__" => "Return bool(key in self).", "nt.stat_result.__delattr__" => "Implement delattr(self, name).", "nt.stat_result.__eq__" => "Return self==value.", @@ -14452,7 +14452,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "nt.stat_result.st_uid" => "user ID of owner", "nt.statvfs_result" => "statvfs_result: Result from statvfs or fstatvfs.\n\nThis object may be accessed either as a tuple of\n (bsize, frsize, blocks, bfree, bavail, files, ffree, favail, flag, namemax),\nor via the attributes f_bsize, f_frsize, f_blocks, f_bfree, and so on.\n\nSee os.statvfs for more information.", "nt.statvfs_result.__add__" => "Return self+value.", - "nt.statvfs_result.__class_getitem__" => "See PEP 585", + "nt.statvfs_result.__class_getitem__" => "Tuples are generic over the types of their contents.\n\nFor example, use ``tuple[int, str]`` for a pair whose first element is an int and second element is a string.\n\nTuples also support the form ``tuple[T, ...]`` to indicate an arbitrary length tuple of elements of type T.", "nt.statvfs_result.__contains__" => "Return bool(key in self).", "nt.statvfs_result.__delattr__" => "Implement delattr(self, name).", "nt.statvfs_result.__eq__" => "Return self==value.", @@ -14483,11 +14483,11 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "nt.statvfs_result.count" => "Return number of occurrences of value.", "nt.statvfs_result.index" => "Return first index of value.\n\nRaises ValueError if the value is not present.", "nt.strerror" => "Translate an error code to a message string.", - "nt.symlink" => "Create a symbolic link pointing to src named dst.\n\ntarget_is_directory is required on Windows if the target is to be\n interpreted as a directory. (On Windows, symlink requires\n Windows 6.0 or greater, and raises a NotImplementedError otherwise.)\n target_is_directory is ignored on non-Windows platforms.\n\nIf dir_fd is not None, it should be a file descriptor open to a directory,\n and path should be relative; path will then be relative to that directory.\ndir_fd may not be implemented on your platform.\n If it is unavailable, using it will raise a NotImplementedError.", + "nt.symlink" => "Create a symbolic link pointing to src named dst.\n\ntarget_is_directory is required on Windows if the target is to be\ninterpreted as a directory. (On Windows, symlink requires Windows 6.0\nor greater, and raises a NotImplementedError otherwise.)\ntarget_is_directory is ignored on non-Windows platforms.\n\nIf dir_fd is not None, it should be a file descriptor open to\na directory, and path should be relative; path will then be relative\nto that directory.\ndir_fd may not be implemented on your platform. If it is unavailable,\nusing it will raise a NotImplementedError.", "nt.system" => "Execute the command in a subshell.", "nt.terminal_size" => "A tuple of (columns, lines) for holding terminal window size", "nt.terminal_size.__add__" => "Return self+value.", - "nt.terminal_size.__class_getitem__" => "See PEP 585", + "nt.terminal_size.__class_getitem__" => "Tuples are generic over the types of their contents.\n\nFor example, use ``tuple[int, str]`` for a pair whose first element is an int and second element is a string.\n\nTuples also support the form ``tuple[T, ...]`` to indicate an arbitrary length tuple of elements of type T.", "nt.terminal_size.__contains__" => "Return bool(key in self).", "nt.terminal_size.__delattr__" => "Implement delattr(self, name).", "nt.terminal_size.__eq__" => "Return self==value.", @@ -14522,7 +14522,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "nt.times" => "Return a collection containing process timing information.\n\nThe object returned behaves like a named tuple with these fields:\n (utime, stime, cutime, cstime, elapsed_time)\nAll fields are floating-point numbers.", "nt.times_result" => "times_result: Result from os.times().\n\nThis object may be accessed either as a tuple of\n (user, system, children_user, children_system, elapsed),\nor via the attributes user, system, children_user, children_system,\nand elapsed.\n\nSee os.times for more information.", "nt.times_result.__add__" => "Return self+value.", - "nt.times_result.__class_getitem__" => "See PEP 585", + "nt.times_result.__class_getitem__" => "Tuples are generic over the types of their contents.\n\nFor example, use ``tuple[int, str]`` for a pair whose first element is an int and second element is a string.\n\nTuples also support the form ``tuple[T, ...]`` to indicate an arbitrary length tuple of elements of type T.", "nt.times_result.__contains__" => "Return bool(key in self).", "nt.times_result.__delattr__" => "Implement delattr(self, name).", "nt.times_result.__eq__" => "Return self==value.", @@ -14557,11 +14557,11 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "nt.times_result.index" => "Return first index of value.\n\nRaises ValueError if the value is not present.", "nt.times_result.system" => "system time", "nt.times_result.user" => "user time", - "nt.truncate" => "Truncate a file, specified by path, to a specific length.\n\nOn some platforms, path may also be specified as an open file descriptor.\n If this functionality is unavailable, using it raises an exception.", + "nt.truncate" => "Truncate a file, specified by path, to a specific length.\n\nOn some platforms, path may also be specified as an open file\ndescriptor. If this functionality is unavailable, using it raises\nan exception.", "nt.umask" => "Set the current numeric umask and return the previous umask.", "nt.uname_result" => "uname_result: Result from os.uname().\n\nThis object may be accessed either as a tuple of\n (sysname, nodename, release, version, machine),\nor via the attributes sysname, nodename, release, version, and machine.\n\nSee os.uname for more information.", "nt.uname_result.__add__" => "Return self+value.", - "nt.uname_result.__class_getitem__" => "See PEP 585", + "nt.uname_result.__class_getitem__" => "Tuples are generic over the types of their contents.\n\nFor example, use ``tuple[int, str]`` for a pair whose first element is an int and second element is a string.\n\nTuples also support the form ``tuple[T, ...]`` to indicate an arbitrary length tuple of elements of type T.", "nt.uname_result.__contains__" => "Return bool(key in self).", "nt.uname_result.__delattr__" => "Implement delattr(self, name).", "nt.uname_result.__eq__" => "Return self==value.", @@ -14596,15 +14596,15 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "nt.uname_result.release" => "operating system release", "nt.uname_result.sysname" => "operating system name", "nt.uname_result.version" => "operating system version", - "nt.unlink" => "Remove a file (same as remove()).\n\nIf dir_fd is not None, it should be a file descriptor open to a directory,\n and path should be relative; path will then be relative to that directory.\ndir_fd may not be implemented on your platform.\n If it is unavailable, using it will raise a NotImplementedError.", + "nt.unlink" => "Remove a file (same as remove()).\n\nIf dir_fd is not None, it should be a file descriptor open to\na directory, and path should be relative; path will then be relative to\nthat directory.\ndir_fd may not be implemented on your platform.\nIf it is unavailable, using it will raise a NotImplementedError.", "nt.unsetenv" => "Delete an environment variable.", "nt.urandom" => "Return a bytes object containing random bytes suitable for cryptographic use.", - "nt.utime" => "Set the access and modified time of path.\n\npath may always be specified as a string.\nOn some platforms, path may also be specified as an open file descriptor.\n If this functionality is unavailable, using it raises an exception.\n\nIf times is not None, it must be a tuple (atime, mtime);\n atime and mtime should be expressed as float seconds since the epoch.\nIf ns is specified, it must be a tuple (atime_ns, mtime_ns);\n atime_ns and mtime_ns should be expressed as integer nanoseconds\n since the epoch.\nIf times is None and ns is unspecified, utime uses the current time.\nSpecifying tuples for both times and ns is an error.\n\nIf dir_fd is not None, it should be a file descriptor open to a directory,\n and path should be relative; path will then be relative to that directory.\nIf follow_symlinks is False, and the last element of the path is a symbolic\n link, utime will modify the symbolic link itself instead of the file the\n link points to.\nIt is an error to use dir_fd or follow_symlinks when specifying path\n as an open file descriptor.\ndir_fd and follow_symlinks may not be available on your platform.\n If they are unavailable, using them will raise a NotImplementedError.", + "nt.utime" => "Set the access and modified time of path.\n\npath may always be specified as a string. On some platforms, path may\nalso be specified as an open file descriptor. If this functionality is\nunavailable, using it raises an exception.\n\nIf times is not None, it must be a tuple (atime, mtime);\natime and mtime should be expressed as float seconds since the epoch.\nIf ns is specified, it must be a tuple (atime_ns, mtime_ns);\natime_ns and mtime_ns should be expressed as integer nanoseconds\nsince the epoch.\nIf times is None and ns is unspecified, utime uses the current time.\nSpecifying tuples for both times and ns is an error.\n\nIf dir_fd is not None, it should be a file descriptor open to\na directory, and path should be relative; path will then be relative to\nthat directory.\nIf follow_symlinks is False, and the last element of the path is\na symbolic link, utime will modify the symbolic link itself instead of\nthe file the link points to.\nIt is an error to use dir_fd or follow_symlinks when specifying path as\nan open file descriptor.\ndir_fd and follow_symlinks may not be available on your platform.\nIf they are unavailable, using them will raise a NotImplementedError.", "nt.waitpid" => "Wait for completion of a given process.\n\nReturns a tuple of information regarding the process:\n (pid, status << 8)\n\nThe options argument is ignored on Windows.", - "nt.waitstatus_to_exitcode" => "Convert a wait status to an exit code.\n\nOn Unix:\n\n* If WIFEXITED(status) is true, return WEXITSTATUS(status).\n* If WIFSIGNALED(status) is true, return -WTERMSIG(status).\n* Otherwise, raise a ValueError.\n\nOn Windows, return status shifted right by 8 bits.\n\nOn Unix, if the process is being traced or if waitpid() was called with\nWUNTRACED option, the caller must first check if WIFSTOPPED(status) is true.\nThis function must not be called if WIFSTOPPED(status) is true.", + "nt.waitstatus_to_exitcode" => "Convert a wait status to an exit code.\n\nOn Unix:\n\n* If WIFEXITED(status) is true, return WEXITSTATUS(status).\n* If WIFSIGNALED(status) is true, return -WTERMSIG(status).\n* Otherwise, raise a ValueError.\n\nOn Windows, return status shifted right by 8 bits.\n\nOn Unix, if the process is being traced or if waitpid() was called with\nWUNTRACED option, the caller must first check if WIFSTOPPED(status) is\ntrue. This function must not be called if WIFSTOPPED(status) is true.", "nt.write" => "Write a bytes object to a file descriptor.", "posix" => "This module provides access to operating system functionality that is\nstandardized by the C Standard and the POSIX standard (a thinly\ndisguised Unix interface). Refer to the library manual and\ncorresponding Unix manual entries for more information on calls.", - "posix.DirEntry.__class_getitem__" => "See PEP 585", + "posix.DirEntry.__class_getitem__" => "DirEntry is generic over the type of the path (str or bytes)", "posix.DirEntry.__delattr__" => "Implement delattr(self, name).", "posix.DirEntry.__eq__" => "Return self==value.", "posix.DirEntry.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", @@ -14633,7 +14633,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "posix.DirEntry.is_junction" => "Return True if the entry is a junction; cached per entry.", "posix.DirEntry.is_symlink" => "Return True if the entry is a symbolic link; cached per entry.", "posix.DirEntry.name" => "the entry's base filename, relative to scandir() \"path\" argument", - "posix.DirEntry.path" => "the entry's full path name; equivalent to os.path.join(scandir_path, entry.name)", + "posix.DirEntry.path" => "the entry's full path name; equivalent to\nos.path.join(scandir_path, entry.name)", "posix.DirEntry.stat" => "Return stat_result object for the entry; cached per entry.", "posix.WCOREDUMP" => "Return True if the process returning status was dumped to a core file.", "posix.WEXITSTATUS" => "Return the process return code from status.", @@ -14650,12 +14650,12 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "posix._is_inputhook_installed" => "Checks if PyOS_CallInputHook is set", "posix._path_normpath" => "Normalize path, eliminating double slashes, etc.", "posix._path_splitroot_ex" => "Split a pathname into drive, root and tail.\n\nThe tail contains anything after the root.", - "posix.abort" => "Abort the interpreter immediately.\n\nThis function 'dumps core' or otherwise fails in the hardest way possible\non the hosting operating system. This function never returns.", + "posix.abort" => "Abort the interpreter immediately.\n\nThis function 'dumps core' or otherwise fails in the hardest way\npossible on the hosting operating system. This function never returns.", "posix.access" => "Use the real uid/gid to test for access to a path.\n\n path\n Path to be tested; can be string, bytes, or a path-like object.\n mode\n Operating-system mode bitfield. Can be F_OK to test existence,\n or the inclusive-OR of R_OK, W_OK, and X_OK.\n dir_fd\n If not None, it should be a file descriptor open to a directory,\n and path should be relative; path will then be relative to that\n directory.\n effective_ids\n If True, access will use the effective uid/gid instead of\n the real uid/gid.\n follow_symlinks\n If False, and the last element of the path is a symbolic link,\n access will examine the symbolic link itself instead of the file\n the link points to.\n\ndir_fd, effective_ids, and follow_symlinks may not be implemented\n on your platform. If they are unavailable, using them will raise a\n NotImplementedError.\n\nNote that most operations will use the effective uid/gid, therefore this\n routine can be used in a suid/sgid environment to test if the invoking user\n has the specified access to the path.", - "posix.chdir" => "Change the current working directory to the specified path.\n\npath may always be specified as a string.\nOn some platforms, path may also be specified as an open file descriptor.\nIf this functionality is unavailable, using it raises an exception.", - "posix.chflags" => "Set file flags.\n\nIf follow_symlinks is False, and the last element of the path is a symbolic\n link, chflags will change flags on the symbolic link itself instead of the\n file the link points to.\nfollow_symlinks may not be implemented on your platform. If it is\nunavailable, using it will raise a NotImplementedError.", - "posix.chmod" => "Change the access permissions of a file.\n\n path\n Path to be modified. May always be specified as a str, bytes, or a path-like object.\n On some platforms, path may also be specified as an open file descriptor.\n If this functionality is unavailable, using it raises an exception.\n mode\n Operating-system mode bitfield.\n Be careful when using number literals for *mode*. The conventional UNIX notation for\n numeric modes uses an octal base, which needs to be indicated with a ``0o`` prefix in\n Python.\n dir_fd\n If not None, it should be a file descriptor open to a directory,\n and path should be relative; path will then be relative to that\n directory.\n follow_symlinks\n If False, and the last element of the path is a symbolic link,\n chmod will modify the symbolic link itself instead of the file\n the link points to.\n\nIt is an error to use dir_fd or follow_symlinks when specifying path as\n an open file descriptor.\ndir_fd and follow_symlinks may not be implemented on your platform.\n If they are unavailable, using them will raise a NotImplementedError.", - "posix.chown" => "Change the owner and group id of path to the numeric uid and gid.\\\n\n path\n Path to be examined; can be string, bytes, a path-like object, or open-file-descriptor int.\n dir_fd\n If not None, it should be a file descriptor open to a directory,\n and path should be relative; path will then be relative to that\n directory.\n follow_symlinks\n If False, and the last element of the path is a symbolic link,\n stat will examine the symbolic link itself instead of the file\n the link points to.\n\npath may always be specified as a string.\nOn some platforms, path may also be specified as an open file descriptor.\n If this functionality is unavailable, using it raises an exception.\nIf dir_fd is not None, it should be a file descriptor open to a directory,\n and path should be relative; path will then be relative to that directory.\nIf follow_symlinks is False, and the last element of the path is a symbolic\n link, chown will modify the symbolic link itself instead of the file the\n link points to.\nIt is an error to use dir_fd or follow_symlinks when specifying path as\n an open file descriptor.\ndir_fd and follow_symlinks may not be implemented on your platform.\n If they are unavailable, using them will raise a NotImplementedError.", + "posix.chdir" => "Change the current working directory to the specified path.\n\npath may always be specified as a string. On some platforms, path may\nalso be specified as an open file descriptor. If this functionality is\nunavailable, using it raises an exception.", + "posix.chflags" => "Set file flags.\n\nIf follow_symlinks is False, and the last element of the path is\na symbolic link, chflags() will change flags on the symbolic link itself\ninstead of the file the link points to.\nfollow_symlinks may not be implemented on your platform. If it is\nunavailable, using it will raise a NotImplementedError.", + "posix.chmod" => "Change the access permissions of a file.\n\n path\n Path to be modified. May always be specified as a str, bytes, or\n a path-like object. On some platforms, path may also be specified\n as an open file descriptor. If this functionality is unavailable,\n using it raises an exception.\n mode\n Operating-system mode bitfield.\n Be careful when using number literals for *mode*. The conventional\n UNIX notation for numeric modes uses an octal base, which needs to\n be indicated with a ``0o`` prefix in Python.\n dir_fd\n If not None, it should be a file descriptor open to a directory,\n and path should be relative; path will then be relative to that\n directory.\n follow_symlinks\n If False, and the last element of the path is a symbolic link,\n chmod will modify the symbolic link itself instead of the file\n the link points to.\n\nIt is an error to use dir_fd or follow_symlinks when specifying path as\n an open file descriptor.\ndir_fd and follow_symlinks may not be implemented on your platform.\n If they are unavailable, using them will raise a NotImplementedError.", + "posix.chown" => "Change the owner and group id of path to the numeric uid and gid.\n\n path\n Path to be examined; can be string, bytes, a path-like object, or\n open-file-descriptor int.\n dir_fd\n If not None, it should be a file descriptor open to a directory,\n and path should be relative; path will then be relative to that\n directory.\n follow_symlinks\n If False, and the last element of the path is a symbolic link,\n stat will examine the symbolic link itself instead of the file\n the link points to.\n\npath may always be specified as a string. On some platforms, path may\nalso be specified as an open file descriptor. If this functionality is\nunavailable, using it raises an exception.\nIf dir_fd is not None, it should be a file descriptor open to\na directory, and path should be relative; path will then be relative to\nthat directory.\nIf follow_symlinks is False, and the last element of the path is\na symbolic link, chown will modify the symbolic link itself instead of\nthe file the link points to.\nIt is an error to use dir_fd or follow_symlinks when specifying path as\nan open file descriptor.\ndir_fd and follow_symlinks may not be implemented on your platform. If\nthey are unavailable, using them will raise a NotImplementedError.", "posix.chroot" => "Change root directory to path.", "posix.close" => "Close a file descriptor.", "posix.closerange" => "Closes all file descriptors in [fd_low, fd_high), ignoring errors.", @@ -14672,13 +14672,13 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "posix.execv" => "Execute an executable path with arguments, replacing current process.\n\n path\n Path of executable file.\n argv\n Tuple or list of strings.", "posix.execve" => "Execute an executable path with arguments, replacing current process.\n\n path\n Path of executable file.\n argv\n Tuple or list of strings.\n env\n Dictionary of strings mapping to strings.", "posix.fchdir" => "Change to the directory of the given file descriptor.\n\nfd must be opened on a directory, not a file.\nEquivalent to os.chdir(fd).", - "posix.fchmod" => "Change the access permissions of the file given by file descriptor fd.\n\n fd\n The file descriptor of the file to be modified.\n mode\n Operating-system mode bitfield.\n Be careful when using number literals for *mode*. The conventional UNIX notation for\n numeric modes uses an octal base, which needs to be indicated with a ``0o`` prefix in\n Python.\n\nEquivalent to os.chmod(fd, mode).", + "posix.fchmod" => "Change the access permissions of the file given by file descriptor fd.\n\n fd\n The file descriptor of the file to be modified.\n mode\n Operating-system mode bitfield.\n Be careful when using number literals for *mode*. The conventional\n UNIX notation for numeric modes uses an octal base, which needs to\n be indicated with a ``0o`` prefix in Python.\n\nEquivalent to os.chmod(fd, mode).", "posix.fchown" => "Change the owner and group id of the file specified by file descriptor.\n\nEquivalent to os.chown(fd, uid, gid).", "posix.fdatasync" => "Force write of fd to disk without forcing update of metadata.", "posix.fork" => "Fork a child process.\n\nReturn 0 to child process and PID of child to parent process.", "posix.forkpty" => "Fork a new process with a new pseudo-terminal as controlling tty.\n\nReturns a tuple of (pid, master_fd).\nLike fork(), return pid of 0 to the child process,\nand pid of child to the parent process.\nTo both, return fd of newly opened pseudo-terminal.", "posix.fpathconf" => "Return the configuration limit name for the file descriptor fd.\n\nIf there is no limit, return -1.", - "posix.fspath" => "Return the file system path representation of the object.\n\nIf the object is str or bytes, then allow it to pass through as-is. If the\nobject defines __fspath__(), then return the result of that method. All other\ntypes raise a TypeError.", + "posix.fspath" => "Return the file system path representation of the object.\n\nIf the object is str or bytes, then allow it to pass through as-is. If\nthe object defines __fspath__(), then return the result of that method.\nAll other types raise a TypeError.", "posix.fstat" => "Perform a stat system call on the given file descriptor.\n\nLike stat(), but for an open file descriptor.\nEquivalent to os.stat(fd).", "posix.fstatvfs" => "Perform an fstatvfs system call on the given fd.\n\nEquivalent to statvfs(fd).", "posix.fsync" => "Force write of fd to disk.", @@ -14698,64 +14698,64 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "posix.getpgid" => "Call the system call getpgid(), and return the result.", "posix.getpgrp" => "Return the current process group id.", "posix.getpid" => "Return the current process id.", - "posix.getppid" => "Return the parent's process id.\n\nIf the parent process has already exited, Windows machines will still\nreturn its id; others systems will return the id of the 'init' process (1).", + "posix.getppid" => "Return the parent's process id.\n\nIf the parent process has already exited, Windows machines will still\nreturn its id; others systems will return the id of the 'init' proces\n(1).", "posix.getpriority" => "Return program scheduling priority.", "posix.getrandom" => "Obtain a series of random bytes.", "posix.getresgid" => "Return a tuple of the current process's real, effective, and saved group ids.", "posix.getresuid" => "Return a tuple of the current process's real, effective, and saved user ids.", "posix.getsid" => "Call the system call getsid(pid) and return the result.", "posix.getuid" => "Return the current process's user id.", - "posix.getxattr" => "Return the value of extended attribute attribute on path.\n\npath may be either a string, a path-like object, or an open file descriptor.\nIf follow_symlinks is False, and the last element of the path is a symbolic\n link, getxattr will examine the symbolic link itself instead of the file\n the link points to.", + "posix.getxattr" => "Return the value of extended attribute attribute on path.\n\npath may be either a string, a path-like object, or an open file\ndescriptor.\nIf follow_symlinks is False, and the last element of the path is\na symbolic link, getxattr will examine the symbolic link itself\ninstead of the file the link points to.", "posix.grantpt" => "Grant access to the slave pseudo-terminal device.\n\n fd\n File descriptor of a master pseudo-terminal device.\n\nPerforms a grantpt() C function call.", - "posix.initgroups" => "Initialize the group access list.\n\nCall the system initgroups() to initialize the group access list with all of\nthe groups of which the specified username is a member, plus the specified\ngroup id.", + "posix.initgroups" => "Initialize the group access list.\n\nCall the system initgroups() to initialize the group access list with\nall of the groups of which the specified username is a member, plus the\nspecified group id.", "posix.isatty" => "Return True if the fd is connected to a terminal.\n\nReturn True if the file descriptor is an open file descriptor\nconnected to the slave end of a terminal.", "posix.kill" => "Kill a process with a signal.", "posix.killpg" => "Kill a process group with a signal.", "posix.lchflags" => "Set file flags.\n\nThis function will not follow symbolic links.\nEquivalent to chflags(path, flags, follow_symlinks=False).", - "posix.lchmod" => "Change the access permissions of a file, without following symbolic links.\n\nIf path is a symlink, this affects the link itself rather than the target.\nEquivalent to chmod(path, mode, follow_symlinks=False).\"", + "posix.lchmod" => "Change the access permissions of a file, without following symbolic links.\n\nIf path is a symlink, this affects the link itself rather than the\ntarget. Equivalent to chmod(path, mode, follow_symlinks=False).", "posix.lchown" => "Change the owner and group id of path to the numeric uid and gid.\n\nThis function will not follow symbolic links.\nEquivalent to os.chown(path, uid, gid, follow_symlinks=False).", - "posix.link" => "Create a hard link to a file.\n\nIf either src_dir_fd or dst_dir_fd is not None, it should be a file\n descriptor open to a directory, and the respective path string (src or dst)\n should be relative; the path will then be relative to that directory.\nIf follow_symlinks is False, and the last element of src is a symbolic\n link, link will create a link to the symbolic link itself instead of the\n file the link points to.\nsrc_dir_fd, dst_dir_fd, and follow_symlinks may not be implemented on your\n platform. If they are unavailable, using them will raise a\n NotImplementedError.", - "posix.listdir" => "Return a list containing the names of the files in the directory.\n\npath can be specified as either str, bytes, or a path-like object. If path is bytes,\n the filenames returned will also be bytes; in all other circumstances\n the filenames returned will be str.\nIf path is None, uses the path='.'.\nOn some platforms, path may also be specified as an open file descriptor;\\\n the file descriptor must refer to a directory.\n If this functionality is unavailable, using it raises NotImplementedError.\n\nThe list is in arbitrary order. It does not include the special\nentries '.' and '..' even if they are present in the directory.", - "posix.listxattr" => "Return a list of extended attributes on path.\n\npath may be either None, a string, a path-like object, or an open file descriptor.\nif path is None, listxattr will examine the current directory.\nIf follow_symlinks is False, and the last element of the path is a symbolic\n link, listxattr will examine the symbolic link itself instead of the file\n the link points to.", + "posix.link" => "Create a hard link to a file.\n\nIf either src_dir_fd or dst_dir_fd is not None, it should be a file\ndescriptor open to a directory, and the respective path string (src or\ndst) should be relative; the path will then be relative to that\ndirectory.\nIf follow_symlinks is False, and the last element of src is a symbolic\nlink, link will create a link to the symbolic link itself instead of the\nfile the link points to.\nsrc_dir_fd, dst_dir_fd, and follow_symlinks may not be implemented on\nyour platform. If they are unavailable, using them will raise\na NotImplementedError.", + "posix.listdir" => "Return a list containing the names of the files in the directory.\n\npath can be specified as either str, bytes, or a path-like object. If\npath is bytes, the filenames returned will also be bytes; in all other\ncircumstances the filenames returned will be str.\nIf path is None, uses the path='.'.\nOn some platforms, path may also be specified as an open file\ndescriptor; the file descriptor must refer to a directory. If this\nfunctionality is unavailable, using it raises NotImplementedError.\n\nThe list is in arbitrary order. It does not include the special\nentries '.' and '..' even if they are present in the directory.", + "posix.listxattr" => "Return a list of extended attributes on path.\n\npath may be either None, a string, a path-like object, or an open file\ndescriptor. If path is None, listxattr will examine the current\ndirectory.\nIf follow_symlinks is False, and the last element of the path is\na symbolic link, listxattr will examine the symbolic link itself instead\nof the file the link points to.", "posix.lockf" => "Apply, test or remove a POSIX lock on an open file descriptor.\n\n fd\n An open file descriptor.\n command\n One of F_LOCK, F_TLOCK, F_ULOCK or F_TEST.\n length\n The number of bytes to lock, starting at the current position.", "posix.login_tty" => "Prepare the tty of which fd is a file descriptor for a new login session.\n\nMake the calling process a session leader; make the tty the\ncontrolling tty, the stdin, the stdout, and the stderr of the\ncalling process; close fd.", - "posix.lseek" => "Set the position of a file descriptor. Return the new position.\n\n fd\n An open file descriptor, as returned by os.open().\n position\n Position, interpreted relative to 'whence'.\n whence\n The relative position to seek from. Valid values are:\n - SEEK_SET: seek from the start of the file.\n - SEEK_CUR: seek from the current file position.\n - SEEK_END: seek from the end of the file.\n\nThe return value is the number of bytes relative to the beginning of the file.", + "posix.lseek" => "Set the position of a file descriptor. Return the new position.\n\n fd\n An open file descriptor, as returned by os.open().\n position\n Position, interpreted relative to 'whence'.\n whence\n The relative position to seek from. Valid values are:\n - SEEK_SET: seek from the start of the file.\n - SEEK_CUR: seek from the current file position.\n - SEEK_END: seek from the end of the file.\n\nThe return value is the number of bytes relative to the beginning of\nthe file.", "posix.lstat" => "Perform a stat system call on the given path, without following symbolic links.\n\nLike stat(), but do not follow symbolic links.\nEquivalent to stat(path, follow_symlinks=False).", "posix.major" => "Extracts a device major number from a raw device number.", "posix.makedev" => "Composes a raw device number from the major and minor device numbers.", "posix.minor" => "Extracts a device minor number from a raw device number.", - "posix.mkdir" => "Create a directory.\n\nIf dir_fd is not None, it should be a file descriptor open to a directory,\n and path should be relative; path will then be relative to that directory.\ndir_fd may not be implemented on your platform.\n If it is unavailable, using it will raise a NotImplementedError.\n\nThe mode argument is ignored on Windows. Where it is used, the current umask\nvalue is first masked out.", - "posix.mkfifo" => "Create a \"fifo\" (a POSIX named pipe).\n\nIf dir_fd is not None, it should be a file descriptor open to a directory,\n and path should be relative; path will then be relative to that directory.\ndir_fd may not be implemented on your platform.\n If it is unavailable, using it will raise a NotImplementedError.", - "posix.mknod" => "Create a node in the file system.\n\nCreate a node in the file system (file, device special file or named pipe)\nat path. mode specifies both the permissions to use and the\ntype of node to be created, being combined (bitwise OR) with one of\nS_IFREG, S_IFCHR, S_IFBLK, and S_IFIFO. If S_IFCHR or S_IFBLK is set on mode,\ndevice defines the newly created device special file (probably using\nos.makedev()). Otherwise device is ignored.\n\nIf dir_fd is not None, it should be a file descriptor open to a directory,\n and path should be relative; path will then be relative to that directory.\ndir_fd may not be implemented on your platform.\n If it is unavailable, using it will raise a NotImplementedError.", + "posix.mkdir" => "Create a directory.\n\nIf dir_fd is not None, it should be a file descriptor open to\na directory, and path should be relative; path will then be relative to\nthat directory.\ndir_fd may not be implemented on your platform. If it is unavailable,\nusing it will raise a NotImplementedError.\n\nThe mode argument is ignored on Windows. Where it is used, the current\numask value is first masked out.", + "posix.mkfifo" => "Create a \"fifo\" (a POSIX named pipe).\n\nIf dir_fd is not None, it should be a file descriptor open to\na directory, and path should be relative; path will then be relative to\nthat directory.\ndir_fd may not be implemented on your platform. If it is unavailable,\nusing it will raise a NotImplementedError.", + "posix.mknod" => "Create a node in the file system.\n\nCreate a node in the file system (file, device special file or named\npipe) at path. mode specifies both the permissions to use and the\ntype of node to be created, being combined (bitwise OR) with one of\nS_IFREG, S_IFCHR, S_IFBLK, and S_IFIFO. If S_IFCHR or S_IFBLK is set\non mode, device defines the newly created device special file (probably\nusing os.makedev()). Otherwise device is ignored.\n\nIf dir_fd is not None, it should be a file descriptor open to\na directory, and path should be relative; path will then be relative\nto that directory.\ndir_fd may not be implemented on your platform. If it is unavailable,\nusing it will raise a NotImplementedError.", "posix.nice" => "Add increment to the priority of process and return the new priority.", - "posix.open" => "Open a file for low level IO. Returns a file descriptor (integer).\n\nIf dir_fd is not None, it should be a file descriptor open to a directory,\n and path should be relative; path will then be relative to that directory.\ndir_fd may not be implemented on your platform.\n If it is unavailable, using it will raise a NotImplementedError.", + "posix.open" => "Open a file for low level IO. Returns a file descriptor (integer).\n\nIf dir_fd is not None, it should be a file descriptor open to\na directory, and path should be relative; path will then be relative to\nthat directory.\ndir_fd may not be implemented on your platform. If it is unavailable,\nusing it will raise a NotImplementedError.", "posix.openpty" => "Open a pseudo-terminal.\n\nReturn a tuple of (master_fd, slave_fd) containing open file descriptors\nfor both the master and slave ends.", - "posix.pathconf" => "Return the configuration limit name for the file or directory path.\n\nIf there is no limit, return -1.\nOn some platforms, path may also be specified as an open file descriptor.\n If this functionality is unavailable, using it raises an exception.", - "posix.pidfd_open" => "Return a file descriptor referring to the process *pid*.\n\nThe descriptor can be used to perform process management without races and\nsignals.", + "posix.pathconf" => "Return the configuration limit name for the file or directory path.\n\nIf there is no limit, return -1.\nOn some platforms, path may also be specified as an open file\ndescriptor. If this functionality is unavailable, using it raises\nan exception.", + "posix.pidfd_open" => "Return a file descriptor referring to the process *pid*.\n\nThe descriptor can be used to perform process management without races\nand signals.", "posix.pipe" => "Create a pipe.\n\nReturns a tuple of two file descriptors:\n (read_fd, write_fd)", "posix.pipe2" => "Create a pipe with flags set atomically.\n\nReturns a tuple of two file descriptors:\n (read_fd, write_fd)\n\nflags can be constructed by ORing together one or more of these values:\nO_NONBLOCK, O_CLOEXEC.", - "posix.posix_fadvise" => "Announce an intention to access data in a specific pattern.\n\nAnnounce an intention to access data in a specific pattern, thus allowing\nthe kernel to make optimizations.\nThe advice applies to the region of the file specified by fd starting at\noffset and continuing for length bytes.\nadvice is one of POSIX_FADV_NORMAL, POSIX_FADV_SEQUENTIAL,\nPOSIX_FADV_RANDOM, POSIX_FADV_NOREUSE, POSIX_FADV_WILLNEED, or\nPOSIX_FADV_DONTNEED.", - "posix.posix_fallocate" => "Ensure a file has allocated at least a particular number of bytes on disk.\n\nEnsure that the file specified by fd encompasses a range of bytes\nstarting at offset bytes from the beginning and continuing for length bytes.", - "posix.posix_openpt" => "Open and return a file descriptor for a master pseudo-terminal device.\n\nPerforms a posix_openpt() C function call. The oflag argument is used to\nset file status flags and file access modes as specified in the manual page\nof posix_openpt() of your system.", - "posix.posix_spawn" => "Execute the program specified by path in a new process.\n\n path\n Path of executable file.\n argv\n Tuple or list of strings.\n env\n Dictionary of strings mapping to strings.\n file_actions\n A sequence of file action tuples.\n setpgroup\n The pgroup to use with the POSIX_SPAWN_SETPGROUP flag.\n resetids\n If the value is `true` the POSIX_SPAWN_RESETIDS will be activated.\n setsid\n If the value is `true` the POSIX_SPAWN_SETSID or POSIX_SPAWN_SETSID_NP will be activated.\n setsigmask\n The sigmask to use with the POSIX_SPAWN_SETSIGMASK flag.\n setsigdef\n The sigmask to use with the POSIX_SPAWN_SETSIGDEF flag.\n scheduler\n A tuple with the scheduler policy (optional) and parameters.", - "posix.posix_spawnp" => "Execute the program specified by path in a new process.\n\n path\n Path of executable file.\n argv\n Tuple or list of strings.\n env\n Dictionary of strings mapping to strings.\n file_actions\n A sequence of file action tuples.\n setpgroup\n The pgroup to use with the POSIX_SPAWN_SETPGROUP flag.\n resetids\n If the value is `True` the POSIX_SPAWN_RESETIDS will be activated.\n setsid\n If the value is `True` the POSIX_SPAWN_SETSID or POSIX_SPAWN_SETSID_NP will be activated.\n setsigmask\n The sigmask to use with the POSIX_SPAWN_SETSIGMASK flag.\n setsigdef\n The sigmask to use with the POSIX_SPAWN_SETSIGDEF flag.\n scheduler\n A tuple with the scheduler policy (optional) and parameters.", + "posix.posix_fadvise" => "Announce an intention to access data in a specific pattern.\n\nAnnounce an intention to access data in a specific pattern, thus\nallowing the kernel to make optimizations.\nThe advice applies to the region of the file specified by fd starting at\noffset and continuing for length bytes.\nadvice is one of POSIX_FADV_NORMAL, POSIX_FADV_SEQUENTIAL,\nPOSIX_FADV_RANDOM, POSIX_FADV_NOREUSE, POSIX_FADV_WILLNEED, or\nPOSIX_FADV_DONTNEED.", + "posix.posix_fallocate" => "Ensure a file has allocated at least a particular number of bytes on disk.\n\nEnsure that the file specified by fd encompasses a range of bytes\nstarting at offset bytes from the beginning and continuing for length\nbytes.", + "posix.posix_openpt" => "Open and return a file descriptor for a master pseudo-terminal device.\n\nPerforms a posix_openpt() C function call. The oflag argument is used to\nset file status flags and file access modes as specified in the manual\npage of posix_openpt() of your system.", + "posix.posix_spawn" => "Execute the program specified by path in a new process.\n\n path\n Path of executable file.\n argv\n Tuple or list of strings.\n env\n Dictionary of strings mapping to strings.\n file_actions\n A sequence of file action tuples.\n setpgroup\n The pgroup to use with the POSIX_SPAWN_SETPGROUP flag.\n resetids\n If the value is `true` the POSIX_SPAWN_RESETIDS will be activated.\n setsid\n If the value is `true` the POSIX_SPAWN_SETSID or POSIX_SPAWN_SETSID_NP\n will be activated.\n setsigmask\n The sigmask to use with the POSIX_SPAWN_SETSIGMASK flag.\n setsigdef\n The sigmask to use with the POSIX_SPAWN_SETSIGDEF flag.\n scheduler\n A tuple with the scheduler policy (optional) and parameters.", + "posix.posix_spawnp" => "Execute the program specified by path in a new process.\n\n path\n Path of executable file.\n argv\n Tuple or list of strings.\n env\n Dictionary of strings mapping to strings.\n file_actions\n A sequence of file action tuples.\n setpgroup\n The pgroup to use with the POSIX_SPAWN_SETPGROUP flag.\n resetids\n If the value is `True` the POSIX_SPAWN_RESETIDS will be activated.\n setsid\n If the value is `True` the POSIX_SPAWN_SETSID or POSIX_SPAWN_SETSID_NP\n will be activated.\n setsigmask\n The sigmask to use with the POSIX_SPAWN_SETSIGMASK flag.\n setsigdef\n The sigmask to use with the POSIX_SPAWN_SETSIGDEF flag.\n scheduler\n A tuple with the scheduler policy (optional) and parameters.", "posix.pread" => "Read a number of bytes from a file descriptor starting at a particular offset.\n\nRead length bytes from file descriptor fd, starting at offset bytes from\nthe beginning of the file. The file offset remains unchanged.", - "posix.preadv" => "Reads from a file descriptor into a number of mutable bytes-like objects.\n\nCombines the functionality of readv() and pread(). As readv(), it will\ntransfer data into each buffer until it is full and then move on to the next\nbuffer in the sequence to hold the rest of the data. Its fourth argument,\nspecifies the file offset at which the input operation is to be performed. It\nwill return the total number of bytes read (which can be less than the total\ncapacity of all the objects).\n\nThe flags argument contains a bitwise OR of zero or more of the following flags:\n\n- RWF_HIPRI\n- RWF_NOWAIT\n\nUsing non-zero flags requires Linux 4.6 or newer.", + "posix.preadv" => "Reads from a file descriptor into a number of mutable bytes-like objects.\n\nCombines the functionality of readv() and pread(). As readv(), it will\ntransfer data into each buffer until it is full and then move on to the\nnext buffer in the sequence to hold the rest of the data. Its fourth\nargument, specifies the file offset at which the input operation is to\nbe performed. It will return the total number of bytes read (which can\nbe less than the total capacity of all the objects).\n\nThe flags argument contains a bitwise OR of zero or more of the\nfollowing flags:\n\n- RWF_HIPRI\n- RWF_NOWAIT\n\nUsing non-zero flags requires Linux 4.6 or newer.", "posix.ptsname" => "Return the name of the slave pseudo-terminal device.\n\n fd\n File descriptor of a master pseudo-terminal device.\n\nIf the ptsname_r() C function is available, it is called;\notherwise, performs a ptsname() C function call.", "posix.putenv" => "Change or add an environment variable.", "posix.pwrite" => "Write bytes to a file descriptor starting at a particular offset.\n\nWrite buffer to fd, starting at offset bytes from the beginning of\nthe file. Returns the number of bytes written. Does not change the\ncurrent file offset.", - "posix.pwritev" => "Writes the contents of bytes-like objects to a file descriptor at a given offset.\n\nCombines the functionality of writev() and pwrite(). All buffers must be a sequence\nof bytes-like objects. Buffers are processed in array order. Entire contents of first\nbuffer is written before proceeding to second, and so on. The operating system may\nset a limit (sysconf() value SC_IOV_MAX) on the number of buffers that can be used.\nThis function writes the contents of each object to the file descriptor and returns\nthe total number of bytes written.\n\nThe flags argument contains a bitwise OR of zero or more of the following flags:\n\n- RWF_DSYNC\n- RWF_SYNC\n- RWF_APPEND\n\nUsing non-zero flags requires Linux 4.7 or newer.", + "posix.pwritev" => "Writes the contents of bytes-like objects to a file descriptor at a given offset.\n\nCombines the functionality of writev() and pwrite(). All buffers must be\na sequence of bytes-like objects. Buffers are processed in array order.\nEntire contents of first buffer is written before proceeding to second,\nand so on. The operating system may set a limit (sysconf() value\nSC_IOV_MAX) on the number of buffers that can be used.\nThis function writes the contents of each object to the file descriptor\nand returns the total number of bytes written.\n\nThe flags argument contains a bitwise OR of zero or more of the\nfollowing flags:\n\n- RWF_DSYNC\n- RWF_SYNC\n- RWF_APPEND\n\nUsing non-zero flags requires Linux 4.7 or newer.", "posix.read" => "Read from a file descriptor. Returns a bytes object.", - "posix.readinto" => "Read into a buffer object from a file descriptor.\n\nThe buffer should be mutable and bytes-like. On success, returns the number of\nbytes read. Less bytes may be read than the size of the buffer. The underlying\nsystem call will be retried when interrupted by a signal, unless the signal\nhandler raises an exception. Other errors will not be retried and an error will\nbe raised.\n\nReturns 0 if *fd* is at end of file or if the provided *buffer* has length 0\n(which can be used to check for errors without reading data). Never returns\nnegative.", - "posix.readlink" => "Return a string representing the path to which the symbolic link points.\n\nIf dir_fd is not None, it should be a file descriptor open to a directory,\nand path should be relative; path will then be relative to that directory.\n\ndir_fd may not be implemented on your platform. If it is unavailable,\nusing it will raise a NotImplementedError.", + "posix.readinto" => "Read into a buffer object from a file descriptor.\n\nThe buffer should be mutable and bytes-like. On success, returns the\nnumber of bytes read. Less bytes may be read than the size of the\nbuffer. The underlying system call will be retried when interrupted by\na signal, unless the signal handler raises an exception. Other errors\nwill not be retried and an error will be raised.\n\nReturns 0 if *fd* is at end of file or if the provided *buffer* has\nlength 0 (which can be used to check for errors without reading data).\nNever returns negative.", + "posix.readlink" => "Return a string representing the path to which the symbolic link points.\n\nIf dir_fd is not None, it should be a file descriptor open to\na directory, and path should be relative; path will then be relative to\nthat directory.\n\ndir_fd may not be implemented on your platform. If it is unavailable,\nusing it will raise a NotImplementedError.", "posix.readv" => "Read from a file descriptor fd into an iterable of buffers.\n\nThe buffers should be mutable buffers accepting bytes.\nreadv will transfer data into each buffer until it is full\nand then move on to the next buffer in the sequence to hold\nthe rest of the data.\n\nreadv returns the total number of bytes read,\nwhich may be less than the total capacity of all the buffers.", "posix.register_at_fork" => "Register callables to be called when forking a new process.\n\n before\n A callable to be called in the parent before the fork() syscall.\n after_in_child\n A callable to be called in the child after fork().\n after_in_parent\n A callable to be called in the parent after fork().\n\n'before' callbacks are called in reverse order.\n'after_in_child' and 'after_in_parent' callbacks are called in order.", - "posix.remove" => "Remove a file (same as unlink()).\n\nIf dir_fd is not None, it should be a file descriptor open to a directory,\n and path should be relative; path will then be relative to that directory.\ndir_fd may not be implemented on your platform.\n If it is unavailable, using it will raise a NotImplementedError.", - "posix.removexattr" => "Remove extended attribute attribute on path.\n\npath may be either a string, a path-like object, or an open file descriptor.\nIf follow_symlinks is False, and the last element of the path is a symbolic\n link, removexattr will modify the symbolic link itself instead of the file\n the link points to.", - "posix.rename" => "Rename a file or directory.\n\nIf either src_dir_fd or dst_dir_fd is not None, it should be a file\n descriptor open to a directory, and the respective path string (src or dst)\n should be relative; the path will then be relative to that directory.\nsrc_dir_fd and dst_dir_fd, may not be implemented on your platform.\n If they are unavailable, using them will raise a NotImplementedError.", - "posix.replace" => "Rename a file or directory, overwriting the destination.\n\nIf either src_dir_fd or dst_dir_fd is not None, it should be a file\n descriptor open to a directory, and the respective path string (src or dst)\n should be relative; the path will then be relative to that directory.\nsrc_dir_fd and dst_dir_fd, may not be implemented on your platform.\n If they are unavailable, using them will raise a NotImplementedError.", - "posix.rmdir" => "Remove a directory.\n\nIf dir_fd is not None, it should be a file descriptor open to a directory,\n and path should be relative; path will then be relative to that directory.\ndir_fd may not be implemented on your platform.\n If it is unavailable, using it will raise a NotImplementedError.", - "posix.scandir" => "Return an iterator of DirEntry objects for given path.\n\npath can be specified as either str, bytes, or a path-like object. If path\nis bytes, the names of yielded DirEntry objects will also be bytes; in\nall other circumstances they will be str.\n\nIf path is None, uses the path='.'.", + "posix.remove" => "Remove a file (same as unlink()).\n\nIf dir_fd is not None, it should be a file descriptor open to\na directory, and path should be relative; path will then be relative\nto that directory.\ndir_fd may not be implemented on your platform.\nIf it is unavailable, using it will raise a NotImplementedError.", + "posix.removexattr" => "Remove extended attribute attribute on path.\n\npath may be either a string, a path-like object, or an open file\ndescriptor.\nIf follow_symlinks is False, and the last element of the path is\na symbolic link, removexattr will modify the symbolic link itself\ninstead of the file the link points to.", + "posix.rename" => "Rename a file or directory.\n\nIf either src_dir_fd or dst_dir_fd is not None, it should be a file\ndescriptor open to a directory, and the respective path string (src or\ndst) should be relative; the path will then be relative to that\ndirectory.\nsrc_dir_fd and dst_dir_fd, may not be implemented on your platform.\nIf they are unavailable, using them will raise a NotImplementedError.", + "posix.replace" => "Rename a file or directory, overwriting the destination.\n\nIf either src_dir_fd or dst_dir_fd is not None, it should be a file\ndescriptor open to a directory, and the respective path string (src or\ndst) should be relative; the path will then be relative to that\ndirectory.\nsrc_dir_fd and dst_dir_fd, may not be implemented on your platform.\nIf they are unavailable, using them will raise a NotImplementedError.", + "posix.rmdir" => "Remove a directory.\n\nIf dir_fd is not None, it should be a file descriptor open to\na directory, and path should be relative; path will then be relative\nto that directory.\ndir_fd may not be implemented on your platform.\nIf it is unavailable, using it will raise a NotImplementedError.", + "posix.scandir" => "Return an iterator of DirEntry objects for given path.\n\npath can be specified as either str, bytes, or a path-like object. If\npath is bytes, the names of yielded DirEntry objects will also be bytes;\nin all other circumstances they will be str.\n\nIf path is None, uses the path='.'.", "posix.sched_get_priority_max" => "Get the maximum scheduling priority for policy.", "posix.sched_get_priority_min" => "Get the minimum scheduling priority for policy.", "posix.sched_getaffinity" => "Return the affinity of the process identified by pid (or the current process if zero).\n\nThe affinity is returned as a set of CPU identifiers.", @@ -14763,7 +14763,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "posix.sched_getscheduler" => "Get the scheduling policy for the process identified by pid.\n\nPassing 0 for pid returns the scheduling policy for the calling process.", "posix.sched_param" => "Currently has only one field: sched_priority\n\n sched_priority\n A scheduling parameter.", "posix.sched_param.__add__" => "Return self+value.", - "posix.sched_param.__class_getitem__" => "See PEP 585", + "posix.sched_param.__class_getitem__" => "Tuples are generic over the types of their contents.\n\nFor example, use ``tuple[int, str]`` for a pair whose first element is an int and second element is a string.\n\nTuples also support the form ``tuple[T, ...]`` to indicate an arbitrary length tuple of elements of type T.", "posix.sched_param.__contains__" => "Return bool(key in self).", "posix.sched_param.__delattr__" => "Implement delattr(self, name).", "posix.sched_param.__eq__" => "Return self==value.", @@ -14816,12 +14816,12 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "posix.setreuid" => "Set the current process's real and effective user ids.", "posix.setsid" => "Call the system call setsid().", "posix.setuid" => "Set the current process's user id.", - "posix.setxattr" => "Set extended attribute attribute on path to value.\n\npath may be either a string, a path-like object, or an open file descriptor.\nIf follow_symlinks is False, and the last element of the path is a symbolic\n link, setxattr will modify the symbolic link itself instead of the file\n the link points to.", + "posix.setxattr" => "Set extended attribute attribute on path to value.\n\npath may be either a string, a path-like object, or an open file\ndescriptor.\nIf follow_symlinks is False, and the last element of the path is\na symbolic link, setxattr will modify the symbolic link itself instead\nof the file the link points to.", "posix.splice" => "Transfer count bytes from one pipe to a descriptor or vice versa.\n\n src\n Source file descriptor.\n dst\n Destination file descriptor.\n count\n Number of bytes to copy.\n offset_src\n Starting offset in src.\n offset_dst\n Starting offset in dst.\n flags\n Flags to modify the semantics of the call.\n\nIf offset_src is None, then src is read from the current position;\nrespectively for offset_dst. The offset associated to the file\ndescriptor that refers to a pipe must be None.", "posix.stat" => "Perform a stat system call on the given path.\n\n path\n Path to be examined; can be string, bytes, a path-like object or\n open-file-descriptor int.\n dir_fd\n If not None, it should be a file descriptor open to a directory,\n and path should be a relative string; path will then be relative to\n that directory.\n follow_symlinks\n If False, and the last element of the path is a symbolic link,\n stat will examine the symbolic link itself instead of the file\n the link points to.\n\ndir_fd and follow_symlinks may not be implemented\n on your platform. If they are unavailable, using them will raise a\n NotImplementedError.\n\nIt's an error to use dir_fd or follow_symlinks when specifying path as\n an open file descriptor.", - "posix.stat_result" => "stat_result: Result from stat, fstat, or lstat.\n\nThis object may be accessed either as a tuple of\n (mode, ino, dev, nlink, uid, gid, size, atime, mtime, ctime)\nor via the attributes st_mode, st_ino, st_dev, st_nlink, st_uid, and so on.\n\nPosix/windows: If your platform supports st_blksize, st_blocks, st_rdev,\nor st_flags, they are available as attributes only.\n\nSee os.stat for more information.", + "posix.stat_result" => "stat_result: Result from stat, fstat, or lstat.\n\nThis object may be accessed either as a tuple of\n (mode, ino, dev, nlink, uid, gid, size, atime, mtime, ctime)\nor via the attributes st_mode, st_ino, st_dev, st_nlink, and so on.\n\nPosix/windows: If your platform supports st_blksize, st_blocks, st_rdev,\nor st_flags, they are available as attributes only.\n\nSee os.stat for more information.", "posix.stat_result.__add__" => "Return self+value.", - "posix.stat_result.__class_getitem__" => "See PEP 585", + "posix.stat_result.__class_getitem__" => "Tuples are generic over the types of their contents.\n\nFor example, use ``tuple[int, str]`` for a pair whose first element is an int and second element is a string.\n\nTuples also support the form ``tuple[T, ...]`` to indicate an arbitrary length tuple of elements of type T.", "posix.stat_result.__contains__" => "Return bool(key in self).", "posix.stat_result.__delattr__" => "Implement delattr(self, name).", "posix.stat_result.__eq__" => "Return self==value.", @@ -14870,10 +14870,10 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "posix.stat_result.st_rdev" => "device type (if inode device)", "posix.stat_result.st_size" => "total size, in bytes", "posix.stat_result.st_uid" => "user ID of owner", - "posix.statvfs" => "Perform a statvfs system call on the given path.\n\npath may always be specified as a string.\nOn some platforms, path may also be specified as an open file descriptor.\n If this functionality is unavailable, using it raises an exception.", + "posix.statvfs" => "Perform a statvfs system call on the given path.\n\npath may always be specified as a string.\nOn some platforms, path may also be specified as an open file\ndescriptor. If this functionality is unavailable, using it raises\nan exception.", "posix.statvfs_result" => "statvfs_result: Result from statvfs or fstatvfs.\n\nThis object may be accessed either as a tuple of\n (bsize, frsize, blocks, bfree, bavail, files, ffree, favail, flag, namemax),\nor via the attributes f_bsize, f_frsize, f_blocks, f_bfree, and so on.\n\nSee os.statvfs for more information.", "posix.statvfs_result.__add__" => "Return self+value.", - "posix.statvfs_result.__class_getitem__" => "See PEP 585", + "posix.statvfs_result.__class_getitem__" => "Tuples are generic over the types of their contents.\n\nFor example, use ``tuple[int, str]`` for a pair whose first element is an int and second element is a string.\n\nTuples also support the form ``tuple[T, ...]`` to indicate an arbitrary length tuple of elements of type T.", "posix.statvfs_result.__contains__" => "Return bool(key in self).", "posix.statvfs_result.__delattr__" => "Implement delattr(self, name).", "posix.statvfs_result.__eq__" => "Return self==value.", @@ -14904,7 +14904,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "posix.statvfs_result.count" => "Return number of occurrences of value.", "posix.statvfs_result.index" => "Return first index of value.\n\nRaises ValueError if the value is not present.", "posix.strerror" => "Translate an error code to a message string.", - "posix.symlink" => "Create a symbolic link pointing to src named dst.\n\ntarget_is_directory is required on Windows if the target is to be\n interpreted as a directory. (On Windows, symlink requires\n Windows 6.0 or greater, and raises a NotImplementedError otherwise.)\n target_is_directory is ignored on non-Windows platforms.\n\nIf dir_fd is not None, it should be a file descriptor open to a directory,\n and path should be relative; path will then be relative to that directory.\ndir_fd may not be implemented on your platform.\n If it is unavailable, using it will raise a NotImplementedError.", + "posix.symlink" => "Create a symbolic link pointing to src named dst.\n\ntarget_is_directory is required on Windows if the target is to be\ninterpreted as a directory. (On Windows, symlink requires Windows 6.0\nor greater, and raises a NotImplementedError otherwise.)\ntarget_is_directory is ignored on non-Windows platforms.\n\nIf dir_fd is not None, it should be a file descriptor open to\na directory, and path should be relative; path will then be relative\nto that directory.\ndir_fd may not be implemented on your platform. If it is unavailable,\nusing it will raise a NotImplementedError.", "posix.sync" => "Force write of everything to disk.", "posix.sysconf" => "Return an integer-valued system configuration variable.", "posix.system" => "Execute the command in a subshell.", @@ -14912,7 +14912,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "posix.tcsetpgrp" => "Set the process group associated with the terminal specified by fd.", "posix.terminal_size" => "A tuple of (columns, lines) for holding terminal window size", "posix.terminal_size.__add__" => "Return self+value.", - "posix.terminal_size.__class_getitem__" => "See PEP 585", + "posix.terminal_size.__class_getitem__" => "Tuples are generic over the types of their contents.\n\nFor example, use ``tuple[int, str]`` for a pair whose first element is an int and second element is a string.\n\nTuples also support the form ``tuple[T, ...]`` to indicate an arbitrary length tuple of elements of type T.", "posix.terminal_size.__contains__" => "Return bool(key in self).", "posix.terminal_size.__delattr__" => "Implement delattr(self, name).", "posix.terminal_size.__eq__" => "Return self==value.", @@ -14952,7 +14952,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "posix.times" => "Return a collection containing process timing information.\n\nThe object returned behaves like a named tuple with these fields:\n (utime, stime, cutime, cstime, elapsed_time)\nAll fields are floating-point numbers.", "posix.times_result" => "times_result: Result from os.times().\n\nThis object may be accessed either as a tuple of\n (user, system, children_user, children_system, elapsed),\nor via the attributes user, system, children_user, children_system,\nand elapsed.\n\nSee os.times for more information.", "posix.times_result.__add__" => "Return self+value.", - "posix.times_result.__class_getitem__" => "See PEP 585", + "posix.times_result.__class_getitem__" => "Tuples are generic over the types of their contents.\n\nFor example, use ``tuple[int, str]`` for a pair whose first element is an int and second element is a string.\n\nTuples also support the form ``tuple[T, ...]`` to indicate an arbitrary length tuple of elements of type T.", "posix.times_result.__contains__" => "Return bool(key in self).", "posix.times_result.__delattr__" => "Implement delattr(self, name).", "posix.times_result.__eq__" => "Return self==value.", @@ -14987,13 +14987,13 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "posix.times_result.index" => "Return first index of value.\n\nRaises ValueError if the value is not present.", "posix.times_result.system" => "system time", "posix.times_result.user" => "user time", - "posix.truncate" => "Truncate a file, specified by path, to a specific length.\n\nOn some platforms, path may also be specified as an open file descriptor.\n If this functionality is unavailable, using it raises an exception.", + "posix.truncate" => "Truncate a file, specified by path, to a specific length.\n\nOn some platforms, path may also be specified as an open file\ndescriptor. If this functionality is unavailable, using it raises\nan exception.", "posix.ttyname" => "Return the name of the terminal device connected to 'fd'.\n\n fd\n Integer file descriptor handle.", "posix.umask" => "Set the current numeric umask and return the previous umask.", "posix.uname" => "Return an object identifying the current operating system.\n\nThe object behaves like a named tuple with the following fields:\n (sysname, nodename, release, version, machine)", "posix.uname_result" => "uname_result: Result from os.uname().\n\nThis object may be accessed either as a tuple of\n (sysname, nodename, release, version, machine),\nor via the attributes sysname, nodename, release, version, and machine.\n\nSee os.uname for more information.", "posix.uname_result.__add__" => "Return self+value.", - "posix.uname_result.__class_getitem__" => "See PEP 585", + "posix.uname_result.__class_getitem__" => "Tuples are generic over the types of their contents.\n\nFor example, use ``tuple[int, str]`` for a pair whose first element is an int and second element is a string.\n\nTuples also support the form ``tuple[T, ...]`` to indicate an arbitrary length tuple of elements of type T.", "posix.uname_result.__contains__" => "Return bool(key in self).", "posix.uname_result.__delattr__" => "Implement delattr(self, name).", "posix.uname_result.__eq__" => "Return self==value.", @@ -15028,19 +15028,19 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "posix.uname_result.release" => "operating system release", "posix.uname_result.sysname" => "operating system name", "posix.uname_result.version" => "operating system version", - "posix.unlink" => "Remove a file (same as remove()).\n\nIf dir_fd is not None, it should be a file descriptor open to a directory,\n and path should be relative; path will then be relative to that directory.\ndir_fd may not be implemented on your platform.\n If it is unavailable, using it will raise a NotImplementedError.", + "posix.unlink" => "Remove a file (same as remove()).\n\nIf dir_fd is not None, it should be a file descriptor open to\na directory, and path should be relative; path will then be relative to\nthat directory.\ndir_fd may not be implemented on your platform.\nIf it is unavailable, using it will raise a NotImplementedError.", "posix.unlockpt" => "Unlock a pseudo-terminal master/slave pair.\n\n fd\n File descriptor of a master pseudo-terminal device.\n\nPerforms an unlockpt() C function call.", "posix.unsetenv" => "Delete an environment variable.", "posix.unshare" => "Disassociate parts of a process (or thread) execution context.\n\n flags\n Namespaces to be unshared.", "posix.urandom" => "Return a bytes object containing random bytes suitable for cryptographic use.", - "posix.utime" => "Set the access and modified time of path.\n\npath may always be specified as a string.\nOn some platforms, path may also be specified as an open file descriptor.\n If this functionality is unavailable, using it raises an exception.\n\nIf times is not None, it must be a tuple (atime, mtime);\n atime and mtime should be expressed as float seconds since the epoch.\nIf ns is specified, it must be a tuple (atime_ns, mtime_ns);\n atime_ns and mtime_ns should be expressed as integer nanoseconds\n since the epoch.\nIf times is None and ns is unspecified, utime uses the current time.\nSpecifying tuples for both times and ns is an error.\n\nIf dir_fd is not None, it should be a file descriptor open to a directory,\n and path should be relative; path will then be relative to that directory.\nIf follow_symlinks is False, and the last element of the path is a symbolic\n link, utime will modify the symbolic link itself instead of the file the\n link points to.\nIt is an error to use dir_fd or follow_symlinks when specifying path\n as an open file descriptor.\ndir_fd and follow_symlinks may not be available on your platform.\n If they are unavailable, using them will raise a NotImplementedError.", + "posix.utime" => "Set the access and modified time of path.\n\npath may always be specified as a string. On some platforms, path may\nalso be specified as an open file descriptor. If this functionality is\nunavailable, using it raises an exception.\n\nIf times is not None, it must be a tuple (atime, mtime);\natime and mtime should be expressed as float seconds since the epoch.\nIf ns is specified, it must be a tuple (atime_ns, mtime_ns);\natime_ns and mtime_ns should be expressed as integer nanoseconds\nsince the epoch.\nIf times is None and ns is unspecified, utime uses the current time.\nSpecifying tuples for both times and ns is an error.\n\nIf dir_fd is not None, it should be a file descriptor open to\na directory, and path should be relative; path will then be relative to\nthat directory.\nIf follow_symlinks is False, and the last element of the path is\na symbolic link, utime will modify the symbolic link itself instead of\nthe file the link points to.\nIt is an error to use dir_fd or follow_symlinks when specifying path as\nan open file descriptor.\ndir_fd and follow_symlinks may not be available on your platform.\nIf they are unavailable, using them will raise a NotImplementedError.", "posix.wait" => "Wait for completion of a child process.\n\nReturns a tuple of information about the child process:\n (pid, status)", "posix.wait3" => "Wait for completion of a child process.\n\nReturns a tuple of information about the child process:\n (pid, status, rusage)", "posix.wait4" => "Wait for completion of a specific child process.\n\nReturns a tuple of information about the child process:\n (pid, status, rusage)", - "posix.waitid" => "Returns the result of waiting for a process or processes.\n\n idtype\n Must be one of be P_PID, P_PGID or P_ALL.\n id\n The id to wait on.\n options\n Constructed from the ORing of one or more of WEXITED, WSTOPPED\n or WCONTINUED and additionally may be ORed with WNOHANG or WNOWAIT.\n\nReturns either waitid_result or None if WNOHANG is specified and there are\nno children in a waitable state.", + "posix.waitid" => "Returns the result of waiting for a process or processes.\n\n idtype\n Must be one of be P_PID, P_PGID or P_ALL.\n id\n The id to wait on.\n options\n Constructed from the ORing of one or more of WEXITED, WSTOPPED\n or WCONTINUED and additionally may be ORed with WNOHANG or WNOWAIT.\n\nReturns either waitid_result or None if WNOHANG is specified and there\nare no children in a waitable state.", "posix.waitid_result" => "waitid_result: Result from waitid.\n\nThis object may be accessed either as a tuple of\n (si_pid, si_uid, si_signo, si_status, si_code),\nor via the attributes si_pid, si_uid, and so on.\n\nSee os.waitid for more information.", "posix.waitid_result.__add__" => "Return self+value.", - "posix.waitid_result.__class_getitem__" => "See PEP 585", + "posix.waitid_result.__class_getitem__" => "Tuples are generic over the types of their contents.\n\nFor example, use ``tuple[int, str]`` for a pair whose first element is an int and second element is a string.\n\nTuples also support the form ``tuple[T, ...]`` to indicate an arbitrary length tuple of elements of type T.", "posix.waitid_result.__contains__" => "Return bool(key in self).", "posix.waitid_result.__delattr__" => "Implement delattr(self, name).", "posix.waitid_result.__eq__" => "Return self==value.", @@ -15071,7 +15071,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "posix.waitid_result.count" => "Return number of occurrences of value.", "posix.waitid_result.index" => "Return first index of value.\n\nRaises ValueError if the value is not present.", "posix.waitpid" => "Wait for completion of a given child process.\n\nReturns a tuple of information regarding the child process:\n (pid, status)\n\nThe options argument is ignored on Windows.", - "posix.waitstatus_to_exitcode" => "Convert a wait status to an exit code.\n\nOn Unix:\n\n* If WIFEXITED(status) is true, return WEXITSTATUS(status).\n* If WIFSIGNALED(status) is true, return -WTERMSIG(status).\n* Otherwise, raise a ValueError.\n\nOn Windows, return status shifted right by 8 bits.\n\nOn Unix, if the process is being traced or if waitpid() was called with\nWUNTRACED option, the caller must first check if WIFSTOPPED(status) is true.\nThis function must not be called if WIFSTOPPED(status) is true.", + "posix.waitstatus_to_exitcode" => "Convert a wait status to an exit code.\n\nOn Unix:\n\n* If WIFEXITED(status) is true, return WEXITSTATUS(status).\n* If WIFSIGNALED(status) is true, return -WTERMSIG(status).\n* Otherwise, raise a ValueError.\n\nOn Windows, return status shifted right by 8 bits.\n\nOn Unix, if the process is being traced or if waitpid() was called with\nWUNTRACED option, the caller must first check if WIFSTOPPED(status) is\ntrue. This function must not be called if WIFSTOPPED(status) is true.", "posix.write" => "Write a bytes object to a file descriptor.", "posix.writev" => "Iterate over buffers, and write the contents of each to a file descriptor.\n\nReturns the total number of bytes written.\nbuffers must be a sequence of bytes-like objects.", "pwd" => "This module provides access to the Unix password database.\nIt is available on all Unix versions.\n\nPassword database entries are reported as 7-tuples containing the following\nitems from the password database (see `'), in order:\npw_name, pw_passwd, pw_uid, pw_gid, pw_gecos, pw_dir, pw_shell.\nThe uid and gid items are integers, all others are strings. An\nexception is raised if the entry asked for cannot be found.", @@ -15080,7 +15080,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "pwd.getpwuid" => "Return the password database entry for the given numeric user ID.\n\nSee `help(pwd)` for more on password database entries.", "pwd.struct_passwd" => "pwd.struct_passwd: Results from getpw*() routines.\n\nThis object may be accessed either as a tuple of\n (pw_name,pw_passwd,pw_uid,pw_gid,pw_gecos,pw_dir,pw_shell)\nor via the object attributes as named in the above tuple.", "pwd.struct_passwd.__add__" => "Return self+value.", - "pwd.struct_passwd.__class_getitem__" => "See PEP 585", + "pwd.struct_passwd.__class_getitem__" => "Tuples are generic over the types of their contents.\n\nFor example, use ``tuple[int, str]`` for a pair whose first element is an int and second element is a string.\n\nTuples also support the form ``tuple[T, ...]`` to indicate an arbitrary length tuple of elements of type T.", "pwd.struct_passwd.__contains__" => "Return bool(key in self).", "pwd.struct_passwd.__delattr__" => "Implement delattr(self, name).", "pwd.struct_passwd.__eq__" => "Return self==value.", @@ -15146,16 +15146,18 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "pyexpat.XMLParserType" => "XML parser", "pyexpat.XMLParserType.ExternalEntityParserCreate" => "Create a parser for parsing an external entity based on the information passed to the ExternalEntityRefHandler.", "pyexpat.XMLParserType.GetBase" => "Return base URL string for the parser.", - "pyexpat.XMLParserType.GetInputContext" => "Return the untranslated text of the input that caused the current event.\n\nIf the event was generated by a large amount of text (such as a start tag\nfor an element with many attributes), not all of the text may be available.", + "pyexpat.XMLParserType.GetInputContext" => "Return the untranslated text of the input that caused the current event.\n\nIf the event was generated by a large amount of text (such as\na start tag for an element with many attributes), not all of the\ntext may be available.", "pyexpat.XMLParserType.GetReparseDeferralEnabled" => "Retrieve reparse deferral enabled status; always returns false with Expat <2.6.0.", "pyexpat.XMLParserType.Parse" => "Parse XML data.\n\n'isfinal' should be true at end of input.", "pyexpat.XMLParserType.ParseFile" => "Parse XML data from file-like object.", - "pyexpat.XMLParserType.SetAllocTrackerActivationThreshold" => "Sets the number of allocated bytes of dynamic memory needed to activate protection against disproportionate use of RAM.\n\nBy default, parser objects have an allocation activation threshold of 64 MiB.", - "pyexpat.XMLParserType.SetAllocTrackerMaximumAmplification" => "Sets the maximum amplification factor between direct input and bytes of dynamic memory allocated.\n\nThe amplification factor is calculated as \"allocated / direct\" while parsing,\nwhere \"direct\" is the number of bytes read from the primary document in parsing\nand \"allocated\" is the number of bytes of dynamic memory allocated in the parser\nhierarchy.\n\nThe 'max_factor' value must be a non-NaN floating point value greater than\nor equal to 1.0. Amplification factors greater than 100.0 can be observed\nnear the start of parsing even with benign files in practice. In particular,\nthe activation threshold should be carefully chosen to avoid false positives.\n\nBy default, parser objects have a maximum amplification factor of 100.0.", + "pyexpat.XMLParserType.SetAllocTrackerActivationThreshold" => "Sets the number of allocated bytes of dynamic memory needed to activate protection against disproportionate use of RAM.\n\nParser objects usually have an allocation activation threshold of 64 MiB,\nbut the actual default value depends on the underlying Expat library.", + "pyexpat.XMLParserType.SetAllocTrackerMaximumAmplification" => "Sets the maximum amplification factor between direct input and bytes of dynamic memory allocated.\n\nThe amplification factor is calculated as \"allocated / direct\" while\nparsing, where \"direct\" is the number of bytes read from the primary\ndocument in parsing and \"allocated\" is the number of bytes of\ndynamic memory allocated in the parser hierarchy.\n\nThe 'max_factor' value must be a non-NaN floating point value\ngreater than or equal to 1.0. Amplification factors greater than\n100.0 can be observed near the start of parsing even with benign\nfiles in practice. In particular, the activation threshold should\nbe carefully chosen to avoid false positives.\n\nParser objects usually have a maximum amplification factor of 100,\nbut the actual default value depends on the underlying Expat library.", "pyexpat.XMLParserType.SetBase" => "Set the base URL for the parser.", + "pyexpat.XMLParserType.SetBillionLaughsAttackProtectionActivationThreshold" => "Sets the number of output bytes needed to activate protection against billion laughs attacks.\n\nThe number of output bytes includes amplification from entity expansion\nand reading DTD files.\n\nParser objects usually have a protection activation threshold of 8 MiB,\nbut the actual default value depends on the underlying Expat library.\n\nActivation thresholds below 4 MiB are known to break support for DITA 1.3\npayload and are hence not recommended.", + "pyexpat.XMLParserType.SetBillionLaughsAttackProtectionMaximumAmplification" => "Sets the maximum tolerated amplification factor for protection against billion laughs attacks.\n\nThe amplification factor is calculated as \"(direct + indirect) / direct\"\nwhile parsing, where \"direct\" is the number of bytes read from the primary\ndocument in parsing and \"indirect\" is the number of bytes added by expanding\nentities and reading external DTD files, combined.\n\nThe 'max_factor' value must be a non-NaN floating point value greater than\nor equal to 1.0. Amplification factors greater than 30,000 can be observed\nin the middle of parsing even with benign files in practice. In particular,\nthe activation threshold should be carefully chosen to avoid false positives.\n\nParser objects usually have a maximum amplification factor of 100,\nbut the actual default value depends on the underlying Expat library.", "pyexpat.XMLParserType.SetParamEntityParsing" => "Controls parsing of parameter entities (including the external DTD subset).\n\nPossible flag values are XML_PARAM_ENTITY_PARSING_NEVER,\nXML_PARAM_ENTITY_PARSING_UNLESS_STANDALONE and\nXML_PARAM_ENTITY_PARSING_ALWAYS. Returns true if setting the flag\nwas successful.", "pyexpat.XMLParserType.SetReparseDeferralEnabled" => "Enable/Disable reparse deferral; enabled by default with Expat >=2.6.0.", - "pyexpat.XMLParserType.UseForeignDTD" => "Allows the application to provide an artificial external subset if one is not specified as part of the document instance.\n\nThis readily allows the use of a 'default' document type controlled by the\napplication, while still getting the advantage of providing document type\ninformation to the parser. 'flag' defaults to True if not provided.", + "pyexpat.XMLParserType.UseForeignDTD" => "Allows the application to provide an artificial external subset if one is not specified as part of the document instance.\n\nThis readily allows the use of a 'default' document type controlled\nby the application, while still getting the advantage of providing\ndocument type information to the parser. 'flag' defaults to True if\nnot provided.", "pyexpat.XMLParserType.__delattr__" => "Implement delattr(self, name).", "pyexpat.XMLParserType.__eq__" => "Return self==value.", "pyexpat.XMLParserType.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", @@ -15230,7 +15232,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "readline.write_history_file" => "Save a readline history file.\n\nThe default filename is ~/.history.", "resource.struct_rusage" => "struct_rusage: Result from getrusage.\n\nThis object may be accessed either as a tuple of\n (utime,stime,maxrss,ixrss,idrss,isrss,minflt,majflt,\n nswap,inblock,oublock,msgsnd,msgrcv,nsignals,nvcsw,nivcsw)\nor via the attributes ru_utime, ru_stime, ru_maxrss, and so on.", "resource.struct_rusage.__add__" => "Return self+value.", - "resource.struct_rusage.__class_getitem__" => "See PEP 585", + "resource.struct_rusage.__class_getitem__" => "Tuples are generic over the types of their contents.\n\nFor example, use ``tuple[int, str]`` for a pair whose first element is an int and second element is a string.\n\nTuples also support the form ``tuple[T, ...]`` to indicate an arbitrary length tuple of elements of type T.", "resource.struct_rusage.__contains__" => "Return bool(key in self).", "resource.struct_rusage.__delattr__" => "Implement delattr(self, name).", "resource.struct_rusage.__eq__" => "Return self==value.", @@ -15304,7 +15306,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "select.epoll.fileno" => "Return the epoll control file descriptor.", "select.epoll.fromfd" => "Create an epoll object from a given control fd.", "select.epoll.modify" => "Modify event mask for a registered file descriptor.\n\n fd\n the target file descriptor of the operation\n eventmask\n a bit set composed of the various EPOLL constants", - "select.epoll.poll" => "Wait for events on the epoll file descriptor.\n\n timeout\n the maximum time to wait in seconds (as float);\n a timeout of None or -1 makes poll wait indefinitely\n maxevents\n the maximum number of events returned; -1 means no limit\n\nReturns a list containing any descriptors that have events to report,\nas a list of (fd, events) 2-tuples.", + "select.epoll.poll" => "Wait for events on the epoll file descriptor.\n\n timeout\n the maximum time to wait in seconds (as float);\n a timeout of None or -1 makes poll wait indefinitely\n maxevents\n the maximum number of events returned; -1 means no limit\n\nReturns a list containing any descriptors that have events to\nreport, as a list of (fd, events) 2-tuples.", "select.epoll.register" => "Registers a new fd or raises an OSError if the fd is already registered.\n\n fd\n the target file descriptor of the operation\n eventmask\n a bit set composed of the various EPOLL constants\n\nThe epoll interface supports all file descriptors that support poll.", "select.epoll.unregister" => "Remove a registered file descriptor from the epoll object.\n\n fd\n the target file descriptor of the operation", "select.kevent" => "kevent(ident, filter=KQ_FILTER_READ, flags=KQ_EV_ADD, fflags=0, data=0, udata=0)\n\nThis object is the equivalent of the struct kevent for the C API.\n\nSee the kqueue manpage for more detailed information about the meaning\nof the arguments.\n\nOne minor note: while you might hope that udata could store a\nreference to a python object, it cannot, because it is impossible to\nkeep a proper reference count of the object once it's passed into the\nkernel. Therefore, I have restricted it to only storing an integer. I\nrecommend ignoring it and simply using the 'ident' field to key off\nof. You could also set up a dictionary on the python side to store a\nudata->object mapping.", @@ -15356,8 +15358,8 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "select.kqueue.control" => "Calls the kernel kevent function.\n\n changelist\n Must be an iterable of kevent objects describing the changes to be made\n to the kernel's watch list or None.\n maxevents\n The maximum number of events that the kernel will return.\n timeout\n The maximum time to wait in seconds, or else None to wait forever.\n This accepts floats for smaller timeouts, too.", "select.kqueue.fileno" => "Return the kqueue control file descriptor.", "select.kqueue.fromfd" => "Create a kqueue object from a given control fd.", - "select.poll" => "Returns a polling object.\n\nThis object supports registering and unregistering file descriptors, and then\npolling them for I/O events.", - "select.select" => "Wait until one or more file descriptors are ready for some kind of I/O.\n\nThe first three arguments are iterables of file descriptors to be waited for:\nrlist -- wait until ready for reading\nwlist -- wait until ready for writing\nxlist -- wait for an \"exceptional condition\"\nIf only one kind of condition is required, pass [] for the other lists.\n\nA file descriptor is either a socket or file object, or a small integer\ngotten from a fileno() method call on one of those.\n\nThe optional 4th argument specifies a timeout in seconds; it may be\na floating-point number to specify fractions of seconds. If it is absent\nor None, the call will never time out.\n\nThe return value is a tuple of three lists corresponding to the first three\narguments; each contains the subset of the corresponding file descriptors\nthat are ready.\n\n*** IMPORTANT NOTICE ***\nOn Windows, only sockets are supported; on Unix, all file\ndescriptors can be used.", + "select.poll" => "Returns a polling object.\n\nThis object supports registering and unregistering file descriptors, and\nthen polling them for I/O events.", + "select.select" => "Wait until one or more file descriptors are ready for some kind of I/O.\n\nThe first three arguments are iterables of file descriptors to be waited\nfor:\nrlist -- wait until ready for reading\nwlist -- wait until ready for writing\nxlist -- wait for an \"exceptional condition\"\nIf only one kind of condition is required, pass [] for the other lists.\n\nA file descriptor is either a socket or file object, or a small integer\ngotten from a fileno() method call on one of those.\n\nThe optional 4th argument specifies a timeout in seconds; it may be\na floating-point number to specify fractions of seconds. If it is absent\nor None, the call will never time out.\n\nThe return value is a tuple of three lists corresponding to the first\nthree arguments; each contains the subset of the corresponding file\ndescriptors that are ready.\n\n*** IMPORTANT NOTICE ***\nOn Windows, only sockets are supported; on Unix, all file\ndescriptors can be used.", "sys" => "This module provides access to some objects used or maintained by the\ninterpreter and to functions that interact strongly with the interpreter.\n\nDynamic objects:\n\nargv -- command line arguments; argv[0] is the script pathname if known\npath -- module search path; path[0] is the script directory, else ''\nmodules -- dictionary of loaded modules\n\ndisplayhook -- called to show results in an interactive session\nexcepthook -- called to handle any uncaught exception other than SystemExit\n To customize printing in an interactive session or to install a custom\n top-level exception handler, assign other functions to replace these.\n\nstdin -- standard input file object; used by input()\nstdout -- standard output file object; used by print()\nstderr -- standard error object; used for error messages\n By assigning other file objects (or objects that behave like files)\n to these, it is possible to redirect all of the interpreter's I/O.\n\nlast_exc - the last uncaught exception\n Only available in an interactive session after a\n traceback has been printed.\nlast_type -- type of last uncaught exception\nlast_value -- value of last uncaught exception\nlast_traceback -- traceback of last uncaught exception\n These three are the (deprecated) legacy representation of last_exc.\n\nStatic objects:\n\nbuiltin_module_names -- tuple of module names built into this interpreter\ncopyright -- copyright notice pertaining to this interpreter\nexec_prefix -- prefix used to find the machine-specific Python library\nexecutable -- absolute path of the executable binary of the Python interpreter\nfloat_info -- a named tuple with information about the float implementation.\nfloat_repr_style -- string indicating the style of repr() output for floats\nhash_info -- a named tuple with information about the hash algorithm.\nhexversion -- version information encoded as a single integer\nimplementation -- Python implementation information.\nint_info -- a named tuple with information about the int implementation.\nmaxsize -- the largest supported length of containers.\nmaxunicode -- the value of the largest Unicode code point\nplatform -- platform identifier\nprefix -- prefix used to find the Python library\nthread_info -- a named tuple with information about the thread implementation.\nversion -- the version of this interpreter as a string\nversion_info -- version information as a named tuple\ndllhandle -- [Windows only] integer handle of the Python DLL\nwinver -- [Windows only] version number of the Python DLL\n_enablelegacywindowsfsencoding -- [Windows only]\n__stdin__ -- the original stdin; don't touch!\n__stdout__ -- the original stdout; don't touch!\n__stderr__ -- the original stderr; don't touch!\n__displayhook__ -- the original displayhook; don't touch!\n__excepthook__ -- the original excepthook; don't touch!\n\nFunctions:\n\ndisplayhook() -- print an object to the screen, and save it in builtins._\nexcepthook() -- print an exception and its traceback to sys.stderr\nexception() -- return the current thread's active exception\nexc_info() -- return information about the current thread's active exception\nexit() -- exit the interpreter by raising SystemExit\ngetdlopenflags() -- returns flags to be used for dlopen() calls\ngetprofile() -- get the global profiling function\ngetrefcount() -- return the reference count for an object (plus one :-)\ngetrecursionlimit() -- return the max recursion depth for the interpreter\ngetsizeof() -- return the size of an object in bytes\ngettrace() -- get the global debug tracing function\nsetdlopenflags() -- set the flags to be used for dlopen() calls\nsetprofile() -- set the global profiling function\nsetrecursionlimit() -- set the max recursion depth for the interpreter\nsettrace() -- set the global debug tracing function", "sys.__breakpointhook__" => "This hook function is called by built-in breakpoint().", "sys.__displayhook__" => "Print an object to sys.stdout and also save it in builtins._", @@ -15411,7 +15413,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "sys.is_finalizing" => "Return True if Python is exiting.", "sys.is_remote_debug_enabled" => "Return True if remote debugging is enabled, False otherwise.", "sys.is_stack_trampoline_active" => "Return *True* if a stack profiler trampoline is active.", - "sys.remote_exec" => "Executes a file containing Python code in a given remote Python process.\n\nThis function returns immediately, and the code will be executed by the\ntarget process's main thread at the next available opportunity, similarly\nto how signals are handled. There is no interface to determine when the\ncode has been executed. The caller is responsible for making sure that\nthe file still exists whenever the remote process tries to read it and that\nit hasn't been overwritten.\n\nThe remote process must be running a CPython interpreter of the same major\nand minor version as the local process. If either the local or remote\ninterpreter is pre-release (alpha, beta, or release candidate) then the\nlocal and remote interpreters must be the same exact version.\n\nArgs:\n pid (int): The process ID of the target Python process.\n script (str|bytes): The path to a file containing\n the Python code to be executed.", + "sys.remote_exec" => "Executes a file containing Python code in a given remote Python process.\n\nThis function returns immediately, and the code will be executed by the\ntarget process's main thread at the next available opportunity,\nsimilarly to how signals are handled. There is no interface to\ndetermine when the code has been executed. The caller is responsible\nfor making sure that the file still exists whenever the remote process\ntries to read it and that it hasn't been overwritten.\n\nThe remote process must be running a CPython interpreter of the same\nmajor and minor version as the local process. If either the local or\nremote interpreter is pre-release (alpha, beta, or release candidate)\nthen the local and remote interpreters must be the same exact version.\n\nArgs:\n pid (int): The process ID of the target Python process.\n script (str|bytes): The path to a file containing\n the Python code to be executed.", "sys.set_asyncgen_hooks" => "set_asyncgen_hooks([firstiter] [, finalizer])\n\nSet a finalizer for async generators objects.", "sys.set_coroutine_origin_tracking_depth" => "Enable or disable origin tracking for coroutine objects in this thread.\n\nCoroutine objects will track 'depth' frames of traceback information\nabout where they came from, available in their cr_origin attribute.\n\nSet a depth of 0 to disable.", "sys.set_int_max_str_digits" => "Set the maximum string digits limit for non-binary int<->str conversions.", @@ -15458,7 +15460,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "termios.tcgetwinsize" => "Get the tty winsize for file descriptor fd.\n\nReturns a tuple (ws_row, ws_col).", "termios.tcsendbreak" => "Send a break on file descriptor fd.\n\nA zero duration sends a break for 0.25-0.5 seconds; a nonzero duration\nhas a system dependent meaning.", "termios.tcsetattr" => "Set the tty attributes for file descriptor fd.\n\nThe attributes to be set are taken from the attributes argument, which\nis a list like the one returned by tcgetattr(). The when argument\ndetermines when the attributes are changed: termios.TCSANOW to\nchange immediately, termios.TCSADRAIN to change after transmitting all\nqueued output, or termios.TCSAFLUSH to change after transmitting all\nqueued output and discarding all queued input.", - "termios.tcsetwinsize" => "Set the tty winsize for file descriptor fd.\n\nThe winsize to be set is taken from the winsize argument, which\nis a two-item tuple (ws_row, ws_col) like the one returned by tcgetwinsize().", + "termios.tcsetwinsize" => "Set the tty winsize for file descriptor fd.\n\nThe winsize to be set is taken from the winsize argument, which\nis a two-item tuple (ws_row, ws_col) like the one returned by\ntcgetwinsize().", "time" => "This module provides various functions to manipulate time values.\n\nThere are two standard representations of time. One is the number\nof seconds since the Epoch, in UTC (a.k.a. GMT). It may be an integer\nor a floating-point number (to represent fractions of seconds).\nThe epoch is the point where the time starts, the return value of time.gmtime(0).\nIt is January 1, 1970, 00:00:00 (UTC) on all platforms.\n\nThe other representation is a tuple of 9 integers giving local time.\nThe tuple items are:\n year (including century, e.g. 1998)\n month (1-12)\n day (1-31)\n hours (0-23)\n minutes (0-59)\n seconds (0-59)\n weekday (0-6, Monday is 0)\n Julian day (day in the year, 1-366)\n DST (Daylight Savings Time) flag (-1, 0 or 1)\nIf the DST flag is 0, the time is given in the regular time zone;\nif it is 1, the time is given in the DST time zone;\nif it is -1, mktime() should guess based on the date and time.", "time.asctime" => "asctime([tuple]) -> string\n\nConvert a time tuple to a string, e.g. 'Sat Jun 06 16:26:11 1998'.\nWhen the time tuple is not present, current time as returned by localtime()\nis used.", "time.clock_getres" => "clock_getres(clk_id) -> floating-point number\n\nReturn the resolution (precision) of the specified clock clk_id.", @@ -15483,7 +15485,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "time.strptime" => "strptime(string, format) -> struct_time\n\nParse a string to a time tuple according to a format specification.\nSee the library reference manual for formatting codes (same as\nstrftime()).\n\nCommonly used format codes:\n\n%Y Year with century as a decimal number.\n%m Month as a decimal number [01,12].\n%d Day of the month as a decimal number [01,31].\n%H Hour (24-hour clock) as a decimal number [00,23].\n%M Minute as a decimal number [00,59].\n%S Second as a decimal number [00,61].\n%z Time zone offset from UTC.\n%a Locale's abbreviated weekday name.\n%A Locale's full weekday name.\n%b Locale's abbreviated month name.\n%B Locale's full month name.\n%c Locale's appropriate date and time representation.\n%I Hour (12-hour clock) as a decimal number [01,12].\n%p Locale's equivalent of either AM or PM.\n\nOther codes may be available on your platform. See documentation for\nthe C library strftime function.", "time.struct_time" => "The time value as returned by gmtime(), localtime(), and strptime(), and\n accepted by asctime(), mktime() and strftime(). May be considered as a\n sequence of 9 integers.\n\n Note that several fields' values are not the same as those defined by\n the C language standard for struct tm. For example, the value of the\n field tm_year is the actual year, not year - 1900. See individual\n fields' descriptions for details.", "time.struct_time.__add__" => "Return self+value.", - "time.struct_time.__class_getitem__" => "See PEP 585", + "time.struct_time.__class_getitem__" => "Tuples are generic over the types of their contents.\n\nFor example, use ``tuple[int, str]`` for a pair whose first element is an int and second element is a string.\n\nTuples also support the form ``tuple[T, ...]`` to indicate an arbitrary length tuple of elements of type T.", "time.struct_time.__contains__" => "Return bool(key in self).", "time.struct_time.__delattr__" => "Implement delattr(self, name).", "time.struct_time.__eq__" => "Return self==value.", @@ -15681,7 +15683,7 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "zlib._ZlibDecompressor.__sizeof__" => "Size of object in memory, in bytes.", "zlib._ZlibDecompressor.__str__" => "Return str(self).", "zlib._ZlibDecompressor.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", - "zlib._ZlibDecompressor.decompress" => "Decompress *data*, returning uncompressed data as bytes.\n\nIf *max_length* is nonnegative, returns at most *max_length* bytes of\ndecompressed data. If this limit is reached and further output can be\nproduced, *self.needs_input* will be set to ``False``. In this case, the next\ncall to *decompress()* may provide *data* as b'' to obtain more of the output.\n\nIf all of the input data was decompressed and returned (either because this\nwas less than *max_length* bytes, or because *max_length* was negative),\n*self.needs_input* will be set to True.\n\nAttempting to decompress data after the end of stream is reached raises an\nEOFError. Any data found after the end of the stream is ignored and saved in\nthe unused_data attribute.", + "zlib._ZlibDecompressor.decompress" => "Decompress *data*, returning uncompressed data as bytes.\n\nIf *max_length* is nonnegative, returns at most *max_length* bytes\nof decompressed data. If this limit is reached and further output\ncan be produced, *self.needs_input* will be set to ``False``. In\nthis case, the next call to *decompress()* may provide *data* as b''\nto obtain more of the output.\n\nIf all of the input data was decompressed and returned (either\nbecause this was less than *max_length* bytes, or because\n*max_length* was negative), *self.needs_input* will be set to True.\n\nAttempting to decompress data after the end of stream is reached\nraises an EOFError. Any data found after the end of the stream is\nignored and saved in the unused_data attribute.", "zlib._ZlibDecompressor.eof" => "True if the end-of-stream marker has been reached.", "zlib._ZlibDecompressor.needs_input" => "True if more input is needed before more decompressed data can be produced.", "zlib._ZlibDecompressor.unused_data" => "Data found after the end of the compressed stream.", From a895eeed0065df270720ba710762c433beede538 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Sun, 14 Jun 2026 07:53:18 +0300 Subject: [PATCH 082/339] Newtype SignalHandlers (#8089) --- crates/vm/src/signal.rs | 35 ++++++++++++++++++++++++++------- crates/vm/src/stdlib/_signal.rs | 11 +++++++---- crates/vm/src/stdlib/posix.rs | 2 +- crates/vm/src/vm/mod.rs | 7 ++++--- 4 files changed, 40 insertions(+), 15 deletions(-) diff --git a/crates/vm/src/signal.rs b/crates/vm/src/signal.rs index 50a887c14..11fe4f212 100644 --- a/crates/vm/src/signal.rs +++ b/crates/vm/src/signal.rs @@ -1,7 +1,10 @@ use crate::{PyObjectRef, PyResult, VirtualMachine}; -use alloc::fmt; -use core::cell::{Cell, RefCell}; -use core::sync::atomic::{AtomicBool, Ordering}; +use core::{ + cell::{Cell, RefCell}, + fmt, + ops::{Deref, DerefMut}, + sync::atomic::{AtomicBool, Ordering}, +}; use std::sync::mpsc; #[cfg(windows)] @@ -22,10 +25,6 @@ pub(crate) static TRIGGERS: [AtomicBool; NSIG] = [ATOMIC_FALSE; NSIG]; #[cfg(windows)] static SIGINT_EVENT: AtomicIsize = AtomicIsize::new(0); -pub(crate) fn new_signal_handlers() -> Box; NSIG]>> { - Box::new(const { RefCell::new([const { None }; NSIG]) }) -} - thread_local! { /// Prevent recursive signal handler invocation. When a Python signal /// handler is running, new signals are deferred until it completes. @@ -190,3 +189,25 @@ pub fn get_sigint_event() -> Option { let handle = SIGINT_EVENT.load(Ordering::Acquire); if handle == 0 { None } else { Some(handle) } } + +pub struct SignalHandlers(Box; NSIG]>>); + +impl Default for SignalHandlers { + fn default() -> Self { + Self(Box::new(const { RefCell::new([const { None }; NSIG]) })) + } +} + +impl Deref for SignalHandlers { + type Target = Box; NSIG]>>; + + fn deref(&self) -> &Self::Target { + &self.0 + } +} + +impl DerefMut for SignalHandlers { + fn deref_mut(&mut self) -> &mut Self::Target { + &mut self.0 + } +} diff --git a/crates/vm/src/stdlib/_signal.rs b/crates/vm/src/stdlib/_signal.rs index 191f67d09..2d9eaa53a 100644 --- a/crates/vm/src/stdlib/_signal.rs +++ b/crates/vm/src/stdlib/_signal.rs @@ -6,7 +6,10 @@ pub(crate) use _signal::module_def; pub(crate) mod _signal { #![allow(unreachable_pub)] - use crate::{Py, PyObjectRef, PyResult, VirtualMachine, signal}; + use crate::{ + Py, PyObjectRef, PyResult, VirtualMachine, + signal::{self, SignalHandlers}, + }; use core::{ ops::Range, sync::atomic::{self, Ordering}, @@ -193,7 +196,7 @@ pub(crate) mod _signal { }; vm.signal_handlers - .get_or_init(signal::new_signal_handlers) + .get_or_init(SignalHandlers::default) .borrow_mut()[signum as usize] = py_handler; } @@ -247,7 +250,7 @@ pub(crate) mod _signal { unsafe { host_signal::install_handler(signalnum, sig_handler) } .map_err(|_| vm.new_os_error("Failed to set signal"))?; - let signal_handlers = vm.signal_handlers.get_or_init(signal::new_signal_handlers); + let signal_handlers = vm.signal_handlers.get_or_init(SignalHandlers::default); let old_handler = signal_handlers.borrow_mut()[signalnum as usize].replace(handler); Ok(old_handler) } @@ -255,7 +258,7 @@ pub(crate) mod _signal { #[pyfunction] fn getsignal(signalnum: i32, vm: &VirtualMachine) -> PyResult { signal::assert_in_range(signalnum, vm)?; - let signal_handlers = vm.signal_handlers.get_or_init(signal::new_signal_handlers); + let signal_handlers = vm.signal_handlers.get_or_init(SignalHandlers::default); let handler = signal_handlers.borrow()[signalnum as usize] .clone() .unwrap_or_else(|| vm.ctx.none()); diff --git a/crates/vm/src/stdlib/posix.rs b/crates/vm/src/stdlib/posix.rs index 0a55cec4c..21576e8da 100644 --- a/crates/vm/src/stdlib/posix.rs +++ b/crates/vm/src/stdlib/posix.rs @@ -670,7 +670,7 @@ pub mod module { // Initialize signal handlers for the child's main thread. // When forked from a worker thread, the OnceCell is empty. vm.signal_handlers - .get_or_init(crate::signal::new_signal_handlers); + .get_or_init(crate::signal::SignalHandlers::default); // Phase 4: Run Python-level at-fork callbacks. let after_forkers_child: Vec = vm.state.after_forkers_child.lock().clone(); diff --git a/crates/vm/src/vm/mod.rs b/crates/vm/src/vm/mod.rs index 0820ae2d8..699c751fc 100644 --- a/crates/vm/src/vm/mod.rs +++ b/crates/vm/src/vm/mod.rs @@ -36,7 +36,8 @@ use crate::{ import, protocol::PyIterIter, scope::Scope, - signal, stdlib, + signal::{self, SignalHandlers}, + stdlib, warn::WarningsState, }; use alloc::{borrow::Cow, collections::BTreeMap}; @@ -82,7 +83,7 @@ pub struct VirtualMachine { pub trace_func: RefCell, pub use_tracing: Cell, pub recursion_limit: Cell, - pub(crate) signal_handlers: OnceCell; signal::NSIG]>>>, + pub(crate) signal_handlers: OnceCell, pub(crate) signal_rx: Option, pub repr_guards: RefCell>, pub state: PyRc, @@ -723,7 +724,7 @@ impl VirtualMachine { let importlib = ctx.none(); let profile_func = RefCell::new(ctx.none()); let trace_func = RefCell::new(ctx.none()); - let signal_handlers = OnceCell::from(signal::new_signal_handlers()); + let signal_handlers = OnceCell::from(SignalHandlers::default()); let vm = Self { builtins, From 28579badbe3ba0ce006aa910eab79da4ddbf0a24 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 14 Jun 2026 14:08:58 +0900 Subject: [PATCH 083/339] Bump cranelift in the wasmtime group across 1 directory (#8090) Bumps the wasmtime group with 1 update in the / directory: [cranelift](https://github.com/bytecodealliance/wasmtime). Updates `cranelift` from 0.132.0 to 0.132.1 - [Release notes](https://github.com/bytecodealliance/wasmtime/releases) - [Changelog](https://github.com/bytecodealliance/wasmtime/blob/main/RELEASES.md) - [Commits](https://github.com/bytecodealliance/wasmtime/commits) --- updated-dependencies: - dependency-name: cranelift dependency-version: 0.132.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: wasmtime ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3fd14cb53..582d09c60 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -741,9 +741,9 @@ dependencies = [ [[package]] name = "cranelift" -version = "0.132.0" +version = "0.132.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2948a18918ec81f4701e0f94d6b1727ec2cf485f8e32d332eddc466886a279d" +checksum = "5a5c702984722ad27d12c532df8467890f922bf5b1932286906dd2bb6779982c" dependencies = [ "cranelift-codegen", "cranelift-frontend", @@ -853,9 +853,9 @@ dependencies = [ [[package]] name = "cranelift-frontend" -version = "0.132.0" +version = "0.132.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "064d2d3533d9608f1cf44c8899cf2f7f33feb70300b0fb83e687b0d9e7b91147" +checksum = "8a0f17e48d15e29552e2f264d302c31a661a830196d879bbdaf4d7b2bf2f7011" dependencies = [ "cranelift-codegen", "log", From 01098494b357ffbf84dfa2f97b46c95fd32b98e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 14 Jun 2026 14:09:01 +0900 Subject: [PATCH 084/339] Bump uuid from 1.23.2 to 1.23.3 (#8091) Bumps [uuid](https://github.com/uuid-rs/uuid) from 1.23.2 to 1.23.3. - [Release notes](https://github.com/uuid-rs/uuid/releases) - [Commits](https://github.com/uuid-rs/uuid/compare/v1.23.2...v1.23.3) --- updated-dependencies: - dependency-name: uuid dependency-version: 1.23.3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 582d09c60..1ea73faaa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4372,7 +4372,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ "fastrand", - "getrandom 0.4.2", + "getrandom 0.3.4", "once_cell", "rustix", "windows-sys 0.60.2", @@ -4726,9 +4726,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.23.2" +version = "1.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d258b83ceec21034727ecee8c382cfa6c3e133699b0742c64571814fb420c9f7" +checksum = "144d6b123cef80b301b8f72a9e2ca4370ddec21950d0a103dd22c437006d2db7" dependencies = [ "atomic", "getrandom 0.4.2", From fd8794270f7177e850820db534434e41c42dd916 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 14 Jun 2026 14:09:05 +0900 Subject: [PATCH 085/339] Bump which from 8.0.2 to 8.0.3 (#8092) Bumps [which](https://github.com/harryfei/which-rs) from 8.0.2 to 8.0.3. - [Release notes](https://github.com/harryfei/which-rs/releases) - [Changelog](https://github.com/harryfei/which-rs/blob/master/CHANGELOG.md) - [Commits](https://github.com/harryfei/which-rs/compare/8.0.2...8.0.3) --- updated-dependencies: - dependency-name: which dependency-version: 8.0.3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1ea73faaa..2bb99d0fd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4923,9 +4923,9 @@ dependencies = [ [[package]] name = "which" -version = "8.0.2" +version = "8.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81995fafaaaf6ae47a7d0cc83c67caf92aeb7e5331650ae6ff856f7c0c60c459" +checksum = "c789537cf2f7f55be8e6192f92e464174ee55f91af622777f7f1ceb0dbccd03e" dependencies = [ "libc", ] From ddd9e0ff944926b76820bad4c035969be308f348 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 14 Jun 2026 14:09:24 +0900 Subject: [PATCH 086/339] Bump log from 0.4.31 to 0.4.32 (#8093) Bumps [log](https://github.com/rust-lang/log) from 0.4.31 to 0.4.32. - [Release notes](https://github.com/rust-lang/log/releases) - [Changelog](https://github.com/rust-lang/log/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/log/compare/0.4.31...0.4.32) --- updated-dependencies: - dependency-name: log dependency-version: 0.4.32 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2bb99d0fd..852f5223e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2206,9 +2206,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.31" +version = "0.4.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "113b30b4cd05f7c06868fdb2854f66a7b9fece9a48425351cd532e810d74024f" +checksum = "953f07c43838f8e6f9758cab68bf5bed85465e7587ebe0b823f1bcd81978ad3a" [[package]] name = "lz4_flex" From 1b0d2f7f9d537cbab0d67bb49dcca3fce64e536e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 14 Jun 2026 14:09:40 +0900 Subject: [PATCH 087/339] Bump pyo3 from 0.28.3 to 0.29.0 (#8094) Bumps [pyo3](https://github.com/pyo3/pyo3) from 0.28.3 to 0.29.0. - [Release notes](https://github.com/pyo3/pyo3/releases) - [Changelog](https://github.com/PyO3/pyo3/blob/main/CHANGELOG.md) - [Commits](https://github.com/pyo3/pyo3/compare/v0.28.3...v0.29.0) --- updated-dependencies: - dependency-name: pyo3 dependency-version: 0.29.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 41 ++++++++++++++++++++--------------------- Cargo.toml | 2 +- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 852f5223e..7e3018049 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -100,7 +100,7 @@ version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -111,7 +111,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -1145,7 +1145,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -1237,7 +1237,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -1971,7 +1971,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "160f2eade097f30263b548aae5deb12ad349c909baa710fa24b92c9090b2e006" dependencies = [ "scopeguard", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -2957,9 +2957,9 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.28.3" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fd8e38a3b50ed1167fb981cd6fd60147e091784c427b8f7183a7ee32c31c12" +checksum = "cd274650b21d4bfc26a0a47587962c1edb425f69287324355cd040c3ea66071c" dependencies = [ "libc", "once_cell", @@ -2971,18 +2971,18 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.28.3" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e368e7ddfdeb98c9bca7f8383be1648fd84ab466bf2bc015e94008db6d35611e" +checksum = "c5e2a7d2f0d013342f295c048ad19237add5154a55b1c5a254c0ec93d4109078" dependencies = [ "target-lexicon", ] [[package]] name = "pyo3-ffi" -version = "0.28.3" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f29e10af80b1f7ccaf7f69eace800a03ecd13e883acfacc1e5d0988605f651e" +checksum = "ca85c467da1bbc8d866eea5deff9cf29ea5f7785054a17da36e65bda9c05845b" dependencies = [ "libc", "pyo3-build-config", @@ -2990,9 +2990,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.28.3" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df6e520eff47c45997d2fc7dd8214b25dd1310918bbb2642156ef66a67f29813" +checksum = "9ac53762fd065daa3194dd09337a38bd793a188100fd1a9304c4ab312d901771" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -3002,13 +3002,12 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.28.3" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cdc218d835738f81c2338f822078af45b4afdf8b2e33cbb5916f108b813acb" +checksum = "4ca3a1557399783172dc5bf39cfca835157732532cba56b71d2292161e53b362" dependencies = [ "heck", "proc-macro2", - "pyo3-build-config", "quote", "syn", ] @@ -3350,7 +3349,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -3426,7 +3425,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -4231,7 +4230,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52d1cfed4120b4d927bf7c0f86d2087a4a7d6027c906d9f9d525a80573b9be51" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -4375,7 +4374,7 @@ dependencies = [ "getrandom 0.3.4", "once_cell", "rustix", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -4968,7 +4967,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index baa17d48b..a340e3e3a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -278,7 +278,7 @@ pkcs8 = "0.11" proc-macro2 = "1.0.105" psm = "0.1" pymath = { version = "0.2.0", features = ["mul_add", "malachite-bigint", "complex"] } -pyo3 = "0.28" +pyo3 = "0.29" quote = "1.0.45" radium = "1.1.1" rand = "0.10" From 5c1803e019b1636b752ea89c03d26358868696e2 Mon Sep 17 00:00:00 2001 From: Joshua Megnauth <48846352+joshuamegnauth54@users.noreply.github.com> Date: Sun, 14 Jun 2026 04:47:42 -0400 Subject: [PATCH 088/339] Fix most of `unicodedata`; unmask multiple tests (#7947) --- Cargo.lock | 49 - Cargo.toml | 2 - Lib/test/test_str.py | 1 - Lib/test/test_unicodedata.py | 17 +- crates/stdlib/Cargo.toml | 5 +- crates/stdlib/build.rs | 611 +- crates/stdlib/src/unicodedata.rs | 455 +- crates/stdlib/unicode/README.md | 7 + .../unicode/latest/DerivedNumericValues.txt | 2734 ++ .../latest/NormalizationCorrections.txt | 53 + crates/stdlib/unicode/latest/UnicodeData.txt | 40575 ++++++++++++++++ .../unicode/ucd32/DerivedBidiClass-3.2.0.txt | 1129 + .../ucd32/DerivedBinaryProperties-3.2.0.txt | 181 + .../ucd32/DerivedCombiningClass-3.2.0.txt | 1484 + .../ucd32/DerivedEastAsianWidth-3.2.0.txt | 1275 + .../ucd32/DerivedGeneralCategory-3.2.0.txt | 2303 + .../ucd32/DerivedNumericType-3.2.0.txt | 88 + .../ucd32/DerivedNumericValues-3.2.0.txt | 883 + extra_tests/snippets/builtin_str_unicode.py | 12 +- 19 files changed, 51656 insertions(+), 208 deletions(-) create mode 100644 crates/stdlib/unicode/README.md create mode 100644 crates/stdlib/unicode/latest/DerivedNumericValues.txt create mode 100644 crates/stdlib/unicode/latest/NormalizationCorrections.txt create mode 100644 crates/stdlib/unicode/latest/UnicodeData.txt create mode 100644 crates/stdlib/unicode/ucd32/DerivedBidiClass-3.2.0.txt create mode 100644 crates/stdlib/unicode/ucd32/DerivedBinaryProperties-3.2.0.txt create mode 100644 crates/stdlib/unicode/ucd32/DerivedCombiningClass-3.2.0.txt create mode 100644 crates/stdlib/unicode/ucd32/DerivedEastAsianWidth-3.2.0.txt create mode 100644 crates/stdlib/unicode/ucd32/DerivedGeneralCategory-3.2.0.txt create mode 100644 crates/stdlib/unicode/ucd32/DerivedNumericType-3.2.0.txt create mode 100644 crates/stdlib/unicode/ucd32/DerivedNumericValues-3.2.0.txt diff --git a/Cargo.lock b/Cargo.lock index 7e3018049..93e167358 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3813,8 +3813,6 @@ dependencies = [ "system-configuration", "tcl-sys", "tk-sys", - "ucd", - "unic-ucd-age", "unicode_names2 2.0.0", "uuid", "webpki-roots", @@ -4577,53 +4575,6 @@ version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40ce102ab67701b8526c123c1bab5cbe42d7040ccfd0f64af1a385808d2f43de" -[[package]] -name = "ucd" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe4fa6e588762366f1eb4991ce59ad1b93651d0b769dfb4e4d1c5c4b943d1159" - -[[package]] -name = "unic-char-property" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" -dependencies = [ - "unic-char-range", -] - -[[package]] -name = "unic-char-range" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc" - -[[package]] -name = "unic-common" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" - -[[package]] -name = "unic-ucd-age" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8cfdfe71af46b871dc6af2c24fcd360e2f3392ee4c5111877f2947f311671c" -dependencies = [ - "unic-char-property", - "unic-char-range", - "unic-ucd-version", -] - -[[package]] -name = "unic-ucd-version" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" -dependencies = [ - "unic-common", -] - [[package]] name = "unicode-ident" version = "1.0.24" diff --git a/Cargo.toml b/Cargo.toml index a340e3e3a..e1f76408e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -318,8 +318,6 @@ icu_locale = "2" icu_properties = "2" icu_normalizer = "2" uuid = "1.23.2" -ucd = "0.1.1" -unic-ucd-age = "0.9.0" unicode_names2 = "2.0.0" widestring = "1.2.0" windows-sys = "0.61.2" diff --git a/Lib/test/test_str.py b/Lib/test/test_str.py index baef29428..513556428 100644 --- a/Lib/test/test_str.py +++ b/Lib/test/test_str.py @@ -853,7 +853,6 @@ class StrTest(string_tests.StringLikeTest, self.assertTrue('\U0001F46F'.isprintable()) self.assertFalse('\U000E0020'.isprintable()) - @unittest.expectedFailure # TODO: RUSTPYTHON @support.requires_resource('cpu') def test_isprintable_invariant(self): for codepoint in range(sys.maxunicode + 1): diff --git a/Lib/test/test_unicodedata.py b/Lib/test/test_unicodedata.py index 899442c0e..40f8e7a10 100644 --- a/Lib/test/test_unicodedata.py +++ b/Lib/test/test_unicodedata.py @@ -118,7 +118,6 @@ class UnicodeFunctionsTest(unittest.TestCase): result = h.hexdigest() self.assertEqual(result, self.expectedchecksum) - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: None != 'EGYPTIAN HIEROGLYPH-13460' def test_name(self): name = self.db.name self.assertRaises(ValueError, name, '\0') @@ -207,7 +206,6 @@ class UnicodeFunctionsTest(unittest.TestCase): ]: self.assertRaises(KeyError, self.db.lookup, nonexistent) - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: None != 9 def test_digit(self): self.assertEqual(self.db.digit('A', None), None) self.assertEqual(self.db.digit('9'), 9) @@ -227,7 +225,7 @@ class UnicodeFunctionsTest(unittest.TestCase): self.assertRaises(TypeError, self.db.digit, 'xx') self.assertRaises(ValueError, self.db.digit, 'x') - @unittest.expectedFailure # TODO: RUSTPYTHON + @unittest.skip # TODO: RUSTPYTHON; - None != 1e+20 (for 3.2.0; passes on latest) def test_numeric(self): self.assertEqual(self.db.numeric('A',None), None) self.assertEqual(self.db.numeric('9'), 9) @@ -260,7 +258,6 @@ class UnicodeFunctionsTest(unittest.TestCase): self.assertRaises(TypeError, self.db.numeric, 'xx') self.assertRaises(ValueError, self.db.numeric, 'x') - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: None != 2 def test_decimal(self): self.assertEqual(self.db.decimal('A',None), None) self.assertEqual(self.db.decimal('9'), 9) @@ -285,7 +282,6 @@ class UnicodeFunctionsTest(unittest.TestCase): self.assertRaises(TypeError, self.db.decimal, 'xx') self.assertRaises(ValueError, self.db.decimal, 'x') - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: 'Cn' != 'Mn' def test_category(self): self.assertEqual(self.db.category('\uFFFE'), 'Cn') self.assertEqual(self.db.category('a'), 'Ll') @@ -310,7 +306,7 @@ class UnicodeFunctionsTest(unittest.TestCase): self.assertRaises(TypeError, self.db.category) self.assertRaises(TypeError, self.db.category, 'xx') - @unittest.expectedFailure # TODO: RUSTPYTHON; - L + @unittest.expectedFailure # TODO: RUSTPYTHON; - 'BN' != '' def test_bidirectional(self): self.assertEqual(self.db.bidirectional('\uFFFE'), '') self.assertEqual(self.db.bidirectional(' '), 'WS') @@ -365,7 +361,6 @@ class UnicodeFunctionsTest(unittest.TestCase): self.assertRaises(TypeError, self.db.decomposition) self.assertRaises(TypeError, self.db.decomposition, 'xx') - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: 1 != 0 def test_mirrored(self): self.assertEqual(self.db.mirrored('\uFFFE'), 0) self.assertEqual(self.db.mirrored('a'), 0) @@ -385,7 +380,6 @@ class UnicodeFunctionsTest(unittest.TestCase): self.assertRaises(TypeError, self.db.mirrored) self.assertRaises(TypeError, self.db.mirrored, 'xx') - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: 0 != 220 def test_combining(self): self.assertEqual(self.db.combining('\uFFFE'), 0) self.assertEqual(self.db.combining('a'), 0) @@ -605,7 +599,6 @@ class UnicodeFunctionsTest(unittest.TestCase): self.assertEqual(self.db.normalize('NFC', u11a7_str_a), u11a7_str_b) self.assertEqual(self.db.normalize('NFC', u11c3_str_a), u11c3_str_b) - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: 'W' != 'N' def test_east_asian_width(self): eaw = self.db.east_asian_width self.assertRaises(TypeError, eaw, b'a') @@ -646,7 +639,7 @@ class UnicodeFunctionsTest(unittest.TestCase): self.assertEqual(eaw('\u2630'), 'N' if self.old else 'W') self.assertEqual(eaw('\U0001FAE9'), 'N' if self.old else 'W') - @unittest.expectedFailure # TODO: RUSTPYTHON; + W + @unittest.skip # TODO: RUSTPYTHON; AssertionError: 'N' != 'W' (passed on latest, fails on 3.2) def test_east_asian_width_unassigned(self): eaw = self.db.east_asian_width # unassigned @@ -685,7 +678,7 @@ class Unicode_3_2_0_FunctionsTest(UnicodeFunctionsTest): def test_combining(self): return super().test_combining() - @unittest.expectedSuccess # TODO: RUSTPYTHON + @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: 'LATIN SMALL LETTER D WITH CURL' != None def test_name(self): return super().test_name() @@ -753,7 +746,6 @@ class UnicodeMiscTest(unittest.TestCase): def test_bug_1704793(self): self.assertEqual(self.db.lookup("GOTHIC LETTER FAIHU"), '\U00010346') - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: False is not true def test_ucd_510(self): # In UCD 5.1.0, a mirrored property changed wrt. UCD 3.2.0 self.assertTrue(unicodedata.mirrored("\u0f3a")) @@ -805,7 +797,6 @@ class NormalizationTest(unittest.TestCase): data = [int(x, 16) for x in data.split(" ")] return "".join([chr(x) for x in data]) - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: False is not true : 13055 @requires_resource('network') @requires_resource('cpu') def test_normalization(self): diff --git a/crates/stdlib/Cargo.toml b/crates/stdlib/Cargo.toml index 61ecf413a..a24811c4a 100644 --- a/crates/stdlib/Cargo.toml +++ b/crates/stdlib/Cargo.toml @@ -81,8 +81,6 @@ unicode_names2 = { workspace = true } # update version all at the same time icu_properties = { workspace = true } icu_normalizer = { workspace = true } -unic-ucd-age = { workspace = true } -ucd = { workspace = true } # compression adler32 = { workspace = true } @@ -143,6 +141,9 @@ system-configuration = { workspace = true } insta = { workspace = true } rustpython-pylib = { workspace = true, features = [ "freeze-stdlib" ] } +[build-dependencies] +icu_normalizer = { workspace = true } +icu_properties = { workspace = true } [lints] workspace = true diff --git a/crates/stdlib/build.rs b/crates/stdlib/build.rs index 5a06d24a2..4cf7b21d4 100644 --- a/crates/stdlib/build.rs +++ b/crates/stdlib/build.rs @@ -3,7 +3,604 @@ reason = "build scripts cannot use rustpython-host_env" )] -// spell-checker:ignore ossl osslconf +// spell-checker:ignore decomp DECOMP ossl osslconf + +extern crate alloc; + +use core::num::NonZeroUsize; + +use alloc::collections::{BTreeMap, BTreeSet}; + +use std::{ + env, + fs::{self, File}, + io::{self, BufRead, BufReader, BufWriter, Write}, + path::{Path, PathBuf}, + thread, +}; + +use icu_properties::props::{EnumeratedProperty, GeneralCategory, NumericType}; + +fn generate_unicode_3_2() { + let path = PathBuf::from(env::var("OUT_DIR").unwrap()) + .join("generated") + .join("unicode_3_2.rs"); + fs::create_dir_all(path.parent().unwrap()).unwrap(); + let mut writer = BufWriter::new(File::create(&path).unwrap()); + + let base = Path::new(env!("CARGO_MANIFEST_DIR")) + .join("unicode") + .join("ucd32"); + + write_derived( + &base, + "DerivedGeneralCategory-3.2.0.txt", + "GENERAL_CATEGORY", + "(u32, u32, GeneralCategory)", + NonZeroUsize::new(1).unwrap(), + &mut writer, + |start, end, id, _| { + let id = parse_general(id); + if id != GeneralCategory::Unassigned { + Some((start, end, id)) + } else { + None + } + }, + |writer, mut values| { + values.sort_unstable_by_key(|(start, _, _)| *start); + write!(writer, "[").unwrap(); + for (start, end, id) in values { + write!(writer, "({start}, {end}, GeneralCategory::{id:?}),").unwrap(); + } + write!(writer, "];").unwrap(); + }, + ); + + write_derived( + &base, + "DerivedEastAsianWidth-3.2.0.txt", + "EAST_ASIAN_WIDTH", + "(u32, u32, EastAsianWidth)", + NonZeroUsize::new(1).unwrap(), + &mut writer, + |start, end, id, _| { + let id = parse_eaw(id); + if id != "EastAsianWidth::Neutral" { + Some((start, end, id)) + } else { + None + } + }, + |writer, mut values| { + values.sort_unstable_by_key(|(start, _, _)| *start); + write!(writer, "[").unwrap(); + for (start, end, id) in values { + write!(writer, "({start}, {end}, {id}),").unwrap(); + } + write!(writer, "];").unwrap(); + }, + ); + + write_derived( + &base, + "DerivedBidiClass-3.2.0.txt", + "BIDI_CLASS", + "(u32, u32, BidiClass)", + NonZeroUsize::new(1).unwrap(), + &mut writer, + |start, end, id, _| { + let id = parse_bidi(id); + if id != "BidiClass::LeftToRight" { + Some((start, end, id)) + } else { + None + } + }, + |writer, mut values| { + values.sort_unstable_by_key(|(start, _, _)| *start); + write!(writer, "[").unwrap(); + for (start, end, id) in values { + write!(writer, "({start}, {end}, {id}),").unwrap(); + } + write!(writer, "];").unwrap(); + }, + ); + + write_derived( + &base, + "DerivedBinaryProperties-3.2.0.txt", + "BIDI_MIRRORED", + "(u32, u32)", + NonZeroUsize::new(1).unwrap(), + &mut writer, + |start, end, id, _| { + assert_eq!( + "Bidi_Mirrored", + id.trim(), + "DerivedBinaryProperties-3.2.0 only has Bidi_Mirrored" + ); + Some((start, end)) + }, + |writer, mut values| { + values.sort_unstable_by_key(|(start, _)| *start); + writeln!(writer, "{values:?};").unwrap(); + }, + ); + + write_derived( + &base, + "DerivedCombiningClass-3.2.0.txt", + "COMBINING_CLASS", + "(u32, u32, CanonicalCombiningClass)", + NonZeroUsize::new(1).unwrap(), + &mut writer, + |start, end, id, _| { + let id: u8 = id.parse().unwrap(); + if id == 0 { + return None; + } + Some((start, end, id)) + }, + |writer, mut values| { + values.sort_unstable_by_key(|(start, _, _)| *start); + write!(writer, "[").unwrap(); + for (start, end, id) in values { + write!( + writer, + "({start}, {end}, CanonicalCombiningClass::from_icu4c_value({id}))," + ) + .unwrap(); + } + writeln!(writer, "];").unwrap(); + }, + ); +} + +fn generate_numeric_type() { + let path = PathBuf::from(env::var("OUT_DIR").unwrap()) + .join("generated") + .join("unicode_num_type.rs"); + fs::create_dir_all(path.parent().unwrap()).unwrap(); + let mut writer = BufWriter::new(File::create(&path).unwrap()); + + let base = Path::new(env!("CARGO_MANIFEST_DIR")) + .join("unicode") + .join("ucd32"); + + write_derived( + &base, + "DerivedNumericType-3.2.0.txt", + "NUMERIC_TYPE_DIFF", + "(u32, u32, NumericType)", + NonZeroUsize::new(1).unwrap(), + &mut writer, + |start, end, id, _| { + let id = parse_numeric_type_str(id); + let differs = (start..=end).any(|c| match char::from_u32(c) { + Some(c) => { + let modern = parse_numeric_type_val(NumericType::for_char(c)); + modern != id + } + None => true, + }); + + if differs { + Some((start, end, id)) + } else { + None + } + }, + |writer, mut values| { + values.sort_unstable_by_key(|(start, _, _)| *start); + write!(writer, "[").unwrap(); + for (start, end, id) in values { + write!(writer, "({start}, {end}, {id}),").unwrap(); + } + writeln!(writer, "];").unwrap(); + }, + ); +} + +fn generate_numeric_value() { + let path = PathBuf::from(env::var("OUT_DIR").unwrap()) + .join("generated") + .join("unicode_numeric_value.rs"); + fs::create_dir_all(path.parent().unwrap()).unwrap(); + let mut writer = BufWriter::new(File::create(&path).unwrap()); + + // Ideally, this would store the diffs between the two tables. However, we need 3.2.0 + // membership as well as different chars. The final tables are both smaller than storing the + // full 3.2.0 value table. + let ucd32 = Path::new(env!("CARGO_MANIFEST_DIR")) + .join("unicode") + .join("ucd32"); + let mut ucd32_diffs = BTreeMap::new(); + let mut ucd32_member = BTreeSet::new(); + let numeric_32 = + BufReader::new(File::open(ucd32.join("DerivedNumericValues-3.2.0.txt")).unwrap()); + parse_unicode_3_2( + numeric_32, + NonZeroUsize::new(1).unwrap(), + &mut io::empty(), + |start, end, value, _| { + let value: f64 = value + .parse() + .expect("Unicode data contains valid properties"); + ucd32_diffs.insert((start, end), value); + ucd32_member.insert((start, end)); + Option::<()>::None + }, + |_writer, _values| {}, + ); + + let ucd_latest = Path::new(env!("CARGO_MANIFEST_DIR")) + .join("unicode") + .join("latest"); + + write_derived( + &ucd_latest, + "DerivedNumericValues.txt", + "NUMERIC_VALUES", + "(u32, u32, f64)", + NonZeroUsize::new(1).unwrap(), + &mut writer, + |start, end, value, _| { + let value: f64 = value + .parse() + .expect("Unicode data contains valid properties"); + + if ucd32_diffs + .get(&(start, end)) + .is_some_and(|old_v| *old_v == value) + { + ucd32_diffs.remove(&(start, end)); + } + + Some((start, end, value)) + }, + |writer, mut values| { + values.sort_unstable_by_key(|(ch, _, _)| *ch); + writeln!(writer, "{values:?};").unwrap(); + }, + ); + + // TODO: More flexible parser + writeln!( + writer, + "static NUMERIC_VALUES_DIFF: &[(u32, u32, f64)] = &[" + ) + .unwrap(); + for ((start, end), value) in ucd32_diffs { + write!(writer, "({start}, {end}, {value:?}),").unwrap(); + } + writeln!(writer, "];").unwrap(); + + // Compress membership table + let mut iter = ucd32_member.iter(); + let &(mut start_prev, mut end_prev) = iter.next().unwrap(); + let mut membership = Vec::new(); + + for &(start, end) in iter { + if start <= end_prev + 1 { + end_prev = end_prev.max(end); + } else { + membership.push((start_prev, end_prev)); + start_prev = start; + end_prev = end; + } + } + membership.push((start_prev, end_prev)); + membership.sort_unstable_by_key(|&(start, _)| start); + + writeln!(writer, "static NUMERIC_VAL_EXISTS_32: &[(u32, u32)] = &").unwrap(); + write!(writer, "{membership:?};").unwrap(); +} + +fn generate_unicode_latest() { + let path = PathBuf::from(env::var("OUT_DIR").unwrap()) + .join("generated") + .join("unicode_latest.rs"); + fs::create_dir_all(path.parent().unwrap()).unwrap(); + let mut writer = BufWriter::new(File::create(&path).unwrap()); + + let base = Path::new(env!("CARGO_MANIFEST_DIR")) + .join("unicode") + .join("latest"); + + // NOTE: + // This ONLY parses compatibility decomposition because Python exposes the tags. The tags are + // the "", "", et cetera bits before the decomposition. Thus, we can save space + // by using icu4x's CanonicalDecomposer for non-compatibility decomposition. + let mut decomp_ranges = Vec::new(); + write_derived( + &base, + "UnicodeData.txt", + "DECOMP_COMPAT", + "(u32, DecompositionType, usize)", + NonZeroUsize::new(5).unwrap(), + &mut writer, + |start, _end, value, _| { + // We're building a sparse array. Most characters don't decompose, so we don't + // need to literally store a row for each char. + if value.is_empty() { + return None; + } + + let (dtype, decomp) = value.split_once('>').map(|(dtype, decomp)| { + let dtype = dtype.strip_prefix('<').unwrap_or_else(|| { + panic!("Compatibility decomp; expected \n\tgot: {value}") + }); + ( + parse_decomp_type(dtype), + decomp + .split_whitespace() + .map(|s| u32::from_str_radix(s, 16).unwrap()), + ) + })?; + + decomp_ranges.extend(decomp); + let end = decomp_ranges.len(); + + Some((start, dtype, end)) + }, + |writer, values| { + // UnicodeData.txt should already be sorted + write!(writer, "[").unwrap(); + for (start, dtype, end) in values { + write!(writer, "({start}, DecompositionType::{dtype:?}, {end}),").unwrap(); + } + writeln!(writer, "];").unwrap(); + }, + ); + + writeln!(writer, "static DECOMP_RANGE: &[u32] = &{decomp_ranges:?};").unwrap(); + + // Normalization corrections is super small - only a handful chars at the time of writing. + write_derived( + &base, + "NormalizationCorrections.txt", + "DECOMP_UPDATES", + "(u32, u32)", + NonZeroUsize::new(1).unwrap(), + &mut writer, + |start, _end, value, line| { + let original = u32::from_str_radix(value.trim(), 16).unwrap_or_else(|e| { + panic!("field 2 of decomp corrections should be a char in hex: {value} {e}") + }); + let version = line + .rsplit(';') + .next() + .unwrap_or_else(|| { + panic!("field 4 of decomp corrections should be a UCD version: {line}") + }) + .split_once('#') + .unwrap() + .0 + .trim(); + + // `version` = when the char was updated. Therefore, we use the incorrect chars past + // 3.2.0 but skip the chars fixed in 3.2.0 because they'll already be right. + if version != "3.2.0" { + Some((start, original)) + } else { + None + } + }, + |writer, mut values| { + values.sort_unstable_by_key(|(c, _)| *c); + write!(writer, "{values:?};").unwrap(); + }, + ); +} + +#[expect(clippy::too_many_arguments)] +fn write_derived( + base: &Path, + file_name: &str, + static_name: &str, + array_type: &str, + field: NonZeroUsize, + writer: &mut W, + parse: P, + write_vec: FW, +) where + W: Write, + P: FnMut(u32, u32, &str, &str) -> Option, + FW: FnMut(&mut W, Vec), +{ + let path = base.join(file_name); + let reader = BufReader::new(File::open(path).unwrap()); + writeln!(writer, "static {static_name}: &[{array_type}] = &").unwrap(); + parse_unicode_3_2(reader, field, writer, parse, write_vec); +} + +/// Parse Unicode 3.2.0 property files. +fn parse_unicode_3_2( + reader: impl BufRead, + field: NonZeroUsize, + writer: &mut W, + mut parse: P, + mut write_vec: FW, +) where + W: Write, + P: FnMut(u32, u32, &str, &str) -> Option, + FW: FnMut(&mut W, Vec), +{ + let mut parsed = Vec::new(); + + for line in reader.lines().map(Result::unwrap) { + let line = line.trim(); + if line.is_empty() || line.starts_with('#') { + continue; + } + + let mut fields = line.split(';'); + let range = fields.next().expect("Unicode data is missing a char range"); + let id = fields + .nth(field.get().saturating_sub(1)) + .expect("Unicode data is missing a property"); + let (start, end) = match range.split_once("..") { + Some((left, right)) => { + let start = u32::from_str_radix(left.trim(), 16).unwrap(); + let end = u32::from_str_radix(right.trim(), 16).unwrap(); + (start, end) + } + None => { + let start = u32::from_str_radix(range.trim(), 16).unwrap(); + (start, start) + } + }; + + let id = id.split_once('#').map_or(id, |(left, _)| left).trim(); + if let Some(val) = parse(start, end, id, line) { + parsed.push(val); + } + } + write_vec(writer, parsed); +} + +fn parse_general(id: &str) -> GeneralCategory { + match id.trim() { + "Cn" => GeneralCategory::Unassigned, + "Lu" => GeneralCategory::UppercaseLetter, + "Ll" => GeneralCategory::LowercaseLetter, + "Lt" => GeneralCategory::TitlecaseLetter, + "Lm" => GeneralCategory::ModifierLetter, + "Lo" => GeneralCategory::OtherLetter, + "Mn" => GeneralCategory::NonspacingMark, + "Mc" => GeneralCategory::SpacingMark, + "Me" => GeneralCategory::EnclosingMark, + "Nd" => GeneralCategory::DecimalNumber, + "Nl" => GeneralCategory::LetterNumber, + "No" => GeneralCategory::OtherNumber, + "Zs" => GeneralCategory::SpaceSeparator, + "Zl" => GeneralCategory::LineSeparator, + "Zp" => GeneralCategory::ParagraphSeparator, + "Cc" => GeneralCategory::Control, + "Cf" => GeneralCategory::Format, + "Co" => GeneralCategory::PrivateUse, + "Cs" => GeneralCategory::Surrogate, + "Pd" => GeneralCategory::DashPunctuation, + "Ps" => GeneralCategory::OpenPunctuation, + "Pe" => GeneralCategory::ClosePunctuation, + "Pc" => GeneralCategory::ConnectorPunctuation, + "Pi" => GeneralCategory::InitialPunctuation, + "Pf" => GeneralCategory::FinalPunctuation, + "Po" => GeneralCategory::OtherPunctuation, + "Sm" => GeneralCategory::MathSymbol, + "Sc" => GeneralCategory::CurrencySymbol, + "Sk" => GeneralCategory::ModifierSymbol, + "So" => GeneralCategory::OtherSymbol, + invalid => unreachable!("Unicode data contains valid properties: {invalid}"), + } +} + +fn parse_eaw(id: &str) -> &'static str { + match id.trim() { + "N" => "EastAsianWidth::Neutral", + "A" => "EastAsianWidth::Ambiguous", + "H" => "EastAsianWidth::Halfwidth", + "F" => "EastAsianWidth::Fullwidth", + "Na" => "EastAsianWidth::Narrow", + "W" => "EastAsianWidth::Wide", + invalid => unreachable!("Unicode data contains valid properties: {invalid}"), + } +} + +fn parse_bidi(id: &str) -> &'static str { + match id.trim() { + "L" => "BidiClass::LeftToRight", + "R" => "BidiClass::RightToLeft", + "EN" => "BidiClass::EuropeanNumber", + "ES" => "BidiClass::EuropeanSeparator", + "ET" => "BidiClass::EuropeanTerminator", + "AN" => "BidiClass::ArabicNumber", + "CS" => "BidiClass::CommonSeparator", + "B" => "BidiClass::ParagraphSeparator", + "S" => "BidiClass::SegmentSeparator", + "WS" => "BidiClass::WhiteSpace", + "ON" => "BidiClass::OtherNeutral", + "LRE" => "BidiClass::LeftToRightEmbedding", + "LRO" => "BidiClass::LeftToRightOverride", + "AL" => "BidiClass::ArabicLetter", + "RLE" => "BidiClass::RightToLeftEmbedding", + "RLO" => "BidiClass::RightToLeftOverride", + "PDF" => "BidiClass::PopDirectionalFormat", + "NSM" => "BidiClass::NonspacingMark", + "BN" => "BidiClass::BoundaryNeutral", + "FSI" => "BidiClass::FirstStrongIsolate", + "LRI" => "BidiClass::LeftToRightIsolate", + "RLI" => "BidiClass::RightToLeftIsolate", + "PDI" => "BidiClass::PopDirectionalIsolate", + invalid => unreachable!("Unicode data contains valid properties: {invalid}"), + } +} + +fn parse_numeric_type_val(val: NumericType) -> &'static str { + match val { + NumericType::None => "none", + NumericType::Decimal => "decimal", + NumericType::Digit => "digit", + NumericType::Numeric => "numeric", + _ => unreachable!("Unicode data contains valid properties"), + } +} + +fn parse_numeric_type_str(id: &str) -> &'static str { + match id { + "none" => "NumericType::None", + "decimal" => "NumericType::Decimal", + "digit" => "NumericType::Digit", + "numeric" => "NumericType::Numeric", + invalid => unreachable!("Unicode data contains valid properties: {invalid}"), + } +} + +#[derive(Debug, Default)] +enum DecompositionType { + #[default] + Canonical, + Compat, + Circle, + Final, + Font, + Fraction, + Initial, + Isolated, + Medial, + Narrow, + Nobreak, + Small, + Square, + Sub, + Super, + Vertical, + Wide, +} + +fn parse_decomp_type(id: &str) -> DecompositionType { + match id { + "canonical" => DecompositionType::Canonical, + "compat" => DecompositionType::Compat, + "circle" => DecompositionType::Circle, + "final" => DecompositionType::Final, + "font" => DecompositionType::Font, + "fraction" => DecompositionType::Fraction, + "initial" => DecompositionType::Initial, + "isolated" => DecompositionType::Isolated, + "medial" => DecompositionType::Medial, + "narrow" => DecompositionType::Narrow, + "noBreak" => DecompositionType::Nobreak, + "small" => DecompositionType::Small, + "square" => DecompositionType::Square, + "sub" => DecompositionType::Sub, + "super" => DecompositionType::Super, + "vertical" => DecompositionType::Vertical, + "wide" => DecompositionType::Wide, + invalid => unreachable!("Unicode data contains valid properties: {invalid}"), + } +} fn main() { println!(r#"cargo::rustc-check-cfg=cfg(osslconf, values("OPENSSL_NO_COMP"))"#); @@ -58,4 +655,16 @@ fn main() { println!("cargo::rustc-cfg=openssl_vendored") } } + + println!("cargo:rerun-if-changed=unicode/ucd32"); + println!("cargo:rerun-if-changed=unicode/latest"); + + let t_32 = thread::spawn(generate_unicode_3_2); + let t_numeric_type = thread::spawn(generate_numeric_type); + let t_numeric_value = thread::spawn(generate_numeric_value); + let t_latest = thread::spawn(generate_unicode_latest); + t_32.join().unwrap(); + t_numeric_type.join().unwrap(); + t_numeric_value.join().unwrap(); + t_latest.join().unwrap(); } diff --git a/crates/stdlib/src/unicodedata.rs b/crates/stdlib/src/unicodedata.rs index 50731e606..e848daade 100644 --- a/crates/stdlib/src/unicodedata.rs +++ b/crates/stdlib/src/unicodedata.rs @@ -2,14 +2,98 @@ See also: https://docs.python.org/3/library/unicodedata.html */ -// spell-checker:ignore nfkc unistr unidata +// spell-checker:ignore codep decomp DECOMP nfkc unistr unidata + +use core::{ + cmp::Ordering, + fmt::{self, Display, Formatter}, + hint::cold_path, +}; pub(crate) use unicodedata::module_def; +use icu_properties::props::{ + BidiClass, CanonicalCombiningClass, EastAsianWidth, GeneralCategory, NumericType, +}; + use crate::vm::{ PyObject, PyResult, VirtualMachine, builtins::PyStr, convert::TryFromBorrowedObject, }; +include!(concat!(env!("OUT_DIR"), "/generated/unicode_3_2.rs")); +include!(concat!(env!("OUT_DIR"), "/generated/unicode_latest.rs")); +include!(concat!(env!("OUT_DIR"), "/generated/unicode_num_type.rs")); +include!(concat!( + env!("OUT_DIR"), + "/generated/unicode_numeric_value.rs" +)); + +#[derive(Clone, Copy, Debug, PartialEq)] +struct UnicodeVersion { + pub major: u8, + pub minor: u8, + pub micro: u8, +} + +impl Display for UnicodeVersion { + fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result { + write!(f, "{}.{}.{}", self.major, self.minor, self.micro) + } +} + +const UNICODE_VERSION: UnicodeVersion = UnicodeVersion { + major: char::UNICODE_VERSION.0, + minor: char::UNICODE_VERSION.1, + micro: char::UNICODE_VERSION.2, +}; + +#[derive(Clone, Copy)] +#[repr(u8)] +enum DecompositionType { + #[allow(unused)] + Canonical, + Compat, + Circle, + Final, + Font, + Fraction, + Initial, + Isolated, + Medial, + Narrow, + Nobreak, + Small, + Square, + Sub, + Super, + Vertical, + Wide, +} + +impl DecompositionType { + const fn type_tag(self) -> &'static str { + match self { + Self::Canonical => "canonical", + Self::Compat => "compat", + Self::Circle => "circle", + Self::Final => "final", + Self::Font => "font", + Self::Fraction => "fraction", + Self::Initial => "initial", + Self::Isolated => "isolated", + Self::Medial => "medial", + Self::Narrow => "narrow", + Self::Nobreak => "noBreak", + Self::Small => "small", + Self::Square => "square", + Self::Sub => "sub", + Self::Super => "super", + Self::Vertical => "vertical", + Self::Wide => "wide", + } + } +} + #[derive(Clone, Copy, Eq, PartialEq)] enum NormalizeForm { Nfc, @@ -18,6 +102,45 @@ enum NormalizeForm { Nfkd, } +fn lookup_property(table: &[(u32, u32, T)], ch: char) -> Option { + let ch = ch as u32; + table + .binary_search_by(|&(start, end, _)| { + if ch > end { + Ordering::Less + } else if ch < start { + Ordering::Greater + } else { + Ordering::Equal + } + }) + .ok() + .map(|i| table[i].2) +} + +fn lookup_numeric_val(ch: char, version: UnicodeVersion) -> Option { + if version.major > 3 { + lookup_property(NUMERIC_VALUES, ch) + } else { + cold_path(); + lookup_property(NUMERIC_VALUES_DIFF, ch).or_else(|| { + NUMERIC_VAL_EXISTS_32 + .binary_search_by(|&(start, end)| { + let ch = ch as u32; + if ch > end { + Ordering::Less + } else if ch < start { + Ordering::Greater + } else { + Ordering::Equal + } + }) + .ok() + .and_then(|_| lookup_property(NUMERIC_VALUES, ch)) + }) + } +} + impl<'a> TryFromBorrowedObject<'a> for NormalizeForm { fn try_from_borrowed_object(vm: &VirtualMachine, obj: &'a PyObject) -> PyResult { obj.try_value_with( @@ -35,25 +158,29 @@ impl<'a> TryFromBorrowedObject<'a> for NormalizeForm { #[pymodule] mod unicodedata { - use super::NormalizeForm::*; + use core::{cmp::Ordering, fmt::Write, hint::cold_path}; + + use super::{ + BIDI_CLASS, BIDI_MIRRORED, COMBINING_CLASS, DECOMP_COMPAT, DECOMP_RANGE, DECOMP_UPDATES, + EAST_ASIAN_WIDTH, GENERAL_CATEGORY, NUMERIC_TYPE_DIFF, NormalizeForm::*, UNICODE_VERSION, + UnicodeVersion, lookup_numeric_val, lookup_property, + }; use crate::vm::{ Py, PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine, builtins::{PyModule, PyStrRef}, function::OptionalArg, }; - use icu_normalizer::{ComposingNormalizerBorrowed, DecomposingNormalizerBorrowed}; - use icu_properties::{ - CodePointSetData, - props::{ - BidiClass, BidiMirrored, CanonicalCombiningClass, EastAsianWidth, EnumeratedProperty, - GeneralCategory, NamedEnumeratedProperty, - }, + use icu_normalizer::{ + ComposingNormalizerBorrowed, DecomposingNormalizerBorrowed, + properties::{CanonicalDecomposition, Decomposed}, + }; + use icu_properties::props::{ + BidiClass, BidiMirrored, BinaryProperty, CanonicalCombiningClass, EastAsianWidth, + EnumeratedProperty, GeneralCategory, NamedEnumeratedProperty, NumericType, }; use itertools::Itertools; use rustpython_common::wtf8::{CodePoint, Wtf8Buf}; - use ucd::{Codepoint, DecompositionType, Number, NumericType}; - use unic_ucd_age::{Age, UNICODE_VERSION, UnicodeVersion}; pub(crate) fn module_exec(vm: &VirtualMachine, module: &Py) -> PyResult<()> { __module_exec(vm, module); @@ -94,45 +221,39 @@ mod unicodedata { Self { unic_version } } - fn check_age(&self, c: CodePoint) -> bool { - c.to_char() - .is_none_or(|c| Age::of(c).is_some_and(|age| age.actual() <= self.unic_version)) - } - - fn extract_char( - &self, - character: PyStrRef, - vm: &VirtualMachine, - ) -> PyResult> { - let c = character + fn extract_char(&self, character: PyStrRef, vm: &VirtualMachine) -> PyResult { + character .as_wtf8() .code_points() .exactly_one() - .map_err(|_| vm.new_type_error("argument must be an unicode character, not str"))?; - - Ok(self.check_age(c).then_some(c)) + .map_err(|_| vm.new_type_error("argument must be an unicode character, not str")) } } #[pyclass(flags(DISALLOW_INSTANTIATION))] impl Ucd { #[pymethod] - fn category(&self, character: PyStrRef, vm: &VirtualMachine) -> PyResult { - Ok(self - .extract_char(character, vm)? - .map_or(GeneralCategory::Unassigned, |c| { - c.to_char() - .map_or(GeneralCategory::Surrogate, GeneralCategory::for_char) - }) + fn category(&self, character: PyStrRef, vm: &VirtualMachine) -> PyResult<&'static str> { + self.extract_char(character, vm).map(|c| { + let Some(c) = c.to_char() else { + return GeneralCategory::Surrogate.short_name(); + }; + if self.unic_version.major > 3 { + Some(GeneralCategory::for_char(c)) + } else { + cold_path(); + lookup_property(GENERAL_CATEGORY, c) + } + .unwrap_or(GeneralCategory::Unassigned) .short_name() - .to_owned()) + }) } + // TODO: Names needs to account for Unicode 3.2.0 and 16.0.0 #[pymethod] fn lookup(&self, name: PyStrRef, vm: &VirtualMachine) -> PyResult { if let Some(name_str) = name.to_str() && let Some(character) = unicode_names2::character(name_str) - && self.check_age(character.into()) { return Ok(character.to_string()); } @@ -143,6 +264,7 @@ mod unicodedata { )) } + // TODO: Names needs to account for Unicode 3.2.0 and 16.0.0 #[pymethod] fn name( &self, @@ -150,11 +272,10 @@ mod unicodedata { default: OptionalArg, vm: &VirtualMachine, ) -> PyResult { - let c = self.extract_char(character, vm)?; - - if let Some(c) = c - && self.check_age(c) - && let Some(name) = c.to_char().and_then(unicode_names2::name) + if let Some(name) = self + .extract_char(character, vm)? + .to_char() + .and_then(unicode_names2::name) { return Ok(vm.ctx.new_str(name.to_string()).into()); } @@ -167,28 +288,49 @@ mod unicodedata { character: PyStrRef, vm: &VirtualMachine, ) -> PyResult<&'static str> { - let bidi = match self.extract_char(character, vm)? { - Some(c) => c - .to_char() - .map_or(BidiClass::LeftToRight, BidiClass::for_char) - .short_name(), - None => "", - }; - Ok(bidi) + self.extract_char(character, vm).map(|c| { + c.to_char() + .and_then(|c| { + if self.unic_version.major > 3 { + Some(BidiClass::for_char(c)) + } else { + cold_path(); + lookup_property(BIDI_CLASS, c) + } + }) + .unwrap_or(BidiClass::LeftToRight) + .short_name() + }) } - /// NOTE: This function uses 9.0.0 database instead of 3.2.0 #[pymethod] fn east_asian_width( &self, character: PyStrRef, vm: &VirtualMachine, ) -> PyResult<&'static str> { - Ok(self - .extract_char(character, vm)? - .and_then(|c| c.to_char()) - .map_or(EastAsianWidth::Neutral, EastAsianWidth::for_char) - .short_name()) + self.extract_char(character, vm).map(|c| { + c.to_char() + .and_then(|c| { + if self.unic_version.major > 3 { + Some(EastAsianWidth::for_char(c)) + } else { + cold_path(); + // CPython overrides characters in the PUA for 3.2.0. + // Basic Multilingual Plane: + // https://en.wikipedia.org/wiki/Plane_(Unicode)#Basic_Multilingual_Plane + // https://en.wikipedia.org/wiki/Private_Use_Areas + // https://www.unicode.org/reports/tr11/tr11-10.html + // https://www.unicode.org/reports/tr11/ + // + // Currently, this implementation is incomplete because I can't figure + // out what CPython is doing. + lookup_property(EAST_ASIAN_WIDTH, c) + } + }) + .unwrap_or(EastAsianWidth::Neutral) + .short_name() + }) } #[pymethod] @@ -248,46 +390,109 @@ mod unicodedata { #[pymethod] fn mirrored(&self, character: PyStrRef, vm: &VirtualMachine) -> PyResult { - match self.extract_char(character, vm)? { - Some(c) => { - if let Some(ch) = c.to_char() { - // Check if the character is mirrored in bidirectional text using Unicode standard - let bidi_mirrored = CodePointSetData::new::(); - Ok(if bidi_mirrored.contains(ch) { 1 } else { 0 }) + self.extract_char(character, vm).map(|c| { + c.to_char().map_or(0, |c| { + (if self.unic_version.major > 3 { + BidiMirrored::for_char(c) } else { - Ok(0) - } - } - None => Ok(0), - } + cold_path(); + let c = c as u32; + BIDI_MIRRORED + .binary_search_by(|&(start, end)| { + if c > end { + Ordering::Less + } else if c < start { + Ordering::Greater + } else { + Ordering::Equal + } + }) + .is_ok() + }) as i32 + }) + }) } #[pymethod] fn combining(&self, character: PyStrRef, vm: &VirtualMachine) -> PyResult { - Ok(self - .extract_char(character, vm)? - .and_then(|c| c.to_char()) - .map_or(0, |ch| { - CanonicalCombiningClass::for_char(ch).to_icu4c_value() - })) + self.extract_char(character, vm).map(|c| { + c.to_char() + .and_then(|c| { + if self.unic_version.major > 3 { + Some(CanonicalCombiningClass::for_char(c)) + } else { + cold_path(); + lookup_property(COMBINING_CLASS, c) + } + }) + .unwrap_or(CanonicalCombiningClass::NotReordered) + .to_icu4c_value() + }) } #[pymethod] fn decomposition(&self, character: PyStrRef, vm: &VirtualMachine) -> PyResult { - let Some(ch) = self.extract_char(character, vm)?.and_then(|c| c.to_char()) else { + let Some(ch) = self.extract_char(character, vm).map(CodePoint::to_char)? else { return Ok(String::new()); }; - let chars = ch.decomposition_map().collect::>(); - // If decomposition maps to just the character itself, there's no decomposition - if chars.len() == 1 && chars[0] == ch { - return Ok(String::new()); + + // Decomposition is remarkable stable according to the normalization file, + // so the updates slice is very small - only about four char pairs. Linearly searching + // it is very fast. The file lists the original, incorrect decomp and the fixed char. + // For 3.2.0, we use the original decomp for compatibility while ignoring the update. + // + // Finally, we don't have to do anything for the latest UCD as it's already updated. + if self.unic_version.major == 3 + && let Some((_, original)) = DECOMP_UPDATES + .iter() + .find(|&&(codep, _original)| codep == ch as u32) + { + Ok(format!("{original:04X}")) + } else if let Ok(i) = + DECOMP_COMPAT.binary_search_by_key(&(ch as u32), |&(codep, _, _)| codep) + { + // Compatibility decomposition + // `icu4x` doesn't expose a non-recursive, compatibility decomposer so we + // have to do it manually for now. + let tag = DECOMP_COMPAT[i].1.type_tag(); + let end = DECOMP_COMPAT[i].2; + let start = i + .checked_sub(1) + .map(|i| DECOMP_COMPAT[i].2) + .unwrap_or_default(); + + let decomp = &DECOMP_RANGE[start..end]; + let cap = decomp.len() * 10 + decomp.len() + tag.len() + 1; + let mut out = String::with_capacity(cap); + + write!(out, "<{tag}>").unwrap(); + for ch in decomp { + write!(out, " {ch:04X}").unwrap(); + } + + Ok(out) + } else { + // Canonical decomposition + let decomposed = CanonicalDecomposition::new().decompose(ch); + match decomposed { + Decomposed::Default => Ok(String::new()), + Decomposed::Singleton(ch) => Ok(format!("{:04X}", ch as u32)), + Decomposed::Expansion(l, r) => Ok(format!("{:04X} {:04X}", l as u32, r as u32)), + } } - let hex_parts = chars.iter().map(|c| format!("{:04X}", *c as u32)).join(" "); - let tag = match ch.decomposition_type() { - Some(DecompositionType::Canonical) | None => return Ok(hex_parts), - Some(dt) => decomposition_type_tag(dt), + } + + fn numeric_type_matches(&self, ch: CodePoint, expected: &[NumericType]) -> Option { + let ch = ch.to_char()?; + + let actual = if self.unic_version.major > 3 { + NumericType::for_char(ch) + } else { + cold_path(); + lookup_property(NUMERIC_TYPE_DIFF, ch).unwrap_or_else(|| NumericType::for_char(ch)) }; - Ok(format!("<{tag}> {hex_parts}")) + + expected.contains(&actual).then_some(ch) } #[pymethod] @@ -296,18 +501,17 @@ mod unicodedata { character: PyStrRef, default: OptionalArg, vm: &VirtualMachine, - ) -> PyResult { - let ch = self.extract_char(character, vm)?.and_then(|c| c.to_char()); - if let Some(ch) = ch - && matches!( - ch.numeric_type(), - Some(NumericType::Decimal | NumericType::Digit) - ) - && let Some(Number::Integer(n)) = ch.numeric_value() - { - return Ok(vm.ctx.new_int(n).into()); - } - default.ok_or_else(|| vm.new_value_error("not a digit")) + ) -> PyResult> { + let ch = self.extract_char(character, vm)?; + let expected = [NumericType::Decimal, NumericType::Digit]; + self.numeric_type_matches(ch, &expected) + .and_then(|ch| { + let value = lookup_numeric_val(ch, UNICODE_VERSION)?; + (value.trunc() == value).then(|| vm.ctx.new_int(value as u64).into()) + }) + .or_else(|| default.present()) + .map(Option::Some) + .ok_or_else(|| vm.new_value_error("not a digit")) } #[pymethod] @@ -316,15 +520,17 @@ mod unicodedata { character: PyStrRef, default: OptionalArg, vm: &VirtualMachine, - ) -> PyResult { - let ch = self.extract_char(character, vm)?.and_then(|c| c.to_char()); - if let Some(ch) = ch - && ch.numeric_type() == Some(NumericType::Decimal) - && let Some(Number::Integer(n)) = ch.numeric_value() - { - return Ok(vm.ctx.new_int(n).into()); - } - default.ok_or_else(|| vm.new_value_error("not a decimal")) + ) -> PyResult> { + let ch = self.extract_char(character, vm)?; + let expected = [NumericType::Decimal]; + self.numeric_type_matches(ch, &expected) + .and_then(|ch| { + let value = lookup_numeric_val(ch, self.unic_version)?; + (value.trunc() == value).then(|| vm.ctx.new_int(value as u64).into()) + }) + .or_else(|| default.present()) + .map(Option::Some) + .ok_or_else(|| vm.new_value_error("not a decimal")) } #[pymethod] @@ -333,20 +539,17 @@ mod unicodedata { character: PyStrRef, default: OptionalArg, vm: &VirtualMachine, - ) -> PyResult { - let ch = self.extract_char(character, vm)?.and_then(|c| c.to_char()); - if let Some(ch) = ch { - match ch.numeric_value() { - Some(Number::Integer(n)) => { - return Ok(vm.ctx.new_float(n as f64).into()); - } - Some(Number::Rational(num, den)) => { - return Ok(vm.ctx.new_float(num as f64 / den as f64).into()); - } - None => {} - } - } - default.ok_or_else(|| vm.new_value_error("not a numeric character")) + ) -> PyResult> { + let ch = self.extract_char(character, vm)?; + let expected = &NumericType::ALL_VALUES[1..]; + self.numeric_type_matches(ch, expected) + .and_then(|ch| { + lookup_numeric_val(ch, self.unic_version) + .map(|value| vm.ctx.new_float(value).into()) + }) + .or_else(|| default.present()) + .map(Option::Some) + .ok_or_else(|| vm.new_value_error("not a numeric character")) } #[pygetset] @@ -355,28 +558,6 @@ mod unicodedata { } } - const fn decomposition_type_tag(dt: DecompositionType) -> &'static str { - match dt { - DecompositionType::Canonical => "canonical", - DecompositionType::Compat => "compat", - DecompositionType::Circle => "circle", - DecompositionType::Final => "final", - DecompositionType::Font => "font", - DecompositionType::Fraction => "fraction", - DecompositionType::Initial => "initial", - DecompositionType::Isolated => "isolated", - DecompositionType::Medial => "medial", - DecompositionType::Narrow => "narrow", - DecompositionType::Nobreak => "noBreak", - DecompositionType::Small => "small", - DecompositionType::Square => "square", - DecompositionType::Sub => "sub", - DecompositionType::Super => "super", - DecompositionType::Vertical => "vertical", - DecompositionType::Wide => "wide", - } - } - #[pyattr] fn ucd_3_2_0(vm: &VirtualMachine) -> PyRef { Ucd { diff --git a/crates/stdlib/unicode/README.md b/crates/stdlib/unicode/README.md new file mode 100644 index 000000000..894db3c4e --- /dev/null +++ b/crates/stdlib/unicode/README.md @@ -0,0 +1,7 @@ +# Unicode data + +The vendored data files come directly from the official [Unicode site](https://www.unicode.org/). + +The files in `latest` need to be periodically bumped to match `icu4x` and Rust. These files may be found at the [Unicode Character Database](https://www.unicode.org/ucd/). + +RustPython vendors [Unicode 3.2.0](https://www.unicode.org/reports/tr28/tr28-3.html) to match CPython. CPython uses 3.2.0 to ensure backwards compatibility with a few older modules. Unicode 3.2.0 was released in 2002 and does not need periodic refreshes. diff --git a/crates/stdlib/unicode/latest/DerivedNumericValues.txt b/crates/stdlib/unicode/latest/DerivedNumericValues.txt new file mode 100644 index 000000000..8613d3585 --- /dev/null +++ b/crates/stdlib/unicode/latest/DerivedNumericValues.txt @@ -0,0 +1,2734 @@ +# DerivedNumericValues-17.0.0.txt +# Date: 2025-06-30, 06:20:22 GMT +# © 2025 Unicode®, Inc. +# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. +# For terms of use and license, see https://www.unicode.org/terms_of_use.html +# +# Unicode Character Database +# For documentation, see https://www.unicode.org/reports/tr44/ + +# ================================================ + +# Derived Property: Numeric_Value +# Field 1: +# The values are based on field 8 of UnicodeData.txt, plus the fields +# kAccountingNumeric, kOtherNumeric, kPrimaryNumeric in the Unicode Han Database (Unihan). +# The derivations for these values are as follows. +# Numeric_Value = the first-listed value of kAccountingNumeric, kOtherNumeric, or kPrimaryNumeric, if they exist; otherwise +# Numeric_Value = the value of field 8, if it exists; otherwise +# Numeric_Value = NaN +# Field 2: +# This field is empty; it used to be a copy of the numeric type. +# +# Field 3: +# This field was added to this extracted data as of Unicode 5.1.0, +# expressing the same numeric value either as a whole integer +# where possible, or as a rational fraction such as "1/6". +# +# WARNING: Certain values, such as 0.16666667, are repeating fractions. +# Although they are only printed with a limited number of decimal places +# in this file, they should be expressed to the limits of the precision +# available when used. +# + +# ================================================ + +0F33 ; -0.5 ; ; -1/2 # No TIBETAN DIGIT HALF ZERO + +# Total code points: 1 + +# ================================================ + +0030 ; 0.0 ; ; 0 # Nd DIGIT ZERO +0660 ; 0.0 ; ; 0 # Nd ARABIC-INDIC DIGIT ZERO +06F0 ; 0.0 ; ; 0 # Nd EXTENDED ARABIC-INDIC DIGIT ZERO +07C0 ; 0.0 ; ; 0 # Nd NKO DIGIT ZERO +0966 ; 0.0 ; ; 0 # Nd DEVANAGARI DIGIT ZERO +09E6 ; 0.0 ; ; 0 # Nd BENGALI DIGIT ZERO +0A66 ; 0.0 ; ; 0 # Nd GURMUKHI DIGIT ZERO +0AE6 ; 0.0 ; ; 0 # Nd GUJARATI DIGIT ZERO +0B66 ; 0.0 ; ; 0 # Nd ORIYA DIGIT ZERO +0BE6 ; 0.0 ; ; 0 # Nd TAMIL DIGIT ZERO +0C66 ; 0.0 ; ; 0 # Nd TELUGU DIGIT ZERO +0C78 ; 0.0 ; ; 0 # No TELUGU FRACTION DIGIT ZERO FOR ODD POWERS OF FOUR +0CE6 ; 0.0 ; ; 0 # Nd KANNADA DIGIT ZERO +0D66 ; 0.0 ; ; 0 # Nd MALAYALAM DIGIT ZERO +0DE6 ; 0.0 ; ; 0 # Nd SINHALA LITH DIGIT ZERO +0E50 ; 0.0 ; ; 0 # Nd THAI DIGIT ZERO +0ED0 ; 0.0 ; ; 0 # Nd LAO DIGIT ZERO +0F20 ; 0.0 ; ; 0 # Nd TIBETAN DIGIT ZERO +1040 ; 0.0 ; ; 0 # Nd MYANMAR DIGIT ZERO +1090 ; 0.0 ; ; 0 # Nd MYANMAR SHAN DIGIT ZERO +17E0 ; 0.0 ; ; 0 # Nd KHMER DIGIT ZERO +17F0 ; 0.0 ; ; 0 # No KHMER SYMBOL LEK ATTAK SON +1810 ; 0.0 ; ; 0 # Nd MONGOLIAN DIGIT ZERO +1946 ; 0.0 ; ; 0 # Nd LIMBU DIGIT ZERO +19D0 ; 0.0 ; ; 0 # Nd NEW TAI LUE DIGIT ZERO +1A80 ; 0.0 ; ; 0 # Nd TAI THAM HORA DIGIT ZERO +1A90 ; 0.0 ; ; 0 # Nd TAI THAM THAM DIGIT ZERO +1B50 ; 0.0 ; ; 0 # Nd BALINESE DIGIT ZERO +1BB0 ; 0.0 ; ; 0 # Nd SUNDANESE DIGIT ZERO +1C40 ; 0.0 ; ; 0 # Nd LEPCHA DIGIT ZERO +1C50 ; 0.0 ; ; 0 # Nd OL CHIKI DIGIT ZERO +2070 ; 0.0 ; ; 0 # No SUPERSCRIPT ZERO +2080 ; 0.0 ; ; 0 # No SUBSCRIPT ZERO +2189 ; 0.0 ; ; 0 # No VULGAR FRACTION ZERO THIRDS +24EA ; 0.0 ; ; 0 # No CIRCLED DIGIT ZERO +24FF ; 0.0 ; ; 0 # No NEGATIVE CIRCLED DIGIT ZERO +3007 ; 0.0 ; ; 0 # Nl IDEOGRAPHIC NUMBER ZERO +6D1E ; 0.0 ; ; 0 # Lo CJK UNIFIED IDEOGRAPH-6D1E +96F6 ; 0.0 ; ; 0 # Lo CJK UNIFIED IDEOGRAPH-96F6 +A620 ; 0.0 ; ; 0 # Nd VAI DIGIT ZERO +A6EF ; 0.0 ; ; 0 # Nl BAMUM LETTER KOGHOM +A8D0 ; 0.0 ; ; 0 # Nd SAURASHTRA DIGIT ZERO +A900 ; 0.0 ; ; 0 # Nd KAYAH LI DIGIT ZERO +A9D0 ; 0.0 ; ; 0 # Nd JAVANESE DIGIT ZERO +A9F0 ; 0.0 ; ; 0 # Nd MYANMAR TAI LAING DIGIT ZERO +AA50 ; 0.0 ; ; 0 # Nd CHAM DIGIT ZERO +ABF0 ; 0.0 ; ; 0 # Nd MEETEI MAYEK DIGIT ZERO +F9B2 ; 0.0 ; ; 0 # Lo CJK COMPATIBILITY IDEOGRAPH-F9B2 +FF10 ; 0.0 ; ; 0 # Nd FULLWIDTH DIGIT ZERO +1018A ; 0.0 ; ; 0 # No GREEK ZERO SIGN +104A0 ; 0.0 ; ; 0 # Nd OSMANYA DIGIT ZERO +10D30 ; 0.0 ; ; 0 # Nd HANIFI ROHINGYA DIGIT ZERO +10D40 ; 0.0 ; ; 0 # Nd GARAY DIGIT ZERO +11066 ; 0.0 ; ; 0 # Nd BRAHMI DIGIT ZERO +110F0 ; 0.0 ; ; 0 # Nd SORA SOMPENG DIGIT ZERO +11136 ; 0.0 ; ; 0 # Nd CHAKMA DIGIT ZERO +111D0 ; 0.0 ; ; 0 # Nd SHARADA DIGIT ZERO +112F0 ; 0.0 ; ; 0 # Nd KHUDAWADI DIGIT ZERO +11450 ; 0.0 ; ; 0 # Nd NEWA DIGIT ZERO +114D0 ; 0.0 ; ; 0 # Nd TIRHUTA DIGIT ZERO +11650 ; 0.0 ; ; 0 # Nd MODI DIGIT ZERO +116C0 ; 0.0 ; ; 0 # Nd TAKRI DIGIT ZERO +116D0 ; 0.0 ; ; 0 # Nd MYANMAR PAO DIGIT ZERO +116DA ; 0.0 ; ; 0 # Nd MYANMAR EASTERN PWO KAREN DIGIT ZERO +11730 ; 0.0 ; ; 0 # Nd AHOM DIGIT ZERO +118E0 ; 0.0 ; ; 0 # Nd WARANG CITI DIGIT ZERO +11950 ; 0.0 ; ; 0 # Nd DIVES AKURU DIGIT ZERO +11BF0 ; 0.0 ; ; 0 # Nd SUNUWAR DIGIT ZERO +11C50 ; 0.0 ; ; 0 # Nd BHAIKSUKI DIGIT ZERO +11D50 ; 0.0 ; ; 0 # Nd MASARAM GONDI DIGIT ZERO +11DA0 ; 0.0 ; ; 0 # Nd GUNJALA GONDI DIGIT ZERO +11DE0 ; 0.0 ; ; 0 # Nd TOLONG SIKI DIGIT ZERO +11F50 ; 0.0 ; ; 0 # Nd KAWI DIGIT ZERO +16130 ; 0.0 ; ; 0 # Nd GURUNG KHEMA DIGIT ZERO +16A60 ; 0.0 ; ; 0 # Nd MRO DIGIT ZERO +16AC0 ; 0.0 ; ; 0 # Nd TANGSA DIGIT ZERO +16B50 ; 0.0 ; ; 0 # Nd PAHAWH HMONG DIGIT ZERO +16D70 ; 0.0 ; ; 0 # Nd KIRAT RAI DIGIT ZERO +16E80 ; 0.0 ; ; 0 # No MEDEFAIDRIN DIGIT ZERO +1CCF0 ; 0.0 ; ; 0 # Nd OUTLINED DIGIT ZERO +1D2C0 ; 0.0 ; ; 0 # No KAKTOVIK NUMERAL ZERO +1D2E0 ; 0.0 ; ; 0 # No MAYAN NUMERAL ZERO +1D7CE ; 0.0 ; ; 0 # Nd MATHEMATICAL BOLD DIGIT ZERO +1D7D8 ; 0.0 ; ; 0 # Nd MATHEMATICAL DOUBLE-STRUCK DIGIT ZERO +1D7E2 ; 0.0 ; ; 0 # Nd MATHEMATICAL SANS-SERIF DIGIT ZERO +1D7EC ; 0.0 ; ; 0 # Nd MATHEMATICAL SANS-SERIF BOLD DIGIT ZERO +1D7F6 ; 0.0 ; ; 0 # Nd MATHEMATICAL MONOSPACE DIGIT ZERO +1E140 ; 0.0 ; ; 0 # Nd NYIAKENG PUACHUE HMONG DIGIT ZERO +1E2F0 ; 0.0 ; ; 0 # Nd WANCHO DIGIT ZERO +1E4F0 ; 0.0 ; ; 0 # Nd NAG MUNDARI DIGIT ZERO +1E5F1 ; 0.0 ; ; 0 # Nd OL ONAL DIGIT ZERO +1E950 ; 0.0 ; ; 0 # Nd ADLAM DIGIT ZERO +1F100..1F101 ; 0.0 ; ; 0 # No [2] DIGIT ZERO FULL STOP..DIGIT ZERO COMMA +1F10B..1F10C ; 0.0 ; ; 0 # No [2] DINGBAT CIRCLED SANS-SERIF DIGIT ZERO..DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT ZERO +1FBF0 ; 0.0 ; ; 0 # Nd SEGMENTED DIGIT ZERO + +# Total code points: 97 + +# ================================================ + +11FC0 ; 0.003125 ; ; 1/320 # No TAMIL FRACTION ONE THREE-HUNDRED-AND-TWENTIETH +11FD4 ; 0.003125 ; ; 1/320 # No TAMIL FRACTION DOWNSCALING FACTOR KIIZH + +# Total code points: 2 + +# ================================================ + +0D58 ; 0.00625 ; ; 1/160 # No MALAYALAM FRACTION ONE ONE-HUNDRED-AND-SIXTIETH +11FC1 ; 0.00625 ; ; 1/160 # No TAMIL FRACTION ONE ONE-HUNDRED-AND-SIXTIETH + +# Total code points: 2 + +# ================================================ + +11FC2 ; 0.0125 ; ; 1/80 # No TAMIL FRACTION ONE EIGHTIETH + +# Total code points: 1 + +# ================================================ + +11FC3 ; 0.015625 ; ; 1/64 # No TAMIL FRACTION ONE SIXTY-FOURTH + +# Total code points: 1 + +# ================================================ + +0D59 ; 0.025 ; ; 1/40 # No MALAYALAM FRACTION ONE FORTIETH +11FC4 ; 0.025 ; ; 1/40 # No TAMIL FRACTION ONE FORTIETH + +# Total code points: 2 + +# ================================================ + +11FC5 ; 0.03125 ; ; 1/32 # No TAMIL FRACTION ONE THIRTY-SECOND + +# Total code points: 1 + +# ================================================ + +0D5A ; 0.0375 ; ; 3/80 # No MALAYALAM FRACTION THREE EIGHTIETHS +11FC6 ; 0.0375 ; ; 3/80 # No TAMIL FRACTION THREE EIGHTIETHS + +# Total code points: 2 + +# ================================================ + +11FC7 ; 0.046875 ; ; 3/64 # No TAMIL FRACTION THREE SIXTY-FOURTHS + +# Total code points: 1 + +# ================================================ + +0D5B ; 0.05 ; ; 1/20 # No MALAYALAM FRACTION ONE TWENTIETH +11FC8 ; 0.05 ; ; 1/20 # No TAMIL FRACTION ONE TWENTIETH + +# Total code points: 2 + +# ================================================ + +09F4 ; 0.0625 ; ; 1/16 # No BENGALI CURRENCY NUMERATOR ONE +0B75 ; 0.0625 ; ; 1/16 # No ORIYA FRACTION ONE SIXTEENTH +0D76 ; 0.0625 ; ; 1/16 # No MALAYALAM FRACTION ONE SIXTEENTH +A833 ; 0.0625 ; ; 1/16 # No NORTH INDIC FRACTION ONE SIXTEENTH +11FC9..11FCA ; 0.0625 ; ; 1/16 # No [2] TAMIL FRACTION ONE SIXTEENTH-1..TAMIL FRACTION ONE SIXTEENTH-2 + +# Total code points: 6 + +# ================================================ + +109F6 ; 0.08333333 ; ; 1/12 # No MEROITIC CURSIVE FRACTION ONE TWELFTH + +# Total code points: 1 + +# ================================================ + +0D5C ; 0.1 ; ; 1/10 # No MALAYALAM FRACTION ONE TENTH +2152 ; 0.1 ; ; 1/10 # No VULGAR FRACTION ONE TENTH +11FCB ; 0.1 ; ; 1/10 # No TAMIL FRACTION ONE TENTH + +# Total code points: 3 + +# ================================================ + +2151 ; 0.11111111 ; ; 1/9 # No VULGAR FRACTION ONE NINTH + +# Total code points: 1 + +# ================================================ + +09F5 ; 0.125 ; ; 1/8 # No BENGALI CURRENCY NUMERATOR TWO +0B76 ; 0.125 ; ; 1/8 # No ORIYA FRACTION ONE EIGHTH +0D77 ; 0.125 ; ; 1/8 # No MALAYALAM FRACTION ONE EIGHTH +215B ; 0.125 ; ; 1/8 # No VULGAR FRACTION ONE EIGHTH +A834 ; 0.125 ; ; 1/8 # No NORTH INDIC FRACTION ONE EIGHTH +11FCC ; 0.125 ; ; 1/8 # No TAMIL FRACTION ONE EIGHTH +1245F ; 0.125 ; ; 1/8 # Nl CUNEIFORM NUMERIC SIGN ONE EIGHTH ASH + +# Total code points: 7 + +# ================================================ + +2150 ; 0.14285714 ; ; 1/7 # No VULGAR FRACTION ONE SEVENTH + +# Total code points: 1 + +# ================================================ + +0D5D ; 0.15 ; ; 3/20 # No MALAYALAM FRACTION THREE TWENTIETHS +11FCD ; 0.15 ; ; 3/20 # No TAMIL FRACTION THREE TWENTIETHS + +# Total code points: 2 + +# ================================================ + +2159 ; 0.16666667 ; ; 1/6 # No VULGAR FRACTION ONE SIXTH +109F7 ; 0.16666667 ; ; 1/6 # No MEROITIC CURSIVE FRACTION TWO TWELFTHS +12461 ; 0.16666667 ; ; 1/6 # Nl CUNEIFORM NUMERIC SIGN OLD ASSYRIAN ONE SIXTH +1ED3D ; 0.16666667 ; ; 1/6 # No OTTOMAN SIYAQ FRACTION ONE SIXTH + +# Total code points: 4 + +# ================================================ + +09F6 ; 0.1875 ; ; 3/16 # No BENGALI CURRENCY NUMERATOR THREE +0B77 ; 0.1875 ; ; 3/16 # No ORIYA FRACTION THREE SIXTEENTHS +0D78 ; 0.1875 ; ; 3/16 # No MALAYALAM FRACTION THREE SIXTEENTHS +A835 ; 0.1875 ; ; 3/16 # No NORTH INDIC FRACTION THREE SIXTEENTHS +11FCE ; 0.1875 ; ; 3/16 # No TAMIL FRACTION THREE SIXTEENTHS + +# Total code points: 5 + +# ================================================ + +0D5E ; 0.2 ; ; 1/5 # No MALAYALAM FRACTION ONE FIFTH +2155 ; 0.2 ; ; 1/5 # No VULGAR FRACTION ONE FIFTH +11FCF ; 0.2 ; ; 1/5 # No TAMIL FRACTION ONE FIFTH + +# Total code points: 3 + +# ================================================ + +00BC ; 0.25 ; ; 1/4 # No VULGAR FRACTION ONE QUARTER +09F7 ; 0.25 ; ; 1/4 # No BENGALI CURRENCY NUMERATOR FOUR +0B72 ; 0.25 ; ; 1/4 # No ORIYA FRACTION ONE QUARTER +0D73 ; 0.25 ; ; 1/4 # No MALAYALAM FRACTION ONE QUARTER +A830 ; 0.25 ; ; 1/4 # No NORTH INDIC FRACTION ONE QUARTER +10140 ; 0.25 ; ; 1/4 # Nl GREEK ACROPHONIC ATTIC ONE QUARTER +1018B ; 0.25 ; ; 1/4 # No GREEK ONE QUARTER SIGN +109F8 ; 0.25 ; ; 1/4 # No MEROITIC CURSIVE FRACTION THREE TWELFTHS +10E7C ; 0.25 ; ; 1/4 # No RUMI FRACTION ONE QUARTER +11FD0 ; 0.25 ; ; 1/4 # No TAMIL FRACTION ONE QUARTER +12460 ; 0.25 ; ; 1/4 # Nl CUNEIFORM NUMERIC SIGN ONE QUARTER ASH +12462..12463 ; 0.25 ; ; 1/4 # Nl [2] CUNEIFORM NUMERIC SIGN OLD ASSYRIAN ONE QUARTER..CUNEIFORM NUMERIC SIGN ONE QUARTER GUR +1ECAD ; 0.25 ; ; 1/4 # No INDIC SIYAQ FRACTION ONE QUARTER + +# Total code points: 14 + +# ================================================ + +2153 ; 0.33333333 ; ; 1/3 # No VULGAR FRACTION ONE THIRD +109F9 ; 0.33333333 ; ; 1/3 # No MEROITIC CURSIVE FRACTION FOUR TWELFTHS +10E7D ; 0.33333333 ; ; 1/3 # No RUMI FRACTION ONE THIRD +1245A ; 0.33333333 ; ; 1/3 # Nl CUNEIFORM NUMERIC SIGN ONE THIRD DISH +1245D ; 0.33333333 ; ; 1/3 # Nl CUNEIFORM NUMERIC SIGN ONE THIRD VARIANT FORM A +12465 ; 0.33333333 ; ; 1/3 # Nl CUNEIFORM NUMERIC SIGN ELAMITE ONE THIRD + +# Total code points: 6 + +# ================================================ + +215C ; 0.375 ; ; 3/8 # No VULGAR FRACTION THREE EIGHTHS + +# Total code points: 1 + +# ================================================ + +2156 ; 0.4 ; ; 2/5 # No VULGAR FRACTION TWO FIFTHS + +# Total code points: 1 + +# ================================================ + +109FA ; 0.41666667 ; ; 5/12 # No MEROITIC CURSIVE FRACTION FIVE TWELFTHS + +# Total code points: 1 + +# ================================================ + +00BD ; 0.5 ; ; 1/2 # No VULGAR FRACTION ONE HALF +0B73 ; 0.5 ; ; 1/2 # No ORIYA FRACTION ONE HALF +0D74 ; 0.5 ; ; 1/2 # No MALAYALAM FRACTION ONE HALF +0F2A ; 0.5 ; ; 1/2 # No TIBETAN DIGIT HALF ONE +2CFD ; 0.5 ; ; 1/2 # No COPTIC FRACTION ONE HALF +A831 ; 0.5 ; ; 1/2 # No NORTH INDIC FRACTION ONE HALF +10141 ; 0.5 ; ; 1/2 # Nl GREEK ACROPHONIC ATTIC ONE HALF +10175..10176 ; 0.5 ; ; 1/2 # No [2] GREEK ONE HALF SIGN..GREEK ONE HALF SIGN ALTERNATE FORM +109BD ; 0.5 ; ; 1/2 # No MEROITIC CURSIVE FRACTION ONE HALF +109FB ; 0.5 ; ; 1/2 # No MEROITIC CURSIVE FRACTION SIX TWELFTHS +10A48 ; 0.5 ; ; 1/2 # No KHAROSHTHI FRACTION ONE HALF +10E7B ; 0.5 ; ; 1/2 # No RUMI FRACTION ONE HALF +10F26 ; 0.5 ; ; 1/2 # No OLD SOGDIAN FRACTION ONE HALF +11FD1..11FD2 ; 0.5 ; ; 1/2 # No [2] TAMIL FRACTION ONE HALF-1..TAMIL FRACTION ONE HALF-2 +12226 ; 0.5 ; ; 1/2 # Lo CUNEIFORM SIGN MASH +12464 ; 0.5 ; ; 1/2 # Nl CUNEIFORM NUMERIC SIGN ONE HALF GUR +1ECAE ; 0.5 ; ; 1/2 # No INDIC SIYAQ FRACTION ONE HALF +1ED3C ; 0.5 ; ; 1/2 # No OTTOMAN SIYAQ FRACTION ONE HALF + +# Total code points: 20 + +# ================================================ + +109FC ; 0.58333333 ; ; 7/12 # No MEROITIC CURSIVE FRACTION SEVEN TWELFTHS + +# Total code points: 1 + +# ================================================ + +2157 ; 0.6 ; ; 3/5 # No VULGAR FRACTION THREE FIFTHS + +# Total code points: 1 + +# ================================================ + +215D ; 0.625 ; ; 5/8 # No VULGAR FRACTION FIVE EIGHTHS + +# Total code points: 1 + +# ================================================ + +2154 ; 0.66666667 ; ; 2/3 # No VULGAR FRACTION TWO THIRDS +10177 ; 0.66666667 ; ; 2/3 # No GREEK TWO THIRDS SIGN +109FD ; 0.66666667 ; ; 2/3 # No MEROITIC CURSIVE FRACTION EIGHT TWELFTHS +10E7E ; 0.66666667 ; ; 2/3 # No RUMI FRACTION TWO THIRDS +1245B ; 0.66666667 ; ; 2/3 # Nl CUNEIFORM NUMERIC SIGN TWO THIRDS DISH +1245E ; 0.66666667 ; ; 2/3 # Nl CUNEIFORM NUMERIC SIGN TWO THIRDS VARIANT FORM A +12466 ; 0.66666667 ; ; 2/3 # Nl CUNEIFORM NUMERIC SIGN ELAMITE TWO THIRDS + +# Total code points: 7 + +# ================================================ + +00BE ; 0.75 ; ; 3/4 # No VULGAR FRACTION THREE QUARTERS +09F8 ; 0.75 ; ; 3/4 # No BENGALI CURRENCY NUMERATOR ONE LESS THAN THE DENOMINATOR +0B74 ; 0.75 ; ; 3/4 # No ORIYA FRACTION THREE QUARTERS +0D75 ; 0.75 ; ; 3/4 # No MALAYALAM FRACTION THREE QUARTERS +A832 ; 0.75 ; ; 3/4 # No NORTH INDIC FRACTION THREE QUARTERS +10178 ; 0.75 ; ; 3/4 # No GREEK THREE QUARTERS SIGN +109FE ; 0.75 ; ; 3/4 # No MEROITIC CURSIVE FRACTION NINE TWELFTHS +11FD3 ; 0.75 ; ; 3/4 # No TAMIL FRACTION THREE QUARTERS +1ECAF ; 0.75 ; ; 3/4 # No INDIC SIYAQ FRACTION THREE QUARTERS + +# Total code points: 9 + +# ================================================ + +2158 ; 0.8 ; ; 4/5 # No VULGAR FRACTION FOUR FIFTHS + +# Total code points: 1 + +# ================================================ + +215A ; 0.83333333 ; ; 5/6 # No VULGAR FRACTION FIVE SIXTHS +109FF ; 0.83333333 ; ; 5/6 # No MEROITIC CURSIVE FRACTION TEN TWELFTHS +1245C ; 0.83333333 ; ; 5/6 # Nl CUNEIFORM NUMERIC SIGN FIVE SIXTHS DISH + +# Total code points: 3 + +# ================================================ + +215E ; 0.875 ; ; 7/8 # No VULGAR FRACTION SEVEN EIGHTHS + +# Total code points: 1 + +# ================================================ + +109BC ; 0.91666667 ; ; 11/12 # No MEROITIC CURSIVE FRACTION ELEVEN TWELFTHS + +# Total code points: 1 + +# ================================================ + +0031 ; 1.0 ; ; 1 # Nd DIGIT ONE +00B9 ; 1.0 ; ; 1 # No SUPERSCRIPT ONE +0661 ; 1.0 ; ; 1 # Nd ARABIC-INDIC DIGIT ONE +06F1 ; 1.0 ; ; 1 # Nd EXTENDED ARABIC-INDIC DIGIT ONE +07C1 ; 1.0 ; ; 1 # Nd NKO DIGIT ONE +0967 ; 1.0 ; ; 1 # Nd DEVANAGARI DIGIT ONE +09E7 ; 1.0 ; ; 1 # Nd BENGALI DIGIT ONE +0A67 ; 1.0 ; ; 1 # Nd GURMUKHI DIGIT ONE +0AE7 ; 1.0 ; ; 1 # Nd GUJARATI DIGIT ONE +0B67 ; 1.0 ; ; 1 # Nd ORIYA DIGIT ONE +0BE7 ; 1.0 ; ; 1 # Nd TAMIL DIGIT ONE +0C67 ; 1.0 ; ; 1 # Nd TELUGU DIGIT ONE +0C79 ; 1.0 ; ; 1 # No TELUGU FRACTION DIGIT ONE FOR ODD POWERS OF FOUR +0C7C ; 1.0 ; ; 1 # No TELUGU FRACTION DIGIT ONE FOR EVEN POWERS OF FOUR +0CE7 ; 1.0 ; ; 1 # Nd KANNADA DIGIT ONE +0D67 ; 1.0 ; ; 1 # Nd MALAYALAM DIGIT ONE +0DE7 ; 1.0 ; ; 1 # Nd SINHALA LITH DIGIT ONE +0E51 ; 1.0 ; ; 1 # Nd THAI DIGIT ONE +0ED1 ; 1.0 ; ; 1 # Nd LAO DIGIT ONE +0F21 ; 1.0 ; ; 1 # Nd TIBETAN DIGIT ONE +1041 ; 1.0 ; ; 1 # Nd MYANMAR DIGIT ONE +1091 ; 1.0 ; ; 1 # Nd MYANMAR SHAN DIGIT ONE +1369 ; 1.0 ; ; 1 # No ETHIOPIC DIGIT ONE +17E1 ; 1.0 ; ; 1 # Nd KHMER DIGIT ONE +17F1 ; 1.0 ; ; 1 # No KHMER SYMBOL LEK ATTAK MUOY +1811 ; 1.0 ; ; 1 # Nd MONGOLIAN DIGIT ONE +1947 ; 1.0 ; ; 1 # Nd LIMBU DIGIT ONE +19D1 ; 1.0 ; ; 1 # Nd NEW TAI LUE DIGIT ONE +19DA ; 1.0 ; ; 1 # No NEW TAI LUE THAM DIGIT ONE +1A81 ; 1.0 ; ; 1 # Nd TAI THAM HORA DIGIT ONE +1A91 ; 1.0 ; ; 1 # Nd TAI THAM THAM DIGIT ONE +1B51 ; 1.0 ; ; 1 # Nd BALINESE DIGIT ONE +1BB1 ; 1.0 ; ; 1 # Nd SUNDANESE DIGIT ONE +1C41 ; 1.0 ; ; 1 # Nd LEPCHA DIGIT ONE +1C51 ; 1.0 ; ; 1 # Nd OL CHIKI DIGIT ONE +2081 ; 1.0 ; ; 1 # No SUBSCRIPT ONE +215F ; 1.0 ; ; 1 # No FRACTION NUMERATOR ONE +2160 ; 1.0 ; ; 1 # Nl ROMAN NUMERAL ONE +2170 ; 1.0 ; ; 1 # Nl SMALL ROMAN NUMERAL ONE +2460 ; 1.0 ; ; 1 # No CIRCLED DIGIT ONE +2474 ; 1.0 ; ; 1 # No PARENTHESIZED DIGIT ONE +2488 ; 1.0 ; ; 1 # No DIGIT ONE FULL STOP +24F5 ; 1.0 ; ; 1 # No DOUBLE CIRCLED DIGIT ONE +2776 ; 1.0 ; ; 1 # No DINGBAT NEGATIVE CIRCLED DIGIT ONE +2780 ; 1.0 ; ; 1 # No DINGBAT CIRCLED SANS-SERIF DIGIT ONE +278A ; 1.0 ; ; 1 # No DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT ONE +3021 ; 1.0 ; ; 1 # Nl HANGZHOU NUMERAL ONE +3192 ; 1.0 ; ; 1 # No IDEOGRAPHIC ANNOTATION ONE MARK +3220 ; 1.0 ; ; 1 # No PARENTHESIZED IDEOGRAPH ONE +3280 ; 1.0 ; ; 1 # No CIRCLED IDEOGRAPH ONE +4E00 ; 1.0 ; ; 1 # Lo CJK UNIFIED IDEOGRAPH-4E00 +58F1 ; 1.0 ; ; 1 # Lo CJK UNIFIED IDEOGRAPH-58F1 +58F9 ; 1.0 ; ; 1 # Lo CJK UNIFIED IDEOGRAPH-58F9 +5E7A ; 1.0 ; ; 1 # Lo CJK UNIFIED IDEOGRAPH-5E7A +5F0C ; 1.0 ; ; 1 # Lo CJK UNIFIED IDEOGRAPH-5F0C +A621 ; 1.0 ; ; 1 # Nd VAI DIGIT ONE +A6E6 ; 1.0 ; ; 1 # Nl BAMUM LETTER MO +A8D1 ; 1.0 ; ; 1 # Nd SAURASHTRA DIGIT ONE +A901 ; 1.0 ; ; 1 # Nd KAYAH LI DIGIT ONE +A9D1 ; 1.0 ; ; 1 # Nd JAVANESE DIGIT ONE +A9F1 ; 1.0 ; ; 1 # Nd MYANMAR TAI LAING DIGIT ONE +AA51 ; 1.0 ; ; 1 # Nd CHAM DIGIT ONE +ABF1 ; 1.0 ; ; 1 # Nd MEETEI MAYEK DIGIT ONE +FF11 ; 1.0 ; ; 1 # Nd FULLWIDTH DIGIT ONE +10107 ; 1.0 ; ; 1 # No AEGEAN NUMBER ONE +10142 ; 1.0 ; ; 1 # Nl GREEK ACROPHONIC ATTIC ONE DRACHMA +10158..1015A ; 1.0 ; ; 1 # Nl [3] GREEK ACROPHONIC HERAEUM ONE PLETHRON..GREEK ACROPHONIC HERMIONIAN ONE +102E1 ; 1.0 ; ; 1 # No COPTIC EPACT DIGIT ONE +10320 ; 1.0 ; ; 1 # No OLD ITALIC NUMERAL ONE +103D1 ; 1.0 ; ; 1 # Nl OLD PERSIAN NUMBER ONE +104A1 ; 1.0 ; ; 1 # Nd OSMANYA DIGIT ONE +10858 ; 1.0 ; ; 1 # No IMPERIAL ARAMAIC NUMBER ONE +10879 ; 1.0 ; ; 1 # No PALMYRENE NUMBER ONE +108A7 ; 1.0 ; ; 1 # No NABATAEAN NUMBER ONE +108FB ; 1.0 ; ; 1 # No HATRAN NUMBER ONE +10916 ; 1.0 ; ; 1 # No PHOENICIAN NUMBER ONE +109C0 ; 1.0 ; ; 1 # No MEROITIC CURSIVE NUMBER ONE +10A40 ; 1.0 ; ; 1 # No KHAROSHTHI DIGIT ONE +10A7D ; 1.0 ; ; 1 # No OLD SOUTH ARABIAN NUMBER ONE +10A9D ; 1.0 ; ; 1 # No OLD NORTH ARABIAN NUMBER ONE +10AEB ; 1.0 ; ; 1 # No MANICHAEAN NUMBER ONE +10B58 ; 1.0 ; ; 1 # No INSCRIPTIONAL PARTHIAN NUMBER ONE +10B78 ; 1.0 ; ; 1 # No INSCRIPTIONAL PAHLAVI NUMBER ONE +10BA9 ; 1.0 ; ; 1 # No PSALTER PAHLAVI NUMBER ONE +10CFA ; 1.0 ; ; 1 # No OLD HUNGARIAN NUMBER ONE +10D31 ; 1.0 ; ; 1 # Nd HANIFI ROHINGYA DIGIT ONE +10D41 ; 1.0 ; ; 1 # Nd GARAY DIGIT ONE +10E60 ; 1.0 ; ; 1 # No RUMI DIGIT ONE +10F1D ; 1.0 ; ; 1 # No OLD SOGDIAN NUMBER ONE +10F51 ; 1.0 ; ; 1 # No SOGDIAN NUMBER ONE +10FC5 ; 1.0 ; ; 1 # No CHORASMIAN NUMBER ONE +11052 ; 1.0 ; ; 1 # No BRAHMI NUMBER ONE +11067 ; 1.0 ; ; 1 # Nd BRAHMI DIGIT ONE +110F1 ; 1.0 ; ; 1 # Nd SORA SOMPENG DIGIT ONE +11137 ; 1.0 ; ; 1 # Nd CHAKMA DIGIT ONE +111D1 ; 1.0 ; ; 1 # Nd SHARADA DIGIT ONE +111E1 ; 1.0 ; ; 1 # No SINHALA ARCHAIC DIGIT ONE +112F1 ; 1.0 ; ; 1 # Nd KHUDAWADI DIGIT ONE +11451 ; 1.0 ; ; 1 # Nd NEWA DIGIT ONE +114D1 ; 1.0 ; ; 1 # Nd TIRHUTA DIGIT ONE +11651 ; 1.0 ; ; 1 # Nd MODI DIGIT ONE +116C1 ; 1.0 ; ; 1 # Nd TAKRI DIGIT ONE +116D1 ; 1.0 ; ; 1 # Nd MYANMAR PAO DIGIT ONE +116DB ; 1.0 ; ; 1 # Nd MYANMAR EASTERN PWO KAREN DIGIT ONE +11731 ; 1.0 ; ; 1 # Nd AHOM DIGIT ONE +118E1 ; 1.0 ; ; 1 # Nd WARANG CITI DIGIT ONE +11951 ; 1.0 ; ; 1 # Nd DIVES AKURU DIGIT ONE +11BF1 ; 1.0 ; ; 1 # Nd SUNUWAR DIGIT ONE +11C51 ; 1.0 ; ; 1 # Nd BHAIKSUKI DIGIT ONE +11C5A ; 1.0 ; ; 1 # No BHAIKSUKI NUMBER ONE +11D51 ; 1.0 ; ; 1 # Nd MASARAM GONDI DIGIT ONE +11DA1 ; 1.0 ; ; 1 # Nd GUNJALA GONDI DIGIT ONE +11DE1 ; 1.0 ; ; 1 # Nd TOLONG SIKI DIGIT ONE +11F51 ; 1.0 ; ; 1 # Nd KAWI DIGIT ONE +12038..12039 ; 1.0 ; ; 1 # Lo [2] CUNEIFORM SIGN ASH..CUNEIFORM SIGN ASH ZIDA TENU +12079 ; 1.0 ; ; 1 # Lo CUNEIFORM SIGN DISH +1230B ; 1.0 ; ; 1 # Lo CUNEIFORM SIGN U +12415 ; 1.0 ; ; 1 # Nl CUNEIFORM NUMERIC SIGN ONE GESH2 +1241E ; 1.0 ; ; 1 # Nl CUNEIFORM NUMERIC SIGN ONE GESHU +1242C ; 1.0 ; ; 1 # Nl CUNEIFORM NUMERIC SIGN ONE SHARU +12434 ; 1.0 ; ; 1 # Nl CUNEIFORM NUMERIC SIGN ONE BURU +1244F ; 1.0 ; ; 1 # Nl CUNEIFORM NUMERIC SIGN ONE BAN2 +12458 ; 1.0 ; ; 1 # Nl CUNEIFORM NUMERIC SIGN ONE ESHE3 +16131 ; 1.0 ; ; 1 # Nd GURUNG KHEMA DIGIT ONE +16A61 ; 1.0 ; ; 1 # Nd MRO DIGIT ONE +16AC1 ; 1.0 ; ; 1 # Nd TANGSA DIGIT ONE +16B51 ; 1.0 ; ; 1 # Nd PAHAWH HMONG DIGIT ONE +16D71 ; 1.0 ; ; 1 # Nd KIRAT RAI DIGIT ONE +16E81 ; 1.0 ; ; 1 # No MEDEFAIDRIN DIGIT ONE +16E94 ; 1.0 ; ; 1 # No MEDEFAIDRIN DIGIT ONE ALTERNATE FORM +16FF4 ; 1.0 ; ; 1 # Nl YANGQIN SIGN SLOW ONE BEAT +1CCF1 ; 1.0 ; ; 1 # Nd OUTLINED DIGIT ONE +1D2C1 ; 1.0 ; ; 1 # No KAKTOVIK NUMERAL ONE +1D2E1 ; 1.0 ; ; 1 # No MAYAN NUMERAL ONE +1D360 ; 1.0 ; ; 1 # No COUNTING ROD UNIT DIGIT ONE +1D372 ; 1.0 ; ; 1 # No IDEOGRAPHIC TALLY MARK ONE +1D377 ; 1.0 ; ; 1 # No TALLY MARK ONE +1D7CF ; 1.0 ; ; 1 # Nd MATHEMATICAL BOLD DIGIT ONE +1D7D9 ; 1.0 ; ; 1 # Nd MATHEMATICAL DOUBLE-STRUCK DIGIT ONE +1D7E3 ; 1.0 ; ; 1 # Nd MATHEMATICAL SANS-SERIF DIGIT ONE +1D7ED ; 1.0 ; ; 1 # Nd MATHEMATICAL SANS-SERIF BOLD DIGIT ONE +1D7F7 ; 1.0 ; ; 1 # Nd MATHEMATICAL MONOSPACE DIGIT ONE +1E141 ; 1.0 ; ; 1 # Nd NYIAKENG PUACHUE HMONG DIGIT ONE +1E2F1 ; 1.0 ; ; 1 # Nd WANCHO DIGIT ONE +1E4F1 ; 1.0 ; ; 1 # Nd NAG MUNDARI DIGIT ONE +1E5F2 ; 1.0 ; ; 1 # Nd OL ONAL DIGIT ONE +1E8C7 ; 1.0 ; ; 1 # No MENDE KIKAKUI DIGIT ONE +1E951 ; 1.0 ; ; 1 # Nd ADLAM DIGIT ONE +1EC71 ; 1.0 ; ; 1 # No INDIC SIYAQ NUMBER ONE +1ECA3 ; 1.0 ; ; 1 # No INDIC SIYAQ NUMBER PREFIXED ONE +1ECB1 ; 1.0 ; ; 1 # No INDIC SIYAQ NUMBER ALTERNATE ONE +1ED01 ; 1.0 ; ; 1 # No OTTOMAN SIYAQ NUMBER ONE +1F102 ; 1.0 ; ; 1 # No DIGIT ONE COMMA +1FBF1 ; 1.0 ; ; 1 # Nd SEGMENTED DIGIT ONE +2092A ; 1.0 ; ; 1 # Lo CJK UNIFIED IDEOGRAPH-2092A + +# Total code points: 158 + +# ================================================ + +0F2B ; 1.5 ; ; 3/2 # No TIBETAN DIGIT HALF TWO +16FF5 ; 1.5 ; ; 3/2 # Nl YANGQIN SIGN SLOW THREE HALF BEATS + +# Total code points: 2 + +# ================================================ + +0032 ; 2.0 ; ; 2 # Nd DIGIT TWO +00B2 ; 2.0 ; ; 2 # No SUPERSCRIPT TWO +0662 ; 2.0 ; ; 2 # Nd ARABIC-INDIC DIGIT TWO +06F2 ; 2.0 ; ; 2 # Nd EXTENDED ARABIC-INDIC DIGIT TWO +07C2 ; 2.0 ; ; 2 # Nd NKO DIGIT TWO +0968 ; 2.0 ; ; 2 # Nd DEVANAGARI DIGIT TWO +09E8 ; 2.0 ; ; 2 # Nd BENGALI DIGIT TWO +0A68 ; 2.0 ; ; 2 # Nd GURMUKHI DIGIT TWO +0AE8 ; 2.0 ; ; 2 # Nd GUJARATI DIGIT TWO +0B68 ; 2.0 ; ; 2 # Nd ORIYA DIGIT TWO +0BE8 ; 2.0 ; ; 2 # Nd TAMIL DIGIT TWO +0C68 ; 2.0 ; ; 2 # Nd TELUGU DIGIT TWO +0C7A ; 2.0 ; ; 2 # No TELUGU FRACTION DIGIT TWO FOR ODD POWERS OF FOUR +0C7D ; 2.0 ; ; 2 # No TELUGU FRACTION DIGIT TWO FOR EVEN POWERS OF FOUR +0CE8 ; 2.0 ; ; 2 # Nd KANNADA DIGIT TWO +0D68 ; 2.0 ; ; 2 # Nd MALAYALAM DIGIT TWO +0DE8 ; 2.0 ; ; 2 # Nd SINHALA LITH DIGIT TWO +0E52 ; 2.0 ; ; 2 # Nd THAI DIGIT TWO +0ED2 ; 2.0 ; ; 2 # Nd LAO DIGIT TWO +0F22 ; 2.0 ; ; 2 # Nd TIBETAN DIGIT TWO +1042 ; 2.0 ; ; 2 # Nd MYANMAR DIGIT TWO +1092 ; 2.0 ; ; 2 # Nd MYANMAR SHAN DIGIT TWO +136A ; 2.0 ; ; 2 # No ETHIOPIC DIGIT TWO +17E2 ; 2.0 ; ; 2 # Nd KHMER DIGIT TWO +17F2 ; 2.0 ; ; 2 # No KHMER SYMBOL LEK ATTAK PII +1812 ; 2.0 ; ; 2 # Nd MONGOLIAN DIGIT TWO +1948 ; 2.0 ; ; 2 # Nd LIMBU DIGIT TWO +19D2 ; 2.0 ; ; 2 # Nd NEW TAI LUE DIGIT TWO +1A82 ; 2.0 ; ; 2 # Nd TAI THAM HORA DIGIT TWO +1A92 ; 2.0 ; ; 2 # Nd TAI THAM THAM DIGIT TWO +1B52 ; 2.0 ; ; 2 # Nd BALINESE DIGIT TWO +1BB2 ; 2.0 ; ; 2 # Nd SUNDANESE DIGIT TWO +1C42 ; 2.0 ; ; 2 # Nd LEPCHA DIGIT TWO +1C52 ; 2.0 ; ; 2 # Nd OL CHIKI DIGIT TWO +2082 ; 2.0 ; ; 2 # No SUBSCRIPT TWO +2161 ; 2.0 ; ; 2 # Nl ROMAN NUMERAL TWO +2171 ; 2.0 ; ; 2 # Nl SMALL ROMAN NUMERAL TWO +2461 ; 2.0 ; ; 2 # No CIRCLED DIGIT TWO +2475 ; 2.0 ; ; 2 # No PARENTHESIZED DIGIT TWO +2489 ; 2.0 ; ; 2 # No DIGIT TWO FULL STOP +24F6 ; 2.0 ; ; 2 # No DOUBLE CIRCLED DIGIT TWO +2777 ; 2.0 ; ; 2 # No DINGBAT NEGATIVE CIRCLED DIGIT TWO +2781 ; 2.0 ; ; 2 # No DINGBAT CIRCLED SANS-SERIF DIGIT TWO +278B ; 2.0 ; ; 2 # No DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT TWO +3022 ; 2.0 ; ; 2 # Nl HANGZHOU NUMERAL TWO +3193 ; 2.0 ; ; 2 # No IDEOGRAPHIC ANNOTATION TWO MARK +3221 ; 2.0 ; ; 2 # No PARENTHESIZED IDEOGRAPH TWO +3281 ; 2.0 ; ; 2 # No CIRCLED IDEOGRAPH TWO +3483 ; 2.0 ; ; 2 # Lo CJK UNIFIED IDEOGRAPH-3483 +4E24 ; 2.0 ; ; 2 # Lo CJK UNIFIED IDEOGRAPH-4E24 +4E8C ; 2.0 ; ; 2 # Lo CJK UNIFIED IDEOGRAPH-4E8C +4FE9 ; 2.0 ; ; 2 # Lo CJK UNIFIED IDEOGRAPH-4FE9 +5006 ; 2.0 ; ; 2 # Lo CJK UNIFIED IDEOGRAPH-5006 +5169 ; 2.0 ; ; 2 # Lo CJK UNIFIED IDEOGRAPH-5169 +5F0D ; 2.0 ; ; 2 # Lo CJK UNIFIED IDEOGRAPH-5F0D +5F10 ; 2.0 ; ; 2 # Lo CJK UNIFIED IDEOGRAPH-5F10 +8CAE ; 2.0 ; ; 2 # Lo CJK UNIFIED IDEOGRAPH-8CAE +8CB3 ; 2.0 ; ; 2 # Lo CJK UNIFIED IDEOGRAPH-8CB3 +8D30 ; 2.0 ; ; 2 # Lo CJK UNIFIED IDEOGRAPH-8D30 +A622 ; 2.0 ; ; 2 # Nd VAI DIGIT TWO +A6E7 ; 2.0 ; ; 2 # Nl BAMUM LETTER MBAA +A8D2 ; 2.0 ; ; 2 # Nd SAURASHTRA DIGIT TWO +A902 ; 2.0 ; ; 2 # Nd KAYAH LI DIGIT TWO +A9D2 ; 2.0 ; ; 2 # Nd JAVANESE DIGIT TWO +A9F2 ; 2.0 ; ; 2 # Nd MYANMAR TAI LAING DIGIT TWO +AA52 ; 2.0 ; ; 2 # Nd CHAM DIGIT TWO +ABF2 ; 2.0 ; ; 2 # Nd MEETEI MAYEK DIGIT TWO +F978 ; 2.0 ; ; 2 # Lo CJK COMPATIBILITY IDEOGRAPH-F978 +FF12 ; 2.0 ; ; 2 # Nd FULLWIDTH DIGIT TWO +10108 ; 2.0 ; ; 2 # No AEGEAN NUMBER TWO +1015B..1015E ; 2.0 ; ; 2 # Nl [4] GREEK ACROPHONIC EPIDAUREAN TWO..GREEK ACROPHONIC EPIDAUREAN TWO DRACHMAS +102E2 ; 2.0 ; ; 2 # No COPTIC EPACT DIGIT TWO +103D2 ; 2.0 ; ; 2 # Nl OLD PERSIAN NUMBER TWO +104A2 ; 2.0 ; ; 2 # Nd OSMANYA DIGIT TWO +10859 ; 2.0 ; ; 2 # No IMPERIAL ARAMAIC NUMBER TWO +1087A ; 2.0 ; ; 2 # No PALMYRENE NUMBER TWO +108A8 ; 2.0 ; ; 2 # No NABATAEAN NUMBER TWO +1091A ; 2.0 ; ; 2 # No PHOENICIAN NUMBER TWO +109C1 ; 2.0 ; ; 2 # No MEROITIC CURSIVE NUMBER TWO +10A41 ; 2.0 ; ; 2 # No KHAROSHTHI DIGIT TWO +10B59 ; 2.0 ; ; 2 # No INSCRIPTIONAL PARTHIAN NUMBER TWO +10B79 ; 2.0 ; ; 2 # No INSCRIPTIONAL PAHLAVI NUMBER TWO +10BAA ; 2.0 ; ; 2 # No PSALTER PAHLAVI NUMBER TWO +10D32 ; 2.0 ; ; 2 # Nd HANIFI ROHINGYA DIGIT TWO +10D42 ; 2.0 ; ; 2 # Nd GARAY DIGIT TWO +10E61 ; 2.0 ; ; 2 # No RUMI DIGIT TWO +10F1E ; 2.0 ; ; 2 # No OLD SOGDIAN NUMBER TWO +10FC6 ; 2.0 ; ; 2 # No CHORASMIAN NUMBER TWO +11053 ; 2.0 ; ; 2 # No BRAHMI NUMBER TWO +11068 ; 2.0 ; ; 2 # Nd BRAHMI DIGIT TWO +110F2 ; 2.0 ; ; 2 # Nd SORA SOMPENG DIGIT TWO +11138 ; 2.0 ; ; 2 # Nd CHAKMA DIGIT TWO +111D2 ; 2.0 ; ; 2 # Nd SHARADA DIGIT TWO +111E2 ; 2.0 ; ; 2 # No SINHALA ARCHAIC DIGIT TWO +112F2 ; 2.0 ; ; 2 # Nd KHUDAWADI DIGIT TWO +11452 ; 2.0 ; ; 2 # Nd NEWA DIGIT TWO +114D2 ; 2.0 ; ; 2 # Nd TIRHUTA DIGIT TWO +11652 ; 2.0 ; ; 2 # Nd MODI DIGIT TWO +116C2 ; 2.0 ; ; 2 # Nd TAKRI DIGIT TWO +116D2 ; 2.0 ; ; 2 # Nd MYANMAR PAO DIGIT TWO +116DC ; 2.0 ; ; 2 # Nd MYANMAR EASTERN PWO KAREN DIGIT TWO +11732 ; 2.0 ; ; 2 # Nd AHOM DIGIT TWO +118E2 ; 2.0 ; ; 2 # Nd WARANG CITI DIGIT TWO +11952 ; 2.0 ; ; 2 # Nd DIVES AKURU DIGIT TWO +11BF2 ; 2.0 ; ; 2 # Nd SUNUWAR DIGIT TWO +11C52 ; 2.0 ; ; 2 # Nd BHAIKSUKI DIGIT TWO +11C5B ; 2.0 ; ; 2 # No BHAIKSUKI NUMBER TWO +11D52 ; 2.0 ; ; 2 # Nd MASARAM GONDI DIGIT TWO +11DA2 ; 2.0 ; ; 2 # Nd GUNJALA GONDI DIGIT TWO +11DE2 ; 2.0 ; ; 2 # Nd TOLONG SIKI DIGIT TWO +11F52 ; 2.0 ; ; 2 # Nd KAWI DIGIT TWO +1222B ; 2.0 ; ; 2 # Lo CUNEIFORM SIGN MIN +12399 ; 2.0 ; ; 2 # Lo CUNEIFORM SIGN U U +12400 ; 2.0 ; ; 2 # Nl CUNEIFORM NUMERIC SIGN TWO ASH +12416 ; 2.0 ; ; 2 # Nl CUNEIFORM NUMERIC SIGN TWO GESH2 +1241F ; 2.0 ; ; 2 # Nl CUNEIFORM NUMERIC SIGN TWO GESHU +12423 ; 2.0 ; ; 2 # Nl CUNEIFORM NUMERIC SIGN TWO SHAR2 +1242D ; 2.0 ; ; 2 # Nl CUNEIFORM NUMERIC SIGN TWO SHARU +12435 ; 2.0 ; ; 2 # Nl CUNEIFORM NUMERIC SIGN TWO BURU +1244A ; 2.0 ; ; 2 # Nl CUNEIFORM NUMERIC SIGN TWO ASH TENU +12450 ; 2.0 ; ; 2 # Nl CUNEIFORM NUMERIC SIGN TWO BAN2 +12456 ; 2.0 ; ; 2 # Nl CUNEIFORM NUMERIC SIGN NIGIDAMIN +12459 ; 2.0 ; ; 2 # Nl CUNEIFORM NUMERIC SIGN TWO ESHE3 +16132 ; 2.0 ; ; 2 # Nd GURUNG KHEMA DIGIT TWO +16A62 ; 2.0 ; ; 2 # Nd MRO DIGIT TWO +16AC2 ; 2.0 ; ; 2 # Nd TANGSA DIGIT TWO +16B52 ; 2.0 ; ; 2 # Nd PAHAWH HMONG DIGIT TWO +16D72 ; 2.0 ; ; 2 # Nd KIRAT RAI DIGIT TWO +16E82 ; 2.0 ; ; 2 # No MEDEFAIDRIN DIGIT TWO +16E95 ; 2.0 ; ; 2 # No MEDEFAIDRIN DIGIT TWO ALTERNATE FORM +16FF6 ; 2.0 ; ; 2 # Nl YANGQIN SIGN SLOW TWO BEATS +1CCF2 ; 2.0 ; ; 2 # Nd OUTLINED DIGIT TWO +1D2C2 ; 2.0 ; ; 2 # No KAKTOVIK NUMERAL TWO +1D2E2 ; 2.0 ; ; 2 # No MAYAN NUMERAL TWO +1D361 ; 2.0 ; ; 2 # No COUNTING ROD UNIT DIGIT TWO +1D373 ; 2.0 ; ; 2 # No IDEOGRAPHIC TALLY MARK TWO +1D7D0 ; 2.0 ; ; 2 # Nd MATHEMATICAL BOLD DIGIT TWO +1D7DA ; 2.0 ; ; 2 # Nd MATHEMATICAL DOUBLE-STRUCK DIGIT TWO +1D7E4 ; 2.0 ; ; 2 # Nd MATHEMATICAL SANS-SERIF DIGIT TWO +1D7EE ; 2.0 ; ; 2 # Nd MATHEMATICAL SANS-SERIF BOLD DIGIT TWO +1D7F8 ; 2.0 ; ; 2 # Nd MATHEMATICAL MONOSPACE DIGIT TWO +1E142 ; 2.0 ; ; 2 # Nd NYIAKENG PUACHUE HMONG DIGIT TWO +1E2F2 ; 2.0 ; ; 2 # Nd WANCHO DIGIT TWO +1E4F2 ; 2.0 ; ; 2 # Nd NAG MUNDARI DIGIT TWO +1E5F3 ; 2.0 ; ; 2 # Nd OL ONAL DIGIT TWO +1E8C8 ; 2.0 ; ; 2 # No MENDE KIKAKUI DIGIT TWO +1E952 ; 2.0 ; ; 2 # Nd ADLAM DIGIT TWO +1EC72 ; 2.0 ; ; 2 # No INDIC SIYAQ NUMBER TWO +1ECA4 ; 2.0 ; ; 2 # No INDIC SIYAQ NUMBER PREFIXED TWO +1ECB2 ; 2.0 ; ; 2 # No INDIC SIYAQ NUMBER ALTERNATE TWO +1ED02 ; 2.0 ; ; 2 # No OTTOMAN SIYAQ NUMBER TWO +1ED2F ; 2.0 ; ; 2 # No OTTOMAN SIYAQ ALTERNATE NUMBER TWO +1F103 ; 2.0 ; ; 2 # No DIGIT TWO COMMA +1FBF2 ; 2.0 ; ; 2 # Nd SEGMENTED DIGIT TWO +22390 ; 2.0 ; ; 2 # Lo CJK UNIFIED IDEOGRAPH-22390 + +# Total code points: 158 + +# ================================================ + +0F2C ; 2.5 ; ; 5/2 # No TIBETAN DIGIT HALF THREE + +# Total code points: 1 + +# ================================================ + +0033 ; 3.0 ; ; 3 # Nd DIGIT THREE +00B3 ; 3.0 ; ; 3 # No SUPERSCRIPT THREE +0663 ; 3.0 ; ; 3 # Nd ARABIC-INDIC DIGIT THREE +06F3 ; 3.0 ; ; 3 # Nd EXTENDED ARABIC-INDIC DIGIT THREE +07C3 ; 3.0 ; ; 3 # Nd NKO DIGIT THREE +0969 ; 3.0 ; ; 3 # Nd DEVANAGARI DIGIT THREE +09E9 ; 3.0 ; ; 3 # Nd BENGALI DIGIT THREE +0A69 ; 3.0 ; ; 3 # Nd GURMUKHI DIGIT THREE +0AE9 ; 3.0 ; ; 3 # Nd GUJARATI DIGIT THREE +0B69 ; 3.0 ; ; 3 # Nd ORIYA DIGIT THREE +0BE9 ; 3.0 ; ; 3 # Nd TAMIL DIGIT THREE +0C69 ; 3.0 ; ; 3 # Nd TELUGU DIGIT THREE +0C7B ; 3.0 ; ; 3 # No TELUGU FRACTION DIGIT THREE FOR ODD POWERS OF FOUR +0C7E ; 3.0 ; ; 3 # No TELUGU FRACTION DIGIT THREE FOR EVEN POWERS OF FOUR +0CE9 ; 3.0 ; ; 3 # Nd KANNADA DIGIT THREE +0D69 ; 3.0 ; ; 3 # Nd MALAYALAM DIGIT THREE +0DE9 ; 3.0 ; ; 3 # Nd SINHALA LITH DIGIT THREE +0E53 ; 3.0 ; ; 3 # Nd THAI DIGIT THREE +0ED3 ; 3.0 ; ; 3 # Nd LAO DIGIT THREE +0F23 ; 3.0 ; ; 3 # Nd TIBETAN DIGIT THREE +1043 ; 3.0 ; ; 3 # Nd MYANMAR DIGIT THREE +1093 ; 3.0 ; ; 3 # Nd MYANMAR SHAN DIGIT THREE +136B ; 3.0 ; ; 3 # No ETHIOPIC DIGIT THREE +17E3 ; 3.0 ; ; 3 # Nd KHMER DIGIT THREE +17F3 ; 3.0 ; ; 3 # No KHMER SYMBOL LEK ATTAK BEI +1813 ; 3.0 ; ; 3 # Nd MONGOLIAN DIGIT THREE +1949 ; 3.0 ; ; 3 # Nd LIMBU DIGIT THREE +19D3 ; 3.0 ; ; 3 # Nd NEW TAI LUE DIGIT THREE +1A83 ; 3.0 ; ; 3 # Nd TAI THAM HORA DIGIT THREE +1A93 ; 3.0 ; ; 3 # Nd TAI THAM THAM DIGIT THREE +1B53 ; 3.0 ; ; 3 # Nd BALINESE DIGIT THREE +1BB3 ; 3.0 ; ; 3 # Nd SUNDANESE DIGIT THREE +1C43 ; 3.0 ; ; 3 # Nd LEPCHA DIGIT THREE +1C53 ; 3.0 ; ; 3 # Nd OL CHIKI DIGIT THREE +2083 ; 3.0 ; ; 3 # No SUBSCRIPT THREE +2162 ; 3.0 ; ; 3 # Nl ROMAN NUMERAL THREE +2172 ; 3.0 ; ; 3 # Nl SMALL ROMAN NUMERAL THREE +2462 ; 3.0 ; ; 3 # No CIRCLED DIGIT THREE +2476 ; 3.0 ; ; 3 # No PARENTHESIZED DIGIT THREE +248A ; 3.0 ; ; 3 # No DIGIT THREE FULL STOP +24F7 ; 3.0 ; ; 3 # No DOUBLE CIRCLED DIGIT THREE +2778 ; 3.0 ; ; 3 # No DINGBAT NEGATIVE CIRCLED DIGIT THREE +2782 ; 3.0 ; ; 3 # No DINGBAT CIRCLED SANS-SERIF DIGIT THREE +278C ; 3.0 ; ; 3 # No DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT THREE +3023 ; 3.0 ; ; 3 # Nl HANGZHOU NUMERAL THREE +3194 ; 3.0 ; ; 3 # No IDEOGRAPHIC ANNOTATION THREE MARK +3222 ; 3.0 ; ; 3 # No PARENTHESIZED IDEOGRAPH THREE +3282 ; 3.0 ; ; 3 # No CIRCLED IDEOGRAPH THREE +4E09 ; 3.0 ; ; 3 # Lo CJK UNIFIED IDEOGRAPH-4E09 +4EE8 ; 3.0 ; ; 3 # Lo CJK UNIFIED IDEOGRAPH-4EE8 +53C1..53C4 ; 3.0 ; ; 3 # Lo [4] CJK UNIFIED IDEOGRAPH-53C1..CJK UNIFIED IDEOGRAPH-53C4 +5F0E ; 3.0 ; ; 3 # Lo CJK UNIFIED IDEOGRAPH-5F0E +A623 ; 3.0 ; ; 3 # Nd VAI DIGIT THREE +A6E8 ; 3.0 ; ; 3 # Nl BAMUM LETTER TET +A8D3 ; 3.0 ; ; 3 # Nd SAURASHTRA DIGIT THREE +A903 ; 3.0 ; ; 3 # Nd KAYAH LI DIGIT THREE +A9D3 ; 3.0 ; ; 3 # Nd JAVANESE DIGIT THREE +A9F3 ; 3.0 ; ; 3 # Nd MYANMAR TAI LAING DIGIT THREE +AA53 ; 3.0 ; ; 3 # Nd CHAM DIGIT THREE +ABF3 ; 3.0 ; ; 3 # Nd MEETEI MAYEK DIGIT THREE +F96B ; 3.0 ; ; 3 # Lo CJK COMPATIBILITY IDEOGRAPH-F96B +FF13 ; 3.0 ; ; 3 # Nd FULLWIDTH DIGIT THREE +10109 ; 3.0 ; ; 3 # No AEGEAN NUMBER THREE +102E3 ; 3.0 ; ; 3 # No COPTIC EPACT DIGIT THREE +104A3 ; 3.0 ; ; 3 # Nd OSMANYA DIGIT THREE +1085A ; 3.0 ; ; 3 # No IMPERIAL ARAMAIC NUMBER THREE +1087B ; 3.0 ; ; 3 # No PALMYRENE NUMBER THREE +108A9 ; 3.0 ; ; 3 # No NABATAEAN NUMBER THREE +1091B ; 3.0 ; ; 3 # No PHOENICIAN NUMBER THREE +109C2 ; 3.0 ; ; 3 # No MEROITIC CURSIVE NUMBER THREE +10A42 ; 3.0 ; ; 3 # No KHAROSHTHI DIGIT THREE +10B5A ; 3.0 ; ; 3 # No INSCRIPTIONAL PARTHIAN NUMBER THREE +10B7A ; 3.0 ; ; 3 # No INSCRIPTIONAL PAHLAVI NUMBER THREE +10BAB ; 3.0 ; ; 3 # No PSALTER PAHLAVI NUMBER THREE +10D33 ; 3.0 ; ; 3 # Nd HANIFI ROHINGYA DIGIT THREE +10D43 ; 3.0 ; ; 3 # Nd GARAY DIGIT THREE +10E62 ; 3.0 ; ; 3 # No RUMI DIGIT THREE +10F1F ; 3.0 ; ; 3 # No OLD SOGDIAN NUMBER THREE +10FC7 ; 3.0 ; ; 3 # No CHORASMIAN NUMBER THREE +11054 ; 3.0 ; ; 3 # No BRAHMI NUMBER THREE +11069 ; 3.0 ; ; 3 # Nd BRAHMI DIGIT THREE +110F3 ; 3.0 ; ; 3 # Nd SORA SOMPENG DIGIT THREE +11139 ; 3.0 ; ; 3 # Nd CHAKMA DIGIT THREE +111D3 ; 3.0 ; ; 3 # Nd SHARADA DIGIT THREE +111E3 ; 3.0 ; ; 3 # No SINHALA ARCHAIC DIGIT THREE +112F3 ; 3.0 ; ; 3 # Nd KHUDAWADI DIGIT THREE +11453 ; 3.0 ; ; 3 # Nd NEWA DIGIT THREE +114D3 ; 3.0 ; ; 3 # Nd TIRHUTA DIGIT THREE +11653 ; 3.0 ; ; 3 # Nd MODI DIGIT THREE +116C3 ; 3.0 ; ; 3 # Nd TAKRI DIGIT THREE +116D3 ; 3.0 ; ; 3 # Nd MYANMAR PAO DIGIT THREE +116DD ; 3.0 ; ; 3 # Nd MYANMAR EASTERN PWO KAREN DIGIT THREE +11733 ; 3.0 ; ; 3 # Nd AHOM DIGIT THREE +118E3 ; 3.0 ; ; 3 # Nd WARANG CITI DIGIT THREE +11953 ; 3.0 ; ; 3 # Nd DIVES AKURU DIGIT THREE +11BF3 ; 3.0 ; ; 3 # Nd SUNUWAR DIGIT THREE +11C53 ; 3.0 ; ; 3 # Nd BHAIKSUKI DIGIT THREE +11C5C ; 3.0 ; ; 3 # No BHAIKSUKI NUMBER THREE +11D53 ; 3.0 ; ; 3 # Nd MASARAM GONDI DIGIT THREE +11DA3 ; 3.0 ; ; 3 # Nd GUNJALA GONDI DIGIT THREE +11DE3 ; 3.0 ; ; 3 # Nd TOLONG SIKI DIGIT THREE +11F53 ; 3.0 ; ; 3 # Nd KAWI DIGIT THREE +1230D ; 3.0 ; ; 3 # Lo CUNEIFORM SIGN U U U +12401 ; 3.0 ; ; 3 # Nl CUNEIFORM NUMERIC SIGN THREE ASH +12408 ; 3.0 ; ; 3 # Nl CUNEIFORM NUMERIC SIGN THREE DISH +12417 ; 3.0 ; ; 3 # Nl CUNEIFORM NUMERIC SIGN THREE GESH2 +12420 ; 3.0 ; ; 3 # Nl CUNEIFORM NUMERIC SIGN THREE GESHU +12424..12425 ; 3.0 ; ; 3 # Nl [2] CUNEIFORM NUMERIC SIGN THREE SHAR2..CUNEIFORM NUMERIC SIGN THREE SHAR2 VARIANT FORM +1242E..1242F ; 3.0 ; ; 3 # Nl [2] CUNEIFORM NUMERIC SIGN THREE SHARU..CUNEIFORM NUMERIC SIGN THREE SHARU VARIANT FORM +12436..12437 ; 3.0 ; ; 3 # Nl [2] CUNEIFORM NUMERIC SIGN THREE BURU..CUNEIFORM NUMERIC SIGN THREE BURU VARIANT FORM +1243A..1243B ; 3.0 ; ; 3 # Nl [2] CUNEIFORM NUMERIC SIGN THREE VARIANT FORM ESH16..CUNEIFORM NUMERIC SIGN THREE VARIANT FORM ESH21 +1244B ; 3.0 ; ; 3 # Nl CUNEIFORM NUMERIC SIGN THREE ASH TENU +12451 ; 3.0 ; ; 3 # Nl CUNEIFORM NUMERIC SIGN THREE BAN2 +12457 ; 3.0 ; ; 3 # Nl CUNEIFORM NUMERIC SIGN NIGIDAESH +16133 ; 3.0 ; ; 3 # Nd GURUNG KHEMA DIGIT THREE +16A63 ; 3.0 ; ; 3 # Nd MRO DIGIT THREE +16AC3 ; 3.0 ; ; 3 # Nd TANGSA DIGIT THREE +16B53 ; 3.0 ; ; 3 # Nd PAHAWH HMONG DIGIT THREE +16D73 ; 3.0 ; ; 3 # Nd KIRAT RAI DIGIT THREE +16E83 ; 3.0 ; ; 3 # No MEDEFAIDRIN DIGIT THREE +16E96 ; 3.0 ; ; 3 # No MEDEFAIDRIN DIGIT THREE ALTERNATE FORM +1CCF3 ; 3.0 ; ; 3 # Nd OUTLINED DIGIT THREE +1D2C3 ; 3.0 ; ; 3 # No KAKTOVIK NUMERAL THREE +1D2E3 ; 3.0 ; ; 3 # No MAYAN NUMERAL THREE +1D362 ; 3.0 ; ; 3 # No COUNTING ROD UNIT DIGIT THREE +1D374 ; 3.0 ; ; 3 # No IDEOGRAPHIC TALLY MARK THREE +1D7D1 ; 3.0 ; ; 3 # Nd MATHEMATICAL BOLD DIGIT THREE +1D7DB ; 3.0 ; ; 3 # Nd MATHEMATICAL DOUBLE-STRUCK DIGIT THREE +1D7E5 ; 3.0 ; ; 3 # Nd MATHEMATICAL SANS-SERIF DIGIT THREE +1D7EF ; 3.0 ; ; 3 # Nd MATHEMATICAL SANS-SERIF BOLD DIGIT THREE +1D7F9 ; 3.0 ; ; 3 # Nd MATHEMATICAL MONOSPACE DIGIT THREE +1E143 ; 3.0 ; ; 3 # Nd NYIAKENG PUACHUE HMONG DIGIT THREE +1E2F3 ; 3.0 ; ; 3 # Nd WANCHO DIGIT THREE +1E4F3 ; 3.0 ; ; 3 # Nd NAG MUNDARI DIGIT THREE +1E5F4 ; 3.0 ; ; 3 # Nd OL ONAL DIGIT THREE +1E8C9 ; 3.0 ; ; 3 # No MENDE KIKAKUI DIGIT THREE +1E953 ; 3.0 ; ; 3 # Nd ADLAM DIGIT THREE +1EC73 ; 3.0 ; ; 3 # No INDIC SIYAQ NUMBER THREE +1ECA5 ; 3.0 ; ; 3 # No INDIC SIYAQ NUMBER PREFIXED THREE +1ED03 ; 3.0 ; ; 3 # No OTTOMAN SIYAQ NUMBER THREE +1ED30 ; 3.0 ; ; 3 # No OTTOMAN SIYAQ ALTERNATE NUMBER THREE +1F104 ; 3.0 ; ; 3 # No DIGIT THREE COMMA +1FBF3 ; 3.0 ; ; 3 # Nd SEGMENTED DIGIT THREE +20AFD ; 3.0 ; ; 3 # Lo CJK UNIFIED IDEOGRAPH-20AFD +20B19 ; 3.0 ; ; 3 # Lo CJK UNIFIED IDEOGRAPH-20B19 +22998 ; 3.0 ; ; 3 # Lo CJK UNIFIED IDEOGRAPH-22998 +23B1B ; 3.0 ; ; 3 # Lo CJK UNIFIED IDEOGRAPH-23B1B + +# Total code points: 154 + +# ================================================ + +0F2D ; 3.5 ; ; 7/2 # No TIBETAN DIGIT HALF FOUR + +# Total code points: 1 + +# ================================================ + +0034 ; 4.0 ; ; 4 # Nd DIGIT FOUR +0664 ; 4.0 ; ; 4 # Nd ARABIC-INDIC DIGIT FOUR +06F4 ; 4.0 ; ; 4 # Nd EXTENDED ARABIC-INDIC DIGIT FOUR +07C4 ; 4.0 ; ; 4 # Nd NKO DIGIT FOUR +096A ; 4.0 ; ; 4 # Nd DEVANAGARI DIGIT FOUR +09EA ; 4.0 ; ; 4 # Nd BENGALI DIGIT FOUR +0A6A ; 4.0 ; ; 4 # Nd GURMUKHI DIGIT FOUR +0AEA ; 4.0 ; ; 4 # Nd GUJARATI DIGIT FOUR +0B6A ; 4.0 ; ; 4 # Nd ORIYA DIGIT FOUR +0BEA ; 4.0 ; ; 4 # Nd TAMIL DIGIT FOUR +0C6A ; 4.0 ; ; 4 # Nd TELUGU DIGIT FOUR +0CEA ; 4.0 ; ; 4 # Nd KANNADA DIGIT FOUR +0D6A ; 4.0 ; ; 4 # Nd MALAYALAM DIGIT FOUR +0DEA ; 4.0 ; ; 4 # Nd SINHALA LITH DIGIT FOUR +0E54 ; 4.0 ; ; 4 # Nd THAI DIGIT FOUR +0ED4 ; 4.0 ; ; 4 # Nd LAO DIGIT FOUR +0F24 ; 4.0 ; ; 4 # Nd TIBETAN DIGIT FOUR +1044 ; 4.0 ; ; 4 # Nd MYANMAR DIGIT FOUR +1094 ; 4.0 ; ; 4 # Nd MYANMAR SHAN DIGIT FOUR +136C ; 4.0 ; ; 4 # No ETHIOPIC DIGIT FOUR +17E4 ; 4.0 ; ; 4 # Nd KHMER DIGIT FOUR +17F4 ; 4.0 ; ; 4 # No KHMER SYMBOL LEK ATTAK BUON +1814 ; 4.0 ; ; 4 # Nd MONGOLIAN DIGIT FOUR +194A ; 4.0 ; ; 4 # Nd LIMBU DIGIT FOUR +19D4 ; 4.0 ; ; 4 # Nd NEW TAI LUE DIGIT FOUR +1A84 ; 4.0 ; ; 4 # Nd TAI THAM HORA DIGIT FOUR +1A94 ; 4.0 ; ; 4 # Nd TAI THAM THAM DIGIT FOUR +1B54 ; 4.0 ; ; 4 # Nd BALINESE DIGIT FOUR +1BB4 ; 4.0 ; ; 4 # Nd SUNDANESE DIGIT FOUR +1C44 ; 4.0 ; ; 4 # Nd LEPCHA DIGIT FOUR +1C54 ; 4.0 ; ; 4 # Nd OL CHIKI DIGIT FOUR +2074 ; 4.0 ; ; 4 # No SUPERSCRIPT FOUR +2084 ; 4.0 ; ; 4 # No SUBSCRIPT FOUR +2163 ; 4.0 ; ; 4 # Nl ROMAN NUMERAL FOUR +2173 ; 4.0 ; ; 4 # Nl SMALL ROMAN NUMERAL FOUR +2463 ; 4.0 ; ; 4 # No CIRCLED DIGIT FOUR +2477 ; 4.0 ; ; 4 # No PARENTHESIZED DIGIT FOUR +248B ; 4.0 ; ; 4 # No DIGIT FOUR FULL STOP +24F8 ; 4.0 ; ; 4 # No DOUBLE CIRCLED DIGIT FOUR +2779 ; 4.0 ; ; 4 # No DINGBAT NEGATIVE CIRCLED DIGIT FOUR +2783 ; 4.0 ; ; 4 # No DINGBAT CIRCLED SANS-SERIF DIGIT FOUR +278D ; 4.0 ; ; 4 # No DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT FOUR +3024 ; 4.0 ; ; 4 # Nl HANGZHOU NUMERAL FOUR +3195 ; 4.0 ; ; 4 # No IDEOGRAPHIC ANNOTATION FOUR MARK +3223 ; 4.0 ; ; 4 # No PARENTHESIZED IDEOGRAPH FOUR +3283 ; 4.0 ; ; 4 # No CIRCLED IDEOGRAPH FOUR +4E96 ; 4.0 ; ; 4 # Lo CJK UNIFIED IDEOGRAPH-4E96 +56DB ; 4.0 ; ; 4 # Lo CJK UNIFIED IDEOGRAPH-56DB +8086 ; 4.0 ; ; 4 # Lo CJK UNIFIED IDEOGRAPH-8086 +A624 ; 4.0 ; ; 4 # Nd VAI DIGIT FOUR +A6E9 ; 4.0 ; ; 4 # Nl BAMUM LETTER KPA +A8D4 ; 4.0 ; ; 4 # Nd SAURASHTRA DIGIT FOUR +A904 ; 4.0 ; ; 4 # Nd KAYAH LI DIGIT FOUR +A9D4 ; 4.0 ; ; 4 # Nd JAVANESE DIGIT FOUR +A9F4 ; 4.0 ; ; 4 # Nd MYANMAR TAI LAING DIGIT FOUR +AA54 ; 4.0 ; ; 4 # Nd CHAM DIGIT FOUR +ABF4 ; 4.0 ; ; 4 # Nd MEETEI MAYEK DIGIT FOUR +FF14 ; 4.0 ; ; 4 # Nd FULLWIDTH DIGIT FOUR +1010A ; 4.0 ; ; 4 # No AEGEAN NUMBER FOUR +102E4 ; 4.0 ; ; 4 # No COPTIC EPACT DIGIT FOUR +104A4 ; 4.0 ; ; 4 # Nd OSMANYA DIGIT FOUR +1087C ; 4.0 ; ; 4 # No PALMYRENE NUMBER FOUR +108AA..108AB ; 4.0 ; ; 4 # No [2] NABATAEAN NUMBER FOUR..NABATAEAN CRUCIFORM NUMBER FOUR +109C3 ; 4.0 ; ; 4 # No MEROITIC CURSIVE NUMBER FOUR +10A43 ; 4.0 ; ; 4 # No KHAROSHTHI DIGIT FOUR +10B5B ; 4.0 ; ; 4 # No INSCRIPTIONAL PARTHIAN NUMBER FOUR +10B7B ; 4.0 ; ; 4 # No INSCRIPTIONAL PAHLAVI NUMBER FOUR +10BAC ; 4.0 ; ; 4 # No PSALTER PAHLAVI NUMBER FOUR +10D34 ; 4.0 ; ; 4 # Nd HANIFI ROHINGYA DIGIT FOUR +10D44 ; 4.0 ; ; 4 # Nd GARAY DIGIT FOUR +10E63 ; 4.0 ; ; 4 # No RUMI DIGIT FOUR +10F20 ; 4.0 ; ; 4 # No OLD SOGDIAN NUMBER FOUR +10FC8 ; 4.0 ; ; 4 # No CHORASMIAN NUMBER FOUR +11055 ; 4.0 ; ; 4 # No BRAHMI NUMBER FOUR +1106A ; 4.0 ; ; 4 # Nd BRAHMI DIGIT FOUR +110F4 ; 4.0 ; ; 4 # Nd SORA SOMPENG DIGIT FOUR +1113A ; 4.0 ; ; 4 # Nd CHAKMA DIGIT FOUR +111D4 ; 4.0 ; ; 4 # Nd SHARADA DIGIT FOUR +111E4 ; 4.0 ; ; 4 # No SINHALA ARCHAIC DIGIT FOUR +112F4 ; 4.0 ; ; 4 # Nd KHUDAWADI DIGIT FOUR +11454 ; 4.0 ; ; 4 # Nd NEWA DIGIT FOUR +114D4 ; 4.0 ; ; 4 # Nd TIRHUTA DIGIT FOUR +11654 ; 4.0 ; ; 4 # Nd MODI DIGIT FOUR +116C4 ; 4.0 ; ; 4 # Nd TAKRI DIGIT FOUR +116D4 ; 4.0 ; ; 4 # Nd MYANMAR PAO DIGIT FOUR +116DE ; 4.0 ; ; 4 # Nd MYANMAR EASTERN PWO KAREN DIGIT FOUR +11734 ; 4.0 ; ; 4 # Nd AHOM DIGIT FOUR +118E4 ; 4.0 ; ; 4 # Nd WARANG CITI DIGIT FOUR +11954 ; 4.0 ; ; 4 # Nd DIVES AKURU DIGIT FOUR +11BF4 ; 4.0 ; ; 4 # Nd SUNUWAR DIGIT FOUR +11C54 ; 4.0 ; ; 4 # Nd BHAIKSUKI DIGIT FOUR +11C5D ; 4.0 ; ; 4 # No BHAIKSUKI NUMBER FOUR +11D54 ; 4.0 ; ; 4 # Nd MASARAM GONDI DIGIT FOUR +11DA4 ; 4.0 ; ; 4 # Nd GUNJALA GONDI DIGIT FOUR +11DE4 ; 4.0 ; ; 4 # Nd TOLONG SIKI DIGIT FOUR +11F54 ; 4.0 ; ; 4 # Nd KAWI DIGIT FOUR +12402 ; 4.0 ; ; 4 # Nl CUNEIFORM NUMERIC SIGN FOUR ASH +12409 ; 4.0 ; ; 4 # Nl CUNEIFORM NUMERIC SIGN FOUR DISH +1240F ; 4.0 ; ; 4 # Nl CUNEIFORM NUMERIC SIGN FOUR U +12418 ; 4.0 ; ; 4 # Nl CUNEIFORM NUMERIC SIGN FOUR GESH2 +12421 ; 4.0 ; ; 4 # Nl CUNEIFORM NUMERIC SIGN FOUR GESHU +12426 ; 4.0 ; ; 4 # Nl CUNEIFORM NUMERIC SIGN FOUR SHAR2 +12430 ; 4.0 ; ; 4 # Nl CUNEIFORM NUMERIC SIGN FOUR SHARU +12438 ; 4.0 ; ; 4 # Nl CUNEIFORM NUMERIC SIGN FOUR BURU +1243C..1243F ; 4.0 ; ; 4 # Nl [4] CUNEIFORM NUMERIC SIGN FOUR VARIANT FORM LIMMU..CUNEIFORM NUMERIC SIGN FOUR VARIANT FORM LIMMU B +1244C ; 4.0 ; ; 4 # Nl CUNEIFORM NUMERIC SIGN FOUR ASH TENU +12452..12453 ; 4.0 ; ; 4 # Nl [2] CUNEIFORM NUMERIC SIGN FOUR BAN2..CUNEIFORM NUMERIC SIGN FOUR BAN2 VARIANT FORM +12469 ; 4.0 ; ; 4 # Nl CUNEIFORM NUMERIC SIGN FOUR U VARIANT FORM +16134 ; 4.0 ; ; 4 # Nd GURUNG KHEMA DIGIT FOUR +16A64 ; 4.0 ; ; 4 # Nd MRO DIGIT FOUR +16AC4 ; 4.0 ; ; 4 # Nd TANGSA DIGIT FOUR +16B54 ; 4.0 ; ; 4 # Nd PAHAWH HMONG DIGIT FOUR +16D74 ; 4.0 ; ; 4 # Nd KIRAT RAI DIGIT FOUR +16E84 ; 4.0 ; ; 4 # No MEDEFAIDRIN DIGIT FOUR +1CCF4 ; 4.0 ; ; 4 # Nd OUTLINED DIGIT FOUR +1D2C4 ; 4.0 ; ; 4 # No KAKTOVIK NUMERAL FOUR +1D2E4 ; 4.0 ; ; 4 # No MAYAN NUMERAL FOUR +1D363 ; 4.0 ; ; 4 # No COUNTING ROD UNIT DIGIT FOUR +1D375 ; 4.0 ; ; 4 # No IDEOGRAPHIC TALLY MARK FOUR +1D7D2 ; 4.0 ; ; 4 # Nd MATHEMATICAL BOLD DIGIT FOUR +1D7DC ; 4.0 ; ; 4 # Nd MATHEMATICAL DOUBLE-STRUCK DIGIT FOUR +1D7E6 ; 4.0 ; ; 4 # Nd MATHEMATICAL SANS-SERIF DIGIT FOUR +1D7F0 ; 4.0 ; ; 4 # Nd MATHEMATICAL SANS-SERIF BOLD DIGIT FOUR +1D7FA ; 4.0 ; ; 4 # Nd MATHEMATICAL MONOSPACE DIGIT FOUR +1E144 ; 4.0 ; ; 4 # Nd NYIAKENG PUACHUE HMONG DIGIT FOUR +1E2F4 ; 4.0 ; ; 4 # Nd WANCHO DIGIT FOUR +1E4F4 ; 4.0 ; ; 4 # Nd NAG MUNDARI DIGIT FOUR +1E5F5 ; 4.0 ; ; 4 # Nd OL ONAL DIGIT FOUR +1E8CA ; 4.0 ; ; 4 # No MENDE KIKAKUI DIGIT FOUR +1E954 ; 4.0 ; ; 4 # Nd ADLAM DIGIT FOUR +1EC74 ; 4.0 ; ; 4 # No INDIC SIYAQ NUMBER FOUR +1ECA6 ; 4.0 ; ; 4 # No INDIC SIYAQ NUMBER PREFIXED FOUR +1ED04 ; 4.0 ; ; 4 # No OTTOMAN SIYAQ NUMBER FOUR +1ED31 ; 4.0 ; ; 4 # No OTTOMAN SIYAQ ALTERNATE NUMBER FOUR +1F105 ; 4.0 ; ; 4 # No DIGIT FOUR COMMA +1FBF4 ; 4.0 ; ; 4 # Nd SEGMENTED DIGIT FOUR +20064 ; 4.0 ; ; 4 # Lo CJK UNIFIED IDEOGRAPH-20064 +200E2 ; 4.0 ; ; 4 # Lo CJK UNIFIED IDEOGRAPH-200E2 +2626D ; 4.0 ; ; 4 # Lo CJK UNIFIED IDEOGRAPH-2626D + +# Total code points: 144 + +# ================================================ + +0F2E ; 4.5 ; ; 9/2 # No TIBETAN DIGIT HALF FIVE + +# Total code points: 1 + +# ================================================ + +0035 ; 5.0 ; ; 5 # Nd DIGIT FIVE +0665 ; 5.0 ; ; 5 # Nd ARABIC-INDIC DIGIT FIVE +06F5 ; 5.0 ; ; 5 # Nd EXTENDED ARABIC-INDIC DIGIT FIVE +07C5 ; 5.0 ; ; 5 # Nd NKO DIGIT FIVE +096B ; 5.0 ; ; 5 # Nd DEVANAGARI DIGIT FIVE +09EB ; 5.0 ; ; 5 # Nd BENGALI DIGIT FIVE +0A6B ; 5.0 ; ; 5 # Nd GURMUKHI DIGIT FIVE +0AEB ; 5.0 ; ; 5 # Nd GUJARATI DIGIT FIVE +0B6B ; 5.0 ; ; 5 # Nd ORIYA DIGIT FIVE +0BEB ; 5.0 ; ; 5 # Nd TAMIL DIGIT FIVE +0C6B ; 5.0 ; ; 5 # Nd TELUGU DIGIT FIVE +0CEB ; 5.0 ; ; 5 # Nd KANNADA DIGIT FIVE +0D6B ; 5.0 ; ; 5 # Nd MALAYALAM DIGIT FIVE +0DEB ; 5.0 ; ; 5 # Nd SINHALA LITH DIGIT FIVE +0E55 ; 5.0 ; ; 5 # Nd THAI DIGIT FIVE +0ED5 ; 5.0 ; ; 5 # Nd LAO DIGIT FIVE +0F25 ; 5.0 ; ; 5 # Nd TIBETAN DIGIT FIVE +1045 ; 5.0 ; ; 5 # Nd MYANMAR DIGIT FIVE +1095 ; 5.0 ; ; 5 # Nd MYANMAR SHAN DIGIT FIVE +136D ; 5.0 ; ; 5 # No ETHIOPIC DIGIT FIVE +17E5 ; 5.0 ; ; 5 # Nd KHMER DIGIT FIVE +17F5 ; 5.0 ; ; 5 # No KHMER SYMBOL LEK ATTAK PRAM +1815 ; 5.0 ; ; 5 # Nd MONGOLIAN DIGIT FIVE +194B ; 5.0 ; ; 5 # Nd LIMBU DIGIT FIVE +19D5 ; 5.0 ; ; 5 # Nd NEW TAI LUE DIGIT FIVE +1A85 ; 5.0 ; ; 5 # Nd TAI THAM HORA DIGIT FIVE +1A95 ; 5.0 ; ; 5 # Nd TAI THAM THAM DIGIT FIVE +1B55 ; 5.0 ; ; 5 # Nd BALINESE DIGIT FIVE +1BB5 ; 5.0 ; ; 5 # Nd SUNDANESE DIGIT FIVE +1C45 ; 5.0 ; ; 5 # Nd LEPCHA DIGIT FIVE +1C55 ; 5.0 ; ; 5 # Nd OL CHIKI DIGIT FIVE +2075 ; 5.0 ; ; 5 # No SUPERSCRIPT FIVE +2085 ; 5.0 ; ; 5 # No SUBSCRIPT FIVE +2164 ; 5.0 ; ; 5 # Nl ROMAN NUMERAL FIVE +2174 ; 5.0 ; ; 5 # Nl SMALL ROMAN NUMERAL FIVE +2464 ; 5.0 ; ; 5 # No CIRCLED DIGIT FIVE +2478 ; 5.0 ; ; 5 # No PARENTHESIZED DIGIT FIVE +248C ; 5.0 ; ; 5 # No DIGIT FIVE FULL STOP +24F9 ; 5.0 ; ; 5 # No DOUBLE CIRCLED DIGIT FIVE +277A ; 5.0 ; ; 5 # No DINGBAT NEGATIVE CIRCLED DIGIT FIVE +2784 ; 5.0 ; ; 5 # No DINGBAT CIRCLED SANS-SERIF DIGIT FIVE +278E ; 5.0 ; ; 5 # No DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT FIVE +3025 ; 5.0 ; ; 5 # Nl HANGZHOU NUMERAL FIVE +3224 ; 5.0 ; ; 5 # No PARENTHESIZED IDEOGRAPH FIVE +3284 ; 5.0 ; ; 5 # No CIRCLED IDEOGRAPH FIVE +3405 ; 5.0 ; ; 5 # Lo CJK UNIFIED IDEOGRAPH-3405 +382A ; 5.0 ; ; 5 # Lo CJK UNIFIED IDEOGRAPH-382A +4E94 ; 5.0 ; ; 5 # Lo CJK UNIFIED IDEOGRAPH-4E94 +4F0D ; 5.0 ; ; 5 # Lo CJK UNIFIED IDEOGRAPH-4F0D +A625 ; 5.0 ; ; 5 # Nd VAI DIGIT FIVE +A6EA ; 5.0 ; ; 5 # Nl BAMUM LETTER TEN +A8D5 ; 5.0 ; ; 5 # Nd SAURASHTRA DIGIT FIVE +A905 ; 5.0 ; ; 5 # Nd KAYAH LI DIGIT FIVE +A9D5 ; 5.0 ; ; 5 # Nd JAVANESE DIGIT FIVE +A9F5 ; 5.0 ; ; 5 # Nd MYANMAR TAI LAING DIGIT FIVE +AA55 ; 5.0 ; ; 5 # Nd CHAM DIGIT FIVE +ABF5 ; 5.0 ; ; 5 # Nd MEETEI MAYEK DIGIT FIVE +FF15 ; 5.0 ; ; 5 # Nd FULLWIDTH DIGIT FIVE +1010B ; 5.0 ; ; 5 # No AEGEAN NUMBER FIVE +10143 ; 5.0 ; ; 5 # Nl GREEK ACROPHONIC ATTIC FIVE +10148 ; 5.0 ; ; 5 # Nl GREEK ACROPHONIC ATTIC FIVE TALENTS +1014F ; 5.0 ; ; 5 # Nl GREEK ACROPHONIC ATTIC FIVE STATERS +1015F ; 5.0 ; ; 5 # Nl GREEK ACROPHONIC TROEZENIAN FIVE +10173 ; 5.0 ; ; 5 # Nl GREEK ACROPHONIC DELPHIC FIVE MNAS +102E5 ; 5.0 ; ; 5 # No COPTIC EPACT DIGIT FIVE +10321 ; 5.0 ; ; 5 # No OLD ITALIC NUMERAL FIVE +104A5 ; 5.0 ; ; 5 # Nd OSMANYA DIGIT FIVE +1087D ; 5.0 ; ; 5 # No PALMYRENE NUMBER FIVE +108AC ; 5.0 ; ; 5 # No NABATAEAN NUMBER FIVE +108FC ; 5.0 ; ; 5 # No HATRAN NUMBER FIVE +109C4 ; 5.0 ; ; 5 # No MEROITIC CURSIVE NUMBER FIVE +10AEC ; 5.0 ; ; 5 # No MANICHAEAN NUMBER FIVE +10CFB ; 5.0 ; ; 5 # No OLD HUNGARIAN NUMBER FIVE +10D35 ; 5.0 ; ; 5 # Nd HANIFI ROHINGYA DIGIT FIVE +10D45 ; 5.0 ; ; 5 # Nd GARAY DIGIT FIVE +10E64 ; 5.0 ; ; 5 # No RUMI DIGIT FIVE +10F21 ; 5.0 ; ; 5 # No OLD SOGDIAN NUMBER FIVE +11056 ; 5.0 ; ; 5 # No BRAHMI NUMBER FIVE +1106B ; 5.0 ; ; 5 # Nd BRAHMI DIGIT FIVE +110F5 ; 5.0 ; ; 5 # Nd SORA SOMPENG DIGIT FIVE +1113B ; 5.0 ; ; 5 # Nd CHAKMA DIGIT FIVE +111D5 ; 5.0 ; ; 5 # Nd SHARADA DIGIT FIVE +111E5 ; 5.0 ; ; 5 # No SINHALA ARCHAIC DIGIT FIVE +112F5 ; 5.0 ; ; 5 # Nd KHUDAWADI DIGIT FIVE +11455 ; 5.0 ; ; 5 # Nd NEWA DIGIT FIVE +114D5 ; 5.0 ; ; 5 # Nd TIRHUTA DIGIT FIVE +11655 ; 5.0 ; ; 5 # Nd MODI DIGIT FIVE +116C5 ; 5.0 ; ; 5 # Nd TAKRI DIGIT FIVE +116D5 ; 5.0 ; ; 5 # Nd MYANMAR PAO DIGIT FIVE +116DF ; 5.0 ; ; 5 # Nd MYANMAR EASTERN PWO KAREN DIGIT FIVE +11735 ; 5.0 ; ; 5 # Nd AHOM DIGIT FIVE +118E5 ; 5.0 ; ; 5 # Nd WARANG CITI DIGIT FIVE +11955 ; 5.0 ; ; 5 # Nd DIVES AKURU DIGIT FIVE +11BF5 ; 5.0 ; ; 5 # Nd SUNUWAR DIGIT FIVE +11C55 ; 5.0 ; ; 5 # Nd BHAIKSUKI DIGIT FIVE +11C5E ; 5.0 ; ; 5 # No BHAIKSUKI NUMBER FIVE +11D55 ; 5.0 ; ; 5 # Nd MASARAM GONDI DIGIT FIVE +11DA5 ; 5.0 ; ; 5 # Nd GUNJALA GONDI DIGIT FIVE +11DE5 ; 5.0 ; ; 5 # Nd TOLONG SIKI DIGIT FIVE +11F55 ; 5.0 ; ; 5 # Nd KAWI DIGIT FIVE +12403 ; 5.0 ; ; 5 # Nl CUNEIFORM NUMERIC SIGN FIVE ASH +1240A ; 5.0 ; ; 5 # Nl CUNEIFORM NUMERIC SIGN FIVE DISH +12410 ; 5.0 ; ; 5 # Nl CUNEIFORM NUMERIC SIGN FIVE U +12419 ; 5.0 ; ; 5 # Nl CUNEIFORM NUMERIC SIGN FIVE GESH2 +12422 ; 5.0 ; ; 5 # Nl CUNEIFORM NUMERIC SIGN FIVE GESHU +12427 ; 5.0 ; ; 5 # Nl CUNEIFORM NUMERIC SIGN FIVE SHAR2 +12431 ; 5.0 ; ; 5 # Nl CUNEIFORM NUMERIC SIGN FIVE SHARU +12439 ; 5.0 ; ; 5 # Nl CUNEIFORM NUMERIC SIGN FIVE BURU +1244D ; 5.0 ; ; 5 # Nl CUNEIFORM NUMERIC SIGN FIVE ASH TENU +12454..12455 ; 5.0 ; ; 5 # Nl [2] CUNEIFORM NUMERIC SIGN FIVE BAN2..CUNEIFORM NUMERIC SIGN FIVE BAN2 VARIANT FORM +1246A ; 5.0 ; ; 5 # Nl CUNEIFORM NUMERIC SIGN FIVE U VARIANT FORM +16135 ; 5.0 ; ; 5 # Nd GURUNG KHEMA DIGIT FIVE +16A65 ; 5.0 ; ; 5 # Nd MRO DIGIT FIVE +16AC5 ; 5.0 ; ; 5 # Nd TANGSA DIGIT FIVE +16B55 ; 5.0 ; ; 5 # Nd PAHAWH HMONG DIGIT FIVE +16D75 ; 5.0 ; ; 5 # Nd KIRAT RAI DIGIT FIVE +16E85 ; 5.0 ; ; 5 # No MEDEFAIDRIN DIGIT FIVE +1CCF5 ; 5.0 ; ; 5 # Nd OUTLINED DIGIT FIVE +1D2C5 ; 5.0 ; ; 5 # No KAKTOVIK NUMERAL FIVE +1D2E5 ; 5.0 ; ; 5 # No MAYAN NUMERAL FIVE +1D364 ; 5.0 ; ; 5 # No COUNTING ROD UNIT DIGIT FIVE +1D376 ; 5.0 ; ; 5 # No IDEOGRAPHIC TALLY MARK FIVE +1D378 ; 5.0 ; ; 5 # No TALLY MARK FIVE +1D7D3 ; 5.0 ; ; 5 # Nd MATHEMATICAL BOLD DIGIT FIVE +1D7DD ; 5.0 ; ; 5 # Nd MATHEMATICAL DOUBLE-STRUCK DIGIT FIVE +1D7E7 ; 5.0 ; ; 5 # Nd MATHEMATICAL SANS-SERIF DIGIT FIVE +1D7F1 ; 5.0 ; ; 5 # Nd MATHEMATICAL SANS-SERIF BOLD DIGIT FIVE +1D7FB ; 5.0 ; ; 5 # Nd MATHEMATICAL MONOSPACE DIGIT FIVE +1E145 ; 5.0 ; ; 5 # Nd NYIAKENG PUACHUE HMONG DIGIT FIVE +1E2F5 ; 5.0 ; ; 5 # Nd WANCHO DIGIT FIVE +1E4F5 ; 5.0 ; ; 5 # Nd NAG MUNDARI DIGIT FIVE +1E5F6 ; 5.0 ; ; 5 # Nd OL ONAL DIGIT FIVE +1E8CB ; 5.0 ; ; 5 # No MENDE KIKAKUI DIGIT FIVE +1E955 ; 5.0 ; ; 5 # Nd ADLAM DIGIT FIVE +1EC75 ; 5.0 ; ; 5 # No INDIC SIYAQ NUMBER FIVE +1ECA7 ; 5.0 ; ; 5 # No INDIC SIYAQ NUMBER PREFIXED FIVE +1ED05 ; 5.0 ; ; 5 # No OTTOMAN SIYAQ NUMBER FIVE +1ED32 ; 5.0 ; ; 5 # No OTTOMAN SIYAQ ALTERNATE NUMBER FIVE +1F106 ; 5.0 ; ; 5 # No DIGIT FIVE COMMA +1FBF5 ; 5.0 ; ; 5 # Nd SEGMENTED DIGIT FIVE +20121 ; 5.0 ; ; 5 # Lo CJK UNIFIED IDEOGRAPH-20121 + +# Total code points: 142 + +# ================================================ + +0F2F ; 5.5 ; ; 11/2 # No TIBETAN DIGIT HALF SIX + +# Total code points: 1 + +# ================================================ + +0036 ; 6.0 ; ; 6 # Nd DIGIT SIX +0666 ; 6.0 ; ; 6 # Nd ARABIC-INDIC DIGIT SIX +06F6 ; 6.0 ; ; 6 # Nd EXTENDED ARABIC-INDIC DIGIT SIX +07C6 ; 6.0 ; ; 6 # Nd NKO DIGIT SIX +096C ; 6.0 ; ; 6 # Nd DEVANAGARI DIGIT SIX +09EC ; 6.0 ; ; 6 # Nd BENGALI DIGIT SIX +0A6C ; 6.0 ; ; 6 # Nd GURMUKHI DIGIT SIX +0AEC ; 6.0 ; ; 6 # Nd GUJARATI DIGIT SIX +0B6C ; 6.0 ; ; 6 # Nd ORIYA DIGIT SIX +0BEC ; 6.0 ; ; 6 # Nd TAMIL DIGIT SIX +0C6C ; 6.0 ; ; 6 # Nd TELUGU DIGIT SIX +0CEC ; 6.0 ; ; 6 # Nd KANNADA DIGIT SIX +0D6C ; 6.0 ; ; 6 # Nd MALAYALAM DIGIT SIX +0DEC ; 6.0 ; ; 6 # Nd SINHALA LITH DIGIT SIX +0E56 ; 6.0 ; ; 6 # Nd THAI DIGIT SIX +0ED6 ; 6.0 ; ; 6 # Nd LAO DIGIT SIX +0F26 ; 6.0 ; ; 6 # Nd TIBETAN DIGIT SIX +1046 ; 6.0 ; ; 6 # Nd MYANMAR DIGIT SIX +1096 ; 6.0 ; ; 6 # Nd MYANMAR SHAN DIGIT SIX +136E ; 6.0 ; ; 6 # No ETHIOPIC DIGIT SIX +17E6 ; 6.0 ; ; 6 # Nd KHMER DIGIT SIX +17F6 ; 6.0 ; ; 6 # No KHMER SYMBOL LEK ATTAK PRAM-MUOY +1816 ; 6.0 ; ; 6 # Nd MONGOLIAN DIGIT SIX +194C ; 6.0 ; ; 6 # Nd LIMBU DIGIT SIX +19D6 ; 6.0 ; ; 6 # Nd NEW TAI LUE DIGIT SIX +1A86 ; 6.0 ; ; 6 # Nd TAI THAM HORA DIGIT SIX +1A96 ; 6.0 ; ; 6 # Nd TAI THAM THAM DIGIT SIX +1B56 ; 6.0 ; ; 6 # Nd BALINESE DIGIT SIX +1BB6 ; 6.0 ; ; 6 # Nd SUNDANESE DIGIT SIX +1C46 ; 6.0 ; ; 6 # Nd LEPCHA DIGIT SIX +1C56 ; 6.0 ; ; 6 # Nd OL CHIKI DIGIT SIX +2076 ; 6.0 ; ; 6 # No SUPERSCRIPT SIX +2086 ; 6.0 ; ; 6 # No SUBSCRIPT SIX +2165 ; 6.0 ; ; 6 # Nl ROMAN NUMERAL SIX +2175 ; 6.0 ; ; 6 # Nl SMALL ROMAN NUMERAL SIX +2185 ; 6.0 ; ; 6 # Nl ROMAN NUMERAL SIX LATE FORM +2465 ; 6.0 ; ; 6 # No CIRCLED DIGIT SIX +2479 ; 6.0 ; ; 6 # No PARENTHESIZED DIGIT SIX +248D ; 6.0 ; ; 6 # No DIGIT SIX FULL STOP +24FA ; 6.0 ; ; 6 # No DOUBLE CIRCLED DIGIT SIX +277B ; 6.0 ; ; 6 # No DINGBAT NEGATIVE CIRCLED DIGIT SIX +2785 ; 6.0 ; ; 6 # No DINGBAT CIRCLED SANS-SERIF DIGIT SIX +278F ; 6.0 ; ; 6 # No DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT SIX +3026 ; 6.0 ; ; 6 # Nl HANGZHOU NUMERAL SIX +3225 ; 6.0 ; ; 6 # No PARENTHESIZED IDEOGRAPH SIX +3285 ; 6.0 ; ; 6 # No CIRCLED IDEOGRAPH SIX +516D ; 6.0 ; ; 6 # Lo CJK UNIFIED IDEOGRAPH-516D +9646 ; 6.0 ; ; 6 # Lo CJK UNIFIED IDEOGRAPH-9646 +9678 ; 6.0 ; ; 6 # Lo CJK UNIFIED IDEOGRAPH-9678 +A626 ; 6.0 ; ; 6 # Nd VAI DIGIT SIX +A6EB ; 6.0 ; ; 6 # Nl BAMUM LETTER NTUU +A8D6 ; 6.0 ; ; 6 # Nd SAURASHTRA DIGIT SIX +A906 ; 6.0 ; ; 6 # Nd KAYAH LI DIGIT SIX +A9D6 ; 6.0 ; ; 6 # Nd JAVANESE DIGIT SIX +A9F6 ; 6.0 ; ; 6 # Nd MYANMAR TAI LAING DIGIT SIX +AA56 ; 6.0 ; ; 6 # Nd CHAM DIGIT SIX +ABF6 ; 6.0 ; ; 6 # Nd MEETEI MAYEK DIGIT SIX +F9D1 ; 6.0 ; ; 6 # Lo CJK COMPATIBILITY IDEOGRAPH-F9D1 +F9D3 ; 6.0 ; ; 6 # Lo CJK COMPATIBILITY IDEOGRAPH-F9D3 +FF16 ; 6.0 ; ; 6 # Nd FULLWIDTH DIGIT SIX +1010C ; 6.0 ; ; 6 # No AEGEAN NUMBER SIX +102E6 ; 6.0 ; ; 6 # No COPTIC EPACT DIGIT SIX +104A6 ; 6.0 ; ; 6 # Nd OSMANYA DIGIT SIX +109C5 ; 6.0 ; ; 6 # No MEROITIC CURSIVE NUMBER SIX +10D36 ; 6.0 ; ; 6 # Nd HANIFI ROHINGYA DIGIT SIX +10D46 ; 6.0 ; ; 6 # Nd GARAY DIGIT SIX +10E65 ; 6.0 ; ; 6 # No RUMI DIGIT SIX +11057 ; 6.0 ; ; 6 # No BRAHMI NUMBER SIX +1106C ; 6.0 ; ; 6 # Nd BRAHMI DIGIT SIX +110F6 ; 6.0 ; ; 6 # Nd SORA SOMPENG DIGIT SIX +1113C ; 6.0 ; ; 6 # Nd CHAKMA DIGIT SIX +111D6 ; 6.0 ; ; 6 # Nd SHARADA DIGIT SIX +111E6 ; 6.0 ; ; 6 # No SINHALA ARCHAIC DIGIT SIX +112F6 ; 6.0 ; ; 6 # Nd KHUDAWADI DIGIT SIX +11456 ; 6.0 ; ; 6 # Nd NEWA DIGIT SIX +114D6 ; 6.0 ; ; 6 # Nd TIRHUTA DIGIT SIX +11656 ; 6.0 ; ; 6 # Nd MODI DIGIT SIX +116C6 ; 6.0 ; ; 6 # Nd TAKRI DIGIT SIX +116D6 ; 6.0 ; ; 6 # Nd MYANMAR PAO DIGIT SIX +116E0 ; 6.0 ; ; 6 # Nd MYANMAR EASTERN PWO KAREN DIGIT SIX +11736 ; 6.0 ; ; 6 # Nd AHOM DIGIT SIX +118E6 ; 6.0 ; ; 6 # Nd WARANG CITI DIGIT SIX +11956 ; 6.0 ; ; 6 # Nd DIVES AKURU DIGIT SIX +11BF6 ; 6.0 ; ; 6 # Nd SUNUWAR DIGIT SIX +11C56 ; 6.0 ; ; 6 # Nd BHAIKSUKI DIGIT SIX +11C5F ; 6.0 ; ; 6 # No BHAIKSUKI NUMBER SIX +11D56 ; 6.0 ; ; 6 # Nd MASARAM GONDI DIGIT SIX +11DA6 ; 6.0 ; ; 6 # Nd GUNJALA GONDI DIGIT SIX +11DE6 ; 6.0 ; ; 6 # Nd TOLONG SIKI DIGIT SIX +11F56 ; 6.0 ; ; 6 # Nd KAWI DIGIT SIX +12404 ; 6.0 ; ; 6 # Nl CUNEIFORM NUMERIC SIGN SIX ASH +1240B ; 6.0 ; ; 6 # Nl CUNEIFORM NUMERIC SIGN SIX DISH +12411 ; 6.0 ; ; 6 # Nl CUNEIFORM NUMERIC SIGN SIX U +1241A ; 6.0 ; ; 6 # Nl CUNEIFORM NUMERIC SIGN SIX GESH2 +12428 ; 6.0 ; ; 6 # Nl CUNEIFORM NUMERIC SIGN SIX SHAR2 +12440 ; 6.0 ; ; 6 # Nl CUNEIFORM NUMERIC SIGN SIX VARIANT FORM ASH9 +1244E ; 6.0 ; ; 6 # Nl CUNEIFORM NUMERIC SIGN SIX ASH TENU +1246B ; 6.0 ; ; 6 # Nl CUNEIFORM NUMERIC SIGN SIX U VARIANT FORM +16136 ; 6.0 ; ; 6 # Nd GURUNG KHEMA DIGIT SIX +16A66 ; 6.0 ; ; 6 # Nd MRO DIGIT SIX +16AC6 ; 6.0 ; ; 6 # Nd TANGSA DIGIT SIX +16B56 ; 6.0 ; ; 6 # Nd PAHAWH HMONG DIGIT SIX +16D76 ; 6.0 ; ; 6 # Nd KIRAT RAI DIGIT SIX +16E86 ; 6.0 ; ; 6 # No MEDEFAIDRIN DIGIT SIX +1CCF6 ; 6.0 ; ; 6 # Nd OUTLINED DIGIT SIX +1D2C6 ; 6.0 ; ; 6 # No KAKTOVIK NUMERAL SIX +1D2E6 ; 6.0 ; ; 6 # No MAYAN NUMERAL SIX +1D365 ; 6.0 ; ; 6 # No COUNTING ROD UNIT DIGIT SIX +1D7D4 ; 6.0 ; ; 6 # Nd MATHEMATICAL BOLD DIGIT SIX +1D7DE ; 6.0 ; ; 6 # Nd MATHEMATICAL DOUBLE-STRUCK DIGIT SIX +1D7E8 ; 6.0 ; ; 6 # Nd MATHEMATICAL SANS-SERIF DIGIT SIX +1D7F2 ; 6.0 ; ; 6 # Nd MATHEMATICAL SANS-SERIF BOLD DIGIT SIX +1D7FC ; 6.0 ; ; 6 # Nd MATHEMATICAL MONOSPACE DIGIT SIX +1E146 ; 6.0 ; ; 6 # Nd NYIAKENG PUACHUE HMONG DIGIT SIX +1E2F6 ; 6.0 ; ; 6 # Nd WANCHO DIGIT SIX +1E4F6 ; 6.0 ; ; 6 # Nd NAG MUNDARI DIGIT SIX +1E5F7 ; 6.0 ; ; 6 # Nd OL ONAL DIGIT SIX +1E8CC ; 6.0 ; ; 6 # No MENDE KIKAKUI DIGIT SIX +1E956 ; 6.0 ; ; 6 # Nd ADLAM DIGIT SIX +1EC76 ; 6.0 ; ; 6 # No INDIC SIYAQ NUMBER SIX +1ECA8 ; 6.0 ; ; 6 # No INDIC SIYAQ NUMBER PREFIXED SIX +1ED06 ; 6.0 ; ; 6 # No OTTOMAN SIYAQ NUMBER SIX +1ED33 ; 6.0 ; ; 6 # No OTTOMAN SIYAQ ALTERNATE NUMBER SIX +1F107 ; 6.0 ; ; 6 # No DIGIT SIX COMMA +1FBF6 ; 6.0 ; ; 6 # Nd SEGMENTED DIGIT SIX +20AEA ; 6.0 ; ; 6 # Lo CJK UNIFIED IDEOGRAPH-20AEA + +# Total code points: 126 + +# ================================================ + +0F30 ; 6.5 ; ; 13/2 # No TIBETAN DIGIT HALF SEVEN + +# Total code points: 1 + +# ================================================ + +0037 ; 7.0 ; ; 7 # Nd DIGIT SEVEN +0667 ; 7.0 ; ; 7 # Nd ARABIC-INDIC DIGIT SEVEN +06F7 ; 7.0 ; ; 7 # Nd EXTENDED ARABIC-INDIC DIGIT SEVEN +07C7 ; 7.0 ; ; 7 # Nd NKO DIGIT SEVEN +096D ; 7.0 ; ; 7 # Nd DEVANAGARI DIGIT SEVEN +09ED ; 7.0 ; ; 7 # Nd BENGALI DIGIT SEVEN +0A6D ; 7.0 ; ; 7 # Nd GURMUKHI DIGIT SEVEN +0AED ; 7.0 ; ; 7 # Nd GUJARATI DIGIT SEVEN +0B6D ; 7.0 ; ; 7 # Nd ORIYA DIGIT SEVEN +0BED ; 7.0 ; ; 7 # Nd TAMIL DIGIT SEVEN +0C6D ; 7.0 ; ; 7 # Nd TELUGU DIGIT SEVEN +0CED ; 7.0 ; ; 7 # Nd KANNADA DIGIT SEVEN +0D6D ; 7.0 ; ; 7 # Nd MALAYALAM DIGIT SEVEN +0DED ; 7.0 ; ; 7 # Nd SINHALA LITH DIGIT SEVEN +0E57 ; 7.0 ; ; 7 # Nd THAI DIGIT SEVEN +0ED7 ; 7.0 ; ; 7 # Nd LAO DIGIT SEVEN +0F27 ; 7.0 ; ; 7 # Nd TIBETAN DIGIT SEVEN +1047 ; 7.0 ; ; 7 # Nd MYANMAR DIGIT SEVEN +1097 ; 7.0 ; ; 7 # Nd MYANMAR SHAN DIGIT SEVEN +136F ; 7.0 ; ; 7 # No ETHIOPIC DIGIT SEVEN +17E7 ; 7.0 ; ; 7 # Nd KHMER DIGIT SEVEN +17F7 ; 7.0 ; ; 7 # No KHMER SYMBOL LEK ATTAK PRAM-PII +1817 ; 7.0 ; ; 7 # Nd MONGOLIAN DIGIT SEVEN +194D ; 7.0 ; ; 7 # Nd LIMBU DIGIT SEVEN +19D7 ; 7.0 ; ; 7 # Nd NEW TAI LUE DIGIT SEVEN +1A87 ; 7.0 ; ; 7 # Nd TAI THAM HORA DIGIT SEVEN +1A97 ; 7.0 ; ; 7 # Nd TAI THAM THAM DIGIT SEVEN +1B57 ; 7.0 ; ; 7 # Nd BALINESE DIGIT SEVEN +1BB7 ; 7.0 ; ; 7 # Nd SUNDANESE DIGIT SEVEN +1C47 ; 7.0 ; ; 7 # Nd LEPCHA DIGIT SEVEN +1C57 ; 7.0 ; ; 7 # Nd OL CHIKI DIGIT SEVEN +2077 ; 7.0 ; ; 7 # No SUPERSCRIPT SEVEN +2087 ; 7.0 ; ; 7 # No SUBSCRIPT SEVEN +2166 ; 7.0 ; ; 7 # Nl ROMAN NUMERAL SEVEN +2176 ; 7.0 ; ; 7 # Nl SMALL ROMAN NUMERAL SEVEN +2466 ; 7.0 ; ; 7 # No CIRCLED DIGIT SEVEN +247A ; 7.0 ; ; 7 # No PARENTHESIZED DIGIT SEVEN +248E ; 7.0 ; ; 7 # No DIGIT SEVEN FULL STOP +24FB ; 7.0 ; ; 7 # No DOUBLE CIRCLED DIGIT SEVEN +277C ; 7.0 ; ; 7 # No DINGBAT NEGATIVE CIRCLED DIGIT SEVEN +2786 ; 7.0 ; ; 7 # No DINGBAT CIRCLED SANS-SERIF DIGIT SEVEN +2790 ; 7.0 ; ; 7 # No DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT SEVEN +3027 ; 7.0 ; ; 7 # Nl HANGZHOU NUMERAL SEVEN +3226 ; 7.0 ; ; 7 # No PARENTHESIZED IDEOGRAPH SEVEN +3286 ; 7.0 ; ; 7 # No CIRCLED IDEOGRAPH SEVEN +3B4D ; 7.0 ; ; 7 # Lo CJK UNIFIED IDEOGRAPH-3B4D +4E03 ; 7.0 ; ; 7 # Lo CJK UNIFIED IDEOGRAPH-4E03 +62D0 ; 7.0 ; ; 7 # Lo CJK UNIFIED IDEOGRAPH-62D0 +67D2 ; 7.0 ; ; 7 # Lo CJK UNIFIED IDEOGRAPH-67D2 +6F06 ; 7.0 ; ; 7 # Lo CJK UNIFIED IDEOGRAPH-6F06 +A627 ; 7.0 ; ; 7 # Nd VAI DIGIT SEVEN +A6EC ; 7.0 ; ; 7 # Nl BAMUM LETTER SAMBA +A8D7 ; 7.0 ; ; 7 # Nd SAURASHTRA DIGIT SEVEN +A907 ; 7.0 ; ; 7 # Nd KAYAH LI DIGIT SEVEN +A9D7 ; 7.0 ; ; 7 # Nd JAVANESE DIGIT SEVEN +A9F7 ; 7.0 ; ; 7 # Nd MYANMAR TAI LAING DIGIT SEVEN +AA57 ; 7.0 ; ; 7 # Nd CHAM DIGIT SEVEN +ABF7 ; 7.0 ; ; 7 # Nd MEETEI MAYEK DIGIT SEVEN +FF17 ; 7.0 ; ; 7 # Nd FULLWIDTH DIGIT SEVEN +1010D ; 7.0 ; ; 7 # No AEGEAN NUMBER SEVEN +102E7 ; 7.0 ; ; 7 # No COPTIC EPACT DIGIT SEVEN +104A7 ; 7.0 ; ; 7 # Nd OSMANYA DIGIT SEVEN +109C6 ; 7.0 ; ; 7 # No MEROITIC CURSIVE NUMBER SEVEN +10D37 ; 7.0 ; ; 7 # Nd HANIFI ROHINGYA DIGIT SEVEN +10D47 ; 7.0 ; ; 7 # Nd GARAY DIGIT SEVEN +10E66 ; 7.0 ; ; 7 # No RUMI DIGIT SEVEN +11058 ; 7.0 ; ; 7 # No BRAHMI NUMBER SEVEN +1106D ; 7.0 ; ; 7 # Nd BRAHMI DIGIT SEVEN +110F7 ; 7.0 ; ; 7 # Nd SORA SOMPENG DIGIT SEVEN +1113D ; 7.0 ; ; 7 # Nd CHAKMA DIGIT SEVEN +111D7 ; 7.0 ; ; 7 # Nd SHARADA DIGIT SEVEN +111E7 ; 7.0 ; ; 7 # No SINHALA ARCHAIC DIGIT SEVEN +112F7 ; 7.0 ; ; 7 # Nd KHUDAWADI DIGIT SEVEN +11457 ; 7.0 ; ; 7 # Nd NEWA DIGIT SEVEN +114D7 ; 7.0 ; ; 7 # Nd TIRHUTA DIGIT SEVEN +11657 ; 7.0 ; ; 7 # Nd MODI DIGIT SEVEN +116C7 ; 7.0 ; ; 7 # Nd TAKRI DIGIT SEVEN +116D7 ; 7.0 ; ; 7 # Nd MYANMAR PAO DIGIT SEVEN +116E1 ; 7.0 ; ; 7 # Nd MYANMAR EASTERN PWO KAREN DIGIT SEVEN +11737 ; 7.0 ; ; 7 # Nd AHOM DIGIT SEVEN +118E7 ; 7.0 ; ; 7 # Nd WARANG CITI DIGIT SEVEN +11957 ; 7.0 ; ; 7 # Nd DIVES AKURU DIGIT SEVEN +11BF7 ; 7.0 ; ; 7 # Nd SUNUWAR DIGIT SEVEN +11C57 ; 7.0 ; ; 7 # Nd BHAIKSUKI DIGIT SEVEN +11C60 ; 7.0 ; ; 7 # No BHAIKSUKI NUMBER SEVEN +11D57 ; 7.0 ; ; 7 # Nd MASARAM GONDI DIGIT SEVEN +11DA7 ; 7.0 ; ; 7 # Nd GUNJALA GONDI DIGIT SEVEN +11DE7 ; 7.0 ; ; 7 # Nd TOLONG SIKI DIGIT SEVEN +11F57 ; 7.0 ; ; 7 # Nd KAWI DIGIT SEVEN +12405 ; 7.0 ; ; 7 # Nl CUNEIFORM NUMERIC SIGN SEVEN ASH +1240C ; 7.0 ; ; 7 # Nl CUNEIFORM NUMERIC SIGN SEVEN DISH +12412 ; 7.0 ; ; 7 # Nl CUNEIFORM NUMERIC SIGN SEVEN U +1241B ; 7.0 ; ; 7 # Nl CUNEIFORM NUMERIC SIGN SEVEN GESH2 +12429 ; 7.0 ; ; 7 # Nl CUNEIFORM NUMERIC SIGN SEVEN SHAR2 +12441..12443 ; 7.0 ; ; 7 # Nl [3] CUNEIFORM NUMERIC SIGN SEVEN VARIANT FORM IMIN3..CUNEIFORM NUMERIC SIGN SEVEN VARIANT FORM IMIN B +1246C ; 7.0 ; ; 7 # Nl CUNEIFORM NUMERIC SIGN SEVEN U VARIANT FORM +16137 ; 7.0 ; ; 7 # Nd GURUNG KHEMA DIGIT SEVEN +16A67 ; 7.0 ; ; 7 # Nd MRO DIGIT SEVEN +16AC7 ; 7.0 ; ; 7 # Nd TANGSA DIGIT SEVEN +16B57 ; 7.0 ; ; 7 # Nd PAHAWH HMONG DIGIT SEVEN +16D77 ; 7.0 ; ; 7 # Nd KIRAT RAI DIGIT SEVEN +16E87 ; 7.0 ; ; 7 # No MEDEFAIDRIN DIGIT SEVEN +1CCF7 ; 7.0 ; ; 7 # Nd OUTLINED DIGIT SEVEN +1D2C7 ; 7.0 ; ; 7 # No KAKTOVIK NUMERAL SEVEN +1D2E7 ; 7.0 ; ; 7 # No MAYAN NUMERAL SEVEN +1D366 ; 7.0 ; ; 7 # No COUNTING ROD UNIT DIGIT SEVEN +1D7D5 ; 7.0 ; ; 7 # Nd MATHEMATICAL BOLD DIGIT SEVEN +1D7DF ; 7.0 ; ; 7 # Nd MATHEMATICAL DOUBLE-STRUCK DIGIT SEVEN +1D7E9 ; 7.0 ; ; 7 # Nd MATHEMATICAL SANS-SERIF DIGIT SEVEN +1D7F3 ; 7.0 ; ; 7 # Nd MATHEMATICAL SANS-SERIF BOLD DIGIT SEVEN +1D7FD ; 7.0 ; ; 7 # Nd MATHEMATICAL MONOSPACE DIGIT SEVEN +1E147 ; 7.0 ; ; 7 # Nd NYIAKENG PUACHUE HMONG DIGIT SEVEN +1E2F7 ; 7.0 ; ; 7 # Nd WANCHO DIGIT SEVEN +1E4F7 ; 7.0 ; ; 7 # Nd NAG MUNDARI DIGIT SEVEN +1E5F8 ; 7.0 ; ; 7 # Nd OL ONAL DIGIT SEVEN +1E8CD ; 7.0 ; ; 7 # No MENDE KIKAKUI DIGIT SEVEN +1E957 ; 7.0 ; ; 7 # Nd ADLAM DIGIT SEVEN +1EC77 ; 7.0 ; ; 7 # No INDIC SIYAQ NUMBER SEVEN +1ECA9 ; 7.0 ; ; 7 # No INDIC SIYAQ NUMBER PREFIXED SEVEN +1ED07 ; 7.0 ; ; 7 # No OTTOMAN SIYAQ NUMBER SEVEN +1ED34 ; 7.0 ; ; 7 # No OTTOMAN SIYAQ ALTERNATE NUMBER SEVEN +1F108 ; 7.0 ; ; 7 # No DIGIT SEVEN COMMA +1FBF7 ; 7.0 ; ; 7 # Nd SEGMENTED DIGIT SEVEN +20001 ; 7.0 ; ; 7 # Lo CJK UNIFIED IDEOGRAPH-20001 + +# Total code points: 126 + +# ================================================ + +0F31 ; 7.5 ; ; 15/2 # No TIBETAN DIGIT HALF EIGHT + +# Total code points: 1 + +# ================================================ + +0038 ; 8.0 ; ; 8 # Nd DIGIT EIGHT +0668 ; 8.0 ; ; 8 # Nd ARABIC-INDIC DIGIT EIGHT +06F8 ; 8.0 ; ; 8 # Nd EXTENDED ARABIC-INDIC DIGIT EIGHT +07C8 ; 8.0 ; ; 8 # Nd NKO DIGIT EIGHT +096E ; 8.0 ; ; 8 # Nd DEVANAGARI DIGIT EIGHT +09EE ; 8.0 ; ; 8 # Nd BENGALI DIGIT EIGHT +0A6E ; 8.0 ; ; 8 # Nd GURMUKHI DIGIT EIGHT +0AEE ; 8.0 ; ; 8 # Nd GUJARATI DIGIT EIGHT +0B6E ; 8.0 ; ; 8 # Nd ORIYA DIGIT EIGHT +0BEE ; 8.0 ; ; 8 # Nd TAMIL DIGIT EIGHT +0C6E ; 8.0 ; ; 8 # Nd TELUGU DIGIT EIGHT +0CEE ; 8.0 ; ; 8 # Nd KANNADA DIGIT EIGHT +0D6E ; 8.0 ; ; 8 # Nd MALAYALAM DIGIT EIGHT +0DEE ; 8.0 ; ; 8 # Nd SINHALA LITH DIGIT EIGHT +0E58 ; 8.0 ; ; 8 # Nd THAI DIGIT EIGHT +0ED8 ; 8.0 ; ; 8 # Nd LAO DIGIT EIGHT +0F28 ; 8.0 ; ; 8 # Nd TIBETAN DIGIT EIGHT +1048 ; 8.0 ; ; 8 # Nd MYANMAR DIGIT EIGHT +1098 ; 8.0 ; ; 8 # Nd MYANMAR SHAN DIGIT EIGHT +1370 ; 8.0 ; ; 8 # No ETHIOPIC DIGIT EIGHT +17E8 ; 8.0 ; ; 8 # Nd KHMER DIGIT EIGHT +17F8 ; 8.0 ; ; 8 # No KHMER SYMBOL LEK ATTAK PRAM-BEI +1818 ; 8.0 ; ; 8 # Nd MONGOLIAN DIGIT EIGHT +194E ; 8.0 ; ; 8 # Nd LIMBU DIGIT EIGHT +19D8 ; 8.0 ; ; 8 # Nd NEW TAI LUE DIGIT EIGHT +1A88 ; 8.0 ; ; 8 # Nd TAI THAM HORA DIGIT EIGHT +1A98 ; 8.0 ; ; 8 # Nd TAI THAM THAM DIGIT EIGHT +1B58 ; 8.0 ; ; 8 # Nd BALINESE DIGIT EIGHT +1BB8 ; 8.0 ; ; 8 # Nd SUNDANESE DIGIT EIGHT +1C48 ; 8.0 ; ; 8 # Nd LEPCHA DIGIT EIGHT +1C58 ; 8.0 ; ; 8 # Nd OL CHIKI DIGIT EIGHT +2078 ; 8.0 ; ; 8 # No SUPERSCRIPT EIGHT +2088 ; 8.0 ; ; 8 # No SUBSCRIPT EIGHT +2167 ; 8.0 ; ; 8 # Nl ROMAN NUMERAL EIGHT +2177 ; 8.0 ; ; 8 # Nl SMALL ROMAN NUMERAL EIGHT +2467 ; 8.0 ; ; 8 # No CIRCLED DIGIT EIGHT +247B ; 8.0 ; ; 8 # No PARENTHESIZED DIGIT EIGHT +248F ; 8.0 ; ; 8 # No DIGIT EIGHT FULL STOP +24FC ; 8.0 ; ; 8 # No DOUBLE CIRCLED DIGIT EIGHT +277D ; 8.0 ; ; 8 # No DINGBAT NEGATIVE CIRCLED DIGIT EIGHT +2787 ; 8.0 ; ; 8 # No DINGBAT CIRCLED SANS-SERIF DIGIT EIGHT +2791 ; 8.0 ; ; 8 # No DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT EIGHT +3028 ; 8.0 ; ; 8 # Nl HANGZHOU NUMERAL EIGHT +3227 ; 8.0 ; ; 8 # No PARENTHESIZED IDEOGRAPH EIGHT +3287 ; 8.0 ; ; 8 # No CIRCLED IDEOGRAPH EIGHT +516B ; 8.0 ; ; 8 # Lo CJK UNIFIED IDEOGRAPH-516B +634C ; 8.0 ; ; 8 # Lo CJK UNIFIED IDEOGRAPH-634C +A628 ; 8.0 ; ; 8 # Nd VAI DIGIT EIGHT +A6ED ; 8.0 ; ; 8 # Nl BAMUM LETTER FAAMAE +A8D8 ; 8.0 ; ; 8 # Nd SAURASHTRA DIGIT EIGHT +A908 ; 8.0 ; ; 8 # Nd KAYAH LI DIGIT EIGHT +A9D8 ; 8.0 ; ; 8 # Nd JAVANESE DIGIT EIGHT +A9F8 ; 8.0 ; ; 8 # Nd MYANMAR TAI LAING DIGIT EIGHT +AA58 ; 8.0 ; ; 8 # Nd CHAM DIGIT EIGHT +ABF8 ; 8.0 ; ; 8 # Nd MEETEI MAYEK DIGIT EIGHT +FF18 ; 8.0 ; ; 8 # Nd FULLWIDTH DIGIT EIGHT +1010E ; 8.0 ; ; 8 # No AEGEAN NUMBER EIGHT +102E8 ; 8.0 ; ; 8 # No COPTIC EPACT DIGIT EIGHT +104A8 ; 8.0 ; ; 8 # Nd OSMANYA DIGIT EIGHT +109C7 ; 8.0 ; ; 8 # No MEROITIC CURSIVE NUMBER EIGHT +10D38 ; 8.0 ; ; 8 # Nd HANIFI ROHINGYA DIGIT EIGHT +10D48 ; 8.0 ; ; 8 # Nd GARAY DIGIT EIGHT +10E67 ; 8.0 ; ; 8 # No RUMI DIGIT EIGHT +11059 ; 8.0 ; ; 8 # No BRAHMI NUMBER EIGHT +1106E ; 8.0 ; ; 8 # Nd BRAHMI DIGIT EIGHT +110F8 ; 8.0 ; ; 8 # Nd SORA SOMPENG DIGIT EIGHT +1113E ; 8.0 ; ; 8 # Nd CHAKMA DIGIT EIGHT +111D8 ; 8.0 ; ; 8 # Nd SHARADA DIGIT EIGHT +111E8 ; 8.0 ; ; 8 # No SINHALA ARCHAIC DIGIT EIGHT +112F8 ; 8.0 ; ; 8 # Nd KHUDAWADI DIGIT EIGHT +11458 ; 8.0 ; ; 8 # Nd NEWA DIGIT EIGHT +114D8 ; 8.0 ; ; 8 # Nd TIRHUTA DIGIT EIGHT +11658 ; 8.0 ; ; 8 # Nd MODI DIGIT EIGHT +116C8 ; 8.0 ; ; 8 # Nd TAKRI DIGIT EIGHT +116D8 ; 8.0 ; ; 8 # Nd MYANMAR PAO DIGIT EIGHT +116E2 ; 8.0 ; ; 8 # Nd MYANMAR EASTERN PWO KAREN DIGIT EIGHT +11738 ; 8.0 ; ; 8 # Nd AHOM DIGIT EIGHT +118E8 ; 8.0 ; ; 8 # Nd WARANG CITI DIGIT EIGHT +11958 ; 8.0 ; ; 8 # Nd DIVES AKURU DIGIT EIGHT +11BF8 ; 8.0 ; ; 8 # Nd SUNUWAR DIGIT EIGHT +11C58 ; 8.0 ; ; 8 # Nd BHAIKSUKI DIGIT EIGHT +11C61 ; 8.0 ; ; 8 # No BHAIKSUKI NUMBER EIGHT +11D58 ; 8.0 ; ; 8 # Nd MASARAM GONDI DIGIT EIGHT +11DA8 ; 8.0 ; ; 8 # Nd GUNJALA GONDI DIGIT EIGHT +11DE8 ; 8.0 ; ; 8 # Nd TOLONG SIKI DIGIT EIGHT +11F58 ; 8.0 ; ; 8 # Nd KAWI DIGIT EIGHT +12406 ; 8.0 ; ; 8 # Nl CUNEIFORM NUMERIC SIGN EIGHT ASH +1240D ; 8.0 ; ; 8 # Nl CUNEIFORM NUMERIC SIGN EIGHT DISH +12413 ; 8.0 ; ; 8 # Nl CUNEIFORM NUMERIC SIGN EIGHT U +1241C ; 8.0 ; ; 8 # Nl CUNEIFORM NUMERIC SIGN EIGHT GESH2 +1242A ; 8.0 ; ; 8 # Nl CUNEIFORM NUMERIC SIGN EIGHT SHAR2 +12444..12445 ; 8.0 ; ; 8 # Nl [2] CUNEIFORM NUMERIC SIGN EIGHT VARIANT FORM USSU..CUNEIFORM NUMERIC SIGN EIGHT VARIANT FORM USSU3 +1246D ; 8.0 ; ; 8 # Nl CUNEIFORM NUMERIC SIGN EIGHT U VARIANT FORM +16138 ; 8.0 ; ; 8 # Nd GURUNG KHEMA DIGIT EIGHT +16A68 ; 8.0 ; ; 8 # Nd MRO DIGIT EIGHT +16AC8 ; 8.0 ; ; 8 # Nd TANGSA DIGIT EIGHT +16B58 ; 8.0 ; ; 8 # Nd PAHAWH HMONG DIGIT EIGHT +16D78 ; 8.0 ; ; 8 # Nd KIRAT RAI DIGIT EIGHT +16E88 ; 8.0 ; ; 8 # No MEDEFAIDRIN DIGIT EIGHT +1CCF8 ; 8.0 ; ; 8 # Nd OUTLINED DIGIT EIGHT +1D2C8 ; 8.0 ; ; 8 # No KAKTOVIK NUMERAL EIGHT +1D2E8 ; 8.0 ; ; 8 # No MAYAN NUMERAL EIGHT +1D367 ; 8.0 ; ; 8 # No COUNTING ROD UNIT DIGIT EIGHT +1D7D6 ; 8.0 ; ; 8 # Nd MATHEMATICAL BOLD DIGIT EIGHT +1D7E0 ; 8.0 ; ; 8 # Nd MATHEMATICAL DOUBLE-STRUCK DIGIT EIGHT +1D7EA ; 8.0 ; ; 8 # Nd MATHEMATICAL SANS-SERIF DIGIT EIGHT +1D7F4 ; 8.0 ; ; 8 # Nd MATHEMATICAL SANS-SERIF BOLD DIGIT EIGHT +1D7FE ; 8.0 ; ; 8 # Nd MATHEMATICAL MONOSPACE DIGIT EIGHT +1E148 ; 8.0 ; ; 8 # Nd NYIAKENG PUACHUE HMONG DIGIT EIGHT +1E2F8 ; 8.0 ; ; 8 # Nd WANCHO DIGIT EIGHT +1E4F8 ; 8.0 ; ; 8 # Nd NAG MUNDARI DIGIT EIGHT +1E5F9 ; 8.0 ; ; 8 # Nd OL ONAL DIGIT EIGHT +1E8CE ; 8.0 ; ; 8 # No MENDE KIKAKUI DIGIT EIGHT +1E958 ; 8.0 ; ; 8 # Nd ADLAM DIGIT EIGHT +1EC78 ; 8.0 ; ; 8 # No INDIC SIYAQ NUMBER EIGHT +1ECAA ; 8.0 ; ; 8 # No INDIC SIYAQ NUMBER PREFIXED EIGHT +1ED08 ; 8.0 ; ; 8 # No OTTOMAN SIYAQ NUMBER EIGHT +1ED35 ; 8.0 ; ; 8 # No OTTOMAN SIYAQ ALTERNATE NUMBER EIGHT +1F109 ; 8.0 ; ; 8 # No DIGIT EIGHT COMMA +1FBF8 ; 8.0 ; ; 8 # Nd SEGMENTED DIGIT EIGHT + +# Total code points: 121 + +# ================================================ + +0F32 ; 8.5 ; ; 17/2 # No TIBETAN DIGIT HALF NINE + +# Total code points: 1 + +# ================================================ + +0039 ; 9.0 ; ; 9 # Nd DIGIT NINE +0669 ; 9.0 ; ; 9 # Nd ARABIC-INDIC DIGIT NINE +06F9 ; 9.0 ; ; 9 # Nd EXTENDED ARABIC-INDIC DIGIT NINE +07C9 ; 9.0 ; ; 9 # Nd NKO DIGIT NINE +096F ; 9.0 ; ; 9 # Nd DEVANAGARI DIGIT NINE +09EF ; 9.0 ; ; 9 # Nd BENGALI DIGIT NINE +0A6F ; 9.0 ; ; 9 # Nd GURMUKHI DIGIT NINE +0AEF ; 9.0 ; ; 9 # Nd GUJARATI DIGIT NINE +0B6F ; 9.0 ; ; 9 # Nd ORIYA DIGIT NINE +0BEF ; 9.0 ; ; 9 # Nd TAMIL DIGIT NINE +0C6F ; 9.0 ; ; 9 # Nd TELUGU DIGIT NINE +0CEF ; 9.0 ; ; 9 # Nd KANNADA DIGIT NINE +0D6F ; 9.0 ; ; 9 # Nd MALAYALAM DIGIT NINE +0DEF ; 9.0 ; ; 9 # Nd SINHALA LITH DIGIT NINE +0E59 ; 9.0 ; ; 9 # Nd THAI DIGIT NINE +0ED9 ; 9.0 ; ; 9 # Nd LAO DIGIT NINE +0F29 ; 9.0 ; ; 9 # Nd TIBETAN DIGIT NINE +1049 ; 9.0 ; ; 9 # Nd MYANMAR DIGIT NINE +1099 ; 9.0 ; ; 9 # Nd MYANMAR SHAN DIGIT NINE +1371 ; 9.0 ; ; 9 # No ETHIOPIC DIGIT NINE +17E9 ; 9.0 ; ; 9 # Nd KHMER DIGIT NINE +17F9 ; 9.0 ; ; 9 # No KHMER SYMBOL LEK ATTAK PRAM-BUON +1819 ; 9.0 ; ; 9 # Nd MONGOLIAN DIGIT NINE +194F ; 9.0 ; ; 9 # Nd LIMBU DIGIT NINE +19D9 ; 9.0 ; ; 9 # Nd NEW TAI LUE DIGIT NINE +1A89 ; 9.0 ; ; 9 # Nd TAI THAM HORA DIGIT NINE +1A99 ; 9.0 ; ; 9 # Nd TAI THAM THAM DIGIT NINE +1B59 ; 9.0 ; ; 9 # Nd BALINESE DIGIT NINE +1BB9 ; 9.0 ; ; 9 # Nd SUNDANESE DIGIT NINE +1C49 ; 9.0 ; ; 9 # Nd LEPCHA DIGIT NINE +1C59 ; 9.0 ; ; 9 # Nd OL CHIKI DIGIT NINE +2079 ; 9.0 ; ; 9 # No SUPERSCRIPT NINE +2089 ; 9.0 ; ; 9 # No SUBSCRIPT NINE +2168 ; 9.0 ; ; 9 # Nl ROMAN NUMERAL NINE +2178 ; 9.0 ; ; 9 # Nl SMALL ROMAN NUMERAL NINE +2468 ; 9.0 ; ; 9 # No CIRCLED DIGIT NINE +247C ; 9.0 ; ; 9 # No PARENTHESIZED DIGIT NINE +2490 ; 9.0 ; ; 9 # No DIGIT NINE FULL STOP +24FD ; 9.0 ; ; 9 # No DOUBLE CIRCLED DIGIT NINE +277E ; 9.0 ; ; 9 # No DINGBAT NEGATIVE CIRCLED DIGIT NINE +2788 ; 9.0 ; ; 9 # No DINGBAT CIRCLED SANS-SERIF DIGIT NINE +2792 ; 9.0 ; ; 9 # No DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT NINE +3029 ; 9.0 ; ; 9 # Nl HANGZHOU NUMERAL NINE +3228 ; 9.0 ; ; 9 # No PARENTHESIZED IDEOGRAPH NINE +3288 ; 9.0 ; ; 9 # No CIRCLED IDEOGRAPH NINE +4E5D ; 9.0 ; ; 9 # Lo CJK UNIFIED IDEOGRAPH-4E5D +5EFE ; 9.0 ; ; 9 # Lo CJK UNIFIED IDEOGRAPH-5EFE +7396 ; 9.0 ; ; 9 # Lo CJK UNIFIED IDEOGRAPH-7396 +920E ; 9.0 ; ; 9 # Lo CJK UNIFIED IDEOGRAPH-920E +94A9 ; 9.0 ; ; 9 # Lo CJK UNIFIED IDEOGRAPH-94A9 +A629 ; 9.0 ; ; 9 # Nd VAI DIGIT NINE +A6EE ; 9.0 ; ; 9 # Nl BAMUM LETTER KOVUU +A8D9 ; 9.0 ; ; 9 # Nd SAURASHTRA DIGIT NINE +A909 ; 9.0 ; ; 9 # Nd KAYAH LI DIGIT NINE +A9D9 ; 9.0 ; ; 9 # Nd JAVANESE DIGIT NINE +A9F9 ; 9.0 ; ; 9 # Nd MYANMAR TAI LAING DIGIT NINE +AA59 ; 9.0 ; ; 9 # Nd CHAM DIGIT NINE +ABF9 ; 9.0 ; ; 9 # Nd MEETEI MAYEK DIGIT NINE +FF19 ; 9.0 ; ; 9 # Nd FULLWIDTH DIGIT NINE +1010F ; 9.0 ; ; 9 # No AEGEAN NUMBER NINE +102E9 ; 9.0 ; ; 9 # No COPTIC EPACT DIGIT NINE +104A9 ; 9.0 ; ; 9 # Nd OSMANYA DIGIT NINE +109C8 ; 9.0 ; ; 9 # No MEROITIC CURSIVE NUMBER NINE +10D39 ; 9.0 ; ; 9 # Nd HANIFI ROHINGYA DIGIT NINE +10D49 ; 9.0 ; ; 9 # Nd GARAY DIGIT NINE +10E68 ; 9.0 ; ; 9 # No RUMI DIGIT NINE +1105A ; 9.0 ; ; 9 # No BRAHMI NUMBER NINE +1106F ; 9.0 ; ; 9 # Nd BRAHMI DIGIT NINE +110F9 ; 9.0 ; ; 9 # Nd SORA SOMPENG DIGIT NINE +1113F ; 9.0 ; ; 9 # Nd CHAKMA DIGIT NINE +111D9 ; 9.0 ; ; 9 # Nd SHARADA DIGIT NINE +111E9 ; 9.0 ; ; 9 # No SINHALA ARCHAIC DIGIT NINE +112F9 ; 9.0 ; ; 9 # Nd KHUDAWADI DIGIT NINE +11459 ; 9.0 ; ; 9 # Nd NEWA DIGIT NINE +114D9 ; 9.0 ; ; 9 # Nd TIRHUTA DIGIT NINE +11659 ; 9.0 ; ; 9 # Nd MODI DIGIT NINE +116C9 ; 9.0 ; ; 9 # Nd TAKRI DIGIT NINE +116D9 ; 9.0 ; ; 9 # Nd MYANMAR PAO DIGIT NINE +116E3 ; 9.0 ; ; 9 # Nd MYANMAR EASTERN PWO KAREN DIGIT NINE +11739 ; 9.0 ; ; 9 # Nd AHOM DIGIT NINE +118E9 ; 9.0 ; ; 9 # Nd WARANG CITI DIGIT NINE +11959 ; 9.0 ; ; 9 # Nd DIVES AKURU DIGIT NINE +11BF9 ; 9.0 ; ; 9 # Nd SUNUWAR DIGIT NINE +11C59 ; 9.0 ; ; 9 # Nd BHAIKSUKI DIGIT NINE +11C62 ; 9.0 ; ; 9 # No BHAIKSUKI NUMBER NINE +11D59 ; 9.0 ; ; 9 # Nd MASARAM GONDI DIGIT NINE +11DA9 ; 9.0 ; ; 9 # Nd GUNJALA GONDI DIGIT NINE +11DE9 ; 9.0 ; ; 9 # Nd TOLONG SIKI DIGIT NINE +11F59 ; 9.0 ; ; 9 # Nd KAWI DIGIT NINE +12407 ; 9.0 ; ; 9 # Nl CUNEIFORM NUMERIC SIGN NINE ASH +1240E ; 9.0 ; ; 9 # Nl CUNEIFORM NUMERIC SIGN NINE DISH +12414 ; 9.0 ; ; 9 # Nl CUNEIFORM NUMERIC SIGN NINE U +1241D ; 9.0 ; ; 9 # Nl CUNEIFORM NUMERIC SIGN NINE GESH2 +1242B ; 9.0 ; ; 9 # Nl CUNEIFORM NUMERIC SIGN NINE SHAR2 +12446..12449 ; 9.0 ; ; 9 # Nl [4] CUNEIFORM NUMERIC SIGN NINE VARIANT FORM ILIMMU..CUNEIFORM NUMERIC SIGN NINE VARIANT FORM ILIMMU A +1246E ; 9.0 ; ; 9 # Nl CUNEIFORM NUMERIC SIGN NINE U VARIANT FORM +16139 ; 9.0 ; ; 9 # Nd GURUNG KHEMA DIGIT NINE +16A69 ; 9.0 ; ; 9 # Nd MRO DIGIT NINE +16AC9 ; 9.0 ; ; 9 # Nd TANGSA DIGIT NINE +16B59 ; 9.0 ; ; 9 # Nd PAHAWH HMONG DIGIT NINE +16D79 ; 9.0 ; ; 9 # Nd KIRAT RAI DIGIT NINE +16E89 ; 9.0 ; ; 9 # No MEDEFAIDRIN DIGIT NINE +1CCF9 ; 9.0 ; ; 9 # Nd OUTLINED DIGIT NINE +1D2C9 ; 9.0 ; ; 9 # No KAKTOVIK NUMERAL NINE +1D2E9 ; 9.0 ; ; 9 # No MAYAN NUMERAL NINE +1D368 ; 9.0 ; ; 9 # No COUNTING ROD UNIT DIGIT NINE +1D7D7 ; 9.0 ; ; 9 # Nd MATHEMATICAL BOLD DIGIT NINE +1D7E1 ; 9.0 ; ; 9 # Nd MATHEMATICAL DOUBLE-STRUCK DIGIT NINE +1D7EB ; 9.0 ; ; 9 # Nd MATHEMATICAL SANS-SERIF DIGIT NINE +1D7F5 ; 9.0 ; ; 9 # Nd MATHEMATICAL SANS-SERIF BOLD DIGIT NINE +1D7FF ; 9.0 ; ; 9 # Nd MATHEMATICAL MONOSPACE DIGIT NINE +1E149 ; 9.0 ; ; 9 # Nd NYIAKENG PUACHUE HMONG DIGIT NINE +1E2F9 ; 9.0 ; ; 9 # Nd WANCHO DIGIT NINE +1E4F9 ; 9.0 ; ; 9 # Nd NAG MUNDARI DIGIT NINE +1E5FA ; 9.0 ; ; 9 # Nd OL ONAL DIGIT NINE +1E8CF ; 9.0 ; ; 9 # No MENDE KIKAKUI DIGIT NINE +1E959 ; 9.0 ; ; 9 # Nd ADLAM DIGIT NINE +1EC79 ; 9.0 ; ; 9 # No INDIC SIYAQ NUMBER NINE +1ECAB ; 9.0 ; ; 9 # No INDIC SIYAQ NUMBER PREFIXED NINE +1ED09 ; 9.0 ; ; 9 # No OTTOMAN SIYAQ NUMBER NINE +1ED36 ; 9.0 ; ; 9 # No OTTOMAN SIYAQ ALTERNATE NUMBER NINE +1F10A ; 9.0 ; ; 9 # No DIGIT NINE COMMA +1FBF9 ; 9.0 ; ; 9 # Nd SEGMENTED DIGIT NINE +2F890 ; 9.0 ; ; 9 # Lo CJK COMPATIBILITY IDEOGRAPH-2F890 + +# Total code points: 127 + +# ================================================ + +0BF0 ; 10.0 ; ; 10 # No TAMIL NUMBER TEN +0D70 ; 10.0 ; ; 10 # No MALAYALAM NUMBER TEN +1372 ; 10.0 ; ; 10 # No ETHIOPIC NUMBER TEN +2169 ; 10.0 ; ; 10 # Nl ROMAN NUMERAL TEN +2179 ; 10.0 ; ; 10 # Nl SMALL ROMAN NUMERAL TEN +2469 ; 10.0 ; ; 10 # No CIRCLED NUMBER TEN +247D ; 10.0 ; ; 10 # No PARENTHESIZED NUMBER TEN +2491 ; 10.0 ; ; 10 # No NUMBER TEN FULL STOP +24FE ; 10.0 ; ; 10 # No DOUBLE CIRCLED NUMBER TEN +277F ; 10.0 ; ; 10 # No DINGBAT NEGATIVE CIRCLED NUMBER TEN +2789 ; 10.0 ; ; 10 # No DINGBAT CIRCLED SANS-SERIF NUMBER TEN +2793 ; 10.0 ; ; 10 # No DINGBAT NEGATIVE CIRCLED SANS-SERIF NUMBER TEN +3038 ; 10.0 ; ; 10 # Nl HANGZHOU NUMERAL TEN +3229 ; 10.0 ; ; 10 # No PARENTHESIZED IDEOGRAPH TEN +3248 ; 10.0 ; ; 10 # No CIRCLED NUMBER TEN ON BLACK SQUARE +3289 ; 10.0 ; ; 10 # No CIRCLED IDEOGRAPH TEN +4EC0 ; 10.0 ; ; 10 # Lo CJK UNIFIED IDEOGRAPH-4EC0 +5341 ; 10.0 ; ; 10 # Lo CJK UNIFIED IDEOGRAPH-5341 +62FE ; 10.0 ; ; 10 # Lo CJK UNIFIED IDEOGRAPH-62FE +F973 ; 10.0 ; ; 10 # Lo CJK COMPATIBILITY IDEOGRAPH-F973 +F9FD ; 10.0 ; ; 10 # Lo CJK COMPATIBILITY IDEOGRAPH-F9FD +10110 ; 10.0 ; ; 10 # No AEGEAN NUMBER TEN +10149 ; 10.0 ; ; 10 # Nl GREEK ACROPHONIC ATTIC TEN TALENTS +10150 ; 10.0 ; ; 10 # Nl GREEK ACROPHONIC ATTIC TEN STATERS +10157 ; 10.0 ; ; 10 # Nl GREEK ACROPHONIC ATTIC TEN MNAS +10160..10164 ; 10.0 ; ; 10 # Nl [5] GREEK ACROPHONIC TROEZENIAN TEN..GREEK ACROPHONIC THESPIAN TEN +102EA ; 10.0 ; ; 10 # No COPTIC EPACT NUMBER TEN +10322 ; 10.0 ; ; 10 # No OLD ITALIC NUMERAL TEN +103D3 ; 10.0 ; ; 10 # Nl OLD PERSIAN NUMBER TEN +1085B ; 10.0 ; ; 10 # No IMPERIAL ARAMAIC NUMBER TEN +1087E ; 10.0 ; ; 10 # No PALMYRENE NUMBER TEN +108AD ; 10.0 ; ; 10 # No NABATAEAN NUMBER TEN +108FD ; 10.0 ; ; 10 # No HATRAN NUMBER TEN +10917 ; 10.0 ; ; 10 # No PHOENICIAN NUMBER TEN +109C9 ; 10.0 ; ; 10 # No MEROITIC CURSIVE NUMBER TEN +10A44 ; 10.0 ; ; 10 # No KHAROSHTHI NUMBER TEN +10A9E ; 10.0 ; ; 10 # No OLD NORTH ARABIAN NUMBER TEN +10AED ; 10.0 ; ; 10 # No MANICHAEAN NUMBER TEN +10B5C ; 10.0 ; ; 10 # No INSCRIPTIONAL PARTHIAN NUMBER TEN +10B7C ; 10.0 ; ; 10 # No INSCRIPTIONAL PAHLAVI NUMBER TEN +10BAD ; 10.0 ; ; 10 # No PSALTER PAHLAVI NUMBER TEN +10CFC ; 10.0 ; ; 10 # No OLD HUNGARIAN NUMBER TEN +10E69 ; 10.0 ; ; 10 # No RUMI NUMBER TEN +10F22 ; 10.0 ; ; 10 # No OLD SOGDIAN NUMBER TEN +10F52 ; 10.0 ; ; 10 # No SOGDIAN NUMBER TEN +10FC9 ; 10.0 ; ; 10 # No CHORASMIAN NUMBER TEN +1105B ; 10.0 ; ; 10 # No BRAHMI NUMBER TEN +111EA ; 10.0 ; ; 10 # No SINHALA ARCHAIC NUMBER TEN +1173A ; 10.0 ; ; 10 # No AHOM NUMBER TEN +118EA ; 10.0 ; ; 10 # No WARANG CITI NUMBER TEN +11C63 ; 10.0 ; ; 10 # No BHAIKSUKI NUMBER TEN +16B5B ; 10.0 ; ; 10 # No PAHAWH HMONG NUMBER TENS +16E8A ; 10.0 ; ; 10 # No MEDEFAIDRIN NUMBER TEN +1D2CA ; 10.0 ; ; 10 # No KAKTOVIK NUMERAL TEN +1D2EA ; 10.0 ; ; 10 # No MAYAN NUMERAL TEN +1D369 ; 10.0 ; ; 10 # No COUNTING ROD TENS DIGIT ONE +1EC7A ; 10.0 ; ; 10 # No INDIC SIYAQ NUMBER TEN +1ED0A ; 10.0 ; ; 10 # No OTTOMAN SIYAQ NUMBER TEN +1ED37 ; 10.0 ; ; 10 # No OTTOMAN SIYAQ ALTERNATE NUMBER TEN + +# Total code points: 63 + +# ================================================ + +216A ; 11.0 ; ; 11 # Nl ROMAN NUMERAL ELEVEN +217A ; 11.0 ; ; 11 # Nl SMALL ROMAN NUMERAL ELEVEN +246A ; 11.0 ; ; 11 # No CIRCLED NUMBER ELEVEN +247E ; 11.0 ; ; 11 # No PARENTHESIZED NUMBER ELEVEN +2492 ; 11.0 ; ; 11 # No NUMBER ELEVEN FULL STOP +24EB ; 11.0 ; ; 11 # No NEGATIVE CIRCLED NUMBER ELEVEN +16E8B ; 11.0 ; ; 11 # No MEDEFAIDRIN NUMBER ELEVEN +1D2CB ; 11.0 ; ; 11 # No KAKTOVIK NUMERAL ELEVEN +1D2EB ; 11.0 ; ; 11 # No MAYAN NUMERAL ELEVEN + +# Total code points: 9 + +# ================================================ + +216B ; 12.0 ; ; 12 # Nl ROMAN NUMERAL TWELVE +217B ; 12.0 ; ; 12 # Nl SMALL ROMAN NUMERAL TWELVE +246B ; 12.0 ; ; 12 # No CIRCLED NUMBER TWELVE +247F ; 12.0 ; ; 12 # No PARENTHESIZED NUMBER TWELVE +2493 ; 12.0 ; ; 12 # No NUMBER TWELVE FULL STOP +24EC ; 12.0 ; ; 12 # No NEGATIVE CIRCLED NUMBER TWELVE +16E8C ; 12.0 ; ; 12 # No MEDEFAIDRIN NUMBER TWELVE +1D2CC ; 12.0 ; ; 12 # No KAKTOVIK NUMERAL TWELVE +1D2EC ; 12.0 ; ; 12 # No MAYAN NUMERAL TWELVE + +# Total code points: 9 + +# ================================================ + +246C ; 13.0 ; ; 13 # No CIRCLED NUMBER THIRTEEN +2480 ; 13.0 ; ; 13 # No PARENTHESIZED NUMBER THIRTEEN +2494 ; 13.0 ; ; 13 # No NUMBER THIRTEEN FULL STOP +24ED ; 13.0 ; ; 13 # No NEGATIVE CIRCLED NUMBER THIRTEEN +16E8D ; 13.0 ; ; 13 # No MEDEFAIDRIN NUMBER THIRTEEN +1D2CD ; 13.0 ; ; 13 # No KAKTOVIK NUMERAL THIRTEEN +1D2ED ; 13.0 ; ; 13 # No MAYAN NUMERAL THIRTEEN + +# Total code points: 7 + +# ================================================ + +246D ; 14.0 ; ; 14 # No CIRCLED NUMBER FOURTEEN +2481 ; 14.0 ; ; 14 # No PARENTHESIZED NUMBER FOURTEEN +2495 ; 14.0 ; ; 14 # No NUMBER FOURTEEN FULL STOP +24EE ; 14.0 ; ; 14 # No NEGATIVE CIRCLED NUMBER FOURTEEN +16E8E ; 14.0 ; ; 14 # No MEDEFAIDRIN NUMBER FOURTEEN +1D2CE ; 14.0 ; ; 14 # No KAKTOVIK NUMERAL FOURTEEN +1D2EE ; 14.0 ; ; 14 # No MAYAN NUMERAL FOURTEEN + +# Total code points: 7 + +# ================================================ + +246E ; 15.0 ; ; 15 # No CIRCLED NUMBER FIFTEEN +2482 ; 15.0 ; ; 15 # No PARENTHESIZED NUMBER FIFTEEN +2496 ; 15.0 ; ; 15 # No NUMBER FIFTEEN FULL STOP +24EF ; 15.0 ; ; 15 # No NEGATIVE CIRCLED NUMBER FIFTEEN +16E8F ; 15.0 ; ; 15 # No MEDEFAIDRIN NUMBER FIFTEEN +1D2CF ; 15.0 ; ; 15 # No KAKTOVIK NUMERAL FIFTEEN +1D2EF ; 15.0 ; ; 15 # No MAYAN NUMERAL FIFTEEN + +# Total code points: 7 + +# ================================================ + +09F9 ; 16.0 ; ; 16 # No BENGALI CURRENCY DENOMINATOR SIXTEEN +246F ; 16.0 ; ; 16 # No CIRCLED NUMBER SIXTEEN +2483 ; 16.0 ; ; 16 # No PARENTHESIZED NUMBER SIXTEEN +2497 ; 16.0 ; ; 16 # No NUMBER SIXTEEN FULL STOP +24F0 ; 16.0 ; ; 16 # No NEGATIVE CIRCLED NUMBER SIXTEEN +16E90 ; 16.0 ; ; 16 # No MEDEFAIDRIN NUMBER SIXTEEN +1D2D0 ; 16.0 ; ; 16 # No KAKTOVIK NUMERAL SIXTEEN +1D2F0 ; 16.0 ; ; 16 # No MAYAN NUMERAL SIXTEEN + +# Total code points: 8 + +# ================================================ + +16EE ; 17.0 ; ; 17 # Nl RUNIC ARLAUG SYMBOL +2470 ; 17.0 ; ; 17 # No CIRCLED NUMBER SEVENTEEN +2484 ; 17.0 ; ; 17 # No PARENTHESIZED NUMBER SEVENTEEN +2498 ; 17.0 ; ; 17 # No NUMBER SEVENTEEN FULL STOP +24F1 ; 17.0 ; ; 17 # No NEGATIVE CIRCLED NUMBER SEVENTEEN +16E91 ; 17.0 ; ; 17 # No MEDEFAIDRIN NUMBER SEVENTEEN +1D2D1 ; 17.0 ; ; 17 # No KAKTOVIK NUMERAL SEVENTEEN +1D2F1 ; 17.0 ; ; 17 # No MAYAN NUMERAL SEVENTEEN + +# Total code points: 8 + +# ================================================ + +16EF ; 18.0 ; ; 18 # Nl RUNIC TVIMADUR SYMBOL +2471 ; 18.0 ; ; 18 # No CIRCLED NUMBER EIGHTEEN +2485 ; 18.0 ; ; 18 # No PARENTHESIZED NUMBER EIGHTEEN +2499 ; 18.0 ; ; 18 # No NUMBER EIGHTEEN FULL STOP +24F2 ; 18.0 ; ; 18 # No NEGATIVE CIRCLED NUMBER EIGHTEEN +16E92 ; 18.0 ; ; 18 # No MEDEFAIDRIN NUMBER EIGHTEEN +1D2D2 ; 18.0 ; ; 18 # No KAKTOVIK NUMERAL EIGHTEEN +1D2F2 ; 18.0 ; ; 18 # No MAYAN NUMERAL EIGHTEEN + +# Total code points: 8 + +# ================================================ + +16F0 ; 19.0 ; ; 19 # Nl RUNIC BELGTHOR SYMBOL +2472 ; 19.0 ; ; 19 # No CIRCLED NUMBER NINETEEN +2486 ; 19.0 ; ; 19 # No PARENTHESIZED NUMBER NINETEEN +249A ; 19.0 ; ; 19 # No NUMBER NINETEEN FULL STOP +24F3 ; 19.0 ; ; 19 # No NEGATIVE CIRCLED NUMBER NINETEEN +16E93 ; 19.0 ; ; 19 # No MEDEFAIDRIN NUMBER NINETEEN +1D2D3 ; 19.0 ; ; 19 # No KAKTOVIK NUMERAL NINETEEN +1D2F3 ; 19.0 ; ; 19 # No MAYAN NUMERAL NINETEEN + +# Total code points: 8 + +# ================================================ + +1373 ; 20.0 ; ; 20 # No ETHIOPIC NUMBER TWENTY +2473 ; 20.0 ; ; 20 # No CIRCLED NUMBER TWENTY +2487 ; 20.0 ; ; 20 # No PARENTHESIZED NUMBER TWENTY +249B ; 20.0 ; ; 20 # No NUMBER TWENTY FULL STOP +24F4 ; 20.0 ; ; 20 # No NEGATIVE CIRCLED NUMBER TWENTY +3039 ; 20.0 ; ; 20 # Nl HANGZHOU NUMERAL TWENTY +3249 ; 20.0 ; ; 20 # No CIRCLED NUMBER TWENTY ON BLACK SQUARE +5344 ; 20.0 ; ; 20 # Lo CJK UNIFIED IDEOGRAPH-5344 +5EFF ; 20.0 ; ; 20 # Lo CJK UNIFIED IDEOGRAPH-5EFF +10111 ; 20.0 ; ; 20 # No AEGEAN NUMBER TWENTY +102EB ; 20.0 ; ; 20 # No COPTIC EPACT NUMBER TWENTY +103D4 ; 20.0 ; ; 20 # Nl OLD PERSIAN NUMBER TWENTY +1085C ; 20.0 ; ; 20 # No IMPERIAL ARAMAIC NUMBER TWENTY +1087F ; 20.0 ; ; 20 # No PALMYRENE NUMBER TWENTY +108AE ; 20.0 ; ; 20 # No NABATAEAN NUMBER TWENTY +108FE ; 20.0 ; ; 20 # No HATRAN NUMBER TWENTY +10918 ; 20.0 ; ; 20 # No PHOENICIAN NUMBER TWENTY +109CA ; 20.0 ; ; 20 # No MEROITIC CURSIVE NUMBER TWENTY +10A45 ; 20.0 ; ; 20 # No KHAROSHTHI NUMBER TWENTY +10A9F ; 20.0 ; ; 20 # No OLD NORTH ARABIAN NUMBER TWENTY +10AEE ; 20.0 ; ; 20 # No MANICHAEAN NUMBER TWENTY +10B5D ; 20.0 ; ; 20 # No INSCRIPTIONAL PARTHIAN NUMBER TWENTY +10B7D ; 20.0 ; ; 20 # No INSCRIPTIONAL PAHLAVI NUMBER TWENTY +10BAE ; 20.0 ; ; 20 # No PSALTER PAHLAVI NUMBER TWENTY +10E6A ; 20.0 ; ; 20 # No RUMI NUMBER TWENTY +10F23 ; 20.0 ; ; 20 # No OLD SOGDIAN NUMBER TWENTY +10F53 ; 20.0 ; ; 20 # No SOGDIAN NUMBER TWENTY +10FCA ; 20.0 ; ; 20 # No CHORASMIAN NUMBER TWENTY +1105C ; 20.0 ; ; 20 # No BRAHMI NUMBER TWENTY +111EB ; 20.0 ; ; 20 # No SINHALA ARCHAIC NUMBER TWENTY +1173B ; 20.0 ; ; 20 # No AHOM NUMBER TWENTY +118EB ; 20.0 ; ; 20 # No WARANG CITI NUMBER TWENTY +11C64 ; 20.0 ; ; 20 # No BHAIKSUKI NUMBER TWENTY +1D36A ; 20.0 ; ; 20 # No COUNTING ROD TENS DIGIT TWO +1EC7B ; 20.0 ; ; 20 # No INDIC SIYAQ NUMBER TWENTY +1ED0B ; 20.0 ; ; 20 # No OTTOMAN SIYAQ NUMBER TWENTY + +# Total code points: 36 + +# ================================================ + +3251 ; 21.0 ; ; 21 # No CIRCLED NUMBER TWENTY ONE + +# Total code points: 1 + +# ================================================ + +3252 ; 22.0 ; ; 22 # No CIRCLED NUMBER TWENTY TWO + +# Total code points: 1 + +# ================================================ + +3253 ; 23.0 ; ; 23 # No CIRCLED NUMBER TWENTY THREE + +# Total code points: 1 + +# ================================================ + +3254 ; 24.0 ; ; 24 # No CIRCLED NUMBER TWENTY FOUR + +# Total code points: 1 + +# ================================================ + +3255 ; 25.0 ; ; 25 # No CIRCLED NUMBER TWENTY FIVE + +# Total code points: 1 + +# ================================================ + +3256 ; 26.0 ; ; 26 # No CIRCLED NUMBER TWENTY SIX + +# Total code points: 1 + +# ================================================ + +3257 ; 27.0 ; ; 27 # No CIRCLED NUMBER TWENTY SEVEN + +# Total code points: 1 + +# ================================================ + +3258 ; 28.0 ; ; 28 # No CIRCLED NUMBER TWENTY EIGHT + +# Total code points: 1 + +# ================================================ + +3259 ; 29.0 ; ; 29 # No CIRCLED NUMBER TWENTY NINE + +# Total code points: 1 + +# ================================================ + +1374 ; 30.0 ; ; 30 # No ETHIOPIC NUMBER THIRTY +303A ; 30.0 ; ; 30 # Nl HANGZHOU NUMERAL THIRTY +324A ; 30.0 ; ; 30 # No CIRCLED NUMBER THIRTY ON BLACK SQUARE +325A ; 30.0 ; ; 30 # No CIRCLED NUMBER THIRTY +5345 ; 30.0 ; ; 30 # Lo CJK UNIFIED IDEOGRAPH-5345 +10112 ; 30.0 ; ; 30 # No AEGEAN NUMBER THIRTY +10165 ; 30.0 ; ; 30 # Nl GREEK ACROPHONIC THESPIAN THIRTY +102EC ; 30.0 ; ; 30 # No COPTIC EPACT NUMBER THIRTY +109CB ; 30.0 ; ; 30 # No MEROITIC CURSIVE NUMBER THIRTY +10E6B ; 30.0 ; ; 30 # No RUMI NUMBER THIRTY +10F24 ; 30.0 ; ; 30 # No OLD SOGDIAN NUMBER THIRTY +1105D ; 30.0 ; ; 30 # No BRAHMI NUMBER THIRTY +111EC ; 30.0 ; ; 30 # No SINHALA ARCHAIC NUMBER THIRTY +118EC ; 30.0 ; ; 30 # No WARANG CITI NUMBER THIRTY +11C65 ; 30.0 ; ; 30 # No BHAIKSUKI NUMBER THIRTY +1D36B ; 30.0 ; ; 30 # No COUNTING ROD TENS DIGIT THREE +1EC7C ; 30.0 ; ; 30 # No INDIC SIYAQ NUMBER THIRTY +1ED0C ; 30.0 ; ; 30 # No OTTOMAN SIYAQ NUMBER THIRTY +20983 ; 30.0 ; ; 30 # Lo CJK UNIFIED IDEOGRAPH-20983 + +# Total code points: 19 + +# ================================================ + +325B ; 31.0 ; ; 31 # No CIRCLED NUMBER THIRTY ONE + +# Total code points: 1 + +# ================================================ + +325C ; 32.0 ; ; 32 # No CIRCLED NUMBER THIRTY TWO + +# Total code points: 1 + +# ================================================ + +325D ; 33.0 ; ; 33 # No CIRCLED NUMBER THIRTY THREE + +# Total code points: 1 + +# ================================================ + +325E ; 34.0 ; ; 34 # No CIRCLED NUMBER THIRTY FOUR + +# Total code points: 1 + +# ================================================ + +325F ; 35.0 ; ; 35 # No CIRCLED NUMBER THIRTY FIVE + +# Total code points: 1 + +# ================================================ + +32B1 ; 36.0 ; ; 36 # No CIRCLED NUMBER THIRTY SIX + +# Total code points: 1 + +# ================================================ + +32B2 ; 37.0 ; ; 37 # No CIRCLED NUMBER THIRTY SEVEN + +# Total code points: 1 + +# ================================================ + +32B3 ; 38.0 ; ; 38 # No CIRCLED NUMBER THIRTY EIGHT + +# Total code points: 1 + +# ================================================ + +32B4 ; 39.0 ; ; 39 # No CIRCLED NUMBER THIRTY NINE + +# Total code points: 1 + +# ================================================ + +1375 ; 40.0 ; ; 40 # No ETHIOPIC NUMBER FORTY +324B ; 40.0 ; ; 40 # No CIRCLED NUMBER FORTY ON BLACK SQUARE +32B5 ; 40.0 ; ; 40 # No CIRCLED NUMBER FORTY +534C ; 40.0 ; ; 40 # Lo CJK UNIFIED IDEOGRAPH-534C +10113 ; 40.0 ; ; 40 # No AEGEAN NUMBER FORTY +102ED ; 40.0 ; ; 40 # No COPTIC EPACT NUMBER FORTY +109CC ; 40.0 ; ; 40 # No MEROITIC CURSIVE NUMBER FORTY +10E6C ; 40.0 ; ; 40 # No RUMI NUMBER FORTY +1105E ; 40.0 ; ; 40 # No BRAHMI NUMBER FORTY +111ED ; 40.0 ; ; 40 # No SINHALA ARCHAIC NUMBER FORTY +118ED ; 40.0 ; ; 40 # No WARANG CITI NUMBER FORTY +11C66 ; 40.0 ; ; 40 # No BHAIKSUKI NUMBER FORTY +12467 ; 40.0 ; ; 40 # Nl CUNEIFORM NUMERIC SIGN ELAMITE FORTY +1D36C ; 40.0 ; ; 40 # No COUNTING ROD TENS DIGIT FOUR +1EC7D ; 40.0 ; ; 40 # No INDIC SIYAQ NUMBER FORTY +1ED0D ; 40.0 ; ; 40 # No OTTOMAN SIYAQ NUMBER FORTY +2098C ; 40.0 ; ; 40 # Lo CJK UNIFIED IDEOGRAPH-2098C +2099C ; 40.0 ; ; 40 # Lo CJK UNIFIED IDEOGRAPH-2099C + +# Total code points: 18 + +# ================================================ + +32B6 ; 41.0 ; ; 41 # No CIRCLED NUMBER FORTY ONE + +# Total code points: 1 + +# ================================================ + +32B7 ; 42.0 ; ; 42 # No CIRCLED NUMBER FORTY TWO + +# Total code points: 1 + +# ================================================ + +32B8 ; 43.0 ; ; 43 # No CIRCLED NUMBER FORTY THREE + +# Total code points: 1 + +# ================================================ + +32B9 ; 44.0 ; ; 44 # No CIRCLED NUMBER FORTY FOUR + +# Total code points: 1 + +# ================================================ + +32BA ; 45.0 ; ; 45 # No CIRCLED NUMBER FORTY FIVE + +# Total code points: 1 + +# ================================================ + +32BB ; 46.0 ; ; 46 # No CIRCLED NUMBER FORTY SIX + +# Total code points: 1 + +# ================================================ + +32BC ; 47.0 ; ; 47 # No CIRCLED NUMBER FORTY SEVEN + +# Total code points: 1 + +# ================================================ + +32BD ; 48.0 ; ; 48 # No CIRCLED NUMBER FORTY EIGHT + +# Total code points: 1 + +# ================================================ + +32BE ; 49.0 ; ; 49 # No CIRCLED NUMBER FORTY NINE + +# Total code points: 1 + +# ================================================ + +1376 ; 50.0 ; ; 50 # No ETHIOPIC NUMBER FIFTY +216C ; 50.0 ; ; 50 # Nl ROMAN NUMERAL FIFTY +217C ; 50.0 ; ; 50 # Nl SMALL ROMAN NUMERAL FIFTY +2186 ; 50.0 ; ; 50 # Nl ROMAN NUMERAL FIFTY EARLY FORM +324C ; 50.0 ; ; 50 # No CIRCLED NUMBER FIFTY ON BLACK SQUARE +32BF ; 50.0 ; ; 50 # No CIRCLED NUMBER FIFTY +10114 ; 50.0 ; ; 50 # No AEGEAN NUMBER FIFTY +10144 ; 50.0 ; ; 50 # Nl GREEK ACROPHONIC ATTIC FIFTY +1014A ; 50.0 ; ; 50 # Nl GREEK ACROPHONIC ATTIC FIFTY TALENTS +10151 ; 50.0 ; ; 50 # Nl GREEK ACROPHONIC ATTIC FIFTY STATERS +10166..10169 ; 50.0 ; ; 50 # Nl [4] GREEK ACROPHONIC TROEZENIAN FIFTY..GREEK ACROPHONIC THESPIAN FIFTY +10174 ; 50.0 ; ; 50 # Nl GREEK ACROPHONIC STRATIAN FIFTY MNAS +102EE ; 50.0 ; ; 50 # No COPTIC EPACT NUMBER FIFTY +10323 ; 50.0 ; ; 50 # No OLD ITALIC NUMERAL FIFTY +109CD ; 50.0 ; ; 50 # No MEROITIC CURSIVE NUMBER FIFTY +10A7E ; 50.0 ; ; 50 # No OLD SOUTH ARABIAN NUMBER FIFTY +10CFD ; 50.0 ; ; 50 # No OLD HUNGARIAN NUMBER FIFTY +10E6D ; 50.0 ; ; 50 # No RUMI NUMBER FIFTY +1105F ; 50.0 ; ; 50 # No BRAHMI NUMBER FIFTY +111EE ; 50.0 ; ; 50 # No SINHALA ARCHAIC NUMBER FIFTY +118EE ; 50.0 ; ; 50 # No WARANG CITI NUMBER FIFTY +11C67 ; 50.0 ; ; 50 # No BHAIKSUKI NUMBER FIFTY +12468 ; 50.0 ; ; 50 # Nl CUNEIFORM NUMERIC SIGN ELAMITE FIFTY +1D36D ; 50.0 ; ; 50 # No COUNTING ROD TENS DIGIT FIVE +1EC7E ; 50.0 ; ; 50 # No INDIC SIYAQ NUMBER FIFTY +1ED0E ; 50.0 ; ; 50 # No OTTOMAN SIYAQ NUMBER FIFTY + +# Total code points: 29 + +# ================================================ + +1377 ; 60.0 ; ; 60 # No ETHIOPIC NUMBER SIXTY +324D ; 60.0 ; ; 60 # No CIRCLED NUMBER SIXTY ON BLACK SQUARE +10115 ; 60.0 ; ; 60 # No AEGEAN NUMBER SIXTY +102EF ; 60.0 ; ; 60 # No COPTIC EPACT NUMBER SIXTY +109CE ; 60.0 ; ; 60 # No MEROITIC CURSIVE NUMBER SIXTY +10E6E ; 60.0 ; ; 60 # No RUMI NUMBER SIXTY +11060 ; 60.0 ; ; 60 # No BRAHMI NUMBER SIXTY +111EF ; 60.0 ; ; 60 # No SINHALA ARCHAIC NUMBER SIXTY +118EF ; 60.0 ; ; 60 # No WARANG CITI NUMBER SIXTY +11C68 ; 60.0 ; ; 60 # No BHAIKSUKI NUMBER SIXTY +1D36E ; 60.0 ; ; 60 # No COUNTING ROD TENS DIGIT SIX +1EC7F ; 60.0 ; ; 60 # No INDIC SIYAQ NUMBER SIXTY +1ED0F ; 60.0 ; ; 60 # No OTTOMAN SIYAQ NUMBER SIXTY + +# Total code points: 13 + +# ================================================ + +1378 ; 70.0 ; ; 70 # No ETHIOPIC NUMBER SEVENTY +324E ; 70.0 ; ; 70 # No CIRCLED NUMBER SEVENTY ON BLACK SQUARE +10116 ; 70.0 ; ; 70 # No AEGEAN NUMBER SEVENTY +102F0 ; 70.0 ; ; 70 # No COPTIC EPACT NUMBER SEVENTY +109CF ; 70.0 ; ; 70 # No MEROITIC CURSIVE NUMBER SEVENTY +10E6F ; 70.0 ; ; 70 # No RUMI NUMBER SEVENTY +11061 ; 70.0 ; ; 70 # No BRAHMI NUMBER SEVENTY +111F0 ; 70.0 ; ; 70 # No SINHALA ARCHAIC NUMBER SEVENTY +118F0 ; 70.0 ; ; 70 # No WARANG CITI NUMBER SEVENTY +11C69 ; 70.0 ; ; 70 # No BHAIKSUKI NUMBER SEVENTY +1D36F ; 70.0 ; ; 70 # No COUNTING ROD TENS DIGIT SEVEN +1EC80 ; 70.0 ; ; 70 # No INDIC SIYAQ NUMBER SEVENTY +1ED10 ; 70.0 ; ; 70 # No OTTOMAN SIYAQ NUMBER SEVENTY + +# Total code points: 13 + +# ================================================ + +1379 ; 80.0 ; ; 80 # No ETHIOPIC NUMBER EIGHTY +324F ; 80.0 ; ; 80 # No CIRCLED NUMBER EIGHTY ON BLACK SQUARE +10117 ; 80.0 ; ; 80 # No AEGEAN NUMBER EIGHTY +102F1 ; 80.0 ; ; 80 # No COPTIC EPACT NUMBER EIGHTY +10E70 ; 80.0 ; ; 80 # No RUMI NUMBER EIGHTY +11062 ; 80.0 ; ; 80 # No BRAHMI NUMBER EIGHTY +111F1 ; 80.0 ; ; 80 # No SINHALA ARCHAIC NUMBER EIGHTY +118F1 ; 80.0 ; ; 80 # No WARANG CITI NUMBER EIGHTY +11C6A ; 80.0 ; ; 80 # No BHAIKSUKI NUMBER EIGHTY +1D370 ; 80.0 ; ; 80 # No COUNTING ROD TENS DIGIT EIGHT +1EC81 ; 80.0 ; ; 80 # No INDIC SIYAQ NUMBER EIGHTY +1ED11 ; 80.0 ; ; 80 # No OTTOMAN SIYAQ NUMBER EIGHTY + +# Total code points: 12 + +# ================================================ + +137A ; 90.0 ; ; 90 # No ETHIOPIC NUMBER NINETY +10118 ; 90.0 ; ; 90 # No AEGEAN NUMBER NINETY +102F2 ; 90.0 ; ; 90 # No COPTIC EPACT NUMBER NINETY +10341 ; 90.0 ; ; 90 # Nl GOTHIC LETTER NINETY +10E71 ; 90.0 ; ; 90 # No RUMI NUMBER NINETY +11063 ; 90.0 ; ; 90 # No BRAHMI NUMBER NINETY +111F2 ; 90.0 ; ; 90 # No SINHALA ARCHAIC NUMBER NINETY +118F2 ; 90.0 ; ; 90 # No WARANG CITI NUMBER NINETY +11C6B ; 90.0 ; ; 90 # No BHAIKSUKI NUMBER NINETY +1D371 ; 90.0 ; ; 90 # No COUNTING ROD TENS DIGIT NINE +1EC82 ; 90.0 ; ; 90 # No INDIC SIYAQ NUMBER NINETY +1ED12 ; 90.0 ; ; 90 # No OTTOMAN SIYAQ NUMBER NINETY + +# Total code points: 12 + +# ================================================ + +0BF1 ; 100.0 ; ; 100 # No TAMIL NUMBER ONE HUNDRED +0D71 ; 100.0 ; ; 100 # No MALAYALAM NUMBER ONE HUNDRED +137B ; 100.0 ; ; 100 # No ETHIOPIC NUMBER HUNDRED +216D ; 100.0 ; ; 100 # Nl ROMAN NUMERAL ONE HUNDRED +217D ; 100.0 ; ; 100 # Nl SMALL ROMAN NUMERAL ONE HUNDRED +4F70 ; 100.0 ; ; 100 # Lo CJK UNIFIED IDEOGRAPH-4F70 +767E ; 100.0 ; ; 100 # Lo CJK UNIFIED IDEOGRAPH-767E +964C ; 100.0 ; ; 100 # Lo CJK UNIFIED IDEOGRAPH-964C +10119 ; 100.0 ; ; 100 # No AEGEAN NUMBER ONE HUNDRED +1014B ; 100.0 ; ; 100 # Nl GREEK ACROPHONIC ATTIC ONE HUNDRED TALENTS +10152 ; 100.0 ; ; 100 # Nl GREEK ACROPHONIC ATTIC ONE HUNDRED STATERS +1016A ; 100.0 ; ; 100 # Nl GREEK ACROPHONIC THESPIAN ONE HUNDRED +102F3 ; 100.0 ; ; 100 # No COPTIC EPACT NUMBER ONE HUNDRED +103D5 ; 100.0 ; ; 100 # Nl OLD PERSIAN NUMBER HUNDRED +1085D ; 100.0 ; ; 100 # No IMPERIAL ARAMAIC NUMBER ONE HUNDRED +108AF ; 100.0 ; ; 100 # No NABATAEAN NUMBER ONE HUNDRED +108FF ; 100.0 ; ; 100 # No HATRAN NUMBER ONE HUNDRED +10919 ; 100.0 ; ; 100 # No PHOENICIAN NUMBER ONE HUNDRED +109D2 ; 100.0 ; ; 100 # No MEROITIC CURSIVE NUMBER ONE HUNDRED +10A46 ; 100.0 ; ; 100 # No KHAROSHTHI NUMBER ONE HUNDRED +10AEF ; 100.0 ; ; 100 # No MANICHAEAN NUMBER ONE HUNDRED +10B5E ; 100.0 ; ; 100 # No INSCRIPTIONAL PARTHIAN NUMBER ONE HUNDRED +10B7E ; 100.0 ; ; 100 # No INSCRIPTIONAL PAHLAVI NUMBER ONE HUNDRED +10BAF ; 100.0 ; ; 100 # No PSALTER PAHLAVI NUMBER ONE HUNDRED +10CFE ; 100.0 ; ; 100 # No OLD HUNGARIAN NUMBER ONE HUNDRED +10E72 ; 100.0 ; ; 100 # No RUMI NUMBER ONE HUNDRED +10F25 ; 100.0 ; ; 100 # No OLD SOGDIAN NUMBER ONE HUNDRED +10F54 ; 100.0 ; ; 100 # No SOGDIAN NUMBER ONE HUNDRED +10FCB ; 100.0 ; ; 100 # No CHORASMIAN NUMBER ONE HUNDRED +11064 ; 100.0 ; ; 100 # No BRAHMI NUMBER ONE HUNDRED +111F3 ; 100.0 ; ; 100 # No SINHALA ARCHAIC NUMBER ONE HUNDRED +11C6C ; 100.0 ; ; 100 # No BHAIKSUKI HUNDREDS UNIT MARK +16B5C ; 100.0 ; ; 100 # No PAHAWH HMONG NUMBER HUNDREDS +1EC83 ; 100.0 ; ; 100 # No INDIC SIYAQ NUMBER ONE HUNDRED +1ED13 ; 100.0 ; ; 100 # No OTTOMAN SIYAQ NUMBER ONE HUNDRED + +# Total code points: 35 + +# ================================================ + +7695 ; 200.0 ; ; 200 # Lo CJK UNIFIED IDEOGRAPH-7695 +1011A ; 200.0 ; ; 200 # No AEGEAN NUMBER TWO HUNDRED +102F4 ; 200.0 ; ; 200 # No COPTIC EPACT NUMBER TWO HUNDRED +109D3 ; 200.0 ; ; 200 # No MEROITIC CURSIVE NUMBER TWO HUNDRED +10E73 ; 200.0 ; ; 200 # No RUMI NUMBER TWO HUNDRED +1EC84 ; 200.0 ; ; 200 # No INDIC SIYAQ NUMBER TWO HUNDRED +1ED14 ; 200.0 ; ; 200 # No OTTOMAN SIYAQ NUMBER TWO HUNDRED + +# Total code points: 7 + +# ================================================ + +1011B ; 300.0 ; ; 300 # No AEGEAN NUMBER THREE HUNDRED +1016B ; 300.0 ; ; 300 # Nl GREEK ACROPHONIC THESPIAN THREE HUNDRED +102F5 ; 300.0 ; ; 300 # No COPTIC EPACT NUMBER THREE HUNDRED +109D4 ; 300.0 ; ; 300 # No MEROITIC CURSIVE NUMBER THREE HUNDRED +10E74 ; 300.0 ; ; 300 # No RUMI NUMBER THREE HUNDRED +1EC85 ; 300.0 ; ; 300 # No INDIC SIYAQ NUMBER THREE HUNDRED +1ED15 ; 300.0 ; ; 300 # No OTTOMAN SIYAQ NUMBER THREE HUNDRED + +# Total code points: 7 + +# ================================================ + +1011C ; 400.0 ; ; 400 # No AEGEAN NUMBER FOUR HUNDRED +102F6 ; 400.0 ; ; 400 # No COPTIC EPACT NUMBER FOUR HUNDRED +109D5 ; 400.0 ; ; 400 # No MEROITIC CURSIVE NUMBER FOUR HUNDRED +10E75 ; 400.0 ; ; 400 # No RUMI NUMBER FOUR HUNDRED +1EC86 ; 400.0 ; ; 400 # No INDIC SIYAQ NUMBER FOUR HUNDRED +1ED16 ; 400.0 ; ; 400 # No OTTOMAN SIYAQ NUMBER FOUR HUNDRED +1ED38 ; 400.0 ; ; 400 # No OTTOMAN SIYAQ ALTERNATE NUMBER FOUR HUNDRED + +# Total code points: 7 + +# ================================================ + +216E ; 500.0 ; ; 500 # Nl ROMAN NUMERAL FIVE HUNDRED +217E ; 500.0 ; ; 500 # Nl SMALL ROMAN NUMERAL FIVE HUNDRED +1011D ; 500.0 ; ; 500 # No AEGEAN NUMBER FIVE HUNDRED +10145 ; 500.0 ; ; 500 # Nl GREEK ACROPHONIC ATTIC FIVE HUNDRED +1014C ; 500.0 ; ; 500 # Nl GREEK ACROPHONIC ATTIC FIVE HUNDRED TALENTS +10153 ; 500.0 ; ; 500 # Nl GREEK ACROPHONIC ATTIC FIVE HUNDRED STATERS +1016C..10170 ; 500.0 ; ; 500 # Nl [5] GREEK ACROPHONIC EPIDAUREAN FIVE HUNDRED..GREEK ACROPHONIC NAXIAN FIVE HUNDRED +102F7 ; 500.0 ; ; 500 # No COPTIC EPACT NUMBER FIVE HUNDRED +109D6 ; 500.0 ; ; 500 # No MEROITIC CURSIVE NUMBER FIVE HUNDRED +10E76 ; 500.0 ; ; 500 # No RUMI NUMBER FIVE HUNDRED +1EC87 ; 500.0 ; ; 500 # No INDIC SIYAQ NUMBER FIVE HUNDRED +1ED17 ; 500.0 ; ; 500 # No OTTOMAN SIYAQ NUMBER FIVE HUNDRED + +# Total code points: 16 + +# ================================================ + +1011E ; 600.0 ; ; 600 # No AEGEAN NUMBER SIX HUNDRED +102F8 ; 600.0 ; ; 600 # No COPTIC EPACT NUMBER SIX HUNDRED +109D7 ; 600.0 ; ; 600 # No MEROITIC CURSIVE NUMBER SIX HUNDRED +10E77 ; 600.0 ; ; 600 # No RUMI NUMBER SIX HUNDRED +1EC88 ; 600.0 ; ; 600 # No INDIC SIYAQ NUMBER SIX HUNDRED +1ED18 ; 600.0 ; ; 600 # No OTTOMAN SIYAQ NUMBER SIX HUNDRED +1ED39 ; 600.0 ; ; 600 # No OTTOMAN SIYAQ ALTERNATE NUMBER SIX HUNDRED + +# Total code points: 7 + +# ================================================ + +1011F ; 700.0 ; ; 700 # No AEGEAN NUMBER SEVEN HUNDRED +102F9 ; 700.0 ; ; 700 # No COPTIC EPACT NUMBER SEVEN HUNDRED +109D8 ; 700.0 ; ; 700 # No MEROITIC CURSIVE NUMBER SEVEN HUNDRED +10E78 ; 700.0 ; ; 700 # No RUMI NUMBER SEVEN HUNDRED +1EC89 ; 700.0 ; ; 700 # No INDIC SIYAQ NUMBER SEVEN HUNDRED +1ED19 ; 700.0 ; ; 700 # No OTTOMAN SIYAQ NUMBER SEVEN HUNDRED + +# Total code points: 6 + +# ================================================ + +10120 ; 800.0 ; ; 800 # No AEGEAN NUMBER EIGHT HUNDRED +102FA ; 800.0 ; ; 800 # No COPTIC EPACT NUMBER EIGHT HUNDRED +109D9 ; 800.0 ; ; 800 # No MEROITIC CURSIVE NUMBER EIGHT HUNDRED +10E79 ; 800.0 ; ; 800 # No RUMI NUMBER EIGHT HUNDRED +1EC8A ; 800.0 ; ; 800 # No INDIC SIYAQ NUMBER EIGHT HUNDRED +1ED1A ; 800.0 ; ; 800 # No OTTOMAN SIYAQ NUMBER EIGHT HUNDRED + +# Total code points: 6 + +# ================================================ + +10121 ; 900.0 ; ; 900 # No AEGEAN NUMBER NINE HUNDRED +102FB ; 900.0 ; ; 900 # No COPTIC EPACT NUMBER NINE HUNDRED +1034A ; 900.0 ; ; 900 # Nl GOTHIC LETTER NINE HUNDRED +109DA ; 900.0 ; ; 900 # No MEROITIC CURSIVE NUMBER NINE HUNDRED +10E7A ; 900.0 ; ; 900 # No RUMI NUMBER NINE HUNDRED +1EC8B ; 900.0 ; ; 900 # No INDIC SIYAQ NUMBER NINE HUNDRED +1ED1B ; 900.0 ; ; 900 # No OTTOMAN SIYAQ NUMBER NINE HUNDRED + +# Total code points: 7 + +# ================================================ + +0BF2 ; 1000.0 ; ; 1000 # No TAMIL NUMBER ONE THOUSAND +0D72 ; 1000.0 ; ; 1000 # No MALAYALAM NUMBER ONE THOUSAND +216F ; 1000.0 ; ; 1000 # Nl ROMAN NUMERAL ONE THOUSAND +217F..2180 ; 1000.0 ; ; 1000 # Nl [2] SMALL ROMAN NUMERAL ONE THOUSAND..ROMAN NUMERAL ONE THOUSAND C D +4EDF ; 1000.0 ; ; 1000 # Lo CJK UNIFIED IDEOGRAPH-4EDF +5343 ; 1000.0 ; ; 1000 # Lo CJK UNIFIED IDEOGRAPH-5343 +9621 ; 1000.0 ; ; 1000 # Lo CJK UNIFIED IDEOGRAPH-9621 +10122 ; 1000.0 ; ; 1000 # No AEGEAN NUMBER ONE THOUSAND +1014D ; 1000.0 ; ; 1000 # Nl GREEK ACROPHONIC ATTIC ONE THOUSAND TALENTS +10154 ; 1000.0 ; ; 1000 # Nl GREEK ACROPHONIC ATTIC ONE THOUSAND STATERS +10171 ; 1000.0 ; ; 1000 # Nl GREEK ACROPHONIC THESPIAN ONE THOUSAND +1085E ; 1000.0 ; ; 1000 # No IMPERIAL ARAMAIC NUMBER ONE THOUSAND +109DB ; 1000.0 ; ; 1000 # No MEROITIC CURSIVE NUMBER ONE THOUSAND +10A47 ; 1000.0 ; ; 1000 # No KHAROSHTHI NUMBER ONE THOUSAND +10B5F ; 1000.0 ; ; 1000 # No INSCRIPTIONAL PARTHIAN NUMBER ONE THOUSAND +10B7F ; 1000.0 ; ; 1000 # No INSCRIPTIONAL PAHLAVI NUMBER ONE THOUSAND +10CFF ; 1000.0 ; ; 1000 # No OLD HUNGARIAN NUMBER ONE THOUSAND +11065 ; 1000.0 ; ; 1000 # No BRAHMI NUMBER ONE THOUSAND +111F4 ; 1000.0 ; ; 1000 # No SINHALA ARCHAIC NUMBER ONE THOUSAND +1EC8C ; 1000.0 ; ; 1000 # No INDIC SIYAQ NUMBER ONE THOUSAND +1ED1C ; 1000.0 ; ; 1000 # No OTTOMAN SIYAQ NUMBER ONE THOUSAND + +# Total code points: 22 + +# ================================================ + +10123 ; 2000.0 ; ; 2000 # No AEGEAN NUMBER TWO THOUSAND +109DC ; 2000.0 ; ; 2000 # No MEROITIC CURSIVE NUMBER TWO THOUSAND +1EC8D ; 2000.0 ; ; 2000 # No INDIC SIYAQ NUMBER TWO THOUSAND +1ED1D ; 2000.0 ; ; 2000 # No OTTOMAN SIYAQ NUMBER TWO THOUSAND +1ED3A ; 2000.0 ; ; 2000 # No OTTOMAN SIYAQ ALTERNATE NUMBER TWO THOUSAND + +# Total code points: 5 + +# ================================================ + +10124 ; 3000.0 ; ; 3000 # No AEGEAN NUMBER THREE THOUSAND +109DD ; 3000.0 ; ; 3000 # No MEROITIC CURSIVE NUMBER THREE THOUSAND +1EC8E ; 3000.0 ; ; 3000 # No INDIC SIYAQ NUMBER THREE THOUSAND +1ED1E ; 3000.0 ; ; 3000 # No OTTOMAN SIYAQ NUMBER THREE THOUSAND + +# Total code points: 4 + +# ================================================ + +10125 ; 4000.0 ; ; 4000 # No AEGEAN NUMBER FOUR THOUSAND +109DE ; 4000.0 ; ; 4000 # No MEROITIC CURSIVE NUMBER FOUR THOUSAND +1EC8F ; 4000.0 ; ; 4000 # No INDIC SIYAQ NUMBER FOUR THOUSAND +1ED1F ; 4000.0 ; ; 4000 # No OTTOMAN SIYAQ NUMBER FOUR THOUSAND + +# Total code points: 4 + +# ================================================ + +2181 ; 5000.0 ; ; 5000 # Nl ROMAN NUMERAL FIVE THOUSAND +10126 ; 5000.0 ; ; 5000 # No AEGEAN NUMBER FIVE THOUSAND +10146 ; 5000.0 ; ; 5000 # Nl GREEK ACROPHONIC ATTIC FIVE THOUSAND +1014E ; 5000.0 ; ; 5000 # Nl GREEK ACROPHONIC ATTIC FIVE THOUSAND TALENTS +10172 ; 5000.0 ; ; 5000 # Nl GREEK ACROPHONIC THESPIAN FIVE THOUSAND +109DF ; 5000.0 ; ; 5000 # No MEROITIC CURSIVE NUMBER FIVE THOUSAND +1EC90 ; 5000.0 ; ; 5000 # No INDIC SIYAQ NUMBER FIVE THOUSAND +1ED20 ; 5000.0 ; ; 5000 # No OTTOMAN SIYAQ NUMBER FIVE THOUSAND + +# Total code points: 8 + +# ================================================ + +10127 ; 6000.0 ; ; 6000 # No AEGEAN NUMBER SIX THOUSAND +109E0 ; 6000.0 ; ; 6000 # No MEROITIC CURSIVE NUMBER SIX THOUSAND +1EC91 ; 6000.0 ; ; 6000 # No INDIC SIYAQ NUMBER SIX THOUSAND +1ED21 ; 6000.0 ; ; 6000 # No OTTOMAN SIYAQ NUMBER SIX THOUSAND + +# Total code points: 4 + +# ================================================ + +10128 ; 7000.0 ; ; 7000 # No AEGEAN NUMBER SEVEN THOUSAND +109E1 ; 7000.0 ; ; 7000 # No MEROITIC CURSIVE NUMBER SEVEN THOUSAND +1EC92 ; 7000.0 ; ; 7000 # No INDIC SIYAQ NUMBER SEVEN THOUSAND +1ED22 ; 7000.0 ; ; 7000 # No OTTOMAN SIYAQ NUMBER SEVEN THOUSAND + +# Total code points: 4 + +# ================================================ + +10129 ; 8000.0 ; ; 8000 # No AEGEAN NUMBER EIGHT THOUSAND +109E2 ; 8000.0 ; ; 8000 # No MEROITIC CURSIVE NUMBER EIGHT THOUSAND +1EC93 ; 8000.0 ; ; 8000 # No INDIC SIYAQ NUMBER EIGHT THOUSAND +1ED23 ; 8000.0 ; ; 8000 # No OTTOMAN SIYAQ NUMBER EIGHT THOUSAND + +# Total code points: 4 + +# ================================================ + +1012A ; 9000.0 ; ; 9000 # No AEGEAN NUMBER NINE THOUSAND +109E3 ; 9000.0 ; ; 9000 # No MEROITIC CURSIVE NUMBER NINE THOUSAND +1EC94 ; 9000.0 ; ; 9000 # No INDIC SIYAQ NUMBER NINE THOUSAND +1ED24 ; 9000.0 ; ; 9000 # No OTTOMAN SIYAQ NUMBER NINE THOUSAND + +# Total code points: 4 + +# ================================================ + +137C ; 10000.0 ; ; 10000 # No ETHIOPIC NUMBER TEN THOUSAND +2182 ; 10000.0 ; ; 10000 # Nl ROMAN NUMERAL TEN THOUSAND +4E07 ; 10000.0 ; ; 10000 # Lo CJK UNIFIED IDEOGRAPH-4E07 +842C ; 10000.0 ; ; 10000 # Lo CJK UNIFIED IDEOGRAPH-842C +1012B ; 10000.0 ; ; 10000 # No AEGEAN NUMBER TEN THOUSAND +10155 ; 10000.0 ; ; 10000 # Nl GREEK ACROPHONIC ATTIC TEN THOUSAND STATERS +1085F ; 10000.0 ; ; 10000 # No IMPERIAL ARAMAIC NUMBER TEN THOUSAND +109E4 ; 10000.0 ; ; 10000 # No MEROITIC CURSIVE NUMBER TEN THOUSAND +16B5D ; 10000.0 ; ; 10000 # No PAHAWH HMONG NUMBER TEN THOUSANDS +1EC95 ; 10000.0 ; ; 10000 # No INDIC SIYAQ NUMBER TEN THOUSAND +1ECB3 ; 10000.0 ; ; 10000 # No INDIC SIYAQ NUMBER ALTERNATE TEN THOUSAND +1ED25 ; 10000.0 ; ; 10000 # No OTTOMAN SIYAQ NUMBER TEN THOUSAND +1ED3B ; 10000.0 ; ; 10000 # No OTTOMAN SIYAQ ALTERNATE NUMBER TEN THOUSAND + +# Total code points: 13 + +# ================================================ + +1012C ; 20000.0 ; ; 20000 # No AEGEAN NUMBER TWENTY THOUSAND +109E5 ; 20000.0 ; ; 20000 # No MEROITIC CURSIVE NUMBER TWENTY THOUSAND +1EC96 ; 20000.0 ; ; 20000 # No INDIC SIYAQ NUMBER TWENTY THOUSAND +1ED26 ; 20000.0 ; ; 20000 # No OTTOMAN SIYAQ NUMBER TWENTY THOUSAND + +# Total code points: 4 + +# ================================================ + +1012D ; 30000.0 ; ; 30000 # No AEGEAN NUMBER THIRTY THOUSAND +109E6 ; 30000.0 ; ; 30000 # No MEROITIC CURSIVE NUMBER THIRTY THOUSAND +1EC97 ; 30000.0 ; ; 30000 # No INDIC SIYAQ NUMBER THIRTY THOUSAND +1ED27 ; 30000.0 ; ; 30000 # No OTTOMAN SIYAQ NUMBER THIRTY THOUSAND + +# Total code points: 4 + +# ================================================ + +1012E ; 40000.0 ; ; 40000 # No AEGEAN NUMBER FORTY THOUSAND +109E7 ; 40000.0 ; ; 40000 # No MEROITIC CURSIVE NUMBER FORTY THOUSAND +1EC98 ; 40000.0 ; ; 40000 # No INDIC SIYAQ NUMBER FORTY THOUSAND +1ED28 ; 40000.0 ; ; 40000 # No OTTOMAN SIYAQ NUMBER FORTY THOUSAND + +# Total code points: 4 + +# ================================================ + +2187 ; 50000.0 ; ; 50000 # Nl ROMAN NUMERAL FIFTY THOUSAND +1012F ; 50000.0 ; ; 50000 # No AEGEAN NUMBER FIFTY THOUSAND +10147 ; 50000.0 ; ; 50000 # Nl GREEK ACROPHONIC ATTIC FIFTY THOUSAND +10156 ; 50000.0 ; ; 50000 # Nl GREEK ACROPHONIC ATTIC FIFTY THOUSAND STATERS +109E8 ; 50000.0 ; ; 50000 # No MEROITIC CURSIVE NUMBER FIFTY THOUSAND +1EC99 ; 50000.0 ; ; 50000 # No INDIC SIYAQ NUMBER FIFTY THOUSAND +1ED29 ; 50000.0 ; ; 50000 # No OTTOMAN SIYAQ NUMBER FIFTY THOUSAND + +# Total code points: 7 + +# ================================================ + +10130 ; 60000.0 ; ; 60000 # No AEGEAN NUMBER SIXTY THOUSAND +109E9 ; 60000.0 ; ; 60000 # No MEROITIC CURSIVE NUMBER SIXTY THOUSAND +1EC9A ; 60000.0 ; ; 60000 # No INDIC SIYAQ NUMBER SIXTY THOUSAND +1ED2A ; 60000.0 ; ; 60000 # No OTTOMAN SIYAQ NUMBER SIXTY THOUSAND + +# Total code points: 4 + +# ================================================ + +10131 ; 70000.0 ; ; 70000 # No AEGEAN NUMBER SEVENTY THOUSAND +109EA ; 70000.0 ; ; 70000 # No MEROITIC CURSIVE NUMBER SEVENTY THOUSAND +1EC9B ; 70000.0 ; ; 70000 # No INDIC SIYAQ NUMBER SEVENTY THOUSAND +1ED2B ; 70000.0 ; ; 70000 # No OTTOMAN SIYAQ NUMBER SEVENTY THOUSAND + +# Total code points: 4 + +# ================================================ + +10132 ; 80000.0 ; ; 80000 # No AEGEAN NUMBER EIGHTY THOUSAND +109EB ; 80000.0 ; ; 80000 # No MEROITIC CURSIVE NUMBER EIGHTY THOUSAND +1EC9C ; 80000.0 ; ; 80000 # No INDIC SIYAQ NUMBER EIGHTY THOUSAND +1ED2C ; 80000.0 ; ; 80000 # No OTTOMAN SIYAQ NUMBER EIGHTY THOUSAND + +# Total code points: 4 + +# ================================================ + +10133 ; 90000.0 ; ; 90000 # No AEGEAN NUMBER NINETY THOUSAND +109EC ; 90000.0 ; ; 90000 # No MEROITIC CURSIVE NUMBER NINETY THOUSAND +1EC9D ; 90000.0 ; ; 90000 # No INDIC SIYAQ NUMBER NINETY THOUSAND +1ED2D ; 90000.0 ; ; 90000 # No OTTOMAN SIYAQ NUMBER NINETY THOUSAND + +# Total code points: 4 + +# ================================================ + +2188 ; 100000.0 ; ; 100000 # Nl ROMAN NUMERAL ONE HUNDRED THOUSAND +109ED ; 100000.0 ; ; 100000 # No MEROITIC CURSIVE NUMBER ONE HUNDRED THOUSAND +1EC9E ; 100000.0 ; ; 100000 # No INDIC SIYAQ NUMBER LAKH +1ECA0 ; 100000.0 ; ; 100000 # No INDIC SIYAQ LAKH MARK +1ECB4 ; 100000.0 ; ; 100000 # No INDIC SIYAQ ALTERNATE LAKH MARK + +# Total code points: 5 + +# ================================================ + +109EE ; 200000.0 ; ; 200000 # No MEROITIC CURSIVE NUMBER TWO HUNDRED THOUSAND +1EC9F ; 200000.0 ; ; 200000 # No INDIC SIYAQ NUMBER LAKHAN + +# Total code points: 2 + +# ================================================ + +12432 ; 216000.0 ; ; 216000 # Nl CUNEIFORM NUMERIC SIGN SHAR2 TIMES GAL PLUS DISH + +# Total code points: 1 + +# ================================================ + +109EF ; 300000.0 ; ; 300000 # No MEROITIC CURSIVE NUMBER THREE HUNDRED THOUSAND + +# Total code points: 1 + +# ================================================ + +109F0 ; 400000.0 ; ; 400000 # No MEROITIC CURSIVE NUMBER FOUR HUNDRED THOUSAND + +# Total code points: 1 + +# ================================================ + +12433 ; 432000.0 ; ; 432000 # Nl CUNEIFORM NUMERIC SIGN SHAR2 TIMES GAL PLUS MIN + +# Total code points: 1 + +# ================================================ + +109F1 ; 500000.0 ; ; 500000 # No MEROITIC CURSIVE NUMBER FIVE HUNDRED THOUSAND + +# Total code points: 1 + +# ================================================ + +109F2 ; 600000.0 ; ; 600000 # No MEROITIC CURSIVE NUMBER SIX HUNDRED THOUSAND + +# Total code points: 1 + +# ================================================ + +109F3 ; 700000.0 ; ; 700000 # No MEROITIC CURSIVE NUMBER SEVEN HUNDRED THOUSAND + +# Total code points: 1 + +# ================================================ + +109F4 ; 800000.0 ; ; 800000 # No MEROITIC CURSIVE NUMBER EIGHT HUNDRED THOUSAND + +# Total code points: 1 + +# ================================================ + +109F5 ; 900000.0 ; ; 900000 # No MEROITIC CURSIVE NUMBER NINE HUNDRED THOUSAND + +# Total code points: 1 + +# ================================================ + +16B5E ; 1000000.0 ; ; 1000000 # No PAHAWH HMONG NUMBER MILLIONS + +# Total code points: 1 + +# ================================================ + +1ECA1 ; 10000000.0 ; ; 10000000 # No INDIC SIYAQ NUMBER KAROR + +# Total code points: 1 + +# ================================================ + +1ECA2 ; 20000000.0 ; ; 20000000 # No INDIC SIYAQ NUMBER KARORAN + +# Total code points: 1 + +# ================================================ + +4EBF ; 100000000.0 ; ; 100000000 # Lo CJK UNIFIED IDEOGRAPH-4EBF +5104 ; 100000000.0 ; ; 100000000 # Lo CJK UNIFIED IDEOGRAPH-5104 +16B5F ; 100000000.0 ; ; 100000000 # No PAHAWH HMONG NUMBER HUNDRED MILLIONS + +# Total code points: 3 + +# ================================================ + +79ED ; 1000000000.0 ; ; 1000000000 # Lo CJK UNIFIED IDEOGRAPH-79ED + +# Total code points: 1 + +# ================================================ + +16B60 ; 10000000000.0 ; ; 10000000000 # No PAHAWH HMONG NUMBER TEN BILLIONS + +# Total code points: 1 + +# ================================================ + +5146 ; 1000000000000.0 ; ; 1000000000000 # Lo CJK UNIFIED IDEOGRAPH-5146 +16B61 ; 1000000000000.0 ; ; 1000000000000 # No PAHAWH HMONG NUMBER TRILLIONS + +# Total code points: 2 + +# ================================================ + +4EAC ; 10000000000000000.0 ; ; 10000000000000000 # Lo CJK UNIFIED IDEOGRAPH-4EAC + +# Total code points: 1 + +# EOF diff --git a/crates/stdlib/unicode/latest/NormalizationCorrections.txt b/crates/stdlib/unicode/latest/NormalizationCorrections.txt new file mode 100644 index 000000000..41ce301fd --- /dev/null +++ b/crates/stdlib/unicode/latest/NormalizationCorrections.txt @@ -0,0 +1,53 @@ +# NormalizationCorrections-17.0.0.txt +# Date: 2025-08-01 +# © 2025 Unicode®, Inc. +# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. +# For terms of use and license, see https://www.unicode.org/terms_of_use.html +# +# Unicode Character Database +# For documentation, see https://www.unicode.org/reports/tr44/ +# +# This file is a normative contributory data file in the +# Unicode Character Database. +# +# The normalization stability policy of the Unicode Consortium +# ordinarily precludes any change to the decomposition +# for any character, once established in a relevant version +# of the UnicodeData.txt data file. However, under certain +# exceptional (and rare) conditions, an error in a decomposition +# mapping may be discovered that is truly just an unintended +# typo in the data, and not a matter of dubious interpretation. +# +# Whenever such an error may be found, and if it meets the +# requirements for possible exceptions to normalization +# stability, the correction is entered in this data file, +# so that any implementation depending on absolute stability +# of normalization, *including* any errors in the data, can +# safely reconstruct the exact state of the data tables at +# any given version of Unicode. +# +# Currently this list has exactly six entries in it, one for the +# typo found and corrected in Corrigendum #3, and five for +# the typos and misidentifications found and corrected in +# Corrigendum #4. All efforts +# will be made to keep the entries limited to just those fixes. +# +# Interpretation of the fields: +# Field 0: Unicode code point +# Field 1: Original (erroneous) decomposition +# Field 2: Corrected decomposition +# Field 3: Version of Unicode for which the correction was +# entered into UnicodeData.txt, in n.n.n format. +# Comment: Indicates the Unicode Corrigendum which documents +# the correction +# +# For more information, see UAX #15, Unicode Normalization Forms. +# +F951;96FB;964B;3.2.0 # Corrigendum 3 +2F868;2136A;36FC;4.0.0 # Corrigendum 4 +2F874;5F33;5F53;4.0.0 # Corrigendum 4 +2F91F;43AB;243AB;4.0.0 # Corrigendum 4 +2F95F;7AAE;7AEE;4.0.0 # Corrigendum 4 +2F9BF;4D57;45D7;4.0.0 # Corrigendum 4 + +# EOF diff --git a/crates/stdlib/unicode/latest/UnicodeData.txt b/crates/stdlib/unicode/latest/UnicodeData.txt new file mode 100644 index 000000000..fca68e3e1 --- /dev/null +++ b/crates/stdlib/unicode/latest/UnicodeData.txt @@ -0,0 +1,40575 @@ +0000;;Cc;0;BN;;;;;N;NULL;;;; +0001;;Cc;0;BN;;;;;N;START OF HEADING;;;; +0002;;Cc;0;BN;;;;;N;START OF TEXT;;;; +0003;;Cc;0;BN;;;;;N;END OF TEXT;;;; +0004;;Cc;0;BN;;;;;N;END OF TRANSMISSION;;;; +0005;;Cc;0;BN;;;;;N;ENQUIRY;;;; +0006;;Cc;0;BN;;;;;N;ACKNOWLEDGE;;;; +0007;;Cc;0;BN;;;;;N;BELL;;;; +0008;;Cc;0;BN;;;;;N;BACKSPACE;;;; +0009;;Cc;0;S;;;;;N;CHARACTER TABULATION;;;; +000A;;Cc;0;B;;;;;N;LINE FEED (LF);;;; +000B;;Cc;0;S;;;;;N;LINE TABULATION;;;; +000C;;Cc;0;WS;;;;;N;FORM FEED (FF);;;; +000D;;Cc;0;B;;;;;N;CARRIAGE RETURN (CR);;;; +000E;;Cc;0;BN;;;;;N;SHIFT OUT;;;; +000F;;Cc;0;BN;;;;;N;SHIFT IN;;;; +0010;;Cc;0;BN;;;;;N;DATA LINK ESCAPE;;;; +0011;;Cc;0;BN;;;;;N;DEVICE CONTROL ONE;;;; +0012;;Cc;0;BN;;;;;N;DEVICE CONTROL TWO;;;; +0013;;Cc;0;BN;;;;;N;DEVICE CONTROL THREE;;;; +0014;;Cc;0;BN;;;;;N;DEVICE CONTROL FOUR;;;; +0015;;Cc;0;BN;;;;;N;NEGATIVE ACKNOWLEDGE;;;; +0016;;Cc;0;BN;;;;;N;SYNCHRONOUS IDLE;;;; +0017;;Cc;0;BN;;;;;N;END OF TRANSMISSION BLOCK;;;; +0018;;Cc;0;BN;;;;;N;CANCEL;;;; +0019;;Cc;0;BN;;;;;N;END OF MEDIUM;;;; +001A;;Cc;0;BN;;;;;N;SUBSTITUTE;;;; +001B;;Cc;0;BN;;;;;N;ESCAPE;;;; +001C;;Cc;0;B;;;;;N;INFORMATION SEPARATOR FOUR;;;; +001D;;Cc;0;B;;;;;N;INFORMATION SEPARATOR THREE;;;; +001E;;Cc;0;B;;;;;N;INFORMATION SEPARATOR TWO;;;; +001F;;Cc;0;S;;;;;N;INFORMATION SEPARATOR ONE;;;; +0020;SPACE;Zs;0;WS;;;;;N;;;;; +0021;EXCLAMATION MARK;Po;0;ON;;;;;N;;;;; +0022;QUOTATION MARK;Po;0;ON;;;;;N;;;;; +0023;NUMBER SIGN;Po;0;ET;;;;;N;;;;; +0024;DOLLAR SIGN;Sc;0;ET;;;;;N;;;;; +0025;PERCENT SIGN;Po;0;ET;;;;;N;;;;; +0026;AMPERSAND;Po;0;ON;;;;;N;;;;; +0027;APOSTROPHE;Po;0;ON;;;;;N;APOSTROPHE-QUOTE;;;; +0028;LEFT PARENTHESIS;Ps;0;ON;;;;;Y;OPENING PARENTHESIS;;;; +0029;RIGHT PARENTHESIS;Pe;0;ON;;;;;Y;CLOSING PARENTHESIS;;;; +002A;ASTERISK;Po;0;ON;;;;;N;;;;; +002B;PLUS SIGN;Sm;0;ES;;;;;N;;;;; +002C;COMMA;Po;0;CS;;;;;N;;;;; +002D;HYPHEN-MINUS;Pd;0;ES;;;;;N;;;;; +002E;FULL STOP;Po;0;CS;;;;;N;PERIOD;;;; +002F;SOLIDUS;Po;0;CS;;;;;N;SLASH;;;; +0030;DIGIT ZERO;Nd;0;EN;;0;0;0;N;;;;; +0031;DIGIT ONE;Nd;0;EN;;1;1;1;N;;;;; +0032;DIGIT TWO;Nd;0;EN;;2;2;2;N;;;;; +0033;DIGIT THREE;Nd;0;EN;;3;3;3;N;;;;; +0034;DIGIT FOUR;Nd;0;EN;;4;4;4;N;;;;; +0035;DIGIT FIVE;Nd;0;EN;;5;5;5;N;;;;; +0036;DIGIT SIX;Nd;0;EN;;6;6;6;N;;;;; +0037;DIGIT SEVEN;Nd;0;EN;;7;7;7;N;;;;; +0038;DIGIT EIGHT;Nd;0;EN;;8;8;8;N;;;;; +0039;DIGIT NINE;Nd;0;EN;;9;9;9;N;;;;; +003A;COLON;Po;0;CS;;;;;N;;;;; +003B;SEMICOLON;Po;0;ON;;;;;N;;;;; +003C;LESS-THAN SIGN;Sm;0;ON;;;;;Y;;;;; +003D;EQUALS SIGN;Sm;0;ON;;;;;N;;;;; +003E;GREATER-THAN SIGN;Sm;0;ON;;;;;Y;;;;; +003F;QUESTION MARK;Po;0;ON;;;;;N;;;;; +0040;COMMERCIAL AT;Po;0;ON;;;;;N;;;;; +0041;LATIN CAPITAL LETTER A;Lu;0;L;;;;;N;;;;0061; +0042;LATIN CAPITAL LETTER B;Lu;0;L;;;;;N;;;;0062; +0043;LATIN CAPITAL LETTER C;Lu;0;L;;;;;N;;;;0063; +0044;LATIN CAPITAL LETTER D;Lu;0;L;;;;;N;;;;0064; +0045;LATIN CAPITAL LETTER E;Lu;0;L;;;;;N;;;;0065; +0046;LATIN CAPITAL LETTER F;Lu;0;L;;;;;N;;;;0066; +0047;LATIN CAPITAL LETTER G;Lu;0;L;;;;;N;;;;0067; +0048;LATIN CAPITAL LETTER H;Lu;0;L;;;;;N;;;;0068; +0049;LATIN CAPITAL LETTER I;Lu;0;L;;;;;N;;;;0069; +004A;LATIN CAPITAL LETTER J;Lu;0;L;;;;;N;;;;006A; +004B;LATIN CAPITAL LETTER K;Lu;0;L;;;;;N;;;;006B; +004C;LATIN CAPITAL LETTER L;Lu;0;L;;;;;N;;;;006C; +004D;LATIN CAPITAL LETTER M;Lu;0;L;;;;;N;;;;006D; +004E;LATIN CAPITAL LETTER N;Lu;0;L;;;;;N;;;;006E; +004F;LATIN CAPITAL LETTER O;Lu;0;L;;;;;N;;;;006F; +0050;LATIN CAPITAL LETTER P;Lu;0;L;;;;;N;;;;0070; +0051;LATIN CAPITAL LETTER Q;Lu;0;L;;;;;N;;;;0071; +0052;LATIN CAPITAL LETTER R;Lu;0;L;;;;;N;;;;0072; +0053;LATIN CAPITAL LETTER S;Lu;0;L;;;;;N;;;;0073; +0054;LATIN CAPITAL LETTER T;Lu;0;L;;;;;N;;;;0074; +0055;LATIN CAPITAL LETTER U;Lu;0;L;;;;;N;;;;0075; +0056;LATIN CAPITAL LETTER V;Lu;0;L;;;;;N;;;;0076; +0057;LATIN CAPITAL LETTER W;Lu;0;L;;;;;N;;;;0077; +0058;LATIN CAPITAL LETTER X;Lu;0;L;;;;;N;;;;0078; +0059;LATIN CAPITAL LETTER Y;Lu;0;L;;;;;N;;;;0079; +005A;LATIN CAPITAL LETTER Z;Lu;0;L;;;;;N;;;;007A; +005B;LEFT SQUARE BRACKET;Ps;0;ON;;;;;Y;OPENING SQUARE BRACKET;;;; +005C;REVERSE SOLIDUS;Po;0;ON;;;;;N;BACKSLASH;;;; +005D;RIGHT SQUARE BRACKET;Pe;0;ON;;;;;Y;CLOSING SQUARE BRACKET;;;; +005E;CIRCUMFLEX ACCENT;Sk;0;ON;;;;;N;SPACING CIRCUMFLEX;;;; +005F;LOW LINE;Pc;0;ON;;;;;N;SPACING UNDERSCORE;;;; +0060;GRAVE ACCENT;Sk;0;ON;;;;;N;SPACING GRAVE;;;; +0061;LATIN SMALL LETTER A;Ll;0;L;;;;;N;;;0041;;0041 +0062;LATIN SMALL LETTER B;Ll;0;L;;;;;N;;;0042;;0042 +0063;LATIN SMALL LETTER C;Ll;0;L;;;;;N;;;0043;;0043 +0064;LATIN SMALL LETTER D;Ll;0;L;;;;;N;;;0044;;0044 +0065;LATIN SMALL LETTER E;Ll;0;L;;;;;N;;;0045;;0045 +0066;LATIN SMALL LETTER F;Ll;0;L;;;;;N;;;0046;;0046 +0067;LATIN SMALL LETTER G;Ll;0;L;;;;;N;;;0047;;0047 +0068;LATIN SMALL LETTER H;Ll;0;L;;;;;N;;;0048;;0048 +0069;LATIN SMALL LETTER I;Ll;0;L;;;;;N;;;0049;;0049 +006A;LATIN SMALL LETTER J;Ll;0;L;;;;;N;;;004A;;004A +006B;LATIN SMALL LETTER K;Ll;0;L;;;;;N;;;004B;;004B +006C;LATIN SMALL LETTER L;Ll;0;L;;;;;N;;;004C;;004C +006D;LATIN SMALL LETTER M;Ll;0;L;;;;;N;;;004D;;004D +006E;LATIN SMALL LETTER N;Ll;0;L;;;;;N;;;004E;;004E +006F;LATIN SMALL LETTER O;Ll;0;L;;;;;N;;;004F;;004F +0070;LATIN SMALL LETTER P;Ll;0;L;;;;;N;;;0050;;0050 +0071;LATIN SMALL LETTER Q;Ll;0;L;;;;;N;;;0051;;0051 +0072;LATIN SMALL LETTER R;Ll;0;L;;;;;N;;;0052;;0052 +0073;LATIN SMALL LETTER S;Ll;0;L;;;;;N;;;0053;;0053 +0074;LATIN SMALL LETTER T;Ll;0;L;;;;;N;;;0054;;0054 +0075;LATIN SMALL LETTER U;Ll;0;L;;;;;N;;;0055;;0055 +0076;LATIN SMALL LETTER V;Ll;0;L;;;;;N;;;0056;;0056 +0077;LATIN SMALL LETTER W;Ll;0;L;;;;;N;;;0057;;0057 +0078;LATIN SMALL LETTER X;Ll;0;L;;;;;N;;;0058;;0058 +0079;LATIN SMALL LETTER Y;Ll;0;L;;;;;N;;;0059;;0059 +007A;LATIN SMALL LETTER Z;Ll;0;L;;;;;N;;;005A;;005A +007B;LEFT CURLY BRACKET;Ps;0;ON;;;;;Y;OPENING CURLY BRACKET;;;; +007C;VERTICAL LINE;Sm;0;ON;;;;;N;VERTICAL BAR;;;; +007D;RIGHT CURLY BRACKET;Pe;0;ON;;;;;Y;CLOSING CURLY BRACKET;;;; +007E;TILDE;Sm;0;ON;;;;;N;;;;; +007F;;Cc;0;BN;;;;;N;DELETE;;;; +0080;;Cc;0;BN;;;;;N;;;;; +0081;;Cc;0;BN;;;;;N;;;;; +0082;;Cc;0;BN;;;;;N;BREAK PERMITTED HERE;;;; +0083;;Cc;0;BN;;;;;N;NO BREAK HERE;;;; +0084;;Cc;0;BN;;;;;N;;;;; +0085;;Cc;0;B;;;;;N;NEXT LINE (NEL);;;; +0086;;Cc;0;BN;;;;;N;START OF SELECTED AREA;;;; +0087;;Cc;0;BN;;;;;N;END OF SELECTED AREA;;;; +0088;;Cc;0;BN;;;;;N;CHARACTER TABULATION SET;;;; +0089;;Cc;0;BN;;;;;N;CHARACTER TABULATION WITH JUSTIFICATION;;;; +008A;;Cc;0;BN;;;;;N;LINE TABULATION SET;;;; +008B;;Cc;0;BN;;;;;N;PARTIAL LINE FORWARD;;;; +008C;;Cc;0;BN;;;;;N;PARTIAL LINE BACKWARD;;;; +008D;;Cc;0;BN;;;;;N;REVERSE LINE FEED;;;; +008E;;Cc;0;BN;;;;;N;SINGLE SHIFT TWO;;;; +008F;;Cc;0;BN;;;;;N;SINGLE SHIFT THREE;;;; +0090;;Cc;0;BN;;;;;N;DEVICE CONTROL STRING;;;; +0091;;Cc;0;BN;;;;;N;PRIVATE USE ONE;;;; +0092;;Cc;0;BN;;;;;N;PRIVATE USE TWO;;;; +0093;;Cc;0;BN;;;;;N;SET TRANSMIT STATE;;;; +0094;;Cc;0;BN;;;;;N;CANCEL CHARACTER;;;; +0095;;Cc;0;BN;;;;;N;MESSAGE WAITING;;;; +0096;;Cc;0;BN;;;;;N;START OF GUARDED AREA;;;; +0097;;Cc;0;BN;;;;;N;END OF GUARDED AREA;;;; +0098;;Cc;0;BN;;;;;N;START OF STRING;;;; +0099;;Cc;0;BN;;;;;N;;;;; +009A;;Cc;0;BN;;;;;N;SINGLE CHARACTER INTRODUCER;;;; +009B;;Cc;0;BN;;;;;N;CONTROL SEQUENCE INTRODUCER;;;; +009C;;Cc;0;BN;;;;;N;STRING TERMINATOR;;;; +009D;;Cc;0;BN;;;;;N;OPERATING SYSTEM COMMAND;;;; +009E;;Cc;0;BN;;;;;N;PRIVACY MESSAGE;;;; +009F;;Cc;0;BN;;;;;N;APPLICATION PROGRAM COMMAND;;;; +00A0;NO-BREAK SPACE;Zs;0;CS; 0020;;;;N;NON-BREAKING SPACE;;;; +00A1;INVERTED EXCLAMATION MARK;Po;0;ON;;;;;N;;;;; +00A2;CENT SIGN;Sc;0;ET;;;;;N;;;;; +00A3;POUND SIGN;Sc;0;ET;;;;;N;;;;; +00A4;CURRENCY SIGN;Sc;0;ET;;;;;N;;;;; +00A5;YEN SIGN;Sc;0;ET;;;;;N;;;;; +00A6;BROKEN BAR;So;0;ON;;;;;N;BROKEN VERTICAL BAR;;;; +00A7;SECTION SIGN;Po;0;ON;;;;;N;;;;; +00A8;DIAERESIS;Sk;0;ON; 0020 0308;;;;N;SPACING DIAERESIS;;;; +00A9;COPYRIGHT SIGN;So;0;ON;;;;;N;;;;; +00AA;FEMININE ORDINAL INDICATOR;Lo;0;L; 0061;;;;N;;;;; +00AB;LEFT-POINTING DOUBLE ANGLE QUOTATION MARK;Pi;0;ON;;;;;Y;LEFT POINTING GUILLEMET;;;; +00AC;NOT SIGN;Sm;0;ON;;;;;N;;;;; +00AD;SOFT HYPHEN;Cf;0;BN;;;;;N;;;;; +00AE;REGISTERED SIGN;So;0;ON;;;;;N;REGISTERED TRADE MARK SIGN;;;; +00AF;MACRON;Sk;0;ON; 0020 0304;;;;N;SPACING MACRON;;;; +00B0;DEGREE SIGN;So;0;ET;;;;;N;;;;; +00B1;PLUS-MINUS SIGN;Sm;0;ET;;;;;N;PLUS-OR-MINUS SIGN;;;; +00B2;SUPERSCRIPT TWO;No;0;EN; 0032;;2;2;N;SUPERSCRIPT DIGIT TWO;;;; +00B3;SUPERSCRIPT THREE;No;0;EN; 0033;;3;3;N;SUPERSCRIPT DIGIT THREE;;;; +00B4;ACUTE ACCENT;Sk;0;ON; 0020 0301;;;;N;SPACING ACUTE;;;; +00B5;MICRO SIGN;Ll;0;L; 03BC;;;;N;;;039C;;039C +00B6;PILCROW SIGN;Po;0;ON;;;;;N;PARAGRAPH SIGN;;;; +00B7;MIDDLE DOT;Po;0;ON;;;;;N;;;;; +00B8;CEDILLA;Sk;0;ON; 0020 0327;;;;N;SPACING CEDILLA;;;; +00B9;SUPERSCRIPT ONE;No;0;EN; 0031;;1;1;N;SUPERSCRIPT DIGIT ONE;;;; +00BA;MASCULINE ORDINAL INDICATOR;Lo;0;L; 006F;;;;N;;;;; +00BB;RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK;Pf;0;ON;;;;;Y;RIGHT POINTING GUILLEMET;;;; +00BC;VULGAR FRACTION ONE QUARTER;No;0;ON; 0031 2044 0034;;;1/4;N;FRACTION ONE QUARTER;;;; +00BD;VULGAR FRACTION ONE HALF;No;0;ON; 0031 2044 0032;;;1/2;N;FRACTION ONE HALF;;;; +00BE;VULGAR FRACTION THREE QUARTERS;No;0;ON; 0033 2044 0034;;;3/4;N;FRACTION THREE QUARTERS;;;; +00BF;INVERTED QUESTION MARK;Po;0;ON;;;;;N;;;;; +00C0;LATIN CAPITAL LETTER A WITH GRAVE;Lu;0;L;0041 0300;;;;N;LATIN CAPITAL LETTER A GRAVE;;;00E0; +00C1;LATIN CAPITAL LETTER A WITH ACUTE;Lu;0;L;0041 0301;;;;N;LATIN CAPITAL LETTER A ACUTE;;;00E1; +00C2;LATIN CAPITAL LETTER A WITH CIRCUMFLEX;Lu;0;L;0041 0302;;;;N;LATIN CAPITAL LETTER A CIRCUMFLEX;;;00E2; +00C3;LATIN CAPITAL LETTER A WITH TILDE;Lu;0;L;0041 0303;;;;N;LATIN CAPITAL LETTER A TILDE;;;00E3; +00C4;LATIN CAPITAL LETTER A WITH DIAERESIS;Lu;0;L;0041 0308;;;;N;LATIN CAPITAL LETTER A DIAERESIS;;;00E4; +00C5;LATIN CAPITAL LETTER A WITH RING ABOVE;Lu;0;L;0041 030A;;;;N;LATIN CAPITAL LETTER A RING;;;00E5; +00C6;LATIN CAPITAL LETTER AE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER A E;;;00E6; +00C7;LATIN CAPITAL LETTER C WITH CEDILLA;Lu;0;L;0043 0327;;;;N;LATIN CAPITAL LETTER C CEDILLA;;;00E7; +00C8;LATIN CAPITAL LETTER E WITH GRAVE;Lu;0;L;0045 0300;;;;N;LATIN CAPITAL LETTER E GRAVE;;;00E8; +00C9;LATIN CAPITAL LETTER E WITH ACUTE;Lu;0;L;0045 0301;;;;N;LATIN CAPITAL LETTER E ACUTE;;;00E9; +00CA;LATIN CAPITAL LETTER E WITH CIRCUMFLEX;Lu;0;L;0045 0302;;;;N;LATIN CAPITAL LETTER E CIRCUMFLEX;;;00EA; +00CB;LATIN CAPITAL LETTER E WITH DIAERESIS;Lu;0;L;0045 0308;;;;N;LATIN CAPITAL LETTER E DIAERESIS;;;00EB; +00CC;LATIN CAPITAL LETTER I WITH GRAVE;Lu;0;L;0049 0300;;;;N;LATIN CAPITAL LETTER I GRAVE;;;00EC; +00CD;LATIN CAPITAL LETTER I WITH ACUTE;Lu;0;L;0049 0301;;;;N;LATIN CAPITAL LETTER I ACUTE;;;00ED; +00CE;LATIN CAPITAL LETTER I WITH CIRCUMFLEX;Lu;0;L;0049 0302;;;;N;LATIN CAPITAL LETTER I CIRCUMFLEX;;;00EE; +00CF;LATIN CAPITAL LETTER I WITH DIAERESIS;Lu;0;L;0049 0308;;;;N;LATIN CAPITAL LETTER I DIAERESIS;;;00EF; +00D0;LATIN CAPITAL LETTER ETH;Lu;0;L;;;;;N;;;;00F0; +00D1;LATIN CAPITAL LETTER N WITH TILDE;Lu;0;L;004E 0303;;;;N;LATIN CAPITAL LETTER N TILDE;;;00F1; +00D2;LATIN CAPITAL LETTER O WITH GRAVE;Lu;0;L;004F 0300;;;;N;LATIN CAPITAL LETTER O GRAVE;;;00F2; +00D3;LATIN CAPITAL LETTER O WITH ACUTE;Lu;0;L;004F 0301;;;;N;LATIN CAPITAL LETTER O ACUTE;;;00F3; +00D4;LATIN CAPITAL LETTER O WITH CIRCUMFLEX;Lu;0;L;004F 0302;;;;N;LATIN CAPITAL LETTER O CIRCUMFLEX;;;00F4; +00D5;LATIN CAPITAL LETTER O WITH TILDE;Lu;0;L;004F 0303;;;;N;LATIN CAPITAL LETTER O TILDE;;;00F5; +00D6;LATIN CAPITAL LETTER O WITH DIAERESIS;Lu;0;L;004F 0308;;;;N;LATIN CAPITAL LETTER O DIAERESIS;;;00F6; +00D7;MULTIPLICATION SIGN;Sm;0;ON;;;;;N;;;;; +00D8;LATIN CAPITAL LETTER O WITH STROKE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER O SLASH;;;00F8; +00D9;LATIN CAPITAL LETTER U WITH GRAVE;Lu;0;L;0055 0300;;;;N;LATIN CAPITAL LETTER U GRAVE;;;00F9; +00DA;LATIN CAPITAL LETTER U WITH ACUTE;Lu;0;L;0055 0301;;;;N;LATIN CAPITAL LETTER U ACUTE;;;00FA; +00DB;LATIN CAPITAL LETTER U WITH CIRCUMFLEX;Lu;0;L;0055 0302;;;;N;LATIN CAPITAL LETTER U CIRCUMFLEX;;;00FB; +00DC;LATIN CAPITAL LETTER U WITH DIAERESIS;Lu;0;L;0055 0308;;;;N;LATIN CAPITAL LETTER U DIAERESIS;;;00FC; +00DD;LATIN CAPITAL LETTER Y WITH ACUTE;Lu;0;L;0059 0301;;;;N;LATIN CAPITAL LETTER Y ACUTE;;;00FD; +00DE;LATIN CAPITAL LETTER THORN;Lu;0;L;;;;;N;;;;00FE; +00DF;LATIN SMALL LETTER SHARP S;Ll;0;L;;;;;N;;;;; +00E0;LATIN SMALL LETTER A WITH GRAVE;Ll;0;L;0061 0300;;;;N;LATIN SMALL LETTER A GRAVE;;00C0;;00C0 +00E1;LATIN SMALL LETTER A WITH ACUTE;Ll;0;L;0061 0301;;;;N;LATIN SMALL LETTER A ACUTE;;00C1;;00C1 +00E2;LATIN SMALL LETTER A WITH CIRCUMFLEX;Ll;0;L;0061 0302;;;;N;LATIN SMALL LETTER A CIRCUMFLEX;;00C2;;00C2 +00E3;LATIN SMALL LETTER A WITH TILDE;Ll;0;L;0061 0303;;;;N;LATIN SMALL LETTER A TILDE;;00C3;;00C3 +00E4;LATIN SMALL LETTER A WITH DIAERESIS;Ll;0;L;0061 0308;;;;N;LATIN SMALL LETTER A DIAERESIS;;00C4;;00C4 +00E5;LATIN SMALL LETTER A WITH RING ABOVE;Ll;0;L;0061 030A;;;;N;LATIN SMALL LETTER A RING;;00C5;;00C5 +00E6;LATIN SMALL LETTER AE;Ll;0;L;;;;;N;LATIN SMALL LETTER A E;;00C6;;00C6 +00E7;LATIN SMALL LETTER C WITH CEDILLA;Ll;0;L;0063 0327;;;;N;LATIN SMALL LETTER C CEDILLA;;00C7;;00C7 +00E8;LATIN SMALL LETTER E WITH GRAVE;Ll;0;L;0065 0300;;;;N;LATIN SMALL LETTER E GRAVE;;00C8;;00C8 +00E9;LATIN SMALL LETTER E WITH ACUTE;Ll;0;L;0065 0301;;;;N;LATIN SMALL LETTER E ACUTE;;00C9;;00C9 +00EA;LATIN SMALL LETTER E WITH CIRCUMFLEX;Ll;0;L;0065 0302;;;;N;LATIN SMALL LETTER E CIRCUMFLEX;;00CA;;00CA +00EB;LATIN SMALL LETTER E WITH DIAERESIS;Ll;0;L;0065 0308;;;;N;LATIN SMALL LETTER E DIAERESIS;;00CB;;00CB +00EC;LATIN SMALL LETTER I WITH GRAVE;Ll;0;L;0069 0300;;;;N;LATIN SMALL LETTER I GRAVE;;00CC;;00CC +00ED;LATIN SMALL LETTER I WITH ACUTE;Ll;0;L;0069 0301;;;;N;LATIN SMALL LETTER I ACUTE;;00CD;;00CD +00EE;LATIN SMALL LETTER I WITH CIRCUMFLEX;Ll;0;L;0069 0302;;;;N;LATIN SMALL LETTER I CIRCUMFLEX;;00CE;;00CE +00EF;LATIN SMALL LETTER I WITH DIAERESIS;Ll;0;L;0069 0308;;;;N;LATIN SMALL LETTER I DIAERESIS;;00CF;;00CF +00F0;LATIN SMALL LETTER ETH;Ll;0;L;;;;;N;;;00D0;;00D0 +00F1;LATIN SMALL LETTER N WITH TILDE;Ll;0;L;006E 0303;;;;N;LATIN SMALL LETTER N TILDE;;00D1;;00D1 +00F2;LATIN SMALL LETTER O WITH GRAVE;Ll;0;L;006F 0300;;;;N;LATIN SMALL LETTER O GRAVE;;00D2;;00D2 +00F3;LATIN SMALL LETTER O WITH ACUTE;Ll;0;L;006F 0301;;;;N;LATIN SMALL LETTER O ACUTE;;00D3;;00D3 +00F4;LATIN SMALL LETTER O WITH CIRCUMFLEX;Ll;0;L;006F 0302;;;;N;LATIN SMALL LETTER O CIRCUMFLEX;;00D4;;00D4 +00F5;LATIN SMALL LETTER O WITH TILDE;Ll;0;L;006F 0303;;;;N;LATIN SMALL LETTER O TILDE;;00D5;;00D5 +00F6;LATIN SMALL LETTER O WITH DIAERESIS;Ll;0;L;006F 0308;;;;N;LATIN SMALL LETTER O DIAERESIS;;00D6;;00D6 +00F7;DIVISION SIGN;Sm;0;ON;;;;;N;;;;; +00F8;LATIN SMALL LETTER O WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER O SLASH;;00D8;;00D8 +00F9;LATIN SMALL LETTER U WITH GRAVE;Ll;0;L;0075 0300;;;;N;LATIN SMALL LETTER U GRAVE;;00D9;;00D9 +00FA;LATIN SMALL LETTER U WITH ACUTE;Ll;0;L;0075 0301;;;;N;LATIN SMALL LETTER U ACUTE;;00DA;;00DA +00FB;LATIN SMALL LETTER U WITH CIRCUMFLEX;Ll;0;L;0075 0302;;;;N;LATIN SMALL LETTER U CIRCUMFLEX;;00DB;;00DB +00FC;LATIN SMALL LETTER U WITH DIAERESIS;Ll;0;L;0075 0308;;;;N;LATIN SMALL LETTER U DIAERESIS;;00DC;;00DC +00FD;LATIN SMALL LETTER Y WITH ACUTE;Ll;0;L;0079 0301;;;;N;LATIN SMALL LETTER Y ACUTE;;00DD;;00DD +00FE;LATIN SMALL LETTER THORN;Ll;0;L;;;;;N;;;00DE;;00DE +00FF;LATIN SMALL LETTER Y WITH DIAERESIS;Ll;0;L;0079 0308;;;;N;LATIN SMALL LETTER Y DIAERESIS;;0178;;0178 +0100;LATIN CAPITAL LETTER A WITH MACRON;Lu;0;L;0041 0304;;;;N;LATIN CAPITAL LETTER A MACRON;;;0101; +0101;LATIN SMALL LETTER A WITH MACRON;Ll;0;L;0061 0304;;;;N;LATIN SMALL LETTER A MACRON;;0100;;0100 +0102;LATIN CAPITAL LETTER A WITH BREVE;Lu;0;L;0041 0306;;;;N;LATIN CAPITAL LETTER A BREVE;;;0103; +0103;LATIN SMALL LETTER A WITH BREVE;Ll;0;L;0061 0306;;;;N;LATIN SMALL LETTER A BREVE;;0102;;0102 +0104;LATIN CAPITAL LETTER A WITH OGONEK;Lu;0;L;0041 0328;;;;N;LATIN CAPITAL LETTER A OGONEK;;;0105; +0105;LATIN SMALL LETTER A WITH OGONEK;Ll;0;L;0061 0328;;;;N;LATIN SMALL LETTER A OGONEK;;0104;;0104 +0106;LATIN CAPITAL LETTER C WITH ACUTE;Lu;0;L;0043 0301;;;;N;LATIN CAPITAL LETTER C ACUTE;;;0107; +0107;LATIN SMALL LETTER C WITH ACUTE;Ll;0;L;0063 0301;;;;N;LATIN SMALL LETTER C ACUTE;;0106;;0106 +0108;LATIN CAPITAL LETTER C WITH CIRCUMFLEX;Lu;0;L;0043 0302;;;;N;LATIN CAPITAL LETTER C CIRCUMFLEX;;;0109; +0109;LATIN SMALL LETTER C WITH CIRCUMFLEX;Ll;0;L;0063 0302;;;;N;LATIN SMALL LETTER C CIRCUMFLEX;;0108;;0108 +010A;LATIN CAPITAL LETTER C WITH DOT ABOVE;Lu;0;L;0043 0307;;;;N;LATIN CAPITAL LETTER C DOT;;;010B; +010B;LATIN SMALL LETTER C WITH DOT ABOVE;Ll;0;L;0063 0307;;;;N;LATIN SMALL LETTER C DOT;;010A;;010A +010C;LATIN CAPITAL LETTER C WITH CARON;Lu;0;L;0043 030C;;;;N;LATIN CAPITAL LETTER C HACEK;;;010D; +010D;LATIN SMALL LETTER C WITH CARON;Ll;0;L;0063 030C;;;;N;LATIN SMALL LETTER C HACEK;;010C;;010C +010E;LATIN CAPITAL LETTER D WITH CARON;Lu;0;L;0044 030C;;;;N;LATIN CAPITAL LETTER D HACEK;;;010F; +010F;LATIN SMALL LETTER D WITH CARON;Ll;0;L;0064 030C;;;;N;LATIN SMALL LETTER D HACEK;;010E;;010E +0110;LATIN CAPITAL LETTER D WITH STROKE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER D BAR;;;0111; +0111;LATIN SMALL LETTER D WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER D BAR;;0110;;0110 +0112;LATIN CAPITAL LETTER E WITH MACRON;Lu;0;L;0045 0304;;;;N;LATIN CAPITAL LETTER E MACRON;;;0113; +0113;LATIN SMALL LETTER E WITH MACRON;Ll;0;L;0065 0304;;;;N;LATIN SMALL LETTER E MACRON;;0112;;0112 +0114;LATIN CAPITAL LETTER E WITH BREVE;Lu;0;L;0045 0306;;;;N;LATIN CAPITAL LETTER E BREVE;;;0115; +0115;LATIN SMALL LETTER E WITH BREVE;Ll;0;L;0065 0306;;;;N;LATIN SMALL LETTER E BREVE;;0114;;0114 +0116;LATIN CAPITAL LETTER E WITH DOT ABOVE;Lu;0;L;0045 0307;;;;N;LATIN CAPITAL LETTER E DOT;;;0117; +0117;LATIN SMALL LETTER E WITH DOT ABOVE;Ll;0;L;0065 0307;;;;N;LATIN SMALL LETTER E DOT;;0116;;0116 +0118;LATIN CAPITAL LETTER E WITH OGONEK;Lu;0;L;0045 0328;;;;N;LATIN CAPITAL LETTER E OGONEK;;;0119; +0119;LATIN SMALL LETTER E WITH OGONEK;Ll;0;L;0065 0328;;;;N;LATIN SMALL LETTER E OGONEK;;0118;;0118 +011A;LATIN CAPITAL LETTER E WITH CARON;Lu;0;L;0045 030C;;;;N;LATIN CAPITAL LETTER E HACEK;;;011B; +011B;LATIN SMALL LETTER E WITH CARON;Ll;0;L;0065 030C;;;;N;LATIN SMALL LETTER E HACEK;;011A;;011A +011C;LATIN CAPITAL LETTER G WITH CIRCUMFLEX;Lu;0;L;0047 0302;;;;N;LATIN CAPITAL LETTER G CIRCUMFLEX;;;011D; +011D;LATIN SMALL LETTER G WITH CIRCUMFLEX;Ll;0;L;0067 0302;;;;N;LATIN SMALL LETTER G CIRCUMFLEX;;011C;;011C +011E;LATIN CAPITAL LETTER G WITH BREVE;Lu;0;L;0047 0306;;;;N;LATIN CAPITAL LETTER G BREVE;;;011F; +011F;LATIN SMALL LETTER G WITH BREVE;Ll;0;L;0067 0306;;;;N;LATIN SMALL LETTER G BREVE;;011E;;011E +0120;LATIN CAPITAL LETTER G WITH DOT ABOVE;Lu;0;L;0047 0307;;;;N;LATIN CAPITAL LETTER G DOT;;;0121; +0121;LATIN SMALL LETTER G WITH DOT ABOVE;Ll;0;L;0067 0307;;;;N;LATIN SMALL LETTER G DOT;;0120;;0120 +0122;LATIN CAPITAL LETTER G WITH CEDILLA;Lu;0;L;0047 0327;;;;N;LATIN CAPITAL LETTER G CEDILLA;;;0123; +0123;LATIN SMALL LETTER G WITH CEDILLA;Ll;0;L;0067 0327;;;;N;LATIN SMALL LETTER G CEDILLA;;0122;;0122 +0124;LATIN CAPITAL LETTER H WITH CIRCUMFLEX;Lu;0;L;0048 0302;;;;N;LATIN CAPITAL LETTER H CIRCUMFLEX;;;0125; +0125;LATIN SMALL LETTER H WITH CIRCUMFLEX;Ll;0;L;0068 0302;;;;N;LATIN SMALL LETTER H CIRCUMFLEX;;0124;;0124 +0126;LATIN CAPITAL LETTER H WITH STROKE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER H BAR;;;0127; +0127;LATIN SMALL LETTER H WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER H BAR;;0126;;0126 +0128;LATIN CAPITAL LETTER I WITH TILDE;Lu;0;L;0049 0303;;;;N;LATIN CAPITAL LETTER I TILDE;;;0129; +0129;LATIN SMALL LETTER I WITH TILDE;Ll;0;L;0069 0303;;;;N;LATIN SMALL LETTER I TILDE;;0128;;0128 +012A;LATIN CAPITAL LETTER I WITH MACRON;Lu;0;L;0049 0304;;;;N;LATIN CAPITAL LETTER I MACRON;;;012B; +012B;LATIN SMALL LETTER I WITH MACRON;Ll;0;L;0069 0304;;;;N;LATIN SMALL LETTER I MACRON;;012A;;012A +012C;LATIN CAPITAL LETTER I WITH BREVE;Lu;0;L;0049 0306;;;;N;LATIN CAPITAL LETTER I BREVE;;;012D; +012D;LATIN SMALL LETTER I WITH BREVE;Ll;0;L;0069 0306;;;;N;LATIN SMALL LETTER I BREVE;;012C;;012C +012E;LATIN CAPITAL LETTER I WITH OGONEK;Lu;0;L;0049 0328;;;;N;LATIN CAPITAL LETTER I OGONEK;;;012F; +012F;LATIN SMALL LETTER I WITH OGONEK;Ll;0;L;0069 0328;;;;N;LATIN SMALL LETTER I OGONEK;;012E;;012E +0130;LATIN CAPITAL LETTER I WITH DOT ABOVE;Lu;0;L;0049 0307;;;;N;LATIN CAPITAL LETTER I DOT;;;0069; +0131;LATIN SMALL LETTER DOTLESS I;Ll;0;L;;;;;N;;;0049;;0049 +0132;LATIN CAPITAL LIGATURE IJ;Lu;0;L; 0049 004A;;;;N;LATIN CAPITAL LETTER I J;;;0133; +0133;LATIN SMALL LIGATURE IJ;Ll;0;L; 0069 006A;;;;N;LATIN SMALL LETTER I J;;0132;;0132 +0134;LATIN CAPITAL LETTER J WITH CIRCUMFLEX;Lu;0;L;004A 0302;;;;N;LATIN CAPITAL LETTER J CIRCUMFLEX;;;0135; +0135;LATIN SMALL LETTER J WITH CIRCUMFLEX;Ll;0;L;006A 0302;;;;N;LATIN SMALL LETTER J CIRCUMFLEX;;0134;;0134 +0136;LATIN CAPITAL LETTER K WITH CEDILLA;Lu;0;L;004B 0327;;;;N;LATIN CAPITAL LETTER K CEDILLA;;;0137; +0137;LATIN SMALL LETTER K WITH CEDILLA;Ll;0;L;006B 0327;;;;N;LATIN SMALL LETTER K CEDILLA;;0136;;0136 +0138;LATIN SMALL LETTER KRA;Ll;0;L;;;;;N;;;;; +0139;LATIN CAPITAL LETTER L WITH ACUTE;Lu;0;L;004C 0301;;;;N;LATIN CAPITAL LETTER L ACUTE;;;013A; +013A;LATIN SMALL LETTER L WITH ACUTE;Ll;0;L;006C 0301;;;;N;LATIN SMALL LETTER L ACUTE;;0139;;0139 +013B;LATIN CAPITAL LETTER L WITH CEDILLA;Lu;0;L;004C 0327;;;;N;LATIN CAPITAL LETTER L CEDILLA;;;013C; +013C;LATIN SMALL LETTER L WITH CEDILLA;Ll;0;L;006C 0327;;;;N;LATIN SMALL LETTER L CEDILLA;;013B;;013B +013D;LATIN CAPITAL LETTER L WITH CARON;Lu;0;L;004C 030C;;;;N;LATIN CAPITAL LETTER L HACEK;;;013E; +013E;LATIN SMALL LETTER L WITH CARON;Ll;0;L;006C 030C;;;;N;LATIN SMALL LETTER L HACEK;;013D;;013D +013F;LATIN CAPITAL LETTER L WITH MIDDLE DOT;Lu;0;L; 004C 00B7;;;;N;;;;0140; +0140;LATIN SMALL LETTER L WITH MIDDLE DOT;Ll;0;L; 006C 00B7;;;;N;;;013F;;013F +0141;LATIN CAPITAL LETTER L WITH STROKE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER L SLASH;;;0142; +0142;LATIN SMALL LETTER L WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER L SLASH;;0141;;0141 +0143;LATIN CAPITAL LETTER N WITH ACUTE;Lu;0;L;004E 0301;;;;N;LATIN CAPITAL LETTER N ACUTE;;;0144; +0144;LATIN SMALL LETTER N WITH ACUTE;Ll;0;L;006E 0301;;;;N;LATIN SMALL LETTER N ACUTE;;0143;;0143 +0145;LATIN CAPITAL LETTER N WITH CEDILLA;Lu;0;L;004E 0327;;;;N;LATIN CAPITAL LETTER N CEDILLA;;;0146; +0146;LATIN SMALL LETTER N WITH CEDILLA;Ll;0;L;006E 0327;;;;N;LATIN SMALL LETTER N CEDILLA;;0145;;0145 +0147;LATIN CAPITAL LETTER N WITH CARON;Lu;0;L;004E 030C;;;;N;LATIN CAPITAL LETTER N HACEK;;;0148; +0148;LATIN SMALL LETTER N WITH CARON;Ll;0;L;006E 030C;;;;N;LATIN SMALL LETTER N HACEK;;0147;;0147 +0149;LATIN SMALL LETTER N PRECEDED BY APOSTROPHE;Ll;0;L; 02BC 006E;;;;N;LATIN SMALL LETTER APOSTROPHE N;;;; +014A;LATIN CAPITAL LETTER ENG;Lu;0;L;;;;;N;;;;014B; +014B;LATIN SMALL LETTER ENG;Ll;0;L;;;;;N;;;014A;;014A +014C;LATIN CAPITAL LETTER O WITH MACRON;Lu;0;L;004F 0304;;;;N;LATIN CAPITAL LETTER O MACRON;;;014D; +014D;LATIN SMALL LETTER O WITH MACRON;Ll;0;L;006F 0304;;;;N;LATIN SMALL LETTER O MACRON;;014C;;014C +014E;LATIN CAPITAL LETTER O WITH BREVE;Lu;0;L;004F 0306;;;;N;LATIN CAPITAL LETTER O BREVE;;;014F; +014F;LATIN SMALL LETTER O WITH BREVE;Ll;0;L;006F 0306;;;;N;LATIN SMALL LETTER O BREVE;;014E;;014E +0150;LATIN CAPITAL LETTER O WITH DOUBLE ACUTE;Lu;0;L;004F 030B;;;;N;LATIN CAPITAL LETTER O DOUBLE ACUTE;;;0151; +0151;LATIN SMALL LETTER O WITH DOUBLE ACUTE;Ll;0;L;006F 030B;;;;N;LATIN SMALL LETTER O DOUBLE ACUTE;;0150;;0150 +0152;LATIN CAPITAL LIGATURE OE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER O E;;;0153; +0153;LATIN SMALL LIGATURE OE;Ll;0;L;;;;;N;LATIN SMALL LETTER O E;;0152;;0152 +0154;LATIN CAPITAL LETTER R WITH ACUTE;Lu;0;L;0052 0301;;;;N;LATIN CAPITAL LETTER R ACUTE;;;0155; +0155;LATIN SMALL LETTER R WITH ACUTE;Ll;0;L;0072 0301;;;;N;LATIN SMALL LETTER R ACUTE;;0154;;0154 +0156;LATIN CAPITAL LETTER R WITH CEDILLA;Lu;0;L;0052 0327;;;;N;LATIN CAPITAL LETTER R CEDILLA;;;0157; +0157;LATIN SMALL LETTER R WITH CEDILLA;Ll;0;L;0072 0327;;;;N;LATIN SMALL LETTER R CEDILLA;;0156;;0156 +0158;LATIN CAPITAL LETTER R WITH CARON;Lu;0;L;0052 030C;;;;N;LATIN CAPITAL LETTER R HACEK;;;0159; +0159;LATIN SMALL LETTER R WITH CARON;Ll;0;L;0072 030C;;;;N;LATIN SMALL LETTER R HACEK;;0158;;0158 +015A;LATIN CAPITAL LETTER S WITH ACUTE;Lu;0;L;0053 0301;;;;N;LATIN CAPITAL LETTER S ACUTE;;;015B; +015B;LATIN SMALL LETTER S WITH ACUTE;Ll;0;L;0073 0301;;;;N;LATIN SMALL LETTER S ACUTE;;015A;;015A +015C;LATIN CAPITAL LETTER S WITH CIRCUMFLEX;Lu;0;L;0053 0302;;;;N;LATIN CAPITAL LETTER S CIRCUMFLEX;;;015D; +015D;LATIN SMALL LETTER S WITH CIRCUMFLEX;Ll;0;L;0073 0302;;;;N;LATIN SMALL LETTER S CIRCUMFLEX;;015C;;015C +015E;LATIN CAPITAL LETTER S WITH CEDILLA;Lu;0;L;0053 0327;;;;N;LATIN CAPITAL LETTER S CEDILLA;;;015F; +015F;LATIN SMALL LETTER S WITH CEDILLA;Ll;0;L;0073 0327;;;;N;LATIN SMALL LETTER S CEDILLA;;015E;;015E +0160;LATIN CAPITAL LETTER S WITH CARON;Lu;0;L;0053 030C;;;;N;LATIN CAPITAL LETTER S HACEK;;;0161; +0161;LATIN SMALL LETTER S WITH CARON;Ll;0;L;0073 030C;;;;N;LATIN SMALL LETTER S HACEK;;0160;;0160 +0162;LATIN CAPITAL LETTER T WITH CEDILLA;Lu;0;L;0054 0327;;;;N;LATIN CAPITAL LETTER T CEDILLA;;;0163; +0163;LATIN SMALL LETTER T WITH CEDILLA;Ll;0;L;0074 0327;;;;N;LATIN SMALL LETTER T CEDILLA;;0162;;0162 +0164;LATIN CAPITAL LETTER T WITH CARON;Lu;0;L;0054 030C;;;;N;LATIN CAPITAL LETTER T HACEK;;;0165; +0165;LATIN SMALL LETTER T WITH CARON;Ll;0;L;0074 030C;;;;N;LATIN SMALL LETTER T HACEK;;0164;;0164 +0166;LATIN CAPITAL LETTER T WITH STROKE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER T BAR;;;0167; +0167;LATIN SMALL LETTER T WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER T BAR;;0166;;0166 +0168;LATIN CAPITAL LETTER U WITH TILDE;Lu;0;L;0055 0303;;;;N;LATIN CAPITAL LETTER U TILDE;;;0169; +0169;LATIN SMALL LETTER U WITH TILDE;Ll;0;L;0075 0303;;;;N;LATIN SMALL LETTER U TILDE;;0168;;0168 +016A;LATIN CAPITAL LETTER U WITH MACRON;Lu;0;L;0055 0304;;;;N;LATIN CAPITAL LETTER U MACRON;;;016B; +016B;LATIN SMALL LETTER U WITH MACRON;Ll;0;L;0075 0304;;;;N;LATIN SMALL LETTER U MACRON;;016A;;016A +016C;LATIN CAPITAL LETTER U WITH BREVE;Lu;0;L;0055 0306;;;;N;LATIN CAPITAL LETTER U BREVE;;;016D; +016D;LATIN SMALL LETTER U WITH BREVE;Ll;0;L;0075 0306;;;;N;LATIN SMALL LETTER U BREVE;;016C;;016C +016E;LATIN CAPITAL LETTER U WITH RING ABOVE;Lu;0;L;0055 030A;;;;N;LATIN CAPITAL LETTER U RING;;;016F; +016F;LATIN SMALL LETTER U WITH RING ABOVE;Ll;0;L;0075 030A;;;;N;LATIN SMALL LETTER U RING;;016E;;016E +0170;LATIN CAPITAL LETTER U WITH DOUBLE ACUTE;Lu;0;L;0055 030B;;;;N;LATIN CAPITAL LETTER U DOUBLE ACUTE;;;0171; +0171;LATIN SMALL LETTER U WITH DOUBLE ACUTE;Ll;0;L;0075 030B;;;;N;LATIN SMALL LETTER U DOUBLE ACUTE;;0170;;0170 +0172;LATIN CAPITAL LETTER U WITH OGONEK;Lu;0;L;0055 0328;;;;N;LATIN CAPITAL LETTER U OGONEK;;;0173; +0173;LATIN SMALL LETTER U WITH OGONEK;Ll;0;L;0075 0328;;;;N;LATIN SMALL LETTER U OGONEK;;0172;;0172 +0174;LATIN CAPITAL LETTER W WITH CIRCUMFLEX;Lu;0;L;0057 0302;;;;N;LATIN CAPITAL LETTER W CIRCUMFLEX;;;0175; +0175;LATIN SMALL LETTER W WITH CIRCUMFLEX;Ll;0;L;0077 0302;;;;N;LATIN SMALL LETTER W CIRCUMFLEX;;0174;;0174 +0176;LATIN CAPITAL LETTER Y WITH CIRCUMFLEX;Lu;0;L;0059 0302;;;;N;LATIN CAPITAL LETTER Y CIRCUMFLEX;;;0177; +0177;LATIN SMALL LETTER Y WITH CIRCUMFLEX;Ll;0;L;0079 0302;;;;N;LATIN SMALL LETTER Y CIRCUMFLEX;;0176;;0176 +0178;LATIN CAPITAL LETTER Y WITH DIAERESIS;Lu;0;L;0059 0308;;;;N;LATIN CAPITAL LETTER Y DIAERESIS;;;00FF; +0179;LATIN CAPITAL LETTER Z WITH ACUTE;Lu;0;L;005A 0301;;;;N;LATIN CAPITAL LETTER Z ACUTE;;;017A; +017A;LATIN SMALL LETTER Z WITH ACUTE;Ll;0;L;007A 0301;;;;N;LATIN SMALL LETTER Z ACUTE;;0179;;0179 +017B;LATIN CAPITAL LETTER Z WITH DOT ABOVE;Lu;0;L;005A 0307;;;;N;LATIN CAPITAL LETTER Z DOT;;;017C; +017C;LATIN SMALL LETTER Z WITH DOT ABOVE;Ll;0;L;007A 0307;;;;N;LATIN SMALL LETTER Z DOT;;017B;;017B +017D;LATIN CAPITAL LETTER Z WITH CARON;Lu;0;L;005A 030C;;;;N;LATIN CAPITAL LETTER Z HACEK;;;017E; +017E;LATIN SMALL LETTER Z WITH CARON;Ll;0;L;007A 030C;;;;N;LATIN SMALL LETTER Z HACEK;;017D;;017D +017F;LATIN SMALL LETTER LONG S;Ll;0;L; 0073;;;;N;;;0053;;0053 +0180;LATIN SMALL LETTER B WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER B BAR;;0243;;0243 +0181;LATIN CAPITAL LETTER B WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER B HOOK;;;0253; +0182;LATIN CAPITAL LETTER B WITH TOPBAR;Lu;0;L;;;;;N;LATIN CAPITAL LETTER B TOPBAR;;;0183; +0183;LATIN SMALL LETTER B WITH TOPBAR;Ll;0;L;;;;;N;LATIN SMALL LETTER B TOPBAR;;0182;;0182 +0184;LATIN CAPITAL LETTER TONE SIX;Lu;0;L;;;;;N;;;;0185; +0185;LATIN SMALL LETTER TONE SIX;Ll;0;L;;;;;N;;;0184;;0184 +0186;LATIN CAPITAL LETTER OPEN O;Lu;0;L;;;;;N;;;;0254; +0187;LATIN CAPITAL LETTER C WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER C HOOK;;;0188; +0188;LATIN SMALL LETTER C WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER C HOOK;;0187;;0187 +0189;LATIN CAPITAL LETTER AFRICAN D;Lu;0;L;;;;;N;;;;0256; +018A;LATIN CAPITAL LETTER D WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER D HOOK;;;0257; +018B;LATIN CAPITAL LETTER D WITH TOPBAR;Lu;0;L;;;;;N;LATIN CAPITAL LETTER D TOPBAR;;;018C; +018C;LATIN SMALL LETTER D WITH TOPBAR;Ll;0;L;;;;;N;LATIN SMALL LETTER D TOPBAR;;018B;;018B +018D;LATIN SMALL LETTER TURNED DELTA;Ll;0;L;;;;;N;;;;; +018E;LATIN CAPITAL LETTER REVERSED E;Lu;0;L;;;;;N;LATIN CAPITAL LETTER TURNED E;;;01DD; +018F;LATIN CAPITAL LETTER SCHWA;Lu;0;L;;;;;N;;;;0259; +0190;LATIN CAPITAL LETTER OPEN E;Lu;0;L;;;;;N;LATIN CAPITAL LETTER EPSILON;;;025B; +0191;LATIN CAPITAL LETTER F WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER F HOOK;;;0192; +0192;LATIN SMALL LETTER F WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER SCRIPT F;;0191;;0191 +0193;LATIN CAPITAL LETTER G WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER G HOOK;;;0260; +0194;LATIN CAPITAL LETTER GAMMA;Lu;0;L;;;;;N;;;;0263; +0195;LATIN SMALL LETTER HV;Ll;0;L;;;;;N;LATIN SMALL LETTER H V;;01F6;;01F6 +0196;LATIN CAPITAL LETTER IOTA;Lu;0;L;;;;;N;;;;0269; +0197;LATIN CAPITAL LETTER I WITH STROKE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER BARRED I;;;0268; +0198;LATIN CAPITAL LETTER K WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER K HOOK;;;0199; +0199;LATIN SMALL LETTER K WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER K HOOK;;0198;;0198 +019A;LATIN SMALL LETTER L WITH BAR;Ll;0;L;;;;;N;LATIN SMALL LETTER BARRED L;;023D;;023D +019B;LATIN SMALL LETTER LAMBDA WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER BARRED LAMBDA;;A7DC;;A7DC +019C;LATIN CAPITAL LETTER TURNED M;Lu;0;L;;;;;N;;;;026F; +019D;LATIN CAPITAL LETTER N WITH LEFT HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER N HOOK;;;0272; +019E;LATIN SMALL LETTER N WITH LONG RIGHT LEG;Ll;0;L;;;;;N;;;0220;;0220 +019F;LATIN CAPITAL LETTER O WITH MIDDLE TILDE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER BARRED O;;;0275; +01A0;LATIN CAPITAL LETTER O WITH HORN;Lu;0;L;004F 031B;;;;N;LATIN CAPITAL LETTER O HORN;;;01A1; +01A1;LATIN SMALL LETTER O WITH HORN;Ll;0;L;006F 031B;;;;N;LATIN SMALL LETTER O HORN;;01A0;;01A0 +01A2;LATIN CAPITAL LETTER OI;Lu;0;L;;;;;N;LATIN CAPITAL LETTER O I;;;01A3; +01A3;LATIN SMALL LETTER OI;Ll;0;L;;;;;N;LATIN SMALL LETTER O I;;01A2;;01A2 +01A4;LATIN CAPITAL LETTER P WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER P HOOK;;;01A5; +01A5;LATIN SMALL LETTER P WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER P HOOK;;01A4;;01A4 +01A6;LATIN LETTER YR;Lu;0;L;;;;;N;LATIN LETTER Y R;;;0280; +01A7;LATIN CAPITAL LETTER TONE TWO;Lu;0;L;;;;;N;;;;01A8; +01A8;LATIN SMALL LETTER TONE TWO;Ll;0;L;;;;;N;;;01A7;;01A7 +01A9;LATIN CAPITAL LETTER ESH;Lu;0;L;;;;;N;;;;0283; +01AA;LATIN LETTER REVERSED ESH LOOP;Ll;0;L;;;;;N;;;;; +01AB;LATIN SMALL LETTER T WITH PALATAL HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER T PALATAL HOOK;;;; +01AC;LATIN CAPITAL LETTER T WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER T HOOK;;;01AD; +01AD;LATIN SMALL LETTER T WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER T HOOK;;01AC;;01AC +01AE;LATIN CAPITAL LETTER T WITH RETROFLEX HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER T RETROFLEX HOOK;;;0288; +01AF;LATIN CAPITAL LETTER U WITH HORN;Lu;0;L;0055 031B;;;;N;LATIN CAPITAL LETTER U HORN;;;01B0; +01B0;LATIN SMALL LETTER U WITH HORN;Ll;0;L;0075 031B;;;;N;LATIN SMALL LETTER U HORN;;01AF;;01AF +01B1;LATIN CAPITAL LETTER UPSILON;Lu;0;L;;;;;N;;;;028A; +01B2;LATIN CAPITAL LETTER V WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER SCRIPT V;;;028B; +01B3;LATIN CAPITAL LETTER Y WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER Y HOOK;;;01B4; +01B4;LATIN SMALL LETTER Y WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER Y HOOK;;01B3;;01B3 +01B5;LATIN CAPITAL LETTER Z WITH STROKE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER Z BAR;;;01B6; +01B6;LATIN SMALL LETTER Z WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER Z BAR;;01B5;;01B5 +01B7;LATIN CAPITAL LETTER EZH;Lu;0;L;;;;;N;LATIN CAPITAL LETTER YOGH;;;0292; +01B8;LATIN CAPITAL LETTER EZH REVERSED;Lu;0;L;;;;;N;LATIN CAPITAL LETTER REVERSED YOGH;;;01B9; +01B9;LATIN SMALL LETTER EZH REVERSED;Ll;0;L;;;;;N;LATIN SMALL LETTER REVERSED YOGH;;01B8;;01B8 +01BA;LATIN SMALL LETTER EZH WITH TAIL;Ll;0;L;;;;;N;LATIN SMALL LETTER YOGH WITH TAIL;;;; +01BB;LATIN LETTER TWO WITH STROKE;Lo;0;L;;;;;N;LATIN LETTER TWO BAR;;;; +01BC;LATIN CAPITAL LETTER TONE FIVE;Lu;0;L;;;;;N;;;;01BD; +01BD;LATIN SMALL LETTER TONE FIVE;Ll;0;L;;;;;N;;;01BC;;01BC +01BE;LATIN LETTER INVERTED GLOTTAL STOP WITH STROKE;Ll;0;L;;;;;N;LATIN LETTER INVERTED GLOTTAL STOP BAR;;;; +01BF;LATIN LETTER WYNN;Ll;0;L;;;;;N;;;01F7;;01F7 +01C0;LATIN LETTER DENTAL CLICK;Lo;0;L;;;;;N;LATIN LETTER PIPE;;;; +01C1;LATIN LETTER LATERAL CLICK;Lo;0;L;;;;;N;LATIN LETTER DOUBLE PIPE;;;; +01C2;LATIN LETTER ALVEOLAR CLICK;Lo;0;L;;;;;N;LATIN LETTER PIPE DOUBLE BAR;;;; +01C3;LATIN LETTER RETROFLEX CLICK;Lo;0;L;;;;;N;LATIN LETTER EXCLAMATION MARK;;;; +01C4;LATIN CAPITAL LETTER DZ WITH CARON;Lu;0;L; 0044 017D;;;;N;LATIN CAPITAL LETTER D Z HACEK;;;01C6;01C5 +01C5;LATIN CAPITAL LETTER D WITH SMALL LETTER Z WITH CARON;Lt;0;L; 0044 017E;;;;N;LATIN LETTER CAPITAL D SMALL Z HACEK;;01C4;01C6;01C5 +01C6;LATIN SMALL LETTER DZ WITH CARON;Ll;0;L; 0064 017E;;;;N;LATIN SMALL LETTER D Z HACEK;;01C4;;01C5 +01C7;LATIN CAPITAL LETTER LJ;Lu;0;L; 004C 004A;;;;N;LATIN CAPITAL LETTER L J;;;01C9;01C8 +01C8;LATIN CAPITAL LETTER L WITH SMALL LETTER J;Lt;0;L; 004C 006A;;;;N;LATIN LETTER CAPITAL L SMALL J;;01C7;01C9;01C8 +01C9;LATIN SMALL LETTER LJ;Ll;0;L; 006C 006A;;;;N;LATIN SMALL LETTER L J;;01C7;;01C8 +01CA;LATIN CAPITAL LETTER NJ;Lu;0;L; 004E 004A;;;;N;LATIN CAPITAL LETTER N J;;;01CC;01CB +01CB;LATIN CAPITAL LETTER N WITH SMALL LETTER J;Lt;0;L; 004E 006A;;;;N;LATIN LETTER CAPITAL N SMALL J;;01CA;01CC;01CB +01CC;LATIN SMALL LETTER NJ;Ll;0;L; 006E 006A;;;;N;LATIN SMALL LETTER N J;;01CA;;01CB +01CD;LATIN CAPITAL LETTER A WITH CARON;Lu;0;L;0041 030C;;;;N;LATIN CAPITAL LETTER A HACEK;;;01CE; +01CE;LATIN SMALL LETTER A WITH CARON;Ll;0;L;0061 030C;;;;N;LATIN SMALL LETTER A HACEK;;01CD;;01CD +01CF;LATIN CAPITAL LETTER I WITH CARON;Lu;0;L;0049 030C;;;;N;LATIN CAPITAL LETTER I HACEK;;;01D0; +01D0;LATIN SMALL LETTER I WITH CARON;Ll;0;L;0069 030C;;;;N;LATIN SMALL LETTER I HACEK;;01CF;;01CF +01D1;LATIN CAPITAL LETTER O WITH CARON;Lu;0;L;004F 030C;;;;N;LATIN CAPITAL LETTER O HACEK;;;01D2; +01D2;LATIN SMALL LETTER O WITH CARON;Ll;0;L;006F 030C;;;;N;LATIN SMALL LETTER O HACEK;;01D1;;01D1 +01D3;LATIN CAPITAL LETTER U WITH CARON;Lu;0;L;0055 030C;;;;N;LATIN CAPITAL LETTER U HACEK;;;01D4; +01D4;LATIN SMALL LETTER U WITH CARON;Ll;0;L;0075 030C;;;;N;LATIN SMALL LETTER U HACEK;;01D3;;01D3 +01D5;LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON;Lu;0;L;00DC 0304;;;;N;LATIN CAPITAL LETTER U DIAERESIS MACRON;;;01D6; +01D6;LATIN SMALL LETTER U WITH DIAERESIS AND MACRON;Ll;0;L;00FC 0304;;;;N;LATIN SMALL LETTER U DIAERESIS MACRON;;01D5;;01D5 +01D7;LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE;Lu;0;L;00DC 0301;;;;N;LATIN CAPITAL LETTER U DIAERESIS ACUTE;;;01D8; +01D8;LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE;Ll;0;L;00FC 0301;;;;N;LATIN SMALL LETTER U DIAERESIS ACUTE;;01D7;;01D7 +01D9;LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON;Lu;0;L;00DC 030C;;;;N;LATIN CAPITAL LETTER U DIAERESIS HACEK;;;01DA; +01DA;LATIN SMALL LETTER U WITH DIAERESIS AND CARON;Ll;0;L;00FC 030C;;;;N;LATIN SMALL LETTER U DIAERESIS HACEK;;01D9;;01D9 +01DB;LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE;Lu;0;L;00DC 0300;;;;N;LATIN CAPITAL LETTER U DIAERESIS GRAVE;;;01DC; +01DC;LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE;Ll;0;L;00FC 0300;;;;N;LATIN SMALL LETTER U DIAERESIS GRAVE;;01DB;;01DB +01DD;LATIN SMALL LETTER TURNED E;Ll;0;L;;;;;N;;;018E;;018E +01DE;LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON;Lu;0;L;00C4 0304;;;;N;LATIN CAPITAL LETTER A DIAERESIS MACRON;;;01DF; +01DF;LATIN SMALL LETTER A WITH DIAERESIS AND MACRON;Ll;0;L;00E4 0304;;;;N;LATIN SMALL LETTER A DIAERESIS MACRON;;01DE;;01DE +01E0;LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON;Lu;0;L;0226 0304;;;;N;LATIN CAPITAL LETTER A DOT MACRON;;;01E1; +01E1;LATIN SMALL LETTER A WITH DOT ABOVE AND MACRON;Ll;0;L;0227 0304;;;;N;LATIN SMALL LETTER A DOT MACRON;;01E0;;01E0 +01E2;LATIN CAPITAL LETTER AE WITH MACRON;Lu;0;L;00C6 0304;;;;N;LATIN CAPITAL LETTER A E MACRON;;;01E3; +01E3;LATIN SMALL LETTER AE WITH MACRON;Ll;0;L;00E6 0304;;;;N;LATIN SMALL LETTER A E MACRON;;01E2;;01E2 +01E4;LATIN CAPITAL LETTER G WITH STROKE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER G BAR;;;01E5; +01E5;LATIN SMALL LETTER G WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER G BAR;;01E4;;01E4 +01E6;LATIN CAPITAL LETTER G WITH CARON;Lu;0;L;0047 030C;;;;N;LATIN CAPITAL LETTER G HACEK;;;01E7; +01E7;LATIN SMALL LETTER G WITH CARON;Ll;0;L;0067 030C;;;;N;LATIN SMALL LETTER G HACEK;;01E6;;01E6 +01E8;LATIN CAPITAL LETTER K WITH CARON;Lu;0;L;004B 030C;;;;N;LATIN CAPITAL LETTER K HACEK;;;01E9; +01E9;LATIN SMALL LETTER K WITH CARON;Ll;0;L;006B 030C;;;;N;LATIN SMALL LETTER K HACEK;;01E8;;01E8 +01EA;LATIN CAPITAL LETTER O WITH OGONEK;Lu;0;L;004F 0328;;;;N;LATIN CAPITAL LETTER O OGONEK;;;01EB; +01EB;LATIN SMALL LETTER O WITH OGONEK;Ll;0;L;006F 0328;;;;N;LATIN SMALL LETTER O OGONEK;;01EA;;01EA +01EC;LATIN CAPITAL LETTER O WITH OGONEK AND MACRON;Lu;0;L;01EA 0304;;;;N;LATIN CAPITAL LETTER O OGONEK MACRON;;;01ED; +01ED;LATIN SMALL LETTER O WITH OGONEK AND MACRON;Ll;0;L;01EB 0304;;;;N;LATIN SMALL LETTER O OGONEK MACRON;;01EC;;01EC +01EE;LATIN CAPITAL LETTER EZH WITH CARON;Lu;0;L;01B7 030C;;;;N;LATIN CAPITAL LETTER YOGH HACEK;;;01EF; +01EF;LATIN SMALL LETTER EZH WITH CARON;Ll;0;L;0292 030C;;;;N;LATIN SMALL LETTER YOGH HACEK;;01EE;;01EE +01F0;LATIN SMALL LETTER J WITH CARON;Ll;0;L;006A 030C;;;;N;LATIN SMALL LETTER J HACEK;;;; +01F1;LATIN CAPITAL LETTER DZ;Lu;0;L; 0044 005A;;;;N;;;;01F3;01F2 +01F2;LATIN CAPITAL LETTER D WITH SMALL LETTER Z;Lt;0;L; 0044 007A;;;;N;;;01F1;01F3;01F2 +01F3;LATIN SMALL LETTER DZ;Ll;0;L; 0064 007A;;;;N;;;01F1;;01F2 +01F4;LATIN CAPITAL LETTER G WITH ACUTE;Lu;0;L;0047 0301;;;;N;;;;01F5; +01F5;LATIN SMALL LETTER G WITH ACUTE;Ll;0;L;0067 0301;;;;N;;;01F4;;01F4 +01F6;LATIN CAPITAL LETTER HWAIR;Lu;0;L;;;;;N;;;;0195; +01F7;LATIN CAPITAL LETTER WYNN;Lu;0;L;;;;;N;;;;01BF; +01F8;LATIN CAPITAL LETTER N WITH GRAVE;Lu;0;L;004E 0300;;;;N;;;;01F9; +01F9;LATIN SMALL LETTER N WITH GRAVE;Ll;0;L;006E 0300;;;;N;;;01F8;;01F8 +01FA;LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE;Lu;0;L;00C5 0301;;;;N;;;;01FB; +01FB;LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE;Ll;0;L;00E5 0301;;;;N;;;01FA;;01FA +01FC;LATIN CAPITAL LETTER AE WITH ACUTE;Lu;0;L;00C6 0301;;;;N;;;;01FD; +01FD;LATIN SMALL LETTER AE WITH ACUTE;Ll;0;L;00E6 0301;;;;N;;;01FC;;01FC +01FE;LATIN CAPITAL LETTER O WITH STROKE AND ACUTE;Lu;0;L;00D8 0301;;;;N;;;;01FF; +01FF;LATIN SMALL LETTER O WITH STROKE AND ACUTE;Ll;0;L;00F8 0301;;;;N;;;01FE;;01FE +0200;LATIN CAPITAL LETTER A WITH DOUBLE GRAVE;Lu;0;L;0041 030F;;;;N;;;;0201; +0201;LATIN SMALL LETTER A WITH DOUBLE GRAVE;Ll;0;L;0061 030F;;;;N;;;0200;;0200 +0202;LATIN CAPITAL LETTER A WITH INVERTED BREVE;Lu;0;L;0041 0311;;;;N;;;;0203; +0203;LATIN SMALL LETTER A WITH INVERTED BREVE;Ll;0;L;0061 0311;;;;N;;;0202;;0202 +0204;LATIN CAPITAL LETTER E WITH DOUBLE GRAVE;Lu;0;L;0045 030F;;;;N;;;;0205; +0205;LATIN SMALL LETTER E WITH DOUBLE GRAVE;Ll;0;L;0065 030F;;;;N;;;0204;;0204 +0206;LATIN CAPITAL LETTER E WITH INVERTED BREVE;Lu;0;L;0045 0311;;;;N;;;;0207; +0207;LATIN SMALL LETTER E WITH INVERTED BREVE;Ll;0;L;0065 0311;;;;N;;;0206;;0206 +0208;LATIN CAPITAL LETTER I WITH DOUBLE GRAVE;Lu;0;L;0049 030F;;;;N;;;;0209; +0209;LATIN SMALL LETTER I WITH DOUBLE GRAVE;Ll;0;L;0069 030F;;;;N;;;0208;;0208 +020A;LATIN CAPITAL LETTER I WITH INVERTED BREVE;Lu;0;L;0049 0311;;;;N;;;;020B; +020B;LATIN SMALL LETTER I WITH INVERTED BREVE;Ll;0;L;0069 0311;;;;N;;;020A;;020A +020C;LATIN CAPITAL LETTER O WITH DOUBLE GRAVE;Lu;0;L;004F 030F;;;;N;;;;020D; +020D;LATIN SMALL LETTER O WITH DOUBLE GRAVE;Ll;0;L;006F 030F;;;;N;;;020C;;020C +020E;LATIN CAPITAL LETTER O WITH INVERTED BREVE;Lu;0;L;004F 0311;;;;N;;;;020F; +020F;LATIN SMALL LETTER O WITH INVERTED BREVE;Ll;0;L;006F 0311;;;;N;;;020E;;020E +0210;LATIN CAPITAL LETTER R WITH DOUBLE GRAVE;Lu;0;L;0052 030F;;;;N;;;;0211; +0211;LATIN SMALL LETTER R WITH DOUBLE GRAVE;Ll;0;L;0072 030F;;;;N;;;0210;;0210 +0212;LATIN CAPITAL LETTER R WITH INVERTED BREVE;Lu;0;L;0052 0311;;;;N;;;;0213; +0213;LATIN SMALL LETTER R WITH INVERTED BREVE;Ll;0;L;0072 0311;;;;N;;;0212;;0212 +0214;LATIN CAPITAL LETTER U WITH DOUBLE GRAVE;Lu;0;L;0055 030F;;;;N;;;;0215; +0215;LATIN SMALL LETTER U WITH DOUBLE GRAVE;Ll;0;L;0075 030F;;;;N;;;0214;;0214 +0216;LATIN CAPITAL LETTER U WITH INVERTED BREVE;Lu;0;L;0055 0311;;;;N;;;;0217; +0217;LATIN SMALL LETTER U WITH INVERTED BREVE;Ll;0;L;0075 0311;;;;N;;;0216;;0216 +0218;LATIN CAPITAL LETTER S WITH COMMA BELOW;Lu;0;L;0053 0326;;;;N;;;;0219; +0219;LATIN SMALL LETTER S WITH COMMA BELOW;Ll;0;L;0073 0326;;;;N;;;0218;;0218 +021A;LATIN CAPITAL LETTER T WITH COMMA BELOW;Lu;0;L;0054 0326;;;;N;;;;021B; +021B;LATIN SMALL LETTER T WITH COMMA BELOW;Ll;0;L;0074 0326;;;;N;;;021A;;021A +021C;LATIN CAPITAL LETTER YOGH;Lu;0;L;;;;;N;;;;021D; +021D;LATIN SMALL LETTER YOGH;Ll;0;L;;;;;N;;;021C;;021C +021E;LATIN CAPITAL LETTER H WITH CARON;Lu;0;L;0048 030C;;;;N;;;;021F; +021F;LATIN SMALL LETTER H WITH CARON;Ll;0;L;0068 030C;;;;N;;;021E;;021E +0220;LATIN CAPITAL LETTER N WITH LONG RIGHT LEG;Lu;0;L;;;;;N;;;;019E; +0221;LATIN SMALL LETTER D WITH CURL;Ll;0;L;;;;;N;;;;; +0222;LATIN CAPITAL LETTER OU;Lu;0;L;;;;;N;;;;0223; +0223;LATIN SMALL LETTER OU;Ll;0;L;;;;;N;;;0222;;0222 +0224;LATIN CAPITAL LETTER Z WITH HOOK;Lu;0;L;;;;;N;;;;0225; +0225;LATIN SMALL LETTER Z WITH HOOK;Ll;0;L;;;;;N;;;0224;;0224 +0226;LATIN CAPITAL LETTER A WITH DOT ABOVE;Lu;0;L;0041 0307;;;;N;;;;0227; +0227;LATIN SMALL LETTER A WITH DOT ABOVE;Ll;0;L;0061 0307;;;;N;;;0226;;0226 +0228;LATIN CAPITAL LETTER E WITH CEDILLA;Lu;0;L;0045 0327;;;;N;;;;0229; +0229;LATIN SMALL LETTER E WITH CEDILLA;Ll;0;L;0065 0327;;;;N;;;0228;;0228 +022A;LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON;Lu;0;L;00D6 0304;;;;N;;;;022B; +022B;LATIN SMALL LETTER O WITH DIAERESIS AND MACRON;Ll;0;L;00F6 0304;;;;N;;;022A;;022A +022C;LATIN CAPITAL LETTER O WITH TILDE AND MACRON;Lu;0;L;00D5 0304;;;;N;;;;022D; +022D;LATIN SMALL LETTER O WITH TILDE AND MACRON;Ll;0;L;00F5 0304;;;;N;;;022C;;022C +022E;LATIN CAPITAL LETTER O WITH DOT ABOVE;Lu;0;L;004F 0307;;;;N;;;;022F; +022F;LATIN SMALL LETTER O WITH DOT ABOVE;Ll;0;L;006F 0307;;;;N;;;022E;;022E +0230;LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON;Lu;0;L;022E 0304;;;;N;;;;0231; +0231;LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON;Ll;0;L;022F 0304;;;;N;;;0230;;0230 +0232;LATIN CAPITAL LETTER Y WITH MACRON;Lu;0;L;0059 0304;;;;N;;;;0233; +0233;LATIN SMALL LETTER Y WITH MACRON;Ll;0;L;0079 0304;;;;N;;;0232;;0232 +0234;LATIN SMALL LETTER L WITH CURL;Ll;0;L;;;;;N;;;;; +0235;LATIN SMALL LETTER N WITH CURL;Ll;0;L;;;;;N;;;;; +0236;LATIN SMALL LETTER T WITH CURL;Ll;0;L;;;;;N;;;;; +0237;LATIN SMALL LETTER DOTLESS J;Ll;0;L;;;;;N;;;;; +0238;LATIN SMALL LETTER DB DIGRAPH;Ll;0;L;;;;;N;;;;; +0239;LATIN SMALL LETTER QP DIGRAPH;Ll;0;L;;;;;N;;;;; +023A;LATIN CAPITAL LETTER A WITH STROKE;Lu;0;L;;;;;N;;;;2C65; +023B;LATIN CAPITAL LETTER C WITH STROKE;Lu;0;L;;;;;N;;;;023C; +023C;LATIN SMALL LETTER C WITH STROKE;Ll;0;L;;;;;N;;;023B;;023B +023D;LATIN CAPITAL LETTER L WITH BAR;Lu;0;L;;;;;N;;;;019A; +023E;LATIN CAPITAL LETTER T WITH DIAGONAL STROKE;Lu;0;L;;;;;N;;;;2C66; +023F;LATIN SMALL LETTER S WITH SWASH TAIL;Ll;0;L;;;;;N;;;2C7E;;2C7E +0240;LATIN SMALL LETTER Z WITH SWASH TAIL;Ll;0;L;;;;;N;;;2C7F;;2C7F +0241;LATIN CAPITAL LETTER GLOTTAL STOP;Lu;0;L;;;;;N;;;;0242; +0242;LATIN SMALL LETTER GLOTTAL STOP;Ll;0;L;;;;;N;;;0241;;0241 +0243;LATIN CAPITAL LETTER B WITH STROKE;Lu;0;L;;;;;N;;;;0180; +0244;LATIN CAPITAL LETTER U BAR;Lu;0;L;;;;;N;;;;0289; +0245;LATIN CAPITAL LETTER TURNED V;Lu;0;L;;;;;N;;;;028C; +0246;LATIN CAPITAL LETTER E WITH STROKE;Lu;0;L;;;;;N;;;;0247; +0247;LATIN SMALL LETTER E WITH STROKE;Ll;0;L;;;;;N;;;0246;;0246 +0248;LATIN CAPITAL LETTER J WITH STROKE;Lu;0;L;;;;;N;;;;0249; +0249;LATIN SMALL LETTER J WITH STROKE;Ll;0;L;;;;;N;;;0248;;0248 +024A;LATIN CAPITAL LETTER SMALL Q WITH HOOK TAIL;Lu;0;L;;;;;N;;;;024B; +024B;LATIN SMALL LETTER Q WITH HOOK TAIL;Ll;0;L;;;;;N;;;024A;;024A +024C;LATIN CAPITAL LETTER R WITH STROKE;Lu;0;L;;;;;N;;;;024D; +024D;LATIN SMALL LETTER R WITH STROKE;Ll;0;L;;;;;N;;;024C;;024C +024E;LATIN CAPITAL LETTER Y WITH STROKE;Lu;0;L;;;;;N;;;;024F; +024F;LATIN SMALL LETTER Y WITH STROKE;Ll;0;L;;;;;N;;;024E;;024E +0250;LATIN SMALL LETTER TURNED A;Ll;0;L;;;;;N;;;2C6F;;2C6F +0251;LATIN SMALL LETTER ALPHA;Ll;0;L;;;;;N;LATIN SMALL LETTER SCRIPT A;;2C6D;;2C6D +0252;LATIN SMALL LETTER TURNED ALPHA;Ll;0;L;;;;;N;LATIN SMALL LETTER TURNED SCRIPT A;;2C70;;2C70 +0253;LATIN SMALL LETTER B WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER B HOOK;;0181;;0181 +0254;LATIN SMALL LETTER OPEN O;Ll;0;L;;;;;N;;;0186;;0186 +0255;LATIN SMALL LETTER C WITH CURL;Ll;0;L;;;;;N;LATIN SMALL LETTER C CURL;;;; +0256;LATIN SMALL LETTER D WITH TAIL;Ll;0;L;;;;;N;LATIN SMALL LETTER D RETROFLEX HOOK;;0189;;0189 +0257;LATIN SMALL LETTER D WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER D HOOK;;018A;;018A +0258;LATIN SMALL LETTER REVERSED E;Ll;0;L;;;;;N;;;;; +0259;LATIN SMALL LETTER SCHWA;Ll;0;L;;;;;N;;;018F;;018F +025A;LATIN SMALL LETTER SCHWA WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER SCHWA HOOK;;;; +025B;LATIN SMALL LETTER OPEN E;Ll;0;L;;;;;N;LATIN SMALL LETTER EPSILON;;0190;;0190 +025C;LATIN SMALL LETTER REVERSED OPEN E;Ll;0;L;;;;;N;LATIN SMALL LETTER REVERSED EPSILON;;A7AB;;A7AB +025D;LATIN SMALL LETTER REVERSED OPEN E WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER REVERSED EPSILON HOOK;;;; +025E;LATIN SMALL LETTER CLOSED REVERSED OPEN E;Ll;0;L;;;;;N;LATIN SMALL LETTER CLOSED REVERSED EPSILON;;;; +025F;LATIN SMALL LETTER DOTLESS J WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER DOTLESS J BAR;;;; +0260;LATIN SMALL LETTER G WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER G HOOK;;0193;;0193 +0261;LATIN SMALL LETTER SCRIPT G;Ll;0;L;;;;;N;;;A7AC;;A7AC +0262;LATIN LETTER SMALL CAPITAL G;Ll;0;L;;;;;N;;;;; +0263;LATIN SMALL LETTER GAMMA;Ll;0;L;;;;;N;;;0194;;0194 +0264;LATIN SMALL LETTER RAMS HORN;Ll;0;L;;;;;N;LATIN SMALL LETTER BABY GAMMA;;A7CB;;A7CB +0265;LATIN SMALL LETTER TURNED H;Ll;0;L;;;;;N;;;A78D;;A78D +0266;LATIN SMALL LETTER H WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER H HOOK;;A7AA;;A7AA +0267;LATIN SMALL LETTER HENG WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER HENG HOOK;;;; +0268;LATIN SMALL LETTER I WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER BARRED I;;0197;;0197 +0269;LATIN SMALL LETTER IOTA;Ll;0;L;;;;;N;;;0196;;0196 +026A;LATIN LETTER SMALL CAPITAL I;Ll;0;L;;;;;N;;;A7AE;;A7AE +026B;LATIN SMALL LETTER L WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;2C62;;2C62 +026C;LATIN SMALL LETTER L WITH BELT;Ll;0;L;;;;;N;LATIN SMALL LETTER L BELT;;A7AD;;A7AD +026D;LATIN SMALL LETTER L WITH RETROFLEX HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER L RETROFLEX HOOK;;;; +026E;LATIN SMALL LETTER LEZH;Ll;0;L;;;;;N;LATIN SMALL LETTER L YOGH;;;; +026F;LATIN SMALL LETTER TURNED M;Ll;0;L;;;;;N;;;019C;;019C +0270;LATIN SMALL LETTER TURNED M WITH LONG LEG;Ll;0;L;;;;;N;;;;; +0271;LATIN SMALL LETTER M WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER M HOOK;;2C6E;;2C6E +0272;LATIN SMALL LETTER N WITH LEFT HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER N HOOK;;019D;;019D +0273;LATIN SMALL LETTER N WITH RETROFLEX HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER N RETROFLEX HOOK;;;; +0274;LATIN LETTER SMALL CAPITAL N;Ll;0;L;;;;;N;;;;; +0275;LATIN SMALL LETTER BARRED O;Ll;0;L;;;;;N;;;019F;;019F +0276;LATIN LETTER SMALL CAPITAL OE;Ll;0;L;;;;;N;LATIN LETTER SMALL CAPITAL O E;;;; +0277;LATIN SMALL LETTER CLOSED OMEGA;Ll;0;L;;;;;N;;;;; +0278;LATIN SMALL LETTER PHI;Ll;0;L;;;;;N;;;;; +0279;LATIN SMALL LETTER TURNED R;Ll;0;L;;;;;N;;;;; +027A;LATIN SMALL LETTER TURNED R WITH LONG LEG;Ll;0;L;;;;;N;;;;; +027B;LATIN SMALL LETTER TURNED R WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER TURNED R HOOK;;;; +027C;LATIN SMALL LETTER R WITH LONG LEG;Ll;0;L;;;;;N;;;;; +027D;LATIN SMALL LETTER R WITH TAIL;Ll;0;L;;;;;N;LATIN SMALL LETTER R HOOK;;2C64;;2C64 +027E;LATIN SMALL LETTER R WITH FISHHOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER FISHHOOK R;;;; +027F;LATIN SMALL LETTER REVERSED R WITH FISHHOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER REVERSED FISHHOOK R;;;; +0280;LATIN LETTER SMALL CAPITAL R;Ll;0;L;;;;;N;;;01A6;;01A6 +0281;LATIN LETTER SMALL CAPITAL INVERTED R;Ll;0;L;;;;;N;;;;; +0282;LATIN SMALL LETTER S WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER S HOOK;;A7C5;;A7C5 +0283;LATIN SMALL LETTER ESH;Ll;0;L;;;;;N;;;01A9;;01A9 +0284;LATIN SMALL LETTER DOTLESS J WITH STROKE AND HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER DOTLESS J BAR HOOK;;;; +0285;LATIN SMALL LETTER SQUAT REVERSED ESH;Ll;0;L;;;;;N;;;;; +0286;LATIN SMALL LETTER ESH WITH CURL;Ll;0;L;;;;;N;LATIN SMALL LETTER ESH CURL;;;; +0287;LATIN SMALL LETTER TURNED T;Ll;0;L;;;;;N;;;A7B1;;A7B1 +0288;LATIN SMALL LETTER T WITH RETROFLEX HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER T RETROFLEX HOOK;;01AE;;01AE +0289;LATIN SMALL LETTER U BAR;Ll;0;L;;;;;N;;;0244;;0244 +028A;LATIN SMALL LETTER UPSILON;Ll;0;L;;;;;N;;;01B1;;01B1 +028B;LATIN SMALL LETTER V WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER SCRIPT V;;01B2;;01B2 +028C;LATIN SMALL LETTER TURNED V;Ll;0;L;;;;;N;;;0245;;0245 +028D;LATIN SMALL LETTER TURNED W;Ll;0;L;;;;;N;;;;; +028E;LATIN SMALL LETTER TURNED Y;Ll;0;L;;;;;N;;;;; +028F;LATIN LETTER SMALL CAPITAL Y;Ll;0;L;;;;;N;;;;; +0290;LATIN SMALL LETTER Z WITH RETROFLEX HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER Z RETROFLEX HOOK;;;; +0291;LATIN SMALL LETTER Z WITH CURL;Ll;0;L;;;;;N;LATIN SMALL LETTER Z CURL;;;; +0292;LATIN SMALL LETTER EZH;Ll;0;L;;;;;N;LATIN SMALL LETTER YOGH;;01B7;;01B7 +0293;LATIN SMALL LETTER EZH WITH CURL;Ll;0;L;;;;;N;LATIN SMALL LETTER YOGH CURL;;;; +0294;LATIN LETTER GLOTTAL STOP;Lo;0;L;;;;;N;;;;; +0295;LATIN LETTER PHARYNGEAL VOICED FRICATIVE;Lo;0;L;;;;;N;LATIN LETTER REVERSED GLOTTAL STOP;;;; +0296;LATIN LETTER INVERTED GLOTTAL STOP;Ll;0;L;;;;;N;;;;; +0297;LATIN LETTER STRETCHED C;Ll;0;L;;;;;N;;;;; +0298;LATIN LETTER BILABIAL CLICK;Ll;0;L;;;;;N;LATIN LETTER BULLSEYE;;;; +0299;LATIN LETTER SMALL CAPITAL B;Ll;0;L;;;;;N;;;;; +029A;LATIN SMALL LETTER CLOSED OPEN E;Ll;0;L;;;;;N;LATIN SMALL LETTER CLOSED EPSILON;;;; +029B;LATIN LETTER SMALL CAPITAL G WITH HOOK;Ll;0;L;;;;;N;LATIN LETTER SMALL CAPITAL G HOOK;;;; +029C;LATIN LETTER SMALL CAPITAL H;Ll;0;L;;;;;N;;;;; +029D;LATIN SMALL LETTER J WITH CROSSED-TAIL;Ll;0;L;;;;;N;LATIN SMALL LETTER CROSSED-TAIL J;;A7B2;;A7B2 +029E;LATIN SMALL LETTER TURNED K;Ll;0;L;;;;;N;;;A7B0;;A7B0 +029F;LATIN LETTER SMALL CAPITAL L;Ll;0;L;;;;;N;;;;; +02A0;LATIN SMALL LETTER Q WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER Q HOOK;;;; +02A1;LATIN LETTER GLOTTAL STOP WITH STROKE;Ll;0;L;;;;;N;LATIN LETTER GLOTTAL STOP BAR;;;; +02A2;LATIN LETTER REVERSED GLOTTAL STOP WITH STROKE;Ll;0;L;;;;;N;LATIN LETTER REVERSED GLOTTAL STOP BAR;;;; +02A3;LATIN SMALL LETTER DZ DIGRAPH;Ll;0;L;;;;;N;LATIN SMALL LETTER D Z;;;; +02A4;LATIN SMALL LETTER DEZH DIGRAPH;Ll;0;L;;;;;N;LATIN SMALL LETTER D YOGH;;;; +02A5;LATIN SMALL LETTER DZ DIGRAPH WITH CURL;Ll;0;L;;;;;N;LATIN SMALL LETTER D Z CURL;;;; +02A6;LATIN SMALL LETTER TS DIGRAPH;Ll;0;L;;;;;N;LATIN SMALL LETTER T S;;;; +02A7;LATIN SMALL LETTER TESH DIGRAPH;Ll;0;L;;;;;N;LATIN SMALL LETTER T ESH;;;; +02A8;LATIN SMALL LETTER TC DIGRAPH WITH CURL;Ll;0;L;;;;;N;LATIN SMALL LETTER T C CURL;;;; +02A9;LATIN SMALL LETTER FENG DIGRAPH;Ll;0;L;;;;;N;;;;; +02AA;LATIN SMALL LETTER LS DIGRAPH;Ll;0;L;;;;;N;;;;; +02AB;LATIN SMALL LETTER LZ DIGRAPH;Ll;0;L;;;;;N;;;;; +02AC;LATIN LETTER BILABIAL PERCUSSIVE;Ll;0;L;;;;;N;;;;; +02AD;LATIN LETTER BIDENTAL PERCUSSIVE;Ll;0;L;;;;;N;;;;; +02AE;LATIN SMALL LETTER TURNED H WITH FISHHOOK;Ll;0;L;;;;;N;;;;; +02AF;LATIN SMALL LETTER TURNED H WITH FISHHOOK AND TAIL;Ll;0;L;;;;;N;;;;; +02B0;MODIFIER LETTER SMALL H;Lm;0;L; 0068;;;;N;;;;; +02B1;MODIFIER LETTER SMALL H WITH HOOK;Lm;0;L; 0266;;;;N;MODIFIER LETTER SMALL H HOOK;;;; +02B2;MODIFIER LETTER SMALL J;Lm;0;L; 006A;;;;N;;;;; +02B3;MODIFIER LETTER SMALL R;Lm;0;L; 0072;;;;N;;;;; +02B4;MODIFIER LETTER SMALL TURNED R;Lm;0;L; 0279;;;;N;;;;; +02B5;MODIFIER LETTER SMALL TURNED R WITH HOOK;Lm;0;L; 027B;;;;N;MODIFIER LETTER SMALL TURNED R HOOK;;;; +02B6;MODIFIER LETTER SMALL CAPITAL INVERTED R;Lm;0;L; 0281;;;;N;;;;; +02B7;MODIFIER LETTER SMALL W;Lm;0;L; 0077;;;;N;;;;; +02B8;MODIFIER LETTER SMALL Y;Lm;0;L; 0079;;;;N;;;;; +02B9;MODIFIER LETTER PRIME;Lm;0;ON;;;;;N;;;;; +02BA;MODIFIER LETTER DOUBLE PRIME;Lm;0;ON;;;;;N;;;;; +02BB;MODIFIER LETTER TURNED COMMA;Lm;0;L;;;;;N;;;;; +02BC;MODIFIER LETTER APOSTROPHE;Lm;0;L;;;;;N;;;;; +02BD;MODIFIER LETTER REVERSED COMMA;Lm;0;L;;;;;N;;;;; +02BE;MODIFIER LETTER RIGHT HALF RING;Lm;0;L;;;;;N;;;;; +02BF;MODIFIER LETTER LEFT HALF RING;Lm;0;L;;;;;N;;;;; +02C0;MODIFIER LETTER GLOTTAL STOP;Lm;0;L;;;;;N;;;;; +02C1;MODIFIER LETTER REVERSED GLOTTAL STOP;Lm;0;L;;;;;N;;;;; +02C2;MODIFIER LETTER LEFT ARROWHEAD;Sk;0;ON;;;;;N;;;;; +02C3;MODIFIER LETTER RIGHT ARROWHEAD;Sk;0;ON;;;;;N;;;;; +02C4;MODIFIER LETTER UP ARROWHEAD;Sk;0;ON;;;;;N;;;;; +02C5;MODIFIER LETTER DOWN ARROWHEAD;Sk;0;ON;;;;;N;;;;; +02C6;MODIFIER LETTER CIRCUMFLEX ACCENT;Lm;0;ON;;;;;N;MODIFIER LETTER CIRCUMFLEX;;;; +02C7;CARON;Lm;0;ON;;;;;N;MODIFIER LETTER HACEK;;;; +02C8;MODIFIER LETTER VERTICAL LINE;Lm;0;ON;;;;;N;;;;; +02C9;MODIFIER LETTER MACRON;Lm;0;ON;;;;;N;;;;; +02CA;MODIFIER LETTER ACUTE ACCENT;Lm;0;ON;;;;;N;MODIFIER LETTER ACUTE;;;; +02CB;MODIFIER LETTER GRAVE ACCENT;Lm;0;ON;;;;;N;MODIFIER LETTER GRAVE;;;; +02CC;MODIFIER LETTER LOW VERTICAL LINE;Lm;0;ON;;;;;N;;;;; +02CD;MODIFIER LETTER LOW MACRON;Lm;0;ON;;;;;N;;;;; +02CE;MODIFIER LETTER LOW GRAVE ACCENT;Lm;0;ON;;;;;N;MODIFIER LETTER LOW GRAVE;;;; +02CF;MODIFIER LETTER LOW ACUTE ACCENT;Lm;0;ON;;;;;N;MODIFIER LETTER LOW ACUTE;;;; +02D0;MODIFIER LETTER TRIANGULAR COLON;Lm;0;L;;;;;N;;;;; +02D1;MODIFIER LETTER HALF TRIANGULAR COLON;Lm;0;L;;;;;N;;;;; +02D2;MODIFIER LETTER CENTRED RIGHT HALF RING;Sk;0;ON;;;;;N;MODIFIER LETTER CENTERED RIGHT HALF RING;;;; +02D3;MODIFIER LETTER CENTRED LEFT HALF RING;Sk;0;ON;;;;;N;MODIFIER LETTER CENTERED LEFT HALF RING;;;; +02D4;MODIFIER LETTER UP TACK;Sk;0;ON;;;;;N;;;;; +02D5;MODIFIER LETTER DOWN TACK;Sk;0;ON;;;;;N;;;;; +02D6;MODIFIER LETTER PLUS SIGN;Sk;0;ON;;;;;N;;;;; +02D7;MODIFIER LETTER MINUS SIGN;Sk;0;ON;;;;;N;;;;; +02D8;BREVE;Sk;0;ON; 0020 0306;;;;N;SPACING BREVE;;;; +02D9;DOT ABOVE;Sk;0;ON; 0020 0307;;;;N;SPACING DOT ABOVE;;;; +02DA;RING ABOVE;Sk;0;ON; 0020 030A;;;;N;SPACING RING ABOVE;;;; +02DB;OGONEK;Sk;0;ON; 0020 0328;;;;N;SPACING OGONEK;;;; +02DC;SMALL TILDE;Sk;0;ON; 0020 0303;;;;N;SPACING TILDE;;;; +02DD;DOUBLE ACUTE ACCENT;Sk;0;ON; 0020 030B;;;;N;SPACING DOUBLE ACUTE;;;; +02DE;MODIFIER LETTER RHOTIC HOOK;Sk;0;ON;;;;;N;;;;; +02DF;MODIFIER LETTER CROSS ACCENT;Sk;0;ON;;;;;N;;;;; +02E0;MODIFIER LETTER SMALL GAMMA;Lm;0;L; 0263;;;;N;;;;; +02E1;MODIFIER LETTER SMALL L;Lm;0;L; 006C;;;;N;;;;; +02E2;MODIFIER LETTER SMALL S;Lm;0;L; 0073;;;;N;;;;; +02E3;MODIFIER LETTER SMALL X;Lm;0;L; 0078;;;;N;;;;; +02E4;MODIFIER LETTER SMALL REVERSED GLOTTAL STOP;Lm;0;L; 0295;;;;N;;;;; +02E5;MODIFIER LETTER EXTRA-HIGH TONE BAR;Sk;0;ON;;;;;N;;;;; +02E6;MODIFIER LETTER HIGH TONE BAR;Sk;0;ON;;;;;N;;;;; +02E7;MODIFIER LETTER MID TONE BAR;Sk;0;ON;;;;;N;;;;; +02E8;MODIFIER LETTER LOW TONE BAR;Sk;0;ON;;;;;N;;;;; +02E9;MODIFIER LETTER EXTRA-LOW TONE BAR;Sk;0;ON;;;;;N;;;;; +02EA;MODIFIER LETTER YIN DEPARTING TONE MARK;Sk;0;ON;;;;;N;;;;; +02EB;MODIFIER LETTER YANG DEPARTING TONE MARK;Sk;0;ON;;;;;N;;;;; +02EC;MODIFIER LETTER VOICING;Lm;0;ON;;;;;N;;;;; +02ED;MODIFIER LETTER UNASPIRATED;Sk;0;ON;;;;;N;;;;; +02EE;MODIFIER LETTER DOUBLE APOSTROPHE;Lm;0;L;;;;;N;;;;; +02EF;MODIFIER LETTER LOW DOWN ARROWHEAD;Sk;0;ON;;;;;N;;;;; +02F0;MODIFIER LETTER LOW UP ARROWHEAD;Sk;0;ON;;;;;N;;;;; +02F1;MODIFIER LETTER LOW LEFT ARROWHEAD;Sk;0;ON;;;;;N;;;;; +02F2;MODIFIER LETTER LOW RIGHT ARROWHEAD;Sk;0;ON;;;;;N;;;;; +02F3;MODIFIER LETTER LOW RING;Sk;0;ON;;;;;N;;;;; +02F4;MODIFIER LETTER MIDDLE GRAVE ACCENT;Sk;0;ON;;;;;N;;;;; +02F5;MODIFIER LETTER MIDDLE DOUBLE GRAVE ACCENT;Sk;0;ON;;;;;N;;;;; +02F6;MODIFIER LETTER MIDDLE DOUBLE ACUTE ACCENT;Sk;0;ON;;;;;N;;;;; +02F7;MODIFIER LETTER LOW TILDE;Sk;0;ON;;;;;N;;;;; +02F8;MODIFIER LETTER RAISED COLON;Sk;0;ON;;;;;N;;;;; +02F9;MODIFIER LETTER BEGIN HIGH TONE;Sk;0;ON;;;;;N;;;;; +02FA;MODIFIER LETTER END HIGH TONE;Sk;0;ON;;;;;N;;;;; +02FB;MODIFIER LETTER BEGIN LOW TONE;Sk;0;ON;;;;;N;;;;; +02FC;MODIFIER LETTER END LOW TONE;Sk;0;ON;;;;;N;;;;; +02FD;MODIFIER LETTER SHELF;Sk;0;ON;;;;;N;;;;; +02FE;MODIFIER LETTER OPEN SHELF;Sk;0;ON;;;;;N;;;;; +02FF;MODIFIER LETTER LOW LEFT ARROW;Sk;0;ON;;;;;N;;;;; +0300;COMBINING GRAVE ACCENT;Mn;230;NSM;;;;;N;NON-SPACING GRAVE;;;; +0301;COMBINING ACUTE ACCENT;Mn;230;NSM;;;;;N;NON-SPACING ACUTE;;;; +0302;COMBINING CIRCUMFLEX ACCENT;Mn;230;NSM;;;;;N;NON-SPACING CIRCUMFLEX;;;; +0303;COMBINING TILDE;Mn;230;NSM;;;;;N;NON-SPACING TILDE;;;; +0304;COMBINING MACRON;Mn;230;NSM;;;;;N;NON-SPACING MACRON;;;; +0305;COMBINING OVERLINE;Mn;230;NSM;;;;;N;NON-SPACING OVERSCORE;;;; +0306;COMBINING BREVE;Mn;230;NSM;;;;;N;NON-SPACING BREVE;;;; +0307;COMBINING DOT ABOVE;Mn;230;NSM;;;;;N;NON-SPACING DOT ABOVE;;;; +0308;COMBINING DIAERESIS;Mn;230;NSM;;;;;N;NON-SPACING DIAERESIS;;;; +0309;COMBINING HOOK ABOVE;Mn;230;NSM;;;;;N;NON-SPACING HOOK ABOVE;;;; +030A;COMBINING RING ABOVE;Mn;230;NSM;;;;;N;NON-SPACING RING ABOVE;;;; +030B;COMBINING DOUBLE ACUTE ACCENT;Mn;230;NSM;;;;;N;NON-SPACING DOUBLE ACUTE;;;; +030C;COMBINING CARON;Mn;230;NSM;;;;;N;NON-SPACING HACEK;;;; +030D;COMBINING VERTICAL LINE ABOVE;Mn;230;NSM;;;;;N;NON-SPACING VERTICAL LINE ABOVE;;;; +030E;COMBINING DOUBLE VERTICAL LINE ABOVE;Mn;230;NSM;;;;;N;NON-SPACING DOUBLE VERTICAL LINE ABOVE;;;; +030F;COMBINING DOUBLE GRAVE ACCENT;Mn;230;NSM;;;;;N;NON-SPACING DOUBLE GRAVE;;;; +0310;COMBINING CANDRABINDU;Mn;230;NSM;;;;;N;NON-SPACING CANDRABINDU;;;; +0311;COMBINING INVERTED BREVE;Mn;230;NSM;;;;;N;NON-SPACING INVERTED BREVE;;;; +0312;COMBINING TURNED COMMA ABOVE;Mn;230;NSM;;;;;N;NON-SPACING TURNED COMMA ABOVE;;;; +0313;COMBINING COMMA ABOVE;Mn;230;NSM;;;;;N;NON-SPACING COMMA ABOVE;;;; +0314;COMBINING REVERSED COMMA ABOVE;Mn;230;NSM;;;;;N;NON-SPACING REVERSED COMMA ABOVE;;;; +0315;COMBINING COMMA ABOVE RIGHT;Mn;232;NSM;;;;;N;NON-SPACING COMMA ABOVE RIGHT;;;; +0316;COMBINING GRAVE ACCENT BELOW;Mn;220;NSM;;;;;N;NON-SPACING GRAVE BELOW;;;; +0317;COMBINING ACUTE ACCENT BELOW;Mn;220;NSM;;;;;N;NON-SPACING ACUTE BELOW;;;; +0318;COMBINING LEFT TACK BELOW;Mn;220;NSM;;;;;N;NON-SPACING LEFT TACK BELOW;;;; +0319;COMBINING RIGHT TACK BELOW;Mn;220;NSM;;;;;N;NON-SPACING RIGHT TACK BELOW;;;; +031A;COMBINING LEFT ANGLE ABOVE;Mn;232;NSM;;;;;N;NON-SPACING LEFT ANGLE ABOVE;;;; +031B;COMBINING HORN;Mn;216;NSM;;;;;N;NON-SPACING HORN;;;; +031C;COMBINING LEFT HALF RING BELOW;Mn;220;NSM;;;;;N;NON-SPACING LEFT HALF RING BELOW;;;; +031D;COMBINING UP TACK BELOW;Mn;220;NSM;;;;;N;NON-SPACING UP TACK BELOW;;;; +031E;COMBINING DOWN TACK BELOW;Mn;220;NSM;;;;;N;NON-SPACING DOWN TACK BELOW;;;; +031F;COMBINING PLUS SIGN BELOW;Mn;220;NSM;;;;;N;NON-SPACING PLUS SIGN BELOW;;;; +0320;COMBINING MINUS SIGN BELOW;Mn;220;NSM;;;;;N;NON-SPACING MINUS SIGN BELOW;;;; +0321;COMBINING PALATALIZED HOOK BELOW;Mn;202;NSM;;;;;N;NON-SPACING PALATALIZED HOOK BELOW;;;; +0322;COMBINING RETROFLEX HOOK BELOW;Mn;202;NSM;;;;;N;NON-SPACING RETROFLEX HOOK BELOW;;;; +0323;COMBINING DOT BELOW;Mn;220;NSM;;;;;N;NON-SPACING DOT BELOW;;;; +0324;COMBINING DIAERESIS BELOW;Mn;220;NSM;;;;;N;NON-SPACING DOUBLE DOT BELOW;;;; +0325;COMBINING RING BELOW;Mn;220;NSM;;;;;N;NON-SPACING RING BELOW;;;; +0326;COMBINING COMMA BELOW;Mn;220;NSM;;;;;N;NON-SPACING COMMA BELOW;;;; +0327;COMBINING CEDILLA;Mn;202;NSM;;;;;N;NON-SPACING CEDILLA;;;; +0328;COMBINING OGONEK;Mn;202;NSM;;;;;N;NON-SPACING OGONEK;;;; +0329;COMBINING VERTICAL LINE BELOW;Mn;220;NSM;;;;;N;NON-SPACING VERTICAL LINE BELOW;;;; +032A;COMBINING BRIDGE BELOW;Mn;220;NSM;;;;;N;NON-SPACING BRIDGE BELOW;;;; +032B;COMBINING INVERTED DOUBLE ARCH BELOW;Mn;220;NSM;;;;;N;NON-SPACING INVERTED DOUBLE ARCH BELOW;;;; +032C;COMBINING CARON BELOW;Mn;220;NSM;;;;;N;NON-SPACING HACEK BELOW;;;; +032D;COMBINING CIRCUMFLEX ACCENT BELOW;Mn;220;NSM;;;;;N;NON-SPACING CIRCUMFLEX BELOW;;;; +032E;COMBINING BREVE BELOW;Mn;220;NSM;;;;;N;NON-SPACING BREVE BELOW;;;; +032F;COMBINING INVERTED BREVE BELOW;Mn;220;NSM;;;;;N;NON-SPACING INVERTED BREVE BELOW;;;; +0330;COMBINING TILDE BELOW;Mn;220;NSM;;;;;N;NON-SPACING TILDE BELOW;;;; +0331;COMBINING MACRON BELOW;Mn;220;NSM;;;;;N;NON-SPACING MACRON BELOW;;;; +0332;COMBINING LOW LINE;Mn;220;NSM;;;;;N;NON-SPACING UNDERSCORE;;;; +0333;COMBINING DOUBLE LOW LINE;Mn;220;NSM;;;;;N;NON-SPACING DOUBLE UNDERSCORE;;;; +0334;COMBINING TILDE OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING TILDE OVERLAY;;;; +0335;COMBINING SHORT STROKE OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING SHORT BAR OVERLAY;;;; +0336;COMBINING LONG STROKE OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING LONG BAR OVERLAY;;;; +0337;COMBINING SHORT SOLIDUS OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING SHORT SLASH OVERLAY;;;; +0338;COMBINING LONG SOLIDUS OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING LONG SLASH OVERLAY;;;; +0339;COMBINING RIGHT HALF RING BELOW;Mn;220;NSM;;;;;N;NON-SPACING RIGHT HALF RING BELOW;;;; +033A;COMBINING INVERTED BRIDGE BELOW;Mn;220;NSM;;;;;N;NON-SPACING INVERTED BRIDGE BELOW;;;; +033B;COMBINING SQUARE BELOW;Mn;220;NSM;;;;;N;NON-SPACING SQUARE BELOW;;;; +033C;COMBINING SEAGULL BELOW;Mn;220;NSM;;;;;N;NON-SPACING SEAGULL BELOW;;;; +033D;COMBINING X ABOVE;Mn;230;NSM;;;;;N;NON-SPACING X ABOVE;;;; +033E;COMBINING VERTICAL TILDE;Mn;230;NSM;;;;;N;NON-SPACING VERTICAL TILDE;;;; +033F;COMBINING DOUBLE OVERLINE;Mn;230;NSM;;;;;N;NON-SPACING DOUBLE OVERSCORE;;;; +0340;COMBINING GRAVE TONE MARK;Mn;230;NSM;0300;;;;N;NON-SPACING GRAVE TONE MARK;;;; +0341;COMBINING ACUTE TONE MARK;Mn;230;NSM;0301;;;;N;NON-SPACING ACUTE TONE MARK;;;; +0342;COMBINING GREEK PERISPOMENI;Mn;230;NSM;;;;;N;;;;; +0343;COMBINING GREEK KORONIS;Mn;230;NSM;0313;;;;N;;;;; +0344;COMBINING GREEK DIALYTIKA TONOS;Mn;230;NSM;0308 0301;;;;N;GREEK NON-SPACING DIAERESIS TONOS;;;; +0345;COMBINING GREEK YPOGEGRAMMENI;Mn;240;NSM;;;;;N;GREEK NON-SPACING IOTA BELOW;;0399;;0399 +0346;COMBINING BRIDGE ABOVE;Mn;230;NSM;;;;;N;;;;; +0347;COMBINING EQUALS SIGN BELOW;Mn;220;NSM;;;;;N;;;;; +0348;COMBINING DOUBLE VERTICAL LINE BELOW;Mn;220;NSM;;;;;N;;;;; +0349;COMBINING LEFT ANGLE BELOW;Mn;220;NSM;;;;;N;;;;; +034A;COMBINING NOT TILDE ABOVE;Mn;230;NSM;;;;;N;;;;; +034B;COMBINING HOMOTHETIC ABOVE;Mn;230;NSM;;;;;N;;;;; +034C;COMBINING ALMOST EQUAL TO ABOVE;Mn;230;NSM;;;;;N;;;;; +034D;COMBINING LEFT RIGHT ARROW BELOW;Mn;220;NSM;;;;;N;;;;; +034E;COMBINING UPWARDS ARROW BELOW;Mn;220;NSM;;;;;N;;;;; +034F;COMBINING GRAPHEME JOINER;Mn;0;NSM;;;;;N;;;;; +0350;COMBINING RIGHT ARROWHEAD ABOVE;Mn;230;NSM;;;;;N;;;;; +0351;COMBINING LEFT HALF RING ABOVE;Mn;230;NSM;;;;;N;;;;; +0352;COMBINING FERMATA;Mn;230;NSM;;;;;N;;;;; +0353;COMBINING X BELOW;Mn;220;NSM;;;;;N;;;;; +0354;COMBINING LEFT ARROWHEAD BELOW;Mn;220;NSM;;;;;N;;;;; +0355;COMBINING RIGHT ARROWHEAD BELOW;Mn;220;NSM;;;;;N;;;;; +0356;COMBINING RIGHT ARROWHEAD AND UP ARROWHEAD BELOW;Mn;220;NSM;;;;;N;;;;; +0357;COMBINING RIGHT HALF RING ABOVE;Mn;230;NSM;;;;;N;;;;; +0358;COMBINING DOT ABOVE RIGHT;Mn;232;NSM;;;;;N;;;;; +0359;COMBINING ASTERISK BELOW;Mn;220;NSM;;;;;N;;;;; +035A;COMBINING DOUBLE RING BELOW;Mn;220;NSM;;;;;N;;;;; +035B;COMBINING ZIGZAG ABOVE;Mn;230;NSM;;;;;N;;;;; +035C;COMBINING DOUBLE BREVE BELOW;Mn;233;NSM;;;;;N;;;;; +035D;COMBINING DOUBLE BREVE;Mn;234;NSM;;;;;N;;;;; +035E;COMBINING DOUBLE MACRON;Mn;234;NSM;;;;;N;;;;; +035F;COMBINING DOUBLE MACRON BELOW;Mn;233;NSM;;;;;N;;;;; +0360;COMBINING DOUBLE TILDE;Mn;234;NSM;;;;;N;;;;; +0361;COMBINING DOUBLE INVERTED BREVE;Mn;234;NSM;;;;;N;;;;; +0362;COMBINING DOUBLE RIGHTWARDS ARROW BELOW;Mn;233;NSM;;;;;N;;;;; +0363;COMBINING LATIN SMALL LETTER A;Mn;230;NSM;;;;;N;;;;; +0364;COMBINING LATIN SMALL LETTER E;Mn;230;NSM;;;;;N;;;;; +0365;COMBINING LATIN SMALL LETTER I;Mn;230;NSM;;;;;N;;;;; +0366;COMBINING LATIN SMALL LETTER O;Mn;230;NSM;;;;;N;;;;; +0367;COMBINING LATIN SMALL LETTER U;Mn;230;NSM;;;;;N;;;;; +0368;COMBINING LATIN SMALL LETTER C;Mn;230;NSM;;;;;N;;;;; +0369;COMBINING LATIN SMALL LETTER D;Mn;230;NSM;;;;;N;;;;; +036A;COMBINING LATIN SMALL LETTER H;Mn;230;NSM;;;;;N;;;;; +036B;COMBINING LATIN SMALL LETTER M;Mn;230;NSM;;;;;N;;;;; +036C;COMBINING LATIN SMALL LETTER R;Mn;230;NSM;;;;;N;;;;; +036D;COMBINING LATIN SMALL LETTER T;Mn;230;NSM;;;;;N;;;;; +036E;COMBINING LATIN SMALL LETTER V;Mn;230;NSM;;;;;N;;;;; +036F;COMBINING LATIN SMALL LETTER X;Mn;230;NSM;;;;;N;;;;; +0370;GREEK CAPITAL LETTER HETA;Lu;0;L;;;;;N;;;;0371; +0371;GREEK SMALL LETTER HETA;Ll;0;L;;;;;N;;;0370;;0370 +0372;GREEK CAPITAL LETTER ARCHAIC SAMPI;Lu;0;L;;;;;N;;;;0373; +0373;GREEK SMALL LETTER ARCHAIC SAMPI;Ll;0;L;;;;;N;;;0372;;0372 +0374;GREEK NUMERAL SIGN;Lm;0;ON;02B9;;;;N;GREEK UPPER NUMERAL SIGN;;;; +0375;GREEK LOWER NUMERAL SIGN;Sk;0;ON;;;;;N;;;;; +0376;GREEK CAPITAL LETTER PAMPHYLIAN DIGAMMA;Lu;0;L;;;;;N;;;;0377; +0377;GREEK SMALL LETTER PAMPHYLIAN DIGAMMA;Ll;0;L;;;;;N;;;0376;;0376 +037A;GREEK YPOGEGRAMMENI;Lm;0;L; 0020 0345;;;;N;GREEK SPACING IOTA BELOW;;;; +037B;GREEK SMALL REVERSED LUNATE SIGMA SYMBOL;Ll;0;L;;;;;N;;;03FD;;03FD +037C;GREEK SMALL DOTTED LUNATE SIGMA SYMBOL;Ll;0;L;;;;;N;;;03FE;;03FE +037D;GREEK SMALL REVERSED DOTTED LUNATE SIGMA SYMBOL;Ll;0;L;;;;;N;;;03FF;;03FF +037E;GREEK QUESTION MARK;Po;0;ON;003B;;;;N;;;;; +037F;GREEK CAPITAL LETTER YOT;Lu;0;L;;;;;N;;;;03F3; +0384;GREEK TONOS;Sk;0;ON; 0020 0301;;;;N;GREEK SPACING TONOS;;;; +0385;GREEK DIALYTIKA TONOS;Sk;0;ON;00A8 0301;;;;N;GREEK SPACING DIAERESIS TONOS;;;; +0386;GREEK CAPITAL LETTER ALPHA WITH TONOS;Lu;0;L;0391 0301;;;;N;GREEK CAPITAL LETTER ALPHA TONOS;;;03AC; +0387;GREEK ANO TELEIA;Po;0;ON;00B7;;;;N;;;;; +0388;GREEK CAPITAL LETTER EPSILON WITH TONOS;Lu;0;L;0395 0301;;;;N;GREEK CAPITAL LETTER EPSILON TONOS;;;03AD; +0389;GREEK CAPITAL LETTER ETA WITH TONOS;Lu;0;L;0397 0301;;;;N;GREEK CAPITAL LETTER ETA TONOS;;;03AE; +038A;GREEK CAPITAL LETTER IOTA WITH TONOS;Lu;0;L;0399 0301;;;;N;GREEK CAPITAL LETTER IOTA TONOS;;;03AF; +038C;GREEK CAPITAL LETTER OMICRON WITH TONOS;Lu;0;L;039F 0301;;;;N;GREEK CAPITAL LETTER OMICRON TONOS;;;03CC; +038E;GREEK CAPITAL LETTER UPSILON WITH TONOS;Lu;0;L;03A5 0301;;;;N;GREEK CAPITAL LETTER UPSILON TONOS;;;03CD; +038F;GREEK CAPITAL LETTER OMEGA WITH TONOS;Lu;0;L;03A9 0301;;;;N;GREEK CAPITAL LETTER OMEGA TONOS;;;03CE; +0390;GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS;Ll;0;L;03CA 0301;;;;N;GREEK SMALL LETTER IOTA DIAERESIS TONOS;;;; +0391;GREEK CAPITAL LETTER ALPHA;Lu;0;L;;;;;N;;;;03B1; +0392;GREEK CAPITAL LETTER BETA;Lu;0;L;;;;;N;;;;03B2; +0393;GREEK CAPITAL LETTER GAMMA;Lu;0;L;;;;;N;;;;03B3; +0394;GREEK CAPITAL LETTER DELTA;Lu;0;L;;;;;N;;;;03B4; +0395;GREEK CAPITAL LETTER EPSILON;Lu;0;L;;;;;N;;;;03B5; +0396;GREEK CAPITAL LETTER ZETA;Lu;0;L;;;;;N;;;;03B6; +0397;GREEK CAPITAL LETTER ETA;Lu;0;L;;;;;N;;;;03B7; +0398;GREEK CAPITAL LETTER THETA;Lu;0;L;;;;;N;;;;03B8; +0399;GREEK CAPITAL LETTER IOTA;Lu;0;L;;;;;N;;;;03B9; +039A;GREEK CAPITAL LETTER KAPPA;Lu;0;L;;;;;N;;;;03BA; +039B;GREEK CAPITAL LETTER LAMDA;Lu;0;L;;;;;N;GREEK CAPITAL LETTER LAMBDA;;;03BB; +039C;GREEK CAPITAL LETTER MU;Lu;0;L;;;;;N;;;;03BC; +039D;GREEK CAPITAL LETTER NU;Lu;0;L;;;;;N;;;;03BD; +039E;GREEK CAPITAL LETTER XI;Lu;0;L;;;;;N;;;;03BE; +039F;GREEK CAPITAL LETTER OMICRON;Lu;0;L;;;;;N;;;;03BF; +03A0;GREEK CAPITAL LETTER PI;Lu;0;L;;;;;N;;;;03C0; +03A1;GREEK CAPITAL LETTER RHO;Lu;0;L;;;;;N;;;;03C1; +03A3;GREEK CAPITAL LETTER SIGMA;Lu;0;L;;;;;N;;;;03C3; +03A4;GREEK CAPITAL LETTER TAU;Lu;0;L;;;;;N;;;;03C4; +03A5;GREEK CAPITAL LETTER UPSILON;Lu;0;L;;;;;N;;;;03C5; +03A6;GREEK CAPITAL LETTER PHI;Lu;0;L;;;;;N;;;;03C6; +03A7;GREEK CAPITAL LETTER CHI;Lu;0;L;;;;;N;;;;03C7; +03A8;GREEK CAPITAL LETTER PSI;Lu;0;L;;;;;N;;;;03C8; +03A9;GREEK CAPITAL LETTER OMEGA;Lu;0;L;;;;;N;;;;03C9; +03AA;GREEK CAPITAL LETTER IOTA WITH DIALYTIKA;Lu;0;L;0399 0308;;;;N;GREEK CAPITAL LETTER IOTA DIAERESIS;;;03CA; +03AB;GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA;Lu;0;L;03A5 0308;;;;N;GREEK CAPITAL LETTER UPSILON DIAERESIS;;;03CB; +03AC;GREEK SMALL LETTER ALPHA WITH TONOS;Ll;0;L;03B1 0301;;;;N;GREEK SMALL LETTER ALPHA TONOS;;0386;;0386 +03AD;GREEK SMALL LETTER EPSILON WITH TONOS;Ll;0;L;03B5 0301;;;;N;GREEK SMALL LETTER EPSILON TONOS;;0388;;0388 +03AE;GREEK SMALL LETTER ETA WITH TONOS;Ll;0;L;03B7 0301;;;;N;GREEK SMALL LETTER ETA TONOS;;0389;;0389 +03AF;GREEK SMALL LETTER IOTA WITH TONOS;Ll;0;L;03B9 0301;;;;N;GREEK SMALL LETTER IOTA TONOS;;038A;;038A +03B0;GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS;Ll;0;L;03CB 0301;;;;N;GREEK SMALL LETTER UPSILON DIAERESIS TONOS;;;; +03B1;GREEK SMALL LETTER ALPHA;Ll;0;L;;;;;N;;;0391;;0391 +03B2;GREEK SMALL LETTER BETA;Ll;0;L;;;;;N;;;0392;;0392 +03B3;GREEK SMALL LETTER GAMMA;Ll;0;L;;;;;N;;;0393;;0393 +03B4;GREEK SMALL LETTER DELTA;Ll;0;L;;;;;N;;;0394;;0394 +03B5;GREEK SMALL LETTER EPSILON;Ll;0;L;;;;;N;;;0395;;0395 +03B6;GREEK SMALL LETTER ZETA;Ll;0;L;;;;;N;;;0396;;0396 +03B7;GREEK SMALL LETTER ETA;Ll;0;L;;;;;N;;;0397;;0397 +03B8;GREEK SMALL LETTER THETA;Ll;0;L;;;;;N;;;0398;;0398 +03B9;GREEK SMALL LETTER IOTA;Ll;0;L;;;;;N;;;0399;;0399 +03BA;GREEK SMALL LETTER KAPPA;Ll;0;L;;;;;N;;;039A;;039A +03BB;GREEK SMALL LETTER LAMDA;Ll;0;L;;;;;N;GREEK SMALL LETTER LAMBDA;;039B;;039B +03BC;GREEK SMALL LETTER MU;Ll;0;L;;;;;N;;;039C;;039C +03BD;GREEK SMALL LETTER NU;Ll;0;L;;;;;N;;;039D;;039D +03BE;GREEK SMALL LETTER XI;Ll;0;L;;;;;N;;;039E;;039E +03BF;GREEK SMALL LETTER OMICRON;Ll;0;L;;;;;N;;;039F;;039F +03C0;GREEK SMALL LETTER PI;Ll;0;L;;;;;N;;;03A0;;03A0 +03C1;GREEK SMALL LETTER RHO;Ll;0;L;;;;;N;;;03A1;;03A1 +03C2;GREEK SMALL LETTER FINAL SIGMA;Ll;0;L;;;;;N;;;03A3;;03A3 +03C3;GREEK SMALL LETTER SIGMA;Ll;0;L;;;;;N;;;03A3;;03A3 +03C4;GREEK SMALL LETTER TAU;Ll;0;L;;;;;N;;;03A4;;03A4 +03C5;GREEK SMALL LETTER UPSILON;Ll;0;L;;;;;N;;;03A5;;03A5 +03C6;GREEK SMALL LETTER PHI;Ll;0;L;;;;;N;;;03A6;;03A6 +03C7;GREEK SMALL LETTER CHI;Ll;0;L;;;;;N;;;03A7;;03A7 +03C8;GREEK SMALL LETTER PSI;Ll;0;L;;;;;N;;;03A8;;03A8 +03C9;GREEK SMALL LETTER OMEGA;Ll;0;L;;;;;N;;;03A9;;03A9 +03CA;GREEK SMALL LETTER IOTA WITH DIALYTIKA;Ll;0;L;03B9 0308;;;;N;GREEK SMALL LETTER IOTA DIAERESIS;;03AA;;03AA +03CB;GREEK SMALL LETTER UPSILON WITH DIALYTIKA;Ll;0;L;03C5 0308;;;;N;GREEK SMALL LETTER UPSILON DIAERESIS;;03AB;;03AB +03CC;GREEK SMALL LETTER OMICRON WITH TONOS;Ll;0;L;03BF 0301;;;;N;GREEK SMALL LETTER OMICRON TONOS;;038C;;038C +03CD;GREEK SMALL LETTER UPSILON WITH TONOS;Ll;0;L;03C5 0301;;;;N;GREEK SMALL LETTER UPSILON TONOS;;038E;;038E +03CE;GREEK SMALL LETTER OMEGA WITH TONOS;Ll;0;L;03C9 0301;;;;N;GREEK SMALL LETTER OMEGA TONOS;;038F;;038F +03CF;GREEK CAPITAL KAI SYMBOL;Lu;0;L;;;;;N;;;;03D7; +03D0;GREEK BETA SYMBOL;Ll;0;L; 03B2;;;;N;GREEK SMALL LETTER CURLED BETA;;0392;;0392 +03D1;GREEK THETA SYMBOL;Ll;0;L; 03B8;;;;N;GREEK SMALL LETTER SCRIPT THETA;;0398;;0398 +03D2;GREEK UPSILON WITH HOOK SYMBOL;Lu;0;L; 03A5;;;;N;GREEK CAPITAL LETTER UPSILON HOOK;;;; +03D3;GREEK UPSILON WITH ACUTE AND HOOK SYMBOL;Lu;0;L;03D2 0301;;;;N;GREEK CAPITAL LETTER UPSILON HOOK TONOS;;;; +03D4;GREEK UPSILON WITH DIAERESIS AND HOOK SYMBOL;Lu;0;L;03D2 0308;;;;N;GREEK CAPITAL LETTER UPSILON HOOK DIAERESIS;;;; +03D5;GREEK PHI SYMBOL;Ll;0;L; 03C6;;;;N;GREEK SMALL LETTER SCRIPT PHI;;03A6;;03A6 +03D6;GREEK PI SYMBOL;Ll;0;L; 03C0;;;;N;GREEK SMALL LETTER OMEGA PI;;03A0;;03A0 +03D7;GREEK KAI SYMBOL;Ll;0;L;;;;;N;;;03CF;;03CF +03D8;GREEK LETTER ARCHAIC KOPPA;Lu;0;L;;;;;N;;;;03D9; +03D9;GREEK SMALL LETTER ARCHAIC KOPPA;Ll;0;L;;;;;N;;;03D8;;03D8 +03DA;GREEK LETTER STIGMA;Lu;0;L;;;;;N;GREEK CAPITAL LETTER STIGMA;;;03DB; +03DB;GREEK SMALL LETTER STIGMA;Ll;0;L;;;;;N;;;03DA;;03DA +03DC;GREEK LETTER DIGAMMA;Lu;0;L;;;;;N;GREEK CAPITAL LETTER DIGAMMA;;;03DD; +03DD;GREEK SMALL LETTER DIGAMMA;Ll;0;L;;;;;N;;;03DC;;03DC +03DE;GREEK LETTER KOPPA;Lu;0;L;;;;;N;GREEK CAPITAL LETTER KOPPA;;;03DF; +03DF;GREEK SMALL LETTER KOPPA;Ll;0;L;;;;;N;;;03DE;;03DE +03E0;GREEK LETTER SAMPI;Lu;0;L;;;;;N;GREEK CAPITAL LETTER SAMPI;;;03E1; +03E1;GREEK SMALL LETTER SAMPI;Ll;0;L;;;;;N;;;03E0;;03E0 +03E2;COPTIC CAPITAL LETTER SHEI;Lu;0;L;;;;;N;GREEK CAPITAL LETTER SHEI;;;03E3; +03E3;COPTIC SMALL LETTER SHEI;Ll;0;L;;;;;N;GREEK SMALL LETTER SHEI;;03E2;;03E2 +03E4;COPTIC CAPITAL LETTER FEI;Lu;0;L;;;;;N;GREEK CAPITAL LETTER FEI;;;03E5; +03E5;COPTIC SMALL LETTER FEI;Ll;0;L;;;;;N;GREEK SMALL LETTER FEI;;03E4;;03E4 +03E6;COPTIC CAPITAL LETTER KHEI;Lu;0;L;;;;;N;GREEK CAPITAL LETTER KHEI;;;03E7; +03E7;COPTIC SMALL LETTER KHEI;Ll;0;L;;;;;N;GREEK SMALL LETTER KHEI;;03E6;;03E6 +03E8;COPTIC CAPITAL LETTER HORI;Lu;0;L;;;;;N;GREEK CAPITAL LETTER HORI;;;03E9; +03E9;COPTIC SMALL LETTER HORI;Ll;0;L;;;;;N;GREEK SMALL LETTER HORI;;03E8;;03E8 +03EA;COPTIC CAPITAL LETTER GANGIA;Lu;0;L;;;;;N;GREEK CAPITAL LETTER GANGIA;;;03EB; +03EB;COPTIC SMALL LETTER GANGIA;Ll;0;L;;;;;N;GREEK SMALL LETTER GANGIA;;03EA;;03EA +03EC;COPTIC CAPITAL LETTER SHIMA;Lu;0;L;;;;;N;GREEK CAPITAL LETTER SHIMA;;;03ED; +03ED;COPTIC SMALL LETTER SHIMA;Ll;0;L;;;;;N;GREEK SMALL LETTER SHIMA;;03EC;;03EC +03EE;COPTIC CAPITAL LETTER DEI;Lu;0;L;;;;;N;GREEK CAPITAL LETTER DEI;;;03EF; +03EF;COPTIC SMALL LETTER DEI;Ll;0;L;;;;;N;GREEK SMALL LETTER DEI;;03EE;;03EE +03F0;GREEK KAPPA SYMBOL;Ll;0;L; 03BA;;;;N;GREEK SMALL LETTER SCRIPT KAPPA;;039A;;039A +03F1;GREEK RHO SYMBOL;Ll;0;L; 03C1;;;;N;GREEK SMALL LETTER TAILED RHO;;03A1;;03A1 +03F2;GREEK LUNATE SIGMA SYMBOL;Ll;0;L; 03C2;;;;N;GREEK SMALL LETTER LUNATE SIGMA;;03F9;;03F9 +03F3;GREEK LETTER YOT;Ll;0;L;;;;;N;;;037F;;037F +03F4;GREEK CAPITAL THETA SYMBOL;Lu;0;L; 0398;;;;N;;;;03B8; +03F5;GREEK LUNATE EPSILON SYMBOL;Ll;0;L; 03B5;;;;N;;;0395;;0395 +03F6;GREEK REVERSED LUNATE EPSILON SYMBOL;Sm;0;ON;;;;;N;;;;; +03F7;GREEK CAPITAL LETTER SHO;Lu;0;L;;;;;N;;;;03F8; +03F8;GREEK SMALL LETTER SHO;Ll;0;L;;;;;N;;;03F7;;03F7 +03F9;GREEK CAPITAL LUNATE SIGMA SYMBOL;Lu;0;L; 03A3;;;;N;;;;03F2; +03FA;GREEK CAPITAL LETTER SAN;Lu;0;L;;;;;N;;;;03FB; +03FB;GREEK SMALL LETTER SAN;Ll;0;L;;;;;N;;;03FA;;03FA +03FC;GREEK RHO WITH STROKE SYMBOL;Ll;0;L;;;;;N;;;;; +03FD;GREEK CAPITAL REVERSED LUNATE SIGMA SYMBOL;Lu;0;L;;;;;N;;;;037B; +03FE;GREEK CAPITAL DOTTED LUNATE SIGMA SYMBOL;Lu;0;L;;;;;N;;;;037C; +03FF;GREEK CAPITAL REVERSED DOTTED LUNATE SIGMA SYMBOL;Lu;0;L;;;;;N;;;;037D; +0400;CYRILLIC CAPITAL LETTER IE WITH GRAVE;Lu;0;L;0415 0300;;;;N;;;;0450; +0401;CYRILLIC CAPITAL LETTER IO;Lu;0;L;0415 0308;;;;N;;;;0451; +0402;CYRILLIC CAPITAL LETTER DJE;Lu;0;L;;;;;N;;;;0452; +0403;CYRILLIC CAPITAL LETTER GJE;Lu;0;L;0413 0301;;;;N;;;;0453; +0404;CYRILLIC CAPITAL LETTER UKRAINIAN IE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER E;;;0454; +0405;CYRILLIC CAPITAL LETTER DZE;Lu;0;L;;;;;N;;;;0455; +0406;CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER I;;;0456; +0407;CYRILLIC CAPITAL LETTER YI;Lu;0;L;0406 0308;;;;N;;;;0457; +0408;CYRILLIC CAPITAL LETTER JE;Lu;0;L;;;;;N;;;;0458; +0409;CYRILLIC CAPITAL LETTER LJE;Lu;0;L;;;;;N;;;;0459; +040A;CYRILLIC CAPITAL LETTER NJE;Lu;0;L;;;;;N;;;;045A; +040B;CYRILLIC CAPITAL LETTER TSHE;Lu;0;L;;;;;N;;;;045B; +040C;CYRILLIC CAPITAL LETTER KJE;Lu;0;L;041A 0301;;;;N;;;;045C; +040D;CYRILLIC CAPITAL LETTER I WITH GRAVE;Lu;0;L;0418 0300;;;;N;;;;045D; +040E;CYRILLIC CAPITAL LETTER SHORT U;Lu;0;L;0423 0306;;;;N;;;;045E; +040F;CYRILLIC CAPITAL LETTER DZHE;Lu;0;L;;;;;N;;;;045F; +0410;CYRILLIC CAPITAL LETTER A;Lu;0;L;;;;;N;;;;0430; +0411;CYRILLIC CAPITAL LETTER BE;Lu;0;L;;;;;N;;;;0431; +0412;CYRILLIC CAPITAL LETTER VE;Lu;0;L;;;;;N;;;;0432; +0413;CYRILLIC CAPITAL LETTER GHE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER GE;;;0433; +0414;CYRILLIC CAPITAL LETTER DE;Lu;0;L;;;;;N;;;;0434; +0415;CYRILLIC CAPITAL LETTER IE;Lu;0;L;;;;;N;;;;0435; +0416;CYRILLIC CAPITAL LETTER ZHE;Lu;0;L;;;;;N;;;;0436; +0417;CYRILLIC CAPITAL LETTER ZE;Lu;0;L;;;;;N;;;;0437; +0418;CYRILLIC CAPITAL LETTER I;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER II;;;0438; +0419;CYRILLIC CAPITAL LETTER SHORT I;Lu;0;L;0418 0306;;;;N;CYRILLIC CAPITAL LETTER SHORT II;;;0439; +041A;CYRILLIC CAPITAL LETTER KA;Lu;0;L;;;;;N;;;;043A; +041B;CYRILLIC CAPITAL LETTER EL;Lu;0;L;;;;;N;;;;043B; +041C;CYRILLIC CAPITAL LETTER EM;Lu;0;L;;;;;N;;;;043C; +041D;CYRILLIC CAPITAL LETTER EN;Lu;0;L;;;;;N;;;;043D; +041E;CYRILLIC CAPITAL LETTER O;Lu;0;L;;;;;N;;;;043E; +041F;CYRILLIC CAPITAL LETTER PE;Lu;0;L;;;;;N;;;;043F; +0420;CYRILLIC CAPITAL LETTER ER;Lu;0;L;;;;;N;;;;0440; +0421;CYRILLIC CAPITAL LETTER ES;Lu;0;L;;;;;N;;;;0441; +0422;CYRILLIC CAPITAL LETTER TE;Lu;0;L;;;;;N;;;;0442; +0423;CYRILLIC CAPITAL LETTER U;Lu;0;L;;;;;N;;;;0443; +0424;CYRILLIC CAPITAL LETTER EF;Lu;0;L;;;;;N;;;;0444; +0425;CYRILLIC CAPITAL LETTER HA;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER KHA;;;0445; +0426;CYRILLIC CAPITAL LETTER TSE;Lu;0;L;;;;;N;;;;0446; +0427;CYRILLIC CAPITAL LETTER CHE;Lu;0;L;;;;;N;;;;0447; +0428;CYRILLIC CAPITAL LETTER SHA;Lu;0;L;;;;;N;;;;0448; +0429;CYRILLIC CAPITAL LETTER SHCHA;Lu;0;L;;;;;N;;;;0449; +042A;CYRILLIC CAPITAL LETTER HARD SIGN;Lu;0;L;;;;;N;;;;044A; +042B;CYRILLIC CAPITAL LETTER YERU;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER YERI;;;044B; +042C;CYRILLIC CAPITAL LETTER SOFT SIGN;Lu;0;L;;;;;N;;;;044C; +042D;CYRILLIC CAPITAL LETTER E;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER REVERSED E;;;044D; +042E;CYRILLIC CAPITAL LETTER YU;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER IU;;;044E; +042F;CYRILLIC CAPITAL LETTER YA;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER IA;;;044F; +0430;CYRILLIC SMALL LETTER A;Ll;0;L;;;;;N;;;0410;;0410 +0431;CYRILLIC SMALL LETTER BE;Ll;0;L;;;;;N;;;0411;;0411 +0432;CYRILLIC SMALL LETTER VE;Ll;0;L;;;;;N;;;0412;;0412 +0433;CYRILLIC SMALL LETTER GHE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER GE;;0413;;0413 +0434;CYRILLIC SMALL LETTER DE;Ll;0;L;;;;;N;;;0414;;0414 +0435;CYRILLIC SMALL LETTER IE;Ll;0;L;;;;;N;;;0415;;0415 +0436;CYRILLIC SMALL LETTER ZHE;Ll;0;L;;;;;N;;;0416;;0416 +0437;CYRILLIC SMALL LETTER ZE;Ll;0;L;;;;;N;;;0417;;0417 +0438;CYRILLIC SMALL LETTER I;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER II;;0418;;0418 +0439;CYRILLIC SMALL LETTER SHORT I;Ll;0;L;0438 0306;;;;N;CYRILLIC SMALL LETTER SHORT II;;0419;;0419 +043A;CYRILLIC SMALL LETTER KA;Ll;0;L;;;;;N;;;041A;;041A +043B;CYRILLIC SMALL LETTER EL;Ll;0;L;;;;;N;;;041B;;041B +043C;CYRILLIC SMALL LETTER EM;Ll;0;L;;;;;N;;;041C;;041C +043D;CYRILLIC SMALL LETTER EN;Ll;0;L;;;;;N;;;041D;;041D +043E;CYRILLIC SMALL LETTER O;Ll;0;L;;;;;N;;;041E;;041E +043F;CYRILLIC SMALL LETTER PE;Ll;0;L;;;;;N;;;041F;;041F +0440;CYRILLIC SMALL LETTER ER;Ll;0;L;;;;;N;;;0420;;0420 +0441;CYRILLIC SMALL LETTER ES;Ll;0;L;;;;;N;;;0421;;0421 +0442;CYRILLIC SMALL LETTER TE;Ll;0;L;;;;;N;;;0422;;0422 +0443;CYRILLIC SMALL LETTER U;Ll;0;L;;;;;N;;;0423;;0423 +0444;CYRILLIC SMALL LETTER EF;Ll;0;L;;;;;N;;;0424;;0424 +0445;CYRILLIC SMALL LETTER HA;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER KHA;;0425;;0425 +0446;CYRILLIC SMALL LETTER TSE;Ll;0;L;;;;;N;;;0426;;0426 +0447;CYRILLIC SMALL LETTER CHE;Ll;0;L;;;;;N;;;0427;;0427 +0448;CYRILLIC SMALL LETTER SHA;Ll;0;L;;;;;N;;;0428;;0428 +0449;CYRILLIC SMALL LETTER SHCHA;Ll;0;L;;;;;N;;;0429;;0429 +044A;CYRILLIC SMALL LETTER HARD SIGN;Ll;0;L;;;;;N;;;042A;;042A +044B;CYRILLIC SMALL LETTER YERU;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER YERI;;042B;;042B +044C;CYRILLIC SMALL LETTER SOFT SIGN;Ll;0;L;;;;;N;;;042C;;042C +044D;CYRILLIC SMALL LETTER E;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER REVERSED E;;042D;;042D +044E;CYRILLIC SMALL LETTER YU;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER IU;;042E;;042E +044F;CYRILLIC SMALL LETTER YA;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER IA;;042F;;042F +0450;CYRILLIC SMALL LETTER IE WITH GRAVE;Ll;0;L;0435 0300;;;;N;;;0400;;0400 +0451;CYRILLIC SMALL LETTER IO;Ll;0;L;0435 0308;;;;N;;;0401;;0401 +0452;CYRILLIC SMALL LETTER DJE;Ll;0;L;;;;;N;;;0402;;0402 +0453;CYRILLIC SMALL LETTER GJE;Ll;0;L;0433 0301;;;;N;;;0403;;0403 +0454;CYRILLIC SMALL LETTER UKRAINIAN IE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER E;;0404;;0404 +0455;CYRILLIC SMALL LETTER DZE;Ll;0;L;;;;;N;;;0405;;0405 +0456;CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER I;;0406;;0406 +0457;CYRILLIC SMALL LETTER YI;Ll;0;L;0456 0308;;;;N;;;0407;;0407 +0458;CYRILLIC SMALL LETTER JE;Ll;0;L;;;;;N;;;0408;;0408 +0459;CYRILLIC SMALL LETTER LJE;Ll;0;L;;;;;N;;;0409;;0409 +045A;CYRILLIC SMALL LETTER NJE;Ll;0;L;;;;;N;;;040A;;040A +045B;CYRILLIC SMALL LETTER TSHE;Ll;0;L;;;;;N;;;040B;;040B +045C;CYRILLIC SMALL LETTER KJE;Ll;0;L;043A 0301;;;;N;;;040C;;040C +045D;CYRILLIC SMALL LETTER I WITH GRAVE;Ll;0;L;0438 0300;;;;N;;;040D;;040D +045E;CYRILLIC SMALL LETTER SHORT U;Ll;0;L;0443 0306;;;;N;;;040E;;040E +045F;CYRILLIC SMALL LETTER DZHE;Ll;0;L;;;;;N;;;040F;;040F +0460;CYRILLIC CAPITAL LETTER OMEGA;Lu;0;L;;;;;N;;;;0461; +0461;CYRILLIC SMALL LETTER OMEGA;Ll;0;L;;;;;N;;;0460;;0460 +0462;CYRILLIC CAPITAL LETTER YAT;Lu;0;L;;;;;N;;;;0463; +0463;CYRILLIC SMALL LETTER YAT;Ll;0;L;;;;;N;;;0462;;0462 +0464;CYRILLIC CAPITAL LETTER IOTIFIED E;Lu;0;L;;;;;N;;;;0465; +0465;CYRILLIC SMALL LETTER IOTIFIED E;Ll;0;L;;;;;N;;;0464;;0464 +0466;CYRILLIC CAPITAL LETTER LITTLE YUS;Lu;0;L;;;;;N;;;;0467; +0467;CYRILLIC SMALL LETTER LITTLE YUS;Ll;0;L;;;;;N;;;0466;;0466 +0468;CYRILLIC CAPITAL LETTER IOTIFIED LITTLE YUS;Lu;0;L;;;;;N;;;;0469; +0469;CYRILLIC SMALL LETTER IOTIFIED LITTLE YUS;Ll;0;L;;;;;N;;;0468;;0468 +046A;CYRILLIC CAPITAL LETTER BIG YUS;Lu;0;L;;;;;N;;;;046B; +046B;CYRILLIC SMALL LETTER BIG YUS;Ll;0;L;;;;;N;;;046A;;046A +046C;CYRILLIC CAPITAL LETTER IOTIFIED BIG YUS;Lu;0;L;;;;;N;;;;046D; +046D;CYRILLIC SMALL LETTER IOTIFIED BIG YUS;Ll;0;L;;;;;N;;;046C;;046C +046E;CYRILLIC CAPITAL LETTER KSI;Lu;0;L;;;;;N;;;;046F; +046F;CYRILLIC SMALL LETTER KSI;Ll;0;L;;;;;N;;;046E;;046E +0470;CYRILLIC CAPITAL LETTER PSI;Lu;0;L;;;;;N;;;;0471; +0471;CYRILLIC SMALL LETTER PSI;Ll;0;L;;;;;N;;;0470;;0470 +0472;CYRILLIC CAPITAL LETTER FITA;Lu;0;L;;;;;N;;;;0473; +0473;CYRILLIC SMALL LETTER FITA;Ll;0;L;;;;;N;;;0472;;0472 +0474;CYRILLIC CAPITAL LETTER IZHITSA;Lu;0;L;;;;;N;;;;0475; +0475;CYRILLIC SMALL LETTER IZHITSA;Ll;0;L;;;;;N;;;0474;;0474 +0476;CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT;Lu;0;L;0474 030F;;;;N;CYRILLIC CAPITAL LETTER IZHITSA DOUBLE GRAVE;;;0477; +0477;CYRILLIC SMALL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT;Ll;0;L;0475 030F;;;;N;CYRILLIC SMALL LETTER IZHITSA DOUBLE GRAVE;;0476;;0476 +0478;CYRILLIC CAPITAL LETTER UK;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER UK DIGRAPH;;;0479; +0479;CYRILLIC SMALL LETTER UK;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER UK DIGRAPH;;0478;;0478 +047A;CYRILLIC CAPITAL LETTER ROUND OMEGA;Lu;0;L;;;;;N;;;;047B; +047B;CYRILLIC SMALL LETTER ROUND OMEGA;Ll;0;L;;;;;N;;;047A;;047A +047C;CYRILLIC CAPITAL LETTER OMEGA WITH TITLO;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER OMEGA TITLO;;;047D; +047D;CYRILLIC SMALL LETTER OMEGA WITH TITLO;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER OMEGA TITLO;;047C;;047C +047E;CYRILLIC CAPITAL LETTER OT;Lu;0;L;;;;;N;;;;047F; +047F;CYRILLIC SMALL LETTER OT;Ll;0;L;;;;;N;;;047E;;047E +0480;CYRILLIC CAPITAL LETTER KOPPA;Lu;0;L;;;;;N;;;;0481; +0481;CYRILLIC SMALL LETTER KOPPA;Ll;0;L;;;;;N;;;0480;;0480 +0482;CYRILLIC THOUSANDS SIGN;So;0;L;;;;;N;;;;; +0483;COMBINING CYRILLIC TITLO;Mn;230;NSM;;;;;N;CYRILLIC NON-SPACING TITLO;;;; +0484;COMBINING CYRILLIC PALATALIZATION;Mn;230;NSM;;;;;N;CYRILLIC NON-SPACING PALATALIZATION;;;; +0485;COMBINING CYRILLIC DASIA PNEUMATA;Mn;230;NSM;;;;;N;CYRILLIC NON-SPACING DASIA PNEUMATA;;;; +0486;COMBINING CYRILLIC PSILI PNEUMATA;Mn;230;NSM;;;;;N;CYRILLIC NON-SPACING PSILI PNEUMATA;;;; +0487;COMBINING CYRILLIC POKRYTIE;Mn;230;NSM;;;;;N;;;;; +0488;COMBINING CYRILLIC HUNDRED THOUSANDS SIGN;Me;0;NSM;;;;;N;;;;; +0489;COMBINING CYRILLIC MILLIONS SIGN;Me;0;NSM;;;;;N;;;;; +048A;CYRILLIC CAPITAL LETTER SHORT I WITH TAIL;Lu;0;L;;;;;N;;;;048B; +048B;CYRILLIC SMALL LETTER SHORT I WITH TAIL;Ll;0;L;;;;;N;;;048A;;048A +048C;CYRILLIC CAPITAL LETTER SEMISOFT SIGN;Lu;0;L;;;;;N;;;;048D; +048D;CYRILLIC SMALL LETTER SEMISOFT SIGN;Ll;0;L;;;;;N;;;048C;;048C +048E;CYRILLIC CAPITAL LETTER ER WITH TICK;Lu;0;L;;;;;N;;;;048F; +048F;CYRILLIC SMALL LETTER ER WITH TICK;Ll;0;L;;;;;N;;;048E;;048E +0490;CYRILLIC CAPITAL LETTER GHE WITH UPTURN;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER GE WITH UPTURN;;;0491; +0491;CYRILLIC SMALL LETTER GHE WITH UPTURN;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER GE WITH UPTURN;;0490;;0490 +0492;CYRILLIC CAPITAL LETTER GHE WITH STROKE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER GE BAR;;;0493; +0493;CYRILLIC SMALL LETTER GHE WITH STROKE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER GE BAR;;0492;;0492 +0494;CYRILLIC CAPITAL LETTER GHE WITH MIDDLE HOOK;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER GE HOOK;;;0495; +0495;CYRILLIC SMALL LETTER GHE WITH MIDDLE HOOK;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER GE HOOK;;0494;;0494 +0496;CYRILLIC CAPITAL LETTER ZHE WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER ZHE WITH RIGHT DESCENDER;;;0497; +0497;CYRILLIC SMALL LETTER ZHE WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER ZHE WITH RIGHT DESCENDER;;0496;;0496 +0498;CYRILLIC CAPITAL LETTER ZE WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER ZE CEDILLA;;;0499; +0499;CYRILLIC SMALL LETTER ZE WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER ZE CEDILLA;;0498;;0498 +049A;CYRILLIC CAPITAL LETTER KA WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER KA WITH RIGHT DESCENDER;;;049B; +049B;CYRILLIC SMALL LETTER KA WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER KA WITH RIGHT DESCENDER;;049A;;049A +049C;CYRILLIC CAPITAL LETTER KA WITH VERTICAL STROKE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER KA VERTICAL BAR;;;049D; +049D;CYRILLIC SMALL LETTER KA WITH VERTICAL STROKE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER KA VERTICAL BAR;;049C;;049C +049E;CYRILLIC CAPITAL LETTER KA WITH STROKE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER KA BAR;;;049F; +049F;CYRILLIC SMALL LETTER KA WITH STROKE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER KA BAR;;049E;;049E +04A0;CYRILLIC CAPITAL LETTER BASHKIR KA;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER REVERSED GE KA;;;04A1; +04A1;CYRILLIC SMALL LETTER BASHKIR KA;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER REVERSED GE KA;;04A0;;04A0 +04A2;CYRILLIC CAPITAL LETTER EN WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER EN WITH RIGHT DESCENDER;;;04A3; +04A3;CYRILLIC SMALL LETTER EN WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER EN WITH RIGHT DESCENDER;;04A2;;04A2 +04A4;CYRILLIC CAPITAL LIGATURE EN GHE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER EN GE;;;04A5; +04A5;CYRILLIC SMALL LIGATURE EN GHE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER EN GE;;04A4;;04A4 +04A6;CYRILLIC CAPITAL LETTER PE WITH MIDDLE HOOK;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER PE HOOK;;;04A7; +04A7;CYRILLIC SMALL LETTER PE WITH MIDDLE HOOK;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER PE HOOK;;04A6;;04A6 +04A8;CYRILLIC CAPITAL LETTER ABKHASIAN HA;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER O HOOK;;;04A9; +04A9;CYRILLIC SMALL LETTER ABKHASIAN HA;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER O HOOK;;04A8;;04A8 +04AA;CYRILLIC CAPITAL LETTER ES WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER ES CEDILLA;;;04AB; +04AB;CYRILLIC SMALL LETTER ES WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER ES CEDILLA;;04AA;;04AA +04AC;CYRILLIC CAPITAL LETTER TE WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER TE WITH RIGHT DESCENDER;;;04AD; +04AD;CYRILLIC SMALL LETTER TE WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER TE WITH RIGHT DESCENDER;;04AC;;04AC +04AE;CYRILLIC CAPITAL LETTER STRAIGHT U;Lu;0;L;;;;;N;;;;04AF; +04AF;CYRILLIC SMALL LETTER STRAIGHT U;Ll;0;L;;;;;N;;;04AE;;04AE +04B0;CYRILLIC CAPITAL LETTER STRAIGHT U WITH STROKE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER STRAIGHT U BAR;;;04B1; +04B1;CYRILLIC SMALL LETTER STRAIGHT U WITH STROKE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER STRAIGHT U BAR;;04B0;;04B0 +04B2;CYRILLIC CAPITAL LETTER HA WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER KHA WITH RIGHT DESCENDER;;;04B3; +04B3;CYRILLIC SMALL LETTER HA WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER KHA WITH RIGHT DESCENDER;;04B2;;04B2 +04B4;CYRILLIC CAPITAL LIGATURE TE TSE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER TE TSE;;;04B5; +04B5;CYRILLIC SMALL LIGATURE TE TSE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER TE TSE;;04B4;;04B4 +04B6;CYRILLIC CAPITAL LETTER CHE WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER CHE WITH RIGHT DESCENDER;;;04B7; +04B7;CYRILLIC SMALL LETTER CHE WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER CHE WITH RIGHT DESCENDER;;04B6;;04B6 +04B8;CYRILLIC CAPITAL LETTER CHE WITH VERTICAL STROKE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER CHE VERTICAL BAR;;;04B9; +04B9;CYRILLIC SMALL LETTER CHE WITH VERTICAL STROKE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER CHE VERTICAL BAR;;04B8;;04B8 +04BA;CYRILLIC CAPITAL LETTER SHHA;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER H;;;04BB; +04BB;CYRILLIC SMALL LETTER SHHA;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER H;;04BA;;04BA +04BC;CYRILLIC CAPITAL LETTER ABKHASIAN CHE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER IE HOOK;;;04BD; +04BD;CYRILLIC SMALL LETTER ABKHASIAN CHE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER IE HOOK;;04BC;;04BC +04BE;CYRILLIC CAPITAL LETTER ABKHASIAN CHE WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER IE HOOK OGONEK;;;04BF; +04BF;CYRILLIC SMALL LETTER ABKHASIAN CHE WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER IE HOOK OGONEK;;04BE;;04BE +04C0;CYRILLIC LETTER PALOCHKA;Lu;0;L;;;;;N;CYRILLIC LETTER I;;;04CF; +04C1;CYRILLIC CAPITAL LETTER ZHE WITH BREVE;Lu;0;L;0416 0306;;;;N;CYRILLIC CAPITAL LETTER SHORT ZHE;;;04C2; +04C2;CYRILLIC SMALL LETTER ZHE WITH BREVE;Ll;0;L;0436 0306;;;;N;CYRILLIC SMALL LETTER SHORT ZHE;;04C1;;04C1 +04C3;CYRILLIC CAPITAL LETTER KA WITH HOOK;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER KA HOOK;;;04C4; +04C4;CYRILLIC SMALL LETTER KA WITH HOOK;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER KA HOOK;;04C3;;04C3 +04C5;CYRILLIC CAPITAL LETTER EL WITH TAIL;Lu;0;L;;;;;N;;;;04C6; +04C6;CYRILLIC SMALL LETTER EL WITH TAIL;Ll;0;L;;;;;N;;;04C5;;04C5 +04C7;CYRILLIC CAPITAL LETTER EN WITH HOOK;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER EN HOOK;;;04C8; +04C8;CYRILLIC SMALL LETTER EN WITH HOOK;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER EN HOOK;;04C7;;04C7 +04C9;CYRILLIC CAPITAL LETTER EN WITH TAIL;Lu;0;L;;;;;N;;;;04CA; +04CA;CYRILLIC SMALL LETTER EN WITH TAIL;Ll;0;L;;;;;N;;;04C9;;04C9 +04CB;CYRILLIC CAPITAL LETTER KHAKASSIAN CHE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER CHE WITH LEFT DESCENDER;;;04CC; +04CC;CYRILLIC SMALL LETTER KHAKASSIAN CHE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER CHE WITH LEFT DESCENDER;;04CB;;04CB +04CD;CYRILLIC CAPITAL LETTER EM WITH TAIL;Lu;0;L;;;;;N;;;;04CE; +04CE;CYRILLIC SMALL LETTER EM WITH TAIL;Ll;0;L;;;;;N;;;04CD;;04CD +04CF;CYRILLIC SMALL LETTER PALOCHKA;Ll;0;L;;;;;N;;;04C0;;04C0 +04D0;CYRILLIC CAPITAL LETTER A WITH BREVE;Lu;0;L;0410 0306;;;;N;;;;04D1; +04D1;CYRILLIC SMALL LETTER A WITH BREVE;Ll;0;L;0430 0306;;;;N;;;04D0;;04D0 +04D2;CYRILLIC CAPITAL LETTER A WITH DIAERESIS;Lu;0;L;0410 0308;;;;N;;;;04D3; +04D3;CYRILLIC SMALL LETTER A WITH DIAERESIS;Ll;0;L;0430 0308;;;;N;;;04D2;;04D2 +04D4;CYRILLIC CAPITAL LIGATURE A IE;Lu;0;L;;;;;N;;;;04D5; +04D5;CYRILLIC SMALL LIGATURE A IE;Ll;0;L;;;;;N;;;04D4;;04D4 +04D6;CYRILLIC CAPITAL LETTER IE WITH BREVE;Lu;0;L;0415 0306;;;;N;;;;04D7; +04D7;CYRILLIC SMALL LETTER IE WITH BREVE;Ll;0;L;0435 0306;;;;N;;;04D6;;04D6 +04D8;CYRILLIC CAPITAL LETTER SCHWA;Lu;0;L;;;;;N;;;;04D9; +04D9;CYRILLIC SMALL LETTER SCHWA;Ll;0;L;;;;;N;;;04D8;;04D8 +04DA;CYRILLIC CAPITAL LETTER SCHWA WITH DIAERESIS;Lu;0;L;04D8 0308;;;;N;;;;04DB; +04DB;CYRILLIC SMALL LETTER SCHWA WITH DIAERESIS;Ll;0;L;04D9 0308;;;;N;;;04DA;;04DA +04DC;CYRILLIC CAPITAL LETTER ZHE WITH DIAERESIS;Lu;0;L;0416 0308;;;;N;;;;04DD; +04DD;CYRILLIC SMALL LETTER ZHE WITH DIAERESIS;Ll;0;L;0436 0308;;;;N;;;04DC;;04DC +04DE;CYRILLIC CAPITAL LETTER ZE WITH DIAERESIS;Lu;0;L;0417 0308;;;;N;;;;04DF; +04DF;CYRILLIC SMALL LETTER ZE WITH DIAERESIS;Ll;0;L;0437 0308;;;;N;;;04DE;;04DE +04E0;CYRILLIC CAPITAL LETTER ABKHASIAN DZE;Lu;0;L;;;;;N;;;;04E1; +04E1;CYRILLIC SMALL LETTER ABKHASIAN DZE;Ll;0;L;;;;;N;;;04E0;;04E0 +04E2;CYRILLIC CAPITAL LETTER I WITH MACRON;Lu;0;L;0418 0304;;;;N;;;;04E3; +04E3;CYRILLIC SMALL LETTER I WITH MACRON;Ll;0;L;0438 0304;;;;N;;;04E2;;04E2 +04E4;CYRILLIC CAPITAL LETTER I WITH DIAERESIS;Lu;0;L;0418 0308;;;;N;;;;04E5; +04E5;CYRILLIC SMALL LETTER I WITH DIAERESIS;Ll;0;L;0438 0308;;;;N;;;04E4;;04E4 +04E6;CYRILLIC CAPITAL LETTER O WITH DIAERESIS;Lu;0;L;041E 0308;;;;N;;;;04E7; +04E7;CYRILLIC SMALL LETTER O WITH DIAERESIS;Ll;0;L;043E 0308;;;;N;;;04E6;;04E6 +04E8;CYRILLIC CAPITAL LETTER BARRED O;Lu;0;L;;;;;N;;;;04E9; +04E9;CYRILLIC SMALL LETTER BARRED O;Ll;0;L;;;;;N;;;04E8;;04E8 +04EA;CYRILLIC CAPITAL LETTER BARRED O WITH DIAERESIS;Lu;0;L;04E8 0308;;;;N;;;;04EB; +04EB;CYRILLIC SMALL LETTER BARRED O WITH DIAERESIS;Ll;0;L;04E9 0308;;;;N;;;04EA;;04EA +04EC;CYRILLIC CAPITAL LETTER E WITH DIAERESIS;Lu;0;L;042D 0308;;;;N;;;;04ED; +04ED;CYRILLIC SMALL LETTER E WITH DIAERESIS;Ll;0;L;044D 0308;;;;N;;;04EC;;04EC +04EE;CYRILLIC CAPITAL LETTER U WITH MACRON;Lu;0;L;0423 0304;;;;N;;;;04EF; +04EF;CYRILLIC SMALL LETTER U WITH MACRON;Ll;0;L;0443 0304;;;;N;;;04EE;;04EE +04F0;CYRILLIC CAPITAL LETTER U WITH DIAERESIS;Lu;0;L;0423 0308;;;;N;;;;04F1; +04F1;CYRILLIC SMALL LETTER U WITH DIAERESIS;Ll;0;L;0443 0308;;;;N;;;04F0;;04F0 +04F2;CYRILLIC CAPITAL LETTER U WITH DOUBLE ACUTE;Lu;0;L;0423 030B;;;;N;;;;04F3; +04F3;CYRILLIC SMALL LETTER U WITH DOUBLE ACUTE;Ll;0;L;0443 030B;;;;N;;;04F2;;04F2 +04F4;CYRILLIC CAPITAL LETTER CHE WITH DIAERESIS;Lu;0;L;0427 0308;;;;N;;;;04F5; +04F5;CYRILLIC SMALL LETTER CHE WITH DIAERESIS;Ll;0;L;0447 0308;;;;N;;;04F4;;04F4 +04F6;CYRILLIC CAPITAL LETTER GHE WITH DESCENDER;Lu;0;L;;;;;N;;;;04F7; +04F7;CYRILLIC SMALL LETTER GHE WITH DESCENDER;Ll;0;L;;;;;N;;;04F6;;04F6 +04F8;CYRILLIC CAPITAL LETTER YERU WITH DIAERESIS;Lu;0;L;042B 0308;;;;N;;;;04F9; +04F9;CYRILLIC SMALL LETTER YERU WITH DIAERESIS;Ll;0;L;044B 0308;;;;N;;;04F8;;04F8 +04FA;CYRILLIC CAPITAL LETTER GHE WITH STROKE AND HOOK;Lu;0;L;;;;;N;;;;04FB; +04FB;CYRILLIC SMALL LETTER GHE WITH STROKE AND HOOK;Ll;0;L;;;;;N;;;04FA;;04FA +04FC;CYRILLIC CAPITAL LETTER HA WITH HOOK;Lu;0;L;;;;;N;;;;04FD; +04FD;CYRILLIC SMALL LETTER HA WITH HOOK;Ll;0;L;;;;;N;;;04FC;;04FC +04FE;CYRILLIC CAPITAL LETTER HA WITH STROKE;Lu;0;L;;;;;N;;;;04FF; +04FF;CYRILLIC SMALL LETTER HA WITH STROKE;Ll;0;L;;;;;N;;;04FE;;04FE +0500;CYRILLIC CAPITAL LETTER KOMI DE;Lu;0;L;;;;;N;;;;0501; +0501;CYRILLIC SMALL LETTER KOMI DE;Ll;0;L;;;;;N;;;0500;;0500 +0502;CYRILLIC CAPITAL LETTER KOMI DJE;Lu;0;L;;;;;N;;;;0503; +0503;CYRILLIC SMALL LETTER KOMI DJE;Ll;0;L;;;;;N;;;0502;;0502 +0504;CYRILLIC CAPITAL LETTER KOMI ZJE;Lu;0;L;;;;;N;;;;0505; +0505;CYRILLIC SMALL LETTER KOMI ZJE;Ll;0;L;;;;;N;;;0504;;0504 +0506;CYRILLIC CAPITAL LETTER KOMI DZJE;Lu;0;L;;;;;N;;;;0507; +0507;CYRILLIC SMALL LETTER KOMI DZJE;Ll;0;L;;;;;N;;;0506;;0506 +0508;CYRILLIC CAPITAL LETTER KOMI LJE;Lu;0;L;;;;;N;;;;0509; +0509;CYRILLIC SMALL LETTER KOMI LJE;Ll;0;L;;;;;N;;;0508;;0508 +050A;CYRILLIC CAPITAL LETTER KOMI NJE;Lu;0;L;;;;;N;;;;050B; +050B;CYRILLIC SMALL LETTER KOMI NJE;Ll;0;L;;;;;N;;;050A;;050A +050C;CYRILLIC CAPITAL LETTER KOMI SJE;Lu;0;L;;;;;N;;;;050D; +050D;CYRILLIC SMALL LETTER KOMI SJE;Ll;0;L;;;;;N;;;050C;;050C +050E;CYRILLIC CAPITAL LETTER KOMI TJE;Lu;0;L;;;;;N;;;;050F; +050F;CYRILLIC SMALL LETTER KOMI TJE;Ll;0;L;;;;;N;;;050E;;050E +0510;CYRILLIC CAPITAL LETTER REVERSED ZE;Lu;0;L;;;;;N;;;;0511; +0511;CYRILLIC SMALL LETTER REVERSED ZE;Ll;0;L;;;;;N;;;0510;;0510 +0512;CYRILLIC CAPITAL LETTER EL WITH HOOK;Lu;0;L;;;;;N;;;;0513; +0513;CYRILLIC SMALL LETTER EL WITH HOOK;Ll;0;L;;;;;N;;;0512;;0512 +0514;CYRILLIC CAPITAL LETTER LHA;Lu;0;L;;;;;N;;;;0515; +0515;CYRILLIC SMALL LETTER LHA;Ll;0;L;;;;;N;;;0514;;0514 +0516;CYRILLIC CAPITAL LETTER RHA;Lu;0;L;;;;;N;;;;0517; +0517;CYRILLIC SMALL LETTER RHA;Ll;0;L;;;;;N;;;0516;;0516 +0518;CYRILLIC CAPITAL LETTER YAE;Lu;0;L;;;;;N;;;;0519; +0519;CYRILLIC SMALL LETTER YAE;Ll;0;L;;;;;N;;;0518;;0518 +051A;CYRILLIC CAPITAL LETTER QA;Lu;0;L;;;;;N;;;;051B; +051B;CYRILLIC SMALL LETTER QA;Ll;0;L;;;;;N;;;051A;;051A +051C;CYRILLIC CAPITAL LETTER WE;Lu;0;L;;;;;N;;;;051D; +051D;CYRILLIC SMALL LETTER WE;Ll;0;L;;;;;N;;;051C;;051C +051E;CYRILLIC CAPITAL LETTER ALEUT KA;Lu;0;L;;;;;N;;;;051F; +051F;CYRILLIC SMALL LETTER ALEUT KA;Ll;0;L;;;;;N;;;051E;;051E +0520;CYRILLIC CAPITAL LETTER EL WITH MIDDLE HOOK;Lu;0;L;;;;;N;;;;0521; +0521;CYRILLIC SMALL LETTER EL WITH MIDDLE HOOK;Ll;0;L;;;;;N;;;0520;;0520 +0522;CYRILLIC CAPITAL LETTER EN WITH MIDDLE HOOK;Lu;0;L;;;;;N;;;;0523; +0523;CYRILLIC SMALL LETTER EN WITH MIDDLE HOOK;Ll;0;L;;;;;N;;;0522;;0522 +0524;CYRILLIC CAPITAL LETTER PE WITH DESCENDER;Lu;0;L;;;;;N;;;;0525; +0525;CYRILLIC SMALL LETTER PE WITH DESCENDER;Ll;0;L;;;;;N;;;0524;;0524 +0526;CYRILLIC CAPITAL LETTER SHHA WITH DESCENDER;Lu;0;L;;;;;N;;;;0527; +0527;CYRILLIC SMALL LETTER SHHA WITH DESCENDER;Ll;0;L;;;;;N;;;0526;;0526 +0528;CYRILLIC CAPITAL LETTER EN WITH LEFT HOOK;Lu;0;L;;;;;N;;;;0529; +0529;CYRILLIC SMALL LETTER EN WITH LEFT HOOK;Ll;0;L;;;;;N;;;0528;;0528 +052A;CYRILLIC CAPITAL LETTER DZZHE;Lu;0;L;;;;;N;;;;052B; +052B;CYRILLIC SMALL LETTER DZZHE;Ll;0;L;;;;;N;;;052A;;052A +052C;CYRILLIC CAPITAL LETTER DCHE;Lu;0;L;;;;;N;;;;052D; +052D;CYRILLIC SMALL LETTER DCHE;Ll;0;L;;;;;N;;;052C;;052C +052E;CYRILLIC CAPITAL LETTER EL WITH DESCENDER;Lu;0;L;;;;;N;;;;052F; +052F;CYRILLIC SMALL LETTER EL WITH DESCENDER;Ll;0;L;;;;;N;;;052E;;052E +0531;ARMENIAN CAPITAL LETTER AYB;Lu;0;L;;;;;N;;;;0561; +0532;ARMENIAN CAPITAL LETTER BEN;Lu;0;L;;;;;N;;;;0562; +0533;ARMENIAN CAPITAL LETTER GIM;Lu;0;L;;;;;N;;;;0563; +0534;ARMENIAN CAPITAL LETTER DA;Lu;0;L;;;;;N;;;;0564; +0535;ARMENIAN CAPITAL LETTER ECH;Lu;0;L;;;;;N;;;;0565; +0536;ARMENIAN CAPITAL LETTER ZA;Lu;0;L;;;;;N;;;;0566; +0537;ARMENIAN CAPITAL LETTER EH;Lu;0;L;;;;;N;;;;0567; +0538;ARMENIAN CAPITAL LETTER ET;Lu;0;L;;;;;N;;;;0568; +0539;ARMENIAN CAPITAL LETTER TO;Lu;0;L;;;;;N;;;;0569; +053A;ARMENIAN CAPITAL LETTER ZHE;Lu;0;L;;;;;N;;;;056A; +053B;ARMENIAN CAPITAL LETTER INI;Lu;0;L;;;;;N;;;;056B; +053C;ARMENIAN CAPITAL LETTER LIWN;Lu;0;L;;;;;N;;;;056C; +053D;ARMENIAN CAPITAL LETTER XEH;Lu;0;L;;;;;N;;;;056D; +053E;ARMENIAN CAPITAL LETTER CA;Lu;0;L;;;;;N;;;;056E; +053F;ARMENIAN CAPITAL LETTER KEN;Lu;0;L;;;;;N;;;;056F; +0540;ARMENIAN CAPITAL LETTER HO;Lu;0;L;;;;;N;;;;0570; +0541;ARMENIAN CAPITAL LETTER JA;Lu;0;L;;;;;N;;;;0571; +0542;ARMENIAN CAPITAL LETTER GHAD;Lu;0;L;;;;;N;ARMENIAN CAPITAL LETTER LAD;;;0572; +0543;ARMENIAN CAPITAL LETTER CHEH;Lu;0;L;;;;;N;;;;0573; +0544;ARMENIAN CAPITAL LETTER MEN;Lu;0;L;;;;;N;;;;0574; +0545;ARMENIAN CAPITAL LETTER YI;Lu;0;L;;;;;N;;;;0575; +0546;ARMENIAN CAPITAL LETTER NOW;Lu;0;L;;;;;N;;;;0576; +0547;ARMENIAN CAPITAL LETTER SHA;Lu;0;L;;;;;N;;;;0577; +0548;ARMENIAN CAPITAL LETTER VO;Lu;0;L;;;;;N;;;;0578; +0549;ARMENIAN CAPITAL LETTER CHA;Lu;0;L;;;;;N;;;;0579; +054A;ARMENIAN CAPITAL LETTER PEH;Lu;0;L;;;;;N;;;;057A; +054B;ARMENIAN CAPITAL LETTER JHEH;Lu;0;L;;;;;N;;;;057B; +054C;ARMENIAN CAPITAL LETTER RA;Lu;0;L;;;;;N;;;;057C; +054D;ARMENIAN CAPITAL LETTER SEH;Lu;0;L;;;;;N;;;;057D; +054E;ARMENIAN CAPITAL LETTER VEW;Lu;0;L;;;;;N;;;;057E; +054F;ARMENIAN CAPITAL LETTER TIWN;Lu;0;L;;;;;N;;;;057F; +0550;ARMENIAN CAPITAL LETTER REH;Lu;0;L;;;;;N;;;;0580; +0551;ARMENIAN CAPITAL LETTER CO;Lu;0;L;;;;;N;;;;0581; +0552;ARMENIAN CAPITAL LETTER YIWN;Lu;0;L;;;;;N;;;;0582; +0553;ARMENIAN CAPITAL LETTER PIWR;Lu;0;L;;;;;N;;;;0583; +0554;ARMENIAN CAPITAL LETTER KEH;Lu;0;L;;;;;N;;;;0584; +0555;ARMENIAN CAPITAL LETTER OH;Lu;0;L;;;;;N;;;;0585; +0556;ARMENIAN CAPITAL LETTER FEH;Lu;0;L;;;;;N;;;;0586; +0559;ARMENIAN MODIFIER LETTER LEFT HALF RING;Lm;0;L;;;;;N;;;;; +055A;ARMENIAN APOSTROPHE;Po;0;L;;;;;N;ARMENIAN MODIFIER LETTER RIGHT HALF RING;;;; +055B;ARMENIAN EMPHASIS MARK;Po;0;L;;;;;N;;;;; +055C;ARMENIAN EXCLAMATION MARK;Po;0;L;;;;;N;;;;; +055D;ARMENIAN COMMA;Po;0;L;;;;;N;;;;; +055E;ARMENIAN QUESTION MARK;Po;0;L;;;;;N;;;;; +055F;ARMENIAN ABBREVIATION MARK;Po;0;L;;;;;N;;;;; +0560;ARMENIAN SMALL LETTER TURNED AYB;Ll;0;L;;;;;N;;;;; +0561;ARMENIAN SMALL LETTER AYB;Ll;0;L;;;;;N;;;0531;;0531 +0562;ARMENIAN SMALL LETTER BEN;Ll;0;L;;;;;N;;;0532;;0532 +0563;ARMENIAN SMALL LETTER GIM;Ll;0;L;;;;;N;;;0533;;0533 +0564;ARMENIAN SMALL LETTER DA;Ll;0;L;;;;;N;;;0534;;0534 +0565;ARMENIAN SMALL LETTER ECH;Ll;0;L;;;;;N;;;0535;;0535 +0566;ARMENIAN SMALL LETTER ZA;Ll;0;L;;;;;N;;;0536;;0536 +0567;ARMENIAN SMALL LETTER EH;Ll;0;L;;;;;N;;;0537;;0537 +0568;ARMENIAN SMALL LETTER ET;Ll;0;L;;;;;N;;;0538;;0538 +0569;ARMENIAN SMALL LETTER TO;Ll;0;L;;;;;N;;;0539;;0539 +056A;ARMENIAN SMALL LETTER ZHE;Ll;0;L;;;;;N;;;053A;;053A +056B;ARMENIAN SMALL LETTER INI;Ll;0;L;;;;;N;;;053B;;053B +056C;ARMENIAN SMALL LETTER LIWN;Ll;0;L;;;;;N;;;053C;;053C +056D;ARMENIAN SMALL LETTER XEH;Ll;0;L;;;;;N;;;053D;;053D +056E;ARMENIAN SMALL LETTER CA;Ll;0;L;;;;;N;;;053E;;053E +056F;ARMENIAN SMALL LETTER KEN;Ll;0;L;;;;;N;;;053F;;053F +0570;ARMENIAN SMALL LETTER HO;Ll;0;L;;;;;N;;;0540;;0540 +0571;ARMENIAN SMALL LETTER JA;Ll;0;L;;;;;N;;;0541;;0541 +0572;ARMENIAN SMALL LETTER GHAD;Ll;0;L;;;;;N;ARMENIAN SMALL LETTER LAD;;0542;;0542 +0573;ARMENIAN SMALL LETTER CHEH;Ll;0;L;;;;;N;;;0543;;0543 +0574;ARMENIAN SMALL LETTER MEN;Ll;0;L;;;;;N;;;0544;;0544 +0575;ARMENIAN SMALL LETTER YI;Ll;0;L;;;;;N;;;0545;;0545 +0576;ARMENIAN SMALL LETTER NOW;Ll;0;L;;;;;N;;;0546;;0546 +0577;ARMENIAN SMALL LETTER SHA;Ll;0;L;;;;;N;;;0547;;0547 +0578;ARMENIAN SMALL LETTER VO;Ll;0;L;;;;;N;;;0548;;0548 +0579;ARMENIAN SMALL LETTER CHA;Ll;0;L;;;;;N;;;0549;;0549 +057A;ARMENIAN SMALL LETTER PEH;Ll;0;L;;;;;N;;;054A;;054A +057B;ARMENIAN SMALL LETTER JHEH;Ll;0;L;;;;;N;;;054B;;054B +057C;ARMENIAN SMALL LETTER RA;Ll;0;L;;;;;N;;;054C;;054C +057D;ARMENIAN SMALL LETTER SEH;Ll;0;L;;;;;N;;;054D;;054D +057E;ARMENIAN SMALL LETTER VEW;Ll;0;L;;;;;N;;;054E;;054E +057F;ARMENIAN SMALL LETTER TIWN;Ll;0;L;;;;;N;;;054F;;054F +0580;ARMENIAN SMALL LETTER REH;Ll;0;L;;;;;N;;;0550;;0550 +0581;ARMENIAN SMALL LETTER CO;Ll;0;L;;;;;N;;;0551;;0551 +0582;ARMENIAN SMALL LETTER YIWN;Ll;0;L;;;;;N;;;0552;;0552 +0583;ARMENIAN SMALL LETTER PIWR;Ll;0;L;;;;;N;;;0553;;0553 +0584;ARMENIAN SMALL LETTER KEH;Ll;0;L;;;;;N;;;0554;;0554 +0585;ARMENIAN SMALL LETTER OH;Ll;0;L;;;;;N;;;0555;;0555 +0586;ARMENIAN SMALL LETTER FEH;Ll;0;L;;;;;N;;;0556;;0556 +0587;ARMENIAN SMALL LIGATURE ECH YIWN;Ll;0;L; 0565 0582;;;;N;;;;; +0588;ARMENIAN SMALL LETTER YI WITH STROKE;Ll;0;L;;;;;N;;;;; +0589;ARMENIAN FULL STOP;Po;0;L;;;;;N;ARMENIAN PERIOD;;;; +058A;ARMENIAN HYPHEN;Pd;0;ON;;;;;N;;;;; +058D;RIGHT-FACING ARMENIAN ETERNITY SIGN;So;0;ON;;;;;N;;;;; +058E;LEFT-FACING ARMENIAN ETERNITY SIGN;So;0;ON;;;;;N;;;;; +058F;ARMENIAN DRAM SIGN;Sc;0;ET;;;;;N;;;;; +0591;HEBREW ACCENT ETNAHTA;Mn;220;NSM;;;;;N;;;;; +0592;HEBREW ACCENT SEGOL;Mn;230;NSM;;;;;N;;;;; +0593;HEBREW ACCENT SHALSHELET;Mn;230;NSM;;;;;N;;;;; +0594;HEBREW ACCENT ZAQEF QATAN;Mn;230;NSM;;;;;N;;;;; +0595;HEBREW ACCENT ZAQEF GADOL;Mn;230;NSM;;;;;N;;;;; +0596;HEBREW ACCENT TIPEHA;Mn;220;NSM;;;;;N;;;;; +0597;HEBREW ACCENT REVIA;Mn;230;NSM;;;;;N;;;;; +0598;HEBREW ACCENT ZARQA;Mn;230;NSM;;;;;N;;;;; +0599;HEBREW ACCENT PASHTA;Mn;230;NSM;;;;;N;;;;; +059A;HEBREW ACCENT YETIV;Mn;222;NSM;;;;;N;;;;; +059B;HEBREW ACCENT TEVIR;Mn;220;NSM;;;;;N;;;;; +059C;HEBREW ACCENT GERESH;Mn;230;NSM;;;;;N;;;;; +059D;HEBREW ACCENT GERESH MUQDAM;Mn;230;NSM;;;;;N;;;;; +059E;HEBREW ACCENT GERSHAYIM;Mn;230;NSM;;;;;N;;;;; +059F;HEBREW ACCENT QARNEY PARA;Mn;230;NSM;;;;;N;;;;; +05A0;HEBREW ACCENT TELISHA GEDOLA;Mn;230;NSM;;;;;N;;;;; +05A1;HEBREW ACCENT PAZER;Mn;230;NSM;;;;;N;;;;; +05A2;HEBREW ACCENT ATNAH HAFUKH;Mn;220;NSM;;;;;N;;;;; +05A3;HEBREW ACCENT MUNAH;Mn;220;NSM;;;;;N;;;;; +05A4;HEBREW ACCENT MAHAPAKH;Mn;220;NSM;;;;;N;;;;; +05A5;HEBREW ACCENT MERKHA;Mn;220;NSM;;;;;N;;;;; +05A6;HEBREW ACCENT MERKHA KEFULA;Mn;220;NSM;;;;;N;;;;; +05A7;HEBREW ACCENT DARGA;Mn;220;NSM;;;;;N;;;;; +05A8;HEBREW ACCENT QADMA;Mn;230;NSM;;;;;N;;;;; +05A9;HEBREW ACCENT TELISHA QETANA;Mn;230;NSM;;;;;N;;;;; +05AA;HEBREW ACCENT YERAH BEN YOMO;Mn;220;NSM;;;;;N;;;;; +05AB;HEBREW ACCENT OLE;Mn;230;NSM;;;;;N;;;;; +05AC;HEBREW ACCENT ILUY;Mn;230;NSM;;;;;N;;;;; +05AD;HEBREW ACCENT DEHI;Mn;222;NSM;;;;;N;;;;; +05AE;HEBREW ACCENT ZINOR;Mn;228;NSM;;;;;N;;;;; +05AF;HEBREW MARK MASORA CIRCLE;Mn;230;NSM;;;;;N;;;;; +05B0;HEBREW POINT SHEVA;Mn;10;NSM;;;;;N;;;;; +05B1;HEBREW POINT HATAF SEGOL;Mn;11;NSM;;;;;N;;;;; +05B2;HEBREW POINT HATAF PATAH;Mn;12;NSM;;;;;N;;;;; +05B3;HEBREW POINT HATAF QAMATS;Mn;13;NSM;;;;;N;;;;; +05B4;HEBREW POINT HIRIQ;Mn;14;NSM;;;;;N;;;;; +05B5;HEBREW POINT TSERE;Mn;15;NSM;;;;;N;;;;; +05B6;HEBREW POINT SEGOL;Mn;16;NSM;;;;;N;;;;; +05B7;HEBREW POINT PATAH;Mn;17;NSM;;;;;N;;;;; +05B8;HEBREW POINT QAMATS;Mn;18;NSM;;;;;N;;;;; +05B9;HEBREW POINT HOLAM;Mn;19;NSM;;;;;N;;;;; +05BA;HEBREW POINT HOLAM HASER FOR VAV;Mn;19;NSM;;;;;N;;;;; +05BB;HEBREW POINT QUBUTS;Mn;20;NSM;;;;;N;;;;; +05BC;HEBREW POINT DAGESH OR MAPIQ;Mn;21;NSM;;;;;N;HEBREW POINT DAGESH;;;; +05BD;HEBREW POINT METEG;Mn;22;NSM;;;;;N;;;;; +05BE;HEBREW PUNCTUATION MAQAF;Pd;0;R;;;;;N;;;;; +05BF;HEBREW POINT RAFE;Mn;23;NSM;;;;;N;;;;; +05C0;HEBREW PUNCTUATION PASEQ;Po;0;R;;;;;N;HEBREW POINT PASEQ;;;; +05C1;HEBREW POINT SHIN DOT;Mn;24;NSM;;;;;N;;;;; +05C2;HEBREW POINT SIN DOT;Mn;25;NSM;;;;;N;;;;; +05C3;HEBREW PUNCTUATION SOF PASUQ;Po;0;R;;;;;N;;;;; +05C4;HEBREW MARK UPPER DOT;Mn;230;NSM;;;;;N;;;;; +05C5;HEBREW MARK LOWER DOT;Mn;220;NSM;;;;;N;;;;; +05C6;HEBREW PUNCTUATION NUN HAFUKHA;Po;0;R;;;;;N;;;;; +05C7;HEBREW POINT QAMATS QATAN;Mn;18;NSM;;;;;N;;;;; +05D0;HEBREW LETTER ALEF;Lo;0;R;;;;;N;;;;; +05D1;HEBREW LETTER BET;Lo;0;R;;;;;N;;;;; +05D2;HEBREW LETTER GIMEL;Lo;0;R;;;;;N;;;;; +05D3;HEBREW LETTER DALET;Lo;0;R;;;;;N;;;;; +05D4;HEBREW LETTER HE;Lo;0;R;;;;;N;;;;; +05D5;HEBREW LETTER VAV;Lo;0;R;;;;;N;;;;; +05D6;HEBREW LETTER ZAYIN;Lo;0;R;;;;;N;;;;; +05D7;HEBREW LETTER HET;Lo;0;R;;;;;N;;;;; +05D8;HEBREW LETTER TET;Lo;0;R;;;;;N;;;;; +05D9;HEBREW LETTER YOD;Lo;0;R;;;;;N;;;;; +05DA;HEBREW LETTER FINAL KAF;Lo;0;R;;;;;N;;;;; +05DB;HEBREW LETTER KAF;Lo;0;R;;;;;N;;;;; +05DC;HEBREW LETTER LAMED;Lo;0;R;;;;;N;;;;; +05DD;HEBREW LETTER FINAL MEM;Lo;0;R;;;;;N;;;;; +05DE;HEBREW LETTER MEM;Lo;0;R;;;;;N;;;;; +05DF;HEBREW LETTER FINAL NUN;Lo;0;R;;;;;N;;;;; +05E0;HEBREW LETTER NUN;Lo;0;R;;;;;N;;;;; +05E1;HEBREW LETTER SAMEKH;Lo;0;R;;;;;N;;;;; +05E2;HEBREW LETTER AYIN;Lo;0;R;;;;;N;;;;; +05E3;HEBREW LETTER FINAL PE;Lo;0;R;;;;;N;;;;; +05E4;HEBREW LETTER PE;Lo;0;R;;;;;N;;;;; +05E5;HEBREW LETTER FINAL TSADI;Lo;0;R;;;;;N;;;;; +05E6;HEBREW LETTER TSADI;Lo;0;R;;;;;N;;;;; +05E7;HEBREW LETTER QOF;Lo;0;R;;;;;N;;;;; +05E8;HEBREW LETTER RESH;Lo;0;R;;;;;N;;;;; +05E9;HEBREW LETTER SHIN;Lo;0;R;;;;;N;;;;; +05EA;HEBREW LETTER TAV;Lo;0;R;;;;;N;;;;; +05EF;HEBREW YOD TRIANGLE;Lo;0;R;;;;;N;;;;; +05F0;HEBREW LIGATURE YIDDISH DOUBLE VAV;Lo;0;R;;;;;N;HEBREW LETTER DOUBLE VAV;;;; +05F1;HEBREW LIGATURE YIDDISH VAV YOD;Lo;0;R;;;;;N;HEBREW LETTER VAV YOD;;;; +05F2;HEBREW LIGATURE YIDDISH DOUBLE YOD;Lo;0;R;;;;;N;HEBREW LETTER DOUBLE YOD;;;; +05F3;HEBREW PUNCTUATION GERESH;Po;0;R;;;;;N;;;;; +05F4;HEBREW PUNCTUATION GERSHAYIM;Po;0;R;;;;;N;;;;; +0600;ARABIC NUMBER SIGN;Cf;0;AN;;;;;N;;;;; +0601;ARABIC SIGN SANAH;Cf;0;AN;;;;;N;;;;; +0602;ARABIC FOOTNOTE MARKER;Cf;0;AN;;;;;N;;;;; +0603;ARABIC SIGN SAFHA;Cf;0;AN;;;;;N;;;;; +0604;ARABIC SIGN SAMVAT;Cf;0;AN;;;;;N;;;;; +0605;ARABIC NUMBER MARK ABOVE;Cf;0;AN;;;;;N;;;;; +0606;ARABIC-INDIC CUBE ROOT;Sm;0;ON;;;;;N;;;;; +0607;ARABIC-INDIC FOURTH ROOT;Sm;0;ON;;;;;N;;;;; +0608;ARABIC RAY;Sm;0;AL;;;;;N;;;;; +0609;ARABIC-INDIC PER MILLE SIGN;Po;0;ET;;;;;N;;;;; +060A;ARABIC-INDIC PER TEN THOUSAND SIGN;Po;0;ET;;;;;N;;;;; +060B;AFGHANI SIGN;Sc;0;AL;;;;;N;;;;; +060C;ARABIC COMMA;Po;0;CS;;;;;N;;;;; +060D;ARABIC DATE SEPARATOR;Po;0;AL;;;;;N;;;;; +060E;ARABIC POETIC VERSE SIGN;So;0;ON;;;;;N;;;;; +060F;ARABIC SIGN MISRA;So;0;ON;;;;;N;;;;; +0610;ARABIC SIGN SALLALLAHOU ALAYHE WASSALLAM;Mn;230;NSM;;;;;N;;;;; +0611;ARABIC SIGN ALAYHE ASSALLAM;Mn;230;NSM;;;;;N;;;;; +0612;ARABIC SIGN RAHMATULLAH ALAYHE;Mn;230;NSM;;;;;N;;;;; +0613;ARABIC SIGN RADI ALLAHOU ANHU;Mn;230;NSM;;;;;N;;;;; +0614;ARABIC SIGN TAKHALLUS;Mn;230;NSM;;;;;N;;;;; +0615;ARABIC SMALL HIGH TAH;Mn;230;NSM;;;;;N;;;;; +0616;ARABIC SMALL HIGH LIGATURE ALEF WITH LAM WITH YEH;Mn;230;NSM;;;;;N;;;;; +0617;ARABIC SMALL HIGH ZAIN;Mn;230;NSM;;;;;N;;;;; +0618;ARABIC SMALL FATHA;Mn;30;NSM;;;;;N;;;;; +0619;ARABIC SMALL DAMMA;Mn;31;NSM;;;;;N;;;;; +061A;ARABIC SMALL KASRA;Mn;32;NSM;;;;;N;;;;; +061B;ARABIC SEMICOLON;Po;0;AL;;;;;N;;;;; +061C;ARABIC LETTER MARK;Cf;0;AL;;;;;N;;;;; +061D;ARABIC END OF TEXT MARK;Po;0;AL;;;;;N;;;;; +061E;ARABIC TRIPLE DOT PUNCTUATION MARK;Po;0;AL;;;;;N;;;;; +061F;ARABIC QUESTION MARK;Po;0;AL;;;;;N;;;;; +0620;ARABIC LETTER KASHMIRI YEH;Lo;0;AL;;;;;N;;;;; +0621;ARABIC LETTER HAMZA;Lo;0;AL;;;;;N;ARABIC LETTER HAMZAH;;;; +0622;ARABIC LETTER ALEF WITH MADDA ABOVE;Lo;0;AL;0627 0653;;;;N;ARABIC LETTER MADDAH ON ALEF;;;; +0623;ARABIC LETTER ALEF WITH HAMZA ABOVE;Lo;0;AL;0627 0654;;;;N;ARABIC LETTER HAMZAH ON ALEF;;;; +0624;ARABIC LETTER WAW WITH HAMZA ABOVE;Lo;0;AL;0648 0654;;;;N;ARABIC LETTER HAMZAH ON WAW;;;; +0625;ARABIC LETTER ALEF WITH HAMZA BELOW;Lo;0;AL;0627 0655;;;;N;ARABIC LETTER HAMZAH UNDER ALEF;;;; +0626;ARABIC LETTER YEH WITH HAMZA ABOVE;Lo;0;AL;064A 0654;;;;N;ARABIC LETTER HAMZAH ON YA;;;; +0627;ARABIC LETTER ALEF;Lo;0;AL;;;;;N;;;;; +0628;ARABIC LETTER BEH;Lo;0;AL;;;;;N;ARABIC LETTER BAA;;;; +0629;ARABIC LETTER TEH MARBUTA;Lo;0;AL;;;;;N;ARABIC LETTER TAA MARBUTAH;;;; +062A;ARABIC LETTER TEH;Lo;0;AL;;;;;N;ARABIC LETTER TAA;;;; +062B;ARABIC LETTER THEH;Lo;0;AL;;;;;N;ARABIC LETTER THAA;;;; +062C;ARABIC LETTER JEEM;Lo;0;AL;;;;;N;;;;; +062D;ARABIC LETTER HAH;Lo;0;AL;;;;;N;ARABIC LETTER HAA;;;; +062E;ARABIC LETTER KHAH;Lo;0;AL;;;;;N;ARABIC LETTER KHAA;;;; +062F;ARABIC LETTER DAL;Lo;0;AL;;;;;N;;;;; +0630;ARABIC LETTER THAL;Lo;0;AL;;;;;N;;;;; +0631;ARABIC LETTER REH;Lo;0;AL;;;;;N;ARABIC LETTER RA;;;; +0632;ARABIC LETTER ZAIN;Lo;0;AL;;;;;N;;;;; +0633;ARABIC LETTER SEEN;Lo;0;AL;;;;;N;;;;; +0634;ARABIC LETTER SHEEN;Lo;0;AL;;;;;N;;;;; +0635;ARABIC LETTER SAD;Lo;0;AL;;;;;N;;;;; +0636;ARABIC LETTER DAD;Lo;0;AL;;;;;N;;;;; +0637;ARABIC LETTER TAH;Lo;0;AL;;;;;N;;;;; +0638;ARABIC LETTER ZAH;Lo;0;AL;;;;;N;ARABIC LETTER DHAH;;;; +0639;ARABIC LETTER AIN;Lo;0;AL;;;;;N;;;;; +063A;ARABIC LETTER GHAIN;Lo;0;AL;;;;;N;;;;; +063B;ARABIC LETTER KEHEH WITH TWO DOTS ABOVE;Lo;0;AL;;;;;N;;;;; +063C;ARABIC LETTER KEHEH WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;;;;; +063D;ARABIC LETTER FARSI YEH WITH INVERTED V;Lo;0;AL;;;;;N;;;;; +063E;ARABIC LETTER FARSI YEH WITH TWO DOTS ABOVE;Lo;0;AL;;;;;N;;;;; +063F;ARABIC LETTER FARSI YEH WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;; +0640;ARABIC TATWEEL;Lm;0;AL;;;;;N;;;;; +0641;ARABIC LETTER FEH;Lo;0;AL;;;;;N;ARABIC LETTER FA;;;; +0642;ARABIC LETTER QAF;Lo;0;AL;;;;;N;;;;; +0643;ARABIC LETTER KAF;Lo;0;AL;;;;;N;ARABIC LETTER CAF;;;; +0644;ARABIC LETTER LAM;Lo;0;AL;;;;;N;;;;; +0645;ARABIC LETTER MEEM;Lo;0;AL;;;;;N;;;;; +0646;ARABIC LETTER NOON;Lo;0;AL;;;;;N;;;;; +0647;ARABIC LETTER HEH;Lo;0;AL;;;;;N;ARABIC LETTER HA;;;; +0648;ARABIC LETTER WAW;Lo;0;AL;;;;;N;;;;; +0649;ARABIC LETTER ALEF MAKSURA;Lo;0;AL;;;;;N;ARABIC LETTER ALEF MAQSURAH;;;; +064A;ARABIC LETTER YEH;Lo;0;AL;;;;;N;ARABIC LETTER YA;;;; +064B;ARABIC FATHATAN;Mn;27;NSM;;;;;N;;;;; +064C;ARABIC DAMMATAN;Mn;28;NSM;;;;;N;;;;; +064D;ARABIC KASRATAN;Mn;29;NSM;;;;;N;;;;; +064E;ARABIC FATHA;Mn;30;NSM;;;;;N;ARABIC FATHAH;;;; +064F;ARABIC DAMMA;Mn;31;NSM;;;;;N;ARABIC DAMMAH;;;; +0650;ARABIC KASRA;Mn;32;NSM;;;;;N;ARABIC KASRAH;;;; +0651;ARABIC SHADDA;Mn;33;NSM;;;;;N;ARABIC SHADDAH;;;; +0652;ARABIC SUKUN;Mn;34;NSM;;;;;N;;;;; +0653;ARABIC MADDAH ABOVE;Mn;230;NSM;;;;;N;;;;; +0654;ARABIC HAMZA ABOVE;Mn;230;NSM;;;;;N;;;;; +0655;ARABIC HAMZA BELOW;Mn;220;NSM;;;;;N;;;;; +0656;ARABIC SUBSCRIPT ALEF;Mn;220;NSM;;;;;N;;;;; +0657;ARABIC INVERTED DAMMA;Mn;230;NSM;;;;;N;;;;; +0658;ARABIC MARK NOON GHUNNA;Mn;230;NSM;;;;;N;;;;; +0659;ARABIC ZWARAKAY;Mn;230;NSM;;;;;N;;;;; +065A;ARABIC VOWEL SIGN SMALL V ABOVE;Mn;230;NSM;;;;;N;;;;; +065B;ARABIC VOWEL SIGN INVERTED SMALL V ABOVE;Mn;230;NSM;;;;;N;;;;; +065C;ARABIC VOWEL SIGN DOT BELOW;Mn;220;NSM;;;;;N;;;;; +065D;ARABIC REVERSED DAMMA;Mn;230;NSM;;;;;N;;;;; +065E;ARABIC FATHA WITH TWO DOTS;Mn;230;NSM;;;;;N;;;;; +065F;ARABIC WAVY HAMZA BELOW;Mn;220;NSM;;;;;N;;;;; +0660;ARABIC-INDIC DIGIT ZERO;Nd;0;AN;;0;0;0;N;;;;; +0661;ARABIC-INDIC DIGIT ONE;Nd;0;AN;;1;1;1;N;;;;; +0662;ARABIC-INDIC DIGIT TWO;Nd;0;AN;;2;2;2;N;;;;; +0663;ARABIC-INDIC DIGIT THREE;Nd;0;AN;;3;3;3;N;;;;; +0664;ARABIC-INDIC DIGIT FOUR;Nd;0;AN;;4;4;4;N;;;;; +0665;ARABIC-INDIC DIGIT FIVE;Nd;0;AN;;5;5;5;N;;;;; +0666;ARABIC-INDIC DIGIT SIX;Nd;0;AN;;6;6;6;N;;;;; +0667;ARABIC-INDIC DIGIT SEVEN;Nd;0;AN;;7;7;7;N;;;;; +0668;ARABIC-INDIC DIGIT EIGHT;Nd;0;AN;;8;8;8;N;;;;; +0669;ARABIC-INDIC DIGIT NINE;Nd;0;AN;;9;9;9;N;;;;; +066A;ARABIC PERCENT SIGN;Po;0;ET;;;;;N;;;;; +066B;ARABIC DECIMAL SEPARATOR;Po;0;AN;;;;;N;;;;; +066C;ARABIC THOUSANDS SEPARATOR;Po;0;AN;;;;;N;;;;; +066D;ARABIC FIVE POINTED STAR;Po;0;AL;;;;;N;;;;; +066E;ARABIC LETTER DOTLESS BEH;Lo;0;AL;;;;;N;;;;; +066F;ARABIC LETTER DOTLESS QAF;Lo;0;AL;;;;;N;;;;; +0670;ARABIC LETTER SUPERSCRIPT ALEF;Mn;35;NSM;;;;;N;ARABIC ALEF ABOVE;;;; +0671;ARABIC LETTER ALEF WASLA;Lo;0;AL;;;;;N;ARABIC LETTER HAMZAT WASL ON ALEF;;;; +0672;ARABIC LETTER ALEF WITH WAVY HAMZA ABOVE;Lo;0;AL;;;;;N;ARABIC LETTER WAVY HAMZAH ON ALEF;;;; +0673;ARABIC LETTER ALEF WITH WAVY HAMZA BELOW;Lo;0;AL;;;;;N;ARABIC LETTER WAVY HAMZAH UNDER ALEF;;;; +0674;ARABIC LETTER HIGH HAMZA;Lo;0;AL;;;;;N;ARABIC LETTER HIGH HAMZAH;;;; +0675;ARABIC LETTER HIGH HAMZA ALEF;Lo;0;AL; 0627 0674;;;;N;ARABIC LETTER HIGH HAMZAH ALEF;;;; +0676;ARABIC LETTER HIGH HAMZA WAW;Lo;0;AL; 0648 0674;;;;N;ARABIC LETTER HIGH HAMZAH WAW;;;; +0677;ARABIC LETTER U WITH HAMZA ABOVE;Lo;0;AL; 06C7 0674;;;;N;ARABIC LETTER HIGH HAMZAH WAW WITH DAMMAH;;;; +0678;ARABIC LETTER HIGH HAMZA YEH;Lo;0;AL; 064A 0674;;;;N;ARABIC LETTER HIGH HAMZAH YA;;;; +0679;ARABIC LETTER TTEH;Lo;0;AL;;;;;N;ARABIC LETTER TAA WITH SMALL TAH;;;; +067A;ARABIC LETTER TTEHEH;Lo;0;AL;;;;;N;ARABIC LETTER TAA WITH TWO DOTS VERTICAL ABOVE;;;; +067B;ARABIC LETTER BEEH;Lo;0;AL;;;;;N;ARABIC LETTER BAA WITH TWO DOTS VERTICAL BELOW;;;; +067C;ARABIC LETTER TEH WITH RING;Lo;0;AL;;;;;N;ARABIC LETTER TAA WITH RING;;;; +067D;ARABIC LETTER TEH WITH THREE DOTS ABOVE DOWNWARDS;Lo;0;AL;;;;;N;ARABIC LETTER TAA WITH THREE DOTS ABOVE DOWNWARD;;;; +067E;ARABIC LETTER PEH;Lo;0;AL;;;;;N;ARABIC LETTER TAA WITH THREE DOTS BELOW;;;; +067F;ARABIC LETTER TEHEH;Lo;0;AL;;;;;N;ARABIC LETTER TAA WITH FOUR DOTS ABOVE;;;; +0680;ARABIC LETTER BEHEH;Lo;0;AL;;;;;N;ARABIC LETTER BAA WITH FOUR DOTS BELOW;;;; +0681;ARABIC LETTER HAH WITH HAMZA ABOVE;Lo;0;AL;;;;;N;ARABIC LETTER HAMZAH ON HAA;;;; +0682;ARABIC LETTER HAH WITH TWO DOTS VERTICAL ABOVE;Lo;0;AL;;;;;N;ARABIC LETTER HAA WITH TWO DOTS VERTICAL ABOVE;;;; +0683;ARABIC LETTER NYEH;Lo;0;AL;;;;;N;ARABIC LETTER HAA WITH MIDDLE TWO DOTS;;;; +0684;ARABIC LETTER DYEH;Lo;0;AL;;;;;N;ARABIC LETTER HAA WITH MIDDLE TWO DOTS VERTICAL;;;; +0685;ARABIC LETTER HAH WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;ARABIC LETTER HAA WITH THREE DOTS ABOVE;;;; +0686;ARABIC LETTER TCHEH;Lo;0;AL;;;;;N;ARABIC LETTER HAA WITH MIDDLE THREE DOTS DOWNWARD;;;; +0687;ARABIC LETTER TCHEHEH;Lo;0;AL;;;;;N;ARABIC LETTER HAA WITH MIDDLE FOUR DOTS;;;; +0688;ARABIC LETTER DDAL;Lo;0;AL;;;;;N;ARABIC LETTER DAL WITH SMALL TAH;;;; +0689;ARABIC LETTER DAL WITH RING;Lo;0;AL;;;;;N;;;;; +068A;ARABIC LETTER DAL WITH DOT BELOW;Lo;0;AL;;;;;N;;;;; +068B;ARABIC LETTER DAL WITH DOT BELOW AND SMALL TAH;Lo;0;AL;;;;;N;;;;; +068C;ARABIC LETTER DAHAL;Lo;0;AL;;;;;N;ARABIC LETTER DAL WITH TWO DOTS ABOVE;;;; +068D;ARABIC LETTER DDAHAL;Lo;0;AL;;;;;N;ARABIC LETTER DAL WITH TWO DOTS BELOW;;;; +068E;ARABIC LETTER DUL;Lo;0;AL;;;;;N;ARABIC LETTER DAL WITH THREE DOTS ABOVE;;;; +068F;ARABIC LETTER DAL WITH THREE DOTS ABOVE DOWNWARDS;Lo;0;AL;;;;;N;ARABIC LETTER DAL WITH THREE DOTS ABOVE DOWNWARD;;;; +0690;ARABIC LETTER DAL WITH FOUR DOTS ABOVE;Lo;0;AL;;;;;N;;;;; +0691;ARABIC LETTER RREH;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH SMALL TAH;;;; +0692;ARABIC LETTER REH WITH SMALL V;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH SMALL V;;;; +0693;ARABIC LETTER REH WITH RING;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH RING;;;; +0694;ARABIC LETTER REH WITH DOT BELOW;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH DOT BELOW;;;; +0695;ARABIC LETTER REH WITH SMALL V BELOW;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH SMALL V BELOW;;;; +0696;ARABIC LETTER REH WITH DOT BELOW AND DOT ABOVE;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH DOT BELOW AND DOT ABOVE;;;; +0697;ARABIC LETTER REH WITH TWO DOTS ABOVE;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH TWO DOTS ABOVE;;;; +0698;ARABIC LETTER JEH;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH THREE DOTS ABOVE;;;; +0699;ARABIC LETTER REH WITH FOUR DOTS ABOVE;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH FOUR DOTS ABOVE;;;; +069A;ARABIC LETTER SEEN WITH DOT BELOW AND DOT ABOVE;Lo;0;AL;;;;;N;;;;; +069B;ARABIC LETTER SEEN WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;;;;; +069C;ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;; +069D;ARABIC LETTER SAD WITH TWO DOTS BELOW;Lo;0;AL;;;;;N;;;;; +069E;ARABIC LETTER SAD WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;; +069F;ARABIC LETTER TAH WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;; +06A0;ARABIC LETTER AIN WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;; +06A1;ARABIC LETTER DOTLESS FEH;Lo;0;AL;;;;;N;ARABIC LETTER DOTLESS FA;;;; +06A2;ARABIC LETTER FEH WITH DOT MOVED BELOW;Lo;0;AL;;;;;N;ARABIC LETTER FA WITH DOT MOVED BELOW;;;; +06A3;ARABIC LETTER FEH WITH DOT BELOW;Lo;0;AL;;;;;N;ARABIC LETTER FA WITH DOT BELOW;;;; +06A4;ARABIC LETTER VEH;Lo;0;AL;;;;;N;ARABIC LETTER FA WITH THREE DOTS ABOVE;;;; +06A5;ARABIC LETTER FEH WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;ARABIC LETTER FA WITH THREE DOTS BELOW;;;; +06A6;ARABIC LETTER PEHEH;Lo;0;AL;;;;;N;ARABIC LETTER FA WITH FOUR DOTS ABOVE;;;; +06A7;ARABIC LETTER QAF WITH DOT ABOVE;Lo;0;AL;;;;;N;;;;; +06A8;ARABIC LETTER QAF WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;; +06A9;ARABIC LETTER KEHEH;Lo;0;AL;;;;;N;ARABIC LETTER OPEN CAF;;;; +06AA;ARABIC LETTER SWASH KAF;Lo;0;AL;;;;;N;ARABIC LETTER SWASH CAF;;;; +06AB;ARABIC LETTER KAF WITH RING;Lo;0;AL;;;;;N;ARABIC LETTER CAF WITH RING;;;; +06AC;ARABIC LETTER KAF WITH DOT ABOVE;Lo;0;AL;;;;;N;ARABIC LETTER CAF WITH DOT ABOVE;;;; +06AD;ARABIC LETTER NG;Lo;0;AL;;;;;N;ARABIC LETTER CAF WITH THREE DOTS ABOVE;;;; +06AE;ARABIC LETTER KAF WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;ARABIC LETTER CAF WITH THREE DOTS BELOW;;;; +06AF;ARABIC LETTER GAF;Lo;0;AL;;;;;N;;;;; +06B0;ARABIC LETTER GAF WITH RING;Lo;0;AL;;;;;N;;;;; +06B1;ARABIC LETTER NGOEH;Lo;0;AL;;;;;N;ARABIC LETTER GAF WITH TWO DOTS ABOVE;;;; +06B2;ARABIC LETTER GAF WITH TWO DOTS BELOW;Lo;0;AL;;;;;N;;;;; +06B3;ARABIC LETTER GUEH;Lo;0;AL;;;;;N;ARABIC LETTER GAF WITH TWO DOTS VERTICAL BELOW;;;; +06B4;ARABIC LETTER GAF WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;; +06B5;ARABIC LETTER LAM WITH SMALL V;Lo;0;AL;;;;;N;;;;; +06B6;ARABIC LETTER LAM WITH DOT ABOVE;Lo;0;AL;;;;;N;;;;; +06B7;ARABIC LETTER LAM WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;; +06B8;ARABIC LETTER LAM WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;;;;; +06B9;ARABIC LETTER NOON WITH DOT BELOW;Lo;0;AL;;;;;N;;;;; +06BA;ARABIC LETTER NOON GHUNNA;Lo;0;AL;;;;;N;ARABIC LETTER DOTLESS NOON;;;; +06BB;ARABIC LETTER RNOON;Lo;0;AL;;;;;N;ARABIC LETTER DOTLESS NOON WITH SMALL TAH;;;; +06BC;ARABIC LETTER NOON WITH RING;Lo;0;AL;;;;;N;;;;; +06BD;ARABIC LETTER NOON WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;; +06BE;ARABIC LETTER HEH DOACHASHMEE;Lo;0;AL;;;;;N;ARABIC LETTER KNOTTED HA;;;; +06BF;ARABIC LETTER TCHEH WITH DOT ABOVE;Lo;0;AL;;;;;N;;;;; +06C0;ARABIC LETTER HEH WITH YEH ABOVE;Lo;0;AL;06D5 0654;;;;N;ARABIC LETTER HAMZAH ON HA;;;; +06C1;ARABIC LETTER HEH GOAL;Lo;0;AL;;;;;N;ARABIC LETTER HA GOAL;;;; +06C2;ARABIC LETTER HEH GOAL WITH HAMZA ABOVE;Lo;0;AL;06C1 0654;;;;N;ARABIC LETTER HAMZAH ON HA GOAL;;;; +06C3;ARABIC LETTER TEH MARBUTA GOAL;Lo;0;AL;;;;;N;ARABIC LETTER TAA MARBUTAH GOAL;;;; +06C4;ARABIC LETTER WAW WITH RING;Lo;0;AL;;;;;N;;;;; +06C5;ARABIC LETTER KIRGHIZ OE;Lo;0;AL;;;;;N;ARABIC LETTER WAW WITH BAR;;;; +06C6;ARABIC LETTER OE;Lo;0;AL;;;;;N;ARABIC LETTER WAW WITH SMALL V;;;; +06C7;ARABIC LETTER U;Lo;0;AL;;;;;N;ARABIC LETTER WAW WITH DAMMAH;;;; +06C8;ARABIC LETTER YU;Lo;0;AL;;;;;N;ARABIC LETTER WAW WITH ALEF ABOVE;;;; +06C9;ARABIC LETTER KIRGHIZ YU;Lo;0;AL;;;;;N;ARABIC LETTER WAW WITH INVERTED SMALL V;;;; +06CA;ARABIC LETTER WAW WITH TWO DOTS ABOVE;Lo;0;AL;;;;;N;;;;; +06CB;ARABIC LETTER VE;Lo;0;AL;;;;;N;ARABIC LETTER WAW WITH THREE DOTS ABOVE;;;; +06CC;ARABIC LETTER FARSI YEH;Lo;0;AL;;;;;N;ARABIC LETTER DOTLESS YA;;;; +06CD;ARABIC LETTER YEH WITH TAIL;Lo;0;AL;;;;;N;ARABIC LETTER YA WITH TAIL;;;; +06CE;ARABIC LETTER YEH WITH SMALL V;Lo;0;AL;;;;;N;ARABIC LETTER YA WITH SMALL V;;;; +06CF;ARABIC LETTER WAW WITH DOT ABOVE;Lo;0;AL;;;;;N;;;;; +06D0;ARABIC LETTER E;Lo;0;AL;;;;;N;ARABIC LETTER YA WITH TWO DOTS VERTICAL BELOW;;;; +06D1;ARABIC LETTER YEH WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;ARABIC LETTER YA WITH THREE DOTS BELOW;;;; +06D2;ARABIC LETTER YEH BARREE;Lo;0;AL;;;;;N;ARABIC LETTER YA BARREE;;;; +06D3;ARABIC LETTER YEH BARREE WITH HAMZA ABOVE;Lo;0;AL;06D2 0654;;;;N;ARABIC LETTER HAMZAH ON YA BARREE;;;; +06D4;ARABIC FULL STOP;Po;0;AL;;;;;N;ARABIC PERIOD;;;; +06D5;ARABIC LETTER AE;Lo;0;AL;;;;;N;;;;; +06D6;ARABIC SMALL HIGH LIGATURE SAD WITH LAM WITH ALEF MAKSURA;Mn;230;NSM;;;;;N;;;;; +06D7;ARABIC SMALL HIGH LIGATURE QAF WITH LAM WITH ALEF MAKSURA;Mn;230;NSM;;;;;N;;;;; +06D8;ARABIC SMALL HIGH MEEM INITIAL FORM;Mn;230;NSM;;;;;N;;;;; +06D9;ARABIC SMALL HIGH LAM ALEF;Mn;230;NSM;;;;;N;;;;; +06DA;ARABIC SMALL HIGH JEEM;Mn;230;NSM;;;;;N;;;;; +06DB;ARABIC SMALL HIGH THREE DOTS;Mn;230;NSM;;;;;N;;;;; +06DC;ARABIC SMALL HIGH SEEN;Mn;230;NSM;;;;;N;;;;; +06DD;ARABIC END OF AYAH;Cf;0;AN;;;;;N;;;;; +06DE;ARABIC START OF RUB EL HIZB;So;0;ON;;;;;N;;;;; +06DF;ARABIC SMALL HIGH ROUNDED ZERO;Mn;230;NSM;;;;;N;;;;; +06E0;ARABIC SMALL HIGH UPRIGHT RECTANGULAR ZERO;Mn;230;NSM;;;;;N;;;;; +06E1;ARABIC SMALL HIGH DOTLESS HEAD OF KHAH;Mn;230;NSM;;;;;N;;;;; +06E2;ARABIC SMALL HIGH MEEM ISOLATED FORM;Mn;230;NSM;;;;;N;;;;; +06E3;ARABIC SMALL LOW SEEN;Mn;220;NSM;;;;;N;;;;; +06E4;ARABIC SMALL HIGH MADDA;Mn;230;NSM;;;;;N;;;;; +06E5;ARABIC SMALL WAW;Lm;0;AL;;;;;N;;;;; +06E6;ARABIC SMALL YEH;Lm;0;AL;;;;;N;;;;; +06E7;ARABIC SMALL HIGH YEH;Mn;230;NSM;;;;;N;;;;; +06E8;ARABIC SMALL HIGH NOON;Mn;230;NSM;;;;;N;;;;; +06E9;ARABIC PLACE OF SAJDAH;So;0;ON;;;;;N;;;;; +06EA;ARABIC EMPTY CENTRE LOW STOP;Mn;220;NSM;;;;;N;;;;; +06EB;ARABIC EMPTY CENTRE HIGH STOP;Mn;230;NSM;;;;;N;;;;; +06EC;ARABIC ROUNDED HIGH STOP WITH FILLED CENTRE;Mn;230;NSM;;;;;N;;;;; +06ED;ARABIC SMALL LOW MEEM;Mn;220;NSM;;;;;N;;;;; +06EE;ARABIC LETTER DAL WITH INVERTED V;Lo;0;AL;;;;;N;;;;; +06EF;ARABIC LETTER REH WITH INVERTED V;Lo;0;AL;;;;;N;;;;; +06F0;EXTENDED ARABIC-INDIC DIGIT ZERO;Nd;0;EN;;0;0;0;N;EASTERN ARABIC-INDIC DIGIT ZERO;;;; +06F1;EXTENDED ARABIC-INDIC DIGIT ONE;Nd;0;EN;;1;1;1;N;EASTERN ARABIC-INDIC DIGIT ONE;;;; +06F2;EXTENDED ARABIC-INDIC DIGIT TWO;Nd;0;EN;;2;2;2;N;EASTERN ARABIC-INDIC DIGIT TWO;;;; +06F3;EXTENDED ARABIC-INDIC DIGIT THREE;Nd;0;EN;;3;3;3;N;EASTERN ARABIC-INDIC DIGIT THREE;;;; +06F4;EXTENDED ARABIC-INDIC DIGIT FOUR;Nd;0;EN;;4;4;4;N;EASTERN ARABIC-INDIC DIGIT FOUR;;;; +06F5;EXTENDED ARABIC-INDIC DIGIT FIVE;Nd;0;EN;;5;5;5;N;EASTERN ARABIC-INDIC DIGIT FIVE;;;; +06F6;EXTENDED ARABIC-INDIC DIGIT SIX;Nd;0;EN;;6;6;6;N;EASTERN ARABIC-INDIC DIGIT SIX;;;; +06F7;EXTENDED ARABIC-INDIC DIGIT SEVEN;Nd;0;EN;;7;7;7;N;EASTERN ARABIC-INDIC DIGIT SEVEN;;;; +06F8;EXTENDED ARABIC-INDIC DIGIT EIGHT;Nd;0;EN;;8;8;8;N;EASTERN ARABIC-INDIC DIGIT EIGHT;;;; +06F9;EXTENDED ARABIC-INDIC DIGIT NINE;Nd;0;EN;;9;9;9;N;EASTERN ARABIC-INDIC DIGIT NINE;;;; +06FA;ARABIC LETTER SHEEN WITH DOT BELOW;Lo;0;AL;;;;;N;;;;; +06FB;ARABIC LETTER DAD WITH DOT BELOW;Lo;0;AL;;;;;N;;;;; +06FC;ARABIC LETTER GHAIN WITH DOT BELOW;Lo;0;AL;;;;;N;;;;; +06FD;ARABIC SIGN SINDHI AMPERSAND;So;0;AL;;;;;N;;;;; +06FE;ARABIC SIGN SINDHI POSTPOSITION MEN;So;0;AL;;;;;N;;;;; +06FF;ARABIC LETTER HEH WITH INVERTED V;Lo;0;AL;;;;;N;;;;; +0700;SYRIAC END OF PARAGRAPH;Po;0;AL;;;;;N;;;;; +0701;SYRIAC SUPRALINEAR FULL STOP;Po;0;AL;;;;;N;;;;; +0702;SYRIAC SUBLINEAR FULL STOP;Po;0;AL;;;;;N;;;;; +0703;SYRIAC SUPRALINEAR COLON;Po;0;AL;;;;;N;;;;; +0704;SYRIAC SUBLINEAR COLON;Po;0;AL;;;;;N;;;;; +0705;SYRIAC HORIZONTAL COLON;Po;0;AL;;;;;N;;;;; +0706;SYRIAC COLON SKEWED LEFT;Po;0;AL;;;;;N;;;;; +0707;SYRIAC COLON SKEWED RIGHT;Po;0;AL;;;;;N;;;;; +0708;SYRIAC SUPRALINEAR COLON SKEWED LEFT;Po;0;AL;;;;;N;;;;; +0709;SYRIAC SUBLINEAR COLON SKEWED RIGHT;Po;0;AL;;;;;N;;;;; +070A;SYRIAC CONTRACTION;Po;0;AL;;;;;N;;;;; +070B;SYRIAC HARKLEAN OBELUS;Po;0;AL;;;;;N;;;;; +070C;SYRIAC HARKLEAN METOBELUS;Po;0;AL;;;;;N;;;;; +070D;SYRIAC HARKLEAN ASTERISCUS;Po;0;AL;;;;;N;;;;; +070F;SYRIAC ABBREVIATION MARK;Cf;0;AL;;;;;N;;;;; +0710;SYRIAC LETTER ALAPH;Lo;0;AL;;;;;N;;;;; +0711;SYRIAC LETTER SUPERSCRIPT ALAPH;Mn;36;NSM;;;;;N;;;;; +0712;SYRIAC LETTER BETH;Lo;0;AL;;;;;N;;;;; +0713;SYRIAC LETTER GAMAL;Lo;0;AL;;;;;N;;;;; +0714;SYRIAC LETTER GAMAL GARSHUNI;Lo;0;AL;;;;;N;;;;; +0715;SYRIAC LETTER DALATH;Lo;0;AL;;;;;N;;;;; +0716;SYRIAC LETTER DOTLESS DALATH RISH;Lo;0;AL;;;;;N;;;;; +0717;SYRIAC LETTER HE;Lo;0;AL;;;;;N;;;;; +0718;SYRIAC LETTER WAW;Lo;0;AL;;;;;N;;;;; +0719;SYRIAC LETTER ZAIN;Lo;0;AL;;;;;N;;;;; +071A;SYRIAC LETTER HETH;Lo;0;AL;;;;;N;;;;; +071B;SYRIAC LETTER TETH;Lo;0;AL;;;;;N;;;;; +071C;SYRIAC LETTER TETH GARSHUNI;Lo;0;AL;;;;;N;;;;; +071D;SYRIAC LETTER YUDH;Lo;0;AL;;;;;N;;;;; +071E;SYRIAC LETTER YUDH HE;Lo;0;AL;;;;;N;;;;; +071F;SYRIAC LETTER KAPH;Lo;0;AL;;;;;N;;;;; +0720;SYRIAC LETTER LAMADH;Lo;0;AL;;;;;N;;;;; +0721;SYRIAC LETTER MIM;Lo;0;AL;;;;;N;;;;; +0722;SYRIAC LETTER NUN;Lo;0;AL;;;;;N;;;;; +0723;SYRIAC LETTER SEMKATH;Lo;0;AL;;;;;N;;;;; +0724;SYRIAC LETTER FINAL SEMKATH;Lo;0;AL;;;;;N;;;;; +0725;SYRIAC LETTER E;Lo;0;AL;;;;;N;;;;; +0726;SYRIAC LETTER PE;Lo;0;AL;;;;;N;;;;; +0727;SYRIAC LETTER REVERSED PE;Lo;0;AL;;;;;N;;;;; +0728;SYRIAC LETTER SADHE;Lo;0;AL;;;;;N;;;;; +0729;SYRIAC LETTER QAPH;Lo;0;AL;;;;;N;;;;; +072A;SYRIAC LETTER RISH;Lo;0;AL;;;;;N;;;;; +072B;SYRIAC LETTER SHIN;Lo;0;AL;;;;;N;;;;; +072C;SYRIAC LETTER TAW;Lo;0;AL;;;;;N;;;;; +072D;SYRIAC LETTER PERSIAN BHETH;Lo;0;AL;;;;;N;;;;; +072E;SYRIAC LETTER PERSIAN GHAMAL;Lo;0;AL;;;;;N;;;;; +072F;SYRIAC LETTER PERSIAN DHALATH;Lo;0;AL;;;;;N;;;;; +0730;SYRIAC PTHAHA ABOVE;Mn;230;NSM;;;;;N;;;;; +0731;SYRIAC PTHAHA BELOW;Mn;220;NSM;;;;;N;;;;; +0732;SYRIAC PTHAHA DOTTED;Mn;230;NSM;;;;;N;;;;; +0733;SYRIAC ZQAPHA ABOVE;Mn;230;NSM;;;;;N;;;;; +0734;SYRIAC ZQAPHA BELOW;Mn;220;NSM;;;;;N;;;;; +0735;SYRIAC ZQAPHA DOTTED;Mn;230;NSM;;;;;N;;;;; +0736;SYRIAC RBASA ABOVE;Mn;230;NSM;;;;;N;;;;; +0737;SYRIAC RBASA BELOW;Mn;220;NSM;;;;;N;;;;; +0738;SYRIAC DOTTED ZLAMA HORIZONTAL;Mn;220;NSM;;;;;N;;;;; +0739;SYRIAC DOTTED ZLAMA ANGULAR;Mn;220;NSM;;;;;N;;;;; +073A;SYRIAC HBASA ABOVE;Mn;230;NSM;;;;;N;;;;; +073B;SYRIAC HBASA BELOW;Mn;220;NSM;;;;;N;;;;; +073C;SYRIAC HBASA-ESASA DOTTED;Mn;220;NSM;;;;;N;;;;; +073D;SYRIAC ESASA ABOVE;Mn;230;NSM;;;;;N;;;;; +073E;SYRIAC ESASA BELOW;Mn;220;NSM;;;;;N;;;;; +073F;SYRIAC RWAHA;Mn;230;NSM;;;;;N;;;;; +0740;SYRIAC FEMININE DOT;Mn;230;NSM;;;;;N;;;;; +0741;SYRIAC QUSHSHAYA;Mn;230;NSM;;;;;N;;;;; +0742;SYRIAC RUKKAKHA;Mn;220;NSM;;;;;N;;;;; +0743;SYRIAC TWO VERTICAL DOTS ABOVE;Mn;230;NSM;;;;;N;;;;; +0744;SYRIAC TWO VERTICAL DOTS BELOW;Mn;220;NSM;;;;;N;;;;; +0745;SYRIAC THREE DOTS ABOVE;Mn;230;NSM;;;;;N;;;;; +0746;SYRIAC THREE DOTS BELOW;Mn;220;NSM;;;;;N;;;;; +0747;SYRIAC OBLIQUE LINE ABOVE;Mn;230;NSM;;;;;N;;;;; +0748;SYRIAC OBLIQUE LINE BELOW;Mn;220;NSM;;;;;N;;;;; +0749;SYRIAC MUSIC;Mn;230;NSM;;;;;N;;;;; +074A;SYRIAC BARREKH;Mn;230;NSM;;;;;N;;;;; +074D;SYRIAC LETTER SOGDIAN ZHAIN;Lo;0;AL;;;;;N;;;;; +074E;SYRIAC LETTER SOGDIAN KHAPH;Lo;0;AL;;;;;N;;;;; +074F;SYRIAC LETTER SOGDIAN FE;Lo;0;AL;;;;;N;;;;; +0750;ARABIC LETTER BEH WITH THREE DOTS HORIZONTALLY BELOW;Lo;0;AL;;;;;N;;;;; +0751;ARABIC LETTER BEH WITH DOT BELOW AND THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;; +0752;ARABIC LETTER BEH WITH THREE DOTS POINTING UPWARDS BELOW;Lo;0;AL;;;;;N;;;;; +0753;ARABIC LETTER BEH WITH THREE DOTS POINTING UPWARDS BELOW AND TWO DOTS ABOVE;Lo;0;AL;;;;;N;;;;; +0754;ARABIC LETTER BEH WITH TWO DOTS BELOW AND DOT ABOVE;Lo;0;AL;;;;;N;;;;; +0755;ARABIC LETTER BEH WITH INVERTED SMALL V BELOW;Lo;0;AL;;;;;N;;;;; +0756;ARABIC LETTER BEH WITH SMALL V;Lo;0;AL;;;;;N;;;;; +0757;ARABIC LETTER HAH WITH TWO DOTS ABOVE;Lo;0;AL;;;;;N;;;;; +0758;ARABIC LETTER HAH WITH THREE DOTS POINTING UPWARDS BELOW;Lo;0;AL;;;;;N;;;;; +0759;ARABIC LETTER DAL WITH TWO DOTS VERTICALLY BELOW AND SMALL TAH;Lo;0;AL;;;;;N;;;;; +075A;ARABIC LETTER DAL WITH INVERTED SMALL V BELOW;Lo;0;AL;;;;;N;;;;; +075B;ARABIC LETTER REH WITH STROKE;Lo;0;AL;;;;;N;;;;; +075C;ARABIC LETTER SEEN WITH FOUR DOTS ABOVE;Lo;0;AL;;;;;N;;;;; +075D;ARABIC LETTER AIN WITH TWO DOTS ABOVE;Lo;0;AL;;;;;N;;;;; +075E;ARABIC LETTER AIN WITH THREE DOTS POINTING DOWNWARDS ABOVE;Lo;0;AL;;;;;N;;;;; +075F;ARABIC LETTER AIN WITH TWO DOTS VERTICALLY ABOVE;Lo;0;AL;;;;;N;;;;; +0760;ARABIC LETTER FEH WITH TWO DOTS BELOW;Lo;0;AL;;;;;N;;;;; +0761;ARABIC LETTER FEH WITH THREE DOTS POINTING UPWARDS BELOW;Lo;0;AL;;;;;N;;;;; +0762;ARABIC LETTER KEHEH WITH DOT ABOVE;Lo;0;AL;;;;;N;;;;; +0763;ARABIC LETTER KEHEH WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;; +0764;ARABIC LETTER KEHEH WITH THREE DOTS POINTING UPWARDS BELOW;Lo;0;AL;;;;;N;;;;; +0765;ARABIC LETTER MEEM WITH DOT ABOVE;Lo;0;AL;;;;;N;;;;; +0766;ARABIC LETTER MEEM WITH DOT BELOW;Lo;0;AL;;;;;N;;;;; +0767;ARABIC LETTER NOON WITH TWO DOTS BELOW;Lo;0;AL;;;;;N;;;;; +0768;ARABIC LETTER NOON WITH SMALL TAH;Lo;0;AL;;;;;N;;;;; +0769;ARABIC LETTER NOON WITH SMALL V;Lo;0;AL;;;;;N;;;;; +076A;ARABIC LETTER LAM WITH BAR;Lo;0;AL;;;;;N;;;;; +076B;ARABIC LETTER REH WITH TWO DOTS VERTICALLY ABOVE;Lo;0;AL;;;;;N;;;;; +076C;ARABIC LETTER REH WITH HAMZA ABOVE;Lo;0;AL;;;;;N;;;;; +076D;ARABIC LETTER SEEN WITH TWO DOTS VERTICALLY ABOVE;Lo;0;AL;;;;;N;;;;; +076E;ARABIC LETTER HAH WITH SMALL ARABIC LETTER TAH BELOW;Lo;0;AL;;;;;N;;;;; +076F;ARABIC LETTER HAH WITH SMALL ARABIC LETTER TAH AND TWO DOTS;Lo;0;AL;;;;;N;;;;; +0770;ARABIC LETTER SEEN WITH SMALL ARABIC LETTER TAH AND TWO DOTS;Lo;0;AL;;;;;N;;;;; +0771;ARABIC LETTER REH WITH SMALL ARABIC LETTER TAH AND TWO DOTS;Lo;0;AL;;;;;N;;;;; +0772;ARABIC LETTER HAH WITH SMALL ARABIC LETTER TAH ABOVE;Lo;0;AL;;;;;N;;;;; +0773;ARABIC LETTER ALEF WITH EXTENDED ARABIC-INDIC DIGIT TWO ABOVE;Lo;0;AL;;;;;N;;;;; +0774;ARABIC LETTER ALEF WITH EXTENDED ARABIC-INDIC DIGIT THREE ABOVE;Lo;0;AL;;;;;N;;;;; +0775;ARABIC LETTER FARSI YEH WITH EXTENDED ARABIC-INDIC DIGIT TWO ABOVE;Lo;0;AL;;;;;N;;;;; +0776;ARABIC LETTER FARSI YEH WITH EXTENDED ARABIC-INDIC DIGIT THREE ABOVE;Lo;0;AL;;;;;N;;;;; +0777;ARABIC LETTER FARSI YEH WITH EXTENDED ARABIC-INDIC DIGIT FOUR BELOW;Lo;0;AL;;;;;N;;;;; +0778;ARABIC LETTER WAW WITH EXTENDED ARABIC-INDIC DIGIT TWO ABOVE;Lo;0;AL;;;;;N;;;;; +0779;ARABIC LETTER WAW WITH EXTENDED ARABIC-INDIC DIGIT THREE ABOVE;Lo;0;AL;;;;;N;;;;; +077A;ARABIC LETTER YEH BARREE WITH EXTENDED ARABIC-INDIC DIGIT TWO ABOVE;Lo;0;AL;;;;;N;;;;; +077B;ARABIC LETTER YEH BARREE WITH EXTENDED ARABIC-INDIC DIGIT THREE ABOVE;Lo;0;AL;;;;;N;;;;; +077C;ARABIC LETTER HAH WITH EXTENDED ARABIC-INDIC DIGIT FOUR BELOW;Lo;0;AL;;;;;N;;;;; +077D;ARABIC LETTER SEEN WITH EXTENDED ARABIC-INDIC DIGIT FOUR ABOVE;Lo;0;AL;;;;;N;;;;; +077E;ARABIC LETTER SEEN WITH INVERTED V;Lo;0;AL;;;;;N;;;;; +077F;ARABIC LETTER KAF WITH TWO DOTS ABOVE;Lo;0;AL;;;;;N;;;;; +0780;THAANA LETTER HAA;Lo;0;AL;;;;;N;;;;; +0781;THAANA LETTER SHAVIYANI;Lo;0;AL;;;;;N;;;;; +0782;THAANA LETTER NOONU;Lo;0;AL;;;;;N;;;;; +0783;THAANA LETTER RAA;Lo;0;AL;;;;;N;;;;; +0784;THAANA LETTER BAA;Lo;0;AL;;;;;N;;;;; +0785;THAANA LETTER LHAVIYANI;Lo;0;AL;;;;;N;;;;; +0786;THAANA LETTER KAAFU;Lo;0;AL;;;;;N;;;;; +0787;THAANA LETTER ALIFU;Lo;0;AL;;;;;N;;;;; +0788;THAANA LETTER VAAVU;Lo;0;AL;;;;;N;;;;; +0789;THAANA LETTER MEEMU;Lo;0;AL;;;;;N;;;;; +078A;THAANA LETTER FAAFU;Lo;0;AL;;;;;N;;;;; +078B;THAANA LETTER DHAALU;Lo;0;AL;;;;;N;;;;; +078C;THAANA LETTER THAA;Lo;0;AL;;;;;N;;;;; +078D;THAANA LETTER LAAMU;Lo;0;AL;;;;;N;;;;; +078E;THAANA LETTER GAAFU;Lo;0;AL;;;;;N;;;;; +078F;THAANA LETTER GNAVIYANI;Lo;0;AL;;;;;N;;;;; +0790;THAANA LETTER SEENU;Lo;0;AL;;;;;N;;;;; +0791;THAANA LETTER DAVIYANI;Lo;0;AL;;;;;N;;;;; +0792;THAANA LETTER ZAVIYANI;Lo;0;AL;;;;;N;;;;; +0793;THAANA LETTER TAVIYANI;Lo;0;AL;;;;;N;;;;; +0794;THAANA LETTER YAA;Lo;0;AL;;;;;N;;;;; +0795;THAANA LETTER PAVIYANI;Lo;0;AL;;;;;N;;;;; +0796;THAANA LETTER JAVIYANI;Lo;0;AL;;;;;N;;;;; +0797;THAANA LETTER CHAVIYANI;Lo;0;AL;;;;;N;;;;; +0798;THAANA LETTER TTAA;Lo;0;AL;;;;;N;;;;; +0799;THAANA LETTER HHAA;Lo;0;AL;;;;;N;;;;; +079A;THAANA LETTER KHAA;Lo;0;AL;;;;;N;;;;; +079B;THAANA LETTER THAALU;Lo;0;AL;;;;;N;;;;; +079C;THAANA LETTER ZAA;Lo;0;AL;;;;;N;;;;; +079D;THAANA LETTER SHEENU;Lo;0;AL;;;;;N;;;;; +079E;THAANA LETTER SAADHU;Lo;0;AL;;;;;N;;;;; +079F;THAANA LETTER DAADHU;Lo;0;AL;;;;;N;;;;; +07A0;THAANA LETTER TO;Lo;0;AL;;;;;N;;;;; +07A1;THAANA LETTER ZO;Lo;0;AL;;;;;N;;;;; +07A2;THAANA LETTER AINU;Lo;0;AL;;;;;N;;;;; +07A3;THAANA LETTER GHAINU;Lo;0;AL;;;;;N;;;;; +07A4;THAANA LETTER QAAFU;Lo;0;AL;;;;;N;;;;; +07A5;THAANA LETTER WAAVU;Lo;0;AL;;;;;N;;;;; +07A6;THAANA ABAFILI;Mn;0;NSM;;;;;N;;;;; +07A7;THAANA AABAAFILI;Mn;0;NSM;;;;;N;;;;; +07A8;THAANA IBIFILI;Mn;0;NSM;;;;;N;;;;; +07A9;THAANA EEBEEFILI;Mn;0;NSM;;;;;N;;;;; +07AA;THAANA UBUFILI;Mn;0;NSM;;;;;N;;;;; +07AB;THAANA OOBOOFILI;Mn;0;NSM;;;;;N;;;;; +07AC;THAANA EBEFILI;Mn;0;NSM;;;;;N;;;;; +07AD;THAANA EYBEYFILI;Mn;0;NSM;;;;;N;;;;; +07AE;THAANA OBOFILI;Mn;0;NSM;;;;;N;;;;; +07AF;THAANA OABOAFILI;Mn;0;NSM;;;;;N;;;;; +07B0;THAANA SUKUN;Mn;0;NSM;;;;;N;;;;; +07B1;THAANA LETTER NAA;Lo;0;AL;;;;;N;;;;; +07C0;NKO DIGIT ZERO;Nd;0;R;;0;0;0;N;;;;; +07C1;NKO DIGIT ONE;Nd;0;R;;1;1;1;N;;;;; +07C2;NKO DIGIT TWO;Nd;0;R;;2;2;2;N;;;;; +07C3;NKO DIGIT THREE;Nd;0;R;;3;3;3;N;;;;; +07C4;NKO DIGIT FOUR;Nd;0;R;;4;4;4;N;;;;; +07C5;NKO DIGIT FIVE;Nd;0;R;;5;5;5;N;;;;; +07C6;NKO DIGIT SIX;Nd;0;R;;6;6;6;N;;;;; +07C7;NKO DIGIT SEVEN;Nd;0;R;;7;7;7;N;;;;; +07C8;NKO DIGIT EIGHT;Nd;0;R;;8;8;8;N;;;;; +07C9;NKO DIGIT NINE;Nd;0;R;;9;9;9;N;;;;; +07CA;NKO LETTER A;Lo;0;R;;;;;N;;;;; +07CB;NKO LETTER EE;Lo;0;R;;;;;N;;;;; +07CC;NKO LETTER I;Lo;0;R;;;;;N;;;;; +07CD;NKO LETTER E;Lo;0;R;;;;;N;;;;; +07CE;NKO LETTER U;Lo;0;R;;;;;N;;;;; +07CF;NKO LETTER OO;Lo;0;R;;;;;N;;;;; +07D0;NKO LETTER O;Lo;0;R;;;;;N;;;;; +07D1;NKO LETTER DAGBASINNA;Lo;0;R;;;;;N;;;;; +07D2;NKO LETTER N;Lo;0;R;;;;;N;;;;; +07D3;NKO LETTER BA;Lo;0;R;;;;;N;;;;; +07D4;NKO LETTER PA;Lo;0;R;;;;;N;;;;; +07D5;NKO LETTER TA;Lo;0;R;;;;;N;;;;; +07D6;NKO LETTER JA;Lo;0;R;;;;;N;;;;; +07D7;NKO LETTER CHA;Lo;0;R;;;;;N;;;;; +07D8;NKO LETTER DA;Lo;0;R;;;;;N;;;;; +07D9;NKO LETTER RA;Lo;0;R;;;;;N;;;;; +07DA;NKO LETTER RRA;Lo;0;R;;;;;N;;;;; +07DB;NKO LETTER SA;Lo;0;R;;;;;N;;;;; +07DC;NKO LETTER GBA;Lo;0;R;;;;;N;;;;; +07DD;NKO LETTER FA;Lo;0;R;;;;;N;;;;; +07DE;NKO LETTER KA;Lo;0;R;;;;;N;;;;; +07DF;NKO LETTER LA;Lo;0;R;;;;;N;;;;; +07E0;NKO LETTER NA WOLOSO;Lo;0;R;;;;;N;;;;; +07E1;NKO LETTER MA;Lo;0;R;;;;;N;;;;; +07E2;NKO LETTER NYA;Lo;0;R;;;;;N;;;;; +07E3;NKO LETTER NA;Lo;0;R;;;;;N;;;;; +07E4;NKO LETTER HA;Lo;0;R;;;;;N;;;;; +07E5;NKO LETTER WA;Lo;0;R;;;;;N;;;;; +07E6;NKO LETTER YA;Lo;0;R;;;;;N;;;;; +07E7;NKO LETTER NYA WOLOSO;Lo;0;R;;;;;N;;;;; +07E8;NKO LETTER JONA JA;Lo;0;R;;;;;N;;;;; +07E9;NKO LETTER JONA CHA;Lo;0;R;;;;;N;;;;; +07EA;NKO LETTER JONA RA;Lo;0;R;;;;;N;;;;; +07EB;NKO COMBINING SHORT HIGH TONE;Mn;230;NSM;;;;;N;;;;; +07EC;NKO COMBINING SHORT LOW TONE;Mn;230;NSM;;;;;N;;;;; +07ED;NKO COMBINING SHORT RISING TONE;Mn;230;NSM;;;;;N;;;;; +07EE;NKO COMBINING LONG DESCENDING TONE;Mn;230;NSM;;;;;N;;;;; +07EF;NKO COMBINING LONG HIGH TONE;Mn;230;NSM;;;;;N;;;;; +07F0;NKO COMBINING LONG LOW TONE;Mn;230;NSM;;;;;N;;;;; +07F1;NKO COMBINING LONG RISING TONE;Mn;230;NSM;;;;;N;;;;; +07F2;NKO COMBINING NASALIZATION MARK;Mn;220;NSM;;;;;N;;;;; +07F3;NKO COMBINING DOUBLE DOT ABOVE;Mn;230;NSM;;;;;N;;;;; +07F4;NKO HIGH TONE APOSTROPHE;Lm;0;R;;;;;N;;;;; +07F5;NKO LOW TONE APOSTROPHE;Lm;0;R;;;;;N;;;;; +07F6;NKO SYMBOL OO DENNEN;So;0;ON;;;;;N;;;;; +07F7;NKO SYMBOL GBAKURUNEN;Po;0;ON;;;;;N;;;;; +07F8;NKO COMMA;Po;0;ON;;;;;N;;;;; +07F9;NKO EXCLAMATION MARK;Po;0;ON;;;;;N;;;;; +07FA;NKO LAJANYALAN;Lm;0;R;;;;;N;;;;; +07FD;NKO DANTAYALAN;Mn;220;NSM;;;;;N;;;;; +07FE;NKO DOROME SIGN;Sc;0;R;;;;;N;;;;; +07FF;NKO TAMAN SIGN;Sc;0;R;;;;;N;;;;; +0800;SAMARITAN LETTER ALAF;Lo;0;R;;;;;N;;;;; +0801;SAMARITAN LETTER BIT;Lo;0;R;;;;;N;;;;; +0802;SAMARITAN LETTER GAMAN;Lo;0;R;;;;;N;;;;; +0803;SAMARITAN LETTER DALAT;Lo;0;R;;;;;N;;;;; +0804;SAMARITAN LETTER IY;Lo;0;R;;;;;N;;;;; +0805;SAMARITAN LETTER BAA;Lo;0;R;;;;;N;;;;; +0806;SAMARITAN LETTER ZEN;Lo;0;R;;;;;N;;;;; +0807;SAMARITAN LETTER IT;Lo;0;R;;;;;N;;;;; +0808;SAMARITAN LETTER TIT;Lo;0;R;;;;;N;;;;; +0809;SAMARITAN LETTER YUT;Lo;0;R;;;;;N;;;;; +080A;SAMARITAN LETTER KAAF;Lo;0;R;;;;;N;;;;; +080B;SAMARITAN LETTER LABAT;Lo;0;R;;;;;N;;;;; +080C;SAMARITAN LETTER MIM;Lo;0;R;;;;;N;;;;; +080D;SAMARITAN LETTER NUN;Lo;0;R;;;;;N;;;;; +080E;SAMARITAN LETTER SINGAAT;Lo;0;R;;;;;N;;;;; +080F;SAMARITAN LETTER IN;Lo;0;R;;;;;N;;;;; +0810;SAMARITAN LETTER FI;Lo;0;R;;;;;N;;;;; +0811;SAMARITAN LETTER TSAADIY;Lo;0;R;;;;;N;;;;; +0812;SAMARITAN LETTER QUF;Lo;0;R;;;;;N;;;;; +0813;SAMARITAN LETTER RISH;Lo;0;R;;;;;N;;;;; +0814;SAMARITAN LETTER SHAN;Lo;0;R;;;;;N;;;;; +0815;SAMARITAN LETTER TAAF;Lo;0;R;;;;;N;;;;; +0816;SAMARITAN MARK IN;Mn;230;NSM;;;;;N;;;;; +0817;SAMARITAN MARK IN-ALAF;Mn;230;NSM;;;;;N;;;;; +0818;SAMARITAN MARK OCCLUSION;Mn;230;NSM;;;;;N;;;;; +0819;SAMARITAN MARK DAGESH;Mn;230;NSM;;;;;N;;;;; +081A;SAMARITAN MODIFIER LETTER EPENTHETIC YUT;Lm;0;R;;;;;N;;;;; +081B;SAMARITAN MARK EPENTHETIC YUT;Mn;230;NSM;;;;;N;;;;; +081C;SAMARITAN VOWEL SIGN LONG E;Mn;230;NSM;;;;;N;;;;; +081D;SAMARITAN VOWEL SIGN E;Mn;230;NSM;;;;;N;;;;; +081E;SAMARITAN VOWEL SIGN OVERLONG AA;Mn;230;NSM;;;;;N;;;;; +081F;SAMARITAN VOWEL SIGN LONG AA;Mn;230;NSM;;;;;N;;;;; +0820;SAMARITAN VOWEL SIGN AA;Mn;230;NSM;;;;;N;;;;; +0821;SAMARITAN VOWEL SIGN OVERLONG A;Mn;230;NSM;;;;;N;;;;; +0822;SAMARITAN VOWEL SIGN LONG A;Mn;230;NSM;;;;;N;;;;; +0823;SAMARITAN VOWEL SIGN A;Mn;230;NSM;;;;;N;;;;; +0824;SAMARITAN MODIFIER LETTER SHORT A;Lm;0;R;;;;;N;;;;; +0825;SAMARITAN VOWEL SIGN SHORT A;Mn;230;NSM;;;;;N;;;;; +0826;SAMARITAN VOWEL SIGN LONG U;Mn;230;NSM;;;;;N;;;;; +0827;SAMARITAN VOWEL SIGN U;Mn;230;NSM;;;;;N;;;;; +0828;SAMARITAN MODIFIER LETTER I;Lm;0;R;;;;;N;;;;; +0829;SAMARITAN VOWEL SIGN LONG I;Mn;230;NSM;;;;;N;;;;; +082A;SAMARITAN VOWEL SIGN I;Mn;230;NSM;;;;;N;;;;; +082B;SAMARITAN VOWEL SIGN O;Mn;230;NSM;;;;;N;;;;; +082C;SAMARITAN VOWEL SIGN SUKUN;Mn;230;NSM;;;;;N;;;;; +082D;SAMARITAN MARK NEQUDAA;Mn;230;NSM;;;;;N;;;;; +0830;SAMARITAN PUNCTUATION NEQUDAA;Po;0;R;;;;;N;;;;; +0831;SAMARITAN PUNCTUATION AFSAAQ;Po;0;R;;;;;N;;;;; +0832;SAMARITAN PUNCTUATION ANGED;Po;0;R;;;;;N;;;;; +0833;SAMARITAN PUNCTUATION BAU;Po;0;R;;;;;N;;;;; +0834;SAMARITAN PUNCTUATION ATMAAU;Po;0;R;;;;;N;;;;; +0835;SAMARITAN PUNCTUATION SHIYYAALAA;Po;0;R;;;;;N;;;;; +0836;SAMARITAN ABBREVIATION MARK;Po;0;R;;;;;N;;;;; +0837;SAMARITAN PUNCTUATION MELODIC QITSA;Po;0;R;;;;;N;;;;; +0838;SAMARITAN PUNCTUATION ZIQAA;Po;0;R;;;;;N;;;;; +0839;SAMARITAN PUNCTUATION QITSA;Po;0;R;;;;;N;;;;; +083A;SAMARITAN PUNCTUATION ZAEF;Po;0;R;;;;;N;;;;; +083B;SAMARITAN PUNCTUATION TURU;Po;0;R;;;;;N;;;;; +083C;SAMARITAN PUNCTUATION ARKAANU;Po;0;R;;;;;N;;;;; +083D;SAMARITAN PUNCTUATION SOF MASHFAAT;Po;0;R;;;;;N;;;;; +083E;SAMARITAN PUNCTUATION ANNAAU;Po;0;R;;;;;N;;;;; +0840;MANDAIC LETTER HALQA;Lo;0;R;;;;;N;;;;; +0841;MANDAIC LETTER AB;Lo;0;R;;;;;N;;;;; +0842;MANDAIC LETTER AG;Lo;0;R;;;;;N;;;;; +0843;MANDAIC LETTER AD;Lo;0;R;;;;;N;;;;; +0844;MANDAIC LETTER AH;Lo;0;R;;;;;N;;;;; +0845;MANDAIC LETTER USHENNA;Lo;0;R;;;;;N;;;;; +0846;MANDAIC LETTER AZ;Lo;0;R;;;;;N;;;;; +0847;MANDAIC LETTER IT;Lo;0;R;;;;;N;;;;; +0848;MANDAIC LETTER ATT;Lo;0;R;;;;;N;;;;; +0849;MANDAIC LETTER AKSA;Lo;0;R;;;;;N;;;;; +084A;MANDAIC LETTER AK;Lo;0;R;;;;;N;;;;; +084B;MANDAIC LETTER AL;Lo;0;R;;;;;N;;;;; +084C;MANDAIC LETTER AM;Lo;0;R;;;;;N;;;;; +084D;MANDAIC LETTER AN;Lo;0;R;;;;;N;;;;; +084E;MANDAIC LETTER AS;Lo;0;R;;;;;N;;;;; +084F;MANDAIC LETTER IN;Lo;0;R;;;;;N;;;;; +0850;MANDAIC LETTER AP;Lo;0;R;;;;;N;;;;; +0851;MANDAIC LETTER ASZ;Lo;0;R;;;;;N;;;;; +0852;MANDAIC LETTER AQ;Lo;0;R;;;;;N;;;;; +0853;MANDAIC LETTER AR;Lo;0;R;;;;;N;;;;; +0854;MANDAIC LETTER ASH;Lo;0;R;;;;;N;;;;; +0855;MANDAIC LETTER AT;Lo;0;R;;;;;N;;;;; +0856;MANDAIC LETTER DUSHENNA;Lo;0;R;;;;;N;;;;; +0857;MANDAIC LETTER KAD;Lo;0;R;;;;;N;;;;; +0858;MANDAIC LETTER AIN;Lo;0;R;;;;;N;;;;; +0859;MANDAIC AFFRICATION MARK;Mn;220;NSM;;;;;N;;;;; +085A;MANDAIC VOCALIZATION MARK;Mn;220;NSM;;;;;N;;;;; +085B;MANDAIC GEMINATION MARK;Mn;220;NSM;;;;;N;;;;; +085E;MANDAIC PUNCTUATION;Po;0;R;;;;;N;;;;; +0860;SYRIAC LETTER MALAYALAM NGA;Lo;0;AL;;;;;N;;;;; +0861;SYRIAC LETTER MALAYALAM JA;Lo;0;AL;;;;;N;;;;; +0862;SYRIAC LETTER MALAYALAM NYA;Lo;0;AL;;;;;N;;;;; +0863;SYRIAC LETTER MALAYALAM TTA;Lo;0;AL;;;;;N;;;;; +0864;SYRIAC LETTER MALAYALAM NNA;Lo;0;AL;;;;;N;;;;; +0865;SYRIAC LETTER MALAYALAM NNNA;Lo;0;AL;;;;;N;;;;; +0866;SYRIAC LETTER MALAYALAM BHA;Lo;0;AL;;;;;N;;;;; +0867;SYRIAC LETTER MALAYALAM RA;Lo;0;AL;;;;;N;;;;; +0868;SYRIAC LETTER MALAYALAM LLA;Lo;0;AL;;;;;N;;;;; +0869;SYRIAC LETTER MALAYALAM LLLA;Lo;0;AL;;;;;N;;;;; +086A;SYRIAC LETTER MALAYALAM SSA;Lo;0;AL;;;;;N;;;;; +0870;ARABIC LETTER ALEF WITH ATTACHED FATHA;Lo;0;AL;;;;;N;;;;; +0871;ARABIC LETTER ALEF WITH ATTACHED TOP RIGHT FATHA;Lo;0;AL;;;;;N;;;;; +0872;ARABIC LETTER ALEF WITH RIGHT MIDDLE STROKE;Lo;0;AL;;;;;N;;;;; +0873;ARABIC LETTER ALEF WITH LEFT MIDDLE STROKE;Lo;0;AL;;;;;N;;;;; +0874;ARABIC LETTER ALEF WITH ATTACHED KASRA;Lo;0;AL;;;;;N;;;;; +0875;ARABIC LETTER ALEF WITH ATTACHED BOTTOM RIGHT KASRA;Lo;0;AL;;;;;N;;;;; +0876;ARABIC LETTER ALEF WITH ATTACHED ROUND DOT ABOVE;Lo;0;AL;;;;;N;;;;; +0877;ARABIC LETTER ALEF WITH ATTACHED RIGHT ROUND DOT;Lo;0;AL;;;;;N;;;;; +0878;ARABIC LETTER ALEF WITH ATTACHED LEFT ROUND DOT;Lo;0;AL;;;;;N;;;;; +0879;ARABIC LETTER ALEF WITH ATTACHED ROUND DOT BELOW;Lo;0;AL;;;;;N;;;;; +087A;ARABIC LETTER ALEF WITH DOT ABOVE;Lo;0;AL;;;;;N;;;;; +087B;ARABIC LETTER ALEF WITH ATTACHED TOP RIGHT FATHA AND DOT ABOVE;Lo;0;AL;;;;;N;;;;; +087C;ARABIC LETTER ALEF WITH RIGHT MIDDLE STROKE AND DOT ABOVE;Lo;0;AL;;;;;N;;;;; +087D;ARABIC LETTER ALEF WITH ATTACHED BOTTOM RIGHT KASRA AND DOT ABOVE;Lo;0;AL;;;;;N;;;;; +087E;ARABIC LETTER ALEF WITH ATTACHED TOP RIGHT FATHA AND LEFT RING;Lo;0;AL;;;;;N;;;;; +087F;ARABIC LETTER ALEF WITH RIGHT MIDDLE STROKE AND LEFT RING;Lo;0;AL;;;;;N;;;;; +0880;ARABIC LETTER ALEF WITH ATTACHED BOTTOM RIGHT KASRA AND LEFT RING;Lo;0;AL;;;;;N;;;;; +0881;ARABIC LETTER ALEF WITH ATTACHED RIGHT HAMZA;Lo;0;AL;;;;;N;;;;; +0882;ARABIC LETTER ALEF WITH ATTACHED LEFT HAMZA;Lo;0;AL;;;;;N;;;;; +0883;ARABIC TATWEEL WITH OVERSTRUCK HAMZA;Lo;0;AL;;;;;N;;;;; +0884;ARABIC TATWEEL WITH OVERSTRUCK WAW;Lo;0;AL;;;;;N;;;;; +0885;ARABIC TATWEEL WITH TWO DOTS BELOW;Lo;0;AL;;;;;N;;;;; +0886;ARABIC LETTER THIN YEH;Lo;0;AL;;;;;N;;;;; +0887;ARABIC BASELINE ROUND DOT;Lo;0;AL;;;;;N;;;;; +0888;ARABIC RAISED ROUND DOT;Sk;0;AL;;;;;N;;;;; +0889;ARABIC LETTER NOON WITH INVERTED SMALL V;Lo;0;AL;;;;;N;;;;; +088A;ARABIC LETTER HAH WITH INVERTED SMALL V BELOW;Lo;0;AL;;;;;N;;;;; +088B;ARABIC LETTER TAH WITH DOT BELOW;Lo;0;AL;;;;;N;;;;; +088C;ARABIC LETTER TAH WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;;;;; +088D;ARABIC LETTER KEHEH WITH TWO DOTS VERTICALLY BELOW;Lo;0;AL;;;;;N;;;;; +088E;ARABIC VERTICAL TAIL;Lo;0;AL;;;;;N;;;;; +088F;ARABIC LETTER NOON WITH RING ABOVE;Lo;0;AL;;;;;N;;;;; +0890;ARABIC POUND MARK ABOVE;Cf;0;AN;;;;;N;;;;; +0891;ARABIC PIASTRE MARK ABOVE;Cf;0;AN;;;;;N;;;;; +0897;ARABIC PEPET;Mn;230;NSM;;;;;N;;;;; +0898;ARABIC SMALL HIGH WORD AL-JUZ;Mn;230;NSM;;;;;N;;;;; +0899;ARABIC SMALL LOW WORD ISHMAAM;Mn;220;NSM;;;;;N;;;;; +089A;ARABIC SMALL LOW WORD IMAALA;Mn;220;NSM;;;;;N;;;;; +089B;ARABIC SMALL LOW WORD TASHEEL;Mn;220;NSM;;;;;N;;;;; +089C;ARABIC MADDA WAAJIB;Mn;230;NSM;;;;;N;;;;; +089D;ARABIC SUPERSCRIPT ALEF MOKHASSAS;Mn;230;NSM;;;;;N;;;;; +089E;ARABIC DOUBLED MADDA;Mn;230;NSM;;;;;N;;;;; +089F;ARABIC HALF MADDA OVER MADDA;Mn;230;NSM;;;;;N;;;;; +08A0;ARABIC LETTER BEH WITH SMALL V BELOW;Lo;0;AL;;;;;N;;;;; +08A1;ARABIC LETTER BEH WITH HAMZA ABOVE;Lo;0;AL;;;;;N;;;;; +08A2;ARABIC LETTER JEEM WITH TWO DOTS ABOVE;Lo;0;AL;;;;;N;;;;; +08A3;ARABIC LETTER TAH WITH TWO DOTS ABOVE;Lo;0;AL;;;;;N;;;;; +08A4;ARABIC LETTER FEH WITH DOT BELOW AND THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;; +08A5;ARABIC LETTER QAF WITH DOT BELOW;Lo;0;AL;;;;;N;;;;; +08A6;ARABIC LETTER LAM WITH DOUBLE BAR;Lo;0;AL;;;;;N;;;;; +08A7;ARABIC LETTER MEEM WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;; +08A8;ARABIC LETTER YEH WITH TWO DOTS BELOW AND HAMZA ABOVE;Lo;0;AL;;;;;N;;;;; +08A9;ARABIC LETTER YEH WITH TWO DOTS BELOW AND DOT ABOVE;Lo;0;AL;;;;;N;;;;; +08AA;ARABIC LETTER REH WITH LOOP;Lo;0;AL;;;;;N;;;;; +08AB;ARABIC LETTER WAW WITH DOT WITHIN;Lo;0;AL;;;;;N;;;;; +08AC;ARABIC LETTER ROHINGYA YEH;Lo;0;AL;;;;;N;;;;; +08AD;ARABIC LETTER LOW ALEF;Lo;0;AL;;;;;N;;;;; +08AE;ARABIC LETTER DAL WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;;;;; +08AF;ARABIC LETTER SAD WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;;;;; +08B0;ARABIC LETTER GAF WITH INVERTED STROKE;Lo;0;AL;;;;;N;;;;; +08B1;ARABIC LETTER STRAIGHT WAW;Lo;0;AL;;;;;N;;;;; +08B2;ARABIC LETTER ZAIN WITH INVERTED V ABOVE;Lo;0;AL;;;;;N;;;;; +08B3;ARABIC LETTER AIN WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;;;;; +08B4;ARABIC LETTER KAF WITH DOT BELOW;Lo;0;AL;;;;;N;;;;; +08B5;ARABIC LETTER QAF WITH DOT BELOW AND NO DOTS ABOVE;Lo;0;AL;;;;;N;;;;; +08B6;ARABIC LETTER BEH WITH SMALL MEEM ABOVE;Lo;0;AL;;;;;N;;;;; +08B7;ARABIC LETTER PEH WITH SMALL MEEM ABOVE;Lo;0;AL;;;;;N;;;;; +08B8;ARABIC LETTER TEH WITH SMALL TEH ABOVE;Lo;0;AL;;;;;N;;;;; +08B9;ARABIC LETTER REH WITH SMALL NOON ABOVE;Lo;0;AL;;;;;N;;;;; +08BA;ARABIC LETTER YEH WITH TWO DOTS BELOW AND SMALL NOON ABOVE;Lo;0;AL;;;;;N;;;;; +08BB;ARABIC LETTER AFRICAN FEH;Lo;0;AL;;;;;N;;;;; +08BC;ARABIC LETTER AFRICAN QAF;Lo;0;AL;;;;;N;;;;; +08BD;ARABIC LETTER AFRICAN NOON;Lo;0;AL;;;;;N;;;;; +08BE;ARABIC LETTER PEH WITH SMALL V;Lo;0;AL;;;;;N;;;;; +08BF;ARABIC LETTER TEH WITH SMALL V;Lo;0;AL;;;;;N;;;;; +08C0;ARABIC LETTER TTEH WITH SMALL V;Lo;0;AL;;;;;N;;;;; +08C1;ARABIC LETTER TCHEH WITH SMALL V;Lo;0;AL;;;;;N;;;;; +08C2;ARABIC LETTER KEHEH WITH SMALL V;Lo;0;AL;;;;;N;;;;; +08C3;ARABIC LETTER GHAIN WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;; +08C4;ARABIC LETTER AFRICAN QAF WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;; +08C5;ARABIC LETTER JEEM WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;; +08C6;ARABIC LETTER JEEM WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;;;;; +08C7;ARABIC LETTER LAM WITH SMALL ARABIC LETTER TAH ABOVE;Lo;0;AL;;;;;N;;;;; +08C8;ARABIC LETTER GRAF;Lo;0;AL;;;;;N;;;;; +08C9;ARABIC SMALL FARSI YEH;Lm;0;AL;;;;;N;;;;; +08CA;ARABIC SMALL HIGH FARSI YEH;Mn;230;NSM;;;;;N;;;;; +08CB;ARABIC SMALL HIGH YEH BARREE WITH TWO DOTS BELOW;Mn;230;NSM;;;;;N;;;;; +08CC;ARABIC SMALL HIGH WORD SAH;Mn;230;NSM;;;;;N;;;;; +08CD;ARABIC SMALL HIGH ZAH;Mn;230;NSM;;;;;N;;;;; +08CE;ARABIC LARGE ROUND DOT ABOVE;Mn;230;NSM;;;;;N;;;;; +08CF;ARABIC LARGE ROUND DOT BELOW;Mn;220;NSM;;;;;N;;;;; +08D0;ARABIC SUKUN BELOW;Mn;220;NSM;;;;;N;;;;; +08D1;ARABIC LARGE CIRCLE BELOW;Mn;220;NSM;;;;;N;;;;; +08D2;ARABIC LARGE ROUND DOT INSIDE CIRCLE BELOW;Mn;220;NSM;;;;;N;;;;; +08D3;ARABIC SMALL LOW WAW;Mn;220;NSM;;;;;N;;;;; +08D4;ARABIC SMALL HIGH WORD AR-RUB;Mn;230;NSM;;;;;N;;;;; +08D5;ARABIC SMALL HIGH SAD;Mn;230;NSM;;;;;N;;;;; +08D6;ARABIC SMALL HIGH AIN;Mn;230;NSM;;;;;N;;;;; +08D7;ARABIC SMALL HIGH QAF;Mn;230;NSM;;;;;N;;;;; +08D8;ARABIC SMALL HIGH NOON WITH KASRA;Mn;230;NSM;;;;;N;;;;; +08D9;ARABIC SMALL LOW NOON WITH KASRA;Mn;230;NSM;;;;;N;;;;; +08DA;ARABIC SMALL HIGH WORD ATH-THALATHA;Mn;230;NSM;;;;;N;;;;; +08DB;ARABIC SMALL HIGH WORD AS-SAJDA;Mn;230;NSM;;;;;N;;;;; +08DC;ARABIC SMALL HIGH WORD AN-NISF;Mn;230;NSM;;;;;N;;;;; +08DD;ARABIC SMALL HIGH WORD SAKTA;Mn;230;NSM;;;;;N;;;;; +08DE;ARABIC SMALL HIGH WORD QIF;Mn;230;NSM;;;;;N;;;;; +08DF;ARABIC SMALL HIGH WORD WAQFA;Mn;230;NSM;;;;;N;;;;; +08E0;ARABIC SMALL HIGH FOOTNOTE MARKER;Mn;230;NSM;;;;;N;;;;; +08E1;ARABIC SMALL HIGH SIGN SAFHA;Mn;230;NSM;;;;;N;;;;; +08E2;ARABIC DISPUTED END OF AYAH;Cf;0;AN;;;;;N;;;;; +08E3;ARABIC TURNED DAMMA BELOW;Mn;220;NSM;;;;;N;;;;; +08E4;ARABIC CURLY FATHA;Mn;230;NSM;;;;;N;;;;; +08E5;ARABIC CURLY DAMMA;Mn;230;NSM;;;;;N;;;;; +08E6;ARABIC CURLY KASRA;Mn;220;NSM;;;;;N;;;;; +08E7;ARABIC CURLY FATHATAN;Mn;230;NSM;;;;;N;;;;; +08E8;ARABIC CURLY DAMMATAN;Mn;230;NSM;;;;;N;;;;; +08E9;ARABIC CURLY KASRATAN;Mn;220;NSM;;;;;N;;;;; +08EA;ARABIC TONE ONE DOT ABOVE;Mn;230;NSM;;;;;N;;;;; +08EB;ARABIC TONE TWO DOTS ABOVE;Mn;230;NSM;;;;;N;;;;; +08EC;ARABIC TONE LOOP ABOVE;Mn;230;NSM;;;;;N;;;;; +08ED;ARABIC TONE ONE DOT BELOW;Mn;220;NSM;;;;;N;;;;; +08EE;ARABIC TONE TWO DOTS BELOW;Mn;220;NSM;;;;;N;;;;; +08EF;ARABIC TONE LOOP BELOW;Mn;220;NSM;;;;;N;;;;; +08F0;ARABIC OPEN FATHATAN;Mn;27;NSM;;;;;N;;;;; +08F1;ARABIC OPEN DAMMATAN;Mn;28;NSM;;;;;N;;;;; +08F2;ARABIC OPEN KASRATAN;Mn;29;NSM;;;;;N;;;;; +08F3;ARABIC SMALL HIGH WAW;Mn;230;NSM;;;;;N;;;;; +08F4;ARABIC FATHA WITH RING;Mn;230;NSM;;;;;N;;;;; +08F5;ARABIC FATHA WITH DOT ABOVE;Mn;230;NSM;;;;;N;;;;; +08F6;ARABIC KASRA WITH DOT BELOW;Mn;220;NSM;;;;;N;;;;; +08F7;ARABIC LEFT ARROWHEAD ABOVE;Mn;230;NSM;;;;;N;;;;; +08F8;ARABIC RIGHT ARROWHEAD ABOVE;Mn;230;NSM;;;;;N;;;;; +08F9;ARABIC LEFT ARROWHEAD BELOW;Mn;220;NSM;;;;;N;;;;; +08FA;ARABIC RIGHT ARROWHEAD BELOW;Mn;220;NSM;;;;;N;;;;; +08FB;ARABIC DOUBLE RIGHT ARROWHEAD ABOVE;Mn;230;NSM;;;;;N;;;;; +08FC;ARABIC DOUBLE RIGHT ARROWHEAD ABOVE WITH DOT;Mn;230;NSM;;;;;N;;;;; +08FD;ARABIC RIGHT ARROWHEAD ABOVE WITH DOT;Mn;230;NSM;;;;;N;;;;; +08FE;ARABIC DAMMA WITH DOT;Mn;230;NSM;;;;;N;;;;; +08FF;ARABIC MARK SIDEWAYS NOON GHUNNA;Mn;230;NSM;;;;;N;;;;; +0900;DEVANAGARI SIGN INVERTED CANDRABINDU;Mn;0;NSM;;;;;N;;;;; +0901;DEVANAGARI SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;; +0902;DEVANAGARI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;; +0903;DEVANAGARI SIGN VISARGA;Mc;0;L;;;;;N;;;;; +0904;DEVANAGARI LETTER SHORT A;Lo;0;L;;;;;N;;;;; +0905;DEVANAGARI LETTER A;Lo;0;L;;;;;N;;;;; +0906;DEVANAGARI LETTER AA;Lo;0;L;;;;;N;;;;; +0907;DEVANAGARI LETTER I;Lo;0;L;;;;;N;;;;; +0908;DEVANAGARI LETTER II;Lo;0;L;;;;;N;;;;; +0909;DEVANAGARI LETTER U;Lo;0;L;;;;;N;;;;; +090A;DEVANAGARI LETTER UU;Lo;0;L;;;;;N;;;;; +090B;DEVANAGARI LETTER VOCALIC R;Lo;0;L;;;;;N;;;;; +090C;DEVANAGARI LETTER VOCALIC L;Lo;0;L;;;;;N;;;;; +090D;DEVANAGARI LETTER CANDRA E;Lo;0;L;;;;;N;;;;; +090E;DEVANAGARI LETTER SHORT E;Lo;0;L;;;;;N;;;;; +090F;DEVANAGARI LETTER E;Lo;0;L;;;;;N;;;;; +0910;DEVANAGARI LETTER AI;Lo;0;L;;;;;N;;;;; +0911;DEVANAGARI LETTER CANDRA O;Lo;0;L;;;;;N;;;;; +0912;DEVANAGARI LETTER SHORT O;Lo;0;L;;;;;N;;;;; +0913;DEVANAGARI LETTER O;Lo;0;L;;;;;N;;;;; +0914;DEVANAGARI LETTER AU;Lo;0;L;;;;;N;;;;; +0915;DEVANAGARI LETTER KA;Lo;0;L;;;;;N;;;;; +0916;DEVANAGARI LETTER KHA;Lo;0;L;;;;;N;;;;; +0917;DEVANAGARI LETTER GA;Lo;0;L;;;;;N;;;;; +0918;DEVANAGARI LETTER GHA;Lo;0;L;;;;;N;;;;; +0919;DEVANAGARI LETTER NGA;Lo;0;L;;;;;N;;;;; +091A;DEVANAGARI LETTER CA;Lo;0;L;;;;;N;;;;; +091B;DEVANAGARI LETTER CHA;Lo;0;L;;;;;N;;;;; +091C;DEVANAGARI LETTER JA;Lo;0;L;;;;;N;;;;; +091D;DEVANAGARI LETTER JHA;Lo;0;L;;;;;N;;;;; +091E;DEVANAGARI LETTER NYA;Lo;0;L;;;;;N;;;;; +091F;DEVANAGARI LETTER TTA;Lo;0;L;;;;;N;;;;; +0920;DEVANAGARI LETTER TTHA;Lo;0;L;;;;;N;;;;; +0921;DEVANAGARI LETTER DDA;Lo;0;L;;;;;N;;;;; +0922;DEVANAGARI LETTER DDHA;Lo;0;L;;;;;N;;;;; +0923;DEVANAGARI LETTER NNA;Lo;0;L;;;;;N;;;;; +0924;DEVANAGARI LETTER TA;Lo;0;L;;;;;N;;;;; +0925;DEVANAGARI LETTER THA;Lo;0;L;;;;;N;;;;; +0926;DEVANAGARI LETTER DA;Lo;0;L;;;;;N;;;;; +0927;DEVANAGARI LETTER DHA;Lo;0;L;;;;;N;;;;; +0928;DEVANAGARI LETTER NA;Lo;0;L;;;;;N;;;;; +0929;DEVANAGARI LETTER NNNA;Lo;0;L;0928 093C;;;;N;;;;; +092A;DEVANAGARI LETTER PA;Lo;0;L;;;;;N;;;;; +092B;DEVANAGARI LETTER PHA;Lo;0;L;;;;;N;;;;; +092C;DEVANAGARI LETTER BA;Lo;0;L;;;;;N;;;;; +092D;DEVANAGARI LETTER BHA;Lo;0;L;;;;;N;;;;; +092E;DEVANAGARI LETTER MA;Lo;0;L;;;;;N;;;;; +092F;DEVANAGARI LETTER YA;Lo;0;L;;;;;N;;;;; +0930;DEVANAGARI LETTER RA;Lo;0;L;;;;;N;;;;; +0931;DEVANAGARI LETTER RRA;Lo;0;L;0930 093C;;;;N;;;;; +0932;DEVANAGARI LETTER LA;Lo;0;L;;;;;N;;;;; +0933;DEVANAGARI LETTER LLA;Lo;0;L;;;;;N;;;;; +0934;DEVANAGARI LETTER LLLA;Lo;0;L;0933 093C;;;;N;;;;; +0935;DEVANAGARI LETTER VA;Lo;0;L;;;;;N;;;;; +0936;DEVANAGARI LETTER SHA;Lo;0;L;;;;;N;;;;; +0937;DEVANAGARI LETTER SSA;Lo;0;L;;;;;N;;;;; +0938;DEVANAGARI LETTER SA;Lo;0;L;;;;;N;;;;; +0939;DEVANAGARI LETTER HA;Lo;0;L;;;;;N;;;;; +093A;DEVANAGARI VOWEL SIGN OE;Mn;0;NSM;;;;;N;;;;; +093B;DEVANAGARI VOWEL SIGN OOE;Mc;0;L;;;;;N;;;;; +093C;DEVANAGARI SIGN NUKTA;Mn;7;NSM;;;;;N;;;;; +093D;DEVANAGARI SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;; +093E;DEVANAGARI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;; +093F;DEVANAGARI VOWEL SIGN I;Mc;0;L;;;;;N;;;;; +0940;DEVANAGARI VOWEL SIGN II;Mc;0;L;;;;;N;;;;; +0941;DEVANAGARI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;; +0942;DEVANAGARI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;; +0943;DEVANAGARI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;; +0944;DEVANAGARI VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;; +0945;DEVANAGARI VOWEL SIGN CANDRA E;Mn;0;NSM;;;;;N;;;;; +0946;DEVANAGARI VOWEL SIGN SHORT E;Mn;0;NSM;;;;;N;;;;; +0947;DEVANAGARI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;; +0948;DEVANAGARI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;; +0949;DEVANAGARI VOWEL SIGN CANDRA O;Mc;0;L;;;;;N;;;;; +094A;DEVANAGARI VOWEL SIGN SHORT O;Mc;0;L;;;;;N;;;;; +094B;DEVANAGARI VOWEL SIGN O;Mc;0;L;;;;;N;;;;; +094C;DEVANAGARI VOWEL SIGN AU;Mc;0;L;;;;;N;;;;; +094D;DEVANAGARI SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;; +094E;DEVANAGARI VOWEL SIGN PRISHTHAMATRA E;Mc;0;L;;;;;N;;;;; +094F;DEVANAGARI VOWEL SIGN AW;Mc;0;L;;;;;N;;;;; +0950;DEVANAGARI OM;Lo;0;L;;;;;N;;;;; +0951;DEVANAGARI STRESS SIGN UDATTA;Mn;230;NSM;;;;;N;;;;; +0952;DEVANAGARI STRESS SIGN ANUDATTA;Mn;220;NSM;;;;;N;;;;; +0953;DEVANAGARI GRAVE ACCENT;Mn;230;NSM;;;;;N;;;;; +0954;DEVANAGARI ACUTE ACCENT;Mn;230;NSM;;;;;N;;;;; +0955;DEVANAGARI VOWEL SIGN CANDRA LONG E;Mn;0;NSM;;;;;N;;;;; +0956;DEVANAGARI VOWEL SIGN UE;Mn;0;NSM;;;;;N;;;;; +0957;DEVANAGARI VOWEL SIGN UUE;Mn;0;NSM;;;;;N;;;;; +0958;DEVANAGARI LETTER QA;Lo;0;L;0915 093C;;;;N;;;;; +0959;DEVANAGARI LETTER KHHA;Lo;0;L;0916 093C;;;;N;;;;; +095A;DEVANAGARI LETTER GHHA;Lo;0;L;0917 093C;;;;N;;;;; +095B;DEVANAGARI LETTER ZA;Lo;0;L;091C 093C;;;;N;;;;; +095C;DEVANAGARI LETTER DDDHA;Lo;0;L;0921 093C;;;;N;;;;; +095D;DEVANAGARI LETTER RHA;Lo;0;L;0922 093C;;;;N;;;;; +095E;DEVANAGARI LETTER FA;Lo;0;L;092B 093C;;;;N;;;;; +095F;DEVANAGARI LETTER YYA;Lo;0;L;092F 093C;;;;N;;;;; +0960;DEVANAGARI LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;; +0961;DEVANAGARI LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;; +0962;DEVANAGARI VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;; +0963;DEVANAGARI VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;; +0964;DEVANAGARI DANDA;Po;0;L;;;;;N;;;;; +0965;DEVANAGARI DOUBLE DANDA;Po;0;L;;;;;N;;;;; +0966;DEVANAGARI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +0967;DEVANAGARI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +0968;DEVANAGARI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +0969;DEVANAGARI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +096A;DEVANAGARI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +096B;DEVANAGARI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +096C;DEVANAGARI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +096D;DEVANAGARI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +096E;DEVANAGARI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +096F;DEVANAGARI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +0970;DEVANAGARI ABBREVIATION SIGN;Po;0;L;;;;;N;;;;; +0971;DEVANAGARI SIGN HIGH SPACING DOT;Lm;0;L;;;;;N;;;;; +0972;DEVANAGARI LETTER CANDRA A;Lo;0;L;;;;;N;;;;; +0973;DEVANAGARI LETTER OE;Lo;0;L;;;;;N;;;;; +0974;DEVANAGARI LETTER OOE;Lo;0;L;;;;;N;;;;; +0975;DEVANAGARI LETTER AW;Lo;0;L;;;;;N;;;;; +0976;DEVANAGARI LETTER UE;Lo;0;L;;;;;N;;;;; +0977;DEVANAGARI LETTER UUE;Lo;0;L;;;;;N;;;;; +0978;DEVANAGARI LETTER MARWARI DDA;Lo;0;L;;;;;N;;;;; +0979;DEVANAGARI LETTER ZHA;Lo;0;L;;;;;N;;;;; +097A;DEVANAGARI LETTER HEAVY YA;Lo;0;L;;;;;N;;;;; +097B;DEVANAGARI LETTER GGA;Lo;0;L;;;;;N;;;;; +097C;DEVANAGARI LETTER JJA;Lo;0;L;;;;;N;;;;; +097D;DEVANAGARI LETTER GLOTTAL STOP;Lo;0;L;;;;;N;;;;; +097E;DEVANAGARI LETTER DDDA;Lo;0;L;;;;;N;;;;; +097F;DEVANAGARI LETTER BBA;Lo;0;L;;;;;N;;;;; +0980;BENGALI ANJI;Lo;0;L;;;;;N;;;;; +0981;BENGALI SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;; +0982;BENGALI SIGN ANUSVARA;Mc;0;L;;;;;N;;;;; +0983;BENGALI SIGN VISARGA;Mc;0;L;;;;;N;;;;; +0985;BENGALI LETTER A;Lo;0;L;;;;;N;;;;; +0986;BENGALI LETTER AA;Lo;0;L;;;;;N;;;;; +0987;BENGALI LETTER I;Lo;0;L;;;;;N;;;;; +0988;BENGALI LETTER II;Lo;0;L;;;;;N;;;;; +0989;BENGALI LETTER U;Lo;0;L;;;;;N;;;;; +098A;BENGALI LETTER UU;Lo;0;L;;;;;N;;;;; +098B;BENGALI LETTER VOCALIC R;Lo;0;L;;;;;N;;;;; +098C;BENGALI LETTER VOCALIC L;Lo;0;L;;;;;N;;;;; +098F;BENGALI LETTER E;Lo;0;L;;;;;N;;;;; +0990;BENGALI LETTER AI;Lo;0;L;;;;;N;;;;; +0993;BENGALI LETTER O;Lo;0;L;;;;;N;;;;; +0994;BENGALI LETTER AU;Lo;0;L;;;;;N;;;;; +0995;BENGALI LETTER KA;Lo;0;L;;;;;N;;;;; +0996;BENGALI LETTER KHA;Lo;0;L;;;;;N;;;;; +0997;BENGALI LETTER GA;Lo;0;L;;;;;N;;;;; +0998;BENGALI LETTER GHA;Lo;0;L;;;;;N;;;;; +0999;BENGALI LETTER NGA;Lo;0;L;;;;;N;;;;; +099A;BENGALI LETTER CA;Lo;0;L;;;;;N;;;;; +099B;BENGALI LETTER CHA;Lo;0;L;;;;;N;;;;; +099C;BENGALI LETTER JA;Lo;0;L;;;;;N;;;;; +099D;BENGALI LETTER JHA;Lo;0;L;;;;;N;;;;; +099E;BENGALI LETTER NYA;Lo;0;L;;;;;N;;;;; +099F;BENGALI LETTER TTA;Lo;0;L;;;;;N;;;;; +09A0;BENGALI LETTER TTHA;Lo;0;L;;;;;N;;;;; +09A1;BENGALI LETTER DDA;Lo;0;L;;;;;N;;;;; +09A2;BENGALI LETTER DDHA;Lo;0;L;;;;;N;;;;; +09A3;BENGALI LETTER NNA;Lo;0;L;;;;;N;;;;; +09A4;BENGALI LETTER TA;Lo;0;L;;;;;N;;;;; +09A5;BENGALI LETTER THA;Lo;0;L;;;;;N;;;;; +09A6;BENGALI LETTER DA;Lo;0;L;;;;;N;;;;; +09A7;BENGALI LETTER DHA;Lo;0;L;;;;;N;;;;; +09A8;BENGALI LETTER NA;Lo;0;L;;;;;N;;;;; +09AA;BENGALI LETTER PA;Lo;0;L;;;;;N;;;;; +09AB;BENGALI LETTER PHA;Lo;0;L;;;;;N;;;;; +09AC;BENGALI LETTER BA;Lo;0;L;;;;;N;;;;; +09AD;BENGALI LETTER BHA;Lo;0;L;;;;;N;;;;; +09AE;BENGALI LETTER MA;Lo;0;L;;;;;N;;;;; +09AF;BENGALI LETTER YA;Lo;0;L;;;;;N;;;;; +09B0;BENGALI LETTER RA;Lo;0;L;;;;;N;;;;; +09B2;BENGALI LETTER LA;Lo;0;L;;;;;N;;;;; +09B6;BENGALI LETTER SHA;Lo;0;L;;;;;N;;;;; +09B7;BENGALI LETTER SSA;Lo;0;L;;;;;N;;;;; +09B8;BENGALI LETTER SA;Lo;0;L;;;;;N;;;;; +09B9;BENGALI LETTER HA;Lo;0;L;;;;;N;;;;; +09BC;BENGALI SIGN NUKTA;Mn;7;NSM;;;;;N;;;;; +09BD;BENGALI SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;; +09BE;BENGALI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;; +09BF;BENGALI VOWEL SIGN I;Mc;0;L;;;;;N;;;;; +09C0;BENGALI VOWEL SIGN II;Mc;0;L;;;;;N;;;;; +09C1;BENGALI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;; +09C2;BENGALI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;; +09C3;BENGALI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;; +09C4;BENGALI VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;; +09C7;BENGALI VOWEL SIGN E;Mc;0;L;;;;;N;;;;; +09C8;BENGALI VOWEL SIGN AI;Mc;0;L;;;;;N;;;;; +09CB;BENGALI VOWEL SIGN O;Mc;0;L;09C7 09BE;;;;N;;;;; +09CC;BENGALI VOWEL SIGN AU;Mc;0;L;09C7 09D7;;;;N;;;;; +09CD;BENGALI SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;; +09CE;BENGALI LETTER KHANDA TA;Lo;0;L;;;;;N;;;;; +09D7;BENGALI AU LENGTH MARK;Mc;0;L;;;;;N;;;;; +09DC;BENGALI LETTER RRA;Lo;0;L;09A1 09BC;;;;N;;;;; +09DD;BENGALI LETTER RHA;Lo;0;L;09A2 09BC;;;;N;;;;; +09DF;BENGALI LETTER YYA;Lo;0;L;09AF 09BC;;;;N;;;;; +09E0;BENGALI LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;; +09E1;BENGALI LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;; +09E2;BENGALI VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;; +09E3;BENGALI VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;; +09E6;BENGALI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +09E7;BENGALI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +09E8;BENGALI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +09E9;BENGALI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +09EA;BENGALI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +09EB;BENGALI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +09EC;BENGALI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +09ED;BENGALI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +09EE;BENGALI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +09EF;BENGALI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +09F0;BENGALI LETTER RA WITH MIDDLE DIAGONAL;Lo;0;L;;;;;N;;;;; +09F1;BENGALI LETTER RA WITH LOWER DIAGONAL;Lo;0;L;;;;;N;BENGALI LETTER VA WITH LOWER DIAGONAL;;;; +09F2;BENGALI RUPEE MARK;Sc;0;ET;;;;;N;;;;; +09F3;BENGALI RUPEE SIGN;Sc;0;ET;;;;;N;;;;; +09F4;BENGALI CURRENCY NUMERATOR ONE;No;0;L;;;;1/16;N;;;;; +09F5;BENGALI CURRENCY NUMERATOR TWO;No;0;L;;;;1/8;N;;;;; +09F6;BENGALI CURRENCY NUMERATOR THREE;No;0;L;;;;3/16;N;;;;; +09F7;BENGALI CURRENCY NUMERATOR FOUR;No;0;L;;;;1/4;N;;;;; +09F8;BENGALI CURRENCY NUMERATOR ONE LESS THAN THE DENOMINATOR;No;0;L;;;;3/4;N;;;;; +09F9;BENGALI CURRENCY DENOMINATOR SIXTEEN;No;0;L;;;;16;N;;;;; +09FA;BENGALI ISSHAR;So;0;L;;;;;N;;;;; +09FB;BENGALI GANDA MARK;Sc;0;ET;;;;;N;;;;; +09FC;BENGALI LETTER VEDIC ANUSVARA;Lo;0;L;;;;;N;;;;; +09FD;BENGALI ABBREVIATION SIGN;Po;0;L;;;;;N;;;;; +09FE;BENGALI SANDHI MARK;Mn;230;NSM;;;;;N;;;;; +0A01;GURMUKHI SIGN ADAK BINDI;Mn;0;NSM;;;;;N;;;;; +0A02;GURMUKHI SIGN BINDI;Mn;0;NSM;;;;;N;;;;; +0A03;GURMUKHI SIGN VISARGA;Mc;0;L;;;;;N;;;;; +0A05;GURMUKHI LETTER A;Lo;0;L;;;;;N;;;;; +0A06;GURMUKHI LETTER AA;Lo;0;L;;;;;N;;;;; +0A07;GURMUKHI LETTER I;Lo;0;L;;;;;N;;;;; +0A08;GURMUKHI LETTER II;Lo;0;L;;;;;N;;;;; +0A09;GURMUKHI LETTER U;Lo;0;L;;;;;N;;;;; +0A0A;GURMUKHI LETTER UU;Lo;0;L;;;;;N;;;;; +0A0F;GURMUKHI LETTER EE;Lo;0;L;;;;;N;;;;; +0A10;GURMUKHI LETTER AI;Lo;0;L;;;;;N;;;;; +0A13;GURMUKHI LETTER OO;Lo;0;L;;;;;N;;;;; +0A14;GURMUKHI LETTER AU;Lo;0;L;;;;;N;;;;; +0A15;GURMUKHI LETTER KA;Lo;0;L;;;;;N;;;;; +0A16;GURMUKHI LETTER KHA;Lo;0;L;;;;;N;;;;; +0A17;GURMUKHI LETTER GA;Lo;0;L;;;;;N;;;;; +0A18;GURMUKHI LETTER GHA;Lo;0;L;;;;;N;;;;; +0A19;GURMUKHI LETTER NGA;Lo;0;L;;;;;N;;;;; +0A1A;GURMUKHI LETTER CA;Lo;0;L;;;;;N;;;;; +0A1B;GURMUKHI LETTER CHA;Lo;0;L;;;;;N;;;;; +0A1C;GURMUKHI LETTER JA;Lo;0;L;;;;;N;;;;; +0A1D;GURMUKHI LETTER JHA;Lo;0;L;;;;;N;;;;; +0A1E;GURMUKHI LETTER NYA;Lo;0;L;;;;;N;;;;; +0A1F;GURMUKHI LETTER TTA;Lo;0;L;;;;;N;;;;; +0A20;GURMUKHI LETTER TTHA;Lo;0;L;;;;;N;;;;; +0A21;GURMUKHI LETTER DDA;Lo;0;L;;;;;N;;;;; +0A22;GURMUKHI LETTER DDHA;Lo;0;L;;;;;N;;;;; +0A23;GURMUKHI LETTER NNA;Lo;0;L;;;;;N;;;;; +0A24;GURMUKHI LETTER TA;Lo;0;L;;;;;N;;;;; +0A25;GURMUKHI LETTER THA;Lo;0;L;;;;;N;;;;; +0A26;GURMUKHI LETTER DA;Lo;0;L;;;;;N;;;;; +0A27;GURMUKHI LETTER DHA;Lo;0;L;;;;;N;;;;; +0A28;GURMUKHI LETTER NA;Lo;0;L;;;;;N;;;;; +0A2A;GURMUKHI LETTER PA;Lo;0;L;;;;;N;;;;; +0A2B;GURMUKHI LETTER PHA;Lo;0;L;;;;;N;;;;; +0A2C;GURMUKHI LETTER BA;Lo;0;L;;;;;N;;;;; +0A2D;GURMUKHI LETTER BHA;Lo;0;L;;;;;N;;;;; +0A2E;GURMUKHI LETTER MA;Lo;0;L;;;;;N;;;;; +0A2F;GURMUKHI LETTER YA;Lo;0;L;;;;;N;;;;; +0A30;GURMUKHI LETTER RA;Lo;0;L;;;;;N;;;;; +0A32;GURMUKHI LETTER LA;Lo;0;L;;;;;N;;;;; +0A33;GURMUKHI LETTER LLA;Lo;0;L;0A32 0A3C;;;;N;;;;; +0A35;GURMUKHI LETTER VA;Lo;0;L;;;;;N;;;;; +0A36;GURMUKHI LETTER SHA;Lo;0;L;0A38 0A3C;;;;N;;;;; +0A38;GURMUKHI LETTER SA;Lo;0;L;;;;;N;;;;; +0A39;GURMUKHI LETTER HA;Lo;0;L;;;;;N;;;;; +0A3C;GURMUKHI SIGN NUKTA;Mn;7;NSM;;;;;N;;;;; +0A3E;GURMUKHI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;; +0A3F;GURMUKHI VOWEL SIGN I;Mc;0;L;;;;;N;;;;; +0A40;GURMUKHI VOWEL SIGN II;Mc;0;L;;;;;N;;;;; +0A41;GURMUKHI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;; +0A42;GURMUKHI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;; +0A47;GURMUKHI VOWEL SIGN EE;Mn;0;NSM;;;;;N;;;;; +0A48;GURMUKHI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;; +0A4B;GURMUKHI VOWEL SIGN OO;Mn;0;NSM;;;;;N;;;;; +0A4C;GURMUKHI VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;; +0A4D;GURMUKHI SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;; +0A51;GURMUKHI SIGN UDAAT;Mn;0;NSM;;;;;N;;;;; +0A59;GURMUKHI LETTER KHHA;Lo;0;L;0A16 0A3C;;;;N;;;;; +0A5A;GURMUKHI LETTER GHHA;Lo;0;L;0A17 0A3C;;;;N;;;;; +0A5B;GURMUKHI LETTER ZA;Lo;0;L;0A1C 0A3C;;;;N;;;;; +0A5C;GURMUKHI LETTER RRA;Lo;0;L;;;;;N;;;;; +0A5E;GURMUKHI LETTER FA;Lo;0;L;0A2B 0A3C;;;;N;;;;; +0A66;GURMUKHI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +0A67;GURMUKHI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +0A68;GURMUKHI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +0A69;GURMUKHI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +0A6A;GURMUKHI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +0A6B;GURMUKHI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +0A6C;GURMUKHI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +0A6D;GURMUKHI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +0A6E;GURMUKHI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +0A6F;GURMUKHI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +0A70;GURMUKHI TIPPI;Mn;0;NSM;;;;;N;;;;; +0A71;GURMUKHI ADDAK;Mn;0;NSM;;;;;N;;;;; +0A72;GURMUKHI IRI;Lo;0;L;;;;;N;;;;; +0A73;GURMUKHI URA;Lo;0;L;;;;;N;;;;; +0A74;GURMUKHI EK ONKAR;Lo;0;L;;;;;N;;;;; +0A75;GURMUKHI SIGN YAKASH;Mn;0;NSM;;;;;N;;;;; +0A76;GURMUKHI ABBREVIATION SIGN;Po;0;L;;;;;N;;;;; +0A81;GUJARATI SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;; +0A82;GUJARATI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;; +0A83;GUJARATI SIGN VISARGA;Mc;0;L;;;;;N;;;;; +0A85;GUJARATI LETTER A;Lo;0;L;;;;;N;;;;; +0A86;GUJARATI LETTER AA;Lo;0;L;;;;;N;;;;; +0A87;GUJARATI LETTER I;Lo;0;L;;;;;N;;;;; +0A88;GUJARATI LETTER II;Lo;0;L;;;;;N;;;;; +0A89;GUJARATI LETTER U;Lo;0;L;;;;;N;;;;; +0A8A;GUJARATI LETTER UU;Lo;0;L;;;;;N;;;;; +0A8B;GUJARATI LETTER VOCALIC R;Lo;0;L;;;;;N;;;;; +0A8C;GUJARATI LETTER VOCALIC L;Lo;0;L;;;;;N;;;;; +0A8D;GUJARATI VOWEL CANDRA E;Lo;0;L;;;;;N;;;;; +0A8F;GUJARATI LETTER E;Lo;0;L;;;;;N;;;;; +0A90;GUJARATI LETTER AI;Lo;0;L;;;;;N;;;;; +0A91;GUJARATI VOWEL CANDRA O;Lo;0;L;;;;;N;;;;; +0A93;GUJARATI LETTER O;Lo;0;L;;;;;N;;;;; +0A94;GUJARATI LETTER AU;Lo;0;L;;;;;N;;;;; +0A95;GUJARATI LETTER KA;Lo;0;L;;;;;N;;;;; +0A96;GUJARATI LETTER KHA;Lo;0;L;;;;;N;;;;; +0A97;GUJARATI LETTER GA;Lo;0;L;;;;;N;;;;; +0A98;GUJARATI LETTER GHA;Lo;0;L;;;;;N;;;;; +0A99;GUJARATI LETTER NGA;Lo;0;L;;;;;N;;;;; +0A9A;GUJARATI LETTER CA;Lo;0;L;;;;;N;;;;; +0A9B;GUJARATI LETTER CHA;Lo;0;L;;;;;N;;;;; +0A9C;GUJARATI LETTER JA;Lo;0;L;;;;;N;;;;; +0A9D;GUJARATI LETTER JHA;Lo;0;L;;;;;N;;;;; +0A9E;GUJARATI LETTER NYA;Lo;0;L;;;;;N;;;;; +0A9F;GUJARATI LETTER TTA;Lo;0;L;;;;;N;;;;; +0AA0;GUJARATI LETTER TTHA;Lo;0;L;;;;;N;;;;; +0AA1;GUJARATI LETTER DDA;Lo;0;L;;;;;N;;;;; +0AA2;GUJARATI LETTER DDHA;Lo;0;L;;;;;N;;;;; +0AA3;GUJARATI LETTER NNA;Lo;0;L;;;;;N;;;;; +0AA4;GUJARATI LETTER TA;Lo;0;L;;;;;N;;;;; +0AA5;GUJARATI LETTER THA;Lo;0;L;;;;;N;;;;; +0AA6;GUJARATI LETTER DA;Lo;0;L;;;;;N;;;;; +0AA7;GUJARATI LETTER DHA;Lo;0;L;;;;;N;;;;; +0AA8;GUJARATI LETTER NA;Lo;0;L;;;;;N;;;;; +0AAA;GUJARATI LETTER PA;Lo;0;L;;;;;N;;;;; +0AAB;GUJARATI LETTER PHA;Lo;0;L;;;;;N;;;;; +0AAC;GUJARATI LETTER BA;Lo;0;L;;;;;N;;;;; +0AAD;GUJARATI LETTER BHA;Lo;0;L;;;;;N;;;;; +0AAE;GUJARATI LETTER MA;Lo;0;L;;;;;N;;;;; +0AAF;GUJARATI LETTER YA;Lo;0;L;;;;;N;;;;; +0AB0;GUJARATI LETTER RA;Lo;0;L;;;;;N;;;;; +0AB2;GUJARATI LETTER LA;Lo;0;L;;;;;N;;;;; +0AB3;GUJARATI LETTER LLA;Lo;0;L;;;;;N;;;;; +0AB5;GUJARATI LETTER VA;Lo;0;L;;;;;N;;;;; +0AB6;GUJARATI LETTER SHA;Lo;0;L;;;;;N;;;;; +0AB7;GUJARATI LETTER SSA;Lo;0;L;;;;;N;;;;; +0AB8;GUJARATI LETTER SA;Lo;0;L;;;;;N;;;;; +0AB9;GUJARATI LETTER HA;Lo;0;L;;;;;N;;;;; +0ABC;GUJARATI SIGN NUKTA;Mn;7;NSM;;;;;N;;;;; +0ABD;GUJARATI SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;; +0ABE;GUJARATI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;; +0ABF;GUJARATI VOWEL SIGN I;Mc;0;L;;;;;N;;;;; +0AC0;GUJARATI VOWEL SIGN II;Mc;0;L;;;;;N;;;;; +0AC1;GUJARATI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;; +0AC2;GUJARATI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;; +0AC3;GUJARATI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;; +0AC4;GUJARATI VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;; +0AC5;GUJARATI VOWEL SIGN CANDRA E;Mn;0;NSM;;;;;N;;;;; +0AC7;GUJARATI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;; +0AC8;GUJARATI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;; +0AC9;GUJARATI VOWEL SIGN CANDRA O;Mc;0;L;;;;;N;;;;; +0ACB;GUJARATI VOWEL SIGN O;Mc;0;L;;;;;N;;;;; +0ACC;GUJARATI VOWEL SIGN AU;Mc;0;L;;;;;N;;;;; +0ACD;GUJARATI SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;; +0AD0;GUJARATI OM;Lo;0;L;;;;;N;;;;; +0AE0;GUJARATI LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;; +0AE1;GUJARATI LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;; +0AE2;GUJARATI VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;; +0AE3;GUJARATI VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;; +0AE6;GUJARATI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +0AE7;GUJARATI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +0AE8;GUJARATI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +0AE9;GUJARATI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +0AEA;GUJARATI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +0AEB;GUJARATI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +0AEC;GUJARATI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +0AED;GUJARATI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +0AEE;GUJARATI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +0AEF;GUJARATI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +0AF0;GUJARATI ABBREVIATION SIGN;Po;0;L;;;;;N;;;;; +0AF1;GUJARATI RUPEE SIGN;Sc;0;ET;;;;;N;;;;; +0AF9;GUJARATI LETTER ZHA;Lo;0;L;;;;;N;;;;; +0AFA;GUJARATI SIGN SUKUN;Mn;0;NSM;;;;;N;;;;; +0AFB;GUJARATI SIGN SHADDA;Mn;0;NSM;;;;;N;;;;; +0AFC;GUJARATI SIGN MADDAH;Mn;0;NSM;;;;;N;;;;; +0AFD;GUJARATI SIGN THREE-DOT NUKTA ABOVE;Mn;0;NSM;;;;;N;;;;; +0AFE;GUJARATI SIGN CIRCLE NUKTA ABOVE;Mn;0;NSM;;;;;N;;;;; +0AFF;GUJARATI SIGN TWO-CIRCLE NUKTA ABOVE;Mn;0;NSM;;;;;N;;;;; +0B01;ORIYA SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;; +0B02;ORIYA SIGN ANUSVARA;Mc;0;L;;;;;N;;;;; +0B03;ORIYA SIGN VISARGA;Mc;0;L;;;;;N;;;;; +0B05;ORIYA LETTER A;Lo;0;L;;;;;N;;;;; +0B06;ORIYA LETTER AA;Lo;0;L;;;;;N;;;;; +0B07;ORIYA LETTER I;Lo;0;L;;;;;N;;;;; +0B08;ORIYA LETTER II;Lo;0;L;;;;;N;;;;; +0B09;ORIYA LETTER U;Lo;0;L;;;;;N;;;;; +0B0A;ORIYA LETTER UU;Lo;0;L;;;;;N;;;;; +0B0B;ORIYA LETTER VOCALIC R;Lo;0;L;;;;;N;;;;; +0B0C;ORIYA LETTER VOCALIC L;Lo;0;L;;;;;N;;;;; +0B0F;ORIYA LETTER E;Lo;0;L;;;;;N;;;;; +0B10;ORIYA LETTER AI;Lo;0;L;;;;;N;;;;; +0B13;ORIYA LETTER O;Lo;0;L;;;;;N;;;;; +0B14;ORIYA LETTER AU;Lo;0;L;;;;;N;;;;; +0B15;ORIYA LETTER KA;Lo;0;L;;;;;N;;;;; +0B16;ORIYA LETTER KHA;Lo;0;L;;;;;N;;;;; +0B17;ORIYA LETTER GA;Lo;0;L;;;;;N;;;;; +0B18;ORIYA LETTER GHA;Lo;0;L;;;;;N;;;;; +0B19;ORIYA LETTER NGA;Lo;0;L;;;;;N;;;;; +0B1A;ORIYA LETTER CA;Lo;0;L;;;;;N;;;;; +0B1B;ORIYA LETTER CHA;Lo;0;L;;;;;N;;;;; +0B1C;ORIYA LETTER JA;Lo;0;L;;;;;N;;;;; +0B1D;ORIYA LETTER JHA;Lo;0;L;;;;;N;;;;; +0B1E;ORIYA LETTER NYA;Lo;0;L;;;;;N;;;;; +0B1F;ORIYA LETTER TTA;Lo;0;L;;;;;N;;;;; +0B20;ORIYA LETTER TTHA;Lo;0;L;;;;;N;;;;; +0B21;ORIYA LETTER DDA;Lo;0;L;;;;;N;;;;; +0B22;ORIYA LETTER DDHA;Lo;0;L;;;;;N;;;;; +0B23;ORIYA LETTER NNA;Lo;0;L;;;;;N;;;;; +0B24;ORIYA LETTER TA;Lo;0;L;;;;;N;;;;; +0B25;ORIYA LETTER THA;Lo;0;L;;;;;N;;;;; +0B26;ORIYA LETTER DA;Lo;0;L;;;;;N;;;;; +0B27;ORIYA LETTER DHA;Lo;0;L;;;;;N;;;;; +0B28;ORIYA LETTER NA;Lo;0;L;;;;;N;;;;; +0B2A;ORIYA LETTER PA;Lo;0;L;;;;;N;;;;; +0B2B;ORIYA LETTER PHA;Lo;0;L;;;;;N;;;;; +0B2C;ORIYA LETTER BA;Lo;0;L;;;;;N;;;;; +0B2D;ORIYA LETTER BHA;Lo;0;L;;;;;N;;;;; +0B2E;ORIYA LETTER MA;Lo;0;L;;;;;N;;;;; +0B2F;ORIYA LETTER YA;Lo;0;L;;;;;N;;;;; +0B30;ORIYA LETTER RA;Lo;0;L;;;;;N;;;;; +0B32;ORIYA LETTER LA;Lo;0;L;;;;;N;;;;; +0B33;ORIYA LETTER LLA;Lo;0;L;;;;;N;;;;; +0B35;ORIYA LETTER VA;Lo;0;L;;;;;N;;;;; +0B36;ORIYA LETTER SHA;Lo;0;L;;;;;N;;;;; +0B37;ORIYA LETTER SSA;Lo;0;L;;;;;N;;;;; +0B38;ORIYA LETTER SA;Lo;0;L;;;;;N;;;;; +0B39;ORIYA LETTER HA;Lo;0;L;;;;;N;;;;; +0B3C;ORIYA SIGN NUKTA;Mn;7;NSM;;;;;N;;;;; +0B3D;ORIYA SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;; +0B3E;ORIYA VOWEL SIGN AA;Mc;0;L;;;;;N;;;;; +0B3F;ORIYA VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;; +0B40;ORIYA VOWEL SIGN II;Mc;0;L;;;;;N;;;;; +0B41;ORIYA VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;; +0B42;ORIYA VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;; +0B43;ORIYA VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;; +0B44;ORIYA VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;; +0B47;ORIYA VOWEL SIGN E;Mc;0;L;;;;;N;;;;; +0B48;ORIYA VOWEL SIGN AI;Mc;0;L;0B47 0B56;;;;N;;;;; +0B4B;ORIYA VOWEL SIGN O;Mc;0;L;0B47 0B3E;;;;N;;;;; +0B4C;ORIYA VOWEL SIGN AU;Mc;0;L;0B47 0B57;;;;N;;;;; +0B4D;ORIYA SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;; +0B55;ORIYA SIGN OVERLINE;Mn;0;NSM;;;;;N;;;;; +0B56;ORIYA AI LENGTH MARK;Mn;0;NSM;;;;;N;;;;; +0B57;ORIYA AU LENGTH MARK;Mc;0;L;;;;;N;;;;; +0B5C;ORIYA LETTER RRA;Lo;0;L;0B21 0B3C;;;;N;;;;; +0B5D;ORIYA LETTER RHA;Lo;0;L;0B22 0B3C;;;;N;;;;; +0B5F;ORIYA LETTER YYA;Lo;0;L;;;;;N;;;;; +0B60;ORIYA LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;; +0B61;ORIYA LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;; +0B62;ORIYA VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;; +0B63;ORIYA VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;; +0B66;ORIYA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +0B67;ORIYA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +0B68;ORIYA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +0B69;ORIYA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +0B6A;ORIYA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +0B6B;ORIYA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +0B6C;ORIYA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +0B6D;ORIYA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +0B6E;ORIYA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +0B6F;ORIYA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +0B70;ORIYA ISSHAR;So;0;L;;;;;N;;;;; +0B71;ORIYA LETTER WA;Lo;0;L;;;;;N;;;;; +0B72;ORIYA FRACTION ONE QUARTER;No;0;L;;;;1/4;N;;;;; +0B73;ORIYA FRACTION ONE HALF;No;0;L;;;;1/2;N;;;;; +0B74;ORIYA FRACTION THREE QUARTERS;No;0;L;;;;3/4;N;;;;; +0B75;ORIYA FRACTION ONE SIXTEENTH;No;0;L;;;;1/16;N;;;;; +0B76;ORIYA FRACTION ONE EIGHTH;No;0;L;;;;1/8;N;;;;; +0B77;ORIYA FRACTION THREE SIXTEENTHS;No;0;L;;;;3/16;N;;;;; +0B82;TAMIL SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;; +0B83;TAMIL SIGN VISARGA;Lo;0;L;;;;;N;;;;; +0B85;TAMIL LETTER A;Lo;0;L;;;;;N;;;;; +0B86;TAMIL LETTER AA;Lo;0;L;;;;;N;;;;; +0B87;TAMIL LETTER I;Lo;0;L;;;;;N;;;;; +0B88;TAMIL LETTER II;Lo;0;L;;;;;N;;;;; +0B89;TAMIL LETTER U;Lo;0;L;;;;;N;;;;; +0B8A;TAMIL LETTER UU;Lo;0;L;;;;;N;;;;; +0B8E;TAMIL LETTER E;Lo;0;L;;;;;N;;;;; +0B8F;TAMIL LETTER EE;Lo;0;L;;;;;N;;;;; +0B90;TAMIL LETTER AI;Lo;0;L;;;;;N;;;;; +0B92;TAMIL LETTER O;Lo;0;L;;;;;N;;;;; +0B93;TAMIL LETTER OO;Lo;0;L;;;;;N;;;;; +0B94;TAMIL LETTER AU;Lo;0;L;0B92 0BD7;;;;N;;;;; +0B95;TAMIL LETTER KA;Lo;0;L;;;;;N;;;;; +0B99;TAMIL LETTER NGA;Lo;0;L;;;;;N;;;;; +0B9A;TAMIL LETTER CA;Lo;0;L;;;;;N;;;;; +0B9C;TAMIL LETTER JA;Lo;0;L;;;;;N;;;;; +0B9E;TAMIL LETTER NYA;Lo;0;L;;;;;N;;;;; +0B9F;TAMIL LETTER TTA;Lo;0;L;;;;;N;;;;; +0BA3;TAMIL LETTER NNA;Lo;0;L;;;;;N;;;;; +0BA4;TAMIL LETTER TA;Lo;0;L;;;;;N;;;;; +0BA8;TAMIL LETTER NA;Lo;0;L;;;;;N;;;;; +0BA9;TAMIL LETTER NNNA;Lo;0;L;;;;;N;;;;; +0BAA;TAMIL LETTER PA;Lo;0;L;;;;;N;;;;; +0BAE;TAMIL LETTER MA;Lo;0;L;;;;;N;;;;; +0BAF;TAMIL LETTER YA;Lo;0;L;;;;;N;;;;; +0BB0;TAMIL LETTER RA;Lo;0;L;;;;;N;;;;; +0BB1;TAMIL LETTER RRA;Lo;0;L;;;;;N;;;;; +0BB2;TAMIL LETTER LA;Lo;0;L;;;;;N;;;;; +0BB3;TAMIL LETTER LLA;Lo;0;L;;;;;N;;;;; +0BB4;TAMIL LETTER LLLA;Lo;0;L;;;;;N;;;;; +0BB5;TAMIL LETTER VA;Lo;0;L;;;;;N;;;;; +0BB6;TAMIL LETTER SHA;Lo;0;L;;;;;N;;;;; +0BB7;TAMIL LETTER SSA;Lo;0;L;;;;;N;;;;; +0BB8;TAMIL LETTER SA;Lo;0;L;;;;;N;;;;; +0BB9;TAMIL LETTER HA;Lo;0;L;;;;;N;;;;; +0BBE;TAMIL VOWEL SIGN AA;Mc;0;L;;;;;N;;;;; +0BBF;TAMIL VOWEL SIGN I;Mc;0;L;;;;;N;;;;; +0BC0;TAMIL VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;; +0BC1;TAMIL VOWEL SIGN U;Mc;0;L;;;;;N;;;;; +0BC2;TAMIL VOWEL SIGN UU;Mc;0;L;;;;;N;;;;; +0BC6;TAMIL VOWEL SIGN E;Mc;0;L;;;;;N;;;;; +0BC7;TAMIL VOWEL SIGN EE;Mc;0;L;;;;;N;;;;; +0BC8;TAMIL VOWEL SIGN AI;Mc;0;L;;;;;N;;;;; +0BCA;TAMIL VOWEL SIGN O;Mc;0;L;0BC6 0BBE;;;;N;;;;; +0BCB;TAMIL VOWEL SIGN OO;Mc;0;L;0BC7 0BBE;;;;N;;;;; +0BCC;TAMIL VOWEL SIGN AU;Mc;0;L;0BC6 0BD7;;;;N;;;;; +0BCD;TAMIL SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;; +0BD0;TAMIL OM;Lo;0;L;;;;;N;;;;; +0BD7;TAMIL AU LENGTH MARK;Mc;0;L;;;;;N;;;;; +0BE6;TAMIL DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +0BE7;TAMIL DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +0BE8;TAMIL DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +0BE9;TAMIL DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +0BEA;TAMIL DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +0BEB;TAMIL DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +0BEC;TAMIL DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +0BED;TAMIL DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +0BEE;TAMIL DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +0BEF;TAMIL DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +0BF0;TAMIL NUMBER TEN;No;0;L;;;;10;N;;;;; +0BF1;TAMIL NUMBER ONE HUNDRED;No;0;L;;;;100;N;;;;; +0BF2;TAMIL NUMBER ONE THOUSAND;No;0;L;;;;1000;N;;;;; +0BF3;TAMIL DAY SIGN;So;0;ON;;;;;N;;;;; +0BF4;TAMIL MONTH SIGN;So;0;ON;;;;;N;;;;; +0BF5;TAMIL YEAR SIGN;So;0;ON;;;;;N;;;;; +0BF6;TAMIL DEBIT SIGN;So;0;ON;;;;;N;;;;; +0BF7;TAMIL CREDIT SIGN;So;0;ON;;;;;N;;;;; +0BF8;TAMIL AS ABOVE SIGN;So;0;ON;;;;;N;;;;; +0BF9;TAMIL RUPEE SIGN;Sc;0;ET;;;;;N;;;;; +0BFA;TAMIL NUMBER SIGN;So;0;ON;;;;;N;;;;; +0C00;TELUGU SIGN COMBINING CANDRABINDU ABOVE;Mn;0;NSM;;;;;N;;;;; +0C01;TELUGU SIGN CANDRABINDU;Mc;0;L;;;;;N;;;;; +0C02;TELUGU SIGN ANUSVARA;Mc;0;L;;;;;N;;;;; +0C03;TELUGU SIGN VISARGA;Mc;0;L;;;;;N;;;;; +0C04;TELUGU SIGN COMBINING ANUSVARA ABOVE;Mn;0;NSM;;;;;N;;;;; +0C05;TELUGU LETTER A;Lo;0;L;;;;;N;;;;; +0C06;TELUGU LETTER AA;Lo;0;L;;;;;N;;;;; +0C07;TELUGU LETTER I;Lo;0;L;;;;;N;;;;; +0C08;TELUGU LETTER II;Lo;0;L;;;;;N;;;;; +0C09;TELUGU LETTER U;Lo;0;L;;;;;N;;;;; +0C0A;TELUGU LETTER UU;Lo;0;L;;;;;N;;;;; +0C0B;TELUGU LETTER VOCALIC R;Lo;0;L;;;;;N;;;;; +0C0C;TELUGU LETTER VOCALIC L;Lo;0;L;;;;;N;;;;; +0C0E;TELUGU LETTER E;Lo;0;L;;;;;N;;;;; +0C0F;TELUGU LETTER EE;Lo;0;L;;;;;N;;;;; +0C10;TELUGU LETTER AI;Lo;0;L;;;;;N;;;;; +0C12;TELUGU LETTER O;Lo;0;L;;;;;N;;;;; +0C13;TELUGU LETTER OO;Lo;0;L;;;;;N;;;;; +0C14;TELUGU LETTER AU;Lo;0;L;;;;;N;;;;; +0C15;TELUGU LETTER KA;Lo;0;L;;;;;N;;;;; +0C16;TELUGU LETTER KHA;Lo;0;L;;;;;N;;;;; +0C17;TELUGU LETTER GA;Lo;0;L;;;;;N;;;;; +0C18;TELUGU LETTER GHA;Lo;0;L;;;;;N;;;;; +0C19;TELUGU LETTER NGA;Lo;0;L;;;;;N;;;;; +0C1A;TELUGU LETTER CA;Lo;0;L;;;;;N;;;;; +0C1B;TELUGU LETTER CHA;Lo;0;L;;;;;N;;;;; +0C1C;TELUGU LETTER JA;Lo;0;L;;;;;N;;;;; +0C1D;TELUGU LETTER JHA;Lo;0;L;;;;;N;;;;; +0C1E;TELUGU LETTER NYA;Lo;0;L;;;;;N;;;;; +0C1F;TELUGU LETTER TTA;Lo;0;L;;;;;N;;;;; +0C20;TELUGU LETTER TTHA;Lo;0;L;;;;;N;;;;; +0C21;TELUGU LETTER DDA;Lo;0;L;;;;;N;;;;; +0C22;TELUGU LETTER DDHA;Lo;0;L;;;;;N;;;;; +0C23;TELUGU LETTER NNA;Lo;0;L;;;;;N;;;;; +0C24;TELUGU LETTER TA;Lo;0;L;;;;;N;;;;; +0C25;TELUGU LETTER THA;Lo;0;L;;;;;N;;;;; +0C26;TELUGU LETTER DA;Lo;0;L;;;;;N;;;;; +0C27;TELUGU LETTER DHA;Lo;0;L;;;;;N;;;;; +0C28;TELUGU LETTER NA;Lo;0;L;;;;;N;;;;; +0C2A;TELUGU LETTER PA;Lo;0;L;;;;;N;;;;; +0C2B;TELUGU LETTER PHA;Lo;0;L;;;;;N;;;;; +0C2C;TELUGU LETTER BA;Lo;0;L;;;;;N;;;;; +0C2D;TELUGU LETTER BHA;Lo;0;L;;;;;N;;;;; +0C2E;TELUGU LETTER MA;Lo;0;L;;;;;N;;;;; +0C2F;TELUGU LETTER YA;Lo;0;L;;;;;N;;;;; +0C30;TELUGU LETTER RA;Lo;0;L;;;;;N;;;;; +0C31;TELUGU LETTER RRA;Lo;0;L;;;;;N;;;;; +0C32;TELUGU LETTER LA;Lo;0;L;;;;;N;;;;; +0C33;TELUGU LETTER LLA;Lo;0;L;;;;;N;;;;; +0C34;TELUGU LETTER LLLA;Lo;0;L;;;;;N;;;;; +0C35;TELUGU LETTER VA;Lo;0;L;;;;;N;;;;; +0C36;TELUGU LETTER SHA;Lo;0;L;;;;;N;;;;; +0C37;TELUGU LETTER SSA;Lo;0;L;;;;;N;;;;; +0C38;TELUGU LETTER SA;Lo;0;L;;;;;N;;;;; +0C39;TELUGU LETTER HA;Lo;0;L;;;;;N;;;;; +0C3C;TELUGU SIGN NUKTA;Mn;7;NSM;;;;;N;;;;; +0C3D;TELUGU SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;; +0C3E;TELUGU VOWEL SIGN AA;Mn;0;NSM;;;;;N;;;;; +0C3F;TELUGU VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;; +0C40;TELUGU VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;; +0C41;TELUGU VOWEL SIGN U;Mc;0;L;;;;;N;;;;; +0C42;TELUGU VOWEL SIGN UU;Mc;0;L;;;;;N;;;;; +0C43;TELUGU VOWEL SIGN VOCALIC R;Mc;0;L;;;;;N;;;;; +0C44;TELUGU VOWEL SIGN VOCALIC RR;Mc;0;L;;;;;N;;;;; +0C46;TELUGU VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;; +0C47;TELUGU VOWEL SIGN EE;Mn;0;NSM;;;;;N;;;;; +0C48;TELUGU VOWEL SIGN AI;Mn;0;NSM;0C46 0C56;;;;N;;;;; +0C4A;TELUGU VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;; +0C4B;TELUGU VOWEL SIGN OO;Mn;0;NSM;;;;;N;;;;; +0C4C;TELUGU VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;; +0C4D;TELUGU SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;; +0C55;TELUGU LENGTH MARK;Mn;84;NSM;;;;;N;;;;; +0C56;TELUGU AI LENGTH MARK;Mn;91;NSM;;;;;N;;;;; +0C58;TELUGU LETTER TSA;Lo;0;L;;;;;N;;;;; +0C59;TELUGU LETTER DZA;Lo;0;L;;;;;N;;;;; +0C5A;TELUGU LETTER RRRA;Lo;0;L;;;;;N;;;;; +0C5C;TELUGU ARCHAIC SHRII;Lo;0;L;;;;;N;;;;; +0C5D;TELUGU LETTER NAKAARA POLLU;Lo;0;L;;;;;N;;;;; +0C60;TELUGU LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;; +0C61;TELUGU LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;; +0C62;TELUGU VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;; +0C63;TELUGU VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;; +0C66;TELUGU DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +0C67;TELUGU DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +0C68;TELUGU DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +0C69;TELUGU DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +0C6A;TELUGU DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +0C6B;TELUGU DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +0C6C;TELUGU DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +0C6D;TELUGU DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +0C6E;TELUGU DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +0C6F;TELUGU DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +0C77;TELUGU SIGN SIDDHAM;Po;0;L;;;;;N;;;;; +0C78;TELUGU FRACTION DIGIT ZERO FOR ODD POWERS OF FOUR;No;0;ON;;;;0;N;;;;; +0C79;TELUGU FRACTION DIGIT ONE FOR ODD POWERS OF FOUR;No;0;ON;;;;1;N;;;;; +0C7A;TELUGU FRACTION DIGIT TWO FOR ODD POWERS OF FOUR;No;0;ON;;;;2;N;;;;; +0C7B;TELUGU FRACTION DIGIT THREE FOR ODD POWERS OF FOUR;No;0;ON;;;;3;N;;;;; +0C7C;TELUGU FRACTION DIGIT ONE FOR EVEN POWERS OF FOUR;No;0;ON;;;;1;N;;;;; +0C7D;TELUGU FRACTION DIGIT TWO FOR EVEN POWERS OF FOUR;No;0;ON;;;;2;N;;;;; +0C7E;TELUGU FRACTION DIGIT THREE FOR EVEN POWERS OF FOUR;No;0;ON;;;;3;N;;;;; +0C7F;TELUGU SIGN TUUMU;So;0;L;;;;;N;;;;; +0C80;KANNADA SIGN SPACING CANDRABINDU;Lo;0;L;;;;;N;;;;; +0C81;KANNADA SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;; +0C82;KANNADA SIGN ANUSVARA;Mc;0;L;;;;;N;;;;; +0C83;KANNADA SIGN VISARGA;Mc;0;L;;;;;N;;;;; +0C84;KANNADA SIGN SIDDHAM;Po;0;L;;;;;N;;;;; +0C85;KANNADA LETTER A;Lo;0;L;;;;;N;;;;; +0C86;KANNADA LETTER AA;Lo;0;L;;;;;N;;;;; +0C87;KANNADA LETTER I;Lo;0;L;;;;;N;;;;; +0C88;KANNADA LETTER II;Lo;0;L;;;;;N;;;;; +0C89;KANNADA LETTER U;Lo;0;L;;;;;N;;;;; +0C8A;KANNADA LETTER UU;Lo;0;L;;;;;N;;;;; +0C8B;KANNADA LETTER VOCALIC R;Lo;0;L;;;;;N;;;;; +0C8C;KANNADA LETTER VOCALIC L;Lo;0;L;;;;;N;;;;; +0C8E;KANNADA LETTER E;Lo;0;L;;;;;N;;;;; +0C8F;KANNADA LETTER EE;Lo;0;L;;;;;N;;;;; +0C90;KANNADA LETTER AI;Lo;0;L;;;;;N;;;;; +0C92;KANNADA LETTER O;Lo;0;L;;;;;N;;;;; +0C93;KANNADA LETTER OO;Lo;0;L;;;;;N;;;;; +0C94;KANNADA LETTER AU;Lo;0;L;;;;;N;;;;; +0C95;KANNADA LETTER KA;Lo;0;L;;;;;N;;;;; +0C96;KANNADA LETTER KHA;Lo;0;L;;;;;N;;;;; +0C97;KANNADA LETTER GA;Lo;0;L;;;;;N;;;;; +0C98;KANNADA LETTER GHA;Lo;0;L;;;;;N;;;;; +0C99;KANNADA LETTER NGA;Lo;0;L;;;;;N;;;;; +0C9A;KANNADA LETTER CA;Lo;0;L;;;;;N;;;;; +0C9B;KANNADA LETTER CHA;Lo;0;L;;;;;N;;;;; +0C9C;KANNADA LETTER JA;Lo;0;L;;;;;N;;;;; +0C9D;KANNADA LETTER JHA;Lo;0;L;;;;;N;;;;; +0C9E;KANNADA LETTER NYA;Lo;0;L;;;;;N;;;;; +0C9F;KANNADA LETTER TTA;Lo;0;L;;;;;N;;;;; +0CA0;KANNADA LETTER TTHA;Lo;0;L;;;;;N;;;;; +0CA1;KANNADA LETTER DDA;Lo;0;L;;;;;N;;;;; +0CA2;KANNADA LETTER DDHA;Lo;0;L;;;;;N;;;;; +0CA3;KANNADA LETTER NNA;Lo;0;L;;;;;N;;;;; +0CA4;KANNADA LETTER TA;Lo;0;L;;;;;N;;;;; +0CA5;KANNADA LETTER THA;Lo;0;L;;;;;N;;;;; +0CA6;KANNADA LETTER DA;Lo;0;L;;;;;N;;;;; +0CA7;KANNADA LETTER DHA;Lo;0;L;;;;;N;;;;; +0CA8;KANNADA LETTER NA;Lo;0;L;;;;;N;;;;; +0CAA;KANNADA LETTER PA;Lo;0;L;;;;;N;;;;; +0CAB;KANNADA LETTER PHA;Lo;0;L;;;;;N;;;;; +0CAC;KANNADA LETTER BA;Lo;0;L;;;;;N;;;;; +0CAD;KANNADA LETTER BHA;Lo;0;L;;;;;N;;;;; +0CAE;KANNADA LETTER MA;Lo;0;L;;;;;N;;;;; +0CAF;KANNADA LETTER YA;Lo;0;L;;;;;N;;;;; +0CB0;KANNADA LETTER RA;Lo;0;L;;;;;N;;;;; +0CB1;KANNADA LETTER RRA;Lo;0;L;;;;;N;;;;; +0CB2;KANNADA LETTER LA;Lo;0;L;;;;;N;;;;; +0CB3;KANNADA LETTER LLA;Lo;0;L;;;;;N;;;;; +0CB5;KANNADA LETTER VA;Lo;0;L;;;;;N;;;;; +0CB6;KANNADA LETTER SHA;Lo;0;L;;;;;N;;;;; +0CB7;KANNADA LETTER SSA;Lo;0;L;;;;;N;;;;; +0CB8;KANNADA LETTER SA;Lo;0;L;;;;;N;;;;; +0CB9;KANNADA LETTER HA;Lo;0;L;;;;;N;;;;; +0CBC;KANNADA SIGN NUKTA;Mn;7;NSM;;;;;N;;;;; +0CBD;KANNADA SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;; +0CBE;KANNADA VOWEL SIGN AA;Mc;0;L;;;;;N;;;;; +0CBF;KANNADA VOWEL SIGN I;Mn;0;L;;;;;N;;;;; +0CC0;KANNADA VOWEL SIGN II;Mc;0;L;0CBF 0CD5;;;;N;;;;; +0CC1;KANNADA VOWEL SIGN U;Mc;0;L;;;;;N;;;;; +0CC2;KANNADA VOWEL SIGN UU;Mc;0;L;;;;;N;;;;; +0CC3;KANNADA VOWEL SIGN VOCALIC R;Mc;0;L;;;;;N;;;;; +0CC4;KANNADA VOWEL SIGN VOCALIC RR;Mc;0;L;;;;;N;;;;; +0CC6;KANNADA VOWEL SIGN E;Mn;0;L;;;;;N;;;;; +0CC7;KANNADA VOWEL SIGN EE;Mc;0;L;0CC6 0CD5;;;;N;;;;; +0CC8;KANNADA VOWEL SIGN AI;Mc;0;L;0CC6 0CD6;;;;N;;;;; +0CCA;KANNADA VOWEL SIGN O;Mc;0;L;0CC6 0CC2;;;;N;;;;; +0CCB;KANNADA VOWEL SIGN OO;Mc;0;L;0CCA 0CD5;;;;N;;;;; +0CCC;KANNADA VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;; +0CCD;KANNADA SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;; +0CD5;KANNADA LENGTH MARK;Mc;0;L;;;;;N;;;;; +0CD6;KANNADA AI LENGTH MARK;Mc;0;L;;;;;N;;;;; +0CDC;KANNADA ARCHAIC SHRII;Lo;0;L;;;;;N;;;;; +0CDD;KANNADA LETTER NAKAARA POLLU;Lo;0;L;;;;;N;;;;; +0CDE;KANNADA LETTER FA;Lo;0;L;;;;;N;;;;; +0CE0;KANNADA LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;; +0CE1;KANNADA LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;; +0CE2;KANNADA VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;; +0CE3;KANNADA VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;; +0CE6;KANNADA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +0CE7;KANNADA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +0CE8;KANNADA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +0CE9;KANNADA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +0CEA;KANNADA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +0CEB;KANNADA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +0CEC;KANNADA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +0CED;KANNADA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +0CEE;KANNADA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +0CEF;KANNADA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +0CF1;KANNADA SIGN JIHVAMULIYA;Lo;0;L;;;;;N;;;;; +0CF2;KANNADA SIGN UPADHMANIYA;Lo;0;L;;;;;N;;;;; +0CF3;KANNADA SIGN COMBINING ANUSVARA ABOVE RIGHT;Mc;0;L;;;;;N;;;;; +0D00;MALAYALAM SIGN COMBINING ANUSVARA ABOVE;Mn;0;NSM;;;;;N;;;;; +0D01;MALAYALAM SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;; +0D02;MALAYALAM SIGN ANUSVARA;Mc;0;L;;;;;N;;;;; +0D03;MALAYALAM SIGN VISARGA;Mc;0;L;;;;;N;;;;; +0D04;MALAYALAM LETTER VEDIC ANUSVARA;Lo;0;L;;;;;N;;;;; +0D05;MALAYALAM LETTER A;Lo;0;L;;;;;N;;;;; +0D06;MALAYALAM LETTER AA;Lo;0;L;;;;;N;;;;; +0D07;MALAYALAM LETTER I;Lo;0;L;;;;;N;;;;; +0D08;MALAYALAM LETTER II;Lo;0;L;;;;;N;;;;; +0D09;MALAYALAM LETTER U;Lo;0;L;;;;;N;;;;; +0D0A;MALAYALAM LETTER UU;Lo;0;L;;;;;N;;;;; +0D0B;MALAYALAM LETTER VOCALIC R;Lo;0;L;;;;;N;;;;; +0D0C;MALAYALAM LETTER VOCALIC L;Lo;0;L;;;;;N;;;;; +0D0E;MALAYALAM LETTER E;Lo;0;L;;;;;N;;;;; +0D0F;MALAYALAM LETTER EE;Lo;0;L;;;;;N;;;;; +0D10;MALAYALAM LETTER AI;Lo;0;L;;;;;N;;;;; +0D12;MALAYALAM LETTER O;Lo;0;L;;;;;N;;;;; +0D13;MALAYALAM LETTER OO;Lo;0;L;;;;;N;;;;; +0D14;MALAYALAM LETTER AU;Lo;0;L;;;;;N;;;;; +0D15;MALAYALAM LETTER KA;Lo;0;L;;;;;N;;;;; +0D16;MALAYALAM LETTER KHA;Lo;0;L;;;;;N;;;;; +0D17;MALAYALAM LETTER GA;Lo;0;L;;;;;N;;;;; +0D18;MALAYALAM LETTER GHA;Lo;0;L;;;;;N;;;;; +0D19;MALAYALAM LETTER NGA;Lo;0;L;;;;;N;;;;; +0D1A;MALAYALAM LETTER CA;Lo;0;L;;;;;N;;;;; +0D1B;MALAYALAM LETTER CHA;Lo;0;L;;;;;N;;;;; +0D1C;MALAYALAM LETTER JA;Lo;0;L;;;;;N;;;;; +0D1D;MALAYALAM LETTER JHA;Lo;0;L;;;;;N;;;;; +0D1E;MALAYALAM LETTER NYA;Lo;0;L;;;;;N;;;;; +0D1F;MALAYALAM LETTER TTA;Lo;0;L;;;;;N;;;;; +0D20;MALAYALAM LETTER TTHA;Lo;0;L;;;;;N;;;;; +0D21;MALAYALAM LETTER DDA;Lo;0;L;;;;;N;;;;; +0D22;MALAYALAM LETTER DDHA;Lo;0;L;;;;;N;;;;; +0D23;MALAYALAM LETTER NNA;Lo;0;L;;;;;N;;;;; +0D24;MALAYALAM LETTER TA;Lo;0;L;;;;;N;;;;; +0D25;MALAYALAM LETTER THA;Lo;0;L;;;;;N;;;;; +0D26;MALAYALAM LETTER DA;Lo;0;L;;;;;N;;;;; +0D27;MALAYALAM LETTER DHA;Lo;0;L;;;;;N;;;;; +0D28;MALAYALAM LETTER NA;Lo;0;L;;;;;N;;;;; +0D29;MALAYALAM LETTER NNNA;Lo;0;L;;;;;N;;;;; +0D2A;MALAYALAM LETTER PA;Lo;0;L;;;;;N;;;;; +0D2B;MALAYALAM LETTER PHA;Lo;0;L;;;;;N;;;;; +0D2C;MALAYALAM LETTER BA;Lo;0;L;;;;;N;;;;; +0D2D;MALAYALAM LETTER BHA;Lo;0;L;;;;;N;;;;; +0D2E;MALAYALAM LETTER MA;Lo;0;L;;;;;N;;;;; +0D2F;MALAYALAM LETTER YA;Lo;0;L;;;;;N;;;;; +0D30;MALAYALAM LETTER RA;Lo;0;L;;;;;N;;;;; +0D31;MALAYALAM LETTER RRA;Lo;0;L;;;;;N;;;;; +0D32;MALAYALAM LETTER LA;Lo;0;L;;;;;N;;;;; +0D33;MALAYALAM LETTER LLA;Lo;0;L;;;;;N;;;;; +0D34;MALAYALAM LETTER LLLA;Lo;0;L;;;;;N;;;;; +0D35;MALAYALAM LETTER VA;Lo;0;L;;;;;N;;;;; +0D36;MALAYALAM LETTER SHA;Lo;0;L;;;;;N;;;;; +0D37;MALAYALAM LETTER SSA;Lo;0;L;;;;;N;;;;; +0D38;MALAYALAM LETTER SA;Lo;0;L;;;;;N;;;;; +0D39;MALAYALAM LETTER HA;Lo;0;L;;;;;N;;;;; +0D3A;MALAYALAM LETTER TTTA;Lo;0;L;;;;;N;;;;; +0D3B;MALAYALAM SIGN VERTICAL BAR VIRAMA;Mn;9;NSM;;;;;N;;;;; +0D3C;MALAYALAM SIGN CIRCULAR VIRAMA;Mn;9;NSM;;;;;N;;;;; +0D3D;MALAYALAM SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;; +0D3E;MALAYALAM VOWEL SIGN AA;Mc;0;L;;;;;N;;;;; +0D3F;MALAYALAM VOWEL SIGN I;Mc;0;L;;;;;N;;;;; +0D40;MALAYALAM VOWEL SIGN II;Mc;0;L;;;;;N;;;;; +0D41;MALAYALAM VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;; +0D42;MALAYALAM VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;; +0D43;MALAYALAM VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;; +0D44;MALAYALAM VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;; +0D46;MALAYALAM VOWEL SIGN E;Mc;0;L;;;;;N;;;;; +0D47;MALAYALAM VOWEL SIGN EE;Mc;0;L;;;;;N;;;;; +0D48;MALAYALAM VOWEL SIGN AI;Mc;0;L;;;;;N;;;;; +0D4A;MALAYALAM VOWEL SIGN O;Mc;0;L;0D46 0D3E;;;;N;;;;; +0D4B;MALAYALAM VOWEL SIGN OO;Mc;0;L;0D47 0D3E;;;;N;;;;; +0D4C;MALAYALAM VOWEL SIGN AU;Mc;0;L;0D46 0D57;;;;N;;;;; +0D4D;MALAYALAM SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;; +0D4E;MALAYALAM LETTER DOT REPH;Lo;0;L;;;;;N;;;;; +0D4F;MALAYALAM SIGN PARA;So;0;L;;;;;N;;;;; +0D54;MALAYALAM LETTER CHILLU M;Lo;0;L;;;;;N;;;;; +0D55;MALAYALAM LETTER CHILLU Y;Lo;0;L;;;;;N;;;;; +0D56;MALAYALAM LETTER CHILLU LLL;Lo;0;L;;;;;N;;;;; +0D57;MALAYALAM AU LENGTH MARK;Mc;0;L;;;;;N;;;;; +0D58;MALAYALAM FRACTION ONE ONE-HUNDRED-AND-SIXTIETH;No;0;L;;;;1/160;N;;;;; +0D59;MALAYALAM FRACTION ONE FORTIETH;No;0;L;;;;1/40;N;;;;; +0D5A;MALAYALAM FRACTION THREE EIGHTIETHS;No;0;L;;;;3/80;N;;;;; +0D5B;MALAYALAM FRACTION ONE TWENTIETH;No;0;L;;;;1/20;N;;;;; +0D5C;MALAYALAM FRACTION ONE TENTH;No;0;L;;;;1/10;N;;;;; +0D5D;MALAYALAM FRACTION THREE TWENTIETHS;No;0;L;;;;3/20;N;;;;; +0D5E;MALAYALAM FRACTION ONE FIFTH;No;0;L;;;;1/5;N;;;;; +0D5F;MALAYALAM LETTER ARCHAIC II;Lo;0;L;;;;;N;;;;; +0D60;MALAYALAM LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;; +0D61;MALAYALAM LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;; +0D62;MALAYALAM VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;; +0D63;MALAYALAM VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;; +0D66;MALAYALAM DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +0D67;MALAYALAM DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +0D68;MALAYALAM DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +0D69;MALAYALAM DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +0D6A;MALAYALAM DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +0D6B;MALAYALAM DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +0D6C;MALAYALAM DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +0D6D;MALAYALAM DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +0D6E;MALAYALAM DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +0D6F;MALAYALAM DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +0D70;MALAYALAM NUMBER TEN;No;0;L;;;;10;N;;;;; +0D71;MALAYALAM NUMBER ONE HUNDRED;No;0;L;;;;100;N;;;;; +0D72;MALAYALAM NUMBER ONE THOUSAND;No;0;L;;;;1000;N;;;;; +0D73;MALAYALAM FRACTION ONE QUARTER;No;0;L;;;;1/4;N;;;;; +0D74;MALAYALAM FRACTION ONE HALF;No;0;L;;;;1/2;N;;;;; +0D75;MALAYALAM FRACTION THREE QUARTERS;No;0;L;;;;3/4;N;;;;; +0D76;MALAYALAM FRACTION ONE SIXTEENTH;No;0;L;;;;1/16;N;;;;; +0D77;MALAYALAM FRACTION ONE EIGHTH;No;0;L;;;;1/8;N;;;;; +0D78;MALAYALAM FRACTION THREE SIXTEENTHS;No;0;L;;;;3/16;N;;;;; +0D79;MALAYALAM DATE MARK;So;0;L;;;;;N;;;;; +0D7A;MALAYALAM LETTER CHILLU NN;Lo;0;L;;;;;N;;;;; +0D7B;MALAYALAM LETTER CHILLU N;Lo;0;L;;;;;N;;;;; +0D7C;MALAYALAM LETTER CHILLU RR;Lo;0;L;;;;;N;;;;; +0D7D;MALAYALAM LETTER CHILLU L;Lo;0;L;;;;;N;;;;; +0D7E;MALAYALAM LETTER CHILLU LL;Lo;0;L;;;;;N;;;;; +0D7F;MALAYALAM LETTER CHILLU K;Lo;0;L;;;;;N;;;;; +0D81;SINHALA SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;; +0D82;SINHALA SIGN ANUSVARAYA;Mc;0;L;;;;;N;;;;; +0D83;SINHALA SIGN VISARGAYA;Mc;0;L;;;;;N;;;;; +0D85;SINHALA LETTER AYANNA;Lo;0;L;;;;;N;;;;; +0D86;SINHALA LETTER AAYANNA;Lo;0;L;;;;;N;;;;; +0D87;SINHALA LETTER AEYANNA;Lo;0;L;;;;;N;;;;; +0D88;SINHALA LETTER AEEYANNA;Lo;0;L;;;;;N;;;;; +0D89;SINHALA LETTER IYANNA;Lo;0;L;;;;;N;;;;; +0D8A;SINHALA LETTER IIYANNA;Lo;0;L;;;;;N;;;;; +0D8B;SINHALA LETTER UYANNA;Lo;0;L;;;;;N;;;;; +0D8C;SINHALA LETTER UUYANNA;Lo;0;L;;;;;N;;;;; +0D8D;SINHALA LETTER IRUYANNA;Lo;0;L;;;;;N;;;;; +0D8E;SINHALA LETTER IRUUYANNA;Lo;0;L;;;;;N;;;;; +0D8F;SINHALA LETTER ILUYANNA;Lo;0;L;;;;;N;;;;; +0D90;SINHALA LETTER ILUUYANNA;Lo;0;L;;;;;N;;;;; +0D91;SINHALA LETTER EYANNA;Lo;0;L;;;;;N;;;;; +0D92;SINHALA LETTER EEYANNA;Lo;0;L;;;;;N;;;;; +0D93;SINHALA LETTER AIYANNA;Lo;0;L;;;;;N;;;;; +0D94;SINHALA LETTER OYANNA;Lo;0;L;;;;;N;;;;; +0D95;SINHALA LETTER OOYANNA;Lo;0;L;;;;;N;;;;; +0D96;SINHALA LETTER AUYANNA;Lo;0;L;;;;;N;;;;; +0D9A;SINHALA LETTER ALPAPRAANA KAYANNA;Lo;0;L;;;;;N;;;;; +0D9B;SINHALA LETTER MAHAAPRAANA KAYANNA;Lo;0;L;;;;;N;;;;; +0D9C;SINHALA LETTER ALPAPRAANA GAYANNA;Lo;0;L;;;;;N;;;;; +0D9D;SINHALA LETTER MAHAAPRAANA GAYANNA;Lo;0;L;;;;;N;;;;; +0D9E;SINHALA LETTER KANTAJA NAASIKYAYA;Lo;0;L;;;;;N;;;;; +0D9F;SINHALA LETTER SANYAKA GAYANNA;Lo;0;L;;;;;N;;;;; +0DA0;SINHALA LETTER ALPAPRAANA CAYANNA;Lo;0;L;;;;;N;;;;; +0DA1;SINHALA LETTER MAHAAPRAANA CAYANNA;Lo;0;L;;;;;N;;;;; +0DA2;SINHALA LETTER ALPAPRAANA JAYANNA;Lo;0;L;;;;;N;;;;; +0DA3;SINHALA LETTER MAHAAPRAANA JAYANNA;Lo;0;L;;;;;N;;;;; +0DA4;SINHALA LETTER TAALUJA NAASIKYAYA;Lo;0;L;;;;;N;;;;; +0DA5;SINHALA LETTER TAALUJA SANYOOGA NAAKSIKYAYA;Lo;0;L;;;;;N;;;;; +0DA6;SINHALA LETTER SANYAKA JAYANNA;Lo;0;L;;;;;N;;;;; +0DA7;SINHALA LETTER ALPAPRAANA TTAYANNA;Lo;0;L;;;;;N;;;;; +0DA8;SINHALA LETTER MAHAAPRAANA TTAYANNA;Lo;0;L;;;;;N;;;;; +0DA9;SINHALA LETTER ALPAPRAANA DDAYANNA;Lo;0;L;;;;;N;;;;; +0DAA;SINHALA LETTER MAHAAPRAANA DDAYANNA;Lo;0;L;;;;;N;;;;; +0DAB;SINHALA LETTER MUURDHAJA NAYANNA;Lo;0;L;;;;;N;;;;; +0DAC;SINHALA LETTER SANYAKA DDAYANNA;Lo;0;L;;;;;N;;;;; +0DAD;SINHALA LETTER ALPAPRAANA TAYANNA;Lo;0;L;;;;;N;;;;; +0DAE;SINHALA LETTER MAHAAPRAANA TAYANNA;Lo;0;L;;;;;N;;;;; +0DAF;SINHALA LETTER ALPAPRAANA DAYANNA;Lo;0;L;;;;;N;;;;; +0DB0;SINHALA LETTER MAHAAPRAANA DAYANNA;Lo;0;L;;;;;N;;;;; +0DB1;SINHALA LETTER DANTAJA NAYANNA;Lo;0;L;;;;;N;;;;; +0DB3;SINHALA LETTER SANYAKA DAYANNA;Lo;0;L;;;;;N;;;;; +0DB4;SINHALA LETTER ALPAPRAANA PAYANNA;Lo;0;L;;;;;N;;;;; +0DB5;SINHALA LETTER MAHAAPRAANA PAYANNA;Lo;0;L;;;;;N;;;;; +0DB6;SINHALA LETTER ALPAPRAANA BAYANNA;Lo;0;L;;;;;N;;;;; +0DB7;SINHALA LETTER MAHAAPRAANA BAYANNA;Lo;0;L;;;;;N;;;;; +0DB8;SINHALA LETTER MAYANNA;Lo;0;L;;;;;N;;;;; +0DB9;SINHALA LETTER AMBA BAYANNA;Lo;0;L;;;;;N;;;;; +0DBA;SINHALA LETTER YAYANNA;Lo;0;L;;;;;N;;;;; +0DBB;SINHALA LETTER RAYANNA;Lo;0;L;;;;;N;;;;; +0DBD;SINHALA LETTER DANTAJA LAYANNA;Lo;0;L;;;;;N;;;;; +0DC0;SINHALA LETTER VAYANNA;Lo;0;L;;;;;N;;;;; +0DC1;SINHALA LETTER TAALUJA SAYANNA;Lo;0;L;;;;;N;;;;; +0DC2;SINHALA LETTER MUURDHAJA SAYANNA;Lo;0;L;;;;;N;;;;; +0DC3;SINHALA LETTER DANTAJA SAYANNA;Lo;0;L;;;;;N;;;;; +0DC4;SINHALA LETTER HAYANNA;Lo;0;L;;;;;N;;;;; +0DC5;SINHALA LETTER MUURDHAJA LAYANNA;Lo;0;L;;;;;N;;;;; +0DC6;SINHALA LETTER FAYANNA;Lo;0;L;;;;;N;;;;; +0DCA;SINHALA SIGN AL-LAKUNA;Mn;9;NSM;;;;;N;;;;; +0DCF;SINHALA VOWEL SIGN AELA-PILLA;Mc;0;L;;;;;N;;;;; +0DD0;SINHALA VOWEL SIGN KETTI AEDA-PILLA;Mc;0;L;;;;;N;;;;; +0DD1;SINHALA VOWEL SIGN DIGA AEDA-PILLA;Mc;0;L;;;;;N;;;;; +0DD2;SINHALA VOWEL SIGN KETTI IS-PILLA;Mn;0;NSM;;;;;N;;;;; +0DD3;SINHALA VOWEL SIGN DIGA IS-PILLA;Mn;0;NSM;;;;;N;;;;; +0DD4;SINHALA VOWEL SIGN KETTI PAA-PILLA;Mn;0;NSM;;;;;N;;;;; +0DD6;SINHALA VOWEL SIGN DIGA PAA-PILLA;Mn;0;NSM;;;;;N;;;;; +0DD8;SINHALA VOWEL SIGN GAETTA-PILLA;Mc;0;L;;;;;N;;;;; +0DD9;SINHALA VOWEL SIGN KOMBUVA;Mc;0;L;;;;;N;;;;; +0DDA;SINHALA VOWEL SIGN DIGA KOMBUVA;Mc;0;L;0DD9 0DCA;;;;N;;;;; +0DDB;SINHALA VOWEL SIGN KOMBU DEKA;Mc;0;L;;;;;N;;;;; +0DDC;SINHALA VOWEL SIGN KOMBUVA HAA AELA-PILLA;Mc;0;L;0DD9 0DCF;;;;N;;;;; +0DDD;SINHALA VOWEL SIGN KOMBUVA HAA DIGA AELA-PILLA;Mc;0;L;0DDC 0DCA;;;;N;;;;; +0DDE;SINHALA VOWEL SIGN KOMBUVA HAA GAYANUKITTA;Mc;0;L;0DD9 0DDF;;;;N;;;;; +0DDF;SINHALA VOWEL SIGN GAYANUKITTA;Mc;0;L;;;;;N;;;;; +0DE6;SINHALA LITH DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +0DE7;SINHALA LITH DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +0DE8;SINHALA LITH DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +0DE9;SINHALA LITH DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +0DEA;SINHALA LITH DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +0DEB;SINHALA LITH DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +0DEC;SINHALA LITH DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +0DED;SINHALA LITH DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +0DEE;SINHALA LITH DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +0DEF;SINHALA LITH DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +0DF2;SINHALA VOWEL SIGN DIGA GAETTA-PILLA;Mc;0;L;;;;;N;;;;; +0DF3;SINHALA VOWEL SIGN DIGA GAYANUKITTA;Mc;0;L;;;;;N;;;;; +0DF4;SINHALA PUNCTUATION KUNDDALIYA;Po;0;L;;;;;N;;;;; +0E01;THAI CHARACTER KO KAI;Lo;0;L;;;;;N;THAI LETTER KO KAI;;;; +0E02;THAI CHARACTER KHO KHAI;Lo;0;L;;;;;N;THAI LETTER KHO KHAI;;;; +0E03;THAI CHARACTER KHO KHUAT;Lo;0;L;;;;;N;THAI LETTER KHO KHUAT;;;; +0E04;THAI CHARACTER KHO KHWAI;Lo;0;L;;;;;N;THAI LETTER KHO KHWAI;;;; +0E05;THAI CHARACTER KHO KHON;Lo;0;L;;;;;N;THAI LETTER KHO KHON;;;; +0E06;THAI CHARACTER KHO RAKHANG;Lo;0;L;;;;;N;THAI LETTER KHO RAKHANG;;;; +0E07;THAI CHARACTER NGO NGU;Lo;0;L;;;;;N;THAI LETTER NGO NGU;;;; +0E08;THAI CHARACTER CHO CHAN;Lo;0;L;;;;;N;THAI LETTER CHO CHAN;;;; +0E09;THAI CHARACTER CHO CHING;Lo;0;L;;;;;N;THAI LETTER CHO CHING;;;; +0E0A;THAI CHARACTER CHO CHANG;Lo;0;L;;;;;N;THAI LETTER CHO CHANG;;;; +0E0B;THAI CHARACTER SO SO;Lo;0;L;;;;;N;THAI LETTER SO SO;;;; +0E0C;THAI CHARACTER CHO CHOE;Lo;0;L;;;;;N;THAI LETTER CHO CHOE;;;; +0E0D;THAI CHARACTER YO YING;Lo;0;L;;;;;N;THAI LETTER YO YING;;;; +0E0E;THAI CHARACTER DO CHADA;Lo;0;L;;;;;N;THAI LETTER DO CHADA;;;; +0E0F;THAI CHARACTER TO PATAK;Lo;0;L;;;;;N;THAI LETTER TO PATAK;;;; +0E10;THAI CHARACTER THO THAN;Lo;0;L;;;;;N;THAI LETTER THO THAN;;;; +0E11;THAI CHARACTER THO NANGMONTHO;Lo;0;L;;;;;N;THAI LETTER THO NANGMONTHO;;;; +0E12;THAI CHARACTER THO PHUTHAO;Lo;0;L;;;;;N;THAI LETTER THO PHUTHAO;;;; +0E13;THAI CHARACTER NO NEN;Lo;0;L;;;;;N;THAI LETTER NO NEN;;;; +0E14;THAI CHARACTER DO DEK;Lo;0;L;;;;;N;THAI LETTER DO DEK;;;; +0E15;THAI CHARACTER TO TAO;Lo;0;L;;;;;N;THAI LETTER TO TAO;;;; +0E16;THAI CHARACTER THO THUNG;Lo;0;L;;;;;N;THAI LETTER THO THUNG;;;; +0E17;THAI CHARACTER THO THAHAN;Lo;0;L;;;;;N;THAI LETTER THO THAHAN;;;; +0E18;THAI CHARACTER THO THONG;Lo;0;L;;;;;N;THAI LETTER THO THONG;;;; +0E19;THAI CHARACTER NO NU;Lo;0;L;;;;;N;THAI LETTER NO NU;;;; +0E1A;THAI CHARACTER BO BAIMAI;Lo;0;L;;;;;N;THAI LETTER BO BAIMAI;;;; +0E1B;THAI CHARACTER PO PLA;Lo;0;L;;;;;N;THAI LETTER PO PLA;;;; +0E1C;THAI CHARACTER PHO PHUNG;Lo;0;L;;;;;N;THAI LETTER PHO PHUNG;;;; +0E1D;THAI CHARACTER FO FA;Lo;0;L;;;;;N;THAI LETTER FO FA;;;; +0E1E;THAI CHARACTER PHO PHAN;Lo;0;L;;;;;N;THAI LETTER PHO PHAN;;;; +0E1F;THAI CHARACTER FO FAN;Lo;0;L;;;;;N;THAI LETTER FO FAN;;;; +0E20;THAI CHARACTER PHO SAMPHAO;Lo;0;L;;;;;N;THAI LETTER PHO SAMPHAO;;;; +0E21;THAI CHARACTER MO MA;Lo;0;L;;;;;N;THAI LETTER MO MA;;;; +0E22;THAI CHARACTER YO YAK;Lo;0;L;;;;;N;THAI LETTER YO YAK;;;; +0E23;THAI CHARACTER RO RUA;Lo;0;L;;;;;N;THAI LETTER RO RUA;;;; +0E24;THAI CHARACTER RU;Lo;0;L;;;;;N;THAI LETTER RU;;;; +0E25;THAI CHARACTER LO LING;Lo;0;L;;;;;N;THAI LETTER LO LING;;;; +0E26;THAI CHARACTER LU;Lo;0;L;;;;;N;THAI LETTER LU;;;; +0E27;THAI CHARACTER WO WAEN;Lo;0;L;;;;;N;THAI LETTER WO WAEN;;;; +0E28;THAI CHARACTER SO SALA;Lo;0;L;;;;;N;THAI LETTER SO SALA;;;; +0E29;THAI CHARACTER SO RUSI;Lo;0;L;;;;;N;THAI LETTER SO RUSI;;;; +0E2A;THAI CHARACTER SO SUA;Lo;0;L;;;;;N;THAI LETTER SO SUA;;;; +0E2B;THAI CHARACTER HO HIP;Lo;0;L;;;;;N;THAI LETTER HO HIP;;;; +0E2C;THAI CHARACTER LO CHULA;Lo;0;L;;;;;N;THAI LETTER LO CHULA;;;; +0E2D;THAI CHARACTER O ANG;Lo;0;L;;;;;N;THAI LETTER O ANG;;;; +0E2E;THAI CHARACTER HO NOKHUK;Lo;0;L;;;;;N;THAI LETTER HO NOK HUK;;;; +0E2F;THAI CHARACTER PAIYANNOI;Lo;0;L;;;;;N;THAI PAI YAN NOI;;;; +0E30;THAI CHARACTER SARA A;Lo;0;L;;;;;N;THAI VOWEL SIGN SARA A;;;; +0E31;THAI CHARACTER MAI HAN-AKAT;Mn;0;NSM;;;;;N;THAI VOWEL SIGN MAI HAN-AKAT;;;; +0E32;THAI CHARACTER SARA AA;Lo;0;L;;;;;N;THAI VOWEL SIGN SARA AA;;;; +0E33;THAI CHARACTER SARA AM;Lo;0;L; 0E4D 0E32;;;;N;THAI VOWEL SIGN SARA AM;;;; +0E34;THAI CHARACTER SARA I;Mn;0;NSM;;;;;N;THAI VOWEL SIGN SARA I;;;; +0E35;THAI CHARACTER SARA II;Mn;0;NSM;;;;;N;THAI VOWEL SIGN SARA II;;;; +0E36;THAI CHARACTER SARA UE;Mn;0;NSM;;;;;N;THAI VOWEL SIGN SARA UE;;;; +0E37;THAI CHARACTER SARA UEE;Mn;0;NSM;;;;;N;THAI VOWEL SIGN SARA UEE;;;; +0E38;THAI CHARACTER SARA U;Mn;103;NSM;;;;;N;THAI VOWEL SIGN SARA U;;;; +0E39;THAI CHARACTER SARA UU;Mn;103;NSM;;;;;N;THAI VOWEL SIGN SARA UU;;;; +0E3A;THAI CHARACTER PHINTHU;Mn;9;NSM;;;;;N;THAI VOWEL SIGN PHINTHU;;;; +0E3F;THAI CURRENCY SYMBOL BAHT;Sc;0;ET;;;;;N;THAI BAHT SIGN;;;; +0E40;THAI CHARACTER SARA E;Lo;0;L;;;;;N;THAI VOWEL SIGN SARA E;;;; +0E41;THAI CHARACTER SARA AE;Lo;0;L;;;;;N;THAI VOWEL SIGN SARA AE;;;; +0E42;THAI CHARACTER SARA O;Lo;0;L;;;;;N;THAI VOWEL SIGN SARA O;;;; +0E43;THAI CHARACTER SARA AI MAIMUAN;Lo;0;L;;;;;N;THAI VOWEL SIGN SARA MAI MUAN;;;; +0E44;THAI CHARACTER SARA AI MAIMALAI;Lo;0;L;;;;;N;THAI VOWEL SIGN SARA MAI MALAI;;;; +0E45;THAI CHARACTER LAKKHANGYAO;Lo;0;L;;;;;N;THAI LAK KHANG YAO;;;; +0E46;THAI CHARACTER MAIYAMOK;Lm;0;L;;;;;N;THAI MAI YAMOK;;;; +0E47;THAI CHARACTER MAITAIKHU;Mn;0;NSM;;;;;N;THAI VOWEL SIGN MAI TAI KHU;;;; +0E48;THAI CHARACTER MAI EK;Mn;107;NSM;;;;;N;THAI TONE MAI EK;;;; +0E49;THAI CHARACTER MAI THO;Mn;107;NSM;;;;;N;THAI TONE MAI THO;;;; +0E4A;THAI CHARACTER MAI TRI;Mn;107;NSM;;;;;N;THAI TONE MAI TRI;;;; +0E4B;THAI CHARACTER MAI CHATTAWA;Mn;107;NSM;;;;;N;THAI TONE MAI CHATTAWA;;;; +0E4C;THAI CHARACTER THANTHAKHAT;Mn;0;NSM;;;;;N;THAI THANTHAKHAT;;;; +0E4D;THAI CHARACTER NIKHAHIT;Mn;0;NSM;;;;;N;THAI NIKKHAHIT;;;; +0E4E;THAI CHARACTER YAMAKKAN;Mn;0;NSM;;;;;N;THAI YAMAKKAN;;;; +0E4F;THAI CHARACTER FONGMAN;Po;0;L;;;;;N;THAI FONGMAN;;;; +0E50;THAI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +0E51;THAI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +0E52;THAI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +0E53;THAI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +0E54;THAI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +0E55;THAI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +0E56;THAI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +0E57;THAI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +0E58;THAI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +0E59;THAI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +0E5A;THAI CHARACTER ANGKHANKHU;Po;0;L;;;;;N;THAI ANGKHANKHU;;;; +0E5B;THAI CHARACTER KHOMUT;Po;0;L;;;;;N;THAI KHOMUT;;;; +0E81;LAO LETTER KO;Lo;0;L;;;;;N;;;;; +0E82;LAO LETTER KHO SUNG;Lo;0;L;;;;;N;;;;; +0E84;LAO LETTER KHO TAM;Lo;0;L;;;;;N;;;;; +0E86;LAO LETTER PALI GHA;Lo;0;L;;;;;N;;;;; +0E87;LAO LETTER NGO;Lo;0;L;;;;;N;;;;; +0E88;LAO LETTER CO;Lo;0;L;;;;;N;;;;; +0E89;LAO LETTER PALI CHA;Lo;0;L;;;;;N;;;;; +0E8A;LAO LETTER SO TAM;Lo;0;L;;;;;N;;;;; +0E8C;LAO LETTER PALI JHA;Lo;0;L;;;;;N;;;;; +0E8D;LAO LETTER NYO;Lo;0;L;;;;;N;;;;; +0E8E;LAO LETTER PALI NYA;Lo;0;L;;;;;N;;;;; +0E8F;LAO LETTER PALI TTA;Lo;0;L;;;;;N;;;;; +0E90;LAO LETTER PALI TTHA;Lo;0;L;;;;;N;;;;; +0E91;LAO LETTER PALI DDA;Lo;0;L;;;;;N;;;;; +0E92;LAO LETTER PALI DDHA;Lo;0;L;;;;;N;;;;; +0E93;LAO LETTER PALI NNA;Lo;0;L;;;;;N;;;;; +0E94;LAO LETTER DO;Lo;0;L;;;;;N;;;;; +0E95;LAO LETTER TO;Lo;0;L;;;;;N;;;;; +0E96;LAO LETTER THO SUNG;Lo;0;L;;;;;N;;;;; +0E97;LAO LETTER THO TAM;Lo;0;L;;;;;N;;;;; +0E98;LAO LETTER PALI DHA;Lo;0;L;;;;;N;;;;; +0E99;LAO LETTER NO;Lo;0;L;;;;;N;;;;; +0E9A;LAO LETTER BO;Lo;0;L;;;;;N;;;;; +0E9B;LAO LETTER PO;Lo;0;L;;;;;N;;;;; +0E9C;LAO LETTER PHO SUNG;Lo;0;L;;;;;N;;;;; +0E9D;LAO LETTER FO TAM;Lo;0;L;;;;;N;;;;; +0E9E;LAO LETTER PHO TAM;Lo;0;L;;;;;N;;;;; +0E9F;LAO LETTER FO SUNG;Lo;0;L;;;;;N;;;;; +0EA0;LAO LETTER PALI BHA;Lo;0;L;;;;;N;;;;; +0EA1;LAO LETTER MO;Lo;0;L;;;;;N;;;;; +0EA2;LAO LETTER YO;Lo;0;L;;;;;N;;;;; +0EA3;LAO LETTER LO LING;Lo;0;L;;;;;N;;;;; +0EA5;LAO LETTER LO LOOT;Lo;0;L;;;;;N;;;;; +0EA7;LAO LETTER WO;Lo;0;L;;;;;N;;;;; +0EA8;LAO LETTER SANSKRIT SHA;Lo;0;L;;;;;N;;;;; +0EA9;LAO LETTER SANSKRIT SSA;Lo;0;L;;;;;N;;;;; +0EAA;LAO LETTER SO SUNG;Lo;0;L;;;;;N;;;;; +0EAB;LAO LETTER HO SUNG;Lo;0;L;;;;;N;;;;; +0EAC;LAO LETTER PALI LLA;Lo;0;L;;;;;N;;;;; +0EAD;LAO LETTER O;Lo;0;L;;;;;N;;;;; +0EAE;LAO LETTER HO TAM;Lo;0;L;;;;;N;;;;; +0EAF;LAO ELLIPSIS;Lo;0;L;;;;;N;;;;; +0EB0;LAO VOWEL SIGN A;Lo;0;L;;;;;N;;;;; +0EB1;LAO VOWEL SIGN MAI KAN;Mn;0;NSM;;;;;N;;;;; +0EB2;LAO VOWEL SIGN AA;Lo;0;L;;;;;N;;;;; +0EB3;LAO VOWEL SIGN AM;Lo;0;L; 0ECD 0EB2;;;;N;;;;; +0EB4;LAO VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;; +0EB5;LAO VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;; +0EB6;LAO VOWEL SIGN Y;Mn;0;NSM;;;;;N;;;;; +0EB7;LAO VOWEL SIGN YY;Mn;0;NSM;;;;;N;;;;; +0EB8;LAO VOWEL SIGN U;Mn;118;NSM;;;;;N;;;;; +0EB9;LAO VOWEL SIGN UU;Mn;118;NSM;;;;;N;;;;; +0EBA;LAO SIGN PALI VIRAMA;Mn;9;NSM;;;;;N;;;;; +0EBB;LAO VOWEL SIGN MAI KON;Mn;0;NSM;;;;;N;;;;; +0EBC;LAO SEMIVOWEL SIGN LO;Mn;0;NSM;;;;;N;;;;; +0EBD;LAO SEMIVOWEL SIGN NYO;Lo;0;L;;;;;N;;;;; +0EC0;LAO VOWEL SIGN E;Lo;0;L;;;;;N;;;;; +0EC1;LAO VOWEL SIGN EI;Lo;0;L;;;;;N;;;;; +0EC2;LAO VOWEL SIGN O;Lo;0;L;;;;;N;;;;; +0EC3;LAO VOWEL SIGN AY;Lo;0;L;;;;;N;;;;; +0EC4;LAO VOWEL SIGN AI;Lo;0;L;;;;;N;;;;; +0EC6;LAO KO LA;Lm;0;L;;;;;N;;;;; +0EC8;LAO TONE MAI EK;Mn;122;NSM;;;;;N;;;;; +0EC9;LAO TONE MAI THO;Mn;122;NSM;;;;;N;;;;; +0ECA;LAO TONE MAI TI;Mn;122;NSM;;;;;N;;;;; +0ECB;LAO TONE MAI CATAWA;Mn;122;NSM;;;;;N;;;;; +0ECC;LAO CANCELLATION MARK;Mn;0;NSM;;;;;N;;;;; +0ECD;LAO NIGGAHITA;Mn;0;NSM;;;;;N;;;;; +0ECE;LAO YAMAKKAN;Mn;0;NSM;;;;;N;;;;; +0ED0;LAO DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +0ED1;LAO DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +0ED2;LAO DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +0ED3;LAO DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +0ED4;LAO DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +0ED5;LAO DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +0ED6;LAO DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +0ED7;LAO DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +0ED8;LAO DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +0ED9;LAO DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +0EDC;LAO HO NO;Lo;0;L; 0EAB 0E99;;;;N;;;;; +0EDD;LAO HO MO;Lo;0;L; 0EAB 0EA1;;;;N;;;;; +0EDE;LAO LETTER KHMU GO;Lo;0;L;;;;;N;;;;; +0EDF;LAO LETTER KHMU NYO;Lo;0;L;;;;;N;;;;; +0F00;TIBETAN SYLLABLE OM;Lo;0;L;;;;;N;;;;; +0F01;TIBETAN MARK GTER YIG MGO TRUNCATED A;So;0;L;;;;;N;;;;; +0F02;TIBETAN MARK GTER YIG MGO -UM RNAM BCAD MA;So;0;L;;;;;N;;;;; +0F03;TIBETAN MARK GTER YIG MGO -UM GTER TSHEG MA;So;0;L;;;;;N;;;;; +0F04;TIBETAN MARK INITIAL YIG MGO MDUN MA;Po;0;L;;;;;N;TIBETAN SINGLE ORNAMENT;;;; +0F05;TIBETAN MARK CLOSING YIG MGO SGAB MA;Po;0;L;;;;;N;;;;; +0F06;TIBETAN MARK CARET YIG MGO PHUR SHAD MA;Po;0;L;;;;;N;;;;; +0F07;TIBETAN MARK YIG MGO TSHEG SHAD MA;Po;0;L;;;;;N;;;;; +0F08;TIBETAN MARK SBRUL SHAD;Po;0;L;;;;;N;TIBETAN RGYANSHAD;;;; +0F09;TIBETAN MARK BSKUR YIG MGO;Po;0;L;;;;;N;;;;; +0F0A;TIBETAN MARK BKA- SHOG YIG MGO;Po;0;L;;;;;N;;;;; +0F0B;TIBETAN MARK INTERSYLLABIC TSHEG;Po;0;L;;;;;N;TIBETAN TSEG;;;; +0F0C;TIBETAN MARK DELIMITER TSHEG BSTAR;Po;0;L; 0F0B;;;;N;;;;; +0F0D;TIBETAN MARK SHAD;Po;0;L;;;;;N;TIBETAN SHAD;;;; +0F0E;TIBETAN MARK NYIS SHAD;Po;0;L;;;;;N;TIBETAN DOUBLE SHAD;;;; +0F0F;TIBETAN MARK TSHEG SHAD;Po;0;L;;;;;N;;;;; +0F10;TIBETAN MARK NYIS TSHEG SHAD;Po;0;L;;;;;N;;;;; +0F11;TIBETAN MARK RIN CHEN SPUNGS SHAD;Po;0;L;;;;;N;TIBETAN RINCHANPHUNGSHAD;;;; +0F12;TIBETAN MARK RGYA GRAM SHAD;Po;0;L;;;;;N;;;;; +0F13;TIBETAN MARK CARET -DZUD RTAGS ME LONG CAN;So;0;L;;;;;N;;;;; +0F14;TIBETAN MARK GTER TSHEG;Po;0;L;;;;;N;TIBETAN COMMA;;;; +0F15;TIBETAN LOGOTYPE SIGN CHAD RTAGS;So;0;L;;;;;N;;;;; +0F16;TIBETAN LOGOTYPE SIGN LHAG RTAGS;So;0;L;;;;;N;;;;; +0F17;TIBETAN ASTROLOGICAL SIGN SGRA GCAN -CHAR RTAGS;So;0;L;;;;;N;;;;; +0F18;TIBETAN ASTROLOGICAL SIGN -KHYUD PA;Mn;220;NSM;;;;;N;;;;; +0F19;TIBETAN ASTROLOGICAL SIGN SDONG TSHUGS;Mn;220;NSM;;;;;N;;;;; +0F1A;TIBETAN SIGN RDEL DKAR GCIG;So;0;L;;;;;N;;;;; +0F1B;TIBETAN SIGN RDEL DKAR GNYIS;So;0;L;;;;;N;;;;; +0F1C;TIBETAN SIGN RDEL DKAR GSUM;So;0;L;;;;;N;;;;; +0F1D;TIBETAN SIGN RDEL NAG GCIG;So;0;L;;;;;N;;;;; +0F1E;TIBETAN SIGN RDEL NAG GNYIS;So;0;L;;;;;N;;;;; +0F1F;TIBETAN SIGN RDEL DKAR RDEL NAG;So;0;L;;;;;N;;;;; +0F20;TIBETAN DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +0F21;TIBETAN DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +0F22;TIBETAN DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +0F23;TIBETAN DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +0F24;TIBETAN DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +0F25;TIBETAN DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +0F26;TIBETAN DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +0F27;TIBETAN DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +0F28;TIBETAN DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +0F29;TIBETAN DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +0F2A;TIBETAN DIGIT HALF ONE;No;0;L;;;;1/2;N;;;;; +0F2B;TIBETAN DIGIT HALF TWO;No;0;L;;;;3/2;N;;;;; +0F2C;TIBETAN DIGIT HALF THREE;No;0;L;;;;5/2;N;;;;; +0F2D;TIBETAN DIGIT HALF FOUR;No;0;L;;;;7/2;N;;;;; +0F2E;TIBETAN DIGIT HALF FIVE;No;0;L;;;;9/2;N;;;;; +0F2F;TIBETAN DIGIT HALF SIX;No;0;L;;;;11/2;N;;;;; +0F30;TIBETAN DIGIT HALF SEVEN;No;0;L;;;;13/2;N;;;;; +0F31;TIBETAN DIGIT HALF EIGHT;No;0;L;;;;15/2;N;;;;; +0F32;TIBETAN DIGIT HALF NINE;No;0;L;;;;17/2;N;;;;; +0F33;TIBETAN DIGIT HALF ZERO;No;0;L;;;;-1/2;N;;;;; +0F34;TIBETAN MARK BSDUS RTAGS;So;0;L;;;;;N;;;;; +0F35;TIBETAN MARK NGAS BZUNG NYI ZLA;Mn;220;NSM;;;;;N;TIBETAN HONORIFIC UNDER RING;;;; +0F36;TIBETAN MARK CARET -DZUD RTAGS BZHI MIG CAN;So;0;L;;;;;N;;;;; +0F37;TIBETAN MARK NGAS BZUNG SGOR RTAGS;Mn;220;NSM;;;;;N;TIBETAN UNDER RING;;;; +0F38;TIBETAN MARK CHE MGO;So;0;L;;;;;N;;;;; +0F39;TIBETAN MARK TSA -PHRU;Mn;216;NSM;;;;;N;TIBETAN LENITION MARK;;;; +0F3A;TIBETAN MARK GUG RTAGS GYON;Ps;0;ON;;;;;Y;;;;; +0F3B;TIBETAN MARK GUG RTAGS GYAS;Pe;0;ON;;;;;Y;;;;; +0F3C;TIBETAN MARK ANG KHANG GYON;Ps;0;ON;;;;;Y;TIBETAN LEFT BRACE;;;; +0F3D;TIBETAN MARK ANG KHANG GYAS;Pe;0;ON;;;;;Y;TIBETAN RIGHT BRACE;;;; +0F3E;TIBETAN SIGN YAR TSHES;Mc;0;L;;;;;N;;;;; +0F3F;TIBETAN SIGN MAR TSHES;Mc;0;L;;;;;N;;;;; +0F40;TIBETAN LETTER KA;Lo;0;L;;;;;N;;;;; +0F41;TIBETAN LETTER KHA;Lo;0;L;;;;;N;;;;; +0F42;TIBETAN LETTER GA;Lo;0;L;;;;;N;;;;; +0F43;TIBETAN LETTER GHA;Lo;0;L;0F42 0FB7;;;;N;;;;; +0F44;TIBETAN LETTER NGA;Lo;0;L;;;;;N;;;;; +0F45;TIBETAN LETTER CA;Lo;0;L;;;;;N;;;;; +0F46;TIBETAN LETTER CHA;Lo;0;L;;;;;N;;;;; +0F47;TIBETAN LETTER JA;Lo;0;L;;;;;N;;;;; +0F49;TIBETAN LETTER NYA;Lo;0;L;;;;;N;;;;; +0F4A;TIBETAN LETTER TTA;Lo;0;L;;;;;N;TIBETAN LETTER REVERSED TA;;;; +0F4B;TIBETAN LETTER TTHA;Lo;0;L;;;;;N;TIBETAN LETTER REVERSED THA;;;; +0F4C;TIBETAN LETTER DDA;Lo;0;L;;;;;N;TIBETAN LETTER REVERSED DA;;;; +0F4D;TIBETAN LETTER DDHA;Lo;0;L;0F4C 0FB7;;;;N;;;;; +0F4E;TIBETAN LETTER NNA;Lo;0;L;;;;;N;TIBETAN LETTER REVERSED NA;;;; +0F4F;TIBETAN LETTER TA;Lo;0;L;;;;;N;;;;; +0F50;TIBETAN LETTER THA;Lo;0;L;;;;;N;;;;; +0F51;TIBETAN LETTER DA;Lo;0;L;;;;;N;;;;; +0F52;TIBETAN LETTER DHA;Lo;0;L;0F51 0FB7;;;;N;;;;; +0F53;TIBETAN LETTER NA;Lo;0;L;;;;;N;;;;; +0F54;TIBETAN LETTER PA;Lo;0;L;;;;;N;;;;; +0F55;TIBETAN LETTER PHA;Lo;0;L;;;;;N;;;;; +0F56;TIBETAN LETTER BA;Lo;0;L;;;;;N;;;;; +0F57;TIBETAN LETTER BHA;Lo;0;L;0F56 0FB7;;;;N;;;;; +0F58;TIBETAN LETTER MA;Lo;0;L;;;;;N;;;;; +0F59;TIBETAN LETTER TSA;Lo;0;L;;;;;N;;;;; +0F5A;TIBETAN LETTER TSHA;Lo;0;L;;;;;N;;;;; +0F5B;TIBETAN LETTER DZA;Lo;0;L;;;;;N;;;;; +0F5C;TIBETAN LETTER DZHA;Lo;0;L;0F5B 0FB7;;;;N;;;;; +0F5D;TIBETAN LETTER WA;Lo;0;L;;;;;N;;;;; +0F5E;TIBETAN LETTER ZHA;Lo;0;L;;;;;N;;;;; +0F5F;TIBETAN LETTER ZA;Lo;0;L;;;;;N;;;;; +0F60;TIBETAN LETTER -A;Lo;0;L;;;;;N;TIBETAN LETTER AA;;;; +0F61;TIBETAN LETTER YA;Lo;0;L;;;;;N;;;;; +0F62;TIBETAN LETTER RA;Lo;0;L;;;;;N;;;;; +0F63;TIBETAN LETTER LA;Lo;0;L;;;;;N;;;;; +0F64;TIBETAN LETTER SHA;Lo;0;L;;;;;N;;;;; +0F65;TIBETAN LETTER SSA;Lo;0;L;;;;;N;TIBETAN LETTER REVERSED SHA;;;; +0F66;TIBETAN LETTER SA;Lo;0;L;;;;;N;;;;; +0F67;TIBETAN LETTER HA;Lo;0;L;;;;;N;;;;; +0F68;TIBETAN LETTER A;Lo;0;L;;;;;N;;;;; +0F69;TIBETAN LETTER KSSA;Lo;0;L;0F40 0FB5;;;;N;;;;; +0F6A;TIBETAN LETTER FIXED-FORM RA;Lo;0;L;;;;;N;;;;; +0F6B;TIBETAN LETTER KKA;Lo;0;L;;;;;N;;;;; +0F6C;TIBETAN LETTER RRA;Lo;0;L;;;;;N;;;;; +0F71;TIBETAN VOWEL SIGN AA;Mn;129;NSM;;;;;N;;;;; +0F72;TIBETAN VOWEL SIGN I;Mn;130;NSM;;;;;N;;;;; +0F73;TIBETAN VOWEL SIGN II;Mn;0;NSM;0F71 0F72;;;;N;;;;; +0F74;TIBETAN VOWEL SIGN U;Mn;132;NSM;;;;;N;;;;; +0F75;TIBETAN VOWEL SIGN UU;Mn;0;NSM;0F71 0F74;;;;N;;;;; +0F76;TIBETAN VOWEL SIGN VOCALIC R;Mn;0;NSM;0FB2 0F80;;;;N;;;;; +0F77;TIBETAN VOWEL SIGN VOCALIC RR;Mn;0;NSM; 0FB2 0F81;;;;N;;;;; +0F78;TIBETAN VOWEL SIGN VOCALIC L;Mn;0;NSM;0FB3 0F80;;;;N;;;;; +0F79;TIBETAN VOWEL SIGN VOCALIC LL;Mn;0;NSM; 0FB3 0F81;;;;N;;;;; +0F7A;TIBETAN VOWEL SIGN E;Mn;130;NSM;;;;;N;;;;; +0F7B;TIBETAN VOWEL SIGN EE;Mn;130;NSM;;;;;N;TIBETAN VOWEL SIGN AI;;;; +0F7C;TIBETAN VOWEL SIGN O;Mn;130;NSM;;;;;N;;;;; +0F7D;TIBETAN VOWEL SIGN OO;Mn;130;NSM;;;;;N;TIBETAN VOWEL SIGN AU;;;; +0F7E;TIBETAN SIGN RJES SU NGA RO;Mn;0;NSM;;;;;N;TIBETAN ANUSVARA;;;; +0F7F;TIBETAN SIGN RNAM BCAD;Mc;0;L;;;;;N;TIBETAN VISARGA;;;; +0F80;TIBETAN VOWEL SIGN REVERSED I;Mn;130;NSM;;;;;N;TIBETAN VOWEL SIGN SHORT I;;;; +0F81;TIBETAN VOWEL SIGN REVERSED II;Mn;0;NSM;0F71 0F80;;;;N;;;;; +0F82;TIBETAN SIGN NYI ZLA NAA DA;Mn;230;NSM;;;;;N;TIBETAN CANDRABINDU WITH ORNAMENT;;;; +0F83;TIBETAN SIGN SNA LDAN;Mn;230;NSM;;;;;N;TIBETAN CANDRABINDU;;;; +0F84;TIBETAN MARK HALANTA;Mn;9;NSM;;;;;N;TIBETAN VIRAMA;;;; +0F85;TIBETAN MARK PALUTA;Po;0;L;;;;;N;TIBETAN CHUCHENYIGE;;;; +0F86;TIBETAN SIGN LCI RTAGS;Mn;230;NSM;;;;;N;;;;; +0F87;TIBETAN SIGN YANG RTAGS;Mn;230;NSM;;;;;N;;;;; +0F88;TIBETAN SIGN LCE TSA CAN;Lo;0;L;;;;;N;;;;; +0F89;TIBETAN SIGN MCHU CAN;Lo;0;L;;;;;N;;;;; +0F8A;TIBETAN SIGN GRU CAN RGYINGS;Lo;0;L;;;;;N;;;;; +0F8B;TIBETAN SIGN GRU MED RGYINGS;Lo;0;L;;;;;N;;;;; +0F8C;TIBETAN SIGN INVERTED MCHU CAN;Lo;0;L;;;;;N;;;;; +0F8D;TIBETAN SUBJOINED SIGN LCE TSA CAN;Mn;0;NSM;;;;;N;;;;; +0F8E;TIBETAN SUBJOINED SIGN MCHU CAN;Mn;0;NSM;;;;;N;;;;; +0F8F;TIBETAN SUBJOINED SIGN INVERTED MCHU CAN;Mn;0;NSM;;;;;N;;;;; +0F90;TIBETAN SUBJOINED LETTER KA;Mn;0;NSM;;;;;N;;;;; +0F91;TIBETAN SUBJOINED LETTER KHA;Mn;0;NSM;;;;;N;;;;; +0F92;TIBETAN SUBJOINED LETTER GA;Mn;0;NSM;;;;;N;;;;; +0F93;TIBETAN SUBJOINED LETTER GHA;Mn;0;NSM;0F92 0FB7;;;;N;;;;; +0F94;TIBETAN SUBJOINED LETTER NGA;Mn;0;NSM;;;;;N;;;;; +0F95;TIBETAN SUBJOINED LETTER CA;Mn;0;NSM;;;;;N;;;;; +0F96;TIBETAN SUBJOINED LETTER CHA;Mn;0;NSM;;;;;N;;;;; +0F97;TIBETAN SUBJOINED LETTER JA;Mn;0;NSM;;;;;N;;;;; +0F99;TIBETAN SUBJOINED LETTER NYA;Mn;0;NSM;;;;;N;;;;; +0F9A;TIBETAN SUBJOINED LETTER TTA;Mn;0;NSM;;;;;N;;;;; +0F9B;TIBETAN SUBJOINED LETTER TTHA;Mn;0;NSM;;;;;N;;;;; +0F9C;TIBETAN SUBJOINED LETTER DDA;Mn;0;NSM;;;;;N;;;;; +0F9D;TIBETAN SUBJOINED LETTER DDHA;Mn;0;NSM;0F9C 0FB7;;;;N;;;;; +0F9E;TIBETAN SUBJOINED LETTER NNA;Mn;0;NSM;;;;;N;;;;; +0F9F;TIBETAN SUBJOINED LETTER TA;Mn;0;NSM;;;;;N;;;;; +0FA0;TIBETAN SUBJOINED LETTER THA;Mn;0;NSM;;;;;N;;;;; +0FA1;TIBETAN SUBJOINED LETTER DA;Mn;0;NSM;;;;;N;;;;; +0FA2;TIBETAN SUBJOINED LETTER DHA;Mn;0;NSM;0FA1 0FB7;;;;N;;;;; +0FA3;TIBETAN SUBJOINED LETTER NA;Mn;0;NSM;;;;;N;;;;; +0FA4;TIBETAN SUBJOINED LETTER PA;Mn;0;NSM;;;;;N;;;;; +0FA5;TIBETAN SUBJOINED LETTER PHA;Mn;0;NSM;;;;;N;;;;; +0FA6;TIBETAN SUBJOINED LETTER BA;Mn;0;NSM;;;;;N;;;;; +0FA7;TIBETAN SUBJOINED LETTER BHA;Mn;0;NSM;0FA6 0FB7;;;;N;;;;; +0FA8;TIBETAN SUBJOINED LETTER MA;Mn;0;NSM;;;;;N;;;;; +0FA9;TIBETAN SUBJOINED LETTER TSA;Mn;0;NSM;;;;;N;;;;; +0FAA;TIBETAN SUBJOINED LETTER TSHA;Mn;0;NSM;;;;;N;;;;; +0FAB;TIBETAN SUBJOINED LETTER DZA;Mn;0;NSM;;;;;N;;;;; +0FAC;TIBETAN SUBJOINED LETTER DZHA;Mn;0;NSM;0FAB 0FB7;;;;N;;;;; +0FAD;TIBETAN SUBJOINED LETTER WA;Mn;0;NSM;;;;;N;;;;; +0FAE;TIBETAN SUBJOINED LETTER ZHA;Mn;0;NSM;;;;;N;;;;; +0FAF;TIBETAN SUBJOINED LETTER ZA;Mn;0;NSM;;;;;N;;;;; +0FB0;TIBETAN SUBJOINED LETTER -A;Mn;0;NSM;;;;;N;;;;; +0FB1;TIBETAN SUBJOINED LETTER YA;Mn;0;NSM;;;;;N;;;;; +0FB2;TIBETAN SUBJOINED LETTER RA;Mn;0;NSM;;;;;N;;;;; +0FB3;TIBETAN SUBJOINED LETTER LA;Mn;0;NSM;;;;;N;;;;; +0FB4;TIBETAN SUBJOINED LETTER SHA;Mn;0;NSM;;;;;N;;;;; +0FB5;TIBETAN SUBJOINED LETTER SSA;Mn;0;NSM;;;;;N;;;;; +0FB6;TIBETAN SUBJOINED LETTER SA;Mn;0;NSM;;;;;N;;;;; +0FB7;TIBETAN SUBJOINED LETTER HA;Mn;0;NSM;;;;;N;;;;; +0FB8;TIBETAN SUBJOINED LETTER A;Mn;0;NSM;;;;;N;;;;; +0FB9;TIBETAN SUBJOINED LETTER KSSA;Mn;0;NSM;0F90 0FB5;;;;N;;;;; +0FBA;TIBETAN SUBJOINED LETTER FIXED-FORM WA;Mn;0;NSM;;;;;N;;;;; +0FBB;TIBETAN SUBJOINED LETTER FIXED-FORM YA;Mn;0;NSM;;;;;N;;;;; +0FBC;TIBETAN SUBJOINED LETTER FIXED-FORM RA;Mn;0;NSM;;;;;N;;;;; +0FBE;TIBETAN KU RU KHA;So;0;L;;;;;N;;;;; +0FBF;TIBETAN KU RU KHA BZHI MIG CAN;So;0;L;;;;;N;;;;; +0FC0;TIBETAN CANTILLATION SIGN HEAVY BEAT;So;0;L;;;;;N;;;;; +0FC1;TIBETAN CANTILLATION SIGN LIGHT BEAT;So;0;L;;;;;N;;;;; +0FC2;TIBETAN CANTILLATION SIGN CANG TE-U;So;0;L;;;;;N;;;;; +0FC3;TIBETAN CANTILLATION SIGN SBUB -CHAL;So;0;L;;;;;N;;;;; +0FC4;TIBETAN SYMBOL DRIL BU;So;0;L;;;;;N;;;;; +0FC5;TIBETAN SYMBOL RDO RJE;So;0;L;;;;;N;;;;; +0FC6;TIBETAN SYMBOL PADMA GDAN;Mn;220;NSM;;;;;N;;;;; +0FC7;TIBETAN SYMBOL RDO RJE RGYA GRAM;So;0;L;;;;;N;;;;; +0FC8;TIBETAN SYMBOL PHUR PA;So;0;L;;;;;N;;;;; +0FC9;TIBETAN SYMBOL NOR BU;So;0;L;;;;;N;;;;; +0FCA;TIBETAN SYMBOL NOR BU NYIS -KHYIL;So;0;L;;;;;N;;;;; +0FCB;TIBETAN SYMBOL NOR BU GSUM -KHYIL;So;0;L;;;;;N;;;;; +0FCC;TIBETAN SYMBOL NOR BU BZHI -KHYIL;So;0;L;;;;;N;;;;; +0FCE;TIBETAN SIGN RDEL NAG RDEL DKAR;So;0;L;;;;;N;;;;; +0FCF;TIBETAN SIGN RDEL NAG GSUM;So;0;L;;;;;N;;;;; +0FD0;TIBETAN MARK BSKA- SHOG GI MGO RGYAN;Po;0;L;;;;;N;;;;; +0FD1;TIBETAN MARK MNYAM YIG GI MGO RGYAN;Po;0;L;;;;;N;;;;; +0FD2;TIBETAN MARK NYIS TSHEG;Po;0;L;;;;;N;;;;; +0FD3;TIBETAN MARK INITIAL BRDA RNYING YIG MGO MDUN MA;Po;0;L;;;;;N;;;;; +0FD4;TIBETAN MARK CLOSING BRDA RNYING YIG MGO SGAB MA;Po;0;L;;;;;N;;;;; +0FD5;RIGHT-FACING SVASTI SIGN;So;0;L;;;;;N;;;;; +0FD6;LEFT-FACING SVASTI SIGN;So;0;L;;;;;N;;;;; +0FD7;RIGHT-FACING SVASTI SIGN WITH DOTS;So;0;L;;;;;N;;;;; +0FD8;LEFT-FACING SVASTI SIGN WITH DOTS;So;0;L;;;;;N;;;;; +0FD9;TIBETAN MARK LEADING MCHAN RTAGS;Po;0;L;;;;;N;;;;; +0FDA;TIBETAN MARK TRAILING MCHAN RTAGS;Po;0;L;;;;;N;;;;; +1000;MYANMAR LETTER KA;Lo;0;L;;;;;N;;;;; +1001;MYANMAR LETTER KHA;Lo;0;L;;;;;N;;;;; +1002;MYANMAR LETTER GA;Lo;0;L;;;;;N;;;;; +1003;MYANMAR LETTER GHA;Lo;0;L;;;;;N;;;;; +1004;MYANMAR LETTER NGA;Lo;0;L;;;;;N;;;;; +1005;MYANMAR LETTER CA;Lo;0;L;;;;;N;;;;; +1006;MYANMAR LETTER CHA;Lo;0;L;;;;;N;;;;; +1007;MYANMAR LETTER JA;Lo;0;L;;;;;N;;;;; +1008;MYANMAR LETTER JHA;Lo;0;L;;;;;N;;;;; +1009;MYANMAR LETTER NYA;Lo;0;L;;;;;N;;;;; +100A;MYANMAR LETTER NNYA;Lo;0;L;;;;;N;;;;; +100B;MYANMAR LETTER TTA;Lo;0;L;;;;;N;;;;; +100C;MYANMAR LETTER TTHA;Lo;0;L;;;;;N;;;;; +100D;MYANMAR LETTER DDA;Lo;0;L;;;;;N;;;;; +100E;MYANMAR LETTER DDHA;Lo;0;L;;;;;N;;;;; +100F;MYANMAR LETTER NNA;Lo;0;L;;;;;N;;;;; +1010;MYANMAR LETTER TA;Lo;0;L;;;;;N;;;;; +1011;MYANMAR LETTER THA;Lo;0;L;;;;;N;;;;; +1012;MYANMAR LETTER DA;Lo;0;L;;;;;N;;;;; +1013;MYANMAR LETTER DHA;Lo;0;L;;;;;N;;;;; +1014;MYANMAR LETTER NA;Lo;0;L;;;;;N;;;;; +1015;MYANMAR LETTER PA;Lo;0;L;;;;;N;;;;; +1016;MYANMAR LETTER PHA;Lo;0;L;;;;;N;;;;; +1017;MYANMAR LETTER BA;Lo;0;L;;;;;N;;;;; +1018;MYANMAR LETTER BHA;Lo;0;L;;;;;N;;;;; +1019;MYANMAR LETTER MA;Lo;0;L;;;;;N;;;;; +101A;MYANMAR LETTER YA;Lo;0;L;;;;;N;;;;; +101B;MYANMAR LETTER RA;Lo;0;L;;;;;N;;;;; +101C;MYANMAR LETTER LA;Lo;0;L;;;;;N;;;;; +101D;MYANMAR LETTER WA;Lo;0;L;;;;;N;;;;; +101E;MYANMAR LETTER SA;Lo;0;L;;;;;N;;;;; +101F;MYANMAR LETTER HA;Lo;0;L;;;;;N;;;;; +1020;MYANMAR LETTER LLA;Lo;0;L;;;;;N;;;;; +1021;MYANMAR LETTER A;Lo;0;L;;;;;N;;;;; +1022;MYANMAR LETTER SHAN A;Lo;0;L;;;;;N;;;;; +1023;MYANMAR LETTER I;Lo;0;L;;;;;N;;;;; +1024;MYANMAR LETTER II;Lo;0;L;;;;;N;;;;; +1025;MYANMAR LETTER U;Lo;0;L;;;;;N;;;;; +1026;MYANMAR LETTER UU;Lo;0;L;1025 102E;;;;N;;;;; +1027;MYANMAR LETTER E;Lo;0;L;;;;;N;;;;; +1028;MYANMAR LETTER MON E;Lo;0;L;;;;;N;;;;; +1029;MYANMAR LETTER O;Lo;0;L;;;;;N;;;;; +102A;MYANMAR LETTER AU;Lo;0;L;;;;;N;;;;; +102B;MYANMAR VOWEL SIGN TALL AA;Mc;0;L;;;;;N;;;;; +102C;MYANMAR VOWEL SIGN AA;Mc;0;L;;;;;N;;;;; +102D;MYANMAR VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;; +102E;MYANMAR VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;; +102F;MYANMAR VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;; +1030;MYANMAR VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;; +1031;MYANMAR VOWEL SIGN E;Mc;0;L;;;;;N;;;;; +1032;MYANMAR VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;; +1033;MYANMAR VOWEL SIGN MON II;Mn;0;NSM;;;;;N;;;;; +1034;MYANMAR VOWEL SIGN MON O;Mn;0;NSM;;;;;N;;;;; +1035;MYANMAR VOWEL SIGN E ABOVE;Mn;0;NSM;;;;;N;;;;; +1036;MYANMAR SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;; +1037;MYANMAR SIGN DOT BELOW;Mn;7;NSM;;;;;N;;;;; +1038;MYANMAR SIGN VISARGA;Mc;0;L;;;;;N;;;;; +1039;MYANMAR SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;; +103A;MYANMAR SIGN ASAT;Mn;9;NSM;;;;;N;;;;; +103B;MYANMAR CONSONANT SIGN MEDIAL YA;Mc;0;L;;;;;N;;;;; +103C;MYANMAR CONSONANT SIGN MEDIAL RA;Mc;0;L;;;;;N;;;;; +103D;MYANMAR CONSONANT SIGN MEDIAL WA;Mn;0;NSM;;;;;N;;;;; +103E;MYANMAR CONSONANT SIGN MEDIAL HA;Mn;0;NSM;;;;;N;;;;; +103F;MYANMAR LETTER GREAT SA;Lo;0;L;;;;;N;;;;; +1040;MYANMAR DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +1041;MYANMAR DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +1042;MYANMAR DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +1043;MYANMAR DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +1044;MYANMAR DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +1045;MYANMAR DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +1046;MYANMAR DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +1047;MYANMAR DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +1048;MYANMAR DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +1049;MYANMAR DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +104A;MYANMAR SIGN LITTLE SECTION;Po;0;L;;;;;N;;;;; +104B;MYANMAR SIGN SECTION;Po;0;L;;;;;N;;;;; +104C;MYANMAR SYMBOL LOCATIVE;Po;0;L;;;;;N;;;;; +104D;MYANMAR SYMBOL COMPLETED;Po;0;L;;;;;N;;;;; +104E;MYANMAR SYMBOL AFOREMENTIONED;Po;0;L;;;;;N;;;;; +104F;MYANMAR SYMBOL GENITIVE;Po;0;L;;;;;N;;;;; +1050;MYANMAR LETTER SHA;Lo;0;L;;;;;N;;;;; +1051;MYANMAR LETTER SSA;Lo;0;L;;;;;N;;;;; +1052;MYANMAR LETTER VOCALIC R;Lo;0;L;;;;;N;;;;; +1053;MYANMAR LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;; +1054;MYANMAR LETTER VOCALIC L;Lo;0;L;;;;;N;;;;; +1055;MYANMAR LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;; +1056;MYANMAR VOWEL SIGN VOCALIC R;Mc;0;L;;;;;N;;;;; +1057;MYANMAR VOWEL SIGN VOCALIC RR;Mc;0;L;;;;;N;;;;; +1058;MYANMAR VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;; +1059;MYANMAR VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;; +105A;MYANMAR LETTER MON NGA;Lo;0;L;;;;;N;;;;; +105B;MYANMAR LETTER MON JHA;Lo;0;L;;;;;N;;;;; +105C;MYANMAR LETTER MON BBA;Lo;0;L;;;;;N;;;;; +105D;MYANMAR LETTER MON BBE;Lo;0;L;;;;;N;;;;; +105E;MYANMAR CONSONANT SIGN MON MEDIAL NA;Mn;0;NSM;;;;;N;;;;; +105F;MYANMAR CONSONANT SIGN MON MEDIAL MA;Mn;0;NSM;;;;;N;;;;; +1060;MYANMAR CONSONANT SIGN MON MEDIAL LA;Mn;0;NSM;;;;;N;;;;; +1061;MYANMAR LETTER SGAW KAREN SHA;Lo;0;L;;;;;N;;;;; +1062;MYANMAR VOWEL SIGN SGAW KAREN EU;Mc;0;L;;;;;N;;;;; +1063;MYANMAR TONE MARK SGAW KAREN HATHI;Mc;0;L;;;;;N;;;;; +1064;MYANMAR TONE MARK SGAW KAREN KE PHO;Mc;0;L;;;;;N;;;;; +1065;MYANMAR LETTER WESTERN PWO KAREN THA;Lo;0;L;;;;;N;;;;; +1066;MYANMAR LETTER WESTERN PWO KAREN PWA;Lo;0;L;;;;;N;;;;; +1067;MYANMAR VOWEL SIGN WESTERN PWO KAREN EU;Mc;0;L;;;;;N;;;;; +1068;MYANMAR VOWEL SIGN WESTERN PWO KAREN UE;Mc;0;L;;;;;N;;;;; +1069;MYANMAR SIGN WESTERN PWO KAREN TONE-1;Mc;0;L;;;;;N;;;;; +106A;MYANMAR SIGN WESTERN PWO KAREN TONE-2;Mc;0;L;;;;;N;;;;; +106B;MYANMAR SIGN WESTERN PWO KAREN TONE-3;Mc;0;L;;;;;N;;;;; +106C;MYANMAR SIGN WESTERN PWO KAREN TONE-4;Mc;0;L;;;;;N;;;;; +106D;MYANMAR SIGN WESTERN PWO KAREN TONE-5;Mc;0;L;;;;;N;;;;; +106E;MYANMAR LETTER EASTERN PWO KAREN NNA;Lo;0;L;;;;;N;;;;; +106F;MYANMAR LETTER EASTERN PWO KAREN YWA;Lo;0;L;;;;;N;;;;; +1070;MYANMAR LETTER EASTERN PWO KAREN GHWA;Lo;0;L;;;;;N;;;;; +1071;MYANMAR VOWEL SIGN GEBA KAREN I;Mn;0;NSM;;;;;N;;;;; +1072;MYANMAR VOWEL SIGN KAYAH OE;Mn;0;NSM;;;;;N;;;;; +1073;MYANMAR VOWEL SIGN KAYAH U;Mn;0;NSM;;;;;N;;;;; +1074;MYANMAR VOWEL SIGN KAYAH EE;Mn;0;NSM;;;;;N;;;;; +1075;MYANMAR LETTER SHAN KA;Lo;0;L;;;;;N;;;;; +1076;MYANMAR LETTER SHAN KHA;Lo;0;L;;;;;N;;;;; +1077;MYANMAR LETTER SHAN GA;Lo;0;L;;;;;N;;;;; +1078;MYANMAR LETTER SHAN CA;Lo;0;L;;;;;N;;;;; +1079;MYANMAR LETTER SHAN ZA;Lo;0;L;;;;;N;;;;; +107A;MYANMAR LETTER SHAN NYA;Lo;0;L;;;;;N;;;;; +107B;MYANMAR LETTER SHAN DA;Lo;0;L;;;;;N;;;;; +107C;MYANMAR LETTER SHAN NA;Lo;0;L;;;;;N;;;;; +107D;MYANMAR LETTER SHAN PHA;Lo;0;L;;;;;N;;;;; +107E;MYANMAR LETTER SHAN FA;Lo;0;L;;;;;N;;;;; +107F;MYANMAR LETTER SHAN BA;Lo;0;L;;;;;N;;;;; +1080;MYANMAR LETTER SHAN THA;Lo;0;L;;;;;N;;;;; +1081;MYANMAR LETTER SHAN HA;Lo;0;L;;;;;N;;;;; +1082;MYANMAR CONSONANT SIGN SHAN MEDIAL WA;Mn;0;NSM;;;;;N;;;;; +1083;MYANMAR VOWEL SIGN SHAN AA;Mc;0;L;;;;;N;;;;; +1084;MYANMAR VOWEL SIGN SHAN E;Mc;0;L;;;;;N;;;;; +1085;MYANMAR VOWEL SIGN SHAN E ABOVE;Mn;0;NSM;;;;;N;;;;; +1086;MYANMAR VOWEL SIGN SHAN FINAL Y;Mn;0;NSM;;;;;N;;;;; +1087;MYANMAR SIGN SHAN TONE-2;Mc;0;L;;;;;N;;;;; +1088;MYANMAR SIGN SHAN TONE-3;Mc;0;L;;;;;N;;;;; +1089;MYANMAR SIGN SHAN TONE-5;Mc;0;L;;;;;N;;;;; +108A;MYANMAR SIGN SHAN TONE-6;Mc;0;L;;;;;N;;;;; +108B;MYANMAR SIGN SHAN COUNCIL TONE-2;Mc;0;L;;;;;N;;;;; +108C;MYANMAR SIGN SHAN COUNCIL TONE-3;Mc;0;L;;;;;N;;;;; +108D;MYANMAR SIGN SHAN COUNCIL EMPHATIC TONE;Mn;220;NSM;;;;;N;;;;; +108E;MYANMAR LETTER RUMAI PALAUNG FA;Lo;0;L;;;;;N;;;;; +108F;MYANMAR SIGN RUMAI PALAUNG TONE-5;Mc;0;L;;;;;N;;;;; +1090;MYANMAR SHAN DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +1091;MYANMAR SHAN DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +1092;MYANMAR SHAN DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +1093;MYANMAR SHAN DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +1094;MYANMAR SHAN DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +1095;MYANMAR SHAN DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +1096;MYANMAR SHAN DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +1097;MYANMAR SHAN DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +1098;MYANMAR SHAN DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +1099;MYANMAR SHAN DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +109A;MYANMAR SIGN KHAMTI TONE-1;Mc;0;L;;;;;N;;;;; +109B;MYANMAR SIGN KHAMTI TONE-3;Mc;0;L;;;;;N;;;;; +109C;MYANMAR VOWEL SIGN AITON A;Mc;0;L;;;;;N;;;;; +109D;MYANMAR VOWEL SIGN AITON AI;Mn;0;NSM;;;;;N;;;;; +109E;MYANMAR SYMBOL SHAN ONE;So;0;L;;;;;N;;;;; +109F;MYANMAR SYMBOL SHAN EXCLAMATION;So;0;L;;;;;N;;;;; +10A0;GEORGIAN CAPITAL LETTER AN;Lu;0;L;;;;;N;;;;2D00; +10A1;GEORGIAN CAPITAL LETTER BAN;Lu;0;L;;;;;N;;;;2D01; +10A2;GEORGIAN CAPITAL LETTER GAN;Lu;0;L;;;;;N;;;;2D02; +10A3;GEORGIAN CAPITAL LETTER DON;Lu;0;L;;;;;N;;;;2D03; +10A4;GEORGIAN CAPITAL LETTER EN;Lu;0;L;;;;;N;;;;2D04; +10A5;GEORGIAN CAPITAL LETTER VIN;Lu;0;L;;;;;N;;;;2D05; +10A6;GEORGIAN CAPITAL LETTER ZEN;Lu;0;L;;;;;N;;;;2D06; +10A7;GEORGIAN CAPITAL LETTER TAN;Lu;0;L;;;;;N;;;;2D07; +10A8;GEORGIAN CAPITAL LETTER IN;Lu;0;L;;;;;N;;;;2D08; +10A9;GEORGIAN CAPITAL LETTER KAN;Lu;0;L;;;;;N;;;;2D09; +10AA;GEORGIAN CAPITAL LETTER LAS;Lu;0;L;;;;;N;;;;2D0A; +10AB;GEORGIAN CAPITAL LETTER MAN;Lu;0;L;;;;;N;;;;2D0B; +10AC;GEORGIAN CAPITAL LETTER NAR;Lu;0;L;;;;;N;;;;2D0C; +10AD;GEORGIAN CAPITAL LETTER ON;Lu;0;L;;;;;N;;;;2D0D; +10AE;GEORGIAN CAPITAL LETTER PAR;Lu;0;L;;;;;N;;;;2D0E; +10AF;GEORGIAN CAPITAL LETTER ZHAR;Lu;0;L;;;;;N;;;;2D0F; +10B0;GEORGIAN CAPITAL LETTER RAE;Lu;0;L;;;;;N;;;;2D10; +10B1;GEORGIAN CAPITAL LETTER SAN;Lu;0;L;;;;;N;;;;2D11; +10B2;GEORGIAN CAPITAL LETTER TAR;Lu;0;L;;;;;N;;;;2D12; +10B3;GEORGIAN CAPITAL LETTER UN;Lu;0;L;;;;;N;;;;2D13; +10B4;GEORGIAN CAPITAL LETTER PHAR;Lu;0;L;;;;;N;;;;2D14; +10B5;GEORGIAN CAPITAL LETTER KHAR;Lu;0;L;;;;;N;;;;2D15; +10B6;GEORGIAN CAPITAL LETTER GHAN;Lu;0;L;;;;;N;;;;2D16; +10B7;GEORGIAN CAPITAL LETTER QAR;Lu;0;L;;;;;N;;;;2D17; +10B8;GEORGIAN CAPITAL LETTER SHIN;Lu;0;L;;;;;N;;;;2D18; +10B9;GEORGIAN CAPITAL LETTER CHIN;Lu;0;L;;;;;N;;;;2D19; +10BA;GEORGIAN CAPITAL LETTER CAN;Lu;0;L;;;;;N;;;;2D1A; +10BB;GEORGIAN CAPITAL LETTER JIL;Lu;0;L;;;;;N;;;;2D1B; +10BC;GEORGIAN CAPITAL LETTER CIL;Lu;0;L;;;;;N;;;;2D1C; +10BD;GEORGIAN CAPITAL LETTER CHAR;Lu;0;L;;;;;N;;;;2D1D; +10BE;GEORGIAN CAPITAL LETTER XAN;Lu;0;L;;;;;N;;;;2D1E; +10BF;GEORGIAN CAPITAL LETTER JHAN;Lu;0;L;;;;;N;;;;2D1F; +10C0;GEORGIAN CAPITAL LETTER HAE;Lu;0;L;;;;;N;;;;2D20; +10C1;GEORGIAN CAPITAL LETTER HE;Lu;0;L;;;;;N;;;;2D21; +10C2;GEORGIAN CAPITAL LETTER HIE;Lu;0;L;;;;;N;;;;2D22; +10C3;GEORGIAN CAPITAL LETTER WE;Lu;0;L;;;;;N;;;;2D23; +10C4;GEORGIAN CAPITAL LETTER HAR;Lu;0;L;;;;;N;;;;2D24; +10C5;GEORGIAN CAPITAL LETTER HOE;Lu;0;L;;;;;N;;;;2D25; +10C7;GEORGIAN CAPITAL LETTER YN;Lu;0;L;;;;;N;;;;2D27; +10CD;GEORGIAN CAPITAL LETTER AEN;Lu;0;L;;;;;N;;;;2D2D; +10D0;GEORGIAN LETTER AN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER AN;;1C90;;10D0 +10D1;GEORGIAN LETTER BAN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER BAN;;1C91;;10D1 +10D2;GEORGIAN LETTER GAN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER GAN;;1C92;;10D2 +10D3;GEORGIAN LETTER DON;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER DON;;1C93;;10D3 +10D4;GEORGIAN LETTER EN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER EN;;1C94;;10D4 +10D5;GEORGIAN LETTER VIN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER VIN;;1C95;;10D5 +10D6;GEORGIAN LETTER ZEN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER ZEN;;1C96;;10D6 +10D7;GEORGIAN LETTER TAN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER TAN;;1C97;;10D7 +10D8;GEORGIAN LETTER IN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER IN;;1C98;;10D8 +10D9;GEORGIAN LETTER KAN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER KAN;;1C99;;10D9 +10DA;GEORGIAN LETTER LAS;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER LAS;;1C9A;;10DA +10DB;GEORGIAN LETTER MAN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER MAN;;1C9B;;10DB +10DC;GEORGIAN LETTER NAR;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER NAR;;1C9C;;10DC +10DD;GEORGIAN LETTER ON;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER ON;;1C9D;;10DD +10DE;GEORGIAN LETTER PAR;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER PAR;;1C9E;;10DE +10DF;GEORGIAN LETTER ZHAR;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER ZHAR;;1C9F;;10DF +10E0;GEORGIAN LETTER RAE;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER RAE;;1CA0;;10E0 +10E1;GEORGIAN LETTER SAN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER SAN;;1CA1;;10E1 +10E2;GEORGIAN LETTER TAR;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER TAR;;1CA2;;10E2 +10E3;GEORGIAN LETTER UN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER UN;;1CA3;;10E3 +10E4;GEORGIAN LETTER PHAR;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER PHAR;;1CA4;;10E4 +10E5;GEORGIAN LETTER KHAR;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER KHAR;;1CA5;;10E5 +10E6;GEORGIAN LETTER GHAN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER GHAN;;1CA6;;10E6 +10E7;GEORGIAN LETTER QAR;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER QAR;;1CA7;;10E7 +10E8;GEORGIAN LETTER SHIN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER SHIN;;1CA8;;10E8 +10E9;GEORGIAN LETTER CHIN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER CHIN;;1CA9;;10E9 +10EA;GEORGIAN LETTER CAN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER CAN;;1CAA;;10EA +10EB;GEORGIAN LETTER JIL;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER JIL;;1CAB;;10EB +10EC;GEORGIAN LETTER CIL;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER CIL;;1CAC;;10EC +10ED;GEORGIAN LETTER CHAR;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER CHAR;;1CAD;;10ED +10EE;GEORGIAN LETTER XAN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER XAN;;1CAE;;10EE +10EF;GEORGIAN LETTER JHAN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER JHAN;;1CAF;;10EF +10F0;GEORGIAN LETTER HAE;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER HAE;;1CB0;;10F0 +10F1;GEORGIAN LETTER HE;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER HE;;1CB1;;10F1 +10F2;GEORGIAN LETTER HIE;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER HIE;;1CB2;;10F2 +10F3;GEORGIAN LETTER WE;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER WE;;1CB3;;10F3 +10F4;GEORGIAN LETTER HAR;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER HAR;;1CB4;;10F4 +10F5;GEORGIAN LETTER HOE;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER HOE;;1CB5;;10F5 +10F6;GEORGIAN LETTER FI;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER FI;;1CB6;;10F6 +10F7;GEORGIAN LETTER YN;Ll;0;L;;;;;N;;;1CB7;;10F7 +10F8;GEORGIAN LETTER ELIFI;Ll;0;L;;;;;N;;;1CB8;;10F8 +10F9;GEORGIAN LETTER TURNED GAN;Ll;0;L;;;;;N;;;1CB9;;10F9 +10FA;GEORGIAN LETTER AIN;Ll;0;L;;;;;N;;;1CBA;;10FA +10FB;GEORGIAN PARAGRAPH SEPARATOR;Po;0;L;;;;;N;;;;; +10FC;MODIFIER LETTER GEORGIAN NAR;Lm;0;L; 10DC;;;;N;;;;; +10FD;GEORGIAN LETTER AEN;Ll;0;L;;;;;N;;;1CBD;;10FD +10FE;GEORGIAN LETTER HARD SIGN;Ll;0;L;;;;;N;;;1CBE;;10FE +10FF;GEORGIAN LETTER LABIAL SIGN;Ll;0;L;;;;;N;;;1CBF;;10FF +1100;HANGUL CHOSEONG KIYEOK;Lo;0;L;;;;;N;;;;; +1101;HANGUL CHOSEONG SSANGKIYEOK;Lo;0;L;;;;;N;;;;; +1102;HANGUL CHOSEONG NIEUN;Lo;0;L;;;;;N;;;;; +1103;HANGUL CHOSEONG TIKEUT;Lo;0;L;;;;;N;;;;; +1104;HANGUL CHOSEONG SSANGTIKEUT;Lo;0;L;;;;;N;;;;; +1105;HANGUL CHOSEONG RIEUL;Lo;0;L;;;;;N;;;;; +1106;HANGUL CHOSEONG MIEUM;Lo;0;L;;;;;N;;;;; +1107;HANGUL CHOSEONG PIEUP;Lo;0;L;;;;;N;;;;; +1108;HANGUL CHOSEONG SSANGPIEUP;Lo;0;L;;;;;N;;;;; +1109;HANGUL CHOSEONG SIOS;Lo;0;L;;;;;N;;;;; +110A;HANGUL CHOSEONG SSANGSIOS;Lo;0;L;;;;;N;;;;; +110B;HANGUL CHOSEONG IEUNG;Lo;0;L;;;;;N;;;;; +110C;HANGUL CHOSEONG CIEUC;Lo;0;L;;;;;N;;;;; +110D;HANGUL CHOSEONG SSANGCIEUC;Lo;0;L;;;;;N;;;;; +110E;HANGUL CHOSEONG CHIEUCH;Lo;0;L;;;;;N;;;;; +110F;HANGUL CHOSEONG KHIEUKH;Lo;0;L;;;;;N;;;;; +1110;HANGUL CHOSEONG THIEUTH;Lo;0;L;;;;;N;;;;; +1111;HANGUL CHOSEONG PHIEUPH;Lo;0;L;;;;;N;;;;; +1112;HANGUL CHOSEONG HIEUH;Lo;0;L;;;;;N;;;;; +1113;HANGUL CHOSEONG NIEUN-KIYEOK;Lo;0;L;;;;;N;;;;; +1114;HANGUL CHOSEONG SSANGNIEUN;Lo;0;L;;;;;N;;;;; +1115;HANGUL CHOSEONG NIEUN-TIKEUT;Lo;0;L;;;;;N;;;;; +1116;HANGUL CHOSEONG NIEUN-PIEUP;Lo;0;L;;;;;N;;;;; +1117;HANGUL CHOSEONG TIKEUT-KIYEOK;Lo;0;L;;;;;N;;;;; +1118;HANGUL CHOSEONG RIEUL-NIEUN;Lo;0;L;;;;;N;;;;; +1119;HANGUL CHOSEONG SSANGRIEUL;Lo;0;L;;;;;N;;;;; +111A;HANGUL CHOSEONG RIEUL-HIEUH;Lo;0;L;;;;;N;;;;; +111B;HANGUL CHOSEONG KAPYEOUNRIEUL;Lo;0;L;;;;;N;;;;; +111C;HANGUL CHOSEONG MIEUM-PIEUP;Lo;0;L;;;;;N;;;;; +111D;HANGUL CHOSEONG KAPYEOUNMIEUM;Lo;0;L;;;;;N;;;;; +111E;HANGUL CHOSEONG PIEUP-KIYEOK;Lo;0;L;;;;;N;;;;; +111F;HANGUL CHOSEONG PIEUP-NIEUN;Lo;0;L;;;;;N;;;;; +1120;HANGUL CHOSEONG PIEUP-TIKEUT;Lo;0;L;;;;;N;;;;; +1121;HANGUL CHOSEONG PIEUP-SIOS;Lo;0;L;;;;;N;;;;; +1122;HANGUL CHOSEONG PIEUP-SIOS-KIYEOK;Lo;0;L;;;;;N;;;;; +1123;HANGUL CHOSEONG PIEUP-SIOS-TIKEUT;Lo;0;L;;;;;N;;;;; +1124;HANGUL CHOSEONG PIEUP-SIOS-PIEUP;Lo;0;L;;;;;N;;;;; +1125;HANGUL CHOSEONG PIEUP-SSANGSIOS;Lo;0;L;;;;;N;;;;; +1126;HANGUL CHOSEONG PIEUP-SIOS-CIEUC;Lo;0;L;;;;;N;;;;; +1127;HANGUL CHOSEONG PIEUP-CIEUC;Lo;0;L;;;;;N;;;;; +1128;HANGUL CHOSEONG PIEUP-CHIEUCH;Lo;0;L;;;;;N;;;;; +1129;HANGUL CHOSEONG PIEUP-THIEUTH;Lo;0;L;;;;;N;;;;; +112A;HANGUL CHOSEONG PIEUP-PHIEUPH;Lo;0;L;;;;;N;;;;; +112B;HANGUL CHOSEONG KAPYEOUNPIEUP;Lo;0;L;;;;;N;;;;; +112C;HANGUL CHOSEONG KAPYEOUNSSANGPIEUP;Lo;0;L;;;;;N;;;;; +112D;HANGUL CHOSEONG SIOS-KIYEOK;Lo;0;L;;;;;N;;;;; +112E;HANGUL CHOSEONG SIOS-NIEUN;Lo;0;L;;;;;N;;;;; +112F;HANGUL CHOSEONG SIOS-TIKEUT;Lo;0;L;;;;;N;;;;; +1130;HANGUL CHOSEONG SIOS-RIEUL;Lo;0;L;;;;;N;;;;; +1131;HANGUL CHOSEONG SIOS-MIEUM;Lo;0;L;;;;;N;;;;; +1132;HANGUL CHOSEONG SIOS-PIEUP;Lo;0;L;;;;;N;;;;; +1133;HANGUL CHOSEONG SIOS-PIEUP-KIYEOK;Lo;0;L;;;;;N;;;;; +1134;HANGUL CHOSEONG SIOS-SSANGSIOS;Lo;0;L;;;;;N;;;;; +1135;HANGUL CHOSEONG SIOS-IEUNG;Lo;0;L;;;;;N;;;;; +1136;HANGUL CHOSEONG SIOS-CIEUC;Lo;0;L;;;;;N;;;;; +1137;HANGUL CHOSEONG SIOS-CHIEUCH;Lo;0;L;;;;;N;;;;; +1138;HANGUL CHOSEONG SIOS-KHIEUKH;Lo;0;L;;;;;N;;;;; +1139;HANGUL CHOSEONG SIOS-THIEUTH;Lo;0;L;;;;;N;;;;; +113A;HANGUL CHOSEONG SIOS-PHIEUPH;Lo;0;L;;;;;N;;;;; +113B;HANGUL CHOSEONG SIOS-HIEUH;Lo;0;L;;;;;N;;;;; +113C;HANGUL CHOSEONG CHITUEUMSIOS;Lo;0;L;;;;;N;;;;; +113D;HANGUL CHOSEONG CHITUEUMSSANGSIOS;Lo;0;L;;;;;N;;;;; +113E;HANGUL CHOSEONG CEONGCHIEUMSIOS;Lo;0;L;;;;;N;;;;; +113F;HANGUL CHOSEONG CEONGCHIEUMSSANGSIOS;Lo;0;L;;;;;N;;;;; +1140;HANGUL CHOSEONG PANSIOS;Lo;0;L;;;;;N;;;;; +1141;HANGUL CHOSEONG IEUNG-KIYEOK;Lo;0;L;;;;;N;;;;; +1142;HANGUL CHOSEONG IEUNG-TIKEUT;Lo;0;L;;;;;N;;;;; +1143;HANGUL CHOSEONG IEUNG-MIEUM;Lo;0;L;;;;;N;;;;; +1144;HANGUL CHOSEONG IEUNG-PIEUP;Lo;0;L;;;;;N;;;;; +1145;HANGUL CHOSEONG IEUNG-SIOS;Lo;0;L;;;;;N;;;;; +1146;HANGUL CHOSEONG IEUNG-PANSIOS;Lo;0;L;;;;;N;;;;; +1147;HANGUL CHOSEONG SSANGIEUNG;Lo;0;L;;;;;N;;;;; +1148;HANGUL CHOSEONG IEUNG-CIEUC;Lo;0;L;;;;;N;;;;; +1149;HANGUL CHOSEONG IEUNG-CHIEUCH;Lo;0;L;;;;;N;;;;; +114A;HANGUL CHOSEONG IEUNG-THIEUTH;Lo;0;L;;;;;N;;;;; +114B;HANGUL CHOSEONG IEUNG-PHIEUPH;Lo;0;L;;;;;N;;;;; +114C;HANGUL CHOSEONG YESIEUNG;Lo;0;L;;;;;N;;;;; +114D;HANGUL CHOSEONG CIEUC-IEUNG;Lo;0;L;;;;;N;;;;; +114E;HANGUL CHOSEONG CHITUEUMCIEUC;Lo;0;L;;;;;N;;;;; +114F;HANGUL CHOSEONG CHITUEUMSSANGCIEUC;Lo;0;L;;;;;N;;;;; +1150;HANGUL CHOSEONG CEONGCHIEUMCIEUC;Lo;0;L;;;;;N;;;;; +1151;HANGUL CHOSEONG CEONGCHIEUMSSANGCIEUC;Lo;0;L;;;;;N;;;;; +1152;HANGUL CHOSEONG CHIEUCH-KHIEUKH;Lo;0;L;;;;;N;;;;; +1153;HANGUL CHOSEONG CHIEUCH-HIEUH;Lo;0;L;;;;;N;;;;; +1154;HANGUL CHOSEONG CHITUEUMCHIEUCH;Lo;0;L;;;;;N;;;;; +1155;HANGUL CHOSEONG CEONGCHIEUMCHIEUCH;Lo;0;L;;;;;N;;;;; +1156;HANGUL CHOSEONG PHIEUPH-PIEUP;Lo;0;L;;;;;N;;;;; +1157;HANGUL CHOSEONG KAPYEOUNPHIEUPH;Lo;0;L;;;;;N;;;;; +1158;HANGUL CHOSEONG SSANGHIEUH;Lo;0;L;;;;;N;;;;; +1159;HANGUL CHOSEONG YEORINHIEUH;Lo;0;L;;;;;N;;;;; +115A;HANGUL CHOSEONG KIYEOK-TIKEUT;Lo;0;L;;;;;N;;;;; +115B;HANGUL CHOSEONG NIEUN-SIOS;Lo;0;L;;;;;N;;;;; +115C;HANGUL CHOSEONG NIEUN-CIEUC;Lo;0;L;;;;;N;;;;; +115D;HANGUL CHOSEONG NIEUN-HIEUH;Lo;0;L;;;;;N;;;;; +115E;HANGUL CHOSEONG TIKEUT-RIEUL;Lo;0;L;;;;;N;;;;; +115F;HANGUL CHOSEONG FILLER;Lo;0;L;;;;;N;;;;; +1160;HANGUL JUNGSEONG FILLER;Lo;0;L;;;;;N;;;;; +1161;HANGUL JUNGSEONG A;Lo;0;L;;;;;N;;;;; +1162;HANGUL JUNGSEONG AE;Lo;0;L;;;;;N;;;;; +1163;HANGUL JUNGSEONG YA;Lo;0;L;;;;;N;;;;; +1164;HANGUL JUNGSEONG YAE;Lo;0;L;;;;;N;;;;; +1165;HANGUL JUNGSEONG EO;Lo;0;L;;;;;N;;;;; +1166;HANGUL JUNGSEONG E;Lo;0;L;;;;;N;;;;; +1167;HANGUL JUNGSEONG YEO;Lo;0;L;;;;;N;;;;; +1168;HANGUL JUNGSEONG YE;Lo;0;L;;;;;N;;;;; +1169;HANGUL JUNGSEONG O;Lo;0;L;;;;;N;;;;; +116A;HANGUL JUNGSEONG WA;Lo;0;L;;;;;N;;;;; +116B;HANGUL JUNGSEONG WAE;Lo;0;L;;;;;N;;;;; +116C;HANGUL JUNGSEONG OE;Lo;0;L;;;;;N;;;;; +116D;HANGUL JUNGSEONG YO;Lo;0;L;;;;;N;;;;; +116E;HANGUL JUNGSEONG U;Lo;0;L;;;;;N;;;;; +116F;HANGUL JUNGSEONG WEO;Lo;0;L;;;;;N;;;;; +1170;HANGUL JUNGSEONG WE;Lo;0;L;;;;;N;;;;; +1171;HANGUL JUNGSEONG WI;Lo;0;L;;;;;N;;;;; +1172;HANGUL JUNGSEONG YU;Lo;0;L;;;;;N;;;;; +1173;HANGUL JUNGSEONG EU;Lo;0;L;;;;;N;;;;; +1174;HANGUL JUNGSEONG YI;Lo;0;L;;;;;N;;;;; +1175;HANGUL JUNGSEONG I;Lo;0;L;;;;;N;;;;; +1176;HANGUL JUNGSEONG A-O;Lo;0;L;;;;;N;;;;; +1177;HANGUL JUNGSEONG A-U;Lo;0;L;;;;;N;;;;; +1178;HANGUL JUNGSEONG YA-O;Lo;0;L;;;;;N;;;;; +1179;HANGUL JUNGSEONG YA-YO;Lo;0;L;;;;;N;;;;; +117A;HANGUL JUNGSEONG EO-O;Lo;0;L;;;;;N;;;;; +117B;HANGUL JUNGSEONG EO-U;Lo;0;L;;;;;N;;;;; +117C;HANGUL JUNGSEONG EO-EU;Lo;0;L;;;;;N;;;;; +117D;HANGUL JUNGSEONG YEO-O;Lo;0;L;;;;;N;;;;; +117E;HANGUL JUNGSEONG YEO-U;Lo;0;L;;;;;N;;;;; +117F;HANGUL JUNGSEONG O-EO;Lo;0;L;;;;;N;;;;; +1180;HANGUL JUNGSEONG O-E;Lo;0;L;;;;;N;;;;; +1181;HANGUL JUNGSEONG O-YE;Lo;0;L;;;;;N;;;;; +1182;HANGUL JUNGSEONG O-O;Lo;0;L;;;;;N;;;;; +1183;HANGUL JUNGSEONG O-U;Lo;0;L;;;;;N;;;;; +1184;HANGUL JUNGSEONG YO-YA;Lo;0;L;;;;;N;;;;; +1185;HANGUL JUNGSEONG YO-YAE;Lo;0;L;;;;;N;;;;; +1186;HANGUL JUNGSEONG YO-YEO;Lo;0;L;;;;;N;;;;; +1187;HANGUL JUNGSEONG YO-O;Lo;0;L;;;;;N;;;;; +1188;HANGUL JUNGSEONG YO-I;Lo;0;L;;;;;N;;;;; +1189;HANGUL JUNGSEONG U-A;Lo;0;L;;;;;N;;;;; +118A;HANGUL JUNGSEONG U-AE;Lo;0;L;;;;;N;;;;; +118B;HANGUL JUNGSEONG U-EO-EU;Lo;0;L;;;;;N;;;;; +118C;HANGUL JUNGSEONG U-YE;Lo;0;L;;;;;N;;;;; +118D;HANGUL JUNGSEONG U-U;Lo;0;L;;;;;N;;;;; +118E;HANGUL JUNGSEONG YU-A;Lo;0;L;;;;;N;;;;; +118F;HANGUL JUNGSEONG YU-EO;Lo;0;L;;;;;N;;;;; +1190;HANGUL JUNGSEONG YU-E;Lo;0;L;;;;;N;;;;; +1191;HANGUL JUNGSEONG YU-YEO;Lo;0;L;;;;;N;;;;; +1192;HANGUL JUNGSEONG YU-YE;Lo;0;L;;;;;N;;;;; +1193;HANGUL JUNGSEONG YU-U;Lo;0;L;;;;;N;;;;; +1194;HANGUL JUNGSEONG YU-I;Lo;0;L;;;;;N;;;;; +1195;HANGUL JUNGSEONG EU-U;Lo;0;L;;;;;N;;;;; +1196;HANGUL JUNGSEONG EU-EU;Lo;0;L;;;;;N;;;;; +1197;HANGUL JUNGSEONG YI-U;Lo;0;L;;;;;N;;;;; +1198;HANGUL JUNGSEONG I-A;Lo;0;L;;;;;N;;;;; +1199;HANGUL JUNGSEONG I-YA;Lo;0;L;;;;;N;;;;; +119A;HANGUL JUNGSEONG I-O;Lo;0;L;;;;;N;;;;; +119B;HANGUL JUNGSEONG I-U;Lo;0;L;;;;;N;;;;; +119C;HANGUL JUNGSEONG I-EU;Lo;0;L;;;;;N;;;;; +119D;HANGUL JUNGSEONG I-ARAEA;Lo;0;L;;;;;N;;;;; +119E;HANGUL JUNGSEONG ARAEA;Lo;0;L;;;;;N;;;;; +119F;HANGUL JUNGSEONG ARAEA-EO;Lo;0;L;;;;;N;;;;; +11A0;HANGUL JUNGSEONG ARAEA-U;Lo;0;L;;;;;N;;;;; +11A1;HANGUL JUNGSEONG ARAEA-I;Lo;0;L;;;;;N;;;;; +11A2;HANGUL JUNGSEONG SSANGARAEA;Lo;0;L;;;;;N;;;;; +11A3;HANGUL JUNGSEONG A-EU;Lo;0;L;;;;;N;;;;; +11A4;HANGUL JUNGSEONG YA-U;Lo;0;L;;;;;N;;;;; +11A5;HANGUL JUNGSEONG YEO-YA;Lo;0;L;;;;;N;;;;; +11A6;HANGUL JUNGSEONG O-YA;Lo;0;L;;;;;N;;;;; +11A7;HANGUL JUNGSEONG O-YAE;Lo;0;L;;;;;N;;;;; +11A8;HANGUL JONGSEONG KIYEOK;Lo;0;L;;;;;N;;;;; +11A9;HANGUL JONGSEONG SSANGKIYEOK;Lo;0;L;;;;;N;;;;; +11AA;HANGUL JONGSEONG KIYEOK-SIOS;Lo;0;L;;;;;N;;;;; +11AB;HANGUL JONGSEONG NIEUN;Lo;0;L;;;;;N;;;;; +11AC;HANGUL JONGSEONG NIEUN-CIEUC;Lo;0;L;;;;;N;;;;; +11AD;HANGUL JONGSEONG NIEUN-HIEUH;Lo;0;L;;;;;N;;;;; +11AE;HANGUL JONGSEONG TIKEUT;Lo;0;L;;;;;N;;;;; +11AF;HANGUL JONGSEONG RIEUL;Lo;0;L;;;;;N;;;;; +11B0;HANGUL JONGSEONG RIEUL-KIYEOK;Lo;0;L;;;;;N;;;;; +11B1;HANGUL JONGSEONG RIEUL-MIEUM;Lo;0;L;;;;;N;;;;; +11B2;HANGUL JONGSEONG RIEUL-PIEUP;Lo;0;L;;;;;N;;;;; +11B3;HANGUL JONGSEONG RIEUL-SIOS;Lo;0;L;;;;;N;;;;; +11B4;HANGUL JONGSEONG RIEUL-THIEUTH;Lo;0;L;;;;;N;;;;; +11B5;HANGUL JONGSEONG RIEUL-PHIEUPH;Lo;0;L;;;;;N;;;;; +11B6;HANGUL JONGSEONG RIEUL-HIEUH;Lo;0;L;;;;;N;;;;; +11B7;HANGUL JONGSEONG MIEUM;Lo;0;L;;;;;N;;;;; +11B8;HANGUL JONGSEONG PIEUP;Lo;0;L;;;;;N;;;;; +11B9;HANGUL JONGSEONG PIEUP-SIOS;Lo;0;L;;;;;N;;;;; +11BA;HANGUL JONGSEONG SIOS;Lo;0;L;;;;;N;;;;; +11BB;HANGUL JONGSEONG SSANGSIOS;Lo;0;L;;;;;N;;;;; +11BC;HANGUL JONGSEONG IEUNG;Lo;0;L;;;;;N;;;;; +11BD;HANGUL JONGSEONG CIEUC;Lo;0;L;;;;;N;;;;; +11BE;HANGUL JONGSEONG CHIEUCH;Lo;0;L;;;;;N;;;;; +11BF;HANGUL JONGSEONG KHIEUKH;Lo;0;L;;;;;N;;;;; +11C0;HANGUL JONGSEONG THIEUTH;Lo;0;L;;;;;N;;;;; +11C1;HANGUL JONGSEONG PHIEUPH;Lo;0;L;;;;;N;;;;; +11C2;HANGUL JONGSEONG HIEUH;Lo;0;L;;;;;N;;;;; +11C3;HANGUL JONGSEONG KIYEOK-RIEUL;Lo;0;L;;;;;N;;;;; +11C4;HANGUL JONGSEONG KIYEOK-SIOS-KIYEOK;Lo;0;L;;;;;N;;;;; +11C5;HANGUL JONGSEONG NIEUN-KIYEOK;Lo;0;L;;;;;N;;;;; +11C6;HANGUL JONGSEONG NIEUN-TIKEUT;Lo;0;L;;;;;N;;;;; +11C7;HANGUL JONGSEONG NIEUN-SIOS;Lo;0;L;;;;;N;;;;; +11C8;HANGUL JONGSEONG NIEUN-PANSIOS;Lo;0;L;;;;;N;;;;; +11C9;HANGUL JONGSEONG NIEUN-THIEUTH;Lo;0;L;;;;;N;;;;; +11CA;HANGUL JONGSEONG TIKEUT-KIYEOK;Lo;0;L;;;;;N;;;;; +11CB;HANGUL JONGSEONG TIKEUT-RIEUL;Lo;0;L;;;;;N;;;;; +11CC;HANGUL JONGSEONG RIEUL-KIYEOK-SIOS;Lo;0;L;;;;;N;;;;; +11CD;HANGUL JONGSEONG RIEUL-NIEUN;Lo;0;L;;;;;N;;;;; +11CE;HANGUL JONGSEONG RIEUL-TIKEUT;Lo;0;L;;;;;N;;;;; +11CF;HANGUL JONGSEONG RIEUL-TIKEUT-HIEUH;Lo;0;L;;;;;N;;;;; +11D0;HANGUL JONGSEONG SSANGRIEUL;Lo;0;L;;;;;N;;;;; +11D1;HANGUL JONGSEONG RIEUL-MIEUM-KIYEOK;Lo;0;L;;;;;N;;;;; +11D2;HANGUL JONGSEONG RIEUL-MIEUM-SIOS;Lo;0;L;;;;;N;;;;; +11D3;HANGUL JONGSEONG RIEUL-PIEUP-SIOS;Lo;0;L;;;;;N;;;;; +11D4;HANGUL JONGSEONG RIEUL-PIEUP-HIEUH;Lo;0;L;;;;;N;;;;; +11D5;HANGUL JONGSEONG RIEUL-KAPYEOUNPIEUP;Lo;0;L;;;;;N;;;;; +11D6;HANGUL JONGSEONG RIEUL-SSANGSIOS;Lo;0;L;;;;;N;;;;; +11D7;HANGUL JONGSEONG RIEUL-PANSIOS;Lo;0;L;;;;;N;;;;; +11D8;HANGUL JONGSEONG RIEUL-KHIEUKH;Lo;0;L;;;;;N;;;;; +11D9;HANGUL JONGSEONG RIEUL-YEORINHIEUH;Lo;0;L;;;;;N;;;;; +11DA;HANGUL JONGSEONG MIEUM-KIYEOK;Lo;0;L;;;;;N;;;;; +11DB;HANGUL JONGSEONG MIEUM-RIEUL;Lo;0;L;;;;;N;;;;; +11DC;HANGUL JONGSEONG MIEUM-PIEUP;Lo;0;L;;;;;N;;;;; +11DD;HANGUL JONGSEONG MIEUM-SIOS;Lo;0;L;;;;;N;;;;; +11DE;HANGUL JONGSEONG MIEUM-SSANGSIOS;Lo;0;L;;;;;N;;;;; +11DF;HANGUL JONGSEONG MIEUM-PANSIOS;Lo;0;L;;;;;N;;;;; +11E0;HANGUL JONGSEONG MIEUM-CHIEUCH;Lo;0;L;;;;;N;;;;; +11E1;HANGUL JONGSEONG MIEUM-HIEUH;Lo;0;L;;;;;N;;;;; +11E2;HANGUL JONGSEONG KAPYEOUNMIEUM;Lo;0;L;;;;;N;;;;; +11E3;HANGUL JONGSEONG PIEUP-RIEUL;Lo;0;L;;;;;N;;;;; +11E4;HANGUL JONGSEONG PIEUP-PHIEUPH;Lo;0;L;;;;;N;;;;; +11E5;HANGUL JONGSEONG PIEUP-HIEUH;Lo;0;L;;;;;N;;;;; +11E6;HANGUL JONGSEONG KAPYEOUNPIEUP;Lo;0;L;;;;;N;;;;; +11E7;HANGUL JONGSEONG SIOS-KIYEOK;Lo;0;L;;;;;N;;;;; +11E8;HANGUL JONGSEONG SIOS-TIKEUT;Lo;0;L;;;;;N;;;;; +11E9;HANGUL JONGSEONG SIOS-RIEUL;Lo;0;L;;;;;N;;;;; +11EA;HANGUL JONGSEONG SIOS-PIEUP;Lo;0;L;;;;;N;;;;; +11EB;HANGUL JONGSEONG PANSIOS;Lo;0;L;;;;;N;;;;; +11EC;HANGUL JONGSEONG IEUNG-KIYEOK;Lo;0;L;;;;;N;;;;; +11ED;HANGUL JONGSEONG IEUNG-SSANGKIYEOK;Lo;0;L;;;;;N;;;;; +11EE;HANGUL JONGSEONG SSANGIEUNG;Lo;0;L;;;;;N;;;;; +11EF;HANGUL JONGSEONG IEUNG-KHIEUKH;Lo;0;L;;;;;N;;;;; +11F0;HANGUL JONGSEONG YESIEUNG;Lo;0;L;;;;;N;;;;; +11F1;HANGUL JONGSEONG YESIEUNG-SIOS;Lo;0;L;;;;;N;;;;; +11F2;HANGUL JONGSEONG YESIEUNG-PANSIOS;Lo;0;L;;;;;N;;;;; +11F3;HANGUL JONGSEONG PHIEUPH-PIEUP;Lo;0;L;;;;;N;;;;; +11F4;HANGUL JONGSEONG KAPYEOUNPHIEUPH;Lo;0;L;;;;;N;;;;; +11F5;HANGUL JONGSEONG HIEUH-NIEUN;Lo;0;L;;;;;N;;;;; +11F6;HANGUL JONGSEONG HIEUH-RIEUL;Lo;0;L;;;;;N;;;;; +11F7;HANGUL JONGSEONG HIEUH-MIEUM;Lo;0;L;;;;;N;;;;; +11F8;HANGUL JONGSEONG HIEUH-PIEUP;Lo;0;L;;;;;N;;;;; +11F9;HANGUL JONGSEONG YEORINHIEUH;Lo;0;L;;;;;N;;;;; +11FA;HANGUL JONGSEONG KIYEOK-NIEUN;Lo;0;L;;;;;N;;;;; +11FB;HANGUL JONGSEONG KIYEOK-PIEUP;Lo;0;L;;;;;N;;;;; +11FC;HANGUL JONGSEONG KIYEOK-CHIEUCH;Lo;0;L;;;;;N;;;;; +11FD;HANGUL JONGSEONG KIYEOK-KHIEUKH;Lo;0;L;;;;;N;;;;; +11FE;HANGUL JONGSEONG KIYEOK-HIEUH;Lo;0;L;;;;;N;;;;; +11FF;HANGUL JONGSEONG SSANGNIEUN;Lo;0;L;;;;;N;;;;; +1200;ETHIOPIC SYLLABLE HA;Lo;0;L;;;;;N;;;;; +1201;ETHIOPIC SYLLABLE HU;Lo;0;L;;;;;N;;;;; +1202;ETHIOPIC SYLLABLE HI;Lo;0;L;;;;;N;;;;; +1203;ETHIOPIC SYLLABLE HAA;Lo;0;L;;;;;N;;;;; +1204;ETHIOPIC SYLLABLE HEE;Lo;0;L;;;;;N;;;;; +1205;ETHIOPIC SYLLABLE HE;Lo;0;L;;;;;N;;;;; +1206;ETHIOPIC SYLLABLE HO;Lo;0;L;;;;;N;;;;; +1207;ETHIOPIC SYLLABLE HOA;Lo;0;L;;;;;N;;;;; +1208;ETHIOPIC SYLLABLE LA;Lo;0;L;;;;;N;;;;; +1209;ETHIOPIC SYLLABLE LU;Lo;0;L;;;;;N;;;;; +120A;ETHIOPIC SYLLABLE LI;Lo;0;L;;;;;N;;;;; +120B;ETHIOPIC SYLLABLE LAA;Lo;0;L;;;;;N;;;;; +120C;ETHIOPIC SYLLABLE LEE;Lo;0;L;;;;;N;;;;; +120D;ETHIOPIC SYLLABLE LE;Lo;0;L;;;;;N;;;;; +120E;ETHIOPIC SYLLABLE LO;Lo;0;L;;;;;N;;;;; +120F;ETHIOPIC SYLLABLE LWA;Lo;0;L;;;;;N;;;;; +1210;ETHIOPIC SYLLABLE HHA;Lo;0;L;;;;;N;;;;; +1211;ETHIOPIC SYLLABLE HHU;Lo;0;L;;;;;N;;;;; +1212;ETHIOPIC SYLLABLE HHI;Lo;0;L;;;;;N;;;;; +1213;ETHIOPIC SYLLABLE HHAA;Lo;0;L;;;;;N;;;;; +1214;ETHIOPIC SYLLABLE HHEE;Lo;0;L;;;;;N;;;;; +1215;ETHIOPIC SYLLABLE HHE;Lo;0;L;;;;;N;;;;; +1216;ETHIOPIC SYLLABLE HHO;Lo;0;L;;;;;N;;;;; +1217;ETHIOPIC SYLLABLE HHWA;Lo;0;L;;;;;N;;;;; +1218;ETHIOPIC SYLLABLE MA;Lo;0;L;;;;;N;;;;; +1219;ETHIOPIC SYLLABLE MU;Lo;0;L;;;;;N;;;;; +121A;ETHIOPIC SYLLABLE MI;Lo;0;L;;;;;N;;;;; +121B;ETHIOPIC SYLLABLE MAA;Lo;0;L;;;;;N;;;;; +121C;ETHIOPIC SYLLABLE MEE;Lo;0;L;;;;;N;;;;; +121D;ETHIOPIC SYLLABLE ME;Lo;0;L;;;;;N;;;;; +121E;ETHIOPIC SYLLABLE MO;Lo;0;L;;;;;N;;;;; +121F;ETHIOPIC SYLLABLE MWA;Lo;0;L;;;;;N;;;;; +1220;ETHIOPIC SYLLABLE SZA;Lo;0;L;;;;;N;;;;; +1221;ETHIOPIC SYLLABLE SZU;Lo;0;L;;;;;N;;;;; +1222;ETHIOPIC SYLLABLE SZI;Lo;0;L;;;;;N;;;;; +1223;ETHIOPIC SYLLABLE SZAA;Lo;0;L;;;;;N;;;;; +1224;ETHIOPIC SYLLABLE SZEE;Lo;0;L;;;;;N;;;;; +1225;ETHIOPIC SYLLABLE SZE;Lo;0;L;;;;;N;;;;; +1226;ETHIOPIC SYLLABLE SZO;Lo;0;L;;;;;N;;;;; +1227;ETHIOPIC SYLLABLE SZWA;Lo;0;L;;;;;N;;;;; +1228;ETHIOPIC SYLLABLE RA;Lo;0;L;;;;;N;;;;; +1229;ETHIOPIC SYLLABLE RU;Lo;0;L;;;;;N;;;;; +122A;ETHIOPIC SYLLABLE RI;Lo;0;L;;;;;N;;;;; +122B;ETHIOPIC SYLLABLE RAA;Lo;0;L;;;;;N;;;;; +122C;ETHIOPIC SYLLABLE REE;Lo;0;L;;;;;N;;;;; +122D;ETHIOPIC SYLLABLE RE;Lo;0;L;;;;;N;;;;; +122E;ETHIOPIC SYLLABLE RO;Lo;0;L;;;;;N;;;;; +122F;ETHIOPIC SYLLABLE RWA;Lo;0;L;;;;;N;;;;; +1230;ETHIOPIC SYLLABLE SA;Lo;0;L;;;;;N;;;;; +1231;ETHIOPIC SYLLABLE SU;Lo;0;L;;;;;N;;;;; +1232;ETHIOPIC SYLLABLE SI;Lo;0;L;;;;;N;;;;; +1233;ETHIOPIC SYLLABLE SAA;Lo;0;L;;;;;N;;;;; +1234;ETHIOPIC SYLLABLE SEE;Lo;0;L;;;;;N;;;;; +1235;ETHIOPIC SYLLABLE SE;Lo;0;L;;;;;N;;;;; +1236;ETHIOPIC SYLLABLE SO;Lo;0;L;;;;;N;;;;; +1237;ETHIOPIC SYLLABLE SWA;Lo;0;L;;;;;N;;;;; +1238;ETHIOPIC SYLLABLE SHA;Lo;0;L;;;;;N;;;;; +1239;ETHIOPIC SYLLABLE SHU;Lo;0;L;;;;;N;;;;; +123A;ETHIOPIC SYLLABLE SHI;Lo;0;L;;;;;N;;;;; +123B;ETHIOPIC SYLLABLE SHAA;Lo;0;L;;;;;N;;;;; +123C;ETHIOPIC SYLLABLE SHEE;Lo;0;L;;;;;N;;;;; +123D;ETHIOPIC SYLLABLE SHE;Lo;0;L;;;;;N;;;;; +123E;ETHIOPIC SYLLABLE SHO;Lo;0;L;;;;;N;;;;; +123F;ETHIOPIC SYLLABLE SHWA;Lo;0;L;;;;;N;;;;; +1240;ETHIOPIC SYLLABLE QA;Lo;0;L;;;;;N;;;;; +1241;ETHIOPIC SYLLABLE QU;Lo;0;L;;;;;N;;;;; +1242;ETHIOPIC SYLLABLE QI;Lo;0;L;;;;;N;;;;; +1243;ETHIOPIC SYLLABLE QAA;Lo;0;L;;;;;N;;;;; +1244;ETHIOPIC SYLLABLE QEE;Lo;0;L;;;;;N;;;;; +1245;ETHIOPIC SYLLABLE QE;Lo;0;L;;;;;N;;;;; +1246;ETHIOPIC SYLLABLE QO;Lo;0;L;;;;;N;;;;; +1247;ETHIOPIC SYLLABLE QOA;Lo;0;L;;;;;N;;;;; +1248;ETHIOPIC SYLLABLE QWA;Lo;0;L;;;;;N;;;;; +124A;ETHIOPIC SYLLABLE QWI;Lo;0;L;;;;;N;;;;; +124B;ETHIOPIC SYLLABLE QWAA;Lo;0;L;;;;;N;;;;; +124C;ETHIOPIC SYLLABLE QWEE;Lo;0;L;;;;;N;;;;; +124D;ETHIOPIC SYLLABLE QWE;Lo;0;L;;;;;N;;;;; +1250;ETHIOPIC SYLLABLE QHA;Lo;0;L;;;;;N;;;;; +1251;ETHIOPIC SYLLABLE QHU;Lo;0;L;;;;;N;;;;; +1252;ETHIOPIC SYLLABLE QHI;Lo;0;L;;;;;N;;;;; +1253;ETHIOPIC SYLLABLE QHAA;Lo;0;L;;;;;N;;;;; +1254;ETHIOPIC SYLLABLE QHEE;Lo;0;L;;;;;N;;;;; +1255;ETHIOPIC SYLLABLE QHE;Lo;0;L;;;;;N;;;;; +1256;ETHIOPIC SYLLABLE QHO;Lo;0;L;;;;;N;;;;; +1258;ETHIOPIC SYLLABLE QHWA;Lo;0;L;;;;;N;;;;; +125A;ETHIOPIC SYLLABLE QHWI;Lo;0;L;;;;;N;;;;; +125B;ETHIOPIC SYLLABLE QHWAA;Lo;0;L;;;;;N;;;;; +125C;ETHIOPIC SYLLABLE QHWEE;Lo;0;L;;;;;N;;;;; +125D;ETHIOPIC SYLLABLE QHWE;Lo;0;L;;;;;N;;;;; +1260;ETHIOPIC SYLLABLE BA;Lo;0;L;;;;;N;;;;; +1261;ETHIOPIC SYLLABLE BU;Lo;0;L;;;;;N;;;;; +1262;ETHIOPIC SYLLABLE BI;Lo;0;L;;;;;N;;;;; +1263;ETHIOPIC SYLLABLE BAA;Lo;0;L;;;;;N;;;;; +1264;ETHIOPIC SYLLABLE BEE;Lo;0;L;;;;;N;;;;; +1265;ETHIOPIC SYLLABLE BE;Lo;0;L;;;;;N;;;;; +1266;ETHIOPIC SYLLABLE BO;Lo;0;L;;;;;N;;;;; +1267;ETHIOPIC SYLLABLE BWA;Lo;0;L;;;;;N;;;;; +1268;ETHIOPIC SYLLABLE VA;Lo;0;L;;;;;N;;;;; +1269;ETHIOPIC SYLLABLE VU;Lo;0;L;;;;;N;;;;; +126A;ETHIOPIC SYLLABLE VI;Lo;0;L;;;;;N;;;;; +126B;ETHIOPIC SYLLABLE VAA;Lo;0;L;;;;;N;;;;; +126C;ETHIOPIC SYLLABLE VEE;Lo;0;L;;;;;N;;;;; +126D;ETHIOPIC SYLLABLE VE;Lo;0;L;;;;;N;;;;; +126E;ETHIOPIC SYLLABLE VO;Lo;0;L;;;;;N;;;;; +126F;ETHIOPIC SYLLABLE VWA;Lo;0;L;;;;;N;;;;; +1270;ETHIOPIC SYLLABLE TA;Lo;0;L;;;;;N;;;;; +1271;ETHIOPIC SYLLABLE TU;Lo;0;L;;;;;N;;;;; +1272;ETHIOPIC SYLLABLE TI;Lo;0;L;;;;;N;;;;; +1273;ETHIOPIC SYLLABLE TAA;Lo;0;L;;;;;N;;;;; +1274;ETHIOPIC SYLLABLE TEE;Lo;0;L;;;;;N;;;;; +1275;ETHIOPIC SYLLABLE TE;Lo;0;L;;;;;N;;;;; +1276;ETHIOPIC SYLLABLE TO;Lo;0;L;;;;;N;;;;; +1277;ETHIOPIC SYLLABLE TWA;Lo;0;L;;;;;N;;;;; +1278;ETHIOPIC SYLLABLE CA;Lo;0;L;;;;;N;;;;; +1279;ETHIOPIC SYLLABLE CU;Lo;0;L;;;;;N;;;;; +127A;ETHIOPIC SYLLABLE CI;Lo;0;L;;;;;N;;;;; +127B;ETHIOPIC SYLLABLE CAA;Lo;0;L;;;;;N;;;;; +127C;ETHIOPIC SYLLABLE CEE;Lo;0;L;;;;;N;;;;; +127D;ETHIOPIC SYLLABLE CE;Lo;0;L;;;;;N;;;;; +127E;ETHIOPIC SYLLABLE CO;Lo;0;L;;;;;N;;;;; +127F;ETHIOPIC SYLLABLE CWA;Lo;0;L;;;;;N;;;;; +1280;ETHIOPIC SYLLABLE XA;Lo;0;L;;;;;N;;;;; +1281;ETHIOPIC SYLLABLE XU;Lo;0;L;;;;;N;;;;; +1282;ETHIOPIC SYLLABLE XI;Lo;0;L;;;;;N;;;;; +1283;ETHIOPIC SYLLABLE XAA;Lo;0;L;;;;;N;;;;; +1284;ETHIOPIC SYLLABLE XEE;Lo;0;L;;;;;N;;;;; +1285;ETHIOPIC SYLLABLE XE;Lo;0;L;;;;;N;;;;; +1286;ETHIOPIC SYLLABLE XO;Lo;0;L;;;;;N;;;;; +1287;ETHIOPIC SYLLABLE XOA;Lo;0;L;;;;;N;;;;; +1288;ETHIOPIC SYLLABLE XWA;Lo;0;L;;;;;N;;;;; +128A;ETHIOPIC SYLLABLE XWI;Lo;0;L;;;;;N;;;;; +128B;ETHIOPIC SYLLABLE XWAA;Lo;0;L;;;;;N;;;;; +128C;ETHIOPIC SYLLABLE XWEE;Lo;0;L;;;;;N;;;;; +128D;ETHIOPIC SYLLABLE XWE;Lo;0;L;;;;;N;;;;; +1290;ETHIOPIC SYLLABLE NA;Lo;0;L;;;;;N;;;;; +1291;ETHIOPIC SYLLABLE NU;Lo;0;L;;;;;N;;;;; +1292;ETHIOPIC SYLLABLE NI;Lo;0;L;;;;;N;;;;; +1293;ETHIOPIC SYLLABLE NAA;Lo;0;L;;;;;N;;;;; +1294;ETHIOPIC SYLLABLE NEE;Lo;0;L;;;;;N;;;;; +1295;ETHIOPIC SYLLABLE NE;Lo;0;L;;;;;N;;;;; +1296;ETHIOPIC SYLLABLE NO;Lo;0;L;;;;;N;;;;; +1297;ETHIOPIC SYLLABLE NWA;Lo;0;L;;;;;N;;;;; +1298;ETHIOPIC SYLLABLE NYA;Lo;0;L;;;;;N;;;;; +1299;ETHIOPIC SYLLABLE NYU;Lo;0;L;;;;;N;;;;; +129A;ETHIOPIC SYLLABLE NYI;Lo;0;L;;;;;N;;;;; +129B;ETHIOPIC SYLLABLE NYAA;Lo;0;L;;;;;N;;;;; +129C;ETHIOPIC SYLLABLE NYEE;Lo;0;L;;;;;N;;;;; +129D;ETHIOPIC SYLLABLE NYE;Lo;0;L;;;;;N;;;;; +129E;ETHIOPIC SYLLABLE NYO;Lo;0;L;;;;;N;;;;; +129F;ETHIOPIC SYLLABLE NYWA;Lo;0;L;;;;;N;;;;; +12A0;ETHIOPIC SYLLABLE GLOTTAL A;Lo;0;L;;;;;N;;;;; +12A1;ETHIOPIC SYLLABLE GLOTTAL U;Lo;0;L;;;;;N;;;;; +12A2;ETHIOPIC SYLLABLE GLOTTAL I;Lo;0;L;;;;;N;;;;; +12A3;ETHIOPIC SYLLABLE GLOTTAL AA;Lo;0;L;;;;;N;;;;; +12A4;ETHIOPIC SYLLABLE GLOTTAL EE;Lo;0;L;;;;;N;;;;; +12A5;ETHIOPIC SYLLABLE GLOTTAL E;Lo;0;L;;;;;N;;;;; +12A6;ETHIOPIC SYLLABLE GLOTTAL O;Lo;0;L;;;;;N;;;;; +12A7;ETHIOPIC SYLLABLE GLOTTAL WA;Lo;0;L;;;;;N;;;;; +12A8;ETHIOPIC SYLLABLE KA;Lo;0;L;;;;;N;;;;; +12A9;ETHIOPIC SYLLABLE KU;Lo;0;L;;;;;N;;;;; +12AA;ETHIOPIC SYLLABLE KI;Lo;0;L;;;;;N;;;;; +12AB;ETHIOPIC SYLLABLE KAA;Lo;0;L;;;;;N;;;;; +12AC;ETHIOPIC SYLLABLE KEE;Lo;0;L;;;;;N;;;;; +12AD;ETHIOPIC SYLLABLE KE;Lo;0;L;;;;;N;;;;; +12AE;ETHIOPIC SYLLABLE KO;Lo;0;L;;;;;N;;;;; +12AF;ETHIOPIC SYLLABLE KOA;Lo;0;L;;;;;N;;;;; +12B0;ETHIOPIC SYLLABLE KWA;Lo;0;L;;;;;N;;;;; +12B2;ETHIOPIC SYLLABLE KWI;Lo;0;L;;;;;N;;;;; +12B3;ETHIOPIC SYLLABLE KWAA;Lo;0;L;;;;;N;;;;; +12B4;ETHIOPIC SYLLABLE KWEE;Lo;0;L;;;;;N;;;;; +12B5;ETHIOPIC SYLLABLE KWE;Lo;0;L;;;;;N;;;;; +12B8;ETHIOPIC SYLLABLE KXA;Lo;0;L;;;;;N;;;;; +12B9;ETHIOPIC SYLLABLE KXU;Lo;0;L;;;;;N;;;;; +12BA;ETHIOPIC SYLLABLE KXI;Lo;0;L;;;;;N;;;;; +12BB;ETHIOPIC SYLLABLE KXAA;Lo;0;L;;;;;N;;;;; +12BC;ETHIOPIC SYLLABLE KXEE;Lo;0;L;;;;;N;;;;; +12BD;ETHIOPIC SYLLABLE KXE;Lo;0;L;;;;;N;;;;; +12BE;ETHIOPIC SYLLABLE KXO;Lo;0;L;;;;;N;;;;; +12C0;ETHIOPIC SYLLABLE KXWA;Lo;0;L;;;;;N;;;;; +12C2;ETHIOPIC SYLLABLE KXWI;Lo;0;L;;;;;N;;;;; +12C3;ETHIOPIC SYLLABLE KXWAA;Lo;0;L;;;;;N;;;;; +12C4;ETHIOPIC SYLLABLE KXWEE;Lo;0;L;;;;;N;;;;; +12C5;ETHIOPIC SYLLABLE KXWE;Lo;0;L;;;;;N;;;;; +12C8;ETHIOPIC SYLLABLE WA;Lo;0;L;;;;;N;;;;; +12C9;ETHIOPIC SYLLABLE WU;Lo;0;L;;;;;N;;;;; +12CA;ETHIOPIC SYLLABLE WI;Lo;0;L;;;;;N;;;;; +12CB;ETHIOPIC SYLLABLE WAA;Lo;0;L;;;;;N;;;;; +12CC;ETHIOPIC SYLLABLE WEE;Lo;0;L;;;;;N;;;;; +12CD;ETHIOPIC SYLLABLE WE;Lo;0;L;;;;;N;;;;; +12CE;ETHIOPIC SYLLABLE WO;Lo;0;L;;;;;N;;;;; +12CF;ETHIOPIC SYLLABLE WOA;Lo;0;L;;;;;N;;;;; +12D0;ETHIOPIC SYLLABLE PHARYNGEAL A;Lo;0;L;;;;;N;;;;; +12D1;ETHIOPIC SYLLABLE PHARYNGEAL U;Lo;0;L;;;;;N;;;;; +12D2;ETHIOPIC SYLLABLE PHARYNGEAL I;Lo;0;L;;;;;N;;;;; +12D3;ETHIOPIC SYLLABLE PHARYNGEAL AA;Lo;0;L;;;;;N;;;;; +12D4;ETHIOPIC SYLLABLE PHARYNGEAL EE;Lo;0;L;;;;;N;;;;; +12D5;ETHIOPIC SYLLABLE PHARYNGEAL E;Lo;0;L;;;;;N;;;;; +12D6;ETHIOPIC SYLLABLE PHARYNGEAL O;Lo;0;L;;;;;N;;;;; +12D8;ETHIOPIC SYLLABLE ZA;Lo;0;L;;;;;N;;;;; +12D9;ETHIOPIC SYLLABLE ZU;Lo;0;L;;;;;N;;;;; +12DA;ETHIOPIC SYLLABLE ZI;Lo;0;L;;;;;N;;;;; +12DB;ETHIOPIC SYLLABLE ZAA;Lo;0;L;;;;;N;;;;; +12DC;ETHIOPIC SYLLABLE ZEE;Lo;0;L;;;;;N;;;;; +12DD;ETHIOPIC SYLLABLE ZE;Lo;0;L;;;;;N;;;;; +12DE;ETHIOPIC SYLLABLE ZO;Lo;0;L;;;;;N;;;;; +12DF;ETHIOPIC SYLLABLE ZWA;Lo;0;L;;;;;N;;;;; +12E0;ETHIOPIC SYLLABLE ZHA;Lo;0;L;;;;;N;;;;; +12E1;ETHIOPIC SYLLABLE ZHU;Lo;0;L;;;;;N;;;;; +12E2;ETHIOPIC SYLLABLE ZHI;Lo;0;L;;;;;N;;;;; +12E3;ETHIOPIC SYLLABLE ZHAA;Lo;0;L;;;;;N;;;;; +12E4;ETHIOPIC SYLLABLE ZHEE;Lo;0;L;;;;;N;;;;; +12E5;ETHIOPIC SYLLABLE ZHE;Lo;0;L;;;;;N;;;;; +12E6;ETHIOPIC SYLLABLE ZHO;Lo;0;L;;;;;N;;;;; +12E7;ETHIOPIC SYLLABLE ZHWA;Lo;0;L;;;;;N;;;;; +12E8;ETHIOPIC SYLLABLE YA;Lo;0;L;;;;;N;;;;; +12E9;ETHIOPIC SYLLABLE YU;Lo;0;L;;;;;N;;;;; +12EA;ETHIOPIC SYLLABLE YI;Lo;0;L;;;;;N;;;;; +12EB;ETHIOPIC SYLLABLE YAA;Lo;0;L;;;;;N;;;;; +12EC;ETHIOPIC SYLLABLE YEE;Lo;0;L;;;;;N;;;;; +12ED;ETHIOPIC SYLLABLE YE;Lo;0;L;;;;;N;;;;; +12EE;ETHIOPIC SYLLABLE YO;Lo;0;L;;;;;N;;;;; +12EF;ETHIOPIC SYLLABLE YOA;Lo;0;L;;;;;N;;;;; +12F0;ETHIOPIC SYLLABLE DA;Lo;0;L;;;;;N;;;;; +12F1;ETHIOPIC SYLLABLE DU;Lo;0;L;;;;;N;;;;; +12F2;ETHIOPIC SYLLABLE DI;Lo;0;L;;;;;N;;;;; +12F3;ETHIOPIC SYLLABLE DAA;Lo;0;L;;;;;N;;;;; +12F4;ETHIOPIC SYLLABLE DEE;Lo;0;L;;;;;N;;;;; +12F5;ETHIOPIC SYLLABLE DE;Lo;0;L;;;;;N;;;;; +12F6;ETHIOPIC SYLLABLE DO;Lo;0;L;;;;;N;;;;; +12F7;ETHIOPIC SYLLABLE DWA;Lo;0;L;;;;;N;;;;; +12F8;ETHIOPIC SYLLABLE DDA;Lo;0;L;;;;;N;;;;; +12F9;ETHIOPIC SYLLABLE DDU;Lo;0;L;;;;;N;;;;; +12FA;ETHIOPIC SYLLABLE DDI;Lo;0;L;;;;;N;;;;; +12FB;ETHIOPIC SYLLABLE DDAA;Lo;0;L;;;;;N;;;;; +12FC;ETHIOPIC SYLLABLE DDEE;Lo;0;L;;;;;N;;;;; +12FD;ETHIOPIC SYLLABLE DDE;Lo;0;L;;;;;N;;;;; +12FE;ETHIOPIC SYLLABLE DDO;Lo;0;L;;;;;N;;;;; +12FF;ETHIOPIC SYLLABLE DDWA;Lo;0;L;;;;;N;;;;; +1300;ETHIOPIC SYLLABLE JA;Lo;0;L;;;;;N;;;;; +1301;ETHIOPIC SYLLABLE JU;Lo;0;L;;;;;N;;;;; +1302;ETHIOPIC SYLLABLE JI;Lo;0;L;;;;;N;;;;; +1303;ETHIOPIC SYLLABLE JAA;Lo;0;L;;;;;N;;;;; +1304;ETHIOPIC SYLLABLE JEE;Lo;0;L;;;;;N;;;;; +1305;ETHIOPIC SYLLABLE JE;Lo;0;L;;;;;N;;;;; +1306;ETHIOPIC SYLLABLE JO;Lo;0;L;;;;;N;;;;; +1307;ETHIOPIC SYLLABLE JWA;Lo;0;L;;;;;N;;;;; +1308;ETHIOPIC SYLLABLE GA;Lo;0;L;;;;;N;;;;; +1309;ETHIOPIC SYLLABLE GU;Lo;0;L;;;;;N;;;;; +130A;ETHIOPIC SYLLABLE GI;Lo;0;L;;;;;N;;;;; +130B;ETHIOPIC SYLLABLE GAA;Lo;0;L;;;;;N;;;;; +130C;ETHIOPIC SYLLABLE GEE;Lo;0;L;;;;;N;;;;; +130D;ETHIOPIC SYLLABLE GE;Lo;0;L;;;;;N;;;;; +130E;ETHIOPIC SYLLABLE GO;Lo;0;L;;;;;N;;;;; +130F;ETHIOPIC SYLLABLE GOA;Lo;0;L;;;;;N;;;;; +1310;ETHIOPIC SYLLABLE GWA;Lo;0;L;;;;;N;;;;; +1312;ETHIOPIC SYLLABLE GWI;Lo;0;L;;;;;N;;;;; +1313;ETHIOPIC SYLLABLE GWAA;Lo;0;L;;;;;N;;;;; +1314;ETHIOPIC SYLLABLE GWEE;Lo;0;L;;;;;N;;;;; +1315;ETHIOPIC SYLLABLE GWE;Lo;0;L;;;;;N;;;;; +1318;ETHIOPIC SYLLABLE GGA;Lo;0;L;;;;;N;;;;; +1319;ETHIOPIC SYLLABLE GGU;Lo;0;L;;;;;N;;;;; +131A;ETHIOPIC SYLLABLE GGI;Lo;0;L;;;;;N;;;;; +131B;ETHIOPIC SYLLABLE GGAA;Lo;0;L;;;;;N;;;;; +131C;ETHIOPIC SYLLABLE GGEE;Lo;0;L;;;;;N;;;;; +131D;ETHIOPIC SYLLABLE GGE;Lo;0;L;;;;;N;;;;; +131E;ETHIOPIC SYLLABLE GGO;Lo;0;L;;;;;N;;;;; +131F;ETHIOPIC SYLLABLE GGWAA;Lo;0;L;;;;;N;;;;; +1320;ETHIOPIC SYLLABLE THA;Lo;0;L;;;;;N;;;;; +1321;ETHIOPIC SYLLABLE THU;Lo;0;L;;;;;N;;;;; +1322;ETHIOPIC SYLLABLE THI;Lo;0;L;;;;;N;;;;; +1323;ETHIOPIC SYLLABLE THAA;Lo;0;L;;;;;N;;;;; +1324;ETHIOPIC SYLLABLE THEE;Lo;0;L;;;;;N;;;;; +1325;ETHIOPIC SYLLABLE THE;Lo;0;L;;;;;N;;;;; +1326;ETHIOPIC SYLLABLE THO;Lo;0;L;;;;;N;;;;; +1327;ETHIOPIC SYLLABLE THWA;Lo;0;L;;;;;N;;;;; +1328;ETHIOPIC SYLLABLE CHA;Lo;0;L;;;;;N;;;;; +1329;ETHIOPIC SYLLABLE CHU;Lo;0;L;;;;;N;;;;; +132A;ETHIOPIC SYLLABLE CHI;Lo;0;L;;;;;N;;;;; +132B;ETHIOPIC SYLLABLE CHAA;Lo;0;L;;;;;N;;;;; +132C;ETHIOPIC SYLLABLE CHEE;Lo;0;L;;;;;N;;;;; +132D;ETHIOPIC SYLLABLE CHE;Lo;0;L;;;;;N;;;;; +132E;ETHIOPIC SYLLABLE CHO;Lo;0;L;;;;;N;;;;; +132F;ETHIOPIC SYLLABLE CHWA;Lo;0;L;;;;;N;;;;; +1330;ETHIOPIC SYLLABLE PHA;Lo;0;L;;;;;N;;;;; +1331;ETHIOPIC SYLLABLE PHU;Lo;0;L;;;;;N;;;;; +1332;ETHIOPIC SYLLABLE PHI;Lo;0;L;;;;;N;;;;; +1333;ETHIOPIC SYLLABLE PHAA;Lo;0;L;;;;;N;;;;; +1334;ETHIOPIC SYLLABLE PHEE;Lo;0;L;;;;;N;;;;; +1335;ETHIOPIC SYLLABLE PHE;Lo;0;L;;;;;N;;;;; +1336;ETHIOPIC SYLLABLE PHO;Lo;0;L;;;;;N;;;;; +1337;ETHIOPIC SYLLABLE PHWA;Lo;0;L;;;;;N;;;;; +1338;ETHIOPIC SYLLABLE TSA;Lo;0;L;;;;;N;;;;; +1339;ETHIOPIC SYLLABLE TSU;Lo;0;L;;;;;N;;;;; +133A;ETHIOPIC SYLLABLE TSI;Lo;0;L;;;;;N;;;;; +133B;ETHIOPIC SYLLABLE TSAA;Lo;0;L;;;;;N;;;;; +133C;ETHIOPIC SYLLABLE TSEE;Lo;0;L;;;;;N;;;;; +133D;ETHIOPIC SYLLABLE TSE;Lo;0;L;;;;;N;;;;; +133E;ETHIOPIC SYLLABLE TSO;Lo;0;L;;;;;N;;;;; +133F;ETHIOPIC SYLLABLE TSWA;Lo;0;L;;;;;N;;;;; +1340;ETHIOPIC SYLLABLE TZA;Lo;0;L;;;;;N;;;;; +1341;ETHIOPIC SYLLABLE TZU;Lo;0;L;;;;;N;;;;; +1342;ETHIOPIC SYLLABLE TZI;Lo;0;L;;;;;N;;;;; +1343;ETHIOPIC SYLLABLE TZAA;Lo;0;L;;;;;N;;;;; +1344;ETHIOPIC SYLLABLE TZEE;Lo;0;L;;;;;N;;;;; +1345;ETHIOPIC SYLLABLE TZE;Lo;0;L;;;;;N;;;;; +1346;ETHIOPIC SYLLABLE TZO;Lo;0;L;;;;;N;;;;; +1347;ETHIOPIC SYLLABLE TZOA;Lo;0;L;;;;;N;;;;; +1348;ETHIOPIC SYLLABLE FA;Lo;0;L;;;;;N;;;;; +1349;ETHIOPIC SYLLABLE FU;Lo;0;L;;;;;N;;;;; +134A;ETHIOPIC SYLLABLE FI;Lo;0;L;;;;;N;;;;; +134B;ETHIOPIC SYLLABLE FAA;Lo;0;L;;;;;N;;;;; +134C;ETHIOPIC SYLLABLE FEE;Lo;0;L;;;;;N;;;;; +134D;ETHIOPIC SYLLABLE FE;Lo;0;L;;;;;N;;;;; +134E;ETHIOPIC SYLLABLE FO;Lo;0;L;;;;;N;;;;; +134F;ETHIOPIC SYLLABLE FWA;Lo;0;L;;;;;N;;;;; +1350;ETHIOPIC SYLLABLE PA;Lo;0;L;;;;;N;;;;; +1351;ETHIOPIC SYLLABLE PU;Lo;0;L;;;;;N;;;;; +1352;ETHIOPIC SYLLABLE PI;Lo;0;L;;;;;N;;;;; +1353;ETHIOPIC SYLLABLE PAA;Lo;0;L;;;;;N;;;;; +1354;ETHIOPIC SYLLABLE PEE;Lo;0;L;;;;;N;;;;; +1355;ETHIOPIC SYLLABLE PE;Lo;0;L;;;;;N;;;;; +1356;ETHIOPIC SYLLABLE PO;Lo;0;L;;;;;N;;;;; +1357;ETHIOPIC SYLLABLE PWA;Lo;0;L;;;;;N;;;;; +1358;ETHIOPIC SYLLABLE RYA;Lo;0;L;;;;;N;;;;; +1359;ETHIOPIC SYLLABLE MYA;Lo;0;L;;;;;N;;;;; +135A;ETHIOPIC SYLLABLE FYA;Lo;0;L;;;;;N;;;;; +135D;ETHIOPIC COMBINING GEMINATION AND VOWEL LENGTH MARK;Mn;230;NSM;;;;;N;;;;; +135E;ETHIOPIC COMBINING VOWEL LENGTH MARK;Mn;230;NSM;;;;;N;;;;; +135F;ETHIOPIC COMBINING GEMINATION MARK;Mn;230;NSM;;;;;N;;;;; +1360;ETHIOPIC SECTION MARK;Po;0;L;;;;;N;;;;; +1361;ETHIOPIC WORDSPACE;Po;0;L;;;;;N;;;;; +1362;ETHIOPIC FULL STOP;Po;0;L;;;;;N;;;;; +1363;ETHIOPIC COMMA;Po;0;L;;;;;N;;;;; +1364;ETHIOPIC SEMICOLON;Po;0;L;;;;;N;;;;; +1365;ETHIOPIC COLON;Po;0;L;;;;;N;;;;; +1366;ETHIOPIC PREFACE COLON;Po;0;L;;;;;N;;;;; +1367;ETHIOPIC QUESTION MARK;Po;0;L;;;;;N;;;;; +1368;ETHIOPIC PARAGRAPH SEPARATOR;Po;0;L;;;;;N;;;;; +1369;ETHIOPIC DIGIT ONE;No;0;L;;;1;1;N;;;;; +136A;ETHIOPIC DIGIT TWO;No;0;L;;;2;2;N;;;;; +136B;ETHIOPIC DIGIT THREE;No;0;L;;;3;3;N;;;;; +136C;ETHIOPIC DIGIT FOUR;No;0;L;;;4;4;N;;;;; +136D;ETHIOPIC DIGIT FIVE;No;0;L;;;5;5;N;;;;; +136E;ETHIOPIC DIGIT SIX;No;0;L;;;6;6;N;;;;; +136F;ETHIOPIC DIGIT SEVEN;No;0;L;;;7;7;N;;;;; +1370;ETHIOPIC DIGIT EIGHT;No;0;L;;;8;8;N;;;;; +1371;ETHIOPIC DIGIT NINE;No;0;L;;;9;9;N;;;;; +1372;ETHIOPIC NUMBER TEN;No;0;L;;;;10;N;;;;; +1373;ETHIOPIC NUMBER TWENTY;No;0;L;;;;20;N;;;;; +1374;ETHIOPIC NUMBER THIRTY;No;0;L;;;;30;N;;;;; +1375;ETHIOPIC NUMBER FORTY;No;0;L;;;;40;N;;;;; +1376;ETHIOPIC NUMBER FIFTY;No;0;L;;;;50;N;;;;; +1377;ETHIOPIC NUMBER SIXTY;No;0;L;;;;60;N;;;;; +1378;ETHIOPIC NUMBER SEVENTY;No;0;L;;;;70;N;;;;; +1379;ETHIOPIC NUMBER EIGHTY;No;0;L;;;;80;N;;;;; +137A;ETHIOPIC NUMBER NINETY;No;0;L;;;;90;N;;;;; +137B;ETHIOPIC NUMBER HUNDRED;No;0;L;;;;100;N;;;;; +137C;ETHIOPIC NUMBER TEN THOUSAND;No;0;L;;;;10000;N;;;;; +1380;ETHIOPIC SYLLABLE SEBATBEIT MWA;Lo;0;L;;;;;N;;;;; +1381;ETHIOPIC SYLLABLE MWI;Lo;0;L;;;;;N;;;;; +1382;ETHIOPIC SYLLABLE MWEE;Lo;0;L;;;;;N;;;;; +1383;ETHIOPIC SYLLABLE MWE;Lo;0;L;;;;;N;;;;; +1384;ETHIOPIC SYLLABLE SEBATBEIT BWA;Lo;0;L;;;;;N;;;;; +1385;ETHIOPIC SYLLABLE BWI;Lo;0;L;;;;;N;;;;; +1386;ETHIOPIC SYLLABLE BWEE;Lo;0;L;;;;;N;;;;; +1387;ETHIOPIC SYLLABLE BWE;Lo;0;L;;;;;N;;;;; +1388;ETHIOPIC SYLLABLE SEBATBEIT FWA;Lo;0;L;;;;;N;;;;; +1389;ETHIOPIC SYLLABLE FWI;Lo;0;L;;;;;N;;;;; +138A;ETHIOPIC SYLLABLE FWEE;Lo;0;L;;;;;N;;;;; +138B;ETHIOPIC SYLLABLE FWE;Lo;0;L;;;;;N;;;;; +138C;ETHIOPIC SYLLABLE SEBATBEIT PWA;Lo;0;L;;;;;N;;;;; +138D;ETHIOPIC SYLLABLE PWI;Lo;0;L;;;;;N;;;;; +138E;ETHIOPIC SYLLABLE PWEE;Lo;0;L;;;;;N;;;;; +138F;ETHIOPIC SYLLABLE PWE;Lo;0;L;;;;;N;;;;; +1390;ETHIOPIC TONAL MARK YIZET;So;0;ON;;;;;N;;;;; +1391;ETHIOPIC TONAL MARK DERET;So;0;ON;;;;;N;;;;; +1392;ETHIOPIC TONAL MARK RIKRIK;So;0;ON;;;;;N;;;;; +1393;ETHIOPIC TONAL MARK SHORT RIKRIK;So;0;ON;;;;;N;;;;; +1394;ETHIOPIC TONAL MARK DIFAT;So;0;ON;;;;;N;;;;; +1395;ETHIOPIC TONAL MARK KENAT;So;0;ON;;;;;N;;;;; +1396;ETHIOPIC TONAL MARK CHIRET;So;0;ON;;;;;N;;;;; +1397;ETHIOPIC TONAL MARK HIDET;So;0;ON;;;;;N;;;;; +1398;ETHIOPIC TONAL MARK DERET-HIDET;So;0;ON;;;;;N;;;;; +1399;ETHIOPIC TONAL MARK KURT;So;0;ON;;;;;N;;;;; +13A0;CHEROKEE LETTER A;Lu;0;L;;;;;N;;;;AB70; +13A1;CHEROKEE LETTER E;Lu;0;L;;;;;N;;;;AB71; +13A2;CHEROKEE LETTER I;Lu;0;L;;;;;N;;;;AB72; +13A3;CHEROKEE LETTER O;Lu;0;L;;;;;N;;;;AB73; +13A4;CHEROKEE LETTER U;Lu;0;L;;;;;N;;;;AB74; +13A5;CHEROKEE LETTER V;Lu;0;L;;;;;N;;;;AB75; +13A6;CHEROKEE LETTER GA;Lu;0;L;;;;;N;;;;AB76; +13A7;CHEROKEE LETTER KA;Lu;0;L;;;;;N;;;;AB77; +13A8;CHEROKEE LETTER GE;Lu;0;L;;;;;N;;;;AB78; +13A9;CHEROKEE LETTER GI;Lu;0;L;;;;;N;;;;AB79; +13AA;CHEROKEE LETTER GO;Lu;0;L;;;;;N;;;;AB7A; +13AB;CHEROKEE LETTER GU;Lu;0;L;;;;;N;;;;AB7B; +13AC;CHEROKEE LETTER GV;Lu;0;L;;;;;N;;;;AB7C; +13AD;CHEROKEE LETTER HA;Lu;0;L;;;;;N;;;;AB7D; +13AE;CHEROKEE LETTER HE;Lu;0;L;;;;;N;;;;AB7E; +13AF;CHEROKEE LETTER HI;Lu;0;L;;;;;N;;;;AB7F; +13B0;CHEROKEE LETTER HO;Lu;0;L;;;;;N;;;;AB80; +13B1;CHEROKEE LETTER HU;Lu;0;L;;;;;N;;;;AB81; +13B2;CHEROKEE LETTER HV;Lu;0;L;;;;;N;;;;AB82; +13B3;CHEROKEE LETTER LA;Lu;0;L;;;;;N;;;;AB83; +13B4;CHEROKEE LETTER LE;Lu;0;L;;;;;N;;;;AB84; +13B5;CHEROKEE LETTER LI;Lu;0;L;;;;;N;;;;AB85; +13B6;CHEROKEE LETTER LO;Lu;0;L;;;;;N;;;;AB86; +13B7;CHEROKEE LETTER LU;Lu;0;L;;;;;N;;;;AB87; +13B8;CHEROKEE LETTER LV;Lu;0;L;;;;;N;;;;AB88; +13B9;CHEROKEE LETTER MA;Lu;0;L;;;;;N;;;;AB89; +13BA;CHEROKEE LETTER ME;Lu;0;L;;;;;N;;;;AB8A; +13BB;CHEROKEE LETTER MI;Lu;0;L;;;;;N;;;;AB8B; +13BC;CHEROKEE LETTER MO;Lu;0;L;;;;;N;;;;AB8C; +13BD;CHEROKEE LETTER MU;Lu;0;L;;;;;N;;;;AB8D; +13BE;CHEROKEE LETTER NA;Lu;0;L;;;;;N;;;;AB8E; +13BF;CHEROKEE LETTER HNA;Lu;0;L;;;;;N;;;;AB8F; +13C0;CHEROKEE LETTER NAH;Lu;0;L;;;;;N;;;;AB90; +13C1;CHEROKEE LETTER NE;Lu;0;L;;;;;N;;;;AB91; +13C2;CHEROKEE LETTER NI;Lu;0;L;;;;;N;;;;AB92; +13C3;CHEROKEE LETTER NO;Lu;0;L;;;;;N;;;;AB93; +13C4;CHEROKEE LETTER NU;Lu;0;L;;;;;N;;;;AB94; +13C5;CHEROKEE LETTER NV;Lu;0;L;;;;;N;;;;AB95; +13C6;CHEROKEE LETTER QUA;Lu;0;L;;;;;N;;;;AB96; +13C7;CHEROKEE LETTER QUE;Lu;0;L;;;;;N;;;;AB97; +13C8;CHEROKEE LETTER QUI;Lu;0;L;;;;;N;;;;AB98; +13C9;CHEROKEE LETTER QUO;Lu;0;L;;;;;N;;;;AB99; +13CA;CHEROKEE LETTER QUU;Lu;0;L;;;;;N;;;;AB9A; +13CB;CHEROKEE LETTER QUV;Lu;0;L;;;;;N;;;;AB9B; +13CC;CHEROKEE LETTER SA;Lu;0;L;;;;;N;;;;AB9C; +13CD;CHEROKEE LETTER S;Lu;0;L;;;;;N;;;;AB9D; +13CE;CHEROKEE LETTER SE;Lu;0;L;;;;;N;;;;AB9E; +13CF;CHEROKEE LETTER SI;Lu;0;L;;;;;N;;;;AB9F; +13D0;CHEROKEE LETTER SO;Lu;0;L;;;;;N;;;;ABA0; +13D1;CHEROKEE LETTER SU;Lu;0;L;;;;;N;;;;ABA1; +13D2;CHEROKEE LETTER SV;Lu;0;L;;;;;N;;;;ABA2; +13D3;CHEROKEE LETTER DA;Lu;0;L;;;;;N;;;;ABA3; +13D4;CHEROKEE LETTER TA;Lu;0;L;;;;;N;;;;ABA4; +13D5;CHEROKEE LETTER DE;Lu;0;L;;;;;N;;;;ABA5; +13D6;CHEROKEE LETTER TE;Lu;0;L;;;;;N;;;;ABA6; +13D7;CHEROKEE LETTER DI;Lu;0;L;;;;;N;;;;ABA7; +13D8;CHEROKEE LETTER TI;Lu;0;L;;;;;N;;;;ABA8; +13D9;CHEROKEE LETTER DO;Lu;0;L;;;;;N;;;;ABA9; +13DA;CHEROKEE LETTER DU;Lu;0;L;;;;;N;;;;ABAA; +13DB;CHEROKEE LETTER DV;Lu;0;L;;;;;N;;;;ABAB; +13DC;CHEROKEE LETTER DLA;Lu;0;L;;;;;N;;;;ABAC; +13DD;CHEROKEE LETTER TLA;Lu;0;L;;;;;N;;;;ABAD; +13DE;CHEROKEE LETTER TLE;Lu;0;L;;;;;N;;;;ABAE; +13DF;CHEROKEE LETTER TLI;Lu;0;L;;;;;N;;;;ABAF; +13E0;CHEROKEE LETTER TLO;Lu;0;L;;;;;N;;;;ABB0; +13E1;CHEROKEE LETTER TLU;Lu;0;L;;;;;N;;;;ABB1; +13E2;CHEROKEE LETTER TLV;Lu;0;L;;;;;N;;;;ABB2; +13E3;CHEROKEE LETTER TSA;Lu;0;L;;;;;N;;;;ABB3; +13E4;CHEROKEE LETTER TSE;Lu;0;L;;;;;N;;;;ABB4; +13E5;CHEROKEE LETTER TSI;Lu;0;L;;;;;N;;;;ABB5; +13E6;CHEROKEE LETTER TSO;Lu;0;L;;;;;N;;;;ABB6; +13E7;CHEROKEE LETTER TSU;Lu;0;L;;;;;N;;;;ABB7; +13E8;CHEROKEE LETTER TSV;Lu;0;L;;;;;N;;;;ABB8; +13E9;CHEROKEE LETTER WA;Lu;0;L;;;;;N;;;;ABB9; +13EA;CHEROKEE LETTER WE;Lu;0;L;;;;;N;;;;ABBA; +13EB;CHEROKEE LETTER WI;Lu;0;L;;;;;N;;;;ABBB; +13EC;CHEROKEE LETTER WO;Lu;0;L;;;;;N;;;;ABBC; +13ED;CHEROKEE LETTER WU;Lu;0;L;;;;;N;;;;ABBD; +13EE;CHEROKEE LETTER WV;Lu;0;L;;;;;N;;;;ABBE; +13EF;CHEROKEE LETTER YA;Lu;0;L;;;;;N;;;;ABBF; +13F0;CHEROKEE LETTER YE;Lu;0;L;;;;;N;;;;13F8; +13F1;CHEROKEE LETTER YI;Lu;0;L;;;;;N;;;;13F9; +13F2;CHEROKEE LETTER YO;Lu;0;L;;;;;N;;;;13FA; +13F3;CHEROKEE LETTER YU;Lu;0;L;;;;;N;;;;13FB; +13F4;CHEROKEE LETTER YV;Lu;0;L;;;;;N;;;;13FC; +13F5;CHEROKEE LETTER MV;Lu;0;L;;;;;N;;;;13FD; +13F8;CHEROKEE SMALL LETTER YE;Ll;0;L;;;;;N;;;13F0;;13F0 +13F9;CHEROKEE SMALL LETTER YI;Ll;0;L;;;;;N;;;13F1;;13F1 +13FA;CHEROKEE SMALL LETTER YO;Ll;0;L;;;;;N;;;13F2;;13F2 +13FB;CHEROKEE SMALL LETTER YU;Ll;0;L;;;;;N;;;13F3;;13F3 +13FC;CHEROKEE SMALL LETTER YV;Ll;0;L;;;;;N;;;13F4;;13F4 +13FD;CHEROKEE SMALL LETTER MV;Ll;0;L;;;;;N;;;13F5;;13F5 +1400;CANADIAN SYLLABICS HYPHEN;Pd;0;ON;;;;;N;;;;; +1401;CANADIAN SYLLABICS E;Lo;0;L;;;;;N;;;;; +1402;CANADIAN SYLLABICS AAI;Lo;0;L;;;;;N;;;;; +1403;CANADIAN SYLLABICS I;Lo;0;L;;;;;N;;;;; +1404;CANADIAN SYLLABICS II;Lo;0;L;;;;;N;;;;; +1405;CANADIAN SYLLABICS O;Lo;0;L;;;;;N;;;;; +1406;CANADIAN SYLLABICS OO;Lo;0;L;;;;;N;;;;; +1407;CANADIAN SYLLABICS Y-CREE OO;Lo;0;L;;;;;N;;;;; +1408;CANADIAN SYLLABICS CARRIER EE;Lo;0;L;;;;;N;;;;; +1409;CANADIAN SYLLABICS CARRIER I;Lo;0;L;;;;;N;;;;; +140A;CANADIAN SYLLABICS A;Lo;0;L;;;;;N;;;;; +140B;CANADIAN SYLLABICS AA;Lo;0;L;;;;;N;;;;; +140C;CANADIAN SYLLABICS WE;Lo;0;L;;;;;N;;;;; +140D;CANADIAN SYLLABICS WEST-CREE WE;Lo;0;L;;;;;N;;;;; +140E;CANADIAN SYLLABICS WI;Lo;0;L;;;;;N;;;;; +140F;CANADIAN SYLLABICS WEST-CREE WI;Lo;0;L;;;;;N;;;;; +1410;CANADIAN SYLLABICS WII;Lo;0;L;;;;;N;;;;; +1411;CANADIAN SYLLABICS WEST-CREE WII;Lo;0;L;;;;;N;;;;; +1412;CANADIAN SYLLABICS WO;Lo;0;L;;;;;N;;;;; +1413;CANADIAN SYLLABICS WEST-CREE WO;Lo;0;L;;;;;N;;;;; +1414;CANADIAN SYLLABICS WOO;Lo;0;L;;;;;N;;;;; +1415;CANADIAN SYLLABICS WEST-CREE WOO;Lo;0;L;;;;;N;;;;; +1416;CANADIAN SYLLABICS NASKAPI WOO;Lo;0;L;;;;;N;;;;; +1417;CANADIAN SYLLABICS WA;Lo;0;L;;;;;N;;;;; +1418;CANADIAN SYLLABICS WEST-CREE WA;Lo;0;L;;;;;N;;;;; +1419;CANADIAN SYLLABICS WAA;Lo;0;L;;;;;N;;;;; +141A;CANADIAN SYLLABICS WEST-CREE WAA;Lo;0;L;;;;;N;;;;; +141B;CANADIAN SYLLABICS NASKAPI WAA;Lo;0;L;;;;;N;;;;; +141C;CANADIAN SYLLABICS AI;Lo;0;L;;;;;N;;;;; +141D;CANADIAN SYLLABICS Y-CREE W;Lo;0;L;;;;;N;;;;; +141E;CANADIAN SYLLABICS GLOTTAL STOP;Lo;0;L;;;;;N;;;;; +141F;CANADIAN SYLLABICS FINAL ACUTE;Lo;0;L;;;;;N;;;;; +1420;CANADIAN SYLLABICS FINAL GRAVE;Lo;0;L;;;;;N;;;;; +1421;CANADIAN SYLLABICS FINAL BOTTOM HALF RING;Lo;0;L;;;;;N;;;;; +1422;CANADIAN SYLLABICS FINAL TOP HALF RING;Lo;0;L;;;;;N;;;;; +1423;CANADIAN SYLLABICS FINAL RIGHT HALF RING;Lo;0;L;;;;;N;;;;; +1424;CANADIAN SYLLABICS FINAL RING;Lo;0;L;;;;;N;;;;; +1425;CANADIAN SYLLABICS FINAL DOUBLE ACUTE;Lo;0;L;;;;;N;;;;; +1426;CANADIAN SYLLABICS FINAL DOUBLE SHORT VERTICAL STROKES;Lo;0;L;;;;;N;;;;; +1427;CANADIAN SYLLABICS FINAL MIDDLE DOT;Lo;0;L;;;;;N;;;;; +1428;CANADIAN SYLLABICS FINAL SHORT HORIZONTAL STROKE;Lo;0;L;;;;;N;;;;; +1429;CANADIAN SYLLABICS FINAL PLUS;Lo;0;L;;;;;N;;;;; +142A;CANADIAN SYLLABICS FINAL DOWN TACK;Lo;0;L;;;;;N;;;;; +142B;CANADIAN SYLLABICS EN;Lo;0;L;;;;;N;;;;; +142C;CANADIAN SYLLABICS IN;Lo;0;L;;;;;N;;;;; +142D;CANADIAN SYLLABICS ON;Lo;0;L;;;;;N;;;;; +142E;CANADIAN SYLLABICS AN;Lo;0;L;;;;;N;;;;; +142F;CANADIAN SYLLABICS PE;Lo;0;L;;;;;N;;;;; +1430;CANADIAN SYLLABICS PAAI;Lo;0;L;;;;;N;;;;; +1431;CANADIAN SYLLABICS PI;Lo;0;L;;;;;N;;;;; +1432;CANADIAN SYLLABICS PII;Lo;0;L;;;;;N;;;;; +1433;CANADIAN SYLLABICS PO;Lo;0;L;;;;;N;;;;; +1434;CANADIAN SYLLABICS POO;Lo;0;L;;;;;N;;;;; +1435;CANADIAN SYLLABICS Y-CREE POO;Lo;0;L;;;;;N;;;;; +1436;CANADIAN SYLLABICS CARRIER HEE;Lo;0;L;;;;;N;;;;; +1437;CANADIAN SYLLABICS CARRIER HI;Lo;0;L;;;;;N;;;;; +1438;CANADIAN SYLLABICS PA;Lo;0;L;;;;;N;;;;; +1439;CANADIAN SYLLABICS PAA;Lo;0;L;;;;;N;;;;; +143A;CANADIAN SYLLABICS PWE;Lo;0;L;;;;;N;;;;; +143B;CANADIAN SYLLABICS WEST-CREE PWE;Lo;0;L;;;;;N;;;;; +143C;CANADIAN SYLLABICS PWI;Lo;0;L;;;;;N;;;;; +143D;CANADIAN SYLLABICS WEST-CREE PWI;Lo;0;L;;;;;N;;;;; +143E;CANADIAN SYLLABICS PWII;Lo;0;L;;;;;N;;;;; +143F;CANADIAN SYLLABICS WEST-CREE PWII;Lo;0;L;;;;;N;;;;; +1440;CANADIAN SYLLABICS PWO;Lo;0;L;;;;;N;;;;; +1441;CANADIAN SYLLABICS WEST-CREE PWO;Lo;0;L;;;;;N;;;;; +1442;CANADIAN SYLLABICS PWOO;Lo;0;L;;;;;N;;;;; +1443;CANADIAN SYLLABICS WEST-CREE PWOO;Lo;0;L;;;;;N;;;;; +1444;CANADIAN SYLLABICS PWA;Lo;0;L;;;;;N;;;;; +1445;CANADIAN SYLLABICS WEST-CREE PWA;Lo;0;L;;;;;N;;;;; +1446;CANADIAN SYLLABICS PWAA;Lo;0;L;;;;;N;;;;; +1447;CANADIAN SYLLABICS WEST-CREE PWAA;Lo;0;L;;;;;N;;;;; +1448;CANADIAN SYLLABICS Y-CREE PWAA;Lo;0;L;;;;;N;;;;; +1449;CANADIAN SYLLABICS P;Lo;0;L;;;;;N;;;;; +144A;CANADIAN SYLLABICS WEST-CREE P;Lo;0;L;;;;;N;;;;; +144B;CANADIAN SYLLABICS CARRIER H;Lo;0;L;;;;;N;;;;; +144C;CANADIAN SYLLABICS TE;Lo;0;L;;;;;N;;;;; +144D;CANADIAN SYLLABICS TAAI;Lo;0;L;;;;;N;;;;; +144E;CANADIAN SYLLABICS TI;Lo;0;L;;;;;N;;;;; +144F;CANADIAN SYLLABICS TII;Lo;0;L;;;;;N;;;;; +1450;CANADIAN SYLLABICS TO;Lo;0;L;;;;;N;;;;; +1451;CANADIAN SYLLABICS TOO;Lo;0;L;;;;;N;;;;; +1452;CANADIAN SYLLABICS Y-CREE TOO;Lo;0;L;;;;;N;;;;; +1453;CANADIAN SYLLABICS CARRIER DEE;Lo;0;L;;;;;N;;;;; +1454;CANADIAN SYLLABICS CARRIER DI;Lo;0;L;;;;;N;;;;; +1455;CANADIAN SYLLABICS TA;Lo;0;L;;;;;N;;;;; +1456;CANADIAN SYLLABICS TAA;Lo;0;L;;;;;N;;;;; +1457;CANADIAN SYLLABICS TWE;Lo;0;L;;;;;N;;;;; +1458;CANADIAN SYLLABICS WEST-CREE TWE;Lo;0;L;;;;;N;;;;; +1459;CANADIAN SYLLABICS TWI;Lo;0;L;;;;;N;;;;; +145A;CANADIAN SYLLABICS WEST-CREE TWI;Lo;0;L;;;;;N;;;;; +145B;CANADIAN SYLLABICS TWII;Lo;0;L;;;;;N;;;;; +145C;CANADIAN SYLLABICS WEST-CREE TWII;Lo;0;L;;;;;N;;;;; +145D;CANADIAN SYLLABICS TWO;Lo;0;L;;;;;N;;;;; +145E;CANADIAN SYLLABICS WEST-CREE TWO;Lo;0;L;;;;;N;;;;; +145F;CANADIAN SYLLABICS TWOO;Lo;0;L;;;;;N;;;;; +1460;CANADIAN SYLLABICS WEST-CREE TWOO;Lo;0;L;;;;;N;;;;; +1461;CANADIAN SYLLABICS TWA;Lo;0;L;;;;;N;;;;; +1462;CANADIAN SYLLABICS WEST-CREE TWA;Lo;0;L;;;;;N;;;;; +1463;CANADIAN SYLLABICS TWAA;Lo;0;L;;;;;N;;;;; +1464;CANADIAN SYLLABICS WEST-CREE TWAA;Lo;0;L;;;;;N;;;;; +1465;CANADIAN SYLLABICS NASKAPI TWAA;Lo;0;L;;;;;N;;;;; +1466;CANADIAN SYLLABICS T;Lo;0;L;;;;;N;;;;; +1467;CANADIAN SYLLABICS TTE;Lo;0;L;;;;;N;;;;; +1468;CANADIAN SYLLABICS TTI;Lo;0;L;;;;;N;;;;; +1469;CANADIAN SYLLABICS TTO;Lo;0;L;;;;;N;;;;; +146A;CANADIAN SYLLABICS TTA;Lo;0;L;;;;;N;;;;; +146B;CANADIAN SYLLABICS KE;Lo;0;L;;;;;N;;;;; +146C;CANADIAN SYLLABICS KAAI;Lo;0;L;;;;;N;;;;; +146D;CANADIAN SYLLABICS KI;Lo;0;L;;;;;N;;;;; +146E;CANADIAN SYLLABICS KII;Lo;0;L;;;;;N;;;;; +146F;CANADIAN SYLLABICS KO;Lo;0;L;;;;;N;;;;; +1470;CANADIAN SYLLABICS KOO;Lo;0;L;;;;;N;;;;; +1471;CANADIAN SYLLABICS Y-CREE KOO;Lo;0;L;;;;;N;;;;; +1472;CANADIAN SYLLABICS KA;Lo;0;L;;;;;N;;;;; +1473;CANADIAN SYLLABICS KAA;Lo;0;L;;;;;N;;;;; +1474;CANADIAN SYLLABICS KWE;Lo;0;L;;;;;N;;;;; +1475;CANADIAN SYLLABICS WEST-CREE KWE;Lo;0;L;;;;;N;;;;; +1476;CANADIAN SYLLABICS KWI;Lo;0;L;;;;;N;;;;; +1477;CANADIAN SYLLABICS WEST-CREE KWI;Lo;0;L;;;;;N;;;;; +1478;CANADIAN SYLLABICS KWII;Lo;0;L;;;;;N;;;;; +1479;CANADIAN SYLLABICS WEST-CREE KWII;Lo;0;L;;;;;N;;;;; +147A;CANADIAN SYLLABICS KWO;Lo;0;L;;;;;N;;;;; +147B;CANADIAN SYLLABICS WEST-CREE KWO;Lo;0;L;;;;;N;;;;; +147C;CANADIAN SYLLABICS KWOO;Lo;0;L;;;;;N;;;;; +147D;CANADIAN SYLLABICS WEST-CREE KWOO;Lo;0;L;;;;;N;;;;; +147E;CANADIAN SYLLABICS KWA;Lo;0;L;;;;;N;;;;; +147F;CANADIAN SYLLABICS WEST-CREE KWA;Lo;0;L;;;;;N;;;;; +1480;CANADIAN SYLLABICS KWAA;Lo;0;L;;;;;N;;;;; +1481;CANADIAN SYLLABICS WEST-CREE KWAA;Lo;0;L;;;;;N;;;;; +1482;CANADIAN SYLLABICS NASKAPI KWAA;Lo;0;L;;;;;N;;;;; +1483;CANADIAN SYLLABICS K;Lo;0;L;;;;;N;;;;; +1484;CANADIAN SYLLABICS KW;Lo;0;L;;;;;N;;;;; +1485;CANADIAN SYLLABICS SOUTH-SLAVEY KEH;Lo;0;L;;;;;N;;;;; +1486;CANADIAN SYLLABICS SOUTH-SLAVEY KIH;Lo;0;L;;;;;N;;;;; +1487;CANADIAN SYLLABICS SOUTH-SLAVEY KOH;Lo;0;L;;;;;N;;;;; +1488;CANADIAN SYLLABICS SOUTH-SLAVEY KAH;Lo;0;L;;;;;N;;;;; +1489;CANADIAN SYLLABICS CE;Lo;0;L;;;;;N;;;;; +148A;CANADIAN SYLLABICS CAAI;Lo;0;L;;;;;N;;;;; +148B;CANADIAN SYLLABICS CI;Lo;0;L;;;;;N;;;;; +148C;CANADIAN SYLLABICS CII;Lo;0;L;;;;;N;;;;; +148D;CANADIAN SYLLABICS CO;Lo;0;L;;;;;N;;;;; +148E;CANADIAN SYLLABICS COO;Lo;0;L;;;;;N;;;;; +148F;CANADIAN SYLLABICS Y-CREE COO;Lo;0;L;;;;;N;;;;; +1490;CANADIAN SYLLABICS CA;Lo;0;L;;;;;N;;;;; +1491;CANADIAN SYLLABICS CAA;Lo;0;L;;;;;N;;;;; +1492;CANADIAN SYLLABICS CWE;Lo;0;L;;;;;N;;;;; +1493;CANADIAN SYLLABICS WEST-CREE CWE;Lo;0;L;;;;;N;;;;; +1494;CANADIAN SYLLABICS CWI;Lo;0;L;;;;;N;;;;; +1495;CANADIAN SYLLABICS WEST-CREE CWI;Lo;0;L;;;;;N;;;;; +1496;CANADIAN SYLLABICS CWII;Lo;0;L;;;;;N;;;;; +1497;CANADIAN SYLLABICS WEST-CREE CWII;Lo;0;L;;;;;N;;;;; +1498;CANADIAN SYLLABICS CWO;Lo;0;L;;;;;N;;;;; +1499;CANADIAN SYLLABICS WEST-CREE CWO;Lo;0;L;;;;;N;;;;; +149A;CANADIAN SYLLABICS CWOO;Lo;0;L;;;;;N;;;;; +149B;CANADIAN SYLLABICS WEST-CREE CWOO;Lo;0;L;;;;;N;;;;; +149C;CANADIAN SYLLABICS CWA;Lo;0;L;;;;;N;;;;; +149D;CANADIAN SYLLABICS WEST-CREE CWA;Lo;0;L;;;;;N;;;;; +149E;CANADIAN SYLLABICS CWAA;Lo;0;L;;;;;N;;;;; +149F;CANADIAN SYLLABICS WEST-CREE CWAA;Lo;0;L;;;;;N;;;;; +14A0;CANADIAN SYLLABICS NASKAPI CWAA;Lo;0;L;;;;;N;;;;; +14A1;CANADIAN SYLLABICS C;Lo;0;L;;;;;N;;;;; +14A2;CANADIAN SYLLABICS SAYISI TH;Lo;0;L;;;;;N;;;;; +14A3;CANADIAN SYLLABICS ME;Lo;0;L;;;;;N;;;;; +14A4;CANADIAN SYLLABICS MAAI;Lo;0;L;;;;;N;;;;; +14A5;CANADIAN SYLLABICS MI;Lo;0;L;;;;;N;;;;; +14A6;CANADIAN SYLLABICS MII;Lo;0;L;;;;;N;;;;; +14A7;CANADIAN SYLLABICS MO;Lo;0;L;;;;;N;;;;; +14A8;CANADIAN SYLLABICS MOO;Lo;0;L;;;;;N;;;;; +14A9;CANADIAN SYLLABICS Y-CREE MOO;Lo;0;L;;;;;N;;;;; +14AA;CANADIAN SYLLABICS MA;Lo;0;L;;;;;N;;;;; +14AB;CANADIAN SYLLABICS MAA;Lo;0;L;;;;;N;;;;; +14AC;CANADIAN SYLLABICS MWE;Lo;0;L;;;;;N;;;;; +14AD;CANADIAN SYLLABICS WEST-CREE MWE;Lo;0;L;;;;;N;;;;; +14AE;CANADIAN SYLLABICS MWI;Lo;0;L;;;;;N;;;;; +14AF;CANADIAN SYLLABICS WEST-CREE MWI;Lo;0;L;;;;;N;;;;; +14B0;CANADIAN SYLLABICS MWII;Lo;0;L;;;;;N;;;;; +14B1;CANADIAN SYLLABICS WEST-CREE MWII;Lo;0;L;;;;;N;;;;; +14B2;CANADIAN SYLLABICS MWO;Lo;0;L;;;;;N;;;;; +14B3;CANADIAN SYLLABICS WEST-CREE MWO;Lo;0;L;;;;;N;;;;; +14B4;CANADIAN SYLLABICS MWOO;Lo;0;L;;;;;N;;;;; +14B5;CANADIAN SYLLABICS WEST-CREE MWOO;Lo;0;L;;;;;N;;;;; +14B6;CANADIAN SYLLABICS MWA;Lo;0;L;;;;;N;;;;; +14B7;CANADIAN SYLLABICS WEST-CREE MWA;Lo;0;L;;;;;N;;;;; +14B8;CANADIAN SYLLABICS MWAA;Lo;0;L;;;;;N;;;;; +14B9;CANADIAN SYLLABICS WEST-CREE MWAA;Lo;0;L;;;;;N;;;;; +14BA;CANADIAN SYLLABICS NASKAPI MWAA;Lo;0;L;;;;;N;;;;; +14BB;CANADIAN SYLLABICS M;Lo;0;L;;;;;N;;;;; +14BC;CANADIAN SYLLABICS WEST-CREE M;Lo;0;L;;;;;N;;;;; +14BD;CANADIAN SYLLABICS MH;Lo;0;L;;;;;N;;;;; +14BE;CANADIAN SYLLABICS ATHAPASCAN M;Lo;0;L;;;;;N;;;;; +14BF;CANADIAN SYLLABICS SAYISI M;Lo;0;L;;;;;N;;;;; +14C0;CANADIAN SYLLABICS NE;Lo;0;L;;;;;N;;;;; +14C1;CANADIAN SYLLABICS NAAI;Lo;0;L;;;;;N;;;;; +14C2;CANADIAN SYLLABICS NI;Lo;0;L;;;;;N;;;;; +14C3;CANADIAN SYLLABICS NII;Lo;0;L;;;;;N;;;;; +14C4;CANADIAN SYLLABICS NO;Lo;0;L;;;;;N;;;;; +14C5;CANADIAN SYLLABICS NOO;Lo;0;L;;;;;N;;;;; +14C6;CANADIAN SYLLABICS Y-CREE NOO;Lo;0;L;;;;;N;;;;; +14C7;CANADIAN SYLLABICS NA;Lo;0;L;;;;;N;;;;; +14C8;CANADIAN SYLLABICS NAA;Lo;0;L;;;;;N;;;;; +14C9;CANADIAN SYLLABICS NWE;Lo;0;L;;;;;N;;;;; +14CA;CANADIAN SYLLABICS WEST-CREE NWE;Lo;0;L;;;;;N;;;;; +14CB;CANADIAN SYLLABICS NWA;Lo;0;L;;;;;N;;;;; +14CC;CANADIAN SYLLABICS WEST-CREE NWA;Lo;0;L;;;;;N;;;;; +14CD;CANADIAN SYLLABICS NWAA;Lo;0;L;;;;;N;;;;; +14CE;CANADIAN SYLLABICS WEST-CREE NWAA;Lo;0;L;;;;;N;;;;; +14CF;CANADIAN SYLLABICS NASKAPI NWAA;Lo;0;L;;;;;N;;;;; +14D0;CANADIAN SYLLABICS N;Lo;0;L;;;;;N;;;;; +14D1;CANADIAN SYLLABICS CARRIER NG;Lo;0;L;;;;;N;;;;; +14D2;CANADIAN SYLLABICS NH;Lo;0;L;;;;;N;;;;; +14D3;CANADIAN SYLLABICS LE;Lo;0;L;;;;;N;;;;; +14D4;CANADIAN SYLLABICS LAAI;Lo;0;L;;;;;N;;;;; +14D5;CANADIAN SYLLABICS LI;Lo;0;L;;;;;N;;;;; +14D6;CANADIAN SYLLABICS LII;Lo;0;L;;;;;N;;;;; +14D7;CANADIAN SYLLABICS LO;Lo;0;L;;;;;N;;;;; +14D8;CANADIAN SYLLABICS LOO;Lo;0;L;;;;;N;;;;; +14D9;CANADIAN SYLLABICS Y-CREE LOO;Lo;0;L;;;;;N;;;;; +14DA;CANADIAN SYLLABICS LA;Lo;0;L;;;;;N;;;;; +14DB;CANADIAN SYLLABICS LAA;Lo;0;L;;;;;N;;;;; +14DC;CANADIAN SYLLABICS LWE;Lo;0;L;;;;;N;;;;; +14DD;CANADIAN SYLLABICS WEST-CREE LWE;Lo;0;L;;;;;N;;;;; +14DE;CANADIAN SYLLABICS LWI;Lo;0;L;;;;;N;;;;; +14DF;CANADIAN SYLLABICS WEST-CREE LWI;Lo;0;L;;;;;N;;;;; +14E0;CANADIAN SYLLABICS LWII;Lo;0;L;;;;;N;;;;; +14E1;CANADIAN SYLLABICS WEST-CREE LWII;Lo;0;L;;;;;N;;;;; +14E2;CANADIAN SYLLABICS LWO;Lo;0;L;;;;;N;;;;; +14E3;CANADIAN SYLLABICS WEST-CREE LWO;Lo;0;L;;;;;N;;;;; +14E4;CANADIAN SYLLABICS LWOO;Lo;0;L;;;;;N;;;;; +14E5;CANADIAN SYLLABICS WEST-CREE LWOO;Lo;0;L;;;;;N;;;;; +14E6;CANADIAN SYLLABICS LWA;Lo;0;L;;;;;N;;;;; +14E7;CANADIAN SYLLABICS WEST-CREE LWA;Lo;0;L;;;;;N;;;;; +14E8;CANADIAN SYLLABICS LWAA;Lo;0;L;;;;;N;;;;; +14E9;CANADIAN SYLLABICS WEST-CREE LWAA;Lo;0;L;;;;;N;;;;; +14EA;CANADIAN SYLLABICS L;Lo;0;L;;;;;N;;;;; +14EB;CANADIAN SYLLABICS WEST-CREE L;Lo;0;L;;;;;N;;;;; +14EC;CANADIAN SYLLABICS MEDIAL L;Lo;0;L;;;;;N;;;;; +14ED;CANADIAN SYLLABICS SE;Lo;0;L;;;;;N;;;;; +14EE;CANADIAN SYLLABICS SAAI;Lo;0;L;;;;;N;;;;; +14EF;CANADIAN SYLLABICS SI;Lo;0;L;;;;;N;;;;; +14F0;CANADIAN SYLLABICS SII;Lo;0;L;;;;;N;;;;; +14F1;CANADIAN SYLLABICS SO;Lo;0;L;;;;;N;;;;; +14F2;CANADIAN SYLLABICS SOO;Lo;0;L;;;;;N;;;;; +14F3;CANADIAN SYLLABICS Y-CREE SOO;Lo;0;L;;;;;N;;;;; +14F4;CANADIAN SYLLABICS SA;Lo;0;L;;;;;N;;;;; +14F5;CANADIAN SYLLABICS SAA;Lo;0;L;;;;;N;;;;; +14F6;CANADIAN SYLLABICS SWE;Lo;0;L;;;;;N;;;;; +14F7;CANADIAN SYLLABICS WEST-CREE SWE;Lo;0;L;;;;;N;;;;; +14F8;CANADIAN SYLLABICS SWI;Lo;0;L;;;;;N;;;;; +14F9;CANADIAN SYLLABICS WEST-CREE SWI;Lo;0;L;;;;;N;;;;; +14FA;CANADIAN SYLLABICS SWII;Lo;0;L;;;;;N;;;;; +14FB;CANADIAN SYLLABICS WEST-CREE SWII;Lo;0;L;;;;;N;;;;; +14FC;CANADIAN SYLLABICS SWO;Lo;0;L;;;;;N;;;;; +14FD;CANADIAN SYLLABICS WEST-CREE SWO;Lo;0;L;;;;;N;;;;; +14FE;CANADIAN SYLLABICS SWOO;Lo;0;L;;;;;N;;;;; +14FF;CANADIAN SYLLABICS WEST-CREE SWOO;Lo;0;L;;;;;N;;;;; +1500;CANADIAN SYLLABICS SWA;Lo;0;L;;;;;N;;;;; +1501;CANADIAN SYLLABICS WEST-CREE SWA;Lo;0;L;;;;;N;;;;; +1502;CANADIAN SYLLABICS SWAA;Lo;0;L;;;;;N;;;;; +1503;CANADIAN SYLLABICS WEST-CREE SWAA;Lo;0;L;;;;;N;;;;; +1504;CANADIAN SYLLABICS NASKAPI SWAA;Lo;0;L;;;;;N;;;;; +1505;CANADIAN SYLLABICS S;Lo;0;L;;;;;N;;;;; +1506;CANADIAN SYLLABICS ATHAPASCAN S;Lo;0;L;;;;;N;;;;; +1507;CANADIAN SYLLABICS SW;Lo;0;L;;;;;N;;;;; +1508;CANADIAN SYLLABICS BLACKFOOT S;Lo;0;L;;;;;N;;;;; +1509;CANADIAN SYLLABICS MOOSE-CREE SK;Lo;0;L;;;;;N;;;;; +150A;CANADIAN SYLLABICS NASKAPI SKW;Lo;0;L;;;;;N;;;;; +150B;CANADIAN SYLLABICS NASKAPI S-W;Lo;0;L;;;;;N;;;;; +150C;CANADIAN SYLLABICS NASKAPI SPWA;Lo;0;L;;;;;N;;;;; +150D;CANADIAN SYLLABICS NASKAPI STWA;Lo;0;L;;;;;N;;;;; +150E;CANADIAN SYLLABICS NASKAPI SKWA;Lo;0;L;;;;;N;;;;; +150F;CANADIAN SYLLABICS NASKAPI SCWA;Lo;0;L;;;;;N;;;;; +1510;CANADIAN SYLLABICS SHE;Lo;0;L;;;;;N;;;;; +1511;CANADIAN SYLLABICS SHI;Lo;0;L;;;;;N;;;;; +1512;CANADIAN SYLLABICS SHII;Lo;0;L;;;;;N;;;;; +1513;CANADIAN SYLLABICS SHO;Lo;0;L;;;;;N;;;;; +1514;CANADIAN SYLLABICS SHOO;Lo;0;L;;;;;N;;;;; +1515;CANADIAN SYLLABICS SHA;Lo;0;L;;;;;N;;;;; +1516;CANADIAN SYLLABICS SHAA;Lo;0;L;;;;;N;;;;; +1517;CANADIAN SYLLABICS SHWE;Lo;0;L;;;;;N;;;;; +1518;CANADIAN SYLLABICS WEST-CREE SHWE;Lo;0;L;;;;;N;;;;; +1519;CANADIAN SYLLABICS SHWI;Lo;0;L;;;;;N;;;;; +151A;CANADIAN SYLLABICS WEST-CREE SHWI;Lo;0;L;;;;;N;;;;; +151B;CANADIAN SYLLABICS SHWII;Lo;0;L;;;;;N;;;;; +151C;CANADIAN SYLLABICS WEST-CREE SHWII;Lo;0;L;;;;;N;;;;; +151D;CANADIAN SYLLABICS SHWO;Lo;0;L;;;;;N;;;;; +151E;CANADIAN SYLLABICS WEST-CREE SHWO;Lo;0;L;;;;;N;;;;; +151F;CANADIAN SYLLABICS SHWOO;Lo;0;L;;;;;N;;;;; +1520;CANADIAN SYLLABICS WEST-CREE SHWOO;Lo;0;L;;;;;N;;;;; +1521;CANADIAN SYLLABICS SHWA;Lo;0;L;;;;;N;;;;; +1522;CANADIAN SYLLABICS WEST-CREE SHWA;Lo;0;L;;;;;N;;;;; +1523;CANADIAN SYLLABICS SHWAA;Lo;0;L;;;;;N;;;;; +1524;CANADIAN SYLLABICS WEST-CREE SHWAA;Lo;0;L;;;;;N;;;;; +1525;CANADIAN SYLLABICS SH;Lo;0;L;;;;;N;;;;; +1526;CANADIAN SYLLABICS YE;Lo;0;L;;;;;N;;;;; +1527;CANADIAN SYLLABICS YAAI;Lo;0;L;;;;;N;;;;; +1528;CANADIAN SYLLABICS YI;Lo;0;L;;;;;N;;;;; +1529;CANADIAN SYLLABICS YII;Lo;0;L;;;;;N;;;;; +152A;CANADIAN SYLLABICS YO;Lo;0;L;;;;;N;;;;; +152B;CANADIAN SYLLABICS YOO;Lo;0;L;;;;;N;;;;; +152C;CANADIAN SYLLABICS Y-CREE YOO;Lo;0;L;;;;;N;;;;; +152D;CANADIAN SYLLABICS YA;Lo;0;L;;;;;N;;;;; +152E;CANADIAN SYLLABICS YAA;Lo;0;L;;;;;N;;;;; +152F;CANADIAN SYLLABICS YWE;Lo;0;L;;;;;N;;;;; +1530;CANADIAN SYLLABICS WEST-CREE YWE;Lo;0;L;;;;;N;;;;; +1531;CANADIAN SYLLABICS YWI;Lo;0;L;;;;;N;;;;; +1532;CANADIAN SYLLABICS WEST-CREE YWI;Lo;0;L;;;;;N;;;;; +1533;CANADIAN SYLLABICS YWII;Lo;0;L;;;;;N;;;;; +1534;CANADIAN SYLLABICS WEST-CREE YWII;Lo;0;L;;;;;N;;;;; +1535;CANADIAN SYLLABICS YWO;Lo;0;L;;;;;N;;;;; +1536;CANADIAN SYLLABICS WEST-CREE YWO;Lo;0;L;;;;;N;;;;; +1537;CANADIAN SYLLABICS YWOO;Lo;0;L;;;;;N;;;;; +1538;CANADIAN SYLLABICS WEST-CREE YWOO;Lo;0;L;;;;;N;;;;; +1539;CANADIAN SYLLABICS YWA;Lo;0;L;;;;;N;;;;; +153A;CANADIAN SYLLABICS WEST-CREE YWA;Lo;0;L;;;;;N;;;;; +153B;CANADIAN SYLLABICS YWAA;Lo;0;L;;;;;N;;;;; +153C;CANADIAN SYLLABICS WEST-CREE YWAA;Lo;0;L;;;;;N;;;;; +153D;CANADIAN SYLLABICS NASKAPI YWAA;Lo;0;L;;;;;N;;;;; +153E;CANADIAN SYLLABICS Y;Lo;0;L;;;;;N;;;;; +153F;CANADIAN SYLLABICS BIBLE-CREE Y;Lo;0;L;;;;;N;;;;; +1540;CANADIAN SYLLABICS WEST-CREE Y;Lo;0;L;;;;;N;;;;; +1541;CANADIAN SYLLABICS SAYISI YI;Lo;0;L;;;;;N;;;;; +1542;CANADIAN SYLLABICS RE;Lo;0;L;;;;;N;;;;; +1543;CANADIAN SYLLABICS R-CREE RE;Lo;0;L;;;;;N;;;;; +1544;CANADIAN SYLLABICS WEST-CREE LE;Lo;0;L;;;;;N;;;;; +1545;CANADIAN SYLLABICS RAAI;Lo;0;L;;;;;N;;;;; +1546;CANADIAN SYLLABICS RI;Lo;0;L;;;;;N;;;;; +1547;CANADIAN SYLLABICS RII;Lo;0;L;;;;;N;;;;; +1548;CANADIAN SYLLABICS RO;Lo;0;L;;;;;N;;;;; +1549;CANADIAN SYLLABICS ROO;Lo;0;L;;;;;N;;;;; +154A;CANADIAN SYLLABICS WEST-CREE LO;Lo;0;L;;;;;N;;;;; +154B;CANADIAN SYLLABICS RA;Lo;0;L;;;;;N;;;;; +154C;CANADIAN SYLLABICS RAA;Lo;0;L;;;;;N;;;;; +154D;CANADIAN SYLLABICS WEST-CREE LA;Lo;0;L;;;;;N;;;;; +154E;CANADIAN SYLLABICS RWAA;Lo;0;L;;;;;N;;;;; +154F;CANADIAN SYLLABICS WEST-CREE RWAA;Lo;0;L;;;;;N;;;;; +1550;CANADIAN SYLLABICS R;Lo;0;L;;;;;N;;;;; +1551;CANADIAN SYLLABICS WEST-CREE R;Lo;0;L;;;;;N;;;;; +1552;CANADIAN SYLLABICS MEDIAL R;Lo;0;L;;;;;N;;;;; +1553;CANADIAN SYLLABICS FE;Lo;0;L;;;;;N;;;;; +1554;CANADIAN SYLLABICS FAAI;Lo;0;L;;;;;N;;;;; +1555;CANADIAN SYLLABICS FI;Lo;0;L;;;;;N;;;;; +1556;CANADIAN SYLLABICS FII;Lo;0;L;;;;;N;;;;; +1557;CANADIAN SYLLABICS FO;Lo;0;L;;;;;N;;;;; +1558;CANADIAN SYLLABICS FOO;Lo;0;L;;;;;N;;;;; +1559;CANADIAN SYLLABICS FA;Lo;0;L;;;;;N;;;;; +155A;CANADIAN SYLLABICS FAA;Lo;0;L;;;;;N;;;;; +155B;CANADIAN SYLLABICS FWAA;Lo;0;L;;;;;N;;;;; +155C;CANADIAN SYLLABICS WEST-CREE FWAA;Lo;0;L;;;;;N;;;;; +155D;CANADIAN SYLLABICS F;Lo;0;L;;;;;N;;;;; +155E;CANADIAN SYLLABICS THE;Lo;0;L;;;;;N;;;;; +155F;CANADIAN SYLLABICS N-CREE THE;Lo;0;L;;;;;N;;;;; +1560;CANADIAN SYLLABICS THI;Lo;0;L;;;;;N;;;;; +1561;CANADIAN SYLLABICS N-CREE THI;Lo;0;L;;;;;N;;;;; +1562;CANADIAN SYLLABICS THII;Lo;0;L;;;;;N;;;;; +1563;CANADIAN SYLLABICS N-CREE THII;Lo;0;L;;;;;N;;;;; +1564;CANADIAN SYLLABICS THO;Lo;0;L;;;;;N;;;;; +1565;CANADIAN SYLLABICS THOO;Lo;0;L;;;;;N;;;;; +1566;CANADIAN SYLLABICS THA;Lo;0;L;;;;;N;;;;; +1567;CANADIAN SYLLABICS THAA;Lo;0;L;;;;;N;;;;; +1568;CANADIAN SYLLABICS THWAA;Lo;0;L;;;;;N;;;;; +1569;CANADIAN SYLLABICS WEST-CREE THWAA;Lo;0;L;;;;;N;;;;; +156A;CANADIAN SYLLABICS TH;Lo;0;L;;;;;N;;;;; +156B;CANADIAN SYLLABICS TTHE;Lo;0;L;;;;;N;;;;; +156C;CANADIAN SYLLABICS TTHI;Lo;0;L;;;;;N;;;;; +156D;CANADIAN SYLLABICS TTHO;Lo;0;L;;;;;N;;;;; +156E;CANADIAN SYLLABICS TTHA;Lo;0;L;;;;;N;;;;; +156F;CANADIAN SYLLABICS TTH;Lo;0;L;;;;;N;;;;; +1570;CANADIAN SYLLABICS TYE;Lo;0;L;;;;;N;;;;; +1571;CANADIAN SYLLABICS TYI;Lo;0;L;;;;;N;;;;; +1572;CANADIAN SYLLABICS TYO;Lo;0;L;;;;;N;;;;; +1573;CANADIAN SYLLABICS TYA;Lo;0;L;;;;;N;;;;; +1574;CANADIAN SYLLABICS NUNAVIK HE;Lo;0;L;;;;;N;;;;; +1575;CANADIAN SYLLABICS NUNAVIK HI;Lo;0;L;;;;;N;;;;; +1576;CANADIAN SYLLABICS NUNAVIK HII;Lo;0;L;;;;;N;;;;; +1577;CANADIAN SYLLABICS NUNAVIK HO;Lo;0;L;;;;;N;;;;; +1578;CANADIAN SYLLABICS NUNAVIK HOO;Lo;0;L;;;;;N;;;;; +1579;CANADIAN SYLLABICS NUNAVIK HA;Lo;0;L;;;;;N;;;;; +157A;CANADIAN SYLLABICS NUNAVIK HAA;Lo;0;L;;;;;N;;;;; +157B;CANADIAN SYLLABICS NUNAVIK H;Lo;0;L;;;;;N;;;;; +157C;CANADIAN SYLLABICS NUNAVUT H;Lo;0;L;;;;;N;;;;; +157D;CANADIAN SYLLABICS HK;Lo;0;L;;;;;N;;;;; +157E;CANADIAN SYLLABICS QAAI;Lo;0;L;;;;;N;;;;; +157F;CANADIAN SYLLABICS QI;Lo;0;L;;;;;N;;;;; +1580;CANADIAN SYLLABICS QII;Lo;0;L;;;;;N;;;;; +1581;CANADIAN SYLLABICS QO;Lo;0;L;;;;;N;;;;; +1582;CANADIAN SYLLABICS QOO;Lo;0;L;;;;;N;;;;; +1583;CANADIAN SYLLABICS QA;Lo;0;L;;;;;N;;;;; +1584;CANADIAN SYLLABICS QAA;Lo;0;L;;;;;N;;;;; +1585;CANADIAN SYLLABICS Q;Lo;0;L;;;;;N;;;;; +1586;CANADIAN SYLLABICS TLHE;Lo;0;L;;;;;N;;;;; +1587;CANADIAN SYLLABICS TLHI;Lo;0;L;;;;;N;;;;; +1588;CANADIAN SYLLABICS TLHO;Lo;0;L;;;;;N;;;;; +1589;CANADIAN SYLLABICS TLHA;Lo;0;L;;;;;N;;;;; +158A;CANADIAN SYLLABICS WEST-CREE RE;Lo;0;L;;;;;N;;;;; +158B;CANADIAN SYLLABICS WEST-CREE RI;Lo;0;L;;;;;N;;;;; +158C;CANADIAN SYLLABICS WEST-CREE RO;Lo;0;L;;;;;N;;;;; +158D;CANADIAN SYLLABICS WEST-CREE RA;Lo;0;L;;;;;N;;;;; +158E;CANADIAN SYLLABICS NGAAI;Lo;0;L;;;;;N;;;;; +158F;CANADIAN SYLLABICS NGI;Lo;0;L;;;;;N;;;;; +1590;CANADIAN SYLLABICS NGII;Lo;0;L;;;;;N;;;;; +1591;CANADIAN SYLLABICS NGO;Lo;0;L;;;;;N;;;;; +1592;CANADIAN SYLLABICS NGOO;Lo;0;L;;;;;N;;;;; +1593;CANADIAN SYLLABICS NGA;Lo;0;L;;;;;N;;;;; +1594;CANADIAN SYLLABICS NGAA;Lo;0;L;;;;;N;;;;; +1595;CANADIAN SYLLABICS NG;Lo;0;L;;;;;N;;;;; +1596;CANADIAN SYLLABICS NNG;Lo;0;L;;;;;N;;;;; +1597;CANADIAN SYLLABICS SAYISI SHE;Lo;0;L;;;;;N;;;;; +1598;CANADIAN SYLLABICS SAYISI SHI;Lo;0;L;;;;;N;;;;; +1599;CANADIAN SYLLABICS SAYISI SHO;Lo;0;L;;;;;N;;;;; +159A;CANADIAN SYLLABICS SAYISI SHA;Lo;0;L;;;;;N;;;;; +159B;CANADIAN SYLLABICS WOODS-CREE THE;Lo;0;L;;;;;N;;;;; +159C;CANADIAN SYLLABICS WOODS-CREE THI;Lo;0;L;;;;;N;;;;; +159D;CANADIAN SYLLABICS WOODS-CREE THO;Lo;0;L;;;;;N;;;;; +159E;CANADIAN SYLLABICS WOODS-CREE THA;Lo;0;L;;;;;N;;;;; +159F;CANADIAN SYLLABICS WOODS-CREE TH;Lo;0;L;;;;;N;;;;; +15A0;CANADIAN SYLLABICS LHI;Lo;0;L;;;;;N;;;;; +15A1;CANADIAN SYLLABICS LHII;Lo;0;L;;;;;N;;;;; +15A2;CANADIAN SYLLABICS LHO;Lo;0;L;;;;;N;;;;; +15A3;CANADIAN SYLLABICS LHOO;Lo;0;L;;;;;N;;;;; +15A4;CANADIAN SYLLABICS LHA;Lo;0;L;;;;;N;;;;; +15A5;CANADIAN SYLLABICS LHAA;Lo;0;L;;;;;N;;;;; +15A6;CANADIAN SYLLABICS LH;Lo;0;L;;;;;N;;;;; +15A7;CANADIAN SYLLABICS TH-CREE THE;Lo;0;L;;;;;N;;;;; +15A8;CANADIAN SYLLABICS TH-CREE THI;Lo;0;L;;;;;N;;;;; +15A9;CANADIAN SYLLABICS TH-CREE THII;Lo;0;L;;;;;N;;;;; +15AA;CANADIAN SYLLABICS TH-CREE THO;Lo;0;L;;;;;N;;;;; +15AB;CANADIAN SYLLABICS TH-CREE THOO;Lo;0;L;;;;;N;;;;; +15AC;CANADIAN SYLLABICS TH-CREE THA;Lo;0;L;;;;;N;;;;; +15AD;CANADIAN SYLLABICS TH-CREE THAA;Lo;0;L;;;;;N;;;;; +15AE;CANADIAN SYLLABICS TH-CREE TH;Lo;0;L;;;;;N;;;;; +15AF;CANADIAN SYLLABICS AIVILIK B;Lo;0;L;;;;;N;;;;; +15B0;CANADIAN SYLLABICS BLACKFOOT E;Lo;0;L;;;;;N;;;;; +15B1;CANADIAN SYLLABICS BLACKFOOT I;Lo;0;L;;;;;N;;;;; +15B2;CANADIAN SYLLABICS BLACKFOOT O;Lo;0;L;;;;;N;;;;; +15B3;CANADIAN SYLLABICS BLACKFOOT A;Lo;0;L;;;;;N;;;;; +15B4;CANADIAN SYLLABICS BLACKFOOT WE;Lo;0;L;;;;;N;;;;; +15B5;CANADIAN SYLLABICS BLACKFOOT WI;Lo;0;L;;;;;N;;;;; +15B6;CANADIAN SYLLABICS BLACKFOOT WO;Lo;0;L;;;;;N;;;;; +15B7;CANADIAN SYLLABICS BLACKFOOT WA;Lo;0;L;;;;;N;;;;; +15B8;CANADIAN SYLLABICS BLACKFOOT NE;Lo;0;L;;;;;N;;;;; +15B9;CANADIAN SYLLABICS BLACKFOOT NI;Lo;0;L;;;;;N;;;;; +15BA;CANADIAN SYLLABICS BLACKFOOT NO;Lo;0;L;;;;;N;;;;; +15BB;CANADIAN SYLLABICS BLACKFOOT NA;Lo;0;L;;;;;N;;;;; +15BC;CANADIAN SYLLABICS BLACKFOOT KE;Lo;0;L;;;;;N;;;;; +15BD;CANADIAN SYLLABICS BLACKFOOT KI;Lo;0;L;;;;;N;;;;; +15BE;CANADIAN SYLLABICS BLACKFOOT KO;Lo;0;L;;;;;N;;;;; +15BF;CANADIAN SYLLABICS BLACKFOOT KA;Lo;0;L;;;;;N;;;;; +15C0;CANADIAN SYLLABICS SAYISI HE;Lo;0;L;;;;;N;;;;; +15C1;CANADIAN SYLLABICS SAYISI HI;Lo;0;L;;;;;N;;;;; +15C2;CANADIAN SYLLABICS SAYISI HO;Lo;0;L;;;;;N;;;;; +15C3;CANADIAN SYLLABICS SAYISI HA;Lo;0;L;;;;;N;;;;; +15C4;CANADIAN SYLLABICS CARRIER GHU;Lo;0;L;;;;;N;;;;; +15C5;CANADIAN SYLLABICS CARRIER GHO;Lo;0;L;;;;;N;;;;; +15C6;CANADIAN SYLLABICS CARRIER GHE;Lo;0;L;;;;;N;;;;; +15C7;CANADIAN SYLLABICS CARRIER GHEE;Lo;0;L;;;;;N;;;;; +15C8;CANADIAN SYLLABICS CARRIER GHI;Lo;0;L;;;;;N;;;;; +15C9;CANADIAN SYLLABICS CARRIER GHA;Lo;0;L;;;;;N;;;;; +15CA;CANADIAN SYLLABICS CARRIER RU;Lo;0;L;;;;;N;;;;; +15CB;CANADIAN SYLLABICS CARRIER RO;Lo;0;L;;;;;N;;;;; +15CC;CANADIAN SYLLABICS CARRIER RE;Lo;0;L;;;;;N;;;;; +15CD;CANADIAN SYLLABICS CARRIER REE;Lo;0;L;;;;;N;;;;; +15CE;CANADIAN SYLLABICS CARRIER RI;Lo;0;L;;;;;N;;;;; +15CF;CANADIAN SYLLABICS CARRIER RA;Lo;0;L;;;;;N;;;;; +15D0;CANADIAN SYLLABICS CARRIER WU;Lo;0;L;;;;;N;;;;; +15D1;CANADIAN SYLLABICS CARRIER WO;Lo;0;L;;;;;N;;;;; +15D2;CANADIAN SYLLABICS CARRIER WE;Lo;0;L;;;;;N;;;;; +15D3;CANADIAN SYLLABICS CARRIER WEE;Lo;0;L;;;;;N;;;;; +15D4;CANADIAN SYLLABICS CARRIER WI;Lo;0;L;;;;;N;;;;; +15D5;CANADIAN SYLLABICS CARRIER WA;Lo;0;L;;;;;N;;;;; +15D6;CANADIAN SYLLABICS CARRIER HWU;Lo;0;L;;;;;N;;;;; +15D7;CANADIAN SYLLABICS CARRIER HWO;Lo;0;L;;;;;N;;;;; +15D8;CANADIAN SYLLABICS CARRIER HWE;Lo;0;L;;;;;N;;;;; +15D9;CANADIAN SYLLABICS CARRIER HWEE;Lo;0;L;;;;;N;;;;; +15DA;CANADIAN SYLLABICS CARRIER HWI;Lo;0;L;;;;;N;;;;; +15DB;CANADIAN SYLLABICS CARRIER HWA;Lo;0;L;;;;;N;;;;; +15DC;CANADIAN SYLLABICS CARRIER THU;Lo;0;L;;;;;N;;;;; +15DD;CANADIAN SYLLABICS CARRIER THO;Lo;0;L;;;;;N;;;;; +15DE;CANADIAN SYLLABICS CARRIER THE;Lo;0;L;;;;;N;;;;; +15DF;CANADIAN SYLLABICS CARRIER THEE;Lo;0;L;;;;;N;;;;; +15E0;CANADIAN SYLLABICS CARRIER THI;Lo;0;L;;;;;N;;;;; +15E1;CANADIAN SYLLABICS CARRIER THA;Lo;0;L;;;;;N;;;;; +15E2;CANADIAN SYLLABICS CARRIER TTU;Lo;0;L;;;;;N;;;;; +15E3;CANADIAN SYLLABICS CARRIER TTO;Lo;0;L;;;;;N;;;;; +15E4;CANADIAN SYLLABICS CARRIER TTE;Lo;0;L;;;;;N;;;;; +15E5;CANADIAN SYLLABICS CARRIER TTEE;Lo;0;L;;;;;N;;;;; +15E6;CANADIAN SYLLABICS CARRIER TTI;Lo;0;L;;;;;N;;;;; +15E7;CANADIAN SYLLABICS CARRIER TTA;Lo;0;L;;;;;N;;;;; +15E8;CANADIAN SYLLABICS CARRIER PU;Lo;0;L;;;;;N;;;;; +15E9;CANADIAN SYLLABICS CARRIER PO;Lo;0;L;;;;;N;;;;; +15EA;CANADIAN SYLLABICS CARRIER PE;Lo;0;L;;;;;N;;;;; +15EB;CANADIAN SYLLABICS CARRIER PEE;Lo;0;L;;;;;N;;;;; +15EC;CANADIAN SYLLABICS CARRIER PI;Lo;0;L;;;;;N;;;;; +15ED;CANADIAN SYLLABICS CARRIER PA;Lo;0;L;;;;;N;;;;; +15EE;CANADIAN SYLLABICS CARRIER P;Lo;0;L;;;;;N;;;;; +15EF;CANADIAN SYLLABICS CARRIER GU;Lo;0;L;;;;;N;;;;; +15F0;CANADIAN SYLLABICS CARRIER GO;Lo;0;L;;;;;N;;;;; +15F1;CANADIAN SYLLABICS CARRIER GE;Lo;0;L;;;;;N;;;;; +15F2;CANADIAN SYLLABICS CARRIER GEE;Lo;0;L;;;;;N;;;;; +15F3;CANADIAN SYLLABICS CARRIER GI;Lo;0;L;;;;;N;;;;; +15F4;CANADIAN SYLLABICS CARRIER GA;Lo;0;L;;;;;N;;;;; +15F5;CANADIAN SYLLABICS CARRIER KHU;Lo;0;L;;;;;N;;;;; +15F6;CANADIAN SYLLABICS CARRIER KHO;Lo;0;L;;;;;N;;;;; +15F7;CANADIAN SYLLABICS CARRIER KHE;Lo;0;L;;;;;N;;;;; +15F8;CANADIAN SYLLABICS CARRIER KHEE;Lo;0;L;;;;;N;;;;; +15F9;CANADIAN SYLLABICS CARRIER KHI;Lo;0;L;;;;;N;;;;; +15FA;CANADIAN SYLLABICS CARRIER KHA;Lo;0;L;;;;;N;;;;; +15FB;CANADIAN SYLLABICS CARRIER KKU;Lo;0;L;;;;;N;;;;; +15FC;CANADIAN SYLLABICS CARRIER KKO;Lo;0;L;;;;;N;;;;; +15FD;CANADIAN SYLLABICS CARRIER KKE;Lo;0;L;;;;;N;;;;; +15FE;CANADIAN SYLLABICS CARRIER KKEE;Lo;0;L;;;;;N;;;;; +15FF;CANADIAN SYLLABICS CARRIER KKI;Lo;0;L;;;;;N;;;;; +1600;CANADIAN SYLLABICS CARRIER KKA;Lo;0;L;;;;;N;;;;; +1601;CANADIAN SYLLABICS CARRIER KK;Lo;0;L;;;;;N;;;;; +1602;CANADIAN SYLLABICS CARRIER NU;Lo;0;L;;;;;N;;;;; +1603;CANADIAN SYLLABICS CARRIER NO;Lo;0;L;;;;;N;;;;; +1604;CANADIAN SYLLABICS CARRIER NE;Lo;0;L;;;;;N;;;;; +1605;CANADIAN SYLLABICS CARRIER NEE;Lo;0;L;;;;;N;;;;; +1606;CANADIAN SYLLABICS CARRIER NI;Lo;0;L;;;;;N;;;;; +1607;CANADIAN SYLLABICS CARRIER NA;Lo;0;L;;;;;N;;;;; +1608;CANADIAN SYLLABICS CARRIER MU;Lo;0;L;;;;;N;;;;; +1609;CANADIAN SYLLABICS CARRIER MO;Lo;0;L;;;;;N;;;;; +160A;CANADIAN SYLLABICS CARRIER ME;Lo;0;L;;;;;N;;;;; +160B;CANADIAN SYLLABICS CARRIER MEE;Lo;0;L;;;;;N;;;;; +160C;CANADIAN SYLLABICS CARRIER MI;Lo;0;L;;;;;N;;;;; +160D;CANADIAN SYLLABICS CARRIER MA;Lo;0;L;;;;;N;;;;; +160E;CANADIAN SYLLABICS CARRIER YU;Lo;0;L;;;;;N;;;;; +160F;CANADIAN SYLLABICS CARRIER YO;Lo;0;L;;;;;N;;;;; +1610;CANADIAN SYLLABICS CARRIER YE;Lo;0;L;;;;;N;;;;; +1611;CANADIAN SYLLABICS CARRIER YEE;Lo;0;L;;;;;N;;;;; +1612;CANADIAN SYLLABICS CARRIER YI;Lo;0;L;;;;;N;;;;; +1613;CANADIAN SYLLABICS CARRIER YA;Lo;0;L;;;;;N;;;;; +1614;CANADIAN SYLLABICS CARRIER JU;Lo;0;L;;;;;N;;;;; +1615;CANADIAN SYLLABICS SAYISI JU;Lo;0;L;;;;;N;;;;; +1616;CANADIAN SYLLABICS CARRIER JO;Lo;0;L;;;;;N;;;;; +1617;CANADIAN SYLLABICS CARRIER JE;Lo;0;L;;;;;N;;;;; +1618;CANADIAN SYLLABICS CARRIER JEE;Lo;0;L;;;;;N;;;;; +1619;CANADIAN SYLLABICS CARRIER JI;Lo;0;L;;;;;N;;;;; +161A;CANADIAN SYLLABICS SAYISI JI;Lo;0;L;;;;;N;;;;; +161B;CANADIAN SYLLABICS CARRIER JA;Lo;0;L;;;;;N;;;;; +161C;CANADIAN SYLLABICS CARRIER JJU;Lo;0;L;;;;;N;;;;; +161D;CANADIAN SYLLABICS CARRIER JJO;Lo;0;L;;;;;N;;;;; +161E;CANADIAN SYLLABICS CARRIER JJE;Lo;0;L;;;;;N;;;;; +161F;CANADIAN SYLLABICS CARRIER JJEE;Lo;0;L;;;;;N;;;;; +1620;CANADIAN SYLLABICS CARRIER JJI;Lo;0;L;;;;;N;;;;; +1621;CANADIAN SYLLABICS CARRIER JJA;Lo;0;L;;;;;N;;;;; +1622;CANADIAN SYLLABICS CARRIER LU;Lo;0;L;;;;;N;;;;; +1623;CANADIAN SYLLABICS CARRIER LO;Lo;0;L;;;;;N;;;;; +1624;CANADIAN SYLLABICS CARRIER LE;Lo;0;L;;;;;N;;;;; +1625;CANADIAN SYLLABICS CARRIER LEE;Lo;0;L;;;;;N;;;;; +1626;CANADIAN SYLLABICS CARRIER LI;Lo;0;L;;;;;N;;;;; +1627;CANADIAN SYLLABICS CARRIER LA;Lo;0;L;;;;;N;;;;; +1628;CANADIAN SYLLABICS CARRIER DLU;Lo;0;L;;;;;N;;;;; +1629;CANADIAN SYLLABICS CARRIER DLO;Lo;0;L;;;;;N;;;;; +162A;CANADIAN SYLLABICS CARRIER DLE;Lo;0;L;;;;;N;;;;; +162B;CANADIAN SYLLABICS CARRIER DLEE;Lo;0;L;;;;;N;;;;; +162C;CANADIAN SYLLABICS CARRIER DLI;Lo;0;L;;;;;N;;;;; +162D;CANADIAN SYLLABICS CARRIER DLA;Lo;0;L;;;;;N;;;;; +162E;CANADIAN SYLLABICS CARRIER LHU;Lo;0;L;;;;;N;;;;; +162F;CANADIAN SYLLABICS CARRIER LHO;Lo;0;L;;;;;N;;;;; +1630;CANADIAN SYLLABICS CARRIER LHE;Lo;0;L;;;;;N;;;;; +1631;CANADIAN SYLLABICS CARRIER LHEE;Lo;0;L;;;;;N;;;;; +1632;CANADIAN SYLLABICS CARRIER LHI;Lo;0;L;;;;;N;;;;; +1633;CANADIAN SYLLABICS CARRIER LHA;Lo;0;L;;;;;N;;;;; +1634;CANADIAN SYLLABICS CARRIER TLHU;Lo;0;L;;;;;N;;;;; +1635;CANADIAN SYLLABICS CARRIER TLHO;Lo;0;L;;;;;N;;;;; +1636;CANADIAN SYLLABICS CARRIER TLHE;Lo;0;L;;;;;N;;;;; +1637;CANADIAN SYLLABICS CARRIER TLHEE;Lo;0;L;;;;;N;;;;; +1638;CANADIAN SYLLABICS CARRIER TLHI;Lo;0;L;;;;;N;;;;; +1639;CANADIAN SYLLABICS CARRIER TLHA;Lo;0;L;;;;;N;;;;; +163A;CANADIAN SYLLABICS CARRIER TLU;Lo;0;L;;;;;N;;;;; +163B;CANADIAN SYLLABICS CARRIER TLO;Lo;0;L;;;;;N;;;;; +163C;CANADIAN SYLLABICS CARRIER TLE;Lo;0;L;;;;;N;;;;; +163D;CANADIAN SYLLABICS CARRIER TLEE;Lo;0;L;;;;;N;;;;; +163E;CANADIAN SYLLABICS CARRIER TLI;Lo;0;L;;;;;N;;;;; +163F;CANADIAN SYLLABICS CARRIER TLA;Lo;0;L;;;;;N;;;;; +1640;CANADIAN SYLLABICS CARRIER ZU;Lo;0;L;;;;;N;;;;; +1641;CANADIAN SYLLABICS CARRIER ZO;Lo;0;L;;;;;N;;;;; +1642;CANADIAN SYLLABICS CARRIER ZE;Lo;0;L;;;;;N;;;;; +1643;CANADIAN SYLLABICS CARRIER ZEE;Lo;0;L;;;;;N;;;;; +1644;CANADIAN SYLLABICS CARRIER ZI;Lo;0;L;;;;;N;;;;; +1645;CANADIAN SYLLABICS CARRIER ZA;Lo;0;L;;;;;N;;;;; +1646;CANADIAN SYLLABICS CARRIER Z;Lo;0;L;;;;;N;;;;; +1647;CANADIAN SYLLABICS CARRIER INITIAL Z;Lo;0;L;;;;;N;;;;; +1648;CANADIAN SYLLABICS CARRIER DZU;Lo;0;L;;;;;N;;;;; +1649;CANADIAN SYLLABICS CARRIER DZO;Lo;0;L;;;;;N;;;;; +164A;CANADIAN SYLLABICS CARRIER DZE;Lo;0;L;;;;;N;;;;; +164B;CANADIAN SYLLABICS CARRIER DZEE;Lo;0;L;;;;;N;;;;; +164C;CANADIAN SYLLABICS CARRIER DZI;Lo;0;L;;;;;N;;;;; +164D;CANADIAN SYLLABICS CARRIER DZA;Lo;0;L;;;;;N;;;;; +164E;CANADIAN SYLLABICS CARRIER SU;Lo;0;L;;;;;N;;;;; +164F;CANADIAN SYLLABICS CARRIER SO;Lo;0;L;;;;;N;;;;; +1650;CANADIAN SYLLABICS CARRIER SE;Lo;0;L;;;;;N;;;;; +1651;CANADIAN SYLLABICS CARRIER SEE;Lo;0;L;;;;;N;;;;; +1652;CANADIAN SYLLABICS CARRIER SI;Lo;0;L;;;;;N;;;;; +1653;CANADIAN SYLLABICS CARRIER SA;Lo;0;L;;;;;N;;;;; +1654;CANADIAN SYLLABICS CARRIER SHU;Lo;0;L;;;;;N;;;;; +1655;CANADIAN SYLLABICS CARRIER SHO;Lo;0;L;;;;;N;;;;; +1656;CANADIAN SYLLABICS CARRIER SHE;Lo;0;L;;;;;N;;;;; +1657;CANADIAN SYLLABICS CARRIER SHEE;Lo;0;L;;;;;N;;;;; +1658;CANADIAN SYLLABICS CARRIER SHI;Lo;0;L;;;;;N;;;;; +1659;CANADIAN SYLLABICS CARRIER SHA;Lo;0;L;;;;;N;;;;; +165A;CANADIAN SYLLABICS CARRIER SH;Lo;0;L;;;;;N;;;;; +165B;CANADIAN SYLLABICS CARRIER TSU;Lo;0;L;;;;;N;;;;; +165C;CANADIAN SYLLABICS CARRIER TSO;Lo;0;L;;;;;N;;;;; +165D;CANADIAN SYLLABICS CARRIER TSE;Lo;0;L;;;;;N;;;;; +165E;CANADIAN SYLLABICS CARRIER TSEE;Lo;0;L;;;;;N;;;;; +165F;CANADIAN SYLLABICS CARRIER TSI;Lo;0;L;;;;;N;;;;; +1660;CANADIAN SYLLABICS CARRIER TSA;Lo;0;L;;;;;N;;;;; +1661;CANADIAN SYLLABICS CARRIER CHU;Lo;0;L;;;;;N;;;;; +1662;CANADIAN SYLLABICS CARRIER CHO;Lo;0;L;;;;;N;;;;; +1663;CANADIAN SYLLABICS CARRIER CHE;Lo;0;L;;;;;N;;;;; +1664;CANADIAN SYLLABICS CARRIER CHEE;Lo;0;L;;;;;N;;;;; +1665;CANADIAN SYLLABICS CARRIER CHI;Lo;0;L;;;;;N;;;;; +1666;CANADIAN SYLLABICS CARRIER CHA;Lo;0;L;;;;;N;;;;; +1667;CANADIAN SYLLABICS CARRIER TTSU;Lo;0;L;;;;;N;;;;; +1668;CANADIAN SYLLABICS CARRIER TTSO;Lo;0;L;;;;;N;;;;; +1669;CANADIAN SYLLABICS CARRIER TTSE;Lo;0;L;;;;;N;;;;; +166A;CANADIAN SYLLABICS CARRIER TTSEE;Lo;0;L;;;;;N;;;;; +166B;CANADIAN SYLLABICS CARRIER TTSI;Lo;0;L;;;;;N;;;;; +166C;CANADIAN SYLLABICS CARRIER TTSA;Lo;0;L;;;;;N;;;;; +166D;CANADIAN SYLLABICS CHI SIGN;So;0;L;;;;;N;;;;; +166E;CANADIAN SYLLABICS FULL STOP;Po;0;L;;;;;N;;;;; +166F;CANADIAN SYLLABICS QAI;Lo;0;L;;;;;N;;;;; +1670;CANADIAN SYLLABICS NGAI;Lo;0;L;;;;;N;;;;; +1671;CANADIAN SYLLABICS NNGI;Lo;0;L;;;;;N;;;;; +1672;CANADIAN SYLLABICS NNGII;Lo;0;L;;;;;N;;;;; +1673;CANADIAN SYLLABICS NNGO;Lo;0;L;;;;;N;;;;; +1674;CANADIAN SYLLABICS NNGOO;Lo;0;L;;;;;N;;;;; +1675;CANADIAN SYLLABICS NNGA;Lo;0;L;;;;;N;;;;; +1676;CANADIAN SYLLABICS NNGAA;Lo;0;L;;;;;N;;;;; +1677;CANADIAN SYLLABICS WOODS-CREE THWEE;Lo;0;L;;;;;N;;;;; +1678;CANADIAN SYLLABICS WOODS-CREE THWI;Lo;0;L;;;;;N;;;;; +1679;CANADIAN SYLLABICS WOODS-CREE THWII;Lo;0;L;;;;;N;;;;; +167A;CANADIAN SYLLABICS WOODS-CREE THWO;Lo;0;L;;;;;N;;;;; +167B;CANADIAN SYLLABICS WOODS-CREE THWOO;Lo;0;L;;;;;N;;;;; +167C;CANADIAN SYLLABICS WOODS-CREE THWA;Lo;0;L;;;;;N;;;;; +167D;CANADIAN SYLLABICS WOODS-CREE THWAA;Lo;0;L;;;;;N;;;;; +167E;CANADIAN SYLLABICS WOODS-CREE FINAL TH;Lo;0;L;;;;;N;;;;; +167F;CANADIAN SYLLABICS BLACKFOOT W;Lo;0;L;;;;;N;;;;; +1680;OGHAM SPACE MARK;Zs;0;WS;;;;;N;;;;; +1681;OGHAM LETTER BEITH;Lo;0;L;;;;;N;;;;; +1682;OGHAM LETTER LUIS;Lo;0;L;;;;;N;;;;; +1683;OGHAM LETTER FEARN;Lo;0;L;;;;;N;;;;; +1684;OGHAM LETTER SAIL;Lo;0;L;;;;;N;;;;; +1685;OGHAM LETTER NION;Lo;0;L;;;;;N;;;;; +1686;OGHAM LETTER UATH;Lo;0;L;;;;;N;;;;; +1687;OGHAM LETTER DAIR;Lo;0;L;;;;;N;;;;; +1688;OGHAM LETTER TINNE;Lo;0;L;;;;;N;;;;; +1689;OGHAM LETTER COLL;Lo;0;L;;;;;N;;;;; +168A;OGHAM LETTER CEIRT;Lo;0;L;;;;;N;;;;; +168B;OGHAM LETTER MUIN;Lo;0;L;;;;;N;;;;; +168C;OGHAM LETTER GORT;Lo;0;L;;;;;N;;;;; +168D;OGHAM LETTER NGEADAL;Lo;0;L;;;;;N;;;;; +168E;OGHAM LETTER STRAIF;Lo;0;L;;;;;N;;;;; +168F;OGHAM LETTER RUIS;Lo;0;L;;;;;N;;;;; +1690;OGHAM LETTER AILM;Lo;0;L;;;;;N;;;;; +1691;OGHAM LETTER ONN;Lo;0;L;;;;;N;;;;; +1692;OGHAM LETTER UR;Lo;0;L;;;;;N;;;;; +1693;OGHAM LETTER EADHADH;Lo;0;L;;;;;N;;;;; +1694;OGHAM LETTER IODHADH;Lo;0;L;;;;;N;;;;; +1695;OGHAM LETTER EABHADH;Lo;0;L;;;;;N;;;;; +1696;OGHAM LETTER OR;Lo;0;L;;;;;N;;;;; +1697;OGHAM LETTER UILLEANN;Lo;0;L;;;;;N;;;;; +1698;OGHAM LETTER IFIN;Lo;0;L;;;;;N;;;;; +1699;OGHAM LETTER EAMHANCHOLL;Lo;0;L;;;;;N;;;;; +169A;OGHAM LETTER PEITH;Lo;0;L;;;;;N;;;;; +169B;OGHAM FEATHER MARK;Ps;0;ON;;;;;Y;;;;; +169C;OGHAM REVERSED FEATHER MARK;Pe;0;ON;;;;;Y;;;;; +16A0;RUNIC LETTER FEHU FEOH FE F;Lo;0;L;;;;;N;;;;; +16A1;RUNIC LETTER V;Lo;0;L;;;;;N;;;;; +16A2;RUNIC LETTER URUZ UR U;Lo;0;L;;;;;N;;;;; +16A3;RUNIC LETTER YR;Lo;0;L;;;;;N;;;;; +16A4;RUNIC LETTER Y;Lo;0;L;;;;;N;;;;; +16A5;RUNIC LETTER W;Lo;0;L;;;;;N;;;;; +16A6;RUNIC LETTER THURISAZ THURS THORN;Lo;0;L;;;;;N;;;;; +16A7;RUNIC LETTER ETH;Lo;0;L;;;;;N;;;;; +16A8;RUNIC LETTER ANSUZ A;Lo;0;L;;;;;N;;;;; +16A9;RUNIC LETTER OS O;Lo;0;L;;;;;N;;;;; +16AA;RUNIC LETTER AC A;Lo;0;L;;;;;N;;;;; +16AB;RUNIC LETTER AESC;Lo;0;L;;;;;N;;;;; +16AC;RUNIC LETTER LONG-BRANCH-OSS O;Lo;0;L;;;;;N;;;;; +16AD;RUNIC LETTER SHORT-TWIG-OSS O;Lo;0;L;;;;;N;;;;; +16AE;RUNIC LETTER O;Lo;0;L;;;;;N;;;;; +16AF;RUNIC LETTER OE;Lo;0;L;;;;;N;;;;; +16B0;RUNIC LETTER ON;Lo;0;L;;;;;N;;;;; +16B1;RUNIC LETTER RAIDO RAD REID R;Lo;0;L;;;;;N;;;;; +16B2;RUNIC LETTER KAUNA;Lo;0;L;;;;;N;;;;; +16B3;RUNIC LETTER CEN;Lo;0;L;;;;;N;;;;; +16B4;RUNIC LETTER KAUN K;Lo;0;L;;;;;N;;;;; +16B5;RUNIC LETTER G;Lo;0;L;;;;;N;;;;; +16B6;RUNIC LETTER ENG;Lo;0;L;;;;;N;;;;; +16B7;RUNIC LETTER GEBO GYFU G;Lo;0;L;;;;;N;;;;; +16B8;RUNIC LETTER GAR;Lo;0;L;;;;;N;;;;; +16B9;RUNIC LETTER WUNJO WYNN W;Lo;0;L;;;;;N;;;;; +16BA;RUNIC LETTER HAGLAZ H;Lo;0;L;;;;;N;;;;; +16BB;RUNIC LETTER HAEGL H;Lo;0;L;;;;;N;;;;; +16BC;RUNIC LETTER LONG-BRANCH-HAGALL H;Lo;0;L;;;;;N;;;;; +16BD;RUNIC LETTER SHORT-TWIG-HAGALL H;Lo;0;L;;;;;N;;;;; +16BE;RUNIC LETTER NAUDIZ NYD NAUD N;Lo;0;L;;;;;N;;;;; +16BF;RUNIC LETTER SHORT-TWIG-NAUD N;Lo;0;L;;;;;N;;;;; +16C0;RUNIC LETTER DOTTED-N;Lo;0;L;;;;;N;;;;; +16C1;RUNIC LETTER ISAZ IS ISS I;Lo;0;L;;;;;N;;;;; +16C2;RUNIC LETTER E;Lo;0;L;;;;;N;;;;; +16C3;RUNIC LETTER JERAN J;Lo;0;L;;;;;N;;;;; +16C4;RUNIC LETTER GER;Lo;0;L;;;;;N;;;;; +16C5;RUNIC LETTER LONG-BRANCH-AR AE;Lo;0;L;;;;;N;;;;; +16C6;RUNIC LETTER SHORT-TWIG-AR A;Lo;0;L;;;;;N;;;;; +16C7;RUNIC LETTER IWAZ EOH;Lo;0;L;;;;;N;;;;; +16C8;RUNIC LETTER PERTHO PEORTH P;Lo;0;L;;;;;N;;;;; +16C9;RUNIC LETTER ALGIZ EOLHX;Lo;0;L;;;;;N;;;;; +16CA;RUNIC LETTER SOWILO S;Lo;0;L;;;;;N;;;;; +16CB;RUNIC LETTER SIGEL LONG-BRANCH-SOL S;Lo;0;L;;;;;N;;;;; +16CC;RUNIC LETTER SHORT-TWIG-SOL S;Lo;0;L;;;;;N;;;;; +16CD;RUNIC LETTER C;Lo;0;L;;;;;N;;;;; +16CE;RUNIC LETTER Z;Lo;0;L;;;;;N;;;;; +16CF;RUNIC LETTER TIWAZ TIR TYR T;Lo;0;L;;;;;N;;;;; +16D0;RUNIC LETTER SHORT-TWIG-TYR T;Lo;0;L;;;;;N;;;;; +16D1;RUNIC LETTER D;Lo;0;L;;;;;N;;;;; +16D2;RUNIC LETTER BERKANAN BEORC BJARKAN B;Lo;0;L;;;;;N;;;;; +16D3;RUNIC LETTER SHORT-TWIG-BJARKAN B;Lo;0;L;;;;;N;;;;; +16D4;RUNIC LETTER DOTTED-P;Lo;0;L;;;;;N;;;;; +16D5;RUNIC LETTER OPEN-P;Lo;0;L;;;;;N;;;;; +16D6;RUNIC LETTER EHWAZ EH E;Lo;0;L;;;;;N;;;;; +16D7;RUNIC LETTER MANNAZ MAN M;Lo;0;L;;;;;N;;;;; +16D8;RUNIC LETTER LONG-BRANCH-MADR M;Lo;0;L;;;;;N;;;;; +16D9;RUNIC LETTER SHORT-TWIG-MADR M;Lo;0;L;;;;;N;;;;; +16DA;RUNIC LETTER LAUKAZ LAGU LOGR L;Lo;0;L;;;;;N;;;;; +16DB;RUNIC LETTER DOTTED-L;Lo;0;L;;;;;N;;;;; +16DC;RUNIC LETTER INGWAZ;Lo;0;L;;;;;N;;;;; +16DD;RUNIC LETTER ING;Lo;0;L;;;;;N;;;;; +16DE;RUNIC LETTER DAGAZ DAEG D;Lo;0;L;;;;;N;;;;; +16DF;RUNIC LETTER OTHALAN ETHEL O;Lo;0;L;;;;;N;;;;; +16E0;RUNIC LETTER EAR;Lo;0;L;;;;;N;;;;; +16E1;RUNIC LETTER IOR;Lo;0;L;;;;;N;;;;; +16E2;RUNIC LETTER CWEORTH;Lo;0;L;;;;;N;;;;; +16E3;RUNIC LETTER CALC;Lo;0;L;;;;;N;;;;; +16E4;RUNIC LETTER CEALC;Lo;0;L;;;;;N;;;;; +16E5;RUNIC LETTER STAN;Lo;0;L;;;;;N;;;;; +16E6;RUNIC LETTER LONG-BRANCH-YR;Lo;0;L;;;;;N;;;;; +16E7;RUNIC LETTER SHORT-TWIG-YR;Lo;0;L;;;;;N;;;;; +16E8;RUNIC LETTER ICELANDIC-YR;Lo;0;L;;;;;N;;;;; +16E9;RUNIC LETTER Q;Lo;0;L;;;;;N;;;;; +16EA;RUNIC LETTER X;Lo;0;L;;;;;N;;;;; +16EB;RUNIC SINGLE PUNCTUATION;Po;0;L;;;;;N;;;;; +16EC;RUNIC MULTIPLE PUNCTUATION;Po;0;L;;;;;N;;;;; +16ED;RUNIC CROSS PUNCTUATION;Po;0;L;;;;;N;;;;; +16EE;RUNIC ARLAUG SYMBOL;Nl;0;L;;;;17;N;;;;; +16EF;RUNIC TVIMADUR SYMBOL;Nl;0;L;;;;18;N;;;;; +16F0;RUNIC BELGTHOR SYMBOL;Nl;0;L;;;;19;N;;;;; +16F1;RUNIC LETTER K;Lo;0;L;;;;;N;;;;; +16F2;RUNIC LETTER SH;Lo;0;L;;;;;N;;;;; +16F3;RUNIC LETTER OO;Lo;0;L;;;;;N;;;;; +16F4;RUNIC LETTER FRANKS CASKET OS;Lo;0;L;;;;;N;;;;; +16F5;RUNIC LETTER FRANKS CASKET IS;Lo;0;L;;;;;N;;;;; +16F6;RUNIC LETTER FRANKS CASKET EH;Lo;0;L;;;;;N;;;;; +16F7;RUNIC LETTER FRANKS CASKET AC;Lo;0;L;;;;;N;;;;; +16F8;RUNIC LETTER FRANKS CASKET AESC;Lo;0;L;;;;;N;;;;; +1700;TAGALOG LETTER A;Lo;0;L;;;;;N;;;;; +1701;TAGALOG LETTER I;Lo;0;L;;;;;N;;;;; +1702;TAGALOG LETTER U;Lo;0;L;;;;;N;;;;; +1703;TAGALOG LETTER KA;Lo;0;L;;;;;N;;;;; +1704;TAGALOG LETTER GA;Lo;0;L;;;;;N;;;;; +1705;TAGALOG LETTER NGA;Lo;0;L;;;;;N;;;;; +1706;TAGALOG LETTER TA;Lo;0;L;;;;;N;;;;; +1707;TAGALOG LETTER DA;Lo;0;L;;;;;N;;;;; +1708;TAGALOG LETTER NA;Lo;0;L;;;;;N;;;;; +1709;TAGALOG LETTER PA;Lo;0;L;;;;;N;;;;; +170A;TAGALOG LETTER BA;Lo;0;L;;;;;N;;;;; +170B;TAGALOG LETTER MA;Lo;0;L;;;;;N;;;;; +170C;TAGALOG LETTER YA;Lo;0;L;;;;;N;;;;; +170D;TAGALOG LETTER RA;Lo;0;L;;;;;N;;;;; +170E;TAGALOG LETTER LA;Lo;0;L;;;;;N;;;;; +170F;TAGALOG LETTER WA;Lo;0;L;;;;;N;;;;; +1710;TAGALOG LETTER SA;Lo;0;L;;;;;N;;;;; +1711;TAGALOG LETTER HA;Lo;0;L;;;;;N;;;;; +1712;TAGALOG VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;; +1713;TAGALOG VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;; +1714;TAGALOG SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;; +1715;TAGALOG SIGN PAMUDPOD;Mc;9;L;;;;;N;;;;; +171F;TAGALOG LETTER ARCHAIC RA;Lo;0;L;;;;;N;;;;; +1720;HANUNOO LETTER A;Lo;0;L;;;;;N;;;;; +1721;HANUNOO LETTER I;Lo;0;L;;;;;N;;;;; +1722;HANUNOO LETTER U;Lo;0;L;;;;;N;;;;; +1723;HANUNOO LETTER KA;Lo;0;L;;;;;N;;;;; +1724;HANUNOO LETTER GA;Lo;0;L;;;;;N;;;;; +1725;HANUNOO LETTER NGA;Lo;0;L;;;;;N;;;;; +1726;HANUNOO LETTER TA;Lo;0;L;;;;;N;;;;; +1727;HANUNOO LETTER DA;Lo;0;L;;;;;N;;;;; +1728;HANUNOO LETTER NA;Lo;0;L;;;;;N;;;;; +1729;HANUNOO LETTER PA;Lo;0;L;;;;;N;;;;; +172A;HANUNOO LETTER BA;Lo;0;L;;;;;N;;;;; +172B;HANUNOO LETTER MA;Lo;0;L;;;;;N;;;;; +172C;HANUNOO LETTER YA;Lo;0;L;;;;;N;;;;; +172D;HANUNOO LETTER RA;Lo;0;L;;;;;N;;;;; +172E;HANUNOO LETTER LA;Lo;0;L;;;;;N;;;;; +172F;HANUNOO LETTER WA;Lo;0;L;;;;;N;;;;; +1730;HANUNOO LETTER SA;Lo;0;L;;;;;N;;;;; +1731;HANUNOO LETTER HA;Lo;0;L;;;;;N;;;;; +1732;HANUNOO VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;; +1733;HANUNOO VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;; +1734;HANUNOO SIGN PAMUDPOD;Mc;9;L;;;;;N;;;;; +1735;PHILIPPINE SINGLE PUNCTUATION;Po;0;L;;;;;N;;;;; +1736;PHILIPPINE DOUBLE PUNCTUATION;Po;0;L;;;;;N;;;;; +1740;BUHID LETTER A;Lo;0;L;;;;;N;;;;; +1741;BUHID LETTER I;Lo;0;L;;;;;N;;;;; +1742;BUHID LETTER U;Lo;0;L;;;;;N;;;;; +1743;BUHID LETTER KA;Lo;0;L;;;;;N;;;;; +1744;BUHID LETTER GA;Lo;0;L;;;;;N;;;;; +1745;BUHID LETTER NGA;Lo;0;L;;;;;N;;;;; +1746;BUHID LETTER TA;Lo;0;L;;;;;N;;;;; +1747;BUHID LETTER DA;Lo;0;L;;;;;N;;;;; +1748;BUHID LETTER NA;Lo;0;L;;;;;N;;;;; +1749;BUHID LETTER PA;Lo;0;L;;;;;N;;;;; +174A;BUHID LETTER BA;Lo;0;L;;;;;N;;;;; +174B;BUHID LETTER MA;Lo;0;L;;;;;N;;;;; +174C;BUHID LETTER YA;Lo;0;L;;;;;N;;;;; +174D;BUHID LETTER RA;Lo;0;L;;;;;N;;;;; +174E;BUHID LETTER LA;Lo;0;L;;;;;N;;;;; +174F;BUHID LETTER WA;Lo;0;L;;;;;N;;;;; +1750;BUHID LETTER SA;Lo;0;L;;;;;N;;;;; +1751;BUHID LETTER HA;Lo;0;L;;;;;N;;;;; +1752;BUHID VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;; +1753;BUHID VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;; +1760;TAGBANWA LETTER A;Lo;0;L;;;;;N;;;;; +1761;TAGBANWA LETTER I;Lo;0;L;;;;;N;;;;; +1762;TAGBANWA LETTER U;Lo;0;L;;;;;N;;;;; +1763;TAGBANWA LETTER KA;Lo;0;L;;;;;N;;;;; +1764;TAGBANWA LETTER GA;Lo;0;L;;;;;N;;;;; +1765;TAGBANWA LETTER NGA;Lo;0;L;;;;;N;;;;; +1766;TAGBANWA LETTER TA;Lo;0;L;;;;;N;;;;; +1767;TAGBANWA LETTER DA;Lo;0;L;;;;;N;;;;; +1768;TAGBANWA LETTER NA;Lo;0;L;;;;;N;;;;; +1769;TAGBANWA LETTER PA;Lo;0;L;;;;;N;;;;; +176A;TAGBANWA LETTER BA;Lo;0;L;;;;;N;;;;; +176B;TAGBANWA LETTER MA;Lo;0;L;;;;;N;;;;; +176C;TAGBANWA LETTER YA;Lo;0;L;;;;;N;;;;; +176E;TAGBANWA LETTER LA;Lo;0;L;;;;;N;;;;; +176F;TAGBANWA LETTER WA;Lo;0;L;;;;;N;;;;; +1770;TAGBANWA LETTER SA;Lo;0;L;;;;;N;;;;; +1772;TAGBANWA VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;; +1773;TAGBANWA VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;; +1780;KHMER LETTER KA;Lo;0;L;;;;;N;;;;; +1781;KHMER LETTER KHA;Lo;0;L;;;;;N;;;;; +1782;KHMER LETTER KO;Lo;0;L;;;;;N;;;;; +1783;KHMER LETTER KHO;Lo;0;L;;;;;N;;;;; +1784;KHMER LETTER NGO;Lo;0;L;;;;;N;;;;; +1785;KHMER LETTER CA;Lo;0;L;;;;;N;;;;; +1786;KHMER LETTER CHA;Lo;0;L;;;;;N;;;;; +1787;KHMER LETTER CO;Lo;0;L;;;;;N;;;;; +1788;KHMER LETTER CHO;Lo;0;L;;;;;N;;;;; +1789;KHMER LETTER NYO;Lo;0;L;;;;;N;;;;; +178A;KHMER LETTER DA;Lo;0;L;;;;;N;;;;; +178B;KHMER LETTER TTHA;Lo;0;L;;;;;N;;;;; +178C;KHMER LETTER DO;Lo;0;L;;;;;N;;;;; +178D;KHMER LETTER TTHO;Lo;0;L;;;;;N;;;;; +178E;KHMER LETTER NNO;Lo;0;L;;;;;N;;;;; +178F;KHMER LETTER TA;Lo;0;L;;;;;N;;;;; +1790;KHMER LETTER THA;Lo;0;L;;;;;N;;;;; +1791;KHMER LETTER TO;Lo;0;L;;;;;N;;;;; +1792;KHMER LETTER THO;Lo;0;L;;;;;N;;;;; +1793;KHMER LETTER NO;Lo;0;L;;;;;N;;;;; +1794;KHMER LETTER BA;Lo;0;L;;;;;N;;;;; +1795;KHMER LETTER PHA;Lo;0;L;;;;;N;;;;; +1796;KHMER LETTER PO;Lo;0;L;;;;;N;;;;; +1797;KHMER LETTER PHO;Lo;0;L;;;;;N;;;;; +1798;KHMER LETTER MO;Lo;0;L;;;;;N;;;;; +1799;KHMER LETTER YO;Lo;0;L;;;;;N;;;;; +179A;KHMER LETTER RO;Lo;0;L;;;;;N;;;;; +179B;KHMER LETTER LO;Lo;0;L;;;;;N;;;;; +179C;KHMER LETTER VO;Lo;0;L;;;;;N;;;;; +179D;KHMER LETTER SHA;Lo;0;L;;;;;N;;;;; +179E;KHMER LETTER SSO;Lo;0;L;;;;;N;;;;; +179F;KHMER LETTER SA;Lo;0;L;;;;;N;;;;; +17A0;KHMER LETTER HA;Lo;0;L;;;;;N;;;;; +17A1;KHMER LETTER LA;Lo;0;L;;;;;N;;;;; +17A2;KHMER LETTER QA;Lo;0;L;;;;;N;;;;; +17A3;KHMER INDEPENDENT VOWEL QAQ;Lo;0;L;;;;;N;;;;; +17A4;KHMER INDEPENDENT VOWEL QAA;Lo;0;L;;;;;N;;;;; +17A5;KHMER INDEPENDENT VOWEL QI;Lo;0;L;;;;;N;;;;; +17A6;KHMER INDEPENDENT VOWEL QII;Lo;0;L;;;;;N;;;;; +17A7;KHMER INDEPENDENT VOWEL QU;Lo;0;L;;;;;N;;;;; +17A8;KHMER INDEPENDENT VOWEL QUK;Lo;0;L;;;;;N;;;;; +17A9;KHMER INDEPENDENT VOWEL QUU;Lo;0;L;;;;;N;;;;; +17AA;KHMER INDEPENDENT VOWEL QUUV;Lo;0;L;;;;;N;;;;; +17AB;KHMER INDEPENDENT VOWEL RY;Lo;0;L;;;;;N;;;;; +17AC;KHMER INDEPENDENT VOWEL RYY;Lo;0;L;;;;;N;;;;; +17AD;KHMER INDEPENDENT VOWEL LY;Lo;0;L;;;;;N;;;;; +17AE;KHMER INDEPENDENT VOWEL LYY;Lo;0;L;;;;;N;;;;; +17AF;KHMER INDEPENDENT VOWEL QE;Lo;0;L;;;;;N;;;;; +17B0;KHMER INDEPENDENT VOWEL QAI;Lo;0;L;;;;;N;;;;; +17B1;KHMER INDEPENDENT VOWEL QOO TYPE ONE;Lo;0;L;;;;;N;;;;; +17B2;KHMER INDEPENDENT VOWEL QOO TYPE TWO;Lo;0;L;;;;;N;;;;; +17B3;KHMER INDEPENDENT VOWEL QAU;Lo;0;L;;;;;N;;;;; +17B4;KHMER VOWEL INHERENT AQ;Mn;0;NSM;;;;;N;;;;; +17B5;KHMER VOWEL INHERENT AA;Mn;0;NSM;;;;;N;;;;; +17B6;KHMER VOWEL SIGN AA;Mc;0;L;;;;;N;;;;; +17B7;KHMER VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;; +17B8;KHMER VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;; +17B9;KHMER VOWEL SIGN Y;Mn;0;NSM;;;;;N;;;;; +17BA;KHMER VOWEL SIGN YY;Mn;0;NSM;;;;;N;;;;; +17BB;KHMER VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;; +17BC;KHMER VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;; +17BD;KHMER VOWEL SIGN UA;Mn;0;NSM;;;;;N;;;;; +17BE;KHMER VOWEL SIGN OE;Mc;0;L;;;;;N;;;;; +17BF;KHMER VOWEL SIGN YA;Mc;0;L;;;;;N;;;;; +17C0;KHMER VOWEL SIGN IE;Mc;0;L;;;;;N;;;;; +17C1;KHMER VOWEL SIGN E;Mc;0;L;;;;;N;;;;; +17C2;KHMER VOWEL SIGN AE;Mc;0;L;;;;;N;;;;; +17C3;KHMER VOWEL SIGN AI;Mc;0;L;;;;;N;;;;; +17C4;KHMER VOWEL SIGN OO;Mc;0;L;;;;;N;;;;; +17C5;KHMER VOWEL SIGN AU;Mc;0;L;;;;;N;;;;; +17C6;KHMER SIGN NIKAHIT;Mn;0;NSM;;;;;N;;;;; +17C7;KHMER SIGN REAHMUK;Mc;0;L;;;;;N;;;;; +17C8;KHMER SIGN YUUKALEAPINTU;Mc;0;L;;;;;N;;;;; +17C9;KHMER SIGN MUUSIKATOAN;Mn;0;NSM;;;;;N;;;;; +17CA;KHMER SIGN TRIISAP;Mn;0;NSM;;;;;N;;;;; +17CB;KHMER SIGN BANTOC;Mn;0;NSM;;;;;N;;;;; +17CC;KHMER SIGN ROBAT;Mn;0;NSM;;;;;N;;;;; +17CD;KHMER SIGN TOANDAKHIAT;Mn;0;NSM;;;;;N;;;;; +17CE;KHMER SIGN KAKABAT;Mn;0;NSM;;;;;N;;;;; +17CF;KHMER SIGN AHSDA;Mn;0;NSM;;;;;N;;;;; +17D0;KHMER SIGN SAMYOK SANNYA;Mn;0;NSM;;;;;N;;;;; +17D1;KHMER SIGN VIRIAM;Mn;0;NSM;;;;;N;;;;; +17D2;KHMER SIGN COENG;Mn;9;NSM;;;;;N;;;;; +17D3;KHMER SIGN BATHAMASAT;Mn;0;NSM;;;;;N;;;;; +17D4;KHMER SIGN KHAN;Po;0;L;;;;;N;;;;; +17D5;KHMER SIGN BARIYOOSAN;Po;0;L;;;;;N;;;;; +17D6;KHMER SIGN CAMNUC PII KUUH;Po;0;L;;;;;N;;;;; +17D7;KHMER SIGN LEK TOO;Lm;0;L;;;;;N;;;;; +17D8;KHMER SIGN BEYYAL;Po;0;L;;;;;N;;;;; +17D9;KHMER SIGN PHNAEK MUAN;Po;0;L;;;;;N;;;;; +17DA;KHMER SIGN KOOMUUT;Po;0;L;;;;;N;;;;; +17DB;KHMER CURRENCY SYMBOL RIEL;Sc;0;ET;;;;;N;;;;; +17DC;KHMER SIGN AVAKRAHASANYA;Lo;0;L;;;;;N;;;;; +17DD;KHMER SIGN ATTHACAN;Mn;230;NSM;;;;;N;;;;; +17E0;KHMER DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +17E1;KHMER DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +17E2;KHMER DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +17E3;KHMER DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +17E4;KHMER DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +17E5;KHMER DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +17E6;KHMER DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +17E7;KHMER DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +17E8;KHMER DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +17E9;KHMER DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +17F0;KHMER SYMBOL LEK ATTAK SON;No;0;ON;;;;0;N;;;;; +17F1;KHMER SYMBOL LEK ATTAK MUOY;No;0;ON;;;;1;N;;;;; +17F2;KHMER SYMBOL LEK ATTAK PII;No;0;ON;;;;2;N;;;;; +17F3;KHMER SYMBOL LEK ATTAK BEI;No;0;ON;;;;3;N;;;;; +17F4;KHMER SYMBOL LEK ATTAK BUON;No;0;ON;;;;4;N;;;;; +17F5;KHMER SYMBOL LEK ATTAK PRAM;No;0;ON;;;;5;N;;;;; +17F6;KHMER SYMBOL LEK ATTAK PRAM-MUOY;No;0;ON;;;;6;N;;;;; +17F7;KHMER SYMBOL LEK ATTAK PRAM-PII;No;0;ON;;;;7;N;;;;; +17F8;KHMER SYMBOL LEK ATTAK PRAM-BEI;No;0;ON;;;;8;N;;;;; +17F9;KHMER SYMBOL LEK ATTAK PRAM-BUON;No;0;ON;;;;9;N;;;;; +1800;MONGOLIAN BIRGA;Po;0;ON;;;;;N;;;;; +1801;MONGOLIAN ELLIPSIS;Po;0;ON;;;;;N;;;;; +1802;MONGOLIAN COMMA;Po;0;ON;;;;;N;;;;; +1803;MONGOLIAN FULL STOP;Po;0;ON;;;;;N;;;;; +1804;MONGOLIAN COLON;Po;0;ON;;;;;N;;;;; +1805;MONGOLIAN FOUR DOTS;Po;0;ON;;;;;N;;;;; +1806;MONGOLIAN TODO SOFT HYPHEN;Pd;0;ON;;;;;N;;;;; +1807;MONGOLIAN SIBE SYLLABLE BOUNDARY MARKER;Po;0;ON;;;;;N;;;;; +1808;MONGOLIAN MANCHU COMMA;Po;0;ON;;;;;N;;;;; +1809;MONGOLIAN MANCHU FULL STOP;Po;0;ON;;;;;N;;;;; +180A;MONGOLIAN NIRUGU;Po;0;ON;;;;;N;;;;; +180B;MONGOLIAN FREE VARIATION SELECTOR ONE;Mn;0;NSM;;;;;N;;;;; +180C;MONGOLIAN FREE VARIATION SELECTOR TWO;Mn;0;NSM;;;;;N;;;;; +180D;MONGOLIAN FREE VARIATION SELECTOR THREE;Mn;0;NSM;;;;;N;;;;; +180E;MONGOLIAN VOWEL SEPARATOR;Cf;0;BN;;;;;N;;;;; +180F;MONGOLIAN FREE VARIATION SELECTOR FOUR;Mn;0;NSM;;;;;N;;;;; +1810;MONGOLIAN DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +1811;MONGOLIAN DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +1812;MONGOLIAN DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +1813;MONGOLIAN DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +1814;MONGOLIAN DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +1815;MONGOLIAN DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +1816;MONGOLIAN DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +1817;MONGOLIAN DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +1818;MONGOLIAN DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +1819;MONGOLIAN DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +1820;MONGOLIAN LETTER A;Lo;0;L;;;;;N;;;;; +1821;MONGOLIAN LETTER E;Lo;0;L;;;;;N;;;;; +1822;MONGOLIAN LETTER I;Lo;0;L;;;;;N;;;;; +1823;MONGOLIAN LETTER O;Lo;0;L;;;;;N;;;;; +1824;MONGOLIAN LETTER U;Lo;0;L;;;;;N;;;;; +1825;MONGOLIAN LETTER OE;Lo;0;L;;;;;N;;;;; +1826;MONGOLIAN LETTER UE;Lo;0;L;;;;;N;;;;; +1827;MONGOLIAN LETTER EE;Lo;0;L;;;;;N;;;;; +1828;MONGOLIAN LETTER NA;Lo;0;L;;;;;N;;;;; +1829;MONGOLIAN LETTER ANG;Lo;0;L;;;;;N;;;;; +182A;MONGOLIAN LETTER BA;Lo;0;L;;;;;N;;;;; +182B;MONGOLIAN LETTER PA;Lo;0;L;;;;;N;;;;; +182C;MONGOLIAN LETTER QA;Lo;0;L;;;;;N;;;;; +182D;MONGOLIAN LETTER GA;Lo;0;L;;;;;N;;;;; +182E;MONGOLIAN LETTER MA;Lo;0;L;;;;;N;;;;; +182F;MONGOLIAN LETTER LA;Lo;0;L;;;;;N;;;;; +1830;MONGOLIAN LETTER SA;Lo;0;L;;;;;N;;;;; +1831;MONGOLIAN LETTER SHA;Lo;0;L;;;;;N;;;;; +1832;MONGOLIAN LETTER TA;Lo;0;L;;;;;N;;;;; +1833;MONGOLIAN LETTER DA;Lo;0;L;;;;;N;;;;; +1834;MONGOLIAN LETTER CHA;Lo;0;L;;;;;N;;;;; +1835;MONGOLIAN LETTER JA;Lo;0;L;;;;;N;;;;; +1836;MONGOLIAN LETTER YA;Lo;0;L;;;;;N;;;;; +1837;MONGOLIAN LETTER RA;Lo;0;L;;;;;N;;;;; +1838;MONGOLIAN LETTER WA;Lo;0;L;;;;;N;;;;; +1839;MONGOLIAN LETTER FA;Lo;0;L;;;;;N;;;;; +183A;MONGOLIAN LETTER KA;Lo;0;L;;;;;N;;;;; +183B;MONGOLIAN LETTER KHA;Lo;0;L;;;;;N;;;;; +183C;MONGOLIAN LETTER TSA;Lo;0;L;;;;;N;;;;; +183D;MONGOLIAN LETTER ZA;Lo;0;L;;;;;N;;;;; +183E;MONGOLIAN LETTER HAA;Lo;0;L;;;;;N;;;;; +183F;MONGOLIAN LETTER ZRA;Lo;0;L;;;;;N;;;;; +1840;MONGOLIAN LETTER LHA;Lo;0;L;;;;;N;;;;; +1841;MONGOLIAN LETTER ZHI;Lo;0;L;;;;;N;;;;; +1842;MONGOLIAN LETTER CHI;Lo;0;L;;;;;N;;;;; +1843;MONGOLIAN LETTER TODO LONG VOWEL SIGN;Lm;0;L;;;;;N;;;;; +1844;MONGOLIAN LETTER TODO E;Lo;0;L;;;;;N;;;;; +1845;MONGOLIAN LETTER TODO I;Lo;0;L;;;;;N;;;;; +1846;MONGOLIAN LETTER TODO O;Lo;0;L;;;;;N;;;;; +1847;MONGOLIAN LETTER TODO U;Lo;0;L;;;;;N;;;;; +1848;MONGOLIAN LETTER TODO OE;Lo;0;L;;;;;N;;;;; +1849;MONGOLIAN LETTER TODO UE;Lo;0;L;;;;;N;;;;; +184A;MONGOLIAN LETTER TODO ANG;Lo;0;L;;;;;N;;;;; +184B;MONGOLIAN LETTER TODO BA;Lo;0;L;;;;;N;;;;; +184C;MONGOLIAN LETTER TODO PA;Lo;0;L;;;;;N;;;;; +184D;MONGOLIAN LETTER TODO QA;Lo;0;L;;;;;N;;;;; +184E;MONGOLIAN LETTER TODO GA;Lo;0;L;;;;;N;;;;; +184F;MONGOLIAN LETTER TODO MA;Lo;0;L;;;;;N;;;;; +1850;MONGOLIAN LETTER TODO TA;Lo;0;L;;;;;N;;;;; +1851;MONGOLIAN LETTER TODO DA;Lo;0;L;;;;;N;;;;; +1852;MONGOLIAN LETTER TODO CHA;Lo;0;L;;;;;N;;;;; +1853;MONGOLIAN LETTER TODO JA;Lo;0;L;;;;;N;;;;; +1854;MONGOLIAN LETTER TODO TSA;Lo;0;L;;;;;N;;;;; +1855;MONGOLIAN LETTER TODO YA;Lo;0;L;;;;;N;;;;; +1856;MONGOLIAN LETTER TODO WA;Lo;0;L;;;;;N;;;;; +1857;MONGOLIAN LETTER TODO KA;Lo;0;L;;;;;N;;;;; +1858;MONGOLIAN LETTER TODO GAA;Lo;0;L;;;;;N;;;;; +1859;MONGOLIAN LETTER TODO HAA;Lo;0;L;;;;;N;;;;; +185A;MONGOLIAN LETTER TODO JIA;Lo;0;L;;;;;N;;;;; +185B;MONGOLIAN LETTER TODO NIA;Lo;0;L;;;;;N;;;;; +185C;MONGOLIAN LETTER TODO DZA;Lo;0;L;;;;;N;;;;; +185D;MONGOLIAN LETTER SIBE E;Lo;0;L;;;;;N;;;;; +185E;MONGOLIAN LETTER SIBE I;Lo;0;L;;;;;N;;;;; +185F;MONGOLIAN LETTER SIBE IY;Lo;0;L;;;;;N;;;;; +1860;MONGOLIAN LETTER SIBE UE;Lo;0;L;;;;;N;;;;; +1861;MONGOLIAN LETTER SIBE U;Lo;0;L;;;;;N;;;;; +1862;MONGOLIAN LETTER SIBE ANG;Lo;0;L;;;;;N;;;;; +1863;MONGOLIAN LETTER SIBE KA;Lo;0;L;;;;;N;;;;; +1864;MONGOLIAN LETTER SIBE GA;Lo;0;L;;;;;N;;;;; +1865;MONGOLIAN LETTER SIBE HA;Lo;0;L;;;;;N;;;;; +1866;MONGOLIAN LETTER SIBE PA;Lo;0;L;;;;;N;;;;; +1867;MONGOLIAN LETTER SIBE SHA;Lo;0;L;;;;;N;;;;; +1868;MONGOLIAN LETTER SIBE TA;Lo;0;L;;;;;N;;;;; +1869;MONGOLIAN LETTER SIBE DA;Lo;0;L;;;;;N;;;;; +186A;MONGOLIAN LETTER SIBE JA;Lo;0;L;;;;;N;;;;; +186B;MONGOLIAN LETTER SIBE FA;Lo;0;L;;;;;N;;;;; +186C;MONGOLIAN LETTER SIBE GAA;Lo;0;L;;;;;N;;;;; +186D;MONGOLIAN LETTER SIBE HAA;Lo;0;L;;;;;N;;;;; +186E;MONGOLIAN LETTER SIBE TSA;Lo;0;L;;;;;N;;;;; +186F;MONGOLIAN LETTER SIBE ZA;Lo;0;L;;;;;N;;;;; +1870;MONGOLIAN LETTER SIBE RAA;Lo;0;L;;;;;N;;;;; +1871;MONGOLIAN LETTER SIBE CHA;Lo;0;L;;;;;N;;;;; +1872;MONGOLIAN LETTER SIBE ZHA;Lo;0;L;;;;;N;;;;; +1873;MONGOLIAN LETTER MANCHU I;Lo;0;L;;;;;N;;;;; +1874;MONGOLIAN LETTER MANCHU KA;Lo;0;L;;;;;N;;;;; +1875;MONGOLIAN LETTER MANCHU RA;Lo;0;L;;;;;N;;;;; +1876;MONGOLIAN LETTER MANCHU FA;Lo;0;L;;;;;N;;;;; +1877;MONGOLIAN LETTER MANCHU ZHA;Lo;0;L;;;;;N;;;;; +1878;MONGOLIAN LETTER CHA WITH TWO DOTS;Lo;0;L;;;;;N;;;;; +1880;MONGOLIAN LETTER ALI GALI ANUSVARA ONE;Lo;0;L;;;;;N;;;;; +1881;MONGOLIAN LETTER ALI GALI VISARGA ONE;Lo;0;L;;;;;N;;;;; +1882;MONGOLIAN LETTER ALI GALI DAMARU;Lo;0;L;;;;;N;;;;; +1883;MONGOLIAN LETTER ALI GALI UBADAMA;Lo;0;L;;;;;N;;;;; +1884;MONGOLIAN LETTER ALI GALI INVERTED UBADAMA;Lo;0;L;;;;;N;;;;; +1885;MONGOLIAN LETTER ALI GALI BALUDA;Mn;0;NSM;;;;;N;;;;; +1886;MONGOLIAN LETTER ALI GALI THREE BALUDA;Mn;0;NSM;;;;;N;;;;; +1887;MONGOLIAN LETTER ALI GALI A;Lo;0;L;;;;;N;;;;; +1888;MONGOLIAN LETTER ALI GALI I;Lo;0;L;;;;;N;;;;; +1889;MONGOLIAN LETTER ALI GALI KA;Lo;0;L;;;;;N;;;;; +188A;MONGOLIAN LETTER ALI GALI NGA;Lo;0;L;;;;;N;;;;; +188B;MONGOLIAN LETTER ALI GALI CA;Lo;0;L;;;;;N;;;;; +188C;MONGOLIAN LETTER ALI GALI TTA;Lo;0;L;;;;;N;;;;; +188D;MONGOLIAN LETTER ALI GALI TTHA;Lo;0;L;;;;;N;;;;; +188E;MONGOLIAN LETTER ALI GALI DDA;Lo;0;L;;;;;N;;;;; +188F;MONGOLIAN LETTER ALI GALI NNA;Lo;0;L;;;;;N;;;;; +1890;MONGOLIAN LETTER ALI GALI TA;Lo;0;L;;;;;N;;;;; +1891;MONGOLIAN LETTER ALI GALI DA;Lo;0;L;;;;;N;;;;; +1892;MONGOLIAN LETTER ALI GALI PA;Lo;0;L;;;;;N;;;;; +1893;MONGOLIAN LETTER ALI GALI PHA;Lo;0;L;;;;;N;;;;; +1894;MONGOLIAN LETTER ALI GALI SSA;Lo;0;L;;;;;N;;;;; +1895;MONGOLIAN LETTER ALI GALI ZHA;Lo;0;L;;;;;N;;;;; +1896;MONGOLIAN LETTER ALI GALI ZA;Lo;0;L;;;;;N;;;;; +1897;MONGOLIAN LETTER ALI GALI AH;Lo;0;L;;;;;N;;;;; +1898;MONGOLIAN LETTER TODO ALI GALI TA;Lo;0;L;;;;;N;;;;; +1899;MONGOLIAN LETTER TODO ALI GALI ZHA;Lo;0;L;;;;;N;;;;; +189A;MONGOLIAN LETTER MANCHU ALI GALI GHA;Lo;0;L;;;;;N;;;;; +189B;MONGOLIAN LETTER MANCHU ALI GALI NGA;Lo;0;L;;;;;N;;;;; +189C;MONGOLIAN LETTER MANCHU ALI GALI CA;Lo;0;L;;;;;N;;;;; +189D;MONGOLIAN LETTER MANCHU ALI GALI JHA;Lo;0;L;;;;;N;;;;; +189E;MONGOLIAN LETTER MANCHU ALI GALI TTA;Lo;0;L;;;;;N;;;;; +189F;MONGOLIAN LETTER MANCHU ALI GALI DDHA;Lo;0;L;;;;;N;;;;; +18A0;MONGOLIAN LETTER MANCHU ALI GALI TA;Lo;0;L;;;;;N;;;;; +18A1;MONGOLIAN LETTER MANCHU ALI GALI DHA;Lo;0;L;;;;;N;;;;; +18A2;MONGOLIAN LETTER MANCHU ALI GALI SSA;Lo;0;L;;;;;N;;;;; +18A3;MONGOLIAN LETTER MANCHU ALI GALI CYA;Lo;0;L;;;;;N;;;;; +18A4;MONGOLIAN LETTER MANCHU ALI GALI ZHA;Lo;0;L;;;;;N;;;;; +18A5;MONGOLIAN LETTER MANCHU ALI GALI ZA;Lo;0;L;;;;;N;;;;; +18A6;MONGOLIAN LETTER ALI GALI HALF U;Lo;0;L;;;;;N;;;;; +18A7;MONGOLIAN LETTER ALI GALI HALF YA;Lo;0;L;;;;;N;;;;; +18A8;MONGOLIAN LETTER MANCHU ALI GALI BHA;Lo;0;L;;;;;N;;;;; +18A9;MONGOLIAN LETTER ALI GALI DAGALGA;Mn;228;NSM;;;;;N;;;;; +18AA;MONGOLIAN LETTER MANCHU ALI GALI LHA;Lo;0;L;;;;;N;;;;; +18B0;CANADIAN SYLLABICS OY;Lo;0;L;;;;;N;;;;; +18B1;CANADIAN SYLLABICS AY;Lo;0;L;;;;;N;;;;; +18B2;CANADIAN SYLLABICS AAY;Lo;0;L;;;;;N;;;;; +18B3;CANADIAN SYLLABICS WAY;Lo;0;L;;;;;N;;;;; +18B4;CANADIAN SYLLABICS POY;Lo;0;L;;;;;N;;;;; +18B5;CANADIAN SYLLABICS PAY;Lo;0;L;;;;;N;;;;; +18B6;CANADIAN SYLLABICS PWOY;Lo;0;L;;;;;N;;;;; +18B7;CANADIAN SYLLABICS TAY;Lo;0;L;;;;;N;;;;; +18B8;CANADIAN SYLLABICS KAY;Lo;0;L;;;;;N;;;;; +18B9;CANADIAN SYLLABICS KWAY;Lo;0;L;;;;;N;;;;; +18BA;CANADIAN SYLLABICS MAY;Lo;0;L;;;;;N;;;;; +18BB;CANADIAN SYLLABICS NOY;Lo;0;L;;;;;N;;;;; +18BC;CANADIAN SYLLABICS NAY;Lo;0;L;;;;;N;;;;; +18BD;CANADIAN SYLLABICS LAY;Lo;0;L;;;;;N;;;;; +18BE;CANADIAN SYLLABICS SOY;Lo;0;L;;;;;N;;;;; +18BF;CANADIAN SYLLABICS SAY;Lo;0;L;;;;;N;;;;; +18C0;CANADIAN SYLLABICS SHOY;Lo;0;L;;;;;N;;;;; +18C1;CANADIAN SYLLABICS SHAY;Lo;0;L;;;;;N;;;;; +18C2;CANADIAN SYLLABICS SHWOY;Lo;0;L;;;;;N;;;;; +18C3;CANADIAN SYLLABICS YOY;Lo;0;L;;;;;N;;;;; +18C4;CANADIAN SYLLABICS YAY;Lo;0;L;;;;;N;;;;; +18C5;CANADIAN SYLLABICS RAY;Lo;0;L;;;;;N;;;;; +18C6;CANADIAN SYLLABICS NWI;Lo;0;L;;;;;N;;;;; +18C7;CANADIAN SYLLABICS OJIBWAY NWI;Lo;0;L;;;;;N;;;;; +18C8;CANADIAN SYLLABICS NWII;Lo;0;L;;;;;N;;;;; +18C9;CANADIAN SYLLABICS OJIBWAY NWII;Lo;0;L;;;;;N;;;;; +18CA;CANADIAN SYLLABICS NWO;Lo;0;L;;;;;N;;;;; +18CB;CANADIAN SYLLABICS OJIBWAY NWO;Lo;0;L;;;;;N;;;;; +18CC;CANADIAN SYLLABICS NWOO;Lo;0;L;;;;;N;;;;; +18CD;CANADIAN SYLLABICS OJIBWAY NWOO;Lo;0;L;;;;;N;;;;; +18CE;CANADIAN SYLLABICS RWEE;Lo;0;L;;;;;N;;;;; +18CF;CANADIAN SYLLABICS RWI;Lo;0;L;;;;;N;;;;; +18D0;CANADIAN SYLLABICS RWII;Lo;0;L;;;;;N;;;;; +18D1;CANADIAN SYLLABICS RWO;Lo;0;L;;;;;N;;;;; +18D2;CANADIAN SYLLABICS RWOO;Lo;0;L;;;;;N;;;;; +18D3;CANADIAN SYLLABICS RWA;Lo;0;L;;;;;N;;;;; +18D4;CANADIAN SYLLABICS OJIBWAY P;Lo;0;L;;;;;N;;;;; +18D5;CANADIAN SYLLABICS OJIBWAY T;Lo;0;L;;;;;N;;;;; +18D6;CANADIAN SYLLABICS OJIBWAY K;Lo;0;L;;;;;N;;;;; +18D7;CANADIAN SYLLABICS OJIBWAY C;Lo;0;L;;;;;N;;;;; +18D8;CANADIAN SYLLABICS OJIBWAY M;Lo;0;L;;;;;N;;;;; +18D9;CANADIAN SYLLABICS OJIBWAY N;Lo;0;L;;;;;N;;;;; +18DA;CANADIAN SYLLABICS OJIBWAY S;Lo;0;L;;;;;N;;;;; +18DB;CANADIAN SYLLABICS OJIBWAY SH;Lo;0;L;;;;;N;;;;; +18DC;CANADIAN SYLLABICS EASTERN W;Lo;0;L;;;;;N;;;;; +18DD;CANADIAN SYLLABICS WESTERN W;Lo;0;L;;;;;N;;;;; +18DE;CANADIAN SYLLABICS FINAL SMALL RING;Lo;0;L;;;;;N;;;;; +18DF;CANADIAN SYLLABICS FINAL RAISED DOT;Lo;0;L;;;;;N;;;;; +18E0;CANADIAN SYLLABICS R-CREE RWE;Lo;0;L;;;;;N;;;;; +18E1;CANADIAN SYLLABICS WEST-CREE LOO;Lo;0;L;;;;;N;;;;; +18E2;CANADIAN SYLLABICS WEST-CREE LAA;Lo;0;L;;;;;N;;;;; +18E3;CANADIAN SYLLABICS THWE;Lo;0;L;;;;;N;;;;; +18E4;CANADIAN SYLLABICS THWA;Lo;0;L;;;;;N;;;;; +18E5;CANADIAN SYLLABICS TTHWE;Lo;0;L;;;;;N;;;;; +18E6;CANADIAN SYLLABICS TTHOO;Lo;0;L;;;;;N;;;;; +18E7;CANADIAN SYLLABICS TTHAA;Lo;0;L;;;;;N;;;;; +18E8;CANADIAN SYLLABICS TLHWE;Lo;0;L;;;;;N;;;;; +18E9;CANADIAN SYLLABICS TLHOO;Lo;0;L;;;;;N;;;;; +18EA;CANADIAN SYLLABICS SAYISI SHWE;Lo;0;L;;;;;N;;;;; +18EB;CANADIAN SYLLABICS SAYISI SHOO;Lo;0;L;;;;;N;;;;; +18EC;CANADIAN SYLLABICS SAYISI HOO;Lo;0;L;;;;;N;;;;; +18ED;CANADIAN SYLLABICS CARRIER GWU;Lo;0;L;;;;;N;;;;; +18EE;CANADIAN SYLLABICS CARRIER DENE GEE;Lo;0;L;;;;;N;;;;; +18EF;CANADIAN SYLLABICS CARRIER GAA;Lo;0;L;;;;;N;;;;; +18F0;CANADIAN SYLLABICS CARRIER GWA;Lo;0;L;;;;;N;;;;; +18F1;CANADIAN SYLLABICS SAYISI JUU;Lo;0;L;;;;;N;;;;; +18F2;CANADIAN SYLLABICS CARRIER JWA;Lo;0;L;;;;;N;;;;; +18F3;CANADIAN SYLLABICS BEAVER DENE L;Lo;0;L;;;;;N;;;;; +18F4;CANADIAN SYLLABICS BEAVER DENE R;Lo;0;L;;;;;N;;;;; +18F5;CANADIAN SYLLABICS CARRIER DENTAL S;Lo;0;L;;;;;N;;;;; +1900;LIMBU VOWEL-CARRIER LETTER;Lo;0;L;;;;;N;;;;; +1901;LIMBU LETTER KA;Lo;0;L;;;;;N;;;;; +1902;LIMBU LETTER KHA;Lo;0;L;;;;;N;;;;; +1903;LIMBU LETTER GA;Lo;0;L;;;;;N;;;;; +1904;LIMBU LETTER GHA;Lo;0;L;;;;;N;;;;; +1905;LIMBU LETTER NGA;Lo;0;L;;;;;N;;;;; +1906;LIMBU LETTER CA;Lo;0;L;;;;;N;;;;; +1907;LIMBU LETTER CHA;Lo;0;L;;;;;N;;;;; +1908;LIMBU LETTER JA;Lo;0;L;;;;;N;;;;; +1909;LIMBU LETTER JHA;Lo;0;L;;;;;N;;;;; +190A;LIMBU LETTER YAN;Lo;0;L;;;;;N;;;;; +190B;LIMBU LETTER TA;Lo;0;L;;;;;N;;;;; +190C;LIMBU LETTER THA;Lo;0;L;;;;;N;;;;; +190D;LIMBU LETTER DA;Lo;0;L;;;;;N;;;;; +190E;LIMBU LETTER DHA;Lo;0;L;;;;;N;;;;; +190F;LIMBU LETTER NA;Lo;0;L;;;;;N;;;;; +1910;LIMBU LETTER PA;Lo;0;L;;;;;N;;;;; +1911;LIMBU LETTER PHA;Lo;0;L;;;;;N;;;;; +1912;LIMBU LETTER BA;Lo;0;L;;;;;N;;;;; +1913;LIMBU LETTER BHA;Lo;0;L;;;;;N;;;;; +1914;LIMBU LETTER MA;Lo;0;L;;;;;N;;;;; +1915;LIMBU LETTER YA;Lo;0;L;;;;;N;;;;; +1916;LIMBU LETTER RA;Lo;0;L;;;;;N;;;;; +1917;LIMBU LETTER LA;Lo;0;L;;;;;N;;;;; +1918;LIMBU LETTER WA;Lo;0;L;;;;;N;;;;; +1919;LIMBU LETTER SHA;Lo;0;L;;;;;N;;;;; +191A;LIMBU LETTER SSA;Lo;0;L;;;;;N;;;;; +191B;LIMBU LETTER SA;Lo;0;L;;;;;N;;;;; +191C;LIMBU LETTER HA;Lo;0;L;;;;;N;;;;; +191D;LIMBU LETTER GYAN;Lo;0;L;;;;;N;;;;; +191E;LIMBU LETTER TRA;Lo;0;L;;;;;N;;;;; +1920;LIMBU VOWEL SIGN A;Mn;0;NSM;;;;;N;;;;; +1921;LIMBU VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;; +1922;LIMBU VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;; +1923;LIMBU VOWEL SIGN EE;Mc;0;L;;;;;N;;;;; +1924;LIMBU VOWEL SIGN AI;Mc;0;L;;;;;N;;;;; +1925;LIMBU VOWEL SIGN OO;Mc;0;L;;;;;N;;;;; +1926;LIMBU VOWEL SIGN AU;Mc;0;L;;;;;N;;;;; +1927;LIMBU VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;; +1928;LIMBU VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;; +1929;LIMBU SUBJOINED LETTER YA;Mc;0;L;;;;;N;;;;; +192A;LIMBU SUBJOINED LETTER RA;Mc;0;L;;;;;N;;;;; +192B;LIMBU SUBJOINED LETTER WA;Mc;0;L;;;;;N;;;;; +1930;LIMBU SMALL LETTER KA;Mc;0;L;;;;;N;;;;; +1931;LIMBU SMALL LETTER NGA;Mc;0;L;;;;;N;;;;; +1932;LIMBU SMALL LETTER ANUSVARA;Mn;0;NSM;;;;;N;;;;; +1933;LIMBU SMALL LETTER TA;Mc;0;L;;;;;N;;;;; +1934;LIMBU SMALL LETTER NA;Mc;0;L;;;;;N;;;;; +1935;LIMBU SMALL LETTER PA;Mc;0;L;;;;;N;;;;; +1936;LIMBU SMALL LETTER MA;Mc;0;L;;;;;N;;;;; +1937;LIMBU SMALL LETTER RA;Mc;0;L;;;;;N;;;;; +1938;LIMBU SMALL LETTER LA;Mc;0;L;;;;;N;;;;; +1939;LIMBU SIGN MUKPHRENG;Mn;222;NSM;;;;;N;;;;; +193A;LIMBU SIGN KEMPHRENG;Mn;230;NSM;;;;;N;;;;; +193B;LIMBU SIGN SA-I;Mn;220;NSM;;;;;N;;;;; +1940;LIMBU SIGN LOO;So;0;ON;;;;;N;;;;; +1944;LIMBU EXCLAMATION MARK;Po;0;ON;;;;;N;;;;; +1945;LIMBU QUESTION MARK;Po;0;ON;;;;;N;;;;; +1946;LIMBU DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +1947;LIMBU DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +1948;LIMBU DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +1949;LIMBU DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +194A;LIMBU DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +194B;LIMBU DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +194C;LIMBU DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +194D;LIMBU DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +194E;LIMBU DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +194F;LIMBU DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +1950;TAI LE LETTER KA;Lo;0;L;;;;;N;;;;; +1951;TAI LE LETTER XA;Lo;0;L;;;;;N;;;;; +1952;TAI LE LETTER NGA;Lo;0;L;;;;;N;;;;; +1953;TAI LE LETTER TSA;Lo;0;L;;;;;N;;;;; +1954;TAI LE LETTER SA;Lo;0;L;;;;;N;;;;; +1955;TAI LE LETTER YA;Lo;0;L;;;;;N;;;;; +1956;TAI LE LETTER TA;Lo;0;L;;;;;N;;;;; +1957;TAI LE LETTER THA;Lo;0;L;;;;;N;;;;; +1958;TAI LE LETTER LA;Lo;0;L;;;;;N;;;;; +1959;TAI LE LETTER PA;Lo;0;L;;;;;N;;;;; +195A;TAI LE LETTER PHA;Lo;0;L;;;;;N;;;;; +195B;TAI LE LETTER MA;Lo;0;L;;;;;N;;;;; +195C;TAI LE LETTER FA;Lo;0;L;;;;;N;;;;; +195D;TAI LE LETTER VA;Lo;0;L;;;;;N;;;;; +195E;TAI LE LETTER HA;Lo;0;L;;;;;N;;;;; +195F;TAI LE LETTER QA;Lo;0;L;;;;;N;;;;; +1960;TAI LE LETTER KHA;Lo;0;L;;;;;N;;;;; +1961;TAI LE LETTER TSHA;Lo;0;L;;;;;N;;;;; +1962;TAI LE LETTER NA;Lo;0;L;;;;;N;;;;; +1963;TAI LE LETTER A;Lo;0;L;;;;;N;;;;; +1964;TAI LE LETTER I;Lo;0;L;;;;;N;;;;; +1965;TAI LE LETTER EE;Lo;0;L;;;;;N;;;;; +1966;TAI LE LETTER EH;Lo;0;L;;;;;N;;;;; +1967;TAI LE LETTER U;Lo;0;L;;;;;N;;;;; +1968;TAI LE LETTER OO;Lo;0;L;;;;;N;;;;; +1969;TAI LE LETTER O;Lo;0;L;;;;;N;;;;; +196A;TAI LE LETTER UE;Lo;0;L;;;;;N;;;;; +196B;TAI LE LETTER E;Lo;0;L;;;;;N;;;;; +196C;TAI LE LETTER AUE;Lo;0;L;;;;;N;;;;; +196D;TAI LE LETTER AI;Lo;0;L;;;;;N;;;;; +1970;TAI LE LETTER TONE-2;Lo;0;L;;;;;N;;;;; +1971;TAI LE LETTER TONE-3;Lo;0;L;;;;;N;;;;; +1972;TAI LE LETTER TONE-4;Lo;0;L;;;;;N;;;;; +1973;TAI LE LETTER TONE-5;Lo;0;L;;;;;N;;;;; +1974;TAI LE LETTER TONE-6;Lo;0;L;;;;;N;;;;; +1980;NEW TAI LUE LETTER HIGH QA;Lo;0;L;;;;;N;;;;; +1981;NEW TAI LUE LETTER LOW QA;Lo;0;L;;;;;N;;;;; +1982;NEW TAI LUE LETTER HIGH KA;Lo;0;L;;;;;N;;;;; +1983;NEW TAI LUE LETTER HIGH XA;Lo;0;L;;;;;N;;;;; +1984;NEW TAI LUE LETTER HIGH NGA;Lo;0;L;;;;;N;;;;; +1985;NEW TAI LUE LETTER LOW KA;Lo;0;L;;;;;N;;;;; +1986;NEW TAI LUE LETTER LOW XA;Lo;0;L;;;;;N;;;;; +1987;NEW TAI LUE LETTER LOW NGA;Lo;0;L;;;;;N;;;;; +1988;NEW TAI LUE LETTER HIGH TSA;Lo;0;L;;;;;N;;;;; +1989;NEW TAI LUE LETTER HIGH SA;Lo;0;L;;;;;N;;;;; +198A;NEW TAI LUE LETTER HIGH YA;Lo;0;L;;;;;N;;;;; +198B;NEW TAI LUE LETTER LOW TSA;Lo;0;L;;;;;N;;;;; +198C;NEW TAI LUE LETTER LOW SA;Lo;0;L;;;;;N;;;;; +198D;NEW TAI LUE LETTER LOW YA;Lo;0;L;;;;;N;;;;; +198E;NEW TAI LUE LETTER HIGH TA;Lo;0;L;;;;;N;;;;; +198F;NEW TAI LUE LETTER HIGH THA;Lo;0;L;;;;;N;;;;; +1990;NEW TAI LUE LETTER HIGH NA;Lo;0;L;;;;;N;;;;; +1991;NEW TAI LUE LETTER LOW TA;Lo;0;L;;;;;N;;;;; +1992;NEW TAI LUE LETTER LOW THA;Lo;0;L;;;;;N;;;;; +1993;NEW TAI LUE LETTER LOW NA;Lo;0;L;;;;;N;;;;; +1994;NEW TAI LUE LETTER HIGH PA;Lo;0;L;;;;;N;;;;; +1995;NEW TAI LUE LETTER HIGH PHA;Lo;0;L;;;;;N;;;;; +1996;NEW TAI LUE LETTER HIGH MA;Lo;0;L;;;;;N;;;;; +1997;NEW TAI LUE LETTER LOW PA;Lo;0;L;;;;;N;;;;; +1998;NEW TAI LUE LETTER LOW PHA;Lo;0;L;;;;;N;;;;; +1999;NEW TAI LUE LETTER LOW MA;Lo;0;L;;;;;N;;;;; +199A;NEW TAI LUE LETTER HIGH FA;Lo;0;L;;;;;N;;;;; +199B;NEW TAI LUE LETTER HIGH VA;Lo;0;L;;;;;N;;;;; +199C;NEW TAI LUE LETTER HIGH LA;Lo;0;L;;;;;N;;;;; +199D;NEW TAI LUE LETTER LOW FA;Lo;0;L;;;;;N;;;;; +199E;NEW TAI LUE LETTER LOW VA;Lo;0;L;;;;;N;;;;; +199F;NEW TAI LUE LETTER LOW LA;Lo;0;L;;;;;N;;;;; +19A0;NEW TAI LUE LETTER HIGH HA;Lo;0;L;;;;;N;;;;; +19A1;NEW TAI LUE LETTER HIGH DA;Lo;0;L;;;;;N;;;;; +19A2;NEW TAI LUE LETTER HIGH BA;Lo;0;L;;;;;N;;;;; +19A3;NEW TAI LUE LETTER LOW HA;Lo;0;L;;;;;N;;;;; +19A4;NEW TAI LUE LETTER LOW DA;Lo;0;L;;;;;N;;;;; +19A5;NEW TAI LUE LETTER LOW BA;Lo;0;L;;;;;N;;;;; +19A6;NEW TAI LUE LETTER HIGH KVA;Lo;0;L;;;;;N;;;;; +19A7;NEW TAI LUE LETTER HIGH XVA;Lo;0;L;;;;;N;;;;; +19A8;NEW TAI LUE LETTER LOW KVA;Lo;0;L;;;;;N;;;;; +19A9;NEW TAI LUE LETTER LOW XVA;Lo;0;L;;;;;N;;;;; +19AA;NEW TAI LUE LETTER HIGH SUA;Lo;0;L;;;;;N;;;;; +19AB;NEW TAI LUE LETTER LOW SUA;Lo;0;L;;;;;N;;;;; +19B0;NEW TAI LUE VOWEL SIGN VOWEL SHORTENER;Lo;0;L;;;;;N;;;;; +19B1;NEW TAI LUE VOWEL SIGN AA;Lo;0;L;;;;;N;;;;; +19B2;NEW TAI LUE VOWEL SIGN II;Lo;0;L;;;;;N;;;;; +19B3;NEW TAI LUE VOWEL SIGN U;Lo;0;L;;;;;N;;;;; +19B4;NEW TAI LUE VOWEL SIGN UU;Lo;0;L;;;;;N;;;;; +19B5;NEW TAI LUE VOWEL SIGN E;Lo;0;L;;;;;N;;;;; +19B6;NEW TAI LUE VOWEL SIGN AE;Lo;0;L;;;;;N;;;;; +19B7;NEW TAI LUE VOWEL SIGN O;Lo;0;L;;;;;N;;;;; +19B8;NEW TAI LUE VOWEL SIGN OA;Lo;0;L;;;;;N;;;;; +19B9;NEW TAI LUE VOWEL SIGN UE;Lo;0;L;;;;;N;;;;; +19BA;NEW TAI LUE VOWEL SIGN AY;Lo;0;L;;;;;N;;;;; +19BB;NEW TAI LUE VOWEL SIGN AAY;Lo;0;L;;;;;N;;;;; +19BC;NEW TAI LUE VOWEL SIGN UY;Lo;0;L;;;;;N;;;;; +19BD;NEW TAI LUE VOWEL SIGN OY;Lo;0;L;;;;;N;;;;; +19BE;NEW TAI LUE VOWEL SIGN OAY;Lo;0;L;;;;;N;;;;; +19BF;NEW TAI LUE VOWEL SIGN UEY;Lo;0;L;;;;;N;;;;; +19C0;NEW TAI LUE VOWEL SIGN IY;Lo;0;L;;;;;N;;;;; +19C1;NEW TAI LUE LETTER FINAL V;Lo;0;L;;;;;N;;;;; +19C2;NEW TAI LUE LETTER FINAL NG;Lo;0;L;;;;;N;;;;; +19C3;NEW TAI LUE LETTER FINAL N;Lo;0;L;;;;;N;;;;; +19C4;NEW TAI LUE LETTER FINAL M;Lo;0;L;;;;;N;;;;; +19C5;NEW TAI LUE LETTER FINAL K;Lo;0;L;;;;;N;;;;; +19C6;NEW TAI LUE LETTER FINAL D;Lo;0;L;;;;;N;;;;; +19C7;NEW TAI LUE LETTER FINAL B;Lo;0;L;;;;;N;;;;; +19C8;NEW TAI LUE TONE MARK-1;Lo;0;L;;;;;N;;;;; +19C9;NEW TAI LUE TONE MARK-2;Lo;0;L;;;;;N;;;;; +19D0;NEW TAI LUE DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +19D1;NEW TAI LUE DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +19D2;NEW TAI LUE DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +19D3;NEW TAI LUE DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +19D4;NEW TAI LUE DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +19D5;NEW TAI LUE DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +19D6;NEW TAI LUE DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +19D7;NEW TAI LUE DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +19D8;NEW TAI LUE DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +19D9;NEW TAI LUE DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +19DA;NEW TAI LUE THAM DIGIT ONE;No;0;L;;;1;1;N;;;;; +19DE;NEW TAI LUE SIGN LAE;So;0;ON;;;;;N;;;;; +19DF;NEW TAI LUE SIGN LAEV;So;0;ON;;;;;N;;;;; +19E0;KHMER SYMBOL PATHAMASAT;So;0;ON;;;;;N;;;;; +19E1;KHMER SYMBOL MUOY KOET;So;0;ON;;;;;N;;;;; +19E2;KHMER SYMBOL PII KOET;So;0;ON;;;;;N;;;;; +19E3;KHMER SYMBOL BEI KOET;So;0;ON;;;;;N;;;;; +19E4;KHMER SYMBOL BUON KOET;So;0;ON;;;;;N;;;;; +19E5;KHMER SYMBOL PRAM KOET;So;0;ON;;;;;N;;;;; +19E6;KHMER SYMBOL PRAM-MUOY KOET;So;0;ON;;;;;N;;;;; +19E7;KHMER SYMBOL PRAM-PII KOET;So;0;ON;;;;;N;;;;; +19E8;KHMER SYMBOL PRAM-BEI KOET;So;0;ON;;;;;N;;;;; +19E9;KHMER SYMBOL PRAM-BUON KOET;So;0;ON;;;;;N;;;;; +19EA;KHMER SYMBOL DAP KOET;So;0;ON;;;;;N;;;;; +19EB;KHMER SYMBOL DAP-MUOY KOET;So;0;ON;;;;;N;;;;; +19EC;KHMER SYMBOL DAP-PII KOET;So;0;ON;;;;;N;;;;; +19ED;KHMER SYMBOL DAP-BEI KOET;So;0;ON;;;;;N;;;;; +19EE;KHMER SYMBOL DAP-BUON KOET;So;0;ON;;;;;N;;;;; +19EF;KHMER SYMBOL DAP-PRAM KOET;So;0;ON;;;;;N;;;;; +19F0;KHMER SYMBOL TUTEYASAT;So;0;ON;;;;;N;;;;; +19F1;KHMER SYMBOL MUOY ROC;So;0;ON;;;;;N;;;;; +19F2;KHMER SYMBOL PII ROC;So;0;ON;;;;;N;;;;; +19F3;KHMER SYMBOL BEI ROC;So;0;ON;;;;;N;;;;; +19F4;KHMER SYMBOL BUON ROC;So;0;ON;;;;;N;;;;; +19F5;KHMER SYMBOL PRAM ROC;So;0;ON;;;;;N;;;;; +19F6;KHMER SYMBOL PRAM-MUOY ROC;So;0;ON;;;;;N;;;;; +19F7;KHMER SYMBOL PRAM-PII ROC;So;0;ON;;;;;N;;;;; +19F8;KHMER SYMBOL PRAM-BEI ROC;So;0;ON;;;;;N;;;;; +19F9;KHMER SYMBOL PRAM-BUON ROC;So;0;ON;;;;;N;;;;; +19FA;KHMER SYMBOL DAP ROC;So;0;ON;;;;;N;;;;; +19FB;KHMER SYMBOL DAP-MUOY ROC;So;0;ON;;;;;N;;;;; +19FC;KHMER SYMBOL DAP-PII ROC;So;0;ON;;;;;N;;;;; +19FD;KHMER SYMBOL DAP-BEI ROC;So;0;ON;;;;;N;;;;; +19FE;KHMER SYMBOL DAP-BUON ROC;So;0;ON;;;;;N;;;;; +19FF;KHMER SYMBOL DAP-PRAM ROC;So;0;ON;;;;;N;;;;; +1A00;BUGINESE LETTER KA;Lo;0;L;;;;;N;;;;; +1A01;BUGINESE LETTER GA;Lo;0;L;;;;;N;;;;; +1A02;BUGINESE LETTER NGA;Lo;0;L;;;;;N;;;;; +1A03;BUGINESE LETTER NGKA;Lo;0;L;;;;;N;;;;; +1A04;BUGINESE LETTER PA;Lo;0;L;;;;;N;;;;; +1A05;BUGINESE LETTER BA;Lo;0;L;;;;;N;;;;; +1A06;BUGINESE LETTER MA;Lo;0;L;;;;;N;;;;; +1A07;BUGINESE LETTER MPA;Lo;0;L;;;;;N;;;;; +1A08;BUGINESE LETTER TA;Lo;0;L;;;;;N;;;;; +1A09;BUGINESE LETTER DA;Lo;0;L;;;;;N;;;;; +1A0A;BUGINESE LETTER NA;Lo;0;L;;;;;N;;;;; +1A0B;BUGINESE LETTER NRA;Lo;0;L;;;;;N;;;;; +1A0C;BUGINESE LETTER CA;Lo;0;L;;;;;N;;;;; +1A0D;BUGINESE LETTER JA;Lo;0;L;;;;;N;;;;; +1A0E;BUGINESE LETTER NYA;Lo;0;L;;;;;N;;;;; +1A0F;BUGINESE LETTER NYCA;Lo;0;L;;;;;N;;;;; +1A10;BUGINESE LETTER YA;Lo;0;L;;;;;N;;;;; +1A11;BUGINESE LETTER RA;Lo;0;L;;;;;N;;;;; +1A12;BUGINESE LETTER LA;Lo;0;L;;;;;N;;;;; +1A13;BUGINESE LETTER VA;Lo;0;L;;;;;N;;;;; +1A14;BUGINESE LETTER SA;Lo;0;L;;;;;N;;;;; +1A15;BUGINESE LETTER A;Lo;0;L;;;;;N;;;;; +1A16;BUGINESE LETTER HA;Lo;0;L;;;;;N;;;;; +1A17;BUGINESE VOWEL SIGN I;Mn;230;NSM;;;;;N;;;;; +1A18;BUGINESE VOWEL SIGN U;Mn;220;NSM;;;;;N;;;;; +1A19;BUGINESE VOWEL SIGN E;Mc;0;L;;;;;N;;;;; +1A1A;BUGINESE VOWEL SIGN O;Mc;0;L;;;;;N;;;;; +1A1B;BUGINESE VOWEL SIGN AE;Mn;0;NSM;;;;;N;;;;; +1A1E;BUGINESE PALLAWA;Po;0;L;;;;;N;;;;; +1A1F;BUGINESE END OF SECTION;Po;0;L;;;;;N;;;;; +1A20;TAI THAM LETTER HIGH KA;Lo;0;L;;;;;N;;;;; +1A21;TAI THAM LETTER HIGH KHA;Lo;0;L;;;;;N;;;;; +1A22;TAI THAM LETTER HIGH KXA;Lo;0;L;;;;;N;;;;; +1A23;TAI THAM LETTER LOW KA;Lo;0;L;;;;;N;;;;; +1A24;TAI THAM LETTER LOW KXA;Lo;0;L;;;;;N;;;;; +1A25;TAI THAM LETTER LOW KHA;Lo;0;L;;;;;N;;;;; +1A26;TAI THAM LETTER NGA;Lo;0;L;;;;;N;;;;; +1A27;TAI THAM LETTER HIGH CA;Lo;0;L;;;;;N;;;;; +1A28;TAI THAM LETTER HIGH CHA;Lo;0;L;;;;;N;;;;; +1A29;TAI THAM LETTER LOW CA;Lo;0;L;;;;;N;;;;; +1A2A;TAI THAM LETTER LOW SA;Lo;0;L;;;;;N;;;;; +1A2B;TAI THAM LETTER LOW CHA;Lo;0;L;;;;;N;;;;; +1A2C;TAI THAM LETTER NYA;Lo;0;L;;;;;N;;;;; +1A2D;TAI THAM LETTER RATA;Lo;0;L;;;;;N;;;;; +1A2E;TAI THAM LETTER HIGH RATHA;Lo;0;L;;;;;N;;;;; +1A2F;TAI THAM LETTER DA;Lo;0;L;;;;;N;;;;; +1A30;TAI THAM LETTER LOW RATHA;Lo;0;L;;;;;N;;;;; +1A31;TAI THAM LETTER RANA;Lo;0;L;;;;;N;;;;; +1A32;TAI THAM LETTER HIGH TA;Lo;0;L;;;;;N;;;;; +1A33;TAI THAM LETTER HIGH THA;Lo;0;L;;;;;N;;;;; +1A34;TAI THAM LETTER LOW TA;Lo;0;L;;;;;N;;;;; +1A35;TAI THAM LETTER LOW THA;Lo;0;L;;;;;N;;;;; +1A36;TAI THAM LETTER NA;Lo;0;L;;;;;N;;;;; +1A37;TAI THAM LETTER BA;Lo;0;L;;;;;N;;;;; +1A38;TAI THAM LETTER HIGH PA;Lo;0;L;;;;;N;;;;; +1A39;TAI THAM LETTER HIGH PHA;Lo;0;L;;;;;N;;;;; +1A3A;TAI THAM LETTER HIGH FA;Lo;0;L;;;;;N;;;;; +1A3B;TAI THAM LETTER LOW PA;Lo;0;L;;;;;N;;;;; +1A3C;TAI THAM LETTER LOW FA;Lo;0;L;;;;;N;;;;; +1A3D;TAI THAM LETTER LOW PHA;Lo;0;L;;;;;N;;;;; +1A3E;TAI THAM LETTER MA;Lo;0;L;;;;;N;;;;; +1A3F;TAI THAM LETTER LOW YA;Lo;0;L;;;;;N;;;;; +1A40;TAI THAM LETTER HIGH YA;Lo;0;L;;;;;N;;;;; +1A41;TAI THAM LETTER RA;Lo;0;L;;;;;N;;;;; +1A42;TAI THAM LETTER RUE;Lo;0;L;;;;;N;;;;; +1A43;TAI THAM LETTER LA;Lo;0;L;;;;;N;;;;; +1A44;TAI THAM LETTER LUE;Lo;0;L;;;;;N;;;;; +1A45;TAI THAM LETTER WA;Lo;0;L;;;;;N;;;;; +1A46;TAI THAM LETTER HIGH SHA;Lo;0;L;;;;;N;;;;; +1A47;TAI THAM LETTER HIGH SSA;Lo;0;L;;;;;N;;;;; +1A48;TAI THAM LETTER HIGH SA;Lo;0;L;;;;;N;;;;; +1A49;TAI THAM LETTER HIGH HA;Lo;0;L;;;;;N;;;;; +1A4A;TAI THAM LETTER LLA;Lo;0;L;;;;;N;;;;; +1A4B;TAI THAM LETTER A;Lo;0;L;;;;;N;;;;; +1A4C;TAI THAM LETTER LOW HA;Lo;0;L;;;;;N;;;;; +1A4D;TAI THAM LETTER I;Lo;0;L;;;;;N;;;;; +1A4E;TAI THAM LETTER II;Lo;0;L;;;;;N;;;;; +1A4F;TAI THAM LETTER U;Lo;0;L;;;;;N;;;;; +1A50;TAI THAM LETTER UU;Lo;0;L;;;;;N;;;;; +1A51;TAI THAM LETTER EE;Lo;0;L;;;;;N;;;;; +1A52;TAI THAM LETTER OO;Lo;0;L;;;;;N;;;;; +1A53;TAI THAM LETTER LAE;Lo;0;L;;;;;N;;;;; +1A54;TAI THAM LETTER GREAT SA;Lo;0;L;;;;;N;;;;; +1A55;TAI THAM CONSONANT SIGN MEDIAL RA;Mc;0;L;;;;;N;;;;; +1A56;TAI THAM CONSONANT SIGN MEDIAL LA;Mn;0;NSM;;;;;N;;;;; +1A57;TAI THAM CONSONANT SIGN LA TANG LAI;Mc;0;L;;;;;N;;;;; +1A58;TAI THAM SIGN MAI KANG LAI;Mn;0;NSM;;;;;N;;;;; +1A59;TAI THAM CONSONANT SIGN FINAL NGA;Mn;0;NSM;;;;;N;;;;; +1A5A;TAI THAM CONSONANT SIGN LOW PA;Mn;0;NSM;;;;;N;;;;; +1A5B;TAI THAM CONSONANT SIGN HIGH RATHA OR LOW PA;Mn;0;NSM;;;;;N;;;;; +1A5C;TAI THAM CONSONANT SIGN MA;Mn;0;NSM;;;;;N;;;;; +1A5D;TAI THAM CONSONANT SIGN BA;Mn;0;NSM;;;;;N;;;;; +1A5E;TAI THAM CONSONANT SIGN SA;Mn;0;NSM;;;;;N;;;;; +1A60;TAI THAM SIGN SAKOT;Mn;9;NSM;;;;;N;;;;; +1A61;TAI THAM VOWEL SIGN A;Mc;0;L;;;;;N;;;;; +1A62;TAI THAM VOWEL SIGN MAI SAT;Mn;0;NSM;;;;;N;;;;; +1A63;TAI THAM VOWEL SIGN AA;Mc;0;L;;;;;N;;;;; +1A64;TAI THAM VOWEL SIGN TALL AA;Mc;0;L;;;;;N;;;;; +1A65;TAI THAM VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;; +1A66;TAI THAM VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;; +1A67;TAI THAM VOWEL SIGN UE;Mn;0;NSM;;;;;N;;;;; +1A68;TAI THAM VOWEL SIGN UUE;Mn;0;NSM;;;;;N;;;;; +1A69;TAI THAM VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;; +1A6A;TAI THAM VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;; +1A6B;TAI THAM VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;; +1A6C;TAI THAM VOWEL SIGN OA BELOW;Mn;0;NSM;;;;;N;;;;; +1A6D;TAI THAM VOWEL SIGN OY;Mc;0;L;;;;;N;;;;; +1A6E;TAI THAM VOWEL SIGN E;Mc;0;L;;;;;N;;;;; +1A6F;TAI THAM VOWEL SIGN AE;Mc;0;L;;;;;N;;;;; +1A70;TAI THAM VOWEL SIGN OO;Mc;0;L;;;;;N;;;;; +1A71;TAI THAM VOWEL SIGN AI;Mc;0;L;;;;;N;;;;; +1A72;TAI THAM VOWEL SIGN THAM AI;Mc;0;L;;;;;N;;;;; +1A73;TAI THAM VOWEL SIGN OA ABOVE;Mn;0;NSM;;;;;N;;;;; +1A74;TAI THAM SIGN MAI KANG;Mn;0;NSM;;;;;N;;;;; +1A75;TAI THAM SIGN TONE-1;Mn;230;NSM;;;;;N;;;;; +1A76;TAI THAM SIGN TONE-2;Mn;230;NSM;;;;;N;;;;; +1A77;TAI THAM SIGN KHUEN TONE-3;Mn;230;NSM;;;;;N;;;;; +1A78;TAI THAM SIGN KHUEN TONE-4;Mn;230;NSM;;;;;N;;;;; +1A79;TAI THAM SIGN KHUEN TONE-5;Mn;230;NSM;;;;;N;;;;; +1A7A;TAI THAM SIGN RA HAAM;Mn;230;NSM;;;;;N;;;;; +1A7B;TAI THAM SIGN MAI SAM;Mn;230;NSM;;;;;N;;;;; +1A7C;TAI THAM SIGN KHUEN-LUE KARAN;Mn;230;NSM;;;;;N;;;;; +1A7F;TAI THAM COMBINING CRYPTOGRAMMIC DOT;Mn;220;NSM;;;;;N;;;;; +1A80;TAI THAM HORA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +1A81;TAI THAM HORA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +1A82;TAI THAM HORA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +1A83;TAI THAM HORA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +1A84;TAI THAM HORA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +1A85;TAI THAM HORA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +1A86;TAI THAM HORA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +1A87;TAI THAM HORA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +1A88;TAI THAM HORA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +1A89;TAI THAM HORA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +1A90;TAI THAM THAM DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +1A91;TAI THAM THAM DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +1A92;TAI THAM THAM DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +1A93;TAI THAM THAM DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +1A94;TAI THAM THAM DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +1A95;TAI THAM THAM DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +1A96;TAI THAM THAM DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +1A97;TAI THAM THAM DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +1A98;TAI THAM THAM DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +1A99;TAI THAM THAM DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +1AA0;TAI THAM SIGN WIANG;Po;0;L;;;;;N;;;;; +1AA1;TAI THAM SIGN WIANGWAAK;Po;0;L;;;;;N;;;;; +1AA2;TAI THAM SIGN SAWAN;Po;0;L;;;;;N;;;;; +1AA3;TAI THAM SIGN KEOW;Po;0;L;;;;;N;;;;; +1AA4;TAI THAM SIGN HOY;Po;0;L;;;;;N;;;;; +1AA5;TAI THAM SIGN DOKMAI;Po;0;L;;;;;N;;;;; +1AA6;TAI THAM SIGN REVERSED ROTATED RANA;Po;0;L;;;;;N;;;;; +1AA7;TAI THAM SIGN MAI YAMOK;Lm;0;L;;;;;N;;;;; +1AA8;TAI THAM SIGN KAAN;Po;0;L;;;;;N;;;;; +1AA9;TAI THAM SIGN KAANKUU;Po;0;L;;;;;N;;;;; +1AAA;TAI THAM SIGN SATKAAN;Po;0;L;;;;;N;;;;; +1AAB;TAI THAM SIGN SATKAANKUU;Po;0;L;;;;;N;;;;; +1AAC;TAI THAM SIGN HANG;Po;0;L;;;;;N;;;;; +1AAD;TAI THAM SIGN CAANG;Po;0;L;;;;;N;;;;; +1AB0;COMBINING DOUBLED CIRCUMFLEX ACCENT;Mn;230;NSM;;;;;N;;;;; +1AB1;COMBINING DIAERESIS-RING;Mn;230;NSM;;;;;N;;;;; +1AB2;COMBINING INFINITY;Mn;230;NSM;;;;;N;;;;; +1AB3;COMBINING DOWNWARDS ARROW;Mn;230;NSM;;;;;N;;;;; +1AB4;COMBINING TRIPLE DOT;Mn;230;NSM;;;;;N;;;;; +1AB5;COMBINING X-X BELOW;Mn;220;NSM;;;;;N;;;;; +1AB6;COMBINING WIGGLY LINE BELOW;Mn;220;NSM;;;;;N;;;;; +1AB7;COMBINING OPEN MARK BELOW;Mn;220;NSM;;;;;N;;;;; +1AB8;COMBINING DOUBLE OPEN MARK BELOW;Mn;220;NSM;;;;;N;;;;; +1AB9;COMBINING LIGHT CENTRALIZATION STROKE BELOW;Mn;220;NSM;;;;;N;;;;; +1ABA;COMBINING STRONG CENTRALIZATION STROKE BELOW;Mn;220;NSM;;;;;N;;;;; +1ABB;COMBINING PARENTHESES ABOVE;Mn;230;NSM;;;;;N;;;;; +1ABC;COMBINING DOUBLE PARENTHESES ABOVE;Mn;230;NSM;;;;;N;;;;; +1ABD;COMBINING PARENTHESES BELOW;Mn;220;NSM;;;;;N;;;;; +1ABE;COMBINING PARENTHESES OVERLAY;Me;0;NSM;;;;;N;;;;; +1ABF;COMBINING LATIN SMALL LETTER W BELOW;Mn;220;NSM;;;;;N;;;;; +1AC0;COMBINING LATIN SMALL LETTER TURNED W BELOW;Mn;220;NSM;;;;;N;;;;; +1AC1;COMBINING LEFT PARENTHESIS ABOVE LEFT;Mn;230;NSM;;;;;N;;;;; +1AC2;COMBINING RIGHT PARENTHESIS ABOVE RIGHT;Mn;230;NSM;;;;;N;;;;; +1AC3;COMBINING LEFT PARENTHESIS BELOW LEFT;Mn;220;NSM;;;;;N;;;;; +1AC4;COMBINING RIGHT PARENTHESIS BELOW RIGHT;Mn;220;NSM;;;;;N;;;;; +1AC5;COMBINING SQUARE BRACKETS ABOVE;Mn;230;NSM;;;;;N;;;;; +1AC6;COMBINING NUMBER SIGN ABOVE;Mn;230;NSM;;;;;N;;;;; +1AC7;COMBINING INVERTED DOUBLE ARCH ABOVE;Mn;230;NSM;;;;;N;;;;; +1AC8;COMBINING PLUS SIGN ABOVE;Mn;230;NSM;;;;;N;;;;; +1AC9;COMBINING DOUBLE PLUS SIGN ABOVE;Mn;230;NSM;;;;;N;;;;; +1ACA;COMBINING DOUBLE PLUS SIGN BELOW;Mn;220;NSM;;;;;N;;;;; +1ACB;COMBINING TRIPLE ACUTE ACCENT;Mn;230;NSM;;;;;N;;;;; +1ACC;COMBINING LATIN SMALL LETTER INSULAR G;Mn;230;NSM;;;;;N;;;;; +1ACD;COMBINING LATIN SMALL LETTER INSULAR R;Mn;230;NSM;;;;;N;;;;; +1ACE;COMBINING LATIN SMALL LETTER INSULAR T;Mn;230;NSM;;;;;N;;;;; +1ACF;COMBINING DOUBLE CARON;Mn;230;NSM;;;;;N;;;;; +1AD0;COMBINING VERTICAL-LINE-ACUTE;Mn;230;NSM;;;;;N;;;;; +1AD1;COMBINING GRAVE-VERTICAL-LINE;Mn;230;NSM;;;;;N;;;;; +1AD2;COMBINING VERTICAL-LINE-GRAVE;Mn;230;NSM;;;;;N;;;;; +1AD3;COMBINING ACUTE-VERTICAL-LINE;Mn;230;NSM;;;;;N;;;;; +1AD4;COMBINING VERTICAL-LINE-MACRON;Mn;230;NSM;;;;;N;;;;; +1AD5;COMBINING MACRON-VERTICAL-LINE;Mn;230;NSM;;;;;N;;;;; +1AD6;COMBINING VERTICAL-LINE-ACUTE-GRAVE;Mn;230;NSM;;;;;N;;;;; +1AD7;COMBINING VERTICAL-LINE-GRAVE-ACUTE;Mn;230;NSM;;;;;N;;;;; +1AD8;COMBINING MACRON-ACUTE-GRAVE;Mn;230;NSM;;;;;N;;;;; +1AD9;COMBINING SHARP SIGN;Mn;230;NSM;;;;;N;;;;; +1ADA;COMBINING FLAT SIGN;Mn;230;NSM;;;;;N;;;;; +1ADB;COMBINING DOWN TACK ABOVE;Mn;230;NSM;;;;;N;;;;; +1ADC;COMBINING DIAERESIS WITH RAISED LEFT DOT;Mn;230;NSM;;;;;N;;;;; +1ADD;COMBINING DOT-AND-RING BELOW;Mn;220;NSM;;;;;N;;;;; +1AE0;COMBINING LEFT TACK ABOVE;Mn;230;NSM;;;;;N;;;;; +1AE1;COMBINING RIGHT TACK ABOVE;Mn;230;NSM;;;;;N;;;;; +1AE2;COMBINING MINUS SIGN ABOVE;Mn;230;NSM;;;;;N;;;;; +1AE3;COMBINING INVERTED BRIDGE ABOVE;Mn;230;NSM;;;;;N;;;;; +1AE4;COMBINING SQUARE ABOVE;Mn;230;NSM;;;;;N;;;;; +1AE5;COMBINING SEAGULL ABOVE;Mn;230;NSM;;;;;N;;;;; +1AE6;COMBINING DOUBLE ARCH BELOW;Mn;220;NSM;;;;;N;;;;; +1AE7;COMBINING DOUBLE ARCH ABOVE;Mn;230;NSM;;;;;N;;;;; +1AE8;COMBINING EQUALS SIGN ABOVE;Mn;230;NSM;;;;;N;;;;; +1AE9;COMBINING LEFT ANGLE CENTRED ABOVE;Mn;230;NSM;;;;;N;;;;; +1AEA;COMBINING UPWARDS ARROW ABOVE;Mn;230;NSM;;;;;N;;;;; +1AEB;COMBINING DOUBLE RIGHTWARDS ARROW ABOVE;Mn;234;NSM;;;;;N;;;;; +1B00;BALINESE SIGN ULU RICEM;Mn;0;NSM;;;;;N;;;;; +1B01;BALINESE SIGN ULU CANDRA;Mn;0;NSM;;;;;N;;;;; +1B02;BALINESE SIGN CECEK;Mn;0;NSM;;;;;N;;;;; +1B03;BALINESE SIGN SURANG;Mn;0;NSM;;;;;N;;;;; +1B04;BALINESE SIGN BISAH;Mc;0;L;;;;;N;;;;; +1B05;BALINESE LETTER AKARA;Lo;0;L;;;;;N;;;;; +1B06;BALINESE LETTER AKARA TEDUNG;Lo;0;L;1B05 1B35;;;;N;;;;; +1B07;BALINESE LETTER IKARA;Lo;0;L;;;;;N;;;;; +1B08;BALINESE LETTER IKARA TEDUNG;Lo;0;L;1B07 1B35;;;;N;;;;; +1B09;BALINESE LETTER UKARA;Lo;0;L;;;;;N;;;;; +1B0A;BALINESE LETTER UKARA TEDUNG;Lo;0;L;1B09 1B35;;;;N;;;;; +1B0B;BALINESE LETTER RA REPA;Lo;0;L;;;;;N;;;;; +1B0C;BALINESE LETTER RA REPA TEDUNG;Lo;0;L;1B0B 1B35;;;;N;;;;; +1B0D;BALINESE LETTER LA LENGA;Lo;0;L;;;;;N;;;;; +1B0E;BALINESE LETTER LA LENGA TEDUNG;Lo;0;L;1B0D 1B35;;;;N;;;;; +1B0F;BALINESE LETTER EKARA;Lo;0;L;;;;;N;;;;; +1B10;BALINESE LETTER AIKARA;Lo;0;L;;;;;N;;;;; +1B11;BALINESE LETTER OKARA;Lo;0;L;;;;;N;;;;; +1B12;BALINESE LETTER OKARA TEDUNG;Lo;0;L;1B11 1B35;;;;N;;;;; +1B13;BALINESE LETTER KA;Lo;0;L;;;;;N;;;;; +1B14;BALINESE LETTER KA MAHAPRANA;Lo;0;L;;;;;N;;;;; +1B15;BALINESE LETTER GA;Lo;0;L;;;;;N;;;;; +1B16;BALINESE LETTER GA GORA;Lo;0;L;;;;;N;;;;; +1B17;BALINESE LETTER NGA;Lo;0;L;;;;;N;;;;; +1B18;BALINESE LETTER CA;Lo;0;L;;;;;N;;;;; +1B19;BALINESE LETTER CA LACA;Lo;0;L;;;;;N;;;;; +1B1A;BALINESE LETTER JA;Lo;0;L;;;;;N;;;;; +1B1B;BALINESE LETTER JA JERA;Lo;0;L;;;;;N;;;;; +1B1C;BALINESE LETTER NYA;Lo;0;L;;;;;N;;;;; +1B1D;BALINESE LETTER TA LATIK;Lo;0;L;;;;;N;;;;; +1B1E;BALINESE LETTER TA MURDA MAHAPRANA;Lo;0;L;;;;;N;;;;; +1B1F;BALINESE LETTER DA MURDA ALPAPRANA;Lo;0;L;;;;;N;;;;; +1B20;BALINESE LETTER DA MURDA MAHAPRANA;Lo;0;L;;;;;N;;;;; +1B21;BALINESE LETTER NA RAMBAT;Lo;0;L;;;;;N;;;;; +1B22;BALINESE LETTER TA;Lo;0;L;;;;;N;;;;; +1B23;BALINESE LETTER TA TAWA;Lo;0;L;;;;;N;;;;; +1B24;BALINESE LETTER DA;Lo;0;L;;;;;N;;;;; +1B25;BALINESE LETTER DA MADU;Lo;0;L;;;;;N;;;;; +1B26;BALINESE LETTER NA;Lo;0;L;;;;;N;;;;; +1B27;BALINESE LETTER PA;Lo;0;L;;;;;N;;;;; +1B28;BALINESE LETTER PA KAPAL;Lo;0;L;;;;;N;;;;; +1B29;BALINESE LETTER BA;Lo;0;L;;;;;N;;;;; +1B2A;BALINESE LETTER BA KEMBANG;Lo;0;L;;;;;N;;;;; +1B2B;BALINESE LETTER MA;Lo;0;L;;;;;N;;;;; +1B2C;BALINESE LETTER YA;Lo;0;L;;;;;N;;;;; +1B2D;BALINESE LETTER RA;Lo;0;L;;;;;N;;;;; +1B2E;BALINESE LETTER LA;Lo;0;L;;;;;N;;;;; +1B2F;BALINESE LETTER WA;Lo;0;L;;;;;N;;;;; +1B30;BALINESE LETTER SA SAGA;Lo;0;L;;;;;N;;;;; +1B31;BALINESE LETTER SA SAPA;Lo;0;L;;;;;N;;;;; +1B32;BALINESE LETTER SA;Lo;0;L;;;;;N;;;;; +1B33;BALINESE LETTER HA;Lo;0;L;;;;;N;;;;; +1B34;BALINESE SIGN REREKAN;Mn;7;NSM;;;;;N;;;;; +1B35;BALINESE VOWEL SIGN TEDUNG;Mc;0;L;;;;;N;;;;; +1B36;BALINESE VOWEL SIGN ULU;Mn;0;NSM;;;;;N;;;;; +1B37;BALINESE VOWEL SIGN ULU SARI;Mn;0;NSM;;;;;N;;;;; +1B38;BALINESE VOWEL SIGN SUKU;Mn;0;NSM;;;;;N;;;;; +1B39;BALINESE VOWEL SIGN SUKU ILUT;Mn;0;NSM;;;;;N;;;;; +1B3A;BALINESE VOWEL SIGN RA REPA;Mn;0;NSM;;;;;N;;;;; +1B3B;BALINESE VOWEL SIGN RA REPA TEDUNG;Mc;0;L;1B3A 1B35;;;;N;;;;; +1B3C;BALINESE VOWEL SIGN LA LENGA;Mn;0;NSM;;;;;N;;;;; +1B3D;BALINESE VOWEL SIGN LA LENGA TEDUNG;Mc;0;L;1B3C 1B35;;;;N;;;;; +1B3E;BALINESE VOWEL SIGN TALING;Mc;0;L;;;;;N;;;;; +1B3F;BALINESE VOWEL SIGN TALING REPA;Mc;0;L;;;;;N;;;;; +1B40;BALINESE VOWEL SIGN TALING TEDUNG;Mc;0;L;1B3E 1B35;;;;N;;;;; +1B41;BALINESE VOWEL SIGN TALING REPA TEDUNG;Mc;0;L;1B3F 1B35;;;;N;;;;; +1B42;BALINESE VOWEL SIGN PEPET;Mn;0;NSM;;;;;N;;;;; +1B43;BALINESE VOWEL SIGN PEPET TEDUNG;Mc;0;L;1B42 1B35;;;;N;;;;; +1B44;BALINESE ADEG ADEG;Mc;9;L;;;;;N;;;;; +1B45;BALINESE LETTER KAF SASAK;Lo;0;L;;;;;N;;;;; +1B46;BALINESE LETTER KHOT SASAK;Lo;0;L;;;;;N;;;;; +1B47;BALINESE LETTER TZIR SASAK;Lo;0;L;;;;;N;;;;; +1B48;BALINESE LETTER EF SASAK;Lo;0;L;;;;;N;;;;; +1B49;BALINESE LETTER VE SASAK;Lo;0;L;;;;;N;;;;; +1B4A;BALINESE LETTER ZAL SASAK;Lo;0;L;;;;;N;;;;; +1B4B;BALINESE LETTER ASYURA SASAK;Lo;0;L;;;;;N;;;;; +1B4C;BALINESE LETTER ARCHAIC JNYA;Lo;0;L;;;;;N;;;;; +1B4E;BALINESE INVERTED CARIK SIKI;Po;0;L;;;;;N;;;;; +1B4F;BALINESE INVERTED CARIK PAREREN;Po;0;L;;;;;N;;;;; +1B50;BALINESE DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +1B51;BALINESE DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +1B52;BALINESE DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +1B53;BALINESE DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +1B54;BALINESE DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +1B55;BALINESE DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +1B56;BALINESE DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +1B57;BALINESE DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +1B58;BALINESE DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +1B59;BALINESE DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +1B5A;BALINESE PANTI;Po;0;L;;;;;N;;;;; +1B5B;BALINESE PAMADA;Po;0;L;;;;;N;;;;; +1B5C;BALINESE WINDU;Po;0;L;;;;;N;;;;; +1B5D;BALINESE CARIK PAMUNGKAH;Po;0;L;;;;;N;;;;; +1B5E;BALINESE CARIK SIKI;Po;0;L;;;;;N;;;;; +1B5F;BALINESE CARIK PAREREN;Po;0;L;;;;;N;;;;; +1B60;BALINESE PAMENENG;Po;0;L;;;;;N;;;;; +1B61;BALINESE MUSICAL SYMBOL DONG;So;0;L;;;;;N;;;;; +1B62;BALINESE MUSICAL SYMBOL DENG;So;0;L;;;;;N;;;;; +1B63;BALINESE MUSICAL SYMBOL DUNG;So;0;L;;;;;N;;;;; +1B64;BALINESE MUSICAL SYMBOL DANG;So;0;L;;;;;N;;;;; +1B65;BALINESE MUSICAL SYMBOL DANG SURANG;So;0;L;;;;;N;;;;; +1B66;BALINESE MUSICAL SYMBOL DING;So;0;L;;;;;N;;;;; +1B67;BALINESE MUSICAL SYMBOL DAENG;So;0;L;;;;;N;;;;; +1B68;BALINESE MUSICAL SYMBOL DEUNG;So;0;L;;;;;N;;;;; +1B69;BALINESE MUSICAL SYMBOL DAING;So;0;L;;;;;N;;;;; +1B6A;BALINESE MUSICAL SYMBOL DANG GEDE;So;0;L;;;;;N;;;;; +1B6B;BALINESE MUSICAL SYMBOL COMBINING TEGEH;Mn;230;NSM;;;;;N;;;;; +1B6C;BALINESE MUSICAL SYMBOL COMBINING ENDEP;Mn;220;NSM;;;;;N;;;;; +1B6D;BALINESE MUSICAL SYMBOL COMBINING KEMPUL;Mn;230;NSM;;;;;N;;;;; +1B6E;BALINESE MUSICAL SYMBOL COMBINING KEMPLI;Mn;230;NSM;;;;;N;;;;; +1B6F;BALINESE MUSICAL SYMBOL COMBINING JEGOGAN;Mn;230;NSM;;;;;N;;;;; +1B70;BALINESE MUSICAL SYMBOL COMBINING KEMPUL WITH JEGOGAN;Mn;230;NSM;;;;;N;;;;; +1B71;BALINESE MUSICAL SYMBOL COMBINING KEMPLI WITH JEGOGAN;Mn;230;NSM;;;;;N;;;;; +1B72;BALINESE MUSICAL SYMBOL COMBINING BENDE;Mn;230;NSM;;;;;N;;;;; +1B73;BALINESE MUSICAL SYMBOL COMBINING GONG;Mn;230;NSM;;;;;N;;;;; +1B74;BALINESE MUSICAL SYMBOL RIGHT-HAND OPEN DUG;So;0;L;;;;;N;;;;; +1B75;BALINESE MUSICAL SYMBOL RIGHT-HAND OPEN DAG;So;0;L;;;;;N;;;;; +1B76;BALINESE MUSICAL SYMBOL RIGHT-HAND CLOSED TUK;So;0;L;;;;;N;;;;; +1B77;BALINESE MUSICAL SYMBOL RIGHT-HAND CLOSED TAK;So;0;L;;;;;N;;;;; +1B78;BALINESE MUSICAL SYMBOL LEFT-HAND OPEN PANG;So;0;L;;;;;N;;;;; +1B79;BALINESE MUSICAL SYMBOL LEFT-HAND OPEN PUNG;So;0;L;;;;;N;;;;; +1B7A;BALINESE MUSICAL SYMBOL LEFT-HAND CLOSED PLAK;So;0;L;;;;;N;;;;; +1B7B;BALINESE MUSICAL SYMBOL LEFT-HAND CLOSED PLUK;So;0;L;;;;;N;;;;; +1B7C;BALINESE MUSICAL SYMBOL LEFT-HAND OPEN PING;So;0;L;;;;;N;;;;; +1B7D;BALINESE PANTI LANTANG;Po;0;L;;;;;N;;;;; +1B7E;BALINESE PAMADA LANTANG;Po;0;L;;;;;N;;;;; +1B7F;BALINESE PANTI BAWAK;Po;0;L;;;;;N;;;;; +1B80;SUNDANESE SIGN PANYECEK;Mn;0;NSM;;;;;N;;;;; +1B81;SUNDANESE SIGN PANGLAYAR;Mn;0;NSM;;;;;N;;;;; +1B82;SUNDANESE SIGN PANGWISAD;Mc;0;L;;;;;N;;;;; +1B83;SUNDANESE LETTER A;Lo;0;L;;;;;N;;;;; +1B84;SUNDANESE LETTER I;Lo;0;L;;;;;N;;;;; +1B85;SUNDANESE LETTER U;Lo;0;L;;;;;N;;;;; +1B86;SUNDANESE LETTER AE;Lo;0;L;;;;;N;;;;; +1B87;SUNDANESE LETTER O;Lo;0;L;;;;;N;;;;; +1B88;SUNDANESE LETTER E;Lo;0;L;;;;;N;;;;; +1B89;SUNDANESE LETTER EU;Lo;0;L;;;;;N;;;;; +1B8A;SUNDANESE LETTER KA;Lo;0;L;;;;;N;;;;; +1B8B;SUNDANESE LETTER QA;Lo;0;L;;;;;N;;;;; +1B8C;SUNDANESE LETTER GA;Lo;0;L;;;;;N;;;;; +1B8D;SUNDANESE LETTER NGA;Lo;0;L;;;;;N;;;;; +1B8E;SUNDANESE LETTER CA;Lo;0;L;;;;;N;;;;; +1B8F;SUNDANESE LETTER JA;Lo;0;L;;;;;N;;;;; +1B90;SUNDANESE LETTER ZA;Lo;0;L;;;;;N;;;;; +1B91;SUNDANESE LETTER NYA;Lo;0;L;;;;;N;;;;; +1B92;SUNDANESE LETTER TA;Lo;0;L;;;;;N;;;;; +1B93;SUNDANESE LETTER DA;Lo;0;L;;;;;N;;;;; +1B94;SUNDANESE LETTER NA;Lo;0;L;;;;;N;;;;; +1B95;SUNDANESE LETTER PA;Lo;0;L;;;;;N;;;;; +1B96;SUNDANESE LETTER FA;Lo;0;L;;;;;N;;;;; +1B97;SUNDANESE LETTER VA;Lo;0;L;;;;;N;;;;; +1B98;SUNDANESE LETTER BA;Lo;0;L;;;;;N;;;;; +1B99;SUNDANESE LETTER MA;Lo;0;L;;;;;N;;;;; +1B9A;SUNDANESE LETTER YA;Lo;0;L;;;;;N;;;;; +1B9B;SUNDANESE LETTER RA;Lo;0;L;;;;;N;;;;; +1B9C;SUNDANESE LETTER LA;Lo;0;L;;;;;N;;;;; +1B9D;SUNDANESE LETTER WA;Lo;0;L;;;;;N;;;;; +1B9E;SUNDANESE LETTER SA;Lo;0;L;;;;;N;;;;; +1B9F;SUNDANESE LETTER XA;Lo;0;L;;;;;N;;;;; +1BA0;SUNDANESE LETTER HA;Lo;0;L;;;;;N;;;;; +1BA1;SUNDANESE CONSONANT SIGN PAMINGKAL;Mc;0;L;;;;;N;;;;; +1BA2;SUNDANESE CONSONANT SIGN PANYAKRA;Mn;0;NSM;;;;;N;;;;; +1BA3;SUNDANESE CONSONANT SIGN PANYIKU;Mn;0;NSM;;;;;N;;;;; +1BA4;SUNDANESE VOWEL SIGN PANGHULU;Mn;0;NSM;;;;;N;;;;; +1BA5;SUNDANESE VOWEL SIGN PANYUKU;Mn;0;NSM;;;;;N;;;;; +1BA6;SUNDANESE VOWEL SIGN PANAELAENG;Mc;0;L;;;;;N;;;;; +1BA7;SUNDANESE VOWEL SIGN PANOLONG;Mc;0;L;;;;;N;;;;; +1BA8;SUNDANESE VOWEL SIGN PAMEPET;Mn;0;NSM;;;;;N;;;;; +1BA9;SUNDANESE VOWEL SIGN PANEULEUNG;Mn;0;NSM;;;;;N;;;;; +1BAA;SUNDANESE SIGN PAMAAEH;Mc;9;L;;;;;N;;;;; +1BAB;SUNDANESE SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;; +1BAC;SUNDANESE CONSONANT SIGN PASANGAN MA;Mn;0;NSM;;;;;N;;;;; +1BAD;SUNDANESE CONSONANT SIGN PASANGAN WA;Mn;0;NSM;;;;;N;;;;; +1BAE;SUNDANESE LETTER KHA;Lo;0;L;;;;;N;;;;; +1BAF;SUNDANESE LETTER SYA;Lo;0;L;;;;;N;;;;; +1BB0;SUNDANESE DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +1BB1;SUNDANESE DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +1BB2;SUNDANESE DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +1BB3;SUNDANESE DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +1BB4;SUNDANESE DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +1BB5;SUNDANESE DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +1BB6;SUNDANESE DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +1BB7;SUNDANESE DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +1BB8;SUNDANESE DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +1BB9;SUNDANESE DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +1BBA;SUNDANESE AVAGRAHA;Lo;0;L;;;;;N;;;;; +1BBB;SUNDANESE LETTER REU;Lo;0;L;;;;;N;;;;; +1BBC;SUNDANESE LETTER LEU;Lo;0;L;;;;;N;;;;; +1BBD;SUNDANESE LETTER BHA;Lo;0;L;;;;;N;;;;; +1BBE;SUNDANESE LETTER FINAL K;Lo;0;L;;;;;N;;;;; +1BBF;SUNDANESE LETTER FINAL M;Lo;0;L;;;;;N;;;;; +1BC0;BATAK LETTER A;Lo;0;L;;;;;N;;;;; +1BC1;BATAK LETTER SIMALUNGUN A;Lo;0;L;;;;;N;;;;; +1BC2;BATAK LETTER HA;Lo;0;L;;;;;N;;;;; +1BC3;BATAK LETTER SIMALUNGUN HA;Lo;0;L;;;;;N;;;;; +1BC4;BATAK LETTER MANDAILING HA;Lo;0;L;;;;;N;;;;; +1BC5;BATAK LETTER BA;Lo;0;L;;;;;N;;;;; +1BC6;BATAK LETTER KARO BA;Lo;0;L;;;;;N;;;;; +1BC7;BATAK LETTER PA;Lo;0;L;;;;;N;;;;; +1BC8;BATAK LETTER SIMALUNGUN PA;Lo;0;L;;;;;N;;;;; +1BC9;BATAK LETTER NA;Lo;0;L;;;;;N;;;;; +1BCA;BATAK LETTER MANDAILING NA;Lo;0;L;;;;;N;;;;; +1BCB;BATAK LETTER WA;Lo;0;L;;;;;N;;;;; +1BCC;BATAK LETTER SIMALUNGUN WA;Lo;0;L;;;;;N;;;;; +1BCD;BATAK LETTER PAKPAK WA;Lo;0;L;;;;;N;;;;; +1BCE;BATAK LETTER GA;Lo;0;L;;;;;N;;;;; +1BCF;BATAK LETTER SIMALUNGUN GA;Lo;0;L;;;;;N;;;;; +1BD0;BATAK LETTER JA;Lo;0;L;;;;;N;;;;; +1BD1;BATAK LETTER DA;Lo;0;L;;;;;N;;;;; +1BD2;BATAK LETTER RA;Lo;0;L;;;;;N;;;;; +1BD3;BATAK LETTER SIMALUNGUN RA;Lo;0;L;;;;;N;;;;; +1BD4;BATAK LETTER MA;Lo;0;L;;;;;N;;;;; +1BD5;BATAK LETTER SIMALUNGUN MA;Lo;0;L;;;;;N;;;;; +1BD6;BATAK LETTER SOUTHERN TA;Lo;0;L;;;;;N;;;;; +1BD7;BATAK LETTER NORTHERN TA;Lo;0;L;;;;;N;;;;; +1BD8;BATAK LETTER SA;Lo;0;L;;;;;N;;;;; +1BD9;BATAK LETTER SIMALUNGUN SA;Lo;0;L;;;;;N;;;;; +1BDA;BATAK LETTER MANDAILING SA;Lo;0;L;;;;;N;;;;; +1BDB;BATAK LETTER YA;Lo;0;L;;;;;N;;;;; +1BDC;BATAK LETTER SIMALUNGUN YA;Lo;0;L;;;;;N;;;;; +1BDD;BATAK LETTER NGA;Lo;0;L;;;;;N;;;;; +1BDE;BATAK LETTER LA;Lo;0;L;;;;;N;;;;; +1BDF;BATAK LETTER SIMALUNGUN LA;Lo;0;L;;;;;N;;;;; +1BE0;BATAK LETTER NYA;Lo;0;L;;;;;N;;;;; +1BE1;BATAK LETTER CA;Lo;0;L;;;;;N;;;;; +1BE2;BATAK LETTER NDA;Lo;0;L;;;;;N;;;;; +1BE3;BATAK LETTER MBA;Lo;0;L;;;;;N;;;;; +1BE4;BATAK LETTER I;Lo;0;L;;;;;N;;;;; +1BE5;BATAK LETTER U;Lo;0;L;;;;;N;;;;; +1BE6;BATAK SIGN TOMPI;Mn;7;NSM;;;;;N;;;;; +1BE7;BATAK VOWEL SIGN E;Mc;0;L;;;;;N;;;;; +1BE8;BATAK VOWEL SIGN PAKPAK E;Mn;0;NSM;;;;;N;;;;; +1BE9;BATAK VOWEL SIGN EE;Mn;0;NSM;;;;;N;;;;; +1BEA;BATAK VOWEL SIGN I;Mc;0;L;;;;;N;;;;; +1BEB;BATAK VOWEL SIGN KARO I;Mc;0;L;;;;;N;;;;; +1BEC;BATAK VOWEL SIGN O;Mc;0;L;;;;;N;;;;; +1BED;BATAK VOWEL SIGN KARO O;Mn;0;NSM;;;;;N;;;;; +1BEE;BATAK VOWEL SIGN U;Mc;0;L;;;;;N;;;;; +1BEF;BATAK VOWEL SIGN U FOR SIMALUNGUN SA;Mn;0;NSM;;;;;N;;;;; +1BF0;BATAK CONSONANT SIGN NG;Mn;0;NSM;;;;;N;;;;; +1BF1;BATAK CONSONANT SIGN H;Mn;0;NSM;;;;;N;;;;; +1BF2;BATAK PANGOLAT;Mc;9;L;;;;;N;;;;; +1BF3;BATAK PANONGONAN;Mc;9;L;;;;;N;;;;; +1BFC;BATAK SYMBOL BINDU NA METEK;Po;0;L;;;;;N;;;;; +1BFD;BATAK SYMBOL BINDU PINARBORAS;Po;0;L;;;;;N;;;;; +1BFE;BATAK SYMBOL BINDU JUDUL;Po;0;L;;;;;N;;;;; +1BFF;BATAK SYMBOL BINDU PANGOLAT;Po;0;L;;;;;N;;;;; +1C00;LEPCHA LETTER KA;Lo;0;L;;;;;N;;;;; +1C01;LEPCHA LETTER KLA;Lo;0;L;;;;;N;;;;; +1C02;LEPCHA LETTER KHA;Lo;0;L;;;;;N;;;;; +1C03;LEPCHA LETTER GA;Lo;0;L;;;;;N;;;;; +1C04;LEPCHA LETTER GLA;Lo;0;L;;;;;N;;;;; +1C05;LEPCHA LETTER NGA;Lo;0;L;;;;;N;;;;; +1C06;LEPCHA LETTER CA;Lo;0;L;;;;;N;;;;; +1C07;LEPCHA LETTER CHA;Lo;0;L;;;;;N;;;;; +1C08;LEPCHA LETTER JA;Lo;0;L;;;;;N;;;;; +1C09;LEPCHA LETTER NYA;Lo;0;L;;;;;N;;;;; +1C0A;LEPCHA LETTER TA;Lo;0;L;;;;;N;;;;; +1C0B;LEPCHA LETTER THA;Lo;0;L;;;;;N;;;;; +1C0C;LEPCHA LETTER DA;Lo;0;L;;;;;N;;;;; +1C0D;LEPCHA LETTER NA;Lo;0;L;;;;;N;;;;; +1C0E;LEPCHA LETTER PA;Lo;0;L;;;;;N;;;;; +1C0F;LEPCHA LETTER PLA;Lo;0;L;;;;;N;;;;; +1C10;LEPCHA LETTER PHA;Lo;0;L;;;;;N;;;;; +1C11;LEPCHA LETTER FA;Lo;0;L;;;;;N;;;;; +1C12;LEPCHA LETTER FLA;Lo;0;L;;;;;N;;;;; +1C13;LEPCHA LETTER BA;Lo;0;L;;;;;N;;;;; +1C14;LEPCHA LETTER BLA;Lo;0;L;;;;;N;;;;; +1C15;LEPCHA LETTER MA;Lo;0;L;;;;;N;;;;; +1C16;LEPCHA LETTER MLA;Lo;0;L;;;;;N;;;;; +1C17;LEPCHA LETTER TSA;Lo;0;L;;;;;N;;;;; +1C18;LEPCHA LETTER TSHA;Lo;0;L;;;;;N;;;;; +1C19;LEPCHA LETTER DZA;Lo;0;L;;;;;N;;;;; +1C1A;LEPCHA LETTER YA;Lo;0;L;;;;;N;;;;; +1C1B;LEPCHA LETTER RA;Lo;0;L;;;;;N;;;;; +1C1C;LEPCHA LETTER LA;Lo;0;L;;;;;N;;;;; +1C1D;LEPCHA LETTER HA;Lo;0;L;;;;;N;;;;; +1C1E;LEPCHA LETTER HLA;Lo;0;L;;;;;N;;;;; +1C1F;LEPCHA LETTER VA;Lo;0;L;;;;;N;;;;; +1C20;LEPCHA LETTER SA;Lo;0;L;;;;;N;;;;; +1C21;LEPCHA LETTER SHA;Lo;0;L;;;;;N;;;;; +1C22;LEPCHA LETTER WA;Lo;0;L;;;;;N;;;;; +1C23;LEPCHA LETTER A;Lo;0;L;;;;;N;;;;; +1C24;LEPCHA SUBJOINED LETTER YA;Mc;0;L;;;;;N;;;;; +1C25;LEPCHA SUBJOINED LETTER RA;Mc;0;L;;;;;N;;;;; +1C26;LEPCHA VOWEL SIGN AA;Mc;0;L;;;;;N;;;;; +1C27;LEPCHA VOWEL SIGN I;Mc;0;L;;;;;N;;;;; +1C28;LEPCHA VOWEL SIGN O;Mc;0;L;;;;;N;;;;; +1C29;LEPCHA VOWEL SIGN OO;Mc;0;L;;;;;N;;;;; +1C2A;LEPCHA VOWEL SIGN U;Mc;0;L;;;;;N;;;;; +1C2B;LEPCHA VOWEL SIGN UU;Mc;0;L;;;;;N;;;;; +1C2C;LEPCHA VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;; +1C2D;LEPCHA CONSONANT SIGN K;Mn;0;NSM;;;;;N;;;;; +1C2E;LEPCHA CONSONANT SIGN M;Mn;0;NSM;;;;;N;;;;; +1C2F;LEPCHA CONSONANT SIGN L;Mn;0;NSM;;;;;N;;;;; +1C30;LEPCHA CONSONANT SIGN N;Mn;0;NSM;;;;;N;;;;; +1C31;LEPCHA CONSONANT SIGN P;Mn;0;NSM;;;;;N;;;;; +1C32;LEPCHA CONSONANT SIGN R;Mn;0;NSM;;;;;N;;;;; +1C33;LEPCHA CONSONANT SIGN T;Mn;0;NSM;;;;;N;;;;; +1C34;LEPCHA CONSONANT SIGN NYIN-DO;Mc;0;L;;;;;N;;;;; +1C35;LEPCHA CONSONANT SIGN KANG;Mc;0;L;;;;;N;;;;; +1C36;LEPCHA SIGN RAN;Mn;0;NSM;;;;;N;;;;; +1C37;LEPCHA SIGN NUKTA;Mn;7;NSM;;;;;N;;;;; +1C3B;LEPCHA PUNCTUATION TA-ROL;Po;0;L;;;;;N;;;;; +1C3C;LEPCHA PUNCTUATION NYET THYOOM TA-ROL;Po;0;L;;;;;N;;;;; +1C3D;LEPCHA PUNCTUATION CER-WA;Po;0;L;;;;;N;;;;; +1C3E;LEPCHA PUNCTUATION TSHOOK CER-WA;Po;0;L;;;;;N;;;;; +1C3F;LEPCHA PUNCTUATION TSHOOK;Po;0;L;;;;;N;;;;; +1C40;LEPCHA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +1C41;LEPCHA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +1C42;LEPCHA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +1C43;LEPCHA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +1C44;LEPCHA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +1C45;LEPCHA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +1C46;LEPCHA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +1C47;LEPCHA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +1C48;LEPCHA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +1C49;LEPCHA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +1C4D;LEPCHA LETTER TTA;Lo;0;L;;;;;N;;;;; +1C4E;LEPCHA LETTER TTHA;Lo;0;L;;;;;N;;;;; +1C4F;LEPCHA LETTER DDA;Lo;0;L;;;;;N;;;;; +1C50;OL CHIKI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +1C51;OL CHIKI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +1C52;OL CHIKI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +1C53;OL CHIKI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +1C54;OL CHIKI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +1C55;OL CHIKI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +1C56;OL CHIKI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +1C57;OL CHIKI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +1C58;OL CHIKI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +1C59;OL CHIKI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +1C5A;OL CHIKI LETTER LA;Lo;0;L;;;;;N;;;;; +1C5B;OL CHIKI LETTER AT;Lo;0;L;;;;;N;;;;; +1C5C;OL CHIKI LETTER AG;Lo;0;L;;;;;N;;;;; +1C5D;OL CHIKI LETTER ANG;Lo;0;L;;;;;N;;;;; +1C5E;OL CHIKI LETTER AL;Lo;0;L;;;;;N;;;;; +1C5F;OL CHIKI LETTER LAA;Lo;0;L;;;;;N;;;;; +1C60;OL CHIKI LETTER AAK;Lo;0;L;;;;;N;;;;; +1C61;OL CHIKI LETTER AAJ;Lo;0;L;;;;;N;;;;; +1C62;OL CHIKI LETTER AAM;Lo;0;L;;;;;N;;;;; +1C63;OL CHIKI LETTER AAW;Lo;0;L;;;;;N;;;;; +1C64;OL CHIKI LETTER LI;Lo;0;L;;;;;N;;;;; +1C65;OL CHIKI LETTER IS;Lo;0;L;;;;;N;;;;; +1C66;OL CHIKI LETTER IH;Lo;0;L;;;;;N;;;;; +1C67;OL CHIKI LETTER INY;Lo;0;L;;;;;N;;;;; +1C68;OL CHIKI LETTER IR;Lo;0;L;;;;;N;;;;; +1C69;OL CHIKI LETTER LU;Lo;0;L;;;;;N;;;;; +1C6A;OL CHIKI LETTER UC;Lo;0;L;;;;;N;;;;; +1C6B;OL CHIKI LETTER UD;Lo;0;L;;;;;N;;;;; +1C6C;OL CHIKI LETTER UNN;Lo;0;L;;;;;N;;;;; +1C6D;OL CHIKI LETTER UY;Lo;0;L;;;;;N;;;;; +1C6E;OL CHIKI LETTER LE;Lo;0;L;;;;;N;;;;; +1C6F;OL CHIKI LETTER EP;Lo;0;L;;;;;N;;;;; +1C70;OL CHIKI LETTER EDD;Lo;0;L;;;;;N;;;;; +1C71;OL CHIKI LETTER EN;Lo;0;L;;;;;N;;;;; +1C72;OL CHIKI LETTER ERR;Lo;0;L;;;;;N;;;;; +1C73;OL CHIKI LETTER LO;Lo;0;L;;;;;N;;;;; +1C74;OL CHIKI LETTER OTT;Lo;0;L;;;;;N;;;;; +1C75;OL CHIKI LETTER OB;Lo;0;L;;;;;N;;;;; +1C76;OL CHIKI LETTER OV;Lo;0;L;;;;;N;;;;; +1C77;OL CHIKI LETTER OH;Lo;0;L;;;;;N;;;;; +1C78;OL CHIKI MU TTUDDAG;Lm;0;L;;;;;N;;;;; +1C79;OL CHIKI GAAHLAA TTUDDAAG;Lm;0;L;;;;;N;;;;; +1C7A;OL CHIKI MU-GAAHLAA TTUDDAAG;Lm;0;L;;;;;N;;;;; +1C7B;OL CHIKI RELAA;Lm;0;L;;;;;N;;;;; +1C7C;OL CHIKI PHAARKAA;Lm;0;L;;;;;N;;;;; +1C7D;OL CHIKI AHAD;Lm;0;L;;;;;N;;;;; +1C7E;OL CHIKI PUNCTUATION MUCAAD;Po;0;L;;;;;N;;;;; +1C7F;OL CHIKI PUNCTUATION DOUBLE MUCAAD;Po;0;L;;;;;N;;;;; +1C80;CYRILLIC SMALL LETTER ROUNDED VE;Ll;0;L;;;;;N;;;0412;;0412 +1C81;CYRILLIC SMALL LETTER LONG-LEGGED DE;Ll;0;L;;;;;N;;;0414;;0414 +1C82;CYRILLIC SMALL LETTER NARROW O;Ll;0;L;;;;;N;;;041E;;041E +1C83;CYRILLIC SMALL LETTER WIDE ES;Ll;0;L;;;;;N;;;0421;;0421 +1C84;CYRILLIC SMALL LETTER TALL TE;Ll;0;L;;;;;N;;;0422;;0422 +1C85;CYRILLIC SMALL LETTER THREE-LEGGED TE;Ll;0;L;;;;;N;;;0422;;0422 +1C86;CYRILLIC SMALL LETTER TALL HARD SIGN;Ll;0;L;;;;;N;;;042A;;042A +1C87;CYRILLIC SMALL LETTER TALL YAT;Ll;0;L;;;;;N;;;0462;;0462 +1C88;CYRILLIC SMALL LETTER UNBLENDED UK;Ll;0;L;;;;;N;;;A64A;;A64A +1C89;CYRILLIC CAPITAL LETTER TJE;Lu;0;L;;;;;N;;;;1C8A; +1C8A;CYRILLIC SMALL LETTER TJE;Ll;0;L;;;;;N;;;1C89;;1C89 +1C90;GEORGIAN MTAVRULI CAPITAL LETTER AN;Lu;0;L;;;;;N;;;;10D0; +1C91;GEORGIAN MTAVRULI CAPITAL LETTER BAN;Lu;0;L;;;;;N;;;;10D1; +1C92;GEORGIAN MTAVRULI CAPITAL LETTER GAN;Lu;0;L;;;;;N;;;;10D2; +1C93;GEORGIAN MTAVRULI CAPITAL LETTER DON;Lu;0;L;;;;;N;;;;10D3; +1C94;GEORGIAN MTAVRULI CAPITAL LETTER EN;Lu;0;L;;;;;N;;;;10D4; +1C95;GEORGIAN MTAVRULI CAPITAL LETTER VIN;Lu;0;L;;;;;N;;;;10D5; +1C96;GEORGIAN MTAVRULI CAPITAL LETTER ZEN;Lu;0;L;;;;;N;;;;10D6; +1C97;GEORGIAN MTAVRULI CAPITAL LETTER TAN;Lu;0;L;;;;;N;;;;10D7; +1C98;GEORGIAN MTAVRULI CAPITAL LETTER IN;Lu;0;L;;;;;N;;;;10D8; +1C99;GEORGIAN MTAVRULI CAPITAL LETTER KAN;Lu;0;L;;;;;N;;;;10D9; +1C9A;GEORGIAN MTAVRULI CAPITAL LETTER LAS;Lu;0;L;;;;;N;;;;10DA; +1C9B;GEORGIAN MTAVRULI CAPITAL LETTER MAN;Lu;0;L;;;;;N;;;;10DB; +1C9C;GEORGIAN MTAVRULI CAPITAL LETTER NAR;Lu;0;L;;;;;N;;;;10DC; +1C9D;GEORGIAN MTAVRULI CAPITAL LETTER ON;Lu;0;L;;;;;N;;;;10DD; +1C9E;GEORGIAN MTAVRULI CAPITAL LETTER PAR;Lu;0;L;;;;;N;;;;10DE; +1C9F;GEORGIAN MTAVRULI CAPITAL LETTER ZHAR;Lu;0;L;;;;;N;;;;10DF; +1CA0;GEORGIAN MTAVRULI CAPITAL LETTER RAE;Lu;0;L;;;;;N;;;;10E0; +1CA1;GEORGIAN MTAVRULI CAPITAL LETTER SAN;Lu;0;L;;;;;N;;;;10E1; +1CA2;GEORGIAN MTAVRULI CAPITAL LETTER TAR;Lu;0;L;;;;;N;;;;10E2; +1CA3;GEORGIAN MTAVRULI CAPITAL LETTER UN;Lu;0;L;;;;;N;;;;10E3; +1CA4;GEORGIAN MTAVRULI CAPITAL LETTER PHAR;Lu;0;L;;;;;N;;;;10E4; +1CA5;GEORGIAN MTAVRULI CAPITAL LETTER KHAR;Lu;0;L;;;;;N;;;;10E5; +1CA6;GEORGIAN MTAVRULI CAPITAL LETTER GHAN;Lu;0;L;;;;;N;;;;10E6; +1CA7;GEORGIAN MTAVRULI CAPITAL LETTER QAR;Lu;0;L;;;;;N;;;;10E7; +1CA8;GEORGIAN MTAVRULI CAPITAL LETTER SHIN;Lu;0;L;;;;;N;;;;10E8; +1CA9;GEORGIAN MTAVRULI CAPITAL LETTER CHIN;Lu;0;L;;;;;N;;;;10E9; +1CAA;GEORGIAN MTAVRULI CAPITAL LETTER CAN;Lu;0;L;;;;;N;;;;10EA; +1CAB;GEORGIAN MTAVRULI CAPITAL LETTER JIL;Lu;0;L;;;;;N;;;;10EB; +1CAC;GEORGIAN MTAVRULI CAPITAL LETTER CIL;Lu;0;L;;;;;N;;;;10EC; +1CAD;GEORGIAN MTAVRULI CAPITAL LETTER CHAR;Lu;0;L;;;;;N;;;;10ED; +1CAE;GEORGIAN MTAVRULI CAPITAL LETTER XAN;Lu;0;L;;;;;N;;;;10EE; +1CAF;GEORGIAN MTAVRULI CAPITAL LETTER JHAN;Lu;0;L;;;;;N;;;;10EF; +1CB0;GEORGIAN MTAVRULI CAPITAL LETTER HAE;Lu;0;L;;;;;N;;;;10F0; +1CB1;GEORGIAN MTAVRULI CAPITAL LETTER HE;Lu;0;L;;;;;N;;;;10F1; +1CB2;GEORGIAN MTAVRULI CAPITAL LETTER HIE;Lu;0;L;;;;;N;;;;10F2; +1CB3;GEORGIAN MTAVRULI CAPITAL LETTER WE;Lu;0;L;;;;;N;;;;10F3; +1CB4;GEORGIAN MTAVRULI CAPITAL LETTER HAR;Lu;0;L;;;;;N;;;;10F4; +1CB5;GEORGIAN MTAVRULI CAPITAL LETTER HOE;Lu;0;L;;;;;N;;;;10F5; +1CB6;GEORGIAN MTAVRULI CAPITAL LETTER FI;Lu;0;L;;;;;N;;;;10F6; +1CB7;GEORGIAN MTAVRULI CAPITAL LETTER YN;Lu;0;L;;;;;N;;;;10F7; +1CB8;GEORGIAN MTAVRULI CAPITAL LETTER ELIFI;Lu;0;L;;;;;N;;;;10F8; +1CB9;GEORGIAN MTAVRULI CAPITAL LETTER TURNED GAN;Lu;0;L;;;;;N;;;;10F9; +1CBA;GEORGIAN MTAVRULI CAPITAL LETTER AIN;Lu;0;L;;;;;N;;;;10FA; +1CBD;GEORGIAN MTAVRULI CAPITAL LETTER AEN;Lu;0;L;;;;;N;;;;10FD; +1CBE;GEORGIAN MTAVRULI CAPITAL LETTER HARD SIGN;Lu;0;L;;;;;N;;;;10FE; +1CBF;GEORGIAN MTAVRULI CAPITAL LETTER LABIAL SIGN;Lu;0;L;;;;;N;;;;10FF; +1CC0;SUNDANESE PUNCTUATION BINDU SURYA;Po;0;L;;;;;N;;;;; +1CC1;SUNDANESE PUNCTUATION BINDU PANGLONG;Po;0;L;;;;;N;;;;; +1CC2;SUNDANESE PUNCTUATION BINDU PURNAMA;Po;0;L;;;;;N;;;;; +1CC3;SUNDANESE PUNCTUATION BINDU CAKRA;Po;0;L;;;;;N;;;;; +1CC4;SUNDANESE PUNCTUATION BINDU LEU SATANGA;Po;0;L;;;;;N;;;;; +1CC5;SUNDANESE PUNCTUATION BINDU KA SATANGA;Po;0;L;;;;;N;;;;; +1CC6;SUNDANESE PUNCTUATION BINDU DA SATANGA;Po;0;L;;;;;N;;;;; +1CC7;SUNDANESE PUNCTUATION BINDU BA SATANGA;Po;0;L;;;;;N;;;;; +1CD0;VEDIC TONE KARSHANA;Mn;230;NSM;;;;;N;;;;; +1CD1;VEDIC TONE SHARA;Mn;230;NSM;;;;;N;;;;; +1CD2;VEDIC TONE PRENKHA;Mn;230;NSM;;;;;N;;;;; +1CD3;VEDIC SIGN NIHSHVASA;Po;0;L;;;;;N;;;;; +1CD4;VEDIC SIGN YAJURVEDIC MIDLINE SVARITA;Mn;1;NSM;;;;;N;;;;; +1CD5;VEDIC TONE YAJURVEDIC AGGRAVATED INDEPENDENT SVARITA;Mn;220;NSM;;;;;N;;;;; +1CD6;VEDIC TONE YAJURVEDIC INDEPENDENT SVARITA;Mn;220;NSM;;;;;N;;;;; +1CD7;VEDIC TONE YAJURVEDIC KATHAKA INDEPENDENT SVARITA;Mn;220;NSM;;;;;N;;;;; +1CD8;VEDIC TONE CANDRA BELOW;Mn;220;NSM;;;;;N;;;;; +1CD9;VEDIC TONE YAJURVEDIC KATHAKA INDEPENDENT SVARITA SCHROEDER;Mn;220;NSM;;;;;N;;;;; +1CDA;VEDIC TONE DOUBLE SVARITA;Mn;230;NSM;;;;;N;;;;; +1CDB;VEDIC TONE TRIPLE SVARITA;Mn;230;NSM;;;;;N;;;;; +1CDC;VEDIC TONE KATHAKA ANUDATTA;Mn;220;NSM;;;;;N;;;;; +1CDD;VEDIC TONE DOT BELOW;Mn;220;NSM;;;;;N;;;;; +1CDE;VEDIC TONE TWO DOTS BELOW;Mn;220;NSM;;;;;N;;;;; +1CDF;VEDIC TONE THREE DOTS BELOW;Mn;220;NSM;;;;;N;;;;; +1CE0;VEDIC TONE RIGVEDIC KASHMIRI INDEPENDENT SVARITA;Mn;230;NSM;;;;;N;;;;; +1CE1;VEDIC TONE ATHARVAVEDIC INDEPENDENT SVARITA;Mc;0;L;;;;;N;;;;; +1CE2;VEDIC SIGN VISARGA SVARITA;Mn;1;NSM;;;;;N;;;;; +1CE3;VEDIC SIGN VISARGA UDATTA;Mn;1;NSM;;;;;N;;;;; +1CE4;VEDIC SIGN REVERSED VISARGA UDATTA;Mn;1;NSM;;;;;N;;;;; +1CE5;VEDIC SIGN VISARGA ANUDATTA;Mn;1;NSM;;;;;N;;;;; +1CE6;VEDIC SIGN REVERSED VISARGA ANUDATTA;Mn;1;NSM;;;;;N;;;;; +1CE7;VEDIC SIGN VISARGA UDATTA WITH TAIL;Mn;1;NSM;;;;;N;;;;; +1CE8;VEDIC SIGN VISARGA ANUDATTA WITH TAIL;Mn;1;NSM;;;;;N;;;;; +1CE9;VEDIC SIGN ANUSVARA ANTARGOMUKHA;Lo;0;L;;;;;N;;;;; +1CEA;VEDIC SIGN ANUSVARA BAHIRGOMUKHA;Lo;0;L;;;;;N;;;;; +1CEB;VEDIC SIGN ANUSVARA VAMAGOMUKHA;Lo;0;L;;;;;N;;;;; +1CEC;VEDIC SIGN ANUSVARA VAMAGOMUKHA WITH TAIL;Lo;0;L;;;;;N;;;;; +1CED;VEDIC SIGN TIRYAK;Mn;220;NSM;;;;;N;;;;; +1CEE;VEDIC SIGN HEXIFORM LONG ANUSVARA;Lo;0;L;;;;;N;;;;; +1CEF;VEDIC SIGN LONG ANUSVARA;Lo;0;L;;;;;N;;;;; +1CF0;VEDIC SIGN RTHANG LONG ANUSVARA;Lo;0;L;;;;;N;;;;; +1CF1;VEDIC SIGN ANUSVARA UBHAYATO MUKHA;Lo;0;L;;;;;N;;;;; +1CF2;VEDIC SIGN ARDHAVISARGA;Lo;0;L;;;;;N;;;;; +1CF3;VEDIC SIGN ROTATED ARDHAVISARGA;Lo;0;L;;;;;N;;;;; +1CF4;VEDIC TONE CANDRA ABOVE;Mn;230;NSM;;;;;N;;;;; +1CF5;VEDIC SIGN JIHVAMULIYA;Lo;0;L;;;;;N;;;;; +1CF6;VEDIC SIGN UPADHMANIYA;Lo;0;L;;;;;N;;;;; +1CF7;VEDIC SIGN ATIKRAMA;Mc;0;L;;;;;N;;;;; +1CF8;VEDIC TONE RING ABOVE;Mn;230;NSM;;;;;N;;;;; +1CF9;VEDIC TONE DOUBLE RING ABOVE;Mn;230;NSM;;;;;N;;;;; +1CFA;VEDIC SIGN DOUBLE ANUSVARA ANTARGOMUKHA;Lo;0;L;;;;;N;;;;; +1D00;LATIN LETTER SMALL CAPITAL A;Ll;0;L;;;;;N;;;;; +1D01;LATIN LETTER SMALL CAPITAL AE;Ll;0;L;;;;;N;;;;; +1D02;LATIN SMALL LETTER TURNED AE;Ll;0;L;;;;;N;;;;; +1D03;LATIN LETTER SMALL CAPITAL BARRED B;Ll;0;L;;;;;N;;;;; +1D04;LATIN LETTER SMALL CAPITAL C;Ll;0;L;;;;;N;;;;; +1D05;LATIN LETTER SMALL CAPITAL D;Ll;0;L;;;;;N;;;;; +1D06;LATIN LETTER SMALL CAPITAL ETH;Ll;0;L;;;;;N;;;;; +1D07;LATIN LETTER SMALL CAPITAL E;Ll;0;L;;;;;N;;;;; +1D08;LATIN SMALL LETTER TURNED OPEN E;Ll;0;L;;;;;N;;;;; +1D09;LATIN SMALL LETTER TURNED I;Ll;0;L;;;;;N;;;;; +1D0A;LATIN LETTER SMALL CAPITAL J;Ll;0;L;;;;;N;;;;; +1D0B;LATIN LETTER SMALL CAPITAL K;Ll;0;L;;;;;N;;;;; +1D0C;LATIN LETTER SMALL CAPITAL L WITH STROKE;Ll;0;L;;;;;N;;;;; +1D0D;LATIN LETTER SMALL CAPITAL M;Ll;0;L;;;;;N;;;;; +1D0E;LATIN LETTER SMALL CAPITAL REVERSED N;Ll;0;L;;;;;N;;;;; +1D0F;LATIN LETTER SMALL CAPITAL O;Ll;0;L;;;;;N;;;;; +1D10;LATIN LETTER SMALL CAPITAL OPEN O;Ll;0;L;;;;;N;;;;; +1D11;LATIN SMALL LETTER SIDEWAYS O;Ll;0;L;;;;;N;;;;; +1D12;LATIN SMALL LETTER SIDEWAYS OPEN O;Ll;0;L;;;;;N;;;;; +1D13;LATIN SMALL LETTER SIDEWAYS O WITH STROKE;Ll;0;L;;;;;N;;;;; +1D14;LATIN SMALL LETTER TURNED OE;Ll;0;L;;;;;N;;;;; +1D15;LATIN LETTER SMALL CAPITAL OU;Ll;0;L;;;;;N;;;;; +1D16;LATIN SMALL LETTER TOP HALF O;Ll;0;L;;;;;N;;;;; +1D17;LATIN SMALL LETTER BOTTOM HALF O;Ll;0;L;;;;;N;;;;; +1D18;LATIN LETTER SMALL CAPITAL P;Ll;0;L;;;;;N;;;;; +1D19;LATIN LETTER SMALL CAPITAL REVERSED R;Ll;0;L;;;;;N;;;;; +1D1A;LATIN LETTER SMALL CAPITAL TURNED R;Ll;0;L;;;;;N;;;;; +1D1B;LATIN LETTER SMALL CAPITAL T;Ll;0;L;;;;;N;;;;; +1D1C;LATIN LETTER SMALL CAPITAL U;Ll;0;L;;;;;N;;;;; +1D1D;LATIN SMALL LETTER SIDEWAYS U;Ll;0;L;;;;;N;;;;; +1D1E;LATIN SMALL LETTER SIDEWAYS DIAERESIZED U;Ll;0;L;;;;;N;;;;; +1D1F;LATIN SMALL LETTER SIDEWAYS TURNED M;Ll;0;L;;;;;N;;;;; +1D20;LATIN LETTER SMALL CAPITAL V;Ll;0;L;;;;;N;;;;; +1D21;LATIN LETTER SMALL CAPITAL W;Ll;0;L;;;;;N;;;;; +1D22;LATIN LETTER SMALL CAPITAL Z;Ll;0;L;;;;;N;;;;; +1D23;LATIN LETTER SMALL CAPITAL EZH;Ll;0;L;;;;;N;;;;; +1D24;LATIN LETTER VOICED LARYNGEAL SPIRANT;Ll;0;L;;;;;N;;;;; +1D25;LATIN LETTER AIN;Ll;0;L;;;;;N;;;;; +1D26;GREEK LETTER SMALL CAPITAL GAMMA;Ll;0;L;;;;;N;;;;; +1D27;GREEK LETTER SMALL CAPITAL LAMDA;Ll;0;L;;;;;N;;;;; +1D28;GREEK LETTER SMALL CAPITAL PI;Ll;0;L;;;;;N;;;;; +1D29;GREEK LETTER SMALL CAPITAL RHO;Ll;0;L;;;;;N;;;;; +1D2A;GREEK LETTER SMALL CAPITAL PSI;Ll;0;L;;;;;N;;;;; +1D2B;CYRILLIC LETTER SMALL CAPITAL EL;Ll;0;L;;;;;N;;;;; +1D2C;MODIFIER LETTER CAPITAL A;Lm;0;L; 0041;;;;N;;;;; +1D2D;MODIFIER LETTER CAPITAL AE;Lm;0;L; 00C6;;;;N;;;;; +1D2E;MODIFIER LETTER CAPITAL B;Lm;0;L; 0042;;;;N;;;;; +1D2F;MODIFIER LETTER CAPITAL BARRED B;Lm;0;L;;;;;N;;;;; +1D30;MODIFIER LETTER CAPITAL D;Lm;0;L; 0044;;;;N;;;;; +1D31;MODIFIER LETTER CAPITAL E;Lm;0;L; 0045;;;;N;;;;; +1D32;MODIFIER LETTER CAPITAL REVERSED E;Lm;0;L; 018E;;;;N;;;;; +1D33;MODIFIER LETTER CAPITAL G;Lm;0;L; 0047;;;;N;;;;; +1D34;MODIFIER LETTER CAPITAL H;Lm;0;L; 0048;;;;N;;;;; +1D35;MODIFIER LETTER CAPITAL I;Lm;0;L; 0049;;;;N;;;;; +1D36;MODIFIER LETTER CAPITAL J;Lm;0;L; 004A;;;;N;;;;; +1D37;MODIFIER LETTER CAPITAL K;Lm;0;L; 004B;;;;N;;;;; +1D38;MODIFIER LETTER CAPITAL L;Lm;0;L; 004C;;;;N;;;;; +1D39;MODIFIER LETTER CAPITAL M;Lm;0;L; 004D;;;;N;;;;; +1D3A;MODIFIER LETTER CAPITAL N;Lm;0;L; 004E;;;;N;;;;; +1D3B;MODIFIER LETTER CAPITAL REVERSED N;Lm;0;L;;;;;N;;;;; +1D3C;MODIFIER LETTER CAPITAL O;Lm;0;L; 004F;;;;N;;;;; +1D3D;MODIFIER LETTER CAPITAL OU;Lm;0;L; 0222;;;;N;;;;; +1D3E;MODIFIER LETTER CAPITAL P;Lm;0;L; 0050;;;;N;;;;; +1D3F;MODIFIER LETTER CAPITAL R;Lm;0;L; 0052;;;;N;;;;; +1D40;MODIFIER LETTER CAPITAL T;Lm;0;L; 0054;;;;N;;;;; +1D41;MODIFIER LETTER CAPITAL U;Lm;0;L; 0055;;;;N;;;;; +1D42;MODIFIER LETTER CAPITAL W;Lm;0;L; 0057;;;;N;;;;; +1D43;MODIFIER LETTER SMALL A;Lm;0;L; 0061;;;;N;;;;; +1D44;MODIFIER LETTER SMALL TURNED A;Lm;0;L; 0250;;;;N;;;;; +1D45;MODIFIER LETTER SMALL ALPHA;Lm;0;L; 0251;;;;N;;;;; +1D46;MODIFIER LETTER SMALL TURNED AE;Lm;0;L; 1D02;;;;N;;;;; +1D47;MODIFIER LETTER SMALL B;Lm;0;L; 0062;;;;N;;;;; +1D48;MODIFIER LETTER SMALL D;Lm;0;L; 0064;;;;N;;;;; +1D49;MODIFIER LETTER SMALL E;Lm;0;L; 0065;;;;N;;;;; +1D4A;MODIFIER LETTER SMALL SCHWA;Lm;0;L; 0259;;;;N;;;;; +1D4B;MODIFIER LETTER SMALL OPEN E;Lm;0;L; 025B;;;;N;;;;; +1D4C;MODIFIER LETTER SMALL TURNED OPEN E;Lm;0;L; 025C;;;;N;;;;; +1D4D;MODIFIER LETTER SMALL G;Lm;0;L; 0067;;;;N;;;;; +1D4E;MODIFIER LETTER SMALL TURNED I;Lm;0;L;;;;;N;;;;; +1D4F;MODIFIER LETTER SMALL K;Lm;0;L; 006B;;;;N;;;;; +1D50;MODIFIER LETTER SMALL M;Lm;0;L; 006D;;;;N;;;;; +1D51;MODIFIER LETTER SMALL ENG;Lm;0;L; 014B;;;;N;;;;; +1D52;MODIFIER LETTER SMALL O;Lm;0;L; 006F;;;;N;;;;; +1D53;MODIFIER LETTER SMALL OPEN O;Lm;0;L; 0254;;;;N;;;;; +1D54;MODIFIER LETTER SMALL TOP HALF O;Lm;0;L; 1D16;;;;N;;;;; +1D55;MODIFIER LETTER SMALL BOTTOM HALF O;Lm;0;L; 1D17;;;;N;;;;; +1D56;MODIFIER LETTER SMALL P;Lm;0;L; 0070;;;;N;;;;; +1D57;MODIFIER LETTER SMALL T;Lm;0;L; 0074;;;;N;;;;; +1D58;MODIFIER LETTER SMALL U;Lm;0;L; 0075;;;;N;;;;; +1D59;MODIFIER LETTER SMALL SIDEWAYS U;Lm;0;L; 1D1D;;;;N;;;;; +1D5A;MODIFIER LETTER SMALL TURNED M;Lm;0;L; 026F;;;;N;;;;; +1D5B;MODIFIER LETTER SMALL V;Lm;0;L; 0076;;;;N;;;;; +1D5C;MODIFIER LETTER SMALL AIN;Lm;0;L; 1D25;;;;N;;;;; +1D5D;MODIFIER LETTER SMALL BETA;Lm;0;L; 03B2;;;;N;;;;; +1D5E;MODIFIER LETTER SMALL GREEK GAMMA;Lm;0;L; 03B3;;;;N;;;;; +1D5F;MODIFIER LETTER SMALL DELTA;Lm;0;L; 03B4;;;;N;;;;; +1D60;MODIFIER LETTER SMALL GREEK PHI;Lm;0;L; 03C6;;;;N;;;;; +1D61;MODIFIER LETTER SMALL CHI;Lm;0;L; 03C7;;;;N;;;;; +1D62;LATIN SUBSCRIPT SMALL LETTER I;Lm;0;L; 0069;;;;N;;;;; +1D63;LATIN SUBSCRIPT SMALL LETTER R;Lm;0;L; 0072;;;;N;;;;; +1D64;LATIN SUBSCRIPT SMALL LETTER U;Lm;0;L; 0075;;;;N;;;;; +1D65;LATIN SUBSCRIPT SMALL LETTER V;Lm;0;L; 0076;;;;N;;;;; +1D66;GREEK SUBSCRIPT SMALL LETTER BETA;Lm;0;L; 03B2;;;;N;;;;; +1D67;GREEK SUBSCRIPT SMALL LETTER GAMMA;Lm;0;L; 03B3;;;;N;;;;; +1D68;GREEK SUBSCRIPT SMALL LETTER RHO;Lm;0;L; 03C1;;;;N;;;;; +1D69;GREEK SUBSCRIPT SMALL LETTER PHI;Lm;0;L; 03C6;;;;N;;;;; +1D6A;GREEK SUBSCRIPT SMALL LETTER CHI;Lm;0;L; 03C7;;;;N;;;;; +1D6B;LATIN SMALL LETTER UE;Ll;0;L;;;;;N;;;;; +1D6C;LATIN SMALL LETTER B WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;; +1D6D;LATIN SMALL LETTER D WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;; +1D6E;LATIN SMALL LETTER F WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;; +1D6F;LATIN SMALL LETTER M WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;; +1D70;LATIN SMALL LETTER N WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;; +1D71;LATIN SMALL LETTER P WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;; +1D72;LATIN SMALL LETTER R WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;; +1D73;LATIN SMALL LETTER R WITH FISHHOOK AND MIDDLE TILDE;Ll;0;L;;;;;N;;;;; +1D74;LATIN SMALL LETTER S WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;; +1D75;LATIN SMALL LETTER T WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;; +1D76;LATIN SMALL LETTER Z WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;; +1D77;LATIN SMALL LETTER TURNED G;Ll;0;L;;;;;N;;;;; +1D78;MODIFIER LETTER CYRILLIC EN;Lm;0;L; 043D;;;;N;;;;; +1D79;LATIN SMALL LETTER INSULAR G;Ll;0;L;;;;;N;;;A77D;;A77D +1D7A;LATIN SMALL LETTER TH WITH STRIKETHROUGH;Ll;0;L;;;;;N;;;;; +1D7B;LATIN SMALL CAPITAL LETTER I WITH STROKE;Ll;0;L;;;;;N;;;;; +1D7C;LATIN SMALL LETTER IOTA WITH STROKE;Ll;0;L;;;;;N;;;;; +1D7D;LATIN SMALL LETTER P WITH STROKE;Ll;0;L;;;;;N;;;2C63;;2C63 +1D7E;LATIN SMALL CAPITAL LETTER U WITH STROKE;Ll;0;L;;;;;N;;;;; +1D7F;LATIN SMALL LETTER UPSILON WITH STROKE;Ll;0;L;;;;;N;;;;; +1D80;LATIN SMALL LETTER B WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1D81;LATIN SMALL LETTER D WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1D82;LATIN SMALL LETTER F WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1D83;LATIN SMALL LETTER G WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1D84;LATIN SMALL LETTER K WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1D85;LATIN SMALL LETTER L WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1D86;LATIN SMALL LETTER M WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1D87;LATIN SMALL LETTER N WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1D88;LATIN SMALL LETTER P WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1D89;LATIN SMALL LETTER R WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1D8A;LATIN SMALL LETTER S WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1D8B;LATIN SMALL LETTER ESH WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1D8C;LATIN SMALL LETTER V WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1D8D;LATIN SMALL LETTER X WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1D8E;LATIN SMALL LETTER Z WITH PALATAL HOOK;Ll;0;L;;;;;N;;;A7C6;;A7C6 +1D8F;LATIN SMALL LETTER A WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;; +1D90;LATIN SMALL LETTER ALPHA WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;; +1D91;LATIN SMALL LETTER D WITH HOOK AND TAIL;Ll;0;L;;;;;N;;;;; +1D92;LATIN SMALL LETTER E WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;; +1D93;LATIN SMALL LETTER OPEN E WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;; +1D94;LATIN SMALL LETTER REVERSED OPEN E WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;; +1D95;LATIN SMALL LETTER SCHWA WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;; +1D96;LATIN SMALL LETTER I WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;; +1D97;LATIN SMALL LETTER OPEN O WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;; +1D98;LATIN SMALL LETTER ESH WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;; +1D99;LATIN SMALL LETTER U WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;; +1D9A;LATIN SMALL LETTER EZH WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;; +1D9B;MODIFIER LETTER SMALL TURNED ALPHA;Lm;0;L; 0252;;;;N;;;;; +1D9C;MODIFIER LETTER SMALL C;Lm;0;L; 0063;;;;N;;;;; +1D9D;MODIFIER LETTER SMALL C WITH CURL;Lm;0;L; 0255;;;;N;;;;; +1D9E;MODIFIER LETTER SMALL ETH;Lm;0;L; 00F0;;;;N;;;;; +1D9F;MODIFIER LETTER SMALL REVERSED OPEN E;Lm;0;L; 025C;;;;N;;;;; +1DA0;MODIFIER LETTER SMALL F;Lm;0;L; 0066;;;;N;;;;; +1DA1;MODIFIER LETTER SMALL DOTLESS J WITH STROKE;Lm;0;L; 025F;;;;N;;;;; +1DA2;MODIFIER LETTER SMALL SCRIPT G;Lm;0;L; 0261;;;;N;;;;; +1DA3;MODIFIER LETTER SMALL TURNED H;Lm;0;L; 0265;;;;N;;;;; +1DA4;MODIFIER LETTER SMALL I WITH STROKE;Lm;0;L; 0268;;;;N;;;;; +1DA5;MODIFIER LETTER SMALL IOTA;Lm;0;L; 0269;;;;N;;;;; +1DA6;MODIFIER LETTER SMALL CAPITAL I;Lm;0;L; 026A;;;;N;;;;; +1DA7;MODIFIER LETTER SMALL CAPITAL I WITH STROKE;Lm;0;L; 1D7B;;;;N;;;;; +1DA8;MODIFIER LETTER SMALL J WITH CROSSED-TAIL;Lm;0;L; 029D;;;;N;;;;; +1DA9;MODIFIER LETTER SMALL L WITH RETROFLEX HOOK;Lm;0;L; 026D;;;;N;;;;; +1DAA;MODIFIER LETTER SMALL L WITH PALATAL HOOK;Lm;0;L; 1D85;;;;N;;;;; +1DAB;MODIFIER LETTER SMALL CAPITAL L;Lm;0;L; 029F;;;;N;;;;; +1DAC;MODIFIER LETTER SMALL M WITH HOOK;Lm;0;L; 0271;;;;N;;;;; +1DAD;MODIFIER LETTER SMALL TURNED M WITH LONG LEG;Lm;0;L; 0270;;;;N;;;;; +1DAE;MODIFIER LETTER SMALL N WITH LEFT HOOK;Lm;0;L; 0272;;;;N;;;;; +1DAF;MODIFIER LETTER SMALL N WITH RETROFLEX HOOK;Lm;0;L; 0273;;;;N;;;;; +1DB0;MODIFIER LETTER SMALL CAPITAL N;Lm;0;L; 0274;;;;N;;;;; +1DB1;MODIFIER LETTER SMALL BARRED O;Lm;0;L; 0275;;;;N;;;;; +1DB2;MODIFIER LETTER SMALL PHI;Lm;0;L; 0278;;;;N;;;;; +1DB3;MODIFIER LETTER SMALL S WITH HOOK;Lm;0;L; 0282;;;;N;;;;; +1DB4;MODIFIER LETTER SMALL ESH;Lm;0;L; 0283;;;;N;;;;; +1DB5;MODIFIER LETTER SMALL T WITH PALATAL HOOK;Lm;0;L; 01AB;;;;N;;;;; +1DB6;MODIFIER LETTER SMALL U BAR;Lm;0;L; 0289;;;;N;;;;; +1DB7;MODIFIER LETTER SMALL UPSILON;Lm;0;L; 028A;;;;N;;;;; +1DB8;MODIFIER LETTER SMALL CAPITAL U;Lm;0;L; 1D1C;;;;N;;;;; +1DB9;MODIFIER LETTER SMALL V WITH HOOK;Lm;0;L; 028B;;;;N;;;;; +1DBA;MODIFIER LETTER SMALL TURNED V;Lm;0;L; 028C;;;;N;;;;; +1DBB;MODIFIER LETTER SMALL Z;Lm;0;L; 007A;;;;N;;;;; +1DBC;MODIFIER LETTER SMALL Z WITH RETROFLEX HOOK;Lm;0;L; 0290;;;;N;;;;; +1DBD;MODIFIER LETTER SMALL Z WITH CURL;Lm;0;L; 0291;;;;N;;;;; +1DBE;MODIFIER LETTER SMALL EZH;Lm;0;L; 0292;;;;N;;;;; +1DBF;MODIFIER LETTER SMALL THETA;Lm;0;L; 03B8;;;;N;;;;; +1DC0;COMBINING DOTTED GRAVE ACCENT;Mn;230;NSM;;;;;N;;;;; +1DC1;COMBINING DOTTED ACUTE ACCENT;Mn;230;NSM;;;;;N;;;;; +1DC2;COMBINING SNAKE BELOW;Mn;220;NSM;;;;;N;;;;; +1DC3;COMBINING SUSPENSION MARK;Mn;230;NSM;;;;;N;;;;; +1DC4;COMBINING MACRON-ACUTE;Mn;230;NSM;;;;;N;;;;; +1DC5;COMBINING GRAVE-MACRON;Mn;230;NSM;;;;;N;;;;; +1DC6;COMBINING MACRON-GRAVE;Mn;230;NSM;;;;;N;;;;; +1DC7;COMBINING ACUTE-MACRON;Mn;230;NSM;;;;;N;;;;; +1DC8;COMBINING GRAVE-ACUTE-GRAVE;Mn;230;NSM;;;;;N;;;;; +1DC9;COMBINING ACUTE-GRAVE-ACUTE;Mn;230;NSM;;;;;N;;;;; +1DCA;COMBINING LATIN SMALL LETTER R BELOW;Mn;220;NSM;;;;;N;;;;; +1DCB;COMBINING BREVE-MACRON;Mn;230;NSM;;;;;N;;;;; +1DCC;COMBINING MACRON-BREVE;Mn;230;NSM;;;;;N;;;;; +1DCD;COMBINING DOUBLE CIRCUMFLEX ABOVE;Mn;234;NSM;;;;;N;;;;; +1DCE;COMBINING OGONEK ABOVE;Mn;214;NSM;;;;;N;;;;; +1DCF;COMBINING ZIGZAG BELOW;Mn;220;NSM;;;;;N;;;;; +1DD0;COMBINING IS BELOW;Mn;202;NSM;;;;;N;;;;; +1DD1;COMBINING UR ABOVE;Mn;230;NSM;;;;;N;;;;; +1DD2;COMBINING US ABOVE;Mn;230;NSM;;;;;N;;;;; +1DD3;COMBINING LATIN SMALL LETTER FLATTENED OPEN A ABOVE;Mn;230;NSM;;;;;N;;;;; +1DD4;COMBINING LATIN SMALL LETTER AE;Mn;230;NSM;;;;;N;;;;; +1DD5;COMBINING LATIN SMALL LETTER AO;Mn;230;NSM;;;;;N;;;;; +1DD6;COMBINING LATIN SMALL LETTER AV;Mn;230;NSM;;;;;N;;;;; +1DD7;COMBINING LATIN SMALL LETTER C CEDILLA;Mn;230;NSM;;;;;N;;;;; +1DD8;COMBINING LATIN SMALL LETTER INSULAR D;Mn;230;NSM;;;;;N;;;;; +1DD9;COMBINING LATIN SMALL LETTER ETH;Mn;230;NSM;;;;;N;;;;; +1DDA;COMBINING LATIN SMALL LETTER G;Mn;230;NSM;;;;;N;;;;; +1DDB;COMBINING LATIN LETTER SMALL CAPITAL G;Mn;230;NSM;;;;;N;;;;; +1DDC;COMBINING LATIN SMALL LETTER K;Mn;230;NSM;;;;;N;;;;; +1DDD;COMBINING LATIN SMALL LETTER L;Mn;230;NSM;;;;;N;;;;; +1DDE;COMBINING LATIN LETTER SMALL CAPITAL L;Mn;230;NSM;;;;;N;;;;; +1DDF;COMBINING LATIN LETTER SMALL CAPITAL M;Mn;230;NSM;;;;;N;;;;; +1DE0;COMBINING LATIN SMALL LETTER N;Mn;230;NSM;;;;;N;;;;; +1DE1;COMBINING LATIN LETTER SMALL CAPITAL N;Mn;230;NSM;;;;;N;;;;; +1DE2;COMBINING LATIN LETTER SMALL CAPITAL R;Mn;230;NSM;;;;;N;;;;; +1DE3;COMBINING LATIN SMALL LETTER R ROTUNDA;Mn;230;NSM;;;;;N;;;;; +1DE4;COMBINING LATIN SMALL LETTER S;Mn;230;NSM;;;;;N;;;;; +1DE5;COMBINING LATIN SMALL LETTER LONG S;Mn;230;NSM;;;;;N;;;;; +1DE6;COMBINING LATIN SMALL LETTER Z;Mn;230;NSM;;;;;N;;;;; +1DE7;COMBINING LATIN SMALL LETTER ALPHA;Mn;230;NSM;;;;;N;;;;; +1DE8;COMBINING LATIN SMALL LETTER B;Mn;230;NSM;;;;;N;;;;; +1DE9;COMBINING LATIN SMALL LETTER BETA;Mn;230;NSM;;;;;N;;;;; +1DEA;COMBINING LATIN SMALL LETTER SCHWA;Mn;230;NSM;;;;;N;;;;; +1DEB;COMBINING LATIN SMALL LETTER F;Mn;230;NSM;;;;;N;;;;; +1DEC;COMBINING LATIN SMALL LETTER L WITH DOUBLE MIDDLE TILDE;Mn;230;NSM;;;;;N;;;;; +1DED;COMBINING LATIN SMALL LETTER O WITH LIGHT CENTRALIZATION STROKE;Mn;230;NSM;;;;;N;;;;; +1DEE;COMBINING LATIN SMALL LETTER P;Mn;230;NSM;;;;;N;;;;; +1DEF;COMBINING LATIN SMALL LETTER ESH;Mn;230;NSM;;;;;N;;;;; +1DF0;COMBINING LATIN SMALL LETTER U WITH LIGHT CENTRALIZATION STROKE;Mn;230;NSM;;;;;N;;;;; +1DF1;COMBINING LATIN SMALL LETTER W;Mn;230;NSM;;;;;N;;;;; +1DF2;COMBINING LATIN SMALL LETTER A WITH DIAERESIS;Mn;230;NSM;;;;;N;;;;; +1DF3;COMBINING LATIN SMALL LETTER O WITH DIAERESIS;Mn;230;NSM;;;;;N;;;;; +1DF4;COMBINING LATIN SMALL LETTER U WITH DIAERESIS;Mn;230;NSM;;;;;N;;;;; +1DF5;COMBINING UP TACK ABOVE;Mn;230;NSM;;;;;N;;;;; +1DF6;COMBINING KAVYKA ABOVE RIGHT;Mn;232;NSM;;;;;N;;;;; +1DF7;COMBINING KAVYKA ABOVE LEFT;Mn;228;NSM;;;;;N;;;;; +1DF8;COMBINING DOT ABOVE LEFT;Mn;228;NSM;;;;;N;;;;; +1DF9;COMBINING WIDE INVERTED BRIDGE BELOW;Mn;220;NSM;;;;;N;;;;; +1DFA;COMBINING DOT BELOW LEFT;Mn;218;NSM;;;;;N;;;;; +1DFB;COMBINING DELETION MARK;Mn;230;NSM;;;;;N;;;;; +1DFC;COMBINING DOUBLE INVERTED BREVE BELOW;Mn;233;NSM;;;;;N;;;;; +1DFD;COMBINING ALMOST EQUAL TO BELOW;Mn;220;NSM;;;;;N;;;;; +1DFE;COMBINING LEFT ARROWHEAD ABOVE;Mn;230;NSM;;;;;N;;;;; +1DFF;COMBINING RIGHT ARROWHEAD AND DOWN ARROWHEAD BELOW;Mn;220;NSM;;;;;N;;;;; +1E00;LATIN CAPITAL LETTER A WITH RING BELOW;Lu;0;L;0041 0325;;;;N;;;;1E01; +1E01;LATIN SMALL LETTER A WITH RING BELOW;Ll;0;L;0061 0325;;;;N;;;1E00;;1E00 +1E02;LATIN CAPITAL LETTER B WITH DOT ABOVE;Lu;0;L;0042 0307;;;;N;;;;1E03; +1E03;LATIN SMALL LETTER B WITH DOT ABOVE;Ll;0;L;0062 0307;;;;N;;;1E02;;1E02 +1E04;LATIN CAPITAL LETTER B WITH DOT BELOW;Lu;0;L;0042 0323;;;;N;;;;1E05; +1E05;LATIN SMALL LETTER B WITH DOT BELOW;Ll;0;L;0062 0323;;;;N;;;1E04;;1E04 +1E06;LATIN CAPITAL LETTER B WITH LINE BELOW;Lu;0;L;0042 0331;;;;N;;;;1E07; +1E07;LATIN SMALL LETTER B WITH LINE BELOW;Ll;0;L;0062 0331;;;;N;;;1E06;;1E06 +1E08;LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE;Lu;0;L;00C7 0301;;;;N;;;;1E09; +1E09;LATIN SMALL LETTER C WITH CEDILLA AND ACUTE;Ll;0;L;00E7 0301;;;;N;;;1E08;;1E08 +1E0A;LATIN CAPITAL LETTER D WITH DOT ABOVE;Lu;0;L;0044 0307;;;;N;;;;1E0B; +1E0B;LATIN SMALL LETTER D WITH DOT ABOVE;Ll;0;L;0064 0307;;;;N;;;1E0A;;1E0A +1E0C;LATIN CAPITAL LETTER D WITH DOT BELOW;Lu;0;L;0044 0323;;;;N;;;;1E0D; +1E0D;LATIN SMALL LETTER D WITH DOT BELOW;Ll;0;L;0064 0323;;;;N;;;1E0C;;1E0C +1E0E;LATIN CAPITAL LETTER D WITH LINE BELOW;Lu;0;L;0044 0331;;;;N;;;;1E0F; +1E0F;LATIN SMALL LETTER D WITH LINE BELOW;Ll;0;L;0064 0331;;;;N;;;1E0E;;1E0E +1E10;LATIN CAPITAL LETTER D WITH CEDILLA;Lu;0;L;0044 0327;;;;N;;;;1E11; +1E11;LATIN SMALL LETTER D WITH CEDILLA;Ll;0;L;0064 0327;;;;N;;;1E10;;1E10 +1E12;LATIN CAPITAL LETTER D WITH CIRCUMFLEX BELOW;Lu;0;L;0044 032D;;;;N;;;;1E13; +1E13;LATIN SMALL LETTER D WITH CIRCUMFLEX BELOW;Ll;0;L;0064 032D;;;;N;;;1E12;;1E12 +1E14;LATIN CAPITAL LETTER E WITH MACRON AND GRAVE;Lu;0;L;0112 0300;;;;N;;;;1E15; +1E15;LATIN SMALL LETTER E WITH MACRON AND GRAVE;Ll;0;L;0113 0300;;;;N;;;1E14;;1E14 +1E16;LATIN CAPITAL LETTER E WITH MACRON AND ACUTE;Lu;0;L;0112 0301;;;;N;;;;1E17; +1E17;LATIN SMALL LETTER E WITH MACRON AND ACUTE;Ll;0;L;0113 0301;;;;N;;;1E16;;1E16 +1E18;LATIN CAPITAL LETTER E WITH CIRCUMFLEX BELOW;Lu;0;L;0045 032D;;;;N;;;;1E19; +1E19;LATIN SMALL LETTER E WITH CIRCUMFLEX BELOW;Ll;0;L;0065 032D;;;;N;;;1E18;;1E18 +1E1A;LATIN CAPITAL LETTER E WITH TILDE BELOW;Lu;0;L;0045 0330;;;;N;;;;1E1B; +1E1B;LATIN SMALL LETTER E WITH TILDE BELOW;Ll;0;L;0065 0330;;;;N;;;1E1A;;1E1A +1E1C;LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE;Lu;0;L;0228 0306;;;;N;;;;1E1D; +1E1D;LATIN SMALL LETTER E WITH CEDILLA AND BREVE;Ll;0;L;0229 0306;;;;N;;;1E1C;;1E1C +1E1E;LATIN CAPITAL LETTER F WITH DOT ABOVE;Lu;0;L;0046 0307;;;;N;;;;1E1F; +1E1F;LATIN SMALL LETTER F WITH DOT ABOVE;Ll;0;L;0066 0307;;;;N;;;1E1E;;1E1E +1E20;LATIN CAPITAL LETTER G WITH MACRON;Lu;0;L;0047 0304;;;;N;;;;1E21; +1E21;LATIN SMALL LETTER G WITH MACRON;Ll;0;L;0067 0304;;;;N;;;1E20;;1E20 +1E22;LATIN CAPITAL LETTER H WITH DOT ABOVE;Lu;0;L;0048 0307;;;;N;;;;1E23; +1E23;LATIN SMALL LETTER H WITH DOT ABOVE;Ll;0;L;0068 0307;;;;N;;;1E22;;1E22 +1E24;LATIN CAPITAL LETTER H WITH DOT BELOW;Lu;0;L;0048 0323;;;;N;;;;1E25; +1E25;LATIN SMALL LETTER H WITH DOT BELOW;Ll;0;L;0068 0323;;;;N;;;1E24;;1E24 +1E26;LATIN CAPITAL LETTER H WITH DIAERESIS;Lu;0;L;0048 0308;;;;N;;;;1E27; +1E27;LATIN SMALL LETTER H WITH DIAERESIS;Ll;0;L;0068 0308;;;;N;;;1E26;;1E26 +1E28;LATIN CAPITAL LETTER H WITH CEDILLA;Lu;0;L;0048 0327;;;;N;;;;1E29; +1E29;LATIN SMALL LETTER H WITH CEDILLA;Ll;0;L;0068 0327;;;;N;;;1E28;;1E28 +1E2A;LATIN CAPITAL LETTER H WITH BREVE BELOW;Lu;0;L;0048 032E;;;;N;;;;1E2B; +1E2B;LATIN SMALL LETTER H WITH BREVE BELOW;Ll;0;L;0068 032E;;;;N;;;1E2A;;1E2A +1E2C;LATIN CAPITAL LETTER I WITH TILDE BELOW;Lu;0;L;0049 0330;;;;N;;;;1E2D; +1E2D;LATIN SMALL LETTER I WITH TILDE BELOW;Ll;0;L;0069 0330;;;;N;;;1E2C;;1E2C +1E2E;LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE;Lu;0;L;00CF 0301;;;;N;;;;1E2F; +1E2F;LATIN SMALL LETTER I WITH DIAERESIS AND ACUTE;Ll;0;L;00EF 0301;;;;N;;;1E2E;;1E2E +1E30;LATIN CAPITAL LETTER K WITH ACUTE;Lu;0;L;004B 0301;;;;N;;;;1E31; +1E31;LATIN SMALL LETTER K WITH ACUTE;Ll;0;L;006B 0301;;;;N;;;1E30;;1E30 +1E32;LATIN CAPITAL LETTER K WITH DOT BELOW;Lu;0;L;004B 0323;;;;N;;;;1E33; +1E33;LATIN SMALL LETTER K WITH DOT BELOW;Ll;0;L;006B 0323;;;;N;;;1E32;;1E32 +1E34;LATIN CAPITAL LETTER K WITH LINE BELOW;Lu;0;L;004B 0331;;;;N;;;;1E35; +1E35;LATIN SMALL LETTER K WITH LINE BELOW;Ll;0;L;006B 0331;;;;N;;;1E34;;1E34 +1E36;LATIN CAPITAL LETTER L WITH DOT BELOW;Lu;0;L;004C 0323;;;;N;;;;1E37; +1E37;LATIN SMALL LETTER L WITH DOT BELOW;Ll;0;L;006C 0323;;;;N;;;1E36;;1E36 +1E38;LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON;Lu;0;L;1E36 0304;;;;N;;;;1E39; +1E39;LATIN SMALL LETTER L WITH DOT BELOW AND MACRON;Ll;0;L;1E37 0304;;;;N;;;1E38;;1E38 +1E3A;LATIN CAPITAL LETTER L WITH LINE BELOW;Lu;0;L;004C 0331;;;;N;;;;1E3B; +1E3B;LATIN SMALL LETTER L WITH LINE BELOW;Ll;0;L;006C 0331;;;;N;;;1E3A;;1E3A +1E3C;LATIN CAPITAL LETTER L WITH CIRCUMFLEX BELOW;Lu;0;L;004C 032D;;;;N;;;;1E3D; +1E3D;LATIN SMALL LETTER L WITH CIRCUMFLEX BELOW;Ll;0;L;006C 032D;;;;N;;;1E3C;;1E3C +1E3E;LATIN CAPITAL LETTER M WITH ACUTE;Lu;0;L;004D 0301;;;;N;;;;1E3F; +1E3F;LATIN SMALL LETTER M WITH ACUTE;Ll;0;L;006D 0301;;;;N;;;1E3E;;1E3E +1E40;LATIN CAPITAL LETTER M WITH DOT ABOVE;Lu;0;L;004D 0307;;;;N;;;;1E41; +1E41;LATIN SMALL LETTER M WITH DOT ABOVE;Ll;0;L;006D 0307;;;;N;;;1E40;;1E40 +1E42;LATIN CAPITAL LETTER M WITH DOT BELOW;Lu;0;L;004D 0323;;;;N;;;;1E43; +1E43;LATIN SMALL LETTER M WITH DOT BELOW;Ll;0;L;006D 0323;;;;N;;;1E42;;1E42 +1E44;LATIN CAPITAL LETTER N WITH DOT ABOVE;Lu;0;L;004E 0307;;;;N;;;;1E45; +1E45;LATIN SMALL LETTER N WITH DOT ABOVE;Ll;0;L;006E 0307;;;;N;;;1E44;;1E44 +1E46;LATIN CAPITAL LETTER N WITH DOT BELOW;Lu;0;L;004E 0323;;;;N;;;;1E47; +1E47;LATIN SMALL LETTER N WITH DOT BELOW;Ll;0;L;006E 0323;;;;N;;;1E46;;1E46 +1E48;LATIN CAPITAL LETTER N WITH LINE BELOW;Lu;0;L;004E 0331;;;;N;;;;1E49; +1E49;LATIN SMALL LETTER N WITH LINE BELOW;Ll;0;L;006E 0331;;;;N;;;1E48;;1E48 +1E4A;LATIN CAPITAL LETTER N WITH CIRCUMFLEX BELOW;Lu;0;L;004E 032D;;;;N;;;;1E4B; +1E4B;LATIN SMALL LETTER N WITH CIRCUMFLEX BELOW;Ll;0;L;006E 032D;;;;N;;;1E4A;;1E4A +1E4C;LATIN CAPITAL LETTER O WITH TILDE AND ACUTE;Lu;0;L;00D5 0301;;;;N;;;;1E4D; +1E4D;LATIN SMALL LETTER O WITH TILDE AND ACUTE;Ll;0;L;00F5 0301;;;;N;;;1E4C;;1E4C +1E4E;LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS;Lu;0;L;00D5 0308;;;;N;;;;1E4F; +1E4F;LATIN SMALL LETTER O WITH TILDE AND DIAERESIS;Ll;0;L;00F5 0308;;;;N;;;1E4E;;1E4E +1E50;LATIN CAPITAL LETTER O WITH MACRON AND GRAVE;Lu;0;L;014C 0300;;;;N;;;;1E51; +1E51;LATIN SMALL LETTER O WITH MACRON AND GRAVE;Ll;0;L;014D 0300;;;;N;;;1E50;;1E50 +1E52;LATIN CAPITAL LETTER O WITH MACRON AND ACUTE;Lu;0;L;014C 0301;;;;N;;;;1E53; +1E53;LATIN SMALL LETTER O WITH MACRON AND ACUTE;Ll;0;L;014D 0301;;;;N;;;1E52;;1E52 +1E54;LATIN CAPITAL LETTER P WITH ACUTE;Lu;0;L;0050 0301;;;;N;;;;1E55; +1E55;LATIN SMALL LETTER P WITH ACUTE;Ll;0;L;0070 0301;;;;N;;;1E54;;1E54 +1E56;LATIN CAPITAL LETTER P WITH DOT ABOVE;Lu;0;L;0050 0307;;;;N;;;;1E57; +1E57;LATIN SMALL LETTER P WITH DOT ABOVE;Ll;0;L;0070 0307;;;;N;;;1E56;;1E56 +1E58;LATIN CAPITAL LETTER R WITH DOT ABOVE;Lu;0;L;0052 0307;;;;N;;;;1E59; +1E59;LATIN SMALL LETTER R WITH DOT ABOVE;Ll;0;L;0072 0307;;;;N;;;1E58;;1E58 +1E5A;LATIN CAPITAL LETTER R WITH DOT BELOW;Lu;0;L;0052 0323;;;;N;;;;1E5B; +1E5B;LATIN SMALL LETTER R WITH DOT BELOW;Ll;0;L;0072 0323;;;;N;;;1E5A;;1E5A +1E5C;LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON;Lu;0;L;1E5A 0304;;;;N;;;;1E5D; +1E5D;LATIN SMALL LETTER R WITH DOT BELOW AND MACRON;Ll;0;L;1E5B 0304;;;;N;;;1E5C;;1E5C +1E5E;LATIN CAPITAL LETTER R WITH LINE BELOW;Lu;0;L;0052 0331;;;;N;;;;1E5F; +1E5F;LATIN SMALL LETTER R WITH LINE BELOW;Ll;0;L;0072 0331;;;;N;;;1E5E;;1E5E +1E60;LATIN CAPITAL LETTER S WITH DOT ABOVE;Lu;0;L;0053 0307;;;;N;;;;1E61; +1E61;LATIN SMALL LETTER S WITH DOT ABOVE;Ll;0;L;0073 0307;;;;N;;;1E60;;1E60 +1E62;LATIN CAPITAL LETTER S WITH DOT BELOW;Lu;0;L;0053 0323;;;;N;;;;1E63; +1E63;LATIN SMALL LETTER S WITH DOT BELOW;Ll;0;L;0073 0323;;;;N;;;1E62;;1E62 +1E64;LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE;Lu;0;L;015A 0307;;;;N;;;;1E65; +1E65;LATIN SMALL LETTER S WITH ACUTE AND DOT ABOVE;Ll;0;L;015B 0307;;;;N;;;1E64;;1E64 +1E66;LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE;Lu;0;L;0160 0307;;;;N;;;;1E67; +1E67;LATIN SMALL LETTER S WITH CARON AND DOT ABOVE;Ll;0;L;0161 0307;;;;N;;;1E66;;1E66 +1E68;LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE;Lu;0;L;1E62 0307;;;;N;;;;1E69; +1E69;LATIN SMALL LETTER S WITH DOT BELOW AND DOT ABOVE;Ll;0;L;1E63 0307;;;;N;;;1E68;;1E68 +1E6A;LATIN CAPITAL LETTER T WITH DOT ABOVE;Lu;0;L;0054 0307;;;;N;;;;1E6B; +1E6B;LATIN SMALL LETTER T WITH DOT ABOVE;Ll;0;L;0074 0307;;;;N;;;1E6A;;1E6A +1E6C;LATIN CAPITAL LETTER T WITH DOT BELOW;Lu;0;L;0054 0323;;;;N;;;;1E6D; +1E6D;LATIN SMALL LETTER T WITH DOT BELOW;Ll;0;L;0074 0323;;;;N;;;1E6C;;1E6C +1E6E;LATIN CAPITAL LETTER T WITH LINE BELOW;Lu;0;L;0054 0331;;;;N;;;;1E6F; +1E6F;LATIN SMALL LETTER T WITH LINE BELOW;Ll;0;L;0074 0331;;;;N;;;1E6E;;1E6E +1E70;LATIN CAPITAL LETTER T WITH CIRCUMFLEX BELOW;Lu;0;L;0054 032D;;;;N;;;;1E71; +1E71;LATIN SMALL LETTER T WITH CIRCUMFLEX BELOW;Ll;0;L;0074 032D;;;;N;;;1E70;;1E70 +1E72;LATIN CAPITAL LETTER U WITH DIAERESIS BELOW;Lu;0;L;0055 0324;;;;N;;;;1E73; +1E73;LATIN SMALL LETTER U WITH DIAERESIS BELOW;Ll;0;L;0075 0324;;;;N;;;1E72;;1E72 +1E74;LATIN CAPITAL LETTER U WITH TILDE BELOW;Lu;0;L;0055 0330;;;;N;;;;1E75; +1E75;LATIN SMALL LETTER U WITH TILDE BELOW;Ll;0;L;0075 0330;;;;N;;;1E74;;1E74 +1E76;LATIN CAPITAL LETTER U WITH CIRCUMFLEX BELOW;Lu;0;L;0055 032D;;;;N;;;;1E77; +1E77;LATIN SMALL LETTER U WITH CIRCUMFLEX BELOW;Ll;0;L;0075 032D;;;;N;;;1E76;;1E76 +1E78;LATIN CAPITAL LETTER U WITH TILDE AND ACUTE;Lu;0;L;0168 0301;;;;N;;;;1E79; +1E79;LATIN SMALL LETTER U WITH TILDE AND ACUTE;Ll;0;L;0169 0301;;;;N;;;1E78;;1E78 +1E7A;LATIN CAPITAL LETTER U WITH MACRON AND DIAERESIS;Lu;0;L;016A 0308;;;;N;;;;1E7B; +1E7B;LATIN SMALL LETTER U WITH MACRON AND DIAERESIS;Ll;0;L;016B 0308;;;;N;;;1E7A;;1E7A +1E7C;LATIN CAPITAL LETTER V WITH TILDE;Lu;0;L;0056 0303;;;;N;;;;1E7D; +1E7D;LATIN SMALL LETTER V WITH TILDE;Ll;0;L;0076 0303;;;;N;;;1E7C;;1E7C +1E7E;LATIN CAPITAL LETTER V WITH DOT BELOW;Lu;0;L;0056 0323;;;;N;;;;1E7F; +1E7F;LATIN SMALL LETTER V WITH DOT BELOW;Ll;0;L;0076 0323;;;;N;;;1E7E;;1E7E +1E80;LATIN CAPITAL LETTER W WITH GRAVE;Lu;0;L;0057 0300;;;;N;;;;1E81; +1E81;LATIN SMALL LETTER W WITH GRAVE;Ll;0;L;0077 0300;;;;N;;;1E80;;1E80 +1E82;LATIN CAPITAL LETTER W WITH ACUTE;Lu;0;L;0057 0301;;;;N;;;;1E83; +1E83;LATIN SMALL LETTER W WITH ACUTE;Ll;0;L;0077 0301;;;;N;;;1E82;;1E82 +1E84;LATIN CAPITAL LETTER W WITH DIAERESIS;Lu;0;L;0057 0308;;;;N;;;;1E85; +1E85;LATIN SMALL LETTER W WITH DIAERESIS;Ll;0;L;0077 0308;;;;N;;;1E84;;1E84 +1E86;LATIN CAPITAL LETTER W WITH DOT ABOVE;Lu;0;L;0057 0307;;;;N;;;;1E87; +1E87;LATIN SMALL LETTER W WITH DOT ABOVE;Ll;0;L;0077 0307;;;;N;;;1E86;;1E86 +1E88;LATIN CAPITAL LETTER W WITH DOT BELOW;Lu;0;L;0057 0323;;;;N;;;;1E89; +1E89;LATIN SMALL LETTER W WITH DOT BELOW;Ll;0;L;0077 0323;;;;N;;;1E88;;1E88 +1E8A;LATIN CAPITAL LETTER X WITH DOT ABOVE;Lu;0;L;0058 0307;;;;N;;;;1E8B; +1E8B;LATIN SMALL LETTER X WITH DOT ABOVE;Ll;0;L;0078 0307;;;;N;;;1E8A;;1E8A +1E8C;LATIN CAPITAL LETTER X WITH DIAERESIS;Lu;0;L;0058 0308;;;;N;;;;1E8D; +1E8D;LATIN SMALL LETTER X WITH DIAERESIS;Ll;0;L;0078 0308;;;;N;;;1E8C;;1E8C +1E8E;LATIN CAPITAL LETTER Y WITH DOT ABOVE;Lu;0;L;0059 0307;;;;N;;;;1E8F; +1E8F;LATIN SMALL LETTER Y WITH DOT ABOVE;Ll;0;L;0079 0307;;;;N;;;1E8E;;1E8E +1E90;LATIN CAPITAL LETTER Z WITH CIRCUMFLEX;Lu;0;L;005A 0302;;;;N;;;;1E91; +1E91;LATIN SMALL LETTER Z WITH CIRCUMFLEX;Ll;0;L;007A 0302;;;;N;;;1E90;;1E90 +1E92;LATIN CAPITAL LETTER Z WITH DOT BELOW;Lu;0;L;005A 0323;;;;N;;;;1E93; +1E93;LATIN SMALL LETTER Z WITH DOT BELOW;Ll;0;L;007A 0323;;;;N;;;1E92;;1E92 +1E94;LATIN CAPITAL LETTER Z WITH LINE BELOW;Lu;0;L;005A 0331;;;;N;;;;1E95; +1E95;LATIN SMALL LETTER Z WITH LINE BELOW;Ll;0;L;007A 0331;;;;N;;;1E94;;1E94 +1E96;LATIN SMALL LETTER H WITH LINE BELOW;Ll;0;L;0068 0331;;;;N;;;;; +1E97;LATIN SMALL LETTER T WITH DIAERESIS;Ll;0;L;0074 0308;;;;N;;;;; +1E98;LATIN SMALL LETTER W WITH RING ABOVE;Ll;0;L;0077 030A;;;;N;;;;; +1E99;LATIN SMALL LETTER Y WITH RING ABOVE;Ll;0;L;0079 030A;;;;N;;;;; +1E9A;LATIN SMALL LETTER A WITH RIGHT HALF RING;Ll;0;L; 0061 02BE;;;;N;;;;; +1E9B;LATIN SMALL LETTER LONG S WITH DOT ABOVE;Ll;0;L;017F 0307;;;;N;;;1E60;;1E60 +1E9C;LATIN SMALL LETTER LONG S WITH DIAGONAL STROKE;Ll;0;L;;;;;N;;;;; +1E9D;LATIN SMALL LETTER LONG S WITH HIGH STROKE;Ll;0;L;;;;;N;;;;; +1E9E;LATIN CAPITAL LETTER SHARP S;Lu;0;L;;;;;N;;;;00DF; +1E9F;LATIN SMALL LETTER DELTA;Ll;0;L;;;;;N;;;;; +1EA0;LATIN CAPITAL LETTER A WITH DOT BELOW;Lu;0;L;0041 0323;;;;N;;;;1EA1; +1EA1;LATIN SMALL LETTER A WITH DOT BELOW;Ll;0;L;0061 0323;;;;N;;;1EA0;;1EA0 +1EA2;LATIN CAPITAL LETTER A WITH HOOK ABOVE;Lu;0;L;0041 0309;;;;N;;;;1EA3; +1EA3;LATIN SMALL LETTER A WITH HOOK ABOVE;Ll;0;L;0061 0309;;;;N;;;1EA2;;1EA2 +1EA4;LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE;Lu;0;L;00C2 0301;;;;N;;;;1EA5; +1EA5;LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE;Ll;0;L;00E2 0301;;;;N;;;1EA4;;1EA4 +1EA6;LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE;Lu;0;L;00C2 0300;;;;N;;;;1EA7; +1EA7;LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE;Ll;0;L;00E2 0300;;;;N;;;1EA6;;1EA6 +1EA8;LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE;Lu;0;L;00C2 0309;;;;N;;;;1EA9; +1EA9;LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE;Ll;0;L;00E2 0309;;;;N;;;1EA8;;1EA8 +1EAA;LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE;Lu;0;L;00C2 0303;;;;N;;;;1EAB; +1EAB;LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE;Ll;0;L;00E2 0303;;;;N;;;1EAA;;1EAA +1EAC;LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW;Lu;0;L;1EA0 0302;;;;N;;;;1EAD; +1EAD;LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW;Ll;0;L;1EA1 0302;;;;N;;;1EAC;;1EAC +1EAE;LATIN CAPITAL LETTER A WITH BREVE AND ACUTE;Lu;0;L;0102 0301;;;;N;;;;1EAF; +1EAF;LATIN SMALL LETTER A WITH BREVE AND ACUTE;Ll;0;L;0103 0301;;;;N;;;1EAE;;1EAE +1EB0;LATIN CAPITAL LETTER A WITH BREVE AND GRAVE;Lu;0;L;0102 0300;;;;N;;;;1EB1; +1EB1;LATIN SMALL LETTER A WITH BREVE AND GRAVE;Ll;0;L;0103 0300;;;;N;;;1EB0;;1EB0 +1EB2;LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE;Lu;0;L;0102 0309;;;;N;;;;1EB3; +1EB3;LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE;Ll;0;L;0103 0309;;;;N;;;1EB2;;1EB2 +1EB4;LATIN CAPITAL LETTER A WITH BREVE AND TILDE;Lu;0;L;0102 0303;;;;N;;;;1EB5; +1EB5;LATIN SMALL LETTER A WITH BREVE AND TILDE;Ll;0;L;0103 0303;;;;N;;;1EB4;;1EB4 +1EB6;LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW;Lu;0;L;1EA0 0306;;;;N;;;;1EB7; +1EB7;LATIN SMALL LETTER A WITH BREVE AND DOT BELOW;Ll;0;L;1EA1 0306;;;;N;;;1EB6;;1EB6 +1EB8;LATIN CAPITAL LETTER E WITH DOT BELOW;Lu;0;L;0045 0323;;;;N;;;;1EB9; +1EB9;LATIN SMALL LETTER E WITH DOT BELOW;Ll;0;L;0065 0323;;;;N;;;1EB8;;1EB8 +1EBA;LATIN CAPITAL LETTER E WITH HOOK ABOVE;Lu;0;L;0045 0309;;;;N;;;;1EBB; +1EBB;LATIN SMALL LETTER E WITH HOOK ABOVE;Ll;0;L;0065 0309;;;;N;;;1EBA;;1EBA +1EBC;LATIN CAPITAL LETTER E WITH TILDE;Lu;0;L;0045 0303;;;;N;;;;1EBD; +1EBD;LATIN SMALL LETTER E WITH TILDE;Ll;0;L;0065 0303;;;;N;;;1EBC;;1EBC +1EBE;LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE;Lu;0;L;00CA 0301;;;;N;;;;1EBF; +1EBF;LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE;Ll;0;L;00EA 0301;;;;N;;;1EBE;;1EBE +1EC0;LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE;Lu;0;L;00CA 0300;;;;N;;;;1EC1; +1EC1;LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE;Ll;0;L;00EA 0300;;;;N;;;1EC0;;1EC0 +1EC2;LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE;Lu;0;L;00CA 0309;;;;N;;;;1EC3; +1EC3;LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE;Ll;0;L;00EA 0309;;;;N;;;1EC2;;1EC2 +1EC4;LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE;Lu;0;L;00CA 0303;;;;N;;;;1EC5; +1EC5;LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE;Ll;0;L;00EA 0303;;;;N;;;1EC4;;1EC4 +1EC6;LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW;Lu;0;L;1EB8 0302;;;;N;;;;1EC7; +1EC7;LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW;Ll;0;L;1EB9 0302;;;;N;;;1EC6;;1EC6 +1EC8;LATIN CAPITAL LETTER I WITH HOOK ABOVE;Lu;0;L;0049 0309;;;;N;;;;1EC9; +1EC9;LATIN SMALL LETTER I WITH HOOK ABOVE;Ll;0;L;0069 0309;;;;N;;;1EC8;;1EC8 +1ECA;LATIN CAPITAL LETTER I WITH DOT BELOW;Lu;0;L;0049 0323;;;;N;;;;1ECB; +1ECB;LATIN SMALL LETTER I WITH DOT BELOW;Ll;0;L;0069 0323;;;;N;;;1ECA;;1ECA +1ECC;LATIN CAPITAL LETTER O WITH DOT BELOW;Lu;0;L;004F 0323;;;;N;;;;1ECD; +1ECD;LATIN SMALL LETTER O WITH DOT BELOW;Ll;0;L;006F 0323;;;;N;;;1ECC;;1ECC +1ECE;LATIN CAPITAL LETTER O WITH HOOK ABOVE;Lu;0;L;004F 0309;;;;N;;;;1ECF; +1ECF;LATIN SMALL LETTER O WITH HOOK ABOVE;Ll;0;L;006F 0309;;;;N;;;1ECE;;1ECE +1ED0;LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE;Lu;0;L;00D4 0301;;;;N;;;;1ED1; +1ED1;LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE;Ll;0;L;00F4 0301;;;;N;;;1ED0;;1ED0 +1ED2;LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE;Lu;0;L;00D4 0300;;;;N;;;;1ED3; +1ED3;LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE;Ll;0;L;00F4 0300;;;;N;;;1ED2;;1ED2 +1ED4;LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE;Lu;0;L;00D4 0309;;;;N;;;;1ED5; +1ED5;LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE;Ll;0;L;00F4 0309;;;;N;;;1ED4;;1ED4 +1ED6;LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE;Lu;0;L;00D4 0303;;;;N;;;;1ED7; +1ED7;LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE;Ll;0;L;00F4 0303;;;;N;;;1ED6;;1ED6 +1ED8;LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW;Lu;0;L;1ECC 0302;;;;N;;;;1ED9; +1ED9;LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW;Ll;0;L;1ECD 0302;;;;N;;;1ED8;;1ED8 +1EDA;LATIN CAPITAL LETTER O WITH HORN AND ACUTE;Lu;0;L;01A0 0301;;;;N;;;;1EDB; +1EDB;LATIN SMALL LETTER O WITH HORN AND ACUTE;Ll;0;L;01A1 0301;;;;N;;;1EDA;;1EDA +1EDC;LATIN CAPITAL LETTER O WITH HORN AND GRAVE;Lu;0;L;01A0 0300;;;;N;;;;1EDD; +1EDD;LATIN SMALL LETTER O WITH HORN AND GRAVE;Ll;0;L;01A1 0300;;;;N;;;1EDC;;1EDC +1EDE;LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE;Lu;0;L;01A0 0309;;;;N;;;;1EDF; +1EDF;LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE;Ll;0;L;01A1 0309;;;;N;;;1EDE;;1EDE +1EE0;LATIN CAPITAL LETTER O WITH HORN AND TILDE;Lu;0;L;01A0 0303;;;;N;;;;1EE1; +1EE1;LATIN SMALL LETTER O WITH HORN AND TILDE;Ll;0;L;01A1 0303;;;;N;;;1EE0;;1EE0 +1EE2;LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW;Lu;0;L;01A0 0323;;;;N;;;;1EE3; +1EE3;LATIN SMALL LETTER O WITH HORN AND DOT BELOW;Ll;0;L;01A1 0323;;;;N;;;1EE2;;1EE2 +1EE4;LATIN CAPITAL LETTER U WITH DOT BELOW;Lu;0;L;0055 0323;;;;N;;;;1EE5; +1EE5;LATIN SMALL LETTER U WITH DOT BELOW;Ll;0;L;0075 0323;;;;N;;;1EE4;;1EE4 +1EE6;LATIN CAPITAL LETTER U WITH HOOK ABOVE;Lu;0;L;0055 0309;;;;N;;;;1EE7; +1EE7;LATIN SMALL LETTER U WITH HOOK ABOVE;Ll;0;L;0075 0309;;;;N;;;1EE6;;1EE6 +1EE8;LATIN CAPITAL LETTER U WITH HORN AND ACUTE;Lu;0;L;01AF 0301;;;;N;;;;1EE9; +1EE9;LATIN SMALL LETTER U WITH HORN AND ACUTE;Ll;0;L;01B0 0301;;;;N;;;1EE8;;1EE8 +1EEA;LATIN CAPITAL LETTER U WITH HORN AND GRAVE;Lu;0;L;01AF 0300;;;;N;;;;1EEB; +1EEB;LATIN SMALL LETTER U WITH HORN AND GRAVE;Ll;0;L;01B0 0300;;;;N;;;1EEA;;1EEA +1EEC;LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE;Lu;0;L;01AF 0309;;;;N;;;;1EED; +1EED;LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE;Ll;0;L;01B0 0309;;;;N;;;1EEC;;1EEC +1EEE;LATIN CAPITAL LETTER U WITH HORN AND TILDE;Lu;0;L;01AF 0303;;;;N;;;;1EEF; +1EEF;LATIN SMALL LETTER U WITH HORN AND TILDE;Ll;0;L;01B0 0303;;;;N;;;1EEE;;1EEE +1EF0;LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW;Lu;0;L;01AF 0323;;;;N;;;;1EF1; +1EF1;LATIN SMALL LETTER U WITH HORN AND DOT BELOW;Ll;0;L;01B0 0323;;;;N;;;1EF0;;1EF0 +1EF2;LATIN CAPITAL LETTER Y WITH GRAVE;Lu;0;L;0059 0300;;;;N;;;;1EF3; +1EF3;LATIN SMALL LETTER Y WITH GRAVE;Ll;0;L;0079 0300;;;;N;;;1EF2;;1EF2 +1EF4;LATIN CAPITAL LETTER Y WITH DOT BELOW;Lu;0;L;0059 0323;;;;N;;;;1EF5; +1EF5;LATIN SMALL LETTER Y WITH DOT BELOW;Ll;0;L;0079 0323;;;;N;;;1EF4;;1EF4 +1EF6;LATIN CAPITAL LETTER Y WITH HOOK ABOVE;Lu;0;L;0059 0309;;;;N;;;;1EF7; +1EF7;LATIN SMALL LETTER Y WITH HOOK ABOVE;Ll;0;L;0079 0309;;;;N;;;1EF6;;1EF6 +1EF8;LATIN CAPITAL LETTER Y WITH TILDE;Lu;0;L;0059 0303;;;;N;;;;1EF9; +1EF9;LATIN SMALL LETTER Y WITH TILDE;Ll;0;L;0079 0303;;;;N;;;1EF8;;1EF8 +1EFA;LATIN CAPITAL LETTER MIDDLE-WELSH LL;Lu;0;L;;;;;N;;;;1EFB; +1EFB;LATIN SMALL LETTER MIDDLE-WELSH LL;Ll;0;L;;;;;N;;;1EFA;;1EFA +1EFC;LATIN CAPITAL LETTER MIDDLE-WELSH V;Lu;0;L;;;;;N;;;;1EFD; +1EFD;LATIN SMALL LETTER MIDDLE-WELSH V;Ll;0;L;;;;;N;;;1EFC;;1EFC +1EFE;LATIN CAPITAL LETTER Y WITH LOOP;Lu;0;L;;;;;N;;;;1EFF; +1EFF;LATIN SMALL LETTER Y WITH LOOP;Ll;0;L;;;;;N;;;1EFE;;1EFE +1F00;GREEK SMALL LETTER ALPHA WITH PSILI;Ll;0;L;03B1 0313;;;;N;;;1F08;;1F08 +1F01;GREEK SMALL LETTER ALPHA WITH DASIA;Ll;0;L;03B1 0314;;;;N;;;1F09;;1F09 +1F02;GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA;Ll;0;L;1F00 0300;;;;N;;;1F0A;;1F0A +1F03;GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA;Ll;0;L;1F01 0300;;;;N;;;1F0B;;1F0B +1F04;GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA;Ll;0;L;1F00 0301;;;;N;;;1F0C;;1F0C +1F05;GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA;Ll;0;L;1F01 0301;;;;N;;;1F0D;;1F0D +1F06;GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI;Ll;0;L;1F00 0342;;;;N;;;1F0E;;1F0E +1F07;GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI;Ll;0;L;1F01 0342;;;;N;;;1F0F;;1F0F +1F08;GREEK CAPITAL LETTER ALPHA WITH PSILI;Lu;0;L;0391 0313;;;;N;;;;1F00; +1F09;GREEK CAPITAL LETTER ALPHA WITH DASIA;Lu;0;L;0391 0314;;;;N;;;;1F01; +1F0A;GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA;Lu;0;L;1F08 0300;;;;N;;;;1F02; +1F0B;GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA;Lu;0;L;1F09 0300;;;;N;;;;1F03; +1F0C;GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA;Lu;0;L;1F08 0301;;;;N;;;;1F04; +1F0D;GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA;Lu;0;L;1F09 0301;;;;N;;;;1F05; +1F0E;GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI;Lu;0;L;1F08 0342;;;;N;;;;1F06; +1F0F;GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI;Lu;0;L;1F09 0342;;;;N;;;;1F07; +1F10;GREEK SMALL LETTER EPSILON WITH PSILI;Ll;0;L;03B5 0313;;;;N;;;1F18;;1F18 +1F11;GREEK SMALL LETTER EPSILON WITH DASIA;Ll;0;L;03B5 0314;;;;N;;;1F19;;1F19 +1F12;GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA;Ll;0;L;1F10 0300;;;;N;;;1F1A;;1F1A +1F13;GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA;Ll;0;L;1F11 0300;;;;N;;;1F1B;;1F1B +1F14;GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA;Ll;0;L;1F10 0301;;;;N;;;1F1C;;1F1C +1F15;GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA;Ll;0;L;1F11 0301;;;;N;;;1F1D;;1F1D +1F18;GREEK CAPITAL LETTER EPSILON WITH PSILI;Lu;0;L;0395 0313;;;;N;;;;1F10; +1F19;GREEK CAPITAL LETTER EPSILON WITH DASIA;Lu;0;L;0395 0314;;;;N;;;;1F11; +1F1A;GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA;Lu;0;L;1F18 0300;;;;N;;;;1F12; +1F1B;GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA;Lu;0;L;1F19 0300;;;;N;;;;1F13; +1F1C;GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA;Lu;0;L;1F18 0301;;;;N;;;;1F14; +1F1D;GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA;Lu;0;L;1F19 0301;;;;N;;;;1F15; +1F20;GREEK SMALL LETTER ETA WITH PSILI;Ll;0;L;03B7 0313;;;;N;;;1F28;;1F28 +1F21;GREEK SMALL LETTER ETA WITH DASIA;Ll;0;L;03B7 0314;;;;N;;;1F29;;1F29 +1F22;GREEK SMALL LETTER ETA WITH PSILI AND VARIA;Ll;0;L;1F20 0300;;;;N;;;1F2A;;1F2A +1F23;GREEK SMALL LETTER ETA WITH DASIA AND VARIA;Ll;0;L;1F21 0300;;;;N;;;1F2B;;1F2B +1F24;GREEK SMALL LETTER ETA WITH PSILI AND OXIA;Ll;0;L;1F20 0301;;;;N;;;1F2C;;1F2C +1F25;GREEK SMALL LETTER ETA WITH DASIA AND OXIA;Ll;0;L;1F21 0301;;;;N;;;1F2D;;1F2D +1F26;GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI;Ll;0;L;1F20 0342;;;;N;;;1F2E;;1F2E +1F27;GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI;Ll;0;L;1F21 0342;;;;N;;;1F2F;;1F2F +1F28;GREEK CAPITAL LETTER ETA WITH PSILI;Lu;0;L;0397 0313;;;;N;;;;1F20; +1F29;GREEK CAPITAL LETTER ETA WITH DASIA;Lu;0;L;0397 0314;;;;N;;;;1F21; +1F2A;GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA;Lu;0;L;1F28 0300;;;;N;;;;1F22; +1F2B;GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA;Lu;0;L;1F29 0300;;;;N;;;;1F23; +1F2C;GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA;Lu;0;L;1F28 0301;;;;N;;;;1F24; +1F2D;GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA;Lu;0;L;1F29 0301;;;;N;;;;1F25; +1F2E;GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI;Lu;0;L;1F28 0342;;;;N;;;;1F26; +1F2F;GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI;Lu;0;L;1F29 0342;;;;N;;;;1F27; +1F30;GREEK SMALL LETTER IOTA WITH PSILI;Ll;0;L;03B9 0313;;;;N;;;1F38;;1F38 +1F31;GREEK SMALL LETTER IOTA WITH DASIA;Ll;0;L;03B9 0314;;;;N;;;1F39;;1F39 +1F32;GREEK SMALL LETTER IOTA WITH PSILI AND VARIA;Ll;0;L;1F30 0300;;;;N;;;1F3A;;1F3A +1F33;GREEK SMALL LETTER IOTA WITH DASIA AND VARIA;Ll;0;L;1F31 0300;;;;N;;;1F3B;;1F3B +1F34;GREEK SMALL LETTER IOTA WITH PSILI AND OXIA;Ll;0;L;1F30 0301;;;;N;;;1F3C;;1F3C +1F35;GREEK SMALL LETTER IOTA WITH DASIA AND OXIA;Ll;0;L;1F31 0301;;;;N;;;1F3D;;1F3D +1F36;GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI;Ll;0;L;1F30 0342;;;;N;;;1F3E;;1F3E +1F37;GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI;Ll;0;L;1F31 0342;;;;N;;;1F3F;;1F3F +1F38;GREEK CAPITAL LETTER IOTA WITH PSILI;Lu;0;L;0399 0313;;;;N;;;;1F30; +1F39;GREEK CAPITAL LETTER IOTA WITH DASIA;Lu;0;L;0399 0314;;;;N;;;;1F31; +1F3A;GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA;Lu;0;L;1F38 0300;;;;N;;;;1F32; +1F3B;GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA;Lu;0;L;1F39 0300;;;;N;;;;1F33; +1F3C;GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA;Lu;0;L;1F38 0301;;;;N;;;;1F34; +1F3D;GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA;Lu;0;L;1F39 0301;;;;N;;;;1F35; +1F3E;GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI;Lu;0;L;1F38 0342;;;;N;;;;1F36; +1F3F;GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI;Lu;0;L;1F39 0342;;;;N;;;;1F37; +1F40;GREEK SMALL LETTER OMICRON WITH PSILI;Ll;0;L;03BF 0313;;;;N;;;1F48;;1F48 +1F41;GREEK SMALL LETTER OMICRON WITH DASIA;Ll;0;L;03BF 0314;;;;N;;;1F49;;1F49 +1F42;GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA;Ll;0;L;1F40 0300;;;;N;;;1F4A;;1F4A +1F43;GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA;Ll;0;L;1F41 0300;;;;N;;;1F4B;;1F4B +1F44;GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA;Ll;0;L;1F40 0301;;;;N;;;1F4C;;1F4C +1F45;GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA;Ll;0;L;1F41 0301;;;;N;;;1F4D;;1F4D +1F48;GREEK CAPITAL LETTER OMICRON WITH PSILI;Lu;0;L;039F 0313;;;;N;;;;1F40; +1F49;GREEK CAPITAL LETTER OMICRON WITH DASIA;Lu;0;L;039F 0314;;;;N;;;;1F41; +1F4A;GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA;Lu;0;L;1F48 0300;;;;N;;;;1F42; +1F4B;GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA;Lu;0;L;1F49 0300;;;;N;;;;1F43; +1F4C;GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA;Lu;0;L;1F48 0301;;;;N;;;;1F44; +1F4D;GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA;Lu;0;L;1F49 0301;;;;N;;;;1F45; +1F50;GREEK SMALL LETTER UPSILON WITH PSILI;Ll;0;L;03C5 0313;;;;N;;;;; +1F51;GREEK SMALL LETTER UPSILON WITH DASIA;Ll;0;L;03C5 0314;;;;N;;;1F59;;1F59 +1F52;GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA;Ll;0;L;1F50 0300;;;;N;;;;; +1F53;GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA;Ll;0;L;1F51 0300;;;;N;;;1F5B;;1F5B +1F54;GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA;Ll;0;L;1F50 0301;;;;N;;;;; +1F55;GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA;Ll;0;L;1F51 0301;;;;N;;;1F5D;;1F5D +1F56;GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI;Ll;0;L;1F50 0342;;;;N;;;;; +1F57;GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI;Ll;0;L;1F51 0342;;;;N;;;1F5F;;1F5F +1F59;GREEK CAPITAL LETTER UPSILON WITH DASIA;Lu;0;L;03A5 0314;;;;N;;;;1F51; +1F5B;GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA;Lu;0;L;1F59 0300;;;;N;;;;1F53; +1F5D;GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA;Lu;0;L;1F59 0301;;;;N;;;;1F55; +1F5F;GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI;Lu;0;L;1F59 0342;;;;N;;;;1F57; +1F60;GREEK SMALL LETTER OMEGA WITH PSILI;Ll;0;L;03C9 0313;;;;N;;;1F68;;1F68 +1F61;GREEK SMALL LETTER OMEGA WITH DASIA;Ll;0;L;03C9 0314;;;;N;;;1F69;;1F69 +1F62;GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA;Ll;0;L;1F60 0300;;;;N;;;1F6A;;1F6A +1F63;GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA;Ll;0;L;1F61 0300;;;;N;;;1F6B;;1F6B +1F64;GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA;Ll;0;L;1F60 0301;;;;N;;;1F6C;;1F6C +1F65;GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA;Ll;0;L;1F61 0301;;;;N;;;1F6D;;1F6D +1F66;GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI;Ll;0;L;1F60 0342;;;;N;;;1F6E;;1F6E +1F67;GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI;Ll;0;L;1F61 0342;;;;N;;;1F6F;;1F6F +1F68;GREEK CAPITAL LETTER OMEGA WITH PSILI;Lu;0;L;03A9 0313;;;;N;;;;1F60; +1F69;GREEK CAPITAL LETTER OMEGA WITH DASIA;Lu;0;L;03A9 0314;;;;N;;;;1F61; +1F6A;GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA;Lu;0;L;1F68 0300;;;;N;;;;1F62; +1F6B;GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA;Lu;0;L;1F69 0300;;;;N;;;;1F63; +1F6C;GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA;Lu;0;L;1F68 0301;;;;N;;;;1F64; +1F6D;GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA;Lu;0;L;1F69 0301;;;;N;;;;1F65; +1F6E;GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI;Lu;0;L;1F68 0342;;;;N;;;;1F66; +1F6F;GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI;Lu;0;L;1F69 0342;;;;N;;;;1F67; +1F70;GREEK SMALL LETTER ALPHA WITH VARIA;Ll;0;L;03B1 0300;;;;N;;;1FBA;;1FBA +1F71;GREEK SMALL LETTER ALPHA WITH OXIA;Ll;0;L;03AC;;;;N;;;1FBB;;1FBB +1F72;GREEK SMALL LETTER EPSILON WITH VARIA;Ll;0;L;03B5 0300;;;;N;;;1FC8;;1FC8 +1F73;GREEK SMALL LETTER EPSILON WITH OXIA;Ll;0;L;03AD;;;;N;;;1FC9;;1FC9 +1F74;GREEK SMALL LETTER ETA WITH VARIA;Ll;0;L;03B7 0300;;;;N;;;1FCA;;1FCA +1F75;GREEK SMALL LETTER ETA WITH OXIA;Ll;0;L;03AE;;;;N;;;1FCB;;1FCB +1F76;GREEK SMALL LETTER IOTA WITH VARIA;Ll;0;L;03B9 0300;;;;N;;;1FDA;;1FDA +1F77;GREEK SMALL LETTER IOTA WITH OXIA;Ll;0;L;03AF;;;;N;;;1FDB;;1FDB +1F78;GREEK SMALL LETTER OMICRON WITH VARIA;Ll;0;L;03BF 0300;;;;N;;;1FF8;;1FF8 +1F79;GREEK SMALL LETTER OMICRON WITH OXIA;Ll;0;L;03CC;;;;N;;;1FF9;;1FF9 +1F7A;GREEK SMALL LETTER UPSILON WITH VARIA;Ll;0;L;03C5 0300;;;;N;;;1FEA;;1FEA +1F7B;GREEK SMALL LETTER UPSILON WITH OXIA;Ll;0;L;03CD;;;;N;;;1FEB;;1FEB +1F7C;GREEK SMALL LETTER OMEGA WITH VARIA;Ll;0;L;03C9 0300;;;;N;;;1FFA;;1FFA +1F7D;GREEK SMALL LETTER OMEGA WITH OXIA;Ll;0;L;03CE;;;;N;;;1FFB;;1FFB +1F80;GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI;Ll;0;L;1F00 0345;;;;N;;;1F88;;1F88 +1F81;GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI;Ll;0;L;1F01 0345;;;;N;;;1F89;;1F89 +1F82;GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI;Ll;0;L;1F02 0345;;;;N;;;1F8A;;1F8A +1F83;GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI;Ll;0;L;1F03 0345;;;;N;;;1F8B;;1F8B +1F84;GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI;Ll;0;L;1F04 0345;;;;N;;;1F8C;;1F8C +1F85;GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI;Ll;0;L;1F05 0345;;;;N;;;1F8D;;1F8D +1F86;GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1F06 0345;;;;N;;;1F8E;;1F8E +1F87;GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1F07 0345;;;;N;;;1F8F;;1F8F +1F88;GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI;Lt;0;L;1F08 0345;;;;N;;;;1F80; +1F89;GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI;Lt;0;L;1F09 0345;;;;N;;;;1F81; +1F8A;GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI;Lt;0;L;1F0A 0345;;;;N;;;;1F82; +1F8B;GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI;Lt;0;L;1F0B 0345;;;;N;;;;1F83; +1F8C;GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI;Lt;0;L;1F0C 0345;;;;N;;;;1F84; +1F8D;GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI;Lt;0;L;1F0D 0345;;;;N;;;;1F85; +1F8E;GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI;Lt;0;L;1F0E 0345;;;;N;;;;1F86; +1F8F;GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI;Lt;0;L;1F0F 0345;;;;N;;;;1F87; +1F90;GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI;Ll;0;L;1F20 0345;;;;N;;;1F98;;1F98 +1F91;GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI;Ll;0;L;1F21 0345;;;;N;;;1F99;;1F99 +1F92;GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI;Ll;0;L;1F22 0345;;;;N;;;1F9A;;1F9A +1F93;GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI;Ll;0;L;1F23 0345;;;;N;;;1F9B;;1F9B +1F94;GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI;Ll;0;L;1F24 0345;;;;N;;;1F9C;;1F9C +1F95;GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI;Ll;0;L;1F25 0345;;;;N;;;1F9D;;1F9D +1F96;GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1F26 0345;;;;N;;;1F9E;;1F9E +1F97;GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1F27 0345;;;;N;;;1F9F;;1F9F +1F98;GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI;Lt;0;L;1F28 0345;;;;N;;;;1F90; +1F99;GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI;Lt;0;L;1F29 0345;;;;N;;;;1F91; +1F9A;GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI;Lt;0;L;1F2A 0345;;;;N;;;;1F92; +1F9B;GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI;Lt;0;L;1F2B 0345;;;;N;;;;1F93; +1F9C;GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI;Lt;0;L;1F2C 0345;;;;N;;;;1F94; +1F9D;GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI;Lt;0;L;1F2D 0345;;;;N;;;;1F95; +1F9E;GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI;Lt;0;L;1F2E 0345;;;;N;;;;1F96; +1F9F;GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI;Lt;0;L;1F2F 0345;;;;N;;;;1F97; +1FA0;GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI;Ll;0;L;1F60 0345;;;;N;;;1FA8;;1FA8 +1FA1;GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI;Ll;0;L;1F61 0345;;;;N;;;1FA9;;1FA9 +1FA2;GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI;Ll;0;L;1F62 0345;;;;N;;;1FAA;;1FAA +1FA3;GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI;Ll;0;L;1F63 0345;;;;N;;;1FAB;;1FAB +1FA4;GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI;Ll;0;L;1F64 0345;;;;N;;;1FAC;;1FAC +1FA5;GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI;Ll;0;L;1F65 0345;;;;N;;;1FAD;;1FAD +1FA6;GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1F66 0345;;;;N;;;1FAE;;1FAE +1FA7;GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1F67 0345;;;;N;;;1FAF;;1FAF +1FA8;GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI;Lt;0;L;1F68 0345;;;;N;;;;1FA0; +1FA9;GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI;Lt;0;L;1F69 0345;;;;N;;;;1FA1; +1FAA;GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI;Lt;0;L;1F6A 0345;;;;N;;;;1FA2; +1FAB;GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI;Lt;0;L;1F6B 0345;;;;N;;;;1FA3; +1FAC;GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI;Lt;0;L;1F6C 0345;;;;N;;;;1FA4; +1FAD;GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI;Lt;0;L;1F6D 0345;;;;N;;;;1FA5; +1FAE;GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI;Lt;0;L;1F6E 0345;;;;N;;;;1FA6; +1FAF;GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI;Lt;0;L;1F6F 0345;;;;N;;;;1FA7; +1FB0;GREEK SMALL LETTER ALPHA WITH VRACHY;Ll;0;L;03B1 0306;;;;N;;;1FB8;;1FB8 +1FB1;GREEK SMALL LETTER ALPHA WITH MACRON;Ll;0;L;03B1 0304;;;;N;;;1FB9;;1FB9 +1FB2;GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI;Ll;0;L;1F70 0345;;;;N;;;;; +1FB3;GREEK SMALL LETTER ALPHA WITH YPOGEGRAMMENI;Ll;0;L;03B1 0345;;;;N;;;1FBC;;1FBC +1FB4;GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI;Ll;0;L;03AC 0345;;;;N;;;;; +1FB6;GREEK SMALL LETTER ALPHA WITH PERISPOMENI;Ll;0;L;03B1 0342;;;;N;;;;; +1FB7;GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1FB6 0345;;;;N;;;;; +1FB8;GREEK CAPITAL LETTER ALPHA WITH VRACHY;Lu;0;L;0391 0306;;;;N;;;;1FB0; +1FB9;GREEK CAPITAL LETTER ALPHA WITH MACRON;Lu;0;L;0391 0304;;;;N;;;;1FB1; +1FBA;GREEK CAPITAL LETTER ALPHA WITH VARIA;Lu;0;L;0391 0300;;;;N;;;;1F70; +1FBB;GREEK CAPITAL LETTER ALPHA WITH OXIA;Lu;0;L;0386;;;;N;;;;1F71; +1FBC;GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI;Lt;0;L;0391 0345;;;;N;;;;1FB3; +1FBD;GREEK KORONIS;Sk;0;ON; 0020 0313;;;;N;;;;; +1FBE;GREEK PROSGEGRAMMENI;Ll;0;L;03B9;;;;N;;;0399;;0399 +1FBF;GREEK PSILI;Sk;0;ON; 0020 0313;;;;N;;;;; +1FC0;GREEK PERISPOMENI;Sk;0;ON; 0020 0342;;;;N;;;;; +1FC1;GREEK DIALYTIKA AND PERISPOMENI;Sk;0;ON;00A8 0342;;;;N;;;;; +1FC2;GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI;Ll;0;L;1F74 0345;;;;N;;;;; +1FC3;GREEK SMALL LETTER ETA WITH YPOGEGRAMMENI;Ll;0;L;03B7 0345;;;;N;;;1FCC;;1FCC +1FC4;GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI;Ll;0;L;03AE 0345;;;;N;;;;; +1FC6;GREEK SMALL LETTER ETA WITH PERISPOMENI;Ll;0;L;03B7 0342;;;;N;;;;; +1FC7;GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1FC6 0345;;;;N;;;;; +1FC8;GREEK CAPITAL LETTER EPSILON WITH VARIA;Lu;0;L;0395 0300;;;;N;;;;1F72; +1FC9;GREEK CAPITAL LETTER EPSILON WITH OXIA;Lu;0;L;0388;;;;N;;;;1F73; +1FCA;GREEK CAPITAL LETTER ETA WITH VARIA;Lu;0;L;0397 0300;;;;N;;;;1F74; +1FCB;GREEK CAPITAL LETTER ETA WITH OXIA;Lu;0;L;0389;;;;N;;;;1F75; +1FCC;GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI;Lt;0;L;0397 0345;;;;N;;;;1FC3; +1FCD;GREEK PSILI AND VARIA;Sk;0;ON;1FBF 0300;;;;N;;;;; +1FCE;GREEK PSILI AND OXIA;Sk;0;ON;1FBF 0301;;;;N;;;;; +1FCF;GREEK PSILI AND PERISPOMENI;Sk;0;ON;1FBF 0342;;;;N;;;;; +1FD0;GREEK SMALL LETTER IOTA WITH VRACHY;Ll;0;L;03B9 0306;;;;N;;;1FD8;;1FD8 +1FD1;GREEK SMALL LETTER IOTA WITH MACRON;Ll;0;L;03B9 0304;;;;N;;;1FD9;;1FD9 +1FD2;GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA;Ll;0;L;03CA 0300;;;;N;;;;; +1FD3;GREEK SMALL LETTER IOTA WITH DIALYTIKA AND OXIA;Ll;0;L;0390;;;;N;;;;; +1FD6;GREEK SMALL LETTER IOTA WITH PERISPOMENI;Ll;0;L;03B9 0342;;;;N;;;;; +1FD7;GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI;Ll;0;L;03CA 0342;;;;N;;;;; +1FD8;GREEK CAPITAL LETTER IOTA WITH VRACHY;Lu;0;L;0399 0306;;;;N;;;;1FD0; +1FD9;GREEK CAPITAL LETTER IOTA WITH MACRON;Lu;0;L;0399 0304;;;;N;;;;1FD1; +1FDA;GREEK CAPITAL LETTER IOTA WITH VARIA;Lu;0;L;0399 0300;;;;N;;;;1F76; +1FDB;GREEK CAPITAL LETTER IOTA WITH OXIA;Lu;0;L;038A;;;;N;;;;1F77; +1FDD;GREEK DASIA AND VARIA;Sk;0;ON;1FFE 0300;;;;N;;;;; +1FDE;GREEK DASIA AND OXIA;Sk;0;ON;1FFE 0301;;;;N;;;;; +1FDF;GREEK DASIA AND PERISPOMENI;Sk;0;ON;1FFE 0342;;;;N;;;;; +1FE0;GREEK SMALL LETTER UPSILON WITH VRACHY;Ll;0;L;03C5 0306;;;;N;;;1FE8;;1FE8 +1FE1;GREEK SMALL LETTER UPSILON WITH MACRON;Ll;0;L;03C5 0304;;;;N;;;1FE9;;1FE9 +1FE2;GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA;Ll;0;L;03CB 0300;;;;N;;;;; +1FE3;GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND OXIA;Ll;0;L;03B0;;;;N;;;;; +1FE4;GREEK SMALL LETTER RHO WITH PSILI;Ll;0;L;03C1 0313;;;;N;;;;; +1FE5;GREEK SMALL LETTER RHO WITH DASIA;Ll;0;L;03C1 0314;;;;N;;;1FEC;;1FEC +1FE6;GREEK SMALL LETTER UPSILON WITH PERISPOMENI;Ll;0;L;03C5 0342;;;;N;;;;; +1FE7;GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI;Ll;0;L;03CB 0342;;;;N;;;;; +1FE8;GREEK CAPITAL LETTER UPSILON WITH VRACHY;Lu;0;L;03A5 0306;;;;N;;;;1FE0; +1FE9;GREEK CAPITAL LETTER UPSILON WITH MACRON;Lu;0;L;03A5 0304;;;;N;;;;1FE1; +1FEA;GREEK CAPITAL LETTER UPSILON WITH VARIA;Lu;0;L;03A5 0300;;;;N;;;;1F7A; +1FEB;GREEK CAPITAL LETTER UPSILON WITH OXIA;Lu;0;L;038E;;;;N;;;;1F7B; +1FEC;GREEK CAPITAL LETTER RHO WITH DASIA;Lu;0;L;03A1 0314;;;;N;;;;1FE5; +1FED;GREEK DIALYTIKA AND VARIA;Sk;0;ON;00A8 0300;;;;N;;;;; +1FEE;GREEK DIALYTIKA AND OXIA;Sk;0;ON;0385;;;;N;;;;; +1FEF;GREEK VARIA;Sk;0;ON;0060;;;;N;;;;; +1FF2;GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI;Ll;0;L;1F7C 0345;;;;N;;;;; +1FF3;GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI;Ll;0;L;03C9 0345;;;;N;;;1FFC;;1FFC +1FF4;GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI;Ll;0;L;03CE 0345;;;;N;;;;; +1FF6;GREEK SMALL LETTER OMEGA WITH PERISPOMENI;Ll;0;L;03C9 0342;;;;N;;;;; +1FF7;GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1FF6 0345;;;;N;;;;; +1FF8;GREEK CAPITAL LETTER OMICRON WITH VARIA;Lu;0;L;039F 0300;;;;N;;;;1F78; +1FF9;GREEK CAPITAL LETTER OMICRON WITH OXIA;Lu;0;L;038C;;;;N;;;;1F79; +1FFA;GREEK CAPITAL LETTER OMEGA WITH VARIA;Lu;0;L;03A9 0300;;;;N;;;;1F7C; +1FFB;GREEK CAPITAL LETTER OMEGA WITH OXIA;Lu;0;L;038F;;;;N;;;;1F7D; +1FFC;GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI;Lt;0;L;03A9 0345;;;;N;;;;1FF3; +1FFD;GREEK OXIA;Sk;0;ON;00B4;;;;N;;;;; +1FFE;GREEK DASIA;Sk;0;ON; 0020 0314;;;;N;;;;; +2000;EN QUAD;Zs;0;WS;2002;;;;N;;;;; +2001;EM QUAD;Zs;0;WS;2003;;;;N;;;;; +2002;EN SPACE;Zs;0;WS; 0020;;;;N;;;;; +2003;EM SPACE;Zs;0;WS; 0020;;;;N;;;;; +2004;THREE-PER-EM SPACE;Zs;0;WS; 0020;;;;N;;;;; +2005;FOUR-PER-EM SPACE;Zs;0;WS; 0020;;;;N;;;;; +2006;SIX-PER-EM SPACE;Zs;0;WS; 0020;;;;N;;;;; +2007;FIGURE SPACE;Zs;0;WS; 0020;;;;N;;;;; +2008;PUNCTUATION SPACE;Zs;0;WS; 0020;;;;N;;;;; +2009;THIN SPACE;Zs;0;WS; 0020;;;;N;;;;; +200A;HAIR SPACE;Zs;0;WS; 0020;;;;N;;;;; +200B;ZERO WIDTH SPACE;Cf;0;BN;;;;;N;;;;; +200C;ZERO WIDTH NON-JOINER;Cf;0;BN;;;;;N;;;;; +200D;ZERO WIDTH JOINER;Cf;0;BN;;;;;N;;;;; +200E;LEFT-TO-RIGHT MARK;Cf;0;L;;;;;N;;;;; +200F;RIGHT-TO-LEFT MARK;Cf;0;R;;;;;N;;;;; +2010;HYPHEN;Pd;0;ON;;;;;N;;;;; +2011;NON-BREAKING HYPHEN;Pd;0;ON; 2010;;;;N;;;;; +2012;FIGURE DASH;Pd;0;ON;;;;;N;;;;; +2013;EN DASH;Pd;0;ON;;;;;N;;;;; +2014;EM DASH;Pd;0;ON;;;;;N;;;;; +2015;HORIZONTAL BAR;Pd;0;ON;;;;;N;QUOTATION DASH;;;; +2016;DOUBLE VERTICAL LINE;Po;0;ON;;;;;N;DOUBLE VERTICAL BAR;;;; +2017;DOUBLE LOW LINE;Po;0;ON; 0020 0333;;;;N;SPACING DOUBLE UNDERSCORE;;;; +2018;LEFT SINGLE QUOTATION MARK;Pi;0;ON;;;;;N;SINGLE TURNED COMMA QUOTATION MARK;;;; +2019;RIGHT SINGLE QUOTATION MARK;Pf;0;ON;;;;;N;SINGLE COMMA QUOTATION MARK;;;; +201A;SINGLE LOW-9 QUOTATION MARK;Ps;0;ON;;;;;N;LOW SINGLE COMMA QUOTATION MARK;;;; +201B;SINGLE HIGH-REVERSED-9 QUOTATION MARK;Pi;0;ON;;;;;N;SINGLE REVERSED COMMA QUOTATION MARK;;;; +201C;LEFT DOUBLE QUOTATION MARK;Pi;0;ON;;;;;N;DOUBLE TURNED COMMA QUOTATION MARK;;;; +201D;RIGHT DOUBLE QUOTATION MARK;Pf;0;ON;;;;;N;DOUBLE COMMA QUOTATION MARK;;;; +201E;DOUBLE LOW-9 QUOTATION MARK;Ps;0;ON;;;;;N;LOW DOUBLE COMMA QUOTATION MARK;;;; +201F;DOUBLE HIGH-REVERSED-9 QUOTATION MARK;Pi;0;ON;;;;;N;DOUBLE REVERSED COMMA QUOTATION MARK;;;; +2020;DAGGER;Po;0;ON;;;;;N;;;;; +2021;DOUBLE DAGGER;Po;0;ON;;;;;N;;;;; +2022;BULLET;Po;0;ON;;;;;N;;;;; +2023;TRIANGULAR BULLET;Po;0;ON;;;;;N;;;;; +2024;ONE DOT LEADER;Po;0;ON; 002E;;;;N;;;;; +2025;TWO DOT LEADER;Po;0;ON; 002E 002E;;;;N;;;;; +2026;HORIZONTAL ELLIPSIS;Po;0;ON; 002E 002E 002E;;;;N;;;;; +2027;HYPHENATION POINT;Po;0;ON;;;;;N;;;;; +2028;LINE SEPARATOR;Zl;0;WS;;;;;N;;;;; +2029;PARAGRAPH SEPARATOR;Zp;0;B;;;;;N;;;;; +202A;LEFT-TO-RIGHT EMBEDDING;Cf;0;LRE;;;;;N;;;;; +202B;RIGHT-TO-LEFT EMBEDDING;Cf;0;RLE;;;;;N;;;;; +202C;POP DIRECTIONAL FORMATTING;Cf;0;PDF;;;;;N;;;;; +202D;LEFT-TO-RIGHT OVERRIDE;Cf;0;LRO;;;;;N;;;;; +202E;RIGHT-TO-LEFT OVERRIDE;Cf;0;RLO;;;;;N;;;;; +202F;NARROW NO-BREAK SPACE;Zs;0;CS; 0020;;;;N;;;;; +2030;PER MILLE SIGN;Po;0;ET;;;;;N;;;;; +2031;PER TEN THOUSAND SIGN;Po;0;ET;;;;;N;;;;; +2032;PRIME;Po;0;ET;;;;;N;;;;; +2033;DOUBLE PRIME;Po;0;ET; 2032 2032;;;;N;;;;; +2034;TRIPLE PRIME;Po;0;ET; 2032 2032 2032;;;;N;;;;; +2035;REVERSED PRIME;Po;0;ON;;;;;N;;;;; +2036;REVERSED DOUBLE PRIME;Po;0;ON; 2035 2035;;;;N;;;;; +2037;REVERSED TRIPLE PRIME;Po;0;ON; 2035 2035 2035;;;;N;;;;; +2038;CARET;Po;0;ON;;;;;N;;;;; +2039;SINGLE LEFT-POINTING ANGLE QUOTATION MARK;Pi;0;ON;;;;;Y;LEFT POINTING SINGLE GUILLEMET;;;; +203A;SINGLE RIGHT-POINTING ANGLE QUOTATION MARK;Pf;0;ON;;;;;Y;RIGHT POINTING SINGLE GUILLEMET;;;; +203B;REFERENCE MARK;Po;0;ON;;;;;N;;;;; +203C;DOUBLE EXCLAMATION MARK;Po;0;ON; 0021 0021;;;;N;;;;; +203D;INTERROBANG;Po;0;ON;;;;;N;;;;; +203E;OVERLINE;Po;0;ON; 0020 0305;;;;N;SPACING OVERSCORE;;;; +203F;UNDERTIE;Pc;0;ON;;;;;N;;;;; +2040;CHARACTER TIE;Pc;0;ON;;;;;N;;;;; +2041;CARET INSERTION POINT;Po;0;ON;;;;;N;;;;; +2042;ASTERISM;Po;0;ON;;;;;N;;;;; +2043;HYPHEN BULLET;Po;0;ON;;;;;N;;;;; +2044;FRACTION SLASH;Sm;0;CS;;;;;N;;;;; +2045;LEFT SQUARE BRACKET WITH QUILL;Ps;0;ON;;;;;Y;;;;; +2046;RIGHT SQUARE BRACKET WITH QUILL;Pe;0;ON;;;;;Y;;;;; +2047;DOUBLE QUESTION MARK;Po;0;ON; 003F 003F;;;;N;;;;; +2048;QUESTION EXCLAMATION MARK;Po;0;ON; 003F 0021;;;;N;;;;; +2049;EXCLAMATION QUESTION MARK;Po;0;ON; 0021 003F;;;;N;;;;; +204A;TIRONIAN SIGN ET;Po;0;ON;;;;;N;;;;; +204B;REVERSED PILCROW SIGN;Po;0;ON;;;;;N;;;;; +204C;BLACK LEFTWARDS BULLET;Po;0;ON;;;;;N;;;;; +204D;BLACK RIGHTWARDS BULLET;Po;0;ON;;;;;N;;;;; +204E;LOW ASTERISK;Po;0;ON;;;;;N;;;;; +204F;REVERSED SEMICOLON;Po;0;ON;;;;;N;;;;; +2050;CLOSE UP;Po;0;ON;;;;;N;;;;; +2051;TWO ASTERISKS ALIGNED VERTICALLY;Po;0;ON;;;;;N;;;;; +2052;COMMERCIAL MINUS SIGN;Sm;0;ON;;;;;N;;;;; +2053;SWUNG DASH;Po;0;ON;;;;;N;;;;; +2054;INVERTED UNDERTIE;Pc;0;ON;;;;;N;;;;; +2055;FLOWER PUNCTUATION MARK;Po;0;ON;;;;;N;;;;; +2056;THREE DOT PUNCTUATION;Po;0;ON;;;;;N;;;;; +2057;QUADRUPLE PRIME;Po;0;ON; 2032 2032 2032 2032;;;;N;;;;; +2058;FOUR DOT PUNCTUATION;Po;0;ON;;;;;N;;;;; +2059;FIVE DOT PUNCTUATION;Po;0;ON;;;;;N;;;;; +205A;TWO DOT PUNCTUATION;Po;0;ON;;;;;N;;;;; +205B;FOUR DOT MARK;Po;0;ON;;;;;N;;;;; +205C;DOTTED CROSS;Po;0;ON;;;;;N;;;;; +205D;TRICOLON;Po;0;ON;;;;;N;;;;; +205E;VERTICAL FOUR DOTS;Po;0;ON;;;;;N;;;;; +205F;MEDIUM MATHEMATICAL SPACE;Zs;0;WS; 0020;;;;N;;;;; +2060;WORD JOINER;Cf;0;BN;;;;;N;;;;; +2061;FUNCTION APPLICATION;Cf;0;BN;;;;;N;;;;; +2062;INVISIBLE TIMES;Cf;0;BN;;;;;N;;;;; +2063;INVISIBLE SEPARATOR;Cf;0;BN;;;;;N;;;;; +2064;INVISIBLE PLUS;Cf;0;BN;;;;;N;;;;; +2066;LEFT-TO-RIGHT ISOLATE;Cf;0;LRI;;;;;N;;;;; +2067;RIGHT-TO-LEFT ISOLATE;Cf;0;RLI;;;;;N;;;;; +2068;FIRST STRONG ISOLATE;Cf;0;FSI;;;;;N;;;;; +2069;POP DIRECTIONAL ISOLATE;Cf;0;PDI;;;;;N;;;;; +206A;INHIBIT SYMMETRIC SWAPPING;Cf;0;BN;;;;;N;;;;; +206B;ACTIVATE SYMMETRIC SWAPPING;Cf;0;BN;;;;;N;;;;; +206C;INHIBIT ARABIC FORM SHAPING;Cf;0;BN;;;;;N;;;;; +206D;ACTIVATE ARABIC FORM SHAPING;Cf;0;BN;;;;;N;;;;; +206E;NATIONAL DIGIT SHAPES;Cf;0;BN;;;;;N;;;;; +206F;NOMINAL DIGIT SHAPES;Cf;0;BN;;;;;N;;;;; +2070;SUPERSCRIPT ZERO;No;0;EN; 0030;;0;0;N;SUPERSCRIPT DIGIT ZERO;;;; +2071;SUPERSCRIPT LATIN SMALL LETTER I;Lm;0;L; 0069;;;;N;;;;; +2074;SUPERSCRIPT FOUR;No;0;EN; 0034;;4;4;N;SUPERSCRIPT DIGIT FOUR;;;; +2075;SUPERSCRIPT FIVE;No;0;EN; 0035;;5;5;N;SUPERSCRIPT DIGIT FIVE;;;; +2076;SUPERSCRIPT SIX;No;0;EN; 0036;;6;6;N;SUPERSCRIPT DIGIT SIX;;;; +2077;SUPERSCRIPT SEVEN;No;0;EN; 0037;;7;7;N;SUPERSCRIPT DIGIT SEVEN;;;; +2078;SUPERSCRIPT EIGHT;No;0;EN; 0038;;8;8;N;SUPERSCRIPT DIGIT EIGHT;;;; +2079;SUPERSCRIPT NINE;No;0;EN; 0039;;9;9;N;SUPERSCRIPT DIGIT NINE;;;; +207A;SUPERSCRIPT PLUS SIGN;Sm;0;ES; 002B;;;;N;;;;; +207B;SUPERSCRIPT MINUS;Sm;0;ES; 2212;;;;N;SUPERSCRIPT HYPHEN-MINUS;;;; +207C;SUPERSCRIPT EQUALS SIGN;Sm;0;ON; 003D;;;;N;;;;; +207D;SUPERSCRIPT LEFT PARENTHESIS;Ps;0;ON; 0028;;;;Y;SUPERSCRIPT OPENING PARENTHESIS;;;; +207E;SUPERSCRIPT RIGHT PARENTHESIS;Pe;0;ON; 0029;;;;Y;SUPERSCRIPT CLOSING PARENTHESIS;;;; +207F;SUPERSCRIPT LATIN SMALL LETTER N;Lm;0;L; 006E;;;;N;;;;; +2080;SUBSCRIPT ZERO;No;0;EN; 0030;;0;0;N;SUBSCRIPT DIGIT ZERO;;;; +2081;SUBSCRIPT ONE;No;0;EN; 0031;;1;1;N;SUBSCRIPT DIGIT ONE;;;; +2082;SUBSCRIPT TWO;No;0;EN; 0032;;2;2;N;SUBSCRIPT DIGIT TWO;;;; +2083;SUBSCRIPT THREE;No;0;EN; 0033;;3;3;N;SUBSCRIPT DIGIT THREE;;;; +2084;SUBSCRIPT FOUR;No;0;EN; 0034;;4;4;N;SUBSCRIPT DIGIT FOUR;;;; +2085;SUBSCRIPT FIVE;No;0;EN; 0035;;5;5;N;SUBSCRIPT DIGIT FIVE;;;; +2086;SUBSCRIPT SIX;No;0;EN; 0036;;6;6;N;SUBSCRIPT DIGIT SIX;;;; +2087;SUBSCRIPT SEVEN;No;0;EN; 0037;;7;7;N;SUBSCRIPT DIGIT SEVEN;;;; +2088;SUBSCRIPT EIGHT;No;0;EN; 0038;;8;8;N;SUBSCRIPT DIGIT EIGHT;;;; +2089;SUBSCRIPT NINE;No;0;EN; 0039;;9;9;N;SUBSCRIPT DIGIT NINE;;;; +208A;SUBSCRIPT PLUS SIGN;Sm;0;ES; 002B;;;;N;;;;; +208B;SUBSCRIPT MINUS;Sm;0;ES; 2212;;;;N;SUBSCRIPT HYPHEN-MINUS;;;; +208C;SUBSCRIPT EQUALS SIGN;Sm;0;ON; 003D;;;;N;;;;; +208D;SUBSCRIPT LEFT PARENTHESIS;Ps;0;ON; 0028;;;;Y;SUBSCRIPT OPENING PARENTHESIS;;;; +208E;SUBSCRIPT RIGHT PARENTHESIS;Pe;0;ON; 0029;;;;Y;SUBSCRIPT CLOSING PARENTHESIS;;;; +2090;LATIN SUBSCRIPT SMALL LETTER A;Lm;0;L; 0061;;;;N;;;;; +2091;LATIN SUBSCRIPT SMALL LETTER E;Lm;0;L; 0065;;;;N;;;;; +2092;LATIN SUBSCRIPT SMALL LETTER O;Lm;0;L; 006F;;;;N;;;;; +2093;LATIN SUBSCRIPT SMALL LETTER X;Lm;0;L; 0078;;;;N;;;;; +2094;LATIN SUBSCRIPT SMALL LETTER SCHWA;Lm;0;L; 0259;;;;N;;;;; +2095;LATIN SUBSCRIPT SMALL LETTER H;Lm;0;L; 0068;;;;N;;;;; +2096;LATIN SUBSCRIPT SMALL LETTER K;Lm;0;L; 006B;;;;N;;;;; +2097;LATIN SUBSCRIPT SMALL LETTER L;Lm;0;L; 006C;;;;N;;;;; +2098;LATIN SUBSCRIPT SMALL LETTER M;Lm;0;L; 006D;;;;N;;;;; +2099;LATIN SUBSCRIPT SMALL LETTER N;Lm;0;L; 006E;;;;N;;;;; +209A;LATIN SUBSCRIPT SMALL LETTER P;Lm;0;L; 0070;;;;N;;;;; +209B;LATIN SUBSCRIPT SMALL LETTER S;Lm;0;L; 0073;;;;N;;;;; +209C;LATIN SUBSCRIPT SMALL LETTER T;Lm;0;L; 0074;;;;N;;;;; +20A0;EURO-CURRENCY SIGN;Sc;0;ET;;;;;N;;;;; +20A1;COLON SIGN;Sc;0;ET;;;;;N;;;;; +20A2;CRUZEIRO SIGN;Sc;0;ET;;;;;N;;;;; +20A3;FRENCH FRANC SIGN;Sc;0;ET;;;;;N;;;;; +20A4;LIRA SIGN;Sc;0;ET;;;;;N;;;;; +20A5;MILL SIGN;Sc;0;ET;;;;;N;;;;; +20A6;NAIRA SIGN;Sc;0;ET;;;;;N;;;;; +20A7;PESETA SIGN;Sc;0;ET;;;;;N;;;;; +20A8;RUPEE SIGN;Sc;0;ET; 0052 0073;;;;N;;;;; +20A9;WON SIGN;Sc;0;ET;;;;;N;;;;; +20AA;NEW SHEQEL SIGN;Sc;0;ET;;;;;N;;;;; +20AB;DONG SIGN;Sc;0;ET;;;;;N;;;;; +20AC;EURO SIGN;Sc;0;ET;;;;;N;;;;; +20AD;KIP SIGN;Sc;0;ET;;;;;N;;;;; +20AE;TUGRIK SIGN;Sc;0;ET;;;;;N;;;;; +20AF;DRACHMA SIGN;Sc;0;ET;;;;;N;;;;; +20B0;GERMAN PENNY SIGN;Sc;0;ET;;;;;N;;;;; +20B1;PESO SIGN;Sc;0;ET;;;;;N;;;;; +20B2;GUARANI SIGN;Sc;0;ET;;;;;N;;;;; +20B3;AUSTRAL SIGN;Sc;0;ET;;;;;N;;;;; +20B4;HRYVNIA SIGN;Sc;0;ET;;;;;N;;;;; +20B5;CEDI SIGN;Sc;0;ET;;;;;N;;;;; +20B6;LIVRE TOURNOIS SIGN;Sc;0;ET;;;;;N;;;;; +20B7;SPESMILO SIGN;Sc;0;ET;;;;;N;;;;; +20B8;TENGE SIGN;Sc;0;ET;;;;;N;;;;; +20B9;INDIAN RUPEE SIGN;Sc;0;ET;;;;;N;;;;; +20BA;TURKISH LIRA SIGN;Sc;0;ET;;;;;N;;;;; +20BB;NORDIC MARK SIGN;Sc;0;ET;;;;;N;;;;; +20BC;MANAT SIGN;Sc;0;ET;;;;;N;;;;; +20BD;RUBLE SIGN;Sc;0;ET;;;;;N;;;;; +20BE;LARI SIGN;Sc;0;ET;;;;;N;;;;; +20BF;BITCOIN SIGN;Sc;0;ET;;;;;N;;;;; +20C0;SOM SIGN;Sc;0;ET;;;;;N;;;;; +20C1;SAUDI RIYAL SIGN;Sc;0;ET;;;;;N;;;;; +20D0;COMBINING LEFT HARPOON ABOVE;Mn;230;NSM;;;;;N;NON-SPACING LEFT HARPOON ABOVE;;;; +20D1;COMBINING RIGHT HARPOON ABOVE;Mn;230;NSM;;;;;N;NON-SPACING RIGHT HARPOON ABOVE;;;; +20D2;COMBINING LONG VERTICAL LINE OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING LONG VERTICAL BAR OVERLAY;;;; +20D3;COMBINING SHORT VERTICAL LINE OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING SHORT VERTICAL BAR OVERLAY;;;; +20D4;COMBINING ANTICLOCKWISE ARROW ABOVE;Mn;230;NSM;;;;;N;NON-SPACING ANTICLOCKWISE ARROW ABOVE;;;; +20D5;COMBINING CLOCKWISE ARROW ABOVE;Mn;230;NSM;;;;;N;NON-SPACING CLOCKWISE ARROW ABOVE;;;; +20D6;COMBINING LEFT ARROW ABOVE;Mn;230;NSM;;;;;N;NON-SPACING LEFT ARROW ABOVE;;;; +20D7;COMBINING RIGHT ARROW ABOVE;Mn;230;NSM;;;;;N;NON-SPACING RIGHT ARROW ABOVE;;;; +20D8;COMBINING RING OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING RING OVERLAY;;;; +20D9;COMBINING CLOCKWISE RING OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING CLOCKWISE RING OVERLAY;;;; +20DA;COMBINING ANTICLOCKWISE RING OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING ANTICLOCKWISE RING OVERLAY;;;; +20DB;COMBINING THREE DOTS ABOVE;Mn;230;NSM;;;;;N;NON-SPACING THREE DOTS ABOVE;;;; +20DC;COMBINING FOUR DOTS ABOVE;Mn;230;NSM;;;;;N;NON-SPACING FOUR DOTS ABOVE;;;; +20DD;COMBINING ENCLOSING CIRCLE;Me;0;NSM;;;;;N;ENCLOSING CIRCLE;;;; +20DE;COMBINING ENCLOSING SQUARE;Me;0;NSM;;;;;N;ENCLOSING SQUARE;;;; +20DF;COMBINING ENCLOSING DIAMOND;Me;0;NSM;;;;;N;ENCLOSING DIAMOND;;;; +20E0;COMBINING ENCLOSING CIRCLE BACKSLASH;Me;0;NSM;;;;;N;ENCLOSING CIRCLE SLASH;;;; +20E1;COMBINING LEFT RIGHT ARROW ABOVE;Mn;230;NSM;;;;;N;NON-SPACING LEFT RIGHT ARROW ABOVE;;;; +20E2;COMBINING ENCLOSING SCREEN;Me;0;NSM;;;;;N;;;;; +20E3;COMBINING ENCLOSING KEYCAP;Me;0;NSM;;;;;N;;;;; +20E4;COMBINING ENCLOSING UPWARD POINTING TRIANGLE;Me;0;NSM;;;;;N;;;;; +20E5;COMBINING REVERSE SOLIDUS OVERLAY;Mn;1;NSM;;;;;N;;;;; +20E6;COMBINING DOUBLE VERTICAL STROKE OVERLAY;Mn;1;NSM;;;;;N;;;;; +20E7;COMBINING ANNUITY SYMBOL;Mn;230;NSM;;;;;N;;;;; +20E8;COMBINING TRIPLE UNDERDOT;Mn;220;NSM;;;;;N;;;;; +20E9;COMBINING WIDE BRIDGE ABOVE;Mn;230;NSM;;;;;N;;;;; +20EA;COMBINING LEFTWARDS ARROW OVERLAY;Mn;1;NSM;;;;;N;;;;; +20EB;COMBINING LONG DOUBLE SOLIDUS OVERLAY;Mn;1;NSM;;;;;N;;;;; +20EC;COMBINING RIGHTWARDS HARPOON WITH BARB DOWNWARDS;Mn;220;NSM;;;;;N;;;;; +20ED;COMBINING LEFTWARDS HARPOON WITH BARB DOWNWARDS;Mn;220;NSM;;;;;N;;;;; +20EE;COMBINING LEFT ARROW BELOW;Mn;220;NSM;;;;;N;;;;; +20EF;COMBINING RIGHT ARROW BELOW;Mn;220;NSM;;;;;N;;;;; +20F0;COMBINING ASTERISK ABOVE;Mn;230;NSM;;;;;N;;;;; +2100;ACCOUNT OF;So;0;ON; 0061 002F 0063;;;;N;;;;; +2101;ADDRESSED TO THE SUBJECT;So;0;ON; 0061 002F 0073;;;;N;;;;; +2102;DOUBLE-STRUCK CAPITAL C;Lu;0;L; 0043;;;;N;DOUBLE-STRUCK C;;;; +2103;DEGREE CELSIUS;So;0;ON; 00B0 0043;;;;N;DEGREES CENTIGRADE;;;; +2104;CENTRE LINE SYMBOL;So;0;ON;;;;;N;C L SYMBOL;;;; +2105;CARE OF;So;0;ON; 0063 002F 006F;;;;N;;;;; +2106;CADA UNA;So;0;ON; 0063 002F 0075;;;;N;;;;; +2107;EULER CONSTANT;Lu;0;L; 0190;;;;N;EULERS;;;; +2108;SCRUPLE;So;0;ON;;;;;N;;;;; +2109;DEGREE FAHRENHEIT;So;0;ON; 00B0 0046;;;;N;DEGREES FAHRENHEIT;;;; +210A;SCRIPT SMALL G;Ll;0;L; 0067;;;;N;;;;; +210B;SCRIPT CAPITAL H;Lu;0;L; 0048;;;;N;SCRIPT H;;;; +210C;BLACK-LETTER CAPITAL H;Lu;0;L; 0048;;;;N;BLACK-LETTER H;;;; +210D;DOUBLE-STRUCK CAPITAL H;Lu;0;L; 0048;;;;N;DOUBLE-STRUCK H;;;; +210E;PLANCK CONSTANT;Ll;0;L; 0068;;;;N;;;;; +210F;PLANCK CONSTANT OVER TWO PI;Ll;0;L; 0127;;;;N;PLANCK CONSTANT OVER 2 PI;;;; +2110;SCRIPT CAPITAL I;Lu;0;L; 0049;;;;N;SCRIPT I;;;; +2111;BLACK-LETTER CAPITAL I;Lu;0;L; 0049;;;;N;BLACK-LETTER I;;;; +2112;SCRIPT CAPITAL L;Lu;0;L; 004C;;;;N;SCRIPT L;;;; +2113;SCRIPT SMALL L;Ll;0;L; 006C;;;;N;;;;; +2114;L B BAR SYMBOL;So;0;ON;;;;;N;;;;; +2115;DOUBLE-STRUCK CAPITAL N;Lu;0;L; 004E;;;;N;DOUBLE-STRUCK N;;;; +2116;NUMERO SIGN;So;0;ON; 004E 006F;;;;N;NUMERO;;;; +2117;SOUND RECORDING COPYRIGHT;So;0;ON;;;;;N;;;;; +2118;SCRIPT CAPITAL P;Sm;0;ON;;;;;N;SCRIPT P;;;; +2119;DOUBLE-STRUCK CAPITAL P;Lu;0;L; 0050;;;;N;DOUBLE-STRUCK P;;;; +211A;DOUBLE-STRUCK CAPITAL Q;Lu;0;L; 0051;;;;N;DOUBLE-STRUCK Q;;;; +211B;SCRIPT CAPITAL R;Lu;0;L; 0052;;;;N;SCRIPT R;;;; +211C;BLACK-LETTER CAPITAL R;Lu;0;L; 0052;;;;N;BLACK-LETTER R;;;; +211D;DOUBLE-STRUCK CAPITAL R;Lu;0;L; 0052;;;;N;DOUBLE-STRUCK R;;;; +211E;PRESCRIPTION TAKE;So;0;ON;;;;;N;;;;; +211F;RESPONSE;So;0;ON;;;;;N;;;;; +2120;SERVICE MARK;So;0;ON; 0053 004D;;;;N;;;;; +2121;TELEPHONE SIGN;So;0;ON; 0054 0045 004C;;;;N;T E L SYMBOL;;;; +2122;TRADE MARK SIGN;So;0;ON; 0054 004D;;;;N;TRADEMARK;;;; +2123;VERSICLE;So;0;ON;;;;;N;;;;; +2124;DOUBLE-STRUCK CAPITAL Z;Lu;0;L; 005A;;;;N;DOUBLE-STRUCK Z;;;; +2125;OUNCE SIGN;So;0;ON;;;;;N;OUNCE;;;; +2126;OHM SIGN;Lu;0;L;03A9;;;;N;OHM;;;03C9; +2127;INVERTED OHM SIGN;So;0;ON;;;;;N;MHO;;;; +2128;BLACK-LETTER CAPITAL Z;Lu;0;L; 005A;;;;N;BLACK-LETTER Z;;;; +2129;TURNED GREEK SMALL LETTER IOTA;So;0;ON;;;;;N;;;;; +212A;KELVIN SIGN;Lu;0;L;004B;;;;N;DEGREES KELVIN;;;006B; +212B;ANGSTROM SIGN;Lu;0;L;00C5;;;;N;ANGSTROM UNIT;;;00E5; +212C;SCRIPT CAPITAL B;Lu;0;L; 0042;;;;N;SCRIPT B;;;; +212D;BLACK-LETTER CAPITAL C;Lu;0;L; 0043;;;;N;BLACK-LETTER C;;;; +212E;ESTIMATED SYMBOL;So;0;ET;;;;;N;;;;; +212F;SCRIPT SMALL E;Ll;0;L; 0065;;;;N;;;;; +2130;SCRIPT CAPITAL E;Lu;0;L; 0045;;;;N;SCRIPT E;;;; +2131;SCRIPT CAPITAL F;Lu;0;L; 0046;;;;N;SCRIPT F;;;; +2132;TURNED CAPITAL F;Lu;0;L;;;;;N;TURNED F;;;214E; +2133;SCRIPT CAPITAL M;Lu;0;L; 004D;;;;N;SCRIPT M;;;; +2134;SCRIPT SMALL O;Ll;0;L; 006F;;;;N;;;;; +2135;ALEF SYMBOL;Lo;0;L; 05D0;;;;N;FIRST TRANSFINITE CARDINAL;;;; +2136;BET SYMBOL;Lo;0;L; 05D1;;;;N;SECOND TRANSFINITE CARDINAL;;;; +2137;GIMEL SYMBOL;Lo;0;L; 05D2;;;;N;THIRD TRANSFINITE CARDINAL;;;; +2138;DALET SYMBOL;Lo;0;L; 05D3;;;;N;FOURTH TRANSFINITE CARDINAL;;;; +2139;INFORMATION SOURCE;Ll;0;L; 0069;;;;N;;;;; +213A;ROTATED CAPITAL Q;So;0;ON;;;;;N;;;;; +213B;FACSIMILE SIGN;So;0;ON; 0046 0041 0058;;;;N;;;;; +213C;DOUBLE-STRUCK SMALL PI;Ll;0;L; 03C0;;;;N;;;;; +213D;DOUBLE-STRUCK SMALL GAMMA;Ll;0;L; 03B3;;;;N;;;;; +213E;DOUBLE-STRUCK CAPITAL GAMMA;Lu;0;L; 0393;;;;N;;;;; +213F;DOUBLE-STRUCK CAPITAL PI;Lu;0;L; 03A0;;;;N;;;;; +2140;DOUBLE-STRUCK N-ARY SUMMATION;Sm;0;ON; 2211;;;;Y;;;;; +2141;TURNED SANS-SERIF CAPITAL G;Sm;0;ON;;;;;N;;;;; +2142;TURNED SANS-SERIF CAPITAL L;Sm;0;ON;;;;;N;;;;; +2143;REVERSED SANS-SERIF CAPITAL L;Sm;0;ON;;;;;N;;;;; +2144;TURNED SANS-SERIF CAPITAL Y;Sm;0;ON;;;;;N;;;;; +2145;DOUBLE-STRUCK ITALIC CAPITAL D;Lu;0;L; 0044;;;;N;;;;; +2146;DOUBLE-STRUCK ITALIC SMALL D;Ll;0;L; 0064;;;;N;;;;; +2147;DOUBLE-STRUCK ITALIC SMALL E;Ll;0;L; 0065;;;;N;;;;; +2148;DOUBLE-STRUCK ITALIC SMALL I;Ll;0;L; 0069;;;;N;;;;; +2149;DOUBLE-STRUCK ITALIC SMALL J;Ll;0;L; 006A;;;;N;;;;; +214A;PROPERTY LINE;So;0;ON;;;;;N;;;;; +214B;TURNED AMPERSAND;Sm;0;ON;;;;;N;;;;; +214C;PER SIGN;So;0;ON;;;;;N;;;;; +214D;AKTIESELSKAB;So;0;ON;;;;;N;;;;; +214E;TURNED SMALL F;Ll;0;L;;;;;N;;;2132;;2132 +214F;SYMBOL FOR SAMARITAN SOURCE;So;0;L;;;;;N;;;;; +2150;VULGAR FRACTION ONE SEVENTH;No;0;ON; 0031 2044 0037;;;1/7;N;;;;; +2151;VULGAR FRACTION ONE NINTH;No;0;ON; 0031 2044 0039;;;1/9;N;;;;; +2152;VULGAR FRACTION ONE TENTH;No;0;ON; 0031 2044 0031 0030;;;1/10;N;;;;; +2153;VULGAR FRACTION ONE THIRD;No;0;ON; 0031 2044 0033;;;1/3;N;FRACTION ONE THIRD;;;; +2154;VULGAR FRACTION TWO THIRDS;No;0;ON; 0032 2044 0033;;;2/3;N;FRACTION TWO THIRDS;;;; +2155;VULGAR FRACTION ONE FIFTH;No;0;ON; 0031 2044 0035;;;1/5;N;FRACTION ONE FIFTH;;;; +2156;VULGAR FRACTION TWO FIFTHS;No;0;ON; 0032 2044 0035;;;2/5;N;FRACTION TWO FIFTHS;;;; +2157;VULGAR FRACTION THREE FIFTHS;No;0;ON; 0033 2044 0035;;;3/5;N;FRACTION THREE FIFTHS;;;; +2158;VULGAR FRACTION FOUR FIFTHS;No;0;ON; 0034 2044 0035;;;4/5;N;FRACTION FOUR FIFTHS;;;; +2159;VULGAR FRACTION ONE SIXTH;No;0;ON; 0031 2044 0036;;;1/6;N;FRACTION ONE SIXTH;;;; +215A;VULGAR FRACTION FIVE SIXTHS;No;0;ON; 0035 2044 0036;;;5/6;N;FRACTION FIVE SIXTHS;;;; +215B;VULGAR FRACTION ONE EIGHTH;No;0;ON; 0031 2044 0038;;;1/8;N;FRACTION ONE EIGHTH;;;; +215C;VULGAR FRACTION THREE EIGHTHS;No;0;ON; 0033 2044 0038;;;3/8;N;FRACTION THREE EIGHTHS;;;; +215D;VULGAR FRACTION FIVE EIGHTHS;No;0;ON; 0035 2044 0038;;;5/8;N;FRACTION FIVE EIGHTHS;;;; +215E;VULGAR FRACTION SEVEN EIGHTHS;No;0;ON; 0037 2044 0038;;;7/8;N;FRACTION SEVEN EIGHTHS;;;; +215F;FRACTION NUMERATOR ONE;No;0;ON; 0031 2044;;;1;N;;;;; +2160;ROMAN NUMERAL ONE;Nl;0;L; 0049;;;1;N;;;;2170; +2161;ROMAN NUMERAL TWO;Nl;0;L; 0049 0049;;;2;N;;;;2171; +2162;ROMAN NUMERAL THREE;Nl;0;L; 0049 0049 0049;;;3;N;;;;2172; +2163;ROMAN NUMERAL FOUR;Nl;0;L; 0049 0056;;;4;N;;;;2173; +2164;ROMAN NUMERAL FIVE;Nl;0;L; 0056;;;5;N;;;;2174; +2165;ROMAN NUMERAL SIX;Nl;0;L; 0056 0049;;;6;N;;;;2175; +2166;ROMAN NUMERAL SEVEN;Nl;0;L; 0056 0049 0049;;;7;N;;;;2176; +2167;ROMAN NUMERAL EIGHT;Nl;0;L; 0056 0049 0049 0049;;;8;N;;;;2177; +2168;ROMAN NUMERAL NINE;Nl;0;L; 0049 0058;;;9;N;;;;2178; +2169;ROMAN NUMERAL TEN;Nl;0;L; 0058;;;10;N;;;;2179; +216A;ROMAN NUMERAL ELEVEN;Nl;0;L; 0058 0049;;;11;N;;;;217A; +216B;ROMAN NUMERAL TWELVE;Nl;0;L; 0058 0049 0049;;;12;N;;;;217B; +216C;ROMAN NUMERAL FIFTY;Nl;0;L; 004C;;;50;N;;;;217C; +216D;ROMAN NUMERAL ONE HUNDRED;Nl;0;L; 0043;;;100;N;;;;217D; +216E;ROMAN NUMERAL FIVE HUNDRED;Nl;0;L; 0044;;;500;N;;;;217E; +216F;ROMAN NUMERAL ONE THOUSAND;Nl;0;L; 004D;;;1000;N;;;;217F; +2170;SMALL ROMAN NUMERAL ONE;Nl;0;L; 0069;;;1;N;;;2160;;2160 +2171;SMALL ROMAN NUMERAL TWO;Nl;0;L; 0069 0069;;;2;N;;;2161;;2161 +2172;SMALL ROMAN NUMERAL THREE;Nl;0;L; 0069 0069 0069;;;3;N;;;2162;;2162 +2173;SMALL ROMAN NUMERAL FOUR;Nl;0;L; 0069 0076;;;4;N;;;2163;;2163 +2174;SMALL ROMAN NUMERAL FIVE;Nl;0;L; 0076;;;5;N;;;2164;;2164 +2175;SMALL ROMAN NUMERAL SIX;Nl;0;L; 0076 0069;;;6;N;;;2165;;2165 +2176;SMALL ROMAN NUMERAL SEVEN;Nl;0;L; 0076 0069 0069;;;7;N;;;2166;;2166 +2177;SMALL ROMAN NUMERAL EIGHT;Nl;0;L; 0076 0069 0069 0069;;;8;N;;;2167;;2167 +2178;SMALL ROMAN NUMERAL NINE;Nl;0;L; 0069 0078;;;9;N;;;2168;;2168 +2179;SMALL ROMAN NUMERAL TEN;Nl;0;L; 0078;;;10;N;;;2169;;2169 +217A;SMALL ROMAN NUMERAL ELEVEN;Nl;0;L; 0078 0069;;;11;N;;;216A;;216A +217B;SMALL ROMAN NUMERAL TWELVE;Nl;0;L; 0078 0069 0069;;;12;N;;;216B;;216B +217C;SMALL ROMAN NUMERAL FIFTY;Nl;0;L; 006C;;;50;N;;;216C;;216C +217D;SMALL ROMAN NUMERAL ONE HUNDRED;Nl;0;L; 0063;;;100;N;;;216D;;216D +217E;SMALL ROMAN NUMERAL FIVE HUNDRED;Nl;0;L; 0064;;;500;N;;;216E;;216E +217F;SMALL ROMAN NUMERAL ONE THOUSAND;Nl;0;L; 006D;;;1000;N;;;216F;;216F +2180;ROMAN NUMERAL ONE THOUSAND C D;Nl;0;L;;;;1000;N;;;;; +2181;ROMAN NUMERAL FIVE THOUSAND;Nl;0;L;;;;5000;N;;;;; +2182;ROMAN NUMERAL TEN THOUSAND;Nl;0;L;;;;10000;N;;;;; +2183;ROMAN NUMERAL REVERSED ONE HUNDRED;Lu;0;L;;;;;N;;;;2184; +2184;LATIN SMALL LETTER REVERSED C;Ll;0;L;;;;;N;;;2183;;2183 +2185;ROMAN NUMERAL SIX LATE FORM;Nl;0;L;;;;6;N;;;;; +2186;ROMAN NUMERAL FIFTY EARLY FORM;Nl;0;L;;;;50;N;;;;; +2187;ROMAN NUMERAL FIFTY THOUSAND;Nl;0;L;;;;50000;N;;;;; +2188;ROMAN NUMERAL ONE HUNDRED THOUSAND;Nl;0;L;;;;100000;N;;;;; +2189;VULGAR FRACTION ZERO THIRDS;No;0;ON; 0030 2044 0033;;;0;N;;;;; +218A;TURNED DIGIT TWO;So;0;ON;;;;;N;;;;; +218B;TURNED DIGIT THREE;So;0;ON;;;;;N;;;;; +2190;LEFTWARDS ARROW;Sm;0;ON;;;;;N;LEFT ARROW;;;; +2191;UPWARDS ARROW;Sm;0;ON;;;;;N;UP ARROW;;;; +2192;RIGHTWARDS ARROW;Sm;0;ON;;;;;N;RIGHT ARROW;;;; +2193;DOWNWARDS ARROW;Sm;0;ON;;;;;N;DOWN ARROW;;;; +2194;LEFT RIGHT ARROW;Sm;0;ON;;;;;N;;;;; +2195;UP DOWN ARROW;So;0;ON;;;;;N;;;;; +2196;NORTH WEST ARROW;So;0;ON;;;;;N;UPPER LEFT ARROW;;;; +2197;NORTH EAST ARROW;So;0;ON;;;;;N;UPPER RIGHT ARROW;;;; +2198;SOUTH EAST ARROW;So;0;ON;;;;;N;LOWER RIGHT ARROW;;;; +2199;SOUTH WEST ARROW;So;0;ON;;;;;N;LOWER LEFT ARROW;;;; +219A;LEFTWARDS ARROW WITH STROKE;Sm;0;ON;2190 0338;;;;N;LEFT ARROW WITH STROKE;;;; +219B;RIGHTWARDS ARROW WITH STROKE;Sm;0;ON;2192 0338;;;;N;RIGHT ARROW WITH STROKE;;;; +219C;LEFTWARDS WAVE ARROW;So;0;ON;;;;;N;LEFT WAVE ARROW;;;; +219D;RIGHTWARDS WAVE ARROW;So;0;ON;;;;;N;RIGHT WAVE ARROW;;;; +219E;LEFTWARDS TWO HEADED ARROW;So;0;ON;;;;;N;LEFT TWO HEADED ARROW;;;; +219F;UPWARDS TWO HEADED ARROW;So;0;ON;;;;;N;UP TWO HEADED ARROW;;;; +21A0;RIGHTWARDS TWO HEADED ARROW;Sm;0;ON;;;;;N;RIGHT TWO HEADED ARROW;;;; +21A1;DOWNWARDS TWO HEADED ARROW;So;0;ON;;;;;N;DOWN TWO HEADED ARROW;;;; +21A2;LEFTWARDS ARROW WITH TAIL;So;0;ON;;;;;N;LEFT ARROW WITH TAIL;;;; +21A3;RIGHTWARDS ARROW WITH TAIL;Sm;0;ON;;;;;N;RIGHT ARROW WITH TAIL;;;; +21A4;LEFTWARDS ARROW FROM BAR;So;0;ON;;;;;N;LEFT ARROW FROM BAR;;;; +21A5;UPWARDS ARROW FROM BAR;So;0;ON;;;;;N;UP ARROW FROM BAR;;;; +21A6;RIGHTWARDS ARROW FROM BAR;Sm;0;ON;;;;;N;RIGHT ARROW FROM BAR;;;; +21A7;DOWNWARDS ARROW FROM BAR;So;0;ON;;;;;N;DOWN ARROW FROM BAR;;;; +21A8;UP DOWN ARROW WITH BASE;So;0;ON;;;;;N;;;;; +21A9;LEFTWARDS ARROW WITH HOOK;So;0;ON;;;;;N;LEFT ARROW WITH HOOK;;;; +21AA;RIGHTWARDS ARROW WITH HOOK;So;0;ON;;;;;N;RIGHT ARROW WITH HOOK;;;; +21AB;LEFTWARDS ARROW WITH LOOP;So;0;ON;;;;;N;LEFT ARROW WITH LOOP;;;; +21AC;RIGHTWARDS ARROW WITH LOOP;So;0;ON;;;;;N;RIGHT ARROW WITH LOOP;;;; +21AD;LEFT RIGHT WAVE ARROW;So;0;ON;;;;;N;;;;; +21AE;LEFT RIGHT ARROW WITH STROKE;Sm;0;ON;2194 0338;;;;N;;;;; +21AF;DOWNWARDS ZIGZAG ARROW;So;0;ON;;;;;N;DOWN ZIGZAG ARROW;;;; +21B0;UPWARDS ARROW WITH TIP LEFTWARDS;So;0;ON;;;;;N;UP ARROW WITH TIP LEFT;;;; +21B1;UPWARDS ARROW WITH TIP RIGHTWARDS;So;0;ON;;;;;N;UP ARROW WITH TIP RIGHT;;;; +21B2;DOWNWARDS ARROW WITH TIP LEFTWARDS;So;0;ON;;;;;N;DOWN ARROW WITH TIP LEFT;;;; +21B3;DOWNWARDS ARROW WITH TIP RIGHTWARDS;So;0;ON;;;;;N;DOWN ARROW WITH TIP RIGHT;;;; +21B4;RIGHTWARDS ARROW WITH CORNER DOWNWARDS;So;0;ON;;;;;N;RIGHT ARROW WITH CORNER DOWN;;;; +21B5;DOWNWARDS ARROW WITH CORNER LEFTWARDS;So;0;ON;;;;;N;DOWN ARROW WITH CORNER LEFT;;;; +21B6;ANTICLOCKWISE TOP SEMICIRCLE ARROW;So;0;ON;;;;;N;;;;; +21B7;CLOCKWISE TOP SEMICIRCLE ARROW;So;0;ON;;;;;N;;;;; +21B8;NORTH WEST ARROW TO LONG BAR;So;0;ON;;;;;N;UPPER LEFT ARROW TO LONG BAR;;;; +21B9;LEFTWARDS ARROW TO BAR OVER RIGHTWARDS ARROW TO BAR;So;0;ON;;;;;N;LEFT ARROW TO BAR OVER RIGHT ARROW TO BAR;;;; +21BA;ANTICLOCKWISE OPEN CIRCLE ARROW;So;0;ON;;;;;N;;;;; +21BB;CLOCKWISE OPEN CIRCLE ARROW;So;0;ON;;;;;N;;;;; +21BC;LEFTWARDS HARPOON WITH BARB UPWARDS;So;0;ON;;;;;N;LEFT HARPOON WITH BARB UP;;;; +21BD;LEFTWARDS HARPOON WITH BARB DOWNWARDS;So;0;ON;;;;;N;LEFT HARPOON WITH BARB DOWN;;;; +21BE;UPWARDS HARPOON WITH BARB RIGHTWARDS;So;0;ON;;;;;N;UP HARPOON WITH BARB RIGHT;;;; +21BF;UPWARDS HARPOON WITH BARB LEFTWARDS;So;0;ON;;;;;N;UP HARPOON WITH BARB LEFT;;;; +21C0;RIGHTWARDS HARPOON WITH BARB UPWARDS;So;0;ON;;;;;N;RIGHT HARPOON WITH BARB UP;;;; +21C1;RIGHTWARDS HARPOON WITH BARB DOWNWARDS;So;0;ON;;;;;N;RIGHT HARPOON WITH BARB DOWN;;;; +21C2;DOWNWARDS HARPOON WITH BARB RIGHTWARDS;So;0;ON;;;;;N;DOWN HARPOON WITH BARB RIGHT;;;; +21C3;DOWNWARDS HARPOON WITH BARB LEFTWARDS;So;0;ON;;;;;N;DOWN HARPOON WITH BARB LEFT;;;; +21C4;RIGHTWARDS ARROW OVER LEFTWARDS ARROW;So;0;ON;;;;;N;RIGHT ARROW OVER LEFT ARROW;;;; +21C5;UPWARDS ARROW LEFTWARDS OF DOWNWARDS ARROW;So;0;ON;;;;;N;UP ARROW LEFT OF DOWN ARROW;;;; +21C6;LEFTWARDS ARROW OVER RIGHTWARDS ARROW;So;0;ON;;;;;N;LEFT ARROW OVER RIGHT ARROW;;;; +21C7;LEFTWARDS PAIRED ARROWS;So;0;ON;;;;;N;LEFT PAIRED ARROWS;;;; +21C8;UPWARDS PAIRED ARROWS;So;0;ON;;;;;N;UP PAIRED ARROWS;;;; +21C9;RIGHTWARDS PAIRED ARROWS;So;0;ON;;;;;N;RIGHT PAIRED ARROWS;;;; +21CA;DOWNWARDS PAIRED ARROWS;So;0;ON;;;;;N;DOWN PAIRED ARROWS;;;; +21CB;LEFTWARDS HARPOON OVER RIGHTWARDS HARPOON;So;0;ON;;;;;N;LEFT HARPOON OVER RIGHT HARPOON;;;; +21CC;RIGHTWARDS HARPOON OVER LEFTWARDS HARPOON;So;0;ON;;;;;N;RIGHT HARPOON OVER LEFT HARPOON;;;; +21CD;LEFTWARDS DOUBLE ARROW WITH STROKE;So;0;ON;21D0 0338;;;;N;LEFT DOUBLE ARROW WITH STROKE;;;; +21CE;LEFT RIGHT DOUBLE ARROW WITH STROKE;Sm;0;ON;21D4 0338;;;;N;;;;; +21CF;RIGHTWARDS DOUBLE ARROW WITH STROKE;Sm;0;ON;21D2 0338;;;;N;RIGHT DOUBLE ARROW WITH STROKE;;;; +21D0;LEFTWARDS DOUBLE ARROW;So;0;ON;;;;;N;LEFT DOUBLE ARROW;;;; +21D1;UPWARDS DOUBLE ARROW;So;0;ON;;;;;N;UP DOUBLE ARROW;;;; +21D2;RIGHTWARDS DOUBLE ARROW;Sm;0;ON;;;;;N;RIGHT DOUBLE ARROW;;;; +21D3;DOWNWARDS DOUBLE ARROW;So;0;ON;;;;;N;DOWN DOUBLE ARROW;;;; +21D4;LEFT RIGHT DOUBLE ARROW;Sm;0;ON;;;;;N;;;;; +21D5;UP DOWN DOUBLE ARROW;So;0;ON;;;;;N;;;;; +21D6;NORTH WEST DOUBLE ARROW;So;0;ON;;;;;N;UPPER LEFT DOUBLE ARROW;;;; +21D7;NORTH EAST DOUBLE ARROW;So;0;ON;;;;;N;UPPER RIGHT DOUBLE ARROW;;;; +21D8;SOUTH EAST DOUBLE ARROW;So;0;ON;;;;;N;LOWER RIGHT DOUBLE ARROW;;;; +21D9;SOUTH WEST DOUBLE ARROW;So;0;ON;;;;;N;LOWER LEFT DOUBLE ARROW;;;; +21DA;LEFTWARDS TRIPLE ARROW;So;0;ON;;;;;N;LEFT TRIPLE ARROW;;;; +21DB;RIGHTWARDS TRIPLE ARROW;So;0;ON;;;;;N;RIGHT TRIPLE ARROW;;;; +21DC;LEFTWARDS SQUIGGLE ARROW;So;0;ON;;;;;N;LEFT SQUIGGLE ARROW;;;; +21DD;RIGHTWARDS SQUIGGLE ARROW;So;0;ON;;;;;N;RIGHT SQUIGGLE ARROW;;;; +21DE;UPWARDS ARROW WITH DOUBLE STROKE;So;0;ON;;;;;N;UP ARROW WITH DOUBLE STROKE;;;; +21DF;DOWNWARDS ARROW WITH DOUBLE STROKE;So;0;ON;;;;;N;DOWN ARROW WITH DOUBLE STROKE;;;; +21E0;LEFTWARDS DASHED ARROW;So;0;ON;;;;;N;LEFT DASHED ARROW;;;; +21E1;UPWARDS DASHED ARROW;So;0;ON;;;;;N;UP DASHED ARROW;;;; +21E2;RIGHTWARDS DASHED ARROW;So;0;ON;;;;;N;RIGHT DASHED ARROW;;;; +21E3;DOWNWARDS DASHED ARROW;So;0;ON;;;;;N;DOWN DASHED ARROW;;;; +21E4;LEFTWARDS ARROW TO BAR;So;0;ON;;;;;N;LEFT ARROW TO BAR;;;; +21E5;RIGHTWARDS ARROW TO BAR;So;0;ON;;;;;N;RIGHT ARROW TO BAR;;;; +21E6;LEFTWARDS WHITE ARROW;So;0;ON;;;;;N;WHITE LEFT ARROW;;;; +21E7;UPWARDS WHITE ARROW;So;0;ON;;;;;N;WHITE UP ARROW;;;; +21E8;RIGHTWARDS WHITE ARROW;So;0;ON;;;;;N;WHITE RIGHT ARROW;;;; +21E9;DOWNWARDS WHITE ARROW;So;0;ON;;;;;N;WHITE DOWN ARROW;;;; +21EA;UPWARDS WHITE ARROW FROM BAR;So;0;ON;;;;;N;WHITE UP ARROW FROM BAR;;;; +21EB;UPWARDS WHITE ARROW ON PEDESTAL;So;0;ON;;;;;N;;;;; +21EC;UPWARDS WHITE ARROW ON PEDESTAL WITH HORIZONTAL BAR;So;0;ON;;;;;N;;;;; +21ED;UPWARDS WHITE ARROW ON PEDESTAL WITH VERTICAL BAR;So;0;ON;;;;;N;;;;; +21EE;UPWARDS WHITE DOUBLE ARROW;So;0;ON;;;;;N;;;;; +21EF;UPWARDS WHITE DOUBLE ARROW ON PEDESTAL;So;0;ON;;;;;N;;;;; +21F0;RIGHTWARDS WHITE ARROW FROM WALL;So;0;ON;;;;;N;;;;; +21F1;NORTH WEST ARROW TO CORNER;So;0;ON;;;;;N;;;;; +21F2;SOUTH EAST ARROW TO CORNER;So;0;ON;;;;;N;;;;; +21F3;UP DOWN WHITE ARROW;So;0;ON;;;;;N;;;;; +21F4;RIGHT ARROW WITH SMALL CIRCLE;Sm;0;ON;;;;;N;;;;; +21F5;DOWNWARDS ARROW LEFTWARDS OF UPWARDS ARROW;Sm;0;ON;;;;;N;;;;; +21F6;THREE RIGHTWARDS ARROWS;Sm;0;ON;;;;;N;;;;; +21F7;LEFTWARDS ARROW WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;; +21F8;RIGHTWARDS ARROW WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;; +21F9;LEFT RIGHT ARROW WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;; +21FA;LEFTWARDS ARROW WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;; +21FB;RIGHTWARDS ARROW WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;; +21FC;LEFT RIGHT ARROW WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;; +21FD;LEFTWARDS OPEN-HEADED ARROW;Sm;0;ON;;;;;N;;;;; +21FE;RIGHTWARDS OPEN-HEADED ARROW;Sm;0;ON;;;;;N;;;;; +21FF;LEFT RIGHT OPEN-HEADED ARROW;Sm;0;ON;;;;;N;;;;; +2200;FOR ALL;Sm;0;ON;;;;;N;;;;; +2201;COMPLEMENT;Sm;0;ON;;;;;Y;;;;; +2202;PARTIAL DIFFERENTIAL;Sm;0;ON;;;;;Y;;;;; +2203;THERE EXISTS;Sm;0;ON;;;;;Y;;;;; +2204;THERE DOES NOT EXIST;Sm;0;ON;2203 0338;;;;Y;;;;; +2205;EMPTY SET;Sm;0;ON;;;;;N;;;;; +2206;INCREMENT;Sm;0;ON;;;;;N;;;;; +2207;NABLA;Sm;0;ON;;;;;N;;;;; +2208;ELEMENT OF;Sm;0;ON;;;;;Y;;;;; +2209;NOT AN ELEMENT OF;Sm;0;ON;2208 0338;;;;Y;;;;; +220A;SMALL ELEMENT OF;Sm;0;ON;;;;;Y;;;;; +220B;CONTAINS AS MEMBER;Sm;0;ON;;;;;Y;;;;; +220C;DOES NOT CONTAIN AS MEMBER;Sm;0;ON;220B 0338;;;;Y;;;;; +220D;SMALL CONTAINS AS MEMBER;Sm;0;ON;;;;;Y;;;;; +220E;END OF PROOF;Sm;0;ON;;;;;N;;;;; +220F;N-ARY PRODUCT;Sm;0;ON;;;;;N;;;;; +2210;N-ARY COPRODUCT;Sm;0;ON;;;;;N;;;;; +2211;N-ARY SUMMATION;Sm;0;ON;;;;;Y;;;;; +2212;MINUS SIGN;Sm;0;ES;;;;;N;;;;; +2213;MINUS-OR-PLUS SIGN;Sm;0;ET;;;;;N;;;;; +2214;DOT PLUS;Sm;0;ON;;;;;N;;;;; +2215;DIVISION SLASH;Sm;0;ON;;;;;Y;;;;; +2216;SET MINUS;Sm;0;ON;;;;;Y;;;;; +2217;ASTERISK OPERATOR;Sm;0;ON;;;;;N;;;;; +2218;RING OPERATOR;Sm;0;ON;;;;;N;;;;; +2219;BULLET OPERATOR;Sm;0;ON;;;;;N;;;;; +221A;SQUARE ROOT;Sm;0;ON;;;;;Y;;;;; +221B;CUBE ROOT;Sm;0;ON;;;;;Y;;;;; +221C;FOURTH ROOT;Sm;0;ON;;;;;Y;;;;; +221D;PROPORTIONAL TO;Sm;0;ON;;;;;Y;;;;; +221E;INFINITY;Sm;0;ON;;;;;N;;;;; +221F;RIGHT ANGLE;Sm;0;ON;;;;;Y;;;;; +2220;ANGLE;Sm;0;ON;;;;;Y;;;;; +2221;MEASURED ANGLE;Sm;0;ON;;;;;Y;;;;; +2222;SPHERICAL ANGLE;Sm;0;ON;;;;;Y;;;;; +2223;DIVIDES;Sm;0;ON;;;;;N;;;;; +2224;DOES NOT DIVIDE;Sm;0;ON;2223 0338;;;;Y;;;;; +2225;PARALLEL TO;Sm;0;ON;;;;;N;;;;; +2226;NOT PARALLEL TO;Sm;0;ON;2225 0338;;;;Y;;;;; +2227;LOGICAL AND;Sm;0;ON;;;;;N;;;;; +2228;LOGICAL OR;Sm;0;ON;;;;;N;;;;; +2229;INTERSECTION;Sm;0;ON;;;;;N;;;;; +222A;UNION;Sm;0;ON;;;;;N;;;;; +222B;INTEGRAL;Sm;0;ON;;;;;Y;;;;; +222C;DOUBLE INTEGRAL;Sm;0;ON; 222B 222B;;;;Y;;;;; +222D;TRIPLE INTEGRAL;Sm;0;ON; 222B 222B 222B;;;;Y;;;;; +222E;CONTOUR INTEGRAL;Sm;0;ON;;;;;Y;;;;; +222F;SURFACE INTEGRAL;Sm;0;ON; 222E 222E;;;;Y;;;;; +2230;VOLUME INTEGRAL;Sm;0;ON; 222E 222E 222E;;;;Y;;;;; +2231;CLOCKWISE INTEGRAL;Sm;0;ON;;;;;Y;;;;; +2232;CLOCKWISE CONTOUR INTEGRAL;Sm;0;ON;;;;;Y;;;;; +2233;ANTICLOCKWISE CONTOUR INTEGRAL;Sm;0;ON;;;;;Y;;;;; +2234;THEREFORE;Sm;0;ON;;;;;N;;;;; +2235;BECAUSE;Sm;0;ON;;;;;N;;;;; +2236;RATIO;Sm;0;ON;;;;;N;;;;; +2237;PROPORTION;Sm;0;ON;;;;;N;;;;; +2238;DOT MINUS;Sm;0;ON;;;;;N;;;;; +2239;EXCESS;Sm;0;ON;;;;;Y;;;;; +223A;GEOMETRIC PROPORTION;Sm;0;ON;;;;;N;;;;; +223B;HOMOTHETIC;Sm;0;ON;;;;;Y;;;;; +223C;TILDE OPERATOR;Sm;0;ON;;;;;Y;;;;; +223D;REVERSED TILDE;Sm;0;ON;;;;;Y;;;;; +223E;INVERTED LAZY S;Sm;0;ON;;;;;Y;;;;; +223F;SINE WAVE;Sm;0;ON;;;;;Y;;;;; +2240;WREATH PRODUCT;Sm;0;ON;;;;;Y;;;;; +2241;NOT TILDE;Sm;0;ON;223C 0338;;;;Y;;;;; +2242;MINUS TILDE;Sm;0;ON;;;;;Y;;;;; +2243;ASYMPTOTICALLY EQUAL TO;Sm;0;ON;;;;;Y;;;;; +2244;NOT ASYMPTOTICALLY EQUAL TO;Sm;0;ON;2243 0338;;;;Y;;;;; +2245;APPROXIMATELY EQUAL TO;Sm;0;ON;;;;;Y;;;;; +2246;APPROXIMATELY BUT NOT ACTUALLY EQUAL TO;Sm;0;ON;;;;;Y;;;;; +2247;NEITHER APPROXIMATELY NOR ACTUALLY EQUAL TO;Sm;0;ON;2245 0338;;;;Y;;;;; +2248;ALMOST EQUAL TO;Sm;0;ON;;;;;Y;;;;; +2249;NOT ALMOST EQUAL TO;Sm;0;ON;2248 0338;;;;Y;;;;; +224A;ALMOST EQUAL OR EQUAL TO;Sm;0;ON;;;;;Y;;;;; +224B;TRIPLE TILDE;Sm;0;ON;;;;;Y;;;;; +224C;ALL EQUAL TO;Sm;0;ON;;;;;Y;;;;; +224D;EQUIVALENT TO;Sm;0;ON;;;;;N;;;;; +224E;GEOMETRICALLY EQUIVALENT TO;Sm;0;ON;;;;;N;;;;; +224F;DIFFERENCE BETWEEN;Sm;0;ON;;;;;N;;;;; +2250;APPROACHES THE LIMIT;Sm;0;ON;;;;;N;;;;; +2251;GEOMETRICALLY EQUAL TO;Sm;0;ON;;;;;N;;;;; +2252;APPROXIMATELY EQUAL TO OR THE IMAGE OF;Sm;0;ON;;;;;Y;;;;; +2253;IMAGE OF OR APPROXIMATELY EQUAL TO;Sm;0;ON;;;;;Y;;;;; +2254;COLON EQUALS;Sm;0;ON;;;;;Y;COLON EQUAL;;;; +2255;EQUALS COLON;Sm;0;ON;;;;;Y;EQUAL COLON;;;; +2256;RING IN EQUAL TO;Sm;0;ON;;;;;N;;;;; +2257;RING EQUAL TO;Sm;0;ON;;;;;N;;;;; +2258;CORRESPONDS TO;Sm;0;ON;;;;;N;;;;; +2259;ESTIMATES;Sm;0;ON;;;;;N;;;;; +225A;EQUIANGULAR TO;Sm;0;ON;;;;;N;;;;; +225B;STAR EQUALS;Sm;0;ON;;;;;N;;;;; +225C;DELTA EQUAL TO;Sm;0;ON;;;;;N;;;;; +225D;EQUAL TO BY DEFINITION;Sm;0;ON;;;;;N;;;;; +225E;MEASURED BY;Sm;0;ON;;;;;N;;;;; +225F;QUESTIONED EQUAL TO;Sm;0;ON;;;;;Y;;;;; +2260;NOT EQUAL TO;Sm;0;ON;003D 0338;;;;Y;;;;; +2261;IDENTICAL TO;Sm;0;ON;;;;;N;;;;; +2262;NOT IDENTICAL TO;Sm;0;ON;2261 0338;;;;Y;;;;; +2263;STRICTLY EQUIVALENT TO;Sm;0;ON;;;;;N;;;;; +2264;LESS-THAN OR EQUAL TO;Sm;0;ON;;;;;Y;LESS THAN OR EQUAL TO;;;; +2265;GREATER-THAN OR EQUAL TO;Sm;0;ON;;;;;Y;GREATER THAN OR EQUAL TO;;;; +2266;LESS-THAN OVER EQUAL TO;Sm;0;ON;;;;;Y;LESS THAN OVER EQUAL TO;;;; +2267;GREATER-THAN OVER EQUAL TO;Sm;0;ON;;;;;Y;GREATER THAN OVER EQUAL TO;;;; +2268;LESS-THAN BUT NOT EQUAL TO;Sm;0;ON;;;;;Y;LESS THAN BUT NOT EQUAL TO;;;; +2269;GREATER-THAN BUT NOT EQUAL TO;Sm;0;ON;;;;;Y;GREATER THAN BUT NOT EQUAL TO;;;; +226A;MUCH LESS-THAN;Sm;0;ON;;;;;Y;MUCH LESS THAN;;;; +226B;MUCH GREATER-THAN;Sm;0;ON;;;;;Y;MUCH GREATER THAN;;;; +226C;BETWEEN;Sm;0;ON;;;;;N;;;;; +226D;NOT EQUIVALENT TO;Sm;0;ON;224D 0338;;;;Y;;;;; +226E;NOT LESS-THAN;Sm;0;ON;003C 0338;;;;Y;NOT LESS THAN;;;; +226F;NOT GREATER-THAN;Sm;0;ON;003E 0338;;;;Y;NOT GREATER THAN;;;; +2270;NEITHER LESS-THAN NOR EQUAL TO;Sm;0;ON;2264 0338;;;;Y;NEITHER LESS THAN NOR EQUAL TO;;;; +2271;NEITHER GREATER-THAN NOR EQUAL TO;Sm;0;ON;2265 0338;;;;Y;NEITHER GREATER THAN NOR EQUAL TO;;;; +2272;LESS-THAN OR EQUIVALENT TO;Sm;0;ON;;;;;Y;LESS THAN OR EQUIVALENT TO;;;; +2273;GREATER-THAN OR EQUIVALENT TO;Sm;0;ON;;;;;Y;GREATER THAN OR EQUIVALENT TO;;;; +2274;NEITHER LESS-THAN NOR EQUIVALENT TO;Sm;0;ON;2272 0338;;;;Y;NEITHER LESS THAN NOR EQUIVALENT TO;;;; +2275;NEITHER GREATER-THAN NOR EQUIVALENT TO;Sm;0;ON;2273 0338;;;;Y;NEITHER GREATER THAN NOR EQUIVALENT TO;;;; +2276;LESS-THAN OR GREATER-THAN;Sm;0;ON;;;;;Y;LESS THAN OR GREATER THAN;;;; +2277;GREATER-THAN OR LESS-THAN;Sm;0;ON;;;;;Y;GREATER THAN OR LESS THAN;;;; +2278;NEITHER LESS-THAN NOR GREATER-THAN;Sm;0;ON;2276 0338;;;;Y;NEITHER LESS THAN NOR GREATER THAN;;;; +2279;NEITHER GREATER-THAN NOR LESS-THAN;Sm;0;ON;2277 0338;;;;Y;NEITHER GREATER THAN NOR LESS THAN;;;; +227A;PRECEDES;Sm;0;ON;;;;;Y;;;;; +227B;SUCCEEDS;Sm;0;ON;;;;;Y;;;;; +227C;PRECEDES OR EQUAL TO;Sm;0;ON;;;;;Y;;;;; +227D;SUCCEEDS OR EQUAL TO;Sm;0;ON;;;;;Y;;;;; +227E;PRECEDES OR EQUIVALENT TO;Sm;0;ON;;;;;Y;;;;; +227F;SUCCEEDS OR EQUIVALENT TO;Sm;0;ON;;;;;Y;;;;; +2280;DOES NOT PRECEDE;Sm;0;ON;227A 0338;;;;Y;;;;; +2281;DOES NOT SUCCEED;Sm;0;ON;227B 0338;;;;Y;;;;; +2282;SUBSET OF;Sm;0;ON;;;;;Y;;;;; +2283;SUPERSET OF;Sm;0;ON;;;;;Y;;;;; +2284;NOT A SUBSET OF;Sm;0;ON;2282 0338;;;;Y;;;;; +2285;NOT A SUPERSET OF;Sm;0;ON;2283 0338;;;;Y;;;;; +2286;SUBSET OF OR EQUAL TO;Sm;0;ON;;;;;Y;;;;; +2287;SUPERSET OF OR EQUAL TO;Sm;0;ON;;;;;Y;;;;; +2288;NEITHER A SUBSET OF NOR EQUAL TO;Sm;0;ON;2286 0338;;;;Y;;;;; +2289;NEITHER A SUPERSET OF NOR EQUAL TO;Sm;0;ON;2287 0338;;;;Y;;;;; +228A;SUBSET OF WITH NOT EQUAL TO;Sm;0;ON;;;;;Y;SUBSET OF OR NOT EQUAL TO;;;; +228B;SUPERSET OF WITH NOT EQUAL TO;Sm;0;ON;;;;;Y;SUPERSET OF OR NOT EQUAL TO;;;; +228C;MULTISET;Sm;0;ON;;;;;Y;;;;; +228D;MULTISET MULTIPLICATION;Sm;0;ON;;;;;N;;;;; +228E;MULTISET UNION;Sm;0;ON;;;;;N;;;;; +228F;SQUARE IMAGE OF;Sm;0;ON;;;;;Y;;;;; +2290;SQUARE ORIGINAL OF;Sm;0;ON;;;;;Y;;;;; +2291;SQUARE IMAGE OF OR EQUAL TO;Sm;0;ON;;;;;Y;;;;; +2292;SQUARE ORIGINAL OF OR EQUAL TO;Sm;0;ON;;;;;Y;;;;; +2293;SQUARE CAP;Sm;0;ON;;;;;N;;;;; +2294;SQUARE CUP;Sm;0;ON;;;;;N;;;;; +2295;CIRCLED PLUS;Sm;0;ON;;;;;N;;;;; +2296;CIRCLED MINUS;Sm;0;ON;;;;;N;;;;; +2297;CIRCLED TIMES;Sm;0;ON;;;;;N;;;;; +2298;CIRCLED DIVISION SLASH;Sm;0;ON;;;;;Y;;;;; +2299;CIRCLED DOT OPERATOR;Sm;0;ON;;;;;N;;;;; +229A;CIRCLED RING OPERATOR;Sm;0;ON;;;;;N;;;;; +229B;CIRCLED ASTERISK OPERATOR;Sm;0;ON;;;;;N;;;;; +229C;CIRCLED EQUALS;Sm;0;ON;;;;;N;;;;; +229D;CIRCLED DASH;Sm;0;ON;;;;;N;;;;; +229E;SQUARED PLUS;Sm;0;ON;;;;;N;;;;; +229F;SQUARED MINUS;Sm;0;ON;;;;;N;;;;; +22A0;SQUARED TIMES;Sm;0;ON;;;;;N;;;;; +22A1;SQUARED DOT OPERATOR;Sm;0;ON;;;;;N;;;;; +22A2;RIGHT TACK;Sm;0;ON;;;;;Y;;;;; +22A3;LEFT TACK;Sm;0;ON;;;;;Y;;;;; +22A4;DOWN TACK;Sm;0;ON;;;;;N;;;;; +22A5;UP TACK;Sm;0;ON;;;;;N;;;;; +22A6;ASSERTION;Sm;0;ON;;;;;Y;;;;; +22A7;MODELS;Sm;0;ON;;;;;Y;;;;; +22A8;TRUE;Sm;0;ON;;;;;Y;;;;; +22A9;FORCES;Sm;0;ON;;;;;Y;;;;; +22AA;TRIPLE VERTICAL BAR RIGHT TURNSTILE;Sm;0;ON;;;;;Y;;;;; +22AB;DOUBLE VERTICAL BAR DOUBLE RIGHT TURNSTILE;Sm;0;ON;;;;;Y;;;;; +22AC;DOES NOT PROVE;Sm;0;ON;22A2 0338;;;;Y;;;;; +22AD;NOT TRUE;Sm;0;ON;22A8 0338;;;;Y;;;;; +22AE;DOES NOT FORCE;Sm;0;ON;22A9 0338;;;;Y;;;;; +22AF;NEGATED DOUBLE VERTICAL BAR DOUBLE RIGHT TURNSTILE;Sm;0;ON;22AB 0338;;;;Y;;;;; +22B0;PRECEDES UNDER RELATION;Sm;0;ON;;;;;Y;;;;; +22B1;SUCCEEDS UNDER RELATION;Sm;0;ON;;;;;Y;;;;; +22B2;NORMAL SUBGROUP OF;Sm;0;ON;;;;;Y;;;;; +22B3;CONTAINS AS NORMAL SUBGROUP;Sm;0;ON;;;;;Y;;;;; +22B4;NORMAL SUBGROUP OF OR EQUAL TO;Sm;0;ON;;;;;Y;;;;; +22B5;CONTAINS AS NORMAL SUBGROUP OR EQUAL TO;Sm;0;ON;;;;;Y;;;;; +22B6;ORIGINAL OF;Sm;0;ON;;;;;Y;;;;; +22B7;IMAGE OF;Sm;0;ON;;;;;Y;;;;; +22B8;MULTIMAP;Sm;0;ON;;;;;Y;;;;; +22B9;HERMITIAN CONJUGATE MATRIX;Sm;0;ON;;;;;N;;;;; +22BA;INTERCALATE;Sm;0;ON;;;;;N;;;;; +22BB;XOR;Sm;0;ON;;;;;N;;;;; +22BC;NAND;Sm;0;ON;;;;;N;;;;; +22BD;NOR;Sm;0;ON;;;;;N;;;;; +22BE;RIGHT ANGLE WITH ARC;Sm;0;ON;;;;;Y;;;;; +22BF;RIGHT TRIANGLE;Sm;0;ON;;;;;Y;;;;; +22C0;N-ARY LOGICAL AND;Sm;0;ON;;;;;N;;;;; +22C1;N-ARY LOGICAL OR;Sm;0;ON;;;;;N;;;;; +22C2;N-ARY INTERSECTION;Sm;0;ON;;;;;N;;;;; +22C3;N-ARY UNION;Sm;0;ON;;;;;N;;;;; +22C4;DIAMOND OPERATOR;Sm;0;ON;;;;;N;;;;; +22C5;DOT OPERATOR;Sm;0;ON;;;;;N;;;;; +22C6;STAR OPERATOR;Sm;0;ON;;;;;N;;;;; +22C7;DIVISION TIMES;Sm;0;ON;;;;;N;;;;; +22C8;BOWTIE;Sm;0;ON;;;;;N;;;;; +22C9;LEFT NORMAL FACTOR SEMIDIRECT PRODUCT;Sm;0;ON;;;;;Y;;;;; +22CA;RIGHT NORMAL FACTOR SEMIDIRECT PRODUCT;Sm;0;ON;;;;;Y;;;;; +22CB;LEFT SEMIDIRECT PRODUCT;Sm;0;ON;;;;;Y;;;;; +22CC;RIGHT SEMIDIRECT PRODUCT;Sm;0;ON;;;;;Y;;;;; +22CD;REVERSED TILDE EQUALS;Sm;0;ON;;;;;Y;;;;; +22CE;CURLY LOGICAL OR;Sm;0;ON;;;;;N;;;;; +22CF;CURLY LOGICAL AND;Sm;0;ON;;;;;N;;;;; +22D0;DOUBLE SUBSET;Sm;0;ON;;;;;Y;;;;; +22D1;DOUBLE SUPERSET;Sm;0;ON;;;;;Y;;;;; +22D2;DOUBLE INTERSECTION;Sm;0;ON;;;;;N;;;;; +22D3;DOUBLE UNION;Sm;0;ON;;;;;N;;;;; +22D4;PITCHFORK;Sm;0;ON;;;;;N;;;;; +22D5;EQUAL AND PARALLEL TO;Sm;0;ON;;;;;N;;;;; +22D6;LESS-THAN WITH DOT;Sm;0;ON;;;;;Y;LESS THAN WITH DOT;;;; +22D7;GREATER-THAN WITH DOT;Sm;0;ON;;;;;Y;GREATER THAN WITH DOT;;;; +22D8;VERY MUCH LESS-THAN;Sm;0;ON;;;;;Y;VERY MUCH LESS THAN;;;; +22D9;VERY MUCH GREATER-THAN;Sm;0;ON;;;;;Y;VERY MUCH GREATER THAN;;;; +22DA;LESS-THAN EQUAL TO OR GREATER-THAN;Sm;0;ON;;;;;Y;LESS THAN EQUAL TO OR GREATER THAN;;;; +22DB;GREATER-THAN EQUAL TO OR LESS-THAN;Sm;0;ON;;;;;Y;GREATER THAN EQUAL TO OR LESS THAN;;;; +22DC;EQUAL TO OR LESS-THAN;Sm;0;ON;;;;;Y;EQUAL TO OR LESS THAN;;;; +22DD;EQUAL TO OR GREATER-THAN;Sm;0;ON;;;;;Y;EQUAL TO OR GREATER THAN;;;; +22DE;EQUAL TO OR PRECEDES;Sm;0;ON;;;;;Y;;;;; +22DF;EQUAL TO OR SUCCEEDS;Sm;0;ON;;;;;Y;;;;; +22E0;DOES NOT PRECEDE OR EQUAL;Sm;0;ON;227C 0338;;;;Y;;;;; +22E1;DOES NOT SUCCEED OR EQUAL;Sm;0;ON;227D 0338;;;;Y;;;;; +22E2;NOT SQUARE IMAGE OF OR EQUAL TO;Sm;0;ON;2291 0338;;;;Y;;;;; +22E3;NOT SQUARE ORIGINAL OF OR EQUAL TO;Sm;0;ON;2292 0338;;;;Y;;;;; +22E4;SQUARE IMAGE OF OR NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;; +22E5;SQUARE ORIGINAL OF OR NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;; +22E6;LESS-THAN BUT NOT EQUIVALENT TO;Sm;0;ON;;;;;Y;LESS THAN BUT NOT EQUIVALENT TO;;;; +22E7;GREATER-THAN BUT NOT EQUIVALENT TO;Sm;0;ON;;;;;Y;GREATER THAN BUT NOT EQUIVALENT TO;;;; +22E8;PRECEDES BUT NOT EQUIVALENT TO;Sm;0;ON;;;;;Y;;;;; +22E9;SUCCEEDS BUT NOT EQUIVALENT TO;Sm;0;ON;;;;;Y;;;;; +22EA;NOT NORMAL SUBGROUP OF;Sm;0;ON;22B2 0338;;;;Y;;;;; +22EB;DOES NOT CONTAIN AS NORMAL SUBGROUP;Sm;0;ON;22B3 0338;;;;Y;;;;; +22EC;NOT NORMAL SUBGROUP OF OR EQUAL TO;Sm;0;ON;22B4 0338;;;;Y;;;;; +22ED;DOES NOT CONTAIN AS NORMAL SUBGROUP OR EQUAL;Sm;0;ON;22B5 0338;;;;Y;;;;; +22EE;VERTICAL ELLIPSIS;Sm;0;ON;;;;;N;;;;; +22EF;MIDLINE HORIZONTAL ELLIPSIS;Sm;0;ON;;;;;N;;;;; +22F0;UP RIGHT DIAGONAL ELLIPSIS;Sm;0;ON;;;;;Y;;;;; +22F1;DOWN RIGHT DIAGONAL ELLIPSIS;Sm;0;ON;;;;;Y;;;;; +22F2;ELEMENT OF WITH LONG HORIZONTAL STROKE;Sm;0;ON;;;;;Y;;;;; +22F3;ELEMENT OF WITH VERTICAL BAR AT END OF HORIZONTAL STROKE;Sm;0;ON;;;;;Y;;;;; +22F4;SMALL ELEMENT OF WITH VERTICAL BAR AT END OF HORIZONTAL STROKE;Sm;0;ON;;;;;Y;;;;; +22F5;ELEMENT OF WITH DOT ABOVE;Sm;0;ON;;;;;Y;;;;; +22F6;ELEMENT OF WITH OVERBAR;Sm;0;ON;;;;;Y;;;;; +22F7;SMALL ELEMENT OF WITH OVERBAR;Sm;0;ON;;;;;Y;;;;; +22F8;ELEMENT OF WITH UNDERBAR;Sm;0;ON;;;;;Y;;;;; +22F9;ELEMENT OF WITH TWO HORIZONTAL STROKES;Sm;0;ON;;;;;Y;;;;; +22FA;CONTAINS WITH LONG HORIZONTAL STROKE;Sm;0;ON;;;;;Y;;;;; +22FB;CONTAINS WITH VERTICAL BAR AT END OF HORIZONTAL STROKE;Sm;0;ON;;;;;Y;;;;; +22FC;SMALL CONTAINS WITH VERTICAL BAR AT END OF HORIZONTAL STROKE;Sm;0;ON;;;;;Y;;;;; +22FD;CONTAINS WITH OVERBAR;Sm;0;ON;;;;;Y;;;;; +22FE;SMALL CONTAINS WITH OVERBAR;Sm;0;ON;;;;;Y;;;;; +22FF;Z NOTATION BAG MEMBERSHIP;Sm;0;ON;;;;;Y;;;;; +2300;DIAMETER SIGN;So;0;ON;;;;;N;;;;; +2301;ELECTRIC ARROW;So;0;ON;;;;;N;;;;; +2302;HOUSE;So;0;ON;;;;;N;;;;; +2303;UP ARROWHEAD;So;0;ON;;;;;N;;;;; +2304;DOWN ARROWHEAD;So;0;ON;;;;;N;;;;; +2305;PROJECTIVE;So;0;ON;;;;;N;;;;; +2306;PERSPECTIVE;So;0;ON;;;;;N;;;;; +2307;WAVY LINE;So;0;ON;;;;;N;;;;; +2308;LEFT CEILING;Ps;0;ON;;;;;Y;;;;; +2309;RIGHT CEILING;Pe;0;ON;;;;;Y;;;;; +230A;LEFT FLOOR;Ps;0;ON;;;;;Y;;;;; +230B;RIGHT FLOOR;Pe;0;ON;;;;;Y;;;;; +230C;BOTTOM RIGHT CROP;So;0;ON;;;;;N;;;;; +230D;BOTTOM LEFT CROP;So;0;ON;;;;;N;;;;; +230E;TOP RIGHT CROP;So;0;ON;;;;;N;;;;; +230F;TOP LEFT CROP;So;0;ON;;;;;N;;;;; +2310;REVERSED NOT SIGN;So;0;ON;;;;;N;;;;; +2311;SQUARE LOZENGE;So;0;ON;;;;;N;;;;; +2312;ARC;So;0;ON;;;;;N;;;;; +2313;SEGMENT;So;0;ON;;;;;N;;;;; +2314;SECTOR;So;0;ON;;;;;N;;;;; +2315;TELEPHONE RECORDER;So;0;ON;;;;;N;;;;; +2316;POSITION INDICATOR;So;0;ON;;;;;N;;;;; +2317;VIEWDATA SQUARE;So;0;ON;;;;;N;;;;; +2318;PLACE OF INTEREST SIGN;So;0;ON;;;;;N;COMMAND KEY;;;; +2319;TURNED NOT SIGN;So;0;ON;;;;;N;;;;; +231A;WATCH;So;0;ON;;;;;N;;;;; +231B;HOURGLASS;So;0;ON;;;;;N;;;;; +231C;TOP LEFT CORNER;So;0;ON;;;;;N;;;;; +231D;TOP RIGHT CORNER;So;0;ON;;;;;N;;;;; +231E;BOTTOM LEFT CORNER;So;0;ON;;;;;N;;;;; +231F;BOTTOM RIGHT CORNER;So;0;ON;;;;;N;;;;; +2320;TOP HALF INTEGRAL;Sm;0;ON;;;;;Y;;;;; +2321;BOTTOM HALF INTEGRAL;Sm;0;ON;;;;;Y;;;;; +2322;FROWN;So;0;ON;;;;;N;;;;; +2323;SMILE;So;0;ON;;;;;N;;;;; +2324;UP ARROWHEAD BETWEEN TWO HORIZONTAL BARS;So;0;ON;;;;;N;ENTER KEY;;;; +2325;OPTION KEY;So;0;ON;;;;;N;;;;; +2326;ERASE TO THE RIGHT;So;0;ON;;;;;N;DELETE TO THE RIGHT KEY;;;; +2327;X IN A RECTANGLE BOX;So;0;ON;;;;;N;CLEAR KEY;;;; +2328;KEYBOARD;So;0;ON;;;;;N;;;;; +2329;LEFT-POINTING ANGLE BRACKET;Ps;0;ON;3008;;;;Y;BRA;;;; +232A;RIGHT-POINTING ANGLE BRACKET;Pe;0;ON;3009;;;;Y;KET;;;; +232B;ERASE TO THE LEFT;So;0;ON;;;;;N;DELETE TO THE LEFT KEY;;;; +232C;BENZENE RING;So;0;ON;;;;;N;;;;; +232D;CYLINDRICITY;So;0;ON;;;;;N;;;;; +232E;ALL AROUND-PROFILE;So;0;ON;;;;;N;;;;; +232F;SYMMETRY;So;0;ON;;;;;N;;;;; +2330;TOTAL RUNOUT;So;0;ON;;;;;N;;;;; +2331;DIMENSION ORIGIN;So;0;ON;;;;;N;;;;; +2332;CONICAL TAPER;So;0;ON;;;;;N;;;;; +2333;SLOPE;So;0;ON;;;;;N;;;;; +2334;COUNTERBORE;So;0;ON;;;;;N;;;;; +2335;COUNTERSINK;So;0;ON;;;;;N;;;;; +2336;APL FUNCTIONAL SYMBOL I-BEAM;So;0;L;;;;;N;;;;; +2337;APL FUNCTIONAL SYMBOL SQUISH QUAD;So;0;L;;;;;N;;;;; +2338;APL FUNCTIONAL SYMBOL QUAD EQUAL;So;0;L;;;;;N;;;;; +2339;APL FUNCTIONAL SYMBOL QUAD DIVIDE;So;0;L;;;;;N;;;;; +233A;APL FUNCTIONAL SYMBOL QUAD DIAMOND;So;0;L;;;;;N;;;;; +233B;APL FUNCTIONAL SYMBOL QUAD JOT;So;0;L;;;;;N;;;;; +233C;APL FUNCTIONAL SYMBOL QUAD CIRCLE;So;0;L;;;;;N;;;;; +233D;APL FUNCTIONAL SYMBOL CIRCLE STILE;So;0;L;;;;;N;;;;; +233E;APL FUNCTIONAL SYMBOL CIRCLE JOT;So;0;L;;;;;N;;;;; +233F;APL FUNCTIONAL SYMBOL SLASH BAR;So;0;L;;;;;N;;;;; +2340;APL FUNCTIONAL SYMBOL BACKSLASH BAR;So;0;L;;;;;N;;;;; +2341;APL FUNCTIONAL SYMBOL QUAD SLASH;So;0;L;;;;;N;;;;; +2342;APL FUNCTIONAL SYMBOL QUAD BACKSLASH;So;0;L;;;;;N;;;;; +2343;APL FUNCTIONAL SYMBOL QUAD LESS-THAN;So;0;L;;;;;N;;;;; +2344;APL FUNCTIONAL SYMBOL QUAD GREATER-THAN;So;0;L;;;;;N;;;;; +2345;APL FUNCTIONAL SYMBOL LEFTWARDS VANE;So;0;L;;;;;N;;;;; +2346;APL FUNCTIONAL SYMBOL RIGHTWARDS VANE;So;0;L;;;;;N;;;;; +2347;APL FUNCTIONAL SYMBOL QUAD LEFTWARDS ARROW;So;0;L;;;;;N;;;;; +2348;APL FUNCTIONAL SYMBOL QUAD RIGHTWARDS ARROW;So;0;L;;;;;N;;;;; +2349;APL FUNCTIONAL SYMBOL CIRCLE BACKSLASH;So;0;L;;;;;N;;;;; +234A;APL FUNCTIONAL SYMBOL DOWN TACK UNDERBAR;So;0;L;;;;;N;;;;; +234B;APL FUNCTIONAL SYMBOL DELTA STILE;So;0;L;;;;;N;;;;; +234C;APL FUNCTIONAL SYMBOL QUAD DOWN CARET;So;0;L;;;;;N;;;;; +234D;APL FUNCTIONAL SYMBOL QUAD DELTA;So;0;L;;;;;N;;;;; +234E;APL FUNCTIONAL SYMBOL DOWN TACK JOT;So;0;L;;;;;N;;;;; +234F;APL FUNCTIONAL SYMBOL UPWARDS VANE;So;0;L;;;;;N;;;;; +2350;APL FUNCTIONAL SYMBOL QUAD UPWARDS ARROW;So;0;L;;;;;N;;;;; +2351;APL FUNCTIONAL SYMBOL UP TACK OVERBAR;So;0;L;;;;;N;;;;; +2352;APL FUNCTIONAL SYMBOL DEL STILE;So;0;L;;;;;N;;;;; +2353;APL FUNCTIONAL SYMBOL QUAD UP CARET;So;0;L;;;;;N;;;;; +2354;APL FUNCTIONAL SYMBOL QUAD DEL;So;0;L;;;;;N;;;;; +2355;APL FUNCTIONAL SYMBOL UP TACK JOT;So;0;L;;;;;N;;;;; +2356;APL FUNCTIONAL SYMBOL DOWNWARDS VANE;So;0;L;;;;;N;;;;; +2357;APL FUNCTIONAL SYMBOL QUAD DOWNWARDS ARROW;So;0;L;;;;;N;;;;; +2358;APL FUNCTIONAL SYMBOL QUOTE UNDERBAR;So;0;L;;;;;N;;;;; +2359;APL FUNCTIONAL SYMBOL DELTA UNDERBAR;So;0;L;;;;;N;;;;; +235A;APL FUNCTIONAL SYMBOL DIAMOND UNDERBAR;So;0;L;;;;;N;;;;; +235B;APL FUNCTIONAL SYMBOL JOT UNDERBAR;So;0;L;;;;;N;;;;; +235C;APL FUNCTIONAL SYMBOL CIRCLE UNDERBAR;So;0;L;;;;;N;;;;; +235D;APL FUNCTIONAL SYMBOL UP SHOE JOT;So;0;L;;;;;N;;;;; +235E;APL FUNCTIONAL SYMBOL QUOTE QUAD;So;0;L;;;;;N;;;;; +235F;APL FUNCTIONAL SYMBOL CIRCLE STAR;So;0;L;;;;;N;;;;; +2360;APL FUNCTIONAL SYMBOL QUAD COLON;So;0;L;;;;;N;;;;; +2361;APL FUNCTIONAL SYMBOL UP TACK DIAERESIS;So;0;L;;;;;N;;;;; +2362;APL FUNCTIONAL SYMBOL DEL DIAERESIS;So;0;L;;;;;N;;;;; +2363;APL FUNCTIONAL SYMBOL STAR DIAERESIS;So;0;L;;;;;N;;;;; +2364;APL FUNCTIONAL SYMBOL JOT DIAERESIS;So;0;L;;;;;N;;;;; +2365;APL FUNCTIONAL SYMBOL CIRCLE DIAERESIS;So;0;L;;;;;N;;;;; +2366;APL FUNCTIONAL SYMBOL DOWN SHOE STILE;So;0;L;;;;;N;;;;; +2367;APL FUNCTIONAL SYMBOL LEFT SHOE STILE;So;0;L;;;;;N;;;;; +2368;APL FUNCTIONAL SYMBOL TILDE DIAERESIS;So;0;L;;;;;N;;;;; +2369;APL FUNCTIONAL SYMBOL GREATER-THAN DIAERESIS;So;0;L;;;;;N;;;;; +236A;APL FUNCTIONAL SYMBOL COMMA BAR;So;0;L;;;;;N;;;;; +236B;APL FUNCTIONAL SYMBOL DEL TILDE;So;0;L;;;;;N;;;;; +236C;APL FUNCTIONAL SYMBOL ZILDE;So;0;L;;;;;N;;;;; +236D;APL FUNCTIONAL SYMBOL STILE TILDE;So;0;L;;;;;N;;;;; +236E;APL FUNCTIONAL SYMBOL SEMICOLON UNDERBAR;So;0;L;;;;;N;;;;; +236F;APL FUNCTIONAL SYMBOL QUAD NOT EQUAL;So;0;L;;;;;N;;;;; +2370;APL FUNCTIONAL SYMBOL QUAD QUESTION;So;0;L;;;;;N;;;;; +2371;APL FUNCTIONAL SYMBOL DOWN CARET TILDE;So;0;L;;;;;N;;;;; +2372;APL FUNCTIONAL SYMBOL UP CARET TILDE;So;0;L;;;;;N;;;;; +2373;APL FUNCTIONAL SYMBOL IOTA;So;0;L;;;;;N;;;;; +2374;APL FUNCTIONAL SYMBOL RHO;So;0;L;;;;;N;;;;; +2375;APL FUNCTIONAL SYMBOL OMEGA;So;0;L;;;;;N;;;;; +2376;APL FUNCTIONAL SYMBOL ALPHA UNDERBAR;So;0;L;;;;;N;;;;; +2377;APL FUNCTIONAL SYMBOL EPSILON UNDERBAR;So;0;L;;;;;N;;;;; +2378;APL FUNCTIONAL SYMBOL IOTA UNDERBAR;So;0;L;;;;;N;;;;; +2379;APL FUNCTIONAL SYMBOL OMEGA UNDERBAR;So;0;L;;;;;N;;;;; +237A;APL FUNCTIONAL SYMBOL ALPHA;So;0;L;;;;;N;;;;; +237B;NOT CHECK MARK;So;0;ON;;;;;N;;;;; +237C;RIGHT ANGLE WITH DOWNWARDS ZIGZAG ARROW;Sm;0;ON;;;;;N;;;;; +237D;SHOULDERED OPEN BOX;So;0;ON;;;;;N;;;;; +237E;BELL SYMBOL;So;0;ON;;;;;N;;;;; +237F;VERTICAL LINE WITH MIDDLE DOT;So;0;ON;;;;;N;;;;; +2380;INSERTION SYMBOL;So;0;ON;;;;;N;;;;; +2381;CONTINUOUS UNDERLINE SYMBOL;So;0;ON;;;;;N;;;;; +2382;DISCONTINUOUS UNDERLINE SYMBOL;So;0;ON;;;;;N;;;;; +2383;EMPHASIS SYMBOL;So;0;ON;;;;;N;;;;; +2384;COMPOSITION SYMBOL;So;0;ON;;;;;N;;;;; +2385;WHITE SQUARE WITH CENTRE VERTICAL LINE;So;0;ON;;;;;N;;;;; +2386;ENTER SYMBOL;So;0;ON;;;;;N;;;;; +2387;ALTERNATIVE KEY SYMBOL;So;0;ON;;;;;N;;;;; +2388;HELM SYMBOL;So;0;ON;;;;;N;;;;; +2389;CIRCLED HORIZONTAL BAR WITH NOTCH;So;0;ON;;;;;N;;;;; +238A;CIRCLED TRIANGLE DOWN;So;0;ON;;;;;N;;;;; +238B;BROKEN CIRCLE WITH NORTHWEST ARROW;So;0;ON;;;;;N;;;;; +238C;UNDO SYMBOL;So;0;ON;;;;;N;;;;; +238D;MONOSTABLE SYMBOL;So;0;ON;;;;;N;;;;; +238E;HYSTERESIS SYMBOL;So;0;ON;;;;;N;;;;; +238F;OPEN-CIRCUIT-OUTPUT H-TYPE SYMBOL;So;0;ON;;;;;N;;;;; +2390;OPEN-CIRCUIT-OUTPUT L-TYPE SYMBOL;So;0;ON;;;;;N;;;;; +2391;PASSIVE-PULL-DOWN-OUTPUT SYMBOL;So;0;ON;;;;;N;;;;; +2392;PASSIVE-PULL-UP-OUTPUT SYMBOL;So;0;ON;;;;;N;;;;; +2393;DIRECT CURRENT SYMBOL FORM TWO;So;0;ON;;;;;N;;;;; +2394;SOFTWARE-FUNCTION SYMBOL;So;0;ON;;;;;N;;;;; +2395;APL FUNCTIONAL SYMBOL QUAD;So;0;L;;;;;N;;;;; +2396;DECIMAL SEPARATOR KEY SYMBOL;So;0;ON;;;;;N;;;;; +2397;PREVIOUS PAGE;So;0;ON;;;;;N;;;;; +2398;NEXT PAGE;So;0;ON;;;;;N;;;;; +2399;PRINT SCREEN SYMBOL;So;0;ON;;;;;N;;;;; +239A;CLEAR SCREEN SYMBOL;So;0;ON;;;;;N;;;;; +239B;LEFT PARENTHESIS UPPER HOOK;Sm;0;ON;;;;;N;;;;; +239C;LEFT PARENTHESIS EXTENSION;Sm;0;ON;;;;;N;;;;; +239D;LEFT PARENTHESIS LOWER HOOK;Sm;0;ON;;;;;N;;;;; +239E;RIGHT PARENTHESIS UPPER HOOK;Sm;0;ON;;;;;N;;;;; +239F;RIGHT PARENTHESIS EXTENSION;Sm;0;ON;;;;;N;;;;; +23A0;RIGHT PARENTHESIS LOWER HOOK;Sm;0;ON;;;;;N;;;;; +23A1;LEFT SQUARE BRACKET UPPER CORNER;Sm;0;ON;;;;;N;;;;; +23A2;LEFT SQUARE BRACKET EXTENSION;Sm;0;ON;;;;;N;;;;; +23A3;LEFT SQUARE BRACKET LOWER CORNER;Sm;0;ON;;;;;N;;;;; +23A4;RIGHT SQUARE BRACKET UPPER CORNER;Sm;0;ON;;;;;N;;;;; +23A5;RIGHT SQUARE BRACKET EXTENSION;Sm;0;ON;;;;;N;;;;; +23A6;RIGHT SQUARE BRACKET LOWER CORNER;Sm;0;ON;;;;;N;;;;; +23A7;LEFT CURLY BRACKET UPPER HOOK;Sm;0;ON;;;;;N;;;;; +23A8;LEFT CURLY BRACKET MIDDLE PIECE;Sm;0;ON;;;;;N;;;;; +23A9;LEFT CURLY BRACKET LOWER HOOK;Sm;0;ON;;;;;N;;;;; +23AA;CURLY BRACKET EXTENSION;Sm;0;ON;;;;;N;;;;; +23AB;RIGHT CURLY BRACKET UPPER HOOK;Sm;0;ON;;;;;N;;;;; +23AC;RIGHT CURLY BRACKET MIDDLE PIECE;Sm;0;ON;;;;;N;;;;; +23AD;RIGHT CURLY BRACKET LOWER HOOK;Sm;0;ON;;;;;N;;;;; +23AE;INTEGRAL EXTENSION;Sm;0;ON;;;;;N;;;;; +23AF;HORIZONTAL LINE EXTENSION;Sm;0;ON;;;;;N;;;;; +23B0;UPPER LEFT OR LOWER RIGHT CURLY BRACKET SECTION;Sm;0;ON;;;;;N;;;;; +23B1;UPPER RIGHT OR LOWER LEFT CURLY BRACKET SECTION;Sm;0;ON;;;;;N;;;;; +23B2;SUMMATION TOP;Sm;0;ON;;;;;N;;;;; +23B3;SUMMATION BOTTOM;Sm;0;ON;;;;;N;;;;; +23B4;TOP SQUARE BRACKET;So;0;ON;;;;;N;;;;; +23B5;BOTTOM SQUARE BRACKET;So;0;ON;;;;;N;;;;; +23B6;BOTTOM SQUARE BRACKET OVER TOP SQUARE BRACKET;So;0;ON;;;;;N;;;;; +23B7;RADICAL SYMBOL BOTTOM;So;0;ON;;;;;N;;;;; +23B8;LEFT VERTICAL BOX LINE;So;0;ON;;;;;N;;;;; +23B9;RIGHT VERTICAL BOX LINE;So;0;ON;;;;;N;;;;; +23BA;HORIZONTAL SCAN LINE-1;So;0;ON;;;;;N;;;;; +23BB;HORIZONTAL SCAN LINE-3;So;0;ON;;;;;N;;;;; +23BC;HORIZONTAL SCAN LINE-7;So;0;ON;;;;;N;;;;; +23BD;HORIZONTAL SCAN LINE-9;So;0;ON;;;;;N;;;;; +23BE;DENTISTRY SYMBOL LIGHT VERTICAL AND TOP RIGHT;So;0;ON;;;;;N;;;;; +23BF;DENTISTRY SYMBOL LIGHT VERTICAL AND BOTTOM RIGHT;So;0;ON;;;;;N;;;;; +23C0;DENTISTRY SYMBOL LIGHT VERTICAL WITH CIRCLE;So;0;ON;;;;;N;;;;; +23C1;DENTISTRY SYMBOL LIGHT DOWN AND HORIZONTAL WITH CIRCLE;So;0;ON;;;;;N;;;;; +23C2;DENTISTRY SYMBOL LIGHT UP AND HORIZONTAL WITH CIRCLE;So;0;ON;;;;;N;;;;; +23C3;DENTISTRY SYMBOL LIGHT VERTICAL WITH TRIANGLE;So;0;ON;;;;;N;;;;; +23C4;DENTISTRY SYMBOL LIGHT DOWN AND HORIZONTAL WITH TRIANGLE;So;0;ON;;;;;N;;;;; +23C5;DENTISTRY SYMBOL LIGHT UP AND HORIZONTAL WITH TRIANGLE;So;0;ON;;;;;N;;;;; +23C6;DENTISTRY SYMBOL LIGHT VERTICAL AND WAVE;So;0;ON;;;;;N;;;;; +23C7;DENTISTRY SYMBOL LIGHT DOWN AND HORIZONTAL WITH WAVE;So;0;ON;;;;;N;;;;; +23C8;DENTISTRY SYMBOL LIGHT UP AND HORIZONTAL WITH WAVE;So;0;ON;;;;;N;;;;; +23C9;DENTISTRY SYMBOL LIGHT DOWN AND HORIZONTAL;So;0;ON;;;;;N;;;;; +23CA;DENTISTRY SYMBOL LIGHT UP AND HORIZONTAL;So;0;ON;;;;;N;;;;; +23CB;DENTISTRY SYMBOL LIGHT VERTICAL AND TOP LEFT;So;0;ON;;;;;N;;;;; +23CC;DENTISTRY SYMBOL LIGHT VERTICAL AND BOTTOM LEFT;So;0;ON;;;;;N;;;;; +23CD;SQUARE FOOT;So;0;ON;;;;;N;;;;; +23CE;RETURN SYMBOL;So;0;ON;;;;;N;;;;; +23CF;EJECT SYMBOL;So;0;ON;;;;;N;;;;; +23D0;VERTICAL LINE EXTENSION;So;0;ON;;;;;N;;;;; +23D1;METRICAL BREVE;So;0;ON;;;;;N;;;;; +23D2;METRICAL LONG OVER SHORT;So;0;ON;;;;;N;;;;; +23D3;METRICAL SHORT OVER LONG;So;0;ON;;;;;N;;;;; +23D4;METRICAL LONG OVER TWO SHORTS;So;0;ON;;;;;N;;;;; +23D5;METRICAL TWO SHORTS OVER LONG;So;0;ON;;;;;N;;;;; +23D6;METRICAL TWO SHORTS JOINED;So;0;ON;;;;;N;;;;; +23D7;METRICAL TRISEME;So;0;ON;;;;;N;;;;; +23D8;METRICAL TETRASEME;So;0;ON;;;;;N;;;;; +23D9;METRICAL PENTASEME;So;0;ON;;;;;N;;;;; +23DA;EARTH GROUND;So;0;ON;;;;;N;;;;; +23DB;FUSE;So;0;ON;;;;;N;;;;; +23DC;TOP PARENTHESIS;Sm;0;ON;;;;;N;;;;; +23DD;BOTTOM PARENTHESIS;Sm;0;ON;;;;;N;;;;; +23DE;TOP CURLY BRACKET;Sm;0;ON;;;;;N;;;;; +23DF;BOTTOM CURLY BRACKET;Sm;0;ON;;;;;N;;;;; +23E0;TOP TORTOISE SHELL BRACKET;Sm;0;ON;;;;;N;;;;; +23E1;BOTTOM TORTOISE SHELL BRACKET;Sm;0;ON;;;;;N;;;;; +23E2;WHITE TRAPEZIUM;So;0;ON;;;;;N;;;;; +23E3;BENZENE RING WITH CIRCLE;So;0;ON;;;;;N;;;;; +23E4;STRAIGHTNESS;So;0;ON;;;;;N;;;;; +23E5;FLATNESS;So;0;ON;;;;;N;;;;; +23E6;AC CURRENT;So;0;ON;;;;;N;;;;; +23E7;ELECTRICAL INTERSECTION;So;0;ON;;;;;N;;;;; +23E8;DECIMAL EXPONENT SYMBOL;So;0;ON;;;;;N;;;;; +23E9;BLACK RIGHT-POINTING DOUBLE TRIANGLE;So;0;ON;;;;;N;;;;; +23EA;BLACK LEFT-POINTING DOUBLE TRIANGLE;So;0;ON;;;;;N;;;;; +23EB;BLACK UP-POINTING DOUBLE TRIANGLE;So;0;ON;;;;;N;;;;; +23EC;BLACK DOWN-POINTING DOUBLE TRIANGLE;So;0;ON;;;;;N;;;;; +23ED;BLACK RIGHT-POINTING DOUBLE TRIANGLE WITH VERTICAL BAR;So;0;ON;;;;;N;;;;; +23EE;BLACK LEFT-POINTING DOUBLE TRIANGLE WITH VERTICAL BAR;So;0;ON;;;;;N;;;;; +23EF;BLACK RIGHT-POINTING TRIANGLE WITH DOUBLE VERTICAL BAR;So;0;ON;;;;;N;;;;; +23F0;ALARM CLOCK;So;0;ON;;;;;N;;;;; +23F1;STOPWATCH;So;0;ON;;;;;N;;;;; +23F2;TIMER CLOCK;So;0;ON;;;;;N;;;;; +23F3;HOURGLASS WITH FLOWING SAND;So;0;ON;;;;;N;;;;; +23F4;BLACK MEDIUM LEFT-POINTING TRIANGLE;So;0;ON;;;;;N;;;;; +23F5;BLACK MEDIUM RIGHT-POINTING TRIANGLE;So;0;ON;;;;;N;;;;; +23F6;BLACK MEDIUM UP-POINTING TRIANGLE;So;0;ON;;;;;N;;;;; +23F7;BLACK MEDIUM DOWN-POINTING TRIANGLE;So;0;ON;;;;;N;;;;; +23F8;DOUBLE VERTICAL BAR;So;0;ON;;;;;N;;;;; +23F9;BLACK SQUARE FOR STOP;So;0;ON;;;;;N;;;;; +23FA;BLACK CIRCLE FOR RECORD;So;0;ON;;;;;N;;;;; +23FB;POWER SYMBOL;So;0;ON;;;;;N;;;;; +23FC;POWER ON-OFF SYMBOL;So;0;ON;;;;;N;;;;; +23FD;POWER ON SYMBOL;So;0;ON;;;;;N;;;;; +23FE;POWER SLEEP SYMBOL;So;0;ON;;;;;N;;;;; +23FF;OBSERVER EYE SYMBOL;So;0;ON;;;;;N;;;;; +2400;SYMBOL FOR NULL;So;0;ON;;;;;N;GRAPHIC FOR NULL;;;; +2401;SYMBOL FOR START OF HEADING;So;0;ON;;;;;N;GRAPHIC FOR START OF HEADING;;;; +2402;SYMBOL FOR START OF TEXT;So;0;ON;;;;;N;GRAPHIC FOR START OF TEXT;;;; +2403;SYMBOL FOR END OF TEXT;So;0;ON;;;;;N;GRAPHIC FOR END OF TEXT;;;; +2404;SYMBOL FOR END OF TRANSMISSION;So;0;ON;;;;;N;GRAPHIC FOR END OF TRANSMISSION;;;; +2405;SYMBOL FOR ENQUIRY;So;0;ON;;;;;N;GRAPHIC FOR ENQUIRY;;;; +2406;SYMBOL FOR ACKNOWLEDGE;So;0;ON;;;;;N;GRAPHIC FOR ACKNOWLEDGE;;;; +2407;SYMBOL FOR BELL;So;0;ON;;;;;N;GRAPHIC FOR BELL;;;; +2408;SYMBOL FOR BACKSPACE;So;0;ON;;;;;N;GRAPHIC FOR BACKSPACE;;;; +2409;SYMBOL FOR HORIZONTAL TABULATION;So;0;ON;;;;;N;GRAPHIC FOR HORIZONTAL TABULATION;;;; +240A;SYMBOL FOR LINE FEED;So;0;ON;;;;;N;GRAPHIC FOR LINE FEED;;;; +240B;SYMBOL FOR VERTICAL TABULATION;So;0;ON;;;;;N;GRAPHIC FOR VERTICAL TABULATION;;;; +240C;SYMBOL FOR FORM FEED;So;0;ON;;;;;N;GRAPHIC FOR FORM FEED;;;; +240D;SYMBOL FOR CARRIAGE RETURN;So;0;ON;;;;;N;GRAPHIC FOR CARRIAGE RETURN;;;; +240E;SYMBOL FOR SHIFT OUT;So;0;ON;;;;;N;GRAPHIC FOR SHIFT OUT;;;; +240F;SYMBOL FOR SHIFT IN;So;0;ON;;;;;N;GRAPHIC FOR SHIFT IN;;;; +2410;SYMBOL FOR DATA LINK ESCAPE;So;0;ON;;;;;N;GRAPHIC FOR DATA LINK ESCAPE;;;; +2411;SYMBOL FOR DEVICE CONTROL ONE;So;0;ON;;;;;N;GRAPHIC FOR DEVICE CONTROL ONE;;;; +2412;SYMBOL FOR DEVICE CONTROL TWO;So;0;ON;;;;;N;GRAPHIC FOR DEVICE CONTROL TWO;;;; +2413;SYMBOL FOR DEVICE CONTROL THREE;So;0;ON;;;;;N;GRAPHIC FOR DEVICE CONTROL THREE;;;; +2414;SYMBOL FOR DEVICE CONTROL FOUR;So;0;ON;;;;;N;GRAPHIC FOR DEVICE CONTROL FOUR;;;; +2415;SYMBOL FOR NEGATIVE ACKNOWLEDGE;So;0;ON;;;;;N;GRAPHIC FOR NEGATIVE ACKNOWLEDGE;;;; +2416;SYMBOL FOR SYNCHRONOUS IDLE;So;0;ON;;;;;N;GRAPHIC FOR SYNCHRONOUS IDLE;;;; +2417;SYMBOL FOR END OF TRANSMISSION BLOCK;So;0;ON;;;;;N;GRAPHIC FOR END OF TRANSMISSION BLOCK;;;; +2418;SYMBOL FOR CANCEL;So;0;ON;;;;;N;GRAPHIC FOR CANCEL;;;; +2419;SYMBOL FOR END OF MEDIUM;So;0;ON;;;;;N;GRAPHIC FOR END OF MEDIUM;;;; +241A;SYMBOL FOR SUBSTITUTE;So;0;ON;;;;;N;GRAPHIC FOR SUBSTITUTE;;;; +241B;SYMBOL FOR ESCAPE;So;0;ON;;;;;N;GRAPHIC FOR ESCAPE;;;; +241C;SYMBOL FOR FILE SEPARATOR;So;0;ON;;;;;N;GRAPHIC FOR FILE SEPARATOR;;;; +241D;SYMBOL FOR GROUP SEPARATOR;So;0;ON;;;;;N;GRAPHIC FOR GROUP SEPARATOR;;;; +241E;SYMBOL FOR RECORD SEPARATOR;So;0;ON;;;;;N;GRAPHIC FOR RECORD SEPARATOR;;;; +241F;SYMBOL FOR UNIT SEPARATOR;So;0;ON;;;;;N;GRAPHIC FOR UNIT SEPARATOR;;;; +2420;SYMBOL FOR SPACE;So;0;ON;;;;;N;GRAPHIC FOR SPACE;;;; +2421;SYMBOL FOR DELETE;So;0;ON;;;;;N;GRAPHIC FOR DELETE;;;; +2422;BLANK SYMBOL;So;0;ON;;;;;N;BLANK;;;; +2423;OPEN BOX;So;0;ON;;;;;N;;;;; +2424;SYMBOL FOR NEWLINE;So;0;ON;;;;;N;GRAPHIC FOR NEWLINE;;;; +2425;SYMBOL FOR DELETE FORM TWO;So;0;ON;;;;;N;;;;; +2426;SYMBOL FOR SUBSTITUTE FORM TWO;So;0;ON;;;;;N;;;;; +2427;SYMBOL FOR DELETE SQUARE CHECKER BOARD FORM;So;0;ON;;;;;N;;;;; +2428;SYMBOL FOR DELETE RECTANGULAR CHECKER BOARD FORM;So;0;ON;;;;;N;;;;; +2429;SYMBOL FOR DELETE MEDIUM SHADE FORM;So;0;ON;;;;;N;;;;; +2440;OCR HOOK;So;0;ON;;;;;N;;;;; +2441;OCR CHAIR;So;0;ON;;;;;N;;;;; +2442;OCR FORK;So;0;ON;;;;;N;;;;; +2443;OCR INVERTED FORK;So;0;ON;;;;;N;;;;; +2444;OCR BELT BUCKLE;So;0;ON;;;;;N;;;;; +2445;OCR BOW TIE;So;0;ON;;;;;N;;;;; +2446;OCR BRANCH BANK IDENTIFICATION;So;0;ON;;;;;N;;;;; +2447;OCR AMOUNT OF CHECK;So;0;ON;;;;;N;;;;; +2448;OCR DASH;So;0;ON;;;;;N;;;;; +2449;OCR CUSTOMER ACCOUNT NUMBER;So;0;ON;;;;;N;;;;; +244A;OCR DOUBLE BACKSLASH;So;0;ON;;;;;N;;;;; +2460;CIRCLED DIGIT ONE;No;0;ON; 0031;;1;1;N;;;;; +2461;CIRCLED DIGIT TWO;No;0;ON; 0032;;2;2;N;;;;; +2462;CIRCLED DIGIT THREE;No;0;ON; 0033;;3;3;N;;;;; +2463;CIRCLED DIGIT FOUR;No;0;ON; 0034;;4;4;N;;;;; +2464;CIRCLED DIGIT FIVE;No;0;ON; 0035;;5;5;N;;;;; +2465;CIRCLED DIGIT SIX;No;0;ON; 0036;;6;6;N;;;;; +2466;CIRCLED DIGIT SEVEN;No;0;ON; 0037;;7;7;N;;;;; +2467;CIRCLED DIGIT EIGHT;No;0;ON; 0038;;8;8;N;;;;; +2468;CIRCLED DIGIT NINE;No;0;ON; 0039;;9;9;N;;;;; +2469;CIRCLED NUMBER TEN;No;0;ON; 0031 0030;;;10;N;;;;; +246A;CIRCLED NUMBER ELEVEN;No;0;ON; 0031 0031;;;11;N;;;;; +246B;CIRCLED NUMBER TWELVE;No;0;ON; 0031 0032;;;12;N;;;;; +246C;CIRCLED NUMBER THIRTEEN;No;0;ON; 0031 0033;;;13;N;;;;; +246D;CIRCLED NUMBER FOURTEEN;No;0;ON; 0031 0034;;;14;N;;;;; +246E;CIRCLED NUMBER FIFTEEN;No;0;ON; 0031 0035;;;15;N;;;;; +246F;CIRCLED NUMBER SIXTEEN;No;0;ON; 0031 0036;;;16;N;;;;; +2470;CIRCLED NUMBER SEVENTEEN;No;0;ON; 0031 0037;;;17;N;;;;; +2471;CIRCLED NUMBER EIGHTEEN;No;0;ON; 0031 0038;;;18;N;;;;; +2472;CIRCLED NUMBER NINETEEN;No;0;ON; 0031 0039;;;19;N;;;;; +2473;CIRCLED NUMBER TWENTY;No;0;ON; 0032 0030;;;20;N;;;;; +2474;PARENTHESIZED DIGIT ONE;No;0;ON; 0028 0031 0029;;1;1;N;;;;; +2475;PARENTHESIZED DIGIT TWO;No;0;ON; 0028 0032 0029;;2;2;N;;;;; +2476;PARENTHESIZED DIGIT THREE;No;0;ON; 0028 0033 0029;;3;3;N;;;;; +2477;PARENTHESIZED DIGIT FOUR;No;0;ON; 0028 0034 0029;;4;4;N;;;;; +2478;PARENTHESIZED DIGIT FIVE;No;0;ON; 0028 0035 0029;;5;5;N;;;;; +2479;PARENTHESIZED DIGIT SIX;No;0;ON; 0028 0036 0029;;6;6;N;;;;; +247A;PARENTHESIZED DIGIT SEVEN;No;0;ON; 0028 0037 0029;;7;7;N;;;;; +247B;PARENTHESIZED DIGIT EIGHT;No;0;ON; 0028 0038 0029;;8;8;N;;;;; +247C;PARENTHESIZED DIGIT NINE;No;0;ON; 0028 0039 0029;;9;9;N;;;;; +247D;PARENTHESIZED NUMBER TEN;No;0;ON; 0028 0031 0030 0029;;;10;N;;;;; +247E;PARENTHESIZED NUMBER ELEVEN;No;0;ON; 0028 0031 0031 0029;;;11;N;;;;; +247F;PARENTHESIZED NUMBER TWELVE;No;0;ON; 0028 0031 0032 0029;;;12;N;;;;; +2480;PARENTHESIZED NUMBER THIRTEEN;No;0;ON; 0028 0031 0033 0029;;;13;N;;;;; +2481;PARENTHESIZED NUMBER FOURTEEN;No;0;ON; 0028 0031 0034 0029;;;14;N;;;;; +2482;PARENTHESIZED NUMBER FIFTEEN;No;0;ON; 0028 0031 0035 0029;;;15;N;;;;; +2483;PARENTHESIZED NUMBER SIXTEEN;No;0;ON; 0028 0031 0036 0029;;;16;N;;;;; +2484;PARENTHESIZED NUMBER SEVENTEEN;No;0;ON; 0028 0031 0037 0029;;;17;N;;;;; +2485;PARENTHESIZED NUMBER EIGHTEEN;No;0;ON; 0028 0031 0038 0029;;;18;N;;;;; +2486;PARENTHESIZED NUMBER NINETEEN;No;0;ON; 0028 0031 0039 0029;;;19;N;;;;; +2487;PARENTHESIZED NUMBER TWENTY;No;0;ON; 0028 0032 0030 0029;;;20;N;;;;; +2488;DIGIT ONE FULL STOP;No;0;EN; 0031 002E;;1;1;N;DIGIT ONE PERIOD;;;; +2489;DIGIT TWO FULL STOP;No;0;EN; 0032 002E;;2;2;N;DIGIT TWO PERIOD;;;; +248A;DIGIT THREE FULL STOP;No;0;EN; 0033 002E;;3;3;N;DIGIT THREE PERIOD;;;; +248B;DIGIT FOUR FULL STOP;No;0;EN; 0034 002E;;4;4;N;DIGIT FOUR PERIOD;;;; +248C;DIGIT FIVE FULL STOP;No;0;EN; 0035 002E;;5;5;N;DIGIT FIVE PERIOD;;;; +248D;DIGIT SIX FULL STOP;No;0;EN; 0036 002E;;6;6;N;DIGIT SIX PERIOD;;;; +248E;DIGIT SEVEN FULL STOP;No;0;EN; 0037 002E;;7;7;N;DIGIT SEVEN PERIOD;;;; +248F;DIGIT EIGHT FULL STOP;No;0;EN; 0038 002E;;8;8;N;DIGIT EIGHT PERIOD;;;; +2490;DIGIT NINE FULL STOP;No;0;EN; 0039 002E;;9;9;N;DIGIT NINE PERIOD;;;; +2491;NUMBER TEN FULL STOP;No;0;EN; 0031 0030 002E;;;10;N;NUMBER TEN PERIOD;;;; +2492;NUMBER ELEVEN FULL STOP;No;0;EN; 0031 0031 002E;;;11;N;NUMBER ELEVEN PERIOD;;;; +2493;NUMBER TWELVE FULL STOP;No;0;EN; 0031 0032 002E;;;12;N;NUMBER TWELVE PERIOD;;;; +2494;NUMBER THIRTEEN FULL STOP;No;0;EN; 0031 0033 002E;;;13;N;NUMBER THIRTEEN PERIOD;;;; +2495;NUMBER FOURTEEN FULL STOP;No;0;EN; 0031 0034 002E;;;14;N;NUMBER FOURTEEN PERIOD;;;; +2496;NUMBER FIFTEEN FULL STOP;No;0;EN; 0031 0035 002E;;;15;N;NUMBER FIFTEEN PERIOD;;;; +2497;NUMBER SIXTEEN FULL STOP;No;0;EN; 0031 0036 002E;;;16;N;NUMBER SIXTEEN PERIOD;;;; +2498;NUMBER SEVENTEEN FULL STOP;No;0;EN; 0031 0037 002E;;;17;N;NUMBER SEVENTEEN PERIOD;;;; +2499;NUMBER EIGHTEEN FULL STOP;No;0;EN; 0031 0038 002E;;;18;N;NUMBER EIGHTEEN PERIOD;;;; +249A;NUMBER NINETEEN FULL STOP;No;0;EN; 0031 0039 002E;;;19;N;NUMBER NINETEEN PERIOD;;;; +249B;NUMBER TWENTY FULL STOP;No;0;EN; 0032 0030 002E;;;20;N;NUMBER TWENTY PERIOD;;;; +249C;PARENTHESIZED LATIN SMALL LETTER A;So;0;L; 0028 0061 0029;;;;N;;;;; +249D;PARENTHESIZED LATIN SMALL LETTER B;So;0;L; 0028 0062 0029;;;;N;;;;; +249E;PARENTHESIZED LATIN SMALL LETTER C;So;0;L; 0028 0063 0029;;;;N;;;;; +249F;PARENTHESIZED LATIN SMALL LETTER D;So;0;L; 0028 0064 0029;;;;N;;;;; +24A0;PARENTHESIZED LATIN SMALL LETTER E;So;0;L; 0028 0065 0029;;;;N;;;;; +24A1;PARENTHESIZED LATIN SMALL LETTER F;So;0;L; 0028 0066 0029;;;;N;;;;; +24A2;PARENTHESIZED LATIN SMALL LETTER G;So;0;L; 0028 0067 0029;;;;N;;;;; +24A3;PARENTHESIZED LATIN SMALL LETTER H;So;0;L; 0028 0068 0029;;;;N;;;;; +24A4;PARENTHESIZED LATIN SMALL LETTER I;So;0;L; 0028 0069 0029;;;;N;;;;; +24A5;PARENTHESIZED LATIN SMALL LETTER J;So;0;L; 0028 006A 0029;;;;N;;;;; +24A6;PARENTHESIZED LATIN SMALL LETTER K;So;0;L; 0028 006B 0029;;;;N;;;;; +24A7;PARENTHESIZED LATIN SMALL LETTER L;So;0;L; 0028 006C 0029;;;;N;;;;; +24A8;PARENTHESIZED LATIN SMALL LETTER M;So;0;L; 0028 006D 0029;;;;N;;;;; +24A9;PARENTHESIZED LATIN SMALL LETTER N;So;0;L; 0028 006E 0029;;;;N;;;;; +24AA;PARENTHESIZED LATIN SMALL LETTER O;So;0;L; 0028 006F 0029;;;;N;;;;; +24AB;PARENTHESIZED LATIN SMALL LETTER P;So;0;L; 0028 0070 0029;;;;N;;;;; +24AC;PARENTHESIZED LATIN SMALL LETTER Q;So;0;L; 0028 0071 0029;;;;N;;;;; +24AD;PARENTHESIZED LATIN SMALL LETTER R;So;0;L; 0028 0072 0029;;;;N;;;;; +24AE;PARENTHESIZED LATIN SMALL LETTER S;So;0;L; 0028 0073 0029;;;;N;;;;; +24AF;PARENTHESIZED LATIN SMALL LETTER T;So;0;L; 0028 0074 0029;;;;N;;;;; +24B0;PARENTHESIZED LATIN SMALL LETTER U;So;0;L; 0028 0075 0029;;;;N;;;;; +24B1;PARENTHESIZED LATIN SMALL LETTER V;So;0;L; 0028 0076 0029;;;;N;;;;; +24B2;PARENTHESIZED LATIN SMALL LETTER W;So;0;L; 0028 0077 0029;;;;N;;;;; +24B3;PARENTHESIZED LATIN SMALL LETTER X;So;0;L; 0028 0078 0029;;;;N;;;;; +24B4;PARENTHESIZED LATIN SMALL LETTER Y;So;0;L; 0028 0079 0029;;;;N;;;;; +24B5;PARENTHESIZED LATIN SMALL LETTER Z;So;0;L; 0028 007A 0029;;;;N;;;;; +24B6;CIRCLED LATIN CAPITAL LETTER A;So;0;L; 0041;;;;N;;;;24D0; +24B7;CIRCLED LATIN CAPITAL LETTER B;So;0;L; 0042;;;;N;;;;24D1; +24B8;CIRCLED LATIN CAPITAL LETTER C;So;0;L; 0043;;;;N;;;;24D2; +24B9;CIRCLED LATIN CAPITAL LETTER D;So;0;L; 0044;;;;N;;;;24D3; +24BA;CIRCLED LATIN CAPITAL LETTER E;So;0;L; 0045;;;;N;;;;24D4; +24BB;CIRCLED LATIN CAPITAL LETTER F;So;0;L; 0046;;;;N;;;;24D5; +24BC;CIRCLED LATIN CAPITAL LETTER G;So;0;L; 0047;;;;N;;;;24D6; +24BD;CIRCLED LATIN CAPITAL LETTER H;So;0;L; 0048;;;;N;;;;24D7; +24BE;CIRCLED LATIN CAPITAL LETTER I;So;0;L; 0049;;;;N;;;;24D8; +24BF;CIRCLED LATIN CAPITAL LETTER J;So;0;L; 004A;;;;N;;;;24D9; +24C0;CIRCLED LATIN CAPITAL LETTER K;So;0;L; 004B;;;;N;;;;24DA; +24C1;CIRCLED LATIN CAPITAL LETTER L;So;0;L; 004C;;;;N;;;;24DB; +24C2;CIRCLED LATIN CAPITAL LETTER M;So;0;L; 004D;;;;N;;;;24DC; +24C3;CIRCLED LATIN CAPITAL LETTER N;So;0;L; 004E;;;;N;;;;24DD; +24C4;CIRCLED LATIN CAPITAL LETTER O;So;0;L; 004F;;;;N;;;;24DE; +24C5;CIRCLED LATIN CAPITAL LETTER P;So;0;L; 0050;;;;N;;;;24DF; +24C6;CIRCLED LATIN CAPITAL LETTER Q;So;0;L; 0051;;;;N;;;;24E0; +24C7;CIRCLED LATIN CAPITAL LETTER R;So;0;L; 0052;;;;N;;;;24E1; +24C8;CIRCLED LATIN CAPITAL LETTER S;So;0;L; 0053;;;;N;;;;24E2; +24C9;CIRCLED LATIN CAPITAL LETTER T;So;0;L; 0054;;;;N;;;;24E3; +24CA;CIRCLED LATIN CAPITAL LETTER U;So;0;L; 0055;;;;N;;;;24E4; +24CB;CIRCLED LATIN CAPITAL LETTER V;So;0;L; 0056;;;;N;;;;24E5; +24CC;CIRCLED LATIN CAPITAL LETTER W;So;0;L; 0057;;;;N;;;;24E6; +24CD;CIRCLED LATIN CAPITAL LETTER X;So;0;L; 0058;;;;N;;;;24E7; +24CE;CIRCLED LATIN CAPITAL LETTER Y;So;0;L; 0059;;;;N;;;;24E8; +24CF;CIRCLED LATIN CAPITAL LETTER Z;So;0;L; 005A;;;;N;;;;24E9; +24D0;CIRCLED LATIN SMALL LETTER A;So;0;L; 0061;;;;N;;;24B6;;24B6 +24D1;CIRCLED LATIN SMALL LETTER B;So;0;L; 0062;;;;N;;;24B7;;24B7 +24D2;CIRCLED LATIN SMALL LETTER C;So;0;L; 0063;;;;N;;;24B8;;24B8 +24D3;CIRCLED LATIN SMALL LETTER D;So;0;L; 0064;;;;N;;;24B9;;24B9 +24D4;CIRCLED LATIN SMALL LETTER E;So;0;L; 0065;;;;N;;;24BA;;24BA +24D5;CIRCLED LATIN SMALL LETTER F;So;0;L; 0066;;;;N;;;24BB;;24BB +24D6;CIRCLED LATIN SMALL LETTER G;So;0;L; 0067;;;;N;;;24BC;;24BC +24D7;CIRCLED LATIN SMALL LETTER H;So;0;L; 0068;;;;N;;;24BD;;24BD +24D8;CIRCLED LATIN SMALL LETTER I;So;0;L; 0069;;;;N;;;24BE;;24BE +24D9;CIRCLED LATIN SMALL LETTER J;So;0;L; 006A;;;;N;;;24BF;;24BF +24DA;CIRCLED LATIN SMALL LETTER K;So;0;L; 006B;;;;N;;;24C0;;24C0 +24DB;CIRCLED LATIN SMALL LETTER L;So;0;L; 006C;;;;N;;;24C1;;24C1 +24DC;CIRCLED LATIN SMALL LETTER M;So;0;L; 006D;;;;N;;;24C2;;24C2 +24DD;CIRCLED LATIN SMALL LETTER N;So;0;L; 006E;;;;N;;;24C3;;24C3 +24DE;CIRCLED LATIN SMALL LETTER O;So;0;L; 006F;;;;N;;;24C4;;24C4 +24DF;CIRCLED LATIN SMALL LETTER P;So;0;L; 0070;;;;N;;;24C5;;24C5 +24E0;CIRCLED LATIN SMALL LETTER Q;So;0;L; 0071;;;;N;;;24C6;;24C6 +24E1;CIRCLED LATIN SMALL LETTER R;So;0;L; 0072;;;;N;;;24C7;;24C7 +24E2;CIRCLED LATIN SMALL LETTER S;So;0;L; 0073;;;;N;;;24C8;;24C8 +24E3;CIRCLED LATIN SMALL LETTER T;So;0;L; 0074;;;;N;;;24C9;;24C9 +24E4;CIRCLED LATIN SMALL LETTER U;So;0;L; 0075;;;;N;;;24CA;;24CA +24E5;CIRCLED LATIN SMALL LETTER V;So;0;L; 0076;;;;N;;;24CB;;24CB +24E6;CIRCLED LATIN SMALL LETTER W;So;0;L; 0077;;;;N;;;24CC;;24CC +24E7;CIRCLED LATIN SMALL LETTER X;So;0;L; 0078;;;;N;;;24CD;;24CD +24E8;CIRCLED LATIN SMALL LETTER Y;So;0;L; 0079;;;;N;;;24CE;;24CE +24E9;CIRCLED LATIN SMALL LETTER Z;So;0;L; 007A;;;;N;;;24CF;;24CF +24EA;CIRCLED DIGIT ZERO;No;0;ON; 0030;;0;0;N;;;;; +24EB;NEGATIVE CIRCLED NUMBER ELEVEN;No;0;ON;;;;11;N;;;;; +24EC;NEGATIVE CIRCLED NUMBER TWELVE;No;0;ON;;;;12;N;;;;; +24ED;NEGATIVE CIRCLED NUMBER THIRTEEN;No;0;ON;;;;13;N;;;;; +24EE;NEGATIVE CIRCLED NUMBER FOURTEEN;No;0;ON;;;;14;N;;;;; +24EF;NEGATIVE CIRCLED NUMBER FIFTEEN;No;0;ON;;;;15;N;;;;; +24F0;NEGATIVE CIRCLED NUMBER SIXTEEN;No;0;ON;;;;16;N;;;;; +24F1;NEGATIVE CIRCLED NUMBER SEVENTEEN;No;0;ON;;;;17;N;;;;; +24F2;NEGATIVE CIRCLED NUMBER EIGHTEEN;No;0;ON;;;;18;N;;;;; +24F3;NEGATIVE CIRCLED NUMBER NINETEEN;No;0;ON;;;;19;N;;;;; +24F4;NEGATIVE CIRCLED NUMBER TWENTY;No;0;ON;;;;20;N;;;;; +24F5;DOUBLE CIRCLED DIGIT ONE;No;0;ON;;;1;1;N;;;;; +24F6;DOUBLE CIRCLED DIGIT TWO;No;0;ON;;;2;2;N;;;;; +24F7;DOUBLE CIRCLED DIGIT THREE;No;0;ON;;;3;3;N;;;;; +24F8;DOUBLE CIRCLED DIGIT FOUR;No;0;ON;;;4;4;N;;;;; +24F9;DOUBLE CIRCLED DIGIT FIVE;No;0;ON;;;5;5;N;;;;; +24FA;DOUBLE CIRCLED DIGIT SIX;No;0;ON;;;6;6;N;;;;; +24FB;DOUBLE CIRCLED DIGIT SEVEN;No;0;ON;;;7;7;N;;;;; +24FC;DOUBLE CIRCLED DIGIT EIGHT;No;0;ON;;;8;8;N;;;;; +24FD;DOUBLE CIRCLED DIGIT NINE;No;0;ON;;;9;9;N;;;;; +24FE;DOUBLE CIRCLED NUMBER TEN;No;0;ON;;;;10;N;;;;; +24FF;NEGATIVE CIRCLED DIGIT ZERO;No;0;ON;;;0;0;N;;;;; +2500;BOX DRAWINGS LIGHT HORIZONTAL;So;0;ON;;;;;N;FORMS LIGHT HORIZONTAL;;;; +2501;BOX DRAWINGS HEAVY HORIZONTAL;So;0;ON;;;;;N;FORMS HEAVY HORIZONTAL;;;; +2502;BOX DRAWINGS LIGHT VERTICAL;So;0;ON;;;;;N;FORMS LIGHT VERTICAL;;;; +2503;BOX DRAWINGS HEAVY VERTICAL;So;0;ON;;;;;N;FORMS HEAVY VERTICAL;;;; +2504;BOX DRAWINGS LIGHT TRIPLE DASH HORIZONTAL;So;0;ON;;;;;N;FORMS LIGHT TRIPLE DASH HORIZONTAL;;;; +2505;BOX DRAWINGS HEAVY TRIPLE DASH HORIZONTAL;So;0;ON;;;;;N;FORMS HEAVY TRIPLE DASH HORIZONTAL;;;; +2506;BOX DRAWINGS LIGHT TRIPLE DASH VERTICAL;So;0;ON;;;;;N;FORMS LIGHT TRIPLE DASH VERTICAL;;;; +2507;BOX DRAWINGS HEAVY TRIPLE DASH VERTICAL;So;0;ON;;;;;N;FORMS HEAVY TRIPLE DASH VERTICAL;;;; +2508;BOX DRAWINGS LIGHT QUADRUPLE DASH HORIZONTAL;So;0;ON;;;;;N;FORMS LIGHT QUADRUPLE DASH HORIZONTAL;;;; +2509;BOX DRAWINGS HEAVY QUADRUPLE DASH HORIZONTAL;So;0;ON;;;;;N;FORMS HEAVY QUADRUPLE DASH HORIZONTAL;;;; +250A;BOX DRAWINGS LIGHT QUADRUPLE DASH VERTICAL;So;0;ON;;;;;N;FORMS LIGHT QUADRUPLE DASH VERTICAL;;;; +250B;BOX DRAWINGS HEAVY QUADRUPLE DASH VERTICAL;So;0;ON;;;;;N;FORMS HEAVY QUADRUPLE DASH VERTICAL;;;; +250C;BOX DRAWINGS LIGHT DOWN AND RIGHT;So;0;ON;;;;;N;FORMS LIGHT DOWN AND RIGHT;;;; +250D;BOX DRAWINGS DOWN LIGHT AND RIGHT HEAVY;So;0;ON;;;;;N;FORMS DOWN LIGHT AND RIGHT HEAVY;;;; +250E;BOX DRAWINGS DOWN HEAVY AND RIGHT LIGHT;So;0;ON;;;;;N;FORMS DOWN HEAVY AND RIGHT LIGHT;;;; +250F;BOX DRAWINGS HEAVY DOWN AND RIGHT;So;0;ON;;;;;N;FORMS HEAVY DOWN AND RIGHT;;;; +2510;BOX DRAWINGS LIGHT DOWN AND LEFT;So;0;ON;;;;;N;FORMS LIGHT DOWN AND LEFT;;;; +2511;BOX DRAWINGS DOWN LIGHT AND LEFT HEAVY;So;0;ON;;;;;N;FORMS DOWN LIGHT AND LEFT HEAVY;;;; +2512;BOX DRAWINGS DOWN HEAVY AND LEFT LIGHT;So;0;ON;;;;;N;FORMS DOWN HEAVY AND LEFT LIGHT;;;; +2513;BOX DRAWINGS HEAVY DOWN AND LEFT;So;0;ON;;;;;N;FORMS HEAVY DOWN AND LEFT;;;; +2514;BOX DRAWINGS LIGHT UP AND RIGHT;So;0;ON;;;;;N;FORMS LIGHT UP AND RIGHT;;;; +2515;BOX DRAWINGS UP LIGHT AND RIGHT HEAVY;So;0;ON;;;;;N;FORMS UP LIGHT AND RIGHT HEAVY;;;; +2516;BOX DRAWINGS UP HEAVY AND RIGHT LIGHT;So;0;ON;;;;;N;FORMS UP HEAVY AND RIGHT LIGHT;;;; +2517;BOX DRAWINGS HEAVY UP AND RIGHT;So;0;ON;;;;;N;FORMS HEAVY UP AND RIGHT;;;; +2518;BOX DRAWINGS LIGHT UP AND LEFT;So;0;ON;;;;;N;FORMS LIGHT UP AND LEFT;;;; +2519;BOX DRAWINGS UP LIGHT AND LEFT HEAVY;So;0;ON;;;;;N;FORMS UP LIGHT AND LEFT HEAVY;;;; +251A;BOX DRAWINGS UP HEAVY AND LEFT LIGHT;So;0;ON;;;;;N;FORMS UP HEAVY AND LEFT LIGHT;;;; +251B;BOX DRAWINGS HEAVY UP AND LEFT;So;0;ON;;;;;N;FORMS HEAVY UP AND LEFT;;;; +251C;BOX DRAWINGS LIGHT VERTICAL AND RIGHT;So;0;ON;;;;;N;FORMS LIGHT VERTICAL AND RIGHT;;;; +251D;BOX DRAWINGS VERTICAL LIGHT AND RIGHT HEAVY;So;0;ON;;;;;N;FORMS VERTICAL LIGHT AND RIGHT HEAVY;;;; +251E;BOX DRAWINGS UP HEAVY AND RIGHT DOWN LIGHT;So;0;ON;;;;;N;FORMS UP HEAVY AND RIGHT DOWN LIGHT;;;; +251F;BOX DRAWINGS DOWN HEAVY AND RIGHT UP LIGHT;So;0;ON;;;;;N;FORMS DOWN HEAVY AND RIGHT UP LIGHT;;;; +2520;BOX DRAWINGS VERTICAL HEAVY AND RIGHT LIGHT;So;0;ON;;;;;N;FORMS VERTICAL HEAVY AND RIGHT LIGHT;;;; +2521;BOX DRAWINGS DOWN LIGHT AND RIGHT UP HEAVY;So;0;ON;;;;;N;FORMS DOWN LIGHT AND RIGHT UP HEAVY;;;; +2522;BOX DRAWINGS UP LIGHT AND RIGHT DOWN HEAVY;So;0;ON;;;;;N;FORMS UP LIGHT AND RIGHT DOWN HEAVY;;;; +2523;BOX DRAWINGS HEAVY VERTICAL AND RIGHT;So;0;ON;;;;;N;FORMS HEAVY VERTICAL AND RIGHT;;;; +2524;BOX DRAWINGS LIGHT VERTICAL AND LEFT;So;0;ON;;;;;N;FORMS LIGHT VERTICAL AND LEFT;;;; +2525;BOX DRAWINGS VERTICAL LIGHT AND LEFT HEAVY;So;0;ON;;;;;N;FORMS VERTICAL LIGHT AND LEFT HEAVY;;;; +2526;BOX DRAWINGS UP HEAVY AND LEFT DOWN LIGHT;So;0;ON;;;;;N;FORMS UP HEAVY AND LEFT DOWN LIGHT;;;; +2527;BOX DRAWINGS DOWN HEAVY AND LEFT UP LIGHT;So;0;ON;;;;;N;FORMS DOWN HEAVY AND LEFT UP LIGHT;;;; +2528;BOX DRAWINGS VERTICAL HEAVY AND LEFT LIGHT;So;0;ON;;;;;N;FORMS VERTICAL HEAVY AND LEFT LIGHT;;;; +2529;BOX DRAWINGS DOWN LIGHT AND LEFT UP HEAVY;So;0;ON;;;;;N;FORMS DOWN LIGHT AND LEFT UP HEAVY;;;; +252A;BOX DRAWINGS UP LIGHT AND LEFT DOWN HEAVY;So;0;ON;;;;;N;FORMS UP LIGHT AND LEFT DOWN HEAVY;;;; +252B;BOX DRAWINGS HEAVY VERTICAL AND LEFT;So;0;ON;;;;;N;FORMS HEAVY VERTICAL AND LEFT;;;; +252C;BOX DRAWINGS LIGHT DOWN AND HORIZONTAL;So;0;ON;;;;;N;FORMS LIGHT DOWN AND HORIZONTAL;;;; +252D;BOX DRAWINGS LEFT HEAVY AND RIGHT DOWN LIGHT;So;0;ON;;;;;N;FORMS LEFT HEAVY AND RIGHT DOWN LIGHT;;;; +252E;BOX DRAWINGS RIGHT HEAVY AND LEFT DOWN LIGHT;So;0;ON;;;;;N;FORMS RIGHT HEAVY AND LEFT DOWN LIGHT;;;; +252F;BOX DRAWINGS DOWN LIGHT AND HORIZONTAL HEAVY;So;0;ON;;;;;N;FORMS DOWN LIGHT AND HORIZONTAL HEAVY;;;; +2530;BOX DRAWINGS DOWN HEAVY AND HORIZONTAL LIGHT;So;0;ON;;;;;N;FORMS DOWN HEAVY AND HORIZONTAL LIGHT;;;; +2531;BOX DRAWINGS RIGHT LIGHT AND LEFT DOWN HEAVY;So;0;ON;;;;;N;FORMS RIGHT LIGHT AND LEFT DOWN HEAVY;;;; +2532;BOX DRAWINGS LEFT LIGHT AND RIGHT DOWN HEAVY;So;0;ON;;;;;N;FORMS LEFT LIGHT AND RIGHT DOWN HEAVY;;;; +2533;BOX DRAWINGS HEAVY DOWN AND HORIZONTAL;So;0;ON;;;;;N;FORMS HEAVY DOWN AND HORIZONTAL;;;; +2534;BOX DRAWINGS LIGHT UP AND HORIZONTAL;So;0;ON;;;;;N;FORMS LIGHT UP AND HORIZONTAL;;;; +2535;BOX DRAWINGS LEFT HEAVY AND RIGHT UP LIGHT;So;0;ON;;;;;N;FORMS LEFT HEAVY AND RIGHT UP LIGHT;;;; +2536;BOX DRAWINGS RIGHT HEAVY AND LEFT UP LIGHT;So;0;ON;;;;;N;FORMS RIGHT HEAVY AND LEFT UP LIGHT;;;; +2537;BOX DRAWINGS UP LIGHT AND HORIZONTAL HEAVY;So;0;ON;;;;;N;FORMS UP LIGHT AND HORIZONTAL HEAVY;;;; +2538;BOX DRAWINGS UP HEAVY AND HORIZONTAL LIGHT;So;0;ON;;;;;N;FORMS UP HEAVY AND HORIZONTAL LIGHT;;;; +2539;BOX DRAWINGS RIGHT LIGHT AND LEFT UP HEAVY;So;0;ON;;;;;N;FORMS RIGHT LIGHT AND LEFT UP HEAVY;;;; +253A;BOX DRAWINGS LEFT LIGHT AND RIGHT UP HEAVY;So;0;ON;;;;;N;FORMS LEFT LIGHT AND RIGHT UP HEAVY;;;; +253B;BOX DRAWINGS HEAVY UP AND HORIZONTAL;So;0;ON;;;;;N;FORMS HEAVY UP AND HORIZONTAL;;;; +253C;BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL;So;0;ON;;;;;N;FORMS LIGHT VERTICAL AND HORIZONTAL;;;; +253D;BOX DRAWINGS LEFT HEAVY AND RIGHT VERTICAL LIGHT;So;0;ON;;;;;N;FORMS LEFT HEAVY AND RIGHT VERTICAL LIGHT;;;; +253E;BOX DRAWINGS RIGHT HEAVY AND LEFT VERTICAL LIGHT;So;0;ON;;;;;N;FORMS RIGHT HEAVY AND LEFT VERTICAL LIGHT;;;; +253F;BOX DRAWINGS VERTICAL LIGHT AND HORIZONTAL HEAVY;So;0;ON;;;;;N;FORMS VERTICAL LIGHT AND HORIZONTAL HEAVY;;;; +2540;BOX DRAWINGS UP HEAVY AND DOWN HORIZONTAL LIGHT;So;0;ON;;;;;N;FORMS UP HEAVY AND DOWN HORIZONTAL LIGHT;;;; +2541;BOX DRAWINGS DOWN HEAVY AND UP HORIZONTAL LIGHT;So;0;ON;;;;;N;FORMS DOWN HEAVY AND UP HORIZONTAL LIGHT;;;; +2542;BOX DRAWINGS VERTICAL HEAVY AND HORIZONTAL LIGHT;So;0;ON;;;;;N;FORMS VERTICAL HEAVY AND HORIZONTAL LIGHT;;;; +2543;BOX DRAWINGS LEFT UP HEAVY AND RIGHT DOWN LIGHT;So;0;ON;;;;;N;FORMS LEFT UP HEAVY AND RIGHT DOWN LIGHT;;;; +2544;BOX DRAWINGS RIGHT UP HEAVY AND LEFT DOWN LIGHT;So;0;ON;;;;;N;FORMS RIGHT UP HEAVY AND LEFT DOWN LIGHT;;;; +2545;BOX DRAWINGS LEFT DOWN HEAVY AND RIGHT UP LIGHT;So;0;ON;;;;;N;FORMS LEFT DOWN HEAVY AND RIGHT UP LIGHT;;;; +2546;BOX DRAWINGS RIGHT DOWN HEAVY AND LEFT UP LIGHT;So;0;ON;;;;;N;FORMS RIGHT DOWN HEAVY AND LEFT UP LIGHT;;;; +2547;BOX DRAWINGS DOWN LIGHT AND UP HORIZONTAL HEAVY;So;0;ON;;;;;N;FORMS DOWN LIGHT AND UP HORIZONTAL HEAVY;;;; +2548;BOX DRAWINGS UP LIGHT AND DOWN HORIZONTAL HEAVY;So;0;ON;;;;;N;FORMS UP LIGHT AND DOWN HORIZONTAL HEAVY;;;; +2549;BOX DRAWINGS RIGHT LIGHT AND LEFT VERTICAL HEAVY;So;0;ON;;;;;N;FORMS RIGHT LIGHT AND LEFT VERTICAL HEAVY;;;; +254A;BOX DRAWINGS LEFT LIGHT AND RIGHT VERTICAL HEAVY;So;0;ON;;;;;N;FORMS LEFT LIGHT AND RIGHT VERTICAL HEAVY;;;; +254B;BOX DRAWINGS HEAVY VERTICAL AND HORIZONTAL;So;0;ON;;;;;N;FORMS HEAVY VERTICAL AND HORIZONTAL;;;; +254C;BOX DRAWINGS LIGHT DOUBLE DASH HORIZONTAL;So;0;ON;;;;;N;FORMS LIGHT DOUBLE DASH HORIZONTAL;;;; +254D;BOX DRAWINGS HEAVY DOUBLE DASH HORIZONTAL;So;0;ON;;;;;N;FORMS HEAVY DOUBLE DASH HORIZONTAL;;;; +254E;BOX DRAWINGS LIGHT DOUBLE DASH VERTICAL;So;0;ON;;;;;N;FORMS LIGHT DOUBLE DASH VERTICAL;;;; +254F;BOX DRAWINGS HEAVY DOUBLE DASH VERTICAL;So;0;ON;;;;;N;FORMS HEAVY DOUBLE DASH VERTICAL;;;; +2550;BOX DRAWINGS DOUBLE HORIZONTAL;So;0;ON;;;;;N;FORMS DOUBLE HORIZONTAL;;;; +2551;BOX DRAWINGS DOUBLE VERTICAL;So;0;ON;;;;;N;FORMS DOUBLE VERTICAL;;;; +2552;BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE;So;0;ON;;;;;N;FORMS DOWN SINGLE AND RIGHT DOUBLE;;;; +2553;BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE;So;0;ON;;;;;N;FORMS DOWN DOUBLE AND RIGHT SINGLE;;;; +2554;BOX DRAWINGS DOUBLE DOWN AND RIGHT;So;0;ON;;;;;N;FORMS DOUBLE DOWN AND RIGHT;;;; +2555;BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE;So;0;ON;;;;;N;FORMS DOWN SINGLE AND LEFT DOUBLE;;;; +2556;BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE;So;0;ON;;;;;N;FORMS DOWN DOUBLE AND LEFT SINGLE;;;; +2557;BOX DRAWINGS DOUBLE DOWN AND LEFT;So;0;ON;;;;;N;FORMS DOUBLE DOWN AND LEFT;;;; +2558;BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE;So;0;ON;;;;;N;FORMS UP SINGLE AND RIGHT DOUBLE;;;; +2559;BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE;So;0;ON;;;;;N;FORMS UP DOUBLE AND RIGHT SINGLE;;;; +255A;BOX DRAWINGS DOUBLE UP AND RIGHT;So;0;ON;;;;;N;FORMS DOUBLE UP AND RIGHT;;;; +255B;BOX DRAWINGS UP SINGLE AND LEFT DOUBLE;So;0;ON;;;;;N;FORMS UP SINGLE AND LEFT DOUBLE;;;; +255C;BOX DRAWINGS UP DOUBLE AND LEFT SINGLE;So;0;ON;;;;;N;FORMS UP DOUBLE AND LEFT SINGLE;;;; +255D;BOX DRAWINGS DOUBLE UP AND LEFT;So;0;ON;;;;;N;FORMS DOUBLE UP AND LEFT;;;; +255E;BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE;So;0;ON;;;;;N;FORMS VERTICAL SINGLE AND RIGHT DOUBLE;;;; +255F;BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE;So;0;ON;;;;;N;FORMS VERTICAL DOUBLE AND RIGHT SINGLE;;;; +2560;BOX DRAWINGS DOUBLE VERTICAL AND RIGHT;So;0;ON;;;;;N;FORMS DOUBLE VERTICAL AND RIGHT;;;; +2561;BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE;So;0;ON;;;;;N;FORMS VERTICAL SINGLE AND LEFT DOUBLE;;;; +2562;BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE;So;0;ON;;;;;N;FORMS VERTICAL DOUBLE AND LEFT SINGLE;;;; +2563;BOX DRAWINGS DOUBLE VERTICAL AND LEFT;So;0;ON;;;;;N;FORMS DOUBLE VERTICAL AND LEFT;;;; +2564;BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE;So;0;ON;;;;;N;FORMS DOWN SINGLE AND HORIZONTAL DOUBLE;;;; +2565;BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE;So;0;ON;;;;;N;FORMS DOWN DOUBLE AND HORIZONTAL SINGLE;;;; +2566;BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL;So;0;ON;;;;;N;FORMS DOUBLE DOWN AND HORIZONTAL;;;; +2567;BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE;So;0;ON;;;;;N;FORMS UP SINGLE AND HORIZONTAL DOUBLE;;;; +2568;BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE;So;0;ON;;;;;N;FORMS UP DOUBLE AND HORIZONTAL SINGLE;;;; +2569;BOX DRAWINGS DOUBLE UP AND HORIZONTAL;So;0;ON;;;;;N;FORMS DOUBLE UP AND HORIZONTAL;;;; +256A;BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE;So;0;ON;;;;;N;FORMS VERTICAL SINGLE AND HORIZONTAL DOUBLE;;;; +256B;BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE;So;0;ON;;;;;N;FORMS VERTICAL DOUBLE AND HORIZONTAL SINGLE;;;; +256C;BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL;So;0;ON;;;;;N;FORMS DOUBLE VERTICAL AND HORIZONTAL;;;; +256D;BOX DRAWINGS LIGHT ARC DOWN AND RIGHT;So;0;ON;;;;;N;FORMS LIGHT ARC DOWN AND RIGHT;;;; +256E;BOX DRAWINGS LIGHT ARC DOWN AND LEFT;So;0;ON;;;;;N;FORMS LIGHT ARC DOWN AND LEFT;;;; +256F;BOX DRAWINGS LIGHT ARC UP AND LEFT;So;0;ON;;;;;N;FORMS LIGHT ARC UP AND LEFT;;;; +2570;BOX DRAWINGS LIGHT ARC UP AND RIGHT;So;0;ON;;;;;N;FORMS LIGHT ARC UP AND RIGHT;;;; +2571;BOX DRAWINGS LIGHT DIAGONAL UPPER RIGHT TO LOWER LEFT;So;0;ON;;;;;N;FORMS LIGHT DIAGONAL UPPER RIGHT TO LOWER LEFT;;;; +2572;BOX DRAWINGS LIGHT DIAGONAL UPPER LEFT TO LOWER RIGHT;So;0;ON;;;;;N;FORMS LIGHT DIAGONAL UPPER LEFT TO LOWER RIGHT;;;; +2573;BOX DRAWINGS LIGHT DIAGONAL CROSS;So;0;ON;;;;;N;FORMS LIGHT DIAGONAL CROSS;;;; +2574;BOX DRAWINGS LIGHT LEFT;So;0;ON;;;;;N;FORMS LIGHT LEFT;;;; +2575;BOX DRAWINGS LIGHT UP;So;0;ON;;;;;N;FORMS LIGHT UP;;;; +2576;BOX DRAWINGS LIGHT RIGHT;So;0;ON;;;;;N;FORMS LIGHT RIGHT;;;; +2577;BOX DRAWINGS LIGHT DOWN;So;0;ON;;;;;N;FORMS LIGHT DOWN;;;; +2578;BOX DRAWINGS HEAVY LEFT;So;0;ON;;;;;N;FORMS HEAVY LEFT;;;; +2579;BOX DRAWINGS HEAVY UP;So;0;ON;;;;;N;FORMS HEAVY UP;;;; +257A;BOX DRAWINGS HEAVY RIGHT;So;0;ON;;;;;N;FORMS HEAVY RIGHT;;;; +257B;BOX DRAWINGS HEAVY DOWN;So;0;ON;;;;;N;FORMS HEAVY DOWN;;;; +257C;BOX DRAWINGS LIGHT LEFT AND HEAVY RIGHT;So;0;ON;;;;;N;FORMS LIGHT LEFT AND HEAVY RIGHT;;;; +257D;BOX DRAWINGS LIGHT UP AND HEAVY DOWN;So;0;ON;;;;;N;FORMS LIGHT UP AND HEAVY DOWN;;;; +257E;BOX DRAWINGS HEAVY LEFT AND LIGHT RIGHT;So;0;ON;;;;;N;FORMS HEAVY LEFT AND LIGHT RIGHT;;;; +257F;BOX DRAWINGS HEAVY UP AND LIGHT DOWN;So;0;ON;;;;;N;FORMS HEAVY UP AND LIGHT DOWN;;;; +2580;UPPER HALF BLOCK;So;0;ON;;;;;N;;;;; +2581;LOWER ONE EIGHTH BLOCK;So;0;ON;;;;;N;;;;; +2582;LOWER ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +2583;LOWER THREE EIGHTHS BLOCK;So;0;ON;;;;;N;;;;; +2584;LOWER HALF BLOCK;So;0;ON;;;;;N;;;;; +2585;LOWER FIVE EIGHTHS BLOCK;So;0;ON;;;;;N;;;;; +2586;LOWER THREE QUARTERS BLOCK;So;0;ON;;;;;N;LOWER THREE QUARTER BLOCK;;;; +2587;LOWER SEVEN EIGHTHS BLOCK;So;0;ON;;;;;N;;;;; +2588;FULL BLOCK;So;0;ON;;;;;N;;;;; +2589;LEFT SEVEN EIGHTHS BLOCK;So;0;ON;;;;;N;;;;; +258A;LEFT THREE QUARTERS BLOCK;So;0;ON;;;;;N;LEFT THREE QUARTER BLOCK;;;; +258B;LEFT FIVE EIGHTHS BLOCK;So;0;ON;;;;;N;;;;; +258C;LEFT HALF BLOCK;So;0;ON;;;;;N;;;;; +258D;LEFT THREE EIGHTHS BLOCK;So;0;ON;;;;;N;;;;; +258E;LEFT ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +258F;LEFT ONE EIGHTH BLOCK;So;0;ON;;;;;N;;;;; +2590;RIGHT HALF BLOCK;So;0;ON;;;;;N;;;;; +2591;LIGHT SHADE;So;0;ON;;;;;N;;;;; +2592;MEDIUM SHADE;So;0;ON;;;;;N;;;;; +2593;DARK SHADE;So;0;ON;;;;;N;;;;; +2594;UPPER ONE EIGHTH BLOCK;So;0;ON;;;;;N;;;;; +2595;RIGHT ONE EIGHTH BLOCK;So;0;ON;;;;;N;;;;; +2596;QUADRANT LOWER LEFT;So;0;ON;;;;;N;;;;; +2597;QUADRANT LOWER RIGHT;So;0;ON;;;;;N;;;;; +2598;QUADRANT UPPER LEFT;So;0;ON;;;;;N;;;;; +2599;QUADRANT UPPER LEFT AND LOWER LEFT AND LOWER RIGHT;So;0;ON;;;;;N;;;;; +259A;QUADRANT UPPER LEFT AND LOWER RIGHT;So;0;ON;;;;;N;;;;; +259B;QUADRANT UPPER LEFT AND UPPER RIGHT AND LOWER LEFT;So;0;ON;;;;;N;;;;; +259C;QUADRANT UPPER LEFT AND UPPER RIGHT AND LOWER RIGHT;So;0;ON;;;;;N;;;;; +259D;QUADRANT UPPER RIGHT;So;0;ON;;;;;N;;;;; +259E;QUADRANT UPPER RIGHT AND LOWER LEFT;So;0;ON;;;;;N;;;;; +259F;QUADRANT UPPER RIGHT AND LOWER LEFT AND LOWER RIGHT;So;0;ON;;;;;N;;;;; +25A0;BLACK SQUARE;So;0;ON;;;;;N;;;;; +25A1;WHITE SQUARE;So;0;ON;;;;;N;;;;; +25A2;WHITE SQUARE WITH ROUNDED CORNERS;So;0;ON;;;;;N;;;;; +25A3;WHITE SQUARE CONTAINING BLACK SMALL SQUARE;So;0;ON;;;;;N;;;;; +25A4;SQUARE WITH HORIZONTAL FILL;So;0;ON;;;;;N;;;;; +25A5;SQUARE WITH VERTICAL FILL;So;0;ON;;;;;N;;;;; +25A6;SQUARE WITH ORTHOGONAL CROSSHATCH FILL;So;0;ON;;;;;N;;;;; +25A7;SQUARE WITH UPPER LEFT TO LOWER RIGHT FILL;So;0;ON;;;;;N;;;;; +25A8;SQUARE WITH UPPER RIGHT TO LOWER LEFT FILL;So;0;ON;;;;;N;;;;; +25A9;SQUARE WITH DIAGONAL CROSSHATCH FILL;So;0;ON;;;;;N;;;;; +25AA;BLACK SMALL SQUARE;So;0;ON;;;;;N;;;;; +25AB;WHITE SMALL SQUARE;So;0;ON;;;;;N;;;;; +25AC;BLACK RECTANGLE;So;0;ON;;;;;N;;;;; +25AD;WHITE RECTANGLE;So;0;ON;;;;;N;;;;; +25AE;BLACK VERTICAL RECTANGLE;So;0;ON;;;;;N;;;;; +25AF;WHITE VERTICAL RECTANGLE;So;0;ON;;;;;N;;;;; +25B0;BLACK PARALLELOGRAM;So;0;ON;;;;;N;;;;; +25B1;WHITE PARALLELOGRAM;So;0;ON;;;;;N;;;;; +25B2;BLACK UP-POINTING TRIANGLE;So;0;ON;;;;;N;BLACK UP POINTING TRIANGLE;;;; +25B3;WHITE UP-POINTING TRIANGLE;So;0;ON;;;;;N;WHITE UP POINTING TRIANGLE;;;; +25B4;BLACK UP-POINTING SMALL TRIANGLE;So;0;ON;;;;;N;BLACK UP POINTING SMALL TRIANGLE;;;; +25B5;WHITE UP-POINTING SMALL TRIANGLE;So;0;ON;;;;;N;WHITE UP POINTING SMALL TRIANGLE;;;; +25B6;BLACK RIGHT-POINTING TRIANGLE;So;0;ON;;;;;N;BLACK RIGHT POINTING TRIANGLE;;;; +25B7;WHITE RIGHT-POINTING TRIANGLE;Sm;0;ON;;;;;N;WHITE RIGHT POINTING TRIANGLE;;;; +25B8;BLACK RIGHT-POINTING SMALL TRIANGLE;So;0;ON;;;;;N;BLACK RIGHT POINTING SMALL TRIANGLE;;;; +25B9;WHITE RIGHT-POINTING SMALL TRIANGLE;So;0;ON;;;;;N;WHITE RIGHT POINTING SMALL TRIANGLE;;;; +25BA;BLACK RIGHT-POINTING POINTER;So;0;ON;;;;;N;BLACK RIGHT POINTING POINTER;;;; +25BB;WHITE RIGHT-POINTING POINTER;So;0;ON;;;;;N;WHITE RIGHT POINTING POINTER;;;; +25BC;BLACK DOWN-POINTING TRIANGLE;So;0;ON;;;;;N;BLACK DOWN POINTING TRIANGLE;;;; +25BD;WHITE DOWN-POINTING TRIANGLE;So;0;ON;;;;;N;WHITE DOWN POINTING TRIANGLE;;;; +25BE;BLACK DOWN-POINTING SMALL TRIANGLE;So;0;ON;;;;;N;BLACK DOWN POINTING SMALL TRIANGLE;;;; +25BF;WHITE DOWN-POINTING SMALL TRIANGLE;So;0;ON;;;;;N;WHITE DOWN POINTING SMALL TRIANGLE;;;; +25C0;BLACK LEFT-POINTING TRIANGLE;So;0;ON;;;;;N;BLACK LEFT POINTING TRIANGLE;;;; +25C1;WHITE LEFT-POINTING TRIANGLE;Sm;0;ON;;;;;N;WHITE LEFT POINTING TRIANGLE;;;; +25C2;BLACK LEFT-POINTING SMALL TRIANGLE;So;0;ON;;;;;N;BLACK LEFT POINTING SMALL TRIANGLE;;;; +25C3;WHITE LEFT-POINTING SMALL TRIANGLE;So;0;ON;;;;;N;WHITE LEFT POINTING SMALL TRIANGLE;;;; +25C4;BLACK LEFT-POINTING POINTER;So;0;ON;;;;;N;BLACK LEFT POINTING POINTER;;;; +25C5;WHITE LEFT-POINTING POINTER;So;0;ON;;;;;N;WHITE LEFT POINTING POINTER;;;; +25C6;BLACK DIAMOND;So;0;ON;;;;;N;;;;; +25C7;WHITE DIAMOND;So;0;ON;;;;;N;;;;; +25C8;WHITE DIAMOND CONTAINING BLACK SMALL DIAMOND;So;0;ON;;;;;N;;;;; +25C9;FISHEYE;So;0;ON;;;;;N;;;;; +25CA;LOZENGE;So;0;ON;;;;;N;;;;; +25CB;WHITE CIRCLE;So;0;ON;;;;;N;;;;; +25CC;DOTTED CIRCLE;So;0;ON;;;;;N;;;;; +25CD;CIRCLE WITH VERTICAL FILL;So;0;ON;;;;;N;;;;; +25CE;BULLSEYE;So;0;ON;;;;;N;;;;; +25CF;BLACK CIRCLE;So;0;ON;;;;;N;;;;; +25D0;CIRCLE WITH LEFT HALF BLACK;So;0;ON;;;;;N;;;;; +25D1;CIRCLE WITH RIGHT HALF BLACK;So;0;ON;;;;;N;;;;; +25D2;CIRCLE WITH LOWER HALF BLACK;So;0;ON;;;;;N;;;;; +25D3;CIRCLE WITH UPPER HALF BLACK;So;0;ON;;;;;N;;;;; +25D4;CIRCLE WITH UPPER RIGHT QUADRANT BLACK;So;0;ON;;;;;N;;;;; +25D5;CIRCLE WITH ALL BUT UPPER LEFT QUADRANT BLACK;So;0;ON;;;;;N;;;;; +25D6;LEFT HALF BLACK CIRCLE;So;0;ON;;;;;N;;;;; +25D7;RIGHT HALF BLACK CIRCLE;So;0;ON;;;;;N;;;;; +25D8;INVERSE BULLET;So;0;ON;;;;;N;;;;; +25D9;INVERSE WHITE CIRCLE;So;0;ON;;;;;N;;;;; +25DA;UPPER HALF INVERSE WHITE CIRCLE;So;0;ON;;;;;N;;;;; +25DB;LOWER HALF INVERSE WHITE CIRCLE;So;0;ON;;;;;N;;;;; +25DC;UPPER LEFT QUADRANT CIRCULAR ARC;So;0;ON;;;;;N;;;;; +25DD;UPPER RIGHT QUADRANT CIRCULAR ARC;So;0;ON;;;;;N;;;;; +25DE;LOWER RIGHT QUADRANT CIRCULAR ARC;So;0;ON;;;;;N;;;;; +25DF;LOWER LEFT QUADRANT CIRCULAR ARC;So;0;ON;;;;;N;;;;; +25E0;UPPER HALF CIRCLE;So;0;ON;;;;;N;;;;; +25E1;LOWER HALF CIRCLE;So;0;ON;;;;;N;;;;; +25E2;BLACK LOWER RIGHT TRIANGLE;So;0;ON;;;;;N;;;;; +25E3;BLACK LOWER LEFT TRIANGLE;So;0;ON;;;;;N;;;;; +25E4;BLACK UPPER LEFT TRIANGLE;So;0;ON;;;;;N;;;;; +25E5;BLACK UPPER RIGHT TRIANGLE;So;0;ON;;;;;N;;;;; +25E6;WHITE BULLET;So;0;ON;;;;;N;;;;; +25E7;SQUARE WITH LEFT HALF BLACK;So;0;ON;;;;;N;;;;; +25E8;SQUARE WITH RIGHT HALF BLACK;So;0;ON;;;;;N;;;;; +25E9;SQUARE WITH UPPER LEFT DIAGONAL HALF BLACK;So;0;ON;;;;;N;;;;; +25EA;SQUARE WITH LOWER RIGHT DIAGONAL HALF BLACK;So;0;ON;;;;;N;;;;; +25EB;WHITE SQUARE WITH VERTICAL BISECTING LINE;So;0;ON;;;;;N;;;;; +25EC;WHITE UP-POINTING TRIANGLE WITH DOT;So;0;ON;;;;;N;WHITE UP POINTING TRIANGLE WITH DOT;;;; +25ED;UP-POINTING TRIANGLE WITH LEFT HALF BLACK;So;0;ON;;;;;N;UP POINTING TRIANGLE WITH LEFT HALF BLACK;;;; +25EE;UP-POINTING TRIANGLE WITH RIGHT HALF BLACK;So;0;ON;;;;;N;UP POINTING TRIANGLE WITH RIGHT HALF BLACK;;;; +25EF;LARGE CIRCLE;So;0;ON;;;;;N;;;;; +25F0;WHITE SQUARE WITH UPPER LEFT QUADRANT;So;0;ON;;;;;N;;;;; +25F1;WHITE SQUARE WITH LOWER LEFT QUADRANT;So;0;ON;;;;;N;;;;; +25F2;WHITE SQUARE WITH LOWER RIGHT QUADRANT;So;0;ON;;;;;N;;;;; +25F3;WHITE SQUARE WITH UPPER RIGHT QUADRANT;So;0;ON;;;;;N;;;;; +25F4;WHITE CIRCLE WITH UPPER LEFT QUADRANT;So;0;ON;;;;;N;;;;; +25F5;WHITE CIRCLE WITH LOWER LEFT QUADRANT;So;0;ON;;;;;N;;;;; +25F6;WHITE CIRCLE WITH LOWER RIGHT QUADRANT;So;0;ON;;;;;N;;;;; +25F7;WHITE CIRCLE WITH UPPER RIGHT QUADRANT;So;0;ON;;;;;N;;;;; +25F8;UPPER LEFT TRIANGLE;Sm;0;ON;;;;;N;;;;; +25F9;UPPER RIGHT TRIANGLE;Sm;0;ON;;;;;N;;;;; +25FA;LOWER LEFT TRIANGLE;Sm;0;ON;;;;;N;;;;; +25FB;WHITE MEDIUM SQUARE;Sm;0;ON;;;;;N;;;;; +25FC;BLACK MEDIUM SQUARE;Sm;0;ON;;;;;N;;;;; +25FD;WHITE MEDIUM SMALL SQUARE;Sm;0;ON;;;;;N;;;;; +25FE;BLACK MEDIUM SMALL SQUARE;Sm;0;ON;;;;;N;;;;; +25FF;LOWER RIGHT TRIANGLE;Sm;0;ON;;;;;N;;;;; +2600;BLACK SUN WITH RAYS;So;0;ON;;;;;N;;;;; +2601;CLOUD;So;0;ON;;;;;N;;;;; +2602;UMBRELLA;So;0;ON;;;;;N;;;;; +2603;SNOWMAN;So;0;ON;;;;;N;;;;; +2604;COMET;So;0;ON;;;;;N;;;;; +2605;BLACK STAR;So;0;ON;;;;;N;;;;; +2606;WHITE STAR;So;0;ON;;;;;N;;;;; +2607;LIGHTNING;So;0;ON;;;;;N;;;;; +2608;THUNDERSTORM;So;0;ON;;;;;N;;;;; +2609;SUN;So;0;ON;;;;;N;;;;; +260A;ASCENDING NODE;So;0;ON;;;;;N;;;;; +260B;DESCENDING NODE;So;0;ON;;;;;N;;;;; +260C;CONJUNCTION;So;0;ON;;;;;N;;;;; +260D;OPPOSITION;So;0;ON;;;;;N;;;;; +260E;BLACK TELEPHONE;So;0;ON;;;;;N;;;;; +260F;WHITE TELEPHONE;So;0;ON;;;;;N;;;;; +2610;BALLOT BOX;So;0;ON;;;;;N;;;;; +2611;BALLOT BOX WITH CHECK;So;0;ON;;;;;N;;;;; +2612;BALLOT BOX WITH X;So;0;ON;;;;;N;;;;; +2613;SALTIRE;So;0;ON;;;;;N;;;;; +2614;UMBRELLA WITH RAIN DROPS;So;0;ON;;;;;N;;;;; +2615;HOT BEVERAGE;So;0;ON;;;;;N;;;;; +2616;WHITE SHOGI PIECE;So;0;ON;;;;;N;;;;; +2617;BLACK SHOGI PIECE;So;0;ON;;;;;N;;;;; +2618;SHAMROCK;So;0;ON;;;;;N;;;;; +2619;REVERSED ROTATED FLORAL HEART BULLET;So;0;ON;;;;;N;;;;; +261A;BLACK LEFT POINTING INDEX;So;0;ON;;;;;N;;;;; +261B;BLACK RIGHT POINTING INDEX;So;0;ON;;;;;N;;;;; +261C;WHITE LEFT POINTING INDEX;So;0;ON;;;;;N;;;;; +261D;WHITE UP POINTING INDEX;So;0;ON;;;;;N;;;;; +261E;WHITE RIGHT POINTING INDEX;So;0;ON;;;;;N;;;;; +261F;WHITE DOWN POINTING INDEX;So;0;ON;;;;;N;;;;; +2620;SKULL AND CROSSBONES;So;0;ON;;;;;N;;;;; +2621;CAUTION SIGN;So;0;ON;;;;;N;;;;; +2622;RADIOACTIVE SIGN;So;0;ON;;;;;N;;;;; +2623;BIOHAZARD SIGN;So;0;ON;;;;;N;;;;; +2624;CADUCEUS;So;0;ON;;;;;N;;;;; +2625;ANKH;So;0;ON;;;;;N;;;;; +2626;ORTHODOX CROSS;So;0;ON;;;;;N;;;;; +2627;CHI RHO;So;0;ON;;;;;N;;;;; +2628;CROSS OF LORRAINE;So;0;ON;;;;;N;;;;; +2629;CROSS OF JERUSALEM;So;0;ON;;;;;N;;;;; +262A;STAR AND CRESCENT;So;0;ON;;;;;N;;;;; +262B;FARSI SYMBOL;So;0;ON;;;;;N;SYMBOL OF IRAN;;;; +262C;ADI SHAKTI;So;0;ON;;;;;N;;;;; +262D;HAMMER AND SICKLE;So;0;ON;;;;;N;;;;; +262E;PEACE SYMBOL;So;0;ON;;;;;N;;;;; +262F;YIN YANG;So;0;ON;;;;;N;;;;; +2630;TRIGRAM FOR HEAVEN;So;0;ON;;;;;N;;;;; +2631;TRIGRAM FOR LAKE;So;0;ON;;;;;N;;;;; +2632;TRIGRAM FOR FIRE;So;0;ON;;;;;N;;;;; +2633;TRIGRAM FOR THUNDER;So;0;ON;;;;;N;;;;; +2634;TRIGRAM FOR WIND;So;0;ON;;;;;N;;;;; +2635;TRIGRAM FOR WATER;So;0;ON;;;;;N;;;;; +2636;TRIGRAM FOR MOUNTAIN;So;0;ON;;;;;N;;;;; +2637;TRIGRAM FOR EARTH;So;0;ON;;;;;N;;;;; +2638;WHEEL OF DHARMA;So;0;ON;;;;;N;;;;; +2639;WHITE FROWNING FACE;So;0;ON;;;;;N;;;;; +263A;WHITE SMILING FACE;So;0;ON;;;;;N;;;;; +263B;BLACK SMILING FACE;So;0;ON;;;;;N;;;;; +263C;WHITE SUN WITH RAYS;So;0;ON;;;;;N;;;;; +263D;FIRST QUARTER MOON;So;0;ON;;;;;N;;;;; +263E;LAST QUARTER MOON;So;0;ON;;;;;N;;;;; +263F;MERCURY;So;0;ON;;;;;N;;;;; +2640;FEMALE SIGN;So;0;ON;;;;;N;;;;; +2641;EARTH;So;0;ON;;;;;N;;;;; +2642;MALE SIGN;So;0;ON;;;;;N;;;;; +2643;JUPITER;So;0;ON;;;;;N;;;;; +2644;SATURN;So;0;ON;;;;;N;;;;; +2645;URANUS;So;0;ON;;;;;N;;;;; +2646;NEPTUNE;So;0;ON;;;;;N;;;;; +2647;PLUTO;So;0;ON;;;;;N;;;;; +2648;ARIES;So;0;ON;;;;;N;;;;; +2649;TAURUS;So;0;ON;;;;;N;;;;; +264A;GEMINI;So;0;ON;;;;;N;;;;; +264B;CANCER;So;0;ON;;;;;N;;;;; +264C;LEO;So;0;ON;;;;;N;;;;; +264D;VIRGO;So;0;ON;;;;;N;;;;; +264E;LIBRA;So;0;ON;;;;;N;;;;; +264F;SCORPIUS;So;0;ON;;;;;N;;;;; +2650;SAGITTARIUS;So;0;ON;;;;;N;;;;; +2651;CAPRICORN;So;0;ON;;;;;N;;;;; +2652;AQUARIUS;So;0;ON;;;;;N;;;;; +2653;PISCES;So;0;ON;;;;;N;;;;; +2654;WHITE CHESS KING;So;0;ON;;;;;N;;;;; +2655;WHITE CHESS QUEEN;So;0;ON;;;;;N;;;;; +2656;WHITE CHESS ROOK;So;0;ON;;;;;N;;;;; +2657;WHITE CHESS BISHOP;So;0;ON;;;;;N;;;;; +2658;WHITE CHESS KNIGHT;So;0;ON;;;;;N;;;;; +2659;WHITE CHESS PAWN;So;0;ON;;;;;N;;;;; +265A;BLACK CHESS KING;So;0;ON;;;;;N;;;;; +265B;BLACK CHESS QUEEN;So;0;ON;;;;;N;;;;; +265C;BLACK CHESS ROOK;So;0;ON;;;;;N;;;;; +265D;BLACK CHESS BISHOP;So;0;ON;;;;;N;;;;; +265E;BLACK CHESS KNIGHT;So;0;ON;;;;;N;;;;; +265F;BLACK CHESS PAWN;So;0;ON;;;;;N;;;;; +2660;BLACK SPADE SUIT;So;0;ON;;;;;N;;;;; +2661;WHITE HEART SUIT;So;0;ON;;;;;N;;;;; +2662;WHITE DIAMOND SUIT;So;0;ON;;;;;N;;;;; +2663;BLACK CLUB SUIT;So;0;ON;;;;;N;;;;; +2664;WHITE SPADE SUIT;So;0;ON;;;;;N;;;;; +2665;BLACK HEART SUIT;So;0;ON;;;;;N;;;;; +2666;BLACK DIAMOND SUIT;So;0;ON;;;;;N;;;;; +2667;WHITE CLUB SUIT;So;0;ON;;;;;N;;;;; +2668;HOT SPRINGS;So;0;ON;;;;;N;;;;; +2669;QUARTER NOTE;So;0;ON;;;;;N;;;;; +266A;EIGHTH NOTE;So;0;ON;;;;;N;;;;; +266B;BEAMED EIGHTH NOTES;So;0;ON;;;;;N;BARRED EIGHTH NOTES;;;; +266C;BEAMED SIXTEENTH NOTES;So;0;ON;;;;;N;BARRED SIXTEENTH NOTES;;;; +266D;MUSIC FLAT SIGN;So;0;ON;;;;;N;FLAT;;;; +266E;MUSIC NATURAL SIGN;So;0;ON;;;;;N;NATURAL;;;; +266F;MUSIC SHARP SIGN;Sm;0;ON;;;;;N;SHARP;;;; +2670;WEST SYRIAC CROSS;So;0;ON;;;;;N;;;;; +2671;EAST SYRIAC CROSS;So;0;ON;;;;;N;;;;; +2672;UNIVERSAL RECYCLING SYMBOL;So;0;ON;;;;;N;;;;; +2673;RECYCLING SYMBOL FOR TYPE-1 PLASTICS;So;0;ON;;;;;N;;;;; +2674;RECYCLING SYMBOL FOR TYPE-2 PLASTICS;So;0;ON;;;;;N;;;;; +2675;RECYCLING SYMBOL FOR TYPE-3 PLASTICS;So;0;ON;;;;;N;;;;; +2676;RECYCLING SYMBOL FOR TYPE-4 PLASTICS;So;0;ON;;;;;N;;;;; +2677;RECYCLING SYMBOL FOR TYPE-5 PLASTICS;So;0;ON;;;;;N;;;;; +2678;RECYCLING SYMBOL FOR TYPE-6 PLASTICS;So;0;ON;;;;;N;;;;; +2679;RECYCLING SYMBOL FOR TYPE-7 PLASTICS;So;0;ON;;;;;N;;;;; +267A;RECYCLING SYMBOL FOR GENERIC MATERIALS;So;0;ON;;;;;N;;;;; +267B;BLACK UNIVERSAL RECYCLING SYMBOL;So;0;ON;;;;;N;;;;; +267C;RECYCLED PAPER SYMBOL;So;0;ON;;;;;N;;;;; +267D;PARTIALLY-RECYCLED PAPER SYMBOL;So;0;ON;;;;;N;;;;; +267E;PERMANENT PAPER SIGN;So;0;ON;;;;;N;;;;; +267F;WHEELCHAIR SYMBOL;So;0;ON;;;;;N;;;;; +2680;DIE FACE-1;So;0;ON;;;;;N;;;;; +2681;DIE FACE-2;So;0;ON;;;;;N;;;;; +2682;DIE FACE-3;So;0;ON;;;;;N;;;;; +2683;DIE FACE-4;So;0;ON;;;;;N;;;;; +2684;DIE FACE-5;So;0;ON;;;;;N;;;;; +2685;DIE FACE-6;So;0;ON;;;;;N;;;;; +2686;WHITE CIRCLE WITH DOT RIGHT;So;0;ON;;;;;N;;;;; +2687;WHITE CIRCLE WITH TWO DOTS;So;0;ON;;;;;N;;;;; +2688;BLACK CIRCLE WITH WHITE DOT RIGHT;So;0;ON;;;;;N;;;;; +2689;BLACK CIRCLE WITH TWO WHITE DOTS;So;0;ON;;;;;N;;;;; +268A;MONOGRAM FOR YANG;So;0;ON;;;;;N;;;;; +268B;MONOGRAM FOR YIN;So;0;ON;;;;;N;;;;; +268C;DIGRAM FOR GREATER YANG;So;0;ON;;;;;N;;;;; +268D;DIGRAM FOR LESSER YIN;So;0;ON;;;;;N;;;;; +268E;DIGRAM FOR LESSER YANG;So;0;ON;;;;;N;;;;; +268F;DIGRAM FOR GREATER YIN;So;0;ON;;;;;N;;;;; +2690;WHITE FLAG;So;0;ON;;;;;N;;;;; +2691;BLACK FLAG;So;0;ON;;;;;N;;;;; +2692;HAMMER AND PICK;So;0;ON;;;;;N;;;;; +2693;ANCHOR;So;0;ON;;;;;N;;;;; +2694;CROSSED SWORDS;So;0;ON;;;;;N;;;;; +2695;STAFF OF AESCULAPIUS;So;0;ON;;;;;N;;;;; +2696;SCALES;So;0;ON;;;;;N;;;;; +2697;ALEMBIC;So;0;ON;;;;;N;;;;; +2698;FLOWER;So;0;ON;;;;;N;;;;; +2699;GEAR;So;0;ON;;;;;N;;;;; +269A;STAFF OF HERMES;So;0;ON;;;;;N;;;;; +269B;ATOM SYMBOL;So;0;ON;;;;;N;;;;; +269C;FLEUR-DE-LIS;So;0;ON;;;;;N;;;;; +269D;OUTLINED WHITE STAR;So;0;ON;;;;;N;;;;; +269E;THREE LINES CONVERGING RIGHT;So;0;ON;;;;;N;;;;; +269F;THREE LINES CONVERGING LEFT;So;0;ON;;;;;N;;;;; +26A0;WARNING SIGN;So;0;ON;;;;;N;;;;; +26A1;HIGH VOLTAGE SIGN;So;0;ON;;;;;N;;;;; +26A2;DOUBLED FEMALE SIGN;So;0;ON;;;;;N;;;;; +26A3;DOUBLED MALE SIGN;So;0;ON;;;;;N;;;;; +26A4;INTERLOCKED FEMALE AND MALE SIGN;So;0;ON;;;;;N;;;;; +26A5;MALE AND FEMALE SIGN;So;0;ON;;;;;N;;;;; +26A6;MALE WITH STROKE SIGN;So;0;ON;;;;;N;;;;; +26A7;MALE WITH STROKE AND MALE AND FEMALE SIGN;So;0;ON;;;;;N;;;;; +26A8;VERTICAL MALE WITH STROKE SIGN;So;0;ON;;;;;N;;;;; +26A9;HORIZONTAL MALE WITH STROKE SIGN;So;0;ON;;;;;N;;;;; +26AA;MEDIUM WHITE CIRCLE;So;0;ON;;;;;N;;;;; +26AB;MEDIUM BLACK CIRCLE;So;0;ON;;;;;N;;;;; +26AC;MEDIUM SMALL WHITE CIRCLE;So;0;L;;;;;N;;;;; +26AD;MARRIAGE SYMBOL;So;0;ON;;;;;N;;;;; +26AE;DIVORCE SYMBOL;So;0;ON;;;;;N;;;;; +26AF;UNMARRIED PARTNERSHIP SYMBOL;So;0;ON;;;;;N;;;;; +26B0;COFFIN;So;0;ON;;;;;N;;;;; +26B1;FUNERAL URN;So;0;ON;;;;;N;;;;; +26B2;NEUTER;So;0;ON;;;;;N;;;;; +26B3;CERES;So;0;ON;;;;;N;;;;; +26B4;PALLAS;So;0;ON;;;;;N;;;;; +26B5;JUNO;So;0;ON;;;;;N;;;;; +26B6;VESTA;So;0;ON;;;;;N;;;;; +26B7;CHIRON;So;0;ON;;;;;N;;;;; +26B8;BLACK MOON LILITH;So;0;ON;;;;;N;;;;; +26B9;SEXTILE;So;0;ON;;;;;N;;;;; +26BA;SEMISEXTILE;So;0;ON;;;;;N;;;;; +26BB;QUINCUNX;So;0;ON;;;;;N;;;;; +26BC;SESQUIQUADRATE;So;0;ON;;;;;N;;;;; +26BD;SOCCER BALL;So;0;ON;;;;;N;;;;; +26BE;BASEBALL;So;0;ON;;;;;N;;;;; +26BF;SQUARED KEY;So;0;ON;;;;;N;;;;; +26C0;WHITE DRAUGHTS MAN;So;0;ON;;;;;N;;;;; +26C1;WHITE DRAUGHTS KING;So;0;ON;;;;;N;;;;; +26C2;BLACK DRAUGHTS MAN;So;0;ON;;;;;N;;;;; +26C3;BLACK DRAUGHTS KING;So;0;ON;;;;;N;;;;; +26C4;SNOWMAN WITHOUT SNOW;So;0;ON;;;;;N;;;;; +26C5;SUN BEHIND CLOUD;So;0;ON;;;;;N;;;;; +26C6;RAIN;So;0;ON;;;;;N;;;;; +26C7;BLACK SNOWMAN;So;0;ON;;;;;N;;;;; +26C8;THUNDER CLOUD AND RAIN;So;0;ON;;;;;N;;;;; +26C9;TURNED WHITE SHOGI PIECE;So;0;ON;;;;;N;;;;; +26CA;TURNED BLACK SHOGI PIECE;So;0;ON;;;;;N;;;;; +26CB;WHITE DIAMOND IN SQUARE;So;0;ON;;;;;N;;;;; +26CC;CROSSING LANES;So;0;ON;;;;;N;;;;; +26CD;DISABLED CAR;So;0;ON;;;;;N;;;;; +26CE;OPHIUCHUS;So;0;ON;;;;;N;;;;; +26CF;PICK;So;0;ON;;;;;N;;;;; +26D0;CAR SLIDING;So;0;ON;;;;;N;;;;; +26D1;HELMET WITH WHITE CROSS;So;0;ON;;;;;N;;;;; +26D2;CIRCLED CROSSING LANES;So;0;ON;;;;;N;;;;; +26D3;CHAINS;So;0;ON;;;;;N;;;;; +26D4;NO ENTRY;So;0;ON;;;;;N;;;;; +26D5;ALTERNATE ONE-WAY LEFT WAY TRAFFIC;So;0;ON;;;;;N;;;;; +26D6;BLACK TWO-WAY LEFT WAY TRAFFIC;So;0;ON;;;;;N;;;;; +26D7;WHITE TWO-WAY LEFT WAY TRAFFIC;So;0;ON;;;;;N;;;;; +26D8;BLACK LEFT LANE MERGE;So;0;ON;;;;;N;;;;; +26D9;WHITE LEFT LANE MERGE;So;0;ON;;;;;N;;;;; +26DA;DRIVE SLOW SIGN;So;0;ON;;;;;N;;;;; +26DB;HEAVY WHITE DOWN-POINTING TRIANGLE;So;0;ON;;;;;N;;;;; +26DC;LEFT CLOSED ENTRY;So;0;ON;;;;;N;;;;; +26DD;SQUARED SALTIRE;So;0;ON;;;;;N;;;;; +26DE;FALLING DIAGONAL IN WHITE CIRCLE IN BLACK SQUARE;So;0;ON;;;;;N;;;;; +26DF;BLACK TRUCK;So;0;ON;;;;;N;;;;; +26E0;RESTRICTED LEFT ENTRY-1;So;0;ON;;;;;N;;;;; +26E1;RESTRICTED LEFT ENTRY-2;So;0;ON;;;;;N;;;;; +26E2;ASTRONOMICAL SYMBOL FOR URANUS;So;0;ON;;;;;N;;;;; +26E3;HEAVY CIRCLE WITH STROKE AND TWO DOTS ABOVE;So;0;ON;;;;;N;;;;; +26E4;PENTAGRAM;So;0;ON;;;;;N;;;;; +26E5;RIGHT-HANDED INTERLACED PENTAGRAM;So;0;ON;;;;;N;;;;; +26E6;LEFT-HANDED INTERLACED PENTAGRAM;So;0;ON;;;;;N;;;;; +26E7;INVERTED PENTAGRAM;So;0;ON;;;;;N;;;;; +26E8;BLACK CROSS ON SHIELD;So;0;ON;;;;;N;;;;; +26E9;SHINTO SHRINE;So;0;ON;;;;;N;;;;; +26EA;CHURCH;So;0;ON;;;;;N;;;;; +26EB;CASTLE;So;0;ON;;;;;N;;;;; +26EC;HISTORIC SITE;So;0;ON;;;;;N;;;;; +26ED;GEAR WITHOUT HUB;So;0;ON;;;;;N;;;;; +26EE;GEAR WITH HANDLES;So;0;ON;;;;;N;;;;; +26EF;MAP SYMBOL FOR LIGHTHOUSE;So;0;ON;;;;;N;;;;; +26F0;MOUNTAIN;So;0;ON;;;;;N;;;;; +26F1;UMBRELLA ON GROUND;So;0;ON;;;;;N;;;;; +26F2;FOUNTAIN;So;0;ON;;;;;N;;;;; +26F3;FLAG IN HOLE;So;0;ON;;;;;N;;;;; +26F4;FERRY;So;0;ON;;;;;N;;;;; +26F5;SAILBOAT;So;0;ON;;;;;N;;;;; +26F6;SQUARE FOUR CORNERS;So;0;ON;;;;;N;;;;; +26F7;SKIER;So;0;ON;;;;;N;;;;; +26F8;ICE SKATE;So;0;ON;;;;;N;;;;; +26F9;PERSON WITH BALL;So;0;ON;;;;;N;;;;; +26FA;TENT;So;0;ON;;;;;N;;;;; +26FB;JAPANESE BANK SYMBOL;So;0;ON;;;;;N;;;;; +26FC;HEADSTONE GRAVEYARD SYMBOL;So;0;ON;;;;;N;;;;; +26FD;FUEL PUMP;So;0;ON;;;;;N;;;;; +26FE;CUP ON BLACK SQUARE;So;0;ON;;;;;N;;;;; +26FF;WHITE FLAG WITH HORIZONTAL MIDDLE BLACK STRIPE;So;0;ON;;;;;N;;;;; +2700;BLACK SAFETY SCISSORS;So;0;ON;;;;;N;;;;; +2701;UPPER BLADE SCISSORS;So;0;ON;;;;;N;;;;; +2702;BLACK SCISSORS;So;0;ON;;;;;N;;;;; +2703;LOWER BLADE SCISSORS;So;0;ON;;;;;N;;;;; +2704;WHITE SCISSORS;So;0;ON;;;;;N;;;;; +2705;WHITE HEAVY CHECK MARK;So;0;ON;;;;;N;;;;; +2706;TELEPHONE LOCATION SIGN;So;0;ON;;;;;N;;;;; +2707;TAPE DRIVE;So;0;ON;;;;;N;;;;; +2708;AIRPLANE;So;0;ON;;;;;N;;;;; +2709;ENVELOPE;So;0;ON;;;;;N;;;;; +270A;RAISED FIST;So;0;ON;;;;;N;;;;; +270B;RAISED HAND;So;0;ON;;;;;N;;;;; +270C;VICTORY HAND;So;0;ON;;;;;N;;;;; +270D;WRITING HAND;So;0;ON;;;;;N;;;;; +270E;LOWER RIGHT PENCIL;So;0;ON;;;;;N;;;;; +270F;PENCIL;So;0;ON;;;;;N;;;;; +2710;UPPER RIGHT PENCIL;So;0;ON;;;;;N;;;;; +2711;WHITE NIB;So;0;ON;;;;;N;;;;; +2712;BLACK NIB;So;0;ON;;;;;N;;;;; +2713;CHECK MARK;So;0;ON;;;;;N;;;;; +2714;HEAVY CHECK MARK;So;0;ON;;;;;N;;;;; +2715;MULTIPLICATION X;So;0;ON;;;;;N;;;;; +2716;HEAVY MULTIPLICATION X;So;0;ON;;;;;N;;;;; +2717;BALLOT X;So;0;ON;;;;;N;;;;; +2718;HEAVY BALLOT X;So;0;ON;;;;;N;;;;; +2719;OUTLINED GREEK CROSS;So;0;ON;;;;;N;;;;; +271A;HEAVY GREEK CROSS;So;0;ON;;;;;N;;;;; +271B;OPEN CENTRE CROSS;So;0;ON;;;;;N;OPEN CENTER CROSS;;;; +271C;HEAVY OPEN CENTRE CROSS;So;0;ON;;;;;N;HEAVY OPEN CENTER CROSS;;;; +271D;LATIN CROSS;So;0;ON;;;;;N;;;;; +271E;SHADOWED WHITE LATIN CROSS;So;0;ON;;;;;N;;;;; +271F;OUTLINED LATIN CROSS;So;0;ON;;;;;N;;;;; +2720;MALTESE CROSS;So;0;ON;;;;;N;;;;; +2721;STAR OF DAVID;So;0;ON;;;;;N;;;;; +2722;FOUR TEARDROP-SPOKED ASTERISK;So;0;ON;;;;;N;;;;; +2723;FOUR BALLOON-SPOKED ASTERISK;So;0;ON;;;;;N;;;;; +2724;HEAVY FOUR BALLOON-SPOKED ASTERISK;So;0;ON;;;;;N;;;;; +2725;FOUR CLUB-SPOKED ASTERISK;So;0;ON;;;;;N;;;;; +2726;BLACK FOUR POINTED STAR;So;0;ON;;;;;N;;;;; +2727;WHITE FOUR POINTED STAR;So;0;ON;;;;;N;;;;; +2728;SPARKLES;So;0;ON;;;;;N;;;;; +2729;STRESS OUTLINED WHITE STAR;So;0;ON;;;;;N;;;;; +272A;CIRCLED WHITE STAR;So;0;ON;;;;;N;;;;; +272B;OPEN CENTRE BLACK STAR;So;0;ON;;;;;N;OPEN CENTER BLACK STAR;;;; +272C;BLACK CENTRE WHITE STAR;So;0;ON;;;;;N;BLACK CENTER WHITE STAR;;;; +272D;OUTLINED BLACK STAR;So;0;ON;;;;;N;;;;; +272E;HEAVY OUTLINED BLACK STAR;So;0;ON;;;;;N;;;;; +272F;PINWHEEL STAR;So;0;ON;;;;;N;;;;; +2730;SHADOWED WHITE STAR;So;0;ON;;;;;N;;;;; +2731;HEAVY ASTERISK;So;0;ON;;;;;N;;;;; +2732;OPEN CENTRE ASTERISK;So;0;ON;;;;;N;OPEN CENTER ASTERISK;;;; +2733;EIGHT SPOKED ASTERISK;So;0;ON;;;;;N;;;;; +2734;EIGHT POINTED BLACK STAR;So;0;ON;;;;;N;;;;; +2735;EIGHT POINTED PINWHEEL STAR;So;0;ON;;;;;N;;;;; +2736;SIX POINTED BLACK STAR;So;0;ON;;;;;N;;;;; +2737;EIGHT POINTED RECTILINEAR BLACK STAR;So;0;ON;;;;;N;;;;; +2738;HEAVY EIGHT POINTED RECTILINEAR BLACK STAR;So;0;ON;;;;;N;;;;; +2739;TWELVE POINTED BLACK STAR;So;0;ON;;;;;N;;;;; +273A;SIXTEEN POINTED ASTERISK;So;0;ON;;;;;N;;;;; +273B;TEARDROP-SPOKED ASTERISK;So;0;ON;;;;;N;;;;; +273C;OPEN CENTRE TEARDROP-SPOKED ASTERISK;So;0;ON;;;;;N;OPEN CENTER TEARDROP-SPOKED ASTERISK;;;; +273D;HEAVY TEARDROP-SPOKED ASTERISK;So;0;ON;;;;;N;;;;; +273E;SIX PETALLED BLACK AND WHITE FLORETTE;So;0;ON;;;;;N;;;;; +273F;BLACK FLORETTE;So;0;ON;;;;;N;;;;; +2740;WHITE FLORETTE;So;0;ON;;;;;N;;;;; +2741;EIGHT PETALLED OUTLINED BLACK FLORETTE;So;0;ON;;;;;N;;;;; +2742;CIRCLED OPEN CENTRE EIGHT POINTED STAR;So;0;ON;;;;;N;CIRCLED OPEN CENTER EIGHT POINTED STAR;;;; +2743;HEAVY TEARDROP-SPOKED PINWHEEL ASTERISK;So;0;ON;;;;;N;;;;; +2744;SNOWFLAKE;So;0;ON;;;;;N;;;;; +2745;TIGHT TRIFOLIATE SNOWFLAKE;So;0;ON;;;;;N;;;;; +2746;HEAVY CHEVRON SNOWFLAKE;So;0;ON;;;;;N;;;;; +2747;SPARKLE;So;0;ON;;;;;N;;;;; +2748;HEAVY SPARKLE;So;0;ON;;;;;N;;;;; +2749;BALLOON-SPOKED ASTERISK;So;0;ON;;;;;N;;;;; +274A;EIGHT TEARDROP-SPOKED PROPELLER ASTERISK;So;0;ON;;;;;N;;;;; +274B;HEAVY EIGHT TEARDROP-SPOKED PROPELLER ASTERISK;So;0;ON;;;;;N;;;;; +274C;CROSS MARK;So;0;ON;;;;;N;;;;; +274D;SHADOWED WHITE CIRCLE;So;0;ON;;;;;N;;;;; +274E;NEGATIVE SQUARED CROSS MARK;So;0;ON;;;;;N;;;;; +274F;LOWER RIGHT DROP-SHADOWED WHITE SQUARE;So;0;ON;;;;;N;;;;; +2750;UPPER RIGHT DROP-SHADOWED WHITE SQUARE;So;0;ON;;;;;N;;;;; +2751;LOWER RIGHT SHADOWED WHITE SQUARE;So;0;ON;;;;;N;;;;; +2752;UPPER RIGHT SHADOWED WHITE SQUARE;So;0;ON;;;;;N;;;;; +2753;BLACK QUESTION MARK ORNAMENT;So;0;ON;;;;;N;;;;; +2754;WHITE QUESTION MARK ORNAMENT;So;0;ON;;;;;N;;;;; +2755;WHITE EXCLAMATION MARK ORNAMENT;So;0;ON;;;;;N;;;;; +2756;BLACK DIAMOND MINUS WHITE X;So;0;ON;;;;;N;;;;; +2757;HEAVY EXCLAMATION MARK SYMBOL;So;0;ON;;;;;N;;;;; +2758;LIGHT VERTICAL BAR;So;0;ON;;;;;N;;;;; +2759;MEDIUM VERTICAL BAR;So;0;ON;;;;;N;;;;; +275A;HEAVY VERTICAL BAR;So;0;ON;;;;;N;;;;; +275B;HEAVY SINGLE TURNED COMMA QUOTATION MARK ORNAMENT;So;0;ON;;;;;N;;;;; +275C;HEAVY SINGLE COMMA QUOTATION MARK ORNAMENT;So;0;ON;;;;;N;;;;; +275D;HEAVY DOUBLE TURNED COMMA QUOTATION MARK ORNAMENT;So;0;ON;;;;;N;;;;; +275E;HEAVY DOUBLE COMMA QUOTATION MARK ORNAMENT;So;0;ON;;;;;N;;;;; +275F;HEAVY LOW SINGLE COMMA QUOTATION MARK ORNAMENT;So;0;ON;;;;;N;;;;; +2760;HEAVY LOW DOUBLE COMMA QUOTATION MARK ORNAMENT;So;0;ON;;;;;N;;;;; +2761;CURVED STEM PARAGRAPH SIGN ORNAMENT;So;0;ON;;;;;N;;;;; +2762;HEAVY EXCLAMATION MARK ORNAMENT;So;0;ON;;;;;N;;;;; +2763;HEAVY HEART EXCLAMATION MARK ORNAMENT;So;0;ON;;;;;N;;;;; +2764;HEAVY BLACK HEART;So;0;ON;;;;;N;;;;; +2765;ROTATED HEAVY BLACK HEART BULLET;So;0;ON;;;;;N;;;;; +2766;FLORAL HEART;So;0;ON;;;;;N;;;;; +2767;ROTATED FLORAL HEART BULLET;So;0;ON;;;;;N;;;;; +2768;MEDIUM LEFT PARENTHESIS ORNAMENT;Ps;0;ON;;;;;Y;;;;; +2769;MEDIUM RIGHT PARENTHESIS ORNAMENT;Pe;0;ON;;;;;Y;;;;; +276A;MEDIUM FLATTENED LEFT PARENTHESIS ORNAMENT;Ps;0;ON;;;;;Y;;;;; +276B;MEDIUM FLATTENED RIGHT PARENTHESIS ORNAMENT;Pe;0;ON;;;;;Y;;;;; +276C;MEDIUM LEFT-POINTING ANGLE BRACKET ORNAMENT;Ps;0;ON;;;;;Y;;;;; +276D;MEDIUM RIGHT-POINTING ANGLE BRACKET ORNAMENT;Pe;0;ON;;;;;Y;;;;; +276E;HEAVY LEFT-POINTING ANGLE QUOTATION MARK ORNAMENT;Ps;0;ON;;;;;Y;;;;; +276F;HEAVY RIGHT-POINTING ANGLE QUOTATION MARK ORNAMENT;Pe;0;ON;;;;;Y;;;;; +2770;HEAVY LEFT-POINTING ANGLE BRACKET ORNAMENT;Ps;0;ON;;;;;Y;;;;; +2771;HEAVY RIGHT-POINTING ANGLE BRACKET ORNAMENT;Pe;0;ON;;;;;Y;;;;; +2772;LIGHT LEFT TORTOISE SHELL BRACKET ORNAMENT;Ps;0;ON;;;;;Y;;;;; +2773;LIGHT RIGHT TORTOISE SHELL BRACKET ORNAMENT;Pe;0;ON;;;;;Y;;;;; +2774;MEDIUM LEFT CURLY BRACKET ORNAMENT;Ps;0;ON;;;;;Y;;;;; +2775;MEDIUM RIGHT CURLY BRACKET ORNAMENT;Pe;0;ON;;;;;Y;;;;; +2776;DINGBAT NEGATIVE CIRCLED DIGIT ONE;No;0;ON;;;1;1;N;INVERSE CIRCLED DIGIT ONE;;;; +2777;DINGBAT NEGATIVE CIRCLED DIGIT TWO;No;0;ON;;;2;2;N;INVERSE CIRCLED DIGIT TWO;;;; +2778;DINGBAT NEGATIVE CIRCLED DIGIT THREE;No;0;ON;;;3;3;N;INVERSE CIRCLED DIGIT THREE;;;; +2779;DINGBAT NEGATIVE CIRCLED DIGIT FOUR;No;0;ON;;;4;4;N;INVERSE CIRCLED DIGIT FOUR;;;; +277A;DINGBAT NEGATIVE CIRCLED DIGIT FIVE;No;0;ON;;;5;5;N;INVERSE CIRCLED DIGIT FIVE;;;; +277B;DINGBAT NEGATIVE CIRCLED DIGIT SIX;No;0;ON;;;6;6;N;INVERSE CIRCLED DIGIT SIX;;;; +277C;DINGBAT NEGATIVE CIRCLED DIGIT SEVEN;No;0;ON;;;7;7;N;INVERSE CIRCLED DIGIT SEVEN;;;; +277D;DINGBAT NEGATIVE CIRCLED DIGIT EIGHT;No;0;ON;;;8;8;N;INVERSE CIRCLED DIGIT EIGHT;;;; +277E;DINGBAT NEGATIVE CIRCLED DIGIT NINE;No;0;ON;;;9;9;N;INVERSE CIRCLED DIGIT NINE;;;; +277F;DINGBAT NEGATIVE CIRCLED NUMBER TEN;No;0;ON;;;;10;N;INVERSE CIRCLED NUMBER TEN;;;; +2780;DINGBAT CIRCLED SANS-SERIF DIGIT ONE;No;0;ON;;;1;1;N;CIRCLED SANS-SERIF DIGIT ONE;;;; +2781;DINGBAT CIRCLED SANS-SERIF DIGIT TWO;No;0;ON;;;2;2;N;CIRCLED SANS-SERIF DIGIT TWO;;;; +2782;DINGBAT CIRCLED SANS-SERIF DIGIT THREE;No;0;ON;;;3;3;N;CIRCLED SANS-SERIF DIGIT THREE;;;; +2783;DINGBAT CIRCLED SANS-SERIF DIGIT FOUR;No;0;ON;;;4;4;N;CIRCLED SANS-SERIF DIGIT FOUR;;;; +2784;DINGBAT CIRCLED SANS-SERIF DIGIT FIVE;No;0;ON;;;5;5;N;CIRCLED SANS-SERIF DIGIT FIVE;;;; +2785;DINGBAT CIRCLED SANS-SERIF DIGIT SIX;No;0;ON;;;6;6;N;CIRCLED SANS-SERIF DIGIT SIX;;;; +2786;DINGBAT CIRCLED SANS-SERIF DIGIT SEVEN;No;0;ON;;;7;7;N;CIRCLED SANS-SERIF DIGIT SEVEN;;;; +2787;DINGBAT CIRCLED SANS-SERIF DIGIT EIGHT;No;0;ON;;;8;8;N;CIRCLED SANS-SERIF DIGIT EIGHT;;;; +2788;DINGBAT CIRCLED SANS-SERIF DIGIT NINE;No;0;ON;;;9;9;N;CIRCLED SANS-SERIF DIGIT NINE;;;; +2789;DINGBAT CIRCLED SANS-SERIF NUMBER TEN;No;0;ON;;;;10;N;CIRCLED SANS-SERIF NUMBER TEN;;;; +278A;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT ONE;No;0;ON;;;1;1;N;INVERSE CIRCLED SANS-SERIF DIGIT ONE;;;; +278B;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT TWO;No;0;ON;;;2;2;N;INVERSE CIRCLED SANS-SERIF DIGIT TWO;;;; +278C;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT THREE;No;0;ON;;;3;3;N;INVERSE CIRCLED SANS-SERIF DIGIT THREE;;;; +278D;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT FOUR;No;0;ON;;;4;4;N;INVERSE CIRCLED SANS-SERIF DIGIT FOUR;;;; +278E;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT FIVE;No;0;ON;;;5;5;N;INVERSE CIRCLED SANS-SERIF DIGIT FIVE;;;; +278F;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT SIX;No;0;ON;;;6;6;N;INVERSE CIRCLED SANS-SERIF DIGIT SIX;;;; +2790;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT SEVEN;No;0;ON;;;7;7;N;INVERSE CIRCLED SANS-SERIF DIGIT SEVEN;;;; +2791;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT EIGHT;No;0;ON;;;8;8;N;INVERSE CIRCLED SANS-SERIF DIGIT EIGHT;;;; +2792;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT NINE;No;0;ON;;;9;9;N;INVERSE CIRCLED SANS-SERIF DIGIT NINE;;;; +2793;DINGBAT NEGATIVE CIRCLED SANS-SERIF NUMBER TEN;No;0;ON;;;;10;N;INVERSE CIRCLED SANS-SERIF NUMBER TEN;;;; +2794;HEAVY WIDE-HEADED RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY WIDE-HEADED RIGHT ARROW;;;; +2795;HEAVY PLUS SIGN;So;0;ON;;;;;N;;;;; +2796;HEAVY MINUS SIGN;So;0;ON;;;;;N;;;;; +2797;HEAVY DIVISION SIGN;So;0;ON;;;;;N;;;;; +2798;HEAVY SOUTH EAST ARROW;So;0;ON;;;;;N;HEAVY LOWER RIGHT ARROW;;;; +2799;HEAVY RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY RIGHT ARROW;;;; +279A;HEAVY NORTH EAST ARROW;So;0;ON;;;;;N;HEAVY UPPER RIGHT ARROW;;;; +279B;DRAFTING POINT RIGHTWARDS ARROW;So;0;ON;;;;;N;DRAFTING POINT RIGHT ARROW;;;; +279C;HEAVY ROUND-TIPPED RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY ROUND-TIPPED RIGHT ARROW;;;; +279D;TRIANGLE-HEADED RIGHTWARDS ARROW;So;0;ON;;;;;N;TRIANGLE-HEADED RIGHT ARROW;;;; +279E;HEAVY TRIANGLE-HEADED RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY TRIANGLE-HEADED RIGHT ARROW;;;; +279F;DASHED TRIANGLE-HEADED RIGHTWARDS ARROW;So;0;ON;;;;;N;DASHED TRIANGLE-HEADED RIGHT ARROW;;;; +27A0;HEAVY DASHED TRIANGLE-HEADED RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY DASHED TRIANGLE-HEADED RIGHT ARROW;;;; +27A1;BLACK RIGHTWARDS ARROW;So;0;ON;;;;;N;BLACK RIGHT ARROW;;;; +27A2;THREE-D TOP-LIGHTED RIGHTWARDS ARROWHEAD;So;0;ON;;;;;N;THREE-D TOP-LIGHTED RIGHT ARROWHEAD;;;; +27A3;THREE-D BOTTOM-LIGHTED RIGHTWARDS ARROWHEAD;So;0;ON;;;;;N;THREE-D BOTTOM-LIGHTED RIGHT ARROWHEAD;;;; +27A4;BLACK RIGHTWARDS ARROWHEAD;So;0;ON;;;;;N;BLACK RIGHT ARROWHEAD;;;; +27A5;HEAVY BLACK CURVED DOWNWARDS AND RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY BLACK CURVED DOWN AND RIGHT ARROW;;;; +27A6;HEAVY BLACK CURVED UPWARDS AND RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY BLACK CURVED UP AND RIGHT ARROW;;;; +27A7;SQUAT BLACK RIGHTWARDS ARROW;So;0;ON;;;;;N;SQUAT BLACK RIGHT ARROW;;;; +27A8;HEAVY CONCAVE-POINTED BLACK RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY CONCAVE-POINTED BLACK RIGHT ARROW;;;; +27A9;RIGHT-SHADED WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;RIGHT-SHADED WHITE RIGHT ARROW;;;; +27AA;LEFT-SHADED WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;LEFT-SHADED WHITE RIGHT ARROW;;;; +27AB;BACK-TILTED SHADOWED WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;BACK-TILTED SHADOWED WHITE RIGHT ARROW;;;; +27AC;FRONT-TILTED SHADOWED WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;FRONT-TILTED SHADOWED WHITE RIGHT ARROW;;;; +27AD;HEAVY LOWER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY LOWER RIGHT-SHADOWED WHITE RIGHT ARROW;;;; +27AE;HEAVY UPPER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY UPPER RIGHT-SHADOWED WHITE RIGHT ARROW;;;; +27AF;NOTCHED LOWER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;NOTCHED LOWER RIGHT-SHADOWED WHITE RIGHT ARROW;;;; +27B0;CURLY LOOP;So;0;ON;;;;;N;;;;; +27B1;NOTCHED UPPER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;NOTCHED UPPER RIGHT-SHADOWED WHITE RIGHT ARROW;;;; +27B2;CIRCLED HEAVY WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;CIRCLED HEAVY WHITE RIGHT ARROW;;;; +27B3;WHITE-FEATHERED RIGHTWARDS ARROW;So;0;ON;;;;;N;WHITE-FEATHERED RIGHT ARROW;;;; +27B4;BLACK-FEATHERED SOUTH EAST ARROW;So;0;ON;;;;;N;BLACK-FEATHERED LOWER RIGHT ARROW;;;; +27B5;BLACK-FEATHERED RIGHTWARDS ARROW;So;0;ON;;;;;N;BLACK-FEATHERED RIGHT ARROW;;;; +27B6;BLACK-FEATHERED NORTH EAST ARROW;So;0;ON;;;;;N;BLACK-FEATHERED UPPER RIGHT ARROW;;;; +27B7;HEAVY BLACK-FEATHERED SOUTH EAST ARROW;So;0;ON;;;;;N;HEAVY BLACK-FEATHERED LOWER RIGHT ARROW;;;; +27B8;HEAVY BLACK-FEATHERED RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY BLACK-FEATHERED RIGHT ARROW;;;; +27B9;HEAVY BLACK-FEATHERED NORTH EAST ARROW;So;0;ON;;;;;N;HEAVY BLACK-FEATHERED UPPER RIGHT ARROW;;;; +27BA;TEARDROP-BARBED RIGHTWARDS ARROW;So;0;ON;;;;;N;TEARDROP-BARBED RIGHT ARROW;;;; +27BB;HEAVY TEARDROP-SHANKED RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY TEARDROP-SHANKED RIGHT ARROW;;;; +27BC;WEDGE-TAILED RIGHTWARDS ARROW;So;0;ON;;;;;N;WEDGE-TAILED RIGHT ARROW;;;; +27BD;HEAVY WEDGE-TAILED RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY WEDGE-TAILED RIGHT ARROW;;;; +27BE;OPEN-OUTLINED RIGHTWARDS ARROW;So;0;ON;;;;;N;OPEN-OUTLINED RIGHT ARROW;;;; +27BF;DOUBLE CURLY LOOP;So;0;ON;;;;;N;;;;; +27C0;THREE DIMENSIONAL ANGLE;Sm;0;ON;;;;;Y;;;;; +27C1;WHITE TRIANGLE CONTAINING SMALL WHITE TRIANGLE;Sm;0;ON;;;;;N;;;;; +27C2;PERPENDICULAR;Sm;0;ON;;;;;N;;;;; +27C3;OPEN SUBSET;Sm;0;ON;;;;;Y;;;;; +27C4;OPEN SUPERSET;Sm;0;ON;;;;;Y;;;;; +27C5;LEFT S-SHAPED BAG DELIMITER;Ps;0;ON;;;;;Y;;;;; +27C6;RIGHT S-SHAPED BAG DELIMITER;Pe;0;ON;;;;;Y;;;;; +27C7;OR WITH DOT INSIDE;Sm;0;ON;;;;;N;;;;; +27C8;REVERSE SOLIDUS PRECEDING SUBSET;Sm;0;ON;;;;;Y;;;;; +27C9;SUPERSET PRECEDING SOLIDUS;Sm;0;ON;;;;;Y;;;;; +27CA;VERTICAL BAR WITH HORIZONTAL STROKE;Sm;0;ON;;;;;N;;;;; +27CB;MATHEMATICAL RISING DIAGONAL;Sm;0;ON;;;;;Y;;;;; +27CC;LONG DIVISION;Sm;0;ON;;;;;Y;;;;; +27CD;MATHEMATICAL FALLING DIAGONAL;Sm;0;ON;;;;;Y;;;;; +27CE;SQUARED LOGICAL AND;Sm;0;ON;;;;;N;;;;; +27CF;SQUARED LOGICAL OR;Sm;0;ON;;;;;N;;;;; +27D0;WHITE DIAMOND WITH CENTRED DOT;Sm;0;ON;;;;;N;;;;; +27D1;AND WITH DOT;Sm;0;ON;;;;;N;;;;; +27D2;ELEMENT OF OPENING UPWARDS;Sm;0;ON;;;;;N;;;;; +27D3;LOWER RIGHT CORNER WITH DOT;Sm;0;ON;;;;;Y;;;;; +27D4;UPPER LEFT CORNER WITH DOT;Sm;0;ON;;;;;Y;;;;; +27D5;LEFT OUTER JOIN;Sm;0;ON;;;;;Y;;;;; +27D6;RIGHT OUTER JOIN;Sm;0;ON;;;;;Y;;;;; +27D7;FULL OUTER JOIN;Sm;0;ON;;;;;N;;;;; +27D8;LARGE UP TACK;Sm;0;ON;;;;;N;;;;; +27D9;LARGE DOWN TACK;Sm;0;ON;;;;;N;;;;; +27DA;LEFT AND RIGHT DOUBLE TURNSTILE;Sm;0;ON;;;;;N;;;;; +27DB;LEFT AND RIGHT TACK;Sm;0;ON;;;;;N;;;;; +27DC;LEFT MULTIMAP;Sm;0;ON;;;;;Y;;;;; +27DD;LONG RIGHT TACK;Sm;0;ON;;;;;Y;;;;; +27DE;LONG LEFT TACK;Sm;0;ON;;;;;Y;;;;; +27DF;UP TACK WITH CIRCLE ABOVE;Sm;0;ON;;;;;N;;;;; +27E0;LOZENGE DIVIDED BY HORIZONTAL RULE;Sm;0;ON;;;;;N;;;;; +27E1;WHITE CONCAVE-SIDED DIAMOND;Sm;0;ON;;;;;N;;;;; +27E2;WHITE CONCAVE-SIDED DIAMOND WITH LEFTWARDS TICK;Sm;0;ON;;;;;Y;;;;; +27E3;WHITE CONCAVE-SIDED DIAMOND WITH RIGHTWARDS TICK;Sm;0;ON;;;;;Y;;;;; +27E4;WHITE SQUARE WITH LEFTWARDS TICK;Sm;0;ON;;;;;Y;;;;; +27E5;WHITE SQUARE WITH RIGHTWARDS TICK;Sm;0;ON;;;;;Y;;;;; +27E6;MATHEMATICAL LEFT WHITE SQUARE BRACKET;Ps;0;ON;;;;;Y;;;;; +27E7;MATHEMATICAL RIGHT WHITE SQUARE BRACKET;Pe;0;ON;;;;;Y;;;;; +27E8;MATHEMATICAL LEFT ANGLE BRACKET;Ps;0;ON;;;;;Y;;;;; +27E9;MATHEMATICAL RIGHT ANGLE BRACKET;Pe;0;ON;;;;;Y;;;;; +27EA;MATHEMATICAL LEFT DOUBLE ANGLE BRACKET;Ps;0;ON;;;;;Y;;;;; +27EB;MATHEMATICAL RIGHT DOUBLE ANGLE BRACKET;Pe;0;ON;;;;;Y;;;;; +27EC;MATHEMATICAL LEFT WHITE TORTOISE SHELL BRACKET;Ps;0;ON;;;;;Y;;;;; +27ED;MATHEMATICAL RIGHT WHITE TORTOISE SHELL BRACKET;Pe;0;ON;;;;;Y;;;;; +27EE;MATHEMATICAL LEFT FLATTENED PARENTHESIS;Ps;0;ON;;;;;Y;;;;; +27EF;MATHEMATICAL RIGHT FLATTENED PARENTHESIS;Pe;0;ON;;;;;Y;;;;; +27F0;UPWARDS QUADRUPLE ARROW;Sm;0;ON;;;;;N;;;;; +27F1;DOWNWARDS QUADRUPLE ARROW;Sm;0;ON;;;;;N;;;;; +27F2;ANTICLOCKWISE GAPPED CIRCLE ARROW;Sm;0;ON;;;;;N;;;;; +27F3;CLOCKWISE GAPPED CIRCLE ARROW;Sm;0;ON;;;;;N;;;;; +27F4;RIGHT ARROW WITH CIRCLED PLUS;Sm;0;ON;;;;;N;;;;; +27F5;LONG LEFTWARDS ARROW;Sm;0;ON;;;;;N;;;;; +27F6;LONG RIGHTWARDS ARROW;Sm;0;ON;;;;;N;;;;; +27F7;LONG LEFT RIGHT ARROW;Sm;0;ON;;;;;N;;;;; +27F8;LONG LEFTWARDS DOUBLE ARROW;Sm;0;ON;;;;;N;;;;; +27F9;LONG RIGHTWARDS DOUBLE ARROW;Sm;0;ON;;;;;N;;;;; +27FA;LONG LEFT RIGHT DOUBLE ARROW;Sm;0;ON;;;;;N;;;;; +27FB;LONG LEFTWARDS ARROW FROM BAR;Sm;0;ON;;;;;N;;;;; +27FC;LONG RIGHTWARDS ARROW FROM BAR;Sm;0;ON;;;;;N;;;;; +27FD;LONG LEFTWARDS DOUBLE ARROW FROM BAR;Sm;0;ON;;;;;N;;;;; +27FE;LONG RIGHTWARDS DOUBLE ARROW FROM BAR;Sm;0;ON;;;;;N;;;;; +27FF;LONG RIGHTWARDS SQUIGGLE ARROW;Sm;0;ON;;;;;N;;;;; +2800;BRAILLE PATTERN BLANK;So;0;L;;;;;N;;;;; +2801;BRAILLE PATTERN DOTS-1;So;0;L;;;;;N;;;;; +2802;BRAILLE PATTERN DOTS-2;So;0;L;;;;;N;;;;; +2803;BRAILLE PATTERN DOTS-12;So;0;L;;;;;N;;;;; +2804;BRAILLE PATTERN DOTS-3;So;0;L;;;;;N;;;;; +2805;BRAILLE PATTERN DOTS-13;So;0;L;;;;;N;;;;; +2806;BRAILLE PATTERN DOTS-23;So;0;L;;;;;N;;;;; +2807;BRAILLE PATTERN DOTS-123;So;0;L;;;;;N;;;;; +2808;BRAILLE PATTERN DOTS-4;So;0;L;;;;;N;;;;; +2809;BRAILLE PATTERN DOTS-14;So;0;L;;;;;N;;;;; +280A;BRAILLE PATTERN DOTS-24;So;0;L;;;;;N;;;;; +280B;BRAILLE PATTERN DOTS-124;So;0;L;;;;;N;;;;; +280C;BRAILLE PATTERN DOTS-34;So;0;L;;;;;N;;;;; +280D;BRAILLE PATTERN DOTS-134;So;0;L;;;;;N;;;;; +280E;BRAILLE PATTERN DOTS-234;So;0;L;;;;;N;;;;; +280F;BRAILLE PATTERN DOTS-1234;So;0;L;;;;;N;;;;; +2810;BRAILLE PATTERN DOTS-5;So;0;L;;;;;N;;;;; +2811;BRAILLE PATTERN DOTS-15;So;0;L;;;;;N;;;;; +2812;BRAILLE PATTERN DOTS-25;So;0;L;;;;;N;;;;; +2813;BRAILLE PATTERN DOTS-125;So;0;L;;;;;N;;;;; +2814;BRAILLE PATTERN DOTS-35;So;0;L;;;;;N;;;;; +2815;BRAILLE PATTERN DOTS-135;So;0;L;;;;;N;;;;; +2816;BRAILLE PATTERN DOTS-235;So;0;L;;;;;N;;;;; +2817;BRAILLE PATTERN DOTS-1235;So;0;L;;;;;N;;;;; +2818;BRAILLE PATTERN DOTS-45;So;0;L;;;;;N;;;;; +2819;BRAILLE PATTERN DOTS-145;So;0;L;;;;;N;;;;; +281A;BRAILLE PATTERN DOTS-245;So;0;L;;;;;N;;;;; +281B;BRAILLE PATTERN DOTS-1245;So;0;L;;;;;N;;;;; +281C;BRAILLE PATTERN DOTS-345;So;0;L;;;;;N;;;;; +281D;BRAILLE PATTERN DOTS-1345;So;0;L;;;;;N;;;;; +281E;BRAILLE PATTERN DOTS-2345;So;0;L;;;;;N;;;;; +281F;BRAILLE PATTERN DOTS-12345;So;0;L;;;;;N;;;;; +2820;BRAILLE PATTERN DOTS-6;So;0;L;;;;;N;;;;; +2821;BRAILLE PATTERN DOTS-16;So;0;L;;;;;N;;;;; +2822;BRAILLE PATTERN DOTS-26;So;0;L;;;;;N;;;;; +2823;BRAILLE PATTERN DOTS-126;So;0;L;;;;;N;;;;; +2824;BRAILLE PATTERN DOTS-36;So;0;L;;;;;N;;;;; +2825;BRAILLE PATTERN DOTS-136;So;0;L;;;;;N;;;;; +2826;BRAILLE PATTERN DOTS-236;So;0;L;;;;;N;;;;; +2827;BRAILLE PATTERN DOTS-1236;So;0;L;;;;;N;;;;; +2828;BRAILLE PATTERN DOTS-46;So;0;L;;;;;N;;;;; +2829;BRAILLE PATTERN DOTS-146;So;0;L;;;;;N;;;;; +282A;BRAILLE PATTERN DOTS-246;So;0;L;;;;;N;;;;; +282B;BRAILLE PATTERN DOTS-1246;So;0;L;;;;;N;;;;; +282C;BRAILLE PATTERN DOTS-346;So;0;L;;;;;N;;;;; +282D;BRAILLE PATTERN DOTS-1346;So;0;L;;;;;N;;;;; +282E;BRAILLE PATTERN DOTS-2346;So;0;L;;;;;N;;;;; +282F;BRAILLE PATTERN DOTS-12346;So;0;L;;;;;N;;;;; +2830;BRAILLE PATTERN DOTS-56;So;0;L;;;;;N;;;;; +2831;BRAILLE PATTERN DOTS-156;So;0;L;;;;;N;;;;; +2832;BRAILLE PATTERN DOTS-256;So;0;L;;;;;N;;;;; +2833;BRAILLE PATTERN DOTS-1256;So;0;L;;;;;N;;;;; +2834;BRAILLE PATTERN DOTS-356;So;0;L;;;;;N;;;;; +2835;BRAILLE PATTERN DOTS-1356;So;0;L;;;;;N;;;;; +2836;BRAILLE PATTERN DOTS-2356;So;0;L;;;;;N;;;;; +2837;BRAILLE PATTERN DOTS-12356;So;0;L;;;;;N;;;;; +2838;BRAILLE PATTERN DOTS-456;So;0;L;;;;;N;;;;; +2839;BRAILLE PATTERN DOTS-1456;So;0;L;;;;;N;;;;; +283A;BRAILLE PATTERN DOTS-2456;So;0;L;;;;;N;;;;; +283B;BRAILLE PATTERN DOTS-12456;So;0;L;;;;;N;;;;; +283C;BRAILLE PATTERN DOTS-3456;So;0;L;;;;;N;;;;; +283D;BRAILLE PATTERN DOTS-13456;So;0;L;;;;;N;;;;; +283E;BRAILLE PATTERN DOTS-23456;So;0;L;;;;;N;;;;; +283F;BRAILLE PATTERN DOTS-123456;So;0;L;;;;;N;;;;; +2840;BRAILLE PATTERN DOTS-7;So;0;L;;;;;N;;;;; +2841;BRAILLE PATTERN DOTS-17;So;0;L;;;;;N;;;;; +2842;BRAILLE PATTERN DOTS-27;So;0;L;;;;;N;;;;; +2843;BRAILLE PATTERN DOTS-127;So;0;L;;;;;N;;;;; +2844;BRAILLE PATTERN DOTS-37;So;0;L;;;;;N;;;;; +2845;BRAILLE PATTERN DOTS-137;So;0;L;;;;;N;;;;; +2846;BRAILLE PATTERN DOTS-237;So;0;L;;;;;N;;;;; +2847;BRAILLE PATTERN DOTS-1237;So;0;L;;;;;N;;;;; +2848;BRAILLE PATTERN DOTS-47;So;0;L;;;;;N;;;;; +2849;BRAILLE PATTERN DOTS-147;So;0;L;;;;;N;;;;; +284A;BRAILLE PATTERN DOTS-247;So;0;L;;;;;N;;;;; +284B;BRAILLE PATTERN DOTS-1247;So;0;L;;;;;N;;;;; +284C;BRAILLE PATTERN DOTS-347;So;0;L;;;;;N;;;;; +284D;BRAILLE PATTERN DOTS-1347;So;0;L;;;;;N;;;;; +284E;BRAILLE PATTERN DOTS-2347;So;0;L;;;;;N;;;;; +284F;BRAILLE PATTERN DOTS-12347;So;0;L;;;;;N;;;;; +2850;BRAILLE PATTERN DOTS-57;So;0;L;;;;;N;;;;; +2851;BRAILLE PATTERN DOTS-157;So;0;L;;;;;N;;;;; +2852;BRAILLE PATTERN DOTS-257;So;0;L;;;;;N;;;;; +2853;BRAILLE PATTERN DOTS-1257;So;0;L;;;;;N;;;;; +2854;BRAILLE PATTERN DOTS-357;So;0;L;;;;;N;;;;; +2855;BRAILLE PATTERN DOTS-1357;So;0;L;;;;;N;;;;; +2856;BRAILLE PATTERN DOTS-2357;So;0;L;;;;;N;;;;; +2857;BRAILLE PATTERN DOTS-12357;So;0;L;;;;;N;;;;; +2858;BRAILLE PATTERN DOTS-457;So;0;L;;;;;N;;;;; +2859;BRAILLE PATTERN DOTS-1457;So;0;L;;;;;N;;;;; +285A;BRAILLE PATTERN DOTS-2457;So;0;L;;;;;N;;;;; +285B;BRAILLE PATTERN DOTS-12457;So;0;L;;;;;N;;;;; +285C;BRAILLE PATTERN DOTS-3457;So;0;L;;;;;N;;;;; +285D;BRAILLE PATTERN DOTS-13457;So;0;L;;;;;N;;;;; +285E;BRAILLE PATTERN DOTS-23457;So;0;L;;;;;N;;;;; +285F;BRAILLE PATTERN DOTS-123457;So;0;L;;;;;N;;;;; +2860;BRAILLE PATTERN DOTS-67;So;0;L;;;;;N;;;;; +2861;BRAILLE PATTERN DOTS-167;So;0;L;;;;;N;;;;; +2862;BRAILLE PATTERN DOTS-267;So;0;L;;;;;N;;;;; +2863;BRAILLE PATTERN DOTS-1267;So;0;L;;;;;N;;;;; +2864;BRAILLE PATTERN DOTS-367;So;0;L;;;;;N;;;;; +2865;BRAILLE PATTERN DOTS-1367;So;0;L;;;;;N;;;;; +2866;BRAILLE PATTERN DOTS-2367;So;0;L;;;;;N;;;;; +2867;BRAILLE PATTERN DOTS-12367;So;0;L;;;;;N;;;;; +2868;BRAILLE PATTERN DOTS-467;So;0;L;;;;;N;;;;; +2869;BRAILLE PATTERN DOTS-1467;So;0;L;;;;;N;;;;; +286A;BRAILLE PATTERN DOTS-2467;So;0;L;;;;;N;;;;; +286B;BRAILLE PATTERN DOTS-12467;So;0;L;;;;;N;;;;; +286C;BRAILLE PATTERN DOTS-3467;So;0;L;;;;;N;;;;; +286D;BRAILLE PATTERN DOTS-13467;So;0;L;;;;;N;;;;; +286E;BRAILLE PATTERN DOTS-23467;So;0;L;;;;;N;;;;; +286F;BRAILLE PATTERN DOTS-123467;So;0;L;;;;;N;;;;; +2870;BRAILLE PATTERN DOTS-567;So;0;L;;;;;N;;;;; +2871;BRAILLE PATTERN DOTS-1567;So;0;L;;;;;N;;;;; +2872;BRAILLE PATTERN DOTS-2567;So;0;L;;;;;N;;;;; +2873;BRAILLE PATTERN DOTS-12567;So;0;L;;;;;N;;;;; +2874;BRAILLE PATTERN DOTS-3567;So;0;L;;;;;N;;;;; +2875;BRAILLE PATTERN DOTS-13567;So;0;L;;;;;N;;;;; +2876;BRAILLE PATTERN DOTS-23567;So;0;L;;;;;N;;;;; +2877;BRAILLE PATTERN DOTS-123567;So;0;L;;;;;N;;;;; +2878;BRAILLE PATTERN DOTS-4567;So;0;L;;;;;N;;;;; +2879;BRAILLE PATTERN DOTS-14567;So;0;L;;;;;N;;;;; +287A;BRAILLE PATTERN DOTS-24567;So;0;L;;;;;N;;;;; +287B;BRAILLE PATTERN DOTS-124567;So;0;L;;;;;N;;;;; +287C;BRAILLE PATTERN DOTS-34567;So;0;L;;;;;N;;;;; +287D;BRAILLE PATTERN DOTS-134567;So;0;L;;;;;N;;;;; +287E;BRAILLE PATTERN DOTS-234567;So;0;L;;;;;N;;;;; +287F;BRAILLE PATTERN DOTS-1234567;So;0;L;;;;;N;;;;; +2880;BRAILLE PATTERN DOTS-8;So;0;L;;;;;N;;;;; +2881;BRAILLE PATTERN DOTS-18;So;0;L;;;;;N;;;;; +2882;BRAILLE PATTERN DOTS-28;So;0;L;;;;;N;;;;; +2883;BRAILLE PATTERN DOTS-128;So;0;L;;;;;N;;;;; +2884;BRAILLE PATTERN DOTS-38;So;0;L;;;;;N;;;;; +2885;BRAILLE PATTERN DOTS-138;So;0;L;;;;;N;;;;; +2886;BRAILLE PATTERN DOTS-238;So;0;L;;;;;N;;;;; +2887;BRAILLE PATTERN DOTS-1238;So;0;L;;;;;N;;;;; +2888;BRAILLE PATTERN DOTS-48;So;0;L;;;;;N;;;;; +2889;BRAILLE PATTERN DOTS-148;So;0;L;;;;;N;;;;; +288A;BRAILLE PATTERN DOTS-248;So;0;L;;;;;N;;;;; +288B;BRAILLE PATTERN DOTS-1248;So;0;L;;;;;N;;;;; +288C;BRAILLE PATTERN DOTS-348;So;0;L;;;;;N;;;;; +288D;BRAILLE PATTERN DOTS-1348;So;0;L;;;;;N;;;;; +288E;BRAILLE PATTERN DOTS-2348;So;0;L;;;;;N;;;;; +288F;BRAILLE PATTERN DOTS-12348;So;0;L;;;;;N;;;;; +2890;BRAILLE PATTERN DOTS-58;So;0;L;;;;;N;;;;; +2891;BRAILLE PATTERN DOTS-158;So;0;L;;;;;N;;;;; +2892;BRAILLE PATTERN DOTS-258;So;0;L;;;;;N;;;;; +2893;BRAILLE PATTERN DOTS-1258;So;0;L;;;;;N;;;;; +2894;BRAILLE PATTERN DOTS-358;So;0;L;;;;;N;;;;; +2895;BRAILLE PATTERN DOTS-1358;So;0;L;;;;;N;;;;; +2896;BRAILLE PATTERN DOTS-2358;So;0;L;;;;;N;;;;; +2897;BRAILLE PATTERN DOTS-12358;So;0;L;;;;;N;;;;; +2898;BRAILLE PATTERN DOTS-458;So;0;L;;;;;N;;;;; +2899;BRAILLE PATTERN DOTS-1458;So;0;L;;;;;N;;;;; +289A;BRAILLE PATTERN DOTS-2458;So;0;L;;;;;N;;;;; +289B;BRAILLE PATTERN DOTS-12458;So;0;L;;;;;N;;;;; +289C;BRAILLE PATTERN DOTS-3458;So;0;L;;;;;N;;;;; +289D;BRAILLE PATTERN DOTS-13458;So;0;L;;;;;N;;;;; +289E;BRAILLE PATTERN DOTS-23458;So;0;L;;;;;N;;;;; +289F;BRAILLE PATTERN DOTS-123458;So;0;L;;;;;N;;;;; +28A0;BRAILLE PATTERN DOTS-68;So;0;L;;;;;N;;;;; +28A1;BRAILLE PATTERN DOTS-168;So;0;L;;;;;N;;;;; +28A2;BRAILLE PATTERN DOTS-268;So;0;L;;;;;N;;;;; +28A3;BRAILLE PATTERN DOTS-1268;So;0;L;;;;;N;;;;; +28A4;BRAILLE PATTERN DOTS-368;So;0;L;;;;;N;;;;; +28A5;BRAILLE PATTERN DOTS-1368;So;0;L;;;;;N;;;;; +28A6;BRAILLE PATTERN DOTS-2368;So;0;L;;;;;N;;;;; +28A7;BRAILLE PATTERN DOTS-12368;So;0;L;;;;;N;;;;; +28A8;BRAILLE PATTERN DOTS-468;So;0;L;;;;;N;;;;; +28A9;BRAILLE PATTERN DOTS-1468;So;0;L;;;;;N;;;;; +28AA;BRAILLE PATTERN DOTS-2468;So;0;L;;;;;N;;;;; +28AB;BRAILLE PATTERN DOTS-12468;So;0;L;;;;;N;;;;; +28AC;BRAILLE PATTERN DOTS-3468;So;0;L;;;;;N;;;;; +28AD;BRAILLE PATTERN DOTS-13468;So;0;L;;;;;N;;;;; +28AE;BRAILLE PATTERN DOTS-23468;So;0;L;;;;;N;;;;; +28AF;BRAILLE PATTERN DOTS-123468;So;0;L;;;;;N;;;;; +28B0;BRAILLE PATTERN DOTS-568;So;0;L;;;;;N;;;;; +28B1;BRAILLE PATTERN DOTS-1568;So;0;L;;;;;N;;;;; +28B2;BRAILLE PATTERN DOTS-2568;So;0;L;;;;;N;;;;; +28B3;BRAILLE PATTERN DOTS-12568;So;0;L;;;;;N;;;;; +28B4;BRAILLE PATTERN DOTS-3568;So;0;L;;;;;N;;;;; +28B5;BRAILLE PATTERN DOTS-13568;So;0;L;;;;;N;;;;; +28B6;BRAILLE PATTERN DOTS-23568;So;0;L;;;;;N;;;;; +28B7;BRAILLE PATTERN DOTS-123568;So;0;L;;;;;N;;;;; +28B8;BRAILLE PATTERN DOTS-4568;So;0;L;;;;;N;;;;; +28B9;BRAILLE PATTERN DOTS-14568;So;0;L;;;;;N;;;;; +28BA;BRAILLE PATTERN DOTS-24568;So;0;L;;;;;N;;;;; +28BB;BRAILLE PATTERN DOTS-124568;So;0;L;;;;;N;;;;; +28BC;BRAILLE PATTERN DOTS-34568;So;0;L;;;;;N;;;;; +28BD;BRAILLE PATTERN DOTS-134568;So;0;L;;;;;N;;;;; +28BE;BRAILLE PATTERN DOTS-234568;So;0;L;;;;;N;;;;; +28BF;BRAILLE PATTERN DOTS-1234568;So;0;L;;;;;N;;;;; +28C0;BRAILLE PATTERN DOTS-78;So;0;L;;;;;N;;;;; +28C1;BRAILLE PATTERN DOTS-178;So;0;L;;;;;N;;;;; +28C2;BRAILLE PATTERN DOTS-278;So;0;L;;;;;N;;;;; +28C3;BRAILLE PATTERN DOTS-1278;So;0;L;;;;;N;;;;; +28C4;BRAILLE PATTERN DOTS-378;So;0;L;;;;;N;;;;; +28C5;BRAILLE PATTERN DOTS-1378;So;0;L;;;;;N;;;;; +28C6;BRAILLE PATTERN DOTS-2378;So;0;L;;;;;N;;;;; +28C7;BRAILLE PATTERN DOTS-12378;So;0;L;;;;;N;;;;; +28C8;BRAILLE PATTERN DOTS-478;So;0;L;;;;;N;;;;; +28C9;BRAILLE PATTERN DOTS-1478;So;0;L;;;;;N;;;;; +28CA;BRAILLE PATTERN DOTS-2478;So;0;L;;;;;N;;;;; +28CB;BRAILLE PATTERN DOTS-12478;So;0;L;;;;;N;;;;; +28CC;BRAILLE PATTERN DOTS-3478;So;0;L;;;;;N;;;;; +28CD;BRAILLE PATTERN DOTS-13478;So;0;L;;;;;N;;;;; +28CE;BRAILLE PATTERN DOTS-23478;So;0;L;;;;;N;;;;; +28CF;BRAILLE PATTERN DOTS-123478;So;0;L;;;;;N;;;;; +28D0;BRAILLE PATTERN DOTS-578;So;0;L;;;;;N;;;;; +28D1;BRAILLE PATTERN DOTS-1578;So;0;L;;;;;N;;;;; +28D2;BRAILLE PATTERN DOTS-2578;So;0;L;;;;;N;;;;; +28D3;BRAILLE PATTERN DOTS-12578;So;0;L;;;;;N;;;;; +28D4;BRAILLE PATTERN DOTS-3578;So;0;L;;;;;N;;;;; +28D5;BRAILLE PATTERN DOTS-13578;So;0;L;;;;;N;;;;; +28D6;BRAILLE PATTERN DOTS-23578;So;0;L;;;;;N;;;;; +28D7;BRAILLE PATTERN DOTS-123578;So;0;L;;;;;N;;;;; +28D8;BRAILLE PATTERN DOTS-4578;So;0;L;;;;;N;;;;; +28D9;BRAILLE PATTERN DOTS-14578;So;0;L;;;;;N;;;;; +28DA;BRAILLE PATTERN DOTS-24578;So;0;L;;;;;N;;;;; +28DB;BRAILLE PATTERN DOTS-124578;So;0;L;;;;;N;;;;; +28DC;BRAILLE PATTERN DOTS-34578;So;0;L;;;;;N;;;;; +28DD;BRAILLE PATTERN DOTS-134578;So;0;L;;;;;N;;;;; +28DE;BRAILLE PATTERN DOTS-234578;So;0;L;;;;;N;;;;; +28DF;BRAILLE PATTERN DOTS-1234578;So;0;L;;;;;N;;;;; +28E0;BRAILLE PATTERN DOTS-678;So;0;L;;;;;N;;;;; +28E1;BRAILLE PATTERN DOTS-1678;So;0;L;;;;;N;;;;; +28E2;BRAILLE PATTERN DOTS-2678;So;0;L;;;;;N;;;;; +28E3;BRAILLE PATTERN DOTS-12678;So;0;L;;;;;N;;;;; +28E4;BRAILLE PATTERN DOTS-3678;So;0;L;;;;;N;;;;; +28E5;BRAILLE PATTERN DOTS-13678;So;0;L;;;;;N;;;;; +28E6;BRAILLE PATTERN DOTS-23678;So;0;L;;;;;N;;;;; +28E7;BRAILLE PATTERN DOTS-123678;So;0;L;;;;;N;;;;; +28E8;BRAILLE PATTERN DOTS-4678;So;0;L;;;;;N;;;;; +28E9;BRAILLE PATTERN DOTS-14678;So;0;L;;;;;N;;;;; +28EA;BRAILLE PATTERN DOTS-24678;So;0;L;;;;;N;;;;; +28EB;BRAILLE PATTERN DOTS-124678;So;0;L;;;;;N;;;;; +28EC;BRAILLE PATTERN DOTS-34678;So;0;L;;;;;N;;;;; +28ED;BRAILLE PATTERN DOTS-134678;So;0;L;;;;;N;;;;; +28EE;BRAILLE PATTERN DOTS-234678;So;0;L;;;;;N;;;;; +28EF;BRAILLE PATTERN DOTS-1234678;So;0;L;;;;;N;;;;; +28F0;BRAILLE PATTERN DOTS-5678;So;0;L;;;;;N;;;;; +28F1;BRAILLE PATTERN DOTS-15678;So;0;L;;;;;N;;;;; +28F2;BRAILLE PATTERN DOTS-25678;So;0;L;;;;;N;;;;; +28F3;BRAILLE PATTERN DOTS-125678;So;0;L;;;;;N;;;;; +28F4;BRAILLE PATTERN DOTS-35678;So;0;L;;;;;N;;;;; +28F5;BRAILLE PATTERN DOTS-135678;So;0;L;;;;;N;;;;; +28F6;BRAILLE PATTERN DOTS-235678;So;0;L;;;;;N;;;;; +28F7;BRAILLE PATTERN DOTS-1235678;So;0;L;;;;;N;;;;; +28F8;BRAILLE PATTERN DOTS-45678;So;0;L;;;;;N;;;;; +28F9;BRAILLE PATTERN DOTS-145678;So;0;L;;;;;N;;;;; +28FA;BRAILLE PATTERN DOTS-245678;So;0;L;;;;;N;;;;; +28FB;BRAILLE PATTERN DOTS-1245678;So;0;L;;;;;N;;;;; +28FC;BRAILLE PATTERN DOTS-345678;So;0;L;;;;;N;;;;; +28FD;BRAILLE PATTERN DOTS-1345678;So;0;L;;;;;N;;;;; +28FE;BRAILLE PATTERN DOTS-2345678;So;0;L;;;;;N;;;;; +28FF;BRAILLE PATTERN DOTS-12345678;So;0;L;;;;;N;;;;; +2900;RIGHTWARDS TWO-HEADED ARROW WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;; +2901;RIGHTWARDS TWO-HEADED ARROW WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;; +2902;LEFTWARDS DOUBLE ARROW WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;; +2903;RIGHTWARDS DOUBLE ARROW WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;; +2904;LEFT RIGHT DOUBLE ARROW WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;; +2905;RIGHTWARDS TWO-HEADED ARROW FROM BAR;Sm;0;ON;;;;;N;;;;; +2906;LEFTWARDS DOUBLE ARROW FROM BAR;Sm;0;ON;;;;;N;;;;; +2907;RIGHTWARDS DOUBLE ARROW FROM BAR;Sm;0;ON;;;;;N;;;;; +2908;DOWNWARDS ARROW WITH HORIZONTAL STROKE;Sm;0;ON;;;;;N;;;;; +2909;UPWARDS ARROW WITH HORIZONTAL STROKE;Sm;0;ON;;;;;N;;;;; +290A;UPWARDS TRIPLE ARROW;Sm;0;ON;;;;;N;;;;; +290B;DOWNWARDS TRIPLE ARROW;Sm;0;ON;;;;;N;;;;; +290C;LEFTWARDS DOUBLE DASH ARROW;Sm;0;ON;;;;;N;;;;; +290D;RIGHTWARDS DOUBLE DASH ARROW;Sm;0;ON;;;;;N;;;;; +290E;LEFTWARDS TRIPLE DASH ARROW;Sm;0;ON;;;;;N;;;;; +290F;RIGHTWARDS TRIPLE DASH ARROW;Sm;0;ON;;;;;N;;;;; +2910;RIGHTWARDS TWO-HEADED TRIPLE DASH ARROW;Sm;0;ON;;;;;N;;;;; +2911;RIGHTWARDS ARROW WITH DOTTED STEM;Sm;0;ON;;;;;N;;;;; +2912;UPWARDS ARROW TO BAR;Sm;0;ON;;;;;N;;;;; +2913;DOWNWARDS ARROW TO BAR;Sm;0;ON;;;;;N;;;;; +2914;RIGHTWARDS ARROW WITH TAIL WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;; +2915;RIGHTWARDS ARROW WITH TAIL WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;; +2916;RIGHTWARDS TWO-HEADED ARROW WITH TAIL;Sm;0;ON;;;;;N;;;;; +2917;RIGHTWARDS TWO-HEADED ARROW WITH TAIL WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;; +2918;RIGHTWARDS TWO-HEADED ARROW WITH TAIL WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;; +2919;LEFTWARDS ARROW-TAIL;Sm;0;ON;;;;;N;;;;; +291A;RIGHTWARDS ARROW-TAIL;Sm;0;ON;;;;;N;;;;; +291B;LEFTWARDS DOUBLE ARROW-TAIL;Sm;0;ON;;;;;N;;;;; +291C;RIGHTWARDS DOUBLE ARROW-TAIL;Sm;0;ON;;;;;N;;;;; +291D;LEFTWARDS ARROW TO BLACK DIAMOND;Sm;0;ON;;;;;N;;;;; +291E;RIGHTWARDS ARROW TO BLACK DIAMOND;Sm;0;ON;;;;;N;;;;; +291F;LEFTWARDS ARROW FROM BAR TO BLACK DIAMOND;Sm;0;ON;;;;;N;;;;; +2920;RIGHTWARDS ARROW FROM BAR TO BLACK DIAMOND;Sm;0;ON;;;;;N;;;;; +2921;NORTH WEST AND SOUTH EAST ARROW;Sm;0;ON;;;;;N;;;;; +2922;NORTH EAST AND SOUTH WEST ARROW;Sm;0;ON;;;;;N;;;;; +2923;NORTH WEST ARROW WITH HOOK;Sm;0;ON;;;;;N;;;;; +2924;NORTH EAST ARROW WITH HOOK;Sm;0;ON;;;;;N;;;;; +2925;SOUTH EAST ARROW WITH HOOK;Sm;0;ON;;;;;N;;;;; +2926;SOUTH WEST ARROW WITH HOOK;Sm;0;ON;;;;;N;;;;; +2927;NORTH WEST ARROW AND NORTH EAST ARROW;Sm;0;ON;;;;;N;;;;; +2928;NORTH EAST ARROW AND SOUTH EAST ARROW;Sm;0;ON;;;;;N;;;;; +2929;SOUTH EAST ARROW AND SOUTH WEST ARROW;Sm;0;ON;;;;;N;;;;; +292A;SOUTH WEST ARROW AND NORTH WEST ARROW;Sm;0;ON;;;;;N;;;;; +292B;RISING DIAGONAL CROSSING FALLING DIAGONAL;Sm;0;ON;;;;;N;;;;; +292C;FALLING DIAGONAL CROSSING RISING DIAGONAL;Sm;0;ON;;;;;N;;;;; +292D;SOUTH EAST ARROW CROSSING NORTH EAST ARROW;Sm;0;ON;;;;;N;;;;; +292E;NORTH EAST ARROW CROSSING SOUTH EAST ARROW;Sm;0;ON;;;;;N;;;;; +292F;FALLING DIAGONAL CROSSING NORTH EAST ARROW;Sm;0;ON;;;;;N;;;;; +2930;RISING DIAGONAL CROSSING SOUTH EAST ARROW;Sm;0;ON;;;;;N;;;;; +2931;NORTH EAST ARROW CROSSING NORTH WEST ARROW;Sm;0;ON;;;;;N;;;;; +2932;NORTH WEST ARROW CROSSING NORTH EAST ARROW;Sm;0;ON;;;;;N;;;;; +2933;WAVE ARROW POINTING DIRECTLY RIGHT;Sm;0;ON;;;;;N;;;;; +2934;ARROW POINTING RIGHTWARDS THEN CURVING UPWARDS;Sm;0;ON;;;;;N;;;;; +2935;ARROW POINTING RIGHTWARDS THEN CURVING DOWNWARDS;Sm;0;ON;;;;;N;;;;; +2936;ARROW POINTING DOWNWARDS THEN CURVING LEFTWARDS;Sm;0;ON;;;;;N;;;;; +2937;ARROW POINTING DOWNWARDS THEN CURVING RIGHTWARDS;Sm;0;ON;;;;;N;;;;; +2938;RIGHT-SIDE ARC CLOCKWISE ARROW;Sm;0;ON;;;;;N;;;;; +2939;LEFT-SIDE ARC ANTICLOCKWISE ARROW;Sm;0;ON;;;;;N;;;;; +293A;TOP ARC ANTICLOCKWISE ARROW;Sm;0;ON;;;;;N;;;;; +293B;BOTTOM ARC ANTICLOCKWISE ARROW;Sm;0;ON;;;;;N;;;;; +293C;TOP ARC CLOCKWISE ARROW WITH MINUS;Sm;0;ON;;;;;N;;;;; +293D;TOP ARC ANTICLOCKWISE ARROW WITH PLUS;Sm;0;ON;;;;;N;;;;; +293E;LOWER RIGHT SEMICIRCULAR CLOCKWISE ARROW;Sm;0;ON;;;;;N;;;;; +293F;LOWER LEFT SEMICIRCULAR ANTICLOCKWISE ARROW;Sm;0;ON;;;;;N;;;;; +2940;ANTICLOCKWISE CLOSED CIRCLE ARROW;Sm;0;ON;;;;;N;;;;; +2941;CLOCKWISE CLOSED CIRCLE ARROW;Sm;0;ON;;;;;N;;;;; +2942;RIGHTWARDS ARROW ABOVE SHORT LEFTWARDS ARROW;Sm;0;ON;;;;;N;;;;; +2943;LEFTWARDS ARROW ABOVE SHORT RIGHTWARDS ARROW;Sm;0;ON;;;;;N;;;;; +2944;SHORT RIGHTWARDS ARROW ABOVE LEFTWARDS ARROW;Sm;0;ON;;;;;N;;;;; +2945;RIGHTWARDS ARROW WITH PLUS BELOW;Sm;0;ON;;;;;N;;;;; +2946;LEFTWARDS ARROW WITH PLUS BELOW;Sm;0;ON;;;;;N;;;;; +2947;RIGHTWARDS ARROW THROUGH X;Sm;0;ON;;;;;N;;;;; +2948;LEFT RIGHT ARROW THROUGH SMALL CIRCLE;Sm;0;ON;;;;;N;;;;; +2949;UPWARDS TWO-HEADED ARROW FROM SMALL CIRCLE;Sm;0;ON;;;;;N;;;;; +294A;LEFT BARB UP RIGHT BARB DOWN HARPOON;Sm;0;ON;;;;;N;;;;; +294B;LEFT BARB DOWN RIGHT BARB UP HARPOON;Sm;0;ON;;;;;N;;;;; +294C;UP BARB RIGHT DOWN BARB LEFT HARPOON;Sm;0;ON;;;;;N;;;;; +294D;UP BARB LEFT DOWN BARB RIGHT HARPOON;Sm;0;ON;;;;;N;;;;; +294E;LEFT BARB UP RIGHT BARB UP HARPOON;Sm;0;ON;;;;;N;;;;; +294F;UP BARB RIGHT DOWN BARB RIGHT HARPOON;Sm;0;ON;;;;;N;;;;; +2950;LEFT BARB DOWN RIGHT BARB DOWN HARPOON;Sm;0;ON;;;;;N;;;;; +2951;UP BARB LEFT DOWN BARB LEFT HARPOON;Sm;0;ON;;;;;N;;;;; +2952;LEFTWARDS HARPOON WITH BARB UP TO BAR;Sm;0;ON;;;;;N;;;;; +2953;RIGHTWARDS HARPOON WITH BARB UP TO BAR;Sm;0;ON;;;;;N;;;;; +2954;UPWARDS HARPOON WITH BARB RIGHT TO BAR;Sm;0;ON;;;;;N;;;;; +2955;DOWNWARDS HARPOON WITH BARB RIGHT TO BAR;Sm;0;ON;;;;;N;;;;; +2956;LEFTWARDS HARPOON WITH BARB DOWN TO BAR;Sm;0;ON;;;;;N;;;;; +2957;RIGHTWARDS HARPOON WITH BARB DOWN TO BAR;Sm;0;ON;;;;;N;;;;; +2958;UPWARDS HARPOON WITH BARB LEFT TO BAR;Sm;0;ON;;;;;N;;;;; +2959;DOWNWARDS HARPOON WITH BARB LEFT TO BAR;Sm;0;ON;;;;;N;;;;; +295A;LEFTWARDS HARPOON WITH BARB UP FROM BAR;Sm;0;ON;;;;;N;;;;; +295B;RIGHTWARDS HARPOON WITH BARB UP FROM BAR;Sm;0;ON;;;;;N;;;;; +295C;UPWARDS HARPOON WITH BARB RIGHT FROM BAR;Sm;0;ON;;;;;N;;;;; +295D;DOWNWARDS HARPOON WITH BARB RIGHT FROM BAR;Sm;0;ON;;;;;N;;;;; +295E;LEFTWARDS HARPOON WITH BARB DOWN FROM BAR;Sm;0;ON;;;;;N;;;;; +295F;RIGHTWARDS HARPOON WITH BARB DOWN FROM BAR;Sm;0;ON;;;;;N;;;;; +2960;UPWARDS HARPOON WITH BARB LEFT FROM BAR;Sm;0;ON;;;;;N;;;;; +2961;DOWNWARDS HARPOON WITH BARB LEFT FROM BAR;Sm;0;ON;;;;;N;;;;; +2962;LEFTWARDS HARPOON WITH BARB UP ABOVE LEFTWARDS HARPOON WITH BARB DOWN;Sm;0;ON;;;;;N;;;;; +2963;UPWARDS HARPOON WITH BARB LEFT BESIDE UPWARDS HARPOON WITH BARB RIGHT;Sm;0;ON;;;;;N;;;;; +2964;RIGHTWARDS HARPOON WITH BARB UP ABOVE RIGHTWARDS HARPOON WITH BARB DOWN;Sm;0;ON;;;;;N;;;;; +2965;DOWNWARDS HARPOON WITH BARB LEFT BESIDE DOWNWARDS HARPOON WITH BARB RIGHT;Sm;0;ON;;;;;N;;;;; +2966;LEFTWARDS HARPOON WITH BARB UP ABOVE RIGHTWARDS HARPOON WITH BARB UP;Sm;0;ON;;;;;N;;;;; +2967;LEFTWARDS HARPOON WITH BARB DOWN ABOVE RIGHTWARDS HARPOON WITH BARB DOWN;Sm;0;ON;;;;;N;;;;; +2968;RIGHTWARDS HARPOON WITH BARB UP ABOVE LEFTWARDS HARPOON WITH BARB UP;Sm;0;ON;;;;;N;;;;; +2969;RIGHTWARDS HARPOON WITH BARB DOWN ABOVE LEFTWARDS HARPOON WITH BARB DOWN;Sm;0;ON;;;;;N;;;;; +296A;LEFTWARDS HARPOON WITH BARB UP ABOVE LONG DASH;Sm;0;ON;;;;;N;;;;; +296B;LEFTWARDS HARPOON WITH BARB DOWN BELOW LONG DASH;Sm;0;ON;;;;;N;;;;; +296C;RIGHTWARDS HARPOON WITH BARB UP ABOVE LONG DASH;Sm;0;ON;;;;;N;;;;; +296D;RIGHTWARDS HARPOON WITH BARB DOWN BELOW LONG DASH;Sm;0;ON;;;;;N;;;;; +296E;UPWARDS HARPOON WITH BARB LEFT BESIDE DOWNWARDS HARPOON WITH BARB RIGHT;Sm;0;ON;;;;;N;;;;; +296F;DOWNWARDS HARPOON WITH BARB LEFT BESIDE UPWARDS HARPOON WITH BARB RIGHT;Sm;0;ON;;;;;N;;;;; +2970;RIGHT DOUBLE ARROW WITH ROUNDED HEAD;Sm;0;ON;;;;;N;;;;; +2971;EQUALS SIGN ABOVE RIGHTWARDS ARROW;Sm;0;ON;;;;;N;;;;; +2972;TILDE OPERATOR ABOVE RIGHTWARDS ARROW;Sm;0;ON;;;;;N;;;;; +2973;LEFTWARDS ARROW ABOVE TILDE OPERATOR;Sm;0;ON;;;;;N;;;;; +2974;RIGHTWARDS ARROW ABOVE TILDE OPERATOR;Sm;0;ON;;;;;N;;;;; +2975;RIGHTWARDS ARROW ABOVE ALMOST EQUAL TO;Sm;0;ON;;;;;N;;;;; +2976;LESS-THAN ABOVE LEFTWARDS ARROW;Sm;0;ON;;;;;N;;;;; +2977;LEFTWARDS ARROW THROUGH LESS-THAN;Sm;0;ON;;;;;N;;;;; +2978;GREATER-THAN ABOVE RIGHTWARDS ARROW;Sm;0;ON;;;;;N;;;;; +2979;SUBSET ABOVE RIGHTWARDS ARROW;Sm;0;ON;;;;;N;;;;; +297A;LEFTWARDS ARROW THROUGH SUBSET;Sm;0;ON;;;;;N;;;;; +297B;SUPERSET ABOVE LEFTWARDS ARROW;Sm;0;ON;;;;;N;;;;; +297C;LEFT FISH TAIL;Sm;0;ON;;;;;N;;;;; +297D;RIGHT FISH TAIL;Sm;0;ON;;;;;N;;;;; +297E;UP FISH TAIL;Sm;0;ON;;;;;N;;;;; +297F;DOWN FISH TAIL;Sm;0;ON;;;;;N;;;;; +2980;TRIPLE VERTICAL BAR DELIMITER;Sm;0;ON;;;;;N;;;;; +2981;Z NOTATION SPOT;Sm;0;ON;;;;;N;;;;; +2982;Z NOTATION TYPE COLON;Sm;0;ON;;;;;N;;;;; +2983;LEFT WHITE CURLY BRACKET;Ps;0;ON;;;;;Y;;;;; +2984;RIGHT WHITE CURLY BRACKET;Pe;0;ON;;;;;Y;;;;; +2985;LEFT WHITE PARENTHESIS;Ps;0;ON;;;;;Y;;;;; +2986;RIGHT WHITE PARENTHESIS;Pe;0;ON;;;;;Y;;;;; +2987;Z NOTATION LEFT IMAGE BRACKET;Ps;0;ON;;;;;Y;;;;; +2988;Z NOTATION RIGHT IMAGE BRACKET;Pe;0;ON;;;;;Y;;;;; +2989;Z NOTATION LEFT BINDING BRACKET;Ps;0;ON;;;;;Y;;;;; +298A;Z NOTATION RIGHT BINDING BRACKET;Pe;0;ON;;;;;Y;;;;; +298B;LEFT SQUARE BRACKET WITH UNDERBAR;Ps;0;ON;;;;;Y;;;;; +298C;RIGHT SQUARE BRACKET WITH UNDERBAR;Pe;0;ON;;;;;Y;;;;; +298D;LEFT SQUARE BRACKET WITH TICK IN TOP CORNER;Ps;0;ON;;;;;Y;;;;; +298E;RIGHT SQUARE BRACKET WITH TICK IN BOTTOM CORNER;Pe;0;ON;;;;;Y;;;;; +298F;LEFT SQUARE BRACKET WITH TICK IN BOTTOM CORNER;Ps;0;ON;;;;;Y;;;;; +2990;RIGHT SQUARE BRACKET WITH TICK IN TOP CORNER;Pe;0;ON;;;;;Y;;;;; +2991;LEFT ANGLE BRACKET WITH DOT;Ps;0;ON;;;;;Y;;;;; +2992;RIGHT ANGLE BRACKET WITH DOT;Pe;0;ON;;;;;Y;;;;; +2993;LEFT ARC LESS-THAN BRACKET;Ps;0;ON;;;;;Y;;;;; +2994;RIGHT ARC GREATER-THAN BRACKET;Pe;0;ON;;;;;Y;;;;; +2995;DOUBLE LEFT ARC GREATER-THAN BRACKET;Ps;0;ON;;;;;Y;;;;; +2996;DOUBLE RIGHT ARC LESS-THAN BRACKET;Pe;0;ON;;;;;Y;;;;; +2997;LEFT BLACK TORTOISE SHELL BRACKET;Ps;0;ON;;;;;Y;;;;; +2998;RIGHT BLACK TORTOISE SHELL BRACKET;Pe;0;ON;;;;;Y;;;;; +2999;DOTTED FENCE;Sm;0;ON;;;;;N;;;;; +299A;VERTICAL ZIGZAG LINE;Sm;0;ON;;;;;N;;;;; +299B;MEASURED ANGLE OPENING LEFT;Sm;0;ON;;;;;Y;;;;; +299C;RIGHT ANGLE VARIANT WITH SQUARE;Sm;0;ON;;;;;Y;;;;; +299D;MEASURED RIGHT ANGLE WITH DOT;Sm;0;ON;;;;;Y;;;;; +299E;ANGLE WITH S INSIDE;Sm;0;ON;;;;;Y;;;;; +299F;ACUTE ANGLE;Sm;0;ON;;;;;Y;;;;; +29A0;SPHERICAL ANGLE OPENING LEFT;Sm;0;ON;;;;;Y;;;;; +29A1;SPHERICAL ANGLE OPENING UP;Sm;0;ON;;;;;N;;;;; +29A2;TURNED ANGLE;Sm;0;ON;;;;;Y;;;;; +29A3;REVERSED ANGLE;Sm;0;ON;;;;;Y;;;;; +29A4;ANGLE WITH UNDERBAR;Sm;0;ON;;;;;Y;;;;; +29A5;REVERSED ANGLE WITH UNDERBAR;Sm;0;ON;;;;;Y;;;;; +29A6;OBLIQUE ANGLE OPENING UP;Sm;0;ON;;;;;Y;;;;; +29A7;OBLIQUE ANGLE OPENING DOWN;Sm;0;ON;;;;;Y;;;;; +29A8;MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING UP AND RIGHT;Sm;0;ON;;;;;Y;;;;; +29A9;MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING UP AND LEFT;Sm;0;ON;;;;;Y;;;;; +29AA;MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING DOWN AND RIGHT;Sm;0;ON;;;;;Y;;;;; +29AB;MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING DOWN AND LEFT;Sm;0;ON;;;;;Y;;;;; +29AC;MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING RIGHT AND UP;Sm;0;ON;;;;;Y;;;;; +29AD;MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING LEFT AND UP;Sm;0;ON;;;;;Y;;;;; +29AE;MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING RIGHT AND DOWN;Sm;0;ON;;;;;Y;;;;; +29AF;MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING LEFT AND DOWN;Sm;0;ON;;;;;Y;;;;; +29B0;REVERSED EMPTY SET;Sm;0;ON;;;;;N;;;;; +29B1;EMPTY SET WITH OVERBAR;Sm;0;ON;;;;;N;;;;; +29B2;EMPTY SET WITH SMALL CIRCLE ABOVE;Sm;0;ON;;;;;N;;;;; +29B3;EMPTY SET WITH RIGHT ARROW ABOVE;Sm;0;ON;;;;;N;;;;; +29B4;EMPTY SET WITH LEFT ARROW ABOVE;Sm;0;ON;;;;;N;;;;; +29B5;CIRCLE WITH HORIZONTAL BAR;Sm;0;ON;;;;;N;;;;; +29B6;CIRCLED VERTICAL BAR;Sm;0;ON;;;;;N;;;;; +29B7;CIRCLED PARALLEL;Sm;0;ON;;;;;N;;;;; +29B8;CIRCLED REVERSE SOLIDUS;Sm;0;ON;;;;;Y;;;;; +29B9;CIRCLED PERPENDICULAR;Sm;0;ON;;;;;N;;;;; +29BA;CIRCLE DIVIDED BY HORIZONTAL BAR AND TOP HALF DIVIDED BY VERTICAL BAR;Sm;0;ON;;;;;N;;;;; +29BB;CIRCLE WITH SUPERIMPOSED X;Sm;0;ON;;;;;N;;;;; +29BC;CIRCLED ANTICLOCKWISE-ROTATED DIVISION SIGN;Sm;0;ON;;;;;N;;;;; +29BD;UP ARROW THROUGH CIRCLE;Sm;0;ON;;;;;N;;;;; +29BE;CIRCLED WHITE BULLET;Sm;0;ON;;;;;N;;;;; +29BF;CIRCLED BULLET;Sm;0;ON;;;;;N;;;;; +29C0;CIRCLED LESS-THAN;Sm;0;ON;;;;;Y;;;;; +29C1;CIRCLED GREATER-THAN;Sm;0;ON;;;;;Y;;;;; +29C2;CIRCLE WITH SMALL CIRCLE TO THE RIGHT;Sm;0;ON;;;;;Y;;;;; +29C3;CIRCLE WITH TWO HORIZONTAL STROKES TO THE RIGHT;Sm;0;ON;;;;;Y;;;;; +29C4;SQUARED RISING DIAGONAL SLASH;Sm;0;ON;;;;;Y;;;;; +29C5;SQUARED FALLING DIAGONAL SLASH;Sm;0;ON;;;;;Y;;;;; +29C6;SQUARED ASTERISK;Sm;0;ON;;;;;N;;;;; +29C7;SQUARED SMALL CIRCLE;Sm;0;ON;;;;;N;;;;; +29C8;SQUARED SQUARE;Sm;0;ON;;;;;N;;;;; +29C9;TWO JOINED SQUARES;Sm;0;ON;;;;;Y;;;;; +29CA;TRIANGLE WITH DOT ABOVE;Sm;0;ON;;;;;N;;;;; +29CB;TRIANGLE WITH UNDERBAR;Sm;0;ON;;;;;N;;;;; +29CC;S IN TRIANGLE;Sm;0;ON;;;;;N;;;;; +29CD;TRIANGLE WITH SERIFS AT BOTTOM;Sm;0;ON;;;;;N;;;;; +29CE;RIGHT TRIANGLE ABOVE LEFT TRIANGLE;Sm;0;ON;;;;;Y;;;;; +29CF;LEFT TRIANGLE BESIDE VERTICAL BAR;Sm;0;ON;;;;;Y;;;;; +29D0;VERTICAL BAR BESIDE RIGHT TRIANGLE;Sm;0;ON;;;;;Y;;;;; +29D1;BOWTIE WITH LEFT HALF BLACK;Sm;0;ON;;;;;Y;;;;; +29D2;BOWTIE WITH RIGHT HALF BLACK;Sm;0;ON;;;;;Y;;;;; +29D3;BLACK BOWTIE;Sm;0;ON;;;;;N;;;;; +29D4;TIMES WITH LEFT HALF BLACK;Sm;0;ON;;;;;Y;;;;; +29D5;TIMES WITH RIGHT HALF BLACK;Sm;0;ON;;;;;Y;;;;; +29D6;WHITE HOURGLASS;Sm;0;ON;;;;;N;;;;; +29D7;BLACK HOURGLASS;Sm;0;ON;;;;;N;;;;; +29D8;LEFT WIGGLY FENCE;Ps;0;ON;;;;;Y;;;;; +29D9;RIGHT WIGGLY FENCE;Pe;0;ON;;;;;Y;;;;; +29DA;LEFT DOUBLE WIGGLY FENCE;Ps;0;ON;;;;;Y;;;;; +29DB;RIGHT DOUBLE WIGGLY FENCE;Pe;0;ON;;;;;Y;;;;; +29DC;INCOMPLETE INFINITY;Sm;0;ON;;;;;Y;;;;; +29DD;TIE OVER INFINITY;Sm;0;ON;;;;;N;;;;; +29DE;INFINITY NEGATED WITH VERTICAL BAR;Sm;0;ON;;;;;N;;;;; +29DF;DOUBLE-ENDED MULTIMAP;Sm;0;ON;;;;;N;;;;; +29E0;SQUARE WITH CONTOURED OUTLINE;Sm;0;ON;;;;;N;;;;; +29E1;INCREASES AS;Sm;0;ON;;;;;Y;;;;; +29E2;SHUFFLE PRODUCT;Sm;0;ON;;;;;N;;;;; +29E3;EQUALS SIGN AND SLANTED PARALLEL;Sm;0;ON;;;;;Y;;;;; +29E4;EQUALS SIGN AND SLANTED PARALLEL WITH TILDE ABOVE;Sm;0;ON;;;;;Y;;;;; +29E5;IDENTICAL TO AND SLANTED PARALLEL;Sm;0;ON;;;;;Y;;;;; +29E6;GLEICH STARK;Sm;0;ON;;;;;N;;;;; +29E7;THERMODYNAMIC;Sm;0;ON;;;;;N;;;;; +29E8;DOWN-POINTING TRIANGLE WITH LEFT HALF BLACK;Sm;0;ON;;;;;Y;;;;; +29E9;DOWN-POINTING TRIANGLE WITH RIGHT HALF BLACK;Sm;0;ON;;;;;Y;;;;; +29EA;BLACK DIAMOND WITH DOWN ARROW;Sm;0;ON;;;;;N;;;;; +29EB;BLACK LOZENGE;Sm;0;ON;;;;;N;;;;; +29EC;WHITE CIRCLE WITH DOWN ARROW;Sm;0;ON;;;;;N;;;;; +29ED;BLACK CIRCLE WITH DOWN ARROW;Sm;0;ON;;;;;N;;;;; +29EE;ERROR-BARRED WHITE SQUARE;Sm;0;ON;;;;;N;;;;; +29EF;ERROR-BARRED BLACK SQUARE;Sm;0;ON;;;;;N;;;;; +29F0;ERROR-BARRED WHITE DIAMOND;Sm;0;ON;;;;;N;;;;; +29F1;ERROR-BARRED BLACK DIAMOND;Sm;0;ON;;;;;N;;;;; +29F2;ERROR-BARRED WHITE CIRCLE;Sm;0;ON;;;;;N;;;;; +29F3;ERROR-BARRED BLACK CIRCLE;Sm;0;ON;;;;;N;;;;; +29F4;RULE-DELAYED;Sm;0;ON;;;;;Y;;;;; +29F5;REVERSE SOLIDUS OPERATOR;Sm;0;ON;;;;;Y;;;;; +29F6;SOLIDUS WITH OVERBAR;Sm;0;ON;;;;;Y;;;;; +29F7;REVERSE SOLIDUS WITH HORIZONTAL STROKE;Sm;0;ON;;;;;Y;;;;; +29F8;BIG SOLIDUS;Sm;0;ON;;;;;Y;;;;; +29F9;BIG REVERSE SOLIDUS;Sm;0;ON;;;;;Y;;;;; +29FA;DOUBLE PLUS;Sm;0;ON;;;;;N;;;;; +29FB;TRIPLE PLUS;Sm;0;ON;;;;;N;;;;; +29FC;LEFT-POINTING CURVED ANGLE BRACKET;Ps;0;ON;;;;;Y;;;;; +29FD;RIGHT-POINTING CURVED ANGLE BRACKET;Pe;0;ON;;;;;Y;;;;; +29FE;TINY;Sm;0;ON;;;;;N;;;;; +29FF;MINY;Sm;0;ON;;;;;N;;;;; +2A00;N-ARY CIRCLED DOT OPERATOR;Sm;0;ON;;;;;N;;;;; +2A01;N-ARY CIRCLED PLUS OPERATOR;Sm;0;ON;;;;;N;;;;; +2A02;N-ARY CIRCLED TIMES OPERATOR;Sm;0;ON;;;;;N;;;;; +2A03;N-ARY UNION OPERATOR WITH DOT;Sm;0;ON;;;;;N;;;;; +2A04;N-ARY UNION OPERATOR WITH PLUS;Sm;0;ON;;;;;N;;;;; +2A05;N-ARY SQUARE INTERSECTION OPERATOR;Sm;0;ON;;;;;N;;;;; +2A06;N-ARY SQUARE UNION OPERATOR;Sm;0;ON;;;;;N;;;;; +2A07;TWO LOGICAL AND OPERATOR;Sm;0;ON;;;;;N;;;;; +2A08;TWO LOGICAL OR OPERATOR;Sm;0;ON;;;;;N;;;;; +2A09;N-ARY TIMES OPERATOR;Sm;0;ON;;;;;N;;;;; +2A0A;MODULO TWO SUM;Sm;0;ON;;;;;Y;;;;; +2A0B;SUMMATION WITH INTEGRAL;Sm;0;ON;;;;;Y;;;;; +2A0C;QUADRUPLE INTEGRAL OPERATOR;Sm;0;ON; 222B 222B 222B 222B;;;;Y;;;;; +2A0D;FINITE PART INTEGRAL;Sm;0;ON;;;;;Y;;;;; +2A0E;INTEGRAL WITH DOUBLE STROKE;Sm;0;ON;;;;;Y;;;;; +2A0F;INTEGRAL AVERAGE WITH SLASH;Sm;0;ON;;;;;Y;;;;; +2A10;CIRCULATION FUNCTION;Sm;0;ON;;;;;Y;;;;; +2A11;ANTICLOCKWISE INTEGRATION;Sm;0;ON;;;;;Y;;;;; +2A12;LINE INTEGRATION WITH RECTANGULAR PATH AROUND POLE;Sm;0;ON;;;;;Y;;;;; +2A13;LINE INTEGRATION WITH SEMICIRCULAR PATH AROUND POLE;Sm;0;ON;;;;;Y;;;;; +2A14;LINE INTEGRATION NOT INCLUDING THE POLE;Sm;0;ON;;;;;Y;;;;; +2A15;INTEGRAL AROUND A POINT OPERATOR;Sm;0;ON;;;;;Y;;;;; +2A16;QUATERNION INTEGRAL OPERATOR;Sm;0;ON;;;;;Y;;;;; +2A17;INTEGRAL WITH LEFTWARDS ARROW WITH HOOK;Sm;0;ON;;;;;Y;;;;; +2A18;INTEGRAL WITH TIMES SIGN;Sm;0;ON;;;;;Y;;;;; +2A19;INTEGRAL WITH INTERSECTION;Sm;0;ON;;;;;Y;;;;; +2A1A;INTEGRAL WITH UNION;Sm;0;ON;;;;;Y;;;;; +2A1B;INTEGRAL WITH OVERBAR;Sm;0;ON;;;;;Y;;;;; +2A1C;INTEGRAL WITH UNDERBAR;Sm;0;ON;;;;;Y;;;;; +2A1D;JOIN;Sm;0;ON;;;;;N;;;;; +2A1E;LARGE LEFT TRIANGLE OPERATOR;Sm;0;ON;;;;;Y;;;;; +2A1F;Z NOTATION SCHEMA COMPOSITION;Sm;0;ON;;;;;Y;;;;; +2A20;Z NOTATION SCHEMA PIPING;Sm;0;ON;;;;;Y;;;;; +2A21;Z NOTATION SCHEMA PROJECTION;Sm;0;ON;;;;;Y;;;;; +2A22;PLUS SIGN WITH SMALL CIRCLE ABOVE;Sm;0;ON;;;;;N;;;;; +2A23;PLUS SIGN WITH CIRCUMFLEX ACCENT ABOVE;Sm;0;ON;;;;;N;;;;; +2A24;PLUS SIGN WITH TILDE ABOVE;Sm;0;ON;;;;;Y;;;;; +2A25;PLUS SIGN WITH DOT BELOW;Sm;0;ON;;;;;N;;;;; +2A26;PLUS SIGN WITH TILDE BELOW;Sm;0;ON;;;;;Y;;;;; +2A27;PLUS SIGN WITH SUBSCRIPT TWO;Sm;0;ON;;;;;N;;;;; +2A28;PLUS SIGN WITH BLACK TRIANGLE;Sm;0;ON;;;;;N;;;;; +2A29;MINUS SIGN WITH COMMA ABOVE;Sm;0;ON;;;;;Y;;;;; +2A2A;MINUS SIGN WITH DOT BELOW;Sm;0;ON;;;;;N;;;;; +2A2B;MINUS SIGN WITH FALLING DOTS;Sm;0;ON;;;;;Y;;;;; +2A2C;MINUS SIGN WITH RISING DOTS;Sm;0;ON;;;;;Y;;;;; +2A2D;PLUS SIGN IN LEFT HALF CIRCLE;Sm;0;ON;;;;;Y;;;;; +2A2E;PLUS SIGN IN RIGHT HALF CIRCLE;Sm;0;ON;;;;;Y;;;;; +2A2F;VECTOR OR CROSS PRODUCT;Sm;0;ON;;;;;N;;;;; +2A30;MULTIPLICATION SIGN WITH DOT ABOVE;Sm;0;ON;;;;;N;;;;; +2A31;MULTIPLICATION SIGN WITH UNDERBAR;Sm;0;ON;;;;;N;;;;; +2A32;SEMIDIRECT PRODUCT WITH BOTTOM CLOSED;Sm;0;ON;;;;;N;;;;; +2A33;SMASH PRODUCT;Sm;0;ON;;;;;N;;;;; +2A34;MULTIPLICATION SIGN IN LEFT HALF CIRCLE;Sm;0;ON;;;;;Y;;;;; +2A35;MULTIPLICATION SIGN IN RIGHT HALF CIRCLE;Sm;0;ON;;;;;Y;;;;; +2A36;CIRCLED MULTIPLICATION SIGN WITH CIRCUMFLEX ACCENT;Sm;0;ON;;;;;N;;;;; +2A37;MULTIPLICATION SIGN IN DOUBLE CIRCLE;Sm;0;ON;;;;;N;;;;; +2A38;CIRCLED DIVISION SIGN;Sm;0;ON;;;;;N;;;;; +2A39;PLUS SIGN IN TRIANGLE;Sm;0;ON;;;;;N;;;;; +2A3A;MINUS SIGN IN TRIANGLE;Sm;0;ON;;;;;N;;;;; +2A3B;MULTIPLICATION SIGN IN TRIANGLE;Sm;0;ON;;;;;N;;;;; +2A3C;INTERIOR PRODUCT;Sm;0;ON;;;;;Y;;;;; +2A3D;RIGHTHAND INTERIOR PRODUCT;Sm;0;ON;;;;;Y;;;;; +2A3E;Z NOTATION RELATIONAL COMPOSITION;Sm;0;ON;;;;;Y;;;;; +2A3F;AMALGAMATION OR COPRODUCT;Sm;0;ON;;;;;N;;;;; +2A40;INTERSECTION WITH DOT;Sm;0;ON;;;;;N;;;;; +2A41;UNION WITH MINUS SIGN;Sm;0;ON;;;;;N;;;;; +2A42;UNION WITH OVERBAR;Sm;0;ON;;;;;N;;;;; +2A43;INTERSECTION WITH OVERBAR;Sm;0;ON;;;;;N;;;;; +2A44;INTERSECTION WITH LOGICAL AND;Sm;0;ON;;;;;N;;;;; +2A45;UNION WITH LOGICAL OR;Sm;0;ON;;;;;N;;;;; +2A46;UNION ABOVE INTERSECTION;Sm;0;ON;;;;;N;;;;; +2A47;INTERSECTION ABOVE UNION;Sm;0;ON;;;;;N;;;;; +2A48;UNION ABOVE BAR ABOVE INTERSECTION;Sm;0;ON;;;;;N;;;;; +2A49;INTERSECTION ABOVE BAR ABOVE UNION;Sm;0;ON;;;;;N;;;;; +2A4A;UNION BESIDE AND JOINED WITH UNION;Sm;0;ON;;;;;N;;;;; +2A4B;INTERSECTION BESIDE AND JOINED WITH INTERSECTION;Sm;0;ON;;;;;N;;;;; +2A4C;CLOSED UNION WITH SERIFS;Sm;0;ON;;;;;N;;;;; +2A4D;CLOSED INTERSECTION WITH SERIFS;Sm;0;ON;;;;;N;;;;; +2A4E;DOUBLE SQUARE INTERSECTION;Sm;0;ON;;;;;N;;;;; +2A4F;DOUBLE SQUARE UNION;Sm;0;ON;;;;;N;;;;; +2A50;CLOSED UNION WITH SERIFS AND SMASH PRODUCT;Sm;0;ON;;;;;N;;;;; +2A51;LOGICAL AND WITH DOT ABOVE;Sm;0;ON;;;;;N;;;;; +2A52;LOGICAL OR WITH DOT ABOVE;Sm;0;ON;;;;;N;;;;; +2A53;DOUBLE LOGICAL AND;Sm;0;ON;;;;;N;;;;; +2A54;DOUBLE LOGICAL OR;Sm;0;ON;;;;;N;;;;; +2A55;TWO INTERSECTING LOGICAL AND;Sm;0;ON;;;;;N;;;;; +2A56;TWO INTERSECTING LOGICAL OR;Sm;0;ON;;;;;N;;;;; +2A57;SLOPING LARGE OR;Sm;0;ON;;;;;Y;;;;; +2A58;SLOPING LARGE AND;Sm;0;ON;;;;;Y;;;;; +2A59;LOGICAL OR OVERLAPPING LOGICAL AND;Sm;0;ON;;;;;N;;;;; +2A5A;LOGICAL AND WITH MIDDLE STEM;Sm;0;ON;;;;;N;;;;; +2A5B;LOGICAL OR WITH MIDDLE STEM;Sm;0;ON;;;;;N;;;;; +2A5C;LOGICAL AND WITH HORIZONTAL DASH;Sm;0;ON;;;;;N;;;;; +2A5D;LOGICAL OR WITH HORIZONTAL DASH;Sm;0;ON;;;;;N;;;;; +2A5E;LOGICAL AND WITH DOUBLE OVERBAR;Sm;0;ON;;;;;N;;;;; +2A5F;LOGICAL AND WITH UNDERBAR;Sm;0;ON;;;;;N;;;;; +2A60;LOGICAL AND WITH DOUBLE UNDERBAR;Sm;0;ON;;;;;N;;;;; +2A61;SMALL VEE WITH UNDERBAR;Sm;0;ON;;;;;N;;;;; +2A62;LOGICAL OR WITH DOUBLE OVERBAR;Sm;0;ON;;;;;N;;;;; +2A63;LOGICAL OR WITH DOUBLE UNDERBAR;Sm;0;ON;;;;;N;;;;; +2A64;Z NOTATION DOMAIN ANTIRESTRICTION;Sm;0;ON;;;;;Y;;;;; +2A65;Z NOTATION RANGE ANTIRESTRICTION;Sm;0;ON;;;;;Y;;;;; +2A66;EQUALS SIGN WITH DOT BELOW;Sm;0;ON;;;;;N;;;;; +2A67;IDENTICAL WITH DOT ABOVE;Sm;0;ON;;;;;N;;;;; +2A68;TRIPLE HORIZONTAL BAR WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;; +2A69;TRIPLE HORIZONTAL BAR WITH TRIPLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;; +2A6A;TILDE OPERATOR WITH DOT ABOVE;Sm;0;ON;;;;;Y;;;;; +2A6B;TILDE OPERATOR WITH RISING DOTS;Sm;0;ON;;;;;Y;;;;; +2A6C;SIMILAR MINUS SIMILAR;Sm;0;ON;;;;;Y;;;;; +2A6D;CONGRUENT WITH DOT ABOVE;Sm;0;ON;;;;;Y;;;;; +2A6E;EQUALS WITH ASTERISK;Sm;0;ON;;;;;N;;;;; +2A6F;ALMOST EQUAL TO WITH CIRCUMFLEX ACCENT;Sm;0;ON;;;;;Y;;;;; +2A70;APPROXIMATELY EQUAL OR EQUAL TO;Sm;0;ON;;;;;Y;;;;; +2A71;EQUALS SIGN ABOVE PLUS SIGN;Sm;0;ON;;;;;N;;;;; +2A72;PLUS SIGN ABOVE EQUALS SIGN;Sm;0;ON;;;;;N;;;;; +2A73;EQUALS SIGN ABOVE TILDE OPERATOR;Sm;0;ON;;;;;Y;;;;; +2A74;DOUBLE COLON EQUAL;Sm;0;ON; 003A 003A 003D;;;;Y;;;;; +2A75;TWO CONSECUTIVE EQUALS SIGNS;Sm;0;ON; 003D 003D;;;;N;;;;; +2A76;THREE CONSECUTIVE EQUALS SIGNS;Sm;0;ON; 003D 003D 003D;;;;N;;;;; +2A77;EQUALS SIGN WITH TWO DOTS ABOVE AND TWO DOTS BELOW;Sm;0;ON;;;;;N;;;;; +2A78;EQUIVALENT WITH FOUR DOTS ABOVE;Sm;0;ON;;;;;N;;;;; +2A79;LESS-THAN WITH CIRCLE INSIDE;Sm;0;ON;;;;;Y;;;;; +2A7A;GREATER-THAN WITH CIRCLE INSIDE;Sm;0;ON;;;;;Y;;;;; +2A7B;LESS-THAN WITH QUESTION MARK ABOVE;Sm;0;ON;;;;;Y;;;;; +2A7C;GREATER-THAN WITH QUESTION MARK ABOVE;Sm;0;ON;;;;;Y;;;;; +2A7D;LESS-THAN OR SLANTED EQUAL TO;Sm;0;ON;;;;;Y;;;;; +2A7E;GREATER-THAN OR SLANTED EQUAL TO;Sm;0;ON;;;;;Y;;;;; +2A7F;LESS-THAN OR SLANTED EQUAL TO WITH DOT INSIDE;Sm;0;ON;;;;;Y;;;;; +2A80;GREATER-THAN OR SLANTED EQUAL TO WITH DOT INSIDE;Sm;0;ON;;;;;Y;;;;; +2A81;LESS-THAN OR SLANTED EQUAL TO WITH DOT ABOVE;Sm;0;ON;;;;;Y;;;;; +2A82;GREATER-THAN OR SLANTED EQUAL TO WITH DOT ABOVE;Sm;0;ON;;;;;Y;;;;; +2A83;LESS-THAN OR SLANTED EQUAL TO WITH DOT ABOVE RIGHT;Sm;0;ON;;;;;Y;;;;; +2A84;GREATER-THAN OR SLANTED EQUAL TO WITH DOT ABOVE LEFT;Sm;0;ON;;;;;Y;;;;; +2A85;LESS-THAN OR APPROXIMATE;Sm;0;ON;;;;;Y;;;;; +2A86;GREATER-THAN OR APPROXIMATE;Sm;0;ON;;;;;Y;;;;; +2A87;LESS-THAN AND SINGLE-LINE NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;; +2A88;GREATER-THAN AND SINGLE-LINE NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;; +2A89;LESS-THAN AND NOT APPROXIMATE;Sm;0;ON;;;;;Y;;;;; +2A8A;GREATER-THAN AND NOT APPROXIMATE;Sm;0;ON;;;;;Y;;;;; +2A8B;LESS-THAN ABOVE DOUBLE-LINE EQUAL ABOVE GREATER-THAN;Sm;0;ON;;;;;Y;;;;; +2A8C;GREATER-THAN ABOVE DOUBLE-LINE EQUAL ABOVE LESS-THAN;Sm;0;ON;;;;;Y;;;;; +2A8D;LESS-THAN ABOVE SIMILAR OR EQUAL;Sm;0;ON;;;;;Y;;;;; +2A8E;GREATER-THAN ABOVE SIMILAR OR EQUAL;Sm;0;ON;;;;;Y;;;;; +2A8F;LESS-THAN ABOVE SIMILAR ABOVE GREATER-THAN;Sm;0;ON;;;;;Y;;;;; +2A90;GREATER-THAN ABOVE SIMILAR ABOVE LESS-THAN;Sm;0;ON;;;;;Y;;;;; +2A91;LESS-THAN ABOVE GREATER-THAN ABOVE DOUBLE-LINE EQUAL;Sm;0;ON;;;;;Y;;;;; +2A92;GREATER-THAN ABOVE LESS-THAN ABOVE DOUBLE-LINE EQUAL;Sm;0;ON;;;;;Y;;;;; +2A93;LESS-THAN ABOVE SLANTED EQUAL ABOVE GREATER-THAN ABOVE SLANTED EQUAL;Sm;0;ON;;;;;Y;;;;; +2A94;GREATER-THAN ABOVE SLANTED EQUAL ABOVE LESS-THAN ABOVE SLANTED EQUAL;Sm;0;ON;;;;;Y;;;;; +2A95;SLANTED EQUAL TO OR LESS-THAN;Sm;0;ON;;;;;Y;;;;; +2A96;SLANTED EQUAL TO OR GREATER-THAN;Sm;0;ON;;;;;Y;;;;; +2A97;SLANTED EQUAL TO OR LESS-THAN WITH DOT INSIDE;Sm;0;ON;;;;;Y;;;;; +2A98;SLANTED EQUAL TO OR GREATER-THAN WITH DOT INSIDE;Sm;0;ON;;;;;Y;;;;; +2A99;DOUBLE-LINE EQUAL TO OR LESS-THAN;Sm;0;ON;;;;;Y;;;;; +2A9A;DOUBLE-LINE EQUAL TO OR GREATER-THAN;Sm;0;ON;;;;;Y;;;;; +2A9B;DOUBLE-LINE SLANTED EQUAL TO OR LESS-THAN;Sm;0;ON;;;;;Y;;;;; +2A9C;DOUBLE-LINE SLANTED EQUAL TO OR GREATER-THAN;Sm;0;ON;;;;;Y;;;;; +2A9D;SIMILAR OR LESS-THAN;Sm;0;ON;;;;;Y;;;;; +2A9E;SIMILAR OR GREATER-THAN;Sm;0;ON;;;;;Y;;;;; +2A9F;SIMILAR ABOVE LESS-THAN ABOVE EQUALS SIGN;Sm;0;ON;;;;;Y;;;;; +2AA0;SIMILAR ABOVE GREATER-THAN ABOVE EQUALS SIGN;Sm;0;ON;;;;;Y;;;;; +2AA1;DOUBLE NESTED LESS-THAN;Sm;0;ON;;;;;Y;;;;; +2AA2;DOUBLE NESTED GREATER-THAN;Sm;0;ON;;;;;Y;;;;; +2AA3;DOUBLE NESTED LESS-THAN WITH UNDERBAR;Sm;0;ON;;;;;Y;;;;; +2AA4;GREATER-THAN OVERLAPPING LESS-THAN;Sm;0;ON;;;;;N;;;;; +2AA5;GREATER-THAN BESIDE LESS-THAN;Sm;0;ON;;;;;N;;;;; +2AA6;LESS-THAN CLOSED BY CURVE;Sm;0;ON;;;;;Y;;;;; +2AA7;GREATER-THAN CLOSED BY CURVE;Sm;0;ON;;;;;Y;;;;; +2AA8;LESS-THAN CLOSED BY CURVE ABOVE SLANTED EQUAL;Sm;0;ON;;;;;Y;;;;; +2AA9;GREATER-THAN CLOSED BY CURVE ABOVE SLANTED EQUAL;Sm;0;ON;;;;;Y;;;;; +2AAA;SMALLER THAN;Sm;0;ON;;;;;Y;;;;; +2AAB;LARGER THAN;Sm;0;ON;;;;;Y;;;;; +2AAC;SMALLER THAN OR EQUAL TO;Sm;0;ON;;;;;Y;;;;; +2AAD;LARGER THAN OR EQUAL TO;Sm;0;ON;;;;;Y;;;;; +2AAE;EQUALS SIGN WITH BUMPY ABOVE;Sm;0;ON;;;;;N;;;;; +2AAF;PRECEDES ABOVE SINGLE-LINE EQUALS SIGN;Sm;0;ON;;;;;Y;;;;; +2AB0;SUCCEEDS ABOVE SINGLE-LINE EQUALS SIGN;Sm;0;ON;;;;;Y;;;;; +2AB1;PRECEDES ABOVE SINGLE-LINE NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;; +2AB2;SUCCEEDS ABOVE SINGLE-LINE NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;; +2AB3;PRECEDES ABOVE EQUALS SIGN;Sm;0;ON;;;;;Y;;;;; +2AB4;SUCCEEDS ABOVE EQUALS SIGN;Sm;0;ON;;;;;Y;;;;; +2AB5;PRECEDES ABOVE NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;; +2AB6;SUCCEEDS ABOVE NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;; +2AB7;PRECEDES ABOVE ALMOST EQUAL TO;Sm;0;ON;;;;;Y;;;;; +2AB8;SUCCEEDS ABOVE ALMOST EQUAL TO;Sm;0;ON;;;;;Y;;;;; +2AB9;PRECEDES ABOVE NOT ALMOST EQUAL TO;Sm;0;ON;;;;;Y;;;;; +2ABA;SUCCEEDS ABOVE NOT ALMOST EQUAL TO;Sm;0;ON;;;;;Y;;;;; +2ABB;DOUBLE PRECEDES;Sm;0;ON;;;;;Y;;;;; +2ABC;DOUBLE SUCCEEDS;Sm;0;ON;;;;;Y;;;;; +2ABD;SUBSET WITH DOT;Sm;0;ON;;;;;Y;;;;; +2ABE;SUPERSET WITH DOT;Sm;0;ON;;;;;Y;;;;; +2ABF;SUBSET WITH PLUS SIGN BELOW;Sm;0;ON;;;;;Y;;;;; +2AC0;SUPERSET WITH PLUS SIGN BELOW;Sm;0;ON;;;;;Y;;;;; +2AC1;SUBSET WITH MULTIPLICATION SIGN BELOW;Sm;0;ON;;;;;Y;;;;; +2AC2;SUPERSET WITH MULTIPLICATION SIGN BELOW;Sm;0;ON;;;;;Y;;;;; +2AC3;SUBSET OF OR EQUAL TO WITH DOT ABOVE;Sm;0;ON;;;;;Y;;;;; +2AC4;SUPERSET OF OR EQUAL TO WITH DOT ABOVE;Sm;0;ON;;;;;Y;;;;; +2AC5;SUBSET OF ABOVE EQUALS SIGN;Sm;0;ON;;;;;Y;;;;; +2AC6;SUPERSET OF ABOVE EQUALS SIGN;Sm;0;ON;;;;;Y;;;;; +2AC7;SUBSET OF ABOVE TILDE OPERATOR;Sm;0;ON;;;;;Y;;;;; +2AC8;SUPERSET OF ABOVE TILDE OPERATOR;Sm;0;ON;;;;;Y;;;;; +2AC9;SUBSET OF ABOVE ALMOST EQUAL TO;Sm;0;ON;;;;;Y;;;;; +2ACA;SUPERSET OF ABOVE ALMOST EQUAL TO;Sm;0;ON;;;;;Y;;;;; +2ACB;SUBSET OF ABOVE NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;; +2ACC;SUPERSET OF ABOVE NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;; +2ACD;SQUARE LEFT OPEN BOX OPERATOR;Sm;0;ON;;;;;Y;;;;; +2ACE;SQUARE RIGHT OPEN BOX OPERATOR;Sm;0;ON;;;;;Y;;;;; +2ACF;CLOSED SUBSET;Sm;0;ON;;;;;Y;;;;; +2AD0;CLOSED SUPERSET;Sm;0;ON;;;;;Y;;;;; +2AD1;CLOSED SUBSET OR EQUAL TO;Sm;0;ON;;;;;Y;;;;; +2AD2;CLOSED SUPERSET OR EQUAL TO;Sm;0;ON;;;;;Y;;;;; +2AD3;SUBSET ABOVE SUPERSET;Sm;0;ON;;;;;Y;;;;; +2AD4;SUPERSET ABOVE SUBSET;Sm;0;ON;;;;;Y;;;;; +2AD5;SUBSET ABOVE SUBSET;Sm;0;ON;;;;;Y;;;;; +2AD6;SUPERSET ABOVE SUPERSET;Sm;0;ON;;;;;Y;;;;; +2AD7;SUPERSET BESIDE SUBSET;Sm;0;ON;;;;;N;;;;; +2AD8;SUPERSET BESIDE AND JOINED BY DASH WITH SUBSET;Sm;0;ON;;;;;N;;;;; +2AD9;ELEMENT OF OPENING DOWNWARDS;Sm;0;ON;;;;;N;;;;; +2ADA;PITCHFORK WITH TEE TOP;Sm;0;ON;;;;;N;;;;; +2ADB;TRANSVERSAL INTERSECTION;Sm;0;ON;;;;;N;;;;; +2ADC;FORKING;Sm;0;ON;2ADD 0338;;;;Y;;;;; +2ADD;NONFORKING;Sm;0;ON;;;;;N;;;;; +2ADE;SHORT LEFT TACK;Sm;0;ON;;;;;Y;;;;; +2ADF;SHORT DOWN TACK;Sm;0;ON;;;;;N;;;;; +2AE0;SHORT UP TACK;Sm;0;ON;;;;;N;;;;; +2AE1;PERPENDICULAR WITH S;Sm;0;ON;;;;;N;;;;; +2AE2;VERTICAL BAR TRIPLE RIGHT TURNSTILE;Sm;0;ON;;;;;Y;;;;; +2AE3;DOUBLE VERTICAL BAR LEFT TURNSTILE;Sm;0;ON;;;;;Y;;;;; +2AE4;VERTICAL BAR DOUBLE LEFT TURNSTILE;Sm;0;ON;;;;;Y;;;;; +2AE5;DOUBLE VERTICAL BAR DOUBLE LEFT TURNSTILE;Sm;0;ON;;;;;Y;;;;; +2AE6;LONG DASH FROM LEFT MEMBER OF DOUBLE VERTICAL;Sm;0;ON;;;;;Y;;;;; +2AE7;SHORT DOWN TACK WITH OVERBAR;Sm;0;ON;;;;;N;;;;; +2AE8;SHORT UP TACK WITH UNDERBAR;Sm;0;ON;;;;;N;;;;; +2AE9;SHORT UP TACK ABOVE SHORT DOWN TACK;Sm;0;ON;;;;;N;;;;; +2AEA;DOUBLE DOWN TACK;Sm;0;ON;;;;;N;;;;; +2AEB;DOUBLE UP TACK;Sm;0;ON;;;;;N;;;;; +2AEC;DOUBLE STROKE NOT SIGN;Sm;0;ON;;;;;Y;;;;; +2AED;REVERSED DOUBLE STROKE NOT SIGN;Sm;0;ON;;;;;Y;;;;; +2AEE;DOES NOT DIVIDE WITH REVERSED NEGATION SLASH;Sm;0;ON;;;;;Y;;;;; +2AEF;VERTICAL LINE WITH CIRCLE ABOVE;Sm;0;ON;;;;;N;;;;; +2AF0;VERTICAL LINE WITH CIRCLE BELOW;Sm;0;ON;;;;;N;;;;; +2AF1;DOWN TACK WITH CIRCLE BELOW;Sm;0;ON;;;;;N;;;;; +2AF2;PARALLEL WITH HORIZONTAL STROKE;Sm;0;ON;;;;;N;;;;; +2AF3;PARALLEL WITH TILDE OPERATOR;Sm;0;ON;;;;;Y;;;;; +2AF4;TRIPLE VERTICAL BAR BINARY RELATION;Sm;0;ON;;;;;N;;;;; +2AF5;TRIPLE VERTICAL BAR WITH HORIZONTAL STROKE;Sm;0;ON;;;;;N;;;;; +2AF6;TRIPLE COLON OPERATOR;Sm;0;ON;;;;;N;;;;; +2AF7;TRIPLE NESTED LESS-THAN;Sm;0;ON;;;;;Y;;;;; +2AF8;TRIPLE NESTED GREATER-THAN;Sm;0;ON;;;;;Y;;;;; +2AF9;DOUBLE-LINE SLANTED LESS-THAN OR EQUAL TO;Sm;0;ON;;;;;Y;;;;; +2AFA;DOUBLE-LINE SLANTED GREATER-THAN OR EQUAL TO;Sm;0;ON;;;;;Y;;;;; +2AFB;TRIPLE SOLIDUS BINARY RELATION;Sm;0;ON;;;;;Y;;;;; +2AFC;LARGE TRIPLE VERTICAL BAR OPERATOR;Sm;0;ON;;;;;N;;;;; +2AFD;DOUBLE SOLIDUS OPERATOR;Sm;0;ON;;;;;Y;;;;; +2AFE;WHITE VERTICAL BAR;Sm;0;ON;;;;;N;;;;; +2AFF;N-ARY WHITE VERTICAL BAR;Sm;0;ON;;;;;N;;;;; +2B00;NORTH EAST WHITE ARROW;So;0;ON;;;;;N;;;;; +2B01;NORTH WEST WHITE ARROW;So;0;ON;;;;;N;;;;; +2B02;SOUTH EAST WHITE ARROW;So;0;ON;;;;;N;;;;; +2B03;SOUTH WEST WHITE ARROW;So;0;ON;;;;;N;;;;; +2B04;LEFT RIGHT WHITE ARROW;So;0;ON;;;;;N;;;;; +2B05;LEFTWARDS BLACK ARROW;So;0;ON;;;;;N;;;;; +2B06;UPWARDS BLACK ARROW;So;0;ON;;;;;N;;;;; +2B07;DOWNWARDS BLACK ARROW;So;0;ON;;;;;N;;;;; +2B08;NORTH EAST BLACK ARROW;So;0;ON;;;;;N;;;;; +2B09;NORTH WEST BLACK ARROW;So;0;ON;;;;;N;;;;; +2B0A;SOUTH EAST BLACK ARROW;So;0;ON;;;;;N;;;;; +2B0B;SOUTH WEST BLACK ARROW;So;0;ON;;;;;N;;;;; +2B0C;LEFT RIGHT BLACK ARROW;So;0;ON;;;;;N;;;;; +2B0D;UP DOWN BLACK ARROW;So;0;ON;;;;;N;;;;; +2B0E;RIGHTWARDS ARROW WITH TIP DOWNWARDS;So;0;ON;;;;;N;;;;; +2B0F;RIGHTWARDS ARROW WITH TIP UPWARDS;So;0;ON;;;;;N;;;;; +2B10;LEFTWARDS ARROW WITH TIP DOWNWARDS;So;0;ON;;;;;N;;;;; +2B11;LEFTWARDS ARROW WITH TIP UPWARDS;So;0;ON;;;;;N;;;;; +2B12;SQUARE WITH TOP HALF BLACK;So;0;ON;;;;;N;;;;; +2B13;SQUARE WITH BOTTOM HALF BLACK;So;0;ON;;;;;N;;;;; +2B14;SQUARE WITH UPPER RIGHT DIAGONAL HALF BLACK;So;0;ON;;;;;N;;;;; +2B15;SQUARE WITH LOWER LEFT DIAGONAL HALF BLACK;So;0;ON;;;;;N;;;;; +2B16;DIAMOND WITH LEFT HALF BLACK;So;0;ON;;;;;N;;;;; +2B17;DIAMOND WITH RIGHT HALF BLACK;So;0;ON;;;;;N;;;;; +2B18;DIAMOND WITH TOP HALF BLACK;So;0;ON;;;;;N;;;;; +2B19;DIAMOND WITH BOTTOM HALF BLACK;So;0;ON;;;;;N;;;;; +2B1A;DOTTED SQUARE;So;0;ON;;;;;N;;;;; +2B1B;BLACK LARGE SQUARE;So;0;ON;;;;;N;;;;; +2B1C;WHITE LARGE SQUARE;So;0;ON;;;;;N;;;;; +2B1D;BLACK VERY SMALL SQUARE;So;0;ON;;;;;N;;;;; +2B1E;WHITE VERY SMALL SQUARE;So;0;ON;;;;;N;;;;; +2B1F;BLACK PENTAGON;So;0;ON;;;;;N;;;;; +2B20;WHITE PENTAGON;So;0;ON;;;;;N;;;;; +2B21;WHITE HEXAGON;So;0;ON;;;;;N;;;;; +2B22;BLACK HEXAGON;So;0;ON;;;;;N;;;;; +2B23;HORIZONTAL BLACK HEXAGON;So;0;ON;;;;;N;;;;; +2B24;BLACK LARGE CIRCLE;So;0;ON;;;;;N;;;;; +2B25;BLACK MEDIUM DIAMOND;So;0;ON;;;;;N;;;;; +2B26;WHITE MEDIUM DIAMOND;So;0;ON;;;;;N;;;;; +2B27;BLACK MEDIUM LOZENGE;So;0;ON;;;;;N;;;;; +2B28;WHITE MEDIUM LOZENGE;So;0;ON;;;;;N;;;;; +2B29;BLACK SMALL DIAMOND;So;0;ON;;;;;N;;;;; +2B2A;BLACK SMALL LOZENGE;So;0;ON;;;;;N;;;;; +2B2B;WHITE SMALL LOZENGE;So;0;ON;;;;;N;;;;; +2B2C;BLACK HORIZONTAL ELLIPSE;So;0;ON;;;;;N;;;;; +2B2D;WHITE HORIZONTAL ELLIPSE;So;0;ON;;;;;N;;;;; +2B2E;BLACK VERTICAL ELLIPSE;So;0;ON;;;;;N;;;;; +2B2F;WHITE VERTICAL ELLIPSE;So;0;ON;;;;;N;;;;; +2B30;LEFT ARROW WITH SMALL CIRCLE;Sm;0;ON;;;;;N;;;;; +2B31;THREE LEFTWARDS ARROWS;Sm;0;ON;;;;;N;;;;; +2B32;LEFT ARROW WITH CIRCLED PLUS;Sm;0;ON;;;;;N;;;;; +2B33;LONG LEFTWARDS SQUIGGLE ARROW;Sm;0;ON;;;;;N;;;;; +2B34;LEFTWARDS TWO-HEADED ARROW WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;; +2B35;LEFTWARDS TWO-HEADED ARROW WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;; +2B36;LEFTWARDS TWO-HEADED ARROW FROM BAR;Sm;0;ON;;;;;N;;;;; +2B37;LEFTWARDS TWO-HEADED TRIPLE DASH ARROW;Sm;0;ON;;;;;N;;;;; +2B38;LEFTWARDS ARROW WITH DOTTED STEM;Sm;0;ON;;;;;N;;;;; +2B39;LEFTWARDS ARROW WITH TAIL WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;; +2B3A;LEFTWARDS ARROW WITH TAIL WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;; +2B3B;LEFTWARDS TWO-HEADED ARROW WITH TAIL;Sm;0;ON;;;;;N;;;;; +2B3C;LEFTWARDS TWO-HEADED ARROW WITH TAIL WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;; +2B3D;LEFTWARDS TWO-HEADED ARROW WITH TAIL WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;; +2B3E;LEFTWARDS ARROW THROUGH X;Sm;0;ON;;;;;N;;;;; +2B3F;WAVE ARROW POINTING DIRECTLY LEFT;Sm;0;ON;;;;;N;;;;; +2B40;EQUALS SIGN ABOVE LEFTWARDS ARROW;Sm;0;ON;;;;;N;;;;; +2B41;REVERSE TILDE OPERATOR ABOVE LEFTWARDS ARROW;Sm;0;ON;;;;;N;;;;; +2B42;LEFTWARDS ARROW ABOVE REVERSE ALMOST EQUAL TO;Sm;0;ON;;;;;N;;;;; +2B43;RIGHTWARDS ARROW THROUGH GREATER-THAN;Sm;0;ON;;;;;N;;;;; +2B44;RIGHTWARDS ARROW THROUGH SUPERSET;Sm;0;ON;;;;;N;;;;; +2B45;LEFTWARDS QUADRUPLE ARROW;So;0;ON;;;;;N;;;;; +2B46;RIGHTWARDS QUADRUPLE ARROW;So;0;ON;;;;;N;;;;; +2B47;REVERSE TILDE OPERATOR ABOVE RIGHTWARDS ARROW;Sm;0;ON;;;;;N;;;;; +2B48;RIGHTWARDS ARROW ABOVE REVERSE ALMOST EQUAL TO;Sm;0;ON;;;;;N;;;;; +2B49;TILDE OPERATOR ABOVE LEFTWARDS ARROW;Sm;0;ON;;;;;N;;;;; +2B4A;LEFTWARDS ARROW ABOVE ALMOST EQUAL TO;Sm;0;ON;;;;;N;;;;; +2B4B;LEFTWARDS ARROW ABOVE REVERSE TILDE OPERATOR;Sm;0;ON;;;;;N;;;;; +2B4C;RIGHTWARDS ARROW ABOVE REVERSE TILDE OPERATOR;Sm;0;ON;;;;;N;;;;; +2B4D;DOWNWARDS TRIANGLE-HEADED ZIGZAG ARROW;So;0;ON;;;;;N;;;;; +2B4E;SHORT SLANTED NORTH ARROW;So;0;ON;;;;;N;;;;; +2B4F;SHORT BACKSLANTED SOUTH ARROW;So;0;ON;;;;;N;;;;; +2B50;WHITE MEDIUM STAR;So;0;ON;;;;;N;;;;; +2B51;BLACK SMALL STAR;So;0;ON;;;;;N;;;;; +2B52;WHITE SMALL STAR;So;0;ON;;;;;N;;;;; +2B53;BLACK RIGHT-POINTING PENTAGON;So;0;ON;;;;;N;;;;; +2B54;WHITE RIGHT-POINTING PENTAGON;So;0;ON;;;;;N;;;;; +2B55;HEAVY LARGE CIRCLE;So;0;ON;;;;;N;;;;; +2B56;HEAVY OVAL WITH OVAL INSIDE;So;0;ON;;;;;N;;;;; +2B57;HEAVY CIRCLE WITH CIRCLE INSIDE;So;0;ON;;;;;N;;;;; +2B58;HEAVY CIRCLE;So;0;ON;;;;;N;;;;; +2B59;HEAVY CIRCLED SALTIRE;So;0;ON;;;;;N;;;;; +2B5A;SLANTED NORTH ARROW WITH HOOKED HEAD;So;0;ON;;;;;N;;;;; +2B5B;BACKSLANTED SOUTH ARROW WITH HOOKED TAIL;So;0;ON;;;;;N;;;;; +2B5C;SLANTED NORTH ARROW WITH HORIZONTAL TAIL;So;0;ON;;;;;N;;;;; +2B5D;BACKSLANTED SOUTH ARROW WITH HORIZONTAL TAIL;So;0;ON;;;;;N;;;;; +2B5E;BENT ARROW POINTING DOWNWARDS THEN NORTH EAST;So;0;ON;;;;;N;;;;; +2B5F;SHORT BENT ARROW POINTING DOWNWARDS THEN NORTH EAST;So;0;ON;;;;;N;;;;; +2B60;LEFTWARDS TRIANGLE-HEADED ARROW;So;0;ON;;;;;N;;;;; +2B61;UPWARDS TRIANGLE-HEADED ARROW;So;0;ON;;;;;N;;;;; +2B62;RIGHTWARDS TRIANGLE-HEADED ARROW;So;0;ON;;;;;N;;;;; +2B63;DOWNWARDS TRIANGLE-HEADED ARROW;So;0;ON;;;;;N;;;;; +2B64;LEFT RIGHT TRIANGLE-HEADED ARROW;So;0;ON;;;;;N;;;;; +2B65;UP DOWN TRIANGLE-HEADED ARROW;So;0;ON;;;;;N;;;;; +2B66;NORTH WEST TRIANGLE-HEADED ARROW;So;0;ON;;;;;N;;;;; +2B67;NORTH EAST TRIANGLE-HEADED ARROW;So;0;ON;;;;;N;;;;; +2B68;SOUTH EAST TRIANGLE-HEADED ARROW;So;0;ON;;;;;N;;;;; +2B69;SOUTH WEST TRIANGLE-HEADED ARROW;So;0;ON;;;;;N;;;;; +2B6A;LEFTWARDS TRIANGLE-HEADED DASHED ARROW;So;0;ON;;;;;N;;;;; +2B6B;UPWARDS TRIANGLE-HEADED DASHED ARROW;So;0;ON;;;;;N;;;;; +2B6C;RIGHTWARDS TRIANGLE-HEADED DASHED ARROW;So;0;ON;;;;;N;;;;; +2B6D;DOWNWARDS TRIANGLE-HEADED DASHED ARROW;So;0;ON;;;;;N;;;;; +2B6E;CLOCKWISE TRIANGLE-HEADED OPEN CIRCLE ARROW;So;0;ON;;;;;N;;;;; +2B6F;ANTICLOCKWISE TRIANGLE-HEADED OPEN CIRCLE ARROW;So;0;ON;;;;;N;;;;; +2B70;LEFTWARDS TRIANGLE-HEADED ARROW TO BAR;So;0;ON;;;;;N;;;;; +2B71;UPWARDS TRIANGLE-HEADED ARROW TO BAR;So;0;ON;;;;;N;;;;; +2B72;RIGHTWARDS TRIANGLE-HEADED ARROW TO BAR;So;0;ON;;;;;N;;;;; +2B73;DOWNWARDS TRIANGLE-HEADED ARROW TO BAR;So;0;ON;;;;;N;;;;; +2B76;NORTH WEST TRIANGLE-HEADED ARROW TO BAR;So;0;ON;;;;;N;;;;; +2B77;NORTH EAST TRIANGLE-HEADED ARROW TO BAR;So;0;ON;;;;;N;;;;; +2B78;SOUTH EAST TRIANGLE-HEADED ARROW TO BAR;So;0;ON;;;;;N;;;;; +2B79;SOUTH WEST TRIANGLE-HEADED ARROW TO BAR;So;0;ON;;;;;N;;;;; +2B7A;LEFTWARDS TRIANGLE-HEADED ARROW WITH DOUBLE HORIZONTAL STROKE;So;0;ON;;;;;N;;;;; +2B7B;UPWARDS TRIANGLE-HEADED ARROW WITH DOUBLE HORIZONTAL STROKE;So;0;ON;;;;;N;;;;; +2B7C;RIGHTWARDS TRIANGLE-HEADED ARROW WITH DOUBLE HORIZONTAL STROKE;So;0;ON;;;;;N;;;;; +2B7D;DOWNWARDS TRIANGLE-HEADED ARROW WITH DOUBLE HORIZONTAL STROKE;So;0;ON;;;;;N;;;;; +2B7E;HORIZONTAL TAB KEY;So;0;ON;;;;;N;;;;; +2B7F;VERTICAL TAB KEY;So;0;ON;;;;;N;;;;; +2B80;LEFTWARDS TRIANGLE-HEADED ARROW OVER RIGHTWARDS TRIANGLE-HEADED ARROW;So;0;ON;;;;;N;;;;; +2B81;UPWARDS TRIANGLE-HEADED ARROW LEFTWARDS OF DOWNWARDS TRIANGLE-HEADED ARROW;So;0;ON;;;;;N;;;;; +2B82;RIGHTWARDS TRIANGLE-HEADED ARROW OVER LEFTWARDS TRIANGLE-HEADED ARROW;So;0;ON;;;;;N;;;;; +2B83;DOWNWARDS TRIANGLE-HEADED ARROW LEFTWARDS OF UPWARDS TRIANGLE-HEADED ARROW;So;0;ON;;;;;N;;;;; +2B84;LEFTWARDS TRIANGLE-HEADED PAIRED ARROWS;So;0;ON;;;;;N;;;;; +2B85;UPWARDS TRIANGLE-HEADED PAIRED ARROWS;So;0;ON;;;;;N;;;;; +2B86;RIGHTWARDS TRIANGLE-HEADED PAIRED ARROWS;So;0;ON;;;;;N;;;;; +2B87;DOWNWARDS TRIANGLE-HEADED PAIRED ARROWS;So;0;ON;;;;;N;;;;; +2B88;LEFTWARDS BLACK CIRCLED WHITE ARROW;So;0;ON;;;;;N;;;;; +2B89;UPWARDS BLACK CIRCLED WHITE ARROW;So;0;ON;;;;;N;;;;; +2B8A;RIGHTWARDS BLACK CIRCLED WHITE ARROW;So;0;ON;;;;;N;;;;; +2B8B;DOWNWARDS BLACK CIRCLED WHITE ARROW;So;0;ON;;;;;N;;;;; +2B8C;ANTICLOCKWISE TRIANGLE-HEADED RIGHT U-SHAPED ARROW;So;0;ON;;;;;N;;;;; +2B8D;ANTICLOCKWISE TRIANGLE-HEADED BOTTOM U-SHAPED ARROW;So;0;ON;;;;;N;;;;; +2B8E;ANTICLOCKWISE TRIANGLE-HEADED LEFT U-SHAPED ARROW;So;0;ON;;;;;N;;;;; +2B8F;ANTICLOCKWISE TRIANGLE-HEADED TOP U-SHAPED ARROW;So;0;ON;;;;;N;;;;; +2B90;RETURN LEFT;So;0;ON;;;;;N;;;;; +2B91;RETURN RIGHT;So;0;ON;;;;;N;;;;; +2B92;NEWLINE LEFT;So;0;ON;;;;;N;;;;; +2B93;NEWLINE RIGHT;So;0;ON;;;;;N;;;;; +2B94;FOUR CORNER ARROWS CIRCLING ANTICLOCKWISE;So;0;ON;;;;;N;;;;; +2B95;RIGHTWARDS BLACK ARROW;So;0;ON;;;;;N;;;;; +2B96;EQUALS SIGN WITH INFINITY ABOVE;So;0;ON;;;;;N;;;;; +2B97;SYMBOL FOR TYPE A ELECTRONICS;So;0;ON;;;;;N;;;;; +2B98;THREE-D TOP-LIGHTED LEFTWARDS EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;; +2B99;THREE-D RIGHT-LIGHTED UPWARDS EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;; +2B9A;THREE-D TOP-LIGHTED RIGHTWARDS EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;; +2B9B;THREE-D LEFT-LIGHTED DOWNWARDS EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;; +2B9C;BLACK LEFTWARDS EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;; +2B9D;BLACK UPWARDS EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;; +2B9E;BLACK RIGHTWARDS EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;; +2B9F;BLACK DOWNWARDS EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;; +2BA0;DOWNWARDS TRIANGLE-HEADED ARROW WITH LONG TIP LEFTWARDS;So;0;ON;;;;;N;;;;; +2BA1;DOWNWARDS TRIANGLE-HEADED ARROW WITH LONG TIP RIGHTWARDS;So;0;ON;;;;;N;;;;; +2BA2;UPWARDS TRIANGLE-HEADED ARROW WITH LONG TIP LEFTWARDS;So;0;ON;;;;;N;;;;; +2BA3;UPWARDS TRIANGLE-HEADED ARROW WITH LONG TIP RIGHTWARDS;So;0;ON;;;;;N;;;;; +2BA4;LEFTWARDS TRIANGLE-HEADED ARROW WITH LONG TIP UPWARDS;So;0;ON;;;;;N;;;;; +2BA5;RIGHTWARDS TRIANGLE-HEADED ARROW WITH LONG TIP UPWARDS;So;0;ON;;;;;N;;;;; +2BA6;LEFTWARDS TRIANGLE-HEADED ARROW WITH LONG TIP DOWNWARDS;So;0;ON;;;;;N;;;;; +2BA7;RIGHTWARDS TRIANGLE-HEADED ARROW WITH LONG TIP DOWNWARDS;So;0;ON;;;;;N;;;;; +2BA8;BLACK CURVED DOWNWARDS AND LEFTWARDS ARROW;So;0;ON;;;;;N;;;;; +2BA9;BLACK CURVED DOWNWARDS AND RIGHTWARDS ARROW;So;0;ON;;;;;N;;;;; +2BAA;BLACK CURVED UPWARDS AND LEFTWARDS ARROW;So;0;ON;;;;;N;;;;; +2BAB;BLACK CURVED UPWARDS AND RIGHTWARDS ARROW;So;0;ON;;;;;N;;;;; +2BAC;BLACK CURVED LEFTWARDS AND UPWARDS ARROW;So;0;ON;;;;;N;;;;; +2BAD;BLACK CURVED RIGHTWARDS AND UPWARDS ARROW;So;0;ON;;;;;N;;;;; +2BAE;BLACK CURVED LEFTWARDS AND DOWNWARDS ARROW;So;0;ON;;;;;N;;;;; +2BAF;BLACK CURVED RIGHTWARDS AND DOWNWARDS ARROW;So;0;ON;;;;;N;;;;; +2BB0;RIBBON ARROW DOWN LEFT;So;0;ON;;;;;N;;;;; +2BB1;RIBBON ARROW DOWN RIGHT;So;0;ON;;;;;N;;;;; +2BB2;RIBBON ARROW UP LEFT;So;0;ON;;;;;N;;;;; +2BB3;RIBBON ARROW UP RIGHT;So;0;ON;;;;;N;;;;; +2BB4;RIBBON ARROW LEFT UP;So;0;ON;;;;;N;;;;; +2BB5;RIBBON ARROW RIGHT UP;So;0;ON;;;;;N;;;;; +2BB6;RIBBON ARROW LEFT DOWN;So;0;ON;;;;;N;;;;; +2BB7;RIBBON ARROW RIGHT DOWN;So;0;ON;;;;;N;;;;; +2BB8;UPWARDS WHITE ARROW FROM BAR WITH HORIZONTAL BAR;So;0;ON;;;;;N;;;;; +2BB9;UP ARROWHEAD IN A RECTANGLE BOX;So;0;ON;;;;;N;;;;; +2BBA;OVERLAPPING WHITE SQUARES;So;0;ON;;;;;N;;;;; +2BBB;OVERLAPPING WHITE AND BLACK SQUARES;So;0;ON;;;;;N;;;;; +2BBC;OVERLAPPING BLACK SQUARES;So;0;ON;;;;;N;;;;; +2BBD;BALLOT BOX WITH LIGHT X;So;0;ON;;;;;N;;;;; +2BBE;CIRCLED X;So;0;ON;;;;;N;;;;; +2BBF;CIRCLED BOLD X;So;0;ON;;;;;N;;;;; +2BC0;BLACK SQUARE CENTRED;So;0;ON;;;;;N;;;;; +2BC1;BLACK DIAMOND CENTRED;So;0;ON;;;;;N;;;;; +2BC2;TURNED BLACK PENTAGON;So;0;ON;;;;;N;;;;; +2BC3;HORIZONTAL BLACK OCTAGON;So;0;ON;;;;;N;;;;; +2BC4;BLACK OCTAGON;So;0;ON;;;;;N;;;;; +2BC5;BLACK MEDIUM UP-POINTING TRIANGLE CENTRED;So;0;ON;;;;;N;;;;; +2BC6;BLACK MEDIUM DOWN-POINTING TRIANGLE CENTRED;So;0;ON;;;;;N;;;;; +2BC7;BLACK MEDIUM LEFT-POINTING TRIANGLE CENTRED;So;0;ON;;;;;N;;;;; +2BC8;BLACK MEDIUM RIGHT-POINTING TRIANGLE CENTRED;So;0;ON;;;;;N;;;;; +2BC9;NEPTUNE FORM TWO;So;0;ON;;;;;N;;;;; +2BCA;TOP HALF BLACK CIRCLE;So;0;ON;;;;;N;;;;; +2BCB;BOTTOM HALF BLACK CIRCLE;So;0;ON;;;;;N;;;;; +2BCC;LIGHT FOUR POINTED BLACK CUSP;So;0;ON;;;;;N;;;;; +2BCD;ROTATED LIGHT FOUR POINTED BLACK CUSP;So;0;ON;;;;;N;;;;; +2BCE;WHITE FOUR POINTED CUSP;So;0;ON;;;;;N;;;;; +2BCF;ROTATED WHITE FOUR POINTED CUSP;So;0;ON;;;;;N;;;;; +2BD0;SQUARE POSITION INDICATOR;So;0;ON;;;;;N;;;;; +2BD1;UNCERTAINTY SIGN;So;0;ON;;;;;N;;;;; +2BD2;GROUP MARK;So;0;ON;;;;;N;;;;; +2BD3;PLUTO FORM TWO;So;0;ON;;;;;N;;;;; +2BD4;PLUTO FORM THREE;So;0;ON;;;;;N;;;;; +2BD5;PLUTO FORM FOUR;So;0;ON;;;;;N;;;;; +2BD6;PLUTO FORM FIVE;So;0;ON;;;;;N;;;;; +2BD7;TRANSPLUTO;So;0;ON;;;;;N;;;;; +2BD8;PROSERPINA;So;0;ON;;;;;N;;;;; +2BD9;ASTRAEA;So;0;ON;;;;;N;;;;; +2BDA;HYGIEA;So;0;ON;;;;;N;;;;; +2BDB;PHOLUS;So;0;ON;;;;;N;;;;; +2BDC;NESSUS;So;0;ON;;;;;N;;;;; +2BDD;WHITE MOON SELENA;So;0;ON;;;;;N;;;;; +2BDE;BLACK DIAMOND ON CROSS;So;0;ON;;;;;N;;;;; +2BDF;TRUE LIGHT MOON ARTA;So;0;ON;;;;;N;;;;; +2BE0;CUPIDO;So;0;ON;;;;;N;;;;; +2BE1;HADES;So;0;ON;;;;;N;;;;; +2BE2;ZEUS;So;0;ON;;;;;N;;;;; +2BE3;KRONOS;So;0;ON;;;;;N;;;;; +2BE4;APOLLON;So;0;ON;;;;;N;;;;; +2BE5;ADMETOS;So;0;ON;;;;;N;;;;; +2BE6;VULCANUS;So;0;ON;;;;;N;;;;; +2BE7;POSEIDON;So;0;ON;;;;;N;;;;; +2BE8;LEFT HALF BLACK STAR;So;0;ON;;;;;N;;;;; +2BE9;RIGHT HALF BLACK STAR;So;0;ON;;;;;N;;;;; +2BEA;STAR WITH LEFT HALF BLACK;So;0;ON;;;;;N;;;;; +2BEB;STAR WITH RIGHT HALF BLACK;So;0;ON;;;;;N;;;;; +2BEC;LEFTWARDS TWO-HEADED ARROW WITH TRIANGLE ARROWHEADS;So;0;ON;;;;;N;;;;; +2BED;UPWARDS TWO-HEADED ARROW WITH TRIANGLE ARROWHEADS;So;0;ON;;;;;N;;;;; +2BEE;RIGHTWARDS TWO-HEADED ARROW WITH TRIANGLE ARROWHEADS;So;0;ON;;;;;N;;;;; +2BEF;DOWNWARDS TWO-HEADED ARROW WITH TRIANGLE ARROWHEADS;So;0;ON;;;;;N;;;;; +2BF0;ERIS FORM ONE;So;0;ON;;;;;N;;;;; +2BF1;ERIS FORM TWO;So;0;ON;;;;;N;;;;; +2BF2;SEDNA;So;0;ON;;;;;N;;;;; +2BF3;RUSSIAN ASTROLOGICAL SYMBOL VIGINTILE;So;0;ON;;;;;N;;;;; +2BF4;RUSSIAN ASTROLOGICAL SYMBOL NOVILE;So;0;ON;;;;;N;;;;; +2BF5;RUSSIAN ASTROLOGICAL SYMBOL QUINTILE;So;0;ON;;;;;N;;;;; +2BF6;RUSSIAN ASTROLOGICAL SYMBOL BINOVILE;So;0;ON;;;;;N;;;;; +2BF7;RUSSIAN ASTROLOGICAL SYMBOL SENTAGON;So;0;ON;;;;;N;;;;; +2BF8;RUSSIAN ASTROLOGICAL SYMBOL TREDECILE;So;0;ON;;;;;N;;;;; +2BF9;EQUALS SIGN WITH INFINITY BELOW;So;0;ON;;;;;N;;;;; +2BFA;UNITED SYMBOL;So;0;ON;;;;;N;;;;; +2BFB;SEPARATED SYMBOL;So;0;ON;;;;;N;;;;; +2BFC;DOUBLED SYMBOL;So;0;ON;;;;;N;;;;; +2BFD;PASSED SYMBOL;So;0;ON;;;;;N;;;;; +2BFE;REVERSED RIGHT ANGLE;So;0;ON;;;;;Y;;;;; +2BFF;HELLSCHREIBER PAUSE SYMBOL;So;0;ON;;;;;N;;;;; +2C00;GLAGOLITIC CAPITAL LETTER AZU;Lu;0;L;;;;;N;;;;2C30; +2C01;GLAGOLITIC CAPITAL LETTER BUKY;Lu;0;L;;;;;N;;;;2C31; +2C02;GLAGOLITIC CAPITAL LETTER VEDE;Lu;0;L;;;;;N;;;;2C32; +2C03;GLAGOLITIC CAPITAL LETTER GLAGOLI;Lu;0;L;;;;;N;;;;2C33; +2C04;GLAGOLITIC CAPITAL LETTER DOBRO;Lu;0;L;;;;;N;;;;2C34; +2C05;GLAGOLITIC CAPITAL LETTER YESTU;Lu;0;L;;;;;N;;;;2C35; +2C06;GLAGOLITIC CAPITAL LETTER ZHIVETE;Lu;0;L;;;;;N;;;;2C36; +2C07;GLAGOLITIC CAPITAL LETTER DZELO;Lu;0;L;;;;;N;;;;2C37; +2C08;GLAGOLITIC CAPITAL LETTER ZEMLJA;Lu;0;L;;;;;N;;;;2C38; +2C09;GLAGOLITIC CAPITAL LETTER IZHE;Lu;0;L;;;;;N;;;;2C39; +2C0A;GLAGOLITIC CAPITAL LETTER INITIAL IZHE;Lu;0;L;;;;;N;;;;2C3A; +2C0B;GLAGOLITIC CAPITAL LETTER I;Lu;0;L;;;;;N;;;;2C3B; +2C0C;GLAGOLITIC CAPITAL LETTER DJERVI;Lu;0;L;;;;;N;;;;2C3C; +2C0D;GLAGOLITIC CAPITAL LETTER KAKO;Lu;0;L;;;;;N;;;;2C3D; +2C0E;GLAGOLITIC CAPITAL LETTER LJUDIJE;Lu;0;L;;;;;N;;;;2C3E; +2C0F;GLAGOLITIC CAPITAL LETTER MYSLITE;Lu;0;L;;;;;N;;;;2C3F; +2C10;GLAGOLITIC CAPITAL LETTER NASHI;Lu;0;L;;;;;N;;;;2C40; +2C11;GLAGOLITIC CAPITAL LETTER ONU;Lu;0;L;;;;;N;;;;2C41; +2C12;GLAGOLITIC CAPITAL LETTER POKOJI;Lu;0;L;;;;;N;;;;2C42; +2C13;GLAGOLITIC CAPITAL LETTER RITSI;Lu;0;L;;;;;N;;;;2C43; +2C14;GLAGOLITIC CAPITAL LETTER SLOVO;Lu;0;L;;;;;N;;;;2C44; +2C15;GLAGOLITIC CAPITAL LETTER TVRIDO;Lu;0;L;;;;;N;;;;2C45; +2C16;GLAGOLITIC CAPITAL LETTER UKU;Lu;0;L;;;;;N;;;;2C46; +2C17;GLAGOLITIC CAPITAL LETTER FRITU;Lu;0;L;;;;;N;;;;2C47; +2C18;GLAGOLITIC CAPITAL LETTER HERU;Lu;0;L;;;;;N;;;;2C48; +2C19;GLAGOLITIC CAPITAL LETTER OTU;Lu;0;L;;;;;N;;;;2C49; +2C1A;GLAGOLITIC CAPITAL LETTER PE;Lu;0;L;;;;;N;;;;2C4A; +2C1B;GLAGOLITIC CAPITAL LETTER SHTA;Lu;0;L;;;;;N;;;;2C4B; +2C1C;GLAGOLITIC CAPITAL LETTER TSI;Lu;0;L;;;;;N;;;;2C4C; +2C1D;GLAGOLITIC CAPITAL LETTER CHRIVI;Lu;0;L;;;;;N;;;;2C4D; +2C1E;GLAGOLITIC CAPITAL LETTER SHA;Lu;0;L;;;;;N;;;;2C4E; +2C1F;GLAGOLITIC CAPITAL LETTER YERU;Lu;0;L;;;;;N;;;;2C4F; +2C20;GLAGOLITIC CAPITAL LETTER YERI;Lu;0;L;;;;;N;;;;2C50; +2C21;GLAGOLITIC CAPITAL LETTER YATI;Lu;0;L;;;;;N;;;;2C51; +2C22;GLAGOLITIC CAPITAL LETTER SPIDERY HA;Lu;0;L;;;;;N;;;;2C52; +2C23;GLAGOLITIC CAPITAL LETTER YU;Lu;0;L;;;;;N;;;;2C53; +2C24;GLAGOLITIC CAPITAL LETTER SMALL YUS;Lu;0;L;;;;;N;;;;2C54; +2C25;GLAGOLITIC CAPITAL LETTER SMALL YUS WITH TAIL;Lu;0;L;;;;;N;;;;2C55; +2C26;GLAGOLITIC CAPITAL LETTER YO;Lu;0;L;;;;;N;;;;2C56; +2C27;GLAGOLITIC CAPITAL LETTER IOTATED SMALL YUS;Lu;0;L;;;;;N;;;;2C57; +2C28;GLAGOLITIC CAPITAL LETTER BIG YUS;Lu;0;L;;;;;N;;;;2C58; +2C29;GLAGOLITIC CAPITAL LETTER IOTATED BIG YUS;Lu;0;L;;;;;N;;;;2C59; +2C2A;GLAGOLITIC CAPITAL LETTER FITA;Lu;0;L;;;;;N;;;;2C5A; +2C2B;GLAGOLITIC CAPITAL LETTER IZHITSA;Lu;0;L;;;;;N;;;;2C5B; +2C2C;GLAGOLITIC CAPITAL LETTER SHTAPIC;Lu;0;L;;;;;N;;;;2C5C; +2C2D;GLAGOLITIC CAPITAL LETTER TROKUTASTI A;Lu;0;L;;;;;N;;;;2C5D; +2C2E;GLAGOLITIC CAPITAL LETTER LATINATE MYSLITE;Lu;0;L;;;;;N;;;;2C5E; +2C2F;GLAGOLITIC CAPITAL LETTER CAUDATE CHRIVI;Lu;0;L;;;;;N;;;;2C5F; +2C30;GLAGOLITIC SMALL LETTER AZU;Ll;0;L;;;;;N;;;2C00;;2C00 +2C31;GLAGOLITIC SMALL LETTER BUKY;Ll;0;L;;;;;N;;;2C01;;2C01 +2C32;GLAGOLITIC SMALL LETTER VEDE;Ll;0;L;;;;;N;;;2C02;;2C02 +2C33;GLAGOLITIC SMALL LETTER GLAGOLI;Ll;0;L;;;;;N;;;2C03;;2C03 +2C34;GLAGOLITIC SMALL LETTER DOBRO;Ll;0;L;;;;;N;;;2C04;;2C04 +2C35;GLAGOLITIC SMALL LETTER YESTU;Ll;0;L;;;;;N;;;2C05;;2C05 +2C36;GLAGOLITIC SMALL LETTER ZHIVETE;Ll;0;L;;;;;N;;;2C06;;2C06 +2C37;GLAGOLITIC SMALL LETTER DZELO;Ll;0;L;;;;;N;;;2C07;;2C07 +2C38;GLAGOLITIC SMALL LETTER ZEMLJA;Ll;0;L;;;;;N;;;2C08;;2C08 +2C39;GLAGOLITIC SMALL LETTER IZHE;Ll;0;L;;;;;N;;;2C09;;2C09 +2C3A;GLAGOLITIC SMALL LETTER INITIAL IZHE;Ll;0;L;;;;;N;;;2C0A;;2C0A +2C3B;GLAGOLITIC SMALL LETTER I;Ll;0;L;;;;;N;;;2C0B;;2C0B +2C3C;GLAGOLITIC SMALL LETTER DJERVI;Ll;0;L;;;;;N;;;2C0C;;2C0C +2C3D;GLAGOLITIC SMALL LETTER KAKO;Ll;0;L;;;;;N;;;2C0D;;2C0D +2C3E;GLAGOLITIC SMALL LETTER LJUDIJE;Ll;0;L;;;;;N;;;2C0E;;2C0E +2C3F;GLAGOLITIC SMALL LETTER MYSLITE;Ll;0;L;;;;;N;;;2C0F;;2C0F +2C40;GLAGOLITIC SMALL LETTER NASHI;Ll;0;L;;;;;N;;;2C10;;2C10 +2C41;GLAGOLITIC SMALL LETTER ONU;Ll;0;L;;;;;N;;;2C11;;2C11 +2C42;GLAGOLITIC SMALL LETTER POKOJI;Ll;0;L;;;;;N;;;2C12;;2C12 +2C43;GLAGOLITIC SMALL LETTER RITSI;Ll;0;L;;;;;N;;;2C13;;2C13 +2C44;GLAGOLITIC SMALL LETTER SLOVO;Ll;0;L;;;;;N;;;2C14;;2C14 +2C45;GLAGOLITIC SMALL LETTER TVRIDO;Ll;0;L;;;;;N;;;2C15;;2C15 +2C46;GLAGOLITIC SMALL LETTER UKU;Ll;0;L;;;;;N;;;2C16;;2C16 +2C47;GLAGOLITIC SMALL LETTER FRITU;Ll;0;L;;;;;N;;;2C17;;2C17 +2C48;GLAGOLITIC SMALL LETTER HERU;Ll;0;L;;;;;N;;;2C18;;2C18 +2C49;GLAGOLITIC SMALL LETTER OTU;Ll;0;L;;;;;N;;;2C19;;2C19 +2C4A;GLAGOLITIC SMALL LETTER PE;Ll;0;L;;;;;N;;;2C1A;;2C1A +2C4B;GLAGOLITIC SMALL LETTER SHTA;Ll;0;L;;;;;N;;;2C1B;;2C1B +2C4C;GLAGOLITIC SMALL LETTER TSI;Ll;0;L;;;;;N;;;2C1C;;2C1C +2C4D;GLAGOLITIC SMALL LETTER CHRIVI;Ll;0;L;;;;;N;;;2C1D;;2C1D +2C4E;GLAGOLITIC SMALL LETTER SHA;Ll;0;L;;;;;N;;;2C1E;;2C1E +2C4F;GLAGOLITIC SMALL LETTER YERU;Ll;0;L;;;;;N;;;2C1F;;2C1F +2C50;GLAGOLITIC SMALL LETTER YERI;Ll;0;L;;;;;N;;;2C20;;2C20 +2C51;GLAGOLITIC SMALL LETTER YATI;Ll;0;L;;;;;N;;;2C21;;2C21 +2C52;GLAGOLITIC SMALL LETTER SPIDERY HA;Ll;0;L;;;;;N;;;2C22;;2C22 +2C53;GLAGOLITIC SMALL LETTER YU;Ll;0;L;;;;;N;;;2C23;;2C23 +2C54;GLAGOLITIC SMALL LETTER SMALL YUS;Ll;0;L;;;;;N;;;2C24;;2C24 +2C55;GLAGOLITIC SMALL LETTER SMALL YUS WITH TAIL;Ll;0;L;;;;;N;;;2C25;;2C25 +2C56;GLAGOLITIC SMALL LETTER YO;Ll;0;L;;;;;N;;;2C26;;2C26 +2C57;GLAGOLITIC SMALL LETTER IOTATED SMALL YUS;Ll;0;L;;;;;N;;;2C27;;2C27 +2C58;GLAGOLITIC SMALL LETTER BIG YUS;Ll;0;L;;;;;N;;;2C28;;2C28 +2C59;GLAGOLITIC SMALL LETTER IOTATED BIG YUS;Ll;0;L;;;;;N;;;2C29;;2C29 +2C5A;GLAGOLITIC SMALL LETTER FITA;Ll;0;L;;;;;N;;;2C2A;;2C2A +2C5B;GLAGOLITIC SMALL LETTER IZHITSA;Ll;0;L;;;;;N;;;2C2B;;2C2B +2C5C;GLAGOLITIC SMALL LETTER SHTAPIC;Ll;0;L;;;;;N;;;2C2C;;2C2C +2C5D;GLAGOLITIC SMALL LETTER TROKUTASTI A;Ll;0;L;;;;;N;;;2C2D;;2C2D +2C5E;GLAGOLITIC SMALL LETTER LATINATE MYSLITE;Ll;0;L;;;;;N;;;2C2E;;2C2E +2C5F;GLAGOLITIC SMALL LETTER CAUDATE CHRIVI;Ll;0;L;;;;;N;;;2C2F;;2C2F +2C60;LATIN CAPITAL LETTER L WITH DOUBLE BAR;Lu;0;L;;;;;N;;;;2C61; +2C61;LATIN SMALL LETTER L WITH DOUBLE BAR;Ll;0;L;;;;;N;;;2C60;;2C60 +2C62;LATIN CAPITAL LETTER L WITH MIDDLE TILDE;Lu;0;L;;;;;N;;;;026B; +2C63;LATIN CAPITAL LETTER P WITH STROKE;Lu;0;L;;;;;N;;;;1D7D; +2C64;LATIN CAPITAL LETTER R WITH TAIL;Lu;0;L;;;;;N;;;;027D; +2C65;LATIN SMALL LETTER A WITH STROKE;Ll;0;L;;;;;N;;;023A;;023A +2C66;LATIN SMALL LETTER T WITH DIAGONAL STROKE;Ll;0;L;;;;;N;;;023E;;023E +2C67;LATIN CAPITAL LETTER H WITH DESCENDER;Lu;0;L;;;;;N;;;;2C68; +2C68;LATIN SMALL LETTER H WITH DESCENDER;Ll;0;L;;;;;N;;;2C67;;2C67 +2C69;LATIN CAPITAL LETTER K WITH DESCENDER;Lu;0;L;;;;;N;;;;2C6A; +2C6A;LATIN SMALL LETTER K WITH DESCENDER;Ll;0;L;;;;;N;;;2C69;;2C69 +2C6B;LATIN CAPITAL LETTER Z WITH DESCENDER;Lu;0;L;;;;;N;;;;2C6C; +2C6C;LATIN SMALL LETTER Z WITH DESCENDER;Ll;0;L;;;;;N;;;2C6B;;2C6B +2C6D;LATIN CAPITAL LETTER ALPHA;Lu;0;L;;;;;N;;;;0251; +2C6E;LATIN CAPITAL LETTER M WITH HOOK;Lu;0;L;;;;;N;;;;0271; +2C6F;LATIN CAPITAL LETTER TURNED A;Lu;0;L;;;;;N;;;;0250; +2C70;LATIN CAPITAL LETTER TURNED ALPHA;Lu;0;L;;;;;N;;;;0252; +2C71;LATIN SMALL LETTER V WITH RIGHT HOOK;Ll;0;L;;;;;N;;;;; +2C72;LATIN CAPITAL LETTER W WITH HOOK;Lu;0;L;;;;;N;;;;2C73; +2C73;LATIN SMALL LETTER W WITH HOOK;Ll;0;L;;;;;N;;;2C72;;2C72 +2C74;LATIN SMALL LETTER V WITH CURL;Ll;0;L;;;;;N;;;;; +2C75;LATIN CAPITAL LETTER HALF H;Lu;0;L;;;;;N;;;;2C76; +2C76;LATIN SMALL LETTER HALF H;Ll;0;L;;;;;N;;;2C75;;2C75 +2C77;LATIN SMALL LETTER TAILLESS PHI;Ll;0;L;;;;;N;;;;; +2C78;LATIN SMALL LETTER E WITH NOTCH;Ll;0;L;;;;;N;;;;; +2C79;LATIN SMALL LETTER TURNED R WITH TAIL;Ll;0;L;;;;;N;;;;; +2C7A;LATIN SMALL LETTER O WITH LOW RING INSIDE;Ll;0;L;;;;;N;;;;; +2C7B;LATIN LETTER SMALL CAPITAL TURNED E;Ll;0;L;;;;;N;;;;; +2C7C;LATIN SUBSCRIPT SMALL LETTER J;Lm;0;L; 006A;;;;N;;;;; +2C7D;MODIFIER LETTER CAPITAL V;Lm;0;L; 0056;;;;N;;;;; +2C7E;LATIN CAPITAL LETTER S WITH SWASH TAIL;Lu;0;L;;;;;N;;;;023F; +2C7F;LATIN CAPITAL LETTER Z WITH SWASH TAIL;Lu;0;L;;;;;N;;;;0240; +2C80;COPTIC CAPITAL LETTER ALFA;Lu;0;L;;;;;N;;;;2C81; +2C81;COPTIC SMALL LETTER ALFA;Ll;0;L;;;;;N;;;2C80;;2C80 +2C82;COPTIC CAPITAL LETTER VIDA;Lu;0;L;;;;;N;;;;2C83; +2C83;COPTIC SMALL LETTER VIDA;Ll;0;L;;;;;N;;;2C82;;2C82 +2C84;COPTIC CAPITAL LETTER GAMMA;Lu;0;L;;;;;N;;;;2C85; +2C85;COPTIC SMALL LETTER GAMMA;Ll;0;L;;;;;N;;;2C84;;2C84 +2C86;COPTIC CAPITAL LETTER DALDA;Lu;0;L;;;;;N;;;;2C87; +2C87;COPTIC SMALL LETTER DALDA;Ll;0;L;;;;;N;;;2C86;;2C86 +2C88;COPTIC CAPITAL LETTER EIE;Lu;0;L;;;;;N;;;;2C89; +2C89;COPTIC SMALL LETTER EIE;Ll;0;L;;;;;N;;;2C88;;2C88 +2C8A;COPTIC CAPITAL LETTER SOU;Lu;0;L;;;;;N;;;;2C8B; +2C8B;COPTIC SMALL LETTER SOU;Ll;0;L;;;;;N;;;2C8A;;2C8A +2C8C;COPTIC CAPITAL LETTER ZATA;Lu;0;L;;;;;N;;;;2C8D; +2C8D;COPTIC SMALL LETTER ZATA;Ll;0;L;;;;;N;;;2C8C;;2C8C +2C8E;COPTIC CAPITAL LETTER HATE;Lu;0;L;;;;;N;;;;2C8F; +2C8F;COPTIC SMALL LETTER HATE;Ll;0;L;;;;;N;;;2C8E;;2C8E +2C90;COPTIC CAPITAL LETTER THETHE;Lu;0;L;;;;;N;;;;2C91; +2C91;COPTIC SMALL LETTER THETHE;Ll;0;L;;;;;N;;;2C90;;2C90 +2C92;COPTIC CAPITAL LETTER IAUDA;Lu;0;L;;;;;N;;;;2C93; +2C93;COPTIC SMALL LETTER IAUDA;Ll;0;L;;;;;N;;;2C92;;2C92 +2C94;COPTIC CAPITAL LETTER KAPA;Lu;0;L;;;;;N;;;;2C95; +2C95;COPTIC SMALL LETTER KAPA;Ll;0;L;;;;;N;;;2C94;;2C94 +2C96;COPTIC CAPITAL LETTER LAULA;Lu;0;L;;;;;N;;;;2C97; +2C97;COPTIC SMALL LETTER LAULA;Ll;0;L;;;;;N;;;2C96;;2C96 +2C98;COPTIC CAPITAL LETTER MI;Lu;0;L;;;;;N;;;;2C99; +2C99;COPTIC SMALL LETTER MI;Ll;0;L;;;;;N;;;2C98;;2C98 +2C9A;COPTIC CAPITAL LETTER NI;Lu;0;L;;;;;N;;;;2C9B; +2C9B;COPTIC SMALL LETTER NI;Ll;0;L;;;;;N;;;2C9A;;2C9A +2C9C;COPTIC CAPITAL LETTER KSI;Lu;0;L;;;;;N;;;;2C9D; +2C9D;COPTIC SMALL LETTER KSI;Ll;0;L;;;;;N;;;2C9C;;2C9C +2C9E;COPTIC CAPITAL LETTER O;Lu;0;L;;;;;N;;;;2C9F; +2C9F;COPTIC SMALL LETTER O;Ll;0;L;;;;;N;;;2C9E;;2C9E +2CA0;COPTIC CAPITAL LETTER PI;Lu;0;L;;;;;N;;;;2CA1; +2CA1;COPTIC SMALL LETTER PI;Ll;0;L;;;;;N;;;2CA0;;2CA0 +2CA2;COPTIC CAPITAL LETTER RO;Lu;0;L;;;;;N;;;;2CA3; +2CA3;COPTIC SMALL LETTER RO;Ll;0;L;;;;;N;;;2CA2;;2CA2 +2CA4;COPTIC CAPITAL LETTER SIMA;Lu;0;L;;;;;N;;;;2CA5; +2CA5;COPTIC SMALL LETTER SIMA;Ll;0;L;;;;;N;;;2CA4;;2CA4 +2CA6;COPTIC CAPITAL LETTER TAU;Lu;0;L;;;;;N;;;;2CA7; +2CA7;COPTIC SMALL LETTER TAU;Ll;0;L;;;;;N;;;2CA6;;2CA6 +2CA8;COPTIC CAPITAL LETTER UA;Lu;0;L;;;;;N;;;;2CA9; +2CA9;COPTIC SMALL LETTER UA;Ll;0;L;;;;;N;;;2CA8;;2CA8 +2CAA;COPTIC CAPITAL LETTER FI;Lu;0;L;;;;;N;;;;2CAB; +2CAB;COPTIC SMALL LETTER FI;Ll;0;L;;;;;N;;;2CAA;;2CAA +2CAC;COPTIC CAPITAL LETTER KHI;Lu;0;L;;;;;N;;;;2CAD; +2CAD;COPTIC SMALL LETTER KHI;Ll;0;L;;;;;N;;;2CAC;;2CAC +2CAE;COPTIC CAPITAL LETTER PSI;Lu;0;L;;;;;N;;;;2CAF; +2CAF;COPTIC SMALL LETTER PSI;Ll;0;L;;;;;N;;;2CAE;;2CAE +2CB0;COPTIC CAPITAL LETTER OOU;Lu;0;L;;;;;N;;;;2CB1; +2CB1;COPTIC SMALL LETTER OOU;Ll;0;L;;;;;N;;;2CB0;;2CB0 +2CB2;COPTIC CAPITAL LETTER DIALECT-P ALEF;Lu;0;L;;;;;N;;;;2CB3; +2CB3;COPTIC SMALL LETTER DIALECT-P ALEF;Ll;0;L;;;;;N;;;2CB2;;2CB2 +2CB4;COPTIC CAPITAL LETTER OLD COPTIC AIN;Lu;0;L;;;;;N;;;;2CB5; +2CB5;COPTIC SMALL LETTER OLD COPTIC AIN;Ll;0;L;;;;;N;;;2CB4;;2CB4 +2CB6;COPTIC CAPITAL LETTER CRYPTOGRAMMIC EIE;Lu;0;L;;;;;N;;;;2CB7; +2CB7;COPTIC SMALL LETTER CRYPTOGRAMMIC EIE;Ll;0;L;;;;;N;;;2CB6;;2CB6 +2CB8;COPTIC CAPITAL LETTER DIALECT-P KAPA;Lu;0;L;;;;;N;;;;2CB9; +2CB9;COPTIC SMALL LETTER DIALECT-P KAPA;Ll;0;L;;;;;N;;;2CB8;;2CB8 +2CBA;COPTIC CAPITAL LETTER DIALECT-P NI;Lu;0;L;;;;;N;;;;2CBB; +2CBB;COPTIC SMALL LETTER DIALECT-P NI;Ll;0;L;;;;;N;;;2CBA;;2CBA +2CBC;COPTIC CAPITAL LETTER CRYPTOGRAMMIC NI;Lu;0;L;;;;;N;;;;2CBD; +2CBD;COPTIC SMALL LETTER CRYPTOGRAMMIC NI;Ll;0;L;;;;;N;;;2CBC;;2CBC +2CBE;COPTIC CAPITAL LETTER OLD COPTIC OOU;Lu;0;L;;;;;N;;;;2CBF; +2CBF;COPTIC SMALL LETTER OLD COPTIC OOU;Ll;0;L;;;;;N;;;2CBE;;2CBE +2CC0;COPTIC CAPITAL LETTER SAMPI;Lu;0;L;;;;;N;;;;2CC1; +2CC1;COPTIC SMALL LETTER SAMPI;Ll;0;L;;;;;N;;;2CC0;;2CC0 +2CC2;COPTIC CAPITAL LETTER CROSSED SHEI;Lu;0;L;;;;;N;;;;2CC3; +2CC3;COPTIC SMALL LETTER CROSSED SHEI;Ll;0;L;;;;;N;;;2CC2;;2CC2 +2CC4;COPTIC CAPITAL LETTER OLD COPTIC SHEI;Lu;0;L;;;;;N;;;;2CC5; +2CC5;COPTIC SMALL LETTER OLD COPTIC SHEI;Ll;0;L;;;;;N;;;2CC4;;2CC4 +2CC6;COPTIC CAPITAL LETTER OLD COPTIC ESH;Lu;0;L;;;;;N;;;;2CC7; +2CC7;COPTIC SMALL LETTER OLD COPTIC ESH;Ll;0;L;;;;;N;;;2CC6;;2CC6 +2CC8;COPTIC CAPITAL LETTER AKHMIMIC KHEI;Lu;0;L;;;;;N;;;;2CC9; +2CC9;COPTIC SMALL LETTER AKHMIMIC KHEI;Ll;0;L;;;;;N;;;2CC8;;2CC8 +2CCA;COPTIC CAPITAL LETTER DIALECT-P HORI;Lu;0;L;;;;;N;;;;2CCB; +2CCB;COPTIC SMALL LETTER DIALECT-P HORI;Ll;0;L;;;;;N;;;2CCA;;2CCA +2CCC;COPTIC CAPITAL LETTER OLD COPTIC HORI;Lu;0;L;;;;;N;;;;2CCD; +2CCD;COPTIC SMALL LETTER OLD COPTIC HORI;Ll;0;L;;;;;N;;;2CCC;;2CCC +2CCE;COPTIC CAPITAL LETTER OLD COPTIC HA;Lu;0;L;;;;;N;;;;2CCF; +2CCF;COPTIC SMALL LETTER OLD COPTIC HA;Ll;0;L;;;;;N;;;2CCE;;2CCE +2CD0;COPTIC CAPITAL LETTER L-SHAPED HA;Lu;0;L;;;;;N;;;;2CD1; +2CD1;COPTIC SMALL LETTER L-SHAPED HA;Ll;0;L;;;;;N;;;2CD0;;2CD0 +2CD2;COPTIC CAPITAL LETTER OLD COPTIC HEI;Lu;0;L;;;;;N;;;;2CD3; +2CD3;COPTIC SMALL LETTER OLD COPTIC HEI;Ll;0;L;;;;;N;;;2CD2;;2CD2 +2CD4;COPTIC CAPITAL LETTER OLD COPTIC HAT;Lu;0;L;;;;;N;;;;2CD5; +2CD5;COPTIC SMALL LETTER OLD COPTIC HAT;Ll;0;L;;;;;N;;;2CD4;;2CD4 +2CD6;COPTIC CAPITAL LETTER OLD COPTIC GANGIA;Lu;0;L;;;;;N;;;;2CD7; +2CD7;COPTIC SMALL LETTER OLD COPTIC GANGIA;Ll;0;L;;;;;N;;;2CD6;;2CD6 +2CD8;COPTIC CAPITAL LETTER OLD COPTIC DJA;Lu;0;L;;;;;N;;;;2CD9; +2CD9;COPTIC SMALL LETTER OLD COPTIC DJA;Ll;0;L;;;;;N;;;2CD8;;2CD8 +2CDA;COPTIC CAPITAL LETTER OLD COPTIC SHIMA;Lu;0;L;;;;;N;;;;2CDB; +2CDB;COPTIC SMALL LETTER OLD COPTIC SHIMA;Ll;0;L;;;;;N;;;2CDA;;2CDA +2CDC;COPTIC CAPITAL LETTER OLD NUBIAN SHIMA;Lu;0;L;;;;;N;;;;2CDD; +2CDD;COPTIC SMALL LETTER OLD NUBIAN SHIMA;Ll;0;L;;;;;N;;;2CDC;;2CDC +2CDE;COPTIC CAPITAL LETTER OLD NUBIAN NGI;Lu;0;L;;;;;N;;;;2CDF; +2CDF;COPTIC SMALL LETTER OLD NUBIAN NGI;Ll;0;L;;;;;N;;;2CDE;;2CDE +2CE0;COPTIC CAPITAL LETTER OLD NUBIAN NYI;Lu;0;L;;;;;N;;;;2CE1; +2CE1;COPTIC SMALL LETTER OLD NUBIAN NYI;Ll;0;L;;;;;N;;;2CE0;;2CE0 +2CE2;COPTIC CAPITAL LETTER OLD NUBIAN WAU;Lu;0;L;;;;;N;;;;2CE3; +2CE3;COPTIC SMALL LETTER OLD NUBIAN WAU;Ll;0;L;;;;;N;;;2CE2;;2CE2 +2CE4;COPTIC SYMBOL KAI;Ll;0;L;;;;;N;;;;; +2CE5;COPTIC SYMBOL MI RO;So;0;ON;;;;;N;;;;; +2CE6;COPTIC SYMBOL PI RO;So;0;ON;;;;;N;;;;; +2CE7;COPTIC SYMBOL STAUROS;So;0;ON;;;;;N;;;;; +2CE8;COPTIC SYMBOL TAU RO;So;0;ON;;;;;N;;;;; +2CE9;COPTIC SYMBOL KHI RO;So;0;ON;;;;;N;;;;; +2CEA;COPTIC SYMBOL SHIMA SIMA;So;0;ON;;;;;N;;;;; +2CEB;COPTIC CAPITAL LETTER CRYPTOGRAMMIC SHEI;Lu;0;L;;;;;N;;;;2CEC; +2CEC;COPTIC SMALL LETTER CRYPTOGRAMMIC SHEI;Ll;0;L;;;;;N;;;2CEB;;2CEB +2CED;COPTIC CAPITAL LETTER CRYPTOGRAMMIC GANGIA;Lu;0;L;;;;;N;;;;2CEE; +2CEE;COPTIC SMALL LETTER CRYPTOGRAMMIC GANGIA;Ll;0;L;;;;;N;;;2CED;;2CED +2CEF;COPTIC COMBINING NI ABOVE;Mn;230;NSM;;;;;N;;;;; +2CF0;COPTIC COMBINING SPIRITUS ASPER;Mn;230;NSM;;;;;N;;;;; +2CF1;COPTIC COMBINING SPIRITUS LENIS;Mn;230;NSM;;;;;N;;;;; +2CF2;COPTIC CAPITAL LETTER BOHAIRIC KHEI;Lu;0;L;;;;;N;;;;2CF3; +2CF3;COPTIC SMALL LETTER BOHAIRIC KHEI;Ll;0;L;;;;;N;;;2CF2;;2CF2 +2CF9;COPTIC OLD NUBIAN FULL STOP;Po;0;ON;;;;;N;;;;; +2CFA;COPTIC OLD NUBIAN DIRECT QUESTION MARK;Po;0;ON;;;;;N;;;;; +2CFB;COPTIC OLD NUBIAN INDIRECT QUESTION MARK;Po;0;ON;;;;;N;;;;; +2CFC;COPTIC OLD NUBIAN VERSE DIVIDER;Po;0;ON;;;;;N;;;;; +2CFD;COPTIC FRACTION ONE HALF;No;0;ON;;;;1/2;N;;;;; +2CFE;COPTIC FULL STOP;Po;0;ON;;;;;N;;;;; +2CFF;COPTIC MORPHOLOGICAL DIVIDER;Po;0;ON;;;;;N;;;;; +2D00;GEORGIAN SMALL LETTER AN;Ll;0;L;;;;;N;;;10A0;;10A0 +2D01;GEORGIAN SMALL LETTER BAN;Ll;0;L;;;;;N;;;10A1;;10A1 +2D02;GEORGIAN SMALL LETTER GAN;Ll;0;L;;;;;N;;;10A2;;10A2 +2D03;GEORGIAN SMALL LETTER DON;Ll;0;L;;;;;N;;;10A3;;10A3 +2D04;GEORGIAN SMALL LETTER EN;Ll;0;L;;;;;N;;;10A4;;10A4 +2D05;GEORGIAN SMALL LETTER VIN;Ll;0;L;;;;;N;;;10A5;;10A5 +2D06;GEORGIAN SMALL LETTER ZEN;Ll;0;L;;;;;N;;;10A6;;10A6 +2D07;GEORGIAN SMALL LETTER TAN;Ll;0;L;;;;;N;;;10A7;;10A7 +2D08;GEORGIAN SMALL LETTER IN;Ll;0;L;;;;;N;;;10A8;;10A8 +2D09;GEORGIAN SMALL LETTER KAN;Ll;0;L;;;;;N;;;10A9;;10A9 +2D0A;GEORGIAN SMALL LETTER LAS;Ll;0;L;;;;;N;;;10AA;;10AA +2D0B;GEORGIAN SMALL LETTER MAN;Ll;0;L;;;;;N;;;10AB;;10AB +2D0C;GEORGIAN SMALL LETTER NAR;Ll;0;L;;;;;N;;;10AC;;10AC +2D0D;GEORGIAN SMALL LETTER ON;Ll;0;L;;;;;N;;;10AD;;10AD +2D0E;GEORGIAN SMALL LETTER PAR;Ll;0;L;;;;;N;;;10AE;;10AE +2D0F;GEORGIAN SMALL LETTER ZHAR;Ll;0;L;;;;;N;;;10AF;;10AF +2D10;GEORGIAN SMALL LETTER RAE;Ll;0;L;;;;;N;;;10B0;;10B0 +2D11;GEORGIAN SMALL LETTER SAN;Ll;0;L;;;;;N;;;10B1;;10B1 +2D12;GEORGIAN SMALL LETTER TAR;Ll;0;L;;;;;N;;;10B2;;10B2 +2D13;GEORGIAN SMALL LETTER UN;Ll;0;L;;;;;N;;;10B3;;10B3 +2D14;GEORGIAN SMALL LETTER PHAR;Ll;0;L;;;;;N;;;10B4;;10B4 +2D15;GEORGIAN SMALL LETTER KHAR;Ll;0;L;;;;;N;;;10B5;;10B5 +2D16;GEORGIAN SMALL LETTER GHAN;Ll;0;L;;;;;N;;;10B6;;10B6 +2D17;GEORGIAN SMALL LETTER QAR;Ll;0;L;;;;;N;;;10B7;;10B7 +2D18;GEORGIAN SMALL LETTER SHIN;Ll;0;L;;;;;N;;;10B8;;10B8 +2D19;GEORGIAN SMALL LETTER CHIN;Ll;0;L;;;;;N;;;10B9;;10B9 +2D1A;GEORGIAN SMALL LETTER CAN;Ll;0;L;;;;;N;;;10BA;;10BA +2D1B;GEORGIAN SMALL LETTER JIL;Ll;0;L;;;;;N;;;10BB;;10BB +2D1C;GEORGIAN SMALL LETTER CIL;Ll;0;L;;;;;N;;;10BC;;10BC +2D1D;GEORGIAN SMALL LETTER CHAR;Ll;0;L;;;;;N;;;10BD;;10BD +2D1E;GEORGIAN SMALL LETTER XAN;Ll;0;L;;;;;N;;;10BE;;10BE +2D1F;GEORGIAN SMALL LETTER JHAN;Ll;0;L;;;;;N;;;10BF;;10BF +2D20;GEORGIAN SMALL LETTER HAE;Ll;0;L;;;;;N;;;10C0;;10C0 +2D21;GEORGIAN SMALL LETTER HE;Ll;0;L;;;;;N;;;10C1;;10C1 +2D22;GEORGIAN SMALL LETTER HIE;Ll;0;L;;;;;N;;;10C2;;10C2 +2D23;GEORGIAN SMALL LETTER WE;Ll;0;L;;;;;N;;;10C3;;10C3 +2D24;GEORGIAN SMALL LETTER HAR;Ll;0;L;;;;;N;;;10C4;;10C4 +2D25;GEORGIAN SMALL LETTER HOE;Ll;0;L;;;;;N;;;10C5;;10C5 +2D27;GEORGIAN SMALL LETTER YN;Ll;0;L;;;;;N;;;10C7;;10C7 +2D2D;GEORGIAN SMALL LETTER AEN;Ll;0;L;;;;;N;;;10CD;;10CD +2D30;TIFINAGH LETTER YA;Lo;0;L;;;;;N;;;;; +2D31;TIFINAGH LETTER YAB;Lo;0;L;;;;;N;;;;; +2D32;TIFINAGH LETTER YABH;Lo;0;L;;;;;N;;;;; +2D33;TIFINAGH LETTER YAG;Lo;0;L;;;;;N;;;;; +2D34;TIFINAGH LETTER YAGHH;Lo;0;L;;;;;N;;;;; +2D35;TIFINAGH LETTER BERBER ACADEMY YAJ;Lo;0;L;;;;;N;;;;; +2D36;TIFINAGH LETTER YAJ;Lo;0;L;;;;;N;;;;; +2D37;TIFINAGH LETTER YAD;Lo;0;L;;;;;N;;;;; +2D38;TIFINAGH LETTER YADH;Lo;0;L;;;;;N;;;;; +2D39;TIFINAGH LETTER YADD;Lo;0;L;;;;;N;;;;; +2D3A;TIFINAGH LETTER YADDH;Lo;0;L;;;;;N;;;;; +2D3B;TIFINAGH LETTER YEY;Lo;0;L;;;;;N;;;;; +2D3C;TIFINAGH LETTER YAF;Lo;0;L;;;;;N;;;;; +2D3D;TIFINAGH LETTER YAK;Lo;0;L;;;;;N;;;;; +2D3E;TIFINAGH LETTER TUAREG YAK;Lo;0;L;;;;;N;;;;; +2D3F;TIFINAGH LETTER YAKHH;Lo;0;L;;;;;N;;;;; +2D40;TIFINAGH LETTER YAH;Lo;0;L;;;;;N;;;;; +2D41;TIFINAGH LETTER BERBER ACADEMY YAH;Lo;0;L;;;;;N;;;;; +2D42;TIFINAGH LETTER TUAREG YAH;Lo;0;L;;;;;N;;;;; +2D43;TIFINAGH LETTER YAHH;Lo;0;L;;;;;N;;;;; +2D44;TIFINAGH LETTER YAA;Lo;0;L;;;;;N;;;;; +2D45;TIFINAGH LETTER YAKH;Lo;0;L;;;;;N;;;;; +2D46;TIFINAGH LETTER TUAREG YAKH;Lo;0;L;;;;;N;;;;; +2D47;TIFINAGH LETTER YAQ;Lo;0;L;;;;;N;;;;; +2D48;TIFINAGH LETTER TUAREG YAQ;Lo;0;L;;;;;N;;;;; +2D49;TIFINAGH LETTER YI;Lo;0;L;;;;;N;;;;; +2D4A;TIFINAGH LETTER YAZH;Lo;0;L;;;;;N;;;;; +2D4B;TIFINAGH LETTER AHAGGAR YAZH;Lo;0;L;;;;;N;;;;; +2D4C;TIFINAGH LETTER TUAREG YAZH;Lo;0;L;;;;;N;;;;; +2D4D;TIFINAGH LETTER YAL;Lo;0;L;;;;;N;;;;; +2D4E;TIFINAGH LETTER YAM;Lo;0;L;;;;;N;;;;; +2D4F;TIFINAGH LETTER YAN;Lo;0;L;;;;;N;;;;; +2D50;TIFINAGH LETTER TUAREG YAGN;Lo;0;L;;;;;N;;;;; +2D51;TIFINAGH LETTER TUAREG YANG;Lo;0;L;;;;;N;;;;; +2D52;TIFINAGH LETTER YAP;Lo;0;L;;;;;N;;;;; +2D53;TIFINAGH LETTER YU;Lo;0;L;;;;;N;;;;; +2D54;TIFINAGH LETTER YAR;Lo;0;L;;;;;N;;;;; +2D55;TIFINAGH LETTER YARR;Lo;0;L;;;;;N;;;;; +2D56;TIFINAGH LETTER YAGH;Lo;0;L;;;;;N;;;;; +2D57;TIFINAGH LETTER TUAREG YAGH;Lo;0;L;;;;;N;;;;; +2D58;TIFINAGH LETTER AYER YAGH;Lo;0;L;;;;;N;;;;; +2D59;TIFINAGH LETTER YAS;Lo;0;L;;;;;N;;;;; +2D5A;TIFINAGH LETTER YASS;Lo;0;L;;;;;N;;;;; +2D5B;TIFINAGH LETTER YASH;Lo;0;L;;;;;N;;;;; +2D5C;TIFINAGH LETTER YAT;Lo;0;L;;;;;N;;;;; +2D5D;TIFINAGH LETTER YATH;Lo;0;L;;;;;N;;;;; +2D5E;TIFINAGH LETTER YACH;Lo;0;L;;;;;N;;;;; +2D5F;TIFINAGH LETTER YATT;Lo;0;L;;;;;N;;;;; +2D60;TIFINAGH LETTER YAV;Lo;0;L;;;;;N;;;;; +2D61;TIFINAGH LETTER YAW;Lo;0;L;;;;;N;;;;; +2D62;TIFINAGH LETTER YAY;Lo;0;L;;;;;N;;;;; +2D63;TIFINAGH LETTER YAZ;Lo;0;L;;;;;N;;;;; +2D64;TIFINAGH LETTER TAWELLEMET YAZ;Lo;0;L;;;;;N;;;;; +2D65;TIFINAGH LETTER YAZZ;Lo;0;L;;;;;N;;;;; +2D66;TIFINAGH LETTER YE;Lo;0;L;;;;;N;;;;; +2D67;TIFINAGH LETTER YO;Lo;0;L;;;;;N;;;;; +2D6F;TIFINAGH MODIFIER LETTER LABIALIZATION MARK;Lm;0;L; 2D61;;;;N;;;;; +2D70;TIFINAGH SEPARATOR MARK;Po;0;L;;;;;N;;;;; +2D7F;TIFINAGH CONSONANT JOINER;Mn;9;NSM;;;;;N;;;;; +2D80;ETHIOPIC SYLLABLE LOA;Lo;0;L;;;;;N;;;;; +2D81;ETHIOPIC SYLLABLE MOA;Lo;0;L;;;;;N;;;;; +2D82;ETHIOPIC SYLLABLE ROA;Lo;0;L;;;;;N;;;;; +2D83;ETHIOPIC SYLLABLE SOA;Lo;0;L;;;;;N;;;;; +2D84;ETHIOPIC SYLLABLE SHOA;Lo;0;L;;;;;N;;;;; +2D85;ETHIOPIC SYLLABLE BOA;Lo;0;L;;;;;N;;;;; +2D86;ETHIOPIC SYLLABLE TOA;Lo;0;L;;;;;N;;;;; +2D87;ETHIOPIC SYLLABLE COA;Lo;0;L;;;;;N;;;;; +2D88;ETHIOPIC SYLLABLE NOA;Lo;0;L;;;;;N;;;;; +2D89;ETHIOPIC SYLLABLE NYOA;Lo;0;L;;;;;N;;;;; +2D8A;ETHIOPIC SYLLABLE GLOTTAL OA;Lo;0;L;;;;;N;;;;; +2D8B;ETHIOPIC SYLLABLE ZOA;Lo;0;L;;;;;N;;;;; +2D8C;ETHIOPIC SYLLABLE DOA;Lo;0;L;;;;;N;;;;; +2D8D;ETHIOPIC SYLLABLE DDOA;Lo;0;L;;;;;N;;;;; +2D8E;ETHIOPIC SYLLABLE JOA;Lo;0;L;;;;;N;;;;; +2D8F;ETHIOPIC SYLLABLE THOA;Lo;0;L;;;;;N;;;;; +2D90;ETHIOPIC SYLLABLE CHOA;Lo;0;L;;;;;N;;;;; +2D91;ETHIOPIC SYLLABLE PHOA;Lo;0;L;;;;;N;;;;; +2D92;ETHIOPIC SYLLABLE POA;Lo;0;L;;;;;N;;;;; +2D93;ETHIOPIC SYLLABLE GGWA;Lo;0;L;;;;;N;;;;; +2D94;ETHIOPIC SYLLABLE GGWI;Lo;0;L;;;;;N;;;;; +2D95;ETHIOPIC SYLLABLE GGWEE;Lo;0;L;;;;;N;;;;; +2D96;ETHIOPIC SYLLABLE GGWE;Lo;0;L;;;;;N;;;;; +2DA0;ETHIOPIC SYLLABLE SSA;Lo;0;L;;;;;N;;;;; +2DA1;ETHIOPIC SYLLABLE SSU;Lo;0;L;;;;;N;;;;; +2DA2;ETHIOPIC SYLLABLE SSI;Lo;0;L;;;;;N;;;;; +2DA3;ETHIOPIC SYLLABLE SSAA;Lo;0;L;;;;;N;;;;; +2DA4;ETHIOPIC SYLLABLE SSEE;Lo;0;L;;;;;N;;;;; +2DA5;ETHIOPIC SYLLABLE SSE;Lo;0;L;;;;;N;;;;; +2DA6;ETHIOPIC SYLLABLE SSO;Lo;0;L;;;;;N;;;;; +2DA8;ETHIOPIC SYLLABLE CCA;Lo;0;L;;;;;N;;;;; +2DA9;ETHIOPIC SYLLABLE CCU;Lo;0;L;;;;;N;;;;; +2DAA;ETHIOPIC SYLLABLE CCI;Lo;0;L;;;;;N;;;;; +2DAB;ETHIOPIC SYLLABLE CCAA;Lo;0;L;;;;;N;;;;; +2DAC;ETHIOPIC SYLLABLE CCEE;Lo;0;L;;;;;N;;;;; +2DAD;ETHIOPIC SYLLABLE CCE;Lo;0;L;;;;;N;;;;; +2DAE;ETHIOPIC SYLLABLE CCO;Lo;0;L;;;;;N;;;;; +2DB0;ETHIOPIC SYLLABLE ZZA;Lo;0;L;;;;;N;;;;; +2DB1;ETHIOPIC SYLLABLE ZZU;Lo;0;L;;;;;N;;;;; +2DB2;ETHIOPIC SYLLABLE ZZI;Lo;0;L;;;;;N;;;;; +2DB3;ETHIOPIC SYLLABLE ZZAA;Lo;0;L;;;;;N;;;;; +2DB4;ETHIOPIC SYLLABLE ZZEE;Lo;0;L;;;;;N;;;;; +2DB5;ETHIOPIC SYLLABLE ZZE;Lo;0;L;;;;;N;;;;; +2DB6;ETHIOPIC SYLLABLE ZZO;Lo;0;L;;;;;N;;;;; +2DB8;ETHIOPIC SYLLABLE CCHA;Lo;0;L;;;;;N;;;;; +2DB9;ETHIOPIC SYLLABLE CCHU;Lo;0;L;;;;;N;;;;; +2DBA;ETHIOPIC SYLLABLE CCHI;Lo;0;L;;;;;N;;;;; +2DBB;ETHIOPIC SYLLABLE CCHAA;Lo;0;L;;;;;N;;;;; +2DBC;ETHIOPIC SYLLABLE CCHEE;Lo;0;L;;;;;N;;;;; +2DBD;ETHIOPIC SYLLABLE CCHE;Lo;0;L;;;;;N;;;;; +2DBE;ETHIOPIC SYLLABLE CCHO;Lo;0;L;;;;;N;;;;; +2DC0;ETHIOPIC SYLLABLE QYA;Lo;0;L;;;;;N;;;;; +2DC1;ETHIOPIC SYLLABLE QYU;Lo;0;L;;;;;N;;;;; +2DC2;ETHIOPIC SYLLABLE QYI;Lo;0;L;;;;;N;;;;; +2DC3;ETHIOPIC SYLLABLE QYAA;Lo;0;L;;;;;N;;;;; +2DC4;ETHIOPIC SYLLABLE QYEE;Lo;0;L;;;;;N;;;;; +2DC5;ETHIOPIC SYLLABLE QYE;Lo;0;L;;;;;N;;;;; +2DC6;ETHIOPIC SYLLABLE QYO;Lo;0;L;;;;;N;;;;; +2DC8;ETHIOPIC SYLLABLE KYA;Lo;0;L;;;;;N;;;;; +2DC9;ETHIOPIC SYLLABLE KYU;Lo;0;L;;;;;N;;;;; +2DCA;ETHIOPIC SYLLABLE KYI;Lo;0;L;;;;;N;;;;; +2DCB;ETHIOPIC SYLLABLE KYAA;Lo;0;L;;;;;N;;;;; +2DCC;ETHIOPIC SYLLABLE KYEE;Lo;0;L;;;;;N;;;;; +2DCD;ETHIOPIC SYLLABLE KYE;Lo;0;L;;;;;N;;;;; +2DCE;ETHIOPIC SYLLABLE KYO;Lo;0;L;;;;;N;;;;; +2DD0;ETHIOPIC SYLLABLE XYA;Lo;0;L;;;;;N;;;;; +2DD1;ETHIOPIC SYLLABLE XYU;Lo;0;L;;;;;N;;;;; +2DD2;ETHIOPIC SYLLABLE XYI;Lo;0;L;;;;;N;;;;; +2DD3;ETHIOPIC SYLLABLE XYAA;Lo;0;L;;;;;N;;;;; +2DD4;ETHIOPIC SYLLABLE XYEE;Lo;0;L;;;;;N;;;;; +2DD5;ETHIOPIC SYLLABLE XYE;Lo;0;L;;;;;N;;;;; +2DD6;ETHIOPIC SYLLABLE XYO;Lo;0;L;;;;;N;;;;; +2DD8;ETHIOPIC SYLLABLE GYA;Lo;0;L;;;;;N;;;;; +2DD9;ETHIOPIC SYLLABLE GYU;Lo;0;L;;;;;N;;;;; +2DDA;ETHIOPIC SYLLABLE GYI;Lo;0;L;;;;;N;;;;; +2DDB;ETHIOPIC SYLLABLE GYAA;Lo;0;L;;;;;N;;;;; +2DDC;ETHIOPIC SYLLABLE GYEE;Lo;0;L;;;;;N;;;;; +2DDD;ETHIOPIC SYLLABLE GYE;Lo;0;L;;;;;N;;;;; +2DDE;ETHIOPIC SYLLABLE GYO;Lo;0;L;;;;;N;;;;; +2DE0;COMBINING CYRILLIC LETTER BE;Mn;230;NSM;;;;;N;;;;; +2DE1;COMBINING CYRILLIC LETTER VE;Mn;230;NSM;;;;;N;;;;; +2DE2;COMBINING CYRILLIC LETTER GHE;Mn;230;NSM;;;;;N;;;;; +2DE3;COMBINING CYRILLIC LETTER DE;Mn;230;NSM;;;;;N;;;;; +2DE4;COMBINING CYRILLIC LETTER ZHE;Mn;230;NSM;;;;;N;;;;; +2DE5;COMBINING CYRILLIC LETTER ZE;Mn;230;NSM;;;;;N;;;;; +2DE6;COMBINING CYRILLIC LETTER KA;Mn;230;NSM;;;;;N;;;;; +2DE7;COMBINING CYRILLIC LETTER EL;Mn;230;NSM;;;;;N;;;;; +2DE8;COMBINING CYRILLIC LETTER EM;Mn;230;NSM;;;;;N;;;;; +2DE9;COMBINING CYRILLIC LETTER EN;Mn;230;NSM;;;;;N;;;;; +2DEA;COMBINING CYRILLIC LETTER O;Mn;230;NSM;;;;;N;;;;; +2DEB;COMBINING CYRILLIC LETTER PE;Mn;230;NSM;;;;;N;;;;; +2DEC;COMBINING CYRILLIC LETTER ER;Mn;230;NSM;;;;;N;;;;; +2DED;COMBINING CYRILLIC LETTER ES;Mn;230;NSM;;;;;N;;;;; +2DEE;COMBINING CYRILLIC LETTER TE;Mn;230;NSM;;;;;N;;;;; +2DEF;COMBINING CYRILLIC LETTER HA;Mn;230;NSM;;;;;N;;;;; +2DF0;COMBINING CYRILLIC LETTER TSE;Mn;230;NSM;;;;;N;;;;; +2DF1;COMBINING CYRILLIC LETTER CHE;Mn;230;NSM;;;;;N;;;;; +2DF2;COMBINING CYRILLIC LETTER SHA;Mn;230;NSM;;;;;N;;;;; +2DF3;COMBINING CYRILLIC LETTER SHCHA;Mn;230;NSM;;;;;N;;;;; +2DF4;COMBINING CYRILLIC LETTER FITA;Mn;230;NSM;;;;;N;;;;; +2DF5;COMBINING CYRILLIC LETTER ES-TE;Mn;230;NSM;;;;;N;;;;; +2DF6;COMBINING CYRILLIC LETTER A;Mn;230;NSM;;;;;N;;;;; +2DF7;COMBINING CYRILLIC LETTER IE;Mn;230;NSM;;;;;N;;;;; +2DF8;COMBINING CYRILLIC LETTER DJERV;Mn;230;NSM;;;;;N;;;;; +2DF9;COMBINING CYRILLIC LETTER MONOGRAPH UK;Mn;230;NSM;;;;;N;;;;; +2DFA;COMBINING CYRILLIC LETTER YAT;Mn;230;NSM;;;;;N;;;;; +2DFB;COMBINING CYRILLIC LETTER YU;Mn;230;NSM;;;;;N;;;;; +2DFC;COMBINING CYRILLIC LETTER IOTIFIED A;Mn;230;NSM;;;;;N;;;;; +2DFD;COMBINING CYRILLIC LETTER LITTLE YUS;Mn;230;NSM;;;;;N;;;;; +2DFE;COMBINING CYRILLIC LETTER BIG YUS;Mn;230;NSM;;;;;N;;;;; +2DFF;COMBINING CYRILLIC LETTER IOTIFIED BIG YUS;Mn;230;NSM;;;;;N;;;;; +2E00;RIGHT ANGLE SUBSTITUTION MARKER;Po;0;ON;;;;;N;;;;; +2E01;RIGHT ANGLE DOTTED SUBSTITUTION MARKER;Po;0;ON;;;;;N;;;;; +2E02;LEFT SUBSTITUTION BRACKET;Pi;0;ON;;;;;Y;;;;; +2E03;RIGHT SUBSTITUTION BRACKET;Pf;0;ON;;;;;Y;;;;; +2E04;LEFT DOTTED SUBSTITUTION BRACKET;Pi;0;ON;;;;;Y;;;;; +2E05;RIGHT DOTTED SUBSTITUTION BRACKET;Pf;0;ON;;;;;Y;;;;; +2E06;RAISED INTERPOLATION MARKER;Po;0;ON;;;;;N;;;;; +2E07;RAISED DOTTED INTERPOLATION MARKER;Po;0;ON;;;;;N;;;;; +2E08;DOTTED TRANSPOSITION MARKER;Po;0;ON;;;;;N;;;;; +2E09;LEFT TRANSPOSITION BRACKET;Pi;0;ON;;;;;Y;;;;; +2E0A;RIGHT TRANSPOSITION BRACKET;Pf;0;ON;;;;;Y;;;;; +2E0B;RAISED SQUARE;Po;0;ON;;;;;N;;;;; +2E0C;LEFT RAISED OMISSION BRACKET;Pi;0;ON;;;;;Y;;;;; +2E0D;RIGHT RAISED OMISSION BRACKET;Pf;0;ON;;;;;Y;;;;; +2E0E;EDITORIAL CORONIS;Po;0;ON;;;;;N;;;;; +2E0F;PARAGRAPHOS;Po;0;ON;;;;;N;;;;; +2E10;FORKED PARAGRAPHOS;Po;0;ON;;;;;N;;;;; +2E11;REVERSED FORKED PARAGRAPHOS;Po;0;ON;;;;;N;;;;; +2E12;HYPODIASTOLE;Po;0;ON;;;;;N;;;;; +2E13;DOTTED OBELOS;Po;0;ON;;;;;N;;;;; +2E14;DOWNWARDS ANCORA;Po;0;ON;;;;;N;;;;; +2E15;UPWARDS ANCORA;Po;0;ON;;;;;N;;;;; +2E16;DOTTED RIGHT-POINTING ANGLE;Po;0;ON;;;;;N;;;;; +2E17;DOUBLE OBLIQUE HYPHEN;Pd;0;ON;;;;;N;;;;; +2E18;INVERTED INTERROBANG;Po;0;ON;;;;;N;;;;; +2E19;PALM BRANCH;Po;0;ON;;;;;N;;;;; +2E1A;HYPHEN WITH DIAERESIS;Pd;0;ON;;;;;N;;;;; +2E1B;TILDE WITH RING ABOVE;Po;0;ON;;;;;N;;;;; +2E1C;LEFT LOW PARAPHRASE BRACKET;Pi;0;ON;;;;;Y;;;;; +2E1D;RIGHT LOW PARAPHRASE BRACKET;Pf;0;ON;;;;;Y;;;;; +2E1E;TILDE WITH DOT ABOVE;Po;0;ON;;;;;N;;;;; +2E1F;TILDE WITH DOT BELOW;Po;0;ON;;;;;N;;;;; +2E20;LEFT VERTICAL BAR WITH QUILL;Pi;0;ON;;;;;Y;;;;; +2E21;RIGHT VERTICAL BAR WITH QUILL;Pf;0;ON;;;;;Y;;;;; +2E22;TOP LEFT HALF BRACKET;Ps;0;ON;;;;;Y;;;;; +2E23;TOP RIGHT HALF BRACKET;Pe;0;ON;;;;;Y;;;;; +2E24;BOTTOM LEFT HALF BRACKET;Ps;0;ON;;;;;Y;;;;; +2E25;BOTTOM RIGHT HALF BRACKET;Pe;0;ON;;;;;Y;;;;; +2E26;LEFT SIDEWAYS U BRACKET;Ps;0;ON;;;;;Y;;;;; +2E27;RIGHT SIDEWAYS U BRACKET;Pe;0;ON;;;;;Y;;;;; +2E28;LEFT DOUBLE PARENTHESIS;Ps;0;ON;;;;;Y;;;;; +2E29;RIGHT DOUBLE PARENTHESIS;Pe;0;ON;;;;;Y;;;;; +2E2A;TWO DOTS OVER ONE DOT PUNCTUATION;Po;0;ON;;;;;N;;;;; +2E2B;ONE DOT OVER TWO DOTS PUNCTUATION;Po;0;ON;;;;;N;;;;; +2E2C;SQUARED FOUR DOT PUNCTUATION;Po;0;ON;;;;;N;;;;; +2E2D;FIVE DOT MARK;Po;0;ON;;;;;N;;;;; +2E2E;REVERSED QUESTION MARK;Po;0;ON;;;;;N;;;;; +2E2F;VERTICAL TILDE;Lm;0;ON;;;;;N;;;;; +2E30;RING POINT;Po;0;ON;;;;;N;;;;; +2E31;WORD SEPARATOR MIDDLE DOT;Po;0;ON;;;;;N;;;;; +2E32;TURNED COMMA;Po;0;ON;;;;;N;;;;; +2E33;RAISED DOT;Po;0;ON;;;;;N;;;;; +2E34;RAISED COMMA;Po;0;ON;;;;;N;;;;; +2E35;TURNED SEMICOLON;Po;0;ON;;;;;N;;;;; +2E36;DAGGER WITH LEFT GUARD;Po;0;ON;;;;;N;;;;; +2E37;DAGGER WITH RIGHT GUARD;Po;0;ON;;;;;N;;;;; +2E38;TURNED DAGGER;Po;0;ON;;;;;N;;;;; +2E39;TOP HALF SECTION SIGN;Po;0;ON;;;;;N;;;;; +2E3A;TWO-EM DASH;Pd;0;ON;;;;;N;;;;; +2E3B;THREE-EM DASH;Pd;0;ON;;;;;N;;;;; +2E3C;STENOGRAPHIC FULL STOP;Po;0;ON;;;;;N;;;;; +2E3D;VERTICAL SIX DOTS;Po;0;ON;;;;;N;;;;; +2E3E;WIGGLY VERTICAL LINE;Po;0;ON;;;;;N;;;;; +2E3F;CAPITULUM;Po;0;ON;;;;;N;;;;; +2E40;DOUBLE HYPHEN;Pd;0;ON;;;;;N;;;;; +2E41;REVERSED COMMA;Po;0;ON;;;;;N;;;;; +2E42;DOUBLE LOW-REVERSED-9 QUOTATION MARK;Ps;0;ON;;;;;N;;;;; +2E43;DASH WITH LEFT UPTURN;Po;0;ON;;;;;N;;;;; +2E44;DOUBLE SUSPENSION MARK;Po;0;ON;;;;;N;;;;; +2E45;INVERTED LOW KAVYKA;Po;0;ON;;;;;N;;;;; +2E46;INVERTED LOW KAVYKA WITH KAVYKA ABOVE;Po;0;ON;;;;;N;;;;; +2E47;LOW KAVYKA;Po;0;ON;;;;;N;;;;; +2E48;LOW KAVYKA WITH DOT;Po;0;ON;;;;;N;;;;; +2E49;DOUBLE STACKED COMMA;Po;0;ON;;;;;N;;;;; +2E4A;DOTTED SOLIDUS;Po;0;ON;;;;;N;;;;; +2E4B;TRIPLE DAGGER;Po;0;ON;;;;;N;;;;; +2E4C;MEDIEVAL COMMA;Po;0;ON;;;;;N;;;;; +2E4D;PARAGRAPHUS MARK;Po;0;ON;;;;;N;;;;; +2E4E;PUNCTUS ELEVATUS MARK;Po;0;ON;;;;;N;;;;; +2E4F;CORNISH VERSE DIVIDER;Po;0;ON;;;;;N;;;;; +2E50;CROSS PATTY WITH RIGHT CROSSBAR;So;0;ON;;;;;N;;;;; +2E51;CROSS PATTY WITH LEFT CROSSBAR;So;0;ON;;;;;N;;;;; +2E52;TIRONIAN SIGN CAPITAL ET;Po;0;ON;;;;;N;;;;; +2E53;MEDIEVAL EXCLAMATION MARK;Po;0;ON;;;;;N;;;;; +2E54;MEDIEVAL QUESTION MARK;Po;0;ON;;;;;N;;;;; +2E55;LEFT SQUARE BRACKET WITH STROKE;Ps;0;ON;;;;;Y;;;;; +2E56;RIGHT SQUARE BRACKET WITH STROKE;Pe;0;ON;;;;;Y;;;;; +2E57;LEFT SQUARE BRACKET WITH DOUBLE STROKE;Ps;0;ON;;;;;Y;;;;; +2E58;RIGHT SQUARE BRACKET WITH DOUBLE STROKE;Pe;0;ON;;;;;Y;;;;; +2E59;TOP HALF LEFT PARENTHESIS;Ps;0;ON;;;;;Y;;;;; +2E5A;TOP HALF RIGHT PARENTHESIS;Pe;0;ON;;;;;Y;;;;; +2E5B;BOTTOM HALF LEFT PARENTHESIS;Ps;0;ON;;;;;Y;;;;; +2E5C;BOTTOM HALF RIGHT PARENTHESIS;Pe;0;ON;;;;;Y;;;;; +2E5D;OBLIQUE HYPHEN;Pd;0;ON;;;;;N;;;;; +2E80;CJK RADICAL REPEAT;So;0;ON;;;;;N;;;;; +2E81;CJK RADICAL CLIFF;So;0;ON;;;;;N;;;;; +2E82;CJK RADICAL SECOND ONE;So;0;ON;;;;;N;;;;; +2E83;CJK RADICAL SECOND TWO;So;0;ON;;;;;N;;;;; +2E84;CJK RADICAL SECOND THREE;So;0;ON;;;;;N;;;;; +2E85;CJK RADICAL PERSON;So;0;ON;;;;;N;;;;; +2E86;CJK RADICAL BOX;So;0;ON;;;;;N;;;;; +2E87;CJK RADICAL TABLE;So;0;ON;;;;;N;;;;; +2E88;CJK RADICAL KNIFE ONE;So;0;ON;;;;;N;;;;; +2E89;CJK RADICAL KNIFE TWO;So;0;ON;;;;;N;;;;; +2E8A;CJK RADICAL DIVINATION;So;0;ON;;;;;N;;;;; +2E8B;CJK RADICAL SEAL;So;0;ON;;;;;N;;;;; +2E8C;CJK RADICAL SMALL ONE;So;0;ON;;;;;N;;;;; +2E8D;CJK RADICAL SMALL TWO;So;0;ON;;;;;N;;;;; +2E8E;CJK RADICAL LAME ONE;So;0;ON;;;;;N;;;;; +2E8F;CJK RADICAL LAME TWO;So;0;ON;;;;;N;;;;; +2E90;CJK RADICAL LAME THREE;So;0;ON;;;;;N;;;;; +2E91;CJK RADICAL LAME FOUR;So;0;ON;;;;;N;;;;; +2E92;CJK RADICAL SNAKE;So;0;ON;;;;;N;;;;; +2E93;CJK RADICAL THREAD;So;0;ON;;;;;N;;;;; +2E94;CJK RADICAL SNOUT ONE;So;0;ON;;;;;N;;;;; +2E95;CJK RADICAL SNOUT TWO;So;0;ON;;;;;N;;;;; +2E96;CJK RADICAL HEART ONE;So;0;ON;;;;;N;;;;; +2E97;CJK RADICAL HEART TWO;So;0;ON;;;;;N;;;;; +2E98;CJK RADICAL HAND;So;0;ON;;;;;N;;;;; +2E99;CJK RADICAL RAP;So;0;ON;;;;;N;;;;; +2E9B;CJK RADICAL CHOKE;So;0;ON;;;;;N;;;;; +2E9C;CJK RADICAL SUN;So;0;ON;;;;;N;;;;; +2E9D;CJK RADICAL MOON;So;0;ON;;;;;N;;;;; +2E9E;CJK RADICAL DEATH;So;0;ON;;;;;N;;;;; +2E9F;CJK RADICAL MOTHER;So;0;ON; 6BCD;;;;N;;;;; +2EA0;CJK RADICAL CIVILIAN;So;0;ON;;;;;N;;;;; +2EA1;CJK RADICAL WATER ONE;So;0;ON;;;;;N;;;;; +2EA2;CJK RADICAL WATER TWO;So;0;ON;;;;;N;;;;; +2EA3;CJK RADICAL FIRE;So;0;ON;;;;;N;;;;; +2EA4;CJK RADICAL PAW ONE;So;0;ON;;;;;N;;;;; +2EA5;CJK RADICAL PAW TWO;So;0;ON;;;;;N;;;;; +2EA6;CJK RADICAL SIMPLIFIED HALF TREE TRUNK;So;0;ON;;;;;N;;;;; +2EA7;CJK RADICAL COW;So;0;ON;;;;;N;;;;; +2EA8;CJK RADICAL DOG;So;0;ON;;;;;N;;;;; +2EA9;CJK RADICAL JADE;So;0;ON;;;;;N;;;;; +2EAA;CJK RADICAL BOLT OF CLOTH;So;0;ON;;;;;N;;;;; +2EAB;CJK RADICAL EYE;So;0;ON;;;;;N;;;;; +2EAC;CJK RADICAL SPIRIT ONE;So;0;ON;;;;;N;;;;; +2EAD;CJK RADICAL SPIRIT TWO;So;0;ON;;;;;N;;;;; +2EAE;CJK RADICAL BAMBOO;So;0;ON;;;;;N;;;;; +2EAF;CJK RADICAL SILK;So;0;ON;;;;;N;;;;; +2EB0;CJK RADICAL C-SIMPLIFIED SILK;So;0;ON;;;;;N;;;;; +2EB1;CJK RADICAL NET ONE;So;0;ON;;;;;N;;;;; +2EB2;CJK RADICAL NET TWO;So;0;ON;;;;;N;;;;; +2EB3;CJK RADICAL NET THREE;So;0;ON;;;;;N;;;;; +2EB4;CJK RADICAL NET FOUR;So;0;ON;;;;;N;;;;; +2EB5;CJK RADICAL MESH;So;0;ON;;;;;N;;;;; +2EB6;CJK RADICAL SHEEP;So;0;ON;;;;;N;;;;; +2EB7;CJK RADICAL RAM;So;0;ON;;;;;N;;;;; +2EB8;CJK RADICAL EWE;So;0;ON;;;;;N;;;;; +2EB9;CJK RADICAL OLD;So;0;ON;;;;;N;;;;; +2EBA;CJK RADICAL BRUSH ONE;So;0;ON;;;;;N;;;;; +2EBB;CJK RADICAL BRUSH TWO;So;0;ON;;;;;N;;;;; +2EBC;CJK RADICAL MEAT;So;0;ON;;;;;N;;;;; +2EBD;CJK RADICAL MORTAR;So;0;ON;;;;;N;;;;; +2EBE;CJK RADICAL GRASS ONE;So;0;ON;;;;;N;;;;; +2EBF;CJK RADICAL GRASS TWO;So;0;ON;;;;;N;;;;; +2EC0;CJK RADICAL GRASS THREE;So;0;ON;;;;;N;;;;; +2EC1;CJK RADICAL TIGER;So;0;ON;;;;;N;;;;; +2EC2;CJK RADICAL CLOTHES;So;0;ON;;;;;N;;;;; +2EC3;CJK RADICAL WEST ONE;So;0;ON;;;;;N;;;;; +2EC4;CJK RADICAL WEST TWO;So;0;ON;;;;;N;;;;; +2EC5;CJK RADICAL C-SIMPLIFIED SEE;So;0;ON;;;;;N;;;;; +2EC6;CJK RADICAL SIMPLIFIED HORN;So;0;ON;;;;;N;;;;; +2EC7;CJK RADICAL HORN;So;0;ON;;;;;N;;;;; +2EC8;CJK RADICAL C-SIMPLIFIED SPEECH;So;0;ON;;;;;N;;;;; +2EC9;CJK RADICAL C-SIMPLIFIED SHELL;So;0;ON;;;;;N;;;;; +2ECA;CJK RADICAL FOOT;So;0;ON;;;;;N;;;;; +2ECB;CJK RADICAL C-SIMPLIFIED CART;So;0;ON;;;;;N;;;;; +2ECC;CJK RADICAL SIMPLIFIED WALK;So;0;ON;;;;;N;;;;; +2ECD;CJK RADICAL WALK ONE;So;0;ON;;;;;N;;;;; +2ECE;CJK RADICAL WALK TWO;So;0;ON;;;;;N;;;;; +2ECF;CJK RADICAL CITY;So;0;ON;;;;;N;;;;; +2ED0;CJK RADICAL C-SIMPLIFIED GOLD;So;0;ON;;;;;N;;;;; +2ED1;CJK RADICAL LONG ONE;So;0;ON;;;;;N;;;;; +2ED2;CJK RADICAL LONG TWO;So;0;ON;;;;;N;;;;; +2ED3;CJK RADICAL C-SIMPLIFIED LONG;So;0;ON;;;;;N;;;;; +2ED4;CJK RADICAL C-SIMPLIFIED GATE;So;0;ON;;;;;N;;;;; +2ED5;CJK RADICAL MOUND ONE;So;0;ON;;;;;N;;;;; +2ED6;CJK RADICAL MOUND TWO;So;0;ON;;;;;N;;;;; +2ED7;CJK RADICAL RAIN;So;0;ON;;;;;N;;;;; +2ED8;CJK RADICAL BLUE;So;0;ON;;;;;N;;;;; +2ED9;CJK RADICAL C-SIMPLIFIED TANNED LEATHER;So;0;ON;;;;;N;;;;; +2EDA;CJK RADICAL C-SIMPLIFIED LEAF;So;0;ON;;;;;N;;;;; +2EDB;CJK RADICAL C-SIMPLIFIED WIND;So;0;ON;;;;;N;;;;; +2EDC;CJK RADICAL C-SIMPLIFIED FLY;So;0;ON;;;;;N;;;;; +2EDD;CJK RADICAL EAT ONE;So;0;ON;;;;;N;;;;; +2EDE;CJK RADICAL EAT TWO;So;0;ON;;;;;N;;;;; +2EDF;CJK RADICAL EAT THREE;So;0;ON;;;;;N;;;;; +2EE0;CJK RADICAL C-SIMPLIFIED EAT;So;0;ON;;;;;N;;;;; +2EE1;CJK RADICAL HEAD;So;0;ON;;;;;N;;;;; +2EE2;CJK RADICAL C-SIMPLIFIED HORSE;So;0;ON;;;;;N;;;;; +2EE3;CJK RADICAL BONE;So;0;ON;;;;;N;;;;; +2EE4;CJK RADICAL GHOST;So;0;ON;;;;;N;;;;; +2EE5;CJK RADICAL C-SIMPLIFIED FISH;So;0;ON;;;;;N;;;;; +2EE6;CJK RADICAL C-SIMPLIFIED BIRD;So;0;ON;;;;;N;;;;; +2EE7;CJK RADICAL C-SIMPLIFIED SALT;So;0;ON;;;;;N;;;;; +2EE8;CJK RADICAL SIMPLIFIED WHEAT;So;0;ON;;;;;N;;;;; +2EE9;CJK RADICAL SIMPLIFIED YELLOW;So;0;ON;;;;;N;;;;; +2EEA;CJK RADICAL C-SIMPLIFIED FROG;So;0;ON;;;;;N;;;;; +2EEB;CJK RADICAL J-SIMPLIFIED EVEN;So;0;ON;;;;;N;;;;; +2EEC;CJK RADICAL C-SIMPLIFIED EVEN;So;0;ON;;;;;N;;;;; +2EED;CJK RADICAL J-SIMPLIFIED TOOTH;So;0;ON;;;;;N;;;;; +2EEE;CJK RADICAL C-SIMPLIFIED TOOTH;So;0;ON;;;;;N;;;;; +2EEF;CJK RADICAL J-SIMPLIFIED DRAGON;So;0;ON;;;;;N;;;;; +2EF0;CJK RADICAL C-SIMPLIFIED DRAGON;So;0;ON;;;;;N;;;;; +2EF1;CJK RADICAL TURTLE;So;0;ON;;;;;N;;;;; +2EF2;CJK RADICAL J-SIMPLIFIED TURTLE;So;0;ON;;;;;N;;;;; +2EF3;CJK RADICAL C-SIMPLIFIED TURTLE;So;0;ON; 9F9F;;;;N;;;;; +2F00;KANGXI RADICAL ONE;So;0;ON; 4E00;;;;N;;;;; +2F01;KANGXI RADICAL LINE;So;0;ON; 4E28;;;;N;;;;; +2F02;KANGXI RADICAL DOT;So;0;ON; 4E36;;;;N;;;;; +2F03;KANGXI RADICAL SLASH;So;0;ON; 4E3F;;;;N;;;;; +2F04;KANGXI RADICAL SECOND;So;0;ON; 4E59;;;;N;;;;; +2F05;KANGXI RADICAL HOOK;So;0;ON; 4E85;;;;N;;;;; +2F06;KANGXI RADICAL TWO;So;0;ON; 4E8C;;;;N;;;;; +2F07;KANGXI RADICAL LID;So;0;ON; 4EA0;;;;N;;;;; +2F08;KANGXI RADICAL MAN;So;0;ON; 4EBA;;;;N;;;;; +2F09;KANGXI RADICAL LEGS;So;0;ON; 513F;;;;N;;;;; +2F0A;KANGXI RADICAL ENTER;So;0;ON; 5165;;;;N;;;;; +2F0B;KANGXI RADICAL EIGHT;So;0;ON; 516B;;;;N;;;;; +2F0C;KANGXI RADICAL DOWN BOX;So;0;ON; 5182;;;;N;;;;; +2F0D;KANGXI RADICAL COVER;So;0;ON; 5196;;;;N;;;;; +2F0E;KANGXI RADICAL ICE;So;0;ON; 51AB;;;;N;;;;; +2F0F;KANGXI RADICAL TABLE;So;0;ON; 51E0;;;;N;;;;; +2F10;KANGXI RADICAL OPEN BOX;So;0;ON; 51F5;;;;N;;;;; +2F11;KANGXI RADICAL KNIFE;So;0;ON; 5200;;;;N;;;;; +2F12;KANGXI RADICAL POWER;So;0;ON; 529B;;;;N;;;;; +2F13;KANGXI RADICAL WRAP;So;0;ON; 52F9;;;;N;;;;; +2F14;KANGXI RADICAL SPOON;So;0;ON; 5315;;;;N;;;;; +2F15;KANGXI RADICAL RIGHT OPEN BOX;So;0;ON; 531A;;;;N;;;;; +2F16;KANGXI RADICAL HIDING ENCLOSURE;So;0;ON; 5338;;;;N;;;;; +2F17;KANGXI RADICAL TEN;So;0;ON; 5341;;;;N;;;;; +2F18;KANGXI RADICAL DIVINATION;So;0;ON; 535C;;;;N;;;;; +2F19;KANGXI RADICAL SEAL;So;0;ON; 5369;;;;N;;;;; +2F1A;KANGXI RADICAL CLIFF;So;0;ON; 5382;;;;N;;;;; +2F1B;KANGXI RADICAL PRIVATE;So;0;ON; 53B6;;;;N;;;;; +2F1C;KANGXI RADICAL AGAIN;So;0;ON; 53C8;;;;N;;;;; +2F1D;KANGXI RADICAL MOUTH;So;0;ON; 53E3;;;;N;;;;; +2F1E;KANGXI RADICAL ENCLOSURE;So;0;ON; 56D7;;;;N;;;;; +2F1F;KANGXI RADICAL EARTH;So;0;ON; 571F;;;;N;;;;; +2F20;KANGXI RADICAL SCHOLAR;So;0;ON; 58EB;;;;N;;;;; +2F21;KANGXI RADICAL GO;So;0;ON; 5902;;;;N;;;;; +2F22;KANGXI RADICAL GO SLOWLY;So;0;ON; 590A;;;;N;;;;; +2F23;KANGXI RADICAL EVENING;So;0;ON; 5915;;;;N;;;;; +2F24;KANGXI RADICAL BIG;So;0;ON; 5927;;;;N;;;;; +2F25;KANGXI RADICAL WOMAN;So;0;ON; 5973;;;;N;;;;; +2F26;KANGXI RADICAL CHILD;So;0;ON; 5B50;;;;N;;;;; +2F27;KANGXI RADICAL ROOF;So;0;ON; 5B80;;;;N;;;;; +2F28;KANGXI RADICAL INCH;So;0;ON; 5BF8;;;;N;;;;; +2F29;KANGXI RADICAL SMALL;So;0;ON; 5C0F;;;;N;;;;; +2F2A;KANGXI RADICAL LAME;So;0;ON; 5C22;;;;N;;;;; +2F2B;KANGXI RADICAL CORPSE;So;0;ON; 5C38;;;;N;;;;; +2F2C;KANGXI RADICAL SPROUT;So;0;ON; 5C6E;;;;N;;;;; +2F2D;KANGXI RADICAL MOUNTAIN;So;0;ON; 5C71;;;;N;;;;; +2F2E;KANGXI RADICAL RIVER;So;0;ON; 5DDB;;;;N;;;;; +2F2F;KANGXI RADICAL WORK;So;0;ON; 5DE5;;;;N;;;;; +2F30;KANGXI RADICAL ONESELF;So;0;ON; 5DF1;;;;N;;;;; +2F31;KANGXI RADICAL TURBAN;So;0;ON; 5DFE;;;;N;;;;; +2F32;KANGXI RADICAL DRY;So;0;ON; 5E72;;;;N;;;;; +2F33;KANGXI RADICAL SHORT THREAD;So;0;ON; 5E7A;;;;N;;;;; +2F34;KANGXI RADICAL DOTTED CLIFF;So;0;ON; 5E7F;;;;N;;;;; +2F35;KANGXI RADICAL LONG STRIDE;So;0;ON; 5EF4;;;;N;;;;; +2F36;KANGXI RADICAL TWO HANDS;So;0;ON; 5EFE;;;;N;;;;; +2F37;KANGXI RADICAL SHOOT;So;0;ON; 5F0B;;;;N;;;;; +2F38;KANGXI RADICAL BOW;So;0;ON; 5F13;;;;N;;;;; +2F39;KANGXI RADICAL SNOUT;So;0;ON; 5F50;;;;N;;;;; +2F3A;KANGXI RADICAL BRISTLE;So;0;ON; 5F61;;;;N;;;;; +2F3B;KANGXI RADICAL STEP;So;0;ON; 5F73;;;;N;;;;; +2F3C;KANGXI RADICAL HEART;So;0;ON; 5FC3;;;;N;;;;; +2F3D;KANGXI RADICAL HALBERD;So;0;ON; 6208;;;;N;;;;; +2F3E;KANGXI RADICAL DOOR;So;0;ON; 6236;;;;N;;;;; +2F3F;KANGXI RADICAL HAND;So;0;ON; 624B;;;;N;;;;; +2F40;KANGXI RADICAL BRANCH;So;0;ON; 652F;;;;N;;;;; +2F41;KANGXI RADICAL RAP;So;0;ON; 6534;;;;N;;;;; +2F42;KANGXI RADICAL SCRIPT;So;0;ON; 6587;;;;N;;;;; +2F43;KANGXI RADICAL DIPPER;So;0;ON; 6597;;;;N;;;;; +2F44;KANGXI RADICAL AXE;So;0;ON; 65A4;;;;N;;;;; +2F45;KANGXI RADICAL SQUARE;So;0;ON; 65B9;;;;N;;;;; +2F46;KANGXI RADICAL NOT;So;0;ON; 65E0;;;;N;;;;; +2F47;KANGXI RADICAL SUN;So;0;ON; 65E5;;;;N;;;;; +2F48;KANGXI RADICAL SAY;So;0;ON; 66F0;;;;N;;;;; +2F49;KANGXI RADICAL MOON;So;0;ON; 6708;;;;N;;;;; +2F4A;KANGXI RADICAL TREE;So;0;ON; 6728;;;;N;;;;; +2F4B;KANGXI RADICAL LACK;So;0;ON; 6B20;;;;N;;;;; +2F4C;KANGXI RADICAL STOP;So;0;ON; 6B62;;;;N;;;;; +2F4D;KANGXI RADICAL DEATH;So;0;ON; 6B79;;;;N;;;;; +2F4E;KANGXI RADICAL WEAPON;So;0;ON; 6BB3;;;;N;;;;; +2F4F;KANGXI RADICAL DO NOT;So;0;ON; 6BCB;;;;N;;;;; +2F50;KANGXI RADICAL COMPARE;So;0;ON; 6BD4;;;;N;;;;; +2F51;KANGXI RADICAL FUR;So;0;ON; 6BDB;;;;N;;;;; +2F52;KANGXI RADICAL CLAN;So;0;ON; 6C0F;;;;N;;;;; +2F53;KANGXI RADICAL STEAM;So;0;ON; 6C14;;;;N;;;;; +2F54;KANGXI RADICAL WATER;So;0;ON; 6C34;;;;N;;;;; +2F55;KANGXI RADICAL FIRE;So;0;ON; 706B;;;;N;;;;; +2F56;KANGXI RADICAL CLAW;So;0;ON; 722A;;;;N;;;;; +2F57;KANGXI RADICAL FATHER;So;0;ON; 7236;;;;N;;;;; +2F58;KANGXI RADICAL DOUBLE X;So;0;ON; 723B;;;;N;;;;; +2F59;KANGXI RADICAL HALF TREE TRUNK;So;0;ON; 723F;;;;N;;;;; +2F5A;KANGXI RADICAL SLICE;So;0;ON; 7247;;;;N;;;;; +2F5B;KANGXI RADICAL FANG;So;0;ON; 7259;;;;N;;;;; +2F5C;KANGXI RADICAL COW;So;0;ON; 725B;;;;N;;;;; +2F5D;KANGXI RADICAL DOG;So;0;ON; 72AC;;;;N;;;;; +2F5E;KANGXI RADICAL PROFOUND;So;0;ON; 7384;;;;N;;;;; +2F5F;KANGXI RADICAL JADE;So;0;ON; 7389;;;;N;;;;; +2F60;KANGXI RADICAL MELON;So;0;ON; 74DC;;;;N;;;;; +2F61;KANGXI RADICAL TILE;So;0;ON; 74E6;;;;N;;;;; +2F62;KANGXI RADICAL SWEET;So;0;ON; 7518;;;;N;;;;; +2F63;KANGXI RADICAL LIFE;So;0;ON; 751F;;;;N;;;;; +2F64;KANGXI RADICAL USE;So;0;ON; 7528;;;;N;;;;; +2F65;KANGXI RADICAL FIELD;So;0;ON; 7530;;;;N;;;;; +2F66;KANGXI RADICAL BOLT OF CLOTH;So;0;ON; 758B;;;;N;;;;; +2F67;KANGXI RADICAL SICKNESS;So;0;ON; 7592;;;;N;;;;; +2F68;KANGXI RADICAL DOTTED TENT;So;0;ON; 7676;;;;N;;;;; +2F69;KANGXI RADICAL WHITE;So;0;ON; 767D;;;;N;;;;; +2F6A;KANGXI RADICAL SKIN;So;0;ON; 76AE;;;;N;;;;; +2F6B;KANGXI RADICAL DISH;So;0;ON; 76BF;;;;N;;;;; +2F6C;KANGXI RADICAL EYE;So;0;ON; 76EE;;;;N;;;;; +2F6D;KANGXI RADICAL SPEAR;So;0;ON; 77DB;;;;N;;;;; +2F6E;KANGXI RADICAL ARROW;So;0;ON; 77E2;;;;N;;;;; +2F6F;KANGXI RADICAL STONE;So;0;ON; 77F3;;;;N;;;;; +2F70;KANGXI RADICAL SPIRIT;So;0;ON; 793A;;;;N;;;;; +2F71;KANGXI RADICAL TRACK;So;0;ON; 79B8;;;;N;;;;; +2F72;KANGXI RADICAL GRAIN;So;0;ON; 79BE;;;;N;;;;; +2F73;KANGXI RADICAL CAVE;So;0;ON; 7A74;;;;N;;;;; +2F74;KANGXI RADICAL STAND;So;0;ON; 7ACB;;;;N;;;;; +2F75;KANGXI RADICAL BAMBOO;So;0;ON; 7AF9;;;;N;;;;; +2F76;KANGXI RADICAL RICE;So;0;ON; 7C73;;;;N;;;;; +2F77;KANGXI RADICAL SILK;So;0;ON; 7CF8;;;;N;;;;; +2F78;KANGXI RADICAL JAR;So;0;ON; 7F36;;;;N;;;;; +2F79;KANGXI RADICAL NET;So;0;ON; 7F51;;;;N;;;;; +2F7A;KANGXI RADICAL SHEEP;So;0;ON; 7F8A;;;;N;;;;; +2F7B;KANGXI RADICAL FEATHER;So;0;ON; 7FBD;;;;N;;;;; +2F7C;KANGXI RADICAL OLD;So;0;ON; 8001;;;;N;;;;; +2F7D;KANGXI RADICAL AND;So;0;ON; 800C;;;;N;;;;; +2F7E;KANGXI RADICAL PLOW;So;0;ON; 8012;;;;N;;;;; +2F7F;KANGXI RADICAL EAR;So;0;ON; 8033;;;;N;;;;; +2F80;KANGXI RADICAL BRUSH;So;0;ON; 807F;;;;N;;;;; +2F81;KANGXI RADICAL MEAT;So;0;ON; 8089;;;;N;;;;; +2F82;KANGXI RADICAL MINISTER;So;0;ON; 81E3;;;;N;;;;; +2F83;KANGXI RADICAL SELF;So;0;ON; 81EA;;;;N;;;;; +2F84;KANGXI RADICAL ARRIVE;So;0;ON; 81F3;;;;N;;;;; +2F85;KANGXI RADICAL MORTAR;So;0;ON; 81FC;;;;N;;;;; +2F86;KANGXI RADICAL TONGUE;So;0;ON; 820C;;;;N;;;;; +2F87;KANGXI RADICAL OPPOSE;So;0;ON; 821B;;;;N;;;;; +2F88;KANGXI RADICAL BOAT;So;0;ON; 821F;;;;N;;;;; +2F89;KANGXI RADICAL STOPPING;So;0;ON; 826E;;;;N;;;;; +2F8A;KANGXI RADICAL COLOR;So;0;ON; 8272;;;;N;;;;; +2F8B;KANGXI RADICAL GRASS;So;0;ON; 8278;;;;N;;;;; +2F8C;KANGXI RADICAL TIGER;So;0;ON; 864D;;;;N;;;;; +2F8D;KANGXI RADICAL INSECT;So;0;ON; 866B;;;;N;;;;; +2F8E;KANGXI RADICAL BLOOD;So;0;ON; 8840;;;;N;;;;; +2F8F;KANGXI RADICAL WALK ENCLOSURE;So;0;ON; 884C;;;;N;;;;; +2F90;KANGXI RADICAL CLOTHES;So;0;ON; 8863;;;;N;;;;; +2F91;KANGXI RADICAL WEST;So;0;ON; 897E;;;;N;;;;; +2F92;KANGXI RADICAL SEE;So;0;ON; 898B;;;;N;;;;; +2F93;KANGXI RADICAL HORN;So;0;ON; 89D2;;;;N;;;;; +2F94;KANGXI RADICAL SPEECH;So;0;ON; 8A00;;;;N;;;;; +2F95;KANGXI RADICAL VALLEY;So;0;ON; 8C37;;;;N;;;;; +2F96;KANGXI RADICAL BEAN;So;0;ON; 8C46;;;;N;;;;; +2F97;KANGXI RADICAL PIG;So;0;ON; 8C55;;;;N;;;;; +2F98;KANGXI RADICAL BADGER;So;0;ON; 8C78;;;;N;;;;; +2F99;KANGXI RADICAL SHELL;So;0;ON; 8C9D;;;;N;;;;; +2F9A;KANGXI RADICAL RED;So;0;ON; 8D64;;;;N;;;;; +2F9B;KANGXI RADICAL RUN;So;0;ON; 8D70;;;;N;;;;; +2F9C;KANGXI RADICAL FOOT;So;0;ON; 8DB3;;;;N;;;;; +2F9D;KANGXI RADICAL BODY;So;0;ON; 8EAB;;;;N;;;;; +2F9E;KANGXI RADICAL CART;So;0;ON; 8ECA;;;;N;;;;; +2F9F;KANGXI RADICAL BITTER;So;0;ON; 8F9B;;;;N;;;;; +2FA0;KANGXI RADICAL MORNING;So;0;ON; 8FB0;;;;N;;;;; +2FA1;KANGXI RADICAL WALK;So;0;ON; 8FB5;;;;N;;;;; +2FA2;KANGXI RADICAL CITY;So;0;ON; 9091;;;;N;;;;; +2FA3;KANGXI RADICAL WINE;So;0;ON; 9149;;;;N;;;;; +2FA4;KANGXI RADICAL DISTINGUISH;So;0;ON; 91C6;;;;N;;;;; +2FA5;KANGXI RADICAL VILLAGE;So;0;ON; 91CC;;;;N;;;;; +2FA6;KANGXI RADICAL GOLD;So;0;ON; 91D1;;;;N;;;;; +2FA7;KANGXI RADICAL LONG;So;0;ON; 9577;;;;N;;;;; +2FA8;KANGXI RADICAL GATE;So;0;ON; 9580;;;;N;;;;; +2FA9;KANGXI RADICAL MOUND;So;0;ON; 961C;;;;N;;;;; +2FAA;KANGXI RADICAL SLAVE;So;0;ON; 96B6;;;;N;;;;; +2FAB;KANGXI RADICAL SHORT TAILED BIRD;So;0;ON; 96B9;;;;N;;;;; +2FAC;KANGXI RADICAL RAIN;So;0;ON; 96E8;;;;N;;;;; +2FAD;KANGXI RADICAL BLUE;So;0;ON; 9751;;;;N;;;;; +2FAE;KANGXI RADICAL WRONG;So;0;ON; 975E;;;;N;;;;; +2FAF;KANGXI RADICAL FACE;So;0;ON; 9762;;;;N;;;;; +2FB0;KANGXI RADICAL LEATHER;So;0;ON; 9769;;;;N;;;;; +2FB1;KANGXI RADICAL TANNED LEATHER;So;0;ON; 97CB;;;;N;;;;; +2FB2;KANGXI RADICAL LEEK;So;0;ON; 97ED;;;;N;;;;; +2FB3;KANGXI RADICAL SOUND;So;0;ON; 97F3;;;;N;;;;; +2FB4;KANGXI RADICAL LEAF;So;0;ON; 9801;;;;N;;;;; +2FB5;KANGXI RADICAL WIND;So;0;ON; 98A8;;;;N;;;;; +2FB6;KANGXI RADICAL FLY;So;0;ON; 98DB;;;;N;;;;; +2FB7;KANGXI RADICAL EAT;So;0;ON; 98DF;;;;N;;;;; +2FB8;KANGXI RADICAL HEAD;So;0;ON; 9996;;;;N;;;;; +2FB9;KANGXI RADICAL FRAGRANT;So;0;ON; 9999;;;;N;;;;; +2FBA;KANGXI RADICAL HORSE;So;0;ON; 99AC;;;;N;;;;; +2FBB;KANGXI RADICAL BONE;So;0;ON; 9AA8;;;;N;;;;; +2FBC;KANGXI RADICAL TALL;So;0;ON; 9AD8;;;;N;;;;; +2FBD;KANGXI RADICAL HAIR;So;0;ON; 9ADF;;;;N;;;;; +2FBE;KANGXI RADICAL FIGHT;So;0;ON; 9B25;;;;N;;;;; +2FBF;KANGXI RADICAL SACRIFICIAL WINE;So;0;ON; 9B2F;;;;N;;;;; +2FC0;KANGXI RADICAL CAULDRON;So;0;ON; 9B32;;;;N;;;;; +2FC1;KANGXI RADICAL GHOST;So;0;ON; 9B3C;;;;N;;;;; +2FC2;KANGXI RADICAL FISH;So;0;ON; 9B5A;;;;N;;;;; +2FC3;KANGXI RADICAL BIRD;So;0;ON; 9CE5;;;;N;;;;; +2FC4;KANGXI RADICAL SALT;So;0;ON; 9E75;;;;N;;;;; +2FC5;KANGXI RADICAL DEER;So;0;ON; 9E7F;;;;N;;;;; +2FC6;KANGXI RADICAL WHEAT;So;0;ON; 9EA5;;;;N;;;;; +2FC7;KANGXI RADICAL HEMP;So;0;ON; 9EBB;;;;N;;;;; +2FC8;KANGXI RADICAL YELLOW;So;0;ON; 9EC3;;;;N;;;;; +2FC9;KANGXI RADICAL MILLET;So;0;ON; 9ECD;;;;N;;;;; +2FCA;KANGXI RADICAL BLACK;So;0;ON; 9ED1;;;;N;;;;; +2FCB;KANGXI RADICAL EMBROIDERY;So;0;ON; 9EF9;;;;N;;;;; +2FCC;KANGXI RADICAL FROG;So;0;ON; 9EFD;;;;N;;;;; +2FCD;KANGXI RADICAL TRIPOD;So;0;ON; 9F0E;;;;N;;;;; +2FCE;KANGXI RADICAL DRUM;So;0;ON; 9F13;;;;N;;;;; +2FCF;KANGXI RADICAL RAT;So;0;ON; 9F20;;;;N;;;;; +2FD0;KANGXI RADICAL NOSE;So;0;ON; 9F3B;;;;N;;;;; +2FD1;KANGXI RADICAL EVEN;So;0;ON; 9F4A;;;;N;;;;; +2FD2;KANGXI RADICAL TOOTH;So;0;ON; 9F52;;;;N;;;;; +2FD3;KANGXI RADICAL DRAGON;So;0;ON; 9F8D;;;;N;;;;; +2FD4;KANGXI RADICAL TURTLE;So;0;ON; 9F9C;;;;N;;;;; +2FD5;KANGXI RADICAL FLUTE;So;0;ON; 9FA0;;;;N;;;;; +2FF0;IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT;So;0;ON;;;;;N;;;;; +2FF1;IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW;So;0;ON;;;;;N;;;;; +2FF2;IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO MIDDLE AND RIGHT;So;0;ON;;;;;N;;;;; +2FF3;IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW;So;0;ON;;;;;N;;;;; +2FF4;IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND;So;0;ON;;;;;N;;;;; +2FF5;IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE;So;0;ON;;;;;N;;;;; +2FF6;IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM BELOW;So;0;ON;;;;;N;;;;; +2FF7;IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT;So;0;ON;;;;;N;;;;; +2FF8;IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT;So;0;ON;;;;;N;;;;; +2FF9;IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT;So;0;ON;;;;;N;;;;; +2FFA;IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT;So;0;ON;;;;;N;;;;; +2FFB;IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID;So;0;ON;;;;;N;;;;; +2FFC;IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM RIGHT;So;0;ON;;;;;N;;;;; +2FFD;IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER RIGHT;So;0;ON;;;;;N;;;;; +2FFE;IDEOGRAPHIC DESCRIPTION CHARACTER HORIZONTAL REFLECTION;So;0;ON;;;;;N;;;;; +2FFF;IDEOGRAPHIC DESCRIPTION CHARACTER ROTATION;So;0;ON;;;;;N;;;;; +3000;IDEOGRAPHIC SPACE;Zs;0;WS; 0020;;;;N;;;;; +3001;IDEOGRAPHIC COMMA;Po;0;ON;;;;;N;;;;; +3002;IDEOGRAPHIC FULL STOP;Po;0;ON;;;;;N;IDEOGRAPHIC PERIOD;;;; +3003;DITTO MARK;Po;0;ON;;;;;N;;;;; +3004;JAPANESE INDUSTRIAL STANDARD SYMBOL;So;0;ON;;;;;N;;;;; +3005;IDEOGRAPHIC ITERATION MARK;Lm;0;L;;;;;N;;;;; +3006;IDEOGRAPHIC CLOSING MARK;Lo;0;L;;;;;N;;;;; +3007;IDEOGRAPHIC NUMBER ZERO;Nl;0;L;;;;0;N;;;;; +3008;LEFT ANGLE BRACKET;Ps;0;ON;;;;;Y;OPENING ANGLE BRACKET;;;; +3009;RIGHT ANGLE BRACKET;Pe;0;ON;;;;;Y;CLOSING ANGLE BRACKET;;;; +300A;LEFT DOUBLE ANGLE BRACKET;Ps;0;ON;;;;;Y;OPENING DOUBLE ANGLE BRACKET;;;; +300B;RIGHT DOUBLE ANGLE BRACKET;Pe;0;ON;;;;;Y;CLOSING DOUBLE ANGLE BRACKET;;;; +300C;LEFT CORNER BRACKET;Ps;0;ON;;;;;Y;OPENING CORNER BRACKET;;;; +300D;RIGHT CORNER BRACKET;Pe;0;ON;;;;;Y;CLOSING CORNER BRACKET;;;; +300E;LEFT WHITE CORNER BRACKET;Ps;0;ON;;;;;Y;OPENING WHITE CORNER BRACKET;;;; +300F;RIGHT WHITE CORNER BRACKET;Pe;0;ON;;;;;Y;CLOSING WHITE CORNER BRACKET;;;; +3010;LEFT BLACK LENTICULAR BRACKET;Ps;0;ON;;;;;Y;OPENING BLACK LENTICULAR BRACKET;;;; +3011;RIGHT BLACK LENTICULAR BRACKET;Pe;0;ON;;;;;Y;CLOSING BLACK LENTICULAR BRACKET;;;; +3012;POSTAL MARK;So;0;ON;;;;;N;;;;; +3013;GETA MARK;So;0;ON;;;;;N;;;;; +3014;LEFT TORTOISE SHELL BRACKET;Ps;0;ON;;;;;Y;OPENING TORTOISE SHELL BRACKET;;;; +3015;RIGHT TORTOISE SHELL BRACKET;Pe;0;ON;;;;;Y;CLOSING TORTOISE SHELL BRACKET;;;; +3016;LEFT WHITE LENTICULAR BRACKET;Ps;0;ON;;;;;Y;OPENING WHITE LENTICULAR BRACKET;;;; +3017;RIGHT WHITE LENTICULAR BRACKET;Pe;0;ON;;;;;Y;CLOSING WHITE LENTICULAR BRACKET;;;; +3018;LEFT WHITE TORTOISE SHELL BRACKET;Ps;0;ON;;;;;Y;OPENING WHITE TORTOISE SHELL BRACKET;;;; +3019;RIGHT WHITE TORTOISE SHELL BRACKET;Pe;0;ON;;;;;Y;CLOSING WHITE TORTOISE SHELL BRACKET;;;; +301A;LEFT WHITE SQUARE BRACKET;Ps;0;ON;;;;;Y;OPENING WHITE SQUARE BRACKET;;;; +301B;RIGHT WHITE SQUARE BRACKET;Pe;0;ON;;;;;Y;CLOSING WHITE SQUARE BRACKET;;;; +301C;WAVE DASH;Pd;0;ON;;;;;N;;;;; +301D;REVERSED DOUBLE PRIME QUOTATION MARK;Ps;0;ON;;;;;N;;;;; +301E;DOUBLE PRIME QUOTATION MARK;Pe;0;ON;;;;;N;;;;; +301F;LOW DOUBLE PRIME QUOTATION MARK;Pe;0;ON;;;;;N;;;;; +3020;POSTAL MARK FACE;So;0;ON;;;;;N;;;;; +3021;HANGZHOU NUMERAL ONE;Nl;0;L;;;;1;N;;;;; +3022;HANGZHOU NUMERAL TWO;Nl;0;L;;;;2;N;;;;; +3023;HANGZHOU NUMERAL THREE;Nl;0;L;;;;3;N;;;;; +3024;HANGZHOU NUMERAL FOUR;Nl;0;L;;;;4;N;;;;; +3025;HANGZHOU NUMERAL FIVE;Nl;0;L;;;;5;N;;;;; +3026;HANGZHOU NUMERAL SIX;Nl;0;L;;;;6;N;;;;; +3027;HANGZHOU NUMERAL SEVEN;Nl;0;L;;;;7;N;;;;; +3028;HANGZHOU NUMERAL EIGHT;Nl;0;L;;;;8;N;;;;; +3029;HANGZHOU NUMERAL NINE;Nl;0;L;;;;9;N;;;;; +302A;IDEOGRAPHIC LEVEL TONE MARK;Mn;218;NSM;;;;;N;;;;; +302B;IDEOGRAPHIC RISING TONE MARK;Mn;228;NSM;;;;;N;;;;; +302C;IDEOGRAPHIC DEPARTING TONE MARK;Mn;232;NSM;;;;;N;;;;; +302D;IDEOGRAPHIC ENTERING TONE MARK;Mn;222;NSM;;;;;N;;;;; +302E;HANGUL SINGLE DOT TONE MARK;Mc;224;L;;;;;N;;;;; +302F;HANGUL DOUBLE DOT TONE MARK;Mc;224;L;;;;;N;;;;; +3030;WAVY DASH;Pd;0;ON;;;;;N;;;;; +3031;VERTICAL KANA REPEAT MARK;Lm;0;L;;;;;N;;;;; +3032;VERTICAL KANA REPEAT WITH VOICED SOUND MARK;Lm;0;L;;;;;N;;;;; +3033;VERTICAL KANA REPEAT MARK UPPER HALF;Lm;0;L;;;;;N;;;;; +3034;VERTICAL KANA REPEAT WITH VOICED SOUND MARK UPPER HALF;Lm;0;L;;;;;N;;;;; +3035;VERTICAL KANA REPEAT MARK LOWER HALF;Lm;0;L;;;;;N;;;;; +3036;CIRCLED POSTAL MARK;So;0;ON; 3012;;;;N;;;;; +3037;IDEOGRAPHIC TELEGRAPH LINE FEED SEPARATOR SYMBOL;So;0;ON;;;;;N;;;;; +3038;HANGZHOU NUMERAL TEN;Nl;0;L; 5341;;;10;N;;;;; +3039;HANGZHOU NUMERAL TWENTY;Nl;0;L; 5344;;;20;N;;;;; +303A;HANGZHOU NUMERAL THIRTY;Nl;0;L; 5345;;;30;N;;;;; +303B;VERTICAL IDEOGRAPHIC ITERATION MARK;Lm;0;L;;;;;N;;;;; +303C;MASU MARK;Lo;0;L;;;;;N;;;;; +303D;PART ALTERNATION MARK;Po;0;ON;;;;;N;;;;; +303E;IDEOGRAPHIC VARIATION INDICATOR;So;0;ON;;;;;N;;;;; +303F;IDEOGRAPHIC HALF FILL SPACE;So;0;ON;;;;;N;;;;; +3041;HIRAGANA LETTER SMALL A;Lo;0;L;;;;;N;;;;; +3042;HIRAGANA LETTER A;Lo;0;L;;;;;N;;;;; +3043;HIRAGANA LETTER SMALL I;Lo;0;L;;;;;N;;;;; +3044;HIRAGANA LETTER I;Lo;0;L;;;;;N;;;;; +3045;HIRAGANA LETTER SMALL U;Lo;0;L;;;;;N;;;;; +3046;HIRAGANA LETTER U;Lo;0;L;;;;;N;;;;; +3047;HIRAGANA LETTER SMALL E;Lo;0;L;;;;;N;;;;; +3048;HIRAGANA LETTER E;Lo;0;L;;;;;N;;;;; +3049;HIRAGANA LETTER SMALL O;Lo;0;L;;;;;N;;;;; +304A;HIRAGANA LETTER O;Lo;0;L;;;;;N;;;;; +304B;HIRAGANA LETTER KA;Lo;0;L;;;;;N;;;;; +304C;HIRAGANA LETTER GA;Lo;0;L;304B 3099;;;;N;;;;; +304D;HIRAGANA LETTER KI;Lo;0;L;;;;;N;;;;; +304E;HIRAGANA LETTER GI;Lo;0;L;304D 3099;;;;N;;;;; +304F;HIRAGANA LETTER KU;Lo;0;L;;;;;N;;;;; +3050;HIRAGANA LETTER GU;Lo;0;L;304F 3099;;;;N;;;;; +3051;HIRAGANA LETTER KE;Lo;0;L;;;;;N;;;;; +3052;HIRAGANA LETTER GE;Lo;0;L;3051 3099;;;;N;;;;; +3053;HIRAGANA LETTER KO;Lo;0;L;;;;;N;;;;; +3054;HIRAGANA LETTER GO;Lo;0;L;3053 3099;;;;N;;;;; +3055;HIRAGANA LETTER SA;Lo;0;L;;;;;N;;;;; +3056;HIRAGANA LETTER ZA;Lo;0;L;3055 3099;;;;N;;;;; +3057;HIRAGANA LETTER SI;Lo;0;L;;;;;N;;;;; +3058;HIRAGANA LETTER ZI;Lo;0;L;3057 3099;;;;N;;;;; +3059;HIRAGANA LETTER SU;Lo;0;L;;;;;N;;;;; +305A;HIRAGANA LETTER ZU;Lo;0;L;3059 3099;;;;N;;;;; +305B;HIRAGANA LETTER SE;Lo;0;L;;;;;N;;;;; +305C;HIRAGANA LETTER ZE;Lo;0;L;305B 3099;;;;N;;;;; +305D;HIRAGANA LETTER SO;Lo;0;L;;;;;N;;;;; +305E;HIRAGANA LETTER ZO;Lo;0;L;305D 3099;;;;N;;;;; +305F;HIRAGANA LETTER TA;Lo;0;L;;;;;N;;;;; +3060;HIRAGANA LETTER DA;Lo;0;L;305F 3099;;;;N;;;;; +3061;HIRAGANA LETTER TI;Lo;0;L;;;;;N;;;;; +3062;HIRAGANA LETTER DI;Lo;0;L;3061 3099;;;;N;;;;; +3063;HIRAGANA LETTER SMALL TU;Lo;0;L;;;;;N;;;;; +3064;HIRAGANA LETTER TU;Lo;0;L;;;;;N;;;;; +3065;HIRAGANA LETTER DU;Lo;0;L;3064 3099;;;;N;;;;; +3066;HIRAGANA LETTER TE;Lo;0;L;;;;;N;;;;; +3067;HIRAGANA LETTER DE;Lo;0;L;3066 3099;;;;N;;;;; +3068;HIRAGANA LETTER TO;Lo;0;L;;;;;N;;;;; +3069;HIRAGANA LETTER DO;Lo;0;L;3068 3099;;;;N;;;;; +306A;HIRAGANA LETTER NA;Lo;0;L;;;;;N;;;;; +306B;HIRAGANA LETTER NI;Lo;0;L;;;;;N;;;;; +306C;HIRAGANA LETTER NU;Lo;0;L;;;;;N;;;;; +306D;HIRAGANA LETTER NE;Lo;0;L;;;;;N;;;;; +306E;HIRAGANA LETTER NO;Lo;0;L;;;;;N;;;;; +306F;HIRAGANA LETTER HA;Lo;0;L;;;;;N;;;;; +3070;HIRAGANA LETTER BA;Lo;0;L;306F 3099;;;;N;;;;; +3071;HIRAGANA LETTER PA;Lo;0;L;306F 309A;;;;N;;;;; +3072;HIRAGANA LETTER HI;Lo;0;L;;;;;N;;;;; +3073;HIRAGANA LETTER BI;Lo;0;L;3072 3099;;;;N;;;;; +3074;HIRAGANA LETTER PI;Lo;0;L;3072 309A;;;;N;;;;; +3075;HIRAGANA LETTER HU;Lo;0;L;;;;;N;;;;; +3076;HIRAGANA LETTER BU;Lo;0;L;3075 3099;;;;N;;;;; +3077;HIRAGANA LETTER PU;Lo;0;L;3075 309A;;;;N;;;;; +3078;HIRAGANA LETTER HE;Lo;0;L;;;;;N;;;;; +3079;HIRAGANA LETTER BE;Lo;0;L;3078 3099;;;;N;;;;; +307A;HIRAGANA LETTER PE;Lo;0;L;3078 309A;;;;N;;;;; +307B;HIRAGANA LETTER HO;Lo;0;L;;;;;N;;;;; +307C;HIRAGANA LETTER BO;Lo;0;L;307B 3099;;;;N;;;;; +307D;HIRAGANA LETTER PO;Lo;0;L;307B 309A;;;;N;;;;; +307E;HIRAGANA LETTER MA;Lo;0;L;;;;;N;;;;; +307F;HIRAGANA LETTER MI;Lo;0;L;;;;;N;;;;; +3080;HIRAGANA LETTER MU;Lo;0;L;;;;;N;;;;; +3081;HIRAGANA LETTER ME;Lo;0;L;;;;;N;;;;; +3082;HIRAGANA LETTER MO;Lo;0;L;;;;;N;;;;; +3083;HIRAGANA LETTER SMALL YA;Lo;0;L;;;;;N;;;;; +3084;HIRAGANA LETTER YA;Lo;0;L;;;;;N;;;;; +3085;HIRAGANA LETTER SMALL YU;Lo;0;L;;;;;N;;;;; +3086;HIRAGANA LETTER YU;Lo;0;L;;;;;N;;;;; +3087;HIRAGANA LETTER SMALL YO;Lo;0;L;;;;;N;;;;; +3088;HIRAGANA LETTER YO;Lo;0;L;;;;;N;;;;; +3089;HIRAGANA LETTER RA;Lo;0;L;;;;;N;;;;; +308A;HIRAGANA LETTER RI;Lo;0;L;;;;;N;;;;; +308B;HIRAGANA LETTER RU;Lo;0;L;;;;;N;;;;; +308C;HIRAGANA LETTER RE;Lo;0;L;;;;;N;;;;; +308D;HIRAGANA LETTER RO;Lo;0;L;;;;;N;;;;; +308E;HIRAGANA LETTER SMALL WA;Lo;0;L;;;;;N;;;;; +308F;HIRAGANA LETTER WA;Lo;0;L;;;;;N;;;;; +3090;HIRAGANA LETTER WI;Lo;0;L;;;;;N;;;;; +3091;HIRAGANA LETTER WE;Lo;0;L;;;;;N;;;;; +3092;HIRAGANA LETTER WO;Lo;0;L;;;;;N;;;;; +3093;HIRAGANA LETTER N;Lo;0;L;;;;;N;;;;; +3094;HIRAGANA LETTER VU;Lo;0;L;3046 3099;;;;N;;;;; +3095;HIRAGANA LETTER SMALL KA;Lo;0;L;;;;;N;;;;; +3096;HIRAGANA LETTER SMALL KE;Lo;0;L;;;;;N;;;;; +3099;COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK;Mn;8;NSM;;;;;N;NON-SPACING KATAKANA-HIRAGANA VOICED SOUND MARK;;;; +309A;COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK;Mn;8;NSM;;;;;N;NON-SPACING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK;;;; +309B;KATAKANA-HIRAGANA VOICED SOUND MARK;Sk;0;ON; 0020 3099;;;;N;;;;; +309C;KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK;Sk;0;ON; 0020 309A;;;;N;;;;; +309D;HIRAGANA ITERATION MARK;Lm;0;L;;;;;N;;;;; +309E;HIRAGANA VOICED ITERATION MARK;Lm;0;L;309D 3099;;;;N;;;;; +309F;HIRAGANA DIGRAPH YORI;Lo;0;L; 3088 308A;;;;N;;;;; +30A0;KATAKANA-HIRAGANA DOUBLE HYPHEN;Pd;0;ON;;;;;N;;;;; +30A1;KATAKANA LETTER SMALL A;Lo;0;L;;;;;N;;;;; +30A2;KATAKANA LETTER A;Lo;0;L;;;;;N;;;;; +30A3;KATAKANA LETTER SMALL I;Lo;0;L;;;;;N;;;;; +30A4;KATAKANA LETTER I;Lo;0;L;;;;;N;;;;; +30A5;KATAKANA LETTER SMALL U;Lo;0;L;;;;;N;;;;; +30A6;KATAKANA LETTER U;Lo;0;L;;;;;N;;;;; +30A7;KATAKANA LETTER SMALL E;Lo;0;L;;;;;N;;;;; +30A8;KATAKANA LETTER E;Lo;0;L;;;;;N;;;;; +30A9;KATAKANA LETTER SMALL O;Lo;0;L;;;;;N;;;;; +30AA;KATAKANA LETTER O;Lo;0;L;;;;;N;;;;; +30AB;KATAKANA LETTER KA;Lo;0;L;;;;;N;;;;; +30AC;KATAKANA LETTER GA;Lo;0;L;30AB 3099;;;;N;;;;; +30AD;KATAKANA LETTER KI;Lo;0;L;;;;;N;;;;; +30AE;KATAKANA LETTER GI;Lo;0;L;30AD 3099;;;;N;;;;; +30AF;KATAKANA LETTER KU;Lo;0;L;;;;;N;;;;; +30B0;KATAKANA LETTER GU;Lo;0;L;30AF 3099;;;;N;;;;; +30B1;KATAKANA LETTER KE;Lo;0;L;;;;;N;;;;; +30B2;KATAKANA LETTER GE;Lo;0;L;30B1 3099;;;;N;;;;; +30B3;KATAKANA LETTER KO;Lo;0;L;;;;;N;;;;; +30B4;KATAKANA LETTER GO;Lo;0;L;30B3 3099;;;;N;;;;; +30B5;KATAKANA LETTER SA;Lo;0;L;;;;;N;;;;; +30B6;KATAKANA LETTER ZA;Lo;0;L;30B5 3099;;;;N;;;;; +30B7;KATAKANA LETTER SI;Lo;0;L;;;;;N;;;;; +30B8;KATAKANA LETTER ZI;Lo;0;L;30B7 3099;;;;N;;;;; +30B9;KATAKANA LETTER SU;Lo;0;L;;;;;N;;;;; +30BA;KATAKANA LETTER ZU;Lo;0;L;30B9 3099;;;;N;;;;; +30BB;KATAKANA LETTER SE;Lo;0;L;;;;;N;;;;; +30BC;KATAKANA LETTER ZE;Lo;0;L;30BB 3099;;;;N;;;;; +30BD;KATAKANA LETTER SO;Lo;0;L;;;;;N;;;;; +30BE;KATAKANA LETTER ZO;Lo;0;L;30BD 3099;;;;N;;;;; +30BF;KATAKANA LETTER TA;Lo;0;L;;;;;N;;;;; +30C0;KATAKANA LETTER DA;Lo;0;L;30BF 3099;;;;N;;;;; +30C1;KATAKANA LETTER TI;Lo;0;L;;;;;N;;;;; +30C2;KATAKANA LETTER DI;Lo;0;L;30C1 3099;;;;N;;;;; +30C3;KATAKANA LETTER SMALL TU;Lo;0;L;;;;;N;;;;; +30C4;KATAKANA LETTER TU;Lo;0;L;;;;;N;;;;; +30C5;KATAKANA LETTER DU;Lo;0;L;30C4 3099;;;;N;;;;; +30C6;KATAKANA LETTER TE;Lo;0;L;;;;;N;;;;; +30C7;KATAKANA LETTER DE;Lo;0;L;30C6 3099;;;;N;;;;; +30C8;KATAKANA LETTER TO;Lo;0;L;;;;;N;;;;; +30C9;KATAKANA LETTER DO;Lo;0;L;30C8 3099;;;;N;;;;; +30CA;KATAKANA LETTER NA;Lo;0;L;;;;;N;;;;; +30CB;KATAKANA LETTER NI;Lo;0;L;;;;;N;;;;; +30CC;KATAKANA LETTER NU;Lo;0;L;;;;;N;;;;; +30CD;KATAKANA LETTER NE;Lo;0;L;;;;;N;;;;; +30CE;KATAKANA LETTER NO;Lo;0;L;;;;;N;;;;; +30CF;KATAKANA LETTER HA;Lo;0;L;;;;;N;;;;; +30D0;KATAKANA LETTER BA;Lo;0;L;30CF 3099;;;;N;;;;; +30D1;KATAKANA LETTER PA;Lo;0;L;30CF 309A;;;;N;;;;; +30D2;KATAKANA LETTER HI;Lo;0;L;;;;;N;;;;; +30D3;KATAKANA LETTER BI;Lo;0;L;30D2 3099;;;;N;;;;; +30D4;KATAKANA LETTER PI;Lo;0;L;30D2 309A;;;;N;;;;; +30D5;KATAKANA LETTER HU;Lo;0;L;;;;;N;;;;; +30D6;KATAKANA LETTER BU;Lo;0;L;30D5 3099;;;;N;;;;; +30D7;KATAKANA LETTER PU;Lo;0;L;30D5 309A;;;;N;;;;; +30D8;KATAKANA LETTER HE;Lo;0;L;;;;;N;;;;; +30D9;KATAKANA LETTER BE;Lo;0;L;30D8 3099;;;;N;;;;; +30DA;KATAKANA LETTER PE;Lo;0;L;30D8 309A;;;;N;;;;; +30DB;KATAKANA LETTER HO;Lo;0;L;;;;;N;;;;; +30DC;KATAKANA LETTER BO;Lo;0;L;30DB 3099;;;;N;;;;; +30DD;KATAKANA LETTER PO;Lo;0;L;30DB 309A;;;;N;;;;; +30DE;KATAKANA LETTER MA;Lo;0;L;;;;;N;;;;; +30DF;KATAKANA LETTER MI;Lo;0;L;;;;;N;;;;; +30E0;KATAKANA LETTER MU;Lo;0;L;;;;;N;;;;; +30E1;KATAKANA LETTER ME;Lo;0;L;;;;;N;;;;; +30E2;KATAKANA LETTER MO;Lo;0;L;;;;;N;;;;; +30E3;KATAKANA LETTER SMALL YA;Lo;0;L;;;;;N;;;;; +30E4;KATAKANA LETTER YA;Lo;0;L;;;;;N;;;;; +30E5;KATAKANA LETTER SMALL YU;Lo;0;L;;;;;N;;;;; +30E6;KATAKANA LETTER YU;Lo;0;L;;;;;N;;;;; +30E7;KATAKANA LETTER SMALL YO;Lo;0;L;;;;;N;;;;; +30E8;KATAKANA LETTER YO;Lo;0;L;;;;;N;;;;; +30E9;KATAKANA LETTER RA;Lo;0;L;;;;;N;;;;; +30EA;KATAKANA LETTER RI;Lo;0;L;;;;;N;;;;; +30EB;KATAKANA LETTER RU;Lo;0;L;;;;;N;;;;; +30EC;KATAKANA LETTER RE;Lo;0;L;;;;;N;;;;; +30ED;KATAKANA LETTER RO;Lo;0;L;;;;;N;;;;; +30EE;KATAKANA LETTER SMALL WA;Lo;0;L;;;;;N;;;;; +30EF;KATAKANA LETTER WA;Lo;0;L;;;;;N;;;;; +30F0;KATAKANA LETTER WI;Lo;0;L;;;;;N;;;;; +30F1;KATAKANA LETTER WE;Lo;0;L;;;;;N;;;;; +30F2;KATAKANA LETTER WO;Lo;0;L;;;;;N;;;;; +30F3;KATAKANA LETTER N;Lo;0;L;;;;;N;;;;; +30F4;KATAKANA LETTER VU;Lo;0;L;30A6 3099;;;;N;;;;; +30F5;KATAKANA LETTER SMALL KA;Lo;0;L;;;;;N;;;;; +30F6;KATAKANA LETTER SMALL KE;Lo;0;L;;;;;N;;;;; +30F7;KATAKANA LETTER VA;Lo;0;L;30EF 3099;;;;N;;;;; +30F8;KATAKANA LETTER VI;Lo;0;L;30F0 3099;;;;N;;;;; +30F9;KATAKANA LETTER VE;Lo;0;L;30F1 3099;;;;N;;;;; +30FA;KATAKANA LETTER VO;Lo;0;L;30F2 3099;;;;N;;;;; +30FB;KATAKANA MIDDLE DOT;Po;0;ON;;;;;N;;;;; +30FC;KATAKANA-HIRAGANA PROLONGED SOUND MARK;Lm;0;L;;;;;N;;;;; +30FD;KATAKANA ITERATION MARK;Lm;0;L;;;;;N;;;;; +30FE;KATAKANA VOICED ITERATION MARK;Lm;0;L;30FD 3099;;;;N;;;;; +30FF;KATAKANA DIGRAPH KOTO;Lo;0;L; 30B3 30C8;;;;N;;;;; +3105;BOPOMOFO LETTER B;Lo;0;L;;;;;N;;;;; +3106;BOPOMOFO LETTER P;Lo;0;L;;;;;N;;;;; +3107;BOPOMOFO LETTER M;Lo;0;L;;;;;N;;;;; +3108;BOPOMOFO LETTER F;Lo;0;L;;;;;N;;;;; +3109;BOPOMOFO LETTER D;Lo;0;L;;;;;N;;;;; +310A;BOPOMOFO LETTER T;Lo;0;L;;;;;N;;;;; +310B;BOPOMOFO LETTER N;Lo;0;L;;;;;N;;;;; +310C;BOPOMOFO LETTER L;Lo;0;L;;;;;N;;;;; +310D;BOPOMOFO LETTER G;Lo;0;L;;;;;N;;;;; +310E;BOPOMOFO LETTER K;Lo;0;L;;;;;N;;;;; +310F;BOPOMOFO LETTER H;Lo;0;L;;;;;N;;;;; +3110;BOPOMOFO LETTER J;Lo;0;L;;;;;N;;;;; +3111;BOPOMOFO LETTER Q;Lo;0;L;;;;;N;;;;; +3112;BOPOMOFO LETTER X;Lo;0;L;;;;;N;;;;; +3113;BOPOMOFO LETTER ZH;Lo;0;L;;;;;N;;;;; +3114;BOPOMOFO LETTER CH;Lo;0;L;;;;;N;;;;; +3115;BOPOMOFO LETTER SH;Lo;0;L;;;;;N;;;;; +3116;BOPOMOFO LETTER R;Lo;0;L;;;;;N;;;;; +3117;BOPOMOFO LETTER Z;Lo;0;L;;;;;N;;;;; +3118;BOPOMOFO LETTER C;Lo;0;L;;;;;N;;;;; +3119;BOPOMOFO LETTER S;Lo;0;L;;;;;N;;;;; +311A;BOPOMOFO LETTER A;Lo;0;L;;;;;N;;;;; +311B;BOPOMOFO LETTER O;Lo;0;L;;;;;N;;;;; +311C;BOPOMOFO LETTER E;Lo;0;L;;;;;N;;;;; +311D;BOPOMOFO LETTER EH;Lo;0;L;;;;;N;;;;; +311E;BOPOMOFO LETTER AI;Lo;0;L;;;;;N;;;;; +311F;BOPOMOFO LETTER EI;Lo;0;L;;;;;N;;;;; +3120;BOPOMOFO LETTER AU;Lo;0;L;;;;;N;;;;; +3121;BOPOMOFO LETTER OU;Lo;0;L;;;;;N;;;;; +3122;BOPOMOFO LETTER AN;Lo;0;L;;;;;N;;;;; +3123;BOPOMOFO LETTER EN;Lo;0;L;;;;;N;;;;; +3124;BOPOMOFO LETTER ANG;Lo;0;L;;;;;N;;;;; +3125;BOPOMOFO LETTER ENG;Lo;0;L;;;;;N;;;;; +3126;BOPOMOFO LETTER ER;Lo;0;L;;;;;N;;;;; +3127;BOPOMOFO LETTER I;Lo;0;L;;;;;N;;;;; +3128;BOPOMOFO LETTER U;Lo;0;L;;;;;N;;;;; +3129;BOPOMOFO LETTER IU;Lo;0;L;;;;;N;;;;; +312A;BOPOMOFO LETTER V;Lo;0;L;;;;;N;;;;; +312B;BOPOMOFO LETTER NG;Lo;0;L;;;;;N;;;;; +312C;BOPOMOFO LETTER GN;Lo;0;L;;;;;N;;;;; +312D;BOPOMOFO LETTER IH;Lo;0;L;;;;;N;;;;; +312E;BOPOMOFO LETTER O WITH DOT ABOVE;Lo;0;L;;;;;N;;;;; +312F;BOPOMOFO LETTER NN;Lo;0;L;;;;;N;;;;; +3131;HANGUL LETTER KIYEOK;Lo;0;L; 1100;;;;N;HANGUL LETTER GIYEOG;;;; +3132;HANGUL LETTER SSANGKIYEOK;Lo;0;L; 1101;;;;N;HANGUL LETTER SSANG GIYEOG;;;; +3133;HANGUL LETTER KIYEOK-SIOS;Lo;0;L; 11AA;;;;N;HANGUL LETTER GIYEOG SIOS;;;; +3134;HANGUL LETTER NIEUN;Lo;0;L; 1102;;;;N;;;;; +3135;HANGUL LETTER NIEUN-CIEUC;Lo;0;L; 11AC;;;;N;HANGUL LETTER NIEUN JIEUJ;;;; +3136;HANGUL LETTER NIEUN-HIEUH;Lo;0;L; 11AD;;;;N;HANGUL LETTER NIEUN HIEUH;;;; +3137;HANGUL LETTER TIKEUT;Lo;0;L; 1103;;;;N;HANGUL LETTER DIGEUD;;;; +3138;HANGUL LETTER SSANGTIKEUT;Lo;0;L; 1104;;;;N;HANGUL LETTER SSANG DIGEUD;;;; +3139;HANGUL LETTER RIEUL;Lo;0;L; 1105;;;;N;HANGUL LETTER LIEUL;;;; +313A;HANGUL LETTER RIEUL-KIYEOK;Lo;0;L; 11B0;;;;N;HANGUL LETTER LIEUL GIYEOG;;;; +313B;HANGUL LETTER RIEUL-MIEUM;Lo;0;L; 11B1;;;;N;HANGUL LETTER LIEUL MIEUM;;;; +313C;HANGUL LETTER RIEUL-PIEUP;Lo;0;L; 11B2;;;;N;HANGUL LETTER LIEUL BIEUB;;;; +313D;HANGUL LETTER RIEUL-SIOS;Lo;0;L; 11B3;;;;N;HANGUL LETTER LIEUL SIOS;;;; +313E;HANGUL LETTER RIEUL-THIEUTH;Lo;0;L; 11B4;;;;N;HANGUL LETTER LIEUL TIEUT;;;; +313F;HANGUL LETTER RIEUL-PHIEUPH;Lo;0;L; 11B5;;;;N;HANGUL LETTER LIEUL PIEUP;;;; +3140;HANGUL LETTER RIEUL-HIEUH;Lo;0;L; 111A;;;;N;HANGUL LETTER LIEUL HIEUH;;;; +3141;HANGUL LETTER MIEUM;Lo;0;L; 1106;;;;N;;;;; +3142;HANGUL LETTER PIEUP;Lo;0;L; 1107;;;;N;HANGUL LETTER BIEUB;;;; +3143;HANGUL LETTER SSANGPIEUP;Lo;0;L; 1108;;;;N;HANGUL LETTER SSANG BIEUB;;;; +3144;HANGUL LETTER PIEUP-SIOS;Lo;0;L; 1121;;;;N;HANGUL LETTER BIEUB SIOS;;;; +3145;HANGUL LETTER SIOS;Lo;0;L; 1109;;;;N;;;;; +3146;HANGUL LETTER SSANGSIOS;Lo;0;L; 110A;;;;N;HANGUL LETTER SSANG SIOS;;;; +3147;HANGUL LETTER IEUNG;Lo;0;L; 110B;;;;N;;;;; +3148;HANGUL LETTER CIEUC;Lo;0;L; 110C;;;;N;HANGUL LETTER JIEUJ;;;; +3149;HANGUL LETTER SSANGCIEUC;Lo;0;L; 110D;;;;N;HANGUL LETTER SSANG JIEUJ;;;; +314A;HANGUL LETTER CHIEUCH;Lo;0;L; 110E;;;;N;HANGUL LETTER CIEUC;;;; +314B;HANGUL LETTER KHIEUKH;Lo;0;L; 110F;;;;N;HANGUL LETTER KIYEOK;;;; +314C;HANGUL LETTER THIEUTH;Lo;0;L; 1110;;;;N;HANGUL LETTER TIEUT;;;; +314D;HANGUL LETTER PHIEUPH;Lo;0;L; 1111;;;;N;HANGUL LETTER PIEUP;;;; +314E;HANGUL LETTER HIEUH;Lo;0;L; 1112;;;;N;;;;; +314F;HANGUL LETTER A;Lo;0;L; 1161;;;;N;;;;; +3150;HANGUL LETTER AE;Lo;0;L; 1162;;;;N;;;;; +3151;HANGUL LETTER YA;Lo;0;L; 1163;;;;N;;;;; +3152;HANGUL LETTER YAE;Lo;0;L; 1164;;;;N;;;;; +3153;HANGUL LETTER EO;Lo;0;L; 1165;;;;N;;;;; +3154;HANGUL LETTER E;Lo;0;L; 1166;;;;N;;;;; +3155;HANGUL LETTER YEO;Lo;0;L; 1167;;;;N;;;;; +3156;HANGUL LETTER YE;Lo;0;L; 1168;;;;N;;;;; +3157;HANGUL LETTER O;Lo;0;L; 1169;;;;N;;;;; +3158;HANGUL LETTER WA;Lo;0;L; 116A;;;;N;;;;; +3159;HANGUL LETTER WAE;Lo;0;L; 116B;;;;N;;;;; +315A;HANGUL LETTER OE;Lo;0;L; 116C;;;;N;;;;; +315B;HANGUL LETTER YO;Lo;0;L; 116D;;;;N;;;;; +315C;HANGUL LETTER U;Lo;0;L; 116E;;;;N;;;;; +315D;HANGUL LETTER WEO;Lo;0;L; 116F;;;;N;;;;; +315E;HANGUL LETTER WE;Lo;0;L; 1170;;;;N;;;;; +315F;HANGUL LETTER WI;Lo;0;L; 1171;;;;N;;;;; +3160;HANGUL LETTER YU;Lo;0;L; 1172;;;;N;;;;; +3161;HANGUL LETTER EU;Lo;0;L; 1173;;;;N;;;;; +3162;HANGUL LETTER YI;Lo;0;L; 1174;;;;N;;;;; +3163;HANGUL LETTER I;Lo;0;L; 1175;;;;N;;;;; +3164;HANGUL FILLER;Lo;0;L; 1160;;;;N;HANGUL CAE OM;;;; +3165;HANGUL LETTER SSANGNIEUN;Lo;0;L; 1114;;;;N;HANGUL LETTER SSANG NIEUN;;;; +3166;HANGUL LETTER NIEUN-TIKEUT;Lo;0;L; 1115;;;;N;HANGUL LETTER NIEUN DIGEUD;;;; +3167;HANGUL LETTER NIEUN-SIOS;Lo;0;L; 11C7;;;;N;HANGUL LETTER NIEUN SIOS;;;; +3168;HANGUL LETTER NIEUN-PANSIOS;Lo;0;L; 11C8;;;;N;HANGUL LETTER NIEUN BAN CHI EUM;;;; +3169;HANGUL LETTER RIEUL-KIYEOK-SIOS;Lo;0;L; 11CC;;;;N;HANGUL LETTER LIEUL GIYEOG SIOS;;;; +316A;HANGUL LETTER RIEUL-TIKEUT;Lo;0;L; 11CE;;;;N;HANGUL LETTER LIEUL DIGEUD;;;; +316B;HANGUL LETTER RIEUL-PIEUP-SIOS;Lo;0;L; 11D3;;;;N;HANGUL LETTER LIEUL BIEUB SIOS;;;; +316C;HANGUL LETTER RIEUL-PANSIOS;Lo;0;L; 11D7;;;;N;HANGUL LETTER LIEUL BAN CHI EUM;;;; +316D;HANGUL LETTER RIEUL-YEORINHIEUH;Lo;0;L; 11D9;;;;N;HANGUL LETTER LIEUL YEOLIN HIEUH;;;; +316E;HANGUL LETTER MIEUM-PIEUP;Lo;0;L; 111C;;;;N;HANGUL LETTER MIEUM BIEUB;;;; +316F;HANGUL LETTER MIEUM-SIOS;Lo;0;L; 11DD;;;;N;HANGUL LETTER MIEUM SIOS;;;; +3170;HANGUL LETTER MIEUM-PANSIOS;Lo;0;L; 11DF;;;;N;HANGUL LETTER BIEUB BAN CHI EUM;;;; +3171;HANGUL LETTER KAPYEOUNMIEUM;Lo;0;L; 111D;;;;N;HANGUL LETTER MIEUM SUN GYEONG EUM;;;; +3172;HANGUL LETTER PIEUP-KIYEOK;Lo;0;L; 111E;;;;N;HANGUL LETTER BIEUB GIYEOG;;;; +3173;HANGUL LETTER PIEUP-TIKEUT;Lo;0;L; 1120;;;;N;HANGUL LETTER BIEUB DIGEUD;;;; +3174;HANGUL LETTER PIEUP-SIOS-KIYEOK;Lo;0;L; 1122;;;;N;HANGUL LETTER BIEUB SIOS GIYEOG;;;; +3175;HANGUL LETTER PIEUP-SIOS-TIKEUT;Lo;0;L; 1123;;;;N;HANGUL LETTER BIEUB SIOS DIGEUD;;;; +3176;HANGUL LETTER PIEUP-CIEUC;Lo;0;L; 1127;;;;N;HANGUL LETTER BIEUB JIEUJ;;;; +3177;HANGUL LETTER PIEUP-THIEUTH;Lo;0;L; 1129;;;;N;HANGUL LETTER BIEUB TIEUT;;;; +3178;HANGUL LETTER KAPYEOUNPIEUP;Lo;0;L; 112B;;;;N;HANGUL LETTER BIEUB SUN GYEONG EUM;;;; +3179;HANGUL LETTER KAPYEOUNSSANGPIEUP;Lo;0;L; 112C;;;;N;HANGUL LETTER SSANG BIEUB SUN GYEONG EUM;;;; +317A;HANGUL LETTER SIOS-KIYEOK;Lo;0;L; 112D;;;;N;HANGUL LETTER SIOS GIYEOG;;;; +317B;HANGUL LETTER SIOS-NIEUN;Lo;0;L; 112E;;;;N;HANGUL LETTER SIOS NIEUN;;;; +317C;HANGUL LETTER SIOS-TIKEUT;Lo;0;L; 112F;;;;N;HANGUL LETTER SIOS DIGEUD;;;; +317D;HANGUL LETTER SIOS-PIEUP;Lo;0;L; 1132;;;;N;HANGUL LETTER SIOS BIEUB;;;; +317E;HANGUL LETTER SIOS-CIEUC;Lo;0;L; 1136;;;;N;HANGUL LETTER SIOS JIEUJ;;;; +317F;HANGUL LETTER PANSIOS;Lo;0;L; 1140;;;;N;HANGUL LETTER BAN CHI EUM;;;; +3180;HANGUL LETTER SSANGIEUNG;Lo;0;L; 1147;;;;N;HANGUL LETTER SSANG IEUNG;;;; +3181;HANGUL LETTER YESIEUNG;Lo;0;L; 114C;;;;N;HANGUL LETTER NGIEUNG;;;; +3182;HANGUL LETTER YESIEUNG-SIOS;Lo;0;L; 11F1;;;;N;HANGUL LETTER NGIEUNG SIOS;;;; +3183;HANGUL LETTER YESIEUNG-PANSIOS;Lo;0;L; 11F2;;;;N;HANGUL LETTER NGIEUNG BAN CHI EUM;;;; +3184;HANGUL LETTER KAPYEOUNPHIEUPH;Lo;0;L; 1157;;;;N;HANGUL LETTER PIEUP SUN GYEONG EUM;;;; +3185;HANGUL LETTER SSANGHIEUH;Lo;0;L; 1158;;;;N;HANGUL LETTER SSANG HIEUH;;;; +3186;HANGUL LETTER YEORINHIEUH;Lo;0;L; 1159;;;;N;HANGUL LETTER YEOLIN HIEUH;;;; +3187;HANGUL LETTER YO-YA;Lo;0;L; 1184;;;;N;HANGUL LETTER YOYA;;;; +3188;HANGUL LETTER YO-YAE;Lo;0;L; 1185;;;;N;HANGUL LETTER YOYAE;;;; +3189;HANGUL LETTER YO-I;Lo;0;L; 1188;;;;N;HANGUL LETTER YOI;;;; +318A;HANGUL LETTER YU-YEO;Lo;0;L; 1191;;;;N;HANGUL LETTER YUYEO;;;; +318B;HANGUL LETTER YU-YE;Lo;0;L; 1192;;;;N;HANGUL LETTER YUYE;;;; +318C;HANGUL LETTER YU-I;Lo;0;L; 1194;;;;N;HANGUL LETTER YUI;;;; +318D;HANGUL LETTER ARAEA;Lo;0;L; 119E;;;;N;HANGUL LETTER ALAE A;;;; +318E;HANGUL LETTER ARAEAE;Lo;0;L; 11A1;;;;N;HANGUL LETTER ALAE AE;;;; +3190;IDEOGRAPHIC ANNOTATION LINKING MARK;So;0;L;;;;;N;KANBUN TATETEN;;;; +3191;IDEOGRAPHIC ANNOTATION REVERSE MARK;So;0;L;;;;;N;KAERITEN RE;;;; +3192;IDEOGRAPHIC ANNOTATION ONE MARK;No;0;L; 4E00;;;1;N;KAERITEN ITI;;;; +3193;IDEOGRAPHIC ANNOTATION TWO MARK;No;0;L; 4E8C;;;2;N;KAERITEN NI;;;; +3194;IDEOGRAPHIC ANNOTATION THREE MARK;No;0;L; 4E09;;;3;N;KAERITEN SAN;;;; +3195;IDEOGRAPHIC ANNOTATION FOUR MARK;No;0;L; 56DB;;;4;N;KAERITEN SI;;;; +3196;IDEOGRAPHIC ANNOTATION TOP MARK;So;0;L; 4E0A;;;;N;KAERITEN ZYOU;;;; +3197;IDEOGRAPHIC ANNOTATION MIDDLE MARK;So;0;L; 4E2D;;;;N;KAERITEN TYUU;;;; +3198;IDEOGRAPHIC ANNOTATION BOTTOM MARK;So;0;L; 4E0B;;;;N;KAERITEN GE;;;; +3199;IDEOGRAPHIC ANNOTATION FIRST MARK;So;0;L; 7532;;;;N;KAERITEN KOU;;;; +319A;IDEOGRAPHIC ANNOTATION SECOND MARK;So;0;L; 4E59;;;;N;KAERITEN OTU;;;; +319B;IDEOGRAPHIC ANNOTATION THIRD MARK;So;0;L; 4E19;;;;N;KAERITEN HEI;;;; +319C;IDEOGRAPHIC ANNOTATION FOURTH MARK;So;0;L; 4E01;;;;N;KAERITEN TEI;;;; +319D;IDEOGRAPHIC ANNOTATION HEAVEN MARK;So;0;L; 5929;;;;N;KAERITEN TEN;;;; +319E;IDEOGRAPHIC ANNOTATION EARTH MARK;So;0;L; 5730;;;;N;KAERITEN TI;;;; +319F;IDEOGRAPHIC ANNOTATION MAN MARK;So;0;L; 4EBA;;;;N;KAERITEN ZIN;;;; +31A0;BOPOMOFO LETTER BU;Lo;0;L;;;;;N;;;;; +31A1;BOPOMOFO LETTER ZI;Lo;0;L;;;;;N;;;;; +31A2;BOPOMOFO LETTER JI;Lo;0;L;;;;;N;;;;; +31A3;BOPOMOFO LETTER GU;Lo;0;L;;;;;N;;;;; +31A4;BOPOMOFO LETTER EE;Lo;0;L;;;;;N;;;;; +31A5;BOPOMOFO LETTER ENN;Lo;0;L;;;;;N;;;;; +31A6;BOPOMOFO LETTER OO;Lo;0;L;;;;;N;;;;; +31A7;BOPOMOFO LETTER ONN;Lo;0;L;;;;;N;;;;; +31A8;BOPOMOFO LETTER IR;Lo;0;L;;;;;N;;;;; +31A9;BOPOMOFO LETTER ANN;Lo;0;L;;;;;N;;;;; +31AA;BOPOMOFO LETTER INN;Lo;0;L;;;;;N;;;;; +31AB;BOPOMOFO LETTER UNN;Lo;0;L;;;;;N;;;;; +31AC;BOPOMOFO LETTER IM;Lo;0;L;;;;;N;;;;; +31AD;BOPOMOFO LETTER NGG;Lo;0;L;;;;;N;;;;; +31AE;BOPOMOFO LETTER AINN;Lo;0;L;;;;;N;;;;; +31AF;BOPOMOFO LETTER AUNN;Lo;0;L;;;;;N;;;;; +31B0;BOPOMOFO LETTER AM;Lo;0;L;;;;;N;;;;; +31B1;BOPOMOFO LETTER OM;Lo;0;L;;;;;N;;;;; +31B2;BOPOMOFO LETTER ONG;Lo;0;L;;;;;N;;;;; +31B3;BOPOMOFO LETTER INNN;Lo;0;L;;;;;N;;;;; +31B4;BOPOMOFO FINAL LETTER P;Lo;0;L;;;;;N;;;;; +31B5;BOPOMOFO FINAL LETTER T;Lo;0;L;;;;;N;;;;; +31B6;BOPOMOFO FINAL LETTER K;Lo;0;L;;;;;N;;;;; +31B7;BOPOMOFO FINAL LETTER H;Lo;0;L;;;;;N;;;;; +31B8;BOPOMOFO LETTER GH;Lo;0;L;;;;;N;;;;; +31B9;BOPOMOFO LETTER LH;Lo;0;L;;;;;N;;;;; +31BA;BOPOMOFO LETTER ZY;Lo;0;L;;;;;N;;;;; +31BB;BOPOMOFO FINAL LETTER G;Lo;0;L;;;;;N;;;;; +31BC;BOPOMOFO LETTER GW;Lo;0;L;;;;;N;;;;; +31BD;BOPOMOFO LETTER KW;Lo;0;L;;;;;N;;;;; +31BE;BOPOMOFO LETTER OE;Lo;0;L;;;;;N;;;;; +31BF;BOPOMOFO LETTER AH;Lo;0;L;;;;;N;;;;; +31C0;CJK STROKE T;So;0;ON;;;;;N;;;;; +31C1;CJK STROKE WG;So;0;ON;;;;;N;;;;; +31C2;CJK STROKE XG;So;0;ON;;;;;N;;;;; +31C3;CJK STROKE BXG;So;0;ON;;;;;N;;;;; +31C4;CJK STROKE SW;So;0;ON;;;;;N;;;;; +31C5;CJK STROKE HZZ;So;0;ON;;;;;N;;;;; +31C6;CJK STROKE HZG;So;0;ON;;;;;N;;;;; +31C7;CJK STROKE HP;So;0;ON;;;;;N;;;;; +31C8;CJK STROKE HZWG;So;0;ON;;;;;N;;;;; +31C9;CJK STROKE SZWG;So;0;ON;;;;;N;;;;; +31CA;CJK STROKE HZT;So;0;ON;;;;;N;;;;; +31CB;CJK STROKE HZZP;So;0;ON;;;;;N;;;;; +31CC;CJK STROKE HPWG;So;0;ON;;;;;N;;;;; +31CD;CJK STROKE HZW;So;0;ON;;;;;N;;;;; +31CE;CJK STROKE HZZZ;So;0;ON;;;;;N;;;;; +31CF;CJK STROKE N;So;0;ON;;;;;N;;;;; +31D0;CJK STROKE H;So;0;ON;;;;;N;;;;; +31D1;CJK STROKE S;So;0;ON;;;;;N;;;;; +31D2;CJK STROKE P;So;0;ON;;;;;N;;;;; +31D3;CJK STROKE SP;So;0;ON;;;;;N;;;;; +31D4;CJK STROKE D;So;0;ON;;;;;N;;;;; +31D5;CJK STROKE HZ;So;0;ON;;;;;N;;;;; +31D6;CJK STROKE HG;So;0;ON;;;;;N;;;;; +31D7;CJK STROKE SZ;So;0;ON;;;;;N;;;;; +31D8;CJK STROKE SWZ;So;0;ON;;;;;N;;;;; +31D9;CJK STROKE ST;So;0;ON;;;;;N;;;;; +31DA;CJK STROKE SG;So;0;ON;;;;;N;;;;; +31DB;CJK STROKE PD;So;0;ON;;;;;N;;;;; +31DC;CJK STROKE PZ;So;0;ON;;;;;N;;;;; +31DD;CJK STROKE TN;So;0;ON;;;;;N;;;;; +31DE;CJK STROKE SZZ;So;0;ON;;;;;N;;;;; +31DF;CJK STROKE SWG;So;0;ON;;;;;N;;;;; +31E0;CJK STROKE HXWG;So;0;ON;;;;;N;;;;; +31E1;CJK STROKE HZZZG;So;0;ON;;;;;N;;;;; +31E2;CJK STROKE PG;So;0;ON;;;;;N;;;;; +31E3;CJK STROKE Q;So;0;ON;;;;;N;;;;; +31E4;CJK STROKE HXG;So;0;ON;;;;;N;;;;; +31E5;CJK STROKE SZP;So;0;ON;;;;;N;;;;; +31EF;IDEOGRAPHIC DESCRIPTION CHARACTER SUBTRACTION;So;0;ON;;;;;N;;;;; +31F0;KATAKANA LETTER SMALL KU;Lo;0;L;;;;;N;;;;; +31F1;KATAKANA LETTER SMALL SI;Lo;0;L;;;;;N;;;;; +31F2;KATAKANA LETTER SMALL SU;Lo;0;L;;;;;N;;;;; +31F3;KATAKANA LETTER SMALL TO;Lo;0;L;;;;;N;;;;; +31F4;KATAKANA LETTER SMALL NU;Lo;0;L;;;;;N;;;;; +31F5;KATAKANA LETTER SMALL HA;Lo;0;L;;;;;N;;;;; +31F6;KATAKANA LETTER SMALL HI;Lo;0;L;;;;;N;;;;; +31F7;KATAKANA LETTER SMALL HU;Lo;0;L;;;;;N;;;;; +31F8;KATAKANA LETTER SMALL HE;Lo;0;L;;;;;N;;;;; +31F9;KATAKANA LETTER SMALL HO;Lo;0;L;;;;;N;;;;; +31FA;KATAKANA LETTER SMALL MU;Lo;0;L;;;;;N;;;;; +31FB;KATAKANA LETTER SMALL RA;Lo;0;L;;;;;N;;;;; +31FC;KATAKANA LETTER SMALL RI;Lo;0;L;;;;;N;;;;; +31FD;KATAKANA LETTER SMALL RU;Lo;0;L;;;;;N;;;;; +31FE;KATAKANA LETTER SMALL RE;Lo;0;L;;;;;N;;;;; +31FF;KATAKANA LETTER SMALL RO;Lo;0;L;;;;;N;;;;; +3200;PARENTHESIZED HANGUL KIYEOK;So;0;L; 0028 1100 0029;;;;N;PARENTHESIZED HANGUL GIYEOG;;;; +3201;PARENTHESIZED HANGUL NIEUN;So;0;L; 0028 1102 0029;;;;N;;;;; +3202;PARENTHESIZED HANGUL TIKEUT;So;0;L; 0028 1103 0029;;;;N;PARENTHESIZED HANGUL DIGEUD;;;; +3203;PARENTHESIZED HANGUL RIEUL;So;0;L; 0028 1105 0029;;;;N;PARENTHESIZED HANGUL LIEUL;;;; +3204;PARENTHESIZED HANGUL MIEUM;So;0;L; 0028 1106 0029;;;;N;;;;; +3205;PARENTHESIZED HANGUL PIEUP;So;0;L; 0028 1107 0029;;;;N;PARENTHESIZED HANGUL BIEUB;;;; +3206;PARENTHESIZED HANGUL SIOS;So;0;L; 0028 1109 0029;;;;N;;;;; +3207;PARENTHESIZED HANGUL IEUNG;So;0;L; 0028 110B 0029;;;;N;;;;; +3208;PARENTHESIZED HANGUL CIEUC;So;0;L; 0028 110C 0029;;;;N;PARENTHESIZED HANGUL JIEUJ;;;; +3209;PARENTHESIZED HANGUL CHIEUCH;So;0;L; 0028 110E 0029;;;;N;PARENTHESIZED HANGUL CIEUC;;;; +320A;PARENTHESIZED HANGUL KHIEUKH;So;0;L; 0028 110F 0029;;;;N;PARENTHESIZED HANGUL KIYEOK;;;; +320B;PARENTHESIZED HANGUL THIEUTH;So;0;L; 0028 1110 0029;;;;N;PARENTHESIZED HANGUL TIEUT;;;; +320C;PARENTHESIZED HANGUL PHIEUPH;So;0;L; 0028 1111 0029;;;;N;PARENTHESIZED HANGUL PIEUP;;;; +320D;PARENTHESIZED HANGUL HIEUH;So;0;L; 0028 1112 0029;;;;N;;;;; +320E;PARENTHESIZED HANGUL KIYEOK A;So;0;L; 0028 1100 1161 0029;;;;N;PARENTHESIZED HANGUL GA;;;; +320F;PARENTHESIZED HANGUL NIEUN A;So;0;L; 0028 1102 1161 0029;;;;N;PARENTHESIZED HANGUL NA;;;; +3210;PARENTHESIZED HANGUL TIKEUT A;So;0;L; 0028 1103 1161 0029;;;;N;PARENTHESIZED HANGUL DA;;;; +3211;PARENTHESIZED HANGUL RIEUL A;So;0;L; 0028 1105 1161 0029;;;;N;PARENTHESIZED HANGUL LA;;;; +3212;PARENTHESIZED HANGUL MIEUM A;So;0;L; 0028 1106 1161 0029;;;;N;PARENTHESIZED HANGUL MA;;;; +3213;PARENTHESIZED HANGUL PIEUP A;So;0;L; 0028 1107 1161 0029;;;;N;PARENTHESIZED HANGUL BA;;;; +3214;PARENTHESIZED HANGUL SIOS A;So;0;L; 0028 1109 1161 0029;;;;N;PARENTHESIZED HANGUL SA;;;; +3215;PARENTHESIZED HANGUL IEUNG A;So;0;L; 0028 110B 1161 0029;;;;N;PARENTHESIZED HANGUL A;;;; +3216;PARENTHESIZED HANGUL CIEUC A;So;0;L; 0028 110C 1161 0029;;;;N;PARENTHESIZED HANGUL JA;;;; +3217;PARENTHESIZED HANGUL CHIEUCH A;So;0;L; 0028 110E 1161 0029;;;;N;PARENTHESIZED HANGUL CA;;;; +3218;PARENTHESIZED HANGUL KHIEUKH A;So;0;L; 0028 110F 1161 0029;;;;N;PARENTHESIZED HANGUL KA;;;; +3219;PARENTHESIZED HANGUL THIEUTH A;So;0;L; 0028 1110 1161 0029;;;;N;PARENTHESIZED HANGUL TA;;;; +321A;PARENTHESIZED HANGUL PHIEUPH A;So;0;L; 0028 1111 1161 0029;;;;N;PARENTHESIZED HANGUL PA;;;; +321B;PARENTHESIZED HANGUL HIEUH A;So;0;L; 0028 1112 1161 0029;;;;N;PARENTHESIZED HANGUL HA;;;; +321C;PARENTHESIZED HANGUL CIEUC U;So;0;L; 0028 110C 116E 0029;;;;N;PARENTHESIZED HANGUL JU;;;; +321D;PARENTHESIZED KOREAN CHARACTER OJEON;So;0;ON; 0028 110B 1169 110C 1165 11AB 0029;;;;N;;;;; +321E;PARENTHESIZED KOREAN CHARACTER O HU;So;0;ON; 0028 110B 1169 1112 116E 0029;;;;N;;;;; +3220;PARENTHESIZED IDEOGRAPH ONE;No;0;L; 0028 4E00 0029;;;1;N;;;;; +3221;PARENTHESIZED IDEOGRAPH TWO;No;0;L; 0028 4E8C 0029;;;2;N;;;;; +3222;PARENTHESIZED IDEOGRAPH THREE;No;0;L; 0028 4E09 0029;;;3;N;;;;; +3223;PARENTHESIZED IDEOGRAPH FOUR;No;0;L; 0028 56DB 0029;;;4;N;;;;; +3224;PARENTHESIZED IDEOGRAPH FIVE;No;0;L; 0028 4E94 0029;;;5;N;;;;; +3225;PARENTHESIZED IDEOGRAPH SIX;No;0;L; 0028 516D 0029;;;6;N;;;;; +3226;PARENTHESIZED IDEOGRAPH SEVEN;No;0;L; 0028 4E03 0029;;;7;N;;;;; +3227;PARENTHESIZED IDEOGRAPH EIGHT;No;0;L; 0028 516B 0029;;;8;N;;;;; +3228;PARENTHESIZED IDEOGRAPH NINE;No;0;L; 0028 4E5D 0029;;;9;N;;;;; +3229;PARENTHESIZED IDEOGRAPH TEN;No;0;L; 0028 5341 0029;;;10;N;;;;; +322A;PARENTHESIZED IDEOGRAPH MOON;So;0;L; 0028 6708 0029;;;;N;;;;; +322B;PARENTHESIZED IDEOGRAPH FIRE;So;0;L; 0028 706B 0029;;;;N;;;;; +322C;PARENTHESIZED IDEOGRAPH WATER;So;0;L; 0028 6C34 0029;;;;N;;;;; +322D;PARENTHESIZED IDEOGRAPH WOOD;So;0;L; 0028 6728 0029;;;;N;;;;; +322E;PARENTHESIZED IDEOGRAPH METAL;So;0;L; 0028 91D1 0029;;;;N;;;;; +322F;PARENTHESIZED IDEOGRAPH EARTH;So;0;L; 0028 571F 0029;;;;N;;;;; +3230;PARENTHESIZED IDEOGRAPH SUN;So;0;L; 0028 65E5 0029;;;;N;;;;; +3231;PARENTHESIZED IDEOGRAPH STOCK;So;0;L; 0028 682A 0029;;;;N;;;;; +3232;PARENTHESIZED IDEOGRAPH HAVE;So;0;L; 0028 6709 0029;;;;N;;;;; +3233;PARENTHESIZED IDEOGRAPH SOCIETY;So;0;L; 0028 793E 0029;;;;N;;;;; +3234;PARENTHESIZED IDEOGRAPH NAME;So;0;L; 0028 540D 0029;;;;N;;;;; +3235;PARENTHESIZED IDEOGRAPH SPECIAL;So;0;L; 0028 7279 0029;;;;N;;;;; +3236;PARENTHESIZED IDEOGRAPH FINANCIAL;So;0;L; 0028 8CA1 0029;;;;N;;;;; +3237;PARENTHESIZED IDEOGRAPH CONGRATULATION;So;0;L; 0028 795D 0029;;;;N;;;;; +3238;PARENTHESIZED IDEOGRAPH LABOR;So;0;L; 0028 52B4 0029;;;;N;;;;; +3239;PARENTHESIZED IDEOGRAPH REPRESENT;So;0;L; 0028 4EE3 0029;;;;N;;;;; +323A;PARENTHESIZED IDEOGRAPH CALL;So;0;L; 0028 547C 0029;;;;N;;;;; +323B;PARENTHESIZED IDEOGRAPH STUDY;So;0;L; 0028 5B66 0029;;;;N;;;;; +323C;PARENTHESIZED IDEOGRAPH SUPERVISE;So;0;L; 0028 76E3 0029;;;;N;;;;; +323D;PARENTHESIZED IDEOGRAPH ENTERPRISE;So;0;L; 0028 4F01 0029;;;;N;;;;; +323E;PARENTHESIZED IDEOGRAPH RESOURCE;So;0;L; 0028 8CC7 0029;;;;N;;;;; +323F;PARENTHESIZED IDEOGRAPH ALLIANCE;So;0;L; 0028 5354 0029;;;;N;;;;; +3240;PARENTHESIZED IDEOGRAPH FESTIVAL;So;0;L; 0028 796D 0029;;;;N;;;;; +3241;PARENTHESIZED IDEOGRAPH REST;So;0;L; 0028 4F11 0029;;;;N;;;;; +3242;PARENTHESIZED IDEOGRAPH SELF;So;0;L; 0028 81EA 0029;;;;N;;;;; +3243;PARENTHESIZED IDEOGRAPH REACH;So;0;L; 0028 81F3 0029;;;;N;;;;; +3244;CIRCLED IDEOGRAPH QUESTION;So;0;L; 554F;;;;N;;;;; +3245;CIRCLED IDEOGRAPH KINDERGARTEN;So;0;L; 5E7C;;;;N;;;;; +3246;CIRCLED IDEOGRAPH SCHOOL;So;0;L; 6587;;;;N;;;;; +3247;CIRCLED IDEOGRAPH KOTO;So;0;L; 7B8F;;;;N;;;;; +3248;CIRCLED NUMBER TEN ON BLACK SQUARE;No;0;L;;;;10;N;;;;; +3249;CIRCLED NUMBER TWENTY ON BLACK SQUARE;No;0;L;;;;20;N;;;;; +324A;CIRCLED NUMBER THIRTY ON BLACK SQUARE;No;0;L;;;;30;N;;;;; +324B;CIRCLED NUMBER FORTY ON BLACK SQUARE;No;0;L;;;;40;N;;;;; +324C;CIRCLED NUMBER FIFTY ON BLACK SQUARE;No;0;L;;;;50;N;;;;; +324D;CIRCLED NUMBER SIXTY ON BLACK SQUARE;No;0;L;;;;60;N;;;;; +324E;CIRCLED NUMBER SEVENTY ON BLACK SQUARE;No;0;L;;;;70;N;;;;; +324F;CIRCLED NUMBER EIGHTY ON BLACK SQUARE;No;0;L;;;;80;N;;;;; +3250;PARTNERSHIP SIGN;So;0;ON; 0050 0054 0045;;;;N;;;;; +3251;CIRCLED NUMBER TWENTY ONE;No;0;ON; 0032 0031;;;21;N;;;;; +3252;CIRCLED NUMBER TWENTY TWO;No;0;ON; 0032 0032;;;22;N;;;;; +3253;CIRCLED NUMBER TWENTY THREE;No;0;ON; 0032 0033;;;23;N;;;;; +3254;CIRCLED NUMBER TWENTY FOUR;No;0;ON; 0032 0034;;;24;N;;;;; +3255;CIRCLED NUMBER TWENTY FIVE;No;0;ON; 0032 0035;;;25;N;;;;; +3256;CIRCLED NUMBER TWENTY SIX;No;0;ON; 0032 0036;;;26;N;;;;; +3257;CIRCLED NUMBER TWENTY SEVEN;No;0;ON; 0032 0037;;;27;N;;;;; +3258;CIRCLED NUMBER TWENTY EIGHT;No;0;ON; 0032 0038;;;28;N;;;;; +3259;CIRCLED NUMBER TWENTY NINE;No;0;ON; 0032 0039;;;29;N;;;;; +325A;CIRCLED NUMBER THIRTY;No;0;ON; 0033 0030;;;30;N;;;;; +325B;CIRCLED NUMBER THIRTY ONE;No;0;ON; 0033 0031;;;31;N;;;;; +325C;CIRCLED NUMBER THIRTY TWO;No;0;ON; 0033 0032;;;32;N;;;;; +325D;CIRCLED NUMBER THIRTY THREE;No;0;ON; 0033 0033;;;33;N;;;;; +325E;CIRCLED NUMBER THIRTY FOUR;No;0;ON; 0033 0034;;;34;N;;;;; +325F;CIRCLED NUMBER THIRTY FIVE;No;0;ON; 0033 0035;;;35;N;;;;; +3260;CIRCLED HANGUL KIYEOK;So;0;L; 1100;;;;N;CIRCLED HANGUL GIYEOG;;;; +3261;CIRCLED HANGUL NIEUN;So;0;L; 1102;;;;N;;;;; +3262;CIRCLED HANGUL TIKEUT;So;0;L; 1103;;;;N;CIRCLED HANGUL DIGEUD;;;; +3263;CIRCLED HANGUL RIEUL;So;0;L; 1105;;;;N;CIRCLED HANGUL LIEUL;;;; +3264;CIRCLED HANGUL MIEUM;So;0;L; 1106;;;;N;;;;; +3265;CIRCLED HANGUL PIEUP;So;0;L; 1107;;;;N;CIRCLED HANGUL BIEUB;;;; +3266;CIRCLED HANGUL SIOS;So;0;L; 1109;;;;N;;;;; +3267;CIRCLED HANGUL IEUNG;So;0;L; 110B;;;;N;;;;; +3268;CIRCLED HANGUL CIEUC;So;0;L; 110C;;;;N;CIRCLED HANGUL JIEUJ;;;; +3269;CIRCLED HANGUL CHIEUCH;So;0;L; 110E;;;;N;CIRCLED HANGUL CIEUC;;;; +326A;CIRCLED HANGUL KHIEUKH;So;0;L; 110F;;;;N;CIRCLED HANGUL KIYEOK;;;; +326B;CIRCLED HANGUL THIEUTH;So;0;L; 1110;;;;N;CIRCLED HANGUL TIEUT;;;; +326C;CIRCLED HANGUL PHIEUPH;So;0;L; 1111;;;;N;CIRCLED HANGUL PIEUP;;;; +326D;CIRCLED HANGUL HIEUH;So;0;L; 1112;;;;N;;;;; +326E;CIRCLED HANGUL KIYEOK A;So;0;L; 1100 1161;;;;N;CIRCLED HANGUL GA;;;; +326F;CIRCLED HANGUL NIEUN A;So;0;L; 1102 1161;;;;N;CIRCLED HANGUL NA;;;; +3270;CIRCLED HANGUL TIKEUT A;So;0;L; 1103 1161;;;;N;CIRCLED HANGUL DA;;;; +3271;CIRCLED HANGUL RIEUL A;So;0;L; 1105 1161;;;;N;CIRCLED HANGUL LA;;;; +3272;CIRCLED HANGUL MIEUM A;So;0;L; 1106 1161;;;;N;CIRCLED HANGUL MA;;;; +3273;CIRCLED HANGUL PIEUP A;So;0;L; 1107 1161;;;;N;CIRCLED HANGUL BA;;;; +3274;CIRCLED HANGUL SIOS A;So;0;L; 1109 1161;;;;N;CIRCLED HANGUL SA;;;; +3275;CIRCLED HANGUL IEUNG A;So;0;L; 110B 1161;;;;N;CIRCLED HANGUL A;;;; +3276;CIRCLED HANGUL CIEUC A;So;0;L; 110C 1161;;;;N;CIRCLED HANGUL JA;;;; +3277;CIRCLED HANGUL CHIEUCH A;So;0;L; 110E 1161;;;;N;CIRCLED HANGUL CA;;;; +3278;CIRCLED HANGUL KHIEUKH A;So;0;L; 110F 1161;;;;N;CIRCLED HANGUL KA;;;; +3279;CIRCLED HANGUL THIEUTH A;So;0;L; 1110 1161;;;;N;CIRCLED HANGUL TA;;;; +327A;CIRCLED HANGUL PHIEUPH A;So;0;L; 1111 1161;;;;N;CIRCLED HANGUL PA;;;; +327B;CIRCLED HANGUL HIEUH A;So;0;L; 1112 1161;;;;N;CIRCLED HANGUL HA;;;; +327C;CIRCLED KOREAN CHARACTER CHAMKO;So;0;ON; 110E 1161 11B7 1100 1169;;;;N;;;;; +327D;CIRCLED KOREAN CHARACTER JUEUI;So;0;ON; 110C 116E 110B 1174;;;;N;;;;; +327E;CIRCLED HANGUL IEUNG U;So;0;ON; 110B 116E;;;;N;;;;; +327F;KOREAN STANDARD SYMBOL;So;0;L;;;;;N;;;;; +3280;CIRCLED IDEOGRAPH ONE;No;0;L; 4E00;;;1;N;;;;; +3281;CIRCLED IDEOGRAPH TWO;No;0;L; 4E8C;;;2;N;;;;; +3282;CIRCLED IDEOGRAPH THREE;No;0;L; 4E09;;;3;N;;;;; +3283;CIRCLED IDEOGRAPH FOUR;No;0;L; 56DB;;;4;N;;;;; +3284;CIRCLED IDEOGRAPH FIVE;No;0;L; 4E94;;;5;N;;;;; +3285;CIRCLED IDEOGRAPH SIX;No;0;L; 516D;;;6;N;;;;; +3286;CIRCLED IDEOGRAPH SEVEN;No;0;L; 4E03;;;7;N;;;;; +3287;CIRCLED IDEOGRAPH EIGHT;No;0;L; 516B;;;8;N;;;;; +3288;CIRCLED IDEOGRAPH NINE;No;0;L; 4E5D;;;9;N;;;;; +3289;CIRCLED IDEOGRAPH TEN;No;0;L; 5341;;;10;N;;;;; +328A;CIRCLED IDEOGRAPH MOON;So;0;L; 6708;;;;N;;;;; +328B;CIRCLED IDEOGRAPH FIRE;So;0;L; 706B;;;;N;;;;; +328C;CIRCLED IDEOGRAPH WATER;So;0;L; 6C34;;;;N;;;;; +328D;CIRCLED IDEOGRAPH WOOD;So;0;L; 6728;;;;N;;;;; +328E;CIRCLED IDEOGRAPH METAL;So;0;L; 91D1;;;;N;;;;; +328F;CIRCLED IDEOGRAPH EARTH;So;0;L; 571F;;;;N;;;;; +3290;CIRCLED IDEOGRAPH SUN;So;0;L; 65E5;;;;N;;;;; +3291;CIRCLED IDEOGRAPH STOCK;So;0;L; 682A;;;;N;;;;; +3292;CIRCLED IDEOGRAPH HAVE;So;0;L; 6709;;;;N;;;;; +3293;CIRCLED IDEOGRAPH SOCIETY;So;0;L; 793E;;;;N;;;;; +3294;CIRCLED IDEOGRAPH NAME;So;0;L; 540D;;;;N;;;;; +3295;CIRCLED IDEOGRAPH SPECIAL;So;0;L; 7279;;;;N;;;;; +3296;CIRCLED IDEOGRAPH FINANCIAL;So;0;L; 8CA1;;;;N;;;;; +3297;CIRCLED IDEOGRAPH CONGRATULATION;So;0;L; 795D;;;;N;;;;; +3298;CIRCLED IDEOGRAPH LABOR;So;0;L; 52B4;;;;N;;;;; +3299;CIRCLED IDEOGRAPH SECRET;So;0;L; 79D8;;;;N;;;;; +329A;CIRCLED IDEOGRAPH MALE;So;0;L; 7537;;;;N;;;;; +329B;CIRCLED IDEOGRAPH FEMALE;So;0;L; 5973;;;;N;;;;; +329C;CIRCLED IDEOGRAPH SUITABLE;So;0;L; 9069;;;;N;;;;; +329D;CIRCLED IDEOGRAPH EXCELLENT;So;0;L; 512A;;;;N;;;;; +329E;CIRCLED IDEOGRAPH PRINT;So;0;L; 5370;;;;N;;;;; +329F;CIRCLED IDEOGRAPH ATTENTION;So;0;L; 6CE8;;;;N;;;;; +32A0;CIRCLED IDEOGRAPH ITEM;So;0;L; 9805;;;;N;;;;; +32A1;CIRCLED IDEOGRAPH REST;So;0;L; 4F11;;;;N;;;;; +32A2;CIRCLED IDEOGRAPH COPY;So;0;L; 5199;;;;N;;;;; +32A3;CIRCLED IDEOGRAPH CORRECT;So;0;L; 6B63;;;;N;;;;; +32A4;CIRCLED IDEOGRAPH HIGH;So;0;L; 4E0A;;;;N;;;;; +32A5;CIRCLED IDEOGRAPH CENTRE;So;0;L; 4E2D;;;;N;CIRCLED IDEOGRAPH CENTER;;;; +32A6;CIRCLED IDEOGRAPH LOW;So;0;L; 4E0B;;;;N;;;;; +32A7;CIRCLED IDEOGRAPH LEFT;So;0;L; 5DE6;;;;N;;;;; +32A8;CIRCLED IDEOGRAPH RIGHT;So;0;L; 53F3;;;;N;;;;; +32A9;CIRCLED IDEOGRAPH MEDICINE;So;0;L; 533B;;;;N;;;;; +32AA;CIRCLED IDEOGRAPH RELIGION;So;0;L; 5B97;;;;N;;;;; +32AB;CIRCLED IDEOGRAPH STUDY;So;0;L; 5B66;;;;N;;;;; +32AC;CIRCLED IDEOGRAPH SUPERVISE;So;0;L; 76E3;;;;N;;;;; +32AD;CIRCLED IDEOGRAPH ENTERPRISE;So;0;L; 4F01;;;;N;;;;; +32AE;CIRCLED IDEOGRAPH RESOURCE;So;0;L; 8CC7;;;;N;;;;; +32AF;CIRCLED IDEOGRAPH ALLIANCE;So;0;L; 5354;;;;N;;;;; +32B0;CIRCLED IDEOGRAPH NIGHT;So;0;L; 591C;;;;N;;;;; +32B1;CIRCLED NUMBER THIRTY SIX;No;0;ON; 0033 0036;;;36;N;;;;; +32B2;CIRCLED NUMBER THIRTY SEVEN;No;0;ON; 0033 0037;;;37;N;;;;; +32B3;CIRCLED NUMBER THIRTY EIGHT;No;0;ON; 0033 0038;;;38;N;;;;; +32B4;CIRCLED NUMBER THIRTY NINE;No;0;ON; 0033 0039;;;39;N;;;;; +32B5;CIRCLED NUMBER FORTY;No;0;ON; 0034 0030;;;40;N;;;;; +32B6;CIRCLED NUMBER FORTY ONE;No;0;ON; 0034 0031;;;41;N;;;;; +32B7;CIRCLED NUMBER FORTY TWO;No;0;ON; 0034 0032;;;42;N;;;;; +32B8;CIRCLED NUMBER FORTY THREE;No;0;ON; 0034 0033;;;43;N;;;;; +32B9;CIRCLED NUMBER FORTY FOUR;No;0;ON; 0034 0034;;;44;N;;;;; +32BA;CIRCLED NUMBER FORTY FIVE;No;0;ON; 0034 0035;;;45;N;;;;; +32BB;CIRCLED NUMBER FORTY SIX;No;0;ON; 0034 0036;;;46;N;;;;; +32BC;CIRCLED NUMBER FORTY SEVEN;No;0;ON; 0034 0037;;;47;N;;;;; +32BD;CIRCLED NUMBER FORTY EIGHT;No;0;ON; 0034 0038;;;48;N;;;;; +32BE;CIRCLED NUMBER FORTY NINE;No;0;ON; 0034 0039;;;49;N;;;;; +32BF;CIRCLED NUMBER FIFTY;No;0;ON; 0035 0030;;;50;N;;;;; +32C0;IDEOGRAPHIC TELEGRAPH SYMBOL FOR JANUARY;So;0;L; 0031 6708;;;;N;;;;; +32C1;IDEOGRAPHIC TELEGRAPH SYMBOL FOR FEBRUARY;So;0;L; 0032 6708;;;;N;;;;; +32C2;IDEOGRAPHIC TELEGRAPH SYMBOL FOR MARCH;So;0;L; 0033 6708;;;;N;;;;; +32C3;IDEOGRAPHIC TELEGRAPH SYMBOL FOR APRIL;So;0;L; 0034 6708;;;;N;;;;; +32C4;IDEOGRAPHIC TELEGRAPH SYMBOL FOR MAY;So;0;L; 0035 6708;;;;N;;;;; +32C5;IDEOGRAPHIC TELEGRAPH SYMBOL FOR JUNE;So;0;L; 0036 6708;;;;N;;;;; +32C6;IDEOGRAPHIC TELEGRAPH SYMBOL FOR JULY;So;0;L; 0037 6708;;;;N;;;;; +32C7;IDEOGRAPHIC TELEGRAPH SYMBOL FOR AUGUST;So;0;L; 0038 6708;;;;N;;;;; +32C8;IDEOGRAPHIC TELEGRAPH SYMBOL FOR SEPTEMBER;So;0;L; 0039 6708;;;;N;;;;; +32C9;IDEOGRAPHIC TELEGRAPH SYMBOL FOR OCTOBER;So;0;L; 0031 0030 6708;;;;N;;;;; +32CA;IDEOGRAPHIC TELEGRAPH SYMBOL FOR NOVEMBER;So;0;L; 0031 0031 6708;;;;N;;;;; +32CB;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DECEMBER;So;0;L; 0031 0032 6708;;;;N;;;;; +32CC;SQUARE HG;So;0;ON; 0048 0067;;;;N;;;;; +32CD;SQUARE ERG;So;0;ON; 0065 0072 0067;;;;N;;;;; +32CE;SQUARE EV;So;0;ON; 0065 0056;;;;N;;;;; +32CF;LIMITED LIABILITY SIGN;So;0;ON; 004C 0054 0044;;;;N;;;;; +32D0;CIRCLED KATAKANA A;So;0;L; 30A2;;;;N;;;;; +32D1;CIRCLED KATAKANA I;So;0;L; 30A4;;;;N;;;;; +32D2;CIRCLED KATAKANA U;So;0;L; 30A6;;;;N;;;;; +32D3;CIRCLED KATAKANA E;So;0;L; 30A8;;;;N;;;;; +32D4;CIRCLED KATAKANA O;So;0;L; 30AA;;;;N;;;;; +32D5;CIRCLED KATAKANA KA;So;0;L; 30AB;;;;N;;;;; +32D6;CIRCLED KATAKANA KI;So;0;L; 30AD;;;;N;;;;; +32D7;CIRCLED KATAKANA KU;So;0;L; 30AF;;;;N;;;;; +32D8;CIRCLED KATAKANA KE;So;0;L; 30B1;;;;N;;;;; +32D9;CIRCLED KATAKANA KO;So;0;L; 30B3;;;;N;;;;; +32DA;CIRCLED KATAKANA SA;So;0;L; 30B5;;;;N;;;;; +32DB;CIRCLED KATAKANA SI;So;0;L; 30B7;;;;N;;;;; +32DC;CIRCLED KATAKANA SU;So;0;L; 30B9;;;;N;;;;; +32DD;CIRCLED KATAKANA SE;So;0;L; 30BB;;;;N;;;;; +32DE;CIRCLED KATAKANA SO;So;0;L; 30BD;;;;N;;;;; +32DF;CIRCLED KATAKANA TA;So;0;L; 30BF;;;;N;;;;; +32E0;CIRCLED KATAKANA TI;So;0;L; 30C1;;;;N;;;;; +32E1;CIRCLED KATAKANA TU;So;0;L; 30C4;;;;N;;;;; +32E2;CIRCLED KATAKANA TE;So;0;L; 30C6;;;;N;;;;; +32E3;CIRCLED KATAKANA TO;So;0;L; 30C8;;;;N;;;;; +32E4;CIRCLED KATAKANA NA;So;0;L; 30CA;;;;N;;;;; +32E5;CIRCLED KATAKANA NI;So;0;L; 30CB;;;;N;;;;; +32E6;CIRCLED KATAKANA NU;So;0;L; 30CC;;;;N;;;;; +32E7;CIRCLED KATAKANA NE;So;0;L; 30CD;;;;N;;;;; +32E8;CIRCLED KATAKANA NO;So;0;L; 30CE;;;;N;;;;; +32E9;CIRCLED KATAKANA HA;So;0;L; 30CF;;;;N;;;;; +32EA;CIRCLED KATAKANA HI;So;0;L; 30D2;;;;N;;;;; +32EB;CIRCLED KATAKANA HU;So;0;L; 30D5;;;;N;;;;; +32EC;CIRCLED KATAKANA HE;So;0;L; 30D8;;;;N;;;;; +32ED;CIRCLED KATAKANA HO;So;0;L; 30DB;;;;N;;;;; +32EE;CIRCLED KATAKANA MA;So;0;L; 30DE;;;;N;;;;; +32EF;CIRCLED KATAKANA MI;So;0;L; 30DF;;;;N;;;;; +32F0;CIRCLED KATAKANA MU;So;0;L; 30E0;;;;N;;;;; +32F1;CIRCLED KATAKANA ME;So;0;L; 30E1;;;;N;;;;; +32F2;CIRCLED KATAKANA MO;So;0;L; 30E2;;;;N;;;;; +32F3;CIRCLED KATAKANA YA;So;0;L; 30E4;;;;N;;;;; +32F4;CIRCLED KATAKANA YU;So;0;L; 30E6;;;;N;;;;; +32F5;CIRCLED KATAKANA YO;So;0;L; 30E8;;;;N;;;;; +32F6;CIRCLED KATAKANA RA;So;0;L; 30E9;;;;N;;;;; +32F7;CIRCLED KATAKANA RI;So;0;L; 30EA;;;;N;;;;; +32F8;CIRCLED KATAKANA RU;So;0;L; 30EB;;;;N;;;;; +32F9;CIRCLED KATAKANA RE;So;0;L; 30EC;;;;N;;;;; +32FA;CIRCLED KATAKANA RO;So;0;L; 30ED;;;;N;;;;; +32FB;CIRCLED KATAKANA WA;So;0;L; 30EF;;;;N;;;;; +32FC;CIRCLED KATAKANA WI;So;0;L; 30F0;;;;N;;;;; +32FD;CIRCLED KATAKANA WE;So;0;L; 30F1;;;;N;;;;; +32FE;CIRCLED KATAKANA WO;So;0;L; 30F2;;;;N;;;;; +32FF;SQUARE ERA NAME REIWA;So;0;L; 4EE4 548C;;;;N;;;;; +3300;SQUARE APAATO;So;0;L; 30A2 30D1 30FC 30C8;;;;N;SQUARED APAATO;;;; +3301;SQUARE ARUHUA;So;0;L; 30A2 30EB 30D5 30A1;;;;N;SQUARED ARUHUA;;;; +3302;SQUARE ANPEA;So;0;L; 30A2 30F3 30DA 30A2;;;;N;SQUARED ANPEA;;;; +3303;SQUARE AARU;So;0;L; 30A2 30FC 30EB;;;;N;SQUARED AARU;;;; +3304;SQUARE ININGU;So;0;L; 30A4 30CB 30F3 30B0;;;;N;SQUARED ININGU;;;; +3305;SQUARE INTI;So;0;L; 30A4 30F3 30C1;;;;N;SQUARED INTI;;;; +3306;SQUARE UON;So;0;L; 30A6 30A9 30F3;;;;N;SQUARED UON;;;; +3307;SQUARE ESUKUUDO;So;0;L; 30A8 30B9 30AF 30FC 30C9;;;;N;SQUARED ESUKUUDO;;;; +3308;SQUARE EEKAA;So;0;L; 30A8 30FC 30AB 30FC;;;;N;SQUARED EEKAA;;;; +3309;SQUARE ONSU;So;0;L; 30AA 30F3 30B9;;;;N;SQUARED ONSU;;;; +330A;SQUARE OOMU;So;0;L; 30AA 30FC 30E0;;;;N;SQUARED OOMU;;;; +330B;SQUARE KAIRI;So;0;L; 30AB 30A4 30EA;;;;N;SQUARED KAIRI;;;; +330C;SQUARE KARATTO;So;0;L; 30AB 30E9 30C3 30C8;;;;N;SQUARED KARATTO;;;; +330D;SQUARE KARORII;So;0;L; 30AB 30ED 30EA 30FC;;;;N;SQUARED KARORII;;;; +330E;SQUARE GARON;So;0;L; 30AC 30ED 30F3;;;;N;SQUARED GARON;;;; +330F;SQUARE GANMA;So;0;L; 30AC 30F3 30DE;;;;N;SQUARED GANMA;;;; +3310;SQUARE GIGA;So;0;L; 30AE 30AC;;;;N;SQUARED GIGA;;;; +3311;SQUARE GINII;So;0;L; 30AE 30CB 30FC;;;;N;SQUARED GINII;;;; +3312;SQUARE KYURII;So;0;L; 30AD 30E5 30EA 30FC;;;;N;SQUARED KYURII;;;; +3313;SQUARE GIRUDAA;So;0;L; 30AE 30EB 30C0 30FC;;;;N;SQUARED GIRUDAA;;;; +3314;SQUARE KIRO;So;0;L; 30AD 30ED;;;;N;SQUARED KIRO;;;; +3315;SQUARE KIROGURAMU;So;0;L; 30AD 30ED 30B0 30E9 30E0;;;;N;SQUARED KIROGURAMU;;;; +3316;SQUARE KIROMEETORU;So;0;L; 30AD 30ED 30E1 30FC 30C8 30EB;;;;N;SQUARED KIROMEETORU;;;; +3317;SQUARE KIROWATTO;So;0;L; 30AD 30ED 30EF 30C3 30C8;;;;N;SQUARED KIROWATTO;;;; +3318;SQUARE GURAMU;So;0;L; 30B0 30E9 30E0;;;;N;SQUARED GURAMU;;;; +3319;SQUARE GURAMUTON;So;0;L; 30B0 30E9 30E0 30C8 30F3;;;;N;SQUARED GURAMUTON;;;; +331A;SQUARE KURUZEIRO;So;0;L; 30AF 30EB 30BC 30A4 30ED;;;;N;SQUARED KURUZEIRO;;;; +331B;SQUARE KUROONE;So;0;L; 30AF 30ED 30FC 30CD;;;;N;SQUARED KUROONE;;;; +331C;SQUARE KEESU;So;0;L; 30B1 30FC 30B9;;;;N;SQUARED KEESU;;;; +331D;SQUARE KORUNA;So;0;L; 30B3 30EB 30CA;;;;N;SQUARED KORUNA;;;; +331E;SQUARE KOOPO;So;0;L; 30B3 30FC 30DD;;;;N;SQUARED KOOPO;;;; +331F;SQUARE SAIKURU;So;0;L; 30B5 30A4 30AF 30EB;;;;N;SQUARED SAIKURU;;;; +3320;SQUARE SANTIIMU;So;0;L; 30B5 30F3 30C1 30FC 30E0;;;;N;SQUARED SANTIIMU;;;; +3321;SQUARE SIRINGU;So;0;L; 30B7 30EA 30F3 30B0;;;;N;SQUARED SIRINGU;;;; +3322;SQUARE SENTI;So;0;L; 30BB 30F3 30C1;;;;N;SQUARED SENTI;;;; +3323;SQUARE SENTO;So;0;L; 30BB 30F3 30C8;;;;N;SQUARED SENTO;;;; +3324;SQUARE DAASU;So;0;L; 30C0 30FC 30B9;;;;N;SQUARED DAASU;;;; +3325;SQUARE DESI;So;0;L; 30C7 30B7;;;;N;SQUARED DESI;;;; +3326;SQUARE DORU;So;0;L; 30C9 30EB;;;;N;SQUARED DORU;;;; +3327;SQUARE TON;So;0;L; 30C8 30F3;;;;N;SQUARED TON;;;; +3328;SQUARE NANO;So;0;L; 30CA 30CE;;;;N;SQUARED NANO;;;; +3329;SQUARE NOTTO;So;0;L; 30CE 30C3 30C8;;;;N;SQUARED NOTTO;;;; +332A;SQUARE HAITU;So;0;L; 30CF 30A4 30C4;;;;N;SQUARED HAITU;;;; +332B;SQUARE PAASENTO;So;0;L; 30D1 30FC 30BB 30F3 30C8;;;;N;SQUARED PAASENTO;;;; +332C;SQUARE PAATU;So;0;L; 30D1 30FC 30C4;;;;N;SQUARED PAATU;;;; +332D;SQUARE BAARERU;So;0;L; 30D0 30FC 30EC 30EB;;;;N;SQUARED BAARERU;;;; +332E;SQUARE PIASUTORU;So;0;L; 30D4 30A2 30B9 30C8 30EB;;;;N;SQUARED PIASUTORU;;;; +332F;SQUARE PIKURU;So;0;L; 30D4 30AF 30EB;;;;N;SQUARED PIKURU;;;; +3330;SQUARE PIKO;So;0;L; 30D4 30B3;;;;N;SQUARED PIKO;;;; +3331;SQUARE BIRU;So;0;L; 30D3 30EB;;;;N;SQUARED BIRU;;;; +3332;SQUARE HUARADDO;So;0;L; 30D5 30A1 30E9 30C3 30C9;;;;N;SQUARED HUARADDO;;;; +3333;SQUARE HUIITO;So;0;L; 30D5 30A3 30FC 30C8;;;;N;SQUARED HUIITO;;;; +3334;SQUARE BUSSYERU;So;0;L; 30D6 30C3 30B7 30A7 30EB;;;;N;SQUARED BUSSYERU;;;; +3335;SQUARE HURAN;So;0;L; 30D5 30E9 30F3;;;;N;SQUARED HURAN;;;; +3336;SQUARE HEKUTAARU;So;0;L; 30D8 30AF 30BF 30FC 30EB;;;;N;SQUARED HEKUTAARU;;;; +3337;SQUARE PESO;So;0;L; 30DA 30BD;;;;N;SQUARED PESO;;;; +3338;SQUARE PENIHI;So;0;L; 30DA 30CB 30D2;;;;N;SQUARED PENIHI;;;; +3339;SQUARE HERUTU;So;0;L; 30D8 30EB 30C4;;;;N;SQUARED HERUTU;;;; +333A;SQUARE PENSU;So;0;L; 30DA 30F3 30B9;;;;N;SQUARED PENSU;;;; +333B;SQUARE PEEZI;So;0;L; 30DA 30FC 30B8;;;;N;SQUARED PEEZI;;;; +333C;SQUARE BEETA;So;0;L; 30D9 30FC 30BF;;;;N;SQUARED BEETA;;;; +333D;SQUARE POINTO;So;0;L; 30DD 30A4 30F3 30C8;;;;N;SQUARED POINTO;;;; +333E;SQUARE BORUTO;So;0;L; 30DC 30EB 30C8;;;;N;SQUARED BORUTO;;;; +333F;SQUARE HON;So;0;L; 30DB 30F3;;;;N;SQUARED HON;;;; +3340;SQUARE PONDO;So;0;L; 30DD 30F3 30C9;;;;N;SQUARED PONDO;;;; +3341;SQUARE HOORU;So;0;L; 30DB 30FC 30EB;;;;N;SQUARED HOORU;;;; +3342;SQUARE HOON;So;0;L; 30DB 30FC 30F3;;;;N;SQUARED HOON;;;; +3343;SQUARE MAIKURO;So;0;L; 30DE 30A4 30AF 30ED;;;;N;SQUARED MAIKURO;;;; +3344;SQUARE MAIRU;So;0;L; 30DE 30A4 30EB;;;;N;SQUARED MAIRU;;;; +3345;SQUARE MAHHA;So;0;L; 30DE 30C3 30CF;;;;N;SQUARED MAHHA;;;; +3346;SQUARE MARUKU;So;0;L; 30DE 30EB 30AF;;;;N;SQUARED MARUKU;;;; +3347;SQUARE MANSYON;So;0;L; 30DE 30F3 30B7 30E7 30F3;;;;N;SQUARED MANSYON;;;; +3348;SQUARE MIKURON;So;0;L; 30DF 30AF 30ED 30F3;;;;N;SQUARED MIKURON;;;; +3349;SQUARE MIRI;So;0;L; 30DF 30EA;;;;N;SQUARED MIRI;;;; +334A;SQUARE MIRIBAARU;So;0;L; 30DF 30EA 30D0 30FC 30EB;;;;N;SQUARED MIRIBAARU;;;; +334B;SQUARE MEGA;So;0;L; 30E1 30AC;;;;N;SQUARED MEGA;;;; +334C;SQUARE MEGATON;So;0;L; 30E1 30AC 30C8 30F3;;;;N;SQUARED MEGATON;;;; +334D;SQUARE MEETORU;So;0;L; 30E1 30FC 30C8 30EB;;;;N;SQUARED MEETORU;;;; +334E;SQUARE YAADO;So;0;L; 30E4 30FC 30C9;;;;N;SQUARED YAADO;;;; +334F;SQUARE YAARU;So;0;L; 30E4 30FC 30EB;;;;N;SQUARED YAARU;;;; +3350;SQUARE YUAN;So;0;L; 30E6 30A2 30F3;;;;N;SQUARED YUAN;;;; +3351;SQUARE RITTORU;So;0;L; 30EA 30C3 30C8 30EB;;;;N;SQUARED RITTORU;;;; +3352;SQUARE RIRA;So;0;L; 30EA 30E9;;;;N;SQUARED RIRA;;;; +3353;SQUARE RUPII;So;0;L; 30EB 30D4 30FC;;;;N;SQUARED RUPII;;;; +3354;SQUARE RUUBURU;So;0;L; 30EB 30FC 30D6 30EB;;;;N;SQUARED RUUBURU;;;; +3355;SQUARE REMU;So;0;L; 30EC 30E0;;;;N;SQUARED REMU;;;; +3356;SQUARE RENTOGEN;So;0;L; 30EC 30F3 30C8 30B2 30F3;;;;N;SQUARED RENTOGEN;;;; +3357;SQUARE WATTO;So;0;L; 30EF 30C3 30C8;;;;N;SQUARED WATTO;;;; +3358;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR ZERO;So;0;L; 0030 70B9;;;;N;;;;; +3359;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR ONE;So;0;L; 0031 70B9;;;;N;;;;; +335A;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWO;So;0;L; 0032 70B9;;;;N;;;;; +335B;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR THREE;So;0;L; 0033 70B9;;;;N;;;;; +335C;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR FOUR;So;0;L; 0034 70B9;;;;N;;;;; +335D;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR FIVE;So;0;L; 0035 70B9;;;;N;;;;; +335E;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR SIX;So;0;L; 0036 70B9;;;;N;;;;; +335F;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR SEVEN;So;0;L; 0037 70B9;;;;N;;;;; +3360;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR EIGHT;So;0;L; 0038 70B9;;;;N;;;;; +3361;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR NINE;So;0;L; 0039 70B9;;;;N;;;;; +3362;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TEN;So;0;L; 0031 0030 70B9;;;;N;;;;; +3363;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR ELEVEN;So;0;L; 0031 0031 70B9;;;;N;;;;; +3364;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWELVE;So;0;L; 0031 0032 70B9;;;;N;;;;; +3365;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR THIRTEEN;So;0;L; 0031 0033 70B9;;;;N;;;;; +3366;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR FOURTEEN;So;0;L; 0031 0034 70B9;;;;N;;;;; +3367;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR FIFTEEN;So;0;L; 0031 0035 70B9;;;;N;;;;; +3368;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR SIXTEEN;So;0;L; 0031 0036 70B9;;;;N;;;;; +3369;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR SEVENTEEN;So;0;L; 0031 0037 70B9;;;;N;;;;; +336A;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR EIGHTEEN;So;0;L; 0031 0038 70B9;;;;N;;;;; +336B;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR NINETEEN;So;0;L; 0031 0039 70B9;;;;N;;;;; +336C;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWENTY;So;0;L; 0032 0030 70B9;;;;N;;;;; +336D;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWENTY-ONE;So;0;L; 0032 0031 70B9;;;;N;;;;; +336E;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWENTY-TWO;So;0;L; 0032 0032 70B9;;;;N;;;;; +336F;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWENTY-THREE;So;0;L; 0032 0033 70B9;;;;N;;;;; +3370;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWENTY-FOUR;So;0;L; 0032 0034 70B9;;;;N;;;;; +3371;SQUARE HPA;So;0;L; 0068 0050 0061;;;;N;;;;; +3372;SQUARE DA;So;0;L; 0064 0061;;;;N;;;;; +3373;SQUARE AU;So;0;L; 0041 0055;;;;N;;;;; +3374;SQUARE BAR;So;0;L; 0062 0061 0072;;;;N;;;;; +3375;SQUARE OV;So;0;L; 006F 0056;;;;N;;;;; +3376;SQUARE PC;So;0;L; 0070 0063;;;;N;;;;; +3377;SQUARE DM;So;0;ON; 0064 006D;;;;N;;;;; +3378;SQUARE DM SQUARED;So;0;ON; 0064 006D 00B2;;;;N;;;;; +3379;SQUARE DM CUBED;So;0;ON; 0064 006D 00B3;;;;N;;;;; +337A;SQUARE IU;So;0;ON; 0049 0055;;;;N;;;;; +337B;SQUARE ERA NAME HEISEI;So;0;L; 5E73 6210;;;;N;SQUARED TWO IDEOGRAPHS ERA NAME HEISEI;;;; +337C;SQUARE ERA NAME SYOUWA;So;0;L; 662D 548C;;;;N;SQUARED TWO IDEOGRAPHS ERA NAME SYOUWA;;;; +337D;SQUARE ERA NAME TAISYOU;So;0;L; 5927 6B63;;;;N;SQUARED TWO IDEOGRAPHS ERA NAME TAISYOU;;;; +337E;SQUARE ERA NAME MEIZI;So;0;L; 660E 6CBB;;;;N;SQUARED TWO IDEOGRAPHS ERA NAME MEIZI;;;; +337F;SQUARE CORPORATION;So;0;L; 682A 5F0F 4F1A 793E;;;;N;SQUARED FOUR IDEOGRAPHS CORPORATION;;;; +3380;SQUARE PA AMPS;So;0;L; 0070 0041;;;;N;SQUARED PA AMPS;;;; +3381;SQUARE NA;So;0;L; 006E 0041;;;;N;SQUARED NA;;;; +3382;SQUARE MU A;So;0;L; 03BC 0041;;;;N;SQUARED MU A;;;; +3383;SQUARE MA;So;0;L; 006D 0041;;;;N;SQUARED MA;;;; +3384;SQUARE KA;So;0;L; 006B 0041;;;;N;SQUARED KA;;;; +3385;SQUARE KB;So;0;L; 004B 0042;;;;N;SQUARED KB;;;; +3386;SQUARE MB;So;0;L; 004D 0042;;;;N;SQUARED MB;;;; +3387;SQUARE GB;So;0;L; 0047 0042;;;;N;SQUARED GB;;;; +3388;SQUARE CAL;So;0;L; 0063 0061 006C;;;;N;SQUARED CAL;;;; +3389;SQUARE KCAL;So;0;L; 006B 0063 0061 006C;;;;N;SQUARED KCAL;;;; +338A;SQUARE PF;So;0;L; 0070 0046;;;;N;SQUARED PF;;;; +338B;SQUARE NF;So;0;L; 006E 0046;;;;N;SQUARED NF;;;; +338C;SQUARE MU F;So;0;L; 03BC 0046;;;;N;SQUARED MU F;;;; +338D;SQUARE MU G;So;0;L; 03BC 0067;;;;N;SQUARED MU G;;;; +338E;SQUARE MG;So;0;L; 006D 0067;;;;N;SQUARED MG;;;; +338F;SQUARE KG;So;0;L; 006B 0067;;;;N;SQUARED KG;;;; +3390;SQUARE HZ;So;0;L; 0048 007A;;;;N;SQUARED HZ;;;; +3391;SQUARE KHZ;So;0;L; 006B 0048 007A;;;;N;SQUARED KHZ;;;; +3392;SQUARE MHZ;So;0;L; 004D 0048 007A;;;;N;SQUARED MHZ;;;; +3393;SQUARE GHZ;So;0;L; 0047 0048 007A;;;;N;SQUARED GHZ;;;; +3394;SQUARE THZ;So;0;L; 0054 0048 007A;;;;N;SQUARED THZ;;;; +3395;SQUARE MU L;So;0;L; 03BC 2113;;;;N;SQUARED MU L;;;; +3396;SQUARE ML;So;0;L; 006D 2113;;;;N;SQUARED ML;;;; +3397;SQUARE DL;So;0;L; 0064 2113;;;;N;SQUARED DL;;;; +3398;SQUARE KL;So;0;L; 006B 2113;;;;N;SQUARED KL;;;; +3399;SQUARE FM;So;0;L; 0066 006D;;;;N;SQUARED FM;;;; +339A;SQUARE NM;So;0;L; 006E 006D;;;;N;SQUARED NM;;;; +339B;SQUARE MU M;So;0;L; 03BC 006D;;;;N;SQUARED MU M;;;; +339C;SQUARE MM;So;0;L; 006D 006D;;;;N;SQUARED MM;;;; +339D;SQUARE CM;So;0;L; 0063 006D;;;;N;SQUARED CM;;;; +339E;SQUARE KM;So;0;L; 006B 006D;;;;N;SQUARED KM;;;; +339F;SQUARE MM SQUARED;So;0;L; 006D 006D 00B2;;;;N;SQUARED MM SQUARED;;;; +33A0;SQUARE CM SQUARED;So;0;L; 0063 006D 00B2;;;;N;SQUARED CM SQUARED;;;; +33A1;SQUARE M SQUARED;So;0;L; 006D 00B2;;;;N;SQUARED M SQUARED;;;; +33A2;SQUARE KM SQUARED;So;0;L; 006B 006D 00B2;;;;N;SQUARED KM SQUARED;;;; +33A3;SQUARE MM CUBED;So;0;L; 006D 006D 00B3;;;;N;SQUARED MM CUBED;;;; +33A4;SQUARE CM CUBED;So;0;L; 0063 006D 00B3;;;;N;SQUARED CM CUBED;;;; +33A5;SQUARE M CUBED;So;0;L; 006D 00B3;;;;N;SQUARED M CUBED;;;; +33A6;SQUARE KM CUBED;So;0;L; 006B 006D 00B3;;;;N;SQUARED KM CUBED;;;; +33A7;SQUARE M OVER S;So;0;L; 006D 2215 0073;;;;N;SQUARED M OVER S;;;; +33A8;SQUARE M OVER S SQUARED;So;0;L; 006D 2215 0073 00B2;;;;N;SQUARED M OVER S SQUARED;;;; +33A9;SQUARE PA;So;0;L; 0050 0061;;;;N;SQUARED PA;;;; +33AA;SQUARE KPA;So;0;L; 006B 0050 0061;;;;N;SQUARED KPA;;;; +33AB;SQUARE MPA;So;0;L; 004D 0050 0061;;;;N;SQUARED MPA;;;; +33AC;SQUARE GPA;So;0;L; 0047 0050 0061;;;;N;SQUARED GPA;;;; +33AD;SQUARE RAD;So;0;L; 0072 0061 0064;;;;N;SQUARED RAD;;;; +33AE;SQUARE RAD OVER S;So;0;L; 0072 0061 0064 2215 0073;;;;N;SQUARED RAD OVER S;;;; +33AF;SQUARE RAD OVER S SQUARED;So;0;L; 0072 0061 0064 2215 0073 00B2;;;;N;SQUARED RAD OVER S SQUARED;;;; +33B0;SQUARE PS;So;0;L; 0070 0073;;;;N;SQUARED PS;;;; +33B1;SQUARE NS;So;0;L; 006E 0073;;;;N;SQUARED NS;;;; +33B2;SQUARE MU S;So;0;L; 03BC 0073;;;;N;SQUARED MU S;;;; +33B3;SQUARE MS;So;0;L; 006D 0073;;;;N;SQUARED MS;;;; +33B4;SQUARE PV;So;0;L; 0070 0056;;;;N;SQUARED PV;;;; +33B5;SQUARE NV;So;0;L; 006E 0056;;;;N;SQUARED NV;;;; +33B6;SQUARE MU V;So;0;L; 03BC 0056;;;;N;SQUARED MU V;;;; +33B7;SQUARE MV;So;0;L; 006D 0056;;;;N;SQUARED MV;;;; +33B8;SQUARE KV;So;0;L; 006B 0056;;;;N;SQUARED KV;;;; +33B9;SQUARE MV MEGA;So;0;L; 004D 0056;;;;N;SQUARED MV MEGA;;;; +33BA;SQUARE PW;So;0;L; 0070 0057;;;;N;SQUARED PW;;;; +33BB;SQUARE NW;So;0;L; 006E 0057;;;;N;SQUARED NW;;;; +33BC;SQUARE MU W;So;0;L; 03BC 0057;;;;N;SQUARED MU W;;;; +33BD;SQUARE MW;So;0;L; 006D 0057;;;;N;SQUARED MW;;;; +33BE;SQUARE KW;So;0;L; 006B 0057;;;;N;SQUARED KW;;;; +33BF;SQUARE MW MEGA;So;0;L; 004D 0057;;;;N;SQUARED MW MEGA;;;; +33C0;SQUARE K OHM;So;0;L; 006B 03A9;;;;N;SQUARED K OHM;;;; +33C1;SQUARE M OHM;So;0;L; 004D 03A9;;;;N;SQUARED M OHM;;;; +33C2;SQUARE AM;So;0;L; 0061 002E 006D 002E;;;;N;SQUARED AM;;;; +33C3;SQUARE BQ;So;0;L; 0042 0071;;;;N;SQUARED BQ;;;; +33C4;SQUARE CC;So;0;L; 0063 0063;;;;N;SQUARED CC;;;; +33C5;SQUARE CD;So;0;L; 0063 0064;;;;N;SQUARED CD;;;; +33C6;SQUARE C OVER KG;So;0;L; 0043 2215 006B 0067;;;;N;SQUARED C OVER KG;;;; +33C7;SQUARE CO;So;0;L; 0043 006F 002E;;;;N;SQUARED CO;;;; +33C8;SQUARE DB;So;0;L; 0064 0042;;;;N;SQUARED DB;;;; +33C9;SQUARE GY;So;0;L; 0047 0079;;;;N;SQUARED GY;;;; +33CA;SQUARE HA;So;0;L; 0068 0061;;;;N;SQUARED HA;;;; +33CB;SQUARE HP;So;0;L; 0048 0050;;;;N;SQUARED HP;;;; +33CC;SQUARE IN;So;0;L; 0069 006E;;;;N;SQUARED IN;;;; +33CD;SQUARE KK;So;0;L; 004B 004B;;;;N;SQUARED KK;;;; +33CE;SQUARE KM CAPITAL;So;0;L; 004B 004D;;;;N;SQUARED KM CAPITAL;;;; +33CF;SQUARE KT;So;0;L; 006B 0074;;;;N;SQUARED KT;;;; +33D0;SQUARE LM;So;0;L; 006C 006D;;;;N;SQUARED LM;;;; +33D1;SQUARE LN;So;0;L; 006C 006E;;;;N;SQUARED LN;;;; +33D2;SQUARE LOG;So;0;L; 006C 006F 0067;;;;N;SQUARED LOG;;;; +33D3;SQUARE LX;So;0;L; 006C 0078;;;;N;SQUARED LX;;;; +33D4;SQUARE MB SMALL;So;0;L; 006D 0062;;;;N;SQUARED MB SMALL;;;; +33D5;SQUARE MIL;So;0;L; 006D 0069 006C;;;;N;SQUARED MIL;;;; +33D6;SQUARE MOL;So;0;L; 006D 006F 006C;;;;N;SQUARED MOL;;;; +33D7;SQUARE PH;So;0;L; 0050 0048;;;;N;SQUARED PH;;;; +33D8;SQUARE PM;So;0;L; 0070 002E 006D 002E;;;;N;SQUARED PM;;;; +33D9;SQUARE PPM;So;0;L; 0050 0050 004D;;;;N;SQUARED PPM;;;; +33DA;SQUARE PR;So;0;L; 0050 0052;;;;N;SQUARED PR;;;; +33DB;SQUARE SR;So;0;L; 0073 0072;;;;N;SQUARED SR;;;; +33DC;SQUARE SV;So;0;L; 0053 0076;;;;N;SQUARED SV;;;; +33DD;SQUARE WB;So;0;L; 0057 0062;;;;N;SQUARED WB;;;; +33DE;SQUARE V OVER M;So;0;ON; 0056 2215 006D;;;;N;;;;; +33DF;SQUARE A OVER M;So;0;ON; 0041 2215 006D;;;;N;;;;; +33E0;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY ONE;So;0;L; 0031 65E5;;;;N;;;;; +33E1;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWO;So;0;L; 0032 65E5;;;;N;;;;; +33E2;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY THREE;So;0;L; 0033 65E5;;;;N;;;;; +33E3;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY FOUR;So;0;L; 0034 65E5;;;;N;;;;; +33E4;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY FIVE;So;0;L; 0035 65E5;;;;N;;;;; +33E5;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY SIX;So;0;L; 0036 65E5;;;;N;;;;; +33E6;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY SEVEN;So;0;L; 0037 65E5;;;;N;;;;; +33E7;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY EIGHT;So;0;L; 0038 65E5;;;;N;;;;; +33E8;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY NINE;So;0;L; 0039 65E5;;;;N;;;;; +33E9;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TEN;So;0;L; 0031 0030 65E5;;;;N;;;;; +33EA;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY ELEVEN;So;0;L; 0031 0031 65E5;;;;N;;;;; +33EB;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWELVE;So;0;L; 0031 0032 65E5;;;;N;;;;; +33EC;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY THIRTEEN;So;0;L; 0031 0033 65E5;;;;N;;;;; +33ED;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY FOURTEEN;So;0;L; 0031 0034 65E5;;;;N;;;;; +33EE;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY FIFTEEN;So;0;L; 0031 0035 65E5;;;;N;;;;; +33EF;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY SIXTEEN;So;0;L; 0031 0036 65E5;;;;N;;;;; +33F0;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY SEVENTEEN;So;0;L; 0031 0037 65E5;;;;N;;;;; +33F1;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY EIGHTEEN;So;0;L; 0031 0038 65E5;;;;N;;;;; +33F2;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY NINETEEN;So;0;L; 0031 0039 65E5;;;;N;;;;; +33F3;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY;So;0;L; 0032 0030 65E5;;;;N;;;;; +33F4;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-ONE;So;0;L; 0032 0031 65E5;;;;N;;;;; +33F5;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-TWO;So;0;L; 0032 0032 65E5;;;;N;;;;; +33F6;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-THREE;So;0;L; 0032 0033 65E5;;;;N;;;;; +33F7;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-FOUR;So;0;L; 0032 0034 65E5;;;;N;;;;; +33F8;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-FIVE;So;0;L; 0032 0035 65E5;;;;N;;;;; +33F9;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-SIX;So;0;L; 0032 0036 65E5;;;;N;;;;; +33FA;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-SEVEN;So;0;L; 0032 0037 65E5;;;;N;;;;; +33FB;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-EIGHT;So;0;L; 0032 0038 65E5;;;;N;;;;; +33FC;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-NINE;So;0;L; 0032 0039 65E5;;;;N;;;;; +33FD;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY THIRTY;So;0;L; 0033 0030 65E5;;;;N;;;;; +33FE;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY THIRTY-ONE;So;0;L; 0033 0031 65E5;;;;N;;;;; +33FF;SQUARE GAL;So;0;ON; 0067 0061 006C;;;;N;;;;; +3400;;Lo;0;L;;;;;N;;;;; +4DBF;;Lo;0;L;;;;;N;;;;; +4DC0;HEXAGRAM FOR THE CREATIVE HEAVEN;So;0;ON;;;;;N;;;;; +4DC1;HEXAGRAM FOR THE RECEPTIVE EARTH;So;0;ON;;;;;N;;;;; +4DC2;HEXAGRAM FOR DIFFICULTY AT THE BEGINNING;So;0;ON;;;;;N;;;;; +4DC3;HEXAGRAM FOR YOUTHFUL FOLLY;So;0;ON;;;;;N;;;;; +4DC4;HEXAGRAM FOR WAITING;So;0;ON;;;;;N;;;;; +4DC5;HEXAGRAM FOR CONFLICT;So;0;ON;;;;;N;;;;; +4DC6;HEXAGRAM FOR THE ARMY;So;0;ON;;;;;N;;;;; +4DC7;HEXAGRAM FOR HOLDING TOGETHER;So;0;ON;;;;;N;;;;; +4DC8;HEXAGRAM FOR SMALL TAMING;So;0;ON;;;;;N;;;;; +4DC9;HEXAGRAM FOR TREADING;So;0;ON;;;;;N;;;;; +4DCA;HEXAGRAM FOR PEACE;So;0;ON;;;;;N;;;;; +4DCB;HEXAGRAM FOR STANDSTILL;So;0;ON;;;;;N;;;;; +4DCC;HEXAGRAM FOR FELLOWSHIP;So;0;ON;;;;;N;;;;; +4DCD;HEXAGRAM FOR GREAT POSSESSION;So;0;ON;;;;;N;;;;; +4DCE;HEXAGRAM FOR MODESTY;So;0;ON;;;;;N;;;;; +4DCF;HEXAGRAM FOR ENTHUSIASM;So;0;ON;;;;;N;;;;; +4DD0;HEXAGRAM FOR FOLLOWING;So;0;ON;;;;;N;;;;; +4DD1;HEXAGRAM FOR WORK ON THE DECAYED;So;0;ON;;;;;N;;;;; +4DD2;HEXAGRAM FOR APPROACH;So;0;ON;;;;;N;;;;; +4DD3;HEXAGRAM FOR CONTEMPLATION;So;0;ON;;;;;N;;;;; +4DD4;HEXAGRAM FOR BITING THROUGH;So;0;ON;;;;;N;;;;; +4DD5;HEXAGRAM FOR GRACE;So;0;ON;;;;;N;;;;; +4DD6;HEXAGRAM FOR SPLITTING APART;So;0;ON;;;;;N;;;;; +4DD7;HEXAGRAM FOR RETURN;So;0;ON;;;;;N;;;;; +4DD8;HEXAGRAM FOR INNOCENCE;So;0;ON;;;;;N;;;;; +4DD9;HEXAGRAM FOR GREAT TAMING;So;0;ON;;;;;N;;;;; +4DDA;HEXAGRAM FOR MOUTH CORNERS;So;0;ON;;;;;N;;;;; +4DDB;HEXAGRAM FOR GREAT PREPONDERANCE;So;0;ON;;;;;N;;;;; +4DDC;HEXAGRAM FOR THE ABYSMAL WATER;So;0;ON;;;;;N;;;;; +4DDD;HEXAGRAM FOR THE CLINGING FIRE;So;0;ON;;;;;N;;;;; +4DDE;HEXAGRAM FOR INFLUENCE;So;0;ON;;;;;N;;;;; +4DDF;HEXAGRAM FOR DURATION;So;0;ON;;;;;N;;;;; +4DE0;HEXAGRAM FOR RETREAT;So;0;ON;;;;;N;;;;; +4DE1;HEXAGRAM FOR GREAT POWER;So;0;ON;;;;;N;;;;; +4DE2;HEXAGRAM FOR PROGRESS;So;0;ON;;;;;N;;;;; +4DE3;HEXAGRAM FOR DARKENING OF THE LIGHT;So;0;ON;;;;;N;;;;; +4DE4;HEXAGRAM FOR THE FAMILY;So;0;ON;;;;;N;;;;; +4DE5;HEXAGRAM FOR OPPOSITION;So;0;ON;;;;;N;;;;; +4DE6;HEXAGRAM FOR OBSTRUCTION;So;0;ON;;;;;N;;;;; +4DE7;HEXAGRAM FOR DELIVERANCE;So;0;ON;;;;;N;;;;; +4DE8;HEXAGRAM FOR DECREASE;So;0;ON;;;;;N;;;;; +4DE9;HEXAGRAM FOR INCREASE;So;0;ON;;;;;N;;;;; +4DEA;HEXAGRAM FOR BREAKTHROUGH;So;0;ON;;;;;N;;;;; +4DEB;HEXAGRAM FOR COMING TO MEET;So;0;ON;;;;;N;;;;; +4DEC;HEXAGRAM FOR GATHERING TOGETHER;So;0;ON;;;;;N;;;;; +4DED;HEXAGRAM FOR PUSHING UPWARD;So;0;ON;;;;;N;;;;; +4DEE;HEXAGRAM FOR OPPRESSION;So;0;ON;;;;;N;;;;; +4DEF;HEXAGRAM FOR THE WELL;So;0;ON;;;;;N;;;;; +4DF0;HEXAGRAM FOR REVOLUTION;So;0;ON;;;;;N;;;;; +4DF1;HEXAGRAM FOR THE CAULDRON;So;0;ON;;;;;N;;;;; +4DF2;HEXAGRAM FOR THE AROUSING THUNDER;So;0;ON;;;;;N;;;;; +4DF3;HEXAGRAM FOR THE KEEPING STILL MOUNTAIN;So;0;ON;;;;;N;;;;; +4DF4;HEXAGRAM FOR DEVELOPMENT;So;0;ON;;;;;N;;;;; +4DF5;HEXAGRAM FOR THE MARRYING MAIDEN;So;0;ON;;;;;N;;;;; +4DF6;HEXAGRAM FOR ABUNDANCE;So;0;ON;;;;;N;;;;; +4DF7;HEXAGRAM FOR THE WANDERER;So;0;ON;;;;;N;;;;; +4DF8;HEXAGRAM FOR THE GENTLE WIND;So;0;ON;;;;;N;;;;; +4DF9;HEXAGRAM FOR THE JOYOUS LAKE;So;0;ON;;;;;N;;;;; +4DFA;HEXAGRAM FOR DISPERSION;So;0;ON;;;;;N;;;;; +4DFB;HEXAGRAM FOR LIMITATION;So;0;ON;;;;;N;;;;; +4DFC;HEXAGRAM FOR INNER TRUTH;So;0;ON;;;;;N;;;;; +4DFD;HEXAGRAM FOR SMALL PREPONDERANCE;So;0;ON;;;;;N;;;;; +4DFE;HEXAGRAM FOR AFTER COMPLETION;So;0;ON;;;;;N;;;;; +4DFF;HEXAGRAM FOR BEFORE COMPLETION;So;0;ON;;;;;N;;;;; +4E00;;Lo;0;L;;;;;N;;;;; +9FFF;;Lo;0;L;;;;;N;;;;; +A000;YI SYLLABLE IT;Lo;0;L;;;;;N;;;;; +A001;YI SYLLABLE IX;Lo;0;L;;;;;N;;;;; +A002;YI SYLLABLE I;Lo;0;L;;;;;N;;;;; +A003;YI SYLLABLE IP;Lo;0;L;;;;;N;;;;; +A004;YI SYLLABLE IET;Lo;0;L;;;;;N;;;;; +A005;YI SYLLABLE IEX;Lo;0;L;;;;;N;;;;; +A006;YI SYLLABLE IE;Lo;0;L;;;;;N;;;;; +A007;YI SYLLABLE IEP;Lo;0;L;;;;;N;;;;; +A008;YI SYLLABLE AT;Lo;0;L;;;;;N;;;;; +A009;YI SYLLABLE AX;Lo;0;L;;;;;N;;;;; +A00A;YI SYLLABLE A;Lo;0;L;;;;;N;;;;; +A00B;YI SYLLABLE AP;Lo;0;L;;;;;N;;;;; +A00C;YI SYLLABLE UOX;Lo;0;L;;;;;N;;;;; +A00D;YI SYLLABLE UO;Lo;0;L;;;;;N;;;;; +A00E;YI SYLLABLE UOP;Lo;0;L;;;;;N;;;;; +A00F;YI SYLLABLE OT;Lo;0;L;;;;;N;;;;; +A010;YI SYLLABLE OX;Lo;0;L;;;;;N;;;;; +A011;YI SYLLABLE O;Lo;0;L;;;;;N;;;;; +A012;YI SYLLABLE OP;Lo;0;L;;;;;N;;;;; +A013;YI SYLLABLE EX;Lo;0;L;;;;;N;;;;; +A014;YI SYLLABLE E;Lo;0;L;;;;;N;;;;; +A015;YI SYLLABLE WU;Lm;0;L;;;;;N;;;;; +A016;YI SYLLABLE BIT;Lo;0;L;;;;;N;;;;; +A017;YI SYLLABLE BIX;Lo;0;L;;;;;N;;;;; +A018;YI SYLLABLE BI;Lo;0;L;;;;;N;;;;; +A019;YI SYLLABLE BIP;Lo;0;L;;;;;N;;;;; +A01A;YI SYLLABLE BIET;Lo;0;L;;;;;N;;;;; +A01B;YI SYLLABLE BIEX;Lo;0;L;;;;;N;;;;; +A01C;YI SYLLABLE BIE;Lo;0;L;;;;;N;;;;; +A01D;YI SYLLABLE BIEP;Lo;0;L;;;;;N;;;;; +A01E;YI SYLLABLE BAT;Lo;0;L;;;;;N;;;;; +A01F;YI SYLLABLE BAX;Lo;0;L;;;;;N;;;;; +A020;YI SYLLABLE BA;Lo;0;L;;;;;N;;;;; +A021;YI SYLLABLE BAP;Lo;0;L;;;;;N;;;;; +A022;YI SYLLABLE BUOX;Lo;0;L;;;;;N;;;;; +A023;YI SYLLABLE BUO;Lo;0;L;;;;;N;;;;; +A024;YI SYLLABLE BUOP;Lo;0;L;;;;;N;;;;; +A025;YI SYLLABLE BOT;Lo;0;L;;;;;N;;;;; +A026;YI SYLLABLE BOX;Lo;0;L;;;;;N;;;;; +A027;YI SYLLABLE BO;Lo;0;L;;;;;N;;;;; +A028;YI SYLLABLE BOP;Lo;0;L;;;;;N;;;;; +A029;YI SYLLABLE BEX;Lo;0;L;;;;;N;;;;; +A02A;YI SYLLABLE BE;Lo;0;L;;;;;N;;;;; +A02B;YI SYLLABLE BEP;Lo;0;L;;;;;N;;;;; +A02C;YI SYLLABLE BUT;Lo;0;L;;;;;N;;;;; +A02D;YI SYLLABLE BUX;Lo;0;L;;;;;N;;;;; +A02E;YI SYLLABLE BU;Lo;0;L;;;;;N;;;;; +A02F;YI SYLLABLE BUP;Lo;0;L;;;;;N;;;;; +A030;YI SYLLABLE BURX;Lo;0;L;;;;;N;;;;; +A031;YI SYLLABLE BUR;Lo;0;L;;;;;N;;;;; +A032;YI SYLLABLE BYT;Lo;0;L;;;;;N;;;;; +A033;YI SYLLABLE BYX;Lo;0;L;;;;;N;;;;; +A034;YI SYLLABLE BY;Lo;0;L;;;;;N;;;;; +A035;YI SYLLABLE BYP;Lo;0;L;;;;;N;;;;; +A036;YI SYLLABLE BYRX;Lo;0;L;;;;;N;;;;; +A037;YI SYLLABLE BYR;Lo;0;L;;;;;N;;;;; +A038;YI SYLLABLE PIT;Lo;0;L;;;;;N;;;;; +A039;YI SYLLABLE PIX;Lo;0;L;;;;;N;;;;; +A03A;YI SYLLABLE PI;Lo;0;L;;;;;N;;;;; +A03B;YI SYLLABLE PIP;Lo;0;L;;;;;N;;;;; +A03C;YI SYLLABLE PIEX;Lo;0;L;;;;;N;;;;; +A03D;YI SYLLABLE PIE;Lo;0;L;;;;;N;;;;; +A03E;YI SYLLABLE PIEP;Lo;0;L;;;;;N;;;;; +A03F;YI SYLLABLE PAT;Lo;0;L;;;;;N;;;;; +A040;YI SYLLABLE PAX;Lo;0;L;;;;;N;;;;; +A041;YI SYLLABLE PA;Lo;0;L;;;;;N;;;;; +A042;YI SYLLABLE PAP;Lo;0;L;;;;;N;;;;; +A043;YI SYLLABLE PUOX;Lo;0;L;;;;;N;;;;; +A044;YI SYLLABLE PUO;Lo;0;L;;;;;N;;;;; +A045;YI SYLLABLE PUOP;Lo;0;L;;;;;N;;;;; +A046;YI SYLLABLE POT;Lo;0;L;;;;;N;;;;; +A047;YI SYLLABLE POX;Lo;0;L;;;;;N;;;;; +A048;YI SYLLABLE PO;Lo;0;L;;;;;N;;;;; +A049;YI SYLLABLE POP;Lo;0;L;;;;;N;;;;; +A04A;YI SYLLABLE PUT;Lo;0;L;;;;;N;;;;; +A04B;YI SYLLABLE PUX;Lo;0;L;;;;;N;;;;; +A04C;YI SYLLABLE PU;Lo;0;L;;;;;N;;;;; +A04D;YI SYLLABLE PUP;Lo;0;L;;;;;N;;;;; +A04E;YI SYLLABLE PURX;Lo;0;L;;;;;N;;;;; +A04F;YI SYLLABLE PUR;Lo;0;L;;;;;N;;;;; +A050;YI SYLLABLE PYT;Lo;0;L;;;;;N;;;;; +A051;YI SYLLABLE PYX;Lo;0;L;;;;;N;;;;; +A052;YI SYLLABLE PY;Lo;0;L;;;;;N;;;;; +A053;YI SYLLABLE PYP;Lo;0;L;;;;;N;;;;; +A054;YI SYLLABLE PYRX;Lo;0;L;;;;;N;;;;; +A055;YI SYLLABLE PYR;Lo;0;L;;;;;N;;;;; +A056;YI SYLLABLE BBIT;Lo;0;L;;;;;N;;;;; +A057;YI SYLLABLE BBIX;Lo;0;L;;;;;N;;;;; +A058;YI SYLLABLE BBI;Lo;0;L;;;;;N;;;;; +A059;YI SYLLABLE BBIP;Lo;0;L;;;;;N;;;;; +A05A;YI SYLLABLE BBIET;Lo;0;L;;;;;N;;;;; +A05B;YI SYLLABLE BBIEX;Lo;0;L;;;;;N;;;;; +A05C;YI SYLLABLE BBIE;Lo;0;L;;;;;N;;;;; +A05D;YI SYLLABLE BBIEP;Lo;0;L;;;;;N;;;;; +A05E;YI SYLLABLE BBAT;Lo;0;L;;;;;N;;;;; +A05F;YI SYLLABLE BBAX;Lo;0;L;;;;;N;;;;; +A060;YI SYLLABLE BBA;Lo;0;L;;;;;N;;;;; +A061;YI SYLLABLE BBAP;Lo;0;L;;;;;N;;;;; +A062;YI SYLLABLE BBUOX;Lo;0;L;;;;;N;;;;; +A063;YI SYLLABLE BBUO;Lo;0;L;;;;;N;;;;; +A064;YI SYLLABLE BBUOP;Lo;0;L;;;;;N;;;;; +A065;YI SYLLABLE BBOT;Lo;0;L;;;;;N;;;;; +A066;YI SYLLABLE BBOX;Lo;0;L;;;;;N;;;;; +A067;YI SYLLABLE BBO;Lo;0;L;;;;;N;;;;; +A068;YI SYLLABLE BBOP;Lo;0;L;;;;;N;;;;; +A069;YI SYLLABLE BBEX;Lo;0;L;;;;;N;;;;; +A06A;YI SYLLABLE BBE;Lo;0;L;;;;;N;;;;; +A06B;YI SYLLABLE BBEP;Lo;0;L;;;;;N;;;;; +A06C;YI SYLLABLE BBUT;Lo;0;L;;;;;N;;;;; +A06D;YI SYLLABLE BBUX;Lo;0;L;;;;;N;;;;; +A06E;YI SYLLABLE BBU;Lo;0;L;;;;;N;;;;; +A06F;YI SYLLABLE BBUP;Lo;0;L;;;;;N;;;;; +A070;YI SYLLABLE BBURX;Lo;0;L;;;;;N;;;;; +A071;YI SYLLABLE BBUR;Lo;0;L;;;;;N;;;;; +A072;YI SYLLABLE BBYT;Lo;0;L;;;;;N;;;;; +A073;YI SYLLABLE BBYX;Lo;0;L;;;;;N;;;;; +A074;YI SYLLABLE BBY;Lo;0;L;;;;;N;;;;; +A075;YI SYLLABLE BBYP;Lo;0;L;;;;;N;;;;; +A076;YI SYLLABLE NBIT;Lo;0;L;;;;;N;;;;; +A077;YI SYLLABLE NBIX;Lo;0;L;;;;;N;;;;; +A078;YI SYLLABLE NBI;Lo;0;L;;;;;N;;;;; +A079;YI SYLLABLE NBIP;Lo;0;L;;;;;N;;;;; +A07A;YI SYLLABLE NBIEX;Lo;0;L;;;;;N;;;;; +A07B;YI SYLLABLE NBIE;Lo;0;L;;;;;N;;;;; +A07C;YI SYLLABLE NBIEP;Lo;0;L;;;;;N;;;;; +A07D;YI SYLLABLE NBAT;Lo;0;L;;;;;N;;;;; +A07E;YI SYLLABLE NBAX;Lo;0;L;;;;;N;;;;; +A07F;YI SYLLABLE NBA;Lo;0;L;;;;;N;;;;; +A080;YI SYLLABLE NBAP;Lo;0;L;;;;;N;;;;; +A081;YI SYLLABLE NBOT;Lo;0;L;;;;;N;;;;; +A082;YI SYLLABLE NBOX;Lo;0;L;;;;;N;;;;; +A083;YI SYLLABLE NBO;Lo;0;L;;;;;N;;;;; +A084;YI SYLLABLE NBOP;Lo;0;L;;;;;N;;;;; +A085;YI SYLLABLE NBUT;Lo;0;L;;;;;N;;;;; +A086;YI SYLLABLE NBUX;Lo;0;L;;;;;N;;;;; +A087;YI SYLLABLE NBU;Lo;0;L;;;;;N;;;;; +A088;YI SYLLABLE NBUP;Lo;0;L;;;;;N;;;;; +A089;YI SYLLABLE NBURX;Lo;0;L;;;;;N;;;;; +A08A;YI SYLLABLE NBUR;Lo;0;L;;;;;N;;;;; +A08B;YI SYLLABLE NBYT;Lo;0;L;;;;;N;;;;; +A08C;YI SYLLABLE NBYX;Lo;0;L;;;;;N;;;;; +A08D;YI SYLLABLE NBY;Lo;0;L;;;;;N;;;;; +A08E;YI SYLLABLE NBYP;Lo;0;L;;;;;N;;;;; +A08F;YI SYLLABLE NBYRX;Lo;0;L;;;;;N;;;;; +A090;YI SYLLABLE NBYR;Lo;0;L;;;;;N;;;;; +A091;YI SYLLABLE HMIT;Lo;0;L;;;;;N;;;;; +A092;YI SYLLABLE HMIX;Lo;0;L;;;;;N;;;;; +A093;YI SYLLABLE HMI;Lo;0;L;;;;;N;;;;; +A094;YI SYLLABLE HMIP;Lo;0;L;;;;;N;;;;; +A095;YI SYLLABLE HMIEX;Lo;0;L;;;;;N;;;;; +A096;YI SYLLABLE HMIE;Lo;0;L;;;;;N;;;;; +A097;YI SYLLABLE HMIEP;Lo;0;L;;;;;N;;;;; +A098;YI SYLLABLE HMAT;Lo;0;L;;;;;N;;;;; +A099;YI SYLLABLE HMAX;Lo;0;L;;;;;N;;;;; +A09A;YI SYLLABLE HMA;Lo;0;L;;;;;N;;;;; +A09B;YI SYLLABLE HMAP;Lo;0;L;;;;;N;;;;; +A09C;YI SYLLABLE HMUOX;Lo;0;L;;;;;N;;;;; +A09D;YI SYLLABLE HMUO;Lo;0;L;;;;;N;;;;; +A09E;YI SYLLABLE HMUOP;Lo;0;L;;;;;N;;;;; +A09F;YI SYLLABLE HMOT;Lo;0;L;;;;;N;;;;; +A0A0;YI SYLLABLE HMOX;Lo;0;L;;;;;N;;;;; +A0A1;YI SYLLABLE HMO;Lo;0;L;;;;;N;;;;; +A0A2;YI SYLLABLE HMOP;Lo;0;L;;;;;N;;;;; +A0A3;YI SYLLABLE HMUT;Lo;0;L;;;;;N;;;;; +A0A4;YI SYLLABLE HMUX;Lo;0;L;;;;;N;;;;; +A0A5;YI SYLLABLE HMU;Lo;0;L;;;;;N;;;;; +A0A6;YI SYLLABLE HMUP;Lo;0;L;;;;;N;;;;; +A0A7;YI SYLLABLE HMURX;Lo;0;L;;;;;N;;;;; +A0A8;YI SYLLABLE HMUR;Lo;0;L;;;;;N;;;;; +A0A9;YI SYLLABLE HMYX;Lo;0;L;;;;;N;;;;; +A0AA;YI SYLLABLE HMY;Lo;0;L;;;;;N;;;;; +A0AB;YI SYLLABLE HMYP;Lo;0;L;;;;;N;;;;; +A0AC;YI SYLLABLE HMYRX;Lo;0;L;;;;;N;;;;; +A0AD;YI SYLLABLE HMYR;Lo;0;L;;;;;N;;;;; +A0AE;YI SYLLABLE MIT;Lo;0;L;;;;;N;;;;; +A0AF;YI SYLLABLE MIX;Lo;0;L;;;;;N;;;;; +A0B0;YI SYLLABLE MI;Lo;0;L;;;;;N;;;;; +A0B1;YI SYLLABLE MIP;Lo;0;L;;;;;N;;;;; +A0B2;YI SYLLABLE MIEX;Lo;0;L;;;;;N;;;;; +A0B3;YI SYLLABLE MIE;Lo;0;L;;;;;N;;;;; +A0B4;YI SYLLABLE MIEP;Lo;0;L;;;;;N;;;;; +A0B5;YI SYLLABLE MAT;Lo;0;L;;;;;N;;;;; +A0B6;YI SYLLABLE MAX;Lo;0;L;;;;;N;;;;; +A0B7;YI SYLLABLE MA;Lo;0;L;;;;;N;;;;; +A0B8;YI SYLLABLE MAP;Lo;0;L;;;;;N;;;;; +A0B9;YI SYLLABLE MUOT;Lo;0;L;;;;;N;;;;; +A0BA;YI SYLLABLE MUOX;Lo;0;L;;;;;N;;;;; +A0BB;YI SYLLABLE MUO;Lo;0;L;;;;;N;;;;; +A0BC;YI SYLLABLE MUOP;Lo;0;L;;;;;N;;;;; +A0BD;YI SYLLABLE MOT;Lo;0;L;;;;;N;;;;; +A0BE;YI SYLLABLE MOX;Lo;0;L;;;;;N;;;;; +A0BF;YI SYLLABLE MO;Lo;0;L;;;;;N;;;;; +A0C0;YI SYLLABLE MOP;Lo;0;L;;;;;N;;;;; +A0C1;YI SYLLABLE MEX;Lo;0;L;;;;;N;;;;; +A0C2;YI SYLLABLE ME;Lo;0;L;;;;;N;;;;; +A0C3;YI SYLLABLE MUT;Lo;0;L;;;;;N;;;;; +A0C4;YI SYLLABLE MUX;Lo;0;L;;;;;N;;;;; +A0C5;YI SYLLABLE MU;Lo;0;L;;;;;N;;;;; +A0C6;YI SYLLABLE MUP;Lo;0;L;;;;;N;;;;; +A0C7;YI SYLLABLE MURX;Lo;0;L;;;;;N;;;;; +A0C8;YI SYLLABLE MUR;Lo;0;L;;;;;N;;;;; +A0C9;YI SYLLABLE MYT;Lo;0;L;;;;;N;;;;; +A0CA;YI SYLLABLE MYX;Lo;0;L;;;;;N;;;;; +A0CB;YI SYLLABLE MY;Lo;0;L;;;;;N;;;;; +A0CC;YI SYLLABLE MYP;Lo;0;L;;;;;N;;;;; +A0CD;YI SYLLABLE FIT;Lo;0;L;;;;;N;;;;; +A0CE;YI SYLLABLE FIX;Lo;0;L;;;;;N;;;;; +A0CF;YI SYLLABLE FI;Lo;0;L;;;;;N;;;;; +A0D0;YI SYLLABLE FIP;Lo;0;L;;;;;N;;;;; +A0D1;YI SYLLABLE FAT;Lo;0;L;;;;;N;;;;; +A0D2;YI SYLLABLE FAX;Lo;0;L;;;;;N;;;;; +A0D3;YI SYLLABLE FA;Lo;0;L;;;;;N;;;;; +A0D4;YI SYLLABLE FAP;Lo;0;L;;;;;N;;;;; +A0D5;YI SYLLABLE FOX;Lo;0;L;;;;;N;;;;; +A0D6;YI SYLLABLE FO;Lo;0;L;;;;;N;;;;; +A0D7;YI SYLLABLE FOP;Lo;0;L;;;;;N;;;;; +A0D8;YI SYLLABLE FUT;Lo;0;L;;;;;N;;;;; +A0D9;YI SYLLABLE FUX;Lo;0;L;;;;;N;;;;; +A0DA;YI SYLLABLE FU;Lo;0;L;;;;;N;;;;; +A0DB;YI SYLLABLE FUP;Lo;0;L;;;;;N;;;;; +A0DC;YI SYLLABLE FURX;Lo;0;L;;;;;N;;;;; +A0DD;YI SYLLABLE FUR;Lo;0;L;;;;;N;;;;; +A0DE;YI SYLLABLE FYT;Lo;0;L;;;;;N;;;;; +A0DF;YI SYLLABLE FYX;Lo;0;L;;;;;N;;;;; +A0E0;YI SYLLABLE FY;Lo;0;L;;;;;N;;;;; +A0E1;YI SYLLABLE FYP;Lo;0;L;;;;;N;;;;; +A0E2;YI SYLLABLE VIT;Lo;0;L;;;;;N;;;;; +A0E3;YI SYLLABLE VIX;Lo;0;L;;;;;N;;;;; +A0E4;YI SYLLABLE VI;Lo;0;L;;;;;N;;;;; +A0E5;YI SYLLABLE VIP;Lo;0;L;;;;;N;;;;; +A0E6;YI SYLLABLE VIET;Lo;0;L;;;;;N;;;;; +A0E7;YI SYLLABLE VIEX;Lo;0;L;;;;;N;;;;; +A0E8;YI SYLLABLE VIE;Lo;0;L;;;;;N;;;;; +A0E9;YI SYLLABLE VIEP;Lo;0;L;;;;;N;;;;; +A0EA;YI SYLLABLE VAT;Lo;0;L;;;;;N;;;;; +A0EB;YI SYLLABLE VAX;Lo;0;L;;;;;N;;;;; +A0EC;YI SYLLABLE VA;Lo;0;L;;;;;N;;;;; +A0ED;YI SYLLABLE VAP;Lo;0;L;;;;;N;;;;; +A0EE;YI SYLLABLE VOT;Lo;0;L;;;;;N;;;;; +A0EF;YI SYLLABLE VOX;Lo;0;L;;;;;N;;;;; +A0F0;YI SYLLABLE VO;Lo;0;L;;;;;N;;;;; +A0F1;YI SYLLABLE VOP;Lo;0;L;;;;;N;;;;; +A0F2;YI SYLLABLE VEX;Lo;0;L;;;;;N;;;;; +A0F3;YI SYLLABLE VEP;Lo;0;L;;;;;N;;;;; +A0F4;YI SYLLABLE VUT;Lo;0;L;;;;;N;;;;; +A0F5;YI SYLLABLE VUX;Lo;0;L;;;;;N;;;;; +A0F6;YI SYLLABLE VU;Lo;0;L;;;;;N;;;;; +A0F7;YI SYLLABLE VUP;Lo;0;L;;;;;N;;;;; +A0F8;YI SYLLABLE VURX;Lo;0;L;;;;;N;;;;; +A0F9;YI SYLLABLE VUR;Lo;0;L;;;;;N;;;;; +A0FA;YI SYLLABLE VYT;Lo;0;L;;;;;N;;;;; +A0FB;YI SYLLABLE VYX;Lo;0;L;;;;;N;;;;; +A0FC;YI SYLLABLE VY;Lo;0;L;;;;;N;;;;; +A0FD;YI SYLLABLE VYP;Lo;0;L;;;;;N;;;;; +A0FE;YI SYLLABLE VYRX;Lo;0;L;;;;;N;;;;; +A0FF;YI SYLLABLE VYR;Lo;0;L;;;;;N;;;;; +A100;YI SYLLABLE DIT;Lo;0;L;;;;;N;;;;; +A101;YI SYLLABLE DIX;Lo;0;L;;;;;N;;;;; +A102;YI SYLLABLE DI;Lo;0;L;;;;;N;;;;; +A103;YI SYLLABLE DIP;Lo;0;L;;;;;N;;;;; +A104;YI SYLLABLE DIEX;Lo;0;L;;;;;N;;;;; +A105;YI SYLLABLE DIE;Lo;0;L;;;;;N;;;;; +A106;YI SYLLABLE DIEP;Lo;0;L;;;;;N;;;;; +A107;YI SYLLABLE DAT;Lo;0;L;;;;;N;;;;; +A108;YI SYLLABLE DAX;Lo;0;L;;;;;N;;;;; +A109;YI SYLLABLE DA;Lo;0;L;;;;;N;;;;; +A10A;YI SYLLABLE DAP;Lo;0;L;;;;;N;;;;; +A10B;YI SYLLABLE DUOX;Lo;0;L;;;;;N;;;;; +A10C;YI SYLLABLE DUO;Lo;0;L;;;;;N;;;;; +A10D;YI SYLLABLE DOT;Lo;0;L;;;;;N;;;;; +A10E;YI SYLLABLE DOX;Lo;0;L;;;;;N;;;;; +A10F;YI SYLLABLE DO;Lo;0;L;;;;;N;;;;; +A110;YI SYLLABLE DOP;Lo;0;L;;;;;N;;;;; +A111;YI SYLLABLE DEX;Lo;0;L;;;;;N;;;;; +A112;YI SYLLABLE DE;Lo;0;L;;;;;N;;;;; +A113;YI SYLLABLE DEP;Lo;0;L;;;;;N;;;;; +A114;YI SYLLABLE DUT;Lo;0;L;;;;;N;;;;; +A115;YI SYLLABLE DUX;Lo;0;L;;;;;N;;;;; +A116;YI SYLLABLE DU;Lo;0;L;;;;;N;;;;; +A117;YI SYLLABLE DUP;Lo;0;L;;;;;N;;;;; +A118;YI SYLLABLE DURX;Lo;0;L;;;;;N;;;;; +A119;YI SYLLABLE DUR;Lo;0;L;;;;;N;;;;; +A11A;YI SYLLABLE TIT;Lo;0;L;;;;;N;;;;; +A11B;YI SYLLABLE TIX;Lo;0;L;;;;;N;;;;; +A11C;YI SYLLABLE TI;Lo;0;L;;;;;N;;;;; +A11D;YI SYLLABLE TIP;Lo;0;L;;;;;N;;;;; +A11E;YI SYLLABLE TIEX;Lo;0;L;;;;;N;;;;; +A11F;YI SYLLABLE TIE;Lo;0;L;;;;;N;;;;; +A120;YI SYLLABLE TIEP;Lo;0;L;;;;;N;;;;; +A121;YI SYLLABLE TAT;Lo;0;L;;;;;N;;;;; +A122;YI SYLLABLE TAX;Lo;0;L;;;;;N;;;;; +A123;YI SYLLABLE TA;Lo;0;L;;;;;N;;;;; +A124;YI SYLLABLE TAP;Lo;0;L;;;;;N;;;;; +A125;YI SYLLABLE TUOT;Lo;0;L;;;;;N;;;;; +A126;YI SYLLABLE TUOX;Lo;0;L;;;;;N;;;;; +A127;YI SYLLABLE TUO;Lo;0;L;;;;;N;;;;; +A128;YI SYLLABLE TUOP;Lo;0;L;;;;;N;;;;; +A129;YI SYLLABLE TOT;Lo;0;L;;;;;N;;;;; +A12A;YI SYLLABLE TOX;Lo;0;L;;;;;N;;;;; +A12B;YI SYLLABLE TO;Lo;0;L;;;;;N;;;;; +A12C;YI SYLLABLE TOP;Lo;0;L;;;;;N;;;;; +A12D;YI SYLLABLE TEX;Lo;0;L;;;;;N;;;;; +A12E;YI SYLLABLE TE;Lo;0;L;;;;;N;;;;; +A12F;YI SYLLABLE TEP;Lo;0;L;;;;;N;;;;; +A130;YI SYLLABLE TUT;Lo;0;L;;;;;N;;;;; +A131;YI SYLLABLE TUX;Lo;0;L;;;;;N;;;;; +A132;YI SYLLABLE TU;Lo;0;L;;;;;N;;;;; +A133;YI SYLLABLE TUP;Lo;0;L;;;;;N;;;;; +A134;YI SYLLABLE TURX;Lo;0;L;;;;;N;;;;; +A135;YI SYLLABLE TUR;Lo;0;L;;;;;N;;;;; +A136;YI SYLLABLE DDIT;Lo;0;L;;;;;N;;;;; +A137;YI SYLLABLE DDIX;Lo;0;L;;;;;N;;;;; +A138;YI SYLLABLE DDI;Lo;0;L;;;;;N;;;;; +A139;YI SYLLABLE DDIP;Lo;0;L;;;;;N;;;;; +A13A;YI SYLLABLE DDIEX;Lo;0;L;;;;;N;;;;; +A13B;YI SYLLABLE DDIE;Lo;0;L;;;;;N;;;;; +A13C;YI SYLLABLE DDIEP;Lo;0;L;;;;;N;;;;; +A13D;YI SYLLABLE DDAT;Lo;0;L;;;;;N;;;;; +A13E;YI SYLLABLE DDAX;Lo;0;L;;;;;N;;;;; +A13F;YI SYLLABLE DDA;Lo;0;L;;;;;N;;;;; +A140;YI SYLLABLE DDAP;Lo;0;L;;;;;N;;;;; +A141;YI SYLLABLE DDUOX;Lo;0;L;;;;;N;;;;; +A142;YI SYLLABLE DDUO;Lo;0;L;;;;;N;;;;; +A143;YI SYLLABLE DDUOP;Lo;0;L;;;;;N;;;;; +A144;YI SYLLABLE DDOT;Lo;0;L;;;;;N;;;;; +A145;YI SYLLABLE DDOX;Lo;0;L;;;;;N;;;;; +A146;YI SYLLABLE DDO;Lo;0;L;;;;;N;;;;; +A147;YI SYLLABLE DDOP;Lo;0;L;;;;;N;;;;; +A148;YI SYLLABLE DDEX;Lo;0;L;;;;;N;;;;; +A149;YI SYLLABLE DDE;Lo;0;L;;;;;N;;;;; +A14A;YI SYLLABLE DDEP;Lo;0;L;;;;;N;;;;; +A14B;YI SYLLABLE DDUT;Lo;0;L;;;;;N;;;;; +A14C;YI SYLLABLE DDUX;Lo;0;L;;;;;N;;;;; +A14D;YI SYLLABLE DDU;Lo;0;L;;;;;N;;;;; +A14E;YI SYLLABLE DDUP;Lo;0;L;;;;;N;;;;; +A14F;YI SYLLABLE DDURX;Lo;0;L;;;;;N;;;;; +A150;YI SYLLABLE DDUR;Lo;0;L;;;;;N;;;;; +A151;YI SYLLABLE NDIT;Lo;0;L;;;;;N;;;;; +A152;YI SYLLABLE NDIX;Lo;0;L;;;;;N;;;;; +A153;YI SYLLABLE NDI;Lo;0;L;;;;;N;;;;; +A154;YI SYLLABLE NDIP;Lo;0;L;;;;;N;;;;; +A155;YI SYLLABLE NDIEX;Lo;0;L;;;;;N;;;;; +A156;YI SYLLABLE NDIE;Lo;0;L;;;;;N;;;;; +A157;YI SYLLABLE NDAT;Lo;0;L;;;;;N;;;;; +A158;YI SYLLABLE NDAX;Lo;0;L;;;;;N;;;;; +A159;YI SYLLABLE NDA;Lo;0;L;;;;;N;;;;; +A15A;YI SYLLABLE NDAP;Lo;0;L;;;;;N;;;;; +A15B;YI SYLLABLE NDOT;Lo;0;L;;;;;N;;;;; +A15C;YI SYLLABLE NDOX;Lo;0;L;;;;;N;;;;; +A15D;YI SYLLABLE NDO;Lo;0;L;;;;;N;;;;; +A15E;YI SYLLABLE NDOP;Lo;0;L;;;;;N;;;;; +A15F;YI SYLLABLE NDEX;Lo;0;L;;;;;N;;;;; +A160;YI SYLLABLE NDE;Lo;0;L;;;;;N;;;;; +A161;YI SYLLABLE NDEP;Lo;0;L;;;;;N;;;;; +A162;YI SYLLABLE NDUT;Lo;0;L;;;;;N;;;;; +A163;YI SYLLABLE NDUX;Lo;0;L;;;;;N;;;;; +A164;YI SYLLABLE NDU;Lo;0;L;;;;;N;;;;; +A165;YI SYLLABLE NDUP;Lo;0;L;;;;;N;;;;; +A166;YI SYLLABLE NDURX;Lo;0;L;;;;;N;;;;; +A167;YI SYLLABLE NDUR;Lo;0;L;;;;;N;;;;; +A168;YI SYLLABLE HNIT;Lo;0;L;;;;;N;;;;; +A169;YI SYLLABLE HNIX;Lo;0;L;;;;;N;;;;; +A16A;YI SYLLABLE HNI;Lo;0;L;;;;;N;;;;; +A16B;YI SYLLABLE HNIP;Lo;0;L;;;;;N;;;;; +A16C;YI SYLLABLE HNIET;Lo;0;L;;;;;N;;;;; +A16D;YI SYLLABLE HNIEX;Lo;0;L;;;;;N;;;;; +A16E;YI SYLLABLE HNIE;Lo;0;L;;;;;N;;;;; +A16F;YI SYLLABLE HNIEP;Lo;0;L;;;;;N;;;;; +A170;YI SYLLABLE HNAT;Lo;0;L;;;;;N;;;;; +A171;YI SYLLABLE HNAX;Lo;0;L;;;;;N;;;;; +A172;YI SYLLABLE HNA;Lo;0;L;;;;;N;;;;; +A173;YI SYLLABLE HNAP;Lo;0;L;;;;;N;;;;; +A174;YI SYLLABLE HNUOX;Lo;0;L;;;;;N;;;;; +A175;YI SYLLABLE HNUO;Lo;0;L;;;;;N;;;;; +A176;YI SYLLABLE HNOT;Lo;0;L;;;;;N;;;;; +A177;YI SYLLABLE HNOX;Lo;0;L;;;;;N;;;;; +A178;YI SYLLABLE HNOP;Lo;0;L;;;;;N;;;;; +A179;YI SYLLABLE HNEX;Lo;0;L;;;;;N;;;;; +A17A;YI SYLLABLE HNE;Lo;0;L;;;;;N;;;;; +A17B;YI SYLLABLE HNEP;Lo;0;L;;;;;N;;;;; +A17C;YI SYLLABLE HNUT;Lo;0;L;;;;;N;;;;; +A17D;YI SYLLABLE NIT;Lo;0;L;;;;;N;;;;; +A17E;YI SYLLABLE NIX;Lo;0;L;;;;;N;;;;; +A17F;YI SYLLABLE NI;Lo;0;L;;;;;N;;;;; +A180;YI SYLLABLE NIP;Lo;0;L;;;;;N;;;;; +A181;YI SYLLABLE NIEX;Lo;0;L;;;;;N;;;;; +A182;YI SYLLABLE NIE;Lo;0;L;;;;;N;;;;; +A183;YI SYLLABLE NIEP;Lo;0;L;;;;;N;;;;; +A184;YI SYLLABLE NAX;Lo;0;L;;;;;N;;;;; +A185;YI SYLLABLE NA;Lo;0;L;;;;;N;;;;; +A186;YI SYLLABLE NAP;Lo;0;L;;;;;N;;;;; +A187;YI SYLLABLE NUOX;Lo;0;L;;;;;N;;;;; +A188;YI SYLLABLE NUO;Lo;0;L;;;;;N;;;;; +A189;YI SYLLABLE NUOP;Lo;0;L;;;;;N;;;;; +A18A;YI SYLLABLE NOT;Lo;0;L;;;;;N;;;;; +A18B;YI SYLLABLE NOX;Lo;0;L;;;;;N;;;;; +A18C;YI SYLLABLE NO;Lo;0;L;;;;;N;;;;; +A18D;YI SYLLABLE NOP;Lo;0;L;;;;;N;;;;; +A18E;YI SYLLABLE NEX;Lo;0;L;;;;;N;;;;; +A18F;YI SYLLABLE NE;Lo;0;L;;;;;N;;;;; +A190;YI SYLLABLE NEP;Lo;0;L;;;;;N;;;;; +A191;YI SYLLABLE NUT;Lo;0;L;;;;;N;;;;; +A192;YI SYLLABLE NUX;Lo;0;L;;;;;N;;;;; +A193;YI SYLLABLE NU;Lo;0;L;;;;;N;;;;; +A194;YI SYLLABLE NUP;Lo;0;L;;;;;N;;;;; +A195;YI SYLLABLE NURX;Lo;0;L;;;;;N;;;;; +A196;YI SYLLABLE NUR;Lo;0;L;;;;;N;;;;; +A197;YI SYLLABLE HLIT;Lo;0;L;;;;;N;;;;; +A198;YI SYLLABLE HLIX;Lo;0;L;;;;;N;;;;; +A199;YI SYLLABLE HLI;Lo;0;L;;;;;N;;;;; +A19A;YI SYLLABLE HLIP;Lo;0;L;;;;;N;;;;; +A19B;YI SYLLABLE HLIEX;Lo;0;L;;;;;N;;;;; +A19C;YI SYLLABLE HLIE;Lo;0;L;;;;;N;;;;; +A19D;YI SYLLABLE HLIEP;Lo;0;L;;;;;N;;;;; +A19E;YI SYLLABLE HLAT;Lo;0;L;;;;;N;;;;; +A19F;YI SYLLABLE HLAX;Lo;0;L;;;;;N;;;;; +A1A0;YI SYLLABLE HLA;Lo;0;L;;;;;N;;;;; +A1A1;YI SYLLABLE HLAP;Lo;0;L;;;;;N;;;;; +A1A2;YI SYLLABLE HLUOX;Lo;0;L;;;;;N;;;;; +A1A3;YI SYLLABLE HLUO;Lo;0;L;;;;;N;;;;; +A1A4;YI SYLLABLE HLUOP;Lo;0;L;;;;;N;;;;; +A1A5;YI SYLLABLE HLOX;Lo;0;L;;;;;N;;;;; +A1A6;YI SYLLABLE HLO;Lo;0;L;;;;;N;;;;; +A1A7;YI SYLLABLE HLOP;Lo;0;L;;;;;N;;;;; +A1A8;YI SYLLABLE HLEX;Lo;0;L;;;;;N;;;;; +A1A9;YI SYLLABLE HLE;Lo;0;L;;;;;N;;;;; +A1AA;YI SYLLABLE HLEP;Lo;0;L;;;;;N;;;;; +A1AB;YI SYLLABLE HLUT;Lo;0;L;;;;;N;;;;; +A1AC;YI SYLLABLE HLUX;Lo;0;L;;;;;N;;;;; +A1AD;YI SYLLABLE HLU;Lo;0;L;;;;;N;;;;; +A1AE;YI SYLLABLE HLUP;Lo;0;L;;;;;N;;;;; +A1AF;YI SYLLABLE HLURX;Lo;0;L;;;;;N;;;;; +A1B0;YI SYLLABLE HLUR;Lo;0;L;;;;;N;;;;; +A1B1;YI SYLLABLE HLYT;Lo;0;L;;;;;N;;;;; +A1B2;YI SYLLABLE HLYX;Lo;0;L;;;;;N;;;;; +A1B3;YI SYLLABLE HLY;Lo;0;L;;;;;N;;;;; +A1B4;YI SYLLABLE HLYP;Lo;0;L;;;;;N;;;;; +A1B5;YI SYLLABLE HLYRX;Lo;0;L;;;;;N;;;;; +A1B6;YI SYLLABLE HLYR;Lo;0;L;;;;;N;;;;; +A1B7;YI SYLLABLE LIT;Lo;0;L;;;;;N;;;;; +A1B8;YI SYLLABLE LIX;Lo;0;L;;;;;N;;;;; +A1B9;YI SYLLABLE LI;Lo;0;L;;;;;N;;;;; +A1BA;YI SYLLABLE LIP;Lo;0;L;;;;;N;;;;; +A1BB;YI SYLLABLE LIET;Lo;0;L;;;;;N;;;;; +A1BC;YI SYLLABLE LIEX;Lo;0;L;;;;;N;;;;; +A1BD;YI SYLLABLE LIE;Lo;0;L;;;;;N;;;;; +A1BE;YI SYLLABLE LIEP;Lo;0;L;;;;;N;;;;; +A1BF;YI SYLLABLE LAT;Lo;0;L;;;;;N;;;;; +A1C0;YI SYLLABLE LAX;Lo;0;L;;;;;N;;;;; +A1C1;YI SYLLABLE LA;Lo;0;L;;;;;N;;;;; +A1C2;YI SYLLABLE LAP;Lo;0;L;;;;;N;;;;; +A1C3;YI SYLLABLE LUOT;Lo;0;L;;;;;N;;;;; +A1C4;YI SYLLABLE LUOX;Lo;0;L;;;;;N;;;;; +A1C5;YI SYLLABLE LUO;Lo;0;L;;;;;N;;;;; +A1C6;YI SYLLABLE LUOP;Lo;0;L;;;;;N;;;;; +A1C7;YI SYLLABLE LOT;Lo;0;L;;;;;N;;;;; +A1C8;YI SYLLABLE LOX;Lo;0;L;;;;;N;;;;; +A1C9;YI SYLLABLE LO;Lo;0;L;;;;;N;;;;; +A1CA;YI SYLLABLE LOP;Lo;0;L;;;;;N;;;;; +A1CB;YI SYLLABLE LEX;Lo;0;L;;;;;N;;;;; +A1CC;YI SYLLABLE LE;Lo;0;L;;;;;N;;;;; +A1CD;YI SYLLABLE LEP;Lo;0;L;;;;;N;;;;; +A1CE;YI SYLLABLE LUT;Lo;0;L;;;;;N;;;;; +A1CF;YI SYLLABLE LUX;Lo;0;L;;;;;N;;;;; +A1D0;YI SYLLABLE LU;Lo;0;L;;;;;N;;;;; +A1D1;YI SYLLABLE LUP;Lo;0;L;;;;;N;;;;; +A1D2;YI SYLLABLE LURX;Lo;0;L;;;;;N;;;;; +A1D3;YI SYLLABLE LUR;Lo;0;L;;;;;N;;;;; +A1D4;YI SYLLABLE LYT;Lo;0;L;;;;;N;;;;; +A1D5;YI SYLLABLE LYX;Lo;0;L;;;;;N;;;;; +A1D6;YI SYLLABLE LY;Lo;0;L;;;;;N;;;;; +A1D7;YI SYLLABLE LYP;Lo;0;L;;;;;N;;;;; +A1D8;YI SYLLABLE LYRX;Lo;0;L;;;;;N;;;;; +A1D9;YI SYLLABLE LYR;Lo;0;L;;;;;N;;;;; +A1DA;YI SYLLABLE GIT;Lo;0;L;;;;;N;;;;; +A1DB;YI SYLLABLE GIX;Lo;0;L;;;;;N;;;;; +A1DC;YI SYLLABLE GI;Lo;0;L;;;;;N;;;;; +A1DD;YI SYLLABLE GIP;Lo;0;L;;;;;N;;;;; +A1DE;YI SYLLABLE GIET;Lo;0;L;;;;;N;;;;; +A1DF;YI SYLLABLE GIEX;Lo;0;L;;;;;N;;;;; +A1E0;YI SYLLABLE GIE;Lo;0;L;;;;;N;;;;; +A1E1;YI SYLLABLE GIEP;Lo;0;L;;;;;N;;;;; +A1E2;YI SYLLABLE GAT;Lo;0;L;;;;;N;;;;; +A1E3;YI SYLLABLE GAX;Lo;0;L;;;;;N;;;;; +A1E4;YI SYLLABLE GA;Lo;0;L;;;;;N;;;;; +A1E5;YI SYLLABLE GAP;Lo;0;L;;;;;N;;;;; +A1E6;YI SYLLABLE GUOT;Lo;0;L;;;;;N;;;;; +A1E7;YI SYLLABLE GUOX;Lo;0;L;;;;;N;;;;; +A1E8;YI SYLLABLE GUO;Lo;0;L;;;;;N;;;;; +A1E9;YI SYLLABLE GUOP;Lo;0;L;;;;;N;;;;; +A1EA;YI SYLLABLE GOT;Lo;0;L;;;;;N;;;;; +A1EB;YI SYLLABLE GOX;Lo;0;L;;;;;N;;;;; +A1EC;YI SYLLABLE GO;Lo;0;L;;;;;N;;;;; +A1ED;YI SYLLABLE GOP;Lo;0;L;;;;;N;;;;; +A1EE;YI SYLLABLE GET;Lo;0;L;;;;;N;;;;; +A1EF;YI SYLLABLE GEX;Lo;0;L;;;;;N;;;;; +A1F0;YI SYLLABLE GE;Lo;0;L;;;;;N;;;;; +A1F1;YI SYLLABLE GEP;Lo;0;L;;;;;N;;;;; +A1F2;YI SYLLABLE GUT;Lo;0;L;;;;;N;;;;; +A1F3;YI SYLLABLE GUX;Lo;0;L;;;;;N;;;;; +A1F4;YI SYLLABLE GU;Lo;0;L;;;;;N;;;;; +A1F5;YI SYLLABLE GUP;Lo;0;L;;;;;N;;;;; +A1F6;YI SYLLABLE GURX;Lo;0;L;;;;;N;;;;; +A1F7;YI SYLLABLE GUR;Lo;0;L;;;;;N;;;;; +A1F8;YI SYLLABLE KIT;Lo;0;L;;;;;N;;;;; +A1F9;YI SYLLABLE KIX;Lo;0;L;;;;;N;;;;; +A1FA;YI SYLLABLE KI;Lo;0;L;;;;;N;;;;; +A1FB;YI SYLLABLE KIP;Lo;0;L;;;;;N;;;;; +A1FC;YI SYLLABLE KIEX;Lo;0;L;;;;;N;;;;; +A1FD;YI SYLLABLE KIE;Lo;0;L;;;;;N;;;;; +A1FE;YI SYLLABLE KIEP;Lo;0;L;;;;;N;;;;; +A1FF;YI SYLLABLE KAT;Lo;0;L;;;;;N;;;;; +A200;YI SYLLABLE KAX;Lo;0;L;;;;;N;;;;; +A201;YI SYLLABLE KA;Lo;0;L;;;;;N;;;;; +A202;YI SYLLABLE KAP;Lo;0;L;;;;;N;;;;; +A203;YI SYLLABLE KUOX;Lo;0;L;;;;;N;;;;; +A204;YI SYLLABLE KUO;Lo;0;L;;;;;N;;;;; +A205;YI SYLLABLE KUOP;Lo;0;L;;;;;N;;;;; +A206;YI SYLLABLE KOT;Lo;0;L;;;;;N;;;;; +A207;YI SYLLABLE KOX;Lo;0;L;;;;;N;;;;; +A208;YI SYLLABLE KO;Lo;0;L;;;;;N;;;;; +A209;YI SYLLABLE KOP;Lo;0;L;;;;;N;;;;; +A20A;YI SYLLABLE KET;Lo;0;L;;;;;N;;;;; +A20B;YI SYLLABLE KEX;Lo;0;L;;;;;N;;;;; +A20C;YI SYLLABLE KE;Lo;0;L;;;;;N;;;;; +A20D;YI SYLLABLE KEP;Lo;0;L;;;;;N;;;;; +A20E;YI SYLLABLE KUT;Lo;0;L;;;;;N;;;;; +A20F;YI SYLLABLE KUX;Lo;0;L;;;;;N;;;;; +A210;YI SYLLABLE KU;Lo;0;L;;;;;N;;;;; +A211;YI SYLLABLE KUP;Lo;0;L;;;;;N;;;;; +A212;YI SYLLABLE KURX;Lo;0;L;;;;;N;;;;; +A213;YI SYLLABLE KUR;Lo;0;L;;;;;N;;;;; +A214;YI SYLLABLE GGIT;Lo;0;L;;;;;N;;;;; +A215;YI SYLLABLE GGIX;Lo;0;L;;;;;N;;;;; +A216;YI SYLLABLE GGI;Lo;0;L;;;;;N;;;;; +A217;YI SYLLABLE GGIEX;Lo;0;L;;;;;N;;;;; +A218;YI SYLLABLE GGIE;Lo;0;L;;;;;N;;;;; +A219;YI SYLLABLE GGIEP;Lo;0;L;;;;;N;;;;; +A21A;YI SYLLABLE GGAT;Lo;0;L;;;;;N;;;;; +A21B;YI SYLLABLE GGAX;Lo;0;L;;;;;N;;;;; +A21C;YI SYLLABLE GGA;Lo;0;L;;;;;N;;;;; +A21D;YI SYLLABLE GGAP;Lo;0;L;;;;;N;;;;; +A21E;YI SYLLABLE GGUOT;Lo;0;L;;;;;N;;;;; +A21F;YI SYLLABLE GGUOX;Lo;0;L;;;;;N;;;;; +A220;YI SYLLABLE GGUO;Lo;0;L;;;;;N;;;;; +A221;YI SYLLABLE GGUOP;Lo;0;L;;;;;N;;;;; +A222;YI SYLLABLE GGOT;Lo;0;L;;;;;N;;;;; +A223;YI SYLLABLE GGOX;Lo;0;L;;;;;N;;;;; +A224;YI SYLLABLE GGO;Lo;0;L;;;;;N;;;;; +A225;YI SYLLABLE GGOP;Lo;0;L;;;;;N;;;;; +A226;YI SYLLABLE GGET;Lo;0;L;;;;;N;;;;; +A227;YI SYLLABLE GGEX;Lo;0;L;;;;;N;;;;; +A228;YI SYLLABLE GGE;Lo;0;L;;;;;N;;;;; +A229;YI SYLLABLE GGEP;Lo;0;L;;;;;N;;;;; +A22A;YI SYLLABLE GGUT;Lo;0;L;;;;;N;;;;; +A22B;YI SYLLABLE GGUX;Lo;0;L;;;;;N;;;;; +A22C;YI SYLLABLE GGU;Lo;0;L;;;;;N;;;;; +A22D;YI SYLLABLE GGUP;Lo;0;L;;;;;N;;;;; +A22E;YI SYLLABLE GGURX;Lo;0;L;;;;;N;;;;; +A22F;YI SYLLABLE GGUR;Lo;0;L;;;;;N;;;;; +A230;YI SYLLABLE MGIEX;Lo;0;L;;;;;N;;;;; +A231;YI SYLLABLE MGIE;Lo;0;L;;;;;N;;;;; +A232;YI SYLLABLE MGAT;Lo;0;L;;;;;N;;;;; +A233;YI SYLLABLE MGAX;Lo;0;L;;;;;N;;;;; +A234;YI SYLLABLE MGA;Lo;0;L;;;;;N;;;;; +A235;YI SYLLABLE MGAP;Lo;0;L;;;;;N;;;;; +A236;YI SYLLABLE MGUOX;Lo;0;L;;;;;N;;;;; +A237;YI SYLLABLE MGUO;Lo;0;L;;;;;N;;;;; +A238;YI SYLLABLE MGUOP;Lo;0;L;;;;;N;;;;; +A239;YI SYLLABLE MGOT;Lo;0;L;;;;;N;;;;; +A23A;YI SYLLABLE MGOX;Lo;0;L;;;;;N;;;;; +A23B;YI SYLLABLE MGO;Lo;0;L;;;;;N;;;;; +A23C;YI SYLLABLE MGOP;Lo;0;L;;;;;N;;;;; +A23D;YI SYLLABLE MGEX;Lo;0;L;;;;;N;;;;; +A23E;YI SYLLABLE MGE;Lo;0;L;;;;;N;;;;; +A23F;YI SYLLABLE MGEP;Lo;0;L;;;;;N;;;;; +A240;YI SYLLABLE MGUT;Lo;0;L;;;;;N;;;;; +A241;YI SYLLABLE MGUX;Lo;0;L;;;;;N;;;;; +A242;YI SYLLABLE MGU;Lo;0;L;;;;;N;;;;; +A243;YI SYLLABLE MGUP;Lo;0;L;;;;;N;;;;; +A244;YI SYLLABLE MGURX;Lo;0;L;;;;;N;;;;; +A245;YI SYLLABLE MGUR;Lo;0;L;;;;;N;;;;; +A246;YI SYLLABLE HXIT;Lo;0;L;;;;;N;;;;; +A247;YI SYLLABLE HXIX;Lo;0;L;;;;;N;;;;; +A248;YI SYLLABLE HXI;Lo;0;L;;;;;N;;;;; +A249;YI SYLLABLE HXIP;Lo;0;L;;;;;N;;;;; +A24A;YI SYLLABLE HXIET;Lo;0;L;;;;;N;;;;; +A24B;YI SYLLABLE HXIEX;Lo;0;L;;;;;N;;;;; +A24C;YI SYLLABLE HXIE;Lo;0;L;;;;;N;;;;; +A24D;YI SYLLABLE HXIEP;Lo;0;L;;;;;N;;;;; +A24E;YI SYLLABLE HXAT;Lo;0;L;;;;;N;;;;; +A24F;YI SYLLABLE HXAX;Lo;0;L;;;;;N;;;;; +A250;YI SYLLABLE HXA;Lo;0;L;;;;;N;;;;; +A251;YI SYLLABLE HXAP;Lo;0;L;;;;;N;;;;; +A252;YI SYLLABLE HXUOT;Lo;0;L;;;;;N;;;;; +A253;YI SYLLABLE HXUOX;Lo;0;L;;;;;N;;;;; +A254;YI SYLLABLE HXUO;Lo;0;L;;;;;N;;;;; +A255;YI SYLLABLE HXUOP;Lo;0;L;;;;;N;;;;; +A256;YI SYLLABLE HXOT;Lo;0;L;;;;;N;;;;; +A257;YI SYLLABLE HXOX;Lo;0;L;;;;;N;;;;; +A258;YI SYLLABLE HXO;Lo;0;L;;;;;N;;;;; +A259;YI SYLLABLE HXOP;Lo;0;L;;;;;N;;;;; +A25A;YI SYLLABLE HXEX;Lo;0;L;;;;;N;;;;; +A25B;YI SYLLABLE HXE;Lo;0;L;;;;;N;;;;; +A25C;YI SYLLABLE HXEP;Lo;0;L;;;;;N;;;;; +A25D;YI SYLLABLE NGIEX;Lo;0;L;;;;;N;;;;; +A25E;YI SYLLABLE NGIE;Lo;0;L;;;;;N;;;;; +A25F;YI SYLLABLE NGIEP;Lo;0;L;;;;;N;;;;; +A260;YI SYLLABLE NGAT;Lo;0;L;;;;;N;;;;; +A261;YI SYLLABLE NGAX;Lo;0;L;;;;;N;;;;; +A262;YI SYLLABLE NGA;Lo;0;L;;;;;N;;;;; +A263;YI SYLLABLE NGAP;Lo;0;L;;;;;N;;;;; +A264;YI SYLLABLE NGUOT;Lo;0;L;;;;;N;;;;; +A265;YI SYLLABLE NGUOX;Lo;0;L;;;;;N;;;;; +A266;YI SYLLABLE NGUO;Lo;0;L;;;;;N;;;;; +A267;YI SYLLABLE NGOT;Lo;0;L;;;;;N;;;;; +A268;YI SYLLABLE NGOX;Lo;0;L;;;;;N;;;;; +A269;YI SYLLABLE NGO;Lo;0;L;;;;;N;;;;; +A26A;YI SYLLABLE NGOP;Lo;0;L;;;;;N;;;;; +A26B;YI SYLLABLE NGEX;Lo;0;L;;;;;N;;;;; +A26C;YI SYLLABLE NGE;Lo;0;L;;;;;N;;;;; +A26D;YI SYLLABLE NGEP;Lo;0;L;;;;;N;;;;; +A26E;YI SYLLABLE HIT;Lo;0;L;;;;;N;;;;; +A26F;YI SYLLABLE HIEX;Lo;0;L;;;;;N;;;;; +A270;YI SYLLABLE HIE;Lo;0;L;;;;;N;;;;; +A271;YI SYLLABLE HAT;Lo;0;L;;;;;N;;;;; +A272;YI SYLLABLE HAX;Lo;0;L;;;;;N;;;;; +A273;YI SYLLABLE HA;Lo;0;L;;;;;N;;;;; +A274;YI SYLLABLE HAP;Lo;0;L;;;;;N;;;;; +A275;YI SYLLABLE HUOT;Lo;0;L;;;;;N;;;;; +A276;YI SYLLABLE HUOX;Lo;0;L;;;;;N;;;;; +A277;YI SYLLABLE HUO;Lo;0;L;;;;;N;;;;; +A278;YI SYLLABLE HUOP;Lo;0;L;;;;;N;;;;; +A279;YI SYLLABLE HOT;Lo;0;L;;;;;N;;;;; +A27A;YI SYLLABLE HOX;Lo;0;L;;;;;N;;;;; +A27B;YI SYLLABLE HO;Lo;0;L;;;;;N;;;;; +A27C;YI SYLLABLE HOP;Lo;0;L;;;;;N;;;;; +A27D;YI SYLLABLE HEX;Lo;0;L;;;;;N;;;;; +A27E;YI SYLLABLE HE;Lo;0;L;;;;;N;;;;; +A27F;YI SYLLABLE HEP;Lo;0;L;;;;;N;;;;; +A280;YI SYLLABLE WAT;Lo;0;L;;;;;N;;;;; +A281;YI SYLLABLE WAX;Lo;0;L;;;;;N;;;;; +A282;YI SYLLABLE WA;Lo;0;L;;;;;N;;;;; +A283;YI SYLLABLE WAP;Lo;0;L;;;;;N;;;;; +A284;YI SYLLABLE WUOX;Lo;0;L;;;;;N;;;;; +A285;YI SYLLABLE WUO;Lo;0;L;;;;;N;;;;; +A286;YI SYLLABLE WUOP;Lo;0;L;;;;;N;;;;; +A287;YI SYLLABLE WOX;Lo;0;L;;;;;N;;;;; +A288;YI SYLLABLE WO;Lo;0;L;;;;;N;;;;; +A289;YI SYLLABLE WOP;Lo;0;L;;;;;N;;;;; +A28A;YI SYLLABLE WEX;Lo;0;L;;;;;N;;;;; +A28B;YI SYLLABLE WE;Lo;0;L;;;;;N;;;;; +A28C;YI SYLLABLE WEP;Lo;0;L;;;;;N;;;;; +A28D;YI SYLLABLE ZIT;Lo;0;L;;;;;N;;;;; +A28E;YI SYLLABLE ZIX;Lo;0;L;;;;;N;;;;; +A28F;YI SYLLABLE ZI;Lo;0;L;;;;;N;;;;; +A290;YI SYLLABLE ZIP;Lo;0;L;;;;;N;;;;; +A291;YI SYLLABLE ZIEX;Lo;0;L;;;;;N;;;;; +A292;YI SYLLABLE ZIE;Lo;0;L;;;;;N;;;;; +A293;YI SYLLABLE ZIEP;Lo;0;L;;;;;N;;;;; +A294;YI SYLLABLE ZAT;Lo;0;L;;;;;N;;;;; +A295;YI SYLLABLE ZAX;Lo;0;L;;;;;N;;;;; +A296;YI SYLLABLE ZA;Lo;0;L;;;;;N;;;;; +A297;YI SYLLABLE ZAP;Lo;0;L;;;;;N;;;;; +A298;YI SYLLABLE ZUOX;Lo;0;L;;;;;N;;;;; +A299;YI SYLLABLE ZUO;Lo;0;L;;;;;N;;;;; +A29A;YI SYLLABLE ZUOP;Lo;0;L;;;;;N;;;;; +A29B;YI SYLLABLE ZOT;Lo;0;L;;;;;N;;;;; +A29C;YI SYLLABLE ZOX;Lo;0;L;;;;;N;;;;; +A29D;YI SYLLABLE ZO;Lo;0;L;;;;;N;;;;; +A29E;YI SYLLABLE ZOP;Lo;0;L;;;;;N;;;;; +A29F;YI SYLLABLE ZEX;Lo;0;L;;;;;N;;;;; +A2A0;YI SYLLABLE ZE;Lo;0;L;;;;;N;;;;; +A2A1;YI SYLLABLE ZEP;Lo;0;L;;;;;N;;;;; +A2A2;YI SYLLABLE ZUT;Lo;0;L;;;;;N;;;;; +A2A3;YI SYLLABLE ZUX;Lo;0;L;;;;;N;;;;; +A2A4;YI SYLLABLE ZU;Lo;0;L;;;;;N;;;;; +A2A5;YI SYLLABLE ZUP;Lo;0;L;;;;;N;;;;; +A2A6;YI SYLLABLE ZURX;Lo;0;L;;;;;N;;;;; +A2A7;YI SYLLABLE ZUR;Lo;0;L;;;;;N;;;;; +A2A8;YI SYLLABLE ZYT;Lo;0;L;;;;;N;;;;; +A2A9;YI SYLLABLE ZYX;Lo;0;L;;;;;N;;;;; +A2AA;YI SYLLABLE ZY;Lo;0;L;;;;;N;;;;; +A2AB;YI SYLLABLE ZYP;Lo;0;L;;;;;N;;;;; +A2AC;YI SYLLABLE ZYRX;Lo;0;L;;;;;N;;;;; +A2AD;YI SYLLABLE ZYR;Lo;0;L;;;;;N;;;;; +A2AE;YI SYLLABLE CIT;Lo;0;L;;;;;N;;;;; +A2AF;YI SYLLABLE CIX;Lo;0;L;;;;;N;;;;; +A2B0;YI SYLLABLE CI;Lo;0;L;;;;;N;;;;; +A2B1;YI SYLLABLE CIP;Lo;0;L;;;;;N;;;;; +A2B2;YI SYLLABLE CIET;Lo;0;L;;;;;N;;;;; +A2B3;YI SYLLABLE CIEX;Lo;0;L;;;;;N;;;;; +A2B4;YI SYLLABLE CIE;Lo;0;L;;;;;N;;;;; +A2B5;YI SYLLABLE CIEP;Lo;0;L;;;;;N;;;;; +A2B6;YI SYLLABLE CAT;Lo;0;L;;;;;N;;;;; +A2B7;YI SYLLABLE CAX;Lo;0;L;;;;;N;;;;; +A2B8;YI SYLLABLE CA;Lo;0;L;;;;;N;;;;; +A2B9;YI SYLLABLE CAP;Lo;0;L;;;;;N;;;;; +A2BA;YI SYLLABLE CUOX;Lo;0;L;;;;;N;;;;; +A2BB;YI SYLLABLE CUO;Lo;0;L;;;;;N;;;;; +A2BC;YI SYLLABLE CUOP;Lo;0;L;;;;;N;;;;; +A2BD;YI SYLLABLE COT;Lo;0;L;;;;;N;;;;; +A2BE;YI SYLLABLE COX;Lo;0;L;;;;;N;;;;; +A2BF;YI SYLLABLE CO;Lo;0;L;;;;;N;;;;; +A2C0;YI SYLLABLE COP;Lo;0;L;;;;;N;;;;; +A2C1;YI SYLLABLE CEX;Lo;0;L;;;;;N;;;;; +A2C2;YI SYLLABLE CE;Lo;0;L;;;;;N;;;;; +A2C3;YI SYLLABLE CEP;Lo;0;L;;;;;N;;;;; +A2C4;YI SYLLABLE CUT;Lo;0;L;;;;;N;;;;; +A2C5;YI SYLLABLE CUX;Lo;0;L;;;;;N;;;;; +A2C6;YI SYLLABLE CU;Lo;0;L;;;;;N;;;;; +A2C7;YI SYLLABLE CUP;Lo;0;L;;;;;N;;;;; +A2C8;YI SYLLABLE CURX;Lo;0;L;;;;;N;;;;; +A2C9;YI SYLLABLE CUR;Lo;0;L;;;;;N;;;;; +A2CA;YI SYLLABLE CYT;Lo;0;L;;;;;N;;;;; +A2CB;YI SYLLABLE CYX;Lo;0;L;;;;;N;;;;; +A2CC;YI SYLLABLE CY;Lo;0;L;;;;;N;;;;; +A2CD;YI SYLLABLE CYP;Lo;0;L;;;;;N;;;;; +A2CE;YI SYLLABLE CYRX;Lo;0;L;;;;;N;;;;; +A2CF;YI SYLLABLE CYR;Lo;0;L;;;;;N;;;;; +A2D0;YI SYLLABLE ZZIT;Lo;0;L;;;;;N;;;;; +A2D1;YI SYLLABLE ZZIX;Lo;0;L;;;;;N;;;;; +A2D2;YI SYLLABLE ZZI;Lo;0;L;;;;;N;;;;; +A2D3;YI SYLLABLE ZZIP;Lo;0;L;;;;;N;;;;; +A2D4;YI SYLLABLE ZZIET;Lo;0;L;;;;;N;;;;; +A2D5;YI SYLLABLE ZZIEX;Lo;0;L;;;;;N;;;;; +A2D6;YI SYLLABLE ZZIE;Lo;0;L;;;;;N;;;;; +A2D7;YI SYLLABLE ZZIEP;Lo;0;L;;;;;N;;;;; +A2D8;YI SYLLABLE ZZAT;Lo;0;L;;;;;N;;;;; +A2D9;YI SYLLABLE ZZAX;Lo;0;L;;;;;N;;;;; +A2DA;YI SYLLABLE ZZA;Lo;0;L;;;;;N;;;;; +A2DB;YI SYLLABLE ZZAP;Lo;0;L;;;;;N;;;;; +A2DC;YI SYLLABLE ZZOX;Lo;0;L;;;;;N;;;;; +A2DD;YI SYLLABLE ZZO;Lo;0;L;;;;;N;;;;; +A2DE;YI SYLLABLE ZZOP;Lo;0;L;;;;;N;;;;; +A2DF;YI SYLLABLE ZZEX;Lo;0;L;;;;;N;;;;; +A2E0;YI SYLLABLE ZZE;Lo;0;L;;;;;N;;;;; +A2E1;YI SYLLABLE ZZEP;Lo;0;L;;;;;N;;;;; +A2E2;YI SYLLABLE ZZUX;Lo;0;L;;;;;N;;;;; +A2E3;YI SYLLABLE ZZU;Lo;0;L;;;;;N;;;;; +A2E4;YI SYLLABLE ZZUP;Lo;0;L;;;;;N;;;;; +A2E5;YI SYLLABLE ZZURX;Lo;0;L;;;;;N;;;;; +A2E6;YI SYLLABLE ZZUR;Lo;0;L;;;;;N;;;;; +A2E7;YI SYLLABLE ZZYT;Lo;0;L;;;;;N;;;;; +A2E8;YI SYLLABLE ZZYX;Lo;0;L;;;;;N;;;;; +A2E9;YI SYLLABLE ZZY;Lo;0;L;;;;;N;;;;; +A2EA;YI SYLLABLE ZZYP;Lo;0;L;;;;;N;;;;; +A2EB;YI SYLLABLE ZZYRX;Lo;0;L;;;;;N;;;;; +A2EC;YI SYLLABLE ZZYR;Lo;0;L;;;;;N;;;;; +A2ED;YI SYLLABLE NZIT;Lo;0;L;;;;;N;;;;; +A2EE;YI SYLLABLE NZIX;Lo;0;L;;;;;N;;;;; +A2EF;YI SYLLABLE NZI;Lo;0;L;;;;;N;;;;; +A2F0;YI SYLLABLE NZIP;Lo;0;L;;;;;N;;;;; +A2F1;YI SYLLABLE NZIEX;Lo;0;L;;;;;N;;;;; +A2F2;YI SYLLABLE NZIE;Lo;0;L;;;;;N;;;;; +A2F3;YI SYLLABLE NZIEP;Lo;0;L;;;;;N;;;;; +A2F4;YI SYLLABLE NZAT;Lo;0;L;;;;;N;;;;; +A2F5;YI SYLLABLE NZAX;Lo;0;L;;;;;N;;;;; +A2F6;YI SYLLABLE NZA;Lo;0;L;;;;;N;;;;; +A2F7;YI SYLLABLE NZAP;Lo;0;L;;;;;N;;;;; +A2F8;YI SYLLABLE NZUOX;Lo;0;L;;;;;N;;;;; +A2F9;YI SYLLABLE NZUO;Lo;0;L;;;;;N;;;;; +A2FA;YI SYLLABLE NZOX;Lo;0;L;;;;;N;;;;; +A2FB;YI SYLLABLE NZOP;Lo;0;L;;;;;N;;;;; +A2FC;YI SYLLABLE NZEX;Lo;0;L;;;;;N;;;;; +A2FD;YI SYLLABLE NZE;Lo;0;L;;;;;N;;;;; +A2FE;YI SYLLABLE NZUX;Lo;0;L;;;;;N;;;;; +A2FF;YI SYLLABLE NZU;Lo;0;L;;;;;N;;;;; +A300;YI SYLLABLE NZUP;Lo;0;L;;;;;N;;;;; +A301;YI SYLLABLE NZURX;Lo;0;L;;;;;N;;;;; +A302;YI SYLLABLE NZUR;Lo;0;L;;;;;N;;;;; +A303;YI SYLLABLE NZYT;Lo;0;L;;;;;N;;;;; +A304;YI SYLLABLE NZYX;Lo;0;L;;;;;N;;;;; +A305;YI SYLLABLE NZY;Lo;0;L;;;;;N;;;;; +A306;YI SYLLABLE NZYP;Lo;0;L;;;;;N;;;;; +A307;YI SYLLABLE NZYRX;Lo;0;L;;;;;N;;;;; +A308;YI SYLLABLE NZYR;Lo;0;L;;;;;N;;;;; +A309;YI SYLLABLE SIT;Lo;0;L;;;;;N;;;;; +A30A;YI SYLLABLE SIX;Lo;0;L;;;;;N;;;;; +A30B;YI SYLLABLE SI;Lo;0;L;;;;;N;;;;; +A30C;YI SYLLABLE SIP;Lo;0;L;;;;;N;;;;; +A30D;YI SYLLABLE SIEX;Lo;0;L;;;;;N;;;;; +A30E;YI SYLLABLE SIE;Lo;0;L;;;;;N;;;;; +A30F;YI SYLLABLE SIEP;Lo;0;L;;;;;N;;;;; +A310;YI SYLLABLE SAT;Lo;0;L;;;;;N;;;;; +A311;YI SYLLABLE SAX;Lo;0;L;;;;;N;;;;; +A312;YI SYLLABLE SA;Lo;0;L;;;;;N;;;;; +A313;YI SYLLABLE SAP;Lo;0;L;;;;;N;;;;; +A314;YI SYLLABLE SUOX;Lo;0;L;;;;;N;;;;; +A315;YI SYLLABLE SUO;Lo;0;L;;;;;N;;;;; +A316;YI SYLLABLE SUOP;Lo;0;L;;;;;N;;;;; +A317;YI SYLLABLE SOT;Lo;0;L;;;;;N;;;;; +A318;YI SYLLABLE SOX;Lo;0;L;;;;;N;;;;; +A319;YI SYLLABLE SO;Lo;0;L;;;;;N;;;;; +A31A;YI SYLLABLE SOP;Lo;0;L;;;;;N;;;;; +A31B;YI SYLLABLE SEX;Lo;0;L;;;;;N;;;;; +A31C;YI SYLLABLE SE;Lo;0;L;;;;;N;;;;; +A31D;YI SYLLABLE SEP;Lo;0;L;;;;;N;;;;; +A31E;YI SYLLABLE SUT;Lo;0;L;;;;;N;;;;; +A31F;YI SYLLABLE SUX;Lo;0;L;;;;;N;;;;; +A320;YI SYLLABLE SU;Lo;0;L;;;;;N;;;;; +A321;YI SYLLABLE SUP;Lo;0;L;;;;;N;;;;; +A322;YI SYLLABLE SURX;Lo;0;L;;;;;N;;;;; +A323;YI SYLLABLE SUR;Lo;0;L;;;;;N;;;;; +A324;YI SYLLABLE SYT;Lo;0;L;;;;;N;;;;; +A325;YI SYLLABLE SYX;Lo;0;L;;;;;N;;;;; +A326;YI SYLLABLE SY;Lo;0;L;;;;;N;;;;; +A327;YI SYLLABLE SYP;Lo;0;L;;;;;N;;;;; +A328;YI SYLLABLE SYRX;Lo;0;L;;;;;N;;;;; +A329;YI SYLLABLE SYR;Lo;0;L;;;;;N;;;;; +A32A;YI SYLLABLE SSIT;Lo;0;L;;;;;N;;;;; +A32B;YI SYLLABLE SSIX;Lo;0;L;;;;;N;;;;; +A32C;YI SYLLABLE SSI;Lo;0;L;;;;;N;;;;; +A32D;YI SYLLABLE SSIP;Lo;0;L;;;;;N;;;;; +A32E;YI SYLLABLE SSIEX;Lo;0;L;;;;;N;;;;; +A32F;YI SYLLABLE SSIE;Lo;0;L;;;;;N;;;;; +A330;YI SYLLABLE SSIEP;Lo;0;L;;;;;N;;;;; +A331;YI SYLLABLE SSAT;Lo;0;L;;;;;N;;;;; +A332;YI SYLLABLE SSAX;Lo;0;L;;;;;N;;;;; +A333;YI SYLLABLE SSA;Lo;0;L;;;;;N;;;;; +A334;YI SYLLABLE SSAP;Lo;0;L;;;;;N;;;;; +A335;YI SYLLABLE SSOT;Lo;0;L;;;;;N;;;;; +A336;YI SYLLABLE SSOX;Lo;0;L;;;;;N;;;;; +A337;YI SYLLABLE SSO;Lo;0;L;;;;;N;;;;; +A338;YI SYLLABLE SSOP;Lo;0;L;;;;;N;;;;; +A339;YI SYLLABLE SSEX;Lo;0;L;;;;;N;;;;; +A33A;YI SYLLABLE SSE;Lo;0;L;;;;;N;;;;; +A33B;YI SYLLABLE SSEP;Lo;0;L;;;;;N;;;;; +A33C;YI SYLLABLE SSUT;Lo;0;L;;;;;N;;;;; +A33D;YI SYLLABLE SSUX;Lo;0;L;;;;;N;;;;; +A33E;YI SYLLABLE SSU;Lo;0;L;;;;;N;;;;; +A33F;YI SYLLABLE SSUP;Lo;0;L;;;;;N;;;;; +A340;YI SYLLABLE SSYT;Lo;0;L;;;;;N;;;;; +A341;YI SYLLABLE SSYX;Lo;0;L;;;;;N;;;;; +A342;YI SYLLABLE SSY;Lo;0;L;;;;;N;;;;; +A343;YI SYLLABLE SSYP;Lo;0;L;;;;;N;;;;; +A344;YI SYLLABLE SSYRX;Lo;0;L;;;;;N;;;;; +A345;YI SYLLABLE SSYR;Lo;0;L;;;;;N;;;;; +A346;YI SYLLABLE ZHAT;Lo;0;L;;;;;N;;;;; +A347;YI SYLLABLE ZHAX;Lo;0;L;;;;;N;;;;; +A348;YI SYLLABLE ZHA;Lo;0;L;;;;;N;;;;; +A349;YI SYLLABLE ZHAP;Lo;0;L;;;;;N;;;;; +A34A;YI SYLLABLE ZHUOX;Lo;0;L;;;;;N;;;;; +A34B;YI SYLLABLE ZHUO;Lo;0;L;;;;;N;;;;; +A34C;YI SYLLABLE ZHUOP;Lo;0;L;;;;;N;;;;; +A34D;YI SYLLABLE ZHOT;Lo;0;L;;;;;N;;;;; +A34E;YI SYLLABLE ZHOX;Lo;0;L;;;;;N;;;;; +A34F;YI SYLLABLE ZHO;Lo;0;L;;;;;N;;;;; +A350;YI SYLLABLE ZHOP;Lo;0;L;;;;;N;;;;; +A351;YI SYLLABLE ZHET;Lo;0;L;;;;;N;;;;; +A352;YI SYLLABLE ZHEX;Lo;0;L;;;;;N;;;;; +A353;YI SYLLABLE ZHE;Lo;0;L;;;;;N;;;;; +A354;YI SYLLABLE ZHEP;Lo;0;L;;;;;N;;;;; +A355;YI SYLLABLE ZHUT;Lo;0;L;;;;;N;;;;; +A356;YI SYLLABLE ZHUX;Lo;0;L;;;;;N;;;;; +A357;YI SYLLABLE ZHU;Lo;0;L;;;;;N;;;;; +A358;YI SYLLABLE ZHUP;Lo;0;L;;;;;N;;;;; +A359;YI SYLLABLE ZHURX;Lo;0;L;;;;;N;;;;; +A35A;YI SYLLABLE ZHUR;Lo;0;L;;;;;N;;;;; +A35B;YI SYLLABLE ZHYT;Lo;0;L;;;;;N;;;;; +A35C;YI SYLLABLE ZHYX;Lo;0;L;;;;;N;;;;; +A35D;YI SYLLABLE ZHY;Lo;0;L;;;;;N;;;;; +A35E;YI SYLLABLE ZHYP;Lo;0;L;;;;;N;;;;; +A35F;YI SYLLABLE ZHYRX;Lo;0;L;;;;;N;;;;; +A360;YI SYLLABLE ZHYR;Lo;0;L;;;;;N;;;;; +A361;YI SYLLABLE CHAT;Lo;0;L;;;;;N;;;;; +A362;YI SYLLABLE CHAX;Lo;0;L;;;;;N;;;;; +A363;YI SYLLABLE CHA;Lo;0;L;;;;;N;;;;; +A364;YI SYLLABLE CHAP;Lo;0;L;;;;;N;;;;; +A365;YI SYLLABLE CHUOT;Lo;0;L;;;;;N;;;;; +A366;YI SYLLABLE CHUOX;Lo;0;L;;;;;N;;;;; +A367;YI SYLLABLE CHUO;Lo;0;L;;;;;N;;;;; +A368;YI SYLLABLE CHUOP;Lo;0;L;;;;;N;;;;; +A369;YI SYLLABLE CHOT;Lo;0;L;;;;;N;;;;; +A36A;YI SYLLABLE CHOX;Lo;0;L;;;;;N;;;;; +A36B;YI SYLLABLE CHO;Lo;0;L;;;;;N;;;;; +A36C;YI SYLLABLE CHOP;Lo;0;L;;;;;N;;;;; +A36D;YI SYLLABLE CHET;Lo;0;L;;;;;N;;;;; +A36E;YI SYLLABLE CHEX;Lo;0;L;;;;;N;;;;; +A36F;YI SYLLABLE CHE;Lo;0;L;;;;;N;;;;; +A370;YI SYLLABLE CHEP;Lo;0;L;;;;;N;;;;; +A371;YI SYLLABLE CHUX;Lo;0;L;;;;;N;;;;; +A372;YI SYLLABLE CHU;Lo;0;L;;;;;N;;;;; +A373;YI SYLLABLE CHUP;Lo;0;L;;;;;N;;;;; +A374;YI SYLLABLE CHURX;Lo;0;L;;;;;N;;;;; +A375;YI SYLLABLE CHUR;Lo;0;L;;;;;N;;;;; +A376;YI SYLLABLE CHYT;Lo;0;L;;;;;N;;;;; +A377;YI SYLLABLE CHYX;Lo;0;L;;;;;N;;;;; +A378;YI SYLLABLE CHY;Lo;0;L;;;;;N;;;;; +A379;YI SYLLABLE CHYP;Lo;0;L;;;;;N;;;;; +A37A;YI SYLLABLE CHYRX;Lo;0;L;;;;;N;;;;; +A37B;YI SYLLABLE CHYR;Lo;0;L;;;;;N;;;;; +A37C;YI SYLLABLE RRAX;Lo;0;L;;;;;N;;;;; +A37D;YI SYLLABLE RRA;Lo;0;L;;;;;N;;;;; +A37E;YI SYLLABLE RRUOX;Lo;0;L;;;;;N;;;;; +A37F;YI SYLLABLE RRUO;Lo;0;L;;;;;N;;;;; +A380;YI SYLLABLE RROT;Lo;0;L;;;;;N;;;;; +A381;YI SYLLABLE RROX;Lo;0;L;;;;;N;;;;; +A382;YI SYLLABLE RRO;Lo;0;L;;;;;N;;;;; +A383;YI SYLLABLE RROP;Lo;0;L;;;;;N;;;;; +A384;YI SYLLABLE RRET;Lo;0;L;;;;;N;;;;; +A385;YI SYLLABLE RREX;Lo;0;L;;;;;N;;;;; +A386;YI SYLLABLE RRE;Lo;0;L;;;;;N;;;;; +A387;YI SYLLABLE RREP;Lo;0;L;;;;;N;;;;; +A388;YI SYLLABLE RRUT;Lo;0;L;;;;;N;;;;; +A389;YI SYLLABLE RRUX;Lo;0;L;;;;;N;;;;; +A38A;YI SYLLABLE RRU;Lo;0;L;;;;;N;;;;; +A38B;YI SYLLABLE RRUP;Lo;0;L;;;;;N;;;;; +A38C;YI SYLLABLE RRURX;Lo;0;L;;;;;N;;;;; +A38D;YI SYLLABLE RRUR;Lo;0;L;;;;;N;;;;; +A38E;YI SYLLABLE RRYT;Lo;0;L;;;;;N;;;;; +A38F;YI SYLLABLE RRYX;Lo;0;L;;;;;N;;;;; +A390;YI SYLLABLE RRY;Lo;0;L;;;;;N;;;;; +A391;YI SYLLABLE RRYP;Lo;0;L;;;;;N;;;;; +A392;YI SYLLABLE RRYRX;Lo;0;L;;;;;N;;;;; +A393;YI SYLLABLE RRYR;Lo;0;L;;;;;N;;;;; +A394;YI SYLLABLE NRAT;Lo;0;L;;;;;N;;;;; +A395;YI SYLLABLE NRAX;Lo;0;L;;;;;N;;;;; +A396;YI SYLLABLE NRA;Lo;0;L;;;;;N;;;;; +A397;YI SYLLABLE NRAP;Lo;0;L;;;;;N;;;;; +A398;YI SYLLABLE NROX;Lo;0;L;;;;;N;;;;; +A399;YI SYLLABLE NRO;Lo;0;L;;;;;N;;;;; +A39A;YI SYLLABLE NROP;Lo;0;L;;;;;N;;;;; +A39B;YI SYLLABLE NRET;Lo;0;L;;;;;N;;;;; +A39C;YI SYLLABLE NREX;Lo;0;L;;;;;N;;;;; +A39D;YI SYLLABLE NRE;Lo;0;L;;;;;N;;;;; +A39E;YI SYLLABLE NREP;Lo;0;L;;;;;N;;;;; +A39F;YI SYLLABLE NRUT;Lo;0;L;;;;;N;;;;; +A3A0;YI SYLLABLE NRUX;Lo;0;L;;;;;N;;;;; +A3A1;YI SYLLABLE NRU;Lo;0;L;;;;;N;;;;; +A3A2;YI SYLLABLE NRUP;Lo;0;L;;;;;N;;;;; +A3A3;YI SYLLABLE NRURX;Lo;0;L;;;;;N;;;;; +A3A4;YI SYLLABLE NRUR;Lo;0;L;;;;;N;;;;; +A3A5;YI SYLLABLE NRYT;Lo;0;L;;;;;N;;;;; +A3A6;YI SYLLABLE NRYX;Lo;0;L;;;;;N;;;;; +A3A7;YI SYLLABLE NRY;Lo;0;L;;;;;N;;;;; +A3A8;YI SYLLABLE NRYP;Lo;0;L;;;;;N;;;;; +A3A9;YI SYLLABLE NRYRX;Lo;0;L;;;;;N;;;;; +A3AA;YI SYLLABLE NRYR;Lo;0;L;;;;;N;;;;; +A3AB;YI SYLLABLE SHAT;Lo;0;L;;;;;N;;;;; +A3AC;YI SYLLABLE SHAX;Lo;0;L;;;;;N;;;;; +A3AD;YI SYLLABLE SHA;Lo;0;L;;;;;N;;;;; +A3AE;YI SYLLABLE SHAP;Lo;0;L;;;;;N;;;;; +A3AF;YI SYLLABLE SHUOX;Lo;0;L;;;;;N;;;;; +A3B0;YI SYLLABLE SHUO;Lo;0;L;;;;;N;;;;; +A3B1;YI SYLLABLE SHUOP;Lo;0;L;;;;;N;;;;; +A3B2;YI SYLLABLE SHOT;Lo;0;L;;;;;N;;;;; +A3B3;YI SYLLABLE SHOX;Lo;0;L;;;;;N;;;;; +A3B4;YI SYLLABLE SHO;Lo;0;L;;;;;N;;;;; +A3B5;YI SYLLABLE SHOP;Lo;0;L;;;;;N;;;;; +A3B6;YI SYLLABLE SHET;Lo;0;L;;;;;N;;;;; +A3B7;YI SYLLABLE SHEX;Lo;0;L;;;;;N;;;;; +A3B8;YI SYLLABLE SHE;Lo;0;L;;;;;N;;;;; +A3B9;YI SYLLABLE SHEP;Lo;0;L;;;;;N;;;;; +A3BA;YI SYLLABLE SHUT;Lo;0;L;;;;;N;;;;; +A3BB;YI SYLLABLE SHUX;Lo;0;L;;;;;N;;;;; +A3BC;YI SYLLABLE SHU;Lo;0;L;;;;;N;;;;; +A3BD;YI SYLLABLE SHUP;Lo;0;L;;;;;N;;;;; +A3BE;YI SYLLABLE SHURX;Lo;0;L;;;;;N;;;;; +A3BF;YI SYLLABLE SHUR;Lo;0;L;;;;;N;;;;; +A3C0;YI SYLLABLE SHYT;Lo;0;L;;;;;N;;;;; +A3C1;YI SYLLABLE SHYX;Lo;0;L;;;;;N;;;;; +A3C2;YI SYLLABLE SHY;Lo;0;L;;;;;N;;;;; +A3C3;YI SYLLABLE SHYP;Lo;0;L;;;;;N;;;;; +A3C4;YI SYLLABLE SHYRX;Lo;0;L;;;;;N;;;;; +A3C5;YI SYLLABLE SHYR;Lo;0;L;;;;;N;;;;; +A3C6;YI SYLLABLE RAT;Lo;0;L;;;;;N;;;;; +A3C7;YI SYLLABLE RAX;Lo;0;L;;;;;N;;;;; +A3C8;YI SYLLABLE RA;Lo;0;L;;;;;N;;;;; +A3C9;YI SYLLABLE RAP;Lo;0;L;;;;;N;;;;; +A3CA;YI SYLLABLE RUOX;Lo;0;L;;;;;N;;;;; +A3CB;YI SYLLABLE RUO;Lo;0;L;;;;;N;;;;; +A3CC;YI SYLLABLE RUOP;Lo;0;L;;;;;N;;;;; +A3CD;YI SYLLABLE ROT;Lo;0;L;;;;;N;;;;; +A3CE;YI SYLLABLE ROX;Lo;0;L;;;;;N;;;;; +A3CF;YI SYLLABLE RO;Lo;0;L;;;;;N;;;;; +A3D0;YI SYLLABLE ROP;Lo;0;L;;;;;N;;;;; +A3D1;YI SYLLABLE REX;Lo;0;L;;;;;N;;;;; +A3D2;YI SYLLABLE RE;Lo;0;L;;;;;N;;;;; +A3D3;YI SYLLABLE REP;Lo;0;L;;;;;N;;;;; +A3D4;YI SYLLABLE RUT;Lo;0;L;;;;;N;;;;; +A3D5;YI SYLLABLE RUX;Lo;0;L;;;;;N;;;;; +A3D6;YI SYLLABLE RU;Lo;0;L;;;;;N;;;;; +A3D7;YI SYLLABLE RUP;Lo;0;L;;;;;N;;;;; +A3D8;YI SYLLABLE RURX;Lo;0;L;;;;;N;;;;; +A3D9;YI SYLLABLE RUR;Lo;0;L;;;;;N;;;;; +A3DA;YI SYLLABLE RYT;Lo;0;L;;;;;N;;;;; +A3DB;YI SYLLABLE RYX;Lo;0;L;;;;;N;;;;; +A3DC;YI SYLLABLE RY;Lo;0;L;;;;;N;;;;; +A3DD;YI SYLLABLE RYP;Lo;0;L;;;;;N;;;;; +A3DE;YI SYLLABLE RYRX;Lo;0;L;;;;;N;;;;; +A3DF;YI SYLLABLE RYR;Lo;0;L;;;;;N;;;;; +A3E0;YI SYLLABLE JIT;Lo;0;L;;;;;N;;;;; +A3E1;YI SYLLABLE JIX;Lo;0;L;;;;;N;;;;; +A3E2;YI SYLLABLE JI;Lo;0;L;;;;;N;;;;; +A3E3;YI SYLLABLE JIP;Lo;0;L;;;;;N;;;;; +A3E4;YI SYLLABLE JIET;Lo;0;L;;;;;N;;;;; +A3E5;YI SYLLABLE JIEX;Lo;0;L;;;;;N;;;;; +A3E6;YI SYLLABLE JIE;Lo;0;L;;;;;N;;;;; +A3E7;YI SYLLABLE JIEP;Lo;0;L;;;;;N;;;;; +A3E8;YI SYLLABLE JUOT;Lo;0;L;;;;;N;;;;; +A3E9;YI SYLLABLE JUOX;Lo;0;L;;;;;N;;;;; +A3EA;YI SYLLABLE JUO;Lo;0;L;;;;;N;;;;; +A3EB;YI SYLLABLE JUOP;Lo;0;L;;;;;N;;;;; +A3EC;YI SYLLABLE JOT;Lo;0;L;;;;;N;;;;; +A3ED;YI SYLLABLE JOX;Lo;0;L;;;;;N;;;;; +A3EE;YI SYLLABLE JO;Lo;0;L;;;;;N;;;;; +A3EF;YI SYLLABLE JOP;Lo;0;L;;;;;N;;;;; +A3F0;YI SYLLABLE JUT;Lo;0;L;;;;;N;;;;; +A3F1;YI SYLLABLE JUX;Lo;0;L;;;;;N;;;;; +A3F2;YI SYLLABLE JU;Lo;0;L;;;;;N;;;;; +A3F3;YI SYLLABLE JUP;Lo;0;L;;;;;N;;;;; +A3F4;YI SYLLABLE JURX;Lo;0;L;;;;;N;;;;; +A3F5;YI SYLLABLE JUR;Lo;0;L;;;;;N;;;;; +A3F6;YI SYLLABLE JYT;Lo;0;L;;;;;N;;;;; +A3F7;YI SYLLABLE JYX;Lo;0;L;;;;;N;;;;; +A3F8;YI SYLLABLE JY;Lo;0;L;;;;;N;;;;; +A3F9;YI SYLLABLE JYP;Lo;0;L;;;;;N;;;;; +A3FA;YI SYLLABLE JYRX;Lo;0;L;;;;;N;;;;; +A3FB;YI SYLLABLE JYR;Lo;0;L;;;;;N;;;;; +A3FC;YI SYLLABLE QIT;Lo;0;L;;;;;N;;;;; +A3FD;YI SYLLABLE QIX;Lo;0;L;;;;;N;;;;; +A3FE;YI SYLLABLE QI;Lo;0;L;;;;;N;;;;; +A3FF;YI SYLLABLE QIP;Lo;0;L;;;;;N;;;;; +A400;YI SYLLABLE QIET;Lo;0;L;;;;;N;;;;; +A401;YI SYLLABLE QIEX;Lo;0;L;;;;;N;;;;; +A402;YI SYLLABLE QIE;Lo;0;L;;;;;N;;;;; +A403;YI SYLLABLE QIEP;Lo;0;L;;;;;N;;;;; +A404;YI SYLLABLE QUOT;Lo;0;L;;;;;N;;;;; +A405;YI SYLLABLE QUOX;Lo;0;L;;;;;N;;;;; +A406;YI SYLLABLE QUO;Lo;0;L;;;;;N;;;;; +A407;YI SYLLABLE QUOP;Lo;0;L;;;;;N;;;;; +A408;YI SYLLABLE QOT;Lo;0;L;;;;;N;;;;; +A409;YI SYLLABLE QOX;Lo;0;L;;;;;N;;;;; +A40A;YI SYLLABLE QO;Lo;0;L;;;;;N;;;;; +A40B;YI SYLLABLE QOP;Lo;0;L;;;;;N;;;;; +A40C;YI SYLLABLE QUT;Lo;0;L;;;;;N;;;;; +A40D;YI SYLLABLE QUX;Lo;0;L;;;;;N;;;;; +A40E;YI SYLLABLE QU;Lo;0;L;;;;;N;;;;; +A40F;YI SYLLABLE QUP;Lo;0;L;;;;;N;;;;; +A410;YI SYLLABLE QURX;Lo;0;L;;;;;N;;;;; +A411;YI SYLLABLE QUR;Lo;0;L;;;;;N;;;;; +A412;YI SYLLABLE QYT;Lo;0;L;;;;;N;;;;; +A413;YI SYLLABLE QYX;Lo;0;L;;;;;N;;;;; +A414;YI SYLLABLE QY;Lo;0;L;;;;;N;;;;; +A415;YI SYLLABLE QYP;Lo;0;L;;;;;N;;;;; +A416;YI SYLLABLE QYRX;Lo;0;L;;;;;N;;;;; +A417;YI SYLLABLE QYR;Lo;0;L;;;;;N;;;;; +A418;YI SYLLABLE JJIT;Lo;0;L;;;;;N;;;;; +A419;YI SYLLABLE JJIX;Lo;0;L;;;;;N;;;;; +A41A;YI SYLLABLE JJI;Lo;0;L;;;;;N;;;;; +A41B;YI SYLLABLE JJIP;Lo;0;L;;;;;N;;;;; +A41C;YI SYLLABLE JJIET;Lo;0;L;;;;;N;;;;; +A41D;YI SYLLABLE JJIEX;Lo;0;L;;;;;N;;;;; +A41E;YI SYLLABLE JJIE;Lo;0;L;;;;;N;;;;; +A41F;YI SYLLABLE JJIEP;Lo;0;L;;;;;N;;;;; +A420;YI SYLLABLE JJUOX;Lo;0;L;;;;;N;;;;; +A421;YI SYLLABLE JJUO;Lo;0;L;;;;;N;;;;; +A422;YI SYLLABLE JJUOP;Lo;0;L;;;;;N;;;;; +A423;YI SYLLABLE JJOT;Lo;0;L;;;;;N;;;;; +A424;YI SYLLABLE JJOX;Lo;0;L;;;;;N;;;;; +A425;YI SYLLABLE JJO;Lo;0;L;;;;;N;;;;; +A426;YI SYLLABLE JJOP;Lo;0;L;;;;;N;;;;; +A427;YI SYLLABLE JJUT;Lo;0;L;;;;;N;;;;; +A428;YI SYLLABLE JJUX;Lo;0;L;;;;;N;;;;; +A429;YI SYLLABLE JJU;Lo;0;L;;;;;N;;;;; +A42A;YI SYLLABLE JJUP;Lo;0;L;;;;;N;;;;; +A42B;YI SYLLABLE JJURX;Lo;0;L;;;;;N;;;;; +A42C;YI SYLLABLE JJUR;Lo;0;L;;;;;N;;;;; +A42D;YI SYLLABLE JJYT;Lo;0;L;;;;;N;;;;; +A42E;YI SYLLABLE JJYX;Lo;0;L;;;;;N;;;;; +A42F;YI SYLLABLE JJY;Lo;0;L;;;;;N;;;;; +A430;YI SYLLABLE JJYP;Lo;0;L;;;;;N;;;;; +A431;YI SYLLABLE NJIT;Lo;0;L;;;;;N;;;;; +A432;YI SYLLABLE NJIX;Lo;0;L;;;;;N;;;;; +A433;YI SYLLABLE NJI;Lo;0;L;;;;;N;;;;; +A434;YI SYLLABLE NJIP;Lo;0;L;;;;;N;;;;; +A435;YI SYLLABLE NJIET;Lo;0;L;;;;;N;;;;; +A436;YI SYLLABLE NJIEX;Lo;0;L;;;;;N;;;;; +A437;YI SYLLABLE NJIE;Lo;0;L;;;;;N;;;;; +A438;YI SYLLABLE NJIEP;Lo;0;L;;;;;N;;;;; +A439;YI SYLLABLE NJUOX;Lo;0;L;;;;;N;;;;; +A43A;YI SYLLABLE NJUO;Lo;0;L;;;;;N;;;;; +A43B;YI SYLLABLE NJOT;Lo;0;L;;;;;N;;;;; +A43C;YI SYLLABLE NJOX;Lo;0;L;;;;;N;;;;; +A43D;YI SYLLABLE NJO;Lo;0;L;;;;;N;;;;; +A43E;YI SYLLABLE NJOP;Lo;0;L;;;;;N;;;;; +A43F;YI SYLLABLE NJUX;Lo;0;L;;;;;N;;;;; +A440;YI SYLLABLE NJU;Lo;0;L;;;;;N;;;;; +A441;YI SYLLABLE NJUP;Lo;0;L;;;;;N;;;;; +A442;YI SYLLABLE NJURX;Lo;0;L;;;;;N;;;;; +A443;YI SYLLABLE NJUR;Lo;0;L;;;;;N;;;;; +A444;YI SYLLABLE NJYT;Lo;0;L;;;;;N;;;;; +A445;YI SYLLABLE NJYX;Lo;0;L;;;;;N;;;;; +A446;YI SYLLABLE NJY;Lo;0;L;;;;;N;;;;; +A447;YI SYLLABLE NJYP;Lo;0;L;;;;;N;;;;; +A448;YI SYLLABLE NJYRX;Lo;0;L;;;;;N;;;;; +A449;YI SYLLABLE NJYR;Lo;0;L;;;;;N;;;;; +A44A;YI SYLLABLE NYIT;Lo;0;L;;;;;N;;;;; +A44B;YI SYLLABLE NYIX;Lo;0;L;;;;;N;;;;; +A44C;YI SYLLABLE NYI;Lo;0;L;;;;;N;;;;; +A44D;YI SYLLABLE NYIP;Lo;0;L;;;;;N;;;;; +A44E;YI SYLLABLE NYIET;Lo;0;L;;;;;N;;;;; +A44F;YI SYLLABLE NYIEX;Lo;0;L;;;;;N;;;;; +A450;YI SYLLABLE NYIE;Lo;0;L;;;;;N;;;;; +A451;YI SYLLABLE NYIEP;Lo;0;L;;;;;N;;;;; +A452;YI SYLLABLE NYUOX;Lo;0;L;;;;;N;;;;; +A453;YI SYLLABLE NYUO;Lo;0;L;;;;;N;;;;; +A454;YI SYLLABLE NYUOP;Lo;0;L;;;;;N;;;;; +A455;YI SYLLABLE NYOT;Lo;0;L;;;;;N;;;;; +A456;YI SYLLABLE NYOX;Lo;0;L;;;;;N;;;;; +A457;YI SYLLABLE NYO;Lo;0;L;;;;;N;;;;; +A458;YI SYLLABLE NYOP;Lo;0;L;;;;;N;;;;; +A459;YI SYLLABLE NYUT;Lo;0;L;;;;;N;;;;; +A45A;YI SYLLABLE NYUX;Lo;0;L;;;;;N;;;;; +A45B;YI SYLLABLE NYU;Lo;0;L;;;;;N;;;;; +A45C;YI SYLLABLE NYUP;Lo;0;L;;;;;N;;;;; +A45D;YI SYLLABLE XIT;Lo;0;L;;;;;N;;;;; +A45E;YI SYLLABLE XIX;Lo;0;L;;;;;N;;;;; +A45F;YI SYLLABLE XI;Lo;0;L;;;;;N;;;;; +A460;YI SYLLABLE XIP;Lo;0;L;;;;;N;;;;; +A461;YI SYLLABLE XIET;Lo;0;L;;;;;N;;;;; +A462;YI SYLLABLE XIEX;Lo;0;L;;;;;N;;;;; +A463;YI SYLLABLE XIE;Lo;0;L;;;;;N;;;;; +A464;YI SYLLABLE XIEP;Lo;0;L;;;;;N;;;;; +A465;YI SYLLABLE XUOX;Lo;0;L;;;;;N;;;;; +A466;YI SYLLABLE XUO;Lo;0;L;;;;;N;;;;; +A467;YI SYLLABLE XOT;Lo;0;L;;;;;N;;;;; +A468;YI SYLLABLE XOX;Lo;0;L;;;;;N;;;;; +A469;YI SYLLABLE XO;Lo;0;L;;;;;N;;;;; +A46A;YI SYLLABLE XOP;Lo;0;L;;;;;N;;;;; +A46B;YI SYLLABLE XYT;Lo;0;L;;;;;N;;;;; +A46C;YI SYLLABLE XYX;Lo;0;L;;;;;N;;;;; +A46D;YI SYLLABLE XY;Lo;0;L;;;;;N;;;;; +A46E;YI SYLLABLE XYP;Lo;0;L;;;;;N;;;;; +A46F;YI SYLLABLE XYRX;Lo;0;L;;;;;N;;;;; +A470;YI SYLLABLE XYR;Lo;0;L;;;;;N;;;;; +A471;YI SYLLABLE YIT;Lo;0;L;;;;;N;;;;; +A472;YI SYLLABLE YIX;Lo;0;L;;;;;N;;;;; +A473;YI SYLLABLE YI;Lo;0;L;;;;;N;;;;; +A474;YI SYLLABLE YIP;Lo;0;L;;;;;N;;;;; +A475;YI SYLLABLE YIET;Lo;0;L;;;;;N;;;;; +A476;YI SYLLABLE YIEX;Lo;0;L;;;;;N;;;;; +A477;YI SYLLABLE YIE;Lo;0;L;;;;;N;;;;; +A478;YI SYLLABLE YIEP;Lo;0;L;;;;;N;;;;; +A479;YI SYLLABLE YUOT;Lo;0;L;;;;;N;;;;; +A47A;YI SYLLABLE YUOX;Lo;0;L;;;;;N;;;;; +A47B;YI SYLLABLE YUO;Lo;0;L;;;;;N;;;;; +A47C;YI SYLLABLE YUOP;Lo;0;L;;;;;N;;;;; +A47D;YI SYLLABLE YOT;Lo;0;L;;;;;N;;;;; +A47E;YI SYLLABLE YOX;Lo;0;L;;;;;N;;;;; +A47F;YI SYLLABLE YO;Lo;0;L;;;;;N;;;;; +A480;YI SYLLABLE YOP;Lo;0;L;;;;;N;;;;; +A481;YI SYLLABLE YUT;Lo;0;L;;;;;N;;;;; +A482;YI SYLLABLE YUX;Lo;0;L;;;;;N;;;;; +A483;YI SYLLABLE YU;Lo;0;L;;;;;N;;;;; +A484;YI SYLLABLE YUP;Lo;0;L;;;;;N;;;;; +A485;YI SYLLABLE YURX;Lo;0;L;;;;;N;;;;; +A486;YI SYLLABLE YUR;Lo;0;L;;;;;N;;;;; +A487;YI SYLLABLE YYT;Lo;0;L;;;;;N;;;;; +A488;YI SYLLABLE YYX;Lo;0;L;;;;;N;;;;; +A489;YI SYLLABLE YY;Lo;0;L;;;;;N;;;;; +A48A;YI SYLLABLE YYP;Lo;0;L;;;;;N;;;;; +A48B;YI SYLLABLE YYRX;Lo;0;L;;;;;N;;;;; +A48C;YI SYLLABLE YYR;Lo;0;L;;;;;N;;;;; +A490;YI RADICAL QOT;So;0;ON;;;;;N;;;;; +A491;YI RADICAL LI;So;0;ON;;;;;N;;;;; +A492;YI RADICAL KIT;So;0;ON;;;;;N;;;;; +A493;YI RADICAL NYIP;So;0;ON;;;;;N;;;;; +A494;YI RADICAL CYP;So;0;ON;;;;;N;;;;; +A495;YI RADICAL SSI;So;0;ON;;;;;N;;;;; +A496;YI RADICAL GGOP;So;0;ON;;;;;N;;;;; +A497;YI RADICAL GEP;So;0;ON;;;;;N;;;;; +A498;YI RADICAL MI;So;0;ON;;;;;N;;;;; +A499;YI RADICAL HXIT;So;0;ON;;;;;N;;;;; +A49A;YI RADICAL LYR;So;0;ON;;;;;N;;;;; +A49B;YI RADICAL BBUT;So;0;ON;;;;;N;;;;; +A49C;YI RADICAL MOP;So;0;ON;;;;;N;;;;; +A49D;YI RADICAL YO;So;0;ON;;;;;N;;;;; +A49E;YI RADICAL PUT;So;0;ON;;;;;N;;;;; +A49F;YI RADICAL HXUO;So;0;ON;;;;;N;;;;; +A4A0;YI RADICAL TAT;So;0;ON;;;;;N;;;;; +A4A1;YI RADICAL GA;So;0;ON;;;;;N;;;;; +A4A2;YI RADICAL ZUP;So;0;ON;;;;;N;;;;; +A4A3;YI RADICAL CYT;So;0;ON;;;;;N;;;;; +A4A4;YI RADICAL DDUR;So;0;ON;;;;;N;;;;; +A4A5;YI RADICAL BUR;So;0;ON;;;;;N;;;;; +A4A6;YI RADICAL GGUO;So;0;ON;;;;;N;;;;; +A4A7;YI RADICAL NYOP;So;0;ON;;;;;N;;;;; +A4A8;YI RADICAL TU;So;0;ON;;;;;N;;;;; +A4A9;YI RADICAL OP;So;0;ON;;;;;N;;;;; +A4AA;YI RADICAL JJUT;So;0;ON;;;;;N;;;;; +A4AB;YI RADICAL ZOT;So;0;ON;;;;;N;;;;; +A4AC;YI RADICAL PYT;So;0;ON;;;;;N;;;;; +A4AD;YI RADICAL HMO;So;0;ON;;;;;N;;;;; +A4AE;YI RADICAL YIT;So;0;ON;;;;;N;;;;; +A4AF;YI RADICAL VUR;So;0;ON;;;;;N;;;;; +A4B0;YI RADICAL SHY;So;0;ON;;;;;N;;;;; +A4B1;YI RADICAL VEP;So;0;ON;;;;;N;;;;; +A4B2;YI RADICAL ZA;So;0;ON;;;;;N;;;;; +A4B3;YI RADICAL JO;So;0;ON;;;;;N;;;;; +A4B4;YI RADICAL NZUP;So;0;ON;;;;;N;;;;; +A4B5;YI RADICAL JJY;So;0;ON;;;;;N;;;;; +A4B6;YI RADICAL GOT;So;0;ON;;;;;N;;;;; +A4B7;YI RADICAL JJIE;So;0;ON;;;;;N;;;;; +A4B8;YI RADICAL WO;So;0;ON;;;;;N;;;;; +A4B9;YI RADICAL DU;So;0;ON;;;;;N;;;;; +A4BA;YI RADICAL SHUR;So;0;ON;;;;;N;;;;; +A4BB;YI RADICAL LIE;So;0;ON;;;;;N;;;;; +A4BC;YI RADICAL CY;So;0;ON;;;;;N;;;;; +A4BD;YI RADICAL CUOP;So;0;ON;;;;;N;;;;; +A4BE;YI RADICAL CIP;So;0;ON;;;;;N;;;;; +A4BF;YI RADICAL HXOP;So;0;ON;;;;;N;;;;; +A4C0;YI RADICAL SHAT;So;0;ON;;;;;N;;;;; +A4C1;YI RADICAL ZUR;So;0;ON;;;;;N;;;;; +A4C2;YI RADICAL SHOP;So;0;ON;;;;;N;;;;; +A4C3;YI RADICAL CHE;So;0;ON;;;;;N;;;;; +A4C4;YI RADICAL ZZIET;So;0;ON;;;;;N;;;;; +A4C5;YI RADICAL NBIE;So;0;ON;;;;;N;;;;; +A4C6;YI RADICAL KE;So;0;ON;;;;;N;;;;; +A4D0;LISU LETTER BA;Lo;0;L;;;;;N;;;;; +A4D1;LISU LETTER PA;Lo;0;L;;;;;N;;;;; +A4D2;LISU LETTER PHA;Lo;0;L;;;;;N;;;;; +A4D3;LISU LETTER DA;Lo;0;L;;;;;N;;;;; +A4D4;LISU LETTER TA;Lo;0;L;;;;;N;;;;; +A4D5;LISU LETTER THA;Lo;0;L;;;;;N;;;;; +A4D6;LISU LETTER GA;Lo;0;L;;;;;N;;;;; +A4D7;LISU LETTER KA;Lo;0;L;;;;;N;;;;; +A4D8;LISU LETTER KHA;Lo;0;L;;;;;N;;;;; +A4D9;LISU LETTER JA;Lo;0;L;;;;;N;;;;; +A4DA;LISU LETTER CA;Lo;0;L;;;;;N;;;;; +A4DB;LISU LETTER CHA;Lo;0;L;;;;;N;;;;; +A4DC;LISU LETTER DZA;Lo;0;L;;;;;N;;;;; +A4DD;LISU LETTER TSA;Lo;0;L;;;;;N;;;;; +A4DE;LISU LETTER TSHA;Lo;0;L;;;;;N;;;;; +A4DF;LISU LETTER MA;Lo;0;L;;;;;N;;;;; +A4E0;LISU LETTER NA;Lo;0;L;;;;;N;;;;; +A4E1;LISU LETTER LA;Lo;0;L;;;;;N;;;;; +A4E2;LISU LETTER SA;Lo;0;L;;;;;N;;;;; +A4E3;LISU LETTER ZHA;Lo;0;L;;;;;N;;;;; +A4E4;LISU LETTER ZA;Lo;0;L;;;;;N;;;;; +A4E5;LISU LETTER NGA;Lo;0;L;;;;;N;;;;; +A4E6;LISU LETTER HA;Lo;0;L;;;;;N;;;;; +A4E7;LISU LETTER XA;Lo;0;L;;;;;N;;;;; +A4E8;LISU LETTER HHA;Lo;0;L;;;;;N;;;;; +A4E9;LISU LETTER FA;Lo;0;L;;;;;N;;;;; +A4EA;LISU LETTER WA;Lo;0;L;;;;;N;;;;; +A4EB;LISU LETTER SHA;Lo;0;L;;;;;N;;;;; +A4EC;LISU LETTER YA;Lo;0;L;;;;;N;;;;; +A4ED;LISU LETTER GHA;Lo;0;L;;;;;N;;;;; +A4EE;LISU LETTER A;Lo;0;L;;;;;N;;;;; +A4EF;LISU LETTER AE;Lo;0;L;;;;;N;;;;; +A4F0;LISU LETTER E;Lo;0;L;;;;;N;;;;; +A4F1;LISU LETTER EU;Lo;0;L;;;;;N;;;;; +A4F2;LISU LETTER I;Lo;0;L;;;;;N;;;;; +A4F3;LISU LETTER O;Lo;0;L;;;;;N;;;;; +A4F4;LISU LETTER U;Lo;0;L;;;;;N;;;;; +A4F5;LISU LETTER UE;Lo;0;L;;;;;N;;;;; +A4F6;LISU LETTER UH;Lo;0;L;;;;;N;;;;; +A4F7;LISU LETTER OE;Lo;0;L;;;;;N;;;;; +A4F8;LISU LETTER TONE MYA TI;Lm;0;L;;;;;N;;;;; +A4F9;LISU LETTER TONE NA PO;Lm;0;L;;;;;N;;;;; +A4FA;LISU LETTER TONE MYA CYA;Lm;0;L;;;;;N;;;;; +A4FB;LISU LETTER TONE MYA BO;Lm;0;L;;;;;N;;;;; +A4FC;LISU LETTER TONE MYA NA;Lm;0;L;;;;;N;;;;; +A4FD;LISU LETTER TONE MYA JEU;Lm;0;L;;;;;N;;;;; +A4FE;LISU PUNCTUATION COMMA;Po;0;L;;;;;N;;;;; +A4FF;LISU PUNCTUATION FULL STOP;Po;0;L;;;;;N;;;;; +A500;VAI SYLLABLE EE;Lo;0;L;;;;;N;;;;; +A501;VAI SYLLABLE EEN;Lo;0;L;;;;;N;;;;; +A502;VAI SYLLABLE HEE;Lo;0;L;;;;;N;;;;; +A503;VAI SYLLABLE WEE;Lo;0;L;;;;;N;;;;; +A504;VAI SYLLABLE WEEN;Lo;0;L;;;;;N;;;;; +A505;VAI SYLLABLE PEE;Lo;0;L;;;;;N;;;;; +A506;VAI SYLLABLE BHEE;Lo;0;L;;;;;N;;;;; +A507;VAI SYLLABLE BEE;Lo;0;L;;;;;N;;;;; +A508;VAI SYLLABLE MBEE;Lo;0;L;;;;;N;;;;; +A509;VAI SYLLABLE KPEE;Lo;0;L;;;;;N;;;;; +A50A;VAI SYLLABLE MGBEE;Lo;0;L;;;;;N;;;;; +A50B;VAI SYLLABLE GBEE;Lo;0;L;;;;;N;;;;; +A50C;VAI SYLLABLE FEE;Lo;0;L;;;;;N;;;;; +A50D;VAI SYLLABLE VEE;Lo;0;L;;;;;N;;;;; +A50E;VAI SYLLABLE TEE;Lo;0;L;;;;;N;;;;; +A50F;VAI SYLLABLE THEE;Lo;0;L;;;;;N;;;;; +A510;VAI SYLLABLE DHEE;Lo;0;L;;;;;N;;;;; +A511;VAI SYLLABLE DHHEE;Lo;0;L;;;;;N;;;;; +A512;VAI SYLLABLE LEE;Lo;0;L;;;;;N;;;;; +A513;VAI SYLLABLE REE;Lo;0;L;;;;;N;;;;; +A514;VAI SYLLABLE DEE;Lo;0;L;;;;;N;;;;; +A515;VAI SYLLABLE NDEE;Lo;0;L;;;;;N;;;;; +A516;VAI SYLLABLE SEE;Lo;0;L;;;;;N;;;;; +A517;VAI SYLLABLE SHEE;Lo;0;L;;;;;N;;;;; +A518;VAI SYLLABLE ZEE;Lo;0;L;;;;;N;;;;; +A519;VAI SYLLABLE ZHEE;Lo;0;L;;;;;N;;;;; +A51A;VAI SYLLABLE CEE;Lo;0;L;;;;;N;;;;; +A51B;VAI SYLLABLE JEE;Lo;0;L;;;;;N;;;;; +A51C;VAI SYLLABLE NJEE;Lo;0;L;;;;;N;;;;; +A51D;VAI SYLLABLE YEE;Lo;0;L;;;;;N;;;;; +A51E;VAI SYLLABLE KEE;Lo;0;L;;;;;N;;;;; +A51F;VAI SYLLABLE NGGEE;Lo;0;L;;;;;N;;;;; +A520;VAI SYLLABLE GEE;Lo;0;L;;;;;N;;;;; +A521;VAI SYLLABLE MEE;Lo;0;L;;;;;N;;;;; +A522;VAI SYLLABLE NEE;Lo;0;L;;;;;N;;;;; +A523;VAI SYLLABLE NYEE;Lo;0;L;;;;;N;;;;; +A524;VAI SYLLABLE I;Lo;0;L;;;;;N;;;;; +A525;VAI SYLLABLE IN;Lo;0;L;;;;;N;;;;; +A526;VAI SYLLABLE HI;Lo;0;L;;;;;N;;;;; +A527;VAI SYLLABLE HIN;Lo;0;L;;;;;N;;;;; +A528;VAI SYLLABLE WI;Lo;0;L;;;;;N;;;;; +A529;VAI SYLLABLE WIN;Lo;0;L;;;;;N;;;;; +A52A;VAI SYLLABLE PI;Lo;0;L;;;;;N;;;;; +A52B;VAI SYLLABLE BHI;Lo;0;L;;;;;N;;;;; +A52C;VAI SYLLABLE BI;Lo;0;L;;;;;N;;;;; +A52D;VAI SYLLABLE MBI;Lo;0;L;;;;;N;;;;; +A52E;VAI SYLLABLE KPI;Lo;0;L;;;;;N;;;;; +A52F;VAI SYLLABLE MGBI;Lo;0;L;;;;;N;;;;; +A530;VAI SYLLABLE GBI;Lo;0;L;;;;;N;;;;; +A531;VAI SYLLABLE FI;Lo;0;L;;;;;N;;;;; +A532;VAI SYLLABLE VI;Lo;0;L;;;;;N;;;;; +A533;VAI SYLLABLE TI;Lo;0;L;;;;;N;;;;; +A534;VAI SYLLABLE THI;Lo;0;L;;;;;N;;;;; +A535;VAI SYLLABLE DHI;Lo;0;L;;;;;N;;;;; +A536;VAI SYLLABLE DHHI;Lo;0;L;;;;;N;;;;; +A537;VAI SYLLABLE LI;Lo;0;L;;;;;N;;;;; +A538;VAI SYLLABLE RI;Lo;0;L;;;;;N;;;;; +A539;VAI SYLLABLE DI;Lo;0;L;;;;;N;;;;; +A53A;VAI SYLLABLE NDI;Lo;0;L;;;;;N;;;;; +A53B;VAI SYLLABLE SI;Lo;0;L;;;;;N;;;;; +A53C;VAI SYLLABLE SHI;Lo;0;L;;;;;N;;;;; +A53D;VAI SYLLABLE ZI;Lo;0;L;;;;;N;;;;; +A53E;VAI SYLLABLE ZHI;Lo;0;L;;;;;N;;;;; +A53F;VAI SYLLABLE CI;Lo;0;L;;;;;N;;;;; +A540;VAI SYLLABLE JI;Lo;0;L;;;;;N;;;;; +A541;VAI SYLLABLE NJI;Lo;0;L;;;;;N;;;;; +A542;VAI SYLLABLE YI;Lo;0;L;;;;;N;;;;; +A543;VAI SYLLABLE KI;Lo;0;L;;;;;N;;;;; +A544;VAI SYLLABLE NGGI;Lo;0;L;;;;;N;;;;; +A545;VAI SYLLABLE GI;Lo;0;L;;;;;N;;;;; +A546;VAI SYLLABLE MI;Lo;0;L;;;;;N;;;;; +A547;VAI SYLLABLE NI;Lo;0;L;;;;;N;;;;; +A548;VAI SYLLABLE NYI;Lo;0;L;;;;;N;;;;; +A549;VAI SYLLABLE A;Lo;0;L;;;;;N;;;;; +A54A;VAI SYLLABLE AN;Lo;0;L;;;;;N;;;;; +A54B;VAI SYLLABLE NGAN;Lo;0;L;;;;;N;;;;; +A54C;VAI SYLLABLE HA;Lo;0;L;;;;;N;;;;; +A54D;VAI SYLLABLE HAN;Lo;0;L;;;;;N;;;;; +A54E;VAI SYLLABLE WA;Lo;0;L;;;;;N;;;;; +A54F;VAI SYLLABLE WAN;Lo;0;L;;;;;N;;;;; +A550;VAI SYLLABLE PA;Lo;0;L;;;;;N;;;;; +A551;VAI SYLLABLE BHA;Lo;0;L;;;;;N;;;;; +A552;VAI SYLLABLE BA;Lo;0;L;;;;;N;;;;; +A553;VAI SYLLABLE MBA;Lo;0;L;;;;;N;;;;; +A554;VAI SYLLABLE KPA;Lo;0;L;;;;;N;;;;; +A555;VAI SYLLABLE KPAN;Lo;0;L;;;;;N;;;;; +A556;VAI SYLLABLE MGBA;Lo;0;L;;;;;N;;;;; +A557;VAI SYLLABLE GBA;Lo;0;L;;;;;N;;;;; +A558;VAI SYLLABLE FA;Lo;0;L;;;;;N;;;;; +A559;VAI SYLLABLE VA;Lo;0;L;;;;;N;;;;; +A55A;VAI SYLLABLE TA;Lo;0;L;;;;;N;;;;; +A55B;VAI SYLLABLE THA;Lo;0;L;;;;;N;;;;; +A55C;VAI SYLLABLE DHA;Lo;0;L;;;;;N;;;;; +A55D;VAI SYLLABLE DHHA;Lo;0;L;;;;;N;;;;; +A55E;VAI SYLLABLE LA;Lo;0;L;;;;;N;;;;; +A55F;VAI SYLLABLE RA;Lo;0;L;;;;;N;;;;; +A560;VAI SYLLABLE DA;Lo;0;L;;;;;N;;;;; +A561;VAI SYLLABLE NDA;Lo;0;L;;;;;N;;;;; +A562;VAI SYLLABLE SA;Lo;0;L;;;;;N;;;;; +A563;VAI SYLLABLE SHA;Lo;0;L;;;;;N;;;;; +A564;VAI SYLLABLE ZA;Lo;0;L;;;;;N;;;;; +A565;VAI SYLLABLE ZHA;Lo;0;L;;;;;N;;;;; +A566;VAI SYLLABLE CA;Lo;0;L;;;;;N;;;;; +A567;VAI SYLLABLE JA;Lo;0;L;;;;;N;;;;; +A568;VAI SYLLABLE NJA;Lo;0;L;;;;;N;;;;; +A569;VAI SYLLABLE YA;Lo;0;L;;;;;N;;;;; +A56A;VAI SYLLABLE KA;Lo;0;L;;;;;N;;;;; +A56B;VAI SYLLABLE KAN;Lo;0;L;;;;;N;;;;; +A56C;VAI SYLLABLE NGGA;Lo;0;L;;;;;N;;;;; +A56D;VAI SYLLABLE GA;Lo;0;L;;;;;N;;;;; +A56E;VAI SYLLABLE MA;Lo;0;L;;;;;N;;;;; +A56F;VAI SYLLABLE NA;Lo;0;L;;;;;N;;;;; +A570;VAI SYLLABLE NYA;Lo;0;L;;;;;N;;;;; +A571;VAI SYLLABLE OO;Lo;0;L;;;;;N;;;;; +A572;VAI SYLLABLE OON;Lo;0;L;;;;;N;;;;; +A573;VAI SYLLABLE HOO;Lo;0;L;;;;;N;;;;; +A574;VAI SYLLABLE WOO;Lo;0;L;;;;;N;;;;; +A575;VAI SYLLABLE WOON;Lo;0;L;;;;;N;;;;; +A576;VAI SYLLABLE POO;Lo;0;L;;;;;N;;;;; +A577;VAI SYLLABLE BHOO;Lo;0;L;;;;;N;;;;; +A578;VAI SYLLABLE BOO;Lo;0;L;;;;;N;;;;; +A579;VAI SYLLABLE MBOO;Lo;0;L;;;;;N;;;;; +A57A;VAI SYLLABLE KPOO;Lo;0;L;;;;;N;;;;; +A57B;VAI SYLLABLE MGBOO;Lo;0;L;;;;;N;;;;; +A57C;VAI SYLLABLE GBOO;Lo;0;L;;;;;N;;;;; +A57D;VAI SYLLABLE FOO;Lo;0;L;;;;;N;;;;; +A57E;VAI SYLLABLE VOO;Lo;0;L;;;;;N;;;;; +A57F;VAI SYLLABLE TOO;Lo;0;L;;;;;N;;;;; +A580;VAI SYLLABLE THOO;Lo;0;L;;;;;N;;;;; +A581;VAI SYLLABLE DHOO;Lo;0;L;;;;;N;;;;; +A582;VAI SYLLABLE DHHOO;Lo;0;L;;;;;N;;;;; +A583;VAI SYLLABLE LOO;Lo;0;L;;;;;N;;;;; +A584;VAI SYLLABLE ROO;Lo;0;L;;;;;N;;;;; +A585;VAI SYLLABLE DOO;Lo;0;L;;;;;N;;;;; +A586;VAI SYLLABLE NDOO;Lo;0;L;;;;;N;;;;; +A587;VAI SYLLABLE SOO;Lo;0;L;;;;;N;;;;; +A588;VAI SYLLABLE SHOO;Lo;0;L;;;;;N;;;;; +A589;VAI SYLLABLE ZOO;Lo;0;L;;;;;N;;;;; +A58A;VAI SYLLABLE ZHOO;Lo;0;L;;;;;N;;;;; +A58B;VAI SYLLABLE COO;Lo;0;L;;;;;N;;;;; +A58C;VAI SYLLABLE JOO;Lo;0;L;;;;;N;;;;; +A58D;VAI SYLLABLE NJOO;Lo;0;L;;;;;N;;;;; +A58E;VAI SYLLABLE YOO;Lo;0;L;;;;;N;;;;; +A58F;VAI SYLLABLE KOO;Lo;0;L;;;;;N;;;;; +A590;VAI SYLLABLE NGGOO;Lo;0;L;;;;;N;;;;; +A591;VAI SYLLABLE GOO;Lo;0;L;;;;;N;;;;; +A592;VAI SYLLABLE MOO;Lo;0;L;;;;;N;;;;; +A593;VAI SYLLABLE NOO;Lo;0;L;;;;;N;;;;; +A594;VAI SYLLABLE NYOO;Lo;0;L;;;;;N;;;;; +A595;VAI SYLLABLE U;Lo;0;L;;;;;N;;;;; +A596;VAI SYLLABLE UN;Lo;0;L;;;;;N;;;;; +A597;VAI SYLLABLE HU;Lo;0;L;;;;;N;;;;; +A598;VAI SYLLABLE HUN;Lo;0;L;;;;;N;;;;; +A599;VAI SYLLABLE WU;Lo;0;L;;;;;N;;;;; +A59A;VAI SYLLABLE WUN;Lo;0;L;;;;;N;;;;; +A59B;VAI SYLLABLE PU;Lo;0;L;;;;;N;;;;; +A59C;VAI SYLLABLE BHU;Lo;0;L;;;;;N;;;;; +A59D;VAI SYLLABLE BU;Lo;0;L;;;;;N;;;;; +A59E;VAI SYLLABLE MBU;Lo;0;L;;;;;N;;;;; +A59F;VAI SYLLABLE KPU;Lo;0;L;;;;;N;;;;; +A5A0;VAI SYLLABLE MGBU;Lo;0;L;;;;;N;;;;; +A5A1;VAI SYLLABLE GBU;Lo;0;L;;;;;N;;;;; +A5A2;VAI SYLLABLE FU;Lo;0;L;;;;;N;;;;; +A5A3;VAI SYLLABLE VU;Lo;0;L;;;;;N;;;;; +A5A4;VAI SYLLABLE TU;Lo;0;L;;;;;N;;;;; +A5A5;VAI SYLLABLE THU;Lo;0;L;;;;;N;;;;; +A5A6;VAI SYLLABLE DHU;Lo;0;L;;;;;N;;;;; +A5A7;VAI SYLLABLE DHHU;Lo;0;L;;;;;N;;;;; +A5A8;VAI SYLLABLE LU;Lo;0;L;;;;;N;;;;; +A5A9;VAI SYLLABLE RU;Lo;0;L;;;;;N;;;;; +A5AA;VAI SYLLABLE DU;Lo;0;L;;;;;N;;;;; +A5AB;VAI SYLLABLE NDU;Lo;0;L;;;;;N;;;;; +A5AC;VAI SYLLABLE SU;Lo;0;L;;;;;N;;;;; +A5AD;VAI SYLLABLE SHU;Lo;0;L;;;;;N;;;;; +A5AE;VAI SYLLABLE ZU;Lo;0;L;;;;;N;;;;; +A5AF;VAI SYLLABLE ZHU;Lo;0;L;;;;;N;;;;; +A5B0;VAI SYLLABLE CU;Lo;0;L;;;;;N;;;;; +A5B1;VAI SYLLABLE JU;Lo;0;L;;;;;N;;;;; +A5B2;VAI SYLLABLE NJU;Lo;0;L;;;;;N;;;;; +A5B3;VAI SYLLABLE YU;Lo;0;L;;;;;N;;;;; +A5B4;VAI SYLLABLE KU;Lo;0;L;;;;;N;;;;; +A5B5;VAI SYLLABLE NGGU;Lo;0;L;;;;;N;;;;; +A5B6;VAI SYLLABLE GU;Lo;0;L;;;;;N;;;;; +A5B7;VAI SYLLABLE MU;Lo;0;L;;;;;N;;;;; +A5B8;VAI SYLLABLE NU;Lo;0;L;;;;;N;;;;; +A5B9;VAI SYLLABLE NYU;Lo;0;L;;;;;N;;;;; +A5BA;VAI SYLLABLE O;Lo;0;L;;;;;N;;;;; +A5BB;VAI SYLLABLE ON;Lo;0;L;;;;;N;;;;; +A5BC;VAI SYLLABLE NGON;Lo;0;L;;;;;N;;;;; +A5BD;VAI SYLLABLE HO;Lo;0;L;;;;;N;;;;; +A5BE;VAI SYLLABLE HON;Lo;0;L;;;;;N;;;;; +A5BF;VAI SYLLABLE WO;Lo;0;L;;;;;N;;;;; +A5C0;VAI SYLLABLE WON;Lo;0;L;;;;;N;;;;; +A5C1;VAI SYLLABLE PO;Lo;0;L;;;;;N;;;;; +A5C2;VAI SYLLABLE BHO;Lo;0;L;;;;;N;;;;; +A5C3;VAI SYLLABLE BO;Lo;0;L;;;;;N;;;;; +A5C4;VAI SYLLABLE MBO;Lo;0;L;;;;;N;;;;; +A5C5;VAI SYLLABLE KPO;Lo;0;L;;;;;N;;;;; +A5C6;VAI SYLLABLE MGBO;Lo;0;L;;;;;N;;;;; +A5C7;VAI SYLLABLE GBO;Lo;0;L;;;;;N;;;;; +A5C8;VAI SYLLABLE GBON;Lo;0;L;;;;;N;;;;; +A5C9;VAI SYLLABLE FO;Lo;0;L;;;;;N;;;;; +A5CA;VAI SYLLABLE VO;Lo;0;L;;;;;N;;;;; +A5CB;VAI SYLLABLE TO;Lo;0;L;;;;;N;;;;; +A5CC;VAI SYLLABLE THO;Lo;0;L;;;;;N;;;;; +A5CD;VAI SYLLABLE DHO;Lo;0;L;;;;;N;;;;; +A5CE;VAI SYLLABLE DHHO;Lo;0;L;;;;;N;;;;; +A5CF;VAI SYLLABLE LO;Lo;0;L;;;;;N;;;;; +A5D0;VAI SYLLABLE RO;Lo;0;L;;;;;N;;;;; +A5D1;VAI SYLLABLE DO;Lo;0;L;;;;;N;;;;; +A5D2;VAI SYLLABLE NDO;Lo;0;L;;;;;N;;;;; +A5D3;VAI SYLLABLE SO;Lo;0;L;;;;;N;;;;; +A5D4;VAI SYLLABLE SHO;Lo;0;L;;;;;N;;;;; +A5D5;VAI SYLLABLE ZO;Lo;0;L;;;;;N;;;;; +A5D6;VAI SYLLABLE ZHO;Lo;0;L;;;;;N;;;;; +A5D7;VAI SYLLABLE CO;Lo;0;L;;;;;N;;;;; +A5D8;VAI SYLLABLE JO;Lo;0;L;;;;;N;;;;; +A5D9;VAI SYLLABLE NJO;Lo;0;L;;;;;N;;;;; +A5DA;VAI SYLLABLE YO;Lo;0;L;;;;;N;;;;; +A5DB;VAI SYLLABLE KO;Lo;0;L;;;;;N;;;;; +A5DC;VAI SYLLABLE NGGO;Lo;0;L;;;;;N;;;;; +A5DD;VAI SYLLABLE GO;Lo;0;L;;;;;N;;;;; +A5DE;VAI SYLLABLE MO;Lo;0;L;;;;;N;;;;; +A5DF;VAI SYLLABLE NO;Lo;0;L;;;;;N;;;;; +A5E0;VAI SYLLABLE NYO;Lo;0;L;;;;;N;;;;; +A5E1;VAI SYLLABLE E;Lo;0;L;;;;;N;;;;; +A5E2;VAI SYLLABLE EN;Lo;0;L;;;;;N;;;;; +A5E3;VAI SYLLABLE NGEN;Lo;0;L;;;;;N;;;;; +A5E4;VAI SYLLABLE HE;Lo;0;L;;;;;N;;;;; +A5E5;VAI SYLLABLE HEN;Lo;0;L;;;;;N;;;;; +A5E6;VAI SYLLABLE WE;Lo;0;L;;;;;N;;;;; +A5E7;VAI SYLLABLE WEN;Lo;0;L;;;;;N;;;;; +A5E8;VAI SYLLABLE PE;Lo;0;L;;;;;N;;;;; +A5E9;VAI SYLLABLE BHE;Lo;0;L;;;;;N;;;;; +A5EA;VAI SYLLABLE BE;Lo;0;L;;;;;N;;;;; +A5EB;VAI SYLLABLE MBE;Lo;0;L;;;;;N;;;;; +A5EC;VAI SYLLABLE KPE;Lo;0;L;;;;;N;;;;; +A5ED;VAI SYLLABLE KPEN;Lo;0;L;;;;;N;;;;; +A5EE;VAI SYLLABLE MGBE;Lo;0;L;;;;;N;;;;; +A5EF;VAI SYLLABLE GBE;Lo;0;L;;;;;N;;;;; +A5F0;VAI SYLLABLE GBEN;Lo;0;L;;;;;N;;;;; +A5F1;VAI SYLLABLE FE;Lo;0;L;;;;;N;;;;; +A5F2;VAI SYLLABLE VE;Lo;0;L;;;;;N;;;;; +A5F3;VAI SYLLABLE TE;Lo;0;L;;;;;N;;;;; +A5F4;VAI SYLLABLE THE;Lo;0;L;;;;;N;;;;; +A5F5;VAI SYLLABLE DHE;Lo;0;L;;;;;N;;;;; +A5F6;VAI SYLLABLE DHHE;Lo;0;L;;;;;N;;;;; +A5F7;VAI SYLLABLE LE;Lo;0;L;;;;;N;;;;; +A5F8;VAI SYLLABLE RE;Lo;0;L;;;;;N;;;;; +A5F9;VAI SYLLABLE DE;Lo;0;L;;;;;N;;;;; +A5FA;VAI SYLLABLE NDE;Lo;0;L;;;;;N;;;;; +A5FB;VAI SYLLABLE SE;Lo;0;L;;;;;N;;;;; +A5FC;VAI SYLLABLE SHE;Lo;0;L;;;;;N;;;;; +A5FD;VAI SYLLABLE ZE;Lo;0;L;;;;;N;;;;; +A5FE;VAI SYLLABLE ZHE;Lo;0;L;;;;;N;;;;; +A5FF;VAI SYLLABLE CE;Lo;0;L;;;;;N;;;;; +A600;VAI SYLLABLE JE;Lo;0;L;;;;;N;;;;; +A601;VAI SYLLABLE NJE;Lo;0;L;;;;;N;;;;; +A602;VAI SYLLABLE YE;Lo;0;L;;;;;N;;;;; +A603;VAI SYLLABLE KE;Lo;0;L;;;;;N;;;;; +A604;VAI SYLLABLE NGGE;Lo;0;L;;;;;N;;;;; +A605;VAI SYLLABLE NGGEN;Lo;0;L;;;;;N;;;;; +A606;VAI SYLLABLE GE;Lo;0;L;;;;;N;;;;; +A607;VAI SYLLABLE GEN;Lo;0;L;;;;;N;;;;; +A608;VAI SYLLABLE ME;Lo;0;L;;;;;N;;;;; +A609;VAI SYLLABLE NE;Lo;0;L;;;;;N;;;;; +A60A;VAI SYLLABLE NYE;Lo;0;L;;;;;N;;;;; +A60B;VAI SYLLABLE NG;Lo;0;L;;;;;N;;;;; +A60C;VAI SYLLABLE LENGTHENER;Lm;0;L;;;;;N;;;;; +A60D;VAI COMMA;Po;0;ON;;;;;N;;;;; +A60E;VAI FULL STOP;Po;0;ON;;;;;N;;;;; +A60F;VAI QUESTION MARK;Po;0;ON;;;;;N;;;;; +A610;VAI SYLLABLE NDOLE FA;Lo;0;L;;;;;N;;;;; +A611;VAI SYLLABLE NDOLE KA;Lo;0;L;;;;;N;;;;; +A612;VAI SYLLABLE NDOLE SOO;Lo;0;L;;;;;N;;;;; +A613;VAI SYMBOL FEENG;Lo;0;L;;;;;N;;;;; +A614;VAI SYMBOL KEENG;Lo;0;L;;;;;N;;;;; +A615;VAI SYMBOL TING;Lo;0;L;;;;;N;;;;; +A616;VAI SYMBOL NII;Lo;0;L;;;;;N;;;;; +A617;VAI SYMBOL BANG;Lo;0;L;;;;;N;;;;; +A618;VAI SYMBOL FAA;Lo;0;L;;;;;N;;;;; +A619;VAI SYMBOL TAA;Lo;0;L;;;;;N;;;;; +A61A;VAI SYMBOL DANG;Lo;0;L;;;;;N;;;;; +A61B;VAI SYMBOL DOONG;Lo;0;L;;;;;N;;;;; +A61C;VAI SYMBOL KUNG;Lo;0;L;;;;;N;;;;; +A61D;VAI SYMBOL TONG;Lo;0;L;;;;;N;;;;; +A61E;VAI SYMBOL DO-O;Lo;0;L;;;;;N;;;;; +A61F;VAI SYMBOL JONG;Lo;0;L;;;;;N;;;;; +A620;VAI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +A621;VAI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +A622;VAI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +A623;VAI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +A624;VAI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +A625;VAI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +A626;VAI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +A627;VAI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +A628;VAI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +A629;VAI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +A62A;VAI SYLLABLE NDOLE MA;Lo;0;L;;;;;N;;;;; +A62B;VAI SYLLABLE NDOLE DO;Lo;0;L;;;;;N;;;;; +A640;CYRILLIC CAPITAL LETTER ZEMLYA;Lu;0;L;;;;;N;;;;A641; +A641;CYRILLIC SMALL LETTER ZEMLYA;Ll;0;L;;;;;N;;;A640;;A640 +A642;CYRILLIC CAPITAL LETTER DZELO;Lu;0;L;;;;;N;;;;A643; +A643;CYRILLIC SMALL LETTER DZELO;Ll;0;L;;;;;N;;;A642;;A642 +A644;CYRILLIC CAPITAL LETTER REVERSED DZE;Lu;0;L;;;;;N;;;;A645; +A645;CYRILLIC SMALL LETTER REVERSED DZE;Ll;0;L;;;;;N;;;A644;;A644 +A646;CYRILLIC CAPITAL LETTER IOTA;Lu;0;L;;;;;N;;;;A647; +A647;CYRILLIC SMALL LETTER IOTA;Ll;0;L;;;;;N;;;A646;;A646 +A648;CYRILLIC CAPITAL LETTER DJERV;Lu;0;L;;;;;N;;;;A649; +A649;CYRILLIC SMALL LETTER DJERV;Ll;0;L;;;;;N;;;A648;;A648 +A64A;CYRILLIC CAPITAL LETTER MONOGRAPH UK;Lu;0;L;;;;;N;;;;A64B; +A64B;CYRILLIC SMALL LETTER MONOGRAPH UK;Ll;0;L;;;;;N;;;A64A;;A64A +A64C;CYRILLIC CAPITAL LETTER BROAD OMEGA;Lu;0;L;;;;;N;;;;A64D; +A64D;CYRILLIC SMALL LETTER BROAD OMEGA;Ll;0;L;;;;;N;;;A64C;;A64C +A64E;CYRILLIC CAPITAL LETTER NEUTRAL YER;Lu;0;L;;;;;N;;;;A64F; +A64F;CYRILLIC SMALL LETTER NEUTRAL YER;Ll;0;L;;;;;N;;;A64E;;A64E +A650;CYRILLIC CAPITAL LETTER YERU WITH BACK YER;Lu;0;L;;;;;N;;;;A651; +A651;CYRILLIC SMALL LETTER YERU WITH BACK YER;Ll;0;L;;;;;N;;;A650;;A650 +A652;CYRILLIC CAPITAL LETTER IOTIFIED YAT;Lu;0;L;;;;;N;;;;A653; +A653;CYRILLIC SMALL LETTER IOTIFIED YAT;Ll;0;L;;;;;N;;;A652;;A652 +A654;CYRILLIC CAPITAL LETTER REVERSED YU;Lu;0;L;;;;;N;;;;A655; +A655;CYRILLIC SMALL LETTER REVERSED YU;Ll;0;L;;;;;N;;;A654;;A654 +A656;CYRILLIC CAPITAL LETTER IOTIFIED A;Lu;0;L;;;;;N;;;;A657; +A657;CYRILLIC SMALL LETTER IOTIFIED A;Ll;0;L;;;;;N;;;A656;;A656 +A658;CYRILLIC CAPITAL LETTER CLOSED LITTLE YUS;Lu;0;L;;;;;N;;;;A659; +A659;CYRILLIC SMALL LETTER CLOSED LITTLE YUS;Ll;0;L;;;;;N;;;A658;;A658 +A65A;CYRILLIC CAPITAL LETTER BLENDED YUS;Lu;0;L;;;;;N;;;;A65B; +A65B;CYRILLIC SMALL LETTER BLENDED YUS;Ll;0;L;;;;;N;;;A65A;;A65A +A65C;CYRILLIC CAPITAL LETTER IOTIFIED CLOSED LITTLE YUS;Lu;0;L;;;;;N;;;;A65D; +A65D;CYRILLIC SMALL LETTER IOTIFIED CLOSED LITTLE YUS;Ll;0;L;;;;;N;;;A65C;;A65C +A65E;CYRILLIC CAPITAL LETTER YN;Lu;0;L;;;;;N;;;;A65F; +A65F;CYRILLIC SMALL LETTER YN;Ll;0;L;;;;;N;;;A65E;;A65E +A660;CYRILLIC CAPITAL LETTER REVERSED TSE;Lu;0;L;;;;;N;;;;A661; +A661;CYRILLIC SMALL LETTER REVERSED TSE;Ll;0;L;;;;;N;;;A660;;A660 +A662;CYRILLIC CAPITAL LETTER SOFT DE;Lu;0;L;;;;;N;;;;A663; +A663;CYRILLIC SMALL LETTER SOFT DE;Ll;0;L;;;;;N;;;A662;;A662 +A664;CYRILLIC CAPITAL LETTER SOFT EL;Lu;0;L;;;;;N;;;;A665; +A665;CYRILLIC SMALL LETTER SOFT EL;Ll;0;L;;;;;N;;;A664;;A664 +A666;CYRILLIC CAPITAL LETTER SOFT EM;Lu;0;L;;;;;N;;;;A667; +A667;CYRILLIC SMALL LETTER SOFT EM;Ll;0;L;;;;;N;;;A666;;A666 +A668;CYRILLIC CAPITAL LETTER MONOCULAR O;Lu;0;L;;;;;N;;;;A669; +A669;CYRILLIC SMALL LETTER MONOCULAR O;Ll;0;L;;;;;N;;;A668;;A668 +A66A;CYRILLIC CAPITAL LETTER BINOCULAR O;Lu;0;L;;;;;N;;;;A66B; +A66B;CYRILLIC SMALL LETTER BINOCULAR O;Ll;0;L;;;;;N;;;A66A;;A66A +A66C;CYRILLIC CAPITAL LETTER DOUBLE MONOCULAR O;Lu;0;L;;;;;N;;;;A66D; +A66D;CYRILLIC SMALL LETTER DOUBLE MONOCULAR O;Ll;0;L;;;;;N;;;A66C;;A66C +A66E;CYRILLIC LETTER MULTIOCULAR O;Lo;0;L;;;;;N;;;;; +A66F;COMBINING CYRILLIC VZMET;Mn;230;NSM;;;;;N;;;;; +A670;COMBINING CYRILLIC TEN MILLIONS SIGN;Me;0;NSM;;;;;N;;;;; +A671;COMBINING CYRILLIC HUNDRED MILLIONS SIGN;Me;0;NSM;;;;;N;;;;; +A672;COMBINING CYRILLIC THOUSAND MILLIONS SIGN;Me;0;NSM;;;;;N;;;;; +A673;SLAVONIC ASTERISK;Po;0;ON;;;;;N;;;;; +A674;COMBINING CYRILLIC LETTER UKRAINIAN IE;Mn;230;NSM;;;;;N;;;;; +A675;COMBINING CYRILLIC LETTER I;Mn;230;NSM;;;;;N;;;;; +A676;COMBINING CYRILLIC LETTER YI;Mn;230;NSM;;;;;N;;;;; +A677;COMBINING CYRILLIC LETTER U;Mn;230;NSM;;;;;N;;;;; +A678;COMBINING CYRILLIC LETTER HARD SIGN;Mn;230;NSM;;;;;N;;;;; +A679;COMBINING CYRILLIC LETTER YERU;Mn;230;NSM;;;;;N;;;;; +A67A;COMBINING CYRILLIC LETTER SOFT SIGN;Mn;230;NSM;;;;;N;;;;; +A67B;COMBINING CYRILLIC LETTER OMEGA;Mn;230;NSM;;;;;N;;;;; +A67C;COMBINING CYRILLIC KAVYKA;Mn;230;NSM;;;;;N;;;;; +A67D;COMBINING CYRILLIC PAYEROK;Mn;230;NSM;;;;;N;;;;; +A67E;CYRILLIC KAVYKA;Po;0;ON;;;;;N;;;;; +A67F;CYRILLIC PAYEROK;Lm;0;ON;;;;;N;;;;; +A680;CYRILLIC CAPITAL LETTER DWE;Lu;0;L;;;;;N;;;;A681; +A681;CYRILLIC SMALL LETTER DWE;Ll;0;L;;;;;N;;;A680;;A680 +A682;CYRILLIC CAPITAL LETTER DZWE;Lu;0;L;;;;;N;;;;A683; +A683;CYRILLIC SMALL LETTER DZWE;Ll;0;L;;;;;N;;;A682;;A682 +A684;CYRILLIC CAPITAL LETTER ZHWE;Lu;0;L;;;;;N;;;;A685; +A685;CYRILLIC SMALL LETTER ZHWE;Ll;0;L;;;;;N;;;A684;;A684 +A686;CYRILLIC CAPITAL LETTER CCHE;Lu;0;L;;;;;N;;;;A687; +A687;CYRILLIC SMALL LETTER CCHE;Ll;0;L;;;;;N;;;A686;;A686 +A688;CYRILLIC CAPITAL LETTER DZZE;Lu;0;L;;;;;N;;;;A689; +A689;CYRILLIC SMALL LETTER DZZE;Ll;0;L;;;;;N;;;A688;;A688 +A68A;CYRILLIC CAPITAL LETTER TE WITH MIDDLE HOOK;Lu;0;L;;;;;N;;;;A68B; +A68B;CYRILLIC SMALL LETTER TE WITH MIDDLE HOOK;Ll;0;L;;;;;N;;;A68A;;A68A +A68C;CYRILLIC CAPITAL LETTER TWE;Lu;0;L;;;;;N;;;;A68D; +A68D;CYRILLIC SMALL LETTER TWE;Ll;0;L;;;;;N;;;A68C;;A68C +A68E;CYRILLIC CAPITAL LETTER TSWE;Lu;0;L;;;;;N;;;;A68F; +A68F;CYRILLIC SMALL LETTER TSWE;Ll;0;L;;;;;N;;;A68E;;A68E +A690;CYRILLIC CAPITAL LETTER TSSE;Lu;0;L;;;;;N;;;;A691; +A691;CYRILLIC SMALL LETTER TSSE;Ll;0;L;;;;;N;;;A690;;A690 +A692;CYRILLIC CAPITAL LETTER TCHE;Lu;0;L;;;;;N;;;;A693; +A693;CYRILLIC SMALL LETTER TCHE;Ll;0;L;;;;;N;;;A692;;A692 +A694;CYRILLIC CAPITAL LETTER HWE;Lu;0;L;;;;;N;;;;A695; +A695;CYRILLIC SMALL LETTER HWE;Ll;0;L;;;;;N;;;A694;;A694 +A696;CYRILLIC CAPITAL LETTER SHWE;Lu;0;L;;;;;N;;;;A697; +A697;CYRILLIC SMALL LETTER SHWE;Ll;0;L;;;;;N;;;A696;;A696 +A698;CYRILLIC CAPITAL LETTER DOUBLE O;Lu;0;L;;;;;N;;;;A699; +A699;CYRILLIC SMALL LETTER DOUBLE O;Ll;0;L;;;;;N;;;A698;;A698 +A69A;CYRILLIC CAPITAL LETTER CROSSED O;Lu;0;L;;;;;N;;;;A69B; +A69B;CYRILLIC SMALL LETTER CROSSED O;Ll;0;L;;;;;N;;;A69A;;A69A +A69C;MODIFIER LETTER CYRILLIC HARD SIGN;Lm;0;L; 044A;;;;N;;;;; +A69D;MODIFIER LETTER CYRILLIC SOFT SIGN;Lm;0;L; 044C;;;;N;;;;; +A69E;COMBINING CYRILLIC LETTER EF;Mn;230;NSM;;;;;N;;;;; +A69F;COMBINING CYRILLIC LETTER IOTIFIED E;Mn;230;NSM;;;;;N;;;;; +A6A0;BAMUM LETTER A;Lo;0;L;;;;;N;;;;; +A6A1;BAMUM LETTER KA;Lo;0;L;;;;;N;;;;; +A6A2;BAMUM LETTER U;Lo;0;L;;;;;N;;;;; +A6A3;BAMUM LETTER KU;Lo;0;L;;;;;N;;;;; +A6A4;BAMUM LETTER EE;Lo;0;L;;;;;N;;;;; +A6A5;BAMUM LETTER REE;Lo;0;L;;;;;N;;;;; +A6A6;BAMUM LETTER TAE;Lo;0;L;;;;;N;;;;; +A6A7;BAMUM LETTER O;Lo;0;L;;;;;N;;;;; +A6A8;BAMUM LETTER NYI;Lo;0;L;;;;;N;;;;; +A6A9;BAMUM LETTER I;Lo;0;L;;;;;N;;;;; +A6AA;BAMUM LETTER LA;Lo;0;L;;;;;N;;;;; +A6AB;BAMUM LETTER PA;Lo;0;L;;;;;N;;;;; +A6AC;BAMUM LETTER RII;Lo;0;L;;;;;N;;;;; +A6AD;BAMUM LETTER RIEE;Lo;0;L;;;;;N;;;;; +A6AE;BAMUM LETTER LEEEE;Lo;0;L;;;;;N;;;;; +A6AF;BAMUM LETTER MEEEE;Lo;0;L;;;;;N;;;;; +A6B0;BAMUM LETTER TAA;Lo;0;L;;;;;N;;;;; +A6B1;BAMUM LETTER NDAA;Lo;0;L;;;;;N;;;;; +A6B2;BAMUM LETTER NJAEM;Lo;0;L;;;;;N;;;;; +A6B3;BAMUM LETTER M;Lo;0;L;;;;;N;;;;; +A6B4;BAMUM LETTER SUU;Lo;0;L;;;;;N;;;;; +A6B5;BAMUM LETTER MU;Lo;0;L;;;;;N;;;;; +A6B6;BAMUM LETTER SHII;Lo;0;L;;;;;N;;;;; +A6B7;BAMUM LETTER SI;Lo;0;L;;;;;N;;;;; +A6B8;BAMUM LETTER SHEUX;Lo;0;L;;;;;N;;;;; +A6B9;BAMUM LETTER SEUX;Lo;0;L;;;;;N;;;;; +A6BA;BAMUM LETTER KYEE;Lo;0;L;;;;;N;;;;; +A6BB;BAMUM LETTER KET;Lo;0;L;;;;;N;;;;; +A6BC;BAMUM LETTER NUAE;Lo;0;L;;;;;N;;;;; +A6BD;BAMUM LETTER NU;Lo;0;L;;;;;N;;;;; +A6BE;BAMUM LETTER NJUAE;Lo;0;L;;;;;N;;;;; +A6BF;BAMUM LETTER YOQ;Lo;0;L;;;;;N;;;;; +A6C0;BAMUM LETTER SHU;Lo;0;L;;;;;N;;;;; +A6C1;BAMUM LETTER YUQ;Lo;0;L;;;;;N;;;;; +A6C2;BAMUM LETTER YA;Lo;0;L;;;;;N;;;;; +A6C3;BAMUM LETTER NSHA;Lo;0;L;;;;;N;;;;; +A6C4;BAMUM LETTER KEUX;Lo;0;L;;;;;N;;;;; +A6C5;BAMUM LETTER PEUX;Lo;0;L;;;;;N;;;;; +A6C6;BAMUM LETTER NJEE;Lo;0;L;;;;;N;;;;; +A6C7;BAMUM LETTER NTEE;Lo;0;L;;;;;N;;;;; +A6C8;BAMUM LETTER PUE;Lo;0;L;;;;;N;;;;; +A6C9;BAMUM LETTER WUE;Lo;0;L;;;;;N;;;;; +A6CA;BAMUM LETTER PEE;Lo;0;L;;;;;N;;;;; +A6CB;BAMUM LETTER FEE;Lo;0;L;;;;;N;;;;; +A6CC;BAMUM LETTER RU;Lo;0;L;;;;;N;;;;; +A6CD;BAMUM LETTER LU;Lo;0;L;;;;;N;;;;; +A6CE;BAMUM LETTER MI;Lo;0;L;;;;;N;;;;; +A6CF;BAMUM LETTER NI;Lo;0;L;;;;;N;;;;; +A6D0;BAMUM LETTER REUX;Lo;0;L;;;;;N;;;;; +A6D1;BAMUM LETTER RAE;Lo;0;L;;;;;N;;;;; +A6D2;BAMUM LETTER KEN;Lo;0;L;;;;;N;;;;; +A6D3;BAMUM LETTER NGKWAEN;Lo;0;L;;;;;N;;;;; +A6D4;BAMUM LETTER NGGA;Lo;0;L;;;;;N;;;;; +A6D5;BAMUM LETTER NGA;Lo;0;L;;;;;N;;;;; +A6D6;BAMUM LETTER SHO;Lo;0;L;;;;;N;;;;; +A6D7;BAMUM LETTER PUAE;Lo;0;L;;;;;N;;;;; +A6D8;BAMUM LETTER FU;Lo;0;L;;;;;N;;;;; +A6D9;BAMUM LETTER FOM;Lo;0;L;;;;;N;;;;; +A6DA;BAMUM LETTER WA;Lo;0;L;;;;;N;;;;; +A6DB;BAMUM LETTER NA;Lo;0;L;;;;;N;;;;; +A6DC;BAMUM LETTER LI;Lo;0;L;;;;;N;;;;; +A6DD;BAMUM LETTER PI;Lo;0;L;;;;;N;;;;; +A6DE;BAMUM LETTER LOQ;Lo;0;L;;;;;N;;;;; +A6DF;BAMUM LETTER KO;Lo;0;L;;;;;N;;;;; +A6E0;BAMUM LETTER MBEN;Lo;0;L;;;;;N;;;;; +A6E1;BAMUM LETTER REN;Lo;0;L;;;;;N;;;;; +A6E2;BAMUM LETTER MEN;Lo;0;L;;;;;N;;;;; +A6E3;BAMUM LETTER MA;Lo;0;L;;;;;N;;;;; +A6E4;BAMUM LETTER TI;Lo;0;L;;;;;N;;;;; +A6E5;BAMUM LETTER KI;Lo;0;L;;;;;N;;;;; +A6E6;BAMUM LETTER MO;Nl;0;L;;;;1;N;;;;; +A6E7;BAMUM LETTER MBAA;Nl;0;L;;;;2;N;;;;; +A6E8;BAMUM LETTER TET;Nl;0;L;;;;3;N;;;;; +A6E9;BAMUM LETTER KPA;Nl;0;L;;;;4;N;;;;; +A6EA;BAMUM LETTER TEN;Nl;0;L;;;;5;N;;;;; +A6EB;BAMUM LETTER NTUU;Nl;0;L;;;;6;N;;;;; +A6EC;BAMUM LETTER SAMBA;Nl;0;L;;;;7;N;;;;; +A6ED;BAMUM LETTER FAAMAE;Nl;0;L;;;;8;N;;;;; +A6EE;BAMUM LETTER KOVUU;Nl;0;L;;;;9;N;;;;; +A6EF;BAMUM LETTER KOGHOM;Nl;0;L;;;;0;N;;;;; +A6F0;BAMUM COMBINING MARK KOQNDON;Mn;230;NSM;;;;;N;;;;; +A6F1;BAMUM COMBINING MARK TUKWENTIS;Mn;230;NSM;;;;;N;;;;; +A6F2;BAMUM NJAEMLI;Po;0;L;;;;;N;;;;; +A6F3;BAMUM FULL STOP;Po;0;L;;;;;N;;;;; +A6F4;BAMUM COLON;Po;0;L;;;;;N;;;;; +A6F5;BAMUM COMMA;Po;0;L;;;;;N;;;;; +A6F6;BAMUM SEMICOLON;Po;0;L;;;;;N;;;;; +A6F7;BAMUM QUESTION MARK;Po;0;L;;;;;N;;;;; +A700;MODIFIER LETTER CHINESE TONE YIN PING;Sk;0;ON;;;;;N;;;;; +A701;MODIFIER LETTER CHINESE TONE YANG PING;Sk;0;ON;;;;;N;;;;; +A702;MODIFIER LETTER CHINESE TONE YIN SHANG;Sk;0;ON;;;;;N;;;;; +A703;MODIFIER LETTER CHINESE TONE YANG SHANG;Sk;0;ON;;;;;N;;;;; +A704;MODIFIER LETTER CHINESE TONE YIN QU;Sk;0;ON;;;;;N;;;;; +A705;MODIFIER LETTER CHINESE TONE YANG QU;Sk;0;ON;;;;;N;;;;; +A706;MODIFIER LETTER CHINESE TONE YIN RU;Sk;0;ON;;;;;N;;;;; +A707;MODIFIER LETTER CHINESE TONE YANG RU;Sk;0;ON;;;;;N;;;;; +A708;MODIFIER LETTER EXTRA-HIGH DOTTED TONE BAR;Sk;0;ON;;;;;N;;;;; +A709;MODIFIER LETTER HIGH DOTTED TONE BAR;Sk;0;ON;;;;;N;;;;; +A70A;MODIFIER LETTER MID DOTTED TONE BAR;Sk;0;ON;;;;;N;;;;; +A70B;MODIFIER LETTER LOW DOTTED TONE BAR;Sk;0;ON;;;;;N;;;;; +A70C;MODIFIER LETTER EXTRA-LOW DOTTED TONE BAR;Sk;0;ON;;;;;N;;;;; +A70D;MODIFIER LETTER EXTRA-HIGH DOTTED LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;; +A70E;MODIFIER LETTER HIGH DOTTED LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;; +A70F;MODIFIER LETTER MID DOTTED LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;; +A710;MODIFIER LETTER LOW DOTTED LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;; +A711;MODIFIER LETTER EXTRA-LOW DOTTED LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;; +A712;MODIFIER LETTER EXTRA-HIGH LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;; +A713;MODIFIER LETTER HIGH LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;; +A714;MODIFIER LETTER MID LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;; +A715;MODIFIER LETTER LOW LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;; +A716;MODIFIER LETTER EXTRA-LOW LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;; +A717;MODIFIER LETTER DOT VERTICAL BAR;Lm;0;ON;;;;;N;;;;; +A718;MODIFIER LETTER DOT SLASH;Lm;0;ON;;;;;N;;;;; +A719;MODIFIER LETTER DOT HORIZONTAL BAR;Lm;0;ON;;;;;N;;;;; +A71A;MODIFIER LETTER LOWER RIGHT CORNER ANGLE;Lm;0;ON;;;;;N;;;;; +A71B;MODIFIER LETTER RAISED UP ARROW;Lm;0;ON;;;;;N;;;;; +A71C;MODIFIER LETTER RAISED DOWN ARROW;Lm;0;ON;;;;;N;;;;; +A71D;MODIFIER LETTER RAISED EXCLAMATION MARK;Lm;0;ON;;;;;N;;;;; +A71E;MODIFIER LETTER RAISED INVERTED EXCLAMATION MARK;Lm;0;ON;;;;;N;;;;; +A71F;MODIFIER LETTER LOW INVERTED EXCLAMATION MARK;Lm;0;ON;;;;;N;;;;; +A720;MODIFIER LETTER STRESS AND HIGH TONE;Sk;0;ON;;;;;N;;;;; +A721;MODIFIER LETTER STRESS AND LOW TONE;Sk;0;ON;;;;;N;;;;; +A722;LATIN CAPITAL LETTER EGYPTOLOGICAL ALEF;Lu;0;L;;;;;N;;;;A723; +A723;LATIN SMALL LETTER EGYPTOLOGICAL ALEF;Ll;0;L;;;;;N;;;A722;;A722 +A724;LATIN CAPITAL LETTER EGYPTOLOGICAL AIN;Lu;0;L;;;;;N;;;;A725; +A725;LATIN SMALL LETTER EGYPTOLOGICAL AIN;Ll;0;L;;;;;N;;;A724;;A724 +A726;LATIN CAPITAL LETTER HENG;Lu;0;L;;;;;N;;;;A727; +A727;LATIN SMALL LETTER HENG;Ll;0;L;;;;;N;;;A726;;A726 +A728;LATIN CAPITAL LETTER TZ;Lu;0;L;;;;;N;;;;A729; +A729;LATIN SMALL LETTER TZ;Ll;0;L;;;;;N;;;A728;;A728 +A72A;LATIN CAPITAL LETTER TRESILLO;Lu;0;L;;;;;N;;;;A72B; +A72B;LATIN SMALL LETTER TRESILLO;Ll;0;L;;;;;N;;;A72A;;A72A +A72C;LATIN CAPITAL LETTER CUATRILLO;Lu;0;L;;;;;N;;;;A72D; +A72D;LATIN SMALL LETTER CUATRILLO;Ll;0;L;;;;;N;;;A72C;;A72C +A72E;LATIN CAPITAL LETTER CUATRILLO WITH COMMA;Lu;0;L;;;;;N;;;;A72F; +A72F;LATIN SMALL LETTER CUATRILLO WITH COMMA;Ll;0;L;;;;;N;;;A72E;;A72E +A730;LATIN LETTER SMALL CAPITAL F;Ll;0;L;;;;;N;;;;; +A731;LATIN LETTER SMALL CAPITAL S;Ll;0;L;;;;;N;;;;; +A732;LATIN CAPITAL LETTER AA;Lu;0;L;;;;;N;;;;A733; +A733;LATIN SMALL LETTER AA;Ll;0;L;;;;;N;;;A732;;A732 +A734;LATIN CAPITAL LETTER AO;Lu;0;L;;;;;N;;;;A735; +A735;LATIN SMALL LETTER AO;Ll;0;L;;;;;N;;;A734;;A734 +A736;LATIN CAPITAL LETTER AU;Lu;0;L;;;;;N;;;;A737; +A737;LATIN SMALL LETTER AU;Ll;0;L;;;;;N;;;A736;;A736 +A738;LATIN CAPITAL LETTER AV;Lu;0;L;;;;;N;;;;A739; +A739;LATIN SMALL LETTER AV;Ll;0;L;;;;;N;;;A738;;A738 +A73A;LATIN CAPITAL LETTER AV WITH HORIZONTAL BAR;Lu;0;L;;;;;N;;;;A73B; +A73B;LATIN SMALL LETTER AV WITH HORIZONTAL BAR;Ll;0;L;;;;;N;;;A73A;;A73A +A73C;LATIN CAPITAL LETTER AY;Lu;0;L;;;;;N;;;;A73D; +A73D;LATIN SMALL LETTER AY;Ll;0;L;;;;;N;;;A73C;;A73C +A73E;LATIN CAPITAL LETTER REVERSED C WITH DOT;Lu;0;L;;;;;N;;;;A73F; +A73F;LATIN SMALL LETTER REVERSED C WITH DOT;Ll;0;L;;;;;N;;;A73E;;A73E +A740;LATIN CAPITAL LETTER K WITH STROKE;Lu;0;L;;;;;N;;;;A741; +A741;LATIN SMALL LETTER K WITH STROKE;Ll;0;L;;;;;N;;;A740;;A740 +A742;LATIN CAPITAL LETTER K WITH DIAGONAL STROKE;Lu;0;L;;;;;N;;;;A743; +A743;LATIN SMALL LETTER K WITH DIAGONAL STROKE;Ll;0;L;;;;;N;;;A742;;A742 +A744;LATIN CAPITAL LETTER K WITH STROKE AND DIAGONAL STROKE;Lu;0;L;;;;;N;;;;A745; +A745;LATIN SMALL LETTER K WITH STROKE AND DIAGONAL STROKE;Ll;0;L;;;;;N;;;A744;;A744 +A746;LATIN CAPITAL LETTER BROKEN L;Lu;0;L;;;;;N;;;;A747; +A747;LATIN SMALL LETTER BROKEN L;Ll;0;L;;;;;N;;;A746;;A746 +A748;LATIN CAPITAL LETTER L WITH HIGH STROKE;Lu;0;L;;;;;N;;;;A749; +A749;LATIN SMALL LETTER L WITH HIGH STROKE;Ll;0;L;;;;;N;;;A748;;A748 +A74A;LATIN CAPITAL LETTER O WITH LONG STROKE OVERLAY;Lu;0;L;;;;;N;;;;A74B; +A74B;LATIN SMALL LETTER O WITH LONG STROKE OVERLAY;Ll;0;L;;;;;N;;;A74A;;A74A +A74C;LATIN CAPITAL LETTER O WITH LOOP;Lu;0;L;;;;;N;;;;A74D; +A74D;LATIN SMALL LETTER O WITH LOOP;Ll;0;L;;;;;N;;;A74C;;A74C +A74E;LATIN CAPITAL LETTER OO;Lu;0;L;;;;;N;;;;A74F; +A74F;LATIN SMALL LETTER OO;Ll;0;L;;;;;N;;;A74E;;A74E +A750;LATIN CAPITAL LETTER P WITH STROKE THROUGH DESCENDER;Lu;0;L;;;;;N;;;;A751; +A751;LATIN SMALL LETTER P WITH STROKE THROUGH DESCENDER;Ll;0;L;;;;;N;;;A750;;A750 +A752;LATIN CAPITAL LETTER P WITH FLOURISH;Lu;0;L;;;;;N;;;;A753; +A753;LATIN SMALL LETTER P WITH FLOURISH;Ll;0;L;;;;;N;;;A752;;A752 +A754;LATIN CAPITAL LETTER P WITH SQUIRREL TAIL;Lu;0;L;;;;;N;;;;A755; +A755;LATIN SMALL LETTER P WITH SQUIRREL TAIL;Ll;0;L;;;;;N;;;A754;;A754 +A756;LATIN CAPITAL LETTER Q WITH STROKE THROUGH DESCENDER;Lu;0;L;;;;;N;;;;A757; +A757;LATIN SMALL LETTER Q WITH STROKE THROUGH DESCENDER;Ll;0;L;;;;;N;;;A756;;A756 +A758;LATIN CAPITAL LETTER Q WITH DIAGONAL STROKE;Lu;0;L;;;;;N;;;;A759; +A759;LATIN SMALL LETTER Q WITH DIAGONAL STROKE;Ll;0;L;;;;;N;;;A758;;A758 +A75A;LATIN CAPITAL LETTER R ROTUNDA;Lu;0;L;;;;;N;;;;A75B; +A75B;LATIN SMALL LETTER R ROTUNDA;Ll;0;L;;;;;N;;;A75A;;A75A +A75C;LATIN CAPITAL LETTER RUM ROTUNDA;Lu;0;L;;;;;N;;;;A75D; +A75D;LATIN SMALL LETTER RUM ROTUNDA;Ll;0;L;;;;;N;;;A75C;;A75C +A75E;LATIN CAPITAL LETTER V WITH DIAGONAL STROKE;Lu;0;L;;;;;N;;;;A75F; +A75F;LATIN SMALL LETTER V WITH DIAGONAL STROKE;Ll;0;L;;;;;N;;;A75E;;A75E +A760;LATIN CAPITAL LETTER VY;Lu;0;L;;;;;N;;;;A761; +A761;LATIN SMALL LETTER VY;Ll;0;L;;;;;N;;;A760;;A760 +A762;LATIN CAPITAL LETTER VISIGOTHIC Z;Lu;0;L;;;;;N;;;;A763; +A763;LATIN SMALL LETTER VISIGOTHIC Z;Ll;0;L;;;;;N;;;A762;;A762 +A764;LATIN CAPITAL LETTER THORN WITH STROKE;Lu;0;L;;;;;N;;;;A765; +A765;LATIN SMALL LETTER THORN WITH STROKE;Ll;0;L;;;;;N;;;A764;;A764 +A766;LATIN CAPITAL LETTER THORN WITH STROKE THROUGH DESCENDER;Lu;0;L;;;;;N;;;;A767; +A767;LATIN SMALL LETTER THORN WITH STROKE THROUGH DESCENDER;Ll;0;L;;;;;N;;;A766;;A766 +A768;LATIN CAPITAL LETTER VEND;Lu;0;L;;;;;N;;;;A769; +A769;LATIN SMALL LETTER VEND;Ll;0;L;;;;;N;;;A768;;A768 +A76A;LATIN CAPITAL LETTER ET;Lu;0;L;;;;;N;;;;A76B; +A76B;LATIN SMALL LETTER ET;Ll;0;L;;;;;N;;;A76A;;A76A +A76C;LATIN CAPITAL LETTER IS;Lu;0;L;;;;;N;;;;A76D; +A76D;LATIN SMALL LETTER IS;Ll;0;L;;;;;N;;;A76C;;A76C +A76E;LATIN CAPITAL LETTER CON;Lu;0;L;;;;;N;;;;A76F; +A76F;LATIN SMALL LETTER CON;Ll;0;L;;;;;N;;;A76E;;A76E +A770;MODIFIER LETTER US;Lm;0;L; A76F;;;;N;;;;; +A771;LATIN SMALL LETTER DUM;Ll;0;L;;;;;N;;;;; +A772;LATIN SMALL LETTER LUM;Ll;0;L;;;;;N;;;;; +A773;LATIN SMALL LETTER MUM;Ll;0;L;;;;;N;;;;; +A774;LATIN SMALL LETTER NUM;Ll;0;L;;;;;N;;;;; +A775;LATIN SMALL LETTER RUM;Ll;0;L;;;;;N;;;;; +A776;LATIN LETTER SMALL CAPITAL RUM;Ll;0;L;;;;;N;;;;; +A777;LATIN SMALL LETTER TUM;Ll;0;L;;;;;N;;;;; +A778;LATIN SMALL LETTER UM;Ll;0;L;;;;;N;;;;; +A779;LATIN CAPITAL LETTER INSULAR D;Lu;0;L;;;;;N;;;;A77A; +A77A;LATIN SMALL LETTER INSULAR D;Ll;0;L;;;;;N;;;A779;;A779 +A77B;LATIN CAPITAL LETTER INSULAR F;Lu;0;L;;;;;N;;;;A77C; +A77C;LATIN SMALL LETTER INSULAR F;Ll;0;L;;;;;N;;;A77B;;A77B +A77D;LATIN CAPITAL LETTER INSULAR G;Lu;0;L;;;;;N;;;;1D79; +A77E;LATIN CAPITAL LETTER TURNED INSULAR G;Lu;0;L;;;;;N;;;;A77F; +A77F;LATIN SMALL LETTER TURNED INSULAR G;Ll;0;L;;;;;N;;;A77E;;A77E +A780;LATIN CAPITAL LETTER TURNED L;Lu;0;L;;;;;N;;;;A781; +A781;LATIN SMALL LETTER TURNED L;Ll;0;L;;;;;N;;;A780;;A780 +A782;LATIN CAPITAL LETTER INSULAR R;Lu;0;L;;;;;N;;;;A783; +A783;LATIN SMALL LETTER INSULAR R;Ll;0;L;;;;;N;;;A782;;A782 +A784;LATIN CAPITAL LETTER INSULAR S;Lu;0;L;;;;;N;;;;A785; +A785;LATIN SMALL LETTER INSULAR S;Ll;0;L;;;;;N;;;A784;;A784 +A786;LATIN CAPITAL LETTER INSULAR T;Lu;0;L;;;;;N;;;;A787; +A787;LATIN SMALL LETTER INSULAR T;Ll;0;L;;;;;N;;;A786;;A786 +A788;MODIFIER LETTER LOW CIRCUMFLEX ACCENT;Lm;0;ON;;;;;N;;;;; +A789;MODIFIER LETTER COLON;Sk;0;L;;;;;N;;;;; +A78A;MODIFIER LETTER SHORT EQUALS SIGN;Sk;0;L;;;;;N;;;;; +A78B;LATIN CAPITAL LETTER SALTILLO;Lu;0;L;;;;;N;;;;A78C; +A78C;LATIN SMALL LETTER SALTILLO;Ll;0;L;;;;;N;;;A78B;;A78B +A78D;LATIN CAPITAL LETTER TURNED H;Lu;0;L;;;;;N;;;;0265; +A78E;LATIN SMALL LETTER L WITH RETROFLEX HOOK AND BELT;Ll;0;L;;;;;N;;;;; +A78F;LATIN LETTER SINOLOGICAL DOT;Lo;0;L;;;;;N;;;;; +A790;LATIN CAPITAL LETTER N WITH DESCENDER;Lu;0;L;;;;;N;;;;A791; +A791;LATIN SMALL LETTER N WITH DESCENDER;Ll;0;L;;;;;N;;;A790;;A790 +A792;LATIN CAPITAL LETTER C WITH BAR;Lu;0;L;;;;;N;;;;A793; +A793;LATIN SMALL LETTER C WITH BAR;Ll;0;L;;;;;N;;;A792;;A792 +A794;LATIN SMALL LETTER C WITH PALATAL HOOK;Ll;0;L;;;;;N;;;A7C4;;A7C4 +A795;LATIN SMALL LETTER H WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;; +A796;LATIN CAPITAL LETTER B WITH FLOURISH;Lu;0;L;;;;;N;;;;A797; +A797;LATIN SMALL LETTER B WITH FLOURISH;Ll;0;L;;;;;N;;;A796;;A796 +A798;LATIN CAPITAL LETTER F WITH STROKE;Lu;0;L;;;;;N;;;;A799; +A799;LATIN SMALL LETTER F WITH STROKE;Ll;0;L;;;;;N;;;A798;;A798 +A79A;LATIN CAPITAL LETTER VOLAPUK AE;Lu;0;L;;;;;N;;;;A79B; +A79B;LATIN SMALL LETTER VOLAPUK AE;Ll;0;L;;;;;N;;;A79A;;A79A +A79C;LATIN CAPITAL LETTER VOLAPUK OE;Lu;0;L;;;;;N;;;;A79D; +A79D;LATIN SMALL LETTER VOLAPUK OE;Ll;0;L;;;;;N;;;A79C;;A79C +A79E;LATIN CAPITAL LETTER VOLAPUK UE;Lu;0;L;;;;;N;;;;A79F; +A79F;LATIN SMALL LETTER VOLAPUK UE;Ll;0;L;;;;;N;;;A79E;;A79E +A7A0;LATIN CAPITAL LETTER G WITH OBLIQUE STROKE;Lu;0;L;;;;;N;;;;A7A1; +A7A1;LATIN SMALL LETTER G WITH OBLIQUE STROKE;Ll;0;L;;;;;N;;;A7A0;;A7A0 +A7A2;LATIN CAPITAL LETTER K WITH OBLIQUE STROKE;Lu;0;L;;;;;N;;;;A7A3; +A7A3;LATIN SMALL LETTER K WITH OBLIQUE STROKE;Ll;0;L;;;;;N;;;A7A2;;A7A2 +A7A4;LATIN CAPITAL LETTER N WITH OBLIQUE STROKE;Lu;0;L;;;;;N;;;;A7A5; +A7A5;LATIN SMALL LETTER N WITH OBLIQUE STROKE;Ll;0;L;;;;;N;;;A7A4;;A7A4 +A7A6;LATIN CAPITAL LETTER R WITH OBLIQUE STROKE;Lu;0;L;;;;;N;;;;A7A7; +A7A7;LATIN SMALL LETTER R WITH OBLIQUE STROKE;Ll;0;L;;;;;N;;;A7A6;;A7A6 +A7A8;LATIN CAPITAL LETTER S WITH OBLIQUE STROKE;Lu;0;L;;;;;N;;;;A7A9; +A7A9;LATIN SMALL LETTER S WITH OBLIQUE STROKE;Ll;0;L;;;;;N;;;A7A8;;A7A8 +A7AA;LATIN CAPITAL LETTER H WITH HOOK;Lu;0;L;;;;;N;;;;0266; +A7AB;LATIN CAPITAL LETTER REVERSED OPEN E;Lu;0;L;;;;;N;;;;025C; +A7AC;LATIN CAPITAL LETTER SCRIPT G;Lu;0;L;;;;;N;;;;0261; +A7AD;LATIN CAPITAL LETTER L WITH BELT;Lu;0;L;;;;;N;;;;026C; +A7AE;LATIN CAPITAL LETTER SMALL CAPITAL I;Lu;0;L;;;;;N;;;;026A; +A7AF;LATIN LETTER SMALL CAPITAL Q;Ll;0;L;;;;;N;;;;; +A7B0;LATIN CAPITAL LETTER TURNED K;Lu;0;L;;;;;N;;;;029E; +A7B1;LATIN CAPITAL LETTER TURNED T;Lu;0;L;;;;;N;;;;0287; +A7B2;LATIN CAPITAL LETTER J WITH CROSSED-TAIL;Lu;0;L;;;;;N;;;;029D; +A7B3;LATIN CAPITAL LETTER CHI;Lu;0;L;;;;;N;;;;AB53; +A7B4;LATIN CAPITAL LETTER BETA;Lu;0;L;;;;;N;;;;A7B5; +A7B5;LATIN SMALL LETTER BETA;Ll;0;L;;;;;N;;;A7B4;;A7B4 +A7B6;LATIN CAPITAL LETTER OMEGA;Lu;0;L;;;;;N;;;;A7B7; +A7B7;LATIN SMALL LETTER OMEGA;Ll;0;L;;;;;N;;;A7B6;;A7B6 +A7B8;LATIN CAPITAL LETTER U WITH STROKE;Lu;0;L;;;;;N;;;;A7B9; +A7B9;LATIN SMALL LETTER U WITH STROKE;Ll;0;L;;;;;N;;;A7B8;;A7B8 +A7BA;LATIN CAPITAL LETTER GLOTTAL A;Lu;0;L;;;;;N;;;;A7BB; +A7BB;LATIN SMALL LETTER GLOTTAL A;Ll;0;L;;;;;N;;;A7BA;;A7BA +A7BC;LATIN CAPITAL LETTER GLOTTAL I;Lu;0;L;;;;;N;;;;A7BD; +A7BD;LATIN SMALL LETTER GLOTTAL I;Ll;0;L;;;;;N;;;A7BC;;A7BC +A7BE;LATIN CAPITAL LETTER GLOTTAL U;Lu;0;L;;;;;N;;;;A7BF; +A7BF;LATIN SMALL LETTER GLOTTAL U;Ll;0;L;;;;;N;;;A7BE;;A7BE +A7C0;LATIN CAPITAL LETTER OLD POLISH O;Lu;0;L;;;;;N;;;;A7C1; +A7C1;LATIN SMALL LETTER OLD POLISH O;Ll;0;L;;;;;N;;;A7C0;;A7C0 +A7C2;LATIN CAPITAL LETTER ANGLICANA W;Lu;0;L;;;;;N;;;;A7C3; +A7C3;LATIN SMALL LETTER ANGLICANA W;Ll;0;L;;;;;N;;;A7C2;;A7C2 +A7C4;LATIN CAPITAL LETTER C WITH PALATAL HOOK;Lu;0;L;;;;;N;;;;A794; +A7C5;LATIN CAPITAL LETTER S WITH HOOK;Lu;0;L;;;;;N;;;;0282; +A7C6;LATIN CAPITAL LETTER Z WITH PALATAL HOOK;Lu;0;L;;;;;N;;;;1D8E; +A7C7;LATIN CAPITAL LETTER D WITH SHORT STROKE OVERLAY;Lu;0;L;;;;;N;;;;A7C8; +A7C8;LATIN SMALL LETTER D WITH SHORT STROKE OVERLAY;Ll;0;L;;;;;N;;;A7C7;;A7C7 +A7C9;LATIN CAPITAL LETTER S WITH SHORT STROKE OVERLAY;Lu;0;L;;;;;N;;;;A7CA; +A7CA;LATIN SMALL LETTER S WITH SHORT STROKE OVERLAY;Ll;0;L;;;;;N;;;A7C9;;A7C9 +A7CB;LATIN CAPITAL LETTER RAMS HORN;Lu;0;L;;;;;N;;;;0264; +A7CC;LATIN CAPITAL LETTER S WITH DIAGONAL STROKE;Lu;0;L;;;;;N;;;;A7CD; +A7CD;LATIN SMALL LETTER S WITH DIAGONAL STROKE;Ll;0;L;;;;;N;;;A7CC;;A7CC +A7CE;LATIN CAPITAL LETTER PHARYNGEAL VOICED FRICATIVE;Lu;0;L;;;;;N;;;;A7CF; +A7CF;LATIN SMALL LETTER PHARYNGEAL VOICED FRICATIVE;Ll;0;L;;;;;N;;;A7CE;;A7CE +A7D0;LATIN CAPITAL LETTER CLOSED INSULAR G;Lu;0;L;;;;;N;;;;A7D1; +A7D1;LATIN SMALL LETTER CLOSED INSULAR G;Ll;0;L;;;;;N;;;A7D0;;A7D0 +A7D2;LATIN CAPITAL LETTER DOUBLE THORN;Lu;0;L;;;;;N;;;;A7D3; +A7D3;LATIN SMALL LETTER DOUBLE THORN;Ll;0;L;;;;;N;;;A7D2;;A7D2 +A7D4;LATIN CAPITAL LETTER DOUBLE WYNN;Lu;0;L;;;;;N;;;;A7D5; +A7D5;LATIN SMALL LETTER DOUBLE WYNN;Ll;0;L;;;;;N;;;A7D4;;A7D4 +A7D6;LATIN CAPITAL LETTER MIDDLE SCOTS S;Lu;0;L;;;;;N;;;;A7D7; +A7D7;LATIN SMALL LETTER MIDDLE SCOTS S;Ll;0;L;;;;;N;;;A7D6;;A7D6 +A7D8;LATIN CAPITAL LETTER SIGMOID S;Lu;0;L;;;;;N;;;;A7D9; +A7D9;LATIN SMALL LETTER SIGMOID S;Ll;0;L;;;;;N;;;A7D8;;A7D8 +A7DA;LATIN CAPITAL LETTER LAMBDA;Lu;0;L;;;;;N;;;;A7DB; +A7DB;LATIN SMALL LETTER LAMBDA;Ll;0;L;;;;;N;;;A7DA;;A7DA +A7DC;LATIN CAPITAL LETTER LAMBDA WITH STROKE;Lu;0;L;;;;;N;;;;019B; +A7F1;MODIFIER LETTER CAPITAL S;Lm;0;L; 0053;;;;N;;;;; +A7F2;MODIFIER LETTER CAPITAL C;Lm;0;L; 0043;;;;N;;;;; +A7F3;MODIFIER LETTER CAPITAL F;Lm;0;L; 0046;;;;N;;;;; +A7F4;MODIFIER LETTER CAPITAL Q;Lm;0;L; 0051;;;;N;;;;; +A7F5;LATIN CAPITAL LETTER REVERSED HALF H;Lu;0;L;;;;;N;;;;A7F6; +A7F6;LATIN SMALL LETTER REVERSED HALF H;Ll;0;L;;;;;N;;;A7F5;;A7F5 +A7F7;LATIN EPIGRAPHIC LETTER SIDEWAYS I;Lo;0;L;;;;;N;;;;; +A7F8;MODIFIER LETTER CAPITAL H WITH STROKE;Lm;0;L; 0126;;;;N;;;;; +A7F9;MODIFIER LETTER SMALL LIGATURE OE;Lm;0;L; 0153;;;;N;;;;; +A7FA;LATIN LETTER SMALL CAPITAL TURNED M;Ll;0;L;;;;;N;;;;; +A7FB;LATIN EPIGRAPHIC LETTER REVERSED F;Lo;0;L;;;;;N;;;;; +A7FC;LATIN EPIGRAPHIC LETTER REVERSED P;Lo;0;L;;;;;N;;;;; +A7FD;LATIN EPIGRAPHIC LETTER INVERTED M;Lo;0;L;;;;;N;;;;; +A7FE;LATIN EPIGRAPHIC LETTER I LONGA;Lo;0;L;;;;;N;;;;; +A7FF;LATIN EPIGRAPHIC LETTER ARCHAIC M;Lo;0;L;;;;;N;;;;; +A800;SYLOTI NAGRI LETTER A;Lo;0;L;;;;;N;;;;; +A801;SYLOTI NAGRI LETTER I;Lo;0;L;;;;;N;;;;; +A802;SYLOTI NAGRI SIGN DVISVARA;Mn;0;NSM;;;;;N;;;;; +A803;SYLOTI NAGRI LETTER U;Lo;0;L;;;;;N;;;;; +A804;SYLOTI NAGRI LETTER E;Lo;0;L;;;;;N;;;;; +A805;SYLOTI NAGRI LETTER O;Lo;0;L;;;;;N;;;;; +A806;SYLOTI NAGRI SIGN HASANTA;Mn;9;NSM;;;;;N;;;;; +A807;SYLOTI NAGRI LETTER KO;Lo;0;L;;;;;N;;;;; +A808;SYLOTI NAGRI LETTER KHO;Lo;0;L;;;;;N;;;;; +A809;SYLOTI NAGRI LETTER GO;Lo;0;L;;;;;N;;;;; +A80A;SYLOTI NAGRI LETTER GHO;Lo;0;L;;;;;N;;;;; +A80B;SYLOTI NAGRI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;; +A80C;SYLOTI NAGRI LETTER CO;Lo;0;L;;;;;N;;;;; +A80D;SYLOTI NAGRI LETTER CHO;Lo;0;L;;;;;N;;;;; +A80E;SYLOTI NAGRI LETTER JO;Lo;0;L;;;;;N;;;;; +A80F;SYLOTI NAGRI LETTER JHO;Lo;0;L;;;;;N;;;;; +A810;SYLOTI NAGRI LETTER TTO;Lo;0;L;;;;;N;;;;; +A811;SYLOTI NAGRI LETTER TTHO;Lo;0;L;;;;;N;;;;; +A812;SYLOTI NAGRI LETTER DDO;Lo;0;L;;;;;N;;;;; +A813;SYLOTI NAGRI LETTER DDHO;Lo;0;L;;;;;N;;;;; +A814;SYLOTI NAGRI LETTER TO;Lo;0;L;;;;;N;;;;; +A815;SYLOTI NAGRI LETTER THO;Lo;0;L;;;;;N;;;;; +A816;SYLOTI NAGRI LETTER DO;Lo;0;L;;;;;N;;;;; +A817;SYLOTI NAGRI LETTER DHO;Lo;0;L;;;;;N;;;;; +A818;SYLOTI NAGRI LETTER NO;Lo;0;L;;;;;N;;;;; +A819;SYLOTI NAGRI LETTER PO;Lo;0;L;;;;;N;;;;; +A81A;SYLOTI NAGRI LETTER PHO;Lo;0;L;;;;;N;;;;; +A81B;SYLOTI NAGRI LETTER BO;Lo;0;L;;;;;N;;;;; +A81C;SYLOTI NAGRI LETTER BHO;Lo;0;L;;;;;N;;;;; +A81D;SYLOTI NAGRI LETTER MO;Lo;0;L;;;;;N;;;;; +A81E;SYLOTI NAGRI LETTER RO;Lo;0;L;;;;;N;;;;; +A81F;SYLOTI NAGRI LETTER LO;Lo;0;L;;;;;N;;;;; +A820;SYLOTI NAGRI LETTER RRO;Lo;0;L;;;;;N;;;;; +A821;SYLOTI NAGRI LETTER SO;Lo;0;L;;;;;N;;;;; +A822;SYLOTI NAGRI LETTER HO;Lo;0;L;;;;;N;;;;; +A823;SYLOTI NAGRI VOWEL SIGN A;Mc;0;L;;;;;N;;;;; +A824;SYLOTI NAGRI VOWEL SIGN I;Mc;0;L;;;;;N;;;;; +A825;SYLOTI NAGRI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;; +A826;SYLOTI NAGRI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;; +A827;SYLOTI NAGRI VOWEL SIGN OO;Mc;0;L;;;;;N;;;;; +A828;SYLOTI NAGRI POETRY MARK-1;So;0;ON;;;;;N;;;;; +A829;SYLOTI NAGRI POETRY MARK-2;So;0;ON;;;;;N;;;;; +A82A;SYLOTI NAGRI POETRY MARK-3;So;0;ON;;;;;N;;;;; +A82B;SYLOTI NAGRI POETRY MARK-4;So;0;ON;;;;;N;;;;; +A82C;SYLOTI NAGRI SIGN ALTERNATE HASANTA;Mn;9;NSM;;;;;N;;;;; +A830;NORTH INDIC FRACTION ONE QUARTER;No;0;L;;;;1/4;N;;;;; +A831;NORTH INDIC FRACTION ONE HALF;No;0;L;;;;1/2;N;;;;; +A832;NORTH INDIC FRACTION THREE QUARTERS;No;0;L;;;;3/4;N;;;;; +A833;NORTH INDIC FRACTION ONE SIXTEENTH;No;0;L;;;;1/16;N;;;;; +A834;NORTH INDIC FRACTION ONE EIGHTH;No;0;L;;;;1/8;N;;;;; +A835;NORTH INDIC FRACTION THREE SIXTEENTHS;No;0;L;;;;3/16;N;;;;; +A836;NORTH INDIC QUARTER MARK;So;0;L;;;;;N;;;;; +A837;NORTH INDIC PLACEHOLDER MARK;So;0;L;;;;;N;;;;; +A838;NORTH INDIC RUPEE MARK;Sc;0;ET;;;;;N;;;;; +A839;NORTH INDIC QUANTITY MARK;So;0;ET;;;;;N;;;;; +A840;PHAGS-PA LETTER KA;Lo;0;L;;;;;N;;;;; +A841;PHAGS-PA LETTER KHA;Lo;0;L;;;;;N;;;;; +A842;PHAGS-PA LETTER GA;Lo;0;L;;;;;N;;;;; +A843;PHAGS-PA LETTER NGA;Lo;0;L;;;;;N;;;;; +A844;PHAGS-PA LETTER CA;Lo;0;L;;;;;N;;;;; +A845;PHAGS-PA LETTER CHA;Lo;0;L;;;;;N;;;;; +A846;PHAGS-PA LETTER JA;Lo;0;L;;;;;N;;;;; +A847;PHAGS-PA LETTER NYA;Lo;0;L;;;;;N;;;;; +A848;PHAGS-PA LETTER TA;Lo;0;L;;;;;N;;;;; +A849;PHAGS-PA LETTER THA;Lo;0;L;;;;;N;;;;; +A84A;PHAGS-PA LETTER DA;Lo;0;L;;;;;N;;;;; +A84B;PHAGS-PA LETTER NA;Lo;0;L;;;;;N;;;;; +A84C;PHAGS-PA LETTER PA;Lo;0;L;;;;;N;;;;; +A84D;PHAGS-PA LETTER PHA;Lo;0;L;;;;;N;;;;; +A84E;PHAGS-PA LETTER BA;Lo;0;L;;;;;N;;;;; +A84F;PHAGS-PA LETTER MA;Lo;0;L;;;;;N;;;;; +A850;PHAGS-PA LETTER TSA;Lo;0;L;;;;;N;;;;; +A851;PHAGS-PA LETTER TSHA;Lo;0;L;;;;;N;;;;; +A852;PHAGS-PA LETTER DZA;Lo;0;L;;;;;N;;;;; +A853;PHAGS-PA LETTER WA;Lo;0;L;;;;;N;;;;; +A854;PHAGS-PA LETTER ZHA;Lo;0;L;;;;;N;;;;; +A855;PHAGS-PA LETTER ZA;Lo;0;L;;;;;N;;;;; +A856;PHAGS-PA LETTER SMALL A;Lo;0;L;;;;;N;;;;; +A857;PHAGS-PA LETTER YA;Lo;0;L;;;;;N;;;;; +A858;PHAGS-PA LETTER RA;Lo;0;L;;;;;N;;;;; +A859;PHAGS-PA LETTER LA;Lo;0;L;;;;;N;;;;; +A85A;PHAGS-PA LETTER SHA;Lo;0;L;;;;;N;;;;; +A85B;PHAGS-PA LETTER SA;Lo;0;L;;;;;N;;;;; +A85C;PHAGS-PA LETTER HA;Lo;0;L;;;;;N;;;;; +A85D;PHAGS-PA LETTER A;Lo;0;L;;;;;N;;;;; +A85E;PHAGS-PA LETTER I;Lo;0;L;;;;;N;;;;; +A85F;PHAGS-PA LETTER U;Lo;0;L;;;;;N;;;;; +A860;PHAGS-PA LETTER E;Lo;0;L;;;;;N;;;;; +A861;PHAGS-PA LETTER O;Lo;0;L;;;;;N;;;;; +A862;PHAGS-PA LETTER QA;Lo;0;L;;;;;N;;;;; +A863;PHAGS-PA LETTER XA;Lo;0;L;;;;;N;;;;; +A864;PHAGS-PA LETTER FA;Lo;0;L;;;;;N;;;;; +A865;PHAGS-PA LETTER GGA;Lo;0;L;;;;;N;;;;; +A866;PHAGS-PA LETTER EE;Lo;0;L;;;;;N;;;;; +A867;PHAGS-PA SUBJOINED LETTER WA;Lo;0;L;;;;;N;;;;; +A868;PHAGS-PA SUBJOINED LETTER YA;Lo;0;L;;;;;N;;;;; +A869;PHAGS-PA LETTER TTA;Lo;0;L;;;;;N;;;;; +A86A;PHAGS-PA LETTER TTHA;Lo;0;L;;;;;N;;;;; +A86B;PHAGS-PA LETTER DDA;Lo;0;L;;;;;N;;;;; +A86C;PHAGS-PA LETTER NNA;Lo;0;L;;;;;N;;;;; +A86D;PHAGS-PA LETTER ALTERNATE YA;Lo;0;L;;;;;N;;;;; +A86E;PHAGS-PA LETTER VOICELESS SHA;Lo;0;L;;;;;N;;;;; +A86F;PHAGS-PA LETTER VOICED HA;Lo;0;L;;;;;N;;;;; +A870;PHAGS-PA LETTER ASPIRATED FA;Lo;0;L;;;;;N;;;;; +A871;PHAGS-PA SUBJOINED LETTER RA;Lo;0;L;;;;;N;;;;; +A872;PHAGS-PA SUPERFIXED LETTER RA;Lo;0;L;;;;;N;;;;; +A873;PHAGS-PA LETTER CANDRABINDU;Lo;0;L;;;;;N;;;;; +A874;PHAGS-PA SINGLE HEAD MARK;Po;0;ON;;;;;N;;;;; +A875;PHAGS-PA DOUBLE HEAD MARK;Po;0;ON;;;;;N;;;;; +A876;PHAGS-PA MARK SHAD;Po;0;ON;;;;;N;;;;; +A877;PHAGS-PA MARK DOUBLE SHAD;Po;0;ON;;;;;N;;;;; +A880;SAURASHTRA SIGN ANUSVARA;Mc;0;L;;;;;N;;;;; +A881;SAURASHTRA SIGN VISARGA;Mc;0;L;;;;;N;;;;; +A882;SAURASHTRA LETTER A;Lo;0;L;;;;;N;;;;; +A883;SAURASHTRA LETTER AA;Lo;0;L;;;;;N;;;;; +A884;SAURASHTRA LETTER I;Lo;0;L;;;;;N;;;;; +A885;SAURASHTRA LETTER II;Lo;0;L;;;;;N;;;;; +A886;SAURASHTRA LETTER U;Lo;0;L;;;;;N;;;;; +A887;SAURASHTRA LETTER UU;Lo;0;L;;;;;N;;;;; +A888;SAURASHTRA LETTER VOCALIC R;Lo;0;L;;;;;N;;;;; +A889;SAURASHTRA LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;; +A88A;SAURASHTRA LETTER VOCALIC L;Lo;0;L;;;;;N;;;;; +A88B;SAURASHTRA LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;; +A88C;SAURASHTRA LETTER E;Lo;0;L;;;;;N;;;;; +A88D;SAURASHTRA LETTER EE;Lo;0;L;;;;;N;;;;; +A88E;SAURASHTRA LETTER AI;Lo;0;L;;;;;N;;;;; +A88F;SAURASHTRA LETTER O;Lo;0;L;;;;;N;;;;; +A890;SAURASHTRA LETTER OO;Lo;0;L;;;;;N;;;;; +A891;SAURASHTRA LETTER AU;Lo;0;L;;;;;N;;;;; +A892;SAURASHTRA LETTER KA;Lo;0;L;;;;;N;;;;; +A893;SAURASHTRA LETTER KHA;Lo;0;L;;;;;N;;;;; +A894;SAURASHTRA LETTER GA;Lo;0;L;;;;;N;;;;; +A895;SAURASHTRA LETTER GHA;Lo;0;L;;;;;N;;;;; +A896;SAURASHTRA LETTER NGA;Lo;0;L;;;;;N;;;;; +A897;SAURASHTRA LETTER CA;Lo;0;L;;;;;N;;;;; +A898;SAURASHTRA LETTER CHA;Lo;0;L;;;;;N;;;;; +A899;SAURASHTRA LETTER JA;Lo;0;L;;;;;N;;;;; +A89A;SAURASHTRA LETTER JHA;Lo;0;L;;;;;N;;;;; +A89B;SAURASHTRA LETTER NYA;Lo;0;L;;;;;N;;;;; +A89C;SAURASHTRA LETTER TTA;Lo;0;L;;;;;N;;;;; +A89D;SAURASHTRA LETTER TTHA;Lo;0;L;;;;;N;;;;; +A89E;SAURASHTRA LETTER DDA;Lo;0;L;;;;;N;;;;; +A89F;SAURASHTRA LETTER DDHA;Lo;0;L;;;;;N;;;;; +A8A0;SAURASHTRA LETTER NNA;Lo;0;L;;;;;N;;;;; +A8A1;SAURASHTRA LETTER TA;Lo;0;L;;;;;N;;;;; +A8A2;SAURASHTRA LETTER THA;Lo;0;L;;;;;N;;;;; +A8A3;SAURASHTRA LETTER DA;Lo;0;L;;;;;N;;;;; +A8A4;SAURASHTRA LETTER DHA;Lo;0;L;;;;;N;;;;; +A8A5;SAURASHTRA LETTER NA;Lo;0;L;;;;;N;;;;; +A8A6;SAURASHTRA LETTER PA;Lo;0;L;;;;;N;;;;; +A8A7;SAURASHTRA LETTER PHA;Lo;0;L;;;;;N;;;;; +A8A8;SAURASHTRA LETTER BA;Lo;0;L;;;;;N;;;;; +A8A9;SAURASHTRA LETTER BHA;Lo;0;L;;;;;N;;;;; +A8AA;SAURASHTRA LETTER MA;Lo;0;L;;;;;N;;;;; +A8AB;SAURASHTRA LETTER YA;Lo;0;L;;;;;N;;;;; +A8AC;SAURASHTRA LETTER RA;Lo;0;L;;;;;N;;;;; +A8AD;SAURASHTRA LETTER LA;Lo;0;L;;;;;N;;;;; +A8AE;SAURASHTRA LETTER VA;Lo;0;L;;;;;N;;;;; +A8AF;SAURASHTRA LETTER SHA;Lo;0;L;;;;;N;;;;; +A8B0;SAURASHTRA LETTER SSA;Lo;0;L;;;;;N;;;;; +A8B1;SAURASHTRA LETTER SA;Lo;0;L;;;;;N;;;;; +A8B2;SAURASHTRA LETTER HA;Lo;0;L;;;;;N;;;;; +A8B3;SAURASHTRA LETTER LLA;Lo;0;L;;;;;N;;;;; +A8B4;SAURASHTRA CONSONANT SIGN HAARU;Mc;0;L;;;;;N;;;;; +A8B5;SAURASHTRA VOWEL SIGN AA;Mc;0;L;;;;;N;;;;; +A8B6;SAURASHTRA VOWEL SIGN I;Mc;0;L;;;;;N;;;;; +A8B7;SAURASHTRA VOWEL SIGN II;Mc;0;L;;;;;N;;;;; +A8B8;SAURASHTRA VOWEL SIGN U;Mc;0;L;;;;;N;;;;; +A8B9;SAURASHTRA VOWEL SIGN UU;Mc;0;L;;;;;N;;;;; +A8BA;SAURASHTRA VOWEL SIGN VOCALIC R;Mc;0;L;;;;;N;;;;; +A8BB;SAURASHTRA VOWEL SIGN VOCALIC RR;Mc;0;L;;;;;N;;;;; +A8BC;SAURASHTRA VOWEL SIGN VOCALIC L;Mc;0;L;;;;;N;;;;; +A8BD;SAURASHTRA VOWEL SIGN VOCALIC LL;Mc;0;L;;;;;N;;;;; +A8BE;SAURASHTRA VOWEL SIGN E;Mc;0;L;;;;;N;;;;; +A8BF;SAURASHTRA VOWEL SIGN EE;Mc;0;L;;;;;N;;;;; +A8C0;SAURASHTRA VOWEL SIGN AI;Mc;0;L;;;;;N;;;;; +A8C1;SAURASHTRA VOWEL SIGN O;Mc;0;L;;;;;N;;;;; +A8C2;SAURASHTRA VOWEL SIGN OO;Mc;0;L;;;;;N;;;;; +A8C3;SAURASHTRA VOWEL SIGN AU;Mc;0;L;;;;;N;;;;; +A8C4;SAURASHTRA SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;; +A8C5;SAURASHTRA SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;; +A8CE;SAURASHTRA DANDA;Po;0;L;;;;;N;;;;; +A8CF;SAURASHTRA DOUBLE DANDA;Po;0;L;;;;;N;;;;; +A8D0;SAURASHTRA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +A8D1;SAURASHTRA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +A8D2;SAURASHTRA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +A8D3;SAURASHTRA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +A8D4;SAURASHTRA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +A8D5;SAURASHTRA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +A8D6;SAURASHTRA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +A8D7;SAURASHTRA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +A8D8;SAURASHTRA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +A8D9;SAURASHTRA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +A8E0;COMBINING DEVANAGARI DIGIT ZERO;Mn;230;NSM;;;;;N;;;;; +A8E1;COMBINING DEVANAGARI DIGIT ONE;Mn;230;NSM;;;;;N;;;;; +A8E2;COMBINING DEVANAGARI DIGIT TWO;Mn;230;NSM;;;;;N;;;;; +A8E3;COMBINING DEVANAGARI DIGIT THREE;Mn;230;NSM;;;;;N;;;;; +A8E4;COMBINING DEVANAGARI DIGIT FOUR;Mn;230;NSM;;;;;N;;;;; +A8E5;COMBINING DEVANAGARI DIGIT FIVE;Mn;230;NSM;;;;;N;;;;; +A8E6;COMBINING DEVANAGARI DIGIT SIX;Mn;230;NSM;;;;;N;;;;; +A8E7;COMBINING DEVANAGARI DIGIT SEVEN;Mn;230;NSM;;;;;N;;;;; +A8E8;COMBINING DEVANAGARI DIGIT EIGHT;Mn;230;NSM;;;;;N;;;;; +A8E9;COMBINING DEVANAGARI DIGIT NINE;Mn;230;NSM;;;;;N;;;;; +A8EA;COMBINING DEVANAGARI LETTER A;Mn;230;NSM;;;;;N;;;;; +A8EB;COMBINING DEVANAGARI LETTER U;Mn;230;NSM;;;;;N;;;;; +A8EC;COMBINING DEVANAGARI LETTER KA;Mn;230;NSM;;;;;N;;;;; +A8ED;COMBINING DEVANAGARI LETTER NA;Mn;230;NSM;;;;;N;;;;; +A8EE;COMBINING DEVANAGARI LETTER PA;Mn;230;NSM;;;;;N;;;;; +A8EF;COMBINING DEVANAGARI LETTER RA;Mn;230;NSM;;;;;N;;;;; +A8F0;COMBINING DEVANAGARI LETTER VI;Mn;230;NSM;;;;;N;;;;; +A8F1;COMBINING DEVANAGARI SIGN AVAGRAHA;Mn;230;NSM;;;;;N;;;;; +A8F2;DEVANAGARI SIGN SPACING CANDRABINDU;Lo;0;L;;;;;N;;;;; +A8F3;DEVANAGARI SIGN CANDRABINDU VIRAMA;Lo;0;L;;;;;N;;;;; +A8F4;DEVANAGARI SIGN DOUBLE CANDRABINDU VIRAMA;Lo;0;L;;;;;N;;;;; +A8F5;DEVANAGARI SIGN CANDRABINDU TWO;Lo;0;L;;;;;N;;;;; +A8F6;DEVANAGARI SIGN CANDRABINDU THREE;Lo;0;L;;;;;N;;;;; +A8F7;DEVANAGARI SIGN CANDRABINDU AVAGRAHA;Lo;0;L;;;;;N;;;;; +A8F8;DEVANAGARI SIGN PUSHPIKA;Po;0;L;;;;;N;;;;; +A8F9;DEVANAGARI GAP FILLER;Po;0;L;;;;;N;;;;; +A8FA;DEVANAGARI CARET;Po;0;L;;;;;N;;;;; +A8FB;DEVANAGARI HEADSTROKE;Lo;0;L;;;;;N;;;;; +A8FC;DEVANAGARI SIGN SIDDHAM;Po;0;L;;;;;N;;;;; +A8FD;DEVANAGARI JAIN OM;Lo;0;L;;;;;N;;;;; +A8FE;DEVANAGARI LETTER AY;Lo;0;L;;;;;N;;;;; +A8FF;DEVANAGARI VOWEL SIGN AY;Mn;0;NSM;;;;;N;;;;; +A900;KAYAH LI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +A901;KAYAH LI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +A902;KAYAH LI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +A903;KAYAH LI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +A904;KAYAH LI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +A905;KAYAH LI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +A906;KAYAH LI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +A907;KAYAH LI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +A908;KAYAH LI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +A909;KAYAH LI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +A90A;KAYAH LI LETTER KA;Lo;0;L;;;;;N;;;;; +A90B;KAYAH LI LETTER KHA;Lo;0;L;;;;;N;;;;; +A90C;KAYAH LI LETTER GA;Lo;0;L;;;;;N;;;;; +A90D;KAYAH LI LETTER NGA;Lo;0;L;;;;;N;;;;; +A90E;KAYAH LI LETTER SA;Lo;0;L;;;;;N;;;;; +A90F;KAYAH LI LETTER SHA;Lo;0;L;;;;;N;;;;; +A910;KAYAH LI LETTER ZA;Lo;0;L;;;;;N;;;;; +A911;KAYAH LI LETTER NYA;Lo;0;L;;;;;N;;;;; +A912;KAYAH LI LETTER TA;Lo;0;L;;;;;N;;;;; +A913;KAYAH LI LETTER HTA;Lo;0;L;;;;;N;;;;; +A914;KAYAH LI LETTER NA;Lo;0;L;;;;;N;;;;; +A915;KAYAH LI LETTER PA;Lo;0;L;;;;;N;;;;; +A916;KAYAH LI LETTER PHA;Lo;0;L;;;;;N;;;;; +A917;KAYAH LI LETTER MA;Lo;0;L;;;;;N;;;;; +A918;KAYAH LI LETTER DA;Lo;0;L;;;;;N;;;;; +A919;KAYAH LI LETTER BA;Lo;0;L;;;;;N;;;;; +A91A;KAYAH LI LETTER RA;Lo;0;L;;;;;N;;;;; +A91B;KAYAH LI LETTER YA;Lo;0;L;;;;;N;;;;; +A91C;KAYAH LI LETTER LA;Lo;0;L;;;;;N;;;;; +A91D;KAYAH LI LETTER WA;Lo;0;L;;;;;N;;;;; +A91E;KAYAH LI LETTER THA;Lo;0;L;;;;;N;;;;; +A91F;KAYAH LI LETTER HA;Lo;0;L;;;;;N;;;;; +A920;KAYAH LI LETTER VA;Lo;0;L;;;;;N;;;;; +A921;KAYAH LI LETTER CA;Lo;0;L;;;;;N;;;;; +A922;KAYAH LI LETTER A;Lo;0;L;;;;;N;;;;; +A923;KAYAH LI LETTER OE;Lo;0;L;;;;;N;;;;; +A924;KAYAH LI LETTER I;Lo;0;L;;;;;N;;;;; +A925;KAYAH LI LETTER OO;Lo;0;L;;;;;N;;;;; +A926;KAYAH LI VOWEL UE;Mn;0;NSM;;;;;N;;;;; +A927;KAYAH LI VOWEL E;Mn;0;NSM;;;;;N;;;;; +A928;KAYAH LI VOWEL U;Mn;0;NSM;;;;;N;;;;; +A929;KAYAH LI VOWEL EE;Mn;0;NSM;;;;;N;;;;; +A92A;KAYAH LI VOWEL O;Mn;0;NSM;;;;;N;;;;; +A92B;KAYAH LI TONE PLOPHU;Mn;220;NSM;;;;;N;;;;; +A92C;KAYAH LI TONE CALYA;Mn;220;NSM;;;;;N;;;;; +A92D;KAYAH LI TONE CALYA PLOPHU;Mn;220;NSM;;;;;N;;;;; +A92E;KAYAH LI SIGN CWI;Po;0;L;;;;;N;;;;; +A92F;KAYAH LI SIGN SHYA;Po;0;L;;;;;N;;;;; +A930;REJANG LETTER KA;Lo;0;L;;;;;N;;;;; +A931;REJANG LETTER GA;Lo;0;L;;;;;N;;;;; +A932;REJANG LETTER NGA;Lo;0;L;;;;;N;;;;; +A933;REJANG LETTER TA;Lo;0;L;;;;;N;;;;; +A934;REJANG LETTER DA;Lo;0;L;;;;;N;;;;; +A935;REJANG LETTER NA;Lo;0;L;;;;;N;;;;; +A936;REJANG LETTER PA;Lo;0;L;;;;;N;;;;; +A937;REJANG LETTER BA;Lo;0;L;;;;;N;;;;; +A938;REJANG LETTER MA;Lo;0;L;;;;;N;;;;; +A939;REJANG LETTER CA;Lo;0;L;;;;;N;;;;; +A93A;REJANG LETTER JA;Lo;0;L;;;;;N;;;;; +A93B;REJANG LETTER NYA;Lo;0;L;;;;;N;;;;; +A93C;REJANG LETTER SA;Lo;0;L;;;;;N;;;;; +A93D;REJANG LETTER RA;Lo;0;L;;;;;N;;;;; +A93E;REJANG LETTER LA;Lo;0;L;;;;;N;;;;; +A93F;REJANG LETTER YA;Lo;0;L;;;;;N;;;;; +A940;REJANG LETTER WA;Lo;0;L;;;;;N;;;;; +A941;REJANG LETTER HA;Lo;0;L;;;;;N;;;;; +A942;REJANG LETTER MBA;Lo;0;L;;;;;N;;;;; +A943;REJANG LETTER NGGA;Lo;0;L;;;;;N;;;;; +A944;REJANG LETTER NDA;Lo;0;L;;;;;N;;;;; +A945;REJANG LETTER NYJA;Lo;0;L;;;;;N;;;;; +A946;REJANG LETTER A;Lo;0;L;;;;;N;;;;; +A947;REJANG VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;; +A948;REJANG VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;; +A949;REJANG VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;; +A94A;REJANG VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;; +A94B;REJANG VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;; +A94C;REJANG VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;; +A94D;REJANG VOWEL SIGN EU;Mn;0;NSM;;;;;N;;;;; +A94E;REJANG VOWEL SIGN EA;Mn;0;NSM;;;;;N;;;;; +A94F;REJANG CONSONANT SIGN NG;Mn;0;NSM;;;;;N;;;;; +A950;REJANG CONSONANT SIGN N;Mn;0;NSM;;;;;N;;;;; +A951;REJANG CONSONANT SIGN R;Mn;0;NSM;;;;;N;;;;; +A952;REJANG CONSONANT SIGN H;Mc;0;L;;;;;N;;;;; +A953;REJANG VIRAMA;Mc;9;L;;;;;N;;;;; +A95F;REJANG SECTION MARK;Po;0;L;;;;;N;;;;; +A960;HANGUL CHOSEONG TIKEUT-MIEUM;Lo;0;L;;;;;N;;;;; +A961;HANGUL CHOSEONG TIKEUT-PIEUP;Lo;0;L;;;;;N;;;;; +A962;HANGUL CHOSEONG TIKEUT-SIOS;Lo;0;L;;;;;N;;;;; +A963;HANGUL CHOSEONG TIKEUT-CIEUC;Lo;0;L;;;;;N;;;;; +A964;HANGUL CHOSEONG RIEUL-KIYEOK;Lo;0;L;;;;;N;;;;; +A965;HANGUL CHOSEONG RIEUL-SSANGKIYEOK;Lo;0;L;;;;;N;;;;; +A966;HANGUL CHOSEONG RIEUL-TIKEUT;Lo;0;L;;;;;N;;;;; +A967;HANGUL CHOSEONG RIEUL-SSANGTIKEUT;Lo;0;L;;;;;N;;;;; +A968;HANGUL CHOSEONG RIEUL-MIEUM;Lo;0;L;;;;;N;;;;; +A969;HANGUL CHOSEONG RIEUL-PIEUP;Lo;0;L;;;;;N;;;;; +A96A;HANGUL CHOSEONG RIEUL-SSANGPIEUP;Lo;0;L;;;;;N;;;;; +A96B;HANGUL CHOSEONG RIEUL-KAPYEOUNPIEUP;Lo;0;L;;;;;N;;;;; +A96C;HANGUL CHOSEONG RIEUL-SIOS;Lo;0;L;;;;;N;;;;; +A96D;HANGUL CHOSEONG RIEUL-CIEUC;Lo;0;L;;;;;N;;;;; +A96E;HANGUL CHOSEONG RIEUL-KHIEUKH;Lo;0;L;;;;;N;;;;; +A96F;HANGUL CHOSEONG MIEUM-KIYEOK;Lo;0;L;;;;;N;;;;; +A970;HANGUL CHOSEONG MIEUM-TIKEUT;Lo;0;L;;;;;N;;;;; +A971;HANGUL CHOSEONG MIEUM-SIOS;Lo;0;L;;;;;N;;;;; +A972;HANGUL CHOSEONG PIEUP-SIOS-THIEUTH;Lo;0;L;;;;;N;;;;; +A973;HANGUL CHOSEONG PIEUP-KHIEUKH;Lo;0;L;;;;;N;;;;; +A974;HANGUL CHOSEONG PIEUP-HIEUH;Lo;0;L;;;;;N;;;;; +A975;HANGUL CHOSEONG SSANGSIOS-PIEUP;Lo;0;L;;;;;N;;;;; +A976;HANGUL CHOSEONG IEUNG-RIEUL;Lo;0;L;;;;;N;;;;; +A977;HANGUL CHOSEONG IEUNG-HIEUH;Lo;0;L;;;;;N;;;;; +A978;HANGUL CHOSEONG SSANGCIEUC-HIEUH;Lo;0;L;;;;;N;;;;; +A979;HANGUL CHOSEONG SSANGTHIEUTH;Lo;0;L;;;;;N;;;;; +A97A;HANGUL CHOSEONG PHIEUPH-HIEUH;Lo;0;L;;;;;N;;;;; +A97B;HANGUL CHOSEONG HIEUH-SIOS;Lo;0;L;;;;;N;;;;; +A97C;HANGUL CHOSEONG SSANGYEORINHIEUH;Lo;0;L;;;;;N;;;;; +A980;JAVANESE SIGN PANYANGGA;Mn;0;NSM;;;;;N;;;;; +A981;JAVANESE SIGN CECAK;Mn;0;NSM;;;;;N;;;;; +A982;JAVANESE SIGN LAYAR;Mn;0;NSM;;;;;N;;;;; +A983;JAVANESE SIGN WIGNYAN;Mc;0;L;;;;;N;;;;; +A984;JAVANESE LETTER A;Lo;0;L;;;;;N;;;;; +A985;JAVANESE LETTER I KAWI;Lo;0;L;;;;;N;;;;; +A986;JAVANESE LETTER I;Lo;0;L;;;;;N;;;;; +A987;JAVANESE LETTER II;Lo;0;L;;;;;N;;;;; +A988;JAVANESE LETTER U;Lo;0;L;;;;;N;;;;; +A989;JAVANESE LETTER PA CEREK;Lo;0;L;;;;;N;;;;; +A98A;JAVANESE LETTER NGA LELET;Lo;0;L;;;;;N;;;;; +A98B;JAVANESE LETTER NGA LELET RASWADI;Lo;0;L;;;;;N;;;;; +A98C;JAVANESE LETTER E;Lo;0;L;;;;;N;;;;; +A98D;JAVANESE LETTER AI;Lo;0;L;;;;;N;;;;; +A98E;JAVANESE LETTER O;Lo;0;L;;;;;N;;;;; +A98F;JAVANESE LETTER KA;Lo;0;L;;;;;N;;;;; +A990;JAVANESE LETTER KA SASAK;Lo;0;L;;;;;N;;;;; +A991;JAVANESE LETTER KA MURDA;Lo;0;L;;;;;N;;;;; +A992;JAVANESE LETTER GA;Lo;0;L;;;;;N;;;;; +A993;JAVANESE LETTER GA MURDA;Lo;0;L;;;;;N;;;;; +A994;JAVANESE LETTER NGA;Lo;0;L;;;;;N;;;;; +A995;JAVANESE LETTER CA;Lo;0;L;;;;;N;;;;; +A996;JAVANESE LETTER CA MURDA;Lo;0;L;;;;;N;;;;; +A997;JAVANESE LETTER JA;Lo;0;L;;;;;N;;;;; +A998;JAVANESE LETTER NYA MURDA;Lo;0;L;;;;;N;;;;; +A999;JAVANESE LETTER JA MAHAPRANA;Lo;0;L;;;;;N;;;;; +A99A;JAVANESE LETTER NYA;Lo;0;L;;;;;N;;;;; +A99B;JAVANESE LETTER TTA;Lo;0;L;;;;;N;;;;; +A99C;JAVANESE LETTER TTA MAHAPRANA;Lo;0;L;;;;;N;;;;; +A99D;JAVANESE LETTER DDA;Lo;0;L;;;;;N;;;;; +A99E;JAVANESE LETTER DDA MAHAPRANA;Lo;0;L;;;;;N;;;;; +A99F;JAVANESE LETTER NA MURDA;Lo;0;L;;;;;N;;;;; +A9A0;JAVANESE LETTER TA;Lo;0;L;;;;;N;;;;; +A9A1;JAVANESE LETTER TA MURDA;Lo;0;L;;;;;N;;;;; +A9A2;JAVANESE LETTER DA;Lo;0;L;;;;;N;;;;; +A9A3;JAVANESE LETTER DA MAHAPRANA;Lo;0;L;;;;;N;;;;; +A9A4;JAVANESE LETTER NA;Lo;0;L;;;;;N;;;;; +A9A5;JAVANESE LETTER PA;Lo;0;L;;;;;N;;;;; +A9A6;JAVANESE LETTER PA MURDA;Lo;0;L;;;;;N;;;;; +A9A7;JAVANESE LETTER BA;Lo;0;L;;;;;N;;;;; +A9A8;JAVANESE LETTER BA MURDA;Lo;0;L;;;;;N;;;;; +A9A9;JAVANESE LETTER MA;Lo;0;L;;;;;N;;;;; +A9AA;JAVANESE LETTER YA;Lo;0;L;;;;;N;;;;; +A9AB;JAVANESE LETTER RA;Lo;0;L;;;;;N;;;;; +A9AC;JAVANESE LETTER RA AGUNG;Lo;0;L;;;;;N;;;;; +A9AD;JAVANESE LETTER LA;Lo;0;L;;;;;N;;;;; +A9AE;JAVANESE LETTER WA;Lo;0;L;;;;;N;;;;; +A9AF;JAVANESE LETTER SA MURDA;Lo;0;L;;;;;N;;;;; +A9B0;JAVANESE LETTER SA MAHAPRANA;Lo;0;L;;;;;N;;;;; +A9B1;JAVANESE LETTER SA;Lo;0;L;;;;;N;;;;; +A9B2;JAVANESE LETTER HA;Lo;0;L;;;;;N;;;;; +A9B3;JAVANESE SIGN CECAK TELU;Mn;7;NSM;;;;;N;;;;; +A9B4;JAVANESE VOWEL SIGN TARUNG;Mc;0;L;;;;;N;;;;; +A9B5;JAVANESE VOWEL SIGN TOLONG;Mc;0;L;;;;;N;;;;; +A9B6;JAVANESE VOWEL SIGN WULU;Mn;0;NSM;;;;;N;;;;; +A9B7;JAVANESE VOWEL SIGN WULU MELIK;Mn;0;NSM;;;;;N;;;;; +A9B8;JAVANESE VOWEL SIGN SUKU;Mn;0;NSM;;;;;N;;;;; +A9B9;JAVANESE VOWEL SIGN SUKU MENDUT;Mn;0;NSM;;;;;N;;;;; +A9BA;JAVANESE VOWEL SIGN TALING;Mc;0;L;;;;;N;;;;; +A9BB;JAVANESE VOWEL SIGN DIRGA MURE;Mc;0;L;;;;;N;;;;; +A9BC;JAVANESE VOWEL SIGN PEPET;Mn;0;NSM;;;;;N;;;;; +A9BD;JAVANESE CONSONANT SIGN KERET;Mn;0;NSM;;;;;N;;;;; +A9BE;JAVANESE CONSONANT SIGN PENGKAL;Mc;0;L;;;;;N;;;;; +A9BF;JAVANESE CONSONANT SIGN CAKRA;Mc;0;L;;;;;N;;;;; +A9C0;JAVANESE PANGKON;Mc;9;L;;;;;N;;;;; +A9C1;JAVANESE LEFT RERENGGAN;Po;0;L;;;;;N;;;;; +A9C2;JAVANESE RIGHT RERENGGAN;Po;0;L;;;;;N;;;;; +A9C3;JAVANESE PADA ANDAP;Po;0;L;;;;;N;;;;; +A9C4;JAVANESE PADA MADYA;Po;0;L;;;;;N;;;;; +A9C5;JAVANESE PADA LUHUR;Po;0;L;;;;;N;;;;; +A9C6;JAVANESE PADA WINDU;Po;0;L;;;;;N;;;;; +A9C7;JAVANESE PADA PANGKAT;Po;0;L;;;;;N;;;;; +A9C8;JAVANESE PADA LINGSA;Po;0;L;;;;;N;;;;; +A9C9;JAVANESE PADA LUNGSI;Po;0;L;;;;;N;;;;; +A9CA;JAVANESE PADA ADEG;Po;0;L;;;;;N;;;;; +A9CB;JAVANESE PADA ADEG ADEG;Po;0;L;;;;;N;;;;; +A9CC;JAVANESE PADA PISELEH;Po;0;L;;;;;N;;;;; +A9CD;JAVANESE TURNED PADA PISELEH;Po;0;L;;;;;N;;;;; +A9CF;JAVANESE PANGRANGKEP;Lm;0;L;;;;;N;;;;; +A9D0;JAVANESE DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +A9D1;JAVANESE DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +A9D2;JAVANESE DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +A9D3;JAVANESE DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +A9D4;JAVANESE DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +A9D5;JAVANESE DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +A9D6;JAVANESE DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +A9D7;JAVANESE DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +A9D8;JAVANESE DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +A9D9;JAVANESE DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +A9DE;JAVANESE PADA TIRTA TUMETES;Po;0;L;;;;;N;;;;; +A9DF;JAVANESE PADA ISEN-ISEN;Po;0;L;;;;;N;;;;; +A9E0;MYANMAR LETTER SHAN GHA;Lo;0;L;;;;;N;;;;; +A9E1;MYANMAR LETTER SHAN CHA;Lo;0;L;;;;;N;;;;; +A9E2;MYANMAR LETTER SHAN JHA;Lo;0;L;;;;;N;;;;; +A9E3;MYANMAR LETTER SHAN NNA;Lo;0;L;;;;;N;;;;; +A9E4;MYANMAR LETTER SHAN BHA;Lo;0;L;;;;;N;;;;; +A9E5;MYANMAR SIGN SHAN SAW;Mn;0;NSM;;;;;N;;;;; +A9E6;MYANMAR MODIFIER LETTER SHAN REDUPLICATION;Lm;0;L;;;;;N;;;;; +A9E7;MYANMAR LETTER TAI LAING NYA;Lo;0;L;;;;;N;;;;; +A9E8;MYANMAR LETTER TAI LAING FA;Lo;0;L;;;;;N;;;;; +A9E9;MYANMAR LETTER TAI LAING GA;Lo;0;L;;;;;N;;;;; +A9EA;MYANMAR LETTER TAI LAING GHA;Lo;0;L;;;;;N;;;;; +A9EB;MYANMAR LETTER TAI LAING JA;Lo;0;L;;;;;N;;;;; +A9EC;MYANMAR LETTER TAI LAING JHA;Lo;0;L;;;;;N;;;;; +A9ED;MYANMAR LETTER TAI LAING DDA;Lo;0;L;;;;;N;;;;; +A9EE;MYANMAR LETTER TAI LAING DDHA;Lo;0;L;;;;;N;;;;; +A9EF;MYANMAR LETTER TAI LAING NNA;Lo;0;L;;;;;N;;;;; +A9F0;MYANMAR TAI LAING DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +A9F1;MYANMAR TAI LAING DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +A9F2;MYANMAR TAI LAING DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +A9F3;MYANMAR TAI LAING DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +A9F4;MYANMAR TAI LAING DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +A9F5;MYANMAR TAI LAING DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +A9F6;MYANMAR TAI LAING DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +A9F7;MYANMAR TAI LAING DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +A9F8;MYANMAR TAI LAING DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +A9F9;MYANMAR TAI LAING DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +A9FA;MYANMAR LETTER TAI LAING LLA;Lo;0;L;;;;;N;;;;; +A9FB;MYANMAR LETTER TAI LAING DA;Lo;0;L;;;;;N;;;;; +A9FC;MYANMAR LETTER TAI LAING DHA;Lo;0;L;;;;;N;;;;; +A9FD;MYANMAR LETTER TAI LAING BA;Lo;0;L;;;;;N;;;;; +A9FE;MYANMAR LETTER TAI LAING BHA;Lo;0;L;;;;;N;;;;; +AA00;CHAM LETTER A;Lo;0;L;;;;;N;;;;; +AA01;CHAM LETTER I;Lo;0;L;;;;;N;;;;; +AA02;CHAM LETTER U;Lo;0;L;;;;;N;;;;; +AA03;CHAM LETTER E;Lo;0;L;;;;;N;;;;; +AA04;CHAM LETTER AI;Lo;0;L;;;;;N;;;;; +AA05;CHAM LETTER O;Lo;0;L;;;;;N;;;;; +AA06;CHAM LETTER KA;Lo;0;L;;;;;N;;;;; +AA07;CHAM LETTER KHA;Lo;0;L;;;;;N;;;;; +AA08;CHAM LETTER GA;Lo;0;L;;;;;N;;;;; +AA09;CHAM LETTER GHA;Lo;0;L;;;;;N;;;;; +AA0A;CHAM LETTER NGUE;Lo;0;L;;;;;N;;;;; +AA0B;CHAM LETTER NGA;Lo;0;L;;;;;N;;;;; +AA0C;CHAM LETTER CHA;Lo;0;L;;;;;N;;;;; +AA0D;CHAM LETTER CHHA;Lo;0;L;;;;;N;;;;; +AA0E;CHAM LETTER JA;Lo;0;L;;;;;N;;;;; +AA0F;CHAM LETTER JHA;Lo;0;L;;;;;N;;;;; +AA10;CHAM LETTER NHUE;Lo;0;L;;;;;N;;;;; +AA11;CHAM LETTER NHA;Lo;0;L;;;;;N;;;;; +AA12;CHAM LETTER NHJA;Lo;0;L;;;;;N;;;;; +AA13;CHAM LETTER TA;Lo;0;L;;;;;N;;;;; +AA14;CHAM LETTER THA;Lo;0;L;;;;;N;;;;; +AA15;CHAM LETTER DA;Lo;0;L;;;;;N;;;;; +AA16;CHAM LETTER DHA;Lo;0;L;;;;;N;;;;; +AA17;CHAM LETTER NUE;Lo;0;L;;;;;N;;;;; +AA18;CHAM LETTER NA;Lo;0;L;;;;;N;;;;; +AA19;CHAM LETTER DDA;Lo;0;L;;;;;N;;;;; +AA1A;CHAM LETTER PA;Lo;0;L;;;;;N;;;;; +AA1B;CHAM LETTER PPA;Lo;0;L;;;;;N;;;;; +AA1C;CHAM LETTER PHA;Lo;0;L;;;;;N;;;;; +AA1D;CHAM LETTER BA;Lo;0;L;;;;;N;;;;; +AA1E;CHAM LETTER BHA;Lo;0;L;;;;;N;;;;; +AA1F;CHAM LETTER MUE;Lo;0;L;;;;;N;;;;; +AA20;CHAM LETTER MA;Lo;0;L;;;;;N;;;;; +AA21;CHAM LETTER BBA;Lo;0;L;;;;;N;;;;; +AA22;CHAM LETTER YA;Lo;0;L;;;;;N;;;;; +AA23;CHAM LETTER RA;Lo;0;L;;;;;N;;;;; +AA24;CHAM LETTER LA;Lo;0;L;;;;;N;;;;; +AA25;CHAM LETTER VA;Lo;0;L;;;;;N;;;;; +AA26;CHAM LETTER SSA;Lo;0;L;;;;;N;;;;; +AA27;CHAM LETTER SA;Lo;0;L;;;;;N;;;;; +AA28;CHAM LETTER HA;Lo;0;L;;;;;N;;;;; +AA29;CHAM VOWEL SIGN AA;Mn;0;NSM;;;;;N;;;;; +AA2A;CHAM VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;; +AA2B;CHAM VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;; +AA2C;CHAM VOWEL SIGN EI;Mn;0;NSM;;;;;N;;;;; +AA2D;CHAM VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;; +AA2E;CHAM VOWEL SIGN OE;Mn;0;NSM;;;;;N;;;;; +AA2F;CHAM VOWEL SIGN O;Mc;0;L;;;;;N;;;;; +AA30;CHAM VOWEL SIGN AI;Mc;0;L;;;;;N;;;;; +AA31;CHAM VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;; +AA32;CHAM VOWEL SIGN UE;Mn;0;NSM;;;;;N;;;;; +AA33;CHAM CONSONANT SIGN YA;Mc;0;L;;;;;N;;;;; +AA34;CHAM CONSONANT SIGN RA;Mc;0;L;;;;;N;;;;; +AA35;CHAM CONSONANT SIGN LA;Mn;0;NSM;;;;;N;;;;; +AA36;CHAM CONSONANT SIGN WA;Mn;0;NSM;;;;;N;;;;; +AA40;CHAM LETTER FINAL K;Lo;0;L;;;;;N;;;;; +AA41;CHAM LETTER FINAL G;Lo;0;L;;;;;N;;;;; +AA42;CHAM LETTER FINAL NG;Lo;0;L;;;;;N;;;;; +AA43;CHAM CONSONANT SIGN FINAL NG;Mn;0;NSM;;;;;N;;;;; +AA44;CHAM LETTER FINAL CH;Lo;0;L;;;;;N;;;;; +AA45;CHAM LETTER FINAL T;Lo;0;L;;;;;N;;;;; +AA46;CHAM LETTER FINAL N;Lo;0;L;;;;;N;;;;; +AA47;CHAM LETTER FINAL P;Lo;0;L;;;;;N;;;;; +AA48;CHAM LETTER FINAL Y;Lo;0;L;;;;;N;;;;; +AA49;CHAM LETTER FINAL R;Lo;0;L;;;;;N;;;;; +AA4A;CHAM LETTER FINAL L;Lo;0;L;;;;;N;;;;; +AA4B;CHAM LETTER FINAL SS;Lo;0;L;;;;;N;;;;; +AA4C;CHAM CONSONANT SIGN FINAL M;Mn;0;NSM;;;;;N;;;;; +AA4D;CHAM CONSONANT SIGN FINAL H;Mc;0;L;;;;;N;;;;; +AA50;CHAM DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +AA51;CHAM DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +AA52;CHAM DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +AA53;CHAM DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +AA54;CHAM DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +AA55;CHAM DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +AA56;CHAM DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +AA57;CHAM DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +AA58;CHAM DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +AA59;CHAM DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +AA5C;CHAM PUNCTUATION SPIRAL;Po;0;L;;;;;N;;;;; +AA5D;CHAM PUNCTUATION DANDA;Po;0;L;;;;;N;;;;; +AA5E;CHAM PUNCTUATION DOUBLE DANDA;Po;0;L;;;;;N;;;;; +AA5F;CHAM PUNCTUATION TRIPLE DANDA;Po;0;L;;;;;N;;;;; +AA60;MYANMAR LETTER KHAMTI GA;Lo;0;L;;;;;N;;;;; +AA61;MYANMAR LETTER KHAMTI CA;Lo;0;L;;;;;N;;;;; +AA62;MYANMAR LETTER KHAMTI CHA;Lo;0;L;;;;;N;;;;; +AA63;MYANMAR LETTER KHAMTI JA;Lo;0;L;;;;;N;;;;; +AA64;MYANMAR LETTER KHAMTI JHA;Lo;0;L;;;;;N;;;;; +AA65;MYANMAR LETTER KHAMTI NYA;Lo;0;L;;;;;N;;;;; +AA66;MYANMAR LETTER KHAMTI TTA;Lo;0;L;;;;;N;;;;; +AA67;MYANMAR LETTER KHAMTI TTHA;Lo;0;L;;;;;N;;;;; +AA68;MYANMAR LETTER KHAMTI DDA;Lo;0;L;;;;;N;;;;; +AA69;MYANMAR LETTER KHAMTI DDHA;Lo;0;L;;;;;N;;;;; +AA6A;MYANMAR LETTER KHAMTI DHA;Lo;0;L;;;;;N;;;;; +AA6B;MYANMAR LETTER KHAMTI NA;Lo;0;L;;;;;N;;;;; +AA6C;MYANMAR LETTER KHAMTI SA;Lo;0;L;;;;;N;;;;; +AA6D;MYANMAR LETTER KHAMTI HA;Lo;0;L;;;;;N;;;;; +AA6E;MYANMAR LETTER KHAMTI HHA;Lo;0;L;;;;;N;;;;; +AA6F;MYANMAR LETTER KHAMTI FA;Lo;0;L;;;;;N;;;;; +AA70;MYANMAR MODIFIER LETTER KHAMTI REDUPLICATION;Lm;0;L;;;;;N;;;;; +AA71;MYANMAR LETTER KHAMTI XA;Lo;0;L;;;;;N;;;;; +AA72;MYANMAR LETTER KHAMTI ZA;Lo;0;L;;;;;N;;;;; +AA73;MYANMAR LETTER KHAMTI RA;Lo;0;L;;;;;N;;;;; +AA74;MYANMAR LOGOGRAM KHAMTI OAY;Lo;0;L;;;;;N;;;;; +AA75;MYANMAR LOGOGRAM KHAMTI QN;Lo;0;L;;;;;N;;;;; +AA76;MYANMAR LOGOGRAM KHAMTI HM;Lo;0;L;;;;;N;;;;; +AA77;MYANMAR SYMBOL AITON EXCLAMATION;So;0;L;;;;;N;;;;; +AA78;MYANMAR SYMBOL AITON ONE;So;0;L;;;;;N;;;;; +AA79;MYANMAR SYMBOL AITON TWO;So;0;L;;;;;N;;;;; +AA7A;MYANMAR LETTER AITON RA;Lo;0;L;;;;;N;;;;; +AA7B;MYANMAR SIGN PAO KAREN TONE;Mc;0;L;;;;;N;;;;; +AA7C;MYANMAR SIGN TAI LAING TONE-2;Mn;0;NSM;;;;;N;;;;; +AA7D;MYANMAR SIGN TAI LAING TONE-5;Mc;0;L;;;;;N;;;;; +AA7E;MYANMAR LETTER SHWE PALAUNG CHA;Lo;0;L;;;;;N;;;;; +AA7F;MYANMAR LETTER SHWE PALAUNG SHA;Lo;0;L;;;;;N;;;;; +AA80;TAI VIET LETTER LOW KO;Lo;0;L;;;;;N;;;;; +AA81;TAI VIET LETTER HIGH KO;Lo;0;L;;;;;N;;;;; +AA82;TAI VIET LETTER LOW KHO;Lo;0;L;;;;;N;;;;; +AA83;TAI VIET LETTER HIGH KHO;Lo;0;L;;;;;N;;;;; +AA84;TAI VIET LETTER LOW KHHO;Lo;0;L;;;;;N;;;;; +AA85;TAI VIET LETTER HIGH KHHO;Lo;0;L;;;;;N;;;;; +AA86;TAI VIET LETTER LOW GO;Lo;0;L;;;;;N;;;;; +AA87;TAI VIET LETTER HIGH GO;Lo;0;L;;;;;N;;;;; +AA88;TAI VIET LETTER LOW NGO;Lo;0;L;;;;;N;;;;; +AA89;TAI VIET LETTER HIGH NGO;Lo;0;L;;;;;N;;;;; +AA8A;TAI VIET LETTER LOW CO;Lo;0;L;;;;;N;;;;; +AA8B;TAI VIET LETTER HIGH CO;Lo;0;L;;;;;N;;;;; +AA8C;TAI VIET LETTER LOW CHO;Lo;0;L;;;;;N;;;;; +AA8D;TAI VIET LETTER HIGH CHO;Lo;0;L;;;;;N;;;;; +AA8E;TAI VIET LETTER LOW SO;Lo;0;L;;;;;N;;;;; +AA8F;TAI VIET LETTER HIGH SO;Lo;0;L;;;;;N;;;;; +AA90;TAI VIET LETTER LOW NYO;Lo;0;L;;;;;N;;;;; +AA91;TAI VIET LETTER HIGH NYO;Lo;0;L;;;;;N;;;;; +AA92;TAI VIET LETTER LOW DO;Lo;0;L;;;;;N;;;;; +AA93;TAI VIET LETTER HIGH DO;Lo;0;L;;;;;N;;;;; +AA94;TAI VIET LETTER LOW TO;Lo;0;L;;;;;N;;;;; +AA95;TAI VIET LETTER HIGH TO;Lo;0;L;;;;;N;;;;; +AA96;TAI VIET LETTER LOW THO;Lo;0;L;;;;;N;;;;; +AA97;TAI VIET LETTER HIGH THO;Lo;0;L;;;;;N;;;;; +AA98;TAI VIET LETTER LOW NO;Lo;0;L;;;;;N;;;;; +AA99;TAI VIET LETTER HIGH NO;Lo;0;L;;;;;N;;;;; +AA9A;TAI VIET LETTER LOW BO;Lo;0;L;;;;;N;;;;; +AA9B;TAI VIET LETTER HIGH BO;Lo;0;L;;;;;N;;;;; +AA9C;TAI VIET LETTER LOW PO;Lo;0;L;;;;;N;;;;; +AA9D;TAI VIET LETTER HIGH PO;Lo;0;L;;;;;N;;;;; +AA9E;TAI VIET LETTER LOW PHO;Lo;0;L;;;;;N;;;;; +AA9F;TAI VIET LETTER HIGH PHO;Lo;0;L;;;;;N;;;;; +AAA0;TAI VIET LETTER LOW FO;Lo;0;L;;;;;N;;;;; +AAA1;TAI VIET LETTER HIGH FO;Lo;0;L;;;;;N;;;;; +AAA2;TAI VIET LETTER LOW MO;Lo;0;L;;;;;N;;;;; +AAA3;TAI VIET LETTER HIGH MO;Lo;0;L;;;;;N;;;;; +AAA4;TAI VIET LETTER LOW YO;Lo;0;L;;;;;N;;;;; +AAA5;TAI VIET LETTER HIGH YO;Lo;0;L;;;;;N;;;;; +AAA6;TAI VIET LETTER LOW RO;Lo;0;L;;;;;N;;;;; +AAA7;TAI VIET LETTER HIGH RO;Lo;0;L;;;;;N;;;;; +AAA8;TAI VIET LETTER LOW LO;Lo;0;L;;;;;N;;;;; +AAA9;TAI VIET LETTER HIGH LO;Lo;0;L;;;;;N;;;;; +AAAA;TAI VIET LETTER LOW VO;Lo;0;L;;;;;N;;;;; +AAAB;TAI VIET LETTER HIGH VO;Lo;0;L;;;;;N;;;;; +AAAC;TAI VIET LETTER LOW HO;Lo;0;L;;;;;N;;;;; +AAAD;TAI VIET LETTER HIGH HO;Lo;0;L;;;;;N;;;;; +AAAE;TAI VIET LETTER LOW O;Lo;0;L;;;;;N;;;;; +AAAF;TAI VIET LETTER HIGH O;Lo;0;L;;;;;N;;;;; +AAB0;TAI VIET MAI KANG;Mn;230;NSM;;;;;N;;;;; +AAB1;TAI VIET VOWEL AA;Lo;0;L;;;;;N;;;;; +AAB2;TAI VIET VOWEL I;Mn;230;NSM;;;;;N;;;;; +AAB3;TAI VIET VOWEL UE;Mn;230;NSM;;;;;N;;;;; +AAB4;TAI VIET VOWEL U;Mn;220;NSM;;;;;N;;;;; +AAB5;TAI VIET VOWEL E;Lo;0;L;;;;;N;;;;; +AAB6;TAI VIET VOWEL O;Lo;0;L;;;;;N;;;;; +AAB7;TAI VIET MAI KHIT;Mn;230;NSM;;;;;N;;;;; +AAB8;TAI VIET VOWEL IA;Mn;230;NSM;;;;;N;;;;; +AAB9;TAI VIET VOWEL UEA;Lo;0;L;;;;;N;;;;; +AABA;TAI VIET VOWEL UA;Lo;0;L;;;;;N;;;;; +AABB;TAI VIET VOWEL AUE;Lo;0;L;;;;;N;;;;; +AABC;TAI VIET VOWEL AY;Lo;0;L;;;;;N;;;;; +AABD;TAI VIET VOWEL AN;Lo;0;L;;;;;N;;;;; +AABE;TAI VIET VOWEL AM;Mn;230;NSM;;;;;N;;;;; +AABF;TAI VIET TONE MAI EK;Mn;230;NSM;;;;;N;;;;; +AAC0;TAI VIET TONE MAI NUENG;Lo;0;L;;;;;N;;;;; +AAC1;TAI VIET TONE MAI THO;Mn;230;NSM;;;;;N;;;;; +AAC2;TAI VIET TONE MAI SONG;Lo;0;L;;;;;N;;;;; +AADB;TAI VIET SYMBOL KON;Lo;0;L;;;;;N;;;;; +AADC;TAI VIET SYMBOL NUENG;Lo;0;L;;;;;N;;;;; +AADD;TAI VIET SYMBOL SAM;Lm;0;L;;;;;N;;;;; +AADE;TAI VIET SYMBOL HO HOI;Po;0;L;;;;;N;;;;; +AADF;TAI VIET SYMBOL KOI KOI;Po;0;L;;;;;N;;;;; +AAE0;MEETEI MAYEK LETTER E;Lo;0;L;;;;;N;;;;; +AAE1;MEETEI MAYEK LETTER O;Lo;0;L;;;;;N;;;;; +AAE2;MEETEI MAYEK LETTER CHA;Lo;0;L;;;;;N;;;;; +AAE3;MEETEI MAYEK LETTER NYA;Lo;0;L;;;;;N;;;;; +AAE4;MEETEI MAYEK LETTER TTA;Lo;0;L;;;;;N;;;;; +AAE5;MEETEI MAYEK LETTER TTHA;Lo;0;L;;;;;N;;;;; +AAE6;MEETEI MAYEK LETTER DDA;Lo;0;L;;;;;N;;;;; +AAE7;MEETEI MAYEK LETTER DDHA;Lo;0;L;;;;;N;;;;; +AAE8;MEETEI MAYEK LETTER NNA;Lo;0;L;;;;;N;;;;; +AAE9;MEETEI MAYEK LETTER SHA;Lo;0;L;;;;;N;;;;; +AAEA;MEETEI MAYEK LETTER SSA;Lo;0;L;;;;;N;;;;; +AAEB;MEETEI MAYEK VOWEL SIGN II;Mc;0;L;;;;;N;;;;; +AAEC;MEETEI MAYEK VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;; +AAED;MEETEI MAYEK VOWEL SIGN AAI;Mn;0;NSM;;;;;N;;;;; +AAEE;MEETEI MAYEK VOWEL SIGN AU;Mc;0;L;;;;;N;;;;; +AAEF;MEETEI MAYEK VOWEL SIGN AAU;Mc;0;L;;;;;N;;;;; +AAF0;MEETEI MAYEK CHEIKHAN;Po;0;L;;;;;N;;;;; +AAF1;MEETEI MAYEK AHANG KHUDAM;Po;0;L;;;;;N;;;;; +AAF2;MEETEI MAYEK ANJI;Lo;0;L;;;;;N;;;;; +AAF3;MEETEI MAYEK SYLLABLE REPETITION MARK;Lm;0;L;;;;;N;;;;; +AAF4;MEETEI MAYEK WORD REPETITION MARK;Lm;0;L;;;;;N;;;;; +AAF5;MEETEI MAYEK VOWEL SIGN VISARGA;Mc;0;L;;;;;N;;;;; +AAF6;MEETEI MAYEK VIRAMA;Mn;9;NSM;;;;;N;;;;; +AB01;ETHIOPIC SYLLABLE TTHU;Lo;0;L;;;;;N;;;;; +AB02;ETHIOPIC SYLLABLE TTHI;Lo;0;L;;;;;N;;;;; +AB03;ETHIOPIC SYLLABLE TTHAA;Lo;0;L;;;;;N;;;;; +AB04;ETHIOPIC SYLLABLE TTHEE;Lo;0;L;;;;;N;;;;; +AB05;ETHIOPIC SYLLABLE TTHE;Lo;0;L;;;;;N;;;;; +AB06;ETHIOPIC SYLLABLE TTHO;Lo;0;L;;;;;N;;;;; +AB09;ETHIOPIC SYLLABLE DDHU;Lo;0;L;;;;;N;;;;; +AB0A;ETHIOPIC SYLLABLE DDHI;Lo;0;L;;;;;N;;;;; +AB0B;ETHIOPIC SYLLABLE DDHAA;Lo;0;L;;;;;N;;;;; +AB0C;ETHIOPIC SYLLABLE DDHEE;Lo;0;L;;;;;N;;;;; +AB0D;ETHIOPIC SYLLABLE DDHE;Lo;0;L;;;;;N;;;;; +AB0E;ETHIOPIC SYLLABLE DDHO;Lo;0;L;;;;;N;;;;; +AB11;ETHIOPIC SYLLABLE DZU;Lo;0;L;;;;;N;;;;; +AB12;ETHIOPIC SYLLABLE DZI;Lo;0;L;;;;;N;;;;; +AB13;ETHIOPIC SYLLABLE DZAA;Lo;0;L;;;;;N;;;;; +AB14;ETHIOPIC SYLLABLE DZEE;Lo;0;L;;;;;N;;;;; +AB15;ETHIOPIC SYLLABLE DZE;Lo;0;L;;;;;N;;;;; +AB16;ETHIOPIC SYLLABLE DZO;Lo;0;L;;;;;N;;;;; +AB20;ETHIOPIC SYLLABLE CCHHA;Lo;0;L;;;;;N;;;;; +AB21;ETHIOPIC SYLLABLE CCHHU;Lo;0;L;;;;;N;;;;; +AB22;ETHIOPIC SYLLABLE CCHHI;Lo;0;L;;;;;N;;;;; +AB23;ETHIOPIC SYLLABLE CCHHAA;Lo;0;L;;;;;N;;;;; +AB24;ETHIOPIC SYLLABLE CCHHEE;Lo;0;L;;;;;N;;;;; +AB25;ETHIOPIC SYLLABLE CCHHE;Lo;0;L;;;;;N;;;;; +AB26;ETHIOPIC SYLLABLE CCHHO;Lo;0;L;;;;;N;;;;; +AB28;ETHIOPIC SYLLABLE BBA;Lo;0;L;;;;;N;;;;; +AB29;ETHIOPIC SYLLABLE BBU;Lo;0;L;;;;;N;;;;; +AB2A;ETHIOPIC SYLLABLE BBI;Lo;0;L;;;;;N;;;;; +AB2B;ETHIOPIC SYLLABLE BBAA;Lo;0;L;;;;;N;;;;; +AB2C;ETHIOPIC SYLLABLE BBEE;Lo;0;L;;;;;N;;;;; +AB2D;ETHIOPIC SYLLABLE BBE;Lo;0;L;;;;;N;;;;; +AB2E;ETHIOPIC SYLLABLE BBO;Lo;0;L;;;;;N;;;;; +AB30;LATIN SMALL LETTER BARRED ALPHA;Ll;0;L;;;;;N;;;;; +AB31;LATIN SMALL LETTER A REVERSED-SCHWA;Ll;0;L;;;;;N;;;;; +AB32;LATIN SMALL LETTER BLACKLETTER E;Ll;0;L;;;;;N;;;;; +AB33;LATIN SMALL LETTER BARRED E;Ll;0;L;;;;;N;;;;; +AB34;LATIN SMALL LETTER E WITH FLOURISH;Ll;0;L;;;;;N;;;;; +AB35;LATIN SMALL LETTER LENIS F;Ll;0;L;;;;;N;;;;; +AB36;LATIN SMALL LETTER SCRIPT G WITH CROSSED-TAIL;Ll;0;L;;;;;N;;;;; +AB37;LATIN SMALL LETTER L WITH INVERTED LAZY S;Ll;0;L;;;;;N;;;;; +AB38;LATIN SMALL LETTER L WITH DOUBLE MIDDLE TILDE;Ll;0;L;;;;;N;;;;; +AB39;LATIN SMALL LETTER L WITH MIDDLE RING;Ll;0;L;;;;;N;;;;; +AB3A;LATIN SMALL LETTER M WITH CROSSED-TAIL;Ll;0;L;;;;;N;;;;; +AB3B;LATIN SMALL LETTER N WITH CROSSED-TAIL;Ll;0;L;;;;;N;;;;; +AB3C;LATIN SMALL LETTER ENG WITH CROSSED-TAIL;Ll;0;L;;;;;N;;;;; +AB3D;LATIN SMALL LETTER BLACKLETTER O;Ll;0;L;;;;;N;;;;; +AB3E;LATIN SMALL LETTER BLACKLETTER O WITH STROKE;Ll;0;L;;;;;N;;;;; +AB3F;LATIN SMALL LETTER OPEN O WITH STROKE;Ll;0;L;;;;;N;;;;; +AB40;LATIN SMALL LETTER INVERTED OE;Ll;0;L;;;;;N;;;;; +AB41;LATIN SMALL LETTER TURNED OE WITH STROKE;Ll;0;L;;;;;N;;;;; +AB42;LATIN SMALL LETTER TURNED OE WITH HORIZONTAL STROKE;Ll;0;L;;;;;N;;;;; +AB43;LATIN SMALL LETTER TURNED O OPEN-O;Ll;0;L;;;;;N;;;;; +AB44;LATIN SMALL LETTER TURNED O OPEN-O WITH STROKE;Ll;0;L;;;;;N;;;;; +AB45;LATIN SMALL LETTER STIRRUP R;Ll;0;L;;;;;N;;;;; +AB46;LATIN LETTER SMALL CAPITAL R WITH RIGHT LEG;Ll;0;L;;;;;N;;;;; +AB47;LATIN SMALL LETTER R WITHOUT HANDLE;Ll;0;L;;;;;N;;;;; +AB48;LATIN SMALL LETTER DOUBLE R;Ll;0;L;;;;;N;;;;; +AB49;LATIN SMALL LETTER R WITH CROSSED-TAIL;Ll;0;L;;;;;N;;;;; +AB4A;LATIN SMALL LETTER DOUBLE R WITH CROSSED-TAIL;Ll;0;L;;;;;N;;;;; +AB4B;LATIN SMALL LETTER SCRIPT R;Ll;0;L;;;;;N;;;;; +AB4C;LATIN SMALL LETTER SCRIPT R WITH RING;Ll;0;L;;;;;N;;;;; +AB4D;LATIN SMALL LETTER BASELINE ESH;Ll;0;L;;;;;N;;;;; +AB4E;LATIN SMALL LETTER U WITH SHORT RIGHT LEG;Ll;0;L;;;;;N;;;;; +AB4F;LATIN SMALL LETTER U BAR WITH SHORT RIGHT LEG;Ll;0;L;;;;;N;;;;; +AB50;LATIN SMALL LETTER UI;Ll;0;L;;;;;N;;;;; +AB51;LATIN SMALL LETTER TURNED UI;Ll;0;L;;;;;N;;;;; +AB52;LATIN SMALL LETTER U WITH LEFT HOOK;Ll;0;L;;;;;N;;;;; +AB53;LATIN SMALL LETTER CHI;Ll;0;L;;;;;N;;;A7B3;;A7B3 +AB54;LATIN SMALL LETTER CHI WITH LOW RIGHT RING;Ll;0;L;;;;;N;;;;; +AB55;LATIN SMALL LETTER CHI WITH LOW LEFT SERIF;Ll;0;L;;;;;N;;;;; +AB56;LATIN SMALL LETTER X WITH LOW RIGHT RING;Ll;0;L;;;;;N;;;;; +AB57;LATIN SMALL LETTER X WITH LONG LEFT LEG;Ll;0;L;;;;;N;;;;; +AB58;LATIN SMALL LETTER X WITH LONG LEFT LEG AND LOW RIGHT RING;Ll;0;L;;;;;N;;;;; +AB59;LATIN SMALL LETTER X WITH LONG LEFT LEG WITH SERIF;Ll;0;L;;;;;N;;;;; +AB5A;LATIN SMALL LETTER Y WITH SHORT RIGHT LEG;Ll;0;L;;;;;N;;;;; +AB5B;MODIFIER BREVE WITH INVERTED BREVE;Sk;0;L;;;;;N;;;;; +AB5C;MODIFIER LETTER SMALL HENG;Lm;0;L; A727;;;;N;;;;; +AB5D;MODIFIER LETTER SMALL L WITH INVERTED LAZY S;Lm;0;L; AB37;;;;N;;;;; +AB5E;MODIFIER LETTER SMALL L WITH MIDDLE TILDE;Lm;0;L; 026B;;;;N;;;;; +AB5F;MODIFIER LETTER SMALL U WITH LEFT HOOK;Lm;0;L; AB52;;;;N;;;;; +AB60;LATIN SMALL LETTER SAKHA YAT;Ll;0;L;;;;;N;;;;; +AB61;LATIN SMALL LETTER IOTIFIED E;Ll;0;L;;;;;N;;;;; +AB62;LATIN SMALL LETTER OPEN OE;Ll;0;L;;;;;N;;;;; +AB63;LATIN SMALL LETTER UO;Ll;0;L;;;;;N;;;;; +AB64;LATIN SMALL LETTER INVERTED ALPHA;Ll;0;L;;;;;N;;;;; +AB65;GREEK LETTER SMALL CAPITAL OMEGA;Ll;0;L;;;;;N;;;;; +AB66;LATIN SMALL LETTER DZ DIGRAPH WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;; +AB67;LATIN SMALL LETTER TS DIGRAPH WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;; +AB68;LATIN SMALL LETTER TURNED R WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;; +AB69;MODIFIER LETTER SMALL TURNED W;Lm;0;L; 028D;;;;N;;;;; +AB6A;MODIFIER LETTER LEFT TACK;Sk;0;ON;;;;;N;;;;; +AB6B;MODIFIER LETTER RIGHT TACK;Sk;0;ON;;;;;N;;;;; +AB70;CHEROKEE SMALL LETTER A;Ll;0;L;;;;;N;;;13A0;;13A0 +AB71;CHEROKEE SMALL LETTER E;Ll;0;L;;;;;N;;;13A1;;13A1 +AB72;CHEROKEE SMALL LETTER I;Ll;0;L;;;;;N;;;13A2;;13A2 +AB73;CHEROKEE SMALL LETTER O;Ll;0;L;;;;;N;;;13A3;;13A3 +AB74;CHEROKEE SMALL LETTER U;Ll;0;L;;;;;N;;;13A4;;13A4 +AB75;CHEROKEE SMALL LETTER V;Ll;0;L;;;;;N;;;13A5;;13A5 +AB76;CHEROKEE SMALL LETTER GA;Ll;0;L;;;;;N;;;13A6;;13A6 +AB77;CHEROKEE SMALL LETTER KA;Ll;0;L;;;;;N;;;13A7;;13A7 +AB78;CHEROKEE SMALL LETTER GE;Ll;0;L;;;;;N;;;13A8;;13A8 +AB79;CHEROKEE SMALL LETTER GI;Ll;0;L;;;;;N;;;13A9;;13A9 +AB7A;CHEROKEE SMALL LETTER GO;Ll;0;L;;;;;N;;;13AA;;13AA +AB7B;CHEROKEE SMALL LETTER GU;Ll;0;L;;;;;N;;;13AB;;13AB +AB7C;CHEROKEE SMALL LETTER GV;Ll;0;L;;;;;N;;;13AC;;13AC +AB7D;CHEROKEE SMALL LETTER HA;Ll;0;L;;;;;N;;;13AD;;13AD +AB7E;CHEROKEE SMALL LETTER HE;Ll;0;L;;;;;N;;;13AE;;13AE +AB7F;CHEROKEE SMALL LETTER HI;Ll;0;L;;;;;N;;;13AF;;13AF +AB80;CHEROKEE SMALL LETTER HO;Ll;0;L;;;;;N;;;13B0;;13B0 +AB81;CHEROKEE SMALL LETTER HU;Ll;0;L;;;;;N;;;13B1;;13B1 +AB82;CHEROKEE SMALL LETTER HV;Ll;0;L;;;;;N;;;13B2;;13B2 +AB83;CHEROKEE SMALL LETTER LA;Ll;0;L;;;;;N;;;13B3;;13B3 +AB84;CHEROKEE SMALL LETTER LE;Ll;0;L;;;;;N;;;13B4;;13B4 +AB85;CHEROKEE SMALL LETTER LI;Ll;0;L;;;;;N;;;13B5;;13B5 +AB86;CHEROKEE SMALL LETTER LO;Ll;0;L;;;;;N;;;13B6;;13B6 +AB87;CHEROKEE SMALL LETTER LU;Ll;0;L;;;;;N;;;13B7;;13B7 +AB88;CHEROKEE SMALL LETTER LV;Ll;0;L;;;;;N;;;13B8;;13B8 +AB89;CHEROKEE SMALL LETTER MA;Ll;0;L;;;;;N;;;13B9;;13B9 +AB8A;CHEROKEE SMALL LETTER ME;Ll;0;L;;;;;N;;;13BA;;13BA +AB8B;CHEROKEE SMALL LETTER MI;Ll;0;L;;;;;N;;;13BB;;13BB +AB8C;CHEROKEE SMALL LETTER MO;Ll;0;L;;;;;N;;;13BC;;13BC +AB8D;CHEROKEE SMALL LETTER MU;Ll;0;L;;;;;N;;;13BD;;13BD +AB8E;CHEROKEE SMALL LETTER NA;Ll;0;L;;;;;N;;;13BE;;13BE +AB8F;CHEROKEE SMALL LETTER HNA;Ll;0;L;;;;;N;;;13BF;;13BF +AB90;CHEROKEE SMALL LETTER NAH;Ll;0;L;;;;;N;;;13C0;;13C0 +AB91;CHEROKEE SMALL LETTER NE;Ll;0;L;;;;;N;;;13C1;;13C1 +AB92;CHEROKEE SMALL LETTER NI;Ll;0;L;;;;;N;;;13C2;;13C2 +AB93;CHEROKEE SMALL LETTER NO;Ll;0;L;;;;;N;;;13C3;;13C3 +AB94;CHEROKEE SMALL LETTER NU;Ll;0;L;;;;;N;;;13C4;;13C4 +AB95;CHEROKEE SMALL LETTER NV;Ll;0;L;;;;;N;;;13C5;;13C5 +AB96;CHEROKEE SMALL LETTER QUA;Ll;0;L;;;;;N;;;13C6;;13C6 +AB97;CHEROKEE SMALL LETTER QUE;Ll;0;L;;;;;N;;;13C7;;13C7 +AB98;CHEROKEE SMALL LETTER QUI;Ll;0;L;;;;;N;;;13C8;;13C8 +AB99;CHEROKEE SMALL LETTER QUO;Ll;0;L;;;;;N;;;13C9;;13C9 +AB9A;CHEROKEE SMALL LETTER QUU;Ll;0;L;;;;;N;;;13CA;;13CA +AB9B;CHEROKEE SMALL LETTER QUV;Ll;0;L;;;;;N;;;13CB;;13CB +AB9C;CHEROKEE SMALL LETTER SA;Ll;0;L;;;;;N;;;13CC;;13CC +AB9D;CHEROKEE SMALL LETTER S;Ll;0;L;;;;;N;;;13CD;;13CD +AB9E;CHEROKEE SMALL LETTER SE;Ll;0;L;;;;;N;;;13CE;;13CE +AB9F;CHEROKEE SMALL LETTER SI;Ll;0;L;;;;;N;;;13CF;;13CF +ABA0;CHEROKEE SMALL LETTER SO;Ll;0;L;;;;;N;;;13D0;;13D0 +ABA1;CHEROKEE SMALL LETTER SU;Ll;0;L;;;;;N;;;13D1;;13D1 +ABA2;CHEROKEE SMALL LETTER SV;Ll;0;L;;;;;N;;;13D2;;13D2 +ABA3;CHEROKEE SMALL LETTER DA;Ll;0;L;;;;;N;;;13D3;;13D3 +ABA4;CHEROKEE SMALL LETTER TA;Ll;0;L;;;;;N;;;13D4;;13D4 +ABA5;CHEROKEE SMALL LETTER DE;Ll;0;L;;;;;N;;;13D5;;13D5 +ABA6;CHEROKEE SMALL LETTER TE;Ll;0;L;;;;;N;;;13D6;;13D6 +ABA7;CHEROKEE SMALL LETTER DI;Ll;0;L;;;;;N;;;13D7;;13D7 +ABA8;CHEROKEE SMALL LETTER TI;Ll;0;L;;;;;N;;;13D8;;13D8 +ABA9;CHEROKEE SMALL LETTER DO;Ll;0;L;;;;;N;;;13D9;;13D9 +ABAA;CHEROKEE SMALL LETTER DU;Ll;0;L;;;;;N;;;13DA;;13DA +ABAB;CHEROKEE SMALL LETTER DV;Ll;0;L;;;;;N;;;13DB;;13DB +ABAC;CHEROKEE SMALL LETTER DLA;Ll;0;L;;;;;N;;;13DC;;13DC +ABAD;CHEROKEE SMALL LETTER TLA;Ll;0;L;;;;;N;;;13DD;;13DD +ABAE;CHEROKEE SMALL LETTER TLE;Ll;0;L;;;;;N;;;13DE;;13DE +ABAF;CHEROKEE SMALL LETTER TLI;Ll;0;L;;;;;N;;;13DF;;13DF +ABB0;CHEROKEE SMALL LETTER TLO;Ll;0;L;;;;;N;;;13E0;;13E0 +ABB1;CHEROKEE SMALL LETTER TLU;Ll;0;L;;;;;N;;;13E1;;13E1 +ABB2;CHEROKEE SMALL LETTER TLV;Ll;0;L;;;;;N;;;13E2;;13E2 +ABB3;CHEROKEE SMALL LETTER TSA;Ll;0;L;;;;;N;;;13E3;;13E3 +ABB4;CHEROKEE SMALL LETTER TSE;Ll;0;L;;;;;N;;;13E4;;13E4 +ABB5;CHEROKEE SMALL LETTER TSI;Ll;0;L;;;;;N;;;13E5;;13E5 +ABB6;CHEROKEE SMALL LETTER TSO;Ll;0;L;;;;;N;;;13E6;;13E6 +ABB7;CHEROKEE SMALL LETTER TSU;Ll;0;L;;;;;N;;;13E7;;13E7 +ABB8;CHEROKEE SMALL LETTER TSV;Ll;0;L;;;;;N;;;13E8;;13E8 +ABB9;CHEROKEE SMALL LETTER WA;Ll;0;L;;;;;N;;;13E9;;13E9 +ABBA;CHEROKEE SMALL LETTER WE;Ll;0;L;;;;;N;;;13EA;;13EA +ABBB;CHEROKEE SMALL LETTER WI;Ll;0;L;;;;;N;;;13EB;;13EB +ABBC;CHEROKEE SMALL LETTER WO;Ll;0;L;;;;;N;;;13EC;;13EC +ABBD;CHEROKEE SMALL LETTER WU;Ll;0;L;;;;;N;;;13ED;;13ED +ABBE;CHEROKEE SMALL LETTER WV;Ll;0;L;;;;;N;;;13EE;;13EE +ABBF;CHEROKEE SMALL LETTER YA;Ll;0;L;;;;;N;;;13EF;;13EF +ABC0;MEETEI MAYEK LETTER KOK;Lo;0;L;;;;;N;;;;; +ABC1;MEETEI MAYEK LETTER SAM;Lo;0;L;;;;;N;;;;; +ABC2;MEETEI MAYEK LETTER LAI;Lo;0;L;;;;;N;;;;; +ABC3;MEETEI MAYEK LETTER MIT;Lo;0;L;;;;;N;;;;; +ABC4;MEETEI MAYEK LETTER PA;Lo;0;L;;;;;N;;;;; +ABC5;MEETEI MAYEK LETTER NA;Lo;0;L;;;;;N;;;;; +ABC6;MEETEI MAYEK LETTER CHIL;Lo;0;L;;;;;N;;;;; +ABC7;MEETEI MAYEK LETTER TIL;Lo;0;L;;;;;N;;;;; +ABC8;MEETEI MAYEK LETTER KHOU;Lo;0;L;;;;;N;;;;; +ABC9;MEETEI MAYEK LETTER NGOU;Lo;0;L;;;;;N;;;;; +ABCA;MEETEI MAYEK LETTER THOU;Lo;0;L;;;;;N;;;;; +ABCB;MEETEI MAYEK LETTER WAI;Lo;0;L;;;;;N;;;;; +ABCC;MEETEI MAYEK LETTER YANG;Lo;0;L;;;;;N;;;;; +ABCD;MEETEI MAYEK LETTER HUK;Lo;0;L;;;;;N;;;;; +ABCE;MEETEI MAYEK LETTER UN;Lo;0;L;;;;;N;;;;; +ABCF;MEETEI MAYEK LETTER I;Lo;0;L;;;;;N;;;;; +ABD0;MEETEI MAYEK LETTER PHAM;Lo;0;L;;;;;N;;;;; +ABD1;MEETEI MAYEK LETTER ATIYA;Lo;0;L;;;;;N;;;;; +ABD2;MEETEI MAYEK LETTER GOK;Lo;0;L;;;;;N;;;;; +ABD3;MEETEI MAYEK LETTER JHAM;Lo;0;L;;;;;N;;;;; +ABD4;MEETEI MAYEK LETTER RAI;Lo;0;L;;;;;N;;;;; +ABD5;MEETEI MAYEK LETTER BA;Lo;0;L;;;;;N;;;;; +ABD6;MEETEI MAYEK LETTER JIL;Lo;0;L;;;;;N;;;;; +ABD7;MEETEI MAYEK LETTER DIL;Lo;0;L;;;;;N;;;;; +ABD8;MEETEI MAYEK LETTER GHOU;Lo;0;L;;;;;N;;;;; +ABD9;MEETEI MAYEK LETTER DHOU;Lo;0;L;;;;;N;;;;; +ABDA;MEETEI MAYEK LETTER BHAM;Lo;0;L;;;;;N;;;;; +ABDB;MEETEI MAYEK LETTER KOK LONSUM;Lo;0;L;;;;;N;;;;; +ABDC;MEETEI MAYEK LETTER LAI LONSUM;Lo;0;L;;;;;N;;;;; +ABDD;MEETEI MAYEK LETTER MIT LONSUM;Lo;0;L;;;;;N;;;;; +ABDE;MEETEI MAYEK LETTER PA LONSUM;Lo;0;L;;;;;N;;;;; +ABDF;MEETEI MAYEK LETTER NA LONSUM;Lo;0;L;;;;;N;;;;; +ABE0;MEETEI MAYEK LETTER TIL LONSUM;Lo;0;L;;;;;N;;;;; +ABE1;MEETEI MAYEK LETTER NGOU LONSUM;Lo;0;L;;;;;N;;;;; +ABE2;MEETEI MAYEK LETTER I LONSUM;Lo;0;L;;;;;N;;;;; +ABE3;MEETEI MAYEK VOWEL SIGN ONAP;Mc;0;L;;;;;N;;;;; +ABE4;MEETEI MAYEK VOWEL SIGN INAP;Mc;0;L;;;;;N;;;;; +ABE5;MEETEI MAYEK VOWEL SIGN ANAP;Mn;0;NSM;;;;;N;;;;; +ABE6;MEETEI MAYEK VOWEL SIGN YENAP;Mc;0;L;;;;;N;;;;; +ABE7;MEETEI MAYEK VOWEL SIGN SOUNAP;Mc;0;L;;;;;N;;;;; +ABE8;MEETEI MAYEK VOWEL SIGN UNAP;Mn;0;NSM;;;;;N;;;;; +ABE9;MEETEI MAYEK VOWEL SIGN CHEINAP;Mc;0;L;;;;;N;;;;; +ABEA;MEETEI MAYEK VOWEL SIGN NUNG;Mc;0;L;;;;;N;;;;; +ABEB;MEETEI MAYEK CHEIKHEI;Po;0;L;;;;;N;;;;; +ABEC;MEETEI MAYEK LUM IYEK;Mc;0;L;;;;;N;;;;; +ABED;MEETEI MAYEK APUN IYEK;Mn;9;NSM;;;;;N;;;;; +ABF0;MEETEI MAYEK DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +ABF1;MEETEI MAYEK DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +ABF2;MEETEI MAYEK DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +ABF3;MEETEI MAYEK DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +ABF4;MEETEI MAYEK DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +ABF5;MEETEI MAYEK DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +ABF6;MEETEI MAYEK DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +ABF7;MEETEI MAYEK DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +ABF8;MEETEI MAYEK DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +ABF9;MEETEI MAYEK DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +AC00;;Lo;0;L;;;;;N;;;;; +D7A3;;Lo;0;L;;;;;N;;;;; +D7B0;HANGUL JUNGSEONG O-YEO;Lo;0;L;;;;;N;;;;; +D7B1;HANGUL JUNGSEONG O-O-I;Lo;0;L;;;;;N;;;;; +D7B2;HANGUL JUNGSEONG YO-A;Lo;0;L;;;;;N;;;;; +D7B3;HANGUL JUNGSEONG YO-AE;Lo;0;L;;;;;N;;;;; +D7B4;HANGUL JUNGSEONG YO-EO;Lo;0;L;;;;;N;;;;; +D7B5;HANGUL JUNGSEONG U-YEO;Lo;0;L;;;;;N;;;;; +D7B6;HANGUL JUNGSEONG U-I-I;Lo;0;L;;;;;N;;;;; +D7B7;HANGUL JUNGSEONG YU-AE;Lo;0;L;;;;;N;;;;; +D7B8;HANGUL JUNGSEONG YU-O;Lo;0;L;;;;;N;;;;; +D7B9;HANGUL JUNGSEONG EU-A;Lo;0;L;;;;;N;;;;; +D7BA;HANGUL JUNGSEONG EU-EO;Lo;0;L;;;;;N;;;;; +D7BB;HANGUL JUNGSEONG EU-E;Lo;0;L;;;;;N;;;;; +D7BC;HANGUL JUNGSEONG EU-O;Lo;0;L;;;;;N;;;;; +D7BD;HANGUL JUNGSEONG I-YA-O;Lo;0;L;;;;;N;;;;; +D7BE;HANGUL JUNGSEONG I-YAE;Lo;0;L;;;;;N;;;;; +D7BF;HANGUL JUNGSEONG I-YEO;Lo;0;L;;;;;N;;;;; +D7C0;HANGUL JUNGSEONG I-YE;Lo;0;L;;;;;N;;;;; +D7C1;HANGUL JUNGSEONG I-O-I;Lo;0;L;;;;;N;;;;; +D7C2;HANGUL JUNGSEONG I-YO;Lo;0;L;;;;;N;;;;; +D7C3;HANGUL JUNGSEONG I-YU;Lo;0;L;;;;;N;;;;; +D7C4;HANGUL JUNGSEONG I-I;Lo;0;L;;;;;N;;;;; +D7C5;HANGUL JUNGSEONG ARAEA-A;Lo;0;L;;;;;N;;;;; +D7C6;HANGUL JUNGSEONG ARAEA-E;Lo;0;L;;;;;N;;;;; +D7CB;HANGUL JONGSEONG NIEUN-RIEUL;Lo;0;L;;;;;N;;;;; +D7CC;HANGUL JONGSEONG NIEUN-CHIEUCH;Lo;0;L;;;;;N;;;;; +D7CD;HANGUL JONGSEONG SSANGTIKEUT;Lo;0;L;;;;;N;;;;; +D7CE;HANGUL JONGSEONG SSANGTIKEUT-PIEUP;Lo;0;L;;;;;N;;;;; +D7CF;HANGUL JONGSEONG TIKEUT-PIEUP;Lo;0;L;;;;;N;;;;; +D7D0;HANGUL JONGSEONG TIKEUT-SIOS;Lo;0;L;;;;;N;;;;; +D7D1;HANGUL JONGSEONG TIKEUT-SIOS-KIYEOK;Lo;0;L;;;;;N;;;;; +D7D2;HANGUL JONGSEONG TIKEUT-CIEUC;Lo;0;L;;;;;N;;;;; +D7D3;HANGUL JONGSEONG TIKEUT-CHIEUCH;Lo;0;L;;;;;N;;;;; +D7D4;HANGUL JONGSEONG TIKEUT-THIEUTH;Lo;0;L;;;;;N;;;;; +D7D5;HANGUL JONGSEONG RIEUL-SSANGKIYEOK;Lo;0;L;;;;;N;;;;; +D7D6;HANGUL JONGSEONG RIEUL-KIYEOK-HIEUH;Lo;0;L;;;;;N;;;;; +D7D7;HANGUL JONGSEONG SSANGRIEUL-KHIEUKH;Lo;0;L;;;;;N;;;;; +D7D8;HANGUL JONGSEONG RIEUL-MIEUM-HIEUH;Lo;0;L;;;;;N;;;;; +D7D9;HANGUL JONGSEONG RIEUL-PIEUP-TIKEUT;Lo;0;L;;;;;N;;;;; +D7DA;HANGUL JONGSEONG RIEUL-PIEUP-PHIEUPH;Lo;0;L;;;;;N;;;;; +D7DB;HANGUL JONGSEONG RIEUL-YESIEUNG;Lo;0;L;;;;;N;;;;; +D7DC;HANGUL JONGSEONG RIEUL-YEORINHIEUH-HIEUH;Lo;0;L;;;;;N;;;;; +D7DD;HANGUL JONGSEONG KAPYEOUNRIEUL;Lo;0;L;;;;;N;;;;; +D7DE;HANGUL JONGSEONG MIEUM-NIEUN;Lo;0;L;;;;;N;;;;; +D7DF;HANGUL JONGSEONG MIEUM-SSANGNIEUN;Lo;0;L;;;;;N;;;;; +D7E0;HANGUL JONGSEONG SSANGMIEUM;Lo;0;L;;;;;N;;;;; +D7E1;HANGUL JONGSEONG MIEUM-PIEUP-SIOS;Lo;0;L;;;;;N;;;;; +D7E2;HANGUL JONGSEONG MIEUM-CIEUC;Lo;0;L;;;;;N;;;;; +D7E3;HANGUL JONGSEONG PIEUP-TIKEUT;Lo;0;L;;;;;N;;;;; +D7E4;HANGUL JONGSEONG PIEUP-RIEUL-PHIEUPH;Lo;0;L;;;;;N;;;;; +D7E5;HANGUL JONGSEONG PIEUP-MIEUM;Lo;0;L;;;;;N;;;;; +D7E6;HANGUL JONGSEONG SSANGPIEUP;Lo;0;L;;;;;N;;;;; +D7E7;HANGUL JONGSEONG PIEUP-SIOS-TIKEUT;Lo;0;L;;;;;N;;;;; +D7E8;HANGUL JONGSEONG PIEUP-CIEUC;Lo;0;L;;;;;N;;;;; +D7E9;HANGUL JONGSEONG PIEUP-CHIEUCH;Lo;0;L;;;;;N;;;;; +D7EA;HANGUL JONGSEONG SIOS-MIEUM;Lo;0;L;;;;;N;;;;; +D7EB;HANGUL JONGSEONG SIOS-KAPYEOUNPIEUP;Lo;0;L;;;;;N;;;;; +D7EC;HANGUL JONGSEONG SSANGSIOS-KIYEOK;Lo;0;L;;;;;N;;;;; +D7ED;HANGUL JONGSEONG SSANGSIOS-TIKEUT;Lo;0;L;;;;;N;;;;; +D7EE;HANGUL JONGSEONG SIOS-PANSIOS;Lo;0;L;;;;;N;;;;; +D7EF;HANGUL JONGSEONG SIOS-CIEUC;Lo;0;L;;;;;N;;;;; +D7F0;HANGUL JONGSEONG SIOS-CHIEUCH;Lo;0;L;;;;;N;;;;; +D7F1;HANGUL JONGSEONG SIOS-THIEUTH;Lo;0;L;;;;;N;;;;; +D7F2;HANGUL JONGSEONG SIOS-HIEUH;Lo;0;L;;;;;N;;;;; +D7F3;HANGUL JONGSEONG PANSIOS-PIEUP;Lo;0;L;;;;;N;;;;; +D7F4;HANGUL JONGSEONG PANSIOS-KAPYEOUNPIEUP;Lo;0;L;;;;;N;;;;; +D7F5;HANGUL JONGSEONG YESIEUNG-MIEUM;Lo;0;L;;;;;N;;;;; +D7F6;HANGUL JONGSEONG YESIEUNG-HIEUH;Lo;0;L;;;;;N;;;;; +D7F7;HANGUL JONGSEONG CIEUC-PIEUP;Lo;0;L;;;;;N;;;;; +D7F8;HANGUL JONGSEONG CIEUC-SSANGPIEUP;Lo;0;L;;;;;N;;;;; +D7F9;HANGUL JONGSEONG SSANGCIEUC;Lo;0;L;;;;;N;;;;; +D7FA;HANGUL JONGSEONG PHIEUPH-SIOS;Lo;0;L;;;;;N;;;;; +D7FB;HANGUL JONGSEONG PHIEUPH-THIEUTH;Lo;0;L;;;;;N;;;;; +D800;;Cs;0;L;;;;;N;;;;; +DB7F;;Cs;0;L;;;;;N;;;;; +DB80;;Cs;0;L;;;;;N;;;;; +DBFF;;Cs;0;L;;;;;N;;;;; +DC00;;Cs;0;L;;;;;N;;;;; +DFFF;;Cs;0;L;;;;;N;;;;; +E000;;Co;0;L;;;;;N;;;;; +F8FF;;Co;0;L;;;;;N;;;;; +F900;CJK COMPATIBILITY IDEOGRAPH-F900;Lo;0;L;8C48;;;;N;;;;; +F901;CJK COMPATIBILITY IDEOGRAPH-F901;Lo;0;L;66F4;;;;N;;;;; +F902;CJK COMPATIBILITY IDEOGRAPH-F902;Lo;0;L;8ECA;;;;N;;;;; +F903;CJK COMPATIBILITY IDEOGRAPH-F903;Lo;0;L;8CC8;;;;N;;;;; +F904;CJK COMPATIBILITY IDEOGRAPH-F904;Lo;0;L;6ED1;;;;N;;;;; +F905;CJK COMPATIBILITY IDEOGRAPH-F905;Lo;0;L;4E32;;;;N;;;;; +F906;CJK COMPATIBILITY IDEOGRAPH-F906;Lo;0;L;53E5;;;;N;;;;; +F907;CJK COMPATIBILITY IDEOGRAPH-F907;Lo;0;L;9F9C;;;;N;;;;; +F908;CJK COMPATIBILITY IDEOGRAPH-F908;Lo;0;L;9F9C;;;;N;;;;; +F909;CJK COMPATIBILITY IDEOGRAPH-F909;Lo;0;L;5951;;;;N;;;;; +F90A;CJK COMPATIBILITY IDEOGRAPH-F90A;Lo;0;L;91D1;;;;N;;;;; +F90B;CJK COMPATIBILITY IDEOGRAPH-F90B;Lo;0;L;5587;;;;N;;;;; +F90C;CJK COMPATIBILITY IDEOGRAPH-F90C;Lo;0;L;5948;;;;N;;;;; +F90D;CJK COMPATIBILITY IDEOGRAPH-F90D;Lo;0;L;61F6;;;;N;;;;; +F90E;CJK COMPATIBILITY IDEOGRAPH-F90E;Lo;0;L;7669;;;;N;;;;; +F90F;CJK COMPATIBILITY IDEOGRAPH-F90F;Lo;0;L;7F85;;;;N;;;;; +F910;CJK COMPATIBILITY IDEOGRAPH-F910;Lo;0;L;863F;;;;N;;;;; +F911;CJK COMPATIBILITY IDEOGRAPH-F911;Lo;0;L;87BA;;;;N;;;;; +F912;CJK COMPATIBILITY IDEOGRAPH-F912;Lo;0;L;88F8;;;;N;;;;; +F913;CJK COMPATIBILITY IDEOGRAPH-F913;Lo;0;L;908F;;;;N;;;;; +F914;CJK COMPATIBILITY IDEOGRAPH-F914;Lo;0;L;6A02;;;;N;;;;; +F915;CJK COMPATIBILITY IDEOGRAPH-F915;Lo;0;L;6D1B;;;;N;;;;; +F916;CJK COMPATIBILITY IDEOGRAPH-F916;Lo;0;L;70D9;;;;N;;;;; +F917;CJK COMPATIBILITY IDEOGRAPH-F917;Lo;0;L;73DE;;;;N;;;;; +F918;CJK COMPATIBILITY IDEOGRAPH-F918;Lo;0;L;843D;;;;N;;;;; +F919;CJK COMPATIBILITY IDEOGRAPH-F919;Lo;0;L;916A;;;;N;;;;; +F91A;CJK COMPATIBILITY IDEOGRAPH-F91A;Lo;0;L;99F1;;;;N;;;;; +F91B;CJK COMPATIBILITY IDEOGRAPH-F91B;Lo;0;L;4E82;;;;N;;;;; +F91C;CJK COMPATIBILITY IDEOGRAPH-F91C;Lo;0;L;5375;;;;N;;;;; +F91D;CJK COMPATIBILITY IDEOGRAPH-F91D;Lo;0;L;6B04;;;;N;;;;; +F91E;CJK COMPATIBILITY IDEOGRAPH-F91E;Lo;0;L;721B;;;;N;;;;; +F91F;CJK COMPATIBILITY IDEOGRAPH-F91F;Lo;0;L;862D;;;;N;;;;; +F920;CJK COMPATIBILITY IDEOGRAPH-F920;Lo;0;L;9E1E;;;;N;;;;; +F921;CJK COMPATIBILITY IDEOGRAPH-F921;Lo;0;L;5D50;;;;N;;;;; +F922;CJK COMPATIBILITY IDEOGRAPH-F922;Lo;0;L;6FEB;;;;N;;;;; +F923;CJK COMPATIBILITY IDEOGRAPH-F923;Lo;0;L;85CD;;;;N;;;;; +F924;CJK COMPATIBILITY IDEOGRAPH-F924;Lo;0;L;8964;;;;N;;;;; +F925;CJK COMPATIBILITY IDEOGRAPH-F925;Lo;0;L;62C9;;;;N;;;;; +F926;CJK COMPATIBILITY IDEOGRAPH-F926;Lo;0;L;81D8;;;;N;;;;; +F927;CJK COMPATIBILITY IDEOGRAPH-F927;Lo;0;L;881F;;;;N;;;;; +F928;CJK COMPATIBILITY IDEOGRAPH-F928;Lo;0;L;5ECA;;;;N;;;;; +F929;CJK COMPATIBILITY IDEOGRAPH-F929;Lo;0;L;6717;;;;N;;;;; +F92A;CJK COMPATIBILITY IDEOGRAPH-F92A;Lo;0;L;6D6A;;;;N;;;;; +F92B;CJK COMPATIBILITY IDEOGRAPH-F92B;Lo;0;L;72FC;;;;N;;;;; +F92C;CJK COMPATIBILITY IDEOGRAPH-F92C;Lo;0;L;90CE;;;;N;;;;; +F92D;CJK COMPATIBILITY IDEOGRAPH-F92D;Lo;0;L;4F86;;;;N;;;;; +F92E;CJK COMPATIBILITY IDEOGRAPH-F92E;Lo;0;L;51B7;;;;N;;;;; +F92F;CJK COMPATIBILITY IDEOGRAPH-F92F;Lo;0;L;52DE;;;;N;;;;; +F930;CJK COMPATIBILITY IDEOGRAPH-F930;Lo;0;L;64C4;;;;N;;;;; +F931;CJK COMPATIBILITY IDEOGRAPH-F931;Lo;0;L;6AD3;;;;N;;;;; +F932;CJK COMPATIBILITY IDEOGRAPH-F932;Lo;0;L;7210;;;;N;;;;; +F933;CJK COMPATIBILITY IDEOGRAPH-F933;Lo;0;L;76E7;;;;N;;;;; +F934;CJK COMPATIBILITY IDEOGRAPH-F934;Lo;0;L;8001;;;;N;;;;; +F935;CJK COMPATIBILITY IDEOGRAPH-F935;Lo;0;L;8606;;;;N;;;;; +F936;CJK COMPATIBILITY IDEOGRAPH-F936;Lo;0;L;865C;;;;N;;;;; +F937;CJK COMPATIBILITY IDEOGRAPH-F937;Lo;0;L;8DEF;;;;N;;;;; +F938;CJK COMPATIBILITY IDEOGRAPH-F938;Lo;0;L;9732;;;;N;;;;; +F939;CJK COMPATIBILITY IDEOGRAPH-F939;Lo;0;L;9B6F;;;;N;;;;; +F93A;CJK COMPATIBILITY IDEOGRAPH-F93A;Lo;0;L;9DFA;;;;N;;;;; +F93B;CJK COMPATIBILITY IDEOGRAPH-F93B;Lo;0;L;788C;;;;N;;;;; +F93C;CJK COMPATIBILITY IDEOGRAPH-F93C;Lo;0;L;797F;;;;N;;;;; +F93D;CJK COMPATIBILITY IDEOGRAPH-F93D;Lo;0;L;7DA0;;;;N;;;;; +F93E;CJK COMPATIBILITY IDEOGRAPH-F93E;Lo;0;L;83C9;;;;N;;;;; +F93F;CJK COMPATIBILITY IDEOGRAPH-F93F;Lo;0;L;9304;;;;N;;;;; +F940;CJK COMPATIBILITY IDEOGRAPH-F940;Lo;0;L;9E7F;;;;N;;;;; +F941;CJK COMPATIBILITY IDEOGRAPH-F941;Lo;0;L;8AD6;;;;N;;;;; +F942;CJK COMPATIBILITY IDEOGRAPH-F942;Lo;0;L;58DF;;;;N;;;;; +F943;CJK COMPATIBILITY IDEOGRAPH-F943;Lo;0;L;5F04;;;;N;;;;; +F944;CJK COMPATIBILITY IDEOGRAPH-F944;Lo;0;L;7C60;;;;N;;;;; +F945;CJK COMPATIBILITY IDEOGRAPH-F945;Lo;0;L;807E;;;;N;;;;; +F946;CJK COMPATIBILITY IDEOGRAPH-F946;Lo;0;L;7262;;;;N;;;;; +F947;CJK COMPATIBILITY IDEOGRAPH-F947;Lo;0;L;78CA;;;;N;;;;; +F948;CJK COMPATIBILITY IDEOGRAPH-F948;Lo;0;L;8CC2;;;;N;;;;; +F949;CJK COMPATIBILITY IDEOGRAPH-F949;Lo;0;L;96F7;;;;N;;;;; +F94A;CJK COMPATIBILITY IDEOGRAPH-F94A;Lo;0;L;58D8;;;;N;;;;; +F94B;CJK COMPATIBILITY IDEOGRAPH-F94B;Lo;0;L;5C62;;;;N;;;;; +F94C;CJK COMPATIBILITY IDEOGRAPH-F94C;Lo;0;L;6A13;;;;N;;;;; +F94D;CJK COMPATIBILITY IDEOGRAPH-F94D;Lo;0;L;6DDA;;;;N;;;;; +F94E;CJK COMPATIBILITY IDEOGRAPH-F94E;Lo;0;L;6F0F;;;;N;;;;; +F94F;CJK COMPATIBILITY IDEOGRAPH-F94F;Lo;0;L;7D2F;;;;N;;;;; +F950;CJK COMPATIBILITY IDEOGRAPH-F950;Lo;0;L;7E37;;;;N;;;;; +F951;CJK COMPATIBILITY IDEOGRAPH-F951;Lo;0;L;964B;;;;N;;;;; +F952;CJK COMPATIBILITY IDEOGRAPH-F952;Lo;0;L;52D2;;;;N;;;;; +F953;CJK COMPATIBILITY IDEOGRAPH-F953;Lo;0;L;808B;;;;N;;;;; +F954;CJK COMPATIBILITY IDEOGRAPH-F954;Lo;0;L;51DC;;;;N;;;;; +F955;CJK COMPATIBILITY IDEOGRAPH-F955;Lo;0;L;51CC;;;;N;;;;; +F956;CJK COMPATIBILITY IDEOGRAPH-F956;Lo;0;L;7A1C;;;;N;;;;; +F957;CJK COMPATIBILITY IDEOGRAPH-F957;Lo;0;L;7DBE;;;;N;;;;; +F958;CJK COMPATIBILITY IDEOGRAPH-F958;Lo;0;L;83F1;;;;N;;;;; +F959;CJK COMPATIBILITY IDEOGRAPH-F959;Lo;0;L;9675;;;;N;;;;; +F95A;CJK COMPATIBILITY IDEOGRAPH-F95A;Lo;0;L;8B80;;;;N;;;;; +F95B;CJK COMPATIBILITY IDEOGRAPH-F95B;Lo;0;L;62CF;;;;N;;;;; +F95C;CJK COMPATIBILITY IDEOGRAPH-F95C;Lo;0;L;6A02;;;;N;;;;; +F95D;CJK COMPATIBILITY IDEOGRAPH-F95D;Lo;0;L;8AFE;;;;N;;;;; +F95E;CJK COMPATIBILITY IDEOGRAPH-F95E;Lo;0;L;4E39;;;;N;;;;; +F95F;CJK COMPATIBILITY IDEOGRAPH-F95F;Lo;0;L;5BE7;;;;N;;;;; +F960;CJK COMPATIBILITY IDEOGRAPH-F960;Lo;0;L;6012;;;;N;;;;; +F961;CJK COMPATIBILITY IDEOGRAPH-F961;Lo;0;L;7387;;;;N;;;;; +F962;CJK COMPATIBILITY IDEOGRAPH-F962;Lo;0;L;7570;;;;N;;;;; +F963;CJK COMPATIBILITY IDEOGRAPH-F963;Lo;0;L;5317;;;;N;;;;; +F964;CJK COMPATIBILITY IDEOGRAPH-F964;Lo;0;L;78FB;;;;N;;;;; +F965;CJK COMPATIBILITY IDEOGRAPH-F965;Lo;0;L;4FBF;;;;N;;;;; +F966;CJK COMPATIBILITY IDEOGRAPH-F966;Lo;0;L;5FA9;;;;N;;;;; +F967;CJK COMPATIBILITY IDEOGRAPH-F967;Lo;0;L;4E0D;;;;N;;;;; +F968;CJK COMPATIBILITY IDEOGRAPH-F968;Lo;0;L;6CCC;;;;N;;;;; +F969;CJK COMPATIBILITY IDEOGRAPH-F969;Lo;0;L;6578;;;;N;;;;; +F96A;CJK COMPATIBILITY IDEOGRAPH-F96A;Lo;0;L;7D22;;;;N;;;;; +F96B;CJK COMPATIBILITY IDEOGRAPH-F96B;Lo;0;L;53C3;;;3;N;;;;; +F96C;CJK COMPATIBILITY IDEOGRAPH-F96C;Lo;0;L;585E;;;;N;;;;; +F96D;CJK COMPATIBILITY IDEOGRAPH-F96D;Lo;0;L;7701;;;;N;;;;; +F96E;CJK COMPATIBILITY IDEOGRAPH-F96E;Lo;0;L;8449;;;;N;;;;; +F96F;CJK COMPATIBILITY IDEOGRAPH-F96F;Lo;0;L;8AAA;;;;N;;;;; +F970;CJK COMPATIBILITY IDEOGRAPH-F970;Lo;0;L;6BBA;;;;N;;;;; +F971;CJK COMPATIBILITY IDEOGRAPH-F971;Lo;0;L;8FB0;;;;N;;;;; +F972;CJK COMPATIBILITY IDEOGRAPH-F972;Lo;0;L;6C88;;;;N;;;;; +F973;CJK COMPATIBILITY IDEOGRAPH-F973;Lo;0;L;62FE;;;10;N;;;;; +F974;CJK COMPATIBILITY IDEOGRAPH-F974;Lo;0;L;82E5;;;;N;;;;; +F975;CJK COMPATIBILITY IDEOGRAPH-F975;Lo;0;L;63A0;;;;N;;;;; +F976;CJK COMPATIBILITY IDEOGRAPH-F976;Lo;0;L;7565;;;;N;;;;; +F977;CJK COMPATIBILITY IDEOGRAPH-F977;Lo;0;L;4EAE;;;;N;;;;; +F978;CJK COMPATIBILITY IDEOGRAPH-F978;Lo;0;L;5169;;;2;N;;;;; +F979;CJK COMPATIBILITY IDEOGRAPH-F979;Lo;0;L;51C9;;;;N;;;;; +F97A;CJK COMPATIBILITY IDEOGRAPH-F97A;Lo;0;L;6881;;;;N;;;;; +F97B;CJK COMPATIBILITY IDEOGRAPH-F97B;Lo;0;L;7CE7;;;;N;;;;; +F97C;CJK COMPATIBILITY IDEOGRAPH-F97C;Lo;0;L;826F;;;;N;;;;; +F97D;CJK COMPATIBILITY IDEOGRAPH-F97D;Lo;0;L;8AD2;;;;N;;;;; +F97E;CJK COMPATIBILITY IDEOGRAPH-F97E;Lo;0;L;91CF;;;;N;;;;; +F97F;CJK COMPATIBILITY IDEOGRAPH-F97F;Lo;0;L;52F5;;;;N;;;;; +F980;CJK COMPATIBILITY IDEOGRAPH-F980;Lo;0;L;5442;;;;N;;;;; +F981;CJK COMPATIBILITY IDEOGRAPH-F981;Lo;0;L;5973;;;;N;;;;; +F982;CJK COMPATIBILITY IDEOGRAPH-F982;Lo;0;L;5EEC;;;;N;;;;; +F983;CJK COMPATIBILITY IDEOGRAPH-F983;Lo;0;L;65C5;;;;N;;;;; +F984;CJK COMPATIBILITY IDEOGRAPH-F984;Lo;0;L;6FFE;;;;N;;;;; +F985;CJK COMPATIBILITY IDEOGRAPH-F985;Lo;0;L;792A;;;;N;;;;; +F986;CJK COMPATIBILITY IDEOGRAPH-F986;Lo;0;L;95AD;;;;N;;;;; +F987;CJK COMPATIBILITY IDEOGRAPH-F987;Lo;0;L;9A6A;;;;N;;;;; +F988;CJK COMPATIBILITY IDEOGRAPH-F988;Lo;0;L;9E97;;;;N;;;;; +F989;CJK COMPATIBILITY IDEOGRAPH-F989;Lo;0;L;9ECE;;;;N;;;;; +F98A;CJK COMPATIBILITY IDEOGRAPH-F98A;Lo;0;L;529B;;;;N;;;;; +F98B;CJK COMPATIBILITY IDEOGRAPH-F98B;Lo;0;L;66C6;;;;N;;;;; +F98C;CJK COMPATIBILITY IDEOGRAPH-F98C;Lo;0;L;6B77;;;;N;;;;; +F98D;CJK COMPATIBILITY IDEOGRAPH-F98D;Lo;0;L;8F62;;;;N;;;;; +F98E;CJK COMPATIBILITY IDEOGRAPH-F98E;Lo;0;L;5E74;;;;N;;;;; +F98F;CJK COMPATIBILITY IDEOGRAPH-F98F;Lo;0;L;6190;;;;N;;;;; +F990;CJK COMPATIBILITY IDEOGRAPH-F990;Lo;0;L;6200;;;;N;;;;; +F991;CJK COMPATIBILITY IDEOGRAPH-F991;Lo;0;L;649A;;;;N;;;;; +F992;CJK COMPATIBILITY IDEOGRAPH-F992;Lo;0;L;6F23;;;;N;;;;; +F993;CJK COMPATIBILITY IDEOGRAPH-F993;Lo;0;L;7149;;;;N;;;;; +F994;CJK COMPATIBILITY IDEOGRAPH-F994;Lo;0;L;7489;;;;N;;;;; +F995;CJK COMPATIBILITY IDEOGRAPH-F995;Lo;0;L;79CA;;;;N;;;;; +F996;CJK COMPATIBILITY IDEOGRAPH-F996;Lo;0;L;7DF4;;;;N;;;;; +F997;CJK COMPATIBILITY IDEOGRAPH-F997;Lo;0;L;806F;;;;N;;;;; +F998;CJK COMPATIBILITY IDEOGRAPH-F998;Lo;0;L;8F26;;;;N;;;;; +F999;CJK COMPATIBILITY IDEOGRAPH-F999;Lo;0;L;84EE;;;;N;;;;; +F99A;CJK COMPATIBILITY IDEOGRAPH-F99A;Lo;0;L;9023;;;;N;;;;; +F99B;CJK COMPATIBILITY IDEOGRAPH-F99B;Lo;0;L;934A;;;;N;;;;; +F99C;CJK COMPATIBILITY IDEOGRAPH-F99C;Lo;0;L;5217;;;;N;;;;; +F99D;CJK COMPATIBILITY IDEOGRAPH-F99D;Lo;0;L;52A3;;;;N;;;;; +F99E;CJK COMPATIBILITY IDEOGRAPH-F99E;Lo;0;L;54BD;;;;N;;;;; +F99F;CJK COMPATIBILITY IDEOGRAPH-F99F;Lo;0;L;70C8;;;;N;;;;; +F9A0;CJK COMPATIBILITY IDEOGRAPH-F9A0;Lo;0;L;88C2;;;;N;;;;; +F9A1;CJK COMPATIBILITY IDEOGRAPH-F9A1;Lo;0;L;8AAA;;;;N;;;;; +F9A2;CJK COMPATIBILITY IDEOGRAPH-F9A2;Lo;0;L;5EC9;;;;N;;;;; +F9A3;CJK COMPATIBILITY IDEOGRAPH-F9A3;Lo;0;L;5FF5;;;;N;;;;; +F9A4;CJK COMPATIBILITY IDEOGRAPH-F9A4;Lo;0;L;637B;;;;N;;;;; +F9A5;CJK COMPATIBILITY IDEOGRAPH-F9A5;Lo;0;L;6BAE;;;;N;;;;; +F9A6;CJK COMPATIBILITY IDEOGRAPH-F9A6;Lo;0;L;7C3E;;;;N;;;;; +F9A7;CJK COMPATIBILITY IDEOGRAPH-F9A7;Lo;0;L;7375;;;;N;;;;; +F9A8;CJK COMPATIBILITY IDEOGRAPH-F9A8;Lo;0;L;4EE4;;;;N;;;;; +F9A9;CJK COMPATIBILITY IDEOGRAPH-F9A9;Lo;0;L;56F9;;;;N;;;;; +F9AA;CJK COMPATIBILITY IDEOGRAPH-F9AA;Lo;0;L;5BE7;;;;N;;;;; +F9AB;CJK COMPATIBILITY IDEOGRAPH-F9AB;Lo;0;L;5DBA;;;;N;;;;; +F9AC;CJK COMPATIBILITY IDEOGRAPH-F9AC;Lo;0;L;601C;;;;N;;;;; +F9AD;CJK COMPATIBILITY IDEOGRAPH-F9AD;Lo;0;L;73B2;;;;N;;;;; +F9AE;CJK COMPATIBILITY IDEOGRAPH-F9AE;Lo;0;L;7469;;;;N;;;;; +F9AF;CJK COMPATIBILITY IDEOGRAPH-F9AF;Lo;0;L;7F9A;;;;N;;;;; +F9B0;CJK COMPATIBILITY IDEOGRAPH-F9B0;Lo;0;L;8046;;;;N;;;;; +F9B1;CJK COMPATIBILITY IDEOGRAPH-F9B1;Lo;0;L;9234;;;;N;;;;; +F9B2;CJK COMPATIBILITY IDEOGRAPH-F9B2;Lo;0;L;96F6;;;0;N;;;;; +F9B3;CJK COMPATIBILITY IDEOGRAPH-F9B3;Lo;0;L;9748;;;;N;;;;; +F9B4;CJK COMPATIBILITY IDEOGRAPH-F9B4;Lo;0;L;9818;;;;N;;;;; +F9B5;CJK COMPATIBILITY IDEOGRAPH-F9B5;Lo;0;L;4F8B;;;;N;;;;; +F9B6;CJK COMPATIBILITY IDEOGRAPH-F9B6;Lo;0;L;79AE;;;;N;;;;; +F9B7;CJK COMPATIBILITY IDEOGRAPH-F9B7;Lo;0;L;91B4;;;;N;;;;; +F9B8;CJK COMPATIBILITY IDEOGRAPH-F9B8;Lo;0;L;96B8;;;;N;;;;; +F9B9;CJK COMPATIBILITY IDEOGRAPH-F9B9;Lo;0;L;60E1;;;;N;;;;; +F9BA;CJK COMPATIBILITY IDEOGRAPH-F9BA;Lo;0;L;4E86;;;;N;;;;; +F9BB;CJK COMPATIBILITY IDEOGRAPH-F9BB;Lo;0;L;50DA;;;;N;;;;; +F9BC;CJK COMPATIBILITY IDEOGRAPH-F9BC;Lo;0;L;5BEE;;;;N;;;;; +F9BD;CJK COMPATIBILITY IDEOGRAPH-F9BD;Lo;0;L;5C3F;;;;N;;;;; +F9BE;CJK COMPATIBILITY IDEOGRAPH-F9BE;Lo;0;L;6599;;;;N;;;;; +F9BF;CJK COMPATIBILITY IDEOGRAPH-F9BF;Lo;0;L;6A02;;;;N;;;;; +F9C0;CJK COMPATIBILITY IDEOGRAPH-F9C0;Lo;0;L;71CE;;;;N;;;;; +F9C1;CJK COMPATIBILITY IDEOGRAPH-F9C1;Lo;0;L;7642;;;;N;;;;; +F9C2;CJK COMPATIBILITY IDEOGRAPH-F9C2;Lo;0;L;84FC;;;;N;;;;; +F9C3;CJK COMPATIBILITY IDEOGRAPH-F9C3;Lo;0;L;907C;;;;N;;;;; +F9C4;CJK COMPATIBILITY IDEOGRAPH-F9C4;Lo;0;L;9F8D;;;;N;;;;; +F9C5;CJK COMPATIBILITY IDEOGRAPH-F9C5;Lo;0;L;6688;;;;N;;;;; +F9C6;CJK COMPATIBILITY IDEOGRAPH-F9C6;Lo;0;L;962E;;;;N;;;;; +F9C7;CJK COMPATIBILITY IDEOGRAPH-F9C7;Lo;0;L;5289;;;;N;;;;; +F9C8;CJK COMPATIBILITY IDEOGRAPH-F9C8;Lo;0;L;677B;;;;N;;;;; +F9C9;CJK COMPATIBILITY IDEOGRAPH-F9C9;Lo;0;L;67F3;;;;N;;;;; +F9CA;CJK COMPATIBILITY IDEOGRAPH-F9CA;Lo;0;L;6D41;;;;N;;;;; +F9CB;CJK COMPATIBILITY IDEOGRAPH-F9CB;Lo;0;L;6E9C;;;;N;;;;; +F9CC;CJK COMPATIBILITY IDEOGRAPH-F9CC;Lo;0;L;7409;;;;N;;;;; +F9CD;CJK COMPATIBILITY IDEOGRAPH-F9CD;Lo;0;L;7559;;;;N;;;;; +F9CE;CJK COMPATIBILITY IDEOGRAPH-F9CE;Lo;0;L;786B;;;;N;;;;; +F9CF;CJK COMPATIBILITY IDEOGRAPH-F9CF;Lo;0;L;7D10;;;;N;;;;; +F9D0;CJK COMPATIBILITY IDEOGRAPH-F9D0;Lo;0;L;985E;;;;N;;;;; +F9D1;CJK COMPATIBILITY IDEOGRAPH-F9D1;Lo;0;L;516D;;;6;N;;;;; +F9D2;CJK COMPATIBILITY IDEOGRAPH-F9D2;Lo;0;L;622E;;;;N;;;;; +F9D3;CJK COMPATIBILITY IDEOGRAPH-F9D3;Lo;0;L;9678;;;6;N;;;;; +F9D4;CJK COMPATIBILITY IDEOGRAPH-F9D4;Lo;0;L;502B;;;;N;;;;; +F9D5;CJK COMPATIBILITY IDEOGRAPH-F9D5;Lo;0;L;5D19;;;;N;;;;; +F9D6;CJK COMPATIBILITY IDEOGRAPH-F9D6;Lo;0;L;6DEA;;;;N;;;;; +F9D7;CJK COMPATIBILITY IDEOGRAPH-F9D7;Lo;0;L;8F2A;;;;N;;;;; +F9D8;CJK COMPATIBILITY IDEOGRAPH-F9D8;Lo;0;L;5F8B;;;;N;;;;; +F9D9;CJK COMPATIBILITY IDEOGRAPH-F9D9;Lo;0;L;6144;;;;N;;;;; +F9DA;CJK COMPATIBILITY IDEOGRAPH-F9DA;Lo;0;L;6817;;;;N;;;;; +F9DB;CJK COMPATIBILITY IDEOGRAPH-F9DB;Lo;0;L;7387;;;;N;;;;; +F9DC;CJK COMPATIBILITY IDEOGRAPH-F9DC;Lo;0;L;9686;;;;N;;;;; +F9DD;CJK COMPATIBILITY IDEOGRAPH-F9DD;Lo;0;L;5229;;;;N;;;;; +F9DE;CJK COMPATIBILITY IDEOGRAPH-F9DE;Lo;0;L;540F;;;;N;;;;; +F9DF;CJK COMPATIBILITY IDEOGRAPH-F9DF;Lo;0;L;5C65;;;;N;;;;; +F9E0;CJK COMPATIBILITY IDEOGRAPH-F9E0;Lo;0;L;6613;;;;N;;;;; +F9E1;CJK COMPATIBILITY IDEOGRAPH-F9E1;Lo;0;L;674E;;;;N;;;;; +F9E2;CJK COMPATIBILITY IDEOGRAPH-F9E2;Lo;0;L;68A8;;;;N;;;;; +F9E3;CJK COMPATIBILITY IDEOGRAPH-F9E3;Lo;0;L;6CE5;;;;N;;;;; +F9E4;CJK COMPATIBILITY IDEOGRAPH-F9E4;Lo;0;L;7406;;;;N;;;;; +F9E5;CJK COMPATIBILITY IDEOGRAPH-F9E5;Lo;0;L;75E2;;;;N;;;;; +F9E6;CJK COMPATIBILITY IDEOGRAPH-F9E6;Lo;0;L;7F79;;;;N;;;;; +F9E7;CJK COMPATIBILITY IDEOGRAPH-F9E7;Lo;0;L;88CF;;;;N;;;;; +F9E8;CJK COMPATIBILITY IDEOGRAPH-F9E8;Lo;0;L;88E1;;;;N;;;;; +F9E9;CJK COMPATIBILITY IDEOGRAPH-F9E9;Lo;0;L;91CC;;;;N;;;;; +F9EA;CJK COMPATIBILITY IDEOGRAPH-F9EA;Lo;0;L;96E2;;;;N;;;;; +F9EB;CJK COMPATIBILITY IDEOGRAPH-F9EB;Lo;0;L;533F;;;;N;;;;; +F9EC;CJK COMPATIBILITY IDEOGRAPH-F9EC;Lo;0;L;6EBA;;;;N;;;;; +F9ED;CJK COMPATIBILITY IDEOGRAPH-F9ED;Lo;0;L;541D;;;;N;;;;; +F9EE;CJK COMPATIBILITY IDEOGRAPH-F9EE;Lo;0;L;71D0;;;;N;;;;; +F9EF;CJK COMPATIBILITY IDEOGRAPH-F9EF;Lo;0;L;7498;;;;N;;;;; +F9F0;CJK COMPATIBILITY IDEOGRAPH-F9F0;Lo;0;L;85FA;;;;N;;;;; +F9F1;CJK COMPATIBILITY IDEOGRAPH-F9F1;Lo;0;L;96A3;;;;N;;;;; +F9F2;CJK COMPATIBILITY IDEOGRAPH-F9F2;Lo;0;L;9C57;;;;N;;;;; +F9F3;CJK COMPATIBILITY IDEOGRAPH-F9F3;Lo;0;L;9E9F;;;;N;;;;; +F9F4;CJK COMPATIBILITY IDEOGRAPH-F9F4;Lo;0;L;6797;;;;N;;;;; +F9F5;CJK COMPATIBILITY IDEOGRAPH-F9F5;Lo;0;L;6DCB;;;;N;;;;; +F9F6;CJK COMPATIBILITY IDEOGRAPH-F9F6;Lo;0;L;81E8;;;;N;;;;; +F9F7;CJK COMPATIBILITY IDEOGRAPH-F9F7;Lo;0;L;7ACB;;;;N;;;;; +F9F8;CJK COMPATIBILITY IDEOGRAPH-F9F8;Lo;0;L;7B20;;;;N;;;;; +F9F9;CJK COMPATIBILITY IDEOGRAPH-F9F9;Lo;0;L;7C92;;;;N;;;;; +F9FA;CJK COMPATIBILITY IDEOGRAPH-F9FA;Lo;0;L;72C0;;;;N;;;;; +F9FB;CJK COMPATIBILITY IDEOGRAPH-F9FB;Lo;0;L;7099;;;;N;;;;; +F9FC;CJK COMPATIBILITY IDEOGRAPH-F9FC;Lo;0;L;8B58;;;;N;;;;; +F9FD;CJK COMPATIBILITY IDEOGRAPH-F9FD;Lo;0;L;4EC0;;;10;N;;;;; +F9FE;CJK COMPATIBILITY IDEOGRAPH-F9FE;Lo;0;L;8336;;;;N;;;;; +F9FF;CJK COMPATIBILITY IDEOGRAPH-F9FF;Lo;0;L;523A;;;;N;;;;; +FA00;CJK COMPATIBILITY IDEOGRAPH-FA00;Lo;0;L;5207;;;;N;;;;; +FA01;CJK COMPATIBILITY IDEOGRAPH-FA01;Lo;0;L;5EA6;;;;N;;;;; +FA02;CJK COMPATIBILITY IDEOGRAPH-FA02;Lo;0;L;62D3;;;;N;;;;; +FA03;CJK COMPATIBILITY IDEOGRAPH-FA03;Lo;0;L;7CD6;;;;N;;;;; +FA04;CJK COMPATIBILITY IDEOGRAPH-FA04;Lo;0;L;5B85;;;;N;;;;; +FA05;CJK COMPATIBILITY IDEOGRAPH-FA05;Lo;0;L;6D1E;;;;N;;;;; +FA06;CJK COMPATIBILITY IDEOGRAPH-FA06;Lo;0;L;66B4;;;;N;;;;; +FA07;CJK COMPATIBILITY IDEOGRAPH-FA07;Lo;0;L;8F3B;;;;N;;;;; +FA08;CJK COMPATIBILITY IDEOGRAPH-FA08;Lo;0;L;884C;;;;N;;;;; +FA09;CJK COMPATIBILITY IDEOGRAPH-FA09;Lo;0;L;964D;;;;N;;;;; +FA0A;CJK COMPATIBILITY IDEOGRAPH-FA0A;Lo;0;L;898B;;;;N;;;;; +FA0B;CJK COMPATIBILITY IDEOGRAPH-FA0B;Lo;0;L;5ED3;;;;N;;;;; +FA0C;CJK COMPATIBILITY IDEOGRAPH-FA0C;Lo;0;L;5140;;;;N;;;;; +FA0D;CJK COMPATIBILITY IDEOGRAPH-FA0D;Lo;0;L;55C0;;;;N;;;;; +FA0E;CJK COMPATIBILITY IDEOGRAPH-FA0E;Lo;0;L;;;;;N;;;;; +FA0F;CJK COMPATIBILITY IDEOGRAPH-FA0F;Lo;0;L;;;;;N;;;;; +FA10;CJK COMPATIBILITY IDEOGRAPH-FA10;Lo;0;L;585A;;;;N;;;;; +FA11;CJK COMPATIBILITY IDEOGRAPH-FA11;Lo;0;L;;;;;N;;;;; +FA12;CJK COMPATIBILITY IDEOGRAPH-FA12;Lo;0;L;6674;;;;N;;;;; +FA13;CJK COMPATIBILITY IDEOGRAPH-FA13;Lo;0;L;;;;;N;;;;; +FA14;CJK COMPATIBILITY IDEOGRAPH-FA14;Lo;0;L;;;;;N;;;;; +FA15;CJK COMPATIBILITY IDEOGRAPH-FA15;Lo;0;L;51DE;;;;N;;;;; +FA16;CJK COMPATIBILITY IDEOGRAPH-FA16;Lo;0;L;732A;;;;N;;;;; +FA17;CJK COMPATIBILITY IDEOGRAPH-FA17;Lo;0;L;76CA;;;;N;;;;; +FA18;CJK COMPATIBILITY IDEOGRAPH-FA18;Lo;0;L;793C;;;;N;;;;; +FA19;CJK COMPATIBILITY IDEOGRAPH-FA19;Lo;0;L;795E;;;;N;;;;; +FA1A;CJK COMPATIBILITY IDEOGRAPH-FA1A;Lo;0;L;7965;;;;N;;;;; +FA1B;CJK COMPATIBILITY IDEOGRAPH-FA1B;Lo;0;L;798F;;;;N;;;;; +FA1C;CJK COMPATIBILITY IDEOGRAPH-FA1C;Lo;0;L;9756;;;;N;;;;; +FA1D;CJK COMPATIBILITY IDEOGRAPH-FA1D;Lo;0;L;7CBE;;;;N;;;;; +FA1E;CJK COMPATIBILITY IDEOGRAPH-FA1E;Lo;0;L;7FBD;;;;N;;;;; +FA1F;CJK COMPATIBILITY IDEOGRAPH-FA1F;Lo;0;L;;;;;N;;;;; +FA20;CJK COMPATIBILITY IDEOGRAPH-FA20;Lo;0;L;8612;;;;N;;;;; +FA21;CJK COMPATIBILITY IDEOGRAPH-FA21;Lo;0;L;;;;;N;;;;; +FA22;CJK COMPATIBILITY IDEOGRAPH-FA22;Lo;0;L;8AF8;;;;N;;;;; +FA23;CJK COMPATIBILITY IDEOGRAPH-FA23;Lo;0;L;;;;;N;;;;; +FA24;CJK COMPATIBILITY IDEOGRAPH-FA24;Lo;0;L;;;;;N;;;;; +FA25;CJK COMPATIBILITY IDEOGRAPH-FA25;Lo;0;L;9038;;;;N;;;;; +FA26;CJK COMPATIBILITY IDEOGRAPH-FA26;Lo;0;L;90FD;;;;N;;;;; +FA27;CJK COMPATIBILITY IDEOGRAPH-FA27;Lo;0;L;;;;;N;;;;; +FA28;CJK COMPATIBILITY IDEOGRAPH-FA28;Lo;0;L;;;;;N;;;;; +FA29;CJK COMPATIBILITY IDEOGRAPH-FA29;Lo;0;L;;;;;N;;;;; +FA2A;CJK COMPATIBILITY IDEOGRAPH-FA2A;Lo;0;L;98EF;;;;N;;;;; +FA2B;CJK COMPATIBILITY IDEOGRAPH-FA2B;Lo;0;L;98FC;;;;N;;;;; +FA2C;CJK COMPATIBILITY IDEOGRAPH-FA2C;Lo;0;L;9928;;;;N;;;;; +FA2D;CJK COMPATIBILITY IDEOGRAPH-FA2D;Lo;0;L;9DB4;;;;N;;;;; +FA2E;CJK COMPATIBILITY IDEOGRAPH-FA2E;Lo;0;L;90DE;;;;N;;;;; +FA2F;CJK COMPATIBILITY IDEOGRAPH-FA2F;Lo;0;L;96B7;;;;N;;;;; +FA30;CJK COMPATIBILITY IDEOGRAPH-FA30;Lo;0;L;4FAE;;;;N;;;;; +FA31;CJK COMPATIBILITY IDEOGRAPH-FA31;Lo;0;L;50E7;;;;N;;;;; +FA32;CJK COMPATIBILITY IDEOGRAPH-FA32;Lo;0;L;514D;;;;N;;;;; +FA33;CJK COMPATIBILITY IDEOGRAPH-FA33;Lo;0;L;52C9;;;;N;;;;; +FA34;CJK COMPATIBILITY IDEOGRAPH-FA34;Lo;0;L;52E4;;;;N;;;;; +FA35;CJK COMPATIBILITY IDEOGRAPH-FA35;Lo;0;L;5351;;;;N;;;;; +FA36;CJK COMPATIBILITY IDEOGRAPH-FA36;Lo;0;L;559D;;;;N;;;;; +FA37;CJK COMPATIBILITY IDEOGRAPH-FA37;Lo;0;L;5606;;;;N;;;;; +FA38;CJK COMPATIBILITY IDEOGRAPH-FA38;Lo;0;L;5668;;;;N;;;;; +FA39;CJK COMPATIBILITY IDEOGRAPH-FA39;Lo;0;L;5840;;;;N;;;;; +FA3A;CJK COMPATIBILITY IDEOGRAPH-FA3A;Lo;0;L;58A8;;;;N;;;;; +FA3B;CJK COMPATIBILITY IDEOGRAPH-FA3B;Lo;0;L;5C64;;;;N;;;;; +FA3C;CJK COMPATIBILITY IDEOGRAPH-FA3C;Lo;0;L;5C6E;;;;N;;;;; +FA3D;CJK COMPATIBILITY IDEOGRAPH-FA3D;Lo;0;L;6094;;;;N;;;;; +FA3E;CJK COMPATIBILITY IDEOGRAPH-FA3E;Lo;0;L;6168;;;;N;;;;; +FA3F;CJK COMPATIBILITY IDEOGRAPH-FA3F;Lo;0;L;618E;;;;N;;;;; +FA40;CJK COMPATIBILITY IDEOGRAPH-FA40;Lo;0;L;61F2;;;;N;;;;; +FA41;CJK COMPATIBILITY IDEOGRAPH-FA41;Lo;0;L;654F;;;;N;;;;; +FA42;CJK COMPATIBILITY IDEOGRAPH-FA42;Lo;0;L;65E2;;;;N;;;;; +FA43;CJK COMPATIBILITY IDEOGRAPH-FA43;Lo;0;L;6691;;;;N;;;;; +FA44;CJK COMPATIBILITY IDEOGRAPH-FA44;Lo;0;L;6885;;;;N;;;;; +FA45;CJK COMPATIBILITY IDEOGRAPH-FA45;Lo;0;L;6D77;;;;N;;;;; +FA46;CJK COMPATIBILITY IDEOGRAPH-FA46;Lo;0;L;6E1A;;;;N;;;;; +FA47;CJK COMPATIBILITY IDEOGRAPH-FA47;Lo;0;L;6F22;;;;N;;;;; +FA48;CJK COMPATIBILITY IDEOGRAPH-FA48;Lo;0;L;716E;;;;N;;;;; +FA49;CJK COMPATIBILITY IDEOGRAPH-FA49;Lo;0;L;722B;;;;N;;;;; +FA4A;CJK COMPATIBILITY IDEOGRAPH-FA4A;Lo;0;L;7422;;;;N;;;;; +FA4B;CJK COMPATIBILITY IDEOGRAPH-FA4B;Lo;0;L;7891;;;;N;;;;; +FA4C;CJK COMPATIBILITY IDEOGRAPH-FA4C;Lo;0;L;793E;;;;N;;;;; +FA4D;CJK COMPATIBILITY IDEOGRAPH-FA4D;Lo;0;L;7949;;;;N;;;;; +FA4E;CJK COMPATIBILITY IDEOGRAPH-FA4E;Lo;0;L;7948;;;;N;;;;; +FA4F;CJK COMPATIBILITY IDEOGRAPH-FA4F;Lo;0;L;7950;;;;N;;;;; +FA50;CJK COMPATIBILITY IDEOGRAPH-FA50;Lo;0;L;7956;;;;N;;;;; +FA51;CJK COMPATIBILITY IDEOGRAPH-FA51;Lo;0;L;795D;;;;N;;;;; +FA52;CJK COMPATIBILITY IDEOGRAPH-FA52;Lo;0;L;798D;;;;N;;;;; +FA53;CJK COMPATIBILITY IDEOGRAPH-FA53;Lo;0;L;798E;;;;N;;;;; +FA54;CJK COMPATIBILITY IDEOGRAPH-FA54;Lo;0;L;7A40;;;;N;;;;; +FA55;CJK COMPATIBILITY IDEOGRAPH-FA55;Lo;0;L;7A81;;;;N;;;;; +FA56;CJK COMPATIBILITY IDEOGRAPH-FA56;Lo;0;L;7BC0;;;;N;;;;; +FA57;CJK COMPATIBILITY IDEOGRAPH-FA57;Lo;0;L;7DF4;;;;N;;;;; +FA58;CJK COMPATIBILITY IDEOGRAPH-FA58;Lo;0;L;7E09;;;;N;;;;; +FA59;CJK COMPATIBILITY IDEOGRAPH-FA59;Lo;0;L;7E41;;;;N;;;;; +FA5A;CJK COMPATIBILITY IDEOGRAPH-FA5A;Lo;0;L;7F72;;;;N;;;;; +FA5B;CJK COMPATIBILITY IDEOGRAPH-FA5B;Lo;0;L;8005;;;;N;;;;; +FA5C;CJK COMPATIBILITY IDEOGRAPH-FA5C;Lo;0;L;81ED;;;;N;;;;; +FA5D;CJK COMPATIBILITY IDEOGRAPH-FA5D;Lo;0;L;8279;;;;N;;;;; +FA5E;CJK COMPATIBILITY IDEOGRAPH-FA5E;Lo;0;L;8279;;;;N;;;;; +FA5F;CJK COMPATIBILITY IDEOGRAPH-FA5F;Lo;0;L;8457;;;;N;;;;; +FA60;CJK COMPATIBILITY IDEOGRAPH-FA60;Lo;0;L;8910;;;;N;;;;; +FA61;CJK COMPATIBILITY IDEOGRAPH-FA61;Lo;0;L;8996;;;;N;;;;; +FA62;CJK COMPATIBILITY IDEOGRAPH-FA62;Lo;0;L;8B01;;;;N;;;;; +FA63;CJK COMPATIBILITY IDEOGRAPH-FA63;Lo;0;L;8B39;;;;N;;;;; +FA64;CJK COMPATIBILITY IDEOGRAPH-FA64;Lo;0;L;8CD3;;;;N;;;;; +FA65;CJK COMPATIBILITY IDEOGRAPH-FA65;Lo;0;L;8D08;;;;N;;;;; +FA66;CJK COMPATIBILITY IDEOGRAPH-FA66;Lo;0;L;8FB6;;;;N;;;;; +FA67;CJK COMPATIBILITY IDEOGRAPH-FA67;Lo;0;L;9038;;;;N;;;;; +FA68;CJK COMPATIBILITY IDEOGRAPH-FA68;Lo;0;L;96E3;;;;N;;;;; +FA69;CJK COMPATIBILITY IDEOGRAPH-FA69;Lo;0;L;97FF;;;;N;;;;; +FA6A;CJK COMPATIBILITY IDEOGRAPH-FA6A;Lo;0;L;983B;;;;N;;;;; +FA6B;CJK COMPATIBILITY IDEOGRAPH-FA6B;Lo;0;L;6075;;;;N;;;;; +FA6C;CJK COMPATIBILITY IDEOGRAPH-FA6C;Lo;0;L;242EE;;;;N;;;;; +FA6D;CJK COMPATIBILITY IDEOGRAPH-FA6D;Lo;0;L;8218;;;;N;;;;; +FA70;CJK COMPATIBILITY IDEOGRAPH-FA70;Lo;0;L;4E26;;;;N;;;;; +FA71;CJK COMPATIBILITY IDEOGRAPH-FA71;Lo;0;L;51B5;;;;N;;;;; +FA72;CJK COMPATIBILITY IDEOGRAPH-FA72;Lo;0;L;5168;;;;N;;;;; +FA73;CJK COMPATIBILITY IDEOGRAPH-FA73;Lo;0;L;4F80;;;;N;;;;; +FA74;CJK COMPATIBILITY IDEOGRAPH-FA74;Lo;0;L;5145;;;;N;;;;; +FA75;CJK COMPATIBILITY IDEOGRAPH-FA75;Lo;0;L;5180;;;;N;;;;; +FA76;CJK COMPATIBILITY IDEOGRAPH-FA76;Lo;0;L;52C7;;;;N;;;;; +FA77;CJK COMPATIBILITY IDEOGRAPH-FA77;Lo;0;L;52FA;;;;N;;;;; +FA78;CJK COMPATIBILITY IDEOGRAPH-FA78;Lo;0;L;559D;;;;N;;;;; +FA79;CJK COMPATIBILITY IDEOGRAPH-FA79;Lo;0;L;5555;;;;N;;;;; +FA7A;CJK COMPATIBILITY IDEOGRAPH-FA7A;Lo;0;L;5599;;;;N;;;;; +FA7B;CJK COMPATIBILITY IDEOGRAPH-FA7B;Lo;0;L;55E2;;;;N;;;;; +FA7C;CJK COMPATIBILITY IDEOGRAPH-FA7C;Lo;0;L;585A;;;;N;;;;; +FA7D;CJK COMPATIBILITY IDEOGRAPH-FA7D;Lo;0;L;58B3;;;;N;;;;; +FA7E;CJK COMPATIBILITY IDEOGRAPH-FA7E;Lo;0;L;5944;;;;N;;;;; +FA7F;CJK COMPATIBILITY IDEOGRAPH-FA7F;Lo;0;L;5954;;;;N;;;;; +FA80;CJK COMPATIBILITY IDEOGRAPH-FA80;Lo;0;L;5A62;;;;N;;;;; +FA81;CJK COMPATIBILITY IDEOGRAPH-FA81;Lo;0;L;5B28;;;;N;;;;; +FA82;CJK COMPATIBILITY IDEOGRAPH-FA82;Lo;0;L;5ED2;;;;N;;;;; +FA83;CJK COMPATIBILITY IDEOGRAPH-FA83;Lo;0;L;5ED9;;;;N;;;;; +FA84;CJK COMPATIBILITY IDEOGRAPH-FA84;Lo;0;L;5F69;;;;N;;;;; +FA85;CJK COMPATIBILITY IDEOGRAPH-FA85;Lo;0;L;5FAD;;;;N;;;;; +FA86;CJK COMPATIBILITY IDEOGRAPH-FA86;Lo;0;L;60D8;;;;N;;;;; +FA87;CJK COMPATIBILITY IDEOGRAPH-FA87;Lo;0;L;614E;;;;N;;;;; +FA88;CJK COMPATIBILITY IDEOGRAPH-FA88;Lo;0;L;6108;;;;N;;;;; +FA89;CJK COMPATIBILITY IDEOGRAPH-FA89;Lo;0;L;618E;;;;N;;;;; +FA8A;CJK COMPATIBILITY IDEOGRAPH-FA8A;Lo;0;L;6160;;;;N;;;;; +FA8B;CJK COMPATIBILITY IDEOGRAPH-FA8B;Lo;0;L;61F2;;;;N;;;;; +FA8C;CJK COMPATIBILITY IDEOGRAPH-FA8C;Lo;0;L;6234;;;;N;;;;; +FA8D;CJK COMPATIBILITY IDEOGRAPH-FA8D;Lo;0;L;63C4;;;;N;;;;; +FA8E;CJK COMPATIBILITY IDEOGRAPH-FA8E;Lo;0;L;641C;;;;N;;;;; +FA8F;CJK COMPATIBILITY IDEOGRAPH-FA8F;Lo;0;L;6452;;;;N;;;;; +FA90;CJK COMPATIBILITY IDEOGRAPH-FA90;Lo;0;L;6556;;;;N;;;;; +FA91;CJK COMPATIBILITY IDEOGRAPH-FA91;Lo;0;L;6674;;;;N;;;;; +FA92;CJK COMPATIBILITY IDEOGRAPH-FA92;Lo;0;L;6717;;;;N;;;;; +FA93;CJK COMPATIBILITY IDEOGRAPH-FA93;Lo;0;L;671B;;;;N;;;;; +FA94;CJK COMPATIBILITY IDEOGRAPH-FA94;Lo;0;L;6756;;;;N;;;;; +FA95;CJK COMPATIBILITY IDEOGRAPH-FA95;Lo;0;L;6B79;;;;N;;;;; +FA96;CJK COMPATIBILITY IDEOGRAPH-FA96;Lo;0;L;6BBA;;;;N;;;;; +FA97;CJK COMPATIBILITY IDEOGRAPH-FA97;Lo;0;L;6D41;;;;N;;;;; +FA98;CJK COMPATIBILITY IDEOGRAPH-FA98;Lo;0;L;6EDB;;;;N;;;;; +FA99;CJK COMPATIBILITY IDEOGRAPH-FA99;Lo;0;L;6ECB;;;;N;;;;; +FA9A;CJK COMPATIBILITY IDEOGRAPH-FA9A;Lo;0;L;6F22;;;;N;;;;; +FA9B;CJK COMPATIBILITY IDEOGRAPH-FA9B;Lo;0;L;701E;;;;N;;;;; +FA9C;CJK COMPATIBILITY IDEOGRAPH-FA9C;Lo;0;L;716E;;;;N;;;;; +FA9D;CJK COMPATIBILITY IDEOGRAPH-FA9D;Lo;0;L;77A7;;;;N;;;;; +FA9E;CJK COMPATIBILITY IDEOGRAPH-FA9E;Lo;0;L;7235;;;;N;;;;; +FA9F;CJK COMPATIBILITY IDEOGRAPH-FA9F;Lo;0;L;72AF;;;;N;;;;; +FAA0;CJK COMPATIBILITY IDEOGRAPH-FAA0;Lo;0;L;732A;;;;N;;;;; +FAA1;CJK COMPATIBILITY IDEOGRAPH-FAA1;Lo;0;L;7471;;;;N;;;;; +FAA2;CJK COMPATIBILITY IDEOGRAPH-FAA2;Lo;0;L;7506;;;;N;;;;; +FAA3;CJK COMPATIBILITY IDEOGRAPH-FAA3;Lo;0;L;753B;;;;N;;;;; +FAA4;CJK COMPATIBILITY IDEOGRAPH-FAA4;Lo;0;L;761D;;;;N;;;;; +FAA5;CJK COMPATIBILITY IDEOGRAPH-FAA5;Lo;0;L;761F;;;;N;;;;; +FAA6;CJK COMPATIBILITY IDEOGRAPH-FAA6;Lo;0;L;76CA;;;;N;;;;; +FAA7;CJK COMPATIBILITY IDEOGRAPH-FAA7;Lo;0;L;76DB;;;;N;;;;; +FAA8;CJK COMPATIBILITY IDEOGRAPH-FAA8;Lo;0;L;76F4;;;;N;;;;; +FAA9;CJK COMPATIBILITY IDEOGRAPH-FAA9;Lo;0;L;774A;;;;N;;;;; +FAAA;CJK COMPATIBILITY IDEOGRAPH-FAAA;Lo;0;L;7740;;;;N;;;;; +FAAB;CJK COMPATIBILITY IDEOGRAPH-FAAB;Lo;0;L;78CC;;;;N;;;;; +FAAC;CJK COMPATIBILITY IDEOGRAPH-FAAC;Lo;0;L;7AB1;;;;N;;;;; +FAAD;CJK COMPATIBILITY IDEOGRAPH-FAAD;Lo;0;L;7BC0;;;;N;;;;; +FAAE;CJK COMPATIBILITY IDEOGRAPH-FAAE;Lo;0;L;7C7B;;;;N;;;;; +FAAF;CJK COMPATIBILITY IDEOGRAPH-FAAF;Lo;0;L;7D5B;;;;N;;;;; +FAB0;CJK COMPATIBILITY IDEOGRAPH-FAB0;Lo;0;L;7DF4;;;;N;;;;; +FAB1;CJK COMPATIBILITY IDEOGRAPH-FAB1;Lo;0;L;7F3E;;;;N;;;;; +FAB2;CJK COMPATIBILITY IDEOGRAPH-FAB2;Lo;0;L;8005;;;;N;;;;; +FAB3;CJK COMPATIBILITY IDEOGRAPH-FAB3;Lo;0;L;8352;;;;N;;;;; +FAB4;CJK COMPATIBILITY IDEOGRAPH-FAB4;Lo;0;L;83EF;;;;N;;;;; +FAB5;CJK COMPATIBILITY IDEOGRAPH-FAB5;Lo;0;L;8779;;;;N;;;;; +FAB6;CJK COMPATIBILITY IDEOGRAPH-FAB6;Lo;0;L;8941;;;;N;;;;; +FAB7;CJK COMPATIBILITY IDEOGRAPH-FAB7;Lo;0;L;8986;;;;N;;;;; +FAB8;CJK COMPATIBILITY IDEOGRAPH-FAB8;Lo;0;L;8996;;;;N;;;;; +FAB9;CJK COMPATIBILITY IDEOGRAPH-FAB9;Lo;0;L;8ABF;;;;N;;;;; +FABA;CJK COMPATIBILITY IDEOGRAPH-FABA;Lo;0;L;8AF8;;;;N;;;;; +FABB;CJK COMPATIBILITY IDEOGRAPH-FABB;Lo;0;L;8ACB;;;;N;;;;; +FABC;CJK COMPATIBILITY IDEOGRAPH-FABC;Lo;0;L;8B01;;;;N;;;;; +FABD;CJK COMPATIBILITY IDEOGRAPH-FABD;Lo;0;L;8AFE;;;;N;;;;; +FABE;CJK COMPATIBILITY IDEOGRAPH-FABE;Lo;0;L;8AED;;;;N;;;;; +FABF;CJK COMPATIBILITY IDEOGRAPH-FABF;Lo;0;L;8B39;;;;N;;;;; +FAC0;CJK COMPATIBILITY IDEOGRAPH-FAC0;Lo;0;L;8B8A;;;;N;;;;; +FAC1;CJK COMPATIBILITY IDEOGRAPH-FAC1;Lo;0;L;8D08;;;;N;;;;; +FAC2;CJK COMPATIBILITY IDEOGRAPH-FAC2;Lo;0;L;8F38;;;;N;;;;; +FAC3;CJK COMPATIBILITY IDEOGRAPH-FAC3;Lo;0;L;9072;;;;N;;;;; +FAC4;CJK COMPATIBILITY IDEOGRAPH-FAC4;Lo;0;L;9199;;;;N;;;;; +FAC5;CJK COMPATIBILITY IDEOGRAPH-FAC5;Lo;0;L;9276;;;;N;;;;; +FAC6;CJK COMPATIBILITY IDEOGRAPH-FAC6;Lo;0;L;967C;;;;N;;;;; +FAC7;CJK COMPATIBILITY IDEOGRAPH-FAC7;Lo;0;L;96E3;;;;N;;;;; +FAC8;CJK COMPATIBILITY IDEOGRAPH-FAC8;Lo;0;L;9756;;;;N;;;;; +FAC9;CJK COMPATIBILITY IDEOGRAPH-FAC9;Lo;0;L;97DB;;;;N;;;;; +FACA;CJK COMPATIBILITY IDEOGRAPH-FACA;Lo;0;L;97FF;;;;N;;;;; +FACB;CJK COMPATIBILITY IDEOGRAPH-FACB;Lo;0;L;980B;;;;N;;;;; +FACC;CJK COMPATIBILITY IDEOGRAPH-FACC;Lo;0;L;983B;;;;N;;;;; +FACD;CJK COMPATIBILITY IDEOGRAPH-FACD;Lo;0;L;9B12;;;;N;;;;; +FACE;CJK COMPATIBILITY IDEOGRAPH-FACE;Lo;0;L;9F9C;;;;N;;;;; +FACF;CJK COMPATIBILITY IDEOGRAPH-FACF;Lo;0;L;2284A;;;;N;;;;; +FAD0;CJK COMPATIBILITY IDEOGRAPH-FAD0;Lo;0;L;22844;;;;N;;;;; +FAD1;CJK COMPATIBILITY IDEOGRAPH-FAD1;Lo;0;L;233D5;;;;N;;;;; +FAD2;CJK COMPATIBILITY IDEOGRAPH-FAD2;Lo;0;L;3B9D;;;;N;;;;; +FAD3;CJK COMPATIBILITY IDEOGRAPH-FAD3;Lo;0;L;4018;;;;N;;;;; +FAD4;CJK COMPATIBILITY IDEOGRAPH-FAD4;Lo;0;L;4039;;;;N;;;;; +FAD5;CJK COMPATIBILITY IDEOGRAPH-FAD5;Lo;0;L;25249;;;;N;;;;; +FAD6;CJK COMPATIBILITY IDEOGRAPH-FAD6;Lo;0;L;25CD0;;;;N;;;;; +FAD7;CJK COMPATIBILITY IDEOGRAPH-FAD7;Lo;0;L;27ED3;;;;N;;;;; +FAD8;CJK COMPATIBILITY IDEOGRAPH-FAD8;Lo;0;L;9F43;;;;N;;;;; +FAD9;CJK COMPATIBILITY IDEOGRAPH-FAD9;Lo;0;L;9F8E;;;;N;;;;; +FB00;LATIN SMALL LIGATURE FF;Ll;0;L; 0066 0066;;;;N;;;;; +FB01;LATIN SMALL LIGATURE FI;Ll;0;L; 0066 0069;;;;N;;;;; +FB02;LATIN SMALL LIGATURE FL;Ll;0;L; 0066 006C;;;;N;;;;; +FB03;LATIN SMALL LIGATURE FFI;Ll;0;L; 0066 0066 0069;;;;N;;;;; +FB04;LATIN SMALL LIGATURE FFL;Ll;0;L; 0066 0066 006C;;;;N;;;;; +FB05;LATIN SMALL LIGATURE LONG S T;Ll;0;L; 017F 0074;;;;N;;;;; +FB06;LATIN SMALL LIGATURE ST;Ll;0;L; 0073 0074;;;;N;;;;; +FB13;ARMENIAN SMALL LIGATURE MEN NOW;Ll;0;L; 0574 0576;;;;N;;;;; +FB14;ARMENIAN SMALL LIGATURE MEN ECH;Ll;0;L; 0574 0565;;;;N;;;;; +FB15;ARMENIAN SMALL LIGATURE MEN INI;Ll;0;L; 0574 056B;;;;N;;;;; +FB16;ARMENIAN SMALL LIGATURE VEW NOW;Ll;0;L; 057E 0576;;;;N;;;;; +FB17;ARMENIAN SMALL LIGATURE MEN XEH;Ll;0;L; 0574 056D;;;;N;;;;; +FB1D;HEBREW LETTER YOD WITH HIRIQ;Lo;0;R;05D9 05B4;;;;N;;;;; +FB1E;HEBREW POINT JUDEO-SPANISH VARIKA;Mn;26;NSM;;;;;N;HEBREW POINT VARIKA;;;; +FB1F;HEBREW LIGATURE YIDDISH YOD YOD PATAH;Lo;0;R;05F2 05B7;;;;N;;;;; +FB20;HEBREW LETTER ALTERNATIVE AYIN;Lo;0;R; 05E2;;;;N;;;;; +FB21;HEBREW LETTER WIDE ALEF;Lo;0;R; 05D0;;;;N;;;;; +FB22;HEBREW LETTER WIDE DALET;Lo;0;R; 05D3;;;;N;;;;; +FB23;HEBREW LETTER WIDE HE;Lo;0;R; 05D4;;;;N;;;;; +FB24;HEBREW LETTER WIDE KAF;Lo;0;R; 05DB;;;;N;;;;; +FB25;HEBREW LETTER WIDE LAMED;Lo;0;R; 05DC;;;;N;;;;; +FB26;HEBREW LETTER WIDE FINAL MEM;Lo;0;R; 05DD;;;;N;;;;; +FB27;HEBREW LETTER WIDE RESH;Lo;0;R; 05E8;;;;N;;;;; +FB28;HEBREW LETTER WIDE TAV;Lo;0;R; 05EA;;;;N;;;;; +FB29;HEBREW LETTER ALTERNATIVE PLUS SIGN;Sm;0;ES; 002B;;;;N;;;;; +FB2A;HEBREW LETTER SHIN WITH SHIN DOT;Lo;0;R;05E9 05C1;;;;N;;;;; +FB2B;HEBREW LETTER SHIN WITH SIN DOT;Lo;0;R;05E9 05C2;;;;N;;;;; +FB2C;HEBREW LETTER SHIN WITH DAGESH AND SHIN DOT;Lo;0;R;FB49 05C1;;;;N;;;;; +FB2D;HEBREW LETTER SHIN WITH DAGESH AND SIN DOT;Lo;0;R;FB49 05C2;;;;N;;;;; +FB2E;HEBREW LETTER ALEF WITH PATAH;Lo;0;R;05D0 05B7;;;;N;;;;; +FB2F;HEBREW LETTER ALEF WITH QAMATS;Lo;0;R;05D0 05B8;;;;N;;;;; +FB30;HEBREW LETTER ALEF WITH MAPIQ;Lo;0;R;05D0 05BC;;;;N;;;;; +FB31;HEBREW LETTER BET WITH DAGESH;Lo;0;R;05D1 05BC;;;;N;;;;; +FB32;HEBREW LETTER GIMEL WITH DAGESH;Lo;0;R;05D2 05BC;;;;N;;;;; +FB33;HEBREW LETTER DALET WITH DAGESH;Lo;0;R;05D3 05BC;;;;N;;;;; +FB34;HEBREW LETTER HE WITH MAPIQ;Lo;0;R;05D4 05BC;;;;N;;;;; +FB35;HEBREW LETTER VAV WITH DAGESH;Lo;0;R;05D5 05BC;;;;N;;;;; +FB36;HEBREW LETTER ZAYIN WITH DAGESH;Lo;0;R;05D6 05BC;;;;N;;;;; +FB38;HEBREW LETTER TET WITH DAGESH;Lo;0;R;05D8 05BC;;;;N;;;;; +FB39;HEBREW LETTER YOD WITH DAGESH;Lo;0;R;05D9 05BC;;;;N;;;;; +FB3A;HEBREW LETTER FINAL KAF WITH DAGESH;Lo;0;R;05DA 05BC;;;;N;;;;; +FB3B;HEBREW LETTER KAF WITH DAGESH;Lo;0;R;05DB 05BC;;;;N;;;;; +FB3C;HEBREW LETTER LAMED WITH DAGESH;Lo;0;R;05DC 05BC;;;;N;;;;; +FB3E;HEBREW LETTER MEM WITH DAGESH;Lo;0;R;05DE 05BC;;;;N;;;;; +FB40;HEBREW LETTER NUN WITH DAGESH;Lo;0;R;05E0 05BC;;;;N;;;;; +FB41;HEBREW LETTER SAMEKH WITH DAGESH;Lo;0;R;05E1 05BC;;;;N;;;;; +FB43;HEBREW LETTER FINAL PE WITH DAGESH;Lo;0;R;05E3 05BC;;;;N;;;;; +FB44;HEBREW LETTER PE WITH DAGESH;Lo;0;R;05E4 05BC;;;;N;;;;; +FB46;HEBREW LETTER TSADI WITH DAGESH;Lo;0;R;05E6 05BC;;;;N;;;;; +FB47;HEBREW LETTER QOF WITH DAGESH;Lo;0;R;05E7 05BC;;;;N;;;;; +FB48;HEBREW LETTER RESH WITH DAGESH;Lo;0;R;05E8 05BC;;;;N;;;;; +FB49;HEBREW LETTER SHIN WITH DAGESH;Lo;0;R;05E9 05BC;;;;N;;;;; +FB4A;HEBREW LETTER TAV WITH DAGESH;Lo;0;R;05EA 05BC;;;;N;;;;; +FB4B;HEBREW LETTER VAV WITH HOLAM;Lo;0;R;05D5 05B9;;;;N;;;;; +FB4C;HEBREW LETTER BET WITH RAFE;Lo;0;R;05D1 05BF;;;;N;;;;; +FB4D;HEBREW LETTER KAF WITH RAFE;Lo;0;R;05DB 05BF;;;;N;;;;; +FB4E;HEBREW LETTER PE WITH RAFE;Lo;0;R;05E4 05BF;;;;N;;;;; +FB4F;HEBREW LIGATURE ALEF LAMED;Lo;0;R; 05D0 05DC;;;;N;;;;; +FB50;ARABIC LETTER ALEF WASLA ISOLATED FORM;Lo;0;AL; 0671;;;;N;;;;; +FB51;ARABIC LETTER ALEF WASLA FINAL FORM;Lo;0;AL; 0671;;;;N;;;;; +FB52;ARABIC LETTER BEEH ISOLATED FORM;Lo;0;AL; 067B;;;;N;;;;; +FB53;ARABIC LETTER BEEH FINAL FORM;Lo;0;AL; 067B;;;;N;;;;; +FB54;ARABIC LETTER BEEH INITIAL FORM;Lo;0;AL; 067B;;;;N;;;;; +FB55;ARABIC LETTER BEEH MEDIAL FORM;Lo;0;AL; 067B;;;;N;;;;; +FB56;ARABIC LETTER PEH ISOLATED FORM;Lo;0;AL; 067E;;;;N;;;;; +FB57;ARABIC LETTER PEH FINAL FORM;Lo;0;AL; 067E;;;;N;;;;; +FB58;ARABIC LETTER PEH INITIAL FORM;Lo;0;AL; 067E;;;;N;;;;; +FB59;ARABIC LETTER PEH MEDIAL FORM;Lo;0;AL; 067E;;;;N;;;;; +FB5A;ARABIC LETTER BEHEH ISOLATED FORM;Lo;0;AL; 0680;;;;N;;;;; +FB5B;ARABIC LETTER BEHEH FINAL FORM;Lo;0;AL; 0680;;;;N;;;;; +FB5C;ARABIC LETTER BEHEH INITIAL FORM;Lo;0;AL; 0680;;;;N;;;;; +FB5D;ARABIC LETTER BEHEH MEDIAL FORM;Lo;0;AL; 0680;;;;N;;;;; +FB5E;ARABIC LETTER TTEHEH ISOLATED FORM;Lo;0;AL; 067A;;;;N;;;;; +FB5F;ARABIC LETTER TTEHEH FINAL FORM;Lo;0;AL; 067A;;;;N;;;;; +FB60;ARABIC LETTER TTEHEH INITIAL FORM;Lo;0;AL; 067A;;;;N;;;;; +FB61;ARABIC LETTER TTEHEH MEDIAL FORM;Lo;0;AL; 067A;;;;N;;;;; +FB62;ARABIC LETTER TEHEH ISOLATED FORM;Lo;0;AL; 067F;;;;N;;;;; +FB63;ARABIC LETTER TEHEH FINAL FORM;Lo;0;AL; 067F;;;;N;;;;; +FB64;ARABIC LETTER TEHEH INITIAL FORM;Lo;0;AL; 067F;;;;N;;;;; +FB65;ARABIC LETTER TEHEH MEDIAL FORM;Lo;0;AL; 067F;;;;N;;;;; +FB66;ARABIC LETTER TTEH ISOLATED FORM;Lo;0;AL; 0679;;;;N;;;;; +FB67;ARABIC LETTER TTEH FINAL FORM;Lo;0;AL; 0679;;;;N;;;;; +FB68;ARABIC LETTER TTEH INITIAL FORM;Lo;0;AL; 0679;;;;N;;;;; +FB69;ARABIC LETTER TTEH MEDIAL FORM;Lo;0;AL; 0679;;;;N;;;;; +FB6A;ARABIC LETTER VEH ISOLATED FORM;Lo;0;AL; 06A4;;;;N;;;;; +FB6B;ARABIC LETTER VEH FINAL FORM;Lo;0;AL; 06A4;;;;N;;;;; +FB6C;ARABIC LETTER VEH INITIAL FORM;Lo;0;AL; 06A4;;;;N;;;;; +FB6D;ARABIC LETTER VEH MEDIAL FORM;Lo;0;AL; 06A4;;;;N;;;;; +FB6E;ARABIC LETTER PEHEH ISOLATED FORM;Lo;0;AL; 06A6;;;;N;;;;; +FB6F;ARABIC LETTER PEHEH FINAL FORM;Lo;0;AL; 06A6;;;;N;;;;; +FB70;ARABIC LETTER PEHEH INITIAL FORM;Lo;0;AL; 06A6;;;;N;;;;; +FB71;ARABIC LETTER PEHEH MEDIAL FORM;Lo;0;AL; 06A6;;;;N;;;;; +FB72;ARABIC LETTER DYEH ISOLATED FORM;Lo;0;AL; 0684;;;;N;;;;; +FB73;ARABIC LETTER DYEH FINAL FORM;Lo;0;AL; 0684;;;;N;;;;; +FB74;ARABIC LETTER DYEH INITIAL FORM;Lo;0;AL; 0684;;;;N;;;;; +FB75;ARABIC LETTER DYEH MEDIAL FORM;Lo;0;AL; 0684;;;;N;;;;; +FB76;ARABIC LETTER NYEH ISOLATED FORM;Lo;0;AL; 0683;;;;N;;;;; +FB77;ARABIC LETTER NYEH FINAL FORM;Lo;0;AL; 0683;;;;N;;;;; +FB78;ARABIC LETTER NYEH INITIAL FORM;Lo;0;AL; 0683;;;;N;;;;; +FB79;ARABIC LETTER NYEH MEDIAL FORM;Lo;0;AL; 0683;;;;N;;;;; +FB7A;ARABIC LETTER TCHEH ISOLATED FORM;Lo;0;AL; 0686;;;;N;;;;; +FB7B;ARABIC LETTER TCHEH FINAL FORM;Lo;0;AL; 0686;;;;N;;;;; +FB7C;ARABIC LETTER TCHEH INITIAL FORM;Lo;0;AL; 0686;;;;N;;;;; +FB7D;ARABIC LETTER TCHEH MEDIAL FORM;Lo;0;AL; 0686;;;;N;;;;; +FB7E;ARABIC LETTER TCHEHEH ISOLATED FORM;Lo;0;AL; 0687;;;;N;;;;; +FB7F;ARABIC LETTER TCHEHEH FINAL FORM;Lo;0;AL; 0687;;;;N;;;;; +FB80;ARABIC LETTER TCHEHEH INITIAL FORM;Lo;0;AL; 0687;;;;N;;;;; +FB81;ARABIC LETTER TCHEHEH MEDIAL FORM;Lo;0;AL; 0687;;;;N;;;;; +FB82;ARABIC LETTER DDAHAL ISOLATED FORM;Lo;0;AL; 068D;;;;N;;;;; +FB83;ARABIC LETTER DDAHAL FINAL FORM;Lo;0;AL; 068D;;;;N;;;;; +FB84;ARABIC LETTER DAHAL ISOLATED FORM;Lo;0;AL; 068C;;;;N;;;;; +FB85;ARABIC LETTER DAHAL FINAL FORM;Lo;0;AL; 068C;;;;N;;;;; +FB86;ARABIC LETTER DUL ISOLATED FORM;Lo;0;AL; 068E;;;;N;;;;; +FB87;ARABIC LETTER DUL FINAL FORM;Lo;0;AL; 068E;;;;N;;;;; +FB88;ARABIC LETTER DDAL ISOLATED FORM;Lo;0;AL; 0688;;;;N;;;;; +FB89;ARABIC LETTER DDAL FINAL FORM;Lo;0;AL; 0688;;;;N;;;;; +FB8A;ARABIC LETTER JEH ISOLATED FORM;Lo;0;AL; 0698;;;;N;;;;; +FB8B;ARABIC LETTER JEH FINAL FORM;Lo;0;AL; 0698;;;;N;;;;; +FB8C;ARABIC LETTER RREH ISOLATED FORM;Lo;0;AL; 0691;;;;N;;;;; +FB8D;ARABIC LETTER RREH FINAL FORM;Lo;0;AL; 0691;;;;N;;;;; +FB8E;ARABIC LETTER KEHEH ISOLATED FORM;Lo;0;AL; 06A9;;;;N;;;;; +FB8F;ARABIC LETTER KEHEH FINAL FORM;Lo;0;AL; 06A9;;;;N;;;;; +FB90;ARABIC LETTER KEHEH INITIAL FORM;Lo;0;AL; 06A9;;;;N;;;;; +FB91;ARABIC LETTER KEHEH MEDIAL FORM;Lo;0;AL; 06A9;;;;N;;;;; +FB92;ARABIC LETTER GAF ISOLATED FORM;Lo;0;AL; 06AF;;;;N;;;;; +FB93;ARABIC LETTER GAF FINAL FORM;Lo;0;AL; 06AF;;;;N;;;;; +FB94;ARABIC LETTER GAF INITIAL FORM;Lo;0;AL; 06AF;;;;N;;;;; +FB95;ARABIC LETTER GAF MEDIAL FORM;Lo;0;AL; 06AF;;;;N;;;;; +FB96;ARABIC LETTER GUEH ISOLATED FORM;Lo;0;AL; 06B3;;;;N;;;;; +FB97;ARABIC LETTER GUEH FINAL FORM;Lo;0;AL; 06B3;;;;N;;;;; +FB98;ARABIC LETTER GUEH INITIAL FORM;Lo;0;AL; 06B3;;;;N;;;;; +FB99;ARABIC LETTER GUEH MEDIAL FORM;Lo;0;AL; 06B3;;;;N;;;;; +FB9A;ARABIC LETTER NGOEH ISOLATED FORM;Lo;0;AL; 06B1;;;;N;;;;; +FB9B;ARABIC LETTER NGOEH FINAL FORM;Lo;0;AL; 06B1;;;;N;;;;; +FB9C;ARABIC LETTER NGOEH INITIAL FORM;Lo;0;AL; 06B1;;;;N;;;;; +FB9D;ARABIC LETTER NGOEH MEDIAL FORM;Lo;0;AL; 06B1;;;;N;;;;; +FB9E;ARABIC LETTER NOON GHUNNA ISOLATED FORM;Lo;0;AL; 06BA;;;;N;;;;; +FB9F;ARABIC LETTER NOON GHUNNA FINAL FORM;Lo;0;AL; 06BA;;;;N;;;;; +FBA0;ARABIC LETTER RNOON ISOLATED FORM;Lo;0;AL; 06BB;;;;N;;;;; +FBA1;ARABIC LETTER RNOON FINAL FORM;Lo;0;AL; 06BB;;;;N;;;;; +FBA2;ARABIC LETTER RNOON INITIAL FORM;Lo;0;AL; 06BB;;;;N;;;;; +FBA3;ARABIC LETTER RNOON MEDIAL FORM;Lo;0;AL; 06BB;;;;N;;;;; +FBA4;ARABIC LETTER HEH WITH YEH ABOVE ISOLATED FORM;Lo;0;AL; 06C0;;;;N;;;;; +FBA5;ARABIC LETTER HEH WITH YEH ABOVE FINAL FORM;Lo;0;AL; 06C0;;;;N;;;;; +FBA6;ARABIC LETTER HEH GOAL ISOLATED FORM;Lo;0;AL; 06C1;;;;N;;;;; +FBA7;ARABIC LETTER HEH GOAL FINAL FORM;Lo;0;AL; 06C1;;;;N;;;;; +FBA8;ARABIC LETTER HEH GOAL INITIAL FORM;Lo;0;AL; 06C1;;;;N;;;;; +FBA9;ARABIC LETTER HEH GOAL MEDIAL FORM;Lo;0;AL; 06C1;;;;N;;;;; +FBAA;ARABIC LETTER HEH DOACHASHMEE ISOLATED FORM;Lo;0;AL; 06BE;;;;N;;;;; +FBAB;ARABIC LETTER HEH DOACHASHMEE FINAL FORM;Lo;0;AL; 06BE;;;;N;;;;; +FBAC;ARABIC LETTER HEH DOACHASHMEE INITIAL FORM;Lo;0;AL; 06BE;;;;N;;;;; +FBAD;ARABIC LETTER HEH DOACHASHMEE MEDIAL FORM;Lo;0;AL; 06BE;;;;N;;;;; +FBAE;ARABIC LETTER YEH BARREE ISOLATED FORM;Lo;0;AL; 06D2;;;;N;;;;; +FBAF;ARABIC LETTER YEH BARREE FINAL FORM;Lo;0;AL; 06D2;;;;N;;;;; +FBB0;ARABIC LETTER YEH BARREE WITH HAMZA ABOVE ISOLATED FORM;Lo;0;AL; 06D3;;;;N;;;;; +FBB1;ARABIC LETTER YEH BARREE WITH HAMZA ABOVE FINAL FORM;Lo;0;AL; 06D3;;;;N;;;;; +FBB2;ARABIC SYMBOL DOT ABOVE;Sk;0;AL;;;;;N;;;;; +FBB3;ARABIC SYMBOL DOT BELOW;Sk;0;AL;;;;;N;;;;; +FBB4;ARABIC SYMBOL TWO DOTS ABOVE;Sk;0;AL;;;;;N;;;;; +FBB5;ARABIC SYMBOL TWO DOTS BELOW;Sk;0;AL;;;;;N;;;;; +FBB6;ARABIC SYMBOL THREE DOTS ABOVE;Sk;0;AL;;;;;N;;;;; +FBB7;ARABIC SYMBOL THREE DOTS BELOW;Sk;0;AL;;;;;N;;;;; +FBB8;ARABIC SYMBOL THREE DOTS POINTING DOWNWARDS ABOVE;Sk;0;AL;;;;;N;;;;; +FBB9;ARABIC SYMBOL THREE DOTS POINTING DOWNWARDS BELOW;Sk;0;AL;;;;;N;;;;; +FBBA;ARABIC SYMBOL FOUR DOTS ABOVE;Sk;0;AL;;;;;N;;;;; +FBBB;ARABIC SYMBOL FOUR DOTS BELOW;Sk;0;AL;;;;;N;;;;; +FBBC;ARABIC SYMBOL DOUBLE VERTICAL BAR BELOW;Sk;0;AL;;;;;N;;;;; +FBBD;ARABIC SYMBOL TWO DOTS VERTICALLY ABOVE;Sk;0;AL;;;;;N;;;;; +FBBE;ARABIC SYMBOL TWO DOTS VERTICALLY BELOW;Sk;0;AL;;;;;N;;;;; +FBBF;ARABIC SYMBOL RING;Sk;0;AL;;;;;N;;;;; +FBC0;ARABIC SYMBOL SMALL TAH ABOVE;Sk;0;AL;;;;;N;;;;; +FBC1;ARABIC SYMBOL SMALL TAH BELOW;Sk;0;AL;;;;;N;;;;; +FBC2;ARABIC SYMBOL WASLA ABOVE;Sk;0;AL;;;;;N;;;;; +FBC3;ARABIC LIGATURE JALLA WA-ALAA;So;0;ON;;;;;N;;;;; +FBC4;ARABIC LIGATURE DAAMAT BARAKAATUHUM;So;0;ON;;;;;N;;;;; +FBC5;ARABIC LIGATURE RAHMATU ALLAAHI TAAALAA ALAYH;So;0;ON;;;;;N;;;;; +FBC6;ARABIC LIGATURE RAHMATU ALLAAHI ALAYHIM;So;0;ON;;;;;N;;;;; +FBC7;ARABIC LIGATURE RAHMATU ALLAAHI ALAYHIMAA;So;0;ON;;;;;N;;;;; +FBC8;ARABIC LIGATURE RAHIMAHUM ALLAAHU TAAALAA;So;0;ON;;;;;N;;;;; +FBC9;ARABIC LIGATURE RAHIMAHUMAA ALLAAH;So;0;ON;;;;;N;;;;; +FBCA;ARABIC LIGATURE RAHIMAHUMAA ALLAAHU TAAALAA;So;0;ON;;;;;N;;;;; +FBCB;ARABIC LIGATURE RADI ALLAAHU TAAALAA ANHUM;So;0;ON;;;;;N;;;;; +FBCC;ARABIC LIGATURE HAFIZAHU ALLAAH;So;0;ON;;;;;N;;;;; +FBCD;ARABIC LIGATURE HAFIZAHU ALLAAHU TAAALAA;So;0;ON;;;;;N;;;;; +FBCE;ARABIC LIGATURE HAFIZAHUM ALLAAHU TAAALAA;So;0;ON;;;;;N;;;;; +FBCF;ARABIC LIGATURE HAFIZAHUMAA ALLAAHU TAAALAA;So;0;ON;;;;;N;;;;; +FBD0;ARABIC LIGATURE SALLALLAAHU TAAALAA ALAYHI WA-SALLAM;So;0;ON;;;;;N;;;;; +FBD1;ARABIC LIGATURE AJJAL ALLAAHU FARAJAHU ASH-SHAREEF;So;0;ON;;;;;N;;;;; +FBD2;ARABIC LIGATURE ALAYHI AR-RAHMAH;So;0;ON;;;;;N;;;;; +FBD3;ARABIC LETTER NG ISOLATED FORM;Lo;0;AL; 06AD;;;;N;;;;; +FBD4;ARABIC LETTER NG FINAL FORM;Lo;0;AL; 06AD;;;;N;;;;; +FBD5;ARABIC LETTER NG INITIAL FORM;Lo;0;AL; 06AD;;;;N;;;;; +FBD6;ARABIC LETTER NG MEDIAL FORM;Lo;0;AL; 06AD;;;;N;;;;; +FBD7;ARABIC LETTER U ISOLATED FORM;Lo;0;AL; 06C7;;;;N;;;;; +FBD8;ARABIC LETTER U FINAL FORM;Lo;0;AL; 06C7;;;;N;;;;; +FBD9;ARABIC LETTER OE ISOLATED FORM;Lo;0;AL; 06C6;;;;N;;;;; +FBDA;ARABIC LETTER OE FINAL FORM;Lo;0;AL; 06C6;;;;N;;;;; +FBDB;ARABIC LETTER YU ISOLATED FORM;Lo;0;AL; 06C8;;;;N;;;;; +FBDC;ARABIC LETTER YU FINAL FORM;Lo;0;AL; 06C8;;;;N;;;;; +FBDD;ARABIC LETTER U WITH HAMZA ABOVE ISOLATED FORM;Lo;0;AL; 0677;;;;N;;;;; +FBDE;ARABIC LETTER VE ISOLATED FORM;Lo;0;AL; 06CB;;;;N;;;;; +FBDF;ARABIC LETTER VE FINAL FORM;Lo;0;AL; 06CB;;;;N;;;;; +FBE0;ARABIC LETTER KIRGHIZ OE ISOLATED FORM;Lo;0;AL; 06C5;;;;N;;;;; +FBE1;ARABIC LETTER KIRGHIZ OE FINAL FORM;Lo;0;AL; 06C5;;;;N;;;;; +FBE2;ARABIC LETTER KIRGHIZ YU ISOLATED FORM;Lo;0;AL; 06C9;;;;N;;;;; +FBE3;ARABIC LETTER KIRGHIZ YU FINAL FORM;Lo;0;AL; 06C9;;;;N;;;;; +FBE4;ARABIC LETTER E ISOLATED FORM;Lo;0;AL; 06D0;;;;N;;;;; +FBE5;ARABIC LETTER E FINAL FORM;Lo;0;AL; 06D0;;;;N;;;;; +FBE6;ARABIC LETTER E INITIAL FORM;Lo;0;AL; 06D0;;;;N;;;;; +FBE7;ARABIC LETTER E MEDIAL FORM;Lo;0;AL; 06D0;;;;N;;;;; +FBE8;ARABIC LETTER UIGHUR KAZAKH KIRGHIZ ALEF MAKSURA INITIAL FORM;Lo;0;AL; 0649;;;;N;;;;; +FBE9;ARABIC LETTER UIGHUR KAZAKH KIRGHIZ ALEF MAKSURA MEDIAL FORM;Lo;0;AL; 0649;;;;N;;;;; +FBEA;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ALEF ISOLATED FORM;Lo;0;AL; 0626 0627;;;;N;;;;; +FBEB;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ALEF FINAL FORM;Lo;0;AL; 0626 0627;;;;N;;;;; +FBEC;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH AE ISOLATED FORM;Lo;0;AL; 0626 06D5;;;;N;;;;; +FBED;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH AE FINAL FORM;Lo;0;AL; 0626 06D5;;;;N;;;;; +FBEE;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH WAW ISOLATED FORM;Lo;0;AL; 0626 0648;;;;N;;;;; +FBEF;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH WAW FINAL FORM;Lo;0;AL; 0626 0648;;;;N;;;;; +FBF0;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH U ISOLATED FORM;Lo;0;AL; 0626 06C7;;;;N;;;;; +FBF1;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH U FINAL FORM;Lo;0;AL; 0626 06C7;;;;N;;;;; +FBF2;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH OE ISOLATED FORM;Lo;0;AL; 0626 06C6;;;;N;;;;; +FBF3;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH OE FINAL FORM;Lo;0;AL; 0626 06C6;;;;N;;;;; +FBF4;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH YU ISOLATED FORM;Lo;0;AL; 0626 06C8;;;;N;;;;; +FBF5;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH YU FINAL FORM;Lo;0;AL; 0626 06C8;;;;N;;;;; +FBF6;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH E ISOLATED FORM;Lo;0;AL; 0626 06D0;;;;N;;;;; +FBF7;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH E FINAL FORM;Lo;0;AL; 0626 06D0;;;;N;;;;; +FBF8;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH E INITIAL FORM;Lo;0;AL; 0626 06D0;;;;N;;;;; +FBF9;ARABIC LIGATURE UIGHUR KIRGHIZ YEH WITH HAMZA ABOVE WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL; 0626 0649;;;;N;;;;; +FBFA;ARABIC LIGATURE UIGHUR KIRGHIZ YEH WITH HAMZA ABOVE WITH ALEF MAKSURA FINAL FORM;Lo;0;AL; 0626 0649;;;;N;;;;; +FBFB;ARABIC LIGATURE UIGHUR KIRGHIZ YEH WITH HAMZA ABOVE WITH ALEF MAKSURA INITIAL FORM;Lo;0;AL; 0626 0649;;;;N;;;;; +FBFC;ARABIC LETTER FARSI YEH ISOLATED FORM;Lo;0;AL; 06CC;;;;N;;;;; +FBFD;ARABIC LETTER FARSI YEH FINAL FORM;Lo;0;AL; 06CC;;;;N;;;;; +FBFE;ARABIC LETTER FARSI YEH INITIAL FORM;Lo;0;AL; 06CC;;;;N;;;;; +FBFF;ARABIC LETTER FARSI YEH MEDIAL FORM;Lo;0;AL; 06CC;;;;N;;;;; +FC00;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH JEEM ISOLATED FORM;Lo;0;AL; 0626 062C;;;;N;;;;; +FC01;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH HAH ISOLATED FORM;Lo;0;AL; 0626 062D;;;;N;;;;; +FC02;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH MEEM ISOLATED FORM;Lo;0;AL; 0626 0645;;;;N;;;;; +FC03;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL; 0626 0649;;;;N;;;;; +FC04;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH YEH ISOLATED FORM;Lo;0;AL; 0626 064A;;;;N;;;;; +FC05;ARABIC LIGATURE BEH WITH JEEM ISOLATED FORM;Lo;0;AL; 0628 062C;;;;N;;;;; +FC06;ARABIC LIGATURE BEH WITH HAH ISOLATED FORM;Lo;0;AL; 0628 062D;;;;N;;;;; +FC07;ARABIC LIGATURE BEH WITH KHAH ISOLATED FORM;Lo;0;AL; 0628 062E;;;;N;;;;; +FC08;ARABIC LIGATURE BEH WITH MEEM ISOLATED FORM;Lo;0;AL; 0628 0645;;;;N;;;;; +FC09;ARABIC LIGATURE BEH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL; 0628 0649;;;;N;;;;; +FC0A;ARABIC LIGATURE BEH WITH YEH ISOLATED FORM;Lo;0;AL; 0628 064A;;;;N;;;;; +FC0B;ARABIC LIGATURE TEH WITH JEEM ISOLATED FORM;Lo;0;AL; 062A 062C;;;;N;;;;; +FC0C;ARABIC LIGATURE TEH WITH HAH ISOLATED FORM;Lo;0;AL; 062A 062D;;;;N;;;;; +FC0D;ARABIC LIGATURE TEH WITH KHAH ISOLATED FORM;Lo;0;AL; 062A 062E;;;;N;;;;; +FC0E;ARABIC LIGATURE TEH WITH MEEM ISOLATED FORM;Lo;0;AL; 062A 0645;;;;N;;;;; +FC0F;ARABIC LIGATURE TEH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL; 062A 0649;;;;N;;;;; +FC10;ARABIC LIGATURE TEH WITH YEH ISOLATED FORM;Lo;0;AL; 062A 064A;;;;N;;;;; +FC11;ARABIC LIGATURE THEH WITH JEEM ISOLATED FORM;Lo;0;AL; 062B 062C;;;;N;;;;; +FC12;ARABIC LIGATURE THEH WITH MEEM ISOLATED FORM;Lo;0;AL; 062B 0645;;;;N;;;;; +FC13;ARABIC LIGATURE THEH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL; 062B 0649;;;;N;;;;; +FC14;ARABIC LIGATURE THEH WITH YEH ISOLATED FORM;Lo;0;AL; 062B 064A;;;;N;;;;; +FC15;ARABIC LIGATURE JEEM WITH HAH ISOLATED FORM;Lo;0;AL; 062C 062D;;;;N;;;;; +FC16;ARABIC LIGATURE JEEM WITH MEEM ISOLATED FORM;Lo;0;AL; 062C 0645;;;;N;;;;; +FC17;ARABIC LIGATURE HAH WITH JEEM ISOLATED FORM;Lo;0;AL; 062D 062C;;;;N;;;;; +FC18;ARABIC LIGATURE HAH WITH MEEM ISOLATED FORM;Lo;0;AL; 062D 0645;;;;N;;;;; +FC19;ARABIC LIGATURE KHAH WITH JEEM ISOLATED FORM;Lo;0;AL; 062E 062C;;;;N;;;;; +FC1A;ARABIC LIGATURE KHAH WITH HAH ISOLATED FORM;Lo;0;AL; 062E 062D;;;;N;;;;; +FC1B;ARABIC LIGATURE KHAH WITH MEEM ISOLATED FORM;Lo;0;AL; 062E 0645;;;;N;;;;; +FC1C;ARABIC LIGATURE SEEN WITH JEEM ISOLATED FORM;Lo;0;AL; 0633 062C;;;;N;;;;; +FC1D;ARABIC LIGATURE SEEN WITH HAH ISOLATED FORM;Lo;0;AL; 0633 062D;;;;N;;;;; +FC1E;ARABIC LIGATURE SEEN WITH KHAH ISOLATED FORM;Lo;0;AL; 0633 062E;;;;N;;;;; +FC1F;ARABIC LIGATURE SEEN WITH MEEM ISOLATED FORM;Lo;0;AL; 0633 0645;;;;N;;;;; +FC20;ARABIC LIGATURE SAD WITH HAH ISOLATED FORM;Lo;0;AL; 0635 062D;;;;N;;;;; +FC21;ARABIC LIGATURE SAD WITH MEEM ISOLATED FORM;Lo;0;AL; 0635 0645;;;;N;;;;; +FC22;ARABIC LIGATURE DAD WITH JEEM ISOLATED FORM;Lo;0;AL; 0636 062C;;;;N;;;;; +FC23;ARABIC LIGATURE DAD WITH HAH ISOLATED FORM;Lo;0;AL; 0636 062D;;;;N;;;;; +FC24;ARABIC LIGATURE DAD WITH KHAH ISOLATED FORM;Lo;0;AL; 0636 062E;;;;N;;;;; +FC25;ARABIC LIGATURE DAD WITH MEEM ISOLATED FORM;Lo;0;AL; 0636 0645;;;;N;;;;; +FC26;ARABIC LIGATURE TAH WITH HAH ISOLATED FORM;Lo;0;AL; 0637 062D;;;;N;;;;; +FC27;ARABIC LIGATURE TAH WITH MEEM ISOLATED FORM;Lo;0;AL; 0637 0645;;;;N;;;;; +FC28;ARABIC LIGATURE ZAH WITH MEEM ISOLATED FORM;Lo;0;AL; 0638 0645;;;;N;;;;; +FC29;ARABIC LIGATURE AIN WITH JEEM ISOLATED FORM;Lo;0;AL; 0639 062C;;;;N;;;;; +FC2A;ARABIC LIGATURE AIN WITH MEEM ISOLATED FORM;Lo;0;AL; 0639 0645;;;;N;;;;; +FC2B;ARABIC LIGATURE GHAIN WITH JEEM ISOLATED FORM;Lo;0;AL; 063A 062C;;;;N;;;;; +FC2C;ARABIC LIGATURE GHAIN WITH MEEM ISOLATED FORM;Lo;0;AL; 063A 0645;;;;N;;;;; +FC2D;ARABIC LIGATURE FEH WITH JEEM ISOLATED FORM;Lo;0;AL; 0641 062C;;;;N;;;;; +FC2E;ARABIC LIGATURE FEH WITH HAH ISOLATED FORM;Lo;0;AL; 0641 062D;;;;N;;;;; +FC2F;ARABIC LIGATURE FEH WITH KHAH ISOLATED FORM;Lo;0;AL; 0641 062E;;;;N;;;;; +FC30;ARABIC LIGATURE FEH WITH MEEM ISOLATED FORM;Lo;0;AL; 0641 0645;;;;N;;;;; +FC31;ARABIC LIGATURE FEH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL; 0641 0649;;;;N;;;;; +FC32;ARABIC LIGATURE FEH WITH YEH ISOLATED FORM;Lo;0;AL; 0641 064A;;;;N;;;;; +FC33;ARABIC LIGATURE QAF WITH HAH ISOLATED FORM;Lo;0;AL; 0642 062D;;;;N;;;;; +FC34;ARABIC LIGATURE QAF WITH MEEM ISOLATED FORM;Lo;0;AL; 0642 0645;;;;N;;;;; +FC35;ARABIC LIGATURE QAF WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL; 0642 0649;;;;N;;;;; +FC36;ARABIC LIGATURE QAF WITH YEH ISOLATED FORM;Lo;0;AL; 0642 064A;;;;N;;;;; +FC37;ARABIC LIGATURE KAF WITH ALEF ISOLATED FORM;Lo;0;AL; 0643 0627;;;;N;;;;; +FC38;ARABIC LIGATURE KAF WITH JEEM ISOLATED FORM;Lo;0;AL; 0643 062C;;;;N;;;;; +FC39;ARABIC LIGATURE KAF WITH HAH ISOLATED FORM;Lo;0;AL; 0643 062D;;;;N;;;;; +FC3A;ARABIC LIGATURE KAF WITH KHAH ISOLATED FORM;Lo;0;AL; 0643 062E;;;;N;;;;; +FC3B;ARABIC LIGATURE KAF WITH LAM ISOLATED FORM;Lo;0;AL; 0643 0644;;;;N;;;;; +FC3C;ARABIC LIGATURE KAF WITH MEEM ISOLATED FORM;Lo;0;AL; 0643 0645;;;;N;;;;; +FC3D;ARABIC LIGATURE KAF WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL; 0643 0649;;;;N;;;;; +FC3E;ARABIC LIGATURE KAF WITH YEH ISOLATED FORM;Lo;0;AL; 0643 064A;;;;N;;;;; +FC3F;ARABIC LIGATURE LAM WITH JEEM ISOLATED FORM;Lo;0;AL; 0644 062C;;;;N;;;;; +FC40;ARABIC LIGATURE LAM WITH HAH ISOLATED FORM;Lo;0;AL; 0644 062D;;;;N;;;;; +FC41;ARABIC LIGATURE LAM WITH KHAH ISOLATED FORM;Lo;0;AL; 0644 062E;;;;N;;;;; +FC42;ARABIC LIGATURE LAM WITH MEEM ISOLATED FORM;Lo;0;AL; 0644 0645;;;;N;;;;; +FC43;ARABIC LIGATURE LAM WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL; 0644 0649;;;;N;;;;; +FC44;ARABIC LIGATURE LAM WITH YEH ISOLATED FORM;Lo;0;AL; 0644 064A;;;;N;;;;; +FC45;ARABIC LIGATURE MEEM WITH JEEM ISOLATED FORM;Lo;0;AL; 0645 062C;;;;N;;;;; +FC46;ARABIC LIGATURE MEEM WITH HAH ISOLATED FORM;Lo;0;AL; 0645 062D;;;;N;;;;; +FC47;ARABIC LIGATURE MEEM WITH KHAH ISOLATED FORM;Lo;0;AL; 0645 062E;;;;N;;;;; +FC48;ARABIC LIGATURE MEEM WITH MEEM ISOLATED FORM;Lo;0;AL; 0645 0645;;;;N;;;;; +FC49;ARABIC LIGATURE MEEM WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL; 0645 0649;;;;N;;;;; +FC4A;ARABIC LIGATURE MEEM WITH YEH ISOLATED FORM;Lo;0;AL; 0645 064A;;;;N;;;;; +FC4B;ARABIC LIGATURE NOON WITH JEEM ISOLATED FORM;Lo;0;AL; 0646 062C;;;;N;;;;; +FC4C;ARABIC LIGATURE NOON WITH HAH ISOLATED FORM;Lo;0;AL; 0646 062D;;;;N;;;;; +FC4D;ARABIC LIGATURE NOON WITH KHAH ISOLATED FORM;Lo;0;AL; 0646 062E;;;;N;;;;; +FC4E;ARABIC LIGATURE NOON WITH MEEM ISOLATED FORM;Lo;0;AL; 0646 0645;;;;N;;;;; +FC4F;ARABIC LIGATURE NOON WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL; 0646 0649;;;;N;;;;; +FC50;ARABIC LIGATURE NOON WITH YEH ISOLATED FORM;Lo;0;AL; 0646 064A;;;;N;;;;; +FC51;ARABIC LIGATURE HEH WITH JEEM ISOLATED FORM;Lo;0;AL; 0647 062C;;;;N;;;;; +FC52;ARABIC LIGATURE HEH WITH MEEM ISOLATED FORM;Lo;0;AL; 0647 0645;;;;N;;;;; +FC53;ARABIC LIGATURE HEH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL; 0647 0649;;;;N;;;;; +FC54;ARABIC LIGATURE HEH WITH YEH ISOLATED FORM;Lo;0;AL; 0647 064A;;;;N;;;;; +FC55;ARABIC LIGATURE YEH WITH JEEM ISOLATED FORM;Lo;0;AL; 064A 062C;;;;N;;;;; +FC56;ARABIC LIGATURE YEH WITH HAH ISOLATED FORM;Lo;0;AL; 064A 062D;;;;N;;;;; +FC57;ARABIC LIGATURE YEH WITH KHAH ISOLATED FORM;Lo;0;AL; 064A 062E;;;;N;;;;; +FC58;ARABIC LIGATURE YEH WITH MEEM ISOLATED FORM;Lo;0;AL; 064A 0645;;;;N;;;;; +FC59;ARABIC LIGATURE YEH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL; 064A 0649;;;;N;;;;; +FC5A;ARABIC LIGATURE YEH WITH YEH ISOLATED FORM;Lo;0;AL; 064A 064A;;;;N;;;;; +FC5B;ARABIC LIGATURE THAL WITH SUPERSCRIPT ALEF ISOLATED FORM;Lo;0;AL; 0630 0670;;;;N;;;;; +FC5C;ARABIC LIGATURE REH WITH SUPERSCRIPT ALEF ISOLATED FORM;Lo;0;AL; 0631 0670;;;;N;;;;; +FC5D;ARABIC LIGATURE ALEF MAKSURA WITH SUPERSCRIPT ALEF ISOLATED FORM;Lo;0;AL; 0649 0670;;;;N;;;;; +FC5E;ARABIC LIGATURE SHADDA WITH DAMMATAN ISOLATED FORM;Lo;0;AL; 0020 064C 0651;;;;N;;;;; +FC5F;ARABIC LIGATURE SHADDA WITH KASRATAN ISOLATED FORM;Lo;0;AL; 0020 064D 0651;;;;N;;;;; +FC60;ARABIC LIGATURE SHADDA WITH FATHA ISOLATED FORM;Lo;0;AL; 0020 064E 0651;;;;N;;;;; +FC61;ARABIC LIGATURE SHADDA WITH DAMMA ISOLATED FORM;Lo;0;AL; 0020 064F 0651;;;;N;;;;; +FC62;ARABIC LIGATURE SHADDA WITH KASRA ISOLATED FORM;Lo;0;AL; 0020 0650 0651;;;;N;;;;; +FC63;ARABIC LIGATURE SHADDA WITH SUPERSCRIPT ALEF ISOLATED FORM;Lo;0;AL; 0020 0651 0670;;;;N;;;;; +FC64;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH REH FINAL FORM;Lo;0;AL; 0626 0631;;;;N;;;;; +FC65;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ZAIN FINAL FORM;Lo;0;AL; 0626 0632;;;;N;;;;; +FC66;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH MEEM FINAL FORM;Lo;0;AL; 0626 0645;;;;N;;;;; +FC67;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH NOON FINAL FORM;Lo;0;AL; 0626 0646;;;;N;;;;; +FC68;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ALEF MAKSURA FINAL FORM;Lo;0;AL; 0626 0649;;;;N;;;;; +FC69;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH YEH FINAL FORM;Lo;0;AL; 0626 064A;;;;N;;;;; +FC6A;ARABIC LIGATURE BEH WITH REH FINAL FORM;Lo;0;AL; 0628 0631;;;;N;;;;; +FC6B;ARABIC LIGATURE BEH WITH ZAIN FINAL FORM;Lo;0;AL; 0628 0632;;;;N;;;;; +FC6C;ARABIC LIGATURE BEH WITH MEEM FINAL FORM;Lo;0;AL; 0628 0645;;;;N;;;;; +FC6D;ARABIC LIGATURE BEH WITH NOON FINAL FORM;Lo;0;AL; 0628 0646;;;;N;;;;; +FC6E;ARABIC LIGATURE BEH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL; 0628 0649;;;;N;;;;; +FC6F;ARABIC LIGATURE BEH WITH YEH FINAL FORM;Lo;0;AL; 0628 064A;;;;N;;;;; +FC70;ARABIC LIGATURE TEH WITH REH FINAL FORM;Lo;0;AL; 062A 0631;;;;N;;;;; +FC71;ARABIC LIGATURE TEH WITH ZAIN FINAL FORM;Lo;0;AL; 062A 0632;;;;N;;;;; +FC72;ARABIC LIGATURE TEH WITH MEEM FINAL FORM;Lo;0;AL; 062A 0645;;;;N;;;;; +FC73;ARABIC LIGATURE TEH WITH NOON FINAL FORM;Lo;0;AL; 062A 0646;;;;N;;;;; +FC74;ARABIC LIGATURE TEH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL; 062A 0649;;;;N;;;;; +FC75;ARABIC LIGATURE TEH WITH YEH FINAL FORM;Lo;0;AL; 062A 064A;;;;N;;;;; +FC76;ARABIC LIGATURE THEH WITH REH FINAL FORM;Lo;0;AL; 062B 0631;;;;N;;;;; +FC77;ARABIC LIGATURE THEH WITH ZAIN FINAL FORM;Lo;0;AL; 062B 0632;;;;N;;;;; +FC78;ARABIC LIGATURE THEH WITH MEEM FINAL FORM;Lo;0;AL; 062B 0645;;;;N;;;;; +FC79;ARABIC LIGATURE THEH WITH NOON FINAL FORM;Lo;0;AL; 062B 0646;;;;N;;;;; +FC7A;ARABIC LIGATURE THEH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL; 062B 0649;;;;N;;;;; +FC7B;ARABIC LIGATURE THEH WITH YEH FINAL FORM;Lo;0;AL; 062B 064A;;;;N;;;;; +FC7C;ARABIC LIGATURE FEH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL; 0641 0649;;;;N;;;;; +FC7D;ARABIC LIGATURE FEH WITH YEH FINAL FORM;Lo;0;AL; 0641 064A;;;;N;;;;; +FC7E;ARABIC LIGATURE QAF WITH ALEF MAKSURA FINAL FORM;Lo;0;AL; 0642 0649;;;;N;;;;; +FC7F;ARABIC LIGATURE QAF WITH YEH FINAL FORM;Lo;0;AL; 0642 064A;;;;N;;;;; +FC80;ARABIC LIGATURE KAF WITH ALEF FINAL FORM;Lo;0;AL; 0643 0627;;;;N;;;;; +FC81;ARABIC LIGATURE KAF WITH LAM FINAL FORM;Lo;0;AL; 0643 0644;;;;N;;;;; +FC82;ARABIC LIGATURE KAF WITH MEEM FINAL FORM;Lo;0;AL; 0643 0645;;;;N;;;;; +FC83;ARABIC LIGATURE KAF WITH ALEF MAKSURA FINAL FORM;Lo;0;AL; 0643 0649;;;;N;;;;; +FC84;ARABIC LIGATURE KAF WITH YEH FINAL FORM;Lo;0;AL; 0643 064A;;;;N;;;;; +FC85;ARABIC LIGATURE LAM WITH MEEM FINAL FORM;Lo;0;AL; 0644 0645;;;;N;;;;; +FC86;ARABIC LIGATURE LAM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL; 0644 0649;;;;N;;;;; +FC87;ARABIC LIGATURE LAM WITH YEH FINAL FORM;Lo;0;AL; 0644 064A;;;;N;;;;; +FC88;ARABIC LIGATURE MEEM WITH ALEF FINAL FORM;Lo;0;AL; 0645 0627;;;;N;;;;; +FC89;ARABIC LIGATURE MEEM WITH MEEM FINAL FORM;Lo;0;AL; 0645 0645;;;;N;;;;; +FC8A;ARABIC LIGATURE NOON WITH REH FINAL FORM;Lo;0;AL; 0646 0631;;;;N;;;;; +FC8B;ARABIC LIGATURE NOON WITH ZAIN FINAL FORM;Lo;0;AL; 0646 0632;;;;N;;;;; +FC8C;ARABIC LIGATURE NOON WITH MEEM FINAL FORM;Lo;0;AL; 0646 0645;;;;N;;;;; +FC8D;ARABIC LIGATURE NOON WITH NOON FINAL FORM;Lo;0;AL; 0646 0646;;;;N;;;;; +FC8E;ARABIC LIGATURE NOON WITH ALEF MAKSURA FINAL FORM;Lo;0;AL; 0646 0649;;;;N;;;;; +FC8F;ARABIC LIGATURE NOON WITH YEH FINAL FORM;Lo;0;AL; 0646 064A;;;;N;;;;; +FC90;ARABIC LIGATURE ALEF MAKSURA WITH SUPERSCRIPT ALEF FINAL FORM;Lo;0;AL; 0649 0670;;;;N;;;;; +FC91;ARABIC LIGATURE YEH WITH REH FINAL FORM;Lo;0;AL; 064A 0631;;;;N;;;;; +FC92;ARABIC LIGATURE YEH WITH ZAIN FINAL FORM;Lo;0;AL; 064A 0632;;;;N;;;;; +FC93;ARABIC LIGATURE YEH WITH MEEM FINAL FORM;Lo;0;AL; 064A 0645;;;;N;;;;; +FC94;ARABIC LIGATURE YEH WITH NOON FINAL FORM;Lo;0;AL; 064A 0646;;;;N;;;;; +FC95;ARABIC LIGATURE YEH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL; 064A 0649;;;;N;;;;; +FC96;ARABIC LIGATURE YEH WITH YEH FINAL FORM;Lo;0;AL; 064A 064A;;;;N;;;;; +FC97;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH JEEM INITIAL FORM;Lo;0;AL; 0626 062C;;;;N;;;;; +FC98;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH HAH INITIAL FORM;Lo;0;AL; 0626 062D;;;;N;;;;; +FC99;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH KHAH INITIAL FORM;Lo;0;AL; 0626 062E;;;;N;;;;; +FC9A;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH MEEM INITIAL FORM;Lo;0;AL; 0626 0645;;;;N;;;;; +FC9B;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH HEH INITIAL FORM;Lo;0;AL; 0626 0647;;;;N;;;;; +FC9C;ARABIC LIGATURE BEH WITH JEEM INITIAL FORM;Lo;0;AL; 0628 062C;;;;N;;;;; +FC9D;ARABIC LIGATURE BEH WITH HAH INITIAL FORM;Lo;0;AL; 0628 062D;;;;N;;;;; +FC9E;ARABIC LIGATURE BEH WITH KHAH INITIAL FORM;Lo;0;AL; 0628 062E;;;;N;;;;; +FC9F;ARABIC LIGATURE BEH WITH MEEM INITIAL FORM;Lo;0;AL; 0628 0645;;;;N;;;;; +FCA0;ARABIC LIGATURE BEH WITH HEH INITIAL FORM;Lo;0;AL; 0628 0647;;;;N;;;;; +FCA1;ARABIC LIGATURE TEH WITH JEEM INITIAL FORM;Lo;0;AL; 062A 062C;;;;N;;;;; +FCA2;ARABIC LIGATURE TEH WITH HAH INITIAL FORM;Lo;0;AL; 062A 062D;;;;N;;;;; +FCA3;ARABIC LIGATURE TEH WITH KHAH INITIAL FORM;Lo;0;AL; 062A 062E;;;;N;;;;; +FCA4;ARABIC LIGATURE TEH WITH MEEM INITIAL FORM;Lo;0;AL; 062A 0645;;;;N;;;;; +FCA5;ARABIC LIGATURE TEH WITH HEH INITIAL FORM;Lo;0;AL; 062A 0647;;;;N;;;;; +FCA6;ARABIC LIGATURE THEH WITH MEEM INITIAL FORM;Lo;0;AL; 062B 0645;;;;N;;;;; +FCA7;ARABIC LIGATURE JEEM WITH HAH INITIAL FORM;Lo;0;AL; 062C 062D;;;;N;;;;; +FCA8;ARABIC LIGATURE JEEM WITH MEEM INITIAL FORM;Lo;0;AL; 062C 0645;;;;N;;;;; +FCA9;ARABIC LIGATURE HAH WITH JEEM INITIAL FORM;Lo;0;AL; 062D 062C;;;;N;;;;; +FCAA;ARABIC LIGATURE HAH WITH MEEM INITIAL FORM;Lo;0;AL; 062D 0645;;;;N;;;;; +FCAB;ARABIC LIGATURE KHAH WITH JEEM INITIAL FORM;Lo;0;AL; 062E 062C;;;;N;;;;; +FCAC;ARABIC LIGATURE KHAH WITH MEEM INITIAL FORM;Lo;0;AL; 062E 0645;;;;N;;;;; +FCAD;ARABIC LIGATURE SEEN WITH JEEM INITIAL FORM;Lo;0;AL; 0633 062C;;;;N;;;;; +FCAE;ARABIC LIGATURE SEEN WITH HAH INITIAL FORM;Lo;0;AL; 0633 062D;;;;N;;;;; +FCAF;ARABIC LIGATURE SEEN WITH KHAH INITIAL FORM;Lo;0;AL; 0633 062E;;;;N;;;;; +FCB0;ARABIC LIGATURE SEEN WITH MEEM INITIAL FORM;Lo;0;AL; 0633 0645;;;;N;;;;; +FCB1;ARABIC LIGATURE SAD WITH HAH INITIAL FORM;Lo;0;AL; 0635 062D;;;;N;;;;; +FCB2;ARABIC LIGATURE SAD WITH KHAH INITIAL FORM;Lo;0;AL; 0635 062E;;;;N;;;;; +FCB3;ARABIC LIGATURE SAD WITH MEEM INITIAL FORM;Lo;0;AL; 0635 0645;;;;N;;;;; +FCB4;ARABIC LIGATURE DAD WITH JEEM INITIAL FORM;Lo;0;AL; 0636 062C;;;;N;;;;; +FCB5;ARABIC LIGATURE DAD WITH HAH INITIAL FORM;Lo;0;AL; 0636 062D;;;;N;;;;; +FCB6;ARABIC LIGATURE DAD WITH KHAH INITIAL FORM;Lo;0;AL; 0636 062E;;;;N;;;;; +FCB7;ARABIC LIGATURE DAD WITH MEEM INITIAL FORM;Lo;0;AL; 0636 0645;;;;N;;;;; +FCB8;ARABIC LIGATURE TAH WITH HAH INITIAL FORM;Lo;0;AL; 0637 062D;;;;N;;;;; +FCB9;ARABIC LIGATURE ZAH WITH MEEM INITIAL FORM;Lo;0;AL; 0638 0645;;;;N;;;;; +FCBA;ARABIC LIGATURE AIN WITH JEEM INITIAL FORM;Lo;0;AL; 0639 062C;;;;N;;;;; +FCBB;ARABIC LIGATURE AIN WITH MEEM INITIAL FORM;Lo;0;AL; 0639 0645;;;;N;;;;; +FCBC;ARABIC LIGATURE GHAIN WITH JEEM INITIAL FORM;Lo;0;AL; 063A 062C;;;;N;;;;; +FCBD;ARABIC LIGATURE GHAIN WITH MEEM INITIAL FORM;Lo;0;AL; 063A 0645;;;;N;;;;; +FCBE;ARABIC LIGATURE FEH WITH JEEM INITIAL FORM;Lo;0;AL; 0641 062C;;;;N;;;;; +FCBF;ARABIC LIGATURE FEH WITH HAH INITIAL FORM;Lo;0;AL; 0641 062D;;;;N;;;;; +FCC0;ARABIC LIGATURE FEH WITH KHAH INITIAL FORM;Lo;0;AL; 0641 062E;;;;N;;;;; +FCC1;ARABIC LIGATURE FEH WITH MEEM INITIAL FORM;Lo;0;AL; 0641 0645;;;;N;;;;; +FCC2;ARABIC LIGATURE QAF WITH HAH INITIAL FORM;Lo;0;AL; 0642 062D;;;;N;;;;; +FCC3;ARABIC LIGATURE QAF WITH MEEM INITIAL FORM;Lo;0;AL; 0642 0645;;;;N;;;;; +FCC4;ARABIC LIGATURE KAF WITH JEEM INITIAL FORM;Lo;0;AL; 0643 062C;;;;N;;;;; +FCC5;ARABIC LIGATURE KAF WITH HAH INITIAL FORM;Lo;0;AL; 0643 062D;;;;N;;;;; +FCC6;ARABIC LIGATURE KAF WITH KHAH INITIAL FORM;Lo;0;AL; 0643 062E;;;;N;;;;; +FCC7;ARABIC LIGATURE KAF WITH LAM INITIAL FORM;Lo;0;AL; 0643 0644;;;;N;;;;; +FCC8;ARABIC LIGATURE KAF WITH MEEM INITIAL FORM;Lo;0;AL; 0643 0645;;;;N;;;;; +FCC9;ARABIC LIGATURE LAM WITH JEEM INITIAL FORM;Lo;0;AL; 0644 062C;;;;N;;;;; +FCCA;ARABIC LIGATURE LAM WITH HAH INITIAL FORM;Lo;0;AL; 0644 062D;;;;N;;;;; +FCCB;ARABIC LIGATURE LAM WITH KHAH INITIAL FORM;Lo;0;AL; 0644 062E;;;;N;;;;; +FCCC;ARABIC LIGATURE LAM WITH MEEM INITIAL FORM;Lo;0;AL; 0644 0645;;;;N;;;;; +FCCD;ARABIC LIGATURE LAM WITH HEH INITIAL FORM;Lo;0;AL; 0644 0647;;;;N;;;;; +FCCE;ARABIC LIGATURE MEEM WITH JEEM INITIAL FORM;Lo;0;AL; 0645 062C;;;;N;;;;; +FCCF;ARABIC LIGATURE MEEM WITH HAH INITIAL FORM;Lo;0;AL; 0645 062D;;;;N;;;;; +FCD0;ARABIC LIGATURE MEEM WITH KHAH INITIAL FORM;Lo;0;AL; 0645 062E;;;;N;;;;; +FCD1;ARABIC LIGATURE MEEM WITH MEEM INITIAL FORM;Lo;0;AL; 0645 0645;;;;N;;;;; +FCD2;ARABIC LIGATURE NOON WITH JEEM INITIAL FORM;Lo;0;AL; 0646 062C;;;;N;;;;; +FCD3;ARABIC LIGATURE NOON WITH HAH INITIAL FORM;Lo;0;AL; 0646 062D;;;;N;;;;; +FCD4;ARABIC LIGATURE NOON WITH KHAH INITIAL FORM;Lo;0;AL; 0646 062E;;;;N;;;;; +FCD5;ARABIC LIGATURE NOON WITH MEEM INITIAL FORM;Lo;0;AL; 0646 0645;;;;N;;;;; +FCD6;ARABIC LIGATURE NOON WITH HEH INITIAL FORM;Lo;0;AL; 0646 0647;;;;N;;;;; +FCD7;ARABIC LIGATURE HEH WITH JEEM INITIAL FORM;Lo;0;AL; 0647 062C;;;;N;;;;; +FCD8;ARABIC LIGATURE HEH WITH MEEM INITIAL FORM;Lo;0;AL; 0647 0645;;;;N;;;;; +FCD9;ARABIC LIGATURE HEH WITH SUPERSCRIPT ALEF INITIAL FORM;Lo;0;AL; 0647 0670;;;;N;;;;; +FCDA;ARABIC LIGATURE YEH WITH JEEM INITIAL FORM;Lo;0;AL; 064A 062C;;;;N;;;;; +FCDB;ARABIC LIGATURE YEH WITH HAH INITIAL FORM;Lo;0;AL; 064A 062D;;;;N;;;;; +FCDC;ARABIC LIGATURE YEH WITH KHAH INITIAL FORM;Lo;0;AL; 064A 062E;;;;N;;;;; +FCDD;ARABIC LIGATURE YEH WITH MEEM INITIAL FORM;Lo;0;AL; 064A 0645;;;;N;;;;; +FCDE;ARABIC LIGATURE YEH WITH HEH INITIAL FORM;Lo;0;AL; 064A 0647;;;;N;;;;; +FCDF;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH MEEM MEDIAL FORM;Lo;0;AL; 0626 0645;;;;N;;;;; +FCE0;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH HEH MEDIAL FORM;Lo;0;AL; 0626 0647;;;;N;;;;; +FCE1;ARABIC LIGATURE BEH WITH MEEM MEDIAL FORM;Lo;0;AL; 0628 0645;;;;N;;;;; +FCE2;ARABIC LIGATURE BEH WITH HEH MEDIAL FORM;Lo;0;AL; 0628 0647;;;;N;;;;; +FCE3;ARABIC LIGATURE TEH WITH MEEM MEDIAL FORM;Lo;0;AL; 062A 0645;;;;N;;;;; +FCE4;ARABIC LIGATURE TEH WITH HEH MEDIAL FORM;Lo;0;AL; 062A 0647;;;;N;;;;; +FCE5;ARABIC LIGATURE THEH WITH MEEM MEDIAL FORM;Lo;0;AL; 062B 0645;;;;N;;;;; +FCE6;ARABIC LIGATURE THEH WITH HEH MEDIAL FORM;Lo;0;AL; 062B 0647;;;;N;;;;; +FCE7;ARABIC LIGATURE SEEN WITH MEEM MEDIAL FORM;Lo;0;AL; 0633 0645;;;;N;;;;; +FCE8;ARABIC LIGATURE SEEN WITH HEH MEDIAL FORM;Lo;0;AL; 0633 0647;;;;N;;;;; +FCE9;ARABIC LIGATURE SHEEN WITH MEEM MEDIAL FORM;Lo;0;AL; 0634 0645;;;;N;;;;; +FCEA;ARABIC LIGATURE SHEEN WITH HEH MEDIAL FORM;Lo;0;AL; 0634 0647;;;;N;;;;; +FCEB;ARABIC LIGATURE KAF WITH LAM MEDIAL FORM;Lo;0;AL; 0643 0644;;;;N;;;;; +FCEC;ARABIC LIGATURE KAF WITH MEEM MEDIAL FORM;Lo;0;AL; 0643 0645;;;;N;;;;; +FCED;ARABIC LIGATURE LAM WITH MEEM MEDIAL FORM;Lo;0;AL; 0644 0645;;;;N;;;;; +FCEE;ARABIC LIGATURE NOON WITH MEEM MEDIAL FORM;Lo;0;AL; 0646 0645;;;;N;;;;; +FCEF;ARABIC LIGATURE NOON WITH HEH MEDIAL FORM;Lo;0;AL; 0646 0647;;;;N;;;;; +FCF0;ARABIC LIGATURE YEH WITH MEEM MEDIAL FORM;Lo;0;AL; 064A 0645;;;;N;;;;; +FCF1;ARABIC LIGATURE YEH WITH HEH MEDIAL FORM;Lo;0;AL; 064A 0647;;;;N;;;;; +FCF2;ARABIC LIGATURE SHADDA WITH FATHA MEDIAL FORM;Lo;0;AL; 0640 064E 0651;;;;N;;;;; +FCF3;ARABIC LIGATURE SHADDA WITH DAMMA MEDIAL FORM;Lo;0;AL; 0640 064F 0651;;;;N;;;;; +FCF4;ARABIC LIGATURE SHADDA WITH KASRA MEDIAL FORM;Lo;0;AL; 0640 0650 0651;;;;N;;;;; +FCF5;ARABIC LIGATURE TAH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL; 0637 0649;;;;N;;;;; +FCF6;ARABIC LIGATURE TAH WITH YEH ISOLATED FORM;Lo;0;AL; 0637 064A;;;;N;;;;; +FCF7;ARABIC LIGATURE AIN WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL; 0639 0649;;;;N;;;;; +FCF8;ARABIC LIGATURE AIN WITH YEH ISOLATED FORM;Lo;0;AL; 0639 064A;;;;N;;;;; +FCF9;ARABIC LIGATURE GHAIN WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL; 063A 0649;;;;N;;;;; +FCFA;ARABIC LIGATURE GHAIN WITH YEH ISOLATED FORM;Lo;0;AL; 063A 064A;;;;N;;;;; +FCFB;ARABIC LIGATURE SEEN WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL; 0633 0649;;;;N;;;;; +FCFC;ARABIC LIGATURE SEEN WITH YEH ISOLATED FORM;Lo;0;AL; 0633 064A;;;;N;;;;; +FCFD;ARABIC LIGATURE SHEEN WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL; 0634 0649;;;;N;;;;; +FCFE;ARABIC LIGATURE SHEEN WITH YEH ISOLATED FORM;Lo;0;AL; 0634 064A;;;;N;;;;; +FCFF;ARABIC LIGATURE HAH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL; 062D 0649;;;;N;;;;; +FD00;ARABIC LIGATURE HAH WITH YEH ISOLATED FORM;Lo;0;AL; 062D 064A;;;;N;;;;; +FD01;ARABIC LIGATURE JEEM WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL; 062C 0649;;;;N;;;;; +FD02;ARABIC LIGATURE JEEM WITH YEH ISOLATED FORM;Lo;0;AL; 062C 064A;;;;N;;;;; +FD03;ARABIC LIGATURE KHAH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL; 062E 0649;;;;N;;;;; +FD04;ARABIC LIGATURE KHAH WITH YEH ISOLATED FORM;Lo;0;AL; 062E 064A;;;;N;;;;; +FD05;ARABIC LIGATURE SAD WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL; 0635 0649;;;;N;;;;; +FD06;ARABIC LIGATURE SAD WITH YEH ISOLATED FORM;Lo;0;AL; 0635 064A;;;;N;;;;; +FD07;ARABIC LIGATURE DAD WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL; 0636 0649;;;;N;;;;; +FD08;ARABIC LIGATURE DAD WITH YEH ISOLATED FORM;Lo;0;AL; 0636 064A;;;;N;;;;; +FD09;ARABIC LIGATURE SHEEN WITH JEEM ISOLATED FORM;Lo;0;AL; 0634 062C;;;;N;;;;; +FD0A;ARABIC LIGATURE SHEEN WITH HAH ISOLATED FORM;Lo;0;AL; 0634 062D;;;;N;;;;; +FD0B;ARABIC LIGATURE SHEEN WITH KHAH ISOLATED FORM;Lo;0;AL; 0634 062E;;;;N;;;;; +FD0C;ARABIC LIGATURE SHEEN WITH MEEM ISOLATED FORM;Lo;0;AL; 0634 0645;;;;N;;;;; +FD0D;ARABIC LIGATURE SHEEN WITH REH ISOLATED FORM;Lo;0;AL; 0634 0631;;;;N;;;;; +FD0E;ARABIC LIGATURE SEEN WITH REH ISOLATED FORM;Lo;0;AL; 0633 0631;;;;N;;;;; +FD0F;ARABIC LIGATURE SAD WITH REH ISOLATED FORM;Lo;0;AL; 0635 0631;;;;N;;;;; +FD10;ARABIC LIGATURE DAD WITH REH ISOLATED FORM;Lo;0;AL; 0636 0631;;;;N;;;;; +FD11;ARABIC LIGATURE TAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL; 0637 0649;;;;N;;;;; +FD12;ARABIC LIGATURE TAH WITH YEH FINAL FORM;Lo;0;AL; 0637 064A;;;;N;;;;; +FD13;ARABIC LIGATURE AIN WITH ALEF MAKSURA FINAL FORM;Lo;0;AL; 0639 0649;;;;N;;;;; +FD14;ARABIC LIGATURE AIN WITH YEH FINAL FORM;Lo;0;AL; 0639 064A;;;;N;;;;; +FD15;ARABIC LIGATURE GHAIN WITH ALEF MAKSURA FINAL FORM;Lo;0;AL; 063A 0649;;;;N;;;;; +FD16;ARABIC LIGATURE GHAIN WITH YEH FINAL FORM;Lo;0;AL; 063A 064A;;;;N;;;;; +FD17;ARABIC LIGATURE SEEN WITH ALEF MAKSURA FINAL FORM;Lo;0;AL; 0633 0649;;;;N;;;;; +FD18;ARABIC LIGATURE SEEN WITH YEH FINAL FORM;Lo;0;AL; 0633 064A;;;;N;;;;; +FD19;ARABIC LIGATURE SHEEN WITH ALEF MAKSURA FINAL FORM;Lo;0;AL; 0634 0649;;;;N;;;;; +FD1A;ARABIC LIGATURE SHEEN WITH YEH FINAL FORM;Lo;0;AL; 0634 064A;;;;N;;;;; +FD1B;ARABIC LIGATURE HAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL; 062D 0649;;;;N;;;;; +FD1C;ARABIC LIGATURE HAH WITH YEH FINAL FORM;Lo;0;AL; 062D 064A;;;;N;;;;; +FD1D;ARABIC LIGATURE JEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL; 062C 0649;;;;N;;;;; +FD1E;ARABIC LIGATURE JEEM WITH YEH FINAL FORM;Lo;0;AL; 062C 064A;;;;N;;;;; +FD1F;ARABIC LIGATURE KHAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL; 062E 0649;;;;N;;;;; +FD20;ARABIC LIGATURE KHAH WITH YEH FINAL FORM;Lo;0;AL; 062E 064A;;;;N;;;;; +FD21;ARABIC LIGATURE SAD WITH ALEF MAKSURA FINAL FORM;Lo;0;AL; 0635 0649;;;;N;;;;; +FD22;ARABIC LIGATURE SAD WITH YEH FINAL FORM;Lo;0;AL; 0635 064A;;;;N;;;;; +FD23;ARABIC LIGATURE DAD WITH ALEF MAKSURA FINAL FORM;Lo;0;AL; 0636 0649;;;;N;;;;; +FD24;ARABIC LIGATURE DAD WITH YEH FINAL FORM;Lo;0;AL; 0636 064A;;;;N;;;;; +FD25;ARABIC LIGATURE SHEEN WITH JEEM FINAL FORM;Lo;0;AL; 0634 062C;;;;N;;;;; +FD26;ARABIC LIGATURE SHEEN WITH HAH FINAL FORM;Lo;0;AL; 0634 062D;;;;N;;;;; +FD27;ARABIC LIGATURE SHEEN WITH KHAH FINAL FORM;Lo;0;AL; 0634 062E;;;;N;;;;; +FD28;ARABIC LIGATURE SHEEN WITH MEEM FINAL FORM;Lo;0;AL; 0634 0645;;;;N;;;;; +FD29;ARABIC LIGATURE SHEEN WITH REH FINAL FORM;Lo;0;AL; 0634 0631;;;;N;;;;; +FD2A;ARABIC LIGATURE SEEN WITH REH FINAL FORM;Lo;0;AL; 0633 0631;;;;N;;;;; +FD2B;ARABIC LIGATURE SAD WITH REH FINAL FORM;Lo;0;AL; 0635 0631;;;;N;;;;; +FD2C;ARABIC LIGATURE DAD WITH REH FINAL FORM;Lo;0;AL; 0636 0631;;;;N;;;;; +FD2D;ARABIC LIGATURE SHEEN WITH JEEM INITIAL FORM;Lo;0;AL; 0634 062C;;;;N;;;;; +FD2E;ARABIC LIGATURE SHEEN WITH HAH INITIAL FORM;Lo;0;AL; 0634 062D;;;;N;;;;; +FD2F;ARABIC LIGATURE SHEEN WITH KHAH INITIAL FORM;Lo;0;AL; 0634 062E;;;;N;;;;; +FD30;ARABIC LIGATURE SHEEN WITH MEEM INITIAL FORM;Lo;0;AL; 0634 0645;;;;N;;;;; +FD31;ARABIC LIGATURE SEEN WITH HEH INITIAL FORM;Lo;0;AL; 0633 0647;;;;N;;;;; +FD32;ARABIC LIGATURE SHEEN WITH HEH INITIAL FORM;Lo;0;AL; 0634 0647;;;;N;;;;; +FD33;ARABIC LIGATURE TAH WITH MEEM INITIAL FORM;Lo;0;AL; 0637 0645;;;;N;;;;; +FD34;ARABIC LIGATURE SEEN WITH JEEM MEDIAL FORM;Lo;0;AL; 0633 062C;;;;N;;;;; +FD35;ARABIC LIGATURE SEEN WITH HAH MEDIAL FORM;Lo;0;AL; 0633 062D;;;;N;;;;; +FD36;ARABIC LIGATURE SEEN WITH KHAH MEDIAL FORM;Lo;0;AL; 0633 062E;;;;N;;;;; +FD37;ARABIC LIGATURE SHEEN WITH JEEM MEDIAL FORM;Lo;0;AL; 0634 062C;;;;N;;;;; +FD38;ARABIC LIGATURE SHEEN WITH HAH MEDIAL FORM;Lo;0;AL; 0634 062D;;;;N;;;;; +FD39;ARABIC LIGATURE SHEEN WITH KHAH MEDIAL FORM;Lo;0;AL; 0634 062E;;;;N;;;;; +FD3A;ARABIC LIGATURE TAH WITH MEEM MEDIAL FORM;Lo;0;AL; 0637 0645;;;;N;;;;; +FD3B;ARABIC LIGATURE ZAH WITH MEEM MEDIAL FORM;Lo;0;AL; 0638 0645;;;;N;;;;; +FD3C;ARABIC LIGATURE ALEF WITH FATHATAN FINAL FORM;Lo;0;AL; 0627 064B;;;;N;;;;; +FD3D;ARABIC LIGATURE ALEF WITH FATHATAN ISOLATED FORM;Lo;0;AL; 0627 064B;;;;N;;;;; +FD3E;ORNATE LEFT PARENTHESIS;Pe;0;ON;;;;;N;;;;; +FD3F;ORNATE RIGHT PARENTHESIS;Ps;0;ON;;;;;N;;;;; +FD40;ARABIC LIGATURE RAHIMAHU ALLAAH;So;0;ON;;;;;N;;;;; +FD41;ARABIC LIGATURE RADI ALLAAHU ANH;So;0;ON;;;;;N;;;;; +FD42;ARABIC LIGATURE RADI ALLAAHU ANHAA;So;0;ON;;;;;N;;;;; +FD43;ARABIC LIGATURE RADI ALLAAHU ANHUM;So;0;ON;;;;;N;;;;; +FD44;ARABIC LIGATURE RADI ALLAAHU ANHUMAA;So;0;ON;;;;;N;;;;; +FD45;ARABIC LIGATURE RADI ALLAAHU ANHUNNA;So;0;ON;;;;;N;;;;; +FD46;ARABIC LIGATURE SALLALLAAHU ALAYHI WA-AALIH;So;0;ON;;;;;N;;;;; +FD47;ARABIC LIGATURE ALAYHI AS-SALAAM;So;0;ON;;;;;N;;;;; +FD48;ARABIC LIGATURE ALAYHIM AS-SALAAM;So;0;ON;;;;;N;;;;; +FD49;ARABIC LIGATURE ALAYHIMAA AS-SALAAM;So;0;ON;;;;;N;;;;; +FD4A;ARABIC LIGATURE ALAYHI AS-SALAATU WAS-SALAAM;So;0;ON;;;;;N;;;;; +FD4B;ARABIC LIGATURE QUDDISA SIRRAH;So;0;ON;;;;;N;;;;; +FD4C;ARABIC LIGATURE SALLALLAHU ALAYHI WAAALIHEE WA-SALLAM;So;0;ON;;;;;N;;;;; +FD4D;ARABIC LIGATURE ALAYHAA AS-SALAAM;So;0;ON;;;;;N;;;;; +FD4E;ARABIC LIGATURE TABAARAKA WA-TAAALAA;So;0;ON;;;;;N;;;;; +FD4F;ARABIC LIGATURE RAHIMAHUM ALLAAH;So;0;ON;;;;;N;;;;; +FD50;ARABIC LIGATURE TEH WITH JEEM WITH MEEM INITIAL FORM;Lo;0;AL; 062A 062C 0645;;;;N;;;;; +FD51;ARABIC LIGATURE TEH WITH HAH WITH JEEM FINAL FORM;Lo;0;AL; 062A 062D 062C;;;;N;;;;; +FD52;ARABIC LIGATURE TEH WITH HAH WITH JEEM INITIAL FORM;Lo;0;AL; 062A 062D 062C;;;;N;;;;; +FD53;ARABIC LIGATURE TEH WITH HAH WITH MEEM INITIAL FORM;Lo;0;AL; 062A 062D 0645;;;;N;;;;; +FD54;ARABIC LIGATURE TEH WITH KHAH WITH MEEM INITIAL FORM;Lo;0;AL; 062A 062E 0645;;;;N;;;;; +FD55;ARABIC LIGATURE TEH WITH MEEM WITH JEEM INITIAL FORM;Lo;0;AL; 062A 0645 062C;;;;N;;;;; +FD56;ARABIC LIGATURE TEH WITH MEEM WITH HAH INITIAL FORM;Lo;0;AL; 062A 0645 062D;;;;N;;;;; +FD57;ARABIC LIGATURE TEH WITH MEEM WITH KHAH INITIAL FORM;Lo;0;AL; 062A 0645 062E;;;;N;;;;; +FD58;ARABIC LIGATURE JEEM WITH MEEM WITH HAH FINAL FORM;Lo;0;AL; 062C 0645 062D;;;;N;;;;; +FD59;ARABIC LIGATURE JEEM WITH MEEM WITH HAH INITIAL FORM;Lo;0;AL; 062C 0645 062D;;;;N;;;;; +FD5A;ARABIC LIGATURE HAH WITH MEEM WITH YEH FINAL FORM;Lo;0;AL; 062D 0645 064A;;;;N;;;;; +FD5B;ARABIC LIGATURE HAH WITH MEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL; 062D 0645 0649;;;;N;;;;; +FD5C;ARABIC LIGATURE SEEN WITH HAH WITH JEEM INITIAL FORM;Lo;0;AL; 0633 062D 062C;;;;N;;;;; +FD5D;ARABIC LIGATURE SEEN WITH JEEM WITH HAH INITIAL FORM;Lo;0;AL; 0633 062C 062D;;;;N;;;;; +FD5E;ARABIC LIGATURE SEEN WITH JEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL; 0633 062C 0649;;;;N;;;;; +FD5F;ARABIC LIGATURE SEEN WITH MEEM WITH HAH FINAL FORM;Lo;0;AL; 0633 0645 062D;;;;N;;;;; +FD60;ARABIC LIGATURE SEEN WITH MEEM WITH HAH INITIAL FORM;Lo;0;AL; 0633 0645 062D;;;;N;;;;; +FD61;ARABIC LIGATURE SEEN WITH MEEM WITH JEEM INITIAL FORM;Lo;0;AL; 0633 0645 062C;;;;N;;;;; +FD62;ARABIC LIGATURE SEEN WITH MEEM WITH MEEM FINAL FORM;Lo;0;AL; 0633 0645 0645;;;;N;;;;; +FD63;ARABIC LIGATURE SEEN WITH MEEM WITH MEEM INITIAL FORM;Lo;0;AL; 0633 0645 0645;;;;N;;;;; +FD64;ARABIC LIGATURE SAD WITH HAH WITH HAH FINAL FORM;Lo;0;AL; 0635 062D 062D;;;;N;;;;; +FD65;ARABIC LIGATURE SAD WITH HAH WITH HAH INITIAL FORM;Lo;0;AL; 0635 062D 062D;;;;N;;;;; +FD66;ARABIC LIGATURE SAD WITH MEEM WITH MEEM FINAL FORM;Lo;0;AL; 0635 0645 0645;;;;N;;;;; +FD67;ARABIC LIGATURE SHEEN WITH HAH WITH MEEM FINAL FORM;Lo;0;AL; 0634 062D 0645;;;;N;;;;; +FD68;ARABIC LIGATURE SHEEN WITH HAH WITH MEEM INITIAL FORM;Lo;0;AL; 0634 062D 0645;;;;N;;;;; +FD69;ARABIC LIGATURE SHEEN WITH JEEM WITH YEH FINAL FORM;Lo;0;AL; 0634 062C 064A;;;;N;;;;; +FD6A;ARABIC LIGATURE SHEEN WITH MEEM WITH KHAH FINAL FORM;Lo;0;AL; 0634 0645 062E;;;;N;;;;; +FD6B;ARABIC LIGATURE SHEEN WITH MEEM WITH KHAH INITIAL FORM;Lo;0;AL; 0634 0645 062E;;;;N;;;;; +FD6C;ARABIC LIGATURE SHEEN WITH MEEM WITH MEEM FINAL FORM;Lo;0;AL; 0634 0645 0645;;;;N;;;;; +FD6D;ARABIC LIGATURE SHEEN WITH MEEM WITH MEEM INITIAL FORM;Lo;0;AL; 0634 0645 0645;;;;N;;;;; +FD6E;ARABIC LIGATURE DAD WITH HAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL; 0636 062D 0649;;;;N;;;;; +FD6F;ARABIC LIGATURE DAD WITH KHAH WITH MEEM FINAL FORM;Lo;0;AL; 0636 062E 0645;;;;N;;;;; +FD70;ARABIC LIGATURE DAD WITH KHAH WITH MEEM INITIAL FORM;Lo;0;AL; 0636 062E 0645;;;;N;;;;; +FD71;ARABIC LIGATURE TAH WITH MEEM WITH HAH FINAL FORM;Lo;0;AL; 0637 0645 062D;;;;N;;;;; +FD72;ARABIC LIGATURE TAH WITH MEEM WITH HAH INITIAL FORM;Lo;0;AL; 0637 0645 062D;;;;N;;;;; +FD73;ARABIC LIGATURE TAH WITH MEEM WITH MEEM INITIAL FORM;Lo;0;AL; 0637 0645 0645;;;;N;;;;; +FD74;ARABIC LIGATURE TAH WITH MEEM WITH YEH FINAL FORM;Lo;0;AL; 0637 0645 064A;;;;N;;;;; +FD75;ARABIC LIGATURE AIN WITH JEEM WITH MEEM FINAL FORM;Lo;0;AL; 0639 062C 0645;;;;N;;;;; +FD76;ARABIC LIGATURE AIN WITH MEEM WITH MEEM FINAL FORM;Lo;0;AL; 0639 0645 0645;;;;N;;;;; +FD77;ARABIC LIGATURE AIN WITH MEEM WITH MEEM INITIAL FORM;Lo;0;AL; 0639 0645 0645;;;;N;;;;; +FD78;ARABIC LIGATURE AIN WITH MEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL; 0639 0645 0649;;;;N;;;;; +FD79;ARABIC LIGATURE GHAIN WITH MEEM WITH MEEM FINAL FORM;Lo;0;AL; 063A 0645 0645;;;;N;;;;; +FD7A;ARABIC LIGATURE GHAIN WITH MEEM WITH YEH FINAL FORM;Lo;0;AL; 063A 0645 064A;;;;N;;;;; +FD7B;ARABIC LIGATURE GHAIN WITH MEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL; 063A 0645 0649;;;;N;;;;; +FD7C;ARABIC LIGATURE FEH WITH KHAH WITH MEEM FINAL FORM;Lo;0;AL; 0641 062E 0645;;;;N;;;;; +FD7D;ARABIC LIGATURE FEH WITH KHAH WITH MEEM INITIAL FORM;Lo;0;AL; 0641 062E 0645;;;;N;;;;; +FD7E;ARABIC LIGATURE QAF WITH MEEM WITH HAH FINAL FORM;Lo;0;AL; 0642 0645 062D;;;;N;;;;; +FD7F;ARABIC LIGATURE QAF WITH MEEM WITH MEEM FINAL FORM;Lo;0;AL; 0642 0645 0645;;;;N;;;;; +FD80;ARABIC LIGATURE LAM WITH HAH WITH MEEM FINAL FORM;Lo;0;AL; 0644 062D 0645;;;;N;;;;; +FD81;ARABIC LIGATURE LAM WITH HAH WITH YEH FINAL FORM;Lo;0;AL; 0644 062D 064A;;;;N;;;;; +FD82;ARABIC LIGATURE LAM WITH HAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL; 0644 062D 0649;;;;N;;;;; +FD83;ARABIC LIGATURE LAM WITH JEEM WITH JEEM INITIAL FORM;Lo;0;AL; 0644 062C 062C;;;;N;;;;; +FD84;ARABIC LIGATURE LAM WITH JEEM WITH JEEM FINAL FORM;Lo;0;AL; 0644 062C 062C;;;;N;;;;; +FD85;ARABIC LIGATURE LAM WITH KHAH WITH MEEM FINAL FORM;Lo;0;AL; 0644 062E 0645;;;;N;;;;; +FD86;ARABIC LIGATURE LAM WITH KHAH WITH MEEM INITIAL FORM;Lo;0;AL; 0644 062E 0645;;;;N;;;;; +FD87;ARABIC LIGATURE LAM WITH MEEM WITH HAH FINAL FORM;Lo;0;AL; 0644 0645 062D;;;;N;;;;; +FD88;ARABIC LIGATURE LAM WITH MEEM WITH HAH INITIAL FORM;Lo;0;AL; 0644 0645 062D;;;;N;;;;; +FD89;ARABIC LIGATURE MEEM WITH HAH WITH JEEM INITIAL FORM;Lo;0;AL; 0645 062D 062C;;;;N;;;;; +FD8A;ARABIC LIGATURE MEEM WITH HAH WITH MEEM INITIAL FORM;Lo;0;AL; 0645 062D 0645;;;;N;;;;; +FD8B;ARABIC LIGATURE MEEM WITH HAH WITH YEH FINAL FORM;Lo;0;AL; 0645 062D 064A;;;;N;;;;; +FD8C;ARABIC LIGATURE MEEM WITH JEEM WITH HAH INITIAL FORM;Lo;0;AL; 0645 062C 062D;;;;N;;;;; +FD8D;ARABIC LIGATURE MEEM WITH JEEM WITH MEEM INITIAL FORM;Lo;0;AL; 0645 062C 0645;;;;N;;;;; +FD8E;ARABIC LIGATURE MEEM WITH KHAH WITH JEEM INITIAL FORM;Lo;0;AL; 0645 062E 062C;;;;N;;;;; +FD8F;ARABIC LIGATURE MEEM WITH KHAH WITH MEEM INITIAL FORM;Lo;0;AL; 0645 062E 0645;;;;N;;;;; +FD90;ARABIC LIGATURE RAHMATU ALLAAHI ALAYH;So;0;ON;;;;;N;;;;; +FD91;ARABIC LIGATURE RAHMATU ALLAAHI ALAYHAA;So;0;ON;;;;;N;;;;; +FD92;ARABIC LIGATURE MEEM WITH JEEM WITH KHAH INITIAL FORM;Lo;0;AL; 0645 062C 062E;;;;N;;;;; +FD93;ARABIC LIGATURE HEH WITH MEEM WITH JEEM INITIAL FORM;Lo;0;AL; 0647 0645 062C;;;;N;;;;; +FD94;ARABIC LIGATURE HEH WITH MEEM WITH MEEM INITIAL FORM;Lo;0;AL; 0647 0645 0645;;;;N;;;;; +FD95;ARABIC LIGATURE NOON WITH HAH WITH MEEM INITIAL FORM;Lo;0;AL; 0646 062D 0645;;;;N;;;;; +FD96;ARABIC LIGATURE NOON WITH HAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL; 0646 062D 0649;;;;N;;;;; +FD97;ARABIC LIGATURE NOON WITH JEEM WITH MEEM FINAL FORM;Lo;0;AL; 0646 062C 0645;;;;N;;;;; +FD98;ARABIC LIGATURE NOON WITH JEEM WITH MEEM INITIAL FORM;Lo;0;AL; 0646 062C 0645;;;;N;;;;; +FD99;ARABIC LIGATURE NOON WITH JEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL; 0646 062C 0649;;;;N;;;;; +FD9A;ARABIC LIGATURE NOON WITH MEEM WITH YEH FINAL FORM;Lo;0;AL; 0646 0645 064A;;;;N;;;;; +FD9B;ARABIC LIGATURE NOON WITH MEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL; 0646 0645 0649;;;;N;;;;; +FD9C;ARABIC LIGATURE YEH WITH MEEM WITH MEEM FINAL FORM;Lo;0;AL; 064A 0645 0645;;;;N;;;;; +FD9D;ARABIC LIGATURE YEH WITH MEEM WITH MEEM INITIAL FORM;Lo;0;AL; 064A 0645 0645;;;;N;;;;; +FD9E;ARABIC LIGATURE BEH WITH KHAH WITH YEH FINAL FORM;Lo;0;AL; 0628 062E 064A;;;;N;;;;; +FD9F;ARABIC LIGATURE TEH WITH JEEM WITH YEH FINAL FORM;Lo;0;AL; 062A 062C 064A;;;;N;;;;; +FDA0;ARABIC LIGATURE TEH WITH JEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL; 062A 062C 0649;;;;N;;;;; +FDA1;ARABIC LIGATURE TEH WITH KHAH WITH YEH FINAL FORM;Lo;0;AL; 062A 062E 064A;;;;N;;;;; +FDA2;ARABIC LIGATURE TEH WITH KHAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL; 062A 062E 0649;;;;N;;;;; +FDA3;ARABIC LIGATURE TEH WITH MEEM WITH YEH FINAL FORM;Lo;0;AL; 062A 0645 064A;;;;N;;;;; +FDA4;ARABIC LIGATURE TEH WITH MEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL; 062A 0645 0649;;;;N;;;;; +FDA5;ARABIC LIGATURE JEEM WITH MEEM WITH YEH FINAL FORM;Lo;0;AL; 062C 0645 064A;;;;N;;;;; +FDA6;ARABIC LIGATURE JEEM WITH HAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL; 062C 062D 0649;;;;N;;;;; +FDA7;ARABIC LIGATURE JEEM WITH MEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL; 062C 0645 0649;;;;N;;;;; +FDA8;ARABIC LIGATURE SEEN WITH KHAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL; 0633 062E 0649;;;;N;;;;; +FDA9;ARABIC LIGATURE SAD WITH HAH WITH YEH FINAL FORM;Lo;0;AL; 0635 062D 064A;;;;N;;;;; +FDAA;ARABIC LIGATURE SHEEN WITH HAH WITH YEH FINAL FORM;Lo;0;AL; 0634 062D 064A;;;;N;;;;; +FDAB;ARABIC LIGATURE DAD WITH HAH WITH YEH FINAL FORM;Lo;0;AL; 0636 062D 064A;;;;N;;;;; +FDAC;ARABIC LIGATURE LAM WITH JEEM WITH YEH FINAL FORM;Lo;0;AL; 0644 062C 064A;;;;N;;;;; +FDAD;ARABIC LIGATURE LAM WITH MEEM WITH YEH FINAL FORM;Lo;0;AL; 0644 0645 064A;;;;N;;;;; +FDAE;ARABIC LIGATURE YEH WITH HAH WITH YEH FINAL FORM;Lo;0;AL; 064A 062D 064A;;;;N;;;;; +FDAF;ARABIC LIGATURE YEH WITH JEEM WITH YEH FINAL FORM;Lo;0;AL; 064A 062C 064A;;;;N;;;;; +FDB0;ARABIC LIGATURE YEH WITH MEEM WITH YEH FINAL FORM;Lo;0;AL; 064A 0645 064A;;;;N;;;;; +FDB1;ARABIC LIGATURE MEEM WITH MEEM WITH YEH FINAL FORM;Lo;0;AL; 0645 0645 064A;;;;N;;;;; +FDB2;ARABIC LIGATURE QAF WITH MEEM WITH YEH FINAL FORM;Lo;0;AL; 0642 0645 064A;;;;N;;;;; +FDB3;ARABIC LIGATURE NOON WITH HAH WITH YEH FINAL FORM;Lo;0;AL; 0646 062D 064A;;;;N;;;;; +FDB4;ARABIC LIGATURE QAF WITH MEEM WITH HAH INITIAL FORM;Lo;0;AL; 0642 0645 062D;;;;N;;;;; +FDB5;ARABIC LIGATURE LAM WITH HAH WITH MEEM INITIAL FORM;Lo;0;AL; 0644 062D 0645;;;;N;;;;; +FDB6;ARABIC LIGATURE AIN WITH MEEM WITH YEH FINAL FORM;Lo;0;AL; 0639 0645 064A;;;;N;;;;; +FDB7;ARABIC LIGATURE KAF WITH MEEM WITH YEH FINAL FORM;Lo;0;AL; 0643 0645 064A;;;;N;;;;; +FDB8;ARABIC LIGATURE NOON WITH JEEM WITH HAH INITIAL FORM;Lo;0;AL; 0646 062C 062D;;;;N;;;;; +FDB9;ARABIC LIGATURE MEEM WITH KHAH WITH YEH FINAL FORM;Lo;0;AL; 0645 062E 064A;;;;N;;;;; +FDBA;ARABIC LIGATURE LAM WITH JEEM WITH MEEM INITIAL FORM;Lo;0;AL; 0644 062C 0645;;;;N;;;;; +FDBB;ARABIC LIGATURE KAF WITH MEEM WITH MEEM FINAL FORM;Lo;0;AL; 0643 0645 0645;;;;N;;;;; +FDBC;ARABIC LIGATURE LAM WITH JEEM WITH MEEM FINAL FORM;Lo;0;AL; 0644 062C 0645;;;;N;;;;; +FDBD;ARABIC LIGATURE NOON WITH JEEM WITH HAH FINAL FORM;Lo;0;AL; 0646 062C 062D;;;;N;;;;; +FDBE;ARABIC LIGATURE JEEM WITH HAH WITH YEH FINAL FORM;Lo;0;AL; 062C 062D 064A;;;;N;;;;; +FDBF;ARABIC LIGATURE HAH WITH JEEM WITH YEH FINAL FORM;Lo;0;AL; 062D 062C 064A;;;;N;;;;; +FDC0;ARABIC LIGATURE MEEM WITH JEEM WITH YEH FINAL FORM;Lo;0;AL; 0645 062C 064A;;;;N;;;;; +FDC1;ARABIC LIGATURE FEH WITH MEEM WITH YEH FINAL FORM;Lo;0;AL; 0641 0645 064A;;;;N;;;;; +FDC2;ARABIC LIGATURE BEH WITH HAH WITH YEH FINAL FORM;Lo;0;AL; 0628 062D 064A;;;;N;;;;; +FDC3;ARABIC LIGATURE KAF WITH MEEM WITH MEEM INITIAL FORM;Lo;0;AL; 0643 0645 0645;;;;N;;;;; +FDC4;ARABIC LIGATURE AIN WITH JEEM WITH MEEM INITIAL FORM;Lo;0;AL; 0639 062C 0645;;;;N;;;;; +FDC5;ARABIC LIGATURE SAD WITH MEEM WITH MEEM INITIAL FORM;Lo;0;AL; 0635 0645 0645;;;;N;;;;; +FDC6;ARABIC LIGATURE SEEN WITH KHAH WITH YEH FINAL FORM;Lo;0;AL; 0633 062E 064A;;;;N;;;;; +FDC7;ARABIC LIGATURE NOON WITH JEEM WITH YEH FINAL FORM;Lo;0;AL; 0646 062C 064A;;;;N;;;;; +FDC8;ARABIC LIGATURE RAHIMAHU ALLAAH TAAALAA;So;0;ON;;;;;N;;;;; +FDC9;ARABIC LIGATURE RADI ALLAAHU TAAALAA ANH;So;0;ON;;;;;N;;;;; +FDCA;ARABIC LIGATURE RADI ALLAAHU TAAALAA ANHAA;So;0;ON;;;;;N;;;;; +FDCB;ARABIC LIGATURE RADI ALLAAHU TAAALAA ANHUMAA;So;0;ON;;;;;N;;;;; +FDCC;ARABIC LIGATURE SALLALLAHU ALAYHI WA-ALAA AALIHEE WA-SALLAM;So;0;ON;;;;;N;;;;; +FDCD;ARABIC LIGATURE AJJAL ALLAAHU TAAALAA FARAJAHU ASH-SHAREEF;So;0;ON;;;;;N;;;;; +FDCE;ARABIC LIGATURE KARRAMA ALLAAHU WAJHAH;So;0;ON;;;;;N;;;;; +FDCF;ARABIC LIGATURE SALAAMUHU ALAYNAA;So;0;ON;;;;;N;;;;; +FDF0;ARABIC LIGATURE SALLA USED AS KORANIC STOP SIGN ISOLATED FORM;Lo;0;AL; 0635 0644 06D2;;;;N;;;;; +FDF1;ARABIC LIGATURE QALA USED AS KORANIC STOP SIGN ISOLATED FORM;Lo;0;AL; 0642 0644 06D2;;;;N;;;;; +FDF2;ARABIC LIGATURE ALLAH ISOLATED FORM;Lo;0;AL; 0627 0644 0644 0647;;;;N;;;;; +FDF3;ARABIC LIGATURE AKBAR ISOLATED FORM;Lo;0;AL; 0627 0643 0628 0631;;;;N;;;;; +FDF4;ARABIC LIGATURE MOHAMMAD ISOLATED FORM;Lo;0;AL; 0645 062D 0645 062F;;;;N;;;;; +FDF5;ARABIC LIGATURE SALAM ISOLATED FORM;Lo;0;AL; 0635 0644 0639 0645;;;;N;;;;; +FDF6;ARABIC LIGATURE RASOUL ISOLATED FORM;Lo;0;AL; 0631 0633 0648 0644;;;;N;;;;; +FDF7;ARABIC LIGATURE ALAYHE ISOLATED FORM;Lo;0;AL; 0639 0644 064A 0647;;;;N;;;;; +FDF8;ARABIC LIGATURE WASALLAM ISOLATED FORM;Lo;0;AL; 0648 0633 0644 0645;;;;N;;;;; +FDF9;ARABIC LIGATURE SALLA ISOLATED FORM;Lo;0;AL; 0635 0644 0649;;;;N;;;;; +FDFA;ARABIC LIGATURE SALLALLAHOU ALAYHE WASALLAM;Lo;0;AL; 0635 0644 0649 0020 0627 0644 0644 0647 0020 0639 0644 064A 0647 0020 0648 0633 0644 0645;;;;N;ARABIC LETTER SALLALLAHOU ALAYHE WASALLAM;;;; +FDFB;ARABIC LIGATURE JALLAJALALOUHOU;Lo;0;AL; 062C 0644 0020 062C 0644 0627 0644 0647;;;;N;ARABIC LETTER JALLAJALALOUHOU;;;; +FDFC;RIAL SIGN;Sc;0;AL; 0631 06CC 0627 0644;;;;N;;;;; +FDFD;ARABIC LIGATURE BISMILLAH AR-RAHMAN AR-RAHEEM;So;0;ON;;;;;N;;;;; +FDFE;ARABIC LIGATURE SUBHAANAHU WA TAAALAA;So;0;ON;;;;;N;;;;; +FDFF;ARABIC LIGATURE AZZA WA JALL;So;0;ON;;;;;N;;;;; +FE00;VARIATION SELECTOR-1;Mn;0;NSM;;;;;N;;;;; +FE01;VARIATION SELECTOR-2;Mn;0;NSM;;;;;N;;;;; +FE02;VARIATION SELECTOR-3;Mn;0;NSM;;;;;N;;;;; +FE03;VARIATION SELECTOR-4;Mn;0;NSM;;;;;N;;;;; +FE04;VARIATION SELECTOR-5;Mn;0;NSM;;;;;N;;;;; +FE05;VARIATION SELECTOR-6;Mn;0;NSM;;;;;N;;;;; +FE06;VARIATION SELECTOR-7;Mn;0;NSM;;;;;N;;;;; +FE07;VARIATION SELECTOR-8;Mn;0;NSM;;;;;N;;;;; +FE08;VARIATION SELECTOR-9;Mn;0;NSM;;;;;N;;;;; +FE09;VARIATION SELECTOR-10;Mn;0;NSM;;;;;N;;;;; +FE0A;VARIATION SELECTOR-11;Mn;0;NSM;;;;;N;;;;; +FE0B;VARIATION SELECTOR-12;Mn;0;NSM;;;;;N;;;;; +FE0C;VARIATION SELECTOR-13;Mn;0;NSM;;;;;N;;;;; +FE0D;VARIATION SELECTOR-14;Mn;0;NSM;;;;;N;;;;; +FE0E;VARIATION SELECTOR-15;Mn;0;NSM;;;;;N;;;;; +FE0F;VARIATION SELECTOR-16;Mn;0;NSM;;;;;N;;;;; +FE10;PRESENTATION FORM FOR VERTICAL COMMA;Po;0;ON; 002C;;;;N;;;;; +FE11;PRESENTATION FORM FOR VERTICAL IDEOGRAPHIC COMMA;Po;0;ON; 3001;;;;N;;;;; +FE12;PRESENTATION FORM FOR VERTICAL IDEOGRAPHIC FULL STOP;Po;0;ON; 3002;;;;N;;;;; +FE13;PRESENTATION FORM FOR VERTICAL COLON;Po;0;ON; 003A;;;;N;;;;; +FE14;PRESENTATION FORM FOR VERTICAL SEMICOLON;Po;0;ON; 003B;;;;N;;;;; +FE15;PRESENTATION FORM FOR VERTICAL EXCLAMATION MARK;Po;0;ON; 0021;;;;N;;;;; +FE16;PRESENTATION FORM FOR VERTICAL QUESTION MARK;Po;0;ON; 003F;;;;N;;;;; +FE17;PRESENTATION FORM FOR VERTICAL LEFT WHITE LENTICULAR BRACKET;Ps;0;ON; 3016;;;;N;;;;; +FE18;PRESENTATION FORM FOR VERTICAL RIGHT WHITE LENTICULAR BRAKCET;Pe;0;ON; 3017;;;;N;;;;; +FE19;PRESENTATION FORM FOR VERTICAL HORIZONTAL ELLIPSIS;Po;0;ON; 2026;;;;N;;;;; +FE20;COMBINING LIGATURE LEFT HALF;Mn;230;NSM;;;;;N;;;;; +FE21;COMBINING LIGATURE RIGHT HALF;Mn;230;NSM;;;;;N;;;;; +FE22;COMBINING DOUBLE TILDE LEFT HALF;Mn;230;NSM;;;;;N;;;;; +FE23;COMBINING DOUBLE TILDE RIGHT HALF;Mn;230;NSM;;;;;N;;;;; +FE24;COMBINING MACRON LEFT HALF;Mn;230;NSM;;;;;N;;;;; +FE25;COMBINING MACRON RIGHT HALF;Mn;230;NSM;;;;;N;;;;; +FE26;COMBINING CONJOINING MACRON;Mn;230;NSM;;;;;N;;;;; +FE27;COMBINING LIGATURE LEFT HALF BELOW;Mn;220;NSM;;;;;N;;;;; +FE28;COMBINING LIGATURE RIGHT HALF BELOW;Mn;220;NSM;;;;;N;;;;; +FE29;COMBINING TILDE LEFT HALF BELOW;Mn;220;NSM;;;;;N;;;;; +FE2A;COMBINING TILDE RIGHT HALF BELOW;Mn;220;NSM;;;;;N;;;;; +FE2B;COMBINING MACRON LEFT HALF BELOW;Mn;220;NSM;;;;;N;;;;; +FE2C;COMBINING MACRON RIGHT HALF BELOW;Mn;220;NSM;;;;;N;;;;; +FE2D;COMBINING CONJOINING MACRON BELOW;Mn;220;NSM;;;;;N;;;;; +FE2E;COMBINING CYRILLIC TITLO LEFT HALF;Mn;230;NSM;;;;;N;;;;; +FE2F;COMBINING CYRILLIC TITLO RIGHT HALF;Mn;230;NSM;;;;;N;;;;; +FE30;PRESENTATION FORM FOR VERTICAL TWO DOT LEADER;Po;0;ON; 2025;;;;N;GLYPH FOR VERTICAL TWO DOT LEADER;;;; +FE31;PRESENTATION FORM FOR VERTICAL EM DASH;Pd;0;ON; 2014;;;;N;GLYPH FOR VERTICAL EM DASH;;;; +FE32;PRESENTATION FORM FOR VERTICAL EN DASH;Pd;0;ON; 2013;;;;N;GLYPH FOR VERTICAL EN DASH;;;; +FE33;PRESENTATION FORM FOR VERTICAL LOW LINE;Pc;0;ON; 005F;;;;N;GLYPH FOR VERTICAL SPACING UNDERSCORE;;;; +FE34;PRESENTATION FORM FOR VERTICAL WAVY LOW LINE;Pc;0;ON; 005F;;;;N;GLYPH FOR VERTICAL SPACING WAVY UNDERSCORE;;;; +FE35;PRESENTATION FORM FOR VERTICAL LEFT PARENTHESIS;Ps;0;ON; 0028;;;;N;GLYPH FOR VERTICAL OPENING PARENTHESIS;;;; +FE36;PRESENTATION FORM FOR VERTICAL RIGHT PARENTHESIS;Pe;0;ON; 0029;;;;N;GLYPH FOR VERTICAL CLOSING PARENTHESIS;;;; +FE37;PRESENTATION FORM FOR VERTICAL LEFT CURLY BRACKET;Ps;0;ON; 007B;;;;N;GLYPH FOR VERTICAL OPENING CURLY BRACKET;;;; +FE38;PRESENTATION FORM FOR VERTICAL RIGHT CURLY BRACKET;Pe;0;ON; 007D;;;;N;GLYPH FOR VERTICAL CLOSING CURLY BRACKET;;;; +FE39;PRESENTATION FORM FOR VERTICAL LEFT TORTOISE SHELL BRACKET;Ps;0;ON; 3014;;;;N;GLYPH FOR VERTICAL OPENING TORTOISE SHELL BRACKET;;;; +FE3A;PRESENTATION FORM FOR VERTICAL RIGHT TORTOISE SHELL BRACKET;Pe;0;ON; 3015;;;;N;GLYPH FOR VERTICAL CLOSING TORTOISE SHELL BRACKET;;;; +FE3B;PRESENTATION FORM FOR VERTICAL LEFT BLACK LENTICULAR BRACKET;Ps;0;ON; 3010;;;;N;GLYPH FOR VERTICAL OPENING BLACK LENTICULAR BRACKET;;;; +FE3C;PRESENTATION FORM FOR VERTICAL RIGHT BLACK LENTICULAR BRACKET;Pe;0;ON; 3011;;;;N;GLYPH FOR VERTICAL CLOSING BLACK LENTICULAR BRACKET;;;; +FE3D;PRESENTATION FORM FOR VERTICAL LEFT DOUBLE ANGLE BRACKET;Ps;0;ON; 300A;;;;N;GLYPH FOR VERTICAL OPENING DOUBLE ANGLE BRACKET;;;; +FE3E;PRESENTATION FORM FOR VERTICAL RIGHT DOUBLE ANGLE BRACKET;Pe;0;ON; 300B;;;;N;GLYPH FOR VERTICAL CLOSING DOUBLE ANGLE BRACKET;;;; +FE3F;PRESENTATION FORM FOR VERTICAL LEFT ANGLE BRACKET;Ps;0;ON; 3008;;;;N;GLYPH FOR VERTICAL OPENING ANGLE BRACKET;;;; +FE40;PRESENTATION FORM FOR VERTICAL RIGHT ANGLE BRACKET;Pe;0;ON; 3009;;;;N;GLYPH FOR VERTICAL CLOSING ANGLE BRACKET;;;; +FE41;PRESENTATION FORM FOR VERTICAL LEFT CORNER BRACKET;Ps;0;ON; 300C;;;;N;GLYPH FOR VERTICAL OPENING CORNER BRACKET;;;; +FE42;PRESENTATION FORM FOR VERTICAL RIGHT CORNER BRACKET;Pe;0;ON; 300D;;;;N;GLYPH FOR VERTICAL CLOSING CORNER BRACKET;;;; +FE43;PRESENTATION FORM FOR VERTICAL LEFT WHITE CORNER BRACKET;Ps;0;ON; 300E;;;;N;GLYPH FOR VERTICAL OPENING WHITE CORNER BRACKET;;;; +FE44;PRESENTATION FORM FOR VERTICAL RIGHT WHITE CORNER BRACKET;Pe;0;ON; 300F;;;;N;GLYPH FOR VERTICAL CLOSING WHITE CORNER BRACKET;;;; +FE45;SESAME DOT;Po;0;ON;;;;;N;;;;; +FE46;WHITE SESAME DOT;Po;0;ON;;;;;N;;;;; +FE47;PRESENTATION FORM FOR VERTICAL LEFT SQUARE BRACKET;Ps;0;ON; 005B;;;;N;;;;; +FE48;PRESENTATION FORM FOR VERTICAL RIGHT SQUARE BRACKET;Pe;0;ON; 005D;;;;N;;;;; +FE49;DASHED OVERLINE;Po;0;ON; 203E;;;;N;SPACING DASHED OVERSCORE;;;; +FE4A;CENTRELINE OVERLINE;Po;0;ON; 203E;;;;N;SPACING CENTERLINE OVERSCORE;;;; +FE4B;WAVY OVERLINE;Po;0;ON; 203E;;;;N;SPACING WAVY OVERSCORE;;;; +FE4C;DOUBLE WAVY OVERLINE;Po;0;ON; 203E;;;;N;SPACING DOUBLE WAVY OVERSCORE;;;; +FE4D;DASHED LOW LINE;Pc;0;ON; 005F;;;;N;SPACING DASHED UNDERSCORE;;;; +FE4E;CENTRELINE LOW LINE;Pc;0;ON; 005F;;;;N;SPACING CENTERLINE UNDERSCORE;;;; +FE4F;WAVY LOW LINE;Pc;0;ON; 005F;;;;N;SPACING WAVY UNDERSCORE;;;; +FE50;SMALL COMMA;Po;0;CS; 002C;;;;N;;;;; +FE51;SMALL IDEOGRAPHIC COMMA;Po;0;ON; 3001;;;;N;;;;; +FE52;SMALL FULL STOP;Po;0;CS; 002E;;;;N;SMALL PERIOD;;;; +FE54;SMALL SEMICOLON;Po;0;ON; 003B;;;;N;;;;; +FE55;SMALL COLON;Po;0;CS; 003A;;;;N;;;;; +FE56;SMALL QUESTION MARK;Po;0;ON; 003F;;;;N;;;;; +FE57;SMALL EXCLAMATION MARK;Po;0;ON; 0021;;;;N;;;;; +FE58;SMALL EM DASH;Pd;0;ON; 2014;;;;N;;;;; +FE59;SMALL LEFT PARENTHESIS;Ps;0;ON; 0028;;;;Y;SMALL OPENING PARENTHESIS;;;; +FE5A;SMALL RIGHT PARENTHESIS;Pe;0;ON; 0029;;;;Y;SMALL CLOSING PARENTHESIS;;;; +FE5B;SMALL LEFT CURLY BRACKET;Ps;0;ON; 007B;;;;Y;SMALL OPENING CURLY BRACKET;;;; +FE5C;SMALL RIGHT CURLY BRACKET;Pe;0;ON; 007D;;;;Y;SMALL CLOSING CURLY BRACKET;;;; +FE5D;SMALL LEFT TORTOISE SHELL BRACKET;Ps;0;ON; 3014;;;;Y;SMALL OPENING TORTOISE SHELL BRACKET;;;; +FE5E;SMALL RIGHT TORTOISE SHELL BRACKET;Pe;0;ON; 3015;;;;Y;SMALL CLOSING TORTOISE SHELL BRACKET;;;; +FE5F;SMALL NUMBER SIGN;Po;0;ET; 0023;;;;N;;;;; +FE60;SMALL AMPERSAND;Po;0;ON; 0026;;;;N;;;;; +FE61;SMALL ASTERISK;Po;0;ON; 002A;;;;N;;;;; +FE62;SMALL PLUS SIGN;Sm;0;ES; 002B;;;;N;;;;; +FE63;SMALL HYPHEN-MINUS;Pd;0;ES; 002D;;;;N;;;;; +FE64;SMALL LESS-THAN SIGN;Sm;0;ON; 003C;;;;Y;;;;; +FE65;SMALL GREATER-THAN SIGN;Sm;0;ON; 003E;;;;Y;;;;; +FE66;SMALL EQUALS SIGN;Sm;0;ON; 003D;;;;N;;;;; +FE68;SMALL REVERSE SOLIDUS;Po;0;ON; 005C;;;;N;SMALL BACKSLASH;;;; +FE69;SMALL DOLLAR SIGN;Sc;0;ET; 0024;;;;N;;;;; +FE6A;SMALL PERCENT SIGN;Po;0;ET; 0025;;;;N;;;;; +FE6B;SMALL COMMERCIAL AT;Po;0;ON; 0040;;;;N;;;;; +FE70;ARABIC FATHATAN ISOLATED FORM;Lo;0;AL; 0020 064B;;;;N;ARABIC SPACING FATHATAN;;;; +FE71;ARABIC TATWEEL WITH FATHATAN ABOVE;Lo;0;AL; 0640 064B;;;;N;ARABIC FATHATAN ON TATWEEL;;;; +FE72;ARABIC DAMMATAN ISOLATED FORM;Lo;0;AL; 0020 064C;;;;N;ARABIC SPACING DAMMATAN;;;; +FE73;ARABIC TAIL FRAGMENT;Lo;0;AL;;;;;N;;;;; +FE74;ARABIC KASRATAN ISOLATED FORM;Lo;0;AL; 0020 064D;;;;N;ARABIC SPACING KASRATAN;;;; +FE76;ARABIC FATHA ISOLATED FORM;Lo;0;AL; 0020 064E;;;;N;ARABIC SPACING FATHAH;;;; +FE77;ARABIC FATHA MEDIAL FORM;Lo;0;AL; 0640 064E;;;;N;ARABIC FATHAH ON TATWEEL;;;; +FE78;ARABIC DAMMA ISOLATED FORM;Lo;0;AL; 0020 064F;;;;N;ARABIC SPACING DAMMAH;;;; +FE79;ARABIC DAMMA MEDIAL FORM;Lo;0;AL; 0640 064F;;;;N;ARABIC DAMMAH ON TATWEEL;;;; +FE7A;ARABIC KASRA ISOLATED FORM;Lo;0;AL; 0020 0650;;;;N;ARABIC SPACING KASRAH;;;; +FE7B;ARABIC KASRA MEDIAL FORM;Lo;0;AL; 0640 0650;;;;N;ARABIC KASRAH ON TATWEEL;;;; +FE7C;ARABIC SHADDA ISOLATED FORM;Lo;0;AL; 0020 0651;;;;N;ARABIC SPACING SHADDAH;;;; +FE7D;ARABIC SHADDA MEDIAL FORM;Lo;0;AL; 0640 0651;;;;N;ARABIC SHADDAH ON TATWEEL;;;; +FE7E;ARABIC SUKUN ISOLATED FORM;Lo;0;AL; 0020 0652;;;;N;ARABIC SPACING SUKUN;;;; +FE7F;ARABIC SUKUN MEDIAL FORM;Lo;0;AL; 0640 0652;;;;N;ARABIC SUKUN ON TATWEEL;;;; +FE80;ARABIC LETTER HAMZA ISOLATED FORM;Lo;0;AL; 0621;;;;N;GLYPH FOR ISOLATE ARABIC HAMZAH;;;; +FE81;ARABIC LETTER ALEF WITH MADDA ABOVE ISOLATED FORM;Lo;0;AL; 0622;;;;N;GLYPH FOR ISOLATE ARABIC MADDAH ON ALEF;;;; +FE82;ARABIC LETTER ALEF WITH MADDA ABOVE FINAL FORM;Lo;0;AL; 0622;;;;N;GLYPH FOR FINAL ARABIC MADDAH ON ALEF;;;; +FE83;ARABIC LETTER ALEF WITH HAMZA ABOVE ISOLATED FORM;Lo;0;AL; 0623;;;;N;GLYPH FOR ISOLATE ARABIC HAMZAH ON ALEF;;;; +FE84;ARABIC LETTER ALEF WITH HAMZA ABOVE FINAL FORM;Lo;0;AL; 0623;;;;N;GLYPH FOR FINAL ARABIC HAMZAH ON ALEF;;;; +FE85;ARABIC LETTER WAW WITH HAMZA ABOVE ISOLATED FORM;Lo;0;AL; 0624;;;;N;GLYPH FOR ISOLATE ARABIC HAMZAH ON WAW;;;; +FE86;ARABIC LETTER WAW WITH HAMZA ABOVE FINAL FORM;Lo;0;AL; 0624;;;;N;GLYPH FOR FINAL ARABIC HAMZAH ON WAW;;;; +FE87;ARABIC LETTER ALEF WITH HAMZA BELOW ISOLATED FORM;Lo;0;AL; 0625;;;;N;GLYPH FOR ISOLATE ARABIC HAMZAH UNDER ALEF;;;; +FE88;ARABIC LETTER ALEF WITH HAMZA BELOW FINAL FORM;Lo;0;AL; 0625;;;;N;GLYPH FOR FINAL ARABIC HAMZAH UNDER ALEF;;;; +FE89;ARABIC LETTER YEH WITH HAMZA ABOVE ISOLATED FORM;Lo;0;AL; 0626;;;;N;GLYPH FOR ISOLATE ARABIC HAMZAH ON YA;;;; +FE8A;ARABIC LETTER YEH WITH HAMZA ABOVE FINAL FORM;Lo;0;AL; 0626;;;;N;GLYPH FOR FINAL ARABIC HAMZAH ON YA;;;; +FE8B;ARABIC LETTER YEH WITH HAMZA ABOVE INITIAL FORM;Lo;0;AL; 0626;;;;N;GLYPH FOR INITIAL ARABIC HAMZAH ON YA;;;; +FE8C;ARABIC LETTER YEH WITH HAMZA ABOVE MEDIAL FORM;Lo;0;AL; 0626;;;;N;GLYPH FOR MEDIAL ARABIC HAMZAH ON YA;;;; +FE8D;ARABIC LETTER ALEF ISOLATED FORM;Lo;0;AL; 0627;;;;N;GLYPH FOR ISOLATE ARABIC ALEF;;;; +FE8E;ARABIC LETTER ALEF FINAL FORM;Lo;0;AL; 0627;;;;N;GLYPH FOR FINAL ARABIC ALEF;;;; +FE8F;ARABIC LETTER BEH ISOLATED FORM;Lo;0;AL; 0628;;;;N;GLYPH FOR ISOLATE ARABIC BAA;;;; +FE90;ARABIC LETTER BEH FINAL FORM;Lo;0;AL; 0628;;;;N;GLYPH FOR FINAL ARABIC BAA;;;; +FE91;ARABIC LETTER BEH INITIAL FORM;Lo;0;AL; 0628;;;;N;GLYPH FOR INITIAL ARABIC BAA;;;; +FE92;ARABIC LETTER BEH MEDIAL FORM;Lo;0;AL; 0628;;;;N;GLYPH FOR MEDIAL ARABIC BAA;;;; +FE93;ARABIC LETTER TEH MARBUTA ISOLATED FORM;Lo;0;AL; 0629;;;;N;GLYPH FOR ISOLATE ARABIC TAA MARBUTAH;;;; +FE94;ARABIC LETTER TEH MARBUTA FINAL FORM;Lo;0;AL; 0629;;;;N;GLYPH FOR FINAL ARABIC TAA MARBUTAH;;;; +FE95;ARABIC LETTER TEH ISOLATED FORM;Lo;0;AL; 062A;;;;N;GLYPH FOR ISOLATE ARABIC TAA;;;; +FE96;ARABIC LETTER TEH FINAL FORM;Lo;0;AL; 062A;;;;N;GLYPH FOR FINAL ARABIC TAA;;;; +FE97;ARABIC LETTER TEH INITIAL FORM;Lo;0;AL; 062A;;;;N;GLYPH FOR INITIAL ARABIC TAA;;;; +FE98;ARABIC LETTER TEH MEDIAL FORM;Lo;0;AL; 062A;;;;N;GLYPH FOR MEDIAL ARABIC TAA;;;; +FE99;ARABIC LETTER THEH ISOLATED FORM;Lo;0;AL; 062B;;;;N;GLYPH FOR ISOLATE ARABIC THAA;;;; +FE9A;ARABIC LETTER THEH FINAL FORM;Lo;0;AL; 062B;;;;N;GLYPH FOR FINAL ARABIC THAA;;;; +FE9B;ARABIC LETTER THEH INITIAL FORM;Lo;0;AL; 062B;;;;N;GLYPH FOR INITIAL ARABIC THAA;;;; +FE9C;ARABIC LETTER THEH MEDIAL FORM;Lo;0;AL; 062B;;;;N;GLYPH FOR MEDIAL ARABIC THAA;;;; +FE9D;ARABIC LETTER JEEM ISOLATED FORM;Lo;0;AL; 062C;;;;N;GLYPH FOR ISOLATE ARABIC JEEM;;;; +FE9E;ARABIC LETTER JEEM FINAL FORM;Lo;0;AL; 062C;;;;N;GLYPH FOR FINAL ARABIC JEEM;;;; +FE9F;ARABIC LETTER JEEM INITIAL FORM;Lo;0;AL; 062C;;;;N;GLYPH FOR INITIAL ARABIC JEEM;;;; +FEA0;ARABIC LETTER JEEM MEDIAL FORM;Lo;0;AL; 062C;;;;N;GLYPH FOR MEDIAL ARABIC JEEM;;;; +FEA1;ARABIC LETTER HAH ISOLATED FORM;Lo;0;AL; 062D;;;;N;GLYPH FOR ISOLATE ARABIC HAA;;;; +FEA2;ARABIC LETTER HAH FINAL FORM;Lo;0;AL; 062D;;;;N;GLYPH FOR FINAL ARABIC HAA;;;; +FEA3;ARABIC LETTER HAH INITIAL FORM;Lo;0;AL; 062D;;;;N;GLYPH FOR INITIAL ARABIC HAA;;;; +FEA4;ARABIC LETTER HAH MEDIAL FORM;Lo;0;AL; 062D;;;;N;GLYPH FOR MEDIAL ARABIC HAA;;;; +FEA5;ARABIC LETTER KHAH ISOLATED FORM;Lo;0;AL; 062E;;;;N;GLYPH FOR ISOLATE ARABIC KHAA;;;; +FEA6;ARABIC LETTER KHAH FINAL FORM;Lo;0;AL; 062E;;;;N;GLYPH FOR FINAL ARABIC KHAA;;;; +FEA7;ARABIC LETTER KHAH INITIAL FORM;Lo;0;AL; 062E;;;;N;GLYPH FOR INITIAL ARABIC KHAA;;;; +FEA8;ARABIC LETTER KHAH MEDIAL FORM;Lo;0;AL; 062E;;;;N;GLYPH FOR MEDIAL ARABIC KHAA;;;; +FEA9;ARABIC LETTER DAL ISOLATED FORM;Lo;0;AL; 062F;;;;N;GLYPH FOR ISOLATE ARABIC DAL;;;; +FEAA;ARABIC LETTER DAL FINAL FORM;Lo;0;AL; 062F;;;;N;GLYPH FOR FINAL ARABIC DAL;;;; +FEAB;ARABIC LETTER THAL ISOLATED FORM;Lo;0;AL; 0630;;;;N;GLYPH FOR ISOLATE ARABIC THAL;;;; +FEAC;ARABIC LETTER THAL FINAL FORM;Lo;0;AL; 0630;;;;N;GLYPH FOR FINAL ARABIC THAL;;;; +FEAD;ARABIC LETTER REH ISOLATED FORM;Lo;0;AL; 0631;;;;N;GLYPH FOR ISOLATE ARABIC RA;;;; +FEAE;ARABIC LETTER REH FINAL FORM;Lo;0;AL; 0631;;;;N;GLYPH FOR FINAL ARABIC RA;;;; +FEAF;ARABIC LETTER ZAIN ISOLATED FORM;Lo;0;AL; 0632;;;;N;GLYPH FOR ISOLATE ARABIC ZAIN;;;; +FEB0;ARABIC LETTER ZAIN FINAL FORM;Lo;0;AL; 0632;;;;N;GLYPH FOR FINAL ARABIC ZAIN;;;; +FEB1;ARABIC LETTER SEEN ISOLATED FORM;Lo;0;AL; 0633;;;;N;GLYPH FOR ISOLATE ARABIC SEEN;;;; +FEB2;ARABIC LETTER SEEN FINAL FORM;Lo;0;AL; 0633;;;;N;GLYPH FOR FINAL ARABIC SEEN;;;; +FEB3;ARABIC LETTER SEEN INITIAL FORM;Lo;0;AL; 0633;;;;N;GLYPH FOR INITIAL ARABIC SEEN;;;; +FEB4;ARABIC LETTER SEEN MEDIAL FORM;Lo;0;AL; 0633;;;;N;GLYPH FOR MEDIAL ARABIC SEEN;;;; +FEB5;ARABIC LETTER SHEEN ISOLATED FORM;Lo;0;AL; 0634;;;;N;GLYPH FOR ISOLATE ARABIC SHEEN;;;; +FEB6;ARABIC LETTER SHEEN FINAL FORM;Lo;0;AL; 0634;;;;N;GLYPH FOR FINAL ARABIC SHEEN;;;; +FEB7;ARABIC LETTER SHEEN INITIAL FORM;Lo;0;AL; 0634;;;;N;GLYPH FOR INITIAL ARABIC SHEEN;;;; +FEB8;ARABIC LETTER SHEEN MEDIAL FORM;Lo;0;AL; 0634;;;;N;GLYPH FOR MEDIAL ARABIC SHEEN;;;; +FEB9;ARABIC LETTER SAD ISOLATED FORM;Lo;0;AL; 0635;;;;N;GLYPH FOR ISOLATE ARABIC SAD;;;; +FEBA;ARABIC LETTER SAD FINAL FORM;Lo;0;AL; 0635;;;;N;GLYPH FOR FINAL ARABIC SAD;;;; +FEBB;ARABIC LETTER SAD INITIAL FORM;Lo;0;AL; 0635;;;;N;GLYPH FOR INITIAL ARABIC SAD;;;; +FEBC;ARABIC LETTER SAD MEDIAL FORM;Lo;0;AL; 0635;;;;N;GLYPH FOR MEDIAL ARABIC SAD;;;; +FEBD;ARABIC LETTER DAD ISOLATED FORM;Lo;0;AL; 0636;;;;N;GLYPH FOR ISOLATE ARABIC DAD;;;; +FEBE;ARABIC LETTER DAD FINAL FORM;Lo;0;AL; 0636;;;;N;GLYPH FOR FINAL ARABIC DAD;;;; +FEBF;ARABIC LETTER DAD INITIAL FORM;Lo;0;AL; 0636;;;;N;GLYPH FOR INITIAL ARABIC DAD;;;; +FEC0;ARABIC LETTER DAD MEDIAL FORM;Lo;0;AL; 0636;;;;N;GLYPH FOR MEDIAL ARABIC DAD;;;; +FEC1;ARABIC LETTER TAH ISOLATED FORM;Lo;0;AL; 0637;;;;N;GLYPH FOR ISOLATE ARABIC TAH;;;; +FEC2;ARABIC LETTER TAH FINAL FORM;Lo;0;AL; 0637;;;;N;GLYPH FOR FINAL ARABIC TAH;;;; +FEC3;ARABIC LETTER TAH INITIAL FORM;Lo;0;AL; 0637;;;;N;GLYPH FOR INITIAL ARABIC TAH;;;; +FEC4;ARABIC LETTER TAH MEDIAL FORM;Lo;0;AL; 0637;;;;N;GLYPH FOR MEDIAL ARABIC TAH;;;; +FEC5;ARABIC LETTER ZAH ISOLATED FORM;Lo;0;AL; 0638;;;;N;GLYPH FOR ISOLATE ARABIC DHAH;;;; +FEC6;ARABIC LETTER ZAH FINAL FORM;Lo;0;AL; 0638;;;;N;GLYPH FOR FINAL ARABIC DHAH;;;; +FEC7;ARABIC LETTER ZAH INITIAL FORM;Lo;0;AL; 0638;;;;N;GLYPH FOR INITIAL ARABIC DHAH;;;; +FEC8;ARABIC LETTER ZAH MEDIAL FORM;Lo;0;AL; 0638;;;;N;GLYPH FOR MEDIAL ARABIC DHAH;;;; +FEC9;ARABIC LETTER AIN ISOLATED FORM;Lo;0;AL; 0639;;;;N;GLYPH FOR ISOLATE ARABIC AIN;;;; +FECA;ARABIC LETTER AIN FINAL FORM;Lo;0;AL; 0639;;;;N;GLYPH FOR FINAL ARABIC AIN;;;; +FECB;ARABIC LETTER AIN INITIAL FORM;Lo;0;AL; 0639;;;;N;GLYPH FOR INITIAL ARABIC AIN;;;; +FECC;ARABIC LETTER AIN MEDIAL FORM;Lo;0;AL; 0639;;;;N;GLYPH FOR MEDIAL ARABIC AIN;;;; +FECD;ARABIC LETTER GHAIN ISOLATED FORM;Lo;0;AL; 063A;;;;N;GLYPH FOR ISOLATE ARABIC GHAIN;;;; +FECE;ARABIC LETTER GHAIN FINAL FORM;Lo;0;AL; 063A;;;;N;GLYPH FOR FINAL ARABIC GHAIN;;;; +FECF;ARABIC LETTER GHAIN INITIAL FORM;Lo;0;AL; 063A;;;;N;GLYPH FOR INITIAL ARABIC GHAIN;;;; +FED0;ARABIC LETTER GHAIN MEDIAL FORM;Lo;0;AL; 063A;;;;N;GLYPH FOR MEDIAL ARABIC GHAIN;;;; +FED1;ARABIC LETTER FEH ISOLATED FORM;Lo;0;AL; 0641;;;;N;GLYPH FOR ISOLATE ARABIC FA;;;; +FED2;ARABIC LETTER FEH FINAL FORM;Lo;0;AL; 0641;;;;N;GLYPH FOR FINAL ARABIC FA;;;; +FED3;ARABIC LETTER FEH INITIAL FORM;Lo;0;AL; 0641;;;;N;GLYPH FOR INITIAL ARABIC FA;;;; +FED4;ARABIC LETTER FEH MEDIAL FORM;Lo;0;AL; 0641;;;;N;GLYPH FOR MEDIAL ARABIC FA;;;; +FED5;ARABIC LETTER QAF ISOLATED FORM;Lo;0;AL; 0642;;;;N;GLYPH FOR ISOLATE ARABIC QAF;;;; +FED6;ARABIC LETTER QAF FINAL FORM;Lo;0;AL; 0642;;;;N;GLYPH FOR FINAL ARABIC QAF;;;; +FED7;ARABIC LETTER QAF INITIAL FORM;Lo;0;AL; 0642;;;;N;GLYPH FOR INITIAL ARABIC QAF;;;; +FED8;ARABIC LETTER QAF MEDIAL FORM;Lo;0;AL; 0642;;;;N;GLYPH FOR MEDIAL ARABIC QAF;;;; +FED9;ARABIC LETTER KAF ISOLATED FORM;Lo;0;AL; 0643;;;;N;GLYPH FOR ISOLATE ARABIC CAF;;;; +FEDA;ARABIC LETTER KAF FINAL FORM;Lo;0;AL; 0643;;;;N;GLYPH FOR FINAL ARABIC CAF;;;; +FEDB;ARABIC LETTER KAF INITIAL FORM;Lo;0;AL; 0643;;;;N;GLYPH FOR INITIAL ARABIC CAF;;;; +FEDC;ARABIC LETTER KAF MEDIAL FORM;Lo;0;AL; 0643;;;;N;GLYPH FOR MEDIAL ARABIC CAF;;;; +FEDD;ARABIC LETTER LAM ISOLATED FORM;Lo;0;AL; 0644;;;;N;GLYPH FOR ISOLATE ARABIC LAM;;;; +FEDE;ARABIC LETTER LAM FINAL FORM;Lo;0;AL; 0644;;;;N;GLYPH FOR FINAL ARABIC LAM;;;; +FEDF;ARABIC LETTER LAM INITIAL FORM;Lo;0;AL; 0644;;;;N;GLYPH FOR INITIAL ARABIC LAM;;;; +FEE0;ARABIC LETTER LAM MEDIAL FORM;Lo;0;AL; 0644;;;;N;GLYPH FOR MEDIAL ARABIC LAM;;;; +FEE1;ARABIC LETTER MEEM ISOLATED FORM;Lo;0;AL; 0645;;;;N;GLYPH FOR ISOLATE ARABIC MEEM;;;; +FEE2;ARABIC LETTER MEEM FINAL FORM;Lo;0;AL; 0645;;;;N;GLYPH FOR FINAL ARABIC MEEM;;;; +FEE3;ARABIC LETTER MEEM INITIAL FORM;Lo;0;AL; 0645;;;;N;GLYPH FOR INITIAL ARABIC MEEM;;;; +FEE4;ARABIC LETTER MEEM MEDIAL FORM;Lo;0;AL; 0645;;;;N;GLYPH FOR MEDIAL ARABIC MEEM;;;; +FEE5;ARABIC LETTER NOON ISOLATED FORM;Lo;0;AL; 0646;;;;N;GLYPH FOR ISOLATE ARABIC NOON;;;; +FEE6;ARABIC LETTER NOON FINAL FORM;Lo;0;AL; 0646;;;;N;GLYPH FOR FINAL ARABIC NOON;;;; +FEE7;ARABIC LETTER NOON INITIAL FORM;Lo;0;AL; 0646;;;;N;GLYPH FOR INITIAL ARABIC NOON;;;; +FEE8;ARABIC LETTER NOON MEDIAL FORM;Lo;0;AL; 0646;;;;N;GLYPH FOR MEDIAL ARABIC NOON;;;; +FEE9;ARABIC LETTER HEH ISOLATED FORM;Lo;0;AL; 0647;;;;N;GLYPH FOR ISOLATE ARABIC HA;;;; +FEEA;ARABIC LETTER HEH FINAL FORM;Lo;0;AL; 0647;;;;N;GLYPH FOR FINAL ARABIC HA;;;; +FEEB;ARABIC LETTER HEH INITIAL FORM;Lo;0;AL; 0647;;;;N;GLYPH FOR INITIAL ARABIC HA;;;; +FEEC;ARABIC LETTER HEH MEDIAL FORM;Lo;0;AL; 0647;;;;N;GLYPH FOR MEDIAL ARABIC HA;;;; +FEED;ARABIC LETTER WAW ISOLATED FORM;Lo;0;AL; 0648;;;;N;GLYPH FOR ISOLATE ARABIC WAW;;;; +FEEE;ARABIC LETTER WAW FINAL FORM;Lo;0;AL; 0648;;;;N;GLYPH FOR FINAL ARABIC WAW;;;; +FEEF;ARABIC LETTER ALEF MAKSURA ISOLATED FORM;Lo;0;AL; 0649;;;;N;GLYPH FOR ISOLATE ARABIC ALEF MAQSURAH;;;; +FEF0;ARABIC LETTER ALEF MAKSURA FINAL FORM;Lo;0;AL; 0649;;;;N;GLYPH FOR FINAL ARABIC ALEF MAQSURAH;;;; +FEF1;ARABIC LETTER YEH ISOLATED FORM;Lo;0;AL; 064A;;;;N;GLYPH FOR ISOLATE ARABIC YA;;;; +FEF2;ARABIC LETTER YEH FINAL FORM;Lo;0;AL; 064A;;;;N;GLYPH FOR FINAL ARABIC YA;;;; +FEF3;ARABIC LETTER YEH INITIAL FORM;Lo;0;AL; 064A;;;;N;GLYPH FOR INITIAL ARABIC YA;;;; +FEF4;ARABIC LETTER YEH MEDIAL FORM;Lo;0;AL; 064A;;;;N;GLYPH FOR MEDIAL ARABIC YA;;;; +FEF5;ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE ISOLATED FORM;Lo;0;AL; 0644 0622;;;;N;GLYPH FOR ISOLATE ARABIC MADDAH ON LIGATURE LAM ALEF;;;; +FEF6;ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE FINAL FORM;Lo;0;AL; 0644 0622;;;;N;GLYPH FOR FINAL ARABIC MADDAH ON LIGATURE LAM ALEF;;;; +FEF7;ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE ISOLATED FORM;Lo;0;AL; 0644 0623;;;;N;GLYPH FOR ISOLATE ARABIC HAMZAH ON LIGATURE LAM ALEF;;;; +FEF8;ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE FINAL FORM;Lo;0;AL; 0644 0623;;;;N;GLYPH FOR FINAL ARABIC HAMZAH ON LIGATURE LAM ALEF;;;; +FEF9;ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW ISOLATED FORM;Lo;0;AL; 0644 0625;;;;N;GLYPH FOR ISOLATE ARABIC HAMZAH UNDER LIGATURE LAM ALEF;;;; +FEFA;ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW FINAL FORM;Lo;0;AL; 0644 0625;;;;N;GLYPH FOR FINAL ARABIC HAMZAH UNDER LIGATURE LAM ALEF;;;; +FEFB;ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM;Lo;0;AL; 0644 0627;;;;N;GLYPH FOR ISOLATE ARABIC LIGATURE LAM ALEF;;;; +FEFC;ARABIC LIGATURE LAM WITH ALEF FINAL FORM;Lo;0;AL; 0644 0627;;;;N;GLYPH FOR FINAL ARABIC LIGATURE LAM ALEF;;;; +FEFF;ZERO WIDTH NO-BREAK SPACE;Cf;0;BN;;;;;N;BYTE ORDER MARK;;;; +FF01;FULLWIDTH EXCLAMATION MARK;Po;0;ON; 0021;;;;N;;;;; +FF02;FULLWIDTH QUOTATION MARK;Po;0;ON; 0022;;;;N;;;;; +FF03;FULLWIDTH NUMBER SIGN;Po;0;ET; 0023;;;;N;;;;; +FF04;FULLWIDTH DOLLAR SIGN;Sc;0;ET; 0024;;;;N;;;;; +FF05;FULLWIDTH PERCENT SIGN;Po;0;ET; 0025;;;;N;;;;; +FF06;FULLWIDTH AMPERSAND;Po;0;ON; 0026;;;;N;;;;; +FF07;FULLWIDTH APOSTROPHE;Po;0;ON; 0027;;;;N;;;;; +FF08;FULLWIDTH LEFT PARENTHESIS;Ps;0;ON; 0028;;;;Y;FULLWIDTH OPENING PARENTHESIS;;;; +FF09;FULLWIDTH RIGHT PARENTHESIS;Pe;0;ON; 0029;;;;Y;FULLWIDTH CLOSING PARENTHESIS;;;; +FF0A;FULLWIDTH ASTERISK;Po;0;ON; 002A;;;;N;;;;; +FF0B;FULLWIDTH PLUS SIGN;Sm;0;ES; 002B;;;;N;;;;; +FF0C;FULLWIDTH COMMA;Po;0;CS; 002C;;;;N;;;;; +FF0D;FULLWIDTH HYPHEN-MINUS;Pd;0;ES; 002D;;;;N;;;;; +FF0E;FULLWIDTH FULL STOP;Po;0;CS; 002E;;;;N;FULLWIDTH PERIOD;;;; +FF0F;FULLWIDTH SOLIDUS;Po;0;CS; 002F;;;;N;FULLWIDTH SLASH;;;; +FF10;FULLWIDTH DIGIT ZERO;Nd;0;EN; 0030;0;0;0;N;;;;; +FF11;FULLWIDTH DIGIT ONE;Nd;0;EN; 0031;1;1;1;N;;;;; +FF12;FULLWIDTH DIGIT TWO;Nd;0;EN; 0032;2;2;2;N;;;;; +FF13;FULLWIDTH DIGIT THREE;Nd;0;EN; 0033;3;3;3;N;;;;; +FF14;FULLWIDTH DIGIT FOUR;Nd;0;EN; 0034;4;4;4;N;;;;; +FF15;FULLWIDTH DIGIT FIVE;Nd;0;EN; 0035;5;5;5;N;;;;; +FF16;FULLWIDTH DIGIT SIX;Nd;0;EN; 0036;6;6;6;N;;;;; +FF17;FULLWIDTH DIGIT SEVEN;Nd;0;EN; 0037;7;7;7;N;;;;; +FF18;FULLWIDTH DIGIT EIGHT;Nd;0;EN; 0038;8;8;8;N;;;;; +FF19;FULLWIDTH DIGIT NINE;Nd;0;EN; 0039;9;9;9;N;;;;; +FF1A;FULLWIDTH COLON;Po;0;CS; 003A;;;;N;;;;; +FF1B;FULLWIDTH SEMICOLON;Po;0;ON; 003B;;;;N;;;;; +FF1C;FULLWIDTH LESS-THAN SIGN;Sm;0;ON; 003C;;;;Y;;;;; +FF1D;FULLWIDTH EQUALS SIGN;Sm;0;ON; 003D;;;;N;;;;; +FF1E;FULLWIDTH GREATER-THAN SIGN;Sm;0;ON; 003E;;;;Y;;;;; +FF1F;FULLWIDTH QUESTION MARK;Po;0;ON; 003F;;;;N;;;;; +FF20;FULLWIDTH COMMERCIAL AT;Po;0;ON; 0040;;;;N;;;;; +FF21;FULLWIDTH LATIN CAPITAL LETTER A;Lu;0;L; 0041;;;;N;;;;FF41; +FF22;FULLWIDTH LATIN CAPITAL LETTER B;Lu;0;L; 0042;;;;N;;;;FF42; +FF23;FULLWIDTH LATIN CAPITAL LETTER C;Lu;0;L; 0043;;;;N;;;;FF43; +FF24;FULLWIDTH LATIN CAPITAL LETTER D;Lu;0;L; 0044;;;;N;;;;FF44; +FF25;FULLWIDTH LATIN CAPITAL LETTER E;Lu;0;L; 0045;;;;N;;;;FF45; +FF26;FULLWIDTH LATIN CAPITAL LETTER F;Lu;0;L; 0046;;;;N;;;;FF46; +FF27;FULLWIDTH LATIN CAPITAL LETTER G;Lu;0;L; 0047;;;;N;;;;FF47; +FF28;FULLWIDTH LATIN CAPITAL LETTER H;Lu;0;L; 0048;;;;N;;;;FF48; +FF29;FULLWIDTH LATIN CAPITAL LETTER I;Lu;0;L; 0049;;;;N;;;;FF49; +FF2A;FULLWIDTH LATIN CAPITAL LETTER J;Lu;0;L; 004A;;;;N;;;;FF4A; +FF2B;FULLWIDTH LATIN CAPITAL LETTER K;Lu;0;L; 004B;;;;N;;;;FF4B; +FF2C;FULLWIDTH LATIN CAPITAL LETTER L;Lu;0;L; 004C;;;;N;;;;FF4C; +FF2D;FULLWIDTH LATIN CAPITAL LETTER M;Lu;0;L; 004D;;;;N;;;;FF4D; +FF2E;FULLWIDTH LATIN CAPITAL LETTER N;Lu;0;L; 004E;;;;N;;;;FF4E; +FF2F;FULLWIDTH LATIN CAPITAL LETTER O;Lu;0;L; 004F;;;;N;;;;FF4F; +FF30;FULLWIDTH LATIN CAPITAL LETTER P;Lu;0;L; 0050;;;;N;;;;FF50; +FF31;FULLWIDTH LATIN CAPITAL LETTER Q;Lu;0;L; 0051;;;;N;;;;FF51; +FF32;FULLWIDTH LATIN CAPITAL LETTER R;Lu;0;L; 0052;;;;N;;;;FF52; +FF33;FULLWIDTH LATIN CAPITAL LETTER S;Lu;0;L; 0053;;;;N;;;;FF53; +FF34;FULLWIDTH LATIN CAPITAL LETTER T;Lu;0;L; 0054;;;;N;;;;FF54; +FF35;FULLWIDTH LATIN CAPITAL LETTER U;Lu;0;L; 0055;;;;N;;;;FF55; +FF36;FULLWIDTH LATIN CAPITAL LETTER V;Lu;0;L; 0056;;;;N;;;;FF56; +FF37;FULLWIDTH LATIN CAPITAL LETTER W;Lu;0;L; 0057;;;;N;;;;FF57; +FF38;FULLWIDTH LATIN CAPITAL LETTER X;Lu;0;L; 0058;;;;N;;;;FF58; +FF39;FULLWIDTH LATIN CAPITAL LETTER Y;Lu;0;L; 0059;;;;N;;;;FF59; +FF3A;FULLWIDTH LATIN CAPITAL LETTER Z;Lu;0;L; 005A;;;;N;;;;FF5A; +FF3B;FULLWIDTH LEFT SQUARE BRACKET;Ps;0;ON; 005B;;;;Y;FULLWIDTH OPENING SQUARE BRACKET;;;; +FF3C;FULLWIDTH REVERSE SOLIDUS;Po;0;ON; 005C;;;;N;FULLWIDTH BACKSLASH;;;; +FF3D;FULLWIDTH RIGHT SQUARE BRACKET;Pe;0;ON; 005D;;;;Y;FULLWIDTH CLOSING SQUARE BRACKET;;;; +FF3E;FULLWIDTH CIRCUMFLEX ACCENT;Sk;0;ON; 005E;;;;N;FULLWIDTH SPACING CIRCUMFLEX;;;; +FF3F;FULLWIDTH LOW LINE;Pc;0;ON; 005F;;;;N;FULLWIDTH SPACING UNDERSCORE;;;; +FF40;FULLWIDTH GRAVE ACCENT;Sk;0;ON; 0060;;;;N;FULLWIDTH SPACING GRAVE;;;; +FF41;FULLWIDTH LATIN SMALL LETTER A;Ll;0;L; 0061;;;;N;;;FF21;;FF21 +FF42;FULLWIDTH LATIN SMALL LETTER B;Ll;0;L; 0062;;;;N;;;FF22;;FF22 +FF43;FULLWIDTH LATIN SMALL LETTER C;Ll;0;L; 0063;;;;N;;;FF23;;FF23 +FF44;FULLWIDTH LATIN SMALL LETTER D;Ll;0;L; 0064;;;;N;;;FF24;;FF24 +FF45;FULLWIDTH LATIN SMALL LETTER E;Ll;0;L; 0065;;;;N;;;FF25;;FF25 +FF46;FULLWIDTH LATIN SMALL LETTER F;Ll;0;L; 0066;;;;N;;;FF26;;FF26 +FF47;FULLWIDTH LATIN SMALL LETTER G;Ll;0;L; 0067;;;;N;;;FF27;;FF27 +FF48;FULLWIDTH LATIN SMALL LETTER H;Ll;0;L; 0068;;;;N;;;FF28;;FF28 +FF49;FULLWIDTH LATIN SMALL LETTER I;Ll;0;L; 0069;;;;N;;;FF29;;FF29 +FF4A;FULLWIDTH LATIN SMALL LETTER J;Ll;0;L; 006A;;;;N;;;FF2A;;FF2A +FF4B;FULLWIDTH LATIN SMALL LETTER K;Ll;0;L; 006B;;;;N;;;FF2B;;FF2B +FF4C;FULLWIDTH LATIN SMALL LETTER L;Ll;0;L; 006C;;;;N;;;FF2C;;FF2C +FF4D;FULLWIDTH LATIN SMALL LETTER M;Ll;0;L; 006D;;;;N;;;FF2D;;FF2D +FF4E;FULLWIDTH LATIN SMALL LETTER N;Ll;0;L; 006E;;;;N;;;FF2E;;FF2E +FF4F;FULLWIDTH LATIN SMALL LETTER O;Ll;0;L; 006F;;;;N;;;FF2F;;FF2F +FF50;FULLWIDTH LATIN SMALL LETTER P;Ll;0;L; 0070;;;;N;;;FF30;;FF30 +FF51;FULLWIDTH LATIN SMALL LETTER Q;Ll;0;L; 0071;;;;N;;;FF31;;FF31 +FF52;FULLWIDTH LATIN SMALL LETTER R;Ll;0;L; 0072;;;;N;;;FF32;;FF32 +FF53;FULLWIDTH LATIN SMALL LETTER S;Ll;0;L; 0073;;;;N;;;FF33;;FF33 +FF54;FULLWIDTH LATIN SMALL LETTER T;Ll;0;L; 0074;;;;N;;;FF34;;FF34 +FF55;FULLWIDTH LATIN SMALL LETTER U;Ll;0;L; 0075;;;;N;;;FF35;;FF35 +FF56;FULLWIDTH LATIN SMALL LETTER V;Ll;0;L; 0076;;;;N;;;FF36;;FF36 +FF57;FULLWIDTH LATIN SMALL LETTER W;Ll;0;L; 0077;;;;N;;;FF37;;FF37 +FF58;FULLWIDTH LATIN SMALL LETTER X;Ll;0;L; 0078;;;;N;;;FF38;;FF38 +FF59;FULLWIDTH LATIN SMALL LETTER Y;Ll;0;L; 0079;;;;N;;;FF39;;FF39 +FF5A;FULLWIDTH LATIN SMALL LETTER Z;Ll;0;L; 007A;;;;N;;;FF3A;;FF3A +FF5B;FULLWIDTH LEFT CURLY BRACKET;Ps;0;ON; 007B;;;;Y;FULLWIDTH OPENING CURLY BRACKET;;;; +FF5C;FULLWIDTH VERTICAL LINE;Sm;0;ON; 007C;;;;N;FULLWIDTH VERTICAL BAR;;;; +FF5D;FULLWIDTH RIGHT CURLY BRACKET;Pe;0;ON; 007D;;;;Y;FULLWIDTH CLOSING CURLY BRACKET;;;; +FF5E;FULLWIDTH TILDE;Sm;0;ON; 007E;;;;N;FULLWIDTH SPACING TILDE;;;; +FF5F;FULLWIDTH LEFT WHITE PARENTHESIS;Ps;0;ON; 2985;;;;Y;;;;; +FF60;FULLWIDTH RIGHT WHITE PARENTHESIS;Pe;0;ON; 2986;;;;Y;;;;; +FF61;HALFWIDTH IDEOGRAPHIC FULL STOP;Po;0;ON; 3002;;;;N;HALFWIDTH IDEOGRAPHIC PERIOD;;;; +FF62;HALFWIDTH LEFT CORNER BRACKET;Ps;0;ON; 300C;;;;Y;HALFWIDTH OPENING CORNER BRACKET;;;; +FF63;HALFWIDTH RIGHT CORNER BRACKET;Pe;0;ON; 300D;;;;Y;HALFWIDTH CLOSING CORNER BRACKET;;;; +FF64;HALFWIDTH IDEOGRAPHIC COMMA;Po;0;ON; 3001;;;;N;;;;; +FF65;HALFWIDTH KATAKANA MIDDLE DOT;Po;0;ON; 30FB;;;;N;;;;; +FF66;HALFWIDTH KATAKANA LETTER WO;Lo;0;L; 30F2;;;;N;;;;; +FF67;HALFWIDTH KATAKANA LETTER SMALL A;Lo;0;L; 30A1;;;;N;;;;; +FF68;HALFWIDTH KATAKANA LETTER SMALL I;Lo;0;L; 30A3;;;;N;;;;; +FF69;HALFWIDTH KATAKANA LETTER SMALL U;Lo;0;L; 30A5;;;;N;;;;; +FF6A;HALFWIDTH KATAKANA LETTER SMALL E;Lo;0;L; 30A7;;;;N;;;;; +FF6B;HALFWIDTH KATAKANA LETTER SMALL O;Lo;0;L; 30A9;;;;N;;;;; +FF6C;HALFWIDTH KATAKANA LETTER SMALL YA;Lo;0;L; 30E3;;;;N;;;;; +FF6D;HALFWIDTH KATAKANA LETTER SMALL YU;Lo;0;L; 30E5;;;;N;;;;; +FF6E;HALFWIDTH KATAKANA LETTER SMALL YO;Lo;0;L; 30E7;;;;N;;;;; +FF6F;HALFWIDTH KATAKANA LETTER SMALL TU;Lo;0;L; 30C3;;;;N;;;;; +FF70;HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK;Lm;0;L; 30FC;;;;N;;;;; +FF71;HALFWIDTH KATAKANA LETTER A;Lo;0;L; 30A2;;;;N;;;;; +FF72;HALFWIDTH KATAKANA LETTER I;Lo;0;L; 30A4;;;;N;;;;; +FF73;HALFWIDTH KATAKANA LETTER U;Lo;0;L; 30A6;;;;N;;;;; +FF74;HALFWIDTH KATAKANA LETTER E;Lo;0;L; 30A8;;;;N;;;;; +FF75;HALFWIDTH KATAKANA LETTER O;Lo;0;L; 30AA;;;;N;;;;; +FF76;HALFWIDTH KATAKANA LETTER KA;Lo;0;L; 30AB;;;;N;;;;; +FF77;HALFWIDTH KATAKANA LETTER KI;Lo;0;L; 30AD;;;;N;;;;; +FF78;HALFWIDTH KATAKANA LETTER KU;Lo;0;L; 30AF;;;;N;;;;; +FF79;HALFWIDTH KATAKANA LETTER KE;Lo;0;L; 30B1;;;;N;;;;; +FF7A;HALFWIDTH KATAKANA LETTER KO;Lo;0;L; 30B3;;;;N;;;;; +FF7B;HALFWIDTH KATAKANA LETTER SA;Lo;0;L; 30B5;;;;N;;;;; +FF7C;HALFWIDTH KATAKANA LETTER SI;Lo;0;L; 30B7;;;;N;;;;; +FF7D;HALFWIDTH KATAKANA LETTER SU;Lo;0;L; 30B9;;;;N;;;;; +FF7E;HALFWIDTH KATAKANA LETTER SE;Lo;0;L; 30BB;;;;N;;;;; +FF7F;HALFWIDTH KATAKANA LETTER SO;Lo;0;L; 30BD;;;;N;;;;; +FF80;HALFWIDTH KATAKANA LETTER TA;Lo;0;L; 30BF;;;;N;;;;; +FF81;HALFWIDTH KATAKANA LETTER TI;Lo;0;L; 30C1;;;;N;;;;; +FF82;HALFWIDTH KATAKANA LETTER TU;Lo;0;L; 30C4;;;;N;;;;; +FF83;HALFWIDTH KATAKANA LETTER TE;Lo;0;L; 30C6;;;;N;;;;; +FF84;HALFWIDTH KATAKANA LETTER TO;Lo;0;L; 30C8;;;;N;;;;; +FF85;HALFWIDTH KATAKANA LETTER NA;Lo;0;L; 30CA;;;;N;;;;; +FF86;HALFWIDTH KATAKANA LETTER NI;Lo;0;L; 30CB;;;;N;;;;; +FF87;HALFWIDTH KATAKANA LETTER NU;Lo;0;L; 30CC;;;;N;;;;; +FF88;HALFWIDTH KATAKANA LETTER NE;Lo;0;L; 30CD;;;;N;;;;; +FF89;HALFWIDTH KATAKANA LETTER NO;Lo;0;L; 30CE;;;;N;;;;; +FF8A;HALFWIDTH KATAKANA LETTER HA;Lo;0;L; 30CF;;;;N;;;;; +FF8B;HALFWIDTH KATAKANA LETTER HI;Lo;0;L; 30D2;;;;N;;;;; +FF8C;HALFWIDTH KATAKANA LETTER HU;Lo;0;L; 30D5;;;;N;;;;; +FF8D;HALFWIDTH KATAKANA LETTER HE;Lo;0;L; 30D8;;;;N;;;;; +FF8E;HALFWIDTH KATAKANA LETTER HO;Lo;0;L; 30DB;;;;N;;;;; +FF8F;HALFWIDTH KATAKANA LETTER MA;Lo;0;L; 30DE;;;;N;;;;; +FF90;HALFWIDTH KATAKANA LETTER MI;Lo;0;L; 30DF;;;;N;;;;; +FF91;HALFWIDTH KATAKANA LETTER MU;Lo;0;L; 30E0;;;;N;;;;; +FF92;HALFWIDTH KATAKANA LETTER ME;Lo;0;L; 30E1;;;;N;;;;; +FF93;HALFWIDTH KATAKANA LETTER MO;Lo;0;L; 30E2;;;;N;;;;; +FF94;HALFWIDTH KATAKANA LETTER YA;Lo;0;L; 30E4;;;;N;;;;; +FF95;HALFWIDTH KATAKANA LETTER YU;Lo;0;L; 30E6;;;;N;;;;; +FF96;HALFWIDTH KATAKANA LETTER YO;Lo;0;L; 30E8;;;;N;;;;; +FF97;HALFWIDTH KATAKANA LETTER RA;Lo;0;L; 30E9;;;;N;;;;; +FF98;HALFWIDTH KATAKANA LETTER RI;Lo;0;L; 30EA;;;;N;;;;; +FF99;HALFWIDTH KATAKANA LETTER RU;Lo;0;L; 30EB;;;;N;;;;; +FF9A;HALFWIDTH KATAKANA LETTER RE;Lo;0;L; 30EC;;;;N;;;;; +FF9B;HALFWIDTH KATAKANA LETTER RO;Lo;0;L; 30ED;;;;N;;;;; +FF9C;HALFWIDTH KATAKANA LETTER WA;Lo;0;L; 30EF;;;;N;;;;; +FF9D;HALFWIDTH KATAKANA LETTER N;Lo;0;L; 30F3;;;;N;;;;; +FF9E;HALFWIDTH KATAKANA VOICED SOUND MARK;Lm;0;L; 3099;;;;N;;;;; +FF9F;HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK;Lm;0;L; 309A;;;;N;;;;; +FFA0;HALFWIDTH HANGUL FILLER;Lo;0;L; 3164;;;;N;HALFWIDTH HANGUL CAE OM;;;; +FFA1;HALFWIDTH HANGUL LETTER KIYEOK;Lo;0;L; 3131;;;;N;HALFWIDTH HANGUL LETTER GIYEOG;;;; +FFA2;HALFWIDTH HANGUL LETTER SSANGKIYEOK;Lo;0;L; 3132;;;;N;HALFWIDTH HANGUL LETTER SSANG GIYEOG;;;; +FFA3;HALFWIDTH HANGUL LETTER KIYEOK-SIOS;Lo;0;L; 3133;;;;N;HALFWIDTH HANGUL LETTER GIYEOG SIOS;;;; +FFA4;HALFWIDTH HANGUL LETTER NIEUN;Lo;0;L; 3134;;;;N;;;;; +FFA5;HALFWIDTH HANGUL LETTER NIEUN-CIEUC;Lo;0;L; 3135;;;;N;HALFWIDTH HANGUL LETTER NIEUN JIEUJ;;;; +FFA6;HALFWIDTH HANGUL LETTER NIEUN-HIEUH;Lo;0;L; 3136;;;;N;HALFWIDTH HANGUL LETTER NIEUN HIEUH;;;; +FFA7;HALFWIDTH HANGUL LETTER TIKEUT;Lo;0;L; 3137;;;;N;HALFWIDTH HANGUL LETTER DIGEUD;;;; +FFA8;HALFWIDTH HANGUL LETTER SSANGTIKEUT;Lo;0;L; 3138;;;;N;HALFWIDTH HANGUL LETTER SSANG DIGEUD;;;; +FFA9;HALFWIDTH HANGUL LETTER RIEUL;Lo;0;L; 3139;;;;N;HALFWIDTH HANGUL LETTER LIEUL;;;; +FFAA;HALFWIDTH HANGUL LETTER RIEUL-KIYEOK;Lo;0;L; 313A;;;;N;HALFWIDTH HANGUL LETTER LIEUL GIYEOG;;;; +FFAB;HALFWIDTH HANGUL LETTER RIEUL-MIEUM;Lo;0;L; 313B;;;;N;HALFWIDTH HANGUL LETTER LIEUL MIEUM;;;; +FFAC;HALFWIDTH HANGUL LETTER RIEUL-PIEUP;Lo;0;L; 313C;;;;N;HALFWIDTH HANGUL LETTER LIEUL BIEUB;;;; +FFAD;HALFWIDTH HANGUL LETTER RIEUL-SIOS;Lo;0;L; 313D;;;;N;HALFWIDTH HANGUL LETTER LIEUL SIOS;;;; +FFAE;HALFWIDTH HANGUL LETTER RIEUL-THIEUTH;Lo;0;L; 313E;;;;N;HALFWIDTH HANGUL LETTER LIEUL TIEUT;;;; +FFAF;HALFWIDTH HANGUL LETTER RIEUL-PHIEUPH;Lo;0;L; 313F;;;;N;HALFWIDTH HANGUL LETTER LIEUL PIEUP;;;; +FFB0;HALFWIDTH HANGUL LETTER RIEUL-HIEUH;Lo;0;L; 3140;;;;N;HALFWIDTH HANGUL LETTER LIEUL HIEUH;;;; +FFB1;HALFWIDTH HANGUL LETTER MIEUM;Lo;0;L; 3141;;;;N;;;;; +FFB2;HALFWIDTH HANGUL LETTER PIEUP;Lo;0;L; 3142;;;;N;HALFWIDTH HANGUL LETTER BIEUB;;;; +FFB3;HALFWIDTH HANGUL LETTER SSANGPIEUP;Lo;0;L; 3143;;;;N;HALFWIDTH HANGUL LETTER SSANG BIEUB;;;; +FFB4;HALFWIDTH HANGUL LETTER PIEUP-SIOS;Lo;0;L; 3144;;;;N;HALFWIDTH HANGUL LETTER BIEUB SIOS;;;; +FFB5;HALFWIDTH HANGUL LETTER SIOS;Lo;0;L; 3145;;;;N;;;;; +FFB6;HALFWIDTH HANGUL LETTER SSANGSIOS;Lo;0;L; 3146;;;;N;HALFWIDTH HANGUL LETTER SSANG SIOS;;;; +FFB7;HALFWIDTH HANGUL LETTER IEUNG;Lo;0;L; 3147;;;;N;;;;; +FFB8;HALFWIDTH HANGUL LETTER CIEUC;Lo;0;L; 3148;;;;N;HALFWIDTH HANGUL LETTER JIEUJ;;;; +FFB9;HALFWIDTH HANGUL LETTER SSANGCIEUC;Lo;0;L; 3149;;;;N;HALFWIDTH HANGUL LETTER SSANG JIEUJ;;;; +FFBA;HALFWIDTH HANGUL LETTER CHIEUCH;Lo;0;L; 314A;;;;N;HALFWIDTH HANGUL LETTER CIEUC;;;; +FFBB;HALFWIDTH HANGUL LETTER KHIEUKH;Lo;0;L; 314B;;;;N;HALFWIDTH HANGUL LETTER KIYEOK;;;; +FFBC;HALFWIDTH HANGUL LETTER THIEUTH;Lo;0;L; 314C;;;;N;HALFWIDTH HANGUL LETTER TIEUT;;;; +FFBD;HALFWIDTH HANGUL LETTER PHIEUPH;Lo;0;L; 314D;;;;N;HALFWIDTH HANGUL LETTER PIEUP;;;; +FFBE;HALFWIDTH HANGUL LETTER HIEUH;Lo;0;L; 314E;;;;N;;;;; +FFC2;HALFWIDTH HANGUL LETTER A;Lo;0;L; 314F;;;;N;;;;; +FFC3;HALFWIDTH HANGUL LETTER AE;Lo;0;L; 3150;;;;N;;;;; +FFC4;HALFWIDTH HANGUL LETTER YA;Lo;0;L; 3151;;;;N;;;;; +FFC5;HALFWIDTH HANGUL LETTER YAE;Lo;0;L; 3152;;;;N;;;;; +FFC6;HALFWIDTH HANGUL LETTER EO;Lo;0;L; 3153;;;;N;;;;; +FFC7;HALFWIDTH HANGUL LETTER E;Lo;0;L; 3154;;;;N;;;;; +FFCA;HALFWIDTH HANGUL LETTER YEO;Lo;0;L; 3155;;;;N;;;;; +FFCB;HALFWIDTH HANGUL LETTER YE;Lo;0;L; 3156;;;;N;;;;; +FFCC;HALFWIDTH HANGUL LETTER O;Lo;0;L; 3157;;;;N;;;;; +FFCD;HALFWIDTH HANGUL LETTER WA;Lo;0;L; 3158;;;;N;;;;; +FFCE;HALFWIDTH HANGUL LETTER WAE;Lo;0;L; 3159;;;;N;;;;; +FFCF;HALFWIDTH HANGUL LETTER OE;Lo;0;L; 315A;;;;N;;;;; +FFD2;HALFWIDTH HANGUL LETTER YO;Lo;0;L; 315B;;;;N;;;;; +FFD3;HALFWIDTH HANGUL LETTER U;Lo;0;L; 315C;;;;N;;;;; +FFD4;HALFWIDTH HANGUL LETTER WEO;Lo;0;L; 315D;;;;N;;;;; +FFD5;HALFWIDTH HANGUL LETTER WE;Lo;0;L; 315E;;;;N;;;;; +FFD6;HALFWIDTH HANGUL LETTER WI;Lo;0;L; 315F;;;;N;;;;; +FFD7;HALFWIDTH HANGUL LETTER YU;Lo;0;L; 3160;;;;N;;;;; +FFDA;HALFWIDTH HANGUL LETTER EU;Lo;0;L; 3161;;;;N;;;;; +FFDB;HALFWIDTH HANGUL LETTER YI;Lo;0;L; 3162;;;;N;;;;; +FFDC;HALFWIDTH HANGUL LETTER I;Lo;0;L; 3163;;;;N;;;;; +FFE0;FULLWIDTH CENT SIGN;Sc;0;ET; 00A2;;;;N;;;;; +FFE1;FULLWIDTH POUND SIGN;Sc;0;ET; 00A3;;;;N;;;;; +FFE2;FULLWIDTH NOT SIGN;Sm;0;ON; 00AC;;;;N;;;;; +FFE3;FULLWIDTH MACRON;Sk;0;ON; 00AF;;;;N;FULLWIDTH SPACING MACRON;;;; +FFE4;FULLWIDTH BROKEN BAR;So;0;ON; 00A6;;;;N;FULLWIDTH BROKEN VERTICAL BAR;;;; +FFE5;FULLWIDTH YEN SIGN;Sc;0;ET; 00A5;;;;N;;;;; +FFE6;FULLWIDTH WON SIGN;Sc;0;ET; 20A9;;;;N;;;;; +FFE8;HALFWIDTH FORMS LIGHT VERTICAL;So;0;ON; 2502;;;;N;;;;; +FFE9;HALFWIDTH LEFTWARDS ARROW;Sm;0;ON; 2190;;;;N;;;;; +FFEA;HALFWIDTH UPWARDS ARROW;Sm;0;ON; 2191;;;;N;;;;; +FFEB;HALFWIDTH RIGHTWARDS ARROW;Sm;0;ON; 2192;;;;N;;;;; +FFEC;HALFWIDTH DOWNWARDS ARROW;Sm;0;ON; 2193;;;;N;;;;; +FFED;HALFWIDTH BLACK SQUARE;So;0;ON; 25A0;;;;N;;;;; +FFEE;HALFWIDTH WHITE CIRCLE;So;0;ON; 25CB;;;;N;;;;; +FFF9;INTERLINEAR ANNOTATION ANCHOR;Cf;0;ON;;;;;N;;;;; +FFFA;INTERLINEAR ANNOTATION SEPARATOR;Cf;0;ON;;;;;N;;;;; +FFFB;INTERLINEAR ANNOTATION TERMINATOR;Cf;0;ON;;;;;N;;;;; +FFFC;OBJECT REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; +FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; +10000;LINEAR B SYLLABLE B008 A;Lo;0;L;;;;;N;;;;; +10001;LINEAR B SYLLABLE B038 E;Lo;0;L;;;;;N;;;;; +10002;LINEAR B SYLLABLE B028 I;Lo;0;L;;;;;N;;;;; +10003;LINEAR B SYLLABLE B061 O;Lo;0;L;;;;;N;;;;; +10004;LINEAR B SYLLABLE B010 U;Lo;0;L;;;;;N;;;;; +10005;LINEAR B SYLLABLE B001 DA;Lo;0;L;;;;;N;;;;; +10006;LINEAR B SYLLABLE B045 DE;Lo;0;L;;;;;N;;;;; +10007;LINEAR B SYLLABLE B007 DI;Lo;0;L;;;;;N;;;;; +10008;LINEAR B SYLLABLE B014 DO;Lo;0;L;;;;;N;;;;; +10009;LINEAR B SYLLABLE B051 DU;Lo;0;L;;;;;N;;;;; +1000A;LINEAR B SYLLABLE B057 JA;Lo;0;L;;;;;N;;;;; +1000B;LINEAR B SYLLABLE B046 JE;Lo;0;L;;;;;N;;;;; +1000D;LINEAR B SYLLABLE B036 JO;Lo;0;L;;;;;N;;;;; +1000E;LINEAR B SYLLABLE B065 JU;Lo;0;L;;;;;N;;;;; +1000F;LINEAR B SYLLABLE B077 KA;Lo;0;L;;;;;N;;;;; +10010;LINEAR B SYLLABLE B044 KE;Lo;0;L;;;;;N;;;;; +10011;LINEAR B SYLLABLE B067 KI;Lo;0;L;;;;;N;;;;; +10012;LINEAR B SYLLABLE B070 KO;Lo;0;L;;;;;N;;;;; +10013;LINEAR B SYLLABLE B081 KU;Lo;0;L;;;;;N;;;;; +10014;LINEAR B SYLLABLE B080 MA;Lo;0;L;;;;;N;;;;; +10015;LINEAR B SYLLABLE B013 ME;Lo;0;L;;;;;N;;;;; +10016;LINEAR B SYLLABLE B073 MI;Lo;0;L;;;;;N;;;;; +10017;LINEAR B SYLLABLE B015 MO;Lo;0;L;;;;;N;;;;; +10018;LINEAR B SYLLABLE B023 MU;Lo;0;L;;;;;N;;;;; +10019;LINEAR B SYLLABLE B006 NA;Lo;0;L;;;;;N;;;;; +1001A;LINEAR B SYLLABLE B024 NE;Lo;0;L;;;;;N;;;;; +1001B;LINEAR B SYLLABLE B030 NI;Lo;0;L;;;;;N;;;;; +1001C;LINEAR B SYLLABLE B052 NO;Lo;0;L;;;;;N;;;;; +1001D;LINEAR B SYLLABLE B055 NU;Lo;0;L;;;;;N;;;;; +1001E;LINEAR B SYLLABLE B003 PA;Lo;0;L;;;;;N;;;;; +1001F;LINEAR B SYLLABLE B072 PE;Lo;0;L;;;;;N;;;;; +10020;LINEAR B SYLLABLE B039 PI;Lo;0;L;;;;;N;;;;; +10021;LINEAR B SYLLABLE B011 PO;Lo;0;L;;;;;N;;;;; +10022;LINEAR B SYLLABLE B050 PU;Lo;0;L;;;;;N;;;;; +10023;LINEAR B SYLLABLE B016 QA;Lo;0;L;;;;;N;;;;; +10024;LINEAR B SYLLABLE B078 QE;Lo;0;L;;;;;N;;;;; +10025;LINEAR B SYLLABLE B021 QI;Lo;0;L;;;;;N;;;;; +10026;LINEAR B SYLLABLE B032 QO;Lo;0;L;;;;;N;;;;; +10028;LINEAR B SYLLABLE B060 RA;Lo;0;L;;;;;N;;;;; +10029;LINEAR B SYLLABLE B027 RE;Lo;0;L;;;;;N;;;;; +1002A;LINEAR B SYLLABLE B053 RI;Lo;0;L;;;;;N;;;;; +1002B;LINEAR B SYLLABLE B002 RO;Lo;0;L;;;;;N;;;;; +1002C;LINEAR B SYLLABLE B026 RU;Lo;0;L;;;;;N;;;;; +1002D;LINEAR B SYLLABLE B031 SA;Lo;0;L;;;;;N;;;;; +1002E;LINEAR B SYLLABLE B009 SE;Lo;0;L;;;;;N;;;;; +1002F;LINEAR B SYLLABLE B041 SI;Lo;0;L;;;;;N;;;;; +10030;LINEAR B SYLLABLE B012 SO;Lo;0;L;;;;;N;;;;; +10031;LINEAR B SYLLABLE B058 SU;Lo;0;L;;;;;N;;;;; +10032;LINEAR B SYLLABLE B059 TA;Lo;0;L;;;;;N;;;;; +10033;LINEAR B SYLLABLE B004 TE;Lo;0;L;;;;;N;;;;; +10034;LINEAR B SYLLABLE B037 TI;Lo;0;L;;;;;N;;;;; +10035;LINEAR B SYLLABLE B005 TO;Lo;0;L;;;;;N;;;;; +10036;LINEAR B SYLLABLE B069 TU;Lo;0;L;;;;;N;;;;; +10037;LINEAR B SYLLABLE B054 WA;Lo;0;L;;;;;N;;;;; +10038;LINEAR B SYLLABLE B075 WE;Lo;0;L;;;;;N;;;;; +10039;LINEAR B SYLLABLE B040 WI;Lo;0;L;;;;;N;;;;; +1003A;LINEAR B SYLLABLE B042 WO;Lo;0;L;;;;;N;;;;; +1003C;LINEAR B SYLLABLE B017 ZA;Lo;0;L;;;;;N;;;;; +1003D;LINEAR B SYLLABLE B074 ZE;Lo;0;L;;;;;N;;;;; +1003F;LINEAR B SYLLABLE B020 ZO;Lo;0;L;;;;;N;;;;; +10040;LINEAR B SYLLABLE B025 A2;Lo;0;L;;;;;N;;;;; +10041;LINEAR B SYLLABLE B043 A3;Lo;0;L;;;;;N;;;;; +10042;LINEAR B SYLLABLE B085 AU;Lo;0;L;;;;;N;;;;; +10043;LINEAR B SYLLABLE B071 DWE;Lo;0;L;;;;;N;;;;; +10044;LINEAR B SYLLABLE B090 DWO;Lo;0;L;;;;;N;;;;; +10045;LINEAR B SYLLABLE B048 NWA;Lo;0;L;;;;;N;;;;; +10046;LINEAR B SYLLABLE B029 PU2;Lo;0;L;;;;;N;;;;; +10047;LINEAR B SYLLABLE B062 PTE;Lo;0;L;;;;;N;;;;; +10048;LINEAR B SYLLABLE B076 RA2;Lo;0;L;;;;;N;;;;; +10049;LINEAR B SYLLABLE B033 RA3;Lo;0;L;;;;;N;;;;; +1004A;LINEAR B SYLLABLE B068 RO2;Lo;0;L;;;;;N;;;;; +1004B;LINEAR B SYLLABLE B066 TA2;Lo;0;L;;;;;N;;;;; +1004C;LINEAR B SYLLABLE B087 TWE;Lo;0;L;;;;;N;;;;; +1004D;LINEAR B SYLLABLE B091 TWO;Lo;0;L;;;;;N;;;;; +10050;LINEAR B SYMBOL B018;Lo;0;L;;;;;N;;;;; +10051;LINEAR B SYMBOL B019;Lo;0;L;;;;;N;;;;; +10052;LINEAR B SYMBOL B022;Lo;0;L;;;;;N;;;;; +10053;LINEAR B SYMBOL B034;Lo;0;L;;;;;N;;;;; +10054;LINEAR B SYMBOL B047;Lo;0;L;;;;;N;;;;; +10055;LINEAR B SYMBOL B049;Lo;0;L;;;;;N;;;;; +10056;LINEAR B SYMBOL B056;Lo;0;L;;;;;N;;;;; +10057;LINEAR B SYMBOL B063;Lo;0;L;;;;;N;;;;; +10058;LINEAR B SYMBOL B064;Lo;0;L;;;;;N;;;;; +10059;LINEAR B SYMBOL B079;Lo;0;L;;;;;N;;;;; +1005A;LINEAR B SYMBOL B082;Lo;0;L;;;;;N;;;;; +1005B;LINEAR B SYMBOL B083;Lo;0;L;;;;;N;;;;; +1005C;LINEAR B SYMBOL B086;Lo;0;L;;;;;N;;;;; +1005D;LINEAR B SYMBOL B089;Lo;0;L;;;;;N;;;;; +10080;LINEAR B IDEOGRAM B100 MAN;Lo;0;L;;;;;N;;;;; +10081;LINEAR B IDEOGRAM B102 WOMAN;Lo;0;L;;;;;N;;;;; +10082;LINEAR B IDEOGRAM B104 DEER;Lo;0;L;;;;;N;;;;; +10083;LINEAR B IDEOGRAM B105 EQUID;Lo;0;L;;;;;N;;;;; +10084;LINEAR B IDEOGRAM B105F MARE;Lo;0;L;;;;;N;;;;; +10085;LINEAR B IDEOGRAM B105M STALLION;Lo;0;L;;;;;N;;;;; +10086;LINEAR B IDEOGRAM B106F EWE;Lo;0;L;;;;;N;;;;; +10087;LINEAR B IDEOGRAM B106M RAM;Lo;0;L;;;;;N;;;;; +10088;LINEAR B IDEOGRAM B107F SHE-GOAT;Lo;0;L;;;;;N;;;;; +10089;LINEAR B IDEOGRAM B107M HE-GOAT;Lo;0;L;;;;;N;;;;; +1008A;LINEAR B IDEOGRAM B108F SOW;Lo;0;L;;;;;N;;;;; +1008B;LINEAR B IDEOGRAM B108M BOAR;Lo;0;L;;;;;N;;;;; +1008C;LINEAR B IDEOGRAM B109F COW;Lo;0;L;;;;;N;;;;; +1008D;LINEAR B IDEOGRAM B109M BULL;Lo;0;L;;;;;N;;;;; +1008E;LINEAR B IDEOGRAM B120 WHEAT;Lo;0;L;;;;;N;;;;; +1008F;LINEAR B IDEOGRAM B121 BARLEY;Lo;0;L;;;;;N;;;;; +10090;LINEAR B IDEOGRAM B122 OLIVE;Lo;0;L;;;;;N;;;;; +10091;LINEAR B IDEOGRAM B123 SPICE;Lo;0;L;;;;;N;;;;; +10092;LINEAR B IDEOGRAM B125 CYPERUS;Lo;0;L;;;;;N;;;;; +10093;LINEAR B MONOGRAM B127 KAPO;Lo;0;L;;;;;N;;;;; +10094;LINEAR B MONOGRAM B128 KANAKO;Lo;0;L;;;;;N;;;;; +10095;LINEAR B IDEOGRAM B130 OIL;Lo;0;L;;;;;N;;;;; +10096;LINEAR B IDEOGRAM B131 WINE;Lo;0;L;;;;;N;;;;; +10097;LINEAR B IDEOGRAM B132;Lo;0;L;;;;;N;;;;; +10098;LINEAR B MONOGRAM B133 AREPA;Lo;0;L;;;;;N;;;;; +10099;LINEAR B MONOGRAM B135 MERI;Lo;0;L;;;;;N;;;;; +1009A;LINEAR B IDEOGRAM B140 BRONZE;Lo;0;L;;;;;N;;;;; +1009B;LINEAR B IDEOGRAM B141 GOLD;Lo;0;L;;;;;N;;;;; +1009C;LINEAR B IDEOGRAM B142;Lo;0;L;;;;;N;;;;; +1009D;LINEAR B IDEOGRAM B145 WOOL;Lo;0;L;;;;;N;;;;; +1009E;LINEAR B IDEOGRAM B146;Lo;0;L;;;;;N;;;;; +1009F;LINEAR B IDEOGRAM B150;Lo;0;L;;;;;N;;;;; +100A0;LINEAR B IDEOGRAM B151 HORN;Lo;0;L;;;;;N;;;;; +100A1;LINEAR B IDEOGRAM B152;Lo;0;L;;;;;N;;;;; +100A2;LINEAR B IDEOGRAM B153;Lo;0;L;;;;;N;;;;; +100A3;LINEAR B IDEOGRAM B154;Lo;0;L;;;;;N;;;;; +100A4;LINEAR B MONOGRAM B156 TURO2;Lo;0;L;;;;;N;;;;; +100A5;LINEAR B IDEOGRAM B157;Lo;0;L;;;;;N;;;;; +100A6;LINEAR B IDEOGRAM B158;Lo;0;L;;;;;N;;;;; +100A7;LINEAR B IDEOGRAM B159 CLOTH;Lo;0;L;;;;;N;;;;; +100A8;LINEAR B IDEOGRAM B160;Lo;0;L;;;;;N;;;;; +100A9;LINEAR B IDEOGRAM B161;Lo;0;L;;;;;N;;;;; +100AA;LINEAR B IDEOGRAM B162 GARMENT;Lo;0;L;;;;;N;;;;; +100AB;LINEAR B IDEOGRAM B163 ARMOUR;Lo;0;L;;;;;N;;;;; +100AC;LINEAR B IDEOGRAM B164;Lo;0;L;;;;;N;;;;; +100AD;LINEAR B IDEOGRAM B165;Lo;0;L;;;;;N;;;;; +100AE;LINEAR B IDEOGRAM B166;Lo;0;L;;;;;N;;;;; +100AF;LINEAR B IDEOGRAM B167;Lo;0;L;;;;;N;;;;; +100B0;LINEAR B IDEOGRAM B168;Lo;0;L;;;;;N;;;;; +100B1;LINEAR B IDEOGRAM B169;Lo;0;L;;;;;N;;;;; +100B2;LINEAR B IDEOGRAM B170;Lo;0;L;;;;;N;;;;; +100B3;LINEAR B IDEOGRAM B171;Lo;0;L;;;;;N;;;;; +100B4;LINEAR B IDEOGRAM B172;Lo;0;L;;;;;N;;;;; +100B5;LINEAR B IDEOGRAM B173 MONTH;Lo;0;L;;;;;N;;;;; +100B6;LINEAR B IDEOGRAM B174;Lo;0;L;;;;;N;;;;; +100B7;LINEAR B IDEOGRAM B176 TREE;Lo;0;L;;;;;N;;;;; +100B8;LINEAR B IDEOGRAM B177;Lo;0;L;;;;;N;;;;; +100B9;LINEAR B IDEOGRAM B178;Lo;0;L;;;;;N;;;;; +100BA;LINEAR B IDEOGRAM B179;Lo;0;L;;;;;N;;;;; +100BB;LINEAR B IDEOGRAM B180;Lo;0;L;;;;;N;;;;; +100BC;LINEAR B IDEOGRAM B181;Lo;0;L;;;;;N;;;;; +100BD;LINEAR B IDEOGRAM B182;Lo;0;L;;;;;N;;;;; +100BE;LINEAR B IDEOGRAM B183;Lo;0;L;;;;;N;;;;; +100BF;LINEAR B IDEOGRAM B184;Lo;0;L;;;;;N;;;;; +100C0;LINEAR B IDEOGRAM B185;Lo;0;L;;;;;N;;;;; +100C1;LINEAR B IDEOGRAM B189;Lo;0;L;;;;;N;;;;; +100C2;LINEAR B IDEOGRAM B190;Lo;0;L;;;;;N;;;;; +100C3;LINEAR B IDEOGRAM B191 HELMET;Lo;0;L;;;;;N;;;;; +100C4;LINEAR B IDEOGRAM B220 FOOTSTOOL;Lo;0;L;;;;;N;;;;; +100C5;LINEAR B IDEOGRAM B225 BATHTUB;Lo;0;L;;;;;N;;;;; +100C6;LINEAR B IDEOGRAM B230 SPEAR;Lo;0;L;;;;;N;;;;; +100C7;LINEAR B IDEOGRAM B231 ARROW;Lo;0;L;;;;;N;;;;; +100C8;LINEAR B IDEOGRAM B232;Lo;0;L;;;;;N;;;;; +100C9;LINEAR B IDEOGRAM B233 SWORD;Lo;0;L;;;;;N;;;;; +100CA;LINEAR B IDEOGRAM B234;Lo;0;L;;;;;N;;;;; +100CB;LINEAR B IDEOGRAM B236;Lo;0;L;;;;;N;;;;; +100CC;LINEAR B IDEOGRAM B240 WHEELED CHARIOT;Lo;0;L;;;;;N;;;;; +100CD;LINEAR B IDEOGRAM B241 CHARIOT;Lo;0;L;;;;;N;;;;; +100CE;LINEAR B IDEOGRAM B242 CHARIOT FRAME;Lo;0;L;;;;;N;;;;; +100CF;LINEAR B IDEOGRAM B243 WHEEL;Lo;0;L;;;;;N;;;;; +100D0;LINEAR B IDEOGRAM B245;Lo;0;L;;;;;N;;;;; +100D1;LINEAR B IDEOGRAM B246;Lo;0;L;;;;;N;;;;; +100D2;LINEAR B MONOGRAM B247 DIPTE;Lo;0;L;;;;;N;;;;; +100D3;LINEAR B IDEOGRAM B248;Lo;0;L;;;;;N;;;;; +100D4;LINEAR B IDEOGRAM B249;Lo;0;L;;;;;N;;;;; +100D5;LINEAR B IDEOGRAM B251;Lo;0;L;;;;;N;;;;; +100D6;LINEAR B IDEOGRAM B252;Lo;0;L;;;;;N;;;;; +100D7;LINEAR B IDEOGRAM B253;Lo;0;L;;;;;N;;;;; +100D8;LINEAR B IDEOGRAM B254 DART;Lo;0;L;;;;;N;;;;; +100D9;LINEAR B IDEOGRAM B255;Lo;0;L;;;;;N;;;;; +100DA;LINEAR B IDEOGRAM B256;Lo;0;L;;;;;N;;;;; +100DB;LINEAR B IDEOGRAM B257;Lo;0;L;;;;;N;;;;; +100DC;LINEAR B IDEOGRAM B258;Lo;0;L;;;;;N;;;;; +100DD;LINEAR B IDEOGRAM B259;Lo;0;L;;;;;N;;;;; +100DE;LINEAR B IDEOGRAM VESSEL B155;Lo;0;L;;;;;N;;;;; +100DF;LINEAR B IDEOGRAM VESSEL B200;Lo;0;L;;;;;N;;;;; +100E0;LINEAR B IDEOGRAM VESSEL B201;Lo;0;L;;;;;N;;;;; +100E1;LINEAR B IDEOGRAM VESSEL B202;Lo;0;L;;;;;N;;;;; +100E2;LINEAR B IDEOGRAM VESSEL B203;Lo;0;L;;;;;N;;;;; +100E3;LINEAR B IDEOGRAM VESSEL B204;Lo;0;L;;;;;N;;;;; +100E4;LINEAR B IDEOGRAM VESSEL B205;Lo;0;L;;;;;N;;;;; +100E5;LINEAR B IDEOGRAM VESSEL B206;Lo;0;L;;;;;N;;;;; +100E6;LINEAR B IDEOGRAM VESSEL B207;Lo;0;L;;;;;N;;;;; +100E7;LINEAR B IDEOGRAM VESSEL B208;Lo;0;L;;;;;N;;;;; +100E8;LINEAR B IDEOGRAM VESSEL B209;Lo;0;L;;;;;N;;;;; +100E9;LINEAR B IDEOGRAM VESSEL B210;Lo;0;L;;;;;N;;;;; +100EA;LINEAR B IDEOGRAM VESSEL B211;Lo;0;L;;;;;N;;;;; +100EB;LINEAR B IDEOGRAM VESSEL B212;Lo;0;L;;;;;N;;;;; +100EC;LINEAR B IDEOGRAM VESSEL B213;Lo;0;L;;;;;N;;;;; +100ED;LINEAR B IDEOGRAM VESSEL B214;Lo;0;L;;;;;N;;;;; +100EE;LINEAR B IDEOGRAM VESSEL B215;Lo;0;L;;;;;N;;;;; +100EF;LINEAR B IDEOGRAM VESSEL B216;Lo;0;L;;;;;N;;;;; +100F0;LINEAR B IDEOGRAM VESSEL B217;Lo;0;L;;;;;N;;;;; +100F1;LINEAR B IDEOGRAM VESSEL B218;Lo;0;L;;;;;N;;;;; +100F2;LINEAR B IDEOGRAM VESSEL B219;Lo;0;L;;;;;N;;;;; +100F3;LINEAR B IDEOGRAM VESSEL B221;Lo;0;L;;;;;N;;;;; +100F4;LINEAR B IDEOGRAM VESSEL B222;Lo;0;L;;;;;N;;;;; +100F5;LINEAR B IDEOGRAM VESSEL B226;Lo;0;L;;;;;N;;;;; +100F6;LINEAR B IDEOGRAM VESSEL B227;Lo;0;L;;;;;N;;;;; +100F7;LINEAR B IDEOGRAM VESSEL B228;Lo;0;L;;;;;N;;;;; +100F8;LINEAR B IDEOGRAM VESSEL B229;Lo;0;L;;;;;N;;;;; +100F9;LINEAR B IDEOGRAM VESSEL B250;Lo;0;L;;;;;N;;;;; +100FA;LINEAR B IDEOGRAM VESSEL B305;Lo;0;L;;;;;N;;;;; +10100;AEGEAN WORD SEPARATOR LINE;Po;0;L;;;;;N;;;;; +10101;AEGEAN WORD SEPARATOR DOT;Po;0;ON;;;;;N;;;;; +10102;AEGEAN CHECK MARK;Po;0;L;;;;;N;;;;; +10107;AEGEAN NUMBER ONE;No;0;L;;;;1;N;;;;; +10108;AEGEAN NUMBER TWO;No;0;L;;;;2;N;;;;; +10109;AEGEAN NUMBER THREE;No;0;L;;;;3;N;;;;; +1010A;AEGEAN NUMBER FOUR;No;0;L;;;;4;N;;;;; +1010B;AEGEAN NUMBER FIVE;No;0;L;;;;5;N;;;;; +1010C;AEGEAN NUMBER SIX;No;0;L;;;;6;N;;;;; +1010D;AEGEAN NUMBER SEVEN;No;0;L;;;;7;N;;;;; +1010E;AEGEAN NUMBER EIGHT;No;0;L;;;;8;N;;;;; +1010F;AEGEAN NUMBER NINE;No;0;L;;;;9;N;;;;; +10110;AEGEAN NUMBER TEN;No;0;L;;;;10;N;;;;; +10111;AEGEAN NUMBER TWENTY;No;0;L;;;;20;N;;;;; +10112;AEGEAN NUMBER THIRTY;No;0;L;;;;30;N;;;;; +10113;AEGEAN NUMBER FORTY;No;0;L;;;;40;N;;;;; +10114;AEGEAN NUMBER FIFTY;No;0;L;;;;50;N;;;;; +10115;AEGEAN NUMBER SIXTY;No;0;L;;;;60;N;;;;; +10116;AEGEAN NUMBER SEVENTY;No;0;L;;;;70;N;;;;; +10117;AEGEAN NUMBER EIGHTY;No;0;L;;;;80;N;;;;; +10118;AEGEAN NUMBER NINETY;No;0;L;;;;90;N;;;;; +10119;AEGEAN NUMBER ONE HUNDRED;No;0;L;;;;100;N;;;;; +1011A;AEGEAN NUMBER TWO HUNDRED;No;0;L;;;;200;N;;;;; +1011B;AEGEAN NUMBER THREE HUNDRED;No;0;L;;;;300;N;;;;; +1011C;AEGEAN NUMBER FOUR HUNDRED;No;0;L;;;;400;N;;;;; +1011D;AEGEAN NUMBER FIVE HUNDRED;No;0;L;;;;500;N;;;;; +1011E;AEGEAN NUMBER SIX HUNDRED;No;0;L;;;;600;N;;;;; +1011F;AEGEAN NUMBER SEVEN HUNDRED;No;0;L;;;;700;N;;;;; +10120;AEGEAN NUMBER EIGHT HUNDRED;No;0;L;;;;800;N;;;;; +10121;AEGEAN NUMBER NINE HUNDRED;No;0;L;;;;900;N;;;;; +10122;AEGEAN NUMBER ONE THOUSAND;No;0;L;;;;1000;N;;;;; +10123;AEGEAN NUMBER TWO THOUSAND;No;0;L;;;;2000;N;;;;; +10124;AEGEAN NUMBER THREE THOUSAND;No;0;L;;;;3000;N;;;;; +10125;AEGEAN NUMBER FOUR THOUSAND;No;0;L;;;;4000;N;;;;; +10126;AEGEAN NUMBER FIVE THOUSAND;No;0;L;;;;5000;N;;;;; +10127;AEGEAN NUMBER SIX THOUSAND;No;0;L;;;;6000;N;;;;; +10128;AEGEAN NUMBER SEVEN THOUSAND;No;0;L;;;;7000;N;;;;; +10129;AEGEAN NUMBER EIGHT THOUSAND;No;0;L;;;;8000;N;;;;; +1012A;AEGEAN NUMBER NINE THOUSAND;No;0;L;;;;9000;N;;;;; +1012B;AEGEAN NUMBER TEN THOUSAND;No;0;L;;;;10000;N;;;;; +1012C;AEGEAN NUMBER TWENTY THOUSAND;No;0;L;;;;20000;N;;;;; +1012D;AEGEAN NUMBER THIRTY THOUSAND;No;0;L;;;;30000;N;;;;; +1012E;AEGEAN NUMBER FORTY THOUSAND;No;0;L;;;;40000;N;;;;; +1012F;AEGEAN NUMBER FIFTY THOUSAND;No;0;L;;;;50000;N;;;;; +10130;AEGEAN NUMBER SIXTY THOUSAND;No;0;L;;;;60000;N;;;;; +10131;AEGEAN NUMBER SEVENTY THOUSAND;No;0;L;;;;70000;N;;;;; +10132;AEGEAN NUMBER EIGHTY THOUSAND;No;0;L;;;;80000;N;;;;; +10133;AEGEAN NUMBER NINETY THOUSAND;No;0;L;;;;90000;N;;;;; +10137;AEGEAN WEIGHT BASE UNIT;So;0;L;;;;;N;;;;; +10138;AEGEAN WEIGHT FIRST SUBUNIT;So;0;L;;;;;N;;;;; +10139;AEGEAN WEIGHT SECOND SUBUNIT;So;0;L;;;;;N;;;;; +1013A;AEGEAN WEIGHT THIRD SUBUNIT;So;0;L;;;;;N;;;;; +1013B;AEGEAN WEIGHT FOURTH SUBUNIT;So;0;L;;;;;N;;;;; +1013C;AEGEAN DRY MEASURE FIRST SUBUNIT;So;0;L;;;;;N;;;;; +1013D;AEGEAN LIQUID MEASURE FIRST SUBUNIT;So;0;L;;;;;N;;;;; +1013E;AEGEAN MEASURE SECOND SUBUNIT;So;0;L;;;;;N;;;;; +1013F;AEGEAN MEASURE THIRD SUBUNIT;So;0;L;;;;;N;;;;; +10140;GREEK ACROPHONIC ATTIC ONE QUARTER;Nl;0;ON;;;;1/4;N;;;;; +10141;GREEK ACROPHONIC ATTIC ONE HALF;Nl;0;ON;;;;1/2;N;;;;; +10142;GREEK ACROPHONIC ATTIC ONE DRACHMA;Nl;0;ON;;;;1;N;;;;; +10143;GREEK ACROPHONIC ATTIC FIVE;Nl;0;ON;;;;5;N;;;;; +10144;GREEK ACROPHONIC ATTIC FIFTY;Nl;0;ON;;;;50;N;;;;; +10145;GREEK ACROPHONIC ATTIC FIVE HUNDRED;Nl;0;ON;;;;500;N;;;;; +10146;GREEK ACROPHONIC ATTIC FIVE THOUSAND;Nl;0;ON;;;;5000;N;;;;; +10147;GREEK ACROPHONIC ATTIC FIFTY THOUSAND;Nl;0;ON;;;;50000;N;;;;; +10148;GREEK ACROPHONIC ATTIC FIVE TALENTS;Nl;0;ON;;;;5;N;;;;; +10149;GREEK ACROPHONIC ATTIC TEN TALENTS;Nl;0;ON;;;;10;N;;;;; +1014A;GREEK ACROPHONIC ATTIC FIFTY TALENTS;Nl;0;ON;;;;50;N;;;;; +1014B;GREEK ACROPHONIC ATTIC ONE HUNDRED TALENTS;Nl;0;ON;;;;100;N;;;;; +1014C;GREEK ACROPHONIC ATTIC FIVE HUNDRED TALENTS;Nl;0;ON;;;;500;N;;;;; +1014D;GREEK ACROPHONIC ATTIC ONE THOUSAND TALENTS;Nl;0;ON;;;;1000;N;;;;; +1014E;GREEK ACROPHONIC ATTIC FIVE THOUSAND TALENTS;Nl;0;ON;;;;5000;N;;;;; +1014F;GREEK ACROPHONIC ATTIC FIVE STATERS;Nl;0;ON;;;;5;N;;;;; +10150;GREEK ACROPHONIC ATTIC TEN STATERS;Nl;0;ON;;;;10;N;;;;; +10151;GREEK ACROPHONIC ATTIC FIFTY STATERS;Nl;0;ON;;;;50;N;;;;; +10152;GREEK ACROPHONIC ATTIC ONE HUNDRED STATERS;Nl;0;ON;;;;100;N;;;;; +10153;GREEK ACROPHONIC ATTIC FIVE HUNDRED STATERS;Nl;0;ON;;;;500;N;;;;; +10154;GREEK ACROPHONIC ATTIC ONE THOUSAND STATERS;Nl;0;ON;;;;1000;N;;;;; +10155;GREEK ACROPHONIC ATTIC TEN THOUSAND STATERS;Nl;0;ON;;;;10000;N;;;;; +10156;GREEK ACROPHONIC ATTIC FIFTY THOUSAND STATERS;Nl;0;ON;;;;50000;N;;;;; +10157;GREEK ACROPHONIC ATTIC TEN MNAS;Nl;0;ON;;;;10;N;;;;; +10158;GREEK ACROPHONIC HERAEUM ONE PLETHRON;Nl;0;ON;;;;1;N;;;;; +10159;GREEK ACROPHONIC THESPIAN ONE;Nl;0;ON;;;;1;N;;;;; +1015A;GREEK ACROPHONIC HERMIONIAN ONE;Nl;0;ON;;;;1;N;;;;; +1015B;GREEK ACROPHONIC EPIDAUREAN TWO;Nl;0;ON;;;;2;N;;;;; +1015C;GREEK ACROPHONIC THESPIAN TWO;Nl;0;ON;;;;2;N;;;;; +1015D;GREEK ACROPHONIC CYRENAIC TWO DRACHMAS;Nl;0;ON;;;;2;N;;;;; +1015E;GREEK ACROPHONIC EPIDAUREAN TWO DRACHMAS;Nl;0;ON;;;;2;N;;;;; +1015F;GREEK ACROPHONIC TROEZENIAN FIVE;Nl;0;ON;;;;5;N;;;;; +10160;GREEK ACROPHONIC TROEZENIAN TEN;Nl;0;ON;;;;10;N;;;;; +10161;GREEK ACROPHONIC TROEZENIAN TEN ALTERNATE FORM;Nl;0;ON;;;;10;N;;;;; +10162;GREEK ACROPHONIC HERMIONIAN TEN;Nl;0;ON;;;;10;N;;;;; +10163;GREEK ACROPHONIC MESSENIAN TEN;Nl;0;ON;;;;10;N;;;;; +10164;GREEK ACROPHONIC THESPIAN TEN;Nl;0;ON;;;;10;N;;;;; +10165;GREEK ACROPHONIC THESPIAN THIRTY;Nl;0;ON;;;;30;N;;;;; +10166;GREEK ACROPHONIC TROEZENIAN FIFTY;Nl;0;ON;;;;50;N;;;;; +10167;GREEK ACROPHONIC TROEZENIAN FIFTY ALTERNATE FORM;Nl;0;ON;;;;50;N;;;;; +10168;GREEK ACROPHONIC HERMIONIAN FIFTY;Nl;0;ON;;;;50;N;;;;; +10169;GREEK ACROPHONIC THESPIAN FIFTY;Nl;0;ON;;;;50;N;;;;; +1016A;GREEK ACROPHONIC THESPIAN ONE HUNDRED;Nl;0;ON;;;;100;N;;;;; +1016B;GREEK ACROPHONIC THESPIAN THREE HUNDRED;Nl;0;ON;;;;300;N;;;;; +1016C;GREEK ACROPHONIC EPIDAUREAN FIVE HUNDRED;Nl;0;ON;;;;500;N;;;;; +1016D;GREEK ACROPHONIC TROEZENIAN FIVE HUNDRED;Nl;0;ON;;;;500;N;;;;; +1016E;GREEK ACROPHONIC THESPIAN FIVE HUNDRED;Nl;0;ON;;;;500;N;;;;; +1016F;GREEK ACROPHONIC CARYSTIAN FIVE HUNDRED;Nl;0;ON;;;;500;N;;;;; +10170;GREEK ACROPHONIC NAXIAN FIVE HUNDRED;Nl;0;ON;;;;500;N;;;;; +10171;GREEK ACROPHONIC THESPIAN ONE THOUSAND;Nl;0;ON;;;;1000;N;;;;; +10172;GREEK ACROPHONIC THESPIAN FIVE THOUSAND;Nl;0;ON;;;;5000;N;;;;; +10173;GREEK ACROPHONIC DELPHIC FIVE MNAS;Nl;0;ON;;;;5;N;;;;; +10174;GREEK ACROPHONIC STRATIAN FIFTY MNAS;Nl;0;ON;;;;50;N;;;;; +10175;GREEK ONE HALF SIGN;No;0;ON;;;;1/2;N;;;;; +10176;GREEK ONE HALF SIGN ALTERNATE FORM;No;0;ON;;;;1/2;N;;;;; +10177;GREEK TWO THIRDS SIGN;No;0;ON;;;;2/3;N;;;;; +10178;GREEK THREE QUARTERS SIGN;No;0;ON;;;;3/4;N;;;;; +10179;GREEK YEAR SIGN;So;0;ON;;;;;N;;;;; +1017A;GREEK TALENT SIGN;So;0;ON;;;;;N;;;;; +1017B;GREEK DRACHMA SIGN;So;0;ON;;;;;N;;;;; +1017C;GREEK OBOL SIGN;So;0;ON;;;;;N;;;;; +1017D;GREEK TWO OBOLS SIGN;So;0;ON;;;;;N;;;;; +1017E;GREEK THREE OBOLS SIGN;So;0;ON;;;;;N;;;;; +1017F;GREEK FOUR OBOLS SIGN;So;0;ON;;;;;N;;;;; +10180;GREEK FIVE OBOLS SIGN;So;0;ON;;;;;N;;;;; +10181;GREEK METRETES SIGN;So;0;ON;;;;;N;;;;; +10182;GREEK KYATHOS BASE SIGN;So;0;ON;;;;;N;;;;; +10183;GREEK LITRA SIGN;So;0;ON;;;;;N;;;;; +10184;GREEK OUNKIA SIGN;So;0;ON;;;;;N;;;;; +10185;GREEK XESTES SIGN;So;0;ON;;;;;N;;;;; +10186;GREEK ARTABE SIGN;So;0;ON;;;;;N;;;;; +10187;GREEK AROURA SIGN;So;0;ON;;;;;N;;;;; +10188;GREEK GRAMMA SIGN;So;0;ON;;;;;N;;;;; +10189;GREEK TRYBLION BASE SIGN;So;0;ON;;;;;N;;;;; +1018A;GREEK ZERO SIGN;No;0;ON;;;;0;N;;;;; +1018B;GREEK ONE QUARTER SIGN;No;0;ON;;;;1/4;N;;;;; +1018C;GREEK SINUSOID SIGN;So;0;ON;;;;;N;;;;; +1018D;GREEK INDICTION SIGN;So;0;L;;;;;N;;;;; +1018E;NOMISMA SIGN;So;0;L;;;;;N;;;;; +10190;ROMAN SEXTANS SIGN;So;0;ON;;;;;N;;;;; +10191;ROMAN UNCIA SIGN;So;0;ON;;;;;N;;;;; +10192;ROMAN SEMUNCIA SIGN;So;0;ON;;;;;N;;;;; +10193;ROMAN SEXTULA SIGN;So;0;ON;;;;;N;;;;; +10194;ROMAN DIMIDIA SEXTULA SIGN;So;0;ON;;;;;N;;;;; +10195;ROMAN SILIQUA SIGN;So;0;ON;;;;;N;;;;; +10196;ROMAN DENARIUS SIGN;So;0;ON;;;;;N;;;;; +10197;ROMAN QUINARIUS SIGN;So;0;ON;;;;;N;;;;; +10198;ROMAN SESTERTIUS SIGN;So;0;ON;;;;;N;;;;; +10199;ROMAN DUPONDIUS SIGN;So;0;ON;;;;;N;;;;; +1019A;ROMAN AS SIGN;So;0;ON;;;;;N;;;;; +1019B;ROMAN CENTURIAL SIGN;So;0;ON;;;;;N;;;;; +1019C;ASCIA SYMBOL;So;0;ON;;;;;N;;;;; +101A0;GREEK SYMBOL TAU RHO;So;0;ON;;;;;N;;;;; +101D0;PHAISTOS DISC SIGN PEDESTRIAN;So;0;L;;;;;N;;;;; +101D1;PHAISTOS DISC SIGN PLUMED HEAD;So;0;L;;;;;N;;;;; +101D2;PHAISTOS DISC SIGN TATTOOED HEAD;So;0;L;;;;;N;;;;; +101D3;PHAISTOS DISC SIGN CAPTIVE;So;0;L;;;;;N;;;;; +101D4;PHAISTOS DISC SIGN CHILD;So;0;L;;;;;N;;;;; +101D5;PHAISTOS DISC SIGN WOMAN;So;0;L;;;;;N;;;;; +101D6;PHAISTOS DISC SIGN HELMET;So;0;L;;;;;N;;;;; +101D7;PHAISTOS DISC SIGN GAUNTLET;So;0;L;;;;;N;;;;; +101D8;PHAISTOS DISC SIGN TIARA;So;0;L;;;;;N;;;;; +101D9;PHAISTOS DISC SIGN ARROW;So;0;L;;;;;N;;;;; +101DA;PHAISTOS DISC SIGN BOW;So;0;L;;;;;N;;;;; +101DB;PHAISTOS DISC SIGN SHIELD;So;0;L;;;;;N;;;;; +101DC;PHAISTOS DISC SIGN CLUB;So;0;L;;;;;N;;;;; +101DD;PHAISTOS DISC SIGN MANACLES;So;0;L;;;;;N;;;;; +101DE;PHAISTOS DISC SIGN MATTOCK;So;0;L;;;;;N;;;;; +101DF;PHAISTOS DISC SIGN SAW;So;0;L;;;;;N;;;;; +101E0;PHAISTOS DISC SIGN LID;So;0;L;;;;;N;;;;; +101E1;PHAISTOS DISC SIGN BOOMERANG;So;0;L;;;;;N;;;;; +101E2;PHAISTOS DISC SIGN CARPENTRY PLANE;So;0;L;;;;;N;;;;; +101E3;PHAISTOS DISC SIGN DOLIUM;So;0;L;;;;;N;;;;; +101E4;PHAISTOS DISC SIGN COMB;So;0;L;;;;;N;;;;; +101E5;PHAISTOS DISC SIGN SLING;So;0;L;;;;;N;;;;; +101E6;PHAISTOS DISC SIGN COLUMN;So;0;L;;;;;N;;;;; +101E7;PHAISTOS DISC SIGN BEEHIVE;So;0;L;;;;;N;;;;; +101E8;PHAISTOS DISC SIGN SHIP;So;0;L;;;;;N;;;;; +101E9;PHAISTOS DISC SIGN HORN;So;0;L;;;;;N;;;;; +101EA;PHAISTOS DISC SIGN HIDE;So;0;L;;;;;N;;;;; +101EB;PHAISTOS DISC SIGN BULLS LEG;So;0;L;;;;;N;;;;; +101EC;PHAISTOS DISC SIGN CAT;So;0;L;;;;;N;;;;; +101ED;PHAISTOS DISC SIGN RAM;So;0;L;;;;;N;;;;; +101EE;PHAISTOS DISC SIGN EAGLE;So;0;L;;;;;N;;;;; +101EF;PHAISTOS DISC SIGN DOVE;So;0;L;;;;;N;;;;; +101F0;PHAISTOS DISC SIGN TUNNY;So;0;L;;;;;N;;;;; +101F1;PHAISTOS DISC SIGN BEE;So;0;L;;;;;N;;;;; +101F2;PHAISTOS DISC SIGN PLANE TREE;So;0;L;;;;;N;;;;; +101F3;PHAISTOS DISC SIGN VINE;So;0;L;;;;;N;;;;; +101F4;PHAISTOS DISC SIGN PAPYRUS;So;0;L;;;;;N;;;;; +101F5;PHAISTOS DISC SIGN ROSETTE;So;0;L;;;;;N;;;;; +101F6;PHAISTOS DISC SIGN LILY;So;0;L;;;;;N;;;;; +101F7;PHAISTOS DISC SIGN OX BACK;So;0;L;;;;;N;;;;; +101F8;PHAISTOS DISC SIGN FLUTE;So;0;L;;;;;N;;;;; +101F9;PHAISTOS DISC SIGN GRATER;So;0;L;;;;;N;;;;; +101FA;PHAISTOS DISC SIGN STRAINER;So;0;L;;;;;N;;;;; +101FB;PHAISTOS DISC SIGN SMALL AXE;So;0;L;;;;;N;;;;; +101FC;PHAISTOS DISC SIGN WAVY BAND;So;0;L;;;;;N;;;;; +101FD;PHAISTOS DISC SIGN COMBINING OBLIQUE STROKE;Mn;220;NSM;;;;;N;;;;; +10280;LYCIAN LETTER A;Lo;0;L;;;;;N;;;;; +10281;LYCIAN LETTER E;Lo;0;L;;;;;N;;;;; +10282;LYCIAN LETTER B;Lo;0;L;;;;;N;;;;; +10283;LYCIAN LETTER BH;Lo;0;L;;;;;N;;;;; +10284;LYCIAN LETTER G;Lo;0;L;;;;;N;;;;; +10285;LYCIAN LETTER D;Lo;0;L;;;;;N;;;;; +10286;LYCIAN LETTER I;Lo;0;L;;;;;N;;;;; +10287;LYCIAN LETTER W;Lo;0;L;;;;;N;;;;; +10288;LYCIAN LETTER Z;Lo;0;L;;;;;N;;;;; +10289;LYCIAN LETTER TH;Lo;0;L;;;;;N;;;;; +1028A;LYCIAN LETTER J;Lo;0;L;;;;;N;;;;; +1028B;LYCIAN LETTER K;Lo;0;L;;;;;N;;;;; +1028C;LYCIAN LETTER Q;Lo;0;L;;;;;N;;;;; +1028D;LYCIAN LETTER L;Lo;0;L;;;;;N;;;;; +1028E;LYCIAN LETTER M;Lo;0;L;;;;;N;;;;; +1028F;LYCIAN LETTER N;Lo;0;L;;;;;N;;;;; +10290;LYCIAN LETTER MM;Lo;0;L;;;;;N;;;;; +10291;LYCIAN LETTER NN;Lo;0;L;;;;;N;;;;; +10292;LYCIAN LETTER U;Lo;0;L;;;;;N;;;;; +10293;LYCIAN LETTER P;Lo;0;L;;;;;N;;;;; +10294;LYCIAN LETTER KK;Lo;0;L;;;;;N;;;;; +10295;LYCIAN LETTER R;Lo;0;L;;;;;N;;;;; +10296;LYCIAN LETTER S;Lo;0;L;;;;;N;;;;; +10297;LYCIAN LETTER T;Lo;0;L;;;;;N;;;;; +10298;LYCIAN LETTER TT;Lo;0;L;;;;;N;;;;; +10299;LYCIAN LETTER AN;Lo;0;L;;;;;N;;;;; +1029A;LYCIAN LETTER EN;Lo;0;L;;;;;N;;;;; +1029B;LYCIAN LETTER H;Lo;0;L;;;;;N;;;;; +1029C;LYCIAN LETTER X;Lo;0;L;;;;;N;;;;; +102A0;CARIAN LETTER A;Lo;0;L;;;;;N;;;;; +102A1;CARIAN LETTER P2;Lo;0;L;;;;;N;;;;; +102A2;CARIAN LETTER D;Lo;0;L;;;;;N;;;;; +102A3;CARIAN LETTER L;Lo;0;L;;;;;N;;;;; +102A4;CARIAN LETTER UUU;Lo;0;L;;;;;N;;;;; +102A5;CARIAN LETTER R;Lo;0;L;;;;;N;;;;; +102A6;CARIAN LETTER LD;Lo;0;L;;;;;N;;;;; +102A7;CARIAN LETTER A2;Lo;0;L;;;;;N;;;;; +102A8;CARIAN LETTER Q;Lo;0;L;;;;;N;;;;; +102A9;CARIAN LETTER B;Lo;0;L;;;;;N;;;;; +102AA;CARIAN LETTER M;Lo;0;L;;;;;N;;;;; +102AB;CARIAN LETTER O;Lo;0;L;;;;;N;;;;; +102AC;CARIAN LETTER D2;Lo;0;L;;;;;N;;;;; +102AD;CARIAN LETTER T;Lo;0;L;;;;;N;;;;; +102AE;CARIAN LETTER SH;Lo;0;L;;;;;N;;;;; +102AF;CARIAN LETTER SH2;Lo;0;L;;;;;N;;;;; +102B0;CARIAN LETTER S;Lo;0;L;;;;;N;;;;; +102B1;CARIAN LETTER C-18;Lo;0;L;;;;;N;;;;; +102B2;CARIAN LETTER U;Lo;0;L;;;;;N;;;;; +102B3;CARIAN LETTER NN;Lo;0;L;;;;;N;;;;; +102B4;CARIAN LETTER X;Lo;0;L;;;;;N;;;;; +102B5;CARIAN LETTER N;Lo;0;L;;;;;N;;;;; +102B6;CARIAN LETTER TT2;Lo;0;L;;;;;N;;;;; +102B7;CARIAN LETTER P;Lo;0;L;;;;;N;;;;; +102B8;CARIAN LETTER SS;Lo;0;L;;;;;N;;;;; +102B9;CARIAN LETTER I;Lo;0;L;;;;;N;;;;; +102BA;CARIAN LETTER E;Lo;0;L;;;;;N;;;;; +102BB;CARIAN LETTER UUUU;Lo;0;L;;;;;N;;;;; +102BC;CARIAN LETTER K;Lo;0;L;;;;;N;;;;; +102BD;CARIAN LETTER K2;Lo;0;L;;;;;N;;;;; +102BE;CARIAN LETTER ND;Lo;0;L;;;;;N;;;;; +102BF;CARIAN LETTER UU;Lo;0;L;;;;;N;;;;; +102C0;CARIAN LETTER G;Lo;0;L;;;;;N;;;;; +102C1;CARIAN LETTER G2;Lo;0;L;;;;;N;;;;; +102C2;CARIAN LETTER ST;Lo;0;L;;;;;N;;;;; +102C3;CARIAN LETTER ST2;Lo;0;L;;;;;N;;;;; +102C4;CARIAN LETTER NG;Lo;0;L;;;;;N;;;;; +102C5;CARIAN LETTER II;Lo;0;L;;;;;N;;;;; +102C6;CARIAN LETTER C-39;Lo;0;L;;;;;N;;;;; +102C7;CARIAN LETTER TT;Lo;0;L;;;;;N;;;;; +102C8;CARIAN LETTER UUU2;Lo;0;L;;;;;N;;;;; +102C9;CARIAN LETTER RR;Lo;0;L;;;;;N;;;;; +102CA;CARIAN LETTER MB;Lo;0;L;;;;;N;;;;; +102CB;CARIAN LETTER MB2;Lo;0;L;;;;;N;;;;; +102CC;CARIAN LETTER MB3;Lo;0;L;;;;;N;;;;; +102CD;CARIAN LETTER MB4;Lo;0;L;;;;;N;;;;; +102CE;CARIAN LETTER LD2;Lo;0;L;;;;;N;;;;; +102CF;CARIAN LETTER E2;Lo;0;L;;;;;N;;;;; +102D0;CARIAN LETTER UUU3;Lo;0;L;;;;;N;;;;; +102E0;COPTIC EPACT THOUSANDS MARK;Mn;220;NSM;;;;;N;;;;; +102E1;COPTIC EPACT DIGIT ONE;No;0;EN;;;;1;N;;;;; +102E2;COPTIC EPACT DIGIT TWO;No;0;EN;;;;2;N;;;;; +102E3;COPTIC EPACT DIGIT THREE;No;0;EN;;;;3;N;;;;; +102E4;COPTIC EPACT DIGIT FOUR;No;0;EN;;;;4;N;;;;; +102E5;COPTIC EPACT DIGIT FIVE;No;0;EN;;;;5;N;;;;; +102E6;COPTIC EPACT DIGIT SIX;No;0;EN;;;;6;N;;;;; +102E7;COPTIC EPACT DIGIT SEVEN;No;0;EN;;;;7;N;;;;; +102E8;COPTIC EPACT DIGIT EIGHT;No;0;EN;;;;8;N;;;;; +102E9;COPTIC EPACT DIGIT NINE;No;0;EN;;;;9;N;;;;; +102EA;COPTIC EPACT NUMBER TEN;No;0;EN;;;;10;N;;;;; +102EB;COPTIC EPACT NUMBER TWENTY;No;0;EN;;;;20;N;;;;; +102EC;COPTIC EPACT NUMBER THIRTY;No;0;EN;;;;30;N;;;;; +102ED;COPTIC EPACT NUMBER FORTY;No;0;EN;;;;40;N;;;;; +102EE;COPTIC EPACT NUMBER FIFTY;No;0;EN;;;;50;N;;;;; +102EF;COPTIC EPACT NUMBER SIXTY;No;0;EN;;;;60;N;;;;; +102F0;COPTIC EPACT NUMBER SEVENTY;No;0;EN;;;;70;N;;;;; +102F1;COPTIC EPACT NUMBER EIGHTY;No;0;EN;;;;80;N;;;;; +102F2;COPTIC EPACT NUMBER NINETY;No;0;EN;;;;90;N;;;;; +102F3;COPTIC EPACT NUMBER ONE HUNDRED;No;0;EN;;;;100;N;;;;; +102F4;COPTIC EPACT NUMBER TWO HUNDRED;No;0;EN;;;;200;N;;;;; +102F5;COPTIC EPACT NUMBER THREE HUNDRED;No;0;EN;;;;300;N;;;;; +102F6;COPTIC EPACT NUMBER FOUR HUNDRED;No;0;EN;;;;400;N;;;;; +102F7;COPTIC EPACT NUMBER FIVE HUNDRED;No;0;EN;;;;500;N;;;;; +102F8;COPTIC EPACT NUMBER SIX HUNDRED;No;0;EN;;;;600;N;;;;; +102F9;COPTIC EPACT NUMBER SEVEN HUNDRED;No;0;EN;;;;700;N;;;;; +102FA;COPTIC EPACT NUMBER EIGHT HUNDRED;No;0;EN;;;;800;N;;;;; +102FB;COPTIC EPACT NUMBER NINE HUNDRED;No;0;EN;;;;900;N;;;;; +10300;OLD ITALIC LETTER A;Lo;0;L;;;;;N;;;;; +10301;OLD ITALIC LETTER BE;Lo;0;L;;;;;N;;;;; +10302;OLD ITALIC LETTER KE;Lo;0;L;;;;;N;;;;; +10303;OLD ITALIC LETTER DE;Lo;0;L;;;;;N;;;;; +10304;OLD ITALIC LETTER E;Lo;0;L;;;;;N;;;;; +10305;OLD ITALIC LETTER VE;Lo;0;L;;;;;N;;;;; +10306;OLD ITALIC LETTER ZE;Lo;0;L;;;;;N;;;;; +10307;OLD ITALIC LETTER HE;Lo;0;L;;;;;N;;;;; +10308;OLD ITALIC LETTER THE;Lo;0;L;;;;;N;;;;; +10309;OLD ITALIC LETTER I;Lo;0;L;;;;;N;;;;; +1030A;OLD ITALIC LETTER KA;Lo;0;L;;;;;N;;;;; +1030B;OLD ITALIC LETTER EL;Lo;0;L;;;;;N;;;;; +1030C;OLD ITALIC LETTER EM;Lo;0;L;;;;;N;;;;; +1030D;OLD ITALIC LETTER EN;Lo;0;L;;;;;N;;;;; +1030E;OLD ITALIC LETTER ESH;Lo;0;L;;;;;N;;;;; +1030F;OLD ITALIC LETTER O;Lo;0;L;;;;;N;;;;; +10310;OLD ITALIC LETTER PE;Lo;0;L;;;;;N;;;;; +10311;OLD ITALIC LETTER SHE;Lo;0;L;;;;;N;;;;; +10312;OLD ITALIC LETTER KU;Lo;0;L;;;;;N;;;;; +10313;OLD ITALIC LETTER ER;Lo;0;L;;;;;N;;;;; +10314;OLD ITALIC LETTER ES;Lo;0;L;;;;;N;;;;; +10315;OLD ITALIC LETTER TE;Lo;0;L;;;;;N;;;;; +10316;OLD ITALIC LETTER U;Lo;0;L;;;;;N;;;;; +10317;OLD ITALIC LETTER EKS;Lo;0;L;;;;;N;;;;; +10318;OLD ITALIC LETTER PHE;Lo;0;L;;;;;N;;;;; +10319;OLD ITALIC LETTER KHE;Lo;0;L;;;;;N;;;;; +1031A;OLD ITALIC LETTER EF;Lo;0;L;;;;;N;;;;; +1031B;OLD ITALIC LETTER ERS;Lo;0;L;;;;;N;;;;; +1031C;OLD ITALIC LETTER CHE;Lo;0;L;;;;;N;;;;; +1031D;OLD ITALIC LETTER II;Lo;0;L;;;;;N;;;;; +1031E;OLD ITALIC LETTER UU;Lo;0;L;;;;;N;;;;; +1031F;OLD ITALIC LETTER ESS;Lo;0;L;;;;;N;;;;; +10320;OLD ITALIC NUMERAL ONE;No;0;L;;;;1;N;;;;; +10321;OLD ITALIC NUMERAL FIVE;No;0;L;;;;5;N;;;;; +10322;OLD ITALIC NUMERAL TEN;No;0;L;;;;10;N;;;;; +10323;OLD ITALIC NUMERAL FIFTY;No;0;L;;;;50;N;;;;; +1032D;OLD ITALIC LETTER YE;Lo;0;L;;;;;N;;;;; +1032E;OLD ITALIC LETTER NORTHERN TSE;Lo;0;L;;;;;N;;;;; +1032F;OLD ITALIC LETTER SOUTHERN TSE;Lo;0;L;;;;;N;;;;; +10330;GOTHIC LETTER AHSA;Lo;0;L;;;;;N;;;;; +10331;GOTHIC LETTER BAIRKAN;Lo;0;L;;;;;N;;;;; +10332;GOTHIC LETTER GIBA;Lo;0;L;;;;;N;;;;; +10333;GOTHIC LETTER DAGS;Lo;0;L;;;;;N;;;;; +10334;GOTHIC LETTER AIHVUS;Lo;0;L;;;;;N;;;;; +10335;GOTHIC LETTER QAIRTHRA;Lo;0;L;;;;;N;;;;; +10336;GOTHIC LETTER IUJA;Lo;0;L;;;;;N;;;;; +10337;GOTHIC LETTER HAGL;Lo;0;L;;;;;N;;;;; +10338;GOTHIC LETTER THIUTH;Lo;0;L;;;;;N;;;;; +10339;GOTHIC LETTER EIS;Lo;0;L;;;;;N;;;;; +1033A;GOTHIC LETTER KUSMA;Lo;0;L;;;;;N;;;;; +1033B;GOTHIC LETTER LAGUS;Lo;0;L;;;;;N;;;;; +1033C;GOTHIC LETTER MANNA;Lo;0;L;;;;;N;;;;; +1033D;GOTHIC LETTER NAUTHS;Lo;0;L;;;;;N;;;;; +1033E;GOTHIC LETTER JER;Lo;0;L;;;;;N;;;;; +1033F;GOTHIC LETTER URUS;Lo;0;L;;;;;N;;;;; +10340;GOTHIC LETTER PAIRTHRA;Lo;0;L;;;;;N;;;;; +10341;GOTHIC LETTER NINETY;Nl;0;L;;;;90;N;;;;; +10342;GOTHIC LETTER RAIDA;Lo;0;L;;;;;N;;;;; +10343;GOTHIC LETTER SAUIL;Lo;0;L;;;;;N;;;;; +10344;GOTHIC LETTER TEIWS;Lo;0;L;;;;;N;;;;; +10345;GOTHIC LETTER WINJA;Lo;0;L;;;;;N;;;;; +10346;GOTHIC LETTER FAIHU;Lo;0;L;;;;;N;;;;; +10347;GOTHIC LETTER IGGWS;Lo;0;L;;;;;N;;;;; +10348;GOTHIC LETTER HWAIR;Lo;0;L;;;;;N;;;;; +10349;GOTHIC LETTER OTHAL;Lo;0;L;;;;;N;;;;; +1034A;GOTHIC LETTER NINE HUNDRED;Nl;0;L;;;;900;N;;;;; +10350;OLD PERMIC LETTER AN;Lo;0;L;;;;;N;;;;; +10351;OLD PERMIC LETTER BUR;Lo;0;L;;;;;N;;;;; +10352;OLD PERMIC LETTER GAI;Lo;0;L;;;;;N;;;;; +10353;OLD PERMIC LETTER DOI;Lo;0;L;;;;;N;;;;; +10354;OLD PERMIC LETTER E;Lo;0;L;;;;;N;;;;; +10355;OLD PERMIC LETTER ZHOI;Lo;0;L;;;;;N;;;;; +10356;OLD PERMIC LETTER DZHOI;Lo;0;L;;;;;N;;;;; +10357;OLD PERMIC LETTER ZATA;Lo;0;L;;;;;N;;;;; +10358;OLD PERMIC LETTER DZITA;Lo;0;L;;;;;N;;;;; +10359;OLD PERMIC LETTER I;Lo;0;L;;;;;N;;;;; +1035A;OLD PERMIC LETTER KOKE;Lo;0;L;;;;;N;;;;; +1035B;OLD PERMIC LETTER LEI;Lo;0;L;;;;;N;;;;; +1035C;OLD PERMIC LETTER MENOE;Lo;0;L;;;;;N;;;;; +1035D;OLD PERMIC LETTER NENOE;Lo;0;L;;;;;N;;;;; +1035E;OLD PERMIC LETTER VOOI;Lo;0;L;;;;;N;;;;; +1035F;OLD PERMIC LETTER PEEI;Lo;0;L;;;;;N;;;;; +10360;OLD PERMIC LETTER REI;Lo;0;L;;;;;N;;;;; +10361;OLD PERMIC LETTER SII;Lo;0;L;;;;;N;;;;; +10362;OLD PERMIC LETTER TAI;Lo;0;L;;;;;N;;;;; +10363;OLD PERMIC LETTER U;Lo;0;L;;;;;N;;;;; +10364;OLD PERMIC LETTER CHERY;Lo;0;L;;;;;N;;;;; +10365;OLD PERMIC LETTER SHOOI;Lo;0;L;;;;;N;;;;; +10366;OLD PERMIC LETTER SHCHOOI;Lo;0;L;;;;;N;;;;; +10367;OLD PERMIC LETTER YRY;Lo;0;L;;;;;N;;;;; +10368;OLD PERMIC LETTER YERU;Lo;0;L;;;;;N;;;;; +10369;OLD PERMIC LETTER O;Lo;0;L;;;;;N;;;;; +1036A;OLD PERMIC LETTER OO;Lo;0;L;;;;;N;;;;; +1036B;OLD PERMIC LETTER EF;Lo;0;L;;;;;N;;;;; +1036C;OLD PERMIC LETTER HA;Lo;0;L;;;;;N;;;;; +1036D;OLD PERMIC LETTER TSIU;Lo;0;L;;;;;N;;;;; +1036E;OLD PERMIC LETTER VER;Lo;0;L;;;;;N;;;;; +1036F;OLD PERMIC LETTER YER;Lo;0;L;;;;;N;;;;; +10370;OLD PERMIC LETTER YERI;Lo;0;L;;;;;N;;;;; +10371;OLD PERMIC LETTER YAT;Lo;0;L;;;;;N;;;;; +10372;OLD PERMIC LETTER IE;Lo;0;L;;;;;N;;;;; +10373;OLD PERMIC LETTER YU;Lo;0;L;;;;;N;;;;; +10374;OLD PERMIC LETTER YA;Lo;0;L;;;;;N;;;;; +10375;OLD PERMIC LETTER IA;Lo;0;L;;;;;N;;;;; +10376;COMBINING OLD PERMIC LETTER AN;Mn;230;NSM;;;;;N;;;;; +10377;COMBINING OLD PERMIC LETTER DOI;Mn;230;NSM;;;;;N;;;;; +10378;COMBINING OLD PERMIC LETTER ZATA;Mn;230;NSM;;;;;N;;;;; +10379;COMBINING OLD PERMIC LETTER NENOE;Mn;230;NSM;;;;;N;;;;; +1037A;COMBINING OLD PERMIC LETTER SII;Mn;230;NSM;;;;;N;;;;; +10380;UGARITIC LETTER ALPA;Lo;0;L;;;;;N;;;;; +10381;UGARITIC LETTER BETA;Lo;0;L;;;;;N;;;;; +10382;UGARITIC LETTER GAMLA;Lo;0;L;;;;;N;;;;; +10383;UGARITIC LETTER KHA;Lo;0;L;;;;;N;;;;; +10384;UGARITIC LETTER DELTA;Lo;0;L;;;;;N;;;;; +10385;UGARITIC LETTER HO;Lo;0;L;;;;;N;;;;; +10386;UGARITIC LETTER WO;Lo;0;L;;;;;N;;;;; +10387;UGARITIC LETTER ZETA;Lo;0;L;;;;;N;;;;; +10388;UGARITIC LETTER HOTA;Lo;0;L;;;;;N;;;;; +10389;UGARITIC LETTER TET;Lo;0;L;;;;;N;;;;; +1038A;UGARITIC LETTER YOD;Lo;0;L;;;;;N;;;;; +1038B;UGARITIC LETTER KAF;Lo;0;L;;;;;N;;;;; +1038C;UGARITIC LETTER SHIN;Lo;0;L;;;;;N;;;;; +1038D;UGARITIC LETTER LAMDA;Lo;0;L;;;;;N;;;;; +1038E;UGARITIC LETTER MEM;Lo;0;L;;;;;N;;;;; +1038F;UGARITIC LETTER DHAL;Lo;0;L;;;;;N;;;;; +10390;UGARITIC LETTER NUN;Lo;0;L;;;;;N;;;;; +10391;UGARITIC LETTER ZU;Lo;0;L;;;;;N;;;;; +10392;UGARITIC LETTER SAMKA;Lo;0;L;;;;;N;;;;; +10393;UGARITIC LETTER AIN;Lo;0;L;;;;;N;;;;; +10394;UGARITIC LETTER PU;Lo;0;L;;;;;N;;;;; +10395;UGARITIC LETTER SADE;Lo;0;L;;;;;N;;;;; +10396;UGARITIC LETTER QOPA;Lo;0;L;;;;;N;;;;; +10397;UGARITIC LETTER RASHA;Lo;0;L;;;;;N;;;;; +10398;UGARITIC LETTER THANNA;Lo;0;L;;;;;N;;;;; +10399;UGARITIC LETTER GHAIN;Lo;0;L;;;;;N;;;;; +1039A;UGARITIC LETTER TO;Lo;0;L;;;;;N;;;;; +1039B;UGARITIC LETTER I;Lo;0;L;;;;;N;;;;; +1039C;UGARITIC LETTER U;Lo;0;L;;;;;N;;;;; +1039D;UGARITIC LETTER SSU;Lo;0;L;;;;;N;;;;; +1039F;UGARITIC WORD DIVIDER;Po;0;L;;;;;N;;;;; +103A0;OLD PERSIAN SIGN A;Lo;0;L;;;;;N;;;;; +103A1;OLD PERSIAN SIGN I;Lo;0;L;;;;;N;;;;; +103A2;OLD PERSIAN SIGN U;Lo;0;L;;;;;N;;;;; +103A3;OLD PERSIAN SIGN KA;Lo;0;L;;;;;N;;;;; +103A4;OLD PERSIAN SIGN KU;Lo;0;L;;;;;N;;;;; +103A5;OLD PERSIAN SIGN GA;Lo;0;L;;;;;N;;;;; +103A6;OLD PERSIAN SIGN GU;Lo;0;L;;;;;N;;;;; +103A7;OLD PERSIAN SIGN XA;Lo;0;L;;;;;N;;;;; +103A8;OLD PERSIAN SIGN CA;Lo;0;L;;;;;N;;;;; +103A9;OLD PERSIAN SIGN JA;Lo;0;L;;;;;N;;;;; +103AA;OLD PERSIAN SIGN JI;Lo;0;L;;;;;N;;;;; +103AB;OLD PERSIAN SIGN TA;Lo;0;L;;;;;N;;;;; +103AC;OLD PERSIAN SIGN TU;Lo;0;L;;;;;N;;;;; +103AD;OLD PERSIAN SIGN DA;Lo;0;L;;;;;N;;;;; +103AE;OLD PERSIAN SIGN DI;Lo;0;L;;;;;N;;;;; +103AF;OLD PERSIAN SIGN DU;Lo;0;L;;;;;N;;;;; +103B0;OLD PERSIAN SIGN THA;Lo;0;L;;;;;N;;;;; +103B1;OLD PERSIAN SIGN PA;Lo;0;L;;;;;N;;;;; +103B2;OLD PERSIAN SIGN BA;Lo;0;L;;;;;N;;;;; +103B3;OLD PERSIAN SIGN FA;Lo;0;L;;;;;N;;;;; +103B4;OLD PERSIAN SIGN NA;Lo;0;L;;;;;N;;;;; +103B5;OLD PERSIAN SIGN NU;Lo;0;L;;;;;N;;;;; +103B6;OLD PERSIAN SIGN MA;Lo;0;L;;;;;N;;;;; +103B7;OLD PERSIAN SIGN MI;Lo;0;L;;;;;N;;;;; +103B8;OLD PERSIAN SIGN MU;Lo;0;L;;;;;N;;;;; +103B9;OLD PERSIAN SIGN YA;Lo;0;L;;;;;N;;;;; +103BA;OLD PERSIAN SIGN VA;Lo;0;L;;;;;N;;;;; +103BB;OLD PERSIAN SIGN VI;Lo;0;L;;;;;N;;;;; +103BC;OLD PERSIAN SIGN RA;Lo;0;L;;;;;N;;;;; +103BD;OLD PERSIAN SIGN RU;Lo;0;L;;;;;N;;;;; +103BE;OLD PERSIAN SIGN LA;Lo;0;L;;;;;N;;;;; +103BF;OLD PERSIAN SIGN SA;Lo;0;L;;;;;N;;;;; +103C0;OLD PERSIAN SIGN ZA;Lo;0;L;;;;;N;;;;; +103C1;OLD PERSIAN SIGN SHA;Lo;0;L;;;;;N;;;;; +103C2;OLD PERSIAN SIGN SSA;Lo;0;L;;;;;N;;;;; +103C3;OLD PERSIAN SIGN HA;Lo;0;L;;;;;N;;;;; +103C8;OLD PERSIAN SIGN AURAMAZDAA;Lo;0;L;;;;;N;;;;; +103C9;OLD PERSIAN SIGN AURAMAZDAA-2;Lo;0;L;;;;;N;;;;; +103CA;OLD PERSIAN SIGN AURAMAZDAAHA;Lo;0;L;;;;;N;;;;; +103CB;OLD PERSIAN SIGN XSHAAYATHIYA;Lo;0;L;;;;;N;;;;; +103CC;OLD PERSIAN SIGN DAHYAAUSH;Lo;0;L;;;;;N;;;;; +103CD;OLD PERSIAN SIGN DAHYAAUSH-2;Lo;0;L;;;;;N;;;;; +103CE;OLD PERSIAN SIGN BAGA;Lo;0;L;;;;;N;;;;; +103CF;OLD PERSIAN SIGN BUUMISH;Lo;0;L;;;;;N;;;;; +103D0;OLD PERSIAN WORD DIVIDER;Po;0;L;;;;;N;;;;; +103D1;OLD PERSIAN NUMBER ONE;Nl;0;L;;;;1;N;;;;; +103D2;OLD PERSIAN NUMBER TWO;Nl;0;L;;;;2;N;;;;; +103D3;OLD PERSIAN NUMBER TEN;Nl;0;L;;;;10;N;;;;; +103D4;OLD PERSIAN NUMBER TWENTY;Nl;0;L;;;;20;N;;;;; +103D5;OLD PERSIAN NUMBER HUNDRED;Nl;0;L;;;;100;N;;;;; +10400;DESERET CAPITAL LETTER LONG I;Lu;0;L;;;;;N;;;;10428; +10401;DESERET CAPITAL LETTER LONG E;Lu;0;L;;;;;N;;;;10429; +10402;DESERET CAPITAL LETTER LONG A;Lu;0;L;;;;;N;;;;1042A; +10403;DESERET CAPITAL LETTER LONG AH;Lu;0;L;;;;;N;;;;1042B; +10404;DESERET CAPITAL LETTER LONG O;Lu;0;L;;;;;N;;;;1042C; +10405;DESERET CAPITAL LETTER LONG OO;Lu;0;L;;;;;N;;;;1042D; +10406;DESERET CAPITAL LETTER SHORT I;Lu;0;L;;;;;N;;;;1042E; +10407;DESERET CAPITAL LETTER SHORT E;Lu;0;L;;;;;N;;;;1042F; +10408;DESERET CAPITAL LETTER SHORT A;Lu;0;L;;;;;N;;;;10430; +10409;DESERET CAPITAL LETTER SHORT AH;Lu;0;L;;;;;N;;;;10431; +1040A;DESERET CAPITAL LETTER SHORT O;Lu;0;L;;;;;N;;;;10432; +1040B;DESERET CAPITAL LETTER SHORT OO;Lu;0;L;;;;;N;;;;10433; +1040C;DESERET CAPITAL LETTER AY;Lu;0;L;;;;;N;;;;10434; +1040D;DESERET CAPITAL LETTER OW;Lu;0;L;;;;;N;;;;10435; +1040E;DESERET CAPITAL LETTER WU;Lu;0;L;;;;;N;;;;10436; +1040F;DESERET CAPITAL LETTER YEE;Lu;0;L;;;;;N;;;;10437; +10410;DESERET CAPITAL LETTER H;Lu;0;L;;;;;N;;;;10438; +10411;DESERET CAPITAL LETTER PEE;Lu;0;L;;;;;N;;;;10439; +10412;DESERET CAPITAL LETTER BEE;Lu;0;L;;;;;N;;;;1043A; +10413;DESERET CAPITAL LETTER TEE;Lu;0;L;;;;;N;;;;1043B; +10414;DESERET CAPITAL LETTER DEE;Lu;0;L;;;;;N;;;;1043C; +10415;DESERET CAPITAL LETTER CHEE;Lu;0;L;;;;;N;;;;1043D; +10416;DESERET CAPITAL LETTER JEE;Lu;0;L;;;;;N;;;;1043E; +10417;DESERET CAPITAL LETTER KAY;Lu;0;L;;;;;N;;;;1043F; +10418;DESERET CAPITAL LETTER GAY;Lu;0;L;;;;;N;;;;10440; +10419;DESERET CAPITAL LETTER EF;Lu;0;L;;;;;N;;;;10441; +1041A;DESERET CAPITAL LETTER VEE;Lu;0;L;;;;;N;;;;10442; +1041B;DESERET CAPITAL LETTER ETH;Lu;0;L;;;;;N;;;;10443; +1041C;DESERET CAPITAL LETTER THEE;Lu;0;L;;;;;N;;;;10444; +1041D;DESERET CAPITAL LETTER ES;Lu;0;L;;;;;N;;;;10445; +1041E;DESERET CAPITAL LETTER ZEE;Lu;0;L;;;;;N;;;;10446; +1041F;DESERET CAPITAL LETTER ESH;Lu;0;L;;;;;N;;;;10447; +10420;DESERET CAPITAL LETTER ZHEE;Lu;0;L;;;;;N;;;;10448; +10421;DESERET CAPITAL LETTER ER;Lu;0;L;;;;;N;;;;10449; +10422;DESERET CAPITAL LETTER EL;Lu;0;L;;;;;N;;;;1044A; +10423;DESERET CAPITAL LETTER EM;Lu;0;L;;;;;N;;;;1044B; +10424;DESERET CAPITAL LETTER EN;Lu;0;L;;;;;N;;;;1044C; +10425;DESERET CAPITAL LETTER ENG;Lu;0;L;;;;;N;;;;1044D; +10426;DESERET CAPITAL LETTER OI;Lu;0;L;;;;;N;;;;1044E; +10427;DESERET CAPITAL LETTER EW;Lu;0;L;;;;;N;;;;1044F; +10428;DESERET SMALL LETTER LONG I;Ll;0;L;;;;;N;;;10400;;10400 +10429;DESERET SMALL LETTER LONG E;Ll;0;L;;;;;N;;;10401;;10401 +1042A;DESERET SMALL LETTER LONG A;Ll;0;L;;;;;N;;;10402;;10402 +1042B;DESERET SMALL LETTER LONG AH;Ll;0;L;;;;;N;;;10403;;10403 +1042C;DESERET SMALL LETTER LONG O;Ll;0;L;;;;;N;;;10404;;10404 +1042D;DESERET SMALL LETTER LONG OO;Ll;0;L;;;;;N;;;10405;;10405 +1042E;DESERET SMALL LETTER SHORT I;Ll;0;L;;;;;N;;;10406;;10406 +1042F;DESERET SMALL LETTER SHORT E;Ll;0;L;;;;;N;;;10407;;10407 +10430;DESERET SMALL LETTER SHORT A;Ll;0;L;;;;;N;;;10408;;10408 +10431;DESERET SMALL LETTER SHORT AH;Ll;0;L;;;;;N;;;10409;;10409 +10432;DESERET SMALL LETTER SHORT O;Ll;0;L;;;;;N;;;1040A;;1040A +10433;DESERET SMALL LETTER SHORT OO;Ll;0;L;;;;;N;;;1040B;;1040B +10434;DESERET SMALL LETTER AY;Ll;0;L;;;;;N;;;1040C;;1040C +10435;DESERET SMALL LETTER OW;Ll;0;L;;;;;N;;;1040D;;1040D +10436;DESERET SMALL LETTER WU;Ll;0;L;;;;;N;;;1040E;;1040E +10437;DESERET SMALL LETTER YEE;Ll;0;L;;;;;N;;;1040F;;1040F +10438;DESERET SMALL LETTER H;Ll;0;L;;;;;N;;;10410;;10410 +10439;DESERET SMALL LETTER PEE;Ll;0;L;;;;;N;;;10411;;10411 +1043A;DESERET SMALL LETTER BEE;Ll;0;L;;;;;N;;;10412;;10412 +1043B;DESERET SMALL LETTER TEE;Ll;0;L;;;;;N;;;10413;;10413 +1043C;DESERET SMALL LETTER DEE;Ll;0;L;;;;;N;;;10414;;10414 +1043D;DESERET SMALL LETTER CHEE;Ll;0;L;;;;;N;;;10415;;10415 +1043E;DESERET SMALL LETTER JEE;Ll;0;L;;;;;N;;;10416;;10416 +1043F;DESERET SMALL LETTER KAY;Ll;0;L;;;;;N;;;10417;;10417 +10440;DESERET SMALL LETTER GAY;Ll;0;L;;;;;N;;;10418;;10418 +10441;DESERET SMALL LETTER EF;Ll;0;L;;;;;N;;;10419;;10419 +10442;DESERET SMALL LETTER VEE;Ll;0;L;;;;;N;;;1041A;;1041A +10443;DESERET SMALL LETTER ETH;Ll;0;L;;;;;N;;;1041B;;1041B +10444;DESERET SMALL LETTER THEE;Ll;0;L;;;;;N;;;1041C;;1041C +10445;DESERET SMALL LETTER ES;Ll;0;L;;;;;N;;;1041D;;1041D +10446;DESERET SMALL LETTER ZEE;Ll;0;L;;;;;N;;;1041E;;1041E +10447;DESERET SMALL LETTER ESH;Ll;0;L;;;;;N;;;1041F;;1041F +10448;DESERET SMALL LETTER ZHEE;Ll;0;L;;;;;N;;;10420;;10420 +10449;DESERET SMALL LETTER ER;Ll;0;L;;;;;N;;;10421;;10421 +1044A;DESERET SMALL LETTER EL;Ll;0;L;;;;;N;;;10422;;10422 +1044B;DESERET SMALL LETTER EM;Ll;0;L;;;;;N;;;10423;;10423 +1044C;DESERET SMALL LETTER EN;Ll;0;L;;;;;N;;;10424;;10424 +1044D;DESERET SMALL LETTER ENG;Ll;0;L;;;;;N;;;10425;;10425 +1044E;DESERET SMALL LETTER OI;Ll;0;L;;;;;N;;;10426;;10426 +1044F;DESERET SMALL LETTER EW;Ll;0;L;;;;;N;;;10427;;10427 +10450;SHAVIAN LETTER PEEP;Lo;0;L;;;;;N;;;;; +10451;SHAVIAN LETTER TOT;Lo;0;L;;;;;N;;;;; +10452;SHAVIAN LETTER KICK;Lo;0;L;;;;;N;;;;; +10453;SHAVIAN LETTER FEE;Lo;0;L;;;;;N;;;;; +10454;SHAVIAN LETTER THIGH;Lo;0;L;;;;;N;;;;; +10455;SHAVIAN LETTER SO;Lo;0;L;;;;;N;;;;; +10456;SHAVIAN LETTER SURE;Lo;0;L;;;;;N;;;;; +10457;SHAVIAN LETTER CHURCH;Lo;0;L;;;;;N;;;;; +10458;SHAVIAN LETTER YEA;Lo;0;L;;;;;N;;;;; +10459;SHAVIAN LETTER HUNG;Lo;0;L;;;;;N;;;;; +1045A;SHAVIAN LETTER BIB;Lo;0;L;;;;;N;;;;; +1045B;SHAVIAN LETTER DEAD;Lo;0;L;;;;;N;;;;; +1045C;SHAVIAN LETTER GAG;Lo;0;L;;;;;N;;;;; +1045D;SHAVIAN LETTER VOW;Lo;0;L;;;;;N;;;;; +1045E;SHAVIAN LETTER THEY;Lo;0;L;;;;;N;;;;; +1045F;SHAVIAN LETTER ZOO;Lo;0;L;;;;;N;;;;; +10460;SHAVIAN LETTER MEASURE;Lo;0;L;;;;;N;;;;; +10461;SHAVIAN LETTER JUDGE;Lo;0;L;;;;;N;;;;; +10462;SHAVIAN LETTER WOE;Lo;0;L;;;;;N;;;;; +10463;SHAVIAN LETTER HA-HA;Lo;0;L;;;;;N;;;;; +10464;SHAVIAN LETTER LOLL;Lo;0;L;;;;;N;;;;; +10465;SHAVIAN LETTER MIME;Lo;0;L;;;;;N;;;;; +10466;SHAVIAN LETTER IF;Lo;0;L;;;;;N;;;;; +10467;SHAVIAN LETTER EGG;Lo;0;L;;;;;N;;;;; +10468;SHAVIAN LETTER ASH;Lo;0;L;;;;;N;;;;; +10469;SHAVIAN LETTER ADO;Lo;0;L;;;;;N;;;;; +1046A;SHAVIAN LETTER ON;Lo;0;L;;;;;N;;;;; +1046B;SHAVIAN LETTER WOOL;Lo;0;L;;;;;N;;;;; +1046C;SHAVIAN LETTER OUT;Lo;0;L;;;;;N;;;;; +1046D;SHAVIAN LETTER AH;Lo;0;L;;;;;N;;;;; +1046E;SHAVIAN LETTER ROAR;Lo;0;L;;;;;N;;;;; +1046F;SHAVIAN LETTER NUN;Lo;0;L;;;;;N;;;;; +10470;SHAVIAN LETTER EAT;Lo;0;L;;;;;N;;;;; +10471;SHAVIAN LETTER AGE;Lo;0;L;;;;;N;;;;; +10472;SHAVIAN LETTER ICE;Lo;0;L;;;;;N;;;;; +10473;SHAVIAN LETTER UP;Lo;0;L;;;;;N;;;;; +10474;SHAVIAN LETTER OAK;Lo;0;L;;;;;N;;;;; +10475;SHAVIAN LETTER OOZE;Lo;0;L;;;;;N;;;;; +10476;SHAVIAN LETTER OIL;Lo;0;L;;;;;N;;;;; +10477;SHAVIAN LETTER AWE;Lo;0;L;;;;;N;;;;; +10478;SHAVIAN LETTER ARE;Lo;0;L;;;;;N;;;;; +10479;SHAVIAN LETTER OR;Lo;0;L;;;;;N;;;;; +1047A;SHAVIAN LETTER AIR;Lo;0;L;;;;;N;;;;; +1047B;SHAVIAN LETTER ERR;Lo;0;L;;;;;N;;;;; +1047C;SHAVIAN LETTER ARRAY;Lo;0;L;;;;;N;;;;; +1047D;SHAVIAN LETTER EAR;Lo;0;L;;;;;N;;;;; +1047E;SHAVIAN LETTER IAN;Lo;0;L;;;;;N;;;;; +1047F;SHAVIAN LETTER YEW;Lo;0;L;;;;;N;;;;; +10480;OSMANYA LETTER ALEF;Lo;0;L;;;;;N;;;;; +10481;OSMANYA LETTER BA;Lo;0;L;;;;;N;;;;; +10482;OSMANYA LETTER TA;Lo;0;L;;;;;N;;;;; +10483;OSMANYA LETTER JA;Lo;0;L;;;;;N;;;;; +10484;OSMANYA LETTER XA;Lo;0;L;;;;;N;;;;; +10485;OSMANYA LETTER KHA;Lo;0;L;;;;;N;;;;; +10486;OSMANYA LETTER DEEL;Lo;0;L;;;;;N;;;;; +10487;OSMANYA LETTER RA;Lo;0;L;;;;;N;;;;; +10488;OSMANYA LETTER SA;Lo;0;L;;;;;N;;;;; +10489;OSMANYA LETTER SHIIN;Lo;0;L;;;;;N;;;;; +1048A;OSMANYA LETTER DHA;Lo;0;L;;;;;N;;;;; +1048B;OSMANYA LETTER CAYN;Lo;0;L;;;;;N;;;;; +1048C;OSMANYA LETTER GA;Lo;0;L;;;;;N;;;;; +1048D;OSMANYA LETTER FA;Lo;0;L;;;;;N;;;;; +1048E;OSMANYA LETTER QAAF;Lo;0;L;;;;;N;;;;; +1048F;OSMANYA LETTER KAAF;Lo;0;L;;;;;N;;;;; +10490;OSMANYA LETTER LAAN;Lo;0;L;;;;;N;;;;; +10491;OSMANYA LETTER MIIN;Lo;0;L;;;;;N;;;;; +10492;OSMANYA LETTER NUUN;Lo;0;L;;;;;N;;;;; +10493;OSMANYA LETTER WAW;Lo;0;L;;;;;N;;;;; +10494;OSMANYA LETTER HA;Lo;0;L;;;;;N;;;;; +10495;OSMANYA LETTER YA;Lo;0;L;;;;;N;;;;; +10496;OSMANYA LETTER A;Lo;0;L;;;;;N;;;;; +10497;OSMANYA LETTER E;Lo;0;L;;;;;N;;;;; +10498;OSMANYA LETTER I;Lo;0;L;;;;;N;;;;; +10499;OSMANYA LETTER O;Lo;0;L;;;;;N;;;;; +1049A;OSMANYA LETTER U;Lo;0;L;;;;;N;;;;; +1049B;OSMANYA LETTER AA;Lo;0;L;;;;;N;;;;; +1049C;OSMANYA LETTER EE;Lo;0;L;;;;;N;;;;; +1049D;OSMANYA LETTER OO;Lo;0;L;;;;;N;;;;; +104A0;OSMANYA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +104A1;OSMANYA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +104A2;OSMANYA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +104A3;OSMANYA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +104A4;OSMANYA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +104A5;OSMANYA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +104A6;OSMANYA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +104A7;OSMANYA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +104A8;OSMANYA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +104A9;OSMANYA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +104B0;OSAGE CAPITAL LETTER A;Lu;0;L;;;;;N;;;;104D8; +104B1;OSAGE CAPITAL LETTER AI;Lu;0;L;;;;;N;;;;104D9; +104B2;OSAGE CAPITAL LETTER AIN;Lu;0;L;;;;;N;;;;104DA; +104B3;OSAGE CAPITAL LETTER AH;Lu;0;L;;;;;N;;;;104DB; +104B4;OSAGE CAPITAL LETTER BRA;Lu;0;L;;;;;N;;;;104DC; +104B5;OSAGE CAPITAL LETTER CHA;Lu;0;L;;;;;N;;;;104DD; +104B6;OSAGE CAPITAL LETTER EHCHA;Lu;0;L;;;;;N;;;;104DE; +104B7;OSAGE CAPITAL LETTER E;Lu;0;L;;;;;N;;;;104DF; +104B8;OSAGE CAPITAL LETTER EIN;Lu;0;L;;;;;N;;;;104E0; +104B9;OSAGE CAPITAL LETTER HA;Lu;0;L;;;;;N;;;;104E1; +104BA;OSAGE CAPITAL LETTER HYA;Lu;0;L;;;;;N;;;;104E2; +104BB;OSAGE CAPITAL LETTER I;Lu;0;L;;;;;N;;;;104E3; +104BC;OSAGE CAPITAL LETTER KA;Lu;0;L;;;;;N;;;;104E4; +104BD;OSAGE CAPITAL LETTER EHKA;Lu;0;L;;;;;N;;;;104E5; +104BE;OSAGE CAPITAL LETTER KYA;Lu;0;L;;;;;N;;;;104E6; +104BF;OSAGE CAPITAL LETTER LA;Lu;0;L;;;;;N;;;;104E7; +104C0;OSAGE CAPITAL LETTER MA;Lu;0;L;;;;;N;;;;104E8; +104C1;OSAGE CAPITAL LETTER NA;Lu;0;L;;;;;N;;;;104E9; +104C2;OSAGE CAPITAL LETTER O;Lu;0;L;;;;;N;;;;104EA; +104C3;OSAGE CAPITAL LETTER OIN;Lu;0;L;;;;;N;;;;104EB; +104C4;OSAGE CAPITAL LETTER PA;Lu;0;L;;;;;N;;;;104EC; +104C5;OSAGE CAPITAL LETTER EHPA;Lu;0;L;;;;;N;;;;104ED; +104C6;OSAGE CAPITAL LETTER SA;Lu;0;L;;;;;N;;;;104EE; +104C7;OSAGE CAPITAL LETTER SHA;Lu;0;L;;;;;N;;;;104EF; +104C8;OSAGE CAPITAL LETTER TA;Lu;0;L;;;;;N;;;;104F0; +104C9;OSAGE CAPITAL LETTER EHTA;Lu;0;L;;;;;N;;;;104F1; +104CA;OSAGE CAPITAL LETTER TSA;Lu;0;L;;;;;N;;;;104F2; +104CB;OSAGE CAPITAL LETTER EHTSA;Lu;0;L;;;;;N;;;;104F3; +104CC;OSAGE CAPITAL LETTER TSHA;Lu;0;L;;;;;N;;;;104F4; +104CD;OSAGE CAPITAL LETTER DHA;Lu;0;L;;;;;N;;;;104F5; +104CE;OSAGE CAPITAL LETTER U;Lu;0;L;;;;;N;;;;104F6; +104CF;OSAGE CAPITAL LETTER WA;Lu;0;L;;;;;N;;;;104F7; +104D0;OSAGE CAPITAL LETTER KHA;Lu;0;L;;;;;N;;;;104F8; +104D1;OSAGE CAPITAL LETTER GHA;Lu;0;L;;;;;N;;;;104F9; +104D2;OSAGE CAPITAL LETTER ZA;Lu;0;L;;;;;N;;;;104FA; +104D3;OSAGE CAPITAL LETTER ZHA;Lu;0;L;;;;;N;;;;104FB; +104D8;OSAGE SMALL LETTER A;Ll;0;L;;;;;N;;;104B0;;104B0 +104D9;OSAGE SMALL LETTER AI;Ll;0;L;;;;;N;;;104B1;;104B1 +104DA;OSAGE SMALL LETTER AIN;Ll;0;L;;;;;N;;;104B2;;104B2 +104DB;OSAGE SMALL LETTER AH;Ll;0;L;;;;;N;;;104B3;;104B3 +104DC;OSAGE SMALL LETTER BRA;Ll;0;L;;;;;N;;;104B4;;104B4 +104DD;OSAGE SMALL LETTER CHA;Ll;0;L;;;;;N;;;104B5;;104B5 +104DE;OSAGE SMALL LETTER EHCHA;Ll;0;L;;;;;N;;;104B6;;104B6 +104DF;OSAGE SMALL LETTER E;Ll;0;L;;;;;N;;;104B7;;104B7 +104E0;OSAGE SMALL LETTER EIN;Ll;0;L;;;;;N;;;104B8;;104B8 +104E1;OSAGE SMALL LETTER HA;Ll;0;L;;;;;N;;;104B9;;104B9 +104E2;OSAGE SMALL LETTER HYA;Ll;0;L;;;;;N;;;104BA;;104BA +104E3;OSAGE SMALL LETTER I;Ll;0;L;;;;;N;;;104BB;;104BB +104E4;OSAGE SMALL LETTER KA;Ll;0;L;;;;;N;;;104BC;;104BC +104E5;OSAGE SMALL LETTER EHKA;Ll;0;L;;;;;N;;;104BD;;104BD +104E6;OSAGE SMALL LETTER KYA;Ll;0;L;;;;;N;;;104BE;;104BE +104E7;OSAGE SMALL LETTER LA;Ll;0;L;;;;;N;;;104BF;;104BF +104E8;OSAGE SMALL LETTER MA;Ll;0;L;;;;;N;;;104C0;;104C0 +104E9;OSAGE SMALL LETTER NA;Ll;0;L;;;;;N;;;104C1;;104C1 +104EA;OSAGE SMALL LETTER O;Ll;0;L;;;;;N;;;104C2;;104C2 +104EB;OSAGE SMALL LETTER OIN;Ll;0;L;;;;;N;;;104C3;;104C3 +104EC;OSAGE SMALL LETTER PA;Ll;0;L;;;;;N;;;104C4;;104C4 +104ED;OSAGE SMALL LETTER EHPA;Ll;0;L;;;;;N;;;104C5;;104C5 +104EE;OSAGE SMALL LETTER SA;Ll;0;L;;;;;N;;;104C6;;104C6 +104EF;OSAGE SMALL LETTER SHA;Ll;0;L;;;;;N;;;104C7;;104C7 +104F0;OSAGE SMALL LETTER TA;Ll;0;L;;;;;N;;;104C8;;104C8 +104F1;OSAGE SMALL LETTER EHTA;Ll;0;L;;;;;N;;;104C9;;104C9 +104F2;OSAGE SMALL LETTER TSA;Ll;0;L;;;;;N;;;104CA;;104CA +104F3;OSAGE SMALL LETTER EHTSA;Ll;0;L;;;;;N;;;104CB;;104CB +104F4;OSAGE SMALL LETTER TSHA;Ll;0;L;;;;;N;;;104CC;;104CC +104F5;OSAGE SMALL LETTER DHA;Ll;0;L;;;;;N;;;104CD;;104CD +104F6;OSAGE SMALL LETTER U;Ll;0;L;;;;;N;;;104CE;;104CE +104F7;OSAGE SMALL LETTER WA;Ll;0;L;;;;;N;;;104CF;;104CF +104F8;OSAGE SMALL LETTER KHA;Ll;0;L;;;;;N;;;104D0;;104D0 +104F9;OSAGE SMALL LETTER GHA;Ll;0;L;;;;;N;;;104D1;;104D1 +104FA;OSAGE SMALL LETTER ZA;Ll;0;L;;;;;N;;;104D2;;104D2 +104FB;OSAGE SMALL LETTER ZHA;Ll;0;L;;;;;N;;;104D3;;104D3 +10500;ELBASAN LETTER A;Lo;0;L;;;;;N;;;;; +10501;ELBASAN LETTER BE;Lo;0;L;;;;;N;;;;; +10502;ELBASAN LETTER CE;Lo;0;L;;;;;N;;;;; +10503;ELBASAN LETTER CHE;Lo;0;L;;;;;N;;;;; +10504;ELBASAN LETTER DE;Lo;0;L;;;;;N;;;;; +10505;ELBASAN LETTER NDE;Lo;0;L;;;;;N;;;;; +10506;ELBASAN LETTER DHE;Lo;0;L;;;;;N;;;;; +10507;ELBASAN LETTER EI;Lo;0;L;;;;;N;;;;; +10508;ELBASAN LETTER E;Lo;0;L;;;;;N;;;;; +10509;ELBASAN LETTER FE;Lo;0;L;;;;;N;;;;; +1050A;ELBASAN LETTER GE;Lo;0;L;;;;;N;;;;; +1050B;ELBASAN LETTER GJE;Lo;0;L;;;;;N;;;;; +1050C;ELBASAN LETTER HE;Lo;0;L;;;;;N;;;;; +1050D;ELBASAN LETTER I;Lo;0;L;;;;;N;;;;; +1050E;ELBASAN LETTER JE;Lo;0;L;;;;;N;;;;; +1050F;ELBASAN LETTER KE;Lo;0;L;;;;;N;;;;; +10510;ELBASAN LETTER LE;Lo;0;L;;;;;N;;;;; +10511;ELBASAN LETTER LLE;Lo;0;L;;;;;N;;;;; +10512;ELBASAN LETTER ME;Lo;0;L;;;;;N;;;;; +10513;ELBASAN LETTER NE;Lo;0;L;;;;;N;;;;; +10514;ELBASAN LETTER NA;Lo;0;L;;;;;N;;;;; +10515;ELBASAN LETTER NJE;Lo;0;L;;;;;N;;;;; +10516;ELBASAN LETTER O;Lo;0;L;;;;;N;;;;; +10517;ELBASAN LETTER PE;Lo;0;L;;;;;N;;;;; +10518;ELBASAN LETTER QE;Lo;0;L;;;;;N;;;;; +10519;ELBASAN LETTER RE;Lo;0;L;;;;;N;;;;; +1051A;ELBASAN LETTER RRE;Lo;0;L;;;;;N;;;;; +1051B;ELBASAN LETTER SE;Lo;0;L;;;;;N;;;;; +1051C;ELBASAN LETTER SHE;Lo;0;L;;;;;N;;;;; +1051D;ELBASAN LETTER TE;Lo;0;L;;;;;N;;;;; +1051E;ELBASAN LETTER THE;Lo;0;L;;;;;N;;;;; +1051F;ELBASAN LETTER U;Lo;0;L;;;;;N;;;;; +10520;ELBASAN LETTER VE;Lo;0;L;;;;;N;;;;; +10521;ELBASAN LETTER XE;Lo;0;L;;;;;N;;;;; +10522;ELBASAN LETTER Y;Lo;0;L;;;;;N;;;;; +10523;ELBASAN LETTER ZE;Lo;0;L;;;;;N;;;;; +10524;ELBASAN LETTER ZHE;Lo;0;L;;;;;N;;;;; +10525;ELBASAN LETTER GHE;Lo;0;L;;;;;N;;;;; +10526;ELBASAN LETTER GHAMMA;Lo;0;L;;;;;N;;;;; +10527;ELBASAN LETTER KHE;Lo;0;L;;;;;N;;;;; +10530;CAUCASIAN ALBANIAN LETTER ALT;Lo;0;L;;;;;N;;;;; +10531;CAUCASIAN ALBANIAN LETTER BET;Lo;0;L;;;;;N;;;;; +10532;CAUCASIAN ALBANIAN LETTER GIM;Lo;0;L;;;;;N;;;;; +10533;CAUCASIAN ALBANIAN LETTER DAT;Lo;0;L;;;;;N;;;;; +10534;CAUCASIAN ALBANIAN LETTER EB;Lo;0;L;;;;;N;;;;; +10535;CAUCASIAN ALBANIAN LETTER ZARL;Lo;0;L;;;;;N;;;;; +10536;CAUCASIAN ALBANIAN LETTER EYN;Lo;0;L;;;;;N;;;;; +10537;CAUCASIAN ALBANIAN LETTER ZHIL;Lo;0;L;;;;;N;;;;; +10538;CAUCASIAN ALBANIAN LETTER TAS;Lo;0;L;;;;;N;;;;; +10539;CAUCASIAN ALBANIAN LETTER CHA;Lo;0;L;;;;;N;;;;; +1053A;CAUCASIAN ALBANIAN LETTER YOWD;Lo;0;L;;;;;N;;;;; +1053B;CAUCASIAN ALBANIAN LETTER ZHA;Lo;0;L;;;;;N;;;;; +1053C;CAUCASIAN ALBANIAN LETTER IRB;Lo;0;L;;;;;N;;;;; +1053D;CAUCASIAN ALBANIAN LETTER SHA;Lo;0;L;;;;;N;;;;; +1053E;CAUCASIAN ALBANIAN LETTER LAN;Lo;0;L;;;;;N;;;;; +1053F;CAUCASIAN ALBANIAN LETTER INYA;Lo;0;L;;;;;N;;;;; +10540;CAUCASIAN ALBANIAN LETTER XEYN;Lo;0;L;;;;;N;;;;; +10541;CAUCASIAN ALBANIAN LETTER DYAN;Lo;0;L;;;;;N;;;;; +10542;CAUCASIAN ALBANIAN LETTER CAR;Lo;0;L;;;;;N;;;;; +10543;CAUCASIAN ALBANIAN LETTER JHOX;Lo;0;L;;;;;N;;;;; +10544;CAUCASIAN ALBANIAN LETTER KAR;Lo;0;L;;;;;N;;;;; +10545;CAUCASIAN ALBANIAN LETTER LYIT;Lo;0;L;;;;;N;;;;; +10546;CAUCASIAN ALBANIAN LETTER HEYT;Lo;0;L;;;;;N;;;;; +10547;CAUCASIAN ALBANIAN LETTER QAY;Lo;0;L;;;;;N;;;;; +10548;CAUCASIAN ALBANIAN LETTER AOR;Lo;0;L;;;;;N;;;;; +10549;CAUCASIAN ALBANIAN LETTER CHOY;Lo;0;L;;;;;N;;;;; +1054A;CAUCASIAN ALBANIAN LETTER CHI;Lo;0;L;;;;;N;;;;; +1054B;CAUCASIAN ALBANIAN LETTER CYAY;Lo;0;L;;;;;N;;;;; +1054C;CAUCASIAN ALBANIAN LETTER MAQ;Lo;0;L;;;;;N;;;;; +1054D;CAUCASIAN ALBANIAN LETTER QAR;Lo;0;L;;;;;N;;;;; +1054E;CAUCASIAN ALBANIAN LETTER NOWC;Lo;0;L;;;;;N;;;;; +1054F;CAUCASIAN ALBANIAN LETTER DZYAY;Lo;0;L;;;;;N;;;;; +10550;CAUCASIAN ALBANIAN LETTER SHAK;Lo;0;L;;;;;N;;;;; +10551;CAUCASIAN ALBANIAN LETTER JAYN;Lo;0;L;;;;;N;;;;; +10552;CAUCASIAN ALBANIAN LETTER ON;Lo;0;L;;;;;N;;;;; +10553;CAUCASIAN ALBANIAN LETTER TYAY;Lo;0;L;;;;;N;;;;; +10554;CAUCASIAN ALBANIAN LETTER FAM;Lo;0;L;;;;;N;;;;; +10555;CAUCASIAN ALBANIAN LETTER DZAY;Lo;0;L;;;;;N;;;;; +10556;CAUCASIAN ALBANIAN LETTER CHAT;Lo;0;L;;;;;N;;;;; +10557;CAUCASIAN ALBANIAN LETTER PEN;Lo;0;L;;;;;N;;;;; +10558;CAUCASIAN ALBANIAN LETTER GHEYS;Lo;0;L;;;;;N;;;;; +10559;CAUCASIAN ALBANIAN LETTER RAT;Lo;0;L;;;;;N;;;;; +1055A;CAUCASIAN ALBANIAN LETTER SEYK;Lo;0;L;;;;;N;;;;; +1055B;CAUCASIAN ALBANIAN LETTER VEYZ;Lo;0;L;;;;;N;;;;; +1055C;CAUCASIAN ALBANIAN LETTER TIWR;Lo;0;L;;;;;N;;;;; +1055D;CAUCASIAN ALBANIAN LETTER SHOY;Lo;0;L;;;;;N;;;;; +1055E;CAUCASIAN ALBANIAN LETTER IWN;Lo;0;L;;;;;N;;;;; +1055F;CAUCASIAN ALBANIAN LETTER CYAW;Lo;0;L;;;;;N;;;;; +10560;CAUCASIAN ALBANIAN LETTER CAYN;Lo;0;L;;;;;N;;;;; +10561;CAUCASIAN ALBANIAN LETTER YAYD;Lo;0;L;;;;;N;;;;; +10562;CAUCASIAN ALBANIAN LETTER PIWR;Lo;0;L;;;;;N;;;;; +10563;CAUCASIAN ALBANIAN LETTER KIW;Lo;0;L;;;;;N;;;;; +1056F;CAUCASIAN ALBANIAN CITATION MARK;Po;0;L;;;;;N;;;;; +10570;VITHKUQI CAPITAL LETTER A;Lu;0;L;;;;;N;;;;10597; +10571;VITHKUQI CAPITAL LETTER BBE;Lu;0;L;;;;;N;;;;10598; +10572;VITHKUQI CAPITAL LETTER BE;Lu;0;L;;;;;N;;;;10599; +10573;VITHKUQI CAPITAL LETTER CE;Lu;0;L;;;;;N;;;;1059A; +10574;VITHKUQI CAPITAL LETTER CHE;Lu;0;L;;;;;N;;;;1059B; +10575;VITHKUQI CAPITAL LETTER DE;Lu;0;L;;;;;N;;;;1059C; +10576;VITHKUQI CAPITAL LETTER DHE;Lu;0;L;;;;;N;;;;1059D; +10577;VITHKUQI CAPITAL LETTER EI;Lu;0;L;;;;;N;;;;1059E; +10578;VITHKUQI CAPITAL LETTER E;Lu;0;L;;;;;N;;;;1059F; +10579;VITHKUQI CAPITAL LETTER FE;Lu;0;L;;;;;N;;;;105A0; +1057A;VITHKUQI CAPITAL LETTER GA;Lu;0;L;;;;;N;;;;105A1; +1057C;VITHKUQI CAPITAL LETTER HA;Lu;0;L;;;;;N;;;;105A3; +1057D;VITHKUQI CAPITAL LETTER HHA;Lu;0;L;;;;;N;;;;105A4; +1057E;VITHKUQI CAPITAL LETTER I;Lu;0;L;;;;;N;;;;105A5; +1057F;VITHKUQI CAPITAL LETTER IJE;Lu;0;L;;;;;N;;;;105A6; +10580;VITHKUQI CAPITAL LETTER JE;Lu;0;L;;;;;N;;;;105A7; +10581;VITHKUQI CAPITAL LETTER KA;Lu;0;L;;;;;N;;;;105A8; +10582;VITHKUQI CAPITAL LETTER LA;Lu;0;L;;;;;N;;;;105A9; +10583;VITHKUQI CAPITAL LETTER LLA;Lu;0;L;;;;;N;;;;105AA; +10584;VITHKUQI CAPITAL LETTER ME;Lu;0;L;;;;;N;;;;105AB; +10585;VITHKUQI CAPITAL LETTER NE;Lu;0;L;;;;;N;;;;105AC; +10586;VITHKUQI CAPITAL LETTER NJE;Lu;0;L;;;;;N;;;;105AD; +10587;VITHKUQI CAPITAL LETTER O;Lu;0;L;;;;;N;;;;105AE; +10588;VITHKUQI CAPITAL LETTER PE;Lu;0;L;;;;;N;;;;105AF; +10589;VITHKUQI CAPITAL LETTER QA;Lu;0;L;;;;;N;;;;105B0; +1058A;VITHKUQI CAPITAL LETTER RE;Lu;0;L;;;;;N;;;;105B1; +1058C;VITHKUQI CAPITAL LETTER SE;Lu;0;L;;;;;N;;;;105B3; +1058D;VITHKUQI CAPITAL LETTER SHE;Lu;0;L;;;;;N;;;;105B4; +1058E;VITHKUQI CAPITAL LETTER TE;Lu;0;L;;;;;N;;;;105B5; +1058F;VITHKUQI CAPITAL LETTER THE;Lu;0;L;;;;;N;;;;105B6; +10590;VITHKUQI CAPITAL LETTER U;Lu;0;L;;;;;N;;;;105B7; +10591;VITHKUQI CAPITAL LETTER VE;Lu;0;L;;;;;N;;;;105B8; +10592;VITHKUQI CAPITAL LETTER XE;Lu;0;L;;;;;N;;;;105B9; +10594;VITHKUQI CAPITAL LETTER Y;Lu;0;L;;;;;N;;;;105BB; +10595;VITHKUQI CAPITAL LETTER ZE;Lu;0;L;;;;;N;;;;105BC; +10597;VITHKUQI SMALL LETTER A;Ll;0;L;;;;;N;;;10570;;10570 +10598;VITHKUQI SMALL LETTER BBE;Ll;0;L;;;;;N;;;10571;;10571 +10599;VITHKUQI SMALL LETTER BE;Ll;0;L;;;;;N;;;10572;;10572 +1059A;VITHKUQI SMALL LETTER CE;Ll;0;L;;;;;N;;;10573;;10573 +1059B;VITHKUQI SMALL LETTER CHE;Ll;0;L;;;;;N;;;10574;;10574 +1059C;VITHKUQI SMALL LETTER DE;Ll;0;L;;;;;N;;;10575;;10575 +1059D;VITHKUQI SMALL LETTER DHE;Ll;0;L;;;;;N;;;10576;;10576 +1059E;VITHKUQI SMALL LETTER EI;Ll;0;L;;;;;N;;;10577;;10577 +1059F;VITHKUQI SMALL LETTER E;Ll;0;L;;;;;N;;;10578;;10578 +105A0;VITHKUQI SMALL LETTER FE;Ll;0;L;;;;;N;;;10579;;10579 +105A1;VITHKUQI SMALL LETTER GA;Ll;0;L;;;;;N;;;1057A;;1057A +105A3;VITHKUQI SMALL LETTER HA;Ll;0;L;;;;;N;;;1057C;;1057C +105A4;VITHKUQI SMALL LETTER HHA;Ll;0;L;;;;;N;;;1057D;;1057D +105A5;VITHKUQI SMALL LETTER I;Ll;0;L;;;;;N;;;1057E;;1057E +105A6;VITHKUQI SMALL LETTER IJE;Ll;0;L;;;;;N;;;1057F;;1057F +105A7;VITHKUQI SMALL LETTER JE;Ll;0;L;;;;;N;;;10580;;10580 +105A8;VITHKUQI SMALL LETTER KA;Ll;0;L;;;;;N;;;10581;;10581 +105A9;VITHKUQI SMALL LETTER LA;Ll;0;L;;;;;N;;;10582;;10582 +105AA;VITHKUQI SMALL LETTER LLA;Ll;0;L;;;;;N;;;10583;;10583 +105AB;VITHKUQI SMALL LETTER ME;Ll;0;L;;;;;N;;;10584;;10584 +105AC;VITHKUQI SMALL LETTER NE;Ll;0;L;;;;;N;;;10585;;10585 +105AD;VITHKUQI SMALL LETTER NJE;Ll;0;L;;;;;N;;;10586;;10586 +105AE;VITHKUQI SMALL LETTER O;Ll;0;L;;;;;N;;;10587;;10587 +105AF;VITHKUQI SMALL LETTER PE;Ll;0;L;;;;;N;;;10588;;10588 +105B0;VITHKUQI SMALL LETTER QA;Ll;0;L;;;;;N;;;10589;;10589 +105B1;VITHKUQI SMALL LETTER RE;Ll;0;L;;;;;N;;;1058A;;1058A +105B3;VITHKUQI SMALL LETTER SE;Ll;0;L;;;;;N;;;1058C;;1058C +105B4;VITHKUQI SMALL LETTER SHE;Ll;0;L;;;;;N;;;1058D;;1058D +105B5;VITHKUQI SMALL LETTER TE;Ll;0;L;;;;;N;;;1058E;;1058E +105B6;VITHKUQI SMALL LETTER THE;Ll;0;L;;;;;N;;;1058F;;1058F +105B7;VITHKUQI SMALL LETTER U;Ll;0;L;;;;;N;;;10590;;10590 +105B8;VITHKUQI SMALL LETTER VE;Ll;0;L;;;;;N;;;10591;;10591 +105B9;VITHKUQI SMALL LETTER XE;Ll;0;L;;;;;N;;;10592;;10592 +105BB;VITHKUQI SMALL LETTER Y;Ll;0;L;;;;;N;;;10594;;10594 +105BC;VITHKUQI SMALL LETTER ZE;Ll;0;L;;;;;N;;;10595;;10595 +105C0;TODHRI LETTER A;Lo;0;L;;;;;N;;;;; +105C1;TODHRI LETTER AS;Lo;0;L;;;;;N;;;;; +105C2;TODHRI LETTER BA;Lo;0;L;;;;;N;;;;; +105C3;TODHRI LETTER MBA;Lo;0;L;;;;;N;;;;; +105C4;TODHRI LETTER CA;Lo;0;L;;;;;N;;;;; +105C5;TODHRI LETTER CHA;Lo;0;L;;;;;N;;;;; +105C6;TODHRI LETTER DA;Lo;0;L;;;;;N;;;;; +105C7;TODHRI LETTER NDA;Lo;0;L;;;;;N;;;;; +105C8;TODHRI LETTER DHA;Lo;0;L;;;;;N;;;;; +105C9;TODHRI LETTER EI;Lo;0;L;105D2 0307;;;;N;;;;; +105CA;TODHRI LETTER E;Lo;0;L;;;;;N;;;;; +105CB;TODHRI LETTER FA;Lo;0;L;;;;;N;;;;; +105CC;TODHRI LETTER GA;Lo;0;L;;;;;N;;;;; +105CD;TODHRI LETTER NGA;Lo;0;L;;;;;N;;;;; +105CE;TODHRI LETTER GJA;Lo;0;L;;;;;N;;;;; +105CF;TODHRI LETTER NGJA;Lo;0;L;;;;;N;;;;; +105D0;TODHRI LETTER HA;Lo;0;L;;;;;N;;;;; +105D1;TODHRI LETTER HJA;Lo;0;L;;;;;N;;;;; +105D2;TODHRI LETTER I;Lo;0;L;;;;;N;;;;; +105D3;TODHRI LETTER JA;Lo;0;L;;;;;N;;;;; +105D4;TODHRI LETTER KA;Lo;0;L;;;;;N;;;;; +105D5;TODHRI LETTER LA;Lo;0;L;;;;;N;;;;; +105D6;TODHRI LETTER LLA;Lo;0;L;;;;;N;;;;; +105D7;TODHRI LETTER MA;Lo;0;L;;;;;N;;;;; +105D8;TODHRI LETTER NA;Lo;0;L;;;;;N;;;;; +105D9;TODHRI LETTER NJAN;Lo;0;L;;;;;N;;;;; +105DA;TODHRI LETTER O;Lo;0;L;;;;;N;;;;; +105DB;TODHRI LETTER PA;Lo;0;L;;;;;N;;;;; +105DC;TODHRI LETTER QA;Lo;0;L;;;;;N;;;;; +105DD;TODHRI LETTER RA;Lo;0;L;;;;;N;;;;; +105DE;TODHRI LETTER RRA;Lo;0;L;;;;;N;;;;; +105DF;TODHRI LETTER SA;Lo;0;L;;;;;N;;;;; +105E0;TODHRI LETTER SHA;Lo;0;L;;;;;N;;;;; +105E1;TODHRI LETTER SHTA;Lo;0;L;;;;;N;;;;; +105E2;TODHRI LETTER TA;Lo;0;L;;;;;N;;;;; +105E3;TODHRI LETTER THA;Lo;0;L;;;;;N;;;;; +105E4;TODHRI LETTER U;Lo;0;L;105DA 0307;;;;N;;;;; +105E5;TODHRI LETTER VA;Lo;0;L;;;;;N;;;;; +105E6;TODHRI LETTER XA;Lo;0;L;;;;;N;;;;; +105E7;TODHRI LETTER NXA;Lo;0;L;;;;;N;;;;; +105E8;TODHRI LETTER XHA;Lo;0;L;;;;;N;;;;; +105E9;TODHRI LETTER NXHA;Lo;0;L;;;;;N;;;;; +105EA;TODHRI LETTER Y;Lo;0;L;;;;;N;;;;; +105EB;TODHRI LETTER JY;Lo;0;L;;;;;N;;;;; +105EC;TODHRI LETTER ZA;Lo;0;L;;;;;N;;;;; +105ED;TODHRI LETTER ZHA;Lo;0;L;;;;;N;;;;; +105EE;TODHRI LETTER GHA;Lo;0;L;;;;;N;;;;; +105EF;TODHRI LETTER STA;Lo;0;L;;;;;N;;;;; +105F0;TODHRI LETTER SKAN;Lo;0;L;;;;;N;;;;; +105F1;TODHRI LETTER KHA;Lo;0;L;;;;;N;;;;; +105F2;TODHRI LETTER PSA;Lo;0;L;;;;;N;;;;; +105F3;TODHRI LETTER OO;Lo;0;L;;;;;N;;;;; +10600;LINEAR A SIGN AB001;Lo;0;L;;;;;N;;;;; +10601;LINEAR A SIGN AB002;Lo;0;L;;;;;N;;;;; +10602;LINEAR A SIGN AB003;Lo;0;L;;;;;N;;;;; +10603;LINEAR A SIGN AB004;Lo;0;L;;;;;N;;;;; +10604;LINEAR A SIGN AB005;Lo;0;L;;;;;N;;;;; +10605;LINEAR A SIGN AB006;Lo;0;L;;;;;N;;;;; +10606;LINEAR A SIGN AB007;Lo;0;L;;;;;N;;;;; +10607;LINEAR A SIGN AB008;Lo;0;L;;;;;N;;;;; +10608;LINEAR A SIGN AB009;Lo;0;L;;;;;N;;;;; +10609;LINEAR A SIGN AB010;Lo;0;L;;;;;N;;;;; +1060A;LINEAR A SIGN AB011;Lo;0;L;;;;;N;;;;; +1060B;LINEAR A SIGN AB013;Lo;0;L;;;;;N;;;;; +1060C;LINEAR A SIGN AB016;Lo;0;L;;;;;N;;;;; +1060D;LINEAR A SIGN AB017;Lo;0;L;;;;;N;;;;; +1060E;LINEAR A SIGN AB020;Lo;0;L;;;;;N;;;;; +1060F;LINEAR A SIGN AB021;Lo;0;L;;;;;N;;;;; +10610;LINEAR A SIGN AB021F;Lo;0;L;;;;;N;;;;; +10611;LINEAR A SIGN AB021M;Lo;0;L;;;;;N;;;;; +10612;LINEAR A SIGN AB022;Lo;0;L;;;;;N;;;;; +10613;LINEAR A SIGN AB022F;Lo;0;L;;;;;N;;;;; +10614;LINEAR A SIGN AB022M;Lo;0;L;;;;;N;;;;; +10615;LINEAR A SIGN AB023;Lo;0;L;;;;;N;;;;; +10616;LINEAR A SIGN AB023M;Lo;0;L;;;;;N;;;;; +10617;LINEAR A SIGN AB024;Lo;0;L;;;;;N;;;;; +10618;LINEAR A SIGN AB026;Lo;0;L;;;;;N;;;;; +10619;LINEAR A SIGN AB027;Lo;0;L;;;;;N;;;;; +1061A;LINEAR A SIGN AB028;Lo;0;L;;;;;N;;;;; +1061B;LINEAR A SIGN A028B;Lo;0;L;;;;;N;;;;; +1061C;LINEAR A SIGN AB029;Lo;0;L;;;;;N;;;;; +1061D;LINEAR A SIGN AB030;Lo;0;L;;;;;N;;;;; +1061E;LINEAR A SIGN AB031;Lo;0;L;;;;;N;;;;; +1061F;LINEAR A SIGN AB034;Lo;0;L;;;;;N;;;;; +10620;LINEAR A SIGN AB037;Lo;0;L;;;;;N;;;;; +10621;LINEAR A SIGN AB038;Lo;0;L;;;;;N;;;;; +10622;LINEAR A SIGN AB039;Lo;0;L;;;;;N;;;;; +10623;LINEAR A SIGN AB040;Lo;0;L;;;;;N;;;;; +10624;LINEAR A SIGN AB041;Lo;0;L;;;;;N;;;;; +10625;LINEAR A SIGN AB044;Lo;0;L;;;;;N;;;;; +10626;LINEAR A SIGN AB045;Lo;0;L;;;;;N;;;;; +10627;LINEAR A SIGN AB046;Lo;0;L;;;;;N;;;;; +10628;LINEAR A SIGN AB047;Lo;0;L;;;;;N;;;;; +10629;LINEAR A SIGN AB048;Lo;0;L;;;;;N;;;;; +1062A;LINEAR A SIGN AB049;Lo;0;L;;;;;N;;;;; +1062B;LINEAR A SIGN AB050;Lo;0;L;;;;;N;;;;; +1062C;LINEAR A SIGN AB051;Lo;0;L;;;;;N;;;;; +1062D;LINEAR A SIGN AB053;Lo;0;L;;;;;N;;;;; +1062E;LINEAR A SIGN AB054;Lo;0;L;;;;;N;;;;; +1062F;LINEAR A SIGN AB055;Lo;0;L;;;;;N;;;;; +10630;LINEAR A SIGN AB056;Lo;0;L;;;;;N;;;;; +10631;LINEAR A SIGN AB057;Lo;0;L;;;;;N;;;;; +10632;LINEAR A SIGN AB058;Lo;0;L;;;;;N;;;;; +10633;LINEAR A SIGN AB059;Lo;0;L;;;;;N;;;;; +10634;LINEAR A SIGN AB060;Lo;0;L;;;;;N;;;;; +10635;LINEAR A SIGN AB061;Lo;0;L;;;;;N;;;;; +10636;LINEAR A SIGN AB065;Lo;0;L;;;;;N;;;;; +10637;LINEAR A SIGN AB066;Lo;0;L;;;;;N;;;;; +10638;LINEAR A SIGN AB067;Lo;0;L;;;;;N;;;;; +10639;LINEAR A SIGN AB069;Lo;0;L;;;;;N;;;;; +1063A;LINEAR A SIGN AB070;Lo;0;L;;;;;N;;;;; +1063B;LINEAR A SIGN AB073;Lo;0;L;;;;;N;;;;; +1063C;LINEAR A SIGN AB074;Lo;0;L;;;;;N;;;;; +1063D;LINEAR A SIGN AB076;Lo;0;L;;;;;N;;;;; +1063E;LINEAR A SIGN AB077;Lo;0;L;;;;;N;;;;; +1063F;LINEAR A SIGN AB078;Lo;0;L;;;;;N;;;;; +10640;LINEAR A SIGN AB079;Lo;0;L;;;;;N;;;;; +10641;LINEAR A SIGN AB080;Lo;0;L;;;;;N;;;;; +10642;LINEAR A SIGN AB081;Lo;0;L;;;;;N;;;;; +10643;LINEAR A SIGN AB082;Lo;0;L;;;;;N;;;;; +10644;LINEAR A SIGN AB085;Lo;0;L;;;;;N;;;;; +10645;LINEAR A SIGN AB086;Lo;0;L;;;;;N;;;;; +10646;LINEAR A SIGN AB087;Lo;0;L;;;;;N;;;;; +10647;LINEAR A SIGN A100-102;Lo;0;L;;;;;N;;;;; +10648;LINEAR A SIGN AB118;Lo;0;L;;;;;N;;;;; +10649;LINEAR A SIGN AB120;Lo;0;L;;;;;N;;;;; +1064A;LINEAR A SIGN A120B;Lo;0;L;;;;;N;;;;; +1064B;LINEAR A SIGN AB122;Lo;0;L;;;;;N;;;;; +1064C;LINEAR A SIGN AB123;Lo;0;L;;;;;N;;;;; +1064D;LINEAR A SIGN AB131A;Lo;0;L;;;;;N;;;;; +1064E;LINEAR A SIGN AB131B;Lo;0;L;;;;;N;;;;; +1064F;LINEAR A SIGN A131C;Lo;0;L;;;;;N;;;;; +10650;LINEAR A SIGN AB164;Lo;0;L;;;;;N;;;;; +10651;LINEAR A SIGN AB171;Lo;0;L;;;;;N;;;;; +10652;LINEAR A SIGN AB180;Lo;0;L;;;;;N;;;;; +10653;LINEAR A SIGN AB188;Lo;0;L;;;;;N;;;;; +10654;LINEAR A SIGN AB191;Lo;0;L;;;;;N;;;;; +10655;LINEAR A SIGN A301;Lo;0;L;;;;;N;;;;; +10656;LINEAR A SIGN A302;Lo;0;L;;;;;N;;;;; +10657;LINEAR A SIGN A303;Lo;0;L;;;;;N;;;;; +10658;LINEAR A SIGN A304;Lo;0;L;;;;;N;;;;; +10659;LINEAR A SIGN A305;Lo;0;L;;;;;N;;;;; +1065A;LINEAR A SIGN A306;Lo;0;L;;;;;N;;;;; +1065B;LINEAR A SIGN A307;Lo;0;L;;;;;N;;;;; +1065C;LINEAR A SIGN A308;Lo;0;L;;;;;N;;;;; +1065D;LINEAR A SIGN A309A;Lo;0;L;;;;;N;;;;; +1065E;LINEAR A SIGN A309B;Lo;0;L;;;;;N;;;;; +1065F;LINEAR A SIGN A309C;Lo;0;L;;;;;N;;;;; +10660;LINEAR A SIGN A310;Lo;0;L;;;;;N;;;;; +10661;LINEAR A SIGN A311;Lo;0;L;;;;;N;;;;; +10662;LINEAR A SIGN A312;Lo;0;L;;;;;N;;;;; +10663;LINEAR A SIGN A313A;Lo;0;L;;;;;N;;;;; +10664;LINEAR A SIGN A313B;Lo;0;L;;;;;N;;;;; +10665;LINEAR A SIGN A313C;Lo;0;L;;;;;N;;;;; +10666;LINEAR A SIGN A314;Lo;0;L;;;;;N;;;;; +10667;LINEAR A SIGN A315;Lo;0;L;;;;;N;;;;; +10668;LINEAR A SIGN A316;Lo;0;L;;;;;N;;;;; +10669;LINEAR A SIGN A317;Lo;0;L;;;;;N;;;;; +1066A;LINEAR A SIGN A318;Lo;0;L;;;;;N;;;;; +1066B;LINEAR A SIGN A319;Lo;0;L;;;;;N;;;;; +1066C;LINEAR A SIGN A320;Lo;0;L;;;;;N;;;;; +1066D;LINEAR A SIGN A321;Lo;0;L;;;;;N;;;;; +1066E;LINEAR A SIGN A322;Lo;0;L;;;;;N;;;;; +1066F;LINEAR A SIGN A323;Lo;0;L;;;;;N;;;;; +10670;LINEAR A SIGN A324;Lo;0;L;;;;;N;;;;; +10671;LINEAR A SIGN A325;Lo;0;L;;;;;N;;;;; +10672;LINEAR A SIGN A326;Lo;0;L;;;;;N;;;;; +10673;LINEAR A SIGN A327;Lo;0;L;;;;;N;;;;; +10674;LINEAR A SIGN A328;Lo;0;L;;;;;N;;;;; +10675;LINEAR A SIGN A329;Lo;0;L;;;;;N;;;;; +10676;LINEAR A SIGN A330;Lo;0;L;;;;;N;;;;; +10677;LINEAR A SIGN A331;Lo;0;L;;;;;N;;;;; +10678;LINEAR A SIGN A332;Lo;0;L;;;;;N;;;;; +10679;LINEAR A SIGN A333;Lo;0;L;;;;;N;;;;; +1067A;LINEAR A SIGN A334;Lo;0;L;;;;;N;;;;; +1067B;LINEAR A SIGN A335;Lo;0;L;;;;;N;;;;; +1067C;LINEAR A SIGN A336;Lo;0;L;;;;;N;;;;; +1067D;LINEAR A SIGN A337;Lo;0;L;;;;;N;;;;; +1067E;LINEAR A SIGN A338;Lo;0;L;;;;;N;;;;; +1067F;LINEAR A SIGN A339;Lo;0;L;;;;;N;;;;; +10680;LINEAR A SIGN A340;Lo;0;L;;;;;N;;;;; +10681;LINEAR A SIGN A341;Lo;0;L;;;;;N;;;;; +10682;LINEAR A SIGN A342;Lo;0;L;;;;;N;;;;; +10683;LINEAR A SIGN A343;Lo;0;L;;;;;N;;;;; +10684;LINEAR A SIGN A344;Lo;0;L;;;;;N;;;;; +10685;LINEAR A SIGN A345;Lo;0;L;;;;;N;;;;; +10686;LINEAR A SIGN A346;Lo;0;L;;;;;N;;;;; +10687;LINEAR A SIGN A347;Lo;0;L;;;;;N;;;;; +10688;LINEAR A SIGN A348;Lo;0;L;;;;;N;;;;; +10689;LINEAR A SIGN A349;Lo;0;L;;;;;N;;;;; +1068A;LINEAR A SIGN A350;Lo;0;L;;;;;N;;;;; +1068B;LINEAR A SIGN A351;Lo;0;L;;;;;N;;;;; +1068C;LINEAR A SIGN A352;Lo;0;L;;;;;N;;;;; +1068D;LINEAR A SIGN A353;Lo;0;L;;;;;N;;;;; +1068E;LINEAR A SIGN A354;Lo;0;L;;;;;N;;;;; +1068F;LINEAR A SIGN A355;Lo;0;L;;;;;N;;;;; +10690;LINEAR A SIGN A356;Lo;0;L;;;;;N;;;;; +10691;LINEAR A SIGN A357;Lo;0;L;;;;;N;;;;; +10692;LINEAR A SIGN A358;Lo;0;L;;;;;N;;;;; +10693;LINEAR A SIGN A359;Lo;0;L;;;;;N;;;;; +10694;LINEAR A SIGN A360;Lo;0;L;;;;;N;;;;; +10695;LINEAR A SIGN A361;Lo;0;L;;;;;N;;;;; +10696;LINEAR A SIGN A362;Lo;0;L;;;;;N;;;;; +10697;LINEAR A SIGN A363;Lo;0;L;;;;;N;;;;; +10698;LINEAR A SIGN A364;Lo;0;L;;;;;N;;;;; +10699;LINEAR A SIGN A365;Lo;0;L;;;;;N;;;;; +1069A;LINEAR A SIGN A366;Lo;0;L;;;;;N;;;;; +1069B;LINEAR A SIGN A367;Lo;0;L;;;;;N;;;;; +1069C;LINEAR A SIGN A368;Lo;0;L;;;;;N;;;;; +1069D;LINEAR A SIGN A369;Lo;0;L;;;;;N;;;;; +1069E;LINEAR A SIGN A370;Lo;0;L;;;;;N;;;;; +1069F;LINEAR A SIGN A371;Lo;0;L;;;;;N;;;;; +106A0;LINEAR A SIGN A400-VAS;Lo;0;L;;;;;N;;;;; +106A1;LINEAR A SIGN A401-VAS;Lo;0;L;;;;;N;;;;; +106A2;LINEAR A SIGN A402-VAS;Lo;0;L;;;;;N;;;;; +106A3;LINEAR A SIGN A403-VAS;Lo;0;L;;;;;N;;;;; +106A4;LINEAR A SIGN A404-VAS;Lo;0;L;;;;;N;;;;; +106A5;LINEAR A SIGN A405-VAS;Lo;0;L;;;;;N;;;;; +106A6;LINEAR A SIGN A406-VAS;Lo;0;L;;;;;N;;;;; +106A7;LINEAR A SIGN A407-VAS;Lo;0;L;;;;;N;;;;; +106A8;LINEAR A SIGN A408-VAS;Lo;0;L;;;;;N;;;;; +106A9;LINEAR A SIGN A409-VAS;Lo;0;L;;;;;N;;;;; +106AA;LINEAR A SIGN A410-VAS;Lo;0;L;;;;;N;;;;; +106AB;LINEAR A SIGN A411-VAS;Lo;0;L;;;;;N;;;;; +106AC;LINEAR A SIGN A412-VAS;Lo;0;L;;;;;N;;;;; +106AD;LINEAR A SIGN A413-VAS;Lo;0;L;;;;;N;;;;; +106AE;LINEAR A SIGN A414-VAS;Lo;0;L;;;;;N;;;;; +106AF;LINEAR A SIGN A415-VAS;Lo;0;L;;;;;N;;;;; +106B0;LINEAR A SIGN A416-VAS;Lo;0;L;;;;;N;;;;; +106B1;LINEAR A SIGN A417-VAS;Lo;0;L;;;;;N;;;;; +106B2;LINEAR A SIGN A418-VAS;Lo;0;L;;;;;N;;;;; +106B3;LINEAR A SIGN A501;Lo;0;L;;;;;N;;;;; +106B4;LINEAR A SIGN A502;Lo;0;L;;;;;N;;;;; +106B5;LINEAR A SIGN A503;Lo;0;L;;;;;N;;;;; +106B6;LINEAR A SIGN A504;Lo;0;L;;;;;N;;;;; +106B7;LINEAR A SIGN A505;Lo;0;L;;;;;N;;;;; +106B8;LINEAR A SIGN A506;Lo;0;L;;;;;N;;;;; +106B9;LINEAR A SIGN A508;Lo;0;L;;;;;N;;;;; +106BA;LINEAR A SIGN A509;Lo;0;L;;;;;N;;;;; +106BB;LINEAR A SIGN A510;Lo;0;L;;;;;N;;;;; +106BC;LINEAR A SIGN A511;Lo;0;L;;;;;N;;;;; +106BD;LINEAR A SIGN A512;Lo;0;L;;;;;N;;;;; +106BE;LINEAR A SIGN A513;Lo;0;L;;;;;N;;;;; +106BF;LINEAR A SIGN A515;Lo;0;L;;;;;N;;;;; +106C0;LINEAR A SIGN A516;Lo;0;L;;;;;N;;;;; +106C1;LINEAR A SIGN A520;Lo;0;L;;;;;N;;;;; +106C2;LINEAR A SIGN A521;Lo;0;L;;;;;N;;;;; +106C3;LINEAR A SIGN A523;Lo;0;L;;;;;N;;;;; +106C4;LINEAR A SIGN A524;Lo;0;L;;;;;N;;;;; +106C5;LINEAR A SIGN A525;Lo;0;L;;;;;N;;;;; +106C6;LINEAR A SIGN A526;Lo;0;L;;;;;N;;;;; +106C7;LINEAR A SIGN A527;Lo;0;L;;;;;N;;;;; +106C8;LINEAR A SIGN A528;Lo;0;L;;;;;N;;;;; +106C9;LINEAR A SIGN A529;Lo;0;L;;;;;N;;;;; +106CA;LINEAR A SIGN A530;Lo;0;L;;;;;N;;;;; +106CB;LINEAR A SIGN A531;Lo;0;L;;;;;N;;;;; +106CC;LINEAR A SIGN A532;Lo;0;L;;;;;N;;;;; +106CD;LINEAR A SIGN A534;Lo;0;L;;;;;N;;;;; +106CE;LINEAR A SIGN A535;Lo;0;L;;;;;N;;;;; +106CF;LINEAR A SIGN A536;Lo;0;L;;;;;N;;;;; +106D0;LINEAR A SIGN A537;Lo;0;L;;;;;N;;;;; +106D1;LINEAR A SIGN A538;Lo;0;L;;;;;N;;;;; +106D2;LINEAR A SIGN A539;Lo;0;L;;;;;N;;;;; +106D3;LINEAR A SIGN A540;Lo;0;L;;;;;N;;;;; +106D4;LINEAR A SIGN A541;Lo;0;L;;;;;N;;;;; +106D5;LINEAR A SIGN A542;Lo;0;L;;;;;N;;;;; +106D6;LINEAR A SIGN A545;Lo;0;L;;;;;N;;;;; +106D7;LINEAR A SIGN A547;Lo;0;L;;;;;N;;;;; +106D8;LINEAR A SIGN A548;Lo;0;L;;;;;N;;;;; +106D9;LINEAR A SIGN A549;Lo;0;L;;;;;N;;;;; +106DA;LINEAR A SIGN A550;Lo;0;L;;;;;N;;;;; +106DB;LINEAR A SIGN A551;Lo;0;L;;;;;N;;;;; +106DC;LINEAR A SIGN A552;Lo;0;L;;;;;N;;;;; +106DD;LINEAR A SIGN A553;Lo;0;L;;;;;N;;;;; +106DE;LINEAR A SIGN A554;Lo;0;L;;;;;N;;;;; +106DF;LINEAR A SIGN A555;Lo;0;L;;;;;N;;;;; +106E0;LINEAR A SIGN A556;Lo;0;L;;;;;N;;;;; +106E1;LINEAR A SIGN A557;Lo;0;L;;;;;N;;;;; +106E2;LINEAR A SIGN A559;Lo;0;L;;;;;N;;;;; +106E3;LINEAR A SIGN A563;Lo;0;L;;;;;N;;;;; +106E4;LINEAR A SIGN A564;Lo;0;L;;;;;N;;;;; +106E5;LINEAR A SIGN A565;Lo;0;L;;;;;N;;;;; +106E6;LINEAR A SIGN A566;Lo;0;L;;;;;N;;;;; +106E7;LINEAR A SIGN A568;Lo;0;L;;;;;N;;;;; +106E8;LINEAR A SIGN A569;Lo;0;L;;;;;N;;;;; +106E9;LINEAR A SIGN A570;Lo;0;L;;;;;N;;;;; +106EA;LINEAR A SIGN A571;Lo;0;L;;;;;N;;;;; +106EB;LINEAR A SIGN A572;Lo;0;L;;;;;N;;;;; +106EC;LINEAR A SIGN A573;Lo;0;L;;;;;N;;;;; +106ED;LINEAR A SIGN A574;Lo;0;L;;;;;N;;;;; +106EE;LINEAR A SIGN A575;Lo;0;L;;;;;N;;;;; +106EF;LINEAR A SIGN A576;Lo;0;L;;;;;N;;;;; +106F0;LINEAR A SIGN A577;Lo;0;L;;;;;N;;;;; +106F1;LINEAR A SIGN A578;Lo;0;L;;;;;N;;;;; +106F2;LINEAR A SIGN A579;Lo;0;L;;;;;N;;;;; +106F3;LINEAR A SIGN A580;Lo;0;L;;;;;N;;;;; +106F4;LINEAR A SIGN A581;Lo;0;L;;;;;N;;;;; +106F5;LINEAR A SIGN A582;Lo;0;L;;;;;N;;;;; +106F6;LINEAR A SIGN A583;Lo;0;L;;;;;N;;;;; +106F7;LINEAR A SIGN A584;Lo;0;L;;;;;N;;;;; +106F8;LINEAR A SIGN A585;Lo;0;L;;;;;N;;;;; +106F9;LINEAR A SIGN A586;Lo;0;L;;;;;N;;;;; +106FA;LINEAR A SIGN A587;Lo;0;L;;;;;N;;;;; +106FB;LINEAR A SIGN A588;Lo;0;L;;;;;N;;;;; +106FC;LINEAR A SIGN A589;Lo;0;L;;;;;N;;;;; +106FD;LINEAR A SIGN A591;Lo;0;L;;;;;N;;;;; +106FE;LINEAR A SIGN A592;Lo;0;L;;;;;N;;;;; +106FF;LINEAR A SIGN A594;Lo;0;L;;;;;N;;;;; +10700;LINEAR A SIGN A595;Lo;0;L;;;;;N;;;;; +10701;LINEAR A SIGN A596;Lo;0;L;;;;;N;;;;; +10702;LINEAR A SIGN A598;Lo;0;L;;;;;N;;;;; +10703;LINEAR A SIGN A600;Lo;0;L;;;;;N;;;;; +10704;LINEAR A SIGN A601;Lo;0;L;;;;;N;;;;; +10705;LINEAR A SIGN A602;Lo;0;L;;;;;N;;;;; +10706;LINEAR A SIGN A603;Lo;0;L;;;;;N;;;;; +10707;LINEAR A SIGN A604;Lo;0;L;;;;;N;;;;; +10708;LINEAR A SIGN A606;Lo;0;L;;;;;N;;;;; +10709;LINEAR A SIGN A608;Lo;0;L;;;;;N;;;;; +1070A;LINEAR A SIGN A609;Lo;0;L;;;;;N;;;;; +1070B;LINEAR A SIGN A610;Lo;0;L;;;;;N;;;;; +1070C;LINEAR A SIGN A611;Lo;0;L;;;;;N;;;;; +1070D;LINEAR A SIGN A612;Lo;0;L;;;;;N;;;;; +1070E;LINEAR A SIGN A613;Lo;0;L;;;;;N;;;;; +1070F;LINEAR A SIGN A614;Lo;0;L;;;;;N;;;;; +10710;LINEAR A SIGN A615;Lo;0;L;;;;;N;;;;; +10711;LINEAR A SIGN A616;Lo;0;L;;;;;N;;;;; +10712;LINEAR A SIGN A617;Lo;0;L;;;;;N;;;;; +10713;LINEAR A SIGN A618;Lo;0;L;;;;;N;;;;; +10714;LINEAR A SIGN A619;Lo;0;L;;;;;N;;;;; +10715;LINEAR A SIGN A620;Lo;0;L;;;;;N;;;;; +10716;LINEAR A SIGN A621;Lo;0;L;;;;;N;;;;; +10717;LINEAR A SIGN A622;Lo;0;L;;;;;N;;;;; +10718;LINEAR A SIGN A623;Lo;0;L;;;;;N;;;;; +10719;LINEAR A SIGN A624;Lo;0;L;;;;;N;;;;; +1071A;LINEAR A SIGN A626;Lo;0;L;;;;;N;;;;; +1071B;LINEAR A SIGN A627;Lo;0;L;;;;;N;;;;; +1071C;LINEAR A SIGN A628;Lo;0;L;;;;;N;;;;; +1071D;LINEAR A SIGN A629;Lo;0;L;;;;;N;;;;; +1071E;LINEAR A SIGN A634;Lo;0;L;;;;;N;;;;; +1071F;LINEAR A SIGN A637;Lo;0;L;;;;;N;;;;; +10720;LINEAR A SIGN A638;Lo;0;L;;;;;N;;;;; +10721;LINEAR A SIGN A640;Lo;0;L;;;;;N;;;;; +10722;LINEAR A SIGN A642;Lo;0;L;;;;;N;;;;; +10723;LINEAR A SIGN A643;Lo;0;L;;;;;N;;;;; +10724;LINEAR A SIGN A644;Lo;0;L;;;;;N;;;;; +10725;LINEAR A SIGN A645;Lo;0;L;;;;;N;;;;; +10726;LINEAR A SIGN A646;Lo;0;L;;;;;N;;;;; +10727;LINEAR A SIGN A648;Lo;0;L;;;;;N;;;;; +10728;LINEAR A SIGN A649;Lo;0;L;;;;;N;;;;; +10729;LINEAR A SIGN A651;Lo;0;L;;;;;N;;;;; +1072A;LINEAR A SIGN A652;Lo;0;L;;;;;N;;;;; +1072B;LINEAR A SIGN A653;Lo;0;L;;;;;N;;;;; +1072C;LINEAR A SIGN A654;Lo;0;L;;;;;N;;;;; +1072D;LINEAR A SIGN A655;Lo;0;L;;;;;N;;;;; +1072E;LINEAR A SIGN A656;Lo;0;L;;;;;N;;;;; +1072F;LINEAR A SIGN A657;Lo;0;L;;;;;N;;;;; +10730;LINEAR A SIGN A658;Lo;0;L;;;;;N;;;;; +10731;LINEAR A SIGN A659;Lo;0;L;;;;;N;;;;; +10732;LINEAR A SIGN A660;Lo;0;L;;;;;N;;;;; +10733;LINEAR A SIGN A661;Lo;0;L;;;;;N;;;;; +10734;LINEAR A SIGN A662;Lo;0;L;;;;;N;;;;; +10735;LINEAR A SIGN A663;Lo;0;L;;;;;N;;;;; +10736;LINEAR A SIGN A664;Lo;0;L;;;;;N;;;;; +10740;LINEAR A SIGN A701 A;Lo;0;L;;;;;N;;;;; +10741;LINEAR A SIGN A702 B;Lo;0;L;;;;;N;;;;; +10742;LINEAR A SIGN A703 D;Lo;0;L;;;;;N;;;;; +10743;LINEAR A SIGN A704 E;Lo;0;L;;;;;N;;;;; +10744;LINEAR A SIGN A705 F;Lo;0;L;;;;;N;;;;; +10745;LINEAR A SIGN A706 H;Lo;0;L;;;;;N;;;;; +10746;LINEAR A SIGN A707 J;Lo;0;L;;;;;N;;;;; +10747;LINEAR A SIGN A708 K;Lo;0;L;;;;;N;;;;; +10748;LINEAR A SIGN A709 L;Lo;0;L;;;;;N;;;;; +10749;LINEAR A SIGN A709-2 L2;Lo;0;L;;;;;N;;;;; +1074A;LINEAR A SIGN A709-3 L3;Lo;0;L;;;;;N;;;;; +1074B;LINEAR A SIGN A709-4 L4;Lo;0;L;;;;;N;;;;; +1074C;LINEAR A SIGN A709-6 L6;Lo;0;L;;;;;N;;;;; +1074D;LINEAR A SIGN A710 W;Lo;0;L;;;;;N;;;;; +1074E;LINEAR A SIGN A711 X;Lo;0;L;;;;;N;;;;; +1074F;LINEAR A SIGN A712 Y;Lo;0;L;;;;;N;;;;; +10750;LINEAR A SIGN A713 OMEGA;Lo;0;L;;;;;N;;;;; +10751;LINEAR A SIGN A714 ABB;Lo;0;L;;;;;N;;;;; +10752;LINEAR A SIGN A715 BB;Lo;0;L;;;;;N;;;;; +10753;LINEAR A SIGN A717 DD;Lo;0;L;;;;;N;;;;; +10754;LINEAR A SIGN A726 EYYY;Lo;0;L;;;;;N;;;;; +10755;LINEAR A SIGN A732 JE;Lo;0;L;;;;;N;;;;; +10760;LINEAR A SIGN A800;Lo;0;L;;;;;N;;;;; +10761;LINEAR A SIGN A801;Lo;0;L;;;;;N;;;;; +10762;LINEAR A SIGN A802;Lo;0;L;;;;;N;;;;; +10763;LINEAR A SIGN A803;Lo;0;L;;;;;N;;;;; +10764;LINEAR A SIGN A804;Lo;0;L;;;;;N;;;;; +10765;LINEAR A SIGN A805;Lo;0;L;;;;;N;;;;; +10766;LINEAR A SIGN A806;Lo;0;L;;;;;N;;;;; +10767;LINEAR A SIGN A807;Lo;0;L;;;;;N;;;;; +10780;MODIFIER LETTER SMALL CAPITAL AA;Lm;0;L;;;;;N;;;;; +10781;MODIFIER LETTER SUPERSCRIPT TRIANGULAR COLON;Lm;0;L; 02D0;;;;N;;;;; +10782;MODIFIER LETTER SUPERSCRIPT HALF TRIANGULAR COLON;Lm;0;L; 02D1;;;;N;;;;; +10783;MODIFIER LETTER SMALL AE;Lm;0;L; 00E6;;;;N;;;;; +10784;MODIFIER LETTER SMALL CAPITAL B;Lm;0;L; 0299;;;;N;;;;; +10785;MODIFIER LETTER SMALL B WITH HOOK;Lm;0;L; 0253;;;;N;;;;; +10787;MODIFIER LETTER SMALL DZ DIGRAPH;Lm;0;L; 02A3;;;;N;;;;; +10788;MODIFIER LETTER SMALL DZ DIGRAPH WITH RETROFLEX HOOK;Lm;0;L; AB66;;;;N;;;;; +10789;MODIFIER LETTER SMALL DZ DIGRAPH WITH CURL;Lm;0;L; 02A5;;;;N;;;;; +1078A;MODIFIER LETTER SMALL DEZH DIGRAPH;Lm;0;L; 02A4;;;;N;;;;; +1078B;MODIFIER LETTER SMALL D WITH TAIL;Lm;0;L; 0256;;;;N;;;;; +1078C;MODIFIER LETTER SMALL D WITH HOOK;Lm;0;L; 0257;;;;N;;;;; +1078D;MODIFIER LETTER SMALL D WITH HOOK AND TAIL;Lm;0;L; 1D91;;;;N;;;;; +1078E;MODIFIER LETTER SMALL REVERSED E;Lm;0;L; 0258;;;;N;;;;; +1078F;MODIFIER LETTER SMALL CLOSED REVERSED OPEN E;Lm;0;L; 025E;;;;N;;;;; +10790;MODIFIER LETTER SMALL FENG DIGRAPH;Lm;0;L; 02A9;;;;N;;;;; +10791;MODIFIER LETTER SMALL RAMS HORN;Lm;0;L; 0264;;;;N;;;;; +10792;MODIFIER LETTER SMALL CAPITAL G;Lm;0;L; 0262;;;;N;;;;; +10793;MODIFIER LETTER SMALL G WITH HOOK;Lm;0;L; 0260;;;;N;;;;; +10794;MODIFIER LETTER SMALL CAPITAL G WITH HOOK;Lm;0;L; 029B;;;;N;;;;; +10795;MODIFIER LETTER SMALL H WITH STROKE;Lm;0;L; 0127;;;;N;;;;; +10796;MODIFIER LETTER SMALL CAPITAL H;Lm;0;L; 029C;;;;N;;;;; +10797;MODIFIER LETTER SMALL HENG WITH HOOK;Lm;0;L; 0267;;;;N;;;;; +10798;MODIFIER LETTER SMALL DOTLESS J WITH STROKE AND HOOK;Lm;0;L; 0284;;;;N;;;;; +10799;MODIFIER LETTER SMALL LS DIGRAPH;Lm;0;L; 02AA;;;;N;;;;; +1079A;MODIFIER LETTER SMALL LZ DIGRAPH;Lm;0;L; 02AB;;;;N;;;;; +1079B;MODIFIER LETTER SMALL L WITH BELT;Lm;0;L; 026C;;;;N;;;;; +1079C;MODIFIER LETTER SMALL CAPITAL L WITH BELT;Lm;0;L; 1DF04;;;;N;;;;; +1079D;MODIFIER LETTER SMALL L WITH RETROFLEX HOOK AND BELT;Lm;0;L; A78E;;;;N;;;;; +1079E;MODIFIER LETTER SMALL LEZH;Lm;0;L; 026E;;;;N;;;;; +1079F;MODIFIER LETTER SMALL LEZH WITH RETROFLEX HOOK;Lm;0;L; 1DF05;;;;N;;;;; +107A0;MODIFIER LETTER SMALL TURNED Y;Lm;0;L; 028E;;;;N;;;;; +107A1;MODIFIER LETTER SMALL TURNED Y WITH BELT;Lm;0;L; 1DF06;;;;N;;;;; +107A2;MODIFIER LETTER SMALL O WITH STROKE;Lm;0;L; 00F8;;;;N;;;;; +107A3;MODIFIER LETTER SMALL CAPITAL OE;Lm;0;L; 0276;;;;N;;;;; +107A4;MODIFIER LETTER SMALL CLOSED OMEGA;Lm;0;L; 0277;;;;N;;;;; +107A5;MODIFIER LETTER SMALL Q;Lm;0;L; 0071;;;;N;;;;; +107A6;MODIFIER LETTER SMALL TURNED R WITH LONG LEG;Lm;0;L; 027A;;;;N;;;;; +107A7;MODIFIER LETTER SMALL TURNED R WITH LONG LEG AND RETROFLEX HOOK;Lm;0;L; 1DF08;;;;N;;;;; +107A8;MODIFIER LETTER SMALL R WITH TAIL;Lm;0;L; 027D;;;;N;;;;; +107A9;MODIFIER LETTER SMALL R WITH FISHHOOK;Lm;0;L; 027E;;;;N;;;;; +107AA;MODIFIER LETTER SMALL CAPITAL R;Lm;0;L; 0280;;;;N;;;;; +107AB;MODIFIER LETTER SMALL TC DIGRAPH WITH CURL;Lm;0;L; 02A8;;;;N;;;;; +107AC;MODIFIER LETTER SMALL TS DIGRAPH;Lm;0;L; 02A6;;;;N;;;;; +107AD;MODIFIER LETTER SMALL TS DIGRAPH WITH RETROFLEX HOOK;Lm;0;L; AB67;;;;N;;;;; +107AE;MODIFIER LETTER SMALL TESH DIGRAPH;Lm;0;L; 02A7;;;;N;;;;; +107AF;MODIFIER LETTER SMALL T WITH RETROFLEX HOOK;Lm;0;L; 0288;;;;N;;;;; +107B0;MODIFIER LETTER SMALL V WITH RIGHT HOOK;Lm;0;L; 2C71;;;;N;;;;; +107B2;MODIFIER LETTER SMALL CAPITAL Y;Lm;0;L; 028F;;;;N;;;;; +107B3;MODIFIER LETTER GLOTTAL STOP WITH STROKE;Lm;0;L; 02A1;;;;N;;;;; +107B4;MODIFIER LETTER REVERSED GLOTTAL STOP WITH STROKE;Lm;0;L; 02A2;;;;N;;;;; +107B5;MODIFIER LETTER BILABIAL CLICK;Lm;0;L; 0298;;;;N;;;;; +107B6;MODIFIER LETTER DENTAL CLICK;Lm;0;L; 01C0;;;;N;;;;; +107B7;MODIFIER LETTER LATERAL CLICK;Lm;0;L; 01C1;;;;N;;;;; +107B8;MODIFIER LETTER ALVEOLAR CLICK;Lm;0;L; 01C2;;;;N;;;;; +107B9;MODIFIER LETTER RETROFLEX CLICK WITH RETROFLEX HOOK;Lm;0;L; 1DF0A;;;;N;;;;; +107BA;MODIFIER LETTER SMALL S WITH CURL;Lm;0;L; 1DF1E;;;;N;;;;; +10800;CYPRIOT SYLLABLE A;Lo;0;R;;;;;N;;;;; +10801;CYPRIOT SYLLABLE E;Lo;0;R;;;;;N;;;;; +10802;CYPRIOT SYLLABLE I;Lo;0;R;;;;;N;;;;; +10803;CYPRIOT SYLLABLE O;Lo;0;R;;;;;N;;;;; +10804;CYPRIOT SYLLABLE U;Lo;0;R;;;;;N;;;;; +10805;CYPRIOT SYLLABLE JA;Lo;0;R;;;;;N;;;;; +10808;CYPRIOT SYLLABLE JO;Lo;0;R;;;;;N;;;;; +1080A;CYPRIOT SYLLABLE KA;Lo;0;R;;;;;N;;;;; +1080B;CYPRIOT SYLLABLE KE;Lo;0;R;;;;;N;;;;; +1080C;CYPRIOT SYLLABLE KI;Lo;0;R;;;;;N;;;;; +1080D;CYPRIOT SYLLABLE KO;Lo;0;R;;;;;N;;;;; +1080E;CYPRIOT SYLLABLE KU;Lo;0;R;;;;;N;;;;; +1080F;CYPRIOT SYLLABLE LA;Lo;0;R;;;;;N;;;;; +10810;CYPRIOT SYLLABLE LE;Lo;0;R;;;;;N;;;;; +10811;CYPRIOT SYLLABLE LI;Lo;0;R;;;;;N;;;;; +10812;CYPRIOT SYLLABLE LO;Lo;0;R;;;;;N;;;;; +10813;CYPRIOT SYLLABLE LU;Lo;0;R;;;;;N;;;;; +10814;CYPRIOT SYLLABLE MA;Lo;0;R;;;;;N;;;;; +10815;CYPRIOT SYLLABLE ME;Lo;0;R;;;;;N;;;;; +10816;CYPRIOT SYLLABLE MI;Lo;0;R;;;;;N;;;;; +10817;CYPRIOT SYLLABLE MO;Lo;0;R;;;;;N;;;;; +10818;CYPRIOT SYLLABLE MU;Lo;0;R;;;;;N;;;;; +10819;CYPRIOT SYLLABLE NA;Lo;0;R;;;;;N;;;;; +1081A;CYPRIOT SYLLABLE NE;Lo;0;R;;;;;N;;;;; +1081B;CYPRIOT SYLLABLE NI;Lo;0;R;;;;;N;;;;; +1081C;CYPRIOT SYLLABLE NO;Lo;0;R;;;;;N;;;;; +1081D;CYPRIOT SYLLABLE NU;Lo;0;R;;;;;N;;;;; +1081E;CYPRIOT SYLLABLE PA;Lo;0;R;;;;;N;;;;; +1081F;CYPRIOT SYLLABLE PE;Lo;0;R;;;;;N;;;;; +10820;CYPRIOT SYLLABLE PI;Lo;0;R;;;;;N;;;;; +10821;CYPRIOT SYLLABLE PO;Lo;0;R;;;;;N;;;;; +10822;CYPRIOT SYLLABLE PU;Lo;0;R;;;;;N;;;;; +10823;CYPRIOT SYLLABLE RA;Lo;0;R;;;;;N;;;;; +10824;CYPRIOT SYLLABLE RE;Lo;0;R;;;;;N;;;;; +10825;CYPRIOT SYLLABLE RI;Lo;0;R;;;;;N;;;;; +10826;CYPRIOT SYLLABLE RO;Lo;0;R;;;;;N;;;;; +10827;CYPRIOT SYLLABLE RU;Lo;0;R;;;;;N;;;;; +10828;CYPRIOT SYLLABLE SA;Lo;0;R;;;;;N;;;;; +10829;CYPRIOT SYLLABLE SE;Lo;0;R;;;;;N;;;;; +1082A;CYPRIOT SYLLABLE SI;Lo;0;R;;;;;N;;;;; +1082B;CYPRIOT SYLLABLE SO;Lo;0;R;;;;;N;;;;; +1082C;CYPRIOT SYLLABLE SU;Lo;0;R;;;;;N;;;;; +1082D;CYPRIOT SYLLABLE TA;Lo;0;R;;;;;N;;;;; +1082E;CYPRIOT SYLLABLE TE;Lo;0;R;;;;;N;;;;; +1082F;CYPRIOT SYLLABLE TI;Lo;0;R;;;;;N;;;;; +10830;CYPRIOT SYLLABLE TO;Lo;0;R;;;;;N;;;;; +10831;CYPRIOT SYLLABLE TU;Lo;0;R;;;;;N;;;;; +10832;CYPRIOT SYLLABLE WA;Lo;0;R;;;;;N;;;;; +10833;CYPRIOT SYLLABLE WE;Lo;0;R;;;;;N;;;;; +10834;CYPRIOT SYLLABLE WI;Lo;0;R;;;;;N;;;;; +10835;CYPRIOT SYLLABLE WO;Lo;0;R;;;;;N;;;;; +10837;CYPRIOT SYLLABLE XA;Lo;0;R;;;;;N;;;;; +10838;CYPRIOT SYLLABLE XE;Lo;0;R;;;;;N;;;;; +1083C;CYPRIOT SYLLABLE ZA;Lo;0;R;;;;;N;;;;; +1083F;CYPRIOT SYLLABLE ZO;Lo;0;R;;;;;N;;;;; +10840;IMPERIAL ARAMAIC LETTER ALEPH;Lo;0;R;;;;;N;;;;; +10841;IMPERIAL ARAMAIC LETTER BETH;Lo;0;R;;;;;N;;;;; +10842;IMPERIAL ARAMAIC LETTER GIMEL;Lo;0;R;;;;;N;;;;; +10843;IMPERIAL ARAMAIC LETTER DALETH;Lo;0;R;;;;;N;;;;; +10844;IMPERIAL ARAMAIC LETTER HE;Lo;0;R;;;;;N;;;;; +10845;IMPERIAL ARAMAIC LETTER WAW;Lo;0;R;;;;;N;;;;; +10846;IMPERIAL ARAMAIC LETTER ZAYIN;Lo;0;R;;;;;N;;;;; +10847;IMPERIAL ARAMAIC LETTER HETH;Lo;0;R;;;;;N;;;;; +10848;IMPERIAL ARAMAIC LETTER TETH;Lo;0;R;;;;;N;;;;; +10849;IMPERIAL ARAMAIC LETTER YODH;Lo;0;R;;;;;N;;;;; +1084A;IMPERIAL ARAMAIC LETTER KAPH;Lo;0;R;;;;;N;;;;; +1084B;IMPERIAL ARAMAIC LETTER LAMEDH;Lo;0;R;;;;;N;;;;; +1084C;IMPERIAL ARAMAIC LETTER MEM;Lo;0;R;;;;;N;;;;; +1084D;IMPERIAL ARAMAIC LETTER NUN;Lo;0;R;;;;;N;;;;; +1084E;IMPERIAL ARAMAIC LETTER SAMEKH;Lo;0;R;;;;;N;;;;; +1084F;IMPERIAL ARAMAIC LETTER AYIN;Lo;0;R;;;;;N;;;;; +10850;IMPERIAL ARAMAIC LETTER PE;Lo;0;R;;;;;N;;;;; +10851;IMPERIAL ARAMAIC LETTER SADHE;Lo;0;R;;;;;N;;;;; +10852;IMPERIAL ARAMAIC LETTER QOPH;Lo;0;R;;;;;N;;;;; +10853;IMPERIAL ARAMAIC LETTER RESH;Lo;0;R;;;;;N;;;;; +10854;IMPERIAL ARAMAIC LETTER SHIN;Lo;0;R;;;;;N;;;;; +10855;IMPERIAL ARAMAIC LETTER TAW;Lo;0;R;;;;;N;;;;; +10857;IMPERIAL ARAMAIC SECTION SIGN;Po;0;R;;;;;N;;;;; +10858;IMPERIAL ARAMAIC NUMBER ONE;No;0;R;;;;1;N;;;;; +10859;IMPERIAL ARAMAIC NUMBER TWO;No;0;R;;;;2;N;;;;; +1085A;IMPERIAL ARAMAIC NUMBER THREE;No;0;R;;;;3;N;;;;; +1085B;IMPERIAL ARAMAIC NUMBER TEN;No;0;R;;;;10;N;;;;; +1085C;IMPERIAL ARAMAIC NUMBER TWENTY;No;0;R;;;;20;N;;;;; +1085D;IMPERIAL ARAMAIC NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;; +1085E;IMPERIAL ARAMAIC NUMBER ONE THOUSAND;No;0;R;;;;1000;N;;;;; +1085F;IMPERIAL ARAMAIC NUMBER TEN THOUSAND;No;0;R;;;;10000;N;;;;; +10860;PALMYRENE LETTER ALEPH;Lo;0;R;;;;;N;;;;; +10861;PALMYRENE LETTER BETH;Lo;0;R;;;;;N;;;;; +10862;PALMYRENE LETTER GIMEL;Lo;0;R;;;;;N;;;;; +10863;PALMYRENE LETTER DALETH;Lo;0;R;;;;;N;;;;; +10864;PALMYRENE LETTER HE;Lo;0;R;;;;;N;;;;; +10865;PALMYRENE LETTER WAW;Lo;0;R;;;;;N;;;;; +10866;PALMYRENE LETTER ZAYIN;Lo;0;R;;;;;N;;;;; +10867;PALMYRENE LETTER HETH;Lo;0;R;;;;;N;;;;; +10868;PALMYRENE LETTER TETH;Lo;0;R;;;;;N;;;;; +10869;PALMYRENE LETTER YODH;Lo;0;R;;;;;N;;;;; +1086A;PALMYRENE LETTER KAPH;Lo;0;R;;;;;N;;;;; +1086B;PALMYRENE LETTER LAMEDH;Lo;0;R;;;;;N;;;;; +1086C;PALMYRENE LETTER MEM;Lo;0;R;;;;;N;;;;; +1086D;PALMYRENE LETTER FINAL NUN;Lo;0;R;;;;;N;;;;; +1086E;PALMYRENE LETTER NUN;Lo;0;R;;;;;N;;;;; +1086F;PALMYRENE LETTER SAMEKH;Lo;0;R;;;;;N;;;;; +10870;PALMYRENE LETTER AYIN;Lo;0;R;;;;;N;;;;; +10871;PALMYRENE LETTER PE;Lo;0;R;;;;;N;;;;; +10872;PALMYRENE LETTER SADHE;Lo;0;R;;;;;N;;;;; +10873;PALMYRENE LETTER QOPH;Lo;0;R;;;;;N;;;;; +10874;PALMYRENE LETTER RESH;Lo;0;R;;;;;N;;;;; +10875;PALMYRENE LETTER SHIN;Lo;0;R;;;;;N;;;;; +10876;PALMYRENE LETTER TAW;Lo;0;R;;;;;N;;;;; +10877;PALMYRENE LEFT-POINTING FLEURON;So;0;R;;;;;N;;;;; +10878;PALMYRENE RIGHT-POINTING FLEURON;So;0;R;;;;;N;;;;; +10879;PALMYRENE NUMBER ONE;No;0;R;;;;1;N;;;;; +1087A;PALMYRENE NUMBER TWO;No;0;R;;;;2;N;;;;; +1087B;PALMYRENE NUMBER THREE;No;0;R;;;;3;N;;;;; +1087C;PALMYRENE NUMBER FOUR;No;0;R;;;;4;N;;;;; +1087D;PALMYRENE NUMBER FIVE;No;0;R;;;;5;N;;;;; +1087E;PALMYRENE NUMBER TEN;No;0;R;;;;10;N;;;;; +1087F;PALMYRENE NUMBER TWENTY;No;0;R;;;;20;N;;;;; +10880;NABATAEAN LETTER FINAL ALEPH;Lo;0;R;;;;;N;;;;; +10881;NABATAEAN LETTER ALEPH;Lo;0;R;;;;;N;;;;; +10882;NABATAEAN LETTER FINAL BETH;Lo;0;R;;;;;N;;;;; +10883;NABATAEAN LETTER BETH;Lo;0;R;;;;;N;;;;; +10884;NABATAEAN LETTER GIMEL;Lo;0;R;;;;;N;;;;; +10885;NABATAEAN LETTER DALETH;Lo;0;R;;;;;N;;;;; +10886;NABATAEAN LETTER FINAL HE;Lo;0;R;;;;;N;;;;; +10887;NABATAEAN LETTER HE;Lo;0;R;;;;;N;;;;; +10888;NABATAEAN LETTER WAW;Lo;0;R;;;;;N;;;;; +10889;NABATAEAN LETTER ZAYIN;Lo;0;R;;;;;N;;;;; +1088A;NABATAEAN LETTER HETH;Lo;0;R;;;;;N;;;;; +1088B;NABATAEAN LETTER TETH;Lo;0;R;;;;;N;;;;; +1088C;NABATAEAN LETTER FINAL YODH;Lo;0;R;;;;;N;;;;; +1088D;NABATAEAN LETTER YODH;Lo;0;R;;;;;N;;;;; +1088E;NABATAEAN LETTER FINAL KAPH;Lo;0;R;;;;;N;;;;; +1088F;NABATAEAN LETTER KAPH;Lo;0;R;;;;;N;;;;; +10890;NABATAEAN LETTER FINAL LAMEDH;Lo;0;R;;;;;N;;;;; +10891;NABATAEAN LETTER LAMEDH;Lo;0;R;;;;;N;;;;; +10892;NABATAEAN LETTER FINAL MEM;Lo;0;R;;;;;N;;;;; +10893;NABATAEAN LETTER MEM;Lo;0;R;;;;;N;;;;; +10894;NABATAEAN LETTER FINAL NUN;Lo;0;R;;;;;N;;;;; +10895;NABATAEAN LETTER NUN;Lo;0;R;;;;;N;;;;; +10896;NABATAEAN LETTER SAMEKH;Lo;0;R;;;;;N;;;;; +10897;NABATAEAN LETTER AYIN;Lo;0;R;;;;;N;;;;; +10898;NABATAEAN LETTER PE;Lo;0;R;;;;;N;;;;; +10899;NABATAEAN LETTER SADHE;Lo;0;R;;;;;N;;;;; +1089A;NABATAEAN LETTER QOPH;Lo;0;R;;;;;N;;;;; +1089B;NABATAEAN LETTER RESH;Lo;0;R;;;;;N;;;;; +1089C;NABATAEAN LETTER FINAL SHIN;Lo;0;R;;;;;N;;;;; +1089D;NABATAEAN LETTER SHIN;Lo;0;R;;;;;N;;;;; +1089E;NABATAEAN LETTER TAW;Lo;0;R;;;;;N;;;;; +108A7;NABATAEAN NUMBER ONE;No;0;R;;;;1;N;;;;; +108A8;NABATAEAN NUMBER TWO;No;0;R;;;;2;N;;;;; +108A9;NABATAEAN NUMBER THREE;No;0;R;;;;3;N;;;;; +108AA;NABATAEAN NUMBER FOUR;No;0;R;;;;4;N;;;;; +108AB;NABATAEAN CRUCIFORM NUMBER FOUR;No;0;R;;;;4;N;;;;; +108AC;NABATAEAN NUMBER FIVE;No;0;R;;;;5;N;;;;; +108AD;NABATAEAN NUMBER TEN;No;0;R;;;;10;N;;;;; +108AE;NABATAEAN NUMBER TWENTY;No;0;R;;;;20;N;;;;; +108AF;NABATAEAN NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;; +108E0;HATRAN LETTER ALEPH;Lo;0;R;;;;;N;;;;; +108E1;HATRAN LETTER BETH;Lo;0;R;;;;;N;;;;; +108E2;HATRAN LETTER GIMEL;Lo;0;R;;;;;N;;;;; +108E3;HATRAN LETTER DALETH-RESH;Lo;0;R;;;;;N;;;;; +108E4;HATRAN LETTER HE;Lo;0;R;;;;;N;;;;; +108E5;HATRAN LETTER WAW;Lo;0;R;;;;;N;;;;; +108E6;HATRAN LETTER ZAYN;Lo;0;R;;;;;N;;;;; +108E7;HATRAN LETTER HETH;Lo;0;R;;;;;N;;;;; +108E8;HATRAN LETTER TETH;Lo;0;R;;;;;N;;;;; +108E9;HATRAN LETTER YODH;Lo;0;R;;;;;N;;;;; +108EA;HATRAN LETTER KAPH;Lo;0;R;;;;;N;;;;; +108EB;HATRAN LETTER LAMEDH;Lo;0;R;;;;;N;;;;; +108EC;HATRAN LETTER MEM;Lo;0;R;;;;;N;;;;; +108ED;HATRAN LETTER NUN;Lo;0;R;;;;;N;;;;; +108EE;HATRAN LETTER SAMEKH;Lo;0;R;;;;;N;;;;; +108EF;HATRAN LETTER AYN;Lo;0;R;;;;;N;;;;; +108F0;HATRAN LETTER PE;Lo;0;R;;;;;N;;;;; +108F1;HATRAN LETTER SADHE;Lo;0;R;;;;;N;;;;; +108F2;HATRAN LETTER QOPH;Lo;0;R;;;;;N;;;;; +108F4;HATRAN LETTER SHIN;Lo;0;R;;;;;N;;;;; +108F5;HATRAN LETTER TAW;Lo;0;R;;;;;N;;;;; +108FB;HATRAN NUMBER ONE;No;0;R;;;;1;N;;;;; +108FC;HATRAN NUMBER FIVE;No;0;R;;;;5;N;;;;; +108FD;HATRAN NUMBER TEN;No;0;R;;;;10;N;;;;; +108FE;HATRAN NUMBER TWENTY;No;0;R;;;;20;N;;;;; +108FF;HATRAN NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;; +10900;PHOENICIAN LETTER ALF;Lo;0;R;;;;;N;;;;; +10901;PHOENICIAN LETTER BET;Lo;0;R;;;;;N;;;;; +10902;PHOENICIAN LETTER GAML;Lo;0;R;;;;;N;;;;; +10903;PHOENICIAN LETTER DELT;Lo;0;R;;;;;N;;;;; +10904;PHOENICIAN LETTER HE;Lo;0;R;;;;;N;;;;; +10905;PHOENICIAN LETTER WAU;Lo;0;R;;;;;N;;;;; +10906;PHOENICIAN LETTER ZAI;Lo;0;R;;;;;N;;;;; +10907;PHOENICIAN LETTER HET;Lo;0;R;;;;;N;;;;; +10908;PHOENICIAN LETTER TET;Lo;0;R;;;;;N;;;;; +10909;PHOENICIAN LETTER YOD;Lo;0;R;;;;;N;;;;; +1090A;PHOENICIAN LETTER KAF;Lo;0;R;;;;;N;;;;; +1090B;PHOENICIAN LETTER LAMD;Lo;0;R;;;;;N;;;;; +1090C;PHOENICIAN LETTER MEM;Lo;0;R;;;;;N;;;;; +1090D;PHOENICIAN LETTER NUN;Lo;0;R;;;;;N;;;;; +1090E;PHOENICIAN LETTER SEMK;Lo;0;R;;;;;N;;;;; +1090F;PHOENICIAN LETTER AIN;Lo;0;R;;;;;N;;;;; +10910;PHOENICIAN LETTER PE;Lo;0;R;;;;;N;;;;; +10911;PHOENICIAN LETTER SADE;Lo;0;R;;;;;N;;;;; +10912;PHOENICIAN LETTER QOF;Lo;0;R;;;;;N;;;;; +10913;PHOENICIAN LETTER ROSH;Lo;0;R;;;;;N;;;;; +10914;PHOENICIAN LETTER SHIN;Lo;0;R;;;;;N;;;;; +10915;PHOENICIAN LETTER TAU;Lo;0;R;;;;;N;;;;; +10916;PHOENICIAN NUMBER ONE;No;0;R;;;;1;N;;;;; +10917;PHOENICIAN NUMBER TEN;No;0;R;;;;10;N;;;;; +10918;PHOENICIAN NUMBER TWENTY;No;0;R;;;;20;N;;;;; +10919;PHOENICIAN NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;; +1091A;PHOENICIAN NUMBER TWO;No;0;R;;;;2;N;;;;; +1091B;PHOENICIAN NUMBER THREE;No;0;R;;;;3;N;;;;; +1091F;PHOENICIAN WORD SEPARATOR;Po;0;ON;;;;;N;;;;; +10920;LYDIAN LETTER A;Lo;0;R;;;;;N;;;;; +10921;LYDIAN LETTER B;Lo;0;R;;;;;N;;;;; +10922;LYDIAN LETTER G;Lo;0;R;;;;;N;;;;; +10923;LYDIAN LETTER D;Lo;0;R;;;;;N;;;;; +10924;LYDIAN LETTER E;Lo;0;R;;;;;N;;;;; +10925;LYDIAN LETTER V;Lo;0;R;;;;;N;;;;; +10926;LYDIAN LETTER I;Lo;0;R;;;;;N;;;;; +10927;LYDIAN LETTER Y;Lo;0;R;;;;;N;;;;; +10928;LYDIAN LETTER K;Lo;0;R;;;;;N;;;;; +10929;LYDIAN LETTER L;Lo;0;R;;;;;N;;;;; +1092A;LYDIAN LETTER M;Lo;0;R;;;;;N;;;;; +1092B;LYDIAN LETTER N;Lo;0;R;;;;;N;;;;; +1092C;LYDIAN LETTER O;Lo;0;R;;;;;N;;;;; +1092D;LYDIAN LETTER R;Lo;0;R;;;;;N;;;;; +1092E;LYDIAN LETTER SS;Lo;0;R;;;;;N;;;;; +1092F;LYDIAN LETTER T;Lo;0;R;;;;;N;;;;; +10930;LYDIAN LETTER U;Lo;0;R;;;;;N;;;;; +10931;LYDIAN LETTER F;Lo;0;R;;;;;N;;;;; +10932;LYDIAN LETTER Q;Lo;0;R;;;;;N;;;;; +10933;LYDIAN LETTER S;Lo;0;R;;;;;N;;;;; +10934;LYDIAN LETTER TT;Lo;0;R;;;;;N;;;;; +10935;LYDIAN LETTER AN;Lo;0;R;;;;;N;;;;; +10936;LYDIAN LETTER EN;Lo;0;R;;;;;N;;;;; +10937;LYDIAN LETTER LY;Lo;0;R;;;;;N;;;;; +10938;LYDIAN LETTER NN;Lo;0;R;;;;;N;;;;; +10939;LYDIAN LETTER C;Lo;0;R;;;;;N;;;;; +1093F;LYDIAN TRIANGULAR MARK;Po;0;R;;;;;N;;;;; +10940;SIDETIC LETTER N01;Lo;0;R;;;;;N;;;;; +10941;SIDETIC LETTER N02;Lo;0;R;;;;;N;;;;; +10942;SIDETIC LETTER N03;Lo;0;R;;;;;N;;;;; +10943;SIDETIC LETTER N04;Lo;0;R;;;;;N;;;;; +10944;SIDETIC LETTER N05;Lo;0;R;;;;;N;;;;; +10945;SIDETIC LETTER N06;Lo;0;R;;;;;N;;;;; +10946;SIDETIC LETTER N07;Lo;0;R;;;;;N;;;;; +10947;SIDETIC LETTER N08;Lo;0;R;;;;;N;;;;; +10948;SIDETIC LETTER N09;Lo;0;R;;;;;N;;;;; +10949;SIDETIC LETTER N10;Lo;0;R;;;;;N;;;;; +1094A;SIDETIC LETTER N11;Lo;0;R;;;;;N;;;;; +1094B;SIDETIC LETTER N12;Lo;0;R;;;;;N;;;;; +1094C;SIDETIC LETTER N13;Lo;0;R;;;;;N;;;;; +1094D;SIDETIC LETTER N14;Lo;0;R;;;;;N;;;;; +1094E;SIDETIC LETTER N15;Lo;0;R;;;;;N;;;;; +1094F;SIDETIC LETTER N16;Lo;0;R;;;;;N;;;;; +10950;SIDETIC LETTER N17;Lo;0;R;;;;;N;;;;; +10951;SIDETIC LETTER N18;Lo;0;R;;;;;N;;;;; +10952;SIDETIC LETTER N19;Lo;0;R;;;;;N;;;;; +10953;SIDETIC LETTER N20;Lo;0;R;;;;;N;;;;; +10954;SIDETIC LETTER N21;Lo;0;R;;;;;N;;;;; +10955;SIDETIC LETTER N22;Lo;0;R;;;;;N;;;;; +10956;SIDETIC LETTER N23;Lo;0;R;;;;;N;;;;; +10957;SIDETIC LETTER N24;Lo;0;R;;;;;N;;;;; +10958;SIDETIC LETTER N25;Lo;0;R;;;;;N;;;;; +10959;SIDETIC LETTER N26;Lo;0;R;;;;;N;;;;; +10980;MEROITIC HIEROGLYPHIC LETTER A;Lo;0;R;;;;;N;;;;; +10981;MEROITIC HIEROGLYPHIC LETTER E;Lo;0;R;;;;;N;;;;; +10982;MEROITIC HIEROGLYPHIC LETTER I;Lo;0;R;;;;;N;;;;; +10983;MEROITIC HIEROGLYPHIC LETTER O;Lo;0;R;;;;;N;;;;; +10984;MEROITIC HIEROGLYPHIC LETTER YA;Lo;0;R;;;;;N;;;;; +10985;MEROITIC HIEROGLYPHIC LETTER WA;Lo;0;R;;;;;N;;;;; +10986;MEROITIC HIEROGLYPHIC LETTER BA;Lo;0;R;;;;;N;;;;; +10987;MEROITIC HIEROGLYPHIC LETTER BA-2;Lo;0;R;;;;;N;;;;; +10988;MEROITIC HIEROGLYPHIC LETTER PA;Lo;0;R;;;;;N;;;;; +10989;MEROITIC HIEROGLYPHIC LETTER MA;Lo;0;R;;;;;N;;;;; +1098A;MEROITIC HIEROGLYPHIC LETTER NA;Lo;0;R;;;;;N;;;;; +1098B;MEROITIC HIEROGLYPHIC LETTER NA-2;Lo;0;R;;;;;N;;;;; +1098C;MEROITIC HIEROGLYPHIC LETTER NE;Lo;0;R;;;;;N;;;;; +1098D;MEROITIC HIEROGLYPHIC LETTER NE-2;Lo;0;R;;;;;N;;;;; +1098E;MEROITIC HIEROGLYPHIC LETTER RA;Lo;0;R;;;;;N;;;;; +1098F;MEROITIC HIEROGLYPHIC LETTER RA-2;Lo;0;R;;;;;N;;;;; +10990;MEROITIC HIEROGLYPHIC LETTER LA;Lo;0;R;;;;;N;;;;; +10991;MEROITIC HIEROGLYPHIC LETTER KHA;Lo;0;R;;;;;N;;;;; +10992;MEROITIC HIEROGLYPHIC LETTER HHA;Lo;0;R;;;;;N;;;;; +10993;MEROITIC HIEROGLYPHIC LETTER SA;Lo;0;R;;;;;N;;;;; +10994;MEROITIC HIEROGLYPHIC LETTER SA-2;Lo;0;R;;;;;N;;;;; +10995;MEROITIC HIEROGLYPHIC LETTER SE;Lo;0;R;;;;;N;;;;; +10996;MEROITIC HIEROGLYPHIC LETTER KA;Lo;0;R;;;;;N;;;;; +10997;MEROITIC HIEROGLYPHIC LETTER QA;Lo;0;R;;;;;N;;;;; +10998;MEROITIC HIEROGLYPHIC LETTER TA;Lo;0;R;;;;;N;;;;; +10999;MEROITIC HIEROGLYPHIC LETTER TA-2;Lo;0;R;;;;;N;;;;; +1099A;MEROITIC HIEROGLYPHIC LETTER TE;Lo;0;R;;;;;N;;;;; +1099B;MEROITIC HIEROGLYPHIC LETTER TE-2;Lo;0;R;;;;;N;;;;; +1099C;MEROITIC HIEROGLYPHIC LETTER TO;Lo;0;R;;;;;N;;;;; +1099D;MEROITIC HIEROGLYPHIC LETTER DA;Lo;0;R;;;;;N;;;;; +1099E;MEROITIC HIEROGLYPHIC SYMBOL VIDJ;Lo;0;R;;;;;N;;;;; +1099F;MEROITIC HIEROGLYPHIC SYMBOL VIDJ-2;Lo;0;R;;;;;N;;;;; +109A0;MEROITIC CURSIVE LETTER A;Lo;0;R;;;;;N;;;;; +109A1;MEROITIC CURSIVE LETTER E;Lo;0;R;;;;;N;;;;; +109A2;MEROITIC CURSIVE LETTER I;Lo;0;R;;;;;N;;;;; +109A3;MEROITIC CURSIVE LETTER O;Lo;0;R;;;;;N;;;;; +109A4;MEROITIC CURSIVE LETTER YA;Lo;0;R;;;;;N;;;;; +109A5;MEROITIC CURSIVE LETTER WA;Lo;0;R;;;;;N;;;;; +109A6;MEROITIC CURSIVE LETTER BA;Lo;0;R;;;;;N;;;;; +109A7;MEROITIC CURSIVE LETTER PA;Lo;0;R;;;;;N;;;;; +109A8;MEROITIC CURSIVE LETTER MA;Lo;0;R;;;;;N;;;;; +109A9;MEROITIC CURSIVE LETTER NA;Lo;0;R;;;;;N;;;;; +109AA;MEROITIC CURSIVE LETTER NE;Lo;0;R;;;;;N;;;;; +109AB;MEROITIC CURSIVE LETTER RA;Lo;0;R;;;;;N;;;;; +109AC;MEROITIC CURSIVE LETTER LA;Lo;0;R;;;;;N;;;;; +109AD;MEROITIC CURSIVE LETTER KHA;Lo;0;R;;;;;N;;;;; +109AE;MEROITIC CURSIVE LETTER HHA;Lo;0;R;;;;;N;;;;; +109AF;MEROITIC CURSIVE LETTER SA;Lo;0;R;;;;;N;;;;; +109B0;MEROITIC CURSIVE LETTER ARCHAIC SA;Lo;0;R;;;;;N;;;;; +109B1;MEROITIC CURSIVE LETTER SE;Lo;0;R;;;;;N;;;;; +109B2;MEROITIC CURSIVE LETTER KA;Lo;0;R;;;;;N;;;;; +109B3;MEROITIC CURSIVE LETTER QA;Lo;0;R;;;;;N;;;;; +109B4;MEROITIC CURSIVE LETTER TA;Lo;0;R;;;;;N;;;;; +109B5;MEROITIC CURSIVE LETTER TE;Lo;0;R;;;;;N;;;;; +109B6;MEROITIC CURSIVE LETTER TO;Lo;0;R;;;;;N;;;;; +109B7;MEROITIC CURSIVE LETTER DA;Lo;0;R;;;;;N;;;;; +109BC;MEROITIC CURSIVE FRACTION ELEVEN TWELFTHS;No;0;R;;;;11/12;N;;;;; +109BD;MEROITIC CURSIVE FRACTION ONE HALF;No;0;R;;;;1/2;N;;;;; +109BE;MEROITIC CURSIVE LOGOGRAM RMT;Lo;0;R;;;;;N;;;;; +109BF;MEROITIC CURSIVE LOGOGRAM IMN;Lo;0;R;;;;;N;;;;; +109C0;MEROITIC CURSIVE NUMBER ONE;No;0;R;;;;1;N;;;;; +109C1;MEROITIC CURSIVE NUMBER TWO;No;0;R;;;;2;N;;;;; +109C2;MEROITIC CURSIVE NUMBER THREE;No;0;R;;;;3;N;;;;; +109C3;MEROITIC CURSIVE NUMBER FOUR;No;0;R;;;;4;N;;;;; +109C4;MEROITIC CURSIVE NUMBER FIVE;No;0;R;;;;5;N;;;;; +109C5;MEROITIC CURSIVE NUMBER SIX;No;0;R;;;;6;N;;;;; +109C6;MEROITIC CURSIVE NUMBER SEVEN;No;0;R;;;;7;N;;;;; +109C7;MEROITIC CURSIVE NUMBER EIGHT;No;0;R;;;;8;N;;;;; +109C8;MEROITIC CURSIVE NUMBER NINE;No;0;R;;;;9;N;;;;; +109C9;MEROITIC CURSIVE NUMBER TEN;No;0;R;;;;10;N;;;;; +109CA;MEROITIC CURSIVE NUMBER TWENTY;No;0;R;;;;20;N;;;;; +109CB;MEROITIC CURSIVE NUMBER THIRTY;No;0;R;;;;30;N;;;;; +109CC;MEROITIC CURSIVE NUMBER FORTY;No;0;R;;;;40;N;;;;; +109CD;MEROITIC CURSIVE NUMBER FIFTY;No;0;R;;;;50;N;;;;; +109CE;MEROITIC CURSIVE NUMBER SIXTY;No;0;R;;;;60;N;;;;; +109CF;MEROITIC CURSIVE NUMBER SEVENTY;No;0;R;;;;70;N;;;;; +109D2;MEROITIC CURSIVE NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;; +109D3;MEROITIC CURSIVE NUMBER TWO HUNDRED;No;0;R;;;;200;N;;;;; +109D4;MEROITIC CURSIVE NUMBER THREE HUNDRED;No;0;R;;;;300;N;;;;; +109D5;MEROITIC CURSIVE NUMBER FOUR HUNDRED;No;0;R;;;;400;N;;;;; +109D6;MEROITIC CURSIVE NUMBER FIVE HUNDRED;No;0;R;;;;500;N;;;;; +109D7;MEROITIC CURSIVE NUMBER SIX HUNDRED;No;0;R;;;;600;N;;;;; +109D8;MEROITIC CURSIVE NUMBER SEVEN HUNDRED;No;0;R;;;;700;N;;;;; +109D9;MEROITIC CURSIVE NUMBER EIGHT HUNDRED;No;0;R;;;;800;N;;;;; +109DA;MEROITIC CURSIVE NUMBER NINE HUNDRED;No;0;R;;;;900;N;;;;; +109DB;MEROITIC CURSIVE NUMBER ONE THOUSAND;No;0;R;;;;1000;N;;;;; +109DC;MEROITIC CURSIVE NUMBER TWO THOUSAND;No;0;R;;;;2000;N;;;;; +109DD;MEROITIC CURSIVE NUMBER THREE THOUSAND;No;0;R;;;;3000;N;;;;; +109DE;MEROITIC CURSIVE NUMBER FOUR THOUSAND;No;0;R;;;;4000;N;;;;; +109DF;MEROITIC CURSIVE NUMBER FIVE THOUSAND;No;0;R;;;;5000;N;;;;; +109E0;MEROITIC CURSIVE NUMBER SIX THOUSAND;No;0;R;;;;6000;N;;;;; +109E1;MEROITIC CURSIVE NUMBER SEVEN THOUSAND;No;0;R;;;;7000;N;;;;; +109E2;MEROITIC CURSIVE NUMBER EIGHT THOUSAND;No;0;R;;;;8000;N;;;;; +109E3;MEROITIC CURSIVE NUMBER NINE THOUSAND;No;0;R;;;;9000;N;;;;; +109E4;MEROITIC CURSIVE NUMBER TEN THOUSAND;No;0;R;;;;10000;N;;;;; +109E5;MEROITIC CURSIVE NUMBER TWENTY THOUSAND;No;0;R;;;;20000;N;;;;; +109E6;MEROITIC CURSIVE NUMBER THIRTY THOUSAND;No;0;R;;;;30000;N;;;;; +109E7;MEROITIC CURSIVE NUMBER FORTY THOUSAND;No;0;R;;;;40000;N;;;;; +109E8;MEROITIC CURSIVE NUMBER FIFTY THOUSAND;No;0;R;;;;50000;N;;;;; +109E9;MEROITIC CURSIVE NUMBER SIXTY THOUSAND;No;0;R;;;;60000;N;;;;; +109EA;MEROITIC CURSIVE NUMBER SEVENTY THOUSAND;No;0;R;;;;70000;N;;;;; +109EB;MEROITIC CURSIVE NUMBER EIGHTY THOUSAND;No;0;R;;;;80000;N;;;;; +109EC;MEROITIC CURSIVE NUMBER NINETY THOUSAND;No;0;R;;;;90000;N;;;;; +109ED;MEROITIC CURSIVE NUMBER ONE HUNDRED THOUSAND;No;0;R;;;;100000;N;;;;; +109EE;MEROITIC CURSIVE NUMBER TWO HUNDRED THOUSAND;No;0;R;;;;200000;N;;;;; +109EF;MEROITIC CURSIVE NUMBER THREE HUNDRED THOUSAND;No;0;R;;;;300000;N;;;;; +109F0;MEROITIC CURSIVE NUMBER FOUR HUNDRED THOUSAND;No;0;R;;;;400000;N;;;;; +109F1;MEROITIC CURSIVE NUMBER FIVE HUNDRED THOUSAND;No;0;R;;;;500000;N;;;;; +109F2;MEROITIC CURSIVE NUMBER SIX HUNDRED THOUSAND;No;0;R;;;;600000;N;;;;; +109F3;MEROITIC CURSIVE NUMBER SEVEN HUNDRED THOUSAND;No;0;R;;;;700000;N;;;;; +109F4;MEROITIC CURSIVE NUMBER EIGHT HUNDRED THOUSAND;No;0;R;;;;800000;N;;;;; +109F5;MEROITIC CURSIVE NUMBER NINE HUNDRED THOUSAND;No;0;R;;;;900000;N;;;;; +109F6;MEROITIC CURSIVE FRACTION ONE TWELFTH;No;0;R;;;;1/12;N;;;;; +109F7;MEROITIC CURSIVE FRACTION TWO TWELFTHS;No;0;R;;;;2/12;N;;;;; +109F8;MEROITIC CURSIVE FRACTION THREE TWELFTHS;No;0;R;;;;3/12;N;;;;; +109F9;MEROITIC CURSIVE FRACTION FOUR TWELFTHS;No;0;R;;;;4/12;N;;;;; +109FA;MEROITIC CURSIVE FRACTION FIVE TWELFTHS;No;0;R;;;;5/12;N;;;;; +109FB;MEROITIC CURSIVE FRACTION SIX TWELFTHS;No;0;R;;;;6/12;N;;;;; +109FC;MEROITIC CURSIVE FRACTION SEVEN TWELFTHS;No;0;R;;;;7/12;N;;;;; +109FD;MEROITIC CURSIVE FRACTION EIGHT TWELFTHS;No;0;R;;;;8/12;N;;;;; +109FE;MEROITIC CURSIVE FRACTION NINE TWELFTHS;No;0;R;;;;9/12;N;;;;; +109FF;MEROITIC CURSIVE FRACTION TEN TWELFTHS;No;0;R;;;;10/12;N;;;;; +10A00;KHAROSHTHI LETTER A;Lo;0;R;;;;;N;;;;; +10A01;KHAROSHTHI VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;; +10A02;KHAROSHTHI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;; +10A03;KHAROSHTHI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;; +10A05;KHAROSHTHI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;; +10A06;KHAROSHTHI VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;; +10A0C;KHAROSHTHI VOWEL LENGTH MARK;Mn;0;NSM;;;;;N;;;;; +10A0D;KHAROSHTHI SIGN DOUBLE RING BELOW;Mn;220;NSM;;;;;N;;;;; +10A0E;KHAROSHTHI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;; +10A0F;KHAROSHTHI SIGN VISARGA;Mn;230;NSM;;;;;N;;;;; +10A10;KHAROSHTHI LETTER KA;Lo;0;R;;;;;N;;;;; +10A11;KHAROSHTHI LETTER KHA;Lo;0;R;;;;;N;;;;; +10A12;KHAROSHTHI LETTER GA;Lo;0;R;;;;;N;;;;; +10A13;KHAROSHTHI LETTER GHA;Lo;0;R;;;;;N;;;;; +10A15;KHAROSHTHI LETTER CA;Lo;0;R;;;;;N;;;;; +10A16;KHAROSHTHI LETTER CHA;Lo;0;R;;;;;N;;;;; +10A17;KHAROSHTHI LETTER JA;Lo;0;R;;;;;N;;;;; +10A19;KHAROSHTHI LETTER NYA;Lo;0;R;;;;;N;;;;; +10A1A;KHAROSHTHI LETTER TTA;Lo;0;R;;;;;N;;;;; +10A1B;KHAROSHTHI LETTER TTHA;Lo;0;R;;;;;N;;;;; +10A1C;KHAROSHTHI LETTER DDA;Lo;0;R;;;;;N;;;;; +10A1D;KHAROSHTHI LETTER DDHA;Lo;0;R;;;;;N;;;;; +10A1E;KHAROSHTHI LETTER NNA;Lo;0;R;;;;;N;;;;; +10A1F;KHAROSHTHI LETTER TA;Lo;0;R;;;;;N;;;;; +10A20;KHAROSHTHI LETTER THA;Lo;0;R;;;;;N;;;;; +10A21;KHAROSHTHI LETTER DA;Lo;0;R;;;;;N;;;;; +10A22;KHAROSHTHI LETTER DHA;Lo;0;R;;;;;N;;;;; +10A23;KHAROSHTHI LETTER NA;Lo;0;R;;;;;N;;;;; +10A24;KHAROSHTHI LETTER PA;Lo;0;R;;;;;N;;;;; +10A25;KHAROSHTHI LETTER PHA;Lo;0;R;;;;;N;;;;; +10A26;KHAROSHTHI LETTER BA;Lo;0;R;;;;;N;;;;; +10A27;KHAROSHTHI LETTER BHA;Lo;0;R;;;;;N;;;;; +10A28;KHAROSHTHI LETTER MA;Lo;0;R;;;;;N;;;;; +10A29;KHAROSHTHI LETTER YA;Lo;0;R;;;;;N;;;;; +10A2A;KHAROSHTHI LETTER RA;Lo;0;R;;;;;N;;;;; +10A2B;KHAROSHTHI LETTER LA;Lo;0;R;;;;;N;;;;; +10A2C;KHAROSHTHI LETTER VA;Lo;0;R;;;;;N;;;;; +10A2D;KHAROSHTHI LETTER SHA;Lo;0;R;;;;;N;;;;; +10A2E;KHAROSHTHI LETTER SSA;Lo;0;R;;;;;N;;;;; +10A2F;KHAROSHTHI LETTER SA;Lo;0;R;;;;;N;;;;; +10A30;KHAROSHTHI LETTER ZA;Lo;0;R;;;;;N;;;;; +10A31;KHAROSHTHI LETTER HA;Lo;0;R;;;;;N;;;;; +10A32;KHAROSHTHI LETTER KKA;Lo;0;R;;;;;N;;;;; +10A33;KHAROSHTHI LETTER TTTHA;Lo;0;R;;;;;N;;;;; +10A34;KHAROSHTHI LETTER TTTA;Lo;0;R;;;;;N;;;;; +10A35;KHAROSHTHI LETTER VHA;Lo;0;R;;;;;N;;;;; +10A38;KHAROSHTHI SIGN BAR ABOVE;Mn;230;NSM;;;;;N;;;;; +10A39;KHAROSHTHI SIGN CAUDA;Mn;1;NSM;;;;;N;;;;; +10A3A;KHAROSHTHI SIGN DOT BELOW;Mn;220;NSM;;;;;N;;;;; +10A3F;KHAROSHTHI VIRAMA;Mn;9;NSM;;;;;N;;;;; +10A40;KHAROSHTHI DIGIT ONE;No;0;R;;;1;1;N;;;;; +10A41;KHAROSHTHI DIGIT TWO;No;0;R;;;2;2;N;;;;; +10A42;KHAROSHTHI DIGIT THREE;No;0;R;;;3;3;N;;;;; +10A43;KHAROSHTHI DIGIT FOUR;No;0;R;;;4;4;N;;;;; +10A44;KHAROSHTHI NUMBER TEN;No;0;R;;;;10;N;;;;; +10A45;KHAROSHTHI NUMBER TWENTY;No;0;R;;;;20;N;;;;; +10A46;KHAROSHTHI NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;; +10A47;KHAROSHTHI NUMBER ONE THOUSAND;No;0;R;;;;1000;N;;;;; +10A48;KHAROSHTHI FRACTION ONE HALF;No;0;R;;;;1/2;N;;;;; +10A50;KHAROSHTHI PUNCTUATION DOT;Po;0;R;;;;;N;;;;; +10A51;KHAROSHTHI PUNCTUATION SMALL CIRCLE;Po;0;R;;;;;N;;;;; +10A52;KHAROSHTHI PUNCTUATION CIRCLE;Po;0;R;;;;;N;;;;; +10A53;KHAROSHTHI PUNCTUATION CRESCENT BAR;Po;0;R;;;;;N;;;;; +10A54;KHAROSHTHI PUNCTUATION MANGALAM;Po;0;R;;;;;N;;;;; +10A55;KHAROSHTHI PUNCTUATION LOTUS;Po;0;R;;;;;N;;;;; +10A56;KHAROSHTHI PUNCTUATION DANDA;Po;0;R;;;;;N;;;;; +10A57;KHAROSHTHI PUNCTUATION DOUBLE DANDA;Po;0;R;;;;;N;;;;; +10A58;KHAROSHTHI PUNCTUATION LINES;Po;0;R;;;;;N;;;;; +10A60;OLD SOUTH ARABIAN LETTER HE;Lo;0;R;;;;;N;;;;; +10A61;OLD SOUTH ARABIAN LETTER LAMEDH;Lo;0;R;;;;;N;;;;; +10A62;OLD SOUTH ARABIAN LETTER HETH;Lo;0;R;;;;;N;;;;; +10A63;OLD SOUTH ARABIAN LETTER MEM;Lo;0;R;;;;;N;;;;; +10A64;OLD SOUTH ARABIAN LETTER QOPH;Lo;0;R;;;;;N;;;;; +10A65;OLD SOUTH ARABIAN LETTER WAW;Lo;0;R;;;;;N;;;;; +10A66;OLD SOUTH ARABIAN LETTER SHIN;Lo;0;R;;;;;N;;;;; +10A67;OLD SOUTH ARABIAN LETTER RESH;Lo;0;R;;;;;N;;;;; +10A68;OLD SOUTH ARABIAN LETTER BETH;Lo;0;R;;;;;N;;;;; +10A69;OLD SOUTH ARABIAN LETTER TAW;Lo;0;R;;;;;N;;;;; +10A6A;OLD SOUTH ARABIAN LETTER SAT;Lo;0;R;;;;;N;;;;; +10A6B;OLD SOUTH ARABIAN LETTER KAPH;Lo;0;R;;;;;N;;;;; +10A6C;OLD SOUTH ARABIAN LETTER NUN;Lo;0;R;;;;;N;;;;; +10A6D;OLD SOUTH ARABIAN LETTER KHETH;Lo;0;R;;;;;N;;;;; +10A6E;OLD SOUTH ARABIAN LETTER SADHE;Lo;0;R;;;;;N;;;;; +10A6F;OLD SOUTH ARABIAN LETTER SAMEKH;Lo;0;R;;;;;N;;;;; +10A70;OLD SOUTH ARABIAN LETTER FE;Lo;0;R;;;;;N;;;;; +10A71;OLD SOUTH ARABIAN LETTER ALEF;Lo;0;R;;;;;N;;;;; +10A72;OLD SOUTH ARABIAN LETTER AYN;Lo;0;R;;;;;N;;;;; +10A73;OLD SOUTH ARABIAN LETTER DHADHE;Lo;0;R;;;;;N;;;;; +10A74;OLD SOUTH ARABIAN LETTER GIMEL;Lo;0;R;;;;;N;;;;; +10A75;OLD SOUTH ARABIAN LETTER DALETH;Lo;0;R;;;;;N;;;;; +10A76;OLD SOUTH ARABIAN LETTER GHAYN;Lo;0;R;;;;;N;;;;; +10A77;OLD SOUTH ARABIAN LETTER TETH;Lo;0;R;;;;;N;;;;; +10A78;OLD SOUTH ARABIAN LETTER ZAYN;Lo;0;R;;;;;N;;;;; +10A79;OLD SOUTH ARABIAN LETTER DHALETH;Lo;0;R;;;;;N;;;;; +10A7A;OLD SOUTH ARABIAN LETTER YODH;Lo;0;R;;;;;N;;;;; +10A7B;OLD SOUTH ARABIAN LETTER THAW;Lo;0;R;;;;;N;;;;; +10A7C;OLD SOUTH ARABIAN LETTER THETH;Lo;0;R;;;;;N;;;;; +10A7D;OLD SOUTH ARABIAN NUMBER ONE;No;0;R;;;;1;N;;;;; +10A7E;OLD SOUTH ARABIAN NUMBER FIFTY;No;0;R;;;;50;N;;;;; +10A7F;OLD SOUTH ARABIAN NUMERIC INDICATOR;Po;0;R;;;;;N;;;;; +10A80;OLD NORTH ARABIAN LETTER HEH;Lo;0;R;;;;;N;;;;; +10A81;OLD NORTH ARABIAN LETTER LAM;Lo;0;R;;;;;N;;;;; +10A82;OLD NORTH ARABIAN LETTER HAH;Lo;0;R;;;;;N;;;;; +10A83;OLD NORTH ARABIAN LETTER MEEM;Lo;0;R;;;;;N;;;;; +10A84;OLD NORTH ARABIAN LETTER QAF;Lo;0;R;;;;;N;;;;; +10A85;OLD NORTH ARABIAN LETTER WAW;Lo;0;R;;;;;N;;;;; +10A86;OLD NORTH ARABIAN LETTER ES-2;Lo;0;R;;;;;N;;;;; +10A87;OLD NORTH ARABIAN LETTER REH;Lo;0;R;;;;;N;;;;; +10A88;OLD NORTH ARABIAN LETTER BEH;Lo;0;R;;;;;N;;;;; +10A89;OLD NORTH ARABIAN LETTER TEH;Lo;0;R;;;;;N;;;;; +10A8A;OLD NORTH ARABIAN LETTER ES-1;Lo;0;R;;;;;N;;;;; +10A8B;OLD NORTH ARABIAN LETTER KAF;Lo;0;R;;;;;N;;;;; +10A8C;OLD NORTH ARABIAN LETTER NOON;Lo;0;R;;;;;N;;;;; +10A8D;OLD NORTH ARABIAN LETTER KHAH;Lo;0;R;;;;;N;;;;; +10A8E;OLD NORTH ARABIAN LETTER SAD;Lo;0;R;;;;;N;;;;; +10A8F;OLD NORTH ARABIAN LETTER ES-3;Lo;0;R;;;;;N;;;;; +10A90;OLD NORTH ARABIAN LETTER FEH;Lo;0;R;;;;;N;;;;; +10A91;OLD NORTH ARABIAN LETTER ALEF;Lo;0;R;;;;;N;;;;; +10A92;OLD NORTH ARABIAN LETTER AIN;Lo;0;R;;;;;N;;;;; +10A93;OLD NORTH ARABIAN LETTER DAD;Lo;0;R;;;;;N;;;;; +10A94;OLD NORTH ARABIAN LETTER GEEM;Lo;0;R;;;;;N;;;;; +10A95;OLD NORTH ARABIAN LETTER DAL;Lo;0;R;;;;;N;;;;; +10A96;OLD NORTH ARABIAN LETTER GHAIN;Lo;0;R;;;;;N;;;;; +10A97;OLD NORTH ARABIAN LETTER TAH;Lo;0;R;;;;;N;;;;; +10A98;OLD NORTH ARABIAN LETTER ZAIN;Lo;0;R;;;;;N;;;;; +10A99;OLD NORTH ARABIAN LETTER THAL;Lo;0;R;;;;;N;;;;; +10A9A;OLD NORTH ARABIAN LETTER YEH;Lo;0;R;;;;;N;;;;; +10A9B;OLD NORTH ARABIAN LETTER THEH;Lo;0;R;;;;;N;;;;; +10A9C;OLD NORTH ARABIAN LETTER ZAH;Lo;0;R;;;;;N;;;;; +10A9D;OLD NORTH ARABIAN NUMBER ONE;No;0;R;;;;1;N;;;;; +10A9E;OLD NORTH ARABIAN NUMBER TEN;No;0;R;;;;10;N;;;;; +10A9F;OLD NORTH ARABIAN NUMBER TWENTY;No;0;R;;;;20;N;;;;; +10AC0;MANICHAEAN LETTER ALEPH;Lo;0;R;;;;;N;;;;; +10AC1;MANICHAEAN LETTER BETH;Lo;0;R;;;;;N;;;;; +10AC2;MANICHAEAN LETTER BHETH;Lo;0;R;;;;;N;;;;; +10AC3;MANICHAEAN LETTER GIMEL;Lo;0;R;;;;;N;;;;; +10AC4;MANICHAEAN LETTER GHIMEL;Lo;0;R;;;;;N;;;;; +10AC5;MANICHAEAN LETTER DALETH;Lo;0;R;;;;;N;;;;; +10AC6;MANICHAEAN LETTER HE;Lo;0;R;;;;;N;;;;; +10AC7;MANICHAEAN LETTER WAW;Lo;0;R;;;;;N;;;;; +10AC8;MANICHAEAN SIGN UD;So;0;R;;;;;N;;;;; +10AC9;MANICHAEAN LETTER ZAYIN;Lo;0;R;;;;;N;;;;; +10ACA;MANICHAEAN LETTER ZHAYIN;Lo;0;R;;;;;N;;;;; +10ACB;MANICHAEAN LETTER JAYIN;Lo;0;R;;;;;N;;;;; +10ACC;MANICHAEAN LETTER JHAYIN;Lo;0;R;;;;;N;;;;; +10ACD;MANICHAEAN LETTER HETH;Lo;0;R;;;;;N;;;;; +10ACE;MANICHAEAN LETTER TETH;Lo;0;R;;;;;N;;;;; +10ACF;MANICHAEAN LETTER YODH;Lo;0;R;;;;;N;;;;; +10AD0;MANICHAEAN LETTER KAPH;Lo;0;R;;;;;N;;;;; +10AD1;MANICHAEAN LETTER XAPH;Lo;0;R;;;;;N;;;;; +10AD2;MANICHAEAN LETTER KHAPH;Lo;0;R;;;;;N;;;;; +10AD3;MANICHAEAN LETTER LAMEDH;Lo;0;R;;;;;N;;;;; +10AD4;MANICHAEAN LETTER DHAMEDH;Lo;0;R;;;;;N;;;;; +10AD5;MANICHAEAN LETTER THAMEDH;Lo;0;R;;;;;N;;;;; +10AD6;MANICHAEAN LETTER MEM;Lo;0;R;;;;;N;;;;; +10AD7;MANICHAEAN LETTER NUN;Lo;0;R;;;;;N;;;;; +10AD8;MANICHAEAN LETTER SAMEKH;Lo;0;R;;;;;N;;;;; +10AD9;MANICHAEAN LETTER AYIN;Lo;0;R;;;;;N;;;;; +10ADA;MANICHAEAN LETTER AAYIN;Lo;0;R;;;;;N;;;;; +10ADB;MANICHAEAN LETTER PE;Lo;0;R;;;;;N;;;;; +10ADC;MANICHAEAN LETTER FE;Lo;0;R;;;;;N;;;;; +10ADD;MANICHAEAN LETTER SADHE;Lo;0;R;;;;;N;;;;; +10ADE;MANICHAEAN LETTER QOPH;Lo;0;R;;;;;N;;;;; +10ADF;MANICHAEAN LETTER XOPH;Lo;0;R;;;;;N;;;;; +10AE0;MANICHAEAN LETTER QHOPH;Lo;0;R;;;;;N;;;;; +10AE1;MANICHAEAN LETTER RESH;Lo;0;R;;;;;N;;;;; +10AE2;MANICHAEAN LETTER SHIN;Lo;0;R;;;;;N;;;;; +10AE3;MANICHAEAN LETTER SSHIN;Lo;0;R;;;;;N;;;;; +10AE4;MANICHAEAN LETTER TAW;Lo;0;R;;;;;N;;;;; +10AE5;MANICHAEAN ABBREVIATION MARK ABOVE;Mn;230;NSM;;;;;N;;;;; +10AE6;MANICHAEAN ABBREVIATION MARK BELOW;Mn;220;NSM;;;;;N;;;;; +10AEB;MANICHAEAN NUMBER ONE;No;0;R;;;;1;N;;;;; +10AEC;MANICHAEAN NUMBER FIVE;No;0;R;;;;5;N;;;;; +10AED;MANICHAEAN NUMBER TEN;No;0;R;;;;10;N;;;;; +10AEE;MANICHAEAN NUMBER TWENTY;No;0;R;;;;20;N;;;;; +10AEF;MANICHAEAN NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;; +10AF0;MANICHAEAN PUNCTUATION STAR;Po;0;R;;;;;N;;;;; +10AF1;MANICHAEAN PUNCTUATION FLEURON;Po;0;R;;;;;N;;;;; +10AF2;MANICHAEAN PUNCTUATION DOUBLE DOT WITHIN DOT;Po;0;R;;;;;N;;;;; +10AF3;MANICHAEAN PUNCTUATION DOT WITHIN DOT;Po;0;R;;;;;N;;;;; +10AF4;MANICHAEAN PUNCTUATION DOT;Po;0;R;;;;;N;;;;; +10AF5;MANICHAEAN PUNCTUATION TWO DOTS;Po;0;R;;;;;N;;;;; +10AF6;MANICHAEAN PUNCTUATION LINE FILLER;Po;0;R;;;;;N;;;;; +10B00;AVESTAN LETTER A;Lo;0;R;;;;;N;;;;; +10B01;AVESTAN LETTER AA;Lo;0;R;;;;;N;;;;; +10B02;AVESTAN LETTER AO;Lo;0;R;;;;;N;;;;; +10B03;AVESTAN LETTER AAO;Lo;0;R;;;;;N;;;;; +10B04;AVESTAN LETTER AN;Lo;0;R;;;;;N;;;;; +10B05;AVESTAN LETTER AAN;Lo;0;R;;;;;N;;;;; +10B06;AVESTAN LETTER AE;Lo;0;R;;;;;N;;;;; +10B07;AVESTAN LETTER AEE;Lo;0;R;;;;;N;;;;; +10B08;AVESTAN LETTER E;Lo;0;R;;;;;N;;;;; +10B09;AVESTAN LETTER EE;Lo;0;R;;;;;N;;;;; +10B0A;AVESTAN LETTER O;Lo;0;R;;;;;N;;;;; +10B0B;AVESTAN LETTER OO;Lo;0;R;;;;;N;;;;; +10B0C;AVESTAN LETTER I;Lo;0;R;;;;;N;;;;; +10B0D;AVESTAN LETTER II;Lo;0;R;;;;;N;;;;; +10B0E;AVESTAN LETTER U;Lo;0;R;;;;;N;;;;; +10B0F;AVESTAN LETTER UU;Lo;0;R;;;;;N;;;;; +10B10;AVESTAN LETTER KE;Lo;0;R;;;;;N;;;;; +10B11;AVESTAN LETTER XE;Lo;0;R;;;;;N;;;;; +10B12;AVESTAN LETTER XYE;Lo;0;R;;;;;N;;;;; +10B13;AVESTAN LETTER XVE;Lo;0;R;;;;;N;;;;; +10B14;AVESTAN LETTER GE;Lo;0;R;;;;;N;;;;; +10B15;AVESTAN LETTER GGE;Lo;0;R;;;;;N;;;;; +10B16;AVESTAN LETTER GHE;Lo;0;R;;;;;N;;;;; +10B17;AVESTAN LETTER CE;Lo;0;R;;;;;N;;;;; +10B18;AVESTAN LETTER JE;Lo;0;R;;;;;N;;;;; +10B19;AVESTAN LETTER TE;Lo;0;R;;;;;N;;;;; +10B1A;AVESTAN LETTER THE;Lo;0;R;;;;;N;;;;; +10B1B;AVESTAN LETTER DE;Lo;0;R;;;;;N;;;;; +10B1C;AVESTAN LETTER DHE;Lo;0;R;;;;;N;;;;; +10B1D;AVESTAN LETTER TTE;Lo;0;R;;;;;N;;;;; +10B1E;AVESTAN LETTER PE;Lo;0;R;;;;;N;;;;; +10B1F;AVESTAN LETTER FE;Lo;0;R;;;;;N;;;;; +10B20;AVESTAN LETTER BE;Lo;0;R;;;;;N;;;;; +10B21;AVESTAN LETTER BHE;Lo;0;R;;;;;N;;;;; +10B22;AVESTAN LETTER NGE;Lo;0;R;;;;;N;;;;; +10B23;AVESTAN LETTER NGYE;Lo;0;R;;;;;N;;;;; +10B24;AVESTAN LETTER NGVE;Lo;0;R;;;;;N;;;;; +10B25;AVESTAN LETTER NE;Lo;0;R;;;;;N;;;;; +10B26;AVESTAN LETTER NYE;Lo;0;R;;;;;N;;;;; +10B27;AVESTAN LETTER NNE;Lo;0;R;;;;;N;;;;; +10B28;AVESTAN LETTER ME;Lo;0;R;;;;;N;;;;; +10B29;AVESTAN LETTER HME;Lo;0;R;;;;;N;;;;; +10B2A;AVESTAN LETTER YYE;Lo;0;R;;;;;N;;;;; +10B2B;AVESTAN LETTER YE;Lo;0;R;;;;;N;;;;; +10B2C;AVESTAN LETTER VE;Lo;0;R;;;;;N;;;;; +10B2D;AVESTAN LETTER RE;Lo;0;R;;;;;N;;;;; +10B2E;AVESTAN LETTER LE;Lo;0;R;;;;;N;;;;; +10B2F;AVESTAN LETTER SE;Lo;0;R;;;;;N;;;;; +10B30;AVESTAN LETTER ZE;Lo;0;R;;;;;N;;;;; +10B31;AVESTAN LETTER SHE;Lo;0;R;;;;;N;;;;; +10B32;AVESTAN LETTER ZHE;Lo;0;R;;;;;N;;;;; +10B33;AVESTAN LETTER SHYE;Lo;0;R;;;;;N;;;;; +10B34;AVESTAN LETTER SSHE;Lo;0;R;;;;;N;;;;; +10B35;AVESTAN LETTER HE;Lo;0;R;;;;;N;;;;; +10B39;AVESTAN ABBREVIATION MARK;Po;0;ON;;;;;N;;;;; +10B3A;TINY TWO DOTS OVER ONE DOT PUNCTUATION;Po;0;ON;;;;;N;;;;; +10B3B;SMALL TWO DOTS OVER ONE DOT PUNCTUATION;Po;0;ON;;;;;N;;;;; +10B3C;LARGE TWO DOTS OVER ONE DOT PUNCTUATION;Po;0;ON;;;;;N;;;;; +10B3D;LARGE ONE DOT OVER TWO DOTS PUNCTUATION;Po;0;ON;;;;;N;;;;; +10B3E;LARGE TWO RINGS OVER ONE RING PUNCTUATION;Po;0;ON;;;;;N;;;;; +10B3F;LARGE ONE RING OVER TWO RINGS PUNCTUATION;Po;0;ON;;;;;N;;;;; +10B40;INSCRIPTIONAL PARTHIAN LETTER ALEPH;Lo;0;R;;;;;N;;;;; +10B41;INSCRIPTIONAL PARTHIAN LETTER BETH;Lo;0;R;;;;;N;;;;; +10B42;INSCRIPTIONAL PARTHIAN LETTER GIMEL;Lo;0;R;;;;;N;;;;; +10B43;INSCRIPTIONAL PARTHIAN LETTER DALETH;Lo;0;R;;;;;N;;;;; +10B44;INSCRIPTIONAL PARTHIAN LETTER HE;Lo;0;R;;;;;N;;;;; +10B45;INSCRIPTIONAL PARTHIAN LETTER WAW;Lo;0;R;;;;;N;;;;; +10B46;INSCRIPTIONAL PARTHIAN LETTER ZAYIN;Lo;0;R;;;;;N;;;;; +10B47;INSCRIPTIONAL PARTHIAN LETTER HETH;Lo;0;R;;;;;N;;;;; +10B48;INSCRIPTIONAL PARTHIAN LETTER TETH;Lo;0;R;;;;;N;;;;; +10B49;INSCRIPTIONAL PARTHIAN LETTER YODH;Lo;0;R;;;;;N;;;;; +10B4A;INSCRIPTIONAL PARTHIAN LETTER KAPH;Lo;0;R;;;;;N;;;;; +10B4B;INSCRIPTIONAL PARTHIAN LETTER LAMEDH;Lo;0;R;;;;;N;;;;; +10B4C;INSCRIPTIONAL PARTHIAN LETTER MEM;Lo;0;R;;;;;N;;;;; +10B4D;INSCRIPTIONAL PARTHIAN LETTER NUN;Lo;0;R;;;;;N;;;;; +10B4E;INSCRIPTIONAL PARTHIAN LETTER SAMEKH;Lo;0;R;;;;;N;;;;; +10B4F;INSCRIPTIONAL PARTHIAN LETTER AYIN;Lo;0;R;;;;;N;;;;; +10B50;INSCRIPTIONAL PARTHIAN LETTER PE;Lo;0;R;;;;;N;;;;; +10B51;INSCRIPTIONAL PARTHIAN LETTER SADHE;Lo;0;R;;;;;N;;;;; +10B52;INSCRIPTIONAL PARTHIAN LETTER QOPH;Lo;0;R;;;;;N;;;;; +10B53;INSCRIPTIONAL PARTHIAN LETTER RESH;Lo;0;R;;;;;N;;;;; +10B54;INSCRIPTIONAL PARTHIAN LETTER SHIN;Lo;0;R;;;;;N;;;;; +10B55;INSCRIPTIONAL PARTHIAN LETTER TAW;Lo;0;R;;;;;N;;;;; +10B58;INSCRIPTIONAL PARTHIAN NUMBER ONE;No;0;R;;;;1;N;;;;; +10B59;INSCRIPTIONAL PARTHIAN NUMBER TWO;No;0;R;;;;2;N;;;;; +10B5A;INSCRIPTIONAL PARTHIAN NUMBER THREE;No;0;R;;;;3;N;;;;; +10B5B;INSCRIPTIONAL PARTHIAN NUMBER FOUR;No;0;R;;;;4;N;;;;; +10B5C;INSCRIPTIONAL PARTHIAN NUMBER TEN;No;0;R;;;;10;N;;;;; +10B5D;INSCRIPTIONAL PARTHIAN NUMBER TWENTY;No;0;R;;;;20;N;;;;; +10B5E;INSCRIPTIONAL PARTHIAN NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;; +10B5F;INSCRIPTIONAL PARTHIAN NUMBER ONE THOUSAND;No;0;R;;;;1000;N;;;;; +10B60;INSCRIPTIONAL PAHLAVI LETTER ALEPH;Lo;0;R;;;;;N;;;;; +10B61;INSCRIPTIONAL PAHLAVI LETTER BETH;Lo;0;R;;;;;N;;;;; +10B62;INSCRIPTIONAL PAHLAVI LETTER GIMEL;Lo;0;R;;;;;N;;;;; +10B63;INSCRIPTIONAL PAHLAVI LETTER DALETH;Lo;0;R;;;;;N;;;;; +10B64;INSCRIPTIONAL PAHLAVI LETTER HE;Lo;0;R;;;;;N;;;;; +10B65;INSCRIPTIONAL PAHLAVI LETTER WAW-AYIN-RESH;Lo;0;R;;;;;N;;;;; +10B66;INSCRIPTIONAL PAHLAVI LETTER ZAYIN;Lo;0;R;;;;;N;;;;; +10B67;INSCRIPTIONAL PAHLAVI LETTER HETH;Lo;0;R;;;;;N;;;;; +10B68;INSCRIPTIONAL PAHLAVI LETTER TETH;Lo;0;R;;;;;N;;;;; +10B69;INSCRIPTIONAL PAHLAVI LETTER YODH;Lo;0;R;;;;;N;;;;; +10B6A;INSCRIPTIONAL PAHLAVI LETTER KAPH;Lo;0;R;;;;;N;;;;; +10B6B;INSCRIPTIONAL PAHLAVI LETTER LAMEDH;Lo;0;R;;;;;N;;;;; +10B6C;INSCRIPTIONAL PAHLAVI LETTER MEM-QOPH;Lo;0;R;;;;;N;;;;; +10B6D;INSCRIPTIONAL PAHLAVI LETTER NUN;Lo;0;R;;;;;N;;;;; +10B6E;INSCRIPTIONAL PAHLAVI LETTER SAMEKH;Lo;0;R;;;;;N;;;;; +10B6F;INSCRIPTIONAL PAHLAVI LETTER PE;Lo;0;R;;;;;N;;;;; +10B70;INSCRIPTIONAL PAHLAVI LETTER SADHE;Lo;0;R;;;;;N;;;;; +10B71;INSCRIPTIONAL PAHLAVI LETTER SHIN;Lo;0;R;;;;;N;;;;; +10B72;INSCRIPTIONAL PAHLAVI LETTER TAW;Lo;0;R;;;;;N;;;;; +10B78;INSCRIPTIONAL PAHLAVI NUMBER ONE;No;0;R;;;;1;N;;;;; +10B79;INSCRIPTIONAL PAHLAVI NUMBER TWO;No;0;R;;;;2;N;;;;; +10B7A;INSCRIPTIONAL PAHLAVI NUMBER THREE;No;0;R;;;;3;N;;;;; +10B7B;INSCRIPTIONAL PAHLAVI NUMBER FOUR;No;0;R;;;;4;N;;;;; +10B7C;INSCRIPTIONAL PAHLAVI NUMBER TEN;No;0;R;;;;10;N;;;;; +10B7D;INSCRIPTIONAL PAHLAVI NUMBER TWENTY;No;0;R;;;;20;N;;;;; +10B7E;INSCRIPTIONAL PAHLAVI NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;; +10B7F;INSCRIPTIONAL PAHLAVI NUMBER ONE THOUSAND;No;0;R;;;;1000;N;;;;; +10B80;PSALTER PAHLAVI LETTER ALEPH;Lo;0;R;;;;;N;;;;; +10B81;PSALTER PAHLAVI LETTER BETH;Lo;0;R;;;;;N;;;;; +10B82;PSALTER PAHLAVI LETTER GIMEL;Lo;0;R;;;;;N;;;;; +10B83;PSALTER PAHLAVI LETTER DALETH;Lo;0;R;;;;;N;;;;; +10B84;PSALTER PAHLAVI LETTER HE;Lo;0;R;;;;;N;;;;; +10B85;PSALTER PAHLAVI LETTER WAW-AYIN-RESH;Lo;0;R;;;;;N;;;;; +10B86;PSALTER PAHLAVI LETTER ZAYIN;Lo;0;R;;;;;N;;;;; +10B87;PSALTER PAHLAVI LETTER HETH;Lo;0;R;;;;;N;;;;; +10B88;PSALTER PAHLAVI LETTER YODH;Lo;0;R;;;;;N;;;;; +10B89;PSALTER PAHLAVI LETTER KAPH;Lo;0;R;;;;;N;;;;; +10B8A;PSALTER PAHLAVI LETTER LAMEDH;Lo;0;R;;;;;N;;;;; +10B8B;PSALTER PAHLAVI LETTER MEM-QOPH;Lo;0;R;;;;;N;;;;; +10B8C;PSALTER PAHLAVI LETTER NUN;Lo;0;R;;;;;N;;;;; +10B8D;PSALTER PAHLAVI LETTER SAMEKH;Lo;0;R;;;;;N;;;;; +10B8E;PSALTER PAHLAVI LETTER PE;Lo;0;R;;;;;N;;;;; +10B8F;PSALTER PAHLAVI LETTER SADHE;Lo;0;R;;;;;N;;;;; +10B90;PSALTER PAHLAVI LETTER SHIN;Lo;0;R;;;;;N;;;;; +10B91;PSALTER PAHLAVI LETTER TAW;Lo;0;R;;;;;N;;;;; +10B99;PSALTER PAHLAVI SECTION MARK;Po;0;R;;;;;N;;;;; +10B9A;PSALTER PAHLAVI TURNED SECTION MARK;Po;0;R;;;;;N;;;;; +10B9B;PSALTER PAHLAVI FOUR DOTS WITH CROSS;Po;0;R;;;;;N;;;;; +10B9C;PSALTER PAHLAVI FOUR DOTS WITH DOT;Po;0;R;;;;;N;;;;; +10BA9;PSALTER PAHLAVI NUMBER ONE;No;0;R;;;;1;N;;;;; +10BAA;PSALTER PAHLAVI NUMBER TWO;No;0;R;;;;2;N;;;;; +10BAB;PSALTER PAHLAVI NUMBER THREE;No;0;R;;;;3;N;;;;; +10BAC;PSALTER PAHLAVI NUMBER FOUR;No;0;R;;;;4;N;;;;; +10BAD;PSALTER PAHLAVI NUMBER TEN;No;0;R;;;;10;N;;;;; +10BAE;PSALTER PAHLAVI NUMBER TWENTY;No;0;R;;;;20;N;;;;; +10BAF;PSALTER PAHLAVI NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;; +10C00;OLD TURKIC LETTER ORKHON A;Lo;0;R;;;;;N;;;;; +10C01;OLD TURKIC LETTER YENISEI A;Lo;0;R;;;;;N;;;;; +10C02;OLD TURKIC LETTER YENISEI AE;Lo;0;R;;;;;N;;;;; +10C03;OLD TURKIC LETTER ORKHON I;Lo;0;R;;;;;N;;;;; +10C04;OLD TURKIC LETTER YENISEI I;Lo;0;R;;;;;N;;;;; +10C05;OLD TURKIC LETTER YENISEI E;Lo;0;R;;;;;N;;;;; +10C06;OLD TURKIC LETTER ORKHON O;Lo;0;R;;;;;N;;;;; +10C07;OLD TURKIC LETTER ORKHON OE;Lo;0;R;;;;;N;;;;; +10C08;OLD TURKIC LETTER YENISEI OE;Lo;0;R;;;;;N;;;;; +10C09;OLD TURKIC LETTER ORKHON AB;Lo;0;R;;;;;N;;;;; +10C0A;OLD TURKIC LETTER YENISEI AB;Lo;0;R;;;;;N;;;;; +10C0B;OLD TURKIC LETTER ORKHON AEB;Lo;0;R;;;;;N;;;;; +10C0C;OLD TURKIC LETTER YENISEI AEB;Lo;0;R;;;;;N;;;;; +10C0D;OLD TURKIC LETTER ORKHON AG;Lo;0;R;;;;;N;;;;; +10C0E;OLD TURKIC LETTER YENISEI AG;Lo;0;R;;;;;N;;;;; +10C0F;OLD TURKIC LETTER ORKHON AEG;Lo;0;R;;;;;N;;;;; +10C10;OLD TURKIC LETTER YENISEI AEG;Lo;0;R;;;;;N;;;;; +10C11;OLD TURKIC LETTER ORKHON AD;Lo;0;R;;;;;N;;;;; +10C12;OLD TURKIC LETTER YENISEI AD;Lo;0;R;;;;;N;;;;; +10C13;OLD TURKIC LETTER ORKHON AED;Lo;0;R;;;;;N;;;;; +10C14;OLD TURKIC LETTER ORKHON EZ;Lo;0;R;;;;;N;;;;; +10C15;OLD TURKIC LETTER YENISEI EZ;Lo;0;R;;;;;N;;;;; +10C16;OLD TURKIC LETTER ORKHON AY;Lo;0;R;;;;;N;;;;; +10C17;OLD TURKIC LETTER YENISEI AY;Lo;0;R;;;;;N;;;;; +10C18;OLD TURKIC LETTER ORKHON AEY;Lo;0;R;;;;;N;;;;; +10C19;OLD TURKIC LETTER YENISEI AEY;Lo;0;R;;;;;N;;;;; +10C1A;OLD TURKIC LETTER ORKHON AEK;Lo;0;R;;;;;N;;;;; +10C1B;OLD TURKIC LETTER YENISEI AEK;Lo;0;R;;;;;N;;;;; +10C1C;OLD TURKIC LETTER ORKHON OEK;Lo;0;R;;;;;N;;;;; +10C1D;OLD TURKIC LETTER YENISEI OEK;Lo;0;R;;;;;N;;;;; +10C1E;OLD TURKIC LETTER ORKHON AL;Lo;0;R;;;;;N;;;;; +10C1F;OLD TURKIC LETTER YENISEI AL;Lo;0;R;;;;;N;;;;; +10C20;OLD TURKIC LETTER ORKHON AEL;Lo;0;R;;;;;N;;;;; +10C21;OLD TURKIC LETTER ORKHON ELT;Lo;0;R;;;;;N;;;;; +10C22;OLD TURKIC LETTER ORKHON EM;Lo;0;R;;;;;N;;;;; +10C23;OLD TURKIC LETTER ORKHON AN;Lo;0;R;;;;;N;;;;; +10C24;OLD TURKIC LETTER ORKHON AEN;Lo;0;R;;;;;N;;;;; +10C25;OLD TURKIC LETTER YENISEI AEN;Lo;0;R;;;;;N;;;;; +10C26;OLD TURKIC LETTER ORKHON ENT;Lo;0;R;;;;;N;;;;; +10C27;OLD TURKIC LETTER YENISEI ENT;Lo;0;R;;;;;N;;;;; +10C28;OLD TURKIC LETTER ORKHON ENC;Lo;0;R;;;;;N;;;;; +10C29;OLD TURKIC LETTER YENISEI ENC;Lo;0;R;;;;;N;;;;; +10C2A;OLD TURKIC LETTER ORKHON ENY;Lo;0;R;;;;;N;;;;; +10C2B;OLD TURKIC LETTER YENISEI ENY;Lo;0;R;;;;;N;;;;; +10C2C;OLD TURKIC LETTER YENISEI ANG;Lo;0;R;;;;;N;;;;; +10C2D;OLD TURKIC LETTER ORKHON ENG;Lo;0;R;;;;;N;;;;; +10C2E;OLD TURKIC LETTER YENISEI AENG;Lo;0;R;;;;;N;;;;; +10C2F;OLD TURKIC LETTER ORKHON EP;Lo;0;R;;;;;N;;;;; +10C30;OLD TURKIC LETTER ORKHON OP;Lo;0;R;;;;;N;;;;; +10C31;OLD TURKIC LETTER ORKHON IC;Lo;0;R;;;;;N;;;;; +10C32;OLD TURKIC LETTER ORKHON EC;Lo;0;R;;;;;N;;;;; +10C33;OLD TURKIC LETTER YENISEI EC;Lo;0;R;;;;;N;;;;; +10C34;OLD TURKIC LETTER ORKHON AQ;Lo;0;R;;;;;N;;;;; +10C35;OLD TURKIC LETTER YENISEI AQ;Lo;0;R;;;;;N;;;;; +10C36;OLD TURKIC LETTER ORKHON IQ;Lo;0;R;;;;;N;;;;; +10C37;OLD TURKIC LETTER YENISEI IQ;Lo;0;R;;;;;N;;;;; +10C38;OLD TURKIC LETTER ORKHON OQ;Lo;0;R;;;;;N;;;;; +10C39;OLD TURKIC LETTER YENISEI OQ;Lo;0;R;;;;;N;;;;; +10C3A;OLD TURKIC LETTER ORKHON AR;Lo;0;R;;;;;N;;;;; +10C3B;OLD TURKIC LETTER YENISEI AR;Lo;0;R;;;;;N;;;;; +10C3C;OLD TURKIC LETTER ORKHON AER;Lo;0;R;;;;;N;;;;; +10C3D;OLD TURKIC LETTER ORKHON AS;Lo;0;R;;;;;N;;;;; +10C3E;OLD TURKIC LETTER ORKHON AES;Lo;0;R;;;;;N;;;;; +10C3F;OLD TURKIC LETTER ORKHON ASH;Lo;0;R;;;;;N;;;;; +10C40;OLD TURKIC LETTER YENISEI ASH;Lo;0;R;;;;;N;;;;; +10C41;OLD TURKIC LETTER ORKHON ESH;Lo;0;R;;;;;N;;;;; +10C42;OLD TURKIC LETTER YENISEI ESH;Lo;0;R;;;;;N;;;;; +10C43;OLD TURKIC LETTER ORKHON AT;Lo;0;R;;;;;N;;;;; +10C44;OLD TURKIC LETTER YENISEI AT;Lo;0;R;;;;;N;;;;; +10C45;OLD TURKIC LETTER ORKHON AET;Lo;0;R;;;;;N;;;;; +10C46;OLD TURKIC LETTER YENISEI AET;Lo;0;R;;;;;N;;;;; +10C47;OLD TURKIC LETTER ORKHON OT;Lo;0;R;;;;;N;;;;; +10C48;OLD TURKIC LETTER ORKHON BASH;Lo;0;R;;;;;N;;;;; +10C80;OLD HUNGARIAN CAPITAL LETTER A;Lu;0;R;;;;;N;;;;10CC0; +10C81;OLD HUNGARIAN CAPITAL LETTER AA;Lu;0;R;;;;;N;;;;10CC1; +10C82;OLD HUNGARIAN CAPITAL LETTER EB;Lu;0;R;;;;;N;;;;10CC2; +10C83;OLD HUNGARIAN CAPITAL LETTER AMB;Lu;0;R;;;;;N;;;;10CC3; +10C84;OLD HUNGARIAN CAPITAL LETTER EC;Lu;0;R;;;;;N;;;;10CC4; +10C85;OLD HUNGARIAN CAPITAL LETTER ENC;Lu;0;R;;;;;N;;;;10CC5; +10C86;OLD HUNGARIAN CAPITAL LETTER ECS;Lu;0;R;;;;;N;;;;10CC6; +10C87;OLD HUNGARIAN CAPITAL LETTER ED;Lu;0;R;;;;;N;;;;10CC7; +10C88;OLD HUNGARIAN CAPITAL LETTER AND;Lu;0;R;;;;;N;;;;10CC8; +10C89;OLD HUNGARIAN CAPITAL LETTER E;Lu;0;R;;;;;N;;;;10CC9; +10C8A;OLD HUNGARIAN CAPITAL LETTER CLOSE E;Lu;0;R;;;;;N;;;;10CCA; +10C8B;OLD HUNGARIAN CAPITAL LETTER EE;Lu;0;R;;;;;N;;;;10CCB; +10C8C;OLD HUNGARIAN CAPITAL LETTER EF;Lu;0;R;;;;;N;;;;10CCC; +10C8D;OLD HUNGARIAN CAPITAL LETTER EG;Lu;0;R;;;;;N;;;;10CCD; +10C8E;OLD HUNGARIAN CAPITAL LETTER EGY;Lu;0;R;;;;;N;;;;10CCE; +10C8F;OLD HUNGARIAN CAPITAL LETTER EH;Lu;0;R;;;;;N;;;;10CCF; +10C90;OLD HUNGARIAN CAPITAL LETTER I;Lu;0;R;;;;;N;;;;10CD0; +10C91;OLD HUNGARIAN CAPITAL LETTER II;Lu;0;R;;;;;N;;;;10CD1; +10C92;OLD HUNGARIAN CAPITAL LETTER EJ;Lu;0;R;;;;;N;;;;10CD2; +10C93;OLD HUNGARIAN CAPITAL LETTER EK;Lu;0;R;;;;;N;;;;10CD3; +10C94;OLD HUNGARIAN CAPITAL LETTER AK;Lu;0;R;;;;;N;;;;10CD4; +10C95;OLD HUNGARIAN CAPITAL LETTER UNK;Lu;0;R;;;;;N;;;;10CD5; +10C96;OLD HUNGARIAN CAPITAL LETTER EL;Lu;0;R;;;;;N;;;;10CD6; +10C97;OLD HUNGARIAN CAPITAL LETTER ELY;Lu;0;R;;;;;N;;;;10CD7; +10C98;OLD HUNGARIAN CAPITAL LETTER EM;Lu;0;R;;;;;N;;;;10CD8; +10C99;OLD HUNGARIAN CAPITAL LETTER EN;Lu;0;R;;;;;N;;;;10CD9; +10C9A;OLD HUNGARIAN CAPITAL LETTER ENY;Lu;0;R;;;;;N;;;;10CDA; +10C9B;OLD HUNGARIAN CAPITAL LETTER O;Lu;0;R;;;;;N;;;;10CDB; +10C9C;OLD HUNGARIAN CAPITAL LETTER OO;Lu;0;R;;;;;N;;;;10CDC; +10C9D;OLD HUNGARIAN CAPITAL LETTER NIKOLSBURG OE;Lu;0;R;;;;;N;;;;10CDD; +10C9E;OLD HUNGARIAN CAPITAL LETTER RUDIMENTA OE;Lu;0;R;;;;;N;;;;10CDE; +10C9F;OLD HUNGARIAN CAPITAL LETTER OEE;Lu;0;R;;;;;N;;;;10CDF; +10CA0;OLD HUNGARIAN CAPITAL LETTER EP;Lu;0;R;;;;;N;;;;10CE0; +10CA1;OLD HUNGARIAN CAPITAL LETTER EMP;Lu;0;R;;;;;N;;;;10CE1; +10CA2;OLD HUNGARIAN CAPITAL LETTER ER;Lu;0;R;;;;;N;;;;10CE2; +10CA3;OLD HUNGARIAN CAPITAL LETTER SHORT ER;Lu;0;R;;;;;N;;;;10CE3; +10CA4;OLD HUNGARIAN CAPITAL LETTER ES;Lu;0;R;;;;;N;;;;10CE4; +10CA5;OLD HUNGARIAN CAPITAL LETTER ESZ;Lu;0;R;;;;;N;;;;10CE5; +10CA6;OLD HUNGARIAN CAPITAL LETTER ET;Lu;0;R;;;;;N;;;;10CE6; +10CA7;OLD HUNGARIAN CAPITAL LETTER ENT;Lu;0;R;;;;;N;;;;10CE7; +10CA8;OLD HUNGARIAN CAPITAL LETTER ETY;Lu;0;R;;;;;N;;;;10CE8; +10CA9;OLD HUNGARIAN CAPITAL LETTER ECH;Lu;0;R;;;;;N;;;;10CE9; +10CAA;OLD HUNGARIAN CAPITAL LETTER U;Lu;0;R;;;;;N;;;;10CEA; +10CAB;OLD HUNGARIAN CAPITAL LETTER UU;Lu;0;R;;;;;N;;;;10CEB; +10CAC;OLD HUNGARIAN CAPITAL LETTER NIKOLSBURG UE;Lu;0;R;;;;;N;;;;10CEC; +10CAD;OLD HUNGARIAN CAPITAL LETTER RUDIMENTA UE;Lu;0;R;;;;;N;;;;10CED; +10CAE;OLD HUNGARIAN CAPITAL LETTER EV;Lu;0;R;;;;;N;;;;10CEE; +10CAF;OLD HUNGARIAN CAPITAL LETTER EZ;Lu;0;R;;;;;N;;;;10CEF; +10CB0;OLD HUNGARIAN CAPITAL LETTER EZS;Lu;0;R;;;;;N;;;;10CF0; +10CB1;OLD HUNGARIAN CAPITAL LETTER ENT-SHAPED SIGN;Lu;0;R;;;;;N;;;;10CF1; +10CB2;OLD HUNGARIAN CAPITAL LETTER US;Lu;0;R;;;;;N;;;;10CF2; +10CC0;OLD HUNGARIAN SMALL LETTER A;Ll;0;R;;;;;N;;;10C80;;10C80 +10CC1;OLD HUNGARIAN SMALL LETTER AA;Ll;0;R;;;;;N;;;10C81;;10C81 +10CC2;OLD HUNGARIAN SMALL LETTER EB;Ll;0;R;;;;;N;;;10C82;;10C82 +10CC3;OLD HUNGARIAN SMALL LETTER AMB;Ll;0;R;;;;;N;;;10C83;;10C83 +10CC4;OLD HUNGARIAN SMALL LETTER EC;Ll;0;R;;;;;N;;;10C84;;10C84 +10CC5;OLD HUNGARIAN SMALL LETTER ENC;Ll;0;R;;;;;N;;;10C85;;10C85 +10CC6;OLD HUNGARIAN SMALL LETTER ECS;Ll;0;R;;;;;N;;;10C86;;10C86 +10CC7;OLD HUNGARIAN SMALL LETTER ED;Ll;0;R;;;;;N;;;10C87;;10C87 +10CC8;OLD HUNGARIAN SMALL LETTER AND;Ll;0;R;;;;;N;;;10C88;;10C88 +10CC9;OLD HUNGARIAN SMALL LETTER E;Ll;0;R;;;;;N;;;10C89;;10C89 +10CCA;OLD HUNGARIAN SMALL LETTER CLOSE E;Ll;0;R;;;;;N;;;10C8A;;10C8A +10CCB;OLD HUNGARIAN SMALL LETTER EE;Ll;0;R;;;;;N;;;10C8B;;10C8B +10CCC;OLD HUNGARIAN SMALL LETTER EF;Ll;0;R;;;;;N;;;10C8C;;10C8C +10CCD;OLD HUNGARIAN SMALL LETTER EG;Ll;0;R;;;;;N;;;10C8D;;10C8D +10CCE;OLD HUNGARIAN SMALL LETTER EGY;Ll;0;R;;;;;N;;;10C8E;;10C8E +10CCF;OLD HUNGARIAN SMALL LETTER EH;Ll;0;R;;;;;N;;;10C8F;;10C8F +10CD0;OLD HUNGARIAN SMALL LETTER I;Ll;0;R;;;;;N;;;10C90;;10C90 +10CD1;OLD HUNGARIAN SMALL LETTER II;Ll;0;R;;;;;N;;;10C91;;10C91 +10CD2;OLD HUNGARIAN SMALL LETTER EJ;Ll;0;R;;;;;N;;;10C92;;10C92 +10CD3;OLD HUNGARIAN SMALL LETTER EK;Ll;0;R;;;;;N;;;10C93;;10C93 +10CD4;OLD HUNGARIAN SMALL LETTER AK;Ll;0;R;;;;;N;;;10C94;;10C94 +10CD5;OLD HUNGARIAN SMALL LETTER UNK;Ll;0;R;;;;;N;;;10C95;;10C95 +10CD6;OLD HUNGARIAN SMALL LETTER EL;Ll;0;R;;;;;N;;;10C96;;10C96 +10CD7;OLD HUNGARIAN SMALL LETTER ELY;Ll;0;R;;;;;N;;;10C97;;10C97 +10CD8;OLD HUNGARIAN SMALL LETTER EM;Ll;0;R;;;;;N;;;10C98;;10C98 +10CD9;OLD HUNGARIAN SMALL LETTER EN;Ll;0;R;;;;;N;;;10C99;;10C99 +10CDA;OLD HUNGARIAN SMALL LETTER ENY;Ll;0;R;;;;;N;;;10C9A;;10C9A +10CDB;OLD HUNGARIAN SMALL LETTER O;Ll;0;R;;;;;N;;;10C9B;;10C9B +10CDC;OLD HUNGARIAN SMALL LETTER OO;Ll;0;R;;;;;N;;;10C9C;;10C9C +10CDD;OLD HUNGARIAN SMALL LETTER NIKOLSBURG OE;Ll;0;R;;;;;N;;;10C9D;;10C9D +10CDE;OLD HUNGARIAN SMALL LETTER RUDIMENTA OE;Ll;0;R;;;;;N;;;10C9E;;10C9E +10CDF;OLD HUNGARIAN SMALL LETTER OEE;Ll;0;R;;;;;N;;;10C9F;;10C9F +10CE0;OLD HUNGARIAN SMALL LETTER EP;Ll;0;R;;;;;N;;;10CA0;;10CA0 +10CE1;OLD HUNGARIAN SMALL LETTER EMP;Ll;0;R;;;;;N;;;10CA1;;10CA1 +10CE2;OLD HUNGARIAN SMALL LETTER ER;Ll;0;R;;;;;N;;;10CA2;;10CA2 +10CE3;OLD HUNGARIAN SMALL LETTER SHORT ER;Ll;0;R;;;;;N;;;10CA3;;10CA3 +10CE4;OLD HUNGARIAN SMALL LETTER ES;Ll;0;R;;;;;N;;;10CA4;;10CA4 +10CE5;OLD HUNGARIAN SMALL LETTER ESZ;Ll;0;R;;;;;N;;;10CA5;;10CA5 +10CE6;OLD HUNGARIAN SMALL LETTER ET;Ll;0;R;;;;;N;;;10CA6;;10CA6 +10CE7;OLD HUNGARIAN SMALL LETTER ENT;Ll;0;R;;;;;N;;;10CA7;;10CA7 +10CE8;OLD HUNGARIAN SMALL LETTER ETY;Ll;0;R;;;;;N;;;10CA8;;10CA8 +10CE9;OLD HUNGARIAN SMALL LETTER ECH;Ll;0;R;;;;;N;;;10CA9;;10CA9 +10CEA;OLD HUNGARIAN SMALL LETTER U;Ll;0;R;;;;;N;;;10CAA;;10CAA +10CEB;OLD HUNGARIAN SMALL LETTER UU;Ll;0;R;;;;;N;;;10CAB;;10CAB +10CEC;OLD HUNGARIAN SMALL LETTER NIKOLSBURG UE;Ll;0;R;;;;;N;;;10CAC;;10CAC +10CED;OLD HUNGARIAN SMALL LETTER RUDIMENTA UE;Ll;0;R;;;;;N;;;10CAD;;10CAD +10CEE;OLD HUNGARIAN SMALL LETTER EV;Ll;0;R;;;;;N;;;10CAE;;10CAE +10CEF;OLD HUNGARIAN SMALL LETTER EZ;Ll;0;R;;;;;N;;;10CAF;;10CAF +10CF0;OLD HUNGARIAN SMALL LETTER EZS;Ll;0;R;;;;;N;;;10CB0;;10CB0 +10CF1;OLD HUNGARIAN SMALL LETTER ENT-SHAPED SIGN;Ll;0;R;;;;;N;;;10CB1;;10CB1 +10CF2;OLD HUNGARIAN SMALL LETTER US;Ll;0;R;;;;;N;;;10CB2;;10CB2 +10CFA;OLD HUNGARIAN NUMBER ONE;No;0;R;;;;1;N;;;;; +10CFB;OLD HUNGARIAN NUMBER FIVE;No;0;R;;;;5;N;;;;; +10CFC;OLD HUNGARIAN NUMBER TEN;No;0;R;;;;10;N;;;;; +10CFD;OLD HUNGARIAN NUMBER FIFTY;No;0;R;;;;50;N;;;;; +10CFE;OLD HUNGARIAN NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;; +10CFF;OLD HUNGARIAN NUMBER ONE THOUSAND;No;0;R;;;;1000;N;;;;; +10D00;HANIFI ROHINGYA LETTER A;Lo;0;AL;;;;;N;;;;; +10D01;HANIFI ROHINGYA LETTER BA;Lo;0;AL;;;;;N;;;;; +10D02;HANIFI ROHINGYA LETTER PA;Lo;0;AL;;;;;N;;;;; +10D03;HANIFI ROHINGYA LETTER TA;Lo;0;AL;;;;;N;;;;; +10D04;HANIFI ROHINGYA LETTER TTA;Lo;0;AL;;;;;N;;;;; +10D05;HANIFI ROHINGYA LETTER JA;Lo;0;AL;;;;;N;;;;; +10D06;HANIFI ROHINGYA LETTER CA;Lo;0;AL;;;;;N;;;;; +10D07;HANIFI ROHINGYA LETTER HA;Lo;0;AL;;;;;N;;;;; +10D08;HANIFI ROHINGYA LETTER KHA;Lo;0;AL;;;;;N;;;;; +10D09;HANIFI ROHINGYA LETTER FA;Lo;0;AL;;;;;N;;;;; +10D0A;HANIFI ROHINGYA LETTER DA;Lo;0;AL;;;;;N;;;;; +10D0B;HANIFI ROHINGYA LETTER DDA;Lo;0;AL;;;;;N;;;;; +10D0C;HANIFI ROHINGYA LETTER RA;Lo;0;AL;;;;;N;;;;; +10D0D;HANIFI ROHINGYA LETTER RRA;Lo;0;AL;;;;;N;;;;; +10D0E;HANIFI ROHINGYA LETTER ZA;Lo;0;AL;;;;;N;;;;; +10D0F;HANIFI ROHINGYA LETTER SA;Lo;0;AL;;;;;N;;;;; +10D10;HANIFI ROHINGYA LETTER SHA;Lo;0;AL;;;;;N;;;;; +10D11;HANIFI ROHINGYA LETTER KA;Lo;0;AL;;;;;N;;;;; +10D12;HANIFI ROHINGYA LETTER GA;Lo;0;AL;;;;;N;;;;; +10D13;HANIFI ROHINGYA LETTER LA;Lo;0;AL;;;;;N;;;;; +10D14;HANIFI ROHINGYA LETTER MA;Lo;0;AL;;;;;N;;;;; +10D15;HANIFI ROHINGYA LETTER NA;Lo;0;AL;;;;;N;;;;; +10D16;HANIFI ROHINGYA LETTER WA;Lo;0;AL;;;;;N;;;;; +10D17;HANIFI ROHINGYA LETTER KINNA WA;Lo;0;AL;;;;;N;;;;; +10D18;HANIFI ROHINGYA LETTER YA;Lo;0;AL;;;;;N;;;;; +10D19;HANIFI ROHINGYA LETTER KINNA YA;Lo;0;AL;;;;;N;;;;; +10D1A;HANIFI ROHINGYA LETTER NGA;Lo;0;AL;;;;;N;;;;; +10D1B;HANIFI ROHINGYA LETTER NYA;Lo;0;AL;;;;;N;;;;; +10D1C;HANIFI ROHINGYA LETTER VA;Lo;0;AL;;;;;N;;;;; +10D1D;HANIFI ROHINGYA VOWEL A;Lo;0;AL;;;;;N;;;;; +10D1E;HANIFI ROHINGYA VOWEL I;Lo;0;AL;;;;;N;;;;; +10D1F;HANIFI ROHINGYA VOWEL U;Lo;0;AL;;;;;N;;;;; +10D20;HANIFI ROHINGYA VOWEL E;Lo;0;AL;;;;;N;;;;; +10D21;HANIFI ROHINGYA VOWEL O;Lo;0;AL;;;;;N;;;;; +10D22;HANIFI ROHINGYA MARK SAKIN;Lo;0;AL;;;;;N;;;;; +10D23;HANIFI ROHINGYA MARK NA KHONNA;Lo;0;AL;;;;;N;;;;; +10D24;HANIFI ROHINGYA SIGN HARBAHAY;Mn;230;NSM;;;;;N;;;;; +10D25;HANIFI ROHINGYA SIGN TAHALA;Mn;230;NSM;;;;;N;;;;; +10D26;HANIFI ROHINGYA SIGN TANA;Mn;230;NSM;;;;;N;;;;; +10D27;HANIFI ROHINGYA SIGN TASSI;Mn;230;NSM;;;;;N;;;;; +10D30;HANIFI ROHINGYA DIGIT ZERO;Nd;0;AN;;0;0;0;N;;;;; +10D31;HANIFI ROHINGYA DIGIT ONE;Nd;0;AN;;1;1;1;N;;;;; +10D32;HANIFI ROHINGYA DIGIT TWO;Nd;0;AN;;2;2;2;N;;;;; +10D33;HANIFI ROHINGYA DIGIT THREE;Nd;0;AN;;3;3;3;N;;;;; +10D34;HANIFI ROHINGYA DIGIT FOUR;Nd;0;AN;;4;4;4;N;;;;; +10D35;HANIFI ROHINGYA DIGIT FIVE;Nd;0;AN;;5;5;5;N;;;;; +10D36;HANIFI ROHINGYA DIGIT SIX;Nd;0;AN;;6;6;6;N;;;;; +10D37;HANIFI ROHINGYA DIGIT SEVEN;Nd;0;AN;;7;7;7;N;;;;; +10D38;HANIFI ROHINGYA DIGIT EIGHT;Nd;0;AN;;8;8;8;N;;;;; +10D39;HANIFI ROHINGYA DIGIT NINE;Nd;0;AN;;9;9;9;N;;;;; +10D40;GARAY DIGIT ZERO;Nd;0;AN;;0;0;0;N;;;;; +10D41;GARAY DIGIT ONE;Nd;0;AN;;1;1;1;N;;;;; +10D42;GARAY DIGIT TWO;Nd;0;AN;;2;2;2;N;;;;; +10D43;GARAY DIGIT THREE;Nd;0;AN;;3;3;3;N;;;;; +10D44;GARAY DIGIT FOUR;Nd;0;AN;;4;4;4;N;;;;; +10D45;GARAY DIGIT FIVE;Nd;0;AN;;5;5;5;N;;;;; +10D46;GARAY DIGIT SIX;Nd;0;AN;;6;6;6;N;;;;; +10D47;GARAY DIGIT SEVEN;Nd;0;AN;;7;7;7;N;;;;; +10D48;GARAY DIGIT EIGHT;Nd;0;AN;;8;8;8;N;;;;; +10D49;GARAY DIGIT NINE;Nd;0;AN;;9;9;9;N;;;;; +10D4A;GARAY VOWEL SIGN A;Lo;0;R;;;;;N;;;;; +10D4B;GARAY VOWEL SIGN I;Lo;0;R;;;;;N;;;;; +10D4C;GARAY VOWEL SIGN O;Lo;0;R;;;;;N;;;;; +10D4D;GARAY VOWEL SIGN EE;Lo;0;R;;;;;N;;;;; +10D4E;GARAY VOWEL LENGTH MARK;Lm;0;R;;;;;N;;;;; +10D4F;GARAY SUKUN;Lo;0;R;;;;;N;;;;; +10D50;GARAY CAPITAL LETTER A;Lu;0;R;;;;;N;;;;10D70; +10D51;GARAY CAPITAL LETTER CA;Lu;0;R;;;;;N;;;;10D71; +10D52;GARAY CAPITAL LETTER MA;Lu;0;R;;;;;N;;;;10D72; +10D53;GARAY CAPITAL LETTER KA;Lu;0;R;;;;;N;;;;10D73; +10D54;GARAY CAPITAL LETTER BA;Lu;0;R;;;;;N;;;;10D74; +10D55;GARAY CAPITAL LETTER JA;Lu;0;R;;;;;N;;;;10D75; +10D56;GARAY CAPITAL LETTER SA;Lu;0;R;;;;;N;;;;10D76; +10D57;GARAY CAPITAL LETTER WA;Lu;0;R;;;;;N;;;;10D77; +10D58;GARAY CAPITAL LETTER LA;Lu;0;R;;;;;N;;;;10D78; +10D59;GARAY CAPITAL LETTER GA;Lu;0;R;;;;;N;;;;10D79; +10D5A;GARAY CAPITAL LETTER DA;Lu;0;R;;;;;N;;;;10D7A; +10D5B;GARAY CAPITAL LETTER XA;Lu;0;R;;;;;N;;;;10D7B; +10D5C;GARAY CAPITAL LETTER YA;Lu;0;R;;;;;N;;;;10D7C; +10D5D;GARAY CAPITAL LETTER TA;Lu;0;R;;;;;N;;;;10D7D; +10D5E;GARAY CAPITAL LETTER RA;Lu;0;R;;;;;N;;;;10D7E; +10D5F;GARAY CAPITAL LETTER NYA;Lu;0;R;;;;;N;;;;10D7F; +10D60;GARAY CAPITAL LETTER FA;Lu;0;R;;;;;N;;;;10D80; +10D61;GARAY CAPITAL LETTER NA;Lu;0;R;;;;;N;;;;10D81; +10D62;GARAY CAPITAL LETTER PA;Lu;0;R;;;;;N;;;;10D82; +10D63;GARAY CAPITAL LETTER HA;Lu;0;R;;;;;N;;;;10D83; +10D64;GARAY CAPITAL LETTER OLD KA;Lu;0;R;;;;;N;;;;10D84; +10D65;GARAY CAPITAL LETTER OLD NA;Lu;0;R;;;;;N;;;;10D85; +10D69;GARAY VOWEL SIGN E;Mn;230;NSM;;;;;N;;;;; +10D6A;GARAY CONSONANT GEMINATION MARK;Mn;230;NSM;;;;;N;;;;; +10D6B;GARAY COMBINING DOT ABOVE;Mn;230;NSM;;;;;N;;;;; +10D6C;GARAY COMBINING DOUBLE DOT ABOVE;Mn;230;NSM;;;;;N;;;;; +10D6D;GARAY CONSONANT NASALIZATION MARK;Mn;230;NSM;;;;;N;;;;; +10D6E;GARAY HYPHEN;Pd;0;ON;;;;;N;;;;; +10D6F;GARAY REDUPLICATION MARK;Lm;0;R;;;;;N;;;;; +10D70;GARAY SMALL LETTER A;Ll;0;R;;;;;N;;;10D50;;10D50 +10D71;GARAY SMALL LETTER CA;Ll;0;R;;;;;N;;;10D51;;10D51 +10D72;GARAY SMALL LETTER MA;Ll;0;R;;;;;N;;;10D52;;10D52 +10D73;GARAY SMALL LETTER KA;Ll;0;R;;;;;N;;;10D53;;10D53 +10D74;GARAY SMALL LETTER BA;Ll;0;R;;;;;N;;;10D54;;10D54 +10D75;GARAY SMALL LETTER JA;Ll;0;R;;;;;N;;;10D55;;10D55 +10D76;GARAY SMALL LETTER SA;Ll;0;R;;;;;N;;;10D56;;10D56 +10D77;GARAY SMALL LETTER WA;Ll;0;R;;;;;N;;;10D57;;10D57 +10D78;GARAY SMALL LETTER LA;Ll;0;R;;;;;N;;;10D58;;10D58 +10D79;GARAY SMALL LETTER GA;Ll;0;R;;;;;N;;;10D59;;10D59 +10D7A;GARAY SMALL LETTER DA;Ll;0;R;;;;;N;;;10D5A;;10D5A +10D7B;GARAY SMALL LETTER XA;Ll;0;R;;;;;N;;;10D5B;;10D5B +10D7C;GARAY SMALL LETTER YA;Ll;0;R;;;;;N;;;10D5C;;10D5C +10D7D;GARAY SMALL LETTER TA;Ll;0;R;;;;;N;;;10D5D;;10D5D +10D7E;GARAY SMALL LETTER RA;Ll;0;R;;;;;N;;;10D5E;;10D5E +10D7F;GARAY SMALL LETTER NYA;Ll;0;R;;;;;N;;;10D5F;;10D5F +10D80;GARAY SMALL LETTER FA;Ll;0;R;;;;;N;;;10D60;;10D60 +10D81;GARAY SMALL LETTER NA;Ll;0;R;;;;;N;;;10D61;;10D61 +10D82;GARAY SMALL LETTER PA;Ll;0;R;;;;;N;;;10D62;;10D62 +10D83;GARAY SMALL LETTER HA;Ll;0;R;;;;;N;;;10D63;;10D63 +10D84;GARAY SMALL LETTER OLD KA;Ll;0;R;;;;;N;;;10D64;;10D64 +10D85;GARAY SMALL LETTER OLD NA;Ll;0;R;;;;;N;;;10D65;;10D65 +10D8E;GARAY PLUS SIGN;Sm;0;R;;;;;N;;;;; +10D8F;GARAY MINUS SIGN;Sm;0;R;;;;;N;;;;; +10E60;RUMI DIGIT ONE;No;0;AN;;;1;1;N;;;;; +10E61;RUMI DIGIT TWO;No;0;AN;;;2;2;N;;;;; +10E62;RUMI DIGIT THREE;No;0;AN;;;3;3;N;;;;; +10E63;RUMI DIGIT FOUR;No;0;AN;;;4;4;N;;;;; +10E64;RUMI DIGIT FIVE;No;0;AN;;;5;5;N;;;;; +10E65;RUMI DIGIT SIX;No;0;AN;;;6;6;N;;;;; +10E66;RUMI DIGIT SEVEN;No;0;AN;;;7;7;N;;;;; +10E67;RUMI DIGIT EIGHT;No;0;AN;;;8;8;N;;;;; +10E68;RUMI DIGIT NINE;No;0;AN;;;9;9;N;;;;; +10E69;RUMI NUMBER TEN;No;0;AN;;;;10;N;;;;; +10E6A;RUMI NUMBER TWENTY;No;0;AN;;;;20;N;;;;; +10E6B;RUMI NUMBER THIRTY;No;0;AN;;;;30;N;;;;; +10E6C;RUMI NUMBER FORTY;No;0;AN;;;;40;N;;;;; +10E6D;RUMI NUMBER FIFTY;No;0;AN;;;;50;N;;;;; +10E6E;RUMI NUMBER SIXTY;No;0;AN;;;;60;N;;;;; +10E6F;RUMI NUMBER SEVENTY;No;0;AN;;;;70;N;;;;; +10E70;RUMI NUMBER EIGHTY;No;0;AN;;;;80;N;;;;; +10E71;RUMI NUMBER NINETY;No;0;AN;;;;90;N;;;;; +10E72;RUMI NUMBER ONE HUNDRED;No;0;AN;;;;100;N;;;;; +10E73;RUMI NUMBER TWO HUNDRED;No;0;AN;;;;200;N;;;;; +10E74;RUMI NUMBER THREE HUNDRED;No;0;AN;;;;300;N;;;;; +10E75;RUMI NUMBER FOUR HUNDRED;No;0;AN;;;;400;N;;;;; +10E76;RUMI NUMBER FIVE HUNDRED;No;0;AN;;;;500;N;;;;; +10E77;RUMI NUMBER SIX HUNDRED;No;0;AN;;;;600;N;;;;; +10E78;RUMI NUMBER SEVEN HUNDRED;No;0;AN;;;;700;N;;;;; +10E79;RUMI NUMBER EIGHT HUNDRED;No;0;AN;;;;800;N;;;;; +10E7A;RUMI NUMBER NINE HUNDRED;No;0;AN;;;;900;N;;;;; +10E7B;RUMI FRACTION ONE HALF;No;0;AN;;;;1/2;N;;;;; +10E7C;RUMI FRACTION ONE QUARTER;No;0;AN;;;;1/4;N;;;;; +10E7D;RUMI FRACTION ONE THIRD;No;0;AN;;;;1/3;N;;;;; +10E7E;RUMI FRACTION TWO THIRDS;No;0;AN;;;;2/3;N;;;;; +10E80;YEZIDI LETTER ELIF;Lo;0;R;;;;;N;;;;; +10E81;YEZIDI LETTER BE;Lo;0;R;;;;;N;;;;; +10E82;YEZIDI LETTER PE;Lo;0;R;;;;;N;;;;; +10E83;YEZIDI LETTER PHE;Lo;0;R;;;;;N;;;;; +10E84;YEZIDI LETTER THE;Lo;0;R;;;;;N;;;;; +10E85;YEZIDI LETTER SE;Lo;0;R;;;;;N;;;;; +10E86;YEZIDI LETTER CIM;Lo;0;R;;;;;N;;;;; +10E87;YEZIDI LETTER CHIM;Lo;0;R;;;;;N;;;;; +10E88;YEZIDI LETTER CHHIM;Lo;0;R;;;;;N;;;;; +10E89;YEZIDI LETTER HHA;Lo;0;R;;;;;N;;;;; +10E8A;YEZIDI LETTER XA;Lo;0;R;;;;;N;;;;; +10E8B;YEZIDI LETTER DAL;Lo;0;R;;;;;N;;;;; +10E8C;YEZIDI LETTER ZAL;Lo;0;R;;;;;N;;;;; +10E8D;YEZIDI LETTER RA;Lo;0;R;;;;;N;;;;; +10E8E;YEZIDI LETTER RHA;Lo;0;R;;;;;N;;;;; +10E8F;YEZIDI LETTER ZA;Lo;0;R;;;;;N;;;;; +10E90;YEZIDI LETTER JA;Lo;0;R;;;;;N;;;;; +10E91;YEZIDI LETTER SIN;Lo;0;R;;;;;N;;;;; +10E92;YEZIDI LETTER SHIN;Lo;0;R;;;;;N;;;;; +10E93;YEZIDI LETTER SAD;Lo;0;R;;;;;N;;;;; +10E94;YEZIDI LETTER DAD;Lo;0;R;;;;;N;;;;; +10E95;YEZIDI LETTER TA;Lo;0;R;;;;;N;;;;; +10E96;YEZIDI LETTER ZE;Lo;0;R;;;;;N;;;;; +10E97;YEZIDI LETTER EYN;Lo;0;R;;;;;N;;;;; +10E98;YEZIDI LETTER XHEYN;Lo;0;R;;;;;N;;;;; +10E99;YEZIDI LETTER FA;Lo;0;R;;;;;N;;;;; +10E9A;YEZIDI LETTER VA;Lo;0;R;;;;;N;;;;; +10E9B;YEZIDI LETTER VA ALTERNATE FORM;Lo;0;R;;;;;N;;;;; +10E9C;YEZIDI LETTER QAF;Lo;0;R;;;;;N;;;;; +10E9D;YEZIDI LETTER KAF;Lo;0;R;;;;;N;;;;; +10E9E;YEZIDI LETTER KHAF;Lo;0;R;;;;;N;;;;; +10E9F;YEZIDI LETTER GAF;Lo;0;R;;;;;N;;;;; +10EA0;YEZIDI LETTER LAM;Lo;0;R;;;;;N;;;;; +10EA1;YEZIDI LETTER MIM;Lo;0;R;;;;;N;;;;; +10EA2;YEZIDI LETTER NUN;Lo;0;R;;;;;N;;;;; +10EA3;YEZIDI LETTER UM;Lo;0;R;;;;;N;;;;; +10EA4;YEZIDI LETTER WAW;Lo;0;R;;;;;N;;;;; +10EA5;YEZIDI LETTER OW;Lo;0;R;;;;;N;;;;; +10EA6;YEZIDI LETTER EW;Lo;0;R;;;;;N;;;;; +10EA7;YEZIDI LETTER HAY;Lo;0;R;;;;;N;;;;; +10EA8;YEZIDI LETTER YOT;Lo;0;R;;;;;N;;;;; +10EA9;YEZIDI LETTER ET;Lo;0;R;;;;;N;;;;; +10EAB;YEZIDI COMBINING HAMZA MARK;Mn;230;NSM;;;;;N;;;;; +10EAC;YEZIDI COMBINING MADDA MARK;Mn;230;NSM;;;;;N;;;;; +10EAD;YEZIDI HYPHENATION MARK;Pd;0;R;;;;;N;;;;; +10EB0;YEZIDI LETTER LAM WITH DOT ABOVE;Lo;0;R;;;;;N;;;;; +10EB1;YEZIDI LETTER YOT WITH CIRCUMFLEX ABOVE;Lo;0;R;;;;;N;;;;; +10EC2;ARABIC LETTER DAL WITH TWO DOTS VERTICALLY BELOW;Lo;0;AL;;;;;N;;;;; +10EC3;ARABIC LETTER TAH WITH TWO DOTS VERTICALLY BELOW;Lo;0;AL;;;;;N;;;;; +10EC4;ARABIC LETTER KAF WITH TWO DOTS VERTICALLY BELOW;Lo;0;AL;;;;;N;;;;; +10EC5;ARABIC SMALL YEH BARREE WITH TWO DOTS BELOW;Lm;0;AL;;;;;N;;;;; +10EC6;ARABIC LETTER THIN NOON;Lo;0;AL;;;;;N;;;;; +10EC7;ARABIC LETTER YEH WITH FOUR DOTS BELOW;Lo;0;AL;;;;;N;;;;; +10ED0;ARABIC BIBLICAL END OF VERSE;Po;0;ON;;;;;N;;;;; +10ED1;ARABIC LIGATURE ALAYHAA AS-SALAATU WAS-SALAAM;So;0;ON;;;;;N;;;;; +10ED2;ARABIC LIGATURE ALAYHIM AS-SALAATU WAS-SALAAM;So;0;ON;;;;;N;;;;; +10ED3;ARABIC LIGATURE ALAYHIMAA AS-SALAATU WAS-SALAAM;So;0;ON;;;;;N;;;;; +10ED4;ARABIC LIGATURE QADDASA ALLAAHU SIRRAH;So;0;ON;;;;;N;;;;; +10ED5;ARABIC LIGATURE QUDDISA SIRRUHUM;So;0;ON;;;;;N;;;;; +10ED6;ARABIC LIGATURE QUDDISA SIRRUHUMAA;So;0;ON;;;;;N;;;;; +10ED7;ARABIC LIGATURE QUDDISAT ASRAARUHUM;So;0;ON;;;;;N;;;;; +10ED8;ARABIC LIGATURE NAWWARA ALLAAHU MARQADAH;So;0;ON;;;;;N;;;;; +10EFA;ARABIC DOUBLE VERTICAL BAR BELOW;Mn;220;NSM;;;;;N;;;;; +10EFB;ARABIC SMALL LOW NOON;Mn;220;NSM;;;;;N;;;;; +10EFC;ARABIC COMBINING ALEF OVERLAY;Mn;0;NSM;;;;;N;;;;; +10EFD;ARABIC SMALL LOW WORD SAKTA;Mn;220;NSM;;;;;N;;;;; +10EFE;ARABIC SMALL LOW WORD QASR;Mn;220;NSM;;;;;N;;;;; +10EFF;ARABIC SMALL LOW WORD MADDA;Mn;220;NSM;;;;;N;;;;; +10F00;OLD SOGDIAN LETTER ALEPH;Lo;0;R;;;;;N;;;;; +10F01;OLD SOGDIAN LETTER FINAL ALEPH;Lo;0;R;;;;;N;;;;; +10F02;OLD SOGDIAN LETTER BETH;Lo;0;R;;;;;N;;;;; +10F03;OLD SOGDIAN LETTER FINAL BETH;Lo;0;R;;;;;N;;;;; +10F04;OLD SOGDIAN LETTER GIMEL;Lo;0;R;;;;;N;;;;; +10F05;OLD SOGDIAN LETTER HE;Lo;0;R;;;;;N;;;;; +10F06;OLD SOGDIAN LETTER FINAL HE;Lo;0;R;;;;;N;;;;; +10F07;OLD SOGDIAN LETTER WAW;Lo;0;R;;;;;N;;;;; +10F08;OLD SOGDIAN LETTER ZAYIN;Lo;0;R;;;;;N;;;;; +10F09;OLD SOGDIAN LETTER HETH;Lo;0;R;;;;;N;;;;; +10F0A;OLD SOGDIAN LETTER YODH;Lo;0;R;;;;;N;;;;; +10F0B;OLD SOGDIAN LETTER KAPH;Lo;0;R;;;;;N;;;;; +10F0C;OLD SOGDIAN LETTER LAMEDH;Lo;0;R;;;;;N;;;;; +10F0D;OLD SOGDIAN LETTER MEM;Lo;0;R;;;;;N;;;;; +10F0E;OLD SOGDIAN LETTER NUN;Lo;0;R;;;;;N;;;;; +10F0F;OLD SOGDIAN LETTER FINAL NUN;Lo;0;R;;;;;N;;;;; +10F10;OLD SOGDIAN LETTER FINAL NUN WITH VERTICAL TAIL;Lo;0;R;;;;;N;;;;; +10F11;OLD SOGDIAN LETTER SAMEKH;Lo;0;R;;;;;N;;;;; +10F12;OLD SOGDIAN LETTER AYIN;Lo;0;R;;;;;N;;;;; +10F13;OLD SOGDIAN LETTER ALTERNATE AYIN;Lo;0;R;;;;;N;;;;; +10F14;OLD SOGDIAN LETTER PE;Lo;0;R;;;;;N;;;;; +10F15;OLD SOGDIAN LETTER SADHE;Lo;0;R;;;;;N;;;;; +10F16;OLD SOGDIAN LETTER FINAL SADHE;Lo;0;R;;;;;N;;;;; +10F17;OLD SOGDIAN LETTER FINAL SADHE WITH VERTICAL TAIL;Lo;0;R;;;;;N;;;;; +10F18;OLD SOGDIAN LETTER RESH-AYIN-DALETH;Lo;0;R;;;;;N;;;;; +10F19;OLD SOGDIAN LETTER SHIN;Lo;0;R;;;;;N;;;;; +10F1A;OLD SOGDIAN LETTER TAW;Lo;0;R;;;;;N;;;;; +10F1B;OLD SOGDIAN LETTER FINAL TAW;Lo;0;R;;;;;N;;;;; +10F1C;OLD SOGDIAN LETTER FINAL TAW WITH VERTICAL TAIL;Lo;0;R;;;;;N;;;;; +10F1D;OLD SOGDIAN NUMBER ONE;No;0;R;;;;1;N;;;;; +10F1E;OLD SOGDIAN NUMBER TWO;No;0;R;;;;2;N;;;;; +10F1F;OLD SOGDIAN NUMBER THREE;No;0;R;;;;3;N;;;;; +10F20;OLD SOGDIAN NUMBER FOUR;No;0;R;;;;4;N;;;;; +10F21;OLD SOGDIAN NUMBER FIVE;No;0;R;;;;5;N;;;;; +10F22;OLD SOGDIAN NUMBER TEN;No;0;R;;;;10;N;;;;; +10F23;OLD SOGDIAN NUMBER TWENTY;No;0;R;;;;20;N;;;;; +10F24;OLD SOGDIAN NUMBER THIRTY;No;0;R;;;;30;N;;;;; +10F25;OLD SOGDIAN NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;; +10F26;OLD SOGDIAN FRACTION ONE HALF;No;0;R;;;;1/2;N;;;;; +10F27;OLD SOGDIAN LIGATURE AYIN-DALETH;Lo;0;R;;;;;N;;;;; +10F30;SOGDIAN LETTER ALEPH;Lo;0;AL;;;;;N;;;;; +10F31;SOGDIAN LETTER BETH;Lo;0;AL;;;;;N;;;;; +10F32;SOGDIAN LETTER GIMEL;Lo;0;AL;;;;;N;;;;; +10F33;SOGDIAN LETTER HE;Lo;0;AL;;;;;N;;;;; +10F34;SOGDIAN LETTER WAW;Lo;0;AL;;;;;N;;;;; +10F35;SOGDIAN LETTER ZAYIN;Lo;0;AL;;;;;N;;;;; +10F36;SOGDIAN LETTER HETH;Lo;0;AL;;;;;N;;;;; +10F37;SOGDIAN LETTER YODH;Lo;0;AL;;;;;N;;;;; +10F38;SOGDIAN LETTER KAPH;Lo;0;AL;;;;;N;;;;; +10F39;SOGDIAN LETTER LAMEDH;Lo;0;AL;;;;;N;;;;; +10F3A;SOGDIAN LETTER MEM;Lo;0;AL;;;;;N;;;;; +10F3B;SOGDIAN LETTER NUN;Lo;0;AL;;;;;N;;;;; +10F3C;SOGDIAN LETTER SAMEKH;Lo;0;AL;;;;;N;;;;; +10F3D;SOGDIAN LETTER AYIN;Lo;0;AL;;;;;N;;;;; +10F3E;SOGDIAN LETTER PE;Lo;0;AL;;;;;N;;;;; +10F3F;SOGDIAN LETTER SADHE;Lo;0;AL;;;;;N;;;;; +10F40;SOGDIAN LETTER RESH-AYIN;Lo;0;AL;;;;;N;;;;; +10F41;SOGDIAN LETTER SHIN;Lo;0;AL;;;;;N;;;;; +10F42;SOGDIAN LETTER TAW;Lo;0;AL;;;;;N;;;;; +10F43;SOGDIAN LETTER FETH;Lo;0;AL;;;;;N;;;;; +10F44;SOGDIAN LETTER LESH;Lo;0;AL;;;;;N;;;;; +10F45;SOGDIAN INDEPENDENT SHIN;Lo;0;AL;;;;;N;;;;; +10F46;SOGDIAN COMBINING DOT BELOW;Mn;220;NSM;;;;;N;;;;; +10F47;SOGDIAN COMBINING TWO DOTS BELOW;Mn;220;NSM;;;;;N;;;;; +10F48;SOGDIAN COMBINING DOT ABOVE;Mn;230;NSM;;;;;N;;;;; +10F49;SOGDIAN COMBINING TWO DOTS ABOVE;Mn;230;NSM;;;;;N;;;;; +10F4A;SOGDIAN COMBINING CURVE ABOVE;Mn;230;NSM;;;;;N;;;;; +10F4B;SOGDIAN COMBINING CURVE BELOW;Mn;220;NSM;;;;;N;;;;; +10F4C;SOGDIAN COMBINING HOOK ABOVE;Mn;230;NSM;;;;;N;;;;; +10F4D;SOGDIAN COMBINING HOOK BELOW;Mn;220;NSM;;;;;N;;;;; +10F4E;SOGDIAN COMBINING LONG HOOK BELOW;Mn;220;NSM;;;;;N;;;;; +10F4F;SOGDIAN COMBINING RESH BELOW;Mn;220;NSM;;;;;N;;;;; +10F50;SOGDIAN COMBINING STROKE BELOW;Mn;220;NSM;;;;;N;;;;; +10F51;SOGDIAN NUMBER ONE;No;0;AL;;;;1;N;;;;; +10F52;SOGDIAN NUMBER TEN;No;0;AL;;;;10;N;;;;; +10F53;SOGDIAN NUMBER TWENTY;No;0;AL;;;;20;N;;;;; +10F54;SOGDIAN NUMBER ONE HUNDRED;No;0;AL;;;;100;N;;;;; +10F55;SOGDIAN PUNCTUATION TWO VERTICAL BARS;Po;0;AL;;;;;N;;;;; +10F56;SOGDIAN PUNCTUATION TWO VERTICAL BARS WITH DOTS;Po;0;AL;;;;;N;;;;; +10F57;SOGDIAN PUNCTUATION CIRCLE WITH DOT;Po;0;AL;;;;;N;;;;; +10F58;SOGDIAN PUNCTUATION TWO CIRCLES WITH DOTS;Po;0;AL;;;;;N;;;;; +10F59;SOGDIAN PUNCTUATION HALF CIRCLE WITH DOT;Po;0;AL;;;;;N;;;;; +10F70;OLD UYGHUR LETTER ALEPH;Lo;0;R;;;;;N;;;;; +10F71;OLD UYGHUR LETTER BETH;Lo;0;R;;;;;N;;;;; +10F72;OLD UYGHUR LETTER GIMEL-HETH;Lo;0;R;;;;;N;;;;; +10F73;OLD UYGHUR LETTER WAW;Lo;0;R;;;;;N;;;;; +10F74;OLD UYGHUR LETTER ZAYIN;Lo;0;R;;;;;N;;;;; +10F75;OLD UYGHUR LETTER FINAL HETH;Lo;0;R;;;;;N;;;;; +10F76;OLD UYGHUR LETTER YODH;Lo;0;R;;;;;N;;;;; +10F77;OLD UYGHUR LETTER KAPH;Lo;0;R;;;;;N;;;;; +10F78;OLD UYGHUR LETTER LAMEDH;Lo;0;R;;;;;N;;;;; +10F79;OLD UYGHUR LETTER MEM;Lo;0;R;;;;;N;;;;; +10F7A;OLD UYGHUR LETTER NUN;Lo;0;R;;;;;N;;;;; +10F7B;OLD UYGHUR LETTER SAMEKH;Lo;0;R;;;;;N;;;;; +10F7C;OLD UYGHUR LETTER PE;Lo;0;R;;;;;N;;;;; +10F7D;OLD UYGHUR LETTER SADHE;Lo;0;R;;;;;N;;;;; +10F7E;OLD UYGHUR LETTER RESH;Lo;0;R;;;;;N;;;;; +10F7F;OLD UYGHUR LETTER SHIN;Lo;0;R;;;;;N;;;;; +10F80;OLD UYGHUR LETTER TAW;Lo;0;R;;;;;N;;;;; +10F81;OLD UYGHUR LETTER LESH;Lo;0;R;;;;;N;;;;; +10F82;OLD UYGHUR COMBINING DOT ABOVE;Mn;230;NSM;;;;;N;;;;; +10F83;OLD UYGHUR COMBINING DOT BELOW;Mn;220;NSM;;;;;N;;;;; +10F84;OLD UYGHUR COMBINING TWO DOTS ABOVE;Mn;230;NSM;;;;;N;;;;; +10F85;OLD UYGHUR COMBINING TWO DOTS BELOW;Mn;220;NSM;;;;;N;;;;; +10F86;OLD UYGHUR PUNCTUATION BAR;Po;0;R;;;;;N;;;;; +10F87;OLD UYGHUR PUNCTUATION TWO BARS;Po;0;R;;;;;N;;;;; +10F88;OLD UYGHUR PUNCTUATION TWO DOTS;Po;0;R;;;;;N;;;;; +10F89;OLD UYGHUR PUNCTUATION FOUR DOTS;Po;0;R;;;;;N;;;;; +10FB0;CHORASMIAN LETTER ALEPH;Lo;0;R;;;;;N;;;;; +10FB1;CHORASMIAN LETTER SMALL ALEPH;Lo;0;R;;;;;N;;;;; +10FB2;CHORASMIAN LETTER BETH;Lo;0;R;;;;;N;;;;; +10FB3;CHORASMIAN LETTER GIMEL;Lo;0;R;;;;;N;;;;; +10FB4;CHORASMIAN LETTER DALETH;Lo;0;R;;;;;N;;;;; +10FB5;CHORASMIAN LETTER HE;Lo;0;R;;;;;N;;;;; +10FB6;CHORASMIAN LETTER WAW;Lo;0;R;;;;;N;;;;; +10FB7;CHORASMIAN LETTER CURLED WAW;Lo;0;R;;;;;N;;;;; +10FB8;CHORASMIAN LETTER ZAYIN;Lo;0;R;;;;;N;;;;; +10FB9;CHORASMIAN LETTER HETH;Lo;0;R;;;;;N;;;;; +10FBA;CHORASMIAN LETTER YODH;Lo;0;R;;;;;N;;;;; +10FBB;CHORASMIAN LETTER KAPH;Lo;0;R;;;;;N;;;;; +10FBC;CHORASMIAN LETTER LAMEDH;Lo;0;R;;;;;N;;;;; +10FBD;CHORASMIAN LETTER MEM;Lo;0;R;;;;;N;;;;; +10FBE;CHORASMIAN LETTER NUN;Lo;0;R;;;;;N;;;;; +10FBF;CHORASMIAN LETTER SAMEKH;Lo;0;R;;;;;N;;;;; +10FC0;CHORASMIAN LETTER AYIN;Lo;0;R;;;;;N;;;;; +10FC1;CHORASMIAN LETTER PE;Lo;0;R;;;;;N;;;;; +10FC2;CHORASMIAN LETTER RESH;Lo;0;R;;;;;N;;;;; +10FC3;CHORASMIAN LETTER SHIN;Lo;0;R;;;;;N;;;;; +10FC4;CHORASMIAN LETTER TAW;Lo;0;R;;;;;N;;;;; +10FC5;CHORASMIAN NUMBER ONE;No;0;R;;;;1;N;;;;; +10FC6;CHORASMIAN NUMBER TWO;No;0;R;;;;2;N;;;;; +10FC7;CHORASMIAN NUMBER THREE;No;0;R;;;;3;N;;;;; +10FC8;CHORASMIAN NUMBER FOUR;No;0;R;;;;4;N;;;;; +10FC9;CHORASMIAN NUMBER TEN;No;0;R;;;;10;N;;;;; +10FCA;CHORASMIAN NUMBER TWENTY;No;0;R;;;;20;N;;;;; +10FCB;CHORASMIAN NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;; +10FE0;ELYMAIC LETTER ALEPH;Lo;0;R;;;;;N;;;;; +10FE1;ELYMAIC LETTER BETH;Lo;0;R;;;;;N;;;;; +10FE2;ELYMAIC LETTER GIMEL;Lo;0;R;;;;;N;;;;; +10FE3;ELYMAIC LETTER DALETH;Lo;0;R;;;;;N;;;;; +10FE4;ELYMAIC LETTER HE;Lo;0;R;;;;;N;;;;; +10FE5;ELYMAIC LETTER WAW;Lo;0;R;;;;;N;;;;; +10FE6;ELYMAIC LETTER ZAYIN;Lo;0;R;;;;;N;;;;; +10FE7;ELYMAIC LETTER HETH;Lo;0;R;;;;;N;;;;; +10FE8;ELYMAIC LETTER TETH;Lo;0;R;;;;;N;;;;; +10FE9;ELYMAIC LETTER YODH;Lo;0;R;;;;;N;;;;; +10FEA;ELYMAIC LETTER KAPH;Lo;0;R;;;;;N;;;;; +10FEB;ELYMAIC LETTER LAMEDH;Lo;0;R;;;;;N;;;;; +10FEC;ELYMAIC LETTER MEM;Lo;0;R;;;;;N;;;;; +10FED;ELYMAIC LETTER NUN;Lo;0;R;;;;;N;;;;; +10FEE;ELYMAIC LETTER SAMEKH;Lo;0;R;;;;;N;;;;; +10FEF;ELYMAIC LETTER AYIN;Lo;0;R;;;;;N;;;;; +10FF0;ELYMAIC LETTER PE;Lo;0;R;;;;;N;;;;; +10FF1;ELYMAIC LETTER SADHE;Lo;0;R;;;;;N;;;;; +10FF2;ELYMAIC LETTER QOPH;Lo;0;R;;;;;N;;;;; +10FF3;ELYMAIC LETTER RESH;Lo;0;R;;;;;N;;;;; +10FF4;ELYMAIC LETTER SHIN;Lo;0;R;;;;;N;;;;; +10FF5;ELYMAIC LETTER TAW;Lo;0;R;;;;;N;;;;; +10FF6;ELYMAIC LIGATURE ZAYIN-YODH;Lo;0;R;;;;;N;;;;; +11000;BRAHMI SIGN CANDRABINDU;Mc;0;L;;;;;N;;;;; +11001;BRAHMI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;; +11002;BRAHMI SIGN VISARGA;Mc;0;L;;;;;N;;;;; +11003;BRAHMI SIGN JIHVAMULIYA;Lo;0;L;;;;;N;;;;; +11004;BRAHMI SIGN UPADHMANIYA;Lo;0;L;;;;;N;;;;; +11005;BRAHMI LETTER A;Lo;0;L;;;;;N;;;;; +11006;BRAHMI LETTER AA;Lo;0;L;;;;;N;;;;; +11007;BRAHMI LETTER I;Lo;0;L;;;;;N;;;;; +11008;BRAHMI LETTER II;Lo;0;L;;;;;N;;;;; +11009;BRAHMI LETTER U;Lo;0;L;;;;;N;;;;; +1100A;BRAHMI LETTER UU;Lo;0;L;;;;;N;;;;; +1100B;BRAHMI LETTER VOCALIC R;Lo;0;L;;;;;N;;;;; +1100C;BRAHMI LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;; +1100D;BRAHMI LETTER VOCALIC L;Lo;0;L;;;;;N;;;;; +1100E;BRAHMI LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;; +1100F;BRAHMI LETTER E;Lo;0;L;;;;;N;;;;; +11010;BRAHMI LETTER AI;Lo;0;L;;;;;N;;;;; +11011;BRAHMI LETTER O;Lo;0;L;;;;;N;;;;; +11012;BRAHMI LETTER AU;Lo;0;L;;;;;N;;;;; +11013;BRAHMI LETTER KA;Lo;0;L;;;;;N;;;;; +11014;BRAHMI LETTER KHA;Lo;0;L;;;;;N;;;;; +11015;BRAHMI LETTER GA;Lo;0;L;;;;;N;;;;; +11016;BRAHMI LETTER GHA;Lo;0;L;;;;;N;;;;; +11017;BRAHMI LETTER NGA;Lo;0;L;;;;;N;;;;; +11018;BRAHMI LETTER CA;Lo;0;L;;;;;N;;;;; +11019;BRAHMI LETTER CHA;Lo;0;L;;;;;N;;;;; +1101A;BRAHMI LETTER JA;Lo;0;L;;;;;N;;;;; +1101B;BRAHMI LETTER JHA;Lo;0;L;;;;;N;;;;; +1101C;BRAHMI LETTER NYA;Lo;0;L;;;;;N;;;;; +1101D;BRAHMI LETTER TTA;Lo;0;L;;;;;N;;;;; +1101E;BRAHMI LETTER TTHA;Lo;0;L;;;;;N;;;;; +1101F;BRAHMI LETTER DDA;Lo;0;L;;;;;N;;;;; +11020;BRAHMI LETTER DDHA;Lo;0;L;;;;;N;;;;; +11021;BRAHMI LETTER NNA;Lo;0;L;;;;;N;;;;; +11022;BRAHMI LETTER TA;Lo;0;L;;;;;N;;;;; +11023;BRAHMI LETTER THA;Lo;0;L;;;;;N;;;;; +11024;BRAHMI LETTER DA;Lo;0;L;;;;;N;;;;; +11025;BRAHMI LETTER DHA;Lo;0;L;;;;;N;;;;; +11026;BRAHMI LETTER NA;Lo;0;L;;;;;N;;;;; +11027;BRAHMI LETTER PA;Lo;0;L;;;;;N;;;;; +11028;BRAHMI LETTER PHA;Lo;0;L;;;;;N;;;;; +11029;BRAHMI LETTER BA;Lo;0;L;;;;;N;;;;; +1102A;BRAHMI LETTER BHA;Lo;0;L;;;;;N;;;;; +1102B;BRAHMI LETTER MA;Lo;0;L;;;;;N;;;;; +1102C;BRAHMI LETTER YA;Lo;0;L;;;;;N;;;;; +1102D;BRAHMI LETTER RA;Lo;0;L;;;;;N;;;;; +1102E;BRAHMI LETTER LA;Lo;0;L;;;;;N;;;;; +1102F;BRAHMI LETTER VA;Lo;0;L;;;;;N;;;;; +11030;BRAHMI LETTER SHA;Lo;0;L;;;;;N;;;;; +11031;BRAHMI LETTER SSA;Lo;0;L;;;;;N;;;;; +11032;BRAHMI LETTER SA;Lo;0;L;;;;;N;;;;; +11033;BRAHMI LETTER HA;Lo;0;L;;;;;N;;;;; +11034;BRAHMI LETTER LLA;Lo;0;L;;;;;N;;;;; +11035;BRAHMI LETTER OLD TAMIL LLLA;Lo;0;L;;;;;N;;;;; +11036;BRAHMI LETTER OLD TAMIL RRA;Lo;0;L;;;;;N;;;;; +11037;BRAHMI LETTER OLD TAMIL NNNA;Lo;0;L;;;;;N;;;;; +11038;BRAHMI VOWEL SIGN AA;Mn;0;NSM;;;;;N;;;;; +11039;BRAHMI VOWEL SIGN BHATTIPROLU AA;Mn;0;NSM;;;;;N;;;;; +1103A;BRAHMI VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;; +1103B;BRAHMI VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;; +1103C;BRAHMI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;; +1103D;BRAHMI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;; +1103E;BRAHMI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;; +1103F;BRAHMI VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;; +11040;BRAHMI VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;; +11041;BRAHMI VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;; +11042;BRAHMI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;; +11043;BRAHMI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;; +11044;BRAHMI VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;; +11045;BRAHMI VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;; +11046;BRAHMI VIRAMA;Mn;9;NSM;;;;;N;;;;; +11047;BRAHMI DANDA;Po;0;L;;;;;N;;;;; +11048;BRAHMI DOUBLE DANDA;Po;0;L;;;;;N;;;;; +11049;BRAHMI PUNCTUATION DOT;Po;0;L;;;;;N;;;;; +1104A;BRAHMI PUNCTUATION DOUBLE DOT;Po;0;L;;;;;N;;;;; +1104B;BRAHMI PUNCTUATION LINE;Po;0;L;;;;;N;;;;; +1104C;BRAHMI PUNCTUATION CRESCENT BAR;Po;0;L;;;;;N;;;;; +1104D;BRAHMI PUNCTUATION LOTUS;Po;0;L;;;;;N;;;;; +11052;BRAHMI NUMBER ONE;No;0;ON;;;1;1;N;;;;; +11053;BRAHMI NUMBER TWO;No;0;ON;;;2;2;N;;;;; +11054;BRAHMI NUMBER THREE;No;0;ON;;;3;3;N;;;;; +11055;BRAHMI NUMBER FOUR;No;0;ON;;;4;4;N;;;;; +11056;BRAHMI NUMBER FIVE;No;0;ON;;;5;5;N;;;;; +11057;BRAHMI NUMBER SIX;No;0;ON;;;6;6;N;;;;; +11058;BRAHMI NUMBER SEVEN;No;0;ON;;;7;7;N;;;;; +11059;BRAHMI NUMBER EIGHT;No;0;ON;;;8;8;N;;;;; +1105A;BRAHMI NUMBER NINE;No;0;ON;;;9;9;N;;;;; +1105B;BRAHMI NUMBER TEN;No;0;ON;;;;10;N;;;;; +1105C;BRAHMI NUMBER TWENTY;No;0;ON;;;;20;N;;;;; +1105D;BRAHMI NUMBER THIRTY;No;0;ON;;;;30;N;;;;; +1105E;BRAHMI NUMBER FORTY;No;0;ON;;;;40;N;;;;; +1105F;BRAHMI NUMBER FIFTY;No;0;ON;;;;50;N;;;;; +11060;BRAHMI NUMBER SIXTY;No;0;ON;;;;60;N;;;;; +11061;BRAHMI NUMBER SEVENTY;No;0;ON;;;;70;N;;;;; +11062;BRAHMI NUMBER EIGHTY;No;0;ON;;;;80;N;;;;; +11063;BRAHMI NUMBER NINETY;No;0;ON;;;;90;N;;;;; +11064;BRAHMI NUMBER ONE HUNDRED;No;0;ON;;;;100;N;;;;; +11065;BRAHMI NUMBER ONE THOUSAND;No;0;ON;;;;1000;N;;;;; +11066;BRAHMI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +11067;BRAHMI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +11068;BRAHMI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +11069;BRAHMI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +1106A;BRAHMI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +1106B;BRAHMI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +1106C;BRAHMI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +1106D;BRAHMI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +1106E;BRAHMI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +1106F;BRAHMI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +11070;BRAHMI SIGN OLD TAMIL VIRAMA;Mn;9;NSM;;;;;N;;;;; +11071;BRAHMI LETTER OLD TAMIL SHORT E;Lo;0;L;;;;;N;;;;; +11072;BRAHMI LETTER OLD TAMIL SHORT O;Lo;0;L;;;;;N;;;;; +11073;BRAHMI VOWEL SIGN OLD TAMIL SHORT E;Mn;0;NSM;;;;;N;;;;; +11074;BRAHMI VOWEL SIGN OLD TAMIL SHORT O;Mn;0;NSM;;;;;N;;;;; +11075;BRAHMI LETTER OLD TAMIL LLA;Lo;0;L;;;;;N;;;;; +1107F;BRAHMI NUMBER JOINER;Mn;9;NSM;;;;;N;;;;; +11080;KAITHI SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;; +11081;KAITHI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;; +11082;KAITHI SIGN VISARGA;Mc;0;L;;;;;N;;;;; +11083;KAITHI LETTER A;Lo;0;L;;;;;N;;;;; +11084;KAITHI LETTER AA;Lo;0;L;;;;;N;;;;; +11085;KAITHI LETTER I;Lo;0;L;;;;;N;;;;; +11086;KAITHI LETTER II;Lo;0;L;;;;;N;;;;; +11087;KAITHI LETTER U;Lo;0;L;;;;;N;;;;; +11088;KAITHI LETTER UU;Lo;0;L;;;;;N;;;;; +11089;KAITHI LETTER E;Lo;0;L;;;;;N;;;;; +1108A;KAITHI LETTER AI;Lo;0;L;;;;;N;;;;; +1108B;KAITHI LETTER O;Lo;0;L;;;;;N;;;;; +1108C;KAITHI LETTER AU;Lo;0;L;;;;;N;;;;; +1108D;KAITHI LETTER KA;Lo;0;L;;;;;N;;;;; +1108E;KAITHI LETTER KHA;Lo;0;L;;;;;N;;;;; +1108F;KAITHI LETTER GA;Lo;0;L;;;;;N;;;;; +11090;KAITHI LETTER GHA;Lo;0;L;;;;;N;;;;; +11091;KAITHI LETTER NGA;Lo;0;L;;;;;N;;;;; +11092;KAITHI LETTER CA;Lo;0;L;;;;;N;;;;; +11093;KAITHI LETTER CHA;Lo;0;L;;;;;N;;;;; +11094;KAITHI LETTER JA;Lo;0;L;;;;;N;;;;; +11095;KAITHI LETTER JHA;Lo;0;L;;;;;N;;;;; +11096;KAITHI LETTER NYA;Lo;0;L;;;;;N;;;;; +11097;KAITHI LETTER TTA;Lo;0;L;;;;;N;;;;; +11098;KAITHI LETTER TTHA;Lo;0;L;;;;;N;;;;; +11099;KAITHI LETTER DDA;Lo;0;L;;;;;N;;;;; +1109A;KAITHI LETTER DDDHA;Lo;0;L;11099 110BA;;;;N;;;;; +1109B;KAITHI LETTER DDHA;Lo;0;L;;;;;N;;;;; +1109C;KAITHI LETTER RHA;Lo;0;L;1109B 110BA;;;;N;;;;; +1109D;KAITHI LETTER NNA;Lo;0;L;;;;;N;;;;; +1109E;KAITHI LETTER TA;Lo;0;L;;;;;N;;;;; +1109F;KAITHI LETTER THA;Lo;0;L;;;;;N;;;;; +110A0;KAITHI LETTER DA;Lo;0;L;;;;;N;;;;; +110A1;KAITHI LETTER DHA;Lo;0;L;;;;;N;;;;; +110A2;KAITHI LETTER NA;Lo;0;L;;;;;N;;;;; +110A3;KAITHI LETTER PA;Lo;0;L;;;;;N;;;;; +110A4;KAITHI LETTER PHA;Lo;0;L;;;;;N;;;;; +110A5;KAITHI LETTER BA;Lo;0;L;;;;;N;;;;; +110A6;KAITHI LETTER BHA;Lo;0;L;;;;;N;;;;; +110A7;KAITHI LETTER MA;Lo;0;L;;;;;N;;;;; +110A8;KAITHI LETTER YA;Lo;0;L;;;;;N;;;;; +110A9;KAITHI LETTER RA;Lo;0;L;;;;;N;;;;; +110AA;KAITHI LETTER LA;Lo;0;L;;;;;N;;;;; +110AB;KAITHI LETTER VA;Lo;0;L;110A5 110BA;;;;N;;;;; +110AC;KAITHI LETTER SHA;Lo;0;L;;;;;N;;;;; +110AD;KAITHI LETTER SSA;Lo;0;L;;;;;N;;;;; +110AE;KAITHI LETTER SA;Lo;0;L;;;;;N;;;;; +110AF;KAITHI LETTER HA;Lo;0;L;;;;;N;;;;; +110B0;KAITHI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;; +110B1;KAITHI VOWEL SIGN I;Mc;0;L;;;;;N;;;;; +110B2;KAITHI VOWEL SIGN II;Mc;0;L;;;;;N;;;;; +110B3;KAITHI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;; +110B4;KAITHI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;; +110B5;KAITHI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;; +110B6;KAITHI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;; +110B7;KAITHI VOWEL SIGN O;Mc;0;L;;;;;N;;;;; +110B8;KAITHI VOWEL SIGN AU;Mc;0;L;;;;;N;;;;; +110B9;KAITHI SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;; +110BA;KAITHI SIGN NUKTA;Mn;7;NSM;;;;;N;;;;; +110BB;KAITHI ABBREVIATION SIGN;Po;0;L;;;;;N;;;;; +110BC;KAITHI ENUMERATION SIGN;Po;0;L;;;;;N;;;;; +110BD;KAITHI NUMBER SIGN;Cf;0;L;;;;;N;;;;; +110BE;KAITHI SECTION MARK;Po;0;L;;;;;N;;;;; +110BF;KAITHI DOUBLE SECTION MARK;Po;0;L;;;;;N;;;;; +110C0;KAITHI DANDA;Po;0;L;;;;;N;;;;; +110C1;KAITHI DOUBLE DANDA;Po;0;L;;;;;N;;;;; +110C2;KAITHI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;; +110CD;KAITHI NUMBER SIGN ABOVE;Cf;0;L;;;;;N;;;;; +110D0;SORA SOMPENG LETTER SAH;Lo;0;L;;;;;N;;;;; +110D1;SORA SOMPENG LETTER TAH;Lo;0;L;;;;;N;;;;; +110D2;SORA SOMPENG LETTER BAH;Lo;0;L;;;;;N;;;;; +110D3;SORA SOMPENG LETTER CAH;Lo;0;L;;;;;N;;;;; +110D4;SORA SOMPENG LETTER DAH;Lo;0;L;;;;;N;;;;; +110D5;SORA SOMPENG LETTER GAH;Lo;0;L;;;;;N;;;;; +110D6;SORA SOMPENG LETTER MAH;Lo;0;L;;;;;N;;;;; +110D7;SORA SOMPENG LETTER NGAH;Lo;0;L;;;;;N;;;;; +110D8;SORA SOMPENG LETTER LAH;Lo;0;L;;;;;N;;;;; +110D9;SORA SOMPENG LETTER NAH;Lo;0;L;;;;;N;;;;; +110DA;SORA SOMPENG LETTER VAH;Lo;0;L;;;;;N;;;;; +110DB;SORA SOMPENG LETTER PAH;Lo;0;L;;;;;N;;;;; +110DC;SORA SOMPENG LETTER YAH;Lo;0;L;;;;;N;;;;; +110DD;SORA SOMPENG LETTER RAH;Lo;0;L;;;;;N;;;;; +110DE;SORA SOMPENG LETTER HAH;Lo;0;L;;;;;N;;;;; +110DF;SORA SOMPENG LETTER KAH;Lo;0;L;;;;;N;;;;; +110E0;SORA SOMPENG LETTER JAH;Lo;0;L;;;;;N;;;;; +110E1;SORA SOMPENG LETTER NYAH;Lo;0;L;;;;;N;;;;; +110E2;SORA SOMPENG LETTER AH;Lo;0;L;;;;;N;;;;; +110E3;SORA SOMPENG LETTER EEH;Lo;0;L;;;;;N;;;;; +110E4;SORA SOMPENG LETTER IH;Lo;0;L;;;;;N;;;;; +110E5;SORA SOMPENG LETTER UH;Lo;0;L;;;;;N;;;;; +110E6;SORA SOMPENG LETTER OH;Lo;0;L;;;;;N;;;;; +110E7;SORA SOMPENG LETTER EH;Lo;0;L;;;;;N;;;;; +110E8;SORA SOMPENG LETTER MAE;Lo;0;L;;;;;N;;;;; +110F0;SORA SOMPENG DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +110F1;SORA SOMPENG DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +110F2;SORA SOMPENG DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +110F3;SORA SOMPENG DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +110F4;SORA SOMPENG DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +110F5;SORA SOMPENG DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +110F6;SORA SOMPENG DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +110F7;SORA SOMPENG DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +110F8;SORA SOMPENG DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +110F9;SORA SOMPENG DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +11100;CHAKMA SIGN CANDRABINDU;Mn;230;NSM;;;;;N;;;;; +11101;CHAKMA SIGN ANUSVARA;Mn;230;NSM;;;;;N;;;;; +11102;CHAKMA SIGN VISARGA;Mn;230;NSM;;;;;N;;;;; +11103;CHAKMA LETTER AA;Lo;0;L;;;;;N;;;;; +11104;CHAKMA LETTER I;Lo;0;L;;;;;N;;;;; +11105;CHAKMA LETTER U;Lo;0;L;;;;;N;;;;; +11106;CHAKMA LETTER E;Lo;0;L;;;;;N;;;;; +11107;CHAKMA LETTER KAA;Lo;0;L;;;;;N;;;;; +11108;CHAKMA LETTER KHAA;Lo;0;L;;;;;N;;;;; +11109;CHAKMA LETTER GAA;Lo;0;L;;;;;N;;;;; +1110A;CHAKMA LETTER GHAA;Lo;0;L;;;;;N;;;;; +1110B;CHAKMA LETTER NGAA;Lo;0;L;;;;;N;;;;; +1110C;CHAKMA LETTER CAA;Lo;0;L;;;;;N;;;;; +1110D;CHAKMA LETTER CHAA;Lo;0;L;;;;;N;;;;; +1110E;CHAKMA LETTER JAA;Lo;0;L;;;;;N;;;;; +1110F;CHAKMA LETTER JHAA;Lo;0;L;;;;;N;;;;; +11110;CHAKMA LETTER NYAA;Lo;0;L;;;;;N;;;;; +11111;CHAKMA LETTER TTAA;Lo;0;L;;;;;N;;;;; +11112;CHAKMA LETTER TTHAA;Lo;0;L;;;;;N;;;;; +11113;CHAKMA LETTER DDAA;Lo;0;L;;;;;N;;;;; +11114;CHAKMA LETTER DDHAA;Lo;0;L;;;;;N;;;;; +11115;CHAKMA LETTER NNAA;Lo;0;L;;;;;N;;;;; +11116;CHAKMA LETTER TAA;Lo;0;L;;;;;N;;;;; +11117;CHAKMA LETTER THAA;Lo;0;L;;;;;N;;;;; +11118;CHAKMA LETTER DAA;Lo;0;L;;;;;N;;;;; +11119;CHAKMA LETTER DHAA;Lo;0;L;;;;;N;;;;; +1111A;CHAKMA LETTER NAA;Lo;0;L;;;;;N;;;;; +1111B;CHAKMA LETTER PAA;Lo;0;L;;;;;N;;;;; +1111C;CHAKMA LETTER PHAA;Lo;0;L;;;;;N;;;;; +1111D;CHAKMA LETTER BAA;Lo;0;L;;;;;N;;;;; +1111E;CHAKMA LETTER BHAA;Lo;0;L;;;;;N;;;;; +1111F;CHAKMA LETTER MAA;Lo;0;L;;;;;N;;;;; +11120;CHAKMA LETTER YYAA;Lo;0;L;;;;;N;;;;; +11121;CHAKMA LETTER YAA;Lo;0;L;;;;;N;;;;; +11122;CHAKMA LETTER RAA;Lo;0;L;;;;;N;;;;; +11123;CHAKMA LETTER LAA;Lo;0;L;;;;;N;;;;; +11124;CHAKMA LETTER WAA;Lo;0;L;;;;;N;;;;; +11125;CHAKMA LETTER SAA;Lo;0;L;;;;;N;;;;; +11126;CHAKMA LETTER HAA;Lo;0;L;;;;;N;;;;; +11127;CHAKMA VOWEL SIGN A;Mn;0;NSM;;;;;N;;;;; +11128;CHAKMA VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;; +11129;CHAKMA VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;; +1112A;CHAKMA VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;; +1112B;CHAKMA VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;; +1112C;CHAKMA VOWEL SIGN E;Mc;0;L;;;;;N;;;;; +1112D;CHAKMA VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;; +1112E;CHAKMA VOWEL SIGN O;Mn;0;NSM;11131 11127;;;;N;;;;; +1112F;CHAKMA VOWEL SIGN AU;Mn;0;NSM;11132 11127;;;;N;;;;; +11130;CHAKMA VOWEL SIGN OI;Mn;0;NSM;;;;;N;;;;; +11131;CHAKMA O MARK;Mn;0;NSM;;;;;N;;;;; +11132;CHAKMA AU MARK;Mn;0;NSM;;;;;N;;;;; +11133;CHAKMA VIRAMA;Mn;9;NSM;;;;;N;;;;; +11134;CHAKMA MAAYYAA;Mn;9;NSM;;;;;N;;;;; +11136;CHAKMA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +11137;CHAKMA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +11138;CHAKMA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +11139;CHAKMA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +1113A;CHAKMA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +1113B;CHAKMA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +1113C;CHAKMA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +1113D;CHAKMA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +1113E;CHAKMA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +1113F;CHAKMA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +11140;CHAKMA SECTION MARK;Po;0;L;;;;;N;;;;; +11141;CHAKMA DANDA;Po;0;L;;;;;N;;;;; +11142;CHAKMA DOUBLE DANDA;Po;0;L;;;;;N;;;;; +11143;CHAKMA QUESTION MARK;Po;0;L;;;;;N;;;;; +11144;CHAKMA LETTER LHAA;Lo;0;L;;;;;N;;;;; +11145;CHAKMA VOWEL SIGN AA;Mc;0;L;;;;;N;;;;; +11146;CHAKMA VOWEL SIGN EI;Mc;0;L;;;;;N;;;;; +11147;CHAKMA LETTER VAA;Lo;0;L;;;;;N;;;;; +11150;MAHAJANI LETTER A;Lo;0;L;;;;;N;;;;; +11151;MAHAJANI LETTER I;Lo;0;L;;;;;N;;;;; +11152;MAHAJANI LETTER U;Lo;0;L;;;;;N;;;;; +11153;MAHAJANI LETTER E;Lo;0;L;;;;;N;;;;; +11154;MAHAJANI LETTER O;Lo;0;L;;;;;N;;;;; +11155;MAHAJANI LETTER KA;Lo;0;L;;;;;N;;;;; +11156;MAHAJANI LETTER KHA;Lo;0;L;;;;;N;;;;; +11157;MAHAJANI LETTER GA;Lo;0;L;;;;;N;;;;; +11158;MAHAJANI LETTER GHA;Lo;0;L;;;;;N;;;;; +11159;MAHAJANI LETTER CA;Lo;0;L;;;;;N;;;;; +1115A;MAHAJANI LETTER CHA;Lo;0;L;;;;;N;;;;; +1115B;MAHAJANI LETTER JA;Lo;0;L;;;;;N;;;;; +1115C;MAHAJANI LETTER JHA;Lo;0;L;;;;;N;;;;; +1115D;MAHAJANI LETTER NYA;Lo;0;L;;;;;N;;;;; +1115E;MAHAJANI LETTER TTA;Lo;0;L;;;;;N;;;;; +1115F;MAHAJANI LETTER TTHA;Lo;0;L;;;;;N;;;;; +11160;MAHAJANI LETTER DDA;Lo;0;L;;;;;N;;;;; +11161;MAHAJANI LETTER DDHA;Lo;0;L;;;;;N;;;;; +11162;MAHAJANI LETTER NNA;Lo;0;L;;;;;N;;;;; +11163;MAHAJANI LETTER TA;Lo;0;L;;;;;N;;;;; +11164;MAHAJANI LETTER THA;Lo;0;L;;;;;N;;;;; +11165;MAHAJANI LETTER DA;Lo;0;L;;;;;N;;;;; +11166;MAHAJANI LETTER DHA;Lo;0;L;;;;;N;;;;; +11167;MAHAJANI LETTER NA;Lo;0;L;;;;;N;;;;; +11168;MAHAJANI LETTER PA;Lo;0;L;;;;;N;;;;; +11169;MAHAJANI LETTER PHA;Lo;0;L;;;;;N;;;;; +1116A;MAHAJANI LETTER BA;Lo;0;L;;;;;N;;;;; +1116B;MAHAJANI LETTER BHA;Lo;0;L;;;;;N;;;;; +1116C;MAHAJANI LETTER MA;Lo;0;L;;;;;N;;;;; +1116D;MAHAJANI LETTER RA;Lo;0;L;;;;;N;;;;; +1116E;MAHAJANI LETTER LA;Lo;0;L;;;;;N;;;;; +1116F;MAHAJANI LETTER VA;Lo;0;L;;;;;N;;;;; +11170;MAHAJANI LETTER SA;Lo;0;L;;;;;N;;;;; +11171;MAHAJANI LETTER HA;Lo;0;L;;;;;N;;;;; +11172;MAHAJANI LETTER RRA;Lo;0;L;;;;;N;;;;; +11173;MAHAJANI SIGN NUKTA;Mn;7;NSM;;;;;N;;;;; +11174;MAHAJANI ABBREVIATION SIGN;Po;0;L;;;;;N;;;;; +11175;MAHAJANI SECTION MARK;Po;0;L;;;;;N;;;;; +11176;MAHAJANI LIGATURE SHRI;Lo;0;L;;;;;N;;;;; +11180;SHARADA SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;; +11181;SHARADA SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;; +11182;SHARADA SIGN VISARGA;Mc;0;L;;;;;N;;;;; +11183;SHARADA LETTER A;Lo;0;L;;;;;N;;;;; +11184;SHARADA LETTER AA;Lo;0;L;;;;;N;;;;; +11185;SHARADA LETTER I;Lo;0;L;;;;;N;;;;; +11186;SHARADA LETTER II;Lo;0;L;;;;;N;;;;; +11187;SHARADA LETTER U;Lo;0;L;;;;;N;;;;; +11188;SHARADA LETTER UU;Lo;0;L;;;;;N;;;;; +11189;SHARADA LETTER VOCALIC R;Lo;0;L;;;;;N;;;;; +1118A;SHARADA LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;; +1118B;SHARADA LETTER VOCALIC L;Lo;0;L;;;;;N;;;;; +1118C;SHARADA LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;; +1118D;SHARADA LETTER E;Lo;0;L;;;;;N;;;;; +1118E;SHARADA LETTER AI;Lo;0;L;;;;;N;;;;; +1118F;SHARADA LETTER O;Lo;0;L;;;;;N;;;;; +11190;SHARADA LETTER AU;Lo;0;L;;;;;N;;;;; +11191;SHARADA LETTER KA;Lo;0;L;;;;;N;;;;; +11192;SHARADA LETTER KHA;Lo;0;L;;;;;N;;;;; +11193;SHARADA LETTER GA;Lo;0;L;;;;;N;;;;; +11194;SHARADA LETTER GHA;Lo;0;L;;;;;N;;;;; +11195;SHARADA LETTER NGA;Lo;0;L;;;;;N;;;;; +11196;SHARADA LETTER CA;Lo;0;L;;;;;N;;;;; +11197;SHARADA LETTER CHA;Lo;0;L;;;;;N;;;;; +11198;SHARADA LETTER JA;Lo;0;L;;;;;N;;;;; +11199;SHARADA LETTER JHA;Lo;0;L;;;;;N;;;;; +1119A;SHARADA LETTER NYA;Lo;0;L;;;;;N;;;;; +1119B;SHARADA LETTER TTA;Lo;0;L;;;;;N;;;;; +1119C;SHARADA LETTER TTHA;Lo;0;L;;;;;N;;;;; +1119D;SHARADA LETTER DDA;Lo;0;L;;;;;N;;;;; +1119E;SHARADA LETTER DDHA;Lo;0;L;;;;;N;;;;; +1119F;SHARADA LETTER NNA;Lo;0;L;;;;;N;;;;; +111A0;SHARADA LETTER TA;Lo;0;L;;;;;N;;;;; +111A1;SHARADA LETTER THA;Lo;0;L;;;;;N;;;;; +111A2;SHARADA LETTER DA;Lo;0;L;;;;;N;;;;; +111A3;SHARADA LETTER DHA;Lo;0;L;;;;;N;;;;; +111A4;SHARADA LETTER NA;Lo;0;L;;;;;N;;;;; +111A5;SHARADA LETTER PA;Lo;0;L;;;;;N;;;;; +111A6;SHARADA LETTER PHA;Lo;0;L;;;;;N;;;;; +111A7;SHARADA LETTER BA;Lo;0;L;;;;;N;;;;; +111A8;SHARADA LETTER BHA;Lo;0;L;;;;;N;;;;; +111A9;SHARADA LETTER MA;Lo;0;L;;;;;N;;;;; +111AA;SHARADA LETTER YA;Lo;0;L;;;;;N;;;;; +111AB;SHARADA LETTER RA;Lo;0;L;;;;;N;;;;; +111AC;SHARADA LETTER LA;Lo;0;L;;;;;N;;;;; +111AD;SHARADA LETTER LLA;Lo;0;L;;;;;N;;;;; +111AE;SHARADA LETTER VA;Lo;0;L;;;;;N;;;;; +111AF;SHARADA LETTER SHA;Lo;0;L;;;;;N;;;;; +111B0;SHARADA LETTER SSA;Lo;0;L;;;;;N;;;;; +111B1;SHARADA LETTER SA;Lo;0;L;;;;;N;;;;; +111B2;SHARADA LETTER HA;Lo;0;L;;;;;N;;;;; +111B3;SHARADA VOWEL SIGN AA;Mc;0;L;;;;;N;;;;; +111B4;SHARADA VOWEL SIGN I;Mc;0;L;;;;;N;;;;; +111B5;SHARADA VOWEL SIGN II;Mc;0;L;;;;;N;;;;; +111B6;SHARADA VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;; +111B7;SHARADA VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;; +111B8;SHARADA VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;; +111B9;SHARADA VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;; +111BA;SHARADA VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;; +111BB;SHARADA VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;; +111BC;SHARADA VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;; +111BD;SHARADA VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;; +111BE;SHARADA VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;; +111BF;SHARADA VOWEL SIGN AU;Mc;0;L;;;;;N;;;;; +111C0;SHARADA SIGN VIRAMA;Mc;9;L;;;;;N;;;;; +111C1;SHARADA SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;; +111C2;SHARADA SIGN JIHVAMULIYA;Lo;0;L;;;;;N;;;;; +111C3;SHARADA SIGN UPADHMANIYA;Lo;0;L;;;;;N;;;;; +111C4;SHARADA OM;Lo;0;L;;;;;N;;;;; +111C5;SHARADA DANDA;Po;0;L;;;;;N;;;;; +111C6;SHARADA DOUBLE DANDA;Po;0;L;;;;;N;;;;; +111C7;SHARADA ABBREVIATION SIGN;Po;0;L;;;;;N;;;;; +111C8;SHARADA SEPARATOR;Po;0;L;;;;;N;;;;; +111C9;SHARADA SANDHI MARK;Mn;0;NSM;;;;;N;;;;; +111CA;SHARADA SIGN NUKTA;Mn;7;NSM;;;;;N;;;;; +111CB;SHARADA VOWEL MODIFIER MARK;Mn;0;NSM;;;;;N;;;;; +111CC;SHARADA EXTRA SHORT VOWEL MARK;Mn;0;NSM;;;;;N;;;;; +111CD;SHARADA SUTRA MARK;Po;0;L;;;;;N;;;;; +111CE;SHARADA VOWEL SIGN PRISHTHAMATRA E;Mc;0;L;;;;;N;;;;; +111CF;SHARADA SIGN INVERTED CANDRABINDU;Mn;0;NSM;;;;;N;;;;; +111D0;SHARADA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +111D1;SHARADA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +111D2;SHARADA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +111D3;SHARADA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +111D4;SHARADA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +111D5;SHARADA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +111D6;SHARADA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +111D7;SHARADA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +111D8;SHARADA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +111D9;SHARADA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +111DA;SHARADA EKAM;Lo;0;L;;;;;N;;;;; +111DB;SHARADA SIGN SIDDHAM;Po;0;L;;;;;N;;;;; +111DC;SHARADA HEADSTROKE;Lo;0;L;;;;;N;;;;; +111DD;SHARADA CONTINUATION SIGN;Po;0;L;;;;;N;;;;; +111DE;SHARADA SECTION MARK-1;Po;0;L;;;;;N;;;;; +111DF;SHARADA SECTION MARK-2;Po;0;L;;;;;N;;;;; +111E1;SINHALA ARCHAIC DIGIT ONE;No;0;L;;;;1;N;;;;; +111E2;SINHALA ARCHAIC DIGIT TWO;No;0;L;;;;2;N;;;;; +111E3;SINHALA ARCHAIC DIGIT THREE;No;0;L;;;;3;N;;;;; +111E4;SINHALA ARCHAIC DIGIT FOUR;No;0;L;;;;4;N;;;;; +111E5;SINHALA ARCHAIC DIGIT FIVE;No;0;L;;;;5;N;;;;; +111E6;SINHALA ARCHAIC DIGIT SIX;No;0;L;;;;6;N;;;;; +111E7;SINHALA ARCHAIC DIGIT SEVEN;No;0;L;;;;7;N;;;;; +111E8;SINHALA ARCHAIC DIGIT EIGHT;No;0;L;;;;8;N;;;;; +111E9;SINHALA ARCHAIC DIGIT NINE;No;0;L;;;;9;N;;;;; +111EA;SINHALA ARCHAIC NUMBER TEN;No;0;L;;;;10;N;;;;; +111EB;SINHALA ARCHAIC NUMBER TWENTY;No;0;L;;;;20;N;;;;; +111EC;SINHALA ARCHAIC NUMBER THIRTY;No;0;L;;;;30;N;;;;; +111ED;SINHALA ARCHAIC NUMBER FORTY;No;0;L;;;;40;N;;;;; +111EE;SINHALA ARCHAIC NUMBER FIFTY;No;0;L;;;;50;N;;;;; +111EF;SINHALA ARCHAIC NUMBER SIXTY;No;0;L;;;;60;N;;;;; +111F0;SINHALA ARCHAIC NUMBER SEVENTY;No;0;L;;;;70;N;;;;; +111F1;SINHALA ARCHAIC NUMBER EIGHTY;No;0;L;;;;80;N;;;;; +111F2;SINHALA ARCHAIC NUMBER NINETY;No;0;L;;;;90;N;;;;; +111F3;SINHALA ARCHAIC NUMBER ONE HUNDRED;No;0;L;;;;100;N;;;;; +111F4;SINHALA ARCHAIC NUMBER ONE THOUSAND;No;0;L;;;;1000;N;;;;; +11200;KHOJKI LETTER A;Lo;0;L;;;;;N;;;;; +11201;KHOJKI LETTER AA;Lo;0;L;;;;;N;;;;; +11202;KHOJKI LETTER I;Lo;0;L;;;;;N;;;;; +11203;KHOJKI LETTER U;Lo;0;L;;;;;N;;;;; +11204;KHOJKI LETTER E;Lo;0;L;;;;;N;;;;; +11205;KHOJKI LETTER AI;Lo;0;L;;;;;N;;;;; +11206;KHOJKI LETTER O;Lo;0;L;;;;;N;;;;; +11207;KHOJKI LETTER AU;Lo;0;L;;;;;N;;;;; +11208;KHOJKI LETTER KA;Lo;0;L;;;;;N;;;;; +11209;KHOJKI LETTER KHA;Lo;0;L;;;;;N;;;;; +1120A;KHOJKI LETTER GA;Lo;0;L;;;;;N;;;;; +1120B;KHOJKI LETTER GGA;Lo;0;L;;;;;N;;;;; +1120C;KHOJKI LETTER GHA;Lo;0;L;;;;;N;;;;; +1120D;KHOJKI LETTER NGA;Lo;0;L;;;;;N;;;;; +1120E;KHOJKI LETTER CA;Lo;0;L;;;;;N;;;;; +1120F;KHOJKI LETTER CHA;Lo;0;L;;;;;N;;;;; +11210;KHOJKI LETTER JA;Lo;0;L;;;;;N;;;;; +11211;KHOJKI LETTER JJA;Lo;0;L;;;;;N;;;;; +11213;KHOJKI LETTER NYA;Lo;0;L;;;;;N;;;;; +11214;KHOJKI LETTER TTA;Lo;0;L;;;;;N;;;;; +11215;KHOJKI LETTER TTHA;Lo;0;L;;;;;N;;;;; +11216;KHOJKI LETTER DDA;Lo;0;L;;;;;N;;;;; +11217;KHOJKI LETTER DDHA;Lo;0;L;;;;;N;;;;; +11218;KHOJKI LETTER NNA;Lo;0;L;;;;;N;;;;; +11219;KHOJKI LETTER TA;Lo;0;L;;;;;N;;;;; +1121A;KHOJKI LETTER THA;Lo;0;L;;;;;N;;;;; +1121B;KHOJKI LETTER DA;Lo;0;L;;;;;N;;;;; +1121C;KHOJKI LETTER DDDA;Lo;0;L;;;;;N;;;;; +1121D;KHOJKI LETTER DHA;Lo;0;L;;;;;N;;;;; +1121E;KHOJKI LETTER NA;Lo;0;L;;;;;N;;;;; +1121F;KHOJKI LETTER PA;Lo;0;L;;;;;N;;;;; +11220;KHOJKI LETTER PHA;Lo;0;L;;;;;N;;;;; +11221;KHOJKI LETTER BA;Lo;0;L;;;;;N;;;;; +11222;KHOJKI LETTER BBA;Lo;0;L;;;;;N;;;;; +11223;KHOJKI LETTER BHA;Lo;0;L;;;;;N;;;;; +11224;KHOJKI LETTER MA;Lo;0;L;;;;;N;;;;; +11225;KHOJKI LETTER YA;Lo;0;L;;;;;N;;;;; +11226;KHOJKI LETTER RA;Lo;0;L;;;;;N;;;;; +11227;KHOJKI LETTER LA;Lo;0;L;;;;;N;;;;; +11228;KHOJKI LETTER VA;Lo;0;L;;;;;N;;;;; +11229;KHOJKI LETTER SA;Lo;0;L;;;;;N;;;;; +1122A;KHOJKI LETTER HA;Lo;0;L;;;;;N;;;;; +1122B;KHOJKI LETTER LLA;Lo;0;L;;;;;N;;;;; +1122C;KHOJKI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;; +1122D;KHOJKI VOWEL SIGN I;Mc;0;L;;;;;N;;;;; +1122E;KHOJKI VOWEL SIGN II;Mc;0;L;;;;;N;;;;; +1122F;KHOJKI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;; +11230;KHOJKI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;; +11231;KHOJKI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;; +11232;KHOJKI VOWEL SIGN O;Mc;0;L;;;;;N;;;;; +11233;KHOJKI VOWEL SIGN AU;Mc;0;L;;;;;N;;;;; +11234;KHOJKI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;; +11235;KHOJKI SIGN VIRAMA;Mc;9;L;;;;;N;;;;; +11236;KHOJKI SIGN NUKTA;Mn;7;NSM;;;;;N;;;;; +11237;KHOJKI SIGN SHADDA;Mn;0;NSM;;;;;N;;;;; +11238;KHOJKI DANDA;Po;0;L;;;;;N;;;;; +11239;KHOJKI DOUBLE DANDA;Po;0;L;;;;;N;;;;; +1123A;KHOJKI WORD SEPARATOR;Po;0;L;;;;;N;;;;; +1123B;KHOJKI SECTION MARK;Po;0;L;;;;;N;;;;; +1123C;KHOJKI DOUBLE SECTION MARK;Po;0;L;;;;;N;;;;; +1123D;KHOJKI ABBREVIATION SIGN;Po;0;L;;;;;N;;;;; +1123E;KHOJKI SIGN SUKUN;Mn;0;NSM;;;;;N;;;;; +1123F;KHOJKI LETTER QA;Lo;0;L;;;;;N;;;;; +11240;KHOJKI LETTER SHORT I;Lo;0;L;;;;;N;;;;; +11241;KHOJKI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;; +11280;MULTANI LETTER A;Lo;0;L;;;;;N;;;;; +11281;MULTANI LETTER I;Lo;0;L;;;;;N;;;;; +11282;MULTANI LETTER U;Lo;0;L;;;;;N;;;;; +11283;MULTANI LETTER E;Lo;0;L;;;;;N;;;;; +11284;MULTANI LETTER KA;Lo;0;L;;;;;N;;;;; +11285;MULTANI LETTER KHA;Lo;0;L;;;;;N;;;;; +11286;MULTANI LETTER GA;Lo;0;L;;;;;N;;;;; +11288;MULTANI LETTER GHA;Lo;0;L;;;;;N;;;;; +1128A;MULTANI LETTER CA;Lo;0;L;;;;;N;;;;; +1128B;MULTANI LETTER CHA;Lo;0;L;;;;;N;;;;; +1128C;MULTANI LETTER JA;Lo;0;L;;;;;N;;;;; +1128D;MULTANI LETTER JJA;Lo;0;L;;;;;N;;;;; +1128F;MULTANI LETTER NYA;Lo;0;L;;;;;N;;;;; +11290;MULTANI LETTER TTA;Lo;0;L;;;;;N;;;;; +11291;MULTANI LETTER TTHA;Lo;0;L;;;;;N;;;;; +11292;MULTANI LETTER DDA;Lo;0;L;;;;;N;;;;; +11293;MULTANI LETTER DDDA;Lo;0;L;;;;;N;;;;; +11294;MULTANI LETTER DDHA;Lo;0;L;;;;;N;;;;; +11295;MULTANI LETTER NNA;Lo;0;L;;;;;N;;;;; +11296;MULTANI LETTER TA;Lo;0;L;;;;;N;;;;; +11297;MULTANI LETTER THA;Lo;0;L;;;;;N;;;;; +11298;MULTANI LETTER DA;Lo;0;L;;;;;N;;;;; +11299;MULTANI LETTER DHA;Lo;0;L;;;;;N;;;;; +1129A;MULTANI LETTER NA;Lo;0;L;;;;;N;;;;; +1129B;MULTANI LETTER PA;Lo;0;L;;;;;N;;;;; +1129C;MULTANI LETTER PHA;Lo;0;L;;;;;N;;;;; +1129D;MULTANI LETTER BA;Lo;0;L;;;;;N;;;;; +1129F;MULTANI LETTER BHA;Lo;0;L;;;;;N;;;;; +112A0;MULTANI LETTER MA;Lo;0;L;;;;;N;;;;; +112A1;MULTANI LETTER YA;Lo;0;L;;;;;N;;;;; +112A2;MULTANI LETTER RA;Lo;0;L;;;;;N;;;;; +112A3;MULTANI LETTER LA;Lo;0;L;;;;;N;;;;; +112A4;MULTANI LETTER VA;Lo;0;L;;;;;N;;;;; +112A5;MULTANI LETTER SA;Lo;0;L;;;;;N;;;;; +112A6;MULTANI LETTER HA;Lo;0;L;;;;;N;;;;; +112A7;MULTANI LETTER RRA;Lo;0;L;;;;;N;;;;; +112A8;MULTANI LETTER RHA;Lo;0;L;;;;;N;;;;; +112A9;MULTANI SECTION MARK;Po;0;L;;;;;N;;;;; +112B0;KHUDAWADI LETTER A;Lo;0;L;;;;;N;;;;; +112B1;KHUDAWADI LETTER AA;Lo;0;L;;;;;N;;;;; +112B2;KHUDAWADI LETTER I;Lo;0;L;;;;;N;;;;; +112B3;KHUDAWADI LETTER II;Lo;0;L;;;;;N;;;;; +112B4;KHUDAWADI LETTER U;Lo;0;L;;;;;N;;;;; +112B5;KHUDAWADI LETTER UU;Lo;0;L;;;;;N;;;;; +112B6;KHUDAWADI LETTER E;Lo;0;L;;;;;N;;;;; +112B7;KHUDAWADI LETTER AI;Lo;0;L;;;;;N;;;;; +112B8;KHUDAWADI LETTER O;Lo;0;L;;;;;N;;;;; +112B9;KHUDAWADI LETTER AU;Lo;0;L;;;;;N;;;;; +112BA;KHUDAWADI LETTER KA;Lo;0;L;;;;;N;;;;; +112BB;KHUDAWADI LETTER KHA;Lo;0;L;;;;;N;;;;; +112BC;KHUDAWADI LETTER GA;Lo;0;L;;;;;N;;;;; +112BD;KHUDAWADI LETTER GGA;Lo;0;L;;;;;N;;;;; +112BE;KHUDAWADI LETTER GHA;Lo;0;L;;;;;N;;;;; +112BF;KHUDAWADI LETTER NGA;Lo;0;L;;;;;N;;;;; +112C0;KHUDAWADI LETTER CA;Lo;0;L;;;;;N;;;;; +112C1;KHUDAWADI LETTER CHA;Lo;0;L;;;;;N;;;;; +112C2;KHUDAWADI LETTER JA;Lo;0;L;;;;;N;;;;; +112C3;KHUDAWADI LETTER JJA;Lo;0;L;;;;;N;;;;; +112C4;KHUDAWADI LETTER JHA;Lo;0;L;;;;;N;;;;; +112C5;KHUDAWADI LETTER NYA;Lo;0;L;;;;;N;;;;; +112C6;KHUDAWADI LETTER TTA;Lo;0;L;;;;;N;;;;; +112C7;KHUDAWADI LETTER TTHA;Lo;0;L;;;;;N;;;;; +112C8;KHUDAWADI LETTER DDA;Lo;0;L;;;;;N;;;;; +112C9;KHUDAWADI LETTER DDDA;Lo;0;L;;;;;N;;;;; +112CA;KHUDAWADI LETTER RRA;Lo;0;L;;;;;N;;;;; +112CB;KHUDAWADI LETTER DDHA;Lo;0;L;;;;;N;;;;; +112CC;KHUDAWADI LETTER NNA;Lo;0;L;;;;;N;;;;; +112CD;KHUDAWADI LETTER TA;Lo;0;L;;;;;N;;;;; +112CE;KHUDAWADI LETTER THA;Lo;0;L;;;;;N;;;;; +112CF;KHUDAWADI LETTER DA;Lo;0;L;;;;;N;;;;; +112D0;KHUDAWADI LETTER DHA;Lo;0;L;;;;;N;;;;; +112D1;KHUDAWADI LETTER NA;Lo;0;L;;;;;N;;;;; +112D2;KHUDAWADI LETTER PA;Lo;0;L;;;;;N;;;;; +112D3;KHUDAWADI LETTER PHA;Lo;0;L;;;;;N;;;;; +112D4;KHUDAWADI LETTER BA;Lo;0;L;;;;;N;;;;; +112D5;KHUDAWADI LETTER BBA;Lo;0;L;;;;;N;;;;; +112D6;KHUDAWADI LETTER BHA;Lo;0;L;;;;;N;;;;; +112D7;KHUDAWADI LETTER MA;Lo;0;L;;;;;N;;;;; +112D8;KHUDAWADI LETTER YA;Lo;0;L;;;;;N;;;;; +112D9;KHUDAWADI LETTER RA;Lo;0;L;;;;;N;;;;; +112DA;KHUDAWADI LETTER LA;Lo;0;L;;;;;N;;;;; +112DB;KHUDAWADI LETTER VA;Lo;0;L;;;;;N;;;;; +112DC;KHUDAWADI LETTER SHA;Lo;0;L;;;;;N;;;;; +112DD;KHUDAWADI LETTER SA;Lo;0;L;;;;;N;;;;; +112DE;KHUDAWADI LETTER HA;Lo;0;L;;;;;N;;;;; +112DF;KHUDAWADI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;; +112E0;KHUDAWADI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;; +112E1;KHUDAWADI VOWEL SIGN I;Mc;0;L;;;;;N;;;;; +112E2;KHUDAWADI VOWEL SIGN II;Mc;0;L;;;;;N;;;;; +112E3;KHUDAWADI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;; +112E4;KHUDAWADI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;; +112E5;KHUDAWADI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;; +112E6;KHUDAWADI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;; +112E7;KHUDAWADI VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;; +112E8;KHUDAWADI VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;; +112E9;KHUDAWADI SIGN NUKTA;Mn;7;NSM;;;;;N;;;;; +112EA;KHUDAWADI SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;; +112F0;KHUDAWADI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +112F1;KHUDAWADI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +112F2;KHUDAWADI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +112F3;KHUDAWADI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +112F4;KHUDAWADI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +112F5;KHUDAWADI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +112F6;KHUDAWADI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +112F7;KHUDAWADI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +112F8;KHUDAWADI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +112F9;KHUDAWADI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +11300;GRANTHA SIGN COMBINING ANUSVARA ABOVE;Mn;0;NSM;;;;;N;;;;; +11301;GRANTHA SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;; +11302;GRANTHA SIGN ANUSVARA;Mc;0;L;;;;;N;;;;; +11303;GRANTHA SIGN VISARGA;Mc;0;L;;;;;N;;;;; +11305;GRANTHA LETTER A;Lo;0;L;;;;;N;;;;; +11306;GRANTHA LETTER AA;Lo;0;L;;;;;N;;;;; +11307;GRANTHA LETTER I;Lo;0;L;;;;;N;;;;; +11308;GRANTHA LETTER II;Lo;0;L;;;;;N;;;;; +11309;GRANTHA LETTER U;Lo;0;L;;;;;N;;;;; +1130A;GRANTHA LETTER UU;Lo;0;L;;;;;N;;;;; +1130B;GRANTHA LETTER VOCALIC R;Lo;0;L;;;;;N;;;;; +1130C;GRANTHA LETTER VOCALIC L;Lo;0;L;;;;;N;;;;; +1130F;GRANTHA LETTER EE;Lo;0;L;;;;;N;;;;; +11310;GRANTHA LETTER AI;Lo;0;L;;;;;N;;;;; +11313;GRANTHA LETTER OO;Lo;0;L;;;;;N;;;;; +11314;GRANTHA LETTER AU;Lo;0;L;;;;;N;;;;; +11315;GRANTHA LETTER KA;Lo;0;L;;;;;N;;;;; +11316;GRANTHA LETTER KHA;Lo;0;L;;;;;N;;;;; +11317;GRANTHA LETTER GA;Lo;0;L;;;;;N;;;;; +11318;GRANTHA LETTER GHA;Lo;0;L;;;;;N;;;;; +11319;GRANTHA LETTER NGA;Lo;0;L;;;;;N;;;;; +1131A;GRANTHA LETTER CA;Lo;0;L;;;;;N;;;;; +1131B;GRANTHA LETTER CHA;Lo;0;L;;;;;N;;;;; +1131C;GRANTHA LETTER JA;Lo;0;L;;;;;N;;;;; +1131D;GRANTHA LETTER JHA;Lo;0;L;;;;;N;;;;; +1131E;GRANTHA LETTER NYA;Lo;0;L;;;;;N;;;;; +1131F;GRANTHA LETTER TTA;Lo;0;L;;;;;N;;;;; +11320;GRANTHA LETTER TTHA;Lo;0;L;;;;;N;;;;; +11321;GRANTHA LETTER DDA;Lo;0;L;;;;;N;;;;; +11322;GRANTHA LETTER DDHA;Lo;0;L;;;;;N;;;;; +11323;GRANTHA LETTER NNA;Lo;0;L;;;;;N;;;;; +11324;GRANTHA LETTER TA;Lo;0;L;;;;;N;;;;; +11325;GRANTHA LETTER THA;Lo;0;L;;;;;N;;;;; +11326;GRANTHA LETTER DA;Lo;0;L;;;;;N;;;;; +11327;GRANTHA LETTER DHA;Lo;0;L;;;;;N;;;;; +11328;GRANTHA LETTER NA;Lo;0;L;;;;;N;;;;; +1132A;GRANTHA LETTER PA;Lo;0;L;;;;;N;;;;; +1132B;GRANTHA LETTER PHA;Lo;0;L;;;;;N;;;;; +1132C;GRANTHA LETTER BA;Lo;0;L;;;;;N;;;;; +1132D;GRANTHA LETTER BHA;Lo;0;L;;;;;N;;;;; +1132E;GRANTHA LETTER MA;Lo;0;L;;;;;N;;;;; +1132F;GRANTHA LETTER YA;Lo;0;L;;;;;N;;;;; +11330;GRANTHA LETTER RA;Lo;0;L;;;;;N;;;;; +11332;GRANTHA LETTER LA;Lo;0;L;;;;;N;;;;; +11333;GRANTHA LETTER LLA;Lo;0;L;;;;;N;;;;; +11335;GRANTHA LETTER VA;Lo;0;L;;;;;N;;;;; +11336;GRANTHA LETTER SHA;Lo;0;L;;;;;N;;;;; +11337;GRANTHA LETTER SSA;Lo;0;L;;;;;N;;;;; +11338;GRANTHA LETTER SA;Lo;0;L;;;;;N;;;;; +11339;GRANTHA LETTER HA;Lo;0;L;;;;;N;;;;; +1133B;COMBINING BINDU BELOW;Mn;7;NSM;;;;;N;;;;; +1133C;GRANTHA SIGN NUKTA;Mn;7;NSM;;;;;N;;;;; +1133D;GRANTHA SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;; +1133E;GRANTHA VOWEL SIGN AA;Mc;0;L;;;;;N;;;;; +1133F;GRANTHA VOWEL SIGN I;Mc;0;L;;;;;N;;;;; +11340;GRANTHA VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;; +11341;GRANTHA VOWEL SIGN U;Mc;0;L;;;;;N;;;;; +11342;GRANTHA VOWEL SIGN UU;Mc;0;L;;;;;N;;;;; +11343;GRANTHA VOWEL SIGN VOCALIC R;Mc;0;L;;;;;N;;;;; +11344;GRANTHA VOWEL SIGN VOCALIC RR;Mc;0;L;;;;;N;;;;; +11347;GRANTHA VOWEL SIGN EE;Mc;0;L;;;;;N;;;;; +11348;GRANTHA VOWEL SIGN AI;Mc;0;L;;;;;N;;;;; +1134B;GRANTHA VOWEL SIGN OO;Mc;0;L;11347 1133E;;;;N;;;;; +1134C;GRANTHA VOWEL SIGN AU;Mc;0;L;11347 11357;;;;N;;;;; +1134D;GRANTHA SIGN VIRAMA;Mc;9;L;;;;;N;;;;; +11350;GRANTHA OM;Lo;0;L;;;;;N;;;;; +11357;GRANTHA AU LENGTH MARK;Mc;0;L;;;;;N;;;;; +1135D;GRANTHA SIGN PLUTA;Lo;0;L;;;;;N;;;;; +1135E;GRANTHA LETTER VEDIC ANUSVARA;Lo;0;L;;;;;N;;;;; +1135F;GRANTHA LETTER VEDIC DOUBLE ANUSVARA;Lo;0;L;;;;;N;;;;; +11360;GRANTHA LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;; +11361;GRANTHA LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;; +11362;GRANTHA VOWEL SIGN VOCALIC L;Mc;0;L;;;;;N;;;;; +11363;GRANTHA VOWEL SIGN VOCALIC LL;Mc;0;L;;;;;N;;;;; +11366;COMBINING GRANTHA DIGIT ZERO;Mn;230;NSM;;;;;N;;;;; +11367;COMBINING GRANTHA DIGIT ONE;Mn;230;NSM;;;;;N;;;;; +11368;COMBINING GRANTHA DIGIT TWO;Mn;230;NSM;;;;;N;;;;; +11369;COMBINING GRANTHA DIGIT THREE;Mn;230;NSM;;;;;N;;;;; +1136A;COMBINING GRANTHA DIGIT FOUR;Mn;230;NSM;;;;;N;;;;; +1136B;COMBINING GRANTHA DIGIT FIVE;Mn;230;NSM;;;;;N;;;;; +1136C;COMBINING GRANTHA DIGIT SIX;Mn;230;NSM;;;;;N;;;;; +11370;COMBINING GRANTHA LETTER A;Mn;230;NSM;;;;;N;;;;; +11371;COMBINING GRANTHA LETTER KA;Mn;230;NSM;;;;;N;;;;; +11372;COMBINING GRANTHA LETTER NA;Mn;230;NSM;;;;;N;;;;; +11373;COMBINING GRANTHA LETTER VI;Mn;230;NSM;;;;;N;;;;; +11374;COMBINING GRANTHA LETTER PA;Mn;230;NSM;;;;;N;;;;; +11380;TULU-TIGALARI LETTER A;Lo;0;L;;;;;N;;;;; +11381;TULU-TIGALARI LETTER AA;Lo;0;L;;;;;N;;;;; +11382;TULU-TIGALARI LETTER I;Lo;0;L;;;;;N;;;;; +11383;TULU-TIGALARI LETTER II;Lo;0;L;11382 113C9;;;;N;;;;; +11384;TULU-TIGALARI LETTER U;Lo;0;L;;;;;N;;;;; +11385;TULU-TIGALARI LETTER UU;Lo;0;L;11384 113BB;;;;N;;;;; +11386;TULU-TIGALARI LETTER VOCALIC R;Lo;0;L;;;;;N;;;;; +11387;TULU-TIGALARI LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;; +11388;TULU-TIGALARI LETTER VOCALIC L;Lo;0;L;;;;;N;;;;; +11389;TULU-TIGALARI LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;; +1138B;TULU-TIGALARI LETTER EE;Lo;0;L;;;;;N;;;;; +1138E;TULU-TIGALARI LETTER AI;Lo;0;L;1138B 113C2;;;;N;;;;; +11390;TULU-TIGALARI LETTER OO;Lo;0;L;;;;;N;;;;; +11391;TULU-TIGALARI LETTER AU;Lo;0;L;11390 113C9;;;;N;;;;; +11392;TULU-TIGALARI LETTER KA;Lo;0;L;;;;;N;;;;; +11393;TULU-TIGALARI LETTER KHA;Lo;0;L;;;;;N;;;;; +11394;TULU-TIGALARI LETTER GA;Lo;0;L;;;;;N;;;;; +11395;TULU-TIGALARI LETTER GHA;Lo;0;L;;;;;N;;;;; +11396;TULU-TIGALARI LETTER NGA;Lo;0;L;;;;;N;;;;; +11397;TULU-TIGALARI LETTER CA;Lo;0;L;;;;;N;;;;; +11398;TULU-TIGALARI LETTER CHA;Lo;0;L;;;;;N;;;;; +11399;TULU-TIGALARI LETTER JA;Lo;0;L;;;;;N;;;;; +1139A;TULU-TIGALARI LETTER JHA;Lo;0;L;;;;;N;;;;; +1139B;TULU-TIGALARI LETTER NYA;Lo;0;L;;;;;N;;;;; +1139C;TULU-TIGALARI LETTER TTA;Lo;0;L;;;;;N;;;;; +1139D;TULU-TIGALARI LETTER TTHA;Lo;0;L;;;;;N;;;;; +1139E;TULU-TIGALARI LETTER DDA;Lo;0;L;;;;;N;;;;; +1139F;TULU-TIGALARI LETTER DDHA;Lo;0;L;;;;;N;;;;; +113A0;TULU-TIGALARI LETTER NNA;Lo;0;L;;;;;N;;;;; +113A1;TULU-TIGALARI LETTER TA;Lo;0;L;;;;;N;;;;; +113A2;TULU-TIGALARI LETTER THA;Lo;0;L;;;;;N;;;;; +113A3;TULU-TIGALARI LETTER DA;Lo;0;L;;;;;N;;;;; +113A4;TULU-TIGALARI LETTER DHA;Lo;0;L;;;;;N;;;;; +113A5;TULU-TIGALARI LETTER NA;Lo;0;L;;;;;N;;;;; +113A6;TULU-TIGALARI LETTER PA;Lo;0;L;;;;;N;;;;; +113A7;TULU-TIGALARI LETTER PHA;Lo;0;L;;;;;N;;;;; +113A8;TULU-TIGALARI LETTER BA;Lo;0;L;;;;;N;;;;; +113A9;TULU-TIGALARI LETTER BHA;Lo;0;L;;;;;N;;;;; +113AA;TULU-TIGALARI LETTER MA;Lo;0;L;;;;;N;;;;; +113AB;TULU-TIGALARI LETTER YA;Lo;0;L;;;;;N;;;;; +113AC;TULU-TIGALARI LETTER RA;Lo;0;L;;;;;N;;;;; +113AD;TULU-TIGALARI LETTER LA;Lo;0;L;;;;;N;;;;; +113AE;TULU-TIGALARI LETTER VA;Lo;0;L;;;;;N;;;;; +113AF;TULU-TIGALARI LETTER SHA;Lo;0;L;;;;;N;;;;; +113B0;TULU-TIGALARI LETTER SSA;Lo;0;L;;;;;N;;;;; +113B1;TULU-TIGALARI LETTER SA;Lo;0;L;;;;;N;;;;; +113B2;TULU-TIGALARI LETTER HA;Lo;0;L;;;;;N;;;;; +113B3;TULU-TIGALARI LETTER LLA;Lo;0;L;;;;;N;;;;; +113B4;TULU-TIGALARI LETTER RRA;Lo;0;L;;;;;N;;;;; +113B5;TULU-TIGALARI LETTER LLLA;Lo;0;L;;;;;N;;;;; +113B7;TULU-TIGALARI SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;; +113B8;TULU-TIGALARI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;; +113B9;TULU-TIGALARI VOWEL SIGN I;Mc;0;L;;;;;N;;;;; +113BA;TULU-TIGALARI VOWEL SIGN II;Mc;0;L;;;;;N;;;;; +113BB;TULU-TIGALARI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;; +113BC;TULU-TIGALARI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;; +113BD;TULU-TIGALARI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;; +113BE;TULU-TIGALARI VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;; +113BF;TULU-TIGALARI VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;; +113C0;TULU-TIGALARI VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;; +113C2;TULU-TIGALARI VOWEL SIGN EE;Mc;0;L;;;;;N;;;;; +113C5;TULU-TIGALARI VOWEL SIGN AI;Mc;0;L;113C2 113C2;;;;N;;;;; +113C7;TULU-TIGALARI VOWEL SIGN OO;Mc;0;L;113C2 113B8;;;;N;;;;; +113C8;TULU-TIGALARI VOWEL SIGN AU;Mc;0;L;113C2 113C9;;;;N;;;;; +113C9;TULU-TIGALARI AU LENGTH MARK;Mc;0;L;;;;;N;;;;; +113CA;TULU-TIGALARI SIGN CANDRA ANUNASIKA;Mc;0;L;;;;;N;;;;; +113CC;TULU-TIGALARI SIGN ANUSVARA;Mc;0;L;;;;;N;;;;; +113CD;TULU-TIGALARI SIGN VISARGA;Mc;0;L;;;;;N;;;;; +113CE;TULU-TIGALARI SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;; +113CF;TULU-TIGALARI SIGN LOOPED VIRAMA;Mc;9;L;;;;;N;;;;; +113D0;TULU-TIGALARI CONJOINER;Mn;9;NSM;;;;;N;;;;; +113D1;TULU-TIGALARI REPHA;Lo;0;L;;;;;N;;;;; +113D2;TULU-TIGALARI GEMINATION MARK;Mn;0;NSM;;;;;N;;;;; +113D3;TULU-TIGALARI SIGN PLUTA;Lo;0;L;;;;;N;;;;; +113D4;TULU-TIGALARI DANDA;Po;0;L;;;;;N;;;;; +113D5;TULU-TIGALARI DOUBLE DANDA;Po;0;L;;;;;N;;;;; +113D7;TULU-TIGALARI SIGN OM PUSHPIKA;Po;0;L;;;;;N;;;;; +113D8;TULU-TIGALARI SIGN SHRII PUSHPIKA;Po;0;L;;;;;N;;;;; +113E1;TULU-TIGALARI VEDIC TONE SVARITA;Mn;0;NSM;;;;;N;;;;; +113E2;TULU-TIGALARI VEDIC TONE ANUDATTA;Mn;0;NSM;;;;;N;;;;; +11400;NEWA LETTER A;Lo;0;L;;;;;N;;;;; +11401;NEWA LETTER AA;Lo;0;L;;;;;N;;;;; +11402;NEWA LETTER I;Lo;0;L;;;;;N;;;;; +11403;NEWA LETTER II;Lo;0;L;;;;;N;;;;; +11404;NEWA LETTER U;Lo;0;L;;;;;N;;;;; +11405;NEWA LETTER UU;Lo;0;L;;;;;N;;;;; +11406;NEWA LETTER VOCALIC R;Lo;0;L;;;;;N;;;;; +11407;NEWA LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;; +11408;NEWA LETTER VOCALIC L;Lo;0;L;;;;;N;;;;; +11409;NEWA LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;; +1140A;NEWA LETTER E;Lo;0;L;;;;;N;;;;; +1140B;NEWA LETTER AI;Lo;0;L;;;;;N;;;;; +1140C;NEWA LETTER O;Lo;0;L;;;;;N;;;;; +1140D;NEWA LETTER AU;Lo;0;L;;;;;N;;;;; +1140E;NEWA LETTER KA;Lo;0;L;;;;;N;;;;; +1140F;NEWA LETTER KHA;Lo;0;L;;;;;N;;;;; +11410;NEWA LETTER GA;Lo;0;L;;;;;N;;;;; +11411;NEWA LETTER GHA;Lo;0;L;;;;;N;;;;; +11412;NEWA LETTER NGA;Lo;0;L;;;;;N;;;;; +11413;NEWA LETTER NGHA;Lo;0;L;;;;;N;;;;; +11414;NEWA LETTER CA;Lo;0;L;;;;;N;;;;; +11415;NEWA LETTER CHA;Lo;0;L;;;;;N;;;;; +11416;NEWA LETTER JA;Lo;0;L;;;;;N;;;;; +11417;NEWA LETTER JHA;Lo;0;L;;;;;N;;;;; +11418;NEWA LETTER NYA;Lo;0;L;;;;;N;;;;; +11419;NEWA LETTER NYHA;Lo;0;L;;;;;N;;;;; +1141A;NEWA LETTER TTA;Lo;0;L;;;;;N;;;;; +1141B;NEWA LETTER TTHA;Lo;0;L;;;;;N;;;;; +1141C;NEWA LETTER DDA;Lo;0;L;;;;;N;;;;; +1141D;NEWA LETTER DDHA;Lo;0;L;;;;;N;;;;; +1141E;NEWA LETTER NNA;Lo;0;L;;;;;N;;;;; +1141F;NEWA LETTER TA;Lo;0;L;;;;;N;;;;; +11420;NEWA LETTER THA;Lo;0;L;;;;;N;;;;; +11421;NEWA LETTER DA;Lo;0;L;;;;;N;;;;; +11422;NEWA LETTER DHA;Lo;0;L;;;;;N;;;;; +11423;NEWA LETTER NA;Lo;0;L;;;;;N;;;;; +11424;NEWA LETTER NHA;Lo;0;L;;;;;N;;;;; +11425;NEWA LETTER PA;Lo;0;L;;;;;N;;;;; +11426;NEWA LETTER PHA;Lo;0;L;;;;;N;;;;; +11427;NEWA LETTER BA;Lo;0;L;;;;;N;;;;; +11428;NEWA LETTER BHA;Lo;0;L;;;;;N;;;;; +11429;NEWA LETTER MA;Lo;0;L;;;;;N;;;;; +1142A;NEWA LETTER MHA;Lo;0;L;;;;;N;;;;; +1142B;NEWA LETTER YA;Lo;0;L;;;;;N;;;;; +1142C;NEWA LETTER RA;Lo;0;L;;;;;N;;;;; +1142D;NEWA LETTER RHA;Lo;0;L;;;;;N;;;;; +1142E;NEWA LETTER LA;Lo;0;L;;;;;N;;;;; +1142F;NEWA LETTER LHA;Lo;0;L;;;;;N;;;;; +11430;NEWA LETTER WA;Lo;0;L;;;;;N;;;;; +11431;NEWA LETTER SHA;Lo;0;L;;;;;N;;;;; +11432;NEWA LETTER SSA;Lo;0;L;;;;;N;;;;; +11433;NEWA LETTER SA;Lo;0;L;;;;;N;;;;; +11434;NEWA LETTER HA;Lo;0;L;;;;;N;;;;; +11435;NEWA VOWEL SIGN AA;Mc;0;L;;;;;N;;;;; +11436;NEWA VOWEL SIGN I;Mc;0;L;;;;;N;;;;; +11437;NEWA VOWEL SIGN II;Mc;0;L;;;;;N;;;;; +11438;NEWA VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;; +11439;NEWA VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;; +1143A;NEWA VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;; +1143B;NEWA VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;; +1143C;NEWA VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;; +1143D;NEWA VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;; +1143E;NEWA VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;; +1143F;NEWA VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;; +11440;NEWA VOWEL SIGN O;Mc;0;L;;;;;N;;;;; +11441;NEWA VOWEL SIGN AU;Mc;0;L;;;;;N;;;;; +11442;NEWA SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;; +11443;NEWA SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;; +11444;NEWA SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;; +11445;NEWA SIGN VISARGA;Mc;0;L;;;;;N;;;;; +11446;NEWA SIGN NUKTA;Mn;7;NSM;;;;;N;;;;; +11447;NEWA SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;; +11448;NEWA SIGN FINAL ANUSVARA;Lo;0;L;;;;;N;;;;; +11449;NEWA OM;Lo;0;L;;;;;N;;;;; +1144A;NEWA SIDDHI;Lo;0;L;;;;;N;;;;; +1144B;NEWA DANDA;Po;0;L;;;;;N;;;;; +1144C;NEWA DOUBLE DANDA;Po;0;L;;;;;N;;;;; +1144D;NEWA COMMA;Po;0;L;;;;;N;;;;; +1144E;NEWA GAP FILLER;Po;0;L;;;;;N;;;;; +1144F;NEWA ABBREVIATION SIGN;Po;0;L;;;;;N;;;;; +11450;NEWA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +11451;NEWA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +11452;NEWA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +11453;NEWA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +11454;NEWA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +11455;NEWA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +11456;NEWA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +11457;NEWA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +11458;NEWA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +11459;NEWA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +1145A;NEWA DOUBLE COMMA;Po;0;L;;;;;N;;;;; +1145B;NEWA PLACEHOLDER MARK;Po;0;L;;;;;N;;;;; +1145D;NEWA INSERTION SIGN;Po;0;L;;;;;N;;;;; +1145E;NEWA SANDHI MARK;Mn;230;NSM;;;;;N;;;;; +1145F;NEWA LETTER VEDIC ANUSVARA;Lo;0;L;;;;;N;;;;; +11460;NEWA SIGN JIHVAMULIYA;Lo;0;L;;;;;N;;;;; +11461;NEWA SIGN UPADHMANIYA;Lo;0;L;;;;;N;;;;; +11480;TIRHUTA ANJI;Lo;0;L;;;;;N;;;;; +11481;TIRHUTA LETTER A;Lo;0;L;;;;;N;;;;; +11482;TIRHUTA LETTER AA;Lo;0;L;;;;;N;;;;; +11483;TIRHUTA LETTER I;Lo;0;L;;;;;N;;;;; +11484;TIRHUTA LETTER II;Lo;0;L;;;;;N;;;;; +11485;TIRHUTA LETTER U;Lo;0;L;;;;;N;;;;; +11486;TIRHUTA LETTER UU;Lo;0;L;;;;;N;;;;; +11487;TIRHUTA LETTER VOCALIC R;Lo;0;L;;;;;N;;;;; +11488;TIRHUTA LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;; +11489;TIRHUTA LETTER VOCALIC L;Lo;0;L;;;;;N;;;;; +1148A;TIRHUTA LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;; +1148B;TIRHUTA LETTER E;Lo;0;L;;;;;N;;;;; +1148C;TIRHUTA LETTER AI;Lo;0;L;;;;;N;;;;; +1148D;TIRHUTA LETTER O;Lo;0;L;;;;;N;;;;; +1148E;TIRHUTA LETTER AU;Lo;0;L;;;;;N;;;;; +1148F;TIRHUTA LETTER KA;Lo;0;L;;;;;N;;;;; +11490;TIRHUTA LETTER KHA;Lo;0;L;;;;;N;;;;; +11491;TIRHUTA LETTER GA;Lo;0;L;;;;;N;;;;; +11492;TIRHUTA LETTER GHA;Lo;0;L;;;;;N;;;;; +11493;TIRHUTA LETTER NGA;Lo;0;L;;;;;N;;;;; +11494;TIRHUTA LETTER CA;Lo;0;L;;;;;N;;;;; +11495;TIRHUTA LETTER CHA;Lo;0;L;;;;;N;;;;; +11496;TIRHUTA LETTER JA;Lo;0;L;;;;;N;;;;; +11497;TIRHUTA LETTER JHA;Lo;0;L;;;;;N;;;;; +11498;TIRHUTA LETTER NYA;Lo;0;L;;;;;N;;;;; +11499;TIRHUTA LETTER TTA;Lo;0;L;;;;;N;;;;; +1149A;TIRHUTA LETTER TTHA;Lo;0;L;;;;;N;;;;; +1149B;TIRHUTA LETTER DDA;Lo;0;L;;;;;N;;;;; +1149C;TIRHUTA LETTER DDHA;Lo;0;L;;;;;N;;;;; +1149D;TIRHUTA LETTER NNA;Lo;0;L;;;;;N;;;;; +1149E;TIRHUTA LETTER TA;Lo;0;L;;;;;N;;;;; +1149F;TIRHUTA LETTER THA;Lo;0;L;;;;;N;;;;; +114A0;TIRHUTA LETTER DA;Lo;0;L;;;;;N;;;;; +114A1;TIRHUTA LETTER DHA;Lo;0;L;;;;;N;;;;; +114A2;TIRHUTA LETTER NA;Lo;0;L;;;;;N;;;;; +114A3;TIRHUTA LETTER PA;Lo;0;L;;;;;N;;;;; +114A4;TIRHUTA LETTER PHA;Lo;0;L;;;;;N;;;;; +114A5;TIRHUTA LETTER BA;Lo;0;L;;;;;N;;;;; +114A6;TIRHUTA LETTER BHA;Lo;0;L;;;;;N;;;;; +114A7;TIRHUTA LETTER MA;Lo;0;L;;;;;N;;;;; +114A8;TIRHUTA LETTER YA;Lo;0;L;;;;;N;;;;; +114A9;TIRHUTA LETTER RA;Lo;0;L;;;;;N;;;;; +114AA;TIRHUTA LETTER LA;Lo;0;L;;;;;N;;;;; +114AB;TIRHUTA LETTER VA;Lo;0;L;;;;;N;;;;; +114AC;TIRHUTA LETTER SHA;Lo;0;L;;;;;N;;;;; +114AD;TIRHUTA LETTER SSA;Lo;0;L;;;;;N;;;;; +114AE;TIRHUTA LETTER SA;Lo;0;L;;;;;N;;;;; +114AF;TIRHUTA LETTER HA;Lo;0;L;;;;;N;;;;; +114B0;TIRHUTA VOWEL SIGN AA;Mc;0;L;;;;;N;;;;; +114B1;TIRHUTA VOWEL SIGN I;Mc;0;L;;;;;N;;;;; +114B2;TIRHUTA VOWEL SIGN II;Mc;0;L;;;;;N;;;;; +114B3;TIRHUTA VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;; +114B4;TIRHUTA VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;; +114B5;TIRHUTA VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;; +114B6;TIRHUTA VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;; +114B7;TIRHUTA VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;; +114B8;TIRHUTA VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;; +114B9;TIRHUTA VOWEL SIGN E;Mc;0;L;;;;;N;;;;; +114BA;TIRHUTA VOWEL SIGN SHORT E;Mn;0;NSM;;;;;N;;;;; +114BB;TIRHUTA VOWEL SIGN AI;Mc;0;L;114B9 114BA;;;;N;;;;; +114BC;TIRHUTA VOWEL SIGN O;Mc;0;L;114B9 114B0;;;;N;;;;; +114BD;TIRHUTA VOWEL SIGN SHORT O;Mc;0;L;;;;;N;;;;; +114BE;TIRHUTA VOWEL SIGN AU;Mc;0;L;114B9 114BD;;;;N;;;;; +114BF;TIRHUTA SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;; +114C0;TIRHUTA SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;; +114C1;TIRHUTA SIGN VISARGA;Mc;0;L;;;;;N;;;;; +114C2;TIRHUTA SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;; +114C3;TIRHUTA SIGN NUKTA;Mn;7;NSM;;;;;N;;;;; +114C4;TIRHUTA SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;; +114C5;TIRHUTA GVANG;Lo;0;L;;;;;N;;;;; +114C6;TIRHUTA ABBREVIATION SIGN;Po;0;L;;;;;N;;;;; +114C7;TIRHUTA OM;Lo;0;L;;;;;N;;;;; +114D0;TIRHUTA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +114D1;TIRHUTA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +114D2;TIRHUTA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +114D3;TIRHUTA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +114D4;TIRHUTA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +114D5;TIRHUTA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +114D6;TIRHUTA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +114D7;TIRHUTA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +114D8;TIRHUTA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +114D9;TIRHUTA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +11580;SIDDHAM LETTER A;Lo;0;L;;;;;N;;;;; +11581;SIDDHAM LETTER AA;Lo;0;L;;;;;N;;;;; +11582;SIDDHAM LETTER I;Lo;0;L;;;;;N;;;;; +11583;SIDDHAM LETTER II;Lo;0;L;;;;;N;;;;; +11584;SIDDHAM LETTER U;Lo;0;L;;;;;N;;;;; +11585;SIDDHAM LETTER UU;Lo;0;L;;;;;N;;;;; +11586;SIDDHAM LETTER VOCALIC R;Lo;0;L;;;;;N;;;;; +11587;SIDDHAM LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;; +11588;SIDDHAM LETTER VOCALIC L;Lo;0;L;;;;;N;;;;; +11589;SIDDHAM LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;; +1158A;SIDDHAM LETTER E;Lo;0;L;;;;;N;;;;; +1158B;SIDDHAM LETTER AI;Lo;0;L;;;;;N;;;;; +1158C;SIDDHAM LETTER O;Lo;0;L;;;;;N;;;;; +1158D;SIDDHAM LETTER AU;Lo;0;L;;;;;N;;;;; +1158E;SIDDHAM LETTER KA;Lo;0;L;;;;;N;;;;; +1158F;SIDDHAM LETTER KHA;Lo;0;L;;;;;N;;;;; +11590;SIDDHAM LETTER GA;Lo;0;L;;;;;N;;;;; +11591;SIDDHAM LETTER GHA;Lo;0;L;;;;;N;;;;; +11592;SIDDHAM LETTER NGA;Lo;0;L;;;;;N;;;;; +11593;SIDDHAM LETTER CA;Lo;0;L;;;;;N;;;;; +11594;SIDDHAM LETTER CHA;Lo;0;L;;;;;N;;;;; +11595;SIDDHAM LETTER JA;Lo;0;L;;;;;N;;;;; +11596;SIDDHAM LETTER JHA;Lo;0;L;;;;;N;;;;; +11597;SIDDHAM LETTER NYA;Lo;0;L;;;;;N;;;;; +11598;SIDDHAM LETTER TTA;Lo;0;L;;;;;N;;;;; +11599;SIDDHAM LETTER TTHA;Lo;0;L;;;;;N;;;;; +1159A;SIDDHAM LETTER DDA;Lo;0;L;;;;;N;;;;; +1159B;SIDDHAM LETTER DDHA;Lo;0;L;;;;;N;;;;; +1159C;SIDDHAM LETTER NNA;Lo;0;L;;;;;N;;;;; +1159D;SIDDHAM LETTER TA;Lo;0;L;;;;;N;;;;; +1159E;SIDDHAM LETTER THA;Lo;0;L;;;;;N;;;;; +1159F;SIDDHAM LETTER DA;Lo;0;L;;;;;N;;;;; +115A0;SIDDHAM LETTER DHA;Lo;0;L;;;;;N;;;;; +115A1;SIDDHAM LETTER NA;Lo;0;L;;;;;N;;;;; +115A2;SIDDHAM LETTER PA;Lo;0;L;;;;;N;;;;; +115A3;SIDDHAM LETTER PHA;Lo;0;L;;;;;N;;;;; +115A4;SIDDHAM LETTER BA;Lo;0;L;;;;;N;;;;; +115A5;SIDDHAM LETTER BHA;Lo;0;L;;;;;N;;;;; +115A6;SIDDHAM LETTER MA;Lo;0;L;;;;;N;;;;; +115A7;SIDDHAM LETTER YA;Lo;0;L;;;;;N;;;;; +115A8;SIDDHAM LETTER RA;Lo;0;L;;;;;N;;;;; +115A9;SIDDHAM LETTER LA;Lo;0;L;;;;;N;;;;; +115AA;SIDDHAM LETTER VA;Lo;0;L;;;;;N;;;;; +115AB;SIDDHAM LETTER SHA;Lo;0;L;;;;;N;;;;; +115AC;SIDDHAM LETTER SSA;Lo;0;L;;;;;N;;;;; +115AD;SIDDHAM LETTER SA;Lo;0;L;;;;;N;;;;; +115AE;SIDDHAM LETTER HA;Lo;0;L;;;;;N;;;;; +115AF;SIDDHAM VOWEL SIGN AA;Mc;0;L;;;;;N;;;;; +115B0;SIDDHAM VOWEL SIGN I;Mc;0;L;;;;;N;;;;; +115B1;SIDDHAM VOWEL SIGN II;Mc;0;L;;;;;N;;;;; +115B2;SIDDHAM VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;; +115B3;SIDDHAM VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;; +115B4;SIDDHAM VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;; +115B5;SIDDHAM VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;; +115B8;SIDDHAM VOWEL SIGN E;Mc;0;L;;;;;N;;;;; +115B9;SIDDHAM VOWEL SIGN AI;Mc;0;L;;;;;N;;;;; +115BA;SIDDHAM VOWEL SIGN O;Mc;0;L;115B8 115AF;;;;N;;;;; +115BB;SIDDHAM VOWEL SIGN AU;Mc;0;L;115B9 115AF;;;;N;;;;; +115BC;SIDDHAM SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;; +115BD;SIDDHAM SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;; +115BE;SIDDHAM SIGN VISARGA;Mc;0;L;;;;;N;;;;; +115BF;SIDDHAM SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;; +115C0;SIDDHAM SIGN NUKTA;Mn;7;NSM;;;;;N;;;;; +115C1;SIDDHAM SIGN SIDDHAM;Po;0;L;;;;;N;;;;; +115C2;SIDDHAM DANDA;Po;0;L;;;;;N;;;;; +115C3;SIDDHAM DOUBLE DANDA;Po;0;L;;;;;N;;;;; +115C4;SIDDHAM SEPARATOR DOT;Po;0;L;;;;;N;;;;; +115C5;SIDDHAM SEPARATOR BAR;Po;0;L;;;;;N;;;;; +115C6;SIDDHAM REPETITION MARK-1;Po;0;L;;;;;N;;;;; +115C7;SIDDHAM REPETITION MARK-2;Po;0;L;;;;;N;;;;; +115C8;SIDDHAM REPETITION MARK-3;Po;0;L;;;;;N;;;;; +115C9;SIDDHAM END OF TEXT MARK;Po;0;L;;;;;N;;;;; +115CA;SIDDHAM SECTION MARK WITH TRIDENT AND U-SHAPED ORNAMENTS;Po;0;L;;;;;N;;;;; +115CB;SIDDHAM SECTION MARK WITH TRIDENT AND DOTTED CRESCENTS;Po;0;L;;;;;N;;;;; +115CC;SIDDHAM SECTION MARK WITH RAYS AND DOTTED CRESCENTS;Po;0;L;;;;;N;;;;; +115CD;SIDDHAM SECTION MARK WITH RAYS AND DOTTED DOUBLE CRESCENTS;Po;0;L;;;;;N;;;;; +115CE;SIDDHAM SECTION MARK WITH RAYS AND DOTTED TRIPLE CRESCENTS;Po;0;L;;;;;N;;;;; +115CF;SIDDHAM SECTION MARK DOUBLE RING;Po;0;L;;;;;N;;;;; +115D0;SIDDHAM SECTION MARK DOUBLE RING WITH RAYS;Po;0;L;;;;;N;;;;; +115D1;SIDDHAM SECTION MARK WITH DOUBLE CRESCENTS;Po;0;L;;;;;N;;;;; +115D2;SIDDHAM SECTION MARK WITH TRIPLE CRESCENTS;Po;0;L;;;;;N;;;;; +115D3;SIDDHAM SECTION MARK WITH QUADRUPLE CRESCENTS;Po;0;L;;;;;N;;;;; +115D4;SIDDHAM SECTION MARK WITH SEPTUPLE CRESCENTS;Po;0;L;;;;;N;;;;; +115D5;SIDDHAM SECTION MARK WITH CIRCLES AND RAYS;Po;0;L;;;;;N;;;;; +115D6;SIDDHAM SECTION MARK WITH CIRCLES AND TWO ENCLOSURES;Po;0;L;;;;;N;;;;; +115D7;SIDDHAM SECTION MARK WITH CIRCLES AND FOUR ENCLOSURES;Po;0;L;;;;;N;;;;; +115D8;SIDDHAM LETTER THREE-CIRCLE ALTERNATE I;Lo;0;L;;;;;N;;;;; +115D9;SIDDHAM LETTER TWO-CIRCLE ALTERNATE I;Lo;0;L;;;;;N;;;;; +115DA;SIDDHAM LETTER TWO-CIRCLE ALTERNATE II;Lo;0;L;;;;;N;;;;; +115DB;SIDDHAM LETTER ALTERNATE U;Lo;0;L;;;;;N;;;;; +115DC;SIDDHAM VOWEL SIGN ALTERNATE U;Mn;0;NSM;;;;;N;;;;; +115DD;SIDDHAM VOWEL SIGN ALTERNATE UU;Mn;0;NSM;;;;;N;;;;; +11600;MODI LETTER A;Lo;0;L;;;;;N;;;;; +11601;MODI LETTER AA;Lo;0;L;;;;;N;;;;; +11602;MODI LETTER I;Lo;0;L;;;;;N;;;;; +11603;MODI LETTER II;Lo;0;L;;;;;N;;;;; +11604;MODI LETTER U;Lo;0;L;;;;;N;;;;; +11605;MODI LETTER UU;Lo;0;L;;;;;N;;;;; +11606;MODI LETTER VOCALIC R;Lo;0;L;;;;;N;;;;; +11607;MODI LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;; +11608;MODI LETTER VOCALIC L;Lo;0;L;;;;;N;;;;; +11609;MODI LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;; +1160A;MODI LETTER E;Lo;0;L;;;;;N;;;;; +1160B;MODI LETTER AI;Lo;0;L;;;;;N;;;;; +1160C;MODI LETTER O;Lo;0;L;;;;;N;;;;; +1160D;MODI LETTER AU;Lo;0;L;;;;;N;;;;; +1160E;MODI LETTER KA;Lo;0;L;;;;;N;;;;; +1160F;MODI LETTER KHA;Lo;0;L;;;;;N;;;;; +11610;MODI LETTER GA;Lo;0;L;;;;;N;;;;; +11611;MODI LETTER GHA;Lo;0;L;;;;;N;;;;; +11612;MODI LETTER NGA;Lo;0;L;;;;;N;;;;; +11613;MODI LETTER CA;Lo;0;L;;;;;N;;;;; +11614;MODI LETTER CHA;Lo;0;L;;;;;N;;;;; +11615;MODI LETTER JA;Lo;0;L;;;;;N;;;;; +11616;MODI LETTER JHA;Lo;0;L;;;;;N;;;;; +11617;MODI LETTER NYA;Lo;0;L;;;;;N;;;;; +11618;MODI LETTER TTA;Lo;0;L;;;;;N;;;;; +11619;MODI LETTER TTHA;Lo;0;L;;;;;N;;;;; +1161A;MODI LETTER DDA;Lo;0;L;;;;;N;;;;; +1161B;MODI LETTER DDHA;Lo;0;L;;;;;N;;;;; +1161C;MODI LETTER NNA;Lo;0;L;;;;;N;;;;; +1161D;MODI LETTER TA;Lo;0;L;;;;;N;;;;; +1161E;MODI LETTER THA;Lo;0;L;;;;;N;;;;; +1161F;MODI LETTER DA;Lo;0;L;;;;;N;;;;; +11620;MODI LETTER DHA;Lo;0;L;;;;;N;;;;; +11621;MODI LETTER NA;Lo;0;L;;;;;N;;;;; +11622;MODI LETTER PA;Lo;0;L;;;;;N;;;;; +11623;MODI LETTER PHA;Lo;0;L;;;;;N;;;;; +11624;MODI LETTER BA;Lo;0;L;;;;;N;;;;; +11625;MODI LETTER BHA;Lo;0;L;;;;;N;;;;; +11626;MODI LETTER MA;Lo;0;L;;;;;N;;;;; +11627;MODI LETTER YA;Lo;0;L;;;;;N;;;;; +11628;MODI LETTER RA;Lo;0;L;;;;;N;;;;; +11629;MODI LETTER LA;Lo;0;L;;;;;N;;;;; +1162A;MODI LETTER VA;Lo;0;L;;;;;N;;;;; +1162B;MODI LETTER SHA;Lo;0;L;;;;;N;;;;; +1162C;MODI LETTER SSA;Lo;0;L;;;;;N;;;;; +1162D;MODI LETTER SA;Lo;0;L;;;;;N;;;;; +1162E;MODI LETTER HA;Lo;0;L;;;;;N;;;;; +1162F;MODI LETTER LLA;Lo;0;L;;;;;N;;;;; +11630;MODI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;; +11631;MODI VOWEL SIGN I;Mc;0;L;;;;;N;;;;; +11632;MODI VOWEL SIGN II;Mc;0;L;;;;;N;;;;; +11633;MODI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;; +11634;MODI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;; +11635;MODI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;; +11636;MODI VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;; +11637;MODI VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;; +11638;MODI VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;; +11639;MODI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;; +1163A;MODI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;; +1163B;MODI VOWEL SIGN O;Mc;0;L;;;;;N;;;;; +1163C;MODI VOWEL SIGN AU;Mc;0;L;;;;;N;;;;; +1163D;MODI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;; +1163E;MODI SIGN VISARGA;Mc;0;L;;;;;N;;;;; +1163F;MODI SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;; +11640;MODI SIGN ARDHACANDRA;Mn;0;NSM;;;;;N;;;;; +11641;MODI DANDA;Po;0;L;;;;;N;;;;; +11642;MODI DOUBLE DANDA;Po;0;L;;;;;N;;;;; +11643;MODI ABBREVIATION SIGN;Po;0;L;;;;;N;;;;; +11644;MODI SIGN HUVA;Lo;0;L;;;;;N;;;;; +11650;MODI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +11651;MODI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +11652;MODI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +11653;MODI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +11654;MODI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +11655;MODI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +11656;MODI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +11657;MODI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +11658;MODI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +11659;MODI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +11660;MONGOLIAN BIRGA WITH ORNAMENT;Po;0;ON;;;;;N;;;;; +11661;MONGOLIAN ROTATED BIRGA;Po;0;ON;;;;;N;;;;; +11662;MONGOLIAN DOUBLE BIRGA WITH ORNAMENT;Po;0;ON;;;;;N;;;;; +11663;MONGOLIAN TRIPLE BIRGA WITH ORNAMENT;Po;0;ON;;;;;N;;;;; +11664;MONGOLIAN BIRGA WITH DOUBLE ORNAMENT;Po;0;ON;;;;;N;;;;; +11665;MONGOLIAN ROTATED BIRGA WITH ORNAMENT;Po;0;ON;;;;;N;;;;; +11666;MONGOLIAN ROTATED BIRGA WITH DOUBLE ORNAMENT;Po;0;ON;;;;;N;;;;; +11667;MONGOLIAN INVERTED BIRGA;Po;0;ON;;;;;N;;;;; +11668;MONGOLIAN INVERTED BIRGA WITH DOUBLE ORNAMENT;Po;0;ON;;;;;N;;;;; +11669;MONGOLIAN SWIRL BIRGA;Po;0;ON;;;;;N;;;;; +1166A;MONGOLIAN SWIRL BIRGA WITH ORNAMENT;Po;0;ON;;;;;N;;;;; +1166B;MONGOLIAN SWIRL BIRGA WITH DOUBLE ORNAMENT;Po;0;ON;;;;;N;;;;; +1166C;MONGOLIAN TURNED SWIRL BIRGA WITH DOUBLE ORNAMENT;Po;0;ON;;;;;N;;;;; +11680;TAKRI LETTER A;Lo;0;L;;;;;N;;;;; +11681;TAKRI LETTER AA;Lo;0;L;;;;;N;;;;; +11682;TAKRI LETTER I;Lo;0;L;;;;;N;;;;; +11683;TAKRI LETTER II;Lo;0;L;;;;;N;;;;; +11684;TAKRI LETTER U;Lo;0;L;;;;;N;;;;; +11685;TAKRI LETTER UU;Lo;0;L;;;;;N;;;;; +11686;TAKRI LETTER E;Lo;0;L;;;;;N;;;;; +11687;TAKRI LETTER AI;Lo;0;L;;;;;N;;;;; +11688;TAKRI LETTER O;Lo;0;L;;;;;N;;;;; +11689;TAKRI LETTER AU;Lo;0;L;;;;;N;;;;; +1168A;TAKRI LETTER KA;Lo;0;L;;;;;N;;;;; +1168B;TAKRI LETTER KHA;Lo;0;L;;;;;N;;;;; +1168C;TAKRI LETTER GA;Lo;0;L;;;;;N;;;;; +1168D;TAKRI LETTER GHA;Lo;0;L;;;;;N;;;;; +1168E;TAKRI LETTER NGA;Lo;0;L;;;;;N;;;;; +1168F;TAKRI LETTER CA;Lo;0;L;;;;;N;;;;; +11690;TAKRI LETTER CHA;Lo;0;L;;;;;N;;;;; +11691;TAKRI LETTER JA;Lo;0;L;;;;;N;;;;; +11692;TAKRI LETTER JHA;Lo;0;L;;;;;N;;;;; +11693;TAKRI LETTER NYA;Lo;0;L;;;;;N;;;;; +11694;TAKRI LETTER TTA;Lo;0;L;;;;;N;;;;; +11695;TAKRI LETTER TTHA;Lo;0;L;;;;;N;;;;; +11696;TAKRI LETTER DDA;Lo;0;L;;;;;N;;;;; +11697;TAKRI LETTER DDHA;Lo;0;L;;;;;N;;;;; +11698;TAKRI LETTER NNA;Lo;0;L;;;;;N;;;;; +11699;TAKRI LETTER TA;Lo;0;L;;;;;N;;;;; +1169A;TAKRI LETTER THA;Lo;0;L;;;;;N;;;;; +1169B;TAKRI LETTER DA;Lo;0;L;;;;;N;;;;; +1169C;TAKRI LETTER DHA;Lo;0;L;;;;;N;;;;; +1169D;TAKRI LETTER NA;Lo;0;L;;;;;N;;;;; +1169E;TAKRI LETTER PA;Lo;0;L;;;;;N;;;;; +1169F;TAKRI LETTER PHA;Lo;0;L;;;;;N;;;;; +116A0;TAKRI LETTER BA;Lo;0;L;;;;;N;;;;; +116A1;TAKRI LETTER BHA;Lo;0;L;;;;;N;;;;; +116A2;TAKRI LETTER MA;Lo;0;L;;;;;N;;;;; +116A3;TAKRI LETTER YA;Lo;0;L;;;;;N;;;;; +116A4;TAKRI LETTER RA;Lo;0;L;;;;;N;;;;; +116A5;TAKRI LETTER LA;Lo;0;L;;;;;N;;;;; +116A6;TAKRI LETTER VA;Lo;0;L;;;;;N;;;;; +116A7;TAKRI LETTER SHA;Lo;0;L;;;;;N;;;;; +116A8;TAKRI LETTER SA;Lo;0;L;;;;;N;;;;; +116A9;TAKRI LETTER HA;Lo;0;L;;;;;N;;;;; +116AA;TAKRI LETTER RRA;Lo;0;L;;;;;N;;;;; +116AB;TAKRI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;; +116AC;TAKRI SIGN VISARGA;Mc;0;L;;;;;N;;;;; +116AD;TAKRI VOWEL SIGN AA;Mn;0;NSM;;;;;N;;;;; +116AE;TAKRI VOWEL SIGN I;Mc;0;L;;;;;N;;;;; +116AF;TAKRI VOWEL SIGN II;Mc;0;L;;;;;N;;;;; +116B0;TAKRI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;; +116B1;TAKRI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;; +116B2;TAKRI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;; +116B3;TAKRI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;; +116B4;TAKRI VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;; +116B5;TAKRI VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;; +116B6;TAKRI SIGN VIRAMA;Mc;9;L;;;;;N;;;;; +116B7;TAKRI SIGN NUKTA;Mn;7;NSM;;;;;N;;;;; +116B8;TAKRI LETTER ARCHAIC KHA;Lo;0;L;;;;;N;;;;; +116B9;TAKRI ABBREVIATION SIGN;Po;0;L;;;;;N;;;;; +116C0;TAKRI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +116C1;TAKRI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +116C2;TAKRI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +116C3;TAKRI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +116C4;TAKRI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +116C5;TAKRI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +116C6;TAKRI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +116C7;TAKRI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +116C8;TAKRI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +116C9;TAKRI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +116D0;MYANMAR PAO DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +116D1;MYANMAR PAO DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +116D2;MYANMAR PAO DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +116D3;MYANMAR PAO DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +116D4;MYANMAR PAO DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +116D5;MYANMAR PAO DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +116D6;MYANMAR PAO DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +116D7;MYANMAR PAO DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +116D8;MYANMAR PAO DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +116D9;MYANMAR PAO DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +116DA;MYANMAR EASTERN PWO KAREN DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +116DB;MYANMAR EASTERN PWO KAREN DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +116DC;MYANMAR EASTERN PWO KAREN DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +116DD;MYANMAR EASTERN PWO KAREN DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +116DE;MYANMAR EASTERN PWO KAREN DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +116DF;MYANMAR EASTERN PWO KAREN DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +116E0;MYANMAR EASTERN PWO KAREN DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +116E1;MYANMAR EASTERN PWO KAREN DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +116E2;MYANMAR EASTERN PWO KAREN DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +116E3;MYANMAR EASTERN PWO KAREN DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +11700;AHOM LETTER KA;Lo;0;L;;;;;N;;;;; +11701;AHOM LETTER KHA;Lo;0;L;;;;;N;;;;; +11702;AHOM LETTER NGA;Lo;0;L;;;;;N;;;;; +11703;AHOM LETTER NA;Lo;0;L;;;;;N;;;;; +11704;AHOM LETTER TA;Lo;0;L;;;;;N;;;;; +11705;AHOM LETTER ALTERNATE TA;Lo;0;L;;;;;N;;;;; +11706;AHOM LETTER PA;Lo;0;L;;;;;N;;;;; +11707;AHOM LETTER PHA;Lo;0;L;;;;;N;;;;; +11708;AHOM LETTER BA;Lo;0;L;;;;;N;;;;; +11709;AHOM LETTER MA;Lo;0;L;;;;;N;;;;; +1170A;AHOM LETTER JA;Lo;0;L;;;;;N;;;;; +1170B;AHOM LETTER CHA;Lo;0;L;;;;;N;;;;; +1170C;AHOM LETTER THA;Lo;0;L;;;;;N;;;;; +1170D;AHOM LETTER RA;Lo;0;L;;;;;N;;;;; +1170E;AHOM LETTER LA;Lo;0;L;;;;;N;;;;; +1170F;AHOM LETTER SA;Lo;0;L;;;;;N;;;;; +11710;AHOM LETTER NYA;Lo;0;L;;;;;N;;;;; +11711;AHOM LETTER HA;Lo;0;L;;;;;N;;;;; +11712;AHOM LETTER A;Lo;0;L;;;;;N;;;;; +11713;AHOM LETTER DA;Lo;0;L;;;;;N;;;;; +11714;AHOM LETTER DHA;Lo;0;L;;;;;N;;;;; +11715;AHOM LETTER GA;Lo;0;L;;;;;N;;;;; +11716;AHOM LETTER ALTERNATE GA;Lo;0;L;;;;;N;;;;; +11717;AHOM LETTER GHA;Lo;0;L;;;;;N;;;;; +11718;AHOM LETTER BHA;Lo;0;L;;;;;N;;;;; +11719;AHOM LETTER JHA;Lo;0;L;;;;;N;;;;; +1171A;AHOM LETTER ALTERNATE BA;Lo;0;L;;;;;N;;;;; +1171D;AHOM CONSONANT SIGN MEDIAL LA;Mn;0;NSM;;;;;N;;;;; +1171E;AHOM CONSONANT SIGN MEDIAL RA;Mc;0;L;;;;;N;;;;; +1171F;AHOM CONSONANT SIGN MEDIAL LIGATING RA;Mn;0;NSM;;;;;N;;;;; +11720;AHOM VOWEL SIGN A;Mc;0;L;;;;;N;;;;; +11721;AHOM VOWEL SIGN AA;Mc;0;L;;;;;N;;;;; +11722;AHOM VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;; +11723;AHOM VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;; +11724;AHOM VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;; +11725;AHOM VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;; +11726;AHOM VOWEL SIGN E;Mc;0;L;;;;;N;;;;; +11727;AHOM VOWEL SIGN AW;Mn;0;NSM;;;;;N;;;;; +11728;AHOM VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;; +11729;AHOM VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;; +1172A;AHOM VOWEL SIGN AM;Mn;0;NSM;;;;;N;;;;; +1172B;AHOM SIGN KILLER;Mn;9;NSM;;;;;N;;;;; +11730;AHOM DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +11731;AHOM DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +11732;AHOM DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +11733;AHOM DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +11734;AHOM DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +11735;AHOM DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +11736;AHOM DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +11737;AHOM DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +11738;AHOM DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +11739;AHOM DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +1173A;AHOM NUMBER TEN;No;0;L;;;;10;N;;;;; +1173B;AHOM NUMBER TWENTY;No;0;L;;;;20;N;;;;; +1173C;AHOM SIGN SMALL SECTION;Po;0;L;;;;;N;;;;; +1173D;AHOM SIGN SECTION;Po;0;L;;;;;N;;;;; +1173E;AHOM SIGN RULAI;Po;0;L;;;;;N;;;;; +1173F;AHOM SYMBOL VI;So;0;L;;;;;N;;;;; +11740;AHOM LETTER CA;Lo;0;L;;;;;N;;;;; +11741;AHOM LETTER TTA;Lo;0;L;;;;;N;;;;; +11742;AHOM LETTER TTHA;Lo;0;L;;;;;N;;;;; +11743;AHOM LETTER DDA;Lo;0;L;;;;;N;;;;; +11744;AHOM LETTER DDHA;Lo;0;L;;;;;N;;;;; +11745;AHOM LETTER NNA;Lo;0;L;;;;;N;;;;; +11746;AHOM LETTER LLA;Lo;0;L;;;;;N;;;;; +11800;DOGRA LETTER A;Lo;0;L;;;;;N;;;;; +11801;DOGRA LETTER AA;Lo;0;L;;;;;N;;;;; +11802;DOGRA LETTER I;Lo;0;L;;;;;N;;;;; +11803;DOGRA LETTER II;Lo;0;L;;;;;N;;;;; +11804;DOGRA LETTER U;Lo;0;L;;;;;N;;;;; +11805;DOGRA LETTER UU;Lo;0;L;;;;;N;;;;; +11806;DOGRA LETTER E;Lo;0;L;;;;;N;;;;; +11807;DOGRA LETTER AI;Lo;0;L;;;;;N;;;;; +11808;DOGRA LETTER O;Lo;0;L;;;;;N;;;;; +11809;DOGRA LETTER AU;Lo;0;L;;;;;N;;;;; +1180A;DOGRA LETTER KA;Lo;0;L;;;;;N;;;;; +1180B;DOGRA LETTER KHA;Lo;0;L;;;;;N;;;;; +1180C;DOGRA LETTER GA;Lo;0;L;;;;;N;;;;; +1180D;DOGRA LETTER GHA;Lo;0;L;;;;;N;;;;; +1180E;DOGRA LETTER NGA;Lo;0;L;;;;;N;;;;; +1180F;DOGRA LETTER CA;Lo;0;L;;;;;N;;;;; +11810;DOGRA LETTER CHA;Lo;0;L;;;;;N;;;;; +11811;DOGRA LETTER JA;Lo;0;L;;;;;N;;;;; +11812;DOGRA LETTER JHA;Lo;0;L;;;;;N;;;;; +11813;DOGRA LETTER NYA;Lo;0;L;;;;;N;;;;; +11814;DOGRA LETTER TTA;Lo;0;L;;;;;N;;;;; +11815;DOGRA LETTER TTHA;Lo;0;L;;;;;N;;;;; +11816;DOGRA LETTER DDA;Lo;0;L;;;;;N;;;;; +11817;DOGRA LETTER DDHA;Lo;0;L;;;;;N;;;;; +11818;DOGRA LETTER NNA;Lo;0;L;;;;;N;;;;; +11819;DOGRA LETTER TA;Lo;0;L;;;;;N;;;;; +1181A;DOGRA LETTER THA;Lo;0;L;;;;;N;;;;; +1181B;DOGRA LETTER DA;Lo;0;L;;;;;N;;;;; +1181C;DOGRA LETTER DHA;Lo;0;L;;;;;N;;;;; +1181D;DOGRA LETTER NA;Lo;0;L;;;;;N;;;;; +1181E;DOGRA LETTER PA;Lo;0;L;;;;;N;;;;; +1181F;DOGRA LETTER PHA;Lo;0;L;;;;;N;;;;; +11820;DOGRA LETTER BA;Lo;0;L;;;;;N;;;;; +11821;DOGRA LETTER BHA;Lo;0;L;;;;;N;;;;; +11822;DOGRA LETTER MA;Lo;0;L;;;;;N;;;;; +11823;DOGRA LETTER YA;Lo;0;L;;;;;N;;;;; +11824;DOGRA LETTER RA;Lo;0;L;;;;;N;;;;; +11825;DOGRA LETTER LA;Lo;0;L;;;;;N;;;;; +11826;DOGRA LETTER VA;Lo;0;L;;;;;N;;;;; +11827;DOGRA LETTER SHA;Lo;0;L;;;;;N;;;;; +11828;DOGRA LETTER SSA;Lo;0;L;;;;;N;;;;; +11829;DOGRA LETTER SA;Lo;0;L;;;;;N;;;;; +1182A;DOGRA LETTER HA;Lo;0;L;;;;;N;;;;; +1182B;DOGRA LETTER RRA;Lo;0;L;;;;;N;;;;; +1182C;DOGRA VOWEL SIGN AA;Mc;0;L;;;;;N;;;;; +1182D;DOGRA VOWEL SIGN I;Mc;0;L;;;;;N;;;;; +1182E;DOGRA VOWEL SIGN II;Mc;0;L;;;;;N;;;;; +1182F;DOGRA VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;; +11830;DOGRA VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;; +11831;DOGRA VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;; +11832;DOGRA VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;; +11833;DOGRA VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;; +11834;DOGRA VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;; +11835;DOGRA VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;; +11836;DOGRA VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;; +11837;DOGRA SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;; +11838;DOGRA SIGN VISARGA;Mc;0;L;;;;;N;;;;; +11839;DOGRA SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;; +1183A;DOGRA SIGN NUKTA;Mn;7;NSM;;;;;N;;;;; +1183B;DOGRA ABBREVIATION SIGN;Po;0;L;;;;;N;;;;; +118A0;WARANG CITI CAPITAL LETTER NGAA;Lu;0;L;;;;;N;;;;118C0; +118A1;WARANG CITI CAPITAL LETTER A;Lu;0;L;;;;;N;;;;118C1; +118A2;WARANG CITI CAPITAL LETTER WI;Lu;0;L;;;;;N;;;;118C2; +118A3;WARANG CITI CAPITAL LETTER YU;Lu;0;L;;;;;N;;;;118C3; +118A4;WARANG CITI CAPITAL LETTER YA;Lu;0;L;;;;;N;;;;118C4; +118A5;WARANG CITI CAPITAL LETTER YO;Lu;0;L;;;;;N;;;;118C5; +118A6;WARANG CITI CAPITAL LETTER II;Lu;0;L;;;;;N;;;;118C6; +118A7;WARANG CITI CAPITAL LETTER UU;Lu;0;L;;;;;N;;;;118C7; +118A8;WARANG CITI CAPITAL LETTER E;Lu;0;L;;;;;N;;;;118C8; +118A9;WARANG CITI CAPITAL LETTER O;Lu;0;L;;;;;N;;;;118C9; +118AA;WARANG CITI CAPITAL LETTER ANG;Lu;0;L;;;;;N;;;;118CA; +118AB;WARANG CITI CAPITAL LETTER GA;Lu;0;L;;;;;N;;;;118CB; +118AC;WARANG CITI CAPITAL LETTER KO;Lu;0;L;;;;;N;;;;118CC; +118AD;WARANG CITI CAPITAL LETTER ENY;Lu;0;L;;;;;N;;;;118CD; +118AE;WARANG CITI CAPITAL LETTER YUJ;Lu;0;L;;;;;N;;;;118CE; +118AF;WARANG CITI CAPITAL LETTER UC;Lu;0;L;;;;;N;;;;118CF; +118B0;WARANG CITI CAPITAL LETTER ENN;Lu;0;L;;;;;N;;;;118D0; +118B1;WARANG CITI CAPITAL LETTER ODD;Lu;0;L;;;;;N;;;;118D1; +118B2;WARANG CITI CAPITAL LETTER TTE;Lu;0;L;;;;;N;;;;118D2; +118B3;WARANG CITI CAPITAL LETTER NUNG;Lu;0;L;;;;;N;;;;118D3; +118B4;WARANG CITI CAPITAL LETTER DA;Lu;0;L;;;;;N;;;;118D4; +118B5;WARANG CITI CAPITAL LETTER AT;Lu;0;L;;;;;N;;;;118D5; +118B6;WARANG CITI CAPITAL LETTER AM;Lu;0;L;;;;;N;;;;118D6; +118B7;WARANG CITI CAPITAL LETTER BU;Lu;0;L;;;;;N;;;;118D7; +118B8;WARANG CITI CAPITAL LETTER PU;Lu;0;L;;;;;N;;;;118D8; +118B9;WARANG CITI CAPITAL LETTER HIYO;Lu;0;L;;;;;N;;;;118D9; +118BA;WARANG CITI CAPITAL LETTER HOLO;Lu;0;L;;;;;N;;;;118DA; +118BB;WARANG CITI CAPITAL LETTER HORR;Lu;0;L;;;;;N;;;;118DB; +118BC;WARANG CITI CAPITAL LETTER HAR;Lu;0;L;;;;;N;;;;118DC; +118BD;WARANG CITI CAPITAL LETTER SSUU;Lu;0;L;;;;;N;;;;118DD; +118BE;WARANG CITI CAPITAL LETTER SII;Lu;0;L;;;;;N;;;;118DE; +118BF;WARANG CITI CAPITAL LETTER VIYO;Lu;0;L;;;;;N;;;;118DF; +118C0;WARANG CITI SMALL LETTER NGAA;Ll;0;L;;;;;N;;;118A0;;118A0 +118C1;WARANG CITI SMALL LETTER A;Ll;0;L;;;;;N;;;118A1;;118A1 +118C2;WARANG CITI SMALL LETTER WI;Ll;0;L;;;;;N;;;118A2;;118A2 +118C3;WARANG CITI SMALL LETTER YU;Ll;0;L;;;;;N;;;118A3;;118A3 +118C4;WARANG CITI SMALL LETTER YA;Ll;0;L;;;;;N;;;118A4;;118A4 +118C5;WARANG CITI SMALL LETTER YO;Ll;0;L;;;;;N;;;118A5;;118A5 +118C6;WARANG CITI SMALL LETTER II;Ll;0;L;;;;;N;;;118A6;;118A6 +118C7;WARANG CITI SMALL LETTER UU;Ll;0;L;;;;;N;;;118A7;;118A7 +118C8;WARANG CITI SMALL LETTER E;Ll;0;L;;;;;N;;;118A8;;118A8 +118C9;WARANG CITI SMALL LETTER O;Ll;0;L;;;;;N;;;118A9;;118A9 +118CA;WARANG CITI SMALL LETTER ANG;Ll;0;L;;;;;N;;;118AA;;118AA +118CB;WARANG CITI SMALL LETTER GA;Ll;0;L;;;;;N;;;118AB;;118AB +118CC;WARANG CITI SMALL LETTER KO;Ll;0;L;;;;;N;;;118AC;;118AC +118CD;WARANG CITI SMALL LETTER ENY;Ll;0;L;;;;;N;;;118AD;;118AD +118CE;WARANG CITI SMALL LETTER YUJ;Ll;0;L;;;;;N;;;118AE;;118AE +118CF;WARANG CITI SMALL LETTER UC;Ll;0;L;;;;;N;;;118AF;;118AF +118D0;WARANG CITI SMALL LETTER ENN;Ll;0;L;;;;;N;;;118B0;;118B0 +118D1;WARANG CITI SMALL LETTER ODD;Ll;0;L;;;;;N;;;118B1;;118B1 +118D2;WARANG CITI SMALL LETTER TTE;Ll;0;L;;;;;N;;;118B2;;118B2 +118D3;WARANG CITI SMALL LETTER NUNG;Ll;0;L;;;;;N;;;118B3;;118B3 +118D4;WARANG CITI SMALL LETTER DA;Ll;0;L;;;;;N;;;118B4;;118B4 +118D5;WARANG CITI SMALL LETTER AT;Ll;0;L;;;;;N;;;118B5;;118B5 +118D6;WARANG CITI SMALL LETTER AM;Ll;0;L;;;;;N;;;118B6;;118B6 +118D7;WARANG CITI SMALL LETTER BU;Ll;0;L;;;;;N;;;118B7;;118B7 +118D8;WARANG CITI SMALL LETTER PU;Ll;0;L;;;;;N;;;118B8;;118B8 +118D9;WARANG CITI SMALL LETTER HIYO;Ll;0;L;;;;;N;;;118B9;;118B9 +118DA;WARANG CITI SMALL LETTER HOLO;Ll;0;L;;;;;N;;;118BA;;118BA +118DB;WARANG CITI SMALL LETTER HORR;Ll;0;L;;;;;N;;;118BB;;118BB +118DC;WARANG CITI SMALL LETTER HAR;Ll;0;L;;;;;N;;;118BC;;118BC +118DD;WARANG CITI SMALL LETTER SSUU;Ll;0;L;;;;;N;;;118BD;;118BD +118DE;WARANG CITI SMALL LETTER SII;Ll;0;L;;;;;N;;;118BE;;118BE +118DF;WARANG CITI SMALL LETTER VIYO;Ll;0;L;;;;;N;;;118BF;;118BF +118E0;WARANG CITI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +118E1;WARANG CITI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +118E2;WARANG CITI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +118E3;WARANG CITI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +118E4;WARANG CITI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +118E5;WARANG CITI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +118E6;WARANG CITI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +118E7;WARANG CITI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +118E8;WARANG CITI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +118E9;WARANG CITI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +118EA;WARANG CITI NUMBER TEN;No;0;L;;;;10;N;;;;; +118EB;WARANG CITI NUMBER TWENTY;No;0;L;;;;20;N;;;;; +118EC;WARANG CITI NUMBER THIRTY;No;0;L;;;;30;N;;;;; +118ED;WARANG CITI NUMBER FORTY;No;0;L;;;;40;N;;;;; +118EE;WARANG CITI NUMBER FIFTY;No;0;L;;;;50;N;;;;; +118EF;WARANG CITI NUMBER SIXTY;No;0;L;;;;60;N;;;;; +118F0;WARANG CITI NUMBER SEVENTY;No;0;L;;;;70;N;;;;; +118F1;WARANG CITI NUMBER EIGHTY;No;0;L;;;;80;N;;;;; +118F2;WARANG CITI NUMBER NINETY;No;0;L;;;;90;N;;;;; +118FF;WARANG CITI OM;Lo;0;L;;;;;N;;;;; +11900;DIVES AKURU LETTER A;Lo;0;L;;;;;N;;;;; +11901;DIVES AKURU LETTER AA;Lo;0;L;;;;;N;;;;; +11902;DIVES AKURU LETTER I;Lo;0;L;;;;;N;;;;; +11903;DIVES AKURU LETTER II;Lo;0;L;;;;;N;;;;; +11904;DIVES AKURU LETTER U;Lo;0;L;;;;;N;;;;; +11905;DIVES AKURU LETTER UU;Lo;0;L;;;;;N;;;;; +11906;DIVES AKURU LETTER E;Lo;0;L;;;;;N;;;;; +11909;DIVES AKURU LETTER O;Lo;0;L;;;;;N;;;;; +1190C;DIVES AKURU LETTER KA;Lo;0;L;;;;;N;;;;; +1190D;DIVES AKURU LETTER KHA;Lo;0;L;;;;;N;;;;; +1190E;DIVES AKURU LETTER GA;Lo;0;L;;;;;N;;;;; +1190F;DIVES AKURU LETTER GHA;Lo;0;L;;;;;N;;;;; +11910;DIVES AKURU LETTER NGA;Lo;0;L;;;;;N;;;;; +11911;DIVES AKURU LETTER CA;Lo;0;L;;;;;N;;;;; +11912;DIVES AKURU LETTER CHA;Lo;0;L;;;;;N;;;;; +11913;DIVES AKURU LETTER JA;Lo;0;L;;;;;N;;;;; +11915;DIVES AKURU LETTER NYA;Lo;0;L;;;;;N;;;;; +11916;DIVES AKURU LETTER TTA;Lo;0;L;;;;;N;;;;; +11918;DIVES AKURU LETTER DDA;Lo;0;L;;;;;N;;;;; +11919;DIVES AKURU LETTER DDHA;Lo;0;L;;;;;N;;;;; +1191A;DIVES AKURU LETTER NNA;Lo;0;L;;;;;N;;;;; +1191B;DIVES AKURU LETTER TA;Lo;0;L;;;;;N;;;;; +1191C;DIVES AKURU LETTER THA;Lo;0;L;;;;;N;;;;; +1191D;DIVES AKURU LETTER DA;Lo;0;L;;;;;N;;;;; +1191E;DIVES AKURU LETTER DHA;Lo;0;L;;;;;N;;;;; +1191F;DIVES AKURU LETTER NA;Lo;0;L;;;;;N;;;;; +11920;DIVES AKURU LETTER PA;Lo;0;L;;;;;N;;;;; +11921;DIVES AKURU LETTER PHA;Lo;0;L;;;;;N;;;;; +11922;DIVES AKURU LETTER BA;Lo;0;L;;;;;N;;;;; +11923;DIVES AKURU LETTER BHA;Lo;0;L;;;;;N;;;;; +11924;DIVES AKURU LETTER MA;Lo;0;L;;;;;N;;;;; +11925;DIVES AKURU LETTER YA;Lo;0;L;;;;;N;;;;; +11926;DIVES AKURU LETTER YYA;Lo;0;L;;;;;N;;;;; +11927;DIVES AKURU LETTER RA;Lo;0;L;;;;;N;;;;; +11928;DIVES AKURU LETTER LA;Lo;0;L;;;;;N;;;;; +11929;DIVES AKURU LETTER VA;Lo;0;L;;;;;N;;;;; +1192A;DIVES AKURU LETTER SHA;Lo;0;L;;;;;N;;;;; +1192B;DIVES AKURU LETTER SSA;Lo;0;L;;;;;N;;;;; +1192C;DIVES AKURU LETTER SA;Lo;0;L;;;;;N;;;;; +1192D;DIVES AKURU LETTER HA;Lo;0;L;;;;;N;;;;; +1192E;DIVES AKURU LETTER LLA;Lo;0;L;;;;;N;;;;; +1192F;DIVES AKURU LETTER ZA;Lo;0;L;;;;;N;;;;; +11930;DIVES AKURU VOWEL SIGN AA;Mc;0;L;;;;;N;;;;; +11931;DIVES AKURU VOWEL SIGN I;Mc;0;L;;;;;N;;;;; +11932;DIVES AKURU VOWEL SIGN II;Mc;0;L;;;;;N;;;;; +11933;DIVES AKURU VOWEL SIGN U;Mc;0;L;;;;;N;;;;; +11934;DIVES AKURU VOWEL SIGN UU;Mc;0;L;;;;;N;;;;; +11935;DIVES AKURU VOWEL SIGN E;Mc;0;L;;;;;N;;;;; +11937;DIVES AKURU VOWEL SIGN AI;Mc;0;L;;;;;N;;;;; +11938;DIVES AKURU VOWEL SIGN O;Mc;0;L;11935 11930;;;;N;;;;; +1193B;DIVES AKURU SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;; +1193C;DIVES AKURU SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;; +1193D;DIVES AKURU SIGN HALANTA;Mc;9;L;;;;;N;;;;; +1193E;DIVES AKURU VIRAMA;Mn;9;NSM;;;;;N;;;;; +1193F;DIVES AKURU PREFIXED NASAL SIGN;Lo;0;L;;;;;N;;;;; +11940;DIVES AKURU MEDIAL YA;Mc;0;L;;;;;N;;;;; +11941;DIVES AKURU INITIAL RA;Lo;0;L;;;;;N;;;;; +11942;DIVES AKURU MEDIAL RA;Mc;0;L;;;;;N;;;;; +11943;DIVES AKURU SIGN NUKTA;Mn;7;NSM;;;;;N;;;;; +11944;DIVES AKURU DOUBLE DANDA;Po;0;L;;;;;N;;;;; +11945;DIVES AKURU GAP FILLER;Po;0;L;;;;;N;;;;; +11946;DIVES AKURU END OF TEXT MARK;Po;0;L;;;;;N;;;;; +11950;DIVES AKURU DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +11951;DIVES AKURU DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +11952;DIVES AKURU DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +11953;DIVES AKURU DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +11954;DIVES AKURU DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +11955;DIVES AKURU DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +11956;DIVES AKURU DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +11957;DIVES AKURU DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +11958;DIVES AKURU DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +11959;DIVES AKURU DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +119A0;NANDINAGARI LETTER A;Lo;0;L;;;;;N;;;;; +119A1;NANDINAGARI LETTER AA;Lo;0;L;;;;;N;;;;; +119A2;NANDINAGARI LETTER I;Lo;0;L;;;;;N;;;;; +119A3;NANDINAGARI LETTER II;Lo;0;L;;;;;N;;;;; +119A4;NANDINAGARI LETTER U;Lo;0;L;;;;;N;;;;; +119A5;NANDINAGARI LETTER UU;Lo;0;L;;;;;N;;;;; +119A6;NANDINAGARI LETTER VOCALIC R;Lo;0;L;;;;;N;;;;; +119A7;NANDINAGARI LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;; +119AA;NANDINAGARI LETTER E;Lo;0;L;;;;;N;;;;; +119AB;NANDINAGARI LETTER AI;Lo;0;L;;;;;N;;;;; +119AC;NANDINAGARI LETTER O;Lo;0;L;;;;;N;;;;; +119AD;NANDINAGARI LETTER AU;Lo;0;L;;;;;N;;;;; +119AE;NANDINAGARI LETTER KA;Lo;0;L;;;;;N;;;;; +119AF;NANDINAGARI LETTER KHA;Lo;0;L;;;;;N;;;;; +119B0;NANDINAGARI LETTER GA;Lo;0;L;;;;;N;;;;; +119B1;NANDINAGARI LETTER GHA;Lo;0;L;;;;;N;;;;; +119B2;NANDINAGARI LETTER NGA;Lo;0;L;;;;;N;;;;; +119B3;NANDINAGARI LETTER CA;Lo;0;L;;;;;N;;;;; +119B4;NANDINAGARI LETTER CHA;Lo;0;L;;;;;N;;;;; +119B5;NANDINAGARI LETTER JA;Lo;0;L;;;;;N;;;;; +119B6;NANDINAGARI LETTER JHA;Lo;0;L;;;;;N;;;;; +119B7;NANDINAGARI LETTER NYA;Lo;0;L;;;;;N;;;;; +119B8;NANDINAGARI LETTER TTA;Lo;0;L;;;;;N;;;;; +119B9;NANDINAGARI LETTER TTHA;Lo;0;L;;;;;N;;;;; +119BA;NANDINAGARI LETTER DDA;Lo;0;L;;;;;N;;;;; +119BB;NANDINAGARI LETTER DDHA;Lo;0;L;;;;;N;;;;; +119BC;NANDINAGARI LETTER NNA;Lo;0;L;;;;;N;;;;; +119BD;NANDINAGARI LETTER TA;Lo;0;L;;;;;N;;;;; +119BE;NANDINAGARI LETTER THA;Lo;0;L;;;;;N;;;;; +119BF;NANDINAGARI LETTER DA;Lo;0;L;;;;;N;;;;; +119C0;NANDINAGARI LETTER DHA;Lo;0;L;;;;;N;;;;; +119C1;NANDINAGARI LETTER NA;Lo;0;L;;;;;N;;;;; +119C2;NANDINAGARI LETTER PA;Lo;0;L;;;;;N;;;;; +119C3;NANDINAGARI LETTER PHA;Lo;0;L;;;;;N;;;;; +119C4;NANDINAGARI LETTER BA;Lo;0;L;;;;;N;;;;; +119C5;NANDINAGARI LETTER BHA;Lo;0;L;;;;;N;;;;; +119C6;NANDINAGARI LETTER MA;Lo;0;L;;;;;N;;;;; +119C7;NANDINAGARI LETTER YA;Lo;0;L;;;;;N;;;;; +119C8;NANDINAGARI LETTER RA;Lo;0;L;;;;;N;;;;; +119C9;NANDINAGARI LETTER LA;Lo;0;L;;;;;N;;;;; +119CA;NANDINAGARI LETTER VA;Lo;0;L;;;;;N;;;;; +119CB;NANDINAGARI LETTER SHA;Lo;0;L;;;;;N;;;;; +119CC;NANDINAGARI LETTER SSA;Lo;0;L;;;;;N;;;;; +119CD;NANDINAGARI LETTER SA;Lo;0;L;;;;;N;;;;; +119CE;NANDINAGARI LETTER HA;Lo;0;L;;;;;N;;;;; +119CF;NANDINAGARI LETTER LLA;Lo;0;L;;;;;N;;;;; +119D0;NANDINAGARI LETTER RRA;Lo;0;L;;;;;N;;;;; +119D1;NANDINAGARI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;; +119D2;NANDINAGARI VOWEL SIGN I;Mc;0;L;;;;;N;;;;; +119D3;NANDINAGARI VOWEL SIGN II;Mc;0;L;;;;;N;;;;; +119D4;NANDINAGARI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;; +119D5;NANDINAGARI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;; +119D6;NANDINAGARI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;; +119D7;NANDINAGARI VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;; +119DA;NANDINAGARI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;; +119DB;NANDINAGARI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;; +119DC;NANDINAGARI VOWEL SIGN O;Mc;0;L;;;;;N;;;;; +119DD;NANDINAGARI VOWEL SIGN AU;Mc;0;L;;;;;N;;;;; +119DE;NANDINAGARI SIGN ANUSVARA;Mc;0;L;;;;;N;;;;; +119DF;NANDINAGARI SIGN VISARGA;Mc;0;L;;;;;N;;;;; +119E0;NANDINAGARI SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;; +119E1;NANDINAGARI SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;; +119E2;NANDINAGARI SIGN SIDDHAM;Po;0;L;;;;;N;;;;; +119E3;NANDINAGARI HEADSTROKE;Lo;0;L;;;;;N;;;;; +119E4;NANDINAGARI VOWEL SIGN PRISHTHAMATRA E;Mc;0;L;;;;;N;;;;; +11A00;ZANABAZAR SQUARE LETTER A;Lo;0;L;;;;;N;;;;; +11A01;ZANABAZAR SQUARE VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;; +11A02;ZANABAZAR SQUARE VOWEL SIGN UE;Mn;0;NSM;;;;;N;;;;; +11A03;ZANABAZAR SQUARE VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;; +11A04;ZANABAZAR SQUARE VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;; +11A05;ZANABAZAR SQUARE VOWEL SIGN OE;Mn;0;NSM;;;;;N;;;;; +11A06;ZANABAZAR SQUARE VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;; +11A07;ZANABAZAR SQUARE VOWEL SIGN AI;Mn;0;L;;;;;N;;;;; +11A08;ZANABAZAR SQUARE VOWEL SIGN AU;Mn;0;L;;;;;N;;;;; +11A09;ZANABAZAR SQUARE VOWEL SIGN REVERSED I;Mn;0;NSM;;;;;N;;;;; +11A0A;ZANABAZAR SQUARE VOWEL LENGTH MARK;Mn;0;NSM;;;;;N;;;;; +11A0B;ZANABAZAR SQUARE LETTER KA;Lo;0;L;;;;;N;;;;; +11A0C;ZANABAZAR SQUARE LETTER KHA;Lo;0;L;;;;;N;;;;; +11A0D;ZANABAZAR SQUARE LETTER GA;Lo;0;L;;;;;N;;;;; +11A0E;ZANABAZAR SQUARE LETTER GHA;Lo;0;L;;;;;N;;;;; +11A0F;ZANABAZAR SQUARE LETTER NGA;Lo;0;L;;;;;N;;;;; +11A10;ZANABAZAR SQUARE LETTER CA;Lo;0;L;;;;;N;;;;; +11A11;ZANABAZAR SQUARE LETTER CHA;Lo;0;L;;;;;N;;;;; +11A12;ZANABAZAR SQUARE LETTER JA;Lo;0;L;;;;;N;;;;; +11A13;ZANABAZAR SQUARE LETTER NYA;Lo;0;L;;;;;N;;;;; +11A14;ZANABAZAR SQUARE LETTER TTA;Lo;0;L;;;;;N;;;;; +11A15;ZANABAZAR SQUARE LETTER TTHA;Lo;0;L;;;;;N;;;;; +11A16;ZANABAZAR SQUARE LETTER DDA;Lo;0;L;;;;;N;;;;; +11A17;ZANABAZAR SQUARE LETTER DDHA;Lo;0;L;;;;;N;;;;; +11A18;ZANABAZAR SQUARE LETTER NNA;Lo;0;L;;;;;N;;;;; +11A19;ZANABAZAR SQUARE LETTER TA;Lo;0;L;;;;;N;;;;; +11A1A;ZANABAZAR SQUARE LETTER THA;Lo;0;L;;;;;N;;;;; +11A1B;ZANABAZAR SQUARE LETTER DA;Lo;0;L;;;;;N;;;;; +11A1C;ZANABAZAR SQUARE LETTER DHA;Lo;0;L;;;;;N;;;;; +11A1D;ZANABAZAR SQUARE LETTER NA;Lo;0;L;;;;;N;;;;; +11A1E;ZANABAZAR SQUARE LETTER PA;Lo;0;L;;;;;N;;;;; +11A1F;ZANABAZAR SQUARE LETTER PHA;Lo;0;L;;;;;N;;;;; +11A20;ZANABAZAR SQUARE LETTER BA;Lo;0;L;;;;;N;;;;; +11A21;ZANABAZAR SQUARE LETTER BHA;Lo;0;L;;;;;N;;;;; +11A22;ZANABAZAR SQUARE LETTER MA;Lo;0;L;;;;;N;;;;; +11A23;ZANABAZAR SQUARE LETTER TSA;Lo;0;L;;;;;N;;;;; +11A24;ZANABAZAR SQUARE LETTER TSHA;Lo;0;L;;;;;N;;;;; +11A25;ZANABAZAR SQUARE LETTER DZA;Lo;0;L;;;;;N;;;;; +11A26;ZANABAZAR SQUARE LETTER DZHA;Lo;0;L;;;;;N;;;;; +11A27;ZANABAZAR SQUARE LETTER ZHA;Lo;0;L;;;;;N;;;;; +11A28;ZANABAZAR SQUARE LETTER ZA;Lo;0;L;;;;;N;;;;; +11A29;ZANABAZAR SQUARE LETTER -A;Lo;0;L;;;;;N;;;;; +11A2A;ZANABAZAR SQUARE LETTER YA;Lo;0;L;;;;;N;;;;; +11A2B;ZANABAZAR SQUARE LETTER RA;Lo;0;L;;;;;N;;;;; +11A2C;ZANABAZAR SQUARE LETTER LA;Lo;0;L;;;;;N;;;;; +11A2D;ZANABAZAR SQUARE LETTER VA;Lo;0;L;;;;;N;;;;; +11A2E;ZANABAZAR SQUARE LETTER SHA;Lo;0;L;;;;;N;;;;; +11A2F;ZANABAZAR SQUARE LETTER SSA;Lo;0;L;;;;;N;;;;; +11A30;ZANABAZAR SQUARE LETTER SA;Lo;0;L;;;;;N;;;;; +11A31;ZANABAZAR SQUARE LETTER HA;Lo;0;L;;;;;N;;;;; +11A32;ZANABAZAR SQUARE LETTER KSSA;Lo;0;L;;;;;N;;;;; +11A33;ZANABAZAR SQUARE FINAL CONSONANT MARK;Mn;0;NSM;;;;;N;;;;; +11A34;ZANABAZAR SQUARE SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;; +11A35;ZANABAZAR SQUARE SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;; +11A36;ZANABAZAR SQUARE SIGN CANDRABINDU WITH ORNAMENT;Mn;0;NSM;;;;;N;;;;; +11A37;ZANABAZAR SQUARE SIGN CANDRA WITH ORNAMENT;Mn;0;NSM;;;;;N;;;;; +11A38;ZANABAZAR SQUARE SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;; +11A39;ZANABAZAR SQUARE SIGN VISARGA;Mc;0;L;;;;;N;;;;; +11A3A;ZANABAZAR SQUARE CLUSTER-INITIAL LETTER RA;Lo;0;L;;;;;N;;;;; +11A3B;ZANABAZAR SQUARE CLUSTER-FINAL LETTER YA;Mn;0;NSM;;;;;N;;;;; +11A3C;ZANABAZAR SQUARE CLUSTER-FINAL LETTER RA;Mn;0;NSM;;;;;N;;;;; +11A3D;ZANABAZAR SQUARE CLUSTER-FINAL LETTER LA;Mn;0;NSM;;;;;N;;;;; +11A3E;ZANABAZAR SQUARE CLUSTER-FINAL LETTER VA;Mn;0;NSM;;;;;N;;;;; +11A3F;ZANABAZAR SQUARE INITIAL HEAD MARK;Po;0;L;;;;;N;;;;; +11A40;ZANABAZAR SQUARE CLOSING HEAD MARK;Po;0;L;;;;;N;;;;; +11A41;ZANABAZAR SQUARE MARK TSHEG;Po;0;L;;;;;N;;;;; +11A42;ZANABAZAR SQUARE MARK SHAD;Po;0;L;;;;;N;;;;; +11A43;ZANABAZAR SQUARE MARK DOUBLE SHAD;Po;0;L;;;;;N;;;;; +11A44;ZANABAZAR SQUARE MARK LONG TSHEG;Po;0;L;;;;;N;;;;; +11A45;ZANABAZAR SQUARE INITIAL DOUBLE-LINED HEAD MARK;Po;0;L;;;;;N;;;;; +11A46;ZANABAZAR SQUARE CLOSING DOUBLE-LINED HEAD MARK;Po;0;L;;;;;N;;;;; +11A47;ZANABAZAR SQUARE SUBJOINER;Mn;9;NSM;;;;;N;;;;; +11A50;SOYOMBO LETTER A;Lo;0;L;;;;;N;;;;; +11A51;SOYOMBO VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;; +11A52;SOYOMBO VOWEL SIGN UE;Mn;0;NSM;;;;;N;;;;; +11A53;SOYOMBO VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;; +11A54;SOYOMBO VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;; +11A55;SOYOMBO VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;; +11A56;SOYOMBO VOWEL SIGN OE;Mn;0;NSM;;;;;N;;;;; +11A57;SOYOMBO VOWEL SIGN AI;Mc;0;L;;;;;N;;;;; +11A58;SOYOMBO VOWEL SIGN AU;Mc;0;L;;;;;N;;;;; +11A59;SOYOMBO VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;; +11A5A;SOYOMBO VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;; +11A5B;SOYOMBO VOWEL LENGTH MARK;Mn;0;NSM;;;;;N;;;;; +11A5C;SOYOMBO LETTER KA;Lo;0;L;;;;;N;;;;; +11A5D;SOYOMBO LETTER KHA;Lo;0;L;;;;;N;;;;; +11A5E;SOYOMBO LETTER GA;Lo;0;L;;;;;N;;;;; +11A5F;SOYOMBO LETTER GHA;Lo;0;L;;;;;N;;;;; +11A60;SOYOMBO LETTER NGA;Lo;0;L;;;;;N;;;;; +11A61;SOYOMBO LETTER CA;Lo;0;L;;;;;N;;;;; +11A62;SOYOMBO LETTER CHA;Lo;0;L;;;;;N;;;;; +11A63;SOYOMBO LETTER JA;Lo;0;L;;;;;N;;;;; +11A64;SOYOMBO LETTER JHA;Lo;0;L;;;;;N;;;;; +11A65;SOYOMBO LETTER NYA;Lo;0;L;;;;;N;;;;; +11A66;SOYOMBO LETTER TTA;Lo;0;L;;;;;N;;;;; +11A67;SOYOMBO LETTER TTHA;Lo;0;L;;;;;N;;;;; +11A68;SOYOMBO LETTER DDA;Lo;0;L;;;;;N;;;;; +11A69;SOYOMBO LETTER DDHA;Lo;0;L;;;;;N;;;;; +11A6A;SOYOMBO LETTER NNA;Lo;0;L;;;;;N;;;;; +11A6B;SOYOMBO LETTER TA;Lo;0;L;;;;;N;;;;; +11A6C;SOYOMBO LETTER THA;Lo;0;L;;;;;N;;;;; +11A6D;SOYOMBO LETTER DA;Lo;0;L;;;;;N;;;;; +11A6E;SOYOMBO LETTER DHA;Lo;0;L;;;;;N;;;;; +11A6F;SOYOMBO LETTER NA;Lo;0;L;;;;;N;;;;; +11A70;SOYOMBO LETTER PA;Lo;0;L;;;;;N;;;;; +11A71;SOYOMBO LETTER PHA;Lo;0;L;;;;;N;;;;; +11A72;SOYOMBO LETTER BA;Lo;0;L;;;;;N;;;;; +11A73;SOYOMBO LETTER BHA;Lo;0;L;;;;;N;;;;; +11A74;SOYOMBO LETTER MA;Lo;0;L;;;;;N;;;;; +11A75;SOYOMBO LETTER TSA;Lo;0;L;;;;;N;;;;; +11A76;SOYOMBO LETTER TSHA;Lo;0;L;;;;;N;;;;; +11A77;SOYOMBO LETTER DZA;Lo;0;L;;;;;N;;;;; +11A78;SOYOMBO LETTER ZHA;Lo;0;L;;;;;N;;;;; +11A79;SOYOMBO LETTER ZA;Lo;0;L;;;;;N;;;;; +11A7A;SOYOMBO LETTER -A;Lo;0;L;;;;;N;;;;; +11A7B;SOYOMBO LETTER YA;Lo;0;L;;;;;N;;;;; +11A7C;SOYOMBO LETTER RA;Lo;0;L;;;;;N;;;;; +11A7D;SOYOMBO LETTER LA;Lo;0;L;;;;;N;;;;; +11A7E;SOYOMBO LETTER VA;Lo;0;L;;;;;N;;;;; +11A7F;SOYOMBO LETTER SHA;Lo;0;L;;;;;N;;;;; +11A80;SOYOMBO LETTER SSA;Lo;0;L;;;;;N;;;;; +11A81;SOYOMBO LETTER SA;Lo;0;L;;;;;N;;;;; +11A82;SOYOMBO LETTER HA;Lo;0;L;;;;;N;;;;; +11A83;SOYOMBO LETTER KSSA;Lo;0;L;;;;;N;;;;; +11A84;SOYOMBO SIGN JIHVAMULIYA;Lo;0;L;;;;;N;;;;; +11A85;SOYOMBO SIGN UPADHMANIYA;Lo;0;L;;;;;N;;;;; +11A86;SOYOMBO CLUSTER-INITIAL LETTER RA;Lo;0;L;;;;;N;;;;; +11A87;SOYOMBO CLUSTER-INITIAL LETTER LA;Lo;0;L;;;;;N;;;;; +11A88;SOYOMBO CLUSTER-INITIAL LETTER SHA;Lo;0;L;;;;;N;;;;; +11A89;SOYOMBO CLUSTER-INITIAL LETTER SA;Lo;0;L;;;;;N;;;;; +11A8A;SOYOMBO FINAL CONSONANT SIGN G;Mn;0;NSM;;;;;N;;;;; +11A8B;SOYOMBO FINAL CONSONANT SIGN K;Mn;0;NSM;;;;;N;;;;; +11A8C;SOYOMBO FINAL CONSONANT SIGN NG;Mn;0;NSM;;;;;N;;;;; +11A8D;SOYOMBO FINAL CONSONANT SIGN D;Mn;0;NSM;;;;;N;;;;; +11A8E;SOYOMBO FINAL CONSONANT SIGN N;Mn;0;NSM;;;;;N;;;;; +11A8F;SOYOMBO FINAL CONSONANT SIGN B;Mn;0;NSM;;;;;N;;;;; +11A90;SOYOMBO FINAL CONSONANT SIGN M;Mn;0;NSM;;;;;N;;;;; +11A91;SOYOMBO FINAL CONSONANT SIGN R;Mn;0;NSM;;;;;N;;;;; +11A92;SOYOMBO FINAL CONSONANT SIGN L;Mn;0;NSM;;;;;N;;;;; +11A93;SOYOMBO FINAL CONSONANT SIGN SH;Mn;0;NSM;;;;;N;;;;; +11A94;SOYOMBO FINAL CONSONANT SIGN S;Mn;0;NSM;;;;;N;;;;; +11A95;SOYOMBO FINAL CONSONANT SIGN -A;Mn;0;NSM;;;;;N;;;;; +11A96;SOYOMBO SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;; +11A97;SOYOMBO SIGN VISARGA;Mc;0;L;;;;;N;;;;; +11A98;SOYOMBO GEMINATION MARK;Mn;0;NSM;;;;;N;;;;; +11A99;SOYOMBO SUBJOINER;Mn;9;NSM;;;;;N;;;;; +11A9A;SOYOMBO MARK TSHEG;Po;0;L;;;;;N;;;;; +11A9B;SOYOMBO MARK SHAD;Po;0;L;;;;;N;;;;; +11A9C;SOYOMBO MARK DOUBLE SHAD;Po;0;L;;;;;N;;;;; +11A9D;SOYOMBO MARK PLUTA;Lo;0;L;;;;;N;;;;; +11A9E;SOYOMBO HEAD MARK WITH MOON AND SUN AND TRIPLE FLAME;Po;0;L;;;;;N;;;;; +11A9F;SOYOMBO HEAD MARK WITH MOON AND SUN AND FLAME;Po;0;L;;;;;N;;;;; +11AA0;SOYOMBO HEAD MARK WITH MOON AND SUN;Po;0;L;;;;;N;;;;; +11AA1;SOYOMBO TERMINAL MARK-1;Po;0;L;;;;;N;;;;; +11AA2;SOYOMBO TERMINAL MARK-2;Po;0;L;;;;;N;;;;; +11AB0;CANADIAN SYLLABICS NATTILIK HI;Lo;0;L;;;;;N;;;;; +11AB1;CANADIAN SYLLABICS NATTILIK HII;Lo;0;L;;;;;N;;;;; +11AB2;CANADIAN SYLLABICS NATTILIK HO;Lo;0;L;;;;;N;;;;; +11AB3;CANADIAN SYLLABICS NATTILIK HOO;Lo;0;L;;;;;N;;;;; +11AB4;CANADIAN SYLLABICS NATTILIK HA;Lo;0;L;;;;;N;;;;; +11AB5;CANADIAN SYLLABICS NATTILIK HAA;Lo;0;L;;;;;N;;;;; +11AB6;CANADIAN SYLLABICS NATTILIK SHRI;Lo;0;L;;;;;N;;;;; +11AB7;CANADIAN SYLLABICS NATTILIK SHRII;Lo;0;L;;;;;N;;;;; +11AB8;CANADIAN SYLLABICS NATTILIK SHRO;Lo;0;L;;;;;N;;;;; +11AB9;CANADIAN SYLLABICS NATTILIK SHROO;Lo;0;L;;;;;N;;;;; +11ABA;CANADIAN SYLLABICS NATTILIK SHRA;Lo;0;L;;;;;N;;;;; +11ABB;CANADIAN SYLLABICS NATTILIK SHRAA;Lo;0;L;;;;;N;;;;; +11ABC;CANADIAN SYLLABICS SPE;Lo;0;L;;;;;N;;;;; +11ABD;CANADIAN SYLLABICS SPI;Lo;0;L;;;;;N;;;;; +11ABE;CANADIAN SYLLABICS SPO;Lo;0;L;;;;;N;;;;; +11ABF;CANADIAN SYLLABICS SPA;Lo;0;L;;;;;N;;;;; +11AC0;PAU CIN HAU LETTER PA;Lo;0;L;;;;;N;;;;; +11AC1;PAU CIN HAU LETTER KA;Lo;0;L;;;;;N;;;;; +11AC2;PAU CIN HAU LETTER LA;Lo;0;L;;;;;N;;;;; +11AC3;PAU CIN HAU LETTER MA;Lo;0;L;;;;;N;;;;; +11AC4;PAU CIN HAU LETTER DA;Lo;0;L;;;;;N;;;;; +11AC5;PAU CIN HAU LETTER ZA;Lo;0;L;;;;;N;;;;; +11AC6;PAU CIN HAU LETTER VA;Lo;0;L;;;;;N;;;;; +11AC7;PAU CIN HAU LETTER NGA;Lo;0;L;;;;;N;;;;; +11AC8;PAU CIN HAU LETTER HA;Lo;0;L;;;;;N;;;;; +11AC9;PAU CIN HAU LETTER GA;Lo;0;L;;;;;N;;;;; +11ACA;PAU CIN HAU LETTER KHA;Lo;0;L;;;;;N;;;;; +11ACB;PAU CIN HAU LETTER SA;Lo;0;L;;;;;N;;;;; +11ACC;PAU CIN HAU LETTER BA;Lo;0;L;;;;;N;;;;; +11ACD;PAU CIN HAU LETTER CA;Lo;0;L;;;;;N;;;;; +11ACE;PAU CIN HAU LETTER TA;Lo;0;L;;;;;N;;;;; +11ACF;PAU CIN HAU LETTER THA;Lo;0;L;;;;;N;;;;; +11AD0;PAU CIN HAU LETTER NA;Lo;0;L;;;;;N;;;;; +11AD1;PAU CIN HAU LETTER PHA;Lo;0;L;;;;;N;;;;; +11AD2;PAU CIN HAU LETTER RA;Lo;0;L;;;;;N;;;;; +11AD3;PAU CIN HAU LETTER FA;Lo;0;L;;;;;N;;;;; +11AD4;PAU CIN HAU LETTER CHA;Lo;0;L;;;;;N;;;;; +11AD5;PAU CIN HAU LETTER A;Lo;0;L;;;;;N;;;;; +11AD6;PAU CIN HAU LETTER E;Lo;0;L;;;;;N;;;;; +11AD7;PAU CIN HAU LETTER I;Lo;0;L;;;;;N;;;;; +11AD8;PAU CIN HAU LETTER O;Lo;0;L;;;;;N;;;;; +11AD9;PAU CIN HAU LETTER U;Lo;0;L;;;;;N;;;;; +11ADA;PAU CIN HAU LETTER UA;Lo;0;L;;;;;N;;;;; +11ADB;PAU CIN HAU LETTER IA;Lo;0;L;;;;;N;;;;; +11ADC;PAU CIN HAU LETTER FINAL P;Lo;0;L;;;;;N;;;;; +11ADD;PAU CIN HAU LETTER FINAL K;Lo;0;L;;;;;N;;;;; +11ADE;PAU CIN HAU LETTER FINAL T;Lo;0;L;;;;;N;;;;; +11ADF;PAU CIN HAU LETTER FINAL M;Lo;0;L;;;;;N;;;;; +11AE0;PAU CIN HAU LETTER FINAL N;Lo;0;L;;;;;N;;;;; +11AE1;PAU CIN HAU LETTER FINAL L;Lo;0;L;;;;;N;;;;; +11AE2;PAU CIN HAU LETTER FINAL W;Lo;0;L;;;;;N;;;;; +11AE3;PAU CIN HAU LETTER FINAL NG;Lo;0;L;;;;;N;;;;; +11AE4;PAU CIN HAU LETTER FINAL Y;Lo;0;L;;;;;N;;;;; +11AE5;PAU CIN HAU RISING TONE LONG;Lo;0;L;;;;;N;;;;; +11AE6;PAU CIN HAU RISING TONE;Lo;0;L;;;;;N;;;;; +11AE7;PAU CIN HAU SANDHI GLOTTAL STOP;Lo;0;L;;;;;N;;;;; +11AE8;PAU CIN HAU RISING TONE LONG FINAL;Lo;0;L;;;;;N;;;;; +11AE9;PAU CIN HAU RISING TONE FINAL;Lo;0;L;;;;;N;;;;; +11AEA;PAU CIN HAU SANDHI GLOTTAL STOP FINAL;Lo;0;L;;;;;N;;;;; +11AEB;PAU CIN HAU SANDHI TONE LONG;Lo;0;L;;;;;N;;;;; +11AEC;PAU CIN HAU SANDHI TONE;Lo;0;L;;;;;N;;;;; +11AED;PAU CIN HAU SANDHI TONE LONG FINAL;Lo;0;L;;;;;N;;;;; +11AEE;PAU CIN HAU SANDHI TONE FINAL;Lo;0;L;;;;;N;;;;; +11AEF;PAU CIN HAU MID-LEVEL TONE;Lo;0;L;;;;;N;;;;; +11AF0;PAU CIN HAU GLOTTAL STOP VARIANT;Lo;0;L;;;;;N;;;;; +11AF1;PAU CIN HAU MID-LEVEL TONE LONG FINAL;Lo;0;L;;;;;N;;;;; +11AF2;PAU CIN HAU MID-LEVEL TONE FINAL;Lo;0;L;;;;;N;;;;; +11AF3;PAU CIN HAU LOW-FALLING TONE LONG;Lo;0;L;;;;;N;;;;; +11AF4;PAU CIN HAU LOW-FALLING TONE;Lo;0;L;;;;;N;;;;; +11AF5;PAU CIN HAU GLOTTAL STOP;Lo;0;L;;;;;N;;;;; +11AF6;PAU CIN HAU LOW-FALLING TONE LONG FINAL;Lo;0;L;;;;;N;;;;; +11AF7;PAU CIN HAU LOW-FALLING TONE FINAL;Lo;0;L;;;;;N;;;;; +11AF8;PAU CIN HAU GLOTTAL STOP FINAL;Lo;0;L;;;;;N;;;;; +11B00;DEVANAGARI HEAD MARK;Po;0;L;;;;;N;;;;; +11B01;DEVANAGARI HEAD MARK WITH HEADSTROKE;Po;0;L;;;;;N;;;;; +11B02;DEVANAGARI SIGN BHALE;Po;0;L;;;;;N;;;;; +11B03;DEVANAGARI SIGN BHALE WITH HOOK;Po;0;L;;;;;N;;;;; +11B04;DEVANAGARI SIGN EXTENDED BHALE;Po;0;L;;;;;N;;;;; +11B05;DEVANAGARI SIGN EXTENDED BHALE WITH HOOK;Po;0;L;;;;;N;;;;; +11B06;DEVANAGARI SIGN WESTERN FIVE-LIKE BHALE;Po;0;L;;;;;N;;;;; +11B07;DEVANAGARI SIGN WESTERN NINE-LIKE BHALE;Po;0;L;;;;;N;;;;; +11B08;DEVANAGARI SIGN REVERSED NINE-LIKE BHALE;Po;0;L;;;;;N;;;;; +11B09;DEVANAGARI SIGN MINDU;Po;0;L;;;;;N;;;;; +11B60;SHARADA VOWEL SIGN OE;Mn;0;NSM;;;;;N;;;;; +11B61;SHARADA VOWEL SIGN OOE;Mc;0;L;;;;;N;;;;; +11B62;SHARADA VOWEL SIGN UE;Mn;0;NSM;;;;;N;;;;; +11B63;SHARADA VOWEL SIGN UUE;Mn;0;NSM;;;;;N;;;;; +11B64;SHARADA VOWEL SIGN SHORT E;Mn;0;NSM;;;;;N;;;;; +11B65;SHARADA VOWEL SIGN SHORT O;Mc;0;L;;;;;N;;;;; +11B66;SHARADA VOWEL SIGN CANDRA E;Mn;0;NSM;;;;;N;;;;; +11B67;SHARADA VOWEL SIGN CANDRA O;Mc;0;L;;;;;N;;;;; +11BC0;SUNUWAR LETTER DEVI;Lo;0;L;;;;;N;;;;; +11BC1;SUNUWAR LETTER TASLA;Lo;0;L;;;;;N;;;;; +11BC2;SUNUWAR LETTER EKO;Lo;0;L;;;;;N;;;;; +11BC3;SUNUWAR LETTER IMAR;Lo;0;L;;;;;N;;;;; +11BC4;SUNUWAR LETTER REU;Lo;0;L;;;;;N;;;;; +11BC5;SUNUWAR LETTER UTTHI;Lo;0;L;;;;;N;;;;; +11BC6;SUNUWAR LETTER KIK;Lo;0;L;;;;;N;;;;; +11BC7;SUNUWAR LETTER MA;Lo;0;L;;;;;N;;;;; +11BC8;SUNUWAR LETTER APPHO;Lo;0;L;;;;;N;;;;; +11BC9;SUNUWAR LETTER PIP;Lo;0;L;;;;;N;;;;; +11BCA;SUNUWAR LETTER GIL;Lo;0;L;;;;;N;;;;; +11BCB;SUNUWAR LETTER HAMSO;Lo;0;L;;;;;N;;;;; +11BCC;SUNUWAR LETTER CARMI;Lo;0;L;;;;;N;;;;; +11BCD;SUNUWAR LETTER NAH;Lo;0;L;;;;;N;;;;; +11BCE;SUNUWAR LETTER BUR;Lo;0;L;;;;;N;;;;; +11BCF;SUNUWAR LETTER JYAH;Lo;0;L;;;;;N;;;;; +11BD0;SUNUWAR LETTER LOACHA;Lo;0;L;;;;;N;;;;; +11BD1;SUNUWAR LETTER OTTHI;Lo;0;L;;;;;N;;;;; +11BD2;SUNUWAR LETTER SHYELE;Lo;0;L;;;;;N;;;;; +11BD3;SUNUWAR LETTER VARCA;Lo;0;L;;;;;N;;;;; +11BD4;SUNUWAR LETTER YAT;Lo;0;L;;;;;N;;;;; +11BD5;SUNUWAR LETTER AVA;Lo;0;L;;;;;N;;;;; +11BD6;SUNUWAR LETTER AAL;Lo;0;L;;;;;N;;;;; +11BD7;SUNUWAR LETTER DONGA;Lo;0;L;;;;;N;;;;; +11BD8;SUNUWAR LETTER THARI;Lo;0;L;;;;;N;;;;; +11BD9;SUNUWAR LETTER PHAR;Lo;0;L;;;;;N;;;;; +11BDA;SUNUWAR LETTER NGAR;Lo;0;L;;;;;N;;;;; +11BDB;SUNUWAR LETTER KHA;Lo;0;L;;;;;N;;;;; +11BDC;SUNUWAR LETTER SHYER;Lo;0;L;;;;;N;;;;; +11BDD;SUNUWAR LETTER CHELAP;Lo;0;L;;;;;N;;;;; +11BDE;SUNUWAR LETTER TENTU;Lo;0;L;;;;;N;;;;; +11BDF;SUNUWAR LETTER THELE;Lo;0;L;;;;;N;;;;; +11BE0;SUNUWAR LETTER KLOKO;Lo;0;L;;;;;N;;;;; +11BE1;SUNUWAR SIGN PVO;Po;0;L;;;;;N;;;;; +11BF0;SUNUWAR DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +11BF1;SUNUWAR DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +11BF2;SUNUWAR DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +11BF3;SUNUWAR DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +11BF4;SUNUWAR DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +11BF5;SUNUWAR DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +11BF6;SUNUWAR DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +11BF7;SUNUWAR DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +11BF8;SUNUWAR DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +11BF9;SUNUWAR DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +11C00;BHAIKSUKI LETTER A;Lo;0;L;;;;;N;;;;; +11C01;BHAIKSUKI LETTER AA;Lo;0;L;;;;;N;;;;; +11C02;BHAIKSUKI LETTER I;Lo;0;L;;;;;N;;;;; +11C03;BHAIKSUKI LETTER II;Lo;0;L;;;;;N;;;;; +11C04;BHAIKSUKI LETTER U;Lo;0;L;;;;;N;;;;; +11C05;BHAIKSUKI LETTER UU;Lo;0;L;;;;;N;;;;; +11C06;BHAIKSUKI LETTER VOCALIC R;Lo;0;L;;;;;N;;;;; +11C07;BHAIKSUKI LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;; +11C08;BHAIKSUKI LETTER VOCALIC L;Lo;0;L;;;;;N;;;;; +11C0A;BHAIKSUKI LETTER E;Lo;0;L;;;;;N;;;;; +11C0B;BHAIKSUKI LETTER AI;Lo;0;L;;;;;N;;;;; +11C0C;BHAIKSUKI LETTER O;Lo;0;L;;;;;N;;;;; +11C0D;BHAIKSUKI LETTER AU;Lo;0;L;;;;;N;;;;; +11C0E;BHAIKSUKI LETTER KA;Lo;0;L;;;;;N;;;;; +11C0F;BHAIKSUKI LETTER KHA;Lo;0;L;;;;;N;;;;; +11C10;BHAIKSUKI LETTER GA;Lo;0;L;;;;;N;;;;; +11C11;BHAIKSUKI LETTER GHA;Lo;0;L;;;;;N;;;;; +11C12;BHAIKSUKI LETTER NGA;Lo;0;L;;;;;N;;;;; +11C13;BHAIKSUKI LETTER CA;Lo;0;L;;;;;N;;;;; +11C14;BHAIKSUKI LETTER CHA;Lo;0;L;;;;;N;;;;; +11C15;BHAIKSUKI LETTER JA;Lo;0;L;;;;;N;;;;; +11C16;BHAIKSUKI LETTER JHA;Lo;0;L;;;;;N;;;;; +11C17;BHAIKSUKI LETTER NYA;Lo;0;L;;;;;N;;;;; +11C18;BHAIKSUKI LETTER TTA;Lo;0;L;;;;;N;;;;; +11C19;BHAIKSUKI LETTER TTHA;Lo;0;L;;;;;N;;;;; +11C1A;BHAIKSUKI LETTER DDA;Lo;0;L;;;;;N;;;;; +11C1B;BHAIKSUKI LETTER DDHA;Lo;0;L;;;;;N;;;;; +11C1C;BHAIKSUKI LETTER NNA;Lo;0;L;;;;;N;;;;; +11C1D;BHAIKSUKI LETTER TA;Lo;0;L;;;;;N;;;;; +11C1E;BHAIKSUKI LETTER THA;Lo;0;L;;;;;N;;;;; +11C1F;BHAIKSUKI LETTER DA;Lo;0;L;;;;;N;;;;; +11C20;BHAIKSUKI LETTER DHA;Lo;0;L;;;;;N;;;;; +11C21;BHAIKSUKI LETTER NA;Lo;0;L;;;;;N;;;;; +11C22;BHAIKSUKI LETTER PA;Lo;0;L;;;;;N;;;;; +11C23;BHAIKSUKI LETTER PHA;Lo;0;L;;;;;N;;;;; +11C24;BHAIKSUKI LETTER BA;Lo;0;L;;;;;N;;;;; +11C25;BHAIKSUKI LETTER BHA;Lo;0;L;;;;;N;;;;; +11C26;BHAIKSUKI LETTER MA;Lo;0;L;;;;;N;;;;; +11C27;BHAIKSUKI LETTER YA;Lo;0;L;;;;;N;;;;; +11C28;BHAIKSUKI LETTER RA;Lo;0;L;;;;;N;;;;; +11C29;BHAIKSUKI LETTER LA;Lo;0;L;;;;;N;;;;; +11C2A;BHAIKSUKI LETTER VA;Lo;0;L;;;;;N;;;;; +11C2B;BHAIKSUKI LETTER SHA;Lo;0;L;;;;;N;;;;; +11C2C;BHAIKSUKI LETTER SSA;Lo;0;L;;;;;N;;;;; +11C2D;BHAIKSUKI LETTER SA;Lo;0;L;;;;;N;;;;; +11C2E;BHAIKSUKI LETTER HA;Lo;0;L;;;;;N;;;;; +11C2F;BHAIKSUKI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;; +11C30;BHAIKSUKI VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;; +11C31;BHAIKSUKI VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;; +11C32;BHAIKSUKI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;; +11C33;BHAIKSUKI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;; +11C34;BHAIKSUKI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;; +11C35;BHAIKSUKI VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;; +11C36;BHAIKSUKI VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;; +11C38;BHAIKSUKI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;; +11C39;BHAIKSUKI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;; +11C3A;BHAIKSUKI VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;; +11C3B;BHAIKSUKI VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;; +11C3C;BHAIKSUKI SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;; +11C3D;BHAIKSUKI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;; +11C3E;BHAIKSUKI SIGN VISARGA;Mc;0;L;;;;;N;;;;; +11C3F;BHAIKSUKI SIGN VIRAMA;Mn;9;L;;;;;N;;;;; +11C40;BHAIKSUKI SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;; +11C41;BHAIKSUKI DANDA;Po;0;L;;;;;N;;;;; +11C42;BHAIKSUKI DOUBLE DANDA;Po;0;L;;;;;N;;;;; +11C43;BHAIKSUKI WORD SEPARATOR;Po;0;L;;;;;N;;;;; +11C44;BHAIKSUKI GAP FILLER-1;Po;0;L;;;;;N;;;;; +11C45;BHAIKSUKI GAP FILLER-2;Po;0;L;;;;;N;;;;; +11C50;BHAIKSUKI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +11C51;BHAIKSUKI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +11C52;BHAIKSUKI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +11C53;BHAIKSUKI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +11C54;BHAIKSUKI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +11C55;BHAIKSUKI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +11C56;BHAIKSUKI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +11C57;BHAIKSUKI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +11C58;BHAIKSUKI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +11C59;BHAIKSUKI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +11C5A;BHAIKSUKI NUMBER ONE;No;0;L;;;;1;N;;;;; +11C5B;BHAIKSUKI NUMBER TWO;No;0;L;;;;2;N;;;;; +11C5C;BHAIKSUKI NUMBER THREE;No;0;L;;;;3;N;;;;; +11C5D;BHAIKSUKI NUMBER FOUR;No;0;L;;;;4;N;;;;; +11C5E;BHAIKSUKI NUMBER FIVE;No;0;L;;;;5;N;;;;; +11C5F;BHAIKSUKI NUMBER SIX;No;0;L;;;;6;N;;;;; +11C60;BHAIKSUKI NUMBER SEVEN;No;0;L;;;;7;N;;;;; +11C61;BHAIKSUKI NUMBER EIGHT;No;0;L;;;;8;N;;;;; +11C62;BHAIKSUKI NUMBER NINE;No;0;L;;;;9;N;;;;; +11C63;BHAIKSUKI NUMBER TEN;No;0;L;;;;10;N;;;;; +11C64;BHAIKSUKI NUMBER TWENTY;No;0;L;;;;20;N;;;;; +11C65;BHAIKSUKI NUMBER THIRTY;No;0;L;;;;30;N;;;;; +11C66;BHAIKSUKI NUMBER FORTY;No;0;L;;;;40;N;;;;; +11C67;BHAIKSUKI NUMBER FIFTY;No;0;L;;;;50;N;;;;; +11C68;BHAIKSUKI NUMBER SIXTY;No;0;L;;;;60;N;;;;; +11C69;BHAIKSUKI NUMBER SEVENTY;No;0;L;;;;70;N;;;;; +11C6A;BHAIKSUKI NUMBER EIGHTY;No;0;L;;;;80;N;;;;; +11C6B;BHAIKSUKI NUMBER NINETY;No;0;L;;;;90;N;;;;; +11C6C;BHAIKSUKI HUNDREDS UNIT MARK;No;0;L;;;;100;N;;;;; +11C70;MARCHEN HEAD MARK;Po;0;L;;;;;N;;;;; +11C71;MARCHEN MARK SHAD;Po;0;L;;;;;N;;;;; +11C72;MARCHEN LETTER KA;Lo;0;L;;;;;N;;;;; +11C73;MARCHEN LETTER KHA;Lo;0;L;;;;;N;;;;; +11C74;MARCHEN LETTER GA;Lo;0;L;;;;;N;;;;; +11C75;MARCHEN LETTER NGA;Lo;0;L;;;;;N;;;;; +11C76;MARCHEN LETTER CA;Lo;0;L;;;;;N;;;;; +11C77;MARCHEN LETTER CHA;Lo;0;L;;;;;N;;;;; +11C78;MARCHEN LETTER JA;Lo;0;L;;;;;N;;;;; +11C79;MARCHEN LETTER NYA;Lo;0;L;;;;;N;;;;; +11C7A;MARCHEN LETTER TA;Lo;0;L;;;;;N;;;;; +11C7B;MARCHEN LETTER THA;Lo;0;L;;;;;N;;;;; +11C7C;MARCHEN LETTER DA;Lo;0;L;;;;;N;;;;; +11C7D;MARCHEN LETTER NA;Lo;0;L;;;;;N;;;;; +11C7E;MARCHEN LETTER PA;Lo;0;L;;;;;N;;;;; +11C7F;MARCHEN LETTER PHA;Lo;0;L;;;;;N;;;;; +11C80;MARCHEN LETTER BA;Lo;0;L;;;;;N;;;;; +11C81;MARCHEN LETTER MA;Lo;0;L;;;;;N;;;;; +11C82;MARCHEN LETTER TSA;Lo;0;L;;;;;N;;;;; +11C83;MARCHEN LETTER TSHA;Lo;0;L;;;;;N;;;;; +11C84;MARCHEN LETTER DZA;Lo;0;L;;;;;N;;;;; +11C85;MARCHEN LETTER WA;Lo;0;L;;;;;N;;;;; +11C86;MARCHEN LETTER ZHA;Lo;0;L;;;;;N;;;;; +11C87;MARCHEN LETTER ZA;Lo;0;L;;;;;N;;;;; +11C88;MARCHEN LETTER -A;Lo;0;L;;;;;N;;;;; +11C89;MARCHEN LETTER YA;Lo;0;L;;;;;N;;;;; +11C8A;MARCHEN LETTER RA;Lo;0;L;;;;;N;;;;; +11C8B;MARCHEN LETTER LA;Lo;0;L;;;;;N;;;;; +11C8C;MARCHEN LETTER SHA;Lo;0;L;;;;;N;;;;; +11C8D;MARCHEN LETTER SA;Lo;0;L;;;;;N;;;;; +11C8E;MARCHEN LETTER HA;Lo;0;L;;;;;N;;;;; +11C8F;MARCHEN LETTER A;Lo;0;L;;;;;N;;;;; +11C92;MARCHEN SUBJOINED LETTER KA;Mn;0;NSM;;;;;N;;;;; +11C93;MARCHEN SUBJOINED LETTER KHA;Mn;0;NSM;;;;;N;;;;; +11C94;MARCHEN SUBJOINED LETTER GA;Mn;0;NSM;;;;;N;;;;; +11C95;MARCHEN SUBJOINED LETTER NGA;Mn;0;NSM;;;;;N;;;;; +11C96;MARCHEN SUBJOINED LETTER CA;Mn;0;NSM;;;;;N;;;;; +11C97;MARCHEN SUBJOINED LETTER CHA;Mn;0;NSM;;;;;N;;;;; +11C98;MARCHEN SUBJOINED LETTER JA;Mn;0;NSM;;;;;N;;;;; +11C99;MARCHEN SUBJOINED LETTER NYA;Mn;0;NSM;;;;;N;;;;; +11C9A;MARCHEN SUBJOINED LETTER TA;Mn;0;NSM;;;;;N;;;;; +11C9B;MARCHEN SUBJOINED LETTER THA;Mn;0;NSM;;;;;N;;;;; +11C9C;MARCHEN SUBJOINED LETTER DA;Mn;0;NSM;;;;;N;;;;; +11C9D;MARCHEN SUBJOINED LETTER NA;Mn;0;NSM;;;;;N;;;;; +11C9E;MARCHEN SUBJOINED LETTER PA;Mn;0;NSM;;;;;N;;;;; +11C9F;MARCHEN SUBJOINED LETTER PHA;Mn;0;NSM;;;;;N;;;;; +11CA0;MARCHEN SUBJOINED LETTER BA;Mn;0;NSM;;;;;N;;;;; +11CA1;MARCHEN SUBJOINED LETTER MA;Mn;0;NSM;;;;;N;;;;; +11CA2;MARCHEN SUBJOINED LETTER TSA;Mn;0;NSM;;;;;N;;;;; +11CA3;MARCHEN SUBJOINED LETTER TSHA;Mn;0;NSM;;;;;N;;;;; +11CA4;MARCHEN SUBJOINED LETTER DZA;Mn;0;NSM;;;;;N;;;;; +11CA5;MARCHEN SUBJOINED LETTER WA;Mn;0;NSM;;;;;N;;;;; +11CA6;MARCHEN SUBJOINED LETTER ZHA;Mn;0;NSM;;;;;N;;;;; +11CA7;MARCHEN SUBJOINED LETTER ZA;Mn;0;NSM;;;;;N;;;;; +11CA9;MARCHEN SUBJOINED LETTER YA;Mc;0;L;;;;;N;;;;; +11CAA;MARCHEN SUBJOINED LETTER RA;Mn;0;NSM;;;;;N;;;;; +11CAB;MARCHEN SUBJOINED LETTER LA;Mn;0;NSM;;;;;N;;;;; +11CAC;MARCHEN SUBJOINED LETTER SHA;Mn;0;NSM;;;;;N;;;;; +11CAD;MARCHEN SUBJOINED LETTER SA;Mn;0;NSM;;;;;N;;;;; +11CAE;MARCHEN SUBJOINED LETTER HA;Mn;0;NSM;;;;;N;;;;; +11CAF;MARCHEN SUBJOINED LETTER A;Mn;0;NSM;;;;;N;;;;; +11CB0;MARCHEN VOWEL SIGN AA;Mn;0;NSM;;;;;N;;;;; +11CB1;MARCHEN VOWEL SIGN I;Mc;0;L;;;;;N;;;;; +11CB2;MARCHEN VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;; +11CB3;MARCHEN VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;; +11CB4;MARCHEN VOWEL SIGN O;Mc;0;L;;;;;N;;;;; +11CB5;MARCHEN SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;; +11CB6;MARCHEN SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;; +11D00;MASARAM GONDI LETTER A;Lo;0;L;;;;;N;;;;; +11D01;MASARAM GONDI LETTER AA;Lo;0;L;;;;;N;;;;; +11D02;MASARAM GONDI LETTER I;Lo;0;L;;;;;N;;;;; +11D03;MASARAM GONDI LETTER II;Lo;0;L;;;;;N;;;;; +11D04;MASARAM GONDI LETTER U;Lo;0;L;;;;;N;;;;; +11D05;MASARAM GONDI LETTER UU;Lo;0;L;;;;;N;;;;; +11D06;MASARAM GONDI LETTER E;Lo;0;L;;;;;N;;;;; +11D08;MASARAM GONDI LETTER AI;Lo;0;L;;;;;N;;;;; +11D09;MASARAM GONDI LETTER O;Lo;0;L;;;;;N;;;;; +11D0B;MASARAM GONDI LETTER AU;Lo;0;L;;;;;N;;;;; +11D0C;MASARAM GONDI LETTER KA;Lo;0;L;;;;;N;;;;; +11D0D;MASARAM GONDI LETTER KHA;Lo;0;L;;;;;N;;;;; +11D0E;MASARAM GONDI LETTER GA;Lo;0;L;;;;;N;;;;; +11D0F;MASARAM GONDI LETTER GHA;Lo;0;L;;;;;N;;;;; +11D10;MASARAM GONDI LETTER NGA;Lo;0;L;;;;;N;;;;; +11D11;MASARAM GONDI LETTER CA;Lo;0;L;;;;;N;;;;; +11D12;MASARAM GONDI LETTER CHA;Lo;0;L;;;;;N;;;;; +11D13;MASARAM GONDI LETTER JA;Lo;0;L;;;;;N;;;;; +11D14;MASARAM GONDI LETTER JHA;Lo;0;L;;;;;N;;;;; +11D15;MASARAM GONDI LETTER NYA;Lo;0;L;;;;;N;;;;; +11D16;MASARAM GONDI LETTER TTA;Lo;0;L;;;;;N;;;;; +11D17;MASARAM GONDI LETTER TTHA;Lo;0;L;;;;;N;;;;; +11D18;MASARAM GONDI LETTER DDA;Lo;0;L;;;;;N;;;;; +11D19;MASARAM GONDI LETTER DDHA;Lo;0;L;;;;;N;;;;; +11D1A;MASARAM GONDI LETTER NNA;Lo;0;L;;;;;N;;;;; +11D1B;MASARAM GONDI LETTER TA;Lo;0;L;;;;;N;;;;; +11D1C;MASARAM GONDI LETTER THA;Lo;0;L;;;;;N;;;;; +11D1D;MASARAM GONDI LETTER DA;Lo;0;L;;;;;N;;;;; +11D1E;MASARAM GONDI LETTER DHA;Lo;0;L;;;;;N;;;;; +11D1F;MASARAM GONDI LETTER NA;Lo;0;L;;;;;N;;;;; +11D20;MASARAM GONDI LETTER PA;Lo;0;L;;;;;N;;;;; +11D21;MASARAM GONDI LETTER PHA;Lo;0;L;;;;;N;;;;; +11D22;MASARAM GONDI LETTER BA;Lo;0;L;;;;;N;;;;; +11D23;MASARAM GONDI LETTER BHA;Lo;0;L;;;;;N;;;;; +11D24;MASARAM GONDI LETTER MA;Lo;0;L;;;;;N;;;;; +11D25;MASARAM GONDI LETTER YA;Lo;0;L;;;;;N;;;;; +11D26;MASARAM GONDI LETTER RA;Lo;0;L;;;;;N;;;;; +11D27;MASARAM GONDI LETTER LA;Lo;0;L;;;;;N;;;;; +11D28;MASARAM GONDI LETTER VA;Lo;0;L;;;;;N;;;;; +11D29;MASARAM GONDI LETTER SHA;Lo;0;L;;;;;N;;;;; +11D2A;MASARAM GONDI LETTER SSA;Lo;0;L;;;;;N;;;;; +11D2B;MASARAM GONDI LETTER SA;Lo;0;L;;;;;N;;;;; +11D2C;MASARAM GONDI LETTER HA;Lo;0;L;;;;;N;;;;; +11D2D;MASARAM GONDI LETTER LLA;Lo;0;L;;;;;N;;;;; +11D2E;MASARAM GONDI LETTER KSSA;Lo;0;L;;;;;N;;;;; +11D2F;MASARAM GONDI LETTER JNYA;Lo;0;L;;;;;N;;;;; +11D30;MASARAM GONDI LETTER TRA;Lo;0;L;;;;;N;;;;; +11D31;MASARAM GONDI VOWEL SIGN AA;Mn;0;NSM;;;;;N;;;;; +11D32;MASARAM GONDI VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;; +11D33;MASARAM GONDI VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;; +11D34;MASARAM GONDI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;; +11D35;MASARAM GONDI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;; +11D36;MASARAM GONDI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;; +11D3A;MASARAM GONDI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;; +11D3C;MASARAM GONDI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;; +11D3D;MASARAM GONDI VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;; +11D3F;MASARAM GONDI VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;; +11D40;MASARAM GONDI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;; +11D41;MASARAM GONDI SIGN VISARGA;Mn;0;NSM;;;;;N;;;;; +11D42;MASARAM GONDI SIGN NUKTA;Mn;7;NSM;;;;;N;;;;; +11D43;MASARAM GONDI SIGN CANDRA;Mn;0;NSM;;;;;N;;;;; +11D44;MASARAM GONDI SIGN HALANTA;Mn;9;NSM;;;;;N;;;;; +11D45;MASARAM GONDI VIRAMA;Mn;9;NSM;;;;;N;;;;; +11D46;MASARAM GONDI REPHA;Lo;0;L;;;;;N;;;;; +11D47;MASARAM GONDI RA-KARA;Mn;0;NSM;;;;;N;;;;; +11D50;MASARAM GONDI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +11D51;MASARAM GONDI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +11D52;MASARAM GONDI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +11D53;MASARAM GONDI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +11D54;MASARAM GONDI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +11D55;MASARAM GONDI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +11D56;MASARAM GONDI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +11D57;MASARAM GONDI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +11D58;MASARAM GONDI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +11D59;MASARAM GONDI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +11D60;GUNJALA GONDI LETTER A;Lo;0;L;;;;;N;;;;; +11D61;GUNJALA GONDI LETTER AA;Lo;0;L;;;;;N;;;;; +11D62;GUNJALA GONDI LETTER I;Lo;0;L;;;;;N;;;;; +11D63;GUNJALA GONDI LETTER II;Lo;0;L;;;;;N;;;;; +11D64;GUNJALA GONDI LETTER U;Lo;0;L;;;;;N;;;;; +11D65;GUNJALA GONDI LETTER UU;Lo;0;L;;;;;N;;;;; +11D67;GUNJALA GONDI LETTER EE;Lo;0;L;;;;;N;;;;; +11D68;GUNJALA GONDI LETTER AI;Lo;0;L;;;;;N;;;;; +11D6A;GUNJALA GONDI LETTER OO;Lo;0;L;;;;;N;;;;; +11D6B;GUNJALA GONDI LETTER AU;Lo;0;L;;;;;N;;;;; +11D6C;GUNJALA GONDI LETTER YA;Lo;0;L;;;;;N;;;;; +11D6D;GUNJALA GONDI LETTER VA;Lo;0;L;;;;;N;;;;; +11D6E;GUNJALA GONDI LETTER BA;Lo;0;L;;;;;N;;;;; +11D6F;GUNJALA GONDI LETTER BHA;Lo;0;L;;;;;N;;;;; +11D70;GUNJALA GONDI LETTER MA;Lo;0;L;;;;;N;;;;; +11D71;GUNJALA GONDI LETTER KA;Lo;0;L;;;;;N;;;;; +11D72;GUNJALA GONDI LETTER KHA;Lo;0;L;;;;;N;;;;; +11D73;GUNJALA GONDI LETTER TA;Lo;0;L;;;;;N;;;;; +11D74;GUNJALA GONDI LETTER THA;Lo;0;L;;;;;N;;;;; +11D75;GUNJALA GONDI LETTER LA;Lo;0;L;;;;;N;;;;; +11D76;GUNJALA GONDI LETTER GA;Lo;0;L;;;;;N;;;;; +11D77;GUNJALA GONDI LETTER GHA;Lo;0;L;;;;;N;;;;; +11D78;GUNJALA GONDI LETTER DA;Lo;0;L;;;;;N;;;;; +11D79;GUNJALA GONDI LETTER DHA;Lo;0;L;;;;;N;;;;; +11D7A;GUNJALA GONDI LETTER NA;Lo;0;L;;;;;N;;;;; +11D7B;GUNJALA GONDI LETTER CA;Lo;0;L;;;;;N;;;;; +11D7C;GUNJALA GONDI LETTER CHA;Lo;0;L;;;;;N;;;;; +11D7D;GUNJALA GONDI LETTER TTA;Lo;0;L;;;;;N;;;;; +11D7E;GUNJALA GONDI LETTER TTHA;Lo;0;L;;;;;N;;;;; +11D7F;GUNJALA GONDI LETTER LLA;Lo;0;L;;;;;N;;;;; +11D80;GUNJALA GONDI LETTER JA;Lo;0;L;;;;;N;;;;; +11D81;GUNJALA GONDI LETTER JHA;Lo;0;L;;;;;N;;;;; +11D82;GUNJALA GONDI LETTER DDA;Lo;0;L;;;;;N;;;;; +11D83;GUNJALA GONDI LETTER DDHA;Lo;0;L;;;;;N;;;;; +11D84;GUNJALA GONDI LETTER NGA;Lo;0;L;;;;;N;;;;; +11D85;GUNJALA GONDI LETTER PA;Lo;0;L;;;;;N;;;;; +11D86;GUNJALA GONDI LETTER PHA;Lo;0;L;;;;;N;;;;; +11D87;GUNJALA GONDI LETTER HA;Lo;0;L;;;;;N;;;;; +11D88;GUNJALA GONDI LETTER RA;Lo;0;L;;;;;N;;;;; +11D89;GUNJALA GONDI LETTER SA;Lo;0;L;;;;;N;;;;; +11D8A;GUNJALA GONDI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;; +11D8B;GUNJALA GONDI VOWEL SIGN I;Mc;0;L;;;;;N;;;;; +11D8C;GUNJALA GONDI VOWEL SIGN II;Mc;0;L;;;;;N;;;;; +11D8D;GUNJALA GONDI VOWEL SIGN U;Mc;0;L;;;;;N;;;;; +11D8E;GUNJALA GONDI VOWEL SIGN UU;Mc;0;L;;;;;N;;;;; +11D90;GUNJALA GONDI VOWEL SIGN EE;Mn;0;NSM;;;;;N;;;;; +11D91;GUNJALA GONDI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;; +11D93;GUNJALA GONDI VOWEL SIGN OO;Mc;0;L;;;;;N;;;;; +11D94;GUNJALA GONDI VOWEL SIGN AU;Mc;0;L;;;;;N;;;;; +11D95;GUNJALA GONDI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;; +11D96;GUNJALA GONDI SIGN VISARGA;Mc;0;L;;;;;N;;;;; +11D97;GUNJALA GONDI VIRAMA;Mn;9;NSM;;;;;N;;;;; +11D98;GUNJALA GONDI OM;Lo;0;L;;;;;N;;;;; +11DA0;GUNJALA GONDI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +11DA1;GUNJALA GONDI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +11DA2;GUNJALA GONDI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +11DA3;GUNJALA GONDI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +11DA4;GUNJALA GONDI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +11DA5;GUNJALA GONDI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +11DA6;GUNJALA GONDI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +11DA7;GUNJALA GONDI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +11DA8;GUNJALA GONDI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +11DA9;GUNJALA GONDI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +11DB0;TOLONG SIKI LETTER I;Lo;0;L;;;;;N;;;;; +11DB1;TOLONG SIKI LETTER E;Lo;0;L;;;;;N;;;;; +11DB2;TOLONG SIKI LETTER U;Lo;0;L;;;;;N;;;;; +11DB3;TOLONG SIKI LETTER O;Lo;0;L;;;;;N;;;;; +11DB4;TOLONG SIKI LETTER A;Lo;0;L;;;;;N;;;;; +11DB5;TOLONG SIKI LETTER AA;Lo;0;L;;;;;N;;;;; +11DB6;TOLONG SIKI LETTER P;Lo;0;L;;;;;N;;;;; +11DB7;TOLONG SIKI LETTER PH;Lo;0;L;;;;;N;;;;; +11DB8;TOLONG SIKI LETTER B;Lo;0;L;;;;;N;;;;; +11DB9;TOLONG SIKI LETTER BH;Lo;0;L;;;;;N;;;;; +11DBA;TOLONG SIKI LETTER M;Lo;0;L;;;;;N;;;;; +11DBB;TOLONG SIKI LETTER T;Lo;0;L;;;;;N;;;;; +11DBC;TOLONG SIKI LETTER TH;Lo;0;L;;;;;N;;;;; +11DBD;TOLONG SIKI LETTER D;Lo;0;L;;;;;N;;;;; +11DBE;TOLONG SIKI LETTER DH;Lo;0;L;;;;;N;;;;; +11DBF;TOLONG SIKI LETTER N;Lo;0;L;;;;;N;;;;; +11DC0;TOLONG SIKI LETTER TT;Lo;0;L;;;;;N;;;;; +11DC1;TOLONG SIKI LETTER TTH;Lo;0;L;;;;;N;;;;; +11DC2;TOLONG SIKI LETTER DD;Lo;0;L;;;;;N;;;;; +11DC3;TOLONG SIKI LETTER DDH;Lo;0;L;;;;;N;;;;; +11DC4;TOLONG SIKI LETTER NN;Lo;0;L;;;;;N;;;;; +11DC5;TOLONG SIKI LETTER C;Lo;0;L;;;;;N;;;;; +11DC6;TOLONG SIKI LETTER CH;Lo;0;L;;;;;N;;;;; +11DC7;TOLONG SIKI LETTER J;Lo;0;L;;;;;N;;;;; +11DC8;TOLONG SIKI LETTER JH;Lo;0;L;;;;;N;;;;; +11DC9;TOLONG SIKI LETTER NY;Lo;0;L;;;;;N;;;;; +11DCA;TOLONG SIKI LETTER K;Lo;0;L;;;;;N;;;;; +11DCB;TOLONG SIKI LETTER KH;Lo;0;L;;;;;N;;;;; +11DCC;TOLONG SIKI LETTER G;Lo;0;L;;;;;N;;;;; +11DCD;TOLONG SIKI LETTER GH;Lo;0;L;;;;;N;;;;; +11DCE;TOLONG SIKI LETTER NG;Lo;0;L;;;;;N;;;;; +11DCF;TOLONG SIKI LETTER Y;Lo;0;L;;;;;N;;;;; +11DD0;TOLONG SIKI LETTER R;Lo;0;L;;;;;N;;;;; +11DD1;TOLONG SIKI LETTER L;Lo;0;L;;;;;N;;;;; +11DD2;TOLONG SIKI LETTER V;Lo;0;L;;;;;N;;;;; +11DD3;TOLONG SIKI LETTER NNY;Lo;0;L;;;;;N;;;;; +11DD4;TOLONG SIKI LETTER S;Lo;0;L;;;;;N;;;;; +11DD5;TOLONG SIKI LETTER H;Lo;0;L;;;;;N;;;;; +11DD6;TOLONG SIKI LETTER X;Lo;0;L;;;;;N;;;;; +11DD7;TOLONG SIKI LETTER RR;Lo;0;L;;;;;N;;;;; +11DD8;TOLONG SIKI LETTER RRH;Lo;0;L;;;;;N;;;;; +11DD9;TOLONG SIKI SIGN SELA;Lm;0;L;;;;;N;;;;; +11DDA;TOLONG SIKI SIGN HECAKA;Lo;0;L;;;;;N;;;;; +11DDB;TOLONG SIKI UNGGA;Lo;0;L;;;;;N;;;;; +11DE0;TOLONG SIKI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +11DE1;TOLONG SIKI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +11DE2;TOLONG SIKI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +11DE3;TOLONG SIKI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +11DE4;TOLONG SIKI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +11DE5;TOLONG SIKI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +11DE6;TOLONG SIKI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +11DE7;TOLONG SIKI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +11DE8;TOLONG SIKI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +11DE9;TOLONG SIKI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +11EE0;MAKASAR LETTER KA;Lo;0;L;;;;;N;;;;; +11EE1;MAKASAR LETTER GA;Lo;0;L;;;;;N;;;;; +11EE2;MAKASAR LETTER NGA;Lo;0;L;;;;;N;;;;; +11EE3;MAKASAR LETTER PA;Lo;0;L;;;;;N;;;;; +11EE4;MAKASAR LETTER BA;Lo;0;L;;;;;N;;;;; +11EE5;MAKASAR LETTER MA;Lo;0;L;;;;;N;;;;; +11EE6;MAKASAR LETTER TA;Lo;0;L;;;;;N;;;;; +11EE7;MAKASAR LETTER DA;Lo;0;L;;;;;N;;;;; +11EE8;MAKASAR LETTER NA;Lo;0;L;;;;;N;;;;; +11EE9;MAKASAR LETTER CA;Lo;0;L;;;;;N;;;;; +11EEA;MAKASAR LETTER JA;Lo;0;L;;;;;N;;;;; +11EEB;MAKASAR LETTER NYA;Lo;0;L;;;;;N;;;;; +11EEC;MAKASAR LETTER YA;Lo;0;L;;;;;N;;;;; +11EED;MAKASAR LETTER RA;Lo;0;L;;;;;N;;;;; +11EEE;MAKASAR LETTER LA;Lo;0;L;;;;;N;;;;; +11EEF;MAKASAR LETTER VA;Lo;0;L;;;;;N;;;;; +11EF0;MAKASAR LETTER SA;Lo;0;L;;;;;N;;;;; +11EF1;MAKASAR LETTER A;Lo;0;L;;;;;N;;;;; +11EF2;MAKASAR ANGKA;Lo;0;L;;;;;N;;;;; +11EF3;MAKASAR VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;; +11EF4;MAKASAR VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;; +11EF5;MAKASAR VOWEL SIGN E;Mc;0;L;;;;;N;;;;; +11EF6;MAKASAR VOWEL SIGN O;Mc;0;L;;;;;N;;;;; +11EF7;MAKASAR PASSIMBANG;Po;0;L;;;;;N;;;;; +11EF8;MAKASAR END OF SECTION;Po;0;L;;;;;N;;;;; +11F00;KAWI SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;; +11F01;KAWI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;; +11F02;KAWI SIGN REPHA;Lo;0;L;;;;;N;;;;; +11F03;KAWI SIGN VISARGA;Mc;0;L;;;;;N;;;;; +11F04;KAWI LETTER A;Lo;0;L;;;;;N;;;;; +11F05;KAWI LETTER AA;Lo;0;L;;;;;N;;;;; +11F06;KAWI LETTER I;Lo;0;L;;;;;N;;;;; +11F07;KAWI LETTER II;Lo;0;L;;;;;N;;;;; +11F08;KAWI LETTER U;Lo;0;L;;;;;N;;;;; +11F09;KAWI LETTER UU;Lo;0;L;;;;;N;;;;; +11F0A;KAWI LETTER VOCALIC R;Lo;0;L;;;;;N;;;;; +11F0B;KAWI LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;; +11F0C;KAWI LETTER VOCALIC L;Lo;0;L;;;;;N;;;;; +11F0D;KAWI LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;; +11F0E;KAWI LETTER E;Lo;0;L;;;;;N;;;;; +11F0F;KAWI LETTER AI;Lo;0;L;;;;;N;;;;; +11F10;KAWI LETTER O;Lo;0;L;;;;;N;;;;; +11F12;KAWI LETTER KA;Lo;0;L;;;;;N;;;;; +11F13;KAWI LETTER KHA;Lo;0;L;;;;;N;;;;; +11F14;KAWI LETTER GA;Lo;0;L;;;;;N;;;;; +11F15;KAWI LETTER GHA;Lo;0;L;;;;;N;;;;; +11F16;KAWI LETTER NGA;Lo;0;L;;;;;N;;;;; +11F17;KAWI LETTER CA;Lo;0;L;;;;;N;;;;; +11F18;KAWI LETTER CHA;Lo;0;L;;;;;N;;;;; +11F19;KAWI LETTER JA;Lo;0;L;;;;;N;;;;; +11F1A;KAWI LETTER JHA;Lo;0;L;;;;;N;;;;; +11F1B;KAWI LETTER NYA;Lo;0;L;;;;;N;;;;; +11F1C;KAWI LETTER TTA;Lo;0;L;;;;;N;;;;; +11F1D;KAWI LETTER TTHA;Lo;0;L;;;;;N;;;;; +11F1E;KAWI LETTER DDA;Lo;0;L;;;;;N;;;;; +11F1F;KAWI LETTER DDHA;Lo;0;L;;;;;N;;;;; +11F20;KAWI LETTER NNA;Lo;0;L;;;;;N;;;;; +11F21;KAWI LETTER TA;Lo;0;L;;;;;N;;;;; +11F22;KAWI LETTER THA;Lo;0;L;;;;;N;;;;; +11F23;KAWI LETTER DA;Lo;0;L;;;;;N;;;;; +11F24;KAWI LETTER DHA;Lo;0;L;;;;;N;;;;; +11F25;KAWI LETTER NA;Lo;0;L;;;;;N;;;;; +11F26;KAWI LETTER PA;Lo;0;L;;;;;N;;;;; +11F27;KAWI LETTER PHA;Lo;0;L;;;;;N;;;;; +11F28;KAWI LETTER BA;Lo;0;L;;;;;N;;;;; +11F29;KAWI LETTER BHA;Lo;0;L;;;;;N;;;;; +11F2A;KAWI LETTER MA;Lo;0;L;;;;;N;;;;; +11F2B;KAWI LETTER YA;Lo;0;L;;;;;N;;;;; +11F2C;KAWI LETTER RA;Lo;0;L;;;;;N;;;;; +11F2D;KAWI LETTER LA;Lo;0;L;;;;;N;;;;; +11F2E;KAWI LETTER WA;Lo;0;L;;;;;N;;;;; +11F2F;KAWI LETTER SHA;Lo;0;L;;;;;N;;;;; +11F30;KAWI LETTER SSA;Lo;0;L;;;;;N;;;;; +11F31;KAWI LETTER SA;Lo;0;L;;;;;N;;;;; +11F32;KAWI LETTER HA;Lo;0;L;;;;;N;;;;; +11F33;KAWI LETTER JNYA;Lo;0;L;;;;;N;;;;; +11F34;KAWI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;; +11F35;KAWI VOWEL SIGN ALTERNATE AA;Mc;0;L;;;;;N;;;;; +11F36;KAWI VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;; +11F37;KAWI VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;; +11F38;KAWI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;; +11F39;KAWI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;; +11F3A;KAWI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;; +11F3E;KAWI VOWEL SIGN E;Mc;0;L;;;;;N;;;;; +11F3F;KAWI VOWEL SIGN AI;Mc;0;L;;;;;N;;;;; +11F40;KAWI VOWEL SIGN EU;Mn;0;NSM;;;;;N;;;;; +11F41;KAWI SIGN KILLER;Mc;9;L;;;;;N;;;;; +11F42;KAWI CONJOINER;Mn;9;NSM;;;;;N;;;;; +11F43;KAWI DANDA;Po;0;L;;;;;N;;;;; +11F44;KAWI DOUBLE DANDA;Po;0;L;;;;;N;;;;; +11F45;KAWI PUNCTUATION SECTION MARKER;Po;0;L;;;;;N;;;;; +11F46;KAWI PUNCTUATION ALTERNATE SECTION MARKER;Po;0;L;;;;;N;;;;; +11F47;KAWI PUNCTUATION FLOWER;Po;0;L;;;;;N;;;;; +11F48;KAWI PUNCTUATION SPACE FILLER;Po;0;L;;;;;N;;;;; +11F49;KAWI PUNCTUATION DOT;Po;0;L;;;;;N;;;;; +11F4A;KAWI PUNCTUATION DOUBLE DOT;Po;0;L;;;;;N;;;;; +11F4B;KAWI PUNCTUATION TRIPLE DOT;Po;0;L;;;;;N;;;;; +11F4C;KAWI PUNCTUATION CIRCLE;Po;0;L;;;;;N;;;;; +11F4D;KAWI PUNCTUATION FILLED CIRCLE;Po;0;L;;;;;N;;;;; +11F4E;KAWI PUNCTUATION SPIRAL;Po;0;L;;;;;N;;;;; +11F4F;KAWI PUNCTUATION CLOSING SPIRAL;Po;0;L;;;;;N;;;;; +11F50;KAWI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +11F51;KAWI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +11F52;KAWI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +11F53;KAWI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +11F54;KAWI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +11F55;KAWI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +11F56;KAWI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +11F57;KAWI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +11F58;KAWI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +11F59;KAWI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +11F5A;KAWI SIGN NUKTA;Mn;0;NSM;;;;;N;;;;; +11FB0;LISU LETTER YHA;Lo;0;L;;;;;N;;;;; +11FC0;TAMIL FRACTION ONE THREE-HUNDRED-AND-TWENTIETH;No;0;L;;;;1/320;N;;;;; +11FC1;TAMIL FRACTION ONE ONE-HUNDRED-AND-SIXTIETH;No;0;L;;;;1/160;N;;;;; +11FC2;TAMIL FRACTION ONE EIGHTIETH;No;0;L;;;;1/80;N;;;;; +11FC3;TAMIL FRACTION ONE SIXTY-FOURTH;No;0;L;;;;1/64;N;;;;; +11FC4;TAMIL FRACTION ONE FORTIETH;No;0;L;;;;1/40;N;;;;; +11FC5;TAMIL FRACTION ONE THIRTY-SECOND;No;0;L;;;;1/32;N;;;;; +11FC6;TAMIL FRACTION THREE EIGHTIETHS;No;0;L;;;;3/80;N;;;;; +11FC7;TAMIL FRACTION THREE SIXTY-FOURTHS;No;0;L;;;;3/64;N;;;;; +11FC8;TAMIL FRACTION ONE TWENTIETH;No;0;L;;;;1/20;N;;;;; +11FC9;TAMIL FRACTION ONE SIXTEENTH-1;No;0;L;;;;1/16;N;;;;; +11FCA;TAMIL FRACTION ONE SIXTEENTH-2;No;0;L;;;;1/16;N;;;;; +11FCB;TAMIL FRACTION ONE TENTH;No;0;L;;;;1/10;N;;;;; +11FCC;TAMIL FRACTION ONE EIGHTH;No;0;L;;;;1/8;N;;;;; +11FCD;TAMIL FRACTION THREE TWENTIETHS;No;0;L;;;;3/20;N;;;;; +11FCE;TAMIL FRACTION THREE SIXTEENTHS;No;0;L;;;;3/16;N;;;;; +11FCF;TAMIL FRACTION ONE FIFTH;No;0;L;;;;1/5;N;;;;; +11FD0;TAMIL FRACTION ONE QUARTER;No;0;L;;;;1/4;N;;;;; +11FD1;TAMIL FRACTION ONE HALF-1;No;0;L;;;;1/2;N;;;;; +11FD2;TAMIL FRACTION ONE HALF-2;No;0;L;;;;1/2;N;;;;; +11FD3;TAMIL FRACTION THREE QUARTERS;No;0;L;;;;3/4;N;;;;; +11FD4;TAMIL FRACTION DOWNSCALING FACTOR KIIZH;No;0;L;;;;1/320;N;;;;; +11FD5;TAMIL SIGN NEL;So;0;ON;;;;;N;;;;; +11FD6;TAMIL SIGN CEVITU;So;0;ON;;;;;N;;;;; +11FD7;TAMIL SIGN AAZHAAKKU;So;0;ON;;;;;N;;;;; +11FD8;TAMIL SIGN UZHAKKU;So;0;ON;;;;;N;;;;; +11FD9;TAMIL SIGN MUUVUZHAKKU;So;0;ON;;;;;N;;;;; +11FDA;TAMIL SIGN KURUNI;So;0;ON;;;;;N;;;;; +11FDB;TAMIL SIGN PATHAKKU;So;0;ON;;;;;N;;;;; +11FDC;TAMIL SIGN MUKKURUNI;So;0;ON;;;;;N;;;;; +11FDD;TAMIL SIGN KAACU;Sc;0;ET;;;;;N;;;;; +11FDE;TAMIL SIGN PANAM;Sc;0;ET;;;;;N;;;;; +11FDF;TAMIL SIGN PON;Sc;0;ET;;;;;N;;;;; +11FE0;TAMIL SIGN VARAAKAN;Sc;0;ET;;;;;N;;;;; +11FE1;TAMIL SIGN PAARAM;So;0;ON;;;;;N;;;;; +11FE2;TAMIL SIGN KUZHI;So;0;ON;;;;;N;;;;; +11FE3;TAMIL SIGN VELI;So;0;ON;;;;;N;;;;; +11FE4;TAMIL WET CULTIVATION SIGN;So;0;ON;;;;;N;;;;; +11FE5;TAMIL DRY CULTIVATION SIGN;So;0;ON;;;;;N;;;;; +11FE6;TAMIL LAND SIGN;So;0;ON;;;;;N;;;;; +11FE7;TAMIL SALT PAN SIGN;So;0;ON;;;;;N;;;;; +11FE8;TAMIL TRADITIONAL CREDIT SIGN;So;0;ON;;;;;N;;;;; +11FE9;TAMIL TRADITIONAL NUMBER SIGN;So;0;ON;;;;;N;;;;; +11FEA;TAMIL CURRENT SIGN;So;0;ON;;;;;N;;;;; +11FEB;TAMIL AND ODD SIGN;So;0;ON;;;;;N;;;;; +11FEC;TAMIL SPENT SIGN;So;0;ON;;;;;N;;;;; +11FED;TAMIL TOTAL SIGN;So;0;ON;;;;;N;;;;; +11FEE;TAMIL IN POSSESSION SIGN;So;0;ON;;;;;N;;;;; +11FEF;TAMIL STARTING FROM SIGN;So;0;ON;;;;;N;;;;; +11FF0;TAMIL SIGN MUTHALIYA;So;0;ON;;;;;N;;;;; +11FF1;TAMIL SIGN VAKAIYARAA;So;0;ON;;;;;N;;;;; +11FFF;TAMIL PUNCTUATION END OF TEXT;Po;0;L;;;;;N;;;;; +12000;CUNEIFORM SIGN A;Lo;0;L;;;;;N;;;;; +12001;CUNEIFORM SIGN A TIMES A;Lo;0;L;;;;;N;;;;; +12002;CUNEIFORM SIGN A TIMES BAD;Lo;0;L;;;;;N;;;;; +12003;CUNEIFORM SIGN A TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;; +12004;CUNEIFORM SIGN A TIMES HA;Lo;0;L;;;;;N;;;;; +12005;CUNEIFORM SIGN A TIMES IGI;Lo;0;L;;;;;N;;;;; +12006;CUNEIFORM SIGN A TIMES LAGAR GUNU;Lo;0;L;;;;;N;;;;; +12007;CUNEIFORM SIGN A TIMES MUSH;Lo;0;L;;;;;N;;;;; +12008;CUNEIFORM SIGN A TIMES SAG;Lo;0;L;;;;;N;;;;; +12009;CUNEIFORM SIGN A2;Lo;0;L;;;;;N;;;;; +1200A;CUNEIFORM SIGN AB;Lo;0;L;;;;;N;;;;; +1200B;CUNEIFORM SIGN AB TIMES ASH2;Lo;0;L;;;;;N;;;;; +1200C;CUNEIFORM SIGN AB TIMES DUN3 GUNU;Lo;0;L;;;;;N;;;;; +1200D;CUNEIFORM SIGN AB TIMES GAL;Lo;0;L;;;;;N;;;;; +1200E;CUNEIFORM SIGN AB TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;; +1200F;CUNEIFORM SIGN AB TIMES HA;Lo;0;L;;;;;N;;;;; +12010;CUNEIFORM SIGN AB TIMES IGI GUNU;Lo;0;L;;;;;N;;;;; +12011;CUNEIFORM SIGN AB TIMES IMIN;Lo;0;L;;;;;N;;;;; +12012;CUNEIFORM SIGN AB TIMES LAGAB;Lo;0;L;;;;;N;;;;; +12013;CUNEIFORM SIGN AB TIMES SHESH;Lo;0;L;;;;;N;;;;; +12014;CUNEIFORM SIGN AB TIMES U PLUS U PLUS U;Lo;0;L;;;;;N;;;;; +12015;CUNEIFORM SIGN AB GUNU;Lo;0;L;;;;;N;;;;; +12016;CUNEIFORM SIGN AB2;Lo;0;L;;;;;N;;;;; +12017;CUNEIFORM SIGN AB2 TIMES BALAG;Lo;0;L;;;;;N;;;;; +12018;CUNEIFORM SIGN AB2 TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;; +12019;CUNEIFORM SIGN AB2 TIMES ME PLUS EN;Lo;0;L;;;;;N;;;;; +1201A;CUNEIFORM SIGN AB2 TIMES SHA3;Lo;0;L;;;;;N;;;;; +1201B;CUNEIFORM SIGN AB2 TIMES TAK4;Lo;0;L;;;;;N;;;;; +1201C;CUNEIFORM SIGN AD;Lo;0;L;;;;;N;;;;; +1201D;CUNEIFORM SIGN AK;Lo;0;L;;;;;N;;;;; +1201E;CUNEIFORM SIGN AK TIMES ERIN2;Lo;0;L;;;;;N;;;;; +1201F;CUNEIFORM SIGN AK TIMES SHITA PLUS GISH;Lo;0;L;;;;;N;;;;; +12020;CUNEIFORM SIGN AL;Lo;0;L;;;;;N;;;;; +12021;CUNEIFORM SIGN AL TIMES AL;Lo;0;L;;;;;N;;;;; +12022;CUNEIFORM SIGN AL TIMES DIM2;Lo;0;L;;;;;N;;;;; +12023;CUNEIFORM SIGN AL TIMES GISH;Lo;0;L;;;;;N;;;;; +12024;CUNEIFORM SIGN AL TIMES HA;Lo;0;L;;;;;N;;;;; +12025;CUNEIFORM SIGN AL TIMES KAD3;Lo;0;L;;;;;N;;;;; +12026;CUNEIFORM SIGN AL TIMES KI;Lo;0;L;;;;;N;;;;; +12027;CUNEIFORM SIGN AL TIMES SHE;Lo;0;L;;;;;N;;;;; +12028;CUNEIFORM SIGN AL TIMES USH;Lo;0;L;;;;;N;;;;; +12029;CUNEIFORM SIGN ALAN;Lo;0;L;;;;;N;;;;; +1202A;CUNEIFORM SIGN ALEPH;Lo;0;L;;;;;N;;;;; +1202B;CUNEIFORM SIGN AMAR;Lo;0;L;;;;;N;;;;; +1202C;CUNEIFORM SIGN AMAR TIMES SHE;Lo;0;L;;;;;N;;;;; +1202D;CUNEIFORM SIGN AN;Lo;0;L;;;;;N;;;;; +1202E;CUNEIFORM SIGN AN OVER AN;Lo;0;L;;;;;N;;;;; +1202F;CUNEIFORM SIGN AN THREE TIMES;Lo;0;L;;;;;N;;;;; +12030;CUNEIFORM SIGN AN PLUS NAGA OPPOSING AN PLUS NAGA;Lo;0;L;;;;;N;;;;; +12031;CUNEIFORM SIGN AN PLUS NAGA SQUARED;Lo;0;L;;;;;N;;;;; +12032;CUNEIFORM SIGN ANSHE;Lo;0;L;;;;;N;;;;; +12033;CUNEIFORM SIGN APIN;Lo;0;L;;;;;N;;;;; +12034;CUNEIFORM SIGN ARAD;Lo;0;L;;;;;N;;;;; +12035;CUNEIFORM SIGN ARAD TIMES KUR;Lo;0;L;;;;;N;;;;; +12036;CUNEIFORM SIGN ARKAB;Lo;0;L;;;;;N;;;;; +12037;CUNEIFORM SIGN ASAL2;Lo;0;L;;;;;N;;;;; +12038;CUNEIFORM SIGN ASH;Lo;0;L;;;;1;N;;;;; +12039;CUNEIFORM SIGN ASH ZIDA TENU;Lo;0;L;;;;1;N;;;;; +1203A;CUNEIFORM SIGN ASH KABA TENU;Lo;0;L;;;;;N;;;;; +1203B;CUNEIFORM SIGN ASH OVER ASH TUG2 OVER TUG2 TUG2 OVER TUG2 PAP;Lo;0;L;;;;;N;;;;; +1203C;CUNEIFORM SIGN ASH OVER ASH OVER ASH;Lo;0;L;;;;;N;;;;; +1203D;CUNEIFORM SIGN ASH OVER ASH OVER ASH CROSSING ASH OVER ASH OVER ASH;Lo;0;L;;;;;N;;;;; +1203E;CUNEIFORM SIGN ASH2;Lo;0;L;;;;;N;;;;; +1203F;CUNEIFORM SIGN ASHGAB;Lo;0;L;;;;;N;;;;; +12040;CUNEIFORM SIGN BA;Lo;0;L;;;;;N;;;;; +12041;CUNEIFORM SIGN BAD;Lo;0;L;;;;;N;;;;; +12042;CUNEIFORM SIGN BAG3;Lo;0;L;;;;;N;;;;; +12043;CUNEIFORM SIGN BAHAR2;Lo;0;L;;;;;N;;;;; +12044;CUNEIFORM SIGN BAL;Lo;0;L;;;;;N;;;;; +12045;CUNEIFORM SIGN BAL OVER BAL;Lo;0;L;;;;;N;;;;; +12046;CUNEIFORM SIGN BALAG;Lo;0;L;;;;;N;;;;; +12047;CUNEIFORM SIGN BAR;Lo;0;L;;;;;N;;;;; +12048;CUNEIFORM SIGN BARA2;Lo;0;L;;;;;N;;;;; +12049;CUNEIFORM SIGN BI;Lo;0;L;;;;;N;;;;; +1204A;CUNEIFORM SIGN BI TIMES A;Lo;0;L;;;;;N;;;;; +1204B;CUNEIFORM SIGN BI TIMES GAR;Lo;0;L;;;;;N;;;;; +1204C;CUNEIFORM SIGN BI TIMES IGI GUNU;Lo;0;L;;;;;N;;;;; +1204D;CUNEIFORM SIGN BU;Lo;0;L;;;;;N;;;;; +1204E;CUNEIFORM SIGN BU OVER BU AB;Lo;0;L;;;;;N;;;;; +1204F;CUNEIFORM SIGN BU OVER BU UN;Lo;0;L;;;;;N;;;;; +12050;CUNEIFORM SIGN BU CROSSING BU;Lo;0;L;;;;;N;;;;; +12051;CUNEIFORM SIGN BULUG;Lo;0;L;;;;;N;;;;; +12052;CUNEIFORM SIGN BULUG OVER BULUG;Lo;0;L;;;;;N;;;;; +12053;CUNEIFORM SIGN BUR;Lo;0;L;;;;;N;;;;; +12054;CUNEIFORM SIGN BUR2;Lo;0;L;;;;;N;;;;; +12055;CUNEIFORM SIGN DA;Lo;0;L;;;;;N;;;;; +12056;CUNEIFORM SIGN DAG;Lo;0;L;;;;;N;;;;; +12057;CUNEIFORM SIGN DAG KISIM5 TIMES A PLUS MASH;Lo;0;L;;;;;N;;;;; +12058;CUNEIFORM SIGN DAG KISIM5 TIMES AMAR;Lo;0;L;;;;;N;;;;; +12059;CUNEIFORM SIGN DAG KISIM5 TIMES BALAG;Lo;0;L;;;;;N;;;;; +1205A;CUNEIFORM SIGN DAG KISIM5 TIMES BI;Lo;0;L;;;;;N;;;;; +1205B;CUNEIFORM SIGN DAG KISIM5 TIMES GA;Lo;0;L;;;;;N;;;;; +1205C;CUNEIFORM SIGN DAG KISIM5 TIMES GA PLUS MASH;Lo;0;L;;;;;N;;;;; +1205D;CUNEIFORM SIGN DAG KISIM5 TIMES GI;Lo;0;L;;;;;N;;;;; +1205E;CUNEIFORM SIGN DAG KISIM5 TIMES GIR2;Lo;0;L;;;;;N;;;;; +1205F;CUNEIFORM SIGN DAG KISIM5 TIMES GUD;Lo;0;L;;;;;N;;;;; +12060;CUNEIFORM SIGN DAG KISIM5 TIMES HA;Lo;0;L;;;;;N;;;;; +12061;CUNEIFORM SIGN DAG KISIM5 TIMES IR;Lo;0;L;;;;;N;;;;; +12062;CUNEIFORM SIGN DAG KISIM5 TIMES IR PLUS LU;Lo;0;L;;;;;N;;;;; +12063;CUNEIFORM SIGN DAG KISIM5 TIMES KAK;Lo;0;L;;;;;N;;;;; +12064;CUNEIFORM SIGN DAG KISIM5 TIMES LA;Lo;0;L;;;;;N;;;;; +12065;CUNEIFORM SIGN DAG KISIM5 TIMES LU;Lo;0;L;;;;;N;;;;; +12066;CUNEIFORM SIGN DAG KISIM5 TIMES LU PLUS MASH2;Lo;0;L;;;;;N;;;;; +12067;CUNEIFORM SIGN DAG KISIM5 TIMES LUM;Lo;0;L;;;;;N;;;;; +12068;CUNEIFORM SIGN DAG KISIM5 TIMES NE;Lo;0;L;;;;;N;;;;; +12069;CUNEIFORM SIGN DAG KISIM5 TIMES PAP PLUS PAP;Lo;0;L;;;;;N;;;;; +1206A;CUNEIFORM SIGN DAG KISIM5 TIMES SI;Lo;0;L;;;;;N;;;;; +1206B;CUNEIFORM SIGN DAG KISIM5 TIMES TAK4;Lo;0;L;;;;;N;;;;; +1206C;CUNEIFORM SIGN DAG KISIM5 TIMES U2 PLUS GIR2;Lo;0;L;;;;;N;;;;; +1206D;CUNEIFORM SIGN DAG KISIM5 TIMES USH;Lo;0;L;;;;;N;;;;; +1206E;CUNEIFORM SIGN DAM;Lo;0;L;;;;;N;;;;; +1206F;CUNEIFORM SIGN DAR;Lo;0;L;;;;;N;;;;; +12070;CUNEIFORM SIGN DARA3;Lo;0;L;;;;;N;;;;; +12071;CUNEIFORM SIGN DARA4;Lo;0;L;;;;;N;;;;; +12072;CUNEIFORM SIGN DI;Lo;0;L;;;;;N;;;;; +12073;CUNEIFORM SIGN DIB;Lo;0;L;;;;;N;;;;; +12074;CUNEIFORM SIGN DIM;Lo;0;L;;;;;N;;;;; +12075;CUNEIFORM SIGN DIM TIMES SHE;Lo;0;L;;;;;N;;;;; +12076;CUNEIFORM SIGN DIM2;Lo;0;L;;;;;N;;;;; +12077;CUNEIFORM SIGN DIN;Lo;0;L;;;;;N;;;;; +12078;CUNEIFORM SIGN DIN KASKAL U GUNU DISH;Lo;0;L;;;;;N;;;;; +12079;CUNEIFORM SIGN DISH;Lo;0;L;;;;1;N;;;;; +1207A;CUNEIFORM SIGN DU;Lo;0;L;;;;;N;;;;; +1207B;CUNEIFORM SIGN DU OVER DU;Lo;0;L;;;;;N;;;;; +1207C;CUNEIFORM SIGN DU GUNU;Lo;0;L;;;;;N;;;;; +1207D;CUNEIFORM SIGN DU SHESHIG;Lo;0;L;;;;;N;;;;; +1207E;CUNEIFORM SIGN DUB;Lo;0;L;;;;;N;;;;; +1207F;CUNEIFORM SIGN DUB TIMES ESH2;Lo;0;L;;;;;N;;;;; +12080;CUNEIFORM SIGN DUB2;Lo;0;L;;;;;N;;;;; +12081;CUNEIFORM SIGN DUG;Lo;0;L;;;;;N;;;;; +12082;CUNEIFORM SIGN DUGUD;Lo;0;L;;;;;N;;;;; +12083;CUNEIFORM SIGN DUH;Lo;0;L;;;;;N;;;;; +12084;CUNEIFORM SIGN DUN;Lo;0;L;;;;;N;;;;; +12085;CUNEIFORM SIGN DUN3;Lo;0;L;;;;;N;;;;; +12086;CUNEIFORM SIGN DUN3 GUNU;Lo;0;L;;;;;N;;;;; +12087;CUNEIFORM SIGN DUN3 GUNU GUNU;Lo;0;L;;;;;N;;;;; +12088;CUNEIFORM SIGN DUN4;Lo;0;L;;;;;N;;;;; +12089;CUNEIFORM SIGN DUR2;Lo;0;L;;;;;N;;;;; +1208A;CUNEIFORM SIGN E;Lo;0;L;;;;;N;;;;; +1208B;CUNEIFORM SIGN E TIMES PAP;Lo;0;L;;;;;N;;;;; +1208C;CUNEIFORM SIGN E OVER E NUN OVER NUN;Lo;0;L;;;;;N;;;;; +1208D;CUNEIFORM SIGN E2;Lo;0;L;;;;;N;;;;; +1208E;CUNEIFORM SIGN E2 TIMES A PLUS HA PLUS DA;Lo;0;L;;;;;N;;;;; +1208F;CUNEIFORM SIGN E2 TIMES GAR;Lo;0;L;;;;;N;;;;; +12090;CUNEIFORM SIGN E2 TIMES MI;Lo;0;L;;;;;N;;;;; +12091;CUNEIFORM SIGN E2 TIMES SAL;Lo;0;L;;;;;N;;;;; +12092;CUNEIFORM SIGN E2 TIMES SHE;Lo;0;L;;;;;N;;;;; +12093;CUNEIFORM SIGN E2 TIMES U;Lo;0;L;;;;;N;;;;; +12094;CUNEIFORM SIGN EDIN;Lo;0;L;;;;;N;;;;; +12095;CUNEIFORM SIGN EGIR;Lo;0;L;;;;;N;;;;; +12096;CUNEIFORM SIGN EL;Lo;0;L;;;;;N;;;;; +12097;CUNEIFORM SIGN EN;Lo;0;L;;;;;N;;;;; +12098;CUNEIFORM SIGN EN TIMES GAN2;Lo;0;L;;;;;N;;;;; +12099;CUNEIFORM SIGN EN TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;; +1209A;CUNEIFORM SIGN EN TIMES ME;Lo;0;L;;;;;N;;;;; +1209B;CUNEIFORM SIGN EN CROSSING EN;Lo;0;L;;;;;N;;;;; +1209C;CUNEIFORM SIGN EN OPPOSING EN;Lo;0;L;;;;;N;;;;; +1209D;CUNEIFORM SIGN EN SQUARED;Lo;0;L;;;;;N;;;;; +1209E;CUNEIFORM SIGN EREN;Lo;0;L;;;;;N;;;;; +1209F;CUNEIFORM SIGN ERIN2;Lo;0;L;;;;;N;;;;; +120A0;CUNEIFORM SIGN ESH2;Lo;0;L;;;;;N;;;;; +120A1;CUNEIFORM SIGN EZEN;Lo;0;L;;;;;N;;;;; +120A2;CUNEIFORM SIGN EZEN TIMES A;Lo;0;L;;;;;N;;;;; +120A3;CUNEIFORM SIGN EZEN TIMES A PLUS LAL;Lo;0;L;;;;;N;;;;; +120A4;CUNEIFORM SIGN EZEN TIMES A PLUS LAL TIMES LAL;Lo;0;L;;;;;N;;;;; +120A5;CUNEIFORM SIGN EZEN TIMES AN;Lo;0;L;;;;;N;;;;; +120A6;CUNEIFORM SIGN EZEN TIMES BAD;Lo;0;L;;;;;N;;;;; +120A7;CUNEIFORM SIGN EZEN TIMES DUN3 GUNU;Lo;0;L;;;;;N;;;;; +120A8;CUNEIFORM SIGN EZEN TIMES DUN3 GUNU GUNU;Lo;0;L;;;;;N;;;;; +120A9;CUNEIFORM SIGN EZEN TIMES HA;Lo;0;L;;;;;N;;;;; +120AA;CUNEIFORM SIGN EZEN TIMES HA GUNU;Lo;0;L;;;;;N;;;;; +120AB;CUNEIFORM SIGN EZEN TIMES IGI GUNU;Lo;0;L;;;;;N;;;;; +120AC;CUNEIFORM SIGN EZEN TIMES KASKAL;Lo;0;L;;;;;N;;;;; +120AD;CUNEIFORM SIGN EZEN TIMES KASKAL SQUARED;Lo;0;L;;;;;N;;;;; +120AE;CUNEIFORM SIGN EZEN TIMES KU3;Lo;0;L;;;;;N;;;;; +120AF;CUNEIFORM SIGN EZEN TIMES LA;Lo;0;L;;;;;N;;;;; +120B0;CUNEIFORM SIGN EZEN TIMES LAL TIMES LAL;Lo;0;L;;;;;N;;;;; +120B1;CUNEIFORM SIGN EZEN TIMES LI;Lo;0;L;;;;;N;;;;; +120B2;CUNEIFORM SIGN EZEN TIMES LU;Lo;0;L;;;;;N;;;;; +120B3;CUNEIFORM SIGN EZEN TIMES U2;Lo;0;L;;;;;N;;;;; +120B4;CUNEIFORM SIGN EZEN TIMES UD;Lo;0;L;;;;;N;;;;; +120B5;CUNEIFORM SIGN GA;Lo;0;L;;;;;N;;;;; +120B6;CUNEIFORM SIGN GA GUNU;Lo;0;L;;;;;N;;;;; +120B7;CUNEIFORM SIGN GA2;Lo;0;L;;;;;N;;;;; +120B8;CUNEIFORM SIGN GA2 TIMES A PLUS DA PLUS HA;Lo;0;L;;;;;N;;;;; +120B9;CUNEIFORM SIGN GA2 TIMES A PLUS HA;Lo;0;L;;;;;N;;;;; +120BA;CUNEIFORM SIGN GA2 TIMES A PLUS IGI;Lo;0;L;;;;;N;;;;; +120BB;CUNEIFORM SIGN GA2 TIMES AB2 TENU PLUS TAB;Lo;0;L;;;;;N;;;;; +120BC;CUNEIFORM SIGN GA2 TIMES AN;Lo;0;L;;;;;N;;;;; +120BD;CUNEIFORM SIGN GA2 TIMES ASH;Lo;0;L;;;;;N;;;;; +120BE;CUNEIFORM SIGN GA2 TIMES ASH2 PLUS GAL;Lo;0;L;;;;;N;;;;; +120BF;CUNEIFORM SIGN GA2 TIMES BAD;Lo;0;L;;;;;N;;;;; +120C0;CUNEIFORM SIGN GA2 TIMES BAR PLUS RA;Lo;0;L;;;;;N;;;;; +120C1;CUNEIFORM SIGN GA2 TIMES BUR;Lo;0;L;;;;;N;;;;; +120C2;CUNEIFORM SIGN GA2 TIMES BUR PLUS RA;Lo;0;L;;;;;N;;;;; +120C3;CUNEIFORM SIGN GA2 TIMES DA;Lo;0;L;;;;;N;;;;; +120C4;CUNEIFORM SIGN GA2 TIMES DI;Lo;0;L;;;;;N;;;;; +120C5;CUNEIFORM SIGN GA2 TIMES DIM TIMES SHE;Lo;0;L;;;;;N;;;;; +120C6;CUNEIFORM SIGN GA2 TIMES DUB;Lo;0;L;;;;;N;;;;; +120C7;CUNEIFORM SIGN GA2 TIMES EL;Lo;0;L;;;;;N;;;;; +120C8;CUNEIFORM SIGN GA2 TIMES EL PLUS LA;Lo;0;L;;;;;N;;;;; +120C9;CUNEIFORM SIGN GA2 TIMES EN;Lo;0;L;;;;;N;;;;; +120CA;CUNEIFORM SIGN GA2 TIMES EN TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;; +120CB;CUNEIFORM SIGN GA2 TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;; +120CC;CUNEIFORM SIGN GA2 TIMES GAR;Lo;0;L;;;;;N;;;;; +120CD;CUNEIFORM SIGN GA2 TIMES GI;Lo;0;L;;;;;N;;;;; +120CE;CUNEIFORM SIGN GA2 TIMES GI4;Lo;0;L;;;;;N;;;;; +120CF;CUNEIFORM SIGN GA2 TIMES GI4 PLUS A;Lo;0;L;;;;;N;;;;; +120D0;CUNEIFORM SIGN GA2 TIMES GIR2 PLUS SU;Lo;0;L;;;;;N;;;;; +120D1;CUNEIFORM SIGN GA2 TIMES HA PLUS LU PLUS ESH2;Lo;0;L;;;;;N;;;;; +120D2;CUNEIFORM SIGN GA2 TIMES HAL;Lo;0;L;;;;;N;;;;; +120D3;CUNEIFORM SIGN GA2 TIMES HAL PLUS LA;Lo;0;L;;;;;N;;;;; +120D4;CUNEIFORM SIGN GA2 TIMES HI PLUS LI;Lo;0;L;;;;;N;;;;; +120D5;CUNEIFORM SIGN GA2 TIMES HUB2;Lo;0;L;;;;;N;;;;; +120D6;CUNEIFORM SIGN GA2 TIMES IGI GUNU;Lo;0;L;;;;;N;;;;; +120D7;CUNEIFORM SIGN GA2 TIMES ISH PLUS HU PLUS ASH;Lo;0;L;;;;;N;;;;; +120D8;CUNEIFORM SIGN GA2 TIMES KAK;Lo;0;L;;;;;N;;;;; +120D9;CUNEIFORM SIGN GA2 TIMES KASKAL;Lo;0;L;;;;;N;;;;; +120DA;CUNEIFORM SIGN GA2 TIMES KID;Lo;0;L;;;;;N;;;;; +120DB;CUNEIFORM SIGN GA2 TIMES KID PLUS LAL;Lo;0;L;;;;;N;;;;; +120DC;CUNEIFORM SIGN GA2 TIMES KU3 PLUS AN;Lo;0;L;;;;;N;;;;; +120DD;CUNEIFORM SIGN GA2 TIMES LA;Lo;0;L;;;;;N;;;;; +120DE;CUNEIFORM SIGN GA2 TIMES ME PLUS EN;Lo;0;L;;;;;N;;;;; +120DF;CUNEIFORM SIGN GA2 TIMES MI;Lo;0;L;;;;;N;;;;; +120E0;CUNEIFORM SIGN GA2 TIMES NUN;Lo;0;L;;;;;N;;;;; +120E1;CUNEIFORM SIGN GA2 TIMES NUN OVER NUN;Lo;0;L;;;;;N;;;;; +120E2;CUNEIFORM SIGN GA2 TIMES PA;Lo;0;L;;;;;N;;;;; +120E3;CUNEIFORM SIGN GA2 TIMES SAL;Lo;0;L;;;;;N;;;;; +120E4;CUNEIFORM SIGN GA2 TIMES SAR;Lo;0;L;;;;;N;;;;; +120E5;CUNEIFORM SIGN GA2 TIMES SHE;Lo;0;L;;;;;N;;;;; +120E6;CUNEIFORM SIGN GA2 TIMES SHE PLUS TUR;Lo;0;L;;;;;N;;;;; +120E7;CUNEIFORM SIGN GA2 TIMES SHID;Lo;0;L;;;;;N;;;;; +120E8;CUNEIFORM SIGN GA2 TIMES SUM;Lo;0;L;;;;;N;;;;; +120E9;CUNEIFORM SIGN GA2 TIMES TAK4;Lo;0;L;;;;;N;;;;; +120EA;CUNEIFORM SIGN GA2 TIMES U;Lo;0;L;;;;;N;;;;; +120EB;CUNEIFORM SIGN GA2 TIMES UD;Lo;0;L;;;;;N;;;;; +120EC;CUNEIFORM SIGN GA2 TIMES UD PLUS DU;Lo;0;L;;;;;N;;;;; +120ED;CUNEIFORM SIGN GA2 OVER GA2;Lo;0;L;;;;;N;;;;; +120EE;CUNEIFORM SIGN GABA;Lo;0;L;;;;;N;;;;; +120EF;CUNEIFORM SIGN GABA CROSSING GABA;Lo;0;L;;;;;N;;;;; +120F0;CUNEIFORM SIGN GAD;Lo;0;L;;;;;N;;;;; +120F1;CUNEIFORM SIGN GAD OVER GAD GAR OVER GAR;Lo;0;L;;;;;N;;;;; +120F2;CUNEIFORM SIGN GAL;Lo;0;L;;;;;N;;;;; +120F3;CUNEIFORM SIGN GAL GAD OVER GAD GAR OVER GAR;Lo;0;L;;;;;N;;;;; +120F4;CUNEIFORM SIGN GALAM;Lo;0;L;;;;;N;;;;; +120F5;CUNEIFORM SIGN GAM;Lo;0;L;;;;;N;;;;; +120F6;CUNEIFORM SIGN GAN;Lo;0;L;;;;;N;;;;; +120F7;CUNEIFORM SIGN GAN2;Lo;0;L;;;;;N;;;;; +120F8;CUNEIFORM SIGN GAN2 TENU;Lo;0;L;;;;;N;;;;; +120F9;CUNEIFORM SIGN GAN2 OVER GAN2;Lo;0;L;;;;;N;;;;; +120FA;CUNEIFORM SIGN GAN2 CROSSING GAN2;Lo;0;L;;;;;N;;;;; +120FB;CUNEIFORM SIGN GAR;Lo;0;L;;;;;N;;;;; +120FC;CUNEIFORM SIGN GAR3;Lo;0;L;;;;;N;;;;; +120FD;CUNEIFORM SIGN GASHAN;Lo;0;L;;;;;N;;;;; +120FE;CUNEIFORM SIGN GESHTIN;Lo;0;L;;;;;N;;;;; +120FF;CUNEIFORM SIGN GESHTIN TIMES KUR;Lo;0;L;;;;;N;;;;; +12100;CUNEIFORM SIGN GI;Lo;0;L;;;;;N;;;;; +12101;CUNEIFORM SIGN GI TIMES E;Lo;0;L;;;;;N;;;;; +12102;CUNEIFORM SIGN GI TIMES U;Lo;0;L;;;;;N;;;;; +12103;CUNEIFORM SIGN GI CROSSING GI;Lo;0;L;;;;;N;;;;; +12104;CUNEIFORM SIGN GI4;Lo;0;L;;;;;N;;;;; +12105;CUNEIFORM SIGN GI4 OVER GI4;Lo;0;L;;;;;N;;;;; +12106;CUNEIFORM SIGN GI4 CROSSING GI4;Lo;0;L;;;;;N;;;;; +12107;CUNEIFORM SIGN GIDIM;Lo;0;L;;;;;N;;;;; +12108;CUNEIFORM SIGN GIR2;Lo;0;L;;;;;N;;;;; +12109;CUNEIFORM SIGN GIR2 GUNU;Lo;0;L;;;;;N;;;;; +1210A;CUNEIFORM SIGN GIR3;Lo;0;L;;;;;N;;;;; +1210B;CUNEIFORM SIGN GIR3 TIMES A PLUS IGI;Lo;0;L;;;;;N;;;;; +1210C;CUNEIFORM SIGN GIR3 TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;; +1210D;CUNEIFORM SIGN GIR3 TIMES IGI;Lo;0;L;;;;;N;;;;; +1210E;CUNEIFORM SIGN GIR3 TIMES LU PLUS IGI;Lo;0;L;;;;;N;;;;; +1210F;CUNEIFORM SIGN GIR3 TIMES PA;Lo;0;L;;;;;N;;;;; +12110;CUNEIFORM SIGN GISAL;Lo;0;L;;;;;N;;;;; +12111;CUNEIFORM SIGN GISH;Lo;0;L;;;;;N;;;;; +12112;CUNEIFORM SIGN GISH CROSSING GISH;Lo;0;L;;;;;N;;;;; +12113;CUNEIFORM SIGN GISH TIMES BAD;Lo;0;L;;;;;N;;;;; +12114;CUNEIFORM SIGN GISH TIMES TAK4;Lo;0;L;;;;;N;;;;; +12115;CUNEIFORM SIGN GISH TENU;Lo;0;L;;;;;N;;;;; +12116;CUNEIFORM SIGN GU;Lo;0;L;;;;;N;;;;; +12117;CUNEIFORM SIGN GU CROSSING GU;Lo;0;L;;;;;N;;;;; +12118;CUNEIFORM SIGN GU2;Lo;0;L;;;;;N;;;;; +12119;CUNEIFORM SIGN GU2 TIMES KAK;Lo;0;L;;;;;N;;;;; +1211A;CUNEIFORM SIGN GU2 TIMES KAK TIMES IGI GUNU;Lo;0;L;;;;;N;;;;; +1211B;CUNEIFORM SIGN GU2 TIMES NUN;Lo;0;L;;;;;N;;;;; +1211C;CUNEIFORM SIGN GU2 TIMES SAL PLUS TUG2;Lo;0;L;;;;;N;;;;; +1211D;CUNEIFORM SIGN GU2 GUNU;Lo;0;L;;;;;N;;;;; +1211E;CUNEIFORM SIGN GUD;Lo;0;L;;;;;N;;;;; +1211F;CUNEIFORM SIGN GUD TIMES A PLUS KUR;Lo;0;L;;;;;N;;;;; +12120;CUNEIFORM SIGN GUD TIMES KUR;Lo;0;L;;;;;N;;;;; +12121;CUNEIFORM SIGN GUD OVER GUD LUGAL;Lo;0;L;;;;;N;;;;; +12122;CUNEIFORM SIGN GUL;Lo;0;L;;;;;N;;;;; +12123;CUNEIFORM SIGN GUM;Lo;0;L;;;;;N;;;;; +12124;CUNEIFORM SIGN GUM TIMES SHE;Lo;0;L;;;;;N;;;;; +12125;CUNEIFORM SIGN GUR;Lo;0;L;;;;;N;;;;; +12126;CUNEIFORM SIGN GUR7;Lo;0;L;;;;;N;;;;; +12127;CUNEIFORM SIGN GURUN;Lo;0;L;;;;;N;;;;; +12128;CUNEIFORM SIGN GURUSH;Lo;0;L;;;;;N;;;;; +12129;CUNEIFORM SIGN HA;Lo;0;L;;;;;N;;;;; +1212A;CUNEIFORM SIGN HA TENU;Lo;0;L;;;;;N;;;;; +1212B;CUNEIFORM SIGN HA GUNU;Lo;0;L;;;;;N;;;;; +1212C;CUNEIFORM SIGN HAL;Lo;0;L;;;;;N;;;;; +1212D;CUNEIFORM SIGN HI;Lo;0;L;;;;;N;;;;; +1212E;CUNEIFORM SIGN HI TIMES ASH;Lo;0;L;;;;;N;;;;; +1212F;CUNEIFORM SIGN HI TIMES ASH2;Lo;0;L;;;;;N;;;;; +12130;CUNEIFORM SIGN HI TIMES BAD;Lo;0;L;;;;;N;;;;; +12131;CUNEIFORM SIGN HI TIMES DISH;Lo;0;L;;;;;N;;;;; +12132;CUNEIFORM SIGN HI TIMES GAD;Lo;0;L;;;;;N;;;;; +12133;CUNEIFORM SIGN HI TIMES KIN;Lo;0;L;;;;;N;;;;; +12134;CUNEIFORM SIGN HI TIMES NUN;Lo;0;L;;;;;N;;;;; +12135;CUNEIFORM SIGN HI TIMES SHE;Lo;0;L;;;;;N;;;;; +12136;CUNEIFORM SIGN HI TIMES U;Lo;0;L;;;;;N;;;;; +12137;CUNEIFORM SIGN HU;Lo;0;L;;;;;N;;;;; +12138;CUNEIFORM SIGN HUB2;Lo;0;L;;;;;N;;;;; +12139;CUNEIFORM SIGN HUB2 TIMES AN;Lo;0;L;;;;;N;;;;; +1213A;CUNEIFORM SIGN HUB2 TIMES HAL;Lo;0;L;;;;;N;;;;; +1213B;CUNEIFORM SIGN HUB2 TIMES KASKAL;Lo;0;L;;;;;N;;;;; +1213C;CUNEIFORM SIGN HUB2 TIMES LISH;Lo;0;L;;;;;N;;;;; +1213D;CUNEIFORM SIGN HUB2 TIMES UD;Lo;0;L;;;;;N;;;;; +1213E;CUNEIFORM SIGN HUL2;Lo;0;L;;;;;N;;;;; +1213F;CUNEIFORM SIGN I;Lo;0;L;;;;;N;;;;; +12140;CUNEIFORM SIGN I A;Lo;0;L;;;;;N;;;;; +12141;CUNEIFORM SIGN IB;Lo;0;L;;;;;N;;;;; +12142;CUNEIFORM SIGN IDIM;Lo;0;L;;;;;N;;;;; +12143;CUNEIFORM SIGN IDIM OVER IDIM BUR;Lo;0;L;;;;;N;;;;; +12144;CUNEIFORM SIGN IDIM OVER IDIM SQUARED;Lo;0;L;;;;;N;;;;; +12145;CUNEIFORM SIGN IG;Lo;0;L;;;;;N;;;;; +12146;CUNEIFORM SIGN IGI;Lo;0;L;;;;;N;;;;; +12147;CUNEIFORM SIGN IGI DIB;Lo;0;L;;;;;N;;;;; +12148;CUNEIFORM SIGN IGI RI;Lo;0;L;;;;;N;;;;; +12149;CUNEIFORM SIGN IGI OVER IGI SHIR OVER SHIR UD OVER UD;Lo;0;L;;;;;N;;;;; +1214A;CUNEIFORM SIGN IGI GUNU;Lo;0;L;;;;;N;;;;; +1214B;CUNEIFORM SIGN IL;Lo;0;L;;;;;N;;;;; +1214C;CUNEIFORM SIGN IL TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;; +1214D;CUNEIFORM SIGN IL2;Lo;0;L;;;;;N;;;;; +1214E;CUNEIFORM SIGN IM;Lo;0;L;;;;;N;;;;; +1214F;CUNEIFORM SIGN IM TIMES TAK4;Lo;0;L;;;;;N;;;;; +12150;CUNEIFORM SIGN IM CROSSING IM;Lo;0;L;;;;;N;;;;; +12151;CUNEIFORM SIGN IM OPPOSING IM;Lo;0;L;;;;;N;;;;; +12152;CUNEIFORM SIGN IM SQUARED;Lo;0;L;;;;;N;;;;; +12153;CUNEIFORM SIGN IMIN;Lo;0;L;;;;;N;;;;; +12154;CUNEIFORM SIGN IN;Lo;0;L;;;;;N;;;;; +12155;CUNEIFORM SIGN IR;Lo;0;L;;;;;N;;;;; +12156;CUNEIFORM SIGN ISH;Lo;0;L;;;;;N;;;;; +12157;CUNEIFORM SIGN KA;Lo;0;L;;;;;N;;;;; +12158;CUNEIFORM SIGN KA TIMES A;Lo;0;L;;;;;N;;;;; +12159;CUNEIFORM SIGN KA TIMES AD;Lo;0;L;;;;;N;;;;; +1215A;CUNEIFORM SIGN KA TIMES AD PLUS KU3;Lo;0;L;;;;;N;;;;; +1215B;CUNEIFORM SIGN KA TIMES ASH2;Lo;0;L;;;;;N;;;;; +1215C;CUNEIFORM SIGN KA TIMES BAD;Lo;0;L;;;;;N;;;;; +1215D;CUNEIFORM SIGN KA TIMES BALAG;Lo;0;L;;;;;N;;;;; +1215E;CUNEIFORM SIGN KA TIMES BAR;Lo;0;L;;;;;N;;;;; +1215F;CUNEIFORM SIGN KA TIMES BI;Lo;0;L;;;;;N;;;;; +12160;CUNEIFORM SIGN KA TIMES ERIN2;Lo;0;L;;;;;N;;;;; +12161;CUNEIFORM SIGN KA TIMES ESH2;Lo;0;L;;;;;N;;;;; +12162;CUNEIFORM SIGN KA TIMES GA;Lo;0;L;;;;;N;;;;; +12163;CUNEIFORM SIGN KA TIMES GAL;Lo;0;L;;;;;N;;;;; +12164;CUNEIFORM SIGN KA TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;; +12165;CUNEIFORM SIGN KA TIMES GAR;Lo;0;L;;;;;N;;;;; +12166;CUNEIFORM SIGN KA TIMES GAR PLUS SHA3 PLUS A;Lo;0;L;;;;;N;;;;; +12167;CUNEIFORM SIGN KA TIMES GI;Lo;0;L;;;;;N;;;;; +12168;CUNEIFORM SIGN KA TIMES GIR2;Lo;0;L;;;;;N;;;;; +12169;CUNEIFORM SIGN KA TIMES GISH PLUS SAR;Lo;0;L;;;;;N;;;;; +1216A;CUNEIFORM SIGN KA TIMES GISH CROSSING GISH;Lo;0;L;;;;;N;;;;; +1216B;CUNEIFORM SIGN KA TIMES GU;Lo;0;L;;;;;N;;;;; +1216C;CUNEIFORM SIGN KA TIMES GUR7;Lo;0;L;;;;;N;;;;; +1216D;CUNEIFORM SIGN KA TIMES IGI;Lo;0;L;;;;;N;;;;; +1216E;CUNEIFORM SIGN KA TIMES IM;Lo;0;L;;;;;N;;;;; +1216F;CUNEIFORM SIGN KA TIMES KAK;Lo;0;L;;;;;N;;;;; +12170;CUNEIFORM SIGN KA TIMES KI;Lo;0;L;;;;;N;;;;; +12171;CUNEIFORM SIGN KA TIMES KID;Lo;0;L;;;;;N;;;;; +12172;CUNEIFORM SIGN KA TIMES LI;Lo;0;L;;;;;N;;;;; +12173;CUNEIFORM SIGN KA TIMES LU;Lo;0;L;;;;;N;;;;; +12174;CUNEIFORM SIGN KA TIMES ME;Lo;0;L;;;;;N;;;;; +12175;CUNEIFORM SIGN KA TIMES ME PLUS DU;Lo;0;L;;;;;N;;;;; +12176;CUNEIFORM SIGN KA TIMES ME PLUS GI;Lo;0;L;;;;;N;;;;; +12177;CUNEIFORM SIGN KA TIMES ME PLUS TE;Lo;0;L;;;;;N;;;;; +12178;CUNEIFORM SIGN KA TIMES MI;Lo;0;L;;;;;N;;;;; +12179;CUNEIFORM SIGN KA TIMES MI PLUS NUNUZ;Lo;0;L;;;;;N;;;;; +1217A;CUNEIFORM SIGN KA TIMES NE;Lo;0;L;;;;;N;;;;; +1217B;CUNEIFORM SIGN KA TIMES NUN;Lo;0;L;;;;;N;;;;; +1217C;CUNEIFORM SIGN KA TIMES PI;Lo;0;L;;;;;N;;;;; +1217D;CUNEIFORM SIGN KA TIMES RU;Lo;0;L;;;;;N;;;;; +1217E;CUNEIFORM SIGN KA TIMES SA;Lo;0;L;;;;;N;;;;; +1217F;CUNEIFORM SIGN KA TIMES SAR;Lo;0;L;;;;;N;;;;; +12180;CUNEIFORM SIGN KA TIMES SHA;Lo;0;L;;;;;N;;;;; +12181;CUNEIFORM SIGN KA TIMES SHE;Lo;0;L;;;;;N;;;;; +12182;CUNEIFORM SIGN KA TIMES SHID;Lo;0;L;;;;;N;;;;; +12183;CUNEIFORM SIGN KA TIMES SHU;Lo;0;L;;;;;N;;;;; +12184;CUNEIFORM SIGN KA TIMES SIG;Lo;0;L;;;;;N;;;;; +12185;CUNEIFORM SIGN KA TIMES SUHUR;Lo;0;L;;;;;N;;;;; +12186;CUNEIFORM SIGN KA TIMES TAR;Lo;0;L;;;;;N;;;;; +12187;CUNEIFORM SIGN KA TIMES U;Lo;0;L;;;;;N;;;;; +12188;CUNEIFORM SIGN KA TIMES U2;Lo;0;L;;;;;N;;;;; +12189;CUNEIFORM SIGN KA TIMES UD;Lo;0;L;;;;;N;;;;; +1218A;CUNEIFORM SIGN KA TIMES UMUM TIMES PA;Lo;0;L;;;;;N;;;;; +1218B;CUNEIFORM SIGN KA TIMES USH;Lo;0;L;;;;;N;;;;; +1218C;CUNEIFORM SIGN KA TIMES ZI;Lo;0;L;;;;;N;;;;; +1218D;CUNEIFORM SIGN KA2;Lo;0;L;;;;;N;;;;; +1218E;CUNEIFORM SIGN KA2 CROSSING KA2;Lo;0;L;;;;;N;;;;; +1218F;CUNEIFORM SIGN KAB;Lo;0;L;;;;;N;;;;; +12190;CUNEIFORM SIGN KAD2;Lo;0;L;;;;;N;;;;; +12191;CUNEIFORM SIGN KAD3;Lo;0;L;;;;;N;;;;; +12192;CUNEIFORM SIGN KAD4;Lo;0;L;;;;;N;;;;; +12193;CUNEIFORM SIGN KAD5;Lo;0;L;;;;;N;;;;; +12194;CUNEIFORM SIGN KAD5 OVER KAD5;Lo;0;L;;;;;N;;;;; +12195;CUNEIFORM SIGN KAK;Lo;0;L;;;;;N;;;;; +12196;CUNEIFORM SIGN KAK TIMES IGI GUNU;Lo;0;L;;;;;N;;;;; +12197;CUNEIFORM SIGN KAL;Lo;0;L;;;;;N;;;;; +12198;CUNEIFORM SIGN KAL TIMES BAD;Lo;0;L;;;;;N;;;;; +12199;CUNEIFORM SIGN KAL CROSSING KAL;Lo;0;L;;;;;N;;;;; +1219A;CUNEIFORM SIGN KAM2;Lo;0;L;;;;;N;;;;; +1219B;CUNEIFORM SIGN KAM4;Lo;0;L;;;;;N;;;;; +1219C;CUNEIFORM SIGN KASKAL;Lo;0;L;;;;;N;;;;; +1219D;CUNEIFORM SIGN KASKAL LAGAB TIMES U OVER LAGAB TIMES U;Lo;0;L;;;;;N;;;;; +1219E;CUNEIFORM SIGN KASKAL OVER KASKAL LAGAB TIMES U OVER LAGAB TIMES U;Lo;0;L;;;;;N;;;;; +1219F;CUNEIFORM SIGN KESH2;Lo;0;L;;;;;N;;;;; +121A0;CUNEIFORM SIGN KI;Lo;0;L;;;;;N;;;;; +121A1;CUNEIFORM SIGN KI TIMES BAD;Lo;0;L;;;;;N;;;;; +121A2;CUNEIFORM SIGN KI TIMES U;Lo;0;L;;;;;N;;;;; +121A3;CUNEIFORM SIGN KI TIMES UD;Lo;0;L;;;;;N;;;;; +121A4;CUNEIFORM SIGN KID;Lo;0;L;;;;;N;;;;; +121A5;CUNEIFORM SIGN KIN;Lo;0;L;;;;;N;;;;; +121A6;CUNEIFORM SIGN KISAL;Lo;0;L;;;;;N;;;;; +121A7;CUNEIFORM SIGN KISH;Lo;0;L;;;;;N;;;;; +121A8;CUNEIFORM SIGN KISIM5;Lo;0;L;;;;;N;;;;; +121A9;CUNEIFORM SIGN KISIM5 OVER KISIM5;Lo;0;L;;;;;N;;;;; +121AA;CUNEIFORM SIGN KU;Lo;0;L;;;;;N;;;;; +121AB;CUNEIFORM SIGN KU OVER HI TIMES ASH2 KU OVER HI TIMES ASH2;Lo;0;L;;;;;N;;;;; +121AC;CUNEIFORM SIGN KU3;Lo;0;L;;;;;N;;;;; +121AD;CUNEIFORM SIGN KU4;Lo;0;L;;;;;N;;;;; +121AE;CUNEIFORM SIGN KU4 VARIANT FORM;Lo;0;L;;;;;N;;;;; +121AF;CUNEIFORM SIGN KU7;Lo;0;L;;;;;N;;;;; +121B0;CUNEIFORM SIGN KUL;Lo;0;L;;;;;N;;;;; +121B1;CUNEIFORM SIGN KUL GUNU;Lo;0;L;;;;;N;;;;; +121B2;CUNEIFORM SIGN KUN;Lo;0;L;;;;;N;;;;; +121B3;CUNEIFORM SIGN KUR;Lo;0;L;;;;;N;;;;; +121B4;CUNEIFORM SIGN KUR OPPOSING KUR;Lo;0;L;;;;;N;;;;; +121B5;CUNEIFORM SIGN KUSHU2;Lo;0;L;;;;;N;;;;; +121B6;CUNEIFORM SIGN KWU318;Lo;0;L;;;;;N;;;;; +121B7;CUNEIFORM SIGN LA;Lo;0;L;;;;;N;;;;; +121B8;CUNEIFORM SIGN LAGAB;Lo;0;L;;;;;N;;;;; +121B9;CUNEIFORM SIGN LAGAB TIMES A;Lo;0;L;;;;;N;;;;; +121BA;CUNEIFORM SIGN LAGAB TIMES A PLUS DA PLUS HA;Lo;0;L;;;;;N;;;;; +121BB;CUNEIFORM SIGN LAGAB TIMES A PLUS GAR;Lo;0;L;;;;;N;;;;; +121BC;CUNEIFORM SIGN LAGAB TIMES A PLUS LAL;Lo;0;L;;;;;N;;;;; +121BD;CUNEIFORM SIGN LAGAB TIMES AL;Lo;0;L;;;;;N;;;;; +121BE;CUNEIFORM SIGN LAGAB TIMES AN;Lo;0;L;;;;;N;;;;; +121BF;CUNEIFORM SIGN LAGAB TIMES ASH ZIDA TENU;Lo;0;L;;;;;N;;;;; +121C0;CUNEIFORM SIGN LAGAB TIMES BAD;Lo;0;L;;;;;N;;;;; +121C1;CUNEIFORM SIGN LAGAB TIMES BI;Lo;0;L;;;;;N;;;;; +121C2;CUNEIFORM SIGN LAGAB TIMES DAR;Lo;0;L;;;;;N;;;;; +121C3;CUNEIFORM SIGN LAGAB TIMES EN;Lo;0;L;;;;;N;;;;; +121C4;CUNEIFORM SIGN LAGAB TIMES GA;Lo;0;L;;;;;N;;;;; +121C5;CUNEIFORM SIGN LAGAB TIMES GAR;Lo;0;L;;;;;N;;;;; +121C6;CUNEIFORM SIGN LAGAB TIMES GUD;Lo;0;L;;;;;N;;;;; +121C7;CUNEIFORM SIGN LAGAB TIMES GUD PLUS GUD;Lo;0;L;;;;;N;;;;; +121C8;CUNEIFORM SIGN LAGAB TIMES HA;Lo;0;L;;;;;N;;;;; +121C9;CUNEIFORM SIGN LAGAB TIMES HAL;Lo;0;L;;;;;N;;;;; +121CA;CUNEIFORM SIGN LAGAB TIMES HI TIMES NUN;Lo;0;L;;;;;N;;;;; +121CB;CUNEIFORM SIGN LAGAB TIMES IGI GUNU;Lo;0;L;;;;;N;;;;; +121CC;CUNEIFORM SIGN LAGAB TIMES IM;Lo;0;L;;;;;N;;;;; +121CD;CUNEIFORM SIGN LAGAB TIMES IM PLUS HA;Lo;0;L;;;;;N;;;;; +121CE;CUNEIFORM SIGN LAGAB TIMES IM PLUS LU;Lo;0;L;;;;;N;;;;; +121CF;CUNEIFORM SIGN LAGAB TIMES KI;Lo;0;L;;;;;N;;;;; +121D0;CUNEIFORM SIGN LAGAB TIMES KIN;Lo;0;L;;;;;N;;;;; +121D1;CUNEIFORM SIGN LAGAB TIMES KU3;Lo;0;L;;;;;N;;;;; +121D2;CUNEIFORM SIGN LAGAB TIMES KUL;Lo;0;L;;;;;N;;;;; +121D3;CUNEIFORM SIGN LAGAB TIMES KUL PLUS HI PLUS A;Lo;0;L;;;;;N;;;;; +121D4;CUNEIFORM SIGN LAGAB TIMES LAGAB;Lo;0;L;;;;;N;;;;; +121D5;CUNEIFORM SIGN LAGAB TIMES LISH;Lo;0;L;;;;;N;;;;; +121D6;CUNEIFORM SIGN LAGAB TIMES LU;Lo;0;L;;;;;N;;;;; +121D7;CUNEIFORM SIGN LAGAB TIMES LUL;Lo;0;L;;;;;N;;;;; +121D8;CUNEIFORM SIGN LAGAB TIMES ME;Lo;0;L;;;;;N;;;;; +121D9;CUNEIFORM SIGN LAGAB TIMES ME PLUS EN;Lo;0;L;;;;;N;;;;; +121DA;CUNEIFORM SIGN LAGAB TIMES MUSH;Lo;0;L;;;;;N;;;;; +121DB;CUNEIFORM SIGN LAGAB TIMES NE;Lo;0;L;;;;;N;;;;; +121DC;CUNEIFORM SIGN LAGAB TIMES SHE PLUS SUM;Lo;0;L;;;;;N;;;;; +121DD;CUNEIFORM SIGN LAGAB TIMES SHITA PLUS GISH PLUS ERIN2;Lo;0;L;;;;;N;;;;; +121DE;CUNEIFORM SIGN LAGAB TIMES SHITA PLUS GISH TENU;Lo;0;L;;;;;N;;;;; +121DF;CUNEIFORM SIGN LAGAB TIMES SHU2;Lo;0;L;;;;;N;;;;; +121E0;CUNEIFORM SIGN LAGAB TIMES SHU2 PLUS SHU2;Lo;0;L;;;;;N;;;;; +121E1;CUNEIFORM SIGN LAGAB TIMES SUM;Lo;0;L;;;;;N;;;;; +121E2;CUNEIFORM SIGN LAGAB TIMES TAG;Lo;0;L;;;;;N;;;;; +121E3;CUNEIFORM SIGN LAGAB TIMES TAK4;Lo;0;L;;;;;N;;;;; +121E4;CUNEIFORM SIGN LAGAB TIMES TE PLUS A PLUS SU PLUS NA;Lo;0;L;;;;;N;;;;; +121E5;CUNEIFORM SIGN LAGAB TIMES U;Lo;0;L;;;;;N;;;;; +121E6;CUNEIFORM SIGN LAGAB TIMES U PLUS A;Lo;0;L;;;;;N;;;;; +121E7;CUNEIFORM SIGN LAGAB TIMES U PLUS U PLUS U;Lo;0;L;;;;;N;;;;; +121E8;CUNEIFORM SIGN LAGAB TIMES U2 PLUS ASH;Lo;0;L;;;;;N;;;;; +121E9;CUNEIFORM SIGN LAGAB TIMES UD;Lo;0;L;;;;;N;;;;; +121EA;CUNEIFORM SIGN LAGAB TIMES USH;Lo;0;L;;;;;N;;;;; +121EB;CUNEIFORM SIGN LAGAB SQUARED;Lo;0;L;;;;;N;;;;; +121EC;CUNEIFORM SIGN LAGAR;Lo;0;L;;;;;N;;;;; +121ED;CUNEIFORM SIGN LAGAR TIMES SHE;Lo;0;L;;;;;N;;;;; +121EE;CUNEIFORM SIGN LAGAR TIMES SHE PLUS SUM;Lo;0;L;;;;;N;;;;; +121EF;CUNEIFORM SIGN LAGAR GUNU;Lo;0;L;;;;;N;;;;; +121F0;CUNEIFORM SIGN LAGAR GUNU OVER LAGAR GUNU SHE;Lo;0;L;;;;;N;;;;; +121F1;CUNEIFORM SIGN LAHSHU;Lo;0;L;;;;;N;;;;; +121F2;CUNEIFORM SIGN LAL;Lo;0;L;;;;;N;;;;; +121F3;CUNEIFORM SIGN LAL TIMES LAL;Lo;0;L;;;;;N;;;;; +121F4;CUNEIFORM SIGN LAM;Lo;0;L;;;;;N;;;;; +121F5;CUNEIFORM SIGN LAM TIMES KUR;Lo;0;L;;;;;N;;;;; +121F6;CUNEIFORM SIGN LAM TIMES KUR PLUS RU;Lo;0;L;;;;;N;;;;; +121F7;CUNEIFORM SIGN LI;Lo;0;L;;;;;N;;;;; +121F8;CUNEIFORM SIGN LIL;Lo;0;L;;;;;N;;;;; +121F9;CUNEIFORM SIGN LIMMU2;Lo;0;L;;;;;N;;;;; +121FA;CUNEIFORM SIGN LISH;Lo;0;L;;;;;N;;;;; +121FB;CUNEIFORM SIGN LU;Lo;0;L;;;;;N;;;;; +121FC;CUNEIFORM SIGN LU TIMES BAD;Lo;0;L;;;;;N;;;;; +121FD;CUNEIFORM SIGN LU2;Lo;0;L;;;;;N;;;;; +121FE;CUNEIFORM SIGN LU2 TIMES AL;Lo;0;L;;;;;N;;;;; +121FF;CUNEIFORM SIGN LU2 TIMES BAD;Lo;0;L;;;;;N;;;;; +12200;CUNEIFORM SIGN LU2 TIMES ESH2;Lo;0;L;;;;;N;;;;; +12201;CUNEIFORM SIGN LU2 TIMES ESH2 TENU;Lo;0;L;;;;;N;;;;; +12202;CUNEIFORM SIGN LU2 TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;; +12203;CUNEIFORM SIGN LU2 TIMES HI TIMES BAD;Lo;0;L;;;;;N;;;;; +12204;CUNEIFORM SIGN LU2 TIMES IM;Lo;0;L;;;;;N;;;;; +12205;CUNEIFORM SIGN LU2 TIMES KAD2;Lo;0;L;;;;;N;;;;; +12206;CUNEIFORM SIGN LU2 TIMES KAD3;Lo;0;L;;;;;N;;;;; +12207;CUNEIFORM SIGN LU2 TIMES KAD3 PLUS ASH;Lo;0;L;;;;;N;;;;; +12208;CUNEIFORM SIGN LU2 TIMES KI;Lo;0;L;;;;;N;;;;; +12209;CUNEIFORM SIGN LU2 TIMES LA PLUS ASH;Lo;0;L;;;;;N;;;;; +1220A;CUNEIFORM SIGN LU2 TIMES LAGAB;Lo;0;L;;;;;N;;;;; +1220B;CUNEIFORM SIGN LU2 TIMES ME PLUS EN;Lo;0;L;;;;;N;;;;; +1220C;CUNEIFORM SIGN LU2 TIMES NE;Lo;0;L;;;;;N;;;;; +1220D;CUNEIFORM SIGN LU2 TIMES NU;Lo;0;L;;;;;N;;;;; +1220E;CUNEIFORM SIGN LU2 TIMES SI PLUS ASH;Lo;0;L;;;;;N;;;;; +1220F;CUNEIFORM SIGN LU2 TIMES SIK2 PLUS BU;Lo;0;L;;;;;N;;;;; +12210;CUNEIFORM SIGN LU2 TIMES TUG2;Lo;0;L;;;;;N;;;;; +12211;CUNEIFORM SIGN LU2 TENU;Lo;0;L;;;;;N;;;;; +12212;CUNEIFORM SIGN LU2 CROSSING LU2;Lo;0;L;;;;;N;;;;; +12213;CUNEIFORM SIGN LU2 OPPOSING LU2;Lo;0;L;;;;;N;;;;; +12214;CUNEIFORM SIGN LU2 SQUARED;Lo;0;L;;;;;N;;;;; +12215;CUNEIFORM SIGN LU2 SHESHIG;Lo;0;L;;;;;N;;;;; +12216;CUNEIFORM SIGN LU3;Lo;0;L;;;;;N;;;;; +12217;CUNEIFORM SIGN LUGAL;Lo;0;L;;;;;N;;;;; +12218;CUNEIFORM SIGN LUGAL OVER LUGAL;Lo;0;L;;;;;N;;;;; +12219;CUNEIFORM SIGN LUGAL OPPOSING LUGAL;Lo;0;L;;;;;N;;;;; +1221A;CUNEIFORM SIGN LUGAL SHESHIG;Lo;0;L;;;;;N;;;;; +1221B;CUNEIFORM SIGN LUH;Lo;0;L;;;;;N;;;;; +1221C;CUNEIFORM SIGN LUL;Lo;0;L;;;;;N;;;;; +1221D;CUNEIFORM SIGN LUM;Lo;0;L;;;;;N;;;;; +1221E;CUNEIFORM SIGN LUM OVER LUM;Lo;0;L;;;;;N;;;;; +1221F;CUNEIFORM SIGN LUM OVER LUM GAR OVER GAR;Lo;0;L;;;;;N;;;;; +12220;CUNEIFORM SIGN MA;Lo;0;L;;;;;N;;;;; +12221;CUNEIFORM SIGN MA TIMES TAK4;Lo;0;L;;;;;N;;;;; +12222;CUNEIFORM SIGN MA GUNU;Lo;0;L;;;;;N;;;;; +12223;CUNEIFORM SIGN MA2;Lo;0;L;;;;;N;;;;; +12224;CUNEIFORM SIGN MAH;Lo;0;L;;;;;N;;;;; +12225;CUNEIFORM SIGN MAR;Lo;0;L;;;;;N;;;;; +12226;CUNEIFORM SIGN MASH;Lo;0;L;;;;1/2;N;;;;; +12227;CUNEIFORM SIGN MASH2;Lo;0;L;;;;;N;;;;; +12228;CUNEIFORM SIGN ME;Lo;0;L;;;;;N;;;;; +12229;CUNEIFORM SIGN MES;Lo;0;L;;;;;N;;;;; +1222A;CUNEIFORM SIGN MI;Lo;0;L;;;;;N;;;;; +1222B;CUNEIFORM SIGN MIN;Lo;0;L;;;;2;N;;;;; +1222C;CUNEIFORM SIGN MU;Lo;0;L;;;;;N;;;;; +1222D;CUNEIFORM SIGN MU OVER MU;Lo;0;L;;;;;N;;;;; +1222E;CUNEIFORM SIGN MUG;Lo;0;L;;;;;N;;;;; +1222F;CUNEIFORM SIGN MUG GUNU;Lo;0;L;;;;;N;;;;; +12230;CUNEIFORM SIGN MUNSUB;Lo;0;L;;;;;N;;;;; +12231;CUNEIFORM SIGN MURGU2;Lo;0;L;;;;;N;;;;; +12232;CUNEIFORM SIGN MUSH;Lo;0;L;;;;;N;;;;; +12233;CUNEIFORM SIGN MUSH TIMES A;Lo;0;L;;;;;N;;;;; +12234;CUNEIFORM SIGN MUSH TIMES KUR;Lo;0;L;;;;;N;;;;; +12235;CUNEIFORM SIGN MUSH TIMES ZA;Lo;0;L;;;;;N;;;;; +12236;CUNEIFORM SIGN MUSH OVER MUSH;Lo;0;L;;;;;N;;;;; +12237;CUNEIFORM SIGN MUSH OVER MUSH TIMES A PLUS NA;Lo;0;L;;;;;N;;;;; +12238;CUNEIFORM SIGN MUSH CROSSING MUSH;Lo;0;L;;;;;N;;;;; +12239;CUNEIFORM SIGN MUSH3;Lo;0;L;;;;;N;;;;; +1223A;CUNEIFORM SIGN MUSH3 TIMES A;Lo;0;L;;;;;N;;;;; +1223B;CUNEIFORM SIGN MUSH3 TIMES A PLUS DI;Lo;0;L;;;;;N;;;;; +1223C;CUNEIFORM SIGN MUSH3 TIMES DI;Lo;0;L;;;;;N;;;;; +1223D;CUNEIFORM SIGN MUSH3 GUNU;Lo;0;L;;;;;N;;;;; +1223E;CUNEIFORM SIGN NA;Lo;0;L;;;;;N;;;;; +1223F;CUNEIFORM SIGN NA2;Lo;0;L;;;;;N;;;;; +12240;CUNEIFORM SIGN NAGA;Lo;0;L;;;;;N;;;;; +12241;CUNEIFORM SIGN NAGA INVERTED;Lo;0;L;;;;;N;;;;; +12242;CUNEIFORM SIGN NAGA TIMES SHU TENU;Lo;0;L;;;;;N;;;;; +12243;CUNEIFORM SIGN NAGA OPPOSING NAGA;Lo;0;L;;;;;N;;;;; +12244;CUNEIFORM SIGN NAGAR;Lo;0;L;;;;;N;;;;; +12245;CUNEIFORM SIGN NAM NUTILLU;Lo;0;L;;;;;N;;;;; +12246;CUNEIFORM SIGN NAM;Lo;0;L;;;;;N;;;;; +12247;CUNEIFORM SIGN NAM2;Lo;0;L;;;;;N;;;;; +12248;CUNEIFORM SIGN NE;Lo;0;L;;;;;N;;;;; +12249;CUNEIFORM SIGN NE TIMES A;Lo;0;L;;;;;N;;;;; +1224A;CUNEIFORM SIGN NE TIMES UD;Lo;0;L;;;;;N;;;;; +1224B;CUNEIFORM SIGN NE SHESHIG;Lo;0;L;;;;;N;;;;; +1224C;CUNEIFORM SIGN NI;Lo;0;L;;;;;N;;;;; +1224D;CUNEIFORM SIGN NI TIMES E;Lo;0;L;;;;;N;;;;; +1224E;CUNEIFORM SIGN NI2;Lo;0;L;;;;;N;;;;; +1224F;CUNEIFORM SIGN NIM;Lo;0;L;;;;;N;;;;; +12250;CUNEIFORM SIGN NIM TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;; +12251;CUNEIFORM SIGN NIM TIMES GAR PLUS GAN2 TENU;Lo;0;L;;;;;N;;;;; +12252;CUNEIFORM SIGN NINDA2;Lo;0;L;;;;;N;;;;; +12253;CUNEIFORM SIGN NINDA2 TIMES AN;Lo;0;L;;;;;N;;;;; +12254;CUNEIFORM SIGN NINDA2 TIMES ASH;Lo;0;L;;;;;N;;;;; +12255;CUNEIFORM SIGN NINDA2 TIMES ASH PLUS ASH;Lo;0;L;;;;;N;;;;; +12256;CUNEIFORM SIGN NINDA2 TIMES GUD;Lo;0;L;;;;;N;;;;; +12257;CUNEIFORM SIGN NINDA2 TIMES ME PLUS GAN2 TENU;Lo;0;L;;;;;N;;;;; +12258;CUNEIFORM SIGN NINDA2 TIMES NE;Lo;0;L;;;;;N;;;;; +12259;CUNEIFORM SIGN NINDA2 TIMES NUN;Lo;0;L;;;;;N;;;;; +1225A;CUNEIFORM SIGN NINDA2 TIMES SHE;Lo;0;L;;;;;N;;;;; +1225B;CUNEIFORM SIGN NINDA2 TIMES SHE PLUS A AN;Lo;0;L;;;;;N;;;;; +1225C;CUNEIFORM SIGN NINDA2 TIMES SHE PLUS ASH;Lo;0;L;;;;;N;;;;; +1225D;CUNEIFORM SIGN NINDA2 TIMES SHE PLUS ASH PLUS ASH;Lo;0;L;;;;;N;;;;; +1225E;CUNEIFORM SIGN NINDA2 TIMES U2 PLUS ASH;Lo;0;L;;;;;N;;;;; +1225F;CUNEIFORM SIGN NINDA2 TIMES USH;Lo;0;L;;;;;N;;;;; +12260;CUNEIFORM SIGN NISAG;Lo;0;L;;;;;N;;;;; +12261;CUNEIFORM SIGN NU;Lo;0;L;;;;;N;;;;; +12262;CUNEIFORM SIGN NU11;Lo;0;L;;;;;N;;;;; +12263;CUNEIFORM SIGN NUN;Lo;0;L;;;;;N;;;;; +12264;CUNEIFORM SIGN NUN LAGAR TIMES GAR;Lo;0;L;;;;;N;;;;; +12265;CUNEIFORM SIGN NUN LAGAR TIMES MASH;Lo;0;L;;;;;N;;;;; +12266;CUNEIFORM SIGN NUN LAGAR TIMES SAL;Lo;0;L;;;;;N;;;;; +12267;CUNEIFORM SIGN NUN LAGAR TIMES SAL OVER NUN LAGAR TIMES SAL;Lo;0;L;;;;;N;;;;; +12268;CUNEIFORM SIGN NUN LAGAR TIMES USH;Lo;0;L;;;;;N;;;;; +12269;CUNEIFORM SIGN NUN TENU;Lo;0;L;;;;;N;;;;; +1226A;CUNEIFORM SIGN NUN OVER NUN;Lo;0;L;;;;;N;;;;; +1226B;CUNEIFORM SIGN NUN CROSSING NUN;Lo;0;L;;;;;N;;;;; +1226C;CUNEIFORM SIGN NUN CROSSING NUN LAGAR OVER LAGAR;Lo;0;L;;;;;N;;;;; +1226D;CUNEIFORM SIGN NUNUZ;Lo;0;L;;;;;N;;;;; +1226E;CUNEIFORM SIGN NUNUZ AB2 TIMES ASHGAB;Lo;0;L;;;;;N;;;;; +1226F;CUNEIFORM SIGN NUNUZ AB2 TIMES BI;Lo;0;L;;;;;N;;;;; +12270;CUNEIFORM SIGN NUNUZ AB2 TIMES DUG;Lo;0;L;;;;;N;;;;; +12271;CUNEIFORM SIGN NUNUZ AB2 TIMES GUD;Lo;0;L;;;;;N;;;;; +12272;CUNEIFORM SIGN NUNUZ AB2 TIMES IGI GUNU;Lo;0;L;;;;;N;;;;; +12273;CUNEIFORM SIGN NUNUZ AB2 TIMES KAD3;Lo;0;L;;;;;N;;;;; +12274;CUNEIFORM SIGN NUNUZ AB2 TIMES LA;Lo;0;L;;;;;N;;;;; +12275;CUNEIFORM SIGN NUNUZ AB2 TIMES NE;Lo;0;L;;;;;N;;;;; +12276;CUNEIFORM SIGN NUNUZ AB2 TIMES SILA3;Lo;0;L;;;;;N;;;;; +12277;CUNEIFORM SIGN NUNUZ AB2 TIMES U2;Lo;0;L;;;;;N;;;;; +12278;CUNEIFORM SIGN NUNUZ KISIM5 TIMES BI;Lo;0;L;;;;;N;;;;; +12279;CUNEIFORM SIGN NUNUZ KISIM5 TIMES BI U;Lo;0;L;;;;;N;;;;; +1227A;CUNEIFORM SIGN PA;Lo;0;L;;;;;N;;;;; +1227B;CUNEIFORM SIGN PAD;Lo;0;L;;;;;N;;;;; +1227C;CUNEIFORM SIGN PAN;Lo;0;L;;;;;N;;;;; +1227D;CUNEIFORM SIGN PAP;Lo;0;L;;;;;N;;;;; +1227E;CUNEIFORM SIGN PESH2;Lo;0;L;;;;;N;;;;; +1227F;CUNEIFORM SIGN PI;Lo;0;L;;;;;N;;;;; +12280;CUNEIFORM SIGN PI TIMES A;Lo;0;L;;;;;N;;;;; +12281;CUNEIFORM SIGN PI TIMES AB;Lo;0;L;;;;;N;;;;; +12282;CUNEIFORM SIGN PI TIMES BI;Lo;0;L;;;;;N;;;;; +12283;CUNEIFORM SIGN PI TIMES BU;Lo;0;L;;;;;N;;;;; +12284;CUNEIFORM SIGN PI TIMES E;Lo;0;L;;;;;N;;;;; +12285;CUNEIFORM SIGN PI TIMES I;Lo;0;L;;;;;N;;;;; +12286;CUNEIFORM SIGN PI TIMES IB;Lo;0;L;;;;;N;;;;; +12287;CUNEIFORM SIGN PI TIMES U;Lo;0;L;;;;;N;;;;; +12288;CUNEIFORM SIGN PI TIMES U2;Lo;0;L;;;;;N;;;;; +12289;CUNEIFORM SIGN PI CROSSING PI;Lo;0;L;;;;;N;;;;; +1228A;CUNEIFORM SIGN PIRIG;Lo;0;L;;;;;N;;;;; +1228B;CUNEIFORM SIGN PIRIG TIMES KAL;Lo;0;L;;;;;N;;;;; +1228C;CUNEIFORM SIGN PIRIG TIMES UD;Lo;0;L;;;;;N;;;;; +1228D;CUNEIFORM SIGN PIRIG TIMES ZA;Lo;0;L;;;;;N;;;;; +1228E;CUNEIFORM SIGN PIRIG OPPOSING PIRIG;Lo;0;L;;;;;N;;;;; +1228F;CUNEIFORM SIGN RA;Lo;0;L;;;;;N;;;;; +12290;CUNEIFORM SIGN RAB;Lo;0;L;;;;;N;;;;; +12291;CUNEIFORM SIGN RI;Lo;0;L;;;;;N;;;;; +12292;CUNEIFORM SIGN RU;Lo;0;L;;;;;N;;;;; +12293;CUNEIFORM SIGN SA;Lo;0;L;;;;;N;;;;; +12294;CUNEIFORM SIGN SAG NUTILLU;Lo;0;L;;;;;N;;;;; +12295;CUNEIFORM SIGN SAG;Lo;0;L;;;;;N;;;;; +12296;CUNEIFORM SIGN SAG TIMES A;Lo;0;L;;;;;N;;;;; +12297;CUNEIFORM SIGN SAG TIMES DU;Lo;0;L;;;;;N;;;;; +12298;CUNEIFORM SIGN SAG TIMES DUB;Lo;0;L;;;;;N;;;;; +12299;CUNEIFORM SIGN SAG TIMES HA;Lo;0;L;;;;;N;;;;; +1229A;CUNEIFORM SIGN SAG TIMES KAK;Lo;0;L;;;;;N;;;;; +1229B;CUNEIFORM SIGN SAG TIMES KUR;Lo;0;L;;;;;N;;;;; +1229C;CUNEIFORM SIGN SAG TIMES LUM;Lo;0;L;;;;;N;;;;; +1229D;CUNEIFORM SIGN SAG TIMES MI;Lo;0;L;;;;;N;;;;; +1229E;CUNEIFORM SIGN SAG TIMES NUN;Lo;0;L;;;;;N;;;;; +1229F;CUNEIFORM SIGN SAG TIMES SAL;Lo;0;L;;;;;N;;;;; +122A0;CUNEIFORM SIGN SAG TIMES SHID;Lo;0;L;;;;;N;;;;; +122A1;CUNEIFORM SIGN SAG TIMES TAB;Lo;0;L;;;;;N;;;;; +122A2;CUNEIFORM SIGN SAG TIMES U2;Lo;0;L;;;;;N;;;;; +122A3;CUNEIFORM SIGN SAG TIMES UB;Lo;0;L;;;;;N;;;;; +122A4;CUNEIFORM SIGN SAG TIMES UM;Lo;0;L;;;;;N;;;;; +122A5;CUNEIFORM SIGN SAG TIMES UR;Lo;0;L;;;;;N;;;;; +122A6;CUNEIFORM SIGN SAG TIMES USH;Lo;0;L;;;;;N;;;;; +122A7;CUNEIFORM SIGN SAG OVER SAG;Lo;0;L;;;;;N;;;;; +122A8;CUNEIFORM SIGN SAG GUNU;Lo;0;L;;;;;N;;;;; +122A9;CUNEIFORM SIGN SAL;Lo;0;L;;;;;N;;;;; +122AA;CUNEIFORM SIGN SAL LAGAB TIMES ASH2;Lo;0;L;;;;;N;;;;; +122AB;CUNEIFORM SIGN SANGA2;Lo;0;L;;;;;N;;;;; +122AC;CUNEIFORM SIGN SAR;Lo;0;L;;;;;N;;;;; +122AD;CUNEIFORM SIGN SHA;Lo;0;L;;;;;N;;;;; +122AE;CUNEIFORM SIGN SHA3;Lo;0;L;;;;;N;;;;; +122AF;CUNEIFORM SIGN SHA3 TIMES A;Lo;0;L;;;;;N;;;;; +122B0;CUNEIFORM SIGN SHA3 TIMES BAD;Lo;0;L;;;;;N;;;;; +122B1;CUNEIFORM SIGN SHA3 TIMES GISH;Lo;0;L;;;;;N;;;;; +122B2;CUNEIFORM SIGN SHA3 TIMES NE;Lo;0;L;;;;;N;;;;; +122B3;CUNEIFORM SIGN SHA3 TIMES SHU2;Lo;0;L;;;;;N;;;;; +122B4;CUNEIFORM SIGN SHA3 TIMES TUR;Lo;0;L;;;;;N;;;;; +122B5;CUNEIFORM SIGN SHA3 TIMES U;Lo;0;L;;;;;N;;;;; +122B6;CUNEIFORM SIGN SHA3 TIMES U PLUS A;Lo;0;L;;;;;N;;;;; +122B7;CUNEIFORM SIGN SHA6;Lo;0;L;;;;;N;;;;; +122B8;CUNEIFORM SIGN SHAB6;Lo;0;L;;;;;N;;;;; +122B9;CUNEIFORM SIGN SHAR2;Lo;0;L;;;;;N;;;;; +122BA;CUNEIFORM SIGN SHE;Lo;0;L;;;;;N;;;;; +122BB;CUNEIFORM SIGN SHE HU;Lo;0;L;;;;;N;;;;; +122BC;CUNEIFORM SIGN SHE OVER SHE GAD OVER GAD GAR OVER GAR;Lo;0;L;;;;;N;;;;; +122BD;CUNEIFORM SIGN SHE OVER SHE TAB OVER TAB GAR OVER GAR;Lo;0;L;;;;;N;;;;; +122BE;CUNEIFORM SIGN SHEG9;Lo;0;L;;;;;N;;;;; +122BF;CUNEIFORM SIGN SHEN;Lo;0;L;;;;;N;;;;; +122C0;CUNEIFORM SIGN SHESH;Lo;0;L;;;;;N;;;;; +122C1;CUNEIFORM SIGN SHESH2;Lo;0;L;;;;;N;;;;; +122C2;CUNEIFORM SIGN SHESHLAM;Lo;0;L;;;;;N;;;;; +122C3;CUNEIFORM SIGN SHID;Lo;0;L;;;;;N;;;;; +122C4;CUNEIFORM SIGN SHID TIMES A;Lo;0;L;;;;;N;;;;; +122C5;CUNEIFORM SIGN SHID TIMES IM;Lo;0;L;;;;;N;;;;; +122C6;CUNEIFORM SIGN SHIM;Lo;0;L;;;;;N;;;;; +122C7;CUNEIFORM SIGN SHIM TIMES A;Lo;0;L;;;;;N;;;;; +122C8;CUNEIFORM SIGN SHIM TIMES BAL;Lo;0;L;;;;;N;;;;; +122C9;CUNEIFORM SIGN SHIM TIMES BULUG;Lo;0;L;;;;;N;;;;; +122CA;CUNEIFORM SIGN SHIM TIMES DIN;Lo;0;L;;;;;N;;;;; +122CB;CUNEIFORM SIGN SHIM TIMES GAR;Lo;0;L;;;;;N;;;;; +122CC;CUNEIFORM SIGN SHIM TIMES IGI;Lo;0;L;;;;;N;;;;; +122CD;CUNEIFORM SIGN SHIM TIMES IGI GUNU;Lo;0;L;;;;;N;;;;; +122CE;CUNEIFORM SIGN SHIM TIMES KUSHU2;Lo;0;L;;;;;N;;;;; +122CF;CUNEIFORM SIGN SHIM TIMES LUL;Lo;0;L;;;;;N;;;;; +122D0;CUNEIFORM SIGN SHIM TIMES MUG;Lo;0;L;;;;;N;;;;; +122D1;CUNEIFORM SIGN SHIM TIMES SAL;Lo;0;L;;;;;N;;;;; +122D2;CUNEIFORM SIGN SHINIG;Lo;0;L;;;;;N;;;;; +122D3;CUNEIFORM SIGN SHIR;Lo;0;L;;;;;N;;;;; +122D4;CUNEIFORM SIGN SHIR TENU;Lo;0;L;;;;;N;;;;; +122D5;CUNEIFORM SIGN SHIR OVER SHIR BUR OVER BUR;Lo;0;L;;;;;N;;;;; +122D6;CUNEIFORM SIGN SHITA;Lo;0;L;;;;;N;;;;; +122D7;CUNEIFORM SIGN SHU;Lo;0;L;;;;;N;;;;; +122D8;CUNEIFORM SIGN SHU OVER INVERTED SHU;Lo;0;L;;;;;N;;;;; +122D9;CUNEIFORM SIGN SHU2;Lo;0;L;;;;;N;;;;; +122DA;CUNEIFORM SIGN SHUBUR;Lo;0;L;;;;;N;;;;; +122DB;CUNEIFORM SIGN SI;Lo;0;L;;;;;N;;;;; +122DC;CUNEIFORM SIGN SI GUNU;Lo;0;L;;;;;N;;;;; +122DD;CUNEIFORM SIGN SIG;Lo;0;L;;;;;N;;;;; +122DE;CUNEIFORM SIGN SIG4;Lo;0;L;;;;;N;;;;; +122DF;CUNEIFORM SIGN SIG4 OVER SIG4 SHU2;Lo;0;L;;;;;N;;;;; +122E0;CUNEIFORM SIGN SIK2;Lo;0;L;;;;;N;;;;; +122E1;CUNEIFORM SIGN SILA3;Lo;0;L;;;;;N;;;;; +122E2;CUNEIFORM SIGN SU;Lo;0;L;;;;;N;;;;; +122E3;CUNEIFORM SIGN SU OVER SU;Lo;0;L;;;;;N;;;;; +122E4;CUNEIFORM SIGN SUD;Lo;0;L;;;;;N;;;;; +122E5;CUNEIFORM SIGN SUD2;Lo;0;L;;;;;N;;;;; +122E6;CUNEIFORM SIGN SUHUR;Lo;0;L;;;;;N;;;;; +122E7;CUNEIFORM SIGN SUM;Lo;0;L;;;;;N;;;;; +122E8;CUNEIFORM SIGN SUMASH;Lo;0;L;;;;;N;;;;; +122E9;CUNEIFORM SIGN SUR;Lo;0;L;;;;;N;;;;; +122EA;CUNEIFORM SIGN SUR9;Lo;0;L;;;;;N;;;;; +122EB;CUNEIFORM SIGN TA;Lo;0;L;;;;;N;;;;; +122EC;CUNEIFORM SIGN TA ASTERISK;Lo;0;L;;;;;N;;;;; +122ED;CUNEIFORM SIGN TA TIMES HI;Lo;0;L;;;;;N;;;;; +122EE;CUNEIFORM SIGN TA TIMES MI;Lo;0;L;;;;;N;;;;; +122EF;CUNEIFORM SIGN TA GUNU;Lo;0;L;;;;;N;;;;; +122F0;CUNEIFORM SIGN TAB;Lo;0;L;;;;;N;;;;; +122F1;CUNEIFORM SIGN TAB OVER TAB NI OVER NI DISH OVER DISH;Lo;0;L;;;;;N;;;;; +122F2;CUNEIFORM SIGN TAB SQUARED;Lo;0;L;;;;;N;;;;; +122F3;CUNEIFORM SIGN TAG;Lo;0;L;;;;;N;;;;; +122F4;CUNEIFORM SIGN TAG TIMES BI;Lo;0;L;;;;;N;;;;; +122F5;CUNEIFORM SIGN TAG TIMES GUD;Lo;0;L;;;;;N;;;;; +122F6;CUNEIFORM SIGN TAG TIMES SHE;Lo;0;L;;;;;N;;;;; +122F7;CUNEIFORM SIGN TAG TIMES SHU;Lo;0;L;;;;;N;;;;; +122F8;CUNEIFORM SIGN TAG TIMES TUG2;Lo;0;L;;;;;N;;;;; +122F9;CUNEIFORM SIGN TAG TIMES UD;Lo;0;L;;;;;N;;;;; +122FA;CUNEIFORM SIGN TAK4;Lo;0;L;;;;;N;;;;; +122FB;CUNEIFORM SIGN TAR;Lo;0;L;;;;;N;;;;; +122FC;CUNEIFORM SIGN TE;Lo;0;L;;;;;N;;;;; +122FD;CUNEIFORM SIGN TE GUNU;Lo;0;L;;;;;N;;;;; +122FE;CUNEIFORM SIGN TI;Lo;0;L;;;;;N;;;;; +122FF;CUNEIFORM SIGN TI TENU;Lo;0;L;;;;;N;;;;; +12300;CUNEIFORM SIGN TIL;Lo;0;L;;;;;N;;;;; +12301;CUNEIFORM SIGN TIR;Lo;0;L;;;;;N;;;;; +12302;CUNEIFORM SIGN TIR TIMES TAK4;Lo;0;L;;;;;N;;;;; +12303;CUNEIFORM SIGN TIR OVER TIR;Lo;0;L;;;;;N;;;;; +12304;CUNEIFORM SIGN TIR OVER TIR GAD OVER GAD GAR OVER GAR;Lo;0;L;;;;;N;;;;; +12305;CUNEIFORM SIGN TU;Lo;0;L;;;;;N;;;;; +12306;CUNEIFORM SIGN TUG2;Lo;0;L;;;;;N;;;;; +12307;CUNEIFORM SIGN TUK;Lo;0;L;;;;;N;;;;; +12308;CUNEIFORM SIGN TUM;Lo;0;L;;;;;N;;;;; +12309;CUNEIFORM SIGN TUR;Lo;0;L;;;;;N;;;;; +1230A;CUNEIFORM SIGN TUR OVER TUR ZA OVER ZA;Lo;0;L;;;;;N;;;;; +1230B;CUNEIFORM SIGN U;Lo;0;L;;;;1;N;;;;; +1230C;CUNEIFORM SIGN U GUD;Lo;0;L;;;;;N;;;;; +1230D;CUNEIFORM SIGN U U U;Lo;0;L;;;;3;N;;;;; +1230E;CUNEIFORM SIGN U OVER U PA OVER PA GAR OVER GAR;Lo;0;L;;;;;N;;;;; +1230F;CUNEIFORM SIGN U OVER U SUR OVER SUR;Lo;0;L;;;;;N;;;;; +12310;CUNEIFORM SIGN U OVER U U REVERSED OVER U REVERSED;Lo;0;L;;;;;N;;;;; +12311;CUNEIFORM SIGN U2;Lo;0;L;;;;;N;;;;; +12312;CUNEIFORM SIGN UB;Lo;0;L;;;;;N;;;;; +12313;CUNEIFORM SIGN UD;Lo;0;L;;;;;N;;;;; +12314;CUNEIFORM SIGN UD KUSHU2;Lo;0;L;;;;;N;;;;; +12315;CUNEIFORM SIGN UD TIMES BAD;Lo;0;L;;;;;N;;;;; +12316;CUNEIFORM SIGN UD TIMES MI;Lo;0;L;;;;;N;;;;; +12317;CUNEIFORM SIGN UD TIMES U PLUS U PLUS U;Lo;0;L;;;;;N;;;;; +12318;CUNEIFORM SIGN UD TIMES U PLUS U PLUS U GUNU;Lo;0;L;;;;;N;;;;; +12319;CUNEIFORM SIGN UD GUNU;Lo;0;L;;;;;N;;;;; +1231A;CUNEIFORM SIGN UD SHESHIG;Lo;0;L;;;;;N;;;;; +1231B;CUNEIFORM SIGN UD SHESHIG TIMES BAD;Lo;0;L;;;;;N;;;;; +1231C;CUNEIFORM SIGN UDUG;Lo;0;L;;;;;N;;;;; +1231D;CUNEIFORM SIGN UM;Lo;0;L;;;;;N;;;;; +1231E;CUNEIFORM SIGN UM TIMES LAGAB;Lo;0;L;;;;;N;;;;; +1231F;CUNEIFORM SIGN UM TIMES ME PLUS DA;Lo;0;L;;;;;N;;;;; +12320;CUNEIFORM SIGN UM TIMES SHA3;Lo;0;L;;;;;N;;;;; +12321;CUNEIFORM SIGN UM TIMES U;Lo;0;L;;;;;N;;;;; +12322;CUNEIFORM SIGN UMBIN;Lo;0;L;;;;;N;;;;; +12323;CUNEIFORM SIGN UMUM;Lo;0;L;;;;;N;;;;; +12324;CUNEIFORM SIGN UMUM TIMES KASKAL;Lo;0;L;;;;;N;;;;; +12325;CUNEIFORM SIGN UMUM TIMES PA;Lo;0;L;;;;;N;;;;; +12326;CUNEIFORM SIGN UN;Lo;0;L;;;;;N;;;;; +12327;CUNEIFORM SIGN UN GUNU;Lo;0;L;;;;;N;;;;; +12328;CUNEIFORM SIGN UR;Lo;0;L;;;;;N;;;;; +12329;CUNEIFORM SIGN UR CROSSING UR;Lo;0;L;;;;;N;;;;; +1232A;CUNEIFORM SIGN UR SHESHIG;Lo;0;L;;;;;N;;;;; +1232B;CUNEIFORM SIGN UR2;Lo;0;L;;;;;N;;;;; +1232C;CUNEIFORM SIGN UR2 TIMES A PLUS HA;Lo;0;L;;;;;N;;;;; +1232D;CUNEIFORM SIGN UR2 TIMES A PLUS NA;Lo;0;L;;;;;N;;;;; +1232E;CUNEIFORM SIGN UR2 TIMES AL;Lo;0;L;;;;;N;;;;; +1232F;CUNEIFORM SIGN UR2 TIMES HA;Lo;0;L;;;;;N;;;;; +12330;CUNEIFORM SIGN UR2 TIMES NUN;Lo;0;L;;;;;N;;;;; +12331;CUNEIFORM SIGN UR2 TIMES U2;Lo;0;L;;;;;N;;;;; +12332;CUNEIFORM SIGN UR2 TIMES U2 PLUS ASH;Lo;0;L;;;;;N;;;;; +12333;CUNEIFORM SIGN UR2 TIMES U2 PLUS BI;Lo;0;L;;;;;N;;;;; +12334;CUNEIFORM SIGN UR4;Lo;0;L;;;;;N;;;;; +12335;CUNEIFORM SIGN URI;Lo;0;L;;;;;N;;;;; +12336;CUNEIFORM SIGN URI3;Lo;0;L;;;;;N;;;;; +12337;CUNEIFORM SIGN URU;Lo;0;L;;;;;N;;;;; +12338;CUNEIFORM SIGN URU TIMES A;Lo;0;L;;;;;N;;;;; +12339;CUNEIFORM SIGN URU TIMES ASHGAB;Lo;0;L;;;;;N;;;;; +1233A;CUNEIFORM SIGN URU TIMES BAR;Lo;0;L;;;;;N;;;;; +1233B;CUNEIFORM SIGN URU TIMES DUN;Lo;0;L;;;;;N;;;;; +1233C;CUNEIFORM SIGN URU TIMES GA;Lo;0;L;;;;;N;;;;; +1233D;CUNEIFORM SIGN URU TIMES GAL;Lo;0;L;;;;;N;;;;; +1233E;CUNEIFORM SIGN URU TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;; +1233F;CUNEIFORM SIGN URU TIMES GAR;Lo;0;L;;;;;N;;;;; +12340;CUNEIFORM SIGN URU TIMES GU;Lo;0;L;;;;;N;;;;; +12341;CUNEIFORM SIGN URU TIMES HA;Lo;0;L;;;;;N;;;;; +12342;CUNEIFORM SIGN URU TIMES IGI;Lo;0;L;;;;;N;;;;; +12343;CUNEIFORM SIGN URU TIMES IM;Lo;0;L;;;;;N;;;;; +12344;CUNEIFORM SIGN URU TIMES ISH;Lo;0;L;;;;;N;;;;; +12345;CUNEIFORM SIGN URU TIMES KI;Lo;0;L;;;;;N;;;;; +12346;CUNEIFORM SIGN URU TIMES LUM;Lo;0;L;;;;;N;;;;; +12347;CUNEIFORM SIGN URU TIMES MIN;Lo;0;L;;;;;N;;;;; +12348;CUNEIFORM SIGN URU TIMES PA;Lo;0;L;;;;;N;;;;; +12349;CUNEIFORM SIGN URU TIMES SHE;Lo;0;L;;;;;N;;;;; +1234A;CUNEIFORM SIGN URU TIMES SIG4;Lo;0;L;;;;;N;;;;; +1234B;CUNEIFORM SIGN URU TIMES TU;Lo;0;L;;;;;N;;;;; +1234C;CUNEIFORM SIGN URU TIMES U PLUS GUD;Lo;0;L;;;;;N;;;;; +1234D;CUNEIFORM SIGN URU TIMES UD;Lo;0;L;;;;;N;;;;; +1234E;CUNEIFORM SIGN URU TIMES URUDA;Lo;0;L;;;;;N;;;;; +1234F;CUNEIFORM SIGN URUDA;Lo;0;L;;;;;N;;;;; +12350;CUNEIFORM SIGN URUDA TIMES U;Lo;0;L;;;;;N;;;;; +12351;CUNEIFORM SIGN USH;Lo;0;L;;;;;N;;;;; +12352;CUNEIFORM SIGN USH TIMES A;Lo;0;L;;;;;N;;;;; +12353;CUNEIFORM SIGN USH TIMES KU;Lo;0;L;;;;;N;;;;; +12354;CUNEIFORM SIGN USH TIMES KUR;Lo;0;L;;;;;N;;;;; +12355;CUNEIFORM SIGN USH TIMES TAK4;Lo;0;L;;;;;N;;;;; +12356;CUNEIFORM SIGN USHX;Lo;0;L;;;;;N;;;;; +12357;CUNEIFORM SIGN USH2;Lo;0;L;;;;;N;;;;; +12358;CUNEIFORM SIGN USHUMX;Lo;0;L;;;;;N;;;;; +12359;CUNEIFORM SIGN UTUKI;Lo;0;L;;;;;N;;;;; +1235A;CUNEIFORM SIGN UZ3;Lo;0;L;;;;;N;;;;; +1235B;CUNEIFORM SIGN UZ3 TIMES KASKAL;Lo;0;L;;;;;N;;;;; +1235C;CUNEIFORM SIGN UZU;Lo;0;L;;;;;N;;;;; +1235D;CUNEIFORM SIGN ZA;Lo;0;L;;;;;N;;;;; +1235E;CUNEIFORM SIGN ZA TENU;Lo;0;L;;;;;N;;;;; +1235F;CUNEIFORM SIGN ZA SQUARED TIMES KUR;Lo;0;L;;;;;N;;;;; +12360;CUNEIFORM SIGN ZAG;Lo;0;L;;;;;N;;;;; +12361;CUNEIFORM SIGN ZAMX;Lo;0;L;;;;;N;;;;; +12362;CUNEIFORM SIGN ZE2;Lo;0;L;;;;;N;;;;; +12363;CUNEIFORM SIGN ZI;Lo;0;L;;;;;N;;;;; +12364;CUNEIFORM SIGN ZI OVER ZI;Lo;0;L;;;;;N;;;;; +12365;CUNEIFORM SIGN ZI3;Lo;0;L;;;;;N;;;;; +12366;CUNEIFORM SIGN ZIB;Lo;0;L;;;;;N;;;;; +12367;CUNEIFORM SIGN ZIB KABA TENU;Lo;0;L;;;;;N;;;;; +12368;CUNEIFORM SIGN ZIG;Lo;0;L;;;;;N;;;;; +12369;CUNEIFORM SIGN ZIZ2;Lo;0;L;;;;;N;;;;; +1236A;CUNEIFORM SIGN ZU;Lo;0;L;;;;;N;;;;; +1236B;CUNEIFORM SIGN ZU5;Lo;0;L;;;;;N;;;;; +1236C;CUNEIFORM SIGN ZU5 TIMES A;Lo;0;L;;;;;N;;;;; +1236D;CUNEIFORM SIGN ZUBUR;Lo;0;L;;;;;N;;;;; +1236E;CUNEIFORM SIGN ZUM;Lo;0;L;;;;;N;;;;; +1236F;CUNEIFORM SIGN KAP ELAMITE;Lo;0;L;;;;;N;;;;; +12370;CUNEIFORM SIGN AB TIMES NUN;Lo;0;L;;;;;N;;;;; +12371;CUNEIFORM SIGN AB2 TIMES A;Lo;0;L;;;;;N;;;;; +12372;CUNEIFORM SIGN AMAR TIMES KUG;Lo;0;L;;;;;N;;;;; +12373;CUNEIFORM SIGN DAG KISIM5 TIMES U2 PLUS MASH;Lo;0;L;;;;;N;;;;; +12374;CUNEIFORM SIGN DAG3;Lo;0;L;;;;;N;;;;; +12375;CUNEIFORM SIGN DISH PLUS SHU;Lo;0;L;;;;;N;;;;; +12376;CUNEIFORM SIGN DUB TIMES SHE;Lo;0;L;;;;;N;;;;; +12377;CUNEIFORM SIGN EZEN TIMES GUD;Lo;0;L;;;;;N;;;;; +12378;CUNEIFORM SIGN EZEN TIMES SHE;Lo;0;L;;;;;N;;;;; +12379;CUNEIFORM SIGN GA2 TIMES AN PLUS KAK PLUS A;Lo;0;L;;;;;N;;;;; +1237A;CUNEIFORM SIGN GA2 TIMES ASH2;Lo;0;L;;;;;N;;;;; +1237B;CUNEIFORM SIGN GE22;Lo;0;L;;;;;N;;;;; +1237C;CUNEIFORM SIGN GIG;Lo;0;L;;;;;N;;;;; +1237D;CUNEIFORM SIGN HUSH;Lo;0;L;;;;;N;;;;; +1237E;CUNEIFORM SIGN KA TIMES ANSHE;Lo;0;L;;;;;N;;;;; +1237F;CUNEIFORM SIGN KA TIMES ASH3;Lo;0;L;;;;;N;;;;; +12380;CUNEIFORM SIGN KA TIMES GISH;Lo;0;L;;;;;N;;;;; +12381;CUNEIFORM SIGN KA TIMES GUD;Lo;0;L;;;;;N;;;;; +12382;CUNEIFORM SIGN KA TIMES HI TIMES ASH2;Lo;0;L;;;;;N;;;;; +12383;CUNEIFORM SIGN KA TIMES LUM;Lo;0;L;;;;;N;;;;; +12384;CUNEIFORM SIGN KA TIMES PA;Lo;0;L;;;;;N;;;;; +12385;CUNEIFORM SIGN KA TIMES SHUL;Lo;0;L;;;;;N;;;;; +12386;CUNEIFORM SIGN KA TIMES TU;Lo;0;L;;;;;N;;;;; +12387;CUNEIFORM SIGN KA TIMES UR2;Lo;0;L;;;;;N;;;;; +12388;CUNEIFORM SIGN LAGAB TIMES GI;Lo;0;L;;;;;N;;;;; +12389;CUNEIFORM SIGN LU2 SHESHIG TIMES BAD;Lo;0;L;;;;;N;;;;; +1238A;CUNEIFORM SIGN LU2 TIMES ESH2 PLUS LAL;Lo;0;L;;;;;N;;;;; +1238B;CUNEIFORM SIGN LU2 TIMES SHU;Lo;0;L;;;;;N;;;;; +1238C;CUNEIFORM SIGN MESH;Lo;0;L;;;;;N;;;;; +1238D;CUNEIFORM SIGN MUSH3 TIMES ZA;Lo;0;L;;;;;N;;;;; +1238E;CUNEIFORM SIGN NA4;Lo;0;L;;;;;N;;;;; +1238F;CUNEIFORM SIGN NIN;Lo;0;L;;;;;N;;;;; +12390;CUNEIFORM SIGN NIN9;Lo;0;L;;;;;N;;;;; +12391;CUNEIFORM SIGN NINDA2 TIMES BAL;Lo;0;L;;;;;N;;;;; +12392;CUNEIFORM SIGN NINDA2 TIMES GI;Lo;0;L;;;;;N;;;;; +12393;CUNEIFORM SIGN NU11 ROTATED NINETY DEGREES;Lo;0;L;;;;;N;;;;; +12394;CUNEIFORM SIGN PESH2 ASTERISK;Lo;0;L;;;;;N;;;;; +12395;CUNEIFORM SIGN PIR2;Lo;0;L;;;;;N;;;;; +12396;CUNEIFORM SIGN SAG TIMES IGI GUNU;Lo;0;L;;;;;N;;;;; +12397;CUNEIFORM SIGN TI2;Lo;0;L;;;;;N;;;;; +12398;CUNEIFORM SIGN UM TIMES ME;Lo;0;L;;;;;N;;;;; +12399;CUNEIFORM SIGN U U;Lo;0;L;;;;2;N;;;;; +12400;CUNEIFORM NUMERIC SIGN TWO ASH;Nl;0;L;;;;2;N;;;;; +12401;CUNEIFORM NUMERIC SIGN THREE ASH;Nl;0;L;;;;3;N;;;;; +12402;CUNEIFORM NUMERIC SIGN FOUR ASH;Nl;0;L;;;;4;N;;;;; +12403;CUNEIFORM NUMERIC SIGN FIVE ASH;Nl;0;L;;;;5;N;;;;; +12404;CUNEIFORM NUMERIC SIGN SIX ASH;Nl;0;L;;;;6;N;;;;; +12405;CUNEIFORM NUMERIC SIGN SEVEN ASH;Nl;0;L;;;;7;N;;;;; +12406;CUNEIFORM NUMERIC SIGN EIGHT ASH;Nl;0;L;;;;8;N;;;;; +12407;CUNEIFORM NUMERIC SIGN NINE ASH;Nl;0;L;;;;9;N;;;;; +12408;CUNEIFORM NUMERIC SIGN THREE DISH;Nl;0;L;;;;3;N;;;;; +12409;CUNEIFORM NUMERIC SIGN FOUR DISH;Nl;0;L;;;;4;N;;;;; +1240A;CUNEIFORM NUMERIC SIGN FIVE DISH;Nl;0;L;;;;5;N;;;;; +1240B;CUNEIFORM NUMERIC SIGN SIX DISH;Nl;0;L;;;;6;N;;;;; +1240C;CUNEIFORM NUMERIC SIGN SEVEN DISH;Nl;0;L;;;;7;N;;;;; +1240D;CUNEIFORM NUMERIC SIGN EIGHT DISH;Nl;0;L;;;;8;N;;;;; +1240E;CUNEIFORM NUMERIC SIGN NINE DISH;Nl;0;L;;;;9;N;;;;; +1240F;CUNEIFORM NUMERIC SIGN FOUR U;Nl;0;L;;;;4;N;;;;; +12410;CUNEIFORM NUMERIC SIGN FIVE U;Nl;0;L;;;;5;N;;;;; +12411;CUNEIFORM NUMERIC SIGN SIX U;Nl;0;L;;;;6;N;;;;; +12412;CUNEIFORM NUMERIC SIGN SEVEN U;Nl;0;L;;;;7;N;;;;; +12413;CUNEIFORM NUMERIC SIGN EIGHT U;Nl;0;L;;;;8;N;;;;; +12414;CUNEIFORM NUMERIC SIGN NINE U;Nl;0;L;;;;9;N;;;;; +12415;CUNEIFORM NUMERIC SIGN ONE GESH2;Nl;0;L;;;;1;N;;;;; +12416;CUNEIFORM NUMERIC SIGN TWO GESH2;Nl;0;L;;;;2;N;;;;; +12417;CUNEIFORM NUMERIC SIGN THREE GESH2;Nl;0;L;;;;3;N;;;;; +12418;CUNEIFORM NUMERIC SIGN FOUR GESH2;Nl;0;L;;;;4;N;;;;; +12419;CUNEIFORM NUMERIC SIGN FIVE GESH2;Nl;0;L;;;;5;N;;;;; +1241A;CUNEIFORM NUMERIC SIGN SIX GESH2;Nl;0;L;;;;6;N;;;;; +1241B;CUNEIFORM NUMERIC SIGN SEVEN GESH2;Nl;0;L;;;;7;N;;;;; +1241C;CUNEIFORM NUMERIC SIGN EIGHT GESH2;Nl;0;L;;;;8;N;;;;; +1241D;CUNEIFORM NUMERIC SIGN NINE GESH2;Nl;0;L;;;;9;N;;;;; +1241E;CUNEIFORM NUMERIC SIGN ONE GESHU;Nl;0;L;;;;1;N;;;;; +1241F;CUNEIFORM NUMERIC SIGN TWO GESHU;Nl;0;L;;;;2;N;;;;; +12420;CUNEIFORM NUMERIC SIGN THREE GESHU;Nl;0;L;;;;3;N;;;;; +12421;CUNEIFORM NUMERIC SIGN FOUR GESHU;Nl;0;L;;;;4;N;;;;; +12422;CUNEIFORM NUMERIC SIGN FIVE GESHU;Nl;0;L;;;;5;N;;;;; +12423;CUNEIFORM NUMERIC SIGN TWO SHAR2;Nl;0;L;;;;2;N;;;;; +12424;CUNEIFORM NUMERIC SIGN THREE SHAR2;Nl;0;L;;;;3;N;;;;; +12425;CUNEIFORM NUMERIC SIGN THREE SHAR2 VARIANT FORM;Nl;0;L;;;;3;N;;;;; +12426;CUNEIFORM NUMERIC SIGN FOUR SHAR2;Nl;0;L;;;;4;N;;;;; +12427;CUNEIFORM NUMERIC SIGN FIVE SHAR2;Nl;0;L;;;;5;N;;;;; +12428;CUNEIFORM NUMERIC SIGN SIX SHAR2;Nl;0;L;;;;6;N;;;;; +12429;CUNEIFORM NUMERIC SIGN SEVEN SHAR2;Nl;0;L;;;;7;N;;;;; +1242A;CUNEIFORM NUMERIC SIGN EIGHT SHAR2;Nl;0;L;;;;8;N;;;;; +1242B;CUNEIFORM NUMERIC SIGN NINE SHAR2;Nl;0;L;;;;9;N;;;;; +1242C;CUNEIFORM NUMERIC SIGN ONE SHARU;Nl;0;L;;;;1;N;;;;; +1242D;CUNEIFORM NUMERIC SIGN TWO SHARU;Nl;0;L;;;;2;N;;;;; +1242E;CUNEIFORM NUMERIC SIGN THREE SHARU;Nl;0;L;;;;3;N;;;;; +1242F;CUNEIFORM NUMERIC SIGN THREE SHARU VARIANT FORM;Nl;0;L;;;;3;N;;;;; +12430;CUNEIFORM NUMERIC SIGN FOUR SHARU;Nl;0;L;;;;4;N;;;;; +12431;CUNEIFORM NUMERIC SIGN FIVE SHARU;Nl;0;L;;;;5;N;;;;; +12432;CUNEIFORM NUMERIC SIGN SHAR2 TIMES GAL PLUS DISH;Nl;0;L;;;;216000;N;;;;; +12433;CUNEIFORM NUMERIC SIGN SHAR2 TIMES GAL PLUS MIN;Nl;0;L;;;;432000;N;;;;; +12434;CUNEIFORM NUMERIC SIGN ONE BURU;Nl;0;L;;;;1;N;;;;; +12435;CUNEIFORM NUMERIC SIGN TWO BURU;Nl;0;L;;;;2;N;;;;; +12436;CUNEIFORM NUMERIC SIGN THREE BURU;Nl;0;L;;;;3;N;;;;; +12437;CUNEIFORM NUMERIC SIGN THREE BURU VARIANT FORM;Nl;0;L;;;;3;N;;;;; +12438;CUNEIFORM NUMERIC SIGN FOUR BURU;Nl;0;L;;;;4;N;;;;; +12439;CUNEIFORM NUMERIC SIGN FIVE BURU;Nl;0;L;;;;5;N;;;;; +1243A;CUNEIFORM NUMERIC SIGN THREE VARIANT FORM ESH16;Nl;0;L;;;;3;N;;;;; +1243B;CUNEIFORM NUMERIC SIGN THREE VARIANT FORM ESH21;Nl;0;L;;;;3;N;;;;; +1243C;CUNEIFORM NUMERIC SIGN FOUR VARIANT FORM LIMMU;Nl;0;L;;;;4;N;;;;; +1243D;CUNEIFORM NUMERIC SIGN FOUR VARIANT FORM LIMMU4;Nl;0;L;;;;4;N;;;;; +1243E;CUNEIFORM NUMERIC SIGN FOUR VARIANT FORM LIMMU A;Nl;0;L;;;;4;N;;;;; +1243F;CUNEIFORM NUMERIC SIGN FOUR VARIANT FORM LIMMU B;Nl;0;L;;;;4;N;;;;; +12440;CUNEIFORM NUMERIC SIGN SIX VARIANT FORM ASH9;Nl;0;L;;;;6;N;;;;; +12441;CUNEIFORM NUMERIC SIGN SEVEN VARIANT FORM IMIN3;Nl;0;L;;;;7;N;;;;; +12442;CUNEIFORM NUMERIC SIGN SEVEN VARIANT FORM IMIN A;Nl;0;L;;;;7;N;;;;; +12443;CUNEIFORM NUMERIC SIGN SEVEN VARIANT FORM IMIN B;Nl;0;L;;;;7;N;;;;; +12444;CUNEIFORM NUMERIC SIGN EIGHT VARIANT FORM USSU;Nl;0;L;;;;8;N;;;;; +12445;CUNEIFORM NUMERIC SIGN EIGHT VARIANT FORM USSU3;Nl;0;L;;;;8;N;;;;; +12446;CUNEIFORM NUMERIC SIGN NINE VARIANT FORM ILIMMU;Nl;0;L;;;;9;N;;;;; +12447;CUNEIFORM NUMERIC SIGN NINE VARIANT FORM ILIMMU3;Nl;0;L;;;;9;N;;;;; +12448;CUNEIFORM NUMERIC SIGN NINE VARIANT FORM ILIMMU4;Nl;0;L;;;;9;N;;;;; +12449;CUNEIFORM NUMERIC SIGN NINE VARIANT FORM ILIMMU A;Nl;0;L;;;;9;N;;;;; +1244A;CUNEIFORM NUMERIC SIGN TWO ASH TENU;Nl;0;L;;;;2;N;;;;; +1244B;CUNEIFORM NUMERIC SIGN THREE ASH TENU;Nl;0;L;;;;3;N;;;;; +1244C;CUNEIFORM NUMERIC SIGN FOUR ASH TENU;Nl;0;L;;;;4;N;;;;; +1244D;CUNEIFORM NUMERIC SIGN FIVE ASH TENU;Nl;0;L;;;;5;N;;;;; +1244E;CUNEIFORM NUMERIC SIGN SIX ASH TENU;Nl;0;L;;;;6;N;;;;; +1244F;CUNEIFORM NUMERIC SIGN ONE BAN2;Nl;0;L;;;;1;N;;;;; +12450;CUNEIFORM NUMERIC SIGN TWO BAN2;Nl;0;L;;;;2;N;;;;; +12451;CUNEIFORM NUMERIC SIGN THREE BAN2;Nl;0;L;;;;3;N;;;;; +12452;CUNEIFORM NUMERIC SIGN FOUR BAN2;Nl;0;L;;;;4;N;;;;; +12453;CUNEIFORM NUMERIC SIGN FOUR BAN2 VARIANT FORM;Nl;0;L;;;;4;N;;;;; +12454;CUNEIFORM NUMERIC SIGN FIVE BAN2;Nl;0;L;;;;5;N;;;;; +12455;CUNEIFORM NUMERIC SIGN FIVE BAN2 VARIANT FORM;Nl;0;L;;;;5;N;;;;; +12456;CUNEIFORM NUMERIC SIGN NIGIDAMIN;Nl;0;L;;;;2;N;;;;; +12457;CUNEIFORM NUMERIC SIGN NIGIDAESH;Nl;0;L;;;;3;N;;;;; +12458;CUNEIFORM NUMERIC SIGN ONE ESHE3;Nl;0;L;;;;1;N;;;;; +12459;CUNEIFORM NUMERIC SIGN TWO ESHE3;Nl;0;L;;;;2;N;;;;; +1245A;CUNEIFORM NUMERIC SIGN ONE THIRD DISH;Nl;0;L;;;;1/3;N;;;;; +1245B;CUNEIFORM NUMERIC SIGN TWO THIRDS DISH;Nl;0;L;;;;2/3;N;;;;; +1245C;CUNEIFORM NUMERIC SIGN FIVE SIXTHS DISH;Nl;0;L;;;;5/6;N;;;;; +1245D;CUNEIFORM NUMERIC SIGN ONE THIRD VARIANT FORM A;Nl;0;L;;;;1/3;N;;;;; +1245E;CUNEIFORM NUMERIC SIGN TWO THIRDS VARIANT FORM A;Nl;0;L;;;;2/3;N;;;;; +1245F;CUNEIFORM NUMERIC SIGN ONE EIGHTH ASH;Nl;0;L;;;;1/8;N;;;;; +12460;CUNEIFORM NUMERIC SIGN ONE QUARTER ASH;Nl;0;L;;;;1/4;N;;;;; +12461;CUNEIFORM NUMERIC SIGN OLD ASSYRIAN ONE SIXTH;Nl;0;L;;;;1/6;N;;;;; +12462;CUNEIFORM NUMERIC SIGN OLD ASSYRIAN ONE QUARTER;Nl;0;L;;;;1/4;N;;;;; +12463;CUNEIFORM NUMERIC SIGN ONE QUARTER GUR;Nl;0;L;;;;1/4;N;;;;; +12464;CUNEIFORM NUMERIC SIGN ONE HALF GUR;Nl;0;L;;;;1/2;N;;;;; +12465;CUNEIFORM NUMERIC SIGN ELAMITE ONE THIRD;Nl;0;L;;;;1/3;N;;;;; +12466;CUNEIFORM NUMERIC SIGN ELAMITE TWO THIRDS;Nl;0;L;;;;2/3;N;;;;; +12467;CUNEIFORM NUMERIC SIGN ELAMITE FORTY;Nl;0;L;;;;40;N;;;;; +12468;CUNEIFORM NUMERIC SIGN ELAMITE FIFTY;Nl;0;L;;;;50;N;;;;; +12469;CUNEIFORM NUMERIC SIGN FOUR U VARIANT FORM;Nl;0;L;;;;4;N;;;;; +1246A;CUNEIFORM NUMERIC SIGN FIVE U VARIANT FORM;Nl;0;L;;;;5;N;;;;; +1246B;CUNEIFORM NUMERIC SIGN SIX U VARIANT FORM;Nl;0;L;;;;6;N;;;;; +1246C;CUNEIFORM NUMERIC SIGN SEVEN U VARIANT FORM;Nl;0;L;;;;7;N;;;;; +1246D;CUNEIFORM NUMERIC SIGN EIGHT U VARIANT FORM;Nl;0;L;;;;8;N;;;;; +1246E;CUNEIFORM NUMERIC SIGN NINE U VARIANT FORM;Nl;0;L;;;;9;N;;;;; +12470;CUNEIFORM PUNCTUATION SIGN OLD ASSYRIAN WORD DIVIDER;Po;0;L;;;;;N;;;;; +12471;CUNEIFORM PUNCTUATION SIGN VERTICAL COLON;Po;0;L;;;;;N;;;;; +12472;CUNEIFORM PUNCTUATION SIGN DIAGONAL COLON;Po;0;L;;;;;N;;;;; +12473;CUNEIFORM PUNCTUATION SIGN DIAGONAL TRICOLON;Po;0;L;;;;;N;;;;; +12474;CUNEIFORM PUNCTUATION SIGN DIAGONAL QUADCOLON;Po;0;L;;;;;N;;;;; +12480;CUNEIFORM SIGN AB TIMES NUN TENU;Lo;0;L;;;;;N;;;;; +12481;CUNEIFORM SIGN AB TIMES SHU2;Lo;0;L;;;;;N;;;;; +12482;CUNEIFORM SIGN AD TIMES ESH2;Lo;0;L;;;;;N;;;;; +12483;CUNEIFORM SIGN BAD TIMES DISH TENU;Lo;0;L;;;;;N;;;;; +12484;CUNEIFORM SIGN BAHAR2 TIMES AB2;Lo;0;L;;;;;N;;;;; +12485;CUNEIFORM SIGN BAHAR2 TIMES NI;Lo;0;L;;;;;N;;;;; +12486;CUNEIFORM SIGN BAHAR2 TIMES ZA;Lo;0;L;;;;;N;;;;; +12487;CUNEIFORM SIGN BU OVER BU TIMES NA2;Lo;0;L;;;;;N;;;;; +12488;CUNEIFORM SIGN DA TIMES TAK4;Lo;0;L;;;;;N;;;;; +12489;CUNEIFORM SIGN DAG TIMES KUR;Lo;0;L;;;;;N;;;;; +1248A;CUNEIFORM SIGN DIM TIMES IGI;Lo;0;L;;;;;N;;;;; +1248B;CUNEIFORM SIGN DIM TIMES U U U;Lo;0;L;;;;;N;;;;; +1248C;CUNEIFORM SIGN DIM2 TIMES UD;Lo;0;L;;;;;N;;;;; +1248D;CUNEIFORM SIGN DUG TIMES ANSHE;Lo;0;L;;;;;N;;;;; +1248E;CUNEIFORM SIGN DUG TIMES ASH;Lo;0;L;;;;;N;;;;; +1248F;CUNEIFORM SIGN DUG TIMES ASH AT LEFT;Lo;0;L;;;;;N;;;;; +12490;CUNEIFORM SIGN DUG TIMES DIN;Lo;0;L;;;;;N;;;;; +12491;CUNEIFORM SIGN DUG TIMES DUN;Lo;0;L;;;;;N;;;;; +12492;CUNEIFORM SIGN DUG TIMES ERIN2;Lo;0;L;;;;;N;;;;; +12493;CUNEIFORM SIGN DUG TIMES GA;Lo;0;L;;;;;N;;;;; +12494;CUNEIFORM SIGN DUG TIMES GI;Lo;0;L;;;;;N;;;;; +12495;CUNEIFORM SIGN DUG TIMES GIR2 GUNU;Lo;0;L;;;;;N;;;;; +12496;CUNEIFORM SIGN DUG TIMES GISH;Lo;0;L;;;;;N;;;;; +12497;CUNEIFORM SIGN DUG TIMES HA;Lo;0;L;;;;;N;;;;; +12498;CUNEIFORM SIGN DUG TIMES HI;Lo;0;L;;;;;N;;;;; +12499;CUNEIFORM SIGN DUG TIMES IGI GUNU;Lo;0;L;;;;;N;;;;; +1249A;CUNEIFORM SIGN DUG TIMES KASKAL;Lo;0;L;;;;;N;;;;; +1249B;CUNEIFORM SIGN DUG TIMES KUR;Lo;0;L;;;;;N;;;;; +1249C;CUNEIFORM SIGN DUG TIMES KUSHU2;Lo;0;L;;;;;N;;;;; +1249D;CUNEIFORM SIGN DUG TIMES KUSHU2 PLUS KASKAL;Lo;0;L;;;;;N;;;;; +1249E;CUNEIFORM SIGN DUG TIMES LAK-020;Lo;0;L;;;;;N;;;;; +1249F;CUNEIFORM SIGN DUG TIMES LAM;Lo;0;L;;;;;N;;;;; +124A0;CUNEIFORM SIGN DUG TIMES LAM TIMES KUR;Lo;0;L;;;;;N;;;;; +124A1;CUNEIFORM SIGN DUG TIMES LUH PLUS GISH;Lo;0;L;;;;;N;;;;; +124A2;CUNEIFORM SIGN DUG TIMES MASH;Lo;0;L;;;;;N;;;;; +124A3;CUNEIFORM SIGN DUG TIMES MES;Lo;0;L;;;;;N;;;;; +124A4;CUNEIFORM SIGN DUG TIMES MI;Lo;0;L;;;;;N;;;;; +124A5;CUNEIFORM SIGN DUG TIMES NI;Lo;0;L;;;;;N;;;;; +124A6;CUNEIFORM SIGN DUG TIMES PI;Lo;0;L;;;;;N;;;;; +124A7;CUNEIFORM SIGN DUG TIMES SHE;Lo;0;L;;;;;N;;;;; +124A8;CUNEIFORM SIGN DUG TIMES SI GUNU;Lo;0;L;;;;;N;;;;; +124A9;CUNEIFORM SIGN E2 TIMES KUR;Lo;0;L;;;;;N;;;;; +124AA;CUNEIFORM SIGN E2 TIMES PAP;Lo;0;L;;;;;N;;;;; +124AB;CUNEIFORM SIGN ERIN2 X;Lo;0;L;;;;;N;;;;; +124AC;CUNEIFORM SIGN ESH2 CROSSING ESH2;Lo;0;L;;;;;N;;;;; +124AD;CUNEIFORM SIGN EZEN SHESHIG TIMES ASH;Lo;0;L;;;;;N;;;;; +124AE;CUNEIFORM SIGN EZEN SHESHIG TIMES HI;Lo;0;L;;;;;N;;;;; +124AF;CUNEIFORM SIGN EZEN SHESHIG TIMES IGI GUNU;Lo;0;L;;;;;N;;;;; +124B0;CUNEIFORM SIGN EZEN SHESHIG TIMES LA;Lo;0;L;;;;;N;;;;; +124B1;CUNEIFORM SIGN EZEN SHESHIG TIMES LAL;Lo;0;L;;;;;N;;;;; +124B2;CUNEIFORM SIGN EZEN SHESHIG TIMES ME;Lo;0;L;;;;;N;;;;; +124B3;CUNEIFORM SIGN EZEN SHESHIG TIMES MES;Lo;0;L;;;;;N;;;;; +124B4;CUNEIFORM SIGN EZEN SHESHIG TIMES SU;Lo;0;L;;;;;N;;;;; +124B5;CUNEIFORM SIGN EZEN TIMES SU;Lo;0;L;;;;;N;;;;; +124B6;CUNEIFORM SIGN GA2 TIMES BAHAR2;Lo;0;L;;;;;N;;;;; +124B7;CUNEIFORM SIGN GA2 TIMES DIM GUNU;Lo;0;L;;;;;N;;;;; +124B8;CUNEIFORM SIGN GA2 TIMES DUG TIMES IGI GUNU;Lo;0;L;;;;;N;;;;; +124B9;CUNEIFORM SIGN GA2 TIMES DUG TIMES KASKAL;Lo;0;L;;;;;N;;;;; +124BA;CUNEIFORM SIGN GA2 TIMES EREN;Lo;0;L;;;;;N;;;;; +124BB;CUNEIFORM SIGN GA2 TIMES GA;Lo;0;L;;;;;N;;;;; +124BC;CUNEIFORM SIGN GA2 TIMES GAR PLUS DI;Lo;0;L;;;;;N;;;;; +124BD;CUNEIFORM SIGN GA2 TIMES GAR PLUS NE;Lo;0;L;;;;;N;;;;; +124BE;CUNEIFORM SIGN GA2 TIMES HA PLUS A;Lo;0;L;;;;;N;;;;; +124BF;CUNEIFORM SIGN GA2 TIMES KUSHU2 PLUS KASKAL;Lo;0;L;;;;;N;;;;; +124C0;CUNEIFORM SIGN GA2 TIMES LAM;Lo;0;L;;;;;N;;;;; +124C1;CUNEIFORM SIGN GA2 TIMES LAM TIMES KUR;Lo;0;L;;;;;N;;;;; +124C2;CUNEIFORM SIGN GA2 TIMES LUH;Lo;0;L;;;;;N;;;;; +124C3;CUNEIFORM SIGN GA2 TIMES MUSH;Lo;0;L;;;;;N;;;;; +124C4;CUNEIFORM SIGN GA2 TIMES NE;Lo;0;L;;;;;N;;;;; +124C5;CUNEIFORM SIGN GA2 TIMES NE PLUS E2;Lo;0;L;;;;;N;;;;; +124C6;CUNEIFORM SIGN GA2 TIMES NE PLUS GI;Lo;0;L;;;;;N;;;;; +124C7;CUNEIFORM SIGN GA2 TIMES SHIM;Lo;0;L;;;;;N;;;;; +124C8;CUNEIFORM SIGN GA2 TIMES ZIZ2;Lo;0;L;;;;;N;;;;; +124C9;CUNEIFORM SIGN GABA ROTATED NINETY DEGREES;Lo;0;L;;;;;N;;;;; +124CA;CUNEIFORM SIGN GESHTIN TIMES U;Lo;0;L;;;;;N;;;;; +124CB;CUNEIFORM SIGN GISH TIMES GISH CROSSING GISH;Lo;0;L;;;;;N;;;;; +124CC;CUNEIFORM SIGN GU2 TIMES IGI GUNU;Lo;0;L;;;;;N;;;;; +124CD;CUNEIFORM SIGN GUD PLUS GISH TIMES TAK4;Lo;0;L;;;;;N;;;;; +124CE;CUNEIFORM SIGN HA TENU GUNU;Lo;0;L;;;;;N;;;;; +124CF;CUNEIFORM SIGN HI TIMES ASH OVER HI TIMES ASH;Lo;0;L;;;;;N;;;;; +124D0;CUNEIFORM SIGN KA TIMES BU;Lo;0;L;;;;;N;;;;; +124D1;CUNEIFORM SIGN KA TIMES KA;Lo;0;L;;;;;N;;;;; +124D2;CUNEIFORM SIGN KA TIMES U U U;Lo;0;L;;;;;N;;;;; +124D3;CUNEIFORM SIGN KA TIMES UR;Lo;0;L;;;;;N;;;;; +124D4;CUNEIFORM SIGN LAGAB TIMES ZU OVER ZU;Lo;0;L;;;;;N;;;;; +124D5;CUNEIFORM SIGN LAK-003;Lo;0;L;;;;;N;;;;; +124D6;CUNEIFORM SIGN LAK-021;Lo;0;L;;;;;N;;;;; +124D7;CUNEIFORM SIGN LAK-025;Lo;0;L;;;;;N;;;;; +124D8;CUNEIFORM SIGN LAK-030;Lo;0;L;;;;;N;;;;; +124D9;CUNEIFORM SIGN LAK-050;Lo;0;L;;;;;N;;;;; +124DA;CUNEIFORM SIGN LAK-051;Lo;0;L;;;;;N;;;;; +124DB;CUNEIFORM SIGN LAK-062;Lo;0;L;;;;;N;;;;; +124DC;CUNEIFORM SIGN LAK-079 OVER LAK-079 GUNU;Lo;0;L;;;;;N;;;;; +124DD;CUNEIFORM SIGN LAK-080;Lo;0;L;;;;;N;;;;; +124DE;CUNEIFORM SIGN LAK-081 OVER LAK-081;Lo;0;L;;;;;N;;;;; +124DF;CUNEIFORM SIGN LAK-092;Lo;0;L;;;;;N;;;;; +124E0;CUNEIFORM SIGN LAK-130;Lo;0;L;;;;;N;;;;; +124E1;CUNEIFORM SIGN LAK-142;Lo;0;L;;;;;N;;;;; +124E2;CUNEIFORM SIGN LAK-210;Lo;0;L;;;;;N;;;;; +124E3;CUNEIFORM SIGN LAK-219;Lo;0;L;;;;;N;;;;; +124E4;CUNEIFORM SIGN LAK-220;Lo;0;L;;;;;N;;;;; +124E5;CUNEIFORM SIGN LAK-225;Lo;0;L;;;;;N;;;;; +124E6;CUNEIFORM SIGN LAK-228;Lo;0;L;;;;;N;;;;; +124E7;CUNEIFORM SIGN LAK-238;Lo;0;L;;;;;N;;;;; +124E8;CUNEIFORM SIGN LAK-265;Lo;0;L;;;;;N;;;;; +124E9;CUNEIFORM SIGN LAK-266;Lo;0;L;;;;;N;;;;; +124EA;CUNEIFORM SIGN LAK-343;Lo;0;L;;;;;N;;;;; +124EB;CUNEIFORM SIGN LAK-347;Lo;0;L;;;;;N;;;;; +124EC;CUNEIFORM SIGN LAK-348;Lo;0;L;;;;;N;;;;; +124ED;CUNEIFORM SIGN LAK-383;Lo;0;L;;;;;N;;;;; +124EE;CUNEIFORM SIGN LAK-384;Lo;0;L;;;;;N;;;;; +124EF;CUNEIFORM SIGN LAK-390;Lo;0;L;;;;;N;;;;; +124F0;CUNEIFORM SIGN LAK-441;Lo;0;L;;;;;N;;;;; +124F1;CUNEIFORM SIGN LAK-449;Lo;0;L;;;;;N;;;;; +124F2;CUNEIFORM SIGN LAK-449 TIMES GU;Lo;0;L;;;;;N;;;;; +124F3;CUNEIFORM SIGN LAK-449 TIMES IGI;Lo;0;L;;;;;N;;;;; +124F4;CUNEIFORM SIGN LAK-449 TIMES PAP PLUS LU3;Lo;0;L;;;;;N;;;;; +124F5;CUNEIFORM SIGN LAK-449 TIMES PAP PLUS PAP PLUS LU3;Lo;0;L;;;;;N;;;;; +124F6;CUNEIFORM SIGN LAK-449 TIMES U2 PLUS BA;Lo;0;L;;;;;N;;;;; +124F7;CUNEIFORM SIGN LAK-450;Lo;0;L;;;;;N;;;;; +124F8;CUNEIFORM SIGN LAK-457;Lo;0;L;;;;;N;;;;; +124F9;CUNEIFORM SIGN LAK-470;Lo;0;L;;;;;N;;;;; +124FA;CUNEIFORM SIGN LAK-483;Lo;0;L;;;;;N;;;;; +124FB;CUNEIFORM SIGN LAK-490;Lo;0;L;;;;;N;;;;; +124FC;CUNEIFORM SIGN LAK-492;Lo;0;L;;;;;N;;;;; +124FD;CUNEIFORM SIGN LAK-493;Lo;0;L;;;;;N;;;;; +124FE;CUNEIFORM SIGN LAK-495;Lo;0;L;;;;;N;;;;; +124FF;CUNEIFORM SIGN LAK-550;Lo;0;L;;;;;N;;;;; +12500;CUNEIFORM SIGN LAK-608;Lo;0;L;;;;;N;;;;; +12501;CUNEIFORM SIGN LAK-617;Lo;0;L;;;;;N;;;;; +12502;CUNEIFORM SIGN LAK-617 TIMES ASH;Lo;0;L;;;;;N;;;;; +12503;CUNEIFORM SIGN LAK-617 TIMES BAD;Lo;0;L;;;;;N;;;;; +12504;CUNEIFORM SIGN LAK-617 TIMES DUN3 GUNU GUNU;Lo;0;L;;;;;N;;;;; +12505;CUNEIFORM SIGN LAK-617 TIMES KU3;Lo;0;L;;;;;N;;;;; +12506;CUNEIFORM SIGN LAK-617 TIMES LA;Lo;0;L;;;;;N;;;;; +12507;CUNEIFORM SIGN LAK-617 TIMES TAR;Lo;0;L;;;;;N;;;;; +12508;CUNEIFORM SIGN LAK-617 TIMES TE;Lo;0;L;;;;;N;;;;; +12509;CUNEIFORM SIGN LAK-617 TIMES U2;Lo;0;L;;;;;N;;;;; +1250A;CUNEIFORM SIGN LAK-617 TIMES UD;Lo;0;L;;;;;N;;;;; +1250B;CUNEIFORM SIGN LAK-617 TIMES URUDA;Lo;0;L;;;;;N;;;;; +1250C;CUNEIFORM SIGN LAK-636;Lo;0;L;;;;;N;;;;; +1250D;CUNEIFORM SIGN LAK-648;Lo;0;L;;;;;N;;;;; +1250E;CUNEIFORM SIGN LAK-648 TIMES DUB;Lo;0;L;;;;;N;;;;; +1250F;CUNEIFORM SIGN LAK-648 TIMES GA;Lo;0;L;;;;;N;;;;; +12510;CUNEIFORM SIGN LAK-648 TIMES IGI;Lo;0;L;;;;;N;;;;; +12511;CUNEIFORM SIGN LAK-648 TIMES IGI GUNU;Lo;0;L;;;;;N;;;;; +12512;CUNEIFORM SIGN LAK-648 TIMES NI;Lo;0;L;;;;;N;;;;; +12513;CUNEIFORM SIGN LAK-648 TIMES PAP PLUS PAP PLUS LU3;Lo;0;L;;;;;N;;;;; +12514;CUNEIFORM SIGN LAK-648 TIMES SHESH PLUS KI;Lo;0;L;;;;;N;;;;; +12515;CUNEIFORM SIGN LAK-648 TIMES UD;Lo;0;L;;;;;N;;;;; +12516;CUNEIFORM SIGN LAK-648 TIMES URUDA;Lo;0;L;;;;;N;;;;; +12517;CUNEIFORM SIGN LAK-724;Lo;0;L;;;;;N;;;;; +12518;CUNEIFORM SIGN LAK-749;Lo;0;L;;;;;N;;;;; +12519;CUNEIFORM SIGN LU2 GUNU TIMES ASH;Lo;0;L;;;;;N;;;;; +1251A;CUNEIFORM SIGN LU2 TIMES DISH;Lo;0;L;;;;;N;;;;; +1251B;CUNEIFORM SIGN LU2 TIMES HAL;Lo;0;L;;;;;N;;;;; +1251C;CUNEIFORM SIGN LU2 TIMES PAP;Lo;0;L;;;;;N;;;;; +1251D;CUNEIFORM SIGN LU2 TIMES PAP PLUS PAP PLUS LU3;Lo;0;L;;;;;N;;;;; +1251E;CUNEIFORM SIGN LU2 TIMES TAK4;Lo;0;L;;;;;N;;;;; +1251F;CUNEIFORM SIGN MI PLUS ZA7;Lo;0;L;;;;;N;;;;; +12520;CUNEIFORM SIGN MUSH OVER MUSH TIMES GA;Lo;0;L;;;;;N;;;;; +12521;CUNEIFORM SIGN MUSH OVER MUSH TIMES KAK;Lo;0;L;;;;;N;;;;; +12522;CUNEIFORM SIGN NINDA2 TIMES DIM GUNU;Lo;0;L;;;;;N;;;;; +12523;CUNEIFORM SIGN NINDA2 TIMES GISH;Lo;0;L;;;;;N;;;;; +12524;CUNEIFORM SIGN NINDA2 TIMES GUL;Lo;0;L;;;;;N;;;;; +12525;CUNEIFORM SIGN NINDA2 TIMES HI;Lo;0;L;;;;;N;;;;; +12526;CUNEIFORM SIGN NINDA2 TIMES KESH2;Lo;0;L;;;;;N;;;;; +12527;CUNEIFORM SIGN NINDA2 TIMES LAK-050;Lo;0;L;;;;;N;;;;; +12528;CUNEIFORM SIGN NINDA2 TIMES MASH;Lo;0;L;;;;;N;;;;; +12529;CUNEIFORM SIGN NINDA2 TIMES PAP PLUS PAP;Lo;0;L;;;;;N;;;;; +1252A;CUNEIFORM SIGN NINDA2 TIMES U;Lo;0;L;;;;;N;;;;; +1252B;CUNEIFORM SIGN NINDA2 TIMES U PLUS U;Lo;0;L;;;;;N;;;;; +1252C;CUNEIFORM SIGN NINDA2 TIMES URUDA;Lo;0;L;;;;;N;;;;; +1252D;CUNEIFORM SIGN SAG GUNU TIMES HA;Lo;0;L;;;;;N;;;;; +1252E;CUNEIFORM SIGN SAG TIMES EN;Lo;0;L;;;;;N;;;;; +1252F;CUNEIFORM SIGN SAG TIMES SHE AT LEFT;Lo;0;L;;;;;N;;;;; +12530;CUNEIFORM SIGN SAG TIMES TAK4;Lo;0;L;;;;;N;;;;; +12531;CUNEIFORM SIGN SHA6 TENU;Lo;0;L;;;;;N;;;;; +12532;CUNEIFORM SIGN SHE OVER SHE;Lo;0;L;;;;;N;;;;; +12533;CUNEIFORM SIGN SHE PLUS HUB2;Lo;0;L;;;;;N;;;;; +12534;CUNEIFORM SIGN SHE PLUS NAM2;Lo;0;L;;;;;N;;;;; +12535;CUNEIFORM SIGN SHE PLUS SAR;Lo;0;L;;;;;N;;;;; +12536;CUNEIFORM SIGN SHU2 PLUS DUG TIMES NI;Lo;0;L;;;;;N;;;;; +12537;CUNEIFORM SIGN SHU2 PLUS E2 TIMES AN;Lo;0;L;;;;;N;;;;; +12538;CUNEIFORM SIGN SI TIMES TAK4;Lo;0;L;;;;;N;;;;; +12539;CUNEIFORM SIGN TAK4 PLUS SAG;Lo;0;L;;;;;N;;;;; +1253A;CUNEIFORM SIGN TUM TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;; +1253B;CUNEIFORM SIGN TUM TIMES THREE DISH;Lo;0;L;;;;;N;;;;; +1253C;CUNEIFORM SIGN UR2 INVERTED;Lo;0;L;;;;;N;;;;; +1253D;CUNEIFORM SIGN UR2 TIMES UD;Lo;0;L;;;;;N;;;;; +1253E;CUNEIFORM SIGN URU TIMES DARA3;Lo;0;L;;;;;N;;;;; +1253F;CUNEIFORM SIGN URU TIMES LAK-668;Lo;0;L;;;;;N;;;;; +12540;CUNEIFORM SIGN URU TIMES LU3;Lo;0;L;;;;;N;;;;; +12541;CUNEIFORM SIGN ZA7;Lo;0;L;;;;;N;;;;; +12542;CUNEIFORM SIGN ZU OVER ZU PLUS SAR;Lo;0;L;;;;;N;;;;; +12543;CUNEIFORM SIGN ZU5 TIMES THREE DISH TENU;Lo;0;L;;;;;N;;;;; +12F90;CYPRO-MINOAN SIGN CM001;Lo;0;L;;;;;N;;;;; +12F91;CYPRO-MINOAN SIGN CM002;Lo;0;L;;;;;N;;;;; +12F92;CYPRO-MINOAN SIGN CM004;Lo;0;L;;;;;N;;;;; +12F93;CYPRO-MINOAN SIGN CM005;Lo;0;L;;;;;N;;;;; +12F94;CYPRO-MINOAN SIGN CM006;Lo;0;L;;;;;N;;;;; +12F95;CYPRO-MINOAN SIGN CM007;Lo;0;L;;;;;N;;;;; +12F96;CYPRO-MINOAN SIGN CM008;Lo;0;L;;;;;N;;;;; +12F97;CYPRO-MINOAN SIGN CM009;Lo;0;L;;;;;N;;;;; +12F98;CYPRO-MINOAN SIGN CM010;Lo;0;L;;;;;N;;;;; +12F99;CYPRO-MINOAN SIGN CM011;Lo;0;L;;;;;N;;;;; +12F9A;CYPRO-MINOAN SIGN CM012;Lo;0;L;;;;;N;;;;; +12F9B;CYPRO-MINOAN SIGN CM012B;Lo;0;L;;;;;N;;;;; +12F9C;CYPRO-MINOAN SIGN CM013;Lo;0;L;;;;;N;;;;; +12F9D;CYPRO-MINOAN SIGN CM015;Lo;0;L;;;;;N;;;;; +12F9E;CYPRO-MINOAN SIGN CM017;Lo;0;L;;;;;N;;;;; +12F9F;CYPRO-MINOAN SIGN CM019;Lo;0;L;;;;;N;;;;; +12FA0;CYPRO-MINOAN SIGN CM021;Lo;0;L;;;;;N;;;;; +12FA1;CYPRO-MINOAN SIGN CM023;Lo;0;L;;;;;N;;;;; +12FA2;CYPRO-MINOAN SIGN CM024;Lo;0;L;;;;;N;;;;; +12FA3;CYPRO-MINOAN SIGN CM025;Lo;0;L;;;;;N;;;;; +12FA4;CYPRO-MINOAN SIGN CM026;Lo;0;L;;;;;N;;;;; +12FA5;CYPRO-MINOAN SIGN CM027;Lo;0;L;;;;;N;;;;; +12FA6;CYPRO-MINOAN SIGN CM028;Lo;0;L;;;;;N;;;;; +12FA7;CYPRO-MINOAN SIGN CM029;Lo;0;L;;;;;N;;;;; +12FA8;CYPRO-MINOAN SIGN CM030;Lo;0;L;;;;;N;;;;; +12FA9;CYPRO-MINOAN SIGN CM033;Lo;0;L;;;;;N;;;;; +12FAA;CYPRO-MINOAN SIGN CM034;Lo;0;L;;;;;N;;;;; +12FAB;CYPRO-MINOAN SIGN CM035;Lo;0;L;;;;;N;;;;; +12FAC;CYPRO-MINOAN SIGN CM036;Lo;0;L;;;;;N;;;;; +12FAD;CYPRO-MINOAN SIGN CM037;Lo;0;L;;;;;N;;;;; +12FAE;CYPRO-MINOAN SIGN CM038;Lo;0;L;;;;;N;;;;; +12FAF;CYPRO-MINOAN SIGN CM039;Lo;0;L;;;;;N;;;;; +12FB0;CYPRO-MINOAN SIGN CM040;Lo;0;L;;;;;N;;;;; +12FB1;CYPRO-MINOAN SIGN CM041;Lo;0;L;;;;;N;;;;; +12FB2;CYPRO-MINOAN SIGN CM044;Lo;0;L;;;;;N;;;;; +12FB3;CYPRO-MINOAN SIGN CM046;Lo;0;L;;;;;N;;;;; +12FB4;CYPRO-MINOAN SIGN CM047;Lo;0;L;;;;;N;;;;; +12FB5;CYPRO-MINOAN SIGN CM049;Lo;0;L;;;;;N;;;;; +12FB6;CYPRO-MINOAN SIGN CM050;Lo;0;L;;;;;N;;;;; +12FB7;CYPRO-MINOAN SIGN CM051;Lo;0;L;;;;;N;;;;; +12FB8;CYPRO-MINOAN SIGN CM052;Lo;0;L;;;;;N;;;;; +12FB9;CYPRO-MINOAN SIGN CM053;Lo;0;L;;;;;N;;;;; +12FBA;CYPRO-MINOAN SIGN CM054;Lo;0;L;;;;;N;;;;; +12FBB;CYPRO-MINOAN SIGN CM055;Lo;0;L;;;;;N;;;;; +12FBC;CYPRO-MINOAN SIGN CM056;Lo;0;L;;;;;N;;;;; +12FBD;CYPRO-MINOAN SIGN CM058;Lo;0;L;;;;;N;;;;; +12FBE;CYPRO-MINOAN SIGN CM059;Lo;0;L;;;;;N;;;;; +12FBF;CYPRO-MINOAN SIGN CM060;Lo;0;L;;;;;N;;;;; +12FC0;CYPRO-MINOAN SIGN CM061;Lo;0;L;;;;;N;;;;; +12FC1;CYPRO-MINOAN SIGN CM062;Lo;0;L;;;;;N;;;;; +12FC2;CYPRO-MINOAN SIGN CM063;Lo;0;L;;;;;N;;;;; +12FC3;CYPRO-MINOAN SIGN CM064;Lo;0;L;;;;;N;;;;; +12FC4;CYPRO-MINOAN SIGN CM066;Lo;0;L;;;;;N;;;;; +12FC5;CYPRO-MINOAN SIGN CM067;Lo;0;L;;;;;N;;;;; +12FC6;CYPRO-MINOAN SIGN CM068;Lo;0;L;;;;;N;;;;; +12FC7;CYPRO-MINOAN SIGN CM069;Lo;0;L;;;;;N;;;;; +12FC8;CYPRO-MINOAN SIGN CM070;Lo;0;L;;;;;N;;;;; +12FC9;CYPRO-MINOAN SIGN CM071;Lo;0;L;;;;;N;;;;; +12FCA;CYPRO-MINOAN SIGN CM072;Lo;0;L;;;;;N;;;;; +12FCB;CYPRO-MINOAN SIGN CM073;Lo;0;L;;;;;N;;;;; +12FCC;CYPRO-MINOAN SIGN CM074;Lo;0;L;;;;;N;;;;; +12FCD;CYPRO-MINOAN SIGN CM075;Lo;0;L;;;;;N;;;;; +12FCE;CYPRO-MINOAN SIGN CM075B;Lo;0;L;;;;;N;;;;; +12FCF;CYPRO-MINOAN SIGN CM076;Lo;0;L;;;;;N;;;;; +12FD0;CYPRO-MINOAN SIGN CM078;Lo;0;L;;;;;N;;;;; +12FD1;CYPRO-MINOAN SIGN CM079;Lo;0;L;;;;;N;;;;; +12FD2;CYPRO-MINOAN SIGN CM080;Lo;0;L;;;;;N;;;;; +12FD3;CYPRO-MINOAN SIGN CM081;Lo;0;L;;;;;N;;;;; +12FD4;CYPRO-MINOAN SIGN CM082;Lo;0;L;;;;;N;;;;; +12FD5;CYPRO-MINOAN SIGN CM083;Lo;0;L;;;;;N;;;;; +12FD6;CYPRO-MINOAN SIGN CM084;Lo;0;L;;;;;N;;;;; +12FD7;CYPRO-MINOAN SIGN CM085;Lo;0;L;;;;;N;;;;; +12FD8;CYPRO-MINOAN SIGN CM086;Lo;0;L;;;;;N;;;;; +12FD9;CYPRO-MINOAN SIGN CM087;Lo;0;L;;;;;N;;;;; +12FDA;CYPRO-MINOAN SIGN CM088;Lo;0;L;;;;;N;;;;; +12FDB;CYPRO-MINOAN SIGN CM089;Lo;0;L;;;;;N;;;;; +12FDC;CYPRO-MINOAN SIGN CM090;Lo;0;L;;;;;N;;;;; +12FDD;CYPRO-MINOAN SIGN CM091;Lo;0;L;;;;;N;;;;; +12FDE;CYPRO-MINOAN SIGN CM092;Lo;0;L;;;;;N;;;;; +12FDF;CYPRO-MINOAN SIGN CM094;Lo;0;L;;;;;N;;;;; +12FE0;CYPRO-MINOAN SIGN CM095;Lo;0;L;;;;;N;;;;; +12FE1;CYPRO-MINOAN SIGN CM096;Lo;0;L;;;;;N;;;;; +12FE2;CYPRO-MINOAN SIGN CM097;Lo;0;L;;;;;N;;;;; +12FE3;CYPRO-MINOAN SIGN CM098;Lo;0;L;;;;;N;;;;; +12FE4;CYPRO-MINOAN SIGN CM099;Lo;0;L;;;;;N;;;;; +12FE5;CYPRO-MINOAN SIGN CM100;Lo;0;L;;;;;N;;;;; +12FE6;CYPRO-MINOAN SIGN CM101;Lo;0;L;;;;;N;;;;; +12FE7;CYPRO-MINOAN SIGN CM102;Lo;0;L;;;;;N;;;;; +12FE8;CYPRO-MINOAN SIGN CM103;Lo;0;L;;;;;N;;;;; +12FE9;CYPRO-MINOAN SIGN CM104;Lo;0;L;;;;;N;;;;; +12FEA;CYPRO-MINOAN SIGN CM105;Lo;0;L;;;;;N;;;;; +12FEB;CYPRO-MINOAN SIGN CM107;Lo;0;L;;;;;N;;;;; +12FEC;CYPRO-MINOAN SIGN CM108;Lo;0;L;;;;;N;;;;; +12FED;CYPRO-MINOAN SIGN CM109;Lo;0;L;;;;;N;;;;; +12FEE;CYPRO-MINOAN SIGN CM110;Lo;0;L;;;;;N;;;;; +12FEF;CYPRO-MINOAN SIGN CM112;Lo;0;L;;;;;N;;;;; +12FF0;CYPRO-MINOAN SIGN CM114;Lo;0;L;;;;;N;;;;; +12FF1;CYPRO-MINOAN SIGN CM301;Po;0;L;;;;;N;;;;; +12FF2;CYPRO-MINOAN SIGN CM302;Po;0;L;;;;;N;;;;; +13000;EGYPTIAN HIEROGLYPH A001;Lo;0;L;;;;;N;;;;; +13001;EGYPTIAN HIEROGLYPH A002;Lo;0;L;;;;;N;;;;; +13002;EGYPTIAN HIEROGLYPH A003;Lo;0;L;;;;;N;;;;; +13003;EGYPTIAN HIEROGLYPH A004;Lo;0;L;;;;;N;;;;; +13004;EGYPTIAN HIEROGLYPH A005;Lo;0;L;;;;;N;;;;; +13005;EGYPTIAN HIEROGLYPH A005A;Lo;0;L;;;;;N;;;;; +13006;EGYPTIAN HIEROGLYPH A006;Lo;0;L;;;;;N;;;;; +13007;EGYPTIAN HIEROGLYPH A006A;Lo;0;L;;;;;N;;;;; +13008;EGYPTIAN HIEROGLYPH A006B;Lo;0;L;;;;;N;;;;; +13009;EGYPTIAN HIEROGLYPH A007;Lo;0;L;;;;;N;;;;; +1300A;EGYPTIAN HIEROGLYPH A008;Lo;0;L;;;;;N;;;;; +1300B;EGYPTIAN HIEROGLYPH A009;Lo;0;L;;;;;N;;;;; +1300C;EGYPTIAN HIEROGLYPH A010;Lo;0;L;;;;;N;;;;; +1300D;EGYPTIAN HIEROGLYPH A011;Lo;0;L;;;;;N;;;;; +1300E;EGYPTIAN HIEROGLYPH A012;Lo;0;L;;;;;N;;;;; +1300F;EGYPTIAN HIEROGLYPH A013;Lo;0;L;;;;;N;;;;; +13010;EGYPTIAN HIEROGLYPH A014;Lo;0;L;;;;;N;;;;; +13011;EGYPTIAN HIEROGLYPH A014A;Lo;0;L;;;;;N;;;;; +13012;EGYPTIAN HIEROGLYPH A015;Lo;0;L;;;;;N;;;;; +13013;EGYPTIAN HIEROGLYPH A016;Lo;0;L;;;;;N;;;;; +13014;EGYPTIAN HIEROGLYPH A017;Lo;0;L;;;;;N;;;;; +13015;EGYPTIAN HIEROGLYPH A017A;Lo;0;L;;;;;N;;;;; +13016;EGYPTIAN HIEROGLYPH A018;Lo;0;L;;;;;N;;;;; +13017;EGYPTIAN HIEROGLYPH A019;Lo;0;L;;;;;N;;;;; +13018;EGYPTIAN HIEROGLYPH A020;Lo;0;L;;;;;N;;;;; +13019;EGYPTIAN HIEROGLYPH A021;Lo;0;L;;;;;N;;;;; +1301A;EGYPTIAN HIEROGLYPH A022;Lo;0;L;;;;;N;;;;; +1301B;EGYPTIAN HIEROGLYPH A023;Lo;0;L;;;;;N;;;;; +1301C;EGYPTIAN HIEROGLYPH A024;Lo;0;L;;;;;N;;;;; +1301D;EGYPTIAN HIEROGLYPH A025;Lo;0;L;;;;;N;;;;; +1301E;EGYPTIAN HIEROGLYPH A026;Lo;0;L;;;;;N;;;;; +1301F;EGYPTIAN HIEROGLYPH A027;Lo;0;L;;;;;N;;;;; +13020;EGYPTIAN HIEROGLYPH A028;Lo;0;L;;;;;N;;;;; +13021;EGYPTIAN HIEROGLYPH A029;Lo;0;L;;;;;N;;;;; +13022;EGYPTIAN HIEROGLYPH A030;Lo;0;L;;;;;N;;;;; +13023;EGYPTIAN HIEROGLYPH A031;Lo;0;L;;;;;N;;;;; +13024;EGYPTIAN HIEROGLYPH A032;Lo;0;L;;;;;N;;;;; +13025;EGYPTIAN HIEROGLYPH A032A;Lo;0;L;;;;;N;;;;; +13026;EGYPTIAN HIEROGLYPH A033;Lo;0;L;;;;;N;;;;; +13027;EGYPTIAN HIEROGLYPH A034;Lo;0;L;;;;;N;;;;; +13028;EGYPTIAN HIEROGLYPH A035;Lo;0;L;;;;;N;;;;; +13029;EGYPTIAN HIEROGLYPH A036;Lo;0;L;;;;;N;;;;; +1302A;EGYPTIAN HIEROGLYPH A037;Lo;0;L;;;;;N;;;;; +1302B;EGYPTIAN HIEROGLYPH A038;Lo;0;L;;;;;N;;;;; +1302C;EGYPTIAN HIEROGLYPH A039;Lo;0;L;;;;;N;;;;; +1302D;EGYPTIAN HIEROGLYPH A040;Lo;0;L;;;;;N;;;;; +1302E;EGYPTIAN HIEROGLYPH A040A;Lo;0;L;;;;;N;;;;; +1302F;EGYPTIAN HIEROGLYPH A041;Lo;0;L;;;;;N;;;;; +13030;EGYPTIAN HIEROGLYPH A042;Lo;0;L;;;;;N;;;;; +13031;EGYPTIAN HIEROGLYPH A042A;Lo;0;L;;;;;N;;;;; +13032;EGYPTIAN HIEROGLYPH A043;Lo;0;L;;;;;N;;;;; +13033;EGYPTIAN HIEROGLYPH A043A;Lo;0;L;;;;;N;;;;; +13034;EGYPTIAN HIEROGLYPH A044;Lo;0;L;;;;;N;;;;; +13035;EGYPTIAN HIEROGLYPH A045;Lo;0;L;;;;;N;;;;; +13036;EGYPTIAN HIEROGLYPH A045A;Lo;0;L;;;;;N;;;;; +13037;EGYPTIAN HIEROGLYPH A046;Lo;0;L;;;;;N;;;;; +13038;EGYPTIAN HIEROGLYPH A047;Lo;0;L;;;;;N;;;;; +13039;EGYPTIAN HIEROGLYPH A048;Lo;0;L;;;;;N;;;;; +1303A;EGYPTIAN HIEROGLYPH A049;Lo;0;L;;;;;N;;;;; +1303B;EGYPTIAN HIEROGLYPH A050;Lo;0;L;;;;;N;;;;; +1303C;EGYPTIAN HIEROGLYPH A051;Lo;0;L;;;;;N;;;;; +1303D;EGYPTIAN HIEROGLYPH A052;Lo;0;L;;;;;N;;;;; +1303E;EGYPTIAN HIEROGLYPH A053;Lo;0;L;;;;;N;;;;; +1303F;EGYPTIAN HIEROGLYPH A054;Lo;0;L;;;;;N;;;;; +13040;EGYPTIAN HIEROGLYPH A055;Lo;0;L;;;;;N;;;;; +13041;EGYPTIAN HIEROGLYPH A056;Lo;0;L;;;;;N;;;;; +13042;EGYPTIAN HIEROGLYPH A057;Lo;0;L;;;;;N;;;;; +13043;EGYPTIAN HIEROGLYPH A058;Lo;0;L;;;;;N;;;;; +13044;EGYPTIAN HIEROGLYPH A059;Lo;0;L;;;;;N;;;;; +13045;EGYPTIAN HIEROGLYPH A060;Lo;0;L;;;;;N;;;;; +13046;EGYPTIAN HIEROGLYPH A061;Lo;0;L;;;;;N;;;;; +13047;EGYPTIAN HIEROGLYPH A062;Lo;0;L;;;;;N;;;;; +13048;EGYPTIAN HIEROGLYPH A063;Lo;0;L;;;;;N;;;;; +13049;EGYPTIAN HIEROGLYPH A064;Lo;0;L;;;;;N;;;;; +1304A;EGYPTIAN HIEROGLYPH A065;Lo;0;L;;;;;N;;;;; +1304B;EGYPTIAN HIEROGLYPH A066;Lo;0;L;;;;;N;;;;; +1304C;EGYPTIAN HIEROGLYPH A067;Lo;0;L;;;;;N;;;;; +1304D;EGYPTIAN HIEROGLYPH A068;Lo;0;L;;;;;N;;;;; +1304E;EGYPTIAN HIEROGLYPH A069;Lo;0;L;;;;;N;;;;; +1304F;EGYPTIAN HIEROGLYPH A070;Lo;0;L;;;;;N;;;;; +13050;EGYPTIAN HIEROGLYPH B001;Lo;0;L;;;;;N;;;;; +13051;EGYPTIAN HIEROGLYPH B002;Lo;0;L;;;;;N;;;;; +13052;EGYPTIAN HIEROGLYPH B003;Lo;0;L;;;;;N;;;;; +13053;EGYPTIAN HIEROGLYPH B004;Lo;0;L;;;;;N;;;;; +13054;EGYPTIAN HIEROGLYPH B005;Lo;0;L;;;;;N;;;;; +13055;EGYPTIAN HIEROGLYPH B005A;Lo;0;L;;;;;N;;;;; +13056;EGYPTIAN HIEROGLYPH B006;Lo;0;L;;;;;N;;;;; +13057;EGYPTIAN HIEROGLYPH B007;Lo;0;L;;;;;N;;;;; +13058;EGYPTIAN HIEROGLYPH B008;Lo;0;L;;;;;N;;;;; +13059;EGYPTIAN HIEROGLYPH B009;Lo;0;L;;;;;N;;;;; +1305A;EGYPTIAN HIEROGLYPH C001;Lo;0;L;;;;;N;;;;; +1305B;EGYPTIAN HIEROGLYPH C002;Lo;0;L;;;;;N;;;;; +1305C;EGYPTIAN HIEROGLYPH C002A;Lo;0;L;;;;;N;;;;; +1305D;EGYPTIAN HIEROGLYPH C002B;Lo;0;L;;;;;N;;;;; +1305E;EGYPTIAN HIEROGLYPH C002C;Lo;0;L;;;;;N;;;;; +1305F;EGYPTIAN HIEROGLYPH C003;Lo;0;L;;;;;N;;;;; +13060;EGYPTIAN HIEROGLYPH C004;Lo;0;L;;;;;N;;;;; +13061;EGYPTIAN HIEROGLYPH C005;Lo;0;L;;;;;N;;;;; +13062;EGYPTIAN HIEROGLYPH C006;Lo;0;L;;;;;N;;;;; +13063;EGYPTIAN HIEROGLYPH C007;Lo;0;L;;;;;N;;;;; +13064;EGYPTIAN HIEROGLYPH C008;Lo;0;L;;;;;N;;;;; +13065;EGYPTIAN HIEROGLYPH C009;Lo;0;L;;;;;N;;;;; +13066;EGYPTIAN HIEROGLYPH C010;Lo;0;L;;;;;N;;;;; +13067;EGYPTIAN HIEROGLYPH C010A;Lo;0;L;;;;;N;;;;; +13068;EGYPTIAN HIEROGLYPH C011;Lo;0;L;;;;;N;;;;; +13069;EGYPTIAN HIEROGLYPH C012;Lo;0;L;;;;;N;;;;; +1306A;EGYPTIAN HIEROGLYPH C013;Lo;0;L;;;;;N;;;;; +1306B;EGYPTIAN HIEROGLYPH C014;Lo;0;L;;;;;N;;;;; +1306C;EGYPTIAN HIEROGLYPH C015;Lo;0;L;;;;;N;;;;; +1306D;EGYPTIAN HIEROGLYPH C016;Lo;0;L;;;;;N;;;;; +1306E;EGYPTIAN HIEROGLYPH C017;Lo;0;L;;;;;N;;;;; +1306F;EGYPTIAN HIEROGLYPH C018;Lo;0;L;;;;;N;;;;; +13070;EGYPTIAN HIEROGLYPH C019;Lo;0;L;;;;;N;;;;; +13071;EGYPTIAN HIEROGLYPH C020;Lo;0;L;;;;;N;;;;; +13072;EGYPTIAN HIEROGLYPH C021;Lo;0;L;;;;;N;;;;; +13073;EGYPTIAN HIEROGLYPH C022;Lo;0;L;;;;;N;;;;; +13074;EGYPTIAN HIEROGLYPH C023;Lo;0;L;;;;;N;;;;; +13075;EGYPTIAN HIEROGLYPH C024;Lo;0;L;;;;;N;;;;; +13076;EGYPTIAN HIEROGLYPH D001;Lo;0;L;;;;;N;;;;; +13077;EGYPTIAN HIEROGLYPH D002;Lo;0;L;;;;;N;;;;; +13078;EGYPTIAN HIEROGLYPH D003;Lo;0;L;;;;;N;;;;; +13079;EGYPTIAN HIEROGLYPH D004;Lo;0;L;;;;;N;;;;; +1307A;EGYPTIAN HIEROGLYPH D005;Lo;0;L;;;;;N;;;;; +1307B;EGYPTIAN HIEROGLYPH D006;Lo;0;L;;;;;N;;;;; +1307C;EGYPTIAN HIEROGLYPH D007;Lo;0;L;;;;;N;;;;; +1307D;EGYPTIAN HIEROGLYPH D008;Lo;0;L;;;;;N;;;;; +1307E;EGYPTIAN HIEROGLYPH D008A;Lo;0;L;;;;;N;;;;; +1307F;EGYPTIAN HIEROGLYPH D009;Lo;0;L;;;;;N;;;;; +13080;EGYPTIAN HIEROGLYPH D010;Lo;0;L;;;;;N;;;;; +13081;EGYPTIAN HIEROGLYPH D011;Lo;0;L;;;;;N;;;;; +13082;EGYPTIAN HIEROGLYPH D012;Lo;0;L;;;;;N;;;;; +13083;EGYPTIAN HIEROGLYPH D013;Lo;0;L;;;;;N;;;;; +13084;EGYPTIAN HIEROGLYPH D014;Lo;0;L;;;;;N;;;;; +13085;EGYPTIAN HIEROGLYPH D015;Lo;0;L;;;;;N;;;;; +13086;EGYPTIAN HIEROGLYPH D016;Lo;0;L;;;;;N;;;;; +13087;EGYPTIAN HIEROGLYPH D017;Lo;0;L;;;;;N;;;;; +13088;EGYPTIAN HIEROGLYPH D018;Lo;0;L;;;;;N;;;;; +13089;EGYPTIAN HIEROGLYPH D019;Lo;0;L;;;;;N;;;;; +1308A;EGYPTIAN HIEROGLYPH D020;Lo;0;L;;;;;N;;;;; +1308B;EGYPTIAN HIEROGLYPH D021;Lo;0;L;;;;;N;;;;; +1308C;EGYPTIAN HIEROGLYPH D022;Lo;0;L;;;;;N;;;;; +1308D;EGYPTIAN HIEROGLYPH D023;Lo;0;L;;;;;N;;;;; +1308E;EGYPTIAN HIEROGLYPH D024;Lo;0;L;;;;;N;;;;; +1308F;EGYPTIAN HIEROGLYPH D025;Lo;0;L;;;;;N;;;;; +13090;EGYPTIAN HIEROGLYPH D026;Lo;0;L;;;;;N;;;;; +13091;EGYPTIAN HIEROGLYPH D027;Lo;0;L;;;;;N;;;;; +13092;EGYPTIAN HIEROGLYPH D027A;Lo;0;L;;;;;N;;;;; +13093;EGYPTIAN HIEROGLYPH D028;Lo;0;L;;;;;N;;;;; +13094;EGYPTIAN HIEROGLYPH D029;Lo;0;L;;;;;N;;;;; +13095;EGYPTIAN HIEROGLYPH D030;Lo;0;L;;;;;N;;;;; +13096;EGYPTIAN HIEROGLYPH D031;Lo;0;L;;;;;N;;;;; +13097;EGYPTIAN HIEROGLYPH D031A;Lo;0;L;;;;;N;;;;; +13098;EGYPTIAN HIEROGLYPH D032;Lo;0;L;;;;;N;;;;; +13099;EGYPTIAN HIEROGLYPH D033;Lo;0;L;;;;;N;;;;; +1309A;EGYPTIAN HIEROGLYPH D034;Lo;0;L;;;;;N;;;;; +1309B;EGYPTIAN HIEROGLYPH D034A;Lo;0;L;;;;;N;;;;; +1309C;EGYPTIAN HIEROGLYPH D035;Lo;0;L;;;;;N;;;;; +1309D;EGYPTIAN HIEROGLYPH D036;Lo;0;L;;;;;N;;;;; +1309E;EGYPTIAN HIEROGLYPH D037;Lo;0;L;;;;;N;;;;; +1309F;EGYPTIAN HIEROGLYPH D038;Lo;0;L;;;;;N;;;;; +130A0;EGYPTIAN HIEROGLYPH D039;Lo;0;L;;;;;N;;;;; +130A1;EGYPTIAN HIEROGLYPH D040;Lo;0;L;;;;;N;;;;; +130A2;EGYPTIAN HIEROGLYPH D041;Lo;0;L;;;;;N;;;;; +130A3;EGYPTIAN HIEROGLYPH D042;Lo;0;L;;;;;N;;;;; +130A4;EGYPTIAN HIEROGLYPH D043;Lo;0;L;;;;;N;;;;; +130A5;EGYPTIAN HIEROGLYPH D044;Lo;0;L;;;;;N;;;;; +130A6;EGYPTIAN HIEROGLYPH D045;Lo;0;L;;;;;N;;;;; +130A7;EGYPTIAN HIEROGLYPH D046;Lo;0;L;;;;;N;;;;; +130A8;EGYPTIAN HIEROGLYPH D046A;Lo;0;L;;;;;N;;;;; +130A9;EGYPTIAN HIEROGLYPH D047;Lo;0;L;;;;;N;;;;; +130AA;EGYPTIAN HIEROGLYPH D048;Lo;0;L;;;;;N;;;;; +130AB;EGYPTIAN HIEROGLYPH D048A;Lo;0;L;;;;;N;;;;; +130AC;EGYPTIAN HIEROGLYPH D049;Lo;0;L;;;;;N;;;;; +130AD;EGYPTIAN HIEROGLYPH D050;Lo;0;L;;;;;N;;;;; +130AE;EGYPTIAN HIEROGLYPH D050A;Lo;0;L;;;;;N;;;;; +130AF;EGYPTIAN HIEROGLYPH D050B;Lo;0;L;;;;;N;;;;; +130B0;EGYPTIAN HIEROGLYPH D050C;Lo;0;L;;;;;N;;;;; +130B1;EGYPTIAN HIEROGLYPH D050D;Lo;0;L;;;;;N;;;;; +130B2;EGYPTIAN HIEROGLYPH D050E;Lo;0;L;;;;;N;;;;; +130B3;EGYPTIAN HIEROGLYPH D050F;Lo;0;L;;;;;N;;;;; +130B4;EGYPTIAN HIEROGLYPH D050G;Lo;0;L;;;;;N;;;;; +130B5;EGYPTIAN HIEROGLYPH D050H;Lo;0;L;;;;;N;;;;; +130B6;EGYPTIAN HIEROGLYPH D050I;Lo;0;L;;;;;N;;;;; +130B7;EGYPTIAN HIEROGLYPH D051;Lo;0;L;;;;;N;;;;; +130B8;EGYPTIAN HIEROGLYPH D052;Lo;0;L;;;;;N;;;;; +130B9;EGYPTIAN HIEROGLYPH D052A;Lo;0;L;;;;;N;;;;; +130BA;EGYPTIAN HIEROGLYPH D053;Lo;0;L;;;;;N;;;;; +130BB;EGYPTIAN HIEROGLYPH D054;Lo;0;L;;;;;N;;;;; +130BC;EGYPTIAN HIEROGLYPH D054A;Lo;0;L;;;;;N;;;;; +130BD;EGYPTIAN HIEROGLYPH D055;Lo;0;L;;;;;N;;;;; +130BE;EGYPTIAN HIEROGLYPH D056;Lo;0;L;;;;;N;;;;; +130BF;EGYPTIAN HIEROGLYPH D057;Lo;0;L;;;;;N;;;;; +130C0;EGYPTIAN HIEROGLYPH D058;Lo;0;L;;;;;N;;;;; +130C1;EGYPTIAN HIEROGLYPH D059;Lo;0;L;;;;;N;;;;; +130C2;EGYPTIAN HIEROGLYPH D060;Lo;0;L;;;;;N;;;;; +130C3;EGYPTIAN HIEROGLYPH D061;Lo;0;L;;;;;N;;;;; +130C4;EGYPTIAN HIEROGLYPH D062;Lo;0;L;;;;;N;;;;; +130C5;EGYPTIAN HIEROGLYPH D063;Lo;0;L;;;;;N;;;;; +130C6;EGYPTIAN HIEROGLYPH D064;Lo;0;L;;;;;N;;;;; +130C7;EGYPTIAN HIEROGLYPH D065;Lo;0;L;;;;;N;;;;; +130C8;EGYPTIAN HIEROGLYPH D066;Lo;0;L;;;;;N;;;;; +130C9;EGYPTIAN HIEROGLYPH D067;Lo;0;L;;;;;N;;;;; +130CA;EGYPTIAN HIEROGLYPH D067A;Lo;0;L;;;;;N;;;;; +130CB;EGYPTIAN HIEROGLYPH D067B;Lo;0;L;;;;;N;;;;; +130CC;EGYPTIAN HIEROGLYPH D067C;Lo;0;L;;;;;N;;;;; +130CD;EGYPTIAN HIEROGLYPH D067D;Lo;0;L;;;;;N;;;;; +130CE;EGYPTIAN HIEROGLYPH D067E;Lo;0;L;;;;;N;;;;; +130CF;EGYPTIAN HIEROGLYPH D067F;Lo;0;L;;;;;N;;;;; +130D0;EGYPTIAN HIEROGLYPH D067G;Lo;0;L;;;;;N;;;;; +130D1;EGYPTIAN HIEROGLYPH D067H;Lo;0;L;;;;;N;;;;; +130D2;EGYPTIAN HIEROGLYPH E001;Lo;0;L;;;;;N;;;;; +130D3;EGYPTIAN HIEROGLYPH E002;Lo;0;L;;;;;N;;;;; +130D4;EGYPTIAN HIEROGLYPH E003;Lo;0;L;;;;;N;;;;; +130D5;EGYPTIAN HIEROGLYPH E004;Lo;0;L;;;;;N;;;;; +130D6;EGYPTIAN HIEROGLYPH E005;Lo;0;L;;;;;N;;;;; +130D7;EGYPTIAN HIEROGLYPH E006;Lo;0;L;;;;;N;;;;; +130D8;EGYPTIAN HIEROGLYPH E007;Lo;0;L;;;;;N;;;;; +130D9;EGYPTIAN HIEROGLYPH E008;Lo;0;L;;;;;N;;;;; +130DA;EGYPTIAN HIEROGLYPH E008A;Lo;0;L;;;;;N;;;;; +130DB;EGYPTIAN HIEROGLYPH E009;Lo;0;L;;;;;N;;;;; +130DC;EGYPTIAN HIEROGLYPH E009A;Lo;0;L;;;;;N;;;;; +130DD;EGYPTIAN HIEROGLYPH E010;Lo;0;L;;;;;N;;;;; +130DE;EGYPTIAN HIEROGLYPH E011;Lo;0;L;;;;;N;;;;; +130DF;EGYPTIAN HIEROGLYPH E012;Lo;0;L;;;;;N;;;;; +130E0;EGYPTIAN HIEROGLYPH E013;Lo;0;L;;;;;N;;;;; +130E1;EGYPTIAN HIEROGLYPH E014;Lo;0;L;;;;;N;;;;; +130E2;EGYPTIAN HIEROGLYPH E015;Lo;0;L;;;;;N;;;;; +130E3;EGYPTIAN HIEROGLYPH E016;Lo;0;L;;;;;N;;;;; +130E4;EGYPTIAN HIEROGLYPH E016A;Lo;0;L;;;;;N;;;;; +130E5;EGYPTIAN HIEROGLYPH E017;Lo;0;L;;;;;N;;;;; +130E6;EGYPTIAN HIEROGLYPH E017A;Lo;0;L;;;;;N;;;;; +130E7;EGYPTIAN HIEROGLYPH E018;Lo;0;L;;;;;N;;;;; +130E8;EGYPTIAN HIEROGLYPH E019;Lo;0;L;;;;;N;;;;; +130E9;EGYPTIAN HIEROGLYPH E020;Lo;0;L;;;;;N;;;;; +130EA;EGYPTIAN HIEROGLYPH E020A;Lo;0;L;;;;;N;;;;; +130EB;EGYPTIAN HIEROGLYPH E021;Lo;0;L;;;;;N;;;;; +130EC;EGYPTIAN HIEROGLYPH E022;Lo;0;L;;;;;N;;;;; +130ED;EGYPTIAN HIEROGLYPH E023;Lo;0;L;;;;;N;;;;; +130EE;EGYPTIAN HIEROGLYPH E024;Lo;0;L;;;;;N;;;;; +130EF;EGYPTIAN HIEROGLYPH E025;Lo;0;L;;;;;N;;;;; +130F0;EGYPTIAN HIEROGLYPH E026;Lo;0;L;;;;;N;;;;; +130F1;EGYPTIAN HIEROGLYPH E027;Lo;0;L;;;;;N;;;;; +130F2;EGYPTIAN HIEROGLYPH E028;Lo;0;L;;;;;N;;;;; +130F3;EGYPTIAN HIEROGLYPH E028A;Lo;0;L;;;;;N;;;;; +130F4;EGYPTIAN HIEROGLYPH E029;Lo;0;L;;;;;N;;;;; +130F5;EGYPTIAN HIEROGLYPH E030;Lo;0;L;;;;;N;;;;; +130F6;EGYPTIAN HIEROGLYPH E031;Lo;0;L;;;;;N;;;;; +130F7;EGYPTIAN HIEROGLYPH E032;Lo;0;L;;;;;N;;;;; +130F8;EGYPTIAN HIEROGLYPH E033;Lo;0;L;;;;;N;;;;; +130F9;EGYPTIAN HIEROGLYPH E034;Lo;0;L;;;;;N;;;;; +130FA;EGYPTIAN HIEROGLYPH E034A;Lo;0;L;;;;;N;;;;; +130FB;EGYPTIAN HIEROGLYPH E036;Lo;0;L;;;;;N;;;;; +130FC;EGYPTIAN HIEROGLYPH E037;Lo;0;L;;;;;N;;;;; +130FD;EGYPTIAN HIEROGLYPH E038;Lo;0;L;;;;;N;;;;; +130FE;EGYPTIAN HIEROGLYPH F001;Lo;0;L;;;;;N;;;;; +130FF;EGYPTIAN HIEROGLYPH F001A;Lo;0;L;;;;;N;;;;; +13100;EGYPTIAN HIEROGLYPH F002;Lo;0;L;;;;;N;;;;; +13101;EGYPTIAN HIEROGLYPH F003;Lo;0;L;;;;;N;;;;; +13102;EGYPTIAN HIEROGLYPH F004;Lo;0;L;;;;;N;;;;; +13103;EGYPTIAN HIEROGLYPH F005;Lo;0;L;;;;;N;;;;; +13104;EGYPTIAN HIEROGLYPH F006;Lo;0;L;;;;;N;;;;; +13105;EGYPTIAN HIEROGLYPH F007;Lo;0;L;;;;;N;;;;; +13106;EGYPTIAN HIEROGLYPH F008;Lo;0;L;;;;;N;;;;; +13107;EGYPTIAN HIEROGLYPH F009;Lo;0;L;;;;;N;;;;; +13108;EGYPTIAN HIEROGLYPH F010;Lo;0;L;;;;;N;;;;; +13109;EGYPTIAN HIEROGLYPH F011;Lo;0;L;;;;;N;;;;; +1310A;EGYPTIAN HIEROGLYPH F012;Lo;0;L;;;;;N;;;;; +1310B;EGYPTIAN HIEROGLYPH F013;Lo;0;L;;;;;N;;;;; +1310C;EGYPTIAN HIEROGLYPH F013A;Lo;0;L;;;;;N;;;;; +1310D;EGYPTIAN HIEROGLYPH F014;Lo;0;L;;;;;N;;;;; +1310E;EGYPTIAN HIEROGLYPH F015;Lo;0;L;;;;;N;;;;; +1310F;EGYPTIAN HIEROGLYPH F016;Lo;0;L;;;;;N;;;;; +13110;EGYPTIAN HIEROGLYPH F017;Lo;0;L;;;;;N;;;;; +13111;EGYPTIAN HIEROGLYPH F018;Lo;0;L;;;;;N;;;;; +13112;EGYPTIAN HIEROGLYPH F019;Lo;0;L;;;;;N;;;;; +13113;EGYPTIAN HIEROGLYPH F020;Lo;0;L;;;;;N;;;;; +13114;EGYPTIAN HIEROGLYPH F021;Lo;0;L;;;;;N;;;;; +13115;EGYPTIAN HIEROGLYPH F021A;Lo;0;L;;;;;N;;;;; +13116;EGYPTIAN HIEROGLYPH F022;Lo;0;L;;;;;N;;;;; +13117;EGYPTIAN HIEROGLYPH F023;Lo;0;L;;;;;N;;;;; +13118;EGYPTIAN HIEROGLYPH F024;Lo;0;L;;;;;N;;;;; +13119;EGYPTIAN HIEROGLYPH F025;Lo;0;L;;;;;N;;;;; +1311A;EGYPTIAN HIEROGLYPH F026;Lo;0;L;;;;;N;;;;; +1311B;EGYPTIAN HIEROGLYPH F027;Lo;0;L;;;;;N;;;;; +1311C;EGYPTIAN HIEROGLYPH F028;Lo;0;L;;;;;N;;;;; +1311D;EGYPTIAN HIEROGLYPH F029;Lo;0;L;;;;;N;;;;; +1311E;EGYPTIAN HIEROGLYPH F030;Lo;0;L;;;;;N;;;;; +1311F;EGYPTIAN HIEROGLYPH F031;Lo;0;L;;;;;N;;;;; +13120;EGYPTIAN HIEROGLYPH F031A;Lo;0;L;;;;;N;;;;; +13121;EGYPTIAN HIEROGLYPH F032;Lo;0;L;;;;;N;;;;; +13122;EGYPTIAN HIEROGLYPH F033;Lo;0;L;;;;;N;;;;; +13123;EGYPTIAN HIEROGLYPH F034;Lo;0;L;;;;;N;;;;; +13124;EGYPTIAN HIEROGLYPH F035;Lo;0;L;;;;;N;;;;; +13125;EGYPTIAN HIEROGLYPH F036;Lo;0;L;;;;;N;;;;; +13126;EGYPTIAN HIEROGLYPH F037;Lo;0;L;;;;;N;;;;; +13127;EGYPTIAN HIEROGLYPH F037A;Lo;0;L;;;;;N;;;;; +13128;EGYPTIAN HIEROGLYPH F038;Lo;0;L;;;;;N;;;;; +13129;EGYPTIAN HIEROGLYPH F038A;Lo;0;L;;;;;N;;;;; +1312A;EGYPTIAN HIEROGLYPH F039;Lo;0;L;;;;;N;;;;; +1312B;EGYPTIAN HIEROGLYPH F040;Lo;0;L;;;;;N;;;;; +1312C;EGYPTIAN HIEROGLYPH F041;Lo;0;L;;;;;N;;;;; +1312D;EGYPTIAN HIEROGLYPH F042;Lo;0;L;;;;;N;;;;; +1312E;EGYPTIAN HIEROGLYPH F043;Lo;0;L;;;;;N;;;;; +1312F;EGYPTIAN HIEROGLYPH F044;Lo;0;L;;;;;N;;;;; +13130;EGYPTIAN HIEROGLYPH F045;Lo;0;L;;;;;N;;;;; +13131;EGYPTIAN HIEROGLYPH F045A;Lo;0;L;;;;;N;;;;; +13132;EGYPTIAN HIEROGLYPH F046;Lo;0;L;;;;;N;;;;; +13133;EGYPTIAN HIEROGLYPH F046A;Lo;0;L;;;;;N;;;;; +13134;EGYPTIAN HIEROGLYPH F047;Lo;0;L;;;;;N;;;;; +13135;EGYPTIAN HIEROGLYPH F047A;Lo;0;L;;;;;N;;;;; +13136;EGYPTIAN HIEROGLYPH F048;Lo;0;L;;;;;N;;;;; +13137;EGYPTIAN HIEROGLYPH F049;Lo;0;L;;;;;N;;;;; +13138;EGYPTIAN HIEROGLYPH F050;Lo;0;L;;;;;N;;;;; +13139;EGYPTIAN HIEROGLYPH F051;Lo;0;L;;;;;N;;;;; +1313A;EGYPTIAN HIEROGLYPH F051A;Lo;0;L;;;;;N;;;;; +1313B;EGYPTIAN HIEROGLYPH F051B;Lo;0;L;;;;;N;;;;; +1313C;EGYPTIAN HIEROGLYPH F051C;Lo;0;L;;;;;N;;;;; +1313D;EGYPTIAN HIEROGLYPH F052;Lo;0;L;;;;;N;;;;; +1313E;EGYPTIAN HIEROGLYPH F053;Lo;0;L;;;;;N;;;;; +1313F;EGYPTIAN HIEROGLYPH G001;Lo;0;L;;;;;N;;;;; +13140;EGYPTIAN HIEROGLYPH G002;Lo;0;L;;;;;N;;;;; +13141;EGYPTIAN HIEROGLYPH G003;Lo;0;L;;;;;N;;;;; +13142;EGYPTIAN HIEROGLYPH G004;Lo;0;L;;;;;N;;;;; +13143;EGYPTIAN HIEROGLYPH G005;Lo;0;L;;;;;N;;;;; +13144;EGYPTIAN HIEROGLYPH G006;Lo;0;L;;;;;N;;;;; +13145;EGYPTIAN HIEROGLYPH G006A;Lo;0;L;;;;;N;;;;; +13146;EGYPTIAN HIEROGLYPH G007;Lo;0;L;;;;;N;;;;; +13147;EGYPTIAN HIEROGLYPH G007A;Lo;0;L;;;;;N;;;;; +13148;EGYPTIAN HIEROGLYPH G007B;Lo;0;L;;;;;N;;;;; +13149;EGYPTIAN HIEROGLYPH G008;Lo;0;L;;;;;N;;;;; +1314A;EGYPTIAN HIEROGLYPH G009;Lo;0;L;;;;;N;;;;; +1314B;EGYPTIAN HIEROGLYPH G010;Lo;0;L;;;;;N;;;;; +1314C;EGYPTIAN HIEROGLYPH G011;Lo;0;L;;;;;N;;;;; +1314D;EGYPTIAN HIEROGLYPH G011A;Lo;0;L;;;;;N;;;;; +1314E;EGYPTIAN HIEROGLYPH G012;Lo;0;L;;;;;N;;;;; +1314F;EGYPTIAN HIEROGLYPH G013;Lo;0;L;;;;;N;;;;; +13150;EGYPTIAN HIEROGLYPH G014;Lo;0;L;;;;;N;;;;; +13151;EGYPTIAN HIEROGLYPH G015;Lo;0;L;;;;;N;;;;; +13152;EGYPTIAN HIEROGLYPH G016;Lo;0;L;;;;;N;;;;; +13153;EGYPTIAN HIEROGLYPH G017;Lo;0;L;;;;;N;;;;; +13154;EGYPTIAN HIEROGLYPH G018;Lo;0;L;;;;;N;;;;; +13155;EGYPTIAN HIEROGLYPH G019;Lo;0;L;;;;;N;;;;; +13156;EGYPTIAN HIEROGLYPH G020;Lo;0;L;;;;;N;;;;; +13157;EGYPTIAN HIEROGLYPH G020A;Lo;0;L;;;;;N;;;;; +13158;EGYPTIAN HIEROGLYPH G021;Lo;0;L;;;;;N;;;;; +13159;EGYPTIAN HIEROGLYPH G022;Lo;0;L;;;;;N;;;;; +1315A;EGYPTIAN HIEROGLYPH G023;Lo;0;L;;;;;N;;;;; +1315B;EGYPTIAN HIEROGLYPH G024;Lo;0;L;;;;;N;;;;; +1315C;EGYPTIAN HIEROGLYPH G025;Lo;0;L;;;;;N;;;;; +1315D;EGYPTIAN HIEROGLYPH G026;Lo;0;L;;;;;N;;;;; +1315E;EGYPTIAN HIEROGLYPH G026A;Lo;0;L;;;;;N;;;;; +1315F;EGYPTIAN HIEROGLYPH G027;Lo;0;L;;;;;N;;;;; +13160;EGYPTIAN HIEROGLYPH G028;Lo;0;L;;;;;N;;;;; +13161;EGYPTIAN HIEROGLYPH G029;Lo;0;L;;;;;N;;;;; +13162;EGYPTIAN HIEROGLYPH G030;Lo;0;L;;;;;N;;;;; +13163;EGYPTIAN HIEROGLYPH G031;Lo;0;L;;;;;N;;;;; +13164;EGYPTIAN HIEROGLYPH G032;Lo;0;L;;;;;N;;;;; +13165;EGYPTIAN HIEROGLYPH G033;Lo;0;L;;;;;N;;;;; +13166;EGYPTIAN HIEROGLYPH G034;Lo;0;L;;;;;N;;;;; +13167;EGYPTIAN HIEROGLYPH G035;Lo;0;L;;;;;N;;;;; +13168;EGYPTIAN HIEROGLYPH G036;Lo;0;L;;;;;N;;;;; +13169;EGYPTIAN HIEROGLYPH G036A;Lo;0;L;;;;;N;;;;; +1316A;EGYPTIAN HIEROGLYPH G037;Lo;0;L;;;;;N;;;;; +1316B;EGYPTIAN HIEROGLYPH G037A;Lo;0;L;;;;;N;;;;; +1316C;EGYPTIAN HIEROGLYPH G038;Lo;0;L;;;;;N;;;;; +1316D;EGYPTIAN HIEROGLYPH G039;Lo;0;L;;;;;N;;;;; +1316E;EGYPTIAN HIEROGLYPH G040;Lo;0;L;;;;;N;;;;; +1316F;EGYPTIAN HIEROGLYPH G041;Lo;0;L;;;;;N;;;;; +13170;EGYPTIAN HIEROGLYPH G042;Lo;0;L;;;;;N;;;;; +13171;EGYPTIAN HIEROGLYPH G043;Lo;0;L;;;;;N;;;;; +13172;EGYPTIAN HIEROGLYPH G043A;Lo;0;L;;;;;N;;;;; +13173;EGYPTIAN HIEROGLYPH G044;Lo;0;L;;;;;N;;;;; +13174;EGYPTIAN HIEROGLYPH G045;Lo;0;L;;;;;N;;;;; +13175;EGYPTIAN HIEROGLYPH G045A;Lo;0;L;;;;;N;;;;; +13176;EGYPTIAN HIEROGLYPH G046;Lo;0;L;;;;;N;;;;; +13177;EGYPTIAN HIEROGLYPH G047;Lo;0;L;;;;;N;;;;; +13178;EGYPTIAN HIEROGLYPH G048;Lo;0;L;;;;;N;;;;; +13179;EGYPTIAN HIEROGLYPH G049;Lo;0;L;;;;;N;;;;; +1317A;EGYPTIAN HIEROGLYPH G050;Lo;0;L;;;;;N;;;;; +1317B;EGYPTIAN HIEROGLYPH G051;Lo;0;L;;;;;N;;;;; +1317C;EGYPTIAN HIEROGLYPH G052;Lo;0;L;;;;;N;;;;; +1317D;EGYPTIAN HIEROGLYPH G053;Lo;0;L;;;;;N;;;;; +1317E;EGYPTIAN HIEROGLYPH G054;Lo;0;L;;;;;N;;;;; +1317F;EGYPTIAN HIEROGLYPH H001;Lo;0;L;;;;;N;;;;; +13180;EGYPTIAN HIEROGLYPH H002;Lo;0;L;;;;;N;;;;; +13181;EGYPTIAN HIEROGLYPH H003;Lo;0;L;;;;;N;;;;; +13182;EGYPTIAN HIEROGLYPH H004;Lo;0;L;;;;;N;;;;; +13183;EGYPTIAN HIEROGLYPH H005;Lo;0;L;;;;;N;;;;; +13184;EGYPTIAN HIEROGLYPH H006;Lo;0;L;;;;;N;;;;; +13185;EGYPTIAN HIEROGLYPH H006A;Lo;0;L;;;;;N;;;;; +13186;EGYPTIAN HIEROGLYPH H007;Lo;0;L;;;;;N;;;;; +13187;EGYPTIAN HIEROGLYPH H008;Lo;0;L;;;;;N;;;;; +13188;EGYPTIAN HIEROGLYPH I001;Lo;0;L;;;;;N;;;;; +13189;EGYPTIAN HIEROGLYPH I002;Lo;0;L;;;;;N;;;;; +1318A;EGYPTIAN HIEROGLYPH I003;Lo;0;L;;;;;N;;;;; +1318B;EGYPTIAN HIEROGLYPH I004;Lo;0;L;;;;;N;;;;; +1318C;EGYPTIAN HIEROGLYPH I005;Lo;0;L;;;;;N;;;;; +1318D;EGYPTIAN HIEROGLYPH I005A;Lo;0;L;;;;;N;;;;; +1318E;EGYPTIAN HIEROGLYPH I006;Lo;0;L;;;;;N;;;;; +1318F;EGYPTIAN HIEROGLYPH I007;Lo;0;L;;;;;N;;;;; +13190;EGYPTIAN HIEROGLYPH I008;Lo;0;L;;;;;N;;;;; +13191;EGYPTIAN HIEROGLYPH I009;Lo;0;L;;;;;N;;;;; +13192;EGYPTIAN HIEROGLYPH I009A;Lo;0;L;;;;;N;;;;; +13193;EGYPTIAN HIEROGLYPH I010;Lo;0;L;;;;;N;;;;; +13194;EGYPTIAN HIEROGLYPH I010A;Lo;0;L;;;;;N;;;;; +13195;EGYPTIAN HIEROGLYPH I011;Lo;0;L;;;;;N;;;;; +13196;EGYPTIAN HIEROGLYPH I011A;Lo;0;L;;;;;N;;;;; +13197;EGYPTIAN HIEROGLYPH I012;Lo;0;L;;;;;N;;;;; +13198;EGYPTIAN HIEROGLYPH I013;Lo;0;L;;;;;N;;;;; +13199;EGYPTIAN HIEROGLYPH I014;Lo;0;L;;;;;N;;;;; +1319A;EGYPTIAN HIEROGLYPH I015;Lo;0;L;;;;;N;;;;; +1319B;EGYPTIAN HIEROGLYPH K001;Lo;0;L;;;;;N;;;;; +1319C;EGYPTIAN HIEROGLYPH K002;Lo;0;L;;;;;N;;;;; +1319D;EGYPTIAN HIEROGLYPH K003;Lo;0;L;;;;;N;;;;; +1319E;EGYPTIAN HIEROGLYPH K004;Lo;0;L;;;;;N;;;;; +1319F;EGYPTIAN HIEROGLYPH K005;Lo;0;L;;;;;N;;;;; +131A0;EGYPTIAN HIEROGLYPH K006;Lo;0;L;;;;;N;;;;; +131A1;EGYPTIAN HIEROGLYPH K007;Lo;0;L;;;;;N;;;;; +131A2;EGYPTIAN HIEROGLYPH K008;Lo;0;L;;;;;N;;;;; +131A3;EGYPTIAN HIEROGLYPH L001;Lo;0;L;;;;;N;;;;; +131A4;EGYPTIAN HIEROGLYPH L002;Lo;0;L;;;;;N;;;;; +131A5;EGYPTIAN HIEROGLYPH L002A;Lo;0;L;;;;;N;;;;; +131A6;EGYPTIAN HIEROGLYPH L003;Lo;0;L;;;;;N;;;;; +131A7;EGYPTIAN HIEROGLYPH L004;Lo;0;L;;;;;N;;;;; +131A8;EGYPTIAN HIEROGLYPH L005;Lo;0;L;;;;;N;;;;; +131A9;EGYPTIAN HIEROGLYPH L006;Lo;0;L;;;;;N;;;;; +131AA;EGYPTIAN HIEROGLYPH L006A;Lo;0;L;;;;;N;;;;; +131AB;EGYPTIAN HIEROGLYPH L007;Lo;0;L;;;;;N;;;;; +131AC;EGYPTIAN HIEROGLYPH L008;Lo;0;L;;;;;N;;;;; +131AD;EGYPTIAN HIEROGLYPH M001;Lo;0;L;;;;;N;;;;; +131AE;EGYPTIAN HIEROGLYPH M001A;Lo;0;L;;;;;N;;;;; +131AF;EGYPTIAN HIEROGLYPH M001B;Lo;0;L;;;;;N;;;;; +131B0;EGYPTIAN HIEROGLYPH M002;Lo;0;L;;;;;N;;;;; +131B1;EGYPTIAN HIEROGLYPH M003;Lo;0;L;;;;;N;;;;; +131B2;EGYPTIAN HIEROGLYPH M003A;Lo;0;L;;;;;N;;;;; +131B3;EGYPTIAN HIEROGLYPH M004;Lo;0;L;;;;;N;;;;; +131B4;EGYPTIAN HIEROGLYPH M005;Lo;0;L;;;;;N;;;;; +131B5;EGYPTIAN HIEROGLYPH M006;Lo;0;L;;;;;N;;;;; +131B6;EGYPTIAN HIEROGLYPH M007;Lo;0;L;;;;;N;;;;; +131B7;EGYPTIAN HIEROGLYPH M008;Lo;0;L;;;;;N;;;;; +131B8;EGYPTIAN HIEROGLYPH M009;Lo;0;L;;;;;N;;;;; +131B9;EGYPTIAN HIEROGLYPH M010;Lo;0;L;;;;;N;;;;; +131BA;EGYPTIAN HIEROGLYPH M010A;Lo;0;L;;;;;N;;;;; +131BB;EGYPTIAN HIEROGLYPH M011;Lo;0;L;;;;;N;;;;; +131BC;EGYPTIAN HIEROGLYPH M012;Lo;0;L;;;;;N;;;;; +131BD;EGYPTIAN HIEROGLYPH M012A;Lo;0;L;;;;;N;;;;; +131BE;EGYPTIAN HIEROGLYPH M012B;Lo;0;L;;;;;N;;;;; +131BF;EGYPTIAN HIEROGLYPH M012C;Lo;0;L;;;;;N;;;;; +131C0;EGYPTIAN HIEROGLYPH M012D;Lo;0;L;;;;;N;;;;; +131C1;EGYPTIAN HIEROGLYPH M012E;Lo;0;L;;;;;N;;;;; +131C2;EGYPTIAN HIEROGLYPH M012F;Lo;0;L;;;;;N;;;;; +131C3;EGYPTIAN HIEROGLYPH M012G;Lo;0;L;;;;;N;;;;; +131C4;EGYPTIAN HIEROGLYPH M012H;Lo;0;L;;;;;N;;;;; +131C5;EGYPTIAN HIEROGLYPH M013;Lo;0;L;;;;;N;;;;; +131C6;EGYPTIAN HIEROGLYPH M014;Lo;0;L;;;;;N;;;;; +131C7;EGYPTIAN HIEROGLYPH M015;Lo;0;L;;;;;N;;;;; +131C8;EGYPTIAN HIEROGLYPH M015A;Lo;0;L;;;;;N;;;;; +131C9;EGYPTIAN HIEROGLYPH M016;Lo;0;L;;;;;N;;;;; +131CA;EGYPTIAN HIEROGLYPH M016A;Lo;0;L;;;;;N;;;;; +131CB;EGYPTIAN HIEROGLYPH M017;Lo;0;L;;;;;N;;;;; +131CC;EGYPTIAN HIEROGLYPH M017A;Lo;0;L;;;;;N;;;;; +131CD;EGYPTIAN HIEROGLYPH M018;Lo;0;L;;;;;N;;;;; +131CE;EGYPTIAN HIEROGLYPH M019;Lo;0;L;;;;;N;;;;; +131CF;EGYPTIAN HIEROGLYPH M020;Lo;0;L;;;;;N;;;;; +131D0;EGYPTIAN HIEROGLYPH M021;Lo;0;L;;;;;N;;;;; +131D1;EGYPTIAN HIEROGLYPH M022;Lo;0;L;;;;;N;;;;; +131D2;EGYPTIAN HIEROGLYPH M022A;Lo;0;L;;;;;N;;;;; +131D3;EGYPTIAN HIEROGLYPH M023;Lo;0;L;;;;;N;;;;; +131D4;EGYPTIAN HIEROGLYPH M024;Lo;0;L;;;;;N;;;;; +131D5;EGYPTIAN HIEROGLYPH M024A;Lo;0;L;;;;;N;;;;; +131D6;EGYPTIAN HIEROGLYPH M025;Lo;0;L;;;;;N;;;;; +131D7;EGYPTIAN HIEROGLYPH M026;Lo;0;L;;;;;N;;;;; +131D8;EGYPTIAN HIEROGLYPH M027;Lo;0;L;;;;;N;;;;; +131D9;EGYPTIAN HIEROGLYPH M028;Lo;0;L;;;;;N;;;;; +131DA;EGYPTIAN HIEROGLYPH M028A;Lo;0;L;;;;;N;;;;; +131DB;EGYPTIAN HIEROGLYPH M029;Lo;0;L;;;;;N;;;;; +131DC;EGYPTIAN HIEROGLYPH M030;Lo;0;L;;;;;N;;;;; +131DD;EGYPTIAN HIEROGLYPH M031;Lo;0;L;;;;;N;;;;; +131DE;EGYPTIAN HIEROGLYPH M031A;Lo;0;L;;;;;N;;;;; +131DF;EGYPTIAN HIEROGLYPH M032;Lo;0;L;;;;;N;;;;; +131E0;EGYPTIAN HIEROGLYPH M033;Lo;0;L;;;;;N;;;;; +131E1;EGYPTIAN HIEROGLYPH M033A;Lo;0;L;;;;;N;;;;; +131E2;EGYPTIAN HIEROGLYPH M033B;Lo;0;L;;;;;N;;;;; +131E3;EGYPTIAN HIEROGLYPH M034;Lo;0;L;;;;;N;;;;; +131E4;EGYPTIAN HIEROGLYPH M035;Lo;0;L;;;;;N;;;;; +131E5;EGYPTIAN HIEROGLYPH M036;Lo;0;L;;;;;N;;;;; +131E6;EGYPTIAN HIEROGLYPH M037;Lo;0;L;;;;;N;;;;; +131E7;EGYPTIAN HIEROGLYPH M038;Lo;0;L;;;;;N;;;;; +131E8;EGYPTIAN HIEROGLYPH M039;Lo;0;L;;;;;N;;;;; +131E9;EGYPTIAN HIEROGLYPH M040;Lo;0;L;;;;;N;;;;; +131EA;EGYPTIAN HIEROGLYPH M040A;Lo;0;L;;;;;N;;;;; +131EB;EGYPTIAN HIEROGLYPH M041;Lo;0;L;;;;;N;;;;; +131EC;EGYPTIAN HIEROGLYPH M042;Lo;0;L;;;;;N;;;;; +131ED;EGYPTIAN HIEROGLYPH M043;Lo;0;L;;;;;N;;;;; +131EE;EGYPTIAN HIEROGLYPH M044;Lo;0;L;;;;;N;;;;; +131EF;EGYPTIAN HIEROGLYPH N001;Lo;0;L;;;;;N;;;;; +131F0;EGYPTIAN HIEROGLYPH N002;Lo;0;L;;;;;N;;;;; +131F1;EGYPTIAN HIEROGLYPH N003;Lo;0;L;;;;;N;;;;; +131F2;EGYPTIAN HIEROGLYPH N004;Lo;0;L;;;;;N;;;;; +131F3;EGYPTIAN HIEROGLYPH N005;Lo;0;L;;;;;N;;;;; +131F4;EGYPTIAN HIEROGLYPH N006;Lo;0;L;;;;;N;;;;; +131F5;EGYPTIAN HIEROGLYPH N007;Lo;0;L;;;;;N;;;;; +131F6;EGYPTIAN HIEROGLYPH N008;Lo;0;L;;;;;N;;;;; +131F7;EGYPTIAN HIEROGLYPH N009;Lo;0;L;;;;;N;;;;; +131F8;EGYPTIAN HIEROGLYPH N010;Lo;0;L;;;;;N;;;;; +131F9;EGYPTIAN HIEROGLYPH N011;Lo;0;L;;;;;N;;;;; +131FA;EGYPTIAN HIEROGLYPH N012;Lo;0;L;;;;;N;;;;; +131FB;EGYPTIAN HIEROGLYPH N013;Lo;0;L;;;;;N;;;;; +131FC;EGYPTIAN HIEROGLYPH N014;Lo;0;L;;;;;N;;;;; +131FD;EGYPTIAN HIEROGLYPH N015;Lo;0;L;;;;;N;;;;; +131FE;EGYPTIAN HIEROGLYPH N016;Lo;0;L;;;;;N;;;;; +131FF;EGYPTIAN HIEROGLYPH N017;Lo;0;L;;;;;N;;;;; +13200;EGYPTIAN HIEROGLYPH N018;Lo;0;L;;;;;N;;;;; +13201;EGYPTIAN HIEROGLYPH N018A;Lo;0;L;;;;;N;;;;; +13202;EGYPTIAN HIEROGLYPH N018B;Lo;0;L;;;;;N;;;;; +13203;EGYPTIAN HIEROGLYPH N019;Lo;0;L;;;;;N;;;;; +13204;EGYPTIAN HIEROGLYPH N020;Lo;0;L;;;;;N;;;;; +13205;EGYPTIAN HIEROGLYPH N021;Lo;0;L;;;;;N;;;;; +13206;EGYPTIAN HIEROGLYPH N022;Lo;0;L;;;;;N;;;;; +13207;EGYPTIAN HIEROGLYPH N023;Lo;0;L;;;;;N;;;;; +13208;EGYPTIAN HIEROGLYPH N024;Lo;0;L;;;;;N;;;;; +13209;EGYPTIAN HIEROGLYPH N025;Lo;0;L;;;;;N;;;;; +1320A;EGYPTIAN HIEROGLYPH N025A;Lo;0;L;;;;;N;;;;; +1320B;EGYPTIAN HIEROGLYPH N026;Lo;0;L;;;;;N;;;;; +1320C;EGYPTIAN HIEROGLYPH N027;Lo;0;L;;;;;N;;;;; +1320D;EGYPTIAN HIEROGLYPH N028;Lo;0;L;;;;;N;;;;; +1320E;EGYPTIAN HIEROGLYPH N029;Lo;0;L;;;;;N;;;;; +1320F;EGYPTIAN HIEROGLYPH N030;Lo;0;L;;;;;N;;;;; +13210;EGYPTIAN HIEROGLYPH N031;Lo;0;L;;;;;N;;;;; +13211;EGYPTIAN HIEROGLYPH N032;Lo;0;L;;;;;N;;;;; +13212;EGYPTIAN HIEROGLYPH N033;Lo;0;L;;;;;N;;;;; +13213;EGYPTIAN HIEROGLYPH N033A;Lo;0;L;;;;;N;;;;; +13214;EGYPTIAN HIEROGLYPH N034;Lo;0;L;;;;;N;;;;; +13215;EGYPTIAN HIEROGLYPH N034A;Lo;0;L;;;;;N;;;;; +13216;EGYPTIAN HIEROGLYPH N035;Lo;0;L;;;;;N;;;;; +13217;EGYPTIAN HIEROGLYPH N035A;Lo;0;L;;;;;N;;;;; +13218;EGYPTIAN HIEROGLYPH N036;Lo;0;L;;;;;N;;;;; +13219;EGYPTIAN HIEROGLYPH N037;Lo;0;L;;;;;N;;;;; +1321A;EGYPTIAN HIEROGLYPH N037A;Lo;0;L;;;;;N;;;;; +1321B;EGYPTIAN HIEROGLYPH N038;Lo;0;L;;;;;N;;;;; +1321C;EGYPTIAN HIEROGLYPH N039;Lo;0;L;;;;;N;;;;; +1321D;EGYPTIAN HIEROGLYPH N040;Lo;0;L;;;;;N;;;;; +1321E;EGYPTIAN HIEROGLYPH N041;Lo;0;L;;;;;N;;;;; +1321F;EGYPTIAN HIEROGLYPH N042;Lo;0;L;;;;;N;;;;; +13220;EGYPTIAN HIEROGLYPH NL001;Lo;0;L;;;;;N;;;;; +13221;EGYPTIAN HIEROGLYPH NL002;Lo;0;L;;;;;N;;;;; +13222;EGYPTIAN HIEROGLYPH NL003;Lo;0;L;;;;;N;;;;; +13223;EGYPTIAN HIEROGLYPH NL004;Lo;0;L;;;;;N;;;;; +13224;EGYPTIAN HIEROGLYPH NL005;Lo;0;L;;;;;N;;;;; +13225;EGYPTIAN HIEROGLYPH NL005A;Lo;0;L;;;;;N;;;;; +13226;EGYPTIAN HIEROGLYPH NL006;Lo;0;L;;;;;N;;;;; +13227;EGYPTIAN HIEROGLYPH NL007;Lo;0;L;;;;;N;;;;; +13228;EGYPTIAN HIEROGLYPH NL008;Lo;0;L;;;;;N;;;;; +13229;EGYPTIAN HIEROGLYPH NL009;Lo;0;L;;;;;N;;;;; +1322A;EGYPTIAN HIEROGLYPH NL010;Lo;0;L;;;;;N;;;;; +1322B;EGYPTIAN HIEROGLYPH NL011;Lo;0;L;;;;;N;;;;; +1322C;EGYPTIAN HIEROGLYPH NL012;Lo;0;L;;;;;N;;;;; +1322D;EGYPTIAN HIEROGLYPH NL013;Lo;0;L;;;;;N;;;;; +1322E;EGYPTIAN HIEROGLYPH NL014;Lo;0;L;;;;;N;;;;; +1322F;EGYPTIAN HIEROGLYPH NL015;Lo;0;L;;;;;N;;;;; +13230;EGYPTIAN HIEROGLYPH NL016;Lo;0;L;;;;;N;;;;; +13231;EGYPTIAN HIEROGLYPH NL017;Lo;0;L;;;;;N;;;;; +13232;EGYPTIAN HIEROGLYPH NL017A;Lo;0;L;;;;;N;;;;; +13233;EGYPTIAN HIEROGLYPH NL018;Lo;0;L;;;;;N;;;;; +13234;EGYPTIAN HIEROGLYPH NL019;Lo;0;L;;;;;N;;;;; +13235;EGYPTIAN HIEROGLYPH NL020;Lo;0;L;;;;;N;;;;; +13236;EGYPTIAN HIEROGLYPH NU001;Lo;0;L;;;;;N;;;;; +13237;EGYPTIAN HIEROGLYPH NU002;Lo;0;L;;;;;N;;;;; +13238;EGYPTIAN HIEROGLYPH NU003;Lo;0;L;;;;;N;;;;; +13239;EGYPTIAN HIEROGLYPH NU004;Lo;0;L;;;;;N;;;;; +1323A;EGYPTIAN HIEROGLYPH NU005;Lo;0;L;;;;;N;;;;; +1323B;EGYPTIAN HIEROGLYPH NU006;Lo;0;L;;;;;N;;;;; +1323C;EGYPTIAN HIEROGLYPH NU007;Lo;0;L;;;;;N;;;;; +1323D;EGYPTIAN HIEROGLYPH NU008;Lo;0;L;;;;;N;;;;; +1323E;EGYPTIAN HIEROGLYPH NU009;Lo;0;L;;;;;N;;;;; +1323F;EGYPTIAN HIEROGLYPH NU010;Lo;0;L;;;;;N;;;;; +13240;EGYPTIAN HIEROGLYPH NU010A;Lo;0;L;;;;;N;;;;; +13241;EGYPTIAN HIEROGLYPH NU011;Lo;0;L;;;;;N;;;;; +13242;EGYPTIAN HIEROGLYPH NU011A;Lo;0;L;;;;;N;;;;; +13243;EGYPTIAN HIEROGLYPH NU012;Lo;0;L;;;;;N;;;;; +13244;EGYPTIAN HIEROGLYPH NU013;Lo;0;L;;;;;N;;;;; +13245;EGYPTIAN HIEROGLYPH NU014;Lo;0;L;;;;;N;;;;; +13246;EGYPTIAN HIEROGLYPH NU015;Lo;0;L;;;;;N;;;;; +13247;EGYPTIAN HIEROGLYPH NU016;Lo;0;L;;;;;N;;;;; +13248;EGYPTIAN HIEROGLYPH NU017;Lo;0;L;;;;;N;;;;; +13249;EGYPTIAN HIEROGLYPH NU018;Lo;0;L;;;;;N;;;;; +1324A;EGYPTIAN HIEROGLYPH NU018A;Lo;0;L;;;;;N;;;;; +1324B;EGYPTIAN HIEROGLYPH NU019;Lo;0;L;;;;;N;;;;; +1324C;EGYPTIAN HIEROGLYPH NU020;Lo;0;L;;;;;N;;;;; +1324D;EGYPTIAN HIEROGLYPH NU021;Lo;0;L;;;;;N;;;;; +1324E;EGYPTIAN HIEROGLYPH NU022;Lo;0;L;;;;;N;;;;; +1324F;EGYPTIAN HIEROGLYPH NU022A;Lo;0;L;;;;;N;;;;; +13250;EGYPTIAN HIEROGLYPH O001;Lo;0;L;;;;;N;;;;; +13251;EGYPTIAN HIEROGLYPH O001A;Lo;0;L;;;;;N;;;;; +13252;EGYPTIAN HIEROGLYPH O002;Lo;0;L;;;;;N;;;;; +13253;EGYPTIAN HIEROGLYPH O003;Lo;0;L;;;;;N;;;;; +13254;EGYPTIAN HIEROGLYPH O004;Lo;0;L;;;;;N;;;;; +13255;EGYPTIAN HIEROGLYPH O005;Lo;0;L;;;;;N;;;;; +13256;EGYPTIAN HIEROGLYPH O005A;Lo;0;L;;;;;N;;;;; +13257;EGYPTIAN HIEROGLYPH O006;Lo;0;L;;;;;N;;;;; +13258;EGYPTIAN HIEROGLYPH O006A;Lo;0;L;;;;;N;;;;; +13259;EGYPTIAN HIEROGLYPH O006B;Lo;0;L;;;;;N;;;;; +1325A;EGYPTIAN HIEROGLYPH O006C;Lo;0;L;;;;;N;;;;; +1325B;EGYPTIAN HIEROGLYPH O006D;Lo;0;L;;;;;N;;;;; +1325C;EGYPTIAN HIEROGLYPH O006E;Lo;0;L;;;;;N;;;;; +1325D;EGYPTIAN HIEROGLYPH O006F;Lo;0;L;;;;;N;;;;; +1325E;EGYPTIAN HIEROGLYPH O007;Lo;0;L;;;;;N;;;;; +1325F;EGYPTIAN HIEROGLYPH O008;Lo;0;L;;;;;N;;;;; +13260;EGYPTIAN HIEROGLYPH O009;Lo;0;L;;;;;N;;;;; +13261;EGYPTIAN HIEROGLYPH O010;Lo;0;L;;;;;N;;;;; +13262;EGYPTIAN HIEROGLYPH O010A;Lo;0;L;;;;;N;;;;; +13263;EGYPTIAN HIEROGLYPH O010B;Lo;0;L;;;;;N;;;;; +13264;EGYPTIAN HIEROGLYPH O010C;Lo;0;L;;;;;N;;;;; +13265;EGYPTIAN HIEROGLYPH O011;Lo;0;L;;;;;N;;;;; +13266;EGYPTIAN HIEROGLYPH O012;Lo;0;L;;;;;N;;;;; +13267;EGYPTIAN HIEROGLYPH O013;Lo;0;L;;;;;N;;;;; +13268;EGYPTIAN HIEROGLYPH O014;Lo;0;L;;;;;N;;;;; +13269;EGYPTIAN HIEROGLYPH O015;Lo;0;L;;;;;N;;;;; +1326A;EGYPTIAN HIEROGLYPH O016;Lo;0;L;;;;;N;;;;; +1326B;EGYPTIAN HIEROGLYPH O017;Lo;0;L;;;;;N;;;;; +1326C;EGYPTIAN HIEROGLYPH O018;Lo;0;L;;;;;N;;;;; +1326D;EGYPTIAN HIEROGLYPH O019;Lo;0;L;;;;;N;;;;; +1326E;EGYPTIAN HIEROGLYPH O019A;Lo;0;L;;;;;N;;;;; +1326F;EGYPTIAN HIEROGLYPH O020;Lo;0;L;;;;;N;;;;; +13270;EGYPTIAN HIEROGLYPH O020A;Lo;0;L;;;;;N;;;;; +13271;EGYPTIAN HIEROGLYPH O021;Lo;0;L;;;;;N;;;;; +13272;EGYPTIAN HIEROGLYPH O022;Lo;0;L;;;;;N;;;;; +13273;EGYPTIAN HIEROGLYPH O023;Lo;0;L;;;;;N;;;;; +13274;EGYPTIAN HIEROGLYPH O024;Lo;0;L;;;;;N;;;;; +13275;EGYPTIAN HIEROGLYPH O024A;Lo;0;L;;;;;N;;;;; +13276;EGYPTIAN HIEROGLYPH O025;Lo;0;L;;;;;N;;;;; +13277;EGYPTIAN HIEROGLYPH O025A;Lo;0;L;;;;;N;;;;; +13278;EGYPTIAN HIEROGLYPH O026;Lo;0;L;;;;;N;;;;; +13279;EGYPTIAN HIEROGLYPH O027;Lo;0;L;;;;;N;;;;; +1327A;EGYPTIAN HIEROGLYPH O028;Lo;0;L;;;;;N;;;;; +1327B;EGYPTIAN HIEROGLYPH O029;Lo;0;L;;;;;N;;;;; +1327C;EGYPTIAN HIEROGLYPH O029A;Lo;0;L;;;;;N;;;;; +1327D;EGYPTIAN HIEROGLYPH O030;Lo;0;L;;;;;N;;;;; +1327E;EGYPTIAN HIEROGLYPH O030A;Lo;0;L;;;;;N;;;;; +1327F;EGYPTIAN HIEROGLYPH O031;Lo;0;L;;;;;N;;;;; +13280;EGYPTIAN HIEROGLYPH O032;Lo;0;L;;;;;N;;;;; +13281;EGYPTIAN HIEROGLYPH O033;Lo;0;L;;;;;N;;;;; +13282;EGYPTIAN HIEROGLYPH O033A;Lo;0;L;;;;;N;;;;; +13283;EGYPTIAN HIEROGLYPH O034;Lo;0;L;;;;;N;;;;; +13284;EGYPTIAN HIEROGLYPH O035;Lo;0;L;;;;;N;;;;; +13285;EGYPTIAN HIEROGLYPH O036;Lo;0;L;;;;;N;;;;; +13286;EGYPTIAN HIEROGLYPH O036A;Lo;0;L;;;;;N;;;;; +13287;EGYPTIAN HIEROGLYPH O036B;Lo;0;L;;;;;N;;;;; +13288;EGYPTIAN HIEROGLYPH O036C;Lo;0;L;;;;;N;;;;; +13289;EGYPTIAN HIEROGLYPH O036D;Lo;0;L;;;;;N;;;;; +1328A;EGYPTIAN HIEROGLYPH O037;Lo;0;L;;;;;N;;;;; +1328B;EGYPTIAN HIEROGLYPH O038;Lo;0;L;;;;;N;;;;; +1328C;EGYPTIAN HIEROGLYPH O039;Lo;0;L;;;;;N;;;;; +1328D;EGYPTIAN HIEROGLYPH O040;Lo;0;L;;;;;N;;;;; +1328E;EGYPTIAN HIEROGLYPH O041;Lo;0;L;;;;;N;;;;; +1328F;EGYPTIAN HIEROGLYPH O042;Lo;0;L;;;;;N;;;;; +13290;EGYPTIAN HIEROGLYPH O043;Lo;0;L;;;;;N;;;;; +13291;EGYPTIAN HIEROGLYPH O044;Lo;0;L;;;;;N;;;;; +13292;EGYPTIAN HIEROGLYPH O045;Lo;0;L;;;;;N;;;;; +13293;EGYPTIAN HIEROGLYPH O046;Lo;0;L;;;;;N;;;;; +13294;EGYPTIAN HIEROGLYPH O047;Lo;0;L;;;;;N;;;;; +13295;EGYPTIAN HIEROGLYPH O048;Lo;0;L;;;;;N;;;;; +13296;EGYPTIAN HIEROGLYPH O049;Lo;0;L;;;;;N;;;;; +13297;EGYPTIAN HIEROGLYPH O050;Lo;0;L;;;;;N;;;;; +13298;EGYPTIAN HIEROGLYPH O050A;Lo;0;L;;;;;N;;;;; +13299;EGYPTIAN HIEROGLYPH O050B;Lo;0;L;;;;;N;;;;; +1329A;EGYPTIAN HIEROGLYPH O051;Lo;0;L;;;;;N;;;;; +1329B;EGYPTIAN HIEROGLYPH P001;Lo;0;L;;;;;N;;;;; +1329C;EGYPTIAN HIEROGLYPH P001A;Lo;0;L;;;;;N;;;;; +1329D;EGYPTIAN HIEROGLYPH P002;Lo;0;L;;;;;N;;;;; +1329E;EGYPTIAN HIEROGLYPH P003;Lo;0;L;;;;;N;;;;; +1329F;EGYPTIAN HIEROGLYPH P003A;Lo;0;L;;;;;N;;;;; +132A0;EGYPTIAN HIEROGLYPH P004;Lo;0;L;;;;;N;;;;; +132A1;EGYPTIAN HIEROGLYPH P005;Lo;0;L;;;;;N;;;;; +132A2;EGYPTIAN HIEROGLYPH P006;Lo;0;L;;;;;N;;;;; +132A3;EGYPTIAN HIEROGLYPH P007;Lo;0;L;;;;;N;;;;; +132A4;EGYPTIAN HIEROGLYPH P008;Lo;0;L;;;;;N;;;;; +132A5;EGYPTIAN HIEROGLYPH P009;Lo;0;L;;;;;N;;;;; +132A6;EGYPTIAN HIEROGLYPH P010;Lo;0;L;;;;;N;;;;; +132A7;EGYPTIAN HIEROGLYPH P011;Lo;0;L;;;;;N;;;;; +132A8;EGYPTIAN HIEROGLYPH Q001;Lo;0;L;;;;;N;;;;; +132A9;EGYPTIAN HIEROGLYPH Q002;Lo;0;L;;;;;N;;;;; +132AA;EGYPTIAN HIEROGLYPH Q003;Lo;0;L;;;;;N;;;;; +132AB;EGYPTIAN HIEROGLYPH Q004;Lo;0;L;;;;;N;;;;; +132AC;EGYPTIAN HIEROGLYPH Q005;Lo;0;L;;;;;N;;;;; +132AD;EGYPTIAN HIEROGLYPH Q006;Lo;0;L;;;;;N;;;;; +132AE;EGYPTIAN HIEROGLYPH Q007;Lo;0;L;;;;;N;;;;; +132AF;EGYPTIAN HIEROGLYPH R001;Lo;0;L;;;;;N;;;;; +132B0;EGYPTIAN HIEROGLYPH R002;Lo;0;L;;;;;N;;;;; +132B1;EGYPTIAN HIEROGLYPH R002A;Lo;0;L;;;;;N;;;;; +132B2;EGYPTIAN HIEROGLYPH R003;Lo;0;L;;;;;N;;;;; +132B3;EGYPTIAN HIEROGLYPH R003A;Lo;0;L;;;;;N;;;;; +132B4;EGYPTIAN HIEROGLYPH R003B;Lo;0;L;;;;;N;;;;; +132B5;EGYPTIAN HIEROGLYPH R004;Lo;0;L;;;;;N;;;;; +132B6;EGYPTIAN HIEROGLYPH R005;Lo;0;L;;;;;N;;;;; +132B7;EGYPTIAN HIEROGLYPH R006;Lo;0;L;;;;;N;;;;; +132B8;EGYPTIAN HIEROGLYPH R007;Lo;0;L;;;;;N;;;;; +132B9;EGYPTIAN HIEROGLYPH R008;Lo;0;L;;;;;N;;;;; +132BA;EGYPTIAN HIEROGLYPH R009;Lo;0;L;;;;;N;;;;; +132BB;EGYPTIAN HIEROGLYPH R010;Lo;0;L;;;;;N;;;;; +132BC;EGYPTIAN HIEROGLYPH R010A;Lo;0;L;;;;;N;;;;; +132BD;EGYPTIAN HIEROGLYPH R011;Lo;0;L;;;;;N;;;;; +132BE;EGYPTIAN HIEROGLYPH R012;Lo;0;L;;;;;N;;;;; +132BF;EGYPTIAN HIEROGLYPH R013;Lo;0;L;;;;;N;;;;; +132C0;EGYPTIAN HIEROGLYPH R014;Lo;0;L;;;;;N;;;;; +132C1;EGYPTIAN HIEROGLYPH R015;Lo;0;L;;;;;N;;;;; +132C2;EGYPTIAN HIEROGLYPH R016;Lo;0;L;;;;;N;;;;; +132C3;EGYPTIAN HIEROGLYPH R016A;Lo;0;L;;;;;N;;;;; +132C4;EGYPTIAN HIEROGLYPH R017;Lo;0;L;;;;;N;;;;; +132C5;EGYPTIAN HIEROGLYPH R018;Lo;0;L;;;;;N;;;;; +132C6;EGYPTIAN HIEROGLYPH R019;Lo;0;L;;;;;N;;;;; +132C7;EGYPTIAN HIEROGLYPH R020;Lo;0;L;;;;;N;;;;; +132C8;EGYPTIAN HIEROGLYPH R021;Lo;0;L;;;;;N;;;;; +132C9;EGYPTIAN HIEROGLYPH R022;Lo;0;L;;;;;N;;;;; +132CA;EGYPTIAN HIEROGLYPH R023;Lo;0;L;;;;;N;;;;; +132CB;EGYPTIAN HIEROGLYPH R024;Lo;0;L;;;;;N;;;;; +132CC;EGYPTIAN HIEROGLYPH R025;Lo;0;L;;;;;N;;;;; +132CD;EGYPTIAN HIEROGLYPH R026;Lo;0;L;;;;;N;;;;; +132CE;EGYPTIAN HIEROGLYPH R027;Lo;0;L;;;;;N;;;;; +132CF;EGYPTIAN HIEROGLYPH R028;Lo;0;L;;;;;N;;;;; +132D0;EGYPTIAN HIEROGLYPH R029;Lo;0;L;;;;;N;;;;; +132D1;EGYPTIAN HIEROGLYPH S001;Lo;0;L;;;;;N;;;;; +132D2;EGYPTIAN HIEROGLYPH S002;Lo;0;L;;;;;N;;;;; +132D3;EGYPTIAN HIEROGLYPH S002A;Lo;0;L;;;;;N;;;;; +132D4;EGYPTIAN HIEROGLYPH S003;Lo;0;L;;;;;N;;;;; +132D5;EGYPTIAN HIEROGLYPH S004;Lo;0;L;;;;;N;;;;; +132D6;EGYPTIAN HIEROGLYPH S005;Lo;0;L;;;;;N;;;;; +132D7;EGYPTIAN HIEROGLYPH S006;Lo;0;L;;;;;N;;;;; +132D8;EGYPTIAN HIEROGLYPH S006A;Lo;0;L;;;;;N;;;;; +132D9;EGYPTIAN HIEROGLYPH S007;Lo;0;L;;;;;N;;;;; +132DA;EGYPTIAN HIEROGLYPH S008;Lo;0;L;;;;;N;;;;; +132DB;EGYPTIAN HIEROGLYPH S009;Lo;0;L;;;;;N;;;;; +132DC;EGYPTIAN HIEROGLYPH S010;Lo;0;L;;;;;N;;;;; +132DD;EGYPTIAN HIEROGLYPH S011;Lo;0;L;;;;;N;;;;; +132DE;EGYPTIAN HIEROGLYPH S012;Lo;0;L;;;;;N;;;;; +132DF;EGYPTIAN HIEROGLYPH S013;Lo;0;L;;;;;N;;;;; +132E0;EGYPTIAN HIEROGLYPH S014;Lo;0;L;;;;;N;;;;; +132E1;EGYPTIAN HIEROGLYPH S014A;Lo;0;L;;;;;N;;;;; +132E2;EGYPTIAN HIEROGLYPH S014B;Lo;0;L;;;;;N;;;;; +132E3;EGYPTIAN HIEROGLYPH S015;Lo;0;L;;;;;N;;;;; +132E4;EGYPTIAN HIEROGLYPH S016;Lo;0;L;;;;;N;;;;; +132E5;EGYPTIAN HIEROGLYPH S017;Lo;0;L;;;;;N;;;;; +132E6;EGYPTIAN HIEROGLYPH S017A;Lo;0;L;;;;;N;;;;; +132E7;EGYPTIAN HIEROGLYPH S018;Lo;0;L;;;;;N;;;;; +132E8;EGYPTIAN HIEROGLYPH S019;Lo;0;L;;;;;N;;;;; +132E9;EGYPTIAN HIEROGLYPH S020;Lo;0;L;;;;;N;;;;; +132EA;EGYPTIAN HIEROGLYPH S021;Lo;0;L;;;;;N;;;;; +132EB;EGYPTIAN HIEROGLYPH S022;Lo;0;L;;;;;N;;;;; +132EC;EGYPTIAN HIEROGLYPH S023;Lo;0;L;;;;;N;;;;; +132ED;EGYPTIAN HIEROGLYPH S024;Lo;0;L;;;;;N;;;;; +132EE;EGYPTIAN HIEROGLYPH S025;Lo;0;L;;;;;N;;;;; +132EF;EGYPTIAN HIEROGLYPH S026;Lo;0;L;;;;;N;;;;; +132F0;EGYPTIAN HIEROGLYPH S026A;Lo;0;L;;;;;N;;;;; +132F1;EGYPTIAN HIEROGLYPH S026B;Lo;0;L;;;;;N;;;;; +132F2;EGYPTIAN HIEROGLYPH S027;Lo;0;L;;;;;N;;;;; +132F3;EGYPTIAN HIEROGLYPH S028;Lo;0;L;;;;;N;;;;; +132F4;EGYPTIAN HIEROGLYPH S029;Lo;0;L;;;;;N;;;;; +132F5;EGYPTIAN HIEROGLYPH S030;Lo;0;L;;;;;N;;;;; +132F6;EGYPTIAN HIEROGLYPH S031;Lo;0;L;;;;;N;;;;; +132F7;EGYPTIAN HIEROGLYPH S032;Lo;0;L;;;;;N;;;;; +132F8;EGYPTIAN HIEROGLYPH S033;Lo;0;L;;;;;N;;;;; +132F9;EGYPTIAN HIEROGLYPH S034;Lo;0;L;;;;;N;;;;; +132FA;EGYPTIAN HIEROGLYPH S035;Lo;0;L;;;;;N;;;;; +132FB;EGYPTIAN HIEROGLYPH S035A;Lo;0;L;;;;;N;;;;; +132FC;EGYPTIAN HIEROGLYPH S036;Lo;0;L;;;;;N;;;;; +132FD;EGYPTIAN HIEROGLYPH S037;Lo;0;L;;;;;N;;;;; +132FE;EGYPTIAN HIEROGLYPH S038;Lo;0;L;;;;;N;;;;; +132FF;EGYPTIAN HIEROGLYPH S039;Lo;0;L;;;;;N;;;;; +13300;EGYPTIAN HIEROGLYPH S040;Lo;0;L;;;;;N;;;;; +13301;EGYPTIAN HIEROGLYPH S041;Lo;0;L;;;;;N;;;;; +13302;EGYPTIAN HIEROGLYPH S042;Lo;0;L;;;;;N;;;;; +13303;EGYPTIAN HIEROGLYPH S043;Lo;0;L;;;;;N;;;;; +13304;EGYPTIAN HIEROGLYPH S044;Lo;0;L;;;;;N;;;;; +13305;EGYPTIAN HIEROGLYPH S045;Lo;0;L;;;;;N;;;;; +13306;EGYPTIAN HIEROGLYPH S046;Lo;0;L;;;;;N;;;;; +13307;EGYPTIAN HIEROGLYPH T001;Lo;0;L;;;;;N;;;;; +13308;EGYPTIAN HIEROGLYPH T002;Lo;0;L;;;;;N;;;;; +13309;EGYPTIAN HIEROGLYPH T003;Lo;0;L;;;;;N;;;;; +1330A;EGYPTIAN HIEROGLYPH T003A;Lo;0;L;;;;;N;;;;; +1330B;EGYPTIAN HIEROGLYPH T004;Lo;0;L;;;;;N;;;;; +1330C;EGYPTIAN HIEROGLYPH T005;Lo;0;L;;;;;N;;;;; +1330D;EGYPTIAN HIEROGLYPH T006;Lo;0;L;;;;;N;;;;; +1330E;EGYPTIAN HIEROGLYPH T007;Lo;0;L;;;;;N;;;;; +1330F;EGYPTIAN HIEROGLYPH T007A;Lo;0;L;;;;;N;;;;; +13310;EGYPTIAN HIEROGLYPH T008;Lo;0;L;;;;;N;;;;; +13311;EGYPTIAN HIEROGLYPH T008A;Lo;0;L;;;;;N;;;;; +13312;EGYPTIAN HIEROGLYPH T009;Lo;0;L;;;;;N;;;;; +13313;EGYPTIAN HIEROGLYPH T009A;Lo;0;L;;;;;N;;;;; +13314;EGYPTIAN HIEROGLYPH T010;Lo;0;L;;;;;N;;;;; +13315;EGYPTIAN HIEROGLYPH T011;Lo;0;L;;;;;N;;;;; +13316;EGYPTIAN HIEROGLYPH T011A;Lo;0;L;;;;;N;;;;; +13317;EGYPTIAN HIEROGLYPH T012;Lo;0;L;;;;;N;;;;; +13318;EGYPTIAN HIEROGLYPH T013;Lo;0;L;;;;;N;;;;; +13319;EGYPTIAN HIEROGLYPH T014;Lo;0;L;;;;;N;;;;; +1331A;EGYPTIAN HIEROGLYPH T015;Lo;0;L;;;;;N;;;;; +1331B;EGYPTIAN HIEROGLYPH T016;Lo;0;L;;;;;N;;;;; +1331C;EGYPTIAN HIEROGLYPH T016A;Lo;0;L;;;;;N;;;;; +1331D;EGYPTIAN HIEROGLYPH T017;Lo;0;L;;;;;N;;;;; +1331E;EGYPTIAN HIEROGLYPH T018;Lo;0;L;;;;;N;;;;; +1331F;EGYPTIAN HIEROGLYPH T019;Lo;0;L;;;;;N;;;;; +13320;EGYPTIAN HIEROGLYPH T020;Lo;0;L;;;;;N;;;;; +13321;EGYPTIAN HIEROGLYPH T021;Lo;0;L;;;;;N;;;;; +13322;EGYPTIAN HIEROGLYPH T022;Lo;0;L;;;;;N;;;;; +13323;EGYPTIAN HIEROGLYPH T023;Lo;0;L;;;;;N;;;;; +13324;EGYPTIAN HIEROGLYPH T024;Lo;0;L;;;;;N;;;;; +13325;EGYPTIAN HIEROGLYPH T025;Lo;0;L;;;;;N;;;;; +13326;EGYPTIAN HIEROGLYPH T026;Lo;0;L;;;;;N;;;;; +13327;EGYPTIAN HIEROGLYPH T027;Lo;0;L;;;;;N;;;;; +13328;EGYPTIAN HIEROGLYPH T028;Lo;0;L;;;;;N;;;;; +13329;EGYPTIAN HIEROGLYPH T029;Lo;0;L;;;;;N;;;;; +1332A;EGYPTIAN HIEROGLYPH T030;Lo;0;L;;;;;N;;;;; +1332B;EGYPTIAN HIEROGLYPH T031;Lo;0;L;;;;;N;;;;; +1332C;EGYPTIAN HIEROGLYPH T032;Lo;0;L;;;;;N;;;;; +1332D;EGYPTIAN HIEROGLYPH T032A;Lo;0;L;;;;;N;;;;; +1332E;EGYPTIAN HIEROGLYPH T033;Lo;0;L;;;;;N;;;;; +1332F;EGYPTIAN HIEROGLYPH T033A;Lo;0;L;;;;;N;;;;; +13330;EGYPTIAN HIEROGLYPH T034;Lo;0;L;;;;;N;;;;; +13331;EGYPTIAN HIEROGLYPH T035;Lo;0;L;;;;;N;;;;; +13332;EGYPTIAN HIEROGLYPH T036;Lo;0;L;;;;;N;;;;; +13333;EGYPTIAN HIEROGLYPH U001;Lo;0;L;;;;;N;;;;; +13334;EGYPTIAN HIEROGLYPH U002;Lo;0;L;;;;;N;;;;; +13335;EGYPTIAN HIEROGLYPH U003;Lo;0;L;;;;;N;;;;; +13336;EGYPTIAN HIEROGLYPH U004;Lo;0;L;;;;;N;;;;; +13337;EGYPTIAN HIEROGLYPH U005;Lo;0;L;;;;;N;;;;; +13338;EGYPTIAN HIEROGLYPH U006;Lo;0;L;;;;;N;;;;; +13339;EGYPTIAN HIEROGLYPH U006A;Lo;0;L;;;;;N;;;;; +1333A;EGYPTIAN HIEROGLYPH U006B;Lo;0;L;;;;;N;;;;; +1333B;EGYPTIAN HIEROGLYPH U007;Lo;0;L;;;;;N;;;;; +1333C;EGYPTIAN HIEROGLYPH U008;Lo;0;L;;;;;N;;;;; +1333D;EGYPTIAN HIEROGLYPH U009;Lo;0;L;;;;;N;;;;; +1333E;EGYPTIAN HIEROGLYPH U010;Lo;0;L;;;;;N;;;;; +1333F;EGYPTIAN HIEROGLYPH U011;Lo;0;L;;;;;N;;;;; +13340;EGYPTIAN HIEROGLYPH U012;Lo;0;L;;;;;N;;;;; +13341;EGYPTIAN HIEROGLYPH U013;Lo;0;L;;;;;N;;;;; +13342;EGYPTIAN HIEROGLYPH U014;Lo;0;L;;;;;N;;;;; +13343;EGYPTIAN HIEROGLYPH U015;Lo;0;L;;;;;N;;;;; +13344;EGYPTIAN HIEROGLYPH U016;Lo;0;L;;;;;N;;;;; +13345;EGYPTIAN HIEROGLYPH U017;Lo;0;L;;;;;N;;;;; +13346;EGYPTIAN HIEROGLYPH U018;Lo;0;L;;;;;N;;;;; +13347;EGYPTIAN HIEROGLYPH U019;Lo;0;L;;;;;N;;;;; +13348;EGYPTIAN HIEROGLYPH U020;Lo;0;L;;;;;N;;;;; +13349;EGYPTIAN HIEROGLYPH U021;Lo;0;L;;;;;N;;;;; +1334A;EGYPTIAN HIEROGLYPH U022;Lo;0;L;;;;;N;;;;; +1334B;EGYPTIAN HIEROGLYPH U023;Lo;0;L;;;;;N;;;;; +1334C;EGYPTIAN HIEROGLYPH U023A;Lo;0;L;;;;;N;;;;; +1334D;EGYPTIAN HIEROGLYPH U024;Lo;0;L;;;;;N;;;;; +1334E;EGYPTIAN HIEROGLYPH U025;Lo;0;L;;;;;N;;;;; +1334F;EGYPTIAN HIEROGLYPH U026;Lo;0;L;;;;;N;;;;; +13350;EGYPTIAN HIEROGLYPH U027;Lo;0;L;;;;;N;;;;; +13351;EGYPTIAN HIEROGLYPH U028;Lo;0;L;;;;;N;;;;; +13352;EGYPTIAN HIEROGLYPH U029;Lo;0;L;;;;;N;;;;; +13353;EGYPTIAN HIEROGLYPH U029A;Lo;0;L;;;;;N;;;;; +13354;EGYPTIAN HIEROGLYPH U030;Lo;0;L;;;;;N;;;;; +13355;EGYPTIAN HIEROGLYPH U031;Lo;0;L;;;;;N;;;;; +13356;EGYPTIAN HIEROGLYPH U032;Lo;0;L;;;;;N;;;;; +13357;EGYPTIAN HIEROGLYPH U032A;Lo;0;L;;;;;N;;;;; +13358;EGYPTIAN HIEROGLYPH U033;Lo;0;L;;;;;N;;;;; +13359;EGYPTIAN HIEROGLYPH U034;Lo;0;L;;;;;N;;;;; +1335A;EGYPTIAN HIEROGLYPH U035;Lo;0;L;;;;;N;;;;; +1335B;EGYPTIAN HIEROGLYPH U036;Lo;0;L;;;;;N;;;;; +1335C;EGYPTIAN HIEROGLYPH U037;Lo;0;L;;;;;N;;;;; +1335D;EGYPTIAN HIEROGLYPH U038;Lo;0;L;;;;;N;;;;; +1335E;EGYPTIAN HIEROGLYPH U039;Lo;0;L;;;;;N;;;;; +1335F;EGYPTIAN HIEROGLYPH U040;Lo;0;L;;;;;N;;;;; +13360;EGYPTIAN HIEROGLYPH U041;Lo;0;L;;;;;N;;;;; +13361;EGYPTIAN HIEROGLYPH U042;Lo;0;L;;;;;N;;;;; +13362;EGYPTIAN HIEROGLYPH V001;Lo;0;L;;;;;N;;;;; +13363;EGYPTIAN HIEROGLYPH V001A;Lo;0;L;;;;;N;;;;; +13364;EGYPTIAN HIEROGLYPH V001B;Lo;0;L;;;;;N;;;;; +13365;EGYPTIAN HIEROGLYPH V001C;Lo;0;L;;;;;N;;;;; +13366;EGYPTIAN HIEROGLYPH V001D;Lo;0;L;;;;;N;;;;; +13367;EGYPTIAN HIEROGLYPH V001E;Lo;0;L;;;;;N;;;;; +13368;EGYPTIAN HIEROGLYPH V001F;Lo;0;L;;;;;N;;;;; +13369;EGYPTIAN HIEROGLYPH V001G;Lo;0;L;;;;;N;;;;; +1336A;EGYPTIAN HIEROGLYPH V001H;Lo;0;L;;;;;N;;;;; +1336B;EGYPTIAN HIEROGLYPH V001I;Lo;0;L;;;;;N;;;;; +1336C;EGYPTIAN HIEROGLYPH V002;Lo;0;L;;;;;N;;;;; +1336D;EGYPTIAN HIEROGLYPH V002A;Lo;0;L;;;;;N;;;;; +1336E;EGYPTIAN HIEROGLYPH V003;Lo;0;L;;;;;N;;;;; +1336F;EGYPTIAN HIEROGLYPH V004;Lo;0;L;;;;;N;;;;; +13370;EGYPTIAN HIEROGLYPH V005;Lo;0;L;;;;;N;;;;; +13371;EGYPTIAN HIEROGLYPH V006;Lo;0;L;;;;;N;;;;; +13372;EGYPTIAN HIEROGLYPH V007;Lo;0;L;;;;;N;;;;; +13373;EGYPTIAN HIEROGLYPH V007A;Lo;0;L;;;;;N;;;;; +13374;EGYPTIAN HIEROGLYPH V007B;Lo;0;L;;;;;N;;;;; +13375;EGYPTIAN HIEROGLYPH V008;Lo;0;L;;;;;N;;;;; +13376;EGYPTIAN HIEROGLYPH V009;Lo;0;L;;;;;N;;;;; +13377;EGYPTIAN HIEROGLYPH V010;Lo;0;L;;;;;N;;;;; +13378;EGYPTIAN HIEROGLYPH V011;Lo;0;L;;;;;N;;;;; +13379;EGYPTIAN HIEROGLYPH V011A;Lo;0;L;;;;;N;;;;; +1337A;EGYPTIAN HIEROGLYPH V011B;Lo;0;L;;;;;N;;;;; +1337B;EGYPTIAN HIEROGLYPH V011C;Lo;0;L;;;;;N;;;;; +1337C;EGYPTIAN HIEROGLYPH V012;Lo;0;L;;;;;N;;;;; +1337D;EGYPTIAN HIEROGLYPH V012A;Lo;0;L;;;;;N;;;;; +1337E;EGYPTIAN HIEROGLYPH V012B;Lo;0;L;;;;;N;;;;; +1337F;EGYPTIAN HIEROGLYPH V013;Lo;0;L;;;;;N;;;;; +13380;EGYPTIAN HIEROGLYPH V014;Lo;0;L;;;;;N;;;;; +13381;EGYPTIAN HIEROGLYPH V015;Lo;0;L;;;;;N;;;;; +13382;EGYPTIAN HIEROGLYPH V016;Lo;0;L;;;;;N;;;;; +13383;EGYPTIAN HIEROGLYPH V017;Lo;0;L;;;;;N;;;;; +13384;EGYPTIAN HIEROGLYPH V018;Lo;0;L;;;;;N;;;;; +13385;EGYPTIAN HIEROGLYPH V019;Lo;0;L;;;;;N;;;;; +13386;EGYPTIAN HIEROGLYPH V020;Lo;0;L;;;;;N;;;;; +13387;EGYPTIAN HIEROGLYPH V020A;Lo;0;L;;;;;N;;;;; +13388;EGYPTIAN HIEROGLYPH V020B;Lo;0;L;;;;;N;;;;; +13389;EGYPTIAN HIEROGLYPH V020C;Lo;0;L;;;;;N;;;;; +1338A;EGYPTIAN HIEROGLYPH V020D;Lo;0;L;;;;;N;;;;; +1338B;EGYPTIAN HIEROGLYPH V020E;Lo;0;L;;;;;N;;;;; +1338C;EGYPTIAN HIEROGLYPH V020F;Lo;0;L;;;;;N;;;;; +1338D;EGYPTIAN HIEROGLYPH V020G;Lo;0;L;;;;;N;;;;; +1338E;EGYPTIAN HIEROGLYPH V020H;Lo;0;L;;;;;N;;;;; +1338F;EGYPTIAN HIEROGLYPH V020I;Lo;0;L;;;;;N;;;;; +13390;EGYPTIAN HIEROGLYPH V020J;Lo;0;L;;;;;N;;;;; +13391;EGYPTIAN HIEROGLYPH V020K;Lo;0;L;;;;;N;;;;; +13392;EGYPTIAN HIEROGLYPH V020L;Lo;0;L;;;;;N;;;;; +13393;EGYPTIAN HIEROGLYPH V021;Lo;0;L;;;;;N;;;;; +13394;EGYPTIAN HIEROGLYPH V022;Lo;0;L;;;;;N;;;;; +13395;EGYPTIAN HIEROGLYPH V023;Lo;0;L;;;;;N;;;;; +13396;EGYPTIAN HIEROGLYPH V023A;Lo;0;L;;;;;N;;;;; +13397;EGYPTIAN HIEROGLYPH V024;Lo;0;L;;;;;N;;;;; +13398;EGYPTIAN HIEROGLYPH V025;Lo;0;L;;;;;N;;;;; +13399;EGYPTIAN HIEROGLYPH V026;Lo;0;L;;;;;N;;;;; +1339A;EGYPTIAN HIEROGLYPH V027;Lo;0;L;;;;;N;;;;; +1339B;EGYPTIAN HIEROGLYPH V028;Lo;0;L;;;;;N;;;;; +1339C;EGYPTIAN HIEROGLYPH V028A;Lo;0;L;;;;;N;;;;; +1339D;EGYPTIAN HIEROGLYPH V029;Lo;0;L;;;;;N;;;;; +1339E;EGYPTIAN HIEROGLYPH V029A;Lo;0;L;;;;;N;;;;; +1339F;EGYPTIAN HIEROGLYPH V030;Lo;0;L;;;;;N;;;;; +133A0;EGYPTIAN HIEROGLYPH V030A;Lo;0;L;;;;;N;;;;; +133A1;EGYPTIAN HIEROGLYPH V031;Lo;0;L;;;;;N;;;;; +133A2;EGYPTIAN HIEROGLYPH V031A;Lo;0;L;;;;;N;;;;; +133A3;EGYPTIAN HIEROGLYPH V032;Lo;0;L;;;;;N;;;;; +133A4;EGYPTIAN HIEROGLYPH V033;Lo;0;L;;;;;N;;;;; +133A5;EGYPTIAN HIEROGLYPH V033A;Lo;0;L;;;;;N;;;;; +133A6;EGYPTIAN HIEROGLYPH V034;Lo;0;L;;;;;N;;;;; +133A7;EGYPTIAN HIEROGLYPH V035;Lo;0;L;;;;;N;;;;; +133A8;EGYPTIAN HIEROGLYPH V036;Lo;0;L;;;;;N;;;;; +133A9;EGYPTIAN HIEROGLYPH V037;Lo;0;L;;;;;N;;;;; +133AA;EGYPTIAN HIEROGLYPH V037A;Lo;0;L;;;;;N;;;;; +133AB;EGYPTIAN HIEROGLYPH V038;Lo;0;L;;;;;N;;;;; +133AC;EGYPTIAN HIEROGLYPH V039;Lo;0;L;;;;;N;;;;; +133AD;EGYPTIAN HIEROGLYPH V040;Lo;0;L;;;;;N;;;;; +133AE;EGYPTIAN HIEROGLYPH V040A;Lo;0;L;;;;;N;;;;; +133AF;EGYPTIAN HIEROGLYPH W001;Lo;0;L;;;;;N;;;;; +133B0;EGYPTIAN HIEROGLYPH W002;Lo;0;L;;;;;N;;;;; +133B1;EGYPTIAN HIEROGLYPH W003;Lo;0;L;;;;;N;;;;; +133B2;EGYPTIAN HIEROGLYPH W003A;Lo;0;L;;;;;N;;;;; +133B3;EGYPTIAN HIEROGLYPH W004;Lo;0;L;;;;;N;;;;; +133B4;EGYPTIAN HIEROGLYPH W005;Lo;0;L;;;;;N;;;;; +133B5;EGYPTIAN HIEROGLYPH W006;Lo;0;L;;;;;N;;;;; +133B6;EGYPTIAN HIEROGLYPH W007;Lo;0;L;;;;;N;;;;; +133B7;EGYPTIAN HIEROGLYPH W008;Lo;0;L;;;;;N;;;;; +133B8;EGYPTIAN HIEROGLYPH W009;Lo;0;L;;;;;N;;;;; +133B9;EGYPTIAN HIEROGLYPH W009A;Lo;0;L;;;;;N;;;;; +133BA;EGYPTIAN HIEROGLYPH W010;Lo;0;L;;;;;N;;;;; +133BB;EGYPTIAN HIEROGLYPH W010A;Lo;0;L;;;;;N;;;;; +133BC;EGYPTIAN HIEROGLYPH W011;Lo;0;L;;;;;N;;;;; +133BD;EGYPTIAN HIEROGLYPH W012;Lo;0;L;;;;;N;;;;; +133BE;EGYPTIAN HIEROGLYPH W013;Lo;0;L;;;;;N;;;;; +133BF;EGYPTIAN HIEROGLYPH W014;Lo;0;L;;;;;N;;;;; +133C0;EGYPTIAN HIEROGLYPH W014A;Lo;0;L;;;;;N;;;;; +133C1;EGYPTIAN HIEROGLYPH W015;Lo;0;L;;;;;N;;;;; +133C2;EGYPTIAN HIEROGLYPH W016;Lo;0;L;;;;;N;;;;; +133C3;EGYPTIAN HIEROGLYPH W017;Lo;0;L;;;;;N;;;;; +133C4;EGYPTIAN HIEROGLYPH W017A;Lo;0;L;;;;;N;;;;; +133C5;EGYPTIAN HIEROGLYPH W018;Lo;0;L;;;;;N;;;;; +133C6;EGYPTIAN HIEROGLYPH W018A;Lo;0;L;;;;;N;;;;; +133C7;EGYPTIAN HIEROGLYPH W019;Lo;0;L;;;;;N;;;;; +133C8;EGYPTIAN HIEROGLYPH W020;Lo;0;L;;;;;N;;;;; +133C9;EGYPTIAN HIEROGLYPH W021;Lo;0;L;;;;;N;;;;; +133CA;EGYPTIAN HIEROGLYPH W022;Lo;0;L;;;;;N;;;;; +133CB;EGYPTIAN HIEROGLYPH W023;Lo;0;L;;;;;N;;;;; +133CC;EGYPTIAN HIEROGLYPH W024;Lo;0;L;;;;;N;;;;; +133CD;EGYPTIAN HIEROGLYPH W024A;Lo;0;L;;;;;N;;;;; +133CE;EGYPTIAN HIEROGLYPH W025;Lo;0;L;;;;;N;;;;; +133CF;EGYPTIAN HIEROGLYPH X001;Lo;0;L;;;;;N;;;;; +133D0;EGYPTIAN HIEROGLYPH X002;Lo;0;L;;;;;N;;;;; +133D1;EGYPTIAN HIEROGLYPH X003;Lo;0;L;;;;;N;;;;; +133D2;EGYPTIAN HIEROGLYPH X004;Lo;0;L;;;;;N;;;;; +133D3;EGYPTIAN HIEROGLYPH X004A;Lo;0;L;;;;;N;;;;; +133D4;EGYPTIAN HIEROGLYPH X004B;Lo;0;L;;;;;N;;;;; +133D5;EGYPTIAN HIEROGLYPH X005;Lo;0;L;;;;;N;;;;; +133D6;EGYPTIAN HIEROGLYPH X006;Lo;0;L;;;;;N;;;;; +133D7;EGYPTIAN HIEROGLYPH X006A;Lo;0;L;;;;;N;;;;; +133D8;EGYPTIAN HIEROGLYPH X007;Lo;0;L;;;;;N;;;;; +133D9;EGYPTIAN HIEROGLYPH X008;Lo;0;L;;;;;N;;;;; +133DA;EGYPTIAN HIEROGLYPH X008A;Lo;0;L;;;;;N;;;;; +133DB;EGYPTIAN HIEROGLYPH Y001;Lo;0;L;;;;;N;;;;; +133DC;EGYPTIAN HIEROGLYPH Y001A;Lo;0;L;;;;;N;;;;; +133DD;EGYPTIAN HIEROGLYPH Y002;Lo;0;L;;;;;N;;;;; +133DE;EGYPTIAN HIEROGLYPH Y003;Lo;0;L;;;;;N;;;;; +133DF;EGYPTIAN HIEROGLYPH Y004;Lo;0;L;;;;;N;;;;; +133E0;EGYPTIAN HIEROGLYPH Y005;Lo;0;L;;;;;N;;;;; +133E1;EGYPTIAN HIEROGLYPH Y006;Lo;0;L;;;;;N;;;;; +133E2;EGYPTIAN HIEROGLYPH Y007;Lo;0;L;;;;;N;;;;; +133E3;EGYPTIAN HIEROGLYPH Y008;Lo;0;L;;;;;N;;;;; +133E4;EGYPTIAN HIEROGLYPH Z001;Lo;0;L;;;;;N;;;;; +133E5;EGYPTIAN HIEROGLYPH Z002;Lo;0;L;;;;;N;;;;; +133E6;EGYPTIAN HIEROGLYPH Z002A;Lo;0;L;;;;;N;;;;; +133E7;EGYPTIAN HIEROGLYPH Z002B;Lo;0;L;;;;;N;;;;; +133E8;EGYPTIAN HIEROGLYPH Z002C;Lo;0;L;;;;;N;;;;; +133E9;EGYPTIAN HIEROGLYPH Z002D;Lo;0;L;;;;;N;;;;; +133EA;EGYPTIAN HIEROGLYPH Z003;Lo;0;L;;;;;N;;;;; +133EB;EGYPTIAN HIEROGLYPH Z003A;Lo;0;L;;;;;N;;;;; +133EC;EGYPTIAN HIEROGLYPH Z003B;Lo;0;L;;;;;N;;;;; +133ED;EGYPTIAN HIEROGLYPH Z004;Lo;0;L;;;;;N;;;;; +133EE;EGYPTIAN HIEROGLYPH Z004A;Lo;0;L;;;;;N;;;;; +133EF;EGYPTIAN HIEROGLYPH Z005;Lo;0;L;;;;;N;;;;; +133F0;EGYPTIAN HIEROGLYPH Z005A;Lo;0;L;;;;;N;;;;; +133F1;EGYPTIAN HIEROGLYPH Z006;Lo;0;L;;;;;N;;;;; +133F2;EGYPTIAN HIEROGLYPH Z007;Lo;0;L;;;;;N;;;;; +133F3;EGYPTIAN HIEROGLYPH Z008;Lo;0;L;;;;;N;;;;; +133F4;EGYPTIAN HIEROGLYPH Z009;Lo;0;L;;;;;N;;;;; +133F5;EGYPTIAN HIEROGLYPH Z010;Lo;0;L;;;;;N;;;;; +133F6;EGYPTIAN HIEROGLYPH Z011;Lo;0;L;;;;;N;;;;; +133F7;EGYPTIAN HIEROGLYPH Z012;Lo;0;L;;;;;N;;;;; +133F8;EGYPTIAN HIEROGLYPH Z013;Lo;0;L;;;;;N;;;;; +133F9;EGYPTIAN HIEROGLYPH Z014;Lo;0;L;;;;;N;;;;; +133FA;EGYPTIAN HIEROGLYPH Z015;Lo;0;L;;;;;N;;;;; +133FB;EGYPTIAN HIEROGLYPH Z015A;Lo;0;L;;;;;N;;;;; +133FC;EGYPTIAN HIEROGLYPH Z015B;Lo;0;L;;;;;N;;;;; +133FD;EGYPTIAN HIEROGLYPH Z015C;Lo;0;L;;;;;N;;;;; +133FE;EGYPTIAN HIEROGLYPH Z015D;Lo;0;L;;;;;N;;;;; +133FF;EGYPTIAN HIEROGLYPH Z015E;Lo;0;L;;;;;N;;;;; +13400;EGYPTIAN HIEROGLYPH Z015F;Lo;0;L;;;;;N;;;;; +13401;EGYPTIAN HIEROGLYPH Z015G;Lo;0;L;;;;;N;;;;; +13402;EGYPTIAN HIEROGLYPH Z015H;Lo;0;L;;;;;N;;;;; +13403;EGYPTIAN HIEROGLYPH Z015I;Lo;0;L;;;;;N;;;;; +13404;EGYPTIAN HIEROGLYPH Z016;Lo;0;L;;;;;N;;;;; +13405;EGYPTIAN HIEROGLYPH Z016A;Lo;0;L;;;;;N;;;;; +13406;EGYPTIAN HIEROGLYPH Z016B;Lo;0;L;;;;;N;;;;; +13407;EGYPTIAN HIEROGLYPH Z016C;Lo;0;L;;;;;N;;;;; +13408;EGYPTIAN HIEROGLYPH Z016D;Lo;0;L;;;;;N;;;;; +13409;EGYPTIAN HIEROGLYPH Z016E;Lo;0;L;;;;;N;;;;; +1340A;EGYPTIAN HIEROGLYPH Z016F;Lo;0;L;;;;;N;;;;; +1340B;EGYPTIAN HIEROGLYPH Z016G;Lo;0;L;;;;;N;;;;; +1340C;EGYPTIAN HIEROGLYPH Z016H;Lo;0;L;;;;;N;;;;; +1340D;EGYPTIAN HIEROGLYPH AA001;Lo;0;L;;;;;N;;;;; +1340E;EGYPTIAN HIEROGLYPH AA002;Lo;0;L;;;;;N;;;;; +1340F;EGYPTIAN HIEROGLYPH AA003;Lo;0;L;;;;;N;;;;; +13410;EGYPTIAN HIEROGLYPH AA004;Lo;0;L;;;;;N;;;;; +13411;EGYPTIAN HIEROGLYPH AA005;Lo;0;L;;;;;N;;;;; +13412;EGYPTIAN HIEROGLYPH AA006;Lo;0;L;;;;;N;;;;; +13413;EGYPTIAN HIEROGLYPH AA007;Lo;0;L;;;;;N;;;;; +13414;EGYPTIAN HIEROGLYPH AA007A;Lo;0;L;;;;;N;;;;; +13415;EGYPTIAN HIEROGLYPH AA007B;Lo;0;L;;;;;N;;;;; +13416;EGYPTIAN HIEROGLYPH AA008;Lo;0;L;;;;;N;;;;; +13417;EGYPTIAN HIEROGLYPH AA009;Lo;0;L;;;;;N;;;;; +13418;EGYPTIAN HIEROGLYPH AA010;Lo;0;L;;;;;N;;;;; +13419;EGYPTIAN HIEROGLYPH AA011;Lo;0;L;;;;;N;;;;; +1341A;EGYPTIAN HIEROGLYPH AA012;Lo;0;L;;;;;N;;;;; +1341B;EGYPTIAN HIEROGLYPH AA013;Lo;0;L;;;;;N;;;;; +1341C;EGYPTIAN HIEROGLYPH AA014;Lo;0;L;;;;;N;;;;; +1341D;EGYPTIAN HIEROGLYPH AA015;Lo;0;L;;;;;N;;;;; +1341E;EGYPTIAN HIEROGLYPH AA016;Lo;0;L;;;;;N;;;;; +1341F;EGYPTIAN HIEROGLYPH AA017;Lo;0;L;;;;;N;;;;; +13420;EGYPTIAN HIEROGLYPH AA018;Lo;0;L;;;;;N;;;;; +13421;EGYPTIAN HIEROGLYPH AA019;Lo;0;L;;;;;N;;;;; +13422;EGYPTIAN HIEROGLYPH AA020;Lo;0;L;;;;;N;;;;; +13423;EGYPTIAN HIEROGLYPH AA021;Lo;0;L;;;;;N;;;;; +13424;EGYPTIAN HIEROGLYPH AA022;Lo;0;L;;;;;N;;;;; +13425;EGYPTIAN HIEROGLYPH AA023;Lo;0;L;;;;;N;;;;; +13426;EGYPTIAN HIEROGLYPH AA024;Lo;0;L;;;;;N;;;;; +13427;EGYPTIAN HIEROGLYPH AA025;Lo;0;L;;;;;N;;;;; +13428;EGYPTIAN HIEROGLYPH AA026;Lo;0;L;;;;;N;;;;; +13429;EGYPTIAN HIEROGLYPH AA027;Lo;0;L;;;;;N;;;;; +1342A;EGYPTIAN HIEROGLYPH AA028;Lo;0;L;;;;;N;;;;; +1342B;EGYPTIAN HIEROGLYPH AA029;Lo;0;L;;;;;N;;;;; +1342C;EGYPTIAN HIEROGLYPH AA030;Lo;0;L;;;;;N;;;;; +1342D;EGYPTIAN HIEROGLYPH AA031;Lo;0;L;;;;;N;;;;; +1342E;EGYPTIAN HIEROGLYPH AA032;Lo;0;L;;;;;N;;;;; +1342F;EGYPTIAN HIEROGLYPH V011D;Lo;0;L;;;;;N;;;;; +13430;EGYPTIAN HIEROGLYPH VERTICAL JOINER;Cf;0;L;;;;;N;;;;; +13431;EGYPTIAN HIEROGLYPH HORIZONTAL JOINER;Cf;0;L;;;;;N;;;;; +13432;EGYPTIAN HIEROGLYPH INSERT AT TOP START;Cf;0;L;;;;;N;;;;; +13433;EGYPTIAN HIEROGLYPH INSERT AT BOTTOM START;Cf;0;L;;;;;N;;;;; +13434;EGYPTIAN HIEROGLYPH INSERT AT TOP END;Cf;0;L;;;;;N;;;;; +13435;EGYPTIAN HIEROGLYPH INSERT AT BOTTOM END;Cf;0;L;;;;;N;;;;; +13436;EGYPTIAN HIEROGLYPH OVERLAY MIDDLE;Cf;0;L;;;;;N;;;;; +13437;EGYPTIAN HIEROGLYPH BEGIN SEGMENT;Cf;0;L;;;;;N;;;;; +13438;EGYPTIAN HIEROGLYPH END SEGMENT;Cf;0;L;;;;;N;;;;; +13439;EGYPTIAN HIEROGLYPH INSERT AT MIDDLE;Cf;0;L;;;;;N;;;;; +1343A;EGYPTIAN HIEROGLYPH INSERT AT TOP;Cf;0;L;;;;;N;;;;; +1343B;EGYPTIAN HIEROGLYPH INSERT AT BOTTOM;Cf;0;L;;;;;N;;;;; +1343C;EGYPTIAN HIEROGLYPH BEGIN ENCLOSURE;Cf;0;L;;;;;N;;;;; +1343D;EGYPTIAN HIEROGLYPH END ENCLOSURE;Cf;0;L;;;;;N;;;;; +1343E;EGYPTIAN HIEROGLYPH BEGIN WALLED ENCLOSURE;Cf;0;L;;;;;N;;;;; +1343F;EGYPTIAN HIEROGLYPH END WALLED ENCLOSURE;Cf;0;L;;;;;N;;;;; +13440;EGYPTIAN HIEROGLYPH MIRROR HORIZONTALLY;Mn;0;NSM;;;;;N;;;;; +13441;EGYPTIAN HIEROGLYPH FULL BLANK;Lo;0;L;;;;;N;;;;; +13442;EGYPTIAN HIEROGLYPH HALF BLANK;Lo;0;L;;;;;N;;;;; +13443;EGYPTIAN HIEROGLYPH LOST SIGN;Lo;0;L;;;;;N;;;;; +13444;EGYPTIAN HIEROGLYPH HALF LOST SIGN;Lo;0;L;;;;;N;;;;; +13445;EGYPTIAN HIEROGLYPH TALL LOST SIGN;Lo;0;L;;;;;N;;;;; +13446;EGYPTIAN HIEROGLYPH WIDE LOST SIGN;Lo;0;L;;;;;N;;;;; +13447;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT TOP START;Mn;0;NSM;;;;;N;;;;; +13448;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT BOTTOM START;Mn;0;NSM;;;;;N;;;;; +13449;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT START;Mn;0;NSM;;;;;N;;;;; +1344A;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT TOP END;Mn;0;NSM;;;;;N;;;;; +1344B;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT TOP;Mn;0;NSM;;;;;N;;;;; +1344C;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT BOTTOM START AND TOP END;Mn;0;NSM;;;;;N;;;;; +1344D;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT START AND TOP;Mn;0;NSM;;;;;N;;;;; +1344E;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT BOTTOM END;Mn;0;NSM;;;;;N;;;;; +1344F;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT TOP START AND BOTTOM END;Mn;0;NSM;;;;;N;;;;; +13450;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT BOTTOM;Mn;0;NSM;;;;;N;;;;; +13451;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT START AND BOTTOM;Mn;0;NSM;;;;;N;;;;; +13452;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT END;Mn;0;NSM;;;;;N;;;;; +13453;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT TOP AND END;Mn;0;NSM;;;;;N;;;;; +13454;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT BOTTOM AND END;Mn;0;NSM;;;;;N;;;;; +13455;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED;Mn;0;NSM;;;;;N;;;;; +13460;EGYPTIAN HIEROGLYPH-13460;Lo;0;L;;;;;N;;;;; +13461;EGYPTIAN HIEROGLYPH-13461;Lo;0;L;;;;;N;;;;; +13462;EGYPTIAN HIEROGLYPH-13462;Lo;0;L;;;;;N;;;;; +13463;EGYPTIAN HIEROGLYPH-13463;Lo;0;L;;;;;N;;;;; +13464;EGYPTIAN HIEROGLYPH-13464;Lo;0;L;;;;;N;;;;; +13465;EGYPTIAN HIEROGLYPH-13465;Lo;0;L;;;;;N;;;;; +13466;EGYPTIAN HIEROGLYPH-13466;Lo;0;L;;;;;N;;;;; +13467;EGYPTIAN HIEROGLYPH-13467;Lo;0;L;;;;;N;;;;; +13468;EGYPTIAN HIEROGLYPH-13468;Lo;0;L;;;;;N;;;;; +13469;EGYPTIAN HIEROGLYPH-13469;Lo;0;L;;;;;N;;;;; +1346A;EGYPTIAN HIEROGLYPH-1346A;Lo;0;L;;;;;N;;;;; +1346B;EGYPTIAN HIEROGLYPH-1346B;Lo;0;L;;;;;N;;;;; +1346C;EGYPTIAN HIEROGLYPH-1346C;Lo;0;L;;;;;N;;;;; +1346D;EGYPTIAN HIEROGLYPH-1346D;Lo;0;L;;;;;N;;;;; +1346E;EGYPTIAN HIEROGLYPH-1346E;Lo;0;L;;;;;N;;;;; +1346F;EGYPTIAN HIEROGLYPH-1346F;Lo;0;L;;;;;N;;;;; +13470;EGYPTIAN HIEROGLYPH-13470;Lo;0;L;;;;;N;;;;; +13471;EGYPTIAN HIEROGLYPH-13471;Lo;0;L;;;;;N;;;;; +13472;EGYPTIAN HIEROGLYPH-13472;Lo;0;L;;;;;N;;;;; +13473;EGYPTIAN HIEROGLYPH-13473;Lo;0;L;;;;;N;;;;; +13474;EGYPTIAN HIEROGLYPH-13474;Lo;0;L;;;;;N;;;;; +13475;EGYPTIAN HIEROGLYPH-13475;Lo;0;L;;;;;N;;;;; +13476;EGYPTIAN HIEROGLYPH-13476;Lo;0;L;;;;;N;;;;; +13477;EGYPTIAN HIEROGLYPH-13477;Lo;0;L;;;;;N;;;;; +13478;EGYPTIAN HIEROGLYPH-13478;Lo;0;L;;;;;N;;;;; +13479;EGYPTIAN HIEROGLYPH-13479;Lo;0;L;;;;;N;;;;; +1347A;EGYPTIAN HIEROGLYPH-1347A;Lo;0;L;;;;;N;;;;; +1347B;EGYPTIAN HIEROGLYPH-1347B;Lo;0;L;;;;;N;;;;; +1347C;EGYPTIAN HIEROGLYPH-1347C;Lo;0;L;;;;;N;;;;; +1347D;EGYPTIAN HIEROGLYPH-1347D;Lo;0;L;;;;;N;;;;; +1347E;EGYPTIAN HIEROGLYPH-1347E;Lo;0;L;;;;;N;;;;; +1347F;EGYPTIAN HIEROGLYPH-1347F;Lo;0;L;;;;;N;;;;; +13480;EGYPTIAN HIEROGLYPH-13480;Lo;0;L;;;;;N;;;;; +13481;EGYPTIAN HIEROGLYPH-13481;Lo;0;L;;;;;N;;;;; +13482;EGYPTIAN HIEROGLYPH-13482;Lo;0;L;;;;;N;;;;; +13483;EGYPTIAN HIEROGLYPH-13483;Lo;0;L;;;;;N;;;;; +13484;EGYPTIAN HIEROGLYPH-13484;Lo;0;L;;;;;N;;;;; +13485;EGYPTIAN HIEROGLYPH-13485;Lo;0;L;;;;;N;;;;; +13486;EGYPTIAN HIEROGLYPH-13486;Lo;0;L;;;;;N;;;;; +13487;EGYPTIAN HIEROGLYPH-13487;Lo;0;L;;;;;N;;;;; +13488;EGYPTIAN HIEROGLYPH-13488;Lo;0;L;;;;;N;;;;; +13489;EGYPTIAN HIEROGLYPH-13489;Lo;0;L;;;;;N;;;;; +1348A;EGYPTIAN HIEROGLYPH-1348A;Lo;0;L;;;;;N;;;;; +1348B;EGYPTIAN HIEROGLYPH-1348B;Lo;0;L;;;;;N;;;;; +1348C;EGYPTIAN HIEROGLYPH-1348C;Lo;0;L;;;;;N;;;;; +1348D;EGYPTIAN HIEROGLYPH-1348D;Lo;0;L;;;;;N;;;;; +1348E;EGYPTIAN HIEROGLYPH-1348E;Lo;0;L;;;;;N;;;;; +1348F;EGYPTIAN HIEROGLYPH-1348F;Lo;0;L;;;;;N;;;;; +13490;EGYPTIAN HIEROGLYPH-13490;Lo;0;L;;;;;N;;;;; +13491;EGYPTIAN HIEROGLYPH-13491;Lo;0;L;;;;;N;;;;; +13492;EGYPTIAN HIEROGLYPH-13492;Lo;0;L;;;;;N;;;;; +13493;EGYPTIAN HIEROGLYPH-13493;Lo;0;L;;;;;N;;;;; +13494;EGYPTIAN HIEROGLYPH-13494;Lo;0;L;;;;;N;;;;; +13495;EGYPTIAN HIEROGLYPH-13495;Lo;0;L;;;;;N;;;;; +13496;EGYPTIAN HIEROGLYPH-13496;Lo;0;L;;;;;N;;;;; +13497;EGYPTIAN HIEROGLYPH-13497;Lo;0;L;;;;;N;;;;; +13498;EGYPTIAN HIEROGLYPH-13498;Lo;0;L;;;;;N;;;;; +13499;EGYPTIAN HIEROGLYPH-13499;Lo;0;L;;;;;N;;;;; +1349A;EGYPTIAN HIEROGLYPH-1349A;Lo;0;L;;;;;N;;;;; +1349B;EGYPTIAN HIEROGLYPH-1349B;Lo;0;L;;;;;N;;;;; +1349C;EGYPTIAN HIEROGLYPH-1349C;Lo;0;L;;;;;N;;;;; +1349D;EGYPTIAN HIEROGLYPH-1349D;Lo;0;L;;;;;N;;;;; +1349E;EGYPTIAN HIEROGLYPH-1349E;Lo;0;L;;;;;N;;;;; +1349F;EGYPTIAN HIEROGLYPH-1349F;Lo;0;L;;;;;N;;;;; +134A0;EGYPTIAN HIEROGLYPH-134A0;Lo;0;L;;;;;N;;;;; +134A1;EGYPTIAN HIEROGLYPH-134A1;Lo;0;L;;;;;N;;;;; +134A2;EGYPTIAN HIEROGLYPH-134A2;Lo;0;L;;;;;N;;;;; +134A3;EGYPTIAN HIEROGLYPH-134A3;Lo;0;L;;;;;N;;;;; +134A4;EGYPTIAN HIEROGLYPH-134A4;Lo;0;L;;;;;N;;;;; +134A5;EGYPTIAN HIEROGLYPH-134A5;Lo;0;L;;;;;N;;;;; +134A6;EGYPTIAN HIEROGLYPH-134A6;Lo;0;L;;;;;N;;;;; +134A7;EGYPTIAN HIEROGLYPH-134A7;Lo;0;L;;;;;N;;;;; +134A8;EGYPTIAN HIEROGLYPH-134A8;Lo;0;L;;;;;N;;;;; +134A9;EGYPTIAN HIEROGLYPH-134A9;Lo;0;L;;;;;N;;;;; +134AA;EGYPTIAN HIEROGLYPH-134AA;Lo;0;L;;;;;N;;;;; +134AB;EGYPTIAN HIEROGLYPH-134AB;Lo;0;L;;;;;N;;;;; +134AC;EGYPTIAN HIEROGLYPH-134AC;Lo;0;L;;;;;N;;;;; +134AD;EGYPTIAN HIEROGLYPH-134AD;Lo;0;L;;;;;N;;;;; +134AE;EGYPTIAN HIEROGLYPH-134AE;Lo;0;L;;;;;N;;;;; +134AF;EGYPTIAN HIEROGLYPH-134AF;Lo;0;L;;;;;N;;;;; +134B0;EGYPTIAN HIEROGLYPH-134B0;Lo;0;L;;;;;N;;;;; +134B1;EGYPTIAN HIEROGLYPH-134B1;Lo;0;L;;;;;N;;;;; +134B2;EGYPTIAN HIEROGLYPH-134B2;Lo;0;L;;;;;N;;;;; +134B3;EGYPTIAN HIEROGLYPH-134B3;Lo;0;L;;;;;N;;;;; +134B4;EGYPTIAN HIEROGLYPH-134B4;Lo;0;L;;;;;N;;;;; +134B5;EGYPTIAN HIEROGLYPH-134B5;Lo;0;L;;;;;N;;;;; +134B6;EGYPTIAN HIEROGLYPH-134B6;Lo;0;L;;;;;N;;;;; +134B7;EGYPTIAN HIEROGLYPH-134B7;Lo;0;L;;;;;N;;;;; +134B8;EGYPTIAN HIEROGLYPH-134B8;Lo;0;L;;;;;N;;;;; +134B9;EGYPTIAN HIEROGLYPH-134B9;Lo;0;L;;;;;N;;;;; +134BA;EGYPTIAN HIEROGLYPH-134BA;Lo;0;L;;;;;N;;;;; +134BB;EGYPTIAN HIEROGLYPH-134BB;Lo;0;L;;;;;N;;;;; +134BC;EGYPTIAN HIEROGLYPH-134BC;Lo;0;L;;;;;N;;;;; +134BD;EGYPTIAN HIEROGLYPH-134BD;Lo;0;L;;;;;N;;;;; +134BE;EGYPTIAN HIEROGLYPH-134BE;Lo;0;L;;;;;N;;;;; +134BF;EGYPTIAN HIEROGLYPH-134BF;Lo;0;L;;;;;N;;;;; +134C0;EGYPTIAN HIEROGLYPH-134C0;Lo;0;L;;;;;N;;;;; +134C1;EGYPTIAN HIEROGLYPH-134C1;Lo;0;L;;;;;N;;;;; +134C2;EGYPTIAN HIEROGLYPH-134C2;Lo;0;L;;;;;N;;;;; +134C3;EGYPTIAN HIEROGLYPH-134C3;Lo;0;L;;;;;N;;;;; +134C4;EGYPTIAN HIEROGLYPH-134C4;Lo;0;L;;;;;N;;;;; +134C5;EGYPTIAN HIEROGLYPH-134C5;Lo;0;L;;;;;N;;;;; +134C6;EGYPTIAN HIEROGLYPH-134C6;Lo;0;L;;;;;N;;;;; +134C7;EGYPTIAN HIEROGLYPH-134C7;Lo;0;L;;;;;N;;;;; +134C8;EGYPTIAN HIEROGLYPH-134C8;Lo;0;L;;;;;N;;;;; +134C9;EGYPTIAN HIEROGLYPH-134C9;Lo;0;L;;;;;N;;;;; +134CA;EGYPTIAN HIEROGLYPH-134CA;Lo;0;L;;;;;N;;;;; +134CB;EGYPTIAN HIEROGLYPH-134CB;Lo;0;L;;;;;N;;;;; +134CC;EGYPTIAN HIEROGLYPH-134CC;Lo;0;L;;;;;N;;;;; +134CD;EGYPTIAN HIEROGLYPH-134CD;Lo;0;L;;;;;N;;;;; +134CE;EGYPTIAN HIEROGLYPH-134CE;Lo;0;L;;;;;N;;;;; +134CF;EGYPTIAN HIEROGLYPH-134CF;Lo;0;L;;;;;N;;;;; +134D0;EGYPTIAN HIEROGLYPH-134D0;Lo;0;L;;;;;N;;;;; +134D1;EGYPTIAN HIEROGLYPH-134D1;Lo;0;L;;;;;N;;;;; +134D2;EGYPTIAN HIEROGLYPH-134D2;Lo;0;L;;;;;N;;;;; +134D3;EGYPTIAN HIEROGLYPH-134D3;Lo;0;L;;;;;N;;;;; +134D4;EGYPTIAN HIEROGLYPH-134D4;Lo;0;L;;;;;N;;;;; +134D5;EGYPTIAN HIEROGLYPH-134D5;Lo;0;L;;;;;N;;;;; +134D6;EGYPTIAN HIEROGLYPH-134D6;Lo;0;L;;;;;N;;;;; +134D7;EGYPTIAN HIEROGLYPH-134D7;Lo;0;L;;;;;N;;;;; +134D8;EGYPTIAN HIEROGLYPH-134D8;Lo;0;L;;;;;N;;;;; +134D9;EGYPTIAN HIEROGLYPH-134D9;Lo;0;L;;;;;N;;;;; +134DA;EGYPTIAN HIEROGLYPH-134DA;Lo;0;L;;;;;N;;;;; +134DB;EGYPTIAN HIEROGLYPH-134DB;Lo;0;L;;;;;N;;;;; +134DC;EGYPTIAN HIEROGLYPH-134DC;Lo;0;L;;;;;N;;;;; +134DD;EGYPTIAN HIEROGLYPH-134DD;Lo;0;L;;;;;N;;;;; +134DE;EGYPTIAN HIEROGLYPH-134DE;Lo;0;L;;;;;N;;;;; +134DF;EGYPTIAN HIEROGLYPH-134DF;Lo;0;L;;;;;N;;;;; +134E0;EGYPTIAN HIEROGLYPH-134E0;Lo;0;L;;;;;N;;;;; +134E1;EGYPTIAN HIEROGLYPH-134E1;Lo;0;L;;;;;N;;;;; +134E2;EGYPTIAN HIEROGLYPH-134E2;Lo;0;L;;;;;N;;;;; +134E3;EGYPTIAN HIEROGLYPH-134E3;Lo;0;L;;;;;N;;;;; +134E4;EGYPTIAN HIEROGLYPH-134E4;Lo;0;L;;;;;N;;;;; +134E5;EGYPTIAN HIEROGLYPH-134E5;Lo;0;L;;;;;N;;;;; +134E6;EGYPTIAN HIEROGLYPH-134E6;Lo;0;L;;;;;N;;;;; +134E7;EGYPTIAN HIEROGLYPH-134E7;Lo;0;L;;;;;N;;;;; +134E8;EGYPTIAN HIEROGLYPH-134E8;Lo;0;L;;;;;N;;;;; +134E9;EGYPTIAN HIEROGLYPH-134E9;Lo;0;L;;;;;N;;;;; +134EA;EGYPTIAN HIEROGLYPH-134EA;Lo;0;L;;;;;N;;;;; +134EB;EGYPTIAN HIEROGLYPH-134EB;Lo;0;L;;;;;N;;;;; +134EC;EGYPTIAN HIEROGLYPH-134EC;Lo;0;L;;;;;N;;;;; +134ED;EGYPTIAN HIEROGLYPH-134ED;Lo;0;L;;;;;N;;;;; +134EE;EGYPTIAN HIEROGLYPH-134EE;Lo;0;L;;;;;N;;;;; +134EF;EGYPTIAN HIEROGLYPH-134EF;Lo;0;L;;;;;N;;;;; +134F0;EGYPTIAN HIEROGLYPH-134F0;Lo;0;L;;;;;N;;;;; +134F1;EGYPTIAN HIEROGLYPH-134F1;Lo;0;L;;;;;N;;;;; +134F2;EGYPTIAN HIEROGLYPH-134F2;Lo;0;L;;;;;N;;;;; +134F3;EGYPTIAN HIEROGLYPH-134F3;Lo;0;L;;;;;N;;;;; +134F4;EGYPTIAN HIEROGLYPH-134F4;Lo;0;L;;;;;N;;;;; +134F5;EGYPTIAN HIEROGLYPH-134F5;Lo;0;L;;;;;N;;;;; +134F6;EGYPTIAN HIEROGLYPH-134F6;Lo;0;L;;;;;N;;;;; +134F7;EGYPTIAN HIEROGLYPH-134F7;Lo;0;L;;;;;N;;;;; +134F8;EGYPTIAN HIEROGLYPH-134F8;Lo;0;L;;;;;N;;;;; +134F9;EGYPTIAN HIEROGLYPH-134F9;Lo;0;L;;;;;N;;;;; +134FA;EGYPTIAN HIEROGLYPH-134FA;Lo;0;L;;;;;N;;;;; +134FB;EGYPTIAN HIEROGLYPH-134FB;Lo;0;L;;;;;N;;;;; +134FC;EGYPTIAN HIEROGLYPH-134FC;Lo;0;L;;;;;N;;;;; +134FD;EGYPTIAN HIEROGLYPH-134FD;Lo;0;L;;;;;N;;;;; +134FE;EGYPTIAN HIEROGLYPH-134FE;Lo;0;L;;;;;N;;;;; +134FF;EGYPTIAN HIEROGLYPH-134FF;Lo;0;L;;;;;N;;;;; +13500;EGYPTIAN HIEROGLYPH-13500;Lo;0;L;;;;;N;;;;; +13501;EGYPTIAN HIEROGLYPH-13501;Lo;0;L;;;;;N;;;;; +13502;EGYPTIAN HIEROGLYPH-13502;Lo;0;L;;;;;N;;;;; +13503;EGYPTIAN HIEROGLYPH-13503;Lo;0;L;;;;;N;;;;; +13504;EGYPTIAN HIEROGLYPH-13504;Lo;0;L;;;;;N;;;;; +13505;EGYPTIAN HIEROGLYPH-13505;Lo;0;L;;;;;N;;;;; +13506;EGYPTIAN HIEROGLYPH-13506;Lo;0;L;;;;;N;;;;; +13507;EGYPTIAN HIEROGLYPH-13507;Lo;0;L;;;;;N;;;;; +13508;EGYPTIAN HIEROGLYPH-13508;Lo;0;L;;;;;N;;;;; +13509;EGYPTIAN HIEROGLYPH-13509;Lo;0;L;;;;;N;;;;; +1350A;EGYPTIAN HIEROGLYPH-1350A;Lo;0;L;;;;;N;;;;; +1350B;EGYPTIAN HIEROGLYPH-1350B;Lo;0;L;;;;;N;;;;; +1350C;EGYPTIAN HIEROGLYPH-1350C;Lo;0;L;;;;;N;;;;; +1350D;EGYPTIAN HIEROGLYPH-1350D;Lo;0;L;;;;;N;;;;; +1350E;EGYPTIAN HIEROGLYPH-1350E;Lo;0;L;;;;;N;;;;; +1350F;EGYPTIAN HIEROGLYPH-1350F;Lo;0;L;;;;;N;;;;; +13510;EGYPTIAN HIEROGLYPH-13510;Lo;0;L;;;;;N;;;;; +13511;EGYPTIAN HIEROGLYPH-13511;Lo;0;L;;;;;N;;;;; +13512;EGYPTIAN HIEROGLYPH-13512;Lo;0;L;;;;;N;;;;; +13513;EGYPTIAN HIEROGLYPH-13513;Lo;0;L;;;;;N;;;;; +13514;EGYPTIAN HIEROGLYPH-13514;Lo;0;L;;;;;N;;;;; +13515;EGYPTIAN HIEROGLYPH-13515;Lo;0;L;;;;;N;;;;; +13516;EGYPTIAN HIEROGLYPH-13516;Lo;0;L;;;;;N;;;;; +13517;EGYPTIAN HIEROGLYPH-13517;Lo;0;L;;;;;N;;;;; +13518;EGYPTIAN HIEROGLYPH-13518;Lo;0;L;;;;;N;;;;; +13519;EGYPTIAN HIEROGLYPH-13519;Lo;0;L;;;;;N;;;;; +1351A;EGYPTIAN HIEROGLYPH-1351A;Lo;0;L;;;;;N;;;;; +1351B;EGYPTIAN HIEROGLYPH-1351B;Lo;0;L;;;;;N;;;;; +1351C;EGYPTIAN HIEROGLYPH-1351C;Lo;0;L;;;;;N;;;;; +1351D;EGYPTIAN HIEROGLYPH-1351D;Lo;0;L;;;;;N;;;;; +1351E;EGYPTIAN HIEROGLYPH-1351E;Lo;0;L;;;;;N;;;;; +1351F;EGYPTIAN HIEROGLYPH-1351F;Lo;0;L;;;;;N;;;;; +13520;EGYPTIAN HIEROGLYPH-13520;Lo;0;L;;;;;N;;;;; +13521;EGYPTIAN HIEROGLYPH-13521;Lo;0;L;;;;;N;;;;; +13522;EGYPTIAN HIEROGLYPH-13522;Lo;0;L;;;;;N;;;;; +13523;EGYPTIAN HIEROGLYPH-13523;Lo;0;L;;;;;N;;;;; +13524;EGYPTIAN HIEROGLYPH-13524;Lo;0;L;;;;;N;;;;; +13525;EGYPTIAN HIEROGLYPH-13525;Lo;0;L;;;;;N;;;;; +13526;EGYPTIAN HIEROGLYPH-13526;Lo;0;L;;;;;N;;;;; +13527;EGYPTIAN HIEROGLYPH-13527;Lo;0;L;;;;;N;;;;; +13528;EGYPTIAN HIEROGLYPH-13528;Lo;0;L;;;;;N;;;;; +13529;EGYPTIAN HIEROGLYPH-13529;Lo;0;L;;;;;N;;;;; +1352A;EGYPTIAN HIEROGLYPH-1352A;Lo;0;L;;;;;N;;;;; +1352B;EGYPTIAN HIEROGLYPH-1352B;Lo;0;L;;;;;N;;;;; +1352C;EGYPTIAN HIEROGLYPH-1352C;Lo;0;L;;;;;N;;;;; +1352D;EGYPTIAN HIEROGLYPH-1352D;Lo;0;L;;;;;N;;;;; +1352E;EGYPTIAN HIEROGLYPH-1352E;Lo;0;L;;;;;N;;;;; +1352F;EGYPTIAN HIEROGLYPH-1352F;Lo;0;L;;;;;N;;;;; +13530;EGYPTIAN HIEROGLYPH-13530;Lo;0;L;;;;;N;;;;; +13531;EGYPTIAN HIEROGLYPH-13531;Lo;0;L;;;;;N;;;;; +13532;EGYPTIAN HIEROGLYPH-13532;Lo;0;L;;;;;N;;;;; +13533;EGYPTIAN HIEROGLYPH-13533;Lo;0;L;;;;;N;;;;; +13534;EGYPTIAN HIEROGLYPH-13534;Lo;0;L;;;;;N;;;;; +13535;EGYPTIAN HIEROGLYPH-13535;Lo;0;L;;;;;N;;;;; +13536;EGYPTIAN HIEROGLYPH-13536;Lo;0;L;;;;;N;;;;; +13537;EGYPTIAN HIEROGLYPH-13537;Lo;0;L;;;;;N;;;;; +13538;EGYPTIAN HIEROGLYPH-13538;Lo;0;L;;;;;N;;;;; +13539;EGYPTIAN HIEROGLYPH-13539;Lo;0;L;;;;;N;;;;; +1353A;EGYPTIAN HIEROGLYPH-1353A;Lo;0;L;;;;;N;;;;; +1353B;EGYPTIAN HIEROGLYPH-1353B;Lo;0;L;;;;;N;;;;; +1353C;EGYPTIAN HIEROGLYPH-1353C;Lo;0;L;;;;;N;;;;; +1353D;EGYPTIAN HIEROGLYPH-1353D;Lo;0;L;;;;;N;;;;; +1353E;EGYPTIAN HIEROGLYPH-1353E;Lo;0;L;;;;;N;;;;; +1353F;EGYPTIAN HIEROGLYPH-1353F;Lo;0;L;;;;;N;;;;; +13540;EGYPTIAN HIEROGLYPH-13540;Lo;0;L;;;;;N;;;;; +13541;EGYPTIAN HIEROGLYPH-13541;Lo;0;L;;;;;N;;;;; +13542;EGYPTIAN HIEROGLYPH-13542;Lo;0;L;;;;;N;;;;; +13543;EGYPTIAN HIEROGLYPH-13543;Lo;0;L;;;;;N;;;;; +13544;EGYPTIAN HIEROGLYPH-13544;Lo;0;L;;;;;N;;;;; +13545;EGYPTIAN HIEROGLYPH-13545;Lo;0;L;;;;;N;;;;; +13546;EGYPTIAN HIEROGLYPH-13546;Lo;0;L;;;;;N;;;;; +13547;EGYPTIAN HIEROGLYPH-13547;Lo;0;L;;;;;N;;;;; +13548;EGYPTIAN HIEROGLYPH-13548;Lo;0;L;;;;;N;;;;; +13549;EGYPTIAN HIEROGLYPH-13549;Lo;0;L;;;;;N;;;;; +1354A;EGYPTIAN HIEROGLYPH-1354A;Lo;0;L;;;;;N;;;;; +1354B;EGYPTIAN HIEROGLYPH-1354B;Lo;0;L;;;;;N;;;;; +1354C;EGYPTIAN HIEROGLYPH-1354C;Lo;0;L;;;;;N;;;;; +1354D;EGYPTIAN HIEROGLYPH-1354D;Lo;0;L;;;;;N;;;;; +1354E;EGYPTIAN HIEROGLYPH-1354E;Lo;0;L;;;;;N;;;;; +1354F;EGYPTIAN HIEROGLYPH-1354F;Lo;0;L;;;;;N;;;;; +13550;EGYPTIAN HIEROGLYPH-13550;Lo;0;L;;;;;N;;;;; +13551;EGYPTIAN HIEROGLYPH-13551;Lo;0;L;;;;;N;;;;; +13552;EGYPTIAN HIEROGLYPH-13552;Lo;0;L;;;;;N;;;;; +13553;EGYPTIAN HIEROGLYPH-13553;Lo;0;L;;;;;N;;;;; +13554;EGYPTIAN HIEROGLYPH-13554;Lo;0;L;;;;;N;;;;; +13555;EGYPTIAN HIEROGLYPH-13555;Lo;0;L;;;;;N;;;;; +13556;EGYPTIAN HIEROGLYPH-13556;Lo;0;L;;;;;N;;;;; +13557;EGYPTIAN HIEROGLYPH-13557;Lo;0;L;;;;;N;;;;; +13558;EGYPTIAN HIEROGLYPH-13558;Lo;0;L;;;;;N;;;;; +13559;EGYPTIAN HIEROGLYPH-13559;Lo;0;L;;;;;N;;;;; +1355A;EGYPTIAN HIEROGLYPH-1355A;Lo;0;L;;;;;N;;;;; +1355B;EGYPTIAN HIEROGLYPH-1355B;Lo;0;L;;;;;N;;;;; +1355C;EGYPTIAN HIEROGLYPH-1355C;Lo;0;L;;;;;N;;;;; +1355D;EGYPTIAN HIEROGLYPH-1355D;Lo;0;L;;;;;N;;;;; +1355E;EGYPTIAN HIEROGLYPH-1355E;Lo;0;L;;;;;N;;;;; +1355F;EGYPTIAN HIEROGLYPH-1355F;Lo;0;L;;;;;N;;;;; +13560;EGYPTIAN HIEROGLYPH-13560;Lo;0;L;;;;;N;;;;; +13561;EGYPTIAN HIEROGLYPH-13561;Lo;0;L;;;;;N;;;;; +13562;EGYPTIAN HIEROGLYPH-13562;Lo;0;L;;;;;N;;;;; +13563;EGYPTIAN HIEROGLYPH-13563;Lo;0;L;;;;;N;;;;; +13564;EGYPTIAN HIEROGLYPH-13564;Lo;0;L;;;;;N;;;;; +13565;EGYPTIAN HIEROGLYPH-13565;Lo;0;L;;;;;N;;;;; +13566;EGYPTIAN HIEROGLYPH-13566;Lo;0;L;;;;;N;;;;; +13567;EGYPTIAN HIEROGLYPH-13567;Lo;0;L;;;;;N;;;;; +13568;EGYPTIAN HIEROGLYPH-13568;Lo;0;L;;;;;N;;;;; +13569;EGYPTIAN HIEROGLYPH-13569;Lo;0;L;;;;;N;;;;; +1356A;EGYPTIAN HIEROGLYPH-1356A;Lo;0;L;;;;;N;;;;; +1356B;EGYPTIAN HIEROGLYPH-1356B;Lo;0;L;;;;;N;;;;; +1356C;EGYPTIAN HIEROGLYPH-1356C;Lo;0;L;;;;;N;;;;; +1356D;EGYPTIAN HIEROGLYPH-1356D;Lo;0;L;;;;;N;;;;; +1356E;EGYPTIAN HIEROGLYPH-1356E;Lo;0;L;;;;;N;;;;; +1356F;EGYPTIAN HIEROGLYPH-1356F;Lo;0;L;;;;;N;;;;; +13570;EGYPTIAN HIEROGLYPH-13570;Lo;0;L;;;;;N;;;;; +13571;EGYPTIAN HIEROGLYPH-13571;Lo;0;L;;;;;N;;;;; +13572;EGYPTIAN HIEROGLYPH-13572;Lo;0;L;;;;;N;;;;; +13573;EGYPTIAN HIEROGLYPH-13573;Lo;0;L;;;;;N;;;;; +13574;EGYPTIAN HIEROGLYPH-13574;Lo;0;L;;;;;N;;;;; +13575;EGYPTIAN HIEROGLYPH-13575;Lo;0;L;;;;;N;;;;; +13576;EGYPTIAN HIEROGLYPH-13576;Lo;0;L;;;;;N;;;;; +13577;EGYPTIAN HIEROGLYPH-13577;Lo;0;L;;;;;N;;;;; +13578;EGYPTIAN HIEROGLYPH-13578;Lo;0;L;;;;;N;;;;; +13579;EGYPTIAN HIEROGLYPH-13579;Lo;0;L;;;;;N;;;;; +1357A;EGYPTIAN HIEROGLYPH-1357A;Lo;0;L;;;;;N;;;;; +1357B;EGYPTIAN HIEROGLYPH-1357B;Lo;0;L;;;;;N;;;;; +1357C;EGYPTIAN HIEROGLYPH-1357C;Lo;0;L;;;;;N;;;;; +1357D;EGYPTIAN HIEROGLYPH-1357D;Lo;0;L;;;;;N;;;;; +1357E;EGYPTIAN HIEROGLYPH-1357E;Lo;0;L;;;;;N;;;;; +1357F;EGYPTIAN HIEROGLYPH-1357F;Lo;0;L;;;;;N;;;;; +13580;EGYPTIAN HIEROGLYPH-13580;Lo;0;L;;;;;N;;;;; +13581;EGYPTIAN HIEROGLYPH-13581;Lo;0;L;;;;;N;;;;; +13582;EGYPTIAN HIEROGLYPH-13582;Lo;0;L;;;;;N;;;;; +13583;EGYPTIAN HIEROGLYPH-13583;Lo;0;L;;;;;N;;;;; +13584;EGYPTIAN HIEROGLYPH-13584;Lo;0;L;;;;;N;;;;; +13585;EGYPTIAN HIEROGLYPH-13585;Lo;0;L;;;;;N;;;;; +13586;EGYPTIAN HIEROGLYPH-13586;Lo;0;L;;;;;N;;;;; +13587;EGYPTIAN HIEROGLYPH-13587;Lo;0;L;;;;;N;;;;; +13588;EGYPTIAN HIEROGLYPH-13588;Lo;0;L;;;;;N;;;;; +13589;EGYPTIAN HIEROGLYPH-13589;Lo;0;L;;;;;N;;;;; +1358A;EGYPTIAN HIEROGLYPH-1358A;Lo;0;L;;;;;N;;;;; +1358B;EGYPTIAN HIEROGLYPH-1358B;Lo;0;L;;;;;N;;;;; +1358C;EGYPTIAN HIEROGLYPH-1358C;Lo;0;L;;;;;N;;;;; +1358D;EGYPTIAN HIEROGLYPH-1358D;Lo;0;L;;;;;N;;;;; +1358E;EGYPTIAN HIEROGLYPH-1358E;Lo;0;L;;;;;N;;;;; +1358F;EGYPTIAN HIEROGLYPH-1358F;Lo;0;L;;;;;N;;;;; +13590;EGYPTIAN HIEROGLYPH-13590;Lo;0;L;;;;;N;;;;; +13591;EGYPTIAN HIEROGLYPH-13591;Lo;0;L;;;;;N;;;;; +13592;EGYPTIAN HIEROGLYPH-13592;Lo;0;L;;;;;N;;;;; +13593;EGYPTIAN HIEROGLYPH-13593;Lo;0;L;;;;;N;;;;; +13594;EGYPTIAN HIEROGLYPH-13594;Lo;0;L;;;;;N;;;;; +13595;EGYPTIAN HIEROGLYPH-13595;Lo;0;L;;;;;N;;;;; +13596;EGYPTIAN HIEROGLYPH-13596;Lo;0;L;;;;;N;;;;; +13597;EGYPTIAN HIEROGLYPH-13597;Lo;0;L;;;;;N;;;;; +13598;EGYPTIAN HIEROGLYPH-13598;Lo;0;L;;;;;N;;;;; +13599;EGYPTIAN HIEROGLYPH-13599;Lo;0;L;;;;;N;;;;; +1359A;EGYPTIAN HIEROGLYPH-1359A;Lo;0;L;;;;;N;;;;; +1359B;EGYPTIAN HIEROGLYPH-1359B;Lo;0;L;;;;;N;;;;; +1359C;EGYPTIAN HIEROGLYPH-1359C;Lo;0;L;;;;;N;;;;; +1359D;EGYPTIAN HIEROGLYPH-1359D;Lo;0;L;;;;;N;;;;; +1359E;EGYPTIAN HIEROGLYPH-1359E;Lo;0;L;;;;;N;;;;; +1359F;EGYPTIAN HIEROGLYPH-1359F;Lo;0;L;;;;;N;;;;; +135A0;EGYPTIAN HIEROGLYPH-135A0;Lo;0;L;;;;;N;;;;; +135A1;EGYPTIAN HIEROGLYPH-135A1;Lo;0;L;;;;;N;;;;; +135A2;EGYPTIAN HIEROGLYPH-135A2;Lo;0;L;;;;;N;;;;; +135A3;EGYPTIAN HIEROGLYPH-135A3;Lo;0;L;;;;;N;;;;; +135A4;EGYPTIAN HIEROGLYPH-135A4;Lo;0;L;;;;;N;;;;; +135A5;EGYPTIAN HIEROGLYPH-135A5;Lo;0;L;;;;;N;;;;; +135A6;EGYPTIAN HIEROGLYPH-135A6;Lo;0;L;;;;;N;;;;; +135A7;EGYPTIAN HIEROGLYPH-135A7;Lo;0;L;;;;;N;;;;; +135A8;EGYPTIAN HIEROGLYPH-135A8;Lo;0;L;;;;;N;;;;; +135A9;EGYPTIAN HIEROGLYPH-135A9;Lo;0;L;;;;;N;;;;; +135AA;EGYPTIAN HIEROGLYPH-135AA;Lo;0;L;;;;;N;;;;; +135AB;EGYPTIAN HIEROGLYPH-135AB;Lo;0;L;;;;;N;;;;; +135AC;EGYPTIAN HIEROGLYPH-135AC;Lo;0;L;;;;;N;;;;; +135AD;EGYPTIAN HIEROGLYPH-135AD;Lo;0;L;;;;;N;;;;; +135AE;EGYPTIAN HIEROGLYPH-135AE;Lo;0;L;;;;;N;;;;; +135AF;EGYPTIAN HIEROGLYPH-135AF;Lo;0;L;;;;;N;;;;; +135B0;EGYPTIAN HIEROGLYPH-135B0;Lo;0;L;;;;;N;;;;; +135B1;EGYPTIAN HIEROGLYPH-135B1;Lo;0;L;;;;;N;;;;; +135B2;EGYPTIAN HIEROGLYPH-135B2;Lo;0;L;;;;;N;;;;; +135B3;EGYPTIAN HIEROGLYPH-135B3;Lo;0;L;;;;;N;;;;; +135B4;EGYPTIAN HIEROGLYPH-135B4;Lo;0;L;;;;;N;;;;; +135B5;EGYPTIAN HIEROGLYPH-135B5;Lo;0;L;;;;;N;;;;; +135B6;EGYPTIAN HIEROGLYPH-135B6;Lo;0;L;;;;;N;;;;; +135B7;EGYPTIAN HIEROGLYPH-135B7;Lo;0;L;;;;;N;;;;; +135B8;EGYPTIAN HIEROGLYPH-135B8;Lo;0;L;;;;;N;;;;; +135B9;EGYPTIAN HIEROGLYPH-135B9;Lo;0;L;;;;;N;;;;; +135BA;EGYPTIAN HIEROGLYPH-135BA;Lo;0;L;;;;;N;;;;; +135BB;EGYPTIAN HIEROGLYPH-135BB;Lo;0;L;;;;;N;;;;; +135BC;EGYPTIAN HIEROGLYPH-135BC;Lo;0;L;;;;;N;;;;; +135BD;EGYPTIAN HIEROGLYPH-135BD;Lo;0;L;;;;;N;;;;; +135BE;EGYPTIAN HIEROGLYPH-135BE;Lo;0;L;;;;;N;;;;; +135BF;EGYPTIAN HIEROGLYPH-135BF;Lo;0;L;;;;;N;;;;; +135C0;EGYPTIAN HIEROGLYPH-135C0;Lo;0;L;;;;;N;;;;; +135C1;EGYPTIAN HIEROGLYPH-135C1;Lo;0;L;;;;;N;;;;; +135C2;EGYPTIAN HIEROGLYPH-135C2;Lo;0;L;;;;;N;;;;; +135C3;EGYPTIAN HIEROGLYPH-135C3;Lo;0;L;;;;;N;;;;; +135C4;EGYPTIAN HIEROGLYPH-135C4;Lo;0;L;;;;;N;;;;; +135C5;EGYPTIAN HIEROGLYPH-135C5;Lo;0;L;;;;;N;;;;; +135C6;EGYPTIAN HIEROGLYPH-135C6;Lo;0;L;;;;;N;;;;; +135C7;EGYPTIAN HIEROGLYPH-135C7;Lo;0;L;;;;;N;;;;; +135C8;EGYPTIAN HIEROGLYPH-135C8;Lo;0;L;;;;;N;;;;; +135C9;EGYPTIAN HIEROGLYPH-135C9;Lo;0;L;;;;;N;;;;; +135CA;EGYPTIAN HIEROGLYPH-135CA;Lo;0;L;;;;;N;;;;; +135CB;EGYPTIAN HIEROGLYPH-135CB;Lo;0;L;;;;;N;;;;; +135CC;EGYPTIAN HIEROGLYPH-135CC;Lo;0;L;;;;;N;;;;; +135CD;EGYPTIAN HIEROGLYPH-135CD;Lo;0;L;;;;;N;;;;; +135CE;EGYPTIAN HIEROGLYPH-135CE;Lo;0;L;;;;;N;;;;; +135CF;EGYPTIAN HIEROGLYPH-135CF;Lo;0;L;;;;;N;;;;; +135D0;EGYPTIAN HIEROGLYPH-135D0;Lo;0;L;;;;;N;;;;; +135D1;EGYPTIAN HIEROGLYPH-135D1;Lo;0;L;;;;;N;;;;; +135D2;EGYPTIAN HIEROGLYPH-135D2;Lo;0;L;;;;;N;;;;; +135D3;EGYPTIAN HIEROGLYPH-135D3;Lo;0;L;;;;;N;;;;; +135D4;EGYPTIAN HIEROGLYPH-135D4;Lo;0;L;;;;;N;;;;; +135D5;EGYPTIAN HIEROGLYPH-135D5;Lo;0;L;;;;;N;;;;; +135D6;EGYPTIAN HIEROGLYPH-135D6;Lo;0;L;;;;;N;;;;; +135D7;EGYPTIAN HIEROGLYPH-135D7;Lo;0;L;;;;;N;;;;; +135D8;EGYPTIAN HIEROGLYPH-135D8;Lo;0;L;;;;;N;;;;; +135D9;EGYPTIAN HIEROGLYPH-135D9;Lo;0;L;;;;;N;;;;; +135DA;EGYPTIAN HIEROGLYPH-135DA;Lo;0;L;;;;;N;;;;; +135DB;EGYPTIAN HIEROGLYPH-135DB;Lo;0;L;;;;;N;;;;; +135DC;EGYPTIAN HIEROGLYPH-135DC;Lo;0;L;;;;;N;;;;; +135DD;EGYPTIAN HIEROGLYPH-135DD;Lo;0;L;;;;;N;;;;; +135DE;EGYPTIAN HIEROGLYPH-135DE;Lo;0;L;;;;;N;;;;; +135DF;EGYPTIAN HIEROGLYPH-135DF;Lo;0;L;;;;;N;;;;; +135E0;EGYPTIAN HIEROGLYPH-135E0;Lo;0;L;;;;;N;;;;; +135E1;EGYPTIAN HIEROGLYPH-135E1;Lo;0;L;;;;;N;;;;; +135E2;EGYPTIAN HIEROGLYPH-135E2;Lo;0;L;;;;;N;;;;; +135E3;EGYPTIAN HIEROGLYPH-135E3;Lo;0;L;;;;;N;;;;; +135E4;EGYPTIAN HIEROGLYPH-135E4;Lo;0;L;;;;;N;;;;; +135E5;EGYPTIAN HIEROGLYPH-135E5;Lo;0;L;;;;;N;;;;; +135E6;EGYPTIAN HIEROGLYPH-135E6;Lo;0;L;;;;;N;;;;; +135E7;EGYPTIAN HIEROGLYPH-135E7;Lo;0;L;;;;;N;;;;; +135E8;EGYPTIAN HIEROGLYPH-135E8;Lo;0;L;;;;;N;;;;; +135E9;EGYPTIAN HIEROGLYPH-135E9;Lo;0;L;;;;;N;;;;; +135EA;EGYPTIAN HIEROGLYPH-135EA;Lo;0;L;;;;;N;;;;; +135EB;EGYPTIAN HIEROGLYPH-135EB;Lo;0;L;;;;;N;;;;; +135EC;EGYPTIAN HIEROGLYPH-135EC;Lo;0;L;;;;;N;;;;; +135ED;EGYPTIAN HIEROGLYPH-135ED;Lo;0;L;;;;;N;;;;; +135EE;EGYPTIAN HIEROGLYPH-135EE;Lo;0;L;;;;;N;;;;; +135EF;EGYPTIAN HIEROGLYPH-135EF;Lo;0;L;;;;;N;;;;; +135F0;EGYPTIAN HIEROGLYPH-135F0;Lo;0;L;;;;;N;;;;; +135F1;EGYPTIAN HIEROGLYPH-135F1;Lo;0;L;;;;;N;;;;; +135F2;EGYPTIAN HIEROGLYPH-135F2;Lo;0;L;;;;;N;;;;; +135F3;EGYPTIAN HIEROGLYPH-135F3;Lo;0;L;;;;;N;;;;; +135F4;EGYPTIAN HIEROGLYPH-135F4;Lo;0;L;;;;;N;;;;; +135F5;EGYPTIAN HIEROGLYPH-135F5;Lo;0;L;;;;;N;;;;; +135F6;EGYPTIAN HIEROGLYPH-135F6;Lo;0;L;;;;;N;;;;; +135F7;EGYPTIAN HIEROGLYPH-135F7;Lo;0;L;;;;;N;;;;; +135F8;EGYPTIAN HIEROGLYPH-135F8;Lo;0;L;;;;;N;;;;; +135F9;EGYPTIAN HIEROGLYPH-135F9;Lo;0;L;;;;;N;;;;; +135FA;EGYPTIAN HIEROGLYPH-135FA;Lo;0;L;;;;;N;;;;; +135FB;EGYPTIAN HIEROGLYPH-135FB;Lo;0;L;;;;;N;;;;; +135FC;EGYPTIAN HIEROGLYPH-135FC;Lo;0;L;;;;;N;;;;; +135FD;EGYPTIAN HIEROGLYPH-135FD;Lo;0;L;;;;;N;;;;; +135FE;EGYPTIAN HIEROGLYPH-135FE;Lo;0;L;;;;;N;;;;; +135FF;EGYPTIAN HIEROGLYPH-135FF;Lo;0;L;;;;;N;;;;; +13600;EGYPTIAN HIEROGLYPH-13600;Lo;0;L;;;;;N;;;;; +13601;EGYPTIAN HIEROGLYPH-13601;Lo;0;L;;;;;N;;;;; +13602;EGYPTIAN HIEROGLYPH-13602;Lo;0;L;;;;;N;;;;; +13603;EGYPTIAN HIEROGLYPH-13603;Lo;0;L;;;;;N;;;;; +13604;EGYPTIAN HIEROGLYPH-13604;Lo;0;L;;;;;N;;;;; +13605;EGYPTIAN HIEROGLYPH-13605;Lo;0;L;;;;;N;;;;; +13606;EGYPTIAN HIEROGLYPH-13606;Lo;0;L;;;;;N;;;;; +13607;EGYPTIAN HIEROGLYPH-13607;Lo;0;L;;;;;N;;;;; +13608;EGYPTIAN HIEROGLYPH-13608;Lo;0;L;;;;;N;;;;; +13609;EGYPTIAN HIEROGLYPH-13609;Lo;0;L;;;;;N;;;;; +1360A;EGYPTIAN HIEROGLYPH-1360A;Lo;0;L;;;;;N;;;;; +1360B;EGYPTIAN HIEROGLYPH-1360B;Lo;0;L;;;;;N;;;;; +1360C;EGYPTIAN HIEROGLYPH-1360C;Lo;0;L;;;;;N;;;;; +1360D;EGYPTIAN HIEROGLYPH-1360D;Lo;0;L;;;;;N;;;;; +1360E;EGYPTIAN HIEROGLYPH-1360E;Lo;0;L;;;;;N;;;;; +1360F;EGYPTIAN HIEROGLYPH-1360F;Lo;0;L;;;;;N;;;;; +13610;EGYPTIAN HIEROGLYPH-13610;Lo;0;L;;;;;N;;;;; +13611;EGYPTIAN HIEROGLYPH-13611;Lo;0;L;;;;;N;;;;; +13612;EGYPTIAN HIEROGLYPH-13612;Lo;0;L;;;;;N;;;;; +13613;EGYPTIAN HIEROGLYPH-13613;Lo;0;L;;;;;N;;;;; +13614;EGYPTIAN HIEROGLYPH-13614;Lo;0;L;;;;;N;;;;; +13615;EGYPTIAN HIEROGLYPH-13615;Lo;0;L;;;;;N;;;;; +13616;EGYPTIAN HIEROGLYPH-13616;Lo;0;L;;;;;N;;;;; +13617;EGYPTIAN HIEROGLYPH-13617;Lo;0;L;;;;;N;;;;; +13618;EGYPTIAN HIEROGLYPH-13618;Lo;0;L;;;;;N;;;;; +13619;EGYPTIAN HIEROGLYPH-13619;Lo;0;L;;;;;N;;;;; +1361A;EGYPTIAN HIEROGLYPH-1361A;Lo;0;L;;;;;N;;;;; +1361B;EGYPTIAN HIEROGLYPH-1361B;Lo;0;L;;;;;N;;;;; +1361C;EGYPTIAN HIEROGLYPH-1361C;Lo;0;L;;;;;N;;;;; +1361D;EGYPTIAN HIEROGLYPH-1361D;Lo;0;L;;;;;N;;;;; +1361E;EGYPTIAN HIEROGLYPH-1361E;Lo;0;L;;;;;N;;;;; +1361F;EGYPTIAN HIEROGLYPH-1361F;Lo;0;L;;;;;N;;;;; +13620;EGYPTIAN HIEROGLYPH-13620;Lo;0;L;;;;;N;;;;; +13621;EGYPTIAN HIEROGLYPH-13621;Lo;0;L;;;;;N;;;;; +13622;EGYPTIAN HIEROGLYPH-13622;Lo;0;L;;;;;N;;;;; +13623;EGYPTIAN HIEROGLYPH-13623;Lo;0;L;;;;;N;;;;; +13624;EGYPTIAN HIEROGLYPH-13624;Lo;0;L;;;;;N;;;;; +13625;EGYPTIAN HIEROGLYPH-13625;Lo;0;L;;;;;N;;;;; +13626;EGYPTIAN HIEROGLYPH-13626;Lo;0;L;;;;;N;;;;; +13627;EGYPTIAN HIEROGLYPH-13627;Lo;0;L;;;;;N;;;;; +13628;EGYPTIAN HIEROGLYPH-13628;Lo;0;L;;;;;N;;;;; +13629;EGYPTIAN HIEROGLYPH-13629;Lo;0;L;;;;;N;;;;; +1362A;EGYPTIAN HIEROGLYPH-1362A;Lo;0;L;;;;;N;;;;; +1362B;EGYPTIAN HIEROGLYPH-1362B;Lo;0;L;;;;;N;;;;; +1362C;EGYPTIAN HIEROGLYPH-1362C;Lo;0;L;;;;;N;;;;; +1362D;EGYPTIAN HIEROGLYPH-1362D;Lo;0;L;;;;;N;;;;; +1362E;EGYPTIAN HIEROGLYPH-1362E;Lo;0;L;;;;;N;;;;; +1362F;EGYPTIAN HIEROGLYPH-1362F;Lo;0;L;;;;;N;;;;; +13630;EGYPTIAN HIEROGLYPH-13630;Lo;0;L;;;;;N;;;;; +13631;EGYPTIAN HIEROGLYPH-13631;Lo;0;L;;;;;N;;;;; +13632;EGYPTIAN HIEROGLYPH-13632;Lo;0;L;;;;;N;;;;; +13633;EGYPTIAN HIEROGLYPH-13633;Lo;0;L;;;;;N;;;;; +13634;EGYPTIAN HIEROGLYPH-13634;Lo;0;L;;;;;N;;;;; +13635;EGYPTIAN HIEROGLYPH-13635;Lo;0;L;;;;;N;;;;; +13636;EGYPTIAN HIEROGLYPH-13636;Lo;0;L;;;;;N;;;;; +13637;EGYPTIAN HIEROGLYPH-13637;Lo;0;L;;;;;N;;;;; +13638;EGYPTIAN HIEROGLYPH-13638;Lo;0;L;;;;;N;;;;; +13639;EGYPTIAN HIEROGLYPH-13639;Lo;0;L;;;;;N;;;;; +1363A;EGYPTIAN HIEROGLYPH-1363A;Lo;0;L;;;;;N;;;;; +1363B;EGYPTIAN HIEROGLYPH-1363B;Lo;0;L;;;;;N;;;;; +1363C;EGYPTIAN HIEROGLYPH-1363C;Lo;0;L;;;;;N;;;;; +1363D;EGYPTIAN HIEROGLYPH-1363D;Lo;0;L;;;;;N;;;;; +1363E;EGYPTIAN HIEROGLYPH-1363E;Lo;0;L;;;;;N;;;;; +1363F;EGYPTIAN HIEROGLYPH-1363F;Lo;0;L;;;;;N;;;;; +13640;EGYPTIAN HIEROGLYPH-13640;Lo;0;L;;;;;N;;;;; +13641;EGYPTIAN HIEROGLYPH-13641;Lo;0;L;;;;;N;;;;; +13642;EGYPTIAN HIEROGLYPH-13642;Lo;0;L;;;;;N;;;;; +13643;EGYPTIAN HIEROGLYPH-13643;Lo;0;L;;;;;N;;;;; +13644;EGYPTIAN HIEROGLYPH-13644;Lo;0;L;;;;;N;;;;; +13645;EGYPTIAN HIEROGLYPH-13645;Lo;0;L;;;;;N;;;;; +13646;EGYPTIAN HIEROGLYPH-13646;Lo;0;L;;;;;N;;;;; +13647;EGYPTIAN HIEROGLYPH-13647;Lo;0;L;;;;;N;;;;; +13648;EGYPTIAN HIEROGLYPH-13648;Lo;0;L;;;;;N;;;;; +13649;EGYPTIAN HIEROGLYPH-13649;Lo;0;L;;;;;N;;;;; +1364A;EGYPTIAN HIEROGLYPH-1364A;Lo;0;L;;;;;N;;;;; +1364B;EGYPTIAN HIEROGLYPH-1364B;Lo;0;L;;;;;N;;;;; +1364C;EGYPTIAN HIEROGLYPH-1364C;Lo;0;L;;;;;N;;;;; +1364D;EGYPTIAN HIEROGLYPH-1364D;Lo;0;L;;;;;N;;;;; +1364E;EGYPTIAN HIEROGLYPH-1364E;Lo;0;L;;;;;N;;;;; +1364F;EGYPTIAN HIEROGLYPH-1364F;Lo;0;L;;;;;N;;;;; +13650;EGYPTIAN HIEROGLYPH-13650;Lo;0;L;;;;;N;;;;; +13651;EGYPTIAN HIEROGLYPH-13651;Lo;0;L;;;;;N;;;;; +13652;EGYPTIAN HIEROGLYPH-13652;Lo;0;L;;;;;N;;;;; +13653;EGYPTIAN HIEROGLYPH-13653;Lo;0;L;;;;;N;;;;; +13654;EGYPTIAN HIEROGLYPH-13654;Lo;0;L;;;;;N;;;;; +13655;EGYPTIAN HIEROGLYPH-13655;Lo;0;L;;;;;N;;;;; +13656;EGYPTIAN HIEROGLYPH-13656;Lo;0;L;;;;;N;;;;; +13657;EGYPTIAN HIEROGLYPH-13657;Lo;0;L;;;;;N;;;;; +13658;EGYPTIAN HIEROGLYPH-13658;Lo;0;L;;;;;N;;;;; +13659;EGYPTIAN HIEROGLYPH-13659;Lo;0;L;;;;;N;;;;; +1365A;EGYPTIAN HIEROGLYPH-1365A;Lo;0;L;;;;;N;;;;; +1365B;EGYPTIAN HIEROGLYPH-1365B;Lo;0;L;;;;;N;;;;; +1365C;EGYPTIAN HIEROGLYPH-1365C;Lo;0;L;;;;;N;;;;; +1365D;EGYPTIAN HIEROGLYPH-1365D;Lo;0;L;;;;;N;;;;; +1365E;EGYPTIAN HIEROGLYPH-1365E;Lo;0;L;;;;;N;;;;; +1365F;EGYPTIAN HIEROGLYPH-1365F;Lo;0;L;;;;;N;;;;; +13660;EGYPTIAN HIEROGLYPH-13660;Lo;0;L;;;;;N;;;;; +13661;EGYPTIAN HIEROGLYPH-13661;Lo;0;L;;;;;N;;;;; +13662;EGYPTIAN HIEROGLYPH-13662;Lo;0;L;;;;;N;;;;; +13663;EGYPTIAN HIEROGLYPH-13663;Lo;0;L;;;;;N;;;;; +13664;EGYPTIAN HIEROGLYPH-13664;Lo;0;L;;;;;N;;;;; +13665;EGYPTIAN HIEROGLYPH-13665;Lo;0;L;;;;;N;;;;; +13666;EGYPTIAN HIEROGLYPH-13666;Lo;0;L;;;;;N;;;;; +13667;EGYPTIAN HIEROGLYPH-13667;Lo;0;L;;;;;N;;;;; +13668;EGYPTIAN HIEROGLYPH-13668;Lo;0;L;;;;;N;;;;; +13669;EGYPTIAN HIEROGLYPH-13669;Lo;0;L;;;;;N;;;;; +1366A;EGYPTIAN HIEROGLYPH-1366A;Lo;0;L;;;;;N;;;;; +1366B;EGYPTIAN HIEROGLYPH-1366B;Lo;0;L;;;;;N;;;;; +1366C;EGYPTIAN HIEROGLYPH-1366C;Lo;0;L;;;;;N;;;;; +1366D;EGYPTIAN HIEROGLYPH-1366D;Lo;0;L;;;;;N;;;;; +1366E;EGYPTIAN HIEROGLYPH-1366E;Lo;0;L;;;;;N;;;;; +1366F;EGYPTIAN HIEROGLYPH-1366F;Lo;0;L;;;;;N;;;;; +13670;EGYPTIAN HIEROGLYPH-13670;Lo;0;L;;;;;N;;;;; +13671;EGYPTIAN HIEROGLYPH-13671;Lo;0;L;;;;;N;;;;; +13672;EGYPTIAN HIEROGLYPH-13672;Lo;0;L;;;;;N;;;;; +13673;EGYPTIAN HIEROGLYPH-13673;Lo;0;L;;;;;N;;;;; +13674;EGYPTIAN HIEROGLYPH-13674;Lo;0;L;;;;;N;;;;; +13675;EGYPTIAN HIEROGLYPH-13675;Lo;0;L;;;;;N;;;;; +13676;EGYPTIAN HIEROGLYPH-13676;Lo;0;L;;;;;N;;;;; +13677;EGYPTIAN HIEROGLYPH-13677;Lo;0;L;;;;;N;;;;; +13678;EGYPTIAN HIEROGLYPH-13678;Lo;0;L;;;;;N;;;;; +13679;EGYPTIAN HIEROGLYPH-13679;Lo;0;L;;;;;N;;;;; +1367A;EGYPTIAN HIEROGLYPH-1367A;Lo;0;L;;;;;N;;;;; +1367B;EGYPTIAN HIEROGLYPH-1367B;Lo;0;L;;;;;N;;;;; +1367C;EGYPTIAN HIEROGLYPH-1367C;Lo;0;L;;;;;N;;;;; +1367D;EGYPTIAN HIEROGLYPH-1367D;Lo;0;L;;;;;N;;;;; +1367E;EGYPTIAN HIEROGLYPH-1367E;Lo;0;L;;;;;N;;;;; +1367F;EGYPTIAN HIEROGLYPH-1367F;Lo;0;L;;;;;N;;;;; +13680;EGYPTIAN HIEROGLYPH-13680;Lo;0;L;;;;;N;;;;; +13681;EGYPTIAN HIEROGLYPH-13681;Lo;0;L;;;;;N;;;;; +13682;EGYPTIAN HIEROGLYPH-13682;Lo;0;L;;;;;N;;;;; +13683;EGYPTIAN HIEROGLYPH-13683;Lo;0;L;;;;;N;;;;; +13684;EGYPTIAN HIEROGLYPH-13684;Lo;0;L;;;;;N;;;;; +13685;EGYPTIAN HIEROGLYPH-13685;Lo;0;L;;;;;N;;;;; +13686;EGYPTIAN HIEROGLYPH-13686;Lo;0;L;;;;;N;;;;; +13687;EGYPTIAN HIEROGLYPH-13687;Lo;0;L;;;;;N;;;;; +13688;EGYPTIAN HIEROGLYPH-13688;Lo;0;L;;;;;N;;;;; +13689;EGYPTIAN HIEROGLYPH-13689;Lo;0;L;;;;;N;;;;; +1368A;EGYPTIAN HIEROGLYPH-1368A;Lo;0;L;;;;;N;;;;; +1368B;EGYPTIAN HIEROGLYPH-1368B;Lo;0;L;;;;;N;;;;; +1368C;EGYPTIAN HIEROGLYPH-1368C;Lo;0;L;;;;;N;;;;; +1368D;EGYPTIAN HIEROGLYPH-1368D;Lo;0;L;;;;;N;;;;; +1368E;EGYPTIAN HIEROGLYPH-1368E;Lo;0;L;;;;;N;;;;; +1368F;EGYPTIAN HIEROGLYPH-1368F;Lo;0;L;;;;;N;;;;; +13690;EGYPTIAN HIEROGLYPH-13690;Lo;0;L;;;;;N;;;;; +13691;EGYPTIAN HIEROGLYPH-13691;Lo;0;L;;;;;N;;;;; +13692;EGYPTIAN HIEROGLYPH-13692;Lo;0;L;;;;;N;;;;; +13693;EGYPTIAN HIEROGLYPH-13693;Lo;0;L;;;;;N;;;;; +13694;EGYPTIAN HIEROGLYPH-13694;Lo;0;L;;;;;N;;;;; +13695;EGYPTIAN HIEROGLYPH-13695;Lo;0;L;;;;;N;;;;; +13696;EGYPTIAN HIEROGLYPH-13696;Lo;0;L;;;;;N;;;;; +13697;EGYPTIAN HIEROGLYPH-13697;Lo;0;L;;;;;N;;;;; +13698;EGYPTIAN HIEROGLYPH-13698;Lo;0;L;;;;;N;;;;; +13699;EGYPTIAN HIEROGLYPH-13699;Lo;0;L;;;;;N;;;;; +1369A;EGYPTIAN HIEROGLYPH-1369A;Lo;0;L;;;;;N;;;;; +1369B;EGYPTIAN HIEROGLYPH-1369B;Lo;0;L;;;;;N;;;;; +1369C;EGYPTIAN HIEROGLYPH-1369C;Lo;0;L;;;;;N;;;;; +1369D;EGYPTIAN HIEROGLYPH-1369D;Lo;0;L;;;;;N;;;;; +1369E;EGYPTIAN HIEROGLYPH-1369E;Lo;0;L;;;;;N;;;;; +1369F;EGYPTIAN HIEROGLYPH-1369F;Lo;0;L;;;;;N;;;;; +136A0;EGYPTIAN HIEROGLYPH-136A0;Lo;0;L;;;;;N;;;;; +136A1;EGYPTIAN HIEROGLYPH-136A1;Lo;0;L;;;;;N;;;;; +136A2;EGYPTIAN HIEROGLYPH-136A2;Lo;0;L;;;;;N;;;;; +136A3;EGYPTIAN HIEROGLYPH-136A3;Lo;0;L;;;;;N;;;;; +136A4;EGYPTIAN HIEROGLYPH-136A4;Lo;0;L;;;;;N;;;;; +136A5;EGYPTIAN HIEROGLYPH-136A5;Lo;0;L;;;;;N;;;;; +136A6;EGYPTIAN HIEROGLYPH-136A6;Lo;0;L;;;;;N;;;;; +136A7;EGYPTIAN HIEROGLYPH-136A7;Lo;0;L;;;;;N;;;;; +136A8;EGYPTIAN HIEROGLYPH-136A8;Lo;0;L;;;;;N;;;;; +136A9;EGYPTIAN HIEROGLYPH-136A9;Lo;0;L;;;;;N;;;;; +136AA;EGYPTIAN HIEROGLYPH-136AA;Lo;0;L;;;;;N;;;;; +136AB;EGYPTIAN HIEROGLYPH-136AB;Lo;0;L;;;;;N;;;;; +136AC;EGYPTIAN HIEROGLYPH-136AC;Lo;0;L;;;;;N;;;;; +136AD;EGYPTIAN HIEROGLYPH-136AD;Lo;0;L;;;;;N;;;;; +136AE;EGYPTIAN HIEROGLYPH-136AE;Lo;0;L;;;;;N;;;;; +136AF;EGYPTIAN HIEROGLYPH-136AF;Lo;0;L;;;;;N;;;;; +136B0;EGYPTIAN HIEROGLYPH-136B0;Lo;0;L;;;;;N;;;;; +136B1;EGYPTIAN HIEROGLYPH-136B1;Lo;0;L;;;;;N;;;;; +136B2;EGYPTIAN HIEROGLYPH-136B2;Lo;0;L;;;;;N;;;;; +136B3;EGYPTIAN HIEROGLYPH-136B3;Lo;0;L;;;;;N;;;;; +136B4;EGYPTIAN HIEROGLYPH-136B4;Lo;0;L;;;;;N;;;;; +136B5;EGYPTIAN HIEROGLYPH-136B5;Lo;0;L;;;;;N;;;;; +136B6;EGYPTIAN HIEROGLYPH-136B6;Lo;0;L;;;;;N;;;;; +136B7;EGYPTIAN HIEROGLYPH-136B7;Lo;0;L;;;;;N;;;;; +136B8;EGYPTIAN HIEROGLYPH-136B8;Lo;0;L;;;;;N;;;;; +136B9;EGYPTIAN HIEROGLYPH-136B9;Lo;0;L;;;;;N;;;;; +136BA;EGYPTIAN HIEROGLYPH-136BA;Lo;0;L;;;;;N;;;;; +136BB;EGYPTIAN HIEROGLYPH-136BB;Lo;0;L;;;;;N;;;;; +136BC;EGYPTIAN HIEROGLYPH-136BC;Lo;0;L;;;;;N;;;;; +136BD;EGYPTIAN HIEROGLYPH-136BD;Lo;0;L;;;;;N;;;;; +136BE;EGYPTIAN HIEROGLYPH-136BE;Lo;0;L;;;;;N;;;;; +136BF;EGYPTIAN HIEROGLYPH-136BF;Lo;0;L;;;;;N;;;;; +136C0;EGYPTIAN HIEROGLYPH-136C0;Lo;0;L;;;;;N;;;;; +136C1;EGYPTIAN HIEROGLYPH-136C1;Lo;0;L;;;;;N;;;;; +136C2;EGYPTIAN HIEROGLYPH-136C2;Lo;0;L;;;;;N;;;;; +136C3;EGYPTIAN HIEROGLYPH-136C3;Lo;0;L;;;;;N;;;;; +136C4;EGYPTIAN HIEROGLYPH-136C4;Lo;0;L;;;;;N;;;;; +136C5;EGYPTIAN HIEROGLYPH-136C5;Lo;0;L;;;;;N;;;;; +136C6;EGYPTIAN HIEROGLYPH-136C6;Lo;0;L;;;;;N;;;;; +136C7;EGYPTIAN HIEROGLYPH-136C7;Lo;0;L;;;;;N;;;;; +136C8;EGYPTIAN HIEROGLYPH-136C8;Lo;0;L;;;;;N;;;;; +136C9;EGYPTIAN HIEROGLYPH-136C9;Lo;0;L;;;;;N;;;;; +136CA;EGYPTIAN HIEROGLYPH-136CA;Lo;0;L;;;;;N;;;;; +136CB;EGYPTIAN HIEROGLYPH-136CB;Lo;0;L;;;;;N;;;;; +136CC;EGYPTIAN HIEROGLYPH-136CC;Lo;0;L;;;;;N;;;;; +136CD;EGYPTIAN HIEROGLYPH-136CD;Lo;0;L;;;;;N;;;;; +136CE;EGYPTIAN HIEROGLYPH-136CE;Lo;0;L;;;;;N;;;;; +136CF;EGYPTIAN HIEROGLYPH-136CF;Lo;0;L;;;;;N;;;;; +136D0;EGYPTIAN HIEROGLYPH-136D0;Lo;0;L;;;;;N;;;;; +136D1;EGYPTIAN HIEROGLYPH-136D1;Lo;0;L;;;;;N;;;;; +136D2;EGYPTIAN HIEROGLYPH-136D2;Lo;0;L;;;;;N;;;;; +136D3;EGYPTIAN HIEROGLYPH-136D3;Lo;0;L;;;;;N;;;;; +136D4;EGYPTIAN HIEROGLYPH-136D4;Lo;0;L;;;;;N;;;;; +136D5;EGYPTIAN HIEROGLYPH-136D5;Lo;0;L;;;;;N;;;;; +136D6;EGYPTIAN HIEROGLYPH-136D6;Lo;0;L;;;;;N;;;;; +136D7;EGYPTIAN HIEROGLYPH-136D7;Lo;0;L;;;;;N;;;;; +136D8;EGYPTIAN HIEROGLYPH-136D8;Lo;0;L;;;;;N;;;;; +136D9;EGYPTIAN HIEROGLYPH-136D9;Lo;0;L;;;;;N;;;;; +136DA;EGYPTIAN HIEROGLYPH-136DA;Lo;0;L;;;;;N;;;;; +136DB;EGYPTIAN HIEROGLYPH-136DB;Lo;0;L;;;;;N;;;;; +136DC;EGYPTIAN HIEROGLYPH-136DC;Lo;0;L;;;;;N;;;;; +136DD;EGYPTIAN HIEROGLYPH-136DD;Lo;0;L;;;;;N;;;;; +136DE;EGYPTIAN HIEROGLYPH-136DE;Lo;0;L;;;;;N;;;;; +136DF;EGYPTIAN HIEROGLYPH-136DF;Lo;0;L;;;;;N;;;;; +136E0;EGYPTIAN HIEROGLYPH-136E0;Lo;0;L;;;;;N;;;;; +136E1;EGYPTIAN HIEROGLYPH-136E1;Lo;0;L;;;;;N;;;;; +136E2;EGYPTIAN HIEROGLYPH-136E2;Lo;0;L;;;;;N;;;;; +136E3;EGYPTIAN HIEROGLYPH-136E3;Lo;0;L;;;;;N;;;;; +136E4;EGYPTIAN HIEROGLYPH-136E4;Lo;0;L;;;;;N;;;;; +136E5;EGYPTIAN HIEROGLYPH-136E5;Lo;0;L;;;;;N;;;;; +136E6;EGYPTIAN HIEROGLYPH-136E6;Lo;0;L;;;;;N;;;;; +136E7;EGYPTIAN HIEROGLYPH-136E7;Lo;0;L;;;;;N;;;;; +136E8;EGYPTIAN HIEROGLYPH-136E8;Lo;0;L;;;;;N;;;;; +136E9;EGYPTIAN HIEROGLYPH-136E9;Lo;0;L;;;;;N;;;;; +136EA;EGYPTIAN HIEROGLYPH-136EA;Lo;0;L;;;;;N;;;;; +136EB;EGYPTIAN HIEROGLYPH-136EB;Lo;0;L;;;;;N;;;;; +136EC;EGYPTIAN HIEROGLYPH-136EC;Lo;0;L;;;;;N;;;;; +136ED;EGYPTIAN HIEROGLYPH-136ED;Lo;0;L;;;;;N;;;;; +136EE;EGYPTIAN HIEROGLYPH-136EE;Lo;0;L;;;;;N;;;;; +136EF;EGYPTIAN HIEROGLYPH-136EF;Lo;0;L;;;;;N;;;;; +136F0;EGYPTIAN HIEROGLYPH-136F0;Lo;0;L;;;;;N;;;;; +136F1;EGYPTIAN HIEROGLYPH-136F1;Lo;0;L;;;;;N;;;;; +136F2;EGYPTIAN HIEROGLYPH-136F2;Lo;0;L;;;;;N;;;;; +136F3;EGYPTIAN HIEROGLYPH-136F3;Lo;0;L;;;;;N;;;;; +136F4;EGYPTIAN HIEROGLYPH-136F4;Lo;0;L;;;;;N;;;;; +136F5;EGYPTIAN HIEROGLYPH-136F5;Lo;0;L;;;;;N;;;;; +136F6;EGYPTIAN HIEROGLYPH-136F6;Lo;0;L;;;;;N;;;;; +136F7;EGYPTIAN HIEROGLYPH-136F7;Lo;0;L;;;;;N;;;;; +136F8;EGYPTIAN HIEROGLYPH-136F8;Lo;0;L;;;;;N;;;;; +136F9;EGYPTIAN HIEROGLYPH-136F9;Lo;0;L;;;;;N;;;;; +136FA;EGYPTIAN HIEROGLYPH-136FA;Lo;0;L;;;;;N;;;;; +136FB;EGYPTIAN HIEROGLYPH-136FB;Lo;0;L;;;;;N;;;;; +136FC;EGYPTIAN HIEROGLYPH-136FC;Lo;0;L;;;;;N;;;;; +136FD;EGYPTIAN HIEROGLYPH-136FD;Lo;0;L;;;;;N;;;;; +136FE;EGYPTIAN HIEROGLYPH-136FE;Lo;0;L;;;;;N;;;;; +136FF;EGYPTIAN HIEROGLYPH-136FF;Lo;0;L;;;;;N;;;;; +13700;EGYPTIAN HIEROGLYPH-13700;Lo;0;L;;;;;N;;;;; +13701;EGYPTIAN HIEROGLYPH-13701;Lo;0;L;;;;;N;;;;; +13702;EGYPTIAN HIEROGLYPH-13702;Lo;0;L;;;;;N;;;;; +13703;EGYPTIAN HIEROGLYPH-13703;Lo;0;L;;;;;N;;;;; +13704;EGYPTIAN HIEROGLYPH-13704;Lo;0;L;;;;;N;;;;; +13705;EGYPTIAN HIEROGLYPH-13705;Lo;0;L;;;;;N;;;;; +13706;EGYPTIAN HIEROGLYPH-13706;Lo;0;L;;;;;N;;;;; +13707;EGYPTIAN HIEROGLYPH-13707;Lo;0;L;;;;;N;;;;; +13708;EGYPTIAN HIEROGLYPH-13708;Lo;0;L;;;;;N;;;;; +13709;EGYPTIAN HIEROGLYPH-13709;Lo;0;L;;;;;N;;;;; +1370A;EGYPTIAN HIEROGLYPH-1370A;Lo;0;L;;;;;N;;;;; +1370B;EGYPTIAN HIEROGLYPH-1370B;Lo;0;L;;;;;N;;;;; +1370C;EGYPTIAN HIEROGLYPH-1370C;Lo;0;L;;;;;N;;;;; +1370D;EGYPTIAN HIEROGLYPH-1370D;Lo;0;L;;;;;N;;;;; +1370E;EGYPTIAN HIEROGLYPH-1370E;Lo;0;L;;;;;N;;;;; +1370F;EGYPTIAN HIEROGLYPH-1370F;Lo;0;L;;;;;N;;;;; +13710;EGYPTIAN HIEROGLYPH-13710;Lo;0;L;;;;;N;;;;; +13711;EGYPTIAN HIEROGLYPH-13711;Lo;0;L;;;;;N;;;;; +13712;EGYPTIAN HIEROGLYPH-13712;Lo;0;L;;;;;N;;;;; +13713;EGYPTIAN HIEROGLYPH-13713;Lo;0;L;;;;;N;;;;; +13714;EGYPTIAN HIEROGLYPH-13714;Lo;0;L;;;;;N;;;;; +13715;EGYPTIAN HIEROGLYPH-13715;Lo;0;L;;;;;N;;;;; +13716;EGYPTIAN HIEROGLYPH-13716;Lo;0;L;;;;;N;;;;; +13717;EGYPTIAN HIEROGLYPH-13717;Lo;0;L;;;;;N;;;;; +13718;EGYPTIAN HIEROGLYPH-13718;Lo;0;L;;;;;N;;;;; +13719;EGYPTIAN HIEROGLYPH-13719;Lo;0;L;;;;;N;;;;; +1371A;EGYPTIAN HIEROGLYPH-1371A;Lo;0;L;;;;;N;;;;; +1371B;EGYPTIAN HIEROGLYPH-1371B;Lo;0;L;;;;;N;;;;; +1371C;EGYPTIAN HIEROGLYPH-1371C;Lo;0;L;;;;;N;;;;; +1371D;EGYPTIAN HIEROGLYPH-1371D;Lo;0;L;;;;;N;;;;; +1371E;EGYPTIAN HIEROGLYPH-1371E;Lo;0;L;;;;;N;;;;; +1371F;EGYPTIAN HIEROGLYPH-1371F;Lo;0;L;;;;;N;;;;; +13720;EGYPTIAN HIEROGLYPH-13720;Lo;0;L;;;;;N;;;;; +13721;EGYPTIAN HIEROGLYPH-13721;Lo;0;L;;;;;N;;;;; +13722;EGYPTIAN HIEROGLYPH-13722;Lo;0;L;;;;;N;;;;; +13723;EGYPTIAN HIEROGLYPH-13723;Lo;0;L;;;;;N;;;;; +13724;EGYPTIAN HIEROGLYPH-13724;Lo;0;L;;;;;N;;;;; +13725;EGYPTIAN HIEROGLYPH-13725;Lo;0;L;;;;;N;;;;; +13726;EGYPTIAN HIEROGLYPH-13726;Lo;0;L;;;;;N;;;;; +13727;EGYPTIAN HIEROGLYPH-13727;Lo;0;L;;;;;N;;;;; +13728;EGYPTIAN HIEROGLYPH-13728;Lo;0;L;;;;;N;;;;; +13729;EGYPTIAN HIEROGLYPH-13729;Lo;0;L;;;;;N;;;;; +1372A;EGYPTIAN HIEROGLYPH-1372A;Lo;0;L;;;;;N;;;;; +1372B;EGYPTIAN HIEROGLYPH-1372B;Lo;0;L;;;;;N;;;;; +1372C;EGYPTIAN HIEROGLYPH-1372C;Lo;0;L;;;;;N;;;;; +1372D;EGYPTIAN HIEROGLYPH-1372D;Lo;0;L;;;;;N;;;;; +1372E;EGYPTIAN HIEROGLYPH-1372E;Lo;0;L;;;;;N;;;;; +1372F;EGYPTIAN HIEROGLYPH-1372F;Lo;0;L;;;;;N;;;;; +13730;EGYPTIAN HIEROGLYPH-13730;Lo;0;L;;;;;N;;;;; +13731;EGYPTIAN HIEROGLYPH-13731;Lo;0;L;;;;;N;;;;; +13732;EGYPTIAN HIEROGLYPH-13732;Lo;0;L;;;;;N;;;;; +13733;EGYPTIAN HIEROGLYPH-13733;Lo;0;L;;;;;N;;;;; +13734;EGYPTIAN HIEROGLYPH-13734;Lo;0;L;;;;;N;;;;; +13735;EGYPTIAN HIEROGLYPH-13735;Lo;0;L;;;;;N;;;;; +13736;EGYPTIAN HIEROGLYPH-13736;Lo;0;L;;;;;N;;;;; +13737;EGYPTIAN HIEROGLYPH-13737;Lo;0;L;;;;;N;;;;; +13738;EGYPTIAN HIEROGLYPH-13738;Lo;0;L;;;;;N;;;;; +13739;EGYPTIAN HIEROGLYPH-13739;Lo;0;L;;;;;N;;;;; +1373A;EGYPTIAN HIEROGLYPH-1373A;Lo;0;L;;;;;N;;;;; +1373B;EGYPTIAN HIEROGLYPH-1373B;Lo;0;L;;;;;N;;;;; +1373C;EGYPTIAN HIEROGLYPH-1373C;Lo;0;L;;;;;N;;;;; +1373D;EGYPTIAN HIEROGLYPH-1373D;Lo;0;L;;;;;N;;;;; +1373E;EGYPTIAN HIEROGLYPH-1373E;Lo;0;L;;;;;N;;;;; +1373F;EGYPTIAN HIEROGLYPH-1373F;Lo;0;L;;;;;N;;;;; +13740;EGYPTIAN HIEROGLYPH-13740;Lo;0;L;;;;;N;;;;; +13741;EGYPTIAN HIEROGLYPH-13741;Lo;0;L;;;;;N;;;;; +13742;EGYPTIAN HIEROGLYPH-13742;Lo;0;L;;;;;N;;;;; +13743;EGYPTIAN HIEROGLYPH-13743;Lo;0;L;;;;;N;;;;; +13744;EGYPTIAN HIEROGLYPH-13744;Lo;0;L;;;;;N;;;;; +13745;EGYPTIAN HIEROGLYPH-13745;Lo;0;L;;;;;N;;;;; +13746;EGYPTIAN HIEROGLYPH-13746;Lo;0;L;;;;;N;;;;; +13747;EGYPTIAN HIEROGLYPH-13747;Lo;0;L;;;;;N;;;;; +13748;EGYPTIAN HIEROGLYPH-13748;Lo;0;L;;;;;N;;;;; +13749;EGYPTIAN HIEROGLYPH-13749;Lo;0;L;;;;;N;;;;; +1374A;EGYPTIAN HIEROGLYPH-1374A;Lo;0;L;;;;;N;;;;; +1374B;EGYPTIAN HIEROGLYPH-1374B;Lo;0;L;;;;;N;;;;; +1374C;EGYPTIAN HIEROGLYPH-1374C;Lo;0;L;;;;;N;;;;; +1374D;EGYPTIAN HIEROGLYPH-1374D;Lo;0;L;;;;;N;;;;; +1374E;EGYPTIAN HIEROGLYPH-1374E;Lo;0;L;;;;;N;;;;; +1374F;EGYPTIAN HIEROGLYPH-1374F;Lo;0;L;;;;;N;;;;; +13750;EGYPTIAN HIEROGLYPH-13750;Lo;0;L;;;;;N;;;;; +13751;EGYPTIAN HIEROGLYPH-13751;Lo;0;L;;;;;N;;;;; +13752;EGYPTIAN HIEROGLYPH-13752;Lo;0;L;;;;;N;;;;; +13753;EGYPTIAN HIEROGLYPH-13753;Lo;0;L;;;;;N;;;;; +13754;EGYPTIAN HIEROGLYPH-13754;Lo;0;L;;;;;N;;;;; +13755;EGYPTIAN HIEROGLYPH-13755;Lo;0;L;;;;;N;;;;; +13756;EGYPTIAN HIEROGLYPH-13756;Lo;0;L;;;;;N;;;;; +13757;EGYPTIAN HIEROGLYPH-13757;Lo;0;L;;;;;N;;;;; +13758;EGYPTIAN HIEROGLYPH-13758;Lo;0;L;;;;;N;;;;; +13759;EGYPTIAN HIEROGLYPH-13759;Lo;0;L;;;;;N;;;;; +1375A;EGYPTIAN HIEROGLYPH-1375A;Lo;0;L;;;;;N;;;;; +1375B;EGYPTIAN HIEROGLYPH-1375B;Lo;0;L;;;;;N;;;;; +1375C;EGYPTIAN HIEROGLYPH-1375C;Lo;0;L;;;;;N;;;;; +1375D;EGYPTIAN HIEROGLYPH-1375D;Lo;0;L;;;;;N;;;;; +1375E;EGYPTIAN HIEROGLYPH-1375E;Lo;0;L;;;;;N;;;;; +1375F;EGYPTIAN HIEROGLYPH-1375F;Lo;0;L;;;;;N;;;;; +13760;EGYPTIAN HIEROGLYPH-13760;Lo;0;L;;;;;N;;;;; +13761;EGYPTIAN HIEROGLYPH-13761;Lo;0;L;;;;;N;;;;; +13762;EGYPTIAN HIEROGLYPH-13762;Lo;0;L;;;;;N;;;;; +13763;EGYPTIAN HIEROGLYPH-13763;Lo;0;L;;;;;N;;;;; +13764;EGYPTIAN HIEROGLYPH-13764;Lo;0;L;;;;;N;;;;; +13765;EGYPTIAN HIEROGLYPH-13765;Lo;0;L;;;;;N;;;;; +13766;EGYPTIAN HIEROGLYPH-13766;Lo;0;L;;;;;N;;;;; +13767;EGYPTIAN HIEROGLYPH-13767;Lo;0;L;;;;;N;;;;; +13768;EGYPTIAN HIEROGLYPH-13768;Lo;0;L;;;;;N;;;;; +13769;EGYPTIAN HIEROGLYPH-13769;Lo;0;L;;;;;N;;;;; +1376A;EGYPTIAN HIEROGLYPH-1376A;Lo;0;L;;;;;N;;;;; +1376B;EGYPTIAN HIEROGLYPH-1376B;Lo;0;L;;;;;N;;;;; +1376C;EGYPTIAN HIEROGLYPH-1376C;Lo;0;L;;;;;N;;;;; +1376D;EGYPTIAN HIEROGLYPH-1376D;Lo;0;L;;;;;N;;;;; +1376E;EGYPTIAN HIEROGLYPH-1376E;Lo;0;L;;;;;N;;;;; +1376F;EGYPTIAN HIEROGLYPH-1376F;Lo;0;L;;;;;N;;;;; +13770;EGYPTIAN HIEROGLYPH-13770;Lo;0;L;;;;;N;;;;; +13771;EGYPTIAN HIEROGLYPH-13771;Lo;0;L;;;;;N;;;;; +13772;EGYPTIAN HIEROGLYPH-13772;Lo;0;L;;;;;N;;;;; +13773;EGYPTIAN HIEROGLYPH-13773;Lo;0;L;;;;;N;;;;; +13774;EGYPTIAN HIEROGLYPH-13774;Lo;0;L;;;;;N;;;;; +13775;EGYPTIAN HIEROGLYPH-13775;Lo;0;L;;;;;N;;;;; +13776;EGYPTIAN HIEROGLYPH-13776;Lo;0;L;;;;;N;;;;; +13777;EGYPTIAN HIEROGLYPH-13777;Lo;0;L;;;;;N;;;;; +13778;EGYPTIAN HIEROGLYPH-13778;Lo;0;L;;;;;N;;;;; +13779;EGYPTIAN HIEROGLYPH-13779;Lo;0;L;;;;;N;;;;; +1377A;EGYPTIAN HIEROGLYPH-1377A;Lo;0;L;;;;;N;;;;; +1377B;EGYPTIAN HIEROGLYPH-1377B;Lo;0;L;;;;;N;;;;; +1377C;EGYPTIAN HIEROGLYPH-1377C;Lo;0;L;;;;;N;;;;; +1377D;EGYPTIAN HIEROGLYPH-1377D;Lo;0;L;;;;;N;;;;; +1377E;EGYPTIAN HIEROGLYPH-1377E;Lo;0;L;;;;;N;;;;; +1377F;EGYPTIAN HIEROGLYPH-1377F;Lo;0;L;;;;;N;;;;; +13780;EGYPTIAN HIEROGLYPH-13780;Lo;0;L;;;;;N;;;;; +13781;EGYPTIAN HIEROGLYPH-13781;Lo;0;L;;;;;N;;;;; +13782;EGYPTIAN HIEROGLYPH-13782;Lo;0;L;;;;;N;;;;; +13783;EGYPTIAN HIEROGLYPH-13783;Lo;0;L;;;;;N;;;;; +13784;EGYPTIAN HIEROGLYPH-13784;Lo;0;L;;;;;N;;;;; +13785;EGYPTIAN HIEROGLYPH-13785;Lo;0;L;;;;;N;;;;; +13786;EGYPTIAN HIEROGLYPH-13786;Lo;0;L;;;;;N;;;;; +13787;EGYPTIAN HIEROGLYPH-13787;Lo;0;L;;;;;N;;;;; +13788;EGYPTIAN HIEROGLYPH-13788;Lo;0;L;;;;;N;;;;; +13789;EGYPTIAN HIEROGLYPH-13789;Lo;0;L;;;;;N;;;;; +1378A;EGYPTIAN HIEROGLYPH-1378A;Lo;0;L;;;;;N;;;;; +1378B;EGYPTIAN HIEROGLYPH-1378B;Lo;0;L;;;;;N;;;;; +1378C;EGYPTIAN HIEROGLYPH-1378C;Lo;0;L;;;;;N;;;;; +1378D;EGYPTIAN HIEROGLYPH-1378D;Lo;0;L;;;;;N;;;;; +1378E;EGYPTIAN HIEROGLYPH-1378E;Lo;0;L;;;;;N;;;;; +1378F;EGYPTIAN HIEROGLYPH-1378F;Lo;0;L;;;;;N;;;;; +13790;EGYPTIAN HIEROGLYPH-13790;Lo;0;L;;;;;N;;;;; +13791;EGYPTIAN HIEROGLYPH-13791;Lo;0;L;;;;;N;;;;; +13792;EGYPTIAN HIEROGLYPH-13792;Lo;0;L;;;;;N;;;;; +13793;EGYPTIAN HIEROGLYPH-13793;Lo;0;L;;;;;N;;;;; +13794;EGYPTIAN HIEROGLYPH-13794;Lo;0;L;;;;;N;;;;; +13795;EGYPTIAN HIEROGLYPH-13795;Lo;0;L;;;;;N;;;;; +13796;EGYPTIAN HIEROGLYPH-13796;Lo;0;L;;;;;N;;;;; +13797;EGYPTIAN HIEROGLYPH-13797;Lo;0;L;;;;;N;;;;; +13798;EGYPTIAN HIEROGLYPH-13798;Lo;0;L;;;;;N;;;;; +13799;EGYPTIAN HIEROGLYPH-13799;Lo;0;L;;;;;N;;;;; +1379A;EGYPTIAN HIEROGLYPH-1379A;Lo;0;L;;;;;N;;;;; +1379B;EGYPTIAN HIEROGLYPH-1379B;Lo;0;L;;;;;N;;;;; +1379C;EGYPTIAN HIEROGLYPH-1379C;Lo;0;L;;;;;N;;;;; +1379D;EGYPTIAN HIEROGLYPH-1379D;Lo;0;L;;;;;N;;;;; +1379E;EGYPTIAN HIEROGLYPH-1379E;Lo;0;L;;;;;N;;;;; +1379F;EGYPTIAN HIEROGLYPH-1379F;Lo;0;L;;;;;N;;;;; +137A0;EGYPTIAN HIEROGLYPH-137A0;Lo;0;L;;;;;N;;;;; +137A1;EGYPTIAN HIEROGLYPH-137A1;Lo;0;L;;;;;N;;;;; +137A2;EGYPTIAN HIEROGLYPH-137A2;Lo;0;L;;;;;N;;;;; +137A3;EGYPTIAN HIEROGLYPH-137A3;Lo;0;L;;;;;N;;;;; +137A4;EGYPTIAN HIEROGLYPH-137A4;Lo;0;L;;;;;N;;;;; +137A5;EGYPTIAN HIEROGLYPH-137A5;Lo;0;L;;;;;N;;;;; +137A6;EGYPTIAN HIEROGLYPH-137A6;Lo;0;L;;;;;N;;;;; +137A7;EGYPTIAN HIEROGLYPH-137A7;Lo;0;L;;;;;N;;;;; +137A8;EGYPTIAN HIEROGLYPH-137A8;Lo;0;L;;;;;N;;;;; +137A9;EGYPTIAN HIEROGLYPH-137A9;Lo;0;L;;;;;N;;;;; +137AA;EGYPTIAN HIEROGLYPH-137AA;Lo;0;L;;;;;N;;;;; +137AB;EGYPTIAN HIEROGLYPH-137AB;Lo;0;L;;;;;N;;;;; +137AC;EGYPTIAN HIEROGLYPH-137AC;Lo;0;L;;;;;N;;;;; +137AD;EGYPTIAN HIEROGLYPH-137AD;Lo;0;L;;;;;N;;;;; +137AE;EGYPTIAN HIEROGLYPH-137AE;Lo;0;L;;;;;N;;;;; +137AF;EGYPTIAN HIEROGLYPH-137AF;Lo;0;L;;;;;N;;;;; +137B0;EGYPTIAN HIEROGLYPH-137B0;Lo;0;L;;;;;N;;;;; +137B1;EGYPTIAN HIEROGLYPH-137B1;Lo;0;L;;;;;N;;;;; +137B2;EGYPTIAN HIEROGLYPH-137B2;Lo;0;L;;;;;N;;;;; +137B3;EGYPTIAN HIEROGLYPH-137B3;Lo;0;L;;;;;N;;;;; +137B4;EGYPTIAN HIEROGLYPH-137B4;Lo;0;L;;;;;N;;;;; +137B5;EGYPTIAN HIEROGLYPH-137B5;Lo;0;L;;;;;N;;;;; +137B6;EGYPTIAN HIEROGLYPH-137B6;Lo;0;L;;;;;N;;;;; +137B7;EGYPTIAN HIEROGLYPH-137B7;Lo;0;L;;;;;N;;;;; +137B8;EGYPTIAN HIEROGLYPH-137B8;Lo;0;L;;;;;N;;;;; +137B9;EGYPTIAN HIEROGLYPH-137B9;Lo;0;L;;;;;N;;;;; +137BA;EGYPTIAN HIEROGLYPH-137BA;Lo;0;L;;;;;N;;;;; +137BB;EGYPTIAN HIEROGLYPH-137BB;Lo;0;L;;;;;N;;;;; +137BC;EGYPTIAN HIEROGLYPH-137BC;Lo;0;L;;;;;N;;;;; +137BD;EGYPTIAN HIEROGLYPH-137BD;Lo;0;L;;;;;N;;;;; +137BE;EGYPTIAN HIEROGLYPH-137BE;Lo;0;L;;;;;N;;;;; +137BF;EGYPTIAN HIEROGLYPH-137BF;Lo;0;L;;;;;N;;;;; +137C0;EGYPTIAN HIEROGLYPH-137C0;Lo;0;L;;;;;N;;;;; +137C1;EGYPTIAN HIEROGLYPH-137C1;Lo;0;L;;;;;N;;;;; +137C2;EGYPTIAN HIEROGLYPH-137C2;Lo;0;L;;;;;N;;;;; +137C3;EGYPTIAN HIEROGLYPH-137C3;Lo;0;L;;;;;N;;;;; +137C4;EGYPTIAN HIEROGLYPH-137C4;Lo;0;L;;;;;N;;;;; +137C5;EGYPTIAN HIEROGLYPH-137C5;Lo;0;L;;;;;N;;;;; +137C6;EGYPTIAN HIEROGLYPH-137C6;Lo;0;L;;;;;N;;;;; +137C7;EGYPTIAN HIEROGLYPH-137C7;Lo;0;L;;;;;N;;;;; +137C8;EGYPTIAN HIEROGLYPH-137C8;Lo;0;L;;;;;N;;;;; +137C9;EGYPTIAN HIEROGLYPH-137C9;Lo;0;L;;;;;N;;;;; +137CA;EGYPTIAN HIEROGLYPH-137CA;Lo;0;L;;;;;N;;;;; +137CB;EGYPTIAN HIEROGLYPH-137CB;Lo;0;L;;;;;N;;;;; +137CC;EGYPTIAN HIEROGLYPH-137CC;Lo;0;L;;;;;N;;;;; +137CD;EGYPTIAN HIEROGLYPH-137CD;Lo;0;L;;;;;N;;;;; +137CE;EGYPTIAN HIEROGLYPH-137CE;Lo;0;L;;;;;N;;;;; +137CF;EGYPTIAN HIEROGLYPH-137CF;Lo;0;L;;;;;N;;;;; +137D0;EGYPTIAN HIEROGLYPH-137D0;Lo;0;L;;;;;N;;;;; +137D1;EGYPTIAN HIEROGLYPH-137D1;Lo;0;L;;;;;N;;;;; +137D2;EGYPTIAN HIEROGLYPH-137D2;Lo;0;L;;;;;N;;;;; +137D3;EGYPTIAN HIEROGLYPH-137D3;Lo;0;L;;;;;N;;;;; +137D4;EGYPTIAN HIEROGLYPH-137D4;Lo;0;L;;;;;N;;;;; +137D5;EGYPTIAN HIEROGLYPH-137D5;Lo;0;L;;;;;N;;;;; +137D6;EGYPTIAN HIEROGLYPH-137D6;Lo;0;L;;;;;N;;;;; +137D7;EGYPTIAN HIEROGLYPH-137D7;Lo;0;L;;;;;N;;;;; +137D8;EGYPTIAN HIEROGLYPH-137D8;Lo;0;L;;;;;N;;;;; +137D9;EGYPTIAN HIEROGLYPH-137D9;Lo;0;L;;;;;N;;;;; +137DA;EGYPTIAN HIEROGLYPH-137DA;Lo;0;L;;;;;N;;;;; +137DB;EGYPTIAN HIEROGLYPH-137DB;Lo;0;L;;;;;N;;;;; +137DC;EGYPTIAN HIEROGLYPH-137DC;Lo;0;L;;;;;N;;;;; +137DD;EGYPTIAN HIEROGLYPH-137DD;Lo;0;L;;;;;N;;;;; +137DE;EGYPTIAN HIEROGLYPH-137DE;Lo;0;L;;;;;N;;;;; +137DF;EGYPTIAN HIEROGLYPH-137DF;Lo;0;L;;;;;N;;;;; +137E0;EGYPTIAN HIEROGLYPH-137E0;Lo;0;L;;;;;N;;;;; +137E1;EGYPTIAN HIEROGLYPH-137E1;Lo;0;L;;;;;N;;;;; +137E2;EGYPTIAN HIEROGLYPH-137E2;Lo;0;L;;;;;N;;;;; +137E3;EGYPTIAN HIEROGLYPH-137E3;Lo;0;L;;;;;N;;;;; +137E4;EGYPTIAN HIEROGLYPH-137E4;Lo;0;L;;;;;N;;;;; +137E5;EGYPTIAN HIEROGLYPH-137E5;Lo;0;L;;;;;N;;;;; +137E6;EGYPTIAN HIEROGLYPH-137E6;Lo;0;L;;;;;N;;;;; +137E7;EGYPTIAN HIEROGLYPH-137E7;Lo;0;L;;;;;N;;;;; +137E8;EGYPTIAN HIEROGLYPH-137E8;Lo;0;L;;;;;N;;;;; +137E9;EGYPTIAN HIEROGLYPH-137E9;Lo;0;L;;;;;N;;;;; +137EA;EGYPTIAN HIEROGLYPH-137EA;Lo;0;L;;;;;N;;;;; +137EB;EGYPTIAN HIEROGLYPH-137EB;Lo;0;L;;;;;N;;;;; +137EC;EGYPTIAN HIEROGLYPH-137EC;Lo;0;L;;;;;N;;;;; +137ED;EGYPTIAN HIEROGLYPH-137ED;Lo;0;L;;;;;N;;;;; +137EE;EGYPTIAN HIEROGLYPH-137EE;Lo;0;L;;;;;N;;;;; +137EF;EGYPTIAN HIEROGLYPH-137EF;Lo;0;L;;;;;N;;;;; +137F0;EGYPTIAN HIEROGLYPH-137F0;Lo;0;L;;;;;N;;;;; +137F1;EGYPTIAN HIEROGLYPH-137F1;Lo;0;L;;;;;N;;;;; +137F2;EGYPTIAN HIEROGLYPH-137F2;Lo;0;L;;;;;N;;;;; +137F3;EGYPTIAN HIEROGLYPH-137F3;Lo;0;L;;;;;N;;;;; +137F4;EGYPTIAN HIEROGLYPH-137F4;Lo;0;L;;;;;N;;;;; +137F5;EGYPTIAN HIEROGLYPH-137F5;Lo;0;L;;;;;N;;;;; +137F6;EGYPTIAN HIEROGLYPH-137F6;Lo;0;L;;;;;N;;;;; +137F7;EGYPTIAN HIEROGLYPH-137F7;Lo;0;L;;;;;N;;;;; +137F8;EGYPTIAN HIEROGLYPH-137F8;Lo;0;L;;;;;N;;;;; +137F9;EGYPTIAN HIEROGLYPH-137F9;Lo;0;L;;;;;N;;;;; +137FA;EGYPTIAN HIEROGLYPH-137FA;Lo;0;L;;;;;N;;;;; +137FB;EGYPTIAN HIEROGLYPH-137FB;Lo;0;L;;;;;N;;;;; +137FC;EGYPTIAN HIEROGLYPH-137FC;Lo;0;L;;;;;N;;;;; +137FD;EGYPTIAN HIEROGLYPH-137FD;Lo;0;L;;;;;N;;;;; +137FE;EGYPTIAN HIEROGLYPH-137FE;Lo;0;L;;;;;N;;;;; +137FF;EGYPTIAN HIEROGLYPH-137FF;Lo;0;L;;;;;N;;;;; +13800;EGYPTIAN HIEROGLYPH-13800;Lo;0;L;;;;;N;;;;; +13801;EGYPTIAN HIEROGLYPH-13801;Lo;0;L;;;;;N;;;;; +13802;EGYPTIAN HIEROGLYPH-13802;Lo;0;L;;;;;N;;;;; +13803;EGYPTIAN HIEROGLYPH-13803;Lo;0;L;;;;;N;;;;; +13804;EGYPTIAN HIEROGLYPH-13804;Lo;0;L;;;;;N;;;;; +13805;EGYPTIAN HIEROGLYPH-13805;Lo;0;L;;;;;N;;;;; +13806;EGYPTIAN HIEROGLYPH-13806;Lo;0;L;;;;;N;;;;; +13807;EGYPTIAN HIEROGLYPH-13807;Lo;0;L;;;;;N;;;;; +13808;EGYPTIAN HIEROGLYPH-13808;Lo;0;L;;;;;N;;;;; +13809;EGYPTIAN HIEROGLYPH-13809;Lo;0;L;;;;;N;;;;; +1380A;EGYPTIAN HIEROGLYPH-1380A;Lo;0;L;;;;;N;;;;; +1380B;EGYPTIAN HIEROGLYPH-1380B;Lo;0;L;;;;;N;;;;; +1380C;EGYPTIAN HIEROGLYPH-1380C;Lo;0;L;;;;;N;;;;; +1380D;EGYPTIAN HIEROGLYPH-1380D;Lo;0;L;;;;;N;;;;; +1380E;EGYPTIAN HIEROGLYPH-1380E;Lo;0;L;;;;;N;;;;; +1380F;EGYPTIAN HIEROGLYPH-1380F;Lo;0;L;;;;;N;;;;; +13810;EGYPTIAN HIEROGLYPH-13810;Lo;0;L;;;;;N;;;;; +13811;EGYPTIAN HIEROGLYPH-13811;Lo;0;L;;;;;N;;;;; +13812;EGYPTIAN HIEROGLYPH-13812;Lo;0;L;;;;;N;;;;; +13813;EGYPTIAN HIEROGLYPH-13813;Lo;0;L;;;;;N;;;;; +13814;EGYPTIAN HIEROGLYPH-13814;Lo;0;L;;;;;N;;;;; +13815;EGYPTIAN HIEROGLYPH-13815;Lo;0;L;;;;;N;;;;; +13816;EGYPTIAN HIEROGLYPH-13816;Lo;0;L;;;;;N;;;;; +13817;EGYPTIAN HIEROGLYPH-13817;Lo;0;L;;;;;N;;;;; +13818;EGYPTIAN HIEROGLYPH-13818;Lo;0;L;;;;;N;;;;; +13819;EGYPTIAN HIEROGLYPH-13819;Lo;0;L;;;;;N;;;;; +1381A;EGYPTIAN HIEROGLYPH-1381A;Lo;0;L;;;;;N;;;;; +1381B;EGYPTIAN HIEROGLYPH-1381B;Lo;0;L;;;;;N;;;;; +1381C;EGYPTIAN HIEROGLYPH-1381C;Lo;0;L;;;;;N;;;;; +1381D;EGYPTIAN HIEROGLYPH-1381D;Lo;0;L;;;;;N;;;;; +1381E;EGYPTIAN HIEROGLYPH-1381E;Lo;0;L;;;;;N;;;;; +1381F;EGYPTIAN HIEROGLYPH-1381F;Lo;0;L;;;;;N;;;;; +13820;EGYPTIAN HIEROGLYPH-13820;Lo;0;L;;;;;N;;;;; +13821;EGYPTIAN HIEROGLYPH-13821;Lo;0;L;;;;;N;;;;; +13822;EGYPTIAN HIEROGLYPH-13822;Lo;0;L;;;;;N;;;;; +13823;EGYPTIAN HIEROGLYPH-13823;Lo;0;L;;;;;N;;;;; +13824;EGYPTIAN HIEROGLYPH-13824;Lo;0;L;;;;;N;;;;; +13825;EGYPTIAN HIEROGLYPH-13825;Lo;0;L;;;;;N;;;;; +13826;EGYPTIAN HIEROGLYPH-13826;Lo;0;L;;;;;N;;;;; +13827;EGYPTIAN HIEROGLYPH-13827;Lo;0;L;;;;;N;;;;; +13828;EGYPTIAN HIEROGLYPH-13828;Lo;0;L;;;;;N;;;;; +13829;EGYPTIAN HIEROGLYPH-13829;Lo;0;L;;;;;N;;;;; +1382A;EGYPTIAN HIEROGLYPH-1382A;Lo;0;L;;;;;N;;;;; +1382B;EGYPTIAN HIEROGLYPH-1382B;Lo;0;L;;;;;N;;;;; +1382C;EGYPTIAN HIEROGLYPH-1382C;Lo;0;L;;;;;N;;;;; +1382D;EGYPTIAN HIEROGLYPH-1382D;Lo;0;L;;;;;N;;;;; +1382E;EGYPTIAN HIEROGLYPH-1382E;Lo;0;L;;;;;N;;;;; +1382F;EGYPTIAN HIEROGLYPH-1382F;Lo;0;L;;;;;N;;;;; +13830;EGYPTIAN HIEROGLYPH-13830;Lo;0;L;;;;;N;;;;; +13831;EGYPTIAN HIEROGLYPH-13831;Lo;0;L;;;;;N;;;;; +13832;EGYPTIAN HIEROGLYPH-13832;Lo;0;L;;;;;N;;;;; +13833;EGYPTIAN HIEROGLYPH-13833;Lo;0;L;;;;;N;;;;; +13834;EGYPTIAN HIEROGLYPH-13834;Lo;0;L;;;;;N;;;;; +13835;EGYPTIAN HIEROGLYPH-13835;Lo;0;L;;;;;N;;;;; +13836;EGYPTIAN HIEROGLYPH-13836;Lo;0;L;;;;;N;;;;; +13837;EGYPTIAN HIEROGLYPH-13837;Lo;0;L;;;;;N;;;;; +13838;EGYPTIAN HIEROGLYPH-13838;Lo;0;L;;;;;N;;;;; +13839;EGYPTIAN HIEROGLYPH-13839;Lo;0;L;;;;;N;;;;; +1383A;EGYPTIAN HIEROGLYPH-1383A;Lo;0;L;;;;;N;;;;; +1383B;EGYPTIAN HIEROGLYPH-1383B;Lo;0;L;;;;;N;;;;; +1383C;EGYPTIAN HIEROGLYPH-1383C;Lo;0;L;;;;;N;;;;; +1383D;EGYPTIAN HIEROGLYPH-1383D;Lo;0;L;;;;;N;;;;; +1383E;EGYPTIAN HIEROGLYPH-1383E;Lo;0;L;;;;;N;;;;; +1383F;EGYPTIAN HIEROGLYPH-1383F;Lo;0;L;;;;;N;;;;; +13840;EGYPTIAN HIEROGLYPH-13840;Lo;0;L;;;;;N;;;;; +13841;EGYPTIAN HIEROGLYPH-13841;Lo;0;L;;;;;N;;;;; +13842;EGYPTIAN HIEROGLYPH-13842;Lo;0;L;;;;;N;;;;; +13843;EGYPTIAN HIEROGLYPH-13843;Lo;0;L;;;;;N;;;;; +13844;EGYPTIAN HIEROGLYPH-13844;Lo;0;L;;;;;N;;;;; +13845;EGYPTIAN HIEROGLYPH-13845;Lo;0;L;;;;;N;;;;; +13846;EGYPTIAN HIEROGLYPH-13846;Lo;0;L;;;;;N;;;;; +13847;EGYPTIAN HIEROGLYPH-13847;Lo;0;L;;;;;N;;;;; +13848;EGYPTIAN HIEROGLYPH-13848;Lo;0;L;;;;;N;;;;; +13849;EGYPTIAN HIEROGLYPH-13849;Lo;0;L;;;;;N;;;;; +1384A;EGYPTIAN HIEROGLYPH-1384A;Lo;0;L;;;;;N;;;;; +1384B;EGYPTIAN HIEROGLYPH-1384B;Lo;0;L;;;;;N;;;;; +1384C;EGYPTIAN HIEROGLYPH-1384C;Lo;0;L;;;;;N;;;;; +1384D;EGYPTIAN HIEROGLYPH-1384D;Lo;0;L;;;;;N;;;;; +1384E;EGYPTIAN HIEROGLYPH-1384E;Lo;0;L;;;;;N;;;;; +1384F;EGYPTIAN HIEROGLYPH-1384F;Lo;0;L;;;;;N;;;;; +13850;EGYPTIAN HIEROGLYPH-13850;Lo;0;L;;;;;N;;;;; +13851;EGYPTIAN HIEROGLYPH-13851;Lo;0;L;;;;;N;;;;; +13852;EGYPTIAN HIEROGLYPH-13852;Lo;0;L;;;;;N;;;;; +13853;EGYPTIAN HIEROGLYPH-13853;Lo;0;L;;;;;N;;;;; +13854;EGYPTIAN HIEROGLYPH-13854;Lo;0;L;;;;;N;;;;; +13855;EGYPTIAN HIEROGLYPH-13855;Lo;0;L;;;;;N;;;;; +13856;EGYPTIAN HIEROGLYPH-13856;Lo;0;L;;;;;N;;;;; +13857;EGYPTIAN HIEROGLYPH-13857;Lo;0;L;;;;;N;;;;; +13858;EGYPTIAN HIEROGLYPH-13858;Lo;0;L;;;;;N;;;;; +13859;EGYPTIAN HIEROGLYPH-13859;Lo;0;L;;;;;N;;;;; +1385A;EGYPTIAN HIEROGLYPH-1385A;Lo;0;L;;;;;N;;;;; +1385B;EGYPTIAN HIEROGLYPH-1385B;Lo;0;L;;;;;N;;;;; +1385C;EGYPTIAN HIEROGLYPH-1385C;Lo;0;L;;;;;N;;;;; +1385D;EGYPTIAN HIEROGLYPH-1385D;Lo;0;L;;;;;N;;;;; +1385E;EGYPTIAN HIEROGLYPH-1385E;Lo;0;L;;;;;N;;;;; +1385F;EGYPTIAN HIEROGLYPH-1385F;Lo;0;L;;;;;N;;;;; +13860;EGYPTIAN HIEROGLYPH-13860;Lo;0;L;;;;;N;;;;; +13861;EGYPTIAN HIEROGLYPH-13861;Lo;0;L;;;;;N;;;;; +13862;EGYPTIAN HIEROGLYPH-13862;Lo;0;L;;;;;N;;;;; +13863;EGYPTIAN HIEROGLYPH-13863;Lo;0;L;;;;;N;;;;; +13864;EGYPTIAN HIEROGLYPH-13864;Lo;0;L;;;;;N;;;;; +13865;EGYPTIAN HIEROGLYPH-13865;Lo;0;L;;;;;N;;;;; +13866;EGYPTIAN HIEROGLYPH-13866;Lo;0;L;;;;;N;;;;; +13867;EGYPTIAN HIEROGLYPH-13867;Lo;0;L;;;;;N;;;;; +13868;EGYPTIAN HIEROGLYPH-13868;Lo;0;L;;;;;N;;;;; +13869;EGYPTIAN HIEROGLYPH-13869;Lo;0;L;;;;;N;;;;; +1386A;EGYPTIAN HIEROGLYPH-1386A;Lo;0;L;;;;;N;;;;; +1386B;EGYPTIAN HIEROGLYPH-1386B;Lo;0;L;;;;;N;;;;; +1386C;EGYPTIAN HIEROGLYPH-1386C;Lo;0;L;;;;;N;;;;; +1386D;EGYPTIAN HIEROGLYPH-1386D;Lo;0;L;;;;;N;;;;; +1386E;EGYPTIAN HIEROGLYPH-1386E;Lo;0;L;;;;;N;;;;; +1386F;EGYPTIAN HIEROGLYPH-1386F;Lo;0;L;;;;;N;;;;; +13870;EGYPTIAN HIEROGLYPH-13870;Lo;0;L;;;;;N;;;;; +13871;EGYPTIAN HIEROGLYPH-13871;Lo;0;L;;;;;N;;;;; +13872;EGYPTIAN HIEROGLYPH-13872;Lo;0;L;;;;;N;;;;; +13873;EGYPTIAN HIEROGLYPH-13873;Lo;0;L;;;;;N;;;;; +13874;EGYPTIAN HIEROGLYPH-13874;Lo;0;L;;;;;N;;;;; +13875;EGYPTIAN HIEROGLYPH-13875;Lo;0;L;;;;;N;;;;; +13876;EGYPTIAN HIEROGLYPH-13876;Lo;0;L;;;;;N;;;;; +13877;EGYPTIAN HIEROGLYPH-13877;Lo;0;L;;;;;N;;;;; +13878;EGYPTIAN HIEROGLYPH-13878;Lo;0;L;;;;;N;;;;; +13879;EGYPTIAN HIEROGLYPH-13879;Lo;0;L;;;;;N;;;;; +1387A;EGYPTIAN HIEROGLYPH-1387A;Lo;0;L;;;;;N;;;;; +1387B;EGYPTIAN HIEROGLYPH-1387B;Lo;0;L;;;;;N;;;;; +1387C;EGYPTIAN HIEROGLYPH-1387C;Lo;0;L;;;;;N;;;;; +1387D;EGYPTIAN HIEROGLYPH-1387D;Lo;0;L;;;;;N;;;;; +1387E;EGYPTIAN HIEROGLYPH-1387E;Lo;0;L;;;;;N;;;;; +1387F;EGYPTIAN HIEROGLYPH-1387F;Lo;0;L;;;;;N;;;;; +13880;EGYPTIAN HIEROGLYPH-13880;Lo;0;L;;;;;N;;;;; +13881;EGYPTIAN HIEROGLYPH-13881;Lo;0;L;;;;;N;;;;; +13882;EGYPTIAN HIEROGLYPH-13882;Lo;0;L;;;;;N;;;;; +13883;EGYPTIAN HIEROGLYPH-13883;Lo;0;L;;;;;N;;;;; +13884;EGYPTIAN HIEROGLYPH-13884;Lo;0;L;;;;;N;;;;; +13885;EGYPTIAN HIEROGLYPH-13885;Lo;0;L;;;;;N;;;;; +13886;EGYPTIAN HIEROGLYPH-13886;Lo;0;L;;;;;N;;;;; +13887;EGYPTIAN HIEROGLYPH-13887;Lo;0;L;;;;;N;;;;; +13888;EGYPTIAN HIEROGLYPH-13888;Lo;0;L;;;;;N;;;;; +13889;EGYPTIAN HIEROGLYPH-13889;Lo;0;L;;;;;N;;;;; +1388A;EGYPTIAN HIEROGLYPH-1388A;Lo;0;L;;;;;N;;;;; +1388B;EGYPTIAN HIEROGLYPH-1388B;Lo;0;L;;;;;N;;;;; +1388C;EGYPTIAN HIEROGLYPH-1388C;Lo;0;L;;;;;N;;;;; +1388D;EGYPTIAN HIEROGLYPH-1388D;Lo;0;L;;;;;N;;;;; +1388E;EGYPTIAN HIEROGLYPH-1388E;Lo;0;L;;;;;N;;;;; +1388F;EGYPTIAN HIEROGLYPH-1388F;Lo;0;L;;;;;N;;;;; +13890;EGYPTIAN HIEROGLYPH-13890;Lo;0;L;;;;;N;;;;; +13891;EGYPTIAN HIEROGLYPH-13891;Lo;0;L;;;;;N;;;;; +13892;EGYPTIAN HIEROGLYPH-13892;Lo;0;L;;;;;N;;;;; +13893;EGYPTIAN HIEROGLYPH-13893;Lo;0;L;;;;;N;;;;; +13894;EGYPTIAN HIEROGLYPH-13894;Lo;0;L;;;;;N;;;;; +13895;EGYPTIAN HIEROGLYPH-13895;Lo;0;L;;;;;N;;;;; +13896;EGYPTIAN HIEROGLYPH-13896;Lo;0;L;;;;;N;;;;; +13897;EGYPTIAN HIEROGLYPH-13897;Lo;0;L;;;;;N;;;;; +13898;EGYPTIAN HIEROGLYPH-13898;Lo;0;L;;;;;N;;;;; +13899;EGYPTIAN HIEROGLYPH-13899;Lo;0;L;;;;;N;;;;; +1389A;EGYPTIAN HIEROGLYPH-1389A;Lo;0;L;;;;;N;;;;; +1389B;EGYPTIAN HIEROGLYPH-1389B;Lo;0;L;;;;;N;;;;; +1389C;EGYPTIAN HIEROGLYPH-1389C;Lo;0;L;;;;;N;;;;; +1389D;EGYPTIAN HIEROGLYPH-1389D;Lo;0;L;;;;;N;;;;; +1389E;EGYPTIAN HIEROGLYPH-1389E;Lo;0;L;;;;;N;;;;; +1389F;EGYPTIAN HIEROGLYPH-1389F;Lo;0;L;;;;;N;;;;; +138A0;EGYPTIAN HIEROGLYPH-138A0;Lo;0;L;;;;;N;;;;; +138A1;EGYPTIAN HIEROGLYPH-138A1;Lo;0;L;;;;;N;;;;; +138A2;EGYPTIAN HIEROGLYPH-138A2;Lo;0;L;;;;;N;;;;; +138A3;EGYPTIAN HIEROGLYPH-138A3;Lo;0;L;;;;;N;;;;; +138A4;EGYPTIAN HIEROGLYPH-138A4;Lo;0;L;;;;;N;;;;; +138A5;EGYPTIAN HIEROGLYPH-138A5;Lo;0;L;;;;;N;;;;; +138A6;EGYPTIAN HIEROGLYPH-138A6;Lo;0;L;;;;;N;;;;; +138A7;EGYPTIAN HIEROGLYPH-138A7;Lo;0;L;;;;;N;;;;; +138A8;EGYPTIAN HIEROGLYPH-138A8;Lo;0;L;;;;;N;;;;; +138A9;EGYPTIAN HIEROGLYPH-138A9;Lo;0;L;;;;;N;;;;; +138AA;EGYPTIAN HIEROGLYPH-138AA;Lo;0;L;;;;;N;;;;; +138AB;EGYPTIAN HIEROGLYPH-138AB;Lo;0;L;;;;;N;;;;; +138AC;EGYPTIAN HIEROGLYPH-138AC;Lo;0;L;;;;;N;;;;; +138AD;EGYPTIAN HIEROGLYPH-138AD;Lo;0;L;;;;;N;;;;; +138AE;EGYPTIAN HIEROGLYPH-138AE;Lo;0;L;;;;;N;;;;; +138AF;EGYPTIAN HIEROGLYPH-138AF;Lo;0;L;;;;;N;;;;; +138B0;EGYPTIAN HIEROGLYPH-138B0;Lo;0;L;;;;;N;;;;; +138B1;EGYPTIAN HIEROGLYPH-138B1;Lo;0;L;;;;;N;;;;; +138B2;EGYPTIAN HIEROGLYPH-138B2;Lo;0;L;;;;;N;;;;; +138B3;EGYPTIAN HIEROGLYPH-138B3;Lo;0;L;;;;;N;;;;; +138B4;EGYPTIAN HIEROGLYPH-138B4;Lo;0;L;;;;;N;;;;; +138B5;EGYPTIAN HIEROGLYPH-138B5;Lo;0;L;;;;;N;;;;; +138B6;EGYPTIAN HIEROGLYPH-138B6;Lo;0;L;;;;;N;;;;; +138B7;EGYPTIAN HIEROGLYPH-138B7;Lo;0;L;;;;;N;;;;; +138B8;EGYPTIAN HIEROGLYPH-138B8;Lo;0;L;;;;;N;;;;; +138B9;EGYPTIAN HIEROGLYPH-138B9;Lo;0;L;;;;;N;;;;; +138BA;EGYPTIAN HIEROGLYPH-138BA;Lo;0;L;;;;;N;;;;; +138BB;EGYPTIAN HIEROGLYPH-138BB;Lo;0;L;;;;;N;;;;; +138BC;EGYPTIAN HIEROGLYPH-138BC;Lo;0;L;;;;;N;;;;; +138BD;EGYPTIAN HIEROGLYPH-138BD;Lo;0;L;;;;;N;;;;; +138BE;EGYPTIAN HIEROGLYPH-138BE;Lo;0;L;;;;;N;;;;; +138BF;EGYPTIAN HIEROGLYPH-138BF;Lo;0;L;;;;;N;;;;; +138C0;EGYPTIAN HIEROGLYPH-138C0;Lo;0;L;;;;;N;;;;; +138C1;EGYPTIAN HIEROGLYPH-138C1;Lo;0;L;;;;;N;;;;; +138C2;EGYPTIAN HIEROGLYPH-138C2;Lo;0;L;;;;;N;;;;; +138C3;EGYPTIAN HIEROGLYPH-138C3;Lo;0;L;;;;;N;;;;; +138C4;EGYPTIAN HIEROGLYPH-138C4;Lo;0;L;;;;;N;;;;; +138C5;EGYPTIAN HIEROGLYPH-138C5;Lo;0;L;;;;;N;;;;; +138C6;EGYPTIAN HIEROGLYPH-138C6;Lo;0;L;;;;;N;;;;; +138C7;EGYPTIAN HIEROGLYPH-138C7;Lo;0;L;;;;;N;;;;; +138C8;EGYPTIAN HIEROGLYPH-138C8;Lo;0;L;;;;;N;;;;; +138C9;EGYPTIAN HIEROGLYPH-138C9;Lo;0;L;;;;;N;;;;; +138CA;EGYPTIAN HIEROGLYPH-138CA;Lo;0;L;;;;;N;;;;; +138CB;EGYPTIAN HIEROGLYPH-138CB;Lo;0;L;;;;;N;;;;; +138CC;EGYPTIAN HIEROGLYPH-138CC;Lo;0;L;;;;;N;;;;; +138CD;EGYPTIAN HIEROGLYPH-138CD;Lo;0;L;;;;;N;;;;; +138CE;EGYPTIAN HIEROGLYPH-138CE;Lo;0;L;;;;;N;;;;; +138CF;EGYPTIAN HIEROGLYPH-138CF;Lo;0;L;;;;;N;;;;; +138D0;EGYPTIAN HIEROGLYPH-138D0;Lo;0;L;;;;;N;;;;; +138D1;EGYPTIAN HIEROGLYPH-138D1;Lo;0;L;;;;;N;;;;; +138D2;EGYPTIAN HIEROGLYPH-138D2;Lo;0;L;;;;;N;;;;; +138D3;EGYPTIAN HIEROGLYPH-138D3;Lo;0;L;;;;;N;;;;; +138D4;EGYPTIAN HIEROGLYPH-138D4;Lo;0;L;;;;;N;;;;; +138D5;EGYPTIAN HIEROGLYPH-138D5;Lo;0;L;;;;;N;;;;; +138D6;EGYPTIAN HIEROGLYPH-138D6;Lo;0;L;;;;;N;;;;; +138D7;EGYPTIAN HIEROGLYPH-138D7;Lo;0;L;;;;;N;;;;; +138D8;EGYPTIAN HIEROGLYPH-138D8;Lo;0;L;;;;;N;;;;; +138D9;EGYPTIAN HIEROGLYPH-138D9;Lo;0;L;;;;;N;;;;; +138DA;EGYPTIAN HIEROGLYPH-138DA;Lo;0;L;;;;;N;;;;; +138DB;EGYPTIAN HIEROGLYPH-138DB;Lo;0;L;;;;;N;;;;; +138DC;EGYPTIAN HIEROGLYPH-138DC;Lo;0;L;;;;;N;;;;; +138DD;EGYPTIAN HIEROGLYPH-138DD;Lo;0;L;;;;;N;;;;; +138DE;EGYPTIAN HIEROGLYPH-138DE;Lo;0;L;;;;;N;;;;; +138DF;EGYPTIAN HIEROGLYPH-138DF;Lo;0;L;;;;;N;;;;; +138E0;EGYPTIAN HIEROGLYPH-138E0;Lo;0;L;;;;;N;;;;; +138E1;EGYPTIAN HIEROGLYPH-138E1;Lo;0;L;;;;;N;;;;; +138E2;EGYPTIAN HIEROGLYPH-138E2;Lo;0;L;;;;;N;;;;; +138E3;EGYPTIAN HIEROGLYPH-138E3;Lo;0;L;;;;;N;;;;; +138E4;EGYPTIAN HIEROGLYPH-138E4;Lo;0;L;;;;;N;;;;; +138E5;EGYPTIAN HIEROGLYPH-138E5;Lo;0;L;;;;;N;;;;; +138E6;EGYPTIAN HIEROGLYPH-138E6;Lo;0;L;;;;;N;;;;; +138E7;EGYPTIAN HIEROGLYPH-138E7;Lo;0;L;;;;;N;;;;; +138E8;EGYPTIAN HIEROGLYPH-138E8;Lo;0;L;;;;;N;;;;; +138E9;EGYPTIAN HIEROGLYPH-138E9;Lo;0;L;;;;;N;;;;; +138EA;EGYPTIAN HIEROGLYPH-138EA;Lo;0;L;;;;;N;;;;; +138EB;EGYPTIAN HIEROGLYPH-138EB;Lo;0;L;;;;;N;;;;; +138EC;EGYPTIAN HIEROGLYPH-138EC;Lo;0;L;;;;;N;;;;; +138ED;EGYPTIAN HIEROGLYPH-138ED;Lo;0;L;;;;;N;;;;; +138EE;EGYPTIAN HIEROGLYPH-138EE;Lo;0;L;;;;;N;;;;; +138EF;EGYPTIAN HIEROGLYPH-138EF;Lo;0;L;;;;;N;;;;; +138F0;EGYPTIAN HIEROGLYPH-138F0;Lo;0;L;;;;;N;;;;; +138F1;EGYPTIAN HIEROGLYPH-138F1;Lo;0;L;;;;;N;;;;; +138F2;EGYPTIAN HIEROGLYPH-138F2;Lo;0;L;;;;;N;;;;; +138F3;EGYPTIAN HIEROGLYPH-138F3;Lo;0;L;;;;;N;;;;; +138F4;EGYPTIAN HIEROGLYPH-138F4;Lo;0;L;;;;;N;;;;; +138F5;EGYPTIAN HIEROGLYPH-138F5;Lo;0;L;;;;;N;;;;; +138F6;EGYPTIAN HIEROGLYPH-138F6;Lo;0;L;;;;;N;;;;; +138F7;EGYPTIAN HIEROGLYPH-138F7;Lo;0;L;;;;;N;;;;; +138F8;EGYPTIAN HIEROGLYPH-138F8;Lo;0;L;;;;;N;;;;; +138F9;EGYPTIAN HIEROGLYPH-138F9;Lo;0;L;;;;;N;;;;; +138FA;EGYPTIAN HIEROGLYPH-138FA;Lo;0;L;;;;;N;;;;; +138FB;EGYPTIAN HIEROGLYPH-138FB;Lo;0;L;;;;;N;;;;; +138FC;EGYPTIAN HIEROGLYPH-138FC;Lo;0;L;;;;;N;;;;; +138FD;EGYPTIAN HIEROGLYPH-138FD;Lo;0;L;;;;;N;;;;; +138FE;EGYPTIAN HIEROGLYPH-138FE;Lo;0;L;;;;;N;;;;; +138FF;EGYPTIAN HIEROGLYPH-138FF;Lo;0;L;;;;;N;;;;; +13900;EGYPTIAN HIEROGLYPH-13900;Lo;0;L;;;;;N;;;;; +13901;EGYPTIAN HIEROGLYPH-13901;Lo;0;L;;;;;N;;;;; +13902;EGYPTIAN HIEROGLYPH-13902;Lo;0;L;;;;;N;;;;; +13903;EGYPTIAN HIEROGLYPH-13903;Lo;0;L;;;;;N;;;;; +13904;EGYPTIAN HIEROGLYPH-13904;Lo;0;L;;;;;N;;;;; +13905;EGYPTIAN HIEROGLYPH-13905;Lo;0;L;;;;;N;;;;; +13906;EGYPTIAN HIEROGLYPH-13906;Lo;0;L;;;;;N;;;;; +13907;EGYPTIAN HIEROGLYPH-13907;Lo;0;L;;;;;N;;;;; +13908;EGYPTIAN HIEROGLYPH-13908;Lo;0;L;;;;;N;;;;; +13909;EGYPTIAN HIEROGLYPH-13909;Lo;0;L;;;;;N;;;;; +1390A;EGYPTIAN HIEROGLYPH-1390A;Lo;0;L;;;;;N;;;;; +1390B;EGYPTIAN HIEROGLYPH-1390B;Lo;0;L;;;;;N;;;;; +1390C;EGYPTIAN HIEROGLYPH-1390C;Lo;0;L;;;;;N;;;;; +1390D;EGYPTIAN HIEROGLYPH-1390D;Lo;0;L;;;;;N;;;;; +1390E;EGYPTIAN HIEROGLYPH-1390E;Lo;0;L;;;;;N;;;;; +1390F;EGYPTIAN HIEROGLYPH-1390F;Lo;0;L;;;;;N;;;;; +13910;EGYPTIAN HIEROGLYPH-13910;Lo;0;L;;;;;N;;;;; +13911;EGYPTIAN HIEROGLYPH-13911;Lo;0;L;;;;;N;;;;; +13912;EGYPTIAN HIEROGLYPH-13912;Lo;0;L;;;;;N;;;;; +13913;EGYPTIAN HIEROGLYPH-13913;Lo;0;L;;;;;N;;;;; +13914;EGYPTIAN HIEROGLYPH-13914;Lo;0;L;;;;;N;;;;; +13915;EGYPTIAN HIEROGLYPH-13915;Lo;0;L;;;;;N;;;;; +13916;EGYPTIAN HIEROGLYPH-13916;Lo;0;L;;;;;N;;;;; +13917;EGYPTIAN HIEROGLYPH-13917;Lo;0;L;;;;;N;;;;; +13918;EGYPTIAN HIEROGLYPH-13918;Lo;0;L;;;;;N;;;;; +13919;EGYPTIAN HIEROGLYPH-13919;Lo;0;L;;;;;N;;;;; +1391A;EGYPTIAN HIEROGLYPH-1391A;Lo;0;L;;;;;N;;;;; +1391B;EGYPTIAN HIEROGLYPH-1391B;Lo;0;L;;;;;N;;;;; +1391C;EGYPTIAN HIEROGLYPH-1391C;Lo;0;L;;;;;N;;;;; +1391D;EGYPTIAN HIEROGLYPH-1391D;Lo;0;L;;;;;N;;;;; +1391E;EGYPTIAN HIEROGLYPH-1391E;Lo;0;L;;;;;N;;;;; +1391F;EGYPTIAN HIEROGLYPH-1391F;Lo;0;L;;;;;N;;;;; +13920;EGYPTIAN HIEROGLYPH-13920;Lo;0;L;;;;;N;;;;; +13921;EGYPTIAN HIEROGLYPH-13921;Lo;0;L;;;;;N;;;;; +13922;EGYPTIAN HIEROGLYPH-13922;Lo;0;L;;;;;N;;;;; +13923;EGYPTIAN HIEROGLYPH-13923;Lo;0;L;;;;;N;;;;; +13924;EGYPTIAN HIEROGLYPH-13924;Lo;0;L;;;;;N;;;;; +13925;EGYPTIAN HIEROGLYPH-13925;Lo;0;L;;;;;N;;;;; +13926;EGYPTIAN HIEROGLYPH-13926;Lo;0;L;;;;;N;;;;; +13927;EGYPTIAN HIEROGLYPH-13927;Lo;0;L;;;;;N;;;;; +13928;EGYPTIAN HIEROGLYPH-13928;Lo;0;L;;;;;N;;;;; +13929;EGYPTIAN HIEROGLYPH-13929;Lo;0;L;;;;;N;;;;; +1392A;EGYPTIAN HIEROGLYPH-1392A;Lo;0;L;;;;;N;;;;; +1392B;EGYPTIAN HIEROGLYPH-1392B;Lo;0;L;;;;;N;;;;; +1392C;EGYPTIAN HIEROGLYPH-1392C;Lo;0;L;;;;;N;;;;; +1392D;EGYPTIAN HIEROGLYPH-1392D;Lo;0;L;;;;;N;;;;; +1392E;EGYPTIAN HIEROGLYPH-1392E;Lo;0;L;;;;;N;;;;; +1392F;EGYPTIAN HIEROGLYPH-1392F;Lo;0;L;;;;;N;;;;; +13930;EGYPTIAN HIEROGLYPH-13930;Lo;0;L;;;;;N;;;;; +13931;EGYPTIAN HIEROGLYPH-13931;Lo;0;L;;;;;N;;;;; +13932;EGYPTIAN HIEROGLYPH-13932;Lo;0;L;;;;;N;;;;; +13933;EGYPTIAN HIEROGLYPH-13933;Lo;0;L;;;;;N;;;;; +13934;EGYPTIAN HIEROGLYPH-13934;Lo;0;L;;;;;N;;;;; +13935;EGYPTIAN HIEROGLYPH-13935;Lo;0;L;;;;;N;;;;; +13936;EGYPTIAN HIEROGLYPH-13936;Lo;0;L;;;;;N;;;;; +13937;EGYPTIAN HIEROGLYPH-13937;Lo;0;L;;;;;N;;;;; +13938;EGYPTIAN HIEROGLYPH-13938;Lo;0;L;;;;;N;;;;; +13939;EGYPTIAN HIEROGLYPH-13939;Lo;0;L;;;;;N;;;;; +1393A;EGYPTIAN HIEROGLYPH-1393A;Lo;0;L;;;;;N;;;;; +1393B;EGYPTIAN HIEROGLYPH-1393B;Lo;0;L;;;;;N;;;;; +1393C;EGYPTIAN HIEROGLYPH-1393C;Lo;0;L;;;;;N;;;;; +1393D;EGYPTIAN HIEROGLYPH-1393D;Lo;0;L;;;;;N;;;;; +1393E;EGYPTIAN HIEROGLYPH-1393E;Lo;0;L;;;;;N;;;;; +1393F;EGYPTIAN HIEROGLYPH-1393F;Lo;0;L;;;;;N;;;;; +13940;EGYPTIAN HIEROGLYPH-13940;Lo;0;L;;;;;N;;;;; +13941;EGYPTIAN HIEROGLYPH-13941;Lo;0;L;;;;;N;;;;; +13942;EGYPTIAN HIEROGLYPH-13942;Lo;0;L;;;;;N;;;;; +13943;EGYPTIAN HIEROGLYPH-13943;Lo;0;L;;;;;N;;;;; +13944;EGYPTIAN HIEROGLYPH-13944;Lo;0;L;;;;;N;;;;; +13945;EGYPTIAN HIEROGLYPH-13945;Lo;0;L;;;;;N;;;;; +13946;EGYPTIAN HIEROGLYPH-13946;Lo;0;L;;;;;N;;;;; +13947;EGYPTIAN HIEROGLYPH-13947;Lo;0;L;;;;;N;;;;; +13948;EGYPTIAN HIEROGLYPH-13948;Lo;0;L;;;;;N;;;;; +13949;EGYPTIAN HIEROGLYPH-13949;Lo;0;L;;;;;N;;;;; +1394A;EGYPTIAN HIEROGLYPH-1394A;Lo;0;L;;;;;N;;;;; +1394B;EGYPTIAN HIEROGLYPH-1394B;Lo;0;L;;;;;N;;;;; +1394C;EGYPTIAN HIEROGLYPH-1394C;Lo;0;L;;;;;N;;;;; +1394D;EGYPTIAN HIEROGLYPH-1394D;Lo;0;L;;;;;N;;;;; +1394E;EGYPTIAN HIEROGLYPH-1394E;Lo;0;L;;;;;N;;;;; +1394F;EGYPTIAN HIEROGLYPH-1394F;Lo;0;L;;;;;N;;;;; +13950;EGYPTIAN HIEROGLYPH-13950;Lo;0;L;;;;;N;;;;; +13951;EGYPTIAN HIEROGLYPH-13951;Lo;0;L;;;;;N;;;;; +13952;EGYPTIAN HIEROGLYPH-13952;Lo;0;L;;;;;N;;;;; +13953;EGYPTIAN HIEROGLYPH-13953;Lo;0;L;;;;;N;;;;; +13954;EGYPTIAN HIEROGLYPH-13954;Lo;0;L;;;;;N;;;;; +13955;EGYPTIAN HIEROGLYPH-13955;Lo;0;L;;;;;N;;;;; +13956;EGYPTIAN HIEROGLYPH-13956;Lo;0;L;;;;;N;;;;; +13957;EGYPTIAN HIEROGLYPH-13957;Lo;0;L;;;;;N;;;;; +13958;EGYPTIAN HIEROGLYPH-13958;Lo;0;L;;;;;N;;;;; +13959;EGYPTIAN HIEROGLYPH-13959;Lo;0;L;;;;;N;;;;; +1395A;EGYPTIAN HIEROGLYPH-1395A;Lo;0;L;;;;;N;;;;; +1395B;EGYPTIAN HIEROGLYPH-1395B;Lo;0;L;;;;;N;;;;; +1395C;EGYPTIAN HIEROGLYPH-1395C;Lo;0;L;;;;;N;;;;; +1395D;EGYPTIAN HIEROGLYPH-1395D;Lo;0;L;;;;;N;;;;; +1395E;EGYPTIAN HIEROGLYPH-1395E;Lo;0;L;;;;;N;;;;; +1395F;EGYPTIAN HIEROGLYPH-1395F;Lo;0;L;;;;;N;;;;; +13960;EGYPTIAN HIEROGLYPH-13960;Lo;0;L;;;;;N;;;;; +13961;EGYPTIAN HIEROGLYPH-13961;Lo;0;L;;;;;N;;;;; +13962;EGYPTIAN HIEROGLYPH-13962;Lo;0;L;;;;;N;;;;; +13963;EGYPTIAN HIEROGLYPH-13963;Lo;0;L;;;;;N;;;;; +13964;EGYPTIAN HIEROGLYPH-13964;Lo;0;L;;;;;N;;;;; +13965;EGYPTIAN HIEROGLYPH-13965;Lo;0;L;;;;;N;;;;; +13966;EGYPTIAN HIEROGLYPH-13966;Lo;0;L;;;;;N;;;;; +13967;EGYPTIAN HIEROGLYPH-13967;Lo;0;L;;;;;N;;;;; +13968;EGYPTIAN HIEROGLYPH-13968;Lo;0;L;;;;;N;;;;; +13969;EGYPTIAN HIEROGLYPH-13969;Lo;0;L;;;;;N;;;;; +1396A;EGYPTIAN HIEROGLYPH-1396A;Lo;0;L;;;;;N;;;;; +1396B;EGYPTIAN HIEROGLYPH-1396B;Lo;0;L;;;;;N;;;;; +1396C;EGYPTIAN HIEROGLYPH-1396C;Lo;0;L;;;;;N;;;;; +1396D;EGYPTIAN HIEROGLYPH-1396D;Lo;0;L;;;;;N;;;;; +1396E;EGYPTIAN HIEROGLYPH-1396E;Lo;0;L;;;;;N;;;;; +1396F;EGYPTIAN HIEROGLYPH-1396F;Lo;0;L;;;;;N;;;;; +13970;EGYPTIAN HIEROGLYPH-13970;Lo;0;L;;;;;N;;;;; +13971;EGYPTIAN HIEROGLYPH-13971;Lo;0;L;;;;;N;;;;; +13972;EGYPTIAN HIEROGLYPH-13972;Lo;0;L;;;;;N;;;;; +13973;EGYPTIAN HIEROGLYPH-13973;Lo;0;L;;;;;N;;;;; +13974;EGYPTIAN HIEROGLYPH-13974;Lo;0;L;;;;;N;;;;; +13975;EGYPTIAN HIEROGLYPH-13975;Lo;0;L;;;;;N;;;;; +13976;EGYPTIAN HIEROGLYPH-13976;Lo;0;L;;;;;N;;;;; +13977;EGYPTIAN HIEROGLYPH-13977;Lo;0;L;;;;;N;;;;; +13978;EGYPTIAN HIEROGLYPH-13978;Lo;0;L;;;;;N;;;;; +13979;EGYPTIAN HIEROGLYPH-13979;Lo;0;L;;;;;N;;;;; +1397A;EGYPTIAN HIEROGLYPH-1397A;Lo;0;L;;;;;N;;;;; +1397B;EGYPTIAN HIEROGLYPH-1397B;Lo;0;L;;;;;N;;;;; +1397C;EGYPTIAN HIEROGLYPH-1397C;Lo;0;L;;;;;N;;;;; +1397D;EGYPTIAN HIEROGLYPH-1397D;Lo;0;L;;;;;N;;;;; +1397E;EGYPTIAN HIEROGLYPH-1397E;Lo;0;L;;;;;N;;;;; +1397F;EGYPTIAN HIEROGLYPH-1397F;Lo;0;L;;;;;N;;;;; +13980;EGYPTIAN HIEROGLYPH-13980;Lo;0;L;;;;;N;;;;; +13981;EGYPTIAN HIEROGLYPH-13981;Lo;0;L;;;;;N;;;;; +13982;EGYPTIAN HIEROGLYPH-13982;Lo;0;L;;;;;N;;;;; +13983;EGYPTIAN HIEROGLYPH-13983;Lo;0;L;;;;;N;;;;; +13984;EGYPTIAN HIEROGLYPH-13984;Lo;0;L;;;;;N;;;;; +13985;EGYPTIAN HIEROGLYPH-13985;Lo;0;L;;;;;N;;;;; +13986;EGYPTIAN HIEROGLYPH-13986;Lo;0;L;;;;;N;;;;; +13987;EGYPTIAN HIEROGLYPH-13987;Lo;0;L;;;;;N;;;;; +13988;EGYPTIAN HIEROGLYPH-13988;Lo;0;L;;;;;N;;;;; +13989;EGYPTIAN HIEROGLYPH-13989;Lo;0;L;;;;;N;;;;; +1398A;EGYPTIAN HIEROGLYPH-1398A;Lo;0;L;;;;;N;;;;; +1398B;EGYPTIAN HIEROGLYPH-1398B;Lo;0;L;;;;;N;;;;; +1398C;EGYPTIAN HIEROGLYPH-1398C;Lo;0;L;;;;;N;;;;; +1398D;EGYPTIAN HIEROGLYPH-1398D;Lo;0;L;;;;;N;;;;; +1398E;EGYPTIAN HIEROGLYPH-1398E;Lo;0;L;;;;;N;;;;; +1398F;EGYPTIAN HIEROGLYPH-1398F;Lo;0;L;;;;;N;;;;; +13990;EGYPTIAN HIEROGLYPH-13990;Lo;0;L;;;;;N;;;;; +13991;EGYPTIAN HIEROGLYPH-13991;Lo;0;L;;;;;N;;;;; +13992;EGYPTIAN HIEROGLYPH-13992;Lo;0;L;;;;;N;;;;; +13993;EGYPTIAN HIEROGLYPH-13993;Lo;0;L;;;;;N;;;;; +13994;EGYPTIAN HIEROGLYPH-13994;Lo;0;L;;;;;N;;;;; +13995;EGYPTIAN HIEROGLYPH-13995;Lo;0;L;;;;;N;;;;; +13996;EGYPTIAN HIEROGLYPH-13996;Lo;0;L;;;;;N;;;;; +13997;EGYPTIAN HIEROGLYPH-13997;Lo;0;L;;;;;N;;;;; +13998;EGYPTIAN HIEROGLYPH-13998;Lo;0;L;;;;;N;;;;; +13999;EGYPTIAN HIEROGLYPH-13999;Lo;0;L;;;;;N;;;;; +1399A;EGYPTIAN HIEROGLYPH-1399A;Lo;0;L;;;;;N;;;;; +1399B;EGYPTIAN HIEROGLYPH-1399B;Lo;0;L;;;;;N;;;;; +1399C;EGYPTIAN HIEROGLYPH-1399C;Lo;0;L;;;;;N;;;;; +1399D;EGYPTIAN HIEROGLYPH-1399D;Lo;0;L;;;;;N;;;;; +1399E;EGYPTIAN HIEROGLYPH-1399E;Lo;0;L;;;;;N;;;;; +1399F;EGYPTIAN HIEROGLYPH-1399F;Lo;0;L;;;;;N;;;;; +139A0;EGYPTIAN HIEROGLYPH-139A0;Lo;0;L;;;;;N;;;;; +139A1;EGYPTIAN HIEROGLYPH-139A1;Lo;0;L;;;;;N;;;;; +139A2;EGYPTIAN HIEROGLYPH-139A2;Lo;0;L;;;;;N;;;;; +139A3;EGYPTIAN HIEROGLYPH-139A3;Lo;0;L;;;;;N;;;;; +139A4;EGYPTIAN HIEROGLYPH-139A4;Lo;0;L;;;;;N;;;;; +139A5;EGYPTIAN HIEROGLYPH-139A5;Lo;0;L;;;;;N;;;;; +139A6;EGYPTIAN HIEROGLYPH-139A6;Lo;0;L;;;;;N;;;;; +139A7;EGYPTIAN HIEROGLYPH-139A7;Lo;0;L;;;;;N;;;;; +139A8;EGYPTIAN HIEROGLYPH-139A8;Lo;0;L;;;;;N;;;;; +139A9;EGYPTIAN HIEROGLYPH-139A9;Lo;0;L;;;;;N;;;;; +139AA;EGYPTIAN HIEROGLYPH-139AA;Lo;0;L;;;;;N;;;;; +139AB;EGYPTIAN HIEROGLYPH-139AB;Lo;0;L;;;;;N;;;;; +139AC;EGYPTIAN HIEROGLYPH-139AC;Lo;0;L;;;;;N;;;;; +139AD;EGYPTIAN HIEROGLYPH-139AD;Lo;0;L;;;;;N;;;;; +139AE;EGYPTIAN HIEROGLYPH-139AE;Lo;0;L;;;;;N;;;;; +139AF;EGYPTIAN HIEROGLYPH-139AF;Lo;0;L;;;;;N;;;;; +139B0;EGYPTIAN HIEROGLYPH-139B0;Lo;0;L;;;;;N;;;;; +139B1;EGYPTIAN HIEROGLYPH-139B1;Lo;0;L;;;;;N;;;;; +139B2;EGYPTIAN HIEROGLYPH-139B2;Lo;0;L;;;;;N;;;;; +139B3;EGYPTIAN HIEROGLYPH-139B3;Lo;0;L;;;;;N;;;;; +139B4;EGYPTIAN HIEROGLYPH-139B4;Lo;0;L;;;;;N;;;;; +139B5;EGYPTIAN HIEROGLYPH-139B5;Lo;0;L;;;;;N;;;;; +139B6;EGYPTIAN HIEROGLYPH-139B6;Lo;0;L;;;;;N;;;;; +139B7;EGYPTIAN HIEROGLYPH-139B7;Lo;0;L;;;;;N;;;;; +139B8;EGYPTIAN HIEROGLYPH-139B8;Lo;0;L;;;;;N;;;;; +139B9;EGYPTIAN HIEROGLYPH-139B9;Lo;0;L;;;;;N;;;;; +139BA;EGYPTIAN HIEROGLYPH-139BA;Lo;0;L;;;;;N;;;;; +139BB;EGYPTIAN HIEROGLYPH-139BB;Lo;0;L;;;;;N;;;;; +139BC;EGYPTIAN HIEROGLYPH-139BC;Lo;0;L;;;;;N;;;;; +139BD;EGYPTIAN HIEROGLYPH-139BD;Lo;0;L;;;;;N;;;;; +139BE;EGYPTIAN HIEROGLYPH-139BE;Lo;0;L;;;;;N;;;;; +139BF;EGYPTIAN HIEROGLYPH-139BF;Lo;0;L;;;;;N;;;;; +139C0;EGYPTIAN HIEROGLYPH-139C0;Lo;0;L;;;;;N;;;;; +139C1;EGYPTIAN HIEROGLYPH-139C1;Lo;0;L;;;;;N;;;;; +139C2;EGYPTIAN HIEROGLYPH-139C2;Lo;0;L;;;;;N;;;;; +139C3;EGYPTIAN HIEROGLYPH-139C3;Lo;0;L;;;;;N;;;;; +139C4;EGYPTIAN HIEROGLYPH-139C4;Lo;0;L;;;;;N;;;;; +139C5;EGYPTIAN HIEROGLYPH-139C5;Lo;0;L;;;;;N;;;;; +139C6;EGYPTIAN HIEROGLYPH-139C6;Lo;0;L;;;;;N;;;;; +139C7;EGYPTIAN HIEROGLYPH-139C7;Lo;0;L;;;;;N;;;;; +139C8;EGYPTIAN HIEROGLYPH-139C8;Lo;0;L;;;;;N;;;;; +139C9;EGYPTIAN HIEROGLYPH-139C9;Lo;0;L;;;;;N;;;;; +139CA;EGYPTIAN HIEROGLYPH-139CA;Lo;0;L;;;;;N;;;;; +139CB;EGYPTIAN HIEROGLYPH-139CB;Lo;0;L;;;;;N;;;;; +139CC;EGYPTIAN HIEROGLYPH-139CC;Lo;0;L;;;;;N;;;;; +139CD;EGYPTIAN HIEROGLYPH-139CD;Lo;0;L;;;;;N;;;;; +139CE;EGYPTIAN HIEROGLYPH-139CE;Lo;0;L;;;;;N;;;;; +139CF;EGYPTIAN HIEROGLYPH-139CF;Lo;0;L;;;;;N;;;;; +139D0;EGYPTIAN HIEROGLYPH-139D0;Lo;0;L;;;;;N;;;;; +139D1;EGYPTIAN HIEROGLYPH-139D1;Lo;0;L;;;;;N;;;;; +139D2;EGYPTIAN HIEROGLYPH-139D2;Lo;0;L;;;;;N;;;;; +139D3;EGYPTIAN HIEROGLYPH-139D3;Lo;0;L;;;;;N;;;;; +139D4;EGYPTIAN HIEROGLYPH-139D4;Lo;0;L;;;;;N;;;;; +139D5;EGYPTIAN HIEROGLYPH-139D5;Lo;0;L;;;;;N;;;;; +139D6;EGYPTIAN HIEROGLYPH-139D6;Lo;0;L;;;;;N;;;;; +139D7;EGYPTIAN HIEROGLYPH-139D7;Lo;0;L;;;;;N;;;;; +139D8;EGYPTIAN HIEROGLYPH-139D8;Lo;0;L;;;;;N;;;;; +139D9;EGYPTIAN HIEROGLYPH-139D9;Lo;0;L;;;;;N;;;;; +139DA;EGYPTIAN HIEROGLYPH-139DA;Lo;0;L;;;;;N;;;;; +139DB;EGYPTIAN HIEROGLYPH-139DB;Lo;0;L;;;;;N;;;;; +139DC;EGYPTIAN HIEROGLYPH-139DC;Lo;0;L;;;;;N;;;;; +139DD;EGYPTIAN HIEROGLYPH-139DD;Lo;0;L;;;;;N;;;;; +139DE;EGYPTIAN HIEROGLYPH-139DE;Lo;0;L;;;;;N;;;;; +139DF;EGYPTIAN HIEROGLYPH-139DF;Lo;0;L;;;;;N;;;;; +139E0;EGYPTIAN HIEROGLYPH-139E0;Lo;0;L;;;;;N;;;;; +139E1;EGYPTIAN HIEROGLYPH-139E1;Lo;0;L;;;;;N;;;;; +139E2;EGYPTIAN HIEROGLYPH-139E2;Lo;0;L;;;;;N;;;;; +139E3;EGYPTIAN HIEROGLYPH-139E3;Lo;0;L;;;;;N;;;;; +139E4;EGYPTIAN HIEROGLYPH-139E4;Lo;0;L;;;;;N;;;;; +139E5;EGYPTIAN HIEROGLYPH-139E5;Lo;0;L;;;;;N;;;;; +139E6;EGYPTIAN HIEROGLYPH-139E6;Lo;0;L;;;;;N;;;;; +139E7;EGYPTIAN HIEROGLYPH-139E7;Lo;0;L;;;;;N;;;;; +139E8;EGYPTIAN HIEROGLYPH-139E8;Lo;0;L;;;;;N;;;;; +139E9;EGYPTIAN HIEROGLYPH-139E9;Lo;0;L;;;;;N;;;;; +139EA;EGYPTIAN HIEROGLYPH-139EA;Lo;0;L;;;;;N;;;;; +139EB;EGYPTIAN HIEROGLYPH-139EB;Lo;0;L;;;;;N;;;;; +139EC;EGYPTIAN HIEROGLYPH-139EC;Lo;0;L;;;;;N;;;;; +139ED;EGYPTIAN HIEROGLYPH-139ED;Lo;0;L;;;;;N;;;;; +139EE;EGYPTIAN HIEROGLYPH-139EE;Lo;0;L;;;;;N;;;;; +139EF;EGYPTIAN HIEROGLYPH-139EF;Lo;0;L;;;;;N;;;;; +139F0;EGYPTIAN HIEROGLYPH-139F0;Lo;0;L;;;;;N;;;;; +139F1;EGYPTIAN HIEROGLYPH-139F1;Lo;0;L;;;;;N;;;;; +139F2;EGYPTIAN HIEROGLYPH-139F2;Lo;0;L;;;;;N;;;;; +139F3;EGYPTIAN HIEROGLYPH-139F3;Lo;0;L;;;;;N;;;;; +139F4;EGYPTIAN HIEROGLYPH-139F4;Lo;0;L;;;;;N;;;;; +139F5;EGYPTIAN HIEROGLYPH-139F5;Lo;0;L;;;;;N;;;;; +139F6;EGYPTIAN HIEROGLYPH-139F6;Lo;0;L;;;;;N;;;;; +139F7;EGYPTIAN HIEROGLYPH-139F7;Lo;0;L;;;;;N;;;;; +139F8;EGYPTIAN HIEROGLYPH-139F8;Lo;0;L;;;;;N;;;;; +139F9;EGYPTIAN HIEROGLYPH-139F9;Lo;0;L;;;;;N;;;;; +139FA;EGYPTIAN HIEROGLYPH-139FA;Lo;0;L;;;;;N;;;;; +139FB;EGYPTIAN HIEROGLYPH-139FB;Lo;0;L;;;;;N;;;;; +139FC;EGYPTIAN HIEROGLYPH-139FC;Lo;0;L;;;;;N;;;;; +139FD;EGYPTIAN HIEROGLYPH-139FD;Lo;0;L;;;;;N;;;;; +139FE;EGYPTIAN HIEROGLYPH-139FE;Lo;0;L;;;;;N;;;;; +139FF;EGYPTIAN HIEROGLYPH-139FF;Lo;0;L;;;;;N;;;;; +13A00;EGYPTIAN HIEROGLYPH-13A00;Lo;0;L;;;;;N;;;;; +13A01;EGYPTIAN HIEROGLYPH-13A01;Lo;0;L;;;;;N;;;;; +13A02;EGYPTIAN HIEROGLYPH-13A02;Lo;0;L;;;;;N;;;;; +13A03;EGYPTIAN HIEROGLYPH-13A03;Lo;0;L;;;;;N;;;;; +13A04;EGYPTIAN HIEROGLYPH-13A04;Lo;0;L;;;;;N;;;;; +13A05;EGYPTIAN HIEROGLYPH-13A05;Lo;0;L;;;;;N;;;;; +13A06;EGYPTIAN HIEROGLYPH-13A06;Lo;0;L;;;;;N;;;;; +13A07;EGYPTIAN HIEROGLYPH-13A07;Lo;0;L;;;;;N;;;;; +13A08;EGYPTIAN HIEROGLYPH-13A08;Lo;0;L;;;;;N;;;;; +13A09;EGYPTIAN HIEROGLYPH-13A09;Lo;0;L;;;;;N;;;;; +13A0A;EGYPTIAN HIEROGLYPH-13A0A;Lo;0;L;;;;;N;;;;; +13A0B;EGYPTIAN HIEROGLYPH-13A0B;Lo;0;L;;;;;N;;;;; +13A0C;EGYPTIAN HIEROGLYPH-13A0C;Lo;0;L;;;;;N;;;;; +13A0D;EGYPTIAN HIEROGLYPH-13A0D;Lo;0;L;;;;;N;;;;; +13A0E;EGYPTIAN HIEROGLYPH-13A0E;Lo;0;L;;;;;N;;;;; +13A0F;EGYPTIAN HIEROGLYPH-13A0F;Lo;0;L;;;;;N;;;;; +13A10;EGYPTIAN HIEROGLYPH-13A10;Lo;0;L;;;;;N;;;;; +13A11;EGYPTIAN HIEROGLYPH-13A11;Lo;0;L;;;;;N;;;;; +13A12;EGYPTIAN HIEROGLYPH-13A12;Lo;0;L;;;;;N;;;;; +13A13;EGYPTIAN HIEROGLYPH-13A13;Lo;0;L;;;;;N;;;;; +13A14;EGYPTIAN HIEROGLYPH-13A14;Lo;0;L;;;;;N;;;;; +13A15;EGYPTIAN HIEROGLYPH-13A15;Lo;0;L;;;;;N;;;;; +13A16;EGYPTIAN HIEROGLYPH-13A16;Lo;0;L;;;;;N;;;;; +13A17;EGYPTIAN HIEROGLYPH-13A17;Lo;0;L;;;;;N;;;;; +13A18;EGYPTIAN HIEROGLYPH-13A18;Lo;0;L;;;;;N;;;;; +13A19;EGYPTIAN HIEROGLYPH-13A19;Lo;0;L;;;;;N;;;;; +13A1A;EGYPTIAN HIEROGLYPH-13A1A;Lo;0;L;;;;;N;;;;; +13A1B;EGYPTIAN HIEROGLYPH-13A1B;Lo;0;L;;;;;N;;;;; +13A1C;EGYPTIAN HIEROGLYPH-13A1C;Lo;0;L;;;;;N;;;;; +13A1D;EGYPTIAN HIEROGLYPH-13A1D;Lo;0;L;;;;;N;;;;; +13A1E;EGYPTIAN HIEROGLYPH-13A1E;Lo;0;L;;;;;N;;;;; +13A1F;EGYPTIAN HIEROGLYPH-13A1F;Lo;0;L;;;;;N;;;;; +13A20;EGYPTIAN HIEROGLYPH-13A20;Lo;0;L;;;;;N;;;;; +13A21;EGYPTIAN HIEROGLYPH-13A21;Lo;0;L;;;;;N;;;;; +13A22;EGYPTIAN HIEROGLYPH-13A22;Lo;0;L;;;;;N;;;;; +13A23;EGYPTIAN HIEROGLYPH-13A23;Lo;0;L;;;;;N;;;;; +13A24;EGYPTIAN HIEROGLYPH-13A24;Lo;0;L;;;;;N;;;;; +13A25;EGYPTIAN HIEROGLYPH-13A25;Lo;0;L;;;;;N;;;;; +13A26;EGYPTIAN HIEROGLYPH-13A26;Lo;0;L;;;;;N;;;;; +13A27;EGYPTIAN HIEROGLYPH-13A27;Lo;0;L;;;;;N;;;;; +13A28;EGYPTIAN HIEROGLYPH-13A28;Lo;0;L;;;;;N;;;;; +13A29;EGYPTIAN HIEROGLYPH-13A29;Lo;0;L;;;;;N;;;;; +13A2A;EGYPTIAN HIEROGLYPH-13A2A;Lo;0;L;;;;;N;;;;; +13A2B;EGYPTIAN HIEROGLYPH-13A2B;Lo;0;L;;;;;N;;;;; +13A2C;EGYPTIAN HIEROGLYPH-13A2C;Lo;0;L;;;;;N;;;;; +13A2D;EGYPTIAN HIEROGLYPH-13A2D;Lo;0;L;;;;;N;;;;; +13A2E;EGYPTIAN HIEROGLYPH-13A2E;Lo;0;L;;;;;N;;;;; +13A2F;EGYPTIAN HIEROGLYPH-13A2F;Lo;0;L;;;;;N;;;;; +13A30;EGYPTIAN HIEROGLYPH-13A30;Lo;0;L;;;;;N;;;;; +13A31;EGYPTIAN HIEROGLYPH-13A31;Lo;0;L;;;;;N;;;;; +13A32;EGYPTIAN HIEROGLYPH-13A32;Lo;0;L;;;;;N;;;;; +13A33;EGYPTIAN HIEROGLYPH-13A33;Lo;0;L;;;;;N;;;;; +13A34;EGYPTIAN HIEROGLYPH-13A34;Lo;0;L;;;;;N;;;;; +13A35;EGYPTIAN HIEROGLYPH-13A35;Lo;0;L;;;;;N;;;;; +13A36;EGYPTIAN HIEROGLYPH-13A36;Lo;0;L;;;;;N;;;;; +13A37;EGYPTIAN HIEROGLYPH-13A37;Lo;0;L;;;;;N;;;;; +13A38;EGYPTIAN HIEROGLYPH-13A38;Lo;0;L;;;;;N;;;;; +13A39;EGYPTIAN HIEROGLYPH-13A39;Lo;0;L;;;;;N;;;;; +13A3A;EGYPTIAN HIEROGLYPH-13A3A;Lo;0;L;;;;;N;;;;; +13A3B;EGYPTIAN HIEROGLYPH-13A3B;Lo;0;L;;;;;N;;;;; +13A3C;EGYPTIAN HIEROGLYPH-13A3C;Lo;0;L;;;;;N;;;;; +13A3D;EGYPTIAN HIEROGLYPH-13A3D;Lo;0;L;;;;;N;;;;; +13A3E;EGYPTIAN HIEROGLYPH-13A3E;Lo;0;L;;;;;N;;;;; +13A3F;EGYPTIAN HIEROGLYPH-13A3F;Lo;0;L;;;;;N;;;;; +13A40;EGYPTIAN HIEROGLYPH-13A40;Lo;0;L;;;;;N;;;;; +13A41;EGYPTIAN HIEROGLYPH-13A41;Lo;0;L;;;;;N;;;;; +13A42;EGYPTIAN HIEROGLYPH-13A42;Lo;0;L;;;;;N;;;;; +13A43;EGYPTIAN HIEROGLYPH-13A43;Lo;0;L;;;;;N;;;;; +13A44;EGYPTIAN HIEROGLYPH-13A44;Lo;0;L;;;;;N;;;;; +13A45;EGYPTIAN HIEROGLYPH-13A45;Lo;0;L;;;;;N;;;;; +13A46;EGYPTIAN HIEROGLYPH-13A46;Lo;0;L;;;;;N;;;;; +13A47;EGYPTIAN HIEROGLYPH-13A47;Lo;0;L;;;;;N;;;;; +13A48;EGYPTIAN HIEROGLYPH-13A48;Lo;0;L;;;;;N;;;;; +13A49;EGYPTIAN HIEROGLYPH-13A49;Lo;0;L;;;;;N;;;;; +13A4A;EGYPTIAN HIEROGLYPH-13A4A;Lo;0;L;;;;;N;;;;; +13A4B;EGYPTIAN HIEROGLYPH-13A4B;Lo;0;L;;;;;N;;;;; +13A4C;EGYPTIAN HIEROGLYPH-13A4C;Lo;0;L;;;;;N;;;;; +13A4D;EGYPTIAN HIEROGLYPH-13A4D;Lo;0;L;;;;;N;;;;; +13A4E;EGYPTIAN HIEROGLYPH-13A4E;Lo;0;L;;;;;N;;;;; +13A4F;EGYPTIAN HIEROGLYPH-13A4F;Lo;0;L;;;;;N;;;;; +13A50;EGYPTIAN HIEROGLYPH-13A50;Lo;0;L;;;;;N;;;;; +13A51;EGYPTIAN HIEROGLYPH-13A51;Lo;0;L;;;;;N;;;;; +13A52;EGYPTIAN HIEROGLYPH-13A52;Lo;0;L;;;;;N;;;;; +13A53;EGYPTIAN HIEROGLYPH-13A53;Lo;0;L;;;;;N;;;;; +13A54;EGYPTIAN HIEROGLYPH-13A54;Lo;0;L;;;;;N;;;;; +13A55;EGYPTIAN HIEROGLYPH-13A55;Lo;0;L;;;;;N;;;;; +13A56;EGYPTIAN HIEROGLYPH-13A56;Lo;0;L;;;;;N;;;;; +13A57;EGYPTIAN HIEROGLYPH-13A57;Lo;0;L;;;;;N;;;;; +13A58;EGYPTIAN HIEROGLYPH-13A58;Lo;0;L;;;;;N;;;;; +13A59;EGYPTIAN HIEROGLYPH-13A59;Lo;0;L;;;;;N;;;;; +13A5A;EGYPTIAN HIEROGLYPH-13A5A;Lo;0;L;;;;;N;;;;; +13A5B;EGYPTIAN HIEROGLYPH-13A5B;Lo;0;L;;;;;N;;;;; +13A5C;EGYPTIAN HIEROGLYPH-13A5C;Lo;0;L;;;;;N;;;;; +13A5D;EGYPTIAN HIEROGLYPH-13A5D;Lo;0;L;;;;;N;;;;; +13A5E;EGYPTIAN HIEROGLYPH-13A5E;Lo;0;L;;;;;N;;;;; +13A5F;EGYPTIAN HIEROGLYPH-13A5F;Lo;0;L;;;;;N;;;;; +13A60;EGYPTIAN HIEROGLYPH-13A60;Lo;0;L;;;;;N;;;;; +13A61;EGYPTIAN HIEROGLYPH-13A61;Lo;0;L;;;;;N;;;;; +13A62;EGYPTIAN HIEROGLYPH-13A62;Lo;0;L;;;;;N;;;;; +13A63;EGYPTIAN HIEROGLYPH-13A63;Lo;0;L;;;;;N;;;;; +13A64;EGYPTIAN HIEROGLYPH-13A64;Lo;0;L;;;;;N;;;;; +13A65;EGYPTIAN HIEROGLYPH-13A65;Lo;0;L;;;;;N;;;;; +13A66;EGYPTIAN HIEROGLYPH-13A66;Lo;0;L;;;;;N;;;;; +13A67;EGYPTIAN HIEROGLYPH-13A67;Lo;0;L;;;;;N;;;;; +13A68;EGYPTIAN HIEROGLYPH-13A68;Lo;0;L;;;;;N;;;;; +13A69;EGYPTIAN HIEROGLYPH-13A69;Lo;0;L;;;;;N;;;;; +13A6A;EGYPTIAN HIEROGLYPH-13A6A;Lo;0;L;;;;;N;;;;; +13A6B;EGYPTIAN HIEROGLYPH-13A6B;Lo;0;L;;;;;N;;;;; +13A6C;EGYPTIAN HIEROGLYPH-13A6C;Lo;0;L;;;;;N;;;;; +13A6D;EGYPTIAN HIEROGLYPH-13A6D;Lo;0;L;;;;;N;;;;; +13A6E;EGYPTIAN HIEROGLYPH-13A6E;Lo;0;L;;;;;N;;;;; +13A6F;EGYPTIAN HIEROGLYPH-13A6F;Lo;0;L;;;;;N;;;;; +13A70;EGYPTIAN HIEROGLYPH-13A70;Lo;0;L;;;;;N;;;;; +13A71;EGYPTIAN HIEROGLYPH-13A71;Lo;0;L;;;;;N;;;;; +13A72;EGYPTIAN HIEROGLYPH-13A72;Lo;0;L;;;;;N;;;;; +13A73;EGYPTIAN HIEROGLYPH-13A73;Lo;0;L;;;;;N;;;;; +13A74;EGYPTIAN HIEROGLYPH-13A74;Lo;0;L;;;;;N;;;;; +13A75;EGYPTIAN HIEROGLYPH-13A75;Lo;0;L;;;;;N;;;;; +13A76;EGYPTIAN HIEROGLYPH-13A76;Lo;0;L;;;;;N;;;;; +13A77;EGYPTIAN HIEROGLYPH-13A77;Lo;0;L;;;;;N;;;;; +13A78;EGYPTIAN HIEROGLYPH-13A78;Lo;0;L;;;;;N;;;;; +13A79;EGYPTIAN HIEROGLYPH-13A79;Lo;0;L;;;;;N;;;;; +13A7A;EGYPTIAN HIEROGLYPH-13A7A;Lo;0;L;;;;;N;;;;; +13A7B;EGYPTIAN HIEROGLYPH-13A7B;Lo;0;L;;;;;N;;;;; +13A7C;EGYPTIAN HIEROGLYPH-13A7C;Lo;0;L;;;;;N;;;;; +13A7D;EGYPTIAN HIEROGLYPH-13A7D;Lo;0;L;;;;;N;;;;; +13A7E;EGYPTIAN HIEROGLYPH-13A7E;Lo;0;L;;;;;N;;;;; +13A7F;EGYPTIAN HIEROGLYPH-13A7F;Lo;0;L;;;;;N;;;;; +13A80;EGYPTIAN HIEROGLYPH-13A80;Lo;0;L;;;;;N;;;;; +13A81;EGYPTIAN HIEROGLYPH-13A81;Lo;0;L;;;;;N;;;;; +13A82;EGYPTIAN HIEROGLYPH-13A82;Lo;0;L;;;;;N;;;;; +13A83;EGYPTIAN HIEROGLYPH-13A83;Lo;0;L;;;;;N;;;;; +13A84;EGYPTIAN HIEROGLYPH-13A84;Lo;0;L;;;;;N;;;;; +13A85;EGYPTIAN HIEROGLYPH-13A85;Lo;0;L;;;;;N;;;;; +13A86;EGYPTIAN HIEROGLYPH-13A86;Lo;0;L;;;;;N;;;;; +13A87;EGYPTIAN HIEROGLYPH-13A87;Lo;0;L;;;;;N;;;;; +13A88;EGYPTIAN HIEROGLYPH-13A88;Lo;0;L;;;;;N;;;;; +13A89;EGYPTIAN HIEROGLYPH-13A89;Lo;0;L;;;;;N;;;;; +13A8A;EGYPTIAN HIEROGLYPH-13A8A;Lo;0;L;;;;;N;;;;; +13A8B;EGYPTIAN HIEROGLYPH-13A8B;Lo;0;L;;;;;N;;;;; +13A8C;EGYPTIAN HIEROGLYPH-13A8C;Lo;0;L;;;;;N;;;;; +13A8D;EGYPTIAN HIEROGLYPH-13A8D;Lo;0;L;;;;;N;;;;; +13A8E;EGYPTIAN HIEROGLYPH-13A8E;Lo;0;L;;;;;N;;;;; +13A8F;EGYPTIAN HIEROGLYPH-13A8F;Lo;0;L;;;;;N;;;;; +13A90;EGYPTIAN HIEROGLYPH-13A90;Lo;0;L;;;;;N;;;;; +13A91;EGYPTIAN HIEROGLYPH-13A91;Lo;0;L;;;;;N;;;;; +13A92;EGYPTIAN HIEROGLYPH-13A92;Lo;0;L;;;;;N;;;;; +13A93;EGYPTIAN HIEROGLYPH-13A93;Lo;0;L;;;;;N;;;;; +13A94;EGYPTIAN HIEROGLYPH-13A94;Lo;0;L;;;;;N;;;;; +13A95;EGYPTIAN HIEROGLYPH-13A95;Lo;0;L;;;;;N;;;;; +13A96;EGYPTIAN HIEROGLYPH-13A96;Lo;0;L;;;;;N;;;;; +13A97;EGYPTIAN HIEROGLYPH-13A97;Lo;0;L;;;;;N;;;;; +13A98;EGYPTIAN HIEROGLYPH-13A98;Lo;0;L;;;;;N;;;;; +13A99;EGYPTIAN HIEROGLYPH-13A99;Lo;0;L;;;;;N;;;;; +13A9A;EGYPTIAN HIEROGLYPH-13A9A;Lo;0;L;;;;;N;;;;; +13A9B;EGYPTIAN HIEROGLYPH-13A9B;Lo;0;L;;;;;N;;;;; +13A9C;EGYPTIAN HIEROGLYPH-13A9C;Lo;0;L;;;;;N;;;;; +13A9D;EGYPTIAN HIEROGLYPH-13A9D;Lo;0;L;;;;;N;;;;; +13A9E;EGYPTIAN HIEROGLYPH-13A9E;Lo;0;L;;;;;N;;;;; +13A9F;EGYPTIAN HIEROGLYPH-13A9F;Lo;0;L;;;;;N;;;;; +13AA0;EGYPTIAN HIEROGLYPH-13AA0;Lo;0;L;;;;;N;;;;; +13AA1;EGYPTIAN HIEROGLYPH-13AA1;Lo;0;L;;;;;N;;;;; +13AA2;EGYPTIAN HIEROGLYPH-13AA2;Lo;0;L;;;;;N;;;;; +13AA3;EGYPTIAN HIEROGLYPH-13AA3;Lo;0;L;;;;;N;;;;; +13AA4;EGYPTIAN HIEROGLYPH-13AA4;Lo;0;L;;;;;N;;;;; +13AA5;EGYPTIAN HIEROGLYPH-13AA5;Lo;0;L;;;;;N;;;;; +13AA6;EGYPTIAN HIEROGLYPH-13AA6;Lo;0;L;;;;;N;;;;; +13AA7;EGYPTIAN HIEROGLYPH-13AA7;Lo;0;L;;;;;N;;;;; +13AA8;EGYPTIAN HIEROGLYPH-13AA8;Lo;0;L;;;;;N;;;;; +13AA9;EGYPTIAN HIEROGLYPH-13AA9;Lo;0;L;;;;;N;;;;; +13AAA;EGYPTIAN HIEROGLYPH-13AAA;Lo;0;L;;;;;N;;;;; +13AAB;EGYPTIAN HIEROGLYPH-13AAB;Lo;0;L;;;;;N;;;;; +13AAC;EGYPTIAN HIEROGLYPH-13AAC;Lo;0;L;;;;;N;;;;; +13AAD;EGYPTIAN HIEROGLYPH-13AAD;Lo;0;L;;;;;N;;;;; +13AAE;EGYPTIAN HIEROGLYPH-13AAE;Lo;0;L;;;;;N;;;;; +13AAF;EGYPTIAN HIEROGLYPH-13AAF;Lo;0;L;;;;;N;;;;; +13AB0;EGYPTIAN HIEROGLYPH-13AB0;Lo;0;L;;;;;N;;;;; +13AB1;EGYPTIAN HIEROGLYPH-13AB1;Lo;0;L;;;;;N;;;;; +13AB2;EGYPTIAN HIEROGLYPH-13AB2;Lo;0;L;;;;;N;;;;; +13AB3;EGYPTIAN HIEROGLYPH-13AB3;Lo;0;L;;;;;N;;;;; +13AB4;EGYPTIAN HIEROGLYPH-13AB4;Lo;0;L;;;;;N;;;;; +13AB5;EGYPTIAN HIEROGLYPH-13AB5;Lo;0;L;;;;;N;;;;; +13AB6;EGYPTIAN HIEROGLYPH-13AB6;Lo;0;L;;;;;N;;;;; +13AB7;EGYPTIAN HIEROGLYPH-13AB7;Lo;0;L;;;;;N;;;;; +13AB8;EGYPTIAN HIEROGLYPH-13AB8;Lo;0;L;;;;;N;;;;; +13AB9;EGYPTIAN HIEROGLYPH-13AB9;Lo;0;L;;;;;N;;;;; +13ABA;EGYPTIAN HIEROGLYPH-13ABA;Lo;0;L;;;;;N;;;;; +13ABB;EGYPTIAN HIEROGLYPH-13ABB;Lo;0;L;;;;;N;;;;; +13ABC;EGYPTIAN HIEROGLYPH-13ABC;Lo;0;L;;;;;N;;;;; +13ABD;EGYPTIAN HIEROGLYPH-13ABD;Lo;0;L;;;;;N;;;;; +13ABE;EGYPTIAN HIEROGLYPH-13ABE;Lo;0;L;;;;;N;;;;; +13ABF;EGYPTIAN HIEROGLYPH-13ABF;Lo;0;L;;;;;N;;;;; +13AC0;EGYPTIAN HIEROGLYPH-13AC0;Lo;0;L;;;;;N;;;;; +13AC1;EGYPTIAN HIEROGLYPH-13AC1;Lo;0;L;;;;;N;;;;; +13AC2;EGYPTIAN HIEROGLYPH-13AC2;Lo;0;L;;;;;N;;;;; +13AC3;EGYPTIAN HIEROGLYPH-13AC3;Lo;0;L;;;;;N;;;;; +13AC4;EGYPTIAN HIEROGLYPH-13AC4;Lo;0;L;;;;;N;;;;; +13AC5;EGYPTIAN HIEROGLYPH-13AC5;Lo;0;L;;;;;N;;;;; +13AC6;EGYPTIAN HIEROGLYPH-13AC6;Lo;0;L;;;;;N;;;;; +13AC7;EGYPTIAN HIEROGLYPH-13AC7;Lo;0;L;;;;;N;;;;; +13AC8;EGYPTIAN HIEROGLYPH-13AC8;Lo;0;L;;;;;N;;;;; +13AC9;EGYPTIAN HIEROGLYPH-13AC9;Lo;0;L;;;;;N;;;;; +13ACA;EGYPTIAN HIEROGLYPH-13ACA;Lo;0;L;;;;;N;;;;; +13ACB;EGYPTIAN HIEROGLYPH-13ACB;Lo;0;L;;;;;N;;;;; +13ACC;EGYPTIAN HIEROGLYPH-13ACC;Lo;0;L;;;;;N;;;;; +13ACD;EGYPTIAN HIEROGLYPH-13ACD;Lo;0;L;;;;;N;;;;; +13ACE;EGYPTIAN HIEROGLYPH-13ACE;Lo;0;L;;;;;N;;;;; +13ACF;EGYPTIAN HIEROGLYPH-13ACF;Lo;0;L;;;;;N;;;;; +13AD0;EGYPTIAN HIEROGLYPH-13AD0;Lo;0;L;;;;;N;;;;; +13AD1;EGYPTIAN HIEROGLYPH-13AD1;Lo;0;L;;;;;N;;;;; +13AD2;EGYPTIAN HIEROGLYPH-13AD2;Lo;0;L;;;;;N;;;;; +13AD3;EGYPTIAN HIEROGLYPH-13AD3;Lo;0;L;;;;;N;;;;; +13AD4;EGYPTIAN HIEROGLYPH-13AD4;Lo;0;L;;;;;N;;;;; +13AD5;EGYPTIAN HIEROGLYPH-13AD5;Lo;0;L;;;;;N;;;;; +13AD6;EGYPTIAN HIEROGLYPH-13AD6;Lo;0;L;;;;;N;;;;; +13AD7;EGYPTIAN HIEROGLYPH-13AD7;Lo;0;L;;;;;N;;;;; +13AD8;EGYPTIAN HIEROGLYPH-13AD8;Lo;0;L;;;;;N;;;;; +13AD9;EGYPTIAN HIEROGLYPH-13AD9;Lo;0;L;;;;;N;;;;; +13ADA;EGYPTIAN HIEROGLYPH-13ADA;Lo;0;L;;;;;N;;;;; +13ADB;EGYPTIAN HIEROGLYPH-13ADB;Lo;0;L;;;;;N;;;;; +13ADC;EGYPTIAN HIEROGLYPH-13ADC;Lo;0;L;;;;;N;;;;; +13ADD;EGYPTIAN HIEROGLYPH-13ADD;Lo;0;L;;;;;N;;;;; +13ADE;EGYPTIAN HIEROGLYPH-13ADE;Lo;0;L;;;;;N;;;;; +13ADF;EGYPTIAN HIEROGLYPH-13ADF;Lo;0;L;;;;;N;;;;; +13AE0;EGYPTIAN HIEROGLYPH-13AE0;Lo;0;L;;;;;N;;;;; +13AE1;EGYPTIAN HIEROGLYPH-13AE1;Lo;0;L;;;;;N;;;;; +13AE2;EGYPTIAN HIEROGLYPH-13AE2;Lo;0;L;;;;;N;;;;; +13AE3;EGYPTIAN HIEROGLYPH-13AE3;Lo;0;L;;;;;N;;;;; +13AE4;EGYPTIAN HIEROGLYPH-13AE4;Lo;0;L;;;;;N;;;;; +13AE5;EGYPTIAN HIEROGLYPH-13AE5;Lo;0;L;;;;;N;;;;; +13AE6;EGYPTIAN HIEROGLYPH-13AE6;Lo;0;L;;;;;N;;;;; +13AE7;EGYPTIAN HIEROGLYPH-13AE7;Lo;0;L;;;;;N;;;;; +13AE8;EGYPTIAN HIEROGLYPH-13AE8;Lo;0;L;;;;;N;;;;; +13AE9;EGYPTIAN HIEROGLYPH-13AE9;Lo;0;L;;;;;N;;;;; +13AEA;EGYPTIAN HIEROGLYPH-13AEA;Lo;0;L;;;;;N;;;;; +13AEB;EGYPTIAN HIEROGLYPH-13AEB;Lo;0;L;;;;;N;;;;; +13AEC;EGYPTIAN HIEROGLYPH-13AEC;Lo;0;L;;;;;N;;;;; +13AED;EGYPTIAN HIEROGLYPH-13AED;Lo;0;L;;;;;N;;;;; +13AEE;EGYPTIAN HIEROGLYPH-13AEE;Lo;0;L;;;;;N;;;;; +13AEF;EGYPTIAN HIEROGLYPH-13AEF;Lo;0;L;;;;;N;;;;; +13AF0;EGYPTIAN HIEROGLYPH-13AF0;Lo;0;L;;;;;N;;;;; +13AF1;EGYPTIAN HIEROGLYPH-13AF1;Lo;0;L;;;;;N;;;;; +13AF2;EGYPTIAN HIEROGLYPH-13AF2;Lo;0;L;;;;;N;;;;; +13AF3;EGYPTIAN HIEROGLYPH-13AF3;Lo;0;L;;;;;N;;;;; +13AF4;EGYPTIAN HIEROGLYPH-13AF4;Lo;0;L;;;;;N;;;;; +13AF5;EGYPTIAN HIEROGLYPH-13AF5;Lo;0;L;;;;;N;;;;; +13AF6;EGYPTIAN HIEROGLYPH-13AF6;Lo;0;L;;;;;N;;;;; +13AF7;EGYPTIAN HIEROGLYPH-13AF7;Lo;0;L;;;;;N;;;;; +13AF8;EGYPTIAN HIEROGLYPH-13AF8;Lo;0;L;;;;;N;;;;; +13AF9;EGYPTIAN HIEROGLYPH-13AF9;Lo;0;L;;;;;N;;;;; +13AFA;EGYPTIAN HIEROGLYPH-13AFA;Lo;0;L;;;;;N;;;;; +13AFB;EGYPTIAN HIEROGLYPH-13AFB;Lo;0;L;;;;;N;;;;; +13AFC;EGYPTIAN HIEROGLYPH-13AFC;Lo;0;L;;;;;N;;;;; +13AFD;EGYPTIAN HIEROGLYPH-13AFD;Lo;0;L;;;;;N;;;;; +13AFE;EGYPTIAN HIEROGLYPH-13AFE;Lo;0;L;;;;;N;;;;; +13AFF;EGYPTIAN HIEROGLYPH-13AFF;Lo;0;L;;;;;N;;;;; +13B00;EGYPTIAN HIEROGLYPH-13B00;Lo;0;L;;;;;N;;;;; +13B01;EGYPTIAN HIEROGLYPH-13B01;Lo;0;L;;;;;N;;;;; +13B02;EGYPTIAN HIEROGLYPH-13B02;Lo;0;L;;;;;N;;;;; +13B03;EGYPTIAN HIEROGLYPH-13B03;Lo;0;L;;;;;N;;;;; +13B04;EGYPTIAN HIEROGLYPH-13B04;Lo;0;L;;;;;N;;;;; +13B05;EGYPTIAN HIEROGLYPH-13B05;Lo;0;L;;;;;N;;;;; +13B06;EGYPTIAN HIEROGLYPH-13B06;Lo;0;L;;;;;N;;;;; +13B07;EGYPTIAN HIEROGLYPH-13B07;Lo;0;L;;;;;N;;;;; +13B08;EGYPTIAN HIEROGLYPH-13B08;Lo;0;L;;;;;N;;;;; +13B09;EGYPTIAN HIEROGLYPH-13B09;Lo;0;L;;;;;N;;;;; +13B0A;EGYPTIAN HIEROGLYPH-13B0A;Lo;0;L;;;;;N;;;;; +13B0B;EGYPTIAN HIEROGLYPH-13B0B;Lo;0;L;;;;;N;;;;; +13B0C;EGYPTIAN HIEROGLYPH-13B0C;Lo;0;L;;;;;N;;;;; +13B0D;EGYPTIAN HIEROGLYPH-13B0D;Lo;0;L;;;;;N;;;;; +13B0E;EGYPTIAN HIEROGLYPH-13B0E;Lo;0;L;;;;;N;;;;; +13B0F;EGYPTIAN HIEROGLYPH-13B0F;Lo;0;L;;;;;N;;;;; +13B10;EGYPTIAN HIEROGLYPH-13B10;Lo;0;L;;;;;N;;;;; +13B11;EGYPTIAN HIEROGLYPH-13B11;Lo;0;L;;;;;N;;;;; +13B12;EGYPTIAN HIEROGLYPH-13B12;Lo;0;L;;;;;N;;;;; +13B13;EGYPTIAN HIEROGLYPH-13B13;Lo;0;L;;;;;N;;;;; +13B14;EGYPTIAN HIEROGLYPH-13B14;Lo;0;L;;;;;N;;;;; +13B15;EGYPTIAN HIEROGLYPH-13B15;Lo;0;L;;;;;N;;;;; +13B16;EGYPTIAN HIEROGLYPH-13B16;Lo;0;L;;;;;N;;;;; +13B17;EGYPTIAN HIEROGLYPH-13B17;Lo;0;L;;;;;N;;;;; +13B18;EGYPTIAN HIEROGLYPH-13B18;Lo;0;L;;;;;N;;;;; +13B19;EGYPTIAN HIEROGLYPH-13B19;Lo;0;L;;;;;N;;;;; +13B1A;EGYPTIAN HIEROGLYPH-13B1A;Lo;0;L;;;;;N;;;;; +13B1B;EGYPTIAN HIEROGLYPH-13B1B;Lo;0;L;;;;;N;;;;; +13B1C;EGYPTIAN HIEROGLYPH-13B1C;Lo;0;L;;;;;N;;;;; +13B1D;EGYPTIAN HIEROGLYPH-13B1D;Lo;0;L;;;;;N;;;;; +13B1E;EGYPTIAN HIEROGLYPH-13B1E;Lo;0;L;;;;;N;;;;; +13B1F;EGYPTIAN HIEROGLYPH-13B1F;Lo;0;L;;;;;N;;;;; +13B20;EGYPTIAN HIEROGLYPH-13B20;Lo;0;L;;;;;N;;;;; +13B21;EGYPTIAN HIEROGLYPH-13B21;Lo;0;L;;;;;N;;;;; +13B22;EGYPTIAN HIEROGLYPH-13B22;Lo;0;L;;;;;N;;;;; +13B23;EGYPTIAN HIEROGLYPH-13B23;Lo;0;L;;;;;N;;;;; +13B24;EGYPTIAN HIEROGLYPH-13B24;Lo;0;L;;;;;N;;;;; +13B25;EGYPTIAN HIEROGLYPH-13B25;Lo;0;L;;;;;N;;;;; +13B26;EGYPTIAN HIEROGLYPH-13B26;Lo;0;L;;;;;N;;;;; +13B27;EGYPTIAN HIEROGLYPH-13B27;Lo;0;L;;;;;N;;;;; +13B28;EGYPTIAN HIEROGLYPH-13B28;Lo;0;L;;;;;N;;;;; +13B29;EGYPTIAN HIEROGLYPH-13B29;Lo;0;L;;;;;N;;;;; +13B2A;EGYPTIAN HIEROGLYPH-13B2A;Lo;0;L;;;;;N;;;;; +13B2B;EGYPTIAN HIEROGLYPH-13B2B;Lo;0;L;;;;;N;;;;; +13B2C;EGYPTIAN HIEROGLYPH-13B2C;Lo;0;L;;;;;N;;;;; +13B2D;EGYPTIAN HIEROGLYPH-13B2D;Lo;0;L;;;;;N;;;;; +13B2E;EGYPTIAN HIEROGLYPH-13B2E;Lo;0;L;;;;;N;;;;; +13B2F;EGYPTIAN HIEROGLYPH-13B2F;Lo;0;L;;;;;N;;;;; +13B30;EGYPTIAN HIEROGLYPH-13B30;Lo;0;L;;;;;N;;;;; +13B31;EGYPTIAN HIEROGLYPH-13B31;Lo;0;L;;;;;N;;;;; +13B32;EGYPTIAN HIEROGLYPH-13B32;Lo;0;L;;;;;N;;;;; +13B33;EGYPTIAN HIEROGLYPH-13B33;Lo;0;L;;;;;N;;;;; +13B34;EGYPTIAN HIEROGLYPH-13B34;Lo;0;L;;;;;N;;;;; +13B35;EGYPTIAN HIEROGLYPH-13B35;Lo;0;L;;;;;N;;;;; +13B36;EGYPTIAN HIEROGLYPH-13B36;Lo;0;L;;;;;N;;;;; +13B37;EGYPTIAN HIEROGLYPH-13B37;Lo;0;L;;;;;N;;;;; +13B38;EGYPTIAN HIEROGLYPH-13B38;Lo;0;L;;;;;N;;;;; +13B39;EGYPTIAN HIEROGLYPH-13B39;Lo;0;L;;;;;N;;;;; +13B3A;EGYPTIAN HIEROGLYPH-13B3A;Lo;0;L;;;;;N;;;;; +13B3B;EGYPTIAN HIEROGLYPH-13B3B;Lo;0;L;;;;;N;;;;; +13B3C;EGYPTIAN HIEROGLYPH-13B3C;Lo;0;L;;;;;N;;;;; +13B3D;EGYPTIAN HIEROGLYPH-13B3D;Lo;0;L;;;;;N;;;;; +13B3E;EGYPTIAN HIEROGLYPH-13B3E;Lo;0;L;;;;;N;;;;; +13B3F;EGYPTIAN HIEROGLYPH-13B3F;Lo;0;L;;;;;N;;;;; +13B40;EGYPTIAN HIEROGLYPH-13B40;Lo;0;L;;;;;N;;;;; +13B41;EGYPTIAN HIEROGLYPH-13B41;Lo;0;L;;;;;N;;;;; +13B42;EGYPTIAN HIEROGLYPH-13B42;Lo;0;L;;;;;N;;;;; +13B43;EGYPTIAN HIEROGLYPH-13B43;Lo;0;L;;;;;N;;;;; +13B44;EGYPTIAN HIEROGLYPH-13B44;Lo;0;L;;;;;N;;;;; +13B45;EGYPTIAN HIEROGLYPH-13B45;Lo;0;L;;;;;N;;;;; +13B46;EGYPTIAN HIEROGLYPH-13B46;Lo;0;L;;;;;N;;;;; +13B47;EGYPTIAN HIEROGLYPH-13B47;Lo;0;L;;;;;N;;;;; +13B48;EGYPTIAN HIEROGLYPH-13B48;Lo;0;L;;;;;N;;;;; +13B49;EGYPTIAN HIEROGLYPH-13B49;Lo;0;L;;;;;N;;;;; +13B4A;EGYPTIAN HIEROGLYPH-13B4A;Lo;0;L;;;;;N;;;;; +13B4B;EGYPTIAN HIEROGLYPH-13B4B;Lo;0;L;;;;;N;;;;; +13B4C;EGYPTIAN HIEROGLYPH-13B4C;Lo;0;L;;;;;N;;;;; +13B4D;EGYPTIAN HIEROGLYPH-13B4D;Lo;0;L;;;;;N;;;;; +13B4E;EGYPTIAN HIEROGLYPH-13B4E;Lo;0;L;;;;;N;;;;; +13B4F;EGYPTIAN HIEROGLYPH-13B4F;Lo;0;L;;;;;N;;;;; +13B50;EGYPTIAN HIEROGLYPH-13B50;Lo;0;L;;;;;N;;;;; +13B51;EGYPTIAN HIEROGLYPH-13B51;Lo;0;L;;;;;N;;;;; +13B52;EGYPTIAN HIEROGLYPH-13B52;Lo;0;L;;;;;N;;;;; +13B53;EGYPTIAN HIEROGLYPH-13B53;Lo;0;L;;;;;N;;;;; +13B54;EGYPTIAN HIEROGLYPH-13B54;Lo;0;L;;;;;N;;;;; +13B55;EGYPTIAN HIEROGLYPH-13B55;Lo;0;L;;;;;N;;;;; +13B56;EGYPTIAN HIEROGLYPH-13B56;Lo;0;L;;;;;N;;;;; +13B57;EGYPTIAN HIEROGLYPH-13B57;Lo;0;L;;;;;N;;;;; +13B58;EGYPTIAN HIEROGLYPH-13B58;Lo;0;L;;;;;N;;;;; +13B59;EGYPTIAN HIEROGLYPH-13B59;Lo;0;L;;;;;N;;;;; +13B5A;EGYPTIAN HIEROGLYPH-13B5A;Lo;0;L;;;;;N;;;;; +13B5B;EGYPTIAN HIEROGLYPH-13B5B;Lo;0;L;;;;;N;;;;; +13B5C;EGYPTIAN HIEROGLYPH-13B5C;Lo;0;L;;;;;N;;;;; +13B5D;EGYPTIAN HIEROGLYPH-13B5D;Lo;0;L;;;;;N;;;;; +13B5E;EGYPTIAN HIEROGLYPH-13B5E;Lo;0;L;;;;;N;;;;; +13B5F;EGYPTIAN HIEROGLYPH-13B5F;Lo;0;L;;;;;N;;;;; +13B60;EGYPTIAN HIEROGLYPH-13B60;Lo;0;L;;;;;N;;;;; +13B61;EGYPTIAN HIEROGLYPH-13B61;Lo;0;L;;;;;N;;;;; +13B62;EGYPTIAN HIEROGLYPH-13B62;Lo;0;L;;;;;N;;;;; +13B63;EGYPTIAN HIEROGLYPH-13B63;Lo;0;L;;;;;N;;;;; +13B64;EGYPTIAN HIEROGLYPH-13B64;Lo;0;L;;;;;N;;;;; +13B65;EGYPTIAN HIEROGLYPH-13B65;Lo;0;L;;;;;N;;;;; +13B66;EGYPTIAN HIEROGLYPH-13B66;Lo;0;L;;;;;N;;;;; +13B67;EGYPTIAN HIEROGLYPH-13B67;Lo;0;L;;;;;N;;;;; +13B68;EGYPTIAN HIEROGLYPH-13B68;Lo;0;L;;;;;N;;;;; +13B69;EGYPTIAN HIEROGLYPH-13B69;Lo;0;L;;;;;N;;;;; +13B6A;EGYPTIAN HIEROGLYPH-13B6A;Lo;0;L;;;;;N;;;;; +13B6B;EGYPTIAN HIEROGLYPH-13B6B;Lo;0;L;;;;;N;;;;; +13B6C;EGYPTIAN HIEROGLYPH-13B6C;Lo;0;L;;;;;N;;;;; +13B6D;EGYPTIAN HIEROGLYPH-13B6D;Lo;0;L;;;;;N;;;;; +13B6E;EGYPTIAN HIEROGLYPH-13B6E;Lo;0;L;;;;;N;;;;; +13B6F;EGYPTIAN HIEROGLYPH-13B6F;Lo;0;L;;;;;N;;;;; +13B70;EGYPTIAN HIEROGLYPH-13B70;Lo;0;L;;;;;N;;;;; +13B71;EGYPTIAN HIEROGLYPH-13B71;Lo;0;L;;;;;N;;;;; +13B72;EGYPTIAN HIEROGLYPH-13B72;Lo;0;L;;;;;N;;;;; +13B73;EGYPTIAN HIEROGLYPH-13B73;Lo;0;L;;;;;N;;;;; +13B74;EGYPTIAN HIEROGLYPH-13B74;Lo;0;L;;;;;N;;;;; +13B75;EGYPTIAN HIEROGLYPH-13B75;Lo;0;L;;;;;N;;;;; +13B76;EGYPTIAN HIEROGLYPH-13B76;Lo;0;L;;;;;N;;;;; +13B77;EGYPTIAN HIEROGLYPH-13B77;Lo;0;L;;;;;N;;;;; +13B78;EGYPTIAN HIEROGLYPH-13B78;Lo;0;L;;;;;N;;;;; +13B79;EGYPTIAN HIEROGLYPH-13B79;Lo;0;L;;;;;N;;;;; +13B7A;EGYPTIAN HIEROGLYPH-13B7A;Lo;0;L;;;;;N;;;;; +13B7B;EGYPTIAN HIEROGLYPH-13B7B;Lo;0;L;;;;;N;;;;; +13B7C;EGYPTIAN HIEROGLYPH-13B7C;Lo;0;L;;;;;N;;;;; +13B7D;EGYPTIAN HIEROGLYPH-13B7D;Lo;0;L;;;;;N;;;;; +13B7E;EGYPTIAN HIEROGLYPH-13B7E;Lo;0;L;;;;;N;;;;; +13B7F;EGYPTIAN HIEROGLYPH-13B7F;Lo;0;L;;;;;N;;;;; +13B80;EGYPTIAN HIEROGLYPH-13B80;Lo;0;L;;;;;N;;;;; +13B81;EGYPTIAN HIEROGLYPH-13B81;Lo;0;L;;;;;N;;;;; +13B82;EGYPTIAN HIEROGLYPH-13B82;Lo;0;L;;;;;N;;;;; +13B83;EGYPTIAN HIEROGLYPH-13B83;Lo;0;L;;;;;N;;;;; +13B84;EGYPTIAN HIEROGLYPH-13B84;Lo;0;L;;;;;N;;;;; +13B85;EGYPTIAN HIEROGLYPH-13B85;Lo;0;L;;;;;N;;;;; +13B86;EGYPTIAN HIEROGLYPH-13B86;Lo;0;L;;;;;N;;;;; +13B87;EGYPTIAN HIEROGLYPH-13B87;Lo;0;L;;;;;N;;;;; +13B88;EGYPTIAN HIEROGLYPH-13B88;Lo;0;L;;;;;N;;;;; +13B89;EGYPTIAN HIEROGLYPH-13B89;Lo;0;L;;;;;N;;;;; +13B8A;EGYPTIAN HIEROGLYPH-13B8A;Lo;0;L;;;;;N;;;;; +13B8B;EGYPTIAN HIEROGLYPH-13B8B;Lo;0;L;;;;;N;;;;; +13B8C;EGYPTIAN HIEROGLYPH-13B8C;Lo;0;L;;;;;N;;;;; +13B8D;EGYPTIAN HIEROGLYPH-13B8D;Lo;0;L;;;;;N;;;;; +13B8E;EGYPTIAN HIEROGLYPH-13B8E;Lo;0;L;;;;;N;;;;; +13B8F;EGYPTIAN HIEROGLYPH-13B8F;Lo;0;L;;;;;N;;;;; +13B90;EGYPTIAN HIEROGLYPH-13B90;Lo;0;L;;;;;N;;;;; +13B91;EGYPTIAN HIEROGLYPH-13B91;Lo;0;L;;;;;N;;;;; +13B92;EGYPTIAN HIEROGLYPH-13B92;Lo;0;L;;;;;N;;;;; +13B93;EGYPTIAN HIEROGLYPH-13B93;Lo;0;L;;;;;N;;;;; +13B94;EGYPTIAN HIEROGLYPH-13B94;Lo;0;L;;;;;N;;;;; +13B95;EGYPTIAN HIEROGLYPH-13B95;Lo;0;L;;;;;N;;;;; +13B96;EGYPTIAN HIEROGLYPH-13B96;Lo;0;L;;;;;N;;;;; +13B97;EGYPTIAN HIEROGLYPH-13B97;Lo;0;L;;;;;N;;;;; +13B98;EGYPTIAN HIEROGLYPH-13B98;Lo;0;L;;;;;N;;;;; +13B99;EGYPTIAN HIEROGLYPH-13B99;Lo;0;L;;;;;N;;;;; +13B9A;EGYPTIAN HIEROGLYPH-13B9A;Lo;0;L;;;;;N;;;;; +13B9B;EGYPTIAN HIEROGLYPH-13B9B;Lo;0;L;;;;;N;;;;; +13B9C;EGYPTIAN HIEROGLYPH-13B9C;Lo;0;L;;;;;N;;;;; +13B9D;EGYPTIAN HIEROGLYPH-13B9D;Lo;0;L;;;;;N;;;;; +13B9E;EGYPTIAN HIEROGLYPH-13B9E;Lo;0;L;;;;;N;;;;; +13B9F;EGYPTIAN HIEROGLYPH-13B9F;Lo;0;L;;;;;N;;;;; +13BA0;EGYPTIAN HIEROGLYPH-13BA0;Lo;0;L;;;;;N;;;;; +13BA1;EGYPTIAN HIEROGLYPH-13BA1;Lo;0;L;;;;;N;;;;; +13BA2;EGYPTIAN HIEROGLYPH-13BA2;Lo;0;L;;;;;N;;;;; +13BA3;EGYPTIAN HIEROGLYPH-13BA3;Lo;0;L;;;;;N;;;;; +13BA4;EGYPTIAN HIEROGLYPH-13BA4;Lo;0;L;;;;;N;;;;; +13BA5;EGYPTIAN HIEROGLYPH-13BA5;Lo;0;L;;;;;N;;;;; +13BA6;EGYPTIAN HIEROGLYPH-13BA6;Lo;0;L;;;;;N;;;;; +13BA7;EGYPTIAN HIEROGLYPH-13BA7;Lo;0;L;;;;;N;;;;; +13BA8;EGYPTIAN HIEROGLYPH-13BA8;Lo;0;L;;;;;N;;;;; +13BA9;EGYPTIAN HIEROGLYPH-13BA9;Lo;0;L;;;;;N;;;;; +13BAA;EGYPTIAN HIEROGLYPH-13BAA;Lo;0;L;;;;;N;;;;; +13BAB;EGYPTIAN HIEROGLYPH-13BAB;Lo;0;L;;;;;N;;;;; +13BAC;EGYPTIAN HIEROGLYPH-13BAC;Lo;0;L;;;;;N;;;;; +13BAD;EGYPTIAN HIEROGLYPH-13BAD;Lo;0;L;;;;;N;;;;; +13BAE;EGYPTIAN HIEROGLYPH-13BAE;Lo;0;L;;;;;N;;;;; +13BAF;EGYPTIAN HIEROGLYPH-13BAF;Lo;0;L;;;;;N;;;;; +13BB0;EGYPTIAN HIEROGLYPH-13BB0;Lo;0;L;;;;;N;;;;; +13BB1;EGYPTIAN HIEROGLYPH-13BB1;Lo;0;L;;;;;N;;;;; +13BB2;EGYPTIAN HIEROGLYPH-13BB2;Lo;0;L;;;;;N;;;;; +13BB3;EGYPTIAN HIEROGLYPH-13BB3;Lo;0;L;;;;;N;;;;; +13BB4;EGYPTIAN HIEROGLYPH-13BB4;Lo;0;L;;;;;N;;;;; +13BB5;EGYPTIAN HIEROGLYPH-13BB5;Lo;0;L;;;;;N;;;;; +13BB6;EGYPTIAN HIEROGLYPH-13BB6;Lo;0;L;;;;;N;;;;; +13BB7;EGYPTIAN HIEROGLYPH-13BB7;Lo;0;L;;;;;N;;;;; +13BB8;EGYPTIAN HIEROGLYPH-13BB8;Lo;0;L;;;;;N;;;;; +13BB9;EGYPTIAN HIEROGLYPH-13BB9;Lo;0;L;;;;;N;;;;; +13BBA;EGYPTIAN HIEROGLYPH-13BBA;Lo;0;L;;;;;N;;;;; +13BBB;EGYPTIAN HIEROGLYPH-13BBB;Lo;0;L;;;;;N;;;;; +13BBC;EGYPTIAN HIEROGLYPH-13BBC;Lo;0;L;;;;;N;;;;; +13BBD;EGYPTIAN HIEROGLYPH-13BBD;Lo;0;L;;;;;N;;;;; +13BBE;EGYPTIAN HIEROGLYPH-13BBE;Lo;0;L;;;;;N;;;;; +13BBF;EGYPTIAN HIEROGLYPH-13BBF;Lo;0;L;;;;;N;;;;; +13BC0;EGYPTIAN HIEROGLYPH-13BC0;Lo;0;L;;;;;N;;;;; +13BC1;EGYPTIAN HIEROGLYPH-13BC1;Lo;0;L;;;;;N;;;;; +13BC2;EGYPTIAN HIEROGLYPH-13BC2;Lo;0;L;;;;;N;;;;; +13BC3;EGYPTIAN HIEROGLYPH-13BC3;Lo;0;L;;;;;N;;;;; +13BC4;EGYPTIAN HIEROGLYPH-13BC4;Lo;0;L;;;;;N;;;;; +13BC5;EGYPTIAN HIEROGLYPH-13BC5;Lo;0;L;;;;;N;;;;; +13BC6;EGYPTIAN HIEROGLYPH-13BC6;Lo;0;L;;;;;N;;;;; +13BC7;EGYPTIAN HIEROGLYPH-13BC7;Lo;0;L;;;;;N;;;;; +13BC8;EGYPTIAN HIEROGLYPH-13BC8;Lo;0;L;;;;;N;;;;; +13BC9;EGYPTIAN HIEROGLYPH-13BC9;Lo;0;L;;;;;N;;;;; +13BCA;EGYPTIAN HIEROGLYPH-13BCA;Lo;0;L;;;;;N;;;;; +13BCB;EGYPTIAN HIEROGLYPH-13BCB;Lo;0;L;;;;;N;;;;; +13BCC;EGYPTIAN HIEROGLYPH-13BCC;Lo;0;L;;;;;N;;;;; +13BCD;EGYPTIAN HIEROGLYPH-13BCD;Lo;0;L;;;;;N;;;;; +13BCE;EGYPTIAN HIEROGLYPH-13BCE;Lo;0;L;;;;;N;;;;; +13BCF;EGYPTIAN HIEROGLYPH-13BCF;Lo;0;L;;;;;N;;;;; +13BD0;EGYPTIAN HIEROGLYPH-13BD0;Lo;0;L;;;;;N;;;;; +13BD1;EGYPTIAN HIEROGLYPH-13BD1;Lo;0;L;;;;;N;;;;; +13BD2;EGYPTIAN HIEROGLYPH-13BD2;Lo;0;L;;;;;N;;;;; +13BD3;EGYPTIAN HIEROGLYPH-13BD3;Lo;0;L;;;;;N;;;;; +13BD4;EGYPTIAN HIEROGLYPH-13BD4;Lo;0;L;;;;;N;;;;; +13BD5;EGYPTIAN HIEROGLYPH-13BD5;Lo;0;L;;;;;N;;;;; +13BD6;EGYPTIAN HIEROGLYPH-13BD6;Lo;0;L;;;;;N;;;;; +13BD7;EGYPTIAN HIEROGLYPH-13BD7;Lo;0;L;;;;;N;;;;; +13BD8;EGYPTIAN HIEROGLYPH-13BD8;Lo;0;L;;;;;N;;;;; +13BD9;EGYPTIAN HIEROGLYPH-13BD9;Lo;0;L;;;;;N;;;;; +13BDA;EGYPTIAN HIEROGLYPH-13BDA;Lo;0;L;;;;;N;;;;; +13BDB;EGYPTIAN HIEROGLYPH-13BDB;Lo;0;L;;;;;N;;;;; +13BDC;EGYPTIAN HIEROGLYPH-13BDC;Lo;0;L;;;;;N;;;;; +13BDD;EGYPTIAN HIEROGLYPH-13BDD;Lo;0;L;;;;;N;;;;; +13BDE;EGYPTIAN HIEROGLYPH-13BDE;Lo;0;L;;;;;N;;;;; +13BDF;EGYPTIAN HIEROGLYPH-13BDF;Lo;0;L;;;;;N;;;;; +13BE0;EGYPTIAN HIEROGLYPH-13BE0;Lo;0;L;;;;;N;;;;; +13BE1;EGYPTIAN HIEROGLYPH-13BE1;Lo;0;L;;;;;N;;;;; +13BE2;EGYPTIAN HIEROGLYPH-13BE2;Lo;0;L;;;;;N;;;;; +13BE3;EGYPTIAN HIEROGLYPH-13BE3;Lo;0;L;;;;;N;;;;; +13BE4;EGYPTIAN HIEROGLYPH-13BE4;Lo;0;L;;;;;N;;;;; +13BE5;EGYPTIAN HIEROGLYPH-13BE5;Lo;0;L;;;;;N;;;;; +13BE6;EGYPTIAN HIEROGLYPH-13BE6;Lo;0;L;;;;;N;;;;; +13BE7;EGYPTIAN HIEROGLYPH-13BE7;Lo;0;L;;;;;N;;;;; +13BE8;EGYPTIAN HIEROGLYPH-13BE8;Lo;0;L;;;;;N;;;;; +13BE9;EGYPTIAN HIEROGLYPH-13BE9;Lo;0;L;;;;;N;;;;; +13BEA;EGYPTIAN HIEROGLYPH-13BEA;Lo;0;L;;;;;N;;;;; +13BEB;EGYPTIAN HIEROGLYPH-13BEB;Lo;0;L;;;;;N;;;;; +13BEC;EGYPTIAN HIEROGLYPH-13BEC;Lo;0;L;;;;;N;;;;; +13BED;EGYPTIAN HIEROGLYPH-13BED;Lo;0;L;;;;;N;;;;; +13BEE;EGYPTIAN HIEROGLYPH-13BEE;Lo;0;L;;;;;N;;;;; +13BEF;EGYPTIAN HIEROGLYPH-13BEF;Lo;0;L;;;;;N;;;;; +13BF0;EGYPTIAN HIEROGLYPH-13BF0;Lo;0;L;;;;;N;;;;; +13BF1;EGYPTIAN HIEROGLYPH-13BF1;Lo;0;L;;;;;N;;;;; +13BF2;EGYPTIAN HIEROGLYPH-13BF2;Lo;0;L;;;;;N;;;;; +13BF3;EGYPTIAN HIEROGLYPH-13BF3;Lo;0;L;;;;;N;;;;; +13BF4;EGYPTIAN HIEROGLYPH-13BF4;Lo;0;L;;;;;N;;;;; +13BF5;EGYPTIAN HIEROGLYPH-13BF5;Lo;0;L;;;;;N;;;;; +13BF6;EGYPTIAN HIEROGLYPH-13BF6;Lo;0;L;;;;;N;;;;; +13BF7;EGYPTIAN HIEROGLYPH-13BF7;Lo;0;L;;;;;N;;;;; +13BF8;EGYPTIAN HIEROGLYPH-13BF8;Lo;0;L;;;;;N;;;;; +13BF9;EGYPTIAN HIEROGLYPH-13BF9;Lo;0;L;;;;;N;;;;; +13BFA;EGYPTIAN HIEROGLYPH-13BFA;Lo;0;L;;;;;N;;;;; +13BFB;EGYPTIAN HIEROGLYPH-13BFB;Lo;0;L;;;;;N;;;;; +13BFC;EGYPTIAN HIEROGLYPH-13BFC;Lo;0;L;;;;;N;;;;; +13BFD;EGYPTIAN HIEROGLYPH-13BFD;Lo;0;L;;;;;N;;;;; +13BFE;EGYPTIAN HIEROGLYPH-13BFE;Lo;0;L;;;;;N;;;;; +13BFF;EGYPTIAN HIEROGLYPH-13BFF;Lo;0;L;;;;;N;;;;; +13C00;EGYPTIAN HIEROGLYPH-13C00;Lo;0;L;;;;;N;;;;; +13C01;EGYPTIAN HIEROGLYPH-13C01;Lo;0;L;;;;;N;;;;; +13C02;EGYPTIAN HIEROGLYPH-13C02;Lo;0;L;;;;;N;;;;; +13C03;EGYPTIAN HIEROGLYPH-13C03;Lo;0;L;;;;;N;;;;; +13C04;EGYPTIAN HIEROGLYPH-13C04;Lo;0;L;;;;;N;;;;; +13C05;EGYPTIAN HIEROGLYPH-13C05;Lo;0;L;;;;;N;;;;; +13C06;EGYPTIAN HIEROGLYPH-13C06;Lo;0;L;;;;;N;;;;; +13C07;EGYPTIAN HIEROGLYPH-13C07;Lo;0;L;;;;;N;;;;; +13C08;EGYPTIAN HIEROGLYPH-13C08;Lo;0;L;;;;;N;;;;; +13C09;EGYPTIAN HIEROGLYPH-13C09;Lo;0;L;;;;;N;;;;; +13C0A;EGYPTIAN HIEROGLYPH-13C0A;Lo;0;L;;;;;N;;;;; +13C0B;EGYPTIAN HIEROGLYPH-13C0B;Lo;0;L;;;;;N;;;;; +13C0C;EGYPTIAN HIEROGLYPH-13C0C;Lo;0;L;;;;;N;;;;; +13C0D;EGYPTIAN HIEROGLYPH-13C0D;Lo;0;L;;;;;N;;;;; +13C0E;EGYPTIAN HIEROGLYPH-13C0E;Lo;0;L;;;;;N;;;;; +13C0F;EGYPTIAN HIEROGLYPH-13C0F;Lo;0;L;;;;;N;;;;; +13C10;EGYPTIAN HIEROGLYPH-13C10;Lo;0;L;;;;;N;;;;; +13C11;EGYPTIAN HIEROGLYPH-13C11;Lo;0;L;;;;;N;;;;; +13C12;EGYPTIAN HIEROGLYPH-13C12;Lo;0;L;;;;;N;;;;; +13C13;EGYPTIAN HIEROGLYPH-13C13;Lo;0;L;;;;;N;;;;; +13C14;EGYPTIAN HIEROGLYPH-13C14;Lo;0;L;;;;;N;;;;; +13C15;EGYPTIAN HIEROGLYPH-13C15;Lo;0;L;;;;;N;;;;; +13C16;EGYPTIAN HIEROGLYPH-13C16;Lo;0;L;;;;;N;;;;; +13C17;EGYPTIAN HIEROGLYPH-13C17;Lo;0;L;;;;;N;;;;; +13C18;EGYPTIAN HIEROGLYPH-13C18;Lo;0;L;;;;;N;;;;; +13C19;EGYPTIAN HIEROGLYPH-13C19;Lo;0;L;;;;;N;;;;; +13C1A;EGYPTIAN HIEROGLYPH-13C1A;Lo;0;L;;;;;N;;;;; +13C1B;EGYPTIAN HIEROGLYPH-13C1B;Lo;0;L;;;;;N;;;;; +13C1C;EGYPTIAN HIEROGLYPH-13C1C;Lo;0;L;;;;;N;;;;; +13C1D;EGYPTIAN HIEROGLYPH-13C1D;Lo;0;L;;;;;N;;;;; +13C1E;EGYPTIAN HIEROGLYPH-13C1E;Lo;0;L;;;;;N;;;;; +13C1F;EGYPTIAN HIEROGLYPH-13C1F;Lo;0;L;;;;;N;;;;; +13C20;EGYPTIAN HIEROGLYPH-13C20;Lo;0;L;;;;;N;;;;; +13C21;EGYPTIAN HIEROGLYPH-13C21;Lo;0;L;;;;;N;;;;; +13C22;EGYPTIAN HIEROGLYPH-13C22;Lo;0;L;;;;;N;;;;; +13C23;EGYPTIAN HIEROGLYPH-13C23;Lo;0;L;;;;;N;;;;; +13C24;EGYPTIAN HIEROGLYPH-13C24;Lo;0;L;;;;;N;;;;; +13C25;EGYPTIAN HIEROGLYPH-13C25;Lo;0;L;;;;;N;;;;; +13C26;EGYPTIAN HIEROGLYPH-13C26;Lo;0;L;;;;;N;;;;; +13C27;EGYPTIAN HIEROGLYPH-13C27;Lo;0;L;;;;;N;;;;; +13C28;EGYPTIAN HIEROGLYPH-13C28;Lo;0;L;;;;;N;;;;; +13C29;EGYPTIAN HIEROGLYPH-13C29;Lo;0;L;;;;;N;;;;; +13C2A;EGYPTIAN HIEROGLYPH-13C2A;Lo;0;L;;;;;N;;;;; +13C2B;EGYPTIAN HIEROGLYPH-13C2B;Lo;0;L;;;;;N;;;;; +13C2C;EGYPTIAN HIEROGLYPH-13C2C;Lo;0;L;;;;;N;;;;; +13C2D;EGYPTIAN HIEROGLYPH-13C2D;Lo;0;L;;;;;N;;;;; +13C2E;EGYPTIAN HIEROGLYPH-13C2E;Lo;0;L;;;;;N;;;;; +13C2F;EGYPTIAN HIEROGLYPH-13C2F;Lo;0;L;;;;;N;;;;; +13C30;EGYPTIAN HIEROGLYPH-13C30;Lo;0;L;;;;;N;;;;; +13C31;EGYPTIAN HIEROGLYPH-13C31;Lo;0;L;;;;;N;;;;; +13C32;EGYPTIAN HIEROGLYPH-13C32;Lo;0;L;;;;;N;;;;; +13C33;EGYPTIAN HIEROGLYPH-13C33;Lo;0;L;;;;;N;;;;; +13C34;EGYPTIAN HIEROGLYPH-13C34;Lo;0;L;;;;;N;;;;; +13C35;EGYPTIAN HIEROGLYPH-13C35;Lo;0;L;;;;;N;;;;; +13C36;EGYPTIAN HIEROGLYPH-13C36;Lo;0;L;;;;;N;;;;; +13C37;EGYPTIAN HIEROGLYPH-13C37;Lo;0;L;;;;;N;;;;; +13C38;EGYPTIAN HIEROGLYPH-13C38;Lo;0;L;;;;;N;;;;; +13C39;EGYPTIAN HIEROGLYPH-13C39;Lo;0;L;;;;;N;;;;; +13C3A;EGYPTIAN HIEROGLYPH-13C3A;Lo;0;L;;;;;N;;;;; +13C3B;EGYPTIAN HIEROGLYPH-13C3B;Lo;0;L;;;;;N;;;;; +13C3C;EGYPTIAN HIEROGLYPH-13C3C;Lo;0;L;;;;;N;;;;; +13C3D;EGYPTIAN HIEROGLYPH-13C3D;Lo;0;L;;;;;N;;;;; +13C3E;EGYPTIAN HIEROGLYPH-13C3E;Lo;0;L;;;;;N;;;;; +13C3F;EGYPTIAN HIEROGLYPH-13C3F;Lo;0;L;;;;;N;;;;; +13C40;EGYPTIAN HIEROGLYPH-13C40;Lo;0;L;;;;;N;;;;; +13C41;EGYPTIAN HIEROGLYPH-13C41;Lo;0;L;;;;;N;;;;; +13C42;EGYPTIAN HIEROGLYPH-13C42;Lo;0;L;;;;;N;;;;; +13C43;EGYPTIAN HIEROGLYPH-13C43;Lo;0;L;;;;;N;;;;; +13C44;EGYPTIAN HIEROGLYPH-13C44;Lo;0;L;;;;;N;;;;; +13C45;EGYPTIAN HIEROGLYPH-13C45;Lo;0;L;;;;;N;;;;; +13C46;EGYPTIAN HIEROGLYPH-13C46;Lo;0;L;;;;;N;;;;; +13C47;EGYPTIAN HIEROGLYPH-13C47;Lo;0;L;;;;;N;;;;; +13C48;EGYPTIAN HIEROGLYPH-13C48;Lo;0;L;;;;;N;;;;; +13C49;EGYPTIAN HIEROGLYPH-13C49;Lo;0;L;;;;;N;;;;; +13C4A;EGYPTIAN HIEROGLYPH-13C4A;Lo;0;L;;;;;N;;;;; +13C4B;EGYPTIAN HIEROGLYPH-13C4B;Lo;0;L;;;;;N;;;;; +13C4C;EGYPTIAN HIEROGLYPH-13C4C;Lo;0;L;;;;;N;;;;; +13C4D;EGYPTIAN HIEROGLYPH-13C4D;Lo;0;L;;;;;N;;;;; +13C4E;EGYPTIAN HIEROGLYPH-13C4E;Lo;0;L;;;;;N;;;;; +13C4F;EGYPTIAN HIEROGLYPH-13C4F;Lo;0;L;;;;;N;;;;; +13C50;EGYPTIAN HIEROGLYPH-13C50;Lo;0;L;;;;;N;;;;; +13C51;EGYPTIAN HIEROGLYPH-13C51;Lo;0;L;;;;;N;;;;; +13C52;EGYPTIAN HIEROGLYPH-13C52;Lo;0;L;;;;;N;;;;; +13C53;EGYPTIAN HIEROGLYPH-13C53;Lo;0;L;;;;;N;;;;; +13C54;EGYPTIAN HIEROGLYPH-13C54;Lo;0;L;;;;;N;;;;; +13C55;EGYPTIAN HIEROGLYPH-13C55;Lo;0;L;;;;;N;;;;; +13C56;EGYPTIAN HIEROGLYPH-13C56;Lo;0;L;;;;;N;;;;; +13C57;EGYPTIAN HIEROGLYPH-13C57;Lo;0;L;;;;;N;;;;; +13C58;EGYPTIAN HIEROGLYPH-13C58;Lo;0;L;;;;;N;;;;; +13C59;EGYPTIAN HIEROGLYPH-13C59;Lo;0;L;;;;;N;;;;; +13C5A;EGYPTIAN HIEROGLYPH-13C5A;Lo;0;L;;;;;N;;;;; +13C5B;EGYPTIAN HIEROGLYPH-13C5B;Lo;0;L;;;;;N;;;;; +13C5C;EGYPTIAN HIEROGLYPH-13C5C;Lo;0;L;;;;;N;;;;; +13C5D;EGYPTIAN HIEROGLYPH-13C5D;Lo;0;L;;;;;N;;;;; +13C5E;EGYPTIAN HIEROGLYPH-13C5E;Lo;0;L;;;;;N;;;;; +13C5F;EGYPTIAN HIEROGLYPH-13C5F;Lo;0;L;;;;;N;;;;; +13C60;EGYPTIAN HIEROGLYPH-13C60;Lo;0;L;;;;;N;;;;; +13C61;EGYPTIAN HIEROGLYPH-13C61;Lo;0;L;;;;;N;;;;; +13C62;EGYPTIAN HIEROGLYPH-13C62;Lo;0;L;;;;;N;;;;; +13C63;EGYPTIAN HIEROGLYPH-13C63;Lo;0;L;;;;;N;;;;; +13C64;EGYPTIAN HIEROGLYPH-13C64;Lo;0;L;;;;;N;;;;; +13C65;EGYPTIAN HIEROGLYPH-13C65;Lo;0;L;;;;;N;;;;; +13C66;EGYPTIAN HIEROGLYPH-13C66;Lo;0;L;;;;;N;;;;; +13C67;EGYPTIAN HIEROGLYPH-13C67;Lo;0;L;;;;;N;;;;; +13C68;EGYPTIAN HIEROGLYPH-13C68;Lo;0;L;;;;;N;;;;; +13C69;EGYPTIAN HIEROGLYPH-13C69;Lo;0;L;;;;;N;;;;; +13C6A;EGYPTIAN HIEROGLYPH-13C6A;Lo;0;L;;;;;N;;;;; +13C6B;EGYPTIAN HIEROGLYPH-13C6B;Lo;0;L;;;;;N;;;;; +13C6C;EGYPTIAN HIEROGLYPH-13C6C;Lo;0;L;;;;;N;;;;; +13C6D;EGYPTIAN HIEROGLYPH-13C6D;Lo;0;L;;;;;N;;;;; +13C6E;EGYPTIAN HIEROGLYPH-13C6E;Lo;0;L;;;;;N;;;;; +13C6F;EGYPTIAN HIEROGLYPH-13C6F;Lo;0;L;;;;;N;;;;; +13C70;EGYPTIAN HIEROGLYPH-13C70;Lo;0;L;;;;;N;;;;; +13C71;EGYPTIAN HIEROGLYPH-13C71;Lo;0;L;;;;;N;;;;; +13C72;EGYPTIAN HIEROGLYPH-13C72;Lo;0;L;;;;;N;;;;; +13C73;EGYPTIAN HIEROGLYPH-13C73;Lo;0;L;;;;;N;;;;; +13C74;EGYPTIAN HIEROGLYPH-13C74;Lo;0;L;;;;;N;;;;; +13C75;EGYPTIAN HIEROGLYPH-13C75;Lo;0;L;;;;;N;;;;; +13C76;EGYPTIAN HIEROGLYPH-13C76;Lo;0;L;;;;;N;;;;; +13C77;EGYPTIAN HIEROGLYPH-13C77;Lo;0;L;;;;;N;;;;; +13C78;EGYPTIAN HIEROGLYPH-13C78;Lo;0;L;;;;;N;;;;; +13C79;EGYPTIAN HIEROGLYPH-13C79;Lo;0;L;;;;;N;;;;; +13C7A;EGYPTIAN HIEROGLYPH-13C7A;Lo;0;L;;;;;N;;;;; +13C7B;EGYPTIAN HIEROGLYPH-13C7B;Lo;0;L;;;;;N;;;;; +13C7C;EGYPTIAN HIEROGLYPH-13C7C;Lo;0;L;;;;;N;;;;; +13C7D;EGYPTIAN HIEROGLYPH-13C7D;Lo;0;L;;;;;N;;;;; +13C7E;EGYPTIAN HIEROGLYPH-13C7E;Lo;0;L;;;;;N;;;;; +13C7F;EGYPTIAN HIEROGLYPH-13C7F;Lo;0;L;;;;;N;;;;; +13C80;EGYPTIAN HIEROGLYPH-13C80;Lo;0;L;;;;;N;;;;; +13C81;EGYPTIAN HIEROGLYPH-13C81;Lo;0;L;;;;;N;;;;; +13C82;EGYPTIAN HIEROGLYPH-13C82;Lo;0;L;;;;;N;;;;; +13C83;EGYPTIAN HIEROGLYPH-13C83;Lo;0;L;;;;;N;;;;; +13C84;EGYPTIAN HIEROGLYPH-13C84;Lo;0;L;;;;;N;;;;; +13C85;EGYPTIAN HIEROGLYPH-13C85;Lo;0;L;;;;;N;;;;; +13C86;EGYPTIAN HIEROGLYPH-13C86;Lo;0;L;;;;;N;;;;; +13C87;EGYPTIAN HIEROGLYPH-13C87;Lo;0;L;;;;;N;;;;; +13C88;EGYPTIAN HIEROGLYPH-13C88;Lo;0;L;;;;;N;;;;; +13C89;EGYPTIAN HIEROGLYPH-13C89;Lo;0;L;;;;;N;;;;; +13C8A;EGYPTIAN HIEROGLYPH-13C8A;Lo;0;L;;;;;N;;;;; +13C8B;EGYPTIAN HIEROGLYPH-13C8B;Lo;0;L;;;;;N;;;;; +13C8C;EGYPTIAN HIEROGLYPH-13C8C;Lo;0;L;;;;;N;;;;; +13C8D;EGYPTIAN HIEROGLYPH-13C8D;Lo;0;L;;;;;N;;;;; +13C8E;EGYPTIAN HIEROGLYPH-13C8E;Lo;0;L;;;;;N;;;;; +13C8F;EGYPTIAN HIEROGLYPH-13C8F;Lo;0;L;;;;;N;;;;; +13C90;EGYPTIAN HIEROGLYPH-13C90;Lo;0;L;;;;;N;;;;; +13C91;EGYPTIAN HIEROGLYPH-13C91;Lo;0;L;;;;;N;;;;; +13C92;EGYPTIAN HIEROGLYPH-13C92;Lo;0;L;;;;;N;;;;; +13C93;EGYPTIAN HIEROGLYPH-13C93;Lo;0;L;;;;;N;;;;; +13C94;EGYPTIAN HIEROGLYPH-13C94;Lo;0;L;;;;;N;;;;; +13C95;EGYPTIAN HIEROGLYPH-13C95;Lo;0;L;;;;;N;;;;; +13C96;EGYPTIAN HIEROGLYPH-13C96;Lo;0;L;;;;;N;;;;; +13C97;EGYPTIAN HIEROGLYPH-13C97;Lo;0;L;;;;;N;;;;; +13C98;EGYPTIAN HIEROGLYPH-13C98;Lo;0;L;;;;;N;;;;; +13C99;EGYPTIAN HIEROGLYPH-13C99;Lo;0;L;;;;;N;;;;; +13C9A;EGYPTIAN HIEROGLYPH-13C9A;Lo;0;L;;;;;N;;;;; +13C9B;EGYPTIAN HIEROGLYPH-13C9B;Lo;0;L;;;;;N;;;;; +13C9C;EGYPTIAN HIEROGLYPH-13C9C;Lo;0;L;;;;;N;;;;; +13C9D;EGYPTIAN HIEROGLYPH-13C9D;Lo;0;L;;;;;N;;;;; +13C9E;EGYPTIAN HIEROGLYPH-13C9E;Lo;0;L;;;;;N;;;;; +13C9F;EGYPTIAN HIEROGLYPH-13C9F;Lo;0;L;;;;;N;;;;; +13CA0;EGYPTIAN HIEROGLYPH-13CA0;Lo;0;L;;;;;N;;;;; +13CA1;EGYPTIAN HIEROGLYPH-13CA1;Lo;0;L;;;;;N;;;;; +13CA2;EGYPTIAN HIEROGLYPH-13CA2;Lo;0;L;;;;;N;;;;; +13CA3;EGYPTIAN HIEROGLYPH-13CA3;Lo;0;L;;;;;N;;;;; +13CA4;EGYPTIAN HIEROGLYPH-13CA4;Lo;0;L;;;;;N;;;;; +13CA5;EGYPTIAN HIEROGLYPH-13CA5;Lo;0;L;;;;;N;;;;; +13CA6;EGYPTIAN HIEROGLYPH-13CA6;Lo;0;L;;;;;N;;;;; +13CA7;EGYPTIAN HIEROGLYPH-13CA7;Lo;0;L;;;;;N;;;;; +13CA8;EGYPTIAN HIEROGLYPH-13CA8;Lo;0;L;;;;;N;;;;; +13CA9;EGYPTIAN HIEROGLYPH-13CA9;Lo;0;L;;;;;N;;;;; +13CAA;EGYPTIAN HIEROGLYPH-13CAA;Lo;0;L;;;;;N;;;;; +13CAB;EGYPTIAN HIEROGLYPH-13CAB;Lo;0;L;;;;;N;;;;; +13CAC;EGYPTIAN HIEROGLYPH-13CAC;Lo;0;L;;;;;N;;;;; +13CAD;EGYPTIAN HIEROGLYPH-13CAD;Lo;0;L;;;;;N;;;;; +13CAE;EGYPTIAN HIEROGLYPH-13CAE;Lo;0;L;;;;;N;;;;; +13CAF;EGYPTIAN HIEROGLYPH-13CAF;Lo;0;L;;;;;N;;;;; +13CB0;EGYPTIAN HIEROGLYPH-13CB0;Lo;0;L;;;;;N;;;;; +13CB1;EGYPTIAN HIEROGLYPH-13CB1;Lo;0;L;;;;;N;;;;; +13CB2;EGYPTIAN HIEROGLYPH-13CB2;Lo;0;L;;;;;N;;;;; +13CB3;EGYPTIAN HIEROGLYPH-13CB3;Lo;0;L;;;;;N;;;;; +13CB4;EGYPTIAN HIEROGLYPH-13CB4;Lo;0;L;;;;;N;;;;; +13CB5;EGYPTIAN HIEROGLYPH-13CB5;Lo;0;L;;;;;N;;;;; +13CB6;EGYPTIAN HIEROGLYPH-13CB6;Lo;0;L;;;;;N;;;;; +13CB7;EGYPTIAN HIEROGLYPH-13CB7;Lo;0;L;;;;;N;;;;; +13CB8;EGYPTIAN HIEROGLYPH-13CB8;Lo;0;L;;;;;N;;;;; +13CB9;EGYPTIAN HIEROGLYPH-13CB9;Lo;0;L;;;;;N;;;;; +13CBA;EGYPTIAN HIEROGLYPH-13CBA;Lo;0;L;;;;;N;;;;; +13CBB;EGYPTIAN HIEROGLYPH-13CBB;Lo;0;L;;;;;N;;;;; +13CBC;EGYPTIAN HIEROGLYPH-13CBC;Lo;0;L;;;;;N;;;;; +13CBD;EGYPTIAN HIEROGLYPH-13CBD;Lo;0;L;;;;;N;;;;; +13CBE;EGYPTIAN HIEROGLYPH-13CBE;Lo;0;L;;;;;N;;;;; +13CBF;EGYPTIAN HIEROGLYPH-13CBF;Lo;0;L;;;;;N;;;;; +13CC0;EGYPTIAN HIEROGLYPH-13CC0;Lo;0;L;;;;;N;;;;; +13CC1;EGYPTIAN HIEROGLYPH-13CC1;Lo;0;L;;;;;N;;;;; +13CC2;EGYPTIAN HIEROGLYPH-13CC2;Lo;0;L;;;;;N;;;;; +13CC3;EGYPTIAN HIEROGLYPH-13CC3;Lo;0;L;;;;;N;;;;; +13CC4;EGYPTIAN HIEROGLYPH-13CC4;Lo;0;L;;;;;N;;;;; +13CC5;EGYPTIAN HIEROGLYPH-13CC5;Lo;0;L;;;;;N;;;;; +13CC6;EGYPTIAN HIEROGLYPH-13CC6;Lo;0;L;;;;;N;;;;; +13CC7;EGYPTIAN HIEROGLYPH-13CC7;Lo;0;L;;;;;N;;;;; +13CC8;EGYPTIAN HIEROGLYPH-13CC8;Lo;0;L;;;;;N;;;;; +13CC9;EGYPTIAN HIEROGLYPH-13CC9;Lo;0;L;;;;;N;;;;; +13CCA;EGYPTIAN HIEROGLYPH-13CCA;Lo;0;L;;;;;N;;;;; +13CCB;EGYPTIAN HIEROGLYPH-13CCB;Lo;0;L;;;;;N;;;;; +13CCC;EGYPTIAN HIEROGLYPH-13CCC;Lo;0;L;;;;;N;;;;; +13CCD;EGYPTIAN HIEROGLYPH-13CCD;Lo;0;L;;;;;N;;;;; +13CCE;EGYPTIAN HIEROGLYPH-13CCE;Lo;0;L;;;;;N;;;;; +13CCF;EGYPTIAN HIEROGLYPH-13CCF;Lo;0;L;;;;;N;;;;; +13CD0;EGYPTIAN HIEROGLYPH-13CD0;Lo;0;L;;;;;N;;;;; +13CD1;EGYPTIAN HIEROGLYPH-13CD1;Lo;0;L;;;;;N;;;;; +13CD2;EGYPTIAN HIEROGLYPH-13CD2;Lo;0;L;;;;;N;;;;; +13CD3;EGYPTIAN HIEROGLYPH-13CD3;Lo;0;L;;;;;N;;;;; +13CD4;EGYPTIAN HIEROGLYPH-13CD4;Lo;0;L;;;;;N;;;;; +13CD5;EGYPTIAN HIEROGLYPH-13CD5;Lo;0;L;;;;;N;;;;; +13CD6;EGYPTIAN HIEROGLYPH-13CD6;Lo;0;L;;;;;N;;;;; +13CD7;EGYPTIAN HIEROGLYPH-13CD7;Lo;0;L;;;;;N;;;;; +13CD8;EGYPTIAN HIEROGLYPH-13CD8;Lo;0;L;;;;;N;;;;; +13CD9;EGYPTIAN HIEROGLYPH-13CD9;Lo;0;L;;;;;N;;;;; +13CDA;EGYPTIAN HIEROGLYPH-13CDA;Lo;0;L;;;;;N;;;;; +13CDB;EGYPTIAN HIEROGLYPH-13CDB;Lo;0;L;;;;;N;;;;; +13CDC;EGYPTIAN HIEROGLYPH-13CDC;Lo;0;L;;;;;N;;;;; +13CDD;EGYPTIAN HIEROGLYPH-13CDD;Lo;0;L;;;;;N;;;;; +13CDE;EGYPTIAN HIEROGLYPH-13CDE;Lo;0;L;;;;;N;;;;; +13CDF;EGYPTIAN HIEROGLYPH-13CDF;Lo;0;L;;;;;N;;;;; +13CE0;EGYPTIAN HIEROGLYPH-13CE0;Lo;0;L;;;;;N;;;;; +13CE1;EGYPTIAN HIEROGLYPH-13CE1;Lo;0;L;;;;;N;;;;; +13CE2;EGYPTIAN HIEROGLYPH-13CE2;Lo;0;L;;;;;N;;;;; +13CE3;EGYPTIAN HIEROGLYPH-13CE3;Lo;0;L;;;;;N;;;;; +13CE4;EGYPTIAN HIEROGLYPH-13CE4;Lo;0;L;;;;;N;;;;; +13CE5;EGYPTIAN HIEROGLYPH-13CE5;Lo;0;L;;;;;N;;;;; +13CE6;EGYPTIAN HIEROGLYPH-13CE6;Lo;0;L;;;;;N;;;;; +13CE7;EGYPTIAN HIEROGLYPH-13CE7;Lo;0;L;;;;;N;;;;; +13CE8;EGYPTIAN HIEROGLYPH-13CE8;Lo;0;L;;;;;N;;;;; +13CE9;EGYPTIAN HIEROGLYPH-13CE9;Lo;0;L;;;;;N;;;;; +13CEA;EGYPTIAN HIEROGLYPH-13CEA;Lo;0;L;;;;;N;;;;; +13CEB;EGYPTIAN HIEROGLYPH-13CEB;Lo;0;L;;;;;N;;;;; +13CEC;EGYPTIAN HIEROGLYPH-13CEC;Lo;0;L;;;;;N;;;;; +13CED;EGYPTIAN HIEROGLYPH-13CED;Lo;0;L;;;;;N;;;;; +13CEE;EGYPTIAN HIEROGLYPH-13CEE;Lo;0;L;;;;;N;;;;; +13CEF;EGYPTIAN HIEROGLYPH-13CEF;Lo;0;L;;;;;N;;;;; +13CF0;EGYPTIAN HIEROGLYPH-13CF0;Lo;0;L;;;;;N;;;;; +13CF1;EGYPTIAN HIEROGLYPH-13CF1;Lo;0;L;;;;;N;;;;; +13CF2;EGYPTIAN HIEROGLYPH-13CF2;Lo;0;L;;;;;N;;;;; +13CF3;EGYPTIAN HIEROGLYPH-13CF3;Lo;0;L;;;;;N;;;;; +13CF4;EGYPTIAN HIEROGLYPH-13CF4;Lo;0;L;;;;;N;;;;; +13CF5;EGYPTIAN HIEROGLYPH-13CF5;Lo;0;L;;;;;N;;;;; +13CF6;EGYPTIAN HIEROGLYPH-13CF6;Lo;0;L;;;;;N;;;;; +13CF7;EGYPTIAN HIEROGLYPH-13CF7;Lo;0;L;;;;;N;;;;; +13CF8;EGYPTIAN HIEROGLYPH-13CF8;Lo;0;L;;;;;N;;;;; +13CF9;EGYPTIAN HIEROGLYPH-13CF9;Lo;0;L;;;;;N;;;;; +13CFA;EGYPTIAN HIEROGLYPH-13CFA;Lo;0;L;;;;;N;;;;; +13CFB;EGYPTIAN HIEROGLYPH-13CFB;Lo;0;L;;;;;N;;;;; +13CFC;EGYPTIAN HIEROGLYPH-13CFC;Lo;0;L;;;;;N;;;;; +13CFD;EGYPTIAN HIEROGLYPH-13CFD;Lo;0;L;;;;;N;;;;; +13CFE;EGYPTIAN HIEROGLYPH-13CFE;Lo;0;L;;;;;N;;;;; +13CFF;EGYPTIAN HIEROGLYPH-13CFF;Lo;0;L;;;;;N;;;;; +13D00;EGYPTIAN HIEROGLYPH-13D00;Lo;0;L;;;;;N;;;;; +13D01;EGYPTIAN HIEROGLYPH-13D01;Lo;0;L;;;;;N;;;;; +13D02;EGYPTIAN HIEROGLYPH-13D02;Lo;0;L;;;;;N;;;;; +13D03;EGYPTIAN HIEROGLYPH-13D03;Lo;0;L;;;;;N;;;;; +13D04;EGYPTIAN HIEROGLYPH-13D04;Lo;0;L;;;;;N;;;;; +13D05;EGYPTIAN HIEROGLYPH-13D05;Lo;0;L;;;;;N;;;;; +13D06;EGYPTIAN HIEROGLYPH-13D06;Lo;0;L;;;;;N;;;;; +13D07;EGYPTIAN HIEROGLYPH-13D07;Lo;0;L;;;;;N;;;;; +13D08;EGYPTIAN HIEROGLYPH-13D08;Lo;0;L;;;;;N;;;;; +13D09;EGYPTIAN HIEROGLYPH-13D09;Lo;0;L;;;;;N;;;;; +13D0A;EGYPTIAN HIEROGLYPH-13D0A;Lo;0;L;;;;;N;;;;; +13D0B;EGYPTIAN HIEROGLYPH-13D0B;Lo;0;L;;;;;N;;;;; +13D0C;EGYPTIAN HIEROGLYPH-13D0C;Lo;0;L;;;;;N;;;;; +13D0D;EGYPTIAN HIEROGLYPH-13D0D;Lo;0;L;;;;;N;;;;; +13D0E;EGYPTIAN HIEROGLYPH-13D0E;Lo;0;L;;;;;N;;;;; +13D0F;EGYPTIAN HIEROGLYPH-13D0F;Lo;0;L;;;;;N;;;;; +13D10;EGYPTIAN HIEROGLYPH-13D10;Lo;0;L;;;;;N;;;;; +13D11;EGYPTIAN HIEROGLYPH-13D11;Lo;0;L;;;;;N;;;;; +13D12;EGYPTIAN HIEROGLYPH-13D12;Lo;0;L;;;;;N;;;;; +13D13;EGYPTIAN HIEROGLYPH-13D13;Lo;0;L;;;;;N;;;;; +13D14;EGYPTIAN HIEROGLYPH-13D14;Lo;0;L;;;;;N;;;;; +13D15;EGYPTIAN HIEROGLYPH-13D15;Lo;0;L;;;;;N;;;;; +13D16;EGYPTIAN HIEROGLYPH-13D16;Lo;0;L;;;;;N;;;;; +13D17;EGYPTIAN HIEROGLYPH-13D17;Lo;0;L;;;;;N;;;;; +13D18;EGYPTIAN HIEROGLYPH-13D18;Lo;0;L;;;;;N;;;;; +13D19;EGYPTIAN HIEROGLYPH-13D19;Lo;0;L;;;;;N;;;;; +13D1A;EGYPTIAN HIEROGLYPH-13D1A;Lo;0;L;;;;;N;;;;; +13D1B;EGYPTIAN HIEROGLYPH-13D1B;Lo;0;L;;;;;N;;;;; +13D1C;EGYPTIAN HIEROGLYPH-13D1C;Lo;0;L;;;;;N;;;;; +13D1D;EGYPTIAN HIEROGLYPH-13D1D;Lo;0;L;;;;;N;;;;; +13D1E;EGYPTIAN HIEROGLYPH-13D1E;Lo;0;L;;;;;N;;;;; +13D1F;EGYPTIAN HIEROGLYPH-13D1F;Lo;0;L;;;;;N;;;;; +13D20;EGYPTIAN HIEROGLYPH-13D20;Lo;0;L;;;;;N;;;;; +13D21;EGYPTIAN HIEROGLYPH-13D21;Lo;0;L;;;;;N;;;;; +13D22;EGYPTIAN HIEROGLYPH-13D22;Lo;0;L;;;;;N;;;;; +13D23;EGYPTIAN HIEROGLYPH-13D23;Lo;0;L;;;;;N;;;;; +13D24;EGYPTIAN HIEROGLYPH-13D24;Lo;0;L;;;;;N;;;;; +13D25;EGYPTIAN HIEROGLYPH-13D25;Lo;0;L;;;;;N;;;;; +13D26;EGYPTIAN HIEROGLYPH-13D26;Lo;0;L;;;;;N;;;;; +13D27;EGYPTIAN HIEROGLYPH-13D27;Lo;0;L;;;;;N;;;;; +13D28;EGYPTIAN HIEROGLYPH-13D28;Lo;0;L;;;;;N;;;;; +13D29;EGYPTIAN HIEROGLYPH-13D29;Lo;0;L;;;;;N;;;;; +13D2A;EGYPTIAN HIEROGLYPH-13D2A;Lo;0;L;;;;;N;;;;; +13D2B;EGYPTIAN HIEROGLYPH-13D2B;Lo;0;L;;;;;N;;;;; +13D2C;EGYPTIAN HIEROGLYPH-13D2C;Lo;0;L;;;;;N;;;;; +13D2D;EGYPTIAN HIEROGLYPH-13D2D;Lo;0;L;;;;;N;;;;; +13D2E;EGYPTIAN HIEROGLYPH-13D2E;Lo;0;L;;;;;N;;;;; +13D2F;EGYPTIAN HIEROGLYPH-13D2F;Lo;0;L;;;;;N;;;;; +13D30;EGYPTIAN HIEROGLYPH-13D30;Lo;0;L;;;;;N;;;;; +13D31;EGYPTIAN HIEROGLYPH-13D31;Lo;0;L;;;;;N;;;;; +13D32;EGYPTIAN HIEROGLYPH-13D32;Lo;0;L;;;;;N;;;;; +13D33;EGYPTIAN HIEROGLYPH-13D33;Lo;0;L;;;;;N;;;;; +13D34;EGYPTIAN HIEROGLYPH-13D34;Lo;0;L;;;;;N;;;;; +13D35;EGYPTIAN HIEROGLYPH-13D35;Lo;0;L;;;;;N;;;;; +13D36;EGYPTIAN HIEROGLYPH-13D36;Lo;0;L;;;;;N;;;;; +13D37;EGYPTIAN HIEROGLYPH-13D37;Lo;0;L;;;;;N;;;;; +13D38;EGYPTIAN HIEROGLYPH-13D38;Lo;0;L;;;;;N;;;;; +13D39;EGYPTIAN HIEROGLYPH-13D39;Lo;0;L;;;;;N;;;;; +13D3A;EGYPTIAN HIEROGLYPH-13D3A;Lo;0;L;;;;;N;;;;; +13D3B;EGYPTIAN HIEROGLYPH-13D3B;Lo;0;L;;;;;N;;;;; +13D3C;EGYPTIAN HIEROGLYPH-13D3C;Lo;0;L;;;;;N;;;;; +13D3D;EGYPTIAN HIEROGLYPH-13D3D;Lo;0;L;;;;;N;;;;; +13D3E;EGYPTIAN HIEROGLYPH-13D3E;Lo;0;L;;;;;N;;;;; +13D3F;EGYPTIAN HIEROGLYPH-13D3F;Lo;0;L;;;;;N;;;;; +13D40;EGYPTIAN HIEROGLYPH-13D40;Lo;0;L;;;;;N;;;;; +13D41;EGYPTIAN HIEROGLYPH-13D41;Lo;0;L;;;;;N;;;;; +13D42;EGYPTIAN HIEROGLYPH-13D42;Lo;0;L;;;;;N;;;;; +13D43;EGYPTIAN HIEROGLYPH-13D43;Lo;0;L;;;;;N;;;;; +13D44;EGYPTIAN HIEROGLYPH-13D44;Lo;0;L;;;;;N;;;;; +13D45;EGYPTIAN HIEROGLYPH-13D45;Lo;0;L;;;;;N;;;;; +13D46;EGYPTIAN HIEROGLYPH-13D46;Lo;0;L;;;;;N;;;;; +13D47;EGYPTIAN HIEROGLYPH-13D47;Lo;0;L;;;;;N;;;;; +13D48;EGYPTIAN HIEROGLYPH-13D48;Lo;0;L;;;;;N;;;;; +13D49;EGYPTIAN HIEROGLYPH-13D49;Lo;0;L;;;;;N;;;;; +13D4A;EGYPTIAN HIEROGLYPH-13D4A;Lo;0;L;;;;;N;;;;; +13D4B;EGYPTIAN HIEROGLYPH-13D4B;Lo;0;L;;;;;N;;;;; +13D4C;EGYPTIAN HIEROGLYPH-13D4C;Lo;0;L;;;;;N;;;;; +13D4D;EGYPTIAN HIEROGLYPH-13D4D;Lo;0;L;;;;;N;;;;; +13D4E;EGYPTIAN HIEROGLYPH-13D4E;Lo;0;L;;;;;N;;;;; +13D4F;EGYPTIAN HIEROGLYPH-13D4F;Lo;0;L;;;;;N;;;;; +13D50;EGYPTIAN HIEROGLYPH-13D50;Lo;0;L;;;;;N;;;;; +13D51;EGYPTIAN HIEROGLYPH-13D51;Lo;0;L;;;;;N;;;;; +13D52;EGYPTIAN HIEROGLYPH-13D52;Lo;0;L;;;;;N;;;;; +13D53;EGYPTIAN HIEROGLYPH-13D53;Lo;0;L;;;;;N;;;;; +13D54;EGYPTIAN HIEROGLYPH-13D54;Lo;0;L;;;;;N;;;;; +13D55;EGYPTIAN HIEROGLYPH-13D55;Lo;0;L;;;;;N;;;;; +13D56;EGYPTIAN HIEROGLYPH-13D56;Lo;0;L;;;;;N;;;;; +13D57;EGYPTIAN HIEROGLYPH-13D57;Lo;0;L;;;;;N;;;;; +13D58;EGYPTIAN HIEROGLYPH-13D58;Lo;0;L;;;;;N;;;;; +13D59;EGYPTIAN HIEROGLYPH-13D59;Lo;0;L;;;;;N;;;;; +13D5A;EGYPTIAN HIEROGLYPH-13D5A;Lo;0;L;;;;;N;;;;; +13D5B;EGYPTIAN HIEROGLYPH-13D5B;Lo;0;L;;;;;N;;;;; +13D5C;EGYPTIAN HIEROGLYPH-13D5C;Lo;0;L;;;;;N;;;;; +13D5D;EGYPTIAN HIEROGLYPH-13D5D;Lo;0;L;;;;;N;;;;; +13D5E;EGYPTIAN HIEROGLYPH-13D5E;Lo;0;L;;;;;N;;;;; +13D5F;EGYPTIAN HIEROGLYPH-13D5F;Lo;0;L;;;;;N;;;;; +13D60;EGYPTIAN HIEROGLYPH-13D60;Lo;0;L;;;;;N;;;;; +13D61;EGYPTIAN HIEROGLYPH-13D61;Lo;0;L;;;;;N;;;;; +13D62;EGYPTIAN HIEROGLYPH-13D62;Lo;0;L;;;;;N;;;;; +13D63;EGYPTIAN HIEROGLYPH-13D63;Lo;0;L;;;;;N;;;;; +13D64;EGYPTIAN HIEROGLYPH-13D64;Lo;0;L;;;;;N;;;;; +13D65;EGYPTIAN HIEROGLYPH-13D65;Lo;0;L;;;;;N;;;;; +13D66;EGYPTIAN HIEROGLYPH-13D66;Lo;0;L;;;;;N;;;;; +13D67;EGYPTIAN HIEROGLYPH-13D67;Lo;0;L;;;;;N;;;;; +13D68;EGYPTIAN HIEROGLYPH-13D68;Lo;0;L;;;;;N;;;;; +13D69;EGYPTIAN HIEROGLYPH-13D69;Lo;0;L;;;;;N;;;;; +13D6A;EGYPTIAN HIEROGLYPH-13D6A;Lo;0;L;;;;;N;;;;; +13D6B;EGYPTIAN HIEROGLYPH-13D6B;Lo;0;L;;;;;N;;;;; +13D6C;EGYPTIAN HIEROGLYPH-13D6C;Lo;0;L;;;;;N;;;;; +13D6D;EGYPTIAN HIEROGLYPH-13D6D;Lo;0;L;;;;;N;;;;; +13D6E;EGYPTIAN HIEROGLYPH-13D6E;Lo;0;L;;;;;N;;;;; +13D6F;EGYPTIAN HIEROGLYPH-13D6F;Lo;0;L;;;;;N;;;;; +13D70;EGYPTIAN HIEROGLYPH-13D70;Lo;0;L;;;;;N;;;;; +13D71;EGYPTIAN HIEROGLYPH-13D71;Lo;0;L;;;;;N;;;;; +13D72;EGYPTIAN HIEROGLYPH-13D72;Lo;0;L;;;;;N;;;;; +13D73;EGYPTIAN HIEROGLYPH-13D73;Lo;0;L;;;;;N;;;;; +13D74;EGYPTIAN HIEROGLYPH-13D74;Lo;0;L;;;;;N;;;;; +13D75;EGYPTIAN HIEROGLYPH-13D75;Lo;0;L;;;;;N;;;;; +13D76;EGYPTIAN HIEROGLYPH-13D76;Lo;0;L;;;;;N;;;;; +13D77;EGYPTIAN HIEROGLYPH-13D77;Lo;0;L;;;;;N;;;;; +13D78;EGYPTIAN HIEROGLYPH-13D78;Lo;0;L;;;;;N;;;;; +13D79;EGYPTIAN HIEROGLYPH-13D79;Lo;0;L;;;;;N;;;;; +13D7A;EGYPTIAN HIEROGLYPH-13D7A;Lo;0;L;;;;;N;;;;; +13D7B;EGYPTIAN HIEROGLYPH-13D7B;Lo;0;L;;;;;N;;;;; +13D7C;EGYPTIAN HIEROGLYPH-13D7C;Lo;0;L;;;;;N;;;;; +13D7D;EGYPTIAN HIEROGLYPH-13D7D;Lo;0;L;;;;;N;;;;; +13D7E;EGYPTIAN HIEROGLYPH-13D7E;Lo;0;L;;;;;N;;;;; +13D7F;EGYPTIAN HIEROGLYPH-13D7F;Lo;0;L;;;;;N;;;;; +13D80;EGYPTIAN HIEROGLYPH-13D80;Lo;0;L;;;;;N;;;;; +13D81;EGYPTIAN HIEROGLYPH-13D81;Lo;0;L;;;;;N;;;;; +13D82;EGYPTIAN HIEROGLYPH-13D82;Lo;0;L;;;;;N;;;;; +13D83;EGYPTIAN HIEROGLYPH-13D83;Lo;0;L;;;;;N;;;;; +13D84;EGYPTIAN HIEROGLYPH-13D84;Lo;0;L;;;;;N;;;;; +13D85;EGYPTIAN HIEROGLYPH-13D85;Lo;0;L;;;;;N;;;;; +13D86;EGYPTIAN HIEROGLYPH-13D86;Lo;0;L;;;;;N;;;;; +13D87;EGYPTIAN HIEROGLYPH-13D87;Lo;0;L;;;;;N;;;;; +13D88;EGYPTIAN HIEROGLYPH-13D88;Lo;0;L;;;;;N;;;;; +13D89;EGYPTIAN HIEROGLYPH-13D89;Lo;0;L;;;;;N;;;;; +13D8A;EGYPTIAN HIEROGLYPH-13D8A;Lo;0;L;;;;;N;;;;; +13D8B;EGYPTIAN HIEROGLYPH-13D8B;Lo;0;L;;;;;N;;;;; +13D8C;EGYPTIAN HIEROGLYPH-13D8C;Lo;0;L;;;;;N;;;;; +13D8D;EGYPTIAN HIEROGLYPH-13D8D;Lo;0;L;;;;;N;;;;; +13D8E;EGYPTIAN HIEROGLYPH-13D8E;Lo;0;L;;;;;N;;;;; +13D8F;EGYPTIAN HIEROGLYPH-13D8F;Lo;0;L;;;;;N;;;;; +13D90;EGYPTIAN HIEROGLYPH-13D90;Lo;0;L;;;;;N;;;;; +13D91;EGYPTIAN HIEROGLYPH-13D91;Lo;0;L;;;;;N;;;;; +13D92;EGYPTIAN HIEROGLYPH-13D92;Lo;0;L;;;;;N;;;;; +13D93;EGYPTIAN HIEROGLYPH-13D93;Lo;0;L;;;;;N;;;;; +13D94;EGYPTIAN HIEROGLYPH-13D94;Lo;0;L;;;;;N;;;;; +13D95;EGYPTIAN HIEROGLYPH-13D95;Lo;0;L;;;;;N;;;;; +13D96;EGYPTIAN HIEROGLYPH-13D96;Lo;0;L;;;;;N;;;;; +13D97;EGYPTIAN HIEROGLYPH-13D97;Lo;0;L;;;;;N;;;;; +13D98;EGYPTIAN HIEROGLYPH-13D98;Lo;0;L;;;;;N;;;;; +13D99;EGYPTIAN HIEROGLYPH-13D99;Lo;0;L;;;;;N;;;;; +13D9A;EGYPTIAN HIEROGLYPH-13D9A;Lo;0;L;;;;;N;;;;; +13D9B;EGYPTIAN HIEROGLYPH-13D9B;Lo;0;L;;;;;N;;;;; +13D9C;EGYPTIAN HIEROGLYPH-13D9C;Lo;0;L;;;;;N;;;;; +13D9D;EGYPTIAN HIEROGLYPH-13D9D;Lo;0;L;;;;;N;;;;; +13D9E;EGYPTIAN HIEROGLYPH-13D9E;Lo;0;L;;;;;N;;;;; +13D9F;EGYPTIAN HIEROGLYPH-13D9F;Lo;0;L;;;;;N;;;;; +13DA0;EGYPTIAN HIEROGLYPH-13DA0;Lo;0;L;;;;;N;;;;; +13DA1;EGYPTIAN HIEROGLYPH-13DA1;Lo;0;L;;;;;N;;;;; +13DA2;EGYPTIAN HIEROGLYPH-13DA2;Lo;0;L;;;;;N;;;;; +13DA3;EGYPTIAN HIEROGLYPH-13DA3;Lo;0;L;;;;;N;;;;; +13DA4;EGYPTIAN HIEROGLYPH-13DA4;Lo;0;L;;;;;N;;;;; +13DA5;EGYPTIAN HIEROGLYPH-13DA5;Lo;0;L;;;;;N;;;;; +13DA6;EGYPTIAN HIEROGLYPH-13DA6;Lo;0;L;;;;;N;;;;; +13DA7;EGYPTIAN HIEROGLYPH-13DA7;Lo;0;L;;;;;N;;;;; +13DA8;EGYPTIAN HIEROGLYPH-13DA8;Lo;0;L;;;;;N;;;;; +13DA9;EGYPTIAN HIEROGLYPH-13DA9;Lo;0;L;;;;;N;;;;; +13DAA;EGYPTIAN HIEROGLYPH-13DAA;Lo;0;L;;;;;N;;;;; +13DAB;EGYPTIAN HIEROGLYPH-13DAB;Lo;0;L;;;;;N;;;;; +13DAC;EGYPTIAN HIEROGLYPH-13DAC;Lo;0;L;;;;;N;;;;; +13DAD;EGYPTIAN HIEROGLYPH-13DAD;Lo;0;L;;;;;N;;;;; +13DAE;EGYPTIAN HIEROGLYPH-13DAE;Lo;0;L;;;;;N;;;;; +13DAF;EGYPTIAN HIEROGLYPH-13DAF;Lo;0;L;;;;;N;;;;; +13DB0;EGYPTIAN HIEROGLYPH-13DB0;Lo;0;L;;;;;N;;;;; +13DB1;EGYPTIAN HIEROGLYPH-13DB1;Lo;0;L;;;;;N;;;;; +13DB2;EGYPTIAN HIEROGLYPH-13DB2;Lo;0;L;;;;;N;;;;; +13DB3;EGYPTIAN HIEROGLYPH-13DB3;Lo;0;L;;;;;N;;;;; +13DB4;EGYPTIAN HIEROGLYPH-13DB4;Lo;0;L;;;;;N;;;;; +13DB5;EGYPTIAN HIEROGLYPH-13DB5;Lo;0;L;;;;;N;;;;; +13DB6;EGYPTIAN HIEROGLYPH-13DB6;Lo;0;L;;;;;N;;;;; +13DB7;EGYPTIAN HIEROGLYPH-13DB7;Lo;0;L;;;;;N;;;;; +13DB8;EGYPTIAN HIEROGLYPH-13DB8;Lo;0;L;;;;;N;;;;; +13DB9;EGYPTIAN HIEROGLYPH-13DB9;Lo;0;L;;;;;N;;;;; +13DBA;EGYPTIAN HIEROGLYPH-13DBA;Lo;0;L;;;;;N;;;;; +13DBB;EGYPTIAN HIEROGLYPH-13DBB;Lo;0;L;;;;;N;;;;; +13DBC;EGYPTIAN HIEROGLYPH-13DBC;Lo;0;L;;;;;N;;;;; +13DBD;EGYPTIAN HIEROGLYPH-13DBD;Lo;0;L;;;;;N;;;;; +13DBE;EGYPTIAN HIEROGLYPH-13DBE;Lo;0;L;;;;;N;;;;; +13DBF;EGYPTIAN HIEROGLYPH-13DBF;Lo;0;L;;;;;N;;;;; +13DC0;EGYPTIAN HIEROGLYPH-13DC0;Lo;0;L;;;;;N;;;;; +13DC1;EGYPTIAN HIEROGLYPH-13DC1;Lo;0;L;;;;;N;;;;; +13DC2;EGYPTIAN HIEROGLYPH-13DC2;Lo;0;L;;;;;N;;;;; +13DC3;EGYPTIAN HIEROGLYPH-13DC3;Lo;0;L;;;;;N;;;;; +13DC4;EGYPTIAN HIEROGLYPH-13DC4;Lo;0;L;;;;;N;;;;; +13DC5;EGYPTIAN HIEROGLYPH-13DC5;Lo;0;L;;;;;N;;;;; +13DC6;EGYPTIAN HIEROGLYPH-13DC6;Lo;0;L;;;;;N;;;;; +13DC7;EGYPTIAN HIEROGLYPH-13DC7;Lo;0;L;;;;;N;;;;; +13DC8;EGYPTIAN HIEROGLYPH-13DC8;Lo;0;L;;;;;N;;;;; +13DC9;EGYPTIAN HIEROGLYPH-13DC9;Lo;0;L;;;;;N;;;;; +13DCA;EGYPTIAN HIEROGLYPH-13DCA;Lo;0;L;;;;;N;;;;; +13DCB;EGYPTIAN HIEROGLYPH-13DCB;Lo;0;L;;;;;N;;;;; +13DCC;EGYPTIAN HIEROGLYPH-13DCC;Lo;0;L;;;;;N;;;;; +13DCD;EGYPTIAN HIEROGLYPH-13DCD;Lo;0;L;;;;;N;;;;; +13DCE;EGYPTIAN HIEROGLYPH-13DCE;Lo;0;L;;;;;N;;;;; +13DCF;EGYPTIAN HIEROGLYPH-13DCF;Lo;0;L;;;;;N;;;;; +13DD0;EGYPTIAN HIEROGLYPH-13DD0;Lo;0;L;;;;;N;;;;; +13DD1;EGYPTIAN HIEROGLYPH-13DD1;Lo;0;L;;;;;N;;;;; +13DD2;EGYPTIAN HIEROGLYPH-13DD2;Lo;0;L;;;;;N;;;;; +13DD3;EGYPTIAN HIEROGLYPH-13DD3;Lo;0;L;;;;;N;;;;; +13DD4;EGYPTIAN HIEROGLYPH-13DD4;Lo;0;L;;;;;N;;;;; +13DD5;EGYPTIAN HIEROGLYPH-13DD5;Lo;0;L;;;;;N;;;;; +13DD6;EGYPTIAN HIEROGLYPH-13DD6;Lo;0;L;;;;;N;;;;; +13DD7;EGYPTIAN HIEROGLYPH-13DD7;Lo;0;L;;;;;N;;;;; +13DD8;EGYPTIAN HIEROGLYPH-13DD8;Lo;0;L;;;;;N;;;;; +13DD9;EGYPTIAN HIEROGLYPH-13DD9;Lo;0;L;;;;;N;;;;; +13DDA;EGYPTIAN HIEROGLYPH-13DDA;Lo;0;L;;;;;N;;;;; +13DDB;EGYPTIAN HIEROGLYPH-13DDB;Lo;0;L;;;;;N;;;;; +13DDC;EGYPTIAN HIEROGLYPH-13DDC;Lo;0;L;;;;;N;;;;; +13DDD;EGYPTIAN HIEROGLYPH-13DDD;Lo;0;L;;;;;N;;;;; +13DDE;EGYPTIAN HIEROGLYPH-13DDE;Lo;0;L;;;;;N;;;;; +13DDF;EGYPTIAN HIEROGLYPH-13DDF;Lo;0;L;;;;;N;;;;; +13DE0;EGYPTIAN HIEROGLYPH-13DE0;Lo;0;L;;;;;N;;;;; +13DE1;EGYPTIAN HIEROGLYPH-13DE1;Lo;0;L;;;;;N;;;;; +13DE2;EGYPTIAN HIEROGLYPH-13DE2;Lo;0;L;;;;;N;;;;; +13DE3;EGYPTIAN HIEROGLYPH-13DE3;Lo;0;L;;;;;N;;;;; +13DE4;EGYPTIAN HIEROGLYPH-13DE4;Lo;0;L;;;;;N;;;;; +13DE5;EGYPTIAN HIEROGLYPH-13DE5;Lo;0;L;;;;;N;;;;; +13DE6;EGYPTIAN HIEROGLYPH-13DE6;Lo;0;L;;;;;N;;;;; +13DE7;EGYPTIAN HIEROGLYPH-13DE7;Lo;0;L;;;;;N;;;;; +13DE8;EGYPTIAN HIEROGLYPH-13DE8;Lo;0;L;;;;;N;;;;; +13DE9;EGYPTIAN HIEROGLYPH-13DE9;Lo;0;L;;;;;N;;;;; +13DEA;EGYPTIAN HIEROGLYPH-13DEA;Lo;0;L;;;;;N;;;;; +13DEB;EGYPTIAN HIEROGLYPH-13DEB;Lo;0;L;;;;;N;;;;; +13DEC;EGYPTIAN HIEROGLYPH-13DEC;Lo;0;L;;;;;N;;;;; +13DED;EGYPTIAN HIEROGLYPH-13DED;Lo;0;L;;;;;N;;;;; +13DEE;EGYPTIAN HIEROGLYPH-13DEE;Lo;0;L;;;;;N;;;;; +13DEF;EGYPTIAN HIEROGLYPH-13DEF;Lo;0;L;;;;;N;;;;; +13DF0;EGYPTIAN HIEROGLYPH-13DF0;Lo;0;L;;;;;N;;;;; +13DF1;EGYPTIAN HIEROGLYPH-13DF1;Lo;0;L;;;;;N;;;;; +13DF2;EGYPTIAN HIEROGLYPH-13DF2;Lo;0;L;;;;;N;;;;; +13DF3;EGYPTIAN HIEROGLYPH-13DF3;Lo;0;L;;;;;N;;;;; +13DF4;EGYPTIAN HIEROGLYPH-13DF4;Lo;0;L;;;;;N;;;;; +13DF5;EGYPTIAN HIEROGLYPH-13DF5;Lo;0;L;;;;;N;;;;; +13DF6;EGYPTIAN HIEROGLYPH-13DF6;Lo;0;L;;;;;N;;;;; +13DF7;EGYPTIAN HIEROGLYPH-13DF7;Lo;0;L;;;;;N;;;;; +13DF8;EGYPTIAN HIEROGLYPH-13DF8;Lo;0;L;;;;;N;;;;; +13DF9;EGYPTIAN HIEROGLYPH-13DF9;Lo;0;L;;;;;N;;;;; +13DFA;EGYPTIAN HIEROGLYPH-13DFA;Lo;0;L;;;;;N;;;;; +13DFB;EGYPTIAN HIEROGLYPH-13DFB;Lo;0;L;;;;;N;;;;; +13DFC;EGYPTIAN HIEROGLYPH-13DFC;Lo;0;L;;;;;N;;;;; +13DFD;EGYPTIAN HIEROGLYPH-13DFD;Lo;0;L;;;;;N;;;;; +13DFE;EGYPTIAN HIEROGLYPH-13DFE;Lo;0;L;;;;;N;;;;; +13DFF;EGYPTIAN HIEROGLYPH-13DFF;Lo;0;L;;;;;N;;;;; +13E00;EGYPTIAN HIEROGLYPH-13E00;Lo;0;L;;;;;N;;;;; +13E01;EGYPTIAN HIEROGLYPH-13E01;Lo;0;L;;;;;N;;;;; +13E02;EGYPTIAN HIEROGLYPH-13E02;Lo;0;L;;;;;N;;;;; +13E03;EGYPTIAN HIEROGLYPH-13E03;Lo;0;L;;;;;N;;;;; +13E04;EGYPTIAN HIEROGLYPH-13E04;Lo;0;L;;;;;N;;;;; +13E05;EGYPTIAN HIEROGLYPH-13E05;Lo;0;L;;;;;N;;;;; +13E06;EGYPTIAN HIEROGLYPH-13E06;Lo;0;L;;;;;N;;;;; +13E07;EGYPTIAN HIEROGLYPH-13E07;Lo;0;L;;;;;N;;;;; +13E08;EGYPTIAN HIEROGLYPH-13E08;Lo;0;L;;;;;N;;;;; +13E09;EGYPTIAN HIEROGLYPH-13E09;Lo;0;L;;;;;N;;;;; +13E0A;EGYPTIAN HIEROGLYPH-13E0A;Lo;0;L;;;;;N;;;;; +13E0B;EGYPTIAN HIEROGLYPH-13E0B;Lo;0;L;;;;;N;;;;; +13E0C;EGYPTIAN HIEROGLYPH-13E0C;Lo;0;L;;;;;N;;;;; +13E0D;EGYPTIAN HIEROGLYPH-13E0D;Lo;0;L;;;;;N;;;;; +13E0E;EGYPTIAN HIEROGLYPH-13E0E;Lo;0;L;;;;;N;;;;; +13E0F;EGYPTIAN HIEROGLYPH-13E0F;Lo;0;L;;;;;N;;;;; +13E10;EGYPTIAN HIEROGLYPH-13E10;Lo;0;L;;;;;N;;;;; +13E11;EGYPTIAN HIEROGLYPH-13E11;Lo;0;L;;;;;N;;;;; +13E12;EGYPTIAN HIEROGLYPH-13E12;Lo;0;L;;;;;N;;;;; +13E13;EGYPTIAN HIEROGLYPH-13E13;Lo;0;L;;;;;N;;;;; +13E14;EGYPTIAN HIEROGLYPH-13E14;Lo;0;L;;;;;N;;;;; +13E15;EGYPTIAN HIEROGLYPH-13E15;Lo;0;L;;;;;N;;;;; +13E16;EGYPTIAN HIEROGLYPH-13E16;Lo;0;L;;;;;N;;;;; +13E17;EGYPTIAN HIEROGLYPH-13E17;Lo;0;L;;;;;N;;;;; +13E18;EGYPTIAN HIEROGLYPH-13E18;Lo;0;L;;;;;N;;;;; +13E19;EGYPTIAN HIEROGLYPH-13E19;Lo;0;L;;;;;N;;;;; +13E1A;EGYPTIAN HIEROGLYPH-13E1A;Lo;0;L;;;;;N;;;;; +13E1B;EGYPTIAN HIEROGLYPH-13E1B;Lo;0;L;;;;;N;;;;; +13E1C;EGYPTIAN HIEROGLYPH-13E1C;Lo;0;L;;;;;N;;;;; +13E1D;EGYPTIAN HIEROGLYPH-13E1D;Lo;0;L;;;;;N;;;;; +13E1E;EGYPTIAN HIEROGLYPH-13E1E;Lo;0;L;;;;;N;;;;; +13E1F;EGYPTIAN HIEROGLYPH-13E1F;Lo;0;L;;;;;N;;;;; +13E20;EGYPTIAN HIEROGLYPH-13E20;Lo;0;L;;;;;N;;;;; +13E21;EGYPTIAN HIEROGLYPH-13E21;Lo;0;L;;;;;N;;;;; +13E22;EGYPTIAN HIEROGLYPH-13E22;Lo;0;L;;;;;N;;;;; +13E23;EGYPTIAN HIEROGLYPH-13E23;Lo;0;L;;;;;N;;;;; +13E24;EGYPTIAN HIEROGLYPH-13E24;Lo;0;L;;;;;N;;;;; +13E25;EGYPTIAN HIEROGLYPH-13E25;Lo;0;L;;;;;N;;;;; +13E26;EGYPTIAN HIEROGLYPH-13E26;Lo;0;L;;;;;N;;;;; +13E27;EGYPTIAN HIEROGLYPH-13E27;Lo;0;L;;;;;N;;;;; +13E28;EGYPTIAN HIEROGLYPH-13E28;Lo;0;L;;;;;N;;;;; +13E29;EGYPTIAN HIEROGLYPH-13E29;Lo;0;L;;;;;N;;;;; +13E2A;EGYPTIAN HIEROGLYPH-13E2A;Lo;0;L;;;;;N;;;;; +13E2B;EGYPTIAN HIEROGLYPH-13E2B;Lo;0;L;;;;;N;;;;; +13E2C;EGYPTIAN HIEROGLYPH-13E2C;Lo;0;L;;;;;N;;;;; +13E2D;EGYPTIAN HIEROGLYPH-13E2D;Lo;0;L;;;;;N;;;;; +13E2E;EGYPTIAN HIEROGLYPH-13E2E;Lo;0;L;;;;;N;;;;; +13E2F;EGYPTIAN HIEROGLYPH-13E2F;Lo;0;L;;;;;N;;;;; +13E30;EGYPTIAN HIEROGLYPH-13E30;Lo;0;L;;;;;N;;;;; +13E31;EGYPTIAN HIEROGLYPH-13E31;Lo;0;L;;;;;N;;;;; +13E32;EGYPTIAN HIEROGLYPH-13E32;Lo;0;L;;;;;N;;;;; +13E33;EGYPTIAN HIEROGLYPH-13E33;Lo;0;L;;;;;N;;;;; +13E34;EGYPTIAN HIEROGLYPH-13E34;Lo;0;L;;;;;N;;;;; +13E35;EGYPTIAN HIEROGLYPH-13E35;Lo;0;L;;;;;N;;;;; +13E36;EGYPTIAN HIEROGLYPH-13E36;Lo;0;L;;;;;N;;;;; +13E37;EGYPTIAN HIEROGLYPH-13E37;Lo;0;L;;;;;N;;;;; +13E38;EGYPTIAN HIEROGLYPH-13E38;Lo;0;L;;;;;N;;;;; +13E39;EGYPTIAN HIEROGLYPH-13E39;Lo;0;L;;;;;N;;;;; +13E3A;EGYPTIAN HIEROGLYPH-13E3A;Lo;0;L;;;;;N;;;;; +13E3B;EGYPTIAN HIEROGLYPH-13E3B;Lo;0;L;;;;;N;;;;; +13E3C;EGYPTIAN HIEROGLYPH-13E3C;Lo;0;L;;;;;N;;;;; +13E3D;EGYPTIAN HIEROGLYPH-13E3D;Lo;0;L;;;;;N;;;;; +13E3E;EGYPTIAN HIEROGLYPH-13E3E;Lo;0;L;;;;;N;;;;; +13E3F;EGYPTIAN HIEROGLYPH-13E3F;Lo;0;L;;;;;N;;;;; +13E40;EGYPTIAN HIEROGLYPH-13E40;Lo;0;L;;;;;N;;;;; +13E41;EGYPTIAN HIEROGLYPH-13E41;Lo;0;L;;;;;N;;;;; +13E42;EGYPTIAN HIEROGLYPH-13E42;Lo;0;L;;;;;N;;;;; +13E43;EGYPTIAN HIEROGLYPH-13E43;Lo;0;L;;;;;N;;;;; +13E44;EGYPTIAN HIEROGLYPH-13E44;Lo;0;L;;;;;N;;;;; +13E45;EGYPTIAN HIEROGLYPH-13E45;Lo;0;L;;;;;N;;;;; +13E46;EGYPTIAN HIEROGLYPH-13E46;Lo;0;L;;;;;N;;;;; +13E47;EGYPTIAN HIEROGLYPH-13E47;Lo;0;L;;;;;N;;;;; +13E48;EGYPTIAN HIEROGLYPH-13E48;Lo;0;L;;;;;N;;;;; +13E49;EGYPTIAN HIEROGLYPH-13E49;Lo;0;L;;;;;N;;;;; +13E4A;EGYPTIAN HIEROGLYPH-13E4A;Lo;0;L;;;;;N;;;;; +13E4B;EGYPTIAN HIEROGLYPH-13E4B;Lo;0;L;;;;;N;;;;; +13E4C;EGYPTIAN HIEROGLYPH-13E4C;Lo;0;L;;;;;N;;;;; +13E4D;EGYPTIAN HIEROGLYPH-13E4D;Lo;0;L;;;;;N;;;;; +13E4E;EGYPTIAN HIEROGLYPH-13E4E;Lo;0;L;;;;;N;;;;; +13E4F;EGYPTIAN HIEROGLYPH-13E4F;Lo;0;L;;;;;N;;;;; +13E50;EGYPTIAN HIEROGLYPH-13E50;Lo;0;L;;;;;N;;;;; +13E51;EGYPTIAN HIEROGLYPH-13E51;Lo;0;L;;;;;N;;;;; +13E52;EGYPTIAN HIEROGLYPH-13E52;Lo;0;L;;;;;N;;;;; +13E53;EGYPTIAN HIEROGLYPH-13E53;Lo;0;L;;;;;N;;;;; +13E54;EGYPTIAN HIEROGLYPH-13E54;Lo;0;L;;;;;N;;;;; +13E55;EGYPTIAN HIEROGLYPH-13E55;Lo;0;L;;;;;N;;;;; +13E56;EGYPTIAN HIEROGLYPH-13E56;Lo;0;L;;;;;N;;;;; +13E57;EGYPTIAN HIEROGLYPH-13E57;Lo;0;L;;;;;N;;;;; +13E58;EGYPTIAN HIEROGLYPH-13E58;Lo;0;L;;;;;N;;;;; +13E59;EGYPTIAN HIEROGLYPH-13E59;Lo;0;L;;;;;N;;;;; +13E5A;EGYPTIAN HIEROGLYPH-13E5A;Lo;0;L;;;;;N;;;;; +13E5B;EGYPTIAN HIEROGLYPH-13E5B;Lo;0;L;;;;;N;;;;; +13E5C;EGYPTIAN HIEROGLYPH-13E5C;Lo;0;L;;;;;N;;;;; +13E5D;EGYPTIAN HIEROGLYPH-13E5D;Lo;0;L;;;;;N;;;;; +13E5E;EGYPTIAN HIEROGLYPH-13E5E;Lo;0;L;;;;;N;;;;; +13E5F;EGYPTIAN HIEROGLYPH-13E5F;Lo;0;L;;;;;N;;;;; +13E60;EGYPTIAN HIEROGLYPH-13E60;Lo;0;L;;;;;N;;;;; +13E61;EGYPTIAN HIEROGLYPH-13E61;Lo;0;L;;;;;N;;;;; +13E62;EGYPTIAN HIEROGLYPH-13E62;Lo;0;L;;;;;N;;;;; +13E63;EGYPTIAN HIEROGLYPH-13E63;Lo;0;L;;;;;N;;;;; +13E64;EGYPTIAN HIEROGLYPH-13E64;Lo;0;L;;;;;N;;;;; +13E65;EGYPTIAN HIEROGLYPH-13E65;Lo;0;L;;;;;N;;;;; +13E66;EGYPTIAN HIEROGLYPH-13E66;Lo;0;L;;;;;N;;;;; +13E67;EGYPTIAN HIEROGLYPH-13E67;Lo;0;L;;;;;N;;;;; +13E68;EGYPTIAN HIEROGLYPH-13E68;Lo;0;L;;;;;N;;;;; +13E69;EGYPTIAN HIEROGLYPH-13E69;Lo;0;L;;;;;N;;;;; +13E6A;EGYPTIAN HIEROGLYPH-13E6A;Lo;0;L;;;;;N;;;;; +13E6B;EGYPTIAN HIEROGLYPH-13E6B;Lo;0;L;;;;;N;;;;; +13E6C;EGYPTIAN HIEROGLYPH-13E6C;Lo;0;L;;;;;N;;;;; +13E6D;EGYPTIAN HIEROGLYPH-13E6D;Lo;0;L;;;;;N;;;;; +13E6E;EGYPTIAN HIEROGLYPH-13E6E;Lo;0;L;;;;;N;;;;; +13E6F;EGYPTIAN HIEROGLYPH-13E6F;Lo;0;L;;;;;N;;;;; +13E70;EGYPTIAN HIEROGLYPH-13E70;Lo;0;L;;;;;N;;;;; +13E71;EGYPTIAN HIEROGLYPH-13E71;Lo;0;L;;;;;N;;;;; +13E72;EGYPTIAN HIEROGLYPH-13E72;Lo;0;L;;;;;N;;;;; +13E73;EGYPTIAN HIEROGLYPH-13E73;Lo;0;L;;;;;N;;;;; +13E74;EGYPTIAN HIEROGLYPH-13E74;Lo;0;L;;;;;N;;;;; +13E75;EGYPTIAN HIEROGLYPH-13E75;Lo;0;L;;;;;N;;;;; +13E76;EGYPTIAN HIEROGLYPH-13E76;Lo;0;L;;;;;N;;;;; +13E77;EGYPTIAN HIEROGLYPH-13E77;Lo;0;L;;;;;N;;;;; +13E78;EGYPTIAN HIEROGLYPH-13E78;Lo;0;L;;;;;N;;;;; +13E79;EGYPTIAN HIEROGLYPH-13E79;Lo;0;L;;;;;N;;;;; +13E7A;EGYPTIAN HIEROGLYPH-13E7A;Lo;0;L;;;;;N;;;;; +13E7B;EGYPTIAN HIEROGLYPH-13E7B;Lo;0;L;;;;;N;;;;; +13E7C;EGYPTIAN HIEROGLYPH-13E7C;Lo;0;L;;;;;N;;;;; +13E7D;EGYPTIAN HIEROGLYPH-13E7D;Lo;0;L;;;;;N;;;;; +13E7E;EGYPTIAN HIEROGLYPH-13E7E;Lo;0;L;;;;;N;;;;; +13E7F;EGYPTIAN HIEROGLYPH-13E7F;Lo;0;L;;;;;N;;;;; +13E80;EGYPTIAN HIEROGLYPH-13E80;Lo;0;L;;;;;N;;;;; +13E81;EGYPTIAN HIEROGLYPH-13E81;Lo;0;L;;;;;N;;;;; +13E82;EGYPTIAN HIEROGLYPH-13E82;Lo;0;L;;;;;N;;;;; +13E83;EGYPTIAN HIEROGLYPH-13E83;Lo;0;L;;;;;N;;;;; +13E84;EGYPTIAN HIEROGLYPH-13E84;Lo;0;L;;;;;N;;;;; +13E85;EGYPTIAN HIEROGLYPH-13E85;Lo;0;L;;;;;N;;;;; +13E86;EGYPTIAN HIEROGLYPH-13E86;Lo;0;L;;;;;N;;;;; +13E87;EGYPTIAN HIEROGLYPH-13E87;Lo;0;L;;;;;N;;;;; +13E88;EGYPTIAN HIEROGLYPH-13E88;Lo;0;L;;;;;N;;;;; +13E89;EGYPTIAN HIEROGLYPH-13E89;Lo;0;L;;;;;N;;;;; +13E8A;EGYPTIAN HIEROGLYPH-13E8A;Lo;0;L;;;;;N;;;;; +13E8B;EGYPTIAN HIEROGLYPH-13E8B;Lo;0;L;;;;;N;;;;; +13E8C;EGYPTIAN HIEROGLYPH-13E8C;Lo;0;L;;;;;N;;;;; +13E8D;EGYPTIAN HIEROGLYPH-13E8D;Lo;0;L;;;;;N;;;;; +13E8E;EGYPTIAN HIEROGLYPH-13E8E;Lo;0;L;;;;;N;;;;; +13E8F;EGYPTIAN HIEROGLYPH-13E8F;Lo;0;L;;;;;N;;;;; +13E90;EGYPTIAN HIEROGLYPH-13E90;Lo;0;L;;;;;N;;;;; +13E91;EGYPTIAN HIEROGLYPH-13E91;Lo;0;L;;;;;N;;;;; +13E92;EGYPTIAN HIEROGLYPH-13E92;Lo;0;L;;;;;N;;;;; +13E93;EGYPTIAN HIEROGLYPH-13E93;Lo;0;L;;;;;N;;;;; +13E94;EGYPTIAN HIEROGLYPH-13E94;Lo;0;L;;;;;N;;;;; +13E95;EGYPTIAN HIEROGLYPH-13E95;Lo;0;L;;;;;N;;;;; +13E96;EGYPTIAN HIEROGLYPH-13E96;Lo;0;L;;;;;N;;;;; +13E97;EGYPTIAN HIEROGLYPH-13E97;Lo;0;L;;;;;N;;;;; +13E98;EGYPTIAN HIEROGLYPH-13E98;Lo;0;L;;;;;N;;;;; +13E99;EGYPTIAN HIEROGLYPH-13E99;Lo;0;L;;;;;N;;;;; +13E9A;EGYPTIAN HIEROGLYPH-13E9A;Lo;0;L;;;;;N;;;;; +13E9B;EGYPTIAN HIEROGLYPH-13E9B;Lo;0;L;;;;;N;;;;; +13E9C;EGYPTIAN HIEROGLYPH-13E9C;Lo;0;L;;;;;N;;;;; +13E9D;EGYPTIAN HIEROGLYPH-13E9D;Lo;0;L;;;;;N;;;;; +13E9E;EGYPTIAN HIEROGLYPH-13E9E;Lo;0;L;;;;;N;;;;; +13E9F;EGYPTIAN HIEROGLYPH-13E9F;Lo;0;L;;;;;N;;;;; +13EA0;EGYPTIAN HIEROGLYPH-13EA0;Lo;0;L;;;;;N;;;;; +13EA1;EGYPTIAN HIEROGLYPH-13EA1;Lo;0;L;;;;;N;;;;; +13EA2;EGYPTIAN HIEROGLYPH-13EA2;Lo;0;L;;;;;N;;;;; +13EA3;EGYPTIAN HIEROGLYPH-13EA3;Lo;0;L;;;;;N;;;;; +13EA4;EGYPTIAN HIEROGLYPH-13EA4;Lo;0;L;;;;;N;;;;; +13EA5;EGYPTIAN HIEROGLYPH-13EA5;Lo;0;L;;;;;N;;;;; +13EA6;EGYPTIAN HIEROGLYPH-13EA6;Lo;0;L;;;;;N;;;;; +13EA7;EGYPTIAN HIEROGLYPH-13EA7;Lo;0;L;;;;;N;;;;; +13EA8;EGYPTIAN HIEROGLYPH-13EA8;Lo;0;L;;;;;N;;;;; +13EA9;EGYPTIAN HIEROGLYPH-13EA9;Lo;0;L;;;;;N;;;;; +13EAA;EGYPTIAN HIEROGLYPH-13EAA;Lo;0;L;;;;;N;;;;; +13EAB;EGYPTIAN HIEROGLYPH-13EAB;Lo;0;L;;;;;N;;;;; +13EAC;EGYPTIAN HIEROGLYPH-13EAC;Lo;0;L;;;;;N;;;;; +13EAD;EGYPTIAN HIEROGLYPH-13EAD;Lo;0;L;;;;;N;;;;; +13EAE;EGYPTIAN HIEROGLYPH-13EAE;Lo;0;L;;;;;N;;;;; +13EAF;EGYPTIAN HIEROGLYPH-13EAF;Lo;0;L;;;;;N;;;;; +13EB0;EGYPTIAN HIEROGLYPH-13EB0;Lo;0;L;;;;;N;;;;; +13EB1;EGYPTIAN HIEROGLYPH-13EB1;Lo;0;L;;;;;N;;;;; +13EB2;EGYPTIAN HIEROGLYPH-13EB2;Lo;0;L;;;;;N;;;;; +13EB3;EGYPTIAN HIEROGLYPH-13EB3;Lo;0;L;;;;;N;;;;; +13EB4;EGYPTIAN HIEROGLYPH-13EB4;Lo;0;L;;;;;N;;;;; +13EB5;EGYPTIAN HIEROGLYPH-13EB5;Lo;0;L;;;;;N;;;;; +13EB6;EGYPTIAN HIEROGLYPH-13EB6;Lo;0;L;;;;;N;;;;; +13EB7;EGYPTIAN HIEROGLYPH-13EB7;Lo;0;L;;;;;N;;;;; +13EB8;EGYPTIAN HIEROGLYPH-13EB8;Lo;0;L;;;;;N;;;;; +13EB9;EGYPTIAN HIEROGLYPH-13EB9;Lo;0;L;;;;;N;;;;; +13EBA;EGYPTIAN HIEROGLYPH-13EBA;Lo;0;L;;;;;N;;;;; +13EBB;EGYPTIAN HIEROGLYPH-13EBB;Lo;0;L;;;;;N;;;;; +13EBC;EGYPTIAN HIEROGLYPH-13EBC;Lo;0;L;;;;;N;;;;; +13EBD;EGYPTIAN HIEROGLYPH-13EBD;Lo;0;L;;;;;N;;;;; +13EBE;EGYPTIAN HIEROGLYPH-13EBE;Lo;0;L;;;;;N;;;;; +13EBF;EGYPTIAN HIEROGLYPH-13EBF;Lo;0;L;;;;;N;;;;; +13EC0;EGYPTIAN HIEROGLYPH-13EC0;Lo;0;L;;;;;N;;;;; +13EC1;EGYPTIAN HIEROGLYPH-13EC1;Lo;0;L;;;;;N;;;;; +13EC2;EGYPTIAN HIEROGLYPH-13EC2;Lo;0;L;;;;;N;;;;; +13EC3;EGYPTIAN HIEROGLYPH-13EC3;Lo;0;L;;;;;N;;;;; +13EC4;EGYPTIAN HIEROGLYPH-13EC4;Lo;0;L;;;;;N;;;;; +13EC5;EGYPTIAN HIEROGLYPH-13EC5;Lo;0;L;;;;;N;;;;; +13EC6;EGYPTIAN HIEROGLYPH-13EC6;Lo;0;L;;;;;N;;;;; +13EC7;EGYPTIAN HIEROGLYPH-13EC7;Lo;0;L;;;;;N;;;;; +13EC8;EGYPTIAN HIEROGLYPH-13EC8;Lo;0;L;;;;;N;;;;; +13EC9;EGYPTIAN HIEROGLYPH-13EC9;Lo;0;L;;;;;N;;;;; +13ECA;EGYPTIAN HIEROGLYPH-13ECA;Lo;0;L;;;;;N;;;;; +13ECB;EGYPTIAN HIEROGLYPH-13ECB;Lo;0;L;;;;;N;;;;; +13ECC;EGYPTIAN HIEROGLYPH-13ECC;Lo;0;L;;;;;N;;;;; +13ECD;EGYPTIAN HIEROGLYPH-13ECD;Lo;0;L;;;;;N;;;;; +13ECE;EGYPTIAN HIEROGLYPH-13ECE;Lo;0;L;;;;;N;;;;; +13ECF;EGYPTIAN HIEROGLYPH-13ECF;Lo;0;L;;;;;N;;;;; +13ED0;EGYPTIAN HIEROGLYPH-13ED0;Lo;0;L;;;;;N;;;;; +13ED1;EGYPTIAN HIEROGLYPH-13ED1;Lo;0;L;;;;;N;;;;; +13ED2;EGYPTIAN HIEROGLYPH-13ED2;Lo;0;L;;;;;N;;;;; +13ED3;EGYPTIAN HIEROGLYPH-13ED3;Lo;0;L;;;;;N;;;;; +13ED4;EGYPTIAN HIEROGLYPH-13ED4;Lo;0;L;;;;;N;;;;; +13ED5;EGYPTIAN HIEROGLYPH-13ED5;Lo;0;L;;;;;N;;;;; +13ED6;EGYPTIAN HIEROGLYPH-13ED6;Lo;0;L;;;;;N;;;;; +13ED7;EGYPTIAN HIEROGLYPH-13ED7;Lo;0;L;;;;;N;;;;; +13ED8;EGYPTIAN HIEROGLYPH-13ED8;Lo;0;L;;;;;N;;;;; +13ED9;EGYPTIAN HIEROGLYPH-13ED9;Lo;0;L;;;;;N;;;;; +13EDA;EGYPTIAN HIEROGLYPH-13EDA;Lo;0;L;;;;;N;;;;; +13EDB;EGYPTIAN HIEROGLYPH-13EDB;Lo;0;L;;;;;N;;;;; +13EDC;EGYPTIAN HIEROGLYPH-13EDC;Lo;0;L;;;;;N;;;;; +13EDD;EGYPTIAN HIEROGLYPH-13EDD;Lo;0;L;;;;;N;;;;; +13EDE;EGYPTIAN HIEROGLYPH-13EDE;Lo;0;L;;;;;N;;;;; +13EDF;EGYPTIAN HIEROGLYPH-13EDF;Lo;0;L;;;;;N;;;;; +13EE0;EGYPTIAN HIEROGLYPH-13EE0;Lo;0;L;;;;;N;;;;; +13EE1;EGYPTIAN HIEROGLYPH-13EE1;Lo;0;L;;;;;N;;;;; +13EE2;EGYPTIAN HIEROGLYPH-13EE2;Lo;0;L;;;;;N;;;;; +13EE3;EGYPTIAN HIEROGLYPH-13EE3;Lo;0;L;;;;;N;;;;; +13EE4;EGYPTIAN HIEROGLYPH-13EE4;Lo;0;L;;;;;N;;;;; +13EE5;EGYPTIAN HIEROGLYPH-13EE5;Lo;0;L;;;;;N;;;;; +13EE6;EGYPTIAN HIEROGLYPH-13EE6;Lo;0;L;;;;;N;;;;; +13EE7;EGYPTIAN HIEROGLYPH-13EE7;Lo;0;L;;;;;N;;;;; +13EE8;EGYPTIAN HIEROGLYPH-13EE8;Lo;0;L;;;;;N;;;;; +13EE9;EGYPTIAN HIEROGLYPH-13EE9;Lo;0;L;;;;;N;;;;; +13EEA;EGYPTIAN HIEROGLYPH-13EEA;Lo;0;L;;;;;N;;;;; +13EEB;EGYPTIAN HIEROGLYPH-13EEB;Lo;0;L;;;;;N;;;;; +13EEC;EGYPTIAN HIEROGLYPH-13EEC;Lo;0;L;;;;;N;;;;; +13EED;EGYPTIAN HIEROGLYPH-13EED;Lo;0;L;;;;;N;;;;; +13EEE;EGYPTIAN HIEROGLYPH-13EEE;Lo;0;L;;;;;N;;;;; +13EEF;EGYPTIAN HIEROGLYPH-13EEF;Lo;0;L;;;;;N;;;;; +13EF0;EGYPTIAN HIEROGLYPH-13EF0;Lo;0;L;;;;;N;;;;; +13EF1;EGYPTIAN HIEROGLYPH-13EF1;Lo;0;L;;;;;N;;;;; +13EF2;EGYPTIAN HIEROGLYPH-13EF2;Lo;0;L;;;;;N;;;;; +13EF3;EGYPTIAN HIEROGLYPH-13EF3;Lo;0;L;;;;;N;;;;; +13EF4;EGYPTIAN HIEROGLYPH-13EF4;Lo;0;L;;;;;N;;;;; +13EF5;EGYPTIAN HIEROGLYPH-13EF5;Lo;0;L;;;;;N;;;;; +13EF6;EGYPTIAN HIEROGLYPH-13EF6;Lo;0;L;;;;;N;;;;; +13EF7;EGYPTIAN HIEROGLYPH-13EF7;Lo;0;L;;;;;N;;;;; +13EF8;EGYPTIAN HIEROGLYPH-13EF8;Lo;0;L;;;;;N;;;;; +13EF9;EGYPTIAN HIEROGLYPH-13EF9;Lo;0;L;;;;;N;;;;; +13EFA;EGYPTIAN HIEROGLYPH-13EFA;Lo;0;L;;;;;N;;;;; +13EFB;EGYPTIAN HIEROGLYPH-13EFB;Lo;0;L;;;;;N;;;;; +13EFC;EGYPTIAN HIEROGLYPH-13EFC;Lo;0;L;;;;;N;;;;; +13EFD;EGYPTIAN HIEROGLYPH-13EFD;Lo;0;L;;;;;N;;;;; +13EFE;EGYPTIAN HIEROGLYPH-13EFE;Lo;0;L;;;;;N;;;;; +13EFF;EGYPTIAN HIEROGLYPH-13EFF;Lo;0;L;;;;;N;;;;; +13F00;EGYPTIAN HIEROGLYPH-13F00;Lo;0;L;;;;;N;;;;; +13F01;EGYPTIAN HIEROGLYPH-13F01;Lo;0;L;;;;;N;;;;; +13F02;EGYPTIAN HIEROGLYPH-13F02;Lo;0;L;;;;;N;;;;; +13F03;EGYPTIAN HIEROGLYPH-13F03;Lo;0;L;;;;;N;;;;; +13F04;EGYPTIAN HIEROGLYPH-13F04;Lo;0;L;;;;;N;;;;; +13F05;EGYPTIAN HIEROGLYPH-13F05;Lo;0;L;;;;;N;;;;; +13F06;EGYPTIAN HIEROGLYPH-13F06;Lo;0;L;;;;;N;;;;; +13F07;EGYPTIAN HIEROGLYPH-13F07;Lo;0;L;;;;;N;;;;; +13F08;EGYPTIAN HIEROGLYPH-13F08;Lo;0;L;;;;;N;;;;; +13F09;EGYPTIAN HIEROGLYPH-13F09;Lo;0;L;;;;;N;;;;; +13F0A;EGYPTIAN HIEROGLYPH-13F0A;Lo;0;L;;;;;N;;;;; +13F0B;EGYPTIAN HIEROGLYPH-13F0B;Lo;0;L;;;;;N;;;;; +13F0C;EGYPTIAN HIEROGLYPH-13F0C;Lo;0;L;;;;;N;;;;; +13F0D;EGYPTIAN HIEROGLYPH-13F0D;Lo;0;L;;;;;N;;;;; +13F0E;EGYPTIAN HIEROGLYPH-13F0E;Lo;0;L;;;;;N;;;;; +13F0F;EGYPTIAN HIEROGLYPH-13F0F;Lo;0;L;;;;;N;;;;; +13F10;EGYPTIAN HIEROGLYPH-13F10;Lo;0;L;;;;;N;;;;; +13F11;EGYPTIAN HIEROGLYPH-13F11;Lo;0;L;;;;;N;;;;; +13F12;EGYPTIAN HIEROGLYPH-13F12;Lo;0;L;;;;;N;;;;; +13F13;EGYPTIAN HIEROGLYPH-13F13;Lo;0;L;;;;;N;;;;; +13F14;EGYPTIAN HIEROGLYPH-13F14;Lo;0;L;;;;;N;;;;; +13F15;EGYPTIAN HIEROGLYPH-13F15;Lo;0;L;;;;;N;;;;; +13F16;EGYPTIAN HIEROGLYPH-13F16;Lo;0;L;;;;;N;;;;; +13F17;EGYPTIAN HIEROGLYPH-13F17;Lo;0;L;;;;;N;;;;; +13F18;EGYPTIAN HIEROGLYPH-13F18;Lo;0;L;;;;;N;;;;; +13F19;EGYPTIAN HIEROGLYPH-13F19;Lo;0;L;;;;;N;;;;; +13F1A;EGYPTIAN HIEROGLYPH-13F1A;Lo;0;L;;;;;N;;;;; +13F1B;EGYPTIAN HIEROGLYPH-13F1B;Lo;0;L;;;;;N;;;;; +13F1C;EGYPTIAN HIEROGLYPH-13F1C;Lo;0;L;;;;;N;;;;; +13F1D;EGYPTIAN HIEROGLYPH-13F1D;Lo;0;L;;;;;N;;;;; +13F1E;EGYPTIAN HIEROGLYPH-13F1E;Lo;0;L;;;;;N;;;;; +13F1F;EGYPTIAN HIEROGLYPH-13F1F;Lo;0;L;;;;;N;;;;; +13F20;EGYPTIAN HIEROGLYPH-13F20;Lo;0;L;;;;;N;;;;; +13F21;EGYPTIAN HIEROGLYPH-13F21;Lo;0;L;;;;;N;;;;; +13F22;EGYPTIAN HIEROGLYPH-13F22;Lo;0;L;;;;;N;;;;; +13F23;EGYPTIAN HIEROGLYPH-13F23;Lo;0;L;;;;;N;;;;; +13F24;EGYPTIAN HIEROGLYPH-13F24;Lo;0;L;;;;;N;;;;; +13F25;EGYPTIAN HIEROGLYPH-13F25;Lo;0;L;;;;;N;;;;; +13F26;EGYPTIAN HIEROGLYPH-13F26;Lo;0;L;;;;;N;;;;; +13F27;EGYPTIAN HIEROGLYPH-13F27;Lo;0;L;;;;;N;;;;; +13F28;EGYPTIAN HIEROGLYPH-13F28;Lo;0;L;;;;;N;;;;; +13F29;EGYPTIAN HIEROGLYPH-13F29;Lo;0;L;;;;;N;;;;; +13F2A;EGYPTIAN HIEROGLYPH-13F2A;Lo;0;L;;;;;N;;;;; +13F2B;EGYPTIAN HIEROGLYPH-13F2B;Lo;0;L;;;;;N;;;;; +13F2C;EGYPTIAN HIEROGLYPH-13F2C;Lo;0;L;;;;;N;;;;; +13F2D;EGYPTIAN HIEROGLYPH-13F2D;Lo;0;L;;;;;N;;;;; +13F2E;EGYPTIAN HIEROGLYPH-13F2E;Lo;0;L;;;;;N;;;;; +13F2F;EGYPTIAN HIEROGLYPH-13F2F;Lo;0;L;;;;;N;;;;; +13F30;EGYPTIAN HIEROGLYPH-13F30;Lo;0;L;;;;;N;;;;; +13F31;EGYPTIAN HIEROGLYPH-13F31;Lo;0;L;;;;;N;;;;; +13F32;EGYPTIAN HIEROGLYPH-13F32;Lo;0;L;;;;;N;;;;; +13F33;EGYPTIAN HIEROGLYPH-13F33;Lo;0;L;;;;;N;;;;; +13F34;EGYPTIAN HIEROGLYPH-13F34;Lo;0;L;;;;;N;;;;; +13F35;EGYPTIAN HIEROGLYPH-13F35;Lo;0;L;;;;;N;;;;; +13F36;EGYPTIAN HIEROGLYPH-13F36;Lo;0;L;;;;;N;;;;; +13F37;EGYPTIAN HIEROGLYPH-13F37;Lo;0;L;;;;;N;;;;; +13F38;EGYPTIAN HIEROGLYPH-13F38;Lo;0;L;;;;;N;;;;; +13F39;EGYPTIAN HIEROGLYPH-13F39;Lo;0;L;;;;;N;;;;; +13F3A;EGYPTIAN HIEROGLYPH-13F3A;Lo;0;L;;;;;N;;;;; +13F3B;EGYPTIAN HIEROGLYPH-13F3B;Lo;0;L;;;;;N;;;;; +13F3C;EGYPTIAN HIEROGLYPH-13F3C;Lo;0;L;;;;;N;;;;; +13F3D;EGYPTIAN HIEROGLYPH-13F3D;Lo;0;L;;;;;N;;;;; +13F3E;EGYPTIAN HIEROGLYPH-13F3E;Lo;0;L;;;;;N;;;;; +13F3F;EGYPTIAN HIEROGLYPH-13F3F;Lo;0;L;;;;;N;;;;; +13F40;EGYPTIAN HIEROGLYPH-13F40;Lo;0;L;;;;;N;;;;; +13F41;EGYPTIAN HIEROGLYPH-13F41;Lo;0;L;;;;;N;;;;; +13F42;EGYPTIAN HIEROGLYPH-13F42;Lo;0;L;;;;;N;;;;; +13F43;EGYPTIAN HIEROGLYPH-13F43;Lo;0;L;;;;;N;;;;; +13F44;EGYPTIAN HIEROGLYPH-13F44;Lo;0;L;;;;;N;;;;; +13F45;EGYPTIAN HIEROGLYPH-13F45;Lo;0;L;;;;;N;;;;; +13F46;EGYPTIAN HIEROGLYPH-13F46;Lo;0;L;;;;;N;;;;; +13F47;EGYPTIAN HIEROGLYPH-13F47;Lo;0;L;;;;;N;;;;; +13F48;EGYPTIAN HIEROGLYPH-13F48;Lo;0;L;;;;;N;;;;; +13F49;EGYPTIAN HIEROGLYPH-13F49;Lo;0;L;;;;;N;;;;; +13F4A;EGYPTIAN HIEROGLYPH-13F4A;Lo;0;L;;;;;N;;;;; +13F4B;EGYPTIAN HIEROGLYPH-13F4B;Lo;0;L;;;;;N;;;;; +13F4C;EGYPTIAN HIEROGLYPH-13F4C;Lo;0;L;;;;;N;;;;; +13F4D;EGYPTIAN HIEROGLYPH-13F4D;Lo;0;L;;;;;N;;;;; +13F4E;EGYPTIAN HIEROGLYPH-13F4E;Lo;0;L;;;;;N;;;;; +13F4F;EGYPTIAN HIEROGLYPH-13F4F;Lo;0;L;;;;;N;;;;; +13F50;EGYPTIAN HIEROGLYPH-13F50;Lo;0;L;;;;;N;;;;; +13F51;EGYPTIAN HIEROGLYPH-13F51;Lo;0;L;;;;;N;;;;; +13F52;EGYPTIAN HIEROGLYPH-13F52;Lo;0;L;;;;;N;;;;; +13F53;EGYPTIAN HIEROGLYPH-13F53;Lo;0;L;;;;;N;;;;; +13F54;EGYPTIAN HIEROGLYPH-13F54;Lo;0;L;;;;;N;;;;; +13F55;EGYPTIAN HIEROGLYPH-13F55;Lo;0;L;;;;;N;;;;; +13F56;EGYPTIAN HIEROGLYPH-13F56;Lo;0;L;;;;;N;;;;; +13F57;EGYPTIAN HIEROGLYPH-13F57;Lo;0;L;;;;;N;;;;; +13F58;EGYPTIAN HIEROGLYPH-13F58;Lo;0;L;;;;;N;;;;; +13F59;EGYPTIAN HIEROGLYPH-13F59;Lo;0;L;;;;;N;;;;; +13F5A;EGYPTIAN HIEROGLYPH-13F5A;Lo;0;L;;;;;N;;;;; +13F5B;EGYPTIAN HIEROGLYPH-13F5B;Lo;0;L;;;;;N;;;;; +13F5C;EGYPTIAN HIEROGLYPH-13F5C;Lo;0;L;;;;;N;;;;; +13F5D;EGYPTIAN HIEROGLYPH-13F5D;Lo;0;L;;;;;N;;;;; +13F5E;EGYPTIAN HIEROGLYPH-13F5E;Lo;0;L;;;;;N;;;;; +13F5F;EGYPTIAN HIEROGLYPH-13F5F;Lo;0;L;;;;;N;;;;; +13F60;EGYPTIAN HIEROGLYPH-13F60;Lo;0;L;;;;;N;;;;; +13F61;EGYPTIAN HIEROGLYPH-13F61;Lo;0;L;;;;;N;;;;; +13F62;EGYPTIAN HIEROGLYPH-13F62;Lo;0;L;;;;;N;;;;; +13F63;EGYPTIAN HIEROGLYPH-13F63;Lo;0;L;;;;;N;;;;; +13F64;EGYPTIAN HIEROGLYPH-13F64;Lo;0;L;;;;;N;;;;; +13F65;EGYPTIAN HIEROGLYPH-13F65;Lo;0;L;;;;;N;;;;; +13F66;EGYPTIAN HIEROGLYPH-13F66;Lo;0;L;;;;;N;;;;; +13F67;EGYPTIAN HIEROGLYPH-13F67;Lo;0;L;;;;;N;;;;; +13F68;EGYPTIAN HIEROGLYPH-13F68;Lo;0;L;;;;;N;;;;; +13F69;EGYPTIAN HIEROGLYPH-13F69;Lo;0;L;;;;;N;;;;; +13F6A;EGYPTIAN HIEROGLYPH-13F6A;Lo;0;L;;;;;N;;;;; +13F6B;EGYPTIAN HIEROGLYPH-13F6B;Lo;0;L;;;;;N;;;;; +13F6C;EGYPTIAN HIEROGLYPH-13F6C;Lo;0;L;;;;;N;;;;; +13F6D;EGYPTIAN HIEROGLYPH-13F6D;Lo;0;L;;;;;N;;;;; +13F6E;EGYPTIAN HIEROGLYPH-13F6E;Lo;0;L;;;;;N;;;;; +13F6F;EGYPTIAN HIEROGLYPH-13F6F;Lo;0;L;;;;;N;;;;; +13F70;EGYPTIAN HIEROGLYPH-13F70;Lo;0;L;;;;;N;;;;; +13F71;EGYPTIAN HIEROGLYPH-13F71;Lo;0;L;;;;;N;;;;; +13F72;EGYPTIAN HIEROGLYPH-13F72;Lo;0;L;;;;;N;;;;; +13F73;EGYPTIAN HIEROGLYPH-13F73;Lo;0;L;;;;;N;;;;; +13F74;EGYPTIAN HIEROGLYPH-13F74;Lo;0;L;;;;;N;;;;; +13F75;EGYPTIAN HIEROGLYPH-13F75;Lo;0;L;;;;;N;;;;; +13F76;EGYPTIAN HIEROGLYPH-13F76;Lo;0;L;;;;;N;;;;; +13F77;EGYPTIAN HIEROGLYPH-13F77;Lo;0;L;;;;;N;;;;; +13F78;EGYPTIAN HIEROGLYPH-13F78;Lo;0;L;;;;;N;;;;; +13F79;EGYPTIAN HIEROGLYPH-13F79;Lo;0;L;;;;;N;;;;; +13F7A;EGYPTIAN HIEROGLYPH-13F7A;Lo;0;L;;;;;N;;;;; +13F7B;EGYPTIAN HIEROGLYPH-13F7B;Lo;0;L;;;;;N;;;;; +13F7C;EGYPTIAN HIEROGLYPH-13F7C;Lo;0;L;;;;;N;;;;; +13F7D;EGYPTIAN HIEROGLYPH-13F7D;Lo;0;L;;;;;N;;;;; +13F7E;EGYPTIAN HIEROGLYPH-13F7E;Lo;0;L;;;;;N;;;;; +13F7F;EGYPTIAN HIEROGLYPH-13F7F;Lo;0;L;;;;;N;;;;; +13F80;EGYPTIAN HIEROGLYPH-13F80;Lo;0;L;;;;;N;;;;; +13F81;EGYPTIAN HIEROGLYPH-13F81;Lo;0;L;;;;;N;;;;; +13F82;EGYPTIAN HIEROGLYPH-13F82;Lo;0;L;;;;;N;;;;; +13F83;EGYPTIAN HIEROGLYPH-13F83;Lo;0;L;;;;;N;;;;; +13F84;EGYPTIAN HIEROGLYPH-13F84;Lo;0;L;;;;;N;;;;; +13F85;EGYPTIAN HIEROGLYPH-13F85;Lo;0;L;;;;;N;;;;; +13F86;EGYPTIAN HIEROGLYPH-13F86;Lo;0;L;;;;;N;;;;; +13F87;EGYPTIAN HIEROGLYPH-13F87;Lo;0;L;;;;;N;;;;; +13F88;EGYPTIAN HIEROGLYPH-13F88;Lo;0;L;;;;;N;;;;; +13F89;EGYPTIAN HIEROGLYPH-13F89;Lo;0;L;;;;;N;;;;; +13F8A;EGYPTIAN HIEROGLYPH-13F8A;Lo;0;L;;;;;N;;;;; +13F8B;EGYPTIAN HIEROGLYPH-13F8B;Lo;0;L;;;;;N;;;;; +13F8C;EGYPTIAN HIEROGLYPH-13F8C;Lo;0;L;;;;;N;;;;; +13F8D;EGYPTIAN HIEROGLYPH-13F8D;Lo;0;L;;;;;N;;;;; +13F8E;EGYPTIAN HIEROGLYPH-13F8E;Lo;0;L;;;;;N;;;;; +13F8F;EGYPTIAN HIEROGLYPH-13F8F;Lo;0;L;;;;;N;;;;; +13F90;EGYPTIAN HIEROGLYPH-13F90;Lo;0;L;;;;;N;;;;; +13F91;EGYPTIAN HIEROGLYPH-13F91;Lo;0;L;;;;;N;;;;; +13F92;EGYPTIAN HIEROGLYPH-13F92;Lo;0;L;;;;;N;;;;; +13F93;EGYPTIAN HIEROGLYPH-13F93;Lo;0;L;;;;;N;;;;; +13F94;EGYPTIAN HIEROGLYPH-13F94;Lo;0;L;;;;;N;;;;; +13F95;EGYPTIAN HIEROGLYPH-13F95;Lo;0;L;;;;;N;;;;; +13F96;EGYPTIAN HIEROGLYPH-13F96;Lo;0;L;;;;;N;;;;; +13F97;EGYPTIAN HIEROGLYPH-13F97;Lo;0;L;;;;;N;;;;; +13F98;EGYPTIAN HIEROGLYPH-13F98;Lo;0;L;;;;;N;;;;; +13F99;EGYPTIAN HIEROGLYPH-13F99;Lo;0;L;;;;;N;;;;; +13F9A;EGYPTIAN HIEROGLYPH-13F9A;Lo;0;L;;;;;N;;;;; +13F9B;EGYPTIAN HIEROGLYPH-13F9B;Lo;0;L;;;;;N;;;;; +13F9C;EGYPTIAN HIEROGLYPH-13F9C;Lo;0;L;;;;;N;;;;; +13F9D;EGYPTIAN HIEROGLYPH-13F9D;Lo;0;L;;;;;N;;;;; +13F9E;EGYPTIAN HIEROGLYPH-13F9E;Lo;0;L;;;;;N;;;;; +13F9F;EGYPTIAN HIEROGLYPH-13F9F;Lo;0;L;;;;;N;;;;; +13FA0;EGYPTIAN HIEROGLYPH-13FA0;Lo;0;L;;;;;N;;;;; +13FA1;EGYPTIAN HIEROGLYPH-13FA1;Lo;0;L;;;;;N;;;;; +13FA2;EGYPTIAN HIEROGLYPH-13FA2;Lo;0;L;;;;;N;;;;; +13FA3;EGYPTIAN HIEROGLYPH-13FA3;Lo;0;L;;;;;N;;;;; +13FA4;EGYPTIAN HIEROGLYPH-13FA4;Lo;0;L;;;;;N;;;;; +13FA5;EGYPTIAN HIEROGLYPH-13FA5;Lo;0;L;;;;;N;;;;; +13FA6;EGYPTIAN HIEROGLYPH-13FA6;Lo;0;L;;;;;N;;;;; +13FA7;EGYPTIAN HIEROGLYPH-13FA7;Lo;0;L;;;;;N;;;;; +13FA8;EGYPTIAN HIEROGLYPH-13FA8;Lo;0;L;;;;;N;;;;; +13FA9;EGYPTIAN HIEROGLYPH-13FA9;Lo;0;L;;;;;N;;;;; +13FAA;EGYPTIAN HIEROGLYPH-13FAA;Lo;0;L;;;;;N;;;;; +13FAB;EGYPTIAN HIEROGLYPH-13FAB;Lo;0;L;;;;;N;;;;; +13FAC;EGYPTIAN HIEROGLYPH-13FAC;Lo;0;L;;;;;N;;;;; +13FAD;EGYPTIAN HIEROGLYPH-13FAD;Lo;0;L;;;;;N;;;;; +13FAE;EGYPTIAN HIEROGLYPH-13FAE;Lo;0;L;;;;;N;;;;; +13FAF;EGYPTIAN HIEROGLYPH-13FAF;Lo;0;L;;;;;N;;;;; +13FB0;EGYPTIAN HIEROGLYPH-13FB0;Lo;0;L;;;;;N;;;;; +13FB1;EGYPTIAN HIEROGLYPH-13FB1;Lo;0;L;;;;;N;;;;; +13FB2;EGYPTIAN HIEROGLYPH-13FB2;Lo;0;L;;;;;N;;;;; +13FB3;EGYPTIAN HIEROGLYPH-13FB3;Lo;0;L;;;;;N;;;;; +13FB4;EGYPTIAN HIEROGLYPH-13FB4;Lo;0;L;;;;;N;;;;; +13FB5;EGYPTIAN HIEROGLYPH-13FB5;Lo;0;L;;;;;N;;;;; +13FB6;EGYPTIAN HIEROGLYPH-13FB6;Lo;0;L;;;;;N;;;;; +13FB7;EGYPTIAN HIEROGLYPH-13FB7;Lo;0;L;;;;;N;;;;; +13FB8;EGYPTIAN HIEROGLYPH-13FB8;Lo;0;L;;;;;N;;;;; +13FB9;EGYPTIAN HIEROGLYPH-13FB9;Lo;0;L;;;;;N;;;;; +13FBA;EGYPTIAN HIEROGLYPH-13FBA;Lo;0;L;;;;;N;;;;; +13FBB;EGYPTIAN HIEROGLYPH-13FBB;Lo;0;L;;;;;N;;;;; +13FBC;EGYPTIAN HIEROGLYPH-13FBC;Lo;0;L;;;;;N;;;;; +13FBD;EGYPTIAN HIEROGLYPH-13FBD;Lo;0;L;;;;;N;;;;; +13FBE;EGYPTIAN HIEROGLYPH-13FBE;Lo;0;L;;;;;N;;;;; +13FBF;EGYPTIAN HIEROGLYPH-13FBF;Lo;0;L;;;;;N;;;;; +13FC0;EGYPTIAN HIEROGLYPH-13FC0;Lo;0;L;;;;;N;;;;; +13FC1;EGYPTIAN HIEROGLYPH-13FC1;Lo;0;L;;;;;N;;;;; +13FC2;EGYPTIAN HIEROGLYPH-13FC2;Lo;0;L;;;;;N;;;;; +13FC3;EGYPTIAN HIEROGLYPH-13FC3;Lo;0;L;;;;;N;;;;; +13FC4;EGYPTIAN HIEROGLYPH-13FC4;Lo;0;L;;;;;N;;;;; +13FC5;EGYPTIAN HIEROGLYPH-13FC5;Lo;0;L;;;;;N;;;;; +13FC6;EGYPTIAN HIEROGLYPH-13FC6;Lo;0;L;;;;;N;;;;; +13FC7;EGYPTIAN HIEROGLYPH-13FC7;Lo;0;L;;;;;N;;;;; +13FC8;EGYPTIAN HIEROGLYPH-13FC8;Lo;0;L;;;;;N;;;;; +13FC9;EGYPTIAN HIEROGLYPH-13FC9;Lo;0;L;;;;;N;;;;; +13FCA;EGYPTIAN HIEROGLYPH-13FCA;Lo;0;L;;;;;N;;;;; +13FCB;EGYPTIAN HIEROGLYPH-13FCB;Lo;0;L;;;;;N;;;;; +13FCC;EGYPTIAN HIEROGLYPH-13FCC;Lo;0;L;;;;;N;;;;; +13FCD;EGYPTIAN HIEROGLYPH-13FCD;Lo;0;L;;;;;N;;;;; +13FCE;EGYPTIAN HIEROGLYPH-13FCE;Lo;0;L;;;;;N;;;;; +13FCF;EGYPTIAN HIEROGLYPH-13FCF;Lo;0;L;;;;;N;;;;; +13FD0;EGYPTIAN HIEROGLYPH-13FD0;Lo;0;L;;;;;N;;;;; +13FD1;EGYPTIAN HIEROGLYPH-13FD1;Lo;0;L;;;;;N;;;;; +13FD2;EGYPTIAN HIEROGLYPH-13FD2;Lo;0;L;;;;;N;;;;; +13FD3;EGYPTIAN HIEROGLYPH-13FD3;Lo;0;L;;;;;N;;;;; +13FD4;EGYPTIAN HIEROGLYPH-13FD4;Lo;0;L;;;;;N;;;;; +13FD5;EGYPTIAN HIEROGLYPH-13FD5;Lo;0;L;;;;;N;;;;; +13FD6;EGYPTIAN HIEROGLYPH-13FD6;Lo;0;L;;;;;N;;;;; +13FD7;EGYPTIAN HIEROGLYPH-13FD7;Lo;0;L;;;;;N;;;;; +13FD8;EGYPTIAN HIEROGLYPH-13FD8;Lo;0;L;;;;;N;;;;; +13FD9;EGYPTIAN HIEROGLYPH-13FD9;Lo;0;L;;;;;N;;;;; +13FDA;EGYPTIAN HIEROGLYPH-13FDA;Lo;0;L;;;;;N;;;;; +13FDB;EGYPTIAN HIEROGLYPH-13FDB;Lo;0;L;;;;;N;;;;; +13FDC;EGYPTIAN HIEROGLYPH-13FDC;Lo;0;L;;;;;N;;;;; +13FDD;EGYPTIAN HIEROGLYPH-13FDD;Lo;0;L;;;;;N;;;;; +13FDE;EGYPTIAN HIEROGLYPH-13FDE;Lo;0;L;;;;;N;;;;; +13FDF;EGYPTIAN HIEROGLYPH-13FDF;Lo;0;L;;;;;N;;;;; +13FE0;EGYPTIAN HIEROGLYPH-13FE0;Lo;0;L;;;;;N;;;;; +13FE1;EGYPTIAN HIEROGLYPH-13FE1;Lo;0;L;;;;;N;;;;; +13FE2;EGYPTIAN HIEROGLYPH-13FE2;Lo;0;L;;;;;N;;;;; +13FE3;EGYPTIAN HIEROGLYPH-13FE3;Lo;0;L;;;;;N;;;;; +13FE4;EGYPTIAN HIEROGLYPH-13FE4;Lo;0;L;;;;;N;;;;; +13FE5;EGYPTIAN HIEROGLYPH-13FE5;Lo;0;L;;;;;N;;;;; +13FE6;EGYPTIAN HIEROGLYPH-13FE6;Lo;0;L;;;;;N;;;;; +13FE7;EGYPTIAN HIEROGLYPH-13FE7;Lo;0;L;;;;;N;;;;; +13FE8;EGYPTIAN HIEROGLYPH-13FE8;Lo;0;L;;;;;N;;;;; +13FE9;EGYPTIAN HIEROGLYPH-13FE9;Lo;0;L;;;;;N;;;;; +13FEA;EGYPTIAN HIEROGLYPH-13FEA;Lo;0;L;;;;;N;;;;; +13FEB;EGYPTIAN HIEROGLYPH-13FEB;Lo;0;L;;;;;N;;;;; +13FEC;EGYPTIAN HIEROGLYPH-13FEC;Lo;0;L;;;;;N;;;;; +13FED;EGYPTIAN HIEROGLYPH-13FED;Lo;0;L;;;;;N;;;;; +13FEE;EGYPTIAN HIEROGLYPH-13FEE;Lo;0;L;;;;;N;;;;; +13FEF;EGYPTIAN HIEROGLYPH-13FEF;Lo;0;L;;;;;N;;;;; +13FF0;EGYPTIAN HIEROGLYPH-13FF0;Lo;0;L;;;;;N;;;;; +13FF1;EGYPTIAN HIEROGLYPH-13FF1;Lo;0;L;;;;;N;;;;; +13FF2;EGYPTIAN HIEROGLYPH-13FF2;Lo;0;L;;;;;N;;;;; +13FF3;EGYPTIAN HIEROGLYPH-13FF3;Lo;0;L;;;;;N;;;;; +13FF4;EGYPTIAN HIEROGLYPH-13FF4;Lo;0;L;;;;;N;;;;; +13FF5;EGYPTIAN HIEROGLYPH-13FF5;Lo;0;L;;;;;N;;;;; +13FF6;EGYPTIAN HIEROGLYPH-13FF6;Lo;0;L;;;;;N;;;;; +13FF7;EGYPTIAN HIEROGLYPH-13FF7;Lo;0;L;;;;;N;;;;; +13FF8;EGYPTIAN HIEROGLYPH-13FF8;Lo;0;L;;;;;N;;;;; +13FF9;EGYPTIAN HIEROGLYPH-13FF9;Lo;0;L;;;;;N;;;;; +13FFA;EGYPTIAN HIEROGLYPH-13FFA;Lo;0;L;;;;;N;;;;; +13FFB;EGYPTIAN HIEROGLYPH-13FFB;Lo;0;L;;;;;N;;;;; +13FFC;EGYPTIAN HIEROGLYPH-13FFC;Lo;0;L;;;;;N;;;;; +13FFD;EGYPTIAN HIEROGLYPH-13FFD;Lo;0;L;;;;;N;;;;; +13FFE;EGYPTIAN HIEROGLYPH-13FFE;Lo;0;L;;;;;N;;;;; +13FFF;EGYPTIAN HIEROGLYPH-13FFF;Lo;0;L;;;;;N;;;;; +14000;EGYPTIAN HIEROGLYPH-14000;Lo;0;L;;;;;N;;;;; +14001;EGYPTIAN HIEROGLYPH-14001;Lo;0;L;;;;;N;;;;; +14002;EGYPTIAN HIEROGLYPH-14002;Lo;0;L;;;;;N;;;;; +14003;EGYPTIAN HIEROGLYPH-14003;Lo;0;L;;;;;N;;;;; +14004;EGYPTIAN HIEROGLYPH-14004;Lo;0;L;;;;;N;;;;; +14005;EGYPTIAN HIEROGLYPH-14005;Lo;0;L;;;;;N;;;;; +14006;EGYPTIAN HIEROGLYPH-14006;Lo;0;L;;;;;N;;;;; +14007;EGYPTIAN HIEROGLYPH-14007;Lo;0;L;;;;;N;;;;; +14008;EGYPTIAN HIEROGLYPH-14008;Lo;0;L;;;;;N;;;;; +14009;EGYPTIAN HIEROGLYPH-14009;Lo;0;L;;;;;N;;;;; +1400A;EGYPTIAN HIEROGLYPH-1400A;Lo;0;L;;;;;N;;;;; +1400B;EGYPTIAN HIEROGLYPH-1400B;Lo;0;L;;;;;N;;;;; +1400C;EGYPTIAN HIEROGLYPH-1400C;Lo;0;L;;;;;N;;;;; +1400D;EGYPTIAN HIEROGLYPH-1400D;Lo;0;L;;;;;N;;;;; +1400E;EGYPTIAN HIEROGLYPH-1400E;Lo;0;L;;;;;N;;;;; +1400F;EGYPTIAN HIEROGLYPH-1400F;Lo;0;L;;;;;N;;;;; +14010;EGYPTIAN HIEROGLYPH-14010;Lo;0;L;;;;;N;;;;; +14011;EGYPTIAN HIEROGLYPH-14011;Lo;0;L;;;;;N;;;;; +14012;EGYPTIAN HIEROGLYPH-14012;Lo;0;L;;;;;N;;;;; +14013;EGYPTIAN HIEROGLYPH-14013;Lo;0;L;;;;;N;;;;; +14014;EGYPTIAN HIEROGLYPH-14014;Lo;0;L;;;;;N;;;;; +14015;EGYPTIAN HIEROGLYPH-14015;Lo;0;L;;;;;N;;;;; +14016;EGYPTIAN HIEROGLYPH-14016;Lo;0;L;;;;;N;;;;; +14017;EGYPTIAN HIEROGLYPH-14017;Lo;0;L;;;;;N;;;;; +14018;EGYPTIAN HIEROGLYPH-14018;Lo;0;L;;;;;N;;;;; +14019;EGYPTIAN HIEROGLYPH-14019;Lo;0;L;;;;;N;;;;; +1401A;EGYPTIAN HIEROGLYPH-1401A;Lo;0;L;;;;;N;;;;; +1401B;EGYPTIAN HIEROGLYPH-1401B;Lo;0;L;;;;;N;;;;; +1401C;EGYPTIAN HIEROGLYPH-1401C;Lo;0;L;;;;;N;;;;; +1401D;EGYPTIAN HIEROGLYPH-1401D;Lo;0;L;;;;;N;;;;; +1401E;EGYPTIAN HIEROGLYPH-1401E;Lo;0;L;;;;;N;;;;; +1401F;EGYPTIAN HIEROGLYPH-1401F;Lo;0;L;;;;;N;;;;; +14020;EGYPTIAN HIEROGLYPH-14020;Lo;0;L;;;;;N;;;;; +14021;EGYPTIAN HIEROGLYPH-14021;Lo;0;L;;;;;N;;;;; +14022;EGYPTIAN HIEROGLYPH-14022;Lo;0;L;;;;;N;;;;; +14023;EGYPTIAN HIEROGLYPH-14023;Lo;0;L;;;;;N;;;;; +14024;EGYPTIAN HIEROGLYPH-14024;Lo;0;L;;;;;N;;;;; +14025;EGYPTIAN HIEROGLYPH-14025;Lo;0;L;;;;;N;;;;; +14026;EGYPTIAN HIEROGLYPH-14026;Lo;0;L;;;;;N;;;;; +14027;EGYPTIAN HIEROGLYPH-14027;Lo;0;L;;;;;N;;;;; +14028;EGYPTIAN HIEROGLYPH-14028;Lo;0;L;;;;;N;;;;; +14029;EGYPTIAN HIEROGLYPH-14029;Lo;0;L;;;;;N;;;;; +1402A;EGYPTIAN HIEROGLYPH-1402A;Lo;0;L;;;;;N;;;;; +1402B;EGYPTIAN HIEROGLYPH-1402B;Lo;0;L;;;;;N;;;;; +1402C;EGYPTIAN HIEROGLYPH-1402C;Lo;0;L;;;;;N;;;;; +1402D;EGYPTIAN HIEROGLYPH-1402D;Lo;0;L;;;;;N;;;;; +1402E;EGYPTIAN HIEROGLYPH-1402E;Lo;0;L;;;;;N;;;;; +1402F;EGYPTIAN HIEROGLYPH-1402F;Lo;0;L;;;;;N;;;;; +14030;EGYPTIAN HIEROGLYPH-14030;Lo;0;L;;;;;N;;;;; +14031;EGYPTIAN HIEROGLYPH-14031;Lo;0;L;;;;;N;;;;; +14032;EGYPTIAN HIEROGLYPH-14032;Lo;0;L;;;;;N;;;;; +14033;EGYPTIAN HIEROGLYPH-14033;Lo;0;L;;;;;N;;;;; +14034;EGYPTIAN HIEROGLYPH-14034;Lo;0;L;;;;;N;;;;; +14035;EGYPTIAN HIEROGLYPH-14035;Lo;0;L;;;;;N;;;;; +14036;EGYPTIAN HIEROGLYPH-14036;Lo;0;L;;;;;N;;;;; +14037;EGYPTIAN HIEROGLYPH-14037;Lo;0;L;;;;;N;;;;; +14038;EGYPTIAN HIEROGLYPH-14038;Lo;0;L;;;;;N;;;;; +14039;EGYPTIAN HIEROGLYPH-14039;Lo;0;L;;;;;N;;;;; +1403A;EGYPTIAN HIEROGLYPH-1403A;Lo;0;L;;;;;N;;;;; +1403B;EGYPTIAN HIEROGLYPH-1403B;Lo;0;L;;;;;N;;;;; +1403C;EGYPTIAN HIEROGLYPH-1403C;Lo;0;L;;;;;N;;;;; +1403D;EGYPTIAN HIEROGLYPH-1403D;Lo;0;L;;;;;N;;;;; +1403E;EGYPTIAN HIEROGLYPH-1403E;Lo;0;L;;;;;N;;;;; +1403F;EGYPTIAN HIEROGLYPH-1403F;Lo;0;L;;;;;N;;;;; +14040;EGYPTIAN HIEROGLYPH-14040;Lo;0;L;;;;;N;;;;; +14041;EGYPTIAN HIEROGLYPH-14041;Lo;0;L;;;;;N;;;;; +14042;EGYPTIAN HIEROGLYPH-14042;Lo;0;L;;;;;N;;;;; +14043;EGYPTIAN HIEROGLYPH-14043;Lo;0;L;;;;;N;;;;; +14044;EGYPTIAN HIEROGLYPH-14044;Lo;0;L;;;;;N;;;;; +14045;EGYPTIAN HIEROGLYPH-14045;Lo;0;L;;;;;N;;;;; +14046;EGYPTIAN HIEROGLYPH-14046;Lo;0;L;;;;;N;;;;; +14047;EGYPTIAN HIEROGLYPH-14047;Lo;0;L;;;;;N;;;;; +14048;EGYPTIAN HIEROGLYPH-14048;Lo;0;L;;;;;N;;;;; +14049;EGYPTIAN HIEROGLYPH-14049;Lo;0;L;;;;;N;;;;; +1404A;EGYPTIAN HIEROGLYPH-1404A;Lo;0;L;;;;;N;;;;; +1404B;EGYPTIAN HIEROGLYPH-1404B;Lo;0;L;;;;;N;;;;; +1404C;EGYPTIAN HIEROGLYPH-1404C;Lo;0;L;;;;;N;;;;; +1404D;EGYPTIAN HIEROGLYPH-1404D;Lo;0;L;;;;;N;;;;; +1404E;EGYPTIAN HIEROGLYPH-1404E;Lo;0;L;;;;;N;;;;; +1404F;EGYPTIAN HIEROGLYPH-1404F;Lo;0;L;;;;;N;;;;; +14050;EGYPTIAN HIEROGLYPH-14050;Lo;0;L;;;;;N;;;;; +14051;EGYPTIAN HIEROGLYPH-14051;Lo;0;L;;;;;N;;;;; +14052;EGYPTIAN HIEROGLYPH-14052;Lo;0;L;;;;;N;;;;; +14053;EGYPTIAN HIEROGLYPH-14053;Lo;0;L;;;;;N;;;;; +14054;EGYPTIAN HIEROGLYPH-14054;Lo;0;L;;;;;N;;;;; +14055;EGYPTIAN HIEROGLYPH-14055;Lo;0;L;;;;;N;;;;; +14056;EGYPTIAN HIEROGLYPH-14056;Lo;0;L;;;;;N;;;;; +14057;EGYPTIAN HIEROGLYPH-14057;Lo;0;L;;;;;N;;;;; +14058;EGYPTIAN HIEROGLYPH-14058;Lo;0;L;;;;;N;;;;; +14059;EGYPTIAN HIEROGLYPH-14059;Lo;0;L;;;;;N;;;;; +1405A;EGYPTIAN HIEROGLYPH-1405A;Lo;0;L;;;;;N;;;;; +1405B;EGYPTIAN HIEROGLYPH-1405B;Lo;0;L;;;;;N;;;;; +1405C;EGYPTIAN HIEROGLYPH-1405C;Lo;0;L;;;;;N;;;;; +1405D;EGYPTIAN HIEROGLYPH-1405D;Lo;0;L;;;;;N;;;;; +1405E;EGYPTIAN HIEROGLYPH-1405E;Lo;0;L;;;;;N;;;;; +1405F;EGYPTIAN HIEROGLYPH-1405F;Lo;0;L;;;;;N;;;;; +14060;EGYPTIAN HIEROGLYPH-14060;Lo;0;L;;;;;N;;;;; +14061;EGYPTIAN HIEROGLYPH-14061;Lo;0;L;;;;;N;;;;; +14062;EGYPTIAN HIEROGLYPH-14062;Lo;0;L;;;;;N;;;;; +14063;EGYPTIAN HIEROGLYPH-14063;Lo;0;L;;;;;N;;;;; +14064;EGYPTIAN HIEROGLYPH-14064;Lo;0;L;;;;;N;;;;; +14065;EGYPTIAN HIEROGLYPH-14065;Lo;0;L;;;;;N;;;;; +14066;EGYPTIAN HIEROGLYPH-14066;Lo;0;L;;;;;N;;;;; +14067;EGYPTIAN HIEROGLYPH-14067;Lo;0;L;;;;;N;;;;; +14068;EGYPTIAN HIEROGLYPH-14068;Lo;0;L;;;;;N;;;;; +14069;EGYPTIAN HIEROGLYPH-14069;Lo;0;L;;;;;N;;;;; +1406A;EGYPTIAN HIEROGLYPH-1406A;Lo;0;L;;;;;N;;;;; +1406B;EGYPTIAN HIEROGLYPH-1406B;Lo;0;L;;;;;N;;;;; +1406C;EGYPTIAN HIEROGLYPH-1406C;Lo;0;L;;;;;N;;;;; +1406D;EGYPTIAN HIEROGLYPH-1406D;Lo;0;L;;;;;N;;;;; +1406E;EGYPTIAN HIEROGLYPH-1406E;Lo;0;L;;;;;N;;;;; +1406F;EGYPTIAN HIEROGLYPH-1406F;Lo;0;L;;;;;N;;;;; +14070;EGYPTIAN HIEROGLYPH-14070;Lo;0;L;;;;;N;;;;; +14071;EGYPTIAN HIEROGLYPH-14071;Lo;0;L;;;;;N;;;;; +14072;EGYPTIAN HIEROGLYPH-14072;Lo;0;L;;;;;N;;;;; +14073;EGYPTIAN HIEROGLYPH-14073;Lo;0;L;;;;;N;;;;; +14074;EGYPTIAN HIEROGLYPH-14074;Lo;0;L;;;;;N;;;;; +14075;EGYPTIAN HIEROGLYPH-14075;Lo;0;L;;;;;N;;;;; +14076;EGYPTIAN HIEROGLYPH-14076;Lo;0;L;;;;;N;;;;; +14077;EGYPTIAN HIEROGLYPH-14077;Lo;0;L;;;;;N;;;;; +14078;EGYPTIAN HIEROGLYPH-14078;Lo;0;L;;;;;N;;;;; +14079;EGYPTIAN HIEROGLYPH-14079;Lo;0;L;;;;;N;;;;; +1407A;EGYPTIAN HIEROGLYPH-1407A;Lo;0;L;;;;;N;;;;; +1407B;EGYPTIAN HIEROGLYPH-1407B;Lo;0;L;;;;;N;;;;; +1407C;EGYPTIAN HIEROGLYPH-1407C;Lo;0;L;;;;;N;;;;; +1407D;EGYPTIAN HIEROGLYPH-1407D;Lo;0;L;;;;;N;;;;; +1407E;EGYPTIAN HIEROGLYPH-1407E;Lo;0;L;;;;;N;;;;; +1407F;EGYPTIAN HIEROGLYPH-1407F;Lo;0;L;;;;;N;;;;; +14080;EGYPTIAN HIEROGLYPH-14080;Lo;0;L;;;;;N;;;;; +14081;EGYPTIAN HIEROGLYPH-14081;Lo;0;L;;;;;N;;;;; +14082;EGYPTIAN HIEROGLYPH-14082;Lo;0;L;;;;;N;;;;; +14083;EGYPTIAN HIEROGLYPH-14083;Lo;0;L;;;;;N;;;;; +14084;EGYPTIAN HIEROGLYPH-14084;Lo;0;L;;;;;N;;;;; +14085;EGYPTIAN HIEROGLYPH-14085;Lo;0;L;;;;;N;;;;; +14086;EGYPTIAN HIEROGLYPH-14086;Lo;0;L;;;;;N;;;;; +14087;EGYPTIAN HIEROGLYPH-14087;Lo;0;L;;;;;N;;;;; +14088;EGYPTIAN HIEROGLYPH-14088;Lo;0;L;;;;;N;;;;; +14089;EGYPTIAN HIEROGLYPH-14089;Lo;0;L;;;;;N;;;;; +1408A;EGYPTIAN HIEROGLYPH-1408A;Lo;0;L;;;;;N;;;;; +1408B;EGYPTIAN HIEROGLYPH-1408B;Lo;0;L;;;;;N;;;;; +1408C;EGYPTIAN HIEROGLYPH-1408C;Lo;0;L;;;;;N;;;;; +1408D;EGYPTIAN HIEROGLYPH-1408D;Lo;0;L;;;;;N;;;;; +1408E;EGYPTIAN HIEROGLYPH-1408E;Lo;0;L;;;;;N;;;;; +1408F;EGYPTIAN HIEROGLYPH-1408F;Lo;0;L;;;;;N;;;;; +14090;EGYPTIAN HIEROGLYPH-14090;Lo;0;L;;;;;N;;;;; +14091;EGYPTIAN HIEROGLYPH-14091;Lo;0;L;;;;;N;;;;; +14092;EGYPTIAN HIEROGLYPH-14092;Lo;0;L;;;;;N;;;;; +14093;EGYPTIAN HIEROGLYPH-14093;Lo;0;L;;;;;N;;;;; +14094;EGYPTIAN HIEROGLYPH-14094;Lo;0;L;;;;;N;;;;; +14095;EGYPTIAN HIEROGLYPH-14095;Lo;0;L;;;;;N;;;;; +14096;EGYPTIAN HIEROGLYPH-14096;Lo;0;L;;;;;N;;;;; +14097;EGYPTIAN HIEROGLYPH-14097;Lo;0;L;;;;;N;;;;; +14098;EGYPTIAN HIEROGLYPH-14098;Lo;0;L;;;;;N;;;;; +14099;EGYPTIAN HIEROGLYPH-14099;Lo;0;L;;;;;N;;;;; +1409A;EGYPTIAN HIEROGLYPH-1409A;Lo;0;L;;;;;N;;;;; +1409B;EGYPTIAN HIEROGLYPH-1409B;Lo;0;L;;;;;N;;;;; +1409C;EGYPTIAN HIEROGLYPH-1409C;Lo;0;L;;;;;N;;;;; +1409D;EGYPTIAN HIEROGLYPH-1409D;Lo;0;L;;;;;N;;;;; +1409E;EGYPTIAN HIEROGLYPH-1409E;Lo;0;L;;;;;N;;;;; +1409F;EGYPTIAN HIEROGLYPH-1409F;Lo;0;L;;;;;N;;;;; +140A0;EGYPTIAN HIEROGLYPH-140A0;Lo;0;L;;;;;N;;;;; +140A1;EGYPTIAN HIEROGLYPH-140A1;Lo;0;L;;;;;N;;;;; +140A2;EGYPTIAN HIEROGLYPH-140A2;Lo;0;L;;;;;N;;;;; +140A3;EGYPTIAN HIEROGLYPH-140A3;Lo;0;L;;;;;N;;;;; +140A4;EGYPTIAN HIEROGLYPH-140A4;Lo;0;L;;;;;N;;;;; +140A5;EGYPTIAN HIEROGLYPH-140A5;Lo;0;L;;;;;N;;;;; +140A6;EGYPTIAN HIEROGLYPH-140A6;Lo;0;L;;;;;N;;;;; +140A7;EGYPTIAN HIEROGLYPH-140A7;Lo;0;L;;;;;N;;;;; +140A8;EGYPTIAN HIEROGLYPH-140A8;Lo;0;L;;;;;N;;;;; +140A9;EGYPTIAN HIEROGLYPH-140A9;Lo;0;L;;;;;N;;;;; +140AA;EGYPTIAN HIEROGLYPH-140AA;Lo;0;L;;;;;N;;;;; +140AB;EGYPTIAN HIEROGLYPH-140AB;Lo;0;L;;;;;N;;;;; +140AC;EGYPTIAN HIEROGLYPH-140AC;Lo;0;L;;;;;N;;;;; +140AD;EGYPTIAN HIEROGLYPH-140AD;Lo;0;L;;;;;N;;;;; +140AE;EGYPTIAN HIEROGLYPH-140AE;Lo;0;L;;;;;N;;;;; +140AF;EGYPTIAN HIEROGLYPH-140AF;Lo;0;L;;;;;N;;;;; +140B0;EGYPTIAN HIEROGLYPH-140B0;Lo;0;L;;;;;N;;;;; +140B1;EGYPTIAN HIEROGLYPH-140B1;Lo;0;L;;;;;N;;;;; +140B2;EGYPTIAN HIEROGLYPH-140B2;Lo;0;L;;;;;N;;;;; +140B3;EGYPTIAN HIEROGLYPH-140B3;Lo;0;L;;;;;N;;;;; +140B4;EGYPTIAN HIEROGLYPH-140B4;Lo;0;L;;;;;N;;;;; +140B5;EGYPTIAN HIEROGLYPH-140B5;Lo;0;L;;;;;N;;;;; +140B6;EGYPTIAN HIEROGLYPH-140B6;Lo;0;L;;;;;N;;;;; +140B7;EGYPTIAN HIEROGLYPH-140B7;Lo;0;L;;;;;N;;;;; +140B8;EGYPTIAN HIEROGLYPH-140B8;Lo;0;L;;;;;N;;;;; +140B9;EGYPTIAN HIEROGLYPH-140B9;Lo;0;L;;;;;N;;;;; +140BA;EGYPTIAN HIEROGLYPH-140BA;Lo;0;L;;;;;N;;;;; +140BB;EGYPTIAN HIEROGLYPH-140BB;Lo;0;L;;;;;N;;;;; +140BC;EGYPTIAN HIEROGLYPH-140BC;Lo;0;L;;;;;N;;;;; +140BD;EGYPTIAN HIEROGLYPH-140BD;Lo;0;L;;;;;N;;;;; +140BE;EGYPTIAN HIEROGLYPH-140BE;Lo;0;L;;;;;N;;;;; +140BF;EGYPTIAN HIEROGLYPH-140BF;Lo;0;L;;;;;N;;;;; +140C0;EGYPTIAN HIEROGLYPH-140C0;Lo;0;L;;;;;N;;;;; +140C1;EGYPTIAN HIEROGLYPH-140C1;Lo;0;L;;;;;N;;;;; +140C2;EGYPTIAN HIEROGLYPH-140C2;Lo;0;L;;;;;N;;;;; +140C3;EGYPTIAN HIEROGLYPH-140C3;Lo;0;L;;;;;N;;;;; +140C4;EGYPTIAN HIEROGLYPH-140C4;Lo;0;L;;;;;N;;;;; +140C5;EGYPTIAN HIEROGLYPH-140C5;Lo;0;L;;;;;N;;;;; +140C6;EGYPTIAN HIEROGLYPH-140C6;Lo;0;L;;;;;N;;;;; +140C7;EGYPTIAN HIEROGLYPH-140C7;Lo;0;L;;;;;N;;;;; +140C8;EGYPTIAN HIEROGLYPH-140C8;Lo;0;L;;;;;N;;;;; +140C9;EGYPTIAN HIEROGLYPH-140C9;Lo;0;L;;;;;N;;;;; +140CA;EGYPTIAN HIEROGLYPH-140CA;Lo;0;L;;;;;N;;;;; +140CB;EGYPTIAN HIEROGLYPH-140CB;Lo;0;L;;;;;N;;;;; +140CC;EGYPTIAN HIEROGLYPH-140CC;Lo;0;L;;;;;N;;;;; +140CD;EGYPTIAN HIEROGLYPH-140CD;Lo;0;L;;;;;N;;;;; +140CE;EGYPTIAN HIEROGLYPH-140CE;Lo;0;L;;;;;N;;;;; +140CF;EGYPTIAN HIEROGLYPH-140CF;Lo;0;L;;;;;N;;;;; +140D0;EGYPTIAN HIEROGLYPH-140D0;Lo;0;L;;;;;N;;;;; +140D1;EGYPTIAN HIEROGLYPH-140D1;Lo;0;L;;;;;N;;;;; +140D2;EGYPTIAN HIEROGLYPH-140D2;Lo;0;L;;;;;N;;;;; +140D3;EGYPTIAN HIEROGLYPH-140D3;Lo;0;L;;;;;N;;;;; +140D4;EGYPTIAN HIEROGLYPH-140D4;Lo;0;L;;;;;N;;;;; +140D5;EGYPTIAN HIEROGLYPH-140D5;Lo;0;L;;;;;N;;;;; +140D6;EGYPTIAN HIEROGLYPH-140D6;Lo;0;L;;;;;N;;;;; +140D7;EGYPTIAN HIEROGLYPH-140D7;Lo;0;L;;;;;N;;;;; +140D8;EGYPTIAN HIEROGLYPH-140D8;Lo;0;L;;;;;N;;;;; +140D9;EGYPTIAN HIEROGLYPH-140D9;Lo;0;L;;;;;N;;;;; +140DA;EGYPTIAN HIEROGLYPH-140DA;Lo;0;L;;;;;N;;;;; +140DB;EGYPTIAN HIEROGLYPH-140DB;Lo;0;L;;;;;N;;;;; +140DC;EGYPTIAN HIEROGLYPH-140DC;Lo;0;L;;;;;N;;;;; +140DD;EGYPTIAN HIEROGLYPH-140DD;Lo;0;L;;;;;N;;;;; +140DE;EGYPTIAN HIEROGLYPH-140DE;Lo;0;L;;;;;N;;;;; +140DF;EGYPTIAN HIEROGLYPH-140DF;Lo;0;L;;;;;N;;;;; +140E0;EGYPTIAN HIEROGLYPH-140E0;Lo;0;L;;;;;N;;;;; +140E1;EGYPTIAN HIEROGLYPH-140E1;Lo;0;L;;;;;N;;;;; +140E2;EGYPTIAN HIEROGLYPH-140E2;Lo;0;L;;;;;N;;;;; +140E3;EGYPTIAN HIEROGLYPH-140E3;Lo;0;L;;;;;N;;;;; +140E4;EGYPTIAN HIEROGLYPH-140E4;Lo;0;L;;;;;N;;;;; +140E5;EGYPTIAN HIEROGLYPH-140E5;Lo;0;L;;;;;N;;;;; +140E6;EGYPTIAN HIEROGLYPH-140E6;Lo;0;L;;;;;N;;;;; +140E7;EGYPTIAN HIEROGLYPH-140E7;Lo;0;L;;;;;N;;;;; +140E8;EGYPTIAN HIEROGLYPH-140E8;Lo;0;L;;;;;N;;;;; +140E9;EGYPTIAN HIEROGLYPH-140E9;Lo;0;L;;;;;N;;;;; +140EA;EGYPTIAN HIEROGLYPH-140EA;Lo;0;L;;;;;N;;;;; +140EB;EGYPTIAN HIEROGLYPH-140EB;Lo;0;L;;;;;N;;;;; +140EC;EGYPTIAN HIEROGLYPH-140EC;Lo;0;L;;;;;N;;;;; +140ED;EGYPTIAN HIEROGLYPH-140ED;Lo;0;L;;;;;N;;;;; +140EE;EGYPTIAN HIEROGLYPH-140EE;Lo;0;L;;;;;N;;;;; +140EF;EGYPTIAN HIEROGLYPH-140EF;Lo;0;L;;;;;N;;;;; +140F0;EGYPTIAN HIEROGLYPH-140F0;Lo;0;L;;;;;N;;;;; +140F1;EGYPTIAN HIEROGLYPH-140F1;Lo;0;L;;;;;N;;;;; +140F2;EGYPTIAN HIEROGLYPH-140F2;Lo;0;L;;;;;N;;;;; +140F3;EGYPTIAN HIEROGLYPH-140F3;Lo;0;L;;;;;N;;;;; +140F4;EGYPTIAN HIEROGLYPH-140F4;Lo;0;L;;;;;N;;;;; +140F5;EGYPTIAN HIEROGLYPH-140F5;Lo;0;L;;;;;N;;;;; +140F6;EGYPTIAN HIEROGLYPH-140F6;Lo;0;L;;;;;N;;;;; +140F7;EGYPTIAN HIEROGLYPH-140F7;Lo;0;L;;;;;N;;;;; +140F8;EGYPTIAN HIEROGLYPH-140F8;Lo;0;L;;;;;N;;;;; +140F9;EGYPTIAN HIEROGLYPH-140F9;Lo;0;L;;;;;N;;;;; +140FA;EGYPTIAN HIEROGLYPH-140FA;Lo;0;L;;;;;N;;;;; +140FB;EGYPTIAN HIEROGLYPH-140FB;Lo;0;L;;;;;N;;;;; +140FC;EGYPTIAN HIEROGLYPH-140FC;Lo;0;L;;;;;N;;;;; +140FD;EGYPTIAN HIEROGLYPH-140FD;Lo;0;L;;;;;N;;;;; +140FE;EGYPTIAN HIEROGLYPH-140FE;Lo;0;L;;;;;N;;;;; +140FF;EGYPTIAN HIEROGLYPH-140FF;Lo;0;L;;;;;N;;;;; +14100;EGYPTIAN HIEROGLYPH-14100;Lo;0;L;;;;;N;;;;; +14101;EGYPTIAN HIEROGLYPH-14101;Lo;0;L;;;;;N;;;;; +14102;EGYPTIAN HIEROGLYPH-14102;Lo;0;L;;;;;N;;;;; +14103;EGYPTIAN HIEROGLYPH-14103;Lo;0;L;;;;;N;;;;; +14104;EGYPTIAN HIEROGLYPH-14104;Lo;0;L;;;;;N;;;;; +14105;EGYPTIAN HIEROGLYPH-14105;Lo;0;L;;;;;N;;;;; +14106;EGYPTIAN HIEROGLYPH-14106;Lo;0;L;;;;;N;;;;; +14107;EGYPTIAN HIEROGLYPH-14107;Lo;0;L;;;;;N;;;;; +14108;EGYPTIAN HIEROGLYPH-14108;Lo;0;L;;;;;N;;;;; +14109;EGYPTIAN HIEROGLYPH-14109;Lo;0;L;;;;;N;;;;; +1410A;EGYPTIAN HIEROGLYPH-1410A;Lo;0;L;;;;;N;;;;; +1410B;EGYPTIAN HIEROGLYPH-1410B;Lo;0;L;;;;;N;;;;; +1410C;EGYPTIAN HIEROGLYPH-1410C;Lo;0;L;;;;;N;;;;; +1410D;EGYPTIAN HIEROGLYPH-1410D;Lo;0;L;;;;;N;;;;; +1410E;EGYPTIAN HIEROGLYPH-1410E;Lo;0;L;;;;;N;;;;; +1410F;EGYPTIAN HIEROGLYPH-1410F;Lo;0;L;;;;;N;;;;; +14110;EGYPTIAN HIEROGLYPH-14110;Lo;0;L;;;;;N;;;;; +14111;EGYPTIAN HIEROGLYPH-14111;Lo;0;L;;;;;N;;;;; +14112;EGYPTIAN HIEROGLYPH-14112;Lo;0;L;;;;;N;;;;; +14113;EGYPTIAN HIEROGLYPH-14113;Lo;0;L;;;;;N;;;;; +14114;EGYPTIAN HIEROGLYPH-14114;Lo;0;L;;;;;N;;;;; +14115;EGYPTIAN HIEROGLYPH-14115;Lo;0;L;;;;;N;;;;; +14116;EGYPTIAN HIEROGLYPH-14116;Lo;0;L;;;;;N;;;;; +14117;EGYPTIAN HIEROGLYPH-14117;Lo;0;L;;;;;N;;;;; +14118;EGYPTIAN HIEROGLYPH-14118;Lo;0;L;;;;;N;;;;; +14119;EGYPTIAN HIEROGLYPH-14119;Lo;0;L;;;;;N;;;;; +1411A;EGYPTIAN HIEROGLYPH-1411A;Lo;0;L;;;;;N;;;;; +1411B;EGYPTIAN HIEROGLYPH-1411B;Lo;0;L;;;;;N;;;;; +1411C;EGYPTIAN HIEROGLYPH-1411C;Lo;0;L;;;;;N;;;;; +1411D;EGYPTIAN HIEROGLYPH-1411D;Lo;0;L;;;;;N;;;;; +1411E;EGYPTIAN HIEROGLYPH-1411E;Lo;0;L;;;;;N;;;;; +1411F;EGYPTIAN HIEROGLYPH-1411F;Lo;0;L;;;;;N;;;;; +14120;EGYPTIAN HIEROGLYPH-14120;Lo;0;L;;;;;N;;;;; +14121;EGYPTIAN HIEROGLYPH-14121;Lo;0;L;;;;;N;;;;; +14122;EGYPTIAN HIEROGLYPH-14122;Lo;0;L;;;;;N;;;;; +14123;EGYPTIAN HIEROGLYPH-14123;Lo;0;L;;;;;N;;;;; +14124;EGYPTIAN HIEROGLYPH-14124;Lo;0;L;;;;;N;;;;; +14125;EGYPTIAN HIEROGLYPH-14125;Lo;0;L;;;;;N;;;;; +14126;EGYPTIAN HIEROGLYPH-14126;Lo;0;L;;;;;N;;;;; +14127;EGYPTIAN HIEROGLYPH-14127;Lo;0;L;;;;;N;;;;; +14128;EGYPTIAN HIEROGLYPH-14128;Lo;0;L;;;;;N;;;;; +14129;EGYPTIAN HIEROGLYPH-14129;Lo;0;L;;;;;N;;;;; +1412A;EGYPTIAN HIEROGLYPH-1412A;Lo;0;L;;;;;N;;;;; +1412B;EGYPTIAN HIEROGLYPH-1412B;Lo;0;L;;;;;N;;;;; +1412C;EGYPTIAN HIEROGLYPH-1412C;Lo;0;L;;;;;N;;;;; +1412D;EGYPTIAN HIEROGLYPH-1412D;Lo;0;L;;;;;N;;;;; +1412E;EGYPTIAN HIEROGLYPH-1412E;Lo;0;L;;;;;N;;;;; +1412F;EGYPTIAN HIEROGLYPH-1412F;Lo;0;L;;;;;N;;;;; +14130;EGYPTIAN HIEROGLYPH-14130;Lo;0;L;;;;;N;;;;; +14131;EGYPTIAN HIEROGLYPH-14131;Lo;0;L;;;;;N;;;;; +14132;EGYPTIAN HIEROGLYPH-14132;Lo;0;L;;;;;N;;;;; +14133;EGYPTIAN HIEROGLYPH-14133;Lo;0;L;;;;;N;;;;; +14134;EGYPTIAN HIEROGLYPH-14134;Lo;0;L;;;;;N;;;;; +14135;EGYPTIAN HIEROGLYPH-14135;Lo;0;L;;;;;N;;;;; +14136;EGYPTIAN HIEROGLYPH-14136;Lo;0;L;;;;;N;;;;; +14137;EGYPTIAN HIEROGLYPH-14137;Lo;0;L;;;;;N;;;;; +14138;EGYPTIAN HIEROGLYPH-14138;Lo;0;L;;;;;N;;;;; +14139;EGYPTIAN HIEROGLYPH-14139;Lo;0;L;;;;;N;;;;; +1413A;EGYPTIAN HIEROGLYPH-1413A;Lo;0;L;;;;;N;;;;; +1413B;EGYPTIAN HIEROGLYPH-1413B;Lo;0;L;;;;;N;;;;; +1413C;EGYPTIAN HIEROGLYPH-1413C;Lo;0;L;;;;;N;;;;; +1413D;EGYPTIAN HIEROGLYPH-1413D;Lo;0;L;;;;;N;;;;; +1413E;EGYPTIAN HIEROGLYPH-1413E;Lo;0;L;;;;;N;;;;; +1413F;EGYPTIAN HIEROGLYPH-1413F;Lo;0;L;;;;;N;;;;; +14140;EGYPTIAN HIEROGLYPH-14140;Lo;0;L;;;;;N;;;;; +14141;EGYPTIAN HIEROGLYPH-14141;Lo;0;L;;;;;N;;;;; +14142;EGYPTIAN HIEROGLYPH-14142;Lo;0;L;;;;;N;;;;; +14143;EGYPTIAN HIEROGLYPH-14143;Lo;0;L;;;;;N;;;;; +14144;EGYPTIAN HIEROGLYPH-14144;Lo;0;L;;;;;N;;;;; +14145;EGYPTIAN HIEROGLYPH-14145;Lo;0;L;;;;;N;;;;; +14146;EGYPTIAN HIEROGLYPH-14146;Lo;0;L;;;;;N;;;;; +14147;EGYPTIAN HIEROGLYPH-14147;Lo;0;L;;;;;N;;;;; +14148;EGYPTIAN HIEROGLYPH-14148;Lo;0;L;;;;;N;;;;; +14149;EGYPTIAN HIEROGLYPH-14149;Lo;0;L;;;;;N;;;;; +1414A;EGYPTIAN HIEROGLYPH-1414A;Lo;0;L;;;;;N;;;;; +1414B;EGYPTIAN HIEROGLYPH-1414B;Lo;0;L;;;;;N;;;;; +1414C;EGYPTIAN HIEROGLYPH-1414C;Lo;0;L;;;;;N;;;;; +1414D;EGYPTIAN HIEROGLYPH-1414D;Lo;0;L;;;;;N;;;;; +1414E;EGYPTIAN HIEROGLYPH-1414E;Lo;0;L;;;;;N;;;;; +1414F;EGYPTIAN HIEROGLYPH-1414F;Lo;0;L;;;;;N;;;;; +14150;EGYPTIAN HIEROGLYPH-14150;Lo;0;L;;;;;N;;;;; +14151;EGYPTIAN HIEROGLYPH-14151;Lo;0;L;;;;;N;;;;; +14152;EGYPTIAN HIEROGLYPH-14152;Lo;0;L;;;;;N;;;;; +14153;EGYPTIAN HIEROGLYPH-14153;Lo;0;L;;;;;N;;;;; +14154;EGYPTIAN HIEROGLYPH-14154;Lo;0;L;;;;;N;;;;; +14155;EGYPTIAN HIEROGLYPH-14155;Lo;0;L;;;;;N;;;;; +14156;EGYPTIAN HIEROGLYPH-14156;Lo;0;L;;;;;N;;;;; +14157;EGYPTIAN HIEROGLYPH-14157;Lo;0;L;;;;;N;;;;; +14158;EGYPTIAN HIEROGLYPH-14158;Lo;0;L;;;;;N;;;;; +14159;EGYPTIAN HIEROGLYPH-14159;Lo;0;L;;;;;N;;;;; +1415A;EGYPTIAN HIEROGLYPH-1415A;Lo;0;L;;;;;N;;;;; +1415B;EGYPTIAN HIEROGLYPH-1415B;Lo;0;L;;;;;N;;;;; +1415C;EGYPTIAN HIEROGLYPH-1415C;Lo;0;L;;;;;N;;;;; +1415D;EGYPTIAN HIEROGLYPH-1415D;Lo;0;L;;;;;N;;;;; +1415E;EGYPTIAN HIEROGLYPH-1415E;Lo;0;L;;;;;N;;;;; +1415F;EGYPTIAN HIEROGLYPH-1415F;Lo;0;L;;;;;N;;;;; +14160;EGYPTIAN HIEROGLYPH-14160;Lo;0;L;;;;;N;;;;; +14161;EGYPTIAN HIEROGLYPH-14161;Lo;0;L;;;;;N;;;;; +14162;EGYPTIAN HIEROGLYPH-14162;Lo;0;L;;;;;N;;;;; +14163;EGYPTIAN HIEROGLYPH-14163;Lo;0;L;;;;;N;;;;; +14164;EGYPTIAN HIEROGLYPH-14164;Lo;0;L;;;;;N;;;;; +14165;EGYPTIAN HIEROGLYPH-14165;Lo;0;L;;;;;N;;;;; +14166;EGYPTIAN HIEROGLYPH-14166;Lo;0;L;;;;;N;;;;; +14167;EGYPTIAN HIEROGLYPH-14167;Lo;0;L;;;;;N;;;;; +14168;EGYPTIAN HIEROGLYPH-14168;Lo;0;L;;;;;N;;;;; +14169;EGYPTIAN HIEROGLYPH-14169;Lo;0;L;;;;;N;;;;; +1416A;EGYPTIAN HIEROGLYPH-1416A;Lo;0;L;;;;;N;;;;; +1416B;EGYPTIAN HIEROGLYPH-1416B;Lo;0;L;;;;;N;;;;; +1416C;EGYPTIAN HIEROGLYPH-1416C;Lo;0;L;;;;;N;;;;; +1416D;EGYPTIAN HIEROGLYPH-1416D;Lo;0;L;;;;;N;;;;; +1416E;EGYPTIAN HIEROGLYPH-1416E;Lo;0;L;;;;;N;;;;; +1416F;EGYPTIAN HIEROGLYPH-1416F;Lo;0;L;;;;;N;;;;; +14170;EGYPTIAN HIEROGLYPH-14170;Lo;0;L;;;;;N;;;;; +14171;EGYPTIAN HIEROGLYPH-14171;Lo;0;L;;;;;N;;;;; +14172;EGYPTIAN HIEROGLYPH-14172;Lo;0;L;;;;;N;;;;; +14173;EGYPTIAN HIEROGLYPH-14173;Lo;0;L;;;;;N;;;;; +14174;EGYPTIAN HIEROGLYPH-14174;Lo;0;L;;;;;N;;;;; +14175;EGYPTIAN HIEROGLYPH-14175;Lo;0;L;;;;;N;;;;; +14176;EGYPTIAN HIEROGLYPH-14176;Lo;0;L;;;;;N;;;;; +14177;EGYPTIAN HIEROGLYPH-14177;Lo;0;L;;;;;N;;;;; +14178;EGYPTIAN HIEROGLYPH-14178;Lo;0;L;;;;;N;;;;; +14179;EGYPTIAN HIEROGLYPH-14179;Lo;0;L;;;;;N;;;;; +1417A;EGYPTIAN HIEROGLYPH-1417A;Lo;0;L;;;;;N;;;;; +1417B;EGYPTIAN HIEROGLYPH-1417B;Lo;0;L;;;;;N;;;;; +1417C;EGYPTIAN HIEROGLYPH-1417C;Lo;0;L;;;;;N;;;;; +1417D;EGYPTIAN HIEROGLYPH-1417D;Lo;0;L;;;;;N;;;;; +1417E;EGYPTIAN HIEROGLYPH-1417E;Lo;0;L;;;;;N;;;;; +1417F;EGYPTIAN HIEROGLYPH-1417F;Lo;0;L;;;;;N;;;;; +14180;EGYPTIAN HIEROGLYPH-14180;Lo;0;L;;;;;N;;;;; +14181;EGYPTIAN HIEROGLYPH-14181;Lo;0;L;;;;;N;;;;; +14182;EGYPTIAN HIEROGLYPH-14182;Lo;0;L;;;;;N;;;;; +14183;EGYPTIAN HIEROGLYPH-14183;Lo;0;L;;;;;N;;;;; +14184;EGYPTIAN HIEROGLYPH-14184;Lo;0;L;;;;;N;;;;; +14185;EGYPTIAN HIEROGLYPH-14185;Lo;0;L;;;;;N;;;;; +14186;EGYPTIAN HIEROGLYPH-14186;Lo;0;L;;;;;N;;;;; +14187;EGYPTIAN HIEROGLYPH-14187;Lo;0;L;;;;;N;;;;; +14188;EGYPTIAN HIEROGLYPH-14188;Lo;0;L;;;;;N;;;;; +14189;EGYPTIAN HIEROGLYPH-14189;Lo;0;L;;;;;N;;;;; +1418A;EGYPTIAN HIEROGLYPH-1418A;Lo;0;L;;;;;N;;;;; +1418B;EGYPTIAN HIEROGLYPH-1418B;Lo;0;L;;;;;N;;;;; +1418C;EGYPTIAN HIEROGLYPH-1418C;Lo;0;L;;;;;N;;;;; +1418D;EGYPTIAN HIEROGLYPH-1418D;Lo;0;L;;;;;N;;;;; +1418E;EGYPTIAN HIEROGLYPH-1418E;Lo;0;L;;;;;N;;;;; +1418F;EGYPTIAN HIEROGLYPH-1418F;Lo;0;L;;;;;N;;;;; +14190;EGYPTIAN HIEROGLYPH-14190;Lo;0;L;;;;;N;;;;; +14191;EGYPTIAN HIEROGLYPH-14191;Lo;0;L;;;;;N;;;;; +14192;EGYPTIAN HIEROGLYPH-14192;Lo;0;L;;;;;N;;;;; +14193;EGYPTIAN HIEROGLYPH-14193;Lo;0;L;;;;;N;;;;; +14194;EGYPTIAN HIEROGLYPH-14194;Lo;0;L;;;;;N;;;;; +14195;EGYPTIAN HIEROGLYPH-14195;Lo;0;L;;;;;N;;;;; +14196;EGYPTIAN HIEROGLYPH-14196;Lo;0;L;;;;;N;;;;; +14197;EGYPTIAN HIEROGLYPH-14197;Lo;0;L;;;;;N;;;;; +14198;EGYPTIAN HIEROGLYPH-14198;Lo;0;L;;;;;N;;;;; +14199;EGYPTIAN HIEROGLYPH-14199;Lo;0;L;;;;;N;;;;; +1419A;EGYPTIAN HIEROGLYPH-1419A;Lo;0;L;;;;;N;;;;; +1419B;EGYPTIAN HIEROGLYPH-1419B;Lo;0;L;;;;;N;;;;; +1419C;EGYPTIAN HIEROGLYPH-1419C;Lo;0;L;;;;;N;;;;; +1419D;EGYPTIAN HIEROGLYPH-1419D;Lo;0;L;;;;;N;;;;; +1419E;EGYPTIAN HIEROGLYPH-1419E;Lo;0;L;;;;;N;;;;; +1419F;EGYPTIAN HIEROGLYPH-1419F;Lo;0;L;;;;;N;;;;; +141A0;EGYPTIAN HIEROGLYPH-141A0;Lo;0;L;;;;;N;;;;; +141A1;EGYPTIAN HIEROGLYPH-141A1;Lo;0;L;;;;;N;;;;; +141A2;EGYPTIAN HIEROGLYPH-141A2;Lo;0;L;;;;;N;;;;; +141A3;EGYPTIAN HIEROGLYPH-141A3;Lo;0;L;;;;;N;;;;; +141A4;EGYPTIAN HIEROGLYPH-141A4;Lo;0;L;;;;;N;;;;; +141A5;EGYPTIAN HIEROGLYPH-141A5;Lo;0;L;;;;;N;;;;; +141A6;EGYPTIAN HIEROGLYPH-141A6;Lo;0;L;;;;;N;;;;; +141A7;EGYPTIAN HIEROGLYPH-141A7;Lo;0;L;;;;;N;;;;; +141A8;EGYPTIAN HIEROGLYPH-141A8;Lo;0;L;;;;;N;;;;; +141A9;EGYPTIAN HIEROGLYPH-141A9;Lo;0;L;;;;;N;;;;; +141AA;EGYPTIAN HIEROGLYPH-141AA;Lo;0;L;;;;;N;;;;; +141AB;EGYPTIAN HIEROGLYPH-141AB;Lo;0;L;;;;;N;;;;; +141AC;EGYPTIAN HIEROGLYPH-141AC;Lo;0;L;;;;;N;;;;; +141AD;EGYPTIAN HIEROGLYPH-141AD;Lo;0;L;;;;;N;;;;; +141AE;EGYPTIAN HIEROGLYPH-141AE;Lo;0;L;;;;;N;;;;; +141AF;EGYPTIAN HIEROGLYPH-141AF;Lo;0;L;;;;;N;;;;; +141B0;EGYPTIAN HIEROGLYPH-141B0;Lo;0;L;;;;;N;;;;; +141B1;EGYPTIAN HIEROGLYPH-141B1;Lo;0;L;;;;;N;;;;; +141B2;EGYPTIAN HIEROGLYPH-141B2;Lo;0;L;;;;;N;;;;; +141B3;EGYPTIAN HIEROGLYPH-141B3;Lo;0;L;;;;;N;;;;; +141B4;EGYPTIAN HIEROGLYPH-141B4;Lo;0;L;;;;;N;;;;; +141B5;EGYPTIAN HIEROGLYPH-141B5;Lo;0;L;;;;;N;;;;; +141B6;EGYPTIAN HIEROGLYPH-141B6;Lo;0;L;;;;;N;;;;; +141B7;EGYPTIAN HIEROGLYPH-141B7;Lo;0;L;;;;;N;;;;; +141B8;EGYPTIAN HIEROGLYPH-141B8;Lo;0;L;;;;;N;;;;; +141B9;EGYPTIAN HIEROGLYPH-141B9;Lo;0;L;;;;;N;;;;; +141BA;EGYPTIAN HIEROGLYPH-141BA;Lo;0;L;;;;;N;;;;; +141BB;EGYPTIAN HIEROGLYPH-141BB;Lo;0;L;;;;;N;;;;; +141BC;EGYPTIAN HIEROGLYPH-141BC;Lo;0;L;;;;;N;;;;; +141BD;EGYPTIAN HIEROGLYPH-141BD;Lo;0;L;;;;;N;;;;; +141BE;EGYPTIAN HIEROGLYPH-141BE;Lo;0;L;;;;;N;;;;; +141BF;EGYPTIAN HIEROGLYPH-141BF;Lo;0;L;;;;;N;;;;; +141C0;EGYPTIAN HIEROGLYPH-141C0;Lo;0;L;;;;;N;;;;; +141C1;EGYPTIAN HIEROGLYPH-141C1;Lo;0;L;;;;;N;;;;; +141C2;EGYPTIAN HIEROGLYPH-141C2;Lo;0;L;;;;;N;;;;; +141C3;EGYPTIAN HIEROGLYPH-141C3;Lo;0;L;;;;;N;;;;; +141C4;EGYPTIAN HIEROGLYPH-141C4;Lo;0;L;;;;;N;;;;; +141C5;EGYPTIAN HIEROGLYPH-141C5;Lo;0;L;;;;;N;;;;; +141C6;EGYPTIAN HIEROGLYPH-141C6;Lo;0;L;;;;;N;;;;; +141C7;EGYPTIAN HIEROGLYPH-141C7;Lo;0;L;;;;;N;;;;; +141C8;EGYPTIAN HIEROGLYPH-141C8;Lo;0;L;;;;;N;;;;; +141C9;EGYPTIAN HIEROGLYPH-141C9;Lo;0;L;;;;;N;;;;; +141CA;EGYPTIAN HIEROGLYPH-141CA;Lo;0;L;;;;;N;;;;; +141CB;EGYPTIAN HIEROGLYPH-141CB;Lo;0;L;;;;;N;;;;; +141CC;EGYPTIAN HIEROGLYPH-141CC;Lo;0;L;;;;;N;;;;; +141CD;EGYPTIAN HIEROGLYPH-141CD;Lo;0;L;;;;;N;;;;; +141CE;EGYPTIAN HIEROGLYPH-141CE;Lo;0;L;;;;;N;;;;; +141CF;EGYPTIAN HIEROGLYPH-141CF;Lo;0;L;;;;;N;;;;; +141D0;EGYPTIAN HIEROGLYPH-141D0;Lo;0;L;;;;;N;;;;; +141D1;EGYPTIAN HIEROGLYPH-141D1;Lo;0;L;;;;;N;;;;; +141D2;EGYPTIAN HIEROGLYPH-141D2;Lo;0;L;;;;;N;;;;; +141D3;EGYPTIAN HIEROGLYPH-141D3;Lo;0;L;;;;;N;;;;; +141D4;EGYPTIAN HIEROGLYPH-141D4;Lo;0;L;;;;;N;;;;; +141D5;EGYPTIAN HIEROGLYPH-141D5;Lo;0;L;;;;;N;;;;; +141D6;EGYPTIAN HIEROGLYPH-141D6;Lo;0;L;;;;;N;;;;; +141D7;EGYPTIAN HIEROGLYPH-141D7;Lo;0;L;;;;;N;;;;; +141D8;EGYPTIAN HIEROGLYPH-141D8;Lo;0;L;;;;;N;;;;; +141D9;EGYPTIAN HIEROGLYPH-141D9;Lo;0;L;;;;;N;;;;; +141DA;EGYPTIAN HIEROGLYPH-141DA;Lo;0;L;;;;;N;;;;; +141DB;EGYPTIAN HIEROGLYPH-141DB;Lo;0;L;;;;;N;;;;; +141DC;EGYPTIAN HIEROGLYPH-141DC;Lo;0;L;;;;;N;;;;; +141DD;EGYPTIAN HIEROGLYPH-141DD;Lo;0;L;;;;;N;;;;; +141DE;EGYPTIAN HIEROGLYPH-141DE;Lo;0;L;;;;;N;;;;; +141DF;EGYPTIAN HIEROGLYPH-141DF;Lo;0;L;;;;;N;;;;; +141E0;EGYPTIAN HIEROGLYPH-141E0;Lo;0;L;;;;;N;;;;; +141E1;EGYPTIAN HIEROGLYPH-141E1;Lo;0;L;;;;;N;;;;; +141E2;EGYPTIAN HIEROGLYPH-141E2;Lo;0;L;;;;;N;;;;; +141E3;EGYPTIAN HIEROGLYPH-141E3;Lo;0;L;;;;;N;;;;; +141E4;EGYPTIAN HIEROGLYPH-141E4;Lo;0;L;;;;;N;;;;; +141E5;EGYPTIAN HIEROGLYPH-141E5;Lo;0;L;;;;;N;;;;; +141E6;EGYPTIAN HIEROGLYPH-141E6;Lo;0;L;;;;;N;;;;; +141E7;EGYPTIAN HIEROGLYPH-141E7;Lo;0;L;;;;;N;;;;; +141E8;EGYPTIAN HIEROGLYPH-141E8;Lo;0;L;;;;;N;;;;; +141E9;EGYPTIAN HIEROGLYPH-141E9;Lo;0;L;;;;;N;;;;; +141EA;EGYPTIAN HIEROGLYPH-141EA;Lo;0;L;;;;;N;;;;; +141EB;EGYPTIAN HIEROGLYPH-141EB;Lo;0;L;;;;;N;;;;; +141EC;EGYPTIAN HIEROGLYPH-141EC;Lo;0;L;;;;;N;;;;; +141ED;EGYPTIAN HIEROGLYPH-141ED;Lo;0;L;;;;;N;;;;; +141EE;EGYPTIAN HIEROGLYPH-141EE;Lo;0;L;;;;;N;;;;; +141EF;EGYPTIAN HIEROGLYPH-141EF;Lo;0;L;;;;;N;;;;; +141F0;EGYPTIAN HIEROGLYPH-141F0;Lo;0;L;;;;;N;;;;; +141F1;EGYPTIAN HIEROGLYPH-141F1;Lo;0;L;;;;;N;;;;; +141F2;EGYPTIAN HIEROGLYPH-141F2;Lo;0;L;;;;;N;;;;; +141F3;EGYPTIAN HIEROGLYPH-141F3;Lo;0;L;;;;;N;;;;; +141F4;EGYPTIAN HIEROGLYPH-141F4;Lo;0;L;;;;;N;;;;; +141F5;EGYPTIAN HIEROGLYPH-141F5;Lo;0;L;;;;;N;;;;; +141F6;EGYPTIAN HIEROGLYPH-141F6;Lo;0;L;;;;;N;;;;; +141F7;EGYPTIAN HIEROGLYPH-141F7;Lo;0;L;;;;;N;;;;; +141F8;EGYPTIAN HIEROGLYPH-141F8;Lo;0;L;;;;;N;;;;; +141F9;EGYPTIAN HIEROGLYPH-141F9;Lo;0;L;;;;;N;;;;; +141FA;EGYPTIAN HIEROGLYPH-141FA;Lo;0;L;;;;;N;;;;; +141FB;EGYPTIAN HIEROGLYPH-141FB;Lo;0;L;;;;;N;;;;; +141FC;EGYPTIAN HIEROGLYPH-141FC;Lo;0;L;;;;;N;;;;; +141FD;EGYPTIAN HIEROGLYPH-141FD;Lo;0;L;;;;;N;;;;; +141FE;EGYPTIAN HIEROGLYPH-141FE;Lo;0;L;;;;;N;;;;; +141FF;EGYPTIAN HIEROGLYPH-141FF;Lo;0;L;;;;;N;;;;; +14200;EGYPTIAN HIEROGLYPH-14200;Lo;0;L;;;;;N;;;;; +14201;EGYPTIAN HIEROGLYPH-14201;Lo;0;L;;;;;N;;;;; +14202;EGYPTIAN HIEROGLYPH-14202;Lo;0;L;;;;;N;;;;; +14203;EGYPTIAN HIEROGLYPH-14203;Lo;0;L;;;;;N;;;;; +14204;EGYPTIAN HIEROGLYPH-14204;Lo;0;L;;;;;N;;;;; +14205;EGYPTIAN HIEROGLYPH-14205;Lo;0;L;;;;;N;;;;; +14206;EGYPTIAN HIEROGLYPH-14206;Lo;0;L;;;;;N;;;;; +14207;EGYPTIAN HIEROGLYPH-14207;Lo;0;L;;;;;N;;;;; +14208;EGYPTIAN HIEROGLYPH-14208;Lo;0;L;;;;;N;;;;; +14209;EGYPTIAN HIEROGLYPH-14209;Lo;0;L;;;;;N;;;;; +1420A;EGYPTIAN HIEROGLYPH-1420A;Lo;0;L;;;;;N;;;;; +1420B;EGYPTIAN HIEROGLYPH-1420B;Lo;0;L;;;;;N;;;;; +1420C;EGYPTIAN HIEROGLYPH-1420C;Lo;0;L;;;;;N;;;;; +1420D;EGYPTIAN HIEROGLYPH-1420D;Lo;0;L;;;;;N;;;;; +1420E;EGYPTIAN HIEROGLYPH-1420E;Lo;0;L;;;;;N;;;;; +1420F;EGYPTIAN HIEROGLYPH-1420F;Lo;0;L;;;;;N;;;;; +14210;EGYPTIAN HIEROGLYPH-14210;Lo;0;L;;;;;N;;;;; +14211;EGYPTIAN HIEROGLYPH-14211;Lo;0;L;;;;;N;;;;; +14212;EGYPTIAN HIEROGLYPH-14212;Lo;0;L;;;;;N;;;;; +14213;EGYPTIAN HIEROGLYPH-14213;Lo;0;L;;;;;N;;;;; +14214;EGYPTIAN HIEROGLYPH-14214;Lo;0;L;;;;;N;;;;; +14215;EGYPTIAN HIEROGLYPH-14215;Lo;0;L;;;;;N;;;;; +14216;EGYPTIAN HIEROGLYPH-14216;Lo;0;L;;;;;N;;;;; +14217;EGYPTIAN HIEROGLYPH-14217;Lo;0;L;;;;;N;;;;; +14218;EGYPTIAN HIEROGLYPH-14218;Lo;0;L;;;;;N;;;;; +14219;EGYPTIAN HIEROGLYPH-14219;Lo;0;L;;;;;N;;;;; +1421A;EGYPTIAN HIEROGLYPH-1421A;Lo;0;L;;;;;N;;;;; +1421B;EGYPTIAN HIEROGLYPH-1421B;Lo;0;L;;;;;N;;;;; +1421C;EGYPTIAN HIEROGLYPH-1421C;Lo;0;L;;;;;N;;;;; +1421D;EGYPTIAN HIEROGLYPH-1421D;Lo;0;L;;;;;N;;;;; +1421E;EGYPTIAN HIEROGLYPH-1421E;Lo;0;L;;;;;N;;;;; +1421F;EGYPTIAN HIEROGLYPH-1421F;Lo;0;L;;;;;N;;;;; +14220;EGYPTIAN HIEROGLYPH-14220;Lo;0;L;;;;;N;;;;; +14221;EGYPTIAN HIEROGLYPH-14221;Lo;0;L;;;;;N;;;;; +14222;EGYPTIAN HIEROGLYPH-14222;Lo;0;L;;;;;N;;;;; +14223;EGYPTIAN HIEROGLYPH-14223;Lo;0;L;;;;;N;;;;; +14224;EGYPTIAN HIEROGLYPH-14224;Lo;0;L;;;;;N;;;;; +14225;EGYPTIAN HIEROGLYPH-14225;Lo;0;L;;;;;N;;;;; +14226;EGYPTIAN HIEROGLYPH-14226;Lo;0;L;;;;;N;;;;; +14227;EGYPTIAN HIEROGLYPH-14227;Lo;0;L;;;;;N;;;;; +14228;EGYPTIAN HIEROGLYPH-14228;Lo;0;L;;;;;N;;;;; +14229;EGYPTIAN HIEROGLYPH-14229;Lo;0;L;;;;;N;;;;; +1422A;EGYPTIAN HIEROGLYPH-1422A;Lo;0;L;;;;;N;;;;; +1422B;EGYPTIAN HIEROGLYPH-1422B;Lo;0;L;;;;;N;;;;; +1422C;EGYPTIAN HIEROGLYPH-1422C;Lo;0;L;;;;;N;;;;; +1422D;EGYPTIAN HIEROGLYPH-1422D;Lo;0;L;;;;;N;;;;; +1422E;EGYPTIAN HIEROGLYPH-1422E;Lo;0;L;;;;;N;;;;; +1422F;EGYPTIAN HIEROGLYPH-1422F;Lo;0;L;;;;;N;;;;; +14230;EGYPTIAN HIEROGLYPH-14230;Lo;0;L;;;;;N;;;;; +14231;EGYPTIAN HIEROGLYPH-14231;Lo;0;L;;;;;N;;;;; +14232;EGYPTIAN HIEROGLYPH-14232;Lo;0;L;;;;;N;;;;; +14233;EGYPTIAN HIEROGLYPH-14233;Lo;0;L;;;;;N;;;;; +14234;EGYPTIAN HIEROGLYPH-14234;Lo;0;L;;;;;N;;;;; +14235;EGYPTIAN HIEROGLYPH-14235;Lo;0;L;;;;;N;;;;; +14236;EGYPTIAN HIEROGLYPH-14236;Lo;0;L;;;;;N;;;;; +14237;EGYPTIAN HIEROGLYPH-14237;Lo;0;L;;;;;N;;;;; +14238;EGYPTIAN HIEROGLYPH-14238;Lo;0;L;;;;;N;;;;; +14239;EGYPTIAN HIEROGLYPH-14239;Lo;0;L;;;;;N;;;;; +1423A;EGYPTIAN HIEROGLYPH-1423A;Lo;0;L;;;;;N;;;;; +1423B;EGYPTIAN HIEROGLYPH-1423B;Lo;0;L;;;;;N;;;;; +1423C;EGYPTIAN HIEROGLYPH-1423C;Lo;0;L;;;;;N;;;;; +1423D;EGYPTIAN HIEROGLYPH-1423D;Lo;0;L;;;;;N;;;;; +1423E;EGYPTIAN HIEROGLYPH-1423E;Lo;0;L;;;;;N;;;;; +1423F;EGYPTIAN HIEROGLYPH-1423F;Lo;0;L;;;;;N;;;;; +14240;EGYPTIAN HIEROGLYPH-14240;Lo;0;L;;;;;N;;;;; +14241;EGYPTIAN HIEROGLYPH-14241;Lo;0;L;;;;;N;;;;; +14242;EGYPTIAN HIEROGLYPH-14242;Lo;0;L;;;;;N;;;;; +14243;EGYPTIAN HIEROGLYPH-14243;Lo;0;L;;;;;N;;;;; +14244;EGYPTIAN HIEROGLYPH-14244;Lo;0;L;;;;;N;;;;; +14245;EGYPTIAN HIEROGLYPH-14245;Lo;0;L;;;;;N;;;;; +14246;EGYPTIAN HIEROGLYPH-14246;Lo;0;L;;;;;N;;;;; +14247;EGYPTIAN HIEROGLYPH-14247;Lo;0;L;;;;;N;;;;; +14248;EGYPTIAN HIEROGLYPH-14248;Lo;0;L;;;;;N;;;;; +14249;EGYPTIAN HIEROGLYPH-14249;Lo;0;L;;;;;N;;;;; +1424A;EGYPTIAN HIEROGLYPH-1424A;Lo;0;L;;;;;N;;;;; +1424B;EGYPTIAN HIEROGLYPH-1424B;Lo;0;L;;;;;N;;;;; +1424C;EGYPTIAN HIEROGLYPH-1424C;Lo;0;L;;;;;N;;;;; +1424D;EGYPTIAN HIEROGLYPH-1424D;Lo;0;L;;;;;N;;;;; +1424E;EGYPTIAN HIEROGLYPH-1424E;Lo;0;L;;;;;N;;;;; +1424F;EGYPTIAN HIEROGLYPH-1424F;Lo;0;L;;;;;N;;;;; +14250;EGYPTIAN HIEROGLYPH-14250;Lo;0;L;;;;;N;;;;; +14251;EGYPTIAN HIEROGLYPH-14251;Lo;0;L;;;;;N;;;;; +14252;EGYPTIAN HIEROGLYPH-14252;Lo;0;L;;;;;N;;;;; +14253;EGYPTIAN HIEROGLYPH-14253;Lo;0;L;;;;;N;;;;; +14254;EGYPTIAN HIEROGLYPH-14254;Lo;0;L;;;;;N;;;;; +14255;EGYPTIAN HIEROGLYPH-14255;Lo;0;L;;;;;N;;;;; +14256;EGYPTIAN HIEROGLYPH-14256;Lo;0;L;;;;;N;;;;; +14257;EGYPTIAN HIEROGLYPH-14257;Lo;0;L;;;;;N;;;;; +14258;EGYPTIAN HIEROGLYPH-14258;Lo;0;L;;;;;N;;;;; +14259;EGYPTIAN HIEROGLYPH-14259;Lo;0;L;;;;;N;;;;; +1425A;EGYPTIAN HIEROGLYPH-1425A;Lo;0;L;;;;;N;;;;; +1425B;EGYPTIAN HIEROGLYPH-1425B;Lo;0;L;;;;;N;;;;; +1425C;EGYPTIAN HIEROGLYPH-1425C;Lo;0;L;;;;;N;;;;; +1425D;EGYPTIAN HIEROGLYPH-1425D;Lo;0;L;;;;;N;;;;; +1425E;EGYPTIAN HIEROGLYPH-1425E;Lo;0;L;;;;;N;;;;; +1425F;EGYPTIAN HIEROGLYPH-1425F;Lo;0;L;;;;;N;;;;; +14260;EGYPTIAN HIEROGLYPH-14260;Lo;0;L;;;;;N;;;;; +14261;EGYPTIAN HIEROGLYPH-14261;Lo;0;L;;;;;N;;;;; +14262;EGYPTIAN HIEROGLYPH-14262;Lo;0;L;;;;;N;;;;; +14263;EGYPTIAN HIEROGLYPH-14263;Lo;0;L;;;;;N;;;;; +14264;EGYPTIAN HIEROGLYPH-14264;Lo;0;L;;;;;N;;;;; +14265;EGYPTIAN HIEROGLYPH-14265;Lo;0;L;;;;;N;;;;; +14266;EGYPTIAN HIEROGLYPH-14266;Lo;0;L;;;;;N;;;;; +14267;EGYPTIAN HIEROGLYPH-14267;Lo;0;L;;;;;N;;;;; +14268;EGYPTIAN HIEROGLYPH-14268;Lo;0;L;;;;;N;;;;; +14269;EGYPTIAN HIEROGLYPH-14269;Lo;0;L;;;;;N;;;;; +1426A;EGYPTIAN HIEROGLYPH-1426A;Lo;0;L;;;;;N;;;;; +1426B;EGYPTIAN HIEROGLYPH-1426B;Lo;0;L;;;;;N;;;;; +1426C;EGYPTIAN HIEROGLYPH-1426C;Lo;0;L;;;;;N;;;;; +1426D;EGYPTIAN HIEROGLYPH-1426D;Lo;0;L;;;;;N;;;;; +1426E;EGYPTIAN HIEROGLYPH-1426E;Lo;0;L;;;;;N;;;;; +1426F;EGYPTIAN HIEROGLYPH-1426F;Lo;0;L;;;;;N;;;;; +14270;EGYPTIAN HIEROGLYPH-14270;Lo;0;L;;;;;N;;;;; +14271;EGYPTIAN HIEROGLYPH-14271;Lo;0;L;;;;;N;;;;; +14272;EGYPTIAN HIEROGLYPH-14272;Lo;0;L;;;;;N;;;;; +14273;EGYPTIAN HIEROGLYPH-14273;Lo;0;L;;;;;N;;;;; +14274;EGYPTIAN HIEROGLYPH-14274;Lo;0;L;;;;;N;;;;; +14275;EGYPTIAN HIEROGLYPH-14275;Lo;0;L;;;;;N;;;;; +14276;EGYPTIAN HIEROGLYPH-14276;Lo;0;L;;;;;N;;;;; +14277;EGYPTIAN HIEROGLYPH-14277;Lo;0;L;;;;;N;;;;; +14278;EGYPTIAN HIEROGLYPH-14278;Lo;0;L;;;;;N;;;;; +14279;EGYPTIAN HIEROGLYPH-14279;Lo;0;L;;;;;N;;;;; +1427A;EGYPTIAN HIEROGLYPH-1427A;Lo;0;L;;;;;N;;;;; +1427B;EGYPTIAN HIEROGLYPH-1427B;Lo;0;L;;;;;N;;;;; +1427C;EGYPTIAN HIEROGLYPH-1427C;Lo;0;L;;;;;N;;;;; +1427D;EGYPTIAN HIEROGLYPH-1427D;Lo;0;L;;;;;N;;;;; +1427E;EGYPTIAN HIEROGLYPH-1427E;Lo;0;L;;;;;N;;;;; +1427F;EGYPTIAN HIEROGLYPH-1427F;Lo;0;L;;;;;N;;;;; +14280;EGYPTIAN HIEROGLYPH-14280;Lo;0;L;;;;;N;;;;; +14281;EGYPTIAN HIEROGLYPH-14281;Lo;0;L;;;;;N;;;;; +14282;EGYPTIAN HIEROGLYPH-14282;Lo;0;L;;;;;N;;;;; +14283;EGYPTIAN HIEROGLYPH-14283;Lo;0;L;;;;;N;;;;; +14284;EGYPTIAN HIEROGLYPH-14284;Lo;0;L;;;;;N;;;;; +14285;EGYPTIAN HIEROGLYPH-14285;Lo;0;L;;;;;N;;;;; +14286;EGYPTIAN HIEROGLYPH-14286;Lo;0;L;;;;;N;;;;; +14287;EGYPTIAN HIEROGLYPH-14287;Lo;0;L;;;;;N;;;;; +14288;EGYPTIAN HIEROGLYPH-14288;Lo;0;L;;;;;N;;;;; +14289;EGYPTIAN HIEROGLYPH-14289;Lo;0;L;;;;;N;;;;; +1428A;EGYPTIAN HIEROGLYPH-1428A;Lo;0;L;;;;;N;;;;; +1428B;EGYPTIAN HIEROGLYPH-1428B;Lo;0;L;;;;;N;;;;; +1428C;EGYPTIAN HIEROGLYPH-1428C;Lo;0;L;;;;;N;;;;; +1428D;EGYPTIAN HIEROGLYPH-1428D;Lo;0;L;;;;;N;;;;; +1428E;EGYPTIAN HIEROGLYPH-1428E;Lo;0;L;;;;;N;;;;; +1428F;EGYPTIAN HIEROGLYPH-1428F;Lo;0;L;;;;;N;;;;; +14290;EGYPTIAN HIEROGLYPH-14290;Lo;0;L;;;;;N;;;;; +14291;EGYPTIAN HIEROGLYPH-14291;Lo;0;L;;;;;N;;;;; +14292;EGYPTIAN HIEROGLYPH-14292;Lo;0;L;;;;;N;;;;; +14293;EGYPTIAN HIEROGLYPH-14293;Lo;0;L;;;;;N;;;;; +14294;EGYPTIAN HIEROGLYPH-14294;Lo;0;L;;;;;N;;;;; +14295;EGYPTIAN HIEROGLYPH-14295;Lo;0;L;;;;;N;;;;; +14296;EGYPTIAN HIEROGLYPH-14296;Lo;0;L;;;;;N;;;;; +14297;EGYPTIAN HIEROGLYPH-14297;Lo;0;L;;;;;N;;;;; +14298;EGYPTIAN HIEROGLYPH-14298;Lo;0;L;;;;;N;;;;; +14299;EGYPTIAN HIEROGLYPH-14299;Lo;0;L;;;;;N;;;;; +1429A;EGYPTIAN HIEROGLYPH-1429A;Lo;0;L;;;;;N;;;;; +1429B;EGYPTIAN HIEROGLYPH-1429B;Lo;0;L;;;;;N;;;;; +1429C;EGYPTIAN HIEROGLYPH-1429C;Lo;0;L;;;;;N;;;;; +1429D;EGYPTIAN HIEROGLYPH-1429D;Lo;0;L;;;;;N;;;;; +1429E;EGYPTIAN HIEROGLYPH-1429E;Lo;0;L;;;;;N;;;;; +1429F;EGYPTIAN HIEROGLYPH-1429F;Lo;0;L;;;;;N;;;;; +142A0;EGYPTIAN HIEROGLYPH-142A0;Lo;0;L;;;;;N;;;;; +142A1;EGYPTIAN HIEROGLYPH-142A1;Lo;0;L;;;;;N;;;;; +142A2;EGYPTIAN HIEROGLYPH-142A2;Lo;0;L;;;;;N;;;;; +142A3;EGYPTIAN HIEROGLYPH-142A3;Lo;0;L;;;;;N;;;;; +142A4;EGYPTIAN HIEROGLYPH-142A4;Lo;0;L;;;;;N;;;;; +142A5;EGYPTIAN HIEROGLYPH-142A5;Lo;0;L;;;;;N;;;;; +142A6;EGYPTIAN HIEROGLYPH-142A6;Lo;0;L;;;;;N;;;;; +142A7;EGYPTIAN HIEROGLYPH-142A7;Lo;0;L;;;;;N;;;;; +142A8;EGYPTIAN HIEROGLYPH-142A8;Lo;0;L;;;;;N;;;;; +142A9;EGYPTIAN HIEROGLYPH-142A9;Lo;0;L;;;;;N;;;;; +142AA;EGYPTIAN HIEROGLYPH-142AA;Lo;0;L;;;;;N;;;;; +142AB;EGYPTIAN HIEROGLYPH-142AB;Lo;0;L;;;;;N;;;;; +142AC;EGYPTIAN HIEROGLYPH-142AC;Lo;0;L;;;;;N;;;;; +142AD;EGYPTIAN HIEROGLYPH-142AD;Lo;0;L;;;;;N;;;;; +142AE;EGYPTIAN HIEROGLYPH-142AE;Lo;0;L;;;;;N;;;;; +142AF;EGYPTIAN HIEROGLYPH-142AF;Lo;0;L;;;;;N;;;;; +142B0;EGYPTIAN HIEROGLYPH-142B0;Lo;0;L;;;;;N;;;;; +142B1;EGYPTIAN HIEROGLYPH-142B1;Lo;0;L;;;;;N;;;;; +142B2;EGYPTIAN HIEROGLYPH-142B2;Lo;0;L;;;;;N;;;;; +142B3;EGYPTIAN HIEROGLYPH-142B3;Lo;0;L;;;;;N;;;;; +142B4;EGYPTIAN HIEROGLYPH-142B4;Lo;0;L;;;;;N;;;;; +142B5;EGYPTIAN HIEROGLYPH-142B5;Lo;0;L;;;;;N;;;;; +142B6;EGYPTIAN HIEROGLYPH-142B6;Lo;0;L;;;;;N;;;;; +142B7;EGYPTIAN HIEROGLYPH-142B7;Lo;0;L;;;;;N;;;;; +142B8;EGYPTIAN HIEROGLYPH-142B8;Lo;0;L;;;;;N;;;;; +142B9;EGYPTIAN HIEROGLYPH-142B9;Lo;0;L;;;;;N;;;;; +142BA;EGYPTIAN HIEROGLYPH-142BA;Lo;0;L;;;;;N;;;;; +142BB;EGYPTIAN HIEROGLYPH-142BB;Lo;0;L;;;;;N;;;;; +142BC;EGYPTIAN HIEROGLYPH-142BC;Lo;0;L;;;;;N;;;;; +142BD;EGYPTIAN HIEROGLYPH-142BD;Lo;0;L;;;;;N;;;;; +142BE;EGYPTIAN HIEROGLYPH-142BE;Lo;0;L;;;;;N;;;;; +142BF;EGYPTIAN HIEROGLYPH-142BF;Lo;0;L;;;;;N;;;;; +142C0;EGYPTIAN HIEROGLYPH-142C0;Lo;0;L;;;;;N;;;;; +142C1;EGYPTIAN HIEROGLYPH-142C1;Lo;0;L;;;;;N;;;;; +142C2;EGYPTIAN HIEROGLYPH-142C2;Lo;0;L;;;;;N;;;;; +142C3;EGYPTIAN HIEROGLYPH-142C3;Lo;0;L;;;;;N;;;;; +142C4;EGYPTIAN HIEROGLYPH-142C4;Lo;0;L;;;;;N;;;;; +142C5;EGYPTIAN HIEROGLYPH-142C5;Lo;0;L;;;;;N;;;;; +142C6;EGYPTIAN HIEROGLYPH-142C6;Lo;0;L;;;;;N;;;;; +142C7;EGYPTIAN HIEROGLYPH-142C7;Lo;0;L;;;;;N;;;;; +142C8;EGYPTIAN HIEROGLYPH-142C8;Lo;0;L;;;;;N;;;;; +142C9;EGYPTIAN HIEROGLYPH-142C9;Lo;0;L;;;;;N;;;;; +142CA;EGYPTIAN HIEROGLYPH-142CA;Lo;0;L;;;;;N;;;;; +142CB;EGYPTIAN HIEROGLYPH-142CB;Lo;0;L;;;;;N;;;;; +142CC;EGYPTIAN HIEROGLYPH-142CC;Lo;0;L;;;;;N;;;;; +142CD;EGYPTIAN HIEROGLYPH-142CD;Lo;0;L;;;;;N;;;;; +142CE;EGYPTIAN HIEROGLYPH-142CE;Lo;0;L;;;;;N;;;;; +142CF;EGYPTIAN HIEROGLYPH-142CF;Lo;0;L;;;;;N;;;;; +142D0;EGYPTIAN HIEROGLYPH-142D0;Lo;0;L;;;;;N;;;;; +142D1;EGYPTIAN HIEROGLYPH-142D1;Lo;0;L;;;;;N;;;;; +142D2;EGYPTIAN HIEROGLYPH-142D2;Lo;0;L;;;;;N;;;;; +142D3;EGYPTIAN HIEROGLYPH-142D3;Lo;0;L;;;;;N;;;;; +142D4;EGYPTIAN HIEROGLYPH-142D4;Lo;0;L;;;;;N;;;;; +142D5;EGYPTIAN HIEROGLYPH-142D5;Lo;0;L;;;;;N;;;;; +142D6;EGYPTIAN HIEROGLYPH-142D6;Lo;0;L;;;;;N;;;;; +142D7;EGYPTIAN HIEROGLYPH-142D7;Lo;0;L;;;;;N;;;;; +142D8;EGYPTIAN HIEROGLYPH-142D8;Lo;0;L;;;;;N;;;;; +142D9;EGYPTIAN HIEROGLYPH-142D9;Lo;0;L;;;;;N;;;;; +142DA;EGYPTIAN HIEROGLYPH-142DA;Lo;0;L;;;;;N;;;;; +142DB;EGYPTIAN HIEROGLYPH-142DB;Lo;0;L;;;;;N;;;;; +142DC;EGYPTIAN HIEROGLYPH-142DC;Lo;0;L;;;;;N;;;;; +142DD;EGYPTIAN HIEROGLYPH-142DD;Lo;0;L;;;;;N;;;;; +142DE;EGYPTIAN HIEROGLYPH-142DE;Lo;0;L;;;;;N;;;;; +142DF;EGYPTIAN HIEROGLYPH-142DF;Lo;0;L;;;;;N;;;;; +142E0;EGYPTIAN HIEROGLYPH-142E0;Lo;0;L;;;;;N;;;;; +142E1;EGYPTIAN HIEROGLYPH-142E1;Lo;0;L;;;;;N;;;;; +142E2;EGYPTIAN HIEROGLYPH-142E2;Lo;0;L;;;;;N;;;;; +142E3;EGYPTIAN HIEROGLYPH-142E3;Lo;0;L;;;;;N;;;;; +142E4;EGYPTIAN HIEROGLYPH-142E4;Lo;0;L;;;;;N;;;;; +142E5;EGYPTIAN HIEROGLYPH-142E5;Lo;0;L;;;;;N;;;;; +142E6;EGYPTIAN HIEROGLYPH-142E6;Lo;0;L;;;;;N;;;;; +142E7;EGYPTIAN HIEROGLYPH-142E7;Lo;0;L;;;;;N;;;;; +142E8;EGYPTIAN HIEROGLYPH-142E8;Lo;0;L;;;;;N;;;;; +142E9;EGYPTIAN HIEROGLYPH-142E9;Lo;0;L;;;;;N;;;;; +142EA;EGYPTIAN HIEROGLYPH-142EA;Lo;0;L;;;;;N;;;;; +142EB;EGYPTIAN HIEROGLYPH-142EB;Lo;0;L;;;;;N;;;;; +142EC;EGYPTIAN HIEROGLYPH-142EC;Lo;0;L;;;;;N;;;;; +142ED;EGYPTIAN HIEROGLYPH-142ED;Lo;0;L;;;;;N;;;;; +142EE;EGYPTIAN HIEROGLYPH-142EE;Lo;0;L;;;;;N;;;;; +142EF;EGYPTIAN HIEROGLYPH-142EF;Lo;0;L;;;;;N;;;;; +142F0;EGYPTIAN HIEROGLYPH-142F0;Lo;0;L;;;;;N;;;;; +142F1;EGYPTIAN HIEROGLYPH-142F1;Lo;0;L;;;;;N;;;;; +142F2;EGYPTIAN HIEROGLYPH-142F2;Lo;0;L;;;;;N;;;;; +142F3;EGYPTIAN HIEROGLYPH-142F3;Lo;0;L;;;;;N;;;;; +142F4;EGYPTIAN HIEROGLYPH-142F4;Lo;0;L;;;;;N;;;;; +142F5;EGYPTIAN HIEROGLYPH-142F5;Lo;0;L;;;;;N;;;;; +142F6;EGYPTIAN HIEROGLYPH-142F6;Lo;0;L;;;;;N;;;;; +142F7;EGYPTIAN HIEROGLYPH-142F7;Lo;0;L;;;;;N;;;;; +142F8;EGYPTIAN HIEROGLYPH-142F8;Lo;0;L;;;;;N;;;;; +142F9;EGYPTIAN HIEROGLYPH-142F9;Lo;0;L;;;;;N;;;;; +142FA;EGYPTIAN HIEROGLYPH-142FA;Lo;0;L;;;;;N;;;;; +142FB;EGYPTIAN HIEROGLYPH-142FB;Lo;0;L;;;;;N;;;;; +142FC;EGYPTIAN HIEROGLYPH-142FC;Lo;0;L;;;;;N;;;;; +142FD;EGYPTIAN HIEROGLYPH-142FD;Lo;0;L;;;;;N;;;;; +142FE;EGYPTIAN HIEROGLYPH-142FE;Lo;0;L;;;;;N;;;;; +142FF;EGYPTIAN HIEROGLYPH-142FF;Lo;0;L;;;;;N;;;;; +14300;EGYPTIAN HIEROGLYPH-14300;Lo;0;L;;;;;N;;;;; +14301;EGYPTIAN HIEROGLYPH-14301;Lo;0;L;;;;;N;;;;; +14302;EGYPTIAN HIEROGLYPH-14302;Lo;0;L;;;;;N;;;;; +14303;EGYPTIAN HIEROGLYPH-14303;Lo;0;L;;;;;N;;;;; +14304;EGYPTIAN HIEROGLYPH-14304;Lo;0;L;;;;;N;;;;; +14305;EGYPTIAN HIEROGLYPH-14305;Lo;0;L;;;;;N;;;;; +14306;EGYPTIAN HIEROGLYPH-14306;Lo;0;L;;;;;N;;;;; +14307;EGYPTIAN HIEROGLYPH-14307;Lo;0;L;;;;;N;;;;; +14308;EGYPTIAN HIEROGLYPH-14308;Lo;0;L;;;;;N;;;;; +14309;EGYPTIAN HIEROGLYPH-14309;Lo;0;L;;;;;N;;;;; +1430A;EGYPTIAN HIEROGLYPH-1430A;Lo;0;L;;;;;N;;;;; +1430B;EGYPTIAN HIEROGLYPH-1430B;Lo;0;L;;;;;N;;;;; +1430C;EGYPTIAN HIEROGLYPH-1430C;Lo;0;L;;;;;N;;;;; +1430D;EGYPTIAN HIEROGLYPH-1430D;Lo;0;L;;;;;N;;;;; +1430E;EGYPTIAN HIEROGLYPH-1430E;Lo;0;L;;;;;N;;;;; +1430F;EGYPTIAN HIEROGLYPH-1430F;Lo;0;L;;;;;N;;;;; +14310;EGYPTIAN HIEROGLYPH-14310;Lo;0;L;;;;;N;;;;; +14311;EGYPTIAN HIEROGLYPH-14311;Lo;0;L;;;;;N;;;;; +14312;EGYPTIAN HIEROGLYPH-14312;Lo;0;L;;;;;N;;;;; +14313;EGYPTIAN HIEROGLYPH-14313;Lo;0;L;;;;;N;;;;; +14314;EGYPTIAN HIEROGLYPH-14314;Lo;0;L;;;;;N;;;;; +14315;EGYPTIAN HIEROGLYPH-14315;Lo;0;L;;;;;N;;;;; +14316;EGYPTIAN HIEROGLYPH-14316;Lo;0;L;;;;;N;;;;; +14317;EGYPTIAN HIEROGLYPH-14317;Lo;0;L;;;;;N;;;;; +14318;EGYPTIAN HIEROGLYPH-14318;Lo;0;L;;;;;N;;;;; +14319;EGYPTIAN HIEROGLYPH-14319;Lo;0;L;;;;;N;;;;; +1431A;EGYPTIAN HIEROGLYPH-1431A;Lo;0;L;;;;;N;;;;; +1431B;EGYPTIAN HIEROGLYPH-1431B;Lo;0;L;;;;;N;;;;; +1431C;EGYPTIAN HIEROGLYPH-1431C;Lo;0;L;;;;;N;;;;; +1431D;EGYPTIAN HIEROGLYPH-1431D;Lo;0;L;;;;;N;;;;; +1431E;EGYPTIAN HIEROGLYPH-1431E;Lo;0;L;;;;;N;;;;; +1431F;EGYPTIAN HIEROGLYPH-1431F;Lo;0;L;;;;;N;;;;; +14320;EGYPTIAN HIEROGLYPH-14320;Lo;0;L;;;;;N;;;;; +14321;EGYPTIAN HIEROGLYPH-14321;Lo;0;L;;;;;N;;;;; +14322;EGYPTIAN HIEROGLYPH-14322;Lo;0;L;;;;;N;;;;; +14323;EGYPTIAN HIEROGLYPH-14323;Lo;0;L;;;;;N;;;;; +14324;EGYPTIAN HIEROGLYPH-14324;Lo;0;L;;;;;N;;;;; +14325;EGYPTIAN HIEROGLYPH-14325;Lo;0;L;;;;;N;;;;; +14326;EGYPTIAN HIEROGLYPH-14326;Lo;0;L;;;;;N;;;;; +14327;EGYPTIAN HIEROGLYPH-14327;Lo;0;L;;;;;N;;;;; +14328;EGYPTIAN HIEROGLYPH-14328;Lo;0;L;;;;;N;;;;; +14329;EGYPTIAN HIEROGLYPH-14329;Lo;0;L;;;;;N;;;;; +1432A;EGYPTIAN HIEROGLYPH-1432A;Lo;0;L;;;;;N;;;;; +1432B;EGYPTIAN HIEROGLYPH-1432B;Lo;0;L;;;;;N;;;;; +1432C;EGYPTIAN HIEROGLYPH-1432C;Lo;0;L;;;;;N;;;;; +1432D;EGYPTIAN HIEROGLYPH-1432D;Lo;0;L;;;;;N;;;;; +1432E;EGYPTIAN HIEROGLYPH-1432E;Lo;0;L;;;;;N;;;;; +1432F;EGYPTIAN HIEROGLYPH-1432F;Lo;0;L;;;;;N;;;;; +14330;EGYPTIAN HIEROGLYPH-14330;Lo;0;L;;;;;N;;;;; +14331;EGYPTIAN HIEROGLYPH-14331;Lo;0;L;;;;;N;;;;; +14332;EGYPTIAN HIEROGLYPH-14332;Lo;0;L;;;;;N;;;;; +14333;EGYPTIAN HIEROGLYPH-14333;Lo;0;L;;;;;N;;;;; +14334;EGYPTIAN HIEROGLYPH-14334;Lo;0;L;;;;;N;;;;; +14335;EGYPTIAN HIEROGLYPH-14335;Lo;0;L;;;;;N;;;;; +14336;EGYPTIAN HIEROGLYPH-14336;Lo;0;L;;;;;N;;;;; +14337;EGYPTIAN HIEROGLYPH-14337;Lo;0;L;;;;;N;;;;; +14338;EGYPTIAN HIEROGLYPH-14338;Lo;0;L;;;;;N;;;;; +14339;EGYPTIAN HIEROGLYPH-14339;Lo;0;L;;;;;N;;;;; +1433A;EGYPTIAN HIEROGLYPH-1433A;Lo;0;L;;;;;N;;;;; +1433B;EGYPTIAN HIEROGLYPH-1433B;Lo;0;L;;;;;N;;;;; +1433C;EGYPTIAN HIEROGLYPH-1433C;Lo;0;L;;;;;N;;;;; +1433D;EGYPTIAN HIEROGLYPH-1433D;Lo;0;L;;;;;N;;;;; +1433E;EGYPTIAN HIEROGLYPH-1433E;Lo;0;L;;;;;N;;;;; +1433F;EGYPTIAN HIEROGLYPH-1433F;Lo;0;L;;;;;N;;;;; +14340;EGYPTIAN HIEROGLYPH-14340;Lo;0;L;;;;;N;;;;; +14341;EGYPTIAN HIEROGLYPH-14341;Lo;0;L;;;;;N;;;;; +14342;EGYPTIAN HIEROGLYPH-14342;Lo;0;L;;;;;N;;;;; +14343;EGYPTIAN HIEROGLYPH-14343;Lo;0;L;;;;;N;;;;; +14344;EGYPTIAN HIEROGLYPH-14344;Lo;0;L;;;;;N;;;;; +14345;EGYPTIAN HIEROGLYPH-14345;Lo;0;L;;;;;N;;;;; +14346;EGYPTIAN HIEROGLYPH-14346;Lo;0;L;;;;;N;;;;; +14347;EGYPTIAN HIEROGLYPH-14347;Lo;0;L;;;;;N;;;;; +14348;EGYPTIAN HIEROGLYPH-14348;Lo;0;L;;;;;N;;;;; +14349;EGYPTIAN HIEROGLYPH-14349;Lo;0;L;;;;;N;;;;; +1434A;EGYPTIAN HIEROGLYPH-1434A;Lo;0;L;;;;;N;;;;; +1434B;EGYPTIAN HIEROGLYPH-1434B;Lo;0;L;;;;;N;;;;; +1434C;EGYPTIAN HIEROGLYPH-1434C;Lo;0;L;;;;;N;;;;; +1434D;EGYPTIAN HIEROGLYPH-1434D;Lo;0;L;;;;;N;;;;; +1434E;EGYPTIAN HIEROGLYPH-1434E;Lo;0;L;;;;;N;;;;; +1434F;EGYPTIAN HIEROGLYPH-1434F;Lo;0;L;;;;;N;;;;; +14350;EGYPTIAN HIEROGLYPH-14350;Lo;0;L;;;;;N;;;;; +14351;EGYPTIAN HIEROGLYPH-14351;Lo;0;L;;;;;N;;;;; +14352;EGYPTIAN HIEROGLYPH-14352;Lo;0;L;;;;;N;;;;; +14353;EGYPTIAN HIEROGLYPH-14353;Lo;0;L;;;;;N;;;;; +14354;EGYPTIAN HIEROGLYPH-14354;Lo;0;L;;;;;N;;;;; +14355;EGYPTIAN HIEROGLYPH-14355;Lo;0;L;;;;;N;;;;; +14356;EGYPTIAN HIEROGLYPH-14356;Lo;0;L;;;;;N;;;;; +14357;EGYPTIAN HIEROGLYPH-14357;Lo;0;L;;;;;N;;;;; +14358;EGYPTIAN HIEROGLYPH-14358;Lo;0;L;;;;;N;;;;; +14359;EGYPTIAN HIEROGLYPH-14359;Lo;0;L;;;;;N;;;;; +1435A;EGYPTIAN HIEROGLYPH-1435A;Lo;0;L;;;;;N;;;;; +1435B;EGYPTIAN HIEROGLYPH-1435B;Lo;0;L;;;;;N;;;;; +1435C;EGYPTIAN HIEROGLYPH-1435C;Lo;0;L;;;;;N;;;;; +1435D;EGYPTIAN HIEROGLYPH-1435D;Lo;0;L;;;;;N;;;;; +1435E;EGYPTIAN HIEROGLYPH-1435E;Lo;0;L;;;;;N;;;;; +1435F;EGYPTIAN HIEROGLYPH-1435F;Lo;0;L;;;;;N;;;;; +14360;EGYPTIAN HIEROGLYPH-14360;Lo;0;L;;;;;N;;;;; +14361;EGYPTIAN HIEROGLYPH-14361;Lo;0;L;;;;;N;;;;; +14362;EGYPTIAN HIEROGLYPH-14362;Lo;0;L;;;;;N;;;;; +14363;EGYPTIAN HIEROGLYPH-14363;Lo;0;L;;;;;N;;;;; +14364;EGYPTIAN HIEROGLYPH-14364;Lo;0;L;;;;;N;;;;; +14365;EGYPTIAN HIEROGLYPH-14365;Lo;0;L;;;;;N;;;;; +14366;EGYPTIAN HIEROGLYPH-14366;Lo;0;L;;;;;N;;;;; +14367;EGYPTIAN HIEROGLYPH-14367;Lo;0;L;;;;;N;;;;; +14368;EGYPTIAN HIEROGLYPH-14368;Lo;0;L;;;;;N;;;;; +14369;EGYPTIAN HIEROGLYPH-14369;Lo;0;L;;;;;N;;;;; +1436A;EGYPTIAN HIEROGLYPH-1436A;Lo;0;L;;;;;N;;;;; +1436B;EGYPTIAN HIEROGLYPH-1436B;Lo;0;L;;;;;N;;;;; +1436C;EGYPTIAN HIEROGLYPH-1436C;Lo;0;L;;;;;N;;;;; +1436D;EGYPTIAN HIEROGLYPH-1436D;Lo;0;L;;;;;N;;;;; +1436E;EGYPTIAN HIEROGLYPH-1436E;Lo;0;L;;;;;N;;;;; +1436F;EGYPTIAN HIEROGLYPH-1436F;Lo;0;L;;;;;N;;;;; +14370;EGYPTIAN HIEROGLYPH-14370;Lo;0;L;;;;;N;;;;; +14371;EGYPTIAN HIEROGLYPH-14371;Lo;0;L;;;;;N;;;;; +14372;EGYPTIAN HIEROGLYPH-14372;Lo;0;L;;;;;N;;;;; +14373;EGYPTIAN HIEROGLYPH-14373;Lo;0;L;;;;;N;;;;; +14374;EGYPTIAN HIEROGLYPH-14374;Lo;0;L;;;;;N;;;;; +14375;EGYPTIAN HIEROGLYPH-14375;Lo;0;L;;;;;N;;;;; +14376;EGYPTIAN HIEROGLYPH-14376;Lo;0;L;;;;;N;;;;; +14377;EGYPTIAN HIEROGLYPH-14377;Lo;0;L;;;;;N;;;;; +14378;EGYPTIAN HIEROGLYPH-14378;Lo;0;L;;;;;N;;;;; +14379;EGYPTIAN HIEROGLYPH-14379;Lo;0;L;;;;;N;;;;; +1437A;EGYPTIAN HIEROGLYPH-1437A;Lo;0;L;;;;;N;;;;; +1437B;EGYPTIAN HIEROGLYPH-1437B;Lo;0;L;;;;;N;;;;; +1437C;EGYPTIAN HIEROGLYPH-1437C;Lo;0;L;;;;;N;;;;; +1437D;EGYPTIAN HIEROGLYPH-1437D;Lo;0;L;;;;;N;;;;; +1437E;EGYPTIAN HIEROGLYPH-1437E;Lo;0;L;;;;;N;;;;; +1437F;EGYPTIAN HIEROGLYPH-1437F;Lo;0;L;;;;;N;;;;; +14380;EGYPTIAN HIEROGLYPH-14380;Lo;0;L;;;;;N;;;;; +14381;EGYPTIAN HIEROGLYPH-14381;Lo;0;L;;;;;N;;;;; +14382;EGYPTIAN HIEROGLYPH-14382;Lo;0;L;;;;;N;;;;; +14383;EGYPTIAN HIEROGLYPH-14383;Lo;0;L;;;;;N;;;;; +14384;EGYPTIAN HIEROGLYPH-14384;Lo;0;L;;;;;N;;;;; +14385;EGYPTIAN HIEROGLYPH-14385;Lo;0;L;;;;;N;;;;; +14386;EGYPTIAN HIEROGLYPH-14386;Lo;0;L;;;;;N;;;;; +14387;EGYPTIAN HIEROGLYPH-14387;Lo;0;L;;;;;N;;;;; +14388;EGYPTIAN HIEROGLYPH-14388;Lo;0;L;;;;;N;;;;; +14389;EGYPTIAN HIEROGLYPH-14389;Lo;0;L;;;;;N;;;;; +1438A;EGYPTIAN HIEROGLYPH-1438A;Lo;0;L;;;;;N;;;;; +1438B;EGYPTIAN HIEROGLYPH-1438B;Lo;0;L;;;;;N;;;;; +1438C;EGYPTIAN HIEROGLYPH-1438C;Lo;0;L;;;;;N;;;;; +1438D;EGYPTIAN HIEROGLYPH-1438D;Lo;0;L;;;;;N;;;;; +1438E;EGYPTIAN HIEROGLYPH-1438E;Lo;0;L;;;;;N;;;;; +1438F;EGYPTIAN HIEROGLYPH-1438F;Lo;0;L;;;;;N;;;;; +14390;EGYPTIAN HIEROGLYPH-14390;Lo;0;L;;;;;N;;;;; +14391;EGYPTIAN HIEROGLYPH-14391;Lo;0;L;;;;;N;;;;; +14392;EGYPTIAN HIEROGLYPH-14392;Lo;0;L;;;;;N;;;;; +14393;EGYPTIAN HIEROGLYPH-14393;Lo;0;L;;;;;N;;;;; +14394;EGYPTIAN HIEROGLYPH-14394;Lo;0;L;;;;;N;;;;; +14395;EGYPTIAN HIEROGLYPH-14395;Lo;0;L;;;;;N;;;;; +14396;EGYPTIAN HIEROGLYPH-14396;Lo;0;L;;;;;N;;;;; +14397;EGYPTIAN HIEROGLYPH-14397;Lo;0;L;;;;;N;;;;; +14398;EGYPTIAN HIEROGLYPH-14398;Lo;0;L;;;;;N;;;;; +14399;EGYPTIAN HIEROGLYPH-14399;Lo;0;L;;;;;N;;;;; +1439A;EGYPTIAN HIEROGLYPH-1439A;Lo;0;L;;;;;N;;;;; +1439B;EGYPTIAN HIEROGLYPH-1439B;Lo;0;L;;;;;N;;;;; +1439C;EGYPTIAN HIEROGLYPH-1439C;Lo;0;L;;;;;N;;;;; +1439D;EGYPTIAN HIEROGLYPH-1439D;Lo;0;L;;;;;N;;;;; +1439E;EGYPTIAN HIEROGLYPH-1439E;Lo;0;L;;;;;N;;;;; +1439F;EGYPTIAN HIEROGLYPH-1439F;Lo;0;L;;;;;N;;;;; +143A0;EGYPTIAN HIEROGLYPH-143A0;Lo;0;L;;;;;N;;;;; +143A1;EGYPTIAN HIEROGLYPH-143A1;Lo;0;L;;;;;N;;;;; +143A2;EGYPTIAN HIEROGLYPH-143A2;Lo;0;L;;;;;N;;;;; +143A3;EGYPTIAN HIEROGLYPH-143A3;Lo;0;L;;;;;N;;;;; +143A4;EGYPTIAN HIEROGLYPH-143A4;Lo;0;L;;;;;N;;;;; +143A5;EGYPTIAN HIEROGLYPH-143A5;Lo;0;L;;;;;N;;;;; +143A6;EGYPTIAN HIEROGLYPH-143A6;Lo;0;L;;;;;N;;;;; +143A7;EGYPTIAN HIEROGLYPH-143A7;Lo;0;L;;;;;N;;;;; +143A8;EGYPTIAN HIEROGLYPH-143A8;Lo;0;L;;;;;N;;;;; +143A9;EGYPTIAN HIEROGLYPH-143A9;Lo;0;L;;;;;N;;;;; +143AA;EGYPTIAN HIEROGLYPH-143AA;Lo;0;L;;;;;N;;;;; +143AB;EGYPTIAN HIEROGLYPH-143AB;Lo;0;L;;;;;N;;;;; +143AC;EGYPTIAN HIEROGLYPH-143AC;Lo;0;L;;;;;N;;;;; +143AD;EGYPTIAN HIEROGLYPH-143AD;Lo;0;L;;;;;N;;;;; +143AE;EGYPTIAN HIEROGLYPH-143AE;Lo;0;L;;;;;N;;;;; +143AF;EGYPTIAN HIEROGLYPH-143AF;Lo;0;L;;;;;N;;;;; +143B0;EGYPTIAN HIEROGLYPH-143B0;Lo;0;L;;;;;N;;;;; +143B1;EGYPTIAN HIEROGLYPH-143B1;Lo;0;L;;;;;N;;;;; +143B2;EGYPTIAN HIEROGLYPH-143B2;Lo;0;L;;;;;N;;;;; +143B3;EGYPTIAN HIEROGLYPH-143B3;Lo;0;L;;;;;N;;;;; +143B4;EGYPTIAN HIEROGLYPH-143B4;Lo;0;L;;;;;N;;;;; +143B5;EGYPTIAN HIEROGLYPH-143B5;Lo;0;L;;;;;N;;;;; +143B6;EGYPTIAN HIEROGLYPH-143B6;Lo;0;L;;;;;N;;;;; +143B7;EGYPTIAN HIEROGLYPH-143B7;Lo;0;L;;;;;N;;;;; +143B8;EGYPTIAN HIEROGLYPH-143B8;Lo;0;L;;;;;N;;;;; +143B9;EGYPTIAN HIEROGLYPH-143B9;Lo;0;L;;;;;N;;;;; +143BA;EGYPTIAN HIEROGLYPH-143BA;Lo;0;L;;;;;N;;;;; +143BB;EGYPTIAN HIEROGLYPH-143BB;Lo;0;L;;;;;N;;;;; +143BC;EGYPTIAN HIEROGLYPH-143BC;Lo;0;L;;;;;N;;;;; +143BD;EGYPTIAN HIEROGLYPH-143BD;Lo;0;L;;;;;N;;;;; +143BE;EGYPTIAN HIEROGLYPH-143BE;Lo;0;L;;;;;N;;;;; +143BF;EGYPTIAN HIEROGLYPH-143BF;Lo;0;L;;;;;N;;;;; +143C0;EGYPTIAN HIEROGLYPH-143C0;Lo;0;L;;;;;N;;;;; +143C1;EGYPTIAN HIEROGLYPH-143C1;Lo;0;L;;;;;N;;;;; +143C2;EGYPTIAN HIEROGLYPH-143C2;Lo;0;L;;;;;N;;;;; +143C3;EGYPTIAN HIEROGLYPH-143C3;Lo;0;L;;;;;N;;;;; +143C4;EGYPTIAN HIEROGLYPH-143C4;Lo;0;L;;;;;N;;;;; +143C5;EGYPTIAN HIEROGLYPH-143C5;Lo;0;L;;;;;N;;;;; +143C6;EGYPTIAN HIEROGLYPH-143C6;Lo;0;L;;;;;N;;;;; +143C7;EGYPTIAN HIEROGLYPH-143C7;Lo;0;L;;;;;N;;;;; +143C8;EGYPTIAN HIEROGLYPH-143C8;Lo;0;L;;;;;N;;;;; +143C9;EGYPTIAN HIEROGLYPH-143C9;Lo;0;L;;;;;N;;;;; +143CA;EGYPTIAN HIEROGLYPH-143CA;Lo;0;L;;;;;N;;;;; +143CB;EGYPTIAN HIEROGLYPH-143CB;Lo;0;L;;;;;N;;;;; +143CC;EGYPTIAN HIEROGLYPH-143CC;Lo;0;L;;;;;N;;;;; +143CD;EGYPTIAN HIEROGLYPH-143CD;Lo;0;L;;;;;N;;;;; +143CE;EGYPTIAN HIEROGLYPH-143CE;Lo;0;L;;;;;N;;;;; +143CF;EGYPTIAN HIEROGLYPH-143CF;Lo;0;L;;;;;N;;;;; +143D0;EGYPTIAN HIEROGLYPH-143D0;Lo;0;L;;;;;N;;;;; +143D1;EGYPTIAN HIEROGLYPH-143D1;Lo;0;L;;;;;N;;;;; +143D2;EGYPTIAN HIEROGLYPH-143D2;Lo;0;L;;;;;N;;;;; +143D3;EGYPTIAN HIEROGLYPH-143D3;Lo;0;L;;;;;N;;;;; +143D4;EGYPTIAN HIEROGLYPH-143D4;Lo;0;L;;;;;N;;;;; +143D5;EGYPTIAN HIEROGLYPH-143D5;Lo;0;L;;;;;N;;;;; +143D6;EGYPTIAN HIEROGLYPH-143D6;Lo;0;L;;;;;N;;;;; +143D7;EGYPTIAN HIEROGLYPH-143D7;Lo;0;L;;;;;N;;;;; +143D8;EGYPTIAN HIEROGLYPH-143D8;Lo;0;L;;;;;N;;;;; +143D9;EGYPTIAN HIEROGLYPH-143D9;Lo;0;L;;;;;N;;;;; +143DA;EGYPTIAN HIEROGLYPH-143DA;Lo;0;L;;;;;N;;;;; +143DB;EGYPTIAN HIEROGLYPH-143DB;Lo;0;L;;;;;N;;;;; +143DC;EGYPTIAN HIEROGLYPH-143DC;Lo;0;L;;;;;N;;;;; +143DD;EGYPTIAN HIEROGLYPH-143DD;Lo;0;L;;;;;N;;;;; +143DE;EGYPTIAN HIEROGLYPH-143DE;Lo;0;L;;;;;N;;;;; +143DF;EGYPTIAN HIEROGLYPH-143DF;Lo;0;L;;;;;N;;;;; +143E0;EGYPTIAN HIEROGLYPH-143E0;Lo;0;L;;;;;N;;;;; +143E1;EGYPTIAN HIEROGLYPH-143E1;Lo;0;L;;;;;N;;;;; +143E2;EGYPTIAN HIEROGLYPH-143E2;Lo;0;L;;;;;N;;;;; +143E3;EGYPTIAN HIEROGLYPH-143E3;Lo;0;L;;;;;N;;;;; +143E4;EGYPTIAN HIEROGLYPH-143E4;Lo;0;L;;;;;N;;;;; +143E5;EGYPTIAN HIEROGLYPH-143E5;Lo;0;L;;;;;N;;;;; +143E6;EGYPTIAN HIEROGLYPH-143E6;Lo;0;L;;;;;N;;;;; +143E7;EGYPTIAN HIEROGLYPH-143E7;Lo;0;L;;;;;N;;;;; +143E8;EGYPTIAN HIEROGLYPH-143E8;Lo;0;L;;;;;N;;;;; +143E9;EGYPTIAN HIEROGLYPH-143E9;Lo;0;L;;;;;N;;;;; +143EA;EGYPTIAN HIEROGLYPH-143EA;Lo;0;L;;;;;N;;;;; +143EB;EGYPTIAN HIEROGLYPH-143EB;Lo;0;L;;;;;N;;;;; +143EC;EGYPTIAN HIEROGLYPH-143EC;Lo;0;L;;;;;N;;;;; +143ED;EGYPTIAN HIEROGLYPH-143ED;Lo;0;L;;;;;N;;;;; +143EE;EGYPTIAN HIEROGLYPH-143EE;Lo;0;L;;;;;N;;;;; +143EF;EGYPTIAN HIEROGLYPH-143EF;Lo;0;L;;;;;N;;;;; +143F0;EGYPTIAN HIEROGLYPH-143F0;Lo;0;L;;;;;N;;;;; +143F1;EGYPTIAN HIEROGLYPH-143F1;Lo;0;L;;;;;N;;;;; +143F2;EGYPTIAN HIEROGLYPH-143F2;Lo;0;L;;;;;N;;;;; +143F3;EGYPTIAN HIEROGLYPH-143F3;Lo;0;L;;;;;N;;;;; +143F4;EGYPTIAN HIEROGLYPH-143F4;Lo;0;L;;;;;N;;;;; +143F5;EGYPTIAN HIEROGLYPH-143F5;Lo;0;L;;;;;N;;;;; +143F6;EGYPTIAN HIEROGLYPH-143F6;Lo;0;L;;;;;N;;;;; +143F7;EGYPTIAN HIEROGLYPH-143F7;Lo;0;L;;;;;N;;;;; +143F8;EGYPTIAN HIEROGLYPH-143F8;Lo;0;L;;;;;N;;;;; +143F9;EGYPTIAN HIEROGLYPH-143F9;Lo;0;L;;;;;N;;;;; +143FA;EGYPTIAN HIEROGLYPH-143FA;Lo;0;L;;;;;N;;;;; +14400;ANATOLIAN HIEROGLYPH A001;Lo;0;L;;;;;N;;;;; +14401;ANATOLIAN HIEROGLYPH A002;Lo;0;L;;;;;N;;;;; +14402;ANATOLIAN HIEROGLYPH A003;Lo;0;L;;;;;N;;;;; +14403;ANATOLIAN HIEROGLYPH A004;Lo;0;L;;;;;N;;;;; +14404;ANATOLIAN HIEROGLYPH A005;Lo;0;L;;;;;N;;;;; +14405;ANATOLIAN HIEROGLYPH A006;Lo;0;L;;;;;N;;;;; +14406;ANATOLIAN HIEROGLYPH A007;Lo;0;L;;;;;N;;;;; +14407;ANATOLIAN HIEROGLYPH A008;Lo;0;L;;;;;N;;;;; +14408;ANATOLIAN HIEROGLYPH A009;Lo;0;L;;;;;N;;;;; +14409;ANATOLIAN HIEROGLYPH A010;Lo;0;L;;;;;N;;;;; +1440A;ANATOLIAN HIEROGLYPH A010A;Lo;0;L;;;;;N;;;;; +1440B;ANATOLIAN HIEROGLYPH A011;Lo;0;L;;;;;N;;;;; +1440C;ANATOLIAN HIEROGLYPH A012;Lo;0;L;;;;;N;;;;; +1440D;ANATOLIAN HIEROGLYPH A013;Lo;0;L;;;;;N;;;;; +1440E;ANATOLIAN HIEROGLYPH A014;Lo;0;L;;;;;N;;;;; +1440F;ANATOLIAN HIEROGLYPH A015;Lo;0;L;;;;;N;;;;; +14410;ANATOLIAN HIEROGLYPH A016;Lo;0;L;;;;;N;;;;; +14411;ANATOLIAN HIEROGLYPH A017;Lo;0;L;;;;;N;;;;; +14412;ANATOLIAN HIEROGLYPH A018;Lo;0;L;;;;;N;;;;; +14413;ANATOLIAN HIEROGLYPH A019;Lo;0;L;;;;;N;;;;; +14414;ANATOLIAN HIEROGLYPH A020;Lo;0;L;;;;;N;;;;; +14415;ANATOLIAN HIEROGLYPH A021;Lo;0;L;;;;;N;;;;; +14416;ANATOLIAN HIEROGLYPH A022;Lo;0;L;;;;;N;;;;; +14417;ANATOLIAN HIEROGLYPH A023;Lo;0;L;;;;;N;;;;; +14418;ANATOLIAN HIEROGLYPH A024;Lo;0;L;;;;;N;;;;; +14419;ANATOLIAN HIEROGLYPH A025;Lo;0;L;;;;;N;;;;; +1441A;ANATOLIAN HIEROGLYPH A026;Lo;0;L;;;;;N;;;;; +1441B;ANATOLIAN HIEROGLYPH A026A;Lo;0;L;;;;;N;;;;; +1441C;ANATOLIAN HIEROGLYPH A027;Lo;0;L;;;;;N;;;;; +1441D;ANATOLIAN HIEROGLYPH A028;Lo;0;L;;;;;N;;;;; +1441E;ANATOLIAN HIEROGLYPH A029;Lo;0;L;;;;;N;;;;; +1441F;ANATOLIAN HIEROGLYPH A030;Lo;0;L;;;;;N;;;;; +14420;ANATOLIAN HIEROGLYPH A031;Lo;0;L;;;;;N;;;;; +14421;ANATOLIAN HIEROGLYPH A032;Lo;0;L;;;;;N;;;;; +14422;ANATOLIAN HIEROGLYPH A033;Lo;0;L;;;;;N;;;;; +14423;ANATOLIAN HIEROGLYPH A034;Lo;0;L;;;;;N;;;;; +14424;ANATOLIAN HIEROGLYPH A035;Lo;0;L;;;;;N;;;;; +14425;ANATOLIAN HIEROGLYPH A036;Lo;0;L;;;;;N;;;;; +14426;ANATOLIAN HIEROGLYPH A037;Lo;0;L;;;;;N;;;;; +14427;ANATOLIAN HIEROGLYPH A038;Lo;0;L;;;;;N;;;;; +14428;ANATOLIAN HIEROGLYPH A039;Lo;0;L;;;;;N;;;;; +14429;ANATOLIAN HIEROGLYPH A039A;Lo;0;L;;;;;N;;;;; +1442A;ANATOLIAN HIEROGLYPH A040;Lo;0;L;;;;;N;;;;; +1442B;ANATOLIAN HIEROGLYPH A041;Lo;0;L;;;;;N;;;;; +1442C;ANATOLIAN HIEROGLYPH A041A;Lo;0;L;;;;;N;;;;; +1442D;ANATOLIAN HIEROGLYPH A042;Lo;0;L;;;;;N;;;;; +1442E;ANATOLIAN HIEROGLYPH A043;Lo;0;L;;;;;N;;;;; +1442F;ANATOLIAN HIEROGLYPH A044;Lo;0;L;;;;;N;;;;; +14430;ANATOLIAN HIEROGLYPH A045;Lo;0;L;;;;;N;;;;; +14431;ANATOLIAN HIEROGLYPH A045A;Lo;0;L;;;;;N;;;;; +14432;ANATOLIAN HIEROGLYPH A046;Lo;0;L;;;;;N;;;;; +14433;ANATOLIAN HIEROGLYPH A046A;Lo;0;L;;;;;N;;;;; +14434;ANATOLIAN HIEROGLYPH A046B;Lo;0;L;;;;;N;;;;; +14435;ANATOLIAN HIEROGLYPH A047;Lo;0;L;;;;;N;;;;; +14436;ANATOLIAN HIEROGLYPH A048;Lo;0;L;;;;;N;;;;; +14437;ANATOLIAN HIEROGLYPH A049;Lo;0;L;;;;;N;;;;; +14438;ANATOLIAN HIEROGLYPH A050;Lo;0;L;;;;;N;;;;; +14439;ANATOLIAN HIEROGLYPH A051;Lo;0;L;;;;;N;;;;; +1443A;ANATOLIAN HIEROGLYPH A052;Lo;0;L;;;;;N;;;;; +1443B;ANATOLIAN HIEROGLYPH A053;Lo;0;L;;;;;N;;;;; +1443C;ANATOLIAN HIEROGLYPH A054;Lo;0;L;;;;;N;;;;; +1443D;ANATOLIAN HIEROGLYPH A055;Lo;0;L;;;;;N;;;;; +1443E;ANATOLIAN HIEROGLYPH A056;Lo;0;L;;;;;N;;;;; +1443F;ANATOLIAN HIEROGLYPH A057;Lo;0;L;;;;;N;;;;; +14440;ANATOLIAN HIEROGLYPH A058;Lo;0;L;;;;;N;;;;; +14441;ANATOLIAN HIEROGLYPH A059;Lo;0;L;;;;;N;;;;; +14442;ANATOLIAN HIEROGLYPH A060;Lo;0;L;;;;;N;;;;; +14443;ANATOLIAN HIEROGLYPH A061;Lo;0;L;;;;;N;;;;; +14444;ANATOLIAN HIEROGLYPH A062;Lo;0;L;;;;;N;;;;; +14445;ANATOLIAN HIEROGLYPH A063;Lo;0;L;;;;;N;;;;; +14446;ANATOLIAN HIEROGLYPH A064;Lo;0;L;;;;;N;;;;; +14447;ANATOLIAN HIEROGLYPH A065;Lo;0;L;;;;;N;;;;; +14448;ANATOLIAN HIEROGLYPH A066;Lo;0;L;;;;;N;;;;; +14449;ANATOLIAN HIEROGLYPH A066A;Lo;0;L;;;;;N;;;;; +1444A;ANATOLIAN HIEROGLYPH A066B;Lo;0;L;;;;;N;;;;; +1444B;ANATOLIAN HIEROGLYPH A066C;Lo;0;L;;;;;N;;;;; +1444C;ANATOLIAN HIEROGLYPH A067;Lo;0;L;;;;;N;;;;; +1444D;ANATOLIAN HIEROGLYPH A068;Lo;0;L;;;;;N;;;;; +1444E;ANATOLIAN HIEROGLYPH A069;Lo;0;L;;;;;N;;;;; +1444F;ANATOLIAN HIEROGLYPH A070;Lo;0;L;;;;;N;;;;; +14450;ANATOLIAN HIEROGLYPH A071;Lo;0;L;;;;;N;;;;; +14451;ANATOLIAN HIEROGLYPH A072;Lo;0;L;;;;;N;;;;; +14452;ANATOLIAN HIEROGLYPH A073;Lo;0;L;;;;;N;;;;; +14453;ANATOLIAN HIEROGLYPH A074;Lo;0;L;;;;;N;;;;; +14454;ANATOLIAN HIEROGLYPH A075;Lo;0;L;;;;;N;;;;; +14455;ANATOLIAN HIEROGLYPH A076;Lo;0;L;;;;;N;;;;; +14456;ANATOLIAN HIEROGLYPH A077;Lo;0;L;;;;;N;;;;; +14457;ANATOLIAN HIEROGLYPH A078;Lo;0;L;;;;;N;;;;; +14458;ANATOLIAN HIEROGLYPH A079;Lo;0;L;;;;;N;;;;; +14459;ANATOLIAN HIEROGLYPH A080;Lo;0;L;;;;;N;;;;; +1445A;ANATOLIAN HIEROGLYPH A081;Lo;0;L;;;;;N;;;;; +1445B;ANATOLIAN HIEROGLYPH A082;Lo;0;L;;;;;N;;;;; +1445C;ANATOLIAN HIEROGLYPH A083;Lo;0;L;;;;;N;;;;; +1445D;ANATOLIAN HIEROGLYPH A084;Lo;0;L;;;;;N;;;;; +1445E;ANATOLIAN HIEROGLYPH A085;Lo;0;L;;;;;N;;;;; +1445F;ANATOLIAN HIEROGLYPH A086;Lo;0;L;;;;;N;;;;; +14460;ANATOLIAN HIEROGLYPH A087;Lo;0;L;;;;;N;;;;; +14461;ANATOLIAN HIEROGLYPH A088;Lo;0;L;;;;;N;;;;; +14462;ANATOLIAN HIEROGLYPH A089;Lo;0;L;;;;;N;;;;; +14463;ANATOLIAN HIEROGLYPH A090;Lo;0;L;;;;;N;;;;; +14464;ANATOLIAN HIEROGLYPH A091;Lo;0;L;;;;;N;;;;; +14465;ANATOLIAN HIEROGLYPH A092;Lo;0;L;;;;;N;;;;; +14466;ANATOLIAN HIEROGLYPH A093;Lo;0;L;;;;;N;;;;; +14467;ANATOLIAN HIEROGLYPH A094;Lo;0;L;;;;;N;;;;; +14468;ANATOLIAN HIEROGLYPH A095;Lo;0;L;;;;;N;;;;; +14469;ANATOLIAN HIEROGLYPH A096;Lo;0;L;;;;;N;;;;; +1446A;ANATOLIAN HIEROGLYPH A097;Lo;0;L;;;;;N;;;;; +1446B;ANATOLIAN HIEROGLYPH A097A;Lo;0;L;;;;;N;;;;; +1446C;ANATOLIAN HIEROGLYPH A098;Lo;0;L;;;;;N;;;;; +1446D;ANATOLIAN HIEROGLYPH A098A;Lo;0;L;;;;;N;;;;; +1446E;ANATOLIAN HIEROGLYPH A099;Lo;0;L;;;;;N;;;;; +1446F;ANATOLIAN HIEROGLYPH A100;Lo;0;L;;;;;N;;;;; +14470;ANATOLIAN HIEROGLYPH A100A;Lo;0;L;;;;;N;;;;; +14471;ANATOLIAN HIEROGLYPH A101;Lo;0;L;;;;;N;;;;; +14472;ANATOLIAN HIEROGLYPH A101A;Lo;0;L;;;;;N;;;;; +14473;ANATOLIAN HIEROGLYPH A102;Lo;0;L;;;;;N;;;;; +14474;ANATOLIAN HIEROGLYPH A102A;Lo;0;L;;;;;N;;;;; +14475;ANATOLIAN HIEROGLYPH A103;Lo;0;L;;;;;N;;;;; +14476;ANATOLIAN HIEROGLYPH A104;Lo;0;L;;;;;N;;;;; +14477;ANATOLIAN HIEROGLYPH A104A;Lo;0;L;;;;;N;;;;; +14478;ANATOLIAN HIEROGLYPH A104B;Lo;0;L;;;;;N;;;;; +14479;ANATOLIAN HIEROGLYPH A104C;Lo;0;L;;;;;N;;;;; +1447A;ANATOLIAN HIEROGLYPH A105;Lo;0;L;;;;;N;;;;; +1447B;ANATOLIAN HIEROGLYPH A105A;Lo;0;L;;;;;N;;;;; +1447C;ANATOLIAN HIEROGLYPH A105B;Lo;0;L;;;;;N;;;;; +1447D;ANATOLIAN HIEROGLYPH A106;Lo;0;L;;;;;N;;;;; +1447E;ANATOLIAN HIEROGLYPH A107;Lo;0;L;;;;;N;;;;; +1447F;ANATOLIAN HIEROGLYPH A107A;Lo;0;L;;;;;N;;;;; +14480;ANATOLIAN HIEROGLYPH A107B;Lo;0;L;;;;;N;;;;; +14481;ANATOLIAN HIEROGLYPH A107C;Lo;0;L;;;;;N;;;;; +14482;ANATOLIAN HIEROGLYPH A108;Lo;0;L;;;;;N;;;;; +14483;ANATOLIAN HIEROGLYPH A109;Lo;0;L;;;;;N;;;;; +14484;ANATOLIAN HIEROGLYPH A110;Lo;0;L;;;;;N;;;;; +14485;ANATOLIAN HIEROGLYPH A110A;Lo;0;L;;;;;N;;;;; +14486;ANATOLIAN HIEROGLYPH A110B;Lo;0;L;;;;;N;;;;; +14487;ANATOLIAN HIEROGLYPH A111;Lo;0;L;;;;;N;;;;; +14488;ANATOLIAN HIEROGLYPH A112;Lo;0;L;;;;;N;;;;; +14489;ANATOLIAN HIEROGLYPH A113;Lo;0;L;;;;;N;;;;; +1448A;ANATOLIAN HIEROGLYPH A114;Lo;0;L;;;;;N;;;;; +1448B;ANATOLIAN HIEROGLYPH A115;Lo;0;L;;;;;N;;;;; +1448C;ANATOLIAN HIEROGLYPH A115A;Lo;0;L;;;;;N;;;;; +1448D;ANATOLIAN HIEROGLYPH A116;Lo;0;L;;;;;N;;;;; +1448E;ANATOLIAN HIEROGLYPH A117;Lo;0;L;;;;;N;;;;; +1448F;ANATOLIAN HIEROGLYPH A118;Lo;0;L;;;;;N;;;;; +14490;ANATOLIAN HIEROGLYPH A119;Lo;0;L;;;;;N;;;;; +14491;ANATOLIAN HIEROGLYPH A120;Lo;0;L;;;;;N;;;;; +14492;ANATOLIAN HIEROGLYPH A121;Lo;0;L;;;;;N;;;;; +14493;ANATOLIAN HIEROGLYPH A122;Lo;0;L;;;;;N;;;;; +14494;ANATOLIAN HIEROGLYPH A123;Lo;0;L;;;;;N;;;;; +14495;ANATOLIAN HIEROGLYPH A124;Lo;0;L;;;;;N;;;;; +14496;ANATOLIAN HIEROGLYPH A125;Lo;0;L;;;;;N;;;;; +14497;ANATOLIAN HIEROGLYPH A125A;Lo;0;L;;;;;N;;;;; +14498;ANATOLIAN HIEROGLYPH A126;Lo;0;L;;;;;N;;;;; +14499;ANATOLIAN HIEROGLYPH A127;Lo;0;L;;;;;N;;;;; +1449A;ANATOLIAN HIEROGLYPH A128;Lo;0;L;;;;;N;;;;; +1449B;ANATOLIAN HIEROGLYPH A129;Lo;0;L;;;;;N;;;;; +1449C;ANATOLIAN HIEROGLYPH A130;Lo;0;L;;;;;N;;;;; +1449D;ANATOLIAN HIEROGLYPH A131;Lo;0;L;;;;;N;;;;; +1449E;ANATOLIAN HIEROGLYPH A132;Lo;0;L;;;;;N;;;;; +1449F;ANATOLIAN HIEROGLYPH A133;Lo;0;L;;;;;N;;;;; +144A0;ANATOLIAN HIEROGLYPH A134;Lo;0;L;;;;;N;;;;; +144A1;ANATOLIAN HIEROGLYPH A135;Lo;0;L;;;;;N;;;;; +144A2;ANATOLIAN HIEROGLYPH A135A;Lo;0;L;;;;;N;;;;; +144A3;ANATOLIAN HIEROGLYPH A136;Lo;0;L;;;;;N;;;;; +144A4;ANATOLIAN HIEROGLYPH A137;Lo;0;L;;;;;N;;;;; +144A5;ANATOLIAN HIEROGLYPH A138;Lo;0;L;;;;;N;;;;; +144A6;ANATOLIAN HIEROGLYPH A139;Lo;0;L;;;;;N;;;;; +144A7;ANATOLIAN HIEROGLYPH A140;Lo;0;L;;;;;N;;;;; +144A8;ANATOLIAN HIEROGLYPH A141;Lo;0;L;;;;;N;;;;; +144A9;ANATOLIAN HIEROGLYPH A142;Lo;0;L;;;;;N;;;;; +144AA;ANATOLIAN HIEROGLYPH A143;Lo;0;L;;;;;N;;;;; +144AB;ANATOLIAN HIEROGLYPH A144;Lo;0;L;;;;;N;;;;; +144AC;ANATOLIAN HIEROGLYPH A145;Lo;0;L;;;;;N;;;;; +144AD;ANATOLIAN HIEROGLYPH A146;Lo;0;L;;;;;N;;;;; +144AE;ANATOLIAN HIEROGLYPH A147;Lo;0;L;;;;;N;;;;; +144AF;ANATOLIAN HIEROGLYPH A148;Lo;0;L;;;;;N;;;;; +144B0;ANATOLIAN HIEROGLYPH A149;Lo;0;L;;;;;N;;;;; +144B1;ANATOLIAN HIEROGLYPH A150;Lo;0;L;;;;;N;;;;; +144B2;ANATOLIAN HIEROGLYPH A151;Lo;0;L;;;;;N;;;;; +144B3;ANATOLIAN HIEROGLYPH A152;Lo;0;L;;;;;N;;;;; +144B4;ANATOLIAN HIEROGLYPH A153;Lo;0;L;;;;;N;;;;; +144B5;ANATOLIAN HIEROGLYPH A154;Lo;0;L;;;;;N;;;;; +144B6;ANATOLIAN HIEROGLYPH A155;Lo;0;L;;;;;N;;;;; +144B7;ANATOLIAN HIEROGLYPH A156;Lo;0;L;;;;;N;;;;; +144B8;ANATOLIAN HIEROGLYPH A157;Lo;0;L;;;;;N;;;;; +144B9;ANATOLIAN HIEROGLYPH A158;Lo;0;L;;;;;N;;;;; +144BA;ANATOLIAN HIEROGLYPH A159;Lo;0;L;;;;;N;;;;; +144BB;ANATOLIAN HIEROGLYPH A160;Lo;0;L;;;;;N;;;;; +144BC;ANATOLIAN HIEROGLYPH A161;Lo;0;L;;;;;N;;;;; +144BD;ANATOLIAN HIEROGLYPH A162;Lo;0;L;;;;;N;;;;; +144BE;ANATOLIAN HIEROGLYPH A163;Lo;0;L;;;;;N;;;;; +144BF;ANATOLIAN HIEROGLYPH A164;Lo;0;L;;;;;N;;;;; +144C0;ANATOLIAN HIEROGLYPH A165;Lo;0;L;;;;;N;;;;; +144C1;ANATOLIAN HIEROGLYPH A166;Lo;0;L;;;;;N;;;;; +144C2;ANATOLIAN HIEROGLYPH A167;Lo;0;L;;;;;N;;;;; +144C3;ANATOLIAN HIEROGLYPH A168;Lo;0;L;;;;;N;;;;; +144C4;ANATOLIAN HIEROGLYPH A169;Lo;0;L;;;;;N;;;;; +144C5;ANATOLIAN HIEROGLYPH A170;Lo;0;L;;;;;N;;;;; +144C6;ANATOLIAN HIEROGLYPH A171;Lo;0;L;;;;;N;;;;; +144C7;ANATOLIAN HIEROGLYPH A172;Lo;0;L;;;;;N;;;;; +144C8;ANATOLIAN HIEROGLYPH A173;Lo;0;L;;;;;N;;;;; +144C9;ANATOLIAN HIEROGLYPH A174;Lo;0;L;;;;;N;;;;; +144CA;ANATOLIAN HIEROGLYPH A175;Lo;0;L;;;;;N;;;;; +144CB;ANATOLIAN HIEROGLYPH A176;Lo;0;L;;;;;N;;;;; +144CC;ANATOLIAN HIEROGLYPH A177;Lo;0;L;;;;;N;;;;; +144CD;ANATOLIAN HIEROGLYPH A178;Lo;0;L;;;;;N;;;;; +144CE;ANATOLIAN HIEROGLYPH A179;Lo;0;L;;;;;N;;;;; +144CF;ANATOLIAN HIEROGLYPH A180;Lo;0;L;;;;;N;;;;; +144D0;ANATOLIAN HIEROGLYPH A181;Lo;0;L;;;;;N;;;;; +144D1;ANATOLIAN HIEROGLYPH A182;Lo;0;L;;;;;N;;;;; +144D2;ANATOLIAN HIEROGLYPH A183;Lo;0;L;;;;;N;;;;; +144D3;ANATOLIAN HIEROGLYPH A184;Lo;0;L;;;;;N;;;;; +144D4;ANATOLIAN HIEROGLYPH A185;Lo;0;L;;;;;N;;;;; +144D5;ANATOLIAN HIEROGLYPH A186;Lo;0;L;;;;;N;;;;; +144D6;ANATOLIAN HIEROGLYPH A187;Lo;0;L;;;;;N;;;;; +144D7;ANATOLIAN HIEROGLYPH A188;Lo;0;L;;;;;N;;;;; +144D8;ANATOLIAN HIEROGLYPH A189;Lo;0;L;;;;;N;;;;; +144D9;ANATOLIAN HIEROGLYPH A190;Lo;0;L;;;;;N;;;;; +144DA;ANATOLIAN HIEROGLYPH A191;Lo;0;L;;;;;N;;;;; +144DB;ANATOLIAN HIEROGLYPH A192;Lo;0;L;;;;;N;;;;; +144DC;ANATOLIAN HIEROGLYPH A193;Lo;0;L;;;;;N;;;;; +144DD;ANATOLIAN HIEROGLYPH A194;Lo;0;L;;;;;N;;;;; +144DE;ANATOLIAN HIEROGLYPH A195;Lo;0;L;;;;;N;;;;; +144DF;ANATOLIAN HIEROGLYPH A196;Lo;0;L;;;;;N;;;;; +144E0;ANATOLIAN HIEROGLYPH A197;Lo;0;L;;;;;N;;;;; +144E1;ANATOLIAN HIEROGLYPH A198;Lo;0;L;;;;;N;;;;; +144E2;ANATOLIAN HIEROGLYPH A199;Lo;0;L;;;;;N;;;;; +144E3;ANATOLIAN HIEROGLYPH A200;Lo;0;L;;;;;N;;;;; +144E4;ANATOLIAN HIEROGLYPH A201;Lo;0;L;;;;;N;;;;; +144E5;ANATOLIAN HIEROGLYPH A202;Lo;0;L;;;;;N;;;;; +144E6;ANATOLIAN HIEROGLYPH A202A;Lo;0;L;;;;;N;;;;; +144E7;ANATOLIAN HIEROGLYPH A202B;Lo;0;L;;;;;N;;;;; +144E8;ANATOLIAN HIEROGLYPH A203;Lo;0;L;;;;;N;;;;; +144E9;ANATOLIAN HIEROGLYPH A204;Lo;0;L;;;;;N;;;;; +144EA;ANATOLIAN HIEROGLYPH A205;Lo;0;L;;;;;N;;;;; +144EB;ANATOLIAN HIEROGLYPH A206;Lo;0;L;;;;;N;;;;; +144EC;ANATOLIAN HIEROGLYPH A207;Lo;0;L;;;;;N;;;;; +144ED;ANATOLIAN HIEROGLYPH A207A;Lo;0;L;;;;;N;;;;; +144EE;ANATOLIAN HIEROGLYPH A208;Lo;0;L;;;;;N;;;;; +144EF;ANATOLIAN HIEROGLYPH A209;Lo;0;L;;;;;N;;;;; +144F0;ANATOLIAN HIEROGLYPH A209A;Lo;0;L;;;;;N;;;;; +144F1;ANATOLIAN HIEROGLYPH A210;Lo;0;L;;;;;N;;;;; +144F2;ANATOLIAN HIEROGLYPH A211;Lo;0;L;;;;;N;;;;; +144F3;ANATOLIAN HIEROGLYPH A212;Lo;0;L;;;;;N;;;;; +144F4;ANATOLIAN HIEROGLYPH A213;Lo;0;L;;;;;N;;;;; +144F5;ANATOLIAN HIEROGLYPH A214;Lo;0;L;;;;;N;;;;; +144F6;ANATOLIAN HIEROGLYPH A215;Lo;0;L;;;;;N;;;;; +144F7;ANATOLIAN HIEROGLYPH A215A;Lo;0;L;;;;;N;;;;; +144F8;ANATOLIAN HIEROGLYPH A216;Lo;0;L;;;;;N;;;;; +144F9;ANATOLIAN HIEROGLYPH A216A;Lo;0;L;;;;;N;;;;; +144FA;ANATOLIAN HIEROGLYPH A217;Lo;0;L;;;;;N;;;;; +144FB;ANATOLIAN HIEROGLYPH A218;Lo;0;L;;;;;N;;;;; +144FC;ANATOLIAN HIEROGLYPH A219;Lo;0;L;;;;;N;;;;; +144FD;ANATOLIAN HIEROGLYPH A220;Lo;0;L;;;;;N;;;;; +144FE;ANATOLIAN HIEROGLYPH A221;Lo;0;L;;;;;N;;;;; +144FF;ANATOLIAN HIEROGLYPH A222;Lo;0;L;;;;;N;;;;; +14500;ANATOLIAN HIEROGLYPH A223;Lo;0;L;;;;;N;;;;; +14501;ANATOLIAN HIEROGLYPH A224;Lo;0;L;;;;;N;;;;; +14502;ANATOLIAN HIEROGLYPH A225;Lo;0;L;;;;;N;;;;; +14503;ANATOLIAN HIEROGLYPH A226;Lo;0;L;;;;;N;;;;; +14504;ANATOLIAN HIEROGLYPH A227;Lo;0;L;;;;;N;;;;; +14505;ANATOLIAN HIEROGLYPH A227A;Lo;0;L;;;;;N;;;;; +14506;ANATOLIAN HIEROGLYPH A228;Lo;0;L;;;;;N;;;;; +14507;ANATOLIAN HIEROGLYPH A229;Lo;0;L;;;;;N;;;;; +14508;ANATOLIAN HIEROGLYPH A230;Lo;0;L;;;;;N;;;;; +14509;ANATOLIAN HIEROGLYPH A231;Lo;0;L;;;;;N;;;;; +1450A;ANATOLIAN HIEROGLYPH A232;Lo;0;L;;;;;N;;;;; +1450B;ANATOLIAN HIEROGLYPH A233;Lo;0;L;;;;;N;;;;; +1450C;ANATOLIAN HIEROGLYPH A234;Lo;0;L;;;;;N;;;;; +1450D;ANATOLIAN HIEROGLYPH A235;Lo;0;L;;;;;N;;;;; +1450E;ANATOLIAN HIEROGLYPH A236;Lo;0;L;;;;;N;;;;; +1450F;ANATOLIAN HIEROGLYPH A237;Lo;0;L;;;;;N;;;;; +14510;ANATOLIAN HIEROGLYPH A238;Lo;0;L;;;;;N;;;;; +14511;ANATOLIAN HIEROGLYPH A239;Lo;0;L;;;;;N;;;;; +14512;ANATOLIAN HIEROGLYPH A240;Lo;0;L;;;;;N;;;;; +14513;ANATOLIAN HIEROGLYPH A241;Lo;0;L;;;;;N;;;;; +14514;ANATOLIAN HIEROGLYPH A242;Lo;0;L;;;;;N;;;;; +14515;ANATOLIAN HIEROGLYPH A243;Lo;0;L;;;;;N;;;;; +14516;ANATOLIAN HIEROGLYPH A244;Lo;0;L;;;;;N;;;;; +14517;ANATOLIAN HIEROGLYPH A245;Lo;0;L;;;;;N;;;;; +14518;ANATOLIAN HIEROGLYPH A246;Lo;0;L;;;;;N;;;;; +14519;ANATOLIAN HIEROGLYPH A247;Lo;0;L;;;;;N;;;;; +1451A;ANATOLIAN HIEROGLYPH A248;Lo;0;L;;;;;N;;;;; +1451B;ANATOLIAN HIEROGLYPH A249;Lo;0;L;;;;;N;;;;; +1451C;ANATOLIAN HIEROGLYPH A250;Lo;0;L;;;;;N;;;;; +1451D;ANATOLIAN HIEROGLYPH A251;Lo;0;L;;;;;N;;;;; +1451E;ANATOLIAN HIEROGLYPH A252;Lo;0;L;;;;;N;;;;; +1451F;ANATOLIAN HIEROGLYPH A253;Lo;0;L;;;;;N;;;;; +14520;ANATOLIAN HIEROGLYPH A254;Lo;0;L;;;;;N;;;;; +14521;ANATOLIAN HIEROGLYPH A255;Lo;0;L;;;;;N;;;;; +14522;ANATOLIAN HIEROGLYPH A256;Lo;0;L;;;;;N;;;;; +14523;ANATOLIAN HIEROGLYPH A257;Lo;0;L;;;;;N;;;;; +14524;ANATOLIAN HIEROGLYPH A258;Lo;0;L;;;;;N;;;;; +14525;ANATOLIAN HIEROGLYPH A259;Lo;0;L;;;;;N;;;;; +14526;ANATOLIAN HIEROGLYPH A260;Lo;0;L;;;;;N;;;;; +14527;ANATOLIAN HIEROGLYPH A261;Lo;0;L;;;;;N;;;;; +14528;ANATOLIAN HIEROGLYPH A262;Lo;0;L;;;;;N;;;;; +14529;ANATOLIAN HIEROGLYPH A263;Lo;0;L;;;;;N;;;;; +1452A;ANATOLIAN HIEROGLYPH A264;Lo;0;L;;;;;N;;;;; +1452B;ANATOLIAN HIEROGLYPH A265;Lo;0;L;;;;;N;;;;; +1452C;ANATOLIAN HIEROGLYPH A266;Lo;0;L;;;;;N;;;;; +1452D;ANATOLIAN HIEROGLYPH A267;Lo;0;L;;;;;N;;;;; +1452E;ANATOLIAN HIEROGLYPH A267A;Lo;0;L;;;;;N;;;;; +1452F;ANATOLIAN HIEROGLYPH A268;Lo;0;L;;;;;N;;;;; +14530;ANATOLIAN HIEROGLYPH A269;Lo;0;L;;;;;N;;;;; +14531;ANATOLIAN HIEROGLYPH A270;Lo;0;L;;;;;N;;;;; +14532;ANATOLIAN HIEROGLYPH A271;Lo;0;L;;;;;N;;;;; +14533;ANATOLIAN HIEROGLYPH A272;Lo;0;L;;;;;N;;;;; +14534;ANATOLIAN HIEROGLYPH A273;Lo;0;L;;;;;N;;;;; +14535;ANATOLIAN HIEROGLYPH A274;Lo;0;L;;;;;N;;;;; +14536;ANATOLIAN HIEROGLYPH A275;Lo;0;L;;;;;N;;;;; +14537;ANATOLIAN HIEROGLYPH A276;Lo;0;L;;;;;N;;;;; +14538;ANATOLIAN HIEROGLYPH A277;Lo;0;L;;;;;N;;;;; +14539;ANATOLIAN HIEROGLYPH A278;Lo;0;L;;;;;N;;;;; +1453A;ANATOLIAN HIEROGLYPH A279;Lo;0;L;;;;;N;;;;; +1453B;ANATOLIAN HIEROGLYPH A280;Lo;0;L;;;;;N;;;;; +1453C;ANATOLIAN HIEROGLYPH A281;Lo;0;L;;;;;N;;;;; +1453D;ANATOLIAN HIEROGLYPH A282;Lo;0;L;;;;;N;;;;; +1453E;ANATOLIAN HIEROGLYPH A283;Lo;0;L;;;;;N;;;;; +1453F;ANATOLIAN HIEROGLYPH A284;Lo;0;L;;;;;N;;;;; +14540;ANATOLIAN HIEROGLYPH A285;Lo;0;L;;;;;N;;;;; +14541;ANATOLIAN HIEROGLYPH A286;Lo;0;L;;;;;N;;;;; +14542;ANATOLIAN HIEROGLYPH A287;Lo;0;L;;;;;N;;;;; +14543;ANATOLIAN HIEROGLYPH A288;Lo;0;L;;;;;N;;;;; +14544;ANATOLIAN HIEROGLYPH A289;Lo;0;L;;;;;N;;;;; +14545;ANATOLIAN HIEROGLYPH A289A;Lo;0;L;;;;;N;;;;; +14546;ANATOLIAN HIEROGLYPH A290;Lo;0;L;;;;;N;;;;; +14547;ANATOLIAN HIEROGLYPH A291;Lo;0;L;;;;;N;;;;; +14548;ANATOLIAN HIEROGLYPH A292;Lo;0;L;;;;;N;;;;; +14549;ANATOLIAN HIEROGLYPH A293;Lo;0;L;;;;;N;;;;; +1454A;ANATOLIAN HIEROGLYPH A294;Lo;0;L;;;;;N;;;;; +1454B;ANATOLIAN HIEROGLYPH A294A;Lo;0;L;;;;;N;;;;; +1454C;ANATOLIAN HIEROGLYPH A295;Lo;0;L;;;;;N;;;;; +1454D;ANATOLIAN HIEROGLYPH A296;Lo;0;L;;;;;N;;;;; +1454E;ANATOLIAN HIEROGLYPH A297;Lo;0;L;;;;;N;;;;; +1454F;ANATOLIAN HIEROGLYPH A298;Lo;0;L;;;;;N;;;;; +14550;ANATOLIAN HIEROGLYPH A299;Lo;0;L;;;;;N;;;;; +14551;ANATOLIAN HIEROGLYPH A299A;Lo;0;L;;;;;N;;;;; +14552;ANATOLIAN HIEROGLYPH A300;Lo;0;L;;;;;N;;;;; +14553;ANATOLIAN HIEROGLYPH A301;Lo;0;L;;;;;N;;;;; +14554;ANATOLIAN HIEROGLYPH A302;Lo;0;L;;;;;N;;;;; +14555;ANATOLIAN HIEROGLYPH A303;Lo;0;L;;;;;N;;;;; +14556;ANATOLIAN HIEROGLYPH A304;Lo;0;L;;;;;N;;;;; +14557;ANATOLIAN HIEROGLYPH A305;Lo;0;L;;;;;N;;;;; +14558;ANATOLIAN HIEROGLYPH A306;Lo;0;L;;;;;N;;;;; +14559;ANATOLIAN HIEROGLYPH A307;Lo;0;L;;;;;N;;;;; +1455A;ANATOLIAN HIEROGLYPH A308;Lo;0;L;;;;;N;;;;; +1455B;ANATOLIAN HIEROGLYPH A309;Lo;0;L;;;;;N;;;;; +1455C;ANATOLIAN HIEROGLYPH A309A;Lo;0;L;;;;;N;;;;; +1455D;ANATOLIAN HIEROGLYPH A310;Lo;0;L;;;;;N;;;;; +1455E;ANATOLIAN HIEROGLYPH A311;Lo;0;L;;;;;N;;;;; +1455F;ANATOLIAN HIEROGLYPH A312;Lo;0;L;;;;;N;;;;; +14560;ANATOLIAN HIEROGLYPH A313;Lo;0;L;;;;;N;;;;; +14561;ANATOLIAN HIEROGLYPH A314;Lo;0;L;;;;;N;;;;; +14562;ANATOLIAN HIEROGLYPH A315;Lo;0;L;;;;;N;;;;; +14563;ANATOLIAN HIEROGLYPH A316;Lo;0;L;;;;;N;;;;; +14564;ANATOLIAN HIEROGLYPH A317;Lo;0;L;;;;;N;;;;; +14565;ANATOLIAN HIEROGLYPH A318;Lo;0;L;;;;;N;;;;; +14566;ANATOLIAN HIEROGLYPH A319;Lo;0;L;;;;;N;;;;; +14567;ANATOLIAN HIEROGLYPH A320;Lo;0;L;;;;;N;;;;; +14568;ANATOLIAN HIEROGLYPH A321;Lo;0;L;;;;;N;;;;; +14569;ANATOLIAN HIEROGLYPH A322;Lo;0;L;;;;;N;;;;; +1456A;ANATOLIAN HIEROGLYPH A323;Lo;0;L;;;;;N;;;;; +1456B;ANATOLIAN HIEROGLYPH A324;Lo;0;L;;;;;N;;;;; +1456C;ANATOLIAN HIEROGLYPH A325;Lo;0;L;;;;;N;;;;; +1456D;ANATOLIAN HIEROGLYPH A326;Lo;0;L;;;;;N;;;;; +1456E;ANATOLIAN HIEROGLYPH A327;Lo;0;L;;;;;N;;;;; +1456F;ANATOLIAN HIEROGLYPH A328;Lo;0;L;;;;;N;;;;; +14570;ANATOLIAN HIEROGLYPH A329;Lo;0;L;;;;;N;;;;; +14571;ANATOLIAN HIEROGLYPH A329A;Lo;0;L;;;;;N;;;;; +14572;ANATOLIAN HIEROGLYPH A330;Lo;0;L;;;;;N;;;;; +14573;ANATOLIAN HIEROGLYPH A331;Lo;0;L;;;;;N;;;;; +14574;ANATOLIAN HIEROGLYPH A332A;Lo;0;L;;;;;N;;;;; +14575;ANATOLIAN HIEROGLYPH A332B;Lo;0;L;;;;;N;;;;; +14576;ANATOLIAN HIEROGLYPH A332C;Lo;0;L;;;;;N;;;;; +14577;ANATOLIAN HIEROGLYPH A333;Lo;0;L;;;;;N;;;;; +14578;ANATOLIAN HIEROGLYPH A334;Lo;0;L;;;;;N;;;;; +14579;ANATOLIAN HIEROGLYPH A335;Lo;0;L;;;;;N;;;;; +1457A;ANATOLIAN HIEROGLYPH A336;Lo;0;L;;;;;N;;;;; +1457B;ANATOLIAN HIEROGLYPH A336A;Lo;0;L;;;;;N;;;;; +1457C;ANATOLIAN HIEROGLYPH A336B;Lo;0;L;;;;;N;;;;; +1457D;ANATOLIAN HIEROGLYPH A336C;Lo;0;L;;;;;N;;;;; +1457E;ANATOLIAN HIEROGLYPH A337;Lo;0;L;;;;;N;;;;; +1457F;ANATOLIAN HIEROGLYPH A338;Lo;0;L;;;;;N;;;;; +14580;ANATOLIAN HIEROGLYPH A339;Lo;0;L;;;;;N;;;;; +14581;ANATOLIAN HIEROGLYPH A340;Lo;0;L;;;;;N;;;;; +14582;ANATOLIAN HIEROGLYPH A341;Lo;0;L;;;;;N;;;;; +14583;ANATOLIAN HIEROGLYPH A342;Lo;0;L;;;;;N;;;;; +14584;ANATOLIAN HIEROGLYPH A343;Lo;0;L;;;;;N;;;;; +14585;ANATOLIAN HIEROGLYPH A344;Lo;0;L;;;;;N;;;;; +14586;ANATOLIAN HIEROGLYPH A345;Lo;0;L;;;;;N;;;;; +14587;ANATOLIAN HIEROGLYPH A346;Lo;0;L;;;;;N;;;;; +14588;ANATOLIAN HIEROGLYPH A347;Lo;0;L;;;;;N;;;;; +14589;ANATOLIAN HIEROGLYPH A348;Lo;0;L;;;;;N;;;;; +1458A;ANATOLIAN HIEROGLYPH A349;Lo;0;L;;;;;N;;;;; +1458B;ANATOLIAN HIEROGLYPH A350;Lo;0;L;;;;;N;;;;; +1458C;ANATOLIAN HIEROGLYPH A351;Lo;0;L;;;;;N;;;;; +1458D;ANATOLIAN HIEROGLYPH A352;Lo;0;L;;;;;N;;;;; +1458E;ANATOLIAN HIEROGLYPH A353;Lo;0;L;;;;;N;;;;; +1458F;ANATOLIAN HIEROGLYPH A354;Lo;0;L;;;;;N;;;;; +14590;ANATOLIAN HIEROGLYPH A355;Lo;0;L;;;;;N;;;;; +14591;ANATOLIAN HIEROGLYPH A356;Lo;0;L;;;;;N;;;;; +14592;ANATOLIAN HIEROGLYPH A357;Lo;0;L;;;;;N;;;;; +14593;ANATOLIAN HIEROGLYPH A358;Lo;0;L;;;;;N;;;;; +14594;ANATOLIAN HIEROGLYPH A359;Lo;0;L;;;;;N;;;;; +14595;ANATOLIAN HIEROGLYPH A359A;Lo;0;L;;;;;N;;;;; +14596;ANATOLIAN HIEROGLYPH A360;Lo;0;L;;;;;N;;;;; +14597;ANATOLIAN HIEROGLYPH A361;Lo;0;L;;;;;N;;;;; +14598;ANATOLIAN HIEROGLYPH A362;Lo;0;L;;;;;N;;;;; +14599;ANATOLIAN HIEROGLYPH A363;Lo;0;L;;;;;N;;;;; +1459A;ANATOLIAN HIEROGLYPH A364;Lo;0;L;;;;;N;;;;; +1459B;ANATOLIAN HIEROGLYPH A364A;Lo;0;L;;;;;N;;;;; +1459C;ANATOLIAN HIEROGLYPH A365;Lo;0;L;;;;;N;;;;; +1459D;ANATOLIAN HIEROGLYPH A366;Lo;0;L;;;;;N;;;;; +1459E;ANATOLIAN HIEROGLYPH A367;Lo;0;L;;;;;N;;;;; +1459F;ANATOLIAN HIEROGLYPH A368;Lo;0;L;;;;;N;;;;; +145A0;ANATOLIAN HIEROGLYPH A368A;Lo;0;L;;;;;N;;;;; +145A1;ANATOLIAN HIEROGLYPH A369;Lo;0;L;;;;;N;;;;; +145A2;ANATOLIAN HIEROGLYPH A370;Lo;0;L;;;;;N;;;;; +145A3;ANATOLIAN HIEROGLYPH A371;Lo;0;L;;;;;N;;;;; +145A4;ANATOLIAN HIEROGLYPH A371A;Lo;0;L;;;;;N;;;;; +145A5;ANATOLIAN HIEROGLYPH A372;Lo;0;L;;;;;N;;;;; +145A6;ANATOLIAN HIEROGLYPH A373;Lo;0;L;;;;;N;;;;; +145A7;ANATOLIAN HIEROGLYPH A374;Lo;0;L;;;;;N;;;;; +145A8;ANATOLIAN HIEROGLYPH A375;Lo;0;L;;;;;N;;;;; +145A9;ANATOLIAN HIEROGLYPH A376;Lo;0;L;;;;;N;;;;; +145AA;ANATOLIAN HIEROGLYPH A377;Lo;0;L;;;;;N;;;;; +145AB;ANATOLIAN HIEROGLYPH A378;Lo;0;L;;;;;N;;;;; +145AC;ANATOLIAN HIEROGLYPH A379;Lo;0;L;;;;;N;;;;; +145AD;ANATOLIAN HIEROGLYPH A380;Lo;0;L;;;;;N;;;;; +145AE;ANATOLIAN HIEROGLYPH A381;Lo;0;L;;;;;N;;;;; +145AF;ANATOLIAN HIEROGLYPH A381A;Lo;0;L;;;;;N;;;;; +145B0;ANATOLIAN HIEROGLYPH A382;Lo;0;L;;;;;N;;;;; +145B1;ANATOLIAN HIEROGLYPH A383 RA OR RI;Lo;0;L;;;;;N;;;;; +145B2;ANATOLIAN HIEROGLYPH A383A;Lo;0;L;;;;;N;;;;; +145B3;ANATOLIAN HIEROGLYPH A384;Lo;0;L;;;;;N;;;;; +145B4;ANATOLIAN HIEROGLYPH A385;Lo;0;L;;;;;N;;;;; +145B5;ANATOLIAN HIEROGLYPH A386;Lo;0;L;;;;;N;;;;; +145B6;ANATOLIAN HIEROGLYPH A386A;Lo;0;L;;;;;N;;;;; +145B7;ANATOLIAN HIEROGLYPH A387;Lo;0;L;;;;;N;;;;; +145B8;ANATOLIAN HIEROGLYPH A388;Lo;0;L;;;;;N;;;;; +145B9;ANATOLIAN HIEROGLYPH A389;Lo;0;L;;;;;N;;;;; +145BA;ANATOLIAN HIEROGLYPH A390;Lo;0;L;;;;;N;;;;; +145BB;ANATOLIAN HIEROGLYPH A391;Lo;0;L;;;;;N;;;;; +145BC;ANATOLIAN HIEROGLYPH A392;Lo;0;L;;;;;N;;;;; +145BD;ANATOLIAN HIEROGLYPH A393 EIGHT;Lo;0;L;;;;;N;;;;; +145BE;ANATOLIAN HIEROGLYPH A394;Lo;0;L;;;;;N;;;;; +145BF;ANATOLIAN HIEROGLYPH A395;Lo;0;L;;;;;N;;;;; +145C0;ANATOLIAN HIEROGLYPH A396;Lo;0;L;;;;;N;;;;; +145C1;ANATOLIAN HIEROGLYPH A397;Lo;0;L;;;;;N;;;;; +145C2;ANATOLIAN HIEROGLYPH A398;Lo;0;L;;;;;N;;;;; +145C3;ANATOLIAN HIEROGLYPH A399;Lo;0;L;;;;;N;;;;; +145C4;ANATOLIAN HIEROGLYPH A400;Lo;0;L;;;;;N;;;;; +145C5;ANATOLIAN HIEROGLYPH A401;Lo;0;L;;;;;N;;;;; +145C6;ANATOLIAN HIEROGLYPH A402;Lo;0;L;;;;;N;;;;; +145C7;ANATOLIAN HIEROGLYPH A403;Lo;0;L;;;;;N;;;;; +145C8;ANATOLIAN HIEROGLYPH A404;Lo;0;L;;;;;N;;;;; +145C9;ANATOLIAN HIEROGLYPH A405;Lo;0;L;;;;;N;;;;; +145CA;ANATOLIAN HIEROGLYPH A406;Lo;0;L;;;;;N;;;;; +145CB;ANATOLIAN HIEROGLYPH A407;Lo;0;L;;;;;N;;;;; +145CC;ANATOLIAN HIEROGLYPH A408;Lo;0;L;;;;;N;;;;; +145CD;ANATOLIAN HIEROGLYPH A409;Lo;0;L;;;;;N;;;;; +145CE;ANATOLIAN HIEROGLYPH A410 BEGIN LOGOGRAM MARK;Lo;0;L;;;;;N;;;;; +145CF;ANATOLIAN HIEROGLYPH A410A END LOGOGRAM MARK;Lo;0;L;;;;;N;;;;; +145D0;ANATOLIAN HIEROGLYPH A411;Lo;0;L;;;;;N;;;;; +145D1;ANATOLIAN HIEROGLYPH A412;Lo;0;L;;;;;N;;;;; +145D2;ANATOLIAN HIEROGLYPH A413;Lo;0;L;;;;;N;;;;; +145D3;ANATOLIAN HIEROGLYPH A414;Lo;0;L;;;;;N;;;;; +145D4;ANATOLIAN HIEROGLYPH A415;Lo;0;L;;;;;N;;;;; +145D5;ANATOLIAN HIEROGLYPH A416;Lo;0;L;;;;;N;;;;; +145D6;ANATOLIAN HIEROGLYPH A417;Lo;0;L;;;;;N;;;;; +145D7;ANATOLIAN HIEROGLYPH A418;Lo;0;L;;;;;N;;;;; +145D8;ANATOLIAN HIEROGLYPH A419;Lo;0;L;;;;;N;;;;; +145D9;ANATOLIAN HIEROGLYPH A420;Lo;0;L;;;;;N;;;;; +145DA;ANATOLIAN HIEROGLYPH A421;Lo;0;L;;;;;N;;;;; +145DB;ANATOLIAN HIEROGLYPH A422;Lo;0;L;;;;;N;;;;; +145DC;ANATOLIAN HIEROGLYPH A423;Lo;0;L;;;;;N;;;;; +145DD;ANATOLIAN HIEROGLYPH A424;Lo;0;L;;;;;N;;;;; +145DE;ANATOLIAN HIEROGLYPH A425;Lo;0;L;;;;;N;;;;; +145DF;ANATOLIAN HIEROGLYPH A426;Lo;0;L;;;;;N;;;;; +145E0;ANATOLIAN HIEROGLYPH A427;Lo;0;L;;;;;N;;;;; +145E1;ANATOLIAN HIEROGLYPH A428;Lo;0;L;;;;;N;;;;; +145E2;ANATOLIAN HIEROGLYPH A429;Lo;0;L;;;;;N;;;;; +145E3;ANATOLIAN HIEROGLYPH A430;Lo;0;L;;;;;N;;;;; +145E4;ANATOLIAN HIEROGLYPH A431;Lo;0;L;;;;;N;;;;; +145E5;ANATOLIAN HIEROGLYPH A432;Lo;0;L;;;;;N;;;;; +145E6;ANATOLIAN HIEROGLYPH A433;Lo;0;L;;;;;N;;;;; +145E7;ANATOLIAN HIEROGLYPH A434;Lo;0;L;;;;;N;;;;; +145E8;ANATOLIAN HIEROGLYPH A435;Lo;0;L;;;;;N;;;;; +145E9;ANATOLIAN HIEROGLYPH A436;Lo;0;L;;;;;N;;;;; +145EA;ANATOLIAN HIEROGLYPH A437;Lo;0;L;;;;;N;;;;; +145EB;ANATOLIAN HIEROGLYPH A438;Lo;0;L;;;;;N;;;;; +145EC;ANATOLIAN HIEROGLYPH A439;Lo;0;L;;;;;N;;;;; +145ED;ANATOLIAN HIEROGLYPH A440;Lo;0;L;;;;;N;;;;; +145EE;ANATOLIAN HIEROGLYPH A441;Lo;0;L;;;;;N;;;;; +145EF;ANATOLIAN HIEROGLYPH A442;Lo;0;L;;;;;N;;;;; +145F0;ANATOLIAN HIEROGLYPH A443;Lo;0;L;;;;;N;;;;; +145F1;ANATOLIAN HIEROGLYPH A444;Lo;0;L;;;;;N;;;;; +145F2;ANATOLIAN HIEROGLYPH A445;Lo;0;L;;;;;N;;;;; +145F3;ANATOLIAN HIEROGLYPH A446;Lo;0;L;;;;;N;;;;; +145F4;ANATOLIAN HIEROGLYPH A447;Lo;0;L;;;;;N;;;;; +145F5;ANATOLIAN HIEROGLYPH A448;Lo;0;L;;;;;N;;;;; +145F6;ANATOLIAN HIEROGLYPH A449;Lo;0;L;;;;;N;;;;; +145F7;ANATOLIAN HIEROGLYPH A450;Lo;0;L;;;;;N;;;;; +145F8;ANATOLIAN HIEROGLYPH A450A;Lo;0;L;;;;;N;;;;; +145F9;ANATOLIAN HIEROGLYPH A451;Lo;0;L;;;;;N;;;;; +145FA;ANATOLIAN HIEROGLYPH A452;Lo;0;L;;;;;N;;;;; +145FB;ANATOLIAN HIEROGLYPH A453;Lo;0;L;;;;;N;;;;; +145FC;ANATOLIAN HIEROGLYPH A454;Lo;0;L;;;;;N;;;;; +145FD;ANATOLIAN HIEROGLYPH A455;Lo;0;L;;;;;N;;;;; +145FE;ANATOLIAN HIEROGLYPH A456;Lo;0;L;;;;;N;;;;; +145FF;ANATOLIAN HIEROGLYPH A457;Lo;0;L;;;;;N;;;;; +14600;ANATOLIAN HIEROGLYPH A457A;Lo;0;L;;;;;N;;;;; +14601;ANATOLIAN HIEROGLYPH A458;Lo;0;L;;;;;N;;;;; +14602;ANATOLIAN HIEROGLYPH A459;Lo;0;L;;;;;N;;;;; +14603;ANATOLIAN HIEROGLYPH A460;Lo;0;L;;;;;N;;;;; +14604;ANATOLIAN HIEROGLYPH A461;Lo;0;L;;;;;N;;;;; +14605;ANATOLIAN HIEROGLYPH A462;Lo;0;L;;;;;N;;;;; +14606;ANATOLIAN HIEROGLYPH A463;Lo;0;L;;;;;N;;;;; +14607;ANATOLIAN HIEROGLYPH A464;Lo;0;L;;;;;N;;;;; +14608;ANATOLIAN HIEROGLYPH A465;Lo;0;L;;;;;N;;;;; +14609;ANATOLIAN HIEROGLYPH A466;Lo;0;L;;;;;N;;;;; +1460A;ANATOLIAN HIEROGLYPH A467;Lo;0;L;;;;;N;;;;; +1460B;ANATOLIAN HIEROGLYPH A468;Lo;0;L;;;;;N;;;;; +1460C;ANATOLIAN HIEROGLYPH A469;Lo;0;L;;;;;N;;;;; +1460D;ANATOLIAN HIEROGLYPH A470;Lo;0;L;;;;;N;;;;; +1460E;ANATOLIAN HIEROGLYPH A471;Lo;0;L;;;;;N;;;;; +1460F;ANATOLIAN HIEROGLYPH A472;Lo;0;L;;;;;N;;;;; +14610;ANATOLIAN HIEROGLYPH A473;Lo;0;L;;;;;N;;;;; +14611;ANATOLIAN HIEROGLYPH A474;Lo;0;L;;;;;N;;;;; +14612;ANATOLIAN HIEROGLYPH A475;Lo;0;L;;;;;N;;;;; +14613;ANATOLIAN HIEROGLYPH A476;Lo;0;L;;;;;N;;;;; +14614;ANATOLIAN HIEROGLYPH A477;Lo;0;L;;;;;N;;;;; +14615;ANATOLIAN HIEROGLYPH A478;Lo;0;L;;;;;N;;;;; +14616;ANATOLIAN HIEROGLYPH A479;Lo;0;L;;;;;N;;;;; +14617;ANATOLIAN HIEROGLYPH A480;Lo;0;L;;;;;N;;;;; +14618;ANATOLIAN HIEROGLYPH A481;Lo;0;L;;;;;N;;;;; +14619;ANATOLIAN HIEROGLYPH A482;Lo;0;L;;;;;N;;;;; +1461A;ANATOLIAN HIEROGLYPH A483;Lo;0;L;;;;;N;;;;; +1461B;ANATOLIAN HIEROGLYPH A484;Lo;0;L;;;;;N;;;;; +1461C;ANATOLIAN HIEROGLYPH A485;Lo;0;L;;;;;N;;;;; +1461D;ANATOLIAN HIEROGLYPH A486;Lo;0;L;;;;;N;;;;; +1461E;ANATOLIAN HIEROGLYPH A487;Lo;0;L;;;;;N;;;;; +1461F;ANATOLIAN HIEROGLYPH A488;Lo;0;L;;;;;N;;;;; +14620;ANATOLIAN HIEROGLYPH A489;Lo;0;L;;;;;N;;;;; +14621;ANATOLIAN HIEROGLYPH A490;Lo;0;L;;;;;N;;;;; +14622;ANATOLIAN HIEROGLYPH A491;Lo;0;L;;;;;N;;;;; +14623;ANATOLIAN HIEROGLYPH A492;Lo;0;L;;;;;N;;;;; +14624;ANATOLIAN HIEROGLYPH A493;Lo;0;L;;;;;N;;;;; +14625;ANATOLIAN HIEROGLYPH A494;Lo;0;L;;;;;N;;;;; +14626;ANATOLIAN HIEROGLYPH A495;Lo;0;L;;;;;N;;;;; +14627;ANATOLIAN HIEROGLYPH A496;Lo;0;L;;;;;N;;;;; +14628;ANATOLIAN HIEROGLYPH A497;Lo;0;L;;;;;N;;;;; +14629;ANATOLIAN HIEROGLYPH A501;Lo;0;L;;;;;N;;;;; +1462A;ANATOLIAN HIEROGLYPH A502;Lo;0;L;;;;;N;;;;; +1462B;ANATOLIAN HIEROGLYPH A503;Lo;0;L;;;;;N;;;;; +1462C;ANATOLIAN HIEROGLYPH A504;Lo;0;L;;;;;N;;;;; +1462D;ANATOLIAN HIEROGLYPH A505;Lo;0;L;;;;;N;;;;; +1462E;ANATOLIAN HIEROGLYPH A506;Lo;0;L;;;;;N;;;;; +1462F;ANATOLIAN HIEROGLYPH A507;Lo;0;L;;;;;N;;;;; +14630;ANATOLIAN HIEROGLYPH A508;Lo;0;L;;;;;N;;;;; +14631;ANATOLIAN HIEROGLYPH A509;Lo;0;L;;;;;N;;;;; +14632;ANATOLIAN HIEROGLYPH A510;Lo;0;L;;;;;N;;;;; +14633;ANATOLIAN HIEROGLYPH A511;Lo;0;L;;;;;N;;;;; +14634;ANATOLIAN HIEROGLYPH A512;Lo;0;L;;;;;N;;;;; +14635;ANATOLIAN HIEROGLYPH A513;Lo;0;L;;;;;N;;;;; +14636;ANATOLIAN HIEROGLYPH A514;Lo;0;L;;;;;N;;;;; +14637;ANATOLIAN HIEROGLYPH A515;Lo;0;L;;;;;N;;;;; +14638;ANATOLIAN HIEROGLYPH A516;Lo;0;L;;;;;N;;;;; +14639;ANATOLIAN HIEROGLYPH A517;Lo;0;L;;;;;N;;;;; +1463A;ANATOLIAN HIEROGLYPH A518;Lo;0;L;;;;;N;;;;; +1463B;ANATOLIAN HIEROGLYPH A519;Lo;0;L;;;;;N;;;;; +1463C;ANATOLIAN HIEROGLYPH A520;Lo;0;L;;;;;N;;;;; +1463D;ANATOLIAN HIEROGLYPH A521;Lo;0;L;;;;;N;;;;; +1463E;ANATOLIAN HIEROGLYPH A522;Lo;0;L;;;;;N;;;;; +1463F;ANATOLIAN HIEROGLYPH A523;Lo;0;L;;;;;N;;;;; +14640;ANATOLIAN HIEROGLYPH A524;Lo;0;L;;;;;N;;;;; +14641;ANATOLIAN HIEROGLYPH A525;Lo;0;L;;;;;N;;;;; +14642;ANATOLIAN HIEROGLYPH A526;Lo;0;L;;;;;N;;;;; +14643;ANATOLIAN HIEROGLYPH A527;Lo;0;L;;;;;N;;;;; +14644;ANATOLIAN HIEROGLYPH A528;Lo;0;L;;;;;N;;;;; +14645;ANATOLIAN HIEROGLYPH A529;Lo;0;L;;;;;N;;;;; +14646;ANATOLIAN HIEROGLYPH A530;Lo;0;L;;;;;N;;;;; +16100;GURUNG KHEMA LETTER A;Lo;0;L;;;;;N;;;;; +16101;GURUNG KHEMA LETTER KA;Lo;0;L;;;;;N;;;;; +16102;GURUNG KHEMA LETTER KHA;Lo;0;L;;;;;N;;;;; +16103;GURUNG KHEMA LETTER GA;Lo;0;L;;;;;N;;;;; +16104;GURUNG KHEMA LETTER GHA;Lo;0;L;;;;;N;;;;; +16105;GURUNG KHEMA LETTER NGA;Lo;0;L;;;;;N;;;;; +16106;GURUNG KHEMA LETTER CA;Lo;0;L;;;;;N;;;;; +16107;GURUNG KHEMA LETTER CHA;Lo;0;L;;;;;N;;;;; +16108;GURUNG KHEMA LETTER JA;Lo;0;L;;;;;N;;;;; +16109;GURUNG KHEMA LETTER JHA;Lo;0;L;;;;;N;;;;; +1610A;GURUNG KHEMA LETTER HA;Lo;0;L;;;;;N;;;;; +1610B;GURUNG KHEMA LETTER TTA;Lo;0;L;;;;;N;;;;; +1610C;GURUNG KHEMA LETTER TTHA;Lo;0;L;;;;;N;;;;; +1610D;GURUNG KHEMA LETTER DDA;Lo;0;L;;;;;N;;;;; +1610E;GURUNG KHEMA LETTER DDHA;Lo;0;L;;;;;N;;;;; +1610F;GURUNG KHEMA LETTER VA;Lo;0;L;;;;;N;;;;; +16110;GURUNG KHEMA LETTER TA;Lo;0;L;;;;;N;;;;; +16111;GURUNG KHEMA LETTER THA;Lo;0;L;;;;;N;;;;; +16112;GURUNG KHEMA LETTER DA;Lo;0;L;;;;;N;;;;; +16113;GURUNG KHEMA LETTER DHA;Lo;0;L;;;;;N;;;;; +16114;GURUNG KHEMA LETTER NA;Lo;0;L;;;;;N;;;;; +16115;GURUNG KHEMA LETTER PA;Lo;0;L;;;;;N;;;;; +16116;GURUNG KHEMA LETTER PHA;Lo;0;L;;;;;N;;;;; +16117;GURUNG KHEMA LETTER BA;Lo;0;L;;;;;N;;;;; +16118;GURUNG KHEMA LETTER BHA;Lo;0;L;;;;;N;;;;; +16119;GURUNG KHEMA LETTER MA;Lo;0;L;;;;;N;;;;; +1611A;GURUNG KHEMA LETTER YA;Lo;0;L;;;;;N;;;;; +1611B;GURUNG KHEMA LETTER RA;Lo;0;L;;;;;N;;;;; +1611C;GURUNG KHEMA LETTER LA;Lo;0;L;;;;;N;;;;; +1611D;GURUNG KHEMA LETTER SA;Lo;0;L;;;;;N;;;;; +1611E;GURUNG KHEMA VOWEL SIGN AA;Mn;0;NSM;;;;;N;;;;; +1611F;GURUNG KHEMA VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;; +16120;GURUNG KHEMA VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;; +16121;GURUNG KHEMA VOWEL SIGN U;Mn;0;NSM;1611E 1611E;;;;N;;;;; +16122;GURUNG KHEMA VOWEL SIGN UU;Mn;0;NSM;1611E 16129;;;;N;;;;; +16123;GURUNG KHEMA VOWEL SIGN E;Mn;0;NSM;1611E 1611F;;;;N;;;;; +16124;GURUNG KHEMA VOWEL SIGN EE;Mn;0;NSM;16129 1611F;;;;N;;;;; +16125;GURUNG KHEMA VOWEL SIGN AI;Mn;0;NSM;1611E 16120;;;;N;;;;; +16126;GURUNG KHEMA VOWEL SIGN O;Mn;0;NSM;16121 1611F;;;;N;;;;; +16127;GURUNG KHEMA VOWEL SIGN OO;Mn;0;NSM;16122 1611F;;;;N;;;;; +16128;GURUNG KHEMA VOWEL SIGN AU;Mn;0;NSM;16121 16120;;;;N;;;;; +16129;GURUNG KHEMA VOWEL LENGTH MARK;Mn;0;NSM;;;;;N;;;;; +1612A;GURUNG KHEMA CONSONANT SIGN MEDIAL YA;Mc;0;L;;;;;N;;;;; +1612B;GURUNG KHEMA CONSONANT SIGN MEDIAL VA;Mc;0;L;;;;;N;;;;; +1612C;GURUNG KHEMA CONSONANT SIGN MEDIAL HA;Mc;0;L;;;;;N;;;;; +1612D;GURUNG KHEMA SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;; +1612E;GURUNG KHEMA CONSONANT SIGN MEDIAL RA;Mn;0;NSM;;;;;N;;;;; +1612F;GURUNG KHEMA SIGN THOLHOMA;Mn;9;NSM;;;;;N;;;;; +16130;GURUNG KHEMA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +16131;GURUNG KHEMA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +16132;GURUNG KHEMA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +16133;GURUNG KHEMA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +16134;GURUNG KHEMA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +16135;GURUNG KHEMA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +16136;GURUNG KHEMA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +16137;GURUNG KHEMA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +16138;GURUNG KHEMA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +16139;GURUNG KHEMA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +16800;BAMUM LETTER PHASE-A NGKUE MFON;Lo;0;L;;;;;N;;;;; +16801;BAMUM LETTER PHASE-A GBIEE FON;Lo;0;L;;;;;N;;;;; +16802;BAMUM LETTER PHASE-A PON MFON PIPAEMGBIEE;Lo;0;L;;;;;N;;;;; +16803;BAMUM LETTER PHASE-A PON MFON PIPAEMBA;Lo;0;L;;;;;N;;;;; +16804;BAMUM LETTER PHASE-A NAA MFON;Lo;0;L;;;;;N;;;;; +16805;BAMUM LETTER PHASE-A SHUENSHUET;Lo;0;L;;;;;N;;;;; +16806;BAMUM LETTER PHASE-A TITA MFON;Lo;0;L;;;;;N;;;;; +16807;BAMUM LETTER PHASE-A NZA MFON;Lo;0;L;;;;;N;;;;; +16808;BAMUM LETTER PHASE-A SHINDA PA NJI;Lo;0;L;;;;;N;;;;; +16809;BAMUM LETTER PHASE-A PON PA NJI PIPAEMGBIEE;Lo;0;L;;;;;N;;;;; +1680A;BAMUM LETTER PHASE-A PON PA NJI PIPAEMBA;Lo;0;L;;;;;N;;;;; +1680B;BAMUM LETTER PHASE-A MAEMBGBIEE;Lo;0;L;;;;;N;;;;; +1680C;BAMUM LETTER PHASE-A TU MAEMBA;Lo;0;L;;;;;N;;;;; +1680D;BAMUM LETTER PHASE-A NGANGU;Lo;0;L;;;;;N;;;;; +1680E;BAMUM LETTER PHASE-A MAEMVEUX;Lo;0;L;;;;;N;;;;; +1680F;BAMUM LETTER PHASE-A MANSUAE;Lo;0;L;;;;;N;;;;; +16810;BAMUM LETTER PHASE-A MVEUAENGAM;Lo;0;L;;;;;N;;;;; +16811;BAMUM LETTER PHASE-A SEUNYAM;Lo;0;L;;;;;N;;;;; +16812;BAMUM LETTER PHASE-A NTOQPEN;Lo;0;L;;;;;N;;;;; +16813;BAMUM LETTER PHASE-A KEUKEUTNDA;Lo;0;L;;;;;N;;;;; +16814;BAMUM LETTER PHASE-A NKINDI;Lo;0;L;;;;;N;;;;; +16815;BAMUM LETTER PHASE-A SUU;Lo;0;L;;;;;N;;;;; +16816;BAMUM LETTER PHASE-A NGKUENZEUM;Lo;0;L;;;;;N;;;;; +16817;BAMUM LETTER PHASE-A LAPAQ;Lo;0;L;;;;;N;;;;; +16818;BAMUM LETTER PHASE-A LET KUT;Lo;0;L;;;;;N;;;;; +16819;BAMUM LETTER PHASE-A NTAP MFAA;Lo;0;L;;;;;N;;;;; +1681A;BAMUM LETTER PHASE-A MAEKEUP;Lo;0;L;;;;;N;;;;; +1681B;BAMUM LETTER PHASE-A PASHAE;Lo;0;L;;;;;N;;;;; +1681C;BAMUM LETTER PHASE-A GHEUAERAE;Lo;0;L;;;;;N;;;;; +1681D;BAMUM LETTER PHASE-A PAMSHAE;Lo;0;L;;;;;N;;;;; +1681E;BAMUM LETTER PHASE-A MON NGGEUAET;Lo;0;L;;;;;N;;;;; +1681F;BAMUM LETTER PHASE-A NZUN MEUT;Lo;0;L;;;;;N;;;;; +16820;BAMUM LETTER PHASE-A U YUQ NAE;Lo;0;L;;;;;N;;;;; +16821;BAMUM LETTER PHASE-A GHEUAEGHEUAE;Lo;0;L;;;;;N;;;;; +16822;BAMUM LETTER PHASE-A NTAP NTAA;Lo;0;L;;;;;N;;;;; +16823;BAMUM LETTER PHASE-A SISA;Lo;0;L;;;;;N;;;;; +16824;BAMUM LETTER PHASE-A MGBASA;Lo;0;L;;;;;N;;;;; +16825;BAMUM LETTER PHASE-A MEUNJOMNDEUQ;Lo;0;L;;;;;N;;;;; +16826;BAMUM LETTER PHASE-A MOOMPUQ;Lo;0;L;;;;;N;;;;; +16827;BAMUM LETTER PHASE-A KAFA;Lo;0;L;;;;;N;;;;; +16828;BAMUM LETTER PHASE-A PA LEERAEWA;Lo;0;L;;;;;N;;;;; +16829;BAMUM LETTER PHASE-A NDA LEERAEWA;Lo;0;L;;;;;N;;;;; +1682A;BAMUM LETTER PHASE-A PET;Lo;0;L;;;;;N;;;;; +1682B;BAMUM LETTER PHASE-A MAEMKPEN;Lo;0;L;;;;;N;;;;; +1682C;BAMUM LETTER PHASE-A NIKA;Lo;0;L;;;;;N;;;;; +1682D;BAMUM LETTER PHASE-A PUP;Lo;0;L;;;;;N;;;;; +1682E;BAMUM LETTER PHASE-A TUAEP;Lo;0;L;;;;;N;;;;; +1682F;BAMUM LETTER PHASE-A LUAEP;Lo;0;L;;;;;N;;;;; +16830;BAMUM LETTER PHASE-A SONJAM;Lo;0;L;;;;;N;;;;; +16831;BAMUM LETTER PHASE-A TEUTEUWEN;Lo;0;L;;;;;N;;;;; +16832;BAMUM LETTER PHASE-A MAENYI;Lo;0;L;;;;;N;;;;; +16833;BAMUM LETTER PHASE-A KET;Lo;0;L;;;;;N;;;;; +16834;BAMUM LETTER PHASE-A NDAANGGEUAET;Lo;0;L;;;;;N;;;;; +16835;BAMUM LETTER PHASE-A KUOQ;Lo;0;L;;;;;N;;;;; +16836;BAMUM LETTER PHASE-A MOOMEUT;Lo;0;L;;;;;N;;;;; +16837;BAMUM LETTER PHASE-A SHUM;Lo;0;L;;;;;N;;;;; +16838;BAMUM LETTER PHASE-A LOMMAE;Lo;0;L;;;;;N;;;;; +16839;BAMUM LETTER PHASE-A FIRI;Lo;0;L;;;;;N;;;;; +1683A;BAMUM LETTER PHASE-A ROM;Lo;0;L;;;;;N;;;;; +1683B;BAMUM LETTER PHASE-A KPOQ;Lo;0;L;;;;;N;;;;; +1683C;BAMUM LETTER PHASE-A SOQ;Lo;0;L;;;;;N;;;;; +1683D;BAMUM LETTER PHASE-A MAP PIEET;Lo;0;L;;;;;N;;;;; +1683E;BAMUM LETTER PHASE-A SHIRAE;Lo;0;L;;;;;N;;;;; +1683F;BAMUM LETTER PHASE-A NTAP;Lo;0;L;;;;;N;;;;; +16840;BAMUM LETTER PHASE-A SHOQ NSHUT YUM;Lo;0;L;;;;;N;;;;; +16841;BAMUM LETTER PHASE-A NYIT MONGKEUAEQ;Lo;0;L;;;;;N;;;;; +16842;BAMUM LETTER PHASE-A PAARAE;Lo;0;L;;;;;N;;;;; +16843;BAMUM LETTER PHASE-A NKAARAE;Lo;0;L;;;;;N;;;;; +16844;BAMUM LETTER PHASE-A UNKNOWN;Lo;0;L;;;;;N;;;;; +16845;BAMUM LETTER PHASE-A NGGEN;Lo;0;L;;;;;N;;;;; +16846;BAMUM LETTER PHASE-A MAESI;Lo;0;L;;;;;N;;;;; +16847;BAMUM LETTER PHASE-A NJAM;Lo;0;L;;;;;N;;;;; +16848;BAMUM LETTER PHASE-A MBANYI;Lo;0;L;;;;;N;;;;; +16849;BAMUM LETTER PHASE-A NYET;Lo;0;L;;;;;N;;;;; +1684A;BAMUM LETTER PHASE-A TEUAEN;Lo;0;L;;;;;N;;;;; +1684B;BAMUM LETTER PHASE-A SOT;Lo;0;L;;;;;N;;;;; +1684C;BAMUM LETTER PHASE-A PAAM;Lo;0;L;;;;;N;;;;; +1684D;BAMUM LETTER PHASE-A NSHIEE;Lo;0;L;;;;;N;;;;; +1684E;BAMUM LETTER PHASE-A MAEM;Lo;0;L;;;;;N;;;;; +1684F;BAMUM LETTER PHASE-A NYI;Lo;0;L;;;;;N;;;;; +16850;BAMUM LETTER PHASE-A KAQ;Lo;0;L;;;;;N;;;;; +16851;BAMUM LETTER PHASE-A NSHA;Lo;0;L;;;;;N;;;;; +16852;BAMUM LETTER PHASE-A VEE;Lo;0;L;;;;;N;;;;; +16853;BAMUM LETTER PHASE-A LU;Lo;0;L;;;;;N;;;;; +16854;BAMUM LETTER PHASE-A NEN;Lo;0;L;;;;;N;;;;; +16855;BAMUM LETTER PHASE-A NAQ;Lo;0;L;;;;;N;;;;; +16856;BAMUM LETTER PHASE-A MBAQ;Lo;0;L;;;;;N;;;;; +16857;BAMUM LETTER PHASE-B NSHUET;Lo;0;L;;;;;N;;;;; +16858;BAMUM LETTER PHASE-B TU MAEMGBIEE;Lo;0;L;;;;;N;;;;; +16859;BAMUM LETTER PHASE-B SIEE;Lo;0;L;;;;;N;;;;; +1685A;BAMUM LETTER PHASE-B SET TU;Lo;0;L;;;;;N;;;;; +1685B;BAMUM LETTER PHASE-B LOM NTEUM;Lo;0;L;;;;;N;;;;; +1685C;BAMUM LETTER PHASE-B MBA MAELEE;Lo;0;L;;;;;N;;;;; +1685D;BAMUM LETTER PHASE-B KIEEM;Lo;0;L;;;;;N;;;;; +1685E;BAMUM LETTER PHASE-B YEURAE;Lo;0;L;;;;;N;;;;; +1685F;BAMUM LETTER PHASE-B MBAARAE;Lo;0;L;;;;;N;;;;; +16860;BAMUM LETTER PHASE-B KAM;Lo;0;L;;;;;N;;;;; +16861;BAMUM LETTER PHASE-B PEESHI;Lo;0;L;;;;;N;;;;; +16862;BAMUM LETTER PHASE-B YAFU LEERAEWA;Lo;0;L;;;;;N;;;;; +16863;BAMUM LETTER PHASE-B LAM NSHUT NYAM;Lo;0;L;;;;;N;;;;; +16864;BAMUM LETTER PHASE-B NTIEE SHEUOQ;Lo;0;L;;;;;N;;;;; +16865;BAMUM LETTER PHASE-B NDU NJAA;Lo;0;L;;;;;N;;;;; +16866;BAMUM LETTER PHASE-B GHEUGHEUAEM;Lo;0;L;;;;;N;;;;; +16867;BAMUM LETTER PHASE-B PIT;Lo;0;L;;;;;N;;;;; +16868;BAMUM LETTER PHASE-B TU NSIEE;Lo;0;L;;;;;N;;;;; +16869;BAMUM LETTER PHASE-B SHET NJAQ;Lo;0;L;;;;;N;;;;; +1686A;BAMUM LETTER PHASE-B SHEUAEQTU;Lo;0;L;;;;;N;;;;; +1686B;BAMUM LETTER PHASE-B MFON TEUAEQ;Lo;0;L;;;;;N;;;;; +1686C;BAMUM LETTER PHASE-B MBIT MBAAKET;Lo;0;L;;;;;N;;;;; +1686D;BAMUM LETTER PHASE-B NYI NTEUM;Lo;0;L;;;;;N;;;;; +1686E;BAMUM LETTER PHASE-B KEUPUQ;Lo;0;L;;;;;N;;;;; +1686F;BAMUM LETTER PHASE-B GHEUGHEN;Lo;0;L;;;;;N;;;;; +16870;BAMUM LETTER PHASE-B KEUYEUX;Lo;0;L;;;;;N;;;;; +16871;BAMUM LETTER PHASE-B LAANAE;Lo;0;L;;;;;N;;;;; +16872;BAMUM LETTER PHASE-B PARUM;Lo;0;L;;;;;N;;;;; +16873;BAMUM LETTER PHASE-B VEUM;Lo;0;L;;;;;N;;;;; +16874;BAMUM LETTER PHASE-B NGKINDI MVOP;Lo;0;L;;;;;N;;;;; +16875;BAMUM LETTER PHASE-B NGGEU MBU;Lo;0;L;;;;;N;;;;; +16876;BAMUM LETTER PHASE-B WUAET;Lo;0;L;;;;;N;;;;; +16877;BAMUM LETTER PHASE-B SAKEUAE;Lo;0;L;;;;;N;;;;; +16878;BAMUM LETTER PHASE-B TAAM;Lo;0;L;;;;;N;;;;; +16879;BAMUM LETTER PHASE-B MEUQ;Lo;0;L;;;;;N;;;;; +1687A;BAMUM LETTER PHASE-B NGGUOQ;Lo;0;L;;;;;N;;;;; +1687B;BAMUM LETTER PHASE-B NGGUOQ LARGE;Lo;0;L;;;;;N;;;;; +1687C;BAMUM LETTER PHASE-B MFIYAQ;Lo;0;L;;;;;N;;;;; +1687D;BAMUM LETTER PHASE-B SUE;Lo;0;L;;;;;N;;;;; +1687E;BAMUM LETTER PHASE-B MBEURI;Lo;0;L;;;;;N;;;;; +1687F;BAMUM LETTER PHASE-B MONTIEEN;Lo;0;L;;;;;N;;;;; +16880;BAMUM LETTER PHASE-B NYAEMAE;Lo;0;L;;;;;N;;;;; +16881;BAMUM LETTER PHASE-B PUNGAAM;Lo;0;L;;;;;N;;;;; +16882;BAMUM LETTER PHASE-B MEUT NGGEET;Lo;0;L;;;;;N;;;;; +16883;BAMUM LETTER PHASE-B FEUX;Lo;0;L;;;;;N;;;;; +16884;BAMUM LETTER PHASE-B MBUOQ;Lo;0;L;;;;;N;;;;; +16885;BAMUM LETTER PHASE-B FEE;Lo;0;L;;;;;N;;;;; +16886;BAMUM LETTER PHASE-B KEUAEM;Lo;0;L;;;;;N;;;;; +16887;BAMUM LETTER PHASE-B MA NJEUAENA;Lo;0;L;;;;;N;;;;; +16888;BAMUM LETTER PHASE-B MA NJUQA;Lo;0;L;;;;;N;;;;; +16889;BAMUM LETTER PHASE-B LET;Lo;0;L;;;;;N;;;;; +1688A;BAMUM LETTER PHASE-B NGGAAM;Lo;0;L;;;;;N;;;;; +1688B;BAMUM LETTER PHASE-B NSEN;Lo;0;L;;;;;N;;;;; +1688C;BAMUM LETTER PHASE-B MA;Lo;0;L;;;;;N;;;;; +1688D;BAMUM LETTER PHASE-B KIQ;Lo;0;L;;;;;N;;;;; +1688E;BAMUM LETTER PHASE-B NGOM;Lo;0;L;;;;;N;;;;; +1688F;BAMUM LETTER PHASE-C NGKUE MAEMBA;Lo;0;L;;;;;N;;;;; +16890;BAMUM LETTER PHASE-C NZA;Lo;0;L;;;;;N;;;;; +16891;BAMUM LETTER PHASE-C YUM;Lo;0;L;;;;;N;;;;; +16892;BAMUM LETTER PHASE-C WANGKUOQ;Lo;0;L;;;;;N;;;;; +16893;BAMUM LETTER PHASE-C NGGEN;Lo;0;L;;;;;N;;;;; +16894;BAMUM LETTER PHASE-C NDEUAEREE;Lo;0;L;;;;;N;;;;; +16895;BAMUM LETTER PHASE-C NGKAQ;Lo;0;L;;;;;N;;;;; +16896;BAMUM LETTER PHASE-C GHARAE;Lo;0;L;;;;;N;;;;; +16897;BAMUM LETTER PHASE-C MBEEKEET;Lo;0;L;;;;;N;;;;; +16898;BAMUM LETTER PHASE-C GBAYI;Lo;0;L;;;;;N;;;;; +16899;BAMUM LETTER PHASE-C NYIR MKPARAQ MEUN;Lo;0;L;;;;;N;;;;; +1689A;BAMUM LETTER PHASE-C NTU MBIT;Lo;0;L;;;;;N;;;;; +1689B;BAMUM LETTER PHASE-C MBEUM;Lo;0;L;;;;;N;;;;; +1689C;BAMUM LETTER PHASE-C PIRIEEN;Lo;0;L;;;;;N;;;;; +1689D;BAMUM LETTER PHASE-C NDOMBU;Lo;0;L;;;;;N;;;;; +1689E;BAMUM LETTER PHASE-C MBAA CABBAGE-TREE;Lo;0;L;;;;;N;;;;; +1689F;BAMUM LETTER PHASE-C KEUSHEUAEP;Lo;0;L;;;;;N;;;;; +168A0;BAMUM LETTER PHASE-C GHAP;Lo;0;L;;;;;N;;;;; +168A1;BAMUM LETTER PHASE-C KEUKAQ;Lo;0;L;;;;;N;;;;; +168A2;BAMUM LETTER PHASE-C YU MUOMAE;Lo;0;L;;;;;N;;;;; +168A3;BAMUM LETTER PHASE-C NZEUM;Lo;0;L;;;;;N;;;;; +168A4;BAMUM LETTER PHASE-C MBUE;Lo;0;L;;;;;N;;;;; +168A5;BAMUM LETTER PHASE-C NSEUAEN;Lo;0;L;;;;;N;;;;; +168A6;BAMUM LETTER PHASE-C MBIT;Lo;0;L;;;;;N;;;;; +168A7;BAMUM LETTER PHASE-C YEUQ;Lo;0;L;;;;;N;;;;; +168A8;BAMUM LETTER PHASE-C KPARAQ;Lo;0;L;;;;;N;;;;; +168A9;BAMUM LETTER PHASE-C KAA;Lo;0;L;;;;;N;;;;; +168AA;BAMUM LETTER PHASE-C SEUX;Lo;0;L;;;;;N;;;;; +168AB;BAMUM LETTER PHASE-C NDIDA;Lo;0;L;;;;;N;;;;; +168AC;BAMUM LETTER PHASE-C TAASHAE;Lo;0;L;;;;;N;;;;; +168AD;BAMUM LETTER PHASE-C NJUEQ;Lo;0;L;;;;;N;;;;; +168AE;BAMUM LETTER PHASE-C TITA YUE;Lo;0;L;;;;;N;;;;; +168AF;BAMUM LETTER PHASE-C SUAET;Lo;0;L;;;;;N;;;;; +168B0;BAMUM LETTER PHASE-C NGGUAEN NYAM;Lo;0;L;;;;;N;;;;; +168B1;BAMUM LETTER PHASE-C VEUX;Lo;0;L;;;;;N;;;;; +168B2;BAMUM LETTER PHASE-C NANSANAQ;Lo;0;L;;;;;N;;;;; +168B3;BAMUM LETTER PHASE-C MA KEUAERI;Lo;0;L;;;;;N;;;;; +168B4;BAMUM LETTER PHASE-C NTAA;Lo;0;L;;;;;N;;;;; +168B5;BAMUM LETTER PHASE-C NGGUON;Lo;0;L;;;;;N;;;;; +168B6;BAMUM LETTER PHASE-C LAP;Lo;0;L;;;;;N;;;;; +168B7;BAMUM LETTER PHASE-C MBIRIEEN;Lo;0;L;;;;;N;;;;; +168B8;BAMUM LETTER PHASE-C MGBASAQ;Lo;0;L;;;;;N;;;;; +168B9;BAMUM LETTER PHASE-C NTEUNGBA;Lo;0;L;;;;;N;;;;; +168BA;BAMUM LETTER PHASE-C TEUTEUX;Lo;0;L;;;;;N;;;;; +168BB;BAMUM LETTER PHASE-C NGGUM;Lo;0;L;;;;;N;;;;; +168BC;BAMUM LETTER PHASE-C FUE;Lo;0;L;;;;;N;;;;; +168BD;BAMUM LETTER PHASE-C NDEUT;Lo;0;L;;;;;N;;;;; +168BE;BAMUM LETTER PHASE-C NSA;Lo;0;L;;;;;N;;;;; +168BF;BAMUM LETTER PHASE-C NSHAQ;Lo;0;L;;;;;N;;;;; +168C0;BAMUM LETTER PHASE-C BUNG;Lo;0;L;;;;;N;;;;; +168C1;BAMUM LETTER PHASE-C VEUAEPEN;Lo;0;L;;;;;N;;;;; +168C2;BAMUM LETTER PHASE-C MBERAE;Lo;0;L;;;;;N;;;;; +168C3;BAMUM LETTER PHASE-C RU;Lo;0;L;;;;;N;;;;; +168C4;BAMUM LETTER PHASE-C NJAEM;Lo;0;L;;;;;N;;;;; +168C5;BAMUM LETTER PHASE-C LAM;Lo;0;L;;;;;N;;;;; +168C6;BAMUM LETTER PHASE-C TITUAEP;Lo;0;L;;;;;N;;;;; +168C7;BAMUM LETTER PHASE-C NSUOT NGOM;Lo;0;L;;;;;N;;;;; +168C8;BAMUM LETTER PHASE-C NJEEEE;Lo;0;L;;;;;N;;;;; +168C9;BAMUM LETTER PHASE-C KET;Lo;0;L;;;;;N;;;;; +168CA;BAMUM LETTER PHASE-C NGGU;Lo;0;L;;;;;N;;;;; +168CB;BAMUM LETTER PHASE-C MAESI;Lo;0;L;;;;;N;;;;; +168CC;BAMUM LETTER PHASE-C MBUAEM;Lo;0;L;;;;;N;;;;; +168CD;BAMUM LETTER PHASE-C LU;Lo;0;L;;;;;N;;;;; +168CE;BAMUM LETTER PHASE-C KUT;Lo;0;L;;;;;N;;;;; +168CF;BAMUM LETTER PHASE-C NJAM;Lo;0;L;;;;;N;;;;; +168D0;BAMUM LETTER PHASE-C NGOM;Lo;0;L;;;;;N;;;;; +168D1;BAMUM LETTER PHASE-C WUP;Lo;0;L;;;;;N;;;;; +168D2;BAMUM LETTER PHASE-C NGGUEET;Lo;0;L;;;;;N;;;;; +168D3;BAMUM LETTER PHASE-C NSOM;Lo;0;L;;;;;N;;;;; +168D4;BAMUM LETTER PHASE-C NTEN;Lo;0;L;;;;;N;;;;; +168D5;BAMUM LETTER PHASE-C KUOP NKAARAE;Lo;0;L;;;;;N;;;;; +168D6;BAMUM LETTER PHASE-C NSUN;Lo;0;L;;;;;N;;;;; +168D7;BAMUM LETTER PHASE-C NDAM;Lo;0;L;;;;;N;;;;; +168D8;BAMUM LETTER PHASE-C MA NSIEE;Lo;0;L;;;;;N;;;;; +168D9;BAMUM LETTER PHASE-C YAA;Lo;0;L;;;;;N;;;;; +168DA;BAMUM LETTER PHASE-C NDAP;Lo;0;L;;;;;N;;;;; +168DB;BAMUM LETTER PHASE-C SHUEQ;Lo;0;L;;;;;N;;;;; +168DC;BAMUM LETTER PHASE-C SETFON;Lo;0;L;;;;;N;;;;; +168DD;BAMUM LETTER PHASE-C MBI;Lo;0;L;;;;;N;;;;; +168DE;BAMUM LETTER PHASE-C MAEMBA;Lo;0;L;;;;;N;;;;; +168DF;BAMUM LETTER PHASE-C MBANYI;Lo;0;L;;;;;N;;;;; +168E0;BAMUM LETTER PHASE-C KEUSEUX;Lo;0;L;;;;;N;;;;; +168E1;BAMUM LETTER PHASE-C MBEUX;Lo;0;L;;;;;N;;;;; +168E2;BAMUM LETTER PHASE-C KEUM;Lo;0;L;;;;;N;;;;; +168E3;BAMUM LETTER PHASE-C MBAA PICKET;Lo;0;L;;;;;N;;;;; +168E4;BAMUM LETTER PHASE-C YUWOQ;Lo;0;L;;;;;N;;;;; +168E5;BAMUM LETTER PHASE-C NJEUX;Lo;0;L;;;;;N;;;;; +168E6;BAMUM LETTER PHASE-C MIEE;Lo;0;L;;;;;N;;;;; +168E7;BAMUM LETTER PHASE-C MUAE;Lo;0;L;;;;;N;;;;; +168E8;BAMUM LETTER PHASE-C SHIQ;Lo;0;L;;;;;N;;;;; +168E9;BAMUM LETTER PHASE-C KEN LAW;Lo;0;L;;;;;N;;;;; +168EA;BAMUM LETTER PHASE-C KEN FATIGUE;Lo;0;L;;;;;N;;;;; +168EB;BAMUM LETTER PHASE-C NGAQ;Lo;0;L;;;;;N;;;;; +168EC;BAMUM LETTER PHASE-C NAQ;Lo;0;L;;;;;N;;;;; +168ED;BAMUM LETTER PHASE-C LIQ;Lo;0;L;;;;;N;;;;; +168EE;BAMUM LETTER PHASE-C PIN;Lo;0;L;;;;;N;;;;; +168EF;BAMUM LETTER PHASE-C PEN;Lo;0;L;;;;;N;;;;; +168F0;BAMUM LETTER PHASE-C TET;Lo;0;L;;;;;N;;;;; +168F1;BAMUM LETTER PHASE-D MBUO;Lo;0;L;;;;;N;;;;; +168F2;BAMUM LETTER PHASE-D WAP;Lo;0;L;;;;;N;;;;; +168F3;BAMUM LETTER PHASE-D NJI;Lo;0;L;;;;;N;;;;; +168F4;BAMUM LETTER PHASE-D MFON;Lo;0;L;;;;;N;;;;; +168F5;BAMUM LETTER PHASE-D NJIEE;Lo;0;L;;;;;N;;;;; +168F6;BAMUM LETTER PHASE-D LIEE;Lo;0;L;;;;;N;;;;; +168F7;BAMUM LETTER PHASE-D NJEUT;Lo;0;L;;;;;N;;;;; +168F8;BAMUM LETTER PHASE-D NSHEE;Lo;0;L;;;;;N;;;;; +168F9;BAMUM LETTER PHASE-D NGGAAMAE;Lo;0;L;;;;;N;;;;; +168FA;BAMUM LETTER PHASE-D NYAM;Lo;0;L;;;;;N;;;;; +168FB;BAMUM LETTER PHASE-D WUAEN;Lo;0;L;;;;;N;;;;; +168FC;BAMUM LETTER PHASE-D NGKUN;Lo;0;L;;;;;N;;;;; +168FD;BAMUM LETTER PHASE-D SHEE;Lo;0;L;;;;;N;;;;; +168FE;BAMUM LETTER PHASE-D NGKAP;Lo;0;L;;;;;N;;;;; +168FF;BAMUM LETTER PHASE-D KEUAETMEUN;Lo;0;L;;;;;N;;;;; +16900;BAMUM LETTER PHASE-D TEUT;Lo;0;L;;;;;N;;;;; +16901;BAMUM LETTER PHASE-D SHEUAE;Lo;0;L;;;;;N;;;;; +16902;BAMUM LETTER PHASE-D NJAP;Lo;0;L;;;;;N;;;;; +16903;BAMUM LETTER PHASE-D SUE;Lo;0;L;;;;;N;;;;; +16904;BAMUM LETTER PHASE-D KET;Lo;0;L;;;;;N;;;;; +16905;BAMUM LETTER PHASE-D YAEMMAE;Lo;0;L;;;;;N;;;;; +16906;BAMUM LETTER PHASE-D KUOM;Lo;0;L;;;;;N;;;;; +16907;BAMUM LETTER PHASE-D SAP;Lo;0;L;;;;;N;;;;; +16908;BAMUM LETTER PHASE-D MFEUT;Lo;0;L;;;;;N;;;;; +16909;BAMUM LETTER PHASE-D NDEUX;Lo;0;L;;;;;N;;;;; +1690A;BAMUM LETTER PHASE-D MALEERI;Lo;0;L;;;;;N;;;;; +1690B;BAMUM LETTER PHASE-D MEUT;Lo;0;L;;;;;N;;;;; +1690C;BAMUM LETTER PHASE-D SEUAEQ;Lo;0;L;;;;;N;;;;; +1690D;BAMUM LETTER PHASE-D YEN;Lo;0;L;;;;;N;;;;; +1690E;BAMUM LETTER PHASE-D NJEUAEM;Lo;0;L;;;;;N;;;;; +1690F;BAMUM LETTER PHASE-D KEUOT MBUAE;Lo;0;L;;;;;N;;;;; +16910;BAMUM LETTER PHASE-D NGKEURI;Lo;0;L;;;;;N;;;;; +16911;BAMUM LETTER PHASE-D TU;Lo;0;L;;;;;N;;;;; +16912;BAMUM LETTER PHASE-D GHAA;Lo;0;L;;;;;N;;;;; +16913;BAMUM LETTER PHASE-D NGKYEE;Lo;0;L;;;;;N;;;;; +16914;BAMUM LETTER PHASE-D FEUFEUAET;Lo;0;L;;;;;N;;;;; +16915;BAMUM LETTER PHASE-D NDEE;Lo;0;L;;;;;N;;;;; +16916;BAMUM LETTER PHASE-D MGBOFUM;Lo;0;L;;;;;N;;;;; +16917;BAMUM LETTER PHASE-D LEUAEP;Lo;0;L;;;;;N;;;;; +16918;BAMUM LETTER PHASE-D NDON;Lo;0;L;;;;;N;;;;; +16919;BAMUM LETTER PHASE-D MONI;Lo;0;L;;;;;N;;;;; +1691A;BAMUM LETTER PHASE-D MGBEUN;Lo;0;L;;;;;N;;;;; +1691B;BAMUM LETTER PHASE-D PUUT;Lo;0;L;;;;;N;;;;; +1691C;BAMUM LETTER PHASE-D MGBIEE;Lo;0;L;;;;;N;;;;; +1691D;BAMUM LETTER PHASE-D MFO;Lo;0;L;;;;;N;;;;; +1691E;BAMUM LETTER PHASE-D LUM;Lo;0;L;;;;;N;;;;; +1691F;BAMUM LETTER PHASE-D NSIEEP;Lo;0;L;;;;;N;;;;; +16920;BAMUM LETTER PHASE-D MBAA;Lo;0;L;;;;;N;;;;; +16921;BAMUM LETTER PHASE-D KWAET;Lo;0;L;;;;;N;;;;; +16922;BAMUM LETTER PHASE-D NYET;Lo;0;L;;;;;N;;;;; +16923;BAMUM LETTER PHASE-D TEUAEN;Lo;0;L;;;;;N;;;;; +16924;BAMUM LETTER PHASE-D SOT;Lo;0;L;;;;;N;;;;; +16925;BAMUM LETTER PHASE-D YUWOQ;Lo;0;L;;;;;N;;;;; +16926;BAMUM LETTER PHASE-D KEUM;Lo;0;L;;;;;N;;;;; +16927;BAMUM LETTER PHASE-D RAEM;Lo;0;L;;;;;N;;;;; +16928;BAMUM LETTER PHASE-D TEEEE;Lo;0;L;;;;;N;;;;; +16929;BAMUM LETTER PHASE-D NGKEUAEQ;Lo;0;L;;;;;N;;;;; +1692A;BAMUM LETTER PHASE-D MFEUAE;Lo;0;L;;;;;N;;;;; +1692B;BAMUM LETTER PHASE-D NSIEET;Lo;0;L;;;;;N;;;;; +1692C;BAMUM LETTER PHASE-D KEUP;Lo;0;L;;;;;N;;;;; +1692D;BAMUM LETTER PHASE-D PIP;Lo;0;L;;;;;N;;;;; +1692E;BAMUM LETTER PHASE-D PEUTAE;Lo;0;L;;;;;N;;;;; +1692F;BAMUM LETTER PHASE-D NYUE;Lo;0;L;;;;;N;;;;; +16930;BAMUM LETTER PHASE-D LET;Lo;0;L;;;;;N;;;;; +16931;BAMUM LETTER PHASE-D NGGAAM;Lo;0;L;;;;;N;;;;; +16932;BAMUM LETTER PHASE-D MFIEE;Lo;0;L;;;;;N;;;;; +16933;BAMUM LETTER PHASE-D NGGWAEN;Lo;0;L;;;;;N;;;;; +16934;BAMUM LETTER PHASE-D YUOM;Lo;0;L;;;;;N;;;;; +16935;BAMUM LETTER PHASE-D PAP;Lo;0;L;;;;;N;;;;; +16936;BAMUM LETTER PHASE-D YUOP;Lo;0;L;;;;;N;;;;; +16937;BAMUM LETTER PHASE-D NDAM;Lo;0;L;;;;;N;;;;; +16938;BAMUM LETTER PHASE-D NTEUM;Lo;0;L;;;;;N;;;;; +16939;BAMUM LETTER PHASE-D SUAE;Lo;0;L;;;;;N;;;;; +1693A;BAMUM LETTER PHASE-D KUN;Lo;0;L;;;;;N;;;;; +1693B;BAMUM LETTER PHASE-D NGGEUX;Lo;0;L;;;;;N;;;;; +1693C;BAMUM LETTER PHASE-D NGKIEE;Lo;0;L;;;;;N;;;;; +1693D;BAMUM LETTER PHASE-D TUOT;Lo;0;L;;;;;N;;;;; +1693E;BAMUM LETTER PHASE-D MEUN;Lo;0;L;;;;;N;;;;; +1693F;BAMUM LETTER PHASE-D KUQ;Lo;0;L;;;;;N;;;;; +16940;BAMUM LETTER PHASE-D NSUM;Lo;0;L;;;;;N;;;;; +16941;BAMUM LETTER PHASE-D TEUN;Lo;0;L;;;;;N;;;;; +16942;BAMUM LETTER PHASE-D MAENJET;Lo;0;L;;;;;N;;;;; +16943;BAMUM LETTER PHASE-D NGGAP;Lo;0;L;;;;;N;;;;; +16944;BAMUM LETTER PHASE-D LEUM;Lo;0;L;;;;;N;;;;; +16945;BAMUM LETTER PHASE-D NGGUOM;Lo;0;L;;;;;N;;;;; +16946;BAMUM LETTER PHASE-D NSHUT;Lo;0;L;;;;;N;;;;; +16947;BAMUM LETTER PHASE-D NJUEQ;Lo;0;L;;;;;N;;;;; +16948;BAMUM LETTER PHASE-D GHEUAE;Lo;0;L;;;;;N;;;;; +16949;BAMUM LETTER PHASE-D KU;Lo;0;L;;;;;N;;;;; +1694A;BAMUM LETTER PHASE-D REN OLD;Lo;0;L;;;;;N;;;;; +1694B;BAMUM LETTER PHASE-D TAE;Lo;0;L;;;;;N;;;;; +1694C;BAMUM LETTER PHASE-D TOQ;Lo;0;L;;;;;N;;;;; +1694D;BAMUM LETTER PHASE-D NYI;Lo;0;L;;;;;N;;;;; +1694E;BAMUM LETTER PHASE-D RII;Lo;0;L;;;;;N;;;;; +1694F;BAMUM LETTER PHASE-D LEEEE;Lo;0;L;;;;;N;;;;; +16950;BAMUM LETTER PHASE-D MEEEE;Lo;0;L;;;;;N;;;;; +16951;BAMUM LETTER PHASE-D M;Lo;0;L;;;;;N;;;;; +16952;BAMUM LETTER PHASE-D SUU;Lo;0;L;;;;;N;;;;; +16953;BAMUM LETTER PHASE-D MU;Lo;0;L;;;;;N;;;;; +16954;BAMUM LETTER PHASE-D SHII;Lo;0;L;;;;;N;;;;; +16955;BAMUM LETTER PHASE-D SHEUX;Lo;0;L;;;;;N;;;;; +16956;BAMUM LETTER PHASE-D KYEE;Lo;0;L;;;;;N;;;;; +16957;BAMUM LETTER PHASE-D NU;Lo;0;L;;;;;N;;;;; +16958;BAMUM LETTER PHASE-D SHU;Lo;0;L;;;;;N;;;;; +16959;BAMUM LETTER PHASE-D NTEE;Lo;0;L;;;;;N;;;;; +1695A;BAMUM LETTER PHASE-D PEE;Lo;0;L;;;;;N;;;;; +1695B;BAMUM LETTER PHASE-D NI;Lo;0;L;;;;;N;;;;; +1695C;BAMUM LETTER PHASE-D SHOQ;Lo;0;L;;;;;N;;;;; +1695D;BAMUM LETTER PHASE-D PUQ;Lo;0;L;;;;;N;;;;; +1695E;BAMUM LETTER PHASE-D MVOP;Lo;0;L;;;;;N;;;;; +1695F;BAMUM LETTER PHASE-D LOQ;Lo;0;L;;;;;N;;;;; +16960;BAMUM LETTER PHASE-D REN MUCH;Lo;0;L;;;;;N;;;;; +16961;BAMUM LETTER PHASE-D TI;Lo;0;L;;;;;N;;;;; +16962;BAMUM LETTER PHASE-D NTUU;Lo;0;L;;;;;N;;;;; +16963;BAMUM LETTER PHASE-D MBAA SEVEN;Lo;0;L;;;;;N;;;;; +16964;BAMUM LETTER PHASE-D SAQ;Lo;0;L;;;;;N;;;;; +16965;BAMUM LETTER PHASE-D FAA;Lo;0;L;;;;;N;;;;; +16966;BAMUM LETTER PHASE-E NDAP;Lo;0;L;;;;;N;;;;; +16967;BAMUM LETTER PHASE-E TOON;Lo;0;L;;;;;N;;;;; +16968;BAMUM LETTER PHASE-E MBEUM;Lo;0;L;;;;;N;;;;; +16969;BAMUM LETTER PHASE-E LAP;Lo;0;L;;;;;N;;;;; +1696A;BAMUM LETTER PHASE-E VOM;Lo;0;L;;;;;N;;;;; +1696B;BAMUM LETTER PHASE-E LOON;Lo;0;L;;;;;N;;;;; +1696C;BAMUM LETTER PHASE-E PAA;Lo;0;L;;;;;N;;;;; +1696D;BAMUM LETTER PHASE-E SOM;Lo;0;L;;;;;N;;;;; +1696E;BAMUM LETTER PHASE-E RAQ;Lo;0;L;;;;;N;;;;; +1696F;BAMUM LETTER PHASE-E NSHUOP;Lo;0;L;;;;;N;;;;; +16970;BAMUM LETTER PHASE-E NDUN;Lo;0;L;;;;;N;;;;; +16971;BAMUM LETTER PHASE-E PUAE;Lo;0;L;;;;;N;;;;; +16972;BAMUM LETTER PHASE-E TAM;Lo;0;L;;;;;N;;;;; +16973;BAMUM LETTER PHASE-E NGKA;Lo;0;L;;;;;N;;;;; +16974;BAMUM LETTER PHASE-E KPEUX;Lo;0;L;;;;;N;;;;; +16975;BAMUM LETTER PHASE-E WUO;Lo;0;L;;;;;N;;;;; +16976;BAMUM LETTER PHASE-E SEE;Lo;0;L;;;;;N;;;;; +16977;BAMUM LETTER PHASE-E NGGEUAET;Lo;0;L;;;;;N;;;;; +16978;BAMUM LETTER PHASE-E PAAM;Lo;0;L;;;;;N;;;;; +16979;BAMUM LETTER PHASE-E TOO;Lo;0;L;;;;;N;;;;; +1697A;BAMUM LETTER PHASE-E KUOP;Lo;0;L;;;;;N;;;;; +1697B;BAMUM LETTER PHASE-E LOM;Lo;0;L;;;;;N;;;;; +1697C;BAMUM LETTER PHASE-E NSHIEE;Lo;0;L;;;;;N;;;;; +1697D;BAMUM LETTER PHASE-E NGOP;Lo;0;L;;;;;N;;;;; +1697E;BAMUM LETTER PHASE-E MAEM;Lo;0;L;;;;;N;;;;; +1697F;BAMUM LETTER PHASE-E NGKEUX;Lo;0;L;;;;;N;;;;; +16980;BAMUM LETTER PHASE-E NGOQ;Lo;0;L;;;;;N;;;;; +16981;BAMUM LETTER PHASE-E NSHUE;Lo;0;L;;;;;N;;;;; +16982;BAMUM LETTER PHASE-E RIMGBA;Lo;0;L;;;;;N;;;;; +16983;BAMUM LETTER PHASE-E NJEUX;Lo;0;L;;;;;N;;;;; +16984;BAMUM LETTER PHASE-E PEEM;Lo;0;L;;;;;N;;;;; +16985;BAMUM LETTER PHASE-E SAA;Lo;0;L;;;;;N;;;;; +16986;BAMUM LETTER PHASE-E NGGURAE;Lo;0;L;;;;;N;;;;; +16987;BAMUM LETTER PHASE-E MGBA;Lo;0;L;;;;;N;;;;; +16988;BAMUM LETTER PHASE-E GHEUX;Lo;0;L;;;;;N;;;;; +16989;BAMUM LETTER PHASE-E NGKEUAEM;Lo;0;L;;;;;N;;;;; +1698A;BAMUM LETTER PHASE-E NJAEMLI;Lo;0;L;;;;;N;;;;; +1698B;BAMUM LETTER PHASE-E MAP;Lo;0;L;;;;;N;;;;; +1698C;BAMUM LETTER PHASE-E LOOT;Lo;0;L;;;;;N;;;;; +1698D;BAMUM LETTER PHASE-E NGGEEEE;Lo;0;L;;;;;N;;;;; +1698E;BAMUM LETTER PHASE-E NDIQ;Lo;0;L;;;;;N;;;;; +1698F;BAMUM LETTER PHASE-E TAEN NTEUM;Lo;0;L;;;;;N;;;;; +16990;BAMUM LETTER PHASE-E SET;Lo;0;L;;;;;N;;;;; +16991;BAMUM LETTER PHASE-E PUM;Lo;0;L;;;;;N;;;;; +16992;BAMUM LETTER PHASE-E NDAA SOFTNESS;Lo;0;L;;;;;N;;;;; +16993;BAMUM LETTER PHASE-E NGGUAESHAE NYAM;Lo;0;L;;;;;N;;;;; +16994;BAMUM LETTER PHASE-E YIEE;Lo;0;L;;;;;N;;;;; +16995;BAMUM LETTER PHASE-E GHEUN;Lo;0;L;;;;;N;;;;; +16996;BAMUM LETTER PHASE-E TUAE;Lo;0;L;;;;;N;;;;; +16997;BAMUM LETTER PHASE-E YEUAE;Lo;0;L;;;;;N;;;;; +16998;BAMUM LETTER PHASE-E PO;Lo;0;L;;;;;N;;;;; +16999;BAMUM LETTER PHASE-E TUMAE;Lo;0;L;;;;;N;;;;; +1699A;BAMUM LETTER PHASE-E KEUAE;Lo;0;L;;;;;N;;;;; +1699B;BAMUM LETTER PHASE-E SUAEN;Lo;0;L;;;;;N;;;;; +1699C;BAMUM LETTER PHASE-E TEUAEQ;Lo;0;L;;;;;N;;;;; +1699D;BAMUM LETTER PHASE-E VEUAE;Lo;0;L;;;;;N;;;;; +1699E;BAMUM LETTER PHASE-E WEUX;Lo;0;L;;;;;N;;;;; +1699F;BAMUM LETTER PHASE-E LAAM;Lo;0;L;;;;;N;;;;; +169A0;BAMUM LETTER PHASE-E PU;Lo;0;L;;;;;N;;;;; +169A1;BAMUM LETTER PHASE-E TAAQ;Lo;0;L;;;;;N;;;;; +169A2;BAMUM LETTER PHASE-E GHAAMAE;Lo;0;L;;;;;N;;;;; +169A3;BAMUM LETTER PHASE-E NGEUREUT;Lo;0;L;;;;;N;;;;; +169A4;BAMUM LETTER PHASE-E SHEUAEQ;Lo;0;L;;;;;N;;;;; +169A5;BAMUM LETTER PHASE-E MGBEN;Lo;0;L;;;;;N;;;;; +169A6;BAMUM LETTER PHASE-E MBEE;Lo;0;L;;;;;N;;;;; +169A7;BAMUM LETTER PHASE-E NZAQ;Lo;0;L;;;;;N;;;;; +169A8;BAMUM LETTER PHASE-E NKOM;Lo;0;L;;;;;N;;;;; +169A9;BAMUM LETTER PHASE-E GBET;Lo;0;L;;;;;N;;;;; +169AA;BAMUM LETTER PHASE-E TUM;Lo;0;L;;;;;N;;;;; +169AB;BAMUM LETTER PHASE-E KUET;Lo;0;L;;;;;N;;;;; +169AC;BAMUM LETTER PHASE-E YAP;Lo;0;L;;;;;N;;;;; +169AD;BAMUM LETTER PHASE-E NYI CLEAVER;Lo;0;L;;;;;N;;;;; +169AE;BAMUM LETTER PHASE-E YIT;Lo;0;L;;;;;N;;;;; +169AF;BAMUM LETTER PHASE-E MFEUQ;Lo;0;L;;;;;N;;;;; +169B0;BAMUM LETTER PHASE-E NDIAQ;Lo;0;L;;;;;N;;;;; +169B1;BAMUM LETTER PHASE-E PIEEQ;Lo;0;L;;;;;N;;;;; +169B2;BAMUM LETTER PHASE-E YUEQ;Lo;0;L;;;;;N;;;;; +169B3;BAMUM LETTER PHASE-E LEUAEM;Lo;0;L;;;;;N;;;;; +169B4;BAMUM LETTER PHASE-E FUE;Lo;0;L;;;;;N;;;;; +169B5;BAMUM LETTER PHASE-E GBEUX;Lo;0;L;;;;;N;;;;; +169B6;BAMUM LETTER PHASE-E NGKUP;Lo;0;L;;;;;N;;;;; +169B7;BAMUM LETTER PHASE-E KET;Lo;0;L;;;;;N;;;;; +169B8;BAMUM LETTER PHASE-E MAE;Lo;0;L;;;;;N;;;;; +169B9;BAMUM LETTER PHASE-E NGKAAMI;Lo;0;L;;;;;N;;;;; +169BA;BAMUM LETTER PHASE-E GHET;Lo;0;L;;;;;N;;;;; +169BB;BAMUM LETTER PHASE-E FA;Lo;0;L;;;;;N;;;;; +169BC;BAMUM LETTER PHASE-E NTUM;Lo;0;L;;;;;N;;;;; +169BD;BAMUM LETTER PHASE-E PEUT;Lo;0;L;;;;;N;;;;; +169BE;BAMUM LETTER PHASE-E YEUM;Lo;0;L;;;;;N;;;;; +169BF;BAMUM LETTER PHASE-E NGGEUAE;Lo;0;L;;;;;N;;;;; +169C0;BAMUM LETTER PHASE-E NYI BETWEEN;Lo;0;L;;;;;N;;;;; +169C1;BAMUM LETTER PHASE-E NZUQ;Lo;0;L;;;;;N;;;;; +169C2;BAMUM LETTER PHASE-E POON;Lo;0;L;;;;;N;;;;; +169C3;BAMUM LETTER PHASE-E MIEE;Lo;0;L;;;;;N;;;;; +169C4;BAMUM LETTER PHASE-E FUET;Lo;0;L;;;;;N;;;;; +169C5;BAMUM LETTER PHASE-E NAE;Lo;0;L;;;;;N;;;;; +169C6;BAMUM LETTER PHASE-E MUAE;Lo;0;L;;;;;N;;;;; +169C7;BAMUM LETTER PHASE-E GHEUAE;Lo;0;L;;;;;N;;;;; +169C8;BAMUM LETTER PHASE-E FU I;Lo;0;L;;;;;N;;;;; +169C9;BAMUM LETTER PHASE-E MVI;Lo;0;L;;;;;N;;;;; +169CA;BAMUM LETTER PHASE-E PUAQ;Lo;0;L;;;;;N;;;;; +169CB;BAMUM LETTER PHASE-E NGKUM;Lo;0;L;;;;;N;;;;; +169CC;BAMUM LETTER PHASE-E KUT;Lo;0;L;;;;;N;;;;; +169CD;BAMUM LETTER PHASE-E PIET;Lo;0;L;;;;;N;;;;; +169CE;BAMUM LETTER PHASE-E NTAP;Lo;0;L;;;;;N;;;;; +169CF;BAMUM LETTER PHASE-E YEUAET;Lo;0;L;;;;;N;;;;; +169D0;BAMUM LETTER PHASE-E NGGUP;Lo;0;L;;;;;N;;;;; +169D1;BAMUM LETTER PHASE-E PA PEOPLE;Lo;0;L;;;;;N;;;;; +169D2;BAMUM LETTER PHASE-E FU CALL;Lo;0;L;;;;;N;;;;; +169D3;BAMUM LETTER PHASE-E FOM;Lo;0;L;;;;;N;;;;; +169D4;BAMUM LETTER PHASE-E NJEE;Lo;0;L;;;;;N;;;;; +169D5;BAMUM LETTER PHASE-E A;Lo;0;L;;;;;N;;;;; +169D6;BAMUM LETTER PHASE-E TOQ;Lo;0;L;;;;;N;;;;; +169D7;BAMUM LETTER PHASE-E O;Lo;0;L;;;;;N;;;;; +169D8;BAMUM LETTER PHASE-E I;Lo;0;L;;;;;N;;;;; +169D9;BAMUM LETTER PHASE-E LAQ;Lo;0;L;;;;;N;;;;; +169DA;BAMUM LETTER PHASE-E PA PLURAL;Lo;0;L;;;;;N;;;;; +169DB;BAMUM LETTER PHASE-E TAA;Lo;0;L;;;;;N;;;;; +169DC;BAMUM LETTER PHASE-E TAQ;Lo;0;L;;;;;N;;;;; +169DD;BAMUM LETTER PHASE-E NDAA MY HOUSE;Lo;0;L;;;;;N;;;;; +169DE;BAMUM LETTER PHASE-E SHIQ;Lo;0;L;;;;;N;;;;; +169DF;BAMUM LETTER PHASE-E YEUX;Lo;0;L;;;;;N;;;;; +169E0;BAMUM LETTER PHASE-E NGUAE;Lo;0;L;;;;;N;;;;; +169E1;BAMUM LETTER PHASE-E YUAEN;Lo;0;L;;;;;N;;;;; +169E2;BAMUM LETTER PHASE-E YOQ SWIMMING;Lo;0;L;;;;;N;;;;; +169E3;BAMUM LETTER PHASE-E YOQ COVER;Lo;0;L;;;;;N;;;;; +169E4;BAMUM LETTER PHASE-E YUQ;Lo;0;L;;;;;N;;;;; +169E5;BAMUM LETTER PHASE-E YUN;Lo;0;L;;;;;N;;;;; +169E6;BAMUM LETTER PHASE-E KEUX;Lo;0;L;;;;;N;;;;; +169E7;BAMUM LETTER PHASE-E PEUX;Lo;0;L;;;;;N;;;;; +169E8;BAMUM LETTER PHASE-E NJEE EPOCH;Lo;0;L;;;;;N;;;;; +169E9;BAMUM LETTER PHASE-E PUE;Lo;0;L;;;;;N;;;;; +169EA;BAMUM LETTER PHASE-E WUE;Lo;0;L;;;;;N;;;;; +169EB;BAMUM LETTER PHASE-E FEE;Lo;0;L;;;;;N;;;;; +169EC;BAMUM LETTER PHASE-E VEE;Lo;0;L;;;;;N;;;;; +169ED;BAMUM LETTER PHASE-E LU;Lo;0;L;;;;;N;;;;; +169EE;BAMUM LETTER PHASE-E MI;Lo;0;L;;;;;N;;;;; +169EF;BAMUM LETTER PHASE-E REUX;Lo;0;L;;;;;N;;;;; +169F0;BAMUM LETTER PHASE-E RAE;Lo;0;L;;;;;N;;;;; +169F1;BAMUM LETTER PHASE-E NGUAET;Lo;0;L;;;;;N;;;;; +169F2;BAMUM LETTER PHASE-E NGA;Lo;0;L;;;;;N;;;;; +169F3;BAMUM LETTER PHASE-E SHO;Lo;0;L;;;;;N;;;;; +169F4;BAMUM LETTER PHASE-E SHOQ;Lo;0;L;;;;;N;;;;; +169F5;BAMUM LETTER PHASE-E FU REMEDY;Lo;0;L;;;;;N;;;;; +169F6;BAMUM LETTER PHASE-E NA;Lo;0;L;;;;;N;;;;; +169F7;BAMUM LETTER PHASE-E PI;Lo;0;L;;;;;N;;;;; +169F8;BAMUM LETTER PHASE-E LOQ;Lo;0;L;;;;;N;;;;; +169F9;BAMUM LETTER PHASE-E KO;Lo;0;L;;;;;N;;;;; +169FA;BAMUM LETTER PHASE-E MEN;Lo;0;L;;;;;N;;;;; +169FB;BAMUM LETTER PHASE-E MA;Lo;0;L;;;;;N;;;;; +169FC;BAMUM LETTER PHASE-E MAQ;Lo;0;L;;;;;N;;;;; +169FD;BAMUM LETTER PHASE-E TEU;Lo;0;L;;;;;N;;;;; +169FE;BAMUM LETTER PHASE-E KI;Lo;0;L;;;;;N;;;;; +169FF;BAMUM LETTER PHASE-E MON;Lo;0;L;;;;;N;;;;; +16A00;BAMUM LETTER PHASE-E TEN;Lo;0;L;;;;;N;;;;; +16A01;BAMUM LETTER PHASE-E FAQ;Lo;0;L;;;;;N;;;;; +16A02;BAMUM LETTER PHASE-E GHOM;Lo;0;L;;;;;N;;;;; +16A03;BAMUM LETTER PHASE-F KA;Lo;0;L;;;;;N;;;;; +16A04;BAMUM LETTER PHASE-F U;Lo;0;L;;;;;N;;;;; +16A05;BAMUM LETTER PHASE-F KU;Lo;0;L;;;;;N;;;;; +16A06;BAMUM LETTER PHASE-F EE;Lo;0;L;;;;;N;;;;; +16A07;BAMUM LETTER PHASE-F REE;Lo;0;L;;;;;N;;;;; +16A08;BAMUM LETTER PHASE-F TAE;Lo;0;L;;;;;N;;;;; +16A09;BAMUM LETTER PHASE-F NYI;Lo;0;L;;;;;N;;;;; +16A0A;BAMUM LETTER PHASE-F LA;Lo;0;L;;;;;N;;;;; +16A0B;BAMUM LETTER PHASE-F RII;Lo;0;L;;;;;N;;;;; +16A0C;BAMUM LETTER PHASE-F RIEE;Lo;0;L;;;;;N;;;;; +16A0D;BAMUM LETTER PHASE-F MEEEE;Lo;0;L;;;;;N;;;;; +16A0E;BAMUM LETTER PHASE-F TAA;Lo;0;L;;;;;N;;;;; +16A0F;BAMUM LETTER PHASE-F NDAA;Lo;0;L;;;;;N;;;;; +16A10;BAMUM LETTER PHASE-F NJAEM;Lo;0;L;;;;;N;;;;; +16A11;BAMUM LETTER PHASE-F M;Lo;0;L;;;;;N;;;;; +16A12;BAMUM LETTER PHASE-F SUU;Lo;0;L;;;;;N;;;;; +16A13;BAMUM LETTER PHASE-F SHII;Lo;0;L;;;;;N;;;;; +16A14;BAMUM LETTER PHASE-F SI;Lo;0;L;;;;;N;;;;; +16A15;BAMUM LETTER PHASE-F SEUX;Lo;0;L;;;;;N;;;;; +16A16;BAMUM LETTER PHASE-F KYEE;Lo;0;L;;;;;N;;;;; +16A17;BAMUM LETTER PHASE-F KET;Lo;0;L;;;;;N;;;;; +16A18;BAMUM LETTER PHASE-F NUAE;Lo;0;L;;;;;N;;;;; +16A19;BAMUM LETTER PHASE-F NU;Lo;0;L;;;;;N;;;;; +16A1A;BAMUM LETTER PHASE-F NJUAE;Lo;0;L;;;;;N;;;;; +16A1B;BAMUM LETTER PHASE-F YOQ;Lo;0;L;;;;;N;;;;; +16A1C;BAMUM LETTER PHASE-F SHU;Lo;0;L;;;;;N;;;;; +16A1D;BAMUM LETTER PHASE-F YA;Lo;0;L;;;;;N;;;;; +16A1E;BAMUM LETTER PHASE-F NSHA;Lo;0;L;;;;;N;;;;; +16A1F;BAMUM LETTER PHASE-F PEUX;Lo;0;L;;;;;N;;;;; +16A20;BAMUM LETTER PHASE-F NTEE;Lo;0;L;;;;;N;;;;; +16A21;BAMUM LETTER PHASE-F WUE;Lo;0;L;;;;;N;;;;; +16A22;BAMUM LETTER PHASE-F PEE;Lo;0;L;;;;;N;;;;; +16A23;BAMUM LETTER PHASE-F RU;Lo;0;L;;;;;N;;;;; +16A24;BAMUM LETTER PHASE-F NI;Lo;0;L;;;;;N;;;;; +16A25;BAMUM LETTER PHASE-F REUX;Lo;0;L;;;;;N;;;;; +16A26;BAMUM LETTER PHASE-F KEN;Lo;0;L;;;;;N;;;;; +16A27;BAMUM LETTER PHASE-F NGKWAEN;Lo;0;L;;;;;N;;;;; +16A28;BAMUM LETTER PHASE-F NGGA;Lo;0;L;;;;;N;;;;; +16A29;BAMUM LETTER PHASE-F SHO;Lo;0;L;;;;;N;;;;; +16A2A;BAMUM LETTER PHASE-F PUAE;Lo;0;L;;;;;N;;;;; +16A2B;BAMUM LETTER PHASE-F FOM;Lo;0;L;;;;;N;;;;; +16A2C;BAMUM LETTER PHASE-F WA;Lo;0;L;;;;;N;;;;; +16A2D;BAMUM LETTER PHASE-F LI;Lo;0;L;;;;;N;;;;; +16A2E;BAMUM LETTER PHASE-F LOQ;Lo;0;L;;;;;N;;;;; +16A2F;BAMUM LETTER PHASE-F KO;Lo;0;L;;;;;N;;;;; +16A30;BAMUM LETTER PHASE-F MBEN;Lo;0;L;;;;;N;;;;; +16A31;BAMUM LETTER PHASE-F REN;Lo;0;L;;;;;N;;;;; +16A32;BAMUM LETTER PHASE-F MA;Lo;0;L;;;;;N;;;;; +16A33;BAMUM LETTER PHASE-F MO;Lo;0;L;;;;;N;;;;; +16A34;BAMUM LETTER PHASE-F MBAA;Lo;0;L;;;;;N;;;;; +16A35;BAMUM LETTER PHASE-F TET;Lo;0;L;;;;;N;;;;; +16A36;BAMUM LETTER PHASE-F KPA;Lo;0;L;;;;;N;;;;; +16A37;BAMUM LETTER PHASE-F SAMBA;Lo;0;L;;;;;N;;;;; +16A38;BAMUM LETTER PHASE-F VUEQ;Lo;0;L;;;;;N;;;;; +16A40;MRO LETTER TA;Lo;0;L;;;;;N;;;;; +16A41;MRO LETTER NGI;Lo;0;L;;;;;N;;;;; +16A42;MRO LETTER YO;Lo;0;L;;;;;N;;;;; +16A43;MRO LETTER MIM;Lo;0;L;;;;;N;;;;; +16A44;MRO LETTER BA;Lo;0;L;;;;;N;;;;; +16A45;MRO LETTER DA;Lo;0;L;;;;;N;;;;; +16A46;MRO LETTER A;Lo;0;L;;;;;N;;;;; +16A47;MRO LETTER PHI;Lo;0;L;;;;;N;;;;; +16A48;MRO LETTER KHAI;Lo;0;L;;;;;N;;;;; +16A49;MRO LETTER HAO;Lo;0;L;;;;;N;;;;; +16A4A;MRO LETTER DAI;Lo;0;L;;;;;N;;;;; +16A4B;MRO LETTER CHU;Lo;0;L;;;;;N;;;;; +16A4C;MRO LETTER KEAAE;Lo;0;L;;;;;N;;;;; +16A4D;MRO LETTER OL;Lo;0;L;;;;;N;;;;; +16A4E;MRO LETTER MAEM;Lo;0;L;;;;;N;;;;; +16A4F;MRO LETTER NIN;Lo;0;L;;;;;N;;;;; +16A50;MRO LETTER PA;Lo;0;L;;;;;N;;;;; +16A51;MRO LETTER OO;Lo;0;L;;;;;N;;;;; +16A52;MRO LETTER O;Lo;0;L;;;;;N;;;;; +16A53;MRO LETTER RO;Lo;0;L;;;;;N;;;;; +16A54;MRO LETTER SHI;Lo;0;L;;;;;N;;;;; +16A55;MRO LETTER THEA;Lo;0;L;;;;;N;;;;; +16A56;MRO LETTER EA;Lo;0;L;;;;;N;;;;; +16A57;MRO LETTER WA;Lo;0;L;;;;;N;;;;; +16A58;MRO LETTER E;Lo;0;L;;;;;N;;;;; +16A59;MRO LETTER KO;Lo;0;L;;;;;N;;;;; +16A5A;MRO LETTER LAN;Lo;0;L;;;;;N;;;;; +16A5B;MRO LETTER LA;Lo;0;L;;;;;N;;;;; +16A5C;MRO LETTER HAI;Lo;0;L;;;;;N;;;;; +16A5D;MRO LETTER RI;Lo;0;L;;;;;N;;;;; +16A5E;MRO LETTER TEK;Lo;0;L;;;;;N;;;;; +16A60;MRO DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +16A61;MRO DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +16A62;MRO DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +16A63;MRO DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +16A64;MRO DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +16A65;MRO DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +16A66;MRO DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +16A67;MRO DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +16A68;MRO DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +16A69;MRO DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +16A6E;MRO DANDA;Po;0;L;;;;;N;;;;; +16A6F;MRO DOUBLE DANDA;Po;0;L;;;;;N;;;;; +16A70;TANGSA LETTER OZ;Lo;0;L;;;;;N;;;;; +16A71;TANGSA LETTER OC;Lo;0;L;;;;;N;;;;; +16A72;TANGSA LETTER OQ;Lo;0;L;;;;;N;;;;; +16A73;TANGSA LETTER OX;Lo;0;L;;;;;N;;;;; +16A74;TANGSA LETTER AZ;Lo;0;L;;;;;N;;;;; +16A75;TANGSA LETTER AC;Lo;0;L;;;;;N;;;;; +16A76;TANGSA LETTER AQ;Lo;0;L;;;;;N;;;;; +16A77;TANGSA LETTER AX;Lo;0;L;;;;;N;;;;; +16A78;TANGSA LETTER VZ;Lo;0;L;;;;;N;;;;; +16A79;TANGSA LETTER VC;Lo;0;L;;;;;N;;;;; +16A7A;TANGSA LETTER VQ;Lo;0;L;;;;;N;;;;; +16A7B;TANGSA LETTER VX;Lo;0;L;;;;;N;;;;; +16A7C;TANGSA LETTER EZ;Lo;0;L;;;;;N;;;;; +16A7D;TANGSA LETTER EC;Lo;0;L;;;;;N;;;;; +16A7E;TANGSA LETTER EQ;Lo;0;L;;;;;N;;;;; +16A7F;TANGSA LETTER EX;Lo;0;L;;;;;N;;;;; +16A80;TANGSA LETTER IZ;Lo;0;L;;;;;N;;;;; +16A81;TANGSA LETTER IC;Lo;0;L;;;;;N;;;;; +16A82;TANGSA LETTER IQ;Lo;0;L;;;;;N;;;;; +16A83;TANGSA LETTER IX;Lo;0;L;;;;;N;;;;; +16A84;TANGSA LETTER UZ;Lo;0;L;;;;;N;;;;; +16A85;TANGSA LETTER UC;Lo;0;L;;;;;N;;;;; +16A86;TANGSA LETTER UQ;Lo;0;L;;;;;N;;;;; +16A87;TANGSA LETTER UX;Lo;0;L;;;;;N;;;;; +16A88;TANGSA LETTER AWZ;Lo;0;L;;;;;N;;;;; +16A89;TANGSA LETTER AWC;Lo;0;L;;;;;N;;;;; +16A8A;TANGSA LETTER AWQ;Lo;0;L;;;;;N;;;;; +16A8B;TANGSA LETTER AWX;Lo;0;L;;;;;N;;;;; +16A8C;TANGSA LETTER UIZ;Lo;0;L;;;;;N;;;;; +16A8D;TANGSA LETTER UIC;Lo;0;L;;;;;N;;;;; +16A8E;TANGSA LETTER UIQ;Lo;0;L;;;;;N;;;;; +16A8F;TANGSA LETTER UIX;Lo;0;L;;;;;N;;;;; +16A90;TANGSA LETTER FINAL NG;Lo;0;L;;;;;N;;;;; +16A91;TANGSA LETTER LONG UEX;Lo;0;L;;;;;N;;;;; +16A92;TANGSA LETTER SHORT UEZ;Lo;0;L;;;;;N;;;;; +16A93;TANGSA LETTER SHORT AWX;Lo;0;L;;;;;N;;;;; +16A94;TANGSA LETTER UEC;Lo;0;L;;;;;N;;;;; +16A95;TANGSA LETTER UEZ;Lo;0;L;;;;;N;;;;; +16A96;TANGSA LETTER UEQ;Lo;0;L;;;;;N;;;;; +16A97;TANGSA LETTER UEX;Lo;0;L;;;;;N;;;;; +16A98;TANGSA LETTER UIUZ;Lo;0;L;;;;;N;;;;; +16A99;TANGSA LETTER UIUC;Lo;0;L;;;;;N;;;;; +16A9A;TANGSA LETTER UIUQ;Lo;0;L;;;;;N;;;;; +16A9B;TANGSA LETTER UIUX;Lo;0;L;;;;;N;;;;; +16A9C;TANGSA LETTER MZ;Lo;0;L;;;;;N;;;;; +16A9D;TANGSA LETTER MC;Lo;0;L;;;;;N;;;;; +16A9E;TANGSA LETTER MQ;Lo;0;L;;;;;N;;;;; +16A9F;TANGSA LETTER MX;Lo;0;L;;;;;N;;;;; +16AA0;TANGSA LETTER KA;Lo;0;L;;;;;N;;;;; +16AA1;TANGSA LETTER KHA;Lo;0;L;;;;;N;;;;; +16AA2;TANGSA LETTER GA;Lo;0;L;;;;;N;;;;; +16AA3;TANGSA LETTER NGA;Lo;0;L;;;;;N;;;;; +16AA4;TANGSA LETTER SA;Lo;0;L;;;;;N;;;;; +16AA5;TANGSA LETTER YA;Lo;0;L;;;;;N;;;;; +16AA6;TANGSA LETTER WA;Lo;0;L;;;;;N;;;;; +16AA7;TANGSA LETTER PA;Lo;0;L;;;;;N;;;;; +16AA8;TANGSA LETTER NYA;Lo;0;L;;;;;N;;;;; +16AA9;TANGSA LETTER PHA;Lo;0;L;;;;;N;;;;; +16AAA;TANGSA LETTER BA;Lo;0;L;;;;;N;;;;; +16AAB;TANGSA LETTER MA;Lo;0;L;;;;;N;;;;; +16AAC;TANGSA LETTER NA;Lo;0;L;;;;;N;;;;; +16AAD;TANGSA LETTER HA;Lo;0;L;;;;;N;;;;; +16AAE;TANGSA LETTER LA;Lo;0;L;;;;;N;;;;; +16AAF;TANGSA LETTER HTA;Lo;0;L;;;;;N;;;;; +16AB0;TANGSA LETTER TA;Lo;0;L;;;;;N;;;;; +16AB1;TANGSA LETTER DA;Lo;0;L;;;;;N;;;;; +16AB2;TANGSA LETTER RA;Lo;0;L;;;;;N;;;;; +16AB3;TANGSA LETTER NHA;Lo;0;L;;;;;N;;;;; +16AB4;TANGSA LETTER SHA;Lo;0;L;;;;;N;;;;; +16AB5;TANGSA LETTER CA;Lo;0;L;;;;;N;;;;; +16AB6;TANGSA LETTER TSA;Lo;0;L;;;;;N;;;;; +16AB7;TANGSA LETTER GHA;Lo;0;L;;;;;N;;;;; +16AB8;TANGSA LETTER HTTA;Lo;0;L;;;;;N;;;;; +16AB9;TANGSA LETTER THA;Lo;0;L;;;;;N;;;;; +16ABA;TANGSA LETTER XA;Lo;0;L;;;;;N;;;;; +16ABB;TANGSA LETTER FA;Lo;0;L;;;;;N;;;;; +16ABC;TANGSA LETTER DHA;Lo;0;L;;;;;N;;;;; +16ABD;TANGSA LETTER CHA;Lo;0;L;;;;;N;;;;; +16ABE;TANGSA LETTER ZA;Lo;0;L;;;;;N;;;;; +16AC0;TANGSA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +16AC1;TANGSA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +16AC2;TANGSA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +16AC3;TANGSA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +16AC4;TANGSA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +16AC5;TANGSA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +16AC6;TANGSA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +16AC7;TANGSA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +16AC8;TANGSA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +16AC9;TANGSA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +16AD0;BASSA VAH LETTER ENNI;Lo;0;L;;;;;N;;;;; +16AD1;BASSA VAH LETTER KA;Lo;0;L;;;;;N;;;;; +16AD2;BASSA VAH LETTER SE;Lo;0;L;;;;;N;;;;; +16AD3;BASSA VAH LETTER FA;Lo;0;L;;;;;N;;;;; +16AD4;BASSA VAH LETTER MBE;Lo;0;L;;;;;N;;;;; +16AD5;BASSA VAH LETTER YIE;Lo;0;L;;;;;N;;;;; +16AD6;BASSA VAH LETTER GAH;Lo;0;L;;;;;N;;;;; +16AD7;BASSA VAH LETTER DHII;Lo;0;L;;;;;N;;;;; +16AD8;BASSA VAH LETTER KPAH;Lo;0;L;;;;;N;;;;; +16AD9;BASSA VAH LETTER JO;Lo;0;L;;;;;N;;;;; +16ADA;BASSA VAH LETTER HWAH;Lo;0;L;;;;;N;;;;; +16ADB;BASSA VAH LETTER WA;Lo;0;L;;;;;N;;;;; +16ADC;BASSA VAH LETTER ZO;Lo;0;L;;;;;N;;;;; +16ADD;BASSA VAH LETTER GBU;Lo;0;L;;;;;N;;;;; +16ADE;BASSA VAH LETTER DO;Lo;0;L;;;;;N;;;;; +16ADF;BASSA VAH LETTER CE;Lo;0;L;;;;;N;;;;; +16AE0;BASSA VAH LETTER UWU;Lo;0;L;;;;;N;;;;; +16AE1;BASSA VAH LETTER TO;Lo;0;L;;;;;N;;;;; +16AE2;BASSA VAH LETTER BA;Lo;0;L;;;;;N;;;;; +16AE3;BASSA VAH LETTER VU;Lo;0;L;;;;;N;;;;; +16AE4;BASSA VAH LETTER YEIN;Lo;0;L;;;;;N;;;;; +16AE5;BASSA VAH LETTER PA;Lo;0;L;;;;;N;;;;; +16AE6;BASSA VAH LETTER WADDA;Lo;0;L;;;;;N;;;;; +16AE7;BASSA VAH LETTER A;Lo;0;L;;;;;N;;;;; +16AE8;BASSA VAH LETTER O;Lo;0;L;;;;;N;;;;; +16AE9;BASSA VAH LETTER OO;Lo;0;L;;;;;N;;;;; +16AEA;BASSA VAH LETTER U;Lo;0;L;;;;;N;;;;; +16AEB;BASSA VAH LETTER EE;Lo;0;L;;;;;N;;;;; +16AEC;BASSA VAH LETTER E;Lo;0;L;;;;;N;;;;; +16AED;BASSA VAH LETTER I;Lo;0;L;;;;;N;;;;; +16AF0;BASSA VAH COMBINING HIGH TONE;Mn;1;NSM;;;;;N;;;;; +16AF1;BASSA VAH COMBINING LOW TONE;Mn;1;NSM;;;;;N;;;;; +16AF2;BASSA VAH COMBINING MID TONE;Mn;1;NSM;;;;;N;;;;; +16AF3;BASSA VAH COMBINING LOW-MID TONE;Mn;1;NSM;;;;;N;;;;; +16AF4;BASSA VAH COMBINING HIGH-LOW TONE;Mn;1;NSM;;;;;N;;;;; +16AF5;BASSA VAH FULL STOP;Po;0;L;;;;;N;;;;; +16B00;PAHAWH HMONG VOWEL KEEB;Lo;0;L;;;;;N;;;;; +16B01;PAHAWH HMONG VOWEL KEEV;Lo;0;L;;;;;N;;;;; +16B02;PAHAWH HMONG VOWEL KIB;Lo;0;L;;;;;N;;;;; +16B03;PAHAWH HMONG VOWEL KIV;Lo;0;L;;;;;N;;;;; +16B04;PAHAWH HMONG VOWEL KAUB;Lo;0;L;;;;;N;;;;; +16B05;PAHAWH HMONG VOWEL KAUV;Lo;0;L;;;;;N;;;;; +16B06;PAHAWH HMONG VOWEL KUB;Lo;0;L;;;;;N;;;;; +16B07;PAHAWH HMONG VOWEL KUV;Lo;0;L;;;;;N;;;;; +16B08;PAHAWH HMONG VOWEL KEB;Lo;0;L;;;;;N;;;;; +16B09;PAHAWH HMONG VOWEL KEV;Lo;0;L;;;;;N;;;;; +16B0A;PAHAWH HMONG VOWEL KAIB;Lo;0;L;;;;;N;;;;; +16B0B;PAHAWH HMONG VOWEL KAIV;Lo;0;L;;;;;N;;;;; +16B0C;PAHAWH HMONG VOWEL KOOB;Lo;0;L;;;;;N;;;;; +16B0D;PAHAWH HMONG VOWEL KOOV;Lo;0;L;;;;;N;;;;; +16B0E;PAHAWH HMONG VOWEL KAWB;Lo;0;L;;;;;N;;;;; +16B0F;PAHAWH HMONG VOWEL KAWV;Lo;0;L;;;;;N;;;;; +16B10;PAHAWH HMONG VOWEL KUAB;Lo;0;L;;;;;N;;;;; +16B11;PAHAWH HMONG VOWEL KUAV;Lo;0;L;;;;;N;;;;; +16B12;PAHAWH HMONG VOWEL KOB;Lo;0;L;;;;;N;;;;; +16B13;PAHAWH HMONG VOWEL KOV;Lo;0;L;;;;;N;;;;; +16B14;PAHAWH HMONG VOWEL KIAB;Lo;0;L;;;;;N;;;;; +16B15;PAHAWH HMONG VOWEL KIAV;Lo;0;L;;;;;N;;;;; +16B16;PAHAWH HMONG VOWEL KAB;Lo;0;L;;;;;N;;;;; +16B17;PAHAWH HMONG VOWEL KAV;Lo;0;L;;;;;N;;;;; +16B18;PAHAWH HMONG VOWEL KWB;Lo;0;L;;;;;N;;;;; +16B19;PAHAWH HMONG VOWEL KWV;Lo;0;L;;;;;N;;;;; +16B1A;PAHAWH HMONG VOWEL KAAB;Lo;0;L;;;;;N;;;;; +16B1B;PAHAWH HMONG VOWEL KAAV;Lo;0;L;;;;;N;;;;; +16B1C;PAHAWH HMONG CONSONANT VAU;Lo;0;L;;;;;N;;;;; +16B1D;PAHAWH HMONG CONSONANT NTSAU;Lo;0;L;;;;;N;;;;; +16B1E;PAHAWH HMONG CONSONANT LAU;Lo;0;L;;;;;N;;;;; +16B1F;PAHAWH HMONG CONSONANT HAU;Lo;0;L;;;;;N;;;;; +16B20;PAHAWH HMONG CONSONANT NLAU;Lo;0;L;;;;;N;;;;; +16B21;PAHAWH HMONG CONSONANT RAU;Lo;0;L;;;;;N;;;;; +16B22;PAHAWH HMONG CONSONANT NKAU;Lo;0;L;;;;;N;;;;; +16B23;PAHAWH HMONG CONSONANT QHAU;Lo;0;L;;;;;N;;;;; +16B24;PAHAWH HMONG CONSONANT YAU;Lo;0;L;;;;;N;;;;; +16B25;PAHAWH HMONG CONSONANT HLAU;Lo;0;L;;;;;N;;;;; +16B26;PAHAWH HMONG CONSONANT MAU;Lo;0;L;;;;;N;;;;; +16B27;PAHAWH HMONG CONSONANT CHAU;Lo;0;L;;;;;N;;;;; +16B28;PAHAWH HMONG CONSONANT NCHAU;Lo;0;L;;;;;N;;;;; +16B29;PAHAWH HMONG CONSONANT HNAU;Lo;0;L;;;;;N;;;;; +16B2A;PAHAWH HMONG CONSONANT PLHAU;Lo;0;L;;;;;N;;;;; +16B2B;PAHAWH HMONG CONSONANT NTHAU;Lo;0;L;;;;;N;;;;; +16B2C;PAHAWH HMONG CONSONANT NAU;Lo;0;L;;;;;N;;;;; +16B2D;PAHAWH HMONG CONSONANT AU;Lo;0;L;;;;;N;;;;; +16B2E;PAHAWH HMONG CONSONANT XAU;Lo;0;L;;;;;N;;;;; +16B2F;PAHAWH HMONG CONSONANT CAU;Lo;0;L;;;;;N;;;;; +16B30;PAHAWH HMONG MARK CIM TUB;Mn;230;NSM;;;;;N;;;;; +16B31;PAHAWH HMONG MARK CIM SO;Mn;230;NSM;;;;;N;;;;; +16B32;PAHAWH HMONG MARK CIM KES;Mn;230;NSM;;;;;N;;;;; +16B33;PAHAWH HMONG MARK CIM KHAV;Mn;230;NSM;;;;;N;;;;; +16B34;PAHAWH HMONG MARK CIM SUAM;Mn;230;NSM;;;;;N;;;;; +16B35;PAHAWH HMONG MARK CIM HOM;Mn;230;NSM;;;;;N;;;;; +16B36;PAHAWH HMONG MARK CIM TAUM;Mn;230;NSM;;;;;N;;;;; +16B37;PAHAWH HMONG SIGN VOS THOM;Po;0;L;;;;;N;;;;; +16B38;PAHAWH HMONG SIGN VOS TSHAB CEEB;Po;0;L;;;;;N;;;;; +16B39;PAHAWH HMONG SIGN CIM CHEEM;Po;0;L;;;;;N;;;;; +16B3A;PAHAWH HMONG SIGN VOS THIAB;Po;0;L;;;;;N;;;;; +16B3B;PAHAWH HMONG SIGN VOS FEEM;Po;0;L;;;;;N;;;;; +16B3C;PAHAWH HMONG SIGN XYEEM NTXIV;So;0;L;;;;;N;;;;; +16B3D;PAHAWH HMONG SIGN XYEEM RHO;So;0;L;;;;;N;;;;; +16B3E;PAHAWH HMONG SIGN XYEEM TOV;So;0;L;;;;;N;;;;; +16B3F;PAHAWH HMONG SIGN XYEEM FAIB;So;0;L;;;;;N;;;;; +16B40;PAHAWH HMONG SIGN VOS SEEV;Lm;0;L;;;;;N;;;;; +16B41;PAHAWH HMONG SIGN MEEJ SUAB;Lm;0;L;;;;;N;;;;; +16B42;PAHAWH HMONG SIGN VOS NRUA;Lm;0;L;;;;;N;;;;; +16B43;PAHAWH HMONG SIGN IB YAM;Lm;0;L;;;;;N;;;;; +16B44;PAHAWH HMONG SIGN XAUS;Po;0;L;;;;;N;;;;; +16B45;PAHAWH HMONG SIGN CIM TSOV ROG;So;0;L;;;;;N;;;;; +16B50;PAHAWH HMONG DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +16B51;PAHAWH HMONG DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +16B52;PAHAWH HMONG DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +16B53;PAHAWH HMONG DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +16B54;PAHAWH HMONG DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +16B55;PAHAWH HMONG DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +16B56;PAHAWH HMONG DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +16B57;PAHAWH HMONG DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +16B58;PAHAWH HMONG DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +16B59;PAHAWH HMONG DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +16B5B;PAHAWH HMONG NUMBER TENS;No;0;L;;;;10;N;;;;; +16B5C;PAHAWH HMONG NUMBER HUNDREDS;No;0;L;;;;100;N;;;;; +16B5D;PAHAWH HMONG NUMBER TEN THOUSANDS;No;0;L;;;;10000;N;;;;; +16B5E;PAHAWH HMONG NUMBER MILLIONS;No;0;L;;;;1000000;N;;;;; +16B5F;PAHAWH HMONG NUMBER HUNDRED MILLIONS;No;0;L;;;;100000000;N;;;;; +16B60;PAHAWH HMONG NUMBER TEN BILLIONS;No;0;L;;;;10000000000;N;;;;; +16B61;PAHAWH HMONG NUMBER TRILLIONS;No;0;L;;;;1000000000000;N;;;;; +16B63;PAHAWH HMONG SIGN VOS LUB;Lo;0;L;;;;;N;;;;; +16B64;PAHAWH HMONG SIGN XYOO;Lo;0;L;;;;;N;;;;; +16B65;PAHAWH HMONG SIGN HLI;Lo;0;L;;;;;N;;;;; +16B66;PAHAWH HMONG SIGN THIRD-STAGE HLI;Lo;0;L;;;;;N;;;;; +16B67;PAHAWH HMONG SIGN ZWJ THAJ;Lo;0;L;;;;;N;;;;; +16B68;PAHAWH HMONG SIGN HNUB;Lo;0;L;;;;;N;;;;; +16B69;PAHAWH HMONG SIGN NQIG;Lo;0;L;;;;;N;;;;; +16B6A;PAHAWH HMONG SIGN XIAB;Lo;0;L;;;;;N;;;;; +16B6B;PAHAWH HMONG SIGN NTUJ;Lo;0;L;;;;;N;;;;; +16B6C;PAHAWH HMONG SIGN AV;Lo;0;L;;;;;N;;;;; +16B6D;PAHAWH HMONG SIGN TXHEEJ CEEV;Lo;0;L;;;;;N;;;;; +16B6E;PAHAWH HMONG SIGN MEEJ TSEEB;Lo;0;L;;;;;N;;;;; +16B6F;PAHAWH HMONG SIGN TAU;Lo;0;L;;;;;N;;;;; +16B70;PAHAWH HMONG SIGN LOS;Lo;0;L;;;;;N;;;;; +16B71;PAHAWH HMONG SIGN MUS;Lo;0;L;;;;;N;;;;; +16B72;PAHAWH HMONG SIGN CIM HAIS LUS NTOG NTOG;Lo;0;L;;;;;N;;;;; +16B73;PAHAWH HMONG SIGN CIM CUAM TSHOOJ;Lo;0;L;;;;;N;;;;; +16B74;PAHAWH HMONG SIGN CIM TXWV;Lo;0;L;;;;;N;;;;; +16B75;PAHAWH HMONG SIGN CIM TXWV CHWV;Lo;0;L;;;;;N;;;;; +16B76;PAHAWH HMONG SIGN CIM PUB DAWB;Lo;0;L;;;;;N;;;;; +16B77;PAHAWH HMONG SIGN CIM NRES TOS;Lo;0;L;;;;;N;;;;; +16B7D;PAHAWH HMONG CLAN SIGN TSHEEJ;Lo;0;L;;;;;N;;;;; +16B7E;PAHAWH HMONG CLAN SIGN YEEG;Lo;0;L;;;;;N;;;;; +16B7F;PAHAWH HMONG CLAN SIGN LIS;Lo;0;L;;;;;N;;;;; +16B80;PAHAWH HMONG CLAN SIGN LAUJ;Lo;0;L;;;;;N;;;;; +16B81;PAHAWH HMONG CLAN SIGN XYOOJ;Lo;0;L;;;;;N;;;;; +16B82;PAHAWH HMONG CLAN SIGN KOO;Lo;0;L;;;;;N;;;;; +16B83;PAHAWH HMONG CLAN SIGN HAWJ;Lo;0;L;;;;;N;;;;; +16B84;PAHAWH HMONG CLAN SIGN MUAS;Lo;0;L;;;;;N;;;;; +16B85;PAHAWH HMONG CLAN SIGN THOJ;Lo;0;L;;;;;N;;;;; +16B86;PAHAWH HMONG CLAN SIGN TSAB;Lo;0;L;;;;;N;;;;; +16B87;PAHAWH HMONG CLAN SIGN PHAB;Lo;0;L;;;;;N;;;;; +16B88;PAHAWH HMONG CLAN SIGN KHAB;Lo;0;L;;;;;N;;;;; +16B89;PAHAWH HMONG CLAN SIGN HAM;Lo;0;L;;;;;N;;;;; +16B8A;PAHAWH HMONG CLAN SIGN VAJ;Lo;0;L;;;;;N;;;;; +16B8B;PAHAWH HMONG CLAN SIGN FAJ;Lo;0;L;;;;;N;;;;; +16B8C;PAHAWH HMONG CLAN SIGN YAJ;Lo;0;L;;;;;N;;;;; +16B8D;PAHAWH HMONG CLAN SIGN TSWB;Lo;0;L;;;;;N;;;;; +16B8E;PAHAWH HMONG CLAN SIGN KWM;Lo;0;L;;;;;N;;;;; +16B8F;PAHAWH HMONG CLAN SIGN VWJ;Lo;0;L;;;;;N;;;;; +16D40;KIRAT RAI SIGN ANUSVARA;Lm;0;L;;;;;N;;;;; +16D41;KIRAT RAI SIGN TONPI;Lm;0;L;;;;;N;;;;; +16D42;KIRAT RAI SIGN VISARGA;Lm;0;L;;;;;N;;;;; +16D43;KIRAT RAI LETTER A;Lo;0;L;;;;;N;;;;; +16D44;KIRAT RAI LETTER KA;Lo;0;L;;;;;N;;;;; +16D45;KIRAT RAI LETTER KHA;Lo;0;L;;;;;N;;;;; +16D46;KIRAT RAI LETTER GA;Lo;0;L;;;;;N;;;;; +16D47;KIRAT RAI LETTER GHA;Lo;0;L;;;;;N;;;;; +16D48;KIRAT RAI LETTER NGA;Lo;0;L;;;;;N;;;;; +16D49;KIRAT RAI LETTER CA;Lo;0;L;;;;;N;;;;; +16D4A;KIRAT RAI LETTER CHA;Lo;0;L;;;;;N;;;;; +16D4B;KIRAT RAI LETTER JA;Lo;0;L;;;;;N;;;;; +16D4C;KIRAT RAI LETTER JHA;Lo;0;L;;;;;N;;;;; +16D4D;KIRAT RAI LETTER NYA;Lo;0;L;;;;;N;;;;; +16D4E;KIRAT RAI LETTER TTA;Lo;0;L;;;;;N;;;;; +16D4F;KIRAT RAI LETTER TTHA;Lo;0;L;;;;;N;;;;; +16D50;KIRAT RAI LETTER DDA;Lo;0;L;;;;;N;;;;; +16D51;KIRAT RAI LETTER DDHA;Lo;0;L;;;;;N;;;;; +16D52;KIRAT RAI LETTER TA;Lo;0;L;;;;;N;;;;; +16D53;KIRAT RAI LETTER THA;Lo;0;L;;;;;N;;;;; +16D54;KIRAT RAI LETTER DA;Lo;0;L;;;;;N;;;;; +16D55;KIRAT RAI LETTER DHA;Lo;0;L;;;;;N;;;;; +16D56;KIRAT RAI LETTER NA;Lo;0;L;;;;;N;;;;; +16D57;KIRAT RAI LETTER PA;Lo;0;L;;;;;N;;;;; +16D58;KIRAT RAI LETTER PHA;Lo;0;L;;;;;N;;;;; +16D59;KIRAT RAI LETTER BA;Lo;0;L;;;;;N;;;;; +16D5A;KIRAT RAI LETTER BHA;Lo;0;L;;;;;N;;;;; +16D5B;KIRAT RAI LETTER MA;Lo;0;L;;;;;N;;;;; +16D5C;KIRAT RAI LETTER YA;Lo;0;L;;;;;N;;;;; +16D5D;KIRAT RAI LETTER RA;Lo;0;L;;;;;N;;;;; +16D5E;KIRAT RAI LETTER LA;Lo;0;L;;;;;N;;;;; +16D5F;KIRAT RAI LETTER VA;Lo;0;L;;;;;N;;;;; +16D60;KIRAT RAI LETTER SA;Lo;0;L;;;;;N;;;;; +16D61;KIRAT RAI LETTER SHA;Lo;0;L;;;;;N;;;;; +16D62;KIRAT RAI LETTER HA;Lo;0;L;;;;;N;;;;; +16D63;KIRAT RAI VOWEL SIGN AA;Lo;0;L;;;;;N;;;;; +16D64;KIRAT RAI VOWEL SIGN I;Lo;0;L;;;;;N;;;;; +16D65;KIRAT RAI VOWEL SIGN U;Lo;0;L;;;;;N;;;;; +16D66;KIRAT RAI VOWEL SIGN UE;Lo;0;L;;;;;N;;;;; +16D67;KIRAT RAI VOWEL SIGN E;Lo;0;L;;;;;N;;;;; +16D68;KIRAT RAI VOWEL SIGN AI;Lo;0;L;16D67 16D67;;;;N;;;;; +16D69;KIRAT RAI VOWEL SIGN O;Lo;0;L;16D63 16D67;;;;N;;;;; +16D6A;KIRAT RAI VOWEL SIGN AU;Lo;0;L;16D69 16D67;;;;N;;;;; +16D6B;KIRAT RAI SIGN VIRAMA;Lm;0;L;;;;;N;;;;; +16D6C;KIRAT RAI SIGN SAAT;Lm;0;L;;;;;N;;;;; +16D6D;KIRAT RAI SIGN YUPI;Po;0;L;;;;;N;;;;; +16D6E;KIRAT RAI DANDA;Po;0;L;;;;;N;;;;; +16D6F;KIRAT RAI DOUBLE DANDA;Po;0;L;;;;;N;;;;; +16D70;KIRAT RAI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +16D71;KIRAT RAI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +16D72;KIRAT RAI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +16D73;KIRAT RAI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +16D74;KIRAT RAI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +16D75;KIRAT RAI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +16D76;KIRAT RAI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +16D77;KIRAT RAI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +16D78;KIRAT RAI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +16D79;KIRAT RAI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +16E40;MEDEFAIDRIN CAPITAL LETTER M;Lu;0;L;;;;;N;;;;16E60; +16E41;MEDEFAIDRIN CAPITAL LETTER S;Lu;0;L;;;;;N;;;;16E61; +16E42;MEDEFAIDRIN CAPITAL LETTER V;Lu;0;L;;;;;N;;;;16E62; +16E43;MEDEFAIDRIN CAPITAL LETTER W;Lu;0;L;;;;;N;;;;16E63; +16E44;MEDEFAIDRIN CAPITAL LETTER ATIU;Lu;0;L;;;;;N;;;;16E64; +16E45;MEDEFAIDRIN CAPITAL LETTER Z;Lu;0;L;;;;;N;;;;16E65; +16E46;MEDEFAIDRIN CAPITAL LETTER KP;Lu;0;L;;;;;N;;;;16E66; +16E47;MEDEFAIDRIN CAPITAL LETTER P;Lu;0;L;;;;;N;;;;16E67; +16E48;MEDEFAIDRIN CAPITAL LETTER T;Lu;0;L;;;;;N;;;;16E68; +16E49;MEDEFAIDRIN CAPITAL LETTER G;Lu;0;L;;;;;N;;;;16E69; +16E4A;MEDEFAIDRIN CAPITAL LETTER F;Lu;0;L;;;;;N;;;;16E6A; +16E4B;MEDEFAIDRIN CAPITAL LETTER I;Lu;0;L;;;;;N;;;;16E6B; +16E4C;MEDEFAIDRIN CAPITAL LETTER K;Lu;0;L;;;;;N;;;;16E6C; +16E4D;MEDEFAIDRIN CAPITAL LETTER A;Lu;0;L;;;;;N;;;;16E6D; +16E4E;MEDEFAIDRIN CAPITAL LETTER J;Lu;0;L;;;;;N;;;;16E6E; +16E4F;MEDEFAIDRIN CAPITAL LETTER E;Lu;0;L;;;;;N;;;;16E6F; +16E50;MEDEFAIDRIN CAPITAL LETTER B;Lu;0;L;;;;;N;;;;16E70; +16E51;MEDEFAIDRIN CAPITAL LETTER C;Lu;0;L;;;;;N;;;;16E71; +16E52;MEDEFAIDRIN CAPITAL LETTER U;Lu;0;L;;;;;N;;;;16E72; +16E53;MEDEFAIDRIN CAPITAL LETTER YU;Lu;0;L;;;;;N;;;;16E73; +16E54;MEDEFAIDRIN CAPITAL LETTER L;Lu;0;L;;;;;N;;;;16E74; +16E55;MEDEFAIDRIN CAPITAL LETTER Q;Lu;0;L;;;;;N;;;;16E75; +16E56;MEDEFAIDRIN CAPITAL LETTER HP;Lu;0;L;;;;;N;;;;16E76; +16E57;MEDEFAIDRIN CAPITAL LETTER NY;Lu;0;L;;;;;N;;;;16E77; +16E58;MEDEFAIDRIN CAPITAL LETTER X;Lu;0;L;;;;;N;;;;16E78; +16E59;MEDEFAIDRIN CAPITAL LETTER D;Lu;0;L;;;;;N;;;;16E79; +16E5A;MEDEFAIDRIN CAPITAL LETTER OE;Lu;0;L;;;;;N;;;;16E7A; +16E5B;MEDEFAIDRIN CAPITAL LETTER N;Lu;0;L;;;;;N;;;;16E7B; +16E5C;MEDEFAIDRIN CAPITAL LETTER R;Lu;0;L;;;;;N;;;;16E7C; +16E5D;MEDEFAIDRIN CAPITAL LETTER O;Lu;0;L;;;;;N;;;;16E7D; +16E5E;MEDEFAIDRIN CAPITAL LETTER AI;Lu;0;L;;;;;N;;;;16E7E; +16E5F;MEDEFAIDRIN CAPITAL LETTER Y;Lu;0;L;;;;;N;;;;16E7F; +16E60;MEDEFAIDRIN SMALL LETTER M;Ll;0;L;;;;;N;;;16E40;;16E40 +16E61;MEDEFAIDRIN SMALL LETTER S;Ll;0;L;;;;;N;;;16E41;;16E41 +16E62;MEDEFAIDRIN SMALL LETTER V;Ll;0;L;;;;;N;;;16E42;;16E42 +16E63;MEDEFAIDRIN SMALL LETTER W;Ll;0;L;;;;;N;;;16E43;;16E43 +16E64;MEDEFAIDRIN SMALL LETTER ATIU;Ll;0;L;;;;;N;;;16E44;;16E44 +16E65;MEDEFAIDRIN SMALL LETTER Z;Ll;0;L;;;;;N;;;16E45;;16E45 +16E66;MEDEFAIDRIN SMALL LETTER KP;Ll;0;L;;;;;N;;;16E46;;16E46 +16E67;MEDEFAIDRIN SMALL LETTER P;Ll;0;L;;;;;N;;;16E47;;16E47 +16E68;MEDEFAIDRIN SMALL LETTER T;Ll;0;L;;;;;N;;;16E48;;16E48 +16E69;MEDEFAIDRIN SMALL LETTER G;Ll;0;L;;;;;N;;;16E49;;16E49 +16E6A;MEDEFAIDRIN SMALL LETTER F;Ll;0;L;;;;;N;;;16E4A;;16E4A +16E6B;MEDEFAIDRIN SMALL LETTER I;Ll;0;L;;;;;N;;;16E4B;;16E4B +16E6C;MEDEFAIDRIN SMALL LETTER K;Ll;0;L;;;;;N;;;16E4C;;16E4C +16E6D;MEDEFAIDRIN SMALL LETTER A;Ll;0;L;;;;;N;;;16E4D;;16E4D +16E6E;MEDEFAIDRIN SMALL LETTER J;Ll;0;L;;;;;N;;;16E4E;;16E4E +16E6F;MEDEFAIDRIN SMALL LETTER E;Ll;0;L;;;;;N;;;16E4F;;16E4F +16E70;MEDEFAIDRIN SMALL LETTER B;Ll;0;L;;;;;N;;;16E50;;16E50 +16E71;MEDEFAIDRIN SMALL LETTER C;Ll;0;L;;;;;N;;;16E51;;16E51 +16E72;MEDEFAIDRIN SMALL LETTER U;Ll;0;L;;;;;N;;;16E52;;16E52 +16E73;MEDEFAIDRIN SMALL LETTER YU;Ll;0;L;;;;;N;;;16E53;;16E53 +16E74;MEDEFAIDRIN SMALL LETTER L;Ll;0;L;;;;;N;;;16E54;;16E54 +16E75;MEDEFAIDRIN SMALL LETTER Q;Ll;0;L;;;;;N;;;16E55;;16E55 +16E76;MEDEFAIDRIN SMALL LETTER HP;Ll;0;L;;;;;N;;;16E56;;16E56 +16E77;MEDEFAIDRIN SMALL LETTER NY;Ll;0;L;;;;;N;;;16E57;;16E57 +16E78;MEDEFAIDRIN SMALL LETTER X;Ll;0;L;;;;;N;;;16E58;;16E58 +16E79;MEDEFAIDRIN SMALL LETTER D;Ll;0;L;;;;;N;;;16E59;;16E59 +16E7A;MEDEFAIDRIN SMALL LETTER OE;Ll;0;L;;;;;N;;;16E5A;;16E5A +16E7B;MEDEFAIDRIN SMALL LETTER N;Ll;0;L;;;;;N;;;16E5B;;16E5B +16E7C;MEDEFAIDRIN SMALL LETTER R;Ll;0;L;;;;;N;;;16E5C;;16E5C +16E7D;MEDEFAIDRIN SMALL LETTER O;Ll;0;L;;;;;N;;;16E5D;;16E5D +16E7E;MEDEFAIDRIN SMALL LETTER AI;Ll;0;L;;;;;N;;;16E5E;;16E5E +16E7F;MEDEFAIDRIN SMALL LETTER Y;Ll;0;L;;;;;N;;;16E5F;;16E5F +16E80;MEDEFAIDRIN DIGIT ZERO;No;0;L;;;;0;N;;;;; +16E81;MEDEFAIDRIN DIGIT ONE;No;0;L;;;;1;N;;;;; +16E82;MEDEFAIDRIN DIGIT TWO;No;0;L;;;;2;N;;;;; +16E83;MEDEFAIDRIN DIGIT THREE;No;0;L;;;;3;N;;;;; +16E84;MEDEFAIDRIN DIGIT FOUR;No;0;L;;;;4;N;;;;; +16E85;MEDEFAIDRIN DIGIT FIVE;No;0;L;;;;5;N;;;;; +16E86;MEDEFAIDRIN DIGIT SIX;No;0;L;;;;6;N;;;;; +16E87;MEDEFAIDRIN DIGIT SEVEN;No;0;L;;;;7;N;;;;; +16E88;MEDEFAIDRIN DIGIT EIGHT;No;0;L;;;;8;N;;;;; +16E89;MEDEFAIDRIN DIGIT NINE;No;0;L;;;;9;N;;;;; +16E8A;MEDEFAIDRIN NUMBER TEN;No;0;L;;;;10;N;;;;; +16E8B;MEDEFAIDRIN NUMBER ELEVEN;No;0;L;;;;11;N;;;;; +16E8C;MEDEFAIDRIN NUMBER TWELVE;No;0;L;;;;12;N;;;;; +16E8D;MEDEFAIDRIN NUMBER THIRTEEN;No;0;L;;;;13;N;;;;; +16E8E;MEDEFAIDRIN NUMBER FOURTEEN;No;0;L;;;;14;N;;;;; +16E8F;MEDEFAIDRIN NUMBER FIFTEEN;No;0;L;;;;15;N;;;;; +16E90;MEDEFAIDRIN NUMBER SIXTEEN;No;0;L;;;;16;N;;;;; +16E91;MEDEFAIDRIN NUMBER SEVENTEEN;No;0;L;;;;17;N;;;;; +16E92;MEDEFAIDRIN NUMBER EIGHTEEN;No;0;L;;;;18;N;;;;; +16E93;MEDEFAIDRIN NUMBER NINETEEN;No;0;L;;;;19;N;;;;; +16E94;MEDEFAIDRIN DIGIT ONE ALTERNATE FORM;No;0;L;;;;1;N;;;;; +16E95;MEDEFAIDRIN DIGIT TWO ALTERNATE FORM;No;0;L;;;;2;N;;;;; +16E96;MEDEFAIDRIN DIGIT THREE ALTERNATE FORM;No;0;L;;;;3;N;;;;; +16E97;MEDEFAIDRIN COMMA;Po;0;L;;;;;N;;;;; +16E98;MEDEFAIDRIN FULL STOP;Po;0;L;;;;;N;;;;; +16E99;MEDEFAIDRIN SYMBOL AIVA;Po;0;L;;;;;N;;;;; +16E9A;MEDEFAIDRIN EXCLAMATION OH;Po;0;L;;;;;N;;;;; +16EA0;BERIA ERFE CAPITAL LETTER ARKAB;Lu;0;L;;;;;N;;;;16EBB; +16EA1;BERIA ERFE CAPITAL LETTER BASIGNA;Lu;0;L;;;;;N;;;;16EBC; +16EA2;BERIA ERFE CAPITAL LETTER DARBAI;Lu;0;L;;;;;N;;;;16EBD; +16EA3;BERIA ERFE CAPITAL LETTER EH;Lu;0;L;;;;;N;;;;16EBE; +16EA4;BERIA ERFE CAPITAL LETTER FITKO;Lu;0;L;;;;;N;;;;16EBF; +16EA5;BERIA ERFE CAPITAL LETTER GOWAY;Lu;0;L;;;;;N;;;;16EC0; +16EA6;BERIA ERFE CAPITAL LETTER HIRDEABO;Lu;0;L;;;;;N;;;;16EC1; +16EA7;BERIA ERFE CAPITAL LETTER I;Lu;0;L;;;;;N;;;;16EC2; +16EA8;BERIA ERFE CAPITAL LETTER DJAI;Lu;0;L;;;;;N;;;;16EC3; +16EA9;BERIA ERFE CAPITAL LETTER KOBO;Lu;0;L;;;;;N;;;;16EC4; +16EAA;BERIA ERFE CAPITAL LETTER LAKKO;Lu;0;L;;;;;N;;;;16EC5; +16EAB;BERIA ERFE CAPITAL LETTER MERI;Lu;0;L;;;;;N;;;;16EC6; +16EAC;BERIA ERFE CAPITAL LETTER NINI;Lu;0;L;;;;;N;;;;16EC7; +16EAD;BERIA ERFE CAPITAL LETTER GNA;Lu;0;L;;;;;N;;;;16EC8; +16EAE;BERIA ERFE CAPITAL LETTER NGAY;Lu;0;L;;;;;N;;;;16EC9; +16EAF;BERIA ERFE CAPITAL LETTER OI;Lu;0;L;;;;;N;;;;16ECA; +16EB0;BERIA ERFE CAPITAL LETTER PI;Lu;0;L;;;;;N;;;;16ECB; +16EB1;BERIA ERFE CAPITAL LETTER ERIGO;Lu;0;L;;;;;N;;;;16ECC; +16EB2;BERIA ERFE CAPITAL LETTER ERIGO TAMURA;Lu;0;L;;;;;N;;;;16ECD; +16EB3;BERIA ERFE CAPITAL LETTER SERI;Lu;0;L;;;;;N;;;;16ECE; +16EB4;BERIA ERFE CAPITAL LETTER SHEP;Lu;0;L;;;;;N;;;;16ECF; +16EB5;BERIA ERFE CAPITAL LETTER TATASOUE;Lu;0;L;;;;;N;;;;16ED0; +16EB6;BERIA ERFE CAPITAL LETTER UI;Lu;0;L;;;;;N;;;;16ED1; +16EB7;BERIA ERFE CAPITAL LETTER WASSE;Lu;0;L;;;;;N;;;;16ED2; +16EB8;BERIA ERFE CAPITAL LETTER AY;Lu;0;L;;;;;N;;;;16ED3; +16EBB;BERIA ERFE SMALL LETTER ARKAB;Ll;0;L;;;;;N;;;16EA0;;16EA0 +16EBC;BERIA ERFE SMALL LETTER BASIGNA;Ll;0;L;;;;;N;;;16EA1;;16EA1 +16EBD;BERIA ERFE SMALL LETTER DARBAI;Ll;0;L;;;;;N;;;16EA2;;16EA2 +16EBE;BERIA ERFE SMALL LETTER EH;Ll;0;L;;;;;N;;;16EA3;;16EA3 +16EBF;BERIA ERFE SMALL LETTER FITKO;Ll;0;L;;;;;N;;;16EA4;;16EA4 +16EC0;BERIA ERFE SMALL LETTER GOWAY;Ll;0;L;;;;;N;;;16EA5;;16EA5 +16EC1;BERIA ERFE SMALL LETTER HIRDEABO;Ll;0;L;;;;;N;;;16EA6;;16EA6 +16EC2;BERIA ERFE SMALL LETTER I;Ll;0;L;;;;;N;;;16EA7;;16EA7 +16EC3;BERIA ERFE SMALL LETTER DJAI;Ll;0;L;;;;;N;;;16EA8;;16EA8 +16EC4;BERIA ERFE SMALL LETTER KOBO;Ll;0;L;;;;;N;;;16EA9;;16EA9 +16EC5;BERIA ERFE SMALL LETTER LAKKO;Ll;0;L;;;;;N;;;16EAA;;16EAA +16EC6;BERIA ERFE SMALL LETTER MERI;Ll;0;L;;;;;N;;;16EAB;;16EAB +16EC7;BERIA ERFE SMALL LETTER NINI;Ll;0;L;;;;;N;;;16EAC;;16EAC +16EC8;BERIA ERFE SMALL LETTER GNA;Ll;0;L;;;;;N;;;16EAD;;16EAD +16EC9;BERIA ERFE SMALL LETTER NGAY;Ll;0;L;;;;;N;;;16EAE;;16EAE +16ECA;BERIA ERFE SMALL LETTER OI;Ll;0;L;;;;;N;;;16EAF;;16EAF +16ECB;BERIA ERFE SMALL LETTER PI;Ll;0;L;;;;;N;;;16EB0;;16EB0 +16ECC;BERIA ERFE SMALL LETTER ERIGO;Ll;0;L;;;;;N;;;16EB1;;16EB1 +16ECD;BERIA ERFE SMALL LETTER ERIGO TAMURA;Ll;0;L;;;;;N;;;16EB2;;16EB2 +16ECE;BERIA ERFE SMALL LETTER SERI;Ll;0;L;;;;;N;;;16EB3;;16EB3 +16ECF;BERIA ERFE SMALL LETTER SHEP;Ll;0;L;;;;;N;;;16EB4;;16EB4 +16ED0;BERIA ERFE SMALL LETTER TATASOUE;Ll;0;L;;;;;N;;;16EB5;;16EB5 +16ED1;BERIA ERFE SMALL LETTER UI;Ll;0;L;;;;;N;;;16EB6;;16EB6 +16ED2;BERIA ERFE SMALL LETTER WASSE;Ll;0;L;;;;;N;;;16EB7;;16EB7 +16ED3;BERIA ERFE SMALL LETTER AY;Ll;0;L;;;;;N;;;16EB8;;16EB8 +16F00;MIAO LETTER PA;Lo;0;L;;;;;N;;;;; +16F01;MIAO LETTER BA;Lo;0;L;;;;;N;;;;; +16F02;MIAO LETTER YI PA;Lo;0;L;;;;;N;;;;; +16F03;MIAO LETTER PLA;Lo;0;L;;;;;N;;;;; +16F04;MIAO LETTER MA;Lo;0;L;;;;;N;;;;; +16F05;MIAO LETTER MHA;Lo;0;L;;;;;N;;;;; +16F06;MIAO LETTER ARCHAIC MA;Lo;0;L;;;;;N;;;;; +16F07;MIAO LETTER FA;Lo;0;L;;;;;N;;;;; +16F08;MIAO LETTER VA;Lo;0;L;;;;;N;;;;; +16F09;MIAO LETTER VFA;Lo;0;L;;;;;N;;;;; +16F0A;MIAO LETTER TA;Lo;0;L;;;;;N;;;;; +16F0B;MIAO LETTER DA;Lo;0;L;;;;;N;;;;; +16F0C;MIAO LETTER YI TTA;Lo;0;L;;;;;N;;;;; +16F0D;MIAO LETTER YI TA;Lo;0;L;;;;;N;;;;; +16F0E;MIAO LETTER TTA;Lo;0;L;;;;;N;;;;; +16F0F;MIAO LETTER DDA;Lo;0;L;;;;;N;;;;; +16F10;MIAO LETTER NA;Lo;0;L;;;;;N;;;;; +16F11;MIAO LETTER NHA;Lo;0;L;;;;;N;;;;; +16F12;MIAO LETTER YI NNA;Lo;0;L;;;;;N;;;;; +16F13;MIAO LETTER ARCHAIC NA;Lo;0;L;;;;;N;;;;; +16F14;MIAO LETTER NNA;Lo;0;L;;;;;N;;;;; +16F15;MIAO LETTER NNHA;Lo;0;L;;;;;N;;;;; +16F16;MIAO LETTER LA;Lo;0;L;;;;;N;;;;; +16F17;MIAO LETTER LYA;Lo;0;L;;;;;N;;;;; +16F18;MIAO LETTER LHA;Lo;0;L;;;;;N;;;;; +16F19;MIAO LETTER LHYA;Lo;0;L;;;;;N;;;;; +16F1A;MIAO LETTER TLHA;Lo;0;L;;;;;N;;;;; +16F1B;MIAO LETTER DLHA;Lo;0;L;;;;;N;;;;; +16F1C;MIAO LETTER TLHYA;Lo;0;L;;;;;N;;;;; +16F1D;MIAO LETTER DLHYA;Lo;0;L;;;;;N;;;;; +16F1E;MIAO LETTER KA;Lo;0;L;;;;;N;;;;; +16F1F;MIAO LETTER GA;Lo;0;L;;;;;N;;;;; +16F20;MIAO LETTER YI KA;Lo;0;L;;;;;N;;;;; +16F21;MIAO LETTER QA;Lo;0;L;;;;;N;;;;; +16F22;MIAO LETTER QGA;Lo;0;L;;;;;N;;;;; +16F23;MIAO LETTER NGA;Lo;0;L;;;;;N;;;;; +16F24;MIAO LETTER NGHA;Lo;0;L;;;;;N;;;;; +16F25;MIAO LETTER ARCHAIC NGA;Lo;0;L;;;;;N;;;;; +16F26;MIAO LETTER HA;Lo;0;L;;;;;N;;;;; +16F27;MIAO LETTER XA;Lo;0;L;;;;;N;;;;; +16F28;MIAO LETTER GHA;Lo;0;L;;;;;N;;;;; +16F29;MIAO LETTER GHHA;Lo;0;L;;;;;N;;;;; +16F2A;MIAO LETTER TSSA;Lo;0;L;;;;;N;;;;; +16F2B;MIAO LETTER DZZA;Lo;0;L;;;;;N;;;;; +16F2C;MIAO LETTER NYA;Lo;0;L;;;;;N;;;;; +16F2D;MIAO LETTER NYHA;Lo;0;L;;;;;N;;;;; +16F2E;MIAO LETTER TSHA;Lo;0;L;;;;;N;;;;; +16F2F;MIAO LETTER DZHA;Lo;0;L;;;;;N;;;;; +16F30;MIAO LETTER YI TSHA;Lo;0;L;;;;;N;;;;; +16F31;MIAO LETTER YI DZHA;Lo;0;L;;;;;N;;;;; +16F32;MIAO LETTER REFORMED TSHA;Lo;0;L;;;;;N;;;;; +16F33;MIAO LETTER SHA;Lo;0;L;;;;;N;;;;; +16F34;MIAO LETTER SSA;Lo;0;L;;;;;N;;;;; +16F35;MIAO LETTER ZHA;Lo;0;L;;;;;N;;;;; +16F36;MIAO LETTER ZSHA;Lo;0;L;;;;;N;;;;; +16F37;MIAO LETTER TSA;Lo;0;L;;;;;N;;;;; +16F38;MIAO LETTER DZA;Lo;0;L;;;;;N;;;;; +16F39;MIAO LETTER YI TSA;Lo;0;L;;;;;N;;;;; +16F3A;MIAO LETTER SA;Lo;0;L;;;;;N;;;;; +16F3B;MIAO LETTER ZA;Lo;0;L;;;;;N;;;;; +16F3C;MIAO LETTER ZSA;Lo;0;L;;;;;N;;;;; +16F3D;MIAO LETTER ZZA;Lo;0;L;;;;;N;;;;; +16F3E;MIAO LETTER ZZSA;Lo;0;L;;;;;N;;;;; +16F3F;MIAO LETTER ARCHAIC ZZA;Lo;0;L;;;;;N;;;;; +16F40;MIAO LETTER ZZYA;Lo;0;L;;;;;N;;;;; +16F41;MIAO LETTER ZZSYA;Lo;0;L;;;;;N;;;;; +16F42;MIAO LETTER WA;Lo;0;L;;;;;N;;;;; +16F43;MIAO LETTER AH;Lo;0;L;;;;;N;;;;; +16F44;MIAO LETTER HHA;Lo;0;L;;;;;N;;;;; +16F45;MIAO LETTER BRI;Lo;0;L;;;;;N;;;;; +16F46;MIAO LETTER SYI;Lo;0;L;;;;;N;;;;; +16F47;MIAO LETTER DZYI;Lo;0;L;;;;;N;;;;; +16F48;MIAO LETTER TE;Lo;0;L;;;;;N;;;;; +16F49;MIAO LETTER TSE;Lo;0;L;;;;;N;;;;; +16F4A;MIAO LETTER RTE;Lo;0;L;;;;;N;;;;; +16F4F;MIAO SIGN CONSONANT MODIFIER BAR;Mn;0;NSM;;;;;N;;;;; +16F50;MIAO LETTER NASALIZATION;Lo;0;L;;;;;N;;;;; +16F51;MIAO SIGN ASPIRATION;Mc;0;L;;;;;N;;;;; +16F52;MIAO SIGN REFORMED VOICING;Mc;0;L;;;;;N;;;;; +16F53;MIAO SIGN REFORMED ASPIRATION;Mc;0;L;;;;;N;;;;; +16F54;MIAO VOWEL SIGN A;Mc;0;L;;;;;N;;;;; +16F55;MIAO VOWEL SIGN AA;Mc;0;L;;;;;N;;;;; +16F56;MIAO VOWEL SIGN AHH;Mc;0;L;;;;;N;;;;; +16F57;MIAO VOWEL SIGN AN;Mc;0;L;;;;;N;;;;; +16F58;MIAO VOWEL SIGN ANG;Mc;0;L;;;;;N;;;;; +16F59;MIAO VOWEL SIGN O;Mc;0;L;;;;;N;;;;; +16F5A;MIAO VOWEL SIGN OO;Mc;0;L;;;;;N;;;;; +16F5B;MIAO VOWEL SIGN WO;Mc;0;L;;;;;N;;;;; +16F5C;MIAO VOWEL SIGN W;Mc;0;L;;;;;N;;;;; +16F5D;MIAO VOWEL SIGN E;Mc;0;L;;;;;N;;;;; +16F5E;MIAO VOWEL SIGN EN;Mc;0;L;;;;;N;;;;; +16F5F;MIAO VOWEL SIGN ENG;Mc;0;L;;;;;N;;;;; +16F60;MIAO VOWEL SIGN OEY;Mc;0;L;;;;;N;;;;; +16F61;MIAO VOWEL SIGN I;Mc;0;L;;;;;N;;;;; +16F62;MIAO VOWEL SIGN IA;Mc;0;L;;;;;N;;;;; +16F63;MIAO VOWEL SIGN IAN;Mc;0;L;;;;;N;;;;; +16F64;MIAO VOWEL SIGN IANG;Mc;0;L;;;;;N;;;;; +16F65;MIAO VOWEL SIGN IO;Mc;0;L;;;;;N;;;;; +16F66;MIAO VOWEL SIGN IE;Mc;0;L;;;;;N;;;;; +16F67;MIAO VOWEL SIGN II;Mc;0;L;;;;;N;;;;; +16F68;MIAO VOWEL SIGN IU;Mc;0;L;;;;;N;;;;; +16F69;MIAO VOWEL SIGN ING;Mc;0;L;;;;;N;;;;; +16F6A;MIAO VOWEL SIGN U;Mc;0;L;;;;;N;;;;; +16F6B;MIAO VOWEL SIGN UA;Mc;0;L;;;;;N;;;;; +16F6C;MIAO VOWEL SIGN UAN;Mc;0;L;;;;;N;;;;; +16F6D;MIAO VOWEL SIGN UANG;Mc;0;L;;;;;N;;;;; +16F6E;MIAO VOWEL SIGN UU;Mc;0;L;;;;;N;;;;; +16F6F;MIAO VOWEL SIGN UEI;Mc;0;L;;;;;N;;;;; +16F70;MIAO VOWEL SIGN UNG;Mc;0;L;;;;;N;;;;; +16F71;MIAO VOWEL SIGN Y;Mc;0;L;;;;;N;;;;; +16F72;MIAO VOWEL SIGN YI;Mc;0;L;;;;;N;;;;; +16F73;MIAO VOWEL SIGN AE;Mc;0;L;;;;;N;;;;; +16F74;MIAO VOWEL SIGN AEE;Mc;0;L;;;;;N;;;;; +16F75;MIAO VOWEL SIGN ERR;Mc;0;L;;;;;N;;;;; +16F76;MIAO VOWEL SIGN ROUNDED ERR;Mc;0;L;;;;;N;;;;; +16F77;MIAO VOWEL SIGN ER;Mc;0;L;;;;;N;;;;; +16F78;MIAO VOWEL SIGN ROUNDED ER;Mc;0;L;;;;;N;;;;; +16F79;MIAO VOWEL SIGN AI;Mc;0;L;;;;;N;;;;; +16F7A;MIAO VOWEL SIGN EI;Mc;0;L;;;;;N;;;;; +16F7B;MIAO VOWEL SIGN AU;Mc;0;L;;;;;N;;;;; +16F7C;MIAO VOWEL SIGN OU;Mc;0;L;;;;;N;;;;; +16F7D;MIAO VOWEL SIGN N;Mc;0;L;;;;;N;;;;; +16F7E;MIAO VOWEL SIGN NG;Mc;0;L;;;;;N;;;;; +16F7F;MIAO VOWEL SIGN UOG;Mc;0;L;;;;;N;;;;; +16F80;MIAO VOWEL SIGN YUI;Mc;0;L;;;;;N;;;;; +16F81;MIAO VOWEL SIGN OG;Mc;0;L;;;;;N;;;;; +16F82;MIAO VOWEL SIGN OER;Mc;0;L;;;;;N;;;;; +16F83;MIAO VOWEL SIGN VW;Mc;0;L;;;;;N;;;;; +16F84;MIAO VOWEL SIGN IG;Mc;0;L;;;;;N;;;;; +16F85;MIAO VOWEL SIGN EA;Mc;0;L;;;;;N;;;;; +16F86;MIAO VOWEL SIGN IONG;Mc;0;L;;;;;N;;;;; +16F87;MIAO VOWEL SIGN UI;Mc;0;L;;;;;N;;;;; +16F8F;MIAO TONE RIGHT;Mn;0;NSM;;;;;N;;;;; +16F90;MIAO TONE TOP RIGHT;Mn;0;NSM;;;;;N;;;;; +16F91;MIAO TONE ABOVE;Mn;0;NSM;;;;;N;;;;; +16F92;MIAO TONE BELOW;Mn;0;NSM;;;;;N;;;;; +16F93;MIAO LETTER TONE-2;Lm;0;L;;;;;N;;;;; +16F94;MIAO LETTER TONE-3;Lm;0;L;;;;;N;;;;; +16F95;MIAO LETTER TONE-4;Lm;0;L;;;;;N;;;;; +16F96;MIAO LETTER TONE-5;Lm;0;L;;;;;N;;;;; +16F97;MIAO LETTER TONE-6;Lm;0;L;;;;;N;;;;; +16F98;MIAO LETTER TONE-7;Lm;0;L;;;;;N;;;;; +16F99;MIAO LETTER TONE-8;Lm;0;L;;;;;N;;;;; +16F9A;MIAO LETTER REFORMED TONE-1;Lm;0;L;;;;;N;;;;; +16F9B;MIAO LETTER REFORMED TONE-2;Lm;0;L;;;;;N;;;;; +16F9C;MIAO LETTER REFORMED TONE-4;Lm;0;L;;;;;N;;;;; +16F9D;MIAO LETTER REFORMED TONE-5;Lm;0;L;;;;;N;;;;; +16F9E;MIAO LETTER REFORMED TONE-6;Lm;0;L;;;;;N;;;;; +16F9F;MIAO LETTER REFORMED TONE-8;Lm;0;L;;;;;N;;;;; +16FE0;TANGUT ITERATION MARK;Lm;0;L;;;;;N;;;;; +16FE1;NUSHU ITERATION MARK;Lm;0;L;;;;;N;;;;; +16FE2;OLD CHINESE HOOK MARK;Po;0;ON;;;;;N;;;;; +16FE3;OLD CHINESE ITERATION MARK;Lm;0;L;;;;;N;;;;; +16FE4;KHITAN SMALL SCRIPT FILLER;Mn;0;NSM;;;;;N;;;;; +16FF0;VIETNAMESE ALTERNATE READING MARK CA;Mc;6;L;;;;;N;;;;; +16FF1;VIETNAMESE ALTERNATE READING MARK NHAY;Mc;6;L;;;;;N;;;;; +16FF2;CHINESE SMALL SIMPLIFIED ER;Lm;0;L;;;;;N;;;;; +16FF3;CHINESE SMALL TRADITIONAL ER;Lm;0;L;;;;;N;;;;; +16FF4;YANGQIN SIGN SLOW ONE BEAT;Nl;0;L;;;;1;N;;;;; +16FF5;YANGQIN SIGN SLOW THREE HALF BEATS;Nl;0;L;;;;3/2;N;;;;; +16FF6;YANGQIN SIGN SLOW TWO BEATS;Nl;0;L;;;;2;N;;;;; +17000;;Lo;0;L;;;;;N;;;;; +187FF;;Lo;0;L;;;;;N;;;;; +18800;TANGUT COMPONENT-001;Lo;0;L;;;;;N;;;;; +18801;TANGUT COMPONENT-002;Lo;0;L;;;;;N;;;;; +18802;TANGUT COMPONENT-003;Lo;0;L;;;;;N;;;;; +18803;TANGUT COMPONENT-004;Lo;0;L;;;;;N;;;;; +18804;TANGUT COMPONENT-005;Lo;0;L;;;;;N;;;;; +18805;TANGUT COMPONENT-006;Lo;0;L;;;;;N;;;;; +18806;TANGUT COMPONENT-007;Lo;0;L;;;;;N;;;;; +18807;TANGUT COMPONENT-008;Lo;0;L;;;;;N;;;;; +18808;TANGUT COMPONENT-009;Lo;0;L;;;;;N;;;;; +18809;TANGUT COMPONENT-010;Lo;0;L;;;;;N;;;;; +1880A;TANGUT COMPONENT-011;Lo;0;L;;;;;N;;;;; +1880B;TANGUT COMPONENT-012;Lo;0;L;;;;;N;;;;; +1880C;TANGUT COMPONENT-013;Lo;0;L;;;;;N;;;;; +1880D;TANGUT COMPONENT-014;Lo;0;L;;;;;N;;;;; +1880E;TANGUT COMPONENT-015;Lo;0;L;;;;;N;;;;; +1880F;TANGUT COMPONENT-016;Lo;0;L;;;;;N;;;;; +18810;TANGUT COMPONENT-017;Lo;0;L;;;;;N;;;;; +18811;TANGUT COMPONENT-018;Lo;0;L;;;;;N;;;;; +18812;TANGUT COMPONENT-019;Lo;0;L;;;;;N;;;;; +18813;TANGUT COMPONENT-020;Lo;0;L;;;;;N;;;;; +18814;TANGUT COMPONENT-021;Lo;0;L;;;;;N;;;;; +18815;TANGUT COMPONENT-022;Lo;0;L;;;;;N;;;;; +18816;TANGUT COMPONENT-023;Lo;0;L;;;;;N;;;;; +18817;TANGUT COMPONENT-024;Lo;0;L;;;;;N;;;;; +18818;TANGUT COMPONENT-025;Lo;0;L;;;;;N;;;;; +18819;TANGUT COMPONENT-026;Lo;0;L;;;;;N;;;;; +1881A;TANGUT COMPONENT-027;Lo;0;L;;;;;N;;;;; +1881B;TANGUT COMPONENT-028;Lo;0;L;;;;;N;;;;; +1881C;TANGUT COMPONENT-029;Lo;0;L;;;;;N;;;;; +1881D;TANGUT COMPONENT-030;Lo;0;L;;;;;N;;;;; +1881E;TANGUT COMPONENT-031;Lo;0;L;;;;;N;;;;; +1881F;TANGUT COMPONENT-032;Lo;0;L;;;;;N;;;;; +18820;TANGUT COMPONENT-033;Lo;0;L;;;;;N;;;;; +18821;TANGUT COMPONENT-034;Lo;0;L;;;;;N;;;;; +18822;TANGUT COMPONENT-035;Lo;0;L;;;;;N;;;;; +18823;TANGUT COMPONENT-036;Lo;0;L;;;;;N;;;;; +18824;TANGUT COMPONENT-037;Lo;0;L;;;;;N;;;;; +18825;TANGUT COMPONENT-038;Lo;0;L;;;;;N;;;;; +18826;TANGUT COMPONENT-039;Lo;0;L;;;;;N;;;;; +18827;TANGUT COMPONENT-040;Lo;0;L;;;;;N;;;;; +18828;TANGUT COMPONENT-041;Lo;0;L;;;;;N;;;;; +18829;TANGUT COMPONENT-042;Lo;0;L;;;;;N;;;;; +1882A;TANGUT COMPONENT-043;Lo;0;L;;;;;N;;;;; +1882B;TANGUT COMPONENT-044;Lo;0;L;;;;;N;;;;; +1882C;TANGUT COMPONENT-045;Lo;0;L;;;;;N;;;;; +1882D;TANGUT COMPONENT-046;Lo;0;L;;;;;N;;;;; +1882E;TANGUT COMPONENT-047;Lo;0;L;;;;;N;;;;; +1882F;TANGUT COMPONENT-048;Lo;0;L;;;;;N;;;;; +18830;TANGUT COMPONENT-049;Lo;0;L;;;;;N;;;;; +18831;TANGUT COMPONENT-050;Lo;0;L;;;;;N;;;;; +18832;TANGUT COMPONENT-051;Lo;0;L;;;;;N;;;;; +18833;TANGUT COMPONENT-052;Lo;0;L;;;;;N;;;;; +18834;TANGUT COMPONENT-053;Lo;0;L;;;;;N;;;;; +18835;TANGUT COMPONENT-054;Lo;0;L;;;;;N;;;;; +18836;TANGUT COMPONENT-055;Lo;0;L;;;;;N;;;;; +18837;TANGUT COMPONENT-056;Lo;0;L;;;;;N;;;;; +18838;TANGUT COMPONENT-057;Lo;0;L;;;;;N;;;;; +18839;TANGUT COMPONENT-058;Lo;0;L;;;;;N;;;;; +1883A;TANGUT COMPONENT-059;Lo;0;L;;;;;N;;;;; +1883B;TANGUT COMPONENT-060;Lo;0;L;;;;;N;;;;; +1883C;TANGUT COMPONENT-061;Lo;0;L;;;;;N;;;;; +1883D;TANGUT COMPONENT-062;Lo;0;L;;;;;N;;;;; +1883E;TANGUT COMPONENT-063;Lo;0;L;;;;;N;;;;; +1883F;TANGUT COMPONENT-064;Lo;0;L;;;;;N;;;;; +18840;TANGUT COMPONENT-065;Lo;0;L;;;;;N;;;;; +18841;TANGUT COMPONENT-066;Lo;0;L;;;;;N;;;;; +18842;TANGUT COMPONENT-067;Lo;0;L;;;;;N;;;;; +18843;TANGUT COMPONENT-068;Lo;0;L;;;;;N;;;;; +18844;TANGUT COMPONENT-069;Lo;0;L;;;;;N;;;;; +18845;TANGUT COMPONENT-070;Lo;0;L;;;;;N;;;;; +18846;TANGUT COMPONENT-071;Lo;0;L;;;;;N;;;;; +18847;TANGUT COMPONENT-072;Lo;0;L;;;;;N;;;;; +18848;TANGUT COMPONENT-073;Lo;0;L;;;;;N;;;;; +18849;TANGUT COMPONENT-074;Lo;0;L;;;;;N;;;;; +1884A;TANGUT COMPONENT-075;Lo;0;L;;;;;N;;;;; +1884B;TANGUT COMPONENT-076;Lo;0;L;;;;;N;;;;; +1884C;TANGUT COMPONENT-077;Lo;0;L;;;;;N;;;;; +1884D;TANGUT COMPONENT-078;Lo;0;L;;;;;N;;;;; +1884E;TANGUT COMPONENT-079;Lo;0;L;;;;;N;;;;; +1884F;TANGUT COMPONENT-080;Lo;0;L;;;;;N;;;;; +18850;TANGUT COMPONENT-081;Lo;0;L;;;;;N;;;;; +18851;TANGUT COMPONENT-082;Lo;0;L;;;;;N;;;;; +18852;TANGUT COMPONENT-083;Lo;0;L;;;;;N;;;;; +18853;TANGUT COMPONENT-084;Lo;0;L;;;;;N;;;;; +18854;TANGUT COMPONENT-085;Lo;0;L;;;;;N;;;;; +18855;TANGUT COMPONENT-086;Lo;0;L;;;;;N;;;;; +18856;TANGUT COMPONENT-087;Lo;0;L;;;;;N;;;;; +18857;TANGUT COMPONENT-088;Lo;0;L;;;;;N;;;;; +18858;TANGUT COMPONENT-089;Lo;0;L;;;;;N;;;;; +18859;TANGUT COMPONENT-090;Lo;0;L;;;;;N;;;;; +1885A;TANGUT COMPONENT-091;Lo;0;L;;;;;N;;;;; +1885B;TANGUT COMPONENT-092;Lo;0;L;;;;;N;;;;; +1885C;TANGUT COMPONENT-093;Lo;0;L;;;;;N;;;;; +1885D;TANGUT COMPONENT-094;Lo;0;L;;;;;N;;;;; +1885E;TANGUT COMPONENT-095;Lo;0;L;;;;;N;;;;; +1885F;TANGUT COMPONENT-096;Lo;0;L;;;;;N;;;;; +18860;TANGUT COMPONENT-097;Lo;0;L;;;;;N;;;;; +18861;TANGUT COMPONENT-098;Lo;0;L;;;;;N;;;;; +18862;TANGUT COMPONENT-099;Lo;0;L;;;;;N;;;;; +18863;TANGUT COMPONENT-100;Lo;0;L;;;;;N;;;;; +18864;TANGUT COMPONENT-101;Lo;0;L;;;;;N;;;;; +18865;TANGUT COMPONENT-102;Lo;0;L;;;;;N;;;;; +18866;TANGUT COMPONENT-103;Lo;0;L;;;;;N;;;;; +18867;TANGUT COMPONENT-104;Lo;0;L;;;;;N;;;;; +18868;TANGUT COMPONENT-105;Lo;0;L;;;;;N;;;;; +18869;TANGUT COMPONENT-106;Lo;0;L;;;;;N;;;;; +1886A;TANGUT COMPONENT-107;Lo;0;L;;;;;N;;;;; +1886B;TANGUT COMPONENT-108;Lo;0;L;;;;;N;;;;; +1886C;TANGUT COMPONENT-109;Lo;0;L;;;;;N;;;;; +1886D;TANGUT COMPONENT-110;Lo;0;L;;;;;N;;;;; +1886E;TANGUT COMPONENT-111;Lo;0;L;;;;;N;;;;; +1886F;TANGUT COMPONENT-112;Lo;0;L;;;;;N;;;;; +18870;TANGUT COMPONENT-113;Lo;0;L;;;;;N;;;;; +18871;TANGUT COMPONENT-114;Lo;0;L;;;;;N;;;;; +18872;TANGUT COMPONENT-115;Lo;0;L;;;;;N;;;;; +18873;TANGUT COMPONENT-116;Lo;0;L;;;;;N;;;;; +18874;TANGUT COMPONENT-117;Lo;0;L;;;;;N;;;;; +18875;TANGUT COMPONENT-118;Lo;0;L;;;;;N;;;;; +18876;TANGUT COMPONENT-119;Lo;0;L;;;;;N;;;;; +18877;TANGUT COMPONENT-120;Lo;0;L;;;;;N;;;;; +18878;TANGUT COMPONENT-121;Lo;0;L;;;;;N;;;;; +18879;TANGUT COMPONENT-122;Lo;0;L;;;;;N;;;;; +1887A;TANGUT COMPONENT-123;Lo;0;L;;;;;N;;;;; +1887B;TANGUT COMPONENT-124;Lo;0;L;;;;;N;;;;; +1887C;TANGUT COMPONENT-125;Lo;0;L;;;;;N;;;;; +1887D;TANGUT COMPONENT-126;Lo;0;L;;;;;N;;;;; +1887E;TANGUT COMPONENT-127;Lo;0;L;;;;;N;;;;; +1887F;TANGUT COMPONENT-128;Lo;0;L;;;;;N;;;;; +18880;TANGUT COMPONENT-129;Lo;0;L;;;;;N;;;;; +18881;TANGUT COMPONENT-130;Lo;0;L;;;;;N;;;;; +18882;TANGUT COMPONENT-131;Lo;0;L;;;;;N;;;;; +18883;TANGUT COMPONENT-132;Lo;0;L;;;;;N;;;;; +18884;TANGUT COMPONENT-133;Lo;0;L;;;;;N;;;;; +18885;TANGUT COMPONENT-134;Lo;0;L;;;;;N;;;;; +18886;TANGUT COMPONENT-135;Lo;0;L;;;;;N;;;;; +18887;TANGUT COMPONENT-136;Lo;0;L;;;;;N;;;;; +18888;TANGUT COMPONENT-137;Lo;0;L;;;;;N;;;;; +18889;TANGUT COMPONENT-138;Lo;0;L;;;;;N;;;;; +1888A;TANGUT COMPONENT-139;Lo;0;L;;;;;N;;;;; +1888B;TANGUT COMPONENT-140;Lo;0;L;;;;;N;;;;; +1888C;TANGUT COMPONENT-141;Lo;0;L;;;;;N;;;;; +1888D;TANGUT COMPONENT-142;Lo;0;L;;;;;N;;;;; +1888E;TANGUT COMPONENT-143;Lo;0;L;;;;;N;;;;; +1888F;TANGUT COMPONENT-144;Lo;0;L;;;;;N;;;;; +18890;TANGUT COMPONENT-145;Lo;0;L;;;;;N;;;;; +18891;TANGUT COMPONENT-146;Lo;0;L;;;;;N;;;;; +18892;TANGUT COMPONENT-147;Lo;0;L;;;;;N;;;;; +18893;TANGUT COMPONENT-148;Lo;0;L;;;;;N;;;;; +18894;TANGUT COMPONENT-149;Lo;0;L;;;;;N;;;;; +18895;TANGUT COMPONENT-150;Lo;0;L;;;;;N;;;;; +18896;TANGUT COMPONENT-151;Lo;0;L;;;;;N;;;;; +18897;TANGUT COMPONENT-152;Lo;0;L;;;;;N;;;;; +18898;TANGUT COMPONENT-153;Lo;0;L;;;;;N;;;;; +18899;TANGUT COMPONENT-154;Lo;0;L;;;;;N;;;;; +1889A;TANGUT COMPONENT-155;Lo;0;L;;;;;N;;;;; +1889B;TANGUT COMPONENT-156;Lo;0;L;;;;;N;;;;; +1889C;TANGUT COMPONENT-157;Lo;0;L;;;;;N;;;;; +1889D;TANGUT COMPONENT-158;Lo;0;L;;;;;N;;;;; +1889E;TANGUT COMPONENT-159;Lo;0;L;;;;;N;;;;; +1889F;TANGUT COMPONENT-160;Lo;0;L;;;;;N;;;;; +188A0;TANGUT COMPONENT-161;Lo;0;L;;;;;N;;;;; +188A1;TANGUT COMPONENT-162;Lo;0;L;;;;;N;;;;; +188A2;TANGUT COMPONENT-163;Lo;0;L;;;;;N;;;;; +188A3;TANGUT COMPONENT-164;Lo;0;L;;;;;N;;;;; +188A4;TANGUT COMPONENT-165;Lo;0;L;;;;;N;;;;; +188A5;TANGUT COMPONENT-166;Lo;0;L;;;;;N;;;;; +188A6;TANGUT COMPONENT-167;Lo;0;L;;;;;N;;;;; +188A7;TANGUT COMPONENT-168;Lo;0;L;;;;;N;;;;; +188A8;TANGUT COMPONENT-169;Lo;0;L;;;;;N;;;;; +188A9;TANGUT COMPONENT-170;Lo;0;L;;;;;N;;;;; +188AA;TANGUT COMPONENT-171;Lo;0;L;;;;;N;;;;; +188AB;TANGUT COMPONENT-172;Lo;0;L;;;;;N;;;;; +188AC;TANGUT COMPONENT-173;Lo;0;L;;;;;N;;;;; +188AD;TANGUT COMPONENT-174;Lo;0;L;;;;;N;;;;; +188AE;TANGUT COMPONENT-175;Lo;0;L;;;;;N;;;;; +188AF;TANGUT COMPONENT-176;Lo;0;L;;;;;N;;;;; +188B0;TANGUT COMPONENT-177;Lo;0;L;;;;;N;;;;; +188B1;TANGUT COMPONENT-178;Lo;0;L;;;;;N;;;;; +188B2;TANGUT COMPONENT-179;Lo;0;L;;;;;N;;;;; +188B3;TANGUT COMPONENT-180;Lo;0;L;;;;;N;;;;; +188B4;TANGUT COMPONENT-181;Lo;0;L;;;;;N;;;;; +188B5;TANGUT COMPONENT-182;Lo;0;L;;;;;N;;;;; +188B6;TANGUT COMPONENT-183;Lo;0;L;;;;;N;;;;; +188B7;TANGUT COMPONENT-184;Lo;0;L;;;;;N;;;;; +188B8;TANGUT COMPONENT-185;Lo;0;L;;;;;N;;;;; +188B9;TANGUT COMPONENT-186;Lo;0;L;;;;;N;;;;; +188BA;TANGUT COMPONENT-187;Lo;0;L;;;;;N;;;;; +188BB;TANGUT COMPONENT-188;Lo;0;L;;;;;N;;;;; +188BC;TANGUT COMPONENT-189;Lo;0;L;;;;;N;;;;; +188BD;TANGUT COMPONENT-190;Lo;0;L;;;;;N;;;;; +188BE;TANGUT COMPONENT-191;Lo;0;L;;;;;N;;;;; +188BF;TANGUT COMPONENT-192;Lo;0;L;;;;;N;;;;; +188C0;TANGUT COMPONENT-193;Lo;0;L;;;;;N;;;;; +188C1;TANGUT COMPONENT-194;Lo;0;L;;;;;N;;;;; +188C2;TANGUT COMPONENT-195;Lo;0;L;;;;;N;;;;; +188C3;TANGUT COMPONENT-196;Lo;0;L;;;;;N;;;;; +188C4;TANGUT COMPONENT-197;Lo;0;L;;;;;N;;;;; +188C5;TANGUT COMPONENT-198;Lo;0;L;;;;;N;;;;; +188C6;TANGUT COMPONENT-199;Lo;0;L;;;;;N;;;;; +188C7;TANGUT COMPONENT-200;Lo;0;L;;;;;N;;;;; +188C8;TANGUT COMPONENT-201;Lo;0;L;;;;;N;;;;; +188C9;TANGUT COMPONENT-202;Lo;0;L;;;;;N;;;;; +188CA;TANGUT COMPONENT-203;Lo;0;L;;;;;N;;;;; +188CB;TANGUT COMPONENT-204;Lo;0;L;;;;;N;;;;; +188CC;TANGUT COMPONENT-205;Lo;0;L;;;;;N;;;;; +188CD;TANGUT COMPONENT-206;Lo;0;L;;;;;N;;;;; +188CE;TANGUT COMPONENT-207;Lo;0;L;;;;;N;;;;; +188CF;TANGUT COMPONENT-208;Lo;0;L;;;;;N;;;;; +188D0;TANGUT COMPONENT-209;Lo;0;L;;;;;N;;;;; +188D1;TANGUT COMPONENT-210;Lo;0;L;;;;;N;;;;; +188D2;TANGUT COMPONENT-211;Lo;0;L;;;;;N;;;;; +188D3;TANGUT COMPONENT-212;Lo;0;L;;;;;N;;;;; +188D4;TANGUT COMPONENT-213;Lo;0;L;;;;;N;;;;; +188D5;TANGUT COMPONENT-214;Lo;0;L;;;;;N;;;;; +188D6;TANGUT COMPONENT-215;Lo;0;L;;;;;N;;;;; +188D7;TANGUT COMPONENT-216;Lo;0;L;;;;;N;;;;; +188D8;TANGUT COMPONENT-217;Lo;0;L;;;;;N;;;;; +188D9;TANGUT COMPONENT-218;Lo;0;L;;;;;N;;;;; +188DA;TANGUT COMPONENT-219;Lo;0;L;;;;;N;;;;; +188DB;TANGUT COMPONENT-220;Lo;0;L;;;;;N;;;;; +188DC;TANGUT COMPONENT-221;Lo;0;L;;;;;N;;;;; +188DD;TANGUT COMPONENT-222;Lo;0;L;;;;;N;;;;; +188DE;TANGUT COMPONENT-223;Lo;0;L;;;;;N;;;;; +188DF;TANGUT COMPONENT-224;Lo;0;L;;;;;N;;;;; +188E0;TANGUT COMPONENT-225;Lo;0;L;;;;;N;;;;; +188E1;TANGUT COMPONENT-226;Lo;0;L;;;;;N;;;;; +188E2;TANGUT COMPONENT-227;Lo;0;L;;;;;N;;;;; +188E3;TANGUT COMPONENT-228;Lo;0;L;;;;;N;;;;; +188E4;TANGUT COMPONENT-229;Lo;0;L;;;;;N;;;;; +188E5;TANGUT COMPONENT-230;Lo;0;L;;;;;N;;;;; +188E6;TANGUT COMPONENT-231;Lo;0;L;;;;;N;;;;; +188E7;TANGUT COMPONENT-232;Lo;0;L;;;;;N;;;;; +188E8;TANGUT COMPONENT-233;Lo;0;L;;;;;N;;;;; +188E9;TANGUT COMPONENT-234;Lo;0;L;;;;;N;;;;; +188EA;TANGUT COMPONENT-235;Lo;0;L;;;;;N;;;;; +188EB;TANGUT COMPONENT-236;Lo;0;L;;;;;N;;;;; +188EC;TANGUT COMPONENT-237;Lo;0;L;;;;;N;;;;; +188ED;TANGUT COMPONENT-238;Lo;0;L;;;;;N;;;;; +188EE;TANGUT COMPONENT-239;Lo;0;L;;;;;N;;;;; +188EF;TANGUT COMPONENT-240;Lo;0;L;;;;;N;;;;; +188F0;TANGUT COMPONENT-241;Lo;0;L;;;;;N;;;;; +188F1;TANGUT COMPONENT-242;Lo;0;L;;;;;N;;;;; +188F2;TANGUT COMPONENT-243;Lo;0;L;;;;;N;;;;; +188F3;TANGUT COMPONENT-244;Lo;0;L;;;;;N;;;;; +188F4;TANGUT COMPONENT-245;Lo;0;L;;;;;N;;;;; +188F5;TANGUT COMPONENT-246;Lo;0;L;;;;;N;;;;; +188F6;TANGUT COMPONENT-247;Lo;0;L;;;;;N;;;;; +188F7;TANGUT COMPONENT-248;Lo;0;L;;;;;N;;;;; +188F8;TANGUT COMPONENT-249;Lo;0;L;;;;;N;;;;; +188F9;TANGUT COMPONENT-250;Lo;0;L;;;;;N;;;;; +188FA;TANGUT COMPONENT-251;Lo;0;L;;;;;N;;;;; +188FB;TANGUT COMPONENT-252;Lo;0;L;;;;;N;;;;; +188FC;TANGUT COMPONENT-253;Lo;0;L;;;;;N;;;;; +188FD;TANGUT COMPONENT-254;Lo;0;L;;;;;N;;;;; +188FE;TANGUT COMPONENT-255;Lo;0;L;;;;;N;;;;; +188FF;TANGUT COMPONENT-256;Lo;0;L;;;;;N;;;;; +18900;TANGUT COMPONENT-257;Lo;0;L;;;;;N;;;;; +18901;TANGUT COMPONENT-258;Lo;0;L;;;;;N;;;;; +18902;TANGUT COMPONENT-259;Lo;0;L;;;;;N;;;;; +18903;TANGUT COMPONENT-260;Lo;0;L;;;;;N;;;;; +18904;TANGUT COMPONENT-261;Lo;0;L;;;;;N;;;;; +18905;TANGUT COMPONENT-262;Lo;0;L;;;;;N;;;;; +18906;TANGUT COMPONENT-263;Lo;0;L;;;;;N;;;;; +18907;TANGUT COMPONENT-264;Lo;0;L;;;;;N;;;;; +18908;TANGUT COMPONENT-265;Lo;0;L;;;;;N;;;;; +18909;TANGUT COMPONENT-266;Lo;0;L;;;;;N;;;;; +1890A;TANGUT COMPONENT-267;Lo;0;L;;;;;N;;;;; +1890B;TANGUT COMPONENT-268;Lo;0;L;;;;;N;;;;; +1890C;TANGUT COMPONENT-269;Lo;0;L;;;;;N;;;;; +1890D;TANGUT COMPONENT-270;Lo;0;L;;;;;N;;;;; +1890E;TANGUT COMPONENT-271;Lo;0;L;;;;;N;;;;; +1890F;TANGUT COMPONENT-272;Lo;0;L;;;;;N;;;;; +18910;TANGUT COMPONENT-273;Lo;0;L;;;;;N;;;;; +18911;TANGUT COMPONENT-274;Lo;0;L;;;;;N;;;;; +18912;TANGUT COMPONENT-275;Lo;0;L;;;;;N;;;;; +18913;TANGUT COMPONENT-276;Lo;0;L;;;;;N;;;;; +18914;TANGUT COMPONENT-277;Lo;0;L;;;;;N;;;;; +18915;TANGUT COMPONENT-278;Lo;0;L;;;;;N;;;;; +18916;TANGUT COMPONENT-279;Lo;0;L;;;;;N;;;;; +18917;TANGUT COMPONENT-280;Lo;0;L;;;;;N;;;;; +18918;TANGUT COMPONENT-281;Lo;0;L;;;;;N;;;;; +18919;TANGUT COMPONENT-282;Lo;0;L;;;;;N;;;;; +1891A;TANGUT COMPONENT-283;Lo;0;L;;;;;N;;;;; +1891B;TANGUT COMPONENT-284;Lo;0;L;;;;;N;;;;; +1891C;TANGUT COMPONENT-285;Lo;0;L;;;;;N;;;;; +1891D;TANGUT COMPONENT-286;Lo;0;L;;;;;N;;;;; +1891E;TANGUT COMPONENT-287;Lo;0;L;;;;;N;;;;; +1891F;TANGUT COMPONENT-288;Lo;0;L;;;;;N;;;;; +18920;TANGUT COMPONENT-289;Lo;0;L;;;;;N;;;;; +18921;TANGUT COMPONENT-290;Lo;0;L;;;;;N;;;;; +18922;TANGUT COMPONENT-291;Lo;0;L;;;;;N;;;;; +18923;TANGUT COMPONENT-292;Lo;0;L;;;;;N;;;;; +18924;TANGUT COMPONENT-293;Lo;0;L;;;;;N;;;;; +18925;TANGUT COMPONENT-294;Lo;0;L;;;;;N;;;;; +18926;TANGUT COMPONENT-295;Lo;0;L;;;;;N;;;;; +18927;TANGUT COMPONENT-296;Lo;0;L;;;;;N;;;;; +18928;TANGUT COMPONENT-297;Lo;0;L;;;;;N;;;;; +18929;TANGUT COMPONENT-298;Lo;0;L;;;;;N;;;;; +1892A;TANGUT COMPONENT-299;Lo;0;L;;;;;N;;;;; +1892B;TANGUT COMPONENT-300;Lo;0;L;;;;;N;;;;; +1892C;TANGUT COMPONENT-301;Lo;0;L;;;;;N;;;;; +1892D;TANGUT COMPONENT-302;Lo;0;L;;;;;N;;;;; +1892E;TANGUT COMPONENT-303;Lo;0;L;;;;;N;;;;; +1892F;TANGUT COMPONENT-304;Lo;0;L;;;;;N;;;;; +18930;TANGUT COMPONENT-305;Lo;0;L;;;;;N;;;;; +18931;TANGUT COMPONENT-306;Lo;0;L;;;;;N;;;;; +18932;TANGUT COMPONENT-307;Lo;0;L;;;;;N;;;;; +18933;TANGUT COMPONENT-308;Lo;0;L;;;;;N;;;;; +18934;TANGUT COMPONENT-309;Lo;0;L;;;;;N;;;;; +18935;TANGUT COMPONENT-310;Lo;0;L;;;;;N;;;;; +18936;TANGUT COMPONENT-311;Lo;0;L;;;;;N;;;;; +18937;TANGUT COMPONENT-312;Lo;0;L;;;;;N;;;;; +18938;TANGUT COMPONENT-313;Lo;0;L;;;;;N;;;;; +18939;TANGUT COMPONENT-314;Lo;0;L;;;;;N;;;;; +1893A;TANGUT COMPONENT-315;Lo;0;L;;;;;N;;;;; +1893B;TANGUT COMPONENT-316;Lo;0;L;;;;;N;;;;; +1893C;TANGUT COMPONENT-317;Lo;0;L;;;;;N;;;;; +1893D;TANGUT COMPONENT-318;Lo;0;L;;;;;N;;;;; +1893E;TANGUT COMPONENT-319;Lo;0;L;;;;;N;;;;; +1893F;TANGUT COMPONENT-320;Lo;0;L;;;;;N;;;;; +18940;TANGUT COMPONENT-321;Lo;0;L;;;;;N;;;;; +18941;TANGUT COMPONENT-322;Lo;0;L;;;;;N;;;;; +18942;TANGUT COMPONENT-323;Lo;0;L;;;;;N;;;;; +18943;TANGUT COMPONENT-324;Lo;0;L;;;;;N;;;;; +18944;TANGUT COMPONENT-325;Lo;0;L;;;;;N;;;;; +18945;TANGUT COMPONENT-326;Lo;0;L;;;;;N;;;;; +18946;TANGUT COMPONENT-327;Lo;0;L;;;;;N;;;;; +18947;TANGUT COMPONENT-328;Lo;0;L;;;;;N;;;;; +18948;TANGUT COMPONENT-329;Lo;0;L;;;;;N;;;;; +18949;TANGUT COMPONENT-330;Lo;0;L;;;;;N;;;;; +1894A;TANGUT COMPONENT-331;Lo;0;L;;;;;N;;;;; +1894B;TANGUT COMPONENT-332;Lo;0;L;;;;;N;;;;; +1894C;TANGUT COMPONENT-333;Lo;0;L;;;;;N;;;;; +1894D;TANGUT COMPONENT-334;Lo;0;L;;;;;N;;;;; +1894E;TANGUT COMPONENT-335;Lo;0;L;;;;;N;;;;; +1894F;TANGUT COMPONENT-336;Lo;0;L;;;;;N;;;;; +18950;TANGUT COMPONENT-337;Lo;0;L;;;;;N;;;;; +18951;TANGUT COMPONENT-338;Lo;0;L;;;;;N;;;;; +18952;TANGUT COMPONENT-339;Lo;0;L;;;;;N;;;;; +18953;TANGUT COMPONENT-340;Lo;0;L;;;;;N;;;;; +18954;TANGUT COMPONENT-341;Lo;0;L;;;;;N;;;;; +18955;TANGUT COMPONENT-342;Lo;0;L;;;;;N;;;;; +18956;TANGUT COMPONENT-343;Lo;0;L;;;;;N;;;;; +18957;TANGUT COMPONENT-344;Lo;0;L;;;;;N;;;;; +18958;TANGUT COMPONENT-345;Lo;0;L;;;;;N;;;;; +18959;TANGUT COMPONENT-346;Lo;0;L;;;;;N;;;;; +1895A;TANGUT COMPONENT-347;Lo;0;L;;;;;N;;;;; +1895B;TANGUT COMPONENT-348;Lo;0;L;;;;;N;;;;; +1895C;TANGUT COMPONENT-349;Lo;0;L;;;;;N;;;;; +1895D;TANGUT COMPONENT-350;Lo;0;L;;;;;N;;;;; +1895E;TANGUT COMPONENT-351;Lo;0;L;;;;;N;;;;; +1895F;TANGUT COMPONENT-352;Lo;0;L;;;;;N;;;;; +18960;TANGUT COMPONENT-353;Lo;0;L;;;;;N;;;;; +18961;TANGUT COMPONENT-354;Lo;0;L;;;;;N;;;;; +18962;TANGUT COMPONENT-355;Lo;0;L;;;;;N;;;;; +18963;TANGUT COMPONENT-356;Lo;0;L;;;;;N;;;;; +18964;TANGUT COMPONENT-357;Lo;0;L;;;;;N;;;;; +18965;TANGUT COMPONENT-358;Lo;0;L;;;;;N;;;;; +18966;TANGUT COMPONENT-359;Lo;0;L;;;;;N;;;;; +18967;TANGUT COMPONENT-360;Lo;0;L;;;;;N;;;;; +18968;TANGUT COMPONENT-361;Lo;0;L;;;;;N;;;;; +18969;TANGUT COMPONENT-362;Lo;0;L;;;;;N;;;;; +1896A;TANGUT COMPONENT-363;Lo;0;L;;;;;N;;;;; +1896B;TANGUT COMPONENT-364;Lo;0;L;;;;;N;;;;; +1896C;TANGUT COMPONENT-365;Lo;0;L;;;;;N;;;;; +1896D;TANGUT COMPONENT-366;Lo;0;L;;;;;N;;;;; +1896E;TANGUT COMPONENT-367;Lo;0;L;;;;;N;;;;; +1896F;TANGUT COMPONENT-368;Lo;0;L;;;;;N;;;;; +18970;TANGUT COMPONENT-369;Lo;0;L;;;;;N;;;;; +18971;TANGUT COMPONENT-370;Lo;0;L;;;;;N;;;;; +18972;TANGUT COMPONENT-371;Lo;0;L;;;;;N;;;;; +18973;TANGUT COMPONENT-372;Lo;0;L;;;;;N;;;;; +18974;TANGUT COMPONENT-373;Lo;0;L;;;;;N;;;;; +18975;TANGUT COMPONENT-374;Lo;0;L;;;;;N;;;;; +18976;TANGUT COMPONENT-375;Lo;0;L;;;;;N;;;;; +18977;TANGUT COMPONENT-376;Lo;0;L;;;;;N;;;;; +18978;TANGUT COMPONENT-377;Lo;0;L;;;;;N;;;;; +18979;TANGUT COMPONENT-378;Lo;0;L;;;;;N;;;;; +1897A;TANGUT COMPONENT-379;Lo;0;L;;;;;N;;;;; +1897B;TANGUT COMPONENT-380;Lo;0;L;;;;;N;;;;; +1897C;TANGUT COMPONENT-381;Lo;0;L;;;;;N;;;;; +1897D;TANGUT COMPONENT-382;Lo;0;L;;;;;N;;;;; +1897E;TANGUT COMPONENT-383;Lo;0;L;;;;;N;;;;; +1897F;TANGUT COMPONENT-384;Lo;0;L;;;;;N;;;;; +18980;TANGUT COMPONENT-385;Lo;0;L;;;;;N;;;;; +18981;TANGUT COMPONENT-386;Lo;0;L;;;;;N;;;;; +18982;TANGUT COMPONENT-387;Lo;0;L;;;;;N;;;;; +18983;TANGUT COMPONENT-388;Lo;0;L;;;;;N;;;;; +18984;TANGUT COMPONENT-389;Lo;0;L;;;;;N;;;;; +18985;TANGUT COMPONENT-390;Lo;0;L;;;;;N;;;;; +18986;TANGUT COMPONENT-391;Lo;0;L;;;;;N;;;;; +18987;TANGUT COMPONENT-392;Lo;0;L;;;;;N;;;;; +18988;TANGUT COMPONENT-393;Lo;0;L;;;;;N;;;;; +18989;TANGUT COMPONENT-394;Lo;0;L;;;;;N;;;;; +1898A;TANGUT COMPONENT-395;Lo;0;L;;;;;N;;;;; +1898B;TANGUT COMPONENT-396;Lo;0;L;;;;;N;;;;; +1898C;TANGUT COMPONENT-397;Lo;0;L;;;;;N;;;;; +1898D;TANGUT COMPONENT-398;Lo;0;L;;;;;N;;;;; +1898E;TANGUT COMPONENT-399;Lo;0;L;;;;;N;;;;; +1898F;TANGUT COMPONENT-400;Lo;0;L;;;;;N;;;;; +18990;TANGUT COMPONENT-401;Lo;0;L;;;;;N;;;;; +18991;TANGUT COMPONENT-402;Lo;0;L;;;;;N;;;;; +18992;TANGUT COMPONENT-403;Lo;0;L;;;;;N;;;;; +18993;TANGUT COMPONENT-404;Lo;0;L;;;;;N;;;;; +18994;TANGUT COMPONENT-405;Lo;0;L;;;;;N;;;;; +18995;TANGUT COMPONENT-406;Lo;0;L;;;;;N;;;;; +18996;TANGUT COMPONENT-407;Lo;0;L;;;;;N;;;;; +18997;TANGUT COMPONENT-408;Lo;0;L;;;;;N;;;;; +18998;TANGUT COMPONENT-409;Lo;0;L;;;;;N;;;;; +18999;TANGUT COMPONENT-410;Lo;0;L;;;;;N;;;;; +1899A;TANGUT COMPONENT-411;Lo;0;L;;;;;N;;;;; +1899B;TANGUT COMPONENT-412;Lo;0;L;;;;;N;;;;; +1899C;TANGUT COMPONENT-413;Lo;0;L;;;;;N;;;;; +1899D;TANGUT COMPONENT-414;Lo;0;L;;;;;N;;;;; +1899E;TANGUT COMPONENT-415;Lo;0;L;;;;;N;;;;; +1899F;TANGUT COMPONENT-416;Lo;0;L;;;;;N;;;;; +189A0;TANGUT COMPONENT-417;Lo;0;L;;;;;N;;;;; +189A1;TANGUT COMPONENT-418;Lo;0;L;;;;;N;;;;; +189A2;TANGUT COMPONENT-419;Lo;0;L;;;;;N;;;;; +189A3;TANGUT COMPONENT-420;Lo;0;L;;;;;N;;;;; +189A4;TANGUT COMPONENT-421;Lo;0;L;;;;;N;;;;; +189A5;TANGUT COMPONENT-422;Lo;0;L;;;;;N;;;;; +189A6;TANGUT COMPONENT-423;Lo;0;L;;;;;N;;;;; +189A7;TANGUT COMPONENT-424;Lo;0;L;;;;;N;;;;; +189A8;TANGUT COMPONENT-425;Lo;0;L;;;;;N;;;;; +189A9;TANGUT COMPONENT-426;Lo;0;L;;;;;N;;;;; +189AA;TANGUT COMPONENT-427;Lo;0;L;;;;;N;;;;; +189AB;TANGUT COMPONENT-428;Lo;0;L;;;;;N;;;;; +189AC;TANGUT COMPONENT-429;Lo;0;L;;;;;N;;;;; +189AD;TANGUT COMPONENT-430;Lo;0;L;;;;;N;;;;; +189AE;TANGUT COMPONENT-431;Lo;0;L;;;;;N;;;;; +189AF;TANGUT COMPONENT-432;Lo;0;L;;;;;N;;;;; +189B0;TANGUT COMPONENT-433;Lo;0;L;;;;;N;;;;; +189B1;TANGUT COMPONENT-434;Lo;0;L;;;;;N;;;;; +189B2;TANGUT COMPONENT-435;Lo;0;L;;;;;N;;;;; +189B3;TANGUT COMPONENT-436;Lo;0;L;;;;;N;;;;; +189B4;TANGUT COMPONENT-437;Lo;0;L;;;;;N;;;;; +189B5;TANGUT COMPONENT-438;Lo;0;L;;;;;N;;;;; +189B6;TANGUT COMPONENT-439;Lo;0;L;;;;;N;;;;; +189B7;TANGUT COMPONENT-440;Lo;0;L;;;;;N;;;;; +189B8;TANGUT COMPONENT-441;Lo;0;L;;;;;N;;;;; +189B9;TANGUT COMPONENT-442;Lo;0;L;;;;;N;;;;; +189BA;TANGUT COMPONENT-443;Lo;0;L;;;;;N;;;;; +189BB;TANGUT COMPONENT-444;Lo;0;L;;;;;N;;;;; +189BC;TANGUT COMPONENT-445;Lo;0;L;;;;;N;;;;; +189BD;TANGUT COMPONENT-446;Lo;0;L;;;;;N;;;;; +189BE;TANGUT COMPONENT-447;Lo;0;L;;;;;N;;;;; +189BF;TANGUT COMPONENT-448;Lo;0;L;;;;;N;;;;; +189C0;TANGUT COMPONENT-449;Lo;0;L;;;;;N;;;;; +189C1;TANGUT COMPONENT-450;Lo;0;L;;;;;N;;;;; +189C2;TANGUT COMPONENT-451;Lo;0;L;;;;;N;;;;; +189C3;TANGUT COMPONENT-452;Lo;0;L;;;;;N;;;;; +189C4;TANGUT COMPONENT-453;Lo;0;L;;;;;N;;;;; +189C5;TANGUT COMPONENT-454;Lo;0;L;;;;;N;;;;; +189C6;TANGUT COMPONENT-455;Lo;0;L;;;;;N;;;;; +189C7;TANGUT COMPONENT-456;Lo;0;L;;;;;N;;;;; +189C8;TANGUT COMPONENT-457;Lo;0;L;;;;;N;;;;; +189C9;TANGUT COMPONENT-458;Lo;0;L;;;;;N;;;;; +189CA;TANGUT COMPONENT-459;Lo;0;L;;;;;N;;;;; +189CB;TANGUT COMPONENT-460;Lo;0;L;;;;;N;;;;; +189CC;TANGUT COMPONENT-461;Lo;0;L;;;;;N;;;;; +189CD;TANGUT COMPONENT-462;Lo;0;L;;;;;N;;;;; +189CE;TANGUT COMPONENT-463;Lo;0;L;;;;;N;;;;; +189CF;TANGUT COMPONENT-464;Lo;0;L;;;;;N;;;;; +189D0;TANGUT COMPONENT-465;Lo;0;L;;;;;N;;;;; +189D1;TANGUT COMPONENT-466;Lo;0;L;;;;;N;;;;; +189D2;TANGUT COMPONENT-467;Lo;0;L;;;;;N;;;;; +189D3;TANGUT COMPONENT-468;Lo;0;L;;;;;N;;;;; +189D4;TANGUT COMPONENT-469;Lo;0;L;;;;;N;;;;; +189D5;TANGUT COMPONENT-470;Lo;0;L;;;;;N;;;;; +189D6;TANGUT COMPONENT-471;Lo;0;L;;;;;N;;;;; +189D7;TANGUT COMPONENT-472;Lo;0;L;;;;;N;;;;; +189D8;TANGUT COMPONENT-473;Lo;0;L;;;;;N;;;;; +189D9;TANGUT COMPONENT-474;Lo;0;L;;;;;N;;;;; +189DA;TANGUT COMPONENT-475;Lo;0;L;;;;;N;;;;; +189DB;TANGUT COMPONENT-476;Lo;0;L;;;;;N;;;;; +189DC;TANGUT COMPONENT-477;Lo;0;L;;;;;N;;;;; +189DD;TANGUT COMPONENT-478;Lo;0;L;;;;;N;;;;; +189DE;TANGUT COMPONENT-479;Lo;0;L;;;;;N;;;;; +189DF;TANGUT COMPONENT-480;Lo;0;L;;;;;N;;;;; +189E0;TANGUT COMPONENT-481;Lo;0;L;;;;;N;;;;; +189E1;TANGUT COMPONENT-482;Lo;0;L;;;;;N;;;;; +189E2;TANGUT COMPONENT-483;Lo;0;L;;;;;N;;;;; +189E3;TANGUT COMPONENT-484;Lo;0;L;;;;;N;;;;; +189E4;TANGUT COMPONENT-485;Lo;0;L;;;;;N;;;;; +189E5;TANGUT COMPONENT-486;Lo;0;L;;;;;N;;;;; +189E6;TANGUT COMPONENT-487;Lo;0;L;;;;;N;;;;; +189E7;TANGUT COMPONENT-488;Lo;0;L;;;;;N;;;;; +189E8;TANGUT COMPONENT-489;Lo;0;L;;;;;N;;;;; +189E9;TANGUT COMPONENT-490;Lo;0;L;;;;;N;;;;; +189EA;TANGUT COMPONENT-491;Lo;0;L;;;;;N;;;;; +189EB;TANGUT COMPONENT-492;Lo;0;L;;;;;N;;;;; +189EC;TANGUT COMPONENT-493;Lo;0;L;;;;;N;;;;; +189ED;TANGUT COMPONENT-494;Lo;0;L;;;;;N;;;;; +189EE;TANGUT COMPONENT-495;Lo;0;L;;;;;N;;;;; +189EF;TANGUT COMPONENT-496;Lo;0;L;;;;;N;;;;; +189F0;TANGUT COMPONENT-497;Lo;0;L;;;;;N;;;;; +189F1;TANGUT COMPONENT-498;Lo;0;L;;;;;N;;;;; +189F2;TANGUT COMPONENT-499;Lo;0;L;;;;;N;;;;; +189F3;TANGUT COMPONENT-500;Lo;0;L;;;;;N;;;;; +189F4;TANGUT COMPONENT-501;Lo;0;L;;;;;N;;;;; +189F5;TANGUT COMPONENT-502;Lo;0;L;;;;;N;;;;; +189F6;TANGUT COMPONENT-503;Lo;0;L;;;;;N;;;;; +189F7;TANGUT COMPONENT-504;Lo;0;L;;;;;N;;;;; +189F8;TANGUT COMPONENT-505;Lo;0;L;;;;;N;;;;; +189F9;TANGUT COMPONENT-506;Lo;0;L;;;;;N;;;;; +189FA;TANGUT COMPONENT-507;Lo;0;L;;;;;N;;;;; +189FB;TANGUT COMPONENT-508;Lo;0;L;;;;;N;;;;; +189FC;TANGUT COMPONENT-509;Lo;0;L;;;;;N;;;;; +189FD;TANGUT COMPONENT-510;Lo;0;L;;;;;N;;;;; +189FE;TANGUT COMPONENT-511;Lo;0;L;;;;;N;;;;; +189FF;TANGUT COMPONENT-512;Lo;0;L;;;;;N;;;;; +18A00;TANGUT COMPONENT-513;Lo;0;L;;;;;N;;;;; +18A01;TANGUT COMPONENT-514;Lo;0;L;;;;;N;;;;; +18A02;TANGUT COMPONENT-515;Lo;0;L;;;;;N;;;;; +18A03;TANGUT COMPONENT-516;Lo;0;L;;;;;N;;;;; +18A04;TANGUT COMPONENT-517;Lo;0;L;;;;;N;;;;; +18A05;TANGUT COMPONENT-518;Lo;0;L;;;;;N;;;;; +18A06;TANGUT COMPONENT-519;Lo;0;L;;;;;N;;;;; +18A07;TANGUT COMPONENT-520;Lo;0;L;;;;;N;;;;; +18A08;TANGUT COMPONENT-521;Lo;0;L;;;;;N;;;;; +18A09;TANGUT COMPONENT-522;Lo;0;L;;;;;N;;;;; +18A0A;TANGUT COMPONENT-523;Lo;0;L;;;;;N;;;;; +18A0B;TANGUT COMPONENT-524;Lo;0;L;;;;;N;;;;; +18A0C;TANGUT COMPONENT-525;Lo;0;L;;;;;N;;;;; +18A0D;TANGUT COMPONENT-526;Lo;0;L;;;;;N;;;;; +18A0E;TANGUT COMPONENT-527;Lo;0;L;;;;;N;;;;; +18A0F;TANGUT COMPONENT-528;Lo;0;L;;;;;N;;;;; +18A10;TANGUT COMPONENT-529;Lo;0;L;;;;;N;;;;; +18A11;TANGUT COMPONENT-530;Lo;0;L;;;;;N;;;;; +18A12;TANGUT COMPONENT-531;Lo;0;L;;;;;N;;;;; +18A13;TANGUT COMPONENT-532;Lo;0;L;;;;;N;;;;; +18A14;TANGUT COMPONENT-533;Lo;0;L;;;;;N;;;;; +18A15;TANGUT COMPONENT-534;Lo;0;L;;;;;N;;;;; +18A16;TANGUT COMPONENT-535;Lo;0;L;;;;;N;;;;; +18A17;TANGUT COMPONENT-536;Lo;0;L;;;;;N;;;;; +18A18;TANGUT COMPONENT-537;Lo;0;L;;;;;N;;;;; +18A19;TANGUT COMPONENT-538;Lo;0;L;;;;;N;;;;; +18A1A;TANGUT COMPONENT-539;Lo;0;L;;;;;N;;;;; +18A1B;TANGUT COMPONENT-540;Lo;0;L;;;;;N;;;;; +18A1C;TANGUT COMPONENT-541;Lo;0;L;;;;;N;;;;; +18A1D;TANGUT COMPONENT-542;Lo;0;L;;;;;N;;;;; +18A1E;TANGUT COMPONENT-543;Lo;0;L;;;;;N;;;;; +18A1F;TANGUT COMPONENT-544;Lo;0;L;;;;;N;;;;; +18A20;TANGUT COMPONENT-545;Lo;0;L;;;;;N;;;;; +18A21;TANGUT COMPONENT-546;Lo;0;L;;;;;N;;;;; +18A22;TANGUT COMPONENT-547;Lo;0;L;;;;;N;;;;; +18A23;TANGUT COMPONENT-548;Lo;0;L;;;;;N;;;;; +18A24;TANGUT COMPONENT-549;Lo;0;L;;;;;N;;;;; +18A25;TANGUT COMPONENT-550;Lo;0;L;;;;;N;;;;; +18A26;TANGUT COMPONENT-551;Lo;0;L;;;;;N;;;;; +18A27;TANGUT COMPONENT-552;Lo;0;L;;;;;N;;;;; +18A28;TANGUT COMPONENT-553;Lo;0;L;;;;;N;;;;; +18A29;TANGUT COMPONENT-554;Lo;0;L;;;;;N;;;;; +18A2A;TANGUT COMPONENT-555;Lo;0;L;;;;;N;;;;; +18A2B;TANGUT COMPONENT-556;Lo;0;L;;;;;N;;;;; +18A2C;TANGUT COMPONENT-557;Lo;0;L;;;;;N;;;;; +18A2D;TANGUT COMPONENT-558;Lo;0;L;;;;;N;;;;; +18A2E;TANGUT COMPONENT-559;Lo;0;L;;;;;N;;;;; +18A2F;TANGUT COMPONENT-560;Lo;0;L;;;;;N;;;;; +18A30;TANGUT COMPONENT-561;Lo;0;L;;;;;N;;;;; +18A31;TANGUT COMPONENT-562;Lo;0;L;;;;;N;;;;; +18A32;TANGUT COMPONENT-563;Lo;0;L;;;;;N;;;;; +18A33;TANGUT COMPONENT-564;Lo;0;L;;;;;N;;;;; +18A34;TANGUT COMPONENT-565;Lo;0;L;;;;;N;;;;; +18A35;TANGUT COMPONENT-566;Lo;0;L;;;;;N;;;;; +18A36;TANGUT COMPONENT-567;Lo;0;L;;;;;N;;;;; +18A37;TANGUT COMPONENT-568;Lo;0;L;;;;;N;;;;; +18A38;TANGUT COMPONENT-569;Lo;0;L;;;;;N;;;;; +18A39;TANGUT COMPONENT-570;Lo;0;L;;;;;N;;;;; +18A3A;TANGUT COMPONENT-571;Lo;0;L;;;;;N;;;;; +18A3B;TANGUT COMPONENT-572;Lo;0;L;;;;;N;;;;; +18A3C;TANGUT COMPONENT-573;Lo;0;L;;;;;N;;;;; +18A3D;TANGUT COMPONENT-574;Lo;0;L;;;;;N;;;;; +18A3E;TANGUT COMPONENT-575;Lo;0;L;;;;;N;;;;; +18A3F;TANGUT COMPONENT-576;Lo;0;L;;;;;N;;;;; +18A40;TANGUT COMPONENT-577;Lo;0;L;;;;;N;;;;; +18A41;TANGUT COMPONENT-578;Lo;0;L;;;;;N;;;;; +18A42;TANGUT COMPONENT-579;Lo;0;L;;;;;N;;;;; +18A43;TANGUT COMPONENT-580;Lo;0;L;;;;;N;;;;; +18A44;TANGUT COMPONENT-581;Lo;0;L;;;;;N;;;;; +18A45;TANGUT COMPONENT-582;Lo;0;L;;;;;N;;;;; +18A46;TANGUT COMPONENT-583;Lo;0;L;;;;;N;;;;; +18A47;TANGUT COMPONENT-584;Lo;0;L;;;;;N;;;;; +18A48;TANGUT COMPONENT-585;Lo;0;L;;;;;N;;;;; +18A49;TANGUT COMPONENT-586;Lo;0;L;;;;;N;;;;; +18A4A;TANGUT COMPONENT-587;Lo;0;L;;;;;N;;;;; +18A4B;TANGUT COMPONENT-588;Lo;0;L;;;;;N;;;;; +18A4C;TANGUT COMPONENT-589;Lo;0;L;;;;;N;;;;; +18A4D;TANGUT COMPONENT-590;Lo;0;L;;;;;N;;;;; +18A4E;TANGUT COMPONENT-591;Lo;0;L;;;;;N;;;;; +18A4F;TANGUT COMPONENT-592;Lo;0;L;;;;;N;;;;; +18A50;TANGUT COMPONENT-593;Lo;0;L;;;;;N;;;;; +18A51;TANGUT COMPONENT-594;Lo;0;L;;;;;N;;;;; +18A52;TANGUT COMPONENT-595;Lo;0;L;;;;;N;;;;; +18A53;TANGUT COMPONENT-596;Lo;0;L;;;;;N;;;;; +18A54;TANGUT COMPONENT-597;Lo;0;L;;;;;N;;;;; +18A55;TANGUT COMPONENT-598;Lo;0;L;;;;;N;;;;; +18A56;TANGUT COMPONENT-599;Lo;0;L;;;;;N;;;;; +18A57;TANGUT COMPONENT-600;Lo;0;L;;;;;N;;;;; +18A58;TANGUT COMPONENT-601;Lo;0;L;;;;;N;;;;; +18A59;TANGUT COMPONENT-602;Lo;0;L;;;;;N;;;;; +18A5A;TANGUT COMPONENT-603;Lo;0;L;;;;;N;;;;; +18A5B;TANGUT COMPONENT-604;Lo;0;L;;;;;N;;;;; +18A5C;TANGUT COMPONENT-605;Lo;0;L;;;;;N;;;;; +18A5D;TANGUT COMPONENT-606;Lo;0;L;;;;;N;;;;; +18A5E;TANGUT COMPONENT-607;Lo;0;L;;;;;N;;;;; +18A5F;TANGUT COMPONENT-608;Lo;0;L;;;;;N;;;;; +18A60;TANGUT COMPONENT-609;Lo;0;L;;;;;N;;;;; +18A61;TANGUT COMPONENT-610;Lo;0;L;;;;;N;;;;; +18A62;TANGUT COMPONENT-611;Lo;0;L;;;;;N;;;;; +18A63;TANGUT COMPONENT-612;Lo;0;L;;;;;N;;;;; +18A64;TANGUT COMPONENT-613;Lo;0;L;;;;;N;;;;; +18A65;TANGUT COMPONENT-614;Lo;0;L;;;;;N;;;;; +18A66;TANGUT COMPONENT-615;Lo;0;L;;;;;N;;;;; +18A67;TANGUT COMPONENT-616;Lo;0;L;;;;;N;;;;; +18A68;TANGUT COMPONENT-617;Lo;0;L;;;;;N;;;;; +18A69;TANGUT COMPONENT-618;Lo;0;L;;;;;N;;;;; +18A6A;TANGUT COMPONENT-619;Lo;0;L;;;;;N;;;;; +18A6B;TANGUT COMPONENT-620;Lo;0;L;;;;;N;;;;; +18A6C;TANGUT COMPONENT-621;Lo;0;L;;;;;N;;;;; +18A6D;TANGUT COMPONENT-622;Lo;0;L;;;;;N;;;;; +18A6E;TANGUT COMPONENT-623;Lo;0;L;;;;;N;;;;; +18A6F;TANGUT COMPONENT-624;Lo;0;L;;;;;N;;;;; +18A70;TANGUT COMPONENT-625;Lo;0;L;;;;;N;;;;; +18A71;TANGUT COMPONENT-626;Lo;0;L;;;;;N;;;;; +18A72;TANGUT COMPONENT-627;Lo;0;L;;;;;N;;;;; +18A73;TANGUT COMPONENT-628;Lo;0;L;;;;;N;;;;; +18A74;TANGUT COMPONENT-629;Lo;0;L;;;;;N;;;;; +18A75;TANGUT COMPONENT-630;Lo;0;L;;;;;N;;;;; +18A76;TANGUT COMPONENT-631;Lo;0;L;;;;;N;;;;; +18A77;TANGUT COMPONENT-632;Lo;0;L;;;;;N;;;;; +18A78;TANGUT COMPONENT-633;Lo;0;L;;;;;N;;;;; +18A79;TANGUT COMPONENT-634;Lo;0;L;;;;;N;;;;; +18A7A;TANGUT COMPONENT-635;Lo;0;L;;;;;N;;;;; +18A7B;TANGUT COMPONENT-636;Lo;0;L;;;;;N;;;;; +18A7C;TANGUT COMPONENT-637;Lo;0;L;;;;;N;;;;; +18A7D;TANGUT COMPONENT-638;Lo;0;L;;;;;N;;;;; +18A7E;TANGUT COMPONENT-639;Lo;0;L;;;;;N;;;;; +18A7F;TANGUT COMPONENT-640;Lo;0;L;;;;;N;;;;; +18A80;TANGUT COMPONENT-641;Lo;0;L;;;;;N;;;;; +18A81;TANGUT COMPONENT-642;Lo;0;L;;;;;N;;;;; +18A82;TANGUT COMPONENT-643;Lo;0;L;;;;;N;;;;; +18A83;TANGUT COMPONENT-644;Lo;0;L;;;;;N;;;;; +18A84;TANGUT COMPONENT-645;Lo;0;L;;;;;N;;;;; +18A85;TANGUT COMPONENT-646;Lo;0;L;;;;;N;;;;; +18A86;TANGUT COMPONENT-647;Lo;0;L;;;;;N;;;;; +18A87;TANGUT COMPONENT-648;Lo;0;L;;;;;N;;;;; +18A88;TANGUT COMPONENT-649;Lo;0;L;;;;;N;;;;; +18A89;TANGUT COMPONENT-650;Lo;0;L;;;;;N;;;;; +18A8A;TANGUT COMPONENT-651;Lo;0;L;;;;;N;;;;; +18A8B;TANGUT COMPONENT-652;Lo;0;L;;;;;N;;;;; +18A8C;TANGUT COMPONENT-653;Lo;0;L;;;;;N;;;;; +18A8D;TANGUT COMPONENT-654;Lo;0;L;;;;;N;;;;; +18A8E;TANGUT COMPONENT-655;Lo;0;L;;;;;N;;;;; +18A8F;TANGUT COMPONENT-656;Lo;0;L;;;;;N;;;;; +18A90;TANGUT COMPONENT-657;Lo;0;L;;;;;N;;;;; +18A91;TANGUT COMPONENT-658;Lo;0;L;;;;;N;;;;; +18A92;TANGUT COMPONENT-659;Lo;0;L;;;;;N;;;;; +18A93;TANGUT COMPONENT-660;Lo;0;L;;;;;N;;;;; +18A94;TANGUT COMPONENT-661;Lo;0;L;;;;;N;;;;; +18A95;TANGUT COMPONENT-662;Lo;0;L;;;;;N;;;;; +18A96;TANGUT COMPONENT-663;Lo;0;L;;;;;N;;;;; +18A97;TANGUT COMPONENT-664;Lo;0;L;;;;;N;;;;; +18A98;TANGUT COMPONENT-665;Lo;0;L;;;;;N;;;;; +18A99;TANGUT COMPONENT-666;Lo;0;L;;;;;N;;;;; +18A9A;TANGUT COMPONENT-667;Lo;0;L;;;;;N;;;;; +18A9B;TANGUT COMPONENT-668;Lo;0;L;;;;;N;;;;; +18A9C;TANGUT COMPONENT-669;Lo;0;L;;;;;N;;;;; +18A9D;TANGUT COMPONENT-670;Lo;0;L;;;;;N;;;;; +18A9E;TANGUT COMPONENT-671;Lo;0;L;;;;;N;;;;; +18A9F;TANGUT COMPONENT-672;Lo;0;L;;;;;N;;;;; +18AA0;TANGUT COMPONENT-673;Lo;0;L;;;;;N;;;;; +18AA1;TANGUT COMPONENT-674;Lo;0;L;;;;;N;;;;; +18AA2;TANGUT COMPONENT-675;Lo;0;L;;;;;N;;;;; +18AA3;TANGUT COMPONENT-676;Lo;0;L;;;;;N;;;;; +18AA4;TANGUT COMPONENT-677;Lo;0;L;;;;;N;;;;; +18AA5;TANGUT COMPONENT-678;Lo;0;L;;;;;N;;;;; +18AA6;TANGUT COMPONENT-679;Lo;0;L;;;;;N;;;;; +18AA7;TANGUT COMPONENT-680;Lo;0;L;;;;;N;;;;; +18AA8;TANGUT COMPONENT-681;Lo;0;L;;;;;N;;;;; +18AA9;TANGUT COMPONENT-682;Lo;0;L;;;;;N;;;;; +18AAA;TANGUT COMPONENT-683;Lo;0;L;;;;;N;;;;; +18AAB;TANGUT COMPONENT-684;Lo;0;L;;;;;N;;;;; +18AAC;TANGUT COMPONENT-685;Lo;0;L;;;;;N;;;;; +18AAD;TANGUT COMPONENT-686;Lo;0;L;;;;;N;;;;; +18AAE;TANGUT COMPONENT-687;Lo;0;L;;;;;N;;;;; +18AAF;TANGUT COMPONENT-688;Lo;0;L;;;;;N;;;;; +18AB0;TANGUT COMPONENT-689;Lo;0;L;;;;;N;;;;; +18AB1;TANGUT COMPONENT-690;Lo;0;L;;;;;N;;;;; +18AB2;TANGUT COMPONENT-691;Lo;0;L;;;;;N;;;;; +18AB3;TANGUT COMPONENT-692;Lo;0;L;;;;;N;;;;; +18AB4;TANGUT COMPONENT-693;Lo;0;L;;;;;N;;;;; +18AB5;TANGUT COMPONENT-694;Lo;0;L;;;;;N;;;;; +18AB6;TANGUT COMPONENT-695;Lo;0;L;;;;;N;;;;; +18AB7;TANGUT COMPONENT-696;Lo;0;L;;;;;N;;;;; +18AB8;TANGUT COMPONENT-697;Lo;0;L;;;;;N;;;;; +18AB9;TANGUT COMPONENT-698;Lo;0;L;;;;;N;;;;; +18ABA;TANGUT COMPONENT-699;Lo;0;L;;;;;N;;;;; +18ABB;TANGUT COMPONENT-700;Lo;0;L;;;;;N;;;;; +18ABC;TANGUT COMPONENT-701;Lo;0;L;;;;;N;;;;; +18ABD;TANGUT COMPONENT-702;Lo;0;L;;;;;N;;;;; +18ABE;TANGUT COMPONENT-703;Lo;0;L;;;;;N;;;;; +18ABF;TANGUT COMPONENT-704;Lo;0;L;;;;;N;;;;; +18AC0;TANGUT COMPONENT-705;Lo;0;L;;;;;N;;;;; +18AC1;TANGUT COMPONENT-706;Lo;0;L;;;;;N;;;;; +18AC2;TANGUT COMPONENT-707;Lo;0;L;;;;;N;;;;; +18AC3;TANGUT COMPONENT-708;Lo;0;L;;;;;N;;;;; +18AC4;TANGUT COMPONENT-709;Lo;0;L;;;;;N;;;;; +18AC5;TANGUT COMPONENT-710;Lo;0;L;;;;;N;;;;; +18AC6;TANGUT COMPONENT-711;Lo;0;L;;;;;N;;;;; +18AC7;TANGUT COMPONENT-712;Lo;0;L;;;;;N;;;;; +18AC8;TANGUT COMPONENT-713;Lo;0;L;;;;;N;;;;; +18AC9;TANGUT COMPONENT-714;Lo;0;L;;;;;N;;;;; +18ACA;TANGUT COMPONENT-715;Lo;0;L;;;;;N;;;;; +18ACB;TANGUT COMPONENT-716;Lo;0;L;;;;;N;;;;; +18ACC;TANGUT COMPONENT-717;Lo;0;L;;;;;N;;;;; +18ACD;TANGUT COMPONENT-718;Lo;0;L;;;;;N;;;;; +18ACE;TANGUT COMPONENT-719;Lo;0;L;;;;;N;;;;; +18ACF;TANGUT COMPONENT-720;Lo;0;L;;;;;N;;;;; +18AD0;TANGUT COMPONENT-721;Lo;0;L;;;;;N;;;;; +18AD1;TANGUT COMPONENT-722;Lo;0;L;;;;;N;;;;; +18AD2;TANGUT COMPONENT-723;Lo;0;L;;;;;N;;;;; +18AD3;TANGUT COMPONENT-724;Lo;0;L;;;;;N;;;;; +18AD4;TANGUT COMPONENT-725;Lo;0;L;;;;;N;;;;; +18AD5;TANGUT COMPONENT-726;Lo;0;L;;;;;N;;;;; +18AD6;TANGUT COMPONENT-727;Lo;0;L;;;;;N;;;;; +18AD7;TANGUT COMPONENT-728;Lo;0;L;;;;;N;;;;; +18AD8;TANGUT COMPONENT-729;Lo;0;L;;;;;N;;;;; +18AD9;TANGUT COMPONENT-730;Lo;0;L;;;;;N;;;;; +18ADA;TANGUT COMPONENT-731;Lo;0;L;;;;;N;;;;; +18ADB;TANGUT COMPONENT-732;Lo;0;L;;;;;N;;;;; +18ADC;TANGUT COMPONENT-733;Lo;0;L;;;;;N;;;;; +18ADD;TANGUT COMPONENT-734;Lo;0;L;;;;;N;;;;; +18ADE;TANGUT COMPONENT-735;Lo;0;L;;;;;N;;;;; +18ADF;TANGUT COMPONENT-736;Lo;0;L;;;;;N;;;;; +18AE0;TANGUT COMPONENT-737;Lo;0;L;;;;;N;;;;; +18AE1;TANGUT COMPONENT-738;Lo;0;L;;;;;N;;;;; +18AE2;TANGUT COMPONENT-739;Lo;0;L;;;;;N;;;;; +18AE3;TANGUT COMPONENT-740;Lo;0;L;;;;;N;;;;; +18AE4;TANGUT COMPONENT-741;Lo;0;L;;;;;N;;;;; +18AE5;TANGUT COMPONENT-742;Lo;0;L;;;;;N;;;;; +18AE6;TANGUT COMPONENT-743;Lo;0;L;;;;;N;;;;; +18AE7;TANGUT COMPONENT-744;Lo;0;L;;;;;N;;;;; +18AE8;TANGUT COMPONENT-745;Lo;0;L;;;;;N;;;;; +18AE9;TANGUT COMPONENT-746;Lo;0;L;;;;;N;;;;; +18AEA;TANGUT COMPONENT-747;Lo;0;L;;;;;N;;;;; +18AEB;TANGUT COMPONENT-748;Lo;0;L;;;;;N;;;;; +18AEC;TANGUT COMPONENT-749;Lo;0;L;;;;;N;;;;; +18AED;TANGUT COMPONENT-750;Lo;0;L;;;;;N;;;;; +18AEE;TANGUT COMPONENT-751;Lo;0;L;;;;;N;;;;; +18AEF;TANGUT COMPONENT-752;Lo;0;L;;;;;N;;;;; +18AF0;TANGUT COMPONENT-753;Lo;0;L;;;;;N;;;;; +18AF1;TANGUT COMPONENT-754;Lo;0;L;;;;;N;;;;; +18AF2;TANGUT COMPONENT-755;Lo;0;L;;;;;N;;;;; +18AF3;TANGUT COMPONENT-756;Lo;0;L;;;;;N;;;;; +18AF4;TANGUT COMPONENT-757;Lo;0;L;;;;;N;;;;; +18AF5;TANGUT COMPONENT-758;Lo;0;L;;;;;N;;;;; +18AF6;TANGUT COMPONENT-759;Lo;0;L;;;;;N;;;;; +18AF7;TANGUT COMPONENT-760;Lo;0;L;;;;;N;;;;; +18AF8;TANGUT COMPONENT-761;Lo;0;L;;;;;N;;;;; +18AF9;TANGUT COMPONENT-762;Lo;0;L;;;;;N;;;;; +18AFA;TANGUT COMPONENT-763;Lo;0;L;;;;;N;;;;; +18AFB;TANGUT COMPONENT-764;Lo;0;L;;;;;N;;;;; +18AFC;TANGUT COMPONENT-765;Lo;0;L;;;;;N;;;;; +18AFD;TANGUT COMPONENT-766;Lo;0;L;;;;;N;;;;; +18AFE;TANGUT COMPONENT-767;Lo;0;L;;;;;N;;;;; +18AFF;TANGUT COMPONENT-768;Lo;0;L;;;;;N;;;;; +18B00;KHITAN SMALL SCRIPT CHARACTER-18B00;Lo;0;L;;;;;N;;;;; +18B01;KHITAN SMALL SCRIPT CHARACTER-18B01;Lo;0;L;;;;;N;;;;; +18B02;KHITAN SMALL SCRIPT CHARACTER-18B02;Lo;0;L;;;;;N;;;;; +18B03;KHITAN SMALL SCRIPT CHARACTER-18B03;Lo;0;L;;;;;N;;;;; +18B04;KHITAN SMALL SCRIPT CHARACTER-18B04;Lo;0;L;;;;;N;;;;; +18B05;KHITAN SMALL SCRIPT CHARACTER-18B05;Lo;0;L;;;;;N;;;;; +18B06;KHITAN SMALL SCRIPT CHARACTER-18B06;Lo;0;L;;;;;N;;;;; +18B07;KHITAN SMALL SCRIPT CHARACTER-18B07;Lo;0;L;;;;;N;;;;; +18B08;KHITAN SMALL SCRIPT CHARACTER-18B08;Lo;0;L;;;;;N;;;;; +18B09;KHITAN SMALL SCRIPT CHARACTER-18B09;Lo;0;L;;;;;N;;;;; +18B0A;KHITAN SMALL SCRIPT CHARACTER-18B0A;Lo;0;L;;;;;N;;;;; +18B0B;KHITAN SMALL SCRIPT CHARACTER-18B0B;Lo;0;L;;;;;N;;;;; +18B0C;KHITAN SMALL SCRIPT CHARACTER-18B0C;Lo;0;L;;;;;N;;;;; +18B0D;KHITAN SMALL SCRIPT CHARACTER-18B0D;Lo;0;L;;;;;N;;;;; +18B0E;KHITAN SMALL SCRIPT CHARACTER-18B0E;Lo;0;L;;;;;N;;;;; +18B0F;KHITAN SMALL SCRIPT CHARACTER-18B0F;Lo;0;L;;;;;N;;;;; +18B10;KHITAN SMALL SCRIPT CHARACTER-18B10;Lo;0;L;;;;;N;;;;; +18B11;KHITAN SMALL SCRIPT CHARACTER-18B11;Lo;0;L;;;;;N;;;;; +18B12;KHITAN SMALL SCRIPT CHARACTER-18B12;Lo;0;L;;;;;N;;;;; +18B13;KHITAN SMALL SCRIPT CHARACTER-18B13;Lo;0;L;;;;;N;;;;; +18B14;KHITAN SMALL SCRIPT CHARACTER-18B14;Lo;0;L;;;;;N;;;;; +18B15;KHITAN SMALL SCRIPT CHARACTER-18B15;Lo;0;L;;;;;N;;;;; +18B16;KHITAN SMALL SCRIPT CHARACTER-18B16;Lo;0;L;;;;;N;;;;; +18B17;KHITAN SMALL SCRIPT CHARACTER-18B17;Lo;0;L;;;;;N;;;;; +18B18;KHITAN SMALL SCRIPT CHARACTER-18B18;Lo;0;L;;;;;N;;;;; +18B19;KHITAN SMALL SCRIPT CHARACTER-18B19;Lo;0;L;;;;;N;;;;; +18B1A;KHITAN SMALL SCRIPT CHARACTER-18B1A;Lo;0;L;;;;;N;;;;; +18B1B;KHITAN SMALL SCRIPT CHARACTER-18B1B;Lo;0;L;;;;;N;;;;; +18B1C;KHITAN SMALL SCRIPT CHARACTER-18B1C;Lo;0;L;;;;;N;;;;; +18B1D;KHITAN SMALL SCRIPT CHARACTER-18B1D;Lo;0;L;;;;;N;;;;; +18B1E;KHITAN SMALL SCRIPT CHARACTER-18B1E;Lo;0;L;;;;;N;;;;; +18B1F;KHITAN SMALL SCRIPT CHARACTER-18B1F;Lo;0;L;;;;;N;;;;; +18B20;KHITAN SMALL SCRIPT CHARACTER-18B20;Lo;0;L;;;;;N;;;;; +18B21;KHITAN SMALL SCRIPT CHARACTER-18B21;Lo;0;L;;;;;N;;;;; +18B22;KHITAN SMALL SCRIPT CHARACTER-18B22;Lo;0;L;;;;;N;;;;; +18B23;KHITAN SMALL SCRIPT CHARACTER-18B23;Lo;0;L;;;;;N;;;;; +18B24;KHITAN SMALL SCRIPT CHARACTER-18B24;Lo;0;L;;;;;N;;;;; +18B25;KHITAN SMALL SCRIPT CHARACTER-18B25;Lo;0;L;;;;;N;;;;; +18B26;KHITAN SMALL SCRIPT CHARACTER-18B26;Lo;0;L;;;;;N;;;;; +18B27;KHITAN SMALL SCRIPT CHARACTER-18B27;Lo;0;L;;;;;N;;;;; +18B28;KHITAN SMALL SCRIPT CHARACTER-18B28;Lo;0;L;;;;;N;;;;; +18B29;KHITAN SMALL SCRIPT CHARACTER-18B29;Lo;0;L;;;;;N;;;;; +18B2A;KHITAN SMALL SCRIPT CHARACTER-18B2A;Lo;0;L;;;;;N;;;;; +18B2B;KHITAN SMALL SCRIPT CHARACTER-18B2B;Lo;0;L;;;;;N;;;;; +18B2C;KHITAN SMALL SCRIPT CHARACTER-18B2C;Lo;0;L;;;;;N;;;;; +18B2D;KHITAN SMALL SCRIPT CHARACTER-18B2D;Lo;0;L;;;;;N;;;;; +18B2E;KHITAN SMALL SCRIPT CHARACTER-18B2E;Lo;0;L;;;;;N;;;;; +18B2F;KHITAN SMALL SCRIPT CHARACTER-18B2F;Lo;0;L;;;;;N;;;;; +18B30;KHITAN SMALL SCRIPT CHARACTER-18B30;Lo;0;L;;;;;N;;;;; +18B31;KHITAN SMALL SCRIPT CHARACTER-18B31;Lo;0;L;;;;;N;;;;; +18B32;KHITAN SMALL SCRIPT CHARACTER-18B32;Lo;0;L;;;;;N;;;;; +18B33;KHITAN SMALL SCRIPT CHARACTER-18B33;Lo;0;L;;;;;N;;;;; +18B34;KHITAN SMALL SCRIPT CHARACTER-18B34;Lo;0;L;;;;;N;;;;; +18B35;KHITAN SMALL SCRIPT CHARACTER-18B35;Lo;0;L;;;;;N;;;;; +18B36;KHITAN SMALL SCRIPT CHARACTER-18B36;Lo;0;L;;;;;N;;;;; +18B37;KHITAN SMALL SCRIPT CHARACTER-18B37;Lo;0;L;;;;;N;;;;; +18B38;KHITAN SMALL SCRIPT CHARACTER-18B38;Lo;0;L;;;;;N;;;;; +18B39;KHITAN SMALL SCRIPT CHARACTER-18B39;Lo;0;L;;;;;N;;;;; +18B3A;KHITAN SMALL SCRIPT CHARACTER-18B3A;Lo;0;L;;;;;N;;;;; +18B3B;KHITAN SMALL SCRIPT CHARACTER-18B3B;Lo;0;L;;;;;N;;;;; +18B3C;KHITAN SMALL SCRIPT CHARACTER-18B3C;Lo;0;L;;;;;N;;;;; +18B3D;KHITAN SMALL SCRIPT CHARACTER-18B3D;Lo;0;L;;;;;N;;;;; +18B3E;KHITAN SMALL SCRIPT CHARACTER-18B3E;Lo;0;L;;;;;N;;;;; +18B3F;KHITAN SMALL SCRIPT CHARACTER-18B3F;Lo;0;L;;;;;N;;;;; +18B40;KHITAN SMALL SCRIPT CHARACTER-18B40;Lo;0;L;;;;;N;;;;; +18B41;KHITAN SMALL SCRIPT CHARACTER-18B41;Lo;0;L;;;;;N;;;;; +18B42;KHITAN SMALL SCRIPT CHARACTER-18B42;Lo;0;L;;;;;N;;;;; +18B43;KHITAN SMALL SCRIPT CHARACTER-18B43;Lo;0;L;;;;;N;;;;; +18B44;KHITAN SMALL SCRIPT CHARACTER-18B44;Lo;0;L;;;;;N;;;;; +18B45;KHITAN SMALL SCRIPT CHARACTER-18B45;Lo;0;L;;;;;N;;;;; +18B46;KHITAN SMALL SCRIPT CHARACTER-18B46;Lo;0;L;;;;;N;;;;; +18B47;KHITAN SMALL SCRIPT CHARACTER-18B47;Lo;0;L;;;;;N;;;;; +18B48;KHITAN SMALL SCRIPT CHARACTER-18B48;Lo;0;L;;;;;N;;;;; +18B49;KHITAN SMALL SCRIPT CHARACTER-18B49;Lo;0;L;;;;;N;;;;; +18B4A;KHITAN SMALL SCRIPT CHARACTER-18B4A;Lo;0;L;;;;;N;;;;; +18B4B;KHITAN SMALL SCRIPT CHARACTER-18B4B;Lo;0;L;;;;;N;;;;; +18B4C;KHITAN SMALL SCRIPT CHARACTER-18B4C;Lo;0;L;;;;;N;;;;; +18B4D;KHITAN SMALL SCRIPT CHARACTER-18B4D;Lo;0;L;;;;;N;;;;; +18B4E;KHITAN SMALL SCRIPT CHARACTER-18B4E;Lo;0;L;;;;;N;;;;; +18B4F;KHITAN SMALL SCRIPT CHARACTER-18B4F;Lo;0;L;;;;;N;;;;; +18B50;KHITAN SMALL SCRIPT CHARACTER-18B50;Lo;0;L;;;;;N;;;;; +18B51;KHITAN SMALL SCRIPT CHARACTER-18B51;Lo;0;L;;;;;N;;;;; +18B52;KHITAN SMALL SCRIPT CHARACTER-18B52;Lo;0;L;;;;;N;;;;; +18B53;KHITAN SMALL SCRIPT CHARACTER-18B53;Lo;0;L;;;;;N;;;;; +18B54;KHITAN SMALL SCRIPT CHARACTER-18B54;Lo;0;L;;;;;N;;;;; +18B55;KHITAN SMALL SCRIPT CHARACTER-18B55;Lo;0;L;;;;;N;;;;; +18B56;KHITAN SMALL SCRIPT CHARACTER-18B56;Lo;0;L;;;;;N;;;;; +18B57;KHITAN SMALL SCRIPT CHARACTER-18B57;Lo;0;L;;;;;N;;;;; +18B58;KHITAN SMALL SCRIPT CHARACTER-18B58;Lo;0;L;;;;;N;;;;; +18B59;KHITAN SMALL SCRIPT CHARACTER-18B59;Lo;0;L;;;;;N;;;;; +18B5A;KHITAN SMALL SCRIPT CHARACTER-18B5A;Lo;0;L;;;;;N;;;;; +18B5B;KHITAN SMALL SCRIPT CHARACTER-18B5B;Lo;0;L;;;;;N;;;;; +18B5C;KHITAN SMALL SCRIPT CHARACTER-18B5C;Lo;0;L;;;;;N;;;;; +18B5D;KHITAN SMALL SCRIPT CHARACTER-18B5D;Lo;0;L;;;;;N;;;;; +18B5E;KHITAN SMALL SCRIPT CHARACTER-18B5E;Lo;0;L;;;;;N;;;;; +18B5F;KHITAN SMALL SCRIPT CHARACTER-18B5F;Lo;0;L;;;;;N;;;;; +18B60;KHITAN SMALL SCRIPT CHARACTER-18B60;Lo;0;L;;;;;N;;;;; +18B61;KHITAN SMALL SCRIPT CHARACTER-18B61;Lo;0;L;;;;;N;;;;; +18B62;KHITAN SMALL SCRIPT CHARACTER-18B62;Lo;0;L;;;;;N;;;;; +18B63;KHITAN SMALL SCRIPT CHARACTER-18B63;Lo;0;L;;;;;N;;;;; +18B64;KHITAN SMALL SCRIPT CHARACTER-18B64;Lo;0;L;;;;;N;;;;; +18B65;KHITAN SMALL SCRIPT CHARACTER-18B65;Lo;0;L;;;;;N;;;;; +18B66;KHITAN SMALL SCRIPT CHARACTER-18B66;Lo;0;L;;;;;N;;;;; +18B67;KHITAN SMALL SCRIPT CHARACTER-18B67;Lo;0;L;;;;;N;;;;; +18B68;KHITAN SMALL SCRIPT CHARACTER-18B68;Lo;0;L;;;;;N;;;;; +18B69;KHITAN SMALL SCRIPT CHARACTER-18B69;Lo;0;L;;;;;N;;;;; +18B6A;KHITAN SMALL SCRIPT CHARACTER-18B6A;Lo;0;L;;;;;N;;;;; +18B6B;KHITAN SMALL SCRIPT CHARACTER-18B6B;Lo;0;L;;;;;N;;;;; +18B6C;KHITAN SMALL SCRIPT CHARACTER-18B6C;Lo;0;L;;;;;N;;;;; +18B6D;KHITAN SMALL SCRIPT CHARACTER-18B6D;Lo;0;L;;;;;N;;;;; +18B6E;KHITAN SMALL SCRIPT CHARACTER-18B6E;Lo;0;L;;;;;N;;;;; +18B6F;KHITAN SMALL SCRIPT CHARACTER-18B6F;Lo;0;L;;;;;N;;;;; +18B70;KHITAN SMALL SCRIPT CHARACTER-18B70;Lo;0;L;;;;;N;;;;; +18B71;KHITAN SMALL SCRIPT CHARACTER-18B71;Lo;0;L;;;;;N;;;;; +18B72;KHITAN SMALL SCRIPT CHARACTER-18B72;Lo;0;L;;;;;N;;;;; +18B73;KHITAN SMALL SCRIPT CHARACTER-18B73;Lo;0;L;;;;;N;;;;; +18B74;KHITAN SMALL SCRIPT CHARACTER-18B74;Lo;0;L;;;;;N;;;;; +18B75;KHITAN SMALL SCRIPT CHARACTER-18B75;Lo;0;L;;;;;N;;;;; +18B76;KHITAN SMALL SCRIPT CHARACTER-18B76;Lo;0;L;;;;;N;;;;; +18B77;KHITAN SMALL SCRIPT CHARACTER-18B77;Lo;0;L;;;;;N;;;;; +18B78;KHITAN SMALL SCRIPT CHARACTER-18B78;Lo;0;L;;;;;N;;;;; +18B79;KHITAN SMALL SCRIPT CHARACTER-18B79;Lo;0;L;;;;;N;;;;; +18B7A;KHITAN SMALL SCRIPT CHARACTER-18B7A;Lo;0;L;;;;;N;;;;; +18B7B;KHITAN SMALL SCRIPT CHARACTER-18B7B;Lo;0;L;;;;;N;;;;; +18B7C;KHITAN SMALL SCRIPT CHARACTER-18B7C;Lo;0;L;;;;;N;;;;; +18B7D;KHITAN SMALL SCRIPT CHARACTER-18B7D;Lo;0;L;;;;;N;;;;; +18B7E;KHITAN SMALL SCRIPT CHARACTER-18B7E;Lo;0;L;;;;;N;;;;; +18B7F;KHITAN SMALL SCRIPT CHARACTER-18B7F;Lo;0;L;;;;;N;;;;; +18B80;KHITAN SMALL SCRIPT CHARACTER-18B80;Lo;0;L;;;;;N;;;;; +18B81;KHITAN SMALL SCRIPT CHARACTER-18B81;Lo;0;L;;;;;N;;;;; +18B82;KHITAN SMALL SCRIPT CHARACTER-18B82;Lo;0;L;;;;;N;;;;; +18B83;KHITAN SMALL SCRIPT CHARACTER-18B83;Lo;0;L;;;;;N;;;;; +18B84;KHITAN SMALL SCRIPT CHARACTER-18B84;Lo;0;L;;;;;N;;;;; +18B85;KHITAN SMALL SCRIPT CHARACTER-18B85;Lo;0;L;;;;;N;;;;; +18B86;KHITAN SMALL SCRIPT CHARACTER-18B86;Lo;0;L;;;;;N;;;;; +18B87;KHITAN SMALL SCRIPT CHARACTER-18B87;Lo;0;L;;;;;N;;;;; +18B88;KHITAN SMALL SCRIPT CHARACTER-18B88;Lo;0;L;;;;;N;;;;; +18B89;KHITAN SMALL SCRIPT CHARACTER-18B89;Lo;0;L;;;;;N;;;;; +18B8A;KHITAN SMALL SCRIPT CHARACTER-18B8A;Lo;0;L;;;;;N;;;;; +18B8B;KHITAN SMALL SCRIPT CHARACTER-18B8B;Lo;0;L;;;;;N;;;;; +18B8C;KHITAN SMALL SCRIPT CHARACTER-18B8C;Lo;0;L;;;;;N;;;;; +18B8D;KHITAN SMALL SCRIPT CHARACTER-18B8D;Lo;0;L;;;;;N;;;;; +18B8E;KHITAN SMALL SCRIPT CHARACTER-18B8E;Lo;0;L;;;;;N;;;;; +18B8F;KHITAN SMALL SCRIPT CHARACTER-18B8F;Lo;0;L;;;;;N;;;;; +18B90;KHITAN SMALL SCRIPT CHARACTER-18B90;Lo;0;L;;;;;N;;;;; +18B91;KHITAN SMALL SCRIPT CHARACTER-18B91;Lo;0;L;;;;;N;;;;; +18B92;KHITAN SMALL SCRIPT CHARACTER-18B92;Lo;0;L;;;;;N;;;;; +18B93;KHITAN SMALL SCRIPT CHARACTER-18B93;Lo;0;L;;;;;N;;;;; +18B94;KHITAN SMALL SCRIPT CHARACTER-18B94;Lo;0;L;;;;;N;;;;; +18B95;KHITAN SMALL SCRIPT CHARACTER-18B95;Lo;0;L;;;;;N;;;;; +18B96;KHITAN SMALL SCRIPT CHARACTER-18B96;Lo;0;L;;;;;N;;;;; +18B97;KHITAN SMALL SCRIPT CHARACTER-18B97;Lo;0;L;;;;;N;;;;; +18B98;KHITAN SMALL SCRIPT CHARACTER-18B98;Lo;0;L;;;;;N;;;;; +18B99;KHITAN SMALL SCRIPT CHARACTER-18B99;Lo;0;L;;;;;N;;;;; +18B9A;KHITAN SMALL SCRIPT CHARACTER-18B9A;Lo;0;L;;;;;N;;;;; +18B9B;KHITAN SMALL SCRIPT CHARACTER-18B9B;Lo;0;L;;;;;N;;;;; +18B9C;KHITAN SMALL SCRIPT CHARACTER-18B9C;Lo;0;L;;;;;N;;;;; +18B9D;KHITAN SMALL SCRIPT CHARACTER-18B9D;Lo;0;L;;;;;N;;;;; +18B9E;KHITAN SMALL SCRIPT CHARACTER-18B9E;Lo;0;L;;;;;N;;;;; +18B9F;KHITAN SMALL SCRIPT CHARACTER-18B9F;Lo;0;L;;;;;N;;;;; +18BA0;KHITAN SMALL SCRIPT CHARACTER-18BA0;Lo;0;L;;;;;N;;;;; +18BA1;KHITAN SMALL SCRIPT CHARACTER-18BA1;Lo;0;L;;;;;N;;;;; +18BA2;KHITAN SMALL SCRIPT CHARACTER-18BA2;Lo;0;L;;;;;N;;;;; +18BA3;KHITAN SMALL SCRIPT CHARACTER-18BA3;Lo;0;L;;;;;N;;;;; +18BA4;KHITAN SMALL SCRIPT CHARACTER-18BA4;Lo;0;L;;;;;N;;;;; +18BA5;KHITAN SMALL SCRIPT CHARACTER-18BA5;Lo;0;L;;;;;N;;;;; +18BA6;KHITAN SMALL SCRIPT CHARACTER-18BA6;Lo;0;L;;;;;N;;;;; +18BA7;KHITAN SMALL SCRIPT CHARACTER-18BA7;Lo;0;L;;;;;N;;;;; +18BA8;KHITAN SMALL SCRIPT CHARACTER-18BA8;Lo;0;L;;;;;N;;;;; +18BA9;KHITAN SMALL SCRIPT CHARACTER-18BA9;Lo;0;L;;;;;N;;;;; +18BAA;KHITAN SMALL SCRIPT CHARACTER-18BAA;Lo;0;L;;;;;N;;;;; +18BAB;KHITAN SMALL SCRIPT CHARACTER-18BAB;Lo;0;L;;;;;N;;;;; +18BAC;KHITAN SMALL SCRIPT CHARACTER-18BAC;Lo;0;L;;;;;N;;;;; +18BAD;KHITAN SMALL SCRIPT CHARACTER-18BAD;Lo;0;L;;;;;N;;;;; +18BAE;KHITAN SMALL SCRIPT CHARACTER-18BAE;Lo;0;L;;;;;N;;;;; +18BAF;KHITAN SMALL SCRIPT CHARACTER-18BAF;Lo;0;L;;;;;N;;;;; +18BB0;KHITAN SMALL SCRIPT CHARACTER-18BB0;Lo;0;L;;;;;N;;;;; +18BB1;KHITAN SMALL SCRIPT CHARACTER-18BB1;Lo;0;L;;;;;N;;;;; +18BB2;KHITAN SMALL SCRIPT CHARACTER-18BB2;Lo;0;L;;;;;N;;;;; +18BB3;KHITAN SMALL SCRIPT CHARACTER-18BB3;Lo;0;L;;;;;N;;;;; +18BB4;KHITAN SMALL SCRIPT CHARACTER-18BB4;Lo;0;L;;;;;N;;;;; +18BB5;KHITAN SMALL SCRIPT CHARACTER-18BB5;Lo;0;L;;;;;N;;;;; +18BB6;KHITAN SMALL SCRIPT CHARACTER-18BB6;Lo;0;L;;;;;N;;;;; +18BB7;KHITAN SMALL SCRIPT CHARACTER-18BB7;Lo;0;L;;;;;N;;;;; +18BB8;KHITAN SMALL SCRIPT CHARACTER-18BB8;Lo;0;L;;;;;N;;;;; +18BB9;KHITAN SMALL SCRIPT CHARACTER-18BB9;Lo;0;L;;;;;N;;;;; +18BBA;KHITAN SMALL SCRIPT CHARACTER-18BBA;Lo;0;L;;;;;N;;;;; +18BBB;KHITAN SMALL SCRIPT CHARACTER-18BBB;Lo;0;L;;;;;N;;;;; +18BBC;KHITAN SMALL SCRIPT CHARACTER-18BBC;Lo;0;L;;;;;N;;;;; +18BBD;KHITAN SMALL SCRIPT CHARACTER-18BBD;Lo;0;L;;;;;N;;;;; +18BBE;KHITAN SMALL SCRIPT CHARACTER-18BBE;Lo;0;L;;;;;N;;;;; +18BBF;KHITAN SMALL SCRIPT CHARACTER-18BBF;Lo;0;L;;;;;N;;;;; +18BC0;KHITAN SMALL SCRIPT CHARACTER-18BC0;Lo;0;L;;;;;N;;;;; +18BC1;KHITAN SMALL SCRIPT CHARACTER-18BC1;Lo;0;L;;;;;N;;;;; +18BC2;KHITAN SMALL SCRIPT CHARACTER-18BC2;Lo;0;L;;;;;N;;;;; +18BC3;KHITAN SMALL SCRIPT CHARACTER-18BC3;Lo;0;L;;;;;N;;;;; +18BC4;KHITAN SMALL SCRIPT CHARACTER-18BC4;Lo;0;L;;;;;N;;;;; +18BC5;KHITAN SMALL SCRIPT CHARACTER-18BC5;Lo;0;L;;;;;N;;;;; +18BC6;KHITAN SMALL SCRIPT CHARACTER-18BC6;Lo;0;L;;;;;N;;;;; +18BC7;KHITAN SMALL SCRIPT CHARACTER-18BC7;Lo;0;L;;;;;N;;;;; +18BC8;KHITAN SMALL SCRIPT CHARACTER-18BC8;Lo;0;L;;;;;N;;;;; +18BC9;KHITAN SMALL SCRIPT CHARACTER-18BC9;Lo;0;L;;;;;N;;;;; +18BCA;KHITAN SMALL SCRIPT CHARACTER-18BCA;Lo;0;L;;;;;N;;;;; +18BCB;KHITAN SMALL SCRIPT CHARACTER-18BCB;Lo;0;L;;;;;N;;;;; +18BCC;KHITAN SMALL SCRIPT CHARACTER-18BCC;Lo;0;L;;;;;N;;;;; +18BCD;KHITAN SMALL SCRIPT CHARACTER-18BCD;Lo;0;L;;;;;N;;;;; +18BCE;KHITAN SMALL SCRIPT CHARACTER-18BCE;Lo;0;L;;;;;N;;;;; +18BCF;KHITAN SMALL SCRIPT CHARACTER-18BCF;Lo;0;L;;;;;N;;;;; +18BD0;KHITAN SMALL SCRIPT CHARACTER-18BD0;Lo;0;L;;;;;N;;;;; +18BD1;KHITAN SMALL SCRIPT CHARACTER-18BD1;Lo;0;L;;;;;N;;;;; +18BD2;KHITAN SMALL SCRIPT CHARACTER-18BD2;Lo;0;L;;;;;N;;;;; +18BD3;KHITAN SMALL SCRIPT CHARACTER-18BD3;Lo;0;L;;;;;N;;;;; +18BD4;KHITAN SMALL SCRIPT CHARACTER-18BD4;Lo;0;L;;;;;N;;;;; +18BD5;KHITAN SMALL SCRIPT CHARACTER-18BD5;Lo;0;L;;;;;N;;;;; +18BD6;KHITAN SMALL SCRIPT CHARACTER-18BD6;Lo;0;L;;;;;N;;;;; +18BD7;KHITAN SMALL SCRIPT CHARACTER-18BD7;Lo;0;L;;;;;N;;;;; +18BD8;KHITAN SMALL SCRIPT CHARACTER-18BD8;Lo;0;L;;;;;N;;;;; +18BD9;KHITAN SMALL SCRIPT CHARACTER-18BD9;Lo;0;L;;;;;N;;;;; +18BDA;KHITAN SMALL SCRIPT CHARACTER-18BDA;Lo;0;L;;;;;N;;;;; +18BDB;KHITAN SMALL SCRIPT CHARACTER-18BDB;Lo;0;L;;;;;N;;;;; +18BDC;KHITAN SMALL SCRIPT CHARACTER-18BDC;Lo;0;L;;;;;N;;;;; +18BDD;KHITAN SMALL SCRIPT CHARACTER-18BDD;Lo;0;L;;;;;N;;;;; +18BDE;KHITAN SMALL SCRIPT CHARACTER-18BDE;Lo;0;L;;;;;N;;;;; +18BDF;KHITAN SMALL SCRIPT CHARACTER-18BDF;Lo;0;L;;;;;N;;;;; +18BE0;KHITAN SMALL SCRIPT CHARACTER-18BE0;Lo;0;L;;;;;N;;;;; +18BE1;KHITAN SMALL SCRIPT CHARACTER-18BE1;Lo;0;L;;;;;N;;;;; +18BE2;KHITAN SMALL SCRIPT CHARACTER-18BE2;Lo;0;L;;;;;N;;;;; +18BE3;KHITAN SMALL SCRIPT CHARACTER-18BE3;Lo;0;L;;;;;N;;;;; +18BE4;KHITAN SMALL SCRIPT CHARACTER-18BE4;Lo;0;L;;;;;N;;;;; +18BE5;KHITAN SMALL SCRIPT CHARACTER-18BE5;Lo;0;L;;;;;N;;;;; +18BE6;KHITAN SMALL SCRIPT CHARACTER-18BE6;Lo;0;L;;;;;N;;;;; +18BE7;KHITAN SMALL SCRIPT CHARACTER-18BE7;Lo;0;L;;;;;N;;;;; +18BE8;KHITAN SMALL SCRIPT CHARACTER-18BE8;Lo;0;L;;;;;N;;;;; +18BE9;KHITAN SMALL SCRIPT CHARACTER-18BE9;Lo;0;L;;;;;N;;;;; +18BEA;KHITAN SMALL SCRIPT CHARACTER-18BEA;Lo;0;L;;;;;N;;;;; +18BEB;KHITAN SMALL SCRIPT CHARACTER-18BEB;Lo;0;L;;;;;N;;;;; +18BEC;KHITAN SMALL SCRIPT CHARACTER-18BEC;Lo;0;L;;;;;N;;;;; +18BED;KHITAN SMALL SCRIPT CHARACTER-18BED;Lo;0;L;;;;;N;;;;; +18BEE;KHITAN SMALL SCRIPT CHARACTER-18BEE;Lo;0;L;;;;;N;;;;; +18BEF;KHITAN SMALL SCRIPT CHARACTER-18BEF;Lo;0;L;;;;;N;;;;; +18BF0;KHITAN SMALL SCRIPT CHARACTER-18BF0;Lo;0;L;;;;;N;;;;; +18BF1;KHITAN SMALL SCRIPT CHARACTER-18BF1;Lo;0;L;;;;;N;;;;; +18BF2;KHITAN SMALL SCRIPT CHARACTER-18BF2;Lo;0;L;;;;;N;;;;; +18BF3;KHITAN SMALL SCRIPT CHARACTER-18BF3;Lo;0;L;;;;;N;;;;; +18BF4;KHITAN SMALL SCRIPT CHARACTER-18BF4;Lo;0;L;;;;;N;;;;; +18BF5;KHITAN SMALL SCRIPT CHARACTER-18BF5;Lo;0;L;;;;;N;;;;; +18BF6;KHITAN SMALL SCRIPT CHARACTER-18BF6;Lo;0;L;;;;;N;;;;; +18BF7;KHITAN SMALL SCRIPT CHARACTER-18BF7;Lo;0;L;;;;;N;;;;; +18BF8;KHITAN SMALL SCRIPT CHARACTER-18BF8;Lo;0;L;;;;;N;;;;; +18BF9;KHITAN SMALL SCRIPT CHARACTER-18BF9;Lo;0;L;;;;;N;;;;; +18BFA;KHITAN SMALL SCRIPT CHARACTER-18BFA;Lo;0;L;;;;;N;;;;; +18BFB;KHITAN SMALL SCRIPT CHARACTER-18BFB;Lo;0;L;;;;;N;;;;; +18BFC;KHITAN SMALL SCRIPT CHARACTER-18BFC;Lo;0;L;;;;;N;;;;; +18BFD;KHITAN SMALL SCRIPT CHARACTER-18BFD;Lo;0;L;;;;;N;;;;; +18BFE;KHITAN SMALL SCRIPT CHARACTER-18BFE;Lo;0;L;;;;;N;;;;; +18BFF;KHITAN SMALL SCRIPT CHARACTER-18BFF;Lo;0;L;;;;;N;;;;; +18C00;KHITAN SMALL SCRIPT CHARACTER-18C00;Lo;0;L;;;;;N;;;;; +18C01;KHITAN SMALL SCRIPT CHARACTER-18C01;Lo;0;L;;;;;N;;;;; +18C02;KHITAN SMALL SCRIPT CHARACTER-18C02;Lo;0;L;;;;;N;;;;; +18C03;KHITAN SMALL SCRIPT CHARACTER-18C03;Lo;0;L;;;;;N;;;;; +18C04;KHITAN SMALL SCRIPT CHARACTER-18C04;Lo;0;L;;;;;N;;;;; +18C05;KHITAN SMALL SCRIPT CHARACTER-18C05;Lo;0;L;;;;;N;;;;; +18C06;KHITAN SMALL SCRIPT CHARACTER-18C06;Lo;0;L;;;;;N;;;;; +18C07;KHITAN SMALL SCRIPT CHARACTER-18C07;Lo;0;L;;;;;N;;;;; +18C08;KHITAN SMALL SCRIPT CHARACTER-18C08;Lo;0;L;;;;;N;;;;; +18C09;KHITAN SMALL SCRIPT CHARACTER-18C09;Lo;0;L;;;;;N;;;;; +18C0A;KHITAN SMALL SCRIPT CHARACTER-18C0A;Lo;0;L;;;;;N;;;;; +18C0B;KHITAN SMALL SCRIPT CHARACTER-18C0B;Lo;0;L;;;;;N;;;;; +18C0C;KHITAN SMALL SCRIPT CHARACTER-18C0C;Lo;0;L;;;;;N;;;;; +18C0D;KHITAN SMALL SCRIPT CHARACTER-18C0D;Lo;0;L;;;;;N;;;;; +18C0E;KHITAN SMALL SCRIPT CHARACTER-18C0E;Lo;0;L;;;;;N;;;;; +18C0F;KHITAN SMALL SCRIPT CHARACTER-18C0F;Lo;0;L;;;;;N;;;;; +18C10;KHITAN SMALL SCRIPT CHARACTER-18C10;Lo;0;L;;;;;N;;;;; +18C11;KHITAN SMALL SCRIPT CHARACTER-18C11;Lo;0;L;;;;;N;;;;; +18C12;KHITAN SMALL SCRIPT CHARACTER-18C12;Lo;0;L;;;;;N;;;;; +18C13;KHITAN SMALL SCRIPT CHARACTER-18C13;Lo;0;L;;;;;N;;;;; +18C14;KHITAN SMALL SCRIPT CHARACTER-18C14;Lo;0;L;;;;;N;;;;; +18C15;KHITAN SMALL SCRIPT CHARACTER-18C15;Lo;0;L;;;;;N;;;;; +18C16;KHITAN SMALL SCRIPT CHARACTER-18C16;Lo;0;L;;;;;N;;;;; +18C17;KHITAN SMALL SCRIPT CHARACTER-18C17;Lo;0;L;;;;;N;;;;; +18C18;KHITAN SMALL SCRIPT CHARACTER-18C18;Lo;0;L;;;;;N;;;;; +18C19;KHITAN SMALL SCRIPT CHARACTER-18C19;Lo;0;L;;;;;N;;;;; +18C1A;KHITAN SMALL SCRIPT CHARACTER-18C1A;Lo;0;L;;;;;N;;;;; +18C1B;KHITAN SMALL SCRIPT CHARACTER-18C1B;Lo;0;L;;;;;N;;;;; +18C1C;KHITAN SMALL SCRIPT CHARACTER-18C1C;Lo;0;L;;;;;N;;;;; +18C1D;KHITAN SMALL SCRIPT CHARACTER-18C1D;Lo;0;L;;;;;N;;;;; +18C1E;KHITAN SMALL SCRIPT CHARACTER-18C1E;Lo;0;L;;;;;N;;;;; +18C1F;KHITAN SMALL SCRIPT CHARACTER-18C1F;Lo;0;L;;;;;N;;;;; +18C20;KHITAN SMALL SCRIPT CHARACTER-18C20;Lo;0;L;;;;;N;;;;; +18C21;KHITAN SMALL SCRIPT CHARACTER-18C21;Lo;0;L;;;;;N;;;;; +18C22;KHITAN SMALL SCRIPT CHARACTER-18C22;Lo;0;L;;;;;N;;;;; +18C23;KHITAN SMALL SCRIPT CHARACTER-18C23;Lo;0;L;;;;;N;;;;; +18C24;KHITAN SMALL SCRIPT CHARACTER-18C24;Lo;0;L;;;;;N;;;;; +18C25;KHITAN SMALL SCRIPT CHARACTER-18C25;Lo;0;L;;;;;N;;;;; +18C26;KHITAN SMALL SCRIPT CHARACTER-18C26;Lo;0;L;;;;;N;;;;; +18C27;KHITAN SMALL SCRIPT CHARACTER-18C27;Lo;0;L;;;;;N;;;;; +18C28;KHITAN SMALL SCRIPT CHARACTER-18C28;Lo;0;L;;;;;N;;;;; +18C29;KHITAN SMALL SCRIPT CHARACTER-18C29;Lo;0;L;;;;;N;;;;; +18C2A;KHITAN SMALL SCRIPT CHARACTER-18C2A;Lo;0;L;;;;;N;;;;; +18C2B;KHITAN SMALL SCRIPT CHARACTER-18C2B;Lo;0;L;;;;;N;;;;; +18C2C;KHITAN SMALL SCRIPT CHARACTER-18C2C;Lo;0;L;;;;;N;;;;; +18C2D;KHITAN SMALL SCRIPT CHARACTER-18C2D;Lo;0;L;;;;;N;;;;; +18C2E;KHITAN SMALL SCRIPT CHARACTER-18C2E;Lo;0;L;;;;;N;;;;; +18C2F;KHITAN SMALL SCRIPT CHARACTER-18C2F;Lo;0;L;;;;;N;;;;; +18C30;KHITAN SMALL SCRIPT CHARACTER-18C30;Lo;0;L;;;;;N;;;;; +18C31;KHITAN SMALL SCRIPT CHARACTER-18C31;Lo;0;L;;;;;N;;;;; +18C32;KHITAN SMALL SCRIPT CHARACTER-18C32;Lo;0;L;;;;;N;;;;; +18C33;KHITAN SMALL SCRIPT CHARACTER-18C33;Lo;0;L;;;;;N;;;;; +18C34;KHITAN SMALL SCRIPT CHARACTER-18C34;Lo;0;L;;;;;N;;;;; +18C35;KHITAN SMALL SCRIPT CHARACTER-18C35;Lo;0;L;;;;;N;;;;; +18C36;KHITAN SMALL SCRIPT CHARACTER-18C36;Lo;0;L;;;;;N;;;;; +18C37;KHITAN SMALL SCRIPT CHARACTER-18C37;Lo;0;L;;;;;N;;;;; +18C38;KHITAN SMALL SCRIPT CHARACTER-18C38;Lo;0;L;;;;;N;;;;; +18C39;KHITAN SMALL SCRIPT CHARACTER-18C39;Lo;0;L;;;;;N;;;;; +18C3A;KHITAN SMALL SCRIPT CHARACTER-18C3A;Lo;0;L;;;;;N;;;;; +18C3B;KHITAN SMALL SCRIPT CHARACTER-18C3B;Lo;0;L;;;;;N;;;;; +18C3C;KHITAN SMALL SCRIPT CHARACTER-18C3C;Lo;0;L;;;;;N;;;;; +18C3D;KHITAN SMALL SCRIPT CHARACTER-18C3D;Lo;0;L;;;;;N;;;;; +18C3E;KHITAN SMALL SCRIPT CHARACTER-18C3E;Lo;0;L;;;;;N;;;;; +18C3F;KHITAN SMALL SCRIPT CHARACTER-18C3F;Lo;0;L;;;;;N;;;;; +18C40;KHITAN SMALL SCRIPT CHARACTER-18C40;Lo;0;L;;;;;N;;;;; +18C41;KHITAN SMALL SCRIPT CHARACTER-18C41;Lo;0;L;;;;;N;;;;; +18C42;KHITAN SMALL SCRIPT CHARACTER-18C42;Lo;0;L;;;;;N;;;;; +18C43;KHITAN SMALL SCRIPT CHARACTER-18C43;Lo;0;L;;;;;N;;;;; +18C44;KHITAN SMALL SCRIPT CHARACTER-18C44;Lo;0;L;;;;;N;;;;; +18C45;KHITAN SMALL SCRIPT CHARACTER-18C45;Lo;0;L;;;;;N;;;;; +18C46;KHITAN SMALL SCRIPT CHARACTER-18C46;Lo;0;L;;;;;N;;;;; +18C47;KHITAN SMALL SCRIPT CHARACTER-18C47;Lo;0;L;;;;;N;;;;; +18C48;KHITAN SMALL SCRIPT CHARACTER-18C48;Lo;0;L;;;;;N;;;;; +18C49;KHITAN SMALL SCRIPT CHARACTER-18C49;Lo;0;L;;;;;N;;;;; +18C4A;KHITAN SMALL SCRIPT CHARACTER-18C4A;Lo;0;L;;;;;N;;;;; +18C4B;KHITAN SMALL SCRIPT CHARACTER-18C4B;Lo;0;L;;;;;N;;;;; +18C4C;KHITAN SMALL SCRIPT CHARACTER-18C4C;Lo;0;L;;;;;N;;;;; +18C4D;KHITAN SMALL SCRIPT CHARACTER-18C4D;Lo;0;L;;;;;N;;;;; +18C4E;KHITAN SMALL SCRIPT CHARACTER-18C4E;Lo;0;L;;;;;N;;;;; +18C4F;KHITAN SMALL SCRIPT CHARACTER-18C4F;Lo;0;L;;;;;N;;;;; +18C50;KHITAN SMALL SCRIPT CHARACTER-18C50;Lo;0;L;;;;;N;;;;; +18C51;KHITAN SMALL SCRIPT CHARACTER-18C51;Lo;0;L;;;;;N;;;;; +18C52;KHITAN SMALL SCRIPT CHARACTER-18C52;Lo;0;L;;;;;N;;;;; +18C53;KHITAN SMALL SCRIPT CHARACTER-18C53;Lo;0;L;;;;;N;;;;; +18C54;KHITAN SMALL SCRIPT CHARACTER-18C54;Lo;0;L;;;;;N;;;;; +18C55;KHITAN SMALL SCRIPT CHARACTER-18C55;Lo;0;L;;;;;N;;;;; +18C56;KHITAN SMALL SCRIPT CHARACTER-18C56;Lo;0;L;;;;;N;;;;; +18C57;KHITAN SMALL SCRIPT CHARACTER-18C57;Lo;0;L;;;;;N;;;;; +18C58;KHITAN SMALL SCRIPT CHARACTER-18C58;Lo;0;L;;;;;N;;;;; +18C59;KHITAN SMALL SCRIPT CHARACTER-18C59;Lo;0;L;;;;;N;;;;; +18C5A;KHITAN SMALL SCRIPT CHARACTER-18C5A;Lo;0;L;;;;;N;;;;; +18C5B;KHITAN SMALL SCRIPT CHARACTER-18C5B;Lo;0;L;;;;;N;;;;; +18C5C;KHITAN SMALL SCRIPT CHARACTER-18C5C;Lo;0;L;;;;;N;;;;; +18C5D;KHITAN SMALL SCRIPT CHARACTER-18C5D;Lo;0;L;;;;;N;;;;; +18C5E;KHITAN SMALL SCRIPT CHARACTER-18C5E;Lo;0;L;;;;;N;;;;; +18C5F;KHITAN SMALL SCRIPT CHARACTER-18C5F;Lo;0;L;;;;;N;;;;; +18C60;KHITAN SMALL SCRIPT CHARACTER-18C60;Lo;0;L;;;;;N;;;;; +18C61;KHITAN SMALL SCRIPT CHARACTER-18C61;Lo;0;L;;;;;N;;;;; +18C62;KHITAN SMALL SCRIPT CHARACTER-18C62;Lo;0;L;;;;;N;;;;; +18C63;KHITAN SMALL SCRIPT CHARACTER-18C63;Lo;0;L;;;;;N;;;;; +18C64;KHITAN SMALL SCRIPT CHARACTER-18C64;Lo;0;L;;;;;N;;;;; +18C65;KHITAN SMALL SCRIPT CHARACTER-18C65;Lo;0;L;;;;;N;;;;; +18C66;KHITAN SMALL SCRIPT CHARACTER-18C66;Lo;0;L;;;;;N;;;;; +18C67;KHITAN SMALL SCRIPT CHARACTER-18C67;Lo;0;L;;;;;N;;;;; +18C68;KHITAN SMALL SCRIPT CHARACTER-18C68;Lo;0;L;;;;;N;;;;; +18C69;KHITAN SMALL SCRIPT CHARACTER-18C69;Lo;0;L;;;;;N;;;;; +18C6A;KHITAN SMALL SCRIPT CHARACTER-18C6A;Lo;0;L;;;;;N;;;;; +18C6B;KHITAN SMALL SCRIPT CHARACTER-18C6B;Lo;0;L;;;;;N;;;;; +18C6C;KHITAN SMALL SCRIPT CHARACTER-18C6C;Lo;0;L;;;;;N;;;;; +18C6D;KHITAN SMALL SCRIPT CHARACTER-18C6D;Lo;0;L;;;;;N;;;;; +18C6E;KHITAN SMALL SCRIPT CHARACTER-18C6E;Lo;0;L;;;;;N;;;;; +18C6F;KHITAN SMALL SCRIPT CHARACTER-18C6F;Lo;0;L;;;;;N;;;;; +18C70;KHITAN SMALL SCRIPT CHARACTER-18C70;Lo;0;L;;;;;N;;;;; +18C71;KHITAN SMALL SCRIPT CHARACTER-18C71;Lo;0;L;;;;;N;;;;; +18C72;KHITAN SMALL SCRIPT CHARACTER-18C72;Lo;0;L;;;;;N;;;;; +18C73;KHITAN SMALL SCRIPT CHARACTER-18C73;Lo;0;L;;;;;N;;;;; +18C74;KHITAN SMALL SCRIPT CHARACTER-18C74;Lo;0;L;;;;;N;;;;; +18C75;KHITAN SMALL SCRIPT CHARACTER-18C75;Lo;0;L;;;;;N;;;;; +18C76;KHITAN SMALL SCRIPT CHARACTER-18C76;Lo;0;L;;;;;N;;;;; +18C77;KHITAN SMALL SCRIPT CHARACTER-18C77;Lo;0;L;;;;;N;;;;; +18C78;KHITAN SMALL SCRIPT CHARACTER-18C78;Lo;0;L;;;;;N;;;;; +18C79;KHITAN SMALL SCRIPT CHARACTER-18C79;Lo;0;L;;;;;N;;;;; +18C7A;KHITAN SMALL SCRIPT CHARACTER-18C7A;Lo;0;L;;;;;N;;;;; +18C7B;KHITAN SMALL SCRIPT CHARACTER-18C7B;Lo;0;L;;;;;N;;;;; +18C7C;KHITAN SMALL SCRIPT CHARACTER-18C7C;Lo;0;L;;;;;N;;;;; +18C7D;KHITAN SMALL SCRIPT CHARACTER-18C7D;Lo;0;L;;;;;N;;;;; +18C7E;KHITAN SMALL SCRIPT CHARACTER-18C7E;Lo;0;L;;;;;N;;;;; +18C7F;KHITAN SMALL SCRIPT CHARACTER-18C7F;Lo;0;L;;;;;N;;;;; +18C80;KHITAN SMALL SCRIPT CHARACTER-18C80;Lo;0;L;;;;;N;;;;; +18C81;KHITAN SMALL SCRIPT CHARACTER-18C81;Lo;0;L;;;;;N;;;;; +18C82;KHITAN SMALL SCRIPT CHARACTER-18C82;Lo;0;L;;;;;N;;;;; +18C83;KHITAN SMALL SCRIPT CHARACTER-18C83;Lo;0;L;;;;;N;;;;; +18C84;KHITAN SMALL SCRIPT CHARACTER-18C84;Lo;0;L;;;;;N;;;;; +18C85;KHITAN SMALL SCRIPT CHARACTER-18C85;Lo;0;L;;;;;N;;;;; +18C86;KHITAN SMALL SCRIPT CHARACTER-18C86;Lo;0;L;;;;;N;;;;; +18C87;KHITAN SMALL SCRIPT CHARACTER-18C87;Lo;0;L;;;;;N;;;;; +18C88;KHITAN SMALL SCRIPT CHARACTER-18C88;Lo;0;L;;;;;N;;;;; +18C89;KHITAN SMALL SCRIPT CHARACTER-18C89;Lo;0;L;;;;;N;;;;; +18C8A;KHITAN SMALL SCRIPT CHARACTER-18C8A;Lo;0;L;;;;;N;;;;; +18C8B;KHITAN SMALL SCRIPT CHARACTER-18C8B;Lo;0;L;;;;;N;;;;; +18C8C;KHITAN SMALL SCRIPT CHARACTER-18C8C;Lo;0;L;;;;;N;;;;; +18C8D;KHITAN SMALL SCRIPT CHARACTER-18C8D;Lo;0;L;;;;;N;;;;; +18C8E;KHITAN SMALL SCRIPT CHARACTER-18C8E;Lo;0;L;;;;;N;;;;; +18C8F;KHITAN SMALL SCRIPT CHARACTER-18C8F;Lo;0;L;;;;;N;;;;; +18C90;KHITAN SMALL SCRIPT CHARACTER-18C90;Lo;0;L;;;;;N;;;;; +18C91;KHITAN SMALL SCRIPT CHARACTER-18C91;Lo;0;L;;;;;N;;;;; +18C92;KHITAN SMALL SCRIPT CHARACTER-18C92;Lo;0;L;;;;;N;;;;; +18C93;KHITAN SMALL SCRIPT CHARACTER-18C93;Lo;0;L;;;;;N;;;;; +18C94;KHITAN SMALL SCRIPT CHARACTER-18C94;Lo;0;L;;;;;N;;;;; +18C95;KHITAN SMALL SCRIPT CHARACTER-18C95;Lo;0;L;;;;;N;;;;; +18C96;KHITAN SMALL SCRIPT CHARACTER-18C96;Lo;0;L;;;;;N;;;;; +18C97;KHITAN SMALL SCRIPT CHARACTER-18C97;Lo;0;L;;;;;N;;;;; +18C98;KHITAN SMALL SCRIPT CHARACTER-18C98;Lo;0;L;;;;;N;;;;; +18C99;KHITAN SMALL SCRIPT CHARACTER-18C99;Lo;0;L;;;;;N;;;;; +18C9A;KHITAN SMALL SCRIPT CHARACTER-18C9A;Lo;0;L;;;;;N;;;;; +18C9B;KHITAN SMALL SCRIPT CHARACTER-18C9B;Lo;0;L;;;;;N;;;;; +18C9C;KHITAN SMALL SCRIPT CHARACTER-18C9C;Lo;0;L;;;;;N;;;;; +18C9D;KHITAN SMALL SCRIPT CHARACTER-18C9D;Lo;0;L;;;;;N;;;;; +18C9E;KHITAN SMALL SCRIPT CHARACTER-18C9E;Lo;0;L;;;;;N;;;;; +18C9F;KHITAN SMALL SCRIPT CHARACTER-18C9F;Lo;0;L;;;;;N;;;;; +18CA0;KHITAN SMALL SCRIPT CHARACTER-18CA0;Lo;0;L;;;;;N;;;;; +18CA1;KHITAN SMALL SCRIPT CHARACTER-18CA1;Lo;0;L;;;;;N;;;;; +18CA2;KHITAN SMALL SCRIPT CHARACTER-18CA2;Lo;0;L;;;;;N;;;;; +18CA3;KHITAN SMALL SCRIPT CHARACTER-18CA3;Lo;0;L;;;;;N;;;;; +18CA4;KHITAN SMALL SCRIPT CHARACTER-18CA4;Lo;0;L;;;;;N;;;;; +18CA5;KHITAN SMALL SCRIPT CHARACTER-18CA5;Lo;0;L;;;;;N;;;;; +18CA6;KHITAN SMALL SCRIPT CHARACTER-18CA6;Lo;0;L;;;;;N;;;;; +18CA7;KHITAN SMALL SCRIPT CHARACTER-18CA7;Lo;0;L;;;;;N;;;;; +18CA8;KHITAN SMALL SCRIPT CHARACTER-18CA8;Lo;0;L;;;;;N;;;;; +18CA9;KHITAN SMALL SCRIPT CHARACTER-18CA9;Lo;0;L;;;;;N;;;;; +18CAA;KHITAN SMALL SCRIPT CHARACTER-18CAA;Lo;0;L;;;;;N;;;;; +18CAB;KHITAN SMALL SCRIPT CHARACTER-18CAB;Lo;0;L;;;;;N;;;;; +18CAC;KHITAN SMALL SCRIPT CHARACTER-18CAC;Lo;0;L;;;;;N;;;;; +18CAD;KHITAN SMALL SCRIPT CHARACTER-18CAD;Lo;0;L;;;;;N;;;;; +18CAE;KHITAN SMALL SCRIPT CHARACTER-18CAE;Lo;0;L;;;;;N;;;;; +18CAF;KHITAN SMALL SCRIPT CHARACTER-18CAF;Lo;0;L;;;;;N;;;;; +18CB0;KHITAN SMALL SCRIPT CHARACTER-18CB0;Lo;0;L;;;;;N;;;;; +18CB1;KHITAN SMALL SCRIPT CHARACTER-18CB1;Lo;0;L;;;;;N;;;;; +18CB2;KHITAN SMALL SCRIPT CHARACTER-18CB2;Lo;0;L;;;;;N;;;;; +18CB3;KHITAN SMALL SCRIPT CHARACTER-18CB3;Lo;0;L;;;;;N;;;;; +18CB4;KHITAN SMALL SCRIPT CHARACTER-18CB4;Lo;0;L;;;;;N;;;;; +18CB5;KHITAN SMALL SCRIPT CHARACTER-18CB5;Lo;0;L;;;;;N;;;;; +18CB6;KHITAN SMALL SCRIPT CHARACTER-18CB6;Lo;0;L;;;;;N;;;;; +18CB7;KHITAN SMALL SCRIPT CHARACTER-18CB7;Lo;0;L;;;;;N;;;;; +18CB8;KHITAN SMALL SCRIPT CHARACTER-18CB8;Lo;0;L;;;;;N;;;;; +18CB9;KHITAN SMALL SCRIPT CHARACTER-18CB9;Lo;0;L;;;;;N;;;;; +18CBA;KHITAN SMALL SCRIPT CHARACTER-18CBA;Lo;0;L;;;;;N;;;;; +18CBB;KHITAN SMALL SCRIPT CHARACTER-18CBB;Lo;0;L;;;;;N;;;;; +18CBC;KHITAN SMALL SCRIPT CHARACTER-18CBC;Lo;0;L;;;;;N;;;;; +18CBD;KHITAN SMALL SCRIPT CHARACTER-18CBD;Lo;0;L;;;;;N;;;;; +18CBE;KHITAN SMALL SCRIPT CHARACTER-18CBE;Lo;0;L;;;;;N;;;;; +18CBF;KHITAN SMALL SCRIPT CHARACTER-18CBF;Lo;0;L;;;;;N;;;;; +18CC0;KHITAN SMALL SCRIPT CHARACTER-18CC0;Lo;0;L;;;;;N;;;;; +18CC1;KHITAN SMALL SCRIPT CHARACTER-18CC1;Lo;0;L;;;;;N;;;;; +18CC2;KHITAN SMALL SCRIPT CHARACTER-18CC2;Lo;0;L;;;;;N;;;;; +18CC3;KHITAN SMALL SCRIPT CHARACTER-18CC3;Lo;0;L;;;;;N;;;;; +18CC4;KHITAN SMALL SCRIPT CHARACTER-18CC4;Lo;0;L;;;;;N;;;;; +18CC5;KHITAN SMALL SCRIPT CHARACTER-18CC5;Lo;0;L;;;;;N;;;;; +18CC6;KHITAN SMALL SCRIPT CHARACTER-18CC6;Lo;0;L;;;;;N;;;;; +18CC7;KHITAN SMALL SCRIPT CHARACTER-18CC7;Lo;0;L;;;;;N;;;;; +18CC8;KHITAN SMALL SCRIPT CHARACTER-18CC8;Lo;0;L;;;;;N;;;;; +18CC9;KHITAN SMALL SCRIPT CHARACTER-18CC9;Lo;0;L;;;;;N;;;;; +18CCA;KHITAN SMALL SCRIPT CHARACTER-18CCA;Lo;0;L;;;;;N;;;;; +18CCB;KHITAN SMALL SCRIPT CHARACTER-18CCB;Lo;0;L;;;;;N;;;;; +18CCC;KHITAN SMALL SCRIPT CHARACTER-18CCC;Lo;0;L;;;;;N;;;;; +18CCD;KHITAN SMALL SCRIPT CHARACTER-18CCD;Lo;0;L;;;;;N;;;;; +18CCE;KHITAN SMALL SCRIPT CHARACTER-18CCE;Lo;0;L;;;;;N;;;;; +18CCF;KHITAN SMALL SCRIPT CHARACTER-18CCF;Lo;0;L;;;;;N;;;;; +18CD0;KHITAN SMALL SCRIPT CHARACTER-18CD0;Lo;0;L;;;;;N;;;;; +18CD1;KHITAN SMALL SCRIPT CHARACTER-18CD1;Lo;0;L;;;;;N;;;;; +18CD2;KHITAN SMALL SCRIPT CHARACTER-18CD2;Lo;0;L;;;;;N;;;;; +18CD3;KHITAN SMALL SCRIPT CHARACTER-18CD3;Lo;0;L;;;;;N;;;;; +18CD4;KHITAN SMALL SCRIPT CHARACTER-18CD4;Lo;0;L;;;;;N;;;;; +18CD5;KHITAN SMALL SCRIPT CHARACTER-18CD5;Lo;0;L;;;;;N;;;;; +18CFF;KHITAN SMALL SCRIPT CHARACTER-18CFF;Lo;0;L;;;;;N;;;;; +18D00;;Lo;0;L;;;;;N;;;;; +18D1E;;Lo;0;L;;;;;N;;;;; +18D80;TANGUT COMPONENT-769;Lo;0;L;;;;;N;;;;; +18D81;TANGUT COMPONENT-770;Lo;0;L;;;;;N;;;;; +18D82;TANGUT COMPONENT-771;Lo;0;L;;;;;N;;;;; +18D83;TANGUT COMPONENT-772;Lo;0;L;;;;;N;;;;; +18D84;TANGUT COMPONENT-773;Lo;0;L;;;;;N;;;;; +18D85;TANGUT COMPONENT-774;Lo;0;L;;;;;N;;;;; +18D86;TANGUT COMPONENT-775;Lo;0;L;;;;;N;;;;; +18D87;TANGUT COMPONENT-776;Lo;0;L;;;;;N;;;;; +18D88;TANGUT COMPONENT-777;Lo;0;L;;;;;N;;;;; +18D89;TANGUT COMPONENT-778;Lo;0;L;;;;;N;;;;; +18D8A;TANGUT COMPONENT-779;Lo;0;L;;;;;N;;;;; +18D8B;TANGUT COMPONENT-780;Lo;0;L;;;;;N;;;;; +18D8C;TANGUT COMPONENT-781;Lo;0;L;;;;;N;;;;; +18D8D;TANGUT COMPONENT-782;Lo;0;L;;;;;N;;;;; +18D8E;TANGUT COMPONENT-783;Lo;0;L;;;;;N;;;;; +18D8F;TANGUT COMPONENT-784;Lo;0;L;;;;;N;;;;; +18D90;TANGUT COMPONENT-785;Lo;0;L;;;;;N;;;;; +18D91;TANGUT COMPONENT-786;Lo;0;L;;;;;N;;;;; +18D92;TANGUT COMPONENT-787;Lo;0;L;;;;;N;;;;; +18D93;TANGUT COMPONENT-788;Lo;0;L;;;;;N;;;;; +18D94;TANGUT COMPONENT-789;Lo;0;L;;;;;N;;;;; +18D95;TANGUT COMPONENT-790;Lo;0;L;;;;;N;;;;; +18D96;TANGUT COMPONENT-791;Lo;0;L;;;;;N;;;;; +18D97;TANGUT COMPONENT-792;Lo;0;L;;;;;N;;;;; +18D98;TANGUT COMPONENT-793;Lo;0;L;;;;;N;;;;; +18D99;TANGUT COMPONENT-794;Lo;0;L;;;;;N;;;;; +18D9A;TANGUT COMPONENT-795;Lo;0;L;;;;;N;;;;; +18D9B;TANGUT COMPONENT-796;Lo;0;L;;;;;N;;;;; +18D9C;TANGUT COMPONENT-797;Lo;0;L;;;;;N;;;;; +18D9D;TANGUT COMPONENT-798;Lo;0;L;;;;;N;;;;; +18D9E;TANGUT COMPONENT-799;Lo;0;L;;;;;N;;;;; +18D9F;TANGUT COMPONENT-800;Lo;0;L;;;;;N;;;;; +18DA0;TANGUT COMPONENT-801;Lo;0;L;;;;;N;;;;; +18DA1;TANGUT COMPONENT-802;Lo;0;L;;;;;N;;;;; +18DA2;TANGUT COMPONENT-803;Lo;0;L;;;;;N;;;;; +18DA3;TANGUT COMPONENT-804;Lo;0;L;;;;;N;;;;; +18DA4;TANGUT COMPONENT-805;Lo;0;L;;;;;N;;;;; +18DA5;TANGUT COMPONENT-806;Lo;0;L;;;;;N;;;;; +18DA6;TANGUT COMPONENT-807;Lo;0;L;;;;;N;;;;; +18DA7;TANGUT COMPONENT-808;Lo;0;L;;;;;N;;;;; +18DA8;TANGUT COMPONENT-809;Lo;0;L;;;;;N;;;;; +18DA9;TANGUT COMPONENT-810;Lo;0;L;;;;;N;;;;; +18DAA;TANGUT COMPONENT-811;Lo;0;L;;;;;N;;;;; +18DAB;TANGUT COMPONENT-812;Lo;0;L;;;;;N;;;;; +18DAC;TANGUT COMPONENT-813;Lo;0;L;;;;;N;;;;; +18DAD;TANGUT COMPONENT-814;Lo;0;L;;;;;N;;;;; +18DAE;TANGUT COMPONENT-815;Lo;0;L;;;;;N;;;;; +18DAF;TANGUT COMPONENT-816;Lo;0;L;;;;;N;;;;; +18DB0;TANGUT COMPONENT-817;Lo;0;L;;;;;N;;;;; +18DB1;TANGUT COMPONENT-818;Lo;0;L;;;;;N;;;;; +18DB2;TANGUT COMPONENT-819;Lo;0;L;;;;;N;;;;; +18DB3;TANGUT COMPONENT-820;Lo;0;L;;;;;N;;;;; +18DB4;TANGUT COMPONENT-821;Lo;0;L;;;;;N;;;;; +18DB5;TANGUT COMPONENT-822;Lo;0;L;;;;;N;;;;; +18DB6;TANGUT COMPONENT-823;Lo;0;L;;;;;N;;;;; +18DB7;TANGUT COMPONENT-824;Lo;0;L;;;;;N;;;;; +18DB8;TANGUT COMPONENT-825;Lo;0;L;;;;;N;;;;; +18DB9;TANGUT COMPONENT-826;Lo;0;L;;;;;N;;;;; +18DBA;TANGUT COMPONENT-827;Lo;0;L;;;;;N;;;;; +18DBB;TANGUT COMPONENT-828;Lo;0;L;;;;;N;;;;; +18DBC;TANGUT COMPONENT-829;Lo;0;L;;;;;N;;;;; +18DBD;TANGUT COMPONENT-830;Lo;0;L;;;;;N;;;;; +18DBE;TANGUT COMPONENT-831;Lo;0;L;;;;;N;;;;; +18DBF;TANGUT COMPONENT-832;Lo;0;L;;;;;N;;;;; +18DC0;TANGUT COMPONENT-833;Lo;0;L;;;;;N;;;;; +18DC1;TANGUT COMPONENT-834;Lo;0;L;;;;;N;;;;; +18DC2;TANGUT COMPONENT-835;Lo;0;L;;;;;N;;;;; +18DC3;TANGUT COMPONENT-836;Lo;0;L;;;;;N;;;;; +18DC4;TANGUT COMPONENT-837;Lo;0;L;;;;;N;;;;; +18DC5;TANGUT COMPONENT-838;Lo;0;L;;;;;N;;;;; +18DC6;TANGUT COMPONENT-839;Lo;0;L;;;;;N;;;;; +18DC7;TANGUT COMPONENT-840;Lo;0;L;;;;;N;;;;; +18DC8;TANGUT COMPONENT-841;Lo;0;L;;;;;N;;;;; +18DC9;TANGUT COMPONENT-842;Lo;0;L;;;;;N;;;;; +18DCA;TANGUT COMPONENT-843;Lo;0;L;;;;;N;;;;; +18DCB;TANGUT COMPONENT-844;Lo;0;L;;;;;N;;;;; +18DCC;TANGUT COMPONENT-845;Lo;0;L;;;;;N;;;;; +18DCD;TANGUT COMPONENT-846;Lo;0;L;;;;;N;;;;; +18DCE;TANGUT COMPONENT-847;Lo;0;L;;;;;N;;;;; +18DCF;TANGUT COMPONENT-848;Lo;0;L;;;;;N;;;;; +18DD0;TANGUT COMPONENT-849;Lo;0;L;;;;;N;;;;; +18DD1;TANGUT COMPONENT-850;Lo;0;L;;;;;N;;;;; +18DD2;TANGUT COMPONENT-851;Lo;0;L;;;;;N;;;;; +18DD3;TANGUT COMPONENT-852;Lo;0;L;;;;;N;;;;; +18DD4;TANGUT COMPONENT-853;Lo;0;L;;;;;N;;;;; +18DD5;TANGUT COMPONENT-854;Lo;0;L;;;;;N;;;;; +18DD6;TANGUT COMPONENT-855;Lo;0;L;;;;;N;;;;; +18DD7;TANGUT COMPONENT-856;Lo;0;L;;;;;N;;;;; +18DD8;TANGUT COMPONENT-857;Lo;0;L;;;;;N;;;;; +18DD9;TANGUT COMPONENT-858;Lo;0;L;;;;;N;;;;; +18DDA;TANGUT COMPONENT-859;Lo;0;L;;;;;N;;;;; +18DDB;TANGUT COMPONENT-860;Lo;0;L;;;;;N;;;;; +18DDC;TANGUT COMPONENT-861;Lo;0;L;;;;;N;;;;; +18DDD;TANGUT COMPONENT-862;Lo;0;L;;;;;N;;;;; +18DDE;TANGUT COMPONENT-863;Lo;0;L;;;;;N;;;;; +18DDF;TANGUT COMPONENT-864;Lo;0;L;;;;;N;;;;; +18DE0;TANGUT COMPONENT-865;Lo;0;L;;;;;N;;;;; +18DE1;TANGUT COMPONENT-866;Lo;0;L;;;;;N;;;;; +18DE2;TANGUT COMPONENT-867;Lo;0;L;;;;;N;;;;; +18DE3;TANGUT COMPONENT-868;Lo;0;L;;;;;N;;;;; +18DE4;TANGUT COMPONENT-869;Lo;0;L;;;;;N;;;;; +18DE5;TANGUT COMPONENT-870;Lo;0;L;;;;;N;;;;; +18DE6;TANGUT COMPONENT-871;Lo;0;L;;;;;N;;;;; +18DE7;TANGUT COMPONENT-872;Lo;0;L;;;;;N;;;;; +18DE8;TANGUT COMPONENT-873;Lo;0;L;;;;;N;;;;; +18DE9;TANGUT COMPONENT-874;Lo;0;L;;;;;N;;;;; +18DEA;TANGUT COMPONENT-875;Lo;0;L;;;;;N;;;;; +18DEB;TANGUT COMPONENT-876;Lo;0;L;;;;;N;;;;; +18DEC;TANGUT COMPONENT-877;Lo;0;L;;;;;N;;;;; +18DED;TANGUT COMPONENT-878;Lo;0;L;;;;;N;;;;; +18DEE;TANGUT COMPONENT-879;Lo;0;L;;;;;N;;;;; +18DEF;TANGUT COMPONENT-880;Lo;0;L;;;;;N;;;;; +18DF0;TANGUT COMPONENT-881;Lo;0;L;;;;;N;;;;; +18DF1;TANGUT COMPONENT-882;Lo;0;L;;;;;N;;;;; +18DF2;TANGUT COMPONENT-883;Lo;0;L;;;;;N;;;;; +1AFF0;KATAKANA LETTER MINNAN TONE-2;Lm;0;L;;;;;N;;;;; +1AFF1;KATAKANA LETTER MINNAN TONE-3;Lm;0;L;;;;;N;;;;; +1AFF2;KATAKANA LETTER MINNAN TONE-4;Lm;0;L;;;;;N;;;;; +1AFF3;KATAKANA LETTER MINNAN TONE-5;Lm;0;L;;;;;N;;;;; +1AFF5;KATAKANA LETTER MINNAN TONE-7;Lm;0;L;;;;;N;;;;; +1AFF6;KATAKANA LETTER MINNAN TONE-8;Lm;0;L;;;;;N;;;;; +1AFF7;KATAKANA LETTER MINNAN NASALIZED TONE-1;Lm;0;L;;;;;N;;;;; +1AFF8;KATAKANA LETTER MINNAN NASALIZED TONE-2;Lm;0;L;;;;;N;;;;; +1AFF9;KATAKANA LETTER MINNAN NASALIZED TONE-3;Lm;0;L;;;;;N;;;;; +1AFFA;KATAKANA LETTER MINNAN NASALIZED TONE-4;Lm;0;L;;;;;N;;;;; +1AFFB;KATAKANA LETTER MINNAN NASALIZED TONE-5;Lm;0;L;;;;;N;;;;; +1AFFD;KATAKANA LETTER MINNAN NASALIZED TONE-7;Lm;0;L;;;;;N;;;;; +1AFFE;KATAKANA LETTER MINNAN NASALIZED TONE-8;Lm;0;L;;;;;N;;;;; +1B000;KATAKANA LETTER ARCHAIC E;Lo;0;L;;;;;N;;;;; +1B001;HIRAGANA LETTER ARCHAIC YE;Lo;0;L;;;;;N;;;;; +1B002;HENTAIGANA LETTER A-1;Lo;0;L;;;;;N;;;;; +1B003;HENTAIGANA LETTER A-2;Lo;0;L;;;;;N;;;;; +1B004;HENTAIGANA LETTER A-3;Lo;0;L;;;;;N;;;;; +1B005;HENTAIGANA LETTER A-WO;Lo;0;L;;;;;N;;;;; +1B006;HENTAIGANA LETTER I-1;Lo;0;L;;;;;N;;;;; +1B007;HENTAIGANA LETTER I-2;Lo;0;L;;;;;N;;;;; +1B008;HENTAIGANA LETTER I-3;Lo;0;L;;;;;N;;;;; +1B009;HENTAIGANA LETTER I-4;Lo;0;L;;;;;N;;;;; +1B00A;HENTAIGANA LETTER U-1;Lo;0;L;;;;;N;;;;; +1B00B;HENTAIGANA LETTER U-2;Lo;0;L;;;;;N;;;;; +1B00C;HENTAIGANA LETTER U-3;Lo;0;L;;;;;N;;;;; +1B00D;HENTAIGANA LETTER U-4;Lo;0;L;;;;;N;;;;; +1B00E;HENTAIGANA LETTER U-5;Lo;0;L;;;;;N;;;;; +1B00F;HENTAIGANA LETTER E-2;Lo;0;L;;;;;N;;;;; +1B010;HENTAIGANA LETTER E-3;Lo;0;L;;;;;N;;;;; +1B011;HENTAIGANA LETTER E-4;Lo;0;L;;;;;N;;;;; +1B012;HENTAIGANA LETTER E-5;Lo;0;L;;;;;N;;;;; +1B013;HENTAIGANA LETTER E-6;Lo;0;L;;;;;N;;;;; +1B014;HENTAIGANA LETTER O-1;Lo;0;L;;;;;N;;;;; +1B015;HENTAIGANA LETTER O-2;Lo;0;L;;;;;N;;;;; +1B016;HENTAIGANA LETTER O-3;Lo;0;L;;;;;N;;;;; +1B017;HENTAIGANA LETTER KA-1;Lo;0;L;;;;;N;;;;; +1B018;HENTAIGANA LETTER KA-2;Lo;0;L;;;;;N;;;;; +1B019;HENTAIGANA LETTER KA-3;Lo;0;L;;;;;N;;;;; +1B01A;HENTAIGANA LETTER KA-4;Lo;0;L;;;;;N;;;;; +1B01B;HENTAIGANA LETTER KA-5;Lo;0;L;;;;;N;;;;; +1B01C;HENTAIGANA LETTER KA-6;Lo;0;L;;;;;N;;;;; +1B01D;HENTAIGANA LETTER KA-7;Lo;0;L;;;;;N;;;;; +1B01E;HENTAIGANA LETTER KA-8;Lo;0;L;;;;;N;;;;; +1B01F;HENTAIGANA LETTER KA-9;Lo;0;L;;;;;N;;;;; +1B020;HENTAIGANA LETTER KA-10;Lo;0;L;;;;;N;;;;; +1B021;HENTAIGANA LETTER KA-11;Lo;0;L;;;;;N;;;;; +1B022;HENTAIGANA LETTER KA-KE;Lo;0;L;;;;;N;;;;; +1B023;HENTAIGANA LETTER KI-1;Lo;0;L;;;;;N;;;;; +1B024;HENTAIGANA LETTER KI-2;Lo;0;L;;;;;N;;;;; +1B025;HENTAIGANA LETTER KI-3;Lo;0;L;;;;;N;;;;; +1B026;HENTAIGANA LETTER KI-4;Lo;0;L;;;;;N;;;;; +1B027;HENTAIGANA LETTER KI-5;Lo;0;L;;;;;N;;;;; +1B028;HENTAIGANA LETTER KI-6;Lo;0;L;;;;;N;;;;; +1B029;HENTAIGANA LETTER KI-7;Lo;0;L;;;;;N;;;;; +1B02A;HENTAIGANA LETTER KI-8;Lo;0;L;;;;;N;;;;; +1B02B;HENTAIGANA LETTER KU-1;Lo;0;L;;;;;N;;;;; +1B02C;HENTAIGANA LETTER KU-2;Lo;0;L;;;;;N;;;;; +1B02D;HENTAIGANA LETTER KU-3;Lo;0;L;;;;;N;;;;; +1B02E;HENTAIGANA LETTER KU-4;Lo;0;L;;;;;N;;;;; +1B02F;HENTAIGANA LETTER KU-5;Lo;0;L;;;;;N;;;;; +1B030;HENTAIGANA LETTER KU-6;Lo;0;L;;;;;N;;;;; +1B031;HENTAIGANA LETTER KU-7;Lo;0;L;;;;;N;;;;; +1B032;HENTAIGANA LETTER KE-1;Lo;0;L;;;;;N;;;;; +1B033;HENTAIGANA LETTER KE-2;Lo;0;L;;;;;N;;;;; +1B034;HENTAIGANA LETTER KE-3;Lo;0;L;;;;;N;;;;; +1B035;HENTAIGANA LETTER KE-4;Lo;0;L;;;;;N;;;;; +1B036;HENTAIGANA LETTER KE-5;Lo;0;L;;;;;N;;;;; +1B037;HENTAIGANA LETTER KE-6;Lo;0;L;;;;;N;;;;; +1B038;HENTAIGANA LETTER KO-1;Lo;0;L;;;;;N;;;;; +1B039;HENTAIGANA LETTER KO-2;Lo;0;L;;;;;N;;;;; +1B03A;HENTAIGANA LETTER KO-3;Lo;0;L;;;;;N;;;;; +1B03B;HENTAIGANA LETTER KO-KI;Lo;0;L;;;;;N;;;;; +1B03C;HENTAIGANA LETTER SA-1;Lo;0;L;;;;;N;;;;; +1B03D;HENTAIGANA LETTER SA-2;Lo;0;L;;;;;N;;;;; +1B03E;HENTAIGANA LETTER SA-3;Lo;0;L;;;;;N;;;;; +1B03F;HENTAIGANA LETTER SA-4;Lo;0;L;;;;;N;;;;; +1B040;HENTAIGANA LETTER SA-5;Lo;0;L;;;;;N;;;;; +1B041;HENTAIGANA LETTER SA-6;Lo;0;L;;;;;N;;;;; +1B042;HENTAIGANA LETTER SA-7;Lo;0;L;;;;;N;;;;; +1B043;HENTAIGANA LETTER SA-8;Lo;0;L;;;;;N;;;;; +1B044;HENTAIGANA LETTER SI-1;Lo;0;L;;;;;N;;;;; +1B045;HENTAIGANA LETTER SI-2;Lo;0;L;;;;;N;;;;; +1B046;HENTAIGANA LETTER SI-3;Lo;0;L;;;;;N;;;;; +1B047;HENTAIGANA LETTER SI-4;Lo;0;L;;;;;N;;;;; +1B048;HENTAIGANA LETTER SI-5;Lo;0;L;;;;;N;;;;; +1B049;HENTAIGANA LETTER SI-6;Lo;0;L;;;;;N;;;;; +1B04A;HENTAIGANA LETTER SU-1;Lo;0;L;;;;;N;;;;; +1B04B;HENTAIGANA LETTER SU-2;Lo;0;L;;;;;N;;;;; +1B04C;HENTAIGANA LETTER SU-3;Lo;0;L;;;;;N;;;;; +1B04D;HENTAIGANA LETTER SU-4;Lo;0;L;;;;;N;;;;; +1B04E;HENTAIGANA LETTER SU-5;Lo;0;L;;;;;N;;;;; +1B04F;HENTAIGANA LETTER SU-6;Lo;0;L;;;;;N;;;;; +1B050;HENTAIGANA LETTER SU-7;Lo;0;L;;;;;N;;;;; +1B051;HENTAIGANA LETTER SU-8;Lo;0;L;;;;;N;;;;; +1B052;HENTAIGANA LETTER SE-1;Lo;0;L;;;;;N;;;;; +1B053;HENTAIGANA LETTER SE-2;Lo;0;L;;;;;N;;;;; +1B054;HENTAIGANA LETTER SE-3;Lo;0;L;;;;;N;;;;; +1B055;HENTAIGANA LETTER SE-4;Lo;0;L;;;;;N;;;;; +1B056;HENTAIGANA LETTER SE-5;Lo;0;L;;;;;N;;;;; +1B057;HENTAIGANA LETTER SO-1;Lo;0;L;;;;;N;;;;; +1B058;HENTAIGANA LETTER SO-2;Lo;0;L;;;;;N;;;;; +1B059;HENTAIGANA LETTER SO-3;Lo;0;L;;;;;N;;;;; +1B05A;HENTAIGANA LETTER SO-4;Lo;0;L;;;;;N;;;;; +1B05B;HENTAIGANA LETTER SO-5;Lo;0;L;;;;;N;;;;; +1B05C;HENTAIGANA LETTER SO-6;Lo;0;L;;;;;N;;;;; +1B05D;HENTAIGANA LETTER SO-7;Lo;0;L;;;;;N;;;;; +1B05E;HENTAIGANA LETTER TA-1;Lo;0;L;;;;;N;;;;; +1B05F;HENTAIGANA LETTER TA-2;Lo;0;L;;;;;N;;;;; +1B060;HENTAIGANA LETTER TA-3;Lo;0;L;;;;;N;;;;; +1B061;HENTAIGANA LETTER TA-4;Lo;0;L;;;;;N;;;;; +1B062;HENTAIGANA LETTER TI-1;Lo;0;L;;;;;N;;;;; +1B063;HENTAIGANA LETTER TI-2;Lo;0;L;;;;;N;;;;; +1B064;HENTAIGANA LETTER TI-3;Lo;0;L;;;;;N;;;;; +1B065;HENTAIGANA LETTER TI-4;Lo;0;L;;;;;N;;;;; +1B066;HENTAIGANA LETTER TI-5;Lo;0;L;;;;;N;;;;; +1B067;HENTAIGANA LETTER TI-6;Lo;0;L;;;;;N;;;;; +1B068;HENTAIGANA LETTER TI-7;Lo;0;L;;;;;N;;;;; +1B069;HENTAIGANA LETTER TU-1;Lo;0;L;;;;;N;;;;; +1B06A;HENTAIGANA LETTER TU-2;Lo;0;L;;;;;N;;;;; +1B06B;HENTAIGANA LETTER TU-3;Lo;0;L;;;;;N;;;;; +1B06C;HENTAIGANA LETTER TU-4;Lo;0;L;;;;;N;;;;; +1B06D;HENTAIGANA LETTER TU-TO;Lo;0;L;;;;;N;;;;; +1B06E;HENTAIGANA LETTER TE-1;Lo;0;L;;;;;N;;;;; +1B06F;HENTAIGANA LETTER TE-2;Lo;0;L;;;;;N;;;;; +1B070;HENTAIGANA LETTER TE-3;Lo;0;L;;;;;N;;;;; +1B071;HENTAIGANA LETTER TE-4;Lo;0;L;;;;;N;;;;; +1B072;HENTAIGANA LETTER TE-5;Lo;0;L;;;;;N;;;;; +1B073;HENTAIGANA LETTER TE-6;Lo;0;L;;;;;N;;;;; +1B074;HENTAIGANA LETTER TE-7;Lo;0;L;;;;;N;;;;; +1B075;HENTAIGANA LETTER TE-8;Lo;0;L;;;;;N;;;;; +1B076;HENTAIGANA LETTER TE-9;Lo;0;L;;;;;N;;;;; +1B077;HENTAIGANA LETTER TO-1;Lo;0;L;;;;;N;;;;; +1B078;HENTAIGANA LETTER TO-2;Lo;0;L;;;;;N;;;;; +1B079;HENTAIGANA LETTER TO-3;Lo;0;L;;;;;N;;;;; +1B07A;HENTAIGANA LETTER TO-4;Lo;0;L;;;;;N;;;;; +1B07B;HENTAIGANA LETTER TO-5;Lo;0;L;;;;;N;;;;; +1B07C;HENTAIGANA LETTER TO-6;Lo;0;L;;;;;N;;;;; +1B07D;HENTAIGANA LETTER TO-RA;Lo;0;L;;;;;N;;;;; +1B07E;HENTAIGANA LETTER NA-1;Lo;0;L;;;;;N;;;;; +1B07F;HENTAIGANA LETTER NA-2;Lo;0;L;;;;;N;;;;; +1B080;HENTAIGANA LETTER NA-3;Lo;0;L;;;;;N;;;;; +1B081;HENTAIGANA LETTER NA-4;Lo;0;L;;;;;N;;;;; +1B082;HENTAIGANA LETTER NA-5;Lo;0;L;;;;;N;;;;; +1B083;HENTAIGANA LETTER NA-6;Lo;0;L;;;;;N;;;;; +1B084;HENTAIGANA LETTER NA-7;Lo;0;L;;;;;N;;;;; +1B085;HENTAIGANA LETTER NA-8;Lo;0;L;;;;;N;;;;; +1B086;HENTAIGANA LETTER NA-9;Lo;0;L;;;;;N;;;;; +1B087;HENTAIGANA LETTER NI-1;Lo;0;L;;;;;N;;;;; +1B088;HENTAIGANA LETTER NI-2;Lo;0;L;;;;;N;;;;; +1B089;HENTAIGANA LETTER NI-3;Lo;0;L;;;;;N;;;;; +1B08A;HENTAIGANA LETTER NI-4;Lo;0;L;;;;;N;;;;; +1B08B;HENTAIGANA LETTER NI-5;Lo;0;L;;;;;N;;;;; +1B08C;HENTAIGANA LETTER NI-6;Lo;0;L;;;;;N;;;;; +1B08D;HENTAIGANA LETTER NI-7;Lo;0;L;;;;;N;;;;; +1B08E;HENTAIGANA LETTER NI-TE;Lo;0;L;;;;;N;;;;; +1B08F;HENTAIGANA LETTER NU-1;Lo;0;L;;;;;N;;;;; +1B090;HENTAIGANA LETTER NU-2;Lo;0;L;;;;;N;;;;; +1B091;HENTAIGANA LETTER NU-3;Lo;0;L;;;;;N;;;;; +1B092;HENTAIGANA LETTER NE-1;Lo;0;L;;;;;N;;;;; +1B093;HENTAIGANA LETTER NE-2;Lo;0;L;;;;;N;;;;; +1B094;HENTAIGANA LETTER NE-3;Lo;0;L;;;;;N;;;;; +1B095;HENTAIGANA LETTER NE-4;Lo;0;L;;;;;N;;;;; +1B096;HENTAIGANA LETTER NE-5;Lo;0;L;;;;;N;;;;; +1B097;HENTAIGANA LETTER NE-6;Lo;0;L;;;;;N;;;;; +1B098;HENTAIGANA LETTER NE-KO;Lo;0;L;;;;;N;;;;; +1B099;HENTAIGANA LETTER NO-1;Lo;0;L;;;;;N;;;;; +1B09A;HENTAIGANA LETTER NO-2;Lo;0;L;;;;;N;;;;; +1B09B;HENTAIGANA LETTER NO-3;Lo;0;L;;;;;N;;;;; +1B09C;HENTAIGANA LETTER NO-4;Lo;0;L;;;;;N;;;;; +1B09D;HENTAIGANA LETTER NO-5;Lo;0;L;;;;;N;;;;; +1B09E;HENTAIGANA LETTER HA-1;Lo;0;L;;;;;N;;;;; +1B09F;HENTAIGANA LETTER HA-2;Lo;0;L;;;;;N;;;;; +1B0A0;HENTAIGANA LETTER HA-3;Lo;0;L;;;;;N;;;;; +1B0A1;HENTAIGANA LETTER HA-4;Lo;0;L;;;;;N;;;;; +1B0A2;HENTAIGANA LETTER HA-5;Lo;0;L;;;;;N;;;;; +1B0A3;HENTAIGANA LETTER HA-6;Lo;0;L;;;;;N;;;;; +1B0A4;HENTAIGANA LETTER HA-7;Lo;0;L;;;;;N;;;;; +1B0A5;HENTAIGANA LETTER HA-8;Lo;0;L;;;;;N;;;;; +1B0A6;HENTAIGANA LETTER HA-9;Lo;0;L;;;;;N;;;;; +1B0A7;HENTAIGANA LETTER HA-10;Lo;0;L;;;;;N;;;;; +1B0A8;HENTAIGANA LETTER HA-11;Lo;0;L;;;;;N;;;;; +1B0A9;HENTAIGANA LETTER HI-1;Lo;0;L;;;;;N;;;;; +1B0AA;HENTAIGANA LETTER HI-2;Lo;0;L;;;;;N;;;;; +1B0AB;HENTAIGANA LETTER HI-3;Lo;0;L;;;;;N;;;;; +1B0AC;HENTAIGANA LETTER HI-4;Lo;0;L;;;;;N;;;;; +1B0AD;HENTAIGANA LETTER HI-5;Lo;0;L;;;;;N;;;;; +1B0AE;HENTAIGANA LETTER HI-6;Lo;0;L;;;;;N;;;;; +1B0AF;HENTAIGANA LETTER HI-7;Lo;0;L;;;;;N;;;;; +1B0B0;HENTAIGANA LETTER HU-1;Lo;0;L;;;;;N;;;;; +1B0B1;HENTAIGANA LETTER HU-2;Lo;0;L;;;;;N;;;;; +1B0B2;HENTAIGANA LETTER HU-3;Lo;0;L;;;;;N;;;;; +1B0B3;HENTAIGANA LETTER HE-1;Lo;0;L;;;;;N;;;;; +1B0B4;HENTAIGANA LETTER HE-2;Lo;0;L;;;;;N;;;;; +1B0B5;HENTAIGANA LETTER HE-3;Lo;0;L;;;;;N;;;;; +1B0B6;HENTAIGANA LETTER HE-4;Lo;0;L;;;;;N;;;;; +1B0B7;HENTAIGANA LETTER HE-5;Lo;0;L;;;;;N;;;;; +1B0B8;HENTAIGANA LETTER HE-6;Lo;0;L;;;;;N;;;;; +1B0B9;HENTAIGANA LETTER HE-7;Lo;0;L;;;;;N;;;;; +1B0BA;HENTAIGANA LETTER HO-1;Lo;0;L;;;;;N;;;;; +1B0BB;HENTAIGANA LETTER HO-2;Lo;0;L;;;;;N;;;;; +1B0BC;HENTAIGANA LETTER HO-3;Lo;0;L;;;;;N;;;;; +1B0BD;HENTAIGANA LETTER HO-4;Lo;0;L;;;;;N;;;;; +1B0BE;HENTAIGANA LETTER HO-5;Lo;0;L;;;;;N;;;;; +1B0BF;HENTAIGANA LETTER HO-6;Lo;0;L;;;;;N;;;;; +1B0C0;HENTAIGANA LETTER HO-7;Lo;0;L;;;;;N;;;;; +1B0C1;HENTAIGANA LETTER HO-8;Lo;0;L;;;;;N;;;;; +1B0C2;HENTAIGANA LETTER MA-1;Lo;0;L;;;;;N;;;;; +1B0C3;HENTAIGANA LETTER MA-2;Lo;0;L;;;;;N;;;;; +1B0C4;HENTAIGANA LETTER MA-3;Lo;0;L;;;;;N;;;;; +1B0C5;HENTAIGANA LETTER MA-4;Lo;0;L;;;;;N;;;;; +1B0C6;HENTAIGANA LETTER MA-5;Lo;0;L;;;;;N;;;;; +1B0C7;HENTAIGANA LETTER MA-6;Lo;0;L;;;;;N;;;;; +1B0C8;HENTAIGANA LETTER MA-7;Lo;0;L;;;;;N;;;;; +1B0C9;HENTAIGANA LETTER MI-1;Lo;0;L;;;;;N;;;;; +1B0CA;HENTAIGANA LETTER MI-2;Lo;0;L;;;;;N;;;;; +1B0CB;HENTAIGANA LETTER MI-3;Lo;0;L;;;;;N;;;;; +1B0CC;HENTAIGANA LETTER MI-4;Lo;0;L;;;;;N;;;;; +1B0CD;HENTAIGANA LETTER MI-5;Lo;0;L;;;;;N;;;;; +1B0CE;HENTAIGANA LETTER MI-6;Lo;0;L;;;;;N;;;;; +1B0CF;HENTAIGANA LETTER MI-7;Lo;0;L;;;;;N;;;;; +1B0D0;HENTAIGANA LETTER MU-1;Lo;0;L;;;;;N;;;;; +1B0D1;HENTAIGANA LETTER MU-2;Lo;0;L;;;;;N;;;;; +1B0D2;HENTAIGANA LETTER MU-3;Lo;0;L;;;;;N;;;;; +1B0D3;HENTAIGANA LETTER MU-4;Lo;0;L;;;;;N;;;;; +1B0D4;HENTAIGANA LETTER ME-1;Lo;0;L;;;;;N;;;;; +1B0D5;HENTAIGANA LETTER ME-2;Lo;0;L;;;;;N;;;;; +1B0D6;HENTAIGANA LETTER ME-MA;Lo;0;L;;;;;N;;;;; +1B0D7;HENTAIGANA LETTER MO-1;Lo;0;L;;;;;N;;;;; +1B0D8;HENTAIGANA LETTER MO-2;Lo;0;L;;;;;N;;;;; +1B0D9;HENTAIGANA LETTER MO-3;Lo;0;L;;;;;N;;;;; +1B0DA;HENTAIGANA LETTER MO-4;Lo;0;L;;;;;N;;;;; +1B0DB;HENTAIGANA LETTER MO-5;Lo;0;L;;;;;N;;;;; +1B0DC;HENTAIGANA LETTER MO-6;Lo;0;L;;;;;N;;;;; +1B0DD;HENTAIGANA LETTER YA-1;Lo;0;L;;;;;N;;;;; +1B0DE;HENTAIGANA LETTER YA-2;Lo;0;L;;;;;N;;;;; +1B0DF;HENTAIGANA LETTER YA-3;Lo;0;L;;;;;N;;;;; +1B0E0;HENTAIGANA LETTER YA-4;Lo;0;L;;;;;N;;;;; +1B0E1;HENTAIGANA LETTER YA-5;Lo;0;L;;;;;N;;;;; +1B0E2;HENTAIGANA LETTER YA-YO;Lo;0;L;;;;;N;;;;; +1B0E3;HENTAIGANA LETTER YU-1;Lo;0;L;;;;;N;;;;; +1B0E4;HENTAIGANA LETTER YU-2;Lo;0;L;;;;;N;;;;; +1B0E5;HENTAIGANA LETTER YU-3;Lo;0;L;;;;;N;;;;; +1B0E6;HENTAIGANA LETTER YU-4;Lo;0;L;;;;;N;;;;; +1B0E7;HENTAIGANA LETTER YO-1;Lo;0;L;;;;;N;;;;; +1B0E8;HENTAIGANA LETTER YO-2;Lo;0;L;;;;;N;;;;; +1B0E9;HENTAIGANA LETTER YO-3;Lo;0;L;;;;;N;;;;; +1B0EA;HENTAIGANA LETTER YO-4;Lo;0;L;;;;;N;;;;; +1B0EB;HENTAIGANA LETTER YO-5;Lo;0;L;;;;;N;;;;; +1B0EC;HENTAIGANA LETTER YO-6;Lo;0;L;;;;;N;;;;; +1B0ED;HENTAIGANA LETTER RA-1;Lo;0;L;;;;;N;;;;; +1B0EE;HENTAIGANA LETTER RA-2;Lo;0;L;;;;;N;;;;; +1B0EF;HENTAIGANA LETTER RA-3;Lo;0;L;;;;;N;;;;; +1B0F0;HENTAIGANA LETTER RA-4;Lo;0;L;;;;;N;;;;; +1B0F1;HENTAIGANA LETTER RI-1;Lo;0;L;;;;;N;;;;; +1B0F2;HENTAIGANA LETTER RI-2;Lo;0;L;;;;;N;;;;; +1B0F3;HENTAIGANA LETTER RI-3;Lo;0;L;;;;;N;;;;; +1B0F4;HENTAIGANA LETTER RI-4;Lo;0;L;;;;;N;;;;; +1B0F5;HENTAIGANA LETTER RI-5;Lo;0;L;;;;;N;;;;; +1B0F6;HENTAIGANA LETTER RI-6;Lo;0;L;;;;;N;;;;; +1B0F7;HENTAIGANA LETTER RI-7;Lo;0;L;;;;;N;;;;; +1B0F8;HENTAIGANA LETTER RU-1;Lo;0;L;;;;;N;;;;; +1B0F9;HENTAIGANA LETTER RU-2;Lo;0;L;;;;;N;;;;; +1B0FA;HENTAIGANA LETTER RU-3;Lo;0;L;;;;;N;;;;; +1B0FB;HENTAIGANA LETTER RU-4;Lo;0;L;;;;;N;;;;; +1B0FC;HENTAIGANA LETTER RU-5;Lo;0;L;;;;;N;;;;; +1B0FD;HENTAIGANA LETTER RU-6;Lo;0;L;;;;;N;;;;; +1B0FE;HENTAIGANA LETTER RE-1;Lo;0;L;;;;;N;;;;; +1B0FF;HENTAIGANA LETTER RE-2;Lo;0;L;;;;;N;;;;; +1B100;HENTAIGANA LETTER RE-3;Lo;0;L;;;;;N;;;;; +1B101;HENTAIGANA LETTER RE-4;Lo;0;L;;;;;N;;;;; +1B102;HENTAIGANA LETTER RO-1;Lo;0;L;;;;;N;;;;; +1B103;HENTAIGANA LETTER RO-2;Lo;0;L;;;;;N;;;;; +1B104;HENTAIGANA LETTER RO-3;Lo;0;L;;;;;N;;;;; +1B105;HENTAIGANA LETTER RO-4;Lo;0;L;;;;;N;;;;; +1B106;HENTAIGANA LETTER RO-5;Lo;0;L;;;;;N;;;;; +1B107;HENTAIGANA LETTER RO-6;Lo;0;L;;;;;N;;;;; +1B108;HENTAIGANA LETTER WA-1;Lo;0;L;;;;;N;;;;; +1B109;HENTAIGANA LETTER WA-2;Lo;0;L;;;;;N;;;;; +1B10A;HENTAIGANA LETTER WA-3;Lo;0;L;;;;;N;;;;; +1B10B;HENTAIGANA LETTER WA-4;Lo;0;L;;;;;N;;;;; +1B10C;HENTAIGANA LETTER WA-5;Lo;0;L;;;;;N;;;;; +1B10D;HENTAIGANA LETTER WI-1;Lo;0;L;;;;;N;;;;; +1B10E;HENTAIGANA LETTER WI-2;Lo;0;L;;;;;N;;;;; +1B10F;HENTAIGANA LETTER WI-3;Lo;0;L;;;;;N;;;;; +1B110;HENTAIGANA LETTER WI-4;Lo;0;L;;;;;N;;;;; +1B111;HENTAIGANA LETTER WI-5;Lo;0;L;;;;;N;;;;; +1B112;HENTAIGANA LETTER WE-1;Lo;0;L;;;;;N;;;;; +1B113;HENTAIGANA LETTER WE-2;Lo;0;L;;;;;N;;;;; +1B114;HENTAIGANA LETTER WE-3;Lo;0;L;;;;;N;;;;; +1B115;HENTAIGANA LETTER WE-4;Lo;0;L;;;;;N;;;;; +1B116;HENTAIGANA LETTER WO-1;Lo;0;L;;;;;N;;;;; +1B117;HENTAIGANA LETTER WO-2;Lo;0;L;;;;;N;;;;; +1B118;HENTAIGANA LETTER WO-3;Lo;0;L;;;;;N;;;;; +1B119;HENTAIGANA LETTER WO-4;Lo;0;L;;;;;N;;;;; +1B11A;HENTAIGANA LETTER WO-5;Lo;0;L;;;;;N;;;;; +1B11B;HENTAIGANA LETTER WO-6;Lo;0;L;;;;;N;;;;; +1B11C;HENTAIGANA LETTER WO-7;Lo;0;L;;;;;N;;;;; +1B11D;HENTAIGANA LETTER N-MU-MO-1;Lo;0;L;;;;;N;;;;; +1B11E;HENTAIGANA LETTER N-MU-MO-2;Lo;0;L;;;;;N;;;;; +1B11F;HIRAGANA LETTER ARCHAIC WU;Lo;0;L;;;;;N;;;;; +1B120;KATAKANA LETTER ARCHAIC YI;Lo;0;L;;;;;N;;;;; +1B121;KATAKANA LETTER ARCHAIC YE;Lo;0;L;;;;;N;;;;; +1B122;KATAKANA LETTER ARCHAIC WU;Lo;0;L;;;;;N;;;;; +1B132;HIRAGANA LETTER SMALL KO;Lo;0;L;;;;;N;;;;; +1B150;HIRAGANA LETTER SMALL WI;Lo;0;L;;;;;N;;;;; +1B151;HIRAGANA LETTER SMALL WE;Lo;0;L;;;;;N;;;;; +1B152;HIRAGANA LETTER SMALL WO;Lo;0;L;;;;;N;;;;; +1B155;KATAKANA LETTER SMALL KO;Lo;0;L;;;;;N;;;;; +1B164;KATAKANA LETTER SMALL WI;Lo;0;L;;;;;N;;;;; +1B165;KATAKANA LETTER SMALL WE;Lo;0;L;;;;;N;;;;; +1B166;KATAKANA LETTER SMALL WO;Lo;0;L;;;;;N;;;;; +1B167;KATAKANA LETTER SMALL N;Lo;0;L;;;;;N;;;;; +1B170;NUSHU CHARACTER-1B170;Lo;0;L;;;;;N;;;;; +1B171;NUSHU CHARACTER-1B171;Lo;0;L;;;;;N;;;;; +1B172;NUSHU CHARACTER-1B172;Lo;0;L;;;;;N;;;;; +1B173;NUSHU CHARACTER-1B173;Lo;0;L;;;;;N;;;;; +1B174;NUSHU CHARACTER-1B174;Lo;0;L;;;;;N;;;;; +1B175;NUSHU CHARACTER-1B175;Lo;0;L;;;;;N;;;;; +1B176;NUSHU CHARACTER-1B176;Lo;0;L;;;;;N;;;;; +1B177;NUSHU CHARACTER-1B177;Lo;0;L;;;;;N;;;;; +1B178;NUSHU CHARACTER-1B178;Lo;0;L;;;;;N;;;;; +1B179;NUSHU CHARACTER-1B179;Lo;0;L;;;;;N;;;;; +1B17A;NUSHU CHARACTER-1B17A;Lo;0;L;;;;;N;;;;; +1B17B;NUSHU CHARACTER-1B17B;Lo;0;L;;;;;N;;;;; +1B17C;NUSHU CHARACTER-1B17C;Lo;0;L;;;;;N;;;;; +1B17D;NUSHU CHARACTER-1B17D;Lo;0;L;;;;;N;;;;; +1B17E;NUSHU CHARACTER-1B17E;Lo;0;L;;;;;N;;;;; +1B17F;NUSHU CHARACTER-1B17F;Lo;0;L;;;;;N;;;;; +1B180;NUSHU CHARACTER-1B180;Lo;0;L;;;;;N;;;;; +1B181;NUSHU CHARACTER-1B181;Lo;0;L;;;;;N;;;;; +1B182;NUSHU CHARACTER-1B182;Lo;0;L;;;;;N;;;;; +1B183;NUSHU CHARACTER-1B183;Lo;0;L;;;;;N;;;;; +1B184;NUSHU CHARACTER-1B184;Lo;0;L;;;;;N;;;;; +1B185;NUSHU CHARACTER-1B185;Lo;0;L;;;;;N;;;;; +1B186;NUSHU CHARACTER-1B186;Lo;0;L;;;;;N;;;;; +1B187;NUSHU CHARACTER-1B187;Lo;0;L;;;;;N;;;;; +1B188;NUSHU CHARACTER-1B188;Lo;0;L;;;;;N;;;;; +1B189;NUSHU CHARACTER-1B189;Lo;0;L;;;;;N;;;;; +1B18A;NUSHU CHARACTER-1B18A;Lo;0;L;;;;;N;;;;; +1B18B;NUSHU CHARACTER-1B18B;Lo;0;L;;;;;N;;;;; +1B18C;NUSHU CHARACTER-1B18C;Lo;0;L;;;;;N;;;;; +1B18D;NUSHU CHARACTER-1B18D;Lo;0;L;;;;;N;;;;; +1B18E;NUSHU CHARACTER-1B18E;Lo;0;L;;;;;N;;;;; +1B18F;NUSHU CHARACTER-1B18F;Lo;0;L;;;;;N;;;;; +1B190;NUSHU CHARACTER-1B190;Lo;0;L;;;;;N;;;;; +1B191;NUSHU CHARACTER-1B191;Lo;0;L;;;;;N;;;;; +1B192;NUSHU CHARACTER-1B192;Lo;0;L;;;;;N;;;;; +1B193;NUSHU CHARACTER-1B193;Lo;0;L;;;;;N;;;;; +1B194;NUSHU CHARACTER-1B194;Lo;0;L;;;;;N;;;;; +1B195;NUSHU CHARACTER-1B195;Lo;0;L;;;;;N;;;;; +1B196;NUSHU CHARACTER-1B196;Lo;0;L;;;;;N;;;;; +1B197;NUSHU CHARACTER-1B197;Lo;0;L;;;;;N;;;;; +1B198;NUSHU CHARACTER-1B198;Lo;0;L;;;;;N;;;;; +1B199;NUSHU CHARACTER-1B199;Lo;0;L;;;;;N;;;;; +1B19A;NUSHU CHARACTER-1B19A;Lo;0;L;;;;;N;;;;; +1B19B;NUSHU CHARACTER-1B19B;Lo;0;L;;;;;N;;;;; +1B19C;NUSHU CHARACTER-1B19C;Lo;0;L;;;;;N;;;;; +1B19D;NUSHU CHARACTER-1B19D;Lo;0;L;;;;;N;;;;; +1B19E;NUSHU CHARACTER-1B19E;Lo;0;L;;;;;N;;;;; +1B19F;NUSHU CHARACTER-1B19F;Lo;0;L;;;;;N;;;;; +1B1A0;NUSHU CHARACTER-1B1A0;Lo;0;L;;;;;N;;;;; +1B1A1;NUSHU CHARACTER-1B1A1;Lo;0;L;;;;;N;;;;; +1B1A2;NUSHU CHARACTER-1B1A2;Lo;0;L;;;;;N;;;;; +1B1A3;NUSHU CHARACTER-1B1A3;Lo;0;L;;;;;N;;;;; +1B1A4;NUSHU CHARACTER-1B1A4;Lo;0;L;;;;;N;;;;; +1B1A5;NUSHU CHARACTER-1B1A5;Lo;0;L;;;;;N;;;;; +1B1A6;NUSHU CHARACTER-1B1A6;Lo;0;L;;;;;N;;;;; +1B1A7;NUSHU CHARACTER-1B1A7;Lo;0;L;;;;;N;;;;; +1B1A8;NUSHU CHARACTER-1B1A8;Lo;0;L;;;;;N;;;;; +1B1A9;NUSHU CHARACTER-1B1A9;Lo;0;L;;;;;N;;;;; +1B1AA;NUSHU CHARACTER-1B1AA;Lo;0;L;;;;;N;;;;; +1B1AB;NUSHU CHARACTER-1B1AB;Lo;0;L;;;;;N;;;;; +1B1AC;NUSHU CHARACTER-1B1AC;Lo;0;L;;;;;N;;;;; +1B1AD;NUSHU CHARACTER-1B1AD;Lo;0;L;;;;;N;;;;; +1B1AE;NUSHU CHARACTER-1B1AE;Lo;0;L;;;;;N;;;;; +1B1AF;NUSHU CHARACTER-1B1AF;Lo;0;L;;;;;N;;;;; +1B1B0;NUSHU CHARACTER-1B1B0;Lo;0;L;;;;;N;;;;; +1B1B1;NUSHU CHARACTER-1B1B1;Lo;0;L;;;;;N;;;;; +1B1B2;NUSHU CHARACTER-1B1B2;Lo;0;L;;;;;N;;;;; +1B1B3;NUSHU CHARACTER-1B1B3;Lo;0;L;;;;;N;;;;; +1B1B4;NUSHU CHARACTER-1B1B4;Lo;0;L;;;;;N;;;;; +1B1B5;NUSHU CHARACTER-1B1B5;Lo;0;L;;;;;N;;;;; +1B1B6;NUSHU CHARACTER-1B1B6;Lo;0;L;;;;;N;;;;; +1B1B7;NUSHU CHARACTER-1B1B7;Lo;0;L;;;;;N;;;;; +1B1B8;NUSHU CHARACTER-1B1B8;Lo;0;L;;;;;N;;;;; +1B1B9;NUSHU CHARACTER-1B1B9;Lo;0;L;;;;;N;;;;; +1B1BA;NUSHU CHARACTER-1B1BA;Lo;0;L;;;;;N;;;;; +1B1BB;NUSHU CHARACTER-1B1BB;Lo;0;L;;;;;N;;;;; +1B1BC;NUSHU CHARACTER-1B1BC;Lo;0;L;;;;;N;;;;; +1B1BD;NUSHU CHARACTER-1B1BD;Lo;0;L;;;;;N;;;;; +1B1BE;NUSHU CHARACTER-1B1BE;Lo;0;L;;;;;N;;;;; +1B1BF;NUSHU CHARACTER-1B1BF;Lo;0;L;;;;;N;;;;; +1B1C0;NUSHU CHARACTER-1B1C0;Lo;0;L;;;;;N;;;;; +1B1C1;NUSHU CHARACTER-1B1C1;Lo;0;L;;;;;N;;;;; +1B1C2;NUSHU CHARACTER-1B1C2;Lo;0;L;;;;;N;;;;; +1B1C3;NUSHU CHARACTER-1B1C3;Lo;0;L;;;;;N;;;;; +1B1C4;NUSHU CHARACTER-1B1C4;Lo;0;L;;;;;N;;;;; +1B1C5;NUSHU CHARACTER-1B1C5;Lo;0;L;;;;;N;;;;; +1B1C6;NUSHU CHARACTER-1B1C6;Lo;0;L;;;;;N;;;;; +1B1C7;NUSHU CHARACTER-1B1C7;Lo;0;L;;;;;N;;;;; +1B1C8;NUSHU CHARACTER-1B1C8;Lo;0;L;;;;;N;;;;; +1B1C9;NUSHU CHARACTER-1B1C9;Lo;0;L;;;;;N;;;;; +1B1CA;NUSHU CHARACTER-1B1CA;Lo;0;L;;;;;N;;;;; +1B1CB;NUSHU CHARACTER-1B1CB;Lo;0;L;;;;;N;;;;; +1B1CC;NUSHU CHARACTER-1B1CC;Lo;0;L;;;;;N;;;;; +1B1CD;NUSHU CHARACTER-1B1CD;Lo;0;L;;;;;N;;;;; +1B1CE;NUSHU CHARACTER-1B1CE;Lo;0;L;;;;;N;;;;; +1B1CF;NUSHU CHARACTER-1B1CF;Lo;0;L;;;;;N;;;;; +1B1D0;NUSHU CHARACTER-1B1D0;Lo;0;L;;;;;N;;;;; +1B1D1;NUSHU CHARACTER-1B1D1;Lo;0;L;;;;;N;;;;; +1B1D2;NUSHU CHARACTER-1B1D2;Lo;0;L;;;;;N;;;;; +1B1D3;NUSHU CHARACTER-1B1D3;Lo;0;L;;;;;N;;;;; +1B1D4;NUSHU CHARACTER-1B1D4;Lo;0;L;;;;;N;;;;; +1B1D5;NUSHU CHARACTER-1B1D5;Lo;0;L;;;;;N;;;;; +1B1D6;NUSHU CHARACTER-1B1D6;Lo;0;L;;;;;N;;;;; +1B1D7;NUSHU CHARACTER-1B1D7;Lo;0;L;;;;;N;;;;; +1B1D8;NUSHU CHARACTER-1B1D8;Lo;0;L;;;;;N;;;;; +1B1D9;NUSHU CHARACTER-1B1D9;Lo;0;L;;;;;N;;;;; +1B1DA;NUSHU CHARACTER-1B1DA;Lo;0;L;;;;;N;;;;; +1B1DB;NUSHU CHARACTER-1B1DB;Lo;0;L;;;;;N;;;;; +1B1DC;NUSHU CHARACTER-1B1DC;Lo;0;L;;;;;N;;;;; +1B1DD;NUSHU CHARACTER-1B1DD;Lo;0;L;;;;;N;;;;; +1B1DE;NUSHU CHARACTER-1B1DE;Lo;0;L;;;;;N;;;;; +1B1DF;NUSHU CHARACTER-1B1DF;Lo;0;L;;;;;N;;;;; +1B1E0;NUSHU CHARACTER-1B1E0;Lo;0;L;;;;;N;;;;; +1B1E1;NUSHU CHARACTER-1B1E1;Lo;0;L;;;;;N;;;;; +1B1E2;NUSHU CHARACTER-1B1E2;Lo;0;L;;;;;N;;;;; +1B1E3;NUSHU CHARACTER-1B1E3;Lo;0;L;;;;;N;;;;; +1B1E4;NUSHU CHARACTER-1B1E4;Lo;0;L;;;;;N;;;;; +1B1E5;NUSHU CHARACTER-1B1E5;Lo;0;L;;;;;N;;;;; +1B1E6;NUSHU CHARACTER-1B1E6;Lo;0;L;;;;;N;;;;; +1B1E7;NUSHU CHARACTER-1B1E7;Lo;0;L;;;;;N;;;;; +1B1E8;NUSHU CHARACTER-1B1E8;Lo;0;L;;;;;N;;;;; +1B1E9;NUSHU CHARACTER-1B1E9;Lo;0;L;;;;;N;;;;; +1B1EA;NUSHU CHARACTER-1B1EA;Lo;0;L;;;;;N;;;;; +1B1EB;NUSHU CHARACTER-1B1EB;Lo;0;L;;;;;N;;;;; +1B1EC;NUSHU CHARACTER-1B1EC;Lo;0;L;;;;;N;;;;; +1B1ED;NUSHU CHARACTER-1B1ED;Lo;0;L;;;;;N;;;;; +1B1EE;NUSHU CHARACTER-1B1EE;Lo;0;L;;;;;N;;;;; +1B1EF;NUSHU CHARACTER-1B1EF;Lo;0;L;;;;;N;;;;; +1B1F0;NUSHU CHARACTER-1B1F0;Lo;0;L;;;;;N;;;;; +1B1F1;NUSHU CHARACTER-1B1F1;Lo;0;L;;;;;N;;;;; +1B1F2;NUSHU CHARACTER-1B1F2;Lo;0;L;;;;;N;;;;; +1B1F3;NUSHU CHARACTER-1B1F3;Lo;0;L;;;;;N;;;;; +1B1F4;NUSHU CHARACTER-1B1F4;Lo;0;L;;;;;N;;;;; +1B1F5;NUSHU CHARACTER-1B1F5;Lo;0;L;;;;;N;;;;; +1B1F6;NUSHU CHARACTER-1B1F6;Lo;0;L;;;;;N;;;;; +1B1F7;NUSHU CHARACTER-1B1F7;Lo;0;L;;;;;N;;;;; +1B1F8;NUSHU CHARACTER-1B1F8;Lo;0;L;;;;;N;;;;; +1B1F9;NUSHU CHARACTER-1B1F9;Lo;0;L;;;;;N;;;;; +1B1FA;NUSHU CHARACTER-1B1FA;Lo;0;L;;;;;N;;;;; +1B1FB;NUSHU CHARACTER-1B1FB;Lo;0;L;;;;;N;;;;; +1B1FC;NUSHU CHARACTER-1B1FC;Lo;0;L;;;;;N;;;;; +1B1FD;NUSHU CHARACTER-1B1FD;Lo;0;L;;;;;N;;;;; +1B1FE;NUSHU CHARACTER-1B1FE;Lo;0;L;;;;;N;;;;; +1B1FF;NUSHU CHARACTER-1B1FF;Lo;0;L;;;;;N;;;;; +1B200;NUSHU CHARACTER-1B200;Lo;0;L;;;;;N;;;;; +1B201;NUSHU CHARACTER-1B201;Lo;0;L;;;;;N;;;;; +1B202;NUSHU CHARACTER-1B202;Lo;0;L;;;;;N;;;;; +1B203;NUSHU CHARACTER-1B203;Lo;0;L;;;;;N;;;;; +1B204;NUSHU CHARACTER-1B204;Lo;0;L;;;;;N;;;;; +1B205;NUSHU CHARACTER-1B205;Lo;0;L;;;;;N;;;;; +1B206;NUSHU CHARACTER-1B206;Lo;0;L;;;;;N;;;;; +1B207;NUSHU CHARACTER-1B207;Lo;0;L;;;;;N;;;;; +1B208;NUSHU CHARACTER-1B208;Lo;0;L;;;;;N;;;;; +1B209;NUSHU CHARACTER-1B209;Lo;0;L;;;;;N;;;;; +1B20A;NUSHU CHARACTER-1B20A;Lo;0;L;;;;;N;;;;; +1B20B;NUSHU CHARACTER-1B20B;Lo;0;L;;;;;N;;;;; +1B20C;NUSHU CHARACTER-1B20C;Lo;0;L;;;;;N;;;;; +1B20D;NUSHU CHARACTER-1B20D;Lo;0;L;;;;;N;;;;; +1B20E;NUSHU CHARACTER-1B20E;Lo;0;L;;;;;N;;;;; +1B20F;NUSHU CHARACTER-1B20F;Lo;0;L;;;;;N;;;;; +1B210;NUSHU CHARACTER-1B210;Lo;0;L;;;;;N;;;;; +1B211;NUSHU CHARACTER-1B211;Lo;0;L;;;;;N;;;;; +1B212;NUSHU CHARACTER-1B212;Lo;0;L;;;;;N;;;;; +1B213;NUSHU CHARACTER-1B213;Lo;0;L;;;;;N;;;;; +1B214;NUSHU CHARACTER-1B214;Lo;0;L;;;;;N;;;;; +1B215;NUSHU CHARACTER-1B215;Lo;0;L;;;;;N;;;;; +1B216;NUSHU CHARACTER-1B216;Lo;0;L;;;;;N;;;;; +1B217;NUSHU CHARACTER-1B217;Lo;0;L;;;;;N;;;;; +1B218;NUSHU CHARACTER-1B218;Lo;0;L;;;;;N;;;;; +1B219;NUSHU CHARACTER-1B219;Lo;0;L;;;;;N;;;;; +1B21A;NUSHU CHARACTER-1B21A;Lo;0;L;;;;;N;;;;; +1B21B;NUSHU CHARACTER-1B21B;Lo;0;L;;;;;N;;;;; +1B21C;NUSHU CHARACTER-1B21C;Lo;0;L;;;;;N;;;;; +1B21D;NUSHU CHARACTER-1B21D;Lo;0;L;;;;;N;;;;; +1B21E;NUSHU CHARACTER-1B21E;Lo;0;L;;;;;N;;;;; +1B21F;NUSHU CHARACTER-1B21F;Lo;0;L;;;;;N;;;;; +1B220;NUSHU CHARACTER-1B220;Lo;0;L;;;;;N;;;;; +1B221;NUSHU CHARACTER-1B221;Lo;0;L;;;;;N;;;;; +1B222;NUSHU CHARACTER-1B222;Lo;0;L;;;;;N;;;;; +1B223;NUSHU CHARACTER-1B223;Lo;0;L;;;;;N;;;;; +1B224;NUSHU CHARACTER-1B224;Lo;0;L;;;;;N;;;;; +1B225;NUSHU CHARACTER-1B225;Lo;0;L;;;;;N;;;;; +1B226;NUSHU CHARACTER-1B226;Lo;0;L;;;;;N;;;;; +1B227;NUSHU CHARACTER-1B227;Lo;0;L;;;;;N;;;;; +1B228;NUSHU CHARACTER-1B228;Lo;0;L;;;;;N;;;;; +1B229;NUSHU CHARACTER-1B229;Lo;0;L;;;;;N;;;;; +1B22A;NUSHU CHARACTER-1B22A;Lo;0;L;;;;;N;;;;; +1B22B;NUSHU CHARACTER-1B22B;Lo;0;L;;;;;N;;;;; +1B22C;NUSHU CHARACTER-1B22C;Lo;0;L;;;;;N;;;;; +1B22D;NUSHU CHARACTER-1B22D;Lo;0;L;;;;;N;;;;; +1B22E;NUSHU CHARACTER-1B22E;Lo;0;L;;;;;N;;;;; +1B22F;NUSHU CHARACTER-1B22F;Lo;0;L;;;;;N;;;;; +1B230;NUSHU CHARACTER-1B230;Lo;0;L;;;;;N;;;;; +1B231;NUSHU CHARACTER-1B231;Lo;0;L;;;;;N;;;;; +1B232;NUSHU CHARACTER-1B232;Lo;0;L;;;;;N;;;;; +1B233;NUSHU CHARACTER-1B233;Lo;0;L;;;;;N;;;;; +1B234;NUSHU CHARACTER-1B234;Lo;0;L;;;;;N;;;;; +1B235;NUSHU CHARACTER-1B235;Lo;0;L;;;;;N;;;;; +1B236;NUSHU CHARACTER-1B236;Lo;0;L;;;;;N;;;;; +1B237;NUSHU CHARACTER-1B237;Lo;0;L;;;;;N;;;;; +1B238;NUSHU CHARACTER-1B238;Lo;0;L;;;;;N;;;;; +1B239;NUSHU CHARACTER-1B239;Lo;0;L;;;;;N;;;;; +1B23A;NUSHU CHARACTER-1B23A;Lo;0;L;;;;;N;;;;; +1B23B;NUSHU CHARACTER-1B23B;Lo;0;L;;;;;N;;;;; +1B23C;NUSHU CHARACTER-1B23C;Lo;0;L;;;;;N;;;;; +1B23D;NUSHU CHARACTER-1B23D;Lo;0;L;;;;;N;;;;; +1B23E;NUSHU CHARACTER-1B23E;Lo;0;L;;;;;N;;;;; +1B23F;NUSHU CHARACTER-1B23F;Lo;0;L;;;;;N;;;;; +1B240;NUSHU CHARACTER-1B240;Lo;0;L;;;;;N;;;;; +1B241;NUSHU CHARACTER-1B241;Lo;0;L;;;;;N;;;;; +1B242;NUSHU CHARACTER-1B242;Lo;0;L;;;;;N;;;;; +1B243;NUSHU CHARACTER-1B243;Lo;0;L;;;;;N;;;;; +1B244;NUSHU CHARACTER-1B244;Lo;0;L;;;;;N;;;;; +1B245;NUSHU CHARACTER-1B245;Lo;0;L;;;;;N;;;;; +1B246;NUSHU CHARACTER-1B246;Lo;0;L;;;;;N;;;;; +1B247;NUSHU CHARACTER-1B247;Lo;0;L;;;;;N;;;;; +1B248;NUSHU CHARACTER-1B248;Lo;0;L;;;;;N;;;;; +1B249;NUSHU CHARACTER-1B249;Lo;0;L;;;;;N;;;;; +1B24A;NUSHU CHARACTER-1B24A;Lo;0;L;;;;;N;;;;; +1B24B;NUSHU CHARACTER-1B24B;Lo;0;L;;;;;N;;;;; +1B24C;NUSHU CHARACTER-1B24C;Lo;0;L;;;;;N;;;;; +1B24D;NUSHU CHARACTER-1B24D;Lo;0;L;;;;;N;;;;; +1B24E;NUSHU CHARACTER-1B24E;Lo;0;L;;;;;N;;;;; +1B24F;NUSHU CHARACTER-1B24F;Lo;0;L;;;;;N;;;;; +1B250;NUSHU CHARACTER-1B250;Lo;0;L;;;;;N;;;;; +1B251;NUSHU CHARACTER-1B251;Lo;0;L;;;;;N;;;;; +1B252;NUSHU CHARACTER-1B252;Lo;0;L;;;;;N;;;;; +1B253;NUSHU CHARACTER-1B253;Lo;0;L;;;;;N;;;;; +1B254;NUSHU CHARACTER-1B254;Lo;0;L;;;;;N;;;;; +1B255;NUSHU CHARACTER-1B255;Lo;0;L;;;;;N;;;;; +1B256;NUSHU CHARACTER-1B256;Lo;0;L;;;;;N;;;;; +1B257;NUSHU CHARACTER-1B257;Lo;0;L;;;;;N;;;;; +1B258;NUSHU CHARACTER-1B258;Lo;0;L;;;;;N;;;;; +1B259;NUSHU CHARACTER-1B259;Lo;0;L;;;;;N;;;;; +1B25A;NUSHU CHARACTER-1B25A;Lo;0;L;;;;;N;;;;; +1B25B;NUSHU CHARACTER-1B25B;Lo;0;L;;;;;N;;;;; +1B25C;NUSHU CHARACTER-1B25C;Lo;0;L;;;;;N;;;;; +1B25D;NUSHU CHARACTER-1B25D;Lo;0;L;;;;;N;;;;; +1B25E;NUSHU CHARACTER-1B25E;Lo;0;L;;;;;N;;;;; +1B25F;NUSHU CHARACTER-1B25F;Lo;0;L;;;;;N;;;;; +1B260;NUSHU CHARACTER-1B260;Lo;0;L;;;;;N;;;;; +1B261;NUSHU CHARACTER-1B261;Lo;0;L;;;;;N;;;;; +1B262;NUSHU CHARACTER-1B262;Lo;0;L;;;;;N;;;;; +1B263;NUSHU CHARACTER-1B263;Lo;0;L;;;;;N;;;;; +1B264;NUSHU CHARACTER-1B264;Lo;0;L;;;;;N;;;;; +1B265;NUSHU CHARACTER-1B265;Lo;0;L;;;;;N;;;;; +1B266;NUSHU CHARACTER-1B266;Lo;0;L;;;;;N;;;;; +1B267;NUSHU CHARACTER-1B267;Lo;0;L;;;;;N;;;;; +1B268;NUSHU CHARACTER-1B268;Lo;0;L;;;;;N;;;;; +1B269;NUSHU CHARACTER-1B269;Lo;0;L;;;;;N;;;;; +1B26A;NUSHU CHARACTER-1B26A;Lo;0;L;;;;;N;;;;; +1B26B;NUSHU CHARACTER-1B26B;Lo;0;L;;;;;N;;;;; +1B26C;NUSHU CHARACTER-1B26C;Lo;0;L;;;;;N;;;;; +1B26D;NUSHU CHARACTER-1B26D;Lo;0;L;;;;;N;;;;; +1B26E;NUSHU CHARACTER-1B26E;Lo;0;L;;;;;N;;;;; +1B26F;NUSHU CHARACTER-1B26F;Lo;0;L;;;;;N;;;;; +1B270;NUSHU CHARACTER-1B270;Lo;0;L;;;;;N;;;;; +1B271;NUSHU CHARACTER-1B271;Lo;0;L;;;;;N;;;;; +1B272;NUSHU CHARACTER-1B272;Lo;0;L;;;;;N;;;;; +1B273;NUSHU CHARACTER-1B273;Lo;0;L;;;;;N;;;;; +1B274;NUSHU CHARACTER-1B274;Lo;0;L;;;;;N;;;;; +1B275;NUSHU CHARACTER-1B275;Lo;0;L;;;;;N;;;;; +1B276;NUSHU CHARACTER-1B276;Lo;0;L;;;;;N;;;;; +1B277;NUSHU CHARACTER-1B277;Lo;0;L;;;;;N;;;;; +1B278;NUSHU CHARACTER-1B278;Lo;0;L;;;;;N;;;;; +1B279;NUSHU CHARACTER-1B279;Lo;0;L;;;;;N;;;;; +1B27A;NUSHU CHARACTER-1B27A;Lo;0;L;;;;;N;;;;; +1B27B;NUSHU CHARACTER-1B27B;Lo;0;L;;;;;N;;;;; +1B27C;NUSHU CHARACTER-1B27C;Lo;0;L;;;;;N;;;;; +1B27D;NUSHU CHARACTER-1B27D;Lo;0;L;;;;;N;;;;; +1B27E;NUSHU CHARACTER-1B27E;Lo;0;L;;;;;N;;;;; +1B27F;NUSHU CHARACTER-1B27F;Lo;0;L;;;;;N;;;;; +1B280;NUSHU CHARACTER-1B280;Lo;0;L;;;;;N;;;;; +1B281;NUSHU CHARACTER-1B281;Lo;0;L;;;;;N;;;;; +1B282;NUSHU CHARACTER-1B282;Lo;0;L;;;;;N;;;;; +1B283;NUSHU CHARACTER-1B283;Lo;0;L;;;;;N;;;;; +1B284;NUSHU CHARACTER-1B284;Lo;0;L;;;;;N;;;;; +1B285;NUSHU CHARACTER-1B285;Lo;0;L;;;;;N;;;;; +1B286;NUSHU CHARACTER-1B286;Lo;0;L;;;;;N;;;;; +1B287;NUSHU CHARACTER-1B287;Lo;0;L;;;;;N;;;;; +1B288;NUSHU CHARACTER-1B288;Lo;0;L;;;;;N;;;;; +1B289;NUSHU CHARACTER-1B289;Lo;0;L;;;;;N;;;;; +1B28A;NUSHU CHARACTER-1B28A;Lo;0;L;;;;;N;;;;; +1B28B;NUSHU CHARACTER-1B28B;Lo;0;L;;;;;N;;;;; +1B28C;NUSHU CHARACTER-1B28C;Lo;0;L;;;;;N;;;;; +1B28D;NUSHU CHARACTER-1B28D;Lo;0;L;;;;;N;;;;; +1B28E;NUSHU CHARACTER-1B28E;Lo;0;L;;;;;N;;;;; +1B28F;NUSHU CHARACTER-1B28F;Lo;0;L;;;;;N;;;;; +1B290;NUSHU CHARACTER-1B290;Lo;0;L;;;;;N;;;;; +1B291;NUSHU CHARACTER-1B291;Lo;0;L;;;;;N;;;;; +1B292;NUSHU CHARACTER-1B292;Lo;0;L;;;;;N;;;;; +1B293;NUSHU CHARACTER-1B293;Lo;0;L;;;;;N;;;;; +1B294;NUSHU CHARACTER-1B294;Lo;0;L;;;;;N;;;;; +1B295;NUSHU CHARACTER-1B295;Lo;0;L;;;;;N;;;;; +1B296;NUSHU CHARACTER-1B296;Lo;0;L;;;;;N;;;;; +1B297;NUSHU CHARACTER-1B297;Lo;0;L;;;;;N;;;;; +1B298;NUSHU CHARACTER-1B298;Lo;0;L;;;;;N;;;;; +1B299;NUSHU CHARACTER-1B299;Lo;0;L;;;;;N;;;;; +1B29A;NUSHU CHARACTER-1B29A;Lo;0;L;;;;;N;;;;; +1B29B;NUSHU CHARACTER-1B29B;Lo;0;L;;;;;N;;;;; +1B29C;NUSHU CHARACTER-1B29C;Lo;0;L;;;;;N;;;;; +1B29D;NUSHU CHARACTER-1B29D;Lo;0;L;;;;;N;;;;; +1B29E;NUSHU CHARACTER-1B29E;Lo;0;L;;;;;N;;;;; +1B29F;NUSHU CHARACTER-1B29F;Lo;0;L;;;;;N;;;;; +1B2A0;NUSHU CHARACTER-1B2A0;Lo;0;L;;;;;N;;;;; +1B2A1;NUSHU CHARACTER-1B2A1;Lo;0;L;;;;;N;;;;; +1B2A2;NUSHU CHARACTER-1B2A2;Lo;0;L;;;;;N;;;;; +1B2A3;NUSHU CHARACTER-1B2A3;Lo;0;L;;;;;N;;;;; +1B2A4;NUSHU CHARACTER-1B2A4;Lo;0;L;;;;;N;;;;; +1B2A5;NUSHU CHARACTER-1B2A5;Lo;0;L;;;;;N;;;;; +1B2A6;NUSHU CHARACTER-1B2A6;Lo;0;L;;;;;N;;;;; +1B2A7;NUSHU CHARACTER-1B2A7;Lo;0;L;;;;;N;;;;; +1B2A8;NUSHU CHARACTER-1B2A8;Lo;0;L;;;;;N;;;;; +1B2A9;NUSHU CHARACTER-1B2A9;Lo;0;L;;;;;N;;;;; +1B2AA;NUSHU CHARACTER-1B2AA;Lo;0;L;;;;;N;;;;; +1B2AB;NUSHU CHARACTER-1B2AB;Lo;0;L;;;;;N;;;;; +1B2AC;NUSHU CHARACTER-1B2AC;Lo;0;L;;;;;N;;;;; +1B2AD;NUSHU CHARACTER-1B2AD;Lo;0;L;;;;;N;;;;; +1B2AE;NUSHU CHARACTER-1B2AE;Lo;0;L;;;;;N;;;;; +1B2AF;NUSHU CHARACTER-1B2AF;Lo;0;L;;;;;N;;;;; +1B2B0;NUSHU CHARACTER-1B2B0;Lo;0;L;;;;;N;;;;; +1B2B1;NUSHU CHARACTER-1B2B1;Lo;0;L;;;;;N;;;;; +1B2B2;NUSHU CHARACTER-1B2B2;Lo;0;L;;;;;N;;;;; +1B2B3;NUSHU CHARACTER-1B2B3;Lo;0;L;;;;;N;;;;; +1B2B4;NUSHU CHARACTER-1B2B4;Lo;0;L;;;;;N;;;;; +1B2B5;NUSHU CHARACTER-1B2B5;Lo;0;L;;;;;N;;;;; +1B2B6;NUSHU CHARACTER-1B2B6;Lo;0;L;;;;;N;;;;; +1B2B7;NUSHU CHARACTER-1B2B7;Lo;0;L;;;;;N;;;;; +1B2B8;NUSHU CHARACTER-1B2B8;Lo;0;L;;;;;N;;;;; +1B2B9;NUSHU CHARACTER-1B2B9;Lo;0;L;;;;;N;;;;; +1B2BA;NUSHU CHARACTER-1B2BA;Lo;0;L;;;;;N;;;;; +1B2BB;NUSHU CHARACTER-1B2BB;Lo;0;L;;;;;N;;;;; +1B2BC;NUSHU CHARACTER-1B2BC;Lo;0;L;;;;;N;;;;; +1B2BD;NUSHU CHARACTER-1B2BD;Lo;0;L;;;;;N;;;;; +1B2BE;NUSHU CHARACTER-1B2BE;Lo;0;L;;;;;N;;;;; +1B2BF;NUSHU CHARACTER-1B2BF;Lo;0;L;;;;;N;;;;; +1B2C0;NUSHU CHARACTER-1B2C0;Lo;0;L;;;;;N;;;;; +1B2C1;NUSHU CHARACTER-1B2C1;Lo;0;L;;;;;N;;;;; +1B2C2;NUSHU CHARACTER-1B2C2;Lo;0;L;;;;;N;;;;; +1B2C3;NUSHU CHARACTER-1B2C3;Lo;0;L;;;;;N;;;;; +1B2C4;NUSHU CHARACTER-1B2C4;Lo;0;L;;;;;N;;;;; +1B2C5;NUSHU CHARACTER-1B2C5;Lo;0;L;;;;;N;;;;; +1B2C6;NUSHU CHARACTER-1B2C6;Lo;0;L;;;;;N;;;;; +1B2C7;NUSHU CHARACTER-1B2C7;Lo;0;L;;;;;N;;;;; +1B2C8;NUSHU CHARACTER-1B2C8;Lo;0;L;;;;;N;;;;; +1B2C9;NUSHU CHARACTER-1B2C9;Lo;0;L;;;;;N;;;;; +1B2CA;NUSHU CHARACTER-1B2CA;Lo;0;L;;;;;N;;;;; +1B2CB;NUSHU CHARACTER-1B2CB;Lo;0;L;;;;;N;;;;; +1B2CC;NUSHU CHARACTER-1B2CC;Lo;0;L;;;;;N;;;;; +1B2CD;NUSHU CHARACTER-1B2CD;Lo;0;L;;;;;N;;;;; +1B2CE;NUSHU CHARACTER-1B2CE;Lo;0;L;;;;;N;;;;; +1B2CF;NUSHU CHARACTER-1B2CF;Lo;0;L;;;;;N;;;;; +1B2D0;NUSHU CHARACTER-1B2D0;Lo;0;L;;;;;N;;;;; +1B2D1;NUSHU CHARACTER-1B2D1;Lo;0;L;;;;;N;;;;; +1B2D2;NUSHU CHARACTER-1B2D2;Lo;0;L;;;;;N;;;;; +1B2D3;NUSHU CHARACTER-1B2D3;Lo;0;L;;;;;N;;;;; +1B2D4;NUSHU CHARACTER-1B2D4;Lo;0;L;;;;;N;;;;; +1B2D5;NUSHU CHARACTER-1B2D5;Lo;0;L;;;;;N;;;;; +1B2D6;NUSHU CHARACTER-1B2D6;Lo;0;L;;;;;N;;;;; +1B2D7;NUSHU CHARACTER-1B2D7;Lo;0;L;;;;;N;;;;; +1B2D8;NUSHU CHARACTER-1B2D8;Lo;0;L;;;;;N;;;;; +1B2D9;NUSHU CHARACTER-1B2D9;Lo;0;L;;;;;N;;;;; +1B2DA;NUSHU CHARACTER-1B2DA;Lo;0;L;;;;;N;;;;; +1B2DB;NUSHU CHARACTER-1B2DB;Lo;0;L;;;;;N;;;;; +1B2DC;NUSHU CHARACTER-1B2DC;Lo;0;L;;;;;N;;;;; +1B2DD;NUSHU CHARACTER-1B2DD;Lo;0;L;;;;;N;;;;; +1B2DE;NUSHU CHARACTER-1B2DE;Lo;0;L;;;;;N;;;;; +1B2DF;NUSHU CHARACTER-1B2DF;Lo;0;L;;;;;N;;;;; +1B2E0;NUSHU CHARACTER-1B2E0;Lo;0;L;;;;;N;;;;; +1B2E1;NUSHU CHARACTER-1B2E1;Lo;0;L;;;;;N;;;;; +1B2E2;NUSHU CHARACTER-1B2E2;Lo;0;L;;;;;N;;;;; +1B2E3;NUSHU CHARACTER-1B2E3;Lo;0;L;;;;;N;;;;; +1B2E4;NUSHU CHARACTER-1B2E4;Lo;0;L;;;;;N;;;;; +1B2E5;NUSHU CHARACTER-1B2E5;Lo;0;L;;;;;N;;;;; +1B2E6;NUSHU CHARACTER-1B2E6;Lo;0;L;;;;;N;;;;; +1B2E7;NUSHU CHARACTER-1B2E7;Lo;0;L;;;;;N;;;;; +1B2E8;NUSHU CHARACTER-1B2E8;Lo;0;L;;;;;N;;;;; +1B2E9;NUSHU CHARACTER-1B2E9;Lo;0;L;;;;;N;;;;; +1B2EA;NUSHU CHARACTER-1B2EA;Lo;0;L;;;;;N;;;;; +1B2EB;NUSHU CHARACTER-1B2EB;Lo;0;L;;;;;N;;;;; +1B2EC;NUSHU CHARACTER-1B2EC;Lo;0;L;;;;;N;;;;; +1B2ED;NUSHU CHARACTER-1B2ED;Lo;0;L;;;;;N;;;;; +1B2EE;NUSHU CHARACTER-1B2EE;Lo;0;L;;;;;N;;;;; +1B2EF;NUSHU CHARACTER-1B2EF;Lo;0;L;;;;;N;;;;; +1B2F0;NUSHU CHARACTER-1B2F0;Lo;0;L;;;;;N;;;;; +1B2F1;NUSHU CHARACTER-1B2F1;Lo;0;L;;;;;N;;;;; +1B2F2;NUSHU CHARACTER-1B2F2;Lo;0;L;;;;;N;;;;; +1B2F3;NUSHU CHARACTER-1B2F3;Lo;0;L;;;;;N;;;;; +1B2F4;NUSHU CHARACTER-1B2F4;Lo;0;L;;;;;N;;;;; +1B2F5;NUSHU CHARACTER-1B2F5;Lo;0;L;;;;;N;;;;; +1B2F6;NUSHU CHARACTER-1B2F6;Lo;0;L;;;;;N;;;;; +1B2F7;NUSHU CHARACTER-1B2F7;Lo;0;L;;;;;N;;;;; +1B2F8;NUSHU CHARACTER-1B2F8;Lo;0;L;;;;;N;;;;; +1B2F9;NUSHU CHARACTER-1B2F9;Lo;0;L;;;;;N;;;;; +1B2FA;NUSHU CHARACTER-1B2FA;Lo;0;L;;;;;N;;;;; +1B2FB;NUSHU CHARACTER-1B2FB;Lo;0;L;;;;;N;;;;; +1BC00;DUPLOYAN LETTER H;Lo;0;L;;;;;N;;;;; +1BC01;DUPLOYAN LETTER X;Lo;0;L;;;;;N;;;;; +1BC02;DUPLOYAN LETTER P;Lo;0;L;;;;;N;;;;; +1BC03;DUPLOYAN LETTER T;Lo;0;L;;;;;N;;;;; +1BC04;DUPLOYAN LETTER F;Lo;0;L;;;;;N;;;;; +1BC05;DUPLOYAN LETTER K;Lo;0;L;;;;;N;;;;; +1BC06;DUPLOYAN LETTER L;Lo;0;L;;;;;N;;;;; +1BC07;DUPLOYAN LETTER B;Lo;0;L;;;;;N;;;;; +1BC08;DUPLOYAN LETTER D;Lo;0;L;;;;;N;;;;; +1BC09;DUPLOYAN LETTER V;Lo;0;L;;;;;N;;;;; +1BC0A;DUPLOYAN LETTER G;Lo;0;L;;;;;N;;;;; +1BC0B;DUPLOYAN LETTER R;Lo;0;L;;;;;N;;;;; +1BC0C;DUPLOYAN LETTER P N;Lo;0;L;;;;;N;;;;; +1BC0D;DUPLOYAN LETTER D S;Lo;0;L;;;;;N;;;;; +1BC0E;DUPLOYAN LETTER F N;Lo;0;L;;;;;N;;;;; +1BC0F;DUPLOYAN LETTER K M;Lo;0;L;;;;;N;;;;; +1BC10;DUPLOYAN LETTER R S;Lo;0;L;;;;;N;;;;; +1BC11;DUPLOYAN LETTER TH;Lo;0;L;;;;;N;;;;; +1BC12;DUPLOYAN LETTER SLOAN DH;Lo;0;L;;;;;N;;;;; +1BC13;DUPLOYAN LETTER DH;Lo;0;L;;;;;N;;;;; +1BC14;DUPLOYAN LETTER KK;Lo;0;L;;;;;N;;;;; +1BC15;DUPLOYAN LETTER SLOAN J;Lo;0;L;;;;;N;;;;; +1BC16;DUPLOYAN LETTER HL;Lo;0;L;;;;;N;;;;; +1BC17;DUPLOYAN LETTER LH;Lo;0;L;;;;;N;;;;; +1BC18;DUPLOYAN LETTER RH;Lo;0;L;;;;;N;;;;; +1BC19;DUPLOYAN LETTER M;Lo;0;L;;;;;N;;;;; +1BC1A;DUPLOYAN LETTER N;Lo;0;L;;;;;N;;;;; +1BC1B;DUPLOYAN LETTER J;Lo;0;L;;;;;N;;;;; +1BC1C;DUPLOYAN LETTER S;Lo;0;L;;;;;N;;;;; +1BC1D;DUPLOYAN LETTER M N;Lo;0;L;;;;;N;;;;; +1BC1E;DUPLOYAN LETTER N M;Lo;0;L;;;;;N;;;;; +1BC1F;DUPLOYAN LETTER J M;Lo;0;L;;;;;N;;;;; +1BC20;DUPLOYAN LETTER S J;Lo;0;L;;;;;N;;;;; +1BC21;DUPLOYAN LETTER M WITH DOT;Lo;0;L;;;;;N;;;;; +1BC22;DUPLOYAN LETTER N WITH DOT;Lo;0;L;;;;;N;;;;; +1BC23;DUPLOYAN LETTER J WITH DOT;Lo;0;L;;;;;N;;;;; +1BC24;DUPLOYAN LETTER J WITH DOTS INSIDE AND ABOVE;Lo;0;L;;;;;N;;;;; +1BC25;DUPLOYAN LETTER S WITH DOT;Lo;0;L;;;;;N;;;;; +1BC26;DUPLOYAN LETTER S WITH DOT BELOW;Lo;0;L;;;;;N;;;;; +1BC27;DUPLOYAN LETTER M S;Lo;0;L;;;;;N;;;;; +1BC28;DUPLOYAN LETTER N S;Lo;0;L;;;;;N;;;;; +1BC29;DUPLOYAN LETTER J S;Lo;0;L;;;;;N;;;;; +1BC2A;DUPLOYAN LETTER S S;Lo;0;L;;;;;N;;;;; +1BC2B;DUPLOYAN LETTER M N S;Lo;0;L;;;;;N;;;;; +1BC2C;DUPLOYAN LETTER N M S;Lo;0;L;;;;;N;;;;; +1BC2D;DUPLOYAN LETTER J M S;Lo;0;L;;;;;N;;;;; +1BC2E;DUPLOYAN LETTER S J S;Lo;0;L;;;;;N;;;;; +1BC2F;DUPLOYAN LETTER J S WITH DOT;Lo;0;L;;;;;N;;;;; +1BC30;DUPLOYAN LETTER J N;Lo;0;L;;;;;N;;;;; +1BC31;DUPLOYAN LETTER J N S;Lo;0;L;;;;;N;;;;; +1BC32;DUPLOYAN LETTER S T;Lo;0;L;;;;;N;;;;; +1BC33;DUPLOYAN LETTER S T R;Lo;0;L;;;;;N;;;;; +1BC34;DUPLOYAN LETTER S P;Lo;0;L;;;;;N;;;;; +1BC35;DUPLOYAN LETTER S P R;Lo;0;L;;;;;N;;;;; +1BC36;DUPLOYAN LETTER T S;Lo;0;L;;;;;N;;;;; +1BC37;DUPLOYAN LETTER T R S;Lo;0;L;;;;;N;;;;; +1BC38;DUPLOYAN LETTER W;Lo;0;L;;;;;N;;;;; +1BC39;DUPLOYAN LETTER WH;Lo;0;L;;;;;N;;;;; +1BC3A;DUPLOYAN LETTER W R;Lo;0;L;;;;;N;;;;; +1BC3B;DUPLOYAN LETTER S N;Lo;0;L;;;;;N;;;;; +1BC3C;DUPLOYAN LETTER S M;Lo;0;L;;;;;N;;;;; +1BC3D;DUPLOYAN LETTER K R S;Lo;0;L;;;;;N;;;;; +1BC3E;DUPLOYAN LETTER G R S;Lo;0;L;;;;;N;;;;; +1BC3F;DUPLOYAN LETTER S K;Lo;0;L;;;;;N;;;;; +1BC40;DUPLOYAN LETTER S K R;Lo;0;L;;;;;N;;;;; +1BC41;DUPLOYAN LETTER A;Lo;0;L;;;;;N;;;;; +1BC42;DUPLOYAN LETTER SLOAN OW;Lo;0;L;;;;;N;;;;; +1BC43;DUPLOYAN LETTER OA;Lo;0;L;;;;;N;;;;; +1BC44;DUPLOYAN LETTER O;Lo;0;L;;;;;N;;;;; +1BC45;DUPLOYAN LETTER AOU;Lo;0;L;;;;;N;;;;; +1BC46;DUPLOYAN LETTER I;Lo;0;L;;;;;N;;;;; +1BC47;DUPLOYAN LETTER E;Lo;0;L;;;;;N;;;;; +1BC48;DUPLOYAN LETTER IE;Lo;0;L;;;;;N;;;;; +1BC49;DUPLOYAN LETTER SHORT I;Lo;0;L;;;;;N;;;;; +1BC4A;DUPLOYAN LETTER UI;Lo;0;L;;;;;N;;;;; +1BC4B;DUPLOYAN LETTER EE;Lo;0;L;;;;;N;;;;; +1BC4C;DUPLOYAN LETTER SLOAN EH;Lo;0;L;;;;;N;;;;; +1BC4D;DUPLOYAN LETTER ROMANIAN I;Lo;0;L;;;;;N;;;;; +1BC4E;DUPLOYAN LETTER SLOAN EE;Lo;0;L;;;;;N;;;;; +1BC4F;DUPLOYAN LETTER LONG I;Lo;0;L;;;;;N;;;;; +1BC50;DUPLOYAN LETTER YE;Lo;0;L;;;;;N;;;;; +1BC51;DUPLOYAN LETTER U;Lo;0;L;;;;;N;;;;; +1BC52;DUPLOYAN LETTER EU;Lo;0;L;;;;;N;;;;; +1BC53;DUPLOYAN LETTER XW;Lo;0;L;;;;;N;;;;; +1BC54;DUPLOYAN LETTER U N;Lo;0;L;;;;;N;;;;; +1BC55;DUPLOYAN LETTER LONG U;Lo;0;L;;;;;N;;;;; +1BC56;DUPLOYAN LETTER ROMANIAN U;Lo;0;L;;;;;N;;;;; +1BC57;DUPLOYAN LETTER UH;Lo;0;L;;;;;N;;;;; +1BC58;DUPLOYAN LETTER SLOAN U;Lo;0;L;;;;;N;;;;; +1BC59;DUPLOYAN LETTER OOH;Lo;0;L;;;;;N;;;;; +1BC5A;DUPLOYAN LETTER OW;Lo;0;L;;;;;N;;;;; +1BC5B;DUPLOYAN LETTER OU;Lo;0;L;;;;;N;;;;; +1BC5C;DUPLOYAN LETTER WA;Lo;0;L;;;;;N;;;;; +1BC5D;DUPLOYAN LETTER WO;Lo;0;L;;;;;N;;;;; +1BC5E;DUPLOYAN LETTER WI;Lo;0;L;;;;;N;;;;; +1BC5F;DUPLOYAN LETTER WEI;Lo;0;L;;;;;N;;;;; +1BC60;DUPLOYAN LETTER WOW;Lo;0;L;;;;;N;;;;; +1BC61;DUPLOYAN LETTER NASAL U;Lo;0;L;;;;;N;;;;; +1BC62;DUPLOYAN LETTER NASAL O;Lo;0;L;;;;;N;;;;; +1BC63;DUPLOYAN LETTER NASAL I;Lo;0;L;;;;;N;;;;; +1BC64;DUPLOYAN LETTER NASAL A;Lo;0;L;;;;;N;;;;; +1BC65;DUPLOYAN LETTER PERNIN AN;Lo;0;L;;;;;N;;;;; +1BC66;DUPLOYAN LETTER PERNIN AM;Lo;0;L;;;;;N;;;;; +1BC67;DUPLOYAN LETTER SLOAN EN;Lo;0;L;;;;;N;;;;; +1BC68;DUPLOYAN LETTER SLOAN AN;Lo;0;L;;;;;N;;;;; +1BC69;DUPLOYAN LETTER SLOAN ON;Lo;0;L;;;;;N;;;;; +1BC6A;DUPLOYAN LETTER VOCALIC M;Lo;0;L;;;;;N;;;;; +1BC70;DUPLOYAN AFFIX LEFT HORIZONTAL SECANT;Lo;0;L;;;;;N;;;;; +1BC71;DUPLOYAN AFFIX MID HORIZONTAL SECANT;Lo;0;L;;;;;N;;;;; +1BC72;DUPLOYAN AFFIX RIGHT HORIZONTAL SECANT;Lo;0;L;;;;;N;;;;; +1BC73;DUPLOYAN AFFIX LOW VERTICAL SECANT;Lo;0;L;;;;;N;;;;; +1BC74;DUPLOYAN AFFIX MID VERTICAL SECANT;Lo;0;L;;;;;N;;;;; +1BC75;DUPLOYAN AFFIX HIGH VERTICAL SECANT;Lo;0;L;;;;;N;;;;; +1BC76;DUPLOYAN AFFIX ATTACHED SECANT;Lo;0;L;;;;;N;;;;; +1BC77;DUPLOYAN AFFIX ATTACHED LEFT-TO-RIGHT SECANT;Lo;0;L;;;;;N;;;;; +1BC78;DUPLOYAN AFFIX ATTACHED TANGENT;Lo;0;L;;;;;N;;;;; +1BC79;DUPLOYAN AFFIX ATTACHED TAIL;Lo;0;L;;;;;N;;;;; +1BC7A;DUPLOYAN AFFIX ATTACHED E HOOK;Lo;0;L;;;;;N;;;;; +1BC7B;DUPLOYAN AFFIX ATTACHED I HOOK;Lo;0;L;;;;;N;;;;; +1BC7C;DUPLOYAN AFFIX ATTACHED TANGENT HOOK;Lo;0;L;;;;;N;;;;; +1BC80;DUPLOYAN AFFIX HIGH ACUTE;Lo;0;L;;;;;N;;;;; +1BC81;DUPLOYAN AFFIX HIGH TIGHT ACUTE;Lo;0;L;;;;;N;;;;; +1BC82;DUPLOYAN AFFIX HIGH GRAVE;Lo;0;L;;;;;N;;;;; +1BC83;DUPLOYAN AFFIX HIGH LONG GRAVE;Lo;0;L;;;;;N;;;;; +1BC84;DUPLOYAN AFFIX HIGH DOT;Lo;0;L;;;;;N;;;;; +1BC85;DUPLOYAN AFFIX HIGH CIRCLE;Lo;0;L;;;;;N;;;;; +1BC86;DUPLOYAN AFFIX HIGH LINE;Lo;0;L;;;;;N;;;;; +1BC87;DUPLOYAN AFFIX HIGH WAVE;Lo;0;L;;;;;N;;;;; +1BC88;DUPLOYAN AFFIX HIGH VERTICAL;Lo;0;L;;;;;N;;;;; +1BC90;DUPLOYAN AFFIX LOW ACUTE;Lo;0;L;;;;;N;;;;; +1BC91;DUPLOYAN AFFIX LOW TIGHT ACUTE;Lo;0;L;;;;;N;;;;; +1BC92;DUPLOYAN AFFIX LOW GRAVE;Lo;0;L;;;;;N;;;;; +1BC93;DUPLOYAN AFFIX LOW LONG GRAVE;Lo;0;L;;;;;N;;;;; +1BC94;DUPLOYAN AFFIX LOW DOT;Lo;0;L;;;;;N;;;;; +1BC95;DUPLOYAN AFFIX LOW CIRCLE;Lo;0;L;;;;;N;;;;; +1BC96;DUPLOYAN AFFIX LOW LINE;Lo;0;L;;;;;N;;;;; +1BC97;DUPLOYAN AFFIX LOW WAVE;Lo;0;L;;;;;N;;;;; +1BC98;DUPLOYAN AFFIX LOW VERTICAL;Lo;0;L;;;;;N;;;;; +1BC99;DUPLOYAN AFFIX LOW ARROW;Lo;0;L;;;;;N;;;;; +1BC9C;DUPLOYAN SIGN O WITH CROSS;So;0;L;;;;;N;;;;; +1BC9D;DUPLOYAN THICK LETTER SELECTOR;Mn;0;NSM;;;;;N;;;;; +1BC9E;DUPLOYAN DOUBLE MARK;Mn;1;NSM;;;;;N;;;;; +1BC9F;DUPLOYAN PUNCTUATION CHINOOK FULL STOP;Po;0;L;;;;;N;;;;; +1BCA0;SHORTHAND FORMAT LETTER OVERLAP;Cf;0;BN;;;;;N;;;;; +1BCA1;SHORTHAND FORMAT CONTINUING OVERLAP;Cf;0;BN;;;;;N;;;;; +1BCA2;SHORTHAND FORMAT DOWN STEP;Cf;0;BN;;;;;N;;;;; +1BCA3;SHORTHAND FORMAT UP STEP;Cf;0;BN;;;;;N;;;;; +1CC00;UP-POINTING GO-KART;So;0;ON;;;;;N;;;;; +1CC01;RIGHT-POINTING GO-KART;So;0;ON;;;;;N;;;;; +1CC02;LEFT-POINTING STICK FIGURE;So;0;ON;;;;;N;;;;; +1CC03;RIGHT-POINTING STICK FIGURE;So;0;ON;;;;;N;;;;; +1CC04;DOWN-POINTING STICK FIGURE;So;0;ON;;;;;N;;;;; +1CC05;LOWER HORIZONTAL RULER SEGMENT;So;0;ON;;;;;N;;;;; +1CC06;RIGHT VERTICAL RULER SEGMENT;So;0;ON;;;;;N;;;;; +1CC07;LOWER RIGHT RULER SEGMENT;So;0;ON;;;;;N;;;;; +1CC08;ANTENNA;So;0;ON;;;;;N;;;;; +1CC09;HORIZONTAL RESISTOR SEGMENT;So;0;ON;;;;;N;;;;; +1CC0A;VERTICAL RESISTOR SEGMENT;So;0;ON;;;;;N;;;;; +1CC0B;LEFT THIRD INDUCTOR;So;0;ON;;;;;N;;;;; +1CC0C;MIDDLE THIRD INDUCTOR;So;0;ON;;;;;N;;;;; +1CC0D;RIGHT THIRD INDUCTOR;So;0;ON;;;;;N;;;;; +1CC0E;LEFT-POINTING DIODE;So;0;ON;;;;;N;;;;; +1CC0F;RIGHT-POINTING DIODE;So;0;ON;;;;;N;;;;; +1CC10;NPN TRANSISTOR;So;0;ON;;;;;N;;;;; +1CC11;PNP TRANSISTOR;So;0;ON;;;;;N;;;;; +1CC12;RECEPTACLE;So;0;ON;;;;;N;;;;; +1CC13;HORIZONTAL CAPACITOR;So;0;ON;;;;;N;;;;; +1CC14;VERTICAL CAPACITOR;So;0;ON;;;;;N;;;;; +1CC15;LOGIC GATE OR;So;0;ON;;;;;N;;;;; +1CC16;LOGIC GATE AND;So;0;ON;;;;;N;;;;; +1CC17;LOGIC GATE INVERTED INPUTS;So;0;ON;;;;;N;;;;; +1CC18;LOGIC GATE INVERTED OUTPUT;So;0;ON;;;;;N;;;;; +1CC19;LOGIC GATE BUFFER;So;0;ON;;;;;N;;;;; +1CC1A;LOGIC GATE BUFFER WITH INVERTED INPUT;So;0;ON;;;;;N;;;;; +1CC1B;BOX DRAWINGS LIGHT HORIZONTAL AND UPPER RIGHT;So;0;ON;;;;;N;;;;; +1CC1C;BOX DRAWINGS LIGHT HORIZONTAL AND LOWER RIGHT;So;0;ON;;;;;N;;;;; +1CC1D;BOX DRAWINGS LIGHT TOP AND UPPER LEFT;So;0;ON;;;;;N;;;;; +1CC1E;BOX DRAWINGS LIGHT BOTTOM AND LOWER LEFT;So;0;ON;;;;;N;;;;; +1CC1F;BOX DRAWINGS DOUBLE DIAGONAL UPPER RIGHT TO LOWER LEFT;So;0;ON;;;;;N;;;;; +1CC20;BOX DRAWINGS DOUBLE DIAGONAL UPPER LEFT TO LOWER RIGHT;So;0;ON;;;;;N;;;;; +1CC21;SEPARATED BLOCK QUADRANT-1;So;0;ON;;;;;N;;;;; +1CC22;SEPARATED BLOCK QUADRANT-2;So;0;ON;;;;;N;;;;; +1CC23;SEPARATED BLOCK QUADRANT-12;So;0;ON;;;;;N;;;;; +1CC24;SEPARATED BLOCK QUADRANT-3;So;0;ON;;;;;N;;;;; +1CC25;SEPARATED BLOCK QUADRANT-13;So;0;ON;;;;;N;;;;; +1CC26;SEPARATED BLOCK QUADRANT-23;So;0;ON;;;;;N;;;;; +1CC27;SEPARATED BLOCK QUADRANT-123;So;0;ON;;;;;N;;;;; +1CC28;SEPARATED BLOCK QUADRANT-4;So;0;ON;;;;;N;;;;; +1CC29;SEPARATED BLOCK QUADRANT-14;So;0;ON;;;;;N;;;;; +1CC2A;SEPARATED BLOCK QUADRANT-24;So;0;ON;;;;;N;;;;; +1CC2B;SEPARATED BLOCK QUADRANT-124;So;0;ON;;;;;N;;;;; +1CC2C;SEPARATED BLOCK QUADRANT-34;So;0;ON;;;;;N;;;;; +1CC2D;SEPARATED BLOCK QUADRANT-134;So;0;ON;;;;;N;;;;; +1CC2E;SEPARATED BLOCK QUADRANT-234;So;0;ON;;;;;N;;;;; +1CC2F;SEPARATED BLOCK QUADRANT-1234;So;0;ON;;;;;N;;;;; +1CC30;UPPER LEFT TWELFTH CIRCLE;So;0;ON;;;;;N;;;;; +1CC31;UPPER CENTRE LEFT TWELFTH CIRCLE;So;0;ON;;;;;N;;;;; +1CC32;UPPER CENTRE RIGHT TWELFTH CIRCLE;So;0;ON;;;;;N;;;;; +1CC33;UPPER RIGHT TWELFTH CIRCLE;So;0;ON;;;;;N;;;;; +1CC34;UPPER MIDDLE LEFT TWELFTH CIRCLE;So;0;ON;;;;;N;;;;; +1CC35;UPPER LEFT QUARTER CIRCLE;So;0;ON;;;;;N;;;;; +1CC36;UPPER RIGHT QUARTER CIRCLE;So;0;ON;;;;;N;;;;; +1CC37;UPPER MIDDLE RIGHT TWELFTH CIRCLE;So;0;ON;;;;;N;;;;; +1CC38;LOWER MIDDLE LEFT TWELFTH CIRCLE;So;0;ON;;;;;N;;;;; +1CC39;LOWER LEFT QUARTER CIRCLE;So;0;ON;;;;;N;;;;; +1CC3A;LOWER RIGHT QUARTER CIRCLE;So;0;ON;;;;;N;;;;; +1CC3B;LOWER MIDDLE RIGHT TWELFTH CIRCLE;So;0;ON;;;;;N;;;;; +1CC3C;LOWER LEFT TWELFTH CIRCLE;So;0;ON;;;;;N;;;;; +1CC3D;LOWER CENTRE LEFT TWELFTH CIRCLE;So;0;ON;;;;;N;;;;; +1CC3E;LOWER CENTRE RIGHT TWELFTH CIRCLE;So;0;ON;;;;;N;;;;; +1CC3F;LOWER RIGHT TWELFTH CIRCLE;So;0;ON;;;;;N;;;;; +1CC40;SPARSE HORIZONTAL FILL;So;0;ON;;;;;N;;;;; +1CC41;SPARSE VERTICAL FILL;So;0;ON;;;;;N;;;;; +1CC42;ORTHOGONAL CROSSHATCH FILL;So;0;ON;;;;;N;;;;; +1CC43;DIAGONAL CROSSHATCH FILL;So;0;ON;;;;;N;;;;; +1CC44;DENSE VERTICAL FILL;So;0;ON;;;;;N;;;;; +1CC45;DENSE HORIZONTAL FILL;So;0;ON;;;;;N;;;;; +1CC46;SPECKLE FILL FRAME-1;So;0;ON;;;;;N;;;;; +1CC47;SPECKLE FILL FRAME-2;So;0;ON;;;;;N;;;;; +1CC48;LEFT-FACING BASSINET;So;0;ON;;;;;N;;;;; +1CC49;RIGHT-FACING BASSINET;So;0;ON;;;;;N;;;;; +1CC4A;FLYING SAUCER WITH BEAMS;So;0;ON;;;;;N;;;;; +1CC4B;FLYING SAUCER WITHOUT BEAMS;So;0;ON;;;;;N;;;;; +1CC4C;ALIEN MONSTER OPEN JAWS;So;0;ON;;;;;N;;;;; +1CC4D;ALIEN MONSTER CLOSED JAWS;So;0;ON;;;;;N;;;;; +1CC4E;ALIEN SQUID OPEN TENTACLES;So;0;ON;;;;;N;;;;; +1CC4F;ALIEN SQUID CLOSED TENTACLES;So;0;ON;;;;;N;;;;; +1CC50;ALIEN CRAB STEPPING RIGHT;So;0;ON;;;;;N;;;;; +1CC51;ALIEN CRAB STEPPING LEFT;So;0;ON;;;;;N;;;;; +1CC52;ALIEN SPIDER CROUCHING;So;0;ON;;;;;N;;;;; +1CC53;ALIEN SPIDER SPREAD;So;0;ON;;;;;N;;;;; +1CC54;ALIEN MONSTER STEP-1;So;0;ON;;;;;N;;;;; +1CC55;ALIEN MONSTER STEP-2;So;0;ON;;;;;N;;;;; +1CC56;LEFT-POINTING ROCKET SHIP;So;0;ON;;;;;N;;;;; +1CC57;UP-POINTING ROCKET SHIP;So;0;ON;;;;;N;;;;; +1CC58;RIGHT-POINTING ROCKET SHIP;So;0;ON;;;;;N;;;;; +1CC59;DOWN-POINTING ROCKET SHIP;So;0;ON;;;;;N;;;;; +1CC5A;TOP HALF LEFT-FACING ROBOT;So;0;ON;;;;;N;;;;; +1CC5B;TOP HALF FORWARD-FACING ROBOT;So;0;ON;;;;;N;;;;; +1CC5C;TOP HALF RIGHT-FACING ROBOT;So;0;ON;;;;;N;;;;; +1CC5D;BOTTOM HALF LEFT-FACING ROBOT;So;0;ON;;;;;N;;;;; +1CC5E;BOTTOM HALF FORWARD-FACING ROBOT;So;0;ON;;;;;N;;;;; +1CC5F;BOTTOM HALF RIGHT-FACING ROBOT;So;0;ON;;;;;N;;;;; +1CC60;LEFT-POINTING ATOMIC BOMB;So;0;ON;;;;;N;;;;; +1CC61;UP-POINTING ATOMIC BOMB;So;0;ON;;;;;N;;;;; +1CC62;RIGHT-POINTING ATOMIC BOMB;So;0;ON;;;;;N;;;;; +1CC63;DOWN-POINTING ATOMIC BOMB;So;0;ON;;;;;N;;;;; +1CC64;MUSHROOM CLOUD;So;0;ON;;;;;N;;;;; +1CC65;LEFT-POINTING RIFLE;So;0;ON;;;;;N;;;;; +1CC66;UP-POINTING RIFLE;So;0;ON;;;;;N;;;;; +1CC67;RIGHT-POINTING RIFLE;So;0;ON;;;;;N;;;;; +1CC68;DOWN-POINTING RIFLE;So;0;ON;;;;;N;;;;; +1CC69;EIGHT RAYS INWARD;So;0;ON;;;;;N;;;;; +1CC6A;EIGHT RAYS OUTWARD;So;0;ON;;;;;N;;;;; +1CC6B;BLACK LARGE CIRCLE MINUS LEFT QUARTER SECTION;So;0;ON;;;;;N;;;;; +1CC6C;BLACK LARGE CIRCLE MINUS UPPER QUARTER SECTION;So;0;ON;;;;;N;;;;; +1CC6D;BLACK LARGE CIRCLE MINUS RIGHT QUARTER SECTION;So;0;ON;;;;;N;;;;; +1CC6E;BLACK LARGE CIRCLE MINUS LOWER QUARTER SECTION;So;0;ON;;;;;N;;;;; +1CC6F;BLACK NEUTRAL FACE;So;0;ON;;;;;N;;;;; +1CC70;LEFT-FACING SNAKE HEAD WITH OPEN MOUTH;So;0;ON;;;;;N;;;;; +1CC71;UP-FACING SNAKE HEAD WITH OPEN MOUTH;So;0;ON;;;;;N;;;;; +1CC72;RIGHT-FACING SNAKE HEAD WITH OPEN MOUTH;So;0;ON;;;;;N;;;;; +1CC73;DOWN-FACING SNAKE HEAD WITH OPEN MOUTH;So;0;ON;;;;;N;;;;; +1CC74;LEFT-FACING SNAKE HEAD WITH CLOSED MOUTH;So;0;ON;;;;;N;;;;; +1CC75;UP-FACING SNAKE HEAD WITH CLOSED MOUTH;So;0;ON;;;;;N;;;;; +1CC76;RIGHT-FACING SNAKE HEAD WITH CLOSED MOUTH;So;0;ON;;;;;N;;;;; +1CC77;DOWN-FACING SNAKE HEAD WITH CLOSED MOUTH;So;0;ON;;;;;N;;;;; +1CC78;LEFT-POINTING ENERGY WAVE;So;0;ON;;;;;N;;;;; +1CC79;UP-POINTING ENERGY WAVE;So;0;ON;;;;;N;;;;; +1CC7A;RIGHT-POINTING ENERGY WAVE;So;0;ON;;;;;N;;;;; +1CC7B;DOWN-POINTING ENERGY WAVE;So;0;ON;;;;;N;;;;; +1CC7C;SQUARE SPIRAL FROM TOP LEFT;So;0;ON;;;;;N;;;;; +1CC7D;SQUARE SPIRAL FROM TOP RIGHT;So;0;ON;;;;;N;;;;; +1CC7E;SQUARE SPIRAL FROM BOTTOM RIGHT;So;0;ON;;;;;N;;;;; +1CC7F;SQUARE SPIRAL FROM BOTTOM LEFT;So;0;ON;;;;;N;;;;; +1CC80;STRIPED LEFT-POINTING TRIANGLE;So;0;ON;;;;;N;;;;; +1CC81;STRIPED UP-POINTING TRIANGLE;So;0;ON;;;;;N;;;;; +1CC82;STRIPED RIGHT-POINTING TRIANGLE;So;0;ON;;;;;N;;;;; +1CC83;STRIPED DOWN-POINTING TRIANGLE;So;0;ON;;;;;N;;;;; +1CC84;VERTICAL LADDER;So;0;ON;;;;;N;;;;; +1CC85;HORIZONTAL LADDER;So;0;ON;;;;;N;;;;; +1CC86;WHITE LOWER LEFT POINTER;So;0;ON;;;;;N;;;;; +1CC87;WHITE LOWER RIGHT POINTER;So;0;ON;;;;;N;;;;; +1CC88;TWO RINGS ALIGNED HORIZONTALLY;So;0;ON;;;;;N;;;;; +1CC89;SQUARE FOUR CORNER SALTIRES;So;0;ON;;;;;N;;;;; +1CC8A;SQUARE FOUR CORNER DIAGONALS;So;0;ON;;;;;N;;;;; +1CC8B;SQUARE FOUR CORNER BLACK TRIANGLES;So;0;ON;;;;;N;;;;; +1CC8C;SQUARE APERTURE;So;0;ON;;;;;N;;;;; +1CC8D;INVERSE BLACK DIAMOND;So;0;ON;;;;;N;;;;; +1CC8E;LEFT AND UPPER ONE EIGHTH BLOCK CONTAINING BLACK SMALL SQUARE;So;0;ON;;;;;N;;;;; +1CC8F;INVERSE BLACK SMALL SQUARE;So;0;ON;;;;;N;;;;; +1CC90;VERTICAL LINE WITH FOUR TICK MARKS;So;0;ON;;;;;N;;;;; +1CC91;HORIZONTAL LINE WITH FOUR TICK MARKS;So;0;ON;;;;;N;;;;; +1CC92;LEFT-FACING FISH;So;0;ON;;;;;N;;;;; +1CC93;RIGHT-FACING FISH;So;0;ON;;;;;N;;;;; +1CC94;LEFT-FACING FISH WITH OPEN MOUTH;So;0;ON;;;;;N;;;;; +1CC95;RIGHT-FACING FISH WITH OPEN MOUTH;So;0;ON;;;;;N;;;;; +1CC96;FLAPPING BIRD;So;0;ON;;;;;N;;;;; +1CC97;LEFT-POINTING RACING CAR;So;0;ON;;;;;N;;;;; +1CC98;UP-POINTING RACING CAR;So;0;ON;;;;;N;;;;; +1CC99;RIGHT-POINTING RACING CAR;So;0;ON;;;;;N;;;;; +1CC9A;DOWN-POINTING RACING CAR;So;0;ON;;;;;N;;;;; +1CC9B;HORIZONTAL RACING CAR;So;0;ON;;;;;N;;;;; +1CC9C;VERTICAL RACING CAR;So;0;ON;;;;;N;;;;; +1CC9D;VERTICAL GO-KART;So;0;ON;;;;;N;;;;; +1CC9E;LEFT-POINTING TANK;So;0;ON;;;;;N;;;;; +1CC9F;RIGHT-POINTING TANK;So;0;ON;;;;;N;;;;; +1CCA0;LEFT-POINTING ROCKET BOOSTER;So;0;ON;;;;;N;;;;; +1CCA1;RIGHT-POINTING ROCKET BOOSTER;So;0;ON;;;;;N;;;;; +1CCA2;LEFT-POINTING ROLLER COASTER CAR;So;0;ON;;;;;N;;;;; +1CCA3;RIGHT-POINTING ROLLER COASTER CAR;So;0;ON;;;;;N;;;;; +1CCA4;LEFT HALF FLYING SAUCER;So;0;ON;;;;;N;;;;; +1CCA5;RIGHT HALF FLYING SAUCER;So;0;ON;;;;;N;;;;; +1CCA6;UPPER LEFT QUADRANT FACE WITH OPEN EYES;So;0;ON;;;;;N;;;;; +1CCA7;UPPER RIGHT QUADRANT FACE WITH OPEN EYES;So;0;ON;;;;;N;;;;; +1CCA8;UPPER LEFT QUADRANT FACE WITH CLOSED EYES;So;0;ON;;;;;N;;;;; +1CCA9;UPPER RIGHT QUADRANT FACE WITH CLOSED EYES;So;0;ON;;;;;N;;;;; +1CCAA;LOWER LEFT QUADRANT SMILING FACE;So;0;ON;;;;;N;;;;; +1CCAB;LOWER RIGHT QUADRANT SMILING FACE;So;0;ON;;;;;N;;;;; +1CCAC;LOWER LEFT QUADRANT NEUTRAL FACE;So;0;ON;;;;;N;;;;; +1CCAD;LOWER RIGHT QUADRANT NEUTRAL FACE;So;0;ON;;;;;N;;;;; +1CCAE;LOWER LEFT QUADRANT FACE WITH OPEN MOUTH;So;0;ON;;;;;N;;;;; +1CCAF;LOWER RIGHT QUADRANT FACE WITH OPEN MOUTH;So;0;ON;;;;;N;;;;; +1CCB0;LOWER LEFT QUADRANT FROWNING FACE;So;0;ON;;;;;N;;;;; +1CCB1;LOWER RIGHT QUADRANT FROWNING FACE;So;0;ON;;;;;N;;;;; +1CCB2;UPPER LEFT QUADRANT TELEVISION;So;0;ON;;;;;N;;;;; +1CCB3;UPPER RIGHT QUADRANT TELEVISION;So;0;ON;;;;;N;;;;; +1CCB4;LOWER LEFT QUADRANT TELEVISION;So;0;ON;;;;;N;;;;; +1CCB5;LOWER RIGHT QUADRANT TELEVISION;So;0;ON;;;;;N;;;;; +1CCB6;UPPER LEFT QUADRANT MICROCOMPUTER;So;0;ON;;;;;N;;;;; +1CCB7;UPPER RIGHT QUADRANT MICROCOMPUTER;So;0;ON;;;;;N;;;;; +1CCB8;LOWER LEFT QUADRANT MICROCOMPUTER;So;0;ON;;;;;N;;;;; +1CCB9;LOWER RIGHT QUADRANT MICROCOMPUTER;So;0;ON;;;;;N;;;;; +1CCBA;UPPER LEFT QUADRANT CHESS KING;So;0;ON;;;;;N;;;;; +1CCBB;UPPER RIGHT QUADRANT CHESS KING;So;0;ON;;;;;N;;;;; +1CCBC;LOWER LEFT QUADRANT CHESS KING;So;0;ON;;;;;N;;;;; +1CCBD;LOWER RIGHT QUADRANT CHESS KING;So;0;ON;;;;;N;;;;; +1CCBE;UPPER LEFT QUADRANT CHESS QUEEN;So;0;ON;;;;;N;;;;; +1CCBF;UPPER RIGHT QUADRANT CHESS QUEEN;So;0;ON;;;;;N;;;;; +1CCC0;LOWER LEFT QUADRANT CHESS QUEEN;So;0;ON;;;;;N;;;;; +1CCC1;LOWER RIGHT QUADRANT CHESS QUEEN;So;0;ON;;;;;N;;;;; +1CCC2;UPPER LEFT QUADRANT CHESS ROOK;So;0;ON;;;;;N;;;;; +1CCC3;UPPER RIGHT QUADRANT CHESS ROOK;So;0;ON;;;;;N;;;;; +1CCC4;LOWER LEFT QUADRANT CHESS ROOK;So;0;ON;;;;;N;;;;; +1CCC5;LOWER RIGHT QUADRANT CHESS ROOK;So;0;ON;;;;;N;;;;; +1CCC6;UPPER LEFT QUADRANT CHESS BISHOP;So;0;ON;;;;;N;;;;; +1CCC7;UPPER RIGHT QUADRANT CHESS BISHOP;So;0;ON;;;;;N;;;;; +1CCC8;LOWER LEFT QUADRANT CHESS BISHOP;So;0;ON;;;;;N;;;;; +1CCC9;LOWER RIGHT QUADRANT CHESS BISHOP;So;0;ON;;;;;N;;;;; +1CCCA;UPPER LEFT QUADRANT CHESS KNIGHT;So;0;ON;;;;;N;;;;; +1CCCB;UPPER RIGHT QUADRANT CHESS KNIGHT;So;0;ON;;;;;N;;;;; +1CCCC;LOWER LEFT QUADRANT CHESS KNIGHT;So;0;ON;;;;;N;;;;; +1CCCD;LOWER RIGHT QUADRANT CHESS KNIGHT;So;0;ON;;;;;N;;;;; +1CCCE;UPPER LEFT QUADRANT CHESS PAWN;So;0;ON;;;;;N;;;;; +1CCCF;UPPER RIGHT QUADRANT CHESS PAWN;So;0;ON;;;;;N;;;;; +1CCD0;LOWER LEFT QUADRANT CHESS PAWN;So;0;ON;;;;;N;;;;; +1CCD1;LOWER RIGHT QUADRANT CHESS PAWN;So;0;ON;;;;;N;;;;; +1CCD2;UPPER LEFT QUADRANT STANDING KNIGHT;So;0;ON;;;;;N;;;;; +1CCD3;UPPER RIGHT QUADRANT STANDING KNIGHT;So;0;ON;;;;;N;;;;; +1CCD4;LOWER LEFT QUADRANT STANDING KNIGHT;So;0;ON;;;;;N;;;;; +1CCD5;LOWER RIGHT QUADRANT STANDING KNIGHT;So;0;ON;;;;;N;;;;; +1CCD6;OUTLINED LATIN CAPITAL LETTER A;So;0;L; 0041;;;;N;;;;; +1CCD7;OUTLINED LATIN CAPITAL LETTER B;So;0;L; 0042;;;;N;;;;; +1CCD8;OUTLINED LATIN CAPITAL LETTER C;So;0;L; 0043;;;;N;;;;; +1CCD9;OUTLINED LATIN CAPITAL LETTER D;So;0;L; 0044;;;;N;;;;; +1CCDA;OUTLINED LATIN CAPITAL LETTER E;So;0;L; 0045;;;;N;;;;; +1CCDB;OUTLINED LATIN CAPITAL LETTER F;So;0;L; 0046;;;;N;;;;; +1CCDC;OUTLINED LATIN CAPITAL LETTER G;So;0;L; 0047;;;;N;;;;; +1CCDD;OUTLINED LATIN CAPITAL LETTER H;So;0;L; 0048;;;;N;;;;; +1CCDE;OUTLINED LATIN CAPITAL LETTER I;So;0;L; 0049;;;;N;;;;; +1CCDF;OUTLINED LATIN CAPITAL LETTER J;So;0;L; 004A;;;;N;;;;; +1CCE0;OUTLINED LATIN CAPITAL LETTER K;So;0;L; 004B;;;;N;;;;; +1CCE1;OUTLINED LATIN CAPITAL LETTER L;So;0;L; 004C;;;;N;;;;; +1CCE2;OUTLINED LATIN CAPITAL LETTER M;So;0;L; 004D;;;;N;;;;; +1CCE3;OUTLINED LATIN CAPITAL LETTER N;So;0;L; 004E;;;;N;;;;; +1CCE4;OUTLINED LATIN CAPITAL LETTER O;So;0;L; 004F;;;;N;;;;; +1CCE5;OUTLINED LATIN CAPITAL LETTER P;So;0;L; 0050;;;;N;;;;; +1CCE6;OUTLINED LATIN CAPITAL LETTER Q;So;0;L; 0051;;;;N;;;;; +1CCE7;OUTLINED LATIN CAPITAL LETTER R;So;0;L; 0052;;;;N;;;;; +1CCE8;OUTLINED LATIN CAPITAL LETTER S;So;0;L; 0053;;;;N;;;;; +1CCE9;OUTLINED LATIN CAPITAL LETTER T;So;0;L; 0054;;;;N;;;;; +1CCEA;OUTLINED LATIN CAPITAL LETTER U;So;0;L; 0055;;;;N;;;;; +1CCEB;OUTLINED LATIN CAPITAL LETTER V;So;0;L; 0056;;;;N;;;;; +1CCEC;OUTLINED LATIN CAPITAL LETTER W;So;0;L; 0057;;;;N;;;;; +1CCED;OUTLINED LATIN CAPITAL LETTER X;So;0;L; 0058;;;;N;;;;; +1CCEE;OUTLINED LATIN CAPITAL LETTER Y;So;0;L; 0059;;;;N;;;;; +1CCEF;OUTLINED LATIN CAPITAL LETTER Z;So;0;L; 005A;;;;N;;;;; +1CCF0;OUTLINED DIGIT ZERO;Nd;0;EN; 0030;0;0;0;N;;;;; +1CCF1;OUTLINED DIGIT ONE;Nd;0;EN; 0031;1;1;1;N;;;;; +1CCF2;OUTLINED DIGIT TWO;Nd;0;EN; 0032;2;2;2;N;;;;; +1CCF3;OUTLINED DIGIT THREE;Nd;0;EN; 0033;3;3;3;N;;;;; +1CCF4;OUTLINED DIGIT FOUR;Nd;0;EN; 0034;4;4;4;N;;;;; +1CCF5;OUTLINED DIGIT FIVE;Nd;0;EN; 0035;5;5;5;N;;;;; +1CCF6;OUTLINED DIGIT SIX;Nd;0;EN; 0036;6;6;6;N;;;;; +1CCF7;OUTLINED DIGIT SEVEN;Nd;0;EN; 0037;7;7;7;N;;;;; +1CCF8;OUTLINED DIGIT EIGHT;Nd;0;EN; 0038;8;8;8;N;;;;; +1CCF9;OUTLINED DIGIT NINE;Nd;0;EN; 0039;9;9;9;N;;;;; +1CCFA;SNAKE SYMBOL;So;0;ON;;;;;N;;;;; +1CCFB;FLYING SAUCER SYMBOL;So;0;ON;;;;;N;;;;; +1CCFC;NOSE SYMBOL;So;0;ON;;;;;N;;;;; +1CD00;BLOCK OCTANT-3;So;0;ON;;;;;N;;;;; +1CD01;BLOCK OCTANT-23;So;0;ON;;;;;N;;;;; +1CD02;BLOCK OCTANT-123;So;0;ON;;;;;N;;;;; +1CD03;BLOCK OCTANT-4;So;0;ON;;;;;N;;;;; +1CD04;BLOCK OCTANT-14;So;0;ON;;;;;N;;;;; +1CD05;BLOCK OCTANT-124;So;0;ON;;;;;N;;;;; +1CD06;BLOCK OCTANT-34;So;0;ON;;;;;N;;;;; +1CD07;BLOCK OCTANT-134;So;0;ON;;;;;N;;;;; +1CD08;BLOCK OCTANT-234;So;0;ON;;;;;N;;;;; +1CD09;BLOCK OCTANT-5;So;0;ON;;;;;N;;;;; +1CD0A;BLOCK OCTANT-15;So;0;ON;;;;;N;;;;; +1CD0B;BLOCK OCTANT-25;So;0;ON;;;;;N;;;;; +1CD0C;BLOCK OCTANT-125;So;0;ON;;;;;N;;;;; +1CD0D;BLOCK OCTANT-135;So;0;ON;;;;;N;;;;; +1CD0E;BLOCK OCTANT-235;So;0;ON;;;;;N;;;;; +1CD0F;BLOCK OCTANT-1235;So;0;ON;;;;;N;;;;; +1CD10;BLOCK OCTANT-45;So;0;ON;;;;;N;;;;; +1CD11;BLOCK OCTANT-145;So;0;ON;;;;;N;;;;; +1CD12;BLOCK OCTANT-245;So;0;ON;;;;;N;;;;; +1CD13;BLOCK OCTANT-1245;So;0;ON;;;;;N;;;;; +1CD14;BLOCK OCTANT-345;So;0;ON;;;;;N;;;;; +1CD15;BLOCK OCTANT-1345;So;0;ON;;;;;N;;;;; +1CD16;BLOCK OCTANT-2345;So;0;ON;;;;;N;;;;; +1CD17;BLOCK OCTANT-12345;So;0;ON;;;;;N;;;;; +1CD18;BLOCK OCTANT-6;So;0;ON;;;;;N;;;;; +1CD19;BLOCK OCTANT-16;So;0;ON;;;;;N;;;;; +1CD1A;BLOCK OCTANT-26;So;0;ON;;;;;N;;;;; +1CD1B;BLOCK OCTANT-126;So;0;ON;;;;;N;;;;; +1CD1C;BLOCK OCTANT-36;So;0;ON;;;;;N;;;;; +1CD1D;BLOCK OCTANT-136;So;0;ON;;;;;N;;;;; +1CD1E;BLOCK OCTANT-236;So;0;ON;;;;;N;;;;; +1CD1F;BLOCK OCTANT-1236;So;0;ON;;;;;N;;;;; +1CD20;BLOCK OCTANT-146;So;0;ON;;;;;N;;;;; +1CD21;BLOCK OCTANT-246;So;0;ON;;;;;N;;;;; +1CD22;BLOCK OCTANT-1246;So;0;ON;;;;;N;;;;; +1CD23;BLOCK OCTANT-346;So;0;ON;;;;;N;;;;; +1CD24;BLOCK OCTANT-1346;So;0;ON;;;;;N;;;;; +1CD25;BLOCK OCTANT-2346;So;0;ON;;;;;N;;;;; +1CD26;BLOCK OCTANT-12346;So;0;ON;;;;;N;;;;; +1CD27;BLOCK OCTANT-56;So;0;ON;;;;;N;;;;; +1CD28;BLOCK OCTANT-156;So;0;ON;;;;;N;;;;; +1CD29;BLOCK OCTANT-256;So;0;ON;;;;;N;;;;; +1CD2A;BLOCK OCTANT-1256;So;0;ON;;;;;N;;;;; +1CD2B;BLOCK OCTANT-356;So;0;ON;;;;;N;;;;; +1CD2C;BLOCK OCTANT-1356;So;0;ON;;;;;N;;;;; +1CD2D;BLOCK OCTANT-2356;So;0;ON;;;;;N;;;;; +1CD2E;BLOCK OCTANT-12356;So;0;ON;;;;;N;;;;; +1CD2F;BLOCK OCTANT-456;So;0;ON;;;;;N;;;;; +1CD30;BLOCK OCTANT-1456;So;0;ON;;;;;N;;;;; +1CD31;BLOCK OCTANT-2456;So;0;ON;;;;;N;;;;; +1CD32;BLOCK OCTANT-12456;So;0;ON;;;;;N;;;;; +1CD33;BLOCK OCTANT-3456;So;0;ON;;;;;N;;;;; +1CD34;BLOCK OCTANT-13456;So;0;ON;;;;;N;;;;; +1CD35;BLOCK OCTANT-23456;So;0;ON;;;;;N;;;;; +1CD36;BLOCK OCTANT-17;So;0;ON;;;;;N;;;;; +1CD37;BLOCK OCTANT-27;So;0;ON;;;;;N;;;;; +1CD38;BLOCK OCTANT-127;So;0;ON;;;;;N;;;;; +1CD39;BLOCK OCTANT-37;So;0;ON;;;;;N;;;;; +1CD3A;BLOCK OCTANT-137;So;0;ON;;;;;N;;;;; +1CD3B;BLOCK OCTANT-237;So;0;ON;;;;;N;;;;; +1CD3C;BLOCK OCTANT-1237;So;0;ON;;;;;N;;;;; +1CD3D;BLOCK OCTANT-47;So;0;ON;;;;;N;;;;; +1CD3E;BLOCK OCTANT-147;So;0;ON;;;;;N;;;;; +1CD3F;BLOCK OCTANT-247;So;0;ON;;;;;N;;;;; +1CD40;BLOCK OCTANT-1247;So;0;ON;;;;;N;;;;; +1CD41;BLOCK OCTANT-347;So;0;ON;;;;;N;;;;; +1CD42;BLOCK OCTANT-1347;So;0;ON;;;;;N;;;;; +1CD43;BLOCK OCTANT-2347;So;0;ON;;;;;N;;;;; +1CD44;BLOCK OCTANT-12347;So;0;ON;;;;;N;;;;; +1CD45;BLOCK OCTANT-157;So;0;ON;;;;;N;;;;; +1CD46;BLOCK OCTANT-257;So;0;ON;;;;;N;;;;; +1CD47;BLOCK OCTANT-1257;So;0;ON;;;;;N;;;;; +1CD48;BLOCK OCTANT-357;So;0;ON;;;;;N;;;;; +1CD49;BLOCK OCTANT-2357;So;0;ON;;;;;N;;;;; +1CD4A;BLOCK OCTANT-12357;So;0;ON;;;;;N;;;;; +1CD4B;BLOCK OCTANT-457;So;0;ON;;;;;N;;;;; +1CD4C;BLOCK OCTANT-1457;So;0;ON;;;;;N;;;;; +1CD4D;BLOCK OCTANT-12457;So;0;ON;;;;;N;;;;; +1CD4E;BLOCK OCTANT-3457;So;0;ON;;;;;N;;;;; +1CD4F;BLOCK OCTANT-13457;So;0;ON;;;;;N;;;;; +1CD50;BLOCK OCTANT-23457;So;0;ON;;;;;N;;;;; +1CD51;BLOCK OCTANT-67;So;0;ON;;;;;N;;;;; +1CD52;BLOCK OCTANT-167;So;0;ON;;;;;N;;;;; +1CD53;BLOCK OCTANT-267;So;0;ON;;;;;N;;;;; +1CD54;BLOCK OCTANT-1267;So;0;ON;;;;;N;;;;; +1CD55;BLOCK OCTANT-367;So;0;ON;;;;;N;;;;; +1CD56;BLOCK OCTANT-1367;So;0;ON;;;;;N;;;;; +1CD57;BLOCK OCTANT-2367;So;0;ON;;;;;N;;;;; +1CD58;BLOCK OCTANT-12367;So;0;ON;;;;;N;;;;; +1CD59;BLOCK OCTANT-467;So;0;ON;;;;;N;;;;; +1CD5A;BLOCK OCTANT-1467;So;0;ON;;;;;N;;;;; +1CD5B;BLOCK OCTANT-2467;So;0;ON;;;;;N;;;;; +1CD5C;BLOCK OCTANT-12467;So;0;ON;;;;;N;;;;; +1CD5D;BLOCK OCTANT-3467;So;0;ON;;;;;N;;;;; +1CD5E;BLOCK OCTANT-13467;So;0;ON;;;;;N;;;;; +1CD5F;BLOCK OCTANT-23467;So;0;ON;;;;;N;;;;; +1CD60;BLOCK OCTANT-123467;So;0;ON;;;;;N;;;;; +1CD61;BLOCK OCTANT-567;So;0;ON;;;;;N;;;;; +1CD62;BLOCK OCTANT-1567;So;0;ON;;;;;N;;;;; +1CD63;BLOCK OCTANT-2567;So;0;ON;;;;;N;;;;; +1CD64;BLOCK OCTANT-12567;So;0;ON;;;;;N;;;;; +1CD65;BLOCK OCTANT-3567;So;0;ON;;;;;N;;;;; +1CD66;BLOCK OCTANT-13567;So;0;ON;;;;;N;;;;; +1CD67;BLOCK OCTANT-23567;So;0;ON;;;;;N;;;;; +1CD68;BLOCK OCTANT-123567;So;0;ON;;;;;N;;;;; +1CD69;BLOCK OCTANT-4567;So;0;ON;;;;;N;;;;; +1CD6A;BLOCK OCTANT-14567;So;0;ON;;;;;N;;;;; +1CD6B;BLOCK OCTANT-24567;So;0;ON;;;;;N;;;;; +1CD6C;BLOCK OCTANT-124567;So;0;ON;;;;;N;;;;; +1CD6D;BLOCK OCTANT-34567;So;0;ON;;;;;N;;;;; +1CD6E;BLOCK OCTANT-134567;So;0;ON;;;;;N;;;;; +1CD6F;BLOCK OCTANT-234567;So;0;ON;;;;;N;;;;; +1CD70;BLOCK OCTANT-1234567;So;0;ON;;;;;N;;;;; +1CD71;BLOCK OCTANT-18;So;0;ON;;;;;N;;;;; +1CD72;BLOCK OCTANT-28;So;0;ON;;;;;N;;;;; +1CD73;BLOCK OCTANT-128;So;0;ON;;;;;N;;;;; +1CD74;BLOCK OCTANT-38;So;0;ON;;;;;N;;;;; +1CD75;BLOCK OCTANT-138;So;0;ON;;;;;N;;;;; +1CD76;BLOCK OCTANT-238;So;0;ON;;;;;N;;;;; +1CD77;BLOCK OCTANT-1238;So;0;ON;;;;;N;;;;; +1CD78;BLOCK OCTANT-48;So;0;ON;;;;;N;;;;; +1CD79;BLOCK OCTANT-148;So;0;ON;;;;;N;;;;; +1CD7A;BLOCK OCTANT-248;So;0;ON;;;;;N;;;;; +1CD7B;BLOCK OCTANT-1248;So;0;ON;;;;;N;;;;; +1CD7C;BLOCK OCTANT-348;So;0;ON;;;;;N;;;;; +1CD7D;BLOCK OCTANT-1348;So;0;ON;;;;;N;;;;; +1CD7E;BLOCK OCTANT-2348;So;0;ON;;;;;N;;;;; +1CD7F;BLOCK OCTANT-12348;So;0;ON;;;;;N;;;;; +1CD80;BLOCK OCTANT-58;So;0;ON;;;;;N;;;;; +1CD81;BLOCK OCTANT-158;So;0;ON;;;;;N;;;;; +1CD82;BLOCK OCTANT-258;So;0;ON;;;;;N;;;;; +1CD83;BLOCK OCTANT-1258;So;0;ON;;;;;N;;;;; +1CD84;BLOCK OCTANT-358;So;0;ON;;;;;N;;;;; +1CD85;BLOCK OCTANT-1358;So;0;ON;;;;;N;;;;; +1CD86;BLOCK OCTANT-2358;So;0;ON;;;;;N;;;;; +1CD87;BLOCK OCTANT-12358;So;0;ON;;;;;N;;;;; +1CD88;BLOCK OCTANT-458;So;0;ON;;;;;N;;;;; +1CD89;BLOCK OCTANT-1458;So;0;ON;;;;;N;;;;; +1CD8A;BLOCK OCTANT-2458;So;0;ON;;;;;N;;;;; +1CD8B;BLOCK OCTANT-12458;So;0;ON;;;;;N;;;;; +1CD8C;BLOCK OCTANT-3458;So;0;ON;;;;;N;;;;; +1CD8D;BLOCK OCTANT-13458;So;0;ON;;;;;N;;;;; +1CD8E;BLOCK OCTANT-23458;So;0;ON;;;;;N;;;;; +1CD8F;BLOCK OCTANT-123458;So;0;ON;;;;;N;;;;; +1CD90;BLOCK OCTANT-168;So;0;ON;;;;;N;;;;; +1CD91;BLOCK OCTANT-268;So;0;ON;;;;;N;;;;; +1CD92;BLOCK OCTANT-1268;So;0;ON;;;;;N;;;;; +1CD93;BLOCK OCTANT-368;So;0;ON;;;;;N;;;;; +1CD94;BLOCK OCTANT-2368;So;0;ON;;;;;N;;;;; +1CD95;BLOCK OCTANT-12368;So;0;ON;;;;;N;;;;; +1CD96;BLOCK OCTANT-468;So;0;ON;;;;;N;;;;; +1CD97;BLOCK OCTANT-1468;So;0;ON;;;;;N;;;;; +1CD98;BLOCK OCTANT-12468;So;0;ON;;;;;N;;;;; +1CD99;BLOCK OCTANT-3468;So;0;ON;;;;;N;;;;; +1CD9A;BLOCK OCTANT-13468;So;0;ON;;;;;N;;;;; +1CD9B;BLOCK OCTANT-23468;So;0;ON;;;;;N;;;;; +1CD9C;BLOCK OCTANT-568;So;0;ON;;;;;N;;;;; +1CD9D;BLOCK OCTANT-1568;So;0;ON;;;;;N;;;;; +1CD9E;BLOCK OCTANT-2568;So;0;ON;;;;;N;;;;; +1CD9F;BLOCK OCTANT-12568;So;0;ON;;;;;N;;;;; +1CDA0;BLOCK OCTANT-3568;So;0;ON;;;;;N;;;;; +1CDA1;BLOCK OCTANT-13568;So;0;ON;;;;;N;;;;; +1CDA2;BLOCK OCTANT-23568;So;0;ON;;;;;N;;;;; +1CDA3;BLOCK OCTANT-123568;So;0;ON;;;;;N;;;;; +1CDA4;BLOCK OCTANT-4568;So;0;ON;;;;;N;;;;; +1CDA5;BLOCK OCTANT-14568;So;0;ON;;;;;N;;;;; +1CDA6;BLOCK OCTANT-24568;So;0;ON;;;;;N;;;;; +1CDA7;BLOCK OCTANT-124568;So;0;ON;;;;;N;;;;; +1CDA8;BLOCK OCTANT-34568;So;0;ON;;;;;N;;;;; +1CDA9;BLOCK OCTANT-134568;So;0;ON;;;;;N;;;;; +1CDAA;BLOCK OCTANT-234568;So;0;ON;;;;;N;;;;; +1CDAB;BLOCK OCTANT-1234568;So;0;ON;;;;;N;;;;; +1CDAC;BLOCK OCTANT-178;So;0;ON;;;;;N;;;;; +1CDAD;BLOCK OCTANT-278;So;0;ON;;;;;N;;;;; +1CDAE;BLOCK OCTANT-1278;So;0;ON;;;;;N;;;;; +1CDAF;BLOCK OCTANT-378;So;0;ON;;;;;N;;;;; +1CDB0;BLOCK OCTANT-1378;So;0;ON;;;;;N;;;;; +1CDB1;BLOCK OCTANT-2378;So;0;ON;;;;;N;;;;; +1CDB2;BLOCK OCTANT-12378;So;0;ON;;;;;N;;;;; +1CDB3;BLOCK OCTANT-478;So;0;ON;;;;;N;;;;; +1CDB4;BLOCK OCTANT-1478;So;0;ON;;;;;N;;;;; +1CDB5;BLOCK OCTANT-2478;So;0;ON;;;;;N;;;;; +1CDB6;BLOCK OCTANT-12478;So;0;ON;;;;;N;;;;; +1CDB7;BLOCK OCTANT-3478;So;0;ON;;;;;N;;;;; +1CDB8;BLOCK OCTANT-13478;So;0;ON;;;;;N;;;;; +1CDB9;BLOCK OCTANT-23478;So;0;ON;;;;;N;;;;; +1CDBA;BLOCK OCTANT-123478;So;0;ON;;;;;N;;;;; +1CDBB;BLOCK OCTANT-578;So;0;ON;;;;;N;;;;; +1CDBC;BLOCK OCTANT-1578;So;0;ON;;;;;N;;;;; +1CDBD;BLOCK OCTANT-2578;So;0;ON;;;;;N;;;;; +1CDBE;BLOCK OCTANT-12578;So;0;ON;;;;;N;;;;; +1CDBF;BLOCK OCTANT-3578;So;0;ON;;;;;N;;;;; +1CDC0;BLOCK OCTANT-13578;So;0;ON;;;;;N;;;;; +1CDC1;BLOCK OCTANT-23578;So;0;ON;;;;;N;;;;; +1CDC2;BLOCK OCTANT-123578;So;0;ON;;;;;N;;;;; +1CDC3;BLOCK OCTANT-4578;So;0;ON;;;;;N;;;;; +1CDC4;BLOCK OCTANT-14578;So;0;ON;;;;;N;;;;; +1CDC5;BLOCK OCTANT-24578;So;0;ON;;;;;N;;;;; +1CDC6;BLOCK OCTANT-124578;So;0;ON;;;;;N;;;;; +1CDC7;BLOCK OCTANT-34578;So;0;ON;;;;;N;;;;; +1CDC8;BLOCK OCTANT-134578;So;0;ON;;;;;N;;;;; +1CDC9;BLOCK OCTANT-234578;So;0;ON;;;;;N;;;;; +1CDCA;BLOCK OCTANT-1234578;So;0;ON;;;;;N;;;;; +1CDCB;BLOCK OCTANT-678;So;0;ON;;;;;N;;;;; +1CDCC;BLOCK OCTANT-1678;So;0;ON;;;;;N;;;;; +1CDCD;BLOCK OCTANT-2678;So;0;ON;;;;;N;;;;; +1CDCE;BLOCK OCTANT-12678;So;0;ON;;;;;N;;;;; +1CDCF;BLOCK OCTANT-3678;So;0;ON;;;;;N;;;;; +1CDD0;BLOCK OCTANT-13678;So;0;ON;;;;;N;;;;; +1CDD1;BLOCK OCTANT-23678;So;0;ON;;;;;N;;;;; +1CDD2;BLOCK OCTANT-123678;So;0;ON;;;;;N;;;;; +1CDD3;BLOCK OCTANT-4678;So;0;ON;;;;;N;;;;; +1CDD4;BLOCK OCTANT-14678;So;0;ON;;;;;N;;;;; +1CDD5;BLOCK OCTANT-24678;So;0;ON;;;;;N;;;;; +1CDD6;BLOCK OCTANT-124678;So;0;ON;;;;;N;;;;; +1CDD7;BLOCK OCTANT-34678;So;0;ON;;;;;N;;;;; +1CDD8;BLOCK OCTANT-134678;So;0;ON;;;;;N;;;;; +1CDD9;BLOCK OCTANT-234678;So;0;ON;;;;;N;;;;; +1CDDA;BLOCK OCTANT-1234678;So;0;ON;;;;;N;;;;; +1CDDB;BLOCK OCTANT-15678;So;0;ON;;;;;N;;;;; +1CDDC;BLOCK OCTANT-25678;So;0;ON;;;;;N;;;;; +1CDDD;BLOCK OCTANT-125678;So;0;ON;;;;;N;;;;; +1CDDE;BLOCK OCTANT-35678;So;0;ON;;;;;N;;;;; +1CDDF;BLOCK OCTANT-235678;So;0;ON;;;;;N;;;;; +1CDE0;BLOCK OCTANT-1235678;So;0;ON;;;;;N;;;;; +1CDE1;BLOCK OCTANT-45678;So;0;ON;;;;;N;;;;; +1CDE2;BLOCK OCTANT-145678;So;0;ON;;;;;N;;;;; +1CDE3;BLOCK OCTANT-1245678;So;0;ON;;;;;N;;;;; +1CDE4;BLOCK OCTANT-1345678;So;0;ON;;;;;N;;;;; +1CDE5;BLOCK OCTANT-2345678;So;0;ON;;;;;N;;;;; +1CDE6;TOP HALF STANDING PERSON;So;0;ON;;;;;N;;;;; +1CDE7;BOTTOM HALF STANDING PERSON;So;0;ON;;;;;N;;;;; +1CDE8;TOP HALF RIGHT-FACING RUNNER FRAME-1;So;0;ON;;;;;N;;;;; +1CDE9;BOTTOM HALF RIGHT-FACING RUNNER FRAME-1;So;0;ON;;;;;N;;;;; +1CDEA;TOP HALF RIGHT-FACING RUNNER FRAME-2;So;0;ON;;;;;N;;;;; +1CDEB;BOTTOM HALF RIGHT-FACING RUNNER FRAME-2;So;0;ON;;;;;N;;;;; +1CDEC;TOP HALF LEFT-FACING RUNNER FRAME-1;So;0;ON;;;;;N;;;;; +1CDED;BOTTOM HALF LEFT-FACING RUNNER FRAME-1;So;0;ON;;;;;N;;;;; +1CDEE;TOP HALF LEFT-FACING RUNNER FRAME-2;So;0;ON;;;;;N;;;;; +1CDEF;BOTTOM HALF LEFT-FACING RUNNER FRAME-2;So;0;ON;;;;;N;;;;; +1CDF0;TOP HALF FORWARD-FACING RUNNER;So;0;ON;;;;;N;;;;; +1CDF1;BOTTOM HALF FORWARD-FACING RUNNER FRAME-1;So;0;ON;;;;;N;;;;; +1CDF2;BOTTOM HALF FORWARD-FACING RUNNER FRAME-2;So;0;ON;;;;;N;;;;; +1CDF3;BOTTOM HALF FORWARD-FACING RUNNER FRAME-3;So;0;ON;;;;;N;;;;; +1CDF4;BOTTOM HALF FORWARD-FACING RUNNER FRAME-4;So;0;ON;;;;;N;;;;; +1CDF5;MOON LANDER;So;0;ON;;;;;N;;;;; +1CDF6;TOP HALF FLAILING ROBOT FRAME-1;So;0;ON;;;;;N;;;;; +1CDF7;TOP HALF FLAILING ROBOT FRAME-2;So;0;ON;;;;;N;;;;; +1CDF8;DOWN-POINTING AIRPLANE;So;0;ON;;;;;N;;;;; +1CDF9;LEFT-POINTING AIRPLANE;So;0;ON;;;;;N;;;;; +1CDFA;SMALL UP-POINTING AIRPLANE;So;0;ON;;;;;N;;;;; +1CDFB;UP-POINTING FROG;So;0;ON;;;;;N;;;;; +1CDFC;DOWN-POINTING FROG;So;0;ON;;;;;N;;;;; +1CDFD;EXPLOSION FRAME-1;So;0;ON;;;;;N;;;;; +1CDFE;EXPLOSION FRAME-2;So;0;ON;;;;;N;;;;; +1CDFF;EXPLOSION FRAME-3;So;0;ON;;;;;N;;;;; +1CE00;RIGHT HALF AND LEFT HALF WHITE CIRCLE;So;0;ON;;;;;N;;;;; +1CE01;LOWER HALF AND UPPER HALF WHITE CIRCLE;So;0;ON;;;;;N;;;;; +1CE02;EXPLOSION AT HORIZON;So;0;ON;;;;;N;;;;; +1CE03;UPPER HALF HEAVY WHITE SQUARE;So;0;ON;;;;;N;;;;; +1CE04;LOWER HALF HEAVY WHITE SQUARE;So;0;ON;;;;;N;;;;; +1CE05;HEAVY WHITE SQUARE CONTAINING BLACK VERY SMALL SQUARE;So;0;ON;;;;;N;;;;; +1CE06;WHITE VERTICAL RECTANGLE WITH HORIZONTAL BAR;So;0;ON;;;;;N;;;;; +1CE07;TOP LEFT BLACK LEFT-POINTING SMALL TRIANGLE;So;0;ON;;;;;N;;;;; +1CE08;FUNNEL;So;0;ON;;;;;N;;;;; +1CE09;BOX DRAWINGS DOUBLE DIAGONAL LOWER LEFT TO MIDDLE CENTRE TO LOWER RIGHT;So;0;ON;;;;;N;;;;; +1CE0A;BOX DRAWINGS DOUBLE DIAGONAL UPPER LEFT TO MIDDLE CENTRE TO UPPER RIGHT;So;0;ON;;;;;N;;;;; +1CE0B;LEFT HALF WHITE ELLIPSE;So;0;ON;;;;;N;;;;; +1CE0C;RIGHT HALF WHITE ELLIPSE;So;0;ON;;;;;N;;;;; +1CE0D;LEFT HALF TRIPLE DASH HORIZONTAL;So;0;ON;;;;;N;;;;; +1CE0E;RIGHT HALF TRIPLE DASH HORIZONTAL;So;0;ON;;;;;N;;;;; +1CE0F;HORIZONTAL LINE WITH TICK MARK;So;0;ON;;;;;N;;;;; +1CE10;LEFT HALF HORIZONTAL LINE WITH THREE TICK MARKS;So;0;ON;;;;;N;;;;; +1CE11;RIGHT HALF HORIZONTAL LINE WITH THREE TICK MARKS;So;0;ON;;;;;N;;;;; +1CE12;HORIZONTAL LINE WITH THREE TICK MARKS;So;0;ON;;;;;N;;;;; +1CE13;LOWER HALF VERTICAL LINE WITH THREE TICK MARKS;So;0;ON;;;;;N;;;;; +1CE14;UPPER HALF VERTICAL LINE WITH THREE TICK MARKS;So;0;ON;;;;;N;;;;; +1CE15;VERTICAL LINE WITH THREE TICK MARKS;So;0;ON;;;;;N;;;;; +1CE16;BOX DRAWINGS LIGHT VERTICAL AND TOP RIGHT;So;0;ON;;;;;N;;;;; +1CE17;BOX DRAWINGS LIGHT VERTICAL AND BOTTOM RIGHT;So;0;ON;;;;;N;;;;; +1CE18;BOX DRAWINGS LIGHT VERTICAL AND TOP LEFT;So;0;ON;;;;;N;;;;; +1CE19;BOX DRAWINGS LIGHT VERTICAL AND BOTTOM LEFT;So;0;ON;;;;;N;;;;; +1CE1A;LARGE TYPE PIECE UPPER LEFT ARC;So;0;ON;;;;;N;;;;; +1CE1B;LARGE TYPE PIECE UPPER LEFT CORNER;So;0;ON;;;;;N;;;;; +1CE1C;LARGE TYPE PIECE UPPER TERMINAL;So;0;ON;;;;;N;;;;; +1CE1D;LARGE TYPE PIECE UPPER LEFT CROTCH;So;0;ON;;;;;N;;;;; +1CE1E;LARGE TYPE PIECE LEFT ARM;So;0;ON;;;;;N;;;;; +1CE1F;LARGE TYPE PIECE CROSSBAR;So;0;ON;;;;;N;;;;; +1CE20;LARGE TYPE PIECE CROSSBAR WITH LOWER STEM;So;0;ON;;;;;N;;;;; +1CE21;LARGE TYPE PIECE UPPER HALF VERTEX OF M;So;0;ON;;;;;N;;;;; +1CE22;LARGE TYPE PIECE DIAGONAL LOWER LEFT;So;0;ON;;;;;N;;;;; +1CE23;LARGE TYPE PIECE SHORT UPPER TERMINAL;So;0;ON;;;;;N;;;;; +1CE24;LARGE TYPE PIECE UPPER RIGHT ARC;So;0;ON;;;;;N;;;;; +1CE25;LARGE TYPE PIECE RIGHT ARM;So;0;ON;;;;;N;;;;; +1CE26;LARGE TYPE PIECE UPPER RIGHT CROTCH;So;0;ON;;;;;N;;;;; +1CE27;LARGE TYPE PIECE UPPER RIGHT CORNER;So;0;ON;;;;;N;;;;; +1CE28;LARGE TYPE PIECE STEM WITH RIGHT CROSSBAR;So;0;ON;;;;;N;;;;; +1CE29;LARGE TYPE PIECE STEM;So;0;ON;;;;;N;;;;; +1CE2A;LARGE TYPE PIECE DIAGONAL UPPER RIGHT AND LOWER RIGHT;So;0;ON;;;;;N;;;;; +1CE2B;LARGE TYPE PIECE DIAGONAL UPPER RIGHT;So;0;ON;;;;;N;;;;; +1CE2C;LARGE TYPE PIECE DIAGONAL LOWER RIGHT;So;0;ON;;;;;N;;;;; +1CE2D;LARGE TYPE PIECE SHORT LOWER TERMINAL;So;0;ON;;;;;N;;;;; +1CE2E;LARGE TYPE PIECE LOWER LEFT AND UPPER LEFT ARC;So;0;ON;;;;;N;;;;; +1CE2F;LARGE TYPE PIECE CENTRE OF K;So;0;ON;;;;;N;;;;; +1CE30;LARGE TYPE PIECE LOWER HALF VERTEX OF M;So;0;ON;;;;;N;;;;; +1CE31;LARGE TYPE PIECE UPPER HALF VERTEX OF W;So;0;ON;;;;;N;;;;; +1CE32;LARGE TYPE PIECE CENTRE OF X;So;0;ON;;;;;N;;;;; +1CE33;LARGE TYPE PIECE CENTRE OF Y;So;0;ON;;;;;N;;;;; +1CE34;LARGE TYPE PIECE CENTRE OF Z WITH CROSSBAR;So;0;ON;;;;;N;;;;; +1CE35;LARGE TYPE PIECE RAISED UPPER LEFT ARC;So;0;ON;;;;;N;;;;; +1CE36;LARGE TYPE PIECE STEM WITH LEFT CROSSBAR;So;0;ON;;;;;N;;;;; +1CE37;LARGE TYPE PIECE LOWER RIGHT AND UPPER RIGHT ARC;So;0;ON;;;;;N;;;;; +1CE38;LARGE TYPE PIECE DIAGONAL UPPER LEFT AND LOWER LEFT;So;0;ON;;;;;N;;;;; +1CE39;LARGE TYPE PIECE STEM WITH LEFT JOINT;So;0;ON;;;;;N;;;;; +1CE3A;LARGE TYPE PIECE STEM WITH CROSSBAR;So;0;ON;;;;;N;;;;; +1CE3B;LARGE TYPE PIECE DIAGONAL UPPER LEFT;So;0;ON;;;;;N;;;;; +1CE3C;LARGE TYPE PIECE LOWER TERMINAL;So;0;ON;;;;;N;;;;; +1CE3D;LARGE TYPE PIECE LOWER LEFT CORNER;So;0;ON;;;;;N;;;;; +1CE3E;LARGE TYPE PIECE LOWER LEFT ARC;So;0;ON;;;;;N;;;;; +1CE3F;LARGE TYPE PIECE LOWER LEFT CROTCH;So;0;ON;;;;;N;;;;; +1CE40;LARGE TYPE PIECE CROSSBAR WITH UPPER STEM;So;0;ON;;;;;N;;;;; +1CE41;LARGE TYPE PIECE VERTEX OF V;So;0;ON;;;;;N;;;;; +1CE42;LARGE TYPE PIECE LOWER HALF VERTEX OF W;So;0;ON;;;;;N;;;;; +1CE43;LARGE TYPE PIECE LOWER RIGHT ARC;So;0;ON;;;;;N;;;;; +1CE44;LARGE TYPE PIECE LOWER RIGHT CORNER;So;0;ON;;;;;N;;;;; +1CE45;LARGE TYPE PIECE LOWER RIGHT ARC WITH TAIL;So;0;ON;;;;;N;;;;; +1CE46;LARGE TYPE PIECE LOWER RIGHT CROTCH;So;0;ON;;;;;N;;;;; +1CE47;LARGE TYPE PIECE STEM-45;So;0;ON;;;;;N;;;;; +1CE48;LARGE TYPE PIECE STEM-2345;So;0;ON;;;;;N;;;;; +1CE49;LARGE TYPE PIECE STEM-4;So;0;ON;;;;;N;;;;; +1CE4A;LARGE TYPE PIECE STEM-34;So;0;ON;;;;;N;;;;; +1CE4B;LARGE TYPE PIECE STEM-234;So;0;ON;;;;;N;;;;; +1CE4C;LARGE TYPE PIECE STEM-1234;So;0;ON;;;;;N;;;;; +1CE4D;LARGE TYPE PIECE STEM-3;So;0;ON;;;;;N;;;;; +1CE4E;LARGE TYPE PIECE STEM-23;So;0;ON;;;;;N;;;;; +1CE4F;LARGE TYPE PIECE STEM-2;So;0;ON;;;;;N;;;;; +1CE50;LARGE TYPE PIECE STEM-12;So;0;ON;;;;;N;;;;; +1CE51;SEPARATED BLOCK SEXTANT-1;So;0;ON;;;;;N;;;;; +1CE52;SEPARATED BLOCK SEXTANT-2;So;0;ON;;;;;N;;;;; +1CE53;SEPARATED BLOCK SEXTANT-12;So;0;ON;;;;;N;;;;; +1CE54;SEPARATED BLOCK SEXTANT-3;So;0;ON;;;;;N;;;;; +1CE55;SEPARATED BLOCK SEXTANT-13;So;0;ON;;;;;N;;;;; +1CE56;SEPARATED BLOCK SEXTANT-23;So;0;ON;;;;;N;;;;; +1CE57;SEPARATED BLOCK SEXTANT-123;So;0;ON;;;;;N;;;;; +1CE58;SEPARATED BLOCK SEXTANT-4;So;0;ON;;;;;N;;;;; +1CE59;SEPARATED BLOCK SEXTANT-14;So;0;ON;;;;;N;;;;; +1CE5A;SEPARATED BLOCK SEXTANT-24;So;0;ON;;;;;N;;;;; +1CE5B;SEPARATED BLOCK SEXTANT-124;So;0;ON;;;;;N;;;;; +1CE5C;SEPARATED BLOCK SEXTANT-34;So;0;ON;;;;;N;;;;; +1CE5D;SEPARATED BLOCK SEXTANT-134;So;0;ON;;;;;N;;;;; +1CE5E;SEPARATED BLOCK SEXTANT-234;So;0;ON;;;;;N;;;;; +1CE5F;SEPARATED BLOCK SEXTANT-1234;So;0;ON;;;;;N;;;;; +1CE60;SEPARATED BLOCK SEXTANT-5;So;0;ON;;;;;N;;;;; +1CE61;SEPARATED BLOCK SEXTANT-15;So;0;ON;;;;;N;;;;; +1CE62;SEPARATED BLOCK SEXTANT-25;So;0;ON;;;;;N;;;;; +1CE63;SEPARATED BLOCK SEXTANT-125;So;0;ON;;;;;N;;;;; +1CE64;SEPARATED BLOCK SEXTANT-35;So;0;ON;;;;;N;;;;; +1CE65;SEPARATED BLOCK SEXTANT-135;So;0;ON;;;;;N;;;;; +1CE66;SEPARATED BLOCK SEXTANT-235;So;0;ON;;;;;N;;;;; +1CE67;SEPARATED BLOCK SEXTANT-1235;So;0;ON;;;;;N;;;;; +1CE68;SEPARATED BLOCK SEXTANT-45;So;0;ON;;;;;N;;;;; +1CE69;SEPARATED BLOCK SEXTANT-145;So;0;ON;;;;;N;;;;; +1CE6A;SEPARATED BLOCK SEXTANT-245;So;0;ON;;;;;N;;;;; +1CE6B;SEPARATED BLOCK SEXTANT-1245;So;0;ON;;;;;N;;;;; +1CE6C;SEPARATED BLOCK SEXTANT-345;So;0;ON;;;;;N;;;;; +1CE6D;SEPARATED BLOCK SEXTANT-1345;So;0;ON;;;;;N;;;;; +1CE6E;SEPARATED BLOCK SEXTANT-2345;So;0;ON;;;;;N;;;;; +1CE6F;SEPARATED BLOCK SEXTANT-12345;So;0;ON;;;;;N;;;;; +1CE70;SEPARATED BLOCK SEXTANT-6;So;0;ON;;;;;N;;;;; +1CE71;SEPARATED BLOCK SEXTANT-16;So;0;ON;;;;;N;;;;; +1CE72;SEPARATED BLOCK SEXTANT-26;So;0;ON;;;;;N;;;;; +1CE73;SEPARATED BLOCK SEXTANT-126;So;0;ON;;;;;N;;;;; +1CE74;SEPARATED BLOCK SEXTANT-36;So;0;ON;;;;;N;;;;; +1CE75;SEPARATED BLOCK SEXTANT-136;So;0;ON;;;;;N;;;;; +1CE76;SEPARATED BLOCK SEXTANT-236;So;0;ON;;;;;N;;;;; +1CE77;SEPARATED BLOCK SEXTANT-1236;So;0;ON;;;;;N;;;;; +1CE78;SEPARATED BLOCK SEXTANT-46;So;0;ON;;;;;N;;;;; +1CE79;SEPARATED BLOCK SEXTANT-146;So;0;ON;;;;;N;;;;; +1CE7A;SEPARATED BLOCK SEXTANT-246;So;0;ON;;;;;N;;;;; +1CE7B;SEPARATED BLOCK SEXTANT-1246;So;0;ON;;;;;N;;;;; +1CE7C;SEPARATED BLOCK SEXTANT-346;So;0;ON;;;;;N;;;;; +1CE7D;SEPARATED BLOCK SEXTANT-1346;So;0;ON;;;;;N;;;;; +1CE7E;SEPARATED BLOCK SEXTANT-2346;So;0;ON;;;;;N;;;;; +1CE7F;SEPARATED BLOCK SEXTANT-12346;So;0;ON;;;;;N;;;;; +1CE80;SEPARATED BLOCK SEXTANT-56;So;0;ON;;;;;N;;;;; +1CE81;SEPARATED BLOCK SEXTANT-156;So;0;ON;;;;;N;;;;; +1CE82;SEPARATED BLOCK SEXTANT-256;So;0;ON;;;;;N;;;;; +1CE83;SEPARATED BLOCK SEXTANT-1256;So;0;ON;;;;;N;;;;; +1CE84;SEPARATED BLOCK SEXTANT-356;So;0;ON;;;;;N;;;;; +1CE85;SEPARATED BLOCK SEXTANT-1356;So;0;ON;;;;;N;;;;; +1CE86;SEPARATED BLOCK SEXTANT-2356;So;0;ON;;;;;N;;;;; +1CE87;SEPARATED BLOCK SEXTANT-12356;So;0;ON;;;;;N;;;;; +1CE88;SEPARATED BLOCK SEXTANT-456;So;0;ON;;;;;N;;;;; +1CE89;SEPARATED BLOCK SEXTANT-1456;So;0;ON;;;;;N;;;;; +1CE8A;SEPARATED BLOCK SEXTANT-2456;So;0;ON;;;;;N;;;;; +1CE8B;SEPARATED BLOCK SEXTANT-12456;So;0;ON;;;;;N;;;;; +1CE8C;SEPARATED BLOCK SEXTANT-3456;So;0;ON;;;;;N;;;;; +1CE8D;SEPARATED BLOCK SEXTANT-13456;So;0;ON;;;;;N;;;;; +1CE8E;SEPARATED BLOCK SEXTANT-23456;So;0;ON;;;;;N;;;;; +1CE8F;SEPARATED BLOCK SEXTANT-123456;So;0;ON;;;;;N;;;;; +1CE90;UPPER LEFT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE91;UPPER CENTRE LEFT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE92;UPPER CENTRE RIGHT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE93;UPPER RIGHT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE94;UPPER MIDDLE LEFT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE95;UPPER MIDDLE CENTRE LEFT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE96;UPPER MIDDLE CENTRE RIGHT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE97;UPPER MIDDLE RIGHT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE98;LOWER MIDDLE LEFT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE99;LOWER MIDDLE CENTRE LEFT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE9A;LOWER MIDDLE CENTRE RIGHT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE9B;LOWER MIDDLE RIGHT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE9C;LOWER LEFT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE9D;LOWER CENTRE LEFT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE9E;LOWER CENTRE RIGHT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE9F;LOWER RIGHT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CEA0;RIGHT HALF LOWER ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEA1;RIGHT THREE QUARTERS LOWER ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEA2;LEFT THREE QUARTERS LOWER ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEA3;LEFT HALF LOWER ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEA4;LOWER HALF LEFT ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEA5;LOWER THREE QUARTERS LEFT ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEA6;UPPER THREE QUARTERS LEFT ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEA7;UPPER HALF LEFT ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEA8;LEFT HALF UPPER ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEA9;LEFT THREE QUARTERS UPPER ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEAA;RIGHT THREE QUARTERS UPPER ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEAB;RIGHT HALF UPPER ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEAC;UPPER HALF RIGHT ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEAD;UPPER THREE QUARTERS RIGHT ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEAE;LOWER THREE QUARTERS RIGHT ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEAF;LOWER HALF RIGHT ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEB0;HORIZONTAL ZIGZAG LINE;So;0;ON;;;;;N;;;;; +1CEB1;KEYHOLE;So;0;ON;;;;;N;;;;; +1CEB2;OLD PERSONAL COMPUTER WITH MONITOR IN PORTRAIT ORIENTATION;So;0;ON;;;;;N;;;;; +1CEB3;BLACK RIGHT TRIANGLE CARET;So;0;ON;;;;;N;;;;; +1CEBA;FRAGILE SYMBOL;So;0;ON;;;;;N;;;;; +1CEBB;OFFICE BUILDING SYMBOL;So;0;ON;;;;;N;;;;; +1CEBC;TREE SYMBOL;So;0;ON;;;;;N;;;;; +1CEBD;APPLE SYMBOL;So;0;ON;;;;;N;;;;; +1CEBE;CHERRY SYMBOL;So;0;ON;;;;;N;;;;; +1CEBF;STRAWBERRY SYMBOL;So;0;ON;;;;;N;;;;; +1CEC0;HEBE;So;0;ON;;;;;N;;;;; +1CEC1;IRIS;So;0;ON;;;;;N;;;;; +1CEC2;FLORA;So;0;ON;;;;;N;;;;; +1CEC3;METIS;So;0;ON;;;;;N;;;;; +1CEC4;PARTHENOPE;So;0;ON;;;;;N;;;;; +1CEC5;VICTORIA;So;0;ON;;;;;N;;;;; +1CEC6;EGERIA;So;0;ON;;;;;N;;;;; +1CEC7;IRENE;So;0;ON;;;;;N;;;;; +1CEC8;EUNOMIA;So;0;ON;;;;;N;;;;; +1CEC9;PSYCHE;So;0;ON;;;;;N;;;;; +1CECA;THETIS;So;0;ON;;;;;N;;;;; +1CECB;MELPOMENE;So;0;ON;;;;;N;;;;; +1CECC;FORTUNA;So;0;ON;;;;;N;;;;; +1CECD;ASTRONOMICAL SYMBOL FOR ASTEROID PROSERPINA;So;0;ON;;;;;N;;;;; +1CECE;BELLONA;So;0;ON;;;;;N;;;;; +1CECF;AMPHITRITE;So;0;ON;;;;;N;;;;; +1CED0;LEUKOTHEA;So;0;ON;;;;;N;;;;; +1CEE0;GEOMANTIC FIGURE POPULUS;So;0;ON;;;;;N;;;;; +1CEE1;GEOMANTIC FIGURE TRISTITIA;So;0;ON;;;;;N;;;;; +1CEE2;GEOMANTIC FIGURE ALBUS;So;0;ON;;;;;N;;;;; +1CEE3;GEOMANTIC FIGURE FORTUNA MAJOR;So;0;ON;;;;;N;;;;; +1CEE4;GEOMANTIC FIGURE RUBEUS;So;0;ON;;;;;N;;;;; +1CEE5;GEOMANTIC FIGURE ACQUISITIO;So;0;ON;;;;;N;;;;; +1CEE6;GEOMANTIC FIGURE CONJUNCTIO;So;0;ON;;;;;N;;;;; +1CEE7;GEOMANTIC FIGURE CAPUT DRACONIS;So;0;ON;;;;;N;;;;; +1CEE8;GEOMANTIC FIGURE LAETITIA;So;0;ON;;;;;N;;;;; +1CEE9;GEOMANTIC FIGURE CARCER;So;0;ON;;;;;N;;;;; +1CEEA;GEOMANTIC FIGURE AMISSIO;So;0;ON;;;;;N;;;;; +1CEEB;GEOMANTIC FIGURE PUELLA;So;0;ON;;;;;N;;;;; +1CEEC;GEOMANTIC FIGURE FORTUNA MINOR;So;0;ON;;;;;N;;;;; +1CEED;GEOMANTIC FIGURE PUER;So;0;ON;;;;;N;;;;; +1CEEE;GEOMANTIC FIGURE CAUDA DRACONIS;So;0;ON;;;;;N;;;;; +1CEEF;GEOMANTIC FIGURE VIA;So;0;ON;;;;;N;;;;; +1CEF0;MEDIUM SMALL WHITE CIRCLE WITH HORIZONTAL BAR;Sm;0;ON;;;;;N;;;;; +1CF00;ZNAMENNY COMBINING MARK GORAZDO NIZKO S KRYZHEM ON LEFT;Mn;0;NSM;;;;;N;;;;; +1CF01;ZNAMENNY COMBINING MARK NIZKO S KRYZHEM ON LEFT;Mn;0;NSM;;;;;N;;;;; +1CF02;ZNAMENNY COMBINING MARK TSATA ON LEFT;Mn;0;NSM;;;;;N;;;;; +1CF03;ZNAMENNY COMBINING MARK GORAZDO NIZKO ON LEFT;Mn;0;NSM;;;;;N;;;;; +1CF04;ZNAMENNY COMBINING MARK NIZKO ON LEFT;Mn;0;NSM;;;;;N;;;;; +1CF05;ZNAMENNY COMBINING MARK SREDNE ON LEFT;Mn;0;NSM;;;;;N;;;;; +1CF06;ZNAMENNY COMBINING MARK MALO POVYSHE ON LEFT;Mn;0;NSM;;;;;N;;;;; +1CF07;ZNAMENNY COMBINING MARK POVYSHE ON LEFT;Mn;0;NSM;;;;;N;;;;; +1CF08;ZNAMENNY COMBINING MARK VYSOKO ON LEFT;Mn;0;NSM;;;;;N;;;;; +1CF09;ZNAMENNY COMBINING MARK MALO POVYSHE S KHOKHLOM ON LEFT;Mn;0;NSM;;;;;N;;;;; +1CF0A;ZNAMENNY COMBINING MARK POVYSHE S KHOKHLOM ON LEFT;Mn;0;NSM;;;;;N;;;;; +1CF0B;ZNAMENNY COMBINING MARK VYSOKO S KHOKHLOM ON LEFT;Mn;0;NSM;;;;;N;;;;; +1CF0C;ZNAMENNY COMBINING MARK GORAZDO NIZKO S KRYZHEM ON RIGHT;Mn;0;NSM;;;;;N;;;;; +1CF0D;ZNAMENNY COMBINING MARK NIZKO S KRYZHEM ON RIGHT;Mn;0;NSM;;;;;N;;;;; +1CF0E;ZNAMENNY COMBINING MARK TSATA ON RIGHT;Mn;0;NSM;;;;;N;;;;; +1CF0F;ZNAMENNY COMBINING MARK GORAZDO NIZKO ON RIGHT;Mn;0;NSM;;;;;N;;;;; +1CF10;ZNAMENNY COMBINING MARK NIZKO ON RIGHT;Mn;0;NSM;;;;;N;;;;; +1CF11;ZNAMENNY COMBINING MARK SREDNE ON RIGHT;Mn;0;NSM;;;;;N;;;;; +1CF12;ZNAMENNY COMBINING MARK MALO POVYSHE ON RIGHT;Mn;0;NSM;;;;;N;;;;; +1CF13;ZNAMENNY COMBINING MARK POVYSHE ON RIGHT;Mn;0;NSM;;;;;N;;;;; +1CF14;ZNAMENNY COMBINING MARK VYSOKO ON RIGHT;Mn;0;NSM;;;;;N;;;;; +1CF15;ZNAMENNY COMBINING MARK MALO POVYSHE S KHOKHLOM ON RIGHT;Mn;0;NSM;;;;;N;;;;; +1CF16;ZNAMENNY COMBINING MARK POVYSHE S KHOKHLOM ON RIGHT;Mn;0;NSM;;;;;N;;;;; +1CF17;ZNAMENNY COMBINING MARK VYSOKO S KHOKHLOM ON RIGHT;Mn;0;NSM;;;;;N;;;;; +1CF18;ZNAMENNY COMBINING MARK TSATA S KRYZHEM;Mn;0;NSM;;;;;N;;;;; +1CF19;ZNAMENNY COMBINING MARK MALO POVYSHE S KRYZHEM;Mn;0;NSM;;;;;N;;;;; +1CF1A;ZNAMENNY COMBINING MARK STRANNO MALO POVYSHE;Mn;0;NSM;;;;;N;;;;; +1CF1B;ZNAMENNY COMBINING MARK POVYSHE S KRYZHEM;Mn;0;NSM;;;;;N;;;;; +1CF1C;ZNAMENNY COMBINING MARK POVYSHE STRANNO;Mn;0;NSM;;;;;N;;;;; +1CF1D;ZNAMENNY COMBINING MARK VYSOKO S KRYZHEM;Mn;0;NSM;;;;;N;;;;; +1CF1E;ZNAMENNY COMBINING MARK MALO POVYSHE STRANNO;Mn;0;NSM;;;;;N;;;;; +1CF1F;ZNAMENNY COMBINING MARK GORAZDO VYSOKO;Mn;0;NSM;;;;;N;;;;; +1CF20;ZNAMENNY COMBINING MARK ZELO;Mn;0;NSM;;;;;N;;;;; +1CF21;ZNAMENNY COMBINING MARK ON;Mn;0;NSM;;;;;N;;;;; +1CF22;ZNAMENNY COMBINING MARK RAVNO;Mn;0;NSM;;;;;N;;;;; +1CF23;ZNAMENNY COMBINING MARK TIKHAYA;Mn;0;NSM;;;;;N;;;;; +1CF24;ZNAMENNY COMBINING MARK BORZAYA;Mn;0;NSM;;;;;N;;;;; +1CF25;ZNAMENNY COMBINING MARK UDARKA;Mn;0;NSM;;;;;N;;;;; +1CF26;ZNAMENNY COMBINING MARK PODVERTKA;Mn;0;NSM;;;;;N;;;;; +1CF27;ZNAMENNY COMBINING MARK LOMKA;Mn;0;NSM;;;;;N;;;;; +1CF28;ZNAMENNY COMBINING MARK KUPNAYA;Mn;0;NSM;;;;;N;;;;; +1CF29;ZNAMENNY COMBINING MARK KACHKA;Mn;0;NSM;;;;;N;;;;; +1CF2A;ZNAMENNY COMBINING MARK ZEVOK;Mn;0;NSM;;;;;N;;;;; +1CF2B;ZNAMENNY COMBINING MARK SKOBA;Mn;0;NSM;;;;;N;;;;; +1CF2C;ZNAMENNY COMBINING MARK RAZSEKA;Mn;0;NSM;;;;;N;;;;; +1CF2D;ZNAMENNY COMBINING MARK KRYZH ON LEFT;Mn;0;NSM;;;;;N;;;;; +1CF30;ZNAMENNY COMBINING TONAL RANGE MARK MRACHNO;Mn;0;NSM;;;;;N;;;;; +1CF31;ZNAMENNY COMBINING TONAL RANGE MARK SVETLO;Mn;0;NSM;;;;;N;;;;; +1CF32;ZNAMENNY COMBINING TONAL RANGE MARK TRESVETLO;Mn;0;NSM;;;;;N;;;;; +1CF33;ZNAMENNY COMBINING MARK ZADERZHKA;Mn;0;NSM;;;;;N;;;;; +1CF34;ZNAMENNY COMBINING MARK DEMESTVENNY ZADERZHKA;Mn;0;NSM;;;;;N;;;;; +1CF35;ZNAMENNY COMBINING MARK OTSECHKA;Mn;0;NSM;;;;;N;;;;; +1CF36;ZNAMENNY COMBINING MARK PODCHASHIE;Mn;0;NSM;;;;;N;;;;; +1CF37;ZNAMENNY COMBINING MARK PODCHASHIE WITH VERTICAL STROKE;Mn;0;NSM;;;;;N;;;;; +1CF38;ZNAMENNY COMBINING MARK CHASHKA;Mn;0;NSM;;;;;N;;;;; +1CF39;ZNAMENNY COMBINING MARK CHASHKA POLNAYA;Mn;0;NSM;;;;;N;;;;; +1CF3A;ZNAMENNY COMBINING MARK OBLACHKO;Mn;0;NSM;;;;;N;;;;; +1CF3B;ZNAMENNY COMBINING MARK SOROCHYA NOZHKA;Mn;0;NSM;;;;;N;;;;; +1CF3C;ZNAMENNY COMBINING MARK TOCHKA;Mn;0;NSM;;;;;N;;;;; +1CF3D;ZNAMENNY COMBINING MARK DVOETOCHIE;Mn;0;NSM;;;;;N;;;;; +1CF3E;ZNAMENNY COMBINING ATTACHING VERTICAL OMET;Mn;0;NSM;;;;;N;;;;; +1CF3F;ZNAMENNY COMBINING MARK CURVED OMET;Mn;0;NSM;;;;;N;;;;; +1CF40;ZNAMENNY COMBINING MARK KRYZH;Mn;0;NSM;;;;;N;;;;; +1CF41;ZNAMENNY COMBINING LOWER TONAL RANGE INDICATOR;Mn;0;NSM;;;;;N;;;;; +1CF42;ZNAMENNY PRIZNAK MODIFIER LEVEL-2;Mn;0;NSM;;;;;N;;;;; +1CF43;ZNAMENNY PRIZNAK MODIFIER LEVEL-3;Mn;0;NSM;;;;;N;;;;; +1CF44;ZNAMENNY PRIZNAK MODIFIER DIRECTION FLIP;Mn;0;NSM;;;;;N;;;;; +1CF45;ZNAMENNY PRIZNAK MODIFIER KRYZH;Mn;0;NSM;;;;;N;;;;; +1CF46;ZNAMENNY PRIZNAK MODIFIER ROG;Mn;0;NSM;;;;;N;;;;; +1CF50;ZNAMENNY NEUME KRYUK;So;0;L;;;;;N;;;;; +1CF51;ZNAMENNY NEUME KRYUK TIKHY;So;0;L;;;;;N;;;;; +1CF52;ZNAMENNY NEUME PARAKLIT;So;0;L;;;;;N;;;;; +1CF53;ZNAMENNY NEUME DVA V CHELNU;So;0;L;;;;;N;;;;; +1CF54;ZNAMENNY NEUME KLYUCH;So;0;L;;;;;N;;;;; +1CF55;ZNAMENNY NEUME ZANOZHEK;So;0;L;;;;;N;;;;; +1CF56;ZNAMENNY NEUME STOPITSA;So;0;L;;;;;N;;;;; +1CF57;ZNAMENNY NEUME STOPITSA S OCHKOM;So;0;L;;;;;N;;;;; +1CF58;ZNAMENNY NEUME PEREVODKA;So;0;L;;;;;N;;;;; +1CF59;ZNAMENNY NEUME PEREVODKA NEPOSTOYANNAYA;So;0;L;;;;;N;;;;; +1CF5A;ZNAMENNY NEUME STOPITSA WITH SOROCHYA NOZHKA;So;0;L;;;;;N;;;;; +1CF5B;ZNAMENNY NEUME CHELYUSTKA;So;0;L;;;;;N;;;;; +1CF5C;ZNAMENNY NEUME PALKA;So;0;L;;;;;N;;;;; +1CF5D;ZNAMENNY NEUME ZAPYATAYA;So;0;L;;;;;N;;;;; +1CF5E;ZNAMENNY NEUME GOLUBCHIK BORZY;So;0;L;;;;;N;;;;; +1CF5F;ZNAMENNY NEUME GOLUBCHIK TIKHY;So;0;L;;;;;N;;;;; +1CF60;ZNAMENNY NEUME GOLUBCHIK MRACHNY;So;0;L;;;;;N;;;;; +1CF61;ZNAMENNY NEUME GOLUBCHIK SVETLY;So;0;L;;;;;N;;;;; +1CF62;ZNAMENNY NEUME GOLUBCHIK TRESVETLY;So;0;L;;;;;N;;;;; +1CF63;ZNAMENNY NEUME VRAKHIYA PROSTAYA;So;0;L;;;;;N;;;;; +1CF64;ZNAMENNY NEUME VRAKHIYA MRACHNAYA;So;0;L;;;;;N;;;;; +1CF65;ZNAMENNY NEUME VRAKHIYA SVETLAYA;So;0;L;;;;;N;;;;; +1CF66;ZNAMENNY NEUME VRAKHIYA TRESVETLAYA;So;0;L;;;;;N;;;;; +1CF67;ZNAMENNY NEUME VRAKHIYA KLYUCHEVAYA PROSTAYA;So;0;L;;;;;N;;;;; +1CF68;ZNAMENNY NEUME VRAKHIYA KLYUCHEVAYA MRACHNAYA;So;0;L;;;;;N;;;;; +1CF69;ZNAMENNY NEUME VRAKHIYA KLYUCHEVAYA SVETLAYA;So;0;L;;;;;N;;;;; +1CF6A;ZNAMENNY NEUME VRAKHIYA KLYUCHEVAYA TRESVETLAYA;So;0;L;;;;;N;;;;; +1CF6B;ZNAMENNY NEUME DOUBLE ZAPYATAYA;So;0;L;;;;;N;;;;; +1CF6C;ZNAMENNY NEUME REVERSED CHELYUSTKA;So;0;L;;;;;N;;;;; +1CF6D;ZNAMENNY NEUME DERBITSA;So;0;L;;;;;N;;;;; +1CF6E;ZNAMENNY NEUME KHAMILO;So;0;L;;;;;N;;;;; +1CF6F;ZNAMENNY NEUME CHASHKA;So;0;L;;;;;N;;;;; +1CF70;ZNAMENNY NEUME PODCHASHIE;So;0;L;;;;;N;;;;; +1CF71;ZNAMENNY NEUME SKAMEYTSA MRACHNAYA;So;0;L;;;;;N;;;;; +1CF72;ZNAMENNY NEUME SKAMEYTSA SVETLAYA;So;0;L;;;;;N;;;;; +1CF73;ZNAMENNY NEUME SKAMEYTSA TRESVETLAYA;So;0;L;;;;;N;;;;; +1CF74;ZNAMENNY NEUME SKAMEYTSA TIKHAYA;So;0;L;;;;;N;;;;; +1CF75;ZNAMENNY NEUME DEMESTVENNY KLYUCH;So;0;L;;;;;N;;;;; +1CF76;ZNAMENNY NEUME SKAMEYTSA KLYUCHEVAYA SVETLAYA;So;0;L;;;;;N;;;;; +1CF77;ZNAMENNY NEUME SKAMEYTSA KLYUCHENEPOSTOYANNAYA;So;0;L;;;;;N;;;;; +1CF78;ZNAMENNY NEUME SKAMEYTSA KLYUCHEVAYA TIKHAYA;So;0;L;;;;;N;;;;; +1CF79;ZNAMENNY NEUME SKAMEYTSA DVOECHELNAYA PROSTAYA;So;0;L;;;;;N;;;;; +1CF7A;ZNAMENNY NEUME SKAMEYTSA DVOECHELNAYA SVETLAYA;So;0;L;;;;;N;;;;; +1CF7B;ZNAMENNY NEUME SKAMEYTSA DVOECHELNAYA NEPOSTOYANNAYA;So;0;L;;;;;N;;;;; +1CF7C;ZNAMENNY NEUME SKAMEYTSA DVOECHELNAYA KLYUCHEVAYA;So;0;L;;;;;N;;;;; +1CF7D;ZNAMENNY NEUME SLOZHITIE;So;0;L;;;;;N;;;;; +1CF7E;ZNAMENNY NEUME SLOZHITIE S ZAPYATOY;So;0;L;;;;;N;;;;; +1CF7F;ZNAMENNY NEUME SLOZHITIE ZAKRYTOE;So;0;L;;;;;N;;;;; +1CF80;ZNAMENNY NEUME SLOZHITIE S KRYZHEM;So;0;L;;;;;N;;;;; +1CF81;ZNAMENNY NEUME KRYZH;So;0;L;;;;;N;;;;; +1CF82;ZNAMENNY NEUME ROG;So;0;L;;;;;N;;;;; +1CF83;ZNAMENNY NEUME FITA;So;0;L;;;;;N;;;;; +1CF84;ZNAMENNY NEUME KOBYLA;So;0;L;;;;;N;;;;; +1CF85;ZNAMENNY NEUME ZMEYTSA;So;0;L;;;;;N;;;;; +1CF86;ZNAMENNY NEUME STATYA;So;0;L;;;;;N;;;;; +1CF87;ZNAMENNY NEUME STATYA S ZAPYATOY;So;0;L;;;;;N;;;;; +1CF88;ZNAMENNY NEUME STATYA S KRYZHEM;So;0;L;;;;;N;;;;; +1CF89;ZNAMENNY NEUME STATYA S ZAPYATOY I KRYZHEM;So;0;L;;;;;N;;;;; +1CF8A;ZNAMENNY NEUME STATYA S KRYZHEM I ZAPYATOY;So;0;L;;;;;N;;;;; +1CF8B;ZNAMENNY NEUME STATYA ZAKRYTAYA;So;0;L;;;;;N;;;;; +1CF8C;ZNAMENNY NEUME STATYA ZAKRYTAYA S ZAPYATOY;So;0;L;;;;;N;;;;; +1CF8D;ZNAMENNY NEUME STATYA S ROGOM;So;0;L;;;;;N;;;;; +1CF8E;ZNAMENNY NEUME STATYA S DVUMYA ZAPYATYMI;So;0;L;;;;;N;;;;; +1CF8F;ZNAMENNY NEUME STATYA S ZAPYATOY I PODCHASHIEM;So;0;L;;;;;N;;;;; +1CF90;ZNAMENNY NEUME POLKULIZMY;So;0;L;;;;;N;;;;; +1CF91;ZNAMENNY NEUME STATYA NEPOSTOYANNAYA;So;0;L;;;;;N;;;;; +1CF92;ZNAMENNY NEUME STRELA PROSTAYA;So;0;L;;;;;N;;;;; +1CF93;ZNAMENNY NEUME STRELA MRACHNOTIKHAYA;So;0;L;;;;;N;;;;; +1CF94;ZNAMENNY NEUME STRELA KRYZHEVAYA;So;0;L;;;;;N;;;;; +1CF95;ZNAMENNY NEUME STRELA POLUPOVODNAYA;So;0;L;;;;;N;;;;; +1CF96;ZNAMENNY NEUME STRELA POVODNAYA;So;0;L;;;;;N;;;;; +1CF97;ZNAMENNY NEUME STRELA NEPOSTOYANNAYA;So;0;L;;;;;N;;;;; +1CF98;ZNAMENNY NEUME STRELA KLYUCHEPOVODNAYA;So;0;L;;;;;N;;;;; +1CF99;ZNAMENNY NEUME STRELA KLYUCHENEPOSTOYANNAYA;So;0;L;;;;;N;;;;; +1CF9A;ZNAMENNY NEUME STRELA TIKHAYA PUTNAYA;So;0;L;;;;;N;;;;; +1CF9B;ZNAMENNY NEUME STRELA DVOECHELNAYA;So;0;L;;;;;N;;;;; +1CF9C;ZNAMENNY NEUME STRELA DVOECHELNOKRYZHEVAYA;So;0;L;;;;;N;;;;; +1CF9D;ZNAMENNY NEUME STRELA DVOECHELNOPOVODNAYA;So;0;L;;;;;N;;;;; +1CF9E;ZNAMENNY NEUME STRELA DVOECHELNAYA KLYUCHEVAYA;So;0;L;;;;;N;;;;; +1CF9F;ZNAMENNY NEUME STRELA DVOECHELNOPOVODNAYA KLYUCHEVAYA;So;0;L;;;;;N;;;;; +1CFA0;ZNAMENNY NEUME STRELA GROMNAYA WITH SINGLE ZAPYATAYA;So;0;L;;;;;N;;;;; +1CFA1;ZNAMENNY NEUME STRELA GROMOPOVODNAYA WITH SINGLE ZAPYATAYA;So;0;L;;;;;N;;;;; +1CFA2;ZNAMENNY NEUME STRELA GROMNAYA;So;0;L;;;;;N;;;;; +1CFA3;ZNAMENNY NEUME STRELA GROMOPOVODNAYA;So;0;L;;;;;N;;;;; +1CFA4;ZNAMENNY NEUME STRELA GROMOPOVODNAYA WITH DOUBLE ZAPYATAYA;So;0;L;;;;;N;;;;; +1CFA5;ZNAMENNY NEUME STRELA GROMOKRYZHEVAYA;So;0;L;;;;;N;;;;; +1CFA6;ZNAMENNY NEUME STRELA GROMOKRYZHEVAYA POVODNAYA;So;0;L;;;;;N;;;;; +1CFA7;ZNAMENNY NEUME MECHIK;So;0;L;;;;;N;;;;; +1CFA8;ZNAMENNY NEUME MECHIK POVODNY;So;0;L;;;;;N;;;;; +1CFA9;ZNAMENNY NEUME MECHIK KLYUCHEVOY;So;0;L;;;;;N;;;;; +1CFAA;ZNAMENNY NEUME MECHIK KLYUCHEPOVODNY;So;0;L;;;;;N;;;;; +1CFAB;ZNAMENNY NEUME MECHIK KLYUCHENEPOSTOYANNY;So;0;L;;;;;N;;;;; +1CFAC;ZNAMENNY NEUME STRELA TRYASOGLASNAYA;So;0;L;;;;;N;;;;; +1CFAD;ZNAMENNY NEUME STRELA TRYASOPOVODNAYA;So;0;L;;;;;N;;;;; +1CFAE;ZNAMENNY NEUME STRELA TRYASOSTRELNAYA;So;0;L;;;;;N;;;;; +1CFAF;ZNAMENNY NEUME OSOKA;So;0;L;;;;;N;;;;; +1CFB0;ZNAMENNY NEUME OSOKA SVETLAYA;So;0;L;;;;;N;;;;; +1CFB1;ZNAMENNY NEUME OSOKA TRESVETLAYA;So;0;L;;;;;N;;;;; +1CFB2;ZNAMENNY NEUME OSOKA KRYUKOVAYA SVETLAYA;So;0;L;;;;;N;;;;; +1CFB3;ZNAMENNY NEUME OSOKA KLYUCHEVAYA SVETLAYA;So;0;L;;;;;N;;;;; +1CFB4;ZNAMENNY NEUME OSOKA KLYUCHEVAYA NEPOSTOYANNAYA;So;0;L;;;;;N;;;;; +1CFB5;ZNAMENNY NEUME STRELA KRYUKOVAYA;So;0;L;;;;;N;;;;; +1CFB6;ZNAMENNY NEUME STRELA KRYUKOVAYA POVODNAYA;So;0;L;;;;;N;;;;; +1CFB7;ZNAMENNY NEUME STRELA KRYUKOVAYA GROMNAYA WITH SINGLE ZAPYATAYA;So;0;L;;;;;N;;;;; +1CFB8;ZNAMENNY NEUME STRELA KRYUKOVAYA GROMOPOVODNAYA WITH SINGLE ZAPYATAYA;So;0;L;;;;;N;;;;; +1CFB9;ZNAMENNY NEUME STRELA KRYUKOVAYA GROMNAYA;So;0;L;;;;;N;;;;; +1CFBA;ZNAMENNY NEUME STRELA KRYUKOVAYA GROMOPOVODNAYA;So;0;L;;;;;N;;;;; +1CFBB;ZNAMENNY NEUME STRELA KRYUKOVAYA GROMOPOVODNAYA WITH DOUBLE ZAPYATAYA;So;0;L;;;;;N;;;;; +1CFBC;ZNAMENNY NEUME STRELA KRYUKOVAYA GROMOKRYZHEVAYA;So;0;L;;;;;N;;;;; +1CFBD;ZNAMENNY NEUME STRELA KRYUKOVAYA GROMOKRYZHEVAYA POVODNAYA;So;0;L;;;;;N;;;;; +1CFBE;ZNAMENNY NEUME STRELA KRYUKOVAYA TRYASKA;So;0;L;;;;;N;;;;; +1CFBF;ZNAMENNY NEUME KUFISMA;So;0;L;;;;;N;;;;; +1CFC0;ZNAMENNY NEUME OBLAKO;So;0;L;;;;;N;;;;; +1CFC1;ZNAMENNY NEUME DUDA;So;0;L;;;;;N;;;;; +1CFC2;ZNAMENNY NEUME NEMKA;So;0;L;;;;;N;;;;; +1CFC3;ZNAMENNY NEUME PAUK;So;0;L;;;;;N;;;;; +1D000;BYZANTINE MUSICAL SYMBOL PSILI;So;0;L;;;;;N;;;;; +1D001;BYZANTINE MUSICAL SYMBOL DASEIA;So;0;L;;;;;N;;;;; +1D002;BYZANTINE MUSICAL SYMBOL PERISPOMENI;So;0;L;;;;;N;;;;; +1D003;BYZANTINE MUSICAL SYMBOL OXEIA EKFONITIKON;So;0;L;;;;;N;;;;; +1D004;BYZANTINE MUSICAL SYMBOL OXEIA DIPLI;So;0;L;;;;;N;;;;; +1D005;BYZANTINE MUSICAL SYMBOL VAREIA EKFONITIKON;So;0;L;;;;;N;;;;; +1D006;BYZANTINE MUSICAL SYMBOL VAREIA DIPLI;So;0;L;;;;;N;;;;; +1D007;BYZANTINE MUSICAL SYMBOL KATHISTI;So;0;L;;;;;N;;;;; +1D008;BYZANTINE MUSICAL SYMBOL SYRMATIKI;So;0;L;;;;;N;;;;; +1D009;BYZANTINE MUSICAL SYMBOL PARAKLITIKI;So;0;L;;;;;N;;;;; +1D00A;BYZANTINE MUSICAL SYMBOL YPOKRISIS;So;0;L;;;;;N;;;;; +1D00B;BYZANTINE MUSICAL SYMBOL YPOKRISIS DIPLI;So;0;L;;;;;N;;;;; +1D00C;BYZANTINE MUSICAL SYMBOL KREMASTI;So;0;L;;;;;N;;;;; +1D00D;BYZANTINE MUSICAL SYMBOL APESO EKFONITIKON;So;0;L;;;;;N;;;;; +1D00E;BYZANTINE MUSICAL SYMBOL EXO EKFONITIKON;So;0;L;;;;;N;;;;; +1D00F;BYZANTINE MUSICAL SYMBOL TELEIA;So;0;L;;;;;N;;;;; +1D010;BYZANTINE MUSICAL SYMBOL KENTIMATA;So;0;L;;;;;N;;;;; +1D011;BYZANTINE MUSICAL SYMBOL APOSTROFOS;So;0;L;;;;;N;;;;; +1D012;BYZANTINE MUSICAL SYMBOL APOSTROFOS DIPLI;So;0;L;;;;;N;;;;; +1D013;BYZANTINE MUSICAL SYMBOL SYNEVMA;So;0;L;;;;;N;;;;; +1D014;BYZANTINE MUSICAL SYMBOL THITA;So;0;L;;;;;N;;;;; +1D015;BYZANTINE MUSICAL SYMBOL OLIGON ARCHAION;So;0;L;;;;;N;;;;; +1D016;BYZANTINE MUSICAL SYMBOL GORGON ARCHAION;So;0;L;;;;;N;;;;; +1D017;BYZANTINE MUSICAL SYMBOL PSILON;So;0;L;;;;;N;;;;; +1D018;BYZANTINE MUSICAL SYMBOL CHAMILON;So;0;L;;;;;N;;;;; +1D019;BYZANTINE MUSICAL SYMBOL VATHY;So;0;L;;;;;N;;;;; +1D01A;BYZANTINE MUSICAL SYMBOL ISON ARCHAION;So;0;L;;;;;N;;;;; +1D01B;BYZANTINE MUSICAL SYMBOL KENTIMA ARCHAION;So;0;L;;;;;N;;;;; +1D01C;BYZANTINE MUSICAL SYMBOL KENTIMATA ARCHAION;So;0;L;;;;;N;;;;; +1D01D;BYZANTINE MUSICAL SYMBOL SAXIMATA;So;0;L;;;;;N;;;;; +1D01E;BYZANTINE MUSICAL SYMBOL PARICHON;So;0;L;;;;;N;;;;; +1D01F;BYZANTINE MUSICAL SYMBOL STAVROS APODEXIA;So;0;L;;;;;N;;;;; +1D020;BYZANTINE MUSICAL SYMBOL OXEIAI ARCHAION;So;0;L;;;;;N;;;;; +1D021;BYZANTINE MUSICAL SYMBOL VAREIAI ARCHAION;So;0;L;;;;;N;;;;; +1D022;BYZANTINE MUSICAL SYMBOL APODERMA ARCHAION;So;0;L;;;;;N;;;;; +1D023;BYZANTINE MUSICAL SYMBOL APOTHEMA;So;0;L;;;;;N;;;;; +1D024;BYZANTINE MUSICAL SYMBOL KLASMA;So;0;L;;;;;N;;;;; +1D025;BYZANTINE MUSICAL SYMBOL REVMA;So;0;L;;;;;N;;;;; +1D026;BYZANTINE MUSICAL SYMBOL PIASMA ARCHAION;So;0;L;;;;;N;;;;; +1D027;BYZANTINE MUSICAL SYMBOL TINAGMA;So;0;L;;;;;N;;;;; +1D028;BYZANTINE MUSICAL SYMBOL ANATRICHISMA;So;0;L;;;;;N;;;;; +1D029;BYZANTINE MUSICAL SYMBOL SEISMA;So;0;L;;;;;N;;;;; +1D02A;BYZANTINE MUSICAL SYMBOL SYNAGMA ARCHAION;So;0;L;;;;;N;;;;; +1D02B;BYZANTINE MUSICAL SYMBOL SYNAGMA META STAVROU;So;0;L;;;;;N;;;;; +1D02C;BYZANTINE MUSICAL SYMBOL OYRANISMA ARCHAION;So;0;L;;;;;N;;;;; +1D02D;BYZANTINE MUSICAL SYMBOL THEMA;So;0;L;;;;;N;;;;; +1D02E;BYZANTINE MUSICAL SYMBOL LEMOI;So;0;L;;;;;N;;;;; +1D02F;BYZANTINE MUSICAL SYMBOL DYO;So;0;L;;;;;N;;;;; +1D030;BYZANTINE MUSICAL SYMBOL TRIA;So;0;L;;;;;N;;;;; +1D031;BYZANTINE MUSICAL SYMBOL TESSERA;So;0;L;;;;;N;;;;; +1D032;BYZANTINE MUSICAL SYMBOL KRATIMATA;So;0;L;;;;;N;;;;; +1D033;BYZANTINE MUSICAL SYMBOL APESO EXO NEO;So;0;L;;;;;N;;;;; +1D034;BYZANTINE MUSICAL SYMBOL FTHORA ARCHAION;So;0;L;;;;;N;;;;; +1D035;BYZANTINE MUSICAL SYMBOL IMIFTHORA;So;0;L;;;;;N;;;;; +1D036;BYZANTINE MUSICAL SYMBOL TROMIKON ARCHAION;So;0;L;;;;;N;;;;; +1D037;BYZANTINE MUSICAL SYMBOL KATAVA TROMIKON;So;0;L;;;;;N;;;;; +1D038;BYZANTINE MUSICAL SYMBOL PELASTON;So;0;L;;;;;N;;;;; +1D039;BYZANTINE MUSICAL SYMBOL PSIFISTON;So;0;L;;;;;N;;;;; +1D03A;BYZANTINE MUSICAL SYMBOL KONTEVMA;So;0;L;;;;;N;;;;; +1D03B;BYZANTINE MUSICAL SYMBOL CHOREVMA ARCHAION;So;0;L;;;;;N;;;;; +1D03C;BYZANTINE MUSICAL SYMBOL RAPISMA;So;0;L;;;;;N;;;;; +1D03D;BYZANTINE MUSICAL SYMBOL PARAKALESMA ARCHAION;So;0;L;;;;;N;;;;; +1D03E;BYZANTINE MUSICAL SYMBOL PARAKLITIKI ARCHAION;So;0;L;;;;;N;;;;; +1D03F;BYZANTINE MUSICAL SYMBOL ICHADIN;So;0;L;;;;;N;;;;; +1D040;BYZANTINE MUSICAL SYMBOL NANA;So;0;L;;;;;N;;;;; +1D041;BYZANTINE MUSICAL SYMBOL PETASMA;So;0;L;;;;;N;;;;; +1D042;BYZANTINE MUSICAL SYMBOL KONTEVMA ALLO;So;0;L;;;;;N;;;;; +1D043;BYZANTINE MUSICAL SYMBOL TROMIKON ALLO;So;0;L;;;;;N;;;;; +1D044;BYZANTINE MUSICAL SYMBOL STRAGGISMATA;So;0;L;;;;;N;;;;; +1D045;BYZANTINE MUSICAL SYMBOL GRONTHISMATA;So;0;L;;;;;N;;;;; +1D046;BYZANTINE MUSICAL SYMBOL ISON NEO;So;0;L;;;;;N;;;;; +1D047;BYZANTINE MUSICAL SYMBOL OLIGON NEO;So;0;L;;;;;N;;;;; +1D048;BYZANTINE MUSICAL SYMBOL OXEIA NEO;So;0;L;;;;;N;;;;; +1D049;BYZANTINE MUSICAL SYMBOL PETASTI;So;0;L;;;;;N;;;;; +1D04A;BYZANTINE MUSICAL SYMBOL KOUFISMA;So;0;L;;;;;N;;;;; +1D04B;BYZANTINE MUSICAL SYMBOL PETASTOKOUFISMA;So;0;L;;;;;N;;;;; +1D04C;BYZANTINE MUSICAL SYMBOL KRATIMOKOUFISMA;So;0;L;;;;;N;;;;; +1D04D;BYZANTINE MUSICAL SYMBOL PELASTON NEO;So;0;L;;;;;N;;;;; +1D04E;BYZANTINE MUSICAL SYMBOL KENTIMATA NEO ANO;So;0;L;;;;;N;;;;; +1D04F;BYZANTINE MUSICAL SYMBOL KENTIMA NEO ANO;So;0;L;;;;;N;;;;; +1D050;BYZANTINE MUSICAL SYMBOL YPSILI;So;0;L;;;;;N;;;;; +1D051;BYZANTINE MUSICAL SYMBOL APOSTROFOS NEO;So;0;L;;;;;N;;;;; +1D052;BYZANTINE MUSICAL SYMBOL APOSTROFOI SYNDESMOS NEO;So;0;L;;;;;N;;;;; +1D053;BYZANTINE MUSICAL SYMBOL YPORROI;So;0;L;;;;;N;;;;; +1D054;BYZANTINE MUSICAL SYMBOL KRATIMOYPORROON;So;0;L;;;;;N;;;;; +1D055;BYZANTINE MUSICAL SYMBOL ELAFRON;So;0;L;;;;;N;;;;; +1D056;BYZANTINE MUSICAL SYMBOL CHAMILI;So;0;L;;;;;N;;;;; +1D057;BYZANTINE MUSICAL SYMBOL MIKRON ISON;So;0;L;;;;;N;;;;; +1D058;BYZANTINE MUSICAL SYMBOL VAREIA NEO;So;0;L;;;;;N;;;;; +1D059;BYZANTINE MUSICAL SYMBOL PIASMA NEO;So;0;L;;;;;N;;;;; +1D05A;BYZANTINE MUSICAL SYMBOL PSIFISTON NEO;So;0;L;;;;;N;;;;; +1D05B;BYZANTINE MUSICAL SYMBOL OMALON;So;0;L;;;;;N;;;;; +1D05C;BYZANTINE MUSICAL SYMBOL ANTIKENOMA;So;0;L;;;;;N;;;;; +1D05D;BYZANTINE MUSICAL SYMBOL LYGISMA;So;0;L;;;;;N;;;;; +1D05E;BYZANTINE MUSICAL SYMBOL PARAKLITIKI NEO;So;0;L;;;;;N;;;;; +1D05F;BYZANTINE MUSICAL SYMBOL PARAKALESMA NEO;So;0;L;;;;;N;;;;; +1D060;BYZANTINE MUSICAL SYMBOL ETERON PARAKALESMA;So;0;L;;;;;N;;;;; +1D061;BYZANTINE MUSICAL SYMBOL KYLISMA;So;0;L;;;;;N;;;;; +1D062;BYZANTINE MUSICAL SYMBOL ANTIKENOKYLISMA;So;0;L;;;;;N;;;;; +1D063;BYZANTINE MUSICAL SYMBOL TROMIKON NEO;So;0;L;;;;;N;;;;; +1D064;BYZANTINE MUSICAL SYMBOL EKSTREPTON;So;0;L;;;;;N;;;;; +1D065;BYZANTINE MUSICAL SYMBOL SYNAGMA NEO;So;0;L;;;;;N;;;;; +1D066;BYZANTINE MUSICAL SYMBOL SYRMA;So;0;L;;;;;N;;;;; +1D067;BYZANTINE MUSICAL SYMBOL CHOREVMA NEO;So;0;L;;;;;N;;;;; +1D068;BYZANTINE MUSICAL SYMBOL EPEGERMA;So;0;L;;;;;N;;;;; +1D069;BYZANTINE MUSICAL SYMBOL SEISMA NEO;So;0;L;;;;;N;;;;; +1D06A;BYZANTINE MUSICAL SYMBOL XIRON KLASMA;So;0;L;;;;;N;;;;; +1D06B;BYZANTINE MUSICAL SYMBOL TROMIKOPSIFISTON;So;0;L;;;;;N;;;;; +1D06C;BYZANTINE MUSICAL SYMBOL PSIFISTOLYGISMA;So;0;L;;;;;N;;;;; +1D06D;BYZANTINE MUSICAL SYMBOL TROMIKOLYGISMA;So;0;L;;;;;N;;;;; +1D06E;BYZANTINE MUSICAL SYMBOL TROMIKOPARAKALESMA;So;0;L;;;;;N;;;;; +1D06F;BYZANTINE MUSICAL SYMBOL PSIFISTOPARAKALESMA;So;0;L;;;;;N;;;;; +1D070;BYZANTINE MUSICAL SYMBOL TROMIKOSYNAGMA;So;0;L;;;;;N;;;;; +1D071;BYZANTINE MUSICAL SYMBOL PSIFISTOSYNAGMA;So;0;L;;;;;N;;;;; +1D072;BYZANTINE MUSICAL SYMBOL GORGOSYNTHETON;So;0;L;;;;;N;;;;; +1D073;BYZANTINE MUSICAL SYMBOL ARGOSYNTHETON;So;0;L;;;;;N;;;;; +1D074;BYZANTINE MUSICAL SYMBOL ETERON ARGOSYNTHETON;So;0;L;;;;;N;;;;; +1D075;BYZANTINE MUSICAL SYMBOL OYRANISMA NEO;So;0;L;;;;;N;;;;; +1D076;BYZANTINE MUSICAL SYMBOL THEMATISMOS ESO;So;0;L;;;;;N;;;;; +1D077;BYZANTINE MUSICAL SYMBOL THEMATISMOS EXO;So;0;L;;;;;N;;;;; +1D078;BYZANTINE MUSICAL SYMBOL THEMA APLOUN;So;0;L;;;;;N;;;;; +1D079;BYZANTINE MUSICAL SYMBOL THES KAI APOTHES;So;0;L;;;;;N;;;;; +1D07A;BYZANTINE MUSICAL SYMBOL KATAVASMA;So;0;L;;;;;N;;;;; +1D07B;BYZANTINE MUSICAL SYMBOL ENDOFONON;So;0;L;;;;;N;;;;; +1D07C;BYZANTINE MUSICAL SYMBOL YFEN KATO;So;0;L;;;;;N;;;;; +1D07D;BYZANTINE MUSICAL SYMBOL YFEN ANO;So;0;L;;;;;N;;;;; +1D07E;BYZANTINE MUSICAL SYMBOL STAVROS;So;0;L;;;;;N;;;;; +1D07F;BYZANTINE MUSICAL SYMBOL KLASMA ANO;So;0;L;;;;;N;;;;; +1D080;BYZANTINE MUSICAL SYMBOL DIPLI ARCHAION;So;0;L;;;;;N;;;;; +1D081;BYZANTINE MUSICAL SYMBOL KRATIMA ARCHAION;So;0;L;;;;;N;;;;; +1D082;BYZANTINE MUSICAL SYMBOL KRATIMA ALLO;So;0;L;;;;;N;;;;; +1D083;BYZANTINE MUSICAL SYMBOL KRATIMA NEO;So;0;L;;;;;N;;;;; +1D084;BYZANTINE MUSICAL SYMBOL APODERMA NEO;So;0;L;;;;;N;;;;; +1D085;BYZANTINE MUSICAL SYMBOL APLI;So;0;L;;;;;N;;;;; +1D086;BYZANTINE MUSICAL SYMBOL DIPLI;So;0;L;;;;;N;;;;; +1D087;BYZANTINE MUSICAL SYMBOL TRIPLI;So;0;L;;;;;N;;;;; +1D088;BYZANTINE MUSICAL SYMBOL TETRAPLI;So;0;L;;;;;N;;;;; +1D089;BYZANTINE MUSICAL SYMBOL KORONIS;So;0;L;;;;;N;;;;; +1D08A;BYZANTINE MUSICAL SYMBOL LEIMMA ENOS CHRONOU;So;0;L;;;;;N;;;;; +1D08B;BYZANTINE MUSICAL SYMBOL LEIMMA DYO CHRONON;So;0;L;;;;;N;;;;; +1D08C;BYZANTINE MUSICAL SYMBOL LEIMMA TRION CHRONON;So;0;L;;;;;N;;;;; +1D08D;BYZANTINE MUSICAL SYMBOL LEIMMA TESSARON CHRONON;So;0;L;;;;;N;;;;; +1D08E;BYZANTINE MUSICAL SYMBOL LEIMMA IMISEOS CHRONOU;So;0;L;;;;;N;;;;; +1D08F;BYZANTINE MUSICAL SYMBOL GORGON NEO ANO;So;0;L;;;;;N;;;;; +1D090;BYZANTINE MUSICAL SYMBOL GORGON PARESTIGMENON ARISTERA;So;0;L;;;;;N;;;;; +1D091;BYZANTINE MUSICAL SYMBOL GORGON PARESTIGMENON DEXIA;So;0;L;;;;;N;;;;; +1D092;BYZANTINE MUSICAL SYMBOL DIGORGON;So;0;L;;;;;N;;;;; +1D093;BYZANTINE MUSICAL SYMBOL DIGORGON PARESTIGMENON ARISTERA KATO;So;0;L;;;;;N;;;;; +1D094;BYZANTINE MUSICAL SYMBOL DIGORGON PARESTIGMENON ARISTERA ANO;So;0;L;;;;;N;;;;; +1D095;BYZANTINE MUSICAL SYMBOL DIGORGON PARESTIGMENON DEXIA;So;0;L;;;;;N;;;;; +1D096;BYZANTINE MUSICAL SYMBOL TRIGORGON;So;0;L;;;;;N;;;;; +1D097;BYZANTINE MUSICAL SYMBOL ARGON;So;0;L;;;;;N;;;;; +1D098;BYZANTINE MUSICAL SYMBOL IMIDIARGON;So;0;L;;;;;N;;;;; +1D099;BYZANTINE MUSICAL SYMBOL DIARGON;So;0;L;;;;;N;;;;; +1D09A;BYZANTINE MUSICAL SYMBOL AGOGI POLI ARGI;So;0;L;;;;;N;;;;; +1D09B;BYZANTINE MUSICAL SYMBOL AGOGI ARGOTERI;So;0;L;;;;;N;;;;; +1D09C;BYZANTINE MUSICAL SYMBOL AGOGI ARGI;So;0;L;;;;;N;;;;; +1D09D;BYZANTINE MUSICAL SYMBOL AGOGI METRIA;So;0;L;;;;;N;;;;; +1D09E;BYZANTINE MUSICAL SYMBOL AGOGI MESI;So;0;L;;;;;N;;;;; +1D09F;BYZANTINE MUSICAL SYMBOL AGOGI GORGI;So;0;L;;;;;N;;;;; +1D0A0;BYZANTINE MUSICAL SYMBOL AGOGI GORGOTERI;So;0;L;;;;;N;;;;; +1D0A1;BYZANTINE MUSICAL SYMBOL AGOGI POLI GORGI;So;0;L;;;;;N;;;;; +1D0A2;BYZANTINE MUSICAL SYMBOL MARTYRIA PROTOS ICHOS;So;0;L;;;;;N;;;;; +1D0A3;BYZANTINE MUSICAL SYMBOL MARTYRIA ALLI PROTOS ICHOS;So;0;L;;;;;N;;;;; +1D0A4;BYZANTINE MUSICAL SYMBOL MARTYRIA DEYTEROS ICHOS;So;0;L;;;;;N;;;;; +1D0A5;BYZANTINE MUSICAL SYMBOL MARTYRIA ALLI DEYTEROS ICHOS;So;0;L;;;;;N;;;;; +1D0A6;BYZANTINE MUSICAL SYMBOL MARTYRIA TRITOS ICHOS;So;0;L;;;;;N;;;;; +1D0A7;BYZANTINE MUSICAL SYMBOL MARTYRIA TRIFONIAS;So;0;L;;;;;N;;;;; +1D0A8;BYZANTINE MUSICAL SYMBOL MARTYRIA TETARTOS ICHOS;So;0;L;;;;;N;;;;; +1D0A9;BYZANTINE MUSICAL SYMBOL MARTYRIA TETARTOS LEGETOS ICHOS;So;0;L;;;;;N;;;;; +1D0AA;BYZANTINE MUSICAL SYMBOL MARTYRIA LEGETOS ICHOS;So;0;L;;;;;N;;;;; +1D0AB;BYZANTINE MUSICAL SYMBOL MARTYRIA PLAGIOS ICHOS;So;0;L;;;;;N;;;;; +1D0AC;BYZANTINE MUSICAL SYMBOL ISAKIA TELOUS ICHIMATOS;So;0;L;;;;;N;;;;; +1D0AD;BYZANTINE MUSICAL SYMBOL APOSTROFOI TELOUS ICHIMATOS;So;0;L;;;;;N;;;;; +1D0AE;BYZANTINE MUSICAL SYMBOL FANEROSIS TETRAFONIAS;So;0;L;;;;;N;;;;; +1D0AF;BYZANTINE MUSICAL SYMBOL FANEROSIS MONOFONIAS;So;0;L;;;;;N;;;;; +1D0B0;BYZANTINE MUSICAL SYMBOL FANEROSIS DIFONIAS;So;0;L;;;;;N;;;;; +1D0B1;BYZANTINE MUSICAL SYMBOL MARTYRIA VARYS ICHOS;So;0;L;;;;;N;;;;; +1D0B2;BYZANTINE MUSICAL SYMBOL MARTYRIA PROTOVARYS ICHOS;So;0;L;;;;;N;;;;; +1D0B3;BYZANTINE MUSICAL SYMBOL MARTYRIA PLAGIOS TETARTOS ICHOS;So;0;L;;;;;N;;;;; +1D0B4;BYZANTINE MUSICAL SYMBOL GORTHMIKON N APLOUN;So;0;L;;;;;N;;;;; +1D0B5;BYZANTINE MUSICAL SYMBOL GORTHMIKON N DIPLOUN;So;0;L;;;;;N;;;;; +1D0B6;BYZANTINE MUSICAL SYMBOL ENARXIS KAI FTHORA VOU;So;0;L;;;;;N;;;;; +1D0B7;BYZANTINE MUSICAL SYMBOL IMIFONON;So;0;L;;;;;N;;;;; +1D0B8;BYZANTINE MUSICAL SYMBOL IMIFTHORON;So;0;L;;;;;N;;;;; +1D0B9;BYZANTINE MUSICAL SYMBOL FTHORA ARCHAION DEYTEROU ICHOU;So;0;L;;;;;N;;;;; +1D0BA;BYZANTINE MUSICAL SYMBOL FTHORA DIATONIKI PA;So;0;L;;;;;N;;;;; +1D0BB;BYZANTINE MUSICAL SYMBOL FTHORA DIATONIKI NANA;So;0;L;;;;;N;;;;; +1D0BC;BYZANTINE MUSICAL SYMBOL FTHORA NAOS ICHOS;So;0;L;;;;;N;;;;; +1D0BD;BYZANTINE MUSICAL SYMBOL FTHORA DIATONIKI DI;So;0;L;;;;;N;;;;; +1D0BE;BYZANTINE MUSICAL SYMBOL FTHORA SKLIRON DIATONON DI;So;0;L;;;;;N;;;;; +1D0BF;BYZANTINE MUSICAL SYMBOL FTHORA DIATONIKI KE;So;0;L;;;;;N;;;;; +1D0C0;BYZANTINE MUSICAL SYMBOL FTHORA DIATONIKI ZO;So;0;L;;;;;N;;;;; +1D0C1;BYZANTINE MUSICAL SYMBOL FTHORA DIATONIKI NI KATO;So;0;L;;;;;N;;;;; +1D0C2;BYZANTINE MUSICAL SYMBOL FTHORA DIATONIKI NI ANO;So;0;L;;;;;N;;;;; +1D0C3;BYZANTINE MUSICAL SYMBOL FTHORA MALAKON CHROMA DIFONIAS;So;0;L;;;;;N;;;;; +1D0C4;BYZANTINE MUSICAL SYMBOL FTHORA MALAKON CHROMA MONOFONIAS;So;0;L;;;;;N;;;;; +1D0C5;BYZANTINE MUSICAL SYMBOL FHTORA SKLIRON CHROMA VASIS;So;0;L;;;;;N;;;;; +1D0C6;BYZANTINE MUSICAL SYMBOL FTHORA SKLIRON CHROMA SYNAFI;So;0;L;;;;;N;;;;; +1D0C7;BYZANTINE MUSICAL SYMBOL FTHORA NENANO;So;0;L;;;;;N;;;;; +1D0C8;BYZANTINE MUSICAL SYMBOL CHROA ZYGOS;So;0;L;;;;;N;;;;; +1D0C9;BYZANTINE MUSICAL SYMBOL CHROA KLITON;So;0;L;;;;;N;;;;; +1D0CA;BYZANTINE MUSICAL SYMBOL CHROA SPATHI;So;0;L;;;;;N;;;;; +1D0CB;BYZANTINE MUSICAL SYMBOL FTHORA I YFESIS TETARTIMORION;So;0;L;;;;;N;;;;; +1D0CC;BYZANTINE MUSICAL SYMBOL FTHORA ENARMONIOS ANTIFONIA;So;0;L;;;;;N;;;;; +1D0CD;BYZANTINE MUSICAL SYMBOL YFESIS TRITIMORION;So;0;L;;;;;N;;;;; +1D0CE;BYZANTINE MUSICAL SYMBOL DIESIS TRITIMORION;So;0;L;;;;;N;;;;; +1D0CF;BYZANTINE MUSICAL SYMBOL DIESIS TETARTIMORION;So;0;L;;;;;N;;;;; +1D0D0;BYZANTINE MUSICAL SYMBOL DIESIS APLI DYO DODEKATA;So;0;L;;;;;N;;;;; +1D0D1;BYZANTINE MUSICAL SYMBOL DIESIS MONOGRAMMOS TESSERA DODEKATA;So;0;L;;;;;N;;;;; +1D0D2;BYZANTINE MUSICAL SYMBOL DIESIS DIGRAMMOS EX DODEKATA;So;0;L;;;;;N;;;;; +1D0D3;BYZANTINE MUSICAL SYMBOL DIESIS TRIGRAMMOS OKTO DODEKATA;So;0;L;;;;;N;;;;; +1D0D4;BYZANTINE MUSICAL SYMBOL YFESIS APLI DYO DODEKATA;So;0;L;;;;;N;;;;; +1D0D5;BYZANTINE MUSICAL SYMBOL YFESIS MONOGRAMMOS TESSERA DODEKATA;So;0;L;;;;;N;;;;; +1D0D6;BYZANTINE MUSICAL SYMBOL YFESIS DIGRAMMOS EX DODEKATA;So;0;L;;;;;N;;;;; +1D0D7;BYZANTINE MUSICAL SYMBOL YFESIS TRIGRAMMOS OKTO DODEKATA;So;0;L;;;;;N;;;;; +1D0D8;BYZANTINE MUSICAL SYMBOL GENIKI DIESIS;So;0;L;;;;;N;;;;; +1D0D9;BYZANTINE MUSICAL SYMBOL GENIKI YFESIS;So;0;L;;;;;N;;;;; +1D0DA;BYZANTINE MUSICAL SYMBOL DIASTOLI APLI MIKRI;So;0;L;;;;;N;;;;; +1D0DB;BYZANTINE MUSICAL SYMBOL DIASTOLI APLI MEGALI;So;0;L;;;;;N;;;;; +1D0DC;BYZANTINE MUSICAL SYMBOL DIASTOLI DIPLI;So;0;L;;;;;N;;;;; +1D0DD;BYZANTINE MUSICAL SYMBOL DIASTOLI THESEOS;So;0;L;;;;;N;;;;; +1D0DE;BYZANTINE MUSICAL SYMBOL SIMANSIS THESEOS;So;0;L;;;;;N;;;;; +1D0DF;BYZANTINE MUSICAL SYMBOL SIMANSIS THESEOS DISIMOU;So;0;L;;;;;N;;;;; +1D0E0;BYZANTINE MUSICAL SYMBOL SIMANSIS THESEOS TRISIMOU;So;0;L;;;;;N;;;;; +1D0E1;BYZANTINE MUSICAL SYMBOL SIMANSIS THESEOS TETRASIMOU;So;0;L;;;;;N;;;;; +1D0E2;BYZANTINE MUSICAL SYMBOL SIMANSIS ARSEOS;So;0;L;;;;;N;;;;; +1D0E3;BYZANTINE MUSICAL SYMBOL SIMANSIS ARSEOS DISIMOU;So;0;L;;;;;N;;;;; +1D0E4;BYZANTINE MUSICAL SYMBOL SIMANSIS ARSEOS TRISIMOU;So;0;L;;;;;N;;;;; +1D0E5;BYZANTINE MUSICAL SYMBOL SIMANSIS ARSEOS TETRASIMOU;So;0;L;;;;;N;;;;; +1D0E6;BYZANTINE MUSICAL SYMBOL DIGRAMMA GG;So;0;L;;;;;N;;;;; +1D0E7;BYZANTINE MUSICAL SYMBOL DIFTOGGOS OU;So;0;L;;;;;N;;;;; +1D0E8;BYZANTINE MUSICAL SYMBOL STIGMA;So;0;L;;;;;N;;;;; +1D0E9;BYZANTINE MUSICAL SYMBOL ARKTIKO PA;So;0;L;;;;;N;;;;; +1D0EA;BYZANTINE MUSICAL SYMBOL ARKTIKO VOU;So;0;L;;;;;N;;;;; +1D0EB;BYZANTINE MUSICAL SYMBOL ARKTIKO GA;So;0;L;;;;;N;;;;; +1D0EC;BYZANTINE MUSICAL SYMBOL ARKTIKO DI;So;0;L;;;;;N;;;;; +1D0ED;BYZANTINE MUSICAL SYMBOL ARKTIKO KE;So;0;L;;;;;N;;;;; +1D0EE;BYZANTINE MUSICAL SYMBOL ARKTIKO ZO;So;0;L;;;;;N;;;;; +1D0EF;BYZANTINE MUSICAL SYMBOL ARKTIKO NI;So;0;L;;;;;N;;;;; +1D0F0;BYZANTINE MUSICAL SYMBOL KENTIMATA NEO MESO;So;0;L;;;;;N;;;;; +1D0F1;BYZANTINE MUSICAL SYMBOL KENTIMA NEO MESO;So;0;L;;;;;N;;;;; +1D0F2;BYZANTINE MUSICAL SYMBOL KENTIMATA NEO KATO;So;0;L;;;;;N;;;;; +1D0F3;BYZANTINE MUSICAL SYMBOL KENTIMA NEO KATO;So;0;L;;;;;N;;;;; +1D0F4;BYZANTINE MUSICAL SYMBOL KLASMA KATO;So;0;L;;;;;N;;;;; +1D0F5;BYZANTINE MUSICAL SYMBOL GORGON NEO KATO;So;0;L;;;;;N;;;;; +1D100;MUSICAL SYMBOL SINGLE BARLINE;So;0;L;;;;;N;;;;; +1D101;MUSICAL SYMBOL DOUBLE BARLINE;So;0;L;;;;;N;;;;; +1D102;MUSICAL SYMBOL FINAL BARLINE;So;0;L;;;;;N;;;;; +1D103;MUSICAL SYMBOL REVERSE FINAL BARLINE;So;0;L;;;;;N;;;;; +1D104;MUSICAL SYMBOL DASHED BARLINE;So;0;L;;;;;N;;;;; +1D105;MUSICAL SYMBOL SHORT BARLINE;So;0;L;;;;;N;;;;; +1D106;MUSICAL SYMBOL LEFT REPEAT SIGN;So;0;L;;;;;N;;;;; +1D107;MUSICAL SYMBOL RIGHT REPEAT SIGN;So;0;L;;;;;N;;;;; +1D108;MUSICAL SYMBOL REPEAT DOTS;So;0;L;;;;;N;;;;; +1D109;MUSICAL SYMBOL DAL SEGNO;So;0;L;;;;;N;;;;; +1D10A;MUSICAL SYMBOL DA CAPO;So;0;L;;;;;N;;;;; +1D10B;MUSICAL SYMBOL SEGNO;So;0;L;;;;;N;;;;; +1D10C;MUSICAL SYMBOL CODA;So;0;L;;;;;N;;;;; +1D10D;MUSICAL SYMBOL REPEATED FIGURE-1;So;0;L;;;;;N;;;;; +1D10E;MUSICAL SYMBOL REPEATED FIGURE-2;So;0;L;;;;;N;;;;; +1D10F;MUSICAL SYMBOL REPEATED FIGURE-3;So;0;L;;;;;N;;;;; +1D110;MUSICAL SYMBOL FERMATA;So;0;L;;;;;N;;;;; +1D111;MUSICAL SYMBOL FERMATA BELOW;So;0;L;;;;;N;;;;; +1D112;MUSICAL SYMBOL BREATH MARK;So;0;L;;;;;N;;;;; +1D113;MUSICAL SYMBOL CAESURA;So;0;L;;;;;N;;;;; +1D114;MUSICAL SYMBOL BRACE;So;0;L;;;;;N;;;;; +1D115;MUSICAL SYMBOL BRACKET;So;0;L;;;;;N;;;;; +1D116;MUSICAL SYMBOL ONE-LINE STAFF;So;0;L;;;;;N;;;;; +1D117;MUSICAL SYMBOL TWO-LINE STAFF;So;0;L;;;;;N;;;;; +1D118;MUSICAL SYMBOL THREE-LINE STAFF;So;0;L;;;;;N;;;;; +1D119;MUSICAL SYMBOL FOUR-LINE STAFF;So;0;L;;;;;N;;;;; +1D11A;MUSICAL SYMBOL FIVE-LINE STAFF;So;0;L;;;;;N;;;;; +1D11B;MUSICAL SYMBOL SIX-LINE STAFF;So;0;L;;;;;N;;;;; +1D11C;MUSICAL SYMBOL SIX-STRING FRETBOARD;So;0;L;;;;;N;;;;; +1D11D;MUSICAL SYMBOL FOUR-STRING FRETBOARD;So;0;L;;;;;N;;;;; +1D11E;MUSICAL SYMBOL G CLEF;So;0;L;;;;;N;;;;; +1D11F;MUSICAL SYMBOL G CLEF OTTAVA ALTA;So;0;L;;;;;N;;;;; +1D120;MUSICAL SYMBOL G CLEF OTTAVA BASSA;So;0;L;;;;;N;;;;; +1D121;MUSICAL SYMBOL C CLEF;So;0;L;;;;;N;;;;; +1D122;MUSICAL SYMBOL F CLEF;So;0;L;;;;;N;;;;; +1D123;MUSICAL SYMBOL F CLEF OTTAVA ALTA;So;0;L;;;;;N;;;;; +1D124;MUSICAL SYMBOL F CLEF OTTAVA BASSA;So;0;L;;;;;N;;;;; +1D125;MUSICAL SYMBOL DRUM CLEF-1;So;0;L;;;;;N;;;;; +1D126;MUSICAL SYMBOL DRUM CLEF-2;So;0;L;;;;;N;;;;; +1D129;MUSICAL SYMBOL MULTIPLE MEASURE REST;So;0;L;;;;;N;;;;; +1D12A;MUSICAL SYMBOL DOUBLE SHARP;So;0;L;;;;;N;;;;; +1D12B;MUSICAL SYMBOL DOUBLE FLAT;So;0;L;;;;;N;;;;; +1D12C;MUSICAL SYMBOL FLAT UP;So;0;L;;;;;N;;;;; +1D12D;MUSICAL SYMBOL FLAT DOWN;So;0;L;;;;;N;;;;; +1D12E;MUSICAL SYMBOL NATURAL UP;So;0;L;;;;;N;;;;; +1D12F;MUSICAL SYMBOL NATURAL DOWN;So;0;L;;;;;N;;;;; +1D130;MUSICAL SYMBOL SHARP UP;So;0;L;;;;;N;;;;; +1D131;MUSICAL SYMBOL SHARP DOWN;So;0;L;;;;;N;;;;; +1D132;MUSICAL SYMBOL QUARTER TONE SHARP;So;0;L;;;;;N;;;;; +1D133;MUSICAL SYMBOL QUARTER TONE FLAT;So;0;L;;;;;N;;;;; +1D134;MUSICAL SYMBOL COMMON TIME;So;0;L;;;;;N;;;;; +1D135;MUSICAL SYMBOL CUT TIME;So;0;L;;;;;N;;;;; +1D136;MUSICAL SYMBOL OTTAVA ALTA;So;0;L;;;;;N;;;;; +1D137;MUSICAL SYMBOL OTTAVA BASSA;So;0;L;;;;;N;;;;; +1D138;MUSICAL SYMBOL QUINDICESIMA ALTA;So;0;L;;;;;N;;;;; +1D139;MUSICAL SYMBOL QUINDICESIMA BASSA;So;0;L;;;;;N;;;;; +1D13A;MUSICAL SYMBOL MULTI REST;So;0;L;;;;;N;;;;; +1D13B;MUSICAL SYMBOL WHOLE REST;So;0;L;;;;;N;;;;; +1D13C;MUSICAL SYMBOL HALF REST;So;0;L;;;;;N;;;;; +1D13D;MUSICAL SYMBOL QUARTER REST;So;0;L;;;;;N;;;;; +1D13E;MUSICAL SYMBOL EIGHTH REST;So;0;L;;;;;N;;;;; +1D13F;MUSICAL SYMBOL SIXTEENTH REST;So;0;L;;;;;N;;;;; +1D140;MUSICAL SYMBOL THIRTY-SECOND REST;So;0;L;;;;;N;;;;; +1D141;MUSICAL SYMBOL SIXTY-FOURTH REST;So;0;L;;;;;N;;;;; +1D142;MUSICAL SYMBOL ONE HUNDRED TWENTY-EIGHTH REST;So;0;L;;;;;N;;;;; +1D143;MUSICAL SYMBOL X NOTEHEAD;So;0;L;;;;;N;;;;; +1D144;MUSICAL SYMBOL PLUS NOTEHEAD;So;0;L;;;;;N;;;;; +1D145;MUSICAL SYMBOL CIRCLE X NOTEHEAD;So;0;L;;;;;N;;;;; +1D146;MUSICAL SYMBOL SQUARE NOTEHEAD WHITE;So;0;L;;;;;N;;;;; +1D147;MUSICAL SYMBOL SQUARE NOTEHEAD BLACK;So;0;L;;;;;N;;;;; +1D148;MUSICAL SYMBOL TRIANGLE NOTEHEAD UP WHITE;So;0;L;;;;;N;;;;; +1D149;MUSICAL SYMBOL TRIANGLE NOTEHEAD UP BLACK;So;0;L;;;;;N;;;;; +1D14A;MUSICAL SYMBOL TRIANGLE NOTEHEAD LEFT WHITE;So;0;L;;;;;N;;;;; +1D14B;MUSICAL SYMBOL TRIANGLE NOTEHEAD LEFT BLACK;So;0;L;;;;;N;;;;; +1D14C;MUSICAL SYMBOL TRIANGLE NOTEHEAD RIGHT WHITE;So;0;L;;;;;N;;;;; +1D14D;MUSICAL SYMBOL TRIANGLE NOTEHEAD RIGHT BLACK;So;0;L;;;;;N;;;;; +1D14E;MUSICAL SYMBOL TRIANGLE NOTEHEAD DOWN WHITE;So;0;L;;;;;N;;;;; +1D14F;MUSICAL SYMBOL TRIANGLE NOTEHEAD DOWN BLACK;So;0;L;;;;;N;;;;; +1D150;MUSICAL SYMBOL TRIANGLE NOTEHEAD UP RIGHT WHITE;So;0;L;;;;;N;;;;; +1D151;MUSICAL SYMBOL TRIANGLE NOTEHEAD UP RIGHT BLACK;So;0;L;;;;;N;;;;; +1D152;MUSICAL SYMBOL MOON NOTEHEAD WHITE;So;0;L;;;;;N;;;;; +1D153;MUSICAL SYMBOL MOON NOTEHEAD BLACK;So;0;L;;;;;N;;;;; +1D154;MUSICAL SYMBOL TRIANGLE-ROUND NOTEHEAD DOWN WHITE;So;0;L;;;;;N;;;;; +1D155;MUSICAL SYMBOL TRIANGLE-ROUND NOTEHEAD DOWN BLACK;So;0;L;;;;;N;;;;; +1D156;MUSICAL SYMBOL PARENTHESIS NOTEHEAD;So;0;L;;;;;N;;;;; +1D157;MUSICAL SYMBOL VOID NOTEHEAD;So;0;L;;;;;N;;;;; +1D158;MUSICAL SYMBOL NOTEHEAD BLACK;So;0;L;;;;;N;;;;; +1D159;MUSICAL SYMBOL NULL NOTEHEAD;So;0;L;;;;;N;;;;; +1D15A;MUSICAL SYMBOL CLUSTER NOTEHEAD WHITE;So;0;L;;;;;N;;;;; +1D15B;MUSICAL SYMBOL CLUSTER NOTEHEAD BLACK;So;0;L;;;;;N;;;;; +1D15C;MUSICAL SYMBOL BREVE;So;0;L;;;;;N;;;;; +1D15D;MUSICAL SYMBOL WHOLE NOTE;So;0;L;;;;;N;;;;; +1D15E;MUSICAL SYMBOL HALF NOTE;So;0;L;1D157 1D165;;;;N;;;;; +1D15F;MUSICAL SYMBOL QUARTER NOTE;So;0;L;1D158 1D165;;;;N;;;;; +1D160;MUSICAL SYMBOL EIGHTH NOTE;So;0;L;1D15F 1D16E;;;;N;;;;; +1D161;MUSICAL SYMBOL SIXTEENTH NOTE;So;0;L;1D15F 1D16F;;;;N;;;;; +1D162;MUSICAL SYMBOL THIRTY-SECOND NOTE;So;0;L;1D15F 1D170;;;;N;;;;; +1D163;MUSICAL SYMBOL SIXTY-FOURTH NOTE;So;0;L;1D15F 1D171;;;;N;;;;; +1D164;MUSICAL SYMBOL ONE HUNDRED TWENTY-EIGHTH NOTE;So;0;L;1D15F 1D172;;;;N;;;;; +1D165;MUSICAL SYMBOL COMBINING STEM;Mc;216;L;;;;;N;;;;; +1D166;MUSICAL SYMBOL COMBINING SPRECHGESANG STEM;Mc;216;L;;;;;N;;;;; +1D167;MUSICAL SYMBOL COMBINING TREMOLO-1;Mn;1;NSM;;;;;N;;;;; +1D168;MUSICAL SYMBOL COMBINING TREMOLO-2;Mn;1;NSM;;;;;N;;;;; +1D169;MUSICAL SYMBOL COMBINING TREMOLO-3;Mn;1;NSM;;;;;N;;;;; +1D16A;MUSICAL SYMBOL FINGERED TREMOLO-1;So;0;L;;;;;N;;;;; +1D16B;MUSICAL SYMBOL FINGERED TREMOLO-2;So;0;L;;;;;N;;;;; +1D16C;MUSICAL SYMBOL FINGERED TREMOLO-3;So;0;L;;;;;N;;;;; +1D16D;MUSICAL SYMBOL COMBINING AUGMENTATION DOT;Mc;226;L;;;;;N;;;;; +1D16E;MUSICAL SYMBOL COMBINING FLAG-1;Mc;216;L;;;;;N;;;;; +1D16F;MUSICAL SYMBOL COMBINING FLAG-2;Mc;216;L;;;;;N;;;;; +1D170;MUSICAL SYMBOL COMBINING FLAG-3;Mc;216;L;;;;;N;;;;; +1D171;MUSICAL SYMBOL COMBINING FLAG-4;Mc;216;L;;;;;N;;;;; +1D172;MUSICAL SYMBOL COMBINING FLAG-5;Mc;216;L;;;;;N;;;;; +1D173;MUSICAL SYMBOL BEGIN BEAM;Cf;0;BN;;;;;N;;;;; +1D174;MUSICAL SYMBOL END BEAM;Cf;0;BN;;;;;N;;;;; +1D175;MUSICAL SYMBOL BEGIN TIE;Cf;0;BN;;;;;N;;;;; +1D176;MUSICAL SYMBOL END TIE;Cf;0;BN;;;;;N;;;;; +1D177;MUSICAL SYMBOL BEGIN SLUR;Cf;0;BN;;;;;N;;;;; +1D178;MUSICAL SYMBOL END SLUR;Cf;0;BN;;;;;N;;;;; +1D179;MUSICAL SYMBOL BEGIN PHRASE;Cf;0;BN;;;;;N;;;;; +1D17A;MUSICAL SYMBOL END PHRASE;Cf;0;BN;;;;;N;;;;; +1D17B;MUSICAL SYMBOL COMBINING ACCENT;Mn;220;NSM;;;;;N;;;;; +1D17C;MUSICAL SYMBOL COMBINING STACCATO;Mn;220;NSM;;;;;N;;;;; +1D17D;MUSICAL SYMBOL COMBINING TENUTO;Mn;220;NSM;;;;;N;;;;; +1D17E;MUSICAL SYMBOL COMBINING STACCATISSIMO;Mn;220;NSM;;;;;N;;;;; +1D17F;MUSICAL SYMBOL COMBINING MARCATO;Mn;220;NSM;;;;;N;;;;; +1D180;MUSICAL SYMBOL COMBINING MARCATO-STACCATO;Mn;220;NSM;;;;;N;;;;; +1D181;MUSICAL SYMBOL COMBINING ACCENT-STACCATO;Mn;220;NSM;;;;;N;;;;; +1D182;MUSICAL SYMBOL COMBINING LOURE;Mn;220;NSM;;;;;N;;;;; +1D183;MUSICAL SYMBOL ARPEGGIATO UP;So;0;L;;;;;N;;;;; +1D184;MUSICAL SYMBOL ARPEGGIATO DOWN;So;0;L;;;;;N;;;;; +1D185;MUSICAL SYMBOL COMBINING DOIT;Mn;230;NSM;;;;;N;;;;; +1D186;MUSICAL SYMBOL COMBINING RIP;Mn;230;NSM;;;;;N;;;;; +1D187;MUSICAL SYMBOL COMBINING FLIP;Mn;230;NSM;;;;;N;;;;; +1D188;MUSICAL SYMBOL COMBINING SMEAR;Mn;230;NSM;;;;;N;;;;; +1D189;MUSICAL SYMBOL COMBINING BEND;Mn;230;NSM;;;;;N;;;;; +1D18A;MUSICAL SYMBOL COMBINING DOUBLE TONGUE;Mn;220;NSM;;;;;N;;;;; +1D18B;MUSICAL SYMBOL COMBINING TRIPLE TONGUE;Mn;220;NSM;;;;;N;;;;; +1D18C;MUSICAL SYMBOL RINFORZANDO;So;0;L;;;;;N;;;;; +1D18D;MUSICAL SYMBOL SUBITO;So;0;L;;;;;N;;;;; +1D18E;MUSICAL SYMBOL Z;So;0;L;;;;;N;;;;; +1D18F;MUSICAL SYMBOL PIANO;So;0;L;;;;;N;;;;; +1D190;MUSICAL SYMBOL MEZZO;So;0;L;;;;;N;;;;; +1D191;MUSICAL SYMBOL FORTE;So;0;L;;;;;N;;;;; +1D192;MUSICAL SYMBOL CRESCENDO;So;0;L;;;;;N;;;;; +1D193;MUSICAL SYMBOL DECRESCENDO;So;0;L;;;;;N;;;;; +1D194;MUSICAL SYMBOL GRACE NOTE SLASH;So;0;L;;;;;N;;;;; +1D195;MUSICAL SYMBOL GRACE NOTE NO SLASH;So;0;L;;;;;N;;;;; +1D196;MUSICAL SYMBOL TR;So;0;L;;;;;N;;;;; +1D197;MUSICAL SYMBOL TURN;So;0;L;;;;;N;;;;; +1D198;MUSICAL SYMBOL INVERTED TURN;So;0;L;;;;;N;;;;; +1D199;MUSICAL SYMBOL TURN SLASH;So;0;L;;;;;N;;;;; +1D19A;MUSICAL SYMBOL TURN UP;So;0;L;;;;;N;;;;; +1D19B;MUSICAL SYMBOL ORNAMENT STROKE-1;So;0;L;;;;;N;;;;; +1D19C;MUSICAL SYMBOL ORNAMENT STROKE-2;So;0;L;;;;;N;;;;; +1D19D;MUSICAL SYMBOL ORNAMENT STROKE-3;So;0;L;;;;;N;;;;; +1D19E;MUSICAL SYMBOL ORNAMENT STROKE-4;So;0;L;;;;;N;;;;; +1D19F;MUSICAL SYMBOL ORNAMENT STROKE-5;So;0;L;;;;;N;;;;; +1D1A0;MUSICAL SYMBOL ORNAMENT STROKE-6;So;0;L;;;;;N;;;;; +1D1A1;MUSICAL SYMBOL ORNAMENT STROKE-7;So;0;L;;;;;N;;;;; +1D1A2;MUSICAL SYMBOL ORNAMENT STROKE-8;So;0;L;;;;;N;;;;; +1D1A3;MUSICAL SYMBOL ORNAMENT STROKE-9;So;0;L;;;;;N;;;;; +1D1A4;MUSICAL SYMBOL ORNAMENT STROKE-10;So;0;L;;;;;N;;;;; +1D1A5;MUSICAL SYMBOL ORNAMENT STROKE-11;So;0;L;;;;;N;;;;; +1D1A6;MUSICAL SYMBOL HAUPTSTIMME;So;0;L;;;;;N;;;;; +1D1A7;MUSICAL SYMBOL NEBENSTIMME;So;0;L;;;;;N;;;;; +1D1A8;MUSICAL SYMBOL END OF STIMME;So;0;L;;;;;N;;;;; +1D1A9;MUSICAL SYMBOL DEGREE SLASH;So;0;L;;;;;N;;;;; +1D1AA;MUSICAL SYMBOL COMBINING DOWN BOW;Mn;230;NSM;;;;;N;;;;; +1D1AB;MUSICAL SYMBOL COMBINING UP BOW;Mn;230;NSM;;;;;N;;;;; +1D1AC;MUSICAL SYMBOL COMBINING HARMONIC;Mn;230;NSM;;;;;N;;;;; +1D1AD;MUSICAL SYMBOL COMBINING SNAP PIZZICATO;Mn;230;NSM;;;;;N;;;;; +1D1AE;MUSICAL SYMBOL PEDAL MARK;So;0;L;;;;;N;;;;; +1D1AF;MUSICAL SYMBOL PEDAL UP MARK;So;0;L;;;;;N;;;;; +1D1B0;MUSICAL SYMBOL HALF PEDAL MARK;So;0;L;;;;;N;;;;; +1D1B1;MUSICAL SYMBOL GLISSANDO UP;So;0;L;;;;;N;;;;; +1D1B2;MUSICAL SYMBOL GLISSANDO DOWN;So;0;L;;;;;N;;;;; +1D1B3;MUSICAL SYMBOL WITH FINGERNAILS;So;0;L;;;;;N;;;;; +1D1B4;MUSICAL SYMBOL DAMP;So;0;L;;;;;N;;;;; +1D1B5;MUSICAL SYMBOL DAMP ALL;So;0;L;;;;;N;;;;; +1D1B6;MUSICAL SYMBOL MAXIMA;So;0;L;;;;;N;;;;; +1D1B7;MUSICAL SYMBOL LONGA;So;0;L;;;;;N;;;;; +1D1B8;MUSICAL SYMBOL BREVIS;So;0;L;;;;;N;;;;; +1D1B9;MUSICAL SYMBOL SEMIBREVIS WHITE;So;0;L;;;;;N;;;;; +1D1BA;MUSICAL SYMBOL SEMIBREVIS BLACK;So;0;L;;;;;N;;;;; +1D1BB;MUSICAL SYMBOL MINIMA;So;0;L;1D1B9 1D165;;;;N;;;;; +1D1BC;MUSICAL SYMBOL MINIMA BLACK;So;0;L;1D1BA 1D165;;;;N;;;;; +1D1BD;MUSICAL SYMBOL SEMIMINIMA WHITE;So;0;L;1D1BB 1D16E;;;;N;;;;; +1D1BE;MUSICAL SYMBOL SEMIMINIMA BLACK;So;0;L;1D1BC 1D16E;;;;N;;;;; +1D1BF;MUSICAL SYMBOL FUSA WHITE;So;0;L;1D1BB 1D16F;;;;N;;;;; +1D1C0;MUSICAL SYMBOL FUSA BLACK;So;0;L;1D1BC 1D16F;;;;N;;;;; +1D1C1;MUSICAL SYMBOL LONGA PERFECTA REST;So;0;L;;;;;N;;;;; +1D1C2;MUSICAL SYMBOL LONGA IMPERFECTA REST;So;0;L;;;;;N;;;;; +1D1C3;MUSICAL SYMBOL BREVIS REST;So;0;L;;;;;N;;;;; +1D1C4;MUSICAL SYMBOL SEMIBREVIS REST;So;0;L;;;;;N;;;;; +1D1C5;MUSICAL SYMBOL MINIMA REST;So;0;L;;;;;N;;;;; +1D1C6;MUSICAL SYMBOL SEMIMINIMA REST;So;0;L;;;;;N;;;;; +1D1C7;MUSICAL SYMBOL TEMPUS PERFECTUM CUM PROLATIONE PERFECTA;So;0;L;;;;;N;;;;; +1D1C8;MUSICAL SYMBOL TEMPUS PERFECTUM CUM PROLATIONE IMPERFECTA;So;0;L;;;;;N;;;;; +1D1C9;MUSICAL SYMBOL TEMPUS PERFECTUM CUM PROLATIONE PERFECTA DIMINUTION-1;So;0;L;;;;;N;;;;; +1D1CA;MUSICAL SYMBOL TEMPUS IMPERFECTUM CUM PROLATIONE PERFECTA;So;0;L;;;;;N;;;;; +1D1CB;MUSICAL SYMBOL TEMPUS IMPERFECTUM CUM PROLATIONE IMPERFECTA;So;0;L;;;;;N;;;;; +1D1CC;MUSICAL SYMBOL TEMPUS IMPERFECTUM CUM PROLATIONE IMPERFECTA DIMINUTION-1;So;0;L;;;;;N;;;;; +1D1CD;MUSICAL SYMBOL TEMPUS IMPERFECTUM CUM PROLATIONE IMPERFECTA DIMINUTION-2;So;0;L;;;;;N;;;;; +1D1CE;MUSICAL SYMBOL TEMPUS IMPERFECTUM CUM PROLATIONE IMPERFECTA DIMINUTION-3;So;0;L;;;;;N;;;;; +1D1CF;MUSICAL SYMBOL CROIX;So;0;L;;;;;N;;;;; +1D1D0;MUSICAL SYMBOL GREGORIAN C CLEF;So;0;L;;;;;N;;;;; +1D1D1;MUSICAL SYMBOL GREGORIAN F CLEF;So;0;L;;;;;N;;;;; +1D1D2;MUSICAL SYMBOL SQUARE B;So;0;L;;;;;N;;;;; +1D1D3;MUSICAL SYMBOL VIRGA;So;0;L;;;;;N;;;;; +1D1D4;MUSICAL SYMBOL PODATUS;So;0;L;;;;;N;;;;; +1D1D5;MUSICAL SYMBOL CLIVIS;So;0;L;;;;;N;;;;; +1D1D6;MUSICAL SYMBOL SCANDICUS;So;0;L;;;;;N;;;;; +1D1D7;MUSICAL SYMBOL CLIMACUS;So;0;L;;;;;N;;;;; +1D1D8;MUSICAL SYMBOL TORCULUS;So;0;L;;;;;N;;;;; +1D1D9;MUSICAL SYMBOL PORRECTUS;So;0;L;;;;;N;;;;; +1D1DA;MUSICAL SYMBOL PORRECTUS FLEXUS;So;0;L;;;;;N;;;;; +1D1DB;MUSICAL SYMBOL SCANDICUS FLEXUS;So;0;L;;;;;N;;;;; +1D1DC;MUSICAL SYMBOL TORCULUS RESUPINUS;So;0;L;;;;;N;;;;; +1D1DD;MUSICAL SYMBOL PES SUBPUNCTIS;So;0;L;;;;;N;;;;; +1D1DE;MUSICAL SYMBOL KIEVAN C CLEF;So;0;L;;;;;N;;;;; +1D1DF;MUSICAL SYMBOL KIEVAN END OF PIECE;So;0;L;;;;;N;;;;; +1D1E0;MUSICAL SYMBOL KIEVAN FINAL NOTE;So;0;L;;;;;N;;;;; +1D1E1;MUSICAL SYMBOL KIEVAN RECITATIVE MARK;So;0;L;;;;;N;;;;; +1D1E2;MUSICAL SYMBOL KIEVAN WHOLE NOTE;So;0;L;;;;;N;;;;; +1D1E3;MUSICAL SYMBOL KIEVAN HALF NOTE;So;0;L;;;;;N;;;;; +1D1E4;MUSICAL SYMBOL KIEVAN QUARTER NOTE STEM DOWN;So;0;L;;;;;N;;;;; +1D1E5;MUSICAL SYMBOL KIEVAN QUARTER NOTE STEM UP;So;0;L;;;;;N;;;;; +1D1E6;MUSICAL SYMBOL KIEVAN EIGHTH NOTE STEM DOWN;So;0;L;;;;;N;;;;; +1D1E7;MUSICAL SYMBOL KIEVAN EIGHTH NOTE STEM UP;So;0;L;;;;;N;;;;; +1D1E8;MUSICAL SYMBOL KIEVAN FLAT SIGN;So;0;L;;;;;N;;;;; +1D1E9;MUSICAL SYMBOL SORI;So;0;ON;;;;;N;;;;; +1D1EA;MUSICAL SYMBOL KORON;So;0;ON;;;;;N;;;;; +1D200;GREEK VOCAL NOTATION SYMBOL-1;So;0;ON;;;;;N;;;;; +1D201;GREEK VOCAL NOTATION SYMBOL-2;So;0;ON;;;;;N;;;;; +1D202;GREEK VOCAL NOTATION SYMBOL-3;So;0;ON;;;;;N;;;;; +1D203;GREEK VOCAL NOTATION SYMBOL-4;So;0;ON;;;;;N;;;;; +1D204;GREEK VOCAL NOTATION SYMBOL-5;So;0;ON;;;;;N;;;;; +1D205;GREEK VOCAL NOTATION SYMBOL-6;So;0;ON;;;;;N;;;;; +1D206;GREEK VOCAL NOTATION SYMBOL-7;So;0;ON;;;;;N;;;;; +1D207;GREEK VOCAL NOTATION SYMBOL-8;So;0;ON;;;;;N;;;;; +1D208;GREEK VOCAL NOTATION SYMBOL-9;So;0;ON;;;;;N;;;;; +1D209;GREEK VOCAL NOTATION SYMBOL-10;So;0;ON;;;;;N;;;;; +1D20A;GREEK VOCAL NOTATION SYMBOL-11;So;0;ON;;;;;N;;;;; +1D20B;GREEK VOCAL NOTATION SYMBOL-12;So;0;ON;;;;;N;;;;; +1D20C;GREEK VOCAL NOTATION SYMBOL-13;So;0;ON;;;;;N;;;;; +1D20D;GREEK VOCAL NOTATION SYMBOL-14;So;0;ON;;;;;N;;;;; +1D20E;GREEK VOCAL NOTATION SYMBOL-15;So;0;ON;;;;;N;;;;; +1D20F;GREEK VOCAL NOTATION SYMBOL-16;So;0;ON;;;;;N;;;;; +1D210;GREEK VOCAL NOTATION SYMBOL-17;So;0;ON;;;;;N;;;;; +1D211;GREEK VOCAL NOTATION SYMBOL-18;So;0;ON;;;;;N;;;;; +1D212;GREEK VOCAL NOTATION SYMBOL-19;So;0;ON;;;;;N;;;;; +1D213;GREEK VOCAL NOTATION SYMBOL-20;So;0;ON;;;;;N;;;;; +1D214;GREEK VOCAL NOTATION SYMBOL-21;So;0;ON;;;;;N;;;;; +1D215;GREEK VOCAL NOTATION SYMBOL-22;So;0;ON;;;;;N;;;;; +1D216;GREEK VOCAL NOTATION SYMBOL-23;So;0;ON;;;;;N;;;;; +1D217;GREEK VOCAL NOTATION SYMBOL-24;So;0;ON;;;;;N;;;;; +1D218;GREEK VOCAL NOTATION SYMBOL-50;So;0;ON;;;;;N;;;;; +1D219;GREEK VOCAL NOTATION SYMBOL-51;So;0;ON;;;;;N;;;;; +1D21A;GREEK VOCAL NOTATION SYMBOL-52;So;0;ON;;;;;N;;;;; +1D21B;GREEK VOCAL NOTATION SYMBOL-53;So;0;ON;;;;;N;;;;; +1D21C;GREEK VOCAL NOTATION SYMBOL-54;So;0;ON;;;;;N;;;;; +1D21D;GREEK INSTRUMENTAL NOTATION SYMBOL-1;So;0;ON;;;;;N;;;;; +1D21E;GREEK INSTRUMENTAL NOTATION SYMBOL-2;So;0;ON;;;;;N;;;;; +1D21F;GREEK INSTRUMENTAL NOTATION SYMBOL-4;So;0;ON;;;;;N;;;;; +1D220;GREEK INSTRUMENTAL NOTATION SYMBOL-5;So;0;ON;;;;;N;;;;; +1D221;GREEK INSTRUMENTAL NOTATION SYMBOL-7;So;0;ON;;;;;N;;;;; +1D222;GREEK INSTRUMENTAL NOTATION SYMBOL-8;So;0;ON;;;;;N;;;;; +1D223;GREEK INSTRUMENTAL NOTATION SYMBOL-11;So;0;ON;;;;;N;;;;; +1D224;GREEK INSTRUMENTAL NOTATION SYMBOL-12;So;0;ON;;;;;N;;;;; +1D225;GREEK INSTRUMENTAL NOTATION SYMBOL-13;So;0;ON;;;;;N;;;;; +1D226;GREEK INSTRUMENTAL NOTATION SYMBOL-14;So;0;ON;;;;;N;;;;; +1D227;GREEK INSTRUMENTAL NOTATION SYMBOL-17;So;0;ON;;;;;N;;;;; +1D228;GREEK INSTRUMENTAL NOTATION SYMBOL-18;So;0;ON;;;;;N;;;;; +1D229;GREEK INSTRUMENTAL NOTATION SYMBOL-19;So;0;ON;;;;;N;;;;; +1D22A;GREEK INSTRUMENTAL NOTATION SYMBOL-23;So;0;ON;;;;;N;;;;; +1D22B;GREEK INSTRUMENTAL NOTATION SYMBOL-24;So;0;ON;;;;;N;;;;; +1D22C;GREEK INSTRUMENTAL NOTATION SYMBOL-25;So;0;ON;;;;;N;;;;; +1D22D;GREEK INSTRUMENTAL NOTATION SYMBOL-26;So;0;ON;;;;;N;;;;; +1D22E;GREEK INSTRUMENTAL NOTATION SYMBOL-27;So;0;ON;;;;;N;;;;; +1D22F;GREEK INSTRUMENTAL NOTATION SYMBOL-29;So;0;ON;;;;;N;;;;; +1D230;GREEK INSTRUMENTAL NOTATION SYMBOL-30;So;0;ON;;;;;N;;;;; +1D231;GREEK INSTRUMENTAL NOTATION SYMBOL-32;So;0;ON;;;;;N;;;;; +1D232;GREEK INSTRUMENTAL NOTATION SYMBOL-36;So;0;ON;;;;;N;;;;; +1D233;GREEK INSTRUMENTAL NOTATION SYMBOL-37;So;0;ON;;;;;N;;;;; +1D234;GREEK INSTRUMENTAL NOTATION SYMBOL-38;So;0;ON;;;;;N;;;;; +1D235;GREEK INSTRUMENTAL NOTATION SYMBOL-39;So;0;ON;;;;;N;;;;; +1D236;GREEK INSTRUMENTAL NOTATION SYMBOL-40;So;0;ON;;;;;N;;;;; +1D237;GREEK INSTRUMENTAL NOTATION SYMBOL-42;So;0;ON;;;;;N;;;;; +1D238;GREEK INSTRUMENTAL NOTATION SYMBOL-43;So;0;ON;;;;;N;;;;; +1D239;GREEK INSTRUMENTAL NOTATION SYMBOL-45;So;0;ON;;;;;N;;;;; +1D23A;GREEK INSTRUMENTAL NOTATION SYMBOL-47;So;0;ON;;;;;N;;;;; +1D23B;GREEK INSTRUMENTAL NOTATION SYMBOL-48;So;0;ON;;;;;N;;;;; +1D23C;GREEK INSTRUMENTAL NOTATION SYMBOL-49;So;0;ON;;;;;N;;;;; +1D23D;GREEK INSTRUMENTAL NOTATION SYMBOL-50;So;0;ON;;;;;N;;;;; +1D23E;GREEK INSTRUMENTAL NOTATION SYMBOL-51;So;0;ON;;;;;N;;;;; +1D23F;GREEK INSTRUMENTAL NOTATION SYMBOL-52;So;0;ON;;;;;N;;;;; +1D240;GREEK INSTRUMENTAL NOTATION SYMBOL-53;So;0;ON;;;;;N;;;;; +1D241;GREEK INSTRUMENTAL NOTATION SYMBOL-54;So;0;ON;;;;;N;;;;; +1D242;COMBINING GREEK MUSICAL TRISEME;Mn;230;NSM;;;;;N;;;;; +1D243;COMBINING GREEK MUSICAL TETRASEME;Mn;230;NSM;;;;;N;;;;; +1D244;COMBINING GREEK MUSICAL PENTASEME;Mn;230;NSM;;;;;N;;;;; +1D245;GREEK MUSICAL LEIMMA;So;0;ON;;;;;N;;;;; +1D2C0;KAKTOVIK NUMERAL ZERO;No;0;L;;;;0;N;;;;; +1D2C1;KAKTOVIK NUMERAL ONE;No;0;L;;;;1;N;;;;; +1D2C2;KAKTOVIK NUMERAL TWO;No;0;L;;;;2;N;;;;; +1D2C3;KAKTOVIK NUMERAL THREE;No;0;L;;;;3;N;;;;; +1D2C4;KAKTOVIK NUMERAL FOUR;No;0;L;;;;4;N;;;;; +1D2C5;KAKTOVIK NUMERAL FIVE;No;0;L;;;;5;N;;;;; +1D2C6;KAKTOVIK NUMERAL SIX;No;0;L;;;;6;N;;;;; +1D2C7;KAKTOVIK NUMERAL SEVEN;No;0;L;;;;7;N;;;;; +1D2C8;KAKTOVIK NUMERAL EIGHT;No;0;L;;;;8;N;;;;; +1D2C9;KAKTOVIK NUMERAL NINE;No;0;L;;;;9;N;;;;; +1D2CA;KAKTOVIK NUMERAL TEN;No;0;L;;;;10;N;;;;; +1D2CB;KAKTOVIK NUMERAL ELEVEN;No;0;L;;;;11;N;;;;; +1D2CC;KAKTOVIK NUMERAL TWELVE;No;0;L;;;;12;N;;;;; +1D2CD;KAKTOVIK NUMERAL THIRTEEN;No;0;L;;;;13;N;;;;; +1D2CE;KAKTOVIK NUMERAL FOURTEEN;No;0;L;;;;14;N;;;;; +1D2CF;KAKTOVIK NUMERAL FIFTEEN;No;0;L;;;;15;N;;;;; +1D2D0;KAKTOVIK NUMERAL SIXTEEN;No;0;L;;;;16;N;;;;; +1D2D1;KAKTOVIK NUMERAL SEVENTEEN;No;0;L;;;;17;N;;;;; +1D2D2;KAKTOVIK NUMERAL EIGHTEEN;No;0;L;;;;18;N;;;;; +1D2D3;KAKTOVIK NUMERAL NINETEEN;No;0;L;;;;19;N;;;;; +1D2E0;MAYAN NUMERAL ZERO;No;0;L;;;;0;N;;;;; +1D2E1;MAYAN NUMERAL ONE;No;0;L;;;;1;N;;;;; +1D2E2;MAYAN NUMERAL TWO;No;0;L;;;;2;N;;;;; +1D2E3;MAYAN NUMERAL THREE;No;0;L;;;;3;N;;;;; +1D2E4;MAYAN NUMERAL FOUR;No;0;L;;;;4;N;;;;; +1D2E5;MAYAN NUMERAL FIVE;No;0;L;;;;5;N;;;;; +1D2E6;MAYAN NUMERAL SIX;No;0;L;;;;6;N;;;;; +1D2E7;MAYAN NUMERAL SEVEN;No;0;L;;;;7;N;;;;; +1D2E8;MAYAN NUMERAL EIGHT;No;0;L;;;;8;N;;;;; +1D2E9;MAYAN NUMERAL NINE;No;0;L;;;;9;N;;;;; +1D2EA;MAYAN NUMERAL TEN;No;0;L;;;;10;N;;;;; +1D2EB;MAYAN NUMERAL ELEVEN;No;0;L;;;;11;N;;;;; +1D2EC;MAYAN NUMERAL TWELVE;No;0;L;;;;12;N;;;;; +1D2ED;MAYAN NUMERAL THIRTEEN;No;0;L;;;;13;N;;;;; +1D2EE;MAYAN NUMERAL FOURTEEN;No;0;L;;;;14;N;;;;; +1D2EF;MAYAN NUMERAL FIFTEEN;No;0;L;;;;15;N;;;;; +1D2F0;MAYAN NUMERAL SIXTEEN;No;0;L;;;;16;N;;;;; +1D2F1;MAYAN NUMERAL SEVENTEEN;No;0;L;;;;17;N;;;;; +1D2F2;MAYAN NUMERAL EIGHTEEN;No;0;L;;;;18;N;;;;; +1D2F3;MAYAN NUMERAL NINETEEN;No;0;L;;;;19;N;;;;; +1D300;MONOGRAM FOR EARTH;So;0;ON;;;;;N;;;;; +1D301;DIGRAM FOR HEAVENLY EARTH;So;0;ON;;;;;N;;;;; +1D302;DIGRAM FOR HUMAN EARTH;So;0;ON;;;;;N;;;;; +1D303;DIGRAM FOR EARTHLY HEAVEN;So;0;ON;;;;;N;;;;; +1D304;DIGRAM FOR EARTHLY HUMAN;So;0;ON;;;;;N;;;;; +1D305;DIGRAM FOR EARTH;So;0;ON;;;;;N;;;;; +1D306;TETRAGRAM FOR CENTRE;So;0;ON;;;;;N;;;;; +1D307;TETRAGRAM FOR FULL CIRCLE;So;0;ON;;;;;N;;;;; +1D308;TETRAGRAM FOR MIRED;So;0;ON;;;;;N;;;;; +1D309;TETRAGRAM FOR BARRIER;So;0;ON;;;;;N;;;;; +1D30A;TETRAGRAM FOR KEEPING SMALL;So;0;ON;;;;;N;;;;; +1D30B;TETRAGRAM FOR CONTRARIETY;So;0;ON;;;;;N;;;;; +1D30C;TETRAGRAM FOR ASCENT;So;0;ON;;;;;N;;;;; +1D30D;TETRAGRAM FOR OPPOSITION;So;0;ON;;;;;N;;;;; +1D30E;TETRAGRAM FOR BRANCHING OUT;So;0;ON;;;;;N;;;;; +1D30F;TETRAGRAM FOR DEFECTIVENESS OR DISTORTION;So;0;ON;;;;;N;;;;; +1D310;TETRAGRAM FOR DIVERGENCE;So;0;ON;;;;;N;;;;; +1D311;TETRAGRAM FOR YOUTHFULNESS;So;0;ON;;;;;N;;;;; +1D312;TETRAGRAM FOR INCREASE;So;0;ON;;;;;N;;;;; +1D313;TETRAGRAM FOR PENETRATION;So;0;ON;;;;;N;;;;; +1D314;TETRAGRAM FOR REACH;So;0;ON;;;;;N;;;;; +1D315;TETRAGRAM FOR CONTACT;So;0;ON;;;;;N;;;;; +1D316;TETRAGRAM FOR HOLDING BACK;So;0;ON;;;;;N;;;;; +1D317;TETRAGRAM FOR WAITING;So;0;ON;;;;;N;;;;; +1D318;TETRAGRAM FOR FOLLOWING;So;0;ON;;;;;N;;;;; +1D319;TETRAGRAM FOR ADVANCE;So;0;ON;;;;;N;;;;; +1D31A;TETRAGRAM FOR RELEASE;So;0;ON;;;;;N;;;;; +1D31B;TETRAGRAM FOR RESISTANCE;So;0;ON;;;;;N;;;;; +1D31C;TETRAGRAM FOR EASE;So;0;ON;;;;;N;;;;; +1D31D;TETRAGRAM FOR JOY;So;0;ON;;;;;N;;;;; +1D31E;TETRAGRAM FOR CONTENTION;So;0;ON;;;;;N;;;;; +1D31F;TETRAGRAM FOR ENDEAVOUR;So;0;ON;;;;;N;;;;; +1D320;TETRAGRAM FOR DUTIES;So;0;ON;;;;;N;;;;; +1D321;TETRAGRAM FOR CHANGE;So;0;ON;;;;;N;;;;; +1D322;TETRAGRAM FOR DECISIVENESS;So;0;ON;;;;;N;;;;; +1D323;TETRAGRAM FOR BOLD RESOLUTION;So;0;ON;;;;;N;;;;; +1D324;TETRAGRAM FOR PACKING;So;0;ON;;;;;N;;;;; +1D325;TETRAGRAM FOR LEGION;So;0;ON;;;;;N;;;;; +1D326;TETRAGRAM FOR CLOSENESS;So;0;ON;;;;;N;;;;; +1D327;TETRAGRAM FOR KINSHIP;So;0;ON;;;;;N;;;;; +1D328;TETRAGRAM FOR GATHERING;So;0;ON;;;;;N;;;;; +1D329;TETRAGRAM FOR STRENGTH;So;0;ON;;;;;N;;;;; +1D32A;TETRAGRAM FOR PURITY;So;0;ON;;;;;N;;;;; +1D32B;TETRAGRAM FOR FULLNESS;So;0;ON;;;;;N;;;;; +1D32C;TETRAGRAM FOR RESIDENCE;So;0;ON;;;;;N;;;;; +1D32D;TETRAGRAM FOR LAW OR MODEL;So;0;ON;;;;;N;;;;; +1D32E;TETRAGRAM FOR RESPONSE;So;0;ON;;;;;N;;;;; +1D32F;TETRAGRAM FOR GOING TO MEET;So;0;ON;;;;;N;;;;; +1D330;TETRAGRAM FOR ENCOUNTERS;So;0;ON;;;;;N;;;;; +1D331;TETRAGRAM FOR STOVE;So;0;ON;;;;;N;;;;; +1D332;TETRAGRAM FOR GREATNESS;So;0;ON;;;;;N;;;;; +1D333;TETRAGRAM FOR ENLARGEMENT;So;0;ON;;;;;N;;;;; +1D334;TETRAGRAM FOR PATTERN;So;0;ON;;;;;N;;;;; +1D335;TETRAGRAM FOR RITUAL;So;0;ON;;;;;N;;;;; +1D336;TETRAGRAM FOR FLIGHT;So;0;ON;;;;;N;;;;; +1D337;TETRAGRAM FOR VASTNESS OR WASTING;So;0;ON;;;;;N;;;;; +1D338;TETRAGRAM FOR CONSTANCY;So;0;ON;;;;;N;;;;; +1D339;TETRAGRAM FOR MEASURE;So;0;ON;;;;;N;;;;; +1D33A;TETRAGRAM FOR ETERNITY;So;0;ON;;;;;N;;;;; +1D33B;TETRAGRAM FOR UNITY;So;0;ON;;;;;N;;;;; +1D33C;TETRAGRAM FOR DIMINISHMENT;So;0;ON;;;;;N;;;;; +1D33D;TETRAGRAM FOR CLOSED MOUTH;So;0;ON;;;;;N;;;;; +1D33E;TETRAGRAM FOR GUARDEDNESS;So;0;ON;;;;;N;;;;; +1D33F;TETRAGRAM FOR GATHERING IN;So;0;ON;;;;;N;;;;; +1D340;TETRAGRAM FOR MASSING;So;0;ON;;;;;N;;;;; +1D341;TETRAGRAM FOR ACCUMULATION;So;0;ON;;;;;N;;;;; +1D342;TETRAGRAM FOR EMBELLISHMENT;So;0;ON;;;;;N;;;;; +1D343;TETRAGRAM FOR DOUBT;So;0;ON;;;;;N;;;;; +1D344;TETRAGRAM FOR WATCH;So;0;ON;;;;;N;;;;; +1D345;TETRAGRAM FOR SINKING;So;0;ON;;;;;N;;;;; +1D346;TETRAGRAM FOR INNER;So;0;ON;;;;;N;;;;; +1D347;TETRAGRAM FOR DEPARTURE;So;0;ON;;;;;N;;;;; +1D348;TETRAGRAM FOR DARKENING;So;0;ON;;;;;N;;;;; +1D349;TETRAGRAM FOR DIMMING;So;0;ON;;;;;N;;;;; +1D34A;TETRAGRAM FOR EXHAUSTION;So;0;ON;;;;;N;;;;; +1D34B;TETRAGRAM FOR SEVERANCE;So;0;ON;;;;;N;;;;; +1D34C;TETRAGRAM FOR STOPPAGE;So;0;ON;;;;;N;;;;; +1D34D;TETRAGRAM FOR HARDNESS;So;0;ON;;;;;N;;;;; +1D34E;TETRAGRAM FOR COMPLETION;So;0;ON;;;;;N;;;;; +1D34F;TETRAGRAM FOR CLOSURE;So;0;ON;;;;;N;;;;; +1D350;TETRAGRAM FOR FAILURE;So;0;ON;;;;;N;;;;; +1D351;TETRAGRAM FOR AGGRAVATION;So;0;ON;;;;;N;;;;; +1D352;TETRAGRAM FOR COMPLIANCE;So;0;ON;;;;;N;;;;; +1D353;TETRAGRAM FOR ON THE VERGE;So;0;ON;;;;;N;;;;; +1D354;TETRAGRAM FOR DIFFICULTIES;So;0;ON;;;;;N;;;;; +1D355;TETRAGRAM FOR LABOURING;So;0;ON;;;;;N;;;;; +1D356;TETRAGRAM FOR FOSTERING;So;0;ON;;;;;N;;;;; +1D360;COUNTING ROD UNIT DIGIT ONE;No;0;L;;;;1;N;;;;; +1D361;COUNTING ROD UNIT DIGIT TWO;No;0;L;;;;2;N;;;;; +1D362;COUNTING ROD UNIT DIGIT THREE;No;0;L;;;;3;N;;;;; +1D363;COUNTING ROD UNIT DIGIT FOUR;No;0;L;;;;4;N;;;;; +1D364;COUNTING ROD UNIT DIGIT FIVE;No;0;L;;;;5;N;;;;; +1D365;COUNTING ROD UNIT DIGIT SIX;No;0;L;;;;6;N;;;;; +1D366;COUNTING ROD UNIT DIGIT SEVEN;No;0;L;;;;7;N;;;;; +1D367;COUNTING ROD UNIT DIGIT EIGHT;No;0;L;;;;8;N;;;;; +1D368;COUNTING ROD UNIT DIGIT NINE;No;0;L;;;;9;N;;;;; +1D369;COUNTING ROD TENS DIGIT ONE;No;0;L;;;;10;N;;;;; +1D36A;COUNTING ROD TENS DIGIT TWO;No;0;L;;;;20;N;;;;; +1D36B;COUNTING ROD TENS DIGIT THREE;No;0;L;;;;30;N;;;;; +1D36C;COUNTING ROD TENS DIGIT FOUR;No;0;L;;;;40;N;;;;; +1D36D;COUNTING ROD TENS DIGIT FIVE;No;0;L;;;;50;N;;;;; +1D36E;COUNTING ROD TENS DIGIT SIX;No;0;L;;;;60;N;;;;; +1D36F;COUNTING ROD TENS DIGIT SEVEN;No;0;L;;;;70;N;;;;; +1D370;COUNTING ROD TENS DIGIT EIGHT;No;0;L;;;;80;N;;;;; +1D371;COUNTING ROD TENS DIGIT NINE;No;0;L;;;;90;N;;;;; +1D372;IDEOGRAPHIC TALLY MARK ONE;No;0;L;;;;1;N;;;;; +1D373;IDEOGRAPHIC TALLY MARK TWO;No;0;L;;;;2;N;;;;; +1D374;IDEOGRAPHIC TALLY MARK THREE;No;0;L;;;;3;N;;;;; +1D375;IDEOGRAPHIC TALLY MARK FOUR;No;0;L;;;;4;N;;;;; +1D376;IDEOGRAPHIC TALLY MARK FIVE;No;0;L;;;;5;N;;;;; +1D377;TALLY MARK ONE;No;0;L;;;;1;N;;;;; +1D378;TALLY MARK FIVE;No;0;L;;;;5;N;;;;; +1D400;MATHEMATICAL BOLD CAPITAL A;Lu;0;L; 0041;;;;N;;;;; +1D401;MATHEMATICAL BOLD CAPITAL B;Lu;0;L; 0042;;;;N;;;;; +1D402;MATHEMATICAL BOLD CAPITAL C;Lu;0;L; 0043;;;;N;;;;; +1D403;MATHEMATICAL BOLD CAPITAL D;Lu;0;L; 0044;;;;N;;;;; +1D404;MATHEMATICAL BOLD CAPITAL E;Lu;0;L; 0045;;;;N;;;;; +1D405;MATHEMATICAL BOLD CAPITAL F;Lu;0;L; 0046;;;;N;;;;; +1D406;MATHEMATICAL BOLD CAPITAL G;Lu;0;L; 0047;;;;N;;;;; +1D407;MATHEMATICAL BOLD CAPITAL H;Lu;0;L; 0048;;;;N;;;;; +1D408;MATHEMATICAL BOLD CAPITAL I;Lu;0;L; 0049;;;;N;;;;; +1D409;MATHEMATICAL BOLD CAPITAL J;Lu;0;L; 004A;;;;N;;;;; +1D40A;MATHEMATICAL BOLD CAPITAL K;Lu;0;L; 004B;;;;N;;;;; +1D40B;MATHEMATICAL BOLD CAPITAL L;Lu;0;L; 004C;;;;N;;;;; +1D40C;MATHEMATICAL BOLD CAPITAL M;Lu;0;L; 004D;;;;N;;;;; +1D40D;MATHEMATICAL BOLD CAPITAL N;Lu;0;L; 004E;;;;N;;;;; +1D40E;MATHEMATICAL BOLD CAPITAL O;Lu;0;L; 004F;;;;N;;;;; +1D40F;MATHEMATICAL BOLD CAPITAL P;Lu;0;L; 0050;;;;N;;;;; +1D410;MATHEMATICAL BOLD CAPITAL Q;Lu;0;L; 0051;;;;N;;;;; +1D411;MATHEMATICAL BOLD CAPITAL R;Lu;0;L; 0052;;;;N;;;;; +1D412;MATHEMATICAL BOLD CAPITAL S;Lu;0;L; 0053;;;;N;;;;; +1D413;MATHEMATICAL BOLD CAPITAL T;Lu;0;L; 0054;;;;N;;;;; +1D414;MATHEMATICAL BOLD CAPITAL U;Lu;0;L; 0055;;;;N;;;;; +1D415;MATHEMATICAL BOLD CAPITAL V;Lu;0;L; 0056;;;;N;;;;; +1D416;MATHEMATICAL BOLD CAPITAL W;Lu;0;L; 0057;;;;N;;;;; +1D417;MATHEMATICAL BOLD CAPITAL X;Lu;0;L; 0058;;;;N;;;;; +1D418;MATHEMATICAL BOLD CAPITAL Y;Lu;0;L; 0059;;;;N;;;;; +1D419;MATHEMATICAL BOLD CAPITAL Z;Lu;0;L; 005A;;;;N;;;;; +1D41A;MATHEMATICAL BOLD SMALL A;Ll;0;L; 0061;;;;N;;;;; +1D41B;MATHEMATICAL BOLD SMALL B;Ll;0;L; 0062;;;;N;;;;; +1D41C;MATHEMATICAL BOLD SMALL C;Ll;0;L; 0063;;;;N;;;;; +1D41D;MATHEMATICAL BOLD SMALL D;Ll;0;L; 0064;;;;N;;;;; +1D41E;MATHEMATICAL BOLD SMALL E;Ll;0;L; 0065;;;;N;;;;; +1D41F;MATHEMATICAL BOLD SMALL F;Ll;0;L; 0066;;;;N;;;;; +1D420;MATHEMATICAL BOLD SMALL G;Ll;0;L; 0067;;;;N;;;;; +1D421;MATHEMATICAL BOLD SMALL H;Ll;0;L; 0068;;;;N;;;;; +1D422;MATHEMATICAL BOLD SMALL I;Ll;0;L; 0069;;;;N;;;;; +1D423;MATHEMATICAL BOLD SMALL J;Ll;0;L; 006A;;;;N;;;;; +1D424;MATHEMATICAL BOLD SMALL K;Ll;0;L; 006B;;;;N;;;;; +1D425;MATHEMATICAL BOLD SMALL L;Ll;0;L; 006C;;;;N;;;;; +1D426;MATHEMATICAL BOLD SMALL M;Ll;0;L; 006D;;;;N;;;;; +1D427;MATHEMATICAL BOLD SMALL N;Ll;0;L; 006E;;;;N;;;;; +1D428;MATHEMATICAL BOLD SMALL O;Ll;0;L; 006F;;;;N;;;;; +1D429;MATHEMATICAL BOLD SMALL P;Ll;0;L; 0070;;;;N;;;;; +1D42A;MATHEMATICAL BOLD SMALL Q;Ll;0;L; 0071;;;;N;;;;; +1D42B;MATHEMATICAL BOLD SMALL R;Ll;0;L; 0072;;;;N;;;;; +1D42C;MATHEMATICAL BOLD SMALL S;Ll;0;L; 0073;;;;N;;;;; +1D42D;MATHEMATICAL BOLD SMALL T;Ll;0;L; 0074;;;;N;;;;; +1D42E;MATHEMATICAL BOLD SMALL U;Ll;0;L; 0075;;;;N;;;;; +1D42F;MATHEMATICAL BOLD SMALL V;Ll;0;L; 0076;;;;N;;;;; +1D430;MATHEMATICAL BOLD SMALL W;Ll;0;L; 0077;;;;N;;;;; +1D431;MATHEMATICAL BOLD SMALL X;Ll;0;L; 0078;;;;N;;;;; +1D432;MATHEMATICAL BOLD SMALL Y;Ll;0;L; 0079;;;;N;;;;; +1D433;MATHEMATICAL BOLD SMALL Z;Ll;0;L; 007A;;;;N;;;;; +1D434;MATHEMATICAL ITALIC CAPITAL A;Lu;0;L; 0041;;;;N;;;;; +1D435;MATHEMATICAL ITALIC CAPITAL B;Lu;0;L; 0042;;;;N;;;;; +1D436;MATHEMATICAL ITALIC CAPITAL C;Lu;0;L; 0043;;;;N;;;;; +1D437;MATHEMATICAL ITALIC CAPITAL D;Lu;0;L; 0044;;;;N;;;;; +1D438;MATHEMATICAL ITALIC CAPITAL E;Lu;0;L; 0045;;;;N;;;;; +1D439;MATHEMATICAL ITALIC CAPITAL F;Lu;0;L; 0046;;;;N;;;;; +1D43A;MATHEMATICAL ITALIC CAPITAL G;Lu;0;L; 0047;;;;N;;;;; +1D43B;MATHEMATICAL ITALIC CAPITAL H;Lu;0;L; 0048;;;;N;;;;; +1D43C;MATHEMATICAL ITALIC CAPITAL I;Lu;0;L; 0049;;;;N;;;;; +1D43D;MATHEMATICAL ITALIC CAPITAL J;Lu;0;L; 004A;;;;N;;;;; +1D43E;MATHEMATICAL ITALIC CAPITAL K;Lu;0;L; 004B;;;;N;;;;; +1D43F;MATHEMATICAL ITALIC CAPITAL L;Lu;0;L; 004C;;;;N;;;;; +1D440;MATHEMATICAL ITALIC CAPITAL M;Lu;0;L; 004D;;;;N;;;;; +1D441;MATHEMATICAL ITALIC CAPITAL N;Lu;0;L; 004E;;;;N;;;;; +1D442;MATHEMATICAL ITALIC CAPITAL O;Lu;0;L; 004F;;;;N;;;;; +1D443;MATHEMATICAL ITALIC CAPITAL P;Lu;0;L; 0050;;;;N;;;;; +1D444;MATHEMATICAL ITALIC CAPITAL Q;Lu;0;L; 0051;;;;N;;;;; +1D445;MATHEMATICAL ITALIC CAPITAL R;Lu;0;L; 0052;;;;N;;;;; +1D446;MATHEMATICAL ITALIC CAPITAL S;Lu;0;L; 0053;;;;N;;;;; +1D447;MATHEMATICAL ITALIC CAPITAL T;Lu;0;L; 0054;;;;N;;;;; +1D448;MATHEMATICAL ITALIC CAPITAL U;Lu;0;L; 0055;;;;N;;;;; +1D449;MATHEMATICAL ITALIC CAPITAL V;Lu;0;L; 0056;;;;N;;;;; +1D44A;MATHEMATICAL ITALIC CAPITAL W;Lu;0;L; 0057;;;;N;;;;; +1D44B;MATHEMATICAL ITALIC CAPITAL X;Lu;0;L; 0058;;;;N;;;;; +1D44C;MATHEMATICAL ITALIC CAPITAL Y;Lu;0;L; 0059;;;;N;;;;; +1D44D;MATHEMATICAL ITALIC CAPITAL Z;Lu;0;L; 005A;;;;N;;;;; +1D44E;MATHEMATICAL ITALIC SMALL A;Ll;0;L; 0061;;;;N;;;;; +1D44F;MATHEMATICAL ITALIC SMALL B;Ll;0;L; 0062;;;;N;;;;; +1D450;MATHEMATICAL ITALIC SMALL C;Ll;0;L; 0063;;;;N;;;;; +1D451;MATHEMATICAL ITALIC SMALL D;Ll;0;L; 0064;;;;N;;;;; +1D452;MATHEMATICAL ITALIC SMALL E;Ll;0;L; 0065;;;;N;;;;; +1D453;MATHEMATICAL ITALIC SMALL F;Ll;0;L; 0066;;;;N;;;;; +1D454;MATHEMATICAL ITALIC SMALL G;Ll;0;L; 0067;;;;N;;;;; +1D456;MATHEMATICAL ITALIC SMALL I;Ll;0;L; 0069;;;;N;;;;; +1D457;MATHEMATICAL ITALIC SMALL J;Ll;0;L; 006A;;;;N;;;;; +1D458;MATHEMATICAL ITALIC SMALL K;Ll;0;L; 006B;;;;N;;;;; +1D459;MATHEMATICAL ITALIC SMALL L;Ll;0;L; 006C;;;;N;;;;; +1D45A;MATHEMATICAL ITALIC SMALL M;Ll;0;L; 006D;;;;N;;;;; +1D45B;MATHEMATICAL ITALIC SMALL N;Ll;0;L; 006E;;;;N;;;;; +1D45C;MATHEMATICAL ITALIC SMALL O;Ll;0;L; 006F;;;;N;;;;; +1D45D;MATHEMATICAL ITALIC SMALL P;Ll;0;L; 0070;;;;N;;;;; +1D45E;MATHEMATICAL ITALIC SMALL Q;Ll;0;L; 0071;;;;N;;;;; +1D45F;MATHEMATICAL ITALIC SMALL R;Ll;0;L; 0072;;;;N;;;;; +1D460;MATHEMATICAL ITALIC SMALL S;Ll;0;L; 0073;;;;N;;;;; +1D461;MATHEMATICAL ITALIC SMALL T;Ll;0;L; 0074;;;;N;;;;; +1D462;MATHEMATICAL ITALIC SMALL U;Ll;0;L; 0075;;;;N;;;;; +1D463;MATHEMATICAL ITALIC SMALL V;Ll;0;L; 0076;;;;N;;;;; +1D464;MATHEMATICAL ITALIC SMALL W;Ll;0;L; 0077;;;;N;;;;; +1D465;MATHEMATICAL ITALIC SMALL X;Ll;0;L; 0078;;;;N;;;;; +1D466;MATHEMATICAL ITALIC SMALL Y;Ll;0;L; 0079;;;;N;;;;; +1D467;MATHEMATICAL ITALIC SMALL Z;Ll;0;L; 007A;;;;N;;;;; +1D468;MATHEMATICAL BOLD ITALIC CAPITAL A;Lu;0;L; 0041;;;;N;;;;; +1D469;MATHEMATICAL BOLD ITALIC CAPITAL B;Lu;0;L; 0042;;;;N;;;;; +1D46A;MATHEMATICAL BOLD ITALIC CAPITAL C;Lu;0;L; 0043;;;;N;;;;; +1D46B;MATHEMATICAL BOLD ITALIC CAPITAL D;Lu;0;L; 0044;;;;N;;;;; +1D46C;MATHEMATICAL BOLD ITALIC CAPITAL E;Lu;0;L; 0045;;;;N;;;;; +1D46D;MATHEMATICAL BOLD ITALIC CAPITAL F;Lu;0;L; 0046;;;;N;;;;; +1D46E;MATHEMATICAL BOLD ITALIC CAPITAL G;Lu;0;L; 0047;;;;N;;;;; +1D46F;MATHEMATICAL BOLD ITALIC CAPITAL H;Lu;0;L; 0048;;;;N;;;;; +1D470;MATHEMATICAL BOLD ITALIC CAPITAL I;Lu;0;L; 0049;;;;N;;;;; +1D471;MATHEMATICAL BOLD ITALIC CAPITAL J;Lu;0;L; 004A;;;;N;;;;; +1D472;MATHEMATICAL BOLD ITALIC CAPITAL K;Lu;0;L; 004B;;;;N;;;;; +1D473;MATHEMATICAL BOLD ITALIC CAPITAL L;Lu;0;L; 004C;;;;N;;;;; +1D474;MATHEMATICAL BOLD ITALIC CAPITAL M;Lu;0;L; 004D;;;;N;;;;; +1D475;MATHEMATICAL BOLD ITALIC CAPITAL N;Lu;0;L; 004E;;;;N;;;;; +1D476;MATHEMATICAL BOLD ITALIC CAPITAL O;Lu;0;L; 004F;;;;N;;;;; +1D477;MATHEMATICAL BOLD ITALIC CAPITAL P;Lu;0;L; 0050;;;;N;;;;; +1D478;MATHEMATICAL BOLD ITALIC CAPITAL Q;Lu;0;L; 0051;;;;N;;;;; +1D479;MATHEMATICAL BOLD ITALIC CAPITAL R;Lu;0;L; 0052;;;;N;;;;; +1D47A;MATHEMATICAL BOLD ITALIC CAPITAL S;Lu;0;L; 0053;;;;N;;;;; +1D47B;MATHEMATICAL BOLD ITALIC CAPITAL T;Lu;0;L; 0054;;;;N;;;;; +1D47C;MATHEMATICAL BOLD ITALIC CAPITAL U;Lu;0;L; 0055;;;;N;;;;; +1D47D;MATHEMATICAL BOLD ITALIC CAPITAL V;Lu;0;L; 0056;;;;N;;;;; +1D47E;MATHEMATICAL BOLD ITALIC CAPITAL W;Lu;0;L; 0057;;;;N;;;;; +1D47F;MATHEMATICAL BOLD ITALIC CAPITAL X;Lu;0;L; 0058;;;;N;;;;; +1D480;MATHEMATICAL BOLD ITALIC CAPITAL Y;Lu;0;L; 0059;;;;N;;;;; +1D481;MATHEMATICAL BOLD ITALIC CAPITAL Z;Lu;0;L; 005A;;;;N;;;;; +1D482;MATHEMATICAL BOLD ITALIC SMALL A;Ll;0;L; 0061;;;;N;;;;; +1D483;MATHEMATICAL BOLD ITALIC SMALL B;Ll;0;L; 0062;;;;N;;;;; +1D484;MATHEMATICAL BOLD ITALIC SMALL C;Ll;0;L; 0063;;;;N;;;;; +1D485;MATHEMATICAL BOLD ITALIC SMALL D;Ll;0;L; 0064;;;;N;;;;; +1D486;MATHEMATICAL BOLD ITALIC SMALL E;Ll;0;L; 0065;;;;N;;;;; +1D487;MATHEMATICAL BOLD ITALIC SMALL F;Ll;0;L; 0066;;;;N;;;;; +1D488;MATHEMATICAL BOLD ITALIC SMALL G;Ll;0;L; 0067;;;;N;;;;; +1D489;MATHEMATICAL BOLD ITALIC SMALL H;Ll;0;L; 0068;;;;N;;;;; +1D48A;MATHEMATICAL BOLD ITALIC SMALL I;Ll;0;L; 0069;;;;N;;;;; +1D48B;MATHEMATICAL BOLD ITALIC SMALL J;Ll;0;L; 006A;;;;N;;;;; +1D48C;MATHEMATICAL BOLD ITALIC SMALL K;Ll;0;L; 006B;;;;N;;;;; +1D48D;MATHEMATICAL BOLD ITALIC SMALL L;Ll;0;L; 006C;;;;N;;;;; +1D48E;MATHEMATICAL BOLD ITALIC SMALL M;Ll;0;L; 006D;;;;N;;;;; +1D48F;MATHEMATICAL BOLD ITALIC SMALL N;Ll;0;L; 006E;;;;N;;;;; +1D490;MATHEMATICAL BOLD ITALIC SMALL O;Ll;0;L; 006F;;;;N;;;;; +1D491;MATHEMATICAL BOLD ITALIC SMALL P;Ll;0;L; 0070;;;;N;;;;; +1D492;MATHEMATICAL BOLD ITALIC SMALL Q;Ll;0;L; 0071;;;;N;;;;; +1D493;MATHEMATICAL BOLD ITALIC SMALL R;Ll;0;L; 0072;;;;N;;;;; +1D494;MATHEMATICAL BOLD ITALIC SMALL S;Ll;0;L; 0073;;;;N;;;;; +1D495;MATHEMATICAL BOLD ITALIC SMALL T;Ll;0;L; 0074;;;;N;;;;; +1D496;MATHEMATICAL BOLD ITALIC SMALL U;Ll;0;L; 0075;;;;N;;;;; +1D497;MATHEMATICAL BOLD ITALIC SMALL V;Ll;0;L; 0076;;;;N;;;;; +1D498;MATHEMATICAL BOLD ITALIC SMALL W;Ll;0;L; 0077;;;;N;;;;; +1D499;MATHEMATICAL BOLD ITALIC SMALL X;Ll;0;L; 0078;;;;N;;;;; +1D49A;MATHEMATICAL BOLD ITALIC SMALL Y;Ll;0;L; 0079;;;;N;;;;; +1D49B;MATHEMATICAL BOLD ITALIC SMALL Z;Ll;0;L; 007A;;;;N;;;;; +1D49C;MATHEMATICAL SCRIPT CAPITAL A;Lu;0;L; 0041;;;;N;;;;; +1D49E;MATHEMATICAL SCRIPT CAPITAL C;Lu;0;L; 0043;;;;N;;;;; +1D49F;MATHEMATICAL SCRIPT CAPITAL D;Lu;0;L; 0044;;;;N;;;;; +1D4A2;MATHEMATICAL SCRIPT CAPITAL G;Lu;0;L; 0047;;;;N;;;;; +1D4A5;MATHEMATICAL SCRIPT CAPITAL J;Lu;0;L; 004A;;;;N;;;;; +1D4A6;MATHEMATICAL SCRIPT CAPITAL K;Lu;0;L; 004B;;;;N;;;;; +1D4A9;MATHEMATICAL SCRIPT CAPITAL N;Lu;0;L; 004E;;;;N;;;;; +1D4AA;MATHEMATICAL SCRIPT CAPITAL O;Lu;0;L; 004F;;;;N;;;;; +1D4AB;MATHEMATICAL SCRIPT CAPITAL P;Lu;0;L; 0050;;;;N;;;;; +1D4AC;MATHEMATICAL SCRIPT CAPITAL Q;Lu;0;L; 0051;;;;N;;;;; +1D4AE;MATHEMATICAL SCRIPT CAPITAL S;Lu;0;L; 0053;;;;N;;;;; +1D4AF;MATHEMATICAL SCRIPT CAPITAL T;Lu;0;L; 0054;;;;N;;;;; +1D4B0;MATHEMATICAL SCRIPT CAPITAL U;Lu;0;L; 0055;;;;N;;;;; +1D4B1;MATHEMATICAL SCRIPT CAPITAL V;Lu;0;L; 0056;;;;N;;;;; +1D4B2;MATHEMATICAL SCRIPT CAPITAL W;Lu;0;L; 0057;;;;N;;;;; +1D4B3;MATHEMATICAL SCRIPT CAPITAL X;Lu;0;L; 0058;;;;N;;;;; +1D4B4;MATHEMATICAL SCRIPT CAPITAL Y;Lu;0;L; 0059;;;;N;;;;; +1D4B5;MATHEMATICAL SCRIPT CAPITAL Z;Lu;0;L; 005A;;;;N;;;;; +1D4B6;MATHEMATICAL SCRIPT SMALL A;Ll;0;L; 0061;;;;N;;;;; +1D4B7;MATHEMATICAL SCRIPT SMALL B;Ll;0;L; 0062;;;;N;;;;; +1D4B8;MATHEMATICAL SCRIPT SMALL C;Ll;0;L; 0063;;;;N;;;;; +1D4B9;MATHEMATICAL SCRIPT SMALL D;Ll;0;L; 0064;;;;N;;;;; +1D4BB;MATHEMATICAL SCRIPT SMALL F;Ll;0;L; 0066;;;;N;;;;; +1D4BD;MATHEMATICAL SCRIPT SMALL H;Ll;0;L; 0068;;;;N;;;;; +1D4BE;MATHEMATICAL SCRIPT SMALL I;Ll;0;L; 0069;;;;N;;;;; +1D4BF;MATHEMATICAL SCRIPT SMALL J;Ll;0;L; 006A;;;;N;;;;; +1D4C0;MATHEMATICAL SCRIPT SMALL K;Ll;0;L; 006B;;;;N;;;;; +1D4C1;MATHEMATICAL SCRIPT SMALL L;Ll;0;L; 006C;;;;N;;;;; +1D4C2;MATHEMATICAL SCRIPT SMALL M;Ll;0;L; 006D;;;;N;;;;; +1D4C3;MATHEMATICAL SCRIPT SMALL N;Ll;0;L; 006E;;;;N;;;;; +1D4C5;MATHEMATICAL SCRIPT SMALL P;Ll;0;L; 0070;;;;N;;;;; +1D4C6;MATHEMATICAL SCRIPT SMALL Q;Ll;0;L; 0071;;;;N;;;;; +1D4C7;MATHEMATICAL SCRIPT SMALL R;Ll;0;L; 0072;;;;N;;;;; +1D4C8;MATHEMATICAL SCRIPT SMALL S;Ll;0;L; 0073;;;;N;;;;; +1D4C9;MATHEMATICAL SCRIPT SMALL T;Ll;0;L; 0074;;;;N;;;;; +1D4CA;MATHEMATICAL SCRIPT SMALL U;Ll;0;L; 0075;;;;N;;;;; +1D4CB;MATHEMATICAL SCRIPT SMALL V;Ll;0;L; 0076;;;;N;;;;; +1D4CC;MATHEMATICAL SCRIPT SMALL W;Ll;0;L; 0077;;;;N;;;;; +1D4CD;MATHEMATICAL SCRIPT SMALL X;Ll;0;L; 0078;;;;N;;;;; +1D4CE;MATHEMATICAL SCRIPT SMALL Y;Ll;0;L; 0079;;;;N;;;;; +1D4CF;MATHEMATICAL SCRIPT SMALL Z;Ll;0;L; 007A;;;;N;;;;; +1D4D0;MATHEMATICAL BOLD SCRIPT CAPITAL A;Lu;0;L; 0041;;;;N;;;;; +1D4D1;MATHEMATICAL BOLD SCRIPT CAPITAL B;Lu;0;L; 0042;;;;N;;;;; +1D4D2;MATHEMATICAL BOLD SCRIPT CAPITAL C;Lu;0;L; 0043;;;;N;;;;; +1D4D3;MATHEMATICAL BOLD SCRIPT CAPITAL D;Lu;0;L; 0044;;;;N;;;;; +1D4D4;MATHEMATICAL BOLD SCRIPT CAPITAL E;Lu;0;L; 0045;;;;N;;;;; +1D4D5;MATHEMATICAL BOLD SCRIPT CAPITAL F;Lu;0;L; 0046;;;;N;;;;; +1D4D6;MATHEMATICAL BOLD SCRIPT CAPITAL G;Lu;0;L; 0047;;;;N;;;;; +1D4D7;MATHEMATICAL BOLD SCRIPT CAPITAL H;Lu;0;L; 0048;;;;N;;;;; +1D4D8;MATHEMATICAL BOLD SCRIPT CAPITAL I;Lu;0;L; 0049;;;;N;;;;; +1D4D9;MATHEMATICAL BOLD SCRIPT CAPITAL J;Lu;0;L; 004A;;;;N;;;;; +1D4DA;MATHEMATICAL BOLD SCRIPT CAPITAL K;Lu;0;L; 004B;;;;N;;;;; +1D4DB;MATHEMATICAL BOLD SCRIPT CAPITAL L;Lu;0;L; 004C;;;;N;;;;; +1D4DC;MATHEMATICAL BOLD SCRIPT CAPITAL M;Lu;0;L; 004D;;;;N;;;;; +1D4DD;MATHEMATICAL BOLD SCRIPT CAPITAL N;Lu;0;L; 004E;;;;N;;;;; +1D4DE;MATHEMATICAL BOLD SCRIPT CAPITAL O;Lu;0;L; 004F;;;;N;;;;; +1D4DF;MATHEMATICAL BOLD SCRIPT CAPITAL P;Lu;0;L; 0050;;;;N;;;;; +1D4E0;MATHEMATICAL BOLD SCRIPT CAPITAL Q;Lu;0;L; 0051;;;;N;;;;; +1D4E1;MATHEMATICAL BOLD SCRIPT CAPITAL R;Lu;0;L; 0052;;;;N;;;;; +1D4E2;MATHEMATICAL BOLD SCRIPT CAPITAL S;Lu;0;L; 0053;;;;N;;;;; +1D4E3;MATHEMATICAL BOLD SCRIPT CAPITAL T;Lu;0;L; 0054;;;;N;;;;; +1D4E4;MATHEMATICAL BOLD SCRIPT CAPITAL U;Lu;0;L; 0055;;;;N;;;;; +1D4E5;MATHEMATICAL BOLD SCRIPT CAPITAL V;Lu;0;L; 0056;;;;N;;;;; +1D4E6;MATHEMATICAL BOLD SCRIPT CAPITAL W;Lu;0;L; 0057;;;;N;;;;; +1D4E7;MATHEMATICAL BOLD SCRIPT CAPITAL X;Lu;0;L; 0058;;;;N;;;;; +1D4E8;MATHEMATICAL BOLD SCRIPT CAPITAL Y;Lu;0;L; 0059;;;;N;;;;; +1D4E9;MATHEMATICAL BOLD SCRIPT CAPITAL Z;Lu;0;L; 005A;;;;N;;;;; +1D4EA;MATHEMATICAL BOLD SCRIPT SMALL A;Ll;0;L; 0061;;;;N;;;;; +1D4EB;MATHEMATICAL BOLD SCRIPT SMALL B;Ll;0;L; 0062;;;;N;;;;; +1D4EC;MATHEMATICAL BOLD SCRIPT SMALL C;Ll;0;L; 0063;;;;N;;;;; +1D4ED;MATHEMATICAL BOLD SCRIPT SMALL D;Ll;0;L; 0064;;;;N;;;;; +1D4EE;MATHEMATICAL BOLD SCRIPT SMALL E;Ll;0;L; 0065;;;;N;;;;; +1D4EF;MATHEMATICAL BOLD SCRIPT SMALL F;Ll;0;L; 0066;;;;N;;;;; +1D4F0;MATHEMATICAL BOLD SCRIPT SMALL G;Ll;0;L; 0067;;;;N;;;;; +1D4F1;MATHEMATICAL BOLD SCRIPT SMALL H;Ll;0;L; 0068;;;;N;;;;; +1D4F2;MATHEMATICAL BOLD SCRIPT SMALL I;Ll;0;L; 0069;;;;N;;;;; +1D4F3;MATHEMATICAL BOLD SCRIPT SMALL J;Ll;0;L; 006A;;;;N;;;;; +1D4F4;MATHEMATICAL BOLD SCRIPT SMALL K;Ll;0;L; 006B;;;;N;;;;; +1D4F5;MATHEMATICAL BOLD SCRIPT SMALL L;Ll;0;L; 006C;;;;N;;;;; +1D4F6;MATHEMATICAL BOLD SCRIPT SMALL M;Ll;0;L; 006D;;;;N;;;;; +1D4F7;MATHEMATICAL BOLD SCRIPT SMALL N;Ll;0;L; 006E;;;;N;;;;; +1D4F8;MATHEMATICAL BOLD SCRIPT SMALL O;Ll;0;L; 006F;;;;N;;;;; +1D4F9;MATHEMATICAL BOLD SCRIPT SMALL P;Ll;0;L; 0070;;;;N;;;;; +1D4FA;MATHEMATICAL BOLD SCRIPT SMALL Q;Ll;0;L; 0071;;;;N;;;;; +1D4FB;MATHEMATICAL BOLD SCRIPT SMALL R;Ll;0;L; 0072;;;;N;;;;; +1D4FC;MATHEMATICAL BOLD SCRIPT SMALL S;Ll;0;L; 0073;;;;N;;;;; +1D4FD;MATHEMATICAL BOLD SCRIPT SMALL T;Ll;0;L; 0074;;;;N;;;;; +1D4FE;MATHEMATICAL BOLD SCRIPT SMALL U;Ll;0;L; 0075;;;;N;;;;; +1D4FF;MATHEMATICAL BOLD SCRIPT SMALL V;Ll;0;L; 0076;;;;N;;;;; +1D500;MATHEMATICAL BOLD SCRIPT SMALL W;Ll;0;L; 0077;;;;N;;;;; +1D501;MATHEMATICAL BOLD SCRIPT SMALL X;Ll;0;L; 0078;;;;N;;;;; +1D502;MATHEMATICAL BOLD SCRIPT SMALL Y;Ll;0;L; 0079;;;;N;;;;; +1D503;MATHEMATICAL BOLD SCRIPT SMALL Z;Ll;0;L; 007A;;;;N;;;;; +1D504;MATHEMATICAL FRAKTUR CAPITAL A;Lu;0;L; 0041;;;;N;;;;; +1D505;MATHEMATICAL FRAKTUR CAPITAL B;Lu;0;L; 0042;;;;N;;;;; +1D507;MATHEMATICAL FRAKTUR CAPITAL D;Lu;0;L; 0044;;;;N;;;;; +1D508;MATHEMATICAL FRAKTUR CAPITAL E;Lu;0;L; 0045;;;;N;;;;; +1D509;MATHEMATICAL FRAKTUR CAPITAL F;Lu;0;L; 0046;;;;N;;;;; +1D50A;MATHEMATICAL FRAKTUR CAPITAL G;Lu;0;L; 0047;;;;N;;;;; +1D50D;MATHEMATICAL FRAKTUR CAPITAL J;Lu;0;L; 004A;;;;N;;;;; +1D50E;MATHEMATICAL FRAKTUR CAPITAL K;Lu;0;L; 004B;;;;N;;;;; +1D50F;MATHEMATICAL FRAKTUR CAPITAL L;Lu;0;L; 004C;;;;N;;;;; +1D510;MATHEMATICAL FRAKTUR CAPITAL M;Lu;0;L; 004D;;;;N;;;;; +1D511;MATHEMATICAL FRAKTUR CAPITAL N;Lu;0;L; 004E;;;;N;;;;; +1D512;MATHEMATICAL FRAKTUR CAPITAL O;Lu;0;L; 004F;;;;N;;;;; +1D513;MATHEMATICAL FRAKTUR CAPITAL P;Lu;0;L; 0050;;;;N;;;;; +1D514;MATHEMATICAL FRAKTUR CAPITAL Q;Lu;0;L; 0051;;;;N;;;;; +1D516;MATHEMATICAL FRAKTUR CAPITAL S;Lu;0;L; 0053;;;;N;;;;; +1D517;MATHEMATICAL FRAKTUR CAPITAL T;Lu;0;L; 0054;;;;N;;;;; +1D518;MATHEMATICAL FRAKTUR CAPITAL U;Lu;0;L; 0055;;;;N;;;;; +1D519;MATHEMATICAL FRAKTUR CAPITAL V;Lu;0;L; 0056;;;;N;;;;; +1D51A;MATHEMATICAL FRAKTUR CAPITAL W;Lu;0;L; 0057;;;;N;;;;; +1D51B;MATHEMATICAL FRAKTUR CAPITAL X;Lu;0;L; 0058;;;;N;;;;; +1D51C;MATHEMATICAL FRAKTUR CAPITAL Y;Lu;0;L; 0059;;;;N;;;;; +1D51E;MATHEMATICAL FRAKTUR SMALL A;Ll;0;L; 0061;;;;N;;;;; +1D51F;MATHEMATICAL FRAKTUR SMALL B;Ll;0;L; 0062;;;;N;;;;; +1D520;MATHEMATICAL FRAKTUR SMALL C;Ll;0;L; 0063;;;;N;;;;; +1D521;MATHEMATICAL FRAKTUR SMALL D;Ll;0;L; 0064;;;;N;;;;; +1D522;MATHEMATICAL FRAKTUR SMALL E;Ll;0;L; 0065;;;;N;;;;; +1D523;MATHEMATICAL FRAKTUR SMALL F;Ll;0;L; 0066;;;;N;;;;; +1D524;MATHEMATICAL FRAKTUR SMALL G;Ll;0;L; 0067;;;;N;;;;; +1D525;MATHEMATICAL FRAKTUR SMALL H;Ll;0;L; 0068;;;;N;;;;; +1D526;MATHEMATICAL FRAKTUR SMALL I;Ll;0;L; 0069;;;;N;;;;; +1D527;MATHEMATICAL FRAKTUR SMALL J;Ll;0;L; 006A;;;;N;;;;; +1D528;MATHEMATICAL FRAKTUR SMALL K;Ll;0;L; 006B;;;;N;;;;; +1D529;MATHEMATICAL FRAKTUR SMALL L;Ll;0;L; 006C;;;;N;;;;; +1D52A;MATHEMATICAL FRAKTUR SMALL M;Ll;0;L; 006D;;;;N;;;;; +1D52B;MATHEMATICAL FRAKTUR SMALL N;Ll;0;L; 006E;;;;N;;;;; +1D52C;MATHEMATICAL FRAKTUR SMALL O;Ll;0;L; 006F;;;;N;;;;; +1D52D;MATHEMATICAL FRAKTUR SMALL P;Ll;0;L; 0070;;;;N;;;;; +1D52E;MATHEMATICAL FRAKTUR SMALL Q;Ll;0;L; 0071;;;;N;;;;; +1D52F;MATHEMATICAL FRAKTUR SMALL R;Ll;0;L; 0072;;;;N;;;;; +1D530;MATHEMATICAL FRAKTUR SMALL S;Ll;0;L; 0073;;;;N;;;;; +1D531;MATHEMATICAL FRAKTUR SMALL T;Ll;0;L; 0074;;;;N;;;;; +1D532;MATHEMATICAL FRAKTUR SMALL U;Ll;0;L; 0075;;;;N;;;;; +1D533;MATHEMATICAL FRAKTUR SMALL V;Ll;0;L; 0076;;;;N;;;;; +1D534;MATHEMATICAL FRAKTUR SMALL W;Ll;0;L; 0077;;;;N;;;;; +1D535;MATHEMATICAL FRAKTUR SMALL X;Ll;0;L; 0078;;;;N;;;;; +1D536;MATHEMATICAL FRAKTUR SMALL Y;Ll;0;L; 0079;;;;N;;;;; +1D537;MATHEMATICAL FRAKTUR SMALL Z;Ll;0;L; 007A;;;;N;;;;; +1D538;MATHEMATICAL DOUBLE-STRUCK CAPITAL A;Lu;0;L; 0041;;;;N;;;;; +1D539;MATHEMATICAL DOUBLE-STRUCK CAPITAL B;Lu;0;L; 0042;;;;N;;;;; +1D53B;MATHEMATICAL DOUBLE-STRUCK CAPITAL D;Lu;0;L; 0044;;;;N;;;;; +1D53C;MATHEMATICAL DOUBLE-STRUCK CAPITAL E;Lu;0;L; 0045;;;;N;;;;; +1D53D;MATHEMATICAL DOUBLE-STRUCK CAPITAL F;Lu;0;L; 0046;;;;N;;;;; +1D53E;MATHEMATICAL DOUBLE-STRUCK CAPITAL G;Lu;0;L; 0047;;;;N;;;;; +1D540;MATHEMATICAL DOUBLE-STRUCK CAPITAL I;Lu;0;L; 0049;;;;N;;;;; +1D541;MATHEMATICAL DOUBLE-STRUCK CAPITAL J;Lu;0;L; 004A;;;;N;;;;; +1D542;MATHEMATICAL DOUBLE-STRUCK CAPITAL K;Lu;0;L; 004B;;;;N;;;;; +1D543;MATHEMATICAL DOUBLE-STRUCK CAPITAL L;Lu;0;L; 004C;;;;N;;;;; +1D544;MATHEMATICAL DOUBLE-STRUCK CAPITAL M;Lu;0;L; 004D;;;;N;;;;; +1D546;MATHEMATICAL DOUBLE-STRUCK CAPITAL O;Lu;0;L; 004F;;;;N;;;;; +1D54A;MATHEMATICAL DOUBLE-STRUCK CAPITAL S;Lu;0;L; 0053;;;;N;;;;; +1D54B;MATHEMATICAL DOUBLE-STRUCK CAPITAL T;Lu;0;L; 0054;;;;N;;;;; +1D54C;MATHEMATICAL DOUBLE-STRUCK CAPITAL U;Lu;0;L; 0055;;;;N;;;;; +1D54D;MATHEMATICAL DOUBLE-STRUCK CAPITAL V;Lu;0;L; 0056;;;;N;;;;; +1D54E;MATHEMATICAL DOUBLE-STRUCK CAPITAL W;Lu;0;L; 0057;;;;N;;;;; +1D54F;MATHEMATICAL DOUBLE-STRUCK CAPITAL X;Lu;0;L; 0058;;;;N;;;;; +1D550;MATHEMATICAL DOUBLE-STRUCK CAPITAL Y;Lu;0;L; 0059;;;;N;;;;; +1D552;MATHEMATICAL DOUBLE-STRUCK SMALL A;Ll;0;L; 0061;;;;N;;;;; +1D553;MATHEMATICAL DOUBLE-STRUCK SMALL B;Ll;0;L; 0062;;;;N;;;;; +1D554;MATHEMATICAL DOUBLE-STRUCK SMALL C;Ll;0;L; 0063;;;;N;;;;; +1D555;MATHEMATICAL DOUBLE-STRUCK SMALL D;Ll;0;L; 0064;;;;N;;;;; +1D556;MATHEMATICAL DOUBLE-STRUCK SMALL E;Ll;0;L; 0065;;;;N;;;;; +1D557;MATHEMATICAL DOUBLE-STRUCK SMALL F;Ll;0;L; 0066;;;;N;;;;; +1D558;MATHEMATICAL DOUBLE-STRUCK SMALL G;Ll;0;L; 0067;;;;N;;;;; +1D559;MATHEMATICAL DOUBLE-STRUCK SMALL H;Ll;0;L; 0068;;;;N;;;;; +1D55A;MATHEMATICAL DOUBLE-STRUCK SMALL I;Ll;0;L; 0069;;;;N;;;;; +1D55B;MATHEMATICAL DOUBLE-STRUCK SMALL J;Ll;0;L; 006A;;;;N;;;;; +1D55C;MATHEMATICAL DOUBLE-STRUCK SMALL K;Ll;0;L; 006B;;;;N;;;;; +1D55D;MATHEMATICAL DOUBLE-STRUCK SMALL L;Ll;0;L; 006C;;;;N;;;;; +1D55E;MATHEMATICAL DOUBLE-STRUCK SMALL M;Ll;0;L; 006D;;;;N;;;;; +1D55F;MATHEMATICAL DOUBLE-STRUCK SMALL N;Ll;0;L; 006E;;;;N;;;;; +1D560;MATHEMATICAL DOUBLE-STRUCK SMALL O;Ll;0;L; 006F;;;;N;;;;; +1D561;MATHEMATICAL DOUBLE-STRUCK SMALL P;Ll;0;L; 0070;;;;N;;;;; +1D562;MATHEMATICAL DOUBLE-STRUCK SMALL Q;Ll;0;L; 0071;;;;N;;;;; +1D563;MATHEMATICAL DOUBLE-STRUCK SMALL R;Ll;0;L; 0072;;;;N;;;;; +1D564;MATHEMATICAL DOUBLE-STRUCK SMALL S;Ll;0;L; 0073;;;;N;;;;; +1D565;MATHEMATICAL DOUBLE-STRUCK SMALL T;Ll;0;L; 0074;;;;N;;;;; +1D566;MATHEMATICAL DOUBLE-STRUCK SMALL U;Ll;0;L; 0075;;;;N;;;;; +1D567;MATHEMATICAL DOUBLE-STRUCK SMALL V;Ll;0;L; 0076;;;;N;;;;; +1D568;MATHEMATICAL DOUBLE-STRUCK SMALL W;Ll;0;L; 0077;;;;N;;;;; +1D569;MATHEMATICAL DOUBLE-STRUCK SMALL X;Ll;0;L; 0078;;;;N;;;;; +1D56A;MATHEMATICAL DOUBLE-STRUCK SMALL Y;Ll;0;L; 0079;;;;N;;;;; +1D56B;MATHEMATICAL DOUBLE-STRUCK SMALL Z;Ll;0;L; 007A;;;;N;;;;; +1D56C;MATHEMATICAL BOLD FRAKTUR CAPITAL A;Lu;0;L; 0041;;;;N;;;;; +1D56D;MATHEMATICAL BOLD FRAKTUR CAPITAL B;Lu;0;L; 0042;;;;N;;;;; +1D56E;MATHEMATICAL BOLD FRAKTUR CAPITAL C;Lu;0;L; 0043;;;;N;;;;; +1D56F;MATHEMATICAL BOLD FRAKTUR CAPITAL D;Lu;0;L; 0044;;;;N;;;;; +1D570;MATHEMATICAL BOLD FRAKTUR CAPITAL E;Lu;0;L; 0045;;;;N;;;;; +1D571;MATHEMATICAL BOLD FRAKTUR CAPITAL F;Lu;0;L; 0046;;;;N;;;;; +1D572;MATHEMATICAL BOLD FRAKTUR CAPITAL G;Lu;0;L; 0047;;;;N;;;;; +1D573;MATHEMATICAL BOLD FRAKTUR CAPITAL H;Lu;0;L; 0048;;;;N;;;;; +1D574;MATHEMATICAL BOLD FRAKTUR CAPITAL I;Lu;0;L; 0049;;;;N;;;;; +1D575;MATHEMATICAL BOLD FRAKTUR CAPITAL J;Lu;0;L; 004A;;;;N;;;;; +1D576;MATHEMATICAL BOLD FRAKTUR CAPITAL K;Lu;0;L; 004B;;;;N;;;;; +1D577;MATHEMATICAL BOLD FRAKTUR CAPITAL L;Lu;0;L; 004C;;;;N;;;;; +1D578;MATHEMATICAL BOLD FRAKTUR CAPITAL M;Lu;0;L; 004D;;;;N;;;;; +1D579;MATHEMATICAL BOLD FRAKTUR CAPITAL N;Lu;0;L; 004E;;;;N;;;;; +1D57A;MATHEMATICAL BOLD FRAKTUR CAPITAL O;Lu;0;L; 004F;;;;N;;;;; +1D57B;MATHEMATICAL BOLD FRAKTUR CAPITAL P;Lu;0;L; 0050;;;;N;;;;; +1D57C;MATHEMATICAL BOLD FRAKTUR CAPITAL Q;Lu;0;L; 0051;;;;N;;;;; +1D57D;MATHEMATICAL BOLD FRAKTUR CAPITAL R;Lu;0;L; 0052;;;;N;;;;; +1D57E;MATHEMATICAL BOLD FRAKTUR CAPITAL S;Lu;0;L; 0053;;;;N;;;;; +1D57F;MATHEMATICAL BOLD FRAKTUR CAPITAL T;Lu;0;L; 0054;;;;N;;;;; +1D580;MATHEMATICAL BOLD FRAKTUR CAPITAL U;Lu;0;L; 0055;;;;N;;;;; +1D581;MATHEMATICAL BOLD FRAKTUR CAPITAL V;Lu;0;L; 0056;;;;N;;;;; +1D582;MATHEMATICAL BOLD FRAKTUR CAPITAL W;Lu;0;L; 0057;;;;N;;;;; +1D583;MATHEMATICAL BOLD FRAKTUR CAPITAL X;Lu;0;L; 0058;;;;N;;;;; +1D584;MATHEMATICAL BOLD FRAKTUR CAPITAL Y;Lu;0;L; 0059;;;;N;;;;; +1D585;MATHEMATICAL BOLD FRAKTUR CAPITAL Z;Lu;0;L; 005A;;;;N;;;;; +1D586;MATHEMATICAL BOLD FRAKTUR SMALL A;Ll;0;L; 0061;;;;N;;;;; +1D587;MATHEMATICAL BOLD FRAKTUR SMALL B;Ll;0;L; 0062;;;;N;;;;; +1D588;MATHEMATICAL BOLD FRAKTUR SMALL C;Ll;0;L; 0063;;;;N;;;;; +1D589;MATHEMATICAL BOLD FRAKTUR SMALL D;Ll;0;L; 0064;;;;N;;;;; +1D58A;MATHEMATICAL BOLD FRAKTUR SMALL E;Ll;0;L; 0065;;;;N;;;;; +1D58B;MATHEMATICAL BOLD FRAKTUR SMALL F;Ll;0;L; 0066;;;;N;;;;; +1D58C;MATHEMATICAL BOLD FRAKTUR SMALL G;Ll;0;L; 0067;;;;N;;;;; +1D58D;MATHEMATICAL BOLD FRAKTUR SMALL H;Ll;0;L; 0068;;;;N;;;;; +1D58E;MATHEMATICAL BOLD FRAKTUR SMALL I;Ll;0;L; 0069;;;;N;;;;; +1D58F;MATHEMATICAL BOLD FRAKTUR SMALL J;Ll;0;L; 006A;;;;N;;;;; +1D590;MATHEMATICAL BOLD FRAKTUR SMALL K;Ll;0;L; 006B;;;;N;;;;; +1D591;MATHEMATICAL BOLD FRAKTUR SMALL L;Ll;0;L; 006C;;;;N;;;;; +1D592;MATHEMATICAL BOLD FRAKTUR SMALL M;Ll;0;L; 006D;;;;N;;;;; +1D593;MATHEMATICAL BOLD FRAKTUR SMALL N;Ll;0;L; 006E;;;;N;;;;; +1D594;MATHEMATICAL BOLD FRAKTUR SMALL O;Ll;0;L; 006F;;;;N;;;;; +1D595;MATHEMATICAL BOLD FRAKTUR SMALL P;Ll;0;L; 0070;;;;N;;;;; +1D596;MATHEMATICAL BOLD FRAKTUR SMALL Q;Ll;0;L; 0071;;;;N;;;;; +1D597;MATHEMATICAL BOLD FRAKTUR SMALL R;Ll;0;L; 0072;;;;N;;;;; +1D598;MATHEMATICAL BOLD FRAKTUR SMALL S;Ll;0;L; 0073;;;;N;;;;; +1D599;MATHEMATICAL BOLD FRAKTUR SMALL T;Ll;0;L; 0074;;;;N;;;;; +1D59A;MATHEMATICAL BOLD FRAKTUR SMALL U;Ll;0;L; 0075;;;;N;;;;; +1D59B;MATHEMATICAL BOLD FRAKTUR SMALL V;Ll;0;L; 0076;;;;N;;;;; +1D59C;MATHEMATICAL BOLD FRAKTUR SMALL W;Ll;0;L; 0077;;;;N;;;;; +1D59D;MATHEMATICAL BOLD FRAKTUR SMALL X;Ll;0;L; 0078;;;;N;;;;; +1D59E;MATHEMATICAL BOLD FRAKTUR SMALL Y;Ll;0;L; 0079;;;;N;;;;; +1D59F;MATHEMATICAL BOLD FRAKTUR SMALL Z;Ll;0;L; 007A;;;;N;;;;; +1D5A0;MATHEMATICAL SANS-SERIF CAPITAL A;Lu;0;L; 0041;;;;N;;;;; +1D5A1;MATHEMATICAL SANS-SERIF CAPITAL B;Lu;0;L; 0042;;;;N;;;;; +1D5A2;MATHEMATICAL SANS-SERIF CAPITAL C;Lu;0;L; 0043;;;;N;;;;; +1D5A3;MATHEMATICAL SANS-SERIF CAPITAL D;Lu;0;L; 0044;;;;N;;;;; +1D5A4;MATHEMATICAL SANS-SERIF CAPITAL E;Lu;0;L; 0045;;;;N;;;;; +1D5A5;MATHEMATICAL SANS-SERIF CAPITAL F;Lu;0;L; 0046;;;;N;;;;; +1D5A6;MATHEMATICAL SANS-SERIF CAPITAL G;Lu;0;L; 0047;;;;N;;;;; +1D5A7;MATHEMATICAL SANS-SERIF CAPITAL H;Lu;0;L; 0048;;;;N;;;;; +1D5A8;MATHEMATICAL SANS-SERIF CAPITAL I;Lu;0;L; 0049;;;;N;;;;; +1D5A9;MATHEMATICAL SANS-SERIF CAPITAL J;Lu;0;L; 004A;;;;N;;;;; +1D5AA;MATHEMATICAL SANS-SERIF CAPITAL K;Lu;0;L; 004B;;;;N;;;;; +1D5AB;MATHEMATICAL SANS-SERIF CAPITAL L;Lu;0;L; 004C;;;;N;;;;; +1D5AC;MATHEMATICAL SANS-SERIF CAPITAL M;Lu;0;L; 004D;;;;N;;;;; +1D5AD;MATHEMATICAL SANS-SERIF CAPITAL N;Lu;0;L; 004E;;;;N;;;;; +1D5AE;MATHEMATICAL SANS-SERIF CAPITAL O;Lu;0;L; 004F;;;;N;;;;; +1D5AF;MATHEMATICAL SANS-SERIF CAPITAL P;Lu;0;L; 0050;;;;N;;;;; +1D5B0;MATHEMATICAL SANS-SERIF CAPITAL Q;Lu;0;L; 0051;;;;N;;;;; +1D5B1;MATHEMATICAL SANS-SERIF CAPITAL R;Lu;0;L; 0052;;;;N;;;;; +1D5B2;MATHEMATICAL SANS-SERIF CAPITAL S;Lu;0;L; 0053;;;;N;;;;; +1D5B3;MATHEMATICAL SANS-SERIF CAPITAL T;Lu;0;L; 0054;;;;N;;;;; +1D5B4;MATHEMATICAL SANS-SERIF CAPITAL U;Lu;0;L; 0055;;;;N;;;;; +1D5B5;MATHEMATICAL SANS-SERIF CAPITAL V;Lu;0;L; 0056;;;;N;;;;; +1D5B6;MATHEMATICAL SANS-SERIF CAPITAL W;Lu;0;L; 0057;;;;N;;;;; +1D5B7;MATHEMATICAL SANS-SERIF CAPITAL X;Lu;0;L; 0058;;;;N;;;;; +1D5B8;MATHEMATICAL SANS-SERIF CAPITAL Y;Lu;0;L; 0059;;;;N;;;;; +1D5B9;MATHEMATICAL SANS-SERIF CAPITAL Z;Lu;0;L; 005A;;;;N;;;;; +1D5BA;MATHEMATICAL SANS-SERIF SMALL A;Ll;0;L; 0061;;;;N;;;;; +1D5BB;MATHEMATICAL SANS-SERIF SMALL B;Ll;0;L; 0062;;;;N;;;;; +1D5BC;MATHEMATICAL SANS-SERIF SMALL C;Ll;0;L; 0063;;;;N;;;;; +1D5BD;MATHEMATICAL SANS-SERIF SMALL D;Ll;0;L; 0064;;;;N;;;;; +1D5BE;MATHEMATICAL SANS-SERIF SMALL E;Ll;0;L; 0065;;;;N;;;;; +1D5BF;MATHEMATICAL SANS-SERIF SMALL F;Ll;0;L; 0066;;;;N;;;;; +1D5C0;MATHEMATICAL SANS-SERIF SMALL G;Ll;0;L; 0067;;;;N;;;;; +1D5C1;MATHEMATICAL SANS-SERIF SMALL H;Ll;0;L; 0068;;;;N;;;;; +1D5C2;MATHEMATICAL SANS-SERIF SMALL I;Ll;0;L; 0069;;;;N;;;;; +1D5C3;MATHEMATICAL SANS-SERIF SMALL J;Ll;0;L; 006A;;;;N;;;;; +1D5C4;MATHEMATICAL SANS-SERIF SMALL K;Ll;0;L; 006B;;;;N;;;;; +1D5C5;MATHEMATICAL SANS-SERIF SMALL L;Ll;0;L; 006C;;;;N;;;;; +1D5C6;MATHEMATICAL SANS-SERIF SMALL M;Ll;0;L; 006D;;;;N;;;;; +1D5C7;MATHEMATICAL SANS-SERIF SMALL N;Ll;0;L; 006E;;;;N;;;;; +1D5C8;MATHEMATICAL SANS-SERIF SMALL O;Ll;0;L; 006F;;;;N;;;;; +1D5C9;MATHEMATICAL SANS-SERIF SMALL P;Ll;0;L; 0070;;;;N;;;;; +1D5CA;MATHEMATICAL SANS-SERIF SMALL Q;Ll;0;L; 0071;;;;N;;;;; +1D5CB;MATHEMATICAL SANS-SERIF SMALL R;Ll;0;L; 0072;;;;N;;;;; +1D5CC;MATHEMATICAL SANS-SERIF SMALL S;Ll;0;L; 0073;;;;N;;;;; +1D5CD;MATHEMATICAL SANS-SERIF SMALL T;Ll;0;L; 0074;;;;N;;;;; +1D5CE;MATHEMATICAL SANS-SERIF SMALL U;Ll;0;L; 0075;;;;N;;;;; +1D5CF;MATHEMATICAL SANS-SERIF SMALL V;Ll;0;L; 0076;;;;N;;;;; +1D5D0;MATHEMATICAL SANS-SERIF SMALL W;Ll;0;L; 0077;;;;N;;;;; +1D5D1;MATHEMATICAL SANS-SERIF SMALL X;Ll;0;L; 0078;;;;N;;;;; +1D5D2;MATHEMATICAL SANS-SERIF SMALL Y;Ll;0;L; 0079;;;;N;;;;; +1D5D3;MATHEMATICAL SANS-SERIF SMALL Z;Ll;0;L; 007A;;;;N;;;;; +1D5D4;MATHEMATICAL SANS-SERIF BOLD CAPITAL A;Lu;0;L; 0041;;;;N;;;;; +1D5D5;MATHEMATICAL SANS-SERIF BOLD CAPITAL B;Lu;0;L; 0042;;;;N;;;;; +1D5D6;MATHEMATICAL SANS-SERIF BOLD CAPITAL C;Lu;0;L; 0043;;;;N;;;;; +1D5D7;MATHEMATICAL SANS-SERIF BOLD CAPITAL D;Lu;0;L; 0044;;;;N;;;;; +1D5D8;MATHEMATICAL SANS-SERIF BOLD CAPITAL E;Lu;0;L; 0045;;;;N;;;;; +1D5D9;MATHEMATICAL SANS-SERIF BOLD CAPITAL F;Lu;0;L; 0046;;;;N;;;;; +1D5DA;MATHEMATICAL SANS-SERIF BOLD CAPITAL G;Lu;0;L; 0047;;;;N;;;;; +1D5DB;MATHEMATICAL SANS-SERIF BOLD CAPITAL H;Lu;0;L; 0048;;;;N;;;;; +1D5DC;MATHEMATICAL SANS-SERIF BOLD CAPITAL I;Lu;0;L; 0049;;;;N;;;;; +1D5DD;MATHEMATICAL SANS-SERIF BOLD CAPITAL J;Lu;0;L; 004A;;;;N;;;;; +1D5DE;MATHEMATICAL SANS-SERIF BOLD CAPITAL K;Lu;0;L; 004B;;;;N;;;;; +1D5DF;MATHEMATICAL SANS-SERIF BOLD CAPITAL L;Lu;0;L; 004C;;;;N;;;;; +1D5E0;MATHEMATICAL SANS-SERIF BOLD CAPITAL M;Lu;0;L; 004D;;;;N;;;;; +1D5E1;MATHEMATICAL SANS-SERIF BOLD CAPITAL N;Lu;0;L; 004E;;;;N;;;;; +1D5E2;MATHEMATICAL SANS-SERIF BOLD CAPITAL O;Lu;0;L; 004F;;;;N;;;;; +1D5E3;MATHEMATICAL SANS-SERIF BOLD CAPITAL P;Lu;0;L; 0050;;;;N;;;;; +1D5E4;MATHEMATICAL SANS-SERIF BOLD CAPITAL Q;Lu;0;L; 0051;;;;N;;;;; +1D5E5;MATHEMATICAL SANS-SERIF BOLD CAPITAL R;Lu;0;L; 0052;;;;N;;;;; +1D5E6;MATHEMATICAL SANS-SERIF BOLD CAPITAL S;Lu;0;L; 0053;;;;N;;;;; +1D5E7;MATHEMATICAL SANS-SERIF BOLD CAPITAL T;Lu;0;L; 0054;;;;N;;;;; +1D5E8;MATHEMATICAL SANS-SERIF BOLD CAPITAL U;Lu;0;L; 0055;;;;N;;;;; +1D5E9;MATHEMATICAL SANS-SERIF BOLD CAPITAL V;Lu;0;L; 0056;;;;N;;;;; +1D5EA;MATHEMATICAL SANS-SERIF BOLD CAPITAL W;Lu;0;L; 0057;;;;N;;;;; +1D5EB;MATHEMATICAL SANS-SERIF BOLD CAPITAL X;Lu;0;L; 0058;;;;N;;;;; +1D5EC;MATHEMATICAL SANS-SERIF BOLD CAPITAL Y;Lu;0;L; 0059;;;;N;;;;; +1D5ED;MATHEMATICAL SANS-SERIF BOLD CAPITAL Z;Lu;0;L; 005A;;;;N;;;;; +1D5EE;MATHEMATICAL SANS-SERIF BOLD SMALL A;Ll;0;L; 0061;;;;N;;;;; +1D5EF;MATHEMATICAL SANS-SERIF BOLD SMALL B;Ll;0;L; 0062;;;;N;;;;; +1D5F0;MATHEMATICAL SANS-SERIF BOLD SMALL C;Ll;0;L; 0063;;;;N;;;;; +1D5F1;MATHEMATICAL SANS-SERIF BOLD SMALL D;Ll;0;L; 0064;;;;N;;;;; +1D5F2;MATHEMATICAL SANS-SERIF BOLD SMALL E;Ll;0;L; 0065;;;;N;;;;; +1D5F3;MATHEMATICAL SANS-SERIF BOLD SMALL F;Ll;0;L; 0066;;;;N;;;;; +1D5F4;MATHEMATICAL SANS-SERIF BOLD SMALL G;Ll;0;L; 0067;;;;N;;;;; +1D5F5;MATHEMATICAL SANS-SERIF BOLD SMALL H;Ll;0;L; 0068;;;;N;;;;; +1D5F6;MATHEMATICAL SANS-SERIF BOLD SMALL I;Ll;0;L; 0069;;;;N;;;;; +1D5F7;MATHEMATICAL SANS-SERIF BOLD SMALL J;Ll;0;L; 006A;;;;N;;;;; +1D5F8;MATHEMATICAL SANS-SERIF BOLD SMALL K;Ll;0;L; 006B;;;;N;;;;; +1D5F9;MATHEMATICAL SANS-SERIF BOLD SMALL L;Ll;0;L; 006C;;;;N;;;;; +1D5FA;MATHEMATICAL SANS-SERIF BOLD SMALL M;Ll;0;L; 006D;;;;N;;;;; +1D5FB;MATHEMATICAL SANS-SERIF BOLD SMALL N;Ll;0;L; 006E;;;;N;;;;; +1D5FC;MATHEMATICAL SANS-SERIF BOLD SMALL O;Ll;0;L; 006F;;;;N;;;;; +1D5FD;MATHEMATICAL SANS-SERIF BOLD SMALL P;Ll;0;L; 0070;;;;N;;;;; +1D5FE;MATHEMATICAL SANS-SERIF BOLD SMALL Q;Ll;0;L; 0071;;;;N;;;;; +1D5FF;MATHEMATICAL SANS-SERIF BOLD SMALL R;Ll;0;L; 0072;;;;N;;;;; +1D600;MATHEMATICAL SANS-SERIF BOLD SMALL S;Ll;0;L; 0073;;;;N;;;;; +1D601;MATHEMATICAL SANS-SERIF BOLD SMALL T;Ll;0;L; 0074;;;;N;;;;; +1D602;MATHEMATICAL SANS-SERIF BOLD SMALL U;Ll;0;L; 0075;;;;N;;;;; +1D603;MATHEMATICAL SANS-SERIF BOLD SMALL V;Ll;0;L; 0076;;;;N;;;;; +1D604;MATHEMATICAL SANS-SERIF BOLD SMALL W;Ll;0;L; 0077;;;;N;;;;; +1D605;MATHEMATICAL SANS-SERIF BOLD SMALL X;Ll;0;L; 0078;;;;N;;;;; +1D606;MATHEMATICAL SANS-SERIF BOLD SMALL Y;Ll;0;L; 0079;;;;N;;;;; +1D607;MATHEMATICAL SANS-SERIF BOLD SMALL Z;Ll;0;L; 007A;;;;N;;;;; +1D608;MATHEMATICAL SANS-SERIF ITALIC CAPITAL A;Lu;0;L; 0041;;;;N;;;;; +1D609;MATHEMATICAL SANS-SERIF ITALIC CAPITAL B;Lu;0;L; 0042;;;;N;;;;; +1D60A;MATHEMATICAL SANS-SERIF ITALIC CAPITAL C;Lu;0;L; 0043;;;;N;;;;; +1D60B;MATHEMATICAL SANS-SERIF ITALIC CAPITAL D;Lu;0;L; 0044;;;;N;;;;; +1D60C;MATHEMATICAL SANS-SERIF ITALIC CAPITAL E;Lu;0;L; 0045;;;;N;;;;; +1D60D;MATHEMATICAL SANS-SERIF ITALIC CAPITAL F;Lu;0;L; 0046;;;;N;;;;; +1D60E;MATHEMATICAL SANS-SERIF ITALIC CAPITAL G;Lu;0;L; 0047;;;;N;;;;; +1D60F;MATHEMATICAL SANS-SERIF ITALIC CAPITAL H;Lu;0;L; 0048;;;;N;;;;; +1D610;MATHEMATICAL SANS-SERIF ITALIC CAPITAL I;Lu;0;L; 0049;;;;N;;;;; +1D611;MATHEMATICAL SANS-SERIF ITALIC CAPITAL J;Lu;0;L; 004A;;;;N;;;;; +1D612;MATHEMATICAL SANS-SERIF ITALIC CAPITAL K;Lu;0;L; 004B;;;;N;;;;; +1D613;MATHEMATICAL SANS-SERIF ITALIC CAPITAL L;Lu;0;L; 004C;;;;N;;;;; +1D614;MATHEMATICAL SANS-SERIF ITALIC CAPITAL M;Lu;0;L; 004D;;;;N;;;;; +1D615;MATHEMATICAL SANS-SERIF ITALIC CAPITAL N;Lu;0;L; 004E;;;;N;;;;; +1D616;MATHEMATICAL SANS-SERIF ITALIC CAPITAL O;Lu;0;L; 004F;;;;N;;;;; +1D617;MATHEMATICAL SANS-SERIF ITALIC CAPITAL P;Lu;0;L; 0050;;;;N;;;;; +1D618;MATHEMATICAL SANS-SERIF ITALIC CAPITAL Q;Lu;0;L; 0051;;;;N;;;;; +1D619;MATHEMATICAL SANS-SERIF ITALIC CAPITAL R;Lu;0;L; 0052;;;;N;;;;; +1D61A;MATHEMATICAL SANS-SERIF ITALIC CAPITAL S;Lu;0;L; 0053;;;;N;;;;; +1D61B;MATHEMATICAL SANS-SERIF ITALIC CAPITAL T;Lu;0;L; 0054;;;;N;;;;; +1D61C;MATHEMATICAL SANS-SERIF ITALIC CAPITAL U;Lu;0;L; 0055;;;;N;;;;; +1D61D;MATHEMATICAL SANS-SERIF ITALIC CAPITAL V;Lu;0;L; 0056;;;;N;;;;; +1D61E;MATHEMATICAL SANS-SERIF ITALIC CAPITAL W;Lu;0;L; 0057;;;;N;;;;; +1D61F;MATHEMATICAL SANS-SERIF ITALIC CAPITAL X;Lu;0;L; 0058;;;;N;;;;; +1D620;MATHEMATICAL SANS-SERIF ITALIC CAPITAL Y;Lu;0;L; 0059;;;;N;;;;; +1D621;MATHEMATICAL SANS-SERIF ITALIC CAPITAL Z;Lu;0;L; 005A;;;;N;;;;; +1D622;MATHEMATICAL SANS-SERIF ITALIC SMALL A;Ll;0;L; 0061;;;;N;;;;; +1D623;MATHEMATICAL SANS-SERIF ITALIC SMALL B;Ll;0;L; 0062;;;;N;;;;; +1D624;MATHEMATICAL SANS-SERIF ITALIC SMALL C;Ll;0;L; 0063;;;;N;;;;; +1D625;MATHEMATICAL SANS-SERIF ITALIC SMALL D;Ll;0;L; 0064;;;;N;;;;; +1D626;MATHEMATICAL SANS-SERIF ITALIC SMALL E;Ll;0;L; 0065;;;;N;;;;; +1D627;MATHEMATICAL SANS-SERIF ITALIC SMALL F;Ll;0;L; 0066;;;;N;;;;; +1D628;MATHEMATICAL SANS-SERIF ITALIC SMALL G;Ll;0;L; 0067;;;;N;;;;; +1D629;MATHEMATICAL SANS-SERIF ITALIC SMALL H;Ll;0;L; 0068;;;;N;;;;; +1D62A;MATHEMATICAL SANS-SERIF ITALIC SMALL I;Ll;0;L; 0069;;;;N;;;;; +1D62B;MATHEMATICAL SANS-SERIF ITALIC SMALL J;Ll;0;L; 006A;;;;N;;;;; +1D62C;MATHEMATICAL SANS-SERIF ITALIC SMALL K;Ll;0;L; 006B;;;;N;;;;; +1D62D;MATHEMATICAL SANS-SERIF ITALIC SMALL L;Ll;0;L; 006C;;;;N;;;;; +1D62E;MATHEMATICAL SANS-SERIF ITALIC SMALL M;Ll;0;L; 006D;;;;N;;;;; +1D62F;MATHEMATICAL SANS-SERIF ITALIC SMALL N;Ll;0;L; 006E;;;;N;;;;; +1D630;MATHEMATICAL SANS-SERIF ITALIC SMALL O;Ll;0;L; 006F;;;;N;;;;; +1D631;MATHEMATICAL SANS-SERIF ITALIC SMALL P;Ll;0;L; 0070;;;;N;;;;; +1D632;MATHEMATICAL SANS-SERIF ITALIC SMALL Q;Ll;0;L; 0071;;;;N;;;;; +1D633;MATHEMATICAL SANS-SERIF ITALIC SMALL R;Ll;0;L; 0072;;;;N;;;;; +1D634;MATHEMATICAL SANS-SERIF ITALIC SMALL S;Ll;0;L; 0073;;;;N;;;;; +1D635;MATHEMATICAL SANS-SERIF ITALIC SMALL T;Ll;0;L; 0074;;;;N;;;;; +1D636;MATHEMATICAL SANS-SERIF ITALIC SMALL U;Ll;0;L; 0075;;;;N;;;;; +1D637;MATHEMATICAL SANS-SERIF ITALIC SMALL V;Ll;0;L; 0076;;;;N;;;;; +1D638;MATHEMATICAL SANS-SERIF ITALIC SMALL W;Ll;0;L; 0077;;;;N;;;;; +1D639;MATHEMATICAL SANS-SERIF ITALIC SMALL X;Ll;0;L; 0078;;;;N;;;;; +1D63A;MATHEMATICAL SANS-SERIF ITALIC SMALL Y;Ll;0;L; 0079;;;;N;;;;; +1D63B;MATHEMATICAL SANS-SERIF ITALIC SMALL Z;Ll;0;L; 007A;;;;N;;;;; +1D63C;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL A;Lu;0;L; 0041;;;;N;;;;; +1D63D;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL B;Lu;0;L; 0042;;;;N;;;;; +1D63E;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL C;Lu;0;L; 0043;;;;N;;;;; +1D63F;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL D;Lu;0;L; 0044;;;;N;;;;; +1D640;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL E;Lu;0;L; 0045;;;;N;;;;; +1D641;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL F;Lu;0;L; 0046;;;;N;;;;; +1D642;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL G;Lu;0;L; 0047;;;;N;;;;; +1D643;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL H;Lu;0;L; 0048;;;;N;;;;; +1D644;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL I;Lu;0;L; 0049;;;;N;;;;; +1D645;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL J;Lu;0;L; 004A;;;;N;;;;; +1D646;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL K;Lu;0;L; 004B;;;;N;;;;; +1D647;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL L;Lu;0;L; 004C;;;;N;;;;; +1D648;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL M;Lu;0;L; 004D;;;;N;;;;; +1D649;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL N;Lu;0;L; 004E;;;;N;;;;; +1D64A;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL O;Lu;0;L; 004F;;;;N;;;;; +1D64B;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL P;Lu;0;L; 0050;;;;N;;;;; +1D64C;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL Q;Lu;0;L; 0051;;;;N;;;;; +1D64D;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL R;Lu;0;L; 0052;;;;N;;;;; +1D64E;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL S;Lu;0;L; 0053;;;;N;;;;; +1D64F;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL T;Lu;0;L; 0054;;;;N;;;;; +1D650;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL U;Lu;0;L; 0055;;;;N;;;;; +1D651;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL V;Lu;0;L; 0056;;;;N;;;;; +1D652;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL W;Lu;0;L; 0057;;;;N;;;;; +1D653;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL X;Lu;0;L; 0058;;;;N;;;;; +1D654;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL Y;Lu;0;L; 0059;;;;N;;;;; +1D655;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL Z;Lu;0;L; 005A;;;;N;;;;; +1D656;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL A;Ll;0;L; 0061;;;;N;;;;; +1D657;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL B;Ll;0;L; 0062;;;;N;;;;; +1D658;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL C;Ll;0;L; 0063;;;;N;;;;; +1D659;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL D;Ll;0;L; 0064;;;;N;;;;; +1D65A;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL E;Ll;0;L; 0065;;;;N;;;;; +1D65B;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL F;Ll;0;L; 0066;;;;N;;;;; +1D65C;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL G;Ll;0;L; 0067;;;;N;;;;; +1D65D;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL H;Ll;0;L; 0068;;;;N;;;;; +1D65E;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL I;Ll;0;L; 0069;;;;N;;;;; +1D65F;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL J;Ll;0;L; 006A;;;;N;;;;; +1D660;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL K;Ll;0;L; 006B;;;;N;;;;; +1D661;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL L;Ll;0;L; 006C;;;;N;;;;; +1D662;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL M;Ll;0;L; 006D;;;;N;;;;; +1D663;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL N;Ll;0;L; 006E;;;;N;;;;; +1D664;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL O;Ll;0;L; 006F;;;;N;;;;; +1D665;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL P;Ll;0;L; 0070;;;;N;;;;; +1D666;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL Q;Ll;0;L; 0071;;;;N;;;;; +1D667;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL R;Ll;0;L; 0072;;;;N;;;;; +1D668;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL S;Ll;0;L; 0073;;;;N;;;;; +1D669;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL T;Ll;0;L; 0074;;;;N;;;;; +1D66A;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL U;Ll;0;L; 0075;;;;N;;;;; +1D66B;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL V;Ll;0;L; 0076;;;;N;;;;; +1D66C;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL W;Ll;0;L; 0077;;;;N;;;;; +1D66D;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL X;Ll;0;L; 0078;;;;N;;;;; +1D66E;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL Y;Ll;0;L; 0079;;;;N;;;;; +1D66F;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL Z;Ll;0;L; 007A;;;;N;;;;; +1D670;MATHEMATICAL MONOSPACE CAPITAL A;Lu;0;L; 0041;;;;N;;;;; +1D671;MATHEMATICAL MONOSPACE CAPITAL B;Lu;0;L; 0042;;;;N;;;;; +1D672;MATHEMATICAL MONOSPACE CAPITAL C;Lu;0;L; 0043;;;;N;;;;; +1D673;MATHEMATICAL MONOSPACE CAPITAL D;Lu;0;L; 0044;;;;N;;;;; +1D674;MATHEMATICAL MONOSPACE CAPITAL E;Lu;0;L; 0045;;;;N;;;;; +1D675;MATHEMATICAL MONOSPACE CAPITAL F;Lu;0;L; 0046;;;;N;;;;; +1D676;MATHEMATICAL MONOSPACE CAPITAL G;Lu;0;L; 0047;;;;N;;;;; +1D677;MATHEMATICAL MONOSPACE CAPITAL H;Lu;0;L; 0048;;;;N;;;;; +1D678;MATHEMATICAL MONOSPACE CAPITAL I;Lu;0;L; 0049;;;;N;;;;; +1D679;MATHEMATICAL MONOSPACE CAPITAL J;Lu;0;L; 004A;;;;N;;;;; +1D67A;MATHEMATICAL MONOSPACE CAPITAL K;Lu;0;L; 004B;;;;N;;;;; +1D67B;MATHEMATICAL MONOSPACE CAPITAL L;Lu;0;L; 004C;;;;N;;;;; +1D67C;MATHEMATICAL MONOSPACE CAPITAL M;Lu;0;L; 004D;;;;N;;;;; +1D67D;MATHEMATICAL MONOSPACE CAPITAL N;Lu;0;L; 004E;;;;N;;;;; +1D67E;MATHEMATICAL MONOSPACE CAPITAL O;Lu;0;L; 004F;;;;N;;;;; +1D67F;MATHEMATICAL MONOSPACE CAPITAL P;Lu;0;L; 0050;;;;N;;;;; +1D680;MATHEMATICAL MONOSPACE CAPITAL Q;Lu;0;L; 0051;;;;N;;;;; +1D681;MATHEMATICAL MONOSPACE CAPITAL R;Lu;0;L; 0052;;;;N;;;;; +1D682;MATHEMATICAL MONOSPACE CAPITAL S;Lu;0;L; 0053;;;;N;;;;; +1D683;MATHEMATICAL MONOSPACE CAPITAL T;Lu;0;L; 0054;;;;N;;;;; +1D684;MATHEMATICAL MONOSPACE CAPITAL U;Lu;0;L; 0055;;;;N;;;;; +1D685;MATHEMATICAL MONOSPACE CAPITAL V;Lu;0;L; 0056;;;;N;;;;; +1D686;MATHEMATICAL MONOSPACE CAPITAL W;Lu;0;L; 0057;;;;N;;;;; +1D687;MATHEMATICAL MONOSPACE CAPITAL X;Lu;0;L; 0058;;;;N;;;;; +1D688;MATHEMATICAL MONOSPACE CAPITAL Y;Lu;0;L; 0059;;;;N;;;;; +1D689;MATHEMATICAL MONOSPACE CAPITAL Z;Lu;0;L; 005A;;;;N;;;;; +1D68A;MATHEMATICAL MONOSPACE SMALL A;Ll;0;L; 0061;;;;N;;;;; +1D68B;MATHEMATICAL MONOSPACE SMALL B;Ll;0;L; 0062;;;;N;;;;; +1D68C;MATHEMATICAL MONOSPACE SMALL C;Ll;0;L; 0063;;;;N;;;;; +1D68D;MATHEMATICAL MONOSPACE SMALL D;Ll;0;L; 0064;;;;N;;;;; +1D68E;MATHEMATICAL MONOSPACE SMALL E;Ll;0;L; 0065;;;;N;;;;; +1D68F;MATHEMATICAL MONOSPACE SMALL F;Ll;0;L; 0066;;;;N;;;;; +1D690;MATHEMATICAL MONOSPACE SMALL G;Ll;0;L; 0067;;;;N;;;;; +1D691;MATHEMATICAL MONOSPACE SMALL H;Ll;0;L; 0068;;;;N;;;;; +1D692;MATHEMATICAL MONOSPACE SMALL I;Ll;0;L; 0069;;;;N;;;;; +1D693;MATHEMATICAL MONOSPACE SMALL J;Ll;0;L; 006A;;;;N;;;;; +1D694;MATHEMATICAL MONOSPACE SMALL K;Ll;0;L; 006B;;;;N;;;;; +1D695;MATHEMATICAL MONOSPACE SMALL L;Ll;0;L; 006C;;;;N;;;;; +1D696;MATHEMATICAL MONOSPACE SMALL M;Ll;0;L; 006D;;;;N;;;;; +1D697;MATHEMATICAL MONOSPACE SMALL N;Ll;0;L; 006E;;;;N;;;;; +1D698;MATHEMATICAL MONOSPACE SMALL O;Ll;0;L; 006F;;;;N;;;;; +1D699;MATHEMATICAL MONOSPACE SMALL P;Ll;0;L; 0070;;;;N;;;;; +1D69A;MATHEMATICAL MONOSPACE SMALL Q;Ll;0;L; 0071;;;;N;;;;; +1D69B;MATHEMATICAL MONOSPACE SMALL R;Ll;0;L; 0072;;;;N;;;;; +1D69C;MATHEMATICAL MONOSPACE SMALL S;Ll;0;L; 0073;;;;N;;;;; +1D69D;MATHEMATICAL MONOSPACE SMALL T;Ll;0;L; 0074;;;;N;;;;; +1D69E;MATHEMATICAL MONOSPACE SMALL U;Ll;0;L; 0075;;;;N;;;;; +1D69F;MATHEMATICAL MONOSPACE SMALL V;Ll;0;L; 0076;;;;N;;;;; +1D6A0;MATHEMATICAL MONOSPACE SMALL W;Ll;0;L; 0077;;;;N;;;;; +1D6A1;MATHEMATICAL MONOSPACE SMALL X;Ll;0;L; 0078;;;;N;;;;; +1D6A2;MATHEMATICAL MONOSPACE SMALL Y;Ll;0;L; 0079;;;;N;;;;; +1D6A3;MATHEMATICAL MONOSPACE SMALL Z;Ll;0;L; 007A;;;;N;;;;; +1D6A4;MATHEMATICAL ITALIC SMALL DOTLESS I;Ll;0;L; 0131;;;;N;;;;; +1D6A5;MATHEMATICAL ITALIC SMALL DOTLESS J;Ll;0;L; 0237;;;;N;;;;; +1D6A8;MATHEMATICAL BOLD CAPITAL ALPHA;Lu;0;L; 0391;;;;N;;;;; +1D6A9;MATHEMATICAL BOLD CAPITAL BETA;Lu;0;L; 0392;;;;N;;;;; +1D6AA;MATHEMATICAL BOLD CAPITAL GAMMA;Lu;0;L; 0393;;;;N;;;;; +1D6AB;MATHEMATICAL BOLD CAPITAL DELTA;Lu;0;L; 0394;;;;N;;;;; +1D6AC;MATHEMATICAL BOLD CAPITAL EPSILON;Lu;0;L; 0395;;;;N;;;;; +1D6AD;MATHEMATICAL BOLD CAPITAL ZETA;Lu;0;L; 0396;;;;N;;;;; +1D6AE;MATHEMATICAL BOLD CAPITAL ETA;Lu;0;L; 0397;;;;N;;;;; +1D6AF;MATHEMATICAL BOLD CAPITAL THETA;Lu;0;L; 0398;;;;N;;;;; +1D6B0;MATHEMATICAL BOLD CAPITAL IOTA;Lu;0;L; 0399;;;;N;;;;; +1D6B1;MATHEMATICAL BOLD CAPITAL KAPPA;Lu;0;L; 039A;;;;N;;;;; +1D6B2;MATHEMATICAL BOLD CAPITAL LAMDA;Lu;0;L; 039B;;;;N;;;;; +1D6B3;MATHEMATICAL BOLD CAPITAL MU;Lu;0;L; 039C;;;;N;;;;; +1D6B4;MATHEMATICAL BOLD CAPITAL NU;Lu;0;L; 039D;;;;N;;;;; +1D6B5;MATHEMATICAL BOLD CAPITAL XI;Lu;0;L; 039E;;;;N;;;;; +1D6B6;MATHEMATICAL BOLD CAPITAL OMICRON;Lu;0;L; 039F;;;;N;;;;; +1D6B7;MATHEMATICAL BOLD CAPITAL PI;Lu;0;L; 03A0;;;;N;;;;; +1D6B8;MATHEMATICAL BOLD CAPITAL RHO;Lu;0;L; 03A1;;;;N;;;;; +1D6B9;MATHEMATICAL BOLD CAPITAL THETA SYMBOL;Lu;0;L; 03F4;;;;N;;;;; +1D6BA;MATHEMATICAL BOLD CAPITAL SIGMA;Lu;0;L; 03A3;;;;N;;;;; +1D6BB;MATHEMATICAL BOLD CAPITAL TAU;Lu;0;L; 03A4;;;;N;;;;; +1D6BC;MATHEMATICAL BOLD CAPITAL UPSILON;Lu;0;L; 03A5;;;;N;;;;; +1D6BD;MATHEMATICAL BOLD CAPITAL PHI;Lu;0;L; 03A6;;;;N;;;;; +1D6BE;MATHEMATICAL BOLD CAPITAL CHI;Lu;0;L; 03A7;;;;N;;;;; +1D6BF;MATHEMATICAL BOLD CAPITAL PSI;Lu;0;L; 03A8;;;;N;;;;; +1D6C0;MATHEMATICAL BOLD CAPITAL OMEGA;Lu;0;L; 03A9;;;;N;;;;; +1D6C1;MATHEMATICAL BOLD NABLA;Sm;0;ON; 2207;;;;N;;;;; +1D6C2;MATHEMATICAL BOLD SMALL ALPHA;Ll;0;L; 03B1;;;;N;;;;; +1D6C3;MATHEMATICAL BOLD SMALL BETA;Ll;0;L; 03B2;;;;N;;;;; +1D6C4;MATHEMATICAL BOLD SMALL GAMMA;Ll;0;L; 03B3;;;;N;;;;; +1D6C5;MATHEMATICAL BOLD SMALL DELTA;Ll;0;L; 03B4;;;;N;;;;; +1D6C6;MATHEMATICAL BOLD SMALL EPSILON;Ll;0;L; 03B5;;;;N;;;;; +1D6C7;MATHEMATICAL BOLD SMALL ZETA;Ll;0;L; 03B6;;;;N;;;;; +1D6C8;MATHEMATICAL BOLD SMALL ETA;Ll;0;L; 03B7;;;;N;;;;; +1D6C9;MATHEMATICAL BOLD SMALL THETA;Ll;0;L; 03B8;;;;N;;;;; +1D6CA;MATHEMATICAL BOLD SMALL IOTA;Ll;0;L; 03B9;;;;N;;;;; +1D6CB;MATHEMATICAL BOLD SMALL KAPPA;Ll;0;L; 03BA;;;;N;;;;; +1D6CC;MATHEMATICAL BOLD SMALL LAMDA;Ll;0;L; 03BB;;;;N;;;;; +1D6CD;MATHEMATICAL BOLD SMALL MU;Ll;0;L; 03BC;;;;N;;;;; +1D6CE;MATHEMATICAL BOLD SMALL NU;Ll;0;L; 03BD;;;;N;;;;; +1D6CF;MATHEMATICAL BOLD SMALL XI;Ll;0;L; 03BE;;;;N;;;;; +1D6D0;MATHEMATICAL BOLD SMALL OMICRON;Ll;0;L; 03BF;;;;N;;;;; +1D6D1;MATHEMATICAL BOLD SMALL PI;Ll;0;L; 03C0;;;;N;;;;; +1D6D2;MATHEMATICAL BOLD SMALL RHO;Ll;0;L; 03C1;;;;N;;;;; +1D6D3;MATHEMATICAL BOLD SMALL FINAL SIGMA;Ll;0;L; 03C2;;;;N;;;;; +1D6D4;MATHEMATICAL BOLD SMALL SIGMA;Ll;0;L; 03C3;;;;N;;;;; +1D6D5;MATHEMATICAL BOLD SMALL TAU;Ll;0;L; 03C4;;;;N;;;;; +1D6D6;MATHEMATICAL BOLD SMALL UPSILON;Ll;0;L; 03C5;;;;N;;;;; +1D6D7;MATHEMATICAL BOLD SMALL PHI;Ll;0;L; 03C6;;;;N;;;;; +1D6D8;MATHEMATICAL BOLD SMALL CHI;Ll;0;L; 03C7;;;;N;;;;; +1D6D9;MATHEMATICAL BOLD SMALL PSI;Ll;0;L; 03C8;;;;N;;;;; +1D6DA;MATHEMATICAL BOLD SMALL OMEGA;Ll;0;L; 03C9;;;;N;;;;; +1D6DB;MATHEMATICAL BOLD PARTIAL DIFFERENTIAL;Sm;0;ON; 2202;;;;Y;;;;; +1D6DC;MATHEMATICAL BOLD EPSILON SYMBOL;Ll;0;L; 03F5;;;;N;;;;; +1D6DD;MATHEMATICAL BOLD THETA SYMBOL;Ll;0;L; 03D1;;;;N;;;;; +1D6DE;MATHEMATICAL BOLD KAPPA SYMBOL;Ll;0;L; 03F0;;;;N;;;;; +1D6DF;MATHEMATICAL BOLD PHI SYMBOL;Ll;0;L; 03D5;;;;N;;;;; +1D6E0;MATHEMATICAL BOLD RHO SYMBOL;Ll;0;L; 03F1;;;;N;;;;; +1D6E1;MATHEMATICAL BOLD PI SYMBOL;Ll;0;L; 03D6;;;;N;;;;; +1D6E2;MATHEMATICAL ITALIC CAPITAL ALPHA;Lu;0;L; 0391;;;;N;;;;; +1D6E3;MATHEMATICAL ITALIC CAPITAL BETA;Lu;0;L; 0392;;;;N;;;;; +1D6E4;MATHEMATICAL ITALIC CAPITAL GAMMA;Lu;0;L; 0393;;;;N;;;;; +1D6E5;MATHEMATICAL ITALIC CAPITAL DELTA;Lu;0;L; 0394;;;;N;;;;; +1D6E6;MATHEMATICAL ITALIC CAPITAL EPSILON;Lu;0;L; 0395;;;;N;;;;; +1D6E7;MATHEMATICAL ITALIC CAPITAL ZETA;Lu;0;L; 0396;;;;N;;;;; +1D6E8;MATHEMATICAL ITALIC CAPITAL ETA;Lu;0;L; 0397;;;;N;;;;; +1D6E9;MATHEMATICAL ITALIC CAPITAL THETA;Lu;0;L; 0398;;;;N;;;;; +1D6EA;MATHEMATICAL ITALIC CAPITAL IOTA;Lu;0;L; 0399;;;;N;;;;; +1D6EB;MATHEMATICAL ITALIC CAPITAL KAPPA;Lu;0;L; 039A;;;;N;;;;; +1D6EC;MATHEMATICAL ITALIC CAPITAL LAMDA;Lu;0;L; 039B;;;;N;;;;; +1D6ED;MATHEMATICAL ITALIC CAPITAL MU;Lu;0;L; 039C;;;;N;;;;; +1D6EE;MATHEMATICAL ITALIC CAPITAL NU;Lu;0;L; 039D;;;;N;;;;; +1D6EF;MATHEMATICAL ITALIC CAPITAL XI;Lu;0;L; 039E;;;;N;;;;; +1D6F0;MATHEMATICAL ITALIC CAPITAL OMICRON;Lu;0;L; 039F;;;;N;;;;; +1D6F1;MATHEMATICAL ITALIC CAPITAL PI;Lu;0;L; 03A0;;;;N;;;;; +1D6F2;MATHEMATICAL ITALIC CAPITAL RHO;Lu;0;L; 03A1;;;;N;;;;; +1D6F3;MATHEMATICAL ITALIC CAPITAL THETA SYMBOL;Lu;0;L; 03F4;;;;N;;;;; +1D6F4;MATHEMATICAL ITALIC CAPITAL SIGMA;Lu;0;L; 03A3;;;;N;;;;; +1D6F5;MATHEMATICAL ITALIC CAPITAL TAU;Lu;0;L; 03A4;;;;N;;;;; +1D6F6;MATHEMATICAL ITALIC CAPITAL UPSILON;Lu;0;L; 03A5;;;;N;;;;; +1D6F7;MATHEMATICAL ITALIC CAPITAL PHI;Lu;0;L; 03A6;;;;N;;;;; +1D6F8;MATHEMATICAL ITALIC CAPITAL CHI;Lu;0;L; 03A7;;;;N;;;;; +1D6F9;MATHEMATICAL ITALIC CAPITAL PSI;Lu;0;L; 03A8;;;;N;;;;; +1D6FA;MATHEMATICAL ITALIC CAPITAL OMEGA;Lu;0;L; 03A9;;;;N;;;;; +1D6FB;MATHEMATICAL ITALIC NABLA;Sm;0;ON; 2207;;;;N;;;;; +1D6FC;MATHEMATICAL ITALIC SMALL ALPHA;Ll;0;L; 03B1;;;;N;;;;; +1D6FD;MATHEMATICAL ITALIC SMALL BETA;Ll;0;L; 03B2;;;;N;;;;; +1D6FE;MATHEMATICAL ITALIC SMALL GAMMA;Ll;0;L; 03B3;;;;N;;;;; +1D6FF;MATHEMATICAL ITALIC SMALL DELTA;Ll;0;L; 03B4;;;;N;;;;; +1D700;MATHEMATICAL ITALIC SMALL EPSILON;Ll;0;L; 03B5;;;;N;;;;; +1D701;MATHEMATICAL ITALIC SMALL ZETA;Ll;0;L; 03B6;;;;N;;;;; +1D702;MATHEMATICAL ITALIC SMALL ETA;Ll;0;L; 03B7;;;;N;;;;; +1D703;MATHEMATICAL ITALIC SMALL THETA;Ll;0;L; 03B8;;;;N;;;;; +1D704;MATHEMATICAL ITALIC SMALL IOTA;Ll;0;L; 03B9;;;;N;;;;; +1D705;MATHEMATICAL ITALIC SMALL KAPPA;Ll;0;L; 03BA;;;;N;;;;; +1D706;MATHEMATICAL ITALIC SMALL LAMDA;Ll;0;L; 03BB;;;;N;;;;; +1D707;MATHEMATICAL ITALIC SMALL MU;Ll;0;L; 03BC;;;;N;;;;; +1D708;MATHEMATICAL ITALIC SMALL NU;Ll;0;L; 03BD;;;;N;;;;; +1D709;MATHEMATICAL ITALIC SMALL XI;Ll;0;L; 03BE;;;;N;;;;; +1D70A;MATHEMATICAL ITALIC SMALL OMICRON;Ll;0;L; 03BF;;;;N;;;;; +1D70B;MATHEMATICAL ITALIC SMALL PI;Ll;0;L; 03C0;;;;N;;;;; +1D70C;MATHEMATICAL ITALIC SMALL RHO;Ll;0;L; 03C1;;;;N;;;;; +1D70D;MATHEMATICAL ITALIC SMALL FINAL SIGMA;Ll;0;L; 03C2;;;;N;;;;; +1D70E;MATHEMATICAL ITALIC SMALL SIGMA;Ll;0;L; 03C3;;;;N;;;;; +1D70F;MATHEMATICAL ITALIC SMALL TAU;Ll;0;L; 03C4;;;;N;;;;; +1D710;MATHEMATICAL ITALIC SMALL UPSILON;Ll;0;L; 03C5;;;;N;;;;; +1D711;MATHEMATICAL ITALIC SMALL PHI;Ll;0;L; 03C6;;;;N;;;;; +1D712;MATHEMATICAL ITALIC SMALL CHI;Ll;0;L; 03C7;;;;N;;;;; +1D713;MATHEMATICAL ITALIC SMALL PSI;Ll;0;L; 03C8;;;;N;;;;; +1D714;MATHEMATICAL ITALIC SMALL OMEGA;Ll;0;L; 03C9;;;;N;;;;; +1D715;MATHEMATICAL ITALIC PARTIAL DIFFERENTIAL;Sm;0;ON; 2202;;;;Y;;;;; +1D716;MATHEMATICAL ITALIC EPSILON SYMBOL;Ll;0;L; 03F5;;;;N;;;;; +1D717;MATHEMATICAL ITALIC THETA SYMBOL;Ll;0;L; 03D1;;;;N;;;;; +1D718;MATHEMATICAL ITALIC KAPPA SYMBOL;Ll;0;L; 03F0;;;;N;;;;; +1D719;MATHEMATICAL ITALIC PHI SYMBOL;Ll;0;L; 03D5;;;;N;;;;; +1D71A;MATHEMATICAL ITALIC RHO SYMBOL;Ll;0;L; 03F1;;;;N;;;;; +1D71B;MATHEMATICAL ITALIC PI SYMBOL;Ll;0;L; 03D6;;;;N;;;;; +1D71C;MATHEMATICAL BOLD ITALIC CAPITAL ALPHA;Lu;0;L; 0391;;;;N;;;;; +1D71D;MATHEMATICAL BOLD ITALIC CAPITAL BETA;Lu;0;L; 0392;;;;N;;;;; +1D71E;MATHEMATICAL BOLD ITALIC CAPITAL GAMMA;Lu;0;L; 0393;;;;N;;;;; +1D71F;MATHEMATICAL BOLD ITALIC CAPITAL DELTA;Lu;0;L; 0394;;;;N;;;;; +1D720;MATHEMATICAL BOLD ITALIC CAPITAL EPSILON;Lu;0;L; 0395;;;;N;;;;; +1D721;MATHEMATICAL BOLD ITALIC CAPITAL ZETA;Lu;0;L; 0396;;;;N;;;;; +1D722;MATHEMATICAL BOLD ITALIC CAPITAL ETA;Lu;0;L; 0397;;;;N;;;;; +1D723;MATHEMATICAL BOLD ITALIC CAPITAL THETA;Lu;0;L; 0398;;;;N;;;;; +1D724;MATHEMATICAL BOLD ITALIC CAPITAL IOTA;Lu;0;L; 0399;;;;N;;;;; +1D725;MATHEMATICAL BOLD ITALIC CAPITAL KAPPA;Lu;0;L; 039A;;;;N;;;;; +1D726;MATHEMATICAL BOLD ITALIC CAPITAL LAMDA;Lu;0;L; 039B;;;;N;;;;; +1D727;MATHEMATICAL BOLD ITALIC CAPITAL MU;Lu;0;L; 039C;;;;N;;;;; +1D728;MATHEMATICAL BOLD ITALIC CAPITAL NU;Lu;0;L; 039D;;;;N;;;;; +1D729;MATHEMATICAL BOLD ITALIC CAPITAL XI;Lu;0;L; 039E;;;;N;;;;; +1D72A;MATHEMATICAL BOLD ITALIC CAPITAL OMICRON;Lu;0;L; 039F;;;;N;;;;; +1D72B;MATHEMATICAL BOLD ITALIC CAPITAL PI;Lu;0;L; 03A0;;;;N;;;;; +1D72C;MATHEMATICAL BOLD ITALIC CAPITAL RHO;Lu;0;L; 03A1;;;;N;;;;; +1D72D;MATHEMATICAL BOLD ITALIC CAPITAL THETA SYMBOL;Lu;0;L; 03F4;;;;N;;;;; +1D72E;MATHEMATICAL BOLD ITALIC CAPITAL SIGMA;Lu;0;L; 03A3;;;;N;;;;; +1D72F;MATHEMATICAL BOLD ITALIC CAPITAL TAU;Lu;0;L; 03A4;;;;N;;;;; +1D730;MATHEMATICAL BOLD ITALIC CAPITAL UPSILON;Lu;0;L; 03A5;;;;N;;;;; +1D731;MATHEMATICAL BOLD ITALIC CAPITAL PHI;Lu;0;L; 03A6;;;;N;;;;; +1D732;MATHEMATICAL BOLD ITALIC CAPITAL CHI;Lu;0;L; 03A7;;;;N;;;;; +1D733;MATHEMATICAL BOLD ITALIC CAPITAL PSI;Lu;0;L; 03A8;;;;N;;;;; +1D734;MATHEMATICAL BOLD ITALIC CAPITAL OMEGA;Lu;0;L; 03A9;;;;N;;;;; +1D735;MATHEMATICAL BOLD ITALIC NABLA;Sm;0;ON; 2207;;;;N;;;;; +1D736;MATHEMATICAL BOLD ITALIC SMALL ALPHA;Ll;0;L; 03B1;;;;N;;;;; +1D737;MATHEMATICAL BOLD ITALIC SMALL BETA;Ll;0;L; 03B2;;;;N;;;;; +1D738;MATHEMATICAL BOLD ITALIC SMALL GAMMA;Ll;0;L; 03B3;;;;N;;;;; +1D739;MATHEMATICAL BOLD ITALIC SMALL DELTA;Ll;0;L; 03B4;;;;N;;;;; +1D73A;MATHEMATICAL BOLD ITALIC SMALL EPSILON;Ll;0;L; 03B5;;;;N;;;;; +1D73B;MATHEMATICAL BOLD ITALIC SMALL ZETA;Ll;0;L; 03B6;;;;N;;;;; +1D73C;MATHEMATICAL BOLD ITALIC SMALL ETA;Ll;0;L; 03B7;;;;N;;;;; +1D73D;MATHEMATICAL BOLD ITALIC SMALL THETA;Ll;0;L; 03B8;;;;N;;;;; +1D73E;MATHEMATICAL BOLD ITALIC SMALL IOTA;Ll;0;L; 03B9;;;;N;;;;; +1D73F;MATHEMATICAL BOLD ITALIC SMALL KAPPA;Ll;0;L; 03BA;;;;N;;;;; +1D740;MATHEMATICAL BOLD ITALIC SMALL LAMDA;Ll;0;L; 03BB;;;;N;;;;; +1D741;MATHEMATICAL BOLD ITALIC SMALL MU;Ll;0;L; 03BC;;;;N;;;;; +1D742;MATHEMATICAL BOLD ITALIC SMALL NU;Ll;0;L; 03BD;;;;N;;;;; +1D743;MATHEMATICAL BOLD ITALIC SMALL XI;Ll;0;L; 03BE;;;;N;;;;; +1D744;MATHEMATICAL BOLD ITALIC SMALL OMICRON;Ll;0;L; 03BF;;;;N;;;;; +1D745;MATHEMATICAL BOLD ITALIC SMALL PI;Ll;0;L; 03C0;;;;N;;;;; +1D746;MATHEMATICAL BOLD ITALIC SMALL RHO;Ll;0;L; 03C1;;;;N;;;;; +1D747;MATHEMATICAL BOLD ITALIC SMALL FINAL SIGMA;Ll;0;L; 03C2;;;;N;;;;; +1D748;MATHEMATICAL BOLD ITALIC SMALL SIGMA;Ll;0;L; 03C3;;;;N;;;;; +1D749;MATHEMATICAL BOLD ITALIC SMALL TAU;Ll;0;L; 03C4;;;;N;;;;; +1D74A;MATHEMATICAL BOLD ITALIC SMALL UPSILON;Ll;0;L; 03C5;;;;N;;;;; +1D74B;MATHEMATICAL BOLD ITALIC SMALL PHI;Ll;0;L; 03C6;;;;N;;;;; +1D74C;MATHEMATICAL BOLD ITALIC SMALL CHI;Ll;0;L; 03C7;;;;N;;;;; +1D74D;MATHEMATICAL BOLD ITALIC SMALL PSI;Ll;0;L; 03C8;;;;N;;;;; +1D74E;MATHEMATICAL BOLD ITALIC SMALL OMEGA;Ll;0;L; 03C9;;;;N;;;;; +1D74F;MATHEMATICAL BOLD ITALIC PARTIAL DIFFERENTIAL;Sm;0;ON; 2202;;;;Y;;;;; +1D750;MATHEMATICAL BOLD ITALIC EPSILON SYMBOL;Ll;0;L; 03F5;;;;N;;;;; +1D751;MATHEMATICAL BOLD ITALIC THETA SYMBOL;Ll;0;L; 03D1;;;;N;;;;; +1D752;MATHEMATICAL BOLD ITALIC KAPPA SYMBOL;Ll;0;L; 03F0;;;;N;;;;; +1D753;MATHEMATICAL BOLD ITALIC PHI SYMBOL;Ll;0;L; 03D5;;;;N;;;;; +1D754;MATHEMATICAL BOLD ITALIC RHO SYMBOL;Ll;0;L; 03F1;;;;N;;;;; +1D755;MATHEMATICAL BOLD ITALIC PI SYMBOL;Ll;0;L; 03D6;;;;N;;;;; +1D756;MATHEMATICAL SANS-SERIF BOLD CAPITAL ALPHA;Lu;0;L; 0391;;;;N;;;;; +1D757;MATHEMATICAL SANS-SERIF BOLD CAPITAL BETA;Lu;0;L; 0392;;;;N;;;;; +1D758;MATHEMATICAL SANS-SERIF BOLD CAPITAL GAMMA;Lu;0;L; 0393;;;;N;;;;; +1D759;MATHEMATICAL SANS-SERIF BOLD CAPITAL DELTA;Lu;0;L; 0394;;;;N;;;;; +1D75A;MATHEMATICAL SANS-SERIF BOLD CAPITAL EPSILON;Lu;0;L; 0395;;;;N;;;;; +1D75B;MATHEMATICAL SANS-SERIF BOLD CAPITAL ZETA;Lu;0;L; 0396;;;;N;;;;; +1D75C;MATHEMATICAL SANS-SERIF BOLD CAPITAL ETA;Lu;0;L; 0397;;;;N;;;;; +1D75D;MATHEMATICAL SANS-SERIF BOLD CAPITAL THETA;Lu;0;L; 0398;;;;N;;;;; +1D75E;MATHEMATICAL SANS-SERIF BOLD CAPITAL IOTA;Lu;0;L; 0399;;;;N;;;;; +1D75F;MATHEMATICAL SANS-SERIF BOLD CAPITAL KAPPA;Lu;0;L; 039A;;;;N;;;;; +1D760;MATHEMATICAL SANS-SERIF BOLD CAPITAL LAMDA;Lu;0;L; 039B;;;;N;;;;; +1D761;MATHEMATICAL SANS-SERIF BOLD CAPITAL MU;Lu;0;L; 039C;;;;N;;;;; +1D762;MATHEMATICAL SANS-SERIF BOLD CAPITAL NU;Lu;0;L; 039D;;;;N;;;;; +1D763;MATHEMATICAL SANS-SERIF BOLD CAPITAL XI;Lu;0;L; 039E;;;;N;;;;; +1D764;MATHEMATICAL SANS-SERIF BOLD CAPITAL OMICRON;Lu;0;L; 039F;;;;N;;;;; +1D765;MATHEMATICAL SANS-SERIF BOLD CAPITAL PI;Lu;0;L; 03A0;;;;N;;;;; +1D766;MATHEMATICAL SANS-SERIF BOLD CAPITAL RHO;Lu;0;L; 03A1;;;;N;;;;; +1D767;MATHEMATICAL SANS-SERIF BOLD CAPITAL THETA SYMBOL;Lu;0;L; 03F4;;;;N;;;;; +1D768;MATHEMATICAL SANS-SERIF BOLD CAPITAL SIGMA;Lu;0;L; 03A3;;;;N;;;;; +1D769;MATHEMATICAL SANS-SERIF BOLD CAPITAL TAU;Lu;0;L; 03A4;;;;N;;;;; +1D76A;MATHEMATICAL SANS-SERIF BOLD CAPITAL UPSILON;Lu;0;L; 03A5;;;;N;;;;; +1D76B;MATHEMATICAL SANS-SERIF BOLD CAPITAL PHI;Lu;0;L; 03A6;;;;N;;;;; +1D76C;MATHEMATICAL SANS-SERIF BOLD CAPITAL CHI;Lu;0;L; 03A7;;;;N;;;;; +1D76D;MATHEMATICAL SANS-SERIF BOLD CAPITAL PSI;Lu;0;L; 03A8;;;;N;;;;; +1D76E;MATHEMATICAL SANS-SERIF BOLD CAPITAL OMEGA;Lu;0;L; 03A9;;;;N;;;;; +1D76F;MATHEMATICAL SANS-SERIF BOLD NABLA;Sm;0;ON; 2207;;;;N;;;;; +1D770;MATHEMATICAL SANS-SERIF BOLD SMALL ALPHA;Ll;0;L; 03B1;;;;N;;;;; +1D771;MATHEMATICAL SANS-SERIF BOLD SMALL BETA;Ll;0;L; 03B2;;;;N;;;;; +1D772;MATHEMATICAL SANS-SERIF BOLD SMALL GAMMA;Ll;0;L; 03B3;;;;N;;;;; +1D773;MATHEMATICAL SANS-SERIF BOLD SMALL DELTA;Ll;0;L; 03B4;;;;N;;;;; +1D774;MATHEMATICAL SANS-SERIF BOLD SMALL EPSILON;Ll;0;L; 03B5;;;;N;;;;; +1D775;MATHEMATICAL SANS-SERIF BOLD SMALL ZETA;Ll;0;L; 03B6;;;;N;;;;; +1D776;MATHEMATICAL SANS-SERIF BOLD SMALL ETA;Ll;0;L; 03B7;;;;N;;;;; +1D777;MATHEMATICAL SANS-SERIF BOLD SMALL THETA;Ll;0;L; 03B8;;;;N;;;;; +1D778;MATHEMATICAL SANS-SERIF BOLD SMALL IOTA;Ll;0;L; 03B9;;;;N;;;;; +1D779;MATHEMATICAL SANS-SERIF BOLD SMALL KAPPA;Ll;0;L; 03BA;;;;N;;;;; +1D77A;MATHEMATICAL SANS-SERIF BOLD SMALL LAMDA;Ll;0;L; 03BB;;;;N;;;;; +1D77B;MATHEMATICAL SANS-SERIF BOLD SMALL MU;Ll;0;L; 03BC;;;;N;;;;; +1D77C;MATHEMATICAL SANS-SERIF BOLD SMALL NU;Ll;0;L; 03BD;;;;N;;;;; +1D77D;MATHEMATICAL SANS-SERIF BOLD SMALL XI;Ll;0;L; 03BE;;;;N;;;;; +1D77E;MATHEMATICAL SANS-SERIF BOLD SMALL OMICRON;Ll;0;L; 03BF;;;;N;;;;; +1D77F;MATHEMATICAL SANS-SERIF BOLD SMALL PI;Ll;0;L; 03C0;;;;N;;;;; +1D780;MATHEMATICAL SANS-SERIF BOLD SMALL RHO;Ll;0;L; 03C1;;;;N;;;;; +1D781;MATHEMATICAL SANS-SERIF BOLD SMALL FINAL SIGMA;Ll;0;L; 03C2;;;;N;;;;; +1D782;MATHEMATICAL SANS-SERIF BOLD SMALL SIGMA;Ll;0;L; 03C3;;;;N;;;;; +1D783;MATHEMATICAL SANS-SERIF BOLD SMALL TAU;Ll;0;L; 03C4;;;;N;;;;; +1D784;MATHEMATICAL SANS-SERIF BOLD SMALL UPSILON;Ll;0;L; 03C5;;;;N;;;;; +1D785;MATHEMATICAL SANS-SERIF BOLD SMALL PHI;Ll;0;L; 03C6;;;;N;;;;; +1D786;MATHEMATICAL SANS-SERIF BOLD SMALL CHI;Ll;0;L; 03C7;;;;N;;;;; +1D787;MATHEMATICAL SANS-SERIF BOLD SMALL PSI;Ll;0;L; 03C8;;;;N;;;;; +1D788;MATHEMATICAL SANS-SERIF BOLD SMALL OMEGA;Ll;0;L; 03C9;;;;N;;;;; +1D789;MATHEMATICAL SANS-SERIF BOLD PARTIAL DIFFERENTIAL;Sm;0;ON; 2202;;;;Y;;;;; +1D78A;MATHEMATICAL SANS-SERIF BOLD EPSILON SYMBOL;Ll;0;L; 03F5;;;;N;;;;; +1D78B;MATHEMATICAL SANS-SERIF BOLD THETA SYMBOL;Ll;0;L; 03D1;;;;N;;;;; +1D78C;MATHEMATICAL SANS-SERIF BOLD KAPPA SYMBOL;Ll;0;L; 03F0;;;;N;;;;; +1D78D;MATHEMATICAL SANS-SERIF BOLD PHI SYMBOL;Ll;0;L; 03D5;;;;N;;;;; +1D78E;MATHEMATICAL SANS-SERIF BOLD RHO SYMBOL;Ll;0;L; 03F1;;;;N;;;;; +1D78F;MATHEMATICAL SANS-SERIF BOLD PI SYMBOL;Ll;0;L; 03D6;;;;N;;;;; +1D790;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL ALPHA;Lu;0;L; 0391;;;;N;;;;; +1D791;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL BETA;Lu;0;L; 0392;;;;N;;;;; +1D792;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL GAMMA;Lu;0;L; 0393;;;;N;;;;; +1D793;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL DELTA;Lu;0;L; 0394;;;;N;;;;; +1D794;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL EPSILON;Lu;0;L; 0395;;;;N;;;;; +1D795;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL ZETA;Lu;0;L; 0396;;;;N;;;;; +1D796;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL ETA;Lu;0;L; 0397;;;;N;;;;; +1D797;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL THETA;Lu;0;L; 0398;;;;N;;;;; +1D798;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL IOTA;Lu;0;L; 0399;;;;N;;;;; +1D799;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL KAPPA;Lu;0;L; 039A;;;;N;;;;; +1D79A;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL LAMDA;Lu;0;L; 039B;;;;N;;;;; +1D79B;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL MU;Lu;0;L; 039C;;;;N;;;;; +1D79C;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL NU;Lu;0;L; 039D;;;;N;;;;; +1D79D;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL XI;Lu;0;L; 039E;;;;N;;;;; +1D79E;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL OMICRON;Lu;0;L; 039F;;;;N;;;;; +1D79F;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL PI;Lu;0;L; 03A0;;;;N;;;;; +1D7A0;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL RHO;Lu;0;L; 03A1;;;;N;;;;; +1D7A1;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL THETA SYMBOL;Lu;0;L; 03F4;;;;N;;;;; +1D7A2;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL SIGMA;Lu;0;L; 03A3;;;;N;;;;; +1D7A3;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL TAU;Lu;0;L; 03A4;;;;N;;;;; +1D7A4;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL UPSILON;Lu;0;L; 03A5;;;;N;;;;; +1D7A5;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL PHI;Lu;0;L; 03A6;;;;N;;;;; +1D7A6;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL CHI;Lu;0;L; 03A7;;;;N;;;;; +1D7A7;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL PSI;Lu;0;L; 03A8;;;;N;;;;; +1D7A8;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL OMEGA;Lu;0;L; 03A9;;;;N;;;;; +1D7A9;MATHEMATICAL SANS-SERIF BOLD ITALIC NABLA;Sm;0;ON; 2207;;;;N;;;;; +1D7AA;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ALPHA;Ll;0;L; 03B1;;;;N;;;;; +1D7AB;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL BETA;Ll;0;L; 03B2;;;;N;;;;; +1D7AC;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL GAMMA;Ll;0;L; 03B3;;;;N;;;;; +1D7AD;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL DELTA;Ll;0;L; 03B4;;;;N;;;;; +1D7AE;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL EPSILON;Ll;0;L; 03B5;;;;N;;;;; +1D7AF;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ZETA;Ll;0;L; 03B6;;;;N;;;;; +1D7B0;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ETA;Ll;0;L; 03B7;;;;N;;;;; +1D7B1;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL THETA;Ll;0;L; 03B8;;;;N;;;;; +1D7B2;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL IOTA;Ll;0;L; 03B9;;;;N;;;;; +1D7B3;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL KAPPA;Ll;0;L; 03BA;;;;N;;;;; +1D7B4;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL LAMDA;Ll;0;L; 03BB;;;;N;;;;; +1D7B5;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL MU;Ll;0;L; 03BC;;;;N;;;;; +1D7B6;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL NU;Ll;0;L; 03BD;;;;N;;;;; +1D7B7;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL XI;Ll;0;L; 03BE;;;;N;;;;; +1D7B8;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL OMICRON;Ll;0;L; 03BF;;;;N;;;;; +1D7B9;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL PI;Ll;0;L; 03C0;;;;N;;;;; +1D7BA;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL RHO;Ll;0;L; 03C1;;;;N;;;;; +1D7BB;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL FINAL SIGMA;Ll;0;L; 03C2;;;;N;;;;; +1D7BC;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL SIGMA;Ll;0;L; 03C3;;;;N;;;;; +1D7BD;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL TAU;Ll;0;L; 03C4;;;;N;;;;; +1D7BE;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL UPSILON;Ll;0;L; 03C5;;;;N;;;;; +1D7BF;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL PHI;Ll;0;L; 03C6;;;;N;;;;; +1D7C0;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL CHI;Ll;0;L; 03C7;;;;N;;;;; +1D7C1;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL PSI;Ll;0;L; 03C8;;;;N;;;;; +1D7C2;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL OMEGA;Ll;0;L; 03C9;;;;N;;;;; +1D7C3;MATHEMATICAL SANS-SERIF BOLD ITALIC PARTIAL DIFFERENTIAL;Sm;0;ON; 2202;;;;Y;;;;; +1D7C4;MATHEMATICAL SANS-SERIF BOLD ITALIC EPSILON SYMBOL;Ll;0;L; 03F5;;;;N;;;;; +1D7C5;MATHEMATICAL SANS-SERIF BOLD ITALIC THETA SYMBOL;Ll;0;L; 03D1;;;;N;;;;; +1D7C6;MATHEMATICAL SANS-SERIF BOLD ITALIC KAPPA SYMBOL;Ll;0;L; 03F0;;;;N;;;;; +1D7C7;MATHEMATICAL SANS-SERIF BOLD ITALIC PHI SYMBOL;Ll;0;L; 03D5;;;;N;;;;; +1D7C8;MATHEMATICAL SANS-SERIF BOLD ITALIC RHO SYMBOL;Ll;0;L; 03F1;;;;N;;;;; +1D7C9;MATHEMATICAL SANS-SERIF BOLD ITALIC PI SYMBOL;Ll;0;L; 03D6;;;;N;;;;; +1D7CA;MATHEMATICAL BOLD CAPITAL DIGAMMA;Lu;0;L; 03DC;;;;N;;;;; +1D7CB;MATHEMATICAL BOLD SMALL DIGAMMA;Ll;0;L; 03DD;;;;N;;;;; +1D7CE;MATHEMATICAL BOLD DIGIT ZERO;Nd;0;EN; 0030;0;0;0;N;;;;; +1D7CF;MATHEMATICAL BOLD DIGIT ONE;Nd;0;EN; 0031;1;1;1;N;;;;; +1D7D0;MATHEMATICAL BOLD DIGIT TWO;Nd;0;EN; 0032;2;2;2;N;;;;; +1D7D1;MATHEMATICAL BOLD DIGIT THREE;Nd;0;EN; 0033;3;3;3;N;;;;; +1D7D2;MATHEMATICAL BOLD DIGIT FOUR;Nd;0;EN; 0034;4;4;4;N;;;;; +1D7D3;MATHEMATICAL BOLD DIGIT FIVE;Nd;0;EN; 0035;5;5;5;N;;;;; +1D7D4;MATHEMATICAL BOLD DIGIT SIX;Nd;0;EN; 0036;6;6;6;N;;;;; +1D7D5;MATHEMATICAL BOLD DIGIT SEVEN;Nd;0;EN; 0037;7;7;7;N;;;;; +1D7D6;MATHEMATICAL BOLD DIGIT EIGHT;Nd;0;EN; 0038;8;8;8;N;;;;; +1D7D7;MATHEMATICAL BOLD DIGIT NINE;Nd;0;EN; 0039;9;9;9;N;;;;; +1D7D8;MATHEMATICAL DOUBLE-STRUCK DIGIT ZERO;Nd;0;EN; 0030;0;0;0;N;;;;; +1D7D9;MATHEMATICAL DOUBLE-STRUCK DIGIT ONE;Nd;0;EN; 0031;1;1;1;N;;;;; +1D7DA;MATHEMATICAL DOUBLE-STRUCK DIGIT TWO;Nd;0;EN; 0032;2;2;2;N;;;;; +1D7DB;MATHEMATICAL DOUBLE-STRUCK DIGIT THREE;Nd;0;EN; 0033;3;3;3;N;;;;; +1D7DC;MATHEMATICAL DOUBLE-STRUCK DIGIT FOUR;Nd;0;EN; 0034;4;4;4;N;;;;; +1D7DD;MATHEMATICAL DOUBLE-STRUCK DIGIT FIVE;Nd;0;EN; 0035;5;5;5;N;;;;; +1D7DE;MATHEMATICAL DOUBLE-STRUCK DIGIT SIX;Nd;0;EN; 0036;6;6;6;N;;;;; +1D7DF;MATHEMATICAL DOUBLE-STRUCK DIGIT SEVEN;Nd;0;EN; 0037;7;7;7;N;;;;; +1D7E0;MATHEMATICAL DOUBLE-STRUCK DIGIT EIGHT;Nd;0;EN; 0038;8;8;8;N;;;;; +1D7E1;MATHEMATICAL DOUBLE-STRUCK DIGIT NINE;Nd;0;EN; 0039;9;9;9;N;;;;; +1D7E2;MATHEMATICAL SANS-SERIF DIGIT ZERO;Nd;0;EN; 0030;0;0;0;N;;;;; +1D7E3;MATHEMATICAL SANS-SERIF DIGIT ONE;Nd;0;EN; 0031;1;1;1;N;;;;; +1D7E4;MATHEMATICAL SANS-SERIF DIGIT TWO;Nd;0;EN; 0032;2;2;2;N;;;;; +1D7E5;MATHEMATICAL SANS-SERIF DIGIT THREE;Nd;0;EN; 0033;3;3;3;N;;;;; +1D7E6;MATHEMATICAL SANS-SERIF DIGIT FOUR;Nd;0;EN; 0034;4;4;4;N;;;;; +1D7E7;MATHEMATICAL SANS-SERIF DIGIT FIVE;Nd;0;EN; 0035;5;5;5;N;;;;; +1D7E8;MATHEMATICAL SANS-SERIF DIGIT SIX;Nd;0;EN; 0036;6;6;6;N;;;;; +1D7E9;MATHEMATICAL SANS-SERIF DIGIT SEVEN;Nd;0;EN; 0037;7;7;7;N;;;;; +1D7EA;MATHEMATICAL SANS-SERIF DIGIT EIGHT;Nd;0;EN; 0038;8;8;8;N;;;;; +1D7EB;MATHEMATICAL SANS-SERIF DIGIT NINE;Nd;0;EN; 0039;9;9;9;N;;;;; +1D7EC;MATHEMATICAL SANS-SERIF BOLD DIGIT ZERO;Nd;0;EN; 0030;0;0;0;N;;;;; +1D7ED;MATHEMATICAL SANS-SERIF BOLD DIGIT ONE;Nd;0;EN; 0031;1;1;1;N;;;;; +1D7EE;MATHEMATICAL SANS-SERIF BOLD DIGIT TWO;Nd;0;EN; 0032;2;2;2;N;;;;; +1D7EF;MATHEMATICAL SANS-SERIF BOLD DIGIT THREE;Nd;0;EN; 0033;3;3;3;N;;;;; +1D7F0;MATHEMATICAL SANS-SERIF BOLD DIGIT FOUR;Nd;0;EN; 0034;4;4;4;N;;;;; +1D7F1;MATHEMATICAL SANS-SERIF BOLD DIGIT FIVE;Nd;0;EN; 0035;5;5;5;N;;;;; +1D7F2;MATHEMATICAL SANS-SERIF BOLD DIGIT SIX;Nd;0;EN; 0036;6;6;6;N;;;;; +1D7F3;MATHEMATICAL SANS-SERIF BOLD DIGIT SEVEN;Nd;0;EN; 0037;7;7;7;N;;;;; +1D7F4;MATHEMATICAL SANS-SERIF BOLD DIGIT EIGHT;Nd;0;EN; 0038;8;8;8;N;;;;; +1D7F5;MATHEMATICAL SANS-SERIF BOLD DIGIT NINE;Nd;0;EN; 0039;9;9;9;N;;;;; +1D7F6;MATHEMATICAL MONOSPACE DIGIT ZERO;Nd;0;EN; 0030;0;0;0;N;;;;; +1D7F7;MATHEMATICAL MONOSPACE DIGIT ONE;Nd;0;EN; 0031;1;1;1;N;;;;; +1D7F8;MATHEMATICAL MONOSPACE DIGIT TWO;Nd;0;EN; 0032;2;2;2;N;;;;; +1D7F9;MATHEMATICAL MONOSPACE DIGIT THREE;Nd;0;EN; 0033;3;3;3;N;;;;; +1D7FA;MATHEMATICAL MONOSPACE DIGIT FOUR;Nd;0;EN; 0034;4;4;4;N;;;;; +1D7FB;MATHEMATICAL MONOSPACE DIGIT FIVE;Nd;0;EN; 0035;5;5;5;N;;;;; +1D7FC;MATHEMATICAL MONOSPACE DIGIT SIX;Nd;0;EN; 0036;6;6;6;N;;;;; +1D7FD;MATHEMATICAL MONOSPACE DIGIT SEVEN;Nd;0;EN; 0037;7;7;7;N;;;;; +1D7FE;MATHEMATICAL MONOSPACE DIGIT EIGHT;Nd;0;EN; 0038;8;8;8;N;;;;; +1D7FF;MATHEMATICAL MONOSPACE DIGIT NINE;Nd;0;EN; 0039;9;9;9;N;;;;; +1D800;SIGNWRITING HAND-FIST INDEX;So;0;L;;;;;N;;;;; +1D801;SIGNWRITING HAND-CIRCLE INDEX;So;0;L;;;;;N;;;;; +1D802;SIGNWRITING HAND-CUP INDEX;So;0;L;;;;;N;;;;; +1D803;SIGNWRITING HAND-OVAL INDEX;So;0;L;;;;;N;;;;; +1D804;SIGNWRITING HAND-HINGE INDEX;So;0;L;;;;;N;;;;; +1D805;SIGNWRITING HAND-ANGLE INDEX;So;0;L;;;;;N;;;;; +1D806;SIGNWRITING HAND-FIST INDEX BENT;So;0;L;;;;;N;;;;; +1D807;SIGNWRITING HAND-CIRCLE INDEX BENT;So;0;L;;;;;N;;;;; +1D808;SIGNWRITING HAND-FIST THUMB UNDER INDEX BENT;So;0;L;;;;;N;;;;; +1D809;SIGNWRITING HAND-FIST INDEX RAISED KNUCKLE;So;0;L;;;;;N;;;;; +1D80A;SIGNWRITING HAND-FIST INDEX CUPPED;So;0;L;;;;;N;;;;; +1D80B;SIGNWRITING HAND-FIST INDEX HINGED;So;0;L;;;;;N;;;;; +1D80C;SIGNWRITING HAND-FIST INDEX HINGED LOW;So;0;L;;;;;N;;;;; +1D80D;SIGNWRITING HAND-CIRCLE INDEX HINGE;So;0;L;;;;;N;;;;; +1D80E;SIGNWRITING HAND-FIST INDEX MIDDLE;So;0;L;;;;;N;;;;; +1D80F;SIGNWRITING HAND-CIRCLE INDEX MIDDLE;So;0;L;;;;;N;;;;; +1D810;SIGNWRITING HAND-FIST INDEX MIDDLE BENT;So;0;L;;;;;N;;;;; +1D811;SIGNWRITING HAND-FIST INDEX MIDDLE RAISED KNUCKLES;So;0;L;;;;;N;;;;; +1D812;SIGNWRITING HAND-FIST INDEX MIDDLE HINGED;So;0;L;;;;;N;;;;; +1D813;SIGNWRITING HAND-FIST INDEX UP MIDDLE HINGED;So;0;L;;;;;N;;;;; +1D814;SIGNWRITING HAND-FIST INDEX HINGED MIDDLE UP;So;0;L;;;;;N;;;;; +1D815;SIGNWRITING HAND-FIST INDEX MIDDLE CONJOINED;So;0;L;;;;;N;;;;; +1D816;SIGNWRITING HAND-FIST INDEX MIDDLE CONJOINED INDEX BENT;So;0;L;;;;;N;;;;; +1D817;SIGNWRITING HAND-FIST INDEX MIDDLE CONJOINED MIDDLE BENT;So;0;L;;;;;N;;;;; +1D818;SIGNWRITING HAND-FIST INDEX MIDDLE CONJOINED CUPPED;So;0;L;;;;;N;;;;; +1D819;SIGNWRITING HAND-FIST INDEX MIDDLE CONJOINED HINGED;So;0;L;;;;;N;;;;; +1D81A;SIGNWRITING HAND-FIST INDEX MIDDLE CROSSED;So;0;L;;;;;N;;;;; +1D81B;SIGNWRITING HAND-CIRCLE INDEX MIDDLE CROSSED;So;0;L;;;;;N;;;;; +1D81C;SIGNWRITING HAND-FIST MIDDLE BENT OVER INDEX;So;0;L;;;;;N;;;;; +1D81D;SIGNWRITING HAND-FIST INDEX BENT OVER MIDDLE;So;0;L;;;;;N;;;;; +1D81E;SIGNWRITING HAND-FIST INDEX MIDDLE THUMB;So;0;L;;;;;N;;;;; +1D81F;SIGNWRITING HAND-CIRCLE INDEX MIDDLE THUMB;So;0;L;;;;;N;;;;; +1D820;SIGNWRITING HAND-FIST INDEX MIDDLE STRAIGHT THUMB BENT;So;0;L;;;;;N;;;;; +1D821;SIGNWRITING HAND-FIST INDEX MIDDLE BENT THUMB STRAIGHT;So;0;L;;;;;N;;;;; +1D822;SIGNWRITING HAND-FIST INDEX MIDDLE THUMB BENT;So;0;L;;;;;N;;;;; +1D823;SIGNWRITING HAND-FIST INDEX MIDDLE HINGED SPREAD THUMB SIDE;So;0;L;;;;;N;;;;; +1D824;SIGNWRITING HAND-FIST INDEX UP MIDDLE HINGED THUMB SIDE;So;0;L;;;;;N;;;;; +1D825;SIGNWRITING HAND-FIST INDEX UP MIDDLE HINGED THUMB CONJOINED;So;0;L;;;;;N;;;;; +1D826;SIGNWRITING HAND-FIST INDEX HINGED MIDDLE UP THUMB SIDE;So;0;L;;;;;N;;;;; +1D827;SIGNWRITING HAND-FIST INDEX MIDDLE UP SPREAD THUMB FORWARD;So;0;L;;;;;N;;;;; +1D828;SIGNWRITING HAND-FIST INDEX MIDDLE THUMB CUPPED;So;0;L;;;;;N;;;;; +1D829;SIGNWRITING HAND-FIST INDEX MIDDLE THUMB CIRCLED;So;0;L;;;;;N;;;;; +1D82A;SIGNWRITING HAND-FIST INDEX MIDDLE THUMB HOOKED;So;0;L;;;;;N;;;;; +1D82B;SIGNWRITING HAND-FIST INDEX MIDDLE THUMB HINGED;So;0;L;;;;;N;;;;; +1D82C;SIGNWRITING HAND-FIST THUMB BETWEEN INDEX MIDDLE STRAIGHT;So;0;L;;;;;N;;;;; +1D82D;SIGNWRITING HAND-FIST INDEX MIDDLE CONJOINED THUMB SIDE;So;0;L;;;;;N;;;;; +1D82E;SIGNWRITING HAND-FIST INDEX MIDDLE CONJOINED THUMB SIDE CONJOINED;So;0;L;;;;;N;;;;; +1D82F;SIGNWRITING HAND-FIST INDEX MIDDLE CONJOINED THUMB SIDE BENT;So;0;L;;;;;N;;;;; +1D830;SIGNWRITING HAND-FIST MIDDLE THUMB HOOKED INDEX UP;So;0;L;;;;;N;;;;; +1D831;SIGNWRITING HAND-FIST INDEX THUMB HOOKED MIDDLE UP;So;0;L;;;;;N;;;;; +1D832;SIGNWRITING HAND-FIST INDEX MIDDLE CONJOINED HINGED THUMB SIDE;So;0;L;;;;;N;;;;; +1D833;SIGNWRITING HAND-FIST INDEX MIDDLE CROSSED THUMB SIDE;So;0;L;;;;;N;;;;; +1D834;SIGNWRITING HAND-FIST INDEX MIDDLE CONJOINED THUMB FORWARD;So;0;L;;;;;N;;;;; +1D835;SIGNWRITING HAND-FIST INDEX MIDDLE CONJOINED CUPPED THUMB FORWARD;So;0;L;;;;;N;;;;; +1D836;SIGNWRITING HAND-FIST MIDDLE THUMB CUPPED INDEX UP;So;0;L;;;;;N;;;;; +1D837;SIGNWRITING HAND-FIST INDEX THUMB CUPPED MIDDLE UP;So;0;L;;;;;N;;;;; +1D838;SIGNWRITING HAND-FIST MIDDLE THUMB CIRCLED INDEX UP;So;0;L;;;;;N;;;;; +1D839;SIGNWRITING HAND-FIST MIDDLE THUMB CIRCLED INDEX HINGED;So;0;L;;;;;N;;;;; +1D83A;SIGNWRITING HAND-FIST INDEX THUMB ANGLED OUT MIDDLE UP;So;0;L;;;;;N;;;;; +1D83B;SIGNWRITING HAND-FIST INDEX THUMB ANGLED IN MIDDLE UP;So;0;L;;;;;N;;;;; +1D83C;SIGNWRITING HAND-FIST INDEX THUMB CIRCLED MIDDLE UP;So;0;L;;;;;N;;;;; +1D83D;SIGNWRITING HAND-FIST INDEX MIDDLE THUMB CONJOINED HINGED;So;0;L;;;;;N;;;;; +1D83E;SIGNWRITING HAND-FIST INDEX MIDDLE THUMB ANGLED OUT;So;0;L;;;;;N;;;;; +1D83F;SIGNWRITING HAND-FIST INDEX MIDDLE THUMB ANGLED;So;0;L;;;;;N;;;;; +1D840;SIGNWRITING HAND-FIST MIDDLE THUMB ANGLED OUT INDEX UP;So;0;L;;;;;N;;;;; +1D841;SIGNWRITING HAND-FIST MIDDLE THUMB ANGLED OUT INDEX CROSSED;So;0;L;;;;;N;;;;; +1D842;SIGNWRITING HAND-FIST MIDDLE THUMB ANGLED INDEX UP;So;0;L;;;;;N;;;;; +1D843;SIGNWRITING HAND-FIST INDEX THUMB HOOKED MIDDLE HINGED;So;0;L;;;;;N;;;;; +1D844;SIGNWRITING HAND-FLAT FOUR FINGERS;So;0;L;;;;;N;;;;; +1D845;SIGNWRITING HAND-FLAT FOUR FINGERS BENT;So;0;L;;;;;N;;;;; +1D846;SIGNWRITING HAND-FLAT FOUR FINGERS HINGED;So;0;L;;;;;N;;;;; +1D847;SIGNWRITING HAND-FLAT FOUR FINGERS CONJOINED;So;0;L;;;;;N;;;;; +1D848;SIGNWRITING HAND-FLAT FOUR FINGERS CONJOINED SPLIT;So;0;L;;;;;N;;;;; +1D849;SIGNWRITING HAND-CLAW FOUR FINGERS CONJOINED;So;0;L;;;;;N;;;;; +1D84A;SIGNWRITING HAND-FIST FOUR FINGERS CONJOINED BENT;So;0;L;;;;;N;;;;; +1D84B;SIGNWRITING HAND-HINGE FOUR FINGERS CONJOINED;So;0;L;;;;;N;;;;; +1D84C;SIGNWRITING HAND-FLAT FIVE FINGERS SPREAD;So;0;L;;;;;N;;;;; +1D84D;SIGNWRITING HAND-FLAT HEEL FIVE FINGERS SPREAD;So;0;L;;;;;N;;;;; +1D84E;SIGNWRITING HAND-FLAT FIVE FINGERS SPREAD FOUR BENT;So;0;L;;;;;N;;;;; +1D84F;SIGNWRITING HAND-FLAT HEEL FIVE FINGERS SPREAD FOUR BENT;So;0;L;;;;;N;;;;; +1D850;SIGNWRITING HAND-FLAT FIVE FINGERS SPREAD BENT;So;0;L;;;;;N;;;;; +1D851;SIGNWRITING HAND-FLAT HEEL FIVE FINGERS SPREAD BENT;So;0;L;;;;;N;;;;; +1D852;SIGNWRITING HAND-FLAT FIVE FINGERS SPREAD THUMB FORWARD;So;0;L;;;;;N;;;;; +1D853;SIGNWRITING HAND-CUP FIVE FINGERS SPREAD;So;0;L;;;;;N;;;;; +1D854;SIGNWRITING HAND-CUP FIVE FINGERS SPREAD OPEN;So;0;L;;;;;N;;;;; +1D855;SIGNWRITING HAND-HINGE FIVE FINGERS SPREAD OPEN;So;0;L;;;;;N;;;;; +1D856;SIGNWRITING HAND-OVAL FIVE FINGERS SPREAD;So;0;L;;;;;N;;;;; +1D857;SIGNWRITING HAND-FLAT FIVE FINGERS SPREAD HINGED;So;0;L;;;;;N;;;;; +1D858;SIGNWRITING HAND-FLAT FIVE FINGERS SPREAD HINGED THUMB SIDE;So;0;L;;;;;N;;;;; +1D859;SIGNWRITING HAND-FLAT FIVE FINGERS SPREAD HINGED NO THUMB;So;0;L;;;;;N;;;;; +1D85A;SIGNWRITING HAND-FLAT;So;0;L;;;;;N;;;;; +1D85B;SIGNWRITING HAND-FLAT BETWEEN PALM FACINGS;So;0;L;;;;;N;;;;; +1D85C;SIGNWRITING HAND-FLAT HEEL;So;0;L;;;;;N;;;;; +1D85D;SIGNWRITING HAND-FLAT THUMB SIDE;So;0;L;;;;;N;;;;; +1D85E;SIGNWRITING HAND-FLAT HEEL THUMB SIDE;So;0;L;;;;;N;;;;; +1D85F;SIGNWRITING HAND-FLAT THUMB BENT;So;0;L;;;;;N;;;;; +1D860;SIGNWRITING HAND-FLAT THUMB FORWARD;So;0;L;;;;;N;;;;; +1D861;SIGNWRITING HAND-FLAT SPLIT INDEX THUMB SIDE;So;0;L;;;;;N;;;;; +1D862;SIGNWRITING HAND-FLAT SPLIT CENTRE;So;0;L;;;;;N;;;;; +1D863;SIGNWRITING HAND-FLAT SPLIT CENTRE THUMB SIDE;So;0;L;;;;;N;;;;; +1D864;SIGNWRITING HAND-FLAT SPLIT CENTRE THUMB SIDE BENT;So;0;L;;;;;N;;;;; +1D865;SIGNWRITING HAND-FLAT SPLIT LITTLE;So;0;L;;;;;N;;;;; +1D866;SIGNWRITING HAND-CLAW;So;0;L;;;;;N;;;;; +1D867;SIGNWRITING HAND-CLAW THUMB SIDE;So;0;L;;;;;N;;;;; +1D868;SIGNWRITING HAND-CLAW NO THUMB;So;0;L;;;;;N;;;;; +1D869;SIGNWRITING HAND-CLAW THUMB FORWARD;So;0;L;;;;;N;;;;; +1D86A;SIGNWRITING HAND-HOOK CURLICUE;So;0;L;;;;;N;;;;; +1D86B;SIGNWRITING HAND-HOOK;So;0;L;;;;;N;;;;; +1D86C;SIGNWRITING HAND-CUP OPEN;So;0;L;;;;;N;;;;; +1D86D;SIGNWRITING HAND-CUP;So;0;L;;;;;N;;;;; +1D86E;SIGNWRITING HAND-CUP OPEN THUMB SIDE;So;0;L;;;;;N;;;;; +1D86F;SIGNWRITING HAND-CUP THUMB SIDE;So;0;L;;;;;N;;;;; +1D870;SIGNWRITING HAND-CUP OPEN NO THUMB;So;0;L;;;;;N;;;;; +1D871;SIGNWRITING HAND-CUP NO THUMB;So;0;L;;;;;N;;;;; +1D872;SIGNWRITING HAND-CUP OPEN THUMB FORWARD;So;0;L;;;;;N;;;;; +1D873;SIGNWRITING HAND-CUP THUMB FORWARD;So;0;L;;;;;N;;;;; +1D874;SIGNWRITING HAND-CURLICUE OPEN;So;0;L;;;;;N;;;;; +1D875;SIGNWRITING HAND-CURLICUE;So;0;L;;;;;N;;;;; +1D876;SIGNWRITING HAND-CIRCLE;So;0;L;;;;;N;;;;; +1D877;SIGNWRITING HAND-OVAL;So;0;L;;;;;N;;;;; +1D878;SIGNWRITING HAND-OVAL THUMB SIDE;So;0;L;;;;;N;;;;; +1D879;SIGNWRITING HAND-OVAL NO THUMB;So;0;L;;;;;N;;;;; +1D87A;SIGNWRITING HAND-OVAL THUMB FORWARD;So;0;L;;;;;N;;;;; +1D87B;SIGNWRITING HAND-HINGE OPEN;So;0;L;;;;;N;;;;; +1D87C;SIGNWRITING HAND-HINGE OPEN THUMB FORWARD;So;0;L;;;;;N;;;;; +1D87D;SIGNWRITING HAND-HINGE;So;0;L;;;;;N;;;;; +1D87E;SIGNWRITING HAND-HINGE SMALL;So;0;L;;;;;N;;;;; +1D87F;SIGNWRITING HAND-HINGE OPEN THUMB SIDE;So;0;L;;;;;N;;;;; +1D880;SIGNWRITING HAND-HINGE THUMB SIDE;So;0;L;;;;;N;;;;; +1D881;SIGNWRITING HAND-HINGE OPEN NO THUMB;So;0;L;;;;;N;;;;; +1D882;SIGNWRITING HAND-HINGE NO THUMB;So;0;L;;;;;N;;;;; +1D883;SIGNWRITING HAND-HINGE THUMB SIDE TOUCHING INDEX;So;0;L;;;;;N;;;;; +1D884;SIGNWRITING HAND-HINGE THUMB BETWEEN MIDDLE RING;So;0;L;;;;;N;;;;; +1D885;SIGNWRITING HAND-ANGLE;So;0;L;;;;;N;;;;; +1D886;SIGNWRITING HAND-FIST INDEX MIDDLE RING;So;0;L;;;;;N;;;;; +1D887;SIGNWRITING HAND-CIRCLE INDEX MIDDLE RING;So;0;L;;;;;N;;;;; +1D888;SIGNWRITING HAND-HINGE INDEX MIDDLE RING;So;0;L;;;;;N;;;;; +1D889;SIGNWRITING HAND-ANGLE INDEX MIDDLE RING;So;0;L;;;;;N;;;;; +1D88A;SIGNWRITING HAND-HINGE LITTLE;So;0;L;;;;;N;;;;; +1D88B;SIGNWRITING HAND-FIST INDEX MIDDLE RING BENT;So;0;L;;;;;N;;;;; +1D88C;SIGNWRITING HAND-FIST INDEX MIDDLE RING CONJOINED;So;0;L;;;;;N;;;;; +1D88D;SIGNWRITING HAND-HINGE INDEX MIDDLE RING CONJOINED;So;0;L;;;;;N;;;;; +1D88E;SIGNWRITING HAND-FIST LITTLE DOWN;So;0;L;;;;;N;;;;; +1D88F;SIGNWRITING HAND-FIST LITTLE DOWN RIPPLE STRAIGHT;So;0;L;;;;;N;;;;; +1D890;SIGNWRITING HAND-FIST LITTLE DOWN RIPPLE CURVED;So;0;L;;;;;N;;;;; +1D891;SIGNWRITING HAND-FIST LITTLE DOWN OTHERS CIRCLED;So;0;L;;;;;N;;;;; +1D892;SIGNWRITING HAND-FIST LITTLE UP;So;0;L;;;;;N;;;;; +1D893;SIGNWRITING HAND-FIST THUMB UNDER LITTLE UP;So;0;L;;;;;N;;;;; +1D894;SIGNWRITING HAND-CIRCLE LITTLE UP;So;0;L;;;;;N;;;;; +1D895;SIGNWRITING HAND-OVAL LITTLE UP;So;0;L;;;;;N;;;;; +1D896;SIGNWRITING HAND-ANGLE LITTLE UP;So;0;L;;;;;N;;;;; +1D897;SIGNWRITING HAND-FIST LITTLE RAISED KNUCKLE;So;0;L;;;;;N;;;;; +1D898;SIGNWRITING HAND-FIST LITTLE BENT;So;0;L;;;;;N;;;;; +1D899;SIGNWRITING HAND-FIST LITTLE TOUCHES THUMB;So;0;L;;;;;N;;;;; +1D89A;SIGNWRITING HAND-FIST LITTLE THUMB;So;0;L;;;;;N;;;;; +1D89B;SIGNWRITING HAND-HINGE LITTLE THUMB;So;0;L;;;;;N;;;;; +1D89C;SIGNWRITING HAND-FIST LITTLE INDEX THUMB;So;0;L;;;;;N;;;;; +1D89D;SIGNWRITING HAND-HINGE LITTLE INDEX THUMB;So;0;L;;;;;N;;;;; +1D89E;SIGNWRITING HAND-ANGLE LITTLE INDEX THUMB INDEX THUMB OUT;So;0;L;;;;;N;;;;; +1D89F;SIGNWRITING HAND-ANGLE LITTLE INDEX THUMB INDEX THUMB;So;0;L;;;;;N;;;;; +1D8A0;SIGNWRITING HAND-FIST LITTLE INDEX;So;0;L;;;;;N;;;;; +1D8A1;SIGNWRITING HAND-CIRCLE LITTLE INDEX;So;0;L;;;;;N;;;;; +1D8A2;SIGNWRITING HAND-HINGE LITTLE INDEX;So;0;L;;;;;N;;;;; +1D8A3;SIGNWRITING HAND-ANGLE LITTLE INDEX;So;0;L;;;;;N;;;;; +1D8A4;SIGNWRITING HAND-FIST INDEX MIDDLE LITTLE;So;0;L;;;;;N;;;;; +1D8A5;SIGNWRITING HAND-CIRCLE INDEX MIDDLE LITTLE;So;0;L;;;;;N;;;;; +1D8A6;SIGNWRITING HAND-HINGE INDEX MIDDLE LITTLE;So;0;L;;;;;N;;;;; +1D8A7;SIGNWRITING HAND-HINGE RING;So;0;L;;;;;N;;;;; +1D8A8;SIGNWRITING HAND-ANGLE INDEX MIDDLE LITTLE;So;0;L;;;;;N;;;;; +1D8A9;SIGNWRITING HAND-FIST INDEX MIDDLE CROSS LITTLE;So;0;L;;;;;N;;;;; +1D8AA;SIGNWRITING HAND-CIRCLE INDEX MIDDLE CROSS LITTLE;So;0;L;;;;;N;;;;; +1D8AB;SIGNWRITING HAND-FIST RING DOWN;So;0;L;;;;;N;;;;; +1D8AC;SIGNWRITING HAND-HINGE RING DOWN INDEX THUMB HOOK MIDDLE;So;0;L;;;;;N;;;;; +1D8AD;SIGNWRITING HAND-ANGLE RING DOWN MIDDLE THUMB INDEX CROSS;So;0;L;;;;;N;;;;; +1D8AE;SIGNWRITING HAND-FIST RING UP;So;0;L;;;;;N;;;;; +1D8AF;SIGNWRITING HAND-FIST RING RAISED KNUCKLE;So;0;L;;;;;N;;;;; +1D8B0;SIGNWRITING HAND-FIST RING LITTLE;So;0;L;;;;;N;;;;; +1D8B1;SIGNWRITING HAND-CIRCLE RING LITTLE;So;0;L;;;;;N;;;;; +1D8B2;SIGNWRITING HAND-OVAL RING LITTLE;So;0;L;;;;;N;;;;; +1D8B3;SIGNWRITING HAND-ANGLE RING LITTLE;So;0;L;;;;;N;;;;; +1D8B4;SIGNWRITING HAND-FIST RING MIDDLE;So;0;L;;;;;N;;;;; +1D8B5;SIGNWRITING HAND-FIST RING MIDDLE CONJOINED;So;0;L;;;;;N;;;;; +1D8B6;SIGNWRITING HAND-FIST RING MIDDLE RAISED KNUCKLES;So;0;L;;;;;N;;;;; +1D8B7;SIGNWRITING HAND-FIST RING INDEX;So;0;L;;;;;N;;;;; +1D8B8;SIGNWRITING HAND-FIST RING THUMB;So;0;L;;;;;N;;;;; +1D8B9;SIGNWRITING HAND-HOOK RING THUMB;So;0;L;;;;;N;;;;; +1D8BA;SIGNWRITING HAND-FIST INDEX RING LITTLE;So;0;L;;;;;N;;;;; +1D8BB;SIGNWRITING HAND-CIRCLE INDEX RING LITTLE;So;0;L;;;;;N;;;;; +1D8BC;SIGNWRITING HAND-CURLICUE INDEX RING LITTLE ON;So;0;L;;;;;N;;;;; +1D8BD;SIGNWRITING HAND-HOOK INDEX RING LITTLE OUT;So;0;L;;;;;N;;;;; +1D8BE;SIGNWRITING HAND-HOOK INDEX RING LITTLE IN;So;0;L;;;;;N;;;;; +1D8BF;SIGNWRITING HAND-HOOK INDEX RING LITTLE UNDER;So;0;L;;;;;N;;;;; +1D8C0;SIGNWRITING HAND-CUP INDEX RING LITTLE;So;0;L;;;;;N;;;;; +1D8C1;SIGNWRITING HAND-HINGE INDEX RING LITTLE;So;0;L;;;;;N;;;;; +1D8C2;SIGNWRITING HAND-ANGLE INDEX RING LITTLE OUT;So;0;L;;;;;N;;;;; +1D8C3;SIGNWRITING HAND-ANGLE INDEX RING LITTLE;So;0;L;;;;;N;;;;; +1D8C4;SIGNWRITING HAND-FIST MIDDLE DOWN;So;0;L;;;;;N;;;;; +1D8C5;SIGNWRITING HAND-HINGE MIDDLE;So;0;L;;;;;N;;;;; +1D8C6;SIGNWRITING HAND-FIST MIDDLE UP;So;0;L;;;;;N;;;;; +1D8C7;SIGNWRITING HAND-CIRCLE MIDDLE UP;So;0;L;;;;;N;;;;; +1D8C8;SIGNWRITING HAND-FIST MIDDLE RAISED KNUCKLE;So;0;L;;;;;N;;;;; +1D8C9;SIGNWRITING HAND-FIST MIDDLE UP THUMB SIDE;So;0;L;;;;;N;;;;; +1D8CA;SIGNWRITING HAND-HOOK MIDDLE THUMB;So;0;L;;;;;N;;;;; +1D8CB;SIGNWRITING HAND-FIST MIDDLE THUMB LITTLE;So;0;L;;;;;N;;;;; +1D8CC;SIGNWRITING HAND-FIST MIDDLE LITTLE;So;0;L;;;;;N;;;;; +1D8CD;SIGNWRITING HAND-FIST MIDDLE RING LITTLE;So;0;L;;;;;N;;;;; +1D8CE;SIGNWRITING HAND-CIRCLE MIDDLE RING LITTLE;So;0;L;;;;;N;;;;; +1D8CF;SIGNWRITING HAND-CURLICUE MIDDLE RING LITTLE ON;So;0;L;;;;;N;;;;; +1D8D0;SIGNWRITING HAND-CUP MIDDLE RING LITTLE;So;0;L;;;;;N;;;;; +1D8D1;SIGNWRITING HAND-HINGE MIDDLE RING LITTLE;So;0;L;;;;;N;;;;; +1D8D2;SIGNWRITING HAND-ANGLE MIDDLE RING LITTLE OUT;So;0;L;;;;;N;;;;; +1D8D3;SIGNWRITING HAND-ANGLE MIDDLE RING LITTLE IN;So;0;L;;;;;N;;;;; +1D8D4;SIGNWRITING HAND-ANGLE MIDDLE RING LITTLE;So;0;L;;;;;N;;;;; +1D8D5;SIGNWRITING HAND-CIRCLE MIDDLE RING LITTLE BENT;So;0;L;;;;;N;;;;; +1D8D6;SIGNWRITING HAND-CLAW MIDDLE RING LITTLE CONJOINED;So;0;L;;;;;N;;;;; +1D8D7;SIGNWRITING HAND-CLAW MIDDLE RING LITTLE CONJOINED SIDE;So;0;L;;;;;N;;;;; +1D8D8;SIGNWRITING HAND-HOOK MIDDLE RING LITTLE CONJOINED OUT;So;0;L;;;;;N;;;;; +1D8D9;SIGNWRITING HAND-HOOK MIDDLE RING LITTLE CONJOINED IN;So;0;L;;;;;N;;;;; +1D8DA;SIGNWRITING HAND-HOOK MIDDLE RING LITTLE CONJOINED;So;0;L;;;;;N;;;;; +1D8DB;SIGNWRITING HAND-HINGE INDEX HINGED;So;0;L;;;;;N;;;;; +1D8DC;SIGNWRITING HAND-FIST INDEX THUMB SIDE;So;0;L;;;;;N;;;;; +1D8DD;SIGNWRITING HAND-HINGE INDEX THUMB SIDE;So;0;L;;;;;N;;;;; +1D8DE;SIGNWRITING HAND-FIST INDEX THUMB SIDE THUMB DIAGONAL;So;0;L;;;;;N;;;;; +1D8DF;SIGNWRITING HAND-FIST INDEX THUMB SIDE THUMB CONJOINED;So;0;L;;;;;N;;;;; +1D8E0;SIGNWRITING HAND-FIST INDEX THUMB SIDE THUMB BENT;So;0;L;;;;;N;;;;; +1D8E1;SIGNWRITING HAND-FIST INDEX THUMB SIDE INDEX BENT;So;0;L;;;;;N;;;;; +1D8E2;SIGNWRITING HAND-FIST INDEX THUMB SIDE BOTH BENT;So;0;L;;;;;N;;;;; +1D8E3;SIGNWRITING HAND-FIST INDEX THUMB SIDE INDEX HINGE;So;0;L;;;;;N;;;;; +1D8E4;SIGNWRITING HAND-FIST INDEX THUMB FORWARD INDEX STRAIGHT;So;0;L;;;;;N;;;;; +1D8E5;SIGNWRITING HAND-FIST INDEX THUMB FORWARD INDEX BENT;So;0;L;;;;;N;;;;; +1D8E6;SIGNWRITING HAND-FIST INDEX THUMB HOOK;So;0;L;;;;;N;;;;; +1D8E7;SIGNWRITING HAND-FIST INDEX THUMB CURLICUE;So;0;L;;;;;N;;;;; +1D8E8;SIGNWRITING HAND-FIST INDEX THUMB CURVE THUMB INSIDE;So;0;L;;;;;N;;;;; +1D8E9;SIGNWRITING HAND-CLAW INDEX THUMB CURVE THUMB INSIDE;So;0;L;;;;;N;;;;; +1D8EA;SIGNWRITING HAND-FIST INDEX THUMB CURVE THUMB UNDER;So;0;L;;;;;N;;;;; +1D8EB;SIGNWRITING HAND-FIST INDEX THUMB CIRCLE;So;0;L;;;;;N;;;;; +1D8EC;SIGNWRITING HAND-CUP INDEX THUMB;So;0;L;;;;;N;;;;; +1D8ED;SIGNWRITING HAND-CUP INDEX THUMB OPEN;So;0;L;;;;;N;;;;; +1D8EE;SIGNWRITING HAND-HINGE INDEX THUMB OPEN;So;0;L;;;;;N;;;;; +1D8EF;SIGNWRITING HAND-HINGE INDEX THUMB LARGE;So;0;L;;;;;N;;;;; +1D8F0;SIGNWRITING HAND-HINGE INDEX THUMB;So;0;L;;;;;N;;;;; +1D8F1;SIGNWRITING HAND-HINGE INDEX THUMB SMALL;So;0;L;;;;;N;;;;; +1D8F2;SIGNWRITING HAND-ANGLE INDEX THUMB OUT;So;0;L;;;;;N;;;;; +1D8F3;SIGNWRITING HAND-ANGLE INDEX THUMB IN;So;0;L;;;;;N;;;;; +1D8F4;SIGNWRITING HAND-ANGLE INDEX THUMB;So;0;L;;;;;N;;;;; +1D8F5;SIGNWRITING HAND-FIST THUMB;So;0;L;;;;;N;;;;; +1D8F6;SIGNWRITING HAND-FIST THUMB HEEL;So;0;L;;;;;N;;;;; +1D8F7;SIGNWRITING HAND-FIST THUMB SIDE DIAGONAL;So;0;L;;;;;N;;;;; +1D8F8;SIGNWRITING HAND-FIST THUMB SIDE CONJOINED;So;0;L;;;;;N;;;;; +1D8F9;SIGNWRITING HAND-FIST THUMB SIDE BENT;So;0;L;;;;;N;;;;; +1D8FA;SIGNWRITING HAND-FIST THUMB FORWARD;So;0;L;;;;;N;;;;; +1D8FB;SIGNWRITING HAND-FIST THUMB BETWEEN INDEX MIDDLE;So;0;L;;;;;N;;;;; +1D8FC;SIGNWRITING HAND-FIST THUMB BETWEEN MIDDLE RING;So;0;L;;;;;N;;;;; +1D8FD;SIGNWRITING HAND-FIST THUMB BETWEEN RING LITTLE;So;0;L;;;;;N;;;;; +1D8FE;SIGNWRITING HAND-FIST THUMB UNDER TWO FINGERS;So;0;L;;;;;N;;;;; +1D8FF;SIGNWRITING HAND-FIST THUMB OVER TWO FINGERS;So;0;L;;;;;N;;;;; +1D900;SIGNWRITING HAND-FIST THUMB UNDER THREE FINGERS;So;0;L;;;;;N;;;;; +1D901;SIGNWRITING HAND-FIST THUMB UNDER FOUR FINGERS;So;0;L;;;;;N;;;;; +1D902;SIGNWRITING HAND-FIST THUMB OVER FOUR RAISED KNUCKLES;So;0;L;;;;;N;;;;; +1D903;SIGNWRITING HAND-FIST;So;0;L;;;;;N;;;;; +1D904;SIGNWRITING HAND-FIST HEEL;So;0;L;;;;;N;;;;; +1D905;SIGNWRITING TOUCH SINGLE;So;0;L;;;;;N;;;;; +1D906;SIGNWRITING TOUCH MULTIPLE;So;0;L;;;;;N;;;;; +1D907;SIGNWRITING TOUCH BETWEEN;So;0;L;;;;;N;;;;; +1D908;SIGNWRITING GRASP SINGLE;So;0;L;;;;;N;;;;; +1D909;SIGNWRITING GRASP MULTIPLE;So;0;L;;;;;N;;;;; +1D90A;SIGNWRITING GRASP BETWEEN;So;0;L;;;;;N;;;;; +1D90B;SIGNWRITING STRIKE SINGLE;So;0;L;;;;;N;;;;; +1D90C;SIGNWRITING STRIKE MULTIPLE;So;0;L;;;;;N;;;;; +1D90D;SIGNWRITING STRIKE BETWEEN;So;0;L;;;;;N;;;;; +1D90E;SIGNWRITING BRUSH SINGLE;So;0;L;;;;;N;;;;; +1D90F;SIGNWRITING BRUSH MULTIPLE;So;0;L;;;;;N;;;;; +1D910;SIGNWRITING BRUSH BETWEEN;So;0;L;;;;;N;;;;; +1D911;SIGNWRITING RUB SINGLE;So;0;L;;;;;N;;;;; +1D912;SIGNWRITING RUB MULTIPLE;So;0;L;;;;;N;;;;; +1D913;SIGNWRITING RUB BETWEEN;So;0;L;;;;;N;;;;; +1D914;SIGNWRITING SURFACE SYMBOLS;So;0;L;;;;;N;;;;; +1D915;SIGNWRITING SURFACE BETWEEN;So;0;L;;;;;N;;;;; +1D916;SIGNWRITING SQUEEZE LARGE SINGLE;So;0;L;;;;;N;;;;; +1D917;SIGNWRITING SQUEEZE SMALL SINGLE;So;0;L;;;;;N;;;;; +1D918;SIGNWRITING SQUEEZE LARGE MULTIPLE;So;0;L;;;;;N;;;;; +1D919;SIGNWRITING SQUEEZE SMALL MULTIPLE;So;0;L;;;;;N;;;;; +1D91A;SIGNWRITING SQUEEZE SEQUENTIAL;So;0;L;;;;;N;;;;; +1D91B;SIGNWRITING FLICK LARGE SINGLE;So;0;L;;;;;N;;;;; +1D91C;SIGNWRITING FLICK SMALL SINGLE;So;0;L;;;;;N;;;;; +1D91D;SIGNWRITING FLICK LARGE MULTIPLE;So;0;L;;;;;N;;;;; +1D91E;SIGNWRITING FLICK SMALL MULTIPLE;So;0;L;;;;;N;;;;; +1D91F;SIGNWRITING FLICK SEQUENTIAL;So;0;L;;;;;N;;;;; +1D920;SIGNWRITING SQUEEZE FLICK ALTERNATING;So;0;L;;;;;N;;;;; +1D921;SIGNWRITING MOVEMENT-HINGE UP DOWN LARGE;So;0;L;;;;;N;;;;; +1D922;SIGNWRITING MOVEMENT-HINGE UP DOWN SMALL;So;0;L;;;;;N;;;;; +1D923;SIGNWRITING MOVEMENT-HINGE UP SEQUENTIAL;So;0;L;;;;;N;;;;; +1D924;SIGNWRITING MOVEMENT-HINGE DOWN SEQUENTIAL;So;0;L;;;;;N;;;;; +1D925;SIGNWRITING MOVEMENT-HINGE UP DOWN ALTERNATING LARGE;So;0;L;;;;;N;;;;; +1D926;SIGNWRITING MOVEMENT-HINGE UP DOWN ALTERNATING SMALL;So;0;L;;;;;N;;;;; +1D927;SIGNWRITING MOVEMENT-HINGE SIDE TO SIDE SCISSORS;So;0;L;;;;;N;;;;; +1D928;SIGNWRITING MOVEMENT-WALLPLANE FINGER CONTACT;So;0;L;;;;;N;;;;; +1D929;SIGNWRITING MOVEMENT-FLOORPLANE FINGER CONTACT;So;0;L;;;;;N;;;;; +1D92A;SIGNWRITING MOVEMENT-WALLPLANE SINGLE STRAIGHT SMALL;So;0;L;;;;;N;;;;; +1D92B;SIGNWRITING MOVEMENT-WALLPLANE SINGLE STRAIGHT MEDIUM;So;0;L;;;;;N;;;;; +1D92C;SIGNWRITING MOVEMENT-WALLPLANE SINGLE STRAIGHT LARGE;So;0;L;;;;;N;;;;; +1D92D;SIGNWRITING MOVEMENT-WALLPLANE SINGLE STRAIGHT LARGEST;So;0;L;;;;;N;;;;; +1D92E;SIGNWRITING MOVEMENT-WALLPLANE SINGLE WRIST FLEX;So;0;L;;;;;N;;;;; +1D92F;SIGNWRITING MOVEMENT-WALLPLANE DOUBLE STRAIGHT;So;0;L;;;;;N;;;;; +1D930;SIGNWRITING MOVEMENT-WALLPLANE DOUBLE WRIST FLEX;So;0;L;;;;;N;;;;; +1D931;SIGNWRITING MOVEMENT-WALLPLANE DOUBLE ALTERNATING;So;0;L;;;;;N;;;;; +1D932;SIGNWRITING MOVEMENT-WALLPLANE DOUBLE ALTERNATING WRIST FLEX;So;0;L;;;;;N;;;;; +1D933;SIGNWRITING MOVEMENT-WALLPLANE CROSS;So;0;L;;;;;N;;;;; +1D934;SIGNWRITING MOVEMENT-WALLPLANE TRIPLE STRAIGHT MOVEMENT;So;0;L;;;;;N;;;;; +1D935;SIGNWRITING MOVEMENT-WALLPLANE TRIPLE WRIST FLEX;So;0;L;;;;;N;;;;; +1D936;SIGNWRITING MOVEMENT-WALLPLANE TRIPLE ALTERNATING;So;0;L;;;;;N;;;;; +1D937;SIGNWRITING MOVEMENT-WALLPLANE TRIPLE ALTERNATING WRIST FLEX;So;0;L;;;;;N;;;;; +1D938;SIGNWRITING MOVEMENT-WALLPLANE BEND SMALL;So;0;L;;;;;N;;;;; +1D939;SIGNWRITING MOVEMENT-WALLPLANE BEND MEDIUM;So;0;L;;;;;N;;;;; +1D93A;SIGNWRITING MOVEMENT-WALLPLANE BEND LARGE;So;0;L;;;;;N;;;;; +1D93B;SIGNWRITING MOVEMENT-WALLPLANE CORNER SMALL;So;0;L;;;;;N;;;;; +1D93C;SIGNWRITING MOVEMENT-WALLPLANE CORNER MEDIUM;So;0;L;;;;;N;;;;; +1D93D;SIGNWRITING MOVEMENT-WALLPLANE CORNER LARGE;So;0;L;;;;;N;;;;; +1D93E;SIGNWRITING MOVEMENT-WALLPLANE CORNER ROTATION;So;0;L;;;;;N;;;;; +1D93F;SIGNWRITING MOVEMENT-WALLPLANE CHECK SMALL;So;0;L;;;;;N;;;;; +1D940;SIGNWRITING MOVEMENT-WALLPLANE CHECK MEDIUM;So;0;L;;;;;N;;;;; +1D941;SIGNWRITING MOVEMENT-WALLPLANE CHECK LARGE;So;0;L;;;;;N;;;;; +1D942;SIGNWRITING MOVEMENT-WALLPLANE BOX SMALL;So;0;L;;;;;N;;;;; +1D943;SIGNWRITING MOVEMENT-WALLPLANE BOX MEDIUM;So;0;L;;;;;N;;;;; +1D944;SIGNWRITING MOVEMENT-WALLPLANE BOX LARGE;So;0;L;;;;;N;;;;; +1D945;SIGNWRITING MOVEMENT-WALLPLANE ZIGZAG SMALL;So;0;L;;;;;N;;;;; +1D946;SIGNWRITING MOVEMENT-WALLPLANE ZIGZAG MEDIUM;So;0;L;;;;;N;;;;; +1D947;SIGNWRITING MOVEMENT-WALLPLANE ZIGZAG LARGE;So;0;L;;;;;N;;;;; +1D948;SIGNWRITING MOVEMENT-WALLPLANE PEAKS SMALL;So;0;L;;;;;N;;;;; +1D949;SIGNWRITING MOVEMENT-WALLPLANE PEAKS MEDIUM;So;0;L;;;;;N;;;;; +1D94A;SIGNWRITING MOVEMENT-WALLPLANE PEAKS LARGE;So;0;L;;;;;N;;;;; +1D94B;SIGNWRITING TRAVEL-WALLPLANE ROTATION-WALLPLANE SINGLE;So;0;L;;;;;N;;;;; +1D94C;SIGNWRITING TRAVEL-WALLPLANE ROTATION-WALLPLANE DOUBLE;So;0;L;;;;;N;;;;; +1D94D;SIGNWRITING TRAVEL-WALLPLANE ROTATION-WALLPLANE ALTERNATING;So;0;L;;;;;N;;;;; +1D94E;SIGNWRITING TRAVEL-WALLPLANE ROTATION-FLOORPLANE SINGLE;So;0;L;;;;;N;;;;; +1D94F;SIGNWRITING TRAVEL-WALLPLANE ROTATION-FLOORPLANE DOUBLE;So;0;L;;;;;N;;;;; +1D950;SIGNWRITING TRAVEL-WALLPLANE ROTATION-FLOORPLANE ALTERNATING;So;0;L;;;;;N;;;;; +1D951;SIGNWRITING TRAVEL-WALLPLANE SHAKING;So;0;L;;;;;N;;;;; +1D952;SIGNWRITING TRAVEL-WALLPLANE ARM SPIRAL SINGLE;So;0;L;;;;;N;;;;; +1D953;SIGNWRITING TRAVEL-WALLPLANE ARM SPIRAL DOUBLE;So;0;L;;;;;N;;;;; +1D954;SIGNWRITING TRAVEL-WALLPLANE ARM SPIRAL TRIPLE;So;0;L;;;;;N;;;;; +1D955;SIGNWRITING MOVEMENT-DIAGONAL AWAY SMALL;So;0;L;;;;;N;;;;; +1D956;SIGNWRITING MOVEMENT-DIAGONAL AWAY MEDIUM;So;0;L;;;;;N;;;;; +1D957;SIGNWRITING MOVEMENT-DIAGONAL AWAY LARGE;So;0;L;;;;;N;;;;; +1D958;SIGNWRITING MOVEMENT-DIAGONAL AWAY LARGEST;So;0;L;;;;;N;;;;; +1D959;SIGNWRITING MOVEMENT-DIAGONAL TOWARDS SMALL;So;0;L;;;;;N;;;;; +1D95A;SIGNWRITING MOVEMENT-DIAGONAL TOWARDS MEDIUM;So;0;L;;;;;N;;;;; +1D95B;SIGNWRITING MOVEMENT-DIAGONAL TOWARDS LARGE;So;0;L;;;;;N;;;;; +1D95C;SIGNWRITING MOVEMENT-DIAGONAL TOWARDS LARGEST;So;0;L;;;;;N;;;;; +1D95D;SIGNWRITING MOVEMENT-DIAGONAL BETWEEN AWAY SMALL;So;0;L;;;;;N;;;;; +1D95E;SIGNWRITING MOVEMENT-DIAGONAL BETWEEN AWAY MEDIUM;So;0;L;;;;;N;;;;; +1D95F;SIGNWRITING MOVEMENT-DIAGONAL BETWEEN AWAY LARGE;So;0;L;;;;;N;;;;; +1D960;SIGNWRITING MOVEMENT-DIAGONAL BETWEEN AWAY LARGEST;So;0;L;;;;;N;;;;; +1D961;SIGNWRITING MOVEMENT-DIAGONAL BETWEEN TOWARDS SMALL;So;0;L;;;;;N;;;;; +1D962;SIGNWRITING MOVEMENT-DIAGONAL BETWEEN TOWARDS MEDIUM;So;0;L;;;;;N;;;;; +1D963;SIGNWRITING MOVEMENT-DIAGONAL BETWEEN TOWARDS LARGE;So;0;L;;;;;N;;;;; +1D964;SIGNWRITING MOVEMENT-DIAGONAL BETWEEN TOWARDS LARGEST;So;0;L;;;;;N;;;;; +1D965;SIGNWRITING MOVEMENT-FLOORPLANE SINGLE STRAIGHT SMALL;So;0;L;;;;;N;;;;; +1D966;SIGNWRITING MOVEMENT-FLOORPLANE SINGLE STRAIGHT MEDIUM;So;0;L;;;;;N;;;;; +1D967;SIGNWRITING MOVEMENT-FLOORPLANE SINGLE STRAIGHT LARGE;So;0;L;;;;;N;;;;; +1D968;SIGNWRITING MOVEMENT-FLOORPLANE SINGLE STRAIGHT LARGEST;So;0;L;;;;;N;;;;; +1D969;SIGNWRITING MOVEMENT-FLOORPLANE SINGLE WRIST FLEX;So;0;L;;;;;N;;;;; +1D96A;SIGNWRITING MOVEMENT-FLOORPLANE DOUBLE STRAIGHT;So;0;L;;;;;N;;;;; +1D96B;SIGNWRITING MOVEMENT-FLOORPLANE DOUBLE WRIST FLEX;So;0;L;;;;;N;;;;; +1D96C;SIGNWRITING MOVEMENT-FLOORPLANE DOUBLE ALTERNATING;So;0;L;;;;;N;;;;; +1D96D;SIGNWRITING MOVEMENT-FLOORPLANE DOUBLE ALTERNATING WRIST FLEX;So;0;L;;;;;N;;;;; +1D96E;SIGNWRITING MOVEMENT-FLOORPLANE CROSS;So;0;L;;;;;N;;;;; +1D96F;SIGNWRITING MOVEMENT-FLOORPLANE TRIPLE STRAIGHT MOVEMENT;So;0;L;;;;;N;;;;; +1D970;SIGNWRITING MOVEMENT-FLOORPLANE TRIPLE WRIST FLEX;So;0;L;;;;;N;;;;; +1D971;SIGNWRITING MOVEMENT-FLOORPLANE TRIPLE ALTERNATING MOVEMENT;So;0;L;;;;;N;;;;; +1D972;SIGNWRITING MOVEMENT-FLOORPLANE TRIPLE ALTERNATING WRIST FLEX;So;0;L;;;;;N;;;;; +1D973;SIGNWRITING MOVEMENT-FLOORPLANE BEND;So;0;L;;;;;N;;;;; +1D974;SIGNWRITING MOVEMENT-FLOORPLANE CORNER SMALL;So;0;L;;;;;N;;;;; +1D975;SIGNWRITING MOVEMENT-FLOORPLANE CORNER MEDIUM;So;0;L;;;;;N;;;;; +1D976;SIGNWRITING MOVEMENT-FLOORPLANE CORNER LARGE;So;0;L;;;;;N;;;;; +1D977;SIGNWRITING MOVEMENT-FLOORPLANE CHECK;So;0;L;;;;;N;;;;; +1D978;SIGNWRITING MOVEMENT-FLOORPLANE BOX SMALL;So;0;L;;;;;N;;;;; +1D979;SIGNWRITING MOVEMENT-FLOORPLANE BOX MEDIUM;So;0;L;;;;;N;;;;; +1D97A;SIGNWRITING MOVEMENT-FLOORPLANE BOX LARGE;So;0;L;;;;;N;;;;; +1D97B;SIGNWRITING MOVEMENT-FLOORPLANE ZIGZAG SMALL;So;0;L;;;;;N;;;;; +1D97C;SIGNWRITING MOVEMENT-FLOORPLANE ZIGZAG MEDIUM;So;0;L;;;;;N;;;;; +1D97D;SIGNWRITING MOVEMENT-FLOORPLANE ZIGZAG LARGE;So;0;L;;;;;N;;;;; +1D97E;SIGNWRITING MOVEMENT-FLOORPLANE PEAKS SMALL;So;0;L;;;;;N;;;;; +1D97F;SIGNWRITING MOVEMENT-FLOORPLANE PEAKS MEDIUM;So;0;L;;;;;N;;;;; +1D980;SIGNWRITING MOVEMENT-FLOORPLANE PEAKS LARGE;So;0;L;;;;;N;;;;; +1D981;SIGNWRITING TRAVEL-FLOORPLANE ROTATION-FLOORPLANE SINGLE;So;0;L;;;;;N;;;;; +1D982;SIGNWRITING TRAVEL-FLOORPLANE ROTATION-FLOORPLANE DOUBLE;So;0;L;;;;;N;;;;; +1D983;SIGNWRITING TRAVEL-FLOORPLANE ROTATION-FLOORPLANE ALTERNATING;So;0;L;;;;;N;;;;; +1D984;SIGNWRITING TRAVEL-FLOORPLANE ROTATION-WALLPLANE SINGLE;So;0;L;;;;;N;;;;; +1D985;SIGNWRITING TRAVEL-FLOORPLANE ROTATION-WALLPLANE DOUBLE;So;0;L;;;;;N;;;;; +1D986;SIGNWRITING TRAVEL-FLOORPLANE ROTATION-WALLPLANE ALTERNATING;So;0;L;;;;;N;;;;; +1D987;SIGNWRITING TRAVEL-FLOORPLANE SHAKING;So;0;L;;;;;N;;;;; +1D988;SIGNWRITING MOVEMENT-WALLPLANE CURVE QUARTER SMALL;So;0;L;;;;;N;;;;; +1D989;SIGNWRITING MOVEMENT-WALLPLANE CURVE QUARTER MEDIUM;So;0;L;;;;;N;;;;; +1D98A;SIGNWRITING MOVEMENT-WALLPLANE CURVE QUARTER LARGE;So;0;L;;;;;N;;;;; +1D98B;SIGNWRITING MOVEMENT-WALLPLANE CURVE QUARTER LARGEST;So;0;L;;;;;N;;;;; +1D98C;SIGNWRITING MOVEMENT-WALLPLANE CURVE HALF-CIRCLE SMALL;So;0;L;;;;;N;;;;; +1D98D;SIGNWRITING MOVEMENT-WALLPLANE CURVE HALF-CIRCLE MEDIUM;So;0;L;;;;;N;;;;; +1D98E;SIGNWRITING MOVEMENT-WALLPLANE CURVE HALF-CIRCLE LARGE;So;0;L;;;;;N;;;;; +1D98F;SIGNWRITING MOVEMENT-WALLPLANE CURVE HALF-CIRCLE LARGEST;So;0;L;;;;;N;;;;; +1D990;SIGNWRITING MOVEMENT-WALLPLANE CURVE THREE-QUARTER CIRCLE SMALL;So;0;L;;;;;N;;;;; +1D991;SIGNWRITING MOVEMENT-WALLPLANE CURVE THREE-QUARTER CIRCLE MEDIUM;So;0;L;;;;;N;;;;; +1D992;SIGNWRITING MOVEMENT-WALLPLANE HUMP SMALL;So;0;L;;;;;N;;;;; +1D993;SIGNWRITING MOVEMENT-WALLPLANE HUMP MEDIUM;So;0;L;;;;;N;;;;; +1D994;SIGNWRITING MOVEMENT-WALLPLANE HUMP LARGE;So;0;L;;;;;N;;;;; +1D995;SIGNWRITING MOVEMENT-WALLPLANE LOOP SMALL;So;0;L;;;;;N;;;;; +1D996;SIGNWRITING MOVEMENT-WALLPLANE LOOP MEDIUM;So;0;L;;;;;N;;;;; +1D997;SIGNWRITING MOVEMENT-WALLPLANE LOOP LARGE;So;0;L;;;;;N;;;;; +1D998;SIGNWRITING MOVEMENT-WALLPLANE LOOP SMALL DOUBLE;So;0;L;;;;;N;;;;; +1D999;SIGNWRITING MOVEMENT-WALLPLANE WAVE CURVE DOUBLE SMALL;So;0;L;;;;;N;;;;; +1D99A;SIGNWRITING MOVEMENT-WALLPLANE WAVE CURVE DOUBLE MEDIUM;So;0;L;;;;;N;;;;; +1D99B;SIGNWRITING MOVEMENT-WALLPLANE WAVE CURVE DOUBLE LARGE;So;0;L;;;;;N;;;;; +1D99C;SIGNWRITING MOVEMENT-WALLPLANE WAVE CURVE TRIPLE SMALL;So;0;L;;;;;N;;;;; +1D99D;SIGNWRITING MOVEMENT-WALLPLANE WAVE CURVE TRIPLE MEDIUM;So;0;L;;;;;N;;;;; +1D99E;SIGNWRITING MOVEMENT-WALLPLANE WAVE CURVE TRIPLE LARGE;So;0;L;;;;;N;;;;; +1D99F;SIGNWRITING MOVEMENT-WALLPLANE CURVE THEN STRAIGHT;So;0;L;;;;;N;;;;; +1D9A0;SIGNWRITING MOVEMENT-WALLPLANE CURVED CROSS SMALL;So;0;L;;;;;N;;;;; +1D9A1;SIGNWRITING MOVEMENT-WALLPLANE CURVED CROSS MEDIUM;So;0;L;;;;;N;;;;; +1D9A2;SIGNWRITING ROTATION-WALLPLANE SINGLE;So;0;L;;;;;N;;;;; +1D9A3;SIGNWRITING ROTATION-WALLPLANE DOUBLE;So;0;L;;;;;N;;;;; +1D9A4;SIGNWRITING ROTATION-WALLPLANE ALTERNATE;So;0;L;;;;;N;;;;; +1D9A5;SIGNWRITING MOVEMENT-WALLPLANE SHAKING;So;0;L;;;;;N;;;;; +1D9A6;SIGNWRITING MOVEMENT-WALLPLANE CURVE HITTING FRONT WALL;So;0;L;;;;;N;;;;; +1D9A7;SIGNWRITING MOVEMENT-WALLPLANE HUMP HITTING FRONT WALL;So;0;L;;;;;N;;;;; +1D9A8;SIGNWRITING MOVEMENT-WALLPLANE LOOP HITTING FRONT WALL;So;0;L;;;;;N;;;;; +1D9A9;SIGNWRITING MOVEMENT-WALLPLANE WAVE HITTING FRONT WALL;So;0;L;;;;;N;;;;; +1D9AA;SIGNWRITING ROTATION-WALLPLANE SINGLE HITTING FRONT WALL;So;0;L;;;;;N;;;;; +1D9AB;SIGNWRITING ROTATION-WALLPLANE DOUBLE HITTING FRONT WALL;So;0;L;;;;;N;;;;; +1D9AC;SIGNWRITING ROTATION-WALLPLANE ALTERNATING HITTING FRONT WALL;So;0;L;;;;;N;;;;; +1D9AD;SIGNWRITING MOVEMENT-WALLPLANE CURVE HITTING CHEST;So;0;L;;;;;N;;;;; +1D9AE;SIGNWRITING MOVEMENT-WALLPLANE HUMP HITTING CHEST;So;0;L;;;;;N;;;;; +1D9AF;SIGNWRITING MOVEMENT-WALLPLANE LOOP HITTING CHEST;So;0;L;;;;;N;;;;; +1D9B0;SIGNWRITING MOVEMENT-WALLPLANE WAVE HITTING CHEST;So;0;L;;;;;N;;;;; +1D9B1;SIGNWRITING ROTATION-WALLPLANE SINGLE HITTING CHEST;So;0;L;;;;;N;;;;; +1D9B2;SIGNWRITING ROTATION-WALLPLANE DOUBLE HITTING CHEST;So;0;L;;;;;N;;;;; +1D9B3;SIGNWRITING ROTATION-WALLPLANE ALTERNATING HITTING CHEST;So;0;L;;;;;N;;;;; +1D9B4;SIGNWRITING MOVEMENT-WALLPLANE WAVE DIAGONAL PATH SMALL;So;0;L;;;;;N;;;;; +1D9B5;SIGNWRITING MOVEMENT-WALLPLANE WAVE DIAGONAL PATH MEDIUM;So;0;L;;;;;N;;;;; +1D9B6;SIGNWRITING MOVEMENT-WALLPLANE WAVE DIAGONAL PATH LARGE;So;0;L;;;;;N;;;;; +1D9B7;SIGNWRITING MOVEMENT-FLOORPLANE CURVE HITTING CEILING SMALL;So;0;L;;;;;N;;;;; +1D9B8;SIGNWRITING MOVEMENT-FLOORPLANE CURVE HITTING CEILING LARGE;So;0;L;;;;;N;;;;; +1D9B9;SIGNWRITING MOVEMENT-FLOORPLANE HUMP HITTING CEILING SMALL DOUBLE;So;0;L;;;;;N;;;;; +1D9BA;SIGNWRITING MOVEMENT-FLOORPLANE HUMP HITTING CEILING LARGE DOUBLE;So;0;L;;;;;N;;;;; +1D9BB;SIGNWRITING MOVEMENT-FLOORPLANE HUMP HITTING CEILING SMALL TRIPLE;So;0;L;;;;;N;;;;; +1D9BC;SIGNWRITING MOVEMENT-FLOORPLANE HUMP HITTING CEILING LARGE TRIPLE;So;0;L;;;;;N;;;;; +1D9BD;SIGNWRITING MOVEMENT-FLOORPLANE LOOP HITTING CEILING SMALL SINGLE;So;0;L;;;;;N;;;;; +1D9BE;SIGNWRITING MOVEMENT-FLOORPLANE LOOP HITTING CEILING LARGE SINGLE;So;0;L;;;;;N;;;;; +1D9BF;SIGNWRITING MOVEMENT-FLOORPLANE LOOP HITTING CEILING SMALL DOUBLE;So;0;L;;;;;N;;;;; +1D9C0;SIGNWRITING MOVEMENT-FLOORPLANE LOOP HITTING CEILING LARGE DOUBLE;So;0;L;;;;;N;;;;; +1D9C1;SIGNWRITING MOVEMENT-FLOORPLANE WAVE HITTING CEILING SMALL;So;0;L;;;;;N;;;;; +1D9C2;SIGNWRITING MOVEMENT-FLOORPLANE WAVE HITTING CEILING LARGE;So;0;L;;;;;N;;;;; +1D9C3;SIGNWRITING ROTATION-FLOORPLANE SINGLE HITTING CEILING;So;0;L;;;;;N;;;;; +1D9C4;SIGNWRITING ROTATION-FLOORPLANE DOUBLE HITTING CEILING;So;0;L;;;;;N;;;;; +1D9C5;SIGNWRITING ROTATION-FLOORPLANE ALTERNATING HITTING CEILING;So;0;L;;;;;N;;;;; +1D9C6;SIGNWRITING MOVEMENT-FLOORPLANE CURVE HITTING FLOOR SMALL;So;0;L;;;;;N;;;;; +1D9C7;SIGNWRITING MOVEMENT-FLOORPLANE CURVE HITTING FLOOR LARGE;So;0;L;;;;;N;;;;; +1D9C8;SIGNWRITING MOVEMENT-FLOORPLANE HUMP HITTING FLOOR SMALL DOUBLE;So;0;L;;;;;N;;;;; +1D9C9;SIGNWRITING MOVEMENT-FLOORPLANE HUMP HITTING FLOOR LARGE DOUBLE;So;0;L;;;;;N;;;;; +1D9CA;SIGNWRITING MOVEMENT-FLOORPLANE HUMP HITTING FLOOR TRIPLE SMALL TRIPLE;So;0;L;;;;;N;;;;; +1D9CB;SIGNWRITING MOVEMENT-FLOORPLANE HUMP HITTING FLOOR TRIPLE LARGE TRIPLE;So;0;L;;;;;N;;;;; +1D9CC;SIGNWRITING MOVEMENT-FLOORPLANE LOOP HITTING FLOOR SMALL SINGLE;So;0;L;;;;;N;;;;; +1D9CD;SIGNWRITING MOVEMENT-FLOORPLANE LOOP HITTING FLOOR LARGE SINGLE;So;0;L;;;;;N;;;;; +1D9CE;SIGNWRITING MOVEMENT-FLOORPLANE LOOP HITTING FLOOR SMALL DOUBLE;So;0;L;;;;;N;;;;; +1D9CF;SIGNWRITING MOVEMENT-FLOORPLANE LOOP HITTING FLOOR LARGE DOUBLE;So;0;L;;;;;N;;;;; +1D9D0;SIGNWRITING MOVEMENT-FLOORPLANE WAVE HITTING FLOOR SMALL;So;0;L;;;;;N;;;;; +1D9D1;SIGNWRITING MOVEMENT-FLOORPLANE WAVE HITTING FLOOR LARGE;So;0;L;;;;;N;;;;; +1D9D2;SIGNWRITING ROTATION-FLOORPLANE SINGLE HITTING FLOOR;So;0;L;;;;;N;;;;; +1D9D3;SIGNWRITING ROTATION-FLOORPLANE DOUBLE HITTING FLOOR;So;0;L;;;;;N;;;;; +1D9D4;SIGNWRITING ROTATION-FLOORPLANE ALTERNATING HITTING FLOOR;So;0;L;;;;;N;;;;; +1D9D5;SIGNWRITING MOVEMENT-FLOORPLANE CURVE SMALL;So;0;L;;;;;N;;;;; +1D9D6;SIGNWRITING MOVEMENT-FLOORPLANE CURVE MEDIUM;So;0;L;;;;;N;;;;; +1D9D7;SIGNWRITING MOVEMENT-FLOORPLANE CURVE LARGE;So;0;L;;;;;N;;;;; +1D9D8;SIGNWRITING MOVEMENT-FLOORPLANE CURVE LARGEST;So;0;L;;;;;N;;;;; +1D9D9;SIGNWRITING MOVEMENT-FLOORPLANE CURVE COMBINED;So;0;L;;;;;N;;;;; +1D9DA;SIGNWRITING MOVEMENT-FLOORPLANE HUMP SMALL;So;0;L;;;;;N;;;;; +1D9DB;SIGNWRITING MOVEMENT-FLOORPLANE LOOP SMALL;So;0;L;;;;;N;;;;; +1D9DC;SIGNWRITING MOVEMENT-FLOORPLANE WAVE SNAKE;So;0;L;;;;;N;;;;; +1D9DD;SIGNWRITING MOVEMENT-FLOORPLANE WAVE SMALL;So;0;L;;;;;N;;;;; +1D9DE;SIGNWRITING MOVEMENT-FLOORPLANE WAVE LARGE;So;0;L;;;;;N;;;;; +1D9DF;SIGNWRITING ROTATION-FLOORPLANE SINGLE;So;0;L;;;;;N;;;;; +1D9E0;SIGNWRITING ROTATION-FLOORPLANE DOUBLE;So;0;L;;;;;N;;;;; +1D9E1;SIGNWRITING ROTATION-FLOORPLANE ALTERNATING;So;0;L;;;;;N;;;;; +1D9E2;SIGNWRITING MOVEMENT-FLOORPLANE SHAKING PARALLEL;So;0;L;;;;;N;;;;; +1D9E3;SIGNWRITING MOVEMENT-WALLPLANE ARM CIRCLE SMALL SINGLE;So;0;L;;;;;N;;;;; +1D9E4;SIGNWRITING MOVEMENT-WALLPLANE ARM CIRCLE MEDIUM SINGLE;So;0;L;;;;;N;;;;; +1D9E5;SIGNWRITING MOVEMENT-WALLPLANE ARM CIRCLE SMALL DOUBLE;So;0;L;;;;;N;;;;; +1D9E6;SIGNWRITING MOVEMENT-WALLPLANE ARM CIRCLE MEDIUM DOUBLE;So;0;L;;;;;N;;;;; +1D9E7;SIGNWRITING MOVEMENT-FLOORPLANE ARM CIRCLE HITTING WALL SMALL SINGLE;So;0;L;;;;;N;;;;; +1D9E8;SIGNWRITING MOVEMENT-FLOORPLANE ARM CIRCLE HITTING WALL MEDIUM SINGLE;So;0;L;;;;;N;;;;; +1D9E9;SIGNWRITING MOVEMENT-FLOORPLANE ARM CIRCLE HITTING WALL LARGE SINGLE;So;0;L;;;;;N;;;;; +1D9EA;SIGNWRITING MOVEMENT-FLOORPLANE ARM CIRCLE HITTING WALL SMALL DOUBLE;So;0;L;;;;;N;;;;; +1D9EB;SIGNWRITING MOVEMENT-FLOORPLANE ARM CIRCLE HITTING WALL MEDIUM DOUBLE;So;0;L;;;;;N;;;;; +1D9EC;SIGNWRITING MOVEMENT-FLOORPLANE ARM CIRCLE HITTING WALL LARGE DOUBLE;So;0;L;;;;;N;;;;; +1D9ED;SIGNWRITING MOVEMENT-WALLPLANE WRIST CIRCLE FRONT SINGLE;So;0;L;;;;;N;;;;; +1D9EE;SIGNWRITING MOVEMENT-WALLPLANE WRIST CIRCLE FRONT DOUBLE;So;0;L;;;;;N;;;;; +1D9EF;SIGNWRITING MOVEMENT-FLOORPLANE WRIST CIRCLE HITTING WALL SINGLE;So;0;L;;;;;N;;;;; +1D9F0;SIGNWRITING MOVEMENT-FLOORPLANE WRIST CIRCLE HITTING WALL DOUBLE;So;0;L;;;;;N;;;;; +1D9F1;SIGNWRITING MOVEMENT-WALLPLANE FINGER CIRCLES SINGLE;So;0;L;;;;;N;;;;; +1D9F2;SIGNWRITING MOVEMENT-WALLPLANE FINGER CIRCLES DOUBLE;So;0;L;;;;;N;;;;; +1D9F3;SIGNWRITING MOVEMENT-FLOORPLANE FINGER CIRCLES HITTING WALL SINGLE;So;0;L;;;;;N;;;;; +1D9F4;SIGNWRITING MOVEMENT-FLOORPLANE FINGER CIRCLES HITTING WALL DOUBLE;So;0;L;;;;;N;;;;; +1D9F5;SIGNWRITING DYNAMIC ARROWHEAD SMALL;So;0;L;;;;;N;;;;; +1D9F6;SIGNWRITING DYNAMIC ARROWHEAD LARGE;So;0;L;;;;;N;;;;; +1D9F7;SIGNWRITING DYNAMIC FAST;So;0;L;;;;;N;;;;; +1D9F8;SIGNWRITING DYNAMIC SLOW;So;0;L;;;;;N;;;;; +1D9F9;SIGNWRITING DYNAMIC TENSE;So;0;L;;;;;N;;;;; +1D9FA;SIGNWRITING DYNAMIC RELAXED;So;0;L;;;;;N;;;;; +1D9FB;SIGNWRITING DYNAMIC SIMULTANEOUS;So;0;L;;;;;N;;;;; +1D9FC;SIGNWRITING DYNAMIC SIMULTANEOUS ALTERNATING;So;0;L;;;;;N;;;;; +1D9FD;SIGNWRITING DYNAMIC EVERY OTHER TIME;So;0;L;;;;;N;;;;; +1D9FE;SIGNWRITING DYNAMIC GRADUAL;So;0;L;;;;;N;;;;; +1D9FF;SIGNWRITING HEAD;So;0;L;;;;;N;;;;; +1DA00;SIGNWRITING HEAD RIM;Mn;0;NSM;;;;;N;;;;; +1DA01;SIGNWRITING HEAD MOVEMENT-WALLPLANE STRAIGHT;Mn;0;NSM;;;;;N;;;;; +1DA02;SIGNWRITING HEAD MOVEMENT-WALLPLANE TILT;Mn;0;NSM;;;;;N;;;;; +1DA03;SIGNWRITING HEAD MOVEMENT-FLOORPLANE STRAIGHT;Mn;0;NSM;;;;;N;;;;; +1DA04;SIGNWRITING HEAD MOVEMENT-WALLPLANE CURVE;Mn;0;NSM;;;;;N;;;;; +1DA05;SIGNWRITING HEAD MOVEMENT-FLOORPLANE CURVE;Mn;0;NSM;;;;;N;;;;; +1DA06;SIGNWRITING HEAD MOVEMENT CIRCLE;Mn;0;NSM;;;;;N;;;;; +1DA07;SIGNWRITING FACE DIRECTION POSITION NOSE FORWARD TILTING;Mn;0;NSM;;;;;N;;;;; +1DA08;SIGNWRITING FACE DIRECTION POSITION NOSE UP OR DOWN;Mn;0;NSM;;;;;N;;;;; +1DA09;SIGNWRITING FACE DIRECTION POSITION NOSE UP OR DOWN TILTING;Mn;0;NSM;;;;;N;;;;; +1DA0A;SIGNWRITING EYEBROWS STRAIGHT UP;Mn;0;NSM;;;;;N;;;;; +1DA0B;SIGNWRITING EYEBROWS STRAIGHT NEUTRAL;Mn;0;NSM;;;;;N;;;;; +1DA0C;SIGNWRITING EYEBROWS STRAIGHT DOWN;Mn;0;NSM;;;;;N;;;;; +1DA0D;SIGNWRITING DREAMY EYEBROWS NEUTRAL DOWN;Mn;0;NSM;;;;;N;;;;; +1DA0E;SIGNWRITING DREAMY EYEBROWS DOWN NEUTRAL;Mn;0;NSM;;;;;N;;;;; +1DA0F;SIGNWRITING DREAMY EYEBROWS UP NEUTRAL;Mn;0;NSM;;;;;N;;;;; +1DA10;SIGNWRITING DREAMY EYEBROWS NEUTRAL UP;Mn;0;NSM;;;;;N;;;;; +1DA11;SIGNWRITING FOREHEAD NEUTRAL;Mn;0;NSM;;;;;N;;;;; +1DA12;SIGNWRITING FOREHEAD CONTACT;Mn;0;NSM;;;;;N;;;;; +1DA13;SIGNWRITING FOREHEAD WRINKLED;Mn;0;NSM;;;;;N;;;;; +1DA14;SIGNWRITING EYES OPEN;Mn;0;NSM;;;;;N;;;;; +1DA15;SIGNWRITING EYES SQUEEZED;Mn;0;NSM;;;;;N;;;;; +1DA16;SIGNWRITING EYES CLOSED;Mn;0;NSM;;;;;N;;;;; +1DA17;SIGNWRITING EYE BLINK SINGLE;Mn;0;NSM;;;;;N;;;;; +1DA18;SIGNWRITING EYE BLINK MULTIPLE;Mn;0;NSM;;;;;N;;;;; +1DA19;SIGNWRITING EYES HALF OPEN;Mn;0;NSM;;;;;N;;;;; +1DA1A;SIGNWRITING EYES WIDE OPEN;Mn;0;NSM;;;;;N;;;;; +1DA1B;SIGNWRITING EYES HALF CLOSED;Mn;0;NSM;;;;;N;;;;; +1DA1C;SIGNWRITING EYES WIDENING MOVEMENT;Mn;0;NSM;;;;;N;;;;; +1DA1D;SIGNWRITING EYE WINK;Mn;0;NSM;;;;;N;;;;; +1DA1E;SIGNWRITING EYELASHES UP;Mn;0;NSM;;;;;N;;;;; +1DA1F;SIGNWRITING EYELASHES DOWN;Mn;0;NSM;;;;;N;;;;; +1DA20;SIGNWRITING EYELASHES FLUTTERING;Mn;0;NSM;;;;;N;;;;; +1DA21;SIGNWRITING EYEGAZE-WALLPLANE STRAIGHT;Mn;0;NSM;;;;;N;;;;; +1DA22;SIGNWRITING EYEGAZE-WALLPLANE STRAIGHT DOUBLE;Mn;0;NSM;;;;;N;;;;; +1DA23;SIGNWRITING EYEGAZE-WALLPLANE STRAIGHT ALTERNATING;Mn;0;NSM;;;;;N;;;;; +1DA24;SIGNWRITING EYEGAZE-FLOORPLANE STRAIGHT;Mn;0;NSM;;;;;N;;;;; +1DA25;SIGNWRITING EYEGAZE-FLOORPLANE STRAIGHT DOUBLE;Mn;0;NSM;;;;;N;;;;; +1DA26;SIGNWRITING EYEGAZE-FLOORPLANE STRAIGHT ALTERNATING;Mn;0;NSM;;;;;N;;;;; +1DA27;SIGNWRITING EYEGAZE-WALLPLANE CURVED;Mn;0;NSM;;;;;N;;;;; +1DA28;SIGNWRITING EYEGAZE-FLOORPLANE CURVED;Mn;0;NSM;;;;;N;;;;; +1DA29;SIGNWRITING EYEGAZE-WALLPLANE CIRCLING;Mn;0;NSM;;;;;N;;;;; +1DA2A;SIGNWRITING CHEEKS PUFFED;Mn;0;NSM;;;;;N;;;;; +1DA2B;SIGNWRITING CHEEKS NEUTRAL;Mn;0;NSM;;;;;N;;;;; +1DA2C;SIGNWRITING CHEEKS SUCKED;Mn;0;NSM;;;;;N;;;;; +1DA2D;SIGNWRITING TENSE CHEEKS HIGH;Mn;0;NSM;;;;;N;;;;; +1DA2E;SIGNWRITING TENSE CHEEKS MIDDLE;Mn;0;NSM;;;;;N;;;;; +1DA2F;SIGNWRITING TENSE CHEEKS LOW;Mn;0;NSM;;;;;N;;;;; +1DA30;SIGNWRITING EARS;Mn;0;NSM;;;;;N;;;;; +1DA31;SIGNWRITING NOSE NEUTRAL;Mn;0;NSM;;;;;N;;;;; +1DA32;SIGNWRITING NOSE CONTACT;Mn;0;NSM;;;;;N;;;;; +1DA33;SIGNWRITING NOSE WRINKLES;Mn;0;NSM;;;;;N;;;;; +1DA34;SIGNWRITING NOSE WIGGLES;Mn;0;NSM;;;;;N;;;;; +1DA35;SIGNWRITING AIR BLOWING OUT;Mn;0;NSM;;;;;N;;;;; +1DA36;SIGNWRITING AIR SUCKING IN;Mn;0;NSM;;;;;N;;;;; +1DA37;SIGNWRITING AIR BLOW SMALL ROTATIONS;So;0;L;;;;;N;;;;; +1DA38;SIGNWRITING AIR SUCK SMALL ROTATIONS;So;0;L;;;;;N;;;;; +1DA39;SIGNWRITING BREATH INHALE;So;0;L;;;;;N;;;;; +1DA3A;SIGNWRITING BREATH EXHALE;So;0;L;;;;;N;;;;; +1DA3B;SIGNWRITING MOUTH CLOSED NEUTRAL;Mn;0;NSM;;;;;N;;;;; +1DA3C;SIGNWRITING MOUTH CLOSED FORWARD;Mn;0;NSM;;;;;N;;;;; +1DA3D;SIGNWRITING MOUTH CLOSED CONTACT;Mn;0;NSM;;;;;N;;;;; +1DA3E;SIGNWRITING MOUTH SMILE;Mn;0;NSM;;;;;N;;;;; +1DA3F;SIGNWRITING MOUTH SMILE WRINKLED;Mn;0;NSM;;;;;N;;;;; +1DA40;SIGNWRITING MOUTH SMILE OPEN;Mn;0;NSM;;;;;N;;;;; +1DA41;SIGNWRITING MOUTH FROWN;Mn;0;NSM;;;;;N;;;;; +1DA42;SIGNWRITING MOUTH FROWN WRINKLED;Mn;0;NSM;;;;;N;;;;; +1DA43;SIGNWRITING MOUTH FROWN OPEN;Mn;0;NSM;;;;;N;;;;; +1DA44;SIGNWRITING MOUTH OPEN CIRCLE;Mn;0;NSM;;;;;N;;;;; +1DA45;SIGNWRITING MOUTH OPEN FORWARD;Mn;0;NSM;;;;;N;;;;; +1DA46;SIGNWRITING MOUTH OPEN WRINKLED;Mn;0;NSM;;;;;N;;;;; +1DA47;SIGNWRITING MOUTH OPEN OVAL;Mn;0;NSM;;;;;N;;;;; +1DA48;SIGNWRITING MOUTH OPEN OVAL WRINKLED;Mn;0;NSM;;;;;N;;;;; +1DA49;SIGNWRITING MOUTH OPEN OVAL YAWN;Mn;0;NSM;;;;;N;;;;; +1DA4A;SIGNWRITING MOUTH OPEN RECTANGLE;Mn;0;NSM;;;;;N;;;;; +1DA4B;SIGNWRITING MOUTH OPEN RECTANGLE WRINKLED;Mn;0;NSM;;;;;N;;;;; +1DA4C;SIGNWRITING MOUTH OPEN RECTANGLE YAWN;Mn;0;NSM;;;;;N;;;;; +1DA4D;SIGNWRITING MOUTH KISS;Mn;0;NSM;;;;;N;;;;; +1DA4E;SIGNWRITING MOUTH KISS FORWARD;Mn;0;NSM;;;;;N;;;;; +1DA4F;SIGNWRITING MOUTH KISS WRINKLED;Mn;0;NSM;;;;;N;;;;; +1DA50;SIGNWRITING MOUTH TENSE;Mn;0;NSM;;;;;N;;;;; +1DA51;SIGNWRITING MOUTH TENSE FORWARD;Mn;0;NSM;;;;;N;;;;; +1DA52;SIGNWRITING MOUTH TENSE SUCKED;Mn;0;NSM;;;;;N;;;;; +1DA53;SIGNWRITING LIPS PRESSED TOGETHER;Mn;0;NSM;;;;;N;;;;; +1DA54;SIGNWRITING LIP LOWER OVER UPPER;Mn;0;NSM;;;;;N;;;;; +1DA55;SIGNWRITING LIP UPPER OVER LOWER;Mn;0;NSM;;;;;N;;;;; +1DA56;SIGNWRITING MOUTH CORNERS;Mn;0;NSM;;;;;N;;;;; +1DA57;SIGNWRITING MOUTH WRINKLES SINGLE;Mn;0;NSM;;;;;N;;;;; +1DA58;SIGNWRITING MOUTH WRINKLES DOUBLE;Mn;0;NSM;;;;;N;;;;; +1DA59;SIGNWRITING TONGUE STICKING OUT FAR;Mn;0;NSM;;;;;N;;;;; +1DA5A;SIGNWRITING TONGUE LICKING LIPS;Mn;0;NSM;;;;;N;;;;; +1DA5B;SIGNWRITING TONGUE TIP BETWEEN LIPS;Mn;0;NSM;;;;;N;;;;; +1DA5C;SIGNWRITING TONGUE TIP TOUCHING INSIDE MOUTH;Mn;0;NSM;;;;;N;;;;; +1DA5D;SIGNWRITING TONGUE INSIDE MOUTH RELAXED;Mn;0;NSM;;;;;N;;;;; +1DA5E;SIGNWRITING TONGUE MOVES AGAINST CHEEK;Mn;0;NSM;;;;;N;;;;; +1DA5F;SIGNWRITING TONGUE CENTRE STICKING OUT;Mn;0;NSM;;;;;N;;;;; +1DA60;SIGNWRITING TONGUE CENTRE INSIDE MOUTH;Mn;0;NSM;;;;;N;;;;; +1DA61;SIGNWRITING TEETH;Mn;0;NSM;;;;;N;;;;; +1DA62;SIGNWRITING TEETH MOVEMENT;Mn;0;NSM;;;;;N;;;;; +1DA63;SIGNWRITING TEETH ON TONGUE;Mn;0;NSM;;;;;N;;;;; +1DA64;SIGNWRITING TEETH ON TONGUE MOVEMENT;Mn;0;NSM;;;;;N;;;;; +1DA65;SIGNWRITING TEETH ON LIPS;Mn;0;NSM;;;;;N;;;;; +1DA66;SIGNWRITING TEETH ON LIPS MOVEMENT;Mn;0;NSM;;;;;N;;;;; +1DA67;SIGNWRITING TEETH BITE LIPS;Mn;0;NSM;;;;;N;;;;; +1DA68;SIGNWRITING MOVEMENT-WALLPLANE JAW;Mn;0;NSM;;;;;N;;;;; +1DA69;SIGNWRITING MOVEMENT-FLOORPLANE JAW;Mn;0;NSM;;;;;N;;;;; +1DA6A;SIGNWRITING NECK;Mn;0;NSM;;;;;N;;;;; +1DA6B;SIGNWRITING HAIR;Mn;0;NSM;;;;;N;;;;; +1DA6C;SIGNWRITING EXCITEMENT;Mn;0;NSM;;;;;N;;;;; +1DA6D;SIGNWRITING SHOULDER HIP SPINE;So;0;L;;;;;N;;;;; +1DA6E;SIGNWRITING SHOULDER HIP POSITIONS;So;0;L;;;;;N;;;;; +1DA6F;SIGNWRITING WALLPLANE SHOULDER HIP MOVE;So;0;L;;;;;N;;;;; +1DA70;SIGNWRITING FLOORPLANE SHOULDER HIP MOVE;So;0;L;;;;;N;;;;; +1DA71;SIGNWRITING SHOULDER TILTING FROM WAIST;So;0;L;;;;;N;;;;; +1DA72;SIGNWRITING TORSO-WALLPLANE STRAIGHT STRETCH;So;0;L;;;;;N;;;;; +1DA73;SIGNWRITING TORSO-WALLPLANE CURVED BEND;So;0;L;;;;;N;;;;; +1DA74;SIGNWRITING TORSO-FLOORPLANE TWISTING;So;0;L;;;;;N;;;;; +1DA75;SIGNWRITING UPPER BODY TILTING FROM HIP JOINTS;Mn;0;NSM;;;;;N;;;;; +1DA76;SIGNWRITING LIMB COMBINATION;So;0;L;;;;;N;;;;; +1DA77;SIGNWRITING LIMB LENGTH-1;So;0;L;;;;;N;;;;; +1DA78;SIGNWRITING LIMB LENGTH-2;So;0;L;;;;;N;;;;; +1DA79;SIGNWRITING LIMB LENGTH-3;So;0;L;;;;;N;;;;; +1DA7A;SIGNWRITING LIMB LENGTH-4;So;0;L;;;;;N;;;;; +1DA7B;SIGNWRITING LIMB LENGTH-5;So;0;L;;;;;N;;;;; +1DA7C;SIGNWRITING LIMB LENGTH-6;So;0;L;;;;;N;;;;; +1DA7D;SIGNWRITING LIMB LENGTH-7;So;0;L;;;;;N;;;;; +1DA7E;SIGNWRITING FINGER;So;0;L;;;;;N;;;;; +1DA7F;SIGNWRITING LOCATION-WALLPLANE SPACE;So;0;L;;;;;N;;;;; +1DA80;SIGNWRITING LOCATION-FLOORPLANE SPACE;So;0;L;;;;;N;;;;; +1DA81;SIGNWRITING LOCATION HEIGHT;So;0;L;;;;;N;;;;; +1DA82;SIGNWRITING LOCATION WIDTH;So;0;L;;;;;N;;;;; +1DA83;SIGNWRITING LOCATION DEPTH;So;0;L;;;;;N;;;;; +1DA84;SIGNWRITING LOCATION HEAD NECK;Mn;0;NSM;;;;;N;;;;; +1DA85;SIGNWRITING LOCATION TORSO;So;0;L;;;;;N;;;;; +1DA86;SIGNWRITING LOCATION LIMBS DIGITS;So;0;L;;;;;N;;;;; +1DA87;SIGNWRITING COMMA;Po;0;L;;;;;N;;;;; +1DA88;SIGNWRITING FULL STOP;Po;0;L;;;;;N;;;;; +1DA89;SIGNWRITING SEMICOLON;Po;0;L;;;;;N;;;;; +1DA8A;SIGNWRITING COLON;Po;0;L;;;;;N;;;;; +1DA8B;SIGNWRITING PARENTHESIS;Po;0;L;;;;;N;;;;; +1DA9B;SIGNWRITING FILL MODIFIER-2;Mn;0;NSM;;;;;N;;;;; +1DA9C;SIGNWRITING FILL MODIFIER-3;Mn;0;NSM;;;;;N;;;;; +1DA9D;SIGNWRITING FILL MODIFIER-4;Mn;0;NSM;;;;;N;;;;; +1DA9E;SIGNWRITING FILL MODIFIER-5;Mn;0;NSM;;;;;N;;;;; +1DA9F;SIGNWRITING FILL MODIFIER-6;Mn;0;NSM;;;;;N;;;;; +1DAA1;SIGNWRITING ROTATION MODIFIER-2;Mn;0;NSM;;;;;N;;;;; +1DAA2;SIGNWRITING ROTATION MODIFIER-3;Mn;0;NSM;;;;;N;;;;; +1DAA3;SIGNWRITING ROTATION MODIFIER-4;Mn;0;NSM;;;;;N;;;;; +1DAA4;SIGNWRITING ROTATION MODIFIER-5;Mn;0;NSM;;;;;N;;;;; +1DAA5;SIGNWRITING ROTATION MODIFIER-6;Mn;0;NSM;;;;;N;;;;; +1DAA6;SIGNWRITING ROTATION MODIFIER-7;Mn;0;NSM;;;;;N;;;;; +1DAA7;SIGNWRITING ROTATION MODIFIER-8;Mn;0;NSM;;;;;N;;;;; +1DAA8;SIGNWRITING ROTATION MODIFIER-9;Mn;0;NSM;;;;;N;;;;; +1DAA9;SIGNWRITING ROTATION MODIFIER-10;Mn;0;NSM;;;;;N;;;;; +1DAAA;SIGNWRITING ROTATION MODIFIER-11;Mn;0;NSM;;;;;N;;;;; +1DAAB;SIGNWRITING ROTATION MODIFIER-12;Mn;0;NSM;;;;;N;;;;; +1DAAC;SIGNWRITING ROTATION MODIFIER-13;Mn;0;NSM;;;;;N;;;;; +1DAAD;SIGNWRITING ROTATION MODIFIER-14;Mn;0;NSM;;;;;N;;;;; +1DAAE;SIGNWRITING ROTATION MODIFIER-15;Mn;0;NSM;;;;;N;;;;; +1DAAF;SIGNWRITING ROTATION MODIFIER-16;Mn;0;NSM;;;;;N;;;;; +1DF00;LATIN SMALL LETTER FENG DIGRAPH WITH TRILL;Ll;0;L;;;;;N;;;;; +1DF01;LATIN SMALL LETTER REVERSED SCRIPT G;Ll;0;L;;;;;N;;;;; +1DF02;LATIN LETTER SMALL CAPITAL TURNED G;Ll;0;L;;;;;N;;;;; +1DF03;LATIN SMALL LETTER REVERSED K;Ll;0;L;;;;;N;;;;; +1DF04;LATIN LETTER SMALL CAPITAL L WITH BELT;Ll;0;L;;;;;N;;;;; +1DF05;LATIN SMALL LETTER LEZH WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;; +1DF06;LATIN SMALL LETTER TURNED Y WITH BELT;Ll;0;L;;;;;N;;;;; +1DF07;LATIN SMALL LETTER REVERSED ENG;Ll;0;L;;;;;N;;;;; +1DF08;LATIN SMALL LETTER TURNED R WITH LONG LEG AND RETROFLEX HOOK;Ll;0;L;;;;;N;;;;; +1DF09;LATIN SMALL LETTER T WITH HOOK AND RETROFLEX HOOK;Ll;0;L;;;;;N;;;;; +1DF0A;LATIN LETTER RETROFLEX CLICK WITH RETROFLEX HOOK;Lo;0;L;;;;;N;;;;; +1DF0B;LATIN SMALL LETTER ESH WITH DOUBLE BAR;Ll;0;L;;;;;N;;;;; +1DF0C;LATIN SMALL LETTER ESH WITH DOUBLE BAR AND CURL;Ll;0;L;;;;;N;;;;; +1DF0D;LATIN SMALL LETTER TURNED T WITH CURL;Ll;0;L;;;;;N;;;;; +1DF0E;LATIN LETTER INVERTED GLOTTAL STOP WITH CURL;Ll;0;L;;;;;N;;;;; +1DF0F;LATIN LETTER STRETCHED C WITH CURL;Ll;0;L;;;;;N;;;;; +1DF10;LATIN LETTER SMALL CAPITAL TURNED K;Ll;0;L;;;;;N;;;;; +1DF11;LATIN SMALL LETTER L WITH FISHHOOK;Ll;0;L;;;;;N;;;;; +1DF12;LATIN SMALL LETTER DEZH DIGRAPH WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1DF13;LATIN SMALL LETTER L WITH BELT AND PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1DF14;LATIN SMALL LETTER ENG WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1DF15;LATIN SMALL LETTER TURNED R WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1DF16;LATIN SMALL LETTER R WITH FISHHOOK AND PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1DF17;LATIN SMALL LETTER TESH DIGRAPH WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1DF18;LATIN SMALL LETTER EZH WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1DF19;LATIN SMALL LETTER DEZH DIGRAPH WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;; +1DF1A;LATIN SMALL LETTER I WITH STROKE AND RETROFLEX HOOK;Ll;0;L;;;;;N;;;;; +1DF1B;LATIN SMALL LETTER O WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;; +1DF1C;LATIN SMALL LETTER TESH DIGRAPH WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;; +1DF1D;LATIN SMALL LETTER C WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;; +1DF1E;LATIN SMALL LETTER S WITH CURL;Ll;0;L;;;;;N;;;;; +1DF25;LATIN SMALL LETTER D WITH MID-HEIGHT LEFT HOOK;Ll;0;L;;;;;N;;;;; +1DF26;LATIN SMALL LETTER L WITH MID-HEIGHT LEFT HOOK;Ll;0;L;;;;;N;;;;; +1DF27;LATIN SMALL LETTER N WITH MID-HEIGHT LEFT HOOK;Ll;0;L;;;;;N;;;;; +1DF28;LATIN SMALL LETTER R WITH MID-HEIGHT LEFT HOOK;Ll;0;L;;;;;N;;;;; +1DF29;LATIN SMALL LETTER S WITH MID-HEIGHT LEFT HOOK;Ll;0;L;;;;;N;;;;; +1DF2A;LATIN SMALL LETTER T WITH MID-HEIGHT LEFT HOOK;Ll;0;L;;;;;N;;;;; +1E000;COMBINING GLAGOLITIC LETTER AZU;Mn;230;NSM;;;;;N;;;;; +1E001;COMBINING GLAGOLITIC LETTER BUKY;Mn;230;NSM;;;;;N;;;;; +1E002;COMBINING GLAGOLITIC LETTER VEDE;Mn;230;NSM;;;;;N;;;;; +1E003;COMBINING GLAGOLITIC LETTER GLAGOLI;Mn;230;NSM;;;;;N;;;;; +1E004;COMBINING GLAGOLITIC LETTER DOBRO;Mn;230;NSM;;;;;N;;;;; +1E005;COMBINING GLAGOLITIC LETTER YESTU;Mn;230;NSM;;;;;N;;;;; +1E006;COMBINING GLAGOLITIC LETTER ZHIVETE;Mn;230;NSM;;;;;N;;;;; +1E008;COMBINING GLAGOLITIC LETTER ZEMLJA;Mn;230;NSM;;;;;N;;;;; +1E009;COMBINING GLAGOLITIC LETTER IZHE;Mn;230;NSM;;;;;N;;;;; +1E00A;COMBINING GLAGOLITIC LETTER INITIAL IZHE;Mn;230;NSM;;;;;N;;;;; +1E00B;COMBINING GLAGOLITIC LETTER I;Mn;230;NSM;;;;;N;;;;; +1E00C;COMBINING GLAGOLITIC LETTER DJERVI;Mn;230;NSM;;;;;N;;;;; +1E00D;COMBINING GLAGOLITIC LETTER KAKO;Mn;230;NSM;;;;;N;;;;; +1E00E;COMBINING GLAGOLITIC LETTER LJUDIJE;Mn;230;NSM;;;;;N;;;;; +1E00F;COMBINING GLAGOLITIC LETTER MYSLITE;Mn;230;NSM;;;;;N;;;;; +1E010;COMBINING GLAGOLITIC LETTER NASHI;Mn;230;NSM;;;;;N;;;;; +1E011;COMBINING GLAGOLITIC LETTER ONU;Mn;230;NSM;;;;;N;;;;; +1E012;COMBINING GLAGOLITIC LETTER POKOJI;Mn;230;NSM;;;;;N;;;;; +1E013;COMBINING GLAGOLITIC LETTER RITSI;Mn;230;NSM;;;;;N;;;;; +1E014;COMBINING GLAGOLITIC LETTER SLOVO;Mn;230;NSM;;;;;N;;;;; +1E015;COMBINING GLAGOLITIC LETTER TVRIDO;Mn;230;NSM;;;;;N;;;;; +1E016;COMBINING GLAGOLITIC LETTER UKU;Mn;230;NSM;;;;;N;;;;; +1E017;COMBINING GLAGOLITIC LETTER FRITU;Mn;230;NSM;;;;;N;;;;; +1E018;COMBINING GLAGOLITIC LETTER HERU;Mn;230;NSM;;;;;N;;;;; +1E01B;COMBINING GLAGOLITIC LETTER SHTA;Mn;230;NSM;;;;;N;;;;; +1E01C;COMBINING GLAGOLITIC LETTER TSI;Mn;230;NSM;;;;;N;;;;; +1E01D;COMBINING GLAGOLITIC LETTER CHRIVI;Mn;230;NSM;;;;;N;;;;; +1E01E;COMBINING GLAGOLITIC LETTER SHA;Mn;230;NSM;;;;;N;;;;; +1E01F;COMBINING GLAGOLITIC LETTER YERU;Mn;230;NSM;;;;;N;;;;; +1E020;COMBINING GLAGOLITIC LETTER YERI;Mn;230;NSM;;;;;N;;;;; +1E021;COMBINING GLAGOLITIC LETTER YATI;Mn;230;NSM;;;;;N;;;;; +1E023;COMBINING GLAGOLITIC LETTER YU;Mn;230;NSM;;;;;N;;;;; +1E024;COMBINING GLAGOLITIC LETTER SMALL YUS;Mn;230;NSM;;;;;N;;;;; +1E026;COMBINING GLAGOLITIC LETTER YO;Mn;230;NSM;;;;;N;;;;; +1E027;COMBINING GLAGOLITIC LETTER IOTATED SMALL YUS;Mn;230;NSM;;;;;N;;;;; +1E028;COMBINING GLAGOLITIC LETTER BIG YUS;Mn;230;NSM;;;;;N;;;;; +1E029;COMBINING GLAGOLITIC LETTER IOTATED BIG YUS;Mn;230;NSM;;;;;N;;;;; +1E02A;COMBINING GLAGOLITIC LETTER FITA;Mn;230;NSM;;;;;N;;;;; +1E030;MODIFIER LETTER CYRILLIC SMALL A;Lm;0;L; 0430;;;;N;;;;; +1E031;MODIFIER LETTER CYRILLIC SMALL BE;Lm;0;L; 0431;;;;N;;;;; +1E032;MODIFIER LETTER CYRILLIC SMALL VE;Lm;0;L; 0432;;;;N;;;;; +1E033;MODIFIER LETTER CYRILLIC SMALL GHE;Lm;0;L; 0433;;;;N;;;;; +1E034;MODIFIER LETTER CYRILLIC SMALL DE;Lm;0;L; 0434;;;;N;;;;; +1E035;MODIFIER LETTER CYRILLIC SMALL IE;Lm;0;L; 0435;;;;N;;;;; +1E036;MODIFIER LETTER CYRILLIC SMALL ZHE;Lm;0;L; 0436;;;;N;;;;; +1E037;MODIFIER LETTER CYRILLIC SMALL ZE;Lm;0;L; 0437;;;;N;;;;; +1E038;MODIFIER LETTER CYRILLIC SMALL I;Lm;0;L; 0438;;;;N;;;;; +1E039;MODIFIER LETTER CYRILLIC SMALL KA;Lm;0;L; 043A;;;;N;;;;; +1E03A;MODIFIER LETTER CYRILLIC SMALL EL;Lm;0;L; 043B;;;;N;;;;; +1E03B;MODIFIER LETTER CYRILLIC SMALL EM;Lm;0;L; 043C;;;;N;;;;; +1E03C;MODIFIER LETTER CYRILLIC SMALL O;Lm;0;L; 043E;;;;N;;;;; +1E03D;MODIFIER LETTER CYRILLIC SMALL PE;Lm;0;L; 043F;;;;N;;;;; +1E03E;MODIFIER LETTER CYRILLIC SMALL ER;Lm;0;L; 0440;;;;N;;;;; +1E03F;MODIFIER LETTER CYRILLIC SMALL ES;Lm;0;L; 0441;;;;N;;;;; +1E040;MODIFIER LETTER CYRILLIC SMALL TE;Lm;0;L; 0442;;;;N;;;;; +1E041;MODIFIER LETTER CYRILLIC SMALL U;Lm;0;L; 0443;;;;N;;;;; +1E042;MODIFIER LETTER CYRILLIC SMALL EF;Lm;0;L; 0444;;;;N;;;;; +1E043;MODIFIER LETTER CYRILLIC SMALL HA;Lm;0;L; 0445;;;;N;;;;; +1E044;MODIFIER LETTER CYRILLIC SMALL TSE;Lm;0;L; 0446;;;;N;;;;; +1E045;MODIFIER LETTER CYRILLIC SMALL CHE;Lm;0;L; 0447;;;;N;;;;; +1E046;MODIFIER LETTER CYRILLIC SMALL SHA;Lm;0;L; 0448;;;;N;;;;; +1E047;MODIFIER LETTER CYRILLIC SMALL YERU;Lm;0;L; 044B;;;;N;;;;; +1E048;MODIFIER LETTER CYRILLIC SMALL E;Lm;0;L; 044D;;;;N;;;;; +1E049;MODIFIER LETTER CYRILLIC SMALL YU;Lm;0;L; 044E;;;;N;;;;; +1E04A;MODIFIER LETTER CYRILLIC SMALL DZZE;Lm;0;L; A689;;;;N;;;;; +1E04B;MODIFIER LETTER CYRILLIC SMALL SCHWA;Lm;0;L; 04D9;;;;N;;;;; +1E04C;MODIFIER LETTER CYRILLIC SMALL BYELORUSSIAN-UKRAINIAN I;Lm;0;L; 0456;;;;N;;;;; +1E04D;MODIFIER LETTER CYRILLIC SMALL JE;Lm;0;L; 0458;;;;N;;;;; +1E04E;MODIFIER LETTER CYRILLIC SMALL BARRED O;Lm;0;L; 04E9;;;;N;;;;; +1E04F;MODIFIER LETTER CYRILLIC SMALL STRAIGHT U;Lm;0;L; 04AF;;;;N;;;;; +1E050;MODIFIER LETTER CYRILLIC SMALL PALOCHKA;Lm;0;L; 04CF;;;;N;;;;; +1E051;CYRILLIC SUBSCRIPT SMALL LETTER A;Lm;0;L; 0430;;;;N;;;;; +1E052;CYRILLIC SUBSCRIPT SMALL LETTER BE;Lm;0;L; 0431;;;;N;;;;; +1E053;CYRILLIC SUBSCRIPT SMALL LETTER VE;Lm;0;L; 0432;;;;N;;;;; +1E054;CYRILLIC SUBSCRIPT SMALL LETTER GHE;Lm;0;L; 0433;;;;N;;;;; +1E055;CYRILLIC SUBSCRIPT SMALL LETTER DE;Lm;0;L; 0434;;;;N;;;;; +1E056;CYRILLIC SUBSCRIPT SMALL LETTER IE;Lm;0;L; 0435;;;;N;;;;; +1E057;CYRILLIC SUBSCRIPT SMALL LETTER ZHE;Lm;0;L; 0436;;;;N;;;;; +1E058;CYRILLIC SUBSCRIPT SMALL LETTER ZE;Lm;0;L; 0437;;;;N;;;;; +1E059;CYRILLIC SUBSCRIPT SMALL LETTER I;Lm;0;L; 0438;;;;N;;;;; +1E05A;CYRILLIC SUBSCRIPT SMALL LETTER KA;Lm;0;L; 043A;;;;N;;;;; +1E05B;CYRILLIC SUBSCRIPT SMALL LETTER EL;Lm;0;L; 043B;;;;N;;;;; +1E05C;CYRILLIC SUBSCRIPT SMALL LETTER O;Lm;0;L; 043E;;;;N;;;;; +1E05D;CYRILLIC SUBSCRIPT SMALL LETTER PE;Lm;0;L; 043F;;;;N;;;;; +1E05E;CYRILLIC SUBSCRIPT SMALL LETTER ES;Lm;0;L; 0441;;;;N;;;;; +1E05F;CYRILLIC SUBSCRIPT SMALL LETTER U;Lm;0;L; 0443;;;;N;;;;; +1E060;CYRILLIC SUBSCRIPT SMALL LETTER EF;Lm;0;L; 0444;;;;N;;;;; +1E061;CYRILLIC SUBSCRIPT SMALL LETTER HA;Lm;0;L; 0445;;;;N;;;;; +1E062;CYRILLIC SUBSCRIPT SMALL LETTER TSE;Lm;0;L; 0446;;;;N;;;;; +1E063;CYRILLIC SUBSCRIPT SMALL LETTER CHE;Lm;0;L; 0447;;;;N;;;;; +1E064;CYRILLIC SUBSCRIPT SMALL LETTER SHA;Lm;0;L; 0448;;;;N;;;;; +1E065;CYRILLIC SUBSCRIPT SMALL LETTER HARD SIGN;Lm;0;L; 044A;;;;N;;;;; +1E066;CYRILLIC SUBSCRIPT SMALL LETTER YERU;Lm;0;L; 044B;;;;N;;;;; +1E067;CYRILLIC SUBSCRIPT SMALL LETTER GHE WITH UPTURN;Lm;0;L; 0491;;;;N;;;;; +1E068;CYRILLIC SUBSCRIPT SMALL LETTER BYELORUSSIAN-UKRAINIAN I;Lm;0;L; 0456;;;;N;;;;; +1E069;CYRILLIC SUBSCRIPT SMALL LETTER DZE;Lm;0;L; 0455;;;;N;;;;; +1E06A;CYRILLIC SUBSCRIPT SMALL LETTER DZHE;Lm;0;L; 045F;;;;N;;;;; +1E06B;MODIFIER LETTER CYRILLIC SMALL ES WITH DESCENDER;Lm;0;L; 04AB;;;;N;;;;; +1E06C;MODIFIER LETTER CYRILLIC SMALL YERU WITH BACK YER;Lm;0;L; A651;;;;N;;;;; +1E06D;MODIFIER LETTER CYRILLIC SMALL STRAIGHT U WITH STROKE;Lm;0;L; 04B1;;;;N;;;;; +1E08F;COMBINING CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I;Mn;230;NSM;;;;;N;;;;; +1E100;NYIAKENG PUACHUE HMONG LETTER MA;Lo;0;L;;;;;N;;;;; +1E101;NYIAKENG PUACHUE HMONG LETTER TSA;Lo;0;L;;;;;N;;;;; +1E102;NYIAKENG PUACHUE HMONG LETTER NTA;Lo;0;L;;;;;N;;;;; +1E103;NYIAKENG PUACHUE HMONG LETTER TA;Lo;0;L;;;;;N;;;;; +1E104;NYIAKENG PUACHUE HMONG LETTER HA;Lo;0;L;;;;;N;;;;; +1E105;NYIAKENG PUACHUE HMONG LETTER NA;Lo;0;L;;;;;N;;;;; +1E106;NYIAKENG PUACHUE HMONG LETTER XA;Lo;0;L;;;;;N;;;;; +1E107;NYIAKENG PUACHUE HMONG LETTER NKA;Lo;0;L;;;;;N;;;;; +1E108;NYIAKENG PUACHUE HMONG LETTER CA;Lo;0;L;;;;;N;;;;; +1E109;NYIAKENG PUACHUE HMONG LETTER LA;Lo;0;L;;;;;N;;;;; +1E10A;NYIAKENG PUACHUE HMONG LETTER SA;Lo;0;L;;;;;N;;;;; +1E10B;NYIAKENG PUACHUE HMONG LETTER ZA;Lo;0;L;;;;;N;;;;; +1E10C;NYIAKENG PUACHUE HMONG LETTER NCA;Lo;0;L;;;;;N;;;;; +1E10D;NYIAKENG PUACHUE HMONG LETTER NTSA;Lo;0;L;;;;;N;;;;; +1E10E;NYIAKENG PUACHUE HMONG LETTER KA;Lo;0;L;;;;;N;;;;; +1E10F;NYIAKENG PUACHUE HMONG LETTER DA;Lo;0;L;;;;;N;;;;; +1E110;NYIAKENG PUACHUE HMONG LETTER NYA;Lo;0;L;;;;;N;;;;; +1E111;NYIAKENG PUACHUE HMONG LETTER NRA;Lo;0;L;;;;;N;;;;; +1E112;NYIAKENG PUACHUE HMONG LETTER VA;Lo;0;L;;;;;N;;;;; +1E113;NYIAKENG PUACHUE HMONG LETTER NTXA;Lo;0;L;;;;;N;;;;; +1E114;NYIAKENG PUACHUE HMONG LETTER TXA;Lo;0;L;;;;;N;;;;; +1E115;NYIAKENG PUACHUE HMONG LETTER FA;Lo;0;L;;;;;N;;;;; +1E116;NYIAKENG PUACHUE HMONG LETTER RA;Lo;0;L;;;;;N;;;;; +1E117;NYIAKENG PUACHUE HMONG LETTER QA;Lo;0;L;;;;;N;;;;; +1E118;NYIAKENG PUACHUE HMONG LETTER YA;Lo;0;L;;;;;N;;;;; +1E119;NYIAKENG PUACHUE HMONG LETTER NQA;Lo;0;L;;;;;N;;;;; +1E11A;NYIAKENG PUACHUE HMONG LETTER PA;Lo;0;L;;;;;N;;;;; +1E11B;NYIAKENG PUACHUE HMONG LETTER XYA;Lo;0;L;;;;;N;;;;; +1E11C;NYIAKENG PUACHUE HMONG LETTER NPA;Lo;0;L;;;;;N;;;;; +1E11D;NYIAKENG PUACHUE HMONG LETTER DLA;Lo;0;L;;;;;N;;;;; +1E11E;NYIAKENG PUACHUE HMONG LETTER NPLA;Lo;0;L;;;;;N;;;;; +1E11F;NYIAKENG PUACHUE HMONG LETTER HAH;Lo;0;L;;;;;N;;;;; +1E120;NYIAKENG PUACHUE HMONG LETTER MLA;Lo;0;L;;;;;N;;;;; +1E121;NYIAKENG PUACHUE HMONG LETTER PLA;Lo;0;L;;;;;N;;;;; +1E122;NYIAKENG PUACHUE HMONG LETTER GA;Lo;0;L;;;;;N;;;;; +1E123;NYIAKENG PUACHUE HMONG LETTER RRA;Lo;0;L;;;;;N;;;;; +1E124;NYIAKENG PUACHUE HMONG LETTER A;Lo;0;L;;;;;N;;;;; +1E125;NYIAKENG PUACHUE HMONG LETTER AA;Lo;0;L;;;;;N;;;;; +1E126;NYIAKENG PUACHUE HMONG LETTER I;Lo;0;L;;;;;N;;;;; +1E127;NYIAKENG PUACHUE HMONG LETTER U;Lo;0;L;;;;;N;;;;; +1E128;NYIAKENG PUACHUE HMONG LETTER O;Lo;0;L;;;;;N;;;;; +1E129;NYIAKENG PUACHUE HMONG LETTER OO;Lo;0;L;;;;;N;;;;; +1E12A;NYIAKENG PUACHUE HMONG LETTER E;Lo;0;L;;;;;N;;;;; +1E12B;NYIAKENG PUACHUE HMONG LETTER EE;Lo;0;L;;;;;N;;;;; +1E12C;NYIAKENG PUACHUE HMONG LETTER W;Lo;0;L;;;;;N;;;;; +1E130;NYIAKENG PUACHUE HMONG TONE-B;Mn;230;NSM;;;;;N;;;;; +1E131;NYIAKENG PUACHUE HMONG TONE-M;Mn;230;NSM;;;;;N;;;;; +1E132;NYIAKENG PUACHUE HMONG TONE-J;Mn;230;NSM;;;;;N;;;;; +1E133;NYIAKENG PUACHUE HMONG TONE-V;Mn;230;NSM;;;;;N;;;;; +1E134;NYIAKENG PUACHUE HMONG TONE-S;Mn;230;NSM;;;;;N;;;;; +1E135;NYIAKENG PUACHUE HMONG TONE-G;Mn;230;NSM;;;;;N;;;;; +1E136;NYIAKENG PUACHUE HMONG TONE-D;Mn;230;NSM;;;;;N;;;;; +1E137;NYIAKENG PUACHUE HMONG SIGN FOR PERSON;Lm;0;L;;;;;N;;;;; +1E138;NYIAKENG PUACHUE HMONG SIGN FOR THING;Lm;0;L;;;;;N;;;;; +1E139;NYIAKENG PUACHUE HMONG SIGN FOR LOCATION;Lm;0;L;;;;;N;;;;; +1E13A;NYIAKENG PUACHUE HMONG SIGN FOR ANIMAL;Lm;0;L;;;;;N;;;;; +1E13B;NYIAKENG PUACHUE HMONG SIGN FOR INVERTEBRATE;Lm;0;L;;;;;N;;;;; +1E13C;NYIAKENG PUACHUE HMONG SIGN XW XW;Lm;0;L;;;;;N;;;;; +1E13D;NYIAKENG PUACHUE HMONG SYLLABLE LENGTHENER;Lm;0;L;;;;;N;;;;; +1E140;NYIAKENG PUACHUE HMONG DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +1E141;NYIAKENG PUACHUE HMONG DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +1E142;NYIAKENG PUACHUE HMONG DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +1E143;NYIAKENG PUACHUE HMONG DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +1E144;NYIAKENG PUACHUE HMONG DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +1E145;NYIAKENG PUACHUE HMONG DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +1E146;NYIAKENG PUACHUE HMONG DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +1E147;NYIAKENG PUACHUE HMONG DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +1E148;NYIAKENG PUACHUE HMONG DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +1E149;NYIAKENG PUACHUE HMONG DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +1E14E;NYIAKENG PUACHUE HMONG LOGOGRAM NYAJ;Lo;0;L;;;;;N;;;;; +1E14F;NYIAKENG PUACHUE HMONG CIRCLED CA;So;0;L;;;;;N;;;;; +1E290;TOTO LETTER PA;Lo;0;L;;;;;N;;;;; +1E291;TOTO LETTER BA;Lo;0;L;;;;;N;;;;; +1E292;TOTO LETTER TA;Lo;0;L;;;;;N;;;;; +1E293;TOTO LETTER DA;Lo;0;L;;;;;N;;;;; +1E294;TOTO LETTER KA;Lo;0;L;;;;;N;;;;; +1E295;TOTO LETTER GA;Lo;0;L;;;;;N;;;;; +1E296;TOTO LETTER MA;Lo;0;L;;;;;N;;;;; +1E297;TOTO LETTER NA;Lo;0;L;;;;;N;;;;; +1E298;TOTO LETTER NGA;Lo;0;L;;;;;N;;;;; +1E299;TOTO LETTER SA;Lo;0;L;;;;;N;;;;; +1E29A;TOTO LETTER CHA;Lo;0;L;;;;;N;;;;; +1E29B;TOTO LETTER YA;Lo;0;L;;;;;N;;;;; +1E29C;TOTO LETTER WA;Lo;0;L;;;;;N;;;;; +1E29D;TOTO LETTER JA;Lo;0;L;;;;;N;;;;; +1E29E;TOTO LETTER HA;Lo;0;L;;;;;N;;;;; +1E29F;TOTO LETTER RA;Lo;0;L;;;;;N;;;;; +1E2A0;TOTO LETTER LA;Lo;0;L;;;;;N;;;;; +1E2A1;TOTO LETTER I;Lo;0;L;;;;;N;;;;; +1E2A2;TOTO LETTER BREATHY I;Lo;0;L;;;;;N;;;;; +1E2A3;TOTO LETTER IU;Lo;0;L;;;;;N;;;;; +1E2A4;TOTO LETTER BREATHY IU;Lo;0;L;;;;;N;;;;; +1E2A5;TOTO LETTER U;Lo;0;L;;;;;N;;;;; +1E2A6;TOTO LETTER E;Lo;0;L;;;;;N;;;;; +1E2A7;TOTO LETTER BREATHY E;Lo;0;L;;;;;N;;;;; +1E2A8;TOTO LETTER EO;Lo;0;L;;;;;N;;;;; +1E2A9;TOTO LETTER BREATHY EO;Lo;0;L;;;;;N;;;;; +1E2AA;TOTO LETTER O;Lo;0;L;;;;;N;;;;; +1E2AB;TOTO LETTER AE;Lo;0;L;;;;;N;;;;; +1E2AC;TOTO LETTER BREATHY AE;Lo;0;L;;;;;N;;;;; +1E2AD;TOTO LETTER A;Lo;0;L;;;;;N;;;;; +1E2AE;TOTO SIGN RISING TONE;Mn;230;NSM;;;;;N;;;;; +1E2C0;WANCHO LETTER AA;Lo;0;L;;;;;N;;;;; +1E2C1;WANCHO LETTER A;Lo;0;L;;;;;N;;;;; +1E2C2;WANCHO LETTER BA;Lo;0;L;;;;;N;;;;; +1E2C3;WANCHO LETTER CA;Lo;0;L;;;;;N;;;;; +1E2C4;WANCHO LETTER DA;Lo;0;L;;;;;N;;;;; +1E2C5;WANCHO LETTER GA;Lo;0;L;;;;;N;;;;; +1E2C6;WANCHO LETTER YA;Lo;0;L;;;;;N;;;;; +1E2C7;WANCHO LETTER PHA;Lo;0;L;;;;;N;;;;; +1E2C8;WANCHO LETTER LA;Lo;0;L;;;;;N;;;;; +1E2C9;WANCHO LETTER NA;Lo;0;L;;;;;N;;;;; +1E2CA;WANCHO LETTER PA;Lo;0;L;;;;;N;;;;; +1E2CB;WANCHO LETTER TA;Lo;0;L;;;;;N;;;;; +1E2CC;WANCHO LETTER THA;Lo;0;L;;;;;N;;;;; +1E2CD;WANCHO LETTER FA;Lo;0;L;;;;;N;;;;; +1E2CE;WANCHO LETTER SA;Lo;0;L;;;;;N;;;;; +1E2CF;WANCHO LETTER SHA;Lo;0;L;;;;;N;;;;; +1E2D0;WANCHO LETTER JA;Lo;0;L;;;;;N;;;;; +1E2D1;WANCHO LETTER ZA;Lo;0;L;;;;;N;;;;; +1E2D2;WANCHO LETTER WA;Lo;0;L;;;;;N;;;;; +1E2D3;WANCHO LETTER VA;Lo;0;L;;;;;N;;;;; +1E2D4;WANCHO LETTER KA;Lo;0;L;;;;;N;;;;; +1E2D5;WANCHO LETTER O;Lo;0;L;;;;;N;;;;; +1E2D6;WANCHO LETTER AU;Lo;0;L;;;;;N;;;;; +1E2D7;WANCHO LETTER RA;Lo;0;L;;;;;N;;;;; +1E2D8;WANCHO LETTER MA;Lo;0;L;;;;;N;;;;; +1E2D9;WANCHO LETTER KHA;Lo;0;L;;;;;N;;;;; +1E2DA;WANCHO LETTER HA;Lo;0;L;;;;;N;;;;; +1E2DB;WANCHO LETTER E;Lo;0;L;;;;;N;;;;; +1E2DC;WANCHO LETTER I;Lo;0;L;;;;;N;;;;; +1E2DD;WANCHO LETTER NGA;Lo;0;L;;;;;N;;;;; +1E2DE;WANCHO LETTER U;Lo;0;L;;;;;N;;;;; +1E2DF;WANCHO LETTER LLHA;Lo;0;L;;;;;N;;;;; +1E2E0;WANCHO LETTER TSA;Lo;0;L;;;;;N;;;;; +1E2E1;WANCHO LETTER TRA;Lo;0;L;;;;;N;;;;; +1E2E2;WANCHO LETTER ONG;Lo;0;L;;;;;N;;;;; +1E2E3;WANCHO LETTER AANG;Lo;0;L;;;;;N;;;;; +1E2E4;WANCHO LETTER ANG;Lo;0;L;;;;;N;;;;; +1E2E5;WANCHO LETTER ING;Lo;0;L;;;;;N;;;;; +1E2E6;WANCHO LETTER ON;Lo;0;L;;;;;N;;;;; +1E2E7;WANCHO LETTER EN;Lo;0;L;;;;;N;;;;; +1E2E8;WANCHO LETTER AAN;Lo;0;L;;;;;N;;;;; +1E2E9;WANCHO LETTER NYA;Lo;0;L;;;;;N;;;;; +1E2EA;WANCHO LETTER UEN;Lo;0;L;;;;;N;;;;; +1E2EB;WANCHO LETTER YIH;Lo;0;L;;;;;N;;;;; +1E2EC;WANCHO TONE TUP;Mn;230;NSM;;;;;N;;;;; +1E2ED;WANCHO TONE TUPNI;Mn;230;NSM;;;;;N;;;;; +1E2EE;WANCHO TONE KOI;Mn;230;NSM;;;;;N;;;;; +1E2EF;WANCHO TONE KOINI;Mn;230;NSM;;;;;N;;;;; +1E2F0;WANCHO DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +1E2F1;WANCHO DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +1E2F2;WANCHO DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +1E2F3;WANCHO DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +1E2F4;WANCHO DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +1E2F5;WANCHO DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +1E2F6;WANCHO DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +1E2F7;WANCHO DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +1E2F8;WANCHO DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +1E2F9;WANCHO DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +1E2FF;WANCHO NGUN SIGN;Sc;0;ET;;;;;N;;;;; +1E4D0;NAG MUNDARI LETTER O;Lo;0;L;;;;;N;;;;; +1E4D1;NAG MUNDARI LETTER OP;Lo;0;L;;;;;N;;;;; +1E4D2;NAG MUNDARI LETTER OL;Lo;0;L;;;;;N;;;;; +1E4D3;NAG MUNDARI LETTER OY;Lo;0;L;;;;;N;;;;; +1E4D4;NAG MUNDARI LETTER ONG;Lo;0;L;;;;;N;;;;; +1E4D5;NAG MUNDARI LETTER A;Lo;0;L;;;;;N;;;;; +1E4D6;NAG MUNDARI LETTER AJ;Lo;0;L;;;;;N;;;;; +1E4D7;NAG MUNDARI LETTER AB;Lo;0;L;;;;;N;;;;; +1E4D8;NAG MUNDARI LETTER ANY;Lo;0;L;;;;;N;;;;; +1E4D9;NAG MUNDARI LETTER AH;Lo;0;L;;;;;N;;;;; +1E4DA;NAG MUNDARI LETTER I;Lo;0;L;;;;;N;;;;; +1E4DB;NAG MUNDARI LETTER IS;Lo;0;L;;;;;N;;;;; +1E4DC;NAG MUNDARI LETTER IDD;Lo;0;L;;;;;N;;;;; +1E4DD;NAG MUNDARI LETTER IT;Lo;0;L;;;;;N;;;;; +1E4DE;NAG MUNDARI LETTER IH;Lo;0;L;;;;;N;;;;; +1E4DF;NAG MUNDARI LETTER U;Lo;0;L;;;;;N;;;;; +1E4E0;NAG MUNDARI LETTER UC;Lo;0;L;;;;;N;;;;; +1E4E1;NAG MUNDARI LETTER UD;Lo;0;L;;;;;N;;;;; +1E4E2;NAG MUNDARI LETTER UK;Lo;0;L;;;;;N;;;;; +1E4E3;NAG MUNDARI LETTER UR;Lo;0;L;;;;;N;;;;; +1E4E4;NAG MUNDARI LETTER E;Lo;0;L;;;;;N;;;;; +1E4E5;NAG MUNDARI LETTER ENN;Lo;0;L;;;;;N;;;;; +1E4E6;NAG MUNDARI LETTER EG;Lo;0;L;;;;;N;;;;; +1E4E7;NAG MUNDARI LETTER EM;Lo;0;L;;;;;N;;;;; +1E4E8;NAG MUNDARI LETTER EN;Lo;0;L;;;;;N;;;;; +1E4E9;NAG MUNDARI LETTER ETT;Lo;0;L;;;;;N;;;;; +1E4EA;NAG MUNDARI LETTER ELL;Lo;0;L;;;;;N;;;;; +1E4EB;NAG MUNDARI SIGN OJOD;Lm;0;L;;;;;N;;;;; +1E4EC;NAG MUNDARI SIGN MUHOR;Mn;232;NSM;;;;;N;;;;; +1E4ED;NAG MUNDARI SIGN TOYOR;Mn;232;NSM;;;;;N;;;;; +1E4EE;NAG MUNDARI SIGN IKIR;Mn;220;NSM;;;;;N;;;;; +1E4EF;NAG MUNDARI SIGN SUTUH;Mn;230;NSM;;;;;N;;;;; +1E4F0;NAG MUNDARI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +1E4F1;NAG MUNDARI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +1E4F2;NAG MUNDARI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +1E4F3;NAG MUNDARI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +1E4F4;NAG MUNDARI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +1E4F5;NAG MUNDARI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +1E4F6;NAG MUNDARI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +1E4F7;NAG MUNDARI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +1E4F8;NAG MUNDARI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +1E4F9;NAG MUNDARI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +1E5D0;OL ONAL LETTER O;Lo;0;L;;;;;N;;;;; +1E5D1;OL ONAL LETTER OM;Lo;0;L;;;;;N;;;;; +1E5D2;OL ONAL LETTER ONG;Lo;0;L;;;;;N;;;;; +1E5D3;OL ONAL LETTER ORR;Lo;0;L;;;;;N;;;;; +1E5D4;OL ONAL LETTER OO;Lo;0;L;;;;;N;;;;; +1E5D5;OL ONAL LETTER OY;Lo;0;L;;;;;N;;;;; +1E5D6;OL ONAL LETTER A;Lo;0;L;;;;;N;;;;; +1E5D7;OL ONAL LETTER AD;Lo;0;L;;;;;N;;;;; +1E5D8;OL ONAL LETTER AB;Lo;0;L;;;;;N;;;;; +1E5D9;OL ONAL LETTER AH;Lo;0;L;;;;;N;;;;; +1E5DA;OL ONAL LETTER AL;Lo;0;L;;;;;N;;;;; +1E5DB;OL ONAL LETTER AW;Lo;0;L;;;;;N;;;;; +1E5DC;OL ONAL LETTER I;Lo;0;L;;;;;N;;;;; +1E5DD;OL ONAL LETTER IT;Lo;0;L;;;;;N;;;;; +1E5DE;OL ONAL LETTER IP;Lo;0;L;;;;;N;;;;; +1E5DF;OL ONAL LETTER ITT;Lo;0;L;;;;;N;;;;; +1E5E0;OL ONAL LETTER ID;Lo;0;L;;;;;N;;;;; +1E5E1;OL ONAL LETTER IN;Lo;0;L;;;;;N;;;;; +1E5E2;OL ONAL LETTER U;Lo;0;L;;;;;N;;;;; +1E5E3;OL ONAL LETTER UK;Lo;0;L;;;;;N;;;;; +1E5E4;OL ONAL LETTER UDD;Lo;0;L;;;;;N;;;;; +1E5E5;OL ONAL LETTER UJ;Lo;0;L;;;;;N;;;;; +1E5E6;OL ONAL LETTER UNY;Lo;0;L;;;;;N;;;;; +1E5E7;OL ONAL LETTER UR;Lo;0;L;;;;;N;;;;; +1E5E8;OL ONAL LETTER E;Lo;0;L;;;;;N;;;;; +1E5E9;OL ONAL LETTER ES;Lo;0;L;;;;;N;;;;; +1E5EA;OL ONAL LETTER EH;Lo;0;L;;;;;N;;;;; +1E5EB;OL ONAL LETTER EC;Lo;0;L;;;;;N;;;;; +1E5EC;OL ONAL LETTER ENN;Lo;0;L;;;;;N;;;;; +1E5ED;OL ONAL LETTER EG;Lo;0;L;;;;;N;;;;; +1E5EE;OL ONAL SIGN MU;Mn;230;NSM;;;;;N;;;;; +1E5EF;OL ONAL SIGN IKIR;Mn;220;NSM;;;;;N;;;;; +1E5F0;OL ONAL SIGN HODDOND;Lo;0;L;;;;;N;;;;; +1E5F1;OL ONAL DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +1E5F2;OL ONAL DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +1E5F3;OL ONAL DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +1E5F4;OL ONAL DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +1E5F5;OL ONAL DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +1E5F6;OL ONAL DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +1E5F7;OL ONAL DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +1E5F8;OL ONAL DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +1E5F9;OL ONAL DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +1E5FA;OL ONAL DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +1E5FF;OL ONAL ABBREVIATION SIGN;Po;0;L;;;;;N;;;;; +1E6C0;TAI YO LETTER LOW KO;Lo;0;L;;;;;N;;;;; +1E6C1;TAI YO LETTER HIGH KO;Lo;0;L;;;;;N;;;;; +1E6C2;TAI YO LETTER LOW KHO;Lo;0;L;;;;;N;;;;; +1E6C3;TAI YO LETTER HIGH KHO;Lo;0;L;;;;;N;;;;; +1E6C4;TAI YO LETTER GO;Lo;0;L;;;;;N;;;;; +1E6C5;TAI YO LETTER NGO;Lo;0;L;;;;;N;;;;; +1E6C6;TAI YO LETTER CO;Lo;0;L;;;;;N;;;;; +1E6C7;TAI YO LETTER LOW XO;Lo;0;L;;;;;N;;;;; +1E6C8;TAI YO LETTER HIGH XO;Lo;0;L;;;;;N;;;;; +1E6C9;TAI YO LETTER LOW NYO;Lo;0;L;;;;;N;;;;; +1E6CA;TAI YO LETTER HIGH NYO;Lo;0;L;;;;;N;;;;; +1E6CB;TAI YO LETTER DO;Lo;0;L;;;;;N;;;;; +1E6CC;TAI YO LETTER LOW TO;Lo;0;L;;;;;N;;;;; +1E6CD;TAI YO LETTER HIGH TO;Lo;0;L;;;;;N;;;;; +1E6CE;TAI YO LETTER THO;Lo;0;L;;;;;N;;;;; +1E6CF;TAI YO LETTER NO;Lo;0;L;;;;;N;;;;; +1E6D0;TAI YO LETTER BO;Lo;0;L;;;;;N;;;;; +1E6D1;TAI YO LETTER LOW PO;Lo;0;L;;;;;N;;;;; +1E6D2;TAI YO LETTER HIGH PO;Lo;0;L;;;;;N;;;;; +1E6D3;TAI YO LETTER PHO;Lo;0;L;;;;;N;;;;; +1E6D4;TAI YO LETTER LOW FO;Lo;0;L;;;;;N;;;;; +1E6D5;TAI YO LETTER HIGH FO;Lo;0;L;;;;;N;;;;; +1E6D6;TAI YO LETTER MO;Lo;0;L;;;;;N;;;;; +1E6D7;TAI YO LETTER YO;Lo;0;L;;;;;N;;;;; +1E6D8;TAI YO LETTER LO;Lo;0;L;;;;;N;;;;; +1E6D9;TAI YO LETTER VO;Lo;0;L;;;;;N;;;;; +1E6DA;TAI YO LETTER LOW HO;Lo;0;L;;;;;N;;;;; +1E6DB;TAI YO LETTER HIGH HO;Lo;0;L;;;;;N;;;;; +1E6DC;TAI YO LETTER QO;Lo;0;L;;;;;N;;;;; +1E6DD;TAI YO LETTER LOW KVO;Lo;0;L;;;;;N;;;;; +1E6DE;TAI YO LETTER HIGH KVO;Lo;0;L;;;;;N;;;;; +1E6E0;TAI YO LETTER AA;Lo;0;L;;;;;N;;;;; +1E6E1;TAI YO LETTER I;Lo;0;L;;;;;N;;;;; +1E6E2;TAI YO LETTER UE;Lo;0;L;;;;;N;;;;; +1E6E3;TAI YO SIGN UE;Mn;230;NSM;;;;;N;;;;; +1E6E4;TAI YO LETTER U;Lo;0;L;;;;;N;;;;; +1E6E5;TAI YO LETTER AE;Lo;0;L;;;;;N;;;;; +1E6E6;TAI YO SIGN AU;Mn;230;NSM;;;;;N;;;;; +1E6E7;TAI YO LETTER O;Lo;0;L;;;;;N;;;;; +1E6E8;TAI YO LETTER E;Lo;0;L;;;;;N;;;;; +1E6E9;TAI YO LETTER IA;Lo;0;L;;;;;N;;;;; +1E6EA;TAI YO LETTER UEA;Lo;0;L;;;;;N;;;;; +1E6EB;TAI YO LETTER UA;Lo;0;L;;;;;N;;;;; +1E6EC;TAI YO LETTER OO;Lo;0;L;;;;;N;;;;; +1E6ED;TAI YO LETTER AUE;Lo;0;L;;;;;N;;;;; +1E6EE;TAI YO SIGN AY;Mn;230;NSM;;;;;N;;;;; +1E6EF;TAI YO SIGN ANG;Mn;230;NSM;;;;;N;;;;; +1E6F0;TAI YO LETTER AN;Lo;0;L;;;;;N;;;;; +1E6F1;TAI YO LETTER AM;Lo;0;L;;;;;N;;;;; +1E6F2;TAI YO LETTER AK;Lo;0;L;;;;;N;;;;; +1E6F3;TAI YO LETTER AT;Lo;0;L;;;;;N;;;;; +1E6F4;TAI YO LETTER AP;Lo;0;L;;;;;N;;;;; +1E6F5;TAI YO SIGN OM;Mn;230;NSM;;;;;N;;;;; +1E6FE;TAI YO SYMBOL MUEANG;Lo;0;L;;;;;N;;;;; +1E6FF;TAI YO XAM LAI;Lm;0;L;;;;;N;;;;; +1E7E0;ETHIOPIC SYLLABLE HHYA;Lo;0;L;;;;;N;;;;; +1E7E1;ETHIOPIC SYLLABLE HHYU;Lo;0;L;;;;;N;;;;; +1E7E2;ETHIOPIC SYLLABLE HHYI;Lo;0;L;;;;;N;;;;; +1E7E3;ETHIOPIC SYLLABLE HHYAA;Lo;0;L;;;;;N;;;;; +1E7E4;ETHIOPIC SYLLABLE HHYEE;Lo;0;L;;;;;N;;;;; +1E7E5;ETHIOPIC SYLLABLE HHYE;Lo;0;L;;;;;N;;;;; +1E7E6;ETHIOPIC SYLLABLE HHYO;Lo;0;L;;;;;N;;;;; +1E7E8;ETHIOPIC SYLLABLE GURAGE HHWA;Lo;0;L;;;;;N;;;;; +1E7E9;ETHIOPIC SYLLABLE HHWI;Lo;0;L;;;;;N;;;;; +1E7EA;ETHIOPIC SYLLABLE HHWEE;Lo;0;L;;;;;N;;;;; +1E7EB;ETHIOPIC SYLLABLE HHWE;Lo;0;L;;;;;N;;;;; +1E7ED;ETHIOPIC SYLLABLE GURAGE MWI;Lo;0;L;;;;;N;;;;; +1E7EE;ETHIOPIC SYLLABLE GURAGE MWEE;Lo;0;L;;;;;N;;;;; +1E7F0;ETHIOPIC SYLLABLE GURAGE QWI;Lo;0;L;;;;;N;;;;; +1E7F1;ETHIOPIC SYLLABLE GURAGE QWEE;Lo;0;L;;;;;N;;;;; +1E7F2;ETHIOPIC SYLLABLE GURAGE QWE;Lo;0;L;;;;;N;;;;; +1E7F3;ETHIOPIC SYLLABLE GURAGE BWI;Lo;0;L;;;;;N;;;;; +1E7F4;ETHIOPIC SYLLABLE GURAGE BWEE;Lo;0;L;;;;;N;;;;; +1E7F5;ETHIOPIC SYLLABLE GURAGE KWI;Lo;0;L;;;;;N;;;;; +1E7F6;ETHIOPIC SYLLABLE GURAGE KWEE;Lo;0;L;;;;;N;;;;; +1E7F7;ETHIOPIC SYLLABLE GURAGE KWE;Lo;0;L;;;;;N;;;;; +1E7F8;ETHIOPIC SYLLABLE GURAGE GWI;Lo;0;L;;;;;N;;;;; +1E7F9;ETHIOPIC SYLLABLE GURAGE GWEE;Lo;0;L;;;;;N;;;;; +1E7FA;ETHIOPIC SYLLABLE GURAGE GWE;Lo;0;L;;;;;N;;;;; +1E7FB;ETHIOPIC SYLLABLE GURAGE FWI;Lo;0;L;;;;;N;;;;; +1E7FC;ETHIOPIC SYLLABLE GURAGE FWEE;Lo;0;L;;;;;N;;;;; +1E7FD;ETHIOPIC SYLLABLE GURAGE PWI;Lo;0;L;;;;;N;;;;; +1E7FE;ETHIOPIC SYLLABLE GURAGE PWEE;Lo;0;L;;;;;N;;;;; +1E800;MENDE KIKAKUI SYLLABLE M001 KI;Lo;0;R;;;;;N;;;;; +1E801;MENDE KIKAKUI SYLLABLE M002 KA;Lo;0;R;;;;;N;;;;; +1E802;MENDE KIKAKUI SYLLABLE M003 KU;Lo;0;R;;;;;N;;;;; +1E803;MENDE KIKAKUI SYLLABLE M065 KEE;Lo;0;R;;;;;N;;;;; +1E804;MENDE KIKAKUI SYLLABLE M095 KE;Lo;0;R;;;;;N;;;;; +1E805;MENDE KIKAKUI SYLLABLE M076 KOO;Lo;0;R;;;;;N;;;;; +1E806;MENDE KIKAKUI SYLLABLE M048 KO;Lo;0;R;;;;;N;;;;; +1E807;MENDE KIKAKUI SYLLABLE M179 KUA;Lo;0;R;;;;;N;;;;; +1E808;MENDE KIKAKUI SYLLABLE M004 WI;Lo;0;R;;;;;N;;;;; +1E809;MENDE KIKAKUI SYLLABLE M005 WA;Lo;0;R;;;;;N;;;;; +1E80A;MENDE KIKAKUI SYLLABLE M006 WU;Lo;0;R;;;;;N;;;;; +1E80B;MENDE KIKAKUI SYLLABLE M126 WEE;Lo;0;R;;;;;N;;;;; +1E80C;MENDE KIKAKUI SYLLABLE M118 WE;Lo;0;R;;;;;N;;;;; +1E80D;MENDE KIKAKUI SYLLABLE M114 WOO;Lo;0;R;;;;;N;;;;; +1E80E;MENDE KIKAKUI SYLLABLE M045 WO;Lo;0;R;;;;;N;;;;; +1E80F;MENDE KIKAKUI SYLLABLE M194 WUI;Lo;0;R;;;;;N;;;;; +1E810;MENDE KIKAKUI SYLLABLE M143 WEI;Lo;0;R;;;;;N;;;;; +1E811;MENDE KIKAKUI SYLLABLE M061 WVI;Lo;0;R;;;;;N;;;;; +1E812;MENDE KIKAKUI SYLLABLE M049 WVA;Lo;0;R;;;;;N;;;;; +1E813;MENDE KIKAKUI SYLLABLE M139 WVE;Lo;0;R;;;;;N;;;;; +1E814;MENDE KIKAKUI SYLLABLE M007 MIN;Lo;0;R;;;;;N;;;;; +1E815;MENDE KIKAKUI SYLLABLE M008 MAN;Lo;0;R;;;;;N;;;;; +1E816;MENDE KIKAKUI SYLLABLE M009 MUN;Lo;0;R;;;;;N;;;;; +1E817;MENDE KIKAKUI SYLLABLE M059 MEN;Lo;0;R;;;;;N;;;;; +1E818;MENDE KIKAKUI SYLLABLE M094 MON;Lo;0;R;;;;;N;;;;; +1E819;MENDE KIKAKUI SYLLABLE M154 MUAN;Lo;0;R;;;;;N;;;;; +1E81A;MENDE KIKAKUI SYLLABLE M189 MUEN;Lo;0;R;;;;;N;;;;; +1E81B;MENDE KIKAKUI SYLLABLE M010 BI;Lo;0;R;;;;;N;;;;; +1E81C;MENDE KIKAKUI SYLLABLE M011 BA;Lo;0;R;;;;;N;;;;; +1E81D;MENDE KIKAKUI SYLLABLE M012 BU;Lo;0;R;;;;;N;;;;; +1E81E;MENDE KIKAKUI SYLLABLE M150 BEE;Lo;0;R;;;;;N;;;;; +1E81F;MENDE KIKAKUI SYLLABLE M097 BE;Lo;0;R;;;;;N;;;;; +1E820;MENDE KIKAKUI SYLLABLE M103 BOO;Lo;0;R;;;;;N;;;;; +1E821;MENDE KIKAKUI SYLLABLE M138 BO;Lo;0;R;;;;;N;;;;; +1E822;MENDE KIKAKUI SYLLABLE M013 I;Lo;0;R;;;;;N;;;;; +1E823;MENDE KIKAKUI SYLLABLE M014 A;Lo;0;R;;;;;N;;;;; +1E824;MENDE KIKAKUI SYLLABLE M015 U;Lo;0;R;;;;;N;;;;; +1E825;MENDE KIKAKUI SYLLABLE M163 EE;Lo;0;R;;;;;N;;;;; +1E826;MENDE KIKAKUI SYLLABLE M100 E;Lo;0;R;;;;;N;;;;; +1E827;MENDE KIKAKUI SYLLABLE M165 OO;Lo;0;R;;;;;N;;;;; +1E828;MENDE KIKAKUI SYLLABLE M147 O;Lo;0;R;;;;;N;;;;; +1E829;MENDE KIKAKUI SYLLABLE M137 EI;Lo;0;R;;;;;N;;;;; +1E82A;MENDE KIKAKUI SYLLABLE M131 IN;Lo;0;R;;;;;N;;;;; +1E82B;MENDE KIKAKUI SYLLABLE M135 IN;Lo;0;R;;;;;N;;;;; +1E82C;MENDE KIKAKUI SYLLABLE M195 AN;Lo;0;R;;;;;N;;;;; +1E82D;MENDE KIKAKUI SYLLABLE M178 EN;Lo;0;R;;;;;N;;;;; +1E82E;MENDE KIKAKUI SYLLABLE M019 SI;Lo;0;R;;;;;N;;;;; +1E82F;MENDE KIKAKUI SYLLABLE M020 SA;Lo;0;R;;;;;N;;;;; +1E830;MENDE KIKAKUI SYLLABLE M021 SU;Lo;0;R;;;;;N;;;;; +1E831;MENDE KIKAKUI SYLLABLE M162 SEE;Lo;0;R;;;;;N;;;;; +1E832;MENDE KIKAKUI SYLLABLE M116 SE;Lo;0;R;;;;;N;;;;; +1E833;MENDE KIKAKUI SYLLABLE M136 SOO;Lo;0;R;;;;;N;;;;; +1E834;MENDE KIKAKUI SYLLABLE M079 SO;Lo;0;R;;;;;N;;;;; +1E835;MENDE KIKAKUI SYLLABLE M196 SIA;Lo;0;R;;;;;N;;;;; +1E836;MENDE KIKAKUI SYLLABLE M025 LI;Lo;0;R;;;;;N;;;;; +1E837;MENDE KIKAKUI SYLLABLE M026 LA;Lo;0;R;;;;;N;;;;; +1E838;MENDE KIKAKUI SYLLABLE M027 LU;Lo;0;R;;;;;N;;;;; +1E839;MENDE KIKAKUI SYLLABLE M084 LEE;Lo;0;R;;;;;N;;;;; +1E83A;MENDE KIKAKUI SYLLABLE M073 LE;Lo;0;R;;;;;N;;;;; +1E83B;MENDE KIKAKUI SYLLABLE M054 LOO;Lo;0;R;;;;;N;;;;; +1E83C;MENDE KIKAKUI SYLLABLE M153 LO;Lo;0;R;;;;;N;;;;; +1E83D;MENDE KIKAKUI SYLLABLE M110 LONG LE;Lo;0;R;;;;;N;;;;; +1E83E;MENDE KIKAKUI SYLLABLE M016 DI;Lo;0;R;;;;;N;;;;; +1E83F;MENDE KIKAKUI SYLLABLE M017 DA;Lo;0;R;;;;;N;;;;; +1E840;MENDE KIKAKUI SYLLABLE M018 DU;Lo;0;R;;;;;N;;;;; +1E841;MENDE KIKAKUI SYLLABLE M089 DEE;Lo;0;R;;;;;N;;;;; +1E842;MENDE KIKAKUI SYLLABLE M180 DOO;Lo;0;R;;;;;N;;;;; +1E843;MENDE KIKAKUI SYLLABLE M181 DO;Lo;0;R;;;;;N;;;;; +1E844;MENDE KIKAKUI SYLLABLE M022 TI;Lo;0;R;;;;;N;;;;; +1E845;MENDE KIKAKUI SYLLABLE M023 TA;Lo;0;R;;;;;N;;;;; +1E846;MENDE KIKAKUI SYLLABLE M024 TU;Lo;0;R;;;;;N;;;;; +1E847;MENDE KIKAKUI SYLLABLE M091 TEE;Lo;0;R;;;;;N;;;;; +1E848;MENDE KIKAKUI SYLLABLE M055 TE;Lo;0;R;;;;;N;;;;; +1E849;MENDE KIKAKUI SYLLABLE M104 TOO;Lo;0;R;;;;;N;;;;; +1E84A;MENDE KIKAKUI SYLLABLE M069 TO;Lo;0;R;;;;;N;;;;; +1E84B;MENDE KIKAKUI SYLLABLE M028 JI;Lo;0;R;;;;;N;;;;; +1E84C;MENDE KIKAKUI SYLLABLE M029 JA;Lo;0;R;;;;;N;;;;; +1E84D;MENDE KIKAKUI SYLLABLE M030 JU;Lo;0;R;;;;;N;;;;; +1E84E;MENDE KIKAKUI SYLLABLE M157 JEE;Lo;0;R;;;;;N;;;;; +1E84F;MENDE KIKAKUI SYLLABLE M113 JE;Lo;0;R;;;;;N;;;;; +1E850;MENDE KIKAKUI SYLLABLE M160 JOO;Lo;0;R;;;;;N;;;;; +1E851;MENDE KIKAKUI SYLLABLE M063 JO;Lo;0;R;;;;;N;;;;; +1E852;MENDE KIKAKUI SYLLABLE M175 LONG JO;Lo;0;R;;;;;N;;;;; +1E853;MENDE KIKAKUI SYLLABLE M031 YI;Lo;0;R;;;;;N;;;;; +1E854;MENDE KIKAKUI SYLLABLE M032 YA;Lo;0;R;;;;;N;;;;; +1E855;MENDE KIKAKUI SYLLABLE M033 YU;Lo;0;R;;;;;N;;;;; +1E856;MENDE KIKAKUI SYLLABLE M109 YEE;Lo;0;R;;;;;N;;;;; +1E857;MENDE KIKAKUI SYLLABLE M080 YE;Lo;0;R;;;;;N;;;;; +1E858;MENDE KIKAKUI SYLLABLE M141 YOO;Lo;0;R;;;;;N;;;;; +1E859;MENDE KIKAKUI SYLLABLE M121 YO;Lo;0;R;;;;;N;;;;; +1E85A;MENDE KIKAKUI SYLLABLE M034 FI;Lo;0;R;;;;;N;;;;; +1E85B;MENDE KIKAKUI SYLLABLE M035 FA;Lo;0;R;;;;;N;;;;; +1E85C;MENDE KIKAKUI SYLLABLE M036 FU;Lo;0;R;;;;;N;;;;; +1E85D;MENDE KIKAKUI SYLLABLE M078 FEE;Lo;0;R;;;;;N;;;;; +1E85E;MENDE KIKAKUI SYLLABLE M075 FE;Lo;0;R;;;;;N;;;;; +1E85F;MENDE KIKAKUI SYLLABLE M133 FOO;Lo;0;R;;;;;N;;;;; +1E860;MENDE KIKAKUI SYLLABLE M088 FO;Lo;0;R;;;;;N;;;;; +1E861;MENDE KIKAKUI SYLLABLE M197 FUA;Lo;0;R;;;;;N;;;;; +1E862;MENDE KIKAKUI SYLLABLE M101 FAN;Lo;0;R;;;;;N;;;;; +1E863;MENDE KIKAKUI SYLLABLE M037 NIN;Lo;0;R;;;;;N;;;;; +1E864;MENDE KIKAKUI SYLLABLE M038 NAN;Lo;0;R;;;;;N;;;;; +1E865;MENDE KIKAKUI SYLLABLE M039 NUN;Lo;0;R;;;;;N;;;;; +1E866;MENDE KIKAKUI SYLLABLE M117 NEN;Lo;0;R;;;;;N;;;;; +1E867;MENDE KIKAKUI SYLLABLE M169 NON;Lo;0;R;;;;;N;;;;; +1E868;MENDE KIKAKUI SYLLABLE M176 HI;Lo;0;R;;;;;N;;;;; +1E869;MENDE KIKAKUI SYLLABLE M041 HA;Lo;0;R;;;;;N;;;;; +1E86A;MENDE KIKAKUI SYLLABLE M186 HU;Lo;0;R;;;;;N;;;;; +1E86B;MENDE KIKAKUI SYLLABLE M040 HEE;Lo;0;R;;;;;N;;;;; +1E86C;MENDE KIKAKUI SYLLABLE M096 HE;Lo;0;R;;;;;N;;;;; +1E86D;MENDE KIKAKUI SYLLABLE M042 HOO;Lo;0;R;;;;;N;;;;; +1E86E;MENDE KIKAKUI SYLLABLE M140 HO;Lo;0;R;;;;;N;;;;; +1E86F;MENDE KIKAKUI SYLLABLE M083 HEEI;Lo;0;R;;;;;N;;;;; +1E870;MENDE KIKAKUI SYLLABLE M128 HOOU;Lo;0;R;;;;;N;;;;; +1E871;MENDE KIKAKUI SYLLABLE M053 HIN;Lo;0;R;;;;;N;;;;; +1E872;MENDE KIKAKUI SYLLABLE M130 HAN;Lo;0;R;;;;;N;;;;; +1E873;MENDE KIKAKUI SYLLABLE M087 HUN;Lo;0;R;;;;;N;;;;; +1E874;MENDE KIKAKUI SYLLABLE M052 HEN;Lo;0;R;;;;;N;;;;; +1E875;MENDE KIKAKUI SYLLABLE M193 HON;Lo;0;R;;;;;N;;;;; +1E876;MENDE KIKAKUI SYLLABLE M046 HUAN;Lo;0;R;;;;;N;;;;; +1E877;MENDE KIKAKUI SYLLABLE M090 NGGI;Lo;0;R;;;;;N;;;;; +1E878;MENDE KIKAKUI SYLLABLE M043 NGGA;Lo;0;R;;;;;N;;;;; +1E879;MENDE KIKAKUI SYLLABLE M082 NGGU;Lo;0;R;;;;;N;;;;; +1E87A;MENDE KIKAKUI SYLLABLE M115 NGGEE;Lo;0;R;;;;;N;;;;; +1E87B;MENDE KIKAKUI SYLLABLE M146 NGGE;Lo;0;R;;;;;N;;;;; +1E87C;MENDE KIKAKUI SYLLABLE M156 NGGOO;Lo;0;R;;;;;N;;;;; +1E87D;MENDE KIKAKUI SYLLABLE M120 NGGO;Lo;0;R;;;;;N;;;;; +1E87E;MENDE KIKAKUI SYLLABLE M159 NGGAA;Lo;0;R;;;;;N;;;;; +1E87F;MENDE KIKAKUI SYLLABLE M127 NGGUA;Lo;0;R;;;;;N;;;;; +1E880;MENDE KIKAKUI SYLLABLE M086 LONG NGGE;Lo;0;R;;;;;N;;;;; +1E881;MENDE KIKAKUI SYLLABLE M106 LONG NGGOO;Lo;0;R;;;;;N;;;;; +1E882;MENDE KIKAKUI SYLLABLE M183 LONG NGGO;Lo;0;R;;;;;N;;;;; +1E883;MENDE KIKAKUI SYLLABLE M155 GI;Lo;0;R;;;;;N;;;;; +1E884;MENDE KIKAKUI SYLLABLE M111 GA;Lo;0;R;;;;;N;;;;; +1E885;MENDE KIKAKUI SYLLABLE M168 GU;Lo;0;R;;;;;N;;;;; +1E886;MENDE KIKAKUI SYLLABLE M190 GEE;Lo;0;R;;;;;N;;;;; +1E887;MENDE KIKAKUI SYLLABLE M166 GUEI;Lo;0;R;;;;;N;;;;; +1E888;MENDE KIKAKUI SYLLABLE M167 GUAN;Lo;0;R;;;;;N;;;;; +1E889;MENDE KIKAKUI SYLLABLE M184 NGEN;Lo;0;R;;;;;N;;;;; +1E88A;MENDE KIKAKUI SYLLABLE M057 NGON;Lo;0;R;;;;;N;;;;; +1E88B;MENDE KIKAKUI SYLLABLE M177 NGUAN;Lo;0;R;;;;;N;;;;; +1E88C;MENDE KIKAKUI SYLLABLE M068 PI;Lo;0;R;;;;;N;;;;; +1E88D;MENDE KIKAKUI SYLLABLE M099 PA;Lo;0;R;;;;;N;;;;; +1E88E;MENDE KIKAKUI SYLLABLE M050 PU;Lo;0;R;;;;;N;;;;; +1E88F;MENDE KIKAKUI SYLLABLE M081 PEE;Lo;0;R;;;;;N;;;;; +1E890;MENDE KIKAKUI SYLLABLE M051 PE;Lo;0;R;;;;;N;;;;; +1E891;MENDE KIKAKUI SYLLABLE M102 POO;Lo;0;R;;;;;N;;;;; +1E892;MENDE KIKAKUI SYLLABLE M066 PO;Lo;0;R;;;;;N;;;;; +1E893;MENDE KIKAKUI SYLLABLE M145 MBI;Lo;0;R;;;;;N;;;;; +1E894;MENDE KIKAKUI SYLLABLE M062 MBA;Lo;0;R;;;;;N;;;;; +1E895;MENDE KIKAKUI SYLLABLE M122 MBU;Lo;0;R;;;;;N;;;;; +1E896;MENDE KIKAKUI SYLLABLE M047 MBEE;Lo;0;R;;;;;N;;;;; +1E897;MENDE KIKAKUI SYLLABLE M188 MBEE;Lo;0;R;;;;;N;;;;; +1E898;MENDE KIKAKUI SYLLABLE M072 MBE;Lo;0;R;;;;;N;;;;; +1E899;MENDE KIKAKUI SYLLABLE M172 MBOO;Lo;0;R;;;;;N;;;;; +1E89A;MENDE KIKAKUI SYLLABLE M174 MBO;Lo;0;R;;;;;N;;;;; +1E89B;MENDE KIKAKUI SYLLABLE M187 MBUU;Lo;0;R;;;;;N;;;;; +1E89C;MENDE KIKAKUI SYLLABLE M161 LONG MBE;Lo;0;R;;;;;N;;;;; +1E89D;MENDE KIKAKUI SYLLABLE M105 LONG MBOO;Lo;0;R;;;;;N;;;;; +1E89E;MENDE KIKAKUI SYLLABLE M142 LONG MBO;Lo;0;R;;;;;N;;;;; +1E89F;MENDE KIKAKUI SYLLABLE M132 KPI;Lo;0;R;;;;;N;;;;; +1E8A0;MENDE KIKAKUI SYLLABLE M092 KPA;Lo;0;R;;;;;N;;;;; +1E8A1;MENDE KIKAKUI SYLLABLE M074 KPU;Lo;0;R;;;;;N;;;;; +1E8A2;MENDE KIKAKUI SYLLABLE M044 KPEE;Lo;0;R;;;;;N;;;;; +1E8A3;MENDE KIKAKUI SYLLABLE M108 KPE;Lo;0;R;;;;;N;;;;; +1E8A4;MENDE KIKAKUI SYLLABLE M112 KPOO;Lo;0;R;;;;;N;;;;; +1E8A5;MENDE KIKAKUI SYLLABLE M158 KPO;Lo;0;R;;;;;N;;;;; +1E8A6;MENDE KIKAKUI SYLLABLE M124 GBI;Lo;0;R;;;;;N;;;;; +1E8A7;MENDE KIKAKUI SYLLABLE M056 GBA;Lo;0;R;;;;;N;;;;; +1E8A8;MENDE KIKAKUI SYLLABLE M148 GBU;Lo;0;R;;;;;N;;;;; +1E8A9;MENDE KIKAKUI SYLLABLE M093 GBEE;Lo;0;R;;;;;N;;;;; +1E8AA;MENDE KIKAKUI SYLLABLE M107 GBE;Lo;0;R;;;;;N;;;;; +1E8AB;MENDE KIKAKUI SYLLABLE M071 GBOO;Lo;0;R;;;;;N;;;;; +1E8AC;MENDE KIKAKUI SYLLABLE M070 GBO;Lo;0;R;;;;;N;;;;; +1E8AD;MENDE KIKAKUI SYLLABLE M171 RA;Lo;0;R;;;;;N;;;;; +1E8AE;MENDE KIKAKUI SYLLABLE M123 NDI;Lo;0;R;;;;;N;;;;; +1E8AF;MENDE KIKAKUI SYLLABLE M129 NDA;Lo;0;R;;;;;N;;;;; +1E8B0;MENDE KIKAKUI SYLLABLE M125 NDU;Lo;0;R;;;;;N;;;;; +1E8B1;MENDE KIKAKUI SYLLABLE M191 NDEE;Lo;0;R;;;;;N;;;;; +1E8B2;MENDE KIKAKUI SYLLABLE M119 NDE;Lo;0;R;;;;;N;;;;; +1E8B3;MENDE KIKAKUI SYLLABLE M067 NDOO;Lo;0;R;;;;;N;;;;; +1E8B4;MENDE KIKAKUI SYLLABLE M064 NDO;Lo;0;R;;;;;N;;;;; +1E8B5;MENDE KIKAKUI SYLLABLE M152 NJA;Lo;0;R;;;;;N;;;;; +1E8B6;MENDE KIKAKUI SYLLABLE M192 NJU;Lo;0;R;;;;;N;;;;; +1E8B7;MENDE KIKAKUI SYLLABLE M149 NJEE;Lo;0;R;;;;;N;;;;; +1E8B8;MENDE KIKAKUI SYLLABLE M134 NJOO;Lo;0;R;;;;;N;;;;; +1E8B9;MENDE KIKAKUI SYLLABLE M182 VI;Lo;0;R;;;;;N;;;;; +1E8BA;MENDE KIKAKUI SYLLABLE M185 VA;Lo;0;R;;;;;N;;;;; +1E8BB;MENDE KIKAKUI SYLLABLE M151 VU;Lo;0;R;;;;;N;;;;; +1E8BC;MENDE KIKAKUI SYLLABLE M173 VEE;Lo;0;R;;;;;N;;;;; +1E8BD;MENDE KIKAKUI SYLLABLE M085 VE;Lo;0;R;;;;;N;;;;; +1E8BE;MENDE KIKAKUI SYLLABLE M144 VOO;Lo;0;R;;;;;N;;;;; +1E8BF;MENDE KIKAKUI SYLLABLE M077 VO;Lo;0;R;;;;;N;;;;; +1E8C0;MENDE KIKAKUI SYLLABLE M164 NYIN;Lo;0;R;;;;;N;;;;; +1E8C1;MENDE KIKAKUI SYLLABLE M058 NYAN;Lo;0;R;;;;;N;;;;; +1E8C2;MENDE KIKAKUI SYLLABLE M170 NYUN;Lo;0;R;;;;;N;;;;; +1E8C3;MENDE KIKAKUI SYLLABLE M098 NYEN;Lo;0;R;;;;;N;;;;; +1E8C4;MENDE KIKAKUI SYLLABLE M060 NYON;Lo;0;R;;;;;N;;;;; +1E8C7;MENDE KIKAKUI DIGIT ONE;No;0;R;;;;1;N;;;;; +1E8C8;MENDE KIKAKUI DIGIT TWO;No;0;R;;;;2;N;;;;; +1E8C9;MENDE KIKAKUI DIGIT THREE;No;0;R;;;;3;N;;;;; +1E8CA;MENDE KIKAKUI DIGIT FOUR;No;0;R;;;;4;N;;;;; +1E8CB;MENDE KIKAKUI DIGIT FIVE;No;0;R;;;;5;N;;;;; +1E8CC;MENDE KIKAKUI DIGIT SIX;No;0;R;;;;6;N;;;;; +1E8CD;MENDE KIKAKUI DIGIT SEVEN;No;0;R;;;;7;N;;;;; +1E8CE;MENDE KIKAKUI DIGIT EIGHT;No;0;R;;;;8;N;;;;; +1E8CF;MENDE KIKAKUI DIGIT NINE;No;0;R;;;;9;N;;;;; +1E8D0;MENDE KIKAKUI COMBINING NUMBER TEENS;Mn;220;NSM;;;;;N;;;;; +1E8D1;MENDE KIKAKUI COMBINING NUMBER TENS;Mn;220;NSM;;;;;N;;;;; +1E8D2;MENDE KIKAKUI COMBINING NUMBER HUNDREDS;Mn;220;NSM;;;;;N;;;;; +1E8D3;MENDE KIKAKUI COMBINING NUMBER THOUSANDS;Mn;220;NSM;;;;;N;;;;; +1E8D4;MENDE KIKAKUI COMBINING NUMBER TEN THOUSANDS;Mn;220;NSM;;;;;N;;;;; +1E8D5;MENDE KIKAKUI COMBINING NUMBER HUNDRED THOUSANDS;Mn;220;NSM;;;;;N;;;;; +1E8D6;MENDE KIKAKUI COMBINING NUMBER MILLIONS;Mn;220;NSM;;;;;N;;;;; +1E900;ADLAM CAPITAL LETTER ALIF;Lu;0;R;;;;;N;;;;1E922; +1E901;ADLAM CAPITAL LETTER DAALI;Lu;0;R;;;;;N;;;;1E923; +1E902;ADLAM CAPITAL LETTER LAAM;Lu;0;R;;;;;N;;;;1E924; +1E903;ADLAM CAPITAL LETTER MIIM;Lu;0;R;;;;;N;;;;1E925; +1E904;ADLAM CAPITAL LETTER BA;Lu;0;R;;;;;N;;;;1E926; +1E905;ADLAM CAPITAL LETTER SINNYIIYHE;Lu;0;R;;;;;N;;;;1E927; +1E906;ADLAM CAPITAL LETTER PE;Lu;0;R;;;;;N;;;;1E928; +1E907;ADLAM CAPITAL LETTER BHE;Lu;0;R;;;;;N;;;;1E929; +1E908;ADLAM CAPITAL LETTER RA;Lu;0;R;;;;;N;;;;1E92A; +1E909;ADLAM CAPITAL LETTER E;Lu;0;R;;;;;N;;;;1E92B; +1E90A;ADLAM CAPITAL LETTER FA;Lu;0;R;;;;;N;;;;1E92C; +1E90B;ADLAM CAPITAL LETTER I;Lu;0;R;;;;;N;;;;1E92D; +1E90C;ADLAM CAPITAL LETTER O;Lu;0;R;;;;;N;;;;1E92E; +1E90D;ADLAM CAPITAL LETTER DHA;Lu;0;R;;;;;N;;;;1E92F; +1E90E;ADLAM CAPITAL LETTER YHE;Lu;0;R;;;;;N;;;;1E930; +1E90F;ADLAM CAPITAL LETTER WAW;Lu;0;R;;;;;N;;;;1E931; +1E910;ADLAM CAPITAL LETTER NUN;Lu;0;R;;;;;N;;;;1E932; +1E911;ADLAM CAPITAL LETTER KAF;Lu;0;R;;;;;N;;;;1E933; +1E912;ADLAM CAPITAL LETTER YA;Lu;0;R;;;;;N;;;;1E934; +1E913;ADLAM CAPITAL LETTER U;Lu;0;R;;;;;N;;;;1E935; +1E914;ADLAM CAPITAL LETTER JIIM;Lu;0;R;;;;;N;;;;1E936; +1E915;ADLAM CAPITAL LETTER CHI;Lu;0;R;;;;;N;;;;1E937; +1E916;ADLAM CAPITAL LETTER HA;Lu;0;R;;;;;N;;;;1E938; +1E917;ADLAM CAPITAL LETTER QAAF;Lu;0;R;;;;;N;;;;1E939; +1E918;ADLAM CAPITAL LETTER GA;Lu;0;R;;;;;N;;;;1E93A; +1E919;ADLAM CAPITAL LETTER NYA;Lu;0;R;;;;;N;;;;1E93B; +1E91A;ADLAM CAPITAL LETTER TU;Lu;0;R;;;;;N;;;;1E93C; +1E91B;ADLAM CAPITAL LETTER NHA;Lu;0;R;;;;;N;;;;1E93D; +1E91C;ADLAM CAPITAL LETTER VA;Lu;0;R;;;;;N;;;;1E93E; +1E91D;ADLAM CAPITAL LETTER KHA;Lu;0;R;;;;;N;;;;1E93F; +1E91E;ADLAM CAPITAL LETTER GBE;Lu;0;R;;;;;N;;;;1E940; +1E91F;ADLAM CAPITAL LETTER ZAL;Lu;0;R;;;;;N;;;;1E941; +1E920;ADLAM CAPITAL LETTER KPO;Lu;0;R;;;;;N;;;;1E942; +1E921;ADLAM CAPITAL LETTER SHA;Lu;0;R;;;;;N;;;;1E943; +1E922;ADLAM SMALL LETTER ALIF;Ll;0;R;;;;;N;;;1E900;;1E900 +1E923;ADLAM SMALL LETTER DAALI;Ll;0;R;;;;;N;;;1E901;;1E901 +1E924;ADLAM SMALL LETTER LAAM;Ll;0;R;;;;;N;;;1E902;;1E902 +1E925;ADLAM SMALL LETTER MIIM;Ll;0;R;;;;;N;;;1E903;;1E903 +1E926;ADLAM SMALL LETTER BA;Ll;0;R;;;;;N;;;1E904;;1E904 +1E927;ADLAM SMALL LETTER SINNYIIYHE;Ll;0;R;;;;;N;;;1E905;;1E905 +1E928;ADLAM SMALL LETTER PE;Ll;0;R;;;;;N;;;1E906;;1E906 +1E929;ADLAM SMALL LETTER BHE;Ll;0;R;;;;;N;;;1E907;;1E907 +1E92A;ADLAM SMALL LETTER RA;Ll;0;R;;;;;N;;;1E908;;1E908 +1E92B;ADLAM SMALL LETTER E;Ll;0;R;;;;;N;;;1E909;;1E909 +1E92C;ADLAM SMALL LETTER FA;Ll;0;R;;;;;N;;;1E90A;;1E90A +1E92D;ADLAM SMALL LETTER I;Ll;0;R;;;;;N;;;1E90B;;1E90B +1E92E;ADLAM SMALL LETTER O;Ll;0;R;;;;;N;;;1E90C;;1E90C +1E92F;ADLAM SMALL LETTER DHA;Ll;0;R;;;;;N;;;1E90D;;1E90D +1E930;ADLAM SMALL LETTER YHE;Ll;0;R;;;;;N;;;1E90E;;1E90E +1E931;ADLAM SMALL LETTER WAW;Ll;0;R;;;;;N;;;1E90F;;1E90F +1E932;ADLAM SMALL LETTER NUN;Ll;0;R;;;;;N;;;1E910;;1E910 +1E933;ADLAM SMALL LETTER KAF;Ll;0;R;;;;;N;;;1E911;;1E911 +1E934;ADLAM SMALL LETTER YA;Ll;0;R;;;;;N;;;1E912;;1E912 +1E935;ADLAM SMALL LETTER U;Ll;0;R;;;;;N;;;1E913;;1E913 +1E936;ADLAM SMALL LETTER JIIM;Ll;0;R;;;;;N;;;1E914;;1E914 +1E937;ADLAM SMALL LETTER CHI;Ll;0;R;;;;;N;;;1E915;;1E915 +1E938;ADLAM SMALL LETTER HA;Ll;0;R;;;;;N;;;1E916;;1E916 +1E939;ADLAM SMALL LETTER QAAF;Ll;0;R;;;;;N;;;1E917;;1E917 +1E93A;ADLAM SMALL LETTER GA;Ll;0;R;;;;;N;;;1E918;;1E918 +1E93B;ADLAM SMALL LETTER NYA;Ll;0;R;;;;;N;;;1E919;;1E919 +1E93C;ADLAM SMALL LETTER TU;Ll;0;R;;;;;N;;;1E91A;;1E91A +1E93D;ADLAM SMALL LETTER NHA;Ll;0;R;;;;;N;;;1E91B;;1E91B +1E93E;ADLAM SMALL LETTER VA;Ll;0;R;;;;;N;;;1E91C;;1E91C +1E93F;ADLAM SMALL LETTER KHA;Ll;0;R;;;;;N;;;1E91D;;1E91D +1E940;ADLAM SMALL LETTER GBE;Ll;0;R;;;;;N;;;1E91E;;1E91E +1E941;ADLAM SMALL LETTER ZAL;Ll;0;R;;;;;N;;;1E91F;;1E91F +1E942;ADLAM SMALL LETTER KPO;Ll;0;R;;;;;N;;;1E920;;1E920 +1E943;ADLAM SMALL LETTER SHA;Ll;0;R;;;;;N;;;1E921;;1E921 +1E944;ADLAM ALIF LENGTHENER;Mn;230;NSM;;;;;N;;;;; +1E945;ADLAM VOWEL LENGTHENER;Mn;230;NSM;;;;;N;;;;; +1E946;ADLAM GEMINATION MARK;Mn;230;NSM;;;;;N;;;;; +1E947;ADLAM HAMZA;Mn;230;NSM;;;;;N;;;;; +1E948;ADLAM CONSONANT MODIFIER;Mn;230;NSM;;;;;N;;;;; +1E949;ADLAM GEMINATE CONSONANT MODIFIER;Mn;230;NSM;;;;;N;;;;; +1E94A;ADLAM NUKTA;Mn;7;NSM;;;;;N;;;;; +1E94B;ADLAM NASALIZATION MARK;Lm;0;R;;;;;N;;;;; +1E950;ADLAM DIGIT ZERO;Nd;0;R;;0;0;0;N;;;;; +1E951;ADLAM DIGIT ONE;Nd;0;R;;1;1;1;N;;;;; +1E952;ADLAM DIGIT TWO;Nd;0;R;;2;2;2;N;;;;; +1E953;ADLAM DIGIT THREE;Nd;0;R;;3;3;3;N;;;;; +1E954;ADLAM DIGIT FOUR;Nd;0;R;;4;4;4;N;;;;; +1E955;ADLAM DIGIT FIVE;Nd;0;R;;5;5;5;N;;;;; +1E956;ADLAM DIGIT SIX;Nd;0;R;;6;6;6;N;;;;; +1E957;ADLAM DIGIT SEVEN;Nd;0;R;;7;7;7;N;;;;; +1E958;ADLAM DIGIT EIGHT;Nd;0;R;;8;8;8;N;;;;; +1E959;ADLAM DIGIT NINE;Nd;0;R;;9;9;9;N;;;;; +1E95E;ADLAM INITIAL EXCLAMATION MARK;Po;0;R;;;;;N;;;;; +1E95F;ADLAM INITIAL QUESTION MARK;Po;0;R;;;;;N;;;;; +1EC71;INDIC SIYAQ NUMBER ONE;No;0;AL;;;;1;N;;;;; +1EC72;INDIC SIYAQ NUMBER TWO;No;0;AL;;;;2;N;;;;; +1EC73;INDIC SIYAQ NUMBER THREE;No;0;AL;;;;3;N;;;;; +1EC74;INDIC SIYAQ NUMBER FOUR;No;0;AL;;;;4;N;;;;; +1EC75;INDIC SIYAQ NUMBER FIVE;No;0;AL;;;;5;N;;;;; +1EC76;INDIC SIYAQ NUMBER SIX;No;0;AL;;;;6;N;;;;; +1EC77;INDIC SIYAQ NUMBER SEVEN;No;0;AL;;;;7;N;;;;; +1EC78;INDIC SIYAQ NUMBER EIGHT;No;0;AL;;;;8;N;;;;; +1EC79;INDIC SIYAQ NUMBER NINE;No;0;AL;;;;9;N;;;;; +1EC7A;INDIC SIYAQ NUMBER TEN;No;0;AL;;;;10;N;;;;; +1EC7B;INDIC SIYAQ NUMBER TWENTY;No;0;AL;;;;20;N;;;;; +1EC7C;INDIC SIYAQ NUMBER THIRTY;No;0;AL;;;;30;N;;;;; +1EC7D;INDIC SIYAQ NUMBER FORTY;No;0;AL;;;;40;N;;;;; +1EC7E;INDIC SIYAQ NUMBER FIFTY;No;0;AL;;;;50;N;;;;; +1EC7F;INDIC SIYAQ NUMBER SIXTY;No;0;AL;;;;60;N;;;;; +1EC80;INDIC SIYAQ NUMBER SEVENTY;No;0;AL;;;;70;N;;;;; +1EC81;INDIC SIYAQ NUMBER EIGHTY;No;0;AL;;;;80;N;;;;; +1EC82;INDIC SIYAQ NUMBER NINETY;No;0;AL;;;;90;N;;;;; +1EC83;INDIC SIYAQ NUMBER ONE HUNDRED;No;0;AL;;;;100;N;;;;; +1EC84;INDIC SIYAQ NUMBER TWO HUNDRED;No;0;AL;;;;200;N;;;;; +1EC85;INDIC SIYAQ NUMBER THREE HUNDRED;No;0;AL;;;;300;N;;;;; +1EC86;INDIC SIYAQ NUMBER FOUR HUNDRED;No;0;AL;;;;400;N;;;;; +1EC87;INDIC SIYAQ NUMBER FIVE HUNDRED;No;0;AL;;;;500;N;;;;; +1EC88;INDIC SIYAQ NUMBER SIX HUNDRED;No;0;AL;;;;600;N;;;;; +1EC89;INDIC SIYAQ NUMBER SEVEN HUNDRED;No;0;AL;;;;700;N;;;;; +1EC8A;INDIC SIYAQ NUMBER EIGHT HUNDRED;No;0;AL;;;;800;N;;;;; +1EC8B;INDIC SIYAQ NUMBER NINE HUNDRED;No;0;AL;;;;900;N;;;;; +1EC8C;INDIC SIYAQ NUMBER ONE THOUSAND;No;0;AL;;;;1000;N;;;;; +1EC8D;INDIC SIYAQ NUMBER TWO THOUSAND;No;0;AL;;;;2000;N;;;;; +1EC8E;INDIC SIYAQ NUMBER THREE THOUSAND;No;0;AL;;;;3000;N;;;;; +1EC8F;INDIC SIYAQ NUMBER FOUR THOUSAND;No;0;AL;;;;4000;N;;;;; +1EC90;INDIC SIYAQ NUMBER FIVE THOUSAND;No;0;AL;;;;5000;N;;;;; +1EC91;INDIC SIYAQ NUMBER SIX THOUSAND;No;0;AL;;;;6000;N;;;;; +1EC92;INDIC SIYAQ NUMBER SEVEN THOUSAND;No;0;AL;;;;7000;N;;;;; +1EC93;INDIC SIYAQ NUMBER EIGHT THOUSAND;No;0;AL;;;;8000;N;;;;; +1EC94;INDIC SIYAQ NUMBER NINE THOUSAND;No;0;AL;;;;9000;N;;;;; +1EC95;INDIC SIYAQ NUMBER TEN THOUSAND;No;0;AL;;;;10000;N;;;;; +1EC96;INDIC SIYAQ NUMBER TWENTY THOUSAND;No;0;AL;;;;20000;N;;;;; +1EC97;INDIC SIYAQ NUMBER THIRTY THOUSAND;No;0;AL;;;;30000;N;;;;; +1EC98;INDIC SIYAQ NUMBER FORTY THOUSAND;No;0;AL;;;;40000;N;;;;; +1EC99;INDIC SIYAQ NUMBER FIFTY THOUSAND;No;0;AL;;;;50000;N;;;;; +1EC9A;INDIC SIYAQ NUMBER SIXTY THOUSAND;No;0;AL;;;;60000;N;;;;; +1EC9B;INDIC SIYAQ NUMBER SEVENTY THOUSAND;No;0;AL;;;;70000;N;;;;; +1EC9C;INDIC SIYAQ NUMBER EIGHTY THOUSAND;No;0;AL;;;;80000;N;;;;; +1EC9D;INDIC SIYAQ NUMBER NINETY THOUSAND;No;0;AL;;;;90000;N;;;;; +1EC9E;INDIC SIYAQ NUMBER LAKH;No;0;AL;;;;100000;N;;;;; +1EC9F;INDIC SIYAQ NUMBER LAKHAN;No;0;AL;;;;200000;N;;;;; +1ECA0;INDIC SIYAQ LAKH MARK;No;0;AL;;;;100000;N;;;;; +1ECA1;INDIC SIYAQ NUMBER KAROR;No;0;AL;;;;10000000;N;;;;; +1ECA2;INDIC SIYAQ NUMBER KARORAN;No;0;AL;;;;20000000;N;;;;; +1ECA3;INDIC SIYAQ NUMBER PREFIXED ONE;No;0;AL;;;;1;N;;;;; +1ECA4;INDIC SIYAQ NUMBER PREFIXED TWO;No;0;AL;;;;2;N;;;;; +1ECA5;INDIC SIYAQ NUMBER PREFIXED THREE;No;0;AL;;;;3;N;;;;; +1ECA6;INDIC SIYAQ NUMBER PREFIXED FOUR;No;0;AL;;;;4;N;;;;; +1ECA7;INDIC SIYAQ NUMBER PREFIXED FIVE;No;0;AL;;;;5;N;;;;; +1ECA8;INDIC SIYAQ NUMBER PREFIXED SIX;No;0;AL;;;;6;N;;;;; +1ECA9;INDIC SIYAQ NUMBER PREFIXED SEVEN;No;0;AL;;;;7;N;;;;; +1ECAA;INDIC SIYAQ NUMBER PREFIXED EIGHT;No;0;AL;;;;8;N;;;;; +1ECAB;INDIC SIYAQ NUMBER PREFIXED NINE;No;0;AL;;;;9;N;;;;; +1ECAC;INDIC SIYAQ PLACEHOLDER;So;0;AL;;;;;N;;;;; +1ECAD;INDIC SIYAQ FRACTION ONE QUARTER;No;0;AL;;;;1/4;N;;;;; +1ECAE;INDIC SIYAQ FRACTION ONE HALF;No;0;AL;;;;1/2;N;;;;; +1ECAF;INDIC SIYAQ FRACTION THREE QUARTERS;No;0;AL;;;;3/4;N;;;;; +1ECB0;INDIC SIYAQ RUPEE MARK;Sc;0;AL;;;;;N;;;;; +1ECB1;INDIC SIYAQ NUMBER ALTERNATE ONE;No;0;AL;;;;1;N;;;;; +1ECB2;INDIC SIYAQ NUMBER ALTERNATE TWO;No;0;AL;;;;2;N;;;;; +1ECB3;INDIC SIYAQ NUMBER ALTERNATE TEN THOUSAND;No;0;AL;;;;10000;N;;;;; +1ECB4;INDIC SIYAQ ALTERNATE LAKH MARK;No;0;AL;;;;100000;N;;;;; +1ED01;OTTOMAN SIYAQ NUMBER ONE;No;0;AL;;;;1;N;;;;; +1ED02;OTTOMAN SIYAQ NUMBER TWO;No;0;AL;;;;2;N;;;;; +1ED03;OTTOMAN SIYAQ NUMBER THREE;No;0;AL;;;;3;N;;;;; +1ED04;OTTOMAN SIYAQ NUMBER FOUR;No;0;AL;;;;4;N;;;;; +1ED05;OTTOMAN SIYAQ NUMBER FIVE;No;0;AL;;;;5;N;;;;; +1ED06;OTTOMAN SIYAQ NUMBER SIX;No;0;AL;;;;6;N;;;;; +1ED07;OTTOMAN SIYAQ NUMBER SEVEN;No;0;AL;;;;7;N;;;;; +1ED08;OTTOMAN SIYAQ NUMBER EIGHT;No;0;AL;;;;8;N;;;;; +1ED09;OTTOMAN SIYAQ NUMBER NINE;No;0;AL;;;;9;N;;;;; +1ED0A;OTTOMAN SIYAQ NUMBER TEN;No;0;AL;;;;10;N;;;;; +1ED0B;OTTOMAN SIYAQ NUMBER TWENTY;No;0;AL;;;;20;N;;;;; +1ED0C;OTTOMAN SIYAQ NUMBER THIRTY;No;0;AL;;;;30;N;;;;; +1ED0D;OTTOMAN SIYAQ NUMBER FORTY;No;0;AL;;;;40;N;;;;; +1ED0E;OTTOMAN SIYAQ NUMBER FIFTY;No;0;AL;;;;50;N;;;;; +1ED0F;OTTOMAN SIYAQ NUMBER SIXTY;No;0;AL;;;;60;N;;;;; +1ED10;OTTOMAN SIYAQ NUMBER SEVENTY;No;0;AL;;;;70;N;;;;; +1ED11;OTTOMAN SIYAQ NUMBER EIGHTY;No;0;AL;;;;80;N;;;;; +1ED12;OTTOMAN SIYAQ NUMBER NINETY;No;0;AL;;;;90;N;;;;; +1ED13;OTTOMAN SIYAQ NUMBER ONE HUNDRED;No;0;AL;;;;100;N;;;;; +1ED14;OTTOMAN SIYAQ NUMBER TWO HUNDRED;No;0;AL;;;;200;N;;;;; +1ED15;OTTOMAN SIYAQ NUMBER THREE HUNDRED;No;0;AL;;;;300;N;;;;; +1ED16;OTTOMAN SIYAQ NUMBER FOUR HUNDRED;No;0;AL;;;;400;N;;;;; +1ED17;OTTOMAN SIYAQ NUMBER FIVE HUNDRED;No;0;AL;;;;500;N;;;;; +1ED18;OTTOMAN SIYAQ NUMBER SIX HUNDRED;No;0;AL;;;;600;N;;;;; +1ED19;OTTOMAN SIYAQ NUMBER SEVEN HUNDRED;No;0;AL;;;;700;N;;;;; +1ED1A;OTTOMAN SIYAQ NUMBER EIGHT HUNDRED;No;0;AL;;;;800;N;;;;; +1ED1B;OTTOMAN SIYAQ NUMBER NINE HUNDRED;No;0;AL;;;;900;N;;;;; +1ED1C;OTTOMAN SIYAQ NUMBER ONE THOUSAND;No;0;AL;;;;1000;N;;;;; +1ED1D;OTTOMAN SIYAQ NUMBER TWO THOUSAND;No;0;AL;;;;2000;N;;;;; +1ED1E;OTTOMAN SIYAQ NUMBER THREE THOUSAND;No;0;AL;;;;3000;N;;;;; +1ED1F;OTTOMAN SIYAQ NUMBER FOUR THOUSAND;No;0;AL;;;;4000;N;;;;; +1ED20;OTTOMAN SIYAQ NUMBER FIVE THOUSAND;No;0;AL;;;;5000;N;;;;; +1ED21;OTTOMAN SIYAQ NUMBER SIX THOUSAND;No;0;AL;;;;6000;N;;;;; +1ED22;OTTOMAN SIYAQ NUMBER SEVEN THOUSAND;No;0;AL;;;;7000;N;;;;; +1ED23;OTTOMAN SIYAQ NUMBER EIGHT THOUSAND;No;0;AL;;;;8000;N;;;;; +1ED24;OTTOMAN SIYAQ NUMBER NINE THOUSAND;No;0;AL;;;;9000;N;;;;; +1ED25;OTTOMAN SIYAQ NUMBER TEN THOUSAND;No;0;AL;;;;10000;N;;;;; +1ED26;OTTOMAN SIYAQ NUMBER TWENTY THOUSAND;No;0;AL;;;;20000;N;;;;; +1ED27;OTTOMAN SIYAQ NUMBER THIRTY THOUSAND;No;0;AL;;;;30000;N;;;;; +1ED28;OTTOMAN SIYAQ NUMBER FORTY THOUSAND;No;0;AL;;;;40000;N;;;;; +1ED29;OTTOMAN SIYAQ NUMBER FIFTY THOUSAND;No;0;AL;;;;50000;N;;;;; +1ED2A;OTTOMAN SIYAQ NUMBER SIXTY THOUSAND;No;0;AL;;;;60000;N;;;;; +1ED2B;OTTOMAN SIYAQ NUMBER SEVENTY THOUSAND;No;0;AL;;;;70000;N;;;;; +1ED2C;OTTOMAN SIYAQ NUMBER EIGHTY THOUSAND;No;0;AL;;;;80000;N;;;;; +1ED2D;OTTOMAN SIYAQ NUMBER NINETY THOUSAND;No;0;AL;;;;90000;N;;;;; +1ED2E;OTTOMAN SIYAQ MARRATAN;So;0;AL;;;;;N;;;;; +1ED2F;OTTOMAN SIYAQ ALTERNATE NUMBER TWO;No;0;AL;;;;2;N;;;;; +1ED30;OTTOMAN SIYAQ ALTERNATE NUMBER THREE;No;0;AL;;;;3;N;;;;; +1ED31;OTTOMAN SIYAQ ALTERNATE NUMBER FOUR;No;0;AL;;;;4;N;;;;; +1ED32;OTTOMAN SIYAQ ALTERNATE NUMBER FIVE;No;0;AL;;;;5;N;;;;; +1ED33;OTTOMAN SIYAQ ALTERNATE NUMBER SIX;No;0;AL;;;;6;N;;;;; +1ED34;OTTOMAN SIYAQ ALTERNATE NUMBER SEVEN;No;0;AL;;;;7;N;;;;; +1ED35;OTTOMAN SIYAQ ALTERNATE NUMBER EIGHT;No;0;AL;;;;8;N;;;;; +1ED36;OTTOMAN SIYAQ ALTERNATE NUMBER NINE;No;0;AL;;;;9;N;;;;; +1ED37;OTTOMAN SIYAQ ALTERNATE NUMBER TEN;No;0;AL;;;;10;N;;;;; +1ED38;OTTOMAN SIYAQ ALTERNATE NUMBER FOUR HUNDRED;No;0;AL;;;;400;N;;;;; +1ED39;OTTOMAN SIYAQ ALTERNATE NUMBER SIX HUNDRED;No;0;AL;;;;600;N;;;;; +1ED3A;OTTOMAN SIYAQ ALTERNATE NUMBER TWO THOUSAND;No;0;AL;;;;2000;N;;;;; +1ED3B;OTTOMAN SIYAQ ALTERNATE NUMBER TEN THOUSAND;No;0;AL;;;;10000;N;;;;; +1ED3C;OTTOMAN SIYAQ FRACTION ONE HALF;No;0;AL;;;;1/2;N;;;;; +1ED3D;OTTOMAN SIYAQ FRACTION ONE SIXTH;No;0;AL;;;;1/6;N;;;;; +1EE00;ARABIC MATHEMATICAL ALEF;Lo;0;AL; 0627;;;;N;;;;; +1EE01;ARABIC MATHEMATICAL BEH;Lo;0;AL; 0628;;;;N;;;;; +1EE02;ARABIC MATHEMATICAL JEEM;Lo;0;AL; 062C;;;;N;;;;; +1EE03;ARABIC MATHEMATICAL DAL;Lo;0;AL; 062F;;;;N;;;;; +1EE05;ARABIC MATHEMATICAL WAW;Lo;0;AL; 0648;;;;N;;;;; +1EE06;ARABIC MATHEMATICAL ZAIN;Lo;0;AL; 0632;;;;N;;;;; +1EE07;ARABIC MATHEMATICAL HAH;Lo;0;AL; 062D;;;;N;;;;; +1EE08;ARABIC MATHEMATICAL TAH;Lo;0;AL; 0637;;;;N;;;;; +1EE09;ARABIC MATHEMATICAL YEH;Lo;0;AL; 064A;;;;N;;;;; +1EE0A;ARABIC MATHEMATICAL KAF;Lo;0;AL; 0643;;;;N;;;;; +1EE0B;ARABIC MATHEMATICAL LAM;Lo;0;AL; 0644;;;;N;;;;; +1EE0C;ARABIC MATHEMATICAL MEEM;Lo;0;AL; 0645;;;;N;;;;; +1EE0D;ARABIC MATHEMATICAL NOON;Lo;0;AL; 0646;;;;N;;;;; +1EE0E;ARABIC MATHEMATICAL SEEN;Lo;0;AL; 0633;;;;N;;;;; +1EE0F;ARABIC MATHEMATICAL AIN;Lo;0;AL; 0639;;;;N;;;;; +1EE10;ARABIC MATHEMATICAL FEH;Lo;0;AL; 0641;;;;N;;;;; +1EE11;ARABIC MATHEMATICAL SAD;Lo;0;AL; 0635;;;;N;;;;; +1EE12;ARABIC MATHEMATICAL QAF;Lo;0;AL; 0642;;;;N;;;;; +1EE13;ARABIC MATHEMATICAL REH;Lo;0;AL; 0631;;;;N;;;;; +1EE14;ARABIC MATHEMATICAL SHEEN;Lo;0;AL; 0634;;;;N;;;;; +1EE15;ARABIC MATHEMATICAL TEH;Lo;0;AL; 062A;;;;N;;;;; +1EE16;ARABIC MATHEMATICAL THEH;Lo;0;AL; 062B;;;;N;;;;; +1EE17;ARABIC MATHEMATICAL KHAH;Lo;0;AL; 062E;;;;N;;;;; +1EE18;ARABIC MATHEMATICAL THAL;Lo;0;AL; 0630;;;;N;;;;; +1EE19;ARABIC MATHEMATICAL DAD;Lo;0;AL; 0636;;;;N;;;;; +1EE1A;ARABIC MATHEMATICAL ZAH;Lo;0;AL; 0638;;;;N;;;;; +1EE1B;ARABIC MATHEMATICAL GHAIN;Lo;0;AL; 063A;;;;N;;;;; +1EE1C;ARABIC MATHEMATICAL DOTLESS BEH;Lo;0;AL; 066E;;;;N;;;;; +1EE1D;ARABIC MATHEMATICAL DOTLESS NOON;Lo;0;AL; 06BA;;;;N;;;;; +1EE1E;ARABIC MATHEMATICAL DOTLESS FEH;Lo;0;AL; 06A1;;;;N;;;;; +1EE1F;ARABIC MATHEMATICAL DOTLESS QAF;Lo;0;AL; 066F;;;;N;;;;; +1EE21;ARABIC MATHEMATICAL INITIAL BEH;Lo;0;AL; 0628;;;;N;;;;; +1EE22;ARABIC MATHEMATICAL INITIAL JEEM;Lo;0;AL; 062C;;;;N;;;;; +1EE24;ARABIC MATHEMATICAL INITIAL HEH;Lo;0;AL; 0647;;;;N;;;;; +1EE27;ARABIC MATHEMATICAL INITIAL HAH;Lo;0;AL; 062D;;;;N;;;;; +1EE29;ARABIC MATHEMATICAL INITIAL YEH;Lo;0;AL; 064A;;;;N;;;;; +1EE2A;ARABIC MATHEMATICAL INITIAL KAF;Lo;0;AL; 0643;;;;N;;;;; +1EE2B;ARABIC MATHEMATICAL INITIAL LAM;Lo;0;AL; 0644;;;;N;;;;; +1EE2C;ARABIC MATHEMATICAL INITIAL MEEM;Lo;0;AL; 0645;;;;N;;;;; +1EE2D;ARABIC MATHEMATICAL INITIAL NOON;Lo;0;AL; 0646;;;;N;;;;; +1EE2E;ARABIC MATHEMATICAL INITIAL SEEN;Lo;0;AL; 0633;;;;N;;;;; +1EE2F;ARABIC MATHEMATICAL INITIAL AIN;Lo;0;AL; 0639;;;;N;;;;; +1EE30;ARABIC MATHEMATICAL INITIAL FEH;Lo;0;AL; 0641;;;;N;;;;; +1EE31;ARABIC MATHEMATICAL INITIAL SAD;Lo;0;AL; 0635;;;;N;;;;; +1EE32;ARABIC MATHEMATICAL INITIAL QAF;Lo;0;AL; 0642;;;;N;;;;; +1EE34;ARABIC MATHEMATICAL INITIAL SHEEN;Lo;0;AL; 0634;;;;N;;;;; +1EE35;ARABIC MATHEMATICAL INITIAL TEH;Lo;0;AL; 062A;;;;N;;;;; +1EE36;ARABIC MATHEMATICAL INITIAL THEH;Lo;0;AL; 062B;;;;N;;;;; +1EE37;ARABIC MATHEMATICAL INITIAL KHAH;Lo;0;AL; 062E;;;;N;;;;; +1EE39;ARABIC MATHEMATICAL INITIAL DAD;Lo;0;AL; 0636;;;;N;;;;; +1EE3B;ARABIC MATHEMATICAL INITIAL GHAIN;Lo;0;AL; 063A;;;;N;;;;; +1EE42;ARABIC MATHEMATICAL TAILED JEEM;Lo;0;AL; 062C;;;;N;;;;; +1EE47;ARABIC MATHEMATICAL TAILED HAH;Lo;0;AL; 062D;;;;N;;;;; +1EE49;ARABIC MATHEMATICAL TAILED YEH;Lo;0;AL; 064A;;;;N;;;;; +1EE4B;ARABIC MATHEMATICAL TAILED LAM;Lo;0;AL; 0644;;;;N;;;;; +1EE4D;ARABIC MATHEMATICAL TAILED NOON;Lo;0;AL; 0646;;;;N;;;;; +1EE4E;ARABIC MATHEMATICAL TAILED SEEN;Lo;0;AL; 0633;;;;N;;;;; +1EE4F;ARABIC MATHEMATICAL TAILED AIN;Lo;0;AL; 0639;;;;N;;;;; +1EE51;ARABIC MATHEMATICAL TAILED SAD;Lo;0;AL; 0635;;;;N;;;;; +1EE52;ARABIC MATHEMATICAL TAILED QAF;Lo;0;AL; 0642;;;;N;;;;; +1EE54;ARABIC MATHEMATICAL TAILED SHEEN;Lo;0;AL; 0634;;;;N;;;;; +1EE57;ARABIC MATHEMATICAL TAILED KHAH;Lo;0;AL; 062E;;;;N;;;;; +1EE59;ARABIC MATHEMATICAL TAILED DAD;Lo;0;AL; 0636;;;;N;;;;; +1EE5B;ARABIC MATHEMATICAL TAILED GHAIN;Lo;0;AL; 063A;;;;N;;;;; +1EE5D;ARABIC MATHEMATICAL TAILED DOTLESS NOON;Lo;0;AL; 06BA;;;;N;;;;; +1EE5F;ARABIC MATHEMATICAL TAILED DOTLESS QAF;Lo;0;AL; 066F;;;;N;;;;; +1EE61;ARABIC MATHEMATICAL STRETCHED BEH;Lo;0;AL; 0628;;;;N;;;;; +1EE62;ARABIC MATHEMATICAL STRETCHED JEEM;Lo;0;AL; 062C;;;;N;;;;; +1EE64;ARABIC MATHEMATICAL STRETCHED HEH;Lo;0;AL; 0647;;;;N;;;;; +1EE67;ARABIC MATHEMATICAL STRETCHED HAH;Lo;0;AL; 062D;;;;N;;;;; +1EE68;ARABIC MATHEMATICAL STRETCHED TAH;Lo;0;AL; 0637;;;;N;;;;; +1EE69;ARABIC MATHEMATICAL STRETCHED YEH;Lo;0;AL; 064A;;;;N;;;;; +1EE6A;ARABIC MATHEMATICAL STRETCHED KAF;Lo;0;AL; 0643;;;;N;;;;; +1EE6C;ARABIC MATHEMATICAL STRETCHED MEEM;Lo;0;AL; 0645;;;;N;;;;; +1EE6D;ARABIC MATHEMATICAL STRETCHED NOON;Lo;0;AL; 0646;;;;N;;;;; +1EE6E;ARABIC MATHEMATICAL STRETCHED SEEN;Lo;0;AL; 0633;;;;N;;;;; +1EE6F;ARABIC MATHEMATICAL STRETCHED AIN;Lo;0;AL; 0639;;;;N;;;;; +1EE70;ARABIC MATHEMATICAL STRETCHED FEH;Lo;0;AL; 0641;;;;N;;;;; +1EE71;ARABIC MATHEMATICAL STRETCHED SAD;Lo;0;AL; 0635;;;;N;;;;; +1EE72;ARABIC MATHEMATICAL STRETCHED QAF;Lo;0;AL; 0642;;;;N;;;;; +1EE74;ARABIC MATHEMATICAL STRETCHED SHEEN;Lo;0;AL; 0634;;;;N;;;;; +1EE75;ARABIC MATHEMATICAL STRETCHED TEH;Lo;0;AL; 062A;;;;N;;;;; +1EE76;ARABIC MATHEMATICAL STRETCHED THEH;Lo;0;AL; 062B;;;;N;;;;; +1EE77;ARABIC MATHEMATICAL STRETCHED KHAH;Lo;0;AL; 062E;;;;N;;;;; +1EE79;ARABIC MATHEMATICAL STRETCHED DAD;Lo;0;AL; 0636;;;;N;;;;; +1EE7A;ARABIC MATHEMATICAL STRETCHED ZAH;Lo;0;AL; 0638;;;;N;;;;; +1EE7B;ARABIC MATHEMATICAL STRETCHED GHAIN;Lo;0;AL; 063A;;;;N;;;;; +1EE7C;ARABIC MATHEMATICAL STRETCHED DOTLESS BEH;Lo;0;AL; 066E;;;;N;;;;; +1EE7E;ARABIC MATHEMATICAL STRETCHED DOTLESS FEH;Lo;0;AL; 06A1;;;;N;;;;; +1EE80;ARABIC MATHEMATICAL LOOPED ALEF;Lo;0;AL; 0627;;;;N;;;;; +1EE81;ARABIC MATHEMATICAL LOOPED BEH;Lo;0;AL; 0628;;;;N;;;;; +1EE82;ARABIC MATHEMATICAL LOOPED JEEM;Lo;0;AL; 062C;;;;N;;;;; +1EE83;ARABIC MATHEMATICAL LOOPED DAL;Lo;0;AL; 062F;;;;N;;;;; +1EE84;ARABIC MATHEMATICAL LOOPED HEH;Lo;0;AL; 0647;;;;N;;;;; +1EE85;ARABIC MATHEMATICAL LOOPED WAW;Lo;0;AL; 0648;;;;N;;;;; +1EE86;ARABIC MATHEMATICAL LOOPED ZAIN;Lo;0;AL; 0632;;;;N;;;;; +1EE87;ARABIC MATHEMATICAL LOOPED HAH;Lo;0;AL; 062D;;;;N;;;;; +1EE88;ARABIC MATHEMATICAL LOOPED TAH;Lo;0;AL; 0637;;;;N;;;;; +1EE89;ARABIC MATHEMATICAL LOOPED YEH;Lo;0;AL; 064A;;;;N;;;;; +1EE8B;ARABIC MATHEMATICAL LOOPED LAM;Lo;0;AL; 0644;;;;N;;;;; +1EE8C;ARABIC MATHEMATICAL LOOPED MEEM;Lo;0;AL; 0645;;;;N;;;;; +1EE8D;ARABIC MATHEMATICAL LOOPED NOON;Lo;0;AL; 0646;;;;N;;;;; +1EE8E;ARABIC MATHEMATICAL LOOPED SEEN;Lo;0;AL; 0633;;;;N;;;;; +1EE8F;ARABIC MATHEMATICAL LOOPED AIN;Lo;0;AL; 0639;;;;N;;;;; +1EE90;ARABIC MATHEMATICAL LOOPED FEH;Lo;0;AL; 0641;;;;N;;;;; +1EE91;ARABIC MATHEMATICAL LOOPED SAD;Lo;0;AL; 0635;;;;N;;;;; +1EE92;ARABIC MATHEMATICAL LOOPED QAF;Lo;0;AL; 0642;;;;N;;;;; +1EE93;ARABIC MATHEMATICAL LOOPED REH;Lo;0;AL; 0631;;;;N;;;;; +1EE94;ARABIC MATHEMATICAL LOOPED SHEEN;Lo;0;AL; 0634;;;;N;;;;; +1EE95;ARABIC MATHEMATICAL LOOPED TEH;Lo;0;AL; 062A;;;;N;;;;; +1EE96;ARABIC MATHEMATICAL LOOPED THEH;Lo;0;AL; 062B;;;;N;;;;; +1EE97;ARABIC MATHEMATICAL LOOPED KHAH;Lo;0;AL; 062E;;;;N;;;;; +1EE98;ARABIC MATHEMATICAL LOOPED THAL;Lo;0;AL; 0630;;;;N;;;;; +1EE99;ARABIC MATHEMATICAL LOOPED DAD;Lo;0;AL; 0636;;;;N;;;;; +1EE9A;ARABIC MATHEMATICAL LOOPED ZAH;Lo;0;AL; 0638;;;;N;;;;; +1EE9B;ARABIC MATHEMATICAL LOOPED GHAIN;Lo;0;AL; 063A;;;;N;;;;; +1EEA1;ARABIC MATHEMATICAL DOUBLE-STRUCK BEH;Lo;0;AL; 0628;;;;N;;;;; +1EEA2;ARABIC MATHEMATICAL DOUBLE-STRUCK JEEM;Lo;0;AL; 062C;;;;N;;;;; +1EEA3;ARABIC MATHEMATICAL DOUBLE-STRUCK DAL;Lo;0;AL; 062F;;;;N;;;;; +1EEA5;ARABIC MATHEMATICAL DOUBLE-STRUCK WAW;Lo;0;AL; 0648;;;;N;;;;; +1EEA6;ARABIC MATHEMATICAL DOUBLE-STRUCK ZAIN;Lo;0;AL; 0632;;;;N;;;;; +1EEA7;ARABIC MATHEMATICAL DOUBLE-STRUCK HAH;Lo;0;AL; 062D;;;;N;;;;; +1EEA8;ARABIC MATHEMATICAL DOUBLE-STRUCK TAH;Lo;0;AL; 0637;;;;N;;;;; +1EEA9;ARABIC MATHEMATICAL DOUBLE-STRUCK YEH;Lo;0;AL; 064A;;;;N;;;;; +1EEAB;ARABIC MATHEMATICAL DOUBLE-STRUCK LAM;Lo;0;AL; 0644;;;;N;;;;; +1EEAC;ARABIC MATHEMATICAL DOUBLE-STRUCK MEEM;Lo;0;AL; 0645;;;;N;;;;; +1EEAD;ARABIC MATHEMATICAL DOUBLE-STRUCK NOON;Lo;0;AL; 0646;;;;N;;;;; +1EEAE;ARABIC MATHEMATICAL DOUBLE-STRUCK SEEN;Lo;0;AL; 0633;;;;N;;;;; +1EEAF;ARABIC MATHEMATICAL DOUBLE-STRUCK AIN;Lo;0;AL; 0639;;;;N;;;;; +1EEB0;ARABIC MATHEMATICAL DOUBLE-STRUCK FEH;Lo;0;AL; 0641;;;;N;;;;; +1EEB1;ARABIC MATHEMATICAL DOUBLE-STRUCK SAD;Lo;0;AL; 0635;;;;N;;;;; +1EEB2;ARABIC MATHEMATICAL DOUBLE-STRUCK QAF;Lo;0;AL; 0642;;;;N;;;;; +1EEB3;ARABIC MATHEMATICAL DOUBLE-STRUCK REH;Lo;0;AL; 0631;;;;N;;;;; +1EEB4;ARABIC MATHEMATICAL DOUBLE-STRUCK SHEEN;Lo;0;AL; 0634;;;;N;;;;; +1EEB5;ARABIC MATHEMATICAL DOUBLE-STRUCK TEH;Lo;0;AL; 062A;;;;N;;;;; +1EEB6;ARABIC MATHEMATICAL DOUBLE-STRUCK THEH;Lo;0;AL; 062B;;;;N;;;;; +1EEB7;ARABIC MATHEMATICAL DOUBLE-STRUCK KHAH;Lo;0;AL; 062E;;;;N;;;;; +1EEB8;ARABIC MATHEMATICAL DOUBLE-STRUCK THAL;Lo;0;AL; 0630;;;;N;;;;; +1EEB9;ARABIC MATHEMATICAL DOUBLE-STRUCK DAD;Lo;0;AL; 0636;;;;N;;;;; +1EEBA;ARABIC MATHEMATICAL DOUBLE-STRUCK ZAH;Lo;0;AL; 0638;;;;N;;;;; +1EEBB;ARABIC MATHEMATICAL DOUBLE-STRUCK GHAIN;Lo;0;AL; 063A;;;;N;;;;; +1EEF0;ARABIC MATHEMATICAL OPERATOR MEEM WITH HAH WITH TATWEEL;Sm;0;ON;;;;;N;;;;; +1EEF1;ARABIC MATHEMATICAL OPERATOR HAH WITH DAL;Sm;0;ON;;;;;N;;;;; +1F000;MAHJONG TILE EAST WIND;So;0;ON;;;;;N;;;;; +1F001;MAHJONG TILE SOUTH WIND;So;0;ON;;;;;N;;;;; +1F002;MAHJONG TILE WEST WIND;So;0;ON;;;;;N;;;;; +1F003;MAHJONG TILE NORTH WIND;So;0;ON;;;;;N;;;;; +1F004;MAHJONG TILE RED DRAGON;So;0;ON;;;;;N;;;;; +1F005;MAHJONG TILE GREEN DRAGON;So;0;ON;;;;;N;;;;; +1F006;MAHJONG TILE WHITE DRAGON;So;0;ON;;;;;N;;;;; +1F007;MAHJONG TILE ONE OF CHARACTERS;So;0;ON;;;;;N;;;;; +1F008;MAHJONG TILE TWO OF CHARACTERS;So;0;ON;;;;;N;;;;; +1F009;MAHJONG TILE THREE OF CHARACTERS;So;0;ON;;;;;N;;;;; +1F00A;MAHJONG TILE FOUR OF CHARACTERS;So;0;ON;;;;;N;;;;; +1F00B;MAHJONG TILE FIVE OF CHARACTERS;So;0;ON;;;;;N;;;;; +1F00C;MAHJONG TILE SIX OF CHARACTERS;So;0;ON;;;;;N;;;;; +1F00D;MAHJONG TILE SEVEN OF CHARACTERS;So;0;ON;;;;;N;;;;; +1F00E;MAHJONG TILE EIGHT OF CHARACTERS;So;0;ON;;;;;N;;;;; +1F00F;MAHJONG TILE NINE OF CHARACTERS;So;0;ON;;;;;N;;;;; +1F010;MAHJONG TILE ONE OF BAMBOOS;So;0;ON;;;;;N;;;;; +1F011;MAHJONG TILE TWO OF BAMBOOS;So;0;ON;;;;;N;;;;; +1F012;MAHJONG TILE THREE OF BAMBOOS;So;0;ON;;;;;N;;;;; +1F013;MAHJONG TILE FOUR OF BAMBOOS;So;0;ON;;;;;N;;;;; +1F014;MAHJONG TILE FIVE OF BAMBOOS;So;0;ON;;;;;N;;;;; +1F015;MAHJONG TILE SIX OF BAMBOOS;So;0;ON;;;;;N;;;;; +1F016;MAHJONG TILE SEVEN OF BAMBOOS;So;0;ON;;;;;N;;;;; +1F017;MAHJONG TILE EIGHT OF BAMBOOS;So;0;ON;;;;;N;;;;; +1F018;MAHJONG TILE NINE OF BAMBOOS;So;0;ON;;;;;N;;;;; +1F019;MAHJONG TILE ONE OF CIRCLES;So;0;ON;;;;;N;;;;; +1F01A;MAHJONG TILE TWO OF CIRCLES;So;0;ON;;;;;N;;;;; +1F01B;MAHJONG TILE THREE OF CIRCLES;So;0;ON;;;;;N;;;;; +1F01C;MAHJONG TILE FOUR OF CIRCLES;So;0;ON;;;;;N;;;;; +1F01D;MAHJONG TILE FIVE OF CIRCLES;So;0;ON;;;;;N;;;;; +1F01E;MAHJONG TILE SIX OF CIRCLES;So;0;ON;;;;;N;;;;; +1F01F;MAHJONG TILE SEVEN OF CIRCLES;So;0;ON;;;;;N;;;;; +1F020;MAHJONG TILE EIGHT OF CIRCLES;So;0;ON;;;;;N;;;;; +1F021;MAHJONG TILE NINE OF CIRCLES;So;0;ON;;;;;N;;;;; +1F022;MAHJONG TILE PLUM;So;0;ON;;;;;N;;;;; +1F023;MAHJONG TILE ORCHID;So;0;ON;;;;;N;;;;; +1F024;MAHJONG TILE BAMBOO;So;0;ON;;;;;N;;;;; +1F025;MAHJONG TILE CHRYSANTHEMUM;So;0;ON;;;;;N;;;;; +1F026;MAHJONG TILE SPRING;So;0;ON;;;;;N;;;;; +1F027;MAHJONG TILE SUMMER;So;0;ON;;;;;N;;;;; +1F028;MAHJONG TILE AUTUMN;So;0;ON;;;;;N;;;;; +1F029;MAHJONG TILE WINTER;So;0;ON;;;;;N;;;;; +1F02A;MAHJONG TILE JOKER;So;0;ON;;;;;N;;;;; +1F02B;MAHJONG TILE BACK;So;0;ON;;;;;N;;;;; +1F030;DOMINO TILE HORIZONTAL BACK;So;0;ON;;;;;N;;;;; +1F031;DOMINO TILE HORIZONTAL-00-00;So;0;ON;;;;;N;;;;; +1F032;DOMINO TILE HORIZONTAL-00-01;So;0;ON;;;;;N;;;;; +1F033;DOMINO TILE HORIZONTAL-00-02;So;0;ON;;;;;N;;;;; +1F034;DOMINO TILE HORIZONTAL-00-03;So;0;ON;;;;;N;;;;; +1F035;DOMINO TILE HORIZONTAL-00-04;So;0;ON;;;;;N;;;;; +1F036;DOMINO TILE HORIZONTAL-00-05;So;0;ON;;;;;N;;;;; +1F037;DOMINO TILE HORIZONTAL-00-06;So;0;ON;;;;;N;;;;; +1F038;DOMINO TILE HORIZONTAL-01-00;So;0;ON;;;;;N;;;;; +1F039;DOMINO TILE HORIZONTAL-01-01;So;0;ON;;;;;N;;;;; +1F03A;DOMINO TILE HORIZONTAL-01-02;So;0;ON;;;;;N;;;;; +1F03B;DOMINO TILE HORIZONTAL-01-03;So;0;ON;;;;;N;;;;; +1F03C;DOMINO TILE HORIZONTAL-01-04;So;0;ON;;;;;N;;;;; +1F03D;DOMINO TILE HORIZONTAL-01-05;So;0;ON;;;;;N;;;;; +1F03E;DOMINO TILE HORIZONTAL-01-06;So;0;ON;;;;;N;;;;; +1F03F;DOMINO TILE HORIZONTAL-02-00;So;0;ON;;;;;N;;;;; +1F040;DOMINO TILE HORIZONTAL-02-01;So;0;ON;;;;;N;;;;; +1F041;DOMINO TILE HORIZONTAL-02-02;So;0;ON;;;;;N;;;;; +1F042;DOMINO TILE HORIZONTAL-02-03;So;0;ON;;;;;N;;;;; +1F043;DOMINO TILE HORIZONTAL-02-04;So;0;ON;;;;;N;;;;; +1F044;DOMINO TILE HORIZONTAL-02-05;So;0;ON;;;;;N;;;;; +1F045;DOMINO TILE HORIZONTAL-02-06;So;0;ON;;;;;N;;;;; +1F046;DOMINO TILE HORIZONTAL-03-00;So;0;ON;;;;;N;;;;; +1F047;DOMINO TILE HORIZONTAL-03-01;So;0;ON;;;;;N;;;;; +1F048;DOMINO TILE HORIZONTAL-03-02;So;0;ON;;;;;N;;;;; +1F049;DOMINO TILE HORIZONTAL-03-03;So;0;ON;;;;;N;;;;; +1F04A;DOMINO TILE HORIZONTAL-03-04;So;0;ON;;;;;N;;;;; +1F04B;DOMINO TILE HORIZONTAL-03-05;So;0;ON;;;;;N;;;;; +1F04C;DOMINO TILE HORIZONTAL-03-06;So;0;ON;;;;;N;;;;; +1F04D;DOMINO TILE HORIZONTAL-04-00;So;0;ON;;;;;N;;;;; +1F04E;DOMINO TILE HORIZONTAL-04-01;So;0;ON;;;;;N;;;;; +1F04F;DOMINO TILE HORIZONTAL-04-02;So;0;ON;;;;;N;;;;; +1F050;DOMINO TILE HORIZONTAL-04-03;So;0;ON;;;;;N;;;;; +1F051;DOMINO TILE HORIZONTAL-04-04;So;0;ON;;;;;N;;;;; +1F052;DOMINO TILE HORIZONTAL-04-05;So;0;ON;;;;;N;;;;; +1F053;DOMINO TILE HORIZONTAL-04-06;So;0;ON;;;;;N;;;;; +1F054;DOMINO TILE HORIZONTAL-05-00;So;0;ON;;;;;N;;;;; +1F055;DOMINO TILE HORIZONTAL-05-01;So;0;ON;;;;;N;;;;; +1F056;DOMINO TILE HORIZONTAL-05-02;So;0;ON;;;;;N;;;;; +1F057;DOMINO TILE HORIZONTAL-05-03;So;0;ON;;;;;N;;;;; +1F058;DOMINO TILE HORIZONTAL-05-04;So;0;ON;;;;;N;;;;; +1F059;DOMINO TILE HORIZONTAL-05-05;So;0;ON;;;;;N;;;;; +1F05A;DOMINO TILE HORIZONTAL-05-06;So;0;ON;;;;;N;;;;; +1F05B;DOMINO TILE HORIZONTAL-06-00;So;0;ON;;;;;N;;;;; +1F05C;DOMINO TILE HORIZONTAL-06-01;So;0;ON;;;;;N;;;;; +1F05D;DOMINO TILE HORIZONTAL-06-02;So;0;ON;;;;;N;;;;; +1F05E;DOMINO TILE HORIZONTAL-06-03;So;0;ON;;;;;N;;;;; +1F05F;DOMINO TILE HORIZONTAL-06-04;So;0;ON;;;;;N;;;;; +1F060;DOMINO TILE HORIZONTAL-06-05;So;0;ON;;;;;N;;;;; +1F061;DOMINO TILE HORIZONTAL-06-06;So;0;ON;;;;;N;;;;; +1F062;DOMINO TILE VERTICAL BACK;So;0;ON;;;;;N;;;;; +1F063;DOMINO TILE VERTICAL-00-00;So;0;ON;;;;;N;;;;; +1F064;DOMINO TILE VERTICAL-00-01;So;0;ON;;;;;N;;;;; +1F065;DOMINO TILE VERTICAL-00-02;So;0;ON;;;;;N;;;;; +1F066;DOMINO TILE VERTICAL-00-03;So;0;ON;;;;;N;;;;; +1F067;DOMINO TILE VERTICAL-00-04;So;0;ON;;;;;N;;;;; +1F068;DOMINO TILE VERTICAL-00-05;So;0;ON;;;;;N;;;;; +1F069;DOMINO TILE VERTICAL-00-06;So;0;ON;;;;;N;;;;; +1F06A;DOMINO TILE VERTICAL-01-00;So;0;ON;;;;;N;;;;; +1F06B;DOMINO TILE VERTICAL-01-01;So;0;ON;;;;;N;;;;; +1F06C;DOMINO TILE VERTICAL-01-02;So;0;ON;;;;;N;;;;; +1F06D;DOMINO TILE VERTICAL-01-03;So;0;ON;;;;;N;;;;; +1F06E;DOMINO TILE VERTICAL-01-04;So;0;ON;;;;;N;;;;; +1F06F;DOMINO TILE VERTICAL-01-05;So;0;ON;;;;;N;;;;; +1F070;DOMINO TILE VERTICAL-01-06;So;0;ON;;;;;N;;;;; +1F071;DOMINO TILE VERTICAL-02-00;So;0;ON;;;;;N;;;;; +1F072;DOMINO TILE VERTICAL-02-01;So;0;ON;;;;;N;;;;; +1F073;DOMINO TILE VERTICAL-02-02;So;0;ON;;;;;N;;;;; +1F074;DOMINO TILE VERTICAL-02-03;So;0;ON;;;;;N;;;;; +1F075;DOMINO TILE VERTICAL-02-04;So;0;ON;;;;;N;;;;; +1F076;DOMINO TILE VERTICAL-02-05;So;0;ON;;;;;N;;;;; +1F077;DOMINO TILE VERTICAL-02-06;So;0;ON;;;;;N;;;;; +1F078;DOMINO TILE VERTICAL-03-00;So;0;ON;;;;;N;;;;; +1F079;DOMINO TILE VERTICAL-03-01;So;0;ON;;;;;N;;;;; +1F07A;DOMINO TILE VERTICAL-03-02;So;0;ON;;;;;N;;;;; +1F07B;DOMINO TILE VERTICAL-03-03;So;0;ON;;;;;N;;;;; +1F07C;DOMINO TILE VERTICAL-03-04;So;0;ON;;;;;N;;;;; +1F07D;DOMINO TILE VERTICAL-03-05;So;0;ON;;;;;N;;;;; +1F07E;DOMINO TILE VERTICAL-03-06;So;0;ON;;;;;N;;;;; +1F07F;DOMINO TILE VERTICAL-04-00;So;0;ON;;;;;N;;;;; +1F080;DOMINO TILE VERTICAL-04-01;So;0;ON;;;;;N;;;;; +1F081;DOMINO TILE VERTICAL-04-02;So;0;ON;;;;;N;;;;; +1F082;DOMINO TILE VERTICAL-04-03;So;0;ON;;;;;N;;;;; +1F083;DOMINO TILE VERTICAL-04-04;So;0;ON;;;;;N;;;;; +1F084;DOMINO TILE VERTICAL-04-05;So;0;ON;;;;;N;;;;; +1F085;DOMINO TILE VERTICAL-04-06;So;0;ON;;;;;N;;;;; +1F086;DOMINO TILE VERTICAL-05-00;So;0;ON;;;;;N;;;;; +1F087;DOMINO TILE VERTICAL-05-01;So;0;ON;;;;;N;;;;; +1F088;DOMINO TILE VERTICAL-05-02;So;0;ON;;;;;N;;;;; +1F089;DOMINO TILE VERTICAL-05-03;So;0;ON;;;;;N;;;;; +1F08A;DOMINO TILE VERTICAL-05-04;So;0;ON;;;;;N;;;;; +1F08B;DOMINO TILE VERTICAL-05-05;So;0;ON;;;;;N;;;;; +1F08C;DOMINO TILE VERTICAL-05-06;So;0;ON;;;;;N;;;;; +1F08D;DOMINO TILE VERTICAL-06-00;So;0;ON;;;;;N;;;;; +1F08E;DOMINO TILE VERTICAL-06-01;So;0;ON;;;;;N;;;;; +1F08F;DOMINO TILE VERTICAL-06-02;So;0;ON;;;;;N;;;;; +1F090;DOMINO TILE VERTICAL-06-03;So;0;ON;;;;;N;;;;; +1F091;DOMINO TILE VERTICAL-06-04;So;0;ON;;;;;N;;;;; +1F092;DOMINO TILE VERTICAL-06-05;So;0;ON;;;;;N;;;;; +1F093;DOMINO TILE VERTICAL-06-06;So;0;ON;;;;;N;;;;; +1F0A0;PLAYING CARD BACK;So;0;ON;;;;;N;;;;; +1F0A1;PLAYING CARD ACE OF SPADES;So;0;ON;;;;;N;;;;; +1F0A2;PLAYING CARD TWO OF SPADES;So;0;ON;;;;;N;;;;; +1F0A3;PLAYING CARD THREE OF SPADES;So;0;ON;;;;;N;;;;; +1F0A4;PLAYING CARD FOUR OF SPADES;So;0;ON;;;;;N;;;;; +1F0A5;PLAYING CARD FIVE OF SPADES;So;0;ON;;;;;N;;;;; +1F0A6;PLAYING CARD SIX OF SPADES;So;0;ON;;;;;N;;;;; +1F0A7;PLAYING CARD SEVEN OF SPADES;So;0;ON;;;;;N;;;;; +1F0A8;PLAYING CARD EIGHT OF SPADES;So;0;ON;;;;;N;;;;; +1F0A9;PLAYING CARD NINE OF SPADES;So;0;ON;;;;;N;;;;; +1F0AA;PLAYING CARD TEN OF SPADES;So;0;ON;;;;;N;;;;; +1F0AB;PLAYING CARD JACK OF SPADES;So;0;ON;;;;;N;;;;; +1F0AC;PLAYING CARD KNIGHT OF SPADES;So;0;ON;;;;;N;;;;; +1F0AD;PLAYING CARD QUEEN OF SPADES;So;0;ON;;;;;N;;;;; +1F0AE;PLAYING CARD KING OF SPADES;So;0;ON;;;;;N;;;;; +1F0B1;PLAYING CARD ACE OF HEARTS;So;0;ON;;;;;N;;;;; +1F0B2;PLAYING CARD TWO OF HEARTS;So;0;ON;;;;;N;;;;; +1F0B3;PLAYING CARD THREE OF HEARTS;So;0;ON;;;;;N;;;;; +1F0B4;PLAYING CARD FOUR OF HEARTS;So;0;ON;;;;;N;;;;; +1F0B5;PLAYING CARD FIVE OF HEARTS;So;0;ON;;;;;N;;;;; +1F0B6;PLAYING CARD SIX OF HEARTS;So;0;ON;;;;;N;;;;; +1F0B7;PLAYING CARD SEVEN OF HEARTS;So;0;ON;;;;;N;;;;; +1F0B8;PLAYING CARD EIGHT OF HEARTS;So;0;ON;;;;;N;;;;; +1F0B9;PLAYING CARD NINE OF HEARTS;So;0;ON;;;;;N;;;;; +1F0BA;PLAYING CARD TEN OF HEARTS;So;0;ON;;;;;N;;;;; +1F0BB;PLAYING CARD JACK OF HEARTS;So;0;ON;;;;;N;;;;; +1F0BC;PLAYING CARD KNIGHT OF HEARTS;So;0;ON;;;;;N;;;;; +1F0BD;PLAYING CARD QUEEN OF HEARTS;So;0;ON;;;;;N;;;;; +1F0BE;PLAYING CARD KING OF HEARTS;So;0;ON;;;;;N;;;;; +1F0BF;PLAYING CARD RED JOKER;So;0;ON;;;;;N;;;;; +1F0C1;PLAYING CARD ACE OF DIAMONDS;So;0;ON;;;;;N;;;;; +1F0C2;PLAYING CARD TWO OF DIAMONDS;So;0;ON;;;;;N;;;;; +1F0C3;PLAYING CARD THREE OF DIAMONDS;So;0;ON;;;;;N;;;;; +1F0C4;PLAYING CARD FOUR OF DIAMONDS;So;0;ON;;;;;N;;;;; +1F0C5;PLAYING CARD FIVE OF DIAMONDS;So;0;ON;;;;;N;;;;; +1F0C6;PLAYING CARD SIX OF DIAMONDS;So;0;ON;;;;;N;;;;; +1F0C7;PLAYING CARD SEVEN OF DIAMONDS;So;0;ON;;;;;N;;;;; +1F0C8;PLAYING CARD EIGHT OF DIAMONDS;So;0;ON;;;;;N;;;;; +1F0C9;PLAYING CARD NINE OF DIAMONDS;So;0;ON;;;;;N;;;;; +1F0CA;PLAYING CARD TEN OF DIAMONDS;So;0;ON;;;;;N;;;;; +1F0CB;PLAYING CARD JACK OF DIAMONDS;So;0;ON;;;;;N;;;;; +1F0CC;PLAYING CARD KNIGHT OF DIAMONDS;So;0;ON;;;;;N;;;;; +1F0CD;PLAYING CARD QUEEN OF DIAMONDS;So;0;ON;;;;;N;;;;; +1F0CE;PLAYING CARD KING OF DIAMONDS;So;0;ON;;;;;N;;;;; +1F0CF;PLAYING CARD BLACK JOKER;So;0;ON;;;;;N;;;;; +1F0D1;PLAYING CARD ACE OF CLUBS;So;0;ON;;;;;N;;;;; +1F0D2;PLAYING CARD TWO OF CLUBS;So;0;ON;;;;;N;;;;; +1F0D3;PLAYING CARD THREE OF CLUBS;So;0;ON;;;;;N;;;;; +1F0D4;PLAYING CARD FOUR OF CLUBS;So;0;ON;;;;;N;;;;; +1F0D5;PLAYING CARD FIVE OF CLUBS;So;0;ON;;;;;N;;;;; +1F0D6;PLAYING CARD SIX OF CLUBS;So;0;ON;;;;;N;;;;; +1F0D7;PLAYING CARD SEVEN OF CLUBS;So;0;ON;;;;;N;;;;; +1F0D8;PLAYING CARD EIGHT OF CLUBS;So;0;ON;;;;;N;;;;; +1F0D9;PLAYING CARD NINE OF CLUBS;So;0;ON;;;;;N;;;;; +1F0DA;PLAYING CARD TEN OF CLUBS;So;0;ON;;;;;N;;;;; +1F0DB;PLAYING CARD JACK OF CLUBS;So;0;ON;;;;;N;;;;; +1F0DC;PLAYING CARD KNIGHT OF CLUBS;So;0;ON;;;;;N;;;;; +1F0DD;PLAYING CARD QUEEN OF CLUBS;So;0;ON;;;;;N;;;;; +1F0DE;PLAYING CARD KING OF CLUBS;So;0;ON;;;;;N;;;;; +1F0DF;PLAYING CARD WHITE JOKER;So;0;ON;;;;;N;;;;; +1F0E0;PLAYING CARD FOOL;So;0;ON;;;;;N;;;;; +1F0E1;PLAYING CARD TRUMP-1;So;0;ON;;;;;N;;;;; +1F0E2;PLAYING CARD TRUMP-2;So;0;ON;;;;;N;;;;; +1F0E3;PLAYING CARD TRUMP-3;So;0;ON;;;;;N;;;;; +1F0E4;PLAYING CARD TRUMP-4;So;0;ON;;;;;N;;;;; +1F0E5;PLAYING CARD TRUMP-5;So;0;ON;;;;;N;;;;; +1F0E6;PLAYING CARD TRUMP-6;So;0;ON;;;;;N;;;;; +1F0E7;PLAYING CARD TRUMP-7;So;0;ON;;;;;N;;;;; +1F0E8;PLAYING CARD TRUMP-8;So;0;ON;;;;;N;;;;; +1F0E9;PLAYING CARD TRUMP-9;So;0;ON;;;;;N;;;;; +1F0EA;PLAYING CARD TRUMP-10;So;0;ON;;;;;N;;;;; +1F0EB;PLAYING CARD TRUMP-11;So;0;ON;;;;;N;;;;; +1F0EC;PLAYING CARD TRUMP-12;So;0;ON;;;;;N;;;;; +1F0ED;PLAYING CARD TRUMP-13;So;0;ON;;;;;N;;;;; +1F0EE;PLAYING CARD TRUMP-14;So;0;ON;;;;;N;;;;; +1F0EF;PLAYING CARD TRUMP-15;So;0;ON;;;;;N;;;;; +1F0F0;PLAYING CARD TRUMP-16;So;0;ON;;;;;N;;;;; +1F0F1;PLAYING CARD TRUMP-17;So;0;ON;;;;;N;;;;; +1F0F2;PLAYING CARD TRUMP-18;So;0;ON;;;;;N;;;;; +1F0F3;PLAYING CARD TRUMP-19;So;0;ON;;;;;N;;;;; +1F0F4;PLAYING CARD TRUMP-20;So;0;ON;;;;;N;;;;; +1F0F5;PLAYING CARD TRUMP-21;So;0;ON;;;;;N;;;;; +1F100;DIGIT ZERO FULL STOP;No;0;EN; 0030 002E;;0;0;N;;;;; +1F101;DIGIT ZERO COMMA;No;0;EN; 0030 002C;;0;0;N;;;;; +1F102;DIGIT ONE COMMA;No;0;EN; 0031 002C;;1;1;N;;;;; +1F103;DIGIT TWO COMMA;No;0;EN; 0032 002C;;2;2;N;;;;; +1F104;DIGIT THREE COMMA;No;0;EN; 0033 002C;;3;3;N;;;;; +1F105;DIGIT FOUR COMMA;No;0;EN; 0034 002C;;4;4;N;;;;; +1F106;DIGIT FIVE COMMA;No;0;EN; 0035 002C;;5;5;N;;;;; +1F107;DIGIT SIX COMMA;No;0;EN; 0036 002C;;6;6;N;;;;; +1F108;DIGIT SEVEN COMMA;No;0;EN; 0037 002C;;7;7;N;;;;; +1F109;DIGIT EIGHT COMMA;No;0;EN; 0038 002C;;8;8;N;;;;; +1F10A;DIGIT NINE COMMA;No;0;EN; 0039 002C;;9;9;N;;;;; +1F10B;DINGBAT CIRCLED SANS-SERIF DIGIT ZERO;No;0;ON;;;;0;N;;;;; +1F10C;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT ZERO;No;0;ON;;;;0;N;;;;; +1F10D;CIRCLED ZERO WITH SLASH;So;0;ON;;;;;N;;;;; +1F10E;CIRCLED ANTICLOCKWISE ARROW;So;0;ON;;;;;N;;;;; +1F10F;CIRCLED DOLLAR SIGN WITH OVERLAID BACKSLASH;So;0;ON;;;;;N;;;;; +1F110;PARENTHESIZED LATIN CAPITAL LETTER A;So;0;L; 0028 0041 0029;;;;N;;;;; +1F111;PARENTHESIZED LATIN CAPITAL LETTER B;So;0;L; 0028 0042 0029;;;;N;;;;; +1F112;PARENTHESIZED LATIN CAPITAL LETTER C;So;0;L; 0028 0043 0029;;;;N;;;;; +1F113;PARENTHESIZED LATIN CAPITAL LETTER D;So;0;L; 0028 0044 0029;;;;N;;;;; +1F114;PARENTHESIZED LATIN CAPITAL LETTER E;So;0;L; 0028 0045 0029;;;;N;;;;; +1F115;PARENTHESIZED LATIN CAPITAL LETTER F;So;0;L; 0028 0046 0029;;;;N;;;;; +1F116;PARENTHESIZED LATIN CAPITAL LETTER G;So;0;L; 0028 0047 0029;;;;N;;;;; +1F117;PARENTHESIZED LATIN CAPITAL LETTER H;So;0;L; 0028 0048 0029;;;;N;;;;; +1F118;PARENTHESIZED LATIN CAPITAL LETTER I;So;0;L; 0028 0049 0029;;;;N;;;;; +1F119;PARENTHESIZED LATIN CAPITAL LETTER J;So;0;L; 0028 004A 0029;;;;N;;;;; +1F11A;PARENTHESIZED LATIN CAPITAL LETTER K;So;0;L; 0028 004B 0029;;;;N;;;;; +1F11B;PARENTHESIZED LATIN CAPITAL LETTER L;So;0;L; 0028 004C 0029;;;;N;;;;; +1F11C;PARENTHESIZED LATIN CAPITAL LETTER M;So;0;L; 0028 004D 0029;;;;N;;;;; +1F11D;PARENTHESIZED LATIN CAPITAL LETTER N;So;0;L; 0028 004E 0029;;;;N;;;;; +1F11E;PARENTHESIZED LATIN CAPITAL LETTER O;So;0;L; 0028 004F 0029;;;;N;;;;; +1F11F;PARENTHESIZED LATIN CAPITAL LETTER P;So;0;L; 0028 0050 0029;;;;N;;;;; +1F120;PARENTHESIZED LATIN CAPITAL LETTER Q;So;0;L; 0028 0051 0029;;;;N;;;;; +1F121;PARENTHESIZED LATIN CAPITAL LETTER R;So;0;L; 0028 0052 0029;;;;N;;;;; +1F122;PARENTHESIZED LATIN CAPITAL LETTER S;So;0;L; 0028 0053 0029;;;;N;;;;; +1F123;PARENTHESIZED LATIN CAPITAL LETTER T;So;0;L; 0028 0054 0029;;;;N;;;;; +1F124;PARENTHESIZED LATIN CAPITAL LETTER U;So;0;L; 0028 0055 0029;;;;N;;;;; +1F125;PARENTHESIZED LATIN CAPITAL LETTER V;So;0;L; 0028 0056 0029;;;;N;;;;; +1F126;PARENTHESIZED LATIN CAPITAL LETTER W;So;0;L; 0028 0057 0029;;;;N;;;;; +1F127;PARENTHESIZED LATIN CAPITAL LETTER X;So;0;L; 0028 0058 0029;;;;N;;;;; +1F128;PARENTHESIZED LATIN CAPITAL LETTER Y;So;0;L; 0028 0059 0029;;;;N;;;;; +1F129;PARENTHESIZED LATIN CAPITAL LETTER Z;So;0;L; 0028 005A 0029;;;;N;;;;; +1F12A;TORTOISE SHELL BRACKETED LATIN CAPITAL LETTER S;So;0;L; 3014 0053 3015;;;;N;;;;; +1F12B;CIRCLED ITALIC LATIN CAPITAL LETTER C;So;0;L; 0043;;;;N;;;;; +1F12C;CIRCLED ITALIC LATIN CAPITAL LETTER R;So;0;L; 0052;;;;N;;;;; +1F12D;CIRCLED CD;So;0;L; 0043 0044;;;;N;;;;; +1F12E;CIRCLED WZ;So;0;L; 0057 005A;;;;N;;;;; +1F12F;COPYLEFT SYMBOL;So;0;ON;;;;;N;;;;; +1F130;SQUARED LATIN CAPITAL LETTER A;So;0;L; 0041;;;;N;;;;; +1F131;SQUARED LATIN CAPITAL LETTER B;So;0;L; 0042;;;;N;;;;; +1F132;SQUARED LATIN CAPITAL LETTER C;So;0;L; 0043;;;;N;;;;; +1F133;SQUARED LATIN CAPITAL LETTER D;So;0;L; 0044;;;;N;;;;; +1F134;SQUARED LATIN CAPITAL LETTER E;So;0;L; 0045;;;;N;;;;; +1F135;SQUARED LATIN CAPITAL LETTER F;So;0;L; 0046;;;;N;;;;; +1F136;SQUARED LATIN CAPITAL LETTER G;So;0;L; 0047;;;;N;;;;; +1F137;SQUARED LATIN CAPITAL LETTER H;So;0;L; 0048;;;;N;;;;; +1F138;SQUARED LATIN CAPITAL LETTER I;So;0;L; 0049;;;;N;;;;; +1F139;SQUARED LATIN CAPITAL LETTER J;So;0;L; 004A;;;;N;;;;; +1F13A;SQUARED LATIN CAPITAL LETTER K;So;0;L; 004B;;;;N;;;;; +1F13B;SQUARED LATIN CAPITAL LETTER L;So;0;L; 004C;;;;N;;;;; +1F13C;SQUARED LATIN CAPITAL LETTER M;So;0;L; 004D;;;;N;;;;; +1F13D;SQUARED LATIN CAPITAL LETTER N;So;0;L; 004E;;;;N;;;;; +1F13E;SQUARED LATIN CAPITAL LETTER O;So;0;L; 004F;;;;N;;;;; +1F13F;SQUARED LATIN CAPITAL LETTER P;So;0;L; 0050;;;;N;;;;; +1F140;SQUARED LATIN CAPITAL LETTER Q;So;0;L; 0051;;;;N;;;;; +1F141;SQUARED LATIN CAPITAL LETTER R;So;0;L; 0052;;;;N;;;;; +1F142;SQUARED LATIN CAPITAL LETTER S;So;0;L; 0053;;;;N;;;;; +1F143;SQUARED LATIN CAPITAL LETTER T;So;0;L; 0054;;;;N;;;;; +1F144;SQUARED LATIN CAPITAL LETTER U;So;0;L; 0055;;;;N;;;;; +1F145;SQUARED LATIN CAPITAL LETTER V;So;0;L; 0056;;;;N;;;;; +1F146;SQUARED LATIN CAPITAL LETTER W;So;0;L; 0057;;;;N;;;;; +1F147;SQUARED LATIN CAPITAL LETTER X;So;0;L; 0058;;;;N;;;;; +1F148;SQUARED LATIN CAPITAL LETTER Y;So;0;L; 0059;;;;N;;;;; +1F149;SQUARED LATIN CAPITAL LETTER Z;So;0;L; 005A;;;;N;;;;; +1F14A;SQUARED HV;So;0;L; 0048 0056;;;;N;;;;; +1F14B;SQUARED MV;So;0;L; 004D 0056;;;;N;;;;; +1F14C;SQUARED SD;So;0;L; 0053 0044;;;;N;;;;; +1F14D;SQUARED SS;So;0;L; 0053 0053;;;;N;;;;; +1F14E;SQUARED PPV;So;0;L; 0050 0050 0056;;;;N;;;;; +1F14F;SQUARED WC;So;0;L; 0057 0043;;;;N;;;;; +1F150;NEGATIVE CIRCLED LATIN CAPITAL LETTER A;So;0;L;;;;;N;;;;; +1F151;NEGATIVE CIRCLED LATIN CAPITAL LETTER B;So;0;L;;;;;N;;;;; +1F152;NEGATIVE CIRCLED LATIN CAPITAL LETTER C;So;0;L;;;;;N;;;;; +1F153;NEGATIVE CIRCLED LATIN CAPITAL LETTER D;So;0;L;;;;;N;;;;; +1F154;NEGATIVE CIRCLED LATIN CAPITAL LETTER E;So;0;L;;;;;N;;;;; +1F155;NEGATIVE CIRCLED LATIN CAPITAL LETTER F;So;0;L;;;;;N;;;;; +1F156;NEGATIVE CIRCLED LATIN CAPITAL LETTER G;So;0;L;;;;;N;;;;; +1F157;NEGATIVE CIRCLED LATIN CAPITAL LETTER H;So;0;L;;;;;N;;;;; +1F158;NEGATIVE CIRCLED LATIN CAPITAL LETTER I;So;0;L;;;;;N;;;;; +1F159;NEGATIVE CIRCLED LATIN CAPITAL LETTER J;So;0;L;;;;;N;;;;; +1F15A;NEGATIVE CIRCLED LATIN CAPITAL LETTER K;So;0;L;;;;;N;;;;; +1F15B;NEGATIVE CIRCLED LATIN CAPITAL LETTER L;So;0;L;;;;;N;;;;; +1F15C;NEGATIVE CIRCLED LATIN CAPITAL LETTER M;So;0;L;;;;;N;;;;; +1F15D;NEGATIVE CIRCLED LATIN CAPITAL LETTER N;So;0;L;;;;;N;;;;; +1F15E;NEGATIVE CIRCLED LATIN CAPITAL LETTER O;So;0;L;;;;;N;;;;; +1F15F;NEGATIVE CIRCLED LATIN CAPITAL LETTER P;So;0;L;;;;;N;;;;; +1F160;NEGATIVE CIRCLED LATIN CAPITAL LETTER Q;So;0;L;;;;;N;;;;; +1F161;NEGATIVE CIRCLED LATIN CAPITAL LETTER R;So;0;L;;;;;N;;;;; +1F162;NEGATIVE CIRCLED LATIN CAPITAL LETTER S;So;0;L;;;;;N;;;;; +1F163;NEGATIVE CIRCLED LATIN CAPITAL LETTER T;So;0;L;;;;;N;;;;; +1F164;NEGATIVE CIRCLED LATIN CAPITAL LETTER U;So;0;L;;;;;N;;;;; +1F165;NEGATIVE CIRCLED LATIN CAPITAL LETTER V;So;0;L;;;;;N;;;;; +1F166;NEGATIVE CIRCLED LATIN CAPITAL LETTER W;So;0;L;;;;;N;;;;; +1F167;NEGATIVE CIRCLED LATIN CAPITAL LETTER X;So;0;L;;;;;N;;;;; +1F168;NEGATIVE CIRCLED LATIN CAPITAL LETTER Y;So;0;L;;;;;N;;;;; +1F169;NEGATIVE CIRCLED LATIN CAPITAL LETTER Z;So;0;L;;;;;N;;;;; +1F16A;RAISED MC SIGN;So;0;ON; 004D 0043;;;;N;;;;; +1F16B;RAISED MD SIGN;So;0;ON; 004D 0044;;;;N;;;;; +1F16C;RAISED MR SIGN;So;0;ON; 004D 0052;;;;N;;;;; +1F16D;CIRCLED CC;So;0;ON;;;;;N;;;;; +1F16E;CIRCLED C WITH OVERLAID BACKSLASH;So;0;ON;;;;;N;;;;; +1F16F;CIRCLED HUMAN FIGURE;So;0;ON;;;;;N;;;;; +1F170;NEGATIVE SQUARED LATIN CAPITAL LETTER A;So;0;L;;;;;N;;;;; +1F171;NEGATIVE SQUARED LATIN CAPITAL LETTER B;So;0;L;;;;;N;;;;; +1F172;NEGATIVE SQUARED LATIN CAPITAL LETTER C;So;0;L;;;;;N;;;;; +1F173;NEGATIVE SQUARED LATIN CAPITAL LETTER D;So;0;L;;;;;N;;;;; +1F174;NEGATIVE SQUARED LATIN CAPITAL LETTER E;So;0;L;;;;;N;;;;; +1F175;NEGATIVE SQUARED LATIN CAPITAL LETTER F;So;0;L;;;;;N;;;;; +1F176;NEGATIVE SQUARED LATIN CAPITAL LETTER G;So;0;L;;;;;N;;;;; +1F177;NEGATIVE SQUARED LATIN CAPITAL LETTER H;So;0;L;;;;;N;;;;; +1F178;NEGATIVE SQUARED LATIN CAPITAL LETTER I;So;0;L;;;;;N;;;;; +1F179;NEGATIVE SQUARED LATIN CAPITAL LETTER J;So;0;L;;;;;N;;;;; +1F17A;NEGATIVE SQUARED LATIN CAPITAL LETTER K;So;0;L;;;;;N;;;;; +1F17B;NEGATIVE SQUARED LATIN CAPITAL LETTER L;So;0;L;;;;;N;;;;; +1F17C;NEGATIVE SQUARED LATIN CAPITAL LETTER M;So;0;L;;;;;N;;;;; +1F17D;NEGATIVE SQUARED LATIN CAPITAL LETTER N;So;0;L;;;;;N;;;;; +1F17E;NEGATIVE SQUARED LATIN CAPITAL LETTER O;So;0;L;;;;;N;;;;; +1F17F;NEGATIVE SQUARED LATIN CAPITAL LETTER P;So;0;L;;;;;N;;;;; +1F180;NEGATIVE SQUARED LATIN CAPITAL LETTER Q;So;0;L;;;;;N;;;;; +1F181;NEGATIVE SQUARED LATIN CAPITAL LETTER R;So;0;L;;;;;N;;;;; +1F182;NEGATIVE SQUARED LATIN CAPITAL LETTER S;So;0;L;;;;;N;;;;; +1F183;NEGATIVE SQUARED LATIN CAPITAL LETTER T;So;0;L;;;;;N;;;;; +1F184;NEGATIVE SQUARED LATIN CAPITAL LETTER U;So;0;L;;;;;N;;;;; +1F185;NEGATIVE SQUARED LATIN CAPITAL LETTER V;So;0;L;;;;;N;;;;; +1F186;NEGATIVE SQUARED LATIN CAPITAL LETTER W;So;0;L;;;;;N;;;;; +1F187;NEGATIVE SQUARED LATIN CAPITAL LETTER X;So;0;L;;;;;N;;;;; +1F188;NEGATIVE SQUARED LATIN CAPITAL LETTER Y;So;0;L;;;;;N;;;;; +1F189;NEGATIVE SQUARED LATIN CAPITAL LETTER Z;So;0;L;;;;;N;;;;; +1F18A;CROSSED NEGATIVE SQUARED LATIN CAPITAL LETTER P;So;0;L;;;;;N;;;;; +1F18B;NEGATIVE SQUARED IC;So;0;L;;;;;N;;;;; +1F18C;NEGATIVE SQUARED PA;So;0;L;;;;;N;;;;; +1F18D;NEGATIVE SQUARED SA;So;0;L;;;;;N;;;;; +1F18E;NEGATIVE SQUARED AB;So;0;L;;;;;N;;;;; +1F18F;NEGATIVE SQUARED WC;So;0;L;;;;;N;;;;; +1F190;SQUARE DJ;So;0;L; 0044 004A;;;;N;;;;; +1F191;SQUARED CL;So;0;L;;;;;N;;;;; +1F192;SQUARED COOL;So;0;L;;;;;N;;;;; +1F193;SQUARED FREE;So;0;L;;;;;N;;;;; +1F194;SQUARED ID;So;0;L;;;;;N;;;;; +1F195;SQUARED NEW;So;0;L;;;;;N;;;;; +1F196;SQUARED NG;So;0;L;;;;;N;;;;; +1F197;SQUARED OK;So;0;L;;;;;N;;;;; +1F198;SQUARED SOS;So;0;L;;;;;N;;;;; +1F199;SQUARED UP WITH EXCLAMATION MARK;So;0;L;;;;;N;;;;; +1F19A;SQUARED VS;So;0;L;;;;;N;;;;; +1F19B;SQUARED THREE D;So;0;L;;;;;N;;;;; +1F19C;SQUARED SECOND SCREEN;So;0;L;;;;;N;;;;; +1F19D;SQUARED TWO K;So;0;L;;;;;N;;;;; +1F19E;SQUARED FOUR K;So;0;L;;;;;N;;;;; +1F19F;SQUARED EIGHT K;So;0;L;;;;;N;;;;; +1F1A0;SQUARED FIVE POINT ONE;So;0;L;;;;;N;;;;; +1F1A1;SQUARED SEVEN POINT ONE;So;0;L;;;;;N;;;;; +1F1A2;SQUARED TWENTY-TWO POINT TWO;So;0;L;;;;;N;;;;; +1F1A3;SQUARED SIXTY P;So;0;L;;;;;N;;;;; +1F1A4;SQUARED ONE HUNDRED TWENTY P;So;0;L;;;;;N;;;;; +1F1A5;SQUARED LATIN SMALL LETTER D;So;0;L;;;;;N;;;;; +1F1A6;SQUARED HC;So;0;L;;;;;N;;;;; +1F1A7;SQUARED HDR;So;0;L;;;;;N;;;;; +1F1A8;SQUARED HI-RES;So;0;L;;;;;N;;;;; +1F1A9;SQUARED LOSSLESS;So;0;L;;;;;N;;;;; +1F1AA;SQUARED SHV;So;0;L;;;;;N;;;;; +1F1AB;SQUARED UHD;So;0;L;;;;;N;;;;; +1F1AC;SQUARED VOD;So;0;L;;;;;N;;;;; +1F1AD;MASK WORK SYMBOL;So;0;ON;;;;;N;;;;; +1F1E6;REGIONAL INDICATOR SYMBOL LETTER A;So;0;L;;;;;N;;;;; +1F1E7;REGIONAL INDICATOR SYMBOL LETTER B;So;0;L;;;;;N;;;;; +1F1E8;REGIONAL INDICATOR SYMBOL LETTER C;So;0;L;;;;;N;;;;; +1F1E9;REGIONAL INDICATOR SYMBOL LETTER D;So;0;L;;;;;N;;;;; +1F1EA;REGIONAL INDICATOR SYMBOL LETTER E;So;0;L;;;;;N;;;;; +1F1EB;REGIONAL INDICATOR SYMBOL LETTER F;So;0;L;;;;;N;;;;; +1F1EC;REGIONAL INDICATOR SYMBOL LETTER G;So;0;L;;;;;N;;;;; +1F1ED;REGIONAL INDICATOR SYMBOL LETTER H;So;0;L;;;;;N;;;;; +1F1EE;REGIONAL INDICATOR SYMBOL LETTER I;So;0;L;;;;;N;;;;; +1F1EF;REGIONAL INDICATOR SYMBOL LETTER J;So;0;L;;;;;N;;;;; +1F1F0;REGIONAL INDICATOR SYMBOL LETTER K;So;0;L;;;;;N;;;;; +1F1F1;REGIONAL INDICATOR SYMBOL LETTER L;So;0;L;;;;;N;;;;; +1F1F2;REGIONAL INDICATOR SYMBOL LETTER M;So;0;L;;;;;N;;;;; +1F1F3;REGIONAL INDICATOR SYMBOL LETTER N;So;0;L;;;;;N;;;;; +1F1F4;REGIONAL INDICATOR SYMBOL LETTER O;So;0;L;;;;;N;;;;; +1F1F5;REGIONAL INDICATOR SYMBOL LETTER P;So;0;L;;;;;N;;;;; +1F1F6;REGIONAL INDICATOR SYMBOL LETTER Q;So;0;L;;;;;N;;;;; +1F1F7;REGIONAL INDICATOR SYMBOL LETTER R;So;0;L;;;;;N;;;;; +1F1F8;REGIONAL INDICATOR SYMBOL LETTER S;So;0;L;;;;;N;;;;; +1F1F9;REGIONAL INDICATOR SYMBOL LETTER T;So;0;L;;;;;N;;;;; +1F1FA;REGIONAL INDICATOR SYMBOL LETTER U;So;0;L;;;;;N;;;;; +1F1FB;REGIONAL INDICATOR SYMBOL LETTER V;So;0;L;;;;;N;;;;; +1F1FC;REGIONAL INDICATOR SYMBOL LETTER W;So;0;L;;;;;N;;;;; +1F1FD;REGIONAL INDICATOR SYMBOL LETTER X;So;0;L;;;;;N;;;;; +1F1FE;REGIONAL INDICATOR SYMBOL LETTER Y;So;0;L;;;;;N;;;;; +1F1FF;REGIONAL INDICATOR SYMBOL LETTER Z;So;0;L;;;;;N;;;;; +1F200;SQUARE HIRAGANA HOKA;So;0;L; 307B 304B;;;;N;;;;; +1F201;SQUARED KATAKANA KOKO;So;0;L; 30B3 30B3;;;;N;;;;; +1F202;SQUARED KATAKANA SA;So;0;L; 30B5;;;;N;;;;; +1F210;SQUARED CJK UNIFIED IDEOGRAPH-624B;So;0;L; 624B;;;;N;;;;; +1F211;SQUARED CJK UNIFIED IDEOGRAPH-5B57;So;0;L; 5B57;;;;N;;;;; +1F212;SQUARED CJK UNIFIED IDEOGRAPH-53CC;So;0;L; 53CC;;;;N;;;;; +1F213;SQUARED KATAKANA DE;So;0;L; 30C7;;;;N;;;;; +1F214;SQUARED CJK UNIFIED IDEOGRAPH-4E8C;So;0;L; 4E8C;;;;N;;;;; +1F215;SQUARED CJK UNIFIED IDEOGRAPH-591A;So;0;L; 591A;;;;N;;;;; +1F216;SQUARED CJK UNIFIED IDEOGRAPH-89E3;So;0;L; 89E3;;;;N;;;;; +1F217;SQUARED CJK UNIFIED IDEOGRAPH-5929;So;0;L; 5929;;;;N;;;;; +1F218;SQUARED CJK UNIFIED IDEOGRAPH-4EA4;So;0;L; 4EA4;;;;N;;;;; +1F219;SQUARED CJK UNIFIED IDEOGRAPH-6620;So;0;L; 6620;;;;N;;;;; +1F21A;SQUARED CJK UNIFIED IDEOGRAPH-7121;So;0;L; 7121;;;;N;;;;; +1F21B;SQUARED CJK UNIFIED IDEOGRAPH-6599;So;0;L; 6599;;;;N;;;;; +1F21C;SQUARED CJK UNIFIED IDEOGRAPH-524D;So;0;L; 524D;;;;N;;;;; +1F21D;SQUARED CJK UNIFIED IDEOGRAPH-5F8C;So;0;L; 5F8C;;;;N;;;;; +1F21E;SQUARED CJK UNIFIED IDEOGRAPH-518D;So;0;L; 518D;;;;N;;;;; +1F21F;SQUARED CJK UNIFIED IDEOGRAPH-65B0;So;0;L; 65B0;;;;N;;;;; +1F220;SQUARED CJK UNIFIED IDEOGRAPH-521D;So;0;L; 521D;;;;N;;;;; +1F221;SQUARED CJK UNIFIED IDEOGRAPH-7D42;So;0;L; 7D42;;;;N;;;;; +1F222;SQUARED CJK UNIFIED IDEOGRAPH-751F;So;0;L; 751F;;;;N;;;;; +1F223;SQUARED CJK UNIFIED IDEOGRAPH-8CA9;So;0;L; 8CA9;;;;N;;;;; +1F224;SQUARED CJK UNIFIED IDEOGRAPH-58F0;So;0;L; 58F0;;;;N;;;;; +1F225;SQUARED CJK UNIFIED IDEOGRAPH-5439;So;0;L; 5439;;;;N;;;;; +1F226;SQUARED CJK UNIFIED IDEOGRAPH-6F14;So;0;L; 6F14;;;;N;;;;; +1F227;SQUARED CJK UNIFIED IDEOGRAPH-6295;So;0;L; 6295;;;;N;;;;; +1F228;SQUARED CJK UNIFIED IDEOGRAPH-6355;So;0;L; 6355;;;;N;;;;; +1F229;SQUARED CJK UNIFIED IDEOGRAPH-4E00;So;0;L; 4E00;;;;N;;;;; +1F22A;SQUARED CJK UNIFIED IDEOGRAPH-4E09;So;0;L; 4E09;;;;N;;;;; +1F22B;SQUARED CJK UNIFIED IDEOGRAPH-904A;So;0;L; 904A;;;;N;;;;; +1F22C;SQUARED CJK UNIFIED IDEOGRAPH-5DE6;So;0;L; 5DE6;;;;N;;;;; +1F22D;SQUARED CJK UNIFIED IDEOGRAPH-4E2D;So;0;L; 4E2D;;;;N;;;;; +1F22E;SQUARED CJK UNIFIED IDEOGRAPH-53F3;So;0;L; 53F3;;;;N;;;;; +1F22F;SQUARED CJK UNIFIED IDEOGRAPH-6307;So;0;L; 6307;;;;N;;;;; +1F230;SQUARED CJK UNIFIED IDEOGRAPH-8D70;So;0;L; 8D70;;;;N;;;;; +1F231;SQUARED CJK UNIFIED IDEOGRAPH-6253;So;0;L; 6253;;;;N;;;;; +1F232;SQUARED CJK UNIFIED IDEOGRAPH-7981;So;0;L; 7981;;;;N;;;;; +1F233;SQUARED CJK UNIFIED IDEOGRAPH-7A7A;So;0;L; 7A7A;;;;N;;;;; +1F234;SQUARED CJK UNIFIED IDEOGRAPH-5408;So;0;L; 5408;;;;N;;;;; +1F235;SQUARED CJK UNIFIED IDEOGRAPH-6E80;So;0;L; 6E80;;;;N;;;;; +1F236;SQUARED CJK UNIFIED IDEOGRAPH-6709;So;0;L; 6709;;;;N;;;;; +1F237;SQUARED CJK UNIFIED IDEOGRAPH-6708;So;0;L; 6708;;;;N;;;;; +1F238;SQUARED CJK UNIFIED IDEOGRAPH-7533;So;0;L; 7533;;;;N;;;;; +1F239;SQUARED CJK UNIFIED IDEOGRAPH-5272;So;0;L; 5272;;;;N;;;;; +1F23A;SQUARED CJK UNIFIED IDEOGRAPH-55B6;So;0;L; 55B6;;;;N;;;;; +1F23B;SQUARED CJK UNIFIED IDEOGRAPH-914D;So;0;L; 914D;;;;N;;;;; +1F240;TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-672C;So;0;L; 3014 672C 3015;;;;N;;;;; +1F241;TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-4E09;So;0;L; 3014 4E09 3015;;;;N;;;;; +1F242;TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-4E8C;So;0;L; 3014 4E8C 3015;;;;N;;;;; +1F243;TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-5B89;So;0;L; 3014 5B89 3015;;;;N;;;;; +1F244;TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-70B9;So;0;L; 3014 70B9 3015;;;;N;;;;; +1F245;TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-6253;So;0;L; 3014 6253 3015;;;;N;;;;; +1F246;TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-76D7;So;0;L; 3014 76D7 3015;;;;N;;;;; +1F247;TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-52DD;So;0;L; 3014 52DD 3015;;;;N;;;;; +1F248;TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-6557;So;0;L; 3014 6557 3015;;;;N;;;;; +1F250;CIRCLED IDEOGRAPH ADVANTAGE;So;0;L; 5F97;;;;N;;;;; +1F251;CIRCLED IDEOGRAPH ACCEPT;So;0;L; 53EF;;;;N;;;;; +1F260;ROUNDED SYMBOL FOR FU;So;0;ON;;;;;N;;;;; +1F261;ROUNDED SYMBOL FOR LU;So;0;ON;;;;;N;;;;; +1F262;ROUNDED SYMBOL FOR SHOU;So;0;ON;;;;;N;;;;; +1F263;ROUNDED SYMBOL FOR XI;So;0;ON;;;;;N;;;;; +1F264;ROUNDED SYMBOL FOR SHUANGXI;So;0;ON;;;;;N;;;;; +1F265;ROUNDED SYMBOL FOR CAI;So;0;ON;;;;;N;;;;; +1F300;CYCLONE;So;0;ON;;;;;N;;;;; +1F301;FOGGY;So;0;ON;;;;;N;;;;; +1F302;CLOSED UMBRELLA;So;0;ON;;;;;N;;;;; +1F303;NIGHT WITH STARS;So;0;ON;;;;;N;;;;; +1F304;SUNRISE OVER MOUNTAINS;So;0;ON;;;;;N;;;;; +1F305;SUNRISE;So;0;ON;;;;;N;;;;; +1F306;CITYSCAPE AT DUSK;So;0;ON;;;;;N;;;;; +1F307;SUNSET OVER BUILDINGS;So;0;ON;;;;;N;;;;; +1F308;RAINBOW;So;0;ON;;;;;N;;;;; +1F309;BRIDGE AT NIGHT;So;0;ON;;;;;N;;;;; +1F30A;WATER WAVE;So;0;ON;;;;;N;;;;; +1F30B;VOLCANO;So;0;ON;;;;;N;;;;; +1F30C;MILKY WAY;So;0;ON;;;;;N;;;;; +1F30D;EARTH GLOBE EUROPE-AFRICA;So;0;ON;;;;;N;;;;; +1F30E;EARTH GLOBE AMERICAS;So;0;ON;;;;;N;;;;; +1F30F;EARTH GLOBE ASIA-AUSTRALIA;So;0;ON;;;;;N;;;;; +1F310;GLOBE WITH MERIDIANS;So;0;ON;;;;;N;;;;; +1F311;NEW MOON SYMBOL;So;0;ON;;;;;N;;;;; +1F312;WAXING CRESCENT MOON SYMBOL;So;0;ON;;;;;N;;;;; +1F313;FIRST QUARTER MOON SYMBOL;So;0;ON;;;;;N;;;;; +1F314;WAXING GIBBOUS MOON SYMBOL;So;0;ON;;;;;N;;;;; +1F315;FULL MOON SYMBOL;So;0;ON;;;;;N;;;;; +1F316;WANING GIBBOUS MOON SYMBOL;So;0;ON;;;;;N;;;;; +1F317;LAST QUARTER MOON SYMBOL;So;0;ON;;;;;N;;;;; +1F318;WANING CRESCENT MOON SYMBOL;So;0;ON;;;;;N;;;;; +1F319;CRESCENT MOON;So;0;ON;;;;;N;;;;; +1F31A;NEW MOON WITH FACE;So;0;ON;;;;;N;;;;; +1F31B;FIRST QUARTER MOON WITH FACE;So;0;ON;;;;;N;;;;; +1F31C;LAST QUARTER MOON WITH FACE;So;0;ON;;;;;N;;;;; +1F31D;FULL MOON WITH FACE;So;0;ON;;;;;N;;;;; +1F31E;SUN WITH FACE;So;0;ON;;;;;N;;;;; +1F31F;GLOWING STAR;So;0;ON;;;;;N;;;;; +1F320;SHOOTING STAR;So;0;ON;;;;;N;;;;; +1F321;THERMOMETER;So;0;ON;;;;;N;;;;; +1F322;BLACK DROPLET;So;0;ON;;;;;N;;;;; +1F323;WHITE SUN;So;0;ON;;;;;N;;;;; +1F324;WHITE SUN WITH SMALL CLOUD;So;0;ON;;;;;N;;;;; +1F325;WHITE SUN BEHIND CLOUD;So;0;ON;;;;;N;;;;; +1F326;WHITE SUN BEHIND CLOUD WITH RAIN;So;0;ON;;;;;N;;;;; +1F327;CLOUD WITH RAIN;So;0;ON;;;;;N;;;;; +1F328;CLOUD WITH SNOW;So;0;ON;;;;;N;;;;; +1F329;CLOUD WITH LIGHTNING;So;0;ON;;;;;N;;;;; +1F32A;CLOUD WITH TORNADO;So;0;ON;;;;;N;;;;; +1F32B;FOG;So;0;ON;;;;;N;;;;; +1F32C;WIND BLOWING FACE;So;0;ON;;;;;N;;;;; +1F32D;HOT DOG;So;0;ON;;;;;N;;;;; +1F32E;TACO;So;0;ON;;;;;N;;;;; +1F32F;BURRITO;So;0;ON;;;;;N;;;;; +1F330;CHESTNUT;So;0;ON;;;;;N;;;;; +1F331;SEEDLING;So;0;ON;;;;;N;;;;; +1F332;EVERGREEN TREE;So;0;ON;;;;;N;;;;; +1F333;DECIDUOUS TREE;So;0;ON;;;;;N;;;;; +1F334;PALM TREE;So;0;ON;;;;;N;;;;; +1F335;CACTUS;So;0;ON;;;;;N;;;;; +1F336;HOT PEPPER;So;0;ON;;;;;N;;;;; +1F337;TULIP;So;0;ON;;;;;N;;;;; +1F338;CHERRY BLOSSOM;So;0;ON;;;;;N;;;;; +1F339;ROSE;So;0;ON;;;;;N;;;;; +1F33A;HIBISCUS;So;0;ON;;;;;N;;;;; +1F33B;SUNFLOWER;So;0;ON;;;;;N;;;;; +1F33C;BLOSSOM;So;0;ON;;;;;N;;;;; +1F33D;EAR OF MAIZE;So;0;ON;;;;;N;;;;; +1F33E;EAR OF RICE;So;0;ON;;;;;N;;;;; +1F33F;HERB;So;0;ON;;;;;N;;;;; +1F340;FOUR LEAF CLOVER;So;0;ON;;;;;N;;;;; +1F341;MAPLE LEAF;So;0;ON;;;;;N;;;;; +1F342;FALLEN LEAF;So;0;ON;;;;;N;;;;; +1F343;LEAF FLUTTERING IN WIND;So;0;ON;;;;;N;;;;; +1F344;MUSHROOM;So;0;ON;;;;;N;;;;; +1F345;TOMATO;So;0;ON;;;;;N;;;;; +1F346;AUBERGINE;So;0;ON;;;;;N;;;;; +1F347;GRAPES;So;0;ON;;;;;N;;;;; +1F348;MELON;So;0;ON;;;;;N;;;;; +1F349;WATERMELON;So;0;ON;;;;;N;;;;; +1F34A;TANGERINE;So;0;ON;;;;;N;;;;; +1F34B;LEMON;So;0;ON;;;;;N;;;;; +1F34C;BANANA;So;0;ON;;;;;N;;;;; +1F34D;PINEAPPLE;So;0;ON;;;;;N;;;;; +1F34E;RED APPLE;So;0;ON;;;;;N;;;;; +1F34F;GREEN APPLE;So;0;ON;;;;;N;;;;; +1F350;PEAR;So;0;ON;;;;;N;;;;; +1F351;PEACH;So;0;ON;;;;;N;;;;; +1F352;CHERRIES;So;0;ON;;;;;N;;;;; +1F353;STRAWBERRY;So;0;ON;;;;;N;;;;; +1F354;HAMBURGER;So;0;ON;;;;;N;;;;; +1F355;SLICE OF PIZZA;So;0;ON;;;;;N;;;;; +1F356;MEAT ON BONE;So;0;ON;;;;;N;;;;; +1F357;POULTRY LEG;So;0;ON;;;;;N;;;;; +1F358;RICE CRACKER;So;0;ON;;;;;N;;;;; +1F359;RICE BALL;So;0;ON;;;;;N;;;;; +1F35A;COOKED RICE;So;0;ON;;;;;N;;;;; +1F35B;CURRY AND RICE;So;0;ON;;;;;N;;;;; +1F35C;STEAMING BOWL;So;0;ON;;;;;N;;;;; +1F35D;SPAGHETTI;So;0;ON;;;;;N;;;;; +1F35E;BREAD;So;0;ON;;;;;N;;;;; +1F35F;FRENCH FRIES;So;0;ON;;;;;N;;;;; +1F360;ROASTED SWEET POTATO;So;0;ON;;;;;N;;;;; +1F361;DANGO;So;0;ON;;;;;N;;;;; +1F362;ODEN;So;0;ON;;;;;N;;;;; +1F363;SUSHI;So;0;ON;;;;;N;;;;; +1F364;FRIED SHRIMP;So;0;ON;;;;;N;;;;; +1F365;FISH CAKE WITH SWIRL DESIGN;So;0;ON;;;;;N;;;;; +1F366;SOFT ICE CREAM;So;0;ON;;;;;N;;;;; +1F367;SHAVED ICE;So;0;ON;;;;;N;;;;; +1F368;ICE CREAM;So;0;ON;;;;;N;;;;; +1F369;DOUGHNUT;So;0;ON;;;;;N;;;;; +1F36A;COOKIE;So;0;ON;;;;;N;;;;; +1F36B;CHOCOLATE BAR;So;0;ON;;;;;N;;;;; +1F36C;CANDY;So;0;ON;;;;;N;;;;; +1F36D;LOLLIPOP;So;0;ON;;;;;N;;;;; +1F36E;CUSTARD;So;0;ON;;;;;N;;;;; +1F36F;HONEY POT;So;0;ON;;;;;N;;;;; +1F370;SHORTCAKE;So;0;ON;;;;;N;;;;; +1F371;BENTO BOX;So;0;ON;;;;;N;;;;; +1F372;POT OF FOOD;So;0;ON;;;;;N;;;;; +1F373;COOKING;So;0;ON;;;;;N;;;;; +1F374;FORK AND KNIFE;So;0;ON;;;;;N;;;;; +1F375;TEACUP WITHOUT HANDLE;So;0;ON;;;;;N;;;;; +1F376;SAKE BOTTLE AND CUP;So;0;ON;;;;;N;;;;; +1F377;WINE GLASS;So;0;ON;;;;;N;;;;; +1F378;COCKTAIL GLASS;So;0;ON;;;;;N;;;;; +1F379;TROPICAL DRINK;So;0;ON;;;;;N;;;;; +1F37A;BEER MUG;So;0;ON;;;;;N;;;;; +1F37B;CLINKING BEER MUGS;So;0;ON;;;;;N;;;;; +1F37C;BABY BOTTLE;So;0;ON;;;;;N;;;;; +1F37D;FORK AND KNIFE WITH PLATE;So;0;ON;;;;;N;;;;; +1F37E;BOTTLE WITH POPPING CORK;So;0;ON;;;;;N;;;;; +1F37F;POPCORN;So;0;ON;;;;;N;;;;; +1F380;RIBBON;So;0;ON;;;;;N;;;;; +1F381;WRAPPED PRESENT;So;0;ON;;;;;N;;;;; +1F382;BIRTHDAY CAKE;So;0;ON;;;;;N;;;;; +1F383;JACK-O-LANTERN;So;0;ON;;;;;N;;;;; +1F384;CHRISTMAS TREE;So;0;ON;;;;;N;;;;; +1F385;FATHER CHRISTMAS;So;0;ON;;;;;N;;;;; +1F386;FIREWORKS;So;0;ON;;;;;N;;;;; +1F387;FIREWORK SPARKLER;So;0;ON;;;;;N;;;;; +1F388;BALLOON;So;0;ON;;;;;N;;;;; +1F389;PARTY POPPER;So;0;ON;;;;;N;;;;; +1F38A;CONFETTI BALL;So;0;ON;;;;;N;;;;; +1F38B;TANABATA TREE;So;0;ON;;;;;N;;;;; +1F38C;CROSSED FLAGS;So;0;ON;;;;;N;;;;; +1F38D;PINE DECORATION;So;0;ON;;;;;N;;;;; +1F38E;JAPANESE DOLLS;So;0;ON;;;;;N;;;;; +1F38F;CARP STREAMER;So;0;ON;;;;;N;;;;; +1F390;WIND CHIME;So;0;ON;;;;;N;;;;; +1F391;MOON VIEWING CEREMONY;So;0;ON;;;;;N;;;;; +1F392;SCHOOL SATCHEL;So;0;ON;;;;;N;;;;; +1F393;GRADUATION CAP;So;0;ON;;;;;N;;;;; +1F394;HEART WITH TIP ON THE LEFT;So;0;ON;;;;;N;;;;; +1F395;BOUQUET OF FLOWERS;So;0;ON;;;;;N;;;;; +1F396;MILITARY MEDAL;So;0;ON;;;;;N;;;;; +1F397;REMINDER RIBBON;So;0;ON;;;;;N;;;;; +1F398;MUSICAL KEYBOARD WITH JACKS;So;0;ON;;;;;N;;;;; +1F399;STUDIO MICROPHONE;So;0;ON;;;;;N;;;;; +1F39A;LEVEL SLIDER;So;0;ON;;;;;N;;;;; +1F39B;CONTROL KNOBS;So;0;ON;;;;;N;;;;; +1F39C;BEAMED ASCENDING MUSICAL NOTES;So;0;ON;;;;;N;;;;; +1F39D;BEAMED DESCENDING MUSICAL NOTES;So;0;ON;;;;;N;;;;; +1F39E;FILM FRAMES;So;0;ON;;;;;N;;;;; +1F39F;ADMISSION TICKETS;So;0;ON;;;;;N;;;;; +1F3A0;CAROUSEL HORSE;So;0;ON;;;;;N;;;;; +1F3A1;FERRIS WHEEL;So;0;ON;;;;;N;;;;; +1F3A2;ROLLER COASTER;So;0;ON;;;;;N;;;;; +1F3A3;FISHING POLE AND FISH;So;0;ON;;;;;N;;;;; +1F3A4;MICROPHONE;So;0;ON;;;;;N;;;;; +1F3A5;MOVIE CAMERA;So;0;ON;;;;;N;;;;; +1F3A6;CINEMA;So;0;ON;;;;;N;;;;; +1F3A7;HEADPHONE;So;0;ON;;;;;N;;;;; +1F3A8;ARTIST PALETTE;So;0;ON;;;;;N;;;;; +1F3A9;TOP HAT;So;0;ON;;;;;N;;;;; +1F3AA;CIRCUS TENT;So;0;ON;;;;;N;;;;; +1F3AB;TICKET;So;0;ON;;;;;N;;;;; +1F3AC;CLAPPER BOARD;So;0;ON;;;;;N;;;;; +1F3AD;PERFORMING ARTS;So;0;ON;;;;;N;;;;; +1F3AE;VIDEO GAME;So;0;ON;;;;;N;;;;; +1F3AF;DIRECT HIT;So;0;ON;;;;;N;;;;; +1F3B0;SLOT MACHINE;So;0;ON;;;;;N;;;;; +1F3B1;BILLIARDS;So;0;ON;;;;;N;;;;; +1F3B2;GAME DIE;So;0;ON;;;;;N;;;;; +1F3B3;BOWLING;So;0;ON;;;;;N;;;;; +1F3B4;FLOWER PLAYING CARDS;So;0;ON;;;;;N;;;;; +1F3B5;MUSICAL NOTE;So;0;ON;;;;;N;;;;; +1F3B6;MULTIPLE MUSICAL NOTES;So;0;ON;;;;;N;;;;; +1F3B7;SAXOPHONE;So;0;ON;;;;;N;;;;; +1F3B8;GUITAR;So;0;ON;;;;;N;;;;; +1F3B9;MUSICAL KEYBOARD;So;0;ON;;;;;N;;;;; +1F3BA;TRUMPET;So;0;ON;;;;;N;;;;; +1F3BB;VIOLIN;So;0;ON;;;;;N;;;;; +1F3BC;MUSICAL SCORE;So;0;ON;;;;;N;;;;; +1F3BD;RUNNING SHIRT WITH SASH;So;0;ON;;;;;N;;;;; +1F3BE;TENNIS RACQUET AND BALL;So;0;ON;;;;;N;;;;; +1F3BF;SKI AND SKI BOOT;So;0;ON;;;;;N;;;;; +1F3C0;BASKETBALL AND HOOP;So;0;ON;;;;;N;;;;; +1F3C1;CHEQUERED FLAG;So;0;ON;;;;;N;;;;; +1F3C2;SNOWBOARDER;So;0;ON;;;;;N;;;;; +1F3C3;RUNNER;So;0;ON;;;;;N;;;;; +1F3C4;SURFER;So;0;ON;;;;;N;;;;; +1F3C5;SPORTS MEDAL;So;0;ON;;;;;N;;;;; +1F3C6;TROPHY;So;0;ON;;;;;N;;;;; +1F3C7;HORSE RACING;So;0;ON;;;;;N;;;;; +1F3C8;AMERICAN FOOTBALL;So;0;ON;;;;;N;;;;; +1F3C9;RUGBY FOOTBALL;So;0;ON;;;;;N;;;;; +1F3CA;SWIMMER;So;0;ON;;;;;N;;;;; +1F3CB;WEIGHT LIFTER;So;0;ON;;;;;N;;;;; +1F3CC;GOLFER;So;0;ON;;;;;N;;;;; +1F3CD;RACING MOTORCYCLE;So;0;ON;;;;;N;;;;; +1F3CE;RACING CAR;So;0;ON;;;;;N;;;;; +1F3CF;CRICKET BAT AND BALL;So;0;ON;;;;;N;;;;; +1F3D0;VOLLEYBALL;So;0;ON;;;;;N;;;;; +1F3D1;FIELD HOCKEY STICK AND BALL;So;0;ON;;;;;N;;;;; +1F3D2;ICE HOCKEY STICK AND PUCK;So;0;ON;;;;;N;;;;; +1F3D3;TABLE TENNIS PADDLE AND BALL;So;0;ON;;;;;N;;;;; +1F3D4;SNOW CAPPED MOUNTAIN;So;0;ON;;;;;N;;;;; +1F3D5;CAMPING;So;0;ON;;;;;N;;;;; +1F3D6;BEACH WITH UMBRELLA;So;0;ON;;;;;N;;;;; +1F3D7;BUILDING CONSTRUCTION;So;0;ON;;;;;N;;;;; +1F3D8;HOUSE BUILDINGS;So;0;ON;;;;;N;;;;; +1F3D9;CITYSCAPE;So;0;ON;;;;;N;;;;; +1F3DA;DERELICT HOUSE BUILDING;So;0;ON;;;;;N;;;;; +1F3DB;CLASSICAL BUILDING;So;0;ON;;;;;N;;;;; +1F3DC;DESERT;So;0;ON;;;;;N;;;;; +1F3DD;DESERT ISLAND;So;0;ON;;;;;N;;;;; +1F3DE;NATIONAL PARK;So;0;ON;;;;;N;;;;; +1F3DF;STADIUM;So;0;ON;;;;;N;;;;; +1F3E0;HOUSE BUILDING;So;0;ON;;;;;N;;;;; +1F3E1;HOUSE WITH GARDEN;So;0;ON;;;;;N;;;;; +1F3E2;OFFICE BUILDING;So;0;ON;;;;;N;;;;; +1F3E3;JAPANESE POST OFFICE;So;0;ON;;;;;N;;;;; +1F3E4;EUROPEAN POST OFFICE;So;0;ON;;;;;N;;;;; +1F3E5;HOSPITAL;So;0;ON;;;;;N;;;;; +1F3E6;BANK;So;0;ON;;;;;N;;;;; +1F3E7;AUTOMATED TELLER MACHINE;So;0;ON;;;;;N;;;;; +1F3E8;HOTEL;So;0;ON;;;;;N;;;;; +1F3E9;LOVE HOTEL;So;0;ON;;;;;N;;;;; +1F3EA;CONVENIENCE STORE;So;0;ON;;;;;N;;;;; +1F3EB;SCHOOL;So;0;ON;;;;;N;;;;; +1F3EC;DEPARTMENT STORE;So;0;ON;;;;;N;;;;; +1F3ED;FACTORY;So;0;ON;;;;;N;;;;; +1F3EE;IZAKAYA LANTERN;So;0;ON;;;;;N;;;;; +1F3EF;JAPANESE CASTLE;So;0;ON;;;;;N;;;;; +1F3F0;EUROPEAN CASTLE;So;0;ON;;;;;N;;;;; +1F3F1;WHITE PENNANT;So;0;ON;;;;;N;;;;; +1F3F2;BLACK PENNANT;So;0;ON;;;;;N;;;;; +1F3F3;WAVING WHITE FLAG;So;0;ON;;;;;N;;;;; +1F3F4;WAVING BLACK FLAG;So;0;ON;;;;;N;;;;; +1F3F5;ROSETTE;So;0;ON;;;;;N;;;;; +1F3F6;BLACK ROSETTE;So;0;ON;;;;;N;;;;; +1F3F7;LABEL;So;0;ON;;;;;N;;;;; +1F3F8;BADMINTON RACQUET AND SHUTTLECOCK;So;0;ON;;;;;N;;;;; +1F3F9;BOW AND ARROW;So;0;ON;;;;;N;;;;; +1F3FA;AMPHORA;So;0;ON;;;;;N;;;;; +1F3FB;EMOJI MODIFIER FITZPATRICK TYPE-1-2;Sk;0;ON;;;;;N;;;;; +1F3FC;EMOJI MODIFIER FITZPATRICK TYPE-3;Sk;0;ON;;;;;N;;;;; +1F3FD;EMOJI MODIFIER FITZPATRICK TYPE-4;Sk;0;ON;;;;;N;;;;; +1F3FE;EMOJI MODIFIER FITZPATRICK TYPE-5;Sk;0;ON;;;;;N;;;;; +1F3FF;EMOJI MODIFIER FITZPATRICK TYPE-6;Sk;0;ON;;;;;N;;;;; +1F400;RAT;So;0;ON;;;;;N;;;;; +1F401;MOUSE;So;0;ON;;;;;N;;;;; +1F402;OX;So;0;ON;;;;;N;;;;; +1F403;WATER BUFFALO;So;0;ON;;;;;N;;;;; +1F404;COW;So;0;ON;;;;;N;;;;; +1F405;TIGER;So;0;ON;;;;;N;;;;; +1F406;LEOPARD;So;0;ON;;;;;N;;;;; +1F407;RABBIT;So;0;ON;;;;;N;;;;; +1F408;CAT;So;0;ON;;;;;N;;;;; +1F409;DRAGON;So;0;ON;;;;;N;;;;; +1F40A;CROCODILE;So;0;ON;;;;;N;;;;; +1F40B;WHALE;So;0;ON;;;;;N;;;;; +1F40C;SNAIL;So;0;ON;;;;;N;;;;; +1F40D;SNAKE;So;0;ON;;;;;N;;;;; +1F40E;HORSE;So;0;ON;;;;;N;;;;; +1F40F;RAM;So;0;ON;;;;;N;;;;; +1F410;GOAT;So;0;ON;;;;;N;;;;; +1F411;SHEEP;So;0;ON;;;;;N;;;;; +1F412;MONKEY;So;0;ON;;;;;N;;;;; +1F413;ROOSTER;So;0;ON;;;;;N;;;;; +1F414;CHICKEN;So;0;ON;;;;;N;;;;; +1F415;DOG;So;0;ON;;;;;N;;;;; +1F416;PIG;So;0;ON;;;;;N;;;;; +1F417;BOAR;So;0;ON;;;;;N;;;;; +1F418;ELEPHANT;So;0;ON;;;;;N;;;;; +1F419;OCTOPUS;So;0;ON;;;;;N;;;;; +1F41A;SPIRAL SHELL;So;0;ON;;;;;N;;;;; +1F41B;BUG;So;0;ON;;;;;N;;;;; +1F41C;ANT;So;0;ON;;;;;N;;;;; +1F41D;HONEYBEE;So;0;ON;;;;;N;;;;; +1F41E;LADY BEETLE;So;0;ON;;;;;N;;;;; +1F41F;FISH;So;0;ON;;;;;N;;;;; +1F420;TROPICAL FISH;So;0;ON;;;;;N;;;;; +1F421;BLOWFISH;So;0;ON;;;;;N;;;;; +1F422;TURTLE;So;0;ON;;;;;N;;;;; +1F423;HATCHING CHICK;So;0;ON;;;;;N;;;;; +1F424;BABY CHICK;So;0;ON;;;;;N;;;;; +1F425;FRONT-FACING BABY CHICK;So;0;ON;;;;;N;;;;; +1F426;BIRD;So;0;ON;;;;;N;;;;; +1F427;PENGUIN;So;0;ON;;;;;N;;;;; +1F428;KOALA;So;0;ON;;;;;N;;;;; +1F429;POODLE;So;0;ON;;;;;N;;;;; +1F42A;DROMEDARY CAMEL;So;0;ON;;;;;N;;;;; +1F42B;BACTRIAN CAMEL;So;0;ON;;;;;N;;;;; +1F42C;DOLPHIN;So;0;ON;;;;;N;;;;; +1F42D;MOUSE FACE;So;0;ON;;;;;N;;;;; +1F42E;COW FACE;So;0;ON;;;;;N;;;;; +1F42F;TIGER FACE;So;0;ON;;;;;N;;;;; +1F430;RABBIT FACE;So;0;ON;;;;;N;;;;; +1F431;CAT FACE;So;0;ON;;;;;N;;;;; +1F432;DRAGON FACE;So;0;ON;;;;;N;;;;; +1F433;SPOUTING WHALE;So;0;ON;;;;;N;;;;; +1F434;HORSE FACE;So;0;ON;;;;;N;;;;; +1F435;MONKEY FACE;So;0;ON;;;;;N;;;;; +1F436;DOG FACE;So;0;ON;;;;;N;;;;; +1F437;PIG FACE;So;0;ON;;;;;N;;;;; +1F438;FROG FACE;So;0;ON;;;;;N;;;;; +1F439;HAMSTER FACE;So;0;ON;;;;;N;;;;; +1F43A;WOLF FACE;So;0;ON;;;;;N;;;;; +1F43B;BEAR FACE;So;0;ON;;;;;N;;;;; +1F43C;PANDA FACE;So;0;ON;;;;;N;;;;; +1F43D;PIG NOSE;So;0;ON;;;;;N;;;;; +1F43E;PAW PRINTS;So;0;ON;;;;;N;;;;; +1F43F;CHIPMUNK;So;0;ON;;;;;N;;;;; +1F440;EYES;So;0;ON;;;;;N;;;;; +1F441;EYE;So;0;ON;;;;;N;;;;; +1F442;EAR;So;0;ON;;;;;N;;;;; +1F443;NOSE;So;0;ON;;;;;N;;;;; +1F444;MOUTH;So;0;ON;;;;;N;;;;; +1F445;TONGUE;So;0;ON;;;;;N;;;;; +1F446;WHITE UP POINTING BACKHAND INDEX;So;0;ON;;;;;N;;;;; +1F447;WHITE DOWN POINTING BACKHAND INDEX;So;0;ON;;;;;N;;;;; +1F448;WHITE LEFT POINTING BACKHAND INDEX;So;0;ON;;;;;N;;;;; +1F449;WHITE RIGHT POINTING BACKHAND INDEX;So;0;ON;;;;;N;;;;; +1F44A;FISTED HAND SIGN;So;0;ON;;;;;N;;;;; +1F44B;WAVING HAND SIGN;So;0;ON;;;;;N;;;;; +1F44C;OK HAND SIGN;So;0;ON;;;;;N;;;;; +1F44D;THUMBS UP SIGN;So;0;ON;;;;;N;;;;; +1F44E;THUMBS DOWN SIGN;So;0;ON;;;;;N;;;;; +1F44F;CLAPPING HANDS SIGN;So;0;ON;;;;;N;;;;; +1F450;OPEN HANDS SIGN;So;0;ON;;;;;N;;;;; +1F451;CROWN;So;0;ON;;;;;N;;;;; +1F452;WOMANS HAT;So;0;ON;;;;;N;;;;; +1F453;EYEGLASSES;So;0;ON;;;;;N;;;;; +1F454;NECKTIE;So;0;ON;;;;;N;;;;; +1F455;T-SHIRT;So;0;ON;;;;;N;;;;; +1F456;JEANS;So;0;ON;;;;;N;;;;; +1F457;DRESS;So;0;ON;;;;;N;;;;; +1F458;KIMONO;So;0;ON;;;;;N;;;;; +1F459;BIKINI;So;0;ON;;;;;N;;;;; +1F45A;WOMANS CLOTHES;So;0;ON;;;;;N;;;;; +1F45B;PURSE;So;0;ON;;;;;N;;;;; +1F45C;HANDBAG;So;0;ON;;;;;N;;;;; +1F45D;POUCH;So;0;ON;;;;;N;;;;; +1F45E;MANS SHOE;So;0;ON;;;;;N;;;;; +1F45F;ATHLETIC SHOE;So;0;ON;;;;;N;;;;; +1F460;HIGH-HEELED SHOE;So;0;ON;;;;;N;;;;; +1F461;WOMANS SANDAL;So;0;ON;;;;;N;;;;; +1F462;WOMANS BOOTS;So;0;ON;;;;;N;;;;; +1F463;FOOTPRINTS;So;0;ON;;;;;N;;;;; +1F464;BUST IN SILHOUETTE;So;0;ON;;;;;N;;;;; +1F465;BUSTS IN SILHOUETTE;So;0;ON;;;;;N;;;;; +1F466;BOY;So;0;ON;;;;;N;;;;; +1F467;GIRL;So;0;ON;;;;;N;;;;; +1F468;MAN;So;0;ON;;;;;N;;;;; +1F469;WOMAN;So;0;ON;;;;;N;;;;; +1F46A;FAMILY;So;0;ON;;;;;N;;;;; +1F46B;MAN AND WOMAN HOLDING HANDS;So;0;ON;;;;;N;;;;; +1F46C;TWO MEN HOLDING HANDS;So;0;ON;;;;;N;;;;; +1F46D;TWO WOMEN HOLDING HANDS;So;0;ON;;;;;N;;;;; +1F46E;POLICE OFFICER;So;0;ON;;;;;N;;;;; +1F46F;WOMAN WITH BUNNY EARS;So;0;ON;;;;;N;;;;; +1F470;BRIDE WITH VEIL;So;0;ON;;;;;N;;;;; +1F471;PERSON WITH BLOND HAIR;So;0;ON;;;;;N;;;;; +1F472;MAN WITH GUA PI MAO;So;0;ON;;;;;N;;;;; +1F473;MAN WITH TURBAN;So;0;ON;;;;;N;;;;; +1F474;OLDER MAN;So;0;ON;;;;;N;;;;; +1F475;OLDER WOMAN;So;0;ON;;;;;N;;;;; +1F476;BABY;So;0;ON;;;;;N;;;;; +1F477;CONSTRUCTION WORKER;So;0;ON;;;;;N;;;;; +1F478;PRINCESS;So;0;ON;;;;;N;;;;; +1F479;JAPANESE OGRE;So;0;ON;;;;;N;;;;; +1F47A;JAPANESE GOBLIN;So;0;ON;;;;;N;;;;; +1F47B;GHOST;So;0;ON;;;;;N;;;;; +1F47C;BABY ANGEL;So;0;ON;;;;;N;;;;; +1F47D;EXTRATERRESTRIAL ALIEN;So;0;ON;;;;;N;;;;; +1F47E;ALIEN MONSTER;So;0;ON;;;;;N;;;;; +1F47F;IMP;So;0;ON;;;;;N;;;;; +1F480;SKULL;So;0;ON;;;;;N;;;;; +1F481;INFORMATION DESK PERSON;So;0;ON;;;;;N;;;;; +1F482;GUARDSMAN;So;0;ON;;;;;N;;;;; +1F483;DANCER;So;0;ON;;;;;N;;;;; +1F484;LIPSTICK;So;0;ON;;;;;N;;;;; +1F485;NAIL POLISH;So;0;ON;;;;;N;;;;; +1F486;FACE MASSAGE;So;0;ON;;;;;N;;;;; +1F487;HAIRCUT;So;0;ON;;;;;N;;;;; +1F488;BARBER POLE;So;0;ON;;;;;N;;;;; +1F489;SYRINGE;So;0;ON;;;;;N;;;;; +1F48A;PILL;So;0;ON;;;;;N;;;;; +1F48B;KISS MARK;So;0;ON;;;;;N;;;;; +1F48C;LOVE LETTER;So;0;ON;;;;;N;;;;; +1F48D;RING;So;0;ON;;;;;N;;;;; +1F48E;GEM STONE;So;0;ON;;;;;N;;;;; +1F48F;KISS;So;0;ON;;;;;N;;;;; +1F490;BOUQUET;So;0;ON;;;;;N;;;;; +1F491;COUPLE WITH HEART;So;0;ON;;;;;N;;;;; +1F492;WEDDING;So;0;ON;;;;;N;;;;; +1F493;BEATING HEART;So;0;ON;;;;;N;;;;; +1F494;BROKEN HEART;So;0;ON;;;;;N;;;;; +1F495;TWO HEARTS;So;0;ON;;;;;N;;;;; +1F496;SPARKLING HEART;So;0;ON;;;;;N;;;;; +1F497;GROWING HEART;So;0;ON;;;;;N;;;;; +1F498;HEART WITH ARROW;So;0;ON;;;;;N;;;;; +1F499;BLUE HEART;So;0;ON;;;;;N;;;;; +1F49A;GREEN HEART;So;0;ON;;;;;N;;;;; +1F49B;YELLOW HEART;So;0;ON;;;;;N;;;;; +1F49C;PURPLE HEART;So;0;ON;;;;;N;;;;; +1F49D;HEART WITH RIBBON;So;0;ON;;;;;N;;;;; +1F49E;REVOLVING HEARTS;So;0;ON;;;;;N;;;;; +1F49F;HEART DECORATION;So;0;ON;;;;;N;;;;; +1F4A0;DIAMOND SHAPE WITH A DOT INSIDE;So;0;ON;;;;;N;;;;; +1F4A1;ELECTRIC LIGHT BULB;So;0;ON;;;;;N;;;;; +1F4A2;ANGER SYMBOL;So;0;ON;;;;;N;;;;; +1F4A3;BOMB;So;0;ON;;;;;N;;;;; +1F4A4;SLEEPING SYMBOL;So;0;ON;;;;;N;;;;; +1F4A5;COLLISION SYMBOL;So;0;ON;;;;;N;;;;; +1F4A6;SPLASHING SWEAT SYMBOL;So;0;ON;;;;;N;;;;; +1F4A7;DROPLET;So;0;ON;;;;;N;;;;; +1F4A8;DASH SYMBOL;So;0;ON;;;;;N;;;;; +1F4A9;PILE OF POO;So;0;ON;;;;;N;;;;; +1F4AA;FLEXED BICEPS;So;0;ON;;;;;N;;;;; +1F4AB;DIZZY SYMBOL;So;0;ON;;;;;N;;;;; +1F4AC;SPEECH BALLOON;So;0;ON;;;;;N;;;;; +1F4AD;THOUGHT BALLOON;So;0;ON;;;;;N;;;;; +1F4AE;WHITE FLOWER;So;0;ON;;;;;N;;;;; +1F4AF;HUNDRED POINTS SYMBOL;So;0;ON;;;;;N;;;;; +1F4B0;MONEY BAG;So;0;ON;;;;;N;;;;; +1F4B1;CURRENCY EXCHANGE;So;0;ON;;;;;N;;;;; +1F4B2;HEAVY DOLLAR SIGN;So;0;ON;;;;;N;;;;; +1F4B3;CREDIT CARD;So;0;ON;;;;;N;;;;; +1F4B4;BANKNOTE WITH YEN SIGN;So;0;ON;;;;;N;;;;; +1F4B5;BANKNOTE WITH DOLLAR SIGN;So;0;ON;;;;;N;;;;; +1F4B6;BANKNOTE WITH EURO SIGN;So;0;ON;;;;;N;;;;; +1F4B7;BANKNOTE WITH POUND SIGN;So;0;ON;;;;;N;;;;; +1F4B8;MONEY WITH WINGS;So;0;ON;;;;;N;;;;; +1F4B9;CHART WITH UPWARDS TREND AND YEN SIGN;So;0;ON;;;;;N;;;;; +1F4BA;SEAT;So;0;ON;;;;;N;;;;; +1F4BB;PERSONAL COMPUTER;So;0;ON;;;;;N;;;;; +1F4BC;BRIEFCASE;So;0;ON;;;;;N;;;;; +1F4BD;MINIDISC;So;0;ON;;;;;N;;;;; +1F4BE;FLOPPY DISK;So;0;ON;;;;;N;;;;; +1F4BF;OPTICAL DISC;So;0;ON;;;;;N;;;;; +1F4C0;DVD;So;0;ON;;;;;N;;;;; +1F4C1;FILE FOLDER;So;0;ON;;;;;N;;;;; +1F4C2;OPEN FILE FOLDER;So;0;ON;;;;;N;;;;; +1F4C3;PAGE WITH CURL;So;0;ON;;;;;N;;;;; +1F4C4;PAGE FACING UP;So;0;ON;;;;;N;;;;; +1F4C5;CALENDAR;So;0;ON;;;;;N;;;;; +1F4C6;TEAR-OFF CALENDAR;So;0;ON;;;;;N;;;;; +1F4C7;CARD INDEX;So;0;ON;;;;;N;;;;; +1F4C8;CHART WITH UPWARDS TREND;So;0;ON;;;;;N;;;;; +1F4C9;CHART WITH DOWNWARDS TREND;So;0;ON;;;;;N;;;;; +1F4CA;BAR CHART;So;0;ON;;;;;N;;;;; +1F4CB;CLIPBOARD;So;0;ON;;;;;N;;;;; +1F4CC;PUSHPIN;So;0;ON;;;;;N;;;;; +1F4CD;ROUND PUSHPIN;So;0;ON;;;;;N;;;;; +1F4CE;PAPERCLIP;So;0;ON;;;;;N;;;;; +1F4CF;STRAIGHT RULER;So;0;ON;;;;;N;;;;; +1F4D0;TRIANGULAR RULER;So;0;ON;;;;;N;;;;; +1F4D1;BOOKMARK TABS;So;0;ON;;;;;N;;;;; +1F4D2;LEDGER;So;0;ON;;;;;N;;;;; +1F4D3;NOTEBOOK;So;0;ON;;;;;N;;;;; +1F4D4;NOTEBOOK WITH DECORATIVE COVER;So;0;ON;;;;;N;;;;; +1F4D5;CLOSED BOOK;So;0;ON;;;;;N;;;;; +1F4D6;OPEN BOOK;So;0;ON;;;;;N;;;;; +1F4D7;GREEN BOOK;So;0;ON;;;;;N;;;;; +1F4D8;BLUE BOOK;So;0;ON;;;;;N;;;;; +1F4D9;ORANGE BOOK;So;0;ON;;;;;N;;;;; +1F4DA;BOOKS;So;0;ON;;;;;N;;;;; +1F4DB;NAME BADGE;So;0;ON;;;;;N;;;;; +1F4DC;SCROLL;So;0;ON;;;;;N;;;;; +1F4DD;MEMO;So;0;ON;;;;;N;;;;; +1F4DE;TELEPHONE RECEIVER;So;0;ON;;;;;N;;;;; +1F4DF;PAGER;So;0;ON;;;;;N;;;;; +1F4E0;FAX MACHINE;So;0;ON;;;;;N;;;;; +1F4E1;SATELLITE ANTENNA;So;0;ON;;;;;N;;;;; +1F4E2;PUBLIC ADDRESS LOUDSPEAKER;So;0;ON;;;;;N;;;;; +1F4E3;CHEERING MEGAPHONE;So;0;ON;;;;;N;;;;; +1F4E4;OUTBOX TRAY;So;0;ON;;;;;N;;;;; +1F4E5;INBOX TRAY;So;0;ON;;;;;N;;;;; +1F4E6;PACKAGE;So;0;ON;;;;;N;;;;; +1F4E7;E-MAIL SYMBOL;So;0;ON;;;;;N;;;;; +1F4E8;INCOMING ENVELOPE;So;0;ON;;;;;N;;;;; +1F4E9;ENVELOPE WITH DOWNWARDS ARROW ABOVE;So;0;ON;;;;;N;;;;; +1F4EA;CLOSED MAILBOX WITH LOWERED FLAG;So;0;ON;;;;;N;;;;; +1F4EB;CLOSED MAILBOX WITH RAISED FLAG;So;0;ON;;;;;N;;;;; +1F4EC;OPEN MAILBOX WITH RAISED FLAG;So;0;ON;;;;;N;;;;; +1F4ED;OPEN MAILBOX WITH LOWERED FLAG;So;0;ON;;;;;N;;;;; +1F4EE;POSTBOX;So;0;ON;;;;;N;;;;; +1F4EF;POSTAL HORN;So;0;ON;;;;;N;;;;; +1F4F0;NEWSPAPER;So;0;ON;;;;;N;;;;; +1F4F1;MOBILE PHONE;So;0;ON;;;;;N;;;;; +1F4F2;MOBILE PHONE WITH RIGHTWARDS ARROW AT LEFT;So;0;ON;;;;;N;;;;; +1F4F3;VIBRATION MODE;So;0;ON;;;;;N;;;;; +1F4F4;MOBILE PHONE OFF;So;0;ON;;;;;N;;;;; +1F4F5;NO MOBILE PHONES;So;0;ON;;;;;N;;;;; +1F4F6;ANTENNA WITH BARS;So;0;ON;;;;;N;;;;; +1F4F7;CAMERA;So;0;ON;;;;;N;;;;; +1F4F8;CAMERA WITH FLASH;So;0;ON;;;;;N;;;;; +1F4F9;VIDEO CAMERA;So;0;ON;;;;;N;;;;; +1F4FA;TELEVISION;So;0;ON;;;;;N;;;;; +1F4FB;RADIO;So;0;ON;;;;;N;;;;; +1F4FC;VIDEOCASSETTE;So;0;ON;;;;;N;;;;; +1F4FD;FILM PROJECTOR;So;0;ON;;;;;N;;;;; +1F4FE;PORTABLE STEREO;So;0;ON;;;;;N;;;;; +1F4FF;PRAYER BEADS;So;0;ON;;;;;N;;;;; +1F500;TWISTED RIGHTWARDS ARROWS;So;0;ON;;;;;N;;;;; +1F501;CLOCKWISE RIGHTWARDS AND LEFTWARDS OPEN CIRCLE ARROWS;So;0;ON;;;;;N;;;;; +1F502;CLOCKWISE RIGHTWARDS AND LEFTWARDS OPEN CIRCLE ARROWS WITH CIRCLED ONE OVERLAY;So;0;ON;;;;;N;;;;; +1F503;CLOCKWISE DOWNWARDS AND UPWARDS OPEN CIRCLE ARROWS;So;0;ON;;;;;N;;;;; +1F504;ANTICLOCKWISE DOWNWARDS AND UPWARDS OPEN CIRCLE ARROWS;So;0;ON;;;;;N;;;;; +1F505;LOW BRIGHTNESS SYMBOL;So;0;ON;;;;;N;;;;; +1F506;HIGH BRIGHTNESS SYMBOL;So;0;ON;;;;;N;;;;; +1F507;SPEAKER WITH CANCELLATION STROKE;So;0;ON;;;;;N;;;;; +1F508;SPEAKER;So;0;ON;;;;;N;;;;; +1F509;SPEAKER WITH ONE SOUND WAVE;So;0;ON;;;;;N;;;;; +1F50A;SPEAKER WITH THREE SOUND WAVES;So;0;ON;;;;;N;;;;; +1F50B;BATTERY;So;0;ON;;;;;N;;;;; +1F50C;ELECTRIC PLUG;So;0;ON;;;;;N;;;;; +1F50D;LEFT-POINTING MAGNIFYING GLASS;So;0;ON;;;;;N;;;;; +1F50E;RIGHT-POINTING MAGNIFYING GLASS;So;0;ON;;;;;N;;;;; +1F50F;LOCK WITH INK PEN;So;0;ON;;;;;N;;;;; +1F510;CLOSED LOCK WITH KEY;So;0;ON;;;;;N;;;;; +1F511;KEY;So;0;ON;;;;;N;;;;; +1F512;LOCK;So;0;ON;;;;;N;;;;; +1F513;OPEN LOCK;So;0;ON;;;;;N;;;;; +1F514;BELL;So;0;ON;;;;;N;;;;; +1F515;BELL WITH CANCELLATION STROKE;So;0;ON;;;;;N;;;;; +1F516;BOOKMARK;So;0;ON;;;;;N;;;;; +1F517;LINK SYMBOL;So;0;ON;;;;;N;;;;; +1F518;RADIO BUTTON;So;0;ON;;;;;N;;;;; +1F519;BACK WITH LEFTWARDS ARROW ABOVE;So;0;ON;;;;;N;;;;; +1F51A;END WITH LEFTWARDS ARROW ABOVE;So;0;ON;;;;;N;;;;; +1F51B;ON WITH EXCLAMATION MARK WITH LEFT RIGHT ARROW ABOVE;So;0;ON;;;;;N;;;;; +1F51C;SOON WITH RIGHTWARDS ARROW ABOVE;So;0;ON;;;;;N;;;;; +1F51D;TOP WITH UPWARDS ARROW ABOVE;So;0;ON;;;;;N;;;;; +1F51E;NO ONE UNDER EIGHTEEN SYMBOL;So;0;ON;;;;;N;;;;; +1F51F;KEYCAP TEN;So;0;ON;;;;;N;;;;; +1F520;INPUT SYMBOL FOR LATIN CAPITAL LETTERS;So;0;ON;;;;;N;;;;; +1F521;INPUT SYMBOL FOR LATIN SMALL LETTERS;So;0;ON;;;;;N;;;;; +1F522;INPUT SYMBOL FOR NUMBERS;So;0;ON;;;;;N;;;;; +1F523;INPUT SYMBOL FOR SYMBOLS;So;0;ON;;;;;N;;;;; +1F524;INPUT SYMBOL FOR LATIN LETTERS;So;0;ON;;;;;N;;;;; +1F525;FIRE;So;0;ON;;;;;N;;;;; +1F526;ELECTRIC TORCH;So;0;ON;;;;;N;;;;; +1F527;WRENCH;So;0;ON;;;;;N;;;;; +1F528;HAMMER;So;0;ON;;;;;N;;;;; +1F529;NUT AND BOLT;So;0;ON;;;;;N;;;;; +1F52A;HOCHO;So;0;ON;;;;;N;;;;; +1F52B;PISTOL;So;0;ON;;;;;N;;;;; +1F52C;MICROSCOPE;So;0;ON;;;;;N;;;;; +1F52D;TELESCOPE;So;0;ON;;;;;N;;;;; +1F52E;CRYSTAL BALL;So;0;ON;;;;;N;;;;; +1F52F;SIX POINTED STAR WITH MIDDLE DOT;So;0;ON;;;;;N;;;;; +1F530;JAPANESE SYMBOL FOR BEGINNER;So;0;ON;;;;;N;;;;; +1F531;TRIDENT EMBLEM;So;0;ON;;;;;N;;;;; +1F532;BLACK SQUARE BUTTON;So;0;ON;;;;;N;;;;; +1F533;WHITE SQUARE BUTTON;So;0;ON;;;;;N;;;;; +1F534;LARGE RED CIRCLE;So;0;ON;;;;;N;;;;; +1F535;LARGE BLUE CIRCLE;So;0;ON;;;;;N;;;;; +1F536;LARGE ORANGE DIAMOND;So;0;ON;;;;;N;;;;; +1F537;LARGE BLUE DIAMOND;So;0;ON;;;;;N;;;;; +1F538;SMALL ORANGE DIAMOND;So;0;ON;;;;;N;;;;; +1F539;SMALL BLUE DIAMOND;So;0;ON;;;;;N;;;;; +1F53A;UP-POINTING RED TRIANGLE;So;0;ON;;;;;N;;;;; +1F53B;DOWN-POINTING RED TRIANGLE;So;0;ON;;;;;N;;;;; +1F53C;UP-POINTING SMALL RED TRIANGLE;So;0;ON;;;;;N;;;;; +1F53D;DOWN-POINTING SMALL RED TRIANGLE;So;0;ON;;;;;N;;;;; +1F53E;LOWER RIGHT SHADOWED WHITE CIRCLE;So;0;ON;;;;;N;;;;; +1F53F;UPPER RIGHT SHADOWED WHITE CIRCLE;So;0;ON;;;;;N;;;;; +1F540;CIRCLED CROSS POMMEE;So;0;ON;;;;;N;;;;; +1F541;CROSS POMMEE WITH HALF-CIRCLE BELOW;So;0;ON;;;;;N;;;;; +1F542;CROSS POMMEE;So;0;ON;;;;;N;;;;; +1F543;NOTCHED LEFT SEMICIRCLE WITH THREE DOTS;So;0;ON;;;;;N;;;;; +1F544;NOTCHED RIGHT SEMICIRCLE WITH THREE DOTS;So;0;ON;;;;;N;;;;; +1F545;SYMBOL FOR MARKS CHAPTER;So;0;ON;;;;;N;;;;; +1F546;WHITE LATIN CROSS;So;0;ON;;;;;N;;;;; +1F547;HEAVY LATIN CROSS;So;0;ON;;;;;N;;;;; +1F548;CELTIC CROSS;So;0;ON;;;;;N;;;;; +1F549;OM SYMBOL;So;0;ON;;;;;N;;;;; +1F54A;DOVE OF PEACE;So;0;ON;;;;;N;;;;; +1F54B;KAABA;So;0;ON;;;;;N;;;;; +1F54C;MOSQUE;So;0;ON;;;;;N;;;;; +1F54D;SYNAGOGUE;So;0;ON;;;;;N;;;;; +1F54E;MENORAH WITH NINE BRANCHES;So;0;ON;;;;;N;;;;; +1F54F;BOWL OF HYGIEIA;So;0;ON;;;;;N;;;;; +1F550;CLOCK FACE ONE OCLOCK;So;0;ON;;;;;N;;;;; +1F551;CLOCK FACE TWO OCLOCK;So;0;ON;;;;;N;;;;; +1F552;CLOCK FACE THREE OCLOCK;So;0;ON;;;;;N;;;;; +1F553;CLOCK FACE FOUR OCLOCK;So;0;ON;;;;;N;;;;; +1F554;CLOCK FACE FIVE OCLOCK;So;0;ON;;;;;N;;;;; +1F555;CLOCK FACE SIX OCLOCK;So;0;ON;;;;;N;;;;; +1F556;CLOCK FACE SEVEN OCLOCK;So;0;ON;;;;;N;;;;; +1F557;CLOCK FACE EIGHT OCLOCK;So;0;ON;;;;;N;;;;; +1F558;CLOCK FACE NINE OCLOCK;So;0;ON;;;;;N;;;;; +1F559;CLOCK FACE TEN OCLOCK;So;0;ON;;;;;N;;;;; +1F55A;CLOCK FACE ELEVEN OCLOCK;So;0;ON;;;;;N;;;;; +1F55B;CLOCK FACE TWELVE OCLOCK;So;0;ON;;;;;N;;;;; +1F55C;CLOCK FACE ONE-THIRTY;So;0;ON;;;;;N;;;;; +1F55D;CLOCK FACE TWO-THIRTY;So;0;ON;;;;;N;;;;; +1F55E;CLOCK FACE THREE-THIRTY;So;0;ON;;;;;N;;;;; +1F55F;CLOCK FACE FOUR-THIRTY;So;0;ON;;;;;N;;;;; +1F560;CLOCK FACE FIVE-THIRTY;So;0;ON;;;;;N;;;;; +1F561;CLOCK FACE SIX-THIRTY;So;0;ON;;;;;N;;;;; +1F562;CLOCK FACE SEVEN-THIRTY;So;0;ON;;;;;N;;;;; +1F563;CLOCK FACE EIGHT-THIRTY;So;0;ON;;;;;N;;;;; +1F564;CLOCK FACE NINE-THIRTY;So;0;ON;;;;;N;;;;; +1F565;CLOCK FACE TEN-THIRTY;So;0;ON;;;;;N;;;;; +1F566;CLOCK FACE ELEVEN-THIRTY;So;0;ON;;;;;N;;;;; +1F567;CLOCK FACE TWELVE-THIRTY;So;0;ON;;;;;N;;;;; +1F568;RIGHT SPEAKER;So;0;ON;;;;;N;;;;; +1F569;RIGHT SPEAKER WITH ONE SOUND WAVE;So;0;ON;;;;;N;;;;; +1F56A;RIGHT SPEAKER WITH THREE SOUND WAVES;So;0;ON;;;;;N;;;;; +1F56B;BULLHORN;So;0;ON;;;;;N;;;;; +1F56C;BULLHORN WITH SOUND WAVES;So;0;ON;;;;;N;;;;; +1F56D;RINGING BELL;So;0;ON;;;;;N;;;;; +1F56E;BOOK;So;0;ON;;;;;N;;;;; +1F56F;CANDLE;So;0;ON;;;;;N;;;;; +1F570;MANTELPIECE CLOCK;So;0;ON;;;;;N;;;;; +1F571;BLACK SKULL AND CROSSBONES;So;0;ON;;;;;N;;;;; +1F572;NO PIRACY;So;0;ON;;;;;N;;;;; +1F573;HOLE;So;0;ON;;;;;N;;;;; +1F574;MAN IN BUSINESS SUIT LEVITATING;So;0;ON;;;;;N;;;;; +1F575;SLEUTH OR SPY;So;0;ON;;;;;N;;;;; +1F576;DARK SUNGLASSES;So;0;ON;;;;;N;;;;; +1F577;SPIDER;So;0;ON;;;;;N;;;;; +1F578;SPIDER WEB;So;0;ON;;;;;N;;;;; +1F579;JOYSTICK;So;0;ON;;;;;N;;;;; +1F57A;MAN DANCING;So;0;ON;;;;;N;;;;; +1F57B;LEFT HAND TELEPHONE RECEIVER;So;0;ON;;;;;N;;;;; +1F57C;TELEPHONE RECEIVER WITH PAGE;So;0;ON;;;;;N;;;;; +1F57D;RIGHT HAND TELEPHONE RECEIVER;So;0;ON;;;;;N;;;;; +1F57E;WHITE TOUCHTONE TELEPHONE;So;0;ON;;;;;N;;;;; +1F57F;BLACK TOUCHTONE TELEPHONE;So;0;ON;;;;;N;;;;; +1F580;TELEPHONE ON TOP OF MODEM;So;0;ON;;;;;N;;;;; +1F581;CLAMSHELL MOBILE PHONE;So;0;ON;;;;;N;;;;; +1F582;BACK OF ENVELOPE;So;0;ON;;;;;N;;;;; +1F583;STAMPED ENVELOPE;So;0;ON;;;;;N;;;;; +1F584;ENVELOPE WITH LIGHTNING;So;0;ON;;;;;N;;;;; +1F585;FLYING ENVELOPE;So;0;ON;;;;;N;;;;; +1F586;PEN OVER STAMPED ENVELOPE;So;0;ON;;;;;N;;;;; +1F587;LINKED PAPERCLIPS;So;0;ON;;;;;N;;;;; +1F588;BLACK PUSHPIN;So;0;ON;;;;;N;;;;; +1F589;LOWER LEFT PENCIL;So;0;ON;;;;;N;;;;; +1F58A;LOWER LEFT BALLPOINT PEN;So;0;ON;;;;;N;;;;; +1F58B;LOWER LEFT FOUNTAIN PEN;So;0;ON;;;;;N;;;;; +1F58C;LOWER LEFT PAINTBRUSH;So;0;ON;;;;;N;;;;; +1F58D;LOWER LEFT CRAYON;So;0;ON;;;;;N;;;;; +1F58E;LEFT WRITING HAND;So;0;ON;;;;;N;;;;; +1F58F;TURNED OK HAND SIGN;So;0;ON;;;;;N;;;;; +1F590;RAISED HAND WITH FINGERS SPLAYED;So;0;ON;;;;;N;;;;; +1F591;REVERSED RAISED HAND WITH FINGERS SPLAYED;So;0;ON;;;;;N;;;;; +1F592;REVERSED THUMBS UP SIGN;So;0;ON;;;;;N;;;;; +1F593;REVERSED THUMBS DOWN SIGN;So;0;ON;;;;;N;;;;; +1F594;REVERSED VICTORY HAND;So;0;ON;;;;;N;;;;; +1F595;REVERSED HAND WITH MIDDLE FINGER EXTENDED;So;0;ON;;;;;N;;;;; +1F596;RAISED HAND WITH PART BETWEEN MIDDLE AND RING FINGERS;So;0;ON;;;;;N;;;;; +1F597;WHITE DOWN POINTING LEFT HAND INDEX;So;0;ON;;;;;N;;;;; +1F598;SIDEWAYS WHITE LEFT POINTING INDEX;So;0;ON;;;;;N;;;;; +1F599;SIDEWAYS WHITE RIGHT POINTING INDEX;So;0;ON;;;;;N;;;;; +1F59A;SIDEWAYS BLACK LEFT POINTING INDEX;So;0;ON;;;;;N;;;;; +1F59B;SIDEWAYS BLACK RIGHT POINTING INDEX;So;0;ON;;;;;N;;;;; +1F59C;BLACK LEFT POINTING BACKHAND INDEX;So;0;ON;;;;;N;;;;; +1F59D;BLACK RIGHT POINTING BACKHAND INDEX;So;0;ON;;;;;N;;;;; +1F59E;SIDEWAYS WHITE UP POINTING INDEX;So;0;ON;;;;;N;;;;; +1F59F;SIDEWAYS WHITE DOWN POINTING INDEX;So;0;ON;;;;;N;;;;; +1F5A0;SIDEWAYS BLACK UP POINTING INDEX;So;0;ON;;;;;N;;;;; +1F5A1;SIDEWAYS BLACK DOWN POINTING INDEX;So;0;ON;;;;;N;;;;; +1F5A2;BLACK UP POINTING BACKHAND INDEX;So;0;ON;;;;;N;;;;; +1F5A3;BLACK DOWN POINTING BACKHAND INDEX;So;0;ON;;;;;N;;;;; +1F5A4;BLACK HEART;So;0;ON;;;;;N;;;;; +1F5A5;DESKTOP COMPUTER;So;0;ON;;;;;N;;;;; +1F5A6;KEYBOARD AND MOUSE;So;0;ON;;;;;N;;;;; +1F5A7;THREE NETWORKED COMPUTERS;So;0;ON;;;;;N;;;;; +1F5A8;PRINTER;So;0;ON;;;;;N;;;;; +1F5A9;POCKET CALCULATOR;So;0;ON;;;;;N;;;;; +1F5AA;BLACK HARD SHELL FLOPPY DISK;So;0;ON;;;;;N;;;;; +1F5AB;WHITE HARD SHELL FLOPPY DISK;So;0;ON;;;;;N;;;;; +1F5AC;SOFT SHELL FLOPPY DISK;So;0;ON;;;;;N;;;;; +1F5AD;TAPE CARTRIDGE;So;0;ON;;;;;N;;;;; +1F5AE;WIRED KEYBOARD;So;0;ON;;;;;N;;;;; +1F5AF;ONE BUTTON MOUSE;So;0;ON;;;;;N;;;;; +1F5B0;TWO BUTTON MOUSE;So;0;ON;;;;;N;;;;; +1F5B1;THREE BUTTON MOUSE;So;0;ON;;;;;N;;;;; +1F5B2;TRACKBALL;So;0;ON;;;;;N;;;;; +1F5B3;OLD PERSONAL COMPUTER;So;0;ON;;;;;N;;;;; +1F5B4;HARD DISK;So;0;ON;;;;;N;;;;; +1F5B5;SCREEN;So;0;ON;;;;;N;;;;; +1F5B6;PRINTER ICON;So;0;ON;;;;;N;;;;; +1F5B7;FAX ICON;So;0;ON;;;;;N;;;;; +1F5B8;OPTICAL DISC ICON;So;0;ON;;;;;N;;;;; +1F5B9;DOCUMENT WITH TEXT;So;0;ON;;;;;N;;;;; +1F5BA;DOCUMENT WITH TEXT AND PICTURE;So;0;ON;;;;;N;;;;; +1F5BB;DOCUMENT WITH PICTURE;So;0;ON;;;;;N;;;;; +1F5BC;FRAME WITH PICTURE;So;0;ON;;;;;N;;;;; +1F5BD;FRAME WITH TILES;So;0;ON;;;;;N;;;;; +1F5BE;FRAME WITH AN X;So;0;ON;;;;;N;;;;; +1F5BF;BLACK FOLDER;So;0;ON;;;;;N;;;;; +1F5C0;FOLDER;So;0;ON;;;;;N;;;;; +1F5C1;OPEN FOLDER;So;0;ON;;;;;N;;;;; +1F5C2;CARD INDEX DIVIDERS;So;0;ON;;;;;N;;;;; +1F5C3;CARD FILE BOX;So;0;ON;;;;;N;;;;; +1F5C4;FILE CABINET;So;0;ON;;;;;N;;;;; +1F5C5;EMPTY NOTE;So;0;ON;;;;;N;;;;; +1F5C6;EMPTY NOTE PAGE;So;0;ON;;;;;N;;;;; +1F5C7;EMPTY NOTE PAD;So;0;ON;;;;;N;;;;; +1F5C8;NOTE;So;0;ON;;;;;N;;;;; +1F5C9;NOTE PAGE;So;0;ON;;;;;N;;;;; +1F5CA;NOTE PAD;So;0;ON;;;;;N;;;;; +1F5CB;EMPTY DOCUMENT;So;0;ON;;;;;N;;;;; +1F5CC;EMPTY PAGE;So;0;ON;;;;;N;;;;; +1F5CD;EMPTY PAGES;So;0;ON;;;;;N;;;;; +1F5CE;DOCUMENT;So;0;ON;;;;;N;;;;; +1F5CF;PAGE;So;0;ON;;;;;N;;;;; +1F5D0;PAGES;So;0;ON;;;;;N;;;;; +1F5D1;WASTEBASKET;So;0;ON;;;;;N;;;;; +1F5D2;SPIRAL NOTE PAD;So;0;ON;;;;;N;;;;; +1F5D3;SPIRAL CALENDAR PAD;So;0;ON;;;;;N;;;;; +1F5D4;DESKTOP WINDOW;So;0;ON;;;;;N;;;;; +1F5D5;MINIMIZE;So;0;ON;;;;;N;;;;; +1F5D6;MAXIMIZE;So;0;ON;;;;;N;;;;; +1F5D7;OVERLAP;So;0;ON;;;;;N;;;;; +1F5D8;CLOCKWISE RIGHT AND LEFT SEMICIRCLE ARROWS;So;0;ON;;;;;N;;;;; +1F5D9;CANCELLATION X;So;0;ON;;;;;N;;;;; +1F5DA;INCREASE FONT SIZE SYMBOL;So;0;ON;;;;;N;;;;; +1F5DB;DECREASE FONT SIZE SYMBOL;So;0;ON;;;;;N;;;;; +1F5DC;COMPRESSION;So;0;ON;;;;;N;;;;; +1F5DD;OLD KEY;So;0;ON;;;;;N;;;;; +1F5DE;ROLLED-UP NEWSPAPER;So;0;ON;;;;;N;;;;; +1F5DF;PAGE WITH CIRCLED TEXT;So;0;ON;;;;;N;;;;; +1F5E0;STOCK CHART;So;0;ON;;;;;N;;;;; +1F5E1;DAGGER KNIFE;So;0;ON;;;;;N;;;;; +1F5E2;LIPS;So;0;ON;;;;;N;;;;; +1F5E3;SPEAKING HEAD IN SILHOUETTE;So;0;ON;;;;;N;;;;; +1F5E4;THREE RAYS ABOVE;So;0;ON;;;;;N;;;;; +1F5E5;THREE RAYS BELOW;So;0;ON;;;;;N;;;;; +1F5E6;THREE RAYS LEFT;So;0;ON;;;;;N;;;;; +1F5E7;THREE RAYS RIGHT;So;0;ON;;;;;N;;;;; +1F5E8;LEFT SPEECH BUBBLE;So;0;ON;;;;;N;;;;; +1F5E9;RIGHT SPEECH BUBBLE;So;0;ON;;;;;N;;;;; +1F5EA;TWO SPEECH BUBBLES;So;0;ON;;;;;N;;;;; +1F5EB;THREE SPEECH BUBBLES;So;0;ON;;;;;N;;;;; +1F5EC;LEFT THOUGHT BUBBLE;So;0;ON;;;;;N;;;;; +1F5ED;RIGHT THOUGHT BUBBLE;So;0;ON;;;;;N;;;;; +1F5EE;LEFT ANGER BUBBLE;So;0;ON;;;;;N;;;;; +1F5EF;RIGHT ANGER BUBBLE;So;0;ON;;;;;N;;;;; +1F5F0;MOOD BUBBLE;So;0;ON;;;;;N;;;;; +1F5F1;LIGHTNING MOOD BUBBLE;So;0;ON;;;;;N;;;;; +1F5F2;LIGHTNING MOOD;So;0;ON;;;;;N;;;;; +1F5F3;BALLOT BOX WITH BALLOT;So;0;ON;;;;;N;;;;; +1F5F4;BALLOT SCRIPT X;So;0;ON;;;;;N;;;;; +1F5F5;BALLOT BOX WITH SCRIPT X;So;0;ON;;;;;N;;;;; +1F5F6;BALLOT BOLD SCRIPT X;So;0;ON;;;;;N;;;;; +1F5F7;BALLOT BOX WITH BOLD SCRIPT X;So;0;ON;;;;;N;;;;; +1F5F8;LIGHT CHECK MARK;So;0;ON;;;;;N;;;;; +1F5F9;BALLOT BOX WITH BOLD CHECK;So;0;ON;;;;;N;;;;; +1F5FA;WORLD MAP;So;0;ON;;;;;N;;;;; +1F5FB;MOUNT FUJI;So;0;ON;;;;;N;;;;; +1F5FC;TOKYO TOWER;So;0;ON;;;;;N;;;;; +1F5FD;STATUE OF LIBERTY;So;0;ON;;;;;N;;;;; +1F5FE;SILHOUETTE OF JAPAN;So;0;ON;;;;;N;;;;; +1F5FF;MOYAI;So;0;ON;;;;;N;;;;; +1F600;GRINNING FACE;So;0;ON;;;;;N;;;;; +1F601;GRINNING FACE WITH SMILING EYES;So;0;ON;;;;;N;;;;; +1F602;FACE WITH TEARS OF JOY;So;0;ON;;;;;N;;;;; +1F603;SMILING FACE WITH OPEN MOUTH;So;0;ON;;;;;N;;;;; +1F604;SMILING FACE WITH OPEN MOUTH AND SMILING EYES;So;0;ON;;;;;N;;;;; +1F605;SMILING FACE WITH OPEN MOUTH AND COLD SWEAT;So;0;ON;;;;;N;;;;; +1F606;SMILING FACE WITH OPEN MOUTH AND TIGHTLY-CLOSED EYES;So;0;ON;;;;;N;;;;; +1F607;SMILING FACE WITH HALO;So;0;ON;;;;;N;;;;; +1F608;SMILING FACE WITH HORNS;So;0;ON;;;;;N;;;;; +1F609;WINKING FACE;So;0;ON;;;;;N;;;;; +1F60A;SMILING FACE WITH SMILING EYES;So;0;ON;;;;;N;;;;; +1F60B;FACE SAVOURING DELICIOUS FOOD;So;0;ON;;;;;N;;;;; +1F60C;RELIEVED FACE;So;0;ON;;;;;N;;;;; +1F60D;SMILING FACE WITH HEART-SHAPED EYES;So;0;ON;;;;;N;;;;; +1F60E;SMILING FACE WITH SUNGLASSES;So;0;ON;;;;;N;;;;; +1F60F;SMIRKING FACE;So;0;ON;;;;;N;;;;; +1F610;NEUTRAL FACE;So;0;ON;;;;;N;;;;; +1F611;EXPRESSIONLESS FACE;So;0;ON;;;;;N;;;;; +1F612;UNAMUSED FACE;So;0;ON;;;;;N;;;;; +1F613;FACE WITH COLD SWEAT;So;0;ON;;;;;N;;;;; +1F614;PENSIVE FACE;So;0;ON;;;;;N;;;;; +1F615;CONFUSED FACE;So;0;ON;;;;;N;;;;; +1F616;CONFOUNDED FACE;So;0;ON;;;;;N;;;;; +1F617;KISSING FACE;So;0;ON;;;;;N;;;;; +1F618;FACE THROWING A KISS;So;0;ON;;;;;N;;;;; +1F619;KISSING FACE WITH SMILING EYES;So;0;ON;;;;;N;;;;; +1F61A;KISSING FACE WITH CLOSED EYES;So;0;ON;;;;;N;;;;; +1F61B;FACE WITH STUCK-OUT TONGUE;So;0;ON;;;;;N;;;;; +1F61C;FACE WITH STUCK-OUT TONGUE AND WINKING EYE;So;0;ON;;;;;N;;;;; +1F61D;FACE WITH STUCK-OUT TONGUE AND TIGHTLY-CLOSED EYES;So;0;ON;;;;;N;;;;; +1F61E;DISAPPOINTED FACE;So;0;ON;;;;;N;;;;; +1F61F;WORRIED FACE;So;0;ON;;;;;N;;;;; +1F620;ANGRY FACE;So;0;ON;;;;;N;;;;; +1F621;POUTING FACE;So;0;ON;;;;;N;;;;; +1F622;CRYING FACE;So;0;ON;;;;;N;;;;; +1F623;PERSEVERING FACE;So;0;ON;;;;;N;;;;; +1F624;FACE WITH LOOK OF TRIUMPH;So;0;ON;;;;;N;;;;; +1F625;DISAPPOINTED BUT RELIEVED FACE;So;0;ON;;;;;N;;;;; +1F626;FROWNING FACE WITH OPEN MOUTH;So;0;ON;;;;;N;;;;; +1F627;ANGUISHED FACE;So;0;ON;;;;;N;;;;; +1F628;FEARFUL FACE;So;0;ON;;;;;N;;;;; +1F629;WEARY FACE;So;0;ON;;;;;N;;;;; +1F62A;SLEEPY FACE;So;0;ON;;;;;N;;;;; +1F62B;TIRED FACE;So;0;ON;;;;;N;;;;; +1F62C;GRIMACING FACE;So;0;ON;;;;;N;;;;; +1F62D;LOUDLY CRYING FACE;So;0;ON;;;;;N;;;;; +1F62E;FACE WITH OPEN MOUTH;So;0;ON;;;;;N;;;;; +1F62F;HUSHED FACE;So;0;ON;;;;;N;;;;; +1F630;FACE WITH OPEN MOUTH AND COLD SWEAT;So;0;ON;;;;;N;;;;; +1F631;FACE SCREAMING IN FEAR;So;0;ON;;;;;N;;;;; +1F632;ASTONISHED FACE;So;0;ON;;;;;N;;;;; +1F633;FLUSHED FACE;So;0;ON;;;;;N;;;;; +1F634;SLEEPING FACE;So;0;ON;;;;;N;;;;; +1F635;DIZZY FACE;So;0;ON;;;;;N;;;;; +1F636;FACE WITHOUT MOUTH;So;0;ON;;;;;N;;;;; +1F637;FACE WITH MEDICAL MASK;So;0;ON;;;;;N;;;;; +1F638;GRINNING CAT FACE WITH SMILING EYES;So;0;ON;;;;;N;;;;; +1F639;CAT FACE WITH TEARS OF JOY;So;0;ON;;;;;N;;;;; +1F63A;SMILING CAT FACE WITH OPEN MOUTH;So;0;ON;;;;;N;;;;; +1F63B;SMILING CAT FACE WITH HEART-SHAPED EYES;So;0;ON;;;;;N;;;;; +1F63C;CAT FACE WITH WRY SMILE;So;0;ON;;;;;N;;;;; +1F63D;KISSING CAT FACE WITH CLOSED EYES;So;0;ON;;;;;N;;;;; +1F63E;POUTING CAT FACE;So;0;ON;;;;;N;;;;; +1F63F;CRYING CAT FACE;So;0;ON;;;;;N;;;;; +1F640;WEARY CAT FACE;So;0;ON;;;;;N;;;;; +1F641;SLIGHTLY FROWNING FACE;So;0;ON;;;;;N;;;;; +1F642;SLIGHTLY SMILING FACE;So;0;ON;;;;;N;;;;; +1F643;UPSIDE-DOWN FACE;So;0;ON;;;;;N;;;;; +1F644;FACE WITH ROLLING EYES;So;0;ON;;;;;N;;;;; +1F645;FACE WITH NO GOOD GESTURE;So;0;ON;;;;;N;;;;; +1F646;FACE WITH OK GESTURE;So;0;ON;;;;;N;;;;; +1F647;PERSON BOWING DEEPLY;So;0;ON;;;;;N;;;;; +1F648;SEE-NO-EVIL MONKEY;So;0;ON;;;;;N;;;;; +1F649;HEAR-NO-EVIL MONKEY;So;0;ON;;;;;N;;;;; +1F64A;SPEAK-NO-EVIL MONKEY;So;0;ON;;;;;N;;;;; +1F64B;HAPPY PERSON RAISING ONE HAND;So;0;ON;;;;;N;;;;; +1F64C;PERSON RAISING BOTH HANDS IN CELEBRATION;So;0;ON;;;;;N;;;;; +1F64D;PERSON FROWNING;So;0;ON;;;;;N;;;;; +1F64E;PERSON WITH POUTING FACE;So;0;ON;;;;;N;;;;; +1F64F;PERSON WITH FOLDED HANDS;So;0;ON;;;;;N;;;;; +1F650;NORTH WEST POINTING LEAF;So;0;ON;;;;;N;;;;; +1F651;SOUTH WEST POINTING LEAF;So;0;ON;;;;;N;;;;; +1F652;NORTH EAST POINTING LEAF;So;0;ON;;;;;N;;;;; +1F653;SOUTH EAST POINTING LEAF;So;0;ON;;;;;N;;;;; +1F654;TURNED NORTH WEST POINTING LEAF;So;0;ON;;;;;N;;;;; +1F655;TURNED SOUTH WEST POINTING LEAF;So;0;ON;;;;;N;;;;; +1F656;TURNED NORTH EAST POINTING LEAF;So;0;ON;;;;;N;;;;; +1F657;TURNED SOUTH EAST POINTING LEAF;So;0;ON;;;;;N;;;;; +1F658;NORTH WEST POINTING VINE LEAF;So;0;ON;;;;;N;;;;; +1F659;SOUTH WEST POINTING VINE LEAF;So;0;ON;;;;;N;;;;; +1F65A;NORTH EAST POINTING VINE LEAF;So;0;ON;;;;;N;;;;; +1F65B;SOUTH EAST POINTING VINE LEAF;So;0;ON;;;;;N;;;;; +1F65C;HEAVY NORTH WEST POINTING VINE LEAF;So;0;ON;;;;;N;;;;; +1F65D;HEAVY SOUTH WEST POINTING VINE LEAF;So;0;ON;;;;;N;;;;; +1F65E;HEAVY NORTH EAST POINTING VINE LEAF;So;0;ON;;;;;N;;;;; +1F65F;HEAVY SOUTH EAST POINTING VINE LEAF;So;0;ON;;;;;N;;;;; +1F660;NORTH WEST POINTING BUD;So;0;ON;;;;;N;;;;; +1F661;SOUTH WEST POINTING BUD;So;0;ON;;;;;N;;;;; +1F662;NORTH EAST POINTING BUD;So;0;ON;;;;;N;;;;; +1F663;SOUTH EAST POINTING BUD;So;0;ON;;;;;N;;;;; +1F664;HEAVY NORTH WEST POINTING BUD;So;0;ON;;;;;N;;;;; +1F665;HEAVY SOUTH WEST POINTING BUD;So;0;ON;;;;;N;;;;; +1F666;HEAVY NORTH EAST POINTING BUD;So;0;ON;;;;;N;;;;; +1F667;HEAVY SOUTH EAST POINTING BUD;So;0;ON;;;;;N;;;;; +1F668;HOLLOW QUILT SQUARE ORNAMENT;So;0;ON;;;;;N;;;;; +1F669;HOLLOW QUILT SQUARE ORNAMENT IN BLACK SQUARE;So;0;ON;;;;;N;;;;; +1F66A;SOLID QUILT SQUARE ORNAMENT;So;0;ON;;;;;N;;;;; +1F66B;SOLID QUILT SQUARE ORNAMENT IN BLACK SQUARE;So;0;ON;;;;;N;;;;; +1F66C;LEFTWARDS ROCKET;So;0;ON;;;;;N;;;;; +1F66D;UPWARDS ROCKET;So;0;ON;;;;;N;;;;; +1F66E;RIGHTWARDS ROCKET;So;0;ON;;;;;N;;;;; +1F66F;DOWNWARDS ROCKET;So;0;ON;;;;;N;;;;; +1F670;SCRIPT LIGATURE ET ORNAMENT;So;0;ON;;;;;N;;;;; +1F671;HEAVY SCRIPT LIGATURE ET ORNAMENT;So;0;ON;;;;;N;;;;; +1F672;LIGATURE OPEN ET ORNAMENT;So;0;ON;;;;;N;;;;; +1F673;HEAVY LIGATURE OPEN ET ORNAMENT;So;0;ON;;;;;N;;;;; +1F674;HEAVY AMPERSAND ORNAMENT;So;0;ON;;;;;N;;;;; +1F675;SWASH AMPERSAND ORNAMENT;So;0;ON;;;;;N;;;;; +1F676;SANS-SERIF HEAVY DOUBLE TURNED COMMA QUOTATION MARK ORNAMENT;So;0;ON;;;;;N;;;;; +1F677;SANS-SERIF HEAVY DOUBLE COMMA QUOTATION MARK ORNAMENT;So;0;ON;;;;;N;;;;; +1F678;SANS-SERIF HEAVY LOW DOUBLE COMMA QUOTATION MARK ORNAMENT;So;0;ON;;;;;N;;;;; +1F679;HEAVY INTERROBANG ORNAMENT;So;0;ON;;;;;N;;;;; +1F67A;SANS-SERIF INTERROBANG ORNAMENT;So;0;ON;;;;;N;;;;; +1F67B;HEAVY SANS-SERIF INTERROBANG ORNAMENT;So;0;ON;;;;;N;;;;; +1F67C;VERY HEAVY SOLIDUS;So;0;ON;;;;;N;;;;; +1F67D;VERY HEAVY REVERSE SOLIDUS;So;0;ON;;;;;N;;;;; +1F67E;CHECKER BOARD;So;0;ON;;;;;N;;;;; +1F67F;REVERSE CHECKER BOARD;So;0;ON;;;;;N;;;;; +1F680;ROCKET;So;0;ON;;;;;N;;;;; +1F681;HELICOPTER;So;0;ON;;;;;N;;;;; +1F682;STEAM LOCOMOTIVE;So;0;ON;;;;;N;;;;; +1F683;RAILWAY CAR;So;0;ON;;;;;N;;;;; +1F684;HIGH-SPEED TRAIN;So;0;ON;;;;;N;;;;; +1F685;HIGH-SPEED TRAIN WITH BULLET NOSE;So;0;ON;;;;;N;;;;; +1F686;TRAIN;So;0;ON;;;;;N;;;;; +1F687;METRO;So;0;ON;;;;;N;;;;; +1F688;LIGHT RAIL;So;0;ON;;;;;N;;;;; +1F689;STATION;So;0;ON;;;;;N;;;;; +1F68A;TRAM;So;0;ON;;;;;N;;;;; +1F68B;TRAM CAR;So;0;ON;;;;;N;;;;; +1F68C;BUS;So;0;ON;;;;;N;;;;; +1F68D;ONCOMING BUS;So;0;ON;;;;;N;;;;; +1F68E;TROLLEYBUS;So;0;ON;;;;;N;;;;; +1F68F;BUS STOP;So;0;ON;;;;;N;;;;; +1F690;MINIBUS;So;0;ON;;;;;N;;;;; +1F691;AMBULANCE;So;0;ON;;;;;N;;;;; +1F692;FIRE ENGINE;So;0;ON;;;;;N;;;;; +1F693;POLICE CAR;So;0;ON;;;;;N;;;;; +1F694;ONCOMING POLICE CAR;So;0;ON;;;;;N;;;;; +1F695;TAXI;So;0;ON;;;;;N;;;;; +1F696;ONCOMING TAXI;So;0;ON;;;;;N;;;;; +1F697;AUTOMOBILE;So;0;ON;;;;;N;;;;; +1F698;ONCOMING AUTOMOBILE;So;0;ON;;;;;N;;;;; +1F699;RECREATIONAL VEHICLE;So;0;ON;;;;;N;;;;; +1F69A;DELIVERY TRUCK;So;0;ON;;;;;N;;;;; +1F69B;ARTICULATED LORRY;So;0;ON;;;;;N;;;;; +1F69C;TRACTOR;So;0;ON;;;;;N;;;;; +1F69D;MONORAIL;So;0;ON;;;;;N;;;;; +1F69E;MOUNTAIN RAILWAY;So;0;ON;;;;;N;;;;; +1F69F;SUSPENSION RAILWAY;So;0;ON;;;;;N;;;;; +1F6A0;MOUNTAIN CABLEWAY;So;0;ON;;;;;N;;;;; +1F6A1;AERIAL TRAMWAY;So;0;ON;;;;;N;;;;; +1F6A2;SHIP;So;0;ON;;;;;N;;;;; +1F6A3;ROWBOAT;So;0;ON;;;;;N;;;;; +1F6A4;SPEEDBOAT;So;0;ON;;;;;N;;;;; +1F6A5;HORIZONTAL TRAFFIC LIGHT;So;0;ON;;;;;N;;;;; +1F6A6;VERTICAL TRAFFIC LIGHT;So;0;ON;;;;;N;;;;; +1F6A7;CONSTRUCTION SIGN;So;0;ON;;;;;N;;;;; +1F6A8;POLICE CARS REVOLVING LIGHT;So;0;ON;;;;;N;;;;; +1F6A9;TRIANGULAR FLAG ON POST;So;0;ON;;;;;N;;;;; +1F6AA;DOOR;So;0;ON;;;;;N;;;;; +1F6AB;NO ENTRY SIGN;So;0;ON;;;;;N;;;;; +1F6AC;SMOKING SYMBOL;So;0;ON;;;;;N;;;;; +1F6AD;NO SMOKING SYMBOL;So;0;ON;;;;;N;;;;; +1F6AE;PUT LITTER IN ITS PLACE SYMBOL;So;0;ON;;;;;N;;;;; +1F6AF;DO NOT LITTER SYMBOL;So;0;ON;;;;;N;;;;; +1F6B0;POTABLE WATER SYMBOL;So;0;ON;;;;;N;;;;; +1F6B1;NON-POTABLE WATER SYMBOL;So;0;ON;;;;;N;;;;; +1F6B2;BICYCLE;So;0;ON;;;;;N;;;;; +1F6B3;NO BICYCLES;So;0;ON;;;;;N;;;;; +1F6B4;BICYCLIST;So;0;ON;;;;;N;;;;; +1F6B5;MOUNTAIN BICYCLIST;So;0;ON;;;;;N;;;;; +1F6B6;PEDESTRIAN;So;0;ON;;;;;N;;;;; +1F6B7;NO PEDESTRIANS;So;0;ON;;;;;N;;;;; +1F6B8;CHILDREN CROSSING;So;0;ON;;;;;N;;;;; +1F6B9;MENS SYMBOL;So;0;ON;;;;;N;;;;; +1F6BA;WOMENS SYMBOL;So;0;ON;;;;;N;;;;; +1F6BB;RESTROOM;So;0;ON;;;;;N;;;;; +1F6BC;BABY SYMBOL;So;0;ON;;;;;N;;;;; +1F6BD;TOILET;So;0;ON;;;;;N;;;;; +1F6BE;WATER CLOSET;So;0;ON;;;;;N;;;;; +1F6BF;SHOWER;So;0;ON;;;;;N;;;;; +1F6C0;BATH;So;0;ON;;;;;N;;;;; +1F6C1;BATHTUB;So;0;ON;;;;;N;;;;; +1F6C2;PASSPORT CONTROL;So;0;ON;;;;;N;;;;; +1F6C3;CUSTOMS;So;0;ON;;;;;N;;;;; +1F6C4;BAGGAGE CLAIM;So;0;ON;;;;;N;;;;; +1F6C5;LEFT LUGGAGE;So;0;ON;;;;;N;;;;; +1F6C6;TRIANGLE WITH ROUNDED CORNERS;So;0;ON;;;;;N;;;;; +1F6C7;PROHIBITED SIGN;So;0;ON;;;;;N;;;;; +1F6C8;CIRCLED INFORMATION SOURCE;So;0;ON;;;;;N;;;;; +1F6C9;BOYS SYMBOL;So;0;ON;;;;;N;;;;; +1F6CA;GIRLS SYMBOL;So;0;ON;;;;;N;;;;; +1F6CB;COUCH AND LAMP;So;0;ON;;;;;N;;;;; +1F6CC;SLEEPING ACCOMMODATION;So;0;ON;;;;;N;;;;; +1F6CD;SHOPPING BAGS;So;0;ON;;;;;N;;;;; +1F6CE;BELLHOP BELL;So;0;ON;;;;;N;;;;; +1F6CF;BED;So;0;ON;;;;;N;;;;; +1F6D0;PLACE OF WORSHIP;So;0;ON;;;;;N;;;;; +1F6D1;OCTAGONAL SIGN;So;0;ON;;;;;N;;;;; +1F6D2;SHOPPING TROLLEY;So;0;ON;;;;;N;;;;; +1F6D3;STUPA;So;0;ON;;;;;N;;;;; +1F6D4;PAGODA;So;0;ON;;;;;N;;;;; +1F6D5;HINDU TEMPLE;So;0;ON;;;;;N;;;;; +1F6D6;HUT;So;0;ON;;;;;N;;;;; +1F6D7;ELEVATOR;So;0;ON;;;;;N;;;;; +1F6D8;LANDSLIDE;So;0;ON;;;;;N;;;;; +1F6DC;WIRELESS;So;0;ON;;;;;N;;;;; +1F6DD;PLAYGROUND SLIDE;So;0;ON;;;;;N;;;;; +1F6DE;WHEEL;So;0;ON;;;;;N;;;;; +1F6DF;RING BUOY;So;0;ON;;;;;N;;;;; +1F6E0;HAMMER AND WRENCH;So;0;ON;;;;;N;;;;; +1F6E1;SHIELD;So;0;ON;;;;;N;;;;; +1F6E2;OIL DRUM;So;0;ON;;;;;N;;;;; +1F6E3;MOTORWAY;So;0;ON;;;;;N;;;;; +1F6E4;RAILWAY TRACK;So;0;ON;;;;;N;;;;; +1F6E5;MOTOR BOAT;So;0;ON;;;;;N;;;;; +1F6E6;UP-POINTING MILITARY AIRPLANE;So;0;ON;;;;;N;;;;; +1F6E7;UP-POINTING AIRPLANE;So;0;ON;;;;;N;;;;; +1F6E8;UP-POINTING SMALL AIRPLANE;So;0;ON;;;;;N;;;;; +1F6E9;SMALL AIRPLANE;So;0;ON;;;;;N;;;;; +1F6EA;NORTHEAST-POINTING AIRPLANE;So;0;ON;;;;;N;;;;; +1F6EB;AIRPLANE DEPARTURE;So;0;ON;;;;;N;;;;; +1F6EC;AIRPLANE ARRIVING;So;0;ON;;;;;N;;;;; +1F6F0;SATELLITE;So;0;ON;;;;;N;;;;; +1F6F1;ONCOMING FIRE ENGINE;So;0;ON;;;;;N;;;;; +1F6F2;DIESEL LOCOMOTIVE;So;0;ON;;;;;N;;;;; +1F6F3;PASSENGER SHIP;So;0;ON;;;;;N;;;;; +1F6F4;SCOOTER;So;0;ON;;;;;N;;;;; +1F6F5;MOTOR SCOOTER;So;0;ON;;;;;N;;;;; +1F6F6;CANOE;So;0;ON;;;;;N;;;;; +1F6F7;SLED;So;0;ON;;;;;N;;;;; +1F6F8;FLYING SAUCER;So;0;ON;;;;;N;;;;; +1F6F9;SKATEBOARD;So;0;ON;;;;;N;;;;; +1F6FA;AUTO RICKSHAW;So;0;ON;;;;;N;;;;; +1F6FB;PICKUP TRUCK;So;0;ON;;;;;N;;;;; +1F6FC;ROLLER SKATE;So;0;ON;;;;;N;;;;; +1F700;ALCHEMICAL SYMBOL FOR QUINTESSENCE;So;0;ON;;;;;N;;;;; +1F701;ALCHEMICAL SYMBOL FOR AIR;So;0;ON;;;;;N;;;;; +1F702;ALCHEMICAL SYMBOL FOR FIRE;So;0;ON;;;;;N;;;;; +1F703;ALCHEMICAL SYMBOL FOR EARTH;So;0;ON;;;;;N;;;;; +1F704;ALCHEMICAL SYMBOL FOR WATER;So;0;ON;;;;;N;;;;; +1F705;ALCHEMICAL SYMBOL FOR AQUAFORTIS;So;0;ON;;;;;N;;;;; +1F706;ALCHEMICAL SYMBOL FOR AQUA REGIA;So;0;ON;;;;;N;;;;; +1F707;ALCHEMICAL SYMBOL FOR AQUA REGIA-2;So;0;ON;;;;;N;;;;; +1F708;ALCHEMICAL SYMBOL FOR AQUA VITAE;So;0;ON;;;;;N;;;;; +1F709;ALCHEMICAL SYMBOL FOR AQUA VITAE-2;So;0;ON;;;;;N;;;;; +1F70A;ALCHEMICAL SYMBOL FOR VINEGAR;So;0;ON;;;;;N;;;;; +1F70B;ALCHEMICAL SYMBOL FOR VINEGAR-2;So;0;ON;;;;;N;;;;; +1F70C;ALCHEMICAL SYMBOL FOR VINEGAR-3;So;0;ON;;;;;N;;;;; +1F70D;ALCHEMICAL SYMBOL FOR SULFUR;So;0;ON;;;;;N;;;;; +1F70E;ALCHEMICAL SYMBOL FOR PHILOSOPHERS SULFUR;So;0;ON;;;;;N;;;;; +1F70F;ALCHEMICAL SYMBOL FOR BLACK SULFUR;So;0;ON;;;;;N;;;;; +1F710;ALCHEMICAL SYMBOL FOR MERCURY SUBLIMATE;So;0;ON;;;;;N;;;;; +1F711;ALCHEMICAL SYMBOL FOR MERCURY SUBLIMATE-2;So;0;ON;;;;;N;;;;; +1F712;ALCHEMICAL SYMBOL FOR MERCURY SUBLIMATE-3;So;0;ON;;;;;N;;;;; +1F713;ALCHEMICAL SYMBOL FOR CINNABAR;So;0;ON;;;;;N;;;;; +1F714;ALCHEMICAL SYMBOL FOR SALT;So;0;ON;;;;;N;;;;; +1F715;ALCHEMICAL SYMBOL FOR NITRE;So;0;ON;;;;;N;;;;; +1F716;ALCHEMICAL SYMBOL FOR VITRIOL;So;0;ON;;;;;N;;;;; +1F717;ALCHEMICAL SYMBOL FOR VITRIOL-2;So;0;ON;;;;;N;;;;; +1F718;ALCHEMICAL SYMBOL FOR ROCK SALT;So;0;ON;;;;;N;;;;; +1F719;ALCHEMICAL SYMBOL FOR ROCK SALT-2;So;0;ON;;;;;N;;;;; +1F71A;ALCHEMICAL SYMBOL FOR GOLD;So;0;ON;;;;;N;;;;; +1F71B;ALCHEMICAL SYMBOL FOR SILVER;So;0;ON;;;;;N;;;;; +1F71C;ALCHEMICAL SYMBOL FOR IRON ORE;So;0;ON;;;;;N;;;;; +1F71D;ALCHEMICAL SYMBOL FOR IRON ORE-2;So;0;ON;;;;;N;;;;; +1F71E;ALCHEMICAL SYMBOL FOR CROCUS OF IRON;So;0;ON;;;;;N;;;;; +1F71F;ALCHEMICAL SYMBOL FOR REGULUS OF IRON;So;0;ON;;;;;N;;;;; +1F720;ALCHEMICAL SYMBOL FOR COPPER ORE;So;0;ON;;;;;N;;;;; +1F721;ALCHEMICAL SYMBOL FOR IRON-COPPER ORE;So;0;ON;;;;;N;;;;; +1F722;ALCHEMICAL SYMBOL FOR SUBLIMATE OF COPPER;So;0;ON;;;;;N;;;;; +1F723;ALCHEMICAL SYMBOL FOR CROCUS OF COPPER;So;0;ON;;;;;N;;;;; +1F724;ALCHEMICAL SYMBOL FOR CROCUS OF COPPER-2;So;0;ON;;;;;N;;;;; +1F725;ALCHEMICAL SYMBOL FOR COPPER ANTIMONIATE;So;0;ON;;;;;N;;;;; +1F726;ALCHEMICAL SYMBOL FOR SALT OF COPPER ANTIMONIATE;So;0;ON;;;;;N;;;;; +1F727;ALCHEMICAL SYMBOL FOR SUBLIMATE OF SALT OF COPPER;So;0;ON;;;;;N;;;;; +1F728;ALCHEMICAL SYMBOL FOR VERDIGRIS;So;0;ON;;;;;N;;;;; +1F729;ALCHEMICAL SYMBOL FOR TIN ORE;So;0;ON;;;;;N;;;;; +1F72A;ALCHEMICAL SYMBOL FOR LEAD ORE;So;0;ON;;;;;N;;;;; +1F72B;ALCHEMICAL SYMBOL FOR ANTIMONY ORE;So;0;ON;;;;;N;;;;; +1F72C;ALCHEMICAL SYMBOL FOR SUBLIMATE OF ANTIMONY;So;0;ON;;;;;N;;;;; +1F72D;ALCHEMICAL SYMBOL FOR SALT OF ANTIMONY;So;0;ON;;;;;N;;;;; +1F72E;ALCHEMICAL SYMBOL FOR SUBLIMATE OF SALT OF ANTIMONY;So;0;ON;;;;;N;;;;; +1F72F;ALCHEMICAL SYMBOL FOR VINEGAR OF ANTIMONY;So;0;ON;;;;;N;;;;; +1F730;ALCHEMICAL SYMBOL FOR REGULUS OF ANTIMONY;So;0;ON;;;;;N;;;;; +1F731;ALCHEMICAL SYMBOL FOR REGULUS OF ANTIMONY-2;So;0;ON;;;;;N;;;;; +1F732;ALCHEMICAL SYMBOL FOR REGULUS;So;0;ON;;;;;N;;;;; +1F733;ALCHEMICAL SYMBOL FOR REGULUS-2;So;0;ON;;;;;N;;;;; +1F734;ALCHEMICAL SYMBOL FOR REGULUS-3;So;0;ON;;;;;N;;;;; +1F735;ALCHEMICAL SYMBOL FOR REGULUS-4;So;0;ON;;;;;N;;;;; +1F736;ALCHEMICAL SYMBOL FOR ALKALI;So;0;ON;;;;;N;;;;; +1F737;ALCHEMICAL SYMBOL FOR ALKALI-2;So;0;ON;;;;;N;;;;; +1F738;ALCHEMICAL SYMBOL FOR MARCASITE;So;0;ON;;;;;N;;;;; +1F739;ALCHEMICAL SYMBOL FOR SAL-AMMONIAC;So;0;ON;;;;;N;;;;; +1F73A;ALCHEMICAL SYMBOL FOR ARSENIC;So;0;ON;;;;;N;;;;; +1F73B;ALCHEMICAL SYMBOL FOR REALGAR;So;0;ON;;;;;N;;;;; +1F73C;ALCHEMICAL SYMBOL FOR REALGAR-2;So;0;ON;;;;;N;;;;; +1F73D;ALCHEMICAL SYMBOL FOR AURIPIGMENT;So;0;ON;;;;;N;;;;; +1F73E;ALCHEMICAL SYMBOL FOR BISMUTH ORE;So;0;ON;;;;;N;;;;; +1F73F;ALCHEMICAL SYMBOL FOR TARTAR;So;0;ON;;;;;N;;;;; +1F740;ALCHEMICAL SYMBOL FOR TARTAR-2;So;0;ON;;;;;N;;;;; +1F741;ALCHEMICAL SYMBOL FOR QUICK LIME;So;0;ON;;;;;N;;;;; +1F742;ALCHEMICAL SYMBOL FOR BORAX;So;0;ON;;;;;N;;;;; +1F743;ALCHEMICAL SYMBOL FOR BORAX-2;So;0;ON;;;;;N;;;;; +1F744;ALCHEMICAL SYMBOL FOR BORAX-3;So;0;ON;;;;;N;;;;; +1F745;ALCHEMICAL SYMBOL FOR ALUM;So;0;ON;;;;;N;;;;; +1F746;ALCHEMICAL SYMBOL FOR OIL;So;0;ON;;;;;N;;;;; +1F747;ALCHEMICAL SYMBOL FOR SPIRIT;So;0;ON;;;;;N;;;;; +1F748;ALCHEMICAL SYMBOL FOR TINCTURE;So;0;ON;;;;;N;;;;; +1F749;ALCHEMICAL SYMBOL FOR GUM;So;0;ON;;;;;N;;;;; +1F74A;ALCHEMICAL SYMBOL FOR WAX;So;0;ON;;;;;N;;;;; +1F74B;ALCHEMICAL SYMBOL FOR POWDER;So;0;ON;;;;;N;;;;; +1F74C;ALCHEMICAL SYMBOL FOR CALX;So;0;ON;;;;;N;;;;; +1F74D;ALCHEMICAL SYMBOL FOR TUTTY;So;0;ON;;;;;N;;;;; +1F74E;ALCHEMICAL SYMBOL FOR CAPUT MORTUUM;So;0;ON;;;;;N;;;;; +1F74F;ALCHEMICAL SYMBOL FOR SCEPTER OF JOVE;So;0;ON;;;;;N;;;;; +1F750;ALCHEMICAL SYMBOL FOR CADUCEUS;So;0;ON;;;;;N;;;;; +1F751;ALCHEMICAL SYMBOL FOR TRIDENT;So;0;ON;;;;;N;;;;; +1F752;ALCHEMICAL SYMBOL FOR STARRED TRIDENT;So;0;ON;;;;;N;;;;; +1F753;ALCHEMICAL SYMBOL FOR LODESTONE;So;0;ON;;;;;N;;;;; +1F754;ALCHEMICAL SYMBOL FOR SOAP;So;0;ON;;;;;N;;;;; +1F755;ALCHEMICAL SYMBOL FOR URINE;So;0;ON;;;;;N;;;;; +1F756;ALCHEMICAL SYMBOL FOR HORSE DUNG;So;0;ON;;;;;N;;;;; +1F757;ALCHEMICAL SYMBOL FOR ASHES;So;0;ON;;;;;N;;;;; +1F758;ALCHEMICAL SYMBOL FOR POT ASHES;So;0;ON;;;;;N;;;;; +1F759;ALCHEMICAL SYMBOL FOR BRICK;So;0;ON;;;;;N;;;;; +1F75A;ALCHEMICAL SYMBOL FOR POWDERED BRICK;So;0;ON;;;;;N;;;;; +1F75B;ALCHEMICAL SYMBOL FOR AMALGAM;So;0;ON;;;;;N;;;;; +1F75C;ALCHEMICAL SYMBOL FOR STRATUM SUPER STRATUM;So;0;ON;;;;;N;;;;; +1F75D;ALCHEMICAL SYMBOL FOR STRATUM SUPER STRATUM-2;So;0;ON;;;;;N;;;;; +1F75E;ALCHEMICAL SYMBOL FOR SUBLIMATION;So;0;ON;;;;;N;;;;; +1F75F;ALCHEMICAL SYMBOL FOR PRECIPITATE;So;0;ON;;;;;N;;;;; +1F760;ALCHEMICAL SYMBOL FOR DISTILL;So;0;ON;;;;;N;;;;; +1F761;ALCHEMICAL SYMBOL FOR DISSOLVE;So;0;ON;;;;;N;;;;; +1F762;ALCHEMICAL SYMBOL FOR DISSOLVE-2;So;0;ON;;;;;N;;;;; +1F763;ALCHEMICAL SYMBOL FOR PURIFY;So;0;ON;;;;;N;;;;; +1F764;ALCHEMICAL SYMBOL FOR PUTREFACTION;So;0;ON;;;;;N;;;;; +1F765;ALCHEMICAL SYMBOL FOR CRUCIBLE;So;0;ON;;;;;N;;;;; +1F766;ALCHEMICAL SYMBOL FOR CRUCIBLE-2;So;0;ON;;;;;N;;;;; +1F767;ALCHEMICAL SYMBOL FOR CRUCIBLE-3;So;0;ON;;;;;N;;;;; +1F768;ALCHEMICAL SYMBOL FOR CRUCIBLE-4;So;0;ON;;;;;N;;;;; +1F769;ALCHEMICAL SYMBOL FOR CRUCIBLE-5;So;0;ON;;;;;N;;;;; +1F76A;ALCHEMICAL SYMBOL FOR ALEMBIC;So;0;ON;;;;;N;;;;; +1F76B;ALCHEMICAL SYMBOL FOR BATH OF MARY;So;0;ON;;;;;N;;;;; +1F76C;ALCHEMICAL SYMBOL FOR BATH OF VAPOURS;So;0;ON;;;;;N;;;;; +1F76D;ALCHEMICAL SYMBOL FOR RETORT;So;0;ON;;;;;N;;;;; +1F76E;ALCHEMICAL SYMBOL FOR HOUR;So;0;ON;;;;;N;;;;; +1F76F;ALCHEMICAL SYMBOL FOR NIGHT;So;0;ON;;;;;N;;;;; +1F770;ALCHEMICAL SYMBOL FOR DAY-NIGHT;So;0;ON;;;;;N;;;;; +1F771;ALCHEMICAL SYMBOL FOR MONTH;So;0;ON;;;;;N;;;;; +1F772;ALCHEMICAL SYMBOL FOR HALF DRAM;So;0;ON;;;;;N;;;;; +1F773;ALCHEMICAL SYMBOL FOR HALF OUNCE;So;0;ON;;;;;N;;;;; +1F774;LOT OF FORTUNE;So;0;ON;;;;;N;;;;; +1F775;OCCULTATION;So;0;ON;;;;;N;;;;; +1F776;LUNAR ECLIPSE;So;0;ON;;;;;N;;;;; +1F777;VESTA FORM TWO;So;0;ON;;;;;N;;;;; +1F778;ASTRAEA FORM TWO;So;0;ON;;;;;N;;;;; +1F779;HYGIEA FORM TWO;So;0;ON;;;;;N;;;;; +1F77A;PARTHENOPE FORM TWO;So;0;ON;;;;;N;;;;; +1F77B;HAUMEA;So;0;ON;;;;;N;;;;; +1F77C;MAKEMAKE;So;0;ON;;;;;N;;;;; +1F77D;GONGGONG;So;0;ON;;;;;N;;;;; +1F77E;QUAOAR;So;0;ON;;;;;N;;;;; +1F77F;ORCUS;So;0;ON;;;;;N;;;;; +1F780;BLACK LEFT-POINTING ISOSCELES RIGHT TRIANGLE;So;0;ON;;;;;N;;;;; +1F781;BLACK UP-POINTING ISOSCELES RIGHT TRIANGLE;So;0;ON;;;;;N;;;;; +1F782;BLACK RIGHT-POINTING ISOSCELES RIGHT TRIANGLE;So;0;ON;;;;;N;;;;; +1F783;BLACK DOWN-POINTING ISOSCELES RIGHT TRIANGLE;So;0;ON;;;;;N;;;;; +1F784;BLACK SLIGHTLY SMALL CIRCLE;So;0;ON;;;;;N;;;;; +1F785;MEDIUM BOLD WHITE CIRCLE;So;0;ON;;;;;N;;;;; +1F786;BOLD WHITE CIRCLE;So;0;ON;;;;;N;;;;; +1F787;HEAVY WHITE CIRCLE;So;0;ON;;;;;N;;;;; +1F788;VERY HEAVY WHITE CIRCLE;So;0;ON;;;;;N;;;;; +1F789;EXTREMELY HEAVY WHITE CIRCLE;So;0;ON;;;;;N;;;;; +1F78A;WHITE CIRCLE CONTAINING BLACK SMALL CIRCLE;So;0;ON;;;;;N;;;;; +1F78B;ROUND TARGET;So;0;ON;;;;;N;;;;; +1F78C;BLACK TINY SQUARE;So;0;ON;;;;;N;;;;; +1F78D;BLACK SLIGHTLY SMALL SQUARE;So;0;ON;;;;;N;;;;; +1F78E;LIGHT WHITE SQUARE;So;0;ON;;;;;N;;;;; +1F78F;MEDIUM WHITE SQUARE;So;0;ON;;;;;N;;;;; +1F790;BOLD WHITE SQUARE;So;0;ON;;;;;N;;;;; +1F791;HEAVY WHITE SQUARE;So;0;ON;;;;;N;;;;; +1F792;VERY HEAVY WHITE SQUARE;So;0;ON;;;;;N;;;;; +1F793;EXTREMELY HEAVY WHITE SQUARE;So;0;ON;;;;;N;;;;; +1F794;WHITE SQUARE CONTAINING BLACK VERY SMALL SQUARE;So;0;ON;;;;;N;;;;; +1F795;WHITE SQUARE CONTAINING BLACK MEDIUM SQUARE;So;0;ON;;;;;N;;;;; +1F796;SQUARE TARGET;So;0;ON;;;;;N;;;;; +1F797;BLACK TINY DIAMOND;So;0;ON;;;;;N;;;;; +1F798;BLACK VERY SMALL DIAMOND;So;0;ON;;;;;N;;;;; +1F799;BLACK MEDIUM SMALL DIAMOND;So;0;ON;;;;;N;;;;; +1F79A;WHITE DIAMOND CONTAINING BLACK VERY SMALL DIAMOND;So;0;ON;;;;;N;;;;; +1F79B;WHITE DIAMOND CONTAINING BLACK MEDIUM DIAMOND;So;0;ON;;;;;N;;;;; +1F79C;DIAMOND TARGET;So;0;ON;;;;;N;;;;; +1F79D;BLACK TINY LOZENGE;So;0;ON;;;;;N;;;;; +1F79E;BLACK VERY SMALL LOZENGE;So;0;ON;;;;;N;;;;; +1F79F;BLACK MEDIUM SMALL LOZENGE;So;0;ON;;;;;N;;;;; +1F7A0;WHITE LOZENGE CONTAINING BLACK SMALL LOZENGE;So;0;ON;;;;;N;;;;; +1F7A1;THIN GREEK CROSS;So;0;ON;;;;;N;;;;; +1F7A2;LIGHT GREEK CROSS;So;0;ON;;;;;N;;;;; +1F7A3;MEDIUM GREEK CROSS;So;0;ON;;;;;N;;;;; +1F7A4;BOLD GREEK CROSS;So;0;ON;;;;;N;;;;; +1F7A5;VERY BOLD GREEK CROSS;So;0;ON;;;;;N;;;;; +1F7A6;VERY HEAVY GREEK CROSS;So;0;ON;;;;;N;;;;; +1F7A7;EXTREMELY HEAVY GREEK CROSS;So;0;ON;;;;;N;;;;; +1F7A8;THIN SALTIRE;So;0;ON;;;;;N;;;;; +1F7A9;LIGHT SALTIRE;So;0;ON;;;;;N;;;;; +1F7AA;MEDIUM SALTIRE;So;0;ON;;;;;N;;;;; +1F7AB;BOLD SALTIRE;So;0;ON;;;;;N;;;;; +1F7AC;HEAVY SALTIRE;So;0;ON;;;;;N;;;;; +1F7AD;VERY HEAVY SALTIRE;So;0;ON;;;;;N;;;;; +1F7AE;EXTREMELY HEAVY SALTIRE;So;0;ON;;;;;N;;;;; +1F7AF;LIGHT FIVE SPOKED ASTERISK;So;0;ON;;;;;N;;;;; +1F7B0;MEDIUM FIVE SPOKED ASTERISK;So;0;ON;;;;;N;;;;; +1F7B1;BOLD FIVE SPOKED ASTERISK;So;0;ON;;;;;N;;;;; +1F7B2;HEAVY FIVE SPOKED ASTERISK;So;0;ON;;;;;N;;;;; +1F7B3;VERY HEAVY FIVE SPOKED ASTERISK;So;0;ON;;;;;N;;;;; +1F7B4;EXTREMELY HEAVY FIVE SPOKED ASTERISK;So;0;ON;;;;;N;;;;; +1F7B5;LIGHT SIX SPOKED ASTERISK;So;0;ON;;;;;N;;;;; +1F7B6;MEDIUM SIX SPOKED ASTERISK;So;0;ON;;;;;N;;;;; +1F7B7;BOLD SIX SPOKED ASTERISK;So;0;ON;;;;;N;;;;; +1F7B8;HEAVY SIX SPOKED ASTERISK;So;0;ON;;;;;N;;;;; +1F7B9;VERY HEAVY SIX SPOKED ASTERISK;So;0;ON;;;;;N;;;;; +1F7BA;EXTREMELY HEAVY SIX SPOKED ASTERISK;So;0;ON;;;;;N;;;;; +1F7BB;LIGHT EIGHT SPOKED ASTERISK;So;0;ON;;;;;N;;;;; +1F7BC;MEDIUM EIGHT SPOKED ASTERISK;So;0;ON;;;;;N;;;;; +1F7BD;BOLD EIGHT SPOKED ASTERISK;So;0;ON;;;;;N;;;;; +1F7BE;HEAVY EIGHT SPOKED ASTERISK;So;0;ON;;;;;N;;;;; +1F7BF;VERY HEAVY EIGHT SPOKED ASTERISK;So;0;ON;;;;;N;;;;; +1F7C0;LIGHT THREE POINTED BLACK STAR;So;0;ON;;;;;N;;;;; +1F7C1;MEDIUM THREE POINTED BLACK STAR;So;0;ON;;;;;N;;;;; +1F7C2;THREE POINTED BLACK STAR;So;0;ON;;;;;N;;;;; +1F7C3;MEDIUM THREE POINTED PINWHEEL STAR;So;0;ON;;;;;N;;;;; +1F7C4;LIGHT FOUR POINTED BLACK STAR;So;0;ON;;;;;N;;;;; +1F7C5;MEDIUM FOUR POINTED BLACK STAR;So;0;ON;;;;;N;;;;; +1F7C6;FOUR POINTED BLACK STAR;So;0;ON;;;;;N;;;;; +1F7C7;MEDIUM FOUR POINTED PINWHEEL STAR;So;0;ON;;;;;N;;;;; +1F7C8;REVERSE LIGHT FOUR POINTED PINWHEEL STAR;So;0;ON;;;;;N;;;;; +1F7C9;LIGHT FIVE POINTED BLACK STAR;So;0;ON;;;;;N;;;;; +1F7CA;HEAVY FIVE POINTED BLACK STAR;So;0;ON;;;;;N;;;;; +1F7CB;MEDIUM SIX POINTED BLACK STAR;So;0;ON;;;;;N;;;;; +1F7CC;HEAVY SIX POINTED BLACK STAR;So;0;ON;;;;;N;;;;; +1F7CD;SIX POINTED PINWHEEL STAR;So;0;ON;;;;;N;;;;; +1F7CE;MEDIUM EIGHT POINTED BLACK STAR;So;0;ON;;;;;N;;;;; +1F7CF;HEAVY EIGHT POINTED BLACK STAR;So;0;ON;;;;;N;;;;; +1F7D0;VERY HEAVY EIGHT POINTED BLACK STAR;So;0;ON;;;;;N;;;;; +1F7D1;HEAVY EIGHT POINTED PINWHEEL STAR;So;0;ON;;;;;N;;;;; +1F7D2;LIGHT TWELVE POINTED BLACK STAR;So;0;ON;;;;;N;;;;; +1F7D3;HEAVY TWELVE POINTED BLACK STAR;So;0;ON;;;;;N;;;;; +1F7D4;HEAVY TWELVE POINTED PINWHEEL STAR;So;0;ON;;;;;N;;;;; +1F7D5;CIRCLED TRIANGLE;So;0;ON;;;;;N;;;;; +1F7D6;NEGATIVE CIRCLED TRIANGLE;So;0;ON;;;;;N;;;;; +1F7D7;CIRCLED SQUARE;So;0;ON;;;;;N;;;;; +1F7D8;NEGATIVE CIRCLED SQUARE;So;0;ON;;;;;N;;;;; +1F7D9;NINE POINTED WHITE STAR;So;0;ON;;;;;N;;;;; +1F7E0;LARGE ORANGE CIRCLE;So;0;ON;;;;;N;;;;; +1F7E1;LARGE YELLOW CIRCLE;So;0;ON;;;;;N;;;;; +1F7E2;LARGE GREEN CIRCLE;So;0;ON;;;;;N;;;;; +1F7E3;LARGE PURPLE CIRCLE;So;0;ON;;;;;N;;;;; +1F7E4;LARGE BROWN CIRCLE;So;0;ON;;;;;N;;;;; +1F7E5;LARGE RED SQUARE;So;0;ON;;;;;N;;;;; +1F7E6;LARGE BLUE SQUARE;So;0;ON;;;;;N;;;;; +1F7E7;LARGE ORANGE SQUARE;So;0;ON;;;;;N;;;;; +1F7E8;LARGE YELLOW SQUARE;So;0;ON;;;;;N;;;;; +1F7E9;LARGE GREEN SQUARE;So;0;ON;;;;;N;;;;; +1F7EA;LARGE PURPLE SQUARE;So;0;ON;;;;;N;;;;; +1F7EB;LARGE BROWN SQUARE;So;0;ON;;;;;N;;;;; +1F7F0;HEAVY EQUALS SIGN;So;0;ON;;;;;N;;;;; +1F800;LEFTWARDS ARROW WITH SMALL TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;; +1F801;UPWARDS ARROW WITH SMALL TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;; +1F802;RIGHTWARDS ARROW WITH SMALL TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;; +1F803;DOWNWARDS ARROW WITH SMALL TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;; +1F804;LEFTWARDS ARROW WITH MEDIUM TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;; +1F805;UPWARDS ARROW WITH MEDIUM TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;; +1F806;RIGHTWARDS ARROW WITH MEDIUM TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;; +1F807;DOWNWARDS ARROW WITH MEDIUM TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;; +1F808;LEFTWARDS ARROW WITH LARGE TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;; +1F809;UPWARDS ARROW WITH LARGE TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;; +1F80A;RIGHTWARDS ARROW WITH LARGE TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;; +1F80B;DOWNWARDS ARROW WITH LARGE TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;; +1F810;LEFTWARDS ARROW WITH SMALL EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;; +1F811;UPWARDS ARROW WITH SMALL EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;; +1F812;RIGHTWARDS ARROW WITH SMALL EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;; +1F813;DOWNWARDS ARROW WITH SMALL EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;; +1F814;LEFTWARDS ARROW WITH EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;; +1F815;UPWARDS ARROW WITH EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;; +1F816;RIGHTWARDS ARROW WITH EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;; +1F817;DOWNWARDS ARROW WITH EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;; +1F818;HEAVY LEFTWARDS ARROW WITH EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;; +1F819;HEAVY UPWARDS ARROW WITH EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;; +1F81A;HEAVY RIGHTWARDS ARROW WITH EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;; +1F81B;HEAVY DOWNWARDS ARROW WITH EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;; +1F81C;HEAVY LEFTWARDS ARROW WITH LARGE EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;; +1F81D;HEAVY UPWARDS ARROW WITH LARGE EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;; +1F81E;HEAVY RIGHTWARDS ARROW WITH LARGE EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;; +1F81F;HEAVY DOWNWARDS ARROW WITH LARGE EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;; +1F820;LEFTWARDS TRIANGLE-HEADED ARROW WITH NARROW SHAFT;So;0;ON;;;;;N;;;;; +1F821;UPWARDS TRIANGLE-HEADED ARROW WITH NARROW SHAFT;So;0;ON;;;;;N;;;;; +1F822;RIGHTWARDS TRIANGLE-HEADED ARROW WITH NARROW SHAFT;So;0;ON;;;;;N;;;;; +1F823;DOWNWARDS TRIANGLE-HEADED ARROW WITH NARROW SHAFT;So;0;ON;;;;;N;;;;; +1F824;LEFTWARDS TRIANGLE-HEADED ARROW WITH MEDIUM SHAFT;So;0;ON;;;;;N;;;;; +1F825;UPWARDS TRIANGLE-HEADED ARROW WITH MEDIUM SHAFT;So;0;ON;;;;;N;;;;; +1F826;RIGHTWARDS TRIANGLE-HEADED ARROW WITH MEDIUM SHAFT;So;0;ON;;;;;N;;;;; +1F827;DOWNWARDS TRIANGLE-HEADED ARROW WITH MEDIUM SHAFT;So;0;ON;;;;;N;;;;; +1F828;LEFTWARDS TRIANGLE-HEADED ARROW WITH BOLD SHAFT;So;0;ON;;;;;N;;;;; +1F829;UPWARDS TRIANGLE-HEADED ARROW WITH BOLD SHAFT;So;0;ON;;;;;N;;;;; +1F82A;RIGHTWARDS TRIANGLE-HEADED ARROW WITH BOLD SHAFT;So;0;ON;;;;;N;;;;; +1F82B;DOWNWARDS TRIANGLE-HEADED ARROW WITH BOLD SHAFT;So;0;ON;;;;;N;;;;; +1F82C;LEFTWARDS TRIANGLE-HEADED ARROW WITH HEAVY SHAFT;So;0;ON;;;;;N;;;;; +1F82D;UPWARDS TRIANGLE-HEADED ARROW WITH HEAVY SHAFT;So;0;ON;;;;;N;;;;; +1F82E;RIGHTWARDS TRIANGLE-HEADED ARROW WITH HEAVY SHAFT;So;0;ON;;;;;N;;;;; +1F82F;DOWNWARDS TRIANGLE-HEADED ARROW WITH HEAVY SHAFT;So;0;ON;;;;;N;;;;; +1F830;LEFTWARDS TRIANGLE-HEADED ARROW WITH VERY HEAVY SHAFT;So;0;ON;;;;;N;;;;; +1F831;UPWARDS TRIANGLE-HEADED ARROW WITH VERY HEAVY SHAFT;So;0;ON;;;;;N;;;;; +1F832;RIGHTWARDS TRIANGLE-HEADED ARROW WITH VERY HEAVY SHAFT;So;0;ON;;;;;N;;;;; +1F833;DOWNWARDS TRIANGLE-HEADED ARROW WITH VERY HEAVY SHAFT;So;0;ON;;;;;N;;;;; +1F834;LEFTWARDS FINGER-POST ARROW;So;0;ON;;;;;N;;;;; +1F835;UPWARDS FINGER-POST ARROW;So;0;ON;;;;;N;;;;; +1F836;RIGHTWARDS FINGER-POST ARROW;So;0;ON;;;;;N;;;;; +1F837;DOWNWARDS FINGER-POST ARROW;So;0;ON;;;;;N;;;;; +1F838;LEFTWARDS SQUARED ARROW;So;0;ON;;;;;N;;;;; +1F839;UPWARDS SQUARED ARROW;So;0;ON;;;;;N;;;;; +1F83A;RIGHTWARDS SQUARED ARROW;So;0;ON;;;;;N;;;;; +1F83B;DOWNWARDS SQUARED ARROW;So;0;ON;;;;;N;;;;; +1F83C;LEFTWARDS COMPRESSED ARROW;So;0;ON;;;;;N;;;;; +1F83D;UPWARDS COMPRESSED ARROW;So;0;ON;;;;;N;;;;; +1F83E;RIGHTWARDS COMPRESSED ARROW;So;0;ON;;;;;N;;;;; +1F83F;DOWNWARDS COMPRESSED ARROW;So;0;ON;;;;;N;;;;; +1F840;LEFTWARDS HEAVY COMPRESSED ARROW;So;0;ON;;;;;N;;;;; +1F841;UPWARDS HEAVY COMPRESSED ARROW;So;0;ON;;;;;N;;;;; +1F842;RIGHTWARDS HEAVY COMPRESSED ARROW;So;0;ON;;;;;N;;;;; +1F843;DOWNWARDS HEAVY COMPRESSED ARROW;So;0;ON;;;;;N;;;;; +1F844;LEFTWARDS HEAVY ARROW;So;0;ON;;;;;N;;;;; +1F845;UPWARDS HEAVY ARROW;So;0;ON;;;;;N;;;;; +1F846;RIGHTWARDS HEAVY ARROW;So;0;ON;;;;;N;;;;; +1F847;DOWNWARDS HEAVY ARROW;So;0;ON;;;;;N;;;;; +1F850;LEFTWARDS SANS-SERIF ARROW;So;0;ON;;;;;N;;;;; +1F851;UPWARDS SANS-SERIF ARROW;So;0;ON;;;;;N;;;;; +1F852;RIGHTWARDS SANS-SERIF ARROW;So;0;ON;;;;;N;;;;; +1F853;DOWNWARDS SANS-SERIF ARROW;So;0;ON;;;;;N;;;;; +1F854;NORTH WEST SANS-SERIF ARROW;So;0;ON;;;;;N;;;;; +1F855;NORTH EAST SANS-SERIF ARROW;So;0;ON;;;;;N;;;;; +1F856;SOUTH EAST SANS-SERIF ARROW;So;0;ON;;;;;N;;;;; +1F857;SOUTH WEST SANS-SERIF ARROW;So;0;ON;;;;;N;;;;; +1F858;LEFT RIGHT SANS-SERIF ARROW;So;0;ON;;;;;N;;;;; +1F859;UP DOWN SANS-SERIF ARROW;So;0;ON;;;;;N;;;;; +1F860;WIDE-HEADED LEFTWARDS LIGHT BARB ARROW;So;0;ON;;;;;N;;;;; +1F861;WIDE-HEADED UPWARDS LIGHT BARB ARROW;So;0;ON;;;;;N;;;;; +1F862;WIDE-HEADED RIGHTWARDS LIGHT BARB ARROW;So;0;ON;;;;;N;;;;; +1F863;WIDE-HEADED DOWNWARDS LIGHT BARB ARROW;So;0;ON;;;;;N;;;;; +1F864;WIDE-HEADED NORTH WEST LIGHT BARB ARROW;So;0;ON;;;;;N;;;;; +1F865;WIDE-HEADED NORTH EAST LIGHT BARB ARROW;So;0;ON;;;;;N;;;;; +1F866;WIDE-HEADED SOUTH EAST LIGHT BARB ARROW;So;0;ON;;;;;N;;;;; +1F867;WIDE-HEADED SOUTH WEST LIGHT BARB ARROW;So;0;ON;;;;;N;;;;; +1F868;WIDE-HEADED LEFTWARDS BARB ARROW;So;0;ON;;;;;N;;;;; +1F869;WIDE-HEADED UPWARDS BARB ARROW;So;0;ON;;;;;N;;;;; +1F86A;WIDE-HEADED RIGHTWARDS BARB ARROW;So;0;ON;;;;;N;;;;; +1F86B;WIDE-HEADED DOWNWARDS BARB ARROW;So;0;ON;;;;;N;;;;; +1F86C;WIDE-HEADED NORTH WEST BARB ARROW;So;0;ON;;;;;N;;;;; +1F86D;WIDE-HEADED NORTH EAST BARB ARROW;So;0;ON;;;;;N;;;;; +1F86E;WIDE-HEADED SOUTH EAST BARB ARROW;So;0;ON;;;;;N;;;;; +1F86F;WIDE-HEADED SOUTH WEST BARB ARROW;So;0;ON;;;;;N;;;;; +1F870;WIDE-HEADED LEFTWARDS MEDIUM BARB ARROW;So;0;ON;;;;;N;;;;; +1F871;WIDE-HEADED UPWARDS MEDIUM BARB ARROW;So;0;ON;;;;;N;;;;; +1F872;WIDE-HEADED RIGHTWARDS MEDIUM BARB ARROW;So;0;ON;;;;;N;;;;; +1F873;WIDE-HEADED DOWNWARDS MEDIUM BARB ARROW;So;0;ON;;;;;N;;;;; +1F874;WIDE-HEADED NORTH WEST MEDIUM BARB ARROW;So;0;ON;;;;;N;;;;; +1F875;WIDE-HEADED NORTH EAST MEDIUM BARB ARROW;So;0;ON;;;;;N;;;;; +1F876;WIDE-HEADED SOUTH EAST MEDIUM BARB ARROW;So;0;ON;;;;;N;;;;; +1F877;WIDE-HEADED SOUTH WEST MEDIUM BARB ARROW;So;0;ON;;;;;N;;;;; +1F878;WIDE-HEADED LEFTWARDS HEAVY BARB ARROW;So;0;ON;;;;;N;;;;; +1F879;WIDE-HEADED UPWARDS HEAVY BARB ARROW;So;0;ON;;;;;N;;;;; +1F87A;WIDE-HEADED RIGHTWARDS HEAVY BARB ARROW;So;0;ON;;;;;N;;;;; +1F87B;WIDE-HEADED DOWNWARDS HEAVY BARB ARROW;So;0;ON;;;;;N;;;;; +1F87C;WIDE-HEADED NORTH WEST HEAVY BARB ARROW;So;0;ON;;;;;N;;;;; +1F87D;WIDE-HEADED NORTH EAST HEAVY BARB ARROW;So;0;ON;;;;;N;;;;; +1F87E;WIDE-HEADED SOUTH EAST HEAVY BARB ARROW;So;0;ON;;;;;N;;;;; +1F87F;WIDE-HEADED SOUTH WEST HEAVY BARB ARROW;So;0;ON;;;;;N;;;;; +1F880;WIDE-HEADED LEFTWARDS VERY HEAVY BARB ARROW;So;0;ON;;;;;N;;;;; +1F881;WIDE-HEADED UPWARDS VERY HEAVY BARB ARROW;So;0;ON;;;;;N;;;;; +1F882;WIDE-HEADED RIGHTWARDS VERY HEAVY BARB ARROW;So;0;ON;;;;;N;;;;; +1F883;WIDE-HEADED DOWNWARDS VERY HEAVY BARB ARROW;So;0;ON;;;;;N;;;;; +1F884;WIDE-HEADED NORTH WEST VERY HEAVY BARB ARROW;So;0;ON;;;;;N;;;;; +1F885;WIDE-HEADED NORTH EAST VERY HEAVY BARB ARROW;So;0;ON;;;;;N;;;;; +1F886;WIDE-HEADED SOUTH EAST VERY HEAVY BARB ARROW;So;0;ON;;;;;N;;;;; +1F887;WIDE-HEADED SOUTH WEST VERY HEAVY BARB ARROW;So;0;ON;;;;;N;;;;; +1F890;LEFTWARDS TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;; +1F891;UPWARDS TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;; +1F892;RIGHTWARDS TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;; +1F893;DOWNWARDS TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;; +1F894;LEFTWARDS WHITE ARROW WITHIN TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;; +1F895;UPWARDS WHITE ARROW WITHIN TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;; +1F896;RIGHTWARDS WHITE ARROW WITHIN TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;; +1F897;DOWNWARDS WHITE ARROW WITHIN TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;; +1F898;LEFTWARDS ARROW WITH NOTCHED TAIL;So;0;ON;;;;;N;;;;; +1F899;UPWARDS ARROW WITH NOTCHED TAIL;So;0;ON;;;;;N;;;;; +1F89A;RIGHTWARDS ARROW WITH NOTCHED TAIL;So;0;ON;;;;;N;;;;; +1F89B;DOWNWARDS ARROW WITH NOTCHED TAIL;So;0;ON;;;;;N;;;;; +1F89C;HEAVY ARROW SHAFT WIDTH ONE;So;0;ON;;;;;N;;;;; +1F89D;HEAVY ARROW SHAFT WIDTH TWO THIRDS;So;0;ON;;;;;N;;;;; +1F89E;HEAVY ARROW SHAFT WIDTH ONE HALF;So;0;ON;;;;;N;;;;; +1F89F;HEAVY ARROW SHAFT WIDTH ONE THIRD;So;0;ON;;;;;N;;;;; +1F8A0;LEFTWARDS BOTTOM-SHADED WHITE ARROW;So;0;ON;;;;;N;;;;; +1F8A1;RIGHTWARDS BOTTOM SHADED WHITE ARROW;So;0;ON;;;;;N;;;;; +1F8A2;LEFTWARDS TOP SHADED WHITE ARROW;So;0;ON;;;;;N;;;;; +1F8A3;RIGHTWARDS TOP SHADED WHITE ARROW;So;0;ON;;;;;N;;;;; +1F8A4;LEFTWARDS LEFT-SHADED WHITE ARROW;So;0;ON;;;;;N;;;;; +1F8A5;RIGHTWARDS RIGHT-SHADED WHITE ARROW;So;0;ON;;;;;N;;;;; +1F8A6;LEFTWARDS RIGHT-SHADED WHITE ARROW;So;0;ON;;;;;N;;;;; +1F8A7;RIGHTWARDS LEFT-SHADED WHITE ARROW;So;0;ON;;;;;N;;;;; +1F8A8;LEFTWARDS BACK-TILTED SHADOWED WHITE ARROW;So;0;ON;;;;;N;;;;; +1F8A9;RIGHTWARDS BACK-TILTED SHADOWED WHITE ARROW;So;0;ON;;;;;N;;;;; +1F8AA;LEFTWARDS FRONT-TILTED SHADOWED WHITE ARROW;So;0;ON;;;;;N;;;;; +1F8AB;RIGHTWARDS FRONT-TILTED SHADOWED WHITE ARROW;So;0;ON;;;;;N;;;;; +1F8AC;WHITE ARROW SHAFT WIDTH ONE;So;0;ON;;;;;N;;;;; +1F8AD;WHITE ARROW SHAFT WIDTH TWO THIRDS;So;0;ON;;;;;N;;;;; +1F8B0;ARROW POINTING UPWARDS THEN NORTH WEST;So;0;ON;;;;;N;;;;; +1F8B1;ARROW POINTING RIGHTWARDS THEN CURVING SOUTH WEST;So;0;ON;;;;;N;;;;; +1F8B2;RIGHTWARDS ARROW WITH LOWER HOOK;So;0;ON;;;;;N;;;;; +1F8B3;DOWNWARDS BLACK ARROW TO BAR;So;0;ON;;;;;N;;;;; +1F8B4;NEGATIVE SQUARED LEFTWARDS ARROW;So;0;ON;;;;;N;;;;; +1F8B5;NEGATIVE SQUARED UPWARDS ARROW;So;0;ON;;;;;N;;;;; +1F8B6;NEGATIVE SQUARED RIGHTWARDS ARROW;So;0;ON;;;;;N;;;;; +1F8B7;NEGATIVE SQUARED DOWNWARDS ARROW;So;0;ON;;;;;N;;;;; +1F8B8;NORTH WEST ARROW FROM BAR;So;0;ON;;;;;N;;;;; +1F8B9;NORTH EAST ARROW FROM BAR;So;0;ON;;;;;N;;;;; +1F8BA;SOUTH EAST ARROW FROM BAR;So;0;ON;;;;;N;;;;; +1F8BB;SOUTH WEST ARROW FROM BAR;So;0;ON;;;;;N;;;;; +1F8C0;LEFTWARDS ARROW FROM DOWNWARDS ARROW;So;0;ON;;;;;N;;;;; +1F8C1;RIGHTWARDS ARROW FROM DOWNWARDS ARROW;So;0;ON;;;;;N;;;;; +1F8D0;LONG RIGHTWARDS ARROW OVER LONG LEFTWARDS ARROW;Sm;0;ON;;;;;N;;;;; +1F8D1;LONG RIGHTWARDS HARPOON OVER LONG LEFTWARDS HARPOON;Sm;0;ON;;;;;N;;;;; +1F8D2;LONG RIGHTWARDS HARPOON ABOVE SHORT LEFTWARDS HARPOON;Sm;0;ON;;;;;N;;;;; +1F8D3;SHORT RIGHTWARDS HARPOON ABOVE LONG LEFTWARDS HARPOON;Sm;0;ON;;;;;N;;;;; +1F8D4;LONG LEFTWARDS HARPOON ABOVE SHORT RIGHTWARDS HARPOON;Sm;0;ON;;;;;N;;;;; +1F8D5;SHORT LEFTWARDS HARPOON ABOVE LONG RIGHTWARDS HARPOON;Sm;0;ON;;;;;N;;;;; +1F8D6;LONG RIGHTWARDS ARROW THROUGH X;Sm;0;ON;;;;;N;;;;; +1F8D7;LONG RIGHTWARDS ARROW WITH DOUBLE SLASH;Sm;0;ON;;;;;N;;;;; +1F8D8;LONG LEFT RIGHT ARROW WITH DEPENDENT LOBE;Sm;0;ON;;;;;N;;;;; +1F900;CIRCLED CROSS FORMEE WITH FOUR DOTS;So;0;ON;;;;;N;;;;; +1F901;CIRCLED CROSS FORMEE WITH TWO DOTS;So;0;ON;;;;;N;;;;; +1F902;CIRCLED CROSS FORMEE;So;0;ON;;;;;N;;;;; +1F903;LEFT HALF CIRCLE WITH FOUR DOTS;So;0;ON;;;;;N;;;;; +1F904;LEFT HALF CIRCLE WITH THREE DOTS;So;0;ON;;;;;N;;;;; +1F905;LEFT HALF CIRCLE WITH TWO DOTS;So;0;ON;;;;;N;;;;; +1F906;LEFT HALF CIRCLE WITH DOT;So;0;ON;;;;;N;;;;; +1F907;LEFT HALF CIRCLE;So;0;ON;;;;;N;;;;; +1F908;DOWNWARD FACING HOOK;So;0;ON;;;;;N;;;;; +1F909;DOWNWARD FACING NOTCHED HOOK;So;0;ON;;;;;N;;;;; +1F90A;DOWNWARD FACING HOOK WITH DOT;So;0;ON;;;;;N;;;;; +1F90B;DOWNWARD FACING NOTCHED HOOK WITH DOT;So;0;ON;;;;;N;;;;; +1F90C;PINCHED FINGERS;So;0;ON;;;;;N;;;;; +1F90D;WHITE HEART;So;0;ON;;;;;N;;;;; +1F90E;BROWN HEART;So;0;ON;;;;;N;;;;; +1F90F;PINCHING HAND;So;0;ON;;;;;N;;;;; +1F910;ZIPPER-MOUTH FACE;So;0;ON;;;;;N;;;;; +1F911;MONEY-MOUTH FACE;So;0;ON;;;;;N;;;;; +1F912;FACE WITH THERMOMETER;So;0;ON;;;;;N;;;;; +1F913;NERD FACE;So;0;ON;;;;;N;;;;; +1F914;THINKING FACE;So;0;ON;;;;;N;;;;; +1F915;FACE WITH HEAD-BANDAGE;So;0;ON;;;;;N;;;;; +1F916;ROBOT FACE;So;0;ON;;;;;N;;;;; +1F917;HUGGING FACE;So;0;ON;;;;;N;;;;; +1F918;SIGN OF THE HORNS;So;0;ON;;;;;N;;;;; +1F919;CALL ME HAND;So;0;ON;;;;;N;;;;; +1F91A;RAISED BACK OF HAND;So;0;ON;;;;;N;;;;; +1F91B;LEFT-FACING FIST;So;0;ON;;;;;N;;;;; +1F91C;RIGHT-FACING FIST;So;0;ON;;;;;N;;;;; +1F91D;HANDSHAKE;So;0;ON;;;;;N;;;;; +1F91E;HAND WITH INDEX AND MIDDLE FINGERS CROSSED;So;0;ON;;;;;N;;;;; +1F91F;I LOVE YOU HAND SIGN;So;0;ON;;;;;N;;;;; +1F920;FACE WITH COWBOY HAT;So;0;ON;;;;;N;;;;; +1F921;CLOWN FACE;So;0;ON;;;;;N;;;;; +1F922;NAUSEATED FACE;So;0;ON;;;;;N;;;;; +1F923;ROLLING ON THE FLOOR LAUGHING;So;0;ON;;;;;N;;;;; +1F924;DROOLING FACE;So;0;ON;;;;;N;;;;; +1F925;LYING FACE;So;0;ON;;;;;N;;;;; +1F926;FACE PALM;So;0;ON;;;;;N;;;;; +1F927;SNEEZING FACE;So;0;ON;;;;;N;;;;; +1F928;FACE WITH ONE EYEBROW RAISED;So;0;ON;;;;;N;;;;; +1F929;GRINNING FACE WITH STAR EYES;So;0;ON;;;;;N;;;;; +1F92A;GRINNING FACE WITH ONE LARGE AND ONE SMALL EYE;So;0;ON;;;;;N;;;;; +1F92B;FACE WITH FINGER COVERING CLOSED LIPS;So;0;ON;;;;;N;;;;; +1F92C;SERIOUS FACE WITH SYMBOLS COVERING MOUTH;So;0;ON;;;;;N;;;;; +1F92D;SMILING FACE WITH SMILING EYES AND HAND COVERING MOUTH;So;0;ON;;;;;N;;;;; +1F92E;FACE WITH OPEN MOUTH VOMITING;So;0;ON;;;;;N;;;;; +1F92F;SHOCKED FACE WITH EXPLODING HEAD;So;0;ON;;;;;N;;;;; +1F930;PREGNANT WOMAN;So;0;ON;;;;;N;;;;; +1F931;BREAST-FEEDING;So;0;ON;;;;;N;;;;; +1F932;PALMS UP TOGETHER;So;0;ON;;;;;N;;;;; +1F933;SELFIE;So;0;ON;;;;;N;;;;; +1F934;PRINCE;So;0;ON;;;;;N;;;;; +1F935;MAN IN TUXEDO;So;0;ON;;;;;N;;;;; +1F936;MOTHER CHRISTMAS;So;0;ON;;;;;N;;;;; +1F937;SHRUG;So;0;ON;;;;;N;;;;; +1F938;PERSON DOING CARTWHEEL;So;0;ON;;;;;N;;;;; +1F939;JUGGLING;So;0;ON;;;;;N;;;;; +1F93A;FENCER;So;0;ON;;;;;N;;;;; +1F93B;MODERN PENTATHLON;So;0;ON;;;;;N;;;;; +1F93C;WRESTLERS;So;0;ON;;;;;N;;;;; +1F93D;WATER POLO;So;0;ON;;;;;N;;;;; +1F93E;HANDBALL;So;0;ON;;;;;N;;;;; +1F93F;DIVING MASK;So;0;ON;;;;;N;;;;; +1F940;WILTED FLOWER;So;0;ON;;;;;N;;;;; +1F941;DRUM WITH DRUMSTICKS;So;0;ON;;;;;N;;;;; +1F942;CLINKING GLASSES;So;0;ON;;;;;N;;;;; +1F943;TUMBLER GLASS;So;0;ON;;;;;N;;;;; +1F944;SPOON;So;0;ON;;;;;N;;;;; +1F945;GOAL NET;So;0;ON;;;;;N;;;;; +1F946;RIFLE;So;0;ON;;;;;N;;;;; +1F947;FIRST PLACE MEDAL;So;0;ON;;;;;N;;;;; +1F948;SECOND PLACE MEDAL;So;0;ON;;;;;N;;;;; +1F949;THIRD PLACE MEDAL;So;0;ON;;;;;N;;;;; +1F94A;BOXING GLOVE;So;0;ON;;;;;N;;;;; +1F94B;MARTIAL ARTS UNIFORM;So;0;ON;;;;;N;;;;; +1F94C;CURLING STONE;So;0;ON;;;;;N;;;;; +1F94D;LACROSSE STICK AND BALL;So;0;ON;;;;;N;;;;; +1F94E;SOFTBALL;So;0;ON;;;;;N;;;;; +1F94F;FLYING DISC;So;0;ON;;;;;N;;;;; +1F950;CROISSANT;So;0;ON;;;;;N;;;;; +1F951;AVOCADO;So;0;ON;;;;;N;;;;; +1F952;CUCUMBER;So;0;ON;;;;;N;;;;; +1F953;BACON;So;0;ON;;;;;N;;;;; +1F954;POTATO;So;0;ON;;;;;N;;;;; +1F955;CARROT;So;0;ON;;;;;N;;;;; +1F956;BAGUETTE BREAD;So;0;ON;;;;;N;;;;; +1F957;GREEN SALAD;So;0;ON;;;;;N;;;;; +1F958;SHALLOW PAN OF FOOD;So;0;ON;;;;;N;;;;; +1F959;STUFFED FLATBREAD;So;0;ON;;;;;N;;;;; +1F95A;EGG;So;0;ON;;;;;N;;;;; +1F95B;GLASS OF MILK;So;0;ON;;;;;N;;;;; +1F95C;PEANUTS;So;0;ON;;;;;N;;;;; +1F95D;KIWIFRUIT;So;0;ON;;;;;N;;;;; +1F95E;PANCAKES;So;0;ON;;;;;N;;;;; +1F95F;DUMPLING;So;0;ON;;;;;N;;;;; +1F960;FORTUNE COOKIE;So;0;ON;;;;;N;;;;; +1F961;TAKEOUT BOX;So;0;ON;;;;;N;;;;; +1F962;CHOPSTICKS;So;0;ON;;;;;N;;;;; +1F963;BOWL WITH SPOON;So;0;ON;;;;;N;;;;; +1F964;CUP WITH STRAW;So;0;ON;;;;;N;;;;; +1F965;COCONUT;So;0;ON;;;;;N;;;;; +1F966;BROCCOLI;So;0;ON;;;;;N;;;;; +1F967;PIE;So;0;ON;;;;;N;;;;; +1F968;PRETZEL;So;0;ON;;;;;N;;;;; +1F969;CUT OF MEAT;So;0;ON;;;;;N;;;;; +1F96A;SANDWICH;So;0;ON;;;;;N;;;;; +1F96B;CANNED FOOD;So;0;ON;;;;;N;;;;; +1F96C;LEAFY GREEN;So;0;ON;;;;;N;;;;; +1F96D;MANGO;So;0;ON;;;;;N;;;;; +1F96E;MOON CAKE;So;0;ON;;;;;N;;;;; +1F96F;BAGEL;So;0;ON;;;;;N;;;;; +1F970;SMILING FACE WITH SMILING EYES AND THREE HEARTS;So;0;ON;;;;;N;;;;; +1F971;YAWNING FACE;So;0;ON;;;;;N;;;;; +1F972;SMILING FACE WITH TEAR;So;0;ON;;;;;N;;;;; +1F973;FACE WITH PARTY HORN AND PARTY HAT;So;0;ON;;;;;N;;;;; +1F974;FACE WITH UNEVEN EYES AND WAVY MOUTH;So;0;ON;;;;;N;;;;; +1F975;OVERHEATED FACE;So;0;ON;;;;;N;;;;; +1F976;FREEZING FACE;So;0;ON;;;;;N;;;;; +1F977;NINJA;So;0;ON;;;;;N;;;;; +1F978;DISGUISED FACE;So;0;ON;;;;;N;;;;; +1F979;FACE HOLDING BACK TEARS;So;0;ON;;;;;N;;;;; +1F97A;FACE WITH PLEADING EYES;So;0;ON;;;;;N;;;;; +1F97B;SARI;So;0;ON;;;;;N;;;;; +1F97C;LAB COAT;So;0;ON;;;;;N;;;;; +1F97D;GOGGLES;So;0;ON;;;;;N;;;;; +1F97E;HIKING BOOT;So;0;ON;;;;;N;;;;; +1F97F;FLAT SHOE;So;0;ON;;;;;N;;;;; +1F980;CRAB;So;0;ON;;;;;N;;;;; +1F981;LION FACE;So;0;ON;;;;;N;;;;; +1F982;SCORPION;So;0;ON;;;;;N;;;;; +1F983;TURKEY;So;0;ON;;;;;N;;;;; +1F984;UNICORN FACE;So;0;ON;;;;;N;;;;; +1F985;EAGLE;So;0;ON;;;;;N;;;;; +1F986;DUCK;So;0;ON;;;;;N;;;;; +1F987;BAT;So;0;ON;;;;;N;;;;; +1F988;SHARK;So;0;ON;;;;;N;;;;; +1F989;OWL;So;0;ON;;;;;N;;;;; +1F98A;FOX FACE;So;0;ON;;;;;N;;;;; +1F98B;BUTTERFLY;So;0;ON;;;;;N;;;;; +1F98C;DEER;So;0;ON;;;;;N;;;;; +1F98D;GORILLA;So;0;ON;;;;;N;;;;; +1F98E;LIZARD;So;0;ON;;;;;N;;;;; +1F98F;RHINOCEROS;So;0;ON;;;;;N;;;;; +1F990;SHRIMP;So;0;ON;;;;;N;;;;; +1F991;SQUID;So;0;ON;;;;;N;;;;; +1F992;GIRAFFE FACE;So;0;ON;;;;;N;;;;; +1F993;ZEBRA FACE;So;0;ON;;;;;N;;;;; +1F994;HEDGEHOG;So;0;ON;;;;;N;;;;; +1F995;SAUROPOD;So;0;ON;;;;;N;;;;; +1F996;T-REX;So;0;ON;;;;;N;;;;; +1F997;CRICKET;So;0;ON;;;;;N;;;;; +1F998;KANGAROO;So;0;ON;;;;;N;;;;; +1F999;LLAMA;So;0;ON;;;;;N;;;;; +1F99A;PEACOCK;So;0;ON;;;;;N;;;;; +1F99B;HIPPOPOTAMUS;So;0;ON;;;;;N;;;;; +1F99C;PARROT;So;0;ON;;;;;N;;;;; +1F99D;RACCOON;So;0;ON;;;;;N;;;;; +1F99E;LOBSTER;So;0;ON;;;;;N;;;;; +1F99F;MOSQUITO;So;0;ON;;;;;N;;;;; +1F9A0;MICROBE;So;0;ON;;;;;N;;;;; +1F9A1;BADGER;So;0;ON;;;;;N;;;;; +1F9A2;SWAN;So;0;ON;;;;;N;;;;; +1F9A3;MAMMOTH;So;0;ON;;;;;N;;;;; +1F9A4;DODO;So;0;ON;;;;;N;;;;; +1F9A5;SLOTH;So;0;ON;;;;;N;;;;; +1F9A6;OTTER;So;0;ON;;;;;N;;;;; +1F9A7;ORANGUTAN;So;0;ON;;;;;N;;;;; +1F9A8;SKUNK;So;0;ON;;;;;N;;;;; +1F9A9;FLAMINGO;So;0;ON;;;;;N;;;;; +1F9AA;OYSTER;So;0;ON;;;;;N;;;;; +1F9AB;BEAVER;So;0;ON;;;;;N;;;;; +1F9AC;BISON;So;0;ON;;;;;N;;;;; +1F9AD;SEAL;So;0;ON;;;;;N;;;;; +1F9AE;GUIDE DOG;So;0;ON;;;;;N;;;;; +1F9AF;PROBING CANE;So;0;ON;;;;;N;;;;; +1F9B0;EMOJI COMPONENT RED HAIR;So;0;ON;;;;;N;;;;; +1F9B1;EMOJI COMPONENT CURLY HAIR;So;0;ON;;;;;N;;;;; +1F9B2;EMOJI COMPONENT BALD;So;0;ON;;;;;N;;;;; +1F9B3;EMOJI COMPONENT WHITE HAIR;So;0;ON;;;;;N;;;;; +1F9B4;BONE;So;0;ON;;;;;N;;;;; +1F9B5;LEG;So;0;ON;;;;;N;;;;; +1F9B6;FOOT;So;0;ON;;;;;N;;;;; +1F9B7;TOOTH;So;0;ON;;;;;N;;;;; +1F9B8;SUPERHERO;So;0;ON;;;;;N;;;;; +1F9B9;SUPERVILLAIN;So;0;ON;;;;;N;;;;; +1F9BA;SAFETY VEST;So;0;ON;;;;;N;;;;; +1F9BB;EAR WITH HEARING AID;So;0;ON;;;;;N;;;;; +1F9BC;MOTORIZED WHEELCHAIR;So;0;ON;;;;;N;;;;; +1F9BD;MANUAL WHEELCHAIR;So;0;ON;;;;;N;;;;; +1F9BE;MECHANICAL ARM;So;0;ON;;;;;N;;;;; +1F9BF;MECHANICAL LEG;So;0;ON;;;;;N;;;;; +1F9C0;CHEESE WEDGE;So;0;ON;;;;;N;;;;; +1F9C1;CUPCAKE;So;0;ON;;;;;N;;;;; +1F9C2;SALT SHAKER;So;0;ON;;;;;N;;;;; +1F9C3;BEVERAGE BOX;So;0;ON;;;;;N;;;;; +1F9C4;GARLIC;So;0;ON;;;;;N;;;;; +1F9C5;ONION;So;0;ON;;;;;N;;;;; +1F9C6;FALAFEL;So;0;ON;;;;;N;;;;; +1F9C7;WAFFLE;So;0;ON;;;;;N;;;;; +1F9C8;BUTTER;So;0;ON;;;;;N;;;;; +1F9C9;MATE DRINK;So;0;ON;;;;;N;;;;; +1F9CA;ICE CUBE;So;0;ON;;;;;N;;;;; +1F9CB;BUBBLE TEA;So;0;ON;;;;;N;;;;; +1F9CC;TROLL;So;0;ON;;;;;N;;;;; +1F9CD;STANDING PERSON;So;0;ON;;;;;N;;;;; +1F9CE;KNEELING PERSON;So;0;ON;;;;;N;;;;; +1F9CF;DEAF PERSON;So;0;ON;;;;;N;;;;; +1F9D0;FACE WITH MONOCLE;So;0;ON;;;;;N;;;;; +1F9D1;ADULT;So;0;ON;;;;;N;;;;; +1F9D2;CHILD;So;0;ON;;;;;N;;;;; +1F9D3;OLDER ADULT;So;0;ON;;;;;N;;;;; +1F9D4;BEARDED PERSON;So;0;ON;;;;;N;;;;; +1F9D5;PERSON WITH HEADSCARF;So;0;ON;;;;;N;;;;; +1F9D6;PERSON IN STEAMY ROOM;So;0;ON;;;;;N;;;;; +1F9D7;PERSON CLIMBING;So;0;ON;;;;;N;;;;; +1F9D8;PERSON IN LOTUS POSITION;So;0;ON;;;;;N;;;;; +1F9D9;MAGE;So;0;ON;;;;;N;;;;; +1F9DA;FAIRY;So;0;ON;;;;;N;;;;; +1F9DB;VAMPIRE;So;0;ON;;;;;N;;;;; +1F9DC;MERPERSON;So;0;ON;;;;;N;;;;; +1F9DD;ELF;So;0;ON;;;;;N;;;;; +1F9DE;GENIE;So;0;ON;;;;;N;;;;; +1F9DF;ZOMBIE;So;0;ON;;;;;N;;;;; +1F9E0;BRAIN;So;0;ON;;;;;N;;;;; +1F9E1;ORANGE HEART;So;0;ON;;;;;N;;;;; +1F9E2;BILLED CAP;So;0;ON;;;;;N;;;;; +1F9E3;SCARF;So;0;ON;;;;;N;;;;; +1F9E4;GLOVES;So;0;ON;;;;;N;;;;; +1F9E5;COAT;So;0;ON;;;;;N;;;;; +1F9E6;SOCKS;So;0;ON;;;;;N;;;;; +1F9E7;RED GIFT ENVELOPE;So;0;ON;;;;;N;;;;; +1F9E8;FIRECRACKER;So;0;ON;;;;;N;;;;; +1F9E9;JIGSAW PUZZLE PIECE;So;0;ON;;;;;N;;;;; +1F9EA;TEST TUBE;So;0;ON;;;;;N;;;;; +1F9EB;PETRI DISH;So;0;ON;;;;;N;;;;; +1F9EC;DNA DOUBLE HELIX;So;0;ON;;;;;N;;;;; +1F9ED;COMPASS;So;0;ON;;;;;N;;;;; +1F9EE;ABACUS;So;0;ON;;;;;N;;;;; +1F9EF;FIRE EXTINGUISHER;So;0;ON;;;;;N;;;;; +1F9F0;TOOLBOX;So;0;ON;;;;;N;;;;; +1F9F1;BRICK;So;0;ON;;;;;N;;;;; +1F9F2;MAGNET;So;0;ON;;;;;N;;;;; +1F9F3;LUGGAGE;So;0;ON;;;;;N;;;;; +1F9F4;LOTION BOTTLE;So;0;ON;;;;;N;;;;; +1F9F5;SPOOL OF THREAD;So;0;ON;;;;;N;;;;; +1F9F6;BALL OF YARN;So;0;ON;;;;;N;;;;; +1F9F7;SAFETY PIN;So;0;ON;;;;;N;;;;; +1F9F8;TEDDY BEAR;So;0;ON;;;;;N;;;;; +1F9F9;BROOM;So;0;ON;;;;;N;;;;; +1F9FA;BASKET;So;0;ON;;;;;N;;;;; +1F9FB;ROLL OF PAPER;So;0;ON;;;;;N;;;;; +1F9FC;BAR OF SOAP;So;0;ON;;;;;N;;;;; +1F9FD;SPONGE;So;0;ON;;;;;N;;;;; +1F9FE;RECEIPT;So;0;ON;;;;;N;;;;; +1F9FF;NAZAR AMULET;So;0;ON;;;;;N;;;;; +1FA00;NEUTRAL CHESS KING;So;0;ON;;;;;N;;;;; +1FA01;NEUTRAL CHESS QUEEN;So;0;ON;;;;;N;;;;; +1FA02;NEUTRAL CHESS ROOK;So;0;ON;;;;;N;;;;; +1FA03;NEUTRAL CHESS BISHOP;So;0;ON;;;;;N;;;;; +1FA04;NEUTRAL CHESS KNIGHT;So;0;ON;;;;;N;;;;; +1FA05;NEUTRAL CHESS PAWN;So;0;ON;;;;;N;;;;; +1FA06;WHITE CHESS KNIGHT ROTATED FORTY-FIVE DEGREES;So;0;ON;;;;;N;;;;; +1FA07;BLACK CHESS KNIGHT ROTATED FORTY-FIVE DEGREES;So;0;ON;;;;;N;;;;; +1FA08;NEUTRAL CHESS KNIGHT ROTATED FORTY-FIVE DEGREES;So;0;ON;;;;;N;;;;; +1FA09;WHITE CHESS KING ROTATED NINETY DEGREES;So;0;ON;;;;;N;;;;; +1FA0A;WHITE CHESS QUEEN ROTATED NINETY DEGREES;So;0;ON;;;;;N;;;;; +1FA0B;WHITE CHESS ROOK ROTATED NINETY DEGREES;So;0;ON;;;;;N;;;;; +1FA0C;WHITE CHESS BISHOP ROTATED NINETY DEGREES;So;0;ON;;;;;N;;;;; +1FA0D;WHITE CHESS KNIGHT ROTATED NINETY DEGREES;So;0;ON;;;;;N;;;;; +1FA0E;WHITE CHESS PAWN ROTATED NINETY DEGREES;So;0;ON;;;;;N;;;;; +1FA0F;BLACK CHESS KING ROTATED NINETY DEGREES;So;0;ON;;;;;N;;;;; +1FA10;BLACK CHESS QUEEN ROTATED NINETY DEGREES;So;0;ON;;;;;N;;;;; +1FA11;BLACK CHESS ROOK ROTATED NINETY DEGREES;So;0;ON;;;;;N;;;;; +1FA12;BLACK CHESS BISHOP ROTATED NINETY DEGREES;So;0;ON;;;;;N;;;;; +1FA13;BLACK CHESS KNIGHT ROTATED NINETY DEGREES;So;0;ON;;;;;N;;;;; +1FA14;BLACK CHESS PAWN ROTATED NINETY DEGREES;So;0;ON;;;;;N;;;;; +1FA15;NEUTRAL CHESS KING ROTATED NINETY DEGREES;So;0;ON;;;;;N;;;;; +1FA16;NEUTRAL CHESS QUEEN ROTATED NINETY DEGREES;So;0;ON;;;;;N;;;;; +1FA17;NEUTRAL CHESS ROOK ROTATED NINETY DEGREES;So;0;ON;;;;;N;;;;; +1FA18;NEUTRAL CHESS BISHOP ROTATED NINETY DEGREES;So;0;ON;;;;;N;;;;; +1FA19;NEUTRAL CHESS KNIGHT ROTATED NINETY DEGREES;So;0;ON;;;;;N;;;;; +1FA1A;NEUTRAL CHESS PAWN ROTATED NINETY DEGREES;So;0;ON;;;;;N;;;;; +1FA1B;WHITE CHESS KNIGHT ROTATED ONE HUNDRED THIRTY-FIVE DEGREES;So;0;ON;;;;;N;;;;; +1FA1C;BLACK CHESS KNIGHT ROTATED ONE HUNDRED THIRTY-FIVE DEGREES;So;0;ON;;;;;N;;;;; +1FA1D;NEUTRAL CHESS KNIGHT ROTATED ONE HUNDRED THIRTY-FIVE DEGREES;So;0;ON;;;;;N;;;;; +1FA1E;WHITE CHESS TURNED KING;So;0;ON;;;;;N;;;;; +1FA1F;WHITE CHESS TURNED QUEEN;So;0;ON;;;;;N;;;;; +1FA20;WHITE CHESS TURNED ROOK;So;0;ON;;;;;N;;;;; +1FA21;WHITE CHESS TURNED BISHOP;So;0;ON;;;;;N;;;;; +1FA22;WHITE CHESS TURNED KNIGHT;So;0;ON;;;;;N;;;;; +1FA23;WHITE CHESS TURNED PAWN;So;0;ON;;;;;N;;;;; +1FA24;BLACK CHESS TURNED KING;So;0;ON;;;;;N;;;;; +1FA25;BLACK CHESS TURNED QUEEN;So;0;ON;;;;;N;;;;; +1FA26;BLACK CHESS TURNED ROOK;So;0;ON;;;;;N;;;;; +1FA27;BLACK CHESS TURNED BISHOP;So;0;ON;;;;;N;;;;; +1FA28;BLACK CHESS TURNED KNIGHT;So;0;ON;;;;;N;;;;; +1FA29;BLACK CHESS TURNED PAWN;So;0;ON;;;;;N;;;;; +1FA2A;NEUTRAL CHESS TURNED KING;So;0;ON;;;;;N;;;;; +1FA2B;NEUTRAL CHESS TURNED QUEEN;So;0;ON;;;;;N;;;;; +1FA2C;NEUTRAL CHESS TURNED ROOK;So;0;ON;;;;;N;;;;; +1FA2D;NEUTRAL CHESS TURNED BISHOP;So;0;ON;;;;;N;;;;; +1FA2E;NEUTRAL CHESS TURNED KNIGHT;So;0;ON;;;;;N;;;;; +1FA2F;NEUTRAL CHESS TURNED PAWN;So;0;ON;;;;;N;;;;; +1FA30;WHITE CHESS KNIGHT ROTATED TWO HUNDRED TWENTY-FIVE DEGREES;So;0;ON;;;;;N;;;;; +1FA31;BLACK CHESS KNIGHT ROTATED TWO HUNDRED TWENTY-FIVE DEGREES;So;0;ON;;;;;N;;;;; +1FA32;NEUTRAL CHESS KNIGHT ROTATED TWO HUNDRED TWENTY-FIVE DEGREES;So;0;ON;;;;;N;;;;; +1FA33;WHITE CHESS KING ROTATED TWO HUNDRED SEVENTY DEGREES;So;0;ON;;;;;N;;;;; +1FA34;WHITE CHESS QUEEN ROTATED TWO HUNDRED SEVENTY DEGREES;So;0;ON;;;;;N;;;;; +1FA35;WHITE CHESS ROOK ROTATED TWO HUNDRED SEVENTY DEGREES;So;0;ON;;;;;N;;;;; +1FA36;WHITE CHESS BISHOP ROTATED TWO HUNDRED SEVENTY DEGREES;So;0;ON;;;;;N;;;;; +1FA37;WHITE CHESS KNIGHT ROTATED TWO HUNDRED SEVENTY DEGREES;So;0;ON;;;;;N;;;;; +1FA38;WHITE CHESS PAWN ROTATED TWO HUNDRED SEVENTY DEGREES;So;0;ON;;;;;N;;;;; +1FA39;BLACK CHESS KING ROTATED TWO HUNDRED SEVENTY DEGREES;So;0;ON;;;;;N;;;;; +1FA3A;BLACK CHESS QUEEN ROTATED TWO HUNDRED SEVENTY DEGREES;So;0;ON;;;;;N;;;;; +1FA3B;BLACK CHESS ROOK ROTATED TWO HUNDRED SEVENTY DEGREES;So;0;ON;;;;;N;;;;; +1FA3C;BLACK CHESS BISHOP ROTATED TWO HUNDRED SEVENTY DEGREES;So;0;ON;;;;;N;;;;; +1FA3D;BLACK CHESS KNIGHT ROTATED TWO HUNDRED SEVENTY DEGREES;So;0;ON;;;;;N;;;;; +1FA3E;BLACK CHESS PAWN ROTATED TWO HUNDRED SEVENTY DEGREES;So;0;ON;;;;;N;;;;; +1FA3F;NEUTRAL CHESS KING ROTATED TWO HUNDRED SEVENTY DEGREES;So;0;ON;;;;;N;;;;; +1FA40;NEUTRAL CHESS QUEEN ROTATED TWO HUNDRED SEVENTY DEGREES;So;0;ON;;;;;N;;;;; +1FA41;NEUTRAL CHESS ROOK ROTATED TWO HUNDRED SEVENTY DEGREES;So;0;ON;;;;;N;;;;; +1FA42;NEUTRAL CHESS BISHOP ROTATED TWO HUNDRED SEVENTY DEGREES;So;0;ON;;;;;N;;;;; +1FA43;NEUTRAL CHESS KNIGHT ROTATED TWO HUNDRED SEVENTY DEGREES;So;0;ON;;;;;N;;;;; +1FA44;NEUTRAL CHESS PAWN ROTATED TWO HUNDRED SEVENTY DEGREES;So;0;ON;;;;;N;;;;; +1FA45;WHITE CHESS KNIGHT ROTATED THREE HUNDRED FIFTEEN DEGREES;So;0;ON;;;;;N;;;;; +1FA46;BLACK CHESS KNIGHT ROTATED THREE HUNDRED FIFTEEN DEGREES;So;0;ON;;;;;N;;;;; +1FA47;NEUTRAL CHESS KNIGHT ROTATED THREE HUNDRED FIFTEEN DEGREES;So;0;ON;;;;;N;;;;; +1FA48;WHITE CHESS EQUIHOPPER;So;0;ON;;;;;N;;;;; +1FA49;BLACK CHESS EQUIHOPPER;So;0;ON;;;;;N;;;;; +1FA4A;NEUTRAL CHESS EQUIHOPPER;So;0;ON;;;;;N;;;;; +1FA4B;WHITE CHESS EQUIHOPPER ROTATED NINETY DEGREES;So;0;ON;;;;;N;;;;; +1FA4C;BLACK CHESS EQUIHOPPER ROTATED NINETY DEGREES;So;0;ON;;;;;N;;;;; +1FA4D;NEUTRAL CHESS EQUIHOPPER ROTATED NINETY DEGREES;So;0;ON;;;;;N;;;;; +1FA4E;WHITE CHESS KNIGHT-QUEEN;So;0;ON;;;;;N;;;;; +1FA4F;WHITE CHESS KNIGHT-ROOK;So;0;ON;;;;;N;;;;; +1FA50;WHITE CHESS KNIGHT-BISHOP;So;0;ON;;;;;N;;;;; +1FA51;BLACK CHESS KNIGHT-QUEEN;So;0;ON;;;;;N;;;;; +1FA52;BLACK CHESS KNIGHT-ROOK;So;0;ON;;;;;N;;;;; +1FA53;BLACK CHESS KNIGHT-BISHOP;So;0;ON;;;;;N;;;;; +1FA54;WHITE CHESS FERZ;So;0;ON;;;;;N;;;;; +1FA55;WHITE CHESS ALFIL;So;0;ON;;;;;N;;;;; +1FA56;BLACK CHESS FERZ;So;0;ON;;;;;N;;;;; +1FA57;BLACK CHESS ALFIL;So;0;ON;;;;;N;;;;; +1FA60;XIANGQI RED GENERAL;So;0;ON;;;;;N;;;;; +1FA61;XIANGQI RED MANDARIN;So;0;ON;;;;;N;;;;; +1FA62;XIANGQI RED ELEPHANT;So;0;ON;;;;;N;;;;; +1FA63;XIANGQI RED HORSE;So;0;ON;;;;;N;;;;; +1FA64;XIANGQI RED CHARIOT;So;0;ON;;;;;N;;;;; +1FA65;XIANGQI RED CANNON;So;0;ON;;;;;N;;;;; +1FA66;XIANGQI RED SOLDIER;So;0;ON;;;;;N;;;;; +1FA67;XIANGQI BLACK GENERAL;So;0;ON;;;;;N;;;;; +1FA68;XIANGQI BLACK MANDARIN;So;0;ON;;;;;N;;;;; +1FA69;XIANGQI BLACK ELEPHANT;So;0;ON;;;;;N;;;;; +1FA6A;XIANGQI BLACK HORSE;So;0;ON;;;;;N;;;;; +1FA6B;XIANGQI BLACK CHARIOT;So;0;ON;;;;;N;;;;; +1FA6C;XIANGQI BLACK CANNON;So;0;ON;;;;;N;;;;; +1FA6D;XIANGQI BLACK SOLDIER;So;0;ON;;;;;N;;;;; +1FA70;BALLET SHOES;So;0;ON;;;;;N;;;;; +1FA71;ONE-PIECE SWIMSUIT;So;0;ON;;;;;N;;;;; +1FA72;BRIEFS;So;0;ON;;;;;N;;;;; +1FA73;SHORTS;So;0;ON;;;;;N;;;;; +1FA74;THONG SANDAL;So;0;ON;;;;;N;;;;; +1FA75;LIGHT BLUE HEART;So;0;ON;;;;;N;;;;; +1FA76;GREY HEART;So;0;ON;;;;;N;;;;; +1FA77;PINK HEART;So;0;ON;;;;;N;;;;; +1FA78;DROP OF BLOOD;So;0;ON;;;;;N;;;;; +1FA79;ADHESIVE BANDAGE;So;0;ON;;;;;N;;;;; +1FA7A;STETHOSCOPE;So;0;ON;;;;;N;;;;; +1FA7B;X-RAY;So;0;ON;;;;;N;;;;; +1FA7C;CRUTCH;So;0;ON;;;;;N;;;;; +1FA80;YO-YO;So;0;ON;;;;;N;;;;; +1FA81;KITE;So;0;ON;;;;;N;;;;; +1FA82;PARACHUTE;So;0;ON;;;;;N;;;;; +1FA83;BOOMERANG;So;0;ON;;;;;N;;;;; +1FA84;MAGIC WAND;So;0;ON;;;;;N;;;;; +1FA85;PINATA;So;0;ON;;;;;N;;;;; +1FA86;NESTING DOLLS;So;0;ON;;;;;N;;;;; +1FA87;MARACAS;So;0;ON;;;;;N;;;;; +1FA88;FLUTE;So;0;ON;;;;;N;;;;; +1FA89;HARP;So;0;ON;;;;;N;;;;; +1FA8A;TROMBONE;So;0;ON;;;;;N;;;;; +1FA8E;TREASURE CHEST;So;0;ON;;;;;N;;;;; +1FA8F;SHOVEL;So;0;ON;;;;;N;;;;; +1FA90;RINGED PLANET;So;0;ON;;;;;N;;;;; +1FA91;CHAIR;So;0;ON;;;;;N;;;;; +1FA92;RAZOR;So;0;ON;;;;;N;;;;; +1FA93;AXE;So;0;ON;;;;;N;;;;; +1FA94;DIYA LAMP;So;0;ON;;;;;N;;;;; +1FA95;BANJO;So;0;ON;;;;;N;;;;; +1FA96;MILITARY HELMET;So;0;ON;;;;;N;;;;; +1FA97;ACCORDION;So;0;ON;;;;;N;;;;; +1FA98;LONG DRUM;So;0;ON;;;;;N;;;;; +1FA99;COIN;So;0;ON;;;;;N;;;;; +1FA9A;CARPENTRY SAW;So;0;ON;;;;;N;;;;; +1FA9B;SCREWDRIVER;So;0;ON;;;;;N;;;;; +1FA9C;LADDER;So;0;ON;;;;;N;;;;; +1FA9D;HOOK;So;0;ON;;;;;N;;;;; +1FA9E;MIRROR;So;0;ON;;;;;N;;;;; +1FA9F;WINDOW;So;0;ON;;;;;N;;;;; +1FAA0;PLUNGER;So;0;ON;;;;;N;;;;; +1FAA1;SEWING NEEDLE;So;0;ON;;;;;N;;;;; +1FAA2;KNOT;So;0;ON;;;;;N;;;;; +1FAA3;BUCKET;So;0;ON;;;;;N;;;;; +1FAA4;MOUSE TRAP;So;0;ON;;;;;N;;;;; +1FAA5;TOOTHBRUSH;So;0;ON;;;;;N;;;;; +1FAA6;HEADSTONE;So;0;ON;;;;;N;;;;; +1FAA7;PLACARD;So;0;ON;;;;;N;;;;; +1FAA8;ROCK;So;0;ON;;;;;N;;;;; +1FAA9;MIRROR BALL;So;0;ON;;;;;N;;;;; +1FAAA;IDENTIFICATION CARD;So;0;ON;;;;;N;;;;; +1FAAB;LOW BATTERY;So;0;ON;;;;;N;;;;; +1FAAC;HAMSA;So;0;ON;;;;;N;;;;; +1FAAD;FOLDING HAND FAN;So;0;ON;;;;;N;;;;; +1FAAE;HAIR PICK;So;0;ON;;;;;N;;;;; +1FAAF;KHANDA;So;0;ON;;;;;N;;;;; +1FAB0;FLY;So;0;ON;;;;;N;;;;; +1FAB1;WORM;So;0;ON;;;;;N;;;;; +1FAB2;BEETLE;So;0;ON;;;;;N;;;;; +1FAB3;COCKROACH;So;0;ON;;;;;N;;;;; +1FAB4;POTTED PLANT;So;0;ON;;;;;N;;;;; +1FAB5;WOOD;So;0;ON;;;;;N;;;;; +1FAB6;FEATHER;So;0;ON;;;;;N;;;;; +1FAB7;LOTUS;So;0;ON;;;;;N;;;;; +1FAB8;CORAL;So;0;ON;;;;;N;;;;; +1FAB9;EMPTY NEST;So;0;ON;;;;;N;;;;; +1FABA;NEST WITH EGGS;So;0;ON;;;;;N;;;;; +1FABB;HYACINTH;So;0;ON;;;;;N;;;;; +1FABC;JELLYFISH;So;0;ON;;;;;N;;;;; +1FABD;WING;So;0;ON;;;;;N;;;;; +1FABE;LEAFLESS TREE;So;0;ON;;;;;N;;;;; +1FABF;GOOSE;So;0;ON;;;;;N;;;;; +1FAC0;ANATOMICAL HEART;So;0;ON;;;;;N;;;;; +1FAC1;LUNGS;So;0;ON;;;;;N;;;;; +1FAC2;PEOPLE HUGGING;So;0;ON;;;;;N;;;;; +1FAC3;PREGNANT MAN;So;0;ON;;;;;N;;;;; +1FAC4;PREGNANT PERSON;So;0;ON;;;;;N;;;;; +1FAC5;PERSON WITH CROWN;So;0;ON;;;;;N;;;;; +1FAC6;FINGERPRINT;So;0;ON;;;;;N;;;;; +1FAC8;HAIRY CREATURE;So;0;ON;;;;;N;;;;; +1FACD;ORCA;So;0;ON;;;;;N;;;;; +1FACE;MOOSE;So;0;ON;;;;;N;;;;; +1FACF;DONKEY;So;0;ON;;;;;N;;;;; +1FAD0;BLUEBERRIES;So;0;ON;;;;;N;;;;; +1FAD1;BELL PEPPER;So;0;ON;;;;;N;;;;; +1FAD2;OLIVE;So;0;ON;;;;;N;;;;; +1FAD3;FLATBREAD;So;0;ON;;;;;N;;;;; +1FAD4;TAMALE;So;0;ON;;;;;N;;;;; +1FAD5;FONDUE;So;0;ON;;;;;N;;;;; +1FAD6;TEAPOT;So;0;ON;;;;;N;;;;; +1FAD7;POURING LIQUID;So;0;ON;;;;;N;;;;; +1FAD8;BEANS;So;0;ON;;;;;N;;;;; +1FAD9;JAR;So;0;ON;;;;;N;;;;; +1FADA;GINGER ROOT;So;0;ON;;;;;N;;;;; +1FADB;PEA POD;So;0;ON;;;;;N;;;;; +1FADC;ROOT VEGETABLE;So;0;ON;;;;;N;;;;; +1FADF;SPLATTER;So;0;ON;;;;;N;;;;; +1FAE0;MELTING FACE;So;0;ON;;;;;N;;;;; +1FAE1;SALUTING FACE;So;0;ON;;;;;N;;;;; +1FAE2;FACE WITH OPEN EYES AND HAND OVER MOUTH;So;0;ON;;;;;N;;;;; +1FAE3;FACE WITH PEEKING EYE;So;0;ON;;;;;N;;;;; +1FAE4;FACE WITH DIAGONAL MOUTH;So;0;ON;;;;;N;;;;; +1FAE5;DOTTED LINE FACE;So;0;ON;;;;;N;;;;; +1FAE6;BITING LIP;So;0;ON;;;;;N;;;;; +1FAE7;BUBBLES;So;0;ON;;;;;N;;;;; +1FAE8;SHAKING FACE;So;0;ON;;;;;N;;;;; +1FAE9;FACE WITH BAGS UNDER EYES;So;0;ON;;;;;N;;;;; +1FAEA;DISTORTED FACE;So;0;ON;;;;;N;;;;; +1FAEF;FIGHT CLOUD;So;0;ON;;;;;N;;;;; +1FAF0;HAND WITH INDEX FINGER AND THUMB CROSSED;So;0;ON;;;;;N;;;;; +1FAF1;RIGHTWARDS HAND;So;0;ON;;;;;N;;;;; +1FAF2;LEFTWARDS HAND;So;0;ON;;;;;N;;;;; +1FAF3;PALM DOWN HAND;So;0;ON;;;;;N;;;;; +1FAF4;PALM UP HAND;So;0;ON;;;;;N;;;;; +1FAF5;INDEX POINTING AT THE VIEWER;So;0;ON;;;;;N;;;;; +1FAF6;HEART HANDS;So;0;ON;;;;;N;;;;; +1FAF7;LEFTWARDS PUSHING HAND;So;0;ON;;;;;N;;;;; +1FAF8;RIGHTWARDS PUSHING HAND;So;0;ON;;;;;N;;;;; +1FB00;BLOCK SEXTANT-1;So;0;ON;;;;;N;;;;; +1FB01;BLOCK SEXTANT-2;So;0;ON;;;;;N;;;;; +1FB02;BLOCK SEXTANT-12;So;0;ON;;;;;N;;;;; +1FB03;BLOCK SEXTANT-3;So;0;ON;;;;;N;;;;; +1FB04;BLOCK SEXTANT-13;So;0;ON;;;;;N;;;;; +1FB05;BLOCK SEXTANT-23;So;0;ON;;;;;N;;;;; +1FB06;BLOCK SEXTANT-123;So;0;ON;;;;;N;;;;; +1FB07;BLOCK SEXTANT-4;So;0;ON;;;;;N;;;;; +1FB08;BLOCK SEXTANT-14;So;0;ON;;;;;N;;;;; +1FB09;BLOCK SEXTANT-24;So;0;ON;;;;;N;;;;; +1FB0A;BLOCK SEXTANT-124;So;0;ON;;;;;N;;;;; +1FB0B;BLOCK SEXTANT-34;So;0;ON;;;;;N;;;;; +1FB0C;BLOCK SEXTANT-134;So;0;ON;;;;;N;;;;; +1FB0D;BLOCK SEXTANT-234;So;0;ON;;;;;N;;;;; +1FB0E;BLOCK SEXTANT-1234;So;0;ON;;;;;N;;;;; +1FB0F;BLOCK SEXTANT-5;So;0;ON;;;;;N;;;;; +1FB10;BLOCK SEXTANT-15;So;0;ON;;;;;N;;;;; +1FB11;BLOCK SEXTANT-25;So;0;ON;;;;;N;;;;; +1FB12;BLOCK SEXTANT-125;So;0;ON;;;;;N;;;;; +1FB13;BLOCK SEXTANT-35;So;0;ON;;;;;N;;;;; +1FB14;BLOCK SEXTANT-235;So;0;ON;;;;;N;;;;; +1FB15;BLOCK SEXTANT-1235;So;0;ON;;;;;N;;;;; +1FB16;BLOCK SEXTANT-45;So;0;ON;;;;;N;;;;; +1FB17;BLOCK SEXTANT-145;So;0;ON;;;;;N;;;;; +1FB18;BLOCK SEXTANT-245;So;0;ON;;;;;N;;;;; +1FB19;BLOCK SEXTANT-1245;So;0;ON;;;;;N;;;;; +1FB1A;BLOCK SEXTANT-345;So;0;ON;;;;;N;;;;; +1FB1B;BLOCK SEXTANT-1345;So;0;ON;;;;;N;;;;; +1FB1C;BLOCK SEXTANT-2345;So;0;ON;;;;;N;;;;; +1FB1D;BLOCK SEXTANT-12345;So;0;ON;;;;;N;;;;; +1FB1E;BLOCK SEXTANT-6;So;0;ON;;;;;N;;;;; +1FB1F;BLOCK SEXTANT-16;So;0;ON;;;;;N;;;;; +1FB20;BLOCK SEXTANT-26;So;0;ON;;;;;N;;;;; +1FB21;BLOCK SEXTANT-126;So;0;ON;;;;;N;;;;; +1FB22;BLOCK SEXTANT-36;So;0;ON;;;;;N;;;;; +1FB23;BLOCK SEXTANT-136;So;0;ON;;;;;N;;;;; +1FB24;BLOCK SEXTANT-236;So;0;ON;;;;;N;;;;; +1FB25;BLOCK SEXTANT-1236;So;0;ON;;;;;N;;;;; +1FB26;BLOCK SEXTANT-46;So;0;ON;;;;;N;;;;; +1FB27;BLOCK SEXTANT-146;So;0;ON;;;;;N;;;;; +1FB28;BLOCK SEXTANT-1246;So;0;ON;;;;;N;;;;; +1FB29;BLOCK SEXTANT-346;So;0;ON;;;;;N;;;;; +1FB2A;BLOCK SEXTANT-1346;So;0;ON;;;;;N;;;;; +1FB2B;BLOCK SEXTANT-2346;So;0;ON;;;;;N;;;;; +1FB2C;BLOCK SEXTANT-12346;So;0;ON;;;;;N;;;;; +1FB2D;BLOCK SEXTANT-56;So;0;ON;;;;;N;;;;; +1FB2E;BLOCK SEXTANT-156;So;0;ON;;;;;N;;;;; +1FB2F;BLOCK SEXTANT-256;So;0;ON;;;;;N;;;;; +1FB30;BLOCK SEXTANT-1256;So;0;ON;;;;;N;;;;; +1FB31;BLOCK SEXTANT-356;So;0;ON;;;;;N;;;;; +1FB32;BLOCK SEXTANT-1356;So;0;ON;;;;;N;;;;; +1FB33;BLOCK SEXTANT-2356;So;0;ON;;;;;N;;;;; +1FB34;BLOCK SEXTANT-12356;So;0;ON;;;;;N;;;;; +1FB35;BLOCK SEXTANT-456;So;0;ON;;;;;N;;;;; +1FB36;BLOCK SEXTANT-1456;So;0;ON;;;;;N;;;;; +1FB37;BLOCK SEXTANT-2456;So;0;ON;;;;;N;;;;; +1FB38;BLOCK SEXTANT-12456;So;0;ON;;;;;N;;;;; +1FB39;BLOCK SEXTANT-3456;So;0;ON;;;;;N;;;;; +1FB3A;BLOCK SEXTANT-13456;So;0;ON;;;;;N;;;;; +1FB3B;BLOCK SEXTANT-23456;So;0;ON;;;;;N;;;;; +1FB3C;LOWER LEFT BLOCK DIAGONAL LOWER MIDDLE LEFT TO LOWER CENTRE;So;0;ON;;;;;N;;;;; +1FB3D;LOWER LEFT BLOCK DIAGONAL LOWER MIDDLE LEFT TO LOWER RIGHT;So;0;ON;;;;;N;;;;; +1FB3E;LOWER LEFT BLOCK DIAGONAL UPPER MIDDLE LEFT TO LOWER CENTRE;So;0;ON;;;;;N;;;;; +1FB3F;LOWER LEFT BLOCK DIAGONAL UPPER MIDDLE LEFT TO LOWER RIGHT;So;0;ON;;;;;N;;;;; +1FB40;LOWER LEFT BLOCK DIAGONAL UPPER LEFT TO LOWER CENTRE;So;0;ON;;;;;N;;;;; +1FB41;LOWER RIGHT BLOCK DIAGONAL UPPER MIDDLE LEFT TO UPPER CENTRE;So;0;ON;;;;;N;;;;; +1FB42;LOWER RIGHT BLOCK DIAGONAL UPPER MIDDLE LEFT TO UPPER RIGHT;So;0;ON;;;;;N;;;;; +1FB43;LOWER RIGHT BLOCK DIAGONAL LOWER MIDDLE LEFT TO UPPER CENTRE;So;0;ON;;;;;N;;;;; +1FB44;LOWER RIGHT BLOCK DIAGONAL LOWER MIDDLE LEFT TO UPPER RIGHT;So;0;ON;;;;;N;;;;; +1FB45;LOWER RIGHT BLOCK DIAGONAL LOWER LEFT TO UPPER CENTRE;So;0;ON;;;;;N;;;;; +1FB46;LOWER RIGHT BLOCK DIAGONAL LOWER MIDDLE LEFT TO UPPER MIDDLE RIGHT;So;0;ON;;;;;N;;;;; +1FB47;LOWER RIGHT BLOCK DIAGONAL LOWER CENTRE TO LOWER MIDDLE RIGHT;So;0;ON;;;;;N;;;;; +1FB48;LOWER RIGHT BLOCK DIAGONAL LOWER LEFT TO LOWER MIDDLE RIGHT;So;0;ON;;;;;N;;;;; +1FB49;LOWER RIGHT BLOCK DIAGONAL LOWER CENTRE TO UPPER MIDDLE RIGHT;So;0;ON;;;;;N;;;;; +1FB4A;LOWER RIGHT BLOCK DIAGONAL LOWER LEFT TO UPPER MIDDLE RIGHT;So;0;ON;;;;;N;;;;; +1FB4B;LOWER RIGHT BLOCK DIAGONAL LOWER CENTRE TO UPPER RIGHT;So;0;ON;;;;;N;;;;; +1FB4C;LOWER LEFT BLOCK DIAGONAL UPPER CENTRE TO UPPER MIDDLE RIGHT;So;0;ON;;;;;N;;;;; +1FB4D;LOWER LEFT BLOCK DIAGONAL UPPER LEFT TO UPPER MIDDLE RIGHT;So;0;ON;;;;;N;;;;; +1FB4E;LOWER LEFT BLOCK DIAGONAL UPPER CENTRE TO LOWER MIDDLE RIGHT;So;0;ON;;;;;N;;;;; +1FB4F;LOWER LEFT BLOCK DIAGONAL UPPER LEFT TO LOWER MIDDLE RIGHT;So;0;ON;;;;;N;;;;; +1FB50;LOWER LEFT BLOCK DIAGONAL UPPER CENTRE TO LOWER RIGHT;So;0;ON;;;;;N;;;;; +1FB51;LOWER LEFT BLOCK DIAGONAL UPPER MIDDLE LEFT TO LOWER MIDDLE RIGHT;So;0;ON;;;;;N;;;;; +1FB52;UPPER RIGHT BLOCK DIAGONAL LOWER MIDDLE LEFT TO LOWER CENTRE;So;0;ON;;;;;N;;;;; +1FB53;UPPER RIGHT BLOCK DIAGONAL LOWER MIDDLE LEFT TO LOWER RIGHT;So;0;ON;;;;;N;;;;; +1FB54;UPPER RIGHT BLOCK DIAGONAL UPPER MIDDLE LEFT TO LOWER CENTRE;So;0;ON;;;;;N;;;;; +1FB55;UPPER RIGHT BLOCK DIAGONAL UPPER MIDDLE LEFT TO LOWER RIGHT;So;0;ON;;;;;N;;;;; +1FB56;UPPER RIGHT BLOCK DIAGONAL UPPER LEFT TO LOWER CENTRE;So;0;ON;;;;;N;;;;; +1FB57;UPPER LEFT BLOCK DIAGONAL UPPER MIDDLE LEFT TO UPPER CENTRE;So;0;ON;;;;;N;;;;; +1FB58;UPPER LEFT BLOCK DIAGONAL UPPER MIDDLE LEFT TO UPPER RIGHT;So;0;ON;;;;;N;;;;; +1FB59;UPPER LEFT BLOCK DIAGONAL LOWER MIDDLE LEFT TO UPPER CENTRE;So;0;ON;;;;;N;;;;; +1FB5A;UPPER LEFT BLOCK DIAGONAL LOWER MIDDLE LEFT TO UPPER RIGHT;So;0;ON;;;;;N;;;;; +1FB5B;UPPER LEFT BLOCK DIAGONAL LOWER LEFT TO UPPER CENTRE;So;0;ON;;;;;N;;;;; +1FB5C;UPPER LEFT BLOCK DIAGONAL LOWER MIDDLE LEFT TO UPPER MIDDLE RIGHT;So;0;ON;;;;;N;;;;; +1FB5D;UPPER LEFT BLOCK DIAGONAL LOWER CENTRE TO LOWER MIDDLE RIGHT;So;0;ON;;;;;N;;;;; +1FB5E;UPPER LEFT BLOCK DIAGONAL LOWER LEFT TO LOWER MIDDLE RIGHT;So;0;ON;;;;;N;;;;; +1FB5F;UPPER LEFT BLOCK DIAGONAL LOWER CENTRE TO UPPER MIDDLE RIGHT;So;0;ON;;;;;N;;;;; +1FB60;UPPER LEFT BLOCK DIAGONAL LOWER LEFT TO UPPER MIDDLE RIGHT;So;0;ON;;;;;N;;;;; +1FB61;UPPER LEFT BLOCK DIAGONAL LOWER CENTRE TO UPPER RIGHT;So;0;ON;;;;;N;;;;; +1FB62;UPPER RIGHT BLOCK DIAGONAL UPPER CENTRE TO UPPER MIDDLE RIGHT;So;0;ON;;;;;N;;;;; +1FB63;UPPER RIGHT BLOCK DIAGONAL UPPER LEFT TO UPPER MIDDLE RIGHT;So;0;ON;;;;;N;;;;; +1FB64;UPPER RIGHT BLOCK DIAGONAL UPPER CENTRE TO LOWER MIDDLE RIGHT;So;0;ON;;;;;N;;;;; +1FB65;UPPER RIGHT BLOCK DIAGONAL UPPER LEFT TO LOWER MIDDLE RIGHT;So;0;ON;;;;;N;;;;; +1FB66;UPPER RIGHT BLOCK DIAGONAL UPPER CENTRE TO LOWER RIGHT;So;0;ON;;;;;N;;;;; +1FB67;UPPER RIGHT BLOCK DIAGONAL UPPER MIDDLE LEFT TO LOWER MIDDLE RIGHT;So;0;ON;;;;;N;;;;; +1FB68;UPPER AND RIGHT AND LOWER TRIANGULAR THREE QUARTERS BLOCK;So;0;ON;;;;;N;;;;; +1FB69;LEFT AND LOWER AND RIGHT TRIANGULAR THREE QUARTERS BLOCK;So;0;ON;;;;;N;;;;; +1FB6A;UPPER AND LEFT AND LOWER TRIANGULAR THREE QUARTERS BLOCK;So;0;ON;;;;;N;;;;; +1FB6B;LEFT AND UPPER AND RIGHT TRIANGULAR THREE QUARTERS BLOCK;So;0;ON;;;;;N;;;;; +1FB6C;LEFT TRIANGULAR ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1FB6D;UPPER TRIANGULAR ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1FB6E;RIGHT TRIANGULAR ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1FB6F;LOWER TRIANGULAR ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1FB70;VERTICAL ONE EIGHTH BLOCK-2;So;0;ON;;;;;N;;;;; +1FB71;VERTICAL ONE EIGHTH BLOCK-3;So;0;ON;;;;;N;;;;; +1FB72;VERTICAL ONE EIGHTH BLOCK-4;So;0;ON;;;;;N;;;;; +1FB73;VERTICAL ONE EIGHTH BLOCK-5;So;0;ON;;;;;N;;;;; +1FB74;VERTICAL ONE EIGHTH BLOCK-6;So;0;ON;;;;;N;;;;; +1FB75;VERTICAL ONE EIGHTH BLOCK-7;So;0;ON;;;;;N;;;;; +1FB76;HORIZONTAL ONE EIGHTH BLOCK-2;So;0;ON;;;;;N;;;;; +1FB77;HORIZONTAL ONE EIGHTH BLOCK-3;So;0;ON;;;;;N;;;;; +1FB78;HORIZONTAL ONE EIGHTH BLOCK-4;So;0;ON;;;;;N;;;;; +1FB79;HORIZONTAL ONE EIGHTH BLOCK-5;So;0;ON;;;;;N;;;;; +1FB7A;HORIZONTAL ONE EIGHTH BLOCK-6;So;0;ON;;;;;N;;;;; +1FB7B;HORIZONTAL ONE EIGHTH BLOCK-7;So;0;ON;;;;;N;;;;; +1FB7C;LEFT AND LOWER ONE EIGHTH BLOCK;So;0;ON;;;;;N;;;;; +1FB7D;LEFT AND UPPER ONE EIGHTH BLOCK;So;0;ON;;;;;N;;;;; +1FB7E;RIGHT AND UPPER ONE EIGHTH BLOCK;So;0;ON;;;;;N;;;;; +1FB7F;RIGHT AND LOWER ONE EIGHTH BLOCK;So;0;ON;;;;;N;;;;; +1FB80;UPPER AND LOWER ONE EIGHTH BLOCK;So;0;ON;;;;;N;;;;; +1FB81;HORIZONTAL ONE EIGHTH BLOCK-1358;So;0;ON;;;;;N;;;;; +1FB82;UPPER ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1FB83;UPPER THREE EIGHTHS BLOCK;So;0;ON;;;;;N;;;;; +1FB84;UPPER FIVE EIGHTHS BLOCK;So;0;ON;;;;;N;;;;; +1FB85;UPPER THREE QUARTERS BLOCK;So;0;ON;;;;;N;;;;; +1FB86;UPPER SEVEN EIGHTHS BLOCK;So;0;ON;;;;;N;;;;; +1FB87;RIGHT ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1FB88;RIGHT THREE EIGHTHS BLOCK;So;0;ON;;;;;N;;;;; +1FB89;RIGHT FIVE EIGHTHS BLOCK;So;0;ON;;;;;N;;;;; +1FB8A;RIGHT THREE QUARTERS BLOCK;So;0;ON;;;;;N;;;;; +1FB8B;RIGHT SEVEN EIGHTHS BLOCK;So;0;ON;;;;;N;;;;; +1FB8C;LEFT HALF MEDIUM SHADE;So;0;ON;;;;;N;;;;; +1FB8D;RIGHT HALF MEDIUM SHADE;So;0;ON;;;;;N;;;;; +1FB8E;UPPER HALF MEDIUM SHADE;So;0;ON;;;;;N;;;;; +1FB8F;LOWER HALF MEDIUM SHADE;So;0;ON;;;;;N;;;;; +1FB90;INVERSE MEDIUM SHADE;So;0;ON;;;;;N;;;;; +1FB91;UPPER HALF BLOCK AND LOWER HALF INVERSE MEDIUM SHADE;So;0;ON;;;;;N;;;;; +1FB92;UPPER HALF INVERSE MEDIUM SHADE AND LOWER HALF BLOCK;So;0;ON;;;;;N;;;;; +1FB94;LEFT HALF INVERSE MEDIUM SHADE AND RIGHT HALF BLOCK;So;0;ON;;;;;N;;;;; +1FB95;CHECKER BOARD FILL;So;0;ON;;;;;N;;;;; +1FB96;INVERSE CHECKER BOARD FILL;So;0;ON;;;;;N;;;;; +1FB97;HEAVY HORIZONTAL FILL;So;0;ON;;;;;N;;;;; +1FB98;UPPER LEFT TO LOWER RIGHT FILL;So;0;ON;;;;;N;;;;; +1FB99;UPPER RIGHT TO LOWER LEFT FILL;So;0;ON;;;;;N;;;;; +1FB9A;UPPER AND LOWER TRIANGULAR HALF BLOCK;So;0;ON;;;;;N;;;;; +1FB9B;LEFT AND RIGHT TRIANGULAR HALF BLOCK;So;0;ON;;;;;N;;;;; +1FB9C;UPPER LEFT TRIANGULAR MEDIUM SHADE;So;0;ON;;;;;N;;;;; +1FB9D;UPPER RIGHT TRIANGULAR MEDIUM SHADE;So;0;ON;;;;;N;;;;; +1FB9E;LOWER RIGHT TRIANGULAR MEDIUM SHADE;So;0;ON;;;;;N;;;;; +1FB9F;LOWER LEFT TRIANGULAR MEDIUM SHADE;So;0;ON;;;;;N;;;;; +1FBA0;BOX DRAWINGS LIGHT DIAGONAL UPPER CENTRE TO MIDDLE LEFT;So;0;ON;;;;;N;;;;; +1FBA1;BOX DRAWINGS LIGHT DIAGONAL UPPER CENTRE TO MIDDLE RIGHT;So;0;ON;;;;;N;;;;; +1FBA2;BOX DRAWINGS LIGHT DIAGONAL MIDDLE LEFT TO LOWER CENTRE;So;0;ON;;;;;N;;;;; +1FBA3;BOX DRAWINGS LIGHT DIAGONAL MIDDLE RIGHT TO LOWER CENTRE;So;0;ON;;;;;N;;;;; +1FBA4;BOX DRAWINGS LIGHT DIAGONAL UPPER CENTRE TO MIDDLE LEFT TO LOWER CENTRE;So;0;ON;;;;;N;;;;; +1FBA5;BOX DRAWINGS LIGHT DIAGONAL UPPER CENTRE TO MIDDLE RIGHT TO LOWER CENTRE;So;0;ON;;;;;N;;;;; +1FBA6;BOX DRAWINGS LIGHT DIAGONAL MIDDLE LEFT TO LOWER CENTRE TO MIDDLE RIGHT;So;0;ON;;;;;N;;;;; +1FBA7;BOX DRAWINGS LIGHT DIAGONAL MIDDLE LEFT TO UPPER CENTRE TO MIDDLE RIGHT;So;0;ON;;;;;N;;;;; +1FBA8;BOX DRAWINGS LIGHT DIAGONAL UPPER CENTRE TO MIDDLE LEFT AND MIDDLE RIGHT TO LOWER CENTRE;So;0;ON;;;;;N;;;;; +1FBA9;BOX DRAWINGS LIGHT DIAGONAL UPPER CENTRE TO MIDDLE RIGHT AND MIDDLE LEFT TO LOWER CENTRE;So;0;ON;;;;;N;;;;; +1FBAA;BOX DRAWINGS LIGHT DIAGONAL UPPER CENTRE TO MIDDLE RIGHT TO LOWER CENTRE TO MIDDLE LEFT;So;0;ON;;;;;N;;;;; +1FBAB;BOX DRAWINGS LIGHT DIAGONAL UPPER CENTRE TO MIDDLE LEFT TO LOWER CENTRE TO MIDDLE RIGHT;So;0;ON;;;;;N;;;;; +1FBAC;BOX DRAWINGS LIGHT DIAGONAL MIDDLE LEFT TO UPPER CENTRE TO MIDDLE RIGHT TO LOWER CENTRE;So;0;ON;;;;;N;;;;; +1FBAD;BOX DRAWINGS LIGHT DIAGONAL MIDDLE RIGHT TO UPPER CENTRE TO MIDDLE LEFT TO LOWER CENTRE;So;0;ON;;;;;N;;;;; +1FBAE;BOX DRAWINGS LIGHT DIAGONAL DIAMOND;So;0;ON;;;;;N;;;;; +1FBAF;BOX DRAWINGS LIGHT HORIZONTAL WITH VERTICAL STROKE;So;0;ON;;;;;N;;;;; +1FBB0;ARROWHEAD-SHAPED POINTER;So;0;ON;;;;;N;;;;; +1FBB1;INVERSE CHECK MARK;So;0;ON;;;;;N;;;;; +1FBB2;LEFT HALF RUNNING MAN;So;0;ON;;;;;N;;;;; +1FBB3;RIGHT HALF RUNNING MAN;So;0;ON;;;;;N;;;;; +1FBB4;INVERSE DOWNWARDS ARROW WITH TIP LEFTWARDS;So;0;ON;;;;;N;;;;; +1FBB5;LEFTWARDS ARROW AND UPPER AND LOWER ONE EIGHTH BLOCK;So;0;ON;;;;;N;;;;; +1FBB6;RIGHTWARDS ARROW AND UPPER AND LOWER ONE EIGHTH BLOCK;So;0;ON;;;;;N;;;;; +1FBB7;DOWNWARDS ARROW AND RIGHT ONE EIGHTH BLOCK;So;0;ON;;;;;N;;;;; +1FBB8;UPWARDS ARROW AND RIGHT ONE EIGHTH BLOCK;So;0;ON;;;;;N;;;;; +1FBB9;LEFT HALF FOLDER;So;0;ON;;;;;N;;;;; +1FBBA;RIGHT HALF FOLDER;So;0;ON;;;;;N;;;;; +1FBBB;VOIDED GREEK CROSS;So;0;ON;;;;;N;;;;; +1FBBC;RIGHT OPEN SQUARED DOT;So;0;ON;;;;;N;;;;; +1FBBD;NEGATIVE DIAGONAL CROSS;So;0;ON;;;;;N;;;;; +1FBBE;NEGATIVE DIAGONAL MIDDLE RIGHT TO LOWER CENTRE;So;0;ON;;;;;N;;;;; +1FBBF;NEGATIVE DIAGONAL DIAMOND;So;0;ON;;;;;N;;;;; +1FBC0;WHITE HEAVY SALTIRE WITH ROUNDED CORNERS;So;0;ON;;;;;N;;;;; +1FBC1;LEFT THIRD WHITE RIGHT POINTING INDEX;So;0;ON;;;;;N;;;;; +1FBC2;MIDDLE THIRD WHITE RIGHT POINTING INDEX;So;0;ON;;;;;N;;;;; +1FBC3;RIGHT THIRD WHITE RIGHT POINTING INDEX;So;0;ON;;;;;N;;;;; +1FBC4;NEGATIVE SQUARED QUESTION MARK;So;0;ON;;;;;N;;;;; +1FBC5;STICK FIGURE;So;0;ON;;;;;N;;;;; +1FBC6;STICK FIGURE WITH ARMS RAISED;So;0;ON;;;;;N;;;;; +1FBC7;STICK FIGURE LEANING LEFT;So;0;ON;;;;;N;;;;; +1FBC8;STICK FIGURE LEANING RIGHT;So;0;ON;;;;;N;;;;; +1FBC9;STICK FIGURE WITH DRESS;So;0;ON;;;;;N;;;;; +1FBCA;WHITE UP-POINTING CHEVRON;So;0;ON;;;;;N;;;;; +1FBCB;WHITE CROSS MARK;So;0;ON;;;;;N;;;;; +1FBCC;RAISED SMALL LEFT SQUARE BRACKET;So;0;ON;;;;;N;;;;; +1FBCD;BLACK SMALL UP-POINTING CHEVRON;So;0;ON;;;;;N;;;;; +1FBCE;LEFT TWO THIRDS BLOCK;So;0;ON;;;;;N;;;;; +1FBCF;LEFT ONE THIRD BLOCK;So;0;ON;;;;;N;;;;; +1FBD0;BOX DRAWINGS LIGHT DIAGONAL MIDDLE RIGHT TO LOWER LEFT;So;0;ON;;;;;N;;;;; +1FBD1;BOX DRAWINGS LIGHT DIAGONAL UPPER RIGHT TO MIDDLE LEFT;So;0;ON;;;;;N;;;;; +1FBD2;BOX DRAWINGS LIGHT DIAGONAL UPPER LEFT TO MIDDLE RIGHT;So;0;ON;;;;;N;;;;; +1FBD3;BOX DRAWINGS LIGHT DIAGONAL MIDDLE LEFT TO LOWER RIGHT;So;0;ON;;;;;N;;;;; +1FBD4;BOX DRAWINGS LIGHT DIAGONAL UPPER LEFT TO LOWER CENTRE;So;0;ON;;;;;N;;;;; +1FBD5;BOX DRAWINGS LIGHT DIAGONAL UPPER CENTRE TO LOWER RIGHT;So;0;ON;;;;;N;;;;; +1FBD6;BOX DRAWINGS LIGHT DIAGONAL UPPER RIGHT TO LOWER CENTRE;So;0;ON;;;;;N;;;;; +1FBD7;BOX DRAWINGS LIGHT DIAGONAL UPPER CENTRE TO LOWER LEFT;So;0;ON;;;;;N;;;;; +1FBD8;BOX DRAWINGS LIGHT DIAGONAL UPPER LEFT TO MIDDLE CENTRE TO UPPER RIGHT;So;0;ON;;;;;N;;;;; +1FBD9;BOX DRAWINGS LIGHT DIAGONAL UPPER RIGHT TO MIDDLE CENTRE TO LOWER RIGHT;So;0;ON;;;;;N;;;;; +1FBDA;BOX DRAWINGS LIGHT DIAGONAL LOWER LEFT TO MIDDLE CENTRE TO LOWER RIGHT;So;0;ON;;;;;N;;;;; +1FBDB;BOX DRAWINGS LIGHT DIAGONAL UPPER LEFT TO MIDDLE CENTRE TO LOWER LEFT;So;0;ON;;;;;N;;;;; +1FBDC;BOX DRAWINGS LIGHT DIAGONAL UPPER LEFT TO LOWER CENTRE TO UPPER RIGHT;So;0;ON;;;;;N;;;;; +1FBDD;BOX DRAWINGS LIGHT DIAGONAL UPPER RIGHT TO MIDDLE LEFT TO LOWER RIGHT;So;0;ON;;;;;N;;;;; +1FBDE;BOX DRAWINGS LIGHT DIAGONAL LOWER LEFT TO UPPER CENTRE TO LOWER RIGHT;So;0;ON;;;;;N;;;;; +1FBDF;BOX DRAWINGS LIGHT DIAGONAL UPPER LEFT TO MIDDLE RIGHT TO LOWER LEFT;So;0;ON;;;;;N;;;;; +1FBE0;TOP JUSTIFIED LOWER HALF WHITE CIRCLE;So;0;ON;;;;;N;;;;; +1FBE1;RIGHT JUSTIFIED LEFT HALF WHITE CIRCLE;So;0;ON;;;;;N;;;;; +1FBE2;BOTTOM JUSTIFIED UPPER HALF WHITE CIRCLE;So;0;ON;;;;;N;;;;; +1FBE3;LEFT JUSTIFIED RIGHT HALF WHITE CIRCLE;So;0;ON;;;;;N;;;;; +1FBE4;UPPER CENTRE ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1FBE5;LOWER CENTRE ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1FBE6;MIDDLE LEFT ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1FBE7;MIDDLE RIGHT ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1FBE8;TOP JUSTIFIED LOWER HALF BLACK CIRCLE;So;0;ON;;;;;N;;;;; +1FBE9;RIGHT JUSTIFIED LEFT HALF BLACK CIRCLE;So;0;ON;;;;;N;;;;; +1FBEA;BOTTOM JUSTIFIED UPPER HALF BLACK CIRCLE;So;0;ON;;;;;N;;;;; +1FBEB;LEFT JUSTIFIED RIGHT HALF BLACK CIRCLE;So;0;ON;;;;;N;;;;; +1FBEC;TOP RIGHT JUSTIFIED LOWER LEFT QUARTER BLACK CIRCLE;So;0;ON;;;;;N;;;;; +1FBED;BOTTOM LEFT JUSTIFIED UPPER RIGHT QUARTER BLACK CIRCLE;So;0;ON;;;;;N;;;;; +1FBEE;BOTTOM RIGHT JUSTIFIED UPPER LEFT QUARTER BLACK CIRCLE;So;0;ON;;;;;N;;;;; +1FBEF;TOP LEFT JUSTIFIED LOWER RIGHT QUARTER BLACK CIRCLE;So;0;ON;;;;;N;;;;; +1FBF0;SEGMENTED DIGIT ZERO;Nd;0;EN; 0030;0;0;0;N;;;;; +1FBF1;SEGMENTED DIGIT ONE;Nd;0;EN; 0031;1;1;1;N;;;;; +1FBF2;SEGMENTED DIGIT TWO;Nd;0;EN; 0032;2;2;2;N;;;;; +1FBF3;SEGMENTED DIGIT THREE;Nd;0;EN; 0033;3;3;3;N;;;;; +1FBF4;SEGMENTED DIGIT FOUR;Nd;0;EN; 0034;4;4;4;N;;;;; +1FBF5;SEGMENTED DIGIT FIVE;Nd;0;EN; 0035;5;5;5;N;;;;; +1FBF6;SEGMENTED DIGIT SIX;Nd;0;EN; 0036;6;6;6;N;;;;; +1FBF7;SEGMENTED DIGIT SEVEN;Nd;0;EN; 0037;7;7;7;N;;;;; +1FBF8;SEGMENTED DIGIT EIGHT;Nd;0;EN; 0038;8;8;8;N;;;;; +1FBF9;SEGMENTED DIGIT NINE;Nd;0;EN; 0039;9;9;9;N;;;;; +1FBFA;ALARM BELL SYMBOL;So;0;ON;;;;;N;;;;; +20000;;Lo;0;L;;;;;N;;;;; +2A6DF;;Lo;0;L;;;;;N;;;;; +2A700;;Lo;0;L;;;;;N;;;;; +2B73F;;Lo;0;L;;;;;N;;;;; +2B740;;Lo;0;L;;;;;N;;;;; +2B81D;;Lo;0;L;;;;;N;;;;; +2B820;;Lo;0;L;;;;;N;;;;; +2CEAD;;Lo;0;L;;;;;N;;;;; +2CEB0;;Lo;0;L;;;;;N;;;;; +2EBE0;;Lo;0;L;;;;;N;;;;; +2EBF0;;Lo;0;L;;;;;N;;;;; +2EE5D;;Lo;0;L;;;;;N;;;;; +2F800;CJK COMPATIBILITY IDEOGRAPH-2F800;Lo;0;L;4E3D;;;;N;;;;; +2F801;CJK COMPATIBILITY IDEOGRAPH-2F801;Lo;0;L;4E38;;;;N;;;;; +2F802;CJK COMPATIBILITY IDEOGRAPH-2F802;Lo;0;L;4E41;;;;N;;;;; +2F803;CJK COMPATIBILITY IDEOGRAPH-2F803;Lo;0;L;20122;;;;N;;;;; +2F804;CJK COMPATIBILITY IDEOGRAPH-2F804;Lo;0;L;4F60;;;;N;;;;; +2F805;CJK COMPATIBILITY IDEOGRAPH-2F805;Lo;0;L;4FAE;;;;N;;;;; +2F806;CJK COMPATIBILITY IDEOGRAPH-2F806;Lo;0;L;4FBB;;;;N;;;;; +2F807;CJK COMPATIBILITY IDEOGRAPH-2F807;Lo;0;L;5002;;;;N;;;;; +2F808;CJK COMPATIBILITY IDEOGRAPH-2F808;Lo;0;L;507A;;;;N;;;;; +2F809;CJK COMPATIBILITY IDEOGRAPH-2F809;Lo;0;L;5099;;;;N;;;;; +2F80A;CJK COMPATIBILITY IDEOGRAPH-2F80A;Lo;0;L;50E7;;;;N;;;;; +2F80B;CJK COMPATIBILITY IDEOGRAPH-2F80B;Lo;0;L;50CF;;;;N;;;;; +2F80C;CJK COMPATIBILITY IDEOGRAPH-2F80C;Lo;0;L;349E;;;;N;;;;; +2F80D;CJK COMPATIBILITY IDEOGRAPH-2F80D;Lo;0;L;2063A;;;;N;;;;; +2F80E;CJK COMPATIBILITY IDEOGRAPH-2F80E;Lo;0;L;514D;;;;N;;;;; +2F80F;CJK COMPATIBILITY IDEOGRAPH-2F80F;Lo;0;L;5154;;;;N;;;;; +2F810;CJK COMPATIBILITY IDEOGRAPH-2F810;Lo;0;L;5164;;;;N;;;;; +2F811;CJK COMPATIBILITY IDEOGRAPH-2F811;Lo;0;L;5177;;;;N;;;;; +2F812;CJK COMPATIBILITY IDEOGRAPH-2F812;Lo;0;L;2051C;;;;N;;;;; +2F813;CJK COMPATIBILITY IDEOGRAPH-2F813;Lo;0;L;34B9;;;;N;;;;; +2F814;CJK COMPATIBILITY IDEOGRAPH-2F814;Lo;0;L;5167;;;;N;;;;; +2F815;CJK COMPATIBILITY IDEOGRAPH-2F815;Lo;0;L;518D;;;;N;;;;; +2F816;CJK COMPATIBILITY IDEOGRAPH-2F816;Lo;0;L;2054B;;;;N;;;;; +2F817;CJK COMPATIBILITY IDEOGRAPH-2F817;Lo;0;L;5197;;;;N;;;;; +2F818;CJK COMPATIBILITY IDEOGRAPH-2F818;Lo;0;L;51A4;;;;N;;;;; +2F819;CJK COMPATIBILITY IDEOGRAPH-2F819;Lo;0;L;4ECC;;;;N;;;;; +2F81A;CJK COMPATIBILITY IDEOGRAPH-2F81A;Lo;0;L;51AC;;;;N;;;;; +2F81B;CJK COMPATIBILITY IDEOGRAPH-2F81B;Lo;0;L;51B5;;;;N;;;;; +2F81C;CJK COMPATIBILITY IDEOGRAPH-2F81C;Lo;0;L;291DF;;;;N;;;;; +2F81D;CJK COMPATIBILITY IDEOGRAPH-2F81D;Lo;0;L;51F5;;;;N;;;;; +2F81E;CJK COMPATIBILITY IDEOGRAPH-2F81E;Lo;0;L;5203;;;;N;;;;; +2F81F;CJK COMPATIBILITY IDEOGRAPH-2F81F;Lo;0;L;34DF;;;;N;;;;; +2F820;CJK COMPATIBILITY IDEOGRAPH-2F820;Lo;0;L;523B;;;;N;;;;; +2F821;CJK COMPATIBILITY IDEOGRAPH-2F821;Lo;0;L;5246;;;;N;;;;; +2F822;CJK COMPATIBILITY IDEOGRAPH-2F822;Lo;0;L;5272;;;;N;;;;; +2F823;CJK COMPATIBILITY IDEOGRAPH-2F823;Lo;0;L;5277;;;;N;;;;; +2F824;CJK COMPATIBILITY IDEOGRAPH-2F824;Lo;0;L;3515;;;;N;;;;; +2F825;CJK COMPATIBILITY IDEOGRAPH-2F825;Lo;0;L;52C7;;;;N;;;;; +2F826;CJK COMPATIBILITY IDEOGRAPH-2F826;Lo;0;L;52C9;;;;N;;;;; +2F827;CJK COMPATIBILITY IDEOGRAPH-2F827;Lo;0;L;52E4;;;;N;;;;; +2F828;CJK COMPATIBILITY IDEOGRAPH-2F828;Lo;0;L;52FA;;;;N;;;;; +2F829;CJK COMPATIBILITY IDEOGRAPH-2F829;Lo;0;L;5305;;;;N;;;;; +2F82A;CJK COMPATIBILITY IDEOGRAPH-2F82A;Lo;0;L;5306;;;;N;;;;; +2F82B;CJK COMPATIBILITY IDEOGRAPH-2F82B;Lo;0;L;5317;;;;N;;;;; +2F82C;CJK COMPATIBILITY IDEOGRAPH-2F82C;Lo;0;L;5349;;;;N;;;;; +2F82D;CJK COMPATIBILITY IDEOGRAPH-2F82D;Lo;0;L;5351;;;;N;;;;; +2F82E;CJK COMPATIBILITY IDEOGRAPH-2F82E;Lo;0;L;535A;;;;N;;;;; +2F82F;CJK COMPATIBILITY IDEOGRAPH-2F82F;Lo;0;L;5373;;;;N;;;;; +2F830;CJK COMPATIBILITY IDEOGRAPH-2F830;Lo;0;L;537D;;;;N;;;;; +2F831;CJK COMPATIBILITY IDEOGRAPH-2F831;Lo;0;L;537F;;;;N;;;;; +2F832;CJK COMPATIBILITY IDEOGRAPH-2F832;Lo;0;L;537F;;;;N;;;;; +2F833;CJK COMPATIBILITY IDEOGRAPH-2F833;Lo;0;L;537F;;;;N;;;;; +2F834;CJK COMPATIBILITY IDEOGRAPH-2F834;Lo;0;L;20A2C;;;;N;;;;; +2F835;CJK COMPATIBILITY IDEOGRAPH-2F835;Lo;0;L;7070;;;;N;;;;; +2F836;CJK COMPATIBILITY IDEOGRAPH-2F836;Lo;0;L;53CA;;;;N;;;;; +2F837;CJK COMPATIBILITY IDEOGRAPH-2F837;Lo;0;L;53DF;;;;N;;;;; +2F838;CJK COMPATIBILITY IDEOGRAPH-2F838;Lo;0;L;20B63;;;;N;;;;; +2F839;CJK COMPATIBILITY IDEOGRAPH-2F839;Lo;0;L;53EB;;;;N;;;;; +2F83A;CJK COMPATIBILITY IDEOGRAPH-2F83A;Lo;0;L;53F1;;;;N;;;;; +2F83B;CJK COMPATIBILITY IDEOGRAPH-2F83B;Lo;0;L;5406;;;;N;;;;; +2F83C;CJK COMPATIBILITY IDEOGRAPH-2F83C;Lo;0;L;549E;;;;N;;;;; +2F83D;CJK COMPATIBILITY IDEOGRAPH-2F83D;Lo;0;L;5438;;;;N;;;;; +2F83E;CJK COMPATIBILITY IDEOGRAPH-2F83E;Lo;0;L;5448;;;;N;;;;; +2F83F;CJK COMPATIBILITY IDEOGRAPH-2F83F;Lo;0;L;5468;;;;N;;;;; +2F840;CJK COMPATIBILITY IDEOGRAPH-2F840;Lo;0;L;54A2;;;;N;;;;; +2F841;CJK COMPATIBILITY IDEOGRAPH-2F841;Lo;0;L;54F6;;;;N;;;;; +2F842;CJK COMPATIBILITY IDEOGRAPH-2F842;Lo;0;L;5510;;;;N;;;;; +2F843;CJK COMPATIBILITY IDEOGRAPH-2F843;Lo;0;L;5553;;;;N;;;;; +2F844;CJK COMPATIBILITY IDEOGRAPH-2F844;Lo;0;L;5563;;;;N;;;;; +2F845;CJK COMPATIBILITY IDEOGRAPH-2F845;Lo;0;L;5584;;;;N;;;;; +2F846;CJK COMPATIBILITY IDEOGRAPH-2F846;Lo;0;L;5584;;;;N;;;;; +2F847;CJK COMPATIBILITY IDEOGRAPH-2F847;Lo;0;L;5599;;;;N;;;;; +2F848;CJK COMPATIBILITY IDEOGRAPH-2F848;Lo;0;L;55AB;;;;N;;;;; +2F849;CJK COMPATIBILITY IDEOGRAPH-2F849;Lo;0;L;55B3;;;;N;;;;; +2F84A;CJK COMPATIBILITY IDEOGRAPH-2F84A;Lo;0;L;55C2;;;;N;;;;; +2F84B;CJK COMPATIBILITY IDEOGRAPH-2F84B;Lo;0;L;5716;;;;N;;;;; +2F84C;CJK COMPATIBILITY IDEOGRAPH-2F84C;Lo;0;L;5606;;;;N;;;;; +2F84D;CJK COMPATIBILITY IDEOGRAPH-2F84D;Lo;0;L;5717;;;;N;;;;; +2F84E;CJK COMPATIBILITY IDEOGRAPH-2F84E;Lo;0;L;5651;;;;N;;;;; +2F84F;CJK COMPATIBILITY IDEOGRAPH-2F84F;Lo;0;L;5674;;;;N;;;;; +2F850;CJK COMPATIBILITY IDEOGRAPH-2F850;Lo;0;L;5207;;;;N;;;;; +2F851;CJK COMPATIBILITY IDEOGRAPH-2F851;Lo;0;L;58EE;;;;N;;;;; +2F852;CJK COMPATIBILITY IDEOGRAPH-2F852;Lo;0;L;57CE;;;;N;;;;; +2F853;CJK COMPATIBILITY IDEOGRAPH-2F853;Lo;0;L;57F4;;;;N;;;;; +2F854;CJK COMPATIBILITY IDEOGRAPH-2F854;Lo;0;L;580D;;;;N;;;;; +2F855;CJK COMPATIBILITY IDEOGRAPH-2F855;Lo;0;L;578B;;;;N;;;;; +2F856;CJK COMPATIBILITY IDEOGRAPH-2F856;Lo;0;L;5832;;;;N;;;;; +2F857;CJK COMPATIBILITY IDEOGRAPH-2F857;Lo;0;L;5831;;;;N;;;;; +2F858;CJK COMPATIBILITY IDEOGRAPH-2F858;Lo;0;L;58AC;;;;N;;;;; +2F859;CJK COMPATIBILITY IDEOGRAPH-2F859;Lo;0;L;214E4;;;;N;;;;; +2F85A;CJK COMPATIBILITY IDEOGRAPH-2F85A;Lo;0;L;58F2;;;;N;;;;; +2F85B;CJK COMPATIBILITY IDEOGRAPH-2F85B;Lo;0;L;58F7;;;;N;;;;; +2F85C;CJK COMPATIBILITY IDEOGRAPH-2F85C;Lo;0;L;5906;;;;N;;;;; +2F85D;CJK COMPATIBILITY IDEOGRAPH-2F85D;Lo;0;L;591A;;;;N;;;;; +2F85E;CJK COMPATIBILITY IDEOGRAPH-2F85E;Lo;0;L;5922;;;;N;;;;; +2F85F;CJK COMPATIBILITY IDEOGRAPH-2F85F;Lo;0;L;5962;;;;N;;;;; +2F860;CJK COMPATIBILITY IDEOGRAPH-2F860;Lo;0;L;216A8;;;;N;;;;; +2F861;CJK COMPATIBILITY IDEOGRAPH-2F861;Lo;0;L;216EA;;;;N;;;;; +2F862;CJK COMPATIBILITY IDEOGRAPH-2F862;Lo;0;L;59EC;;;;N;;;;; +2F863;CJK COMPATIBILITY IDEOGRAPH-2F863;Lo;0;L;5A1B;;;;N;;;;; +2F864;CJK COMPATIBILITY IDEOGRAPH-2F864;Lo;0;L;5A27;;;;N;;;;; +2F865;CJK COMPATIBILITY IDEOGRAPH-2F865;Lo;0;L;59D8;;;;N;;;;; +2F866;CJK COMPATIBILITY IDEOGRAPH-2F866;Lo;0;L;5A66;;;;N;;;;; +2F867;CJK COMPATIBILITY IDEOGRAPH-2F867;Lo;0;L;36EE;;;;N;;;;; +2F868;CJK COMPATIBILITY IDEOGRAPH-2F868;Lo;0;L;36FC;;;;N;;;;; +2F869;CJK COMPATIBILITY IDEOGRAPH-2F869;Lo;0;L;5B08;;;;N;;;;; +2F86A;CJK COMPATIBILITY IDEOGRAPH-2F86A;Lo;0;L;5B3E;;;;N;;;;; +2F86B;CJK COMPATIBILITY IDEOGRAPH-2F86B;Lo;0;L;5B3E;;;;N;;;;; +2F86C;CJK COMPATIBILITY IDEOGRAPH-2F86C;Lo;0;L;219C8;;;;N;;;;; +2F86D;CJK COMPATIBILITY IDEOGRAPH-2F86D;Lo;0;L;5BC3;;;;N;;;;; +2F86E;CJK COMPATIBILITY IDEOGRAPH-2F86E;Lo;0;L;5BD8;;;;N;;;;; +2F86F;CJK COMPATIBILITY IDEOGRAPH-2F86F;Lo;0;L;5BE7;;;;N;;;;; +2F870;CJK COMPATIBILITY IDEOGRAPH-2F870;Lo;0;L;5BF3;;;;N;;;;; +2F871;CJK COMPATIBILITY IDEOGRAPH-2F871;Lo;0;L;21B18;;;;N;;;;; +2F872;CJK COMPATIBILITY IDEOGRAPH-2F872;Lo;0;L;5BFF;;;;N;;;;; +2F873;CJK COMPATIBILITY IDEOGRAPH-2F873;Lo;0;L;5C06;;;;N;;;;; +2F874;CJK COMPATIBILITY IDEOGRAPH-2F874;Lo;0;L;5F53;;;;N;;;;; +2F875;CJK COMPATIBILITY IDEOGRAPH-2F875;Lo;0;L;5C22;;;;N;;;;; +2F876;CJK COMPATIBILITY IDEOGRAPH-2F876;Lo;0;L;3781;;;;N;;;;; +2F877;CJK COMPATIBILITY IDEOGRAPH-2F877;Lo;0;L;5C60;;;;N;;;;; +2F878;CJK COMPATIBILITY IDEOGRAPH-2F878;Lo;0;L;5C6E;;;;N;;;;; +2F879;CJK COMPATIBILITY IDEOGRAPH-2F879;Lo;0;L;5CC0;;;;N;;;;; +2F87A;CJK COMPATIBILITY IDEOGRAPH-2F87A;Lo;0;L;5C8D;;;;N;;;;; +2F87B;CJK COMPATIBILITY IDEOGRAPH-2F87B;Lo;0;L;21DE4;;;;N;;;;; +2F87C;CJK COMPATIBILITY IDEOGRAPH-2F87C;Lo;0;L;5D43;;;;N;;;;; +2F87D;CJK COMPATIBILITY IDEOGRAPH-2F87D;Lo;0;L;21DE6;;;;N;;;;; +2F87E;CJK COMPATIBILITY IDEOGRAPH-2F87E;Lo;0;L;5D6E;;;;N;;;;; +2F87F;CJK COMPATIBILITY IDEOGRAPH-2F87F;Lo;0;L;5D6B;;;;N;;;;; +2F880;CJK COMPATIBILITY IDEOGRAPH-2F880;Lo;0;L;5D7C;;;;N;;;;; +2F881;CJK COMPATIBILITY IDEOGRAPH-2F881;Lo;0;L;5DE1;;;;N;;;;; +2F882;CJK COMPATIBILITY IDEOGRAPH-2F882;Lo;0;L;5DE2;;;;N;;;;; +2F883;CJK COMPATIBILITY IDEOGRAPH-2F883;Lo;0;L;382F;;;;N;;;;; +2F884;CJK COMPATIBILITY IDEOGRAPH-2F884;Lo;0;L;5DFD;;;;N;;;;; +2F885;CJK COMPATIBILITY IDEOGRAPH-2F885;Lo;0;L;5E28;;;;N;;;;; +2F886;CJK COMPATIBILITY IDEOGRAPH-2F886;Lo;0;L;5E3D;;;;N;;;;; +2F887;CJK COMPATIBILITY IDEOGRAPH-2F887;Lo;0;L;5E69;;;;N;;;;; +2F888;CJK COMPATIBILITY IDEOGRAPH-2F888;Lo;0;L;3862;;;;N;;;;; +2F889;CJK COMPATIBILITY IDEOGRAPH-2F889;Lo;0;L;22183;;;;N;;;;; +2F88A;CJK COMPATIBILITY IDEOGRAPH-2F88A;Lo;0;L;387C;;;;N;;;;; +2F88B;CJK COMPATIBILITY IDEOGRAPH-2F88B;Lo;0;L;5EB0;;;;N;;;;; +2F88C;CJK COMPATIBILITY IDEOGRAPH-2F88C;Lo;0;L;5EB3;;;;N;;;;; +2F88D;CJK COMPATIBILITY IDEOGRAPH-2F88D;Lo;0;L;5EB6;;;;N;;;;; +2F88E;CJK COMPATIBILITY IDEOGRAPH-2F88E;Lo;0;L;5ECA;;;;N;;;;; +2F88F;CJK COMPATIBILITY IDEOGRAPH-2F88F;Lo;0;L;2A392;;;;N;;;;; +2F890;CJK COMPATIBILITY IDEOGRAPH-2F890;Lo;0;L;5EFE;;;9;N;;;;; +2F891;CJK COMPATIBILITY IDEOGRAPH-2F891;Lo;0;L;22331;;;;N;;;;; +2F892;CJK COMPATIBILITY IDEOGRAPH-2F892;Lo;0;L;22331;;;;N;;;;; +2F893;CJK COMPATIBILITY IDEOGRAPH-2F893;Lo;0;L;8201;;;;N;;;;; +2F894;CJK COMPATIBILITY IDEOGRAPH-2F894;Lo;0;L;5F22;;;;N;;;;; +2F895;CJK COMPATIBILITY IDEOGRAPH-2F895;Lo;0;L;5F22;;;;N;;;;; +2F896;CJK COMPATIBILITY IDEOGRAPH-2F896;Lo;0;L;38C7;;;;N;;;;; +2F897;CJK COMPATIBILITY IDEOGRAPH-2F897;Lo;0;L;232B8;;;;N;;;;; +2F898;CJK COMPATIBILITY IDEOGRAPH-2F898;Lo;0;L;261DA;;;;N;;;;; +2F899;CJK COMPATIBILITY IDEOGRAPH-2F899;Lo;0;L;5F62;;;;N;;;;; +2F89A;CJK COMPATIBILITY IDEOGRAPH-2F89A;Lo;0;L;5F6B;;;;N;;;;; +2F89B;CJK COMPATIBILITY IDEOGRAPH-2F89B;Lo;0;L;38E3;;;;N;;;;; +2F89C;CJK COMPATIBILITY IDEOGRAPH-2F89C;Lo;0;L;5F9A;;;;N;;;;; +2F89D;CJK COMPATIBILITY IDEOGRAPH-2F89D;Lo;0;L;5FCD;;;;N;;;;; +2F89E;CJK COMPATIBILITY IDEOGRAPH-2F89E;Lo;0;L;5FD7;;;;N;;;;; +2F89F;CJK COMPATIBILITY IDEOGRAPH-2F89F;Lo;0;L;5FF9;;;;N;;;;; +2F8A0;CJK COMPATIBILITY IDEOGRAPH-2F8A0;Lo;0;L;6081;;;;N;;;;; +2F8A1;CJK COMPATIBILITY IDEOGRAPH-2F8A1;Lo;0;L;393A;;;;N;;;;; +2F8A2;CJK COMPATIBILITY IDEOGRAPH-2F8A2;Lo;0;L;391C;;;;N;;;;; +2F8A3;CJK COMPATIBILITY IDEOGRAPH-2F8A3;Lo;0;L;6094;;;;N;;;;; +2F8A4;CJK COMPATIBILITY IDEOGRAPH-2F8A4;Lo;0;L;226D4;;;;N;;;;; +2F8A5;CJK COMPATIBILITY IDEOGRAPH-2F8A5;Lo;0;L;60C7;;;;N;;;;; +2F8A6;CJK COMPATIBILITY IDEOGRAPH-2F8A6;Lo;0;L;6148;;;;N;;;;; +2F8A7;CJK COMPATIBILITY IDEOGRAPH-2F8A7;Lo;0;L;614C;;;;N;;;;; +2F8A8;CJK COMPATIBILITY IDEOGRAPH-2F8A8;Lo;0;L;614E;;;;N;;;;; +2F8A9;CJK COMPATIBILITY IDEOGRAPH-2F8A9;Lo;0;L;614C;;;;N;;;;; +2F8AA;CJK COMPATIBILITY IDEOGRAPH-2F8AA;Lo;0;L;617A;;;;N;;;;; +2F8AB;CJK COMPATIBILITY IDEOGRAPH-2F8AB;Lo;0;L;618E;;;;N;;;;; +2F8AC;CJK COMPATIBILITY IDEOGRAPH-2F8AC;Lo;0;L;61B2;;;;N;;;;; +2F8AD;CJK COMPATIBILITY IDEOGRAPH-2F8AD;Lo;0;L;61A4;;;;N;;;;; +2F8AE;CJK COMPATIBILITY IDEOGRAPH-2F8AE;Lo;0;L;61AF;;;;N;;;;; +2F8AF;CJK COMPATIBILITY IDEOGRAPH-2F8AF;Lo;0;L;61DE;;;;N;;;;; +2F8B0;CJK COMPATIBILITY IDEOGRAPH-2F8B0;Lo;0;L;61F2;;;;N;;;;; +2F8B1;CJK COMPATIBILITY IDEOGRAPH-2F8B1;Lo;0;L;61F6;;;;N;;;;; +2F8B2;CJK COMPATIBILITY IDEOGRAPH-2F8B2;Lo;0;L;6210;;;;N;;;;; +2F8B3;CJK COMPATIBILITY IDEOGRAPH-2F8B3;Lo;0;L;621B;;;;N;;;;; +2F8B4;CJK COMPATIBILITY IDEOGRAPH-2F8B4;Lo;0;L;625D;;;;N;;;;; +2F8B5;CJK COMPATIBILITY IDEOGRAPH-2F8B5;Lo;0;L;62B1;;;;N;;;;; +2F8B6;CJK COMPATIBILITY IDEOGRAPH-2F8B6;Lo;0;L;62D4;;;;N;;;;; +2F8B7;CJK COMPATIBILITY IDEOGRAPH-2F8B7;Lo;0;L;6350;;;;N;;;;; +2F8B8;CJK COMPATIBILITY IDEOGRAPH-2F8B8;Lo;0;L;22B0C;;;;N;;;;; +2F8B9;CJK COMPATIBILITY IDEOGRAPH-2F8B9;Lo;0;L;633D;;;;N;;;;; +2F8BA;CJK COMPATIBILITY IDEOGRAPH-2F8BA;Lo;0;L;62FC;;;;N;;;;; +2F8BB;CJK COMPATIBILITY IDEOGRAPH-2F8BB;Lo;0;L;6368;;;;N;;;;; +2F8BC;CJK COMPATIBILITY IDEOGRAPH-2F8BC;Lo;0;L;6383;;;;N;;;;; +2F8BD;CJK COMPATIBILITY IDEOGRAPH-2F8BD;Lo;0;L;63E4;;;;N;;;;; +2F8BE;CJK COMPATIBILITY IDEOGRAPH-2F8BE;Lo;0;L;22BF1;;;;N;;;;; +2F8BF;CJK COMPATIBILITY IDEOGRAPH-2F8BF;Lo;0;L;6422;;;;N;;;;; +2F8C0;CJK COMPATIBILITY IDEOGRAPH-2F8C0;Lo;0;L;63C5;;;;N;;;;; +2F8C1;CJK COMPATIBILITY IDEOGRAPH-2F8C1;Lo;0;L;63A9;;;;N;;;;; +2F8C2;CJK COMPATIBILITY IDEOGRAPH-2F8C2;Lo;0;L;3A2E;;;;N;;;;; +2F8C3;CJK COMPATIBILITY IDEOGRAPH-2F8C3;Lo;0;L;6469;;;;N;;;;; +2F8C4;CJK COMPATIBILITY IDEOGRAPH-2F8C4;Lo;0;L;647E;;;;N;;;;; +2F8C5;CJK COMPATIBILITY IDEOGRAPH-2F8C5;Lo;0;L;649D;;;;N;;;;; +2F8C6;CJK COMPATIBILITY IDEOGRAPH-2F8C6;Lo;0;L;6477;;;;N;;;;; +2F8C7;CJK COMPATIBILITY IDEOGRAPH-2F8C7;Lo;0;L;3A6C;;;;N;;;;; +2F8C8;CJK COMPATIBILITY IDEOGRAPH-2F8C8;Lo;0;L;654F;;;;N;;;;; +2F8C9;CJK COMPATIBILITY IDEOGRAPH-2F8C9;Lo;0;L;656C;;;;N;;;;; +2F8CA;CJK COMPATIBILITY IDEOGRAPH-2F8CA;Lo;0;L;2300A;;;;N;;;;; +2F8CB;CJK COMPATIBILITY IDEOGRAPH-2F8CB;Lo;0;L;65E3;;;;N;;;;; +2F8CC;CJK COMPATIBILITY IDEOGRAPH-2F8CC;Lo;0;L;66F8;;;;N;;;;; +2F8CD;CJK COMPATIBILITY IDEOGRAPH-2F8CD;Lo;0;L;6649;;;;N;;;;; +2F8CE;CJK COMPATIBILITY IDEOGRAPH-2F8CE;Lo;0;L;3B19;;;;N;;;;; +2F8CF;CJK COMPATIBILITY IDEOGRAPH-2F8CF;Lo;0;L;6691;;;;N;;;;; +2F8D0;CJK COMPATIBILITY IDEOGRAPH-2F8D0;Lo;0;L;3B08;;;;N;;;;; +2F8D1;CJK COMPATIBILITY IDEOGRAPH-2F8D1;Lo;0;L;3AE4;;;;N;;;;; +2F8D2;CJK COMPATIBILITY IDEOGRAPH-2F8D2;Lo;0;L;5192;;;;N;;;;; +2F8D3;CJK COMPATIBILITY IDEOGRAPH-2F8D3;Lo;0;L;5195;;;;N;;;;; +2F8D4;CJK COMPATIBILITY IDEOGRAPH-2F8D4;Lo;0;L;6700;;;;N;;;;; +2F8D5;CJK COMPATIBILITY IDEOGRAPH-2F8D5;Lo;0;L;669C;;;;N;;;;; +2F8D6;CJK COMPATIBILITY IDEOGRAPH-2F8D6;Lo;0;L;80AD;;;;N;;;;; +2F8D7;CJK COMPATIBILITY IDEOGRAPH-2F8D7;Lo;0;L;43D9;;;;N;;;;; +2F8D8;CJK COMPATIBILITY IDEOGRAPH-2F8D8;Lo;0;L;6717;;;;N;;;;; +2F8D9;CJK COMPATIBILITY IDEOGRAPH-2F8D9;Lo;0;L;671B;;;;N;;;;; +2F8DA;CJK COMPATIBILITY IDEOGRAPH-2F8DA;Lo;0;L;6721;;;;N;;;;; +2F8DB;CJK COMPATIBILITY IDEOGRAPH-2F8DB;Lo;0;L;675E;;;;N;;;;; +2F8DC;CJK COMPATIBILITY IDEOGRAPH-2F8DC;Lo;0;L;6753;;;;N;;;;; +2F8DD;CJK COMPATIBILITY IDEOGRAPH-2F8DD;Lo;0;L;233C3;;;;N;;;;; +2F8DE;CJK COMPATIBILITY IDEOGRAPH-2F8DE;Lo;0;L;3B49;;;;N;;;;; +2F8DF;CJK COMPATIBILITY IDEOGRAPH-2F8DF;Lo;0;L;67FA;;;;N;;;;; +2F8E0;CJK COMPATIBILITY IDEOGRAPH-2F8E0;Lo;0;L;6785;;;;N;;;;; +2F8E1;CJK COMPATIBILITY IDEOGRAPH-2F8E1;Lo;0;L;6852;;;;N;;;;; +2F8E2;CJK COMPATIBILITY IDEOGRAPH-2F8E2;Lo;0;L;6885;;;;N;;;;; +2F8E3;CJK COMPATIBILITY IDEOGRAPH-2F8E3;Lo;0;L;2346D;;;;N;;;;; +2F8E4;CJK COMPATIBILITY IDEOGRAPH-2F8E4;Lo;0;L;688E;;;;N;;;;; +2F8E5;CJK COMPATIBILITY IDEOGRAPH-2F8E5;Lo;0;L;681F;;;;N;;;;; +2F8E6;CJK COMPATIBILITY IDEOGRAPH-2F8E6;Lo;0;L;6914;;;;N;;;;; +2F8E7;CJK COMPATIBILITY IDEOGRAPH-2F8E7;Lo;0;L;3B9D;;;;N;;;;; +2F8E8;CJK COMPATIBILITY IDEOGRAPH-2F8E8;Lo;0;L;6942;;;;N;;;;; +2F8E9;CJK COMPATIBILITY IDEOGRAPH-2F8E9;Lo;0;L;69A3;;;;N;;;;; +2F8EA;CJK COMPATIBILITY IDEOGRAPH-2F8EA;Lo;0;L;69EA;;;;N;;;;; +2F8EB;CJK COMPATIBILITY IDEOGRAPH-2F8EB;Lo;0;L;6AA8;;;;N;;;;; +2F8EC;CJK COMPATIBILITY IDEOGRAPH-2F8EC;Lo;0;L;236A3;;;;N;;;;; +2F8ED;CJK COMPATIBILITY IDEOGRAPH-2F8ED;Lo;0;L;6ADB;;;;N;;;;; +2F8EE;CJK COMPATIBILITY IDEOGRAPH-2F8EE;Lo;0;L;3C18;;;;N;;;;; +2F8EF;CJK COMPATIBILITY IDEOGRAPH-2F8EF;Lo;0;L;6B21;;;;N;;;;; +2F8F0;CJK COMPATIBILITY IDEOGRAPH-2F8F0;Lo;0;L;238A7;;;;N;;;;; +2F8F1;CJK COMPATIBILITY IDEOGRAPH-2F8F1;Lo;0;L;6B54;;;;N;;;;; +2F8F2;CJK COMPATIBILITY IDEOGRAPH-2F8F2;Lo;0;L;3C4E;;;;N;;;;; +2F8F3;CJK COMPATIBILITY IDEOGRAPH-2F8F3;Lo;0;L;6B72;;;;N;;;;; +2F8F4;CJK COMPATIBILITY IDEOGRAPH-2F8F4;Lo;0;L;6B9F;;;;N;;;;; +2F8F5;CJK COMPATIBILITY IDEOGRAPH-2F8F5;Lo;0;L;6BBA;;;;N;;;;; +2F8F6;CJK COMPATIBILITY IDEOGRAPH-2F8F6;Lo;0;L;6BBB;;;;N;;;;; +2F8F7;CJK COMPATIBILITY IDEOGRAPH-2F8F7;Lo;0;L;23A8D;;;;N;;;;; +2F8F8;CJK COMPATIBILITY IDEOGRAPH-2F8F8;Lo;0;L;21D0B;;;;N;;;;; +2F8F9;CJK COMPATIBILITY IDEOGRAPH-2F8F9;Lo;0;L;23AFA;;;;N;;;;; +2F8FA;CJK COMPATIBILITY IDEOGRAPH-2F8FA;Lo;0;L;6C4E;;;;N;;;;; +2F8FB;CJK COMPATIBILITY IDEOGRAPH-2F8FB;Lo;0;L;23CBC;;;;N;;;;; +2F8FC;CJK COMPATIBILITY IDEOGRAPH-2F8FC;Lo;0;L;6CBF;;;;N;;;;; +2F8FD;CJK COMPATIBILITY IDEOGRAPH-2F8FD;Lo;0;L;6CCD;;;;N;;;;; +2F8FE;CJK COMPATIBILITY IDEOGRAPH-2F8FE;Lo;0;L;6C67;;;;N;;;;; +2F8FF;CJK COMPATIBILITY IDEOGRAPH-2F8FF;Lo;0;L;6D16;;;;N;;;;; +2F900;CJK COMPATIBILITY IDEOGRAPH-2F900;Lo;0;L;6D3E;;;;N;;;;; +2F901;CJK COMPATIBILITY IDEOGRAPH-2F901;Lo;0;L;6D77;;;;N;;;;; +2F902;CJK COMPATIBILITY IDEOGRAPH-2F902;Lo;0;L;6D41;;;;N;;;;; +2F903;CJK COMPATIBILITY IDEOGRAPH-2F903;Lo;0;L;6D69;;;;N;;;;; +2F904;CJK COMPATIBILITY IDEOGRAPH-2F904;Lo;0;L;6D78;;;;N;;;;; +2F905;CJK COMPATIBILITY IDEOGRAPH-2F905;Lo;0;L;6D85;;;;N;;;;; +2F906;CJK COMPATIBILITY IDEOGRAPH-2F906;Lo;0;L;23D1E;;;;N;;;;; +2F907;CJK COMPATIBILITY IDEOGRAPH-2F907;Lo;0;L;6D34;;;;N;;;;; +2F908;CJK COMPATIBILITY IDEOGRAPH-2F908;Lo;0;L;6E2F;;;;N;;;;; +2F909;CJK COMPATIBILITY IDEOGRAPH-2F909;Lo;0;L;6E6E;;;;N;;;;; +2F90A;CJK COMPATIBILITY IDEOGRAPH-2F90A;Lo;0;L;3D33;;;;N;;;;; +2F90B;CJK COMPATIBILITY IDEOGRAPH-2F90B;Lo;0;L;6ECB;;;;N;;;;; +2F90C;CJK COMPATIBILITY IDEOGRAPH-2F90C;Lo;0;L;6EC7;;;;N;;;;; +2F90D;CJK COMPATIBILITY IDEOGRAPH-2F90D;Lo;0;L;23ED1;;;;N;;;;; +2F90E;CJK COMPATIBILITY IDEOGRAPH-2F90E;Lo;0;L;6DF9;;;;N;;;;; +2F90F;CJK COMPATIBILITY IDEOGRAPH-2F90F;Lo;0;L;6F6E;;;;N;;;;; +2F910;CJK COMPATIBILITY IDEOGRAPH-2F910;Lo;0;L;23F5E;;;;N;;;;; +2F911;CJK COMPATIBILITY IDEOGRAPH-2F911;Lo;0;L;23F8E;;;;N;;;;; +2F912;CJK COMPATIBILITY IDEOGRAPH-2F912;Lo;0;L;6FC6;;;;N;;;;; +2F913;CJK COMPATIBILITY IDEOGRAPH-2F913;Lo;0;L;7039;;;;N;;;;; +2F914;CJK COMPATIBILITY IDEOGRAPH-2F914;Lo;0;L;701E;;;;N;;;;; +2F915;CJK COMPATIBILITY IDEOGRAPH-2F915;Lo;0;L;701B;;;;N;;;;; +2F916;CJK COMPATIBILITY IDEOGRAPH-2F916;Lo;0;L;3D96;;;;N;;;;; +2F917;CJK COMPATIBILITY IDEOGRAPH-2F917;Lo;0;L;704A;;;;N;;;;; +2F918;CJK COMPATIBILITY IDEOGRAPH-2F918;Lo;0;L;707D;;;;N;;;;; +2F919;CJK COMPATIBILITY IDEOGRAPH-2F919;Lo;0;L;7077;;;;N;;;;; +2F91A;CJK COMPATIBILITY IDEOGRAPH-2F91A;Lo;0;L;70AD;;;;N;;;;; +2F91B;CJK COMPATIBILITY IDEOGRAPH-2F91B;Lo;0;L;20525;;;;N;;;;; +2F91C;CJK COMPATIBILITY IDEOGRAPH-2F91C;Lo;0;L;7145;;;;N;;;;; +2F91D;CJK COMPATIBILITY IDEOGRAPH-2F91D;Lo;0;L;24263;;;;N;;;;; +2F91E;CJK COMPATIBILITY IDEOGRAPH-2F91E;Lo;0;L;719C;;;;N;;;;; +2F91F;CJK COMPATIBILITY IDEOGRAPH-2F91F;Lo;0;L;243AB;;;;N;;;;; +2F920;CJK COMPATIBILITY IDEOGRAPH-2F920;Lo;0;L;7228;;;;N;;;;; +2F921;CJK COMPATIBILITY IDEOGRAPH-2F921;Lo;0;L;7235;;;;N;;;;; +2F922;CJK COMPATIBILITY IDEOGRAPH-2F922;Lo;0;L;7250;;;;N;;;;; +2F923;CJK COMPATIBILITY IDEOGRAPH-2F923;Lo;0;L;24608;;;;N;;;;; +2F924;CJK COMPATIBILITY IDEOGRAPH-2F924;Lo;0;L;7280;;;;N;;;;; +2F925;CJK COMPATIBILITY IDEOGRAPH-2F925;Lo;0;L;7295;;;;N;;;;; +2F926;CJK COMPATIBILITY IDEOGRAPH-2F926;Lo;0;L;24735;;;;N;;;;; +2F927;CJK COMPATIBILITY IDEOGRAPH-2F927;Lo;0;L;24814;;;;N;;;;; +2F928;CJK COMPATIBILITY IDEOGRAPH-2F928;Lo;0;L;737A;;;;N;;;;; +2F929;CJK COMPATIBILITY IDEOGRAPH-2F929;Lo;0;L;738B;;;;N;;;;; +2F92A;CJK COMPATIBILITY IDEOGRAPH-2F92A;Lo;0;L;3EAC;;;;N;;;;; +2F92B;CJK COMPATIBILITY IDEOGRAPH-2F92B;Lo;0;L;73A5;;;;N;;;;; +2F92C;CJK COMPATIBILITY IDEOGRAPH-2F92C;Lo;0;L;3EB8;;;;N;;;;; +2F92D;CJK COMPATIBILITY IDEOGRAPH-2F92D;Lo;0;L;3EB8;;;;N;;;;; +2F92E;CJK COMPATIBILITY IDEOGRAPH-2F92E;Lo;0;L;7447;;;;N;;;;; +2F92F;CJK COMPATIBILITY IDEOGRAPH-2F92F;Lo;0;L;745C;;;;N;;;;; +2F930;CJK COMPATIBILITY IDEOGRAPH-2F930;Lo;0;L;7471;;;;N;;;;; +2F931;CJK COMPATIBILITY IDEOGRAPH-2F931;Lo;0;L;7485;;;;N;;;;; +2F932;CJK COMPATIBILITY IDEOGRAPH-2F932;Lo;0;L;74CA;;;;N;;;;; +2F933;CJK COMPATIBILITY IDEOGRAPH-2F933;Lo;0;L;3F1B;;;;N;;;;; +2F934;CJK COMPATIBILITY IDEOGRAPH-2F934;Lo;0;L;7524;;;;N;;;;; +2F935;CJK COMPATIBILITY IDEOGRAPH-2F935;Lo;0;L;24C36;;;;N;;;;; +2F936;CJK COMPATIBILITY IDEOGRAPH-2F936;Lo;0;L;753E;;;;N;;;;; +2F937;CJK COMPATIBILITY IDEOGRAPH-2F937;Lo;0;L;24C92;;;;N;;;;; +2F938;CJK COMPATIBILITY IDEOGRAPH-2F938;Lo;0;L;7570;;;;N;;;;; +2F939;CJK COMPATIBILITY IDEOGRAPH-2F939;Lo;0;L;2219F;;;;N;;;;; +2F93A;CJK COMPATIBILITY IDEOGRAPH-2F93A;Lo;0;L;7610;;;;N;;;;; +2F93B;CJK COMPATIBILITY IDEOGRAPH-2F93B;Lo;0;L;24FA1;;;;N;;;;; +2F93C;CJK COMPATIBILITY IDEOGRAPH-2F93C;Lo;0;L;24FB8;;;;N;;;;; +2F93D;CJK COMPATIBILITY IDEOGRAPH-2F93D;Lo;0;L;25044;;;;N;;;;; +2F93E;CJK COMPATIBILITY IDEOGRAPH-2F93E;Lo;0;L;3FFC;;;;N;;;;; +2F93F;CJK COMPATIBILITY IDEOGRAPH-2F93F;Lo;0;L;4008;;;;N;;;;; +2F940;CJK COMPATIBILITY IDEOGRAPH-2F940;Lo;0;L;76F4;;;;N;;;;; +2F941;CJK COMPATIBILITY IDEOGRAPH-2F941;Lo;0;L;250F3;;;;N;;;;; +2F942;CJK COMPATIBILITY IDEOGRAPH-2F942;Lo;0;L;250F2;;;;N;;;;; +2F943;CJK COMPATIBILITY IDEOGRAPH-2F943;Lo;0;L;25119;;;;N;;;;; +2F944;CJK COMPATIBILITY IDEOGRAPH-2F944;Lo;0;L;25133;;;;N;;;;; +2F945;CJK COMPATIBILITY IDEOGRAPH-2F945;Lo;0;L;771E;;;;N;;;;; +2F946;CJK COMPATIBILITY IDEOGRAPH-2F946;Lo;0;L;771F;;;;N;;;;; +2F947;CJK COMPATIBILITY IDEOGRAPH-2F947;Lo;0;L;771F;;;;N;;;;; +2F948;CJK COMPATIBILITY IDEOGRAPH-2F948;Lo;0;L;774A;;;;N;;;;; +2F949;CJK COMPATIBILITY IDEOGRAPH-2F949;Lo;0;L;4039;;;;N;;;;; +2F94A;CJK COMPATIBILITY IDEOGRAPH-2F94A;Lo;0;L;778B;;;;N;;;;; +2F94B;CJK COMPATIBILITY IDEOGRAPH-2F94B;Lo;0;L;4046;;;;N;;;;; +2F94C;CJK COMPATIBILITY IDEOGRAPH-2F94C;Lo;0;L;4096;;;;N;;;;; +2F94D;CJK COMPATIBILITY IDEOGRAPH-2F94D;Lo;0;L;2541D;;;;N;;;;; +2F94E;CJK COMPATIBILITY IDEOGRAPH-2F94E;Lo;0;L;784E;;;;N;;;;; +2F94F;CJK COMPATIBILITY IDEOGRAPH-2F94F;Lo;0;L;788C;;;;N;;;;; +2F950;CJK COMPATIBILITY IDEOGRAPH-2F950;Lo;0;L;78CC;;;;N;;;;; +2F951;CJK COMPATIBILITY IDEOGRAPH-2F951;Lo;0;L;40E3;;;;N;;;;; +2F952;CJK COMPATIBILITY IDEOGRAPH-2F952;Lo;0;L;25626;;;;N;;;;; +2F953;CJK COMPATIBILITY IDEOGRAPH-2F953;Lo;0;L;7956;;;;N;;;;; +2F954;CJK COMPATIBILITY IDEOGRAPH-2F954;Lo;0;L;2569A;;;;N;;;;; +2F955;CJK COMPATIBILITY IDEOGRAPH-2F955;Lo;0;L;256C5;;;;N;;;;; +2F956;CJK COMPATIBILITY IDEOGRAPH-2F956;Lo;0;L;798F;;;;N;;;;; +2F957;CJK COMPATIBILITY IDEOGRAPH-2F957;Lo;0;L;79EB;;;;N;;;;; +2F958;CJK COMPATIBILITY IDEOGRAPH-2F958;Lo;0;L;412F;;;;N;;;;; +2F959;CJK COMPATIBILITY IDEOGRAPH-2F959;Lo;0;L;7A40;;;;N;;;;; +2F95A;CJK COMPATIBILITY IDEOGRAPH-2F95A;Lo;0;L;7A4A;;;;N;;;;; +2F95B;CJK COMPATIBILITY IDEOGRAPH-2F95B;Lo;0;L;7A4F;;;;N;;;;; +2F95C;CJK COMPATIBILITY IDEOGRAPH-2F95C;Lo;0;L;2597C;;;;N;;;;; +2F95D;CJK COMPATIBILITY IDEOGRAPH-2F95D;Lo;0;L;25AA7;;;;N;;;;; +2F95E;CJK COMPATIBILITY IDEOGRAPH-2F95E;Lo;0;L;25AA7;;;;N;;;;; +2F95F;CJK COMPATIBILITY IDEOGRAPH-2F95F;Lo;0;L;7AEE;;;;N;;;;; +2F960;CJK COMPATIBILITY IDEOGRAPH-2F960;Lo;0;L;4202;;;;N;;;;; +2F961;CJK COMPATIBILITY IDEOGRAPH-2F961;Lo;0;L;25BAB;;;;N;;;;; +2F962;CJK COMPATIBILITY IDEOGRAPH-2F962;Lo;0;L;7BC6;;;;N;;;;; +2F963;CJK COMPATIBILITY IDEOGRAPH-2F963;Lo;0;L;7BC9;;;;N;;;;; +2F964;CJK COMPATIBILITY IDEOGRAPH-2F964;Lo;0;L;4227;;;;N;;;;; +2F965;CJK COMPATIBILITY IDEOGRAPH-2F965;Lo;0;L;25C80;;;;N;;;;; +2F966;CJK COMPATIBILITY IDEOGRAPH-2F966;Lo;0;L;7CD2;;;;N;;;;; +2F967;CJK COMPATIBILITY IDEOGRAPH-2F967;Lo;0;L;42A0;;;;N;;;;; +2F968;CJK COMPATIBILITY IDEOGRAPH-2F968;Lo;0;L;7CE8;;;;N;;;;; +2F969;CJK COMPATIBILITY IDEOGRAPH-2F969;Lo;0;L;7CE3;;;;N;;;;; +2F96A;CJK COMPATIBILITY IDEOGRAPH-2F96A;Lo;0;L;7D00;;;;N;;;;; +2F96B;CJK COMPATIBILITY IDEOGRAPH-2F96B;Lo;0;L;25F86;;;;N;;;;; +2F96C;CJK COMPATIBILITY IDEOGRAPH-2F96C;Lo;0;L;7D63;;;;N;;;;; +2F96D;CJK COMPATIBILITY IDEOGRAPH-2F96D;Lo;0;L;4301;;;;N;;;;; +2F96E;CJK COMPATIBILITY IDEOGRAPH-2F96E;Lo;0;L;7DC7;;;;N;;;;; +2F96F;CJK COMPATIBILITY IDEOGRAPH-2F96F;Lo;0;L;7E02;;;;N;;;;; +2F970;CJK COMPATIBILITY IDEOGRAPH-2F970;Lo;0;L;7E45;;;;N;;;;; +2F971;CJK COMPATIBILITY IDEOGRAPH-2F971;Lo;0;L;4334;;;;N;;;;; +2F972;CJK COMPATIBILITY IDEOGRAPH-2F972;Lo;0;L;26228;;;;N;;;;; +2F973;CJK COMPATIBILITY IDEOGRAPH-2F973;Lo;0;L;26247;;;;N;;;;; +2F974;CJK COMPATIBILITY IDEOGRAPH-2F974;Lo;0;L;4359;;;;N;;;;; +2F975;CJK COMPATIBILITY IDEOGRAPH-2F975;Lo;0;L;262D9;;;;N;;;;; +2F976;CJK COMPATIBILITY IDEOGRAPH-2F976;Lo;0;L;7F7A;;;;N;;;;; +2F977;CJK COMPATIBILITY IDEOGRAPH-2F977;Lo;0;L;2633E;;;;N;;;;; +2F978;CJK COMPATIBILITY IDEOGRAPH-2F978;Lo;0;L;7F95;;;;N;;;;; +2F979;CJK COMPATIBILITY IDEOGRAPH-2F979;Lo;0;L;7FFA;;;;N;;;;; +2F97A;CJK COMPATIBILITY IDEOGRAPH-2F97A;Lo;0;L;8005;;;;N;;;;; +2F97B;CJK COMPATIBILITY IDEOGRAPH-2F97B;Lo;0;L;264DA;;;;N;;;;; +2F97C;CJK COMPATIBILITY IDEOGRAPH-2F97C;Lo;0;L;26523;;;;N;;;;; +2F97D;CJK COMPATIBILITY IDEOGRAPH-2F97D;Lo;0;L;8060;;;;N;;;;; +2F97E;CJK COMPATIBILITY IDEOGRAPH-2F97E;Lo;0;L;265A8;;;;N;;;;; +2F97F;CJK COMPATIBILITY IDEOGRAPH-2F97F;Lo;0;L;8070;;;;N;;;;; +2F980;CJK COMPATIBILITY IDEOGRAPH-2F980;Lo;0;L;2335F;;;;N;;;;; +2F981;CJK COMPATIBILITY IDEOGRAPH-2F981;Lo;0;L;43D5;;;;N;;;;; +2F982;CJK COMPATIBILITY IDEOGRAPH-2F982;Lo;0;L;80B2;;;;N;;;;; +2F983;CJK COMPATIBILITY IDEOGRAPH-2F983;Lo;0;L;8103;;;;N;;;;; +2F984;CJK COMPATIBILITY IDEOGRAPH-2F984;Lo;0;L;440B;;;;N;;;;; +2F985;CJK COMPATIBILITY IDEOGRAPH-2F985;Lo;0;L;813E;;;;N;;;;; +2F986;CJK COMPATIBILITY IDEOGRAPH-2F986;Lo;0;L;5AB5;;;;N;;;;; +2F987;CJK COMPATIBILITY IDEOGRAPH-2F987;Lo;0;L;267A7;;;;N;;;;; +2F988;CJK COMPATIBILITY IDEOGRAPH-2F988;Lo;0;L;267B5;;;;N;;;;; +2F989;CJK COMPATIBILITY IDEOGRAPH-2F989;Lo;0;L;23393;;;;N;;;;; +2F98A;CJK COMPATIBILITY IDEOGRAPH-2F98A;Lo;0;L;2339C;;;;N;;;;; +2F98B;CJK COMPATIBILITY IDEOGRAPH-2F98B;Lo;0;L;8201;;;;N;;;;; +2F98C;CJK COMPATIBILITY IDEOGRAPH-2F98C;Lo;0;L;8204;;;;N;;;;; +2F98D;CJK COMPATIBILITY IDEOGRAPH-2F98D;Lo;0;L;8F9E;;;;N;;;;; +2F98E;CJK COMPATIBILITY IDEOGRAPH-2F98E;Lo;0;L;446B;;;;N;;;;; +2F98F;CJK COMPATIBILITY IDEOGRAPH-2F98F;Lo;0;L;8291;;;;N;;;;; +2F990;CJK COMPATIBILITY IDEOGRAPH-2F990;Lo;0;L;828B;;;;N;;;;; +2F991;CJK COMPATIBILITY IDEOGRAPH-2F991;Lo;0;L;829D;;;;N;;;;; +2F992;CJK COMPATIBILITY IDEOGRAPH-2F992;Lo;0;L;52B3;;;;N;;;;; +2F993;CJK COMPATIBILITY IDEOGRAPH-2F993;Lo;0;L;82B1;;;;N;;;;; +2F994;CJK COMPATIBILITY IDEOGRAPH-2F994;Lo;0;L;82B3;;;;N;;;;; +2F995;CJK COMPATIBILITY IDEOGRAPH-2F995;Lo;0;L;82BD;;;;N;;;;; +2F996;CJK COMPATIBILITY IDEOGRAPH-2F996;Lo;0;L;82E6;;;;N;;;;; +2F997;CJK COMPATIBILITY IDEOGRAPH-2F997;Lo;0;L;26B3C;;;;N;;;;; +2F998;CJK COMPATIBILITY IDEOGRAPH-2F998;Lo;0;L;82E5;;;;N;;;;; +2F999;CJK COMPATIBILITY IDEOGRAPH-2F999;Lo;0;L;831D;;;;N;;;;; +2F99A;CJK COMPATIBILITY IDEOGRAPH-2F99A;Lo;0;L;8363;;;;N;;;;; +2F99B;CJK COMPATIBILITY IDEOGRAPH-2F99B;Lo;0;L;83AD;;;;N;;;;; +2F99C;CJK COMPATIBILITY IDEOGRAPH-2F99C;Lo;0;L;8323;;;;N;;;;; +2F99D;CJK COMPATIBILITY IDEOGRAPH-2F99D;Lo;0;L;83BD;;;;N;;;;; +2F99E;CJK COMPATIBILITY IDEOGRAPH-2F99E;Lo;0;L;83E7;;;;N;;;;; +2F99F;CJK COMPATIBILITY IDEOGRAPH-2F99F;Lo;0;L;8457;;;;N;;;;; +2F9A0;CJK COMPATIBILITY IDEOGRAPH-2F9A0;Lo;0;L;8353;;;;N;;;;; +2F9A1;CJK COMPATIBILITY IDEOGRAPH-2F9A1;Lo;0;L;83CA;;;;N;;;;; +2F9A2;CJK COMPATIBILITY IDEOGRAPH-2F9A2;Lo;0;L;83CC;;;;N;;;;; +2F9A3;CJK COMPATIBILITY IDEOGRAPH-2F9A3;Lo;0;L;83DC;;;;N;;;;; +2F9A4;CJK COMPATIBILITY IDEOGRAPH-2F9A4;Lo;0;L;26C36;;;;N;;;;; +2F9A5;CJK COMPATIBILITY IDEOGRAPH-2F9A5;Lo;0;L;26D6B;;;;N;;;;; +2F9A6;CJK COMPATIBILITY IDEOGRAPH-2F9A6;Lo;0;L;26CD5;;;;N;;;;; +2F9A7;CJK COMPATIBILITY IDEOGRAPH-2F9A7;Lo;0;L;452B;;;;N;;;;; +2F9A8;CJK COMPATIBILITY IDEOGRAPH-2F9A8;Lo;0;L;84F1;;;;N;;;;; +2F9A9;CJK COMPATIBILITY IDEOGRAPH-2F9A9;Lo;0;L;84F3;;;;N;;;;; +2F9AA;CJK COMPATIBILITY IDEOGRAPH-2F9AA;Lo;0;L;8516;;;;N;;;;; +2F9AB;CJK COMPATIBILITY IDEOGRAPH-2F9AB;Lo;0;L;273CA;;;;N;;;;; +2F9AC;CJK COMPATIBILITY IDEOGRAPH-2F9AC;Lo;0;L;8564;;;;N;;;;; +2F9AD;CJK COMPATIBILITY IDEOGRAPH-2F9AD;Lo;0;L;26F2C;;;;N;;;;; +2F9AE;CJK COMPATIBILITY IDEOGRAPH-2F9AE;Lo;0;L;455D;;;;N;;;;; +2F9AF;CJK COMPATIBILITY IDEOGRAPH-2F9AF;Lo;0;L;4561;;;;N;;;;; +2F9B0;CJK COMPATIBILITY IDEOGRAPH-2F9B0;Lo;0;L;26FB1;;;;N;;;;; +2F9B1;CJK COMPATIBILITY IDEOGRAPH-2F9B1;Lo;0;L;270D2;;;;N;;;;; +2F9B2;CJK COMPATIBILITY IDEOGRAPH-2F9B2;Lo;0;L;456B;;;;N;;;;; +2F9B3;CJK COMPATIBILITY IDEOGRAPH-2F9B3;Lo;0;L;8650;;;;N;;;;; +2F9B4;CJK COMPATIBILITY IDEOGRAPH-2F9B4;Lo;0;L;865C;;;;N;;;;; +2F9B5;CJK COMPATIBILITY IDEOGRAPH-2F9B5;Lo;0;L;8667;;;;N;;;;; +2F9B6;CJK COMPATIBILITY IDEOGRAPH-2F9B6;Lo;0;L;8669;;;;N;;;;; +2F9B7;CJK COMPATIBILITY IDEOGRAPH-2F9B7;Lo;0;L;86A9;;;;N;;;;; +2F9B8;CJK COMPATIBILITY IDEOGRAPH-2F9B8;Lo;0;L;8688;;;;N;;;;; +2F9B9;CJK COMPATIBILITY IDEOGRAPH-2F9B9;Lo;0;L;870E;;;;N;;;;; +2F9BA;CJK COMPATIBILITY IDEOGRAPH-2F9BA;Lo;0;L;86E2;;;;N;;;;; +2F9BB;CJK COMPATIBILITY IDEOGRAPH-2F9BB;Lo;0;L;8779;;;;N;;;;; +2F9BC;CJK COMPATIBILITY IDEOGRAPH-2F9BC;Lo;0;L;8728;;;;N;;;;; +2F9BD;CJK COMPATIBILITY IDEOGRAPH-2F9BD;Lo;0;L;876B;;;;N;;;;; +2F9BE;CJK COMPATIBILITY IDEOGRAPH-2F9BE;Lo;0;L;8786;;;;N;;;;; +2F9BF;CJK COMPATIBILITY IDEOGRAPH-2F9BF;Lo;0;L;45D7;;;;N;;;;; +2F9C0;CJK COMPATIBILITY IDEOGRAPH-2F9C0;Lo;0;L;87E1;;;;N;;;;; +2F9C1;CJK COMPATIBILITY IDEOGRAPH-2F9C1;Lo;0;L;8801;;;;N;;;;; +2F9C2;CJK COMPATIBILITY IDEOGRAPH-2F9C2;Lo;0;L;45F9;;;;N;;;;; +2F9C3;CJK COMPATIBILITY IDEOGRAPH-2F9C3;Lo;0;L;8860;;;;N;;;;; +2F9C4;CJK COMPATIBILITY IDEOGRAPH-2F9C4;Lo;0;L;8863;;;;N;;;;; +2F9C5;CJK COMPATIBILITY IDEOGRAPH-2F9C5;Lo;0;L;27667;;;;N;;;;; +2F9C6;CJK COMPATIBILITY IDEOGRAPH-2F9C6;Lo;0;L;88D7;;;;N;;;;; +2F9C7;CJK COMPATIBILITY IDEOGRAPH-2F9C7;Lo;0;L;88DE;;;;N;;;;; +2F9C8;CJK COMPATIBILITY IDEOGRAPH-2F9C8;Lo;0;L;4635;;;;N;;;;; +2F9C9;CJK COMPATIBILITY IDEOGRAPH-2F9C9;Lo;0;L;88FA;;;;N;;;;; +2F9CA;CJK COMPATIBILITY IDEOGRAPH-2F9CA;Lo;0;L;34BB;;;;N;;;;; +2F9CB;CJK COMPATIBILITY IDEOGRAPH-2F9CB;Lo;0;L;278AE;;;;N;;;;; +2F9CC;CJK COMPATIBILITY IDEOGRAPH-2F9CC;Lo;0;L;27966;;;;N;;;;; +2F9CD;CJK COMPATIBILITY IDEOGRAPH-2F9CD;Lo;0;L;46BE;;;;N;;;;; +2F9CE;CJK COMPATIBILITY IDEOGRAPH-2F9CE;Lo;0;L;46C7;;;;N;;;;; +2F9CF;CJK COMPATIBILITY IDEOGRAPH-2F9CF;Lo;0;L;8AA0;;;;N;;;;; +2F9D0;CJK COMPATIBILITY IDEOGRAPH-2F9D0;Lo;0;L;8AED;;;;N;;;;; +2F9D1;CJK COMPATIBILITY IDEOGRAPH-2F9D1;Lo;0;L;8B8A;;;;N;;;;; +2F9D2;CJK COMPATIBILITY IDEOGRAPH-2F9D2;Lo;0;L;8C55;;;;N;;;;; +2F9D3;CJK COMPATIBILITY IDEOGRAPH-2F9D3;Lo;0;L;27CA8;;;;N;;;;; +2F9D4;CJK COMPATIBILITY IDEOGRAPH-2F9D4;Lo;0;L;8CAB;;;;N;;;;; +2F9D5;CJK COMPATIBILITY IDEOGRAPH-2F9D5;Lo;0;L;8CC1;;;;N;;;;; +2F9D6;CJK COMPATIBILITY IDEOGRAPH-2F9D6;Lo;0;L;8D1B;;;;N;;;;; +2F9D7;CJK COMPATIBILITY IDEOGRAPH-2F9D7;Lo;0;L;8D77;;;;N;;;;; +2F9D8;CJK COMPATIBILITY IDEOGRAPH-2F9D8;Lo;0;L;27F2F;;;;N;;;;; +2F9D9;CJK COMPATIBILITY IDEOGRAPH-2F9D9;Lo;0;L;20804;;;;N;;;;; +2F9DA;CJK COMPATIBILITY IDEOGRAPH-2F9DA;Lo;0;L;8DCB;;;;N;;;;; +2F9DB;CJK COMPATIBILITY IDEOGRAPH-2F9DB;Lo;0;L;8DBC;;;;N;;;;; +2F9DC;CJK COMPATIBILITY IDEOGRAPH-2F9DC;Lo;0;L;8DF0;;;;N;;;;; +2F9DD;CJK COMPATIBILITY IDEOGRAPH-2F9DD;Lo;0;L;208DE;;;;N;;;;; +2F9DE;CJK COMPATIBILITY IDEOGRAPH-2F9DE;Lo;0;L;8ED4;;;;N;;;;; +2F9DF;CJK COMPATIBILITY IDEOGRAPH-2F9DF;Lo;0;L;8F38;;;;N;;;;; +2F9E0;CJK COMPATIBILITY IDEOGRAPH-2F9E0;Lo;0;L;285D2;;;;N;;;;; +2F9E1;CJK COMPATIBILITY IDEOGRAPH-2F9E1;Lo;0;L;285ED;;;;N;;;;; +2F9E2;CJK COMPATIBILITY IDEOGRAPH-2F9E2;Lo;0;L;9094;;;;N;;;;; +2F9E3;CJK COMPATIBILITY IDEOGRAPH-2F9E3;Lo;0;L;90F1;;;;N;;;;; +2F9E4;CJK COMPATIBILITY IDEOGRAPH-2F9E4;Lo;0;L;9111;;;;N;;;;; +2F9E5;CJK COMPATIBILITY IDEOGRAPH-2F9E5;Lo;0;L;2872E;;;;N;;;;; +2F9E6;CJK COMPATIBILITY IDEOGRAPH-2F9E6;Lo;0;L;911B;;;;N;;;;; +2F9E7;CJK COMPATIBILITY IDEOGRAPH-2F9E7;Lo;0;L;9238;;;;N;;;;; +2F9E8;CJK COMPATIBILITY IDEOGRAPH-2F9E8;Lo;0;L;92D7;;;;N;;;;; +2F9E9;CJK COMPATIBILITY IDEOGRAPH-2F9E9;Lo;0;L;92D8;;;;N;;;;; +2F9EA;CJK COMPATIBILITY IDEOGRAPH-2F9EA;Lo;0;L;927C;;;;N;;;;; +2F9EB;CJK COMPATIBILITY IDEOGRAPH-2F9EB;Lo;0;L;93F9;;;;N;;;;; +2F9EC;CJK COMPATIBILITY IDEOGRAPH-2F9EC;Lo;0;L;9415;;;;N;;;;; +2F9ED;CJK COMPATIBILITY IDEOGRAPH-2F9ED;Lo;0;L;28BFA;;;;N;;;;; +2F9EE;CJK COMPATIBILITY IDEOGRAPH-2F9EE;Lo;0;L;958B;;;;N;;;;; +2F9EF;CJK COMPATIBILITY IDEOGRAPH-2F9EF;Lo;0;L;4995;;;;N;;;;; +2F9F0;CJK COMPATIBILITY IDEOGRAPH-2F9F0;Lo;0;L;95B7;;;;N;;;;; +2F9F1;CJK COMPATIBILITY IDEOGRAPH-2F9F1;Lo;0;L;28D77;;;;N;;;;; +2F9F2;CJK COMPATIBILITY IDEOGRAPH-2F9F2;Lo;0;L;49E6;;;;N;;;;; +2F9F3;CJK COMPATIBILITY IDEOGRAPH-2F9F3;Lo;0;L;96C3;;;;N;;;;; +2F9F4;CJK COMPATIBILITY IDEOGRAPH-2F9F4;Lo;0;L;5DB2;;;;N;;;;; +2F9F5;CJK COMPATIBILITY IDEOGRAPH-2F9F5;Lo;0;L;9723;;;;N;;;;; +2F9F6;CJK COMPATIBILITY IDEOGRAPH-2F9F6;Lo;0;L;29145;;;;N;;;;; +2F9F7;CJK COMPATIBILITY IDEOGRAPH-2F9F7;Lo;0;L;2921A;;;;N;;;;; +2F9F8;CJK COMPATIBILITY IDEOGRAPH-2F9F8;Lo;0;L;4A6E;;;;N;;;;; +2F9F9;CJK COMPATIBILITY IDEOGRAPH-2F9F9;Lo;0;L;4A76;;;;N;;;;; +2F9FA;CJK COMPATIBILITY IDEOGRAPH-2F9FA;Lo;0;L;97E0;;;;N;;;;; +2F9FB;CJK COMPATIBILITY IDEOGRAPH-2F9FB;Lo;0;L;2940A;;;;N;;;;; +2F9FC;CJK COMPATIBILITY IDEOGRAPH-2F9FC;Lo;0;L;4AB2;;;;N;;;;; +2F9FD;CJK COMPATIBILITY IDEOGRAPH-2F9FD;Lo;0;L;29496;;;;N;;;;; +2F9FE;CJK COMPATIBILITY IDEOGRAPH-2F9FE;Lo;0;L;980B;;;;N;;;;; +2F9FF;CJK COMPATIBILITY IDEOGRAPH-2F9FF;Lo;0;L;980B;;;;N;;;;; +2FA00;CJK COMPATIBILITY IDEOGRAPH-2FA00;Lo;0;L;9829;;;;N;;;;; +2FA01;CJK COMPATIBILITY IDEOGRAPH-2FA01;Lo;0;L;295B6;;;;N;;;;; +2FA02;CJK COMPATIBILITY IDEOGRAPH-2FA02;Lo;0;L;98E2;;;;N;;;;; +2FA03;CJK COMPATIBILITY IDEOGRAPH-2FA03;Lo;0;L;4B33;;;;N;;;;; +2FA04;CJK COMPATIBILITY IDEOGRAPH-2FA04;Lo;0;L;9929;;;;N;;;;; +2FA05;CJK COMPATIBILITY IDEOGRAPH-2FA05;Lo;0;L;99A7;;;;N;;;;; +2FA06;CJK COMPATIBILITY IDEOGRAPH-2FA06;Lo;0;L;99C2;;;;N;;;;; +2FA07;CJK COMPATIBILITY IDEOGRAPH-2FA07;Lo;0;L;99FE;;;;N;;;;; +2FA08;CJK COMPATIBILITY IDEOGRAPH-2FA08;Lo;0;L;4BCE;;;;N;;;;; +2FA09;CJK COMPATIBILITY IDEOGRAPH-2FA09;Lo;0;L;29B30;;;;N;;;;; +2FA0A;CJK COMPATIBILITY IDEOGRAPH-2FA0A;Lo;0;L;9B12;;;;N;;;;; +2FA0B;CJK COMPATIBILITY IDEOGRAPH-2FA0B;Lo;0;L;9C40;;;;N;;;;; +2FA0C;CJK COMPATIBILITY IDEOGRAPH-2FA0C;Lo;0;L;9CFD;;;;N;;;;; +2FA0D;CJK COMPATIBILITY IDEOGRAPH-2FA0D;Lo;0;L;4CCE;;;;N;;;;; +2FA0E;CJK COMPATIBILITY IDEOGRAPH-2FA0E;Lo;0;L;4CED;;;;N;;;;; +2FA0F;CJK COMPATIBILITY IDEOGRAPH-2FA0F;Lo;0;L;9D67;;;;N;;;;; +2FA10;CJK COMPATIBILITY IDEOGRAPH-2FA10;Lo;0;L;2A0CE;;;;N;;;;; +2FA11;CJK COMPATIBILITY IDEOGRAPH-2FA11;Lo;0;L;4CF8;;;;N;;;;; +2FA12;CJK COMPATIBILITY IDEOGRAPH-2FA12;Lo;0;L;2A105;;;;N;;;;; +2FA13;CJK COMPATIBILITY IDEOGRAPH-2FA13;Lo;0;L;2A20E;;;;N;;;;; +2FA14;CJK COMPATIBILITY IDEOGRAPH-2FA14;Lo;0;L;2A291;;;;N;;;;; +2FA15;CJK COMPATIBILITY IDEOGRAPH-2FA15;Lo;0;L;9EBB;;;;N;;;;; +2FA16;CJK COMPATIBILITY IDEOGRAPH-2FA16;Lo;0;L;4D56;;;;N;;;;; +2FA17;CJK COMPATIBILITY IDEOGRAPH-2FA17;Lo;0;L;9EF9;;;;N;;;;; +2FA18;CJK COMPATIBILITY IDEOGRAPH-2FA18;Lo;0;L;9EFE;;;;N;;;;; +2FA19;CJK COMPATIBILITY IDEOGRAPH-2FA19;Lo;0;L;9F05;;;;N;;;;; +2FA1A;CJK COMPATIBILITY IDEOGRAPH-2FA1A;Lo;0;L;9F0F;;;;N;;;;; +2FA1B;CJK COMPATIBILITY IDEOGRAPH-2FA1B;Lo;0;L;9F16;;;;N;;;;; +2FA1C;CJK COMPATIBILITY IDEOGRAPH-2FA1C;Lo;0;L;9F3B;;;;N;;;;; +2FA1D;CJK COMPATIBILITY IDEOGRAPH-2FA1D;Lo;0;L;2A600;;;;N;;;;; +30000;;Lo;0;L;;;;;N;;;;; +3134A;;Lo;0;L;;;;;N;;;;; +31350;;Lo;0;L;;;;;N;;;;; +323AF;;Lo;0;L;;;;;N;;;;; +323B0;;Lo;0;L;;;;;N;;;;; +33479;;Lo;0;L;;;;;N;;;;; +E0001;LANGUAGE TAG;Cf;0;BN;;;;;N;;;;; +E0020;TAG SPACE;Cf;0;BN;;;;;N;;;;; +E0021;TAG EXCLAMATION MARK;Cf;0;BN;;;;;N;;;;; +E0022;TAG QUOTATION MARK;Cf;0;BN;;;;;N;;;;; +E0023;TAG NUMBER SIGN;Cf;0;BN;;;;;N;;;;; +E0024;TAG DOLLAR SIGN;Cf;0;BN;;;;;N;;;;; +E0025;TAG PERCENT SIGN;Cf;0;BN;;;;;N;;;;; +E0026;TAG AMPERSAND;Cf;0;BN;;;;;N;;;;; +E0027;TAG APOSTROPHE;Cf;0;BN;;;;;N;;;;; +E0028;TAG LEFT PARENTHESIS;Cf;0;BN;;;;;N;;;;; +E0029;TAG RIGHT PARENTHESIS;Cf;0;BN;;;;;N;;;;; +E002A;TAG ASTERISK;Cf;0;BN;;;;;N;;;;; +E002B;TAG PLUS SIGN;Cf;0;BN;;;;;N;;;;; +E002C;TAG COMMA;Cf;0;BN;;;;;N;;;;; +E002D;TAG HYPHEN-MINUS;Cf;0;BN;;;;;N;;;;; +E002E;TAG FULL STOP;Cf;0;BN;;;;;N;;;;; +E002F;TAG SOLIDUS;Cf;0;BN;;;;;N;;;;; +E0030;TAG DIGIT ZERO;Cf;0;BN;;;;;N;;;;; +E0031;TAG DIGIT ONE;Cf;0;BN;;;;;N;;;;; +E0032;TAG DIGIT TWO;Cf;0;BN;;;;;N;;;;; +E0033;TAG DIGIT THREE;Cf;0;BN;;;;;N;;;;; +E0034;TAG DIGIT FOUR;Cf;0;BN;;;;;N;;;;; +E0035;TAG DIGIT FIVE;Cf;0;BN;;;;;N;;;;; +E0036;TAG DIGIT SIX;Cf;0;BN;;;;;N;;;;; +E0037;TAG DIGIT SEVEN;Cf;0;BN;;;;;N;;;;; +E0038;TAG DIGIT EIGHT;Cf;0;BN;;;;;N;;;;; +E0039;TAG DIGIT NINE;Cf;0;BN;;;;;N;;;;; +E003A;TAG COLON;Cf;0;BN;;;;;N;;;;; +E003B;TAG SEMICOLON;Cf;0;BN;;;;;N;;;;; +E003C;TAG LESS-THAN SIGN;Cf;0;BN;;;;;N;;;;; +E003D;TAG EQUALS SIGN;Cf;0;BN;;;;;N;;;;; +E003E;TAG GREATER-THAN SIGN;Cf;0;BN;;;;;N;;;;; +E003F;TAG QUESTION MARK;Cf;0;BN;;;;;N;;;;; +E0040;TAG COMMERCIAL AT;Cf;0;BN;;;;;N;;;;; +E0041;TAG LATIN CAPITAL LETTER A;Cf;0;BN;;;;;N;;;;; +E0042;TAG LATIN CAPITAL LETTER B;Cf;0;BN;;;;;N;;;;; +E0043;TAG LATIN CAPITAL LETTER C;Cf;0;BN;;;;;N;;;;; +E0044;TAG LATIN CAPITAL LETTER D;Cf;0;BN;;;;;N;;;;; +E0045;TAG LATIN CAPITAL LETTER E;Cf;0;BN;;;;;N;;;;; +E0046;TAG LATIN CAPITAL LETTER F;Cf;0;BN;;;;;N;;;;; +E0047;TAG LATIN CAPITAL LETTER G;Cf;0;BN;;;;;N;;;;; +E0048;TAG LATIN CAPITAL LETTER H;Cf;0;BN;;;;;N;;;;; +E0049;TAG LATIN CAPITAL LETTER I;Cf;0;BN;;;;;N;;;;; +E004A;TAG LATIN CAPITAL LETTER J;Cf;0;BN;;;;;N;;;;; +E004B;TAG LATIN CAPITAL LETTER K;Cf;0;BN;;;;;N;;;;; +E004C;TAG LATIN CAPITAL LETTER L;Cf;0;BN;;;;;N;;;;; +E004D;TAG LATIN CAPITAL LETTER M;Cf;0;BN;;;;;N;;;;; +E004E;TAG LATIN CAPITAL LETTER N;Cf;0;BN;;;;;N;;;;; +E004F;TAG LATIN CAPITAL LETTER O;Cf;0;BN;;;;;N;;;;; +E0050;TAG LATIN CAPITAL LETTER P;Cf;0;BN;;;;;N;;;;; +E0051;TAG LATIN CAPITAL LETTER Q;Cf;0;BN;;;;;N;;;;; +E0052;TAG LATIN CAPITAL LETTER R;Cf;0;BN;;;;;N;;;;; +E0053;TAG LATIN CAPITAL LETTER S;Cf;0;BN;;;;;N;;;;; +E0054;TAG LATIN CAPITAL LETTER T;Cf;0;BN;;;;;N;;;;; +E0055;TAG LATIN CAPITAL LETTER U;Cf;0;BN;;;;;N;;;;; +E0056;TAG LATIN CAPITAL LETTER V;Cf;0;BN;;;;;N;;;;; +E0057;TAG LATIN CAPITAL LETTER W;Cf;0;BN;;;;;N;;;;; +E0058;TAG LATIN CAPITAL LETTER X;Cf;0;BN;;;;;N;;;;; +E0059;TAG LATIN CAPITAL LETTER Y;Cf;0;BN;;;;;N;;;;; +E005A;TAG LATIN CAPITAL LETTER Z;Cf;0;BN;;;;;N;;;;; +E005B;TAG LEFT SQUARE BRACKET;Cf;0;BN;;;;;N;;;;; +E005C;TAG REVERSE SOLIDUS;Cf;0;BN;;;;;N;;;;; +E005D;TAG RIGHT SQUARE BRACKET;Cf;0;BN;;;;;N;;;;; +E005E;TAG CIRCUMFLEX ACCENT;Cf;0;BN;;;;;N;;;;; +E005F;TAG LOW LINE;Cf;0;BN;;;;;N;;;;; +E0060;TAG GRAVE ACCENT;Cf;0;BN;;;;;N;;;;; +E0061;TAG LATIN SMALL LETTER A;Cf;0;BN;;;;;N;;;;; +E0062;TAG LATIN SMALL LETTER B;Cf;0;BN;;;;;N;;;;; +E0063;TAG LATIN SMALL LETTER C;Cf;0;BN;;;;;N;;;;; +E0064;TAG LATIN SMALL LETTER D;Cf;0;BN;;;;;N;;;;; +E0065;TAG LATIN SMALL LETTER E;Cf;0;BN;;;;;N;;;;; +E0066;TAG LATIN SMALL LETTER F;Cf;0;BN;;;;;N;;;;; +E0067;TAG LATIN SMALL LETTER G;Cf;0;BN;;;;;N;;;;; +E0068;TAG LATIN SMALL LETTER H;Cf;0;BN;;;;;N;;;;; +E0069;TAG LATIN SMALL LETTER I;Cf;0;BN;;;;;N;;;;; +E006A;TAG LATIN SMALL LETTER J;Cf;0;BN;;;;;N;;;;; +E006B;TAG LATIN SMALL LETTER K;Cf;0;BN;;;;;N;;;;; +E006C;TAG LATIN SMALL LETTER L;Cf;0;BN;;;;;N;;;;; +E006D;TAG LATIN SMALL LETTER M;Cf;0;BN;;;;;N;;;;; +E006E;TAG LATIN SMALL LETTER N;Cf;0;BN;;;;;N;;;;; +E006F;TAG LATIN SMALL LETTER O;Cf;0;BN;;;;;N;;;;; +E0070;TAG LATIN SMALL LETTER P;Cf;0;BN;;;;;N;;;;; +E0071;TAG LATIN SMALL LETTER Q;Cf;0;BN;;;;;N;;;;; +E0072;TAG LATIN SMALL LETTER R;Cf;0;BN;;;;;N;;;;; +E0073;TAG LATIN SMALL LETTER S;Cf;0;BN;;;;;N;;;;; +E0074;TAG LATIN SMALL LETTER T;Cf;0;BN;;;;;N;;;;; +E0075;TAG LATIN SMALL LETTER U;Cf;0;BN;;;;;N;;;;; +E0076;TAG LATIN SMALL LETTER V;Cf;0;BN;;;;;N;;;;; +E0077;TAG LATIN SMALL LETTER W;Cf;0;BN;;;;;N;;;;; +E0078;TAG LATIN SMALL LETTER X;Cf;0;BN;;;;;N;;;;; +E0079;TAG LATIN SMALL LETTER Y;Cf;0;BN;;;;;N;;;;; +E007A;TAG LATIN SMALL LETTER Z;Cf;0;BN;;;;;N;;;;; +E007B;TAG LEFT CURLY BRACKET;Cf;0;BN;;;;;N;;;;; +E007C;TAG VERTICAL LINE;Cf;0;BN;;;;;N;;;;; +E007D;TAG RIGHT CURLY BRACKET;Cf;0;BN;;;;;N;;;;; +E007E;TAG TILDE;Cf;0;BN;;;;;N;;;;; +E007F;CANCEL TAG;Cf;0;BN;;;;;N;;;;; +E0100;VARIATION SELECTOR-17;Mn;0;NSM;;;;;N;;;;; +E0101;VARIATION SELECTOR-18;Mn;0;NSM;;;;;N;;;;; +E0102;VARIATION SELECTOR-19;Mn;0;NSM;;;;;N;;;;; +E0103;VARIATION SELECTOR-20;Mn;0;NSM;;;;;N;;;;; +E0104;VARIATION SELECTOR-21;Mn;0;NSM;;;;;N;;;;; +E0105;VARIATION SELECTOR-22;Mn;0;NSM;;;;;N;;;;; +E0106;VARIATION SELECTOR-23;Mn;0;NSM;;;;;N;;;;; +E0107;VARIATION SELECTOR-24;Mn;0;NSM;;;;;N;;;;; +E0108;VARIATION SELECTOR-25;Mn;0;NSM;;;;;N;;;;; +E0109;VARIATION SELECTOR-26;Mn;0;NSM;;;;;N;;;;; +E010A;VARIATION SELECTOR-27;Mn;0;NSM;;;;;N;;;;; +E010B;VARIATION SELECTOR-28;Mn;0;NSM;;;;;N;;;;; +E010C;VARIATION SELECTOR-29;Mn;0;NSM;;;;;N;;;;; +E010D;VARIATION SELECTOR-30;Mn;0;NSM;;;;;N;;;;; +E010E;VARIATION SELECTOR-31;Mn;0;NSM;;;;;N;;;;; +E010F;VARIATION SELECTOR-32;Mn;0;NSM;;;;;N;;;;; +E0110;VARIATION SELECTOR-33;Mn;0;NSM;;;;;N;;;;; +E0111;VARIATION SELECTOR-34;Mn;0;NSM;;;;;N;;;;; +E0112;VARIATION SELECTOR-35;Mn;0;NSM;;;;;N;;;;; +E0113;VARIATION SELECTOR-36;Mn;0;NSM;;;;;N;;;;; +E0114;VARIATION SELECTOR-37;Mn;0;NSM;;;;;N;;;;; +E0115;VARIATION SELECTOR-38;Mn;0;NSM;;;;;N;;;;; +E0116;VARIATION SELECTOR-39;Mn;0;NSM;;;;;N;;;;; +E0117;VARIATION SELECTOR-40;Mn;0;NSM;;;;;N;;;;; +E0118;VARIATION SELECTOR-41;Mn;0;NSM;;;;;N;;;;; +E0119;VARIATION SELECTOR-42;Mn;0;NSM;;;;;N;;;;; +E011A;VARIATION SELECTOR-43;Mn;0;NSM;;;;;N;;;;; +E011B;VARIATION SELECTOR-44;Mn;0;NSM;;;;;N;;;;; +E011C;VARIATION SELECTOR-45;Mn;0;NSM;;;;;N;;;;; +E011D;VARIATION SELECTOR-46;Mn;0;NSM;;;;;N;;;;; +E011E;VARIATION SELECTOR-47;Mn;0;NSM;;;;;N;;;;; +E011F;VARIATION SELECTOR-48;Mn;0;NSM;;;;;N;;;;; +E0120;VARIATION SELECTOR-49;Mn;0;NSM;;;;;N;;;;; +E0121;VARIATION SELECTOR-50;Mn;0;NSM;;;;;N;;;;; +E0122;VARIATION SELECTOR-51;Mn;0;NSM;;;;;N;;;;; +E0123;VARIATION SELECTOR-52;Mn;0;NSM;;;;;N;;;;; +E0124;VARIATION SELECTOR-53;Mn;0;NSM;;;;;N;;;;; +E0125;VARIATION SELECTOR-54;Mn;0;NSM;;;;;N;;;;; +E0126;VARIATION SELECTOR-55;Mn;0;NSM;;;;;N;;;;; +E0127;VARIATION SELECTOR-56;Mn;0;NSM;;;;;N;;;;; +E0128;VARIATION SELECTOR-57;Mn;0;NSM;;;;;N;;;;; +E0129;VARIATION SELECTOR-58;Mn;0;NSM;;;;;N;;;;; +E012A;VARIATION SELECTOR-59;Mn;0;NSM;;;;;N;;;;; +E012B;VARIATION SELECTOR-60;Mn;0;NSM;;;;;N;;;;; +E012C;VARIATION SELECTOR-61;Mn;0;NSM;;;;;N;;;;; +E012D;VARIATION SELECTOR-62;Mn;0;NSM;;;;;N;;;;; +E012E;VARIATION SELECTOR-63;Mn;0;NSM;;;;;N;;;;; +E012F;VARIATION SELECTOR-64;Mn;0;NSM;;;;;N;;;;; +E0130;VARIATION SELECTOR-65;Mn;0;NSM;;;;;N;;;;; +E0131;VARIATION SELECTOR-66;Mn;0;NSM;;;;;N;;;;; +E0132;VARIATION SELECTOR-67;Mn;0;NSM;;;;;N;;;;; +E0133;VARIATION SELECTOR-68;Mn;0;NSM;;;;;N;;;;; +E0134;VARIATION SELECTOR-69;Mn;0;NSM;;;;;N;;;;; +E0135;VARIATION SELECTOR-70;Mn;0;NSM;;;;;N;;;;; +E0136;VARIATION SELECTOR-71;Mn;0;NSM;;;;;N;;;;; +E0137;VARIATION SELECTOR-72;Mn;0;NSM;;;;;N;;;;; +E0138;VARIATION SELECTOR-73;Mn;0;NSM;;;;;N;;;;; +E0139;VARIATION SELECTOR-74;Mn;0;NSM;;;;;N;;;;; +E013A;VARIATION SELECTOR-75;Mn;0;NSM;;;;;N;;;;; +E013B;VARIATION SELECTOR-76;Mn;0;NSM;;;;;N;;;;; +E013C;VARIATION SELECTOR-77;Mn;0;NSM;;;;;N;;;;; +E013D;VARIATION SELECTOR-78;Mn;0;NSM;;;;;N;;;;; +E013E;VARIATION SELECTOR-79;Mn;0;NSM;;;;;N;;;;; +E013F;VARIATION SELECTOR-80;Mn;0;NSM;;;;;N;;;;; +E0140;VARIATION SELECTOR-81;Mn;0;NSM;;;;;N;;;;; +E0141;VARIATION SELECTOR-82;Mn;0;NSM;;;;;N;;;;; +E0142;VARIATION SELECTOR-83;Mn;0;NSM;;;;;N;;;;; +E0143;VARIATION SELECTOR-84;Mn;0;NSM;;;;;N;;;;; +E0144;VARIATION SELECTOR-85;Mn;0;NSM;;;;;N;;;;; +E0145;VARIATION SELECTOR-86;Mn;0;NSM;;;;;N;;;;; +E0146;VARIATION SELECTOR-87;Mn;0;NSM;;;;;N;;;;; +E0147;VARIATION SELECTOR-88;Mn;0;NSM;;;;;N;;;;; +E0148;VARIATION SELECTOR-89;Mn;0;NSM;;;;;N;;;;; +E0149;VARIATION SELECTOR-90;Mn;0;NSM;;;;;N;;;;; +E014A;VARIATION SELECTOR-91;Mn;0;NSM;;;;;N;;;;; +E014B;VARIATION SELECTOR-92;Mn;0;NSM;;;;;N;;;;; +E014C;VARIATION SELECTOR-93;Mn;0;NSM;;;;;N;;;;; +E014D;VARIATION SELECTOR-94;Mn;0;NSM;;;;;N;;;;; +E014E;VARIATION SELECTOR-95;Mn;0;NSM;;;;;N;;;;; +E014F;VARIATION SELECTOR-96;Mn;0;NSM;;;;;N;;;;; +E0150;VARIATION SELECTOR-97;Mn;0;NSM;;;;;N;;;;; +E0151;VARIATION SELECTOR-98;Mn;0;NSM;;;;;N;;;;; +E0152;VARIATION SELECTOR-99;Mn;0;NSM;;;;;N;;;;; +E0153;VARIATION SELECTOR-100;Mn;0;NSM;;;;;N;;;;; +E0154;VARIATION SELECTOR-101;Mn;0;NSM;;;;;N;;;;; +E0155;VARIATION SELECTOR-102;Mn;0;NSM;;;;;N;;;;; +E0156;VARIATION SELECTOR-103;Mn;0;NSM;;;;;N;;;;; +E0157;VARIATION SELECTOR-104;Mn;0;NSM;;;;;N;;;;; +E0158;VARIATION SELECTOR-105;Mn;0;NSM;;;;;N;;;;; +E0159;VARIATION SELECTOR-106;Mn;0;NSM;;;;;N;;;;; +E015A;VARIATION SELECTOR-107;Mn;0;NSM;;;;;N;;;;; +E015B;VARIATION SELECTOR-108;Mn;0;NSM;;;;;N;;;;; +E015C;VARIATION SELECTOR-109;Mn;0;NSM;;;;;N;;;;; +E015D;VARIATION SELECTOR-110;Mn;0;NSM;;;;;N;;;;; +E015E;VARIATION SELECTOR-111;Mn;0;NSM;;;;;N;;;;; +E015F;VARIATION SELECTOR-112;Mn;0;NSM;;;;;N;;;;; +E0160;VARIATION SELECTOR-113;Mn;0;NSM;;;;;N;;;;; +E0161;VARIATION SELECTOR-114;Mn;0;NSM;;;;;N;;;;; +E0162;VARIATION SELECTOR-115;Mn;0;NSM;;;;;N;;;;; +E0163;VARIATION SELECTOR-116;Mn;0;NSM;;;;;N;;;;; +E0164;VARIATION SELECTOR-117;Mn;0;NSM;;;;;N;;;;; +E0165;VARIATION SELECTOR-118;Mn;0;NSM;;;;;N;;;;; +E0166;VARIATION SELECTOR-119;Mn;0;NSM;;;;;N;;;;; +E0167;VARIATION SELECTOR-120;Mn;0;NSM;;;;;N;;;;; +E0168;VARIATION SELECTOR-121;Mn;0;NSM;;;;;N;;;;; +E0169;VARIATION SELECTOR-122;Mn;0;NSM;;;;;N;;;;; +E016A;VARIATION SELECTOR-123;Mn;0;NSM;;;;;N;;;;; +E016B;VARIATION SELECTOR-124;Mn;0;NSM;;;;;N;;;;; +E016C;VARIATION SELECTOR-125;Mn;0;NSM;;;;;N;;;;; +E016D;VARIATION SELECTOR-126;Mn;0;NSM;;;;;N;;;;; +E016E;VARIATION SELECTOR-127;Mn;0;NSM;;;;;N;;;;; +E016F;VARIATION SELECTOR-128;Mn;0;NSM;;;;;N;;;;; +E0170;VARIATION SELECTOR-129;Mn;0;NSM;;;;;N;;;;; +E0171;VARIATION SELECTOR-130;Mn;0;NSM;;;;;N;;;;; +E0172;VARIATION SELECTOR-131;Mn;0;NSM;;;;;N;;;;; +E0173;VARIATION SELECTOR-132;Mn;0;NSM;;;;;N;;;;; +E0174;VARIATION SELECTOR-133;Mn;0;NSM;;;;;N;;;;; +E0175;VARIATION SELECTOR-134;Mn;0;NSM;;;;;N;;;;; +E0176;VARIATION SELECTOR-135;Mn;0;NSM;;;;;N;;;;; +E0177;VARIATION SELECTOR-136;Mn;0;NSM;;;;;N;;;;; +E0178;VARIATION SELECTOR-137;Mn;0;NSM;;;;;N;;;;; +E0179;VARIATION SELECTOR-138;Mn;0;NSM;;;;;N;;;;; +E017A;VARIATION SELECTOR-139;Mn;0;NSM;;;;;N;;;;; +E017B;VARIATION SELECTOR-140;Mn;0;NSM;;;;;N;;;;; +E017C;VARIATION SELECTOR-141;Mn;0;NSM;;;;;N;;;;; +E017D;VARIATION SELECTOR-142;Mn;0;NSM;;;;;N;;;;; +E017E;VARIATION SELECTOR-143;Mn;0;NSM;;;;;N;;;;; +E017F;VARIATION SELECTOR-144;Mn;0;NSM;;;;;N;;;;; +E0180;VARIATION SELECTOR-145;Mn;0;NSM;;;;;N;;;;; +E0181;VARIATION SELECTOR-146;Mn;0;NSM;;;;;N;;;;; +E0182;VARIATION SELECTOR-147;Mn;0;NSM;;;;;N;;;;; +E0183;VARIATION SELECTOR-148;Mn;0;NSM;;;;;N;;;;; +E0184;VARIATION SELECTOR-149;Mn;0;NSM;;;;;N;;;;; +E0185;VARIATION SELECTOR-150;Mn;0;NSM;;;;;N;;;;; +E0186;VARIATION SELECTOR-151;Mn;0;NSM;;;;;N;;;;; +E0187;VARIATION SELECTOR-152;Mn;0;NSM;;;;;N;;;;; +E0188;VARIATION SELECTOR-153;Mn;0;NSM;;;;;N;;;;; +E0189;VARIATION SELECTOR-154;Mn;0;NSM;;;;;N;;;;; +E018A;VARIATION SELECTOR-155;Mn;0;NSM;;;;;N;;;;; +E018B;VARIATION SELECTOR-156;Mn;0;NSM;;;;;N;;;;; +E018C;VARIATION SELECTOR-157;Mn;0;NSM;;;;;N;;;;; +E018D;VARIATION SELECTOR-158;Mn;0;NSM;;;;;N;;;;; +E018E;VARIATION SELECTOR-159;Mn;0;NSM;;;;;N;;;;; +E018F;VARIATION SELECTOR-160;Mn;0;NSM;;;;;N;;;;; +E0190;VARIATION SELECTOR-161;Mn;0;NSM;;;;;N;;;;; +E0191;VARIATION SELECTOR-162;Mn;0;NSM;;;;;N;;;;; +E0192;VARIATION SELECTOR-163;Mn;0;NSM;;;;;N;;;;; +E0193;VARIATION SELECTOR-164;Mn;0;NSM;;;;;N;;;;; +E0194;VARIATION SELECTOR-165;Mn;0;NSM;;;;;N;;;;; +E0195;VARIATION SELECTOR-166;Mn;0;NSM;;;;;N;;;;; +E0196;VARIATION SELECTOR-167;Mn;0;NSM;;;;;N;;;;; +E0197;VARIATION SELECTOR-168;Mn;0;NSM;;;;;N;;;;; +E0198;VARIATION SELECTOR-169;Mn;0;NSM;;;;;N;;;;; +E0199;VARIATION SELECTOR-170;Mn;0;NSM;;;;;N;;;;; +E019A;VARIATION SELECTOR-171;Mn;0;NSM;;;;;N;;;;; +E019B;VARIATION SELECTOR-172;Mn;0;NSM;;;;;N;;;;; +E019C;VARIATION SELECTOR-173;Mn;0;NSM;;;;;N;;;;; +E019D;VARIATION SELECTOR-174;Mn;0;NSM;;;;;N;;;;; +E019E;VARIATION SELECTOR-175;Mn;0;NSM;;;;;N;;;;; +E019F;VARIATION SELECTOR-176;Mn;0;NSM;;;;;N;;;;; +E01A0;VARIATION SELECTOR-177;Mn;0;NSM;;;;;N;;;;; +E01A1;VARIATION SELECTOR-178;Mn;0;NSM;;;;;N;;;;; +E01A2;VARIATION SELECTOR-179;Mn;0;NSM;;;;;N;;;;; +E01A3;VARIATION SELECTOR-180;Mn;0;NSM;;;;;N;;;;; +E01A4;VARIATION SELECTOR-181;Mn;0;NSM;;;;;N;;;;; +E01A5;VARIATION SELECTOR-182;Mn;0;NSM;;;;;N;;;;; +E01A6;VARIATION SELECTOR-183;Mn;0;NSM;;;;;N;;;;; +E01A7;VARIATION SELECTOR-184;Mn;0;NSM;;;;;N;;;;; +E01A8;VARIATION SELECTOR-185;Mn;0;NSM;;;;;N;;;;; +E01A9;VARIATION SELECTOR-186;Mn;0;NSM;;;;;N;;;;; +E01AA;VARIATION SELECTOR-187;Mn;0;NSM;;;;;N;;;;; +E01AB;VARIATION SELECTOR-188;Mn;0;NSM;;;;;N;;;;; +E01AC;VARIATION SELECTOR-189;Mn;0;NSM;;;;;N;;;;; +E01AD;VARIATION SELECTOR-190;Mn;0;NSM;;;;;N;;;;; +E01AE;VARIATION SELECTOR-191;Mn;0;NSM;;;;;N;;;;; +E01AF;VARIATION SELECTOR-192;Mn;0;NSM;;;;;N;;;;; +E01B0;VARIATION SELECTOR-193;Mn;0;NSM;;;;;N;;;;; +E01B1;VARIATION SELECTOR-194;Mn;0;NSM;;;;;N;;;;; +E01B2;VARIATION SELECTOR-195;Mn;0;NSM;;;;;N;;;;; +E01B3;VARIATION SELECTOR-196;Mn;0;NSM;;;;;N;;;;; +E01B4;VARIATION SELECTOR-197;Mn;0;NSM;;;;;N;;;;; +E01B5;VARIATION SELECTOR-198;Mn;0;NSM;;;;;N;;;;; +E01B6;VARIATION SELECTOR-199;Mn;0;NSM;;;;;N;;;;; +E01B7;VARIATION SELECTOR-200;Mn;0;NSM;;;;;N;;;;; +E01B8;VARIATION SELECTOR-201;Mn;0;NSM;;;;;N;;;;; +E01B9;VARIATION SELECTOR-202;Mn;0;NSM;;;;;N;;;;; +E01BA;VARIATION SELECTOR-203;Mn;0;NSM;;;;;N;;;;; +E01BB;VARIATION SELECTOR-204;Mn;0;NSM;;;;;N;;;;; +E01BC;VARIATION SELECTOR-205;Mn;0;NSM;;;;;N;;;;; +E01BD;VARIATION SELECTOR-206;Mn;0;NSM;;;;;N;;;;; +E01BE;VARIATION SELECTOR-207;Mn;0;NSM;;;;;N;;;;; +E01BF;VARIATION SELECTOR-208;Mn;0;NSM;;;;;N;;;;; +E01C0;VARIATION SELECTOR-209;Mn;0;NSM;;;;;N;;;;; +E01C1;VARIATION SELECTOR-210;Mn;0;NSM;;;;;N;;;;; +E01C2;VARIATION SELECTOR-211;Mn;0;NSM;;;;;N;;;;; +E01C3;VARIATION SELECTOR-212;Mn;0;NSM;;;;;N;;;;; +E01C4;VARIATION SELECTOR-213;Mn;0;NSM;;;;;N;;;;; +E01C5;VARIATION SELECTOR-214;Mn;0;NSM;;;;;N;;;;; +E01C6;VARIATION SELECTOR-215;Mn;0;NSM;;;;;N;;;;; +E01C7;VARIATION SELECTOR-216;Mn;0;NSM;;;;;N;;;;; +E01C8;VARIATION SELECTOR-217;Mn;0;NSM;;;;;N;;;;; +E01C9;VARIATION SELECTOR-218;Mn;0;NSM;;;;;N;;;;; +E01CA;VARIATION SELECTOR-219;Mn;0;NSM;;;;;N;;;;; +E01CB;VARIATION SELECTOR-220;Mn;0;NSM;;;;;N;;;;; +E01CC;VARIATION SELECTOR-221;Mn;0;NSM;;;;;N;;;;; +E01CD;VARIATION SELECTOR-222;Mn;0;NSM;;;;;N;;;;; +E01CE;VARIATION SELECTOR-223;Mn;0;NSM;;;;;N;;;;; +E01CF;VARIATION SELECTOR-224;Mn;0;NSM;;;;;N;;;;; +E01D0;VARIATION SELECTOR-225;Mn;0;NSM;;;;;N;;;;; +E01D1;VARIATION SELECTOR-226;Mn;0;NSM;;;;;N;;;;; +E01D2;VARIATION SELECTOR-227;Mn;0;NSM;;;;;N;;;;; +E01D3;VARIATION SELECTOR-228;Mn;0;NSM;;;;;N;;;;; +E01D4;VARIATION SELECTOR-229;Mn;0;NSM;;;;;N;;;;; +E01D5;VARIATION SELECTOR-230;Mn;0;NSM;;;;;N;;;;; +E01D6;VARIATION SELECTOR-231;Mn;0;NSM;;;;;N;;;;; +E01D7;VARIATION SELECTOR-232;Mn;0;NSM;;;;;N;;;;; +E01D8;VARIATION SELECTOR-233;Mn;0;NSM;;;;;N;;;;; +E01D9;VARIATION SELECTOR-234;Mn;0;NSM;;;;;N;;;;; +E01DA;VARIATION SELECTOR-235;Mn;0;NSM;;;;;N;;;;; +E01DB;VARIATION SELECTOR-236;Mn;0;NSM;;;;;N;;;;; +E01DC;VARIATION SELECTOR-237;Mn;0;NSM;;;;;N;;;;; +E01DD;VARIATION SELECTOR-238;Mn;0;NSM;;;;;N;;;;; +E01DE;VARIATION SELECTOR-239;Mn;0;NSM;;;;;N;;;;; +E01DF;VARIATION SELECTOR-240;Mn;0;NSM;;;;;N;;;;; +E01E0;VARIATION SELECTOR-241;Mn;0;NSM;;;;;N;;;;; +E01E1;VARIATION SELECTOR-242;Mn;0;NSM;;;;;N;;;;; +E01E2;VARIATION SELECTOR-243;Mn;0;NSM;;;;;N;;;;; +E01E3;VARIATION SELECTOR-244;Mn;0;NSM;;;;;N;;;;; +E01E4;VARIATION SELECTOR-245;Mn;0;NSM;;;;;N;;;;; +E01E5;VARIATION SELECTOR-246;Mn;0;NSM;;;;;N;;;;; +E01E6;VARIATION SELECTOR-247;Mn;0;NSM;;;;;N;;;;; +E01E7;VARIATION SELECTOR-248;Mn;0;NSM;;;;;N;;;;; +E01E8;VARIATION SELECTOR-249;Mn;0;NSM;;;;;N;;;;; +E01E9;VARIATION SELECTOR-250;Mn;0;NSM;;;;;N;;;;; +E01EA;VARIATION SELECTOR-251;Mn;0;NSM;;;;;N;;;;; +E01EB;VARIATION SELECTOR-252;Mn;0;NSM;;;;;N;;;;; +E01EC;VARIATION SELECTOR-253;Mn;0;NSM;;;;;N;;;;; +E01ED;VARIATION SELECTOR-254;Mn;0;NSM;;;;;N;;;;; +E01EE;VARIATION SELECTOR-255;Mn;0;NSM;;;;;N;;;;; +E01EF;VARIATION SELECTOR-256;Mn;0;NSM;;;;;N;;;;; +F0000;;Co;0;L;;;;;N;;;;; +FFFFD;;Co;0;L;;;;;N;;;;; +100000;;Co;0;L;;;;;N;;;;; +10FFFD;;Co;0;L;;;;;N;;;;; diff --git a/crates/stdlib/unicode/ucd32/DerivedBidiClass-3.2.0.txt b/crates/stdlib/unicode/ucd32/DerivedBidiClass-3.2.0.txt new file mode 100644 index 000000000..28bde960b --- /dev/null +++ b/crates/stdlib/unicode/ucd32/DerivedBidiClass-3.2.0.txt @@ -0,0 +1,1129 @@ +# DerivedBidiClass-3.2.0.txt +# Date: 2002-03-19,23:30:29 GMT [MD] +# +# Unicode Character Database: Derived Property Data +# Generated algorithmically from the Unicode Character Database +# For documentation, see DerivedProperties.html +# Note: Unassigned and Noncharacter codepoints are omitted, +# except when listing Noncharacter or Cn. +# ================================================ + + +# ================================================ +# Bidi Class (listing UnicodeData.txt, field 4: see UnicodeData.html) +# ================================================ + +0041..005A ; L # L& [26] LATIN CAPITAL LETTER A..LATIN CAPITAL LETTER Z +0061..007A ; L # L& [26] LATIN SMALL LETTER A..LATIN SMALL LETTER Z +00AA ; L # L& FEMININE ORDINAL INDICATOR +00B5 ; L # L& MICRO SIGN +00BA ; L # L& MASCULINE ORDINAL INDICATOR +00C0..00D6 ; L # L& [23] LATIN CAPITAL LETTER A WITH GRAVE..LATIN CAPITAL LETTER O WITH DIAERESIS +00D8..00F6 ; L # L& [31] LATIN CAPITAL LETTER O WITH STROKE..LATIN SMALL LETTER O WITH DIAERESIS +00F8..01BA ; L # L& [195] LATIN SMALL LETTER O WITH STROKE..LATIN SMALL LETTER EZH WITH TAIL +01BB ; L # Lo LATIN LETTER TWO WITH STROKE +01BC..01BF ; L # L& [4] LATIN CAPITAL LETTER TONE FIVE..LATIN LETTER WYNN +01C0..01C3 ; L # Lo [4] LATIN LETTER DENTAL CLICK..LATIN LETTER RETROFLEX CLICK +01C4..0220 ; L # L& [93] LATIN CAPITAL LETTER DZ WITH CARON..LATIN CAPITAL LETTER N WITH LONG RIGHT LEG +0222..0233 ; L # L& [18] LATIN CAPITAL LETTER OU..LATIN SMALL LETTER Y WITH MACRON +0250..02AD ; L # L& [94] LATIN SMALL LETTER TURNED A..LATIN LETTER BIDENTAL PERCUSSIVE +02B0..02B8 ; L # Lm [9] MODIFIER LETTER SMALL H..MODIFIER LETTER SMALL Y +02BB..02C1 ; L # Lm [7] MODIFIER LETTER TURNED COMMA..MODIFIER LETTER REVERSED GLOTTAL STOP +02D0..02D1 ; L # Lm [2] MODIFIER LETTER TRIANGULAR COLON..MODIFIER LETTER HALF TRIANGULAR COLON +02E0..02E4 ; L # Lm [5] MODIFIER LETTER SMALL GAMMA..MODIFIER LETTER SMALL REVERSED GLOTTAL STOP +02EE ; L # Lm MODIFIER LETTER DOUBLE APOSTROPHE +037A ; L # Lm GREEK YPOGEGRAMMENI +0386 ; L # L& GREEK CAPITAL LETTER ALPHA WITH TONOS +0388..038A ; L # L& [3] GREEK CAPITAL LETTER EPSILON WITH TONOS..GREEK CAPITAL LETTER IOTA WITH TONOS +038C ; L # L& GREEK CAPITAL LETTER OMICRON WITH TONOS +038E..03A1 ; L # L& [20] GREEK CAPITAL LETTER UPSILON WITH TONOS..GREEK CAPITAL LETTER RHO +03A3..03CE ; L # L& [44] GREEK CAPITAL LETTER SIGMA..GREEK SMALL LETTER OMEGA WITH TONOS +03D0..03F5 ; L # L& [38] GREEK BETA SYMBOL..GREEK LUNATE EPSILON SYMBOL +0400..0481 ; L # L& [130] CYRILLIC CAPITAL LETTER IE WITH GRAVE..CYRILLIC SMALL LETTER KOPPA +0482 ; L # So CYRILLIC THOUSANDS SIGN +048A..04CE ; L # L& [69] CYRILLIC CAPITAL LETTER SHORT I WITH TAIL..CYRILLIC SMALL LETTER EM WITH TAIL +04D0..04F5 ; L # L& [38] CYRILLIC CAPITAL LETTER A WITH BREVE..CYRILLIC SMALL LETTER CHE WITH DIAERESIS +04F8..04F9 ; L # L& [2] CYRILLIC CAPITAL LETTER YERU WITH DIAERESIS..CYRILLIC SMALL LETTER YERU WITH DIAERESIS +0500..050F ; L # L& [16] CYRILLIC CAPITAL LETTER KOMI DE..CYRILLIC SMALL LETTER KOMI TJE +0531..0556 ; L # L& [38] ARMENIAN CAPITAL LETTER AYB..ARMENIAN CAPITAL LETTER FEH +0559 ; L # Lm ARMENIAN MODIFIER LETTER LEFT HALF RING +055A..055F ; L # Po [6] ARMENIAN APOSTROPHE..ARMENIAN ABBREVIATION MARK +0561..0587 ; L # L& [39] ARMENIAN SMALL LETTER AYB..ARMENIAN SMALL LIGATURE ECH YIWN +0589 ; L # Po ARMENIAN FULL STOP +0903 ; L # Mc DEVANAGARI SIGN VISARGA +0905..0939 ; L # Lo [53] DEVANAGARI LETTER A..DEVANAGARI LETTER HA +093D ; L # Lo DEVANAGARI SIGN AVAGRAHA +093E..0940 ; L # Mc [3] DEVANAGARI VOWEL SIGN AA..DEVANAGARI VOWEL SIGN II +0949..094C ; L # Mc [4] DEVANAGARI VOWEL SIGN CANDRA O..DEVANAGARI VOWEL SIGN AU +0950 ; L # Lo DEVANAGARI OM +0958..0961 ; L # Lo [10] DEVANAGARI LETTER QA..DEVANAGARI LETTER VOCALIC LL +0964..0965 ; L # Po [2] DEVANAGARI DANDA..DEVANAGARI DOUBLE DANDA +0966..096F ; L # Nd [10] DEVANAGARI DIGIT ZERO..DEVANAGARI DIGIT NINE +0970 ; L # Po DEVANAGARI ABBREVIATION SIGN +0982..0983 ; L # Mc [2] BENGALI SIGN ANUSVARA..BENGALI SIGN VISARGA +0985..098C ; L # Lo [8] BENGALI LETTER A..BENGALI LETTER VOCALIC L +098F..0990 ; L # Lo [2] BENGALI LETTER E..BENGALI LETTER AI +0993..09A8 ; L # Lo [22] BENGALI LETTER O..BENGALI LETTER NA +09AA..09B0 ; L # Lo [7] BENGALI LETTER PA..BENGALI LETTER RA +09B2 ; L # Lo BENGALI LETTER LA +09B6..09B9 ; L # Lo [4] BENGALI LETTER SHA..BENGALI LETTER HA +09BE..09C0 ; L # Mc [3] BENGALI VOWEL SIGN AA..BENGALI VOWEL SIGN II +09C7..09C8 ; L # Mc [2] BENGALI VOWEL SIGN E..BENGALI VOWEL SIGN AI +09CB..09CC ; L # Mc [2] BENGALI VOWEL SIGN O..BENGALI VOWEL SIGN AU +09D7 ; L # Mc BENGALI AU LENGTH MARK +09DC..09DD ; L # Lo [2] BENGALI LETTER RRA..BENGALI LETTER RHA +09DF..09E1 ; L # Lo [3] BENGALI LETTER YYA..BENGALI LETTER VOCALIC LL +09E6..09EF ; L # Nd [10] BENGALI DIGIT ZERO..BENGALI DIGIT NINE +09F0..09F1 ; L # Lo [2] BENGALI LETTER RA WITH MIDDLE DIAGONAL..BENGALI LETTER RA WITH LOWER DIAGONAL +09F4..09F9 ; L # No [6] BENGALI CURRENCY NUMERATOR ONE..BENGALI CURRENCY DENOMINATOR SIXTEEN +09FA ; L # So BENGALI ISSHAR +0A05..0A0A ; L # Lo [6] GURMUKHI LETTER A..GURMUKHI LETTER UU +0A0F..0A10 ; L # Lo [2] GURMUKHI LETTER EE..GURMUKHI LETTER AI +0A13..0A28 ; L # Lo [22] GURMUKHI LETTER OO..GURMUKHI LETTER NA +0A2A..0A30 ; L # Lo [7] GURMUKHI LETTER PA..GURMUKHI LETTER RA +0A32..0A33 ; L # Lo [2] GURMUKHI LETTER LA..GURMUKHI LETTER LLA +0A35..0A36 ; L # Lo [2] GURMUKHI LETTER VA..GURMUKHI LETTER SHA +0A38..0A39 ; L # Lo [2] GURMUKHI LETTER SA..GURMUKHI LETTER HA +0A3E..0A40 ; L # Mc [3] GURMUKHI VOWEL SIGN AA..GURMUKHI VOWEL SIGN II +0A59..0A5C ; L # Lo [4] GURMUKHI LETTER KHHA..GURMUKHI LETTER RRA +0A5E ; L # Lo GURMUKHI LETTER FA +0A66..0A6F ; L # Nd [10] GURMUKHI DIGIT ZERO..GURMUKHI DIGIT NINE +0A72..0A74 ; L # Lo [3] GURMUKHI IRI..GURMUKHI EK ONKAR +0A83 ; L # Mc GUJARATI SIGN VISARGA +0A85..0A8B ; L # Lo [7] GUJARATI LETTER A..GUJARATI LETTER VOCALIC R +0A8D ; L # Lo GUJARATI VOWEL CANDRA E +0A8F..0A91 ; L # Lo [3] GUJARATI LETTER E..GUJARATI VOWEL CANDRA O +0A93..0AA8 ; L # Lo [22] GUJARATI LETTER O..GUJARATI LETTER NA +0AAA..0AB0 ; L # Lo [7] GUJARATI LETTER PA..GUJARATI LETTER RA +0AB2..0AB3 ; L # Lo [2] GUJARATI LETTER LA..GUJARATI LETTER LLA +0AB5..0AB9 ; L # Lo [5] GUJARATI LETTER VA..GUJARATI LETTER HA +0ABD ; L # Lo GUJARATI SIGN AVAGRAHA +0ABE..0AC0 ; L # Mc [3] GUJARATI VOWEL SIGN AA..GUJARATI VOWEL SIGN II +0AC9 ; L # Mc GUJARATI VOWEL SIGN CANDRA O +0ACB..0ACC ; L # Mc [2] GUJARATI VOWEL SIGN O..GUJARATI VOWEL SIGN AU +0AD0 ; L # Lo GUJARATI OM +0AE0 ; L # Lo GUJARATI LETTER VOCALIC RR +0AE6..0AEF ; L # Nd [10] GUJARATI DIGIT ZERO..GUJARATI DIGIT NINE +0B02..0B03 ; L # Mc [2] ORIYA SIGN ANUSVARA..ORIYA SIGN VISARGA +0B05..0B0C ; L # Lo [8] ORIYA LETTER A..ORIYA LETTER VOCALIC L +0B0F..0B10 ; L # Lo [2] ORIYA LETTER E..ORIYA LETTER AI +0B13..0B28 ; L # Lo [22] ORIYA LETTER O..ORIYA LETTER NA +0B2A..0B30 ; L # Lo [7] ORIYA LETTER PA..ORIYA LETTER RA +0B32..0B33 ; L # Lo [2] ORIYA LETTER LA..ORIYA LETTER LLA +0B36..0B39 ; L # Lo [4] ORIYA LETTER SHA..ORIYA LETTER HA +0B3D ; L # Lo ORIYA SIGN AVAGRAHA +0B3E ; L # Mc ORIYA VOWEL SIGN AA +0B40 ; L # Mc ORIYA VOWEL SIGN II +0B47..0B48 ; L # Mc [2] ORIYA VOWEL SIGN E..ORIYA VOWEL SIGN AI +0B4B..0B4C ; L # Mc [2] ORIYA VOWEL SIGN O..ORIYA VOWEL SIGN AU +0B57 ; L # Mc ORIYA AU LENGTH MARK +0B5C..0B5D ; L # Lo [2] ORIYA LETTER RRA..ORIYA LETTER RHA +0B5F..0B61 ; L # Lo [3] ORIYA LETTER YYA..ORIYA LETTER VOCALIC LL +0B66..0B6F ; L # Nd [10] ORIYA DIGIT ZERO..ORIYA DIGIT NINE +0B70 ; L # So ORIYA ISSHAR +0B83 ; L # Lo TAMIL SIGN VISARGA +0B85..0B8A ; L # Lo [6] TAMIL LETTER A..TAMIL LETTER UU +0B8E..0B90 ; L # Lo [3] TAMIL LETTER E..TAMIL LETTER AI +0B92..0B95 ; L # Lo [4] TAMIL LETTER O..TAMIL LETTER KA +0B99..0B9A ; L # Lo [2] TAMIL LETTER NGA..TAMIL LETTER CA +0B9C ; L # Lo TAMIL LETTER JA +0B9E..0B9F ; L # Lo [2] TAMIL LETTER NYA..TAMIL LETTER TTA +0BA3..0BA4 ; L # Lo [2] TAMIL LETTER NNA..TAMIL LETTER TA +0BA8..0BAA ; L # Lo [3] TAMIL LETTER NA..TAMIL LETTER PA +0BAE..0BB5 ; L # Lo [8] TAMIL LETTER MA..TAMIL LETTER VA +0BB7..0BB9 ; L # Lo [3] TAMIL LETTER SSA..TAMIL LETTER HA +0BBE..0BBF ; L # Mc [2] TAMIL VOWEL SIGN AA..TAMIL VOWEL SIGN I +0BC1..0BC2 ; L # Mc [2] TAMIL VOWEL SIGN U..TAMIL VOWEL SIGN UU +0BC6..0BC8 ; L # Mc [3] TAMIL VOWEL SIGN E..TAMIL VOWEL SIGN AI +0BCA..0BCC ; L # Mc [3] TAMIL VOWEL SIGN O..TAMIL VOWEL SIGN AU +0BD7 ; L # Mc TAMIL AU LENGTH MARK +0BE7..0BEF ; L # Nd [9] TAMIL DIGIT ONE..TAMIL DIGIT NINE +0BF0..0BF2 ; L # No [3] TAMIL NUMBER TEN..TAMIL NUMBER ONE THOUSAND +0C01..0C03 ; L # Mc [3] TELUGU SIGN CANDRABINDU..TELUGU SIGN VISARGA +0C05..0C0C ; L # Lo [8] TELUGU LETTER A..TELUGU LETTER VOCALIC L +0C0E..0C10 ; L # Lo [3] TELUGU LETTER E..TELUGU LETTER AI +0C12..0C28 ; L # Lo [23] TELUGU LETTER O..TELUGU LETTER NA +0C2A..0C33 ; L # Lo [10] TELUGU LETTER PA..TELUGU LETTER LLA +0C35..0C39 ; L # Lo [5] TELUGU LETTER VA..TELUGU LETTER HA +0C41..0C44 ; L # Mc [4] TELUGU VOWEL SIGN U..TELUGU VOWEL SIGN VOCALIC RR +0C60..0C61 ; L # Lo [2] TELUGU LETTER VOCALIC RR..TELUGU LETTER VOCALIC LL +0C66..0C6F ; L # Nd [10] TELUGU DIGIT ZERO..TELUGU DIGIT NINE +0C82..0C83 ; L # Mc [2] KANNADA SIGN ANUSVARA..KANNADA SIGN VISARGA +0C85..0C8C ; L # Lo [8] KANNADA LETTER A..KANNADA LETTER VOCALIC L +0C8E..0C90 ; L # Lo [3] KANNADA LETTER E..KANNADA LETTER AI +0C92..0CA8 ; L # Lo [23] KANNADA LETTER O..KANNADA LETTER NA +0CAA..0CB3 ; L # Lo [10] KANNADA LETTER PA..KANNADA LETTER LLA +0CB5..0CB9 ; L # Lo [5] KANNADA LETTER VA..KANNADA LETTER HA +0CBE ; L # Mc KANNADA VOWEL SIGN AA +0CC0..0CC4 ; L # Mc [5] KANNADA VOWEL SIGN II..KANNADA VOWEL SIGN VOCALIC RR +0CC7..0CC8 ; L # Mc [2] KANNADA VOWEL SIGN EE..KANNADA VOWEL SIGN AI +0CCA..0CCB ; L # Mc [2] KANNADA VOWEL SIGN O..KANNADA VOWEL SIGN OO +0CD5..0CD6 ; L # Mc [2] KANNADA LENGTH MARK..KANNADA AI LENGTH MARK +0CDE ; L # Lo KANNADA LETTER FA +0CE0..0CE1 ; L # Lo [2] KANNADA LETTER VOCALIC RR..KANNADA LETTER VOCALIC LL +0CE6..0CEF ; L # Nd [10] KANNADA DIGIT ZERO..KANNADA DIGIT NINE +0D02..0D03 ; L # Mc [2] MALAYALAM SIGN ANUSVARA..MALAYALAM SIGN VISARGA +0D05..0D0C ; L # Lo [8] MALAYALAM LETTER A..MALAYALAM LETTER VOCALIC L +0D0E..0D10 ; L # Lo [3] MALAYALAM LETTER E..MALAYALAM LETTER AI +0D12..0D28 ; L # Lo [23] MALAYALAM LETTER O..MALAYALAM LETTER NA +0D2A..0D39 ; L # Lo [16] MALAYALAM LETTER PA..MALAYALAM LETTER HA +0D3E..0D40 ; L # Mc [3] MALAYALAM VOWEL SIGN AA..MALAYALAM VOWEL SIGN II +0D46..0D48 ; L # Mc [3] MALAYALAM VOWEL SIGN E..MALAYALAM VOWEL SIGN AI +0D4A..0D4C ; L # Mc [3] MALAYALAM VOWEL SIGN O..MALAYALAM VOWEL SIGN AU +0D57 ; L # Mc MALAYALAM AU LENGTH MARK +0D60..0D61 ; L # Lo [2] MALAYALAM LETTER VOCALIC RR..MALAYALAM LETTER VOCALIC LL +0D66..0D6F ; L # Nd [10] MALAYALAM DIGIT ZERO..MALAYALAM DIGIT NINE +0D82..0D83 ; L # Mc [2] SINHALA SIGN ANUSVARAYA..SINHALA SIGN VISARGAYA +0D85..0D96 ; L # Lo [18] SINHALA LETTER AYANNA..SINHALA LETTER AUYANNA +0D9A..0DB1 ; L # Lo [24] SINHALA LETTER ALPAPRAANA KAYANNA..SINHALA LETTER DANTAJA NAYANNA +0DB3..0DBB ; L # Lo [9] SINHALA LETTER SANYAKA DAYANNA..SINHALA LETTER RAYANNA +0DBD ; L # Lo SINHALA LETTER DANTAJA LAYANNA +0DC0..0DC6 ; L # Lo [7] SINHALA LETTER VAYANNA..SINHALA LETTER FAYANNA +0DCF..0DD1 ; L # Mc [3] SINHALA VOWEL SIGN AELA-PILLA..SINHALA VOWEL SIGN DIGA AEDA-PILLA +0DD8..0DDF ; L # Mc [8] SINHALA VOWEL SIGN GAETTA-PILLA..SINHALA VOWEL SIGN GAYANUKITTA +0DF2..0DF3 ; L # Mc [2] SINHALA VOWEL SIGN DIGA GAETTA-PILLA..SINHALA VOWEL SIGN DIGA GAYANUKITTA +0DF4 ; L # Po SINHALA PUNCTUATION KUNDDALIYA +0E01..0E30 ; L # Lo [48] THAI CHARACTER KO KAI..THAI CHARACTER SARA A +0E32..0E33 ; L # Lo [2] THAI CHARACTER SARA AA..THAI CHARACTER SARA AM +0E40..0E45 ; L # Lo [6] THAI CHARACTER SARA E..THAI CHARACTER LAKKHANGYAO +0E46 ; L # Lm THAI CHARACTER MAIYAMOK +0E4F ; L # Po THAI CHARACTER FONGMAN +0E50..0E59 ; L # Nd [10] THAI DIGIT ZERO..THAI DIGIT NINE +0E5A..0E5B ; L # Po [2] THAI CHARACTER ANGKHANKHU..THAI CHARACTER KHOMUT +0E81..0E82 ; L # Lo [2] LAO LETTER KO..LAO LETTER KHO SUNG +0E84 ; L # Lo LAO LETTER KHO TAM +0E87..0E88 ; L # Lo [2] LAO LETTER NGO..LAO LETTER CO +0E8A ; L # Lo LAO LETTER SO TAM +0E8D ; L # Lo LAO LETTER NYO +0E94..0E97 ; L # Lo [4] LAO LETTER DO..LAO LETTER THO TAM +0E99..0E9F ; L # Lo [7] LAO LETTER NO..LAO LETTER FO SUNG +0EA1..0EA3 ; L # Lo [3] LAO LETTER MO..LAO LETTER LO LING +0EA5 ; L # Lo LAO LETTER LO LOOT +0EA7 ; L # Lo LAO LETTER WO +0EAA..0EAB ; L # Lo [2] LAO LETTER SO SUNG..LAO LETTER HO SUNG +0EAD..0EB0 ; L # Lo [4] LAO LETTER O..LAO VOWEL SIGN A +0EB2..0EB3 ; L # Lo [2] LAO VOWEL SIGN AA..LAO VOWEL SIGN AM +0EBD ; L # Lo LAO SEMIVOWEL SIGN NYO +0EC0..0EC4 ; L # Lo [5] LAO VOWEL SIGN E..LAO VOWEL SIGN AI +0EC6 ; L # Lm LAO KO LA +0ED0..0ED9 ; L # Nd [10] LAO DIGIT ZERO..LAO DIGIT NINE +0EDC..0EDD ; L # Lo [2] LAO HO NO..LAO HO MO +0F00 ; L # Lo TIBETAN SYLLABLE OM +0F01..0F03 ; L # So [3] TIBETAN MARK GTER YIG MGO TRUNCATED A..TIBETAN MARK GTER YIG MGO -UM GTER TSHEG MA +0F04..0F12 ; L # Po [15] TIBETAN MARK INITIAL YIG MGO MDUN MA..TIBETAN MARK RGYA GRAM SHAD +0F13..0F17 ; L # So [5] TIBETAN MARK CARET -DZUD RTAGS ME LONG CAN..TIBETAN ASTROLOGICAL SIGN SGRA GCAN -CHAR RTAGS +0F1A..0F1F ; L # So [6] TIBETAN SIGN RDEL DKAR GCIG..TIBETAN SIGN RDEL DKAR RDEL NAG +0F20..0F29 ; L # Nd [10] TIBETAN DIGIT ZERO..TIBETAN DIGIT NINE +0F2A..0F33 ; L # No [10] TIBETAN DIGIT HALF ONE..TIBETAN DIGIT HALF ZERO +0F34 ; L # So TIBETAN MARK BSDUS RTAGS +0F36 ; L # So TIBETAN MARK CARET -DZUD RTAGS BZHI MIG CAN +0F38 ; L # So TIBETAN MARK CHE MGO +0F3E..0F3F ; L # Mc [2] TIBETAN SIGN YAR TSHES..TIBETAN SIGN MAR TSHES +0F40..0F47 ; L # Lo [8] TIBETAN LETTER KA..TIBETAN LETTER JA +0F49..0F6A ; L # Lo [34] TIBETAN LETTER NYA..TIBETAN LETTER FIXED-FORM RA +0F7F ; L # Mc TIBETAN SIGN RNAM BCAD +0F85 ; L # Po TIBETAN MARK PALUTA +0F88..0F8B ; L # Lo [4] TIBETAN SIGN LCE TSA CAN..TIBETAN SIGN GRU MED RGYINGS +0FBE..0FC5 ; L # So [8] TIBETAN KU RU KHA..TIBETAN SYMBOL RDO RJE +0FC7..0FCC ; L # So [6] TIBETAN SYMBOL RDO RJE RGYA GRAM..TIBETAN SYMBOL NOR BU BZHI -KHYIL +0FCF ; L # So TIBETAN SIGN RDEL NAG GSUM +1000..1021 ; L # Lo [34] MYANMAR LETTER KA..MYANMAR LETTER A +1023..1027 ; L # Lo [5] MYANMAR LETTER I..MYANMAR LETTER E +1029..102A ; L # Lo [2] MYANMAR LETTER O..MYANMAR LETTER AU +102C ; L # Mc MYANMAR VOWEL SIGN AA +1031 ; L # Mc MYANMAR VOWEL SIGN E +1038 ; L # Mc MYANMAR SIGN VISARGA +1040..1049 ; L # Nd [10] MYANMAR DIGIT ZERO..MYANMAR DIGIT NINE +104A..104F ; L # Po [6] MYANMAR SIGN LITTLE SECTION..MYANMAR SYMBOL GENITIVE +1050..1055 ; L # Lo [6] MYANMAR LETTER SHA..MYANMAR LETTER VOCALIC LL +1056..1057 ; L # Mc [2] MYANMAR VOWEL SIGN VOCALIC R..MYANMAR VOWEL SIGN VOCALIC RR +10A0..10C5 ; L # L& [38] GEORGIAN CAPITAL LETTER AN..GEORGIAN CAPITAL LETTER HOE +10D0..10F8 ; L # Lo [41] GEORGIAN LETTER AN..GEORGIAN LETTER ELIFI +10FB ; L # Po GEORGIAN PARAGRAPH SEPARATOR +1100..1159 ; L # Lo [90] HANGUL CHOSEONG KIYEOK..HANGUL CHOSEONG YEORINHIEUH +115F..11A2 ; L # Lo [68] HANGUL CHOSEONG FILLER..HANGUL JUNGSEONG SSANGARAEA +11A8..11F9 ; L # Lo [82] HANGUL JONGSEONG KIYEOK..HANGUL JONGSEONG YEORINHIEUH +1200..1206 ; L # Lo [7] ETHIOPIC SYLLABLE HA..ETHIOPIC SYLLABLE HO +1208..1246 ; L # Lo [63] ETHIOPIC SYLLABLE LA..ETHIOPIC SYLLABLE QO +1248 ; L # Lo ETHIOPIC SYLLABLE QWA +124A..124D ; L # Lo [4] ETHIOPIC SYLLABLE QWI..ETHIOPIC SYLLABLE QWE +1250..1256 ; L # Lo [7] ETHIOPIC SYLLABLE QHA..ETHIOPIC SYLLABLE QHO +1258 ; L # Lo ETHIOPIC SYLLABLE QHWA +125A..125D ; L # Lo [4] ETHIOPIC SYLLABLE QHWI..ETHIOPIC SYLLABLE QHWE +1260..1286 ; L # Lo [39] ETHIOPIC SYLLABLE BA..ETHIOPIC SYLLABLE XO +1288 ; L # Lo ETHIOPIC SYLLABLE XWA +128A..128D ; L # Lo [4] ETHIOPIC SYLLABLE XWI..ETHIOPIC SYLLABLE XWE +1290..12AE ; L # Lo [31] ETHIOPIC SYLLABLE NA..ETHIOPIC SYLLABLE KO +12B0 ; L # Lo ETHIOPIC SYLLABLE KWA +12B2..12B5 ; L # Lo [4] ETHIOPIC SYLLABLE KWI..ETHIOPIC SYLLABLE KWE +12B8..12BE ; L # Lo [7] ETHIOPIC SYLLABLE KXA..ETHIOPIC SYLLABLE KXO +12C0 ; L # Lo ETHIOPIC SYLLABLE KXWA +12C2..12C5 ; L # Lo [4] ETHIOPIC SYLLABLE KXWI..ETHIOPIC SYLLABLE KXWE +12C8..12CE ; L # Lo [7] ETHIOPIC SYLLABLE WA..ETHIOPIC SYLLABLE WO +12D0..12D6 ; L # Lo [7] ETHIOPIC SYLLABLE PHARYNGEAL A..ETHIOPIC SYLLABLE PHARYNGEAL O +12D8..12EE ; L # Lo [23] ETHIOPIC SYLLABLE ZA..ETHIOPIC SYLLABLE YO +12F0..130E ; L # Lo [31] ETHIOPIC SYLLABLE DA..ETHIOPIC SYLLABLE GO +1310 ; L # Lo ETHIOPIC SYLLABLE GWA +1312..1315 ; L # Lo [4] ETHIOPIC SYLLABLE GWI..ETHIOPIC SYLLABLE GWE +1318..131E ; L # Lo [7] ETHIOPIC SYLLABLE GGA..ETHIOPIC SYLLABLE GGO +1320..1346 ; L # Lo [39] ETHIOPIC SYLLABLE THA..ETHIOPIC SYLLABLE TZO +1348..135A ; L # Lo [19] ETHIOPIC SYLLABLE FA..ETHIOPIC SYLLABLE FYA +1361..1368 ; L # Po [8] ETHIOPIC WORDSPACE..ETHIOPIC PARAGRAPH SEPARATOR +1369..1371 ; L # Nd [9] ETHIOPIC DIGIT ONE..ETHIOPIC DIGIT NINE +1372..137C ; L # No [11] ETHIOPIC NUMBER TEN..ETHIOPIC NUMBER TEN THOUSAND +13A0..13F4 ; L # Lo [85] CHEROKEE LETTER A..CHEROKEE LETTER YV +1401..166C ; L # Lo [620] CANADIAN SYLLABICS E..CANADIAN SYLLABICS CARRIER TTSA +166D..166E ; L # Po [2] CANADIAN SYLLABICS CHI SIGN..CANADIAN SYLLABICS FULL STOP +166F..1676 ; L # Lo [8] CANADIAN SYLLABICS QAI..CANADIAN SYLLABICS NNGAA +1681..169A ; L # Lo [26] OGHAM LETTER BEITH..OGHAM LETTER PEITH +16A0..16EA ; L # Lo [75] RUNIC LETTER FEHU FEOH FE F..RUNIC LETTER X +16EB..16ED ; L # Po [3] RUNIC SINGLE PUNCTUATION..RUNIC CROSS PUNCTUATION +16EE..16F0 ; L # Nl [3] RUNIC ARLAUG SYMBOL..RUNIC BELGTHOR SYMBOL +1700..170C ; L # Lo [13] TAGALOG LETTER A..TAGALOG LETTER YA +170E..1711 ; L # Lo [4] TAGALOG LETTER LA..TAGALOG LETTER HA +1720..1731 ; L # Lo [18] HANUNOO LETTER A..HANUNOO LETTER HA +1735..1736 ; L # Po [2] PHILIPPINE SINGLE PUNCTUATION..PHILIPPINE DOUBLE PUNCTUATION +1740..1751 ; L # Lo [18] BUHID LETTER A..BUHID LETTER HA +1760..176C ; L # Lo [13] TAGBANWA LETTER A..TAGBANWA LETTER YA +176E..1770 ; L # Lo [3] TAGBANWA LETTER LA..TAGBANWA LETTER SA +1780..17B3 ; L # Lo [52] KHMER LETTER KA..KHMER INDEPENDENT VOWEL QAU +17B4..17B6 ; L # Mc [3] KHMER VOWEL INHERENT AQ..KHMER VOWEL SIGN AA +17BE..17C5 ; L # Mc [8] KHMER VOWEL SIGN OE..KHMER VOWEL SIGN AU +17C7..17C8 ; L # Mc [2] KHMER SIGN REAHMUK..KHMER SIGN YUUKALEAPINTU +17D4..17D6 ; L # Po [3] KHMER SIGN KHAN..KHMER SIGN CAMNUC PII KUUH +17D7 ; L # Lm KHMER SIGN LEK TOO +17D8..17DA ; L # Po [3] KHMER SIGN BEYYAL..KHMER SIGN KOOMUUT +17DC ; L # Lo KHMER SIGN AVAKRAHASANYA +17E0..17E9 ; L # Nd [10] KHMER DIGIT ZERO..KHMER DIGIT NINE +1810..1819 ; L # Nd [10] MONGOLIAN DIGIT ZERO..MONGOLIAN DIGIT NINE +1820..1842 ; L # Lo [35] MONGOLIAN LETTER A..MONGOLIAN LETTER CHI +1843 ; L # Lm MONGOLIAN LETTER TODO LONG VOWEL SIGN +1844..1877 ; L # Lo [52] MONGOLIAN LETTER TODO E..MONGOLIAN LETTER MANCHU ZHA +1880..18A8 ; L # Lo [41] MONGOLIAN LETTER ALI GALI ANUSVARA ONE..MONGOLIAN LETTER MANCHU ALI GALI BHA +1E00..1E9B ; L # L& [156] LATIN CAPITAL LETTER A WITH RING BELOW..LATIN SMALL LETTER LONG S WITH DOT ABOVE +1EA0..1EF9 ; L # L& [90] LATIN CAPITAL LETTER A WITH DOT BELOW..LATIN SMALL LETTER Y WITH TILDE +1F00..1F15 ; L # L& [22] GREEK SMALL LETTER ALPHA WITH PSILI..GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA +1F18..1F1D ; L # L& [6] GREEK CAPITAL LETTER EPSILON WITH PSILI..GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA +1F20..1F45 ; L # L& [38] GREEK SMALL LETTER ETA WITH PSILI..GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA +1F48..1F4D ; L # L& [6] GREEK CAPITAL LETTER OMICRON WITH PSILI..GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA +1F50..1F57 ; L # L& [8] GREEK SMALL LETTER UPSILON WITH PSILI..GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI +1F59 ; L # L& GREEK CAPITAL LETTER UPSILON WITH DASIA +1F5B ; L # L& GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA +1F5D ; L # L& GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA +1F5F..1F7D ; L # L& [31] GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI..GREEK SMALL LETTER OMEGA WITH OXIA +1F80..1FB4 ; L # L& [53] GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI..GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI +1FB6..1FBC ; L # L& [7] GREEK SMALL LETTER ALPHA WITH PERISPOMENI..GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI +1FBE ; L # L& GREEK PROSGEGRAMMENI +1FC2..1FC4 ; L # L& [3] GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI..GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI +1FC6..1FCC ; L # L& [7] GREEK SMALL LETTER ETA WITH PERISPOMENI..GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI +1FD0..1FD3 ; L # L& [4] GREEK SMALL LETTER IOTA WITH VRACHY..GREEK SMALL LETTER IOTA WITH DIALYTIKA AND OXIA +1FD6..1FDB ; L # L& [6] GREEK SMALL LETTER IOTA WITH PERISPOMENI..GREEK CAPITAL LETTER IOTA WITH OXIA +1FE0..1FEC ; L # L& [13] GREEK SMALL LETTER UPSILON WITH VRACHY..GREEK CAPITAL LETTER RHO WITH DASIA +1FF2..1FF4 ; L # L& [3] GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI..GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI +1FF6..1FFC ; L # L& [7] GREEK SMALL LETTER OMEGA WITH PERISPOMENI..GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI +200E ; L # Cf LEFT-TO-RIGHT MARK +2071 ; L # L& SUPERSCRIPT LATIN SMALL LETTER I +207F ; L # L& SUPERSCRIPT LATIN SMALL LETTER N +2102 ; L # L& DOUBLE-STRUCK CAPITAL C +2107 ; L # L& EULER CONSTANT +210A..2113 ; L # L& [10] SCRIPT SMALL G..SCRIPT SMALL L +2115 ; L # L& DOUBLE-STRUCK CAPITAL N +2119..211D ; L # L& [5] DOUBLE-STRUCK CAPITAL P..DOUBLE-STRUCK CAPITAL R +2124 ; L # L& DOUBLE-STRUCK CAPITAL Z +2126 ; L # L& OHM SIGN +2128 ; L # L& BLACK-LETTER CAPITAL Z +212A..212D ; L # L& [4] KELVIN SIGN..BLACK-LETTER CAPITAL C +212F..2131 ; L # L& [3] SCRIPT SMALL E..SCRIPT CAPITAL F +2133..2134 ; L # L& [2] SCRIPT CAPITAL M..SCRIPT SMALL O +2135..2138 ; L # Lo [4] ALEF SYMBOL..DALET SYMBOL +2139 ; L # L& INFORMATION SOURCE +213D..213F ; L # L& [3] DOUBLE-STRUCK SMALL GAMMA..DOUBLE-STRUCK CAPITAL PI +2145..2149 ; L # L& [5] DOUBLE-STRUCK ITALIC CAPITAL D..DOUBLE-STRUCK ITALIC SMALL J +2160..2183 ; L # Nl [36] ROMAN NUMERAL ONE..ROMAN NUMERAL REVERSED ONE HUNDRED +2336..237A ; L # So [69] APL FUNCTIONAL SYMBOL I-BEAM..APL FUNCTIONAL SYMBOL ALPHA +2395 ; L # So APL FUNCTIONAL SYMBOL QUAD +249C..24E9 ; L # So [78] PARENTHESIZED LATIN SMALL LETTER A..CIRCLED LATIN SMALL LETTER Z +3005 ; L # Lm IDEOGRAPHIC ITERATION MARK +3006 ; L # Lo IDEOGRAPHIC CLOSING MARK +3007 ; L # Nl IDEOGRAPHIC NUMBER ZERO +3021..3029 ; L # Nl [9] HANGZHOU NUMERAL ONE..HANGZHOU NUMERAL NINE +3031..3035 ; L # Lm [5] VERTICAL KANA REPEAT MARK..VERTICAL KANA REPEAT MARK LOWER HALF +3038..303A ; L # Nl [3] HANGZHOU NUMERAL TEN..HANGZHOU NUMERAL THIRTY +303B ; L # Lm VERTICAL IDEOGRAPHIC ITERATION MARK +303C ; L # Lo MASU MARK +3041..3096 ; L # Lo [86] HIRAGANA LETTER SMALL A..HIRAGANA LETTER SMALL KE +309D..309E ; L # Lm [2] HIRAGANA ITERATION MARK..HIRAGANA VOICED ITERATION MARK +309F ; L # Lo HIRAGANA DIGRAPH YORI +30A1..30FA ; L # Lo [90] KATAKANA LETTER SMALL A..KATAKANA LETTER VO +30FC..30FE ; L # Lm [3] KATAKANA-HIRAGANA PROLONGED SOUND MARK..KATAKANA VOICED ITERATION MARK +30FF ; L # Lo KATAKANA DIGRAPH KOTO +3105..312C ; L # Lo [40] BOPOMOFO LETTER B..BOPOMOFO LETTER GN +3131..318E ; L # Lo [94] HANGUL LETTER KIYEOK..HANGUL LETTER ARAEAE +3190..3191 ; L # So [2] IDEOGRAPHIC ANNOTATION LINKING MARK..IDEOGRAPHIC ANNOTATION REVERSE MARK +3192..3195 ; L # No [4] IDEOGRAPHIC ANNOTATION ONE MARK..IDEOGRAPHIC ANNOTATION FOUR MARK +3196..319F ; L # So [10] IDEOGRAPHIC ANNOTATION TOP MARK..IDEOGRAPHIC ANNOTATION MAN MARK +31A0..31B7 ; L # Lo [24] BOPOMOFO LETTER BU..BOPOMOFO FINAL LETTER H +31F0..31FF ; L # Lo [16] KATAKANA LETTER SMALL KU..KATAKANA LETTER SMALL RO +3200..321C ; L # So [29] PARENTHESIZED HANGUL KIYEOK..PARENTHESIZED HANGUL CIEUC U +3220..3229 ; L # No [10] PARENTHESIZED IDEOGRAPH ONE..PARENTHESIZED IDEOGRAPH TEN +322A..3243 ; L # So [26] PARENTHESIZED IDEOGRAPH MOON..PARENTHESIZED IDEOGRAPH REACH +3260..327B ; L # So [28] CIRCLED HANGUL KIYEOK..CIRCLED HANGUL HIEUH A +327F ; L # So KOREAN STANDARD SYMBOL +3280..3289 ; L # No [10] CIRCLED IDEOGRAPH ONE..CIRCLED IDEOGRAPH TEN +328A..32B0 ; L # So [39] CIRCLED IDEOGRAPH MOON..CIRCLED IDEOGRAPH NIGHT +32C0..32CB ; L # So [12] IDEOGRAPHIC TELEGRAPH SYMBOL FOR JANUARY..IDEOGRAPHIC TELEGRAPH SYMBOL FOR DECEMBER +32D0..32FE ; L # So [47] CIRCLED KATAKANA A..CIRCLED KATAKANA WO +3300..3376 ; L # So [119] SQUARE APAATO..SQUARE PC +337B..33DD ; L # So [99] SQUARE ERA NAME HEISEI..SQUARE WB +33E0..33FE ; L # So [31] IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY ONE..IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY THIRTY-ONE +3400..4DB5 ; L # Lo [6582] CJK UNIFIED IDEOGRAPH-3400..CJK UNIFIED IDEOGRAPH-4DB5 +4E00..9FA5 ; L # Lo [20902] CJK UNIFIED IDEOGRAPH-4E00..CJK UNIFIED IDEOGRAPH-9FA5 +A000..A48C ; L # Lo [1165] YI SYLLABLE IT..YI SYLLABLE YYR +AC00..D7A3 ; L # Lo [11172] HANGUL SYLLABLE GA..HANGUL SYLLABLE HIH +D800..DFFF ; L # Cs [2048] +E000..F8FF ; L # Co [6400] +F900..FA2D ; L # Lo [302] CJK COMPATIBILITY IDEOGRAPH-F900..CJK COMPATIBILITY IDEOGRAPH-FA2D +FA30..FA6A ; L # Lo [59] CJK COMPATIBILITY IDEOGRAPH-FA30..CJK COMPATIBILITY IDEOGRAPH-FA6A +FB00..FB06 ; L # L& [7] LATIN SMALL LIGATURE FF..LATIN SMALL LIGATURE ST +FB13..FB17 ; L # L& [5] ARMENIAN SMALL LIGATURE MEN NOW..ARMENIAN SMALL LIGATURE MEN XEH +FF21..FF3A ; L # L& [26] FULLWIDTH LATIN CAPITAL LETTER A..FULLWIDTH LATIN CAPITAL LETTER Z +FF41..FF5A ; L # L& [26] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH LATIN SMALL LETTER Z +FF66..FF6F ; L # Lo [10] HALFWIDTH KATAKANA LETTER WO..HALFWIDTH KATAKANA LETTER SMALL TU +FF70 ; L # Lm HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK +FF71..FF9D ; L # Lo [45] HALFWIDTH KATAKANA LETTER A..HALFWIDTH KATAKANA LETTER N +FF9E..FF9F ; L # Lm [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK +FFA0..FFBE ; L # Lo [31] HALFWIDTH HANGUL FILLER..HALFWIDTH HANGUL LETTER HIEUH +FFC2..FFC7 ; L # Lo [6] HALFWIDTH HANGUL LETTER A..HALFWIDTH HANGUL LETTER E +FFCA..FFCF ; L # Lo [6] HALFWIDTH HANGUL LETTER YEO..HALFWIDTH HANGUL LETTER OE +FFD2..FFD7 ; L # Lo [6] HALFWIDTH HANGUL LETTER YO..HALFWIDTH HANGUL LETTER YU +FFDA..FFDC ; L # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL LETTER I +10300..1031E ; L # Lo [31] OLD ITALIC LETTER A..OLD ITALIC LETTER UU +10320..10323 ; L # No [4] OLD ITALIC NUMERAL ONE..OLD ITALIC NUMERAL FIFTY +10330..10349 ; L # Lo [26] GOTHIC LETTER AHSA..GOTHIC LETTER OTHAL +1034A ; L # Nl GOTHIC LETTER NINE HUNDRED +10400..10425 ; L # L& [38] DESERET CAPITAL LETTER LONG I..DESERET CAPITAL LETTER ENG +10428..1044D ; L # L& [38] DESERET SMALL LETTER LONG I..DESERET SMALL LETTER ENG +1D000..1D0F5 ; L # So [246] BYZANTINE MUSICAL SYMBOL PSILI..BYZANTINE MUSICAL SYMBOL GORGON NEO KATO +1D100..1D126 ; L # So [39] MUSICAL SYMBOL SINGLE BARLINE..MUSICAL SYMBOL DRUM CLEF-2 +1D12A..1D164 ; L # So [59] MUSICAL SYMBOL DOUBLE SHARP..MUSICAL SYMBOL ONE HUNDRED TWENTY-EIGHTH NOTE +1D165..1D166 ; L # Mc [2] MUSICAL SYMBOL COMBINING STEM..MUSICAL SYMBOL COMBINING SPRECHGESANG STEM +1D16A..1D16C ; L # So [3] MUSICAL SYMBOL FINGERED TREMOLO-1..MUSICAL SYMBOL FINGERED TREMOLO-3 +1D16D..1D172 ; L # Mc [6] MUSICAL SYMBOL COMBINING AUGMENTATION DOT..MUSICAL SYMBOL COMBINING FLAG-5 +1D183..1D184 ; L # So [2] MUSICAL SYMBOL ARPEGGIATO UP..MUSICAL SYMBOL ARPEGGIATO DOWN +1D18C..1D1A9 ; L # So [30] MUSICAL SYMBOL RINFORZANDO..MUSICAL SYMBOL DEGREE SLASH +1D1AE..1D1DD ; L # So [48] MUSICAL SYMBOL PEDAL MARK..MUSICAL SYMBOL PES SUBPUNCTIS +1D400..1D454 ; L # L& [85] MATHEMATICAL BOLD CAPITAL A..MATHEMATICAL ITALIC SMALL G +1D456..1D49C ; L # L& [71] MATHEMATICAL ITALIC SMALL I..MATHEMATICAL SCRIPT CAPITAL A +1D49E..1D49F ; L # L& [2] MATHEMATICAL SCRIPT CAPITAL C..MATHEMATICAL SCRIPT CAPITAL D +1D4A2 ; L # L& MATHEMATICAL SCRIPT CAPITAL G +1D4A5..1D4A6 ; L # L& [2] MATHEMATICAL SCRIPT CAPITAL J..MATHEMATICAL SCRIPT CAPITAL K +1D4A9..1D4AC ; L # L& [4] MATHEMATICAL SCRIPT CAPITAL N..MATHEMATICAL SCRIPT CAPITAL Q +1D4AE..1D4B9 ; L # L& [12] MATHEMATICAL SCRIPT CAPITAL S..MATHEMATICAL SCRIPT SMALL D +1D4BB ; L # L& MATHEMATICAL SCRIPT SMALL F +1D4BD..1D4C0 ; L # L& [4] MATHEMATICAL SCRIPT SMALL H..MATHEMATICAL SCRIPT SMALL K +1D4C2..1D4C3 ; L # L& [2] MATHEMATICAL SCRIPT SMALL M..MATHEMATICAL SCRIPT SMALL N +1D4C5..1D505 ; L # L& [65] MATHEMATICAL SCRIPT SMALL P..MATHEMATICAL FRAKTUR CAPITAL B +1D507..1D50A ; L # L& [4] MATHEMATICAL FRAKTUR CAPITAL D..MATHEMATICAL FRAKTUR CAPITAL G +1D50D..1D514 ; L # L& [8] MATHEMATICAL FRAKTUR CAPITAL J..MATHEMATICAL FRAKTUR CAPITAL Q +1D516..1D51C ; L # L& [7] MATHEMATICAL FRAKTUR CAPITAL S..MATHEMATICAL FRAKTUR CAPITAL Y +1D51E..1D539 ; L # L& [28] MATHEMATICAL FRAKTUR SMALL A..MATHEMATICAL DOUBLE-STRUCK CAPITAL B +1D53B..1D53E ; L # L& [4] MATHEMATICAL DOUBLE-STRUCK CAPITAL D..MATHEMATICAL DOUBLE-STRUCK CAPITAL G +1D540..1D544 ; L # L& [5] MATHEMATICAL DOUBLE-STRUCK CAPITAL I..MATHEMATICAL DOUBLE-STRUCK CAPITAL M +1D546 ; L # L& MATHEMATICAL DOUBLE-STRUCK CAPITAL O +1D54A..1D550 ; L # L& [7] MATHEMATICAL DOUBLE-STRUCK CAPITAL S..MATHEMATICAL DOUBLE-STRUCK CAPITAL Y +1D552..1D6A3 ; L # L& [338] MATHEMATICAL DOUBLE-STRUCK SMALL A..MATHEMATICAL MONOSPACE SMALL Z +1D6A8..1D6C0 ; L # L& [25] MATHEMATICAL BOLD CAPITAL ALPHA..MATHEMATICAL BOLD CAPITAL OMEGA +1D6C1 ; L # Sm MATHEMATICAL BOLD NABLA +1D6C2..1D6DA ; L # L& [25] MATHEMATICAL BOLD SMALL ALPHA..MATHEMATICAL BOLD SMALL OMEGA +1D6DB ; L # Sm MATHEMATICAL BOLD PARTIAL DIFFERENTIAL +1D6DC..1D6FA ; L # L& [31] MATHEMATICAL BOLD EPSILON SYMBOL..MATHEMATICAL ITALIC CAPITAL OMEGA +1D6FB ; L # Sm MATHEMATICAL ITALIC NABLA +1D6FC..1D714 ; L # L& [25] MATHEMATICAL ITALIC SMALL ALPHA..MATHEMATICAL ITALIC SMALL OMEGA +1D715 ; L # Sm MATHEMATICAL ITALIC PARTIAL DIFFERENTIAL +1D716..1D734 ; L # L& [31] MATHEMATICAL ITALIC EPSILON SYMBOL..MATHEMATICAL BOLD ITALIC CAPITAL OMEGA +1D735 ; L # Sm MATHEMATICAL BOLD ITALIC NABLA +1D736..1D74E ; L # L& [25] MATHEMATICAL BOLD ITALIC SMALL ALPHA..MATHEMATICAL BOLD ITALIC SMALL OMEGA +1D74F ; L # Sm MATHEMATICAL BOLD ITALIC PARTIAL DIFFERENTIAL +1D750..1D76E ; L # L& [31] MATHEMATICAL BOLD ITALIC EPSILON SYMBOL..MATHEMATICAL SANS-SERIF BOLD CAPITAL OMEGA +1D76F ; L # Sm MATHEMATICAL SANS-SERIF BOLD NABLA +1D770..1D788 ; L # L& [25] MATHEMATICAL SANS-SERIF BOLD SMALL ALPHA..MATHEMATICAL SANS-SERIF BOLD SMALL OMEGA +1D789 ; L # Sm MATHEMATICAL SANS-SERIF BOLD PARTIAL DIFFERENTIAL +1D78A..1D7A8 ; L # L& [31] MATHEMATICAL SANS-SERIF BOLD EPSILON SYMBOL..MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL OMEGA +1D7A9 ; L # Sm MATHEMATICAL SANS-SERIF BOLD ITALIC NABLA +1D7AA..1D7C2 ; L # L& [25] MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ALPHA..MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL OMEGA +1D7C3 ; L # Sm MATHEMATICAL SANS-SERIF BOLD ITALIC PARTIAL DIFFERENTIAL +1D7C4..1D7C9 ; L # L& [6] MATHEMATICAL SANS-SERIF BOLD ITALIC EPSILON SYMBOL..MATHEMATICAL SANS-SERIF BOLD ITALIC PI SYMBOL +20000..2A6D6 ; L # Lo [42711] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6D6 +2F800..2FA1D ; L # Lo [542] CJK COMPATIBILITY IDEOGRAPH-2F800..CJK COMPATIBILITY IDEOGRAPH-2FA1D +F0000..FFFFD ; L # Co [65534] +100000..10FFFD; L # Co [65534] + +# Total code points: 229973 + +# ================================================ + +05BE ; R # Po HEBREW PUNCTUATION MAQAF +05C0 ; R # Po HEBREW PUNCTUATION PASEQ +05C3 ; R # Po HEBREW PUNCTUATION SOF PASUQ +05D0..05EA ; R # Lo [27] HEBREW LETTER ALEF..HEBREW LETTER TAV +05F0..05F2 ; R # Lo [3] HEBREW LIGATURE YIDDISH DOUBLE VAV..HEBREW LIGATURE YIDDISH DOUBLE YOD +05F3..05F4 ; R # Po [2] HEBREW PUNCTUATION GERESH..HEBREW PUNCTUATION GERSHAYIM +200F ; R # Cf RIGHT-TO-LEFT MARK +FB1D ; R # Lo HEBREW LETTER YOD WITH HIRIQ +FB1F..FB28 ; R # Lo [10] HEBREW LIGATURE YIDDISH YOD YOD PATAH..HEBREW LETTER WIDE TAV +FB2A..FB36 ; R # Lo [13] HEBREW LETTER SHIN WITH SHIN DOT..HEBREW LETTER ZAYIN WITH DAGESH +FB38..FB3C ; R # Lo [5] HEBREW LETTER TET WITH DAGESH..HEBREW LETTER LAMED WITH DAGESH +FB3E ; R # Lo HEBREW LETTER MEM WITH DAGESH +FB40..FB41 ; R # Lo [2] HEBREW LETTER NUN WITH DAGESH..HEBREW LETTER SAMEKH WITH DAGESH +FB43..FB44 ; R # Lo [2] HEBREW LETTER FINAL PE WITH DAGESH..HEBREW LETTER PE WITH DAGESH +FB46..FB4F ; R # Lo [10] HEBREW LETTER TSADI WITH DAGESH..HEBREW LIGATURE ALEF LAMED + +# Total code points: 80 + +# ================================================ + +0030..0039 ; EN # Nd [10] DIGIT ZERO..DIGIT NINE +00B2..00B3 ; EN # No [2] SUPERSCRIPT TWO..SUPERSCRIPT THREE +00B9 ; EN # No SUPERSCRIPT ONE +06F0..06F9 ; EN # Nd [10] EXTENDED ARABIC-INDIC DIGIT ZERO..EXTENDED ARABIC-INDIC DIGIT NINE +2070 ; EN # No SUPERSCRIPT ZERO +2074..2079 ; EN # No [6] SUPERSCRIPT FOUR..SUPERSCRIPT NINE +2080..2089 ; EN # No [10] SUBSCRIPT ZERO..SUBSCRIPT NINE +2460..249B ; EN # No [60] CIRCLED DIGIT ONE..NUMBER TWENTY FULL STOP +24EA ; EN # No CIRCLED DIGIT ZERO +FF10..FF19 ; EN # Nd [10] FULLWIDTH DIGIT ZERO..FULLWIDTH DIGIT NINE +1D7CE..1D7FF ; EN # Nd [50] MATHEMATICAL BOLD DIGIT ZERO..MATHEMATICAL MONOSPACE DIGIT NINE + +# Total code points: 161 + +# ================================================ + +002F ; ES # Po SOLIDUS +FF0F ; ES # Po FULLWIDTH SOLIDUS + +# Total code points: 2 + +# ================================================ + +0023 ; ET # Po NUMBER SIGN +0024 ; ET # Sc DOLLAR SIGN +0025 ; ET # Po PERCENT SIGN +002B ; ET # Sm PLUS SIGN +002D ; ET # Pd HYPHEN-MINUS +00A2..00A5 ; ET # Sc [4] CENT SIGN..YEN SIGN +00B0 ; ET # So DEGREE SIGN +00B1 ; ET # Sm PLUS-MINUS SIGN +066A ; ET # Po ARABIC PERCENT SIGN +09F2..09F3 ; ET # Sc [2] BENGALI RUPEE MARK..BENGALI RUPEE SIGN +0E3F ; ET # Sc THAI CURRENCY SYMBOL BAHT +17DB ; ET # Sc KHMER CURRENCY SYMBOL RIEL +2030..2034 ; ET # Po [5] PER MILLE SIGN..TRIPLE PRIME +207A..207B ; ET # Sm [2] SUPERSCRIPT PLUS SIGN..SUPERSCRIPT MINUS +208A..208B ; ET # Sm [2] SUBSCRIPT PLUS SIGN..SUBSCRIPT MINUS +20A0..20B1 ; ET # Sc [18] EURO-CURRENCY SIGN..PESO SIGN +212E ; ET # So ESTIMATED SYMBOL +2212..2213 ; ET # Sm [2] MINUS SIGN..MINUS-OR-PLUS SIGN +FB29 ; ET # Sm HEBREW LETTER ALTERNATIVE PLUS SIGN +FE5F ; ET # Po SMALL NUMBER SIGN +FE62 ; ET # Sm SMALL PLUS SIGN +FE63 ; ET # Pd SMALL HYPHEN-MINUS +FE69 ; ET # Sc SMALL DOLLAR SIGN +FE6A ; ET # Po SMALL PERCENT SIGN +FF03 ; ET # Po FULLWIDTH NUMBER SIGN +FF04 ; ET # Sc FULLWIDTH DOLLAR SIGN +FF05 ; ET # Po FULLWIDTH PERCENT SIGN +FF0B ; ET # Sm FULLWIDTH PLUS SIGN +FF0D ; ET # Pd FULLWIDTH HYPHEN-MINUS +FFE0..FFE1 ; ET # Sc [2] FULLWIDTH CENT SIGN..FULLWIDTH POUND SIGN +FFE5..FFE6 ; ET # Sc [2] FULLWIDTH YEN SIGN..FULLWIDTH WON SIGN + +# Total code points: 61 + +# ================================================ + +0660..0669 ; AN # Nd [10] ARABIC-INDIC DIGIT ZERO..ARABIC-INDIC DIGIT NINE +066B..066C ; AN # Po [2] ARABIC DECIMAL SEPARATOR..ARABIC THOUSANDS SEPARATOR + +# Total code points: 12 + +# ================================================ + +002C ; CS # Po COMMA +002E ; CS # Po FULL STOP +003A ; CS # Po COLON +00A0 ; CS # Zs NO-BREAK SPACE +060C ; CS # Po ARABIC COMMA +FE50 ; CS # Po SMALL COMMA +FE52 ; CS # Po SMALL FULL STOP +FE55 ; CS # Po SMALL COLON +FF0C ; CS # Po FULLWIDTH COMMA +FF0E ; CS # Po FULLWIDTH FULL STOP +FF1A ; CS # Po FULLWIDTH COLON + +# Total code points: 11 + +# ================================================ + +000A ; B # Cc +000D ; B # Cc +001C..001E ; B # Cc [3] .. +0085 ; B # Cc +2029 ; B # Zp PARAGRAPH SEPARATOR + +# Total code points: 7 + +# ================================================ + +0009 ; S # Cc +000B ; S # Cc +001F ; S # Cc + +# Total code points: 3 + +# ================================================ + +000C ; WS # Cc +0020 ; WS # Zs SPACE +1680 ; WS # Zs OGHAM SPACE MARK +2000..200A ; WS # Zs [11] EN QUAD..HAIR SPACE +2028 ; WS # Zl LINE SEPARATOR +202F ; WS # Zs NARROW NO-BREAK SPACE +205F ; WS # Zs MEDIUM MATHEMATICAL SPACE +3000 ; WS # Zs IDEOGRAPHIC SPACE + +# Total code points: 18 + +# ================================================ + +0021..0022 ; ON # Po [2] EXCLAMATION MARK..QUOTATION MARK +0026..0027 ; ON # Po [2] AMPERSAND..APOSTROPHE +0028 ; ON # Ps LEFT PARENTHESIS +0029 ; ON # Pe RIGHT PARENTHESIS +002A ; ON # Po ASTERISK +003B ; ON # Po SEMICOLON +003C..003E ; ON # Sm [3] LESS-THAN SIGN..GREATER-THAN SIGN +003F..0040 ; ON # Po [2] QUESTION MARK..COMMERCIAL AT +005B ; ON # Ps LEFT SQUARE BRACKET +005C ; ON # Po REVERSE SOLIDUS +005D ; ON # Pe RIGHT SQUARE BRACKET +005E ; ON # Sk CIRCUMFLEX ACCENT +005F ; ON # Pc LOW LINE +0060 ; ON # Sk GRAVE ACCENT +007B ; ON # Ps LEFT CURLY BRACKET +007C ; ON # Sm VERTICAL LINE +007D ; ON # Pe RIGHT CURLY BRACKET +007E ; ON # Sm TILDE +00A1 ; ON # Po INVERTED EXCLAMATION MARK +00A6..00A7 ; ON # So [2] BROKEN BAR..SECTION SIGN +00A8 ; ON # Sk DIAERESIS +00A9 ; ON # So COPYRIGHT SIGN +00AB ; ON # Pi LEFT-POINTING DOUBLE ANGLE QUOTATION MARK +00AC ; ON # Sm NOT SIGN +00AD ; ON # Pd SOFT HYPHEN +00AE ; ON # So REGISTERED SIGN +00AF ; ON # Sk MACRON +00B4 ; ON # Sk ACUTE ACCENT +00B6 ; ON # So PILCROW SIGN +00B7 ; ON # Po MIDDLE DOT +00B8 ; ON # Sk CEDILLA +00BB ; ON # Pf RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK +00BC..00BE ; ON # No [3] VULGAR FRACTION ONE QUARTER..VULGAR FRACTION THREE QUARTERS +00BF ; ON # Po INVERTED QUESTION MARK +00D7 ; ON # Sm MULTIPLICATION SIGN +00F7 ; ON # Sm DIVISION SIGN +02B9..02BA ; ON # Sk [2] MODIFIER LETTER PRIME..MODIFIER LETTER DOUBLE PRIME +02C2..02CF ; ON # Sk [14] MODIFIER LETTER LEFT ARROWHEAD..MODIFIER LETTER LOW ACUTE ACCENT +02D2..02DF ; ON # Sk [14] MODIFIER LETTER CENTRED RIGHT HALF RING..MODIFIER LETTER CROSS ACCENT +02E5..02ED ; ON # Sk [9] MODIFIER LETTER EXTRA-HIGH TONE BAR..MODIFIER LETTER UNASPIRATED +0374..0375 ; ON # Sk [2] GREEK NUMERAL SIGN..GREEK LOWER NUMERAL SIGN +037E ; ON # Po GREEK QUESTION MARK +0384..0385 ; ON # Sk [2] GREEK TONOS..GREEK DIALYTIKA TONOS +0387 ; ON # Po GREEK ANO TELEIA +03F6 ; ON # Sm GREEK REVERSED LUNATE EPSILON SYMBOL +058A ; ON # Pd ARMENIAN HYPHEN +06E9 ; ON # So ARABIC PLACE OF SAJDAH +0F3A ; ON # Ps TIBETAN MARK GUG RTAGS GYON +0F3B ; ON # Pe TIBETAN MARK GUG RTAGS GYAS +0F3C ; ON # Ps TIBETAN MARK ANG KHANG GYON +0F3D ; ON # Pe TIBETAN MARK ANG KHANG GYAS +169B ; ON # Ps OGHAM FEATHER MARK +169C ; ON # Pe OGHAM REVERSED FEATHER MARK +1800..1805 ; ON # Po [6] MONGOLIAN BIRGA..MONGOLIAN FOUR DOTS +1806 ; ON # Pd MONGOLIAN TODO SOFT HYPHEN +1807..180A ; ON # Po [4] MONGOLIAN SIBE SYLLABLE BOUNDARY MARKER..MONGOLIAN NIRUGU +1FBD ; ON # Sk GREEK KORONIS +1FBF..1FC1 ; ON # Sk [3] GREEK PSILI..GREEK DIALYTIKA AND PERISPOMENI +1FCD..1FCF ; ON # Sk [3] GREEK PSILI AND VARIA..GREEK PSILI AND PERISPOMENI +1FDD..1FDF ; ON # Sk [3] GREEK DASIA AND VARIA..GREEK DASIA AND PERISPOMENI +1FED..1FEF ; ON # Sk [3] GREEK DIALYTIKA AND VARIA..GREEK VARIA +1FFD..1FFE ; ON # Sk [2] GREEK OXIA..GREEK DASIA +2010..2015 ; ON # Pd [6] HYPHEN..HORIZONTAL BAR +2016..2017 ; ON # Po [2] DOUBLE VERTICAL LINE..DOUBLE LOW LINE +2018 ; ON # Pi LEFT SINGLE QUOTATION MARK +2019 ; ON # Pf RIGHT SINGLE QUOTATION MARK +201A ; ON # Ps SINGLE LOW-9 QUOTATION MARK +201B..201C ; ON # Pi [2] SINGLE HIGH-REVERSED-9 QUOTATION MARK..LEFT DOUBLE QUOTATION MARK +201D ; ON # Pf RIGHT DOUBLE QUOTATION MARK +201E ; ON # Ps DOUBLE LOW-9 QUOTATION MARK +201F ; ON # Pi DOUBLE HIGH-REVERSED-9 QUOTATION MARK +2020..2027 ; ON # Po [8] DAGGER..HYPHENATION POINT +2035..2038 ; ON # Po [4] REVERSED PRIME..CARET +2039 ; ON # Pi SINGLE LEFT-POINTING ANGLE QUOTATION MARK +203A ; ON # Pf SINGLE RIGHT-POINTING ANGLE QUOTATION MARK +203B..203E ; ON # Po [4] REFERENCE MARK..OVERLINE +203F..2040 ; ON # Pc [2] UNDERTIE..CHARACTER TIE +2041..2043 ; ON # Po [3] CARET INSERTION POINT..HYPHEN BULLET +2044 ; ON # Sm FRACTION SLASH +2045 ; ON # Ps LEFT SQUARE BRACKET WITH QUILL +2046 ; ON # Pe RIGHT SQUARE BRACKET WITH QUILL +2047..2051 ; ON # Po [11] DOUBLE QUESTION MARK..TWO ASTERISKS ALIGNED VERTICALLY +2052 ; ON # Sm COMMERCIAL MINUS SIGN +2057 ; ON # Po QUADRUPLE PRIME +207C ; ON # Sm SUPERSCRIPT EQUALS SIGN +207D ; ON # Ps SUPERSCRIPT LEFT PARENTHESIS +207E ; ON # Pe SUPERSCRIPT RIGHT PARENTHESIS +208C ; ON # Sm SUBSCRIPT EQUALS SIGN +208D ; ON # Ps SUBSCRIPT LEFT PARENTHESIS +208E ; ON # Pe SUBSCRIPT RIGHT PARENTHESIS +2100..2101 ; ON # So [2] ACCOUNT OF..ADDRESSED TO THE SUBJECT +2103..2106 ; ON # So [4] DEGREE CELSIUS..CADA UNA +2108..2109 ; ON # So [2] SCRUPLE..DEGREE FAHRENHEIT +2114 ; ON # So L B BAR SYMBOL +2116..2118 ; ON # So [3] NUMERO SIGN..SCRIPT CAPITAL P +211E..2123 ; ON # So [6] PRESCRIPTION TAKE..VERSICLE +2125 ; ON # So OUNCE SIGN +2127 ; ON # So INVERTED OHM SIGN +2129 ; ON # So TURNED GREEK SMALL LETTER IOTA +2132 ; ON # So TURNED CAPITAL F +213A ; ON # So ROTATED CAPITAL Q +2140..2144 ; ON # Sm [5] DOUBLE-STRUCK N-ARY SUMMATION..TURNED SANS-SERIF CAPITAL Y +214A ; ON # So PROPERTY LINE +214B ; ON # Sm TURNED AMPERSAND +2153..215F ; ON # No [13] VULGAR FRACTION ONE THIRD..FRACTION NUMERATOR ONE +2190..2194 ; ON # Sm [5] LEFTWARDS ARROW..LEFT RIGHT ARROW +2195..2199 ; ON # So [5] UP DOWN ARROW..SOUTH WEST ARROW +219A..219B ; ON # Sm [2] LEFTWARDS ARROW WITH STROKE..RIGHTWARDS ARROW WITH STROKE +219C..219F ; ON # So [4] LEFTWARDS WAVE ARROW..UPWARDS TWO HEADED ARROW +21A0 ; ON # Sm RIGHTWARDS TWO HEADED ARROW +21A1..21A2 ; ON # So [2] DOWNWARDS TWO HEADED ARROW..LEFTWARDS ARROW WITH TAIL +21A3 ; ON # Sm RIGHTWARDS ARROW WITH TAIL +21A4..21A5 ; ON # So [2] LEFTWARDS ARROW FROM BAR..UPWARDS ARROW FROM BAR +21A6 ; ON # Sm RIGHTWARDS ARROW FROM BAR +21A7..21AD ; ON # So [7] DOWNWARDS ARROW FROM BAR..LEFT RIGHT WAVE ARROW +21AE ; ON # Sm LEFT RIGHT ARROW WITH STROKE +21AF..21CD ; ON # So [31] DOWNWARDS ZIGZAG ARROW..LEFTWARDS DOUBLE ARROW WITH STROKE +21CE..21CF ; ON # Sm [2] LEFT RIGHT DOUBLE ARROW WITH STROKE..RIGHTWARDS DOUBLE ARROW WITH STROKE +21D0..21D1 ; ON # So [2] LEFTWARDS DOUBLE ARROW..UPWARDS DOUBLE ARROW +21D2 ; ON # Sm RIGHTWARDS DOUBLE ARROW +21D3 ; ON # So DOWNWARDS DOUBLE ARROW +21D4 ; ON # Sm LEFT RIGHT DOUBLE ARROW +21D5..21F3 ; ON # So [31] UP DOWN DOUBLE ARROW..UP DOWN WHITE ARROW +21F4..2211 ; ON # Sm [30] RIGHT ARROW WITH SMALL CIRCLE..N-ARY SUMMATION +2214..22FF ; ON # Sm [236] DOT PLUS..Z NOTATION BAG MEMBERSHIP +2300..2307 ; ON # So [8] DIAMETER SIGN..WAVY LINE +2308..230B ; ON # Sm [4] LEFT CEILING..RIGHT FLOOR +230C..231F ; ON # So [20] BOTTOM RIGHT CROP..BOTTOM RIGHT CORNER +2320..2321 ; ON # Sm [2] TOP HALF INTEGRAL..BOTTOM HALF INTEGRAL +2322..2328 ; ON # So [7] FROWN..KEYBOARD +2329 ; ON # Ps LEFT-POINTING ANGLE BRACKET +232A ; ON # Pe RIGHT-POINTING ANGLE BRACKET +232B..2335 ; ON # So [11] ERASE TO THE LEFT..COUNTERSINK +237B ; ON # So NOT CHECK MARK +237C ; ON # Sm RIGHT ANGLE WITH DOWNWARDS ZIGZAG ARROW +237D..2394 ; ON # So [24] SHOULDERED OPEN BOX..SOFTWARE-FUNCTION SYMBOL +2396..239A ; ON # So [5] DECIMAL SEPARATOR KEY SYMBOL..CLEAR SCREEN SYMBOL +239B..23B3 ; ON # Sm [25] LEFT PARENTHESIS UPPER HOOK..SUMMATION BOTTOM +23B4 ; ON # Ps TOP SQUARE BRACKET +23B5 ; ON # Pe BOTTOM SQUARE BRACKET +23B6 ; ON # Po BOTTOM SQUARE BRACKET OVER TOP SQUARE BRACKET +23B7..23CE ; ON # So [24] RADICAL SYMBOL BOTTOM..RETURN SYMBOL +2400..2426 ; ON # So [39] SYMBOL FOR NULL..SYMBOL FOR SUBSTITUTE FORM TWO +2440..244A ; ON # So [11] OCR HOOK..OCR DOUBLE BACKSLASH +24EB..24FE ; ON # No [20] NEGATIVE CIRCLED NUMBER ELEVEN..DOUBLE CIRCLED NUMBER TEN +2500..25B6 ; ON # So [183] BOX DRAWINGS LIGHT HORIZONTAL..BLACK RIGHT-POINTING TRIANGLE +25B7 ; ON # Sm WHITE RIGHT-POINTING TRIANGLE +25B8..25C0 ; ON # So [9] BLACK RIGHT-POINTING SMALL TRIANGLE..BLACK LEFT-POINTING TRIANGLE +25C1 ; ON # Sm WHITE LEFT-POINTING TRIANGLE +25C2..25F7 ; ON # So [54] BLACK LEFT-POINTING SMALL TRIANGLE..WHITE CIRCLE WITH UPPER RIGHT QUADRANT +25F8..25FF ; ON # Sm [8] UPPER LEFT TRIANGLE..LOWER RIGHT TRIANGLE +2600..2613 ; ON # So [20] BLACK SUN WITH RAYS..SALTIRE +2616..2617 ; ON # So [2] WHITE SHOGI PIECE..BLACK SHOGI PIECE +2619..266E ; ON # So [86] REVERSED ROTATED FLORAL HEART BULLET..MUSIC NATURAL SIGN +266F ; ON # Sm MUSIC SHARP SIGN +2670..267D ; ON # So [14] WEST SYRIAC CROSS..PARTIALLY-RECYCLED PAPER SYMBOL +2680..2689 ; ON # So [10] DIE FACE-1..BLACK CIRCLE WITH TWO WHITE DOTS +2701..2704 ; ON # So [4] UPPER BLADE SCISSORS..WHITE SCISSORS +2706..2709 ; ON # So [4] TELEPHONE LOCATION SIGN..ENVELOPE +270C..2727 ; ON # So [28] VICTORY HAND..WHITE FOUR POINTED STAR +2729..274B ; ON # So [35] STRESS OUTLINED WHITE STAR..HEAVY EIGHT TEARDROP-SPOKED PROPELLER ASTERISK +274D ; ON # So SHADOWED WHITE CIRCLE +274F..2752 ; ON # So [4] LOWER RIGHT DROP-SHADOWED WHITE SQUARE..UPPER RIGHT SHADOWED WHITE SQUARE +2756 ; ON # So BLACK DIAMOND MINUS WHITE X +2758..275E ; ON # So [7] LIGHT VERTICAL BAR..HEAVY DOUBLE COMMA QUOTATION MARK ORNAMENT +2761..2767 ; ON # So [7] CURVED STEM PARAGRAPH SIGN ORNAMENT..ROTATED FLORAL HEART BULLET +2768 ; ON # Ps MEDIUM LEFT PARENTHESIS ORNAMENT +2769 ; ON # Pe MEDIUM RIGHT PARENTHESIS ORNAMENT +276A ; ON # Ps MEDIUM FLATTENED LEFT PARENTHESIS ORNAMENT +276B ; ON # Pe MEDIUM FLATTENED RIGHT PARENTHESIS ORNAMENT +276C ; ON # Ps MEDIUM LEFT-POINTING ANGLE BRACKET ORNAMENT +276D ; ON # Pe MEDIUM RIGHT-POINTING ANGLE BRACKET ORNAMENT +276E ; ON # Ps HEAVY LEFT-POINTING ANGLE QUOTATION MARK ORNAMENT +276F ; ON # Pe HEAVY RIGHT-POINTING ANGLE QUOTATION MARK ORNAMENT +2770 ; ON # Ps HEAVY LEFT-POINTING ANGLE BRACKET ORNAMENT +2771 ; ON # Pe HEAVY RIGHT-POINTING ANGLE BRACKET ORNAMENT +2772 ; ON # Ps LIGHT LEFT TORTOISE SHELL BRACKET ORNAMENT +2773 ; ON # Pe LIGHT RIGHT TORTOISE SHELL BRACKET ORNAMENT +2774 ; ON # Ps MEDIUM LEFT CURLY BRACKET ORNAMENT +2775 ; ON # Pe MEDIUM RIGHT CURLY BRACKET ORNAMENT +2776..2793 ; ON # No [30] DINGBAT NEGATIVE CIRCLED DIGIT ONE..DINGBAT NEGATIVE CIRCLED SANS-SERIF NUMBER TEN +2794 ; ON # So HEAVY WIDE-HEADED RIGHTWARDS ARROW +2798..27AF ; ON # So [24] HEAVY SOUTH EAST ARROW..NOTCHED LOWER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW +27B1..27BE ; ON # So [14] NOTCHED UPPER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW..OPEN-OUTLINED RIGHTWARDS ARROW +27D0..27E5 ; ON # Sm [22] WHITE DIAMOND WITH CENTRED DOT..WHITE SQUARE WITH RIGHTWARDS TICK +27E6 ; ON # Ps MATHEMATICAL LEFT WHITE SQUARE BRACKET +27E7 ; ON # Pe MATHEMATICAL RIGHT WHITE SQUARE BRACKET +27E8 ; ON # Ps MATHEMATICAL LEFT ANGLE BRACKET +27E9 ; ON # Pe MATHEMATICAL RIGHT ANGLE BRACKET +27EA ; ON # Ps MATHEMATICAL LEFT DOUBLE ANGLE BRACKET +27EB ; ON # Pe MATHEMATICAL RIGHT DOUBLE ANGLE BRACKET +27F0..27FF ; ON # Sm [16] UPWARDS QUADRUPLE ARROW..LONG RIGHTWARDS SQUIGGLE ARROW +2800..28FF ; ON # So [256] BRAILLE PATTERN BLANK..BRAILLE PATTERN DOTS-12345678 +2900..2982 ; ON # Sm [131] RIGHTWARDS TWO-HEADED ARROW WITH VERTICAL STROKE..Z NOTATION TYPE COLON +2983 ; ON # Ps LEFT WHITE CURLY BRACKET +2984 ; ON # Pe RIGHT WHITE CURLY BRACKET +2985 ; ON # Ps LEFT WHITE PARENTHESIS +2986 ; ON # Pe RIGHT WHITE PARENTHESIS +2987 ; ON # Ps Z NOTATION LEFT IMAGE BRACKET +2988 ; ON # Pe Z NOTATION RIGHT IMAGE BRACKET +2989 ; ON # Ps Z NOTATION LEFT BINDING BRACKET +298A ; ON # Pe Z NOTATION RIGHT BINDING BRACKET +298B ; ON # Ps LEFT SQUARE BRACKET WITH UNDERBAR +298C ; ON # Pe RIGHT SQUARE BRACKET WITH UNDERBAR +298D ; ON # Ps LEFT SQUARE BRACKET WITH TICK IN TOP CORNER +298E ; ON # Pe RIGHT SQUARE BRACKET WITH TICK IN BOTTOM CORNER +298F ; ON # Ps LEFT SQUARE BRACKET WITH TICK IN BOTTOM CORNER +2990 ; ON # Pe RIGHT SQUARE BRACKET WITH TICK IN TOP CORNER +2991 ; ON # Ps LEFT ANGLE BRACKET WITH DOT +2992 ; ON # Pe RIGHT ANGLE BRACKET WITH DOT +2993 ; ON # Ps LEFT ARC LESS-THAN BRACKET +2994 ; ON # Pe RIGHT ARC GREATER-THAN BRACKET +2995 ; ON # Ps DOUBLE LEFT ARC GREATER-THAN BRACKET +2996 ; ON # Pe DOUBLE RIGHT ARC LESS-THAN BRACKET +2997 ; ON # Ps LEFT BLACK TORTOISE SHELL BRACKET +2998 ; ON # Pe RIGHT BLACK TORTOISE SHELL BRACKET +2999..29D7 ; ON # Sm [63] DOTTED FENCE..BLACK HOURGLASS +29D8 ; ON # Ps LEFT WIGGLY FENCE +29D9 ; ON # Pe RIGHT WIGGLY FENCE +29DA ; ON # Ps LEFT DOUBLE WIGGLY FENCE +29DB ; ON # Pe RIGHT DOUBLE WIGGLY FENCE +29DC..29FB ; ON # Sm [32] INCOMPLETE INFINITY..TRIPLE PLUS +29FC ; ON # Ps LEFT-POINTING CURVED ANGLE BRACKET +29FD ; ON # Pe RIGHT-POINTING CURVED ANGLE BRACKET +29FE..2AFF ; ON # Sm [258] TINY..N-ARY WHITE VERTICAL BAR +2E80..2E99 ; ON # So [26] CJK RADICAL REPEAT..CJK RADICAL RAP +2E9B..2EF3 ; ON # So [89] CJK RADICAL CHOKE..CJK RADICAL C-SIMPLIFIED TURTLE +2F00..2FD5 ; ON # So [214] KANGXI RADICAL ONE..KANGXI RADICAL FLUTE +2FF0..2FFB ; ON # So [12] IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT..IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID +3001..3003 ; ON # Po [3] IDEOGRAPHIC COMMA..DITTO MARK +3004 ; ON # So JAPANESE INDUSTRIAL STANDARD SYMBOL +3008 ; ON # Ps LEFT ANGLE BRACKET +3009 ; ON # Pe RIGHT ANGLE BRACKET +300A ; ON # Ps LEFT DOUBLE ANGLE BRACKET +300B ; ON # Pe RIGHT DOUBLE ANGLE BRACKET +300C ; ON # Ps LEFT CORNER BRACKET +300D ; ON # Pe RIGHT CORNER BRACKET +300E ; ON # Ps LEFT WHITE CORNER BRACKET +300F ; ON # Pe RIGHT WHITE CORNER BRACKET +3010 ; ON # Ps LEFT BLACK LENTICULAR BRACKET +3011 ; ON # Pe RIGHT BLACK LENTICULAR BRACKET +3012..3013 ; ON # So [2] POSTAL MARK..GETA MARK +3014 ; ON # Ps LEFT TORTOISE SHELL BRACKET +3015 ; ON # Pe RIGHT TORTOISE SHELL BRACKET +3016 ; ON # Ps LEFT WHITE LENTICULAR BRACKET +3017 ; ON # Pe RIGHT WHITE LENTICULAR BRACKET +3018 ; ON # Ps LEFT WHITE TORTOISE SHELL BRACKET +3019 ; ON # Pe RIGHT WHITE TORTOISE SHELL BRACKET +301A ; ON # Ps LEFT WHITE SQUARE BRACKET +301B ; ON # Pe RIGHT WHITE SQUARE BRACKET +301C ; ON # Pd WAVE DASH +301D ; ON # Ps REVERSED DOUBLE PRIME QUOTATION MARK +301E..301F ; ON # Pe [2] DOUBLE PRIME QUOTATION MARK..LOW DOUBLE PRIME QUOTATION MARK +3020 ; ON # So POSTAL MARK FACE +3030 ; ON # Pd WAVY DASH +3036..3037 ; ON # So [2] CIRCLED POSTAL MARK..IDEOGRAPHIC TELEGRAPH LINE FEED SEPARATOR SYMBOL +303D ; ON # Po PART ALTERNATION MARK +303E..303F ; ON # So [2] IDEOGRAPHIC VARIATION INDICATOR..IDEOGRAPHIC HALF FILL SPACE +309B..309C ; ON # Sk [2] KATAKANA-HIRAGANA VOICED SOUND MARK..KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK +30A0 ; ON # Pd KATAKANA-HIRAGANA DOUBLE HYPHEN +30FB ; ON # Pc KATAKANA MIDDLE DOT +3251..325F ; ON # No [15] CIRCLED NUMBER TWENTY ONE..CIRCLED NUMBER THIRTY FIVE +32B1..32BF ; ON # No [15] CIRCLED NUMBER THIRTY SIX..CIRCLED NUMBER FIFTY +A490..A4C6 ; ON # So [55] YI RADICAL QOT..YI RADICAL KE +FD3E ; ON # Ps ORNATE LEFT PARENTHESIS +FD3F ; ON # Pe ORNATE RIGHT PARENTHESIS +FE30 ; ON # Po PRESENTATION FORM FOR VERTICAL TWO DOT LEADER +FE31..FE32 ; ON # Pd [2] PRESENTATION FORM FOR VERTICAL EM DASH..PRESENTATION FORM FOR VERTICAL EN DASH +FE33..FE34 ; ON # Pc [2] PRESENTATION FORM FOR VERTICAL LOW LINE..PRESENTATION FORM FOR VERTICAL WAVY LOW LINE +FE35 ; ON # Ps PRESENTATION FORM FOR VERTICAL LEFT PARENTHESIS +FE36 ; ON # Pe PRESENTATION FORM FOR VERTICAL RIGHT PARENTHESIS +FE37 ; ON # Ps PRESENTATION FORM FOR VERTICAL LEFT CURLY BRACKET +FE38 ; ON # Pe PRESENTATION FORM FOR VERTICAL RIGHT CURLY BRACKET +FE39 ; ON # Ps PRESENTATION FORM FOR VERTICAL LEFT TORTOISE SHELL BRACKET +FE3A ; ON # Pe PRESENTATION FORM FOR VERTICAL RIGHT TORTOISE SHELL BRACKET +FE3B ; ON # Ps PRESENTATION FORM FOR VERTICAL LEFT BLACK LENTICULAR BRACKET +FE3C ; ON # Pe PRESENTATION FORM FOR VERTICAL RIGHT BLACK LENTICULAR BRACKET +FE3D ; ON # Ps PRESENTATION FORM FOR VERTICAL LEFT DOUBLE ANGLE BRACKET +FE3E ; ON # Pe PRESENTATION FORM FOR VERTICAL RIGHT DOUBLE ANGLE BRACKET +FE3F ; ON # Ps PRESENTATION FORM FOR VERTICAL LEFT ANGLE BRACKET +FE40 ; ON # Pe PRESENTATION FORM FOR VERTICAL RIGHT ANGLE BRACKET +FE41 ; ON # Ps PRESENTATION FORM FOR VERTICAL LEFT CORNER BRACKET +FE42 ; ON # Pe PRESENTATION FORM FOR VERTICAL RIGHT CORNER BRACKET +FE43 ; ON # Ps PRESENTATION FORM FOR VERTICAL LEFT WHITE CORNER BRACKET +FE44 ; ON # Pe PRESENTATION FORM FOR VERTICAL RIGHT WHITE CORNER BRACKET +FE45..FE46 ; ON # Po [2] SESAME DOT..WHITE SESAME DOT +FE49..FE4C ; ON # Po [4] DASHED OVERLINE..DOUBLE WAVY OVERLINE +FE4D..FE4F ; ON # Pc [3] DASHED LOW LINE..WAVY LOW LINE +FE51 ; ON # Po SMALL IDEOGRAPHIC COMMA +FE54 ; ON # Po SMALL SEMICOLON +FE56..FE57 ; ON # Po [2] SMALL QUESTION MARK..SMALL EXCLAMATION MARK +FE58 ; ON # Pd SMALL EM DASH +FE59 ; ON # Ps SMALL LEFT PARENTHESIS +FE5A ; ON # Pe SMALL RIGHT PARENTHESIS +FE5B ; ON # Ps SMALL LEFT CURLY BRACKET +FE5C ; ON # Pe SMALL RIGHT CURLY BRACKET +FE5D ; ON # Ps SMALL LEFT TORTOISE SHELL BRACKET +FE5E ; ON # Pe SMALL RIGHT TORTOISE SHELL BRACKET +FE60..FE61 ; ON # Po [2] SMALL AMPERSAND..SMALL ASTERISK +FE64..FE66 ; ON # Sm [3] SMALL LESS-THAN SIGN..SMALL EQUALS SIGN +FE68 ; ON # Po SMALL REVERSE SOLIDUS +FE6B ; ON # Po SMALL COMMERCIAL AT +FF01..FF02 ; ON # Po [2] FULLWIDTH EXCLAMATION MARK..FULLWIDTH QUOTATION MARK +FF06..FF07 ; ON # Po [2] FULLWIDTH AMPERSAND..FULLWIDTH APOSTROPHE +FF08 ; ON # Ps FULLWIDTH LEFT PARENTHESIS +FF09 ; ON # Pe FULLWIDTH RIGHT PARENTHESIS +FF0A ; ON # Po FULLWIDTH ASTERISK +FF1B ; ON # Po FULLWIDTH SEMICOLON +FF1C..FF1E ; ON # Sm [3] FULLWIDTH LESS-THAN SIGN..FULLWIDTH GREATER-THAN SIGN +FF1F..FF20 ; ON # Po [2] FULLWIDTH QUESTION MARK..FULLWIDTH COMMERCIAL AT +FF3B ; ON # Ps FULLWIDTH LEFT SQUARE BRACKET +FF3C ; ON # Po FULLWIDTH REVERSE SOLIDUS +FF3D ; ON # Pe FULLWIDTH RIGHT SQUARE BRACKET +FF3E ; ON # Sk FULLWIDTH CIRCUMFLEX ACCENT +FF3F ; ON # Pc FULLWIDTH LOW LINE +FF40 ; ON # Sk FULLWIDTH GRAVE ACCENT +FF5B ; ON # Ps FULLWIDTH LEFT CURLY BRACKET +FF5C ; ON # Sm FULLWIDTH VERTICAL LINE +FF5D ; ON # Pe FULLWIDTH RIGHT CURLY BRACKET +FF5E ; ON # Sm FULLWIDTH TILDE +FF5F ; ON # Ps FULLWIDTH LEFT WHITE PARENTHESIS +FF60 ; ON # Pe FULLWIDTH RIGHT WHITE PARENTHESIS +FF61 ; ON # Po HALFWIDTH IDEOGRAPHIC FULL STOP +FF62 ; ON # Ps HALFWIDTH LEFT CORNER BRACKET +FF63 ; ON # Pe HALFWIDTH RIGHT CORNER BRACKET +FF64 ; ON # Po HALFWIDTH IDEOGRAPHIC COMMA +FF65 ; ON # Pc HALFWIDTH KATAKANA MIDDLE DOT +FFE2 ; ON # Sm FULLWIDTH NOT SIGN +FFE3 ; ON # Sk FULLWIDTH MACRON +FFE4 ; ON # So FULLWIDTH BROKEN BAR +FFE8 ; ON # So HALFWIDTH FORMS LIGHT VERTICAL +FFE9..FFEC ; ON # Sm [4] HALFWIDTH LEFTWARDS ARROW..HALFWIDTH DOWNWARDS ARROW +FFED..FFEE ; ON # So [2] HALFWIDTH BLACK SQUARE..HALFWIDTH WHITE CIRCLE +FFFC..FFFD ; ON # So [2] OBJECT REPLACEMENT CHARACTER..REPLACEMENT CHARACTER + +# Total code points: 2733 + +# ================================================ + +0000..0008 ; BN # Cc [9] .. +000E..001B ; BN # Cc [14] .. +007F..0084 ; BN # Cc [6] .. +0086..009F ; BN # Cc [26] .. +070F ; BN # Cf SYRIAC ABBREVIATION MARK +180E ; BN # Cf MONGOLIAN VOWEL SEPARATOR +200B ; BN # Zs ZERO WIDTH SPACE +200C..200D ; BN # Cf [2] ZERO WIDTH NON-JOINER..ZERO WIDTH JOINER +2060..2063 ; BN # Cf [4] WORD JOINER..INVISIBLE SEPARATOR +206A..206F ; BN # Cf [6] INHIBIT SYMMETRIC SWAPPING..NOMINAL DIGIT SHAPES +FEFF ; BN # Cf ZERO WIDTH NO-BREAK SPACE +FFF9..FFFB ; BN # Cf [3] INTERLINEAR ANNOTATION ANCHOR..INTERLINEAR ANNOTATION TERMINATOR +1D173..1D17A ; BN # Cf [8] MUSICAL SYMBOL BEGIN BEAM..MUSICAL SYMBOL END PHRASE +E0001 ; BN # Cf LANGUAGE TAG +E0020..E007F ; BN # Cf [96] TAG SPACE..CANCEL TAG + +# Total code points: 179 + +# ================================================ + +0300..034F ; NSM # Mn [80] COMBINING GRAVE ACCENT..COMBINING GRAPHEME JOINER +0360..036F ; NSM # Mn [16] COMBINING DOUBLE TILDE..COMBINING LATIN SMALL LETTER X +0483..0486 ; NSM # Mn [4] COMBINING CYRILLIC TITLO..COMBINING CYRILLIC PSILI PNEUMATA +0488..0489 ; NSM # Me [2] COMBINING CYRILLIC HUNDRED THOUSANDS SIGN..COMBINING CYRILLIC MILLIONS SIGN +0591..05A1 ; NSM # Mn [17] HEBREW ACCENT ETNAHTA..HEBREW ACCENT PAZER +05A3..05B9 ; NSM # Mn [23] HEBREW ACCENT MUNAH..HEBREW POINT HOLAM +05BB..05BD ; NSM # Mn [3] HEBREW POINT QUBUTS..HEBREW POINT METEG +05BF ; NSM # Mn HEBREW POINT RAFE +05C1..05C2 ; NSM # Mn [2] HEBREW POINT SHIN DOT..HEBREW POINT SIN DOT +05C4 ; NSM # Mn HEBREW MARK UPPER DOT +064B..0655 ; NSM # Mn [11] ARABIC FATHATAN..ARABIC HAMZA BELOW +0670 ; NSM # Mn ARABIC LETTER SUPERSCRIPT ALEF +06D6..06DC ; NSM # Mn [7] ARABIC SMALL HIGH LIGATURE SAD WITH LAM WITH ALEF MAKSURA..ARABIC SMALL HIGH SEEN +06DE ; NSM # Me ARABIC START OF RUB EL HIZB +06DF..06E4 ; NSM # Mn [6] ARABIC SMALL HIGH ROUNDED ZERO..ARABIC SMALL HIGH MADDA +06E7..06E8 ; NSM # Mn [2] ARABIC SMALL HIGH YEH..ARABIC SMALL HIGH NOON +06EA..06ED ; NSM # Mn [4] ARABIC EMPTY CENTRE LOW STOP..ARABIC SMALL LOW MEEM +0711 ; NSM # Mn SYRIAC LETTER SUPERSCRIPT ALAPH +0730..074A ; NSM # Mn [27] SYRIAC PTHAHA ABOVE..SYRIAC BARREKH +07A6..07B0 ; NSM # Mn [11] THAANA ABAFILI..THAANA SUKUN +0901..0902 ; NSM # Mn [2] DEVANAGARI SIGN CANDRABINDU..DEVANAGARI SIGN ANUSVARA +093C ; NSM # Mn DEVANAGARI SIGN NUKTA +0941..0948 ; NSM # Mn [8] DEVANAGARI VOWEL SIGN U..DEVANAGARI VOWEL SIGN AI +094D ; NSM # Mn DEVANAGARI SIGN VIRAMA +0951..0954 ; NSM # Mn [4] DEVANAGARI STRESS SIGN UDATTA..DEVANAGARI ACUTE ACCENT +0962..0963 ; NSM # Mn [2] DEVANAGARI VOWEL SIGN VOCALIC L..DEVANAGARI VOWEL SIGN VOCALIC LL +0981 ; NSM # Mn BENGALI SIGN CANDRABINDU +09BC ; NSM # Mn BENGALI SIGN NUKTA +09C1..09C4 ; NSM # Mn [4] BENGALI VOWEL SIGN U..BENGALI VOWEL SIGN VOCALIC RR +09CD ; NSM # Mn BENGALI SIGN VIRAMA +09E2..09E3 ; NSM # Mn [2] BENGALI VOWEL SIGN VOCALIC L..BENGALI VOWEL SIGN VOCALIC LL +0A02 ; NSM # Mn GURMUKHI SIGN BINDI +0A3C ; NSM # Mn GURMUKHI SIGN NUKTA +0A41..0A42 ; NSM # Mn [2] GURMUKHI VOWEL SIGN U..GURMUKHI VOWEL SIGN UU +0A47..0A48 ; NSM # Mn [2] GURMUKHI VOWEL SIGN EE..GURMUKHI VOWEL SIGN AI +0A4B..0A4D ; NSM # Mn [3] GURMUKHI VOWEL SIGN OO..GURMUKHI SIGN VIRAMA +0A70..0A71 ; NSM # Mn [2] GURMUKHI TIPPI..GURMUKHI ADDAK +0A81..0A82 ; NSM # Mn [2] GUJARATI SIGN CANDRABINDU..GUJARATI SIGN ANUSVARA +0ABC ; NSM # Mn GUJARATI SIGN NUKTA +0AC1..0AC5 ; NSM # Mn [5] GUJARATI VOWEL SIGN U..GUJARATI VOWEL SIGN CANDRA E +0AC7..0AC8 ; NSM # Mn [2] GUJARATI VOWEL SIGN E..GUJARATI VOWEL SIGN AI +0ACD ; NSM # Mn GUJARATI SIGN VIRAMA +0B01 ; NSM # Mn ORIYA SIGN CANDRABINDU +0B3C ; NSM # Mn ORIYA SIGN NUKTA +0B3F ; NSM # Mn ORIYA VOWEL SIGN I +0B41..0B43 ; NSM # Mn [3] ORIYA VOWEL SIGN U..ORIYA VOWEL SIGN VOCALIC R +0B4D ; NSM # Mn ORIYA SIGN VIRAMA +0B56 ; NSM # Mn ORIYA AI LENGTH MARK +0B82 ; NSM # Mn TAMIL SIGN ANUSVARA +0BC0 ; NSM # Mn TAMIL VOWEL SIGN II +0BCD ; NSM # Mn TAMIL SIGN VIRAMA +0C3E..0C40 ; NSM # Mn [3] TELUGU VOWEL SIGN AA..TELUGU VOWEL SIGN II +0C46..0C48 ; NSM # Mn [3] TELUGU VOWEL SIGN E..TELUGU VOWEL SIGN AI +0C4A..0C4D ; NSM # Mn [4] TELUGU VOWEL SIGN O..TELUGU SIGN VIRAMA +0C55..0C56 ; NSM # Mn [2] TELUGU LENGTH MARK..TELUGU AI LENGTH MARK +0CBF ; NSM # Mn KANNADA VOWEL SIGN I +0CC6 ; NSM # Mn KANNADA VOWEL SIGN E +0CCC..0CCD ; NSM # Mn [2] KANNADA VOWEL SIGN AU..KANNADA SIGN VIRAMA +0D41..0D43 ; NSM # Mn [3] MALAYALAM VOWEL SIGN U..MALAYALAM VOWEL SIGN VOCALIC R +0D4D ; NSM # Mn MALAYALAM SIGN VIRAMA +0DCA ; NSM # Mn SINHALA SIGN AL-LAKUNA +0DD2..0DD4 ; NSM # Mn [3] SINHALA VOWEL SIGN KETTI IS-PILLA..SINHALA VOWEL SIGN KETTI PAA-PILLA +0DD6 ; NSM # Mn SINHALA VOWEL SIGN DIGA PAA-PILLA +0E31 ; NSM # Mn THAI CHARACTER MAI HAN-AKAT +0E34..0E3A ; NSM # Mn [7] THAI CHARACTER SARA I..THAI CHARACTER PHINTHU +0E47..0E4E ; NSM # Mn [8] THAI CHARACTER MAITAIKHU..THAI CHARACTER YAMAKKAN +0EB1 ; NSM # Mn LAO VOWEL SIGN MAI KAN +0EB4..0EB9 ; NSM # Mn [6] LAO VOWEL SIGN I..LAO VOWEL SIGN UU +0EBB..0EBC ; NSM # Mn [2] LAO VOWEL SIGN MAI KON..LAO SEMIVOWEL SIGN LO +0EC8..0ECD ; NSM # Mn [6] LAO TONE MAI EK..LAO NIGGAHITA +0F18..0F19 ; NSM # Mn [2] TIBETAN ASTROLOGICAL SIGN -KHYUD PA..TIBETAN ASTROLOGICAL SIGN SDONG TSHUGS +0F35 ; NSM # Mn TIBETAN MARK NGAS BZUNG NYI ZLA +0F37 ; NSM # Mn TIBETAN MARK NGAS BZUNG SGOR RTAGS +0F39 ; NSM # Mn TIBETAN MARK TSA -PHRU +0F71..0F7E ; NSM # Mn [14] TIBETAN VOWEL SIGN AA..TIBETAN SIGN RJES SU NGA RO +0F80..0F84 ; NSM # Mn [5] TIBETAN VOWEL SIGN REVERSED I..TIBETAN MARK HALANTA +0F86..0F87 ; NSM # Mn [2] TIBETAN SIGN LCI RTAGS..TIBETAN SIGN YANG RTAGS +0F90..0F97 ; NSM # Mn [8] TIBETAN SUBJOINED LETTER KA..TIBETAN SUBJOINED LETTER JA +0F99..0FBC ; NSM # Mn [36] TIBETAN SUBJOINED LETTER NYA..TIBETAN SUBJOINED LETTER FIXED-FORM RA +0FC6 ; NSM # Mn TIBETAN SYMBOL PADMA GDAN +102D..1030 ; NSM # Mn [4] MYANMAR VOWEL SIGN I..MYANMAR VOWEL SIGN UU +1032 ; NSM # Mn MYANMAR VOWEL SIGN AI +1036..1037 ; NSM # Mn [2] MYANMAR SIGN ANUSVARA..MYANMAR SIGN DOT BELOW +1039 ; NSM # Mn MYANMAR SIGN VIRAMA +1058..1059 ; NSM # Mn [2] MYANMAR VOWEL SIGN VOCALIC L..MYANMAR VOWEL SIGN VOCALIC LL +1712..1714 ; NSM # Mn [3] TAGALOG VOWEL SIGN I..TAGALOG SIGN VIRAMA +1732..1734 ; NSM # Mn [3] HANUNOO VOWEL SIGN I..HANUNOO SIGN PAMUDPOD +1752..1753 ; NSM # Mn [2] BUHID VOWEL SIGN I..BUHID VOWEL SIGN U +1772..1773 ; NSM # Mn [2] TAGBANWA VOWEL SIGN I..TAGBANWA VOWEL SIGN U +17B7..17BD ; NSM # Mn [7] KHMER VOWEL SIGN I..KHMER VOWEL SIGN UA +17C6 ; NSM # Mn KHMER SIGN NIKAHIT +17C9..17D3 ; NSM # Mn [11] KHMER SIGN MUUSIKATOAN..KHMER SIGN BATHAMASAT +180B..180D ; NSM # Mn [3] MONGOLIAN FREE VARIATION SELECTOR ONE..MONGOLIAN FREE VARIATION SELECTOR THREE +18A9 ; NSM # Mn MONGOLIAN LETTER ALI GALI DAGALGA +20D0..20DC ; NSM # Mn [13] COMBINING LEFT HARPOON ABOVE..COMBINING FOUR DOTS ABOVE +20DD..20E0 ; NSM # Me [4] COMBINING ENCLOSING CIRCLE..COMBINING ENCLOSING CIRCLE BACKSLASH +20E1 ; NSM # Mn COMBINING LEFT RIGHT ARROW ABOVE +20E2..20E4 ; NSM # Me [3] COMBINING ENCLOSING SCREEN..COMBINING ENCLOSING UPWARD POINTING TRIANGLE +20E5..20EA ; NSM # Mn [6] COMBINING REVERSE SOLIDUS OVERLAY..COMBINING LEFTWARDS ARROW OVERLAY +302A..302F ; NSM # Mn [6] IDEOGRAPHIC LEVEL TONE MARK..HANGUL DOUBLE DOT TONE MARK +3099..309A ; NSM # Mn [2] COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK..COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK +FB1E ; NSM # Mn HEBREW POINT JUDEO-SPANISH VARIKA +FE00..FE0F ; NSM # Mn [16] VARIATION SELECTOR-1..VARIATION SELECTOR-16 +FE20..FE23 ; NSM # Mn [4] COMBINING LIGATURE LEFT HALF..COMBINING DOUBLE TILDE RIGHT HALF +1D167..1D169 ; NSM # Mn [3] MUSICAL SYMBOL COMBINING TREMOLO-1..MUSICAL SYMBOL COMBINING TREMOLO-3 +1D17B..1D182 ; NSM # Mn [8] MUSICAL SYMBOL COMBINING ACCENT..MUSICAL SYMBOL COMBINING LOURE +1D185..1D18B ; NSM # Mn [7] MUSICAL SYMBOL COMBINING DOIT..MUSICAL SYMBOL COMBINING TRIPLE TONGUE +1D1AA..1D1AD ; NSM # Mn [4] MUSICAL SYMBOL COMBINING DOWN BOW..MUSICAL SYMBOL COMBINING SNAP PIZZICATO + +# Total code points: 528 + +# ================================================ + +061B ; AL # Po ARABIC SEMICOLON +061F ; AL # Po ARABIC QUESTION MARK +0621..063A ; AL # Lo [26] ARABIC LETTER HAMZA..ARABIC LETTER GHAIN +0640 ; AL # Lm ARABIC TATWEEL +0641..064A ; AL # Lo [10] ARABIC LETTER FEH..ARABIC LETTER YEH +066D ; AL # Po ARABIC FIVE POINTED STAR +066E..066F ; AL # Lo [2] ARABIC LETTER DOTLESS BEH..ARABIC LETTER DOTLESS QAF +0671..06D3 ; AL # Lo [99] ARABIC LETTER ALEF WASLA..ARABIC LETTER YEH BARREE WITH HAMZA ABOVE +06D4 ; AL # Po ARABIC FULL STOP +06D5 ; AL # Lo ARABIC LETTER AE +06DD ; AL # Cf ARABIC END OF AYAH +06E5..06E6 ; AL # Lm [2] ARABIC SMALL WAW..ARABIC SMALL YEH +06FA..06FC ; AL # Lo [3] ARABIC LETTER SHEEN WITH DOT BELOW..ARABIC LETTER GHAIN WITH DOT BELOW +06FD..06FE ; AL # So [2] ARABIC SIGN SINDHI AMPERSAND..ARABIC SIGN SINDHI POSTPOSITION MEN +0700..070D ; AL # Po [14] SYRIAC END OF PARAGRAPH..SYRIAC HARKLEAN ASTERISCUS +0710 ; AL # Lo SYRIAC LETTER ALAPH +0712..072C ; AL # Lo [27] SYRIAC LETTER BETH..SYRIAC LETTER TAW +0780..07A5 ; AL # Lo [38] THAANA LETTER HAA..THAANA LETTER WAAVU +07B1 ; AL # Lo THAANA LETTER NAA +FB50..FBB1 ; AL # Lo [98] ARABIC LETTER ALEF WASLA ISOLATED FORM..ARABIC LETTER YEH BARREE WITH HAMZA ABOVE FINAL FORM +FBD3..FD3D ; AL # Lo [363] ARABIC LETTER NG ISOLATED FORM..ARABIC LIGATURE ALEF WITH FATHATAN ISOLATED FORM +FD50..FD8F ; AL # Lo [64] ARABIC LIGATURE TEH WITH JEEM WITH MEEM INITIAL FORM..ARABIC LIGATURE MEEM WITH KHAH WITH MEEM INITIAL FORM +FD92..FDC7 ; AL # Lo [54] ARABIC LIGATURE MEEM WITH JEEM WITH KHAH INITIAL FORM..ARABIC LIGATURE NOON WITH JEEM WITH YEH FINAL FORM +FDF0..FDFB ; AL # Lo [12] ARABIC LIGATURE SALLA USED AS KORANIC STOP SIGN ISOLATED FORM..ARABIC LIGATURE JALLAJALALOUHOU +FDFC ; AL # Sc RIAL SIGN +FE70..FE74 ; AL # Lo [5] ARABIC FATHATAN ISOLATED FORM..ARABIC KASRATAN ISOLATED FORM +FE76..FEFC ; AL # Lo [135] ARABIC FATHA ISOLATED FORM..ARABIC LIGATURE LAM WITH ALEF FINAL FORM + +# Total code points: 964 + +# ================================================ + +202D ; LRO # Cf LEFT-TO-RIGHT OVERRIDE + +# Total code points: 1 + +# ================================================ + +202E ; RLO # Cf RIGHT-TO-LEFT OVERRIDE + +# Total code points: 1 + +# ================================================ + +202A ; LRE # Cf LEFT-TO-RIGHT EMBEDDING + +# Total code points: 1 + +# ================================================ + +202B ; RLE # Cf RIGHT-TO-LEFT EMBEDDING + +# Total code points: 1 + +# ================================================ + +202C ; PDF # Cf POP DIRECTIONAL FORMATTING + +# Total code points: 1 + diff --git a/crates/stdlib/unicode/ucd32/DerivedBinaryProperties-3.2.0.txt b/crates/stdlib/unicode/ucd32/DerivedBinaryProperties-3.2.0.txt new file mode 100644 index 000000000..7647b3a23 --- /dev/null +++ b/crates/stdlib/unicode/ucd32/DerivedBinaryProperties-3.2.0.txt @@ -0,0 +1,181 @@ +# DerivedBinaryProperties-3.2.0.txt +# Date: 2002-03-19,23:30:33 GMT [MD] +# +# Unicode Character Database: Derived Property Data +# Generated algorithmically from the Unicode Character Database +# For documentation, see DerivedProperties.html +# Note: Unassigned and Noncharacter codepoints are omitted, +# except when listing Noncharacter or Cn. +# ================================================ + + +# ================================================ +# BidiMirrored (listing UnicodeData.txt, field 9: see UnicodeData.html) +# ================================================ + +0028 ; Bidi_Mirrored # Ps LEFT PARENTHESIS +0029 ; Bidi_Mirrored # Pe RIGHT PARENTHESIS +003C ; Bidi_Mirrored # Sm LESS-THAN SIGN +003E ; Bidi_Mirrored # Sm GREATER-THAN SIGN +005B ; Bidi_Mirrored # Ps LEFT SQUARE BRACKET +005D ; Bidi_Mirrored # Pe RIGHT SQUARE BRACKET +007B ; Bidi_Mirrored # Ps LEFT CURLY BRACKET +007D ; Bidi_Mirrored # Pe RIGHT CURLY BRACKET +00AB ; Bidi_Mirrored # Pi LEFT-POINTING DOUBLE ANGLE QUOTATION MARK +00BB ; Bidi_Mirrored # Pf RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK +2039 ; Bidi_Mirrored # Pi SINGLE LEFT-POINTING ANGLE QUOTATION MARK +203A ; Bidi_Mirrored # Pf SINGLE RIGHT-POINTING ANGLE QUOTATION MARK +2045 ; Bidi_Mirrored # Ps LEFT SQUARE BRACKET WITH QUILL +2046 ; Bidi_Mirrored # Pe RIGHT SQUARE BRACKET WITH QUILL +207D ; Bidi_Mirrored # Ps SUPERSCRIPT LEFT PARENTHESIS +207E ; Bidi_Mirrored # Pe SUPERSCRIPT RIGHT PARENTHESIS +208D ; Bidi_Mirrored # Ps SUBSCRIPT LEFT PARENTHESIS +208E ; Bidi_Mirrored # Pe SUBSCRIPT RIGHT PARENTHESIS +2140 ; Bidi_Mirrored # Sm DOUBLE-STRUCK N-ARY SUMMATION +2201..2204 ; Bidi_Mirrored # Sm [4] COMPLEMENT..THERE DOES NOT EXIST +2208..220D ; Bidi_Mirrored # Sm [6] ELEMENT OF..SMALL CONTAINS AS MEMBER +2211 ; Bidi_Mirrored # Sm N-ARY SUMMATION +2215..2216 ; Bidi_Mirrored # Sm [2] DIVISION SLASH..SET MINUS +221A..221D ; Bidi_Mirrored # Sm [4] SQUARE ROOT..PROPORTIONAL TO +221F..2222 ; Bidi_Mirrored # Sm [4] RIGHT ANGLE..SPHERICAL ANGLE +2224 ; Bidi_Mirrored # Sm DOES NOT DIVIDE +2226 ; Bidi_Mirrored # Sm NOT PARALLEL TO +222B..2233 ; Bidi_Mirrored # Sm [9] INTEGRAL..ANTICLOCKWISE CONTOUR INTEGRAL +2239 ; Bidi_Mirrored # Sm EXCESS +223B..224C ; Bidi_Mirrored # Sm [18] HOMOTHETIC..ALL EQUAL TO +2252..2255 ; Bidi_Mirrored # Sm [4] APPROXIMATELY EQUAL TO OR THE IMAGE OF..EQUALS COLON +225F..2260 ; Bidi_Mirrored # Sm [2] QUESTIONED EQUAL TO..NOT EQUAL TO +2262 ; Bidi_Mirrored # Sm NOT IDENTICAL TO +2264..226B ; Bidi_Mirrored # Sm [8] LESS-THAN OR EQUAL TO..MUCH GREATER-THAN +226E..228C ; Bidi_Mirrored # Sm [31] NOT LESS-THAN..MULTISET +228F..2292 ; Bidi_Mirrored # Sm [4] SQUARE IMAGE OF..SQUARE ORIGINAL OF OR EQUAL TO +2298 ; Bidi_Mirrored # Sm CIRCLED DIVISION SLASH +22A2..22A3 ; Bidi_Mirrored # Sm [2] RIGHT TACK..LEFT TACK +22A6..22B8 ; Bidi_Mirrored # Sm [19] ASSERTION..MULTIMAP +22BE..22BF ; Bidi_Mirrored # Sm [2] RIGHT ANGLE WITH ARC..RIGHT TRIANGLE +22C9..22CD ; Bidi_Mirrored # Sm [5] LEFT NORMAL FACTOR SEMIDIRECT PRODUCT..REVERSED TILDE EQUALS +22D0..22D1 ; Bidi_Mirrored # Sm [2] DOUBLE SUBSET..DOUBLE SUPERSET +22D6..22ED ; Bidi_Mirrored # Sm [24] LESS-THAN WITH DOT..DOES NOT CONTAIN AS NORMAL SUBGROUP OR EQUAL +22F0..22FF ; Bidi_Mirrored # Sm [16] UP RIGHT DIAGONAL ELLIPSIS..Z NOTATION BAG MEMBERSHIP +2308..230B ; Bidi_Mirrored # Sm [4] LEFT CEILING..RIGHT FLOOR +2320..2321 ; Bidi_Mirrored # Sm [2] TOP HALF INTEGRAL..BOTTOM HALF INTEGRAL +2329 ; Bidi_Mirrored # Ps LEFT-POINTING ANGLE BRACKET +232A ; Bidi_Mirrored # Pe RIGHT-POINTING ANGLE BRACKET +2768 ; Bidi_Mirrored # Ps MEDIUM LEFT PARENTHESIS ORNAMENT +2769 ; Bidi_Mirrored # Pe MEDIUM RIGHT PARENTHESIS ORNAMENT +276A ; Bidi_Mirrored # Ps MEDIUM FLATTENED LEFT PARENTHESIS ORNAMENT +276B ; Bidi_Mirrored # Pe MEDIUM FLATTENED RIGHT PARENTHESIS ORNAMENT +276C ; Bidi_Mirrored # Ps MEDIUM LEFT-POINTING ANGLE BRACKET ORNAMENT +276D ; Bidi_Mirrored # Pe MEDIUM RIGHT-POINTING ANGLE BRACKET ORNAMENT +276E ; Bidi_Mirrored # Ps HEAVY LEFT-POINTING ANGLE QUOTATION MARK ORNAMENT +276F ; Bidi_Mirrored # Pe HEAVY RIGHT-POINTING ANGLE QUOTATION MARK ORNAMENT +2770 ; Bidi_Mirrored # Ps HEAVY LEFT-POINTING ANGLE BRACKET ORNAMENT +2771 ; Bidi_Mirrored # Pe HEAVY RIGHT-POINTING ANGLE BRACKET ORNAMENT +2772 ; Bidi_Mirrored # Ps LIGHT LEFT TORTOISE SHELL BRACKET ORNAMENT +2773 ; Bidi_Mirrored # Pe LIGHT RIGHT TORTOISE SHELL BRACKET ORNAMENT +2774 ; Bidi_Mirrored # Ps MEDIUM LEFT CURLY BRACKET ORNAMENT +2775 ; Bidi_Mirrored # Pe MEDIUM RIGHT CURLY BRACKET ORNAMENT +27D3..27D6 ; Bidi_Mirrored # Sm [4] LOWER RIGHT CORNER WITH DOT..RIGHT OUTER JOIN +27DC..27DE ; Bidi_Mirrored # Sm [3] LEFT MULTIMAP..LONG LEFT TACK +27E2..27E5 ; Bidi_Mirrored # Sm [4] WHITE CONCAVE-SIDED DIAMOND WITH LEFTWARDS TICK..WHITE SQUARE WITH RIGHTWARDS TICK +27E6 ; Bidi_Mirrored # Ps MATHEMATICAL LEFT WHITE SQUARE BRACKET +27E7 ; Bidi_Mirrored # Pe MATHEMATICAL RIGHT WHITE SQUARE BRACKET +27E8 ; Bidi_Mirrored # Ps MATHEMATICAL LEFT ANGLE BRACKET +27E9 ; Bidi_Mirrored # Pe MATHEMATICAL RIGHT ANGLE BRACKET +27EA ; Bidi_Mirrored # Ps MATHEMATICAL LEFT DOUBLE ANGLE BRACKET +27EB ; Bidi_Mirrored # Pe MATHEMATICAL RIGHT DOUBLE ANGLE BRACKET +2983 ; Bidi_Mirrored # Ps LEFT WHITE CURLY BRACKET +2984 ; Bidi_Mirrored # Pe RIGHT WHITE CURLY BRACKET +2985 ; Bidi_Mirrored # Ps LEFT WHITE PARENTHESIS +2986 ; Bidi_Mirrored # Pe RIGHT WHITE PARENTHESIS +2987 ; Bidi_Mirrored # Ps Z NOTATION LEFT IMAGE BRACKET +2988 ; Bidi_Mirrored # Pe Z NOTATION RIGHT IMAGE BRACKET +2989 ; Bidi_Mirrored # Ps Z NOTATION LEFT BINDING BRACKET +298A ; Bidi_Mirrored # Pe Z NOTATION RIGHT BINDING BRACKET +298B ; Bidi_Mirrored # Ps LEFT SQUARE BRACKET WITH UNDERBAR +298C ; Bidi_Mirrored # Pe RIGHT SQUARE BRACKET WITH UNDERBAR +298D ; Bidi_Mirrored # Ps LEFT SQUARE BRACKET WITH TICK IN TOP CORNER +298E ; Bidi_Mirrored # Pe RIGHT SQUARE BRACKET WITH TICK IN BOTTOM CORNER +298F ; Bidi_Mirrored # Ps LEFT SQUARE BRACKET WITH TICK IN BOTTOM CORNER +2990 ; Bidi_Mirrored # Pe RIGHT SQUARE BRACKET WITH TICK IN TOP CORNER +2991 ; Bidi_Mirrored # Ps LEFT ANGLE BRACKET WITH DOT +2992 ; Bidi_Mirrored # Pe RIGHT ANGLE BRACKET WITH DOT +2993 ; Bidi_Mirrored # Ps LEFT ARC LESS-THAN BRACKET +2994 ; Bidi_Mirrored # Pe RIGHT ARC GREATER-THAN BRACKET +2995 ; Bidi_Mirrored # Ps DOUBLE LEFT ARC GREATER-THAN BRACKET +2996 ; Bidi_Mirrored # Pe DOUBLE RIGHT ARC LESS-THAN BRACKET +2997 ; Bidi_Mirrored # Ps LEFT BLACK TORTOISE SHELL BRACKET +2998 ; Bidi_Mirrored # Pe RIGHT BLACK TORTOISE SHELL BRACKET +299B..29AF ; Bidi_Mirrored # Sm [21] MEASURED ANGLE OPENING LEFT..MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING LEFT AND DOWN +29B8 ; Bidi_Mirrored # Sm CIRCLED REVERSE SOLIDUS +29C0..29C5 ; Bidi_Mirrored # Sm [6] CIRCLED LESS-THAN..SQUARED FALLING DIAGONAL SLASH +29C9 ; Bidi_Mirrored # Sm TWO JOINED SQUARES +29CE..29D2 ; Bidi_Mirrored # Sm [5] RIGHT TRIANGLE ABOVE LEFT TRIANGLE..BOWTIE WITH RIGHT HALF BLACK +29D4..29D5 ; Bidi_Mirrored # Sm [2] TIMES WITH LEFT HALF BLACK..TIMES WITH RIGHT HALF BLACK +29D8 ; Bidi_Mirrored # Ps LEFT WIGGLY FENCE +29D9 ; Bidi_Mirrored # Pe RIGHT WIGGLY FENCE +29DA ; Bidi_Mirrored # Ps LEFT DOUBLE WIGGLY FENCE +29DB ; Bidi_Mirrored # Pe RIGHT DOUBLE WIGGLY FENCE +29DC ; Bidi_Mirrored # Sm INCOMPLETE INFINITY +29E1 ; Bidi_Mirrored # Sm INCREASES AS +29E3..29E5 ; Bidi_Mirrored # Sm [3] EQUALS SIGN AND SLANTED PARALLEL..IDENTICAL TO AND SLANTED PARALLEL +29E8..29E9 ; Bidi_Mirrored # Sm [2] DOWN-POINTING TRIANGLE WITH LEFT HALF BLACK..DOWN-POINTING TRIANGLE WITH RIGHT HALF BLACK +29F4..29F9 ; Bidi_Mirrored # Sm [6] RULE-DELAYED..BIG REVERSE SOLIDUS +29FC ; Bidi_Mirrored # Ps LEFT-POINTING CURVED ANGLE BRACKET +29FD ; Bidi_Mirrored # Pe RIGHT-POINTING CURVED ANGLE BRACKET +2A0A..2A1C ; Bidi_Mirrored # Sm [19] MODULO TWO SUM..INTEGRAL WITH UNDERBAR +2A1E..2A21 ; Bidi_Mirrored # Sm [4] LARGE LEFT TRIANGLE OPERATOR..Z NOTATION SCHEMA PROJECTION +2A24 ; Bidi_Mirrored # Sm PLUS SIGN WITH TILDE ABOVE +2A26 ; Bidi_Mirrored # Sm PLUS SIGN WITH TILDE BELOW +2A29 ; Bidi_Mirrored # Sm MINUS SIGN WITH COMMA ABOVE +2A2B..2A2E ; Bidi_Mirrored # Sm [4] MINUS SIGN WITH FALLING DOTS..PLUS SIGN IN RIGHT HALF CIRCLE +2A34..2A35 ; Bidi_Mirrored # Sm [2] MULTIPLICATION SIGN IN LEFT HALF CIRCLE..MULTIPLICATION SIGN IN RIGHT HALF CIRCLE +2A3C..2A3E ; Bidi_Mirrored # Sm [3] INTERIOR PRODUCT..Z NOTATION RELATIONAL COMPOSITION +2A57..2A58 ; Bidi_Mirrored # Sm [2] SLOPING LARGE OR..SLOPING LARGE AND +2A64..2A65 ; Bidi_Mirrored # Sm [2] Z NOTATION DOMAIN ANTIRESTRICTION..Z NOTATION RANGE ANTIRESTRICTION +2A6A..2A6D ; Bidi_Mirrored # Sm [4] TILDE OPERATOR WITH DOT ABOVE..CONGRUENT WITH DOT ABOVE +2A6F..2A70 ; Bidi_Mirrored # Sm [2] ALMOST EQUAL TO WITH CIRCUMFLEX ACCENT..APPROXIMATELY EQUAL OR EQUAL TO +2A73..2A74 ; Bidi_Mirrored # Sm [2] EQUALS SIGN ABOVE TILDE OPERATOR..DOUBLE COLON EQUAL +2A79..2AA3 ; Bidi_Mirrored # Sm [43] LESS-THAN WITH CIRCLE INSIDE..DOUBLE NESTED LESS-THAN WITH UNDERBAR +2AA6..2AAD ; Bidi_Mirrored # Sm [8] LESS-THAN CLOSED BY CURVE..LARGER THAN OR EQUAL TO +2AAF..2AD6 ; Bidi_Mirrored # Sm [40] PRECEDES ABOVE SINGLE-LINE EQUALS SIGN..SUPERSET ABOVE SUPERSET +2ADC ; Bidi_Mirrored # Sm FORKING +2ADE ; Bidi_Mirrored # Sm SHORT LEFT TACK +2AE2..2AE6 ; Bidi_Mirrored # Sm [5] VERTICAL BAR TRIPLE RIGHT TURNSTILE..LONG DASH FROM LEFT MEMBER OF DOUBLE VERTICAL +2AEC..2AEE ; Bidi_Mirrored # Sm [3] DOUBLE STROKE NOT SIGN..DOES NOT DIVIDE WITH REVERSED NEGATION SLASH +2AF3 ; Bidi_Mirrored # Sm PARALLEL WITH TILDE OPERATOR +2AF7..2AFB ; Bidi_Mirrored # Sm [5] TRIPLE NESTED LESS-THAN..TRIPLE SOLIDUS BINARY RELATION +2AFD ; Bidi_Mirrored # Sm DOUBLE SOLIDUS OPERATOR +3008 ; Bidi_Mirrored # Ps LEFT ANGLE BRACKET +3009 ; Bidi_Mirrored # Pe RIGHT ANGLE BRACKET +300A ; Bidi_Mirrored # Ps LEFT DOUBLE ANGLE BRACKET +300B ; Bidi_Mirrored # Pe RIGHT DOUBLE ANGLE BRACKET +300C ; Bidi_Mirrored # Ps LEFT CORNER BRACKET +300D ; Bidi_Mirrored # Pe RIGHT CORNER BRACKET +300E ; Bidi_Mirrored # Ps LEFT WHITE CORNER BRACKET +300F ; Bidi_Mirrored # Pe RIGHT WHITE CORNER BRACKET +3010 ; Bidi_Mirrored # Ps LEFT BLACK LENTICULAR BRACKET +3011 ; Bidi_Mirrored # Pe RIGHT BLACK LENTICULAR BRACKET +3014 ; Bidi_Mirrored # Ps LEFT TORTOISE SHELL BRACKET +3015 ; Bidi_Mirrored # Pe RIGHT TORTOISE SHELL BRACKET +3016 ; Bidi_Mirrored # Ps LEFT WHITE LENTICULAR BRACKET +3017 ; Bidi_Mirrored # Pe RIGHT WHITE LENTICULAR BRACKET +3018 ; Bidi_Mirrored # Ps LEFT WHITE TORTOISE SHELL BRACKET +3019 ; Bidi_Mirrored # Pe RIGHT WHITE TORTOISE SHELL BRACKET +301A ; Bidi_Mirrored # Ps LEFT WHITE SQUARE BRACKET +301B ; Bidi_Mirrored # Pe RIGHT WHITE SQUARE BRACKET +FF08 ; Bidi_Mirrored # Ps FULLWIDTH LEFT PARENTHESIS +FF09 ; Bidi_Mirrored # Pe FULLWIDTH RIGHT PARENTHESIS +FF1C ; Bidi_Mirrored # Sm FULLWIDTH LESS-THAN SIGN +FF1E ; Bidi_Mirrored # Sm FULLWIDTH GREATER-THAN SIGN +FF3B ; Bidi_Mirrored # Ps FULLWIDTH LEFT SQUARE BRACKET +FF3D ; Bidi_Mirrored # Pe FULLWIDTH RIGHT SQUARE BRACKET +FF5B ; Bidi_Mirrored # Ps FULLWIDTH LEFT CURLY BRACKET +FF5D ; Bidi_Mirrored # Pe FULLWIDTH RIGHT CURLY BRACKET +FF5F ; Bidi_Mirrored # Ps FULLWIDTH LEFT WHITE PARENTHESIS +FF60 ; Bidi_Mirrored # Pe FULLWIDTH RIGHT WHITE PARENTHESIS +FF62 ; Bidi_Mirrored # Ps HALFWIDTH LEFT CORNER BRACKET +FF63 ; Bidi_Mirrored # Pe HALFWIDTH RIGHT CORNER BRACKET + +# Total code points: 492 + diff --git a/crates/stdlib/unicode/ucd32/DerivedCombiningClass-3.2.0.txt b/crates/stdlib/unicode/ucd32/DerivedCombiningClass-3.2.0.txt new file mode 100644 index 000000000..c851bffa1 --- /dev/null +++ b/crates/stdlib/unicode/ucd32/DerivedCombiningClass-3.2.0.txt @@ -0,0 +1,1484 @@ +# DerivedCombiningClass-3.2.0.txt +# Date: 2002-03-19,23:30:33 GMT [MD] +# +# Unicode Character Database: Derived Property Data +# Generated algorithmically from the Unicode Character Database +# For documentation, see DerivedProperties.html +# Note: Unassigned and Noncharacter codepoints are omitted, +# except when listing Noncharacter or Cn. +# ================================================ + + +# ================================================ +# Combining Class (listing UnicodeData.txt, field 3: see UnicodeData.html) +# ================================================ + +# NotReordered + +0000..001F ; 0 # Cc [32] .. +0020 ; 0 # Zs SPACE +0021..0023 ; 0 # Po [3] EXCLAMATION MARK..NUMBER SIGN +0024 ; 0 # Sc DOLLAR SIGN +0025..0027 ; 0 # Po [3] PERCENT SIGN..APOSTROPHE +0028 ; 0 # Ps LEFT PARENTHESIS +0029 ; 0 # Pe RIGHT PARENTHESIS +002A ; 0 # Po ASTERISK +002B ; 0 # Sm PLUS SIGN +002C ; 0 # Po COMMA +002D ; 0 # Pd HYPHEN-MINUS +002E..002F ; 0 # Po [2] FULL STOP..SOLIDUS +0030..0039 ; 0 # Nd [10] DIGIT ZERO..DIGIT NINE +003A..003B ; 0 # Po [2] COLON..SEMICOLON +003C..003E ; 0 # Sm [3] LESS-THAN SIGN..GREATER-THAN SIGN +003F..0040 ; 0 # Po [2] QUESTION MARK..COMMERCIAL AT +0041..005A ; 0 # L& [26] LATIN CAPITAL LETTER A..LATIN CAPITAL LETTER Z +005B ; 0 # Ps LEFT SQUARE BRACKET +005C ; 0 # Po REVERSE SOLIDUS +005D ; 0 # Pe RIGHT SQUARE BRACKET +005E ; 0 # Sk CIRCUMFLEX ACCENT +005F ; 0 # Pc LOW LINE +0060 ; 0 # Sk GRAVE ACCENT +0061..007A ; 0 # L& [26] LATIN SMALL LETTER A..LATIN SMALL LETTER Z +007B ; 0 # Ps LEFT CURLY BRACKET +007C ; 0 # Sm VERTICAL LINE +007D ; 0 # Pe RIGHT CURLY BRACKET +007E ; 0 # Sm TILDE +007F..009F ; 0 # Cc [33] .. +00A0 ; 0 # Zs NO-BREAK SPACE +00A1 ; 0 # Po INVERTED EXCLAMATION MARK +00A2..00A5 ; 0 # Sc [4] CENT SIGN..YEN SIGN +00A6..00A7 ; 0 # So [2] BROKEN BAR..SECTION SIGN +00A8 ; 0 # Sk DIAERESIS +00A9 ; 0 # So COPYRIGHT SIGN +00AA ; 0 # L& FEMININE ORDINAL INDICATOR +00AB ; 0 # Pi LEFT-POINTING DOUBLE ANGLE QUOTATION MARK +00AC ; 0 # Sm NOT SIGN +00AD ; 0 # Pd SOFT HYPHEN +00AE ; 0 # So REGISTERED SIGN +00AF ; 0 # Sk MACRON +00B0 ; 0 # So DEGREE SIGN +00B1 ; 0 # Sm PLUS-MINUS SIGN +00B2..00B3 ; 0 # No [2] SUPERSCRIPT TWO..SUPERSCRIPT THREE +00B4 ; 0 # Sk ACUTE ACCENT +00B5 ; 0 # L& MICRO SIGN +00B6 ; 0 # So PILCROW SIGN +00B7 ; 0 # Po MIDDLE DOT +00B8 ; 0 # Sk CEDILLA +00B9 ; 0 # No SUPERSCRIPT ONE +00BA ; 0 # L& MASCULINE ORDINAL INDICATOR +00BB ; 0 # Pf RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK +00BC..00BE ; 0 # No [3] VULGAR FRACTION ONE QUARTER..VULGAR FRACTION THREE QUARTERS +00BF ; 0 # Po INVERTED QUESTION MARK +00C0..00D6 ; 0 # L& [23] LATIN CAPITAL LETTER A WITH GRAVE..LATIN CAPITAL LETTER O WITH DIAERESIS +00D7 ; 0 # Sm MULTIPLICATION SIGN +00D8..00F6 ; 0 # L& [31] LATIN CAPITAL LETTER O WITH STROKE..LATIN SMALL LETTER O WITH DIAERESIS +00F7 ; 0 # Sm DIVISION SIGN +00F8..01BA ; 0 # L& [195] LATIN SMALL LETTER O WITH STROKE..LATIN SMALL LETTER EZH WITH TAIL +01BB ; 0 # Lo LATIN LETTER TWO WITH STROKE +01BC..01BF ; 0 # L& [4] LATIN CAPITAL LETTER TONE FIVE..LATIN LETTER WYNN +01C0..01C3 ; 0 # Lo [4] LATIN LETTER DENTAL CLICK..LATIN LETTER RETROFLEX CLICK +01C4..0220 ; 0 # L& [93] LATIN CAPITAL LETTER DZ WITH CARON..LATIN CAPITAL LETTER N WITH LONG RIGHT LEG +0222..0233 ; 0 # L& [18] LATIN CAPITAL LETTER OU..LATIN SMALL LETTER Y WITH MACRON +0250..02AD ; 0 # L& [94] LATIN SMALL LETTER TURNED A..LATIN LETTER BIDENTAL PERCUSSIVE +02B0..02B8 ; 0 # Lm [9] MODIFIER LETTER SMALL H..MODIFIER LETTER SMALL Y +02B9..02BA ; 0 # Sk [2] MODIFIER LETTER PRIME..MODIFIER LETTER DOUBLE PRIME +02BB..02C1 ; 0 # Lm [7] MODIFIER LETTER TURNED COMMA..MODIFIER LETTER REVERSED GLOTTAL STOP +02C2..02CF ; 0 # Sk [14] MODIFIER LETTER LEFT ARROWHEAD..MODIFIER LETTER LOW ACUTE ACCENT +02D0..02D1 ; 0 # Lm [2] MODIFIER LETTER TRIANGULAR COLON..MODIFIER LETTER HALF TRIANGULAR COLON +02D2..02DF ; 0 # Sk [14] MODIFIER LETTER CENTRED RIGHT HALF RING..MODIFIER LETTER CROSS ACCENT +02E0..02E4 ; 0 # Lm [5] MODIFIER LETTER SMALL GAMMA..MODIFIER LETTER SMALL REVERSED GLOTTAL STOP +02E5..02ED ; 0 # Sk [9] MODIFIER LETTER EXTRA-HIGH TONE BAR..MODIFIER LETTER UNASPIRATED +02EE ; 0 # Lm MODIFIER LETTER DOUBLE APOSTROPHE +034F ; 0 # Mn COMBINING GRAPHEME JOINER +0374..0375 ; 0 # Sk [2] GREEK NUMERAL SIGN..GREEK LOWER NUMERAL SIGN +037A ; 0 # Lm GREEK YPOGEGRAMMENI +037E ; 0 # Po GREEK QUESTION MARK +0384..0385 ; 0 # Sk [2] GREEK TONOS..GREEK DIALYTIKA TONOS +0386 ; 0 # L& GREEK CAPITAL LETTER ALPHA WITH TONOS +0387 ; 0 # Po GREEK ANO TELEIA +0388..038A ; 0 # L& [3] GREEK CAPITAL LETTER EPSILON WITH TONOS..GREEK CAPITAL LETTER IOTA WITH TONOS +038C ; 0 # L& GREEK CAPITAL LETTER OMICRON WITH TONOS +038E..03A1 ; 0 # L& [20] GREEK CAPITAL LETTER UPSILON WITH TONOS..GREEK CAPITAL LETTER RHO +03A3..03CE ; 0 # L& [44] GREEK CAPITAL LETTER SIGMA..GREEK SMALL LETTER OMEGA WITH TONOS +03D0..03F5 ; 0 # L& [38] GREEK BETA SYMBOL..GREEK LUNATE EPSILON SYMBOL +03F6 ; 0 # Sm GREEK REVERSED LUNATE EPSILON SYMBOL +0400..0481 ; 0 # L& [130] CYRILLIC CAPITAL LETTER IE WITH GRAVE..CYRILLIC SMALL LETTER KOPPA +0482 ; 0 # So CYRILLIC THOUSANDS SIGN +0488..0489 ; 0 # Me [2] COMBINING CYRILLIC HUNDRED THOUSANDS SIGN..COMBINING CYRILLIC MILLIONS SIGN +048A..04CE ; 0 # L& [69] CYRILLIC CAPITAL LETTER SHORT I WITH TAIL..CYRILLIC SMALL LETTER EM WITH TAIL +04D0..04F5 ; 0 # L& [38] CYRILLIC CAPITAL LETTER A WITH BREVE..CYRILLIC SMALL LETTER CHE WITH DIAERESIS +04F8..04F9 ; 0 # L& [2] CYRILLIC CAPITAL LETTER YERU WITH DIAERESIS..CYRILLIC SMALL LETTER YERU WITH DIAERESIS +0500..050F ; 0 # L& [16] CYRILLIC CAPITAL LETTER KOMI DE..CYRILLIC SMALL LETTER KOMI TJE +0531..0556 ; 0 # L& [38] ARMENIAN CAPITAL LETTER AYB..ARMENIAN CAPITAL LETTER FEH +0559 ; 0 # Lm ARMENIAN MODIFIER LETTER LEFT HALF RING +055A..055F ; 0 # Po [6] ARMENIAN APOSTROPHE..ARMENIAN ABBREVIATION MARK +0561..0587 ; 0 # L& [39] ARMENIAN SMALL LETTER AYB..ARMENIAN SMALL LIGATURE ECH YIWN +0589 ; 0 # Po ARMENIAN FULL STOP +058A ; 0 # Pd ARMENIAN HYPHEN +05BE ; 0 # Po HEBREW PUNCTUATION MAQAF +05C0 ; 0 # Po HEBREW PUNCTUATION PASEQ +05C3 ; 0 # Po HEBREW PUNCTUATION SOF PASUQ +05D0..05EA ; 0 # Lo [27] HEBREW LETTER ALEF..HEBREW LETTER TAV +05F0..05F2 ; 0 # Lo [3] HEBREW LIGATURE YIDDISH DOUBLE VAV..HEBREW LIGATURE YIDDISH DOUBLE YOD +05F3..05F4 ; 0 # Po [2] HEBREW PUNCTUATION GERESH..HEBREW PUNCTUATION GERSHAYIM +060C ; 0 # Po ARABIC COMMA +061B ; 0 # Po ARABIC SEMICOLON +061F ; 0 # Po ARABIC QUESTION MARK +0621..063A ; 0 # Lo [26] ARABIC LETTER HAMZA..ARABIC LETTER GHAIN +0640 ; 0 # Lm ARABIC TATWEEL +0641..064A ; 0 # Lo [10] ARABIC LETTER FEH..ARABIC LETTER YEH +0660..0669 ; 0 # Nd [10] ARABIC-INDIC DIGIT ZERO..ARABIC-INDIC DIGIT NINE +066A..066D ; 0 # Po [4] ARABIC PERCENT SIGN..ARABIC FIVE POINTED STAR +066E..066F ; 0 # Lo [2] ARABIC LETTER DOTLESS BEH..ARABIC LETTER DOTLESS QAF +0671..06D3 ; 0 # Lo [99] ARABIC LETTER ALEF WASLA..ARABIC LETTER YEH BARREE WITH HAMZA ABOVE +06D4 ; 0 # Po ARABIC FULL STOP +06D5 ; 0 # Lo ARABIC LETTER AE +06DD ; 0 # Cf ARABIC END OF AYAH +06DE ; 0 # Me ARABIC START OF RUB EL HIZB +06E5..06E6 ; 0 # Lm [2] ARABIC SMALL WAW..ARABIC SMALL YEH +06E9 ; 0 # So ARABIC PLACE OF SAJDAH +06F0..06F9 ; 0 # Nd [10] EXTENDED ARABIC-INDIC DIGIT ZERO..EXTENDED ARABIC-INDIC DIGIT NINE +06FA..06FC ; 0 # Lo [3] ARABIC LETTER SHEEN WITH DOT BELOW..ARABIC LETTER GHAIN WITH DOT BELOW +06FD..06FE ; 0 # So [2] ARABIC SIGN SINDHI AMPERSAND..ARABIC SIGN SINDHI POSTPOSITION MEN +0700..070D ; 0 # Po [14] SYRIAC END OF PARAGRAPH..SYRIAC HARKLEAN ASTERISCUS +070F ; 0 # Cf SYRIAC ABBREVIATION MARK +0710 ; 0 # Lo SYRIAC LETTER ALAPH +0712..072C ; 0 # Lo [27] SYRIAC LETTER BETH..SYRIAC LETTER TAW +0780..07A5 ; 0 # Lo [38] THAANA LETTER HAA..THAANA LETTER WAAVU +07A6..07B0 ; 0 # Mn [11] THAANA ABAFILI..THAANA SUKUN +07B1 ; 0 # Lo THAANA LETTER NAA +0901..0902 ; 0 # Mn [2] DEVANAGARI SIGN CANDRABINDU..DEVANAGARI SIGN ANUSVARA +0903 ; 0 # Mc DEVANAGARI SIGN VISARGA +0905..0939 ; 0 # Lo [53] DEVANAGARI LETTER A..DEVANAGARI LETTER HA +093D ; 0 # Lo DEVANAGARI SIGN AVAGRAHA +093E..0940 ; 0 # Mc [3] DEVANAGARI VOWEL SIGN AA..DEVANAGARI VOWEL SIGN II +0941..0948 ; 0 # Mn [8] DEVANAGARI VOWEL SIGN U..DEVANAGARI VOWEL SIGN AI +0949..094C ; 0 # Mc [4] DEVANAGARI VOWEL SIGN CANDRA O..DEVANAGARI VOWEL SIGN AU +0950 ; 0 # Lo DEVANAGARI OM +0958..0961 ; 0 # Lo [10] DEVANAGARI LETTER QA..DEVANAGARI LETTER VOCALIC LL +0962..0963 ; 0 # Mn [2] DEVANAGARI VOWEL SIGN VOCALIC L..DEVANAGARI VOWEL SIGN VOCALIC LL +0964..0965 ; 0 # Po [2] DEVANAGARI DANDA..DEVANAGARI DOUBLE DANDA +0966..096F ; 0 # Nd [10] DEVANAGARI DIGIT ZERO..DEVANAGARI DIGIT NINE +0970 ; 0 # Po DEVANAGARI ABBREVIATION SIGN +0981 ; 0 # Mn BENGALI SIGN CANDRABINDU +0982..0983 ; 0 # Mc [2] BENGALI SIGN ANUSVARA..BENGALI SIGN VISARGA +0985..098C ; 0 # Lo [8] BENGALI LETTER A..BENGALI LETTER VOCALIC L +098F..0990 ; 0 # Lo [2] BENGALI LETTER E..BENGALI LETTER AI +0993..09A8 ; 0 # Lo [22] BENGALI LETTER O..BENGALI LETTER NA +09AA..09B0 ; 0 # Lo [7] BENGALI LETTER PA..BENGALI LETTER RA +09B2 ; 0 # Lo BENGALI LETTER LA +09B6..09B9 ; 0 # Lo [4] BENGALI LETTER SHA..BENGALI LETTER HA +09BE..09C0 ; 0 # Mc [3] BENGALI VOWEL SIGN AA..BENGALI VOWEL SIGN II +09C1..09C4 ; 0 # Mn [4] BENGALI VOWEL SIGN U..BENGALI VOWEL SIGN VOCALIC RR +09C7..09C8 ; 0 # Mc [2] BENGALI VOWEL SIGN E..BENGALI VOWEL SIGN AI +09CB..09CC ; 0 # Mc [2] BENGALI VOWEL SIGN O..BENGALI VOWEL SIGN AU +09D7 ; 0 # Mc BENGALI AU LENGTH MARK +09DC..09DD ; 0 # Lo [2] BENGALI LETTER RRA..BENGALI LETTER RHA +09DF..09E1 ; 0 # Lo [3] BENGALI LETTER YYA..BENGALI LETTER VOCALIC LL +09E2..09E3 ; 0 # Mn [2] BENGALI VOWEL SIGN VOCALIC L..BENGALI VOWEL SIGN VOCALIC LL +09E6..09EF ; 0 # Nd [10] BENGALI DIGIT ZERO..BENGALI DIGIT NINE +09F0..09F1 ; 0 # Lo [2] BENGALI LETTER RA WITH MIDDLE DIAGONAL..BENGALI LETTER RA WITH LOWER DIAGONAL +09F2..09F3 ; 0 # Sc [2] BENGALI RUPEE MARK..BENGALI RUPEE SIGN +09F4..09F9 ; 0 # No [6] BENGALI CURRENCY NUMERATOR ONE..BENGALI CURRENCY DENOMINATOR SIXTEEN +09FA ; 0 # So BENGALI ISSHAR +0A02 ; 0 # Mn GURMUKHI SIGN BINDI +0A05..0A0A ; 0 # Lo [6] GURMUKHI LETTER A..GURMUKHI LETTER UU +0A0F..0A10 ; 0 # Lo [2] GURMUKHI LETTER EE..GURMUKHI LETTER AI +0A13..0A28 ; 0 # Lo [22] GURMUKHI LETTER OO..GURMUKHI LETTER NA +0A2A..0A30 ; 0 # Lo [7] GURMUKHI LETTER PA..GURMUKHI LETTER RA +0A32..0A33 ; 0 # Lo [2] GURMUKHI LETTER LA..GURMUKHI LETTER LLA +0A35..0A36 ; 0 # Lo [2] GURMUKHI LETTER VA..GURMUKHI LETTER SHA +0A38..0A39 ; 0 # Lo [2] GURMUKHI LETTER SA..GURMUKHI LETTER HA +0A3E..0A40 ; 0 # Mc [3] GURMUKHI VOWEL SIGN AA..GURMUKHI VOWEL SIGN II +0A41..0A42 ; 0 # Mn [2] GURMUKHI VOWEL SIGN U..GURMUKHI VOWEL SIGN UU +0A47..0A48 ; 0 # Mn [2] GURMUKHI VOWEL SIGN EE..GURMUKHI VOWEL SIGN AI +0A4B..0A4C ; 0 # Mn [2] GURMUKHI VOWEL SIGN OO..GURMUKHI VOWEL SIGN AU +0A59..0A5C ; 0 # Lo [4] GURMUKHI LETTER KHHA..GURMUKHI LETTER RRA +0A5E ; 0 # Lo GURMUKHI LETTER FA +0A66..0A6F ; 0 # Nd [10] GURMUKHI DIGIT ZERO..GURMUKHI DIGIT NINE +0A70..0A71 ; 0 # Mn [2] GURMUKHI TIPPI..GURMUKHI ADDAK +0A72..0A74 ; 0 # Lo [3] GURMUKHI IRI..GURMUKHI EK ONKAR +0A81..0A82 ; 0 # Mn [2] GUJARATI SIGN CANDRABINDU..GUJARATI SIGN ANUSVARA +0A83 ; 0 # Mc GUJARATI SIGN VISARGA +0A85..0A8B ; 0 # Lo [7] GUJARATI LETTER A..GUJARATI LETTER VOCALIC R +0A8D ; 0 # Lo GUJARATI VOWEL CANDRA E +0A8F..0A91 ; 0 # Lo [3] GUJARATI LETTER E..GUJARATI VOWEL CANDRA O +0A93..0AA8 ; 0 # Lo [22] GUJARATI LETTER O..GUJARATI LETTER NA +0AAA..0AB0 ; 0 # Lo [7] GUJARATI LETTER PA..GUJARATI LETTER RA +0AB2..0AB3 ; 0 # Lo [2] GUJARATI LETTER LA..GUJARATI LETTER LLA +0AB5..0AB9 ; 0 # Lo [5] GUJARATI LETTER VA..GUJARATI LETTER HA +0ABD ; 0 # Lo GUJARATI SIGN AVAGRAHA +0ABE..0AC0 ; 0 # Mc [3] GUJARATI VOWEL SIGN AA..GUJARATI VOWEL SIGN II +0AC1..0AC5 ; 0 # Mn [5] GUJARATI VOWEL SIGN U..GUJARATI VOWEL SIGN CANDRA E +0AC7..0AC8 ; 0 # Mn [2] GUJARATI VOWEL SIGN E..GUJARATI VOWEL SIGN AI +0AC9 ; 0 # Mc GUJARATI VOWEL SIGN CANDRA O +0ACB..0ACC ; 0 # Mc [2] GUJARATI VOWEL SIGN O..GUJARATI VOWEL SIGN AU +0AD0 ; 0 # Lo GUJARATI OM +0AE0 ; 0 # Lo GUJARATI LETTER VOCALIC RR +0AE6..0AEF ; 0 # Nd [10] GUJARATI DIGIT ZERO..GUJARATI DIGIT NINE +0B01 ; 0 # Mn ORIYA SIGN CANDRABINDU +0B02..0B03 ; 0 # Mc [2] ORIYA SIGN ANUSVARA..ORIYA SIGN VISARGA +0B05..0B0C ; 0 # Lo [8] ORIYA LETTER A..ORIYA LETTER VOCALIC L +0B0F..0B10 ; 0 # Lo [2] ORIYA LETTER E..ORIYA LETTER AI +0B13..0B28 ; 0 # Lo [22] ORIYA LETTER O..ORIYA LETTER NA +0B2A..0B30 ; 0 # Lo [7] ORIYA LETTER PA..ORIYA LETTER RA +0B32..0B33 ; 0 # Lo [2] ORIYA LETTER LA..ORIYA LETTER LLA +0B36..0B39 ; 0 # Lo [4] ORIYA LETTER SHA..ORIYA LETTER HA +0B3D ; 0 # Lo ORIYA SIGN AVAGRAHA +0B3E ; 0 # Mc ORIYA VOWEL SIGN AA +0B3F ; 0 # Mn ORIYA VOWEL SIGN I +0B40 ; 0 # Mc ORIYA VOWEL SIGN II +0B41..0B43 ; 0 # Mn [3] ORIYA VOWEL SIGN U..ORIYA VOWEL SIGN VOCALIC R +0B47..0B48 ; 0 # Mc [2] ORIYA VOWEL SIGN E..ORIYA VOWEL SIGN AI +0B4B..0B4C ; 0 # Mc [2] ORIYA VOWEL SIGN O..ORIYA VOWEL SIGN AU +0B56 ; 0 # Mn ORIYA AI LENGTH MARK +0B57 ; 0 # Mc ORIYA AU LENGTH MARK +0B5C..0B5D ; 0 # Lo [2] ORIYA LETTER RRA..ORIYA LETTER RHA +0B5F..0B61 ; 0 # Lo [3] ORIYA LETTER YYA..ORIYA LETTER VOCALIC LL +0B66..0B6F ; 0 # Nd [10] ORIYA DIGIT ZERO..ORIYA DIGIT NINE +0B70 ; 0 # So ORIYA ISSHAR +0B82 ; 0 # Mn TAMIL SIGN ANUSVARA +0B83 ; 0 # Lo TAMIL SIGN VISARGA +0B85..0B8A ; 0 # Lo [6] TAMIL LETTER A..TAMIL LETTER UU +0B8E..0B90 ; 0 # Lo [3] TAMIL LETTER E..TAMIL LETTER AI +0B92..0B95 ; 0 # Lo [4] TAMIL LETTER O..TAMIL LETTER KA +0B99..0B9A ; 0 # Lo [2] TAMIL LETTER NGA..TAMIL LETTER CA +0B9C ; 0 # Lo TAMIL LETTER JA +0B9E..0B9F ; 0 # Lo [2] TAMIL LETTER NYA..TAMIL LETTER TTA +0BA3..0BA4 ; 0 # Lo [2] TAMIL LETTER NNA..TAMIL LETTER TA +0BA8..0BAA ; 0 # Lo [3] TAMIL LETTER NA..TAMIL LETTER PA +0BAE..0BB5 ; 0 # Lo [8] TAMIL LETTER MA..TAMIL LETTER VA +0BB7..0BB9 ; 0 # Lo [3] TAMIL LETTER SSA..TAMIL LETTER HA +0BBE..0BBF ; 0 # Mc [2] TAMIL VOWEL SIGN AA..TAMIL VOWEL SIGN I +0BC0 ; 0 # Mn TAMIL VOWEL SIGN II +0BC1..0BC2 ; 0 # Mc [2] TAMIL VOWEL SIGN U..TAMIL VOWEL SIGN UU +0BC6..0BC8 ; 0 # Mc [3] TAMIL VOWEL SIGN E..TAMIL VOWEL SIGN AI +0BCA..0BCC ; 0 # Mc [3] TAMIL VOWEL SIGN O..TAMIL VOWEL SIGN AU +0BD7 ; 0 # Mc TAMIL AU LENGTH MARK +0BE7..0BEF ; 0 # Nd [9] TAMIL DIGIT ONE..TAMIL DIGIT NINE +0BF0..0BF2 ; 0 # No [3] TAMIL NUMBER TEN..TAMIL NUMBER ONE THOUSAND +0C01..0C03 ; 0 # Mc [3] TELUGU SIGN CANDRABINDU..TELUGU SIGN VISARGA +0C05..0C0C ; 0 # Lo [8] TELUGU LETTER A..TELUGU LETTER VOCALIC L +0C0E..0C10 ; 0 # Lo [3] TELUGU LETTER E..TELUGU LETTER AI +0C12..0C28 ; 0 # Lo [23] TELUGU LETTER O..TELUGU LETTER NA +0C2A..0C33 ; 0 # Lo [10] TELUGU LETTER PA..TELUGU LETTER LLA +0C35..0C39 ; 0 # Lo [5] TELUGU LETTER VA..TELUGU LETTER HA +0C3E..0C40 ; 0 # Mn [3] TELUGU VOWEL SIGN AA..TELUGU VOWEL SIGN II +0C41..0C44 ; 0 # Mc [4] TELUGU VOWEL SIGN U..TELUGU VOWEL SIGN VOCALIC RR +0C46..0C48 ; 0 # Mn [3] TELUGU VOWEL SIGN E..TELUGU VOWEL SIGN AI +0C4A..0C4C ; 0 # Mn [3] TELUGU VOWEL SIGN O..TELUGU VOWEL SIGN AU +0C60..0C61 ; 0 # Lo [2] TELUGU LETTER VOCALIC RR..TELUGU LETTER VOCALIC LL +0C66..0C6F ; 0 # Nd [10] TELUGU DIGIT ZERO..TELUGU DIGIT NINE +0C82..0C83 ; 0 # Mc [2] KANNADA SIGN ANUSVARA..KANNADA SIGN VISARGA +0C85..0C8C ; 0 # Lo [8] KANNADA LETTER A..KANNADA LETTER VOCALIC L +0C8E..0C90 ; 0 # Lo [3] KANNADA LETTER E..KANNADA LETTER AI +0C92..0CA8 ; 0 # Lo [23] KANNADA LETTER O..KANNADA LETTER NA +0CAA..0CB3 ; 0 # Lo [10] KANNADA LETTER PA..KANNADA LETTER LLA +0CB5..0CB9 ; 0 # Lo [5] KANNADA LETTER VA..KANNADA LETTER HA +0CBE ; 0 # Mc KANNADA VOWEL SIGN AA +0CBF ; 0 # Mn KANNADA VOWEL SIGN I +0CC0..0CC4 ; 0 # Mc [5] KANNADA VOWEL SIGN II..KANNADA VOWEL SIGN VOCALIC RR +0CC6 ; 0 # Mn KANNADA VOWEL SIGN E +0CC7..0CC8 ; 0 # Mc [2] KANNADA VOWEL SIGN EE..KANNADA VOWEL SIGN AI +0CCA..0CCB ; 0 # Mc [2] KANNADA VOWEL SIGN O..KANNADA VOWEL SIGN OO +0CCC ; 0 # Mn KANNADA VOWEL SIGN AU +0CD5..0CD6 ; 0 # Mc [2] KANNADA LENGTH MARK..KANNADA AI LENGTH MARK +0CDE ; 0 # Lo KANNADA LETTER FA +0CE0..0CE1 ; 0 # Lo [2] KANNADA LETTER VOCALIC RR..KANNADA LETTER VOCALIC LL +0CE6..0CEF ; 0 # Nd [10] KANNADA DIGIT ZERO..KANNADA DIGIT NINE +0D02..0D03 ; 0 # Mc [2] MALAYALAM SIGN ANUSVARA..MALAYALAM SIGN VISARGA +0D05..0D0C ; 0 # Lo [8] MALAYALAM LETTER A..MALAYALAM LETTER VOCALIC L +0D0E..0D10 ; 0 # Lo [3] MALAYALAM LETTER E..MALAYALAM LETTER AI +0D12..0D28 ; 0 # Lo [23] MALAYALAM LETTER O..MALAYALAM LETTER NA +0D2A..0D39 ; 0 # Lo [16] MALAYALAM LETTER PA..MALAYALAM LETTER HA +0D3E..0D40 ; 0 # Mc [3] MALAYALAM VOWEL SIGN AA..MALAYALAM VOWEL SIGN II +0D41..0D43 ; 0 # Mn [3] MALAYALAM VOWEL SIGN U..MALAYALAM VOWEL SIGN VOCALIC R +0D46..0D48 ; 0 # Mc [3] MALAYALAM VOWEL SIGN E..MALAYALAM VOWEL SIGN AI +0D4A..0D4C ; 0 # Mc [3] MALAYALAM VOWEL SIGN O..MALAYALAM VOWEL SIGN AU +0D57 ; 0 # Mc MALAYALAM AU LENGTH MARK +0D60..0D61 ; 0 # Lo [2] MALAYALAM LETTER VOCALIC RR..MALAYALAM LETTER VOCALIC LL +0D66..0D6F ; 0 # Nd [10] MALAYALAM DIGIT ZERO..MALAYALAM DIGIT NINE +0D82..0D83 ; 0 # Mc [2] SINHALA SIGN ANUSVARAYA..SINHALA SIGN VISARGAYA +0D85..0D96 ; 0 # Lo [18] SINHALA LETTER AYANNA..SINHALA LETTER AUYANNA +0D9A..0DB1 ; 0 # Lo [24] SINHALA LETTER ALPAPRAANA KAYANNA..SINHALA LETTER DANTAJA NAYANNA +0DB3..0DBB ; 0 # Lo [9] SINHALA LETTER SANYAKA DAYANNA..SINHALA LETTER RAYANNA +0DBD ; 0 # Lo SINHALA LETTER DANTAJA LAYANNA +0DC0..0DC6 ; 0 # Lo [7] SINHALA LETTER VAYANNA..SINHALA LETTER FAYANNA +0DCF..0DD1 ; 0 # Mc [3] SINHALA VOWEL SIGN AELA-PILLA..SINHALA VOWEL SIGN DIGA AEDA-PILLA +0DD2..0DD4 ; 0 # Mn [3] SINHALA VOWEL SIGN KETTI IS-PILLA..SINHALA VOWEL SIGN KETTI PAA-PILLA +0DD6 ; 0 # Mn SINHALA VOWEL SIGN DIGA PAA-PILLA +0DD8..0DDF ; 0 # Mc [8] SINHALA VOWEL SIGN GAETTA-PILLA..SINHALA VOWEL SIGN GAYANUKITTA +0DF2..0DF3 ; 0 # Mc [2] SINHALA VOWEL SIGN DIGA GAETTA-PILLA..SINHALA VOWEL SIGN DIGA GAYANUKITTA +0DF4 ; 0 # Po SINHALA PUNCTUATION KUNDDALIYA +0E01..0E30 ; 0 # Lo [48] THAI CHARACTER KO KAI..THAI CHARACTER SARA A +0E31 ; 0 # Mn THAI CHARACTER MAI HAN-AKAT +0E32..0E33 ; 0 # Lo [2] THAI CHARACTER SARA AA..THAI CHARACTER SARA AM +0E34..0E37 ; 0 # Mn [4] THAI CHARACTER SARA I..THAI CHARACTER SARA UEE +0E3F ; 0 # Sc THAI CURRENCY SYMBOL BAHT +0E40..0E45 ; 0 # Lo [6] THAI CHARACTER SARA E..THAI CHARACTER LAKKHANGYAO +0E46 ; 0 # Lm THAI CHARACTER MAIYAMOK +0E47 ; 0 # Mn THAI CHARACTER MAITAIKHU +0E4C..0E4E ; 0 # Mn [3] THAI CHARACTER THANTHAKHAT..THAI CHARACTER YAMAKKAN +0E4F ; 0 # Po THAI CHARACTER FONGMAN +0E50..0E59 ; 0 # Nd [10] THAI DIGIT ZERO..THAI DIGIT NINE +0E5A..0E5B ; 0 # Po [2] THAI CHARACTER ANGKHANKHU..THAI CHARACTER KHOMUT +0E81..0E82 ; 0 # Lo [2] LAO LETTER KO..LAO LETTER KHO SUNG +0E84 ; 0 # Lo LAO LETTER KHO TAM +0E87..0E88 ; 0 # Lo [2] LAO LETTER NGO..LAO LETTER CO +0E8A ; 0 # Lo LAO LETTER SO TAM +0E8D ; 0 # Lo LAO LETTER NYO +0E94..0E97 ; 0 # Lo [4] LAO LETTER DO..LAO LETTER THO TAM +0E99..0E9F ; 0 # Lo [7] LAO LETTER NO..LAO LETTER FO SUNG +0EA1..0EA3 ; 0 # Lo [3] LAO LETTER MO..LAO LETTER LO LING +0EA5 ; 0 # Lo LAO LETTER LO LOOT +0EA7 ; 0 # Lo LAO LETTER WO +0EAA..0EAB ; 0 # Lo [2] LAO LETTER SO SUNG..LAO LETTER HO SUNG +0EAD..0EB0 ; 0 # Lo [4] LAO LETTER O..LAO VOWEL SIGN A +0EB1 ; 0 # Mn LAO VOWEL SIGN MAI KAN +0EB2..0EB3 ; 0 # Lo [2] LAO VOWEL SIGN AA..LAO VOWEL SIGN AM +0EB4..0EB7 ; 0 # Mn [4] LAO VOWEL SIGN I..LAO VOWEL SIGN YY +0EBB..0EBC ; 0 # Mn [2] LAO VOWEL SIGN MAI KON..LAO SEMIVOWEL SIGN LO +0EBD ; 0 # Lo LAO SEMIVOWEL SIGN NYO +0EC0..0EC4 ; 0 # Lo [5] LAO VOWEL SIGN E..LAO VOWEL SIGN AI +0EC6 ; 0 # Lm LAO KO LA +0ECC..0ECD ; 0 # Mn [2] LAO CANCELLATION MARK..LAO NIGGAHITA +0ED0..0ED9 ; 0 # Nd [10] LAO DIGIT ZERO..LAO DIGIT NINE +0EDC..0EDD ; 0 # Lo [2] LAO HO NO..LAO HO MO +0F00 ; 0 # Lo TIBETAN SYLLABLE OM +0F01..0F03 ; 0 # So [3] TIBETAN MARK GTER YIG MGO TRUNCATED A..TIBETAN MARK GTER YIG MGO -UM GTER TSHEG MA +0F04..0F12 ; 0 # Po [15] TIBETAN MARK INITIAL YIG MGO MDUN MA..TIBETAN MARK RGYA GRAM SHAD +0F13..0F17 ; 0 # So [5] TIBETAN MARK CARET -DZUD RTAGS ME LONG CAN..TIBETAN ASTROLOGICAL SIGN SGRA GCAN -CHAR RTAGS +0F1A..0F1F ; 0 # So [6] TIBETAN SIGN RDEL DKAR GCIG..TIBETAN SIGN RDEL DKAR RDEL NAG +0F20..0F29 ; 0 # Nd [10] TIBETAN DIGIT ZERO..TIBETAN DIGIT NINE +0F2A..0F33 ; 0 # No [10] TIBETAN DIGIT HALF ONE..TIBETAN DIGIT HALF ZERO +0F34 ; 0 # So TIBETAN MARK BSDUS RTAGS +0F36 ; 0 # So TIBETAN MARK CARET -DZUD RTAGS BZHI MIG CAN +0F38 ; 0 # So TIBETAN MARK CHE MGO +0F3A ; 0 # Ps TIBETAN MARK GUG RTAGS GYON +0F3B ; 0 # Pe TIBETAN MARK GUG RTAGS GYAS +0F3C ; 0 # Ps TIBETAN MARK ANG KHANG GYON +0F3D ; 0 # Pe TIBETAN MARK ANG KHANG GYAS +0F3E..0F3F ; 0 # Mc [2] TIBETAN SIGN YAR TSHES..TIBETAN SIGN MAR TSHES +0F40..0F47 ; 0 # Lo [8] TIBETAN LETTER KA..TIBETAN LETTER JA +0F49..0F6A ; 0 # Lo [34] TIBETAN LETTER NYA..TIBETAN LETTER FIXED-FORM RA +0F73 ; 0 # Mn TIBETAN VOWEL SIGN II +0F75..0F79 ; 0 # Mn [5] TIBETAN VOWEL SIGN UU..TIBETAN VOWEL SIGN VOCALIC LL +0F7E ; 0 # Mn TIBETAN SIGN RJES SU NGA RO +0F7F ; 0 # Mc TIBETAN SIGN RNAM BCAD +0F81 ; 0 # Mn TIBETAN VOWEL SIGN REVERSED II +0F85 ; 0 # Po TIBETAN MARK PALUTA +0F88..0F8B ; 0 # Lo [4] TIBETAN SIGN LCE TSA CAN..TIBETAN SIGN GRU MED RGYINGS +0F90..0F97 ; 0 # Mn [8] TIBETAN SUBJOINED LETTER KA..TIBETAN SUBJOINED LETTER JA +0F99..0FBC ; 0 # Mn [36] TIBETAN SUBJOINED LETTER NYA..TIBETAN SUBJOINED LETTER FIXED-FORM RA +0FBE..0FC5 ; 0 # So [8] TIBETAN KU RU KHA..TIBETAN SYMBOL RDO RJE +0FC7..0FCC ; 0 # So [6] TIBETAN SYMBOL RDO RJE RGYA GRAM..TIBETAN SYMBOL NOR BU BZHI -KHYIL +0FCF ; 0 # So TIBETAN SIGN RDEL NAG GSUM +1000..1021 ; 0 # Lo [34] MYANMAR LETTER KA..MYANMAR LETTER A +1023..1027 ; 0 # Lo [5] MYANMAR LETTER I..MYANMAR LETTER E +1029..102A ; 0 # Lo [2] MYANMAR LETTER O..MYANMAR LETTER AU +102C ; 0 # Mc MYANMAR VOWEL SIGN AA +102D..1030 ; 0 # Mn [4] MYANMAR VOWEL SIGN I..MYANMAR VOWEL SIGN UU +1031 ; 0 # Mc MYANMAR VOWEL SIGN E +1032 ; 0 # Mn MYANMAR VOWEL SIGN AI +1036 ; 0 # Mn MYANMAR SIGN ANUSVARA +1038 ; 0 # Mc MYANMAR SIGN VISARGA +1040..1049 ; 0 # Nd [10] MYANMAR DIGIT ZERO..MYANMAR DIGIT NINE +104A..104F ; 0 # Po [6] MYANMAR SIGN LITTLE SECTION..MYANMAR SYMBOL GENITIVE +1050..1055 ; 0 # Lo [6] MYANMAR LETTER SHA..MYANMAR LETTER VOCALIC LL +1056..1057 ; 0 # Mc [2] MYANMAR VOWEL SIGN VOCALIC R..MYANMAR VOWEL SIGN VOCALIC RR +1058..1059 ; 0 # Mn [2] MYANMAR VOWEL SIGN VOCALIC L..MYANMAR VOWEL SIGN VOCALIC LL +10A0..10C5 ; 0 # L& [38] GEORGIAN CAPITAL LETTER AN..GEORGIAN CAPITAL LETTER HOE +10D0..10F8 ; 0 # Lo [41] GEORGIAN LETTER AN..GEORGIAN LETTER ELIFI +10FB ; 0 # Po GEORGIAN PARAGRAPH SEPARATOR +1100..1159 ; 0 # Lo [90] HANGUL CHOSEONG KIYEOK..HANGUL CHOSEONG YEORINHIEUH +115F..11A2 ; 0 # Lo [68] HANGUL CHOSEONG FILLER..HANGUL JUNGSEONG SSANGARAEA +11A8..11F9 ; 0 # Lo [82] HANGUL JONGSEONG KIYEOK..HANGUL JONGSEONG YEORINHIEUH +1200..1206 ; 0 # Lo [7] ETHIOPIC SYLLABLE HA..ETHIOPIC SYLLABLE HO +1208..1246 ; 0 # Lo [63] ETHIOPIC SYLLABLE LA..ETHIOPIC SYLLABLE QO +1248 ; 0 # Lo ETHIOPIC SYLLABLE QWA +124A..124D ; 0 # Lo [4] ETHIOPIC SYLLABLE QWI..ETHIOPIC SYLLABLE QWE +1250..1256 ; 0 # Lo [7] ETHIOPIC SYLLABLE QHA..ETHIOPIC SYLLABLE QHO +1258 ; 0 # Lo ETHIOPIC SYLLABLE QHWA +125A..125D ; 0 # Lo [4] ETHIOPIC SYLLABLE QHWI..ETHIOPIC SYLLABLE QHWE +1260..1286 ; 0 # Lo [39] ETHIOPIC SYLLABLE BA..ETHIOPIC SYLLABLE XO +1288 ; 0 # Lo ETHIOPIC SYLLABLE XWA +128A..128D ; 0 # Lo [4] ETHIOPIC SYLLABLE XWI..ETHIOPIC SYLLABLE XWE +1290..12AE ; 0 # Lo [31] ETHIOPIC SYLLABLE NA..ETHIOPIC SYLLABLE KO +12B0 ; 0 # Lo ETHIOPIC SYLLABLE KWA +12B2..12B5 ; 0 # Lo [4] ETHIOPIC SYLLABLE KWI..ETHIOPIC SYLLABLE KWE +12B8..12BE ; 0 # Lo [7] ETHIOPIC SYLLABLE KXA..ETHIOPIC SYLLABLE KXO +12C0 ; 0 # Lo ETHIOPIC SYLLABLE KXWA +12C2..12C5 ; 0 # Lo [4] ETHIOPIC SYLLABLE KXWI..ETHIOPIC SYLLABLE KXWE +12C8..12CE ; 0 # Lo [7] ETHIOPIC SYLLABLE WA..ETHIOPIC SYLLABLE WO +12D0..12D6 ; 0 # Lo [7] ETHIOPIC SYLLABLE PHARYNGEAL A..ETHIOPIC SYLLABLE PHARYNGEAL O +12D8..12EE ; 0 # Lo [23] ETHIOPIC SYLLABLE ZA..ETHIOPIC SYLLABLE YO +12F0..130E ; 0 # Lo [31] ETHIOPIC SYLLABLE DA..ETHIOPIC SYLLABLE GO +1310 ; 0 # Lo ETHIOPIC SYLLABLE GWA +1312..1315 ; 0 # Lo [4] ETHIOPIC SYLLABLE GWI..ETHIOPIC SYLLABLE GWE +1318..131E ; 0 # Lo [7] ETHIOPIC SYLLABLE GGA..ETHIOPIC SYLLABLE GGO +1320..1346 ; 0 # Lo [39] ETHIOPIC SYLLABLE THA..ETHIOPIC SYLLABLE TZO +1348..135A ; 0 # Lo [19] ETHIOPIC SYLLABLE FA..ETHIOPIC SYLLABLE FYA +1361..1368 ; 0 # Po [8] ETHIOPIC WORDSPACE..ETHIOPIC PARAGRAPH SEPARATOR +1369..1371 ; 0 # Nd [9] ETHIOPIC DIGIT ONE..ETHIOPIC DIGIT NINE +1372..137C ; 0 # No [11] ETHIOPIC NUMBER TEN..ETHIOPIC NUMBER TEN THOUSAND +13A0..13F4 ; 0 # Lo [85] CHEROKEE LETTER A..CHEROKEE LETTER YV +1401..166C ; 0 # Lo [620] CANADIAN SYLLABICS E..CANADIAN SYLLABICS CARRIER TTSA +166D..166E ; 0 # Po [2] CANADIAN SYLLABICS CHI SIGN..CANADIAN SYLLABICS FULL STOP +166F..1676 ; 0 # Lo [8] CANADIAN SYLLABICS QAI..CANADIAN SYLLABICS NNGAA +1680 ; 0 # Zs OGHAM SPACE MARK +1681..169A ; 0 # Lo [26] OGHAM LETTER BEITH..OGHAM LETTER PEITH +169B ; 0 # Ps OGHAM FEATHER MARK +169C ; 0 # Pe OGHAM REVERSED FEATHER MARK +16A0..16EA ; 0 # Lo [75] RUNIC LETTER FEHU FEOH FE F..RUNIC LETTER X +16EB..16ED ; 0 # Po [3] RUNIC SINGLE PUNCTUATION..RUNIC CROSS PUNCTUATION +16EE..16F0 ; 0 # Nl [3] RUNIC ARLAUG SYMBOL..RUNIC BELGTHOR SYMBOL +1700..170C ; 0 # Lo [13] TAGALOG LETTER A..TAGALOG LETTER YA +170E..1711 ; 0 # Lo [4] TAGALOG LETTER LA..TAGALOG LETTER HA +1712..1713 ; 0 # Mn [2] TAGALOG VOWEL SIGN I..TAGALOG VOWEL SIGN U +1720..1731 ; 0 # Lo [18] HANUNOO LETTER A..HANUNOO LETTER HA +1732..1733 ; 0 # Mn [2] HANUNOO VOWEL SIGN I..HANUNOO VOWEL SIGN U +1735..1736 ; 0 # Po [2] PHILIPPINE SINGLE PUNCTUATION..PHILIPPINE DOUBLE PUNCTUATION +1740..1751 ; 0 # Lo [18] BUHID LETTER A..BUHID LETTER HA +1752..1753 ; 0 # Mn [2] BUHID VOWEL SIGN I..BUHID VOWEL SIGN U +1760..176C ; 0 # Lo [13] TAGBANWA LETTER A..TAGBANWA LETTER YA +176E..1770 ; 0 # Lo [3] TAGBANWA LETTER LA..TAGBANWA LETTER SA +1772..1773 ; 0 # Mn [2] TAGBANWA VOWEL SIGN I..TAGBANWA VOWEL SIGN U +1780..17B3 ; 0 # Lo [52] KHMER LETTER KA..KHMER INDEPENDENT VOWEL QAU +17B4..17B6 ; 0 # Mc [3] KHMER VOWEL INHERENT AQ..KHMER VOWEL SIGN AA +17B7..17BD ; 0 # Mn [7] KHMER VOWEL SIGN I..KHMER VOWEL SIGN UA +17BE..17C5 ; 0 # Mc [8] KHMER VOWEL SIGN OE..KHMER VOWEL SIGN AU +17C6 ; 0 # Mn KHMER SIGN NIKAHIT +17C7..17C8 ; 0 # Mc [2] KHMER SIGN REAHMUK..KHMER SIGN YUUKALEAPINTU +17C9..17D1 ; 0 # Mn [9] KHMER SIGN MUUSIKATOAN..KHMER SIGN VIRIAM +17D3 ; 0 # Mn KHMER SIGN BATHAMASAT +17D4..17D6 ; 0 # Po [3] KHMER SIGN KHAN..KHMER SIGN CAMNUC PII KUUH +17D7 ; 0 # Lm KHMER SIGN LEK TOO +17D8..17DA ; 0 # Po [3] KHMER SIGN BEYYAL..KHMER SIGN KOOMUUT +17DB ; 0 # Sc KHMER CURRENCY SYMBOL RIEL +17DC ; 0 # Lo KHMER SIGN AVAKRAHASANYA +17E0..17E9 ; 0 # Nd [10] KHMER DIGIT ZERO..KHMER DIGIT NINE +1800..1805 ; 0 # Po [6] MONGOLIAN BIRGA..MONGOLIAN FOUR DOTS +1806 ; 0 # Pd MONGOLIAN TODO SOFT HYPHEN +1807..180A ; 0 # Po [4] MONGOLIAN SIBE SYLLABLE BOUNDARY MARKER..MONGOLIAN NIRUGU +180B..180D ; 0 # Mn [3] MONGOLIAN FREE VARIATION SELECTOR ONE..MONGOLIAN FREE VARIATION SELECTOR THREE +180E ; 0 # Cf MONGOLIAN VOWEL SEPARATOR +1810..1819 ; 0 # Nd [10] MONGOLIAN DIGIT ZERO..MONGOLIAN DIGIT NINE +1820..1842 ; 0 # Lo [35] MONGOLIAN LETTER A..MONGOLIAN LETTER CHI +1843 ; 0 # Lm MONGOLIAN LETTER TODO LONG VOWEL SIGN +1844..1877 ; 0 # Lo [52] MONGOLIAN LETTER TODO E..MONGOLIAN LETTER MANCHU ZHA +1880..18A8 ; 0 # Lo [41] MONGOLIAN LETTER ALI GALI ANUSVARA ONE..MONGOLIAN LETTER MANCHU ALI GALI BHA +1E00..1E9B ; 0 # L& [156] LATIN CAPITAL LETTER A WITH RING BELOW..LATIN SMALL LETTER LONG S WITH DOT ABOVE +1EA0..1EF9 ; 0 # L& [90] LATIN CAPITAL LETTER A WITH DOT BELOW..LATIN SMALL LETTER Y WITH TILDE +1F00..1F15 ; 0 # L& [22] GREEK SMALL LETTER ALPHA WITH PSILI..GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA +1F18..1F1D ; 0 # L& [6] GREEK CAPITAL LETTER EPSILON WITH PSILI..GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA +1F20..1F45 ; 0 # L& [38] GREEK SMALL LETTER ETA WITH PSILI..GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA +1F48..1F4D ; 0 # L& [6] GREEK CAPITAL LETTER OMICRON WITH PSILI..GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA +1F50..1F57 ; 0 # L& [8] GREEK SMALL LETTER UPSILON WITH PSILI..GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI +1F59 ; 0 # L& GREEK CAPITAL LETTER UPSILON WITH DASIA +1F5B ; 0 # L& GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA +1F5D ; 0 # L& GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA +1F5F..1F7D ; 0 # L& [31] GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI..GREEK SMALL LETTER OMEGA WITH OXIA +1F80..1FB4 ; 0 # L& [53] GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI..GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI +1FB6..1FBC ; 0 # L& [7] GREEK SMALL LETTER ALPHA WITH PERISPOMENI..GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI +1FBD ; 0 # Sk GREEK KORONIS +1FBE ; 0 # L& GREEK PROSGEGRAMMENI +1FBF..1FC1 ; 0 # Sk [3] GREEK PSILI..GREEK DIALYTIKA AND PERISPOMENI +1FC2..1FC4 ; 0 # L& [3] GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI..GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI +1FC6..1FCC ; 0 # L& [7] GREEK SMALL LETTER ETA WITH PERISPOMENI..GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI +1FCD..1FCF ; 0 # Sk [3] GREEK PSILI AND VARIA..GREEK PSILI AND PERISPOMENI +1FD0..1FD3 ; 0 # L& [4] GREEK SMALL LETTER IOTA WITH VRACHY..GREEK SMALL LETTER IOTA WITH DIALYTIKA AND OXIA +1FD6..1FDB ; 0 # L& [6] GREEK SMALL LETTER IOTA WITH PERISPOMENI..GREEK CAPITAL LETTER IOTA WITH OXIA +1FDD..1FDF ; 0 # Sk [3] GREEK DASIA AND VARIA..GREEK DASIA AND PERISPOMENI +1FE0..1FEC ; 0 # L& [13] GREEK SMALL LETTER UPSILON WITH VRACHY..GREEK CAPITAL LETTER RHO WITH DASIA +1FED..1FEF ; 0 # Sk [3] GREEK DIALYTIKA AND VARIA..GREEK VARIA +1FF2..1FF4 ; 0 # L& [3] GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI..GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI +1FF6..1FFC ; 0 # L& [7] GREEK SMALL LETTER OMEGA WITH PERISPOMENI..GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI +1FFD..1FFE ; 0 # Sk [2] GREEK OXIA..GREEK DASIA +2000..200B ; 0 # Zs [12] EN QUAD..ZERO WIDTH SPACE +200C..200F ; 0 # Cf [4] ZERO WIDTH NON-JOINER..RIGHT-TO-LEFT MARK +2010..2015 ; 0 # Pd [6] HYPHEN..HORIZONTAL BAR +2016..2017 ; 0 # Po [2] DOUBLE VERTICAL LINE..DOUBLE LOW LINE +2018 ; 0 # Pi LEFT SINGLE QUOTATION MARK +2019 ; 0 # Pf RIGHT SINGLE QUOTATION MARK +201A ; 0 # Ps SINGLE LOW-9 QUOTATION MARK +201B..201C ; 0 # Pi [2] SINGLE HIGH-REVERSED-9 QUOTATION MARK..LEFT DOUBLE QUOTATION MARK +201D ; 0 # Pf RIGHT DOUBLE QUOTATION MARK +201E ; 0 # Ps DOUBLE LOW-9 QUOTATION MARK +201F ; 0 # Pi DOUBLE HIGH-REVERSED-9 QUOTATION MARK +2020..2027 ; 0 # Po [8] DAGGER..HYPHENATION POINT +2028 ; 0 # Zl LINE SEPARATOR +2029 ; 0 # Zp PARAGRAPH SEPARATOR +202A..202E ; 0 # Cf [5] LEFT-TO-RIGHT EMBEDDING..RIGHT-TO-LEFT OVERRIDE +202F ; 0 # Zs NARROW NO-BREAK SPACE +2030..2038 ; 0 # Po [9] PER MILLE SIGN..CARET +2039 ; 0 # Pi SINGLE LEFT-POINTING ANGLE QUOTATION MARK +203A ; 0 # Pf SINGLE RIGHT-POINTING ANGLE QUOTATION MARK +203B..203E ; 0 # Po [4] REFERENCE MARK..OVERLINE +203F..2040 ; 0 # Pc [2] UNDERTIE..CHARACTER TIE +2041..2043 ; 0 # Po [3] CARET INSERTION POINT..HYPHEN BULLET +2044 ; 0 # Sm FRACTION SLASH +2045 ; 0 # Ps LEFT SQUARE BRACKET WITH QUILL +2046 ; 0 # Pe RIGHT SQUARE BRACKET WITH QUILL +2047..2051 ; 0 # Po [11] DOUBLE QUESTION MARK..TWO ASTERISKS ALIGNED VERTICALLY +2052 ; 0 # Sm COMMERCIAL MINUS SIGN +2057 ; 0 # Po QUADRUPLE PRIME +205F ; 0 # Zs MEDIUM MATHEMATICAL SPACE +2060..2063 ; 0 # Cf [4] WORD JOINER..INVISIBLE SEPARATOR +206A..206F ; 0 # Cf [6] INHIBIT SYMMETRIC SWAPPING..NOMINAL DIGIT SHAPES +2070 ; 0 # No SUPERSCRIPT ZERO +2071 ; 0 # L& SUPERSCRIPT LATIN SMALL LETTER I +2074..2079 ; 0 # No [6] SUPERSCRIPT FOUR..SUPERSCRIPT NINE +207A..207C ; 0 # Sm [3] SUPERSCRIPT PLUS SIGN..SUPERSCRIPT EQUALS SIGN +207D ; 0 # Ps SUPERSCRIPT LEFT PARENTHESIS +207E ; 0 # Pe SUPERSCRIPT RIGHT PARENTHESIS +207F ; 0 # L& SUPERSCRIPT LATIN SMALL LETTER N +2080..2089 ; 0 # No [10] SUBSCRIPT ZERO..SUBSCRIPT NINE +208A..208C ; 0 # Sm [3] SUBSCRIPT PLUS SIGN..SUBSCRIPT EQUALS SIGN +208D ; 0 # Ps SUBSCRIPT LEFT PARENTHESIS +208E ; 0 # Pe SUBSCRIPT RIGHT PARENTHESIS +20A0..20B1 ; 0 # Sc [18] EURO-CURRENCY SIGN..PESO SIGN +20DD..20E0 ; 0 # Me [4] COMBINING ENCLOSING CIRCLE..COMBINING ENCLOSING CIRCLE BACKSLASH +20E2..20E4 ; 0 # Me [3] COMBINING ENCLOSING SCREEN..COMBINING ENCLOSING UPWARD POINTING TRIANGLE +2100..2101 ; 0 # So [2] ACCOUNT OF..ADDRESSED TO THE SUBJECT +2102 ; 0 # L& DOUBLE-STRUCK CAPITAL C +2103..2106 ; 0 # So [4] DEGREE CELSIUS..CADA UNA +2107 ; 0 # L& EULER CONSTANT +2108..2109 ; 0 # So [2] SCRUPLE..DEGREE FAHRENHEIT +210A..2113 ; 0 # L& [10] SCRIPT SMALL G..SCRIPT SMALL L +2114 ; 0 # So L B BAR SYMBOL +2115 ; 0 # L& DOUBLE-STRUCK CAPITAL N +2116..2118 ; 0 # So [3] NUMERO SIGN..SCRIPT CAPITAL P +2119..211D ; 0 # L& [5] DOUBLE-STRUCK CAPITAL P..DOUBLE-STRUCK CAPITAL R +211E..2123 ; 0 # So [6] PRESCRIPTION TAKE..VERSICLE +2124 ; 0 # L& DOUBLE-STRUCK CAPITAL Z +2125 ; 0 # So OUNCE SIGN +2126 ; 0 # L& OHM SIGN +2127 ; 0 # So INVERTED OHM SIGN +2128 ; 0 # L& BLACK-LETTER CAPITAL Z +2129 ; 0 # So TURNED GREEK SMALL LETTER IOTA +212A..212D ; 0 # L& [4] KELVIN SIGN..BLACK-LETTER CAPITAL C +212E ; 0 # So ESTIMATED SYMBOL +212F..2131 ; 0 # L& [3] SCRIPT SMALL E..SCRIPT CAPITAL F +2132 ; 0 # So TURNED CAPITAL F +2133..2134 ; 0 # L& [2] SCRIPT CAPITAL M..SCRIPT SMALL O +2135..2138 ; 0 # Lo [4] ALEF SYMBOL..DALET SYMBOL +2139 ; 0 # L& INFORMATION SOURCE +213A ; 0 # So ROTATED CAPITAL Q +213D..213F ; 0 # L& [3] DOUBLE-STRUCK SMALL GAMMA..DOUBLE-STRUCK CAPITAL PI +2140..2144 ; 0 # Sm [5] DOUBLE-STRUCK N-ARY SUMMATION..TURNED SANS-SERIF CAPITAL Y +2145..2149 ; 0 # L& [5] DOUBLE-STRUCK ITALIC CAPITAL D..DOUBLE-STRUCK ITALIC SMALL J +214A ; 0 # So PROPERTY LINE +214B ; 0 # Sm TURNED AMPERSAND +2153..215F ; 0 # No [13] VULGAR FRACTION ONE THIRD..FRACTION NUMERATOR ONE +2160..2183 ; 0 # Nl [36] ROMAN NUMERAL ONE..ROMAN NUMERAL REVERSED ONE HUNDRED +2190..2194 ; 0 # Sm [5] LEFTWARDS ARROW..LEFT RIGHT ARROW +2195..2199 ; 0 # So [5] UP DOWN ARROW..SOUTH WEST ARROW +219A..219B ; 0 # Sm [2] LEFTWARDS ARROW WITH STROKE..RIGHTWARDS ARROW WITH STROKE +219C..219F ; 0 # So [4] LEFTWARDS WAVE ARROW..UPWARDS TWO HEADED ARROW +21A0 ; 0 # Sm RIGHTWARDS TWO HEADED ARROW +21A1..21A2 ; 0 # So [2] DOWNWARDS TWO HEADED ARROW..LEFTWARDS ARROW WITH TAIL +21A3 ; 0 # Sm RIGHTWARDS ARROW WITH TAIL +21A4..21A5 ; 0 # So [2] LEFTWARDS ARROW FROM BAR..UPWARDS ARROW FROM BAR +21A6 ; 0 # Sm RIGHTWARDS ARROW FROM BAR +21A7..21AD ; 0 # So [7] DOWNWARDS ARROW FROM BAR..LEFT RIGHT WAVE ARROW +21AE ; 0 # Sm LEFT RIGHT ARROW WITH STROKE +21AF..21CD ; 0 # So [31] DOWNWARDS ZIGZAG ARROW..LEFTWARDS DOUBLE ARROW WITH STROKE +21CE..21CF ; 0 # Sm [2] LEFT RIGHT DOUBLE ARROW WITH STROKE..RIGHTWARDS DOUBLE ARROW WITH STROKE +21D0..21D1 ; 0 # So [2] LEFTWARDS DOUBLE ARROW..UPWARDS DOUBLE ARROW +21D2 ; 0 # Sm RIGHTWARDS DOUBLE ARROW +21D3 ; 0 # So DOWNWARDS DOUBLE ARROW +21D4 ; 0 # Sm LEFT RIGHT DOUBLE ARROW +21D5..21F3 ; 0 # So [31] UP DOWN DOUBLE ARROW..UP DOWN WHITE ARROW +21F4..22FF ; 0 # Sm [268] RIGHT ARROW WITH SMALL CIRCLE..Z NOTATION BAG MEMBERSHIP +2300..2307 ; 0 # So [8] DIAMETER SIGN..WAVY LINE +2308..230B ; 0 # Sm [4] LEFT CEILING..RIGHT FLOOR +230C..231F ; 0 # So [20] BOTTOM RIGHT CROP..BOTTOM RIGHT CORNER +2320..2321 ; 0 # Sm [2] TOP HALF INTEGRAL..BOTTOM HALF INTEGRAL +2322..2328 ; 0 # So [7] FROWN..KEYBOARD +2329 ; 0 # Ps LEFT-POINTING ANGLE BRACKET +232A ; 0 # Pe RIGHT-POINTING ANGLE BRACKET +232B..237B ; 0 # So [81] ERASE TO THE LEFT..NOT CHECK MARK +237C ; 0 # Sm RIGHT ANGLE WITH DOWNWARDS ZIGZAG ARROW +237D..239A ; 0 # So [30] SHOULDERED OPEN BOX..CLEAR SCREEN SYMBOL +239B..23B3 ; 0 # Sm [25] LEFT PARENTHESIS UPPER HOOK..SUMMATION BOTTOM +23B4 ; 0 # Ps TOP SQUARE BRACKET +23B5 ; 0 # Pe BOTTOM SQUARE BRACKET +23B6 ; 0 # Po BOTTOM SQUARE BRACKET OVER TOP SQUARE BRACKET +23B7..23CE ; 0 # So [24] RADICAL SYMBOL BOTTOM..RETURN SYMBOL +2400..2426 ; 0 # So [39] SYMBOL FOR NULL..SYMBOL FOR SUBSTITUTE FORM TWO +2440..244A ; 0 # So [11] OCR HOOK..OCR DOUBLE BACKSLASH +2460..249B ; 0 # No [60] CIRCLED DIGIT ONE..NUMBER TWENTY FULL STOP +249C..24E9 ; 0 # So [78] PARENTHESIZED LATIN SMALL LETTER A..CIRCLED LATIN SMALL LETTER Z +24EA..24FE ; 0 # No [21] CIRCLED DIGIT ZERO..DOUBLE CIRCLED NUMBER TEN +2500..25B6 ; 0 # So [183] BOX DRAWINGS LIGHT HORIZONTAL..BLACK RIGHT-POINTING TRIANGLE +25B7 ; 0 # Sm WHITE RIGHT-POINTING TRIANGLE +25B8..25C0 ; 0 # So [9] BLACK RIGHT-POINTING SMALL TRIANGLE..BLACK LEFT-POINTING TRIANGLE +25C1 ; 0 # Sm WHITE LEFT-POINTING TRIANGLE +25C2..25F7 ; 0 # So [54] BLACK LEFT-POINTING SMALL TRIANGLE..WHITE CIRCLE WITH UPPER RIGHT QUADRANT +25F8..25FF ; 0 # Sm [8] UPPER LEFT TRIANGLE..LOWER RIGHT TRIANGLE +2600..2613 ; 0 # So [20] BLACK SUN WITH RAYS..SALTIRE +2616..2617 ; 0 # So [2] WHITE SHOGI PIECE..BLACK SHOGI PIECE +2619..266E ; 0 # So [86] REVERSED ROTATED FLORAL HEART BULLET..MUSIC NATURAL SIGN +266F ; 0 # Sm MUSIC SHARP SIGN +2670..267D ; 0 # So [14] WEST SYRIAC CROSS..PARTIALLY-RECYCLED PAPER SYMBOL +2680..2689 ; 0 # So [10] DIE FACE-1..BLACK CIRCLE WITH TWO WHITE DOTS +2701..2704 ; 0 # So [4] UPPER BLADE SCISSORS..WHITE SCISSORS +2706..2709 ; 0 # So [4] TELEPHONE LOCATION SIGN..ENVELOPE +270C..2727 ; 0 # So [28] VICTORY HAND..WHITE FOUR POINTED STAR +2729..274B ; 0 # So [35] STRESS OUTLINED WHITE STAR..HEAVY EIGHT TEARDROP-SPOKED PROPELLER ASTERISK +274D ; 0 # So SHADOWED WHITE CIRCLE +274F..2752 ; 0 # So [4] LOWER RIGHT DROP-SHADOWED WHITE SQUARE..UPPER RIGHT SHADOWED WHITE SQUARE +2756 ; 0 # So BLACK DIAMOND MINUS WHITE X +2758..275E ; 0 # So [7] LIGHT VERTICAL BAR..HEAVY DOUBLE COMMA QUOTATION MARK ORNAMENT +2761..2767 ; 0 # So [7] CURVED STEM PARAGRAPH SIGN ORNAMENT..ROTATED FLORAL HEART BULLET +2768 ; 0 # Ps MEDIUM LEFT PARENTHESIS ORNAMENT +2769 ; 0 # Pe MEDIUM RIGHT PARENTHESIS ORNAMENT +276A ; 0 # Ps MEDIUM FLATTENED LEFT PARENTHESIS ORNAMENT +276B ; 0 # Pe MEDIUM FLATTENED RIGHT PARENTHESIS ORNAMENT +276C ; 0 # Ps MEDIUM LEFT-POINTING ANGLE BRACKET ORNAMENT +276D ; 0 # Pe MEDIUM RIGHT-POINTING ANGLE BRACKET ORNAMENT +276E ; 0 # Ps HEAVY LEFT-POINTING ANGLE QUOTATION MARK ORNAMENT +276F ; 0 # Pe HEAVY RIGHT-POINTING ANGLE QUOTATION MARK ORNAMENT +2770 ; 0 # Ps HEAVY LEFT-POINTING ANGLE BRACKET ORNAMENT +2771 ; 0 # Pe HEAVY RIGHT-POINTING ANGLE BRACKET ORNAMENT +2772 ; 0 # Ps LIGHT LEFT TORTOISE SHELL BRACKET ORNAMENT +2773 ; 0 # Pe LIGHT RIGHT TORTOISE SHELL BRACKET ORNAMENT +2774 ; 0 # Ps MEDIUM LEFT CURLY BRACKET ORNAMENT +2775 ; 0 # Pe MEDIUM RIGHT CURLY BRACKET ORNAMENT +2776..2793 ; 0 # No [30] DINGBAT NEGATIVE CIRCLED DIGIT ONE..DINGBAT NEGATIVE CIRCLED SANS-SERIF NUMBER TEN +2794 ; 0 # So HEAVY WIDE-HEADED RIGHTWARDS ARROW +2798..27AF ; 0 # So [24] HEAVY SOUTH EAST ARROW..NOTCHED LOWER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW +27B1..27BE ; 0 # So [14] NOTCHED UPPER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW..OPEN-OUTLINED RIGHTWARDS ARROW +27D0..27E5 ; 0 # Sm [22] WHITE DIAMOND WITH CENTRED DOT..WHITE SQUARE WITH RIGHTWARDS TICK +27E6 ; 0 # Ps MATHEMATICAL LEFT WHITE SQUARE BRACKET +27E7 ; 0 # Pe MATHEMATICAL RIGHT WHITE SQUARE BRACKET +27E8 ; 0 # Ps MATHEMATICAL LEFT ANGLE BRACKET +27E9 ; 0 # Pe MATHEMATICAL RIGHT ANGLE BRACKET +27EA ; 0 # Ps MATHEMATICAL LEFT DOUBLE ANGLE BRACKET +27EB ; 0 # Pe MATHEMATICAL RIGHT DOUBLE ANGLE BRACKET +27F0..27FF ; 0 # Sm [16] UPWARDS QUADRUPLE ARROW..LONG RIGHTWARDS SQUIGGLE ARROW +2800..28FF ; 0 # So [256] BRAILLE PATTERN BLANK..BRAILLE PATTERN DOTS-12345678 +2900..2982 ; 0 # Sm [131] RIGHTWARDS TWO-HEADED ARROW WITH VERTICAL STROKE..Z NOTATION TYPE COLON +2983 ; 0 # Ps LEFT WHITE CURLY BRACKET +2984 ; 0 # Pe RIGHT WHITE CURLY BRACKET +2985 ; 0 # Ps LEFT WHITE PARENTHESIS +2986 ; 0 # Pe RIGHT WHITE PARENTHESIS +2987 ; 0 # Ps Z NOTATION LEFT IMAGE BRACKET +2988 ; 0 # Pe Z NOTATION RIGHT IMAGE BRACKET +2989 ; 0 # Ps Z NOTATION LEFT BINDING BRACKET +298A ; 0 # Pe Z NOTATION RIGHT BINDING BRACKET +298B ; 0 # Ps LEFT SQUARE BRACKET WITH UNDERBAR +298C ; 0 # Pe RIGHT SQUARE BRACKET WITH UNDERBAR +298D ; 0 # Ps LEFT SQUARE BRACKET WITH TICK IN TOP CORNER +298E ; 0 # Pe RIGHT SQUARE BRACKET WITH TICK IN BOTTOM CORNER +298F ; 0 # Ps LEFT SQUARE BRACKET WITH TICK IN BOTTOM CORNER +2990 ; 0 # Pe RIGHT SQUARE BRACKET WITH TICK IN TOP CORNER +2991 ; 0 # Ps LEFT ANGLE BRACKET WITH DOT +2992 ; 0 # Pe RIGHT ANGLE BRACKET WITH DOT +2993 ; 0 # Ps LEFT ARC LESS-THAN BRACKET +2994 ; 0 # Pe RIGHT ARC GREATER-THAN BRACKET +2995 ; 0 # Ps DOUBLE LEFT ARC GREATER-THAN BRACKET +2996 ; 0 # Pe DOUBLE RIGHT ARC LESS-THAN BRACKET +2997 ; 0 # Ps LEFT BLACK TORTOISE SHELL BRACKET +2998 ; 0 # Pe RIGHT BLACK TORTOISE SHELL BRACKET +2999..29D7 ; 0 # Sm [63] DOTTED FENCE..BLACK HOURGLASS +29D8 ; 0 # Ps LEFT WIGGLY FENCE +29D9 ; 0 # Pe RIGHT WIGGLY FENCE +29DA ; 0 # Ps LEFT DOUBLE WIGGLY FENCE +29DB ; 0 # Pe RIGHT DOUBLE WIGGLY FENCE +29DC..29FB ; 0 # Sm [32] INCOMPLETE INFINITY..TRIPLE PLUS +29FC ; 0 # Ps LEFT-POINTING CURVED ANGLE BRACKET +29FD ; 0 # Pe RIGHT-POINTING CURVED ANGLE BRACKET +29FE..2AFF ; 0 # Sm [258] TINY..N-ARY WHITE VERTICAL BAR +2E80..2E99 ; 0 # So [26] CJK RADICAL REPEAT..CJK RADICAL RAP +2E9B..2EF3 ; 0 # So [89] CJK RADICAL CHOKE..CJK RADICAL C-SIMPLIFIED TURTLE +2F00..2FD5 ; 0 # So [214] KANGXI RADICAL ONE..KANGXI RADICAL FLUTE +2FF0..2FFB ; 0 # So [12] IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT..IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID +3000 ; 0 # Zs IDEOGRAPHIC SPACE +3001..3003 ; 0 # Po [3] IDEOGRAPHIC COMMA..DITTO MARK +3004 ; 0 # So JAPANESE INDUSTRIAL STANDARD SYMBOL +3005 ; 0 # Lm IDEOGRAPHIC ITERATION MARK +3006 ; 0 # Lo IDEOGRAPHIC CLOSING MARK +3007 ; 0 # Nl IDEOGRAPHIC NUMBER ZERO +3008 ; 0 # Ps LEFT ANGLE BRACKET +3009 ; 0 # Pe RIGHT ANGLE BRACKET +300A ; 0 # Ps LEFT DOUBLE ANGLE BRACKET +300B ; 0 # Pe RIGHT DOUBLE ANGLE BRACKET +300C ; 0 # Ps LEFT CORNER BRACKET +300D ; 0 # Pe RIGHT CORNER BRACKET +300E ; 0 # Ps LEFT WHITE CORNER BRACKET +300F ; 0 # Pe RIGHT WHITE CORNER BRACKET +3010 ; 0 # Ps LEFT BLACK LENTICULAR BRACKET +3011 ; 0 # Pe RIGHT BLACK LENTICULAR BRACKET +3012..3013 ; 0 # So [2] POSTAL MARK..GETA MARK +3014 ; 0 # Ps LEFT TORTOISE SHELL BRACKET +3015 ; 0 # Pe RIGHT TORTOISE SHELL BRACKET +3016 ; 0 # Ps LEFT WHITE LENTICULAR BRACKET +3017 ; 0 # Pe RIGHT WHITE LENTICULAR BRACKET +3018 ; 0 # Ps LEFT WHITE TORTOISE SHELL BRACKET +3019 ; 0 # Pe RIGHT WHITE TORTOISE SHELL BRACKET +301A ; 0 # Ps LEFT WHITE SQUARE BRACKET +301B ; 0 # Pe RIGHT WHITE SQUARE BRACKET +301C ; 0 # Pd WAVE DASH +301D ; 0 # Ps REVERSED DOUBLE PRIME QUOTATION MARK +301E..301F ; 0 # Pe [2] DOUBLE PRIME QUOTATION MARK..LOW DOUBLE PRIME QUOTATION MARK +3020 ; 0 # So POSTAL MARK FACE +3021..3029 ; 0 # Nl [9] HANGZHOU NUMERAL ONE..HANGZHOU NUMERAL NINE +3030 ; 0 # Pd WAVY DASH +3031..3035 ; 0 # Lm [5] VERTICAL KANA REPEAT MARK..VERTICAL KANA REPEAT MARK LOWER HALF +3036..3037 ; 0 # So [2] CIRCLED POSTAL MARK..IDEOGRAPHIC TELEGRAPH LINE FEED SEPARATOR SYMBOL +3038..303A ; 0 # Nl [3] HANGZHOU NUMERAL TEN..HANGZHOU NUMERAL THIRTY +303B ; 0 # Lm VERTICAL IDEOGRAPHIC ITERATION MARK +303C ; 0 # Lo MASU MARK +303D ; 0 # Po PART ALTERNATION MARK +303E..303F ; 0 # So [2] IDEOGRAPHIC VARIATION INDICATOR..IDEOGRAPHIC HALF FILL SPACE +3041..3096 ; 0 # Lo [86] HIRAGANA LETTER SMALL A..HIRAGANA LETTER SMALL KE +309B..309C ; 0 # Sk [2] KATAKANA-HIRAGANA VOICED SOUND MARK..KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK +309D..309E ; 0 # Lm [2] HIRAGANA ITERATION MARK..HIRAGANA VOICED ITERATION MARK +309F ; 0 # Lo HIRAGANA DIGRAPH YORI +30A0 ; 0 # Pd KATAKANA-HIRAGANA DOUBLE HYPHEN +30A1..30FA ; 0 # Lo [90] KATAKANA LETTER SMALL A..KATAKANA LETTER VO +30FB ; 0 # Pc KATAKANA MIDDLE DOT +30FC..30FE ; 0 # Lm [3] KATAKANA-HIRAGANA PROLONGED SOUND MARK..KATAKANA VOICED ITERATION MARK +30FF ; 0 # Lo KATAKANA DIGRAPH KOTO +3105..312C ; 0 # Lo [40] BOPOMOFO LETTER B..BOPOMOFO LETTER GN +3131..318E ; 0 # Lo [94] HANGUL LETTER KIYEOK..HANGUL LETTER ARAEAE +3190..3191 ; 0 # So [2] IDEOGRAPHIC ANNOTATION LINKING MARK..IDEOGRAPHIC ANNOTATION REVERSE MARK +3192..3195 ; 0 # No [4] IDEOGRAPHIC ANNOTATION ONE MARK..IDEOGRAPHIC ANNOTATION FOUR MARK +3196..319F ; 0 # So [10] IDEOGRAPHIC ANNOTATION TOP MARK..IDEOGRAPHIC ANNOTATION MAN MARK +31A0..31B7 ; 0 # Lo [24] BOPOMOFO LETTER BU..BOPOMOFO FINAL LETTER H +31F0..31FF ; 0 # Lo [16] KATAKANA LETTER SMALL KU..KATAKANA LETTER SMALL RO +3200..321C ; 0 # So [29] PARENTHESIZED HANGUL KIYEOK..PARENTHESIZED HANGUL CIEUC U +3220..3229 ; 0 # No [10] PARENTHESIZED IDEOGRAPH ONE..PARENTHESIZED IDEOGRAPH TEN +322A..3243 ; 0 # So [26] PARENTHESIZED IDEOGRAPH MOON..PARENTHESIZED IDEOGRAPH REACH +3251..325F ; 0 # No [15] CIRCLED NUMBER TWENTY ONE..CIRCLED NUMBER THIRTY FIVE +3260..327B ; 0 # So [28] CIRCLED HANGUL KIYEOK..CIRCLED HANGUL HIEUH A +327F ; 0 # So KOREAN STANDARD SYMBOL +3280..3289 ; 0 # No [10] CIRCLED IDEOGRAPH ONE..CIRCLED IDEOGRAPH TEN +328A..32B0 ; 0 # So [39] CIRCLED IDEOGRAPH MOON..CIRCLED IDEOGRAPH NIGHT +32B1..32BF ; 0 # No [15] CIRCLED NUMBER THIRTY SIX..CIRCLED NUMBER FIFTY +32C0..32CB ; 0 # So [12] IDEOGRAPHIC TELEGRAPH SYMBOL FOR JANUARY..IDEOGRAPHIC TELEGRAPH SYMBOL FOR DECEMBER +32D0..32FE ; 0 # So [47] CIRCLED KATAKANA A..CIRCLED KATAKANA WO +3300..3376 ; 0 # So [119] SQUARE APAATO..SQUARE PC +337B..33DD ; 0 # So [99] SQUARE ERA NAME HEISEI..SQUARE WB +33E0..33FE ; 0 # So [31] IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY ONE..IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY THIRTY-ONE +3400..4DB5 ; 0 # Lo [6582] CJK UNIFIED IDEOGRAPH-3400..CJK UNIFIED IDEOGRAPH-4DB5 +4E00..9FA5 ; 0 # Lo [20902] CJK UNIFIED IDEOGRAPH-4E00..CJK UNIFIED IDEOGRAPH-9FA5 +A000..A48C ; 0 # Lo [1165] YI SYLLABLE IT..YI SYLLABLE YYR +A490..A4C6 ; 0 # So [55] YI RADICAL QOT..YI RADICAL KE +AC00..D7A3 ; 0 # Lo [11172] HANGUL SYLLABLE GA..HANGUL SYLLABLE HIH +D800..DFFF ; 0 # Cs [2048] +E000..F8FF ; 0 # Co [6400] +F900..FA2D ; 0 # Lo [302] CJK COMPATIBILITY IDEOGRAPH-F900..CJK COMPATIBILITY IDEOGRAPH-FA2D +FA30..FA6A ; 0 # Lo [59] CJK COMPATIBILITY IDEOGRAPH-FA30..CJK COMPATIBILITY IDEOGRAPH-FA6A +FB00..FB06 ; 0 # L& [7] LATIN SMALL LIGATURE FF..LATIN SMALL LIGATURE ST +FB13..FB17 ; 0 # L& [5] ARMENIAN SMALL LIGATURE MEN NOW..ARMENIAN SMALL LIGATURE MEN XEH +FB1D ; 0 # Lo HEBREW LETTER YOD WITH HIRIQ +FB1F..FB28 ; 0 # Lo [10] HEBREW LIGATURE YIDDISH YOD YOD PATAH..HEBREW LETTER WIDE TAV +FB29 ; 0 # Sm HEBREW LETTER ALTERNATIVE PLUS SIGN +FB2A..FB36 ; 0 # Lo [13] HEBREW LETTER SHIN WITH SHIN DOT..HEBREW LETTER ZAYIN WITH DAGESH +FB38..FB3C ; 0 # Lo [5] HEBREW LETTER TET WITH DAGESH..HEBREW LETTER LAMED WITH DAGESH +FB3E ; 0 # Lo HEBREW LETTER MEM WITH DAGESH +FB40..FB41 ; 0 # Lo [2] HEBREW LETTER NUN WITH DAGESH..HEBREW LETTER SAMEKH WITH DAGESH +FB43..FB44 ; 0 # Lo [2] HEBREW LETTER FINAL PE WITH DAGESH..HEBREW LETTER PE WITH DAGESH +FB46..FBB1 ; 0 # Lo [108] HEBREW LETTER TSADI WITH DAGESH..ARABIC LETTER YEH BARREE WITH HAMZA ABOVE FINAL FORM +FBD3..FD3D ; 0 # Lo [363] ARABIC LETTER NG ISOLATED FORM..ARABIC LIGATURE ALEF WITH FATHATAN ISOLATED FORM +FD3E ; 0 # Ps ORNATE LEFT PARENTHESIS +FD3F ; 0 # Pe ORNATE RIGHT PARENTHESIS +FD50..FD8F ; 0 # Lo [64] ARABIC LIGATURE TEH WITH JEEM WITH MEEM INITIAL FORM..ARABIC LIGATURE MEEM WITH KHAH WITH MEEM INITIAL FORM +FD92..FDC7 ; 0 # Lo [54] ARABIC LIGATURE MEEM WITH JEEM WITH KHAH INITIAL FORM..ARABIC LIGATURE NOON WITH JEEM WITH YEH FINAL FORM +FDF0..FDFB ; 0 # Lo [12] ARABIC LIGATURE SALLA USED AS KORANIC STOP SIGN ISOLATED FORM..ARABIC LIGATURE JALLAJALALOUHOU +FDFC ; 0 # Sc RIAL SIGN +FE00..FE0F ; 0 # Mn [16] VARIATION SELECTOR-1..VARIATION SELECTOR-16 +FE30 ; 0 # Po PRESENTATION FORM FOR VERTICAL TWO DOT LEADER +FE31..FE32 ; 0 # Pd [2] PRESENTATION FORM FOR VERTICAL EM DASH..PRESENTATION FORM FOR VERTICAL EN DASH +FE33..FE34 ; 0 # Pc [2] PRESENTATION FORM FOR VERTICAL LOW LINE..PRESENTATION FORM FOR VERTICAL WAVY LOW LINE +FE35 ; 0 # Ps PRESENTATION FORM FOR VERTICAL LEFT PARENTHESIS +FE36 ; 0 # Pe PRESENTATION FORM FOR VERTICAL RIGHT PARENTHESIS +FE37 ; 0 # Ps PRESENTATION FORM FOR VERTICAL LEFT CURLY BRACKET +FE38 ; 0 # Pe PRESENTATION FORM FOR VERTICAL RIGHT CURLY BRACKET +FE39 ; 0 # Ps PRESENTATION FORM FOR VERTICAL LEFT TORTOISE SHELL BRACKET +FE3A ; 0 # Pe PRESENTATION FORM FOR VERTICAL RIGHT TORTOISE SHELL BRACKET +FE3B ; 0 # Ps PRESENTATION FORM FOR VERTICAL LEFT BLACK LENTICULAR BRACKET +FE3C ; 0 # Pe PRESENTATION FORM FOR VERTICAL RIGHT BLACK LENTICULAR BRACKET +FE3D ; 0 # Ps PRESENTATION FORM FOR VERTICAL LEFT DOUBLE ANGLE BRACKET +FE3E ; 0 # Pe PRESENTATION FORM FOR VERTICAL RIGHT DOUBLE ANGLE BRACKET +FE3F ; 0 # Ps PRESENTATION FORM FOR VERTICAL LEFT ANGLE BRACKET +FE40 ; 0 # Pe PRESENTATION FORM FOR VERTICAL RIGHT ANGLE BRACKET +FE41 ; 0 # Ps PRESENTATION FORM FOR VERTICAL LEFT CORNER BRACKET +FE42 ; 0 # Pe PRESENTATION FORM FOR VERTICAL RIGHT CORNER BRACKET +FE43 ; 0 # Ps PRESENTATION FORM FOR VERTICAL LEFT WHITE CORNER BRACKET +FE44 ; 0 # Pe PRESENTATION FORM FOR VERTICAL RIGHT WHITE CORNER BRACKET +FE45..FE46 ; 0 # Po [2] SESAME DOT..WHITE SESAME DOT +FE49..FE4C ; 0 # Po [4] DASHED OVERLINE..DOUBLE WAVY OVERLINE +FE4D..FE4F ; 0 # Pc [3] DASHED LOW LINE..WAVY LOW LINE +FE50..FE52 ; 0 # Po [3] SMALL COMMA..SMALL FULL STOP +FE54..FE57 ; 0 # Po [4] SMALL SEMICOLON..SMALL EXCLAMATION MARK +FE58 ; 0 # Pd SMALL EM DASH +FE59 ; 0 # Ps SMALL LEFT PARENTHESIS +FE5A ; 0 # Pe SMALL RIGHT PARENTHESIS +FE5B ; 0 # Ps SMALL LEFT CURLY BRACKET +FE5C ; 0 # Pe SMALL RIGHT CURLY BRACKET +FE5D ; 0 # Ps SMALL LEFT TORTOISE SHELL BRACKET +FE5E ; 0 # Pe SMALL RIGHT TORTOISE SHELL BRACKET +FE5F..FE61 ; 0 # Po [3] SMALL NUMBER SIGN..SMALL ASTERISK +FE62 ; 0 # Sm SMALL PLUS SIGN +FE63 ; 0 # Pd SMALL HYPHEN-MINUS +FE64..FE66 ; 0 # Sm [3] SMALL LESS-THAN SIGN..SMALL EQUALS SIGN +FE68 ; 0 # Po SMALL REVERSE SOLIDUS +FE69 ; 0 # Sc SMALL DOLLAR SIGN +FE6A..FE6B ; 0 # Po [2] SMALL PERCENT SIGN..SMALL COMMERCIAL AT +FE70..FE74 ; 0 # Lo [5] ARABIC FATHATAN ISOLATED FORM..ARABIC KASRATAN ISOLATED FORM +FE76..FEFC ; 0 # Lo [135] ARABIC FATHA ISOLATED FORM..ARABIC LIGATURE LAM WITH ALEF FINAL FORM +FEFF ; 0 # Cf ZERO WIDTH NO-BREAK SPACE +FF01..FF03 ; 0 # Po [3] FULLWIDTH EXCLAMATION MARK..FULLWIDTH NUMBER SIGN +FF04 ; 0 # Sc FULLWIDTH DOLLAR SIGN +FF05..FF07 ; 0 # Po [3] FULLWIDTH PERCENT SIGN..FULLWIDTH APOSTROPHE +FF08 ; 0 # Ps FULLWIDTH LEFT PARENTHESIS +FF09 ; 0 # Pe FULLWIDTH RIGHT PARENTHESIS +FF0A ; 0 # Po FULLWIDTH ASTERISK +FF0B ; 0 # Sm FULLWIDTH PLUS SIGN +FF0C ; 0 # Po FULLWIDTH COMMA +FF0D ; 0 # Pd FULLWIDTH HYPHEN-MINUS +FF0E..FF0F ; 0 # Po [2] FULLWIDTH FULL STOP..FULLWIDTH SOLIDUS +FF10..FF19 ; 0 # Nd [10] FULLWIDTH DIGIT ZERO..FULLWIDTH DIGIT NINE +FF1A..FF1B ; 0 # Po [2] FULLWIDTH COLON..FULLWIDTH SEMICOLON +FF1C..FF1E ; 0 # Sm [3] FULLWIDTH LESS-THAN SIGN..FULLWIDTH GREATER-THAN SIGN +FF1F..FF20 ; 0 # Po [2] FULLWIDTH QUESTION MARK..FULLWIDTH COMMERCIAL AT +FF21..FF3A ; 0 # L& [26] FULLWIDTH LATIN CAPITAL LETTER A..FULLWIDTH LATIN CAPITAL LETTER Z +FF3B ; 0 # Ps FULLWIDTH LEFT SQUARE BRACKET +FF3C ; 0 # Po FULLWIDTH REVERSE SOLIDUS +FF3D ; 0 # Pe FULLWIDTH RIGHT SQUARE BRACKET +FF3E ; 0 # Sk FULLWIDTH CIRCUMFLEX ACCENT +FF3F ; 0 # Pc FULLWIDTH LOW LINE +FF40 ; 0 # Sk FULLWIDTH GRAVE ACCENT +FF41..FF5A ; 0 # L& [26] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH LATIN SMALL LETTER Z +FF5B ; 0 # Ps FULLWIDTH LEFT CURLY BRACKET +FF5C ; 0 # Sm FULLWIDTH VERTICAL LINE +FF5D ; 0 # Pe FULLWIDTH RIGHT CURLY BRACKET +FF5E ; 0 # Sm FULLWIDTH TILDE +FF5F ; 0 # Ps FULLWIDTH LEFT WHITE PARENTHESIS +FF60 ; 0 # Pe FULLWIDTH RIGHT WHITE PARENTHESIS +FF61 ; 0 # Po HALFWIDTH IDEOGRAPHIC FULL STOP +FF62 ; 0 # Ps HALFWIDTH LEFT CORNER BRACKET +FF63 ; 0 # Pe HALFWIDTH RIGHT CORNER BRACKET +FF64 ; 0 # Po HALFWIDTH IDEOGRAPHIC COMMA +FF65 ; 0 # Pc HALFWIDTH KATAKANA MIDDLE DOT +FF66..FF6F ; 0 # Lo [10] HALFWIDTH KATAKANA LETTER WO..HALFWIDTH KATAKANA LETTER SMALL TU +FF70 ; 0 # Lm HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK +FF71..FF9D ; 0 # Lo [45] HALFWIDTH KATAKANA LETTER A..HALFWIDTH KATAKANA LETTER N +FF9E..FF9F ; 0 # Lm [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK +FFA0..FFBE ; 0 # Lo [31] HALFWIDTH HANGUL FILLER..HALFWIDTH HANGUL LETTER HIEUH +FFC2..FFC7 ; 0 # Lo [6] HALFWIDTH HANGUL LETTER A..HALFWIDTH HANGUL LETTER E +FFCA..FFCF ; 0 # Lo [6] HALFWIDTH HANGUL LETTER YEO..HALFWIDTH HANGUL LETTER OE +FFD2..FFD7 ; 0 # Lo [6] HALFWIDTH HANGUL LETTER YO..HALFWIDTH HANGUL LETTER YU +FFDA..FFDC ; 0 # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL LETTER I +FFE0..FFE1 ; 0 # Sc [2] FULLWIDTH CENT SIGN..FULLWIDTH POUND SIGN +FFE2 ; 0 # Sm FULLWIDTH NOT SIGN +FFE3 ; 0 # Sk FULLWIDTH MACRON +FFE4 ; 0 # So FULLWIDTH BROKEN BAR +FFE5..FFE6 ; 0 # Sc [2] FULLWIDTH YEN SIGN..FULLWIDTH WON SIGN +FFE8 ; 0 # So HALFWIDTH FORMS LIGHT VERTICAL +FFE9..FFEC ; 0 # Sm [4] HALFWIDTH LEFTWARDS ARROW..HALFWIDTH DOWNWARDS ARROW +FFED..FFEE ; 0 # So [2] HALFWIDTH BLACK SQUARE..HALFWIDTH WHITE CIRCLE +FFF9..FFFB ; 0 # Cf [3] INTERLINEAR ANNOTATION ANCHOR..INTERLINEAR ANNOTATION TERMINATOR +FFFC..FFFD ; 0 # So [2] OBJECT REPLACEMENT CHARACTER..REPLACEMENT CHARACTER +10300..1031E ; 0 # Lo [31] OLD ITALIC LETTER A..OLD ITALIC LETTER UU +10320..10323 ; 0 # No [4] OLD ITALIC NUMERAL ONE..OLD ITALIC NUMERAL FIFTY +10330..10349 ; 0 # Lo [26] GOTHIC LETTER AHSA..GOTHIC LETTER OTHAL +1034A ; 0 # Nl GOTHIC LETTER NINE HUNDRED +10400..10425 ; 0 # L& [38] DESERET CAPITAL LETTER LONG I..DESERET CAPITAL LETTER ENG +10428..1044D ; 0 # L& [38] DESERET SMALL LETTER LONG I..DESERET SMALL LETTER ENG +1D000..1D0F5 ; 0 # So [246] BYZANTINE MUSICAL SYMBOL PSILI..BYZANTINE MUSICAL SYMBOL GORGON NEO KATO +1D100..1D126 ; 0 # So [39] MUSICAL SYMBOL SINGLE BARLINE..MUSICAL SYMBOL DRUM CLEF-2 +1D12A..1D164 ; 0 # So [59] MUSICAL SYMBOL DOUBLE SHARP..MUSICAL SYMBOL ONE HUNDRED TWENTY-EIGHTH NOTE +1D16A..1D16C ; 0 # So [3] MUSICAL SYMBOL FINGERED TREMOLO-1..MUSICAL SYMBOL FINGERED TREMOLO-3 +1D173..1D17A ; 0 # Cf [8] MUSICAL SYMBOL BEGIN BEAM..MUSICAL SYMBOL END PHRASE +1D183..1D184 ; 0 # So [2] MUSICAL SYMBOL ARPEGGIATO UP..MUSICAL SYMBOL ARPEGGIATO DOWN +1D18C..1D1A9 ; 0 # So [30] MUSICAL SYMBOL RINFORZANDO..MUSICAL SYMBOL DEGREE SLASH +1D1AE..1D1DD ; 0 # So [48] MUSICAL SYMBOL PEDAL MARK..MUSICAL SYMBOL PES SUBPUNCTIS +1D400..1D454 ; 0 # L& [85] MATHEMATICAL BOLD CAPITAL A..MATHEMATICAL ITALIC SMALL G +1D456..1D49C ; 0 # L& [71] MATHEMATICAL ITALIC SMALL I..MATHEMATICAL SCRIPT CAPITAL A +1D49E..1D49F ; 0 # L& [2] MATHEMATICAL SCRIPT CAPITAL C..MATHEMATICAL SCRIPT CAPITAL D +1D4A2 ; 0 # L& MATHEMATICAL SCRIPT CAPITAL G +1D4A5..1D4A6 ; 0 # L& [2] MATHEMATICAL SCRIPT CAPITAL J..MATHEMATICAL SCRIPT CAPITAL K +1D4A9..1D4AC ; 0 # L& [4] MATHEMATICAL SCRIPT CAPITAL N..MATHEMATICAL SCRIPT CAPITAL Q +1D4AE..1D4B9 ; 0 # L& [12] MATHEMATICAL SCRIPT CAPITAL S..MATHEMATICAL SCRIPT SMALL D +1D4BB ; 0 # L& MATHEMATICAL SCRIPT SMALL F +1D4BD..1D4C0 ; 0 # L& [4] MATHEMATICAL SCRIPT SMALL H..MATHEMATICAL SCRIPT SMALL K +1D4C2..1D4C3 ; 0 # L& [2] MATHEMATICAL SCRIPT SMALL M..MATHEMATICAL SCRIPT SMALL N +1D4C5..1D505 ; 0 # L& [65] MATHEMATICAL SCRIPT SMALL P..MATHEMATICAL FRAKTUR CAPITAL B +1D507..1D50A ; 0 # L& [4] MATHEMATICAL FRAKTUR CAPITAL D..MATHEMATICAL FRAKTUR CAPITAL G +1D50D..1D514 ; 0 # L& [8] MATHEMATICAL FRAKTUR CAPITAL J..MATHEMATICAL FRAKTUR CAPITAL Q +1D516..1D51C ; 0 # L& [7] MATHEMATICAL FRAKTUR CAPITAL S..MATHEMATICAL FRAKTUR CAPITAL Y +1D51E..1D539 ; 0 # L& [28] MATHEMATICAL FRAKTUR SMALL A..MATHEMATICAL DOUBLE-STRUCK CAPITAL B +1D53B..1D53E ; 0 # L& [4] MATHEMATICAL DOUBLE-STRUCK CAPITAL D..MATHEMATICAL DOUBLE-STRUCK CAPITAL G +1D540..1D544 ; 0 # L& [5] MATHEMATICAL DOUBLE-STRUCK CAPITAL I..MATHEMATICAL DOUBLE-STRUCK CAPITAL M +1D546 ; 0 # L& MATHEMATICAL DOUBLE-STRUCK CAPITAL O +1D54A..1D550 ; 0 # L& [7] MATHEMATICAL DOUBLE-STRUCK CAPITAL S..MATHEMATICAL DOUBLE-STRUCK CAPITAL Y +1D552..1D6A3 ; 0 # L& [338] MATHEMATICAL DOUBLE-STRUCK SMALL A..MATHEMATICAL MONOSPACE SMALL Z +1D6A8..1D6C0 ; 0 # L& [25] MATHEMATICAL BOLD CAPITAL ALPHA..MATHEMATICAL BOLD CAPITAL OMEGA +1D6C1 ; 0 # Sm MATHEMATICAL BOLD NABLA +1D6C2..1D6DA ; 0 # L& [25] MATHEMATICAL BOLD SMALL ALPHA..MATHEMATICAL BOLD SMALL OMEGA +1D6DB ; 0 # Sm MATHEMATICAL BOLD PARTIAL DIFFERENTIAL +1D6DC..1D6FA ; 0 # L& [31] MATHEMATICAL BOLD EPSILON SYMBOL..MATHEMATICAL ITALIC CAPITAL OMEGA +1D6FB ; 0 # Sm MATHEMATICAL ITALIC NABLA +1D6FC..1D714 ; 0 # L& [25] MATHEMATICAL ITALIC SMALL ALPHA..MATHEMATICAL ITALIC SMALL OMEGA +1D715 ; 0 # Sm MATHEMATICAL ITALIC PARTIAL DIFFERENTIAL +1D716..1D734 ; 0 # L& [31] MATHEMATICAL ITALIC EPSILON SYMBOL..MATHEMATICAL BOLD ITALIC CAPITAL OMEGA +1D735 ; 0 # Sm MATHEMATICAL BOLD ITALIC NABLA +1D736..1D74E ; 0 # L& [25] MATHEMATICAL BOLD ITALIC SMALL ALPHA..MATHEMATICAL BOLD ITALIC SMALL OMEGA +1D74F ; 0 # Sm MATHEMATICAL BOLD ITALIC PARTIAL DIFFERENTIAL +1D750..1D76E ; 0 # L& [31] MATHEMATICAL BOLD ITALIC EPSILON SYMBOL..MATHEMATICAL SANS-SERIF BOLD CAPITAL OMEGA +1D76F ; 0 # Sm MATHEMATICAL SANS-SERIF BOLD NABLA +1D770..1D788 ; 0 # L& [25] MATHEMATICAL SANS-SERIF BOLD SMALL ALPHA..MATHEMATICAL SANS-SERIF BOLD SMALL OMEGA +1D789 ; 0 # Sm MATHEMATICAL SANS-SERIF BOLD PARTIAL DIFFERENTIAL +1D78A..1D7A8 ; 0 # L& [31] MATHEMATICAL SANS-SERIF BOLD EPSILON SYMBOL..MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL OMEGA +1D7A9 ; 0 # Sm MATHEMATICAL SANS-SERIF BOLD ITALIC NABLA +1D7AA..1D7C2 ; 0 # L& [25] MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ALPHA..MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL OMEGA +1D7C3 ; 0 # Sm MATHEMATICAL SANS-SERIF BOLD ITALIC PARTIAL DIFFERENTIAL +1D7C4..1D7C9 ; 0 # L& [6] MATHEMATICAL SANS-SERIF BOLD ITALIC EPSILON SYMBOL..MATHEMATICAL SANS-SERIF BOLD ITALIC PI SYMBOL +1D7CE..1D7FF ; 0 # Nd [50] MATHEMATICAL BOLD DIGIT ZERO..MATHEMATICAL MONOSPACE DIGIT NINE +20000..2A6D6 ; 0 # Lo [42711] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6D6 +2F800..2FA1D ; 0 # Lo [542] CJK COMPATIBILITY IDEOGRAPH-2F800..CJK COMPATIBILITY IDEOGRAPH-2FA1D +E0001 ; 0 # Cf LANGUAGE TAG +E0020..E007F ; 0 # Cf [96] TAG SPACE..CANCEL TAG +F0000..FFFFD ; 0 # Co [65534] +100000..10FFFD; 0 # Co [65534] + +# Total code points: 234410 + +# ================================================ + +# Overlay + +0334..0338 ; 1 # Mn [5] COMBINING TILDE OVERLAY..COMBINING LONG SOLIDUS OVERLAY +20D2..20D3 ; 1 # Mn [2] COMBINING LONG VERTICAL LINE OVERLAY..COMBINING SHORT VERTICAL LINE OVERLAY +20D8..20DA ; 1 # Mn [3] COMBINING RING OVERLAY..COMBINING ANTICLOCKWISE RING OVERLAY +20E5..20E6 ; 1 # Mn [2] COMBINING REVERSE SOLIDUS OVERLAY..COMBINING DOUBLE VERTICAL STROKE OVERLAY +20EA ; 1 # Mn COMBINING LEFTWARDS ARROW OVERLAY +1D167..1D169 ; 1 # Mn [3] MUSICAL SYMBOL COMBINING TREMOLO-1..MUSICAL SYMBOL COMBINING TREMOLO-3 + +# Total code points: 16 + +# ================================================ + +# Nukta + +093C ; 7 # Mn DEVANAGARI SIGN NUKTA +09BC ; 7 # Mn BENGALI SIGN NUKTA +0A3C ; 7 # Mn GURMUKHI SIGN NUKTA +0ABC ; 7 # Mn GUJARATI SIGN NUKTA +0B3C ; 7 # Mn ORIYA SIGN NUKTA +1037 ; 7 # Mn MYANMAR SIGN DOT BELOW + +# Total code points: 6 + +# ================================================ + +# KanaVoicing + +3099..309A ; 8 # Mn [2] COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK..COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK + +# Total code points: 2 + +# ================================================ + +# Virama + +094D ; 9 # Mn DEVANAGARI SIGN VIRAMA +09CD ; 9 # Mn BENGALI SIGN VIRAMA +0A4D ; 9 # Mn GURMUKHI SIGN VIRAMA +0ACD ; 9 # Mn GUJARATI SIGN VIRAMA +0B4D ; 9 # Mn ORIYA SIGN VIRAMA +0BCD ; 9 # Mn TAMIL SIGN VIRAMA +0C4D ; 9 # Mn TELUGU SIGN VIRAMA +0CCD ; 9 # Mn KANNADA SIGN VIRAMA +0D4D ; 9 # Mn MALAYALAM SIGN VIRAMA +0DCA ; 9 # Mn SINHALA SIGN AL-LAKUNA +0E3A ; 9 # Mn THAI CHARACTER PHINTHU +0F84 ; 9 # Mn TIBETAN MARK HALANTA +1039 ; 9 # Mn MYANMAR SIGN VIRAMA +1714 ; 9 # Mn TAGALOG SIGN VIRAMA +1734 ; 9 # Mn HANUNOO SIGN PAMUDPOD +17D2 ; 9 # Mn KHMER SIGN COENG + +# Total code points: 16 + +# ================================================ + +# Other Combining Class + +05B0 ; 10 # Mn HEBREW POINT SHEVA + +# Total code points: 1 + +# ================================================ + +# Other Combining Class + +05B1 ; 11 # Mn HEBREW POINT HATAF SEGOL + +# Total code points: 1 + +# ================================================ + +# Other Combining Class + +05B2 ; 12 # Mn HEBREW POINT HATAF PATAH + +# Total code points: 1 + +# ================================================ + +# Other Combining Class + +05B3 ; 13 # Mn HEBREW POINT HATAF QAMATS + +# Total code points: 1 + +# ================================================ + +# Other Combining Class + +05B4 ; 14 # Mn HEBREW POINT HIRIQ + +# Total code points: 1 + +# ================================================ + +# Other Combining Class + +05B5 ; 15 # Mn HEBREW POINT TSERE + +# Total code points: 1 + +# ================================================ + +# Other Combining Class + +05B6 ; 16 # Mn HEBREW POINT SEGOL + +# Total code points: 1 + +# ================================================ + +# Other Combining Class + +05B7 ; 17 # Mn HEBREW POINT PATAH + +# Total code points: 1 + +# ================================================ + +# Other Combining Class + +05B8 ; 18 # Mn HEBREW POINT QAMATS + +# Total code points: 1 + +# ================================================ + +# Other Combining Class + +05B9 ; 19 # Mn HEBREW POINT HOLAM + +# Total code points: 1 + +# ================================================ + +# Other Combining Class + +05BB ; 20 # Mn HEBREW POINT QUBUTS + +# Total code points: 1 + +# ================================================ + +# Other Combining Class + +05BC ; 21 # Mn HEBREW POINT DAGESH OR MAPIQ + +# Total code points: 1 + +# ================================================ + +# Other Combining Class + +05BD ; 22 # Mn HEBREW POINT METEG + +# Total code points: 1 + +# ================================================ + +# Other Combining Class + +05BF ; 23 # Mn HEBREW POINT RAFE + +# Total code points: 1 + +# ================================================ + +# Other Combining Class + +05C1 ; 24 # Mn HEBREW POINT SHIN DOT + +# Total code points: 1 + +# ================================================ + +# Other Combining Class + +05C2 ; 25 # Mn HEBREW POINT SIN DOT + +# Total code points: 1 + +# ================================================ + +# Other Combining Class + +FB1E ; 26 # Mn HEBREW POINT JUDEO-SPANISH VARIKA + +# Total code points: 1 + +# ================================================ + +# Other Combining Class + +064B ; 27 # Mn ARABIC FATHATAN + +# Total code points: 1 + +# ================================================ + +# Other Combining Class + +064C ; 28 # Mn ARABIC DAMMATAN + +# Total code points: 1 + +# ================================================ + +# Other Combining Class + +064D ; 29 # Mn ARABIC KASRATAN + +# Total code points: 1 + +# ================================================ + +# Other Combining Class + +064E ; 30 # Mn ARABIC FATHA + +# Total code points: 1 + +# ================================================ + +# Other Combining Class + +064F ; 31 # Mn ARABIC DAMMA + +# Total code points: 1 + +# ================================================ + +# Other Combining Class + +0650 ; 32 # Mn ARABIC KASRA + +# Total code points: 1 + +# ================================================ + +# Other Combining Class + +0651 ; 33 # Mn ARABIC SHADDA + +# Total code points: 1 + +# ================================================ + +# Other Combining Class + +0652 ; 34 # Mn ARABIC SUKUN + +# Total code points: 1 + +# ================================================ + +# Other Combining Class + +0670 ; 35 # Mn ARABIC LETTER SUPERSCRIPT ALEF + +# Total code points: 1 + +# ================================================ + +# Other Combining Class + +0711 ; 36 # Mn SYRIAC LETTER SUPERSCRIPT ALAPH + +# Total code points: 1 + +# ================================================ + +# Other Combining Class + +0C55 ; 84 # Mn TELUGU LENGTH MARK + +# Total code points: 1 + +# ================================================ + +# Other Combining Class + +0C56 ; 91 # Mn TELUGU AI LENGTH MARK + +# Total code points: 1 + +# ================================================ + +# Other Combining Class + +0E38..0E39 ; 103 # Mn [2] THAI CHARACTER SARA U..THAI CHARACTER SARA UU + +# Total code points: 2 + +# ================================================ + +# Other Combining Class + +0E48..0E4B ; 107 # Mn [4] THAI CHARACTER MAI EK..THAI CHARACTER MAI CHATTAWA + +# Total code points: 4 + +# ================================================ + +# Other Combining Class + +0EB8..0EB9 ; 118 # Mn [2] LAO VOWEL SIGN U..LAO VOWEL SIGN UU + +# Total code points: 2 + +# ================================================ + +# Other Combining Class + +0EC8..0ECB ; 122 # Mn [4] LAO TONE MAI EK..LAO TONE MAI CATAWA + +# Total code points: 4 + +# ================================================ + +# Other Combining Class + +0F71 ; 129 # Mn TIBETAN VOWEL SIGN AA + +# Total code points: 1 + +# ================================================ + +# Other Combining Class + +0F72 ; 130 # Mn TIBETAN VOWEL SIGN I +0F7A..0F7D ; 130 # Mn [4] TIBETAN VOWEL SIGN E..TIBETAN VOWEL SIGN OO +0F80 ; 130 # Mn TIBETAN VOWEL SIGN REVERSED I + +# Total code points: 6 + +# ================================================ + +# Other Combining Class + +0F74 ; 132 # Mn TIBETAN VOWEL SIGN U + +# Total code points: 1 + +# ================================================ + +# AttachedBelowLeft + +0321..0322 ; 202 # Mn [2] COMBINING PALATALIZED HOOK BELOW..COMBINING RETROFLEX HOOK BELOW +0327..0328 ; 202 # Mn [2] COMBINING CEDILLA..COMBINING OGONEK + +# Total code points: 4 + +# ================================================ + +# AttachedAboveRight + +031B ; 216 # Mn COMBINING HORN +0F39 ; 216 # Mn TIBETAN MARK TSA -PHRU +1D165..1D166 ; 216 # Mc [2] MUSICAL SYMBOL COMBINING STEM..MUSICAL SYMBOL COMBINING SPRECHGESANG STEM +1D16E..1D172 ; 216 # Mc [5] MUSICAL SYMBOL COMBINING FLAG-1..MUSICAL SYMBOL COMBINING FLAG-5 + +# Total code points: 9 + +# ================================================ + +# BelowLeft + +302A ; 218 # Mn IDEOGRAPHIC LEVEL TONE MARK + +# Total code points: 1 + +# ================================================ + +# Below + +0316..0319 ; 220 # Mn [4] COMBINING GRAVE ACCENT BELOW..COMBINING RIGHT TACK BELOW +031C..0320 ; 220 # Mn [5] COMBINING LEFT HALF RING BELOW..COMBINING MINUS SIGN BELOW +0323..0326 ; 220 # Mn [4] COMBINING DOT BELOW..COMBINING COMMA BELOW +0329..0333 ; 220 # Mn [11] COMBINING VERTICAL LINE BELOW..COMBINING DOUBLE LOW LINE +0339..033C ; 220 # Mn [4] COMBINING RIGHT HALF RING BELOW..COMBINING SEAGULL BELOW +0347..0349 ; 220 # Mn [3] COMBINING EQUALS SIGN BELOW..COMBINING LEFT ANGLE BELOW +034D..034E ; 220 # Mn [2] COMBINING LEFT RIGHT ARROW BELOW..COMBINING UPWARDS ARROW BELOW +0591 ; 220 # Mn HEBREW ACCENT ETNAHTA +0596 ; 220 # Mn HEBREW ACCENT TIPEHA +059B ; 220 # Mn HEBREW ACCENT TEVIR +05A3..05A7 ; 220 # Mn [5] HEBREW ACCENT MUNAH..HEBREW ACCENT DARGA +05AA ; 220 # Mn HEBREW ACCENT YERAH BEN YOMO +0655 ; 220 # Mn ARABIC HAMZA BELOW +06E3 ; 220 # Mn ARABIC SMALL LOW SEEN +06EA ; 220 # Mn ARABIC EMPTY CENTRE LOW STOP +06ED ; 220 # Mn ARABIC SMALL LOW MEEM +0731 ; 220 # Mn SYRIAC PTHAHA BELOW +0734 ; 220 # Mn SYRIAC ZQAPHA BELOW +0737..0739 ; 220 # Mn [3] SYRIAC RBASA BELOW..SYRIAC DOTTED ZLAMA ANGULAR +073B..073C ; 220 # Mn [2] SYRIAC HBASA BELOW..SYRIAC HBASA-ESASA DOTTED +073E ; 220 # Mn SYRIAC ESASA BELOW +0742 ; 220 # Mn SYRIAC RUKKAKHA +0744 ; 220 # Mn SYRIAC TWO VERTICAL DOTS BELOW +0746 ; 220 # Mn SYRIAC THREE DOTS BELOW +0748 ; 220 # Mn SYRIAC OBLIQUE LINE BELOW +0952 ; 220 # Mn DEVANAGARI STRESS SIGN ANUDATTA +0F18..0F19 ; 220 # Mn [2] TIBETAN ASTROLOGICAL SIGN -KHYUD PA..TIBETAN ASTROLOGICAL SIGN SDONG TSHUGS +0F35 ; 220 # Mn TIBETAN MARK NGAS BZUNG NYI ZLA +0F37 ; 220 # Mn TIBETAN MARK NGAS BZUNG SGOR RTAGS +0FC6 ; 220 # Mn TIBETAN SYMBOL PADMA GDAN +20E8 ; 220 # Mn COMBINING TRIPLE UNDERDOT +1D17B..1D182 ; 220 # Mn [8] MUSICAL SYMBOL COMBINING ACCENT..MUSICAL SYMBOL COMBINING LOURE +1D18A..1D18B ; 220 # Mn [2] MUSICAL SYMBOL COMBINING DOUBLE TONGUE..MUSICAL SYMBOL COMBINING TRIPLE TONGUE + +# Total code points: 75 + +# ================================================ + +# BelowRight + +059A ; 222 # Mn HEBREW ACCENT YETIV +05AD ; 222 # Mn HEBREW ACCENT DEHI +302D ; 222 # Mn IDEOGRAPHIC ENTERING TONE MARK + +# Total code points: 3 + +# ================================================ + +# Left + +302E..302F ; 224 # Mn [2] HANGUL SINGLE DOT TONE MARK..HANGUL DOUBLE DOT TONE MARK + +# Total code points: 2 + +# ================================================ + +# Right + +1D16D ; 226 # Mc MUSICAL SYMBOL COMBINING AUGMENTATION DOT + +# Total code points: 1 + +# ================================================ + +# AboveLeft + +05AE ; 228 # Mn HEBREW ACCENT ZINOR +18A9 ; 228 # Mn MONGOLIAN LETTER ALI GALI DAGALGA +302B ; 228 # Mn IDEOGRAPHIC RISING TONE MARK + +# Total code points: 3 + +# ================================================ + +# Above + +0300..0314 ; 230 # Mn [21] COMBINING GRAVE ACCENT..COMBINING REVERSED COMMA ABOVE +033D..0344 ; 230 # Mn [8] COMBINING X ABOVE..COMBINING GREEK DIALYTIKA TONOS +0346 ; 230 # Mn COMBINING BRIDGE ABOVE +034A..034C ; 230 # Mn [3] COMBINING NOT TILDE ABOVE..COMBINING ALMOST EQUAL TO ABOVE +0363..036F ; 230 # Mn [13] COMBINING LATIN SMALL LETTER A..COMBINING LATIN SMALL LETTER X +0483..0486 ; 230 # Mn [4] COMBINING CYRILLIC TITLO..COMBINING CYRILLIC PSILI PNEUMATA +0592..0595 ; 230 # Mn [4] HEBREW ACCENT SEGOL..HEBREW ACCENT ZAQEF GADOL +0597..0599 ; 230 # Mn [3] HEBREW ACCENT REVIA..HEBREW ACCENT PASHTA +059C..05A1 ; 230 # Mn [6] HEBREW ACCENT GERESH..HEBREW ACCENT PAZER +05A8..05A9 ; 230 # Mn [2] HEBREW ACCENT QADMA..HEBREW ACCENT TELISHA QETANA +05AB..05AC ; 230 # Mn [2] HEBREW ACCENT OLE..HEBREW ACCENT ILUY +05AF ; 230 # Mn HEBREW MARK MASORA CIRCLE +05C4 ; 230 # Mn HEBREW MARK UPPER DOT +0653..0654 ; 230 # Mn [2] ARABIC MADDAH ABOVE..ARABIC HAMZA ABOVE +06D6..06DC ; 230 # Mn [7] ARABIC SMALL HIGH LIGATURE SAD WITH LAM WITH ALEF MAKSURA..ARABIC SMALL HIGH SEEN +06DF..06E2 ; 230 # Mn [4] ARABIC SMALL HIGH ROUNDED ZERO..ARABIC SMALL HIGH MEEM ISOLATED FORM +06E4 ; 230 # Mn ARABIC SMALL HIGH MADDA +06E7..06E8 ; 230 # Mn [2] ARABIC SMALL HIGH YEH..ARABIC SMALL HIGH NOON +06EB..06EC ; 230 # Mn [2] ARABIC EMPTY CENTRE HIGH STOP..ARABIC ROUNDED HIGH STOP WITH FILLED CENTRE +0730 ; 230 # Mn SYRIAC PTHAHA ABOVE +0732..0733 ; 230 # Mn [2] SYRIAC PTHAHA DOTTED..SYRIAC ZQAPHA ABOVE +0735..0736 ; 230 # Mn [2] SYRIAC ZQAPHA DOTTED..SYRIAC RBASA ABOVE +073A ; 230 # Mn SYRIAC HBASA ABOVE +073D ; 230 # Mn SYRIAC ESASA ABOVE +073F..0741 ; 230 # Mn [3] SYRIAC RWAHA..SYRIAC QUSHSHAYA +0743 ; 230 # Mn SYRIAC TWO VERTICAL DOTS ABOVE +0745 ; 230 # Mn SYRIAC THREE DOTS ABOVE +0747 ; 230 # Mn SYRIAC OBLIQUE LINE ABOVE +0749..074A ; 230 # Mn [2] SYRIAC MUSIC..SYRIAC BARREKH +0951 ; 230 # Mn DEVANAGARI STRESS SIGN UDATTA +0953..0954 ; 230 # Mn [2] DEVANAGARI GRAVE ACCENT..DEVANAGARI ACUTE ACCENT +0F82..0F83 ; 230 # Mn [2] TIBETAN SIGN NYI ZLA NAA DA..TIBETAN SIGN SNA LDAN +0F86..0F87 ; 230 # Mn [2] TIBETAN SIGN LCI RTAGS..TIBETAN SIGN YANG RTAGS +20D0..20D1 ; 230 # Mn [2] COMBINING LEFT HARPOON ABOVE..COMBINING RIGHT HARPOON ABOVE +20D4..20D7 ; 230 # Mn [4] COMBINING ANTICLOCKWISE ARROW ABOVE..COMBINING RIGHT ARROW ABOVE +20DB..20DC ; 230 # Mn [2] COMBINING THREE DOTS ABOVE..COMBINING FOUR DOTS ABOVE +20E1 ; 230 # Mn COMBINING LEFT RIGHT ARROW ABOVE +20E7 ; 230 # Mn COMBINING ANNUITY SYMBOL +20E9 ; 230 # Mn COMBINING WIDE BRIDGE ABOVE +FE20..FE23 ; 230 # Mn [4] COMBINING LIGATURE LEFT HALF..COMBINING DOUBLE TILDE RIGHT HALF +1D185..1D189 ; 230 # Mn [5] MUSICAL SYMBOL COMBINING DOIT..MUSICAL SYMBOL COMBINING BEND +1D1AA..1D1AD ; 230 # Mn [4] MUSICAL SYMBOL COMBINING DOWN BOW..MUSICAL SYMBOL COMBINING SNAP PIZZICATO + +# Total code points: 133 + +# ================================================ + +# AboveRight + +0315 ; 232 # Mn COMBINING COMMA ABOVE RIGHT +031A ; 232 # Mn COMBINING LEFT ANGLE ABOVE +302C ; 232 # Mn IDEOGRAPHIC DEPARTING TONE MARK + +# Total code points: 3 + +# ================================================ + +# DoubleBelow + +0362 ; 233 # Mn COMBINING DOUBLE RIGHTWARDS ARROW BELOW + +# Total code points: 1 + +# ================================================ + +# DoubleAbove + +0360..0361 ; 234 # Mn [2] COMBINING DOUBLE TILDE..COMBINING DOUBLE INVERTED BREVE + +# Total code points: 2 + +# ================================================ + +# IotaSubscript + +0345 ; 240 # Mn COMBINING GREEK YPOGEGRAMMENI + +# Total code points: 1 + diff --git a/crates/stdlib/unicode/ucd32/DerivedEastAsianWidth-3.2.0.txt b/crates/stdlib/unicode/ucd32/DerivedEastAsianWidth-3.2.0.txt new file mode 100644 index 000000000..391831c56 --- /dev/null +++ b/crates/stdlib/unicode/ucd32/DerivedEastAsianWidth-3.2.0.txt @@ -0,0 +1,1275 @@ +# DerivedEastAsianWidth-3.2.0.txt +# Date: 2002-03-19,23:30:47 GMT [MD] +# +# Unicode Character Database: Derived Property Data +# Generated algorithmically from the Unicode Character Database +# For documentation, see DerivedProperties.html +# Note: Unassigned and Noncharacter codepoints are omitted, +# except when listing Noncharacter or Cn. +# ================================================ + + +# ================================================ +# East Asian Width (listing EastAsianWidth.txt, field 1) +# ================================================ + +0000..001F ; N # Cc [32] .. +007F..009F ; N # Cc [33] .. +00A0 ; N # Zs NO-BREAK SPACE +00A9 ; N # So COPYRIGHT SIGN +00AB ; N # Pi LEFT-POINTING DOUBLE ANGLE QUOTATION MARK +00B5 ; N # L& MICRO SIGN +00BB ; N # Pf RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK +00C0..00C5 ; N # L& [6] LATIN CAPITAL LETTER A WITH GRAVE..LATIN CAPITAL LETTER A WITH RING ABOVE +00C7..00CF ; N # L& [9] LATIN CAPITAL LETTER C WITH CEDILLA..LATIN CAPITAL LETTER I WITH DIAERESIS +00D1..00D6 ; N # L& [6] LATIN CAPITAL LETTER N WITH TILDE..LATIN CAPITAL LETTER O WITH DIAERESIS +00D9..00DD ; N # L& [5] LATIN CAPITAL LETTER U WITH GRAVE..LATIN CAPITAL LETTER Y WITH ACUTE +00E2..00E5 ; N # L& [4] LATIN SMALL LETTER A WITH CIRCUMFLEX..LATIN SMALL LETTER A WITH RING ABOVE +00E7 ; N # L& LATIN SMALL LETTER C WITH CEDILLA +00EB ; N # L& LATIN SMALL LETTER E WITH DIAERESIS +00EE..00EF ; N # L& [2] LATIN SMALL LETTER I WITH CIRCUMFLEX..LATIN SMALL LETTER I WITH DIAERESIS +00F1 ; N # L& LATIN SMALL LETTER N WITH TILDE +00F4..00F6 ; N # L& [3] LATIN SMALL LETTER O WITH CIRCUMFLEX..LATIN SMALL LETTER O WITH DIAERESIS +00FB ; N # L& LATIN SMALL LETTER U WITH CIRCUMFLEX +00FD ; N # L& LATIN SMALL LETTER Y WITH ACUTE +00FF..0100 ; N # L& [2] LATIN SMALL LETTER Y WITH DIAERESIS..LATIN CAPITAL LETTER A WITH MACRON +0102..0110 ; N # L& [15] LATIN CAPITAL LETTER A WITH BREVE..LATIN CAPITAL LETTER D WITH STROKE +0112 ; N # L& LATIN CAPITAL LETTER E WITH MACRON +0114..011A ; N # L& [7] LATIN CAPITAL LETTER E WITH BREVE..LATIN CAPITAL LETTER E WITH CARON +011C..0125 ; N # L& [10] LATIN CAPITAL LETTER G WITH CIRCUMFLEX..LATIN SMALL LETTER H WITH CIRCUMFLEX +0128..012A ; N # L& [3] LATIN CAPITAL LETTER I WITH TILDE..LATIN CAPITAL LETTER I WITH MACRON +012C..0130 ; N # L& [5] LATIN CAPITAL LETTER I WITH BREVE..LATIN CAPITAL LETTER I WITH DOT ABOVE +0134..0137 ; N # L& [4] LATIN CAPITAL LETTER J WITH CIRCUMFLEX..LATIN SMALL LETTER K WITH CEDILLA +0139..013E ; N # L& [6] LATIN CAPITAL LETTER L WITH ACUTE..LATIN SMALL LETTER L WITH CARON +0143 ; N # L& LATIN CAPITAL LETTER N WITH ACUTE +0145..0147 ; N # L& [3] LATIN CAPITAL LETTER N WITH CEDILLA..LATIN CAPITAL LETTER N WITH CARON +014C ; N # L& LATIN CAPITAL LETTER O WITH MACRON +014E..0151 ; N # L& [4] LATIN CAPITAL LETTER O WITH BREVE..LATIN SMALL LETTER O WITH DOUBLE ACUTE +0154..0165 ; N # L& [18] LATIN CAPITAL LETTER R WITH ACUTE..LATIN SMALL LETTER T WITH CARON +0168..016A ; N # L& [3] LATIN CAPITAL LETTER U WITH TILDE..LATIN CAPITAL LETTER U WITH MACRON +016C..01BA ; N # L& [79] LATIN CAPITAL LETTER U WITH BREVE..LATIN SMALL LETTER EZH WITH TAIL +01BB ; N # Lo LATIN LETTER TWO WITH STROKE +01BC..01BF ; N # L& [4] LATIN CAPITAL LETTER TONE FIVE..LATIN LETTER WYNN +01C0..01C3 ; N # Lo [4] LATIN LETTER DENTAL CLICK..LATIN LETTER RETROFLEX CLICK +01C4..01CD ; N # L& [10] LATIN CAPITAL LETTER DZ WITH CARON..LATIN CAPITAL LETTER A WITH CARON +01CF ; N # L& LATIN CAPITAL LETTER I WITH CARON +01D1 ; N # L& LATIN CAPITAL LETTER O WITH CARON +01D3 ; N # L& LATIN CAPITAL LETTER U WITH CARON +01D5 ; N # L& LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON +01D7 ; N # L& LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE +01D9 ; N # L& LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON +01DB ; N # L& LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE +01DD..0220 ; N # L& [68] LATIN SMALL LETTER TURNED E..LATIN CAPITAL LETTER N WITH LONG RIGHT LEG +0222..0233 ; N # L& [18] LATIN CAPITAL LETTER OU..LATIN SMALL LETTER Y WITH MACRON +0250 ; N # L& LATIN SMALL LETTER TURNED A +0252..0260 ; N # L& [15] LATIN SMALL LETTER TURNED ALPHA..LATIN SMALL LETTER G WITH HOOK +0262..02AD ; N # L& [76] LATIN LETTER SMALL CAPITAL G..LATIN LETTER BIDENTAL PERCUSSIVE +02B0..02B8 ; N # Lm [9] MODIFIER LETTER SMALL H..MODIFIER LETTER SMALL Y +02B9..02BA ; N # Sk [2] MODIFIER LETTER PRIME..MODIFIER LETTER DOUBLE PRIME +02BB..02C1 ; N # Lm [7] MODIFIER LETTER TURNED COMMA..MODIFIER LETTER REVERSED GLOTTAL STOP +02C2..02C3 ; N # Sk [2] MODIFIER LETTER LEFT ARROWHEAD..MODIFIER LETTER RIGHT ARROWHEAD +02C5..02C6 ; N # Sk [2] MODIFIER LETTER DOWN ARROWHEAD..MODIFIER LETTER CIRCUMFLEX ACCENT +02C8 ; N # Sk MODIFIER LETTER VERTICAL LINE +02CC ; N # Sk MODIFIER LETTER LOW VERTICAL LINE +02CE..02CF ; N # Sk [2] MODIFIER LETTER LOW GRAVE ACCENT..MODIFIER LETTER LOW ACUTE ACCENT +02D1 ; N # Lm MODIFIER LETTER HALF TRIANGULAR COLON +02D2..02D7 ; N # Sk [6] MODIFIER LETTER CENTRED RIGHT HALF RING..MODIFIER LETTER MINUS SIGN +02DC ; N # Sk SMALL TILDE +02DE ; N # Sk MODIFIER LETTER RHOTIC HOOK +02E0..02E4 ; N # Lm [5] MODIFIER LETTER SMALL GAMMA..MODIFIER LETTER SMALL REVERSED GLOTTAL STOP +02E5..02ED ; N # Sk [9] MODIFIER LETTER EXTRA-HIGH TONE BAR..MODIFIER LETTER UNASPIRATED +02EE ; N # Lm MODIFIER LETTER DOUBLE APOSTROPHE +0374..0375 ; N # Sk [2] GREEK NUMERAL SIGN..GREEK LOWER NUMERAL SIGN +037A ; N # Lm GREEK YPOGEGRAMMENI +037E ; N # Po GREEK QUESTION MARK +0384..0385 ; N # Sk [2] GREEK TONOS..GREEK DIALYTIKA TONOS +0386 ; N # L& GREEK CAPITAL LETTER ALPHA WITH TONOS +0387 ; N # Po GREEK ANO TELEIA +0388..038A ; N # L& [3] GREEK CAPITAL LETTER EPSILON WITH TONOS..GREEK CAPITAL LETTER IOTA WITH TONOS +038C ; N # L& GREEK CAPITAL LETTER OMICRON WITH TONOS +038E..0390 ; N # L& [3] GREEK CAPITAL LETTER UPSILON WITH TONOS..GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS +03AA..03B0 ; N # L& [7] GREEK CAPITAL LETTER IOTA WITH DIALYTIKA..GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS +03C2 ; N # L& GREEK SMALL LETTER FINAL SIGMA +03CA..03CE ; N # L& [5] GREEK SMALL LETTER IOTA WITH DIALYTIKA..GREEK SMALL LETTER OMEGA WITH TONOS +03D0..03F5 ; N # L& [38] GREEK BETA SYMBOL..GREEK LUNATE EPSILON SYMBOL +03F6 ; N # Sm GREEK REVERSED LUNATE EPSILON SYMBOL +0400 ; N # L& CYRILLIC CAPITAL LETTER IE WITH GRAVE +0402..040F ; N # L& [14] CYRILLIC CAPITAL LETTER DJE..CYRILLIC CAPITAL LETTER DZHE +0450 ; N # L& CYRILLIC SMALL LETTER IE WITH GRAVE +0452..0481 ; N # L& [48] CYRILLIC SMALL LETTER DJE..CYRILLIC SMALL LETTER KOPPA +0482 ; N # So CYRILLIC THOUSANDS SIGN +0483..0486 ; N # Mn [4] COMBINING CYRILLIC TITLO..COMBINING CYRILLIC PSILI PNEUMATA +0488..0489 ; N # Me [2] COMBINING CYRILLIC HUNDRED THOUSANDS SIGN..COMBINING CYRILLIC MILLIONS SIGN +048A..04CE ; N # L& [69] CYRILLIC CAPITAL LETTER SHORT I WITH TAIL..CYRILLIC SMALL LETTER EM WITH TAIL +04D0..04F5 ; N # L& [38] CYRILLIC CAPITAL LETTER A WITH BREVE..CYRILLIC SMALL LETTER CHE WITH DIAERESIS +04F8..04F9 ; N # L& [2] CYRILLIC CAPITAL LETTER YERU WITH DIAERESIS..CYRILLIC SMALL LETTER YERU WITH DIAERESIS +0500..050F ; N # L& [16] CYRILLIC CAPITAL LETTER KOMI DE..CYRILLIC SMALL LETTER KOMI TJE +0531..0556 ; N # L& [38] ARMENIAN CAPITAL LETTER AYB..ARMENIAN CAPITAL LETTER FEH +0559 ; N # Lm ARMENIAN MODIFIER LETTER LEFT HALF RING +055A..055F ; N # Po [6] ARMENIAN APOSTROPHE..ARMENIAN ABBREVIATION MARK +0561..0587 ; N # L& [39] ARMENIAN SMALL LETTER AYB..ARMENIAN SMALL LIGATURE ECH YIWN +0589 ; N # Po ARMENIAN FULL STOP +058A ; N # Pd ARMENIAN HYPHEN +0591..05A1 ; N # Mn [17] HEBREW ACCENT ETNAHTA..HEBREW ACCENT PAZER +05A3..05B9 ; N # Mn [23] HEBREW ACCENT MUNAH..HEBREW POINT HOLAM +05BB..05BD ; N # Mn [3] HEBREW POINT QUBUTS..HEBREW POINT METEG +05BE ; N # Po HEBREW PUNCTUATION MAQAF +05BF ; N # Mn HEBREW POINT RAFE +05C0 ; N # Po HEBREW PUNCTUATION PASEQ +05C1..05C2 ; N # Mn [2] HEBREW POINT SHIN DOT..HEBREW POINT SIN DOT +05C3 ; N # Po HEBREW PUNCTUATION SOF PASUQ +05C4 ; N # Mn HEBREW MARK UPPER DOT +05D0..05EA ; N # Lo [27] HEBREW LETTER ALEF..HEBREW LETTER TAV +05F0..05F2 ; N # Lo [3] HEBREW LIGATURE YIDDISH DOUBLE VAV..HEBREW LIGATURE YIDDISH DOUBLE YOD +05F3..05F4 ; N # Po [2] HEBREW PUNCTUATION GERESH..HEBREW PUNCTUATION GERSHAYIM +060C ; N # Po ARABIC COMMA +061B ; N # Po ARABIC SEMICOLON +061F ; N # Po ARABIC QUESTION MARK +0621..063A ; N # Lo [26] ARABIC LETTER HAMZA..ARABIC LETTER GHAIN +0640 ; N # Lm ARABIC TATWEEL +0641..064A ; N # Lo [10] ARABIC LETTER FEH..ARABIC LETTER YEH +064B..0655 ; N # Mn [11] ARABIC FATHATAN..ARABIC HAMZA BELOW +0660..0669 ; N # Nd [10] ARABIC-INDIC DIGIT ZERO..ARABIC-INDIC DIGIT NINE +066A..066D ; N # Po [4] ARABIC PERCENT SIGN..ARABIC FIVE POINTED STAR +066E..066F ; N # Lo [2] ARABIC LETTER DOTLESS BEH..ARABIC LETTER DOTLESS QAF +0670 ; N # Mn ARABIC LETTER SUPERSCRIPT ALEF +0671..06D3 ; N # Lo [99] ARABIC LETTER ALEF WASLA..ARABIC LETTER YEH BARREE WITH HAMZA ABOVE +06D4 ; N # Po ARABIC FULL STOP +06D5 ; N # Lo ARABIC LETTER AE +06D6..06DC ; N # Mn [7] ARABIC SMALL HIGH LIGATURE SAD WITH LAM WITH ALEF MAKSURA..ARABIC SMALL HIGH SEEN +06DD ; N # Cf ARABIC END OF AYAH +06DE ; N # Me ARABIC START OF RUB EL HIZB +06DF..06E4 ; N # Mn [6] ARABIC SMALL HIGH ROUNDED ZERO..ARABIC SMALL HIGH MADDA +06E5..06E6 ; N # Lm [2] ARABIC SMALL WAW..ARABIC SMALL YEH +06E7..06E8 ; N # Mn [2] ARABIC SMALL HIGH YEH..ARABIC SMALL HIGH NOON +06E9 ; N # So ARABIC PLACE OF SAJDAH +06EA..06ED ; N # Mn [4] ARABIC EMPTY CENTRE LOW STOP..ARABIC SMALL LOW MEEM +06F0..06F9 ; N # Nd [10] EXTENDED ARABIC-INDIC DIGIT ZERO..EXTENDED ARABIC-INDIC DIGIT NINE +06FA..06FC ; N # Lo [3] ARABIC LETTER SHEEN WITH DOT BELOW..ARABIC LETTER GHAIN WITH DOT BELOW +06FD..06FE ; N # So [2] ARABIC SIGN SINDHI AMPERSAND..ARABIC SIGN SINDHI POSTPOSITION MEN +0700..070D ; N # Po [14] SYRIAC END OF PARAGRAPH..SYRIAC HARKLEAN ASTERISCUS +070F ; N # Cf SYRIAC ABBREVIATION MARK +0710 ; N # Lo SYRIAC LETTER ALAPH +0711 ; N # Mn SYRIAC LETTER SUPERSCRIPT ALAPH +0712..072C ; N # Lo [27] SYRIAC LETTER BETH..SYRIAC LETTER TAW +0730..074A ; N # Mn [27] SYRIAC PTHAHA ABOVE..SYRIAC BARREKH +0780..07A5 ; N # Lo [38] THAANA LETTER HAA..THAANA LETTER WAAVU +07A6..07B0 ; N # Mn [11] THAANA ABAFILI..THAANA SUKUN +07B1 ; N # Lo THAANA LETTER NAA +0901..0902 ; N # Mn [2] DEVANAGARI SIGN CANDRABINDU..DEVANAGARI SIGN ANUSVARA +0903 ; N # Mc DEVANAGARI SIGN VISARGA +0905..0939 ; N # Lo [53] DEVANAGARI LETTER A..DEVANAGARI LETTER HA +093C ; N # Mn DEVANAGARI SIGN NUKTA +093D ; N # Lo DEVANAGARI SIGN AVAGRAHA +093E..0940 ; N # Mc [3] DEVANAGARI VOWEL SIGN AA..DEVANAGARI VOWEL SIGN II +0941..0948 ; N # Mn [8] DEVANAGARI VOWEL SIGN U..DEVANAGARI VOWEL SIGN AI +0949..094C ; N # Mc [4] DEVANAGARI VOWEL SIGN CANDRA O..DEVANAGARI VOWEL SIGN AU +094D ; N # Mn DEVANAGARI SIGN VIRAMA +0950 ; N # Lo DEVANAGARI OM +0951..0954 ; N # Mn [4] DEVANAGARI STRESS SIGN UDATTA..DEVANAGARI ACUTE ACCENT +0958..0961 ; N # Lo [10] DEVANAGARI LETTER QA..DEVANAGARI LETTER VOCALIC LL +0962..0963 ; N # Mn [2] DEVANAGARI VOWEL SIGN VOCALIC L..DEVANAGARI VOWEL SIGN VOCALIC LL +0964..0965 ; N # Po [2] DEVANAGARI DANDA..DEVANAGARI DOUBLE DANDA +0966..096F ; N # Nd [10] DEVANAGARI DIGIT ZERO..DEVANAGARI DIGIT NINE +0970 ; N # Po DEVANAGARI ABBREVIATION SIGN +0981 ; N # Mn BENGALI SIGN CANDRABINDU +0982..0983 ; N # Mc [2] BENGALI SIGN ANUSVARA..BENGALI SIGN VISARGA +0985..098C ; N # Lo [8] BENGALI LETTER A..BENGALI LETTER VOCALIC L +098F..0990 ; N # Lo [2] BENGALI LETTER E..BENGALI LETTER AI +0993..09A8 ; N # Lo [22] BENGALI LETTER O..BENGALI LETTER NA +09AA..09B0 ; N # Lo [7] BENGALI LETTER PA..BENGALI LETTER RA +09B2 ; N # Lo BENGALI LETTER LA +09B6..09B9 ; N # Lo [4] BENGALI LETTER SHA..BENGALI LETTER HA +09BC ; N # Mn BENGALI SIGN NUKTA +09BE..09C0 ; N # Mc [3] BENGALI VOWEL SIGN AA..BENGALI VOWEL SIGN II +09C1..09C4 ; N # Mn [4] BENGALI VOWEL SIGN U..BENGALI VOWEL SIGN VOCALIC RR +09C7..09C8 ; N # Mc [2] BENGALI VOWEL SIGN E..BENGALI VOWEL SIGN AI +09CB..09CC ; N # Mc [2] BENGALI VOWEL SIGN O..BENGALI VOWEL SIGN AU +09CD ; N # Mn BENGALI SIGN VIRAMA +09D7 ; N # Mc BENGALI AU LENGTH MARK +09DC..09DD ; N # Lo [2] BENGALI LETTER RRA..BENGALI LETTER RHA +09DF..09E1 ; N # Lo [3] BENGALI LETTER YYA..BENGALI LETTER VOCALIC LL +09E2..09E3 ; N # Mn [2] BENGALI VOWEL SIGN VOCALIC L..BENGALI VOWEL SIGN VOCALIC LL +09E6..09EF ; N # Nd [10] BENGALI DIGIT ZERO..BENGALI DIGIT NINE +09F0..09F1 ; N # Lo [2] BENGALI LETTER RA WITH MIDDLE DIAGONAL..BENGALI LETTER RA WITH LOWER DIAGONAL +09F2..09F3 ; N # Sc [2] BENGALI RUPEE MARK..BENGALI RUPEE SIGN +09F4..09F9 ; N # No [6] BENGALI CURRENCY NUMERATOR ONE..BENGALI CURRENCY DENOMINATOR SIXTEEN +09FA ; N # So BENGALI ISSHAR +0A02 ; N # Mn GURMUKHI SIGN BINDI +0A05..0A0A ; N # Lo [6] GURMUKHI LETTER A..GURMUKHI LETTER UU +0A0F..0A10 ; N # Lo [2] GURMUKHI LETTER EE..GURMUKHI LETTER AI +0A13..0A28 ; N # Lo [22] GURMUKHI LETTER OO..GURMUKHI LETTER NA +0A2A..0A30 ; N # Lo [7] GURMUKHI LETTER PA..GURMUKHI LETTER RA +0A32..0A33 ; N # Lo [2] GURMUKHI LETTER LA..GURMUKHI LETTER LLA +0A35..0A36 ; N # Lo [2] GURMUKHI LETTER VA..GURMUKHI LETTER SHA +0A38..0A39 ; N # Lo [2] GURMUKHI LETTER SA..GURMUKHI LETTER HA +0A3C ; N # Mn GURMUKHI SIGN NUKTA +0A3E..0A40 ; N # Mc [3] GURMUKHI VOWEL SIGN AA..GURMUKHI VOWEL SIGN II +0A41..0A42 ; N # Mn [2] GURMUKHI VOWEL SIGN U..GURMUKHI VOWEL SIGN UU +0A47..0A48 ; N # Mn [2] GURMUKHI VOWEL SIGN EE..GURMUKHI VOWEL SIGN AI +0A4B..0A4D ; N # Mn [3] GURMUKHI VOWEL SIGN OO..GURMUKHI SIGN VIRAMA +0A59..0A5C ; N # Lo [4] GURMUKHI LETTER KHHA..GURMUKHI LETTER RRA +0A5E ; N # Lo GURMUKHI LETTER FA +0A66..0A6F ; N # Nd [10] GURMUKHI DIGIT ZERO..GURMUKHI DIGIT NINE +0A70..0A71 ; N # Mn [2] GURMUKHI TIPPI..GURMUKHI ADDAK +0A72..0A74 ; N # Lo [3] GURMUKHI IRI..GURMUKHI EK ONKAR +0A81..0A82 ; N # Mn [2] GUJARATI SIGN CANDRABINDU..GUJARATI SIGN ANUSVARA +0A83 ; N # Mc GUJARATI SIGN VISARGA +0A85..0A8B ; N # Lo [7] GUJARATI LETTER A..GUJARATI LETTER VOCALIC R +0A8D ; N # Lo GUJARATI VOWEL CANDRA E +0A8F..0A91 ; N # Lo [3] GUJARATI LETTER E..GUJARATI VOWEL CANDRA O +0A93..0AA8 ; N # Lo [22] GUJARATI LETTER O..GUJARATI LETTER NA +0AAA..0AB0 ; N # Lo [7] GUJARATI LETTER PA..GUJARATI LETTER RA +0AB2..0AB3 ; N # Lo [2] GUJARATI LETTER LA..GUJARATI LETTER LLA +0AB5..0AB9 ; N # Lo [5] GUJARATI LETTER VA..GUJARATI LETTER HA +0ABC ; N # Mn GUJARATI SIGN NUKTA +0ABD ; N # Lo GUJARATI SIGN AVAGRAHA +0ABE..0AC0 ; N # Mc [3] GUJARATI VOWEL SIGN AA..GUJARATI VOWEL SIGN II +0AC1..0AC5 ; N # Mn [5] GUJARATI VOWEL SIGN U..GUJARATI VOWEL SIGN CANDRA E +0AC7..0AC8 ; N # Mn [2] GUJARATI VOWEL SIGN E..GUJARATI VOWEL SIGN AI +0AC9 ; N # Mc GUJARATI VOWEL SIGN CANDRA O +0ACB..0ACC ; N # Mc [2] GUJARATI VOWEL SIGN O..GUJARATI VOWEL SIGN AU +0ACD ; N # Mn GUJARATI SIGN VIRAMA +0AD0 ; N # Lo GUJARATI OM +0AE0 ; N # Lo GUJARATI LETTER VOCALIC RR +0AE6..0AEF ; N # Nd [10] GUJARATI DIGIT ZERO..GUJARATI DIGIT NINE +0B01 ; N # Mn ORIYA SIGN CANDRABINDU +0B02..0B03 ; N # Mc [2] ORIYA SIGN ANUSVARA..ORIYA SIGN VISARGA +0B05..0B0C ; N # Lo [8] ORIYA LETTER A..ORIYA LETTER VOCALIC L +0B0F..0B10 ; N # Lo [2] ORIYA LETTER E..ORIYA LETTER AI +0B13..0B28 ; N # Lo [22] ORIYA LETTER O..ORIYA LETTER NA +0B2A..0B30 ; N # Lo [7] ORIYA LETTER PA..ORIYA LETTER RA +0B32..0B33 ; N # Lo [2] ORIYA LETTER LA..ORIYA LETTER LLA +0B36..0B39 ; N # Lo [4] ORIYA LETTER SHA..ORIYA LETTER HA +0B3C ; N # Mn ORIYA SIGN NUKTA +0B3D ; N # Lo ORIYA SIGN AVAGRAHA +0B3E ; N # Mc ORIYA VOWEL SIGN AA +0B3F ; N # Mn ORIYA VOWEL SIGN I +0B40 ; N # Mc ORIYA VOWEL SIGN II +0B41..0B43 ; N # Mn [3] ORIYA VOWEL SIGN U..ORIYA VOWEL SIGN VOCALIC R +0B47..0B48 ; N # Mc [2] ORIYA VOWEL SIGN E..ORIYA VOWEL SIGN AI +0B4B..0B4C ; N # Mc [2] ORIYA VOWEL SIGN O..ORIYA VOWEL SIGN AU +0B4D ; N # Mn ORIYA SIGN VIRAMA +0B56 ; N # Mn ORIYA AI LENGTH MARK +0B57 ; N # Mc ORIYA AU LENGTH MARK +0B5C..0B5D ; N # Lo [2] ORIYA LETTER RRA..ORIYA LETTER RHA +0B5F..0B61 ; N # Lo [3] ORIYA LETTER YYA..ORIYA LETTER VOCALIC LL +0B66..0B6F ; N # Nd [10] ORIYA DIGIT ZERO..ORIYA DIGIT NINE +0B70 ; N # So ORIYA ISSHAR +0B82 ; N # Mn TAMIL SIGN ANUSVARA +0B83 ; N # Lo TAMIL SIGN VISARGA +0B85..0B8A ; N # Lo [6] TAMIL LETTER A..TAMIL LETTER UU +0B8E..0B90 ; N # Lo [3] TAMIL LETTER E..TAMIL LETTER AI +0B92..0B95 ; N # Lo [4] TAMIL LETTER O..TAMIL LETTER KA +0B99..0B9A ; N # Lo [2] TAMIL LETTER NGA..TAMIL LETTER CA +0B9C ; N # Lo TAMIL LETTER JA +0B9E..0B9F ; N # Lo [2] TAMIL LETTER NYA..TAMIL LETTER TTA +0BA3..0BA4 ; N # Lo [2] TAMIL LETTER NNA..TAMIL LETTER TA +0BA8..0BAA ; N # Lo [3] TAMIL LETTER NA..TAMIL LETTER PA +0BAE..0BB5 ; N # Lo [8] TAMIL LETTER MA..TAMIL LETTER VA +0BB7..0BB9 ; N # Lo [3] TAMIL LETTER SSA..TAMIL LETTER HA +0BBE..0BBF ; N # Mc [2] TAMIL VOWEL SIGN AA..TAMIL VOWEL SIGN I +0BC0 ; N # Mn TAMIL VOWEL SIGN II +0BC1..0BC2 ; N # Mc [2] TAMIL VOWEL SIGN U..TAMIL VOWEL SIGN UU +0BC6..0BC8 ; N # Mc [3] TAMIL VOWEL SIGN E..TAMIL VOWEL SIGN AI +0BCA..0BCC ; N # Mc [3] TAMIL VOWEL SIGN O..TAMIL VOWEL SIGN AU +0BCD ; N # Mn TAMIL SIGN VIRAMA +0BD7 ; N # Mc TAMIL AU LENGTH MARK +0BE7..0BEF ; N # Nd [9] TAMIL DIGIT ONE..TAMIL DIGIT NINE +0BF0..0BF2 ; N # No [3] TAMIL NUMBER TEN..TAMIL NUMBER ONE THOUSAND +0C01..0C03 ; N # Mc [3] TELUGU SIGN CANDRABINDU..TELUGU SIGN VISARGA +0C05..0C0C ; N # Lo [8] TELUGU LETTER A..TELUGU LETTER VOCALIC L +0C0E..0C10 ; N # Lo [3] TELUGU LETTER E..TELUGU LETTER AI +0C12..0C28 ; N # Lo [23] TELUGU LETTER O..TELUGU LETTER NA +0C2A..0C33 ; N # Lo [10] TELUGU LETTER PA..TELUGU LETTER LLA +0C35..0C39 ; N # Lo [5] TELUGU LETTER VA..TELUGU LETTER HA +0C3E..0C40 ; N # Mn [3] TELUGU VOWEL SIGN AA..TELUGU VOWEL SIGN II +0C41..0C44 ; N # Mc [4] TELUGU VOWEL SIGN U..TELUGU VOWEL SIGN VOCALIC RR +0C46..0C48 ; N # Mn [3] TELUGU VOWEL SIGN E..TELUGU VOWEL SIGN AI +0C4A..0C4D ; N # Mn [4] TELUGU VOWEL SIGN O..TELUGU SIGN VIRAMA +0C55..0C56 ; N # Mn [2] TELUGU LENGTH MARK..TELUGU AI LENGTH MARK +0C60..0C61 ; N # Lo [2] TELUGU LETTER VOCALIC RR..TELUGU LETTER VOCALIC LL +0C66..0C6F ; N # Nd [10] TELUGU DIGIT ZERO..TELUGU DIGIT NINE +0C82..0C83 ; N # Mc [2] KANNADA SIGN ANUSVARA..KANNADA SIGN VISARGA +0C85..0C8C ; N # Lo [8] KANNADA LETTER A..KANNADA LETTER VOCALIC L +0C8E..0C90 ; N # Lo [3] KANNADA LETTER E..KANNADA LETTER AI +0C92..0CA8 ; N # Lo [23] KANNADA LETTER O..KANNADA LETTER NA +0CAA..0CB3 ; N # Lo [10] KANNADA LETTER PA..KANNADA LETTER LLA +0CB5..0CB9 ; N # Lo [5] KANNADA LETTER VA..KANNADA LETTER HA +0CBE ; N # Mc KANNADA VOWEL SIGN AA +0CBF ; N # Mn KANNADA VOWEL SIGN I +0CC0..0CC4 ; N # Mc [5] KANNADA VOWEL SIGN II..KANNADA VOWEL SIGN VOCALIC RR +0CC6 ; N # Mn KANNADA VOWEL SIGN E +0CC7..0CC8 ; N # Mc [2] KANNADA VOWEL SIGN EE..KANNADA VOWEL SIGN AI +0CCA..0CCB ; N # Mc [2] KANNADA VOWEL SIGN O..KANNADA VOWEL SIGN OO +0CCC..0CCD ; N # Mn [2] KANNADA VOWEL SIGN AU..KANNADA SIGN VIRAMA +0CD5..0CD6 ; N # Mc [2] KANNADA LENGTH MARK..KANNADA AI LENGTH MARK +0CDE ; N # Lo KANNADA LETTER FA +0CE0..0CE1 ; N # Lo [2] KANNADA LETTER VOCALIC RR..KANNADA LETTER VOCALIC LL +0CE6..0CEF ; N # Nd [10] KANNADA DIGIT ZERO..KANNADA DIGIT NINE +0D02..0D03 ; N # Mc [2] MALAYALAM SIGN ANUSVARA..MALAYALAM SIGN VISARGA +0D05..0D0C ; N # Lo [8] MALAYALAM LETTER A..MALAYALAM LETTER VOCALIC L +0D0E..0D10 ; N # Lo [3] MALAYALAM LETTER E..MALAYALAM LETTER AI +0D12..0D28 ; N # Lo [23] MALAYALAM LETTER O..MALAYALAM LETTER NA +0D2A..0D39 ; N # Lo [16] MALAYALAM LETTER PA..MALAYALAM LETTER HA +0D3E..0D40 ; N # Mc [3] MALAYALAM VOWEL SIGN AA..MALAYALAM VOWEL SIGN II +0D41..0D43 ; N # Mn [3] MALAYALAM VOWEL SIGN U..MALAYALAM VOWEL SIGN VOCALIC R +0D46..0D48 ; N # Mc [3] MALAYALAM VOWEL SIGN E..MALAYALAM VOWEL SIGN AI +0D4A..0D4C ; N # Mc [3] MALAYALAM VOWEL SIGN O..MALAYALAM VOWEL SIGN AU +0D4D ; N # Mn MALAYALAM SIGN VIRAMA +0D57 ; N # Mc MALAYALAM AU LENGTH MARK +0D60..0D61 ; N # Lo [2] MALAYALAM LETTER VOCALIC RR..MALAYALAM LETTER VOCALIC LL +0D66..0D6F ; N # Nd [10] MALAYALAM DIGIT ZERO..MALAYALAM DIGIT NINE +0D82..0D83 ; N # Mc [2] SINHALA SIGN ANUSVARAYA..SINHALA SIGN VISARGAYA +0D85..0D96 ; N # Lo [18] SINHALA LETTER AYANNA..SINHALA LETTER AUYANNA +0D9A..0DB1 ; N # Lo [24] SINHALA LETTER ALPAPRAANA KAYANNA..SINHALA LETTER DANTAJA NAYANNA +0DB3..0DBB ; N # Lo [9] SINHALA LETTER SANYAKA DAYANNA..SINHALA LETTER RAYANNA +0DBD ; N # Lo SINHALA LETTER DANTAJA LAYANNA +0DC0..0DC6 ; N # Lo [7] SINHALA LETTER VAYANNA..SINHALA LETTER FAYANNA +0DCA ; N # Mn SINHALA SIGN AL-LAKUNA +0DCF..0DD1 ; N # Mc [3] SINHALA VOWEL SIGN AELA-PILLA..SINHALA VOWEL SIGN DIGA AEDA-PILLA +0DD2..0DD4 ; N # Mn [3] SINHALA VOWEL SIGN KETTI IS-PILLA..SINHALA VOWEL SIGN KETTI PAA-PILLA +0DD6 ; N # Mn SINHALA VOWEL SIGN DIGA PAA-PILLA +0DD8..0DDF ; N # Mc [8] SINHALA VOWEL SIGN GAETTA-PILLA..SINHALA VOWEL SIGN GAYANUKITTA +0DF2..0DF3 ; N # Mc [2] SINHALA VOWEL SIGN DIGA GAETTA-PILLA..SINHALA VOWEL SIGN DIGA GAYANUKITTA +0DF4 ; N # Po SINHALA PUNCTUATION KUNDDALIYA +0E01..0E30 ; N # Lo [48] THAI CHARACTER KO KAI..THAI CHARACTER SARA A +0E31 ; N # Mn THAI CHARACTER MAI HAN-AKAT +0E32..0E33 ; N # Lo [2] THAI CHARACTER SARA AA..THAI CHARACTER SARA AM +0E34..0E3A ; N # Mn [7] THAI CHARACTER SARA I..THAI CHARACTER PHINTHU +0E3F ; N # Sc THAI CURRENCY SYMBOL BAHT +0E40..0E45 ; N # Lo [6] THAI CHARACTER SARA E..THAI CHARACTER LAKKHANGYAO +0E46 ; N # Lm THAI CHARACTER MAIYAMOK +0E47..0E4E ; N # Mn [8] THAI CHARACTER MAITAIKHU..THAI CHARACTER YAMAKKAN +0E4F ; N # Po THAI CHARACTER FONGMAN +0E50..0E59 ; N # Nd [10] THAI DIGIT ZERO..THAI DIGIT NINE +0E5A..0E5B ; N # Po [2] THAI CHARACTER ANGKHANKHU..THAI CHARACTER KHOMUT +0E81..0E82 ; N # Lo [2] LAO LETTER KO..LAO LETTER KHO SUNG +0E84 ; N # Lo LAO LETTER KHO TAM +0E87..0E88 ; N # Lo [2] LAO LETTER NGO..LAO LETTER CO +0E8A ; N # Lo LAO LETTER SO TAM +0E8D ; N # Lo LAO LETTER NYO +0E94..0E97 ; N # Lo [4] LAO LETTER DO..LAO LETTER THO TAM +0E99..0E9F ; N # Lo [7] LAO LETTER NO..LAO LETTER FO SUNG +0EA1..0EA3 ; N # Lo [3] LAO LETTER MO..LAO LETTER LO LING +0EA5 ; N # Lo LAO LETTER LO LOOT +0EA7 ; N # Lo LAO LETTER WO +0EAA..0EAB ; N # Lo [2] LAO LETTER SO SUNG..LAO LETTER HO SUNG +0EAD..0EB0 ; N # Lo [4] LAO LETTER O..LAO VOWEL SIGN A +0EB1 ; N # Mn LAO VOWEL SIGN MAI KAN +0EB2..0EB3 ; N # Lo [2] LAO VOWEL SIGN AA..LAO VOWEL SIGN AM +0EB4..0EB9 ; N # Mn [6] LAO VOWEL SIGN I..LAO VOWEL SIGN UU +0EBB..0EBC ; N # Mn [2] LAO VOWEL SIGN MAI KON..LAO SEMIVOWEL SIGN LO +0EBD ; N # Lo LAO SEMIVOWEL SIGN NYO +0EC0..0EC4 ; N # Lo [5] LAO VOWEL SIGN E..LAO VOWEL SIGN AI +0EC6 ; N # Lm LAO KO LA +0EC8..0ECD ; N # Mn [6] LAO TONE MAI EK..LAO NIGGAHITA +0ED0..0ED9 ; N # Nd [10] LAO DIGIT ZERO..LAO DIGIT NINE +0EDC..0EDD ; N # Lo [2] LAO HO NO..LAO HO MO +0F00 ; N # Lo TIBETAN SYLLABLE OM +0F01..0F03 ; N # So [3] TIBETAN MARK GTER YIG MGO TRUNCATED A..TIBETAN MARK GTER YIG MGO -UM GTER TSHEG MA +0F04..0F12 ; N # Po [15] TIBETAN MARK INITIAL YIG MGO MDUN MA..TIBETAN MARK RGYA GRAM SHAD +0F13..0F17 ; N # So [5] TIBETAN MARK CARET -DZUD RTAGS ME LONG CAN..TIBETAN ASTROLOGICAL SIGN SGRA GCAN -CHAR RTAGS +0F18..0F19 ; N # Mn [2] TIBETAN ASTROLOGICAL SIGN -KHYUD PA..TIBETAN ASTROLOGICAL SIGN SDONG TSHUGS +0F1A..0F1F ; N # So [6] TIBETAN SIGN RDEL DKAR GCIG..TIBETAN SIGN RDEL DKAR RDEL NAG +0F20..0F29 ; N # Nd [10] TIBETAN DIGIT ZERO..TIBETAN DIGIT NINE +0F2A..0F33 ; N # No [10] TIBETAN DIGIT HALF ONE..TIBETAN DIGIT HALF ZERO +0F34 ; N # So TIBETAN MARK BSDUS RTAGS +0F35 ; N # Mn TIBETAN MARK NGAS BZUNG NYI ZLA +0F36 ; N # So TIBETAN MARK CARET -DZUD RTAGS BZHI MIG CAN +0F37 ; N # Mn TIBETAN MARK NGAS BZUNG SGOR RTAGS +0F38 ; N # So TIBETAN MARK CHE MGO +0F39 ; N # Mn TIBETAN MARK TSA -PHRU +0F3A ; N # Ps TIBETAN MARK GUG RTAGS GYON +0F3B ; N # Pe TIBETAN MARK GUG RTAGS GYAS +0F3C ; N # Ps TIBETAN MARK ANG KHANG GYON +0F3D ; N # Pe TIBETAN MARK ANG KHANG GYAS +0F3E..0F3F ; N # Mc [2] TIBETAN SIGN YAR TSHES..TIBETAN SIGN MAR TSHES +0F40..0F47 ; N # Lo [8] TIBETAN LETTER KA..TIBETAN LETTER JA +0F49..0F6A ; N # Lo [34] TIBETAN LETTER NYA..TIBETAN LETTER FIXED-FORM RA +0F71..0F7E ; N # Mn [14] TIBETAN VOWEL SIGN AA..TIBETAN SIGN RJES SU NGA RO +0F7F ; N # Mc TIBETAN SIGN RNAM BCAD +0F80..0F84 ; N # Mn [5] TIBETAN VOWEL SIGN REVERSED I..TIBETAN MARK HALANTA +0F85 ; N # Po TIBETAN MARK PALUTA +0F86..0F87 ; N # Mn [2] TIBETAN SIGN LCI RTAGS..TIBETAN SIGN YANG RTAGS +0F88..0F8B ; N # Lo [4] TIBETAN SIGN LCE TSA CAN..TIBETAN SIGN GRU MED RGYINGS +0F90..0F97 ; N # Mn [8] TIBETAN SUBJOINED LETTER KA..TIBETAN SUBJOINED LETTER JA +0F99..0FBC ; N # Mn [36] TIBETAN SUBJOINED LETTER NYA..TIBETAN SUBJOINED LETTER FIXED-FORM RA +0FBE..0FC5 ; N # So [8] TIBETAN KU RU KHA..TIBETAN SYMBOL RDO RJE +0FC6 ; N # Mn TIBETAN SYMBOL PADMA GDAN +0FC7..0FCC ; N # So [6] TIBETAN SYMBOL RDO RJE RGYA GRAM..TIBETAN SYMBOL NOR BU BZHI -KHYIL +0FCF ; N # So TIBETAN SIGN RDEL NAG GSUM +1000..1021 ; N # Lo [34] MYANMAR LETTER KA..MYANMAR LETTER A +1023..1027 ; N # Lo [5] MYANMAR LETTER I..MYANMAR LETTER E +1029..102A ; N # Lo [2] MYANMAR LETTER O..MYANMAR LETTER AU +102C ; N # Mc MYANMAR VOWEL SIGN AA +102D..1030 ; N # Mn [4] MYANMAR VOWEL SIGN I..MYANMAR VOWEL SIGN UU +1031 ; N # Mc MYANMAR VOWEL SIGN E +1032 ; N # Mn MYANMAR VOWEL SIGN AI +1036..1037 ; N # Mn [2] MYANMAR SIGN ANUSVARA..MYANMAR SIGN DOT BELOW +1038 ; N # Mc MYANMAR SIGN VISARGA +1039 ; N # Mn MYANMAR SIGN VIRAMA +1040..1049 ; N # Nd [10] MYANMAR DIGIT ZERO..MYANMAR DIGIT NINE +104A..104F ; N # Po [6] MYANMAR SIGN LITTLE SECTION..MYANMAR SYMBOL GENITIVE +1050..1055 ; N # Lo [6] MYANMAR LETTER SHA..MYANMAR LETTER VOCALIC LL +1056..1057 ; N # Mc [2] MYANMAR VOWEL SIGN VOCALIC R..MYANMAR VOWEL SIGN VOCALIC RR +1058..1059 ; N # Mn [2] MYANMAR VOWEL SIGN VOCALIC L..MYANMAR VOWEL SIGN VOCALIC LL +10A0..10C5 ; N # L& [38] GEORGIAN CAPITAL LETTER AN..GEORGIAN CAPITAL LETTER HOE +10D0..10F8 ; N # Lo [41] GEORGIAN LETTER AN..GEORGIAN LETTER ELIFI +10FB ; N # Po GEORGIAN PARAGRAPH SEPARATOR +1160..11A2 ; N # Lo [67] HANGUL JUNGSEONG FILLER..HANGUL JUNGSEONG SSANGARAEA +11A8..11F9 ; N # Lo [82] HANGUL JONGSEONG KIYEOK..HANGUL JONGSEONG YEORINHIEUH +1200..1206 ; N # Lo [7] ETHIOPIC SYLLABLE HA..ETHIOPIC SYLLABLE HO +1208..1246 ; N # Lo [63] ETHIOPIC SYLLABLE LA..ETHIOPIC SYLLABLE QO +1248 ; N # Lo ETHIOPIC SYLLABLE QWA +124A..124D ; N # Lo [4] ETHIOPIC SYLLABLE QWI..ETHIOPIC SYLLABLE QWE +1250..1256 ; N # Lo [7] ETHIOPIC SYLLABLE QHA..ETHIOPIC SYLLABLE QHO +1258 ; N # Lo ETHIOPIC SYLLABLE QHWA +125A..125D ; N # Lo [4] ETHIOPIC SYLLABLE QHWI..ETHIOPIC SYLLABLE QHWE +1260..1286 ; N # Lo [39] ETHIOPIC SYLLABLE BA..ETHIOPIC SYLLABLE XO +1288 ; N # Lo ETHIOPIC SYLLABLE XWA +128A..128D ; N # Lo [4] ETHIOPIC SYLLABLE XWI..ETHIOPIC SYLLABLE XWE +1290..12AE ; N # Lo [31] ETHIOPIC SYLLABLE NA..ETHIOPIC SYLLABLE KO +12B0 ; N # Lo ETHIOPIC SYLLABLE KWA +12B2..12B5 ; N # Lo [4] ETHIOPIC SYLLABLE KWI..ETHIOPIC SYLLABLE KWE +12B8..12BE ; N # Lo [7] ETHIOPIC SYLLABLE KXA..ETHIOPIC SYLLABLE KXO +12C0 ; N # Lo ETHIOPIC SYLLABLE KXWA +12C2..12C5 ; N # Lo [4] ETHIOPIC SYLLABLE KXWI..ETHIOPIC SYLLABLE KXWE +12C8..12CE ; N # Lo [7] ETHIOPIC SYLLABLE WA..ETHIOPIC SYLLABLE WO +12D0..12D6 ; N # Lo [7] ETHIOPIC SYLLABLE PHARYNGEAL A..ETHIOPIC SYLLABLE PHARYNGEAL O +12D8..12EE ; N # Lo [23] ETHIOPIC SYLLABLE ZA..ETHIOPIC SYLLABLE YO +12F0..130E ; N # Lo [31] ETHIOPIC SYLLABLE DA..ETHIOPIC SYLLABLE GO +1310 ; N # Lo ETHIOPIC SYLLABLE GWA +1312..1315 ; N # Lo [4] ETHIOPIC SYLLABLE GWI..ETHIOPIC SYLLABLE GWE +1318..131E ; N # Lo [7] ETHIOPIC SYLLABLE GGA..ETHIOPIC SYLLABLE GGO +1320..1346 ; N # Lo [39] ETHIOPIC SYLLABLE THA..ETHIOPIC SYLLABLE TZO +1348..135A ; N # Lo [19] ETHIOPIC SYLLABLE FA..ETHIOPIC SYLLABLE FYA +1361..1368 ; N # Po [8] ETHIOPIC WORDSPACE..ETHIOPIC PARAGRAPH SEPARATOR +1369..1371 ; N # Nd [9] ETHIOPIC DIGIT ONE..ETHIOPIC DIGIT NINE +1372..137C ; N # No [11] ETHIOPIC NUMBER TEN..ETHIOPIC NUMBER TEN THOUSAND +13A0..13F4 ; N # Lo [85] CHEROKEE LETTER A..CHEROKEE LETTER YV +1401..166C ; N # Lo [620] CANADIAN SYLLABICS E..CANADIAN SYLLABICS CARRIER TTSA +166D..166E ; N # Po [2] CANADIAN SYLLABICS CHI SIGN..CANADIAN SYLLABICS FULL STOP +166F..1676 ; N # Lo [8] CANADIAN SYLLABICS QAI..CANADIAN SYLLABICS NNGAA +1680 ; N # Zs OGHAM SPACE MARK +1681..169A ; N # Lo [26] OGHAM LETTER BEITH..OGHAM LETTER PEITH +169B ; N # Ps OGHAM FEATHER MARK +169C ; N # Pe OGHAM REVERSED FEATHER MARK +16A0..16EA ; N # Lo [75] RUNIC LETTER FEHU FEOH FE F..RUNIC LETTER X +16EB..16ED ; N # Po [3] RUNIC SINGLE PUNCTUATION..RUNIC CROSS PUNCTUATION +16EE..16F0 ; N # Nl [3] RUNIC ARLAUG SYMBOL..RUNIC BELGTHOR SYMBOL +1700..170C ; N # Lo [13] TAGALOG LETTER A..TAGALOG LETTER YA +170E..1711 ; N # Lo [4] TAGALOG LETTER LA..TAGALOG LETTER HA +1712..1714 ; N # Mn [3] TAGALOG VOWEL SIGN I..TAGALOG SIGN VIRAMA +1720..1731 ; N # Lo [18] HANUNOO LETTER A..HANUNOO LETTER HA +1732..1734 ; N # Mn [3] HANUNOO VOWEL SIGN I..HANUNOO SIGN PAMUDPOD +1735..1736 ; N # Po [2] PHILIPPINE SINGLE PUNCTUATION..PHILIPPINE DOUBLE PUNCTUATION +1740..1751 ; N # Lo [18] BUHID LETTER A..BUHID LETTER HA +1752..1753 ; N # Mn [2] BUHID VOWEL SIGN I..BUHID VOWEL SIGN U +1760..176C ; N # Lo [13] TAGBANWA LETTER A..TAGBANWA LETTER YA +176E..1770 ; N # Lo [3] TAGBANWA LETTER LA..TAGBANWA LETTER SA +1772..1773 ; N # Mn [2] TAGBANWA VOWEL SIGN I..TAGBANWA VOWEL SIGN U +1780..17B3 ; N # Lo [52] KHMER LETTER KA..KHMER INDEPENDENT VOWEL QAU +17B4..17B6 ; N # Mc [3] KHMER VOWEL INHERENT AQ..KHMER VOWEL SIGN AA +17B7..17BD ; N # Mn [7] KHMER VOWEL SIGN I..KHMER VOWEL SIGN UA +17BE..17C5 ; N # Mc [8] KHMER VOWEL SIGN OE..KHMER VOWEL SIGN AU +17C6 ; N # Mn KHMER SIGN NIKAHIT +17C7..17C8 ; N # Mc [2] KHMER SIGN REAHMUK..KHMER SIGN YUUKALEAPINTU +17C9..17D3 ; N # Mn [11] KHMER SIGN MUUSIKATOAN..KHMER SIGN BATHAMASAT +17D4..17D6 ; N # Po [3] KHMER SIGN KHAN..KHMER SIGN CAMNUC PII KUUH +17D7 ; N # Lm KHMER SIGN LEK TOO +17D8..17DA ; N # Po [3] KHMER SIGN BEYYAL..KHMER SIGN KOOMUUT +17DB ; N # Sc KHMER CURRENCY SYMBOL RIEL +17DC ; N # Lo KHMER SIGN AVAKRAHASANYA +17E0..17E9 ; N # Nd [10] KHMER DIGIT ZERO..KHMER DIGIT NINE +1800..1805 ; N # Po [6] MONGOLIAN BIRGA..MONGOLIAN FOUR DOTS +1806 ; N # Pd MONGOLIAN TODO SOFT HYPHEN +1807..180A ; N # Po [4] MONGOLIAN SIBE SYLLABLE BOUNDARY MARKER..MONGOLIAN NIRUGU +180B..180D ; N # Mn [3] MONGOLIAN FREE VARIATION SELECTOR ONE..MONGOLIAN FREE VARIATION SELECTOR THREE +180E ; N # Cf MONGOLIAN VOWEL SEPARATOR +1810..1819 ; N # Nd [10] MONGOLIAN DIGIT ZERO..MONGOLIAN DIGIT NINE +1820..1842 ; N # Lo [35] MONGOLIAN LETTER A..MONGOLIAN LETTER CHI +1843 ; N # Lm MONGOLIAN LETTER TODO LONG VOWEL SIGN +1844..1877 ; N # Lo [52] MONGOLIAN LETTER TODO E..MONGOLIAN LETTER MANCHU ZHA +1880..18A8 ; N # Lo [41] MONGOLIAN LETTER ALI GALI ANUSVARA ONE..MONGOLIAN LETTER MANCHU ALI GALI BHA +18A9 ; N # Mn MONGOLIAN LETTER ALI GALI DAGALGA +1E00..1E9B ; N # L& [156] LATIN CAPITAL LETTER A WITH RING BELOW..LATIN SMALL LETTER LONG S WITH DOT ABOVE +1EA0..1EF9 ; N # L& [90] LATIN CAPITAL LETTER A WITH DOT BELOW..LATIN SMALL LETTER Y WITH TILDE +1F00..1F15 ; N # L& [22] GREEK SMALL LETTER ALPHA WITH PSILI..GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA +1F18..1F1D ; N # L& [6] GREEK CAPITAL LETTER EPSILON WITH PSILI..GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA +1F20..1F45 ; N # L& [38] GREEK SMALL LETTER ETA WITH PSILI..GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA +1F48..1F4D ; N # L& [6] GREEK CAPITAL LETTER OMICRON WITH PSILI..GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA +1F50..1F57 ; N # L& [8] GREEK SMALL LETTER UPSILON WITH PSILI..GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI +1F59 ; N # L& GREEK CAPITAL LETTER UPSILON WITH DASIA +1F5B ; N # L& GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA +1F5D ; N # L& GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA +1F5F..1F7D ; N # L& [31] GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI..GREEK SMALL LETTER OMEGA WITH OXIA +1F80..1FB4 ; N # L& [53] GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI..GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI +1FB6..1FBC ; N # L& [7] GREEK SMALL LETTER ALPHA WITH PERISPOMENI..GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI +1FBD ; N # Sk GREEK KORONIS +1FBE ; N # L& GREEK PROSGEGRAMMENI +1FBF..1FC1 ; N # Sk [3] GREEK PSILI..GREEK DIALYTIKA AND PERISPOMENI +1FC2..1FC4 ; N # L& [3] GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI..GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI +1FC6..1FCC ; N # L& [7] GREEK SMALL LETTER ETA WITH PERISPOMENI..GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI +1FCD..1FCF ; N # Sk [3] GREEK PSILI AND VARIA..GREEK PSILI AND PERISPOMENI +1FD0..1FD3 ; N # L& [4] GREEK SMALL LETTER IOTA WITH VRACHY..GREEK SMALL LETTER IOTA WITH DIALYTIKA AND OXIA +1FD6..1FDB ; N # L& [6] GREEK SMALL LETTER IOTA WITH PERISPOMENI..GREEK CAPITAL LETTER IOTA WITH OXIA +1FDD..1FDF ; N # Sk [3] GREEK DASIA AND VARIA..GREEK DASIA AND PERISPOMENI +1FE0..1FEC ; N # L& [13] GREEK SMALL LETTER UPSILON WITH VRACHY..GREEK CAPITAL LETTER RHO WITH DASIA +1FED..1FEF ; N # Sk [3] GREEK DIALYTIKA AND VARIA..GREEK VARIA +1FF2..1FF4 ; N # L& [3] GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI..GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI +1FF6..1FFC ; N # L& [7] GREEK SMALL LETTER OMEGA WITH PERISPOMENI..GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI +1FFD..1FFE ; N # Sk [2] GREEK OXIA..GREEK DASIA +2000..200B ; N # Zs [12] EN QUAD..ZERO WIDTH SPACE +200C..200F ; N # Cf [4] ZERO WIDTH NON-JOINER..RIGHT-TO-LEFT MARK +2011..2012 ; N # Pd [2] NON-BREAKING HYPHEN..FIGURE DASH +2017 ; N # Po DOUBLE LOW LINE +201A ; N # Ps SINGLE LOW-9 QUOTATION MARK +201B ; N # Pi SINGLE HIGH-REVERSED-9 QUOTATION MARK +201E ; N # Ps DOUBLE LOW-9 QUOTATION MARK +201F ; N # Pi DOUBLE HIGH-REVERSED-9 QUOTATION MARK +2023 ; N # Po TRIANGULAR BULLET +2028 ; N # Zl LINE SEPARATOR +2029 ; N # Zp PARAGRAPH SEPARATOR +202A..202E ; N # Cf [5] LEFT-TO-RIGHT EMBEDDING..RIGHT-TO-LEFT OVERRIDE +202F ; N # Zs NARROW NO-BREAK SPACE +2031 ; N # Po PER TEN THOUSAND SIGN +2034 ; N # Po TRIPLE PRIME +2036..2038 ; N # Po [3] REVERSED DOUBLE PRIME..CARET +2039 ; N # Pi SINGLE LEFT-POINTING ANGLE QUOTATION MARK +203A ; N # Pf SINGLE RIGHT-POINTING ANGLE QUOTATION MARK +203C..203D ; N # Po [2] DOUBLE EXCLAMATION MARK..INTERROBANG +203F..2040 ; N # Pc [2] UNDERTIE..CHARACTER TIE +2041..2043 ; N # Po [3] CARET INSERTION POINT..HYPHEN BULLET +2044 ; N # Sm FRACTION SLASH +2045 ; N # Ps LEFT SQUARE BRACKET WITH QUILL +2046 ; N # Pe RIGHT SQUARE BRACKET WITH QUILL +2047..2051 ; N # Po [11] DOUBLE QUESTION MARK..TWO ASTERISKS ALIGNED VERTICALLY +2052 ; N # Sm COMMERCIAL MINUS SIGN +2057 ; N # Po QUADRUPLE PRIME +205F ; N # Zs MEDIUM MATHEMATICAL SPACE +2060..2063 ; N # Cf [4] WORD JOINER..INVISIBLE SEPARATOR +206A..206F ; N # Cf [6] INHIBIT SYMMETRIC SWAPPING..NOMINAL DIGIT SHAPES +2070 ; N # No SUPERSCRIPT ZERO +2071 ; N # L& SUPERSCRIPT LATIN SMALL LETTER I +2075..2079 ; N # No [5] SUPERSCRIPT FIVE..SUPERSCRIPT NINE +207A..207C ; N # Sm [3] SUPERSCRIPT PLUS SIGN..SUPERSCRIPT EQUALS SIGN +207D ; N # Ps SUPERSCRIPT LEFT PARENTHESIS +207E ; N # Pe SUPERSCRIPT RIGHT PARENTHESIS +2080 ; N # No SUBSCRIPT ZERO +2085..2089 ; N # No [5] SUBSCRIPT FIVE..SUBSCRIPT NINE +208A..208C ; N # Sm [3] SUBSCRIPT PLUS SIGN..SUBSCRIPT EQUALS SIGN +208D ; N # Ps SUBSCRIPT LEFT PARENTHESIS +208E ; N # Pe SUBSCRIPT RIGHT PARENTHESIS +20A0..20A8 ; N # Sc [9] EURO-CURRENCY SIGN..RUPEE SIGN +20AA..20AB ; N # Sc [2] NEW SHEQEL SIGN..DONG SIGN +20AD..20B1 ; N # Sc [5] KIP SIGN..PESO SIGN +20D0..20DC ; N # Mn [13] COMBINING LEFT HARPOON ABOVE..COMBINING FOUR DOTS ABOVE +20DD..20E0 ; N # Me [4] COMBINING ENCLOSING CIRCLE..COMBINING ENCLOSING CIRCLE BACKSLASH +20E1 ; N # Mn COMBINING LEFT RIGHT ARROW ABOVE +20E2..20E4 ; N # Me [3] COMBINING ENCLOSING SCREEN..COMBINING ENCLOSING UPWARD POINTING TRIANGLE +20E5..20EA ; N # Mn [6] COMBINING REVERSE SOLIDUS OVERLAY..COMBINING LEFTWARDS ARROW OVERLAY +2100..2101 ; N # So [2] ACCOUNT OF..ADDRESSED TO THE SUBJECT +2102 ; N # L& DOUBLE-STRUCK CAPITAL C +2104 ; N # So CENTRE LINE SYMBOL +2106 ; N # So CADA UNA +2107 ; N # L& EULER CONSTANT +2108 ; N # So SCRUPLE +210A..2112 ; N # L& [9] SCRIPT SMALL G..SCRIPT CAPITAL L +2114 ; N # So L B BAR SYMBOL +2115 ; N # L& DOUBLE-STRUCK CAPITAL N +2117..2118 ; N # So [2] SOUND RECORDING COPYRIGHT..SCRIPT CAPITAL P +2119..211D ; N # L& [5] DOUBLE-STRUCK CAPITAL P..DOUBLE-STRUCK CAPITAL R +211E..2120 ; N # So [3] PRESCRIPTION TAKE..SERVICE MARK +2123 ; N # So VERSICLE +2124 ; N # L& DOUBLE-STRUCK CAPITAL Z +2125 ; N # So OUNCE SIGN +2127 ; N # So INVERTED OHM SIGN +2128 ; N # L& BLACK-LETTER CAPITAL Z +2129 ; N # So TURNED GREEK SMALL LETTER IOTA +212A ; N # L& KELVIN SIGN +212C..212D ; N # L& [2] SCRIPT CAPITAL B..BLACK-LETTER CAPITAL C +212E ; N # So ESTIMATED SYMBOL +212F..2131 ; N # L& [3] SCRIPT SMALL E..SCRIPT CAPITAL F +2132 ; N # So TURNED CAPITAL F +2133..2134 ; N # L& [2] SCRIPT CAPITAL M..SCRIPT SMALL O +2135..2138 ; N # Lo [4] ALEF SYMBOL..DALET SYMBOL +2139 ; N # L& INFORMATION SOURCE +213A ; N # So ROTATED CAPITAL Q +213D..213F ; N # L& [3] DOUBLE-STRUCK SMALL GAMMA..DOUBLE-STRUCK CAPITAL PI +2140..2144 ; N # Sm [5] DOUBLE-STRUCK N-ARY SUMMATION..TURNED SANS-SERIF CAPITAL Y +2145..2149 ; N # L& [5] DOUBLE-STRUCK ITALIC CAPITAL D..DOUBLE-STRUCK ITALIC SMALL J +214A ; N # So PROPERTY LINE +214B ; N # Sm TURNED AMPERSAND +2155..215A ; N # No [6] VULGAR FRACTION ONE FIFTH..VULGAR FRACTION FIVE SIXTHS +215F ; N # No FRACTION NUMERATOR ONE +216C..216F ; N # Nl [4] ROMAN NUMERAL FIFTY..ROMAN NUMERAL ONE THOUSAND +217A..2183 ; N # Nl [10] SMALL ROMAN NUMERAL ELEVEN..ROMAN NUMERAL REVERSED ONE HUNDRED +219A..219B ; N # Sm [2] LEFTWARDS ARROW WITH STROKE..RIGHTWARDS ARROW WITH STROKE +219C..219F ; N # So [4] LEFTWARDS WAVE ARROW..UPWARDS TWO HEADED ARROW +21A0 ; N # Sm RIGHTWARDS TWO HEADED ARROW +21A1..21A2 ; N # So [2] DOWNWARDS TWO HEADED ARROW..LEFTWARDS ARROW WITH TAIL +21A3 ; N # Sm RIGHTWARDS ARROW WITH TAIL +21A4..21A5 ; N # So [2] LEFTWARDS ARROW FROM BAR..UPWARDS ARROW FROM BAR +21A6 ; N # Sm RIGHTWARDS ARROW FROM BAR +21A7..21AD ; N # So [7] DOWNWARDS ARROW FROM BAR..LEFT RIGHT WAVE ARROW +21AE ; N # Sm LEFT RIGHT ARROW WITH STROKE +21AF..21B7 ; N # So [9] DOWNWARDS ZIGZAG ARROW..CLOCKWISE TOP SEMICIRCLE ARROW +21BA..21CD ; N # So [20] ANTICLOCKWISE OPEN CIRCLE ARROW..LEFTWARDS DOUBLE ARROW WITH STROKE +21CE..21CF ; N # Sm [2] LEFT RIGHT DOUBLE ARROW WITH STROKE..RIGHTWARDS DOUBLE ARROW WITH STROKE +21D0..21D1 ; N # So [2] LEFTWARDS DOUBLE ARROW..UPWARDS DOUBLE ARROW +21D3 ; N # So DOWNWARDS DOUBLE ARROW +21D5..21E6 ; N # So [18] UP DOWN DOUBLE ARROW..LEFTWARDS WHITE ARROW +21E8..21F3 ; N # So [12] RIGHTWARDS WHITE ARROW..UP DOWN WHITE ARROW +21F4..21FF ; N # Sm [12] RIGHT ARROW WITH SMALL CIRCLE..LEFT RIGHT OPEN-HEADED ARROW +2201 ; N # Sm COMPLEMENT +2204..2206 ; N # Sm [3] THERE DOES NOT EXIST..INCREMENT +2209..220A ; N # Sm [2] NOT AN ELEMENT OF..SMALL ELEMENT OF +220C..220E ; N # Sm [3] DOES NOT CONTAIN AS MEMBER..END OF PROOF +2210 ; N # Sm N-ARY COPRODUCT +2212..2214 ; N # Sm [3] MINUS SIGN..DOT PLUS +2216..2219 ; N # Sm [4] SET MINUS..BULLET OPERATOR +221B..221C ; N # Sm [2] CUBE ROOT..FOURTH ROOT +2221..2222 ; N # Sm [2] MEASURED ANGLE..SPHERICAL ANGLE +2224 ; N # Sm DOES NOT DIVIDE +2226 ; N # Sm NOT PARALLEL TO +222D ; N # Sm TRIPLE INTEGRAL +222F..2233 ; N # Sm [5] SURFACE INTEGRAL..ANTICLOCKWISE CONTOUR INTEGRAL +2238..223B ; N # Sm [4] DOT MINUS..HOMOTHETIC +223E..2247 ; N # Sm [10] INVERTED LAZY S..NEITHER APPROXIMATELY NOR ACTUALLY EQUAL TO +2249..224B ; N # Sm [3] NOT ALMOST EQUAL TO..TRIPLE TILDE +224D..2251 ; N # Sm [5] EQUIVALENT TO..GEOMETRICALLY EQUAL TO +2253..225F ; N # Sm [13] IMAGE OF OR APPROXIMATELY EQUAL TO..QUESTIONED EQUAL TO +2262..2263 ; N # Sm [2] NOT IDENTICAL TO..STRICTLY EQUIVALENT TO +2268..2269 ; N # Sm [2] LESS-THAN BUT NOT EQUAL TO..GREATER-THAN BUT NOT EQUAL TO +226C..226D ; N # Sm [2] BETWEEN..NOT EQUIVALENT TO +2270..2281 ; N # Sm [18] NEITHER LESS-THAN NOR EQUAL TO..DOES NOT SUCCEED +2284..2285 ; N # Sm [2] NOT A SUBSET OF..NOT A SUPERSET OF +2288..2294 ; N # Sm [13] NEITHER A SUBSET OF NOR EQUAL TO..SQUARE CUP +2296..2298 ; N # Sm [3] CIRCLED MINUS..CIRCLED DIVISION SLASH +229A..22A4 ; N # Sm [11] CIRCLED RING OPERATOR..DOWN TACK +22A6..22BE ; N # Sm [25] ASSERTION..RIGHT ANGLE WITH ARC +22C0..22FF ; N # Sm [64] N-ARY LOGICAL AND..Z NOTATION BAG MEMBERSHIP +2300..2307 ; N # So [8] DIAMETER SIGN..WAVY LINE +2308..230B ; N # Sm [4] LEFT CEILING..RIGHT FLOOR +230C..2311 ; N # So [6] BOTTOM RIGHT CROP..SQUARE LOZENGE +2313..231F ; N # So [13] SEGMENT..BOTTOM RIGHT CORNER +2320..2321 ; N # Sm [2] TOP HALF INTEGRAL..BOTTOM HALF INTEGRAL +2322..2328 ; N # So [7] FROWN..KEYBOARD +232B..237B ; N # So [81] ERASE TO THE LEFT..NOT CHECK MARK +237C ; N # Sm RIGHT ANGLE WITH DOWNWARDS ZIGZAG ARROW +237D..239A ; N # So [30] SHOULDERED OPEN BOX..CLEAR SCREEN SYMBOL +239B..23B3 ; N # Sm [25] LEFT PARENTHESIS UPPER HOOK..SUMMATION BOTTOM +23B4 ; N # Ps TOP SQUARE BRACKET +23B5 ; N # Pe BOTTOM SQUARE BRACKET +23B6 ; N # Po BOTTOM SQUARE BRACKET OVER TOP SQUARE BRACKET +23B7..23CE ; N # So [24] RADICAL SYMBOL BOTTOM..RETURN SYMBOL +2400..2426 ; N # So [39] SYMBOL FOR NULL..SYMBOL FOR SUBSTITUTE FORM TWO +2440..244A ; N # So [11] OCR HOOK..OCR DOUBLE BACKSLASH +24EA ; N # No CIRCLED DIGIT ZERO +254C..254F ; N # So [4] BOX DRAWINGS LIGHT DOUBLE DASH HORIZONTAL..BOX DRAWINGS HEAVY DOUBLE DASH VERTICAL +2574..257F ; N # So [12] BOX DRAWINGS LIGHT LEFT..BOX DRAWINGS HEAVY UP AND LIGHT DOWN +2590..2591 ; N # So [2] RIGHT HALF BLOCK..LIGHT SHADE +2596..259F ; N # So [10] QUADRANT LOWER LEFT..QUADRANT UPPER RIGHT AND LOWER LEFT AND LOWER RIGHT +25A2 ; N # So WHITE SQUARE WITH ROUNDED CORNERS +25AA..25B1 ; N # So [8] BLACK SMALL SQUARE..WHITE PARALLELOGRAM +25B4..25B5 ; N # So [2] BLACK UP-POINTING SMALL TRIANGLE..WHITE UP-POINTING SMALL TRIANGLE +25B8..25BB ; N # So [4] BLACK RIGHT-POINTING SMALL TRIANGLE..WHITE RIGHT-POINTING POINTER +25BE..25BF ; N # So [2] BLACK DOWN-POINTING SMALL TRIANGLE..WHITE DOWN-POINTING SMALL TRIANGLE +25C2..25C5 ; N # So [4] BLACK LEFT-POINTING SMALL TRIANGLE..WHITE LEFT-POINTING POINTER +25C9..25CA ; N # So [2] FISHEYE..LOZENGE +25CC..25CD ; N # So [2] DOTTED CIRCLE..CIRCLE WITH VERTICAL FILL +25D2..25E1 ; N # So [16] CIRCLE WITH LOWER HALF BLACK..LOWER HALF CIRCLE +25E6..25EE ; N # So [9] WHITE BULLET..UP-POINTING TRIANGLE WITH RIGHT HALF BLACK +25F0..25F7 ; N # So [8] WHITE SQUARE WITH UPPER LEFT QUADRANT..WHITE CIRCLE WITH UPPER RIGHT QUADRANT +25F8..25FF ; N # Sm [8] UPPER LEFT TRIANGLE..LOWER RIGHT TRIANGLE +2600..2604 ; N # So [5] BLACK SUN WITH RAYS..COMET +2607..2608 ; N # So [2] LIGHTNING..THUNDERSTORM +260A..260D ; N # So [4] ASCENDING NODE..OPPOSITION +2610..2613 ; N # So [4] BALLOT BOX..SALTIRE +2616..2617 ; N # So [2] WHITE SHOGI PIECE..BLACK SHOGI PIECE +2619..261B ; N # So [3] REVERSED ROTATED FLORAL HEART BULLET..BLACK RIGHT POINTING INDEX +261D ; N # So WHITE UP POINTING INDEX +261F..263F ; N # So [33] WHITE DOWN POINTING INDEX..MERCURY +2641 ; N # So EARTH +2643..265F ; N # So [29] JUPITER..BLACK CHESS PAWN +2662 ; N # So WHITE DIAMOND SUIT +2666 ; N # So BLACK DIAMOND SUIT +266B ; N # So BEAMED EIGHTH NOTES +266E ; N # So MUSIC NATURAL SIGN +2670..267D ; N # So [14] WEST SYRIAC CROSS..PARTIALLY-RECYCLED PAPER SYMBOL +2680..2689 ; N # So [10] DIE FACE-1..BLACK CIRCLE WITH TWO WHITE DOTS +2701..2704 ; N # So [4] UPPER BLADE SCISSORS..WHITE SCISSORS +2706..2709 ; N # So [4] TELEPHONE LOCATION SIGN..ENVELOPE +270C..2727 ; N # So [28] VICTORY HAND..WHITE FOUR POINTED STAR +2729..273C ; N # So [20] STRESS OUTLINED WHITE STAR..OPEN CENTRE TEARDROP-SPOKED ASTERISK +273E..274B ; N # So [14] SIX PETALLED BLACK AND WHITE FLORETTE..HEAVY EIGHT TEARDROP-SPOKED PROPELLER ASTERISK +274D ; N # So SHADOWED WHITE CIRCLE +274F..2752 ; N # So [4] LOWER RIGHT DROP-SHADOWED WHITE SQUARE..UPPER RIGHT SHADOWED WHITE SQUARE +2756 ; N # So BLACK DIAMOND MINUS WHITE X +2758..275E ; N # So [7] LIGHT VERTICAL BAR..HEAVY DOUBLE COMMA QUOTATION MARK ORNAMENT +2761..2767 ; N # So [7] CURVED STEM PARAGRAPH SIGN ORNAMENT..ROTATED FLORAL HEART BULLET +2768 ; N # Ps MEDIUM LEFT PARENTHESIS ORNAMENT +2769 ; N # Pe MEDIUM RIGHT PARENTHESIS ORNAMENT +276A ; N # Ps MEDIUM FLATTENED LEFT PARENTHESIS ORNAMENT +276B ; N # Pe MEDIUM FLATTENED RIGHT PARENTHESIS ORNAMENT +276C ; N # Ps MEDIUM LEFT-POINTING ANGLE BRACKET ORNAMENT +276D ; N # Pe MEDIUM RIGHT-POINTING ANGLE BRACKET ORNAMENT +276E ; N # Ps HEAVY LEFT-POINTING ANGLE QUOTATION MARK ORNAMENT +276F ; N # Pe HEAVY RIGHT-POINTING ANGLE QUOTATION MARK ORNAMENT +2770 ; N # Ps HEAVY LEFT-POINTING ANGLE BRACKET ORNAMENT +2771 ; N # Pe HEAVY RIGHT-POINTING ANGLE BRACKET ORNAMENT +2772 ; N # Ps LIGHT LEFT TORTOISE SHELL BRACKET ORNAMENT +2773 ; N # Pe LIGHT RIGHT TORTOISE SHELL BRACKET ORNAMENT +2774 ; N # Ps MEDIUM LEFT CURLY BRACKET ORNAMENT +2775 ; N # Pe MEDIUM RIGHT CURLY BRACKET ORNAMENT +2780..2793 ; N # No [20] DINGBAT CIRCLED SANS-SERIF DIGIT ONE..DINGBAT NEGATIVE CIRCLED SANS-SERIF NUMBER TEN +2794 ; N # So HEAVY WIDE-HEADED RIGHTWARDS ARROW +2798..27AF ; N # So [24] HEAVY SOUTH EAST ARROW..NOTCHED LOWER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW +27B1..27BE ; N # So [14] NOTCHED UPPER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW..OPEN-OUTLINED RIGHTWARDS ARROW +27D0..27E5 ; N # Sm [22] WHITE DIAMOND WITH CENTRED DOT..WHITE SQUARE WITH RIGHTWARDS TICK +27F0..27FF ; N # Sm [16] UPWARDS QUADRUPLE ARROW..LONG RIGHTWARDS SQUIGGLE ARROW +2800..28FF ; N # So [256] BRAILLE PATTERN BLANK..BRAILLE PATTERN DOTS-12345678 +2900..2982 ; N # Sm [131] RIGHTWARDS TWO-HEADED ARROW WITH VERTICAL STROKE..Z NOTATION TYPE COLON +2983 ; N # Ps LEFT WHITE CURLY BRACKET +2984 ; N # Pe RIGHT WHITE CURLY BRACKET +2987 ; N # Ps Z NOTATION LEFT IMAGE BRACKET +2988 ; N # Pe Z NOTATION RIGHT IMAGE BRACKET +2989 ; N # Ps Z NOTATION LEFT BINDING BRACKET +298A ; N # Pe Z NOTATION RIGHT BINDING BRACKET +298B ; N # Ps LEFT SQUARE BRACKET WITH UNDERBAR +298C ; N # Pe RIGHT SQUARE BRACKET WITH UNDERBAR +298D ; N # Ps LEFT SQUARE BRACKET WITH TICK IN TOP CORNER +298E ; N # Pe RIGHT SQUARE BRACKET WITH TICK IN BOTTOM CORNER +298F ; N # Ps LEFT SQUARE BRACKET WITH TICK IN BOTTOM CORNER +2990 ; N # Pe RIGHT SQUARE BRACKET WITH TICK IN TOP CORNER +2991 ; N # Ps LEFT ANGLE BRACKET WITH DOT +2992 ; N # Pe RIGHT ANGLE BRACKET WITH DOT +2993 ; N # Ps LEFT ARC LESS-THAN BRACKET +2994 ; N # Pe RIGHT ARC GREATER-THAN BRACKET +2995 ; N # Ps DOUBLE LEFT ARC GREATER-THAN BRACKET +2996 ; N # Pe DOUBLE RIGHT ARC LESS-THAN BRACKET +2997 ; N # Ps LEFT BLACK TORTOISE SHELL BRACKET +2998 ; N # Pe RIGHT BLACK TORTOISE SHELL BRACKET +2999..29D7 ; N # Sm [63] DOTTED FENCE..BLACK HOURGLASS +29D8 ; N # Ps LEFT WIGGLY FENCE +29D9 ; N # Pe RIGHT WIGGLY FENCE +29DA ; N # Ps LEFT DOUBLE WIGGLY FENCE +29DB ; N # Pe RIGHT DOUBLE WIGGLY FENCE +29DC..29FB ; N # Sm [32] INCOMPLETE INFINITY..TRIPLE PLUS +29FC ; N # Ps LEFT-POINTING CURVED ANGLE BRACKET +29FD ; N # Pe RIGHT-POINTING CURVED ANGLE BRACKET +29FE..2AFF ; N # Sm [258] TINY..N-ARY WHITE VERTICAL BAR +303F ; N # So IDEOGRAPHIC HALF FILL SPACE +D800..DFFF ; N # Cs [2048] +FB00..FB06 ; N # L& [7] LATIN SMALL LIGATURE FF..LATIN SMALL LIGATURE ST +FB13..FB17 ; N # L& [5] ARMENIAN SMALL LIGATURE MEN NOW..ARMENIAN SMALL LIGATURE MEN XEH +FB1D ; N # Lo HEBREW LETTER YOD WITH HIRIQ +FB1E ; N # Mn HEBREW POINT JUDEO-SPANISH VARIKA +FB1F..FB28 ; N # Lo [10] HEBREW LIGATURE YIDDISH YOD YOD PATAH..HEBREW LETTER WIDE TAV +FB29 ; N # Sm HEBREW LETTER ALTERNATIVE PLUS SIGN +FB2A..FB36 ; N # Lo [13] HEBREW LETTER SHIN WITH SHIN DOT..HEBREW LETTER ZAYIN WITH DAGESH +FB38..FB3C ; N # Lo [5] HEBREW LETTER TET WITH DAGESH..HEBREW LETTER LAMED WITH DAGESH +FB3E ; N # Lo HEBREW LETTER MEM WITH DAGESH +FB40..FB41 ; N # Lo [2] HEBREW LETTER NUN WITH DAGESH..HEBREW LETTER SAMEKH WITH DAGESH +FB43..FB44 ; N # Lo [2] HEBREW LETTER FINAL PE WITH DAGESH..HEBREW LETTER PE WITH DAGESH +FB46..FBB1 ; N # Lo [108] HEBREW LETTER TSADI WITH DAGESH..ARABIC LETTER YEH BARREE WITH HAMZA ABOVE FINAL FORM +FBD3..FD3D ; N # Lo [363] ARABIC LETTER NG ISOLATED FORM..ARABIC LIGATURE ALEF WITH FATHATAN ISOLATED FORM +FD3E ; N # Ps ORNATE LEFT PARENTHESIS +FD3F ; N # Pe ORNATE RIGHT PARENTHESIS +FD50..FD8F ; N # Lo [64] ARABIC LIGATURE TEH WITH JEEM WITH MEEM INITIAL FORM..ARABIC LIGATURE MEEM WITH KHAH WITH MEEM INITIAL FORM +FD92..FDC7 ; N # Lo [54] ARABIC LIGATURE MEEM WITH JEEM WITH KHAH INITIAL FORM..ARABIC LIGATURE NOON WITH JEEM WITH YEH FINAL FORM +FDF0..FDFB ; N # Lo [12] ARABIC LIGATURE SALLA USED AS KORANIC STOP SIGN ISOLATED FORM..ARABIC LIGATURE JALLAJALALOUHOU +FDFC ; N # Sc RIAL SIGN +FE20..FE23 ; N # Mn [4] COMBINING LIGATURE LEFT HALF..COMBINING DOUBLE TILDE RIGHT HALF +FE70..FE74 ; N # Lo [5] ARABIC FATHATAN ISOLATED FORM..ARABIC KASRATAN ISOLATED FORM +FE76..FEFC ; N # Lo [135] ARABIC FATHA ISOLATED FORM..ARABIC LIGATURE LAM WITH ALEF FINAL FORM +FEFF ; N # Cf ZERO WIDTH NO-BREAK SPACE +FFF9..FFFB ; N # Cf [3] INTERLINEAR ANNOTATION ANCHOR..INTERLINEAR ANNOTATION TERMINATOR +FFFC ; N # So OBJECT REPLACEMENT CHARACTER +10300..1031E ; N # Lo [31] OLD ITALIC LETTER A..OLD ITALIC LETTER UU +10320..10323 ; N # No [4] OLD ITALIC NUMERAL ONE..OLD ITALIC NUMERAL FIFTY +10330..10349 ; N # Lo [26] GOTHIC LETTER AHSA..GOTHIC LETTER OTHAL +1034A ; N # Nl GOTHIC LETTER NINE HUNDRED +10400..10425 ; N # L& [38] DESERET CAPITAL LETTER LONG I..DESERET CAPITAL LETTER ENG +10428..1044D ; N # L& [38] DESERET SMALL LETTER LONG I..DESERET SMALL LETTER ENG +1D000..1D0F5 ; N # So [246] BYZANTINE MUSICAL SYMBOL PSILI..BYZANTINE MUSICAL SYMBOL GORGON NEO KATO +1D100..1D126 ; N # So [39] MUSICAL SYMBOL SINGLE BARLINE..MUSICAL SYMBOL DRUM CLEF-2 +1D12A..1D164 ; N # So [59] MUSICAL SYMBOL DOUBLE SHARP..MUSICAL SYMBOL ONE HUNDRED TWENTY-EIGHTH NOTE +1D165..1D166 ; N # Mc [2] MUSICAL SYMBOL COMBINING STEM..MUSICAL SYMBOL COMBINING SPRECHGESANG STEM +1D167..1D169 ; N # Mn [3] MUSICAL SYMBOL COMBINING TREMOLO-1..MUSICAL SYMBOL COMBINING TREMOLO-3 +1D16A..1D16C ; N # So [3] MUSICAL SYMBOL FINGERED TREMOLO-1..MUSICAL SYMBOL FINGERED TREMOLO-3 +1D16D..1D172 ; N # Mc [6] MUSICAL SYMBOL COMBINING AUGMENTATION DOT..MUSICAL SYMBOL COMBINING FLAG-5 +1D173..1D17A ; N # Cf [8] MUSICAL SYMBOL BEGIN BEAM..MUSICAL SYMBOL END PHRASE +1D17B..1D182 ; N # Mn [8] MUSICAL SYMBOL COMBINING ACCENT..MUSICAL SYMBOL COMBINING LOURE +1D183..1D184 ; N # So [2] MUSICAL SYMBOL ARPEGGIATO UP..MUSICAL SYMBOL ARPEGGIATO DOWN +1D185..1D18B ; N # Mn [7] MUSICAL SYMBOL COMBINING DOIT..MUSICAL SYMBOL COMBINING TRIPLE TONGUE +1D18C..1D1A9 ; N # So [30] MUSICAL SYMBOL RINFORZANDO..MUSICAL SYMBOL DEGREE SLASH +1D1AA..1D1AD ; N # Mn [4] MUSICAL SYMBOL COMBINING DOWN BOW..MUSICAL SYMBOL COMBINING SNAP PIZZICATO +1D1AE..1D1DD ; N # So [48] MUSICAL SYMBOL PEDAL MARK..MUSICAL SYMBOL PES SUBPUNCTIS +1D400..1D454 ; N # L& [85] MATHEMATICAL BOLD CAPITAL A..MATHEMATICAL ITALIC SMALL G +1D456..1D49C ; N # L& [71] MATHEMATICAL ITALIC SMALL I..MATHEMATICAL SCRIPT CAPITAL A +1D49E..1D49F ; N # L& [2] MATHEMATICAL SCRIPT CAPITAL C..MATHEMATICAL SCRIPT CAPITAL D +1D4A2 ; N # L& MATHEMATICAL SCRIPT CAPITAL G +1D4A5..1D4A6 ; N # L& [2] MATHEMATICAL SCRIPT CAPITAL J..MATHEMATICAL SCRIPT CAPITAL K +1D4A9..1D4AC ; N # L& [4] MATHEMATICAL SCRIPT CAPITAL N..MATHEMATICAL SCRIPT CAPITAL Q +1D4AE..1D4B9 ; N # L& [12] MATHEMATICAL SCRIPT CAPITAL S..MATHEMATICAL SCRIPT SMALL D +1D4BB ; N # L& MATHEMATICAL SCRIPT SMALL F +1D4BD..1D4C0 ; N # L& [4] MATHEMATICAL SCRIPT SMALL H..MATHEMATICAL SCRIPT SMALL K +1D4C2..1D4C3 ; N # L& [2] MATHEMATICAL SCRIPT SMALL M..MATHEMATICAL SCRIPT SMALL N +1D4C5..1D505 ; N # L& [65] MATHEMATICAL SCRIPT SMALL P..MATHEMATICAL FRAKTUR CAPITAL B +1D507..1D50A ; N # L& [4] MATHEMATICAL FRAKTUR CAPITAL D..MATHEMATICAL FRAKTUR CAPITAL G +1D50D..1D514 ; N # L& [8] MATHEMATICAL FRAKTUR CAPITAL J..MATHEMATICAL FRAKTUR CAPITAL Q +1D516..1D51C ; N # L& [7] MATHEMATICAL FRAKTUR CAPITAL S..MATHEMATICAL FRAKTUR CAPITAL Y +1D51E..1D539 ; N # L& [28] MATHEMATICAL FRAKTUR SMALL A..MATHEMATICAL DOUBLE-STRUCK CAPITAL B +1D53B..1D53E ; N # L& [4] MATHEMATICAL DOUBLE-STRUCK CAPITAL D..MATHEMATICAL DOUBLE-STRUCK CAPITAL G +1D540..1D544 ; N # L& [5] MATHEMATICAL DOUBLE-STRUCK CAPITAL I..MATHEMATICAL DOUBLE-STRUCK CAPITAL M +1D546 ; N # L& MATHEMATICAL DOUBLE-STRUCK CAPITAL O +1D54A..1D550 ; N # L& [7] MATHEMATICAL DOUBLE-STRUCK CAPITAL S..MATHEMATICAL DOUBLE-STRUCK CAPITAL Y +1D552..1D6A3 ; N # L& [338] MATHEMATICAL DOUBLE-STRUCK SMALL A..MATHEMATICAL MONOSPACE SMALL Z +1D6A8..1D6C0 ; N # L& [25] MATHEMATICAL BOLD CAPITAL ALPHA..MATHEMATICAL BOLD CAPITAL OMEGA +1D6C1 ; N # Sm MATHEMATICAL BOLD NABLA +1D6C2..1D6DA ; N # L& [25] MATHEMATICAL BOLD SMALL ALPHA..MATHEMATICAL BOLD SMALL OMEGA +1D6DB ; N # Sm MATHEMATICAL BOLD PARTIAL DIFFERENTIAL +1D6DC..1D6FA ; N # L& [31] MATHEMATICAL BOLD EPSILON SYMBOL..MATHEMATICAL ITALIC CAPITAL OMEGA +1D6FB ; N # Sm MATHEMATICAL ITALIC NABLA +1D6FC..1D714 ; N # L& [25] MATHEMATICAL ITALIC SMALL ALPHA..MATHEMATICAL ITALIC SMALL OMEGA +1D715 ; N # Sm MATHEMATICAL ITALIC PARTIAL DIFFERENTIAL +1D716..1D734 ; N # L& [31] MATHEMATICAL ITALIC EPSILON SYMBOL..MATHEMATICAL BOLD ITALIC CAPITAL OMEGA +1D735 ; N # Sm MATHEMATICAL BOLD ITALIC NABLA +1D736..1D74E ; N # L& [25] MATHEMATICAL BOLD ITALIC SMALL ALPHA..MATHEMATICAL BOLD ITALIC SMALL OMEGA +1D74F ; N # Sm MATHEMATICAL BOLD ITALIC PARTIAL DIFFERENTIAL +1D750..1D76E ; N # L& [31] MATHEMATICAL BOLD ITALIC EPSILON SYMBOL..MATHEMATICAL SANS-SERIF BOLD CAPITAL OMEGA +1D76F ; N # Sm MATHEMATICAL SANS-SERIF BOLD NABLA +1D770..1D788 ; N # L& [25] MATHEMATICAL SANS-SERIF BOLD SMALL ALPHA..MATHEMATICAL SANS-SERIF BOLD SMALL OMEGA +1D789 ; N # Sm MATHEMATICAL SANS-SERIF BOLD PARTIAL DIFFERENTIAL +1D78A..1D7A8 ; N # L& [31] MATHEMATICAL SANS-SERIF BOLD EPSILON SYMBOL..MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL OMEGA +1D7A9 ; N # Sm MATHEMATICAL SANS-SERIF BOLD ITALIC NABLA +1D7AA..1D7C2 ; N # L& [25] MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ALPHA..MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL OMEGA +1D7C3 ; N # Sm MATHEMATICAL SANS-SERIF BOLD ITALIC PARTIAL DIFFERENTIAL +1D7C4..1D7C9 ; N # L& [6] MATHEMATICAL SANS-SERIF BOLD ITALIC EPSILON SYMBOL..MATHEMATICAL SANS-SERIF BOLD ITALIC PI SYMBOL +1D7CE..1D7FF ; N # Nd [50] MATHEMATICAL BOLD DIGIT ZERO..MATHEMATICAL MONOSPACE DIGIT NINE +E0001 ; N # Cf LANGUAGE TAG +E0020..E007F ; N # Cf [96] TAG SPACE..CANCEL TAG + +# Total code points: 11227 + +# ================================================ + +00A1 ; A # Po INVERTED EXCLAMATION MARK +00A4 ; A # Sc CURRENCY SIGN +00A7 ; A # So SECTION SIGN +00A8 ; A # Sk DIAERESIS +00AA ; A # L& FEMININE ORDINAL INDICATOR +00AD ; A # Pd SOFT HYPHEN +00AE ; A # So REGISTERED SIGN +00B0 ; A # So DEGREE SIGN +00B1 ; A # Sm PLUS-MINUS SIGN +00B2..00B3 ; A # No [2] SUPERSCRIPT TWO..SUPERSCRIPT THREE +00B4 ; A # Sk ACUTE ACCENT +00B6 ; A # So PILCROW SIGN +00B7 ; A # Po MIDDLE DOT +00B8 ; A # Sk CEDILLA +00B9 ; A # No SUPERSCRIPT ONE +00BA ; A # L& MASCULINE ORDINAL INDICATOR +00BC..00BE ; A # No [3] VULGAR FRACTION ONE QUARTER..VULGAR FRACTION THREE QUARTERS +00BF ; A # Po INVERTED QUESTION MARK +00C6 ; A # L& LATIN CAPITAL LETTER AE +00D0 ; A # L& LATIN CAPITAL LETTER ETH +00D7 ; A # Sm MULTIPLICATION SIGN +00D8 ; A # L& LATIN CAPITAL LETTER O WITH STROKE +00DE..00E1 ; A # L& [4] LATIN CAPITAL LETTER THORN..LATIN SMALL LETTER A WITH ACUTE +00E6 ; A # L& LATIN SMALL LETTER AE +00E8..00EA ; A # L& [3] LATIN SMALL LETTER E WITH GRAVE..LATIN SMALL LETTER E WITH CIRCUMFLEX +00EC..00ED ; A # L& [2] LATIN SMALL LETTER I WITH GRAVE..LATIN SMALL LETTER I WITH ACUTE +00F0 ; A # L& LATIN SMALL LETTER ETH +00F2..00F3 ; A # L& [2] LATIN SMALL LETTER O WITH GRAVE..LATIN SMALL LETTER O WITH ACUTE +00F7 ; A # Sm DIVISION SIGN +00F8..00FA ; A # L& [3] LATIN SMALL LETTER O WITH STROKE..LATIN SMALL LETTER U WITH ACUTE +00FC ; A # L& LATIN SMALL LETTER U WITH DIAERESIS +00FE ; A # L& LATIN SMALL LETTER THORN +0101 ; A # L& LATIN SMALL LETTER A WITH MACRON +0111 ; A # L& LATIN SMALL LETTER D WITH STROKE +0113 ; A # L& LATIN SMALL LETTER E WITH MACRON +011B ; A # L& LATIN SMALL LETTER E WITH CARON +0126..0127 ; A # L& [2] LATIN CAPITAL LETTER H WITH STROKE..LATIN SMALL LETTER H WITH STROKE +012B ; A # L& LATIN SMALL LETTER I WITH MACRON +0131..0133 ; A # L& [3] LATIN SMALL LETTER DOTLESS I..LATIN SMALL LIGATURE IJ +0138 ; A # L& LATIN SMALL LETTER KRA +013F..0142 ; A # L& [4] LATIN CAPITAL LETTER L WITH MIDDLE DOT..LATIN SMALL LETTER L WITH STROKE +0144 ; A # L& LATIN SMALL LETTER N WITH ACUTE +0148..014B ; A # L& [4] LATIN SMALL LETTER N WITH CARON..LATIN SMALL LETTER ENG +014D ; A # L& LATIN SMALL LETTER O WITH MACRON +0152..0153 ; A # L& [2] LATIN CAPITAL LIGATURE OE..LATIN SMALL LIGATURE OE +0166..0167 ; A # L& [2] LATIN CAPITAL LETTER T WITH STROKE..LATIN SMALL LETTER T WITH STROKE +016B ; A # L& LATIN SMALL LETTER U WITH MACRON +01CE ; A # L& LATIN SMALL LETTER A WITH CARON +01D0 ; A # L& LATIN SMALL LETTER I WITH CARON +01D2 ; A # L& LATIN SMALL LETTER O WITH CARON +01D4 ; A # L& LATIN SMALL LETTER U WITH CARON +01D6 ; A # L& LATIN SMALL LETTER U WITH DIAERESIS AND MACRON +01D8 ; A # L& LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE +01DA ; A # L& LATIN SMALL LETTER U WITH DIAERESIS AND CARON +01DC ; A # L& LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE +0251 ; A # L& LATIN SMALL LETTER ALPHA +0261 ; A # L& LATIN SMALL LETTER SCRIPT G +02C4 ; A # Sk MODIFIER LETTER UP ARROWHEAD +02C7 ; A # Sk CARON +02C9..02CB ; A # Sk [3] MODIFIER LETTER MACRON..MODIFIER LETTER GRAVE ACCENT +02CD ; A # Sk MODIFIER LETTER LOW MACRON +02D0 ; A # Lm MODIFIER LETTER TRIANGULAR COLON +02D8..02DB ; A # Sk [4] BREVE..OGONEK +02DD ; A # Sk DOUBLE ACUTE ACCENT +02DF ; A # Sk MODIFIER LETTER CROSS ACCENT +0300..034F ; A # Mn [80] COMBINING GRAVE ACCENT..COMBINING GRAPHEME JOINER +0360..036F ; A # Mn [16] COMBINING DOUBLE TILDE..COMBINING LATIN SMALL LETTER X +0391..03A1 ; A # L& [17] GREEK CAPITAL LETTER ALPHA..GREEK CAPITAL LETTER RHO +03A3..03A9 ; A # L& [7] GREEK CAPITAL LETTER SIGMA..GREEK CAPITAL LETTER OMEGA +03B1..03C1 ; A # L& [17] GREEK SMALL LETTER ALPHA..GREEK SMALL LETTER RHO +03C3..03C9 ; A # L& [7] GREEK SMALL LETTER SIGMA..GREEK SMALL LETTER OMEGA +0401 ; A # L& CYRILLIC CAPITAL LETTER IO +0410..044F ; A # L& [64] CYRILLIC CAPITAL LETTER A..CYRILLIC SMALL LETTER YA +0451 ; A # L& CYRILLIC SMALL LETTER IO +2010 ; A # Pd HYPHEN +2013..2015 ; A # Pd [3] EN DASH..HORIZONTAL BAR +2016 ; A # Po DOUBLE VERTICAL LINE +2018 ; A # Pi LEFT SINGLE QUOTATION MARK +2019 ; A # Pf RIGHT SINGLE QUOTATION MARK +201C ; A # Pi LEFT DOUBLE QUOTATION MARK +201D ; A # Pf RIGHT DOUBLE QUOTATION MARK +2020..2022 ; A # Po [3] DAGGER..BULLET +2024..2027 ; A # Po [4] ONE DOT LEADER..HYPHENATION POINT +2030 ; A # Po PER MILLE SIGN +2032..2033 ; A # Po [2] PRIME..DOUBLE PRIME +2035 ; A # Po REVERSED PRIME +203B ; A # Po REFERENCE MARK +203E ; A # Po OVERLINE +2074 ; A # No SUPERSCRIPT FOUR +207F ; A # L& SUPERSCRIPT LATIN SMALL LETTER N +2081..2084 ; A # No [4] SUBSCRIPT ONE..SUBSCRIPT FOUR +20AC ; A # Sc EURO SIGN +2103 ; A # So DEGREE CELSIUS +2105 ; A # So CARE OF +2109 ; A # So DEGREE FAHRENHEIT +2113 ; A # L& SCRIPT SMALL L +2116 ; A # So NUMERO SIGN +2121..2122 ; A # So [2] TELEPHONE SIGN..TRADE MARK SIGN +2126 ; A # L& OHM SIGN +212B ; A # L& ANGSTROM SIGN +2153..2154 ; A # No [2] VULGAR FRACTION ONE THIRD..VULGAR FRACTION TWO THIRDS +215B..215E ; A # No [4] VULGAR FRACTION ONE EIGHTH..VULGAR FRACTION SEVEN EIGHTHS +2160..216B ; A # Nl [12] ROMAN NUMERAL ONE..ROMAN NUMERAL TWELVE +2170..2179 ; A # Nl [10] SMALL ROMAN NUMERAL ONE..SMALL ROMAN NUMERAL TEN +2190..2194 ; A # Sm [5] LEFTWARDS ARROW..LEFT RIGHT ARROW +2195..2199 ; A # So [5] UP DOWN ARROW..SOUTH WEST ARROW +21B8..21B9 ; A # So [2] NORTH WEST ARROW TO LONG BAR..LEFTWARDS ARROW TO BAR OVER RIGHTWARDS ARROW TO BAR +21D2 ; A # Sm RIGHTWARDS DOUBLE ARROW +21D4 ; A # Sm LEFT RIGHT DOUBLE ARROW +21E7 ; A # So UPWARDS WHITE ARROW +2200 ; A # Sm FOR ALL +2202..2203 ; A # Sm [2] PARTIAL DIFFERENTIAL..THERE EXISTS +2207..2208 ; A # Sm [2] NABLA..ELEMENT OF +220B ; A # Sm CONTAINS AS MEMBER +220F ; A # Sm N-ARY PRODUCT +2211 ; A # Sm N-ARY SUMMATION +2215 ; A # Sm DIVISION SLASH +221A ; A # Sm SQUARE ROOT +221D..2220 ; A # Sm [4] PROPORTIONAL TO..ANGLE +2223 ; A # Sm DIVIDES +2225 ; A # Sm PARALLEL TO +2227..222C ; A # Sm [6] LOGICAL AND..DOUBLE INTEGRAL +222E ; A # Sm CONTOUR INTEGRAL +2234..2237 ; A # Sm [4] THEREFORE..PROPORTION +223C..223D ; A # Sm [2] TILDE OPERATOR..REVERSED TILDE +2248 ; A # Sm ALMOST EQUAL TO +224C ; A # Sm ALL EQUAL TO +2252 ; A # Sm APPROXIMATELY EQUAL TO OR THE IMAGE OF +2260..2261 ; A # Sm [2] NOT EQUAL TO..IDENTICAL TO +2264..2267 ; A # Sm [4] LESS-THAN OR EQUAL TO..GREATER-THAN OVER EQUAL TO +226A..226B ; A # Sm [2] MUCH LESS-THAN..MUCH GREATER-THAN +226E..226F ; A # Sm [2] NOT LESS-THAN..NOT GREATER-THAN +2282..2283 ; A # Sm [2] SUBSET OF..SUPERSET OF +2286..2287 ; A # Sm [2] SUBSET OF OR EQUAL TO..SUPERSET OF OR EQUAL TO +2295 ; A # Sm CIRCLED PLUS +2299 ; A # Sm CIRCLED DOT OPERATOR +22A5 ; A # Sm UP TACK +22BF ; A # Sm RIGHT TRIANGLE +2312 ; A # So ARC +2460..249B ; A # No [60] CIRCLED DIGIT ONE..NUMBER TWENTY FULL STOP +249C..24E9 ; A # So [78] PARENTHESIZED LATIN SMALL LETTER A..CIRCLED LATIN SMALL LETTER Z +24EB..24FE ; A # No [20] NEGATIVE CIRCLED NUMBER ELEVEN..DOUBLE CIRCLED NUMBER TEN +2500..254B ; A # So [76] BOX DRAWINGS LIGHT HORIZONTAL..BOX DRAWINGS HEAVY VERTICAL AND HORIZONTAL +2550..2573 ; A # So [36] BOX DRAWINGS DOUBLE HORIZONTAL..BOX DRAWINGS LIGHT DIAGONAL CROSS +2580..258F ; A # So [16] UPPER HALF BLOCK..LEFT ONE EIGHTH BLOCK +2592..2595 ; A # So [4] MEDIUM SHADE..RIGHT ONE EIGHTH BLOCK +25A0..25A1 ; A # So [2] BLACK SQUARE..WHITE SQUARE +25A3..25A9 ; A # So [7] WHITE SQUARE CONTAINING BLACK SMALL SQUARE..SQUARE WITH DIAGONAL CROSSHATCH FILL +25B2..25B3 ; A # So [2] BLACK UP-POINTING TRIANGLE..WHITE UP-POINTING TRIANGLE +25B6 ; A # So BLACK RIGHT-POINTING TRIANGLE +25B7 ; A # Sm WHITE RIGHT-POINTING TRIANGLE +25BC..25BD ; A # So [2] BLACK DOWN-POINTING TRIANGLE..WHITE DOWN-POINTING TRIANGLE +25C0 ; A # So BLACK LEFT-POINTING TRIANGLE +25C1 ; A # Sm WHITE LEFT-POINTING TRIANGLE +25C6..25C8 ; A # So [3] BLACK DIAMOND..WHITE DIAMOND CONTAINING BLACK SMALL DIAMOND +25CB ; A # So WHITE CIRCLE +25CE..25D1 ; A # So [4] BULLSEYE..CIRCLE WITH RIGHT HALF BLACK +25E2..25E5 ; A # So [4] BLACK LOWER RIGHT TRIANGLE..BLACK UPPER RIGHT TRIANGLE +25EF ; A # So LARGE CIRCLE +2605..2606 ; A # So [2] BLACK STAR..WHITE STAR +2609 ; A # So SUN +260E..260F ; A # So [2] BLACK TELEPHONE..WHITE TELEPHONE +261C ; A # So WHITE LEFT POINTING INDEX +261E ; A # So WHITE RIGHT POINTING INDEX +2640 ; A # So FEMALE SIGN +2642 ; A # So MALE SIGN +2660..2661 ; A # So [2] BLACK SPADE SUIT..WHITE HEART SUIT +2663..2665 ; A # So [3] BLACK CLUB SUIT..BLACK HEART SUIT +2667..266A ; A # So [4] WHITE CLUB SUIT..EIGHTH NOTE +266C..266D ; A # So [2] BEAMED SIXTEENTH NOTES..MUSIC FLAT SIGN +266F ; A # Sm MUSIC SHARP SIGN +273D ; A # So HEAVY TEARDROP-SPOKED ASTERISK +2776..277F ; A # No [10] DINGBAT NEGATIVE CIRCLED DIGIT ONE..DINGBAT NEGATIVE CIRCLED NUMBER TEN +E000..F8FF ; A # Co [6400] +FE00..FE0F ; A # Mn [16] VARIATION SELECTOR-1..VARIATION SELECTOR-16 +FFFD ; A # So REPLACEMENT CHARACTER +F0000..FFFFD ; A # Co [65534] +100000..10FFFD; A # Co [65534] + +# Total code points: 138272 + +# ================================================ + +20A9 ; H # Sc WON SIGN +FF61 ; H # Po HALFWIDTH IDEOGRAPHIC FULL STOP +FF62 ; H # Ps HALFWIDTH LEFT CORNER BRACKET +FF63 ; H # Pe HALFWIDTH RIGHT CORNER BRACKET +FF64 ; H # Po HALFWIDTH IDEOGRAPHIC COMMA +FF65 ; H # Pc HALFWIDTH KATAKANA MIDDLE DOT +FF66..FF6F ; H # Lo [10] HALFWIDTH KATAKANA LETTER WO..HALFWIDTH KATAKANA LETTER SMALL TU +FF70 ; H # Lm HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK +FF71..FF9D ; H # Lo [45] HALFWIDTH KATAKANA LETTER A..HALFWIDTH KATAKANA LETTER N +FF9E..FF9F ; H # Lm [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK +FFA0..FFBE ; H # Lo [31] HALFWIDTH HANGUL FILLER..HALFWIDTH HANGUL LETTER HIEUH +FFC2..FFC7 ; H # Lo [6] HALFWIDTH HANGUL LETTER A..HALFWIDTH HANGUL LETTER E +FFCA..FFCF ; H # Lo [6] HALFWIDTH HANGUL LETTER YEO..HALFWIDTH HANGUL LETTER OE +FFD2..FFD7 ; H # Lo [6] HALFWIDTH HANGUL LETTER YO..HALFWIDTH HANGUL LETTER YU +FFDA..FFDC ; H # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL LETTER I +FFE8 ; H # So HALFWIDTH FORMS LIGHT VERTICAL +FFE9..FFEC ; H # Sm [4] HALFWIDTH LEFTWARDS ARROW..HALFWIDTH DOWNWARDS ARROW +FFED..FFEE ; H # So [2] HALFWIDTH BLACK SQUARE..HALFWIDTH WHITE CIRCLE + +# Total code points: 123 + +# ================================================ + +1100..1159 ; W # Lo [90] HANGUL CHOSEONG KIYEOK..HANGUL CHOSEONG YEORINHIEUH +115F ; W # Lo HANGUL CHOSEONG FILLER +2329 ; W # Ps LEFT-POINTING ANGLE BRACKET +232A ; W # Pe RIGHT-POINTING ANGLE BRACKET +2E80..2E99 ; W # So [26] CJK RADICAL REPEAT..CJK RADICAL RAP +2E9B..2EF3 ; W # So [89] CJK RADICAL CHOKE..CJK RADICAL C-SIMPLIFIED TURTLE +2F00..2FD5 ; W # So [214] KANGXI RADICAL ONE..KANGXI RADICAL FLUTE +2FF0..2FFB ; W # So [12] IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT..IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID +3001..3003 ; W # Po [3] IDEOGRAPHIC COMMA..DITTO MARK +3004 ; W # So JAPANESE INDUSTRIAL STANDARD SYMBOL +3005 ; W # Lm IDEOGRAPHIC ITERATION MARK +3006 ; W # Lo IDEOGRAPHIC CLOSING MARK +3007 ; W # Nl IDEOGRAPHIC NUMBER ZERO +3008 ; W # Ps LEFT ANGLE BRACKET +3009 ; W # Pe RIGHT ANGLE BRACKET +300A ; W # Ps LEFT DOUBLE ANGLE BRACKET +300B ; W # Pe RIGHT DOUBLE ANGLE BRACKET +300C ; W # Ps LEFT CORNER BRACKET +300D ; W # Pe RIGHT CORNER BRACKET +300E ; W # Ps LEFT WHITE CORNER BRACKET +300F ; W # Pe RIGHT WHITE CORNER BRACKET +3010 ; W # Ps LEFT BLACK LENTICULAR BRACKET +3011 ; W # Pe RIGHT BLACK LENTICULAR BRACKET +3012..3013 ; W # So [2] POSTAL MARK..GETA MARK +3014 ; W # Ps LEFT TORTOISE SHELL BRACKET +3015 ; W # Pe RIGHT TORTOISE SHELL BRACKET +3016 ; W # Ps LEFT WHITE LENTICULAR BRACKET +3017 ; W # Pe RIGHT WHITE LENTICULAR BRACKET +3018 ; W # Ps LEFT WHITE TORTOISE SHELL BRACKET +3019 ; W # Pe RIGHT WHITE TORTOISE SHELL BRACKET +301A ; W # Ps LEFT WHITE SQUARE BRACKET +301B ; W # Pe RIGHT WHITE SQUARE BRACKET +301C ; W # Pd WAVE DASH +301D ; W # Ps REVERSED DOUBLE PRIME QUOTATION MARK +301E..301F ; W # Pe [2] DOUBLE PRIME QUOTATION MARK..LOW DOUBLE PRIME QUOTATION MARK +3020 ; W # So POSTAL MARK FACE +3021..3029 ; W # Nl [9] HANGZHOU NUMERAL ONE..HANGZHOU NUMERAL NINE +302A..302F ; W # Mn [6] IDEOGRAPHIC LEVEL TONE MARK..HANGUL DOUBLE DOT TONE MARK +3030 ; W # Pd WAVY DASH +3031..3035 ; W # Lm [5] VERTICAL KANA REPEAT MARK..VERTICAL KANA REPEAT MARK LOWER HALF +3036..3037 ; W # So [2] CIRCLED POSTAL MARK..IDEOGRAPHIC TELEGRAPH LINE FEED SEPARATOR SYMBOL +3038..303A ; W # Nl [3] HANGZHOU NUMERAL TEN..HANGZHOU NUMERAL THIRTY +303B ; W # Lm VERTICAL IDEOGRAPHIC ITERATION MARK +303C ; W # Lo MASU MARK +303D ; W # Po PART ALTERNATION MARK +303E ; W # So IDEOGRAPHIC VARIATION INDICATOR +3041..3096 ; W # Lo [86] HIRAGANA LETTER SMALL A..HIRAGANA LETTER SMALL KE +3099..309A ; W # Mn [2] COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK..COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK +309B..309C ; W # Sk [2] KATAKANA-HIRAGANA VOICED SOUND MARK..KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK +309D..309E ; W # Lm [2] HIRAGANA ITERATION MARK..HIRAGANA VOICED ITERATION MARK +309F ; W # Lo HIRAGANA DIGRAPH YORI +30A0 ; W # Pd KATAKANA-HIRAGANA DOUBLE HYPHEN +30A1..30FA ; W # Lo [90] KATAKANA LETTER SMALL A..KATAKANA LETTER VO +30FB ; W # Pc KATAKANA MIDDLE DOT +30FC..30FE ; W # Lm [3] KATAKANA-HIRAGANA PROLONGED SOUND MARK..KATAKANA VOICED ITERATION MARK +30FF ; W # Lo KATAKANA DIGRAPH KOTO +3105..312C ; W # Lo [40] BOPOMOFO LETTER B..BOPOMOFO LETTER GN +3131..318E ; W # Lo [94] HANGUL LETTER KIYEOK..HANGUL LETTER ARAEAE +3190..3191 ; W # So [2] IDEOGRAPHIC ANNOTATION LINKING MARK..IDEOGRAPHIC ANNOTATION REVERSE MARK +3192..3195 ; W # No [4] IDEOGRAPHIC ANNOTATION ONE MARK..IDEOGRAPHIC ANNOTATION FOUR MARK +3196..319F ; W # So [10] IDEOGRAPHIC ANNOTATION TOP MARK..IDEOGRAPHIC ANNOTATION MAN MARK +31A0..31B7 ; W # Lo [24] BOPOMOFO LETTER BU..BOPOMOFO FINAL LETTER H +31F0..31FF ; W # Lo [16] KATAKANA LETTER SMALL KU..KATAKANA LETTER SMALL RO +3200..321C ; W # So [29] PARENTHESIZED HANGUL KIYEOK..PARENTHESIZED HANGUL CIEUC U +3220..3229 ; W # No [10] PARENTHESIZED IDEOGRAPH ONE..PARENTHESIZED IDEOGRAPH TEN +322A..3243 ; W # So [26] PARENTHESIZED IDEOGRAPH MOON..PARENTHESIZED IDEOGRAPH REACH +3251..325F ; W # No [15] CIRCLED NUMBER TWENTY ONE..CIRCLED NUMBER THIRTY FIVE +3260..327B ; W # So [28] CIRCLED HANGUL KIYEOK..CIRCLED HANGUL HIEUH A +327F ; W # So KOREAN STANDARD SYMBOL +3280..3289 ; W # No [10] CIRCLED IDEOGRAPH ONE..CIRCLED IDEOGRAPH TEN +328A..32B0 ; W # So [39] CIRCLED IDEOGRAPH MOON..CIRCLED IDEOGRAPH NIGHT +32B1..32BF ; W # No [15] CIRCLED NUMBER THIRTY SIX..CIRCLED NUMBER FIFTY +32C0..32CB ; W # So [12] IDEOGRAPHIC TELEGRAPH SYMBOL FOR JANUARY..IDEOGRAPHIC TELEGRAPH SYMBOL FOR DECEMBER +32D0..32FE ; W # So [47] CIRCLED KATAKANA A..CIRCLED KATAKANA WO +3300..3376 ; W # So [119] SQUARE APAATO..SQUARE PC +337B..33DD ; W # So [99] SQUARE ERA NAME HEISEI..SQUARE WB +33E0..33FE ; W # So [31] IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY ONE..IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY THIRTY-ONE +3400..4DB5 ; W # Lo [6582] CJK UNIFIED IDEOGRAPH-3400..CJK UNIFIED IDEOGRAPH-4DB5 +4E00..9FA5 ; W # Lo [20902] CJK UNIFIED IDEOGRAPH-4E00..CJK UNIFIED IDEOGRAPH-9FA5 +A000..A48C ; W # Lo [1165] YI SYLLABLE IT..YI SYLLABLE YYR +A490..A4C6 ; W # So [55] YI RADICAL QOT..YI RADICAL KE +AC00..D7A3 ; W # Lo [11172] HANGUL SYLLABLE GA..HANGUL SYLLABLE HIH +F900..FA2D ; W # Lo [302] CJK COMPATIBILITY IDEOGRAPH-F900..CJK COMPATIBILITY IDEOGRAPH-FA2D +FA30..FA6A ; W # Lo [59] CJK COMPATIBILITY IDEOGRAPH-FA30..CJK COMPATIBILITY IDEOGRAPH-FA6A +FE30 ; W # Po PRESENTATION FORM FOR VERTICAL TWO DOT LEADER +FE31..FE32 ; W # Pd [2] PRESENTATION FORM FOR VERTICAL EM DASH..PRESENTATION FORM FOR VERTICAL EN DASH +FE33..FE34 ; W # Pc [2] PRESENTATION FORM FOR VERTICAL LOW LINE..PRESENTATION FORM FOR VERTICAL WAVY LOW LINE +FE35 ; W # Ps PRESENTATION FORM FOR VERTICAL LEFT PARENTHESIS +FE36 ; W # Pe PRESENTATION FORM FOR VERTICAL RIGHT PARENTHESIS +FE37 ; W # Ps PRESENTATION FORM FOR VERTICAL LEFT CURLY BRACKET +FE38 ; W # Pe PRESENTATION FORM FOR VERTICAL RIGHT CURLY BRACKET +FE39 ; W # Ps PRESENTATION FORM FOR VERTICAL LEFT TORTOISE SHELL BRACKET +FE3A ; W # Pe PRESENTATION FORM FOR VERTICAL RIGHT TORTOISE SHELL BRACKET +FE3B ; W # Ps PRESENTATION FORM FOR VERTICAL LEFT BLACK LENTICULAR BRACKET +FE3C ; W # Pe PRESENTATION FORM FOR VERTICAL RIGHT BLACK LENTICULAR BRACKET +FE3D ; W # Ps PRESENTATION FORM FOR VERTICAL LEFT DOUBLE ANGLE BRACKET +FE3E ; W # Pe PRESENTATION FORM FOR VERTICAL RIGHT DOUBLE ANGLE BRACKET +FE3F ; W # Ps PRESENTATION FORM FOR VERTICAL LEFT ANGLE BRACKET +FE40 ; W # Pe PRESENTATION FORM FOR VERTICAL RIGHT ANGLE BRACKET +FE41 ; W # Ps PRESENTATION FORM FOR VERTICAL LEFT CORNER BRACKET +FE42 ; W # Pe PRESENTATION FORM FOR VERTICAL RIGHT CORNER BRACKET +FE43 ; W # Ps PRESENTATION FORM FOR VERTICAL LEFT WHITE CORNER BRACKET +FE44 ; W # Pe PRESENTATION FORM FOR VERTICAL RIGHT WHITE CORNER BRACKET +FE45..FE46 ; W # Po [2] SESAME DOT..WHITE SESAME DOT +FE49..FE4C ; W # Po [4] DASHED OVERLINE..DOUBLE WAVY OVERLINE +FE4D..FE4F ; W # Pc [3] DASHED LOW LINE..WAVY LOW LINE +FE50..FE52 ; W # Po [3] SMALL COMMA..SMALL FULL STOP +FE54..FE57 ; W # Po [4] SMALL SEMICOLON..SMALL EXCLAMATION MARK +FE58 ; W # Pd SMALL EM DASH +FE59 ; W # Ps SMALL LEFT PARENTHESIS +FE5A ; W # Pe SMALL RIGHT PARENTHESIS +FE5B ; W # Ps SMALL LEFT CURLY BRACKET +FE5C ; W # Pe SMALL RIGHT CURLY BRACKET +FE5D ; W # Ps SMALL LEFT TORTOISE SHELL BRACKET +FE5E ; W # Pe SMALL RIGHT TORTOISE SHELL BRACKET +FE5F..FE61 ; W # Po [3] SMALL NUMBER SIGN..SMALL ASTERISK +FE62 ; W # Sm SMALL PLUS SIGN +FE63 ; W # Pd SMALL HYPHEN-MINUS +FE64..FE66 ; W # Sm [3] SMALL LESS-THAN SIGN..SMALL EQUALS SIGN +FE68 ; W # Po SMALL REVERSE SOLIDUS +FE69 ; W # Sc SMALL DOLLAR SIGN +FE6A..FE6B ; W # Po [2] SMALL PERCENT SIGN..SMALL COMMERCIAL AT +20000..2A6D6 ; W # Lo [42711] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6D6 +2F800..2FA1D ; W # Lo [542] CJK COMPATIBILITY IDEOGRAPH-2F800..CJK COMPATIBILITY IDEOGRAPH-2FA1D + +# Total code points: 84902 + +# ================================================ + +3000 ; F # Zs IDEOGRAPHIC SPACE +FF01..FF03 ; F # Po [3] FULLWIDTH EXCLAMATION MARK..FULLWIDTH NUMBER SIGN +FF04 ; F # Sc FULLWIDTH DOLLAR SIGN +FF05..FF07 ; F # Po [3] FULLWIDTH PERCENT SIGN..FULLWIDTH APOSTROPHE +FF08 ; F # Ps FULLWIDTH LEFT PARENTHESIS +FF09 ; F # Pe FULLWIDTH RIGHT PARENTHESIS +FF0A ; F # Po FULLWIDTH ASTERISK +FF0B ; F # Sm FULLWIDTH PLUS SIGN +FF0C ; F # Po FULLWIDTH COMMA +FF0D ; F # Pd FULLWIDTH HYPHEN-MINUS +FF0E..FF0F ; F # Po [2] FULLWIDTH FULL STOP..FULLWIDTH SOLIDUS +FF10..FF19 ; F # Nd [10] FULLWIDTH DIGIT ZERO..FULLWIDTH DIGIT NINE +FF1A..FF1B ; F # Po [2] FULLWIDTH COLON..FULLWIDTH SEMICOLON +FF1C..FF1E ; F # Sm [3] FULLWIDTH LESS-THAN SIGN..FULLWIDTH GREATER-THAN SIGN +FF1F..FF20 ; F # Po [2] FULLWIDTH QUESTION MARK..FULLWIDTH COMMERCIAL AT +FF21..FF3A ; F # L& [26] FULLWIDTH LATIN CAPITAL LETTER A..FULLWIDTH LATIN CAPITAL LETTER Z +FF3B ; F # Ps FULLWIDTH LEFT SQUARE BRACKET +FF3C ; F # Po FULLWIDTH REVERSE SOLIDUS +FF3D ; F # Pe FULLWIDTH RIGHT SQUARE BRACKET +FF3E ; F # Sk FULLWIDTH CIRCUMFLEX ACCENT +FF3F ; F # Pc FULLWIDTH LOW LINE +FF40 ; F # Sk FULLWIDTH GRAVE ACCENT +FF41..FF5A ; F # L& [26] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH LATIN SMALL LETTER Z +FF5B ; F # Ps FULLWIDTH LEFT CURLY BRACKET +FF5C ; F # Sm FULLWIDTH VERTICAL LINE +FF5D ; F # Pe FULLWIDTH RIGHT CURLY BRACKET +FF5E ; F # Sm FULLWIDTH TILDE +FF5F ; F # Ps FULLWIDTH LEFT WHITE PARENTHESIS +FF60 ; F # Pe FULLWIDTH RIGHT WHITE PARENTHESIS +FFE0..FFE1 ; F # Sc [2] FULLWIDTH CENT SIGN..FULLWIDTH POUND SIGN +FFE2 ; F # Sm FULLWIDTH NOT SIGN +FFE3 ; F # Sk FULLWIDTH MACRON +FFE4 ; F # So FULLWIDTH BROKEN BAR +FFE5..FFE6 ; F # Sc [2] FULLWIDTH YEN SIGN..FULLWIDTH WON SIGN + +# Total code points: 104 + +# ================================================ + +0020 ; Na # Zs SPACE +0021..0023 ; Na # Po [3] EXCLAMATION MARK..NUMBER SIGN +0024 ; Na # Sc DOLLAR SIGN +0025..0027 ; Na # Po [3] PERCENT SIGN..APOSTROPHE +0028 ; Na # Ps LEFT PARENTHESIS +0029 ; Na # Pe RIGHT PARENTHESIS +002A ; Na # Po ASTERISK +002B ; Na # Sm PLUS SIGN +002C ; Na # Po COMMA +002D ; Na # Pd HYPHEN-MINUS +002E..002F ; Na # Po [2] FULL STOP..SOLIDUS +0030..0039 ; Na # Nd [10] DIGIT ZERO..DIGIT NINE +003A..003B ; Na # Po [2] COLON..SEMICOLON +003C..003E ; Na # Sm [3] LESS-THAN SIGN..GREATER-THAN SIGN +003F..0040 ; Na # Po [2] QUESTION MARK..COMMERCIAL AT +0041..005A ; Na # L& [26] LATIN CAPITAL LETTER A..LATIN CAPITAL LETTER Z +005B ; Na # Ps LEFT SQUARE BRACKET +005C ; Na # Po REVERSE SOLIDUS +005D ; Na # Pe RIGHT SQUARE BRACKET +005E ; Na # Sk CIRCUMFLEX ACCENT +005F ; Na # Pc LOW LINE +0060 ; Na # Sk GRAVE ACCENT +0061..007A ; Na # L& [26] LATIN SMALL LETTER A..LATIN SMALL LETTER Z +007B ; Na # Ps LEFT CURLY BRACKET +007C ; Na # Sm VERTICAL LINE +007D ; Na # Pe RIGHT CURLY BRACKET +007E ; Na # Sm TILDE +00A2..00A3 ; Na # Sc [2] CENT SIGN..POUND SIGN +00A5 ; Na # Sc YEN SIGN +00A6 ; Na # So BROKEN BAR +00AC ; Na # Sm NOT SIGN +00AF ; Na # Sk MACRON +27E6 ; Na # Ps MATHEMATICAL LEFT WHITE SQUARE BRACKET +27E7 ; Na # Pe MATHEMATICAL RIGHT WHITE SQUARE BRACKET +27E8 ; Na # Ps MATHEMATICAL LEFT ANGLE BRACKET +27E9 ; Na # Pe MATHEMATICAL RIGHT ANGLE BRACKET +27EA ; Na # Ps MATHEMATICAL LEFT DOUBLE ANGLE BRACKET +27EB ; Na # Pe MATHEMATICAL RIGHT DOUBLE ANGLE BRACKET +2985 ; Na # Ps LEFT WHITE PARENTHESIS +2986 ; Na # Pe RIGHT WHITE PARENTHESIS + +# Total code points: 109 + diff --git a/crates/stdlib/unicode/ucd32/DerivedGeneralCategory-3.2.0.txt b/crates/stdlib/unicode/ucd32/DerivedGeneralCategory-3.2.0.txt new file mode 100644 index 000000000..0ec9bc48c --- /dev/null +++ b/crates/stdlib/unicode/ucd32/DerivedGeneralCategory-3.2.0.txt @@ -0,0 +1,2303 @@ +# DerivedGeneralCategory-3.2.0.txt +# Date: 2002-03-19,23:30:49 GMT [MD] +# +# Unicode Character Database: Derived Property Data +# Generated algorithmically from the Unicode Character Database +# For documentation, see DerivedProperties.html +# Note: Unassigned and Noncharacter codepoints are omitted, +# except when listing Noncharacter or Cn. +# ================================================ + + +# ================================================ +# General Category (listing UnicodeData.txt, field 2: see UnicodeData.html) +# ================================================ + +0221 ; Cn # +0234..024F ; Cn # [28] +02AE..02AF ; Cn # [2] +02EF..02FF ; Cn # [17] +0350..035F ; Cn # [16] +0370..0373 ; Cn # [4] +0376..0379 ; Cn # [4] +037B..037D ; Cn # [3] +037F..0383 ; Cn # [5] +038B ; Cn # +038D ; Cn # +03A2 ; Cn # +03CF ; Cn # +03F7..03FF ; Cn # [9] +0487 ; Cn # +04CF ; Cn # +04F6..04F7 ; Cn # [2] +04FA..04FF ; Cn # [6] +0510..0530 ; Cn # [33] +0557..0558 ; Cn # [2] +0560 ; Cn # +0588 ; Cn # +058B..0590 ; Cn # [6] +05A2 ; Cn # +05BA ; Cn # +05C5..05CF ; Cn # [11] +05EB..05EF ; Cn # [5] +05F5..060B ; Cn # [23] +060D..061A ; Cn # [14] +061C..061E ; Cn # [3] +0620 ; Cn # +063B..063F ; Cn # [5] +0656..065F ; Cn # [10] +06EE..06EF ; Cn # [2] +06FF ; Cn # +070E ; Cn # +072D..072F ; Cn # [3] +074B..077F ; Cn # [53] +07B2..0900 ; Cn # [335] +0904 ; Cn # +093A..093B ; Cn # [2] +094E..094F ; Cn # [2] +0955..0957 ; Cn # [3] +0971..0980 ; Cn # [16] +0984 ; Cn # +098D..098E ; Cn # [2] +0991..0992 ; Cn # [2] +09A9 ; Cn # +09B1 ; Cn # +09B3..09B5 ; Cn # [3] +09BA..09BB ; Cn # [2] +09BD ; Cn # +09C5..09C6 ; Cn # [2] +09C9..09CA ; Cn # [2] +09CE..09D6 ; Cn # [9] +09D8..09DB ; Cn # [4] +09DE ; Cn # +09E4..09E5 ; Cn # [2] +09FB..0A01 ; Cn # [7] +0A03..0A04 ; Cn # [2] +0A0B..0A0E ; Cn # [4] +0A11..0A12 ; Cn # [2] +0A29 ; Cn # +0A31 ; Cn # +0A34 ; Cn # +0A37 ; Cn # +0A3A..0A3B ; Cn # [2] +0A3D ; Cn # +0A43..0A46 ; Cn # [4] +0A49..0A4A ; Cn # [2] +0A4E..0A58 ; Cn # [11] +0A5D ; Cn # +0A5F..0A65 ; Cn # [7] +0A75..0A80 ; Cn # [12] +0A84 ; Cn # +0A8C ; Cn # +0A8E ; Cn # +0A92 ; Cn # +0AA9 ; Cn # +0AB1 ; Cn # +0AB4 ; Cn # +0ABA..0ABB ; Cn # [2] +0AC6 ; Cn # +0ACA ; Cn # +0ACE..0ACF ; Cn # [2] +0AD1..0ADF ; Cn # [15] +0AE1..0AE5 ; Cn # [5] +0AF0..0B00 ; Cn # [17] +0B04 ; Cn # +0B0D..0B0E ; Cn # [2] +0B11..0B12 ; Cn # [2] +0B29 ; Cn # +0B31 ; Cn # +0B34..0B35 ; Cn # [2] +0B3A..0B3B ; Cn # [2] +0B44..0B46 ; Cn # [3] +0B49..0B4A ; Cn # [2] +0B4E..0B55 ; Cn # [8] +0B58..0B5B ; Cn # [4] +0B5E ; Cn # +0B62..0B65 ; Cn # [4] +0B71..0B81 ; Cn # [17] +0B84 ; Cn # +0B8B..0B8D ; Cn # [3] +0B91 ; Cn # +0B96..0B98 ; Cn # [3] +0B9B ; Cn # +0B9D ; Cn # +0BA0..0BA2 ; Cn # [3] +0BA5..0BA7 ; Cn # [3] +0BAB..0BAD ; Cn # [3] +0BB6 ; Cn # +0BBA..0BBD ; Cn # [4] +0BC3..0BC5 ; Cn # [3] +0BC9 ; Cn # +0BCE..0BD6 ; Cn # [9] +0BD8..0BE6 ; Cn # [15] +0BF3..0C00 ; Cn # [14] +0C04 ; Cn # +0C0D ; Cn # +0C11 ; Cn # +0C29 ; Cn # +0C34 ; Cn # +0C3A..0C3D ; Cn # [4] +0C45 ; Cn # +0C49 ; Cn # +0C4E..0C54 ; Cn # [7] +0C57..0C5F ; Cn # [9] +0C62..0C65 ; Cn # [4] +0C70..0C81 ; Cn # [18] +0C84 ; Cn # +0C8D ; Cn # +0C91 ; Cn # +0CA9 ; Cn # +0CB4 ; Cn # +0CBA..0CBD ; Cn # [4] +0CC5 ; Cn # +0CC9 ; Cn # +0CCE..0CD4 ; Cn # [7] +0CD7..0CDD ; Cn # [7] +0CDF ; Cn # +0CE2..0CE5 ; Cn # [4] +0CF0..0D01 ; Cn # [18] +0D04 ; Cn # +0D0D ; Cn # +0D11 ; Cn # +0D29 ; Cn # +0D3A..0D3D ; Cn # [4] +0D44..0D45 ; Cn # [2] +0D49 ; Cn # +0D4E..0D56 ; Cn # [9] +0D58..0D5F ; Cn # [8] +0D62..0D65 ; Cn # [4] +0D70..0D81 ; Cn # [18] +0D84 ; Cn # +0D97..0D99 ; Cn # [3] +0DB2 ; Cn # +0DBC ; Cn # +0DBE..0DBF ; Cn # [2] +0DC7..0DC9 ; Cn # [3] +0DCB..0DCE ; Cn # [4] +0DD5 ; Cn # +0DD7 ; Cn # +0DE0..0DF1 ; Cn # [18] +0DF5..0E00 ; Cn # [12] +0E3B..0E3E ; Cn # [4] +0E5C..0E80 ; Cn # [37] +0E83 ; Cn # +0E85..0E86 ; Cn # [2] +0E89 ; Cn # +0E8B..0E8C ; Cn # [2] +0E8E..0E93 ; Cn # [6] +0E98 ; Cn # +0EA0 ; Cn # +0EA4 ; Cn # +0EA6 ; Cn # +0EA8..0EA9 ; Cn # [2] +0EAC ; Cn # +0EBA ; Cn # +0EBE..0EBF ; Cn # [2] +0EC5 ; Cn # +0EC7 ; Cn # +0ECE..0ECF ; Cn # [2] +0EDA..0EDB ; Cn # [2] +0EDE..0EFF ; Cn # [34] +0F48 ; Cn # +0F6B..0F70 ; Cn # [6] +0F8C..0F8F ; Cn # [4] +0F98 ; Cn # +0FBD ; Cn # +0FCD..0FCE ; Cn # [2] +0FD0..0FFF ; Cn # [48] +1022 ; Cn # +1028 ; Cn # +102B ; Cn # +1033..1035 ; Cn # [3] +103A..103F ; Cn # [6] +105A..109F ; Cn # [70] +10C6..10CF ; Cn # [10] +10F9..10FA ; Cn # [2] +10FC..10FF ; Cn # [4] +115A..115E ; Cn # [5] +11A3..11A7 ; Cn # [5] +11FA..11FF ; Cn # [6] +1207 ; Cn # +1247 ; Cn # +1249 ; Cn # +124E..124F ; Cn # [2] +1257 ; Cn # +1259 ; Cn # +125E..125F ; Cn # [2] +1287 ; Cn # +1289 ; Cn # +128E..128F ; Cn # [2] +12AF ; Cn # +12B1 ; Cn # +12B6..12B7 ; Cn # [2] +12BF ; Cn # +12C1 ; Cn # +12C6..12C7 ; Cn # [2] +12CF ; Cn # +12D7 ; Cn # +12EF ; Cn # +130F ; Cn # +1311 ; Cn # +1316..1317 ; Cn # [2] +131F ; Cn # +1347 ; Cn # +135B..1360 ; Cn # [6] +137D..139F ; Cn # [35] +13F5..1400 ; Cn # [12] +1677..167F ; Cn # [9] +169D..169F ; Cn # [3] +16F1..16FF ; Cn # [15] +170D ; Cn # +1715..171F ; Cn # [11] +1737..173F ; Cn # [9] +1754..175F ; Cn # [12] +176D ; Cn # +1771 ; Cn # +1774..177F ; Cn # [12] +17DD..17DF ; Cn # [3] +17EA..17FF ; Cn # [22] +180F ; Cn # +181A..181F ; Cn # [6] +1878..187F ; Cn # [8] +18AA..1DFF ; Cn # [1366] +1E9C..1E9F ; Cn # [4] +1EFA..1EFF ; Cn # [6] +1F16..1F17 ; Cn # [2] +1F1E..1F1F ; Cn # [2] +1F46..1F47 ; Cn # [2] +1F4E..1F4F ; Cn # [2] +1F58 ; Cn # +1F5A ; Cn # +1F5C ; Cn # +1F5E ; Cn # +1F7E..1F7F ; Cn # [2] +1FB5 ; Cn # +1FC5 ; Cn # +1FD4..1FD5 ; Cn # [2] +1FDC ; Cn # +1FF0..1FF1 ; Cn # [2] +1FF5 ; Cn # +1FFF ; Cn # +2053..2056 ; Cn # [4] +2058..205E ; Cn # [7] +2064..2069 ; Cn # [6] +2072..2073 ; Cn # [2] +208F..209F ; Cn # [17] +20B2..20CF ; Cn # [30] +20EB..20FF ; Cn # [21] +213B..213C ; Cn # [2] +214C..2152 ; Cn # [7] +2184..218F ; Cn # [12] +23CF..23FF ; Cn # [49] +2427..243F ; Cn # [25] +244B..245F ; Cn # [21] +24FF ; Cn # +2614..2615 ; Cn # [2] +2618 ; Cn # +267E..267F ; Cn # [2] +268A..2700 ; Cn # [119] +2705 ; Cn # +270A..270B ; Cn # [2] +2728 ; Cn # +274C ; Cn # +274E ; Cn # +2753..2755 ; Cn # [3] +2757 ; Cn # +275F..2760 ; Cn # [2] +2795..2797 ; Cn # [3] +27B0 ; Cn # +27BF..27CF ; Cn # [17] +27EC..27EF ; Cn # [4] +2B00..2E7F ; Cn # [896] +2E9A ; Cn # +2EF4..2EFF ; Cn # [12] +2FD6..2FEF ; Cn # [26] +2FFC..2FFF ; Cn # [4] +3040 ; Cn # +3097..3098 ; Cn # [2] +3100..3104 ; Cn # [5] +312D..3130 ; Cn # [4] +318F ; Cn # +31B8..31EF ; Cn # [56] +321D..321F ; Cn # [3] +3244..3250 ; Cn # [13] +327C..327E ; Cn # [3] +32CC..32CF ; Cn # [4] +32FF ; Cn # +3377..337A ; Cn # [4] +33DE..33DF ; Cn # [2] +33FF ; Cn # +4DB6..4DFF ; Cn # [74] +9FA6..9FFF ; Cn # [90] +A48D..A48F ; Cn # [3] +A4C7..ABFF ; Cn # [1849] +D7A4..D7FF ; Cn # [92] +FA2E..FA2F ; Cn # [2] +FA6B..FAFF ; Cn # [149] +FB07..FB12 ; Cn # [12] +FB18..FB1C ; Cn # [5] +FB37 ; Cn # +FB3D ; Cn # +FB3F ; Cn # +FB42 ; Cn # +FB45 ; Cn # +FBB2..FBD2 ; Cn # [33] +FD40..FD4F ; Cn # [16] +FD90..FD91 ; Cn # [2] +FDC8..FDCF ; Cn # [8] +FDD0..FDEF ; Cn # [32] +FDFD..FDFF ; Cn # [3] +FE10..FE1F ; Cn # [16] +FE24..FE2F ; Cn # [12] +FE47..FE48 ; Cn # [2] +FE53 ; Cn # +FE67 ; Cn # +FE6C..FE6F ; Cn # [4] +FE75 ; Cn # +FEFD..FEFE ; Cn # [2] +FF00 ; Cn # +FFBF..FFC1 ; Cn # [3] +FFC8..FFC9 ; Cn # [2] +FFD0..FFD1 ; Cn # [2] +FFD8..FFD9 ; Cn # [2] +FFDD..FFDF ; Cn # [3] +FFE7 ; Cn # +FFEF..FFF8 ; Cn # [10] +FFFE..FFFF ; Cn # [2] +10000..102FF ; Cn # [768] +1031F ; Cn # +10324..1032F ; Cn # [12] +1034B..103FF ; Cn # [181] +10426..10427 ; Cn # [2] +1044E..1CFFF ; Cn # [52146] +1D0F6..1D0FF ; Cn # [10] +1D127..1D129 ; Cn # [3] +1D1DE..1D3FF ; Cn # [546] +1D455 ; Cn # +1D49D ; Cn # +1D4A0..1D4A1 ; Cn # [2] +1D4A3..1D4A4 ; Cn # [2] +1D4A7..1D4A8 ; Cn # [2] +1D4AD ; Cn # +1D4BA ; Cn # +1D4BC ; Cn # +1D4C1 ; Cn # +1D4C4 ; Cn # +1D506 ; Cn # +1D50B..1D50C ; Cn # [2] +1D515 ; Cn # +1D51D ; Cn # +1D53A ; Cn # +1D53F ; Cn # +1D545 ; Cn # +1D547..1D549 ; Cn # [3] +1D551 ; Cn # +1D6A4..1D6A7 ; Cn # [4] +1D7CA..1D7CD ; Cn # [4] +1D800..1FFFD ; Cn # [10238] +1FFFE..1FFFF ; Cn # [2] +2A6D7..2F7FF ; Cn # [20777] +2FA1E..2FFFD ; Cn # [1504] +2FFFE..2FFFF ; Cn # [2] +30000..3FFFD ; Cn # [65534] +3FFFE..3FFFF ; Cn # [2] +40000..4FFFD ; Cn # [65534] +4FFFE..4FFFF ; Cn # [2] +50000..5FFFD ; Cn # [65534] +5FFFE..5FFFF ; Cn # [2] +60000..6FFFD ; Cn # [65534] +6FFFE..6FFFF ; Cn # [2] +70000..7FFFD ; Cn # [65534] +7FFFE..7FFFF ; Cn # [2] +80000..8FFFD ; Cn # [65534] +8FFFE..8FFFF ; Cn # [2] +90000..9FFFD ; Cn # [65534] +9FFFE..9FFFF ; Cn # [2] +A0000..AFFFD ; Cn # [65534] +AFFFE..AFFFF ; Cn # [2] +B0000..BFFFD ; Cn # [65534] +BFFFE..BFFFF ; Cn # [2] +C0000..CFFFD ; Cn # [65534] +CFFFE..CFFFF ; Cn # [2] +D0000..DFFFD ; Cn # [65534] +DFFFE..DFFFF ; Cn # [2] +E0000 ; Cn # +E0002..E001F ; Cn # [30] +E0080..EFFFD ; Cn # [65406] +EFFFE..EFFFF ; Cn # [2] +FFFFE..FFFFF ; Cn # [2] +10FFFE..10FFFF; Cn # [2] + +# Total code points: 879375 + +# ================================================ + +0041..005A ; Lu # [26] LATIN CAPITAL LETTER A..LATIN CAPITAL LETTER Z +00C0..00D6 ; Lu # [23] LATIN CAPITAL LETTER A WITH GRAVE..LATIN CAPITAL LETTER O WITH DIAERESIS +00D8..00DE ; Lu # [7] LATIN CAPITAL LETTER O WITH STROKE..LATIN CAPITAL LETTER THORN +0100 ; Lu # LATIN CAPITAL LETTER A WITH MACRON +0102 ; Lu # LATIN CAPITAL LETTER A WITH BREVE +0104 ; Lu # LATIN CAPITAL LETTER A WITH OGONEK +0106 ; Lu # LATIN CAPITAL LETTER C WITH ACUTE +0108 ; Lu # LATIN CAPITAL LETTER C WITH CIRCUMFLEX +010A ; Lu # LATIN CAPITAL LETTER C WITH DOT ABOVE +010C ; Lu # LATIN CAPITAL LETTER C WITH CARON +010E ; Lu # LATIN CAPITAL LETTER D WITH CARON +0110 ; Lu # LATIN CAPITAL LETTER D WITH STROKE +0112 ; Lu # LATIN CAPITAL LETTER E WITH MACRON +0114 ; Lu # LATIN CAPITAL LETTER E WITH BREVE +0116 ; Lu # LATIN CAPITAL LETTER E WITH DOT ABOVE +0118 ; Lu # LATIN CAPITAL LETTER E WITH OGONEK +011A ; Lu # LATIN CAPITAL LETTER E WITH CARON +011C ; Lu # LATIN CAPITAL LETTER G WITH CIRCUMFLEX +011E ; Lu # LATIN CAPITAL LETTER G WITH BREVE +0120 ; Lu # LATIN CAPITAL LETTER G WITH DOT ABOVE +0122 ; Lu # LATIN CAPITAL LETTER G WITH CEDILLA +0124 ; Lu # LATIN CAPITAL LETTER H WITH CIRCUMFLEX +0126 ; Lu # LATIN CAPITAL LETTER H WITH STROKE +0128 ; Lu # LATIN CAPITAL LETTER I WITH TILDE +012A ; Lu # LATIN CAPITAL LETTER I WITH MACRON +012C ; Lu # LATIN CAPITAL LETTER I WITH BREVE +012E ; Lu # LATIN CAPITAL LETTER I WITH OGONEK +0130 ; Lu # LATIN CAPITAL LETTER I WITH DOT ABOVE +0132 ; Lu # LATIN CAPITAL LIGATURE IJ +0134 ; Lu # LATIN CAPITAL LETTER J WITH CIRCUMFLEX +0136 ; Lu # LATIN CAPITAL LETTER K WITH CEDILLA +0139 ; Lu # LATIN CAPITAL LETTER L WITH ACUTE +013B ; Lu # LATIN CAPITAL LETTER L WITH CEDILLA +013D ; Lu # LATIN CAPITAL LETTER L WITH CARON +013F ; Lu # LATIN CAPITAL LETTER L WITH MIDDLE DOT +0141 ; Lu # LATIN CAPITAL LETTER L WITH STROKE +0143 ; Lu # LATIN CAPITAL LETTER N WITH ACUTE +0145 ; Lu # LATIN CAPITAL LETTER N WITH CEDILLA +0147 ; Lu # LATIN CAPITAL LETTER N WITH CARON +014A ; Lu # LATIN CAPITAL LETTER ENG +014C ; Lu # LATIN CAPITAL LETTER O WITH MACRON +014E ; Lu # LATIN CAPITAL LETTER O WITH BREVE +0150 ; Lu # LATIN CAPITAL LETTER O WITH DOUBLE ACUTE +0152 ; Lu # LATIN CAPITAL LIGATURE OE +0154 ; Lu # LATIN CAPITAL LETTER R WITH ACUTE +0156 ; Lu # LATIN CAPITAL LETTER R WITH CEDILLA +0158 ; Lu # LATIN CAPITAL LETTER R WITH CARON +015A ; Lu # LATIN CAPITAL LETTER S WITH ACUTE +015C ; Lu # LATIN CAPITAL LETTER S WITH CIRCUMFLEX +015E ; Lu # LATIN CAPITAL LETTER S WITH CEDILLA +0160 ; Lu # LATIN CAPITAL LETTER S WITH CARON +0162 ; Lu # LATIN CAPITAL LETTER T WITH CEDILLA +0164 ; Lu # LATIN CAPITAL LETTER T WITH CARON +0166 ; Lu # LATIN CAPITAL LETTER T WITH STROKE +0168 ; Lu # LATIN CAPITAL LETTER U WITH TILDE +016A ; Lu # LATIN CAPITAL LETTER U WITH MACRON +016C ; Lu # LATIN CAPITAL LETTER U WITH BREVE +016E ; Lu # LATIN CAPITAL LETTER U WITH RING ABOVE +0170 ; Lu # LATIN CAPITAL LETTER U WITH DOUBLE ACUTE +0172 ; Lu # LATIN CAPITAL LETTER U WITH OGONEK +0174 ; Lu # LATIN CAPITAL LETTER W WITH CIRCUMFLEX +0176 ; Lu # LATIN CAPITAL LETTER Y WITH CIRCUMFLEX +0178..0179 ; Lu # [2] LATIN CAPITAL LETTER Y WITH DIAERESIS..LATIN CAPITAL LETTER Z WITH ACUTE +017B ; Lu # LATIN CAPITAL LETTER Z WITH DOT ABOVE +017D ; Lu # LATIN CAPITAL LETTER Z WITH CARON +0181..0182 ; Lu # [2] LATIN CAPITAL LETTER B WITH HOOK..LATIN CAPITAL LETTER B WITH TOPBAR +0184 ; Lu # LATIN CAPITAL LETTER TONE SIX +0186..0187 ; Lu # [2] LATIN CAPITAL LETTER OPEN O..LATIN CAPITAL LETTER C WITH HOOK +0189..018B ; Lu # [3] LATIN CAPITAL LETTER AFRICAN D..LATIN CAPITAL LETTER D WITH TOPBAR +018E..0191 ; Lu # [4] LATIN CAPITAL LETTER REVERSED E..LATIN CAPITAL LETTER F WITH HOOK +0193..0194 ; Lu # [2] LATIN CAPITAL LETTER G WITH HOOK..LATIN CAPITAL LETTER GAMMA +0196..0198 ; Lu # [3] LATIN CAPITAL LETTER IOTA..LATIN CAPITAL LETTER K WITH HOOK +019C..019D ; Lu # [2] LATIN CAPITAL LETTER TURNED M..LATIN CAPITAL LETTER N WITH LEFT HOOK +019F..01A0 ; Lu # [2] LATIN CAPITAL LETTER O WITH MIDDLE TILDE..LATIN CAPITAL LETTER O WITH HORN +01A2 ; Lu # LATIN CAPITAL LETTER OI +01A4 ; Lu # LATIN CAPITAL LETTER P WITH HOOK +01A6..01A7 ; Lu # [2] LATIN LETTER YR..LATIN CAPITAL LETTER TONE TWO +01A9 ; Lu # LATIN CAPITAL LETTER ESH +01AC ; Lu # LATIN CAPITAL LETTER T WITH HOOK +01AE..01AF ; Lu # [2] LATIN CAPITAL LETTER T WITH RETROFLEX HOOK..LATIN CAPITAL LETTER U WITH HORN +01B1..01B3 ; Lu # [3] LATIN CAPITAL LETTER UPSILON..LATIN CAPITAL LETTER Y WITH HOOK +01B5 ; Lu # LATIN CAPITAL LETTER Z WITH STROKE +01B7..01B8 ; Lu # [2] LATIN CAPITAL LETTER EZH..LATIN CAPITAL LETTER EZH REVERSED +01BC ; Lu # LATIN CAPITAL LETTER TONE FIVE +01C4 ; Lu # LATIN CAPITAL LETTER DZ WITH CARON +01C7 ; Lu # LATIN CAPITAL LETTER LJ +01CA ; Lu # LATIN CAPITAL LETTER NJ +01CD ; Lu # LATIN CAPITAL LETTER A WITH CARON +01CF ; Lu # LATIN CAPITAL LETTER I WITH CARON +01D1 ; Lu # LATIN CAPITAL LETTER O WITH CARON +01D3 ; Lu # LATIN CAPITAL LETTER U WITH CARON +01D5 ; Lu # LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON +01D7 ; Lu # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE +01D9 ; Lu # LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON +01DB ; Lu # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE +01DE ; Lu # LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON +01E0 ; Lu # LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON +01E2 ; Lu # LATIN CAPITAL LETTER AE WITH MACRON +01E4 ; Lu # LATIN CAPITAL LETTER G WITH STROKE +01E6 ; Lu # LATIN CAPITAL LETTER G WITH CARON +01E8 ; Lu # LATIN CAPITAL LETTER K WITH CARON +01EA ; Lu # LATIN CAPITAL LETTER O WITH OGONEK +01EC ; Lu # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON +01EE ; Lu # LATIN CAPITAL LETTER EZH WITH CARON +01F1 ; Lu # LATIN CAPITAL LETTER DZ +01F4 ; Lu # LATIN CAPITAL LETTER G WITH ACUTE +01F6..01F8 ; Lu # [3] LATIN CAPITAL LETTER HWAIR..LATIN CAPITAL LETTER N WITH GRAVE +01FA ; Lu # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE +01FC ; Lu # LATIN CAPITAL LETTER AE WITH ACUTE +01FE ; Lu # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE +0200 ; Lu # LATIN CAPITAL LETTER A WITH DOUBLE GRAVE +0202 ; Lu # LATIN CAPITAL LETTER A WITH INVERTED BREVE +0204 ; Lu # LATIN CAPITAL LETTER E WITH DOUBLE GRAVE +0206 ; Lu # LATIN CAPITAL LETTER E WITH INVERTED BREVE +0208 ; Lu # LATIN CAPITAL LETTER I WITH DOUBLE GRAVE +020A ; Lu # LATIN CAPITAL LETTER I WITH INVERTED BREVE +020C ; Lu # LATIN CAPITAL LETTER O WITH DOUBLE GRAVE +020E ; Lu # LATIN CAPITAL LETTER O WITH INVERTED BREVE +0210 ; Lu # LATIN CAPITAL LETTER R WITH DOUBLE GRAVE +0212 ; Lu # LATIN CAPITAL LETTER R WITH INVERTED BREVE +0214 ; Lu # LATIN CAPITAL LETTER U WITH DOUBLE GRAVE +0216 ; Lu # LATIN CAPITAL LETTER U WITH INVERTED BREVE +0218 ; Lu # LATIN CAPITAL LETTER S WITH COMMA BELOW +021A ; Lu # LATIN CAPITAL LETTER T WITH COMMA BELOW +021C ; Lu # LATIN CAPITAL LETTER YOGH +021E ; Lu # LATIN CAPITAL LETTER H WITH CARON +0220 ; Lu # LATIN CAPITAL LETTER N WITH LONG RIGHT LEG +0222 ; Lu # LATIN CAPITAL LETTER OU +0224 ; Lu # LATIN CAPITAL LETTER Z WITH HOOK +0226 ; Lu # LATIN CAPITAL LETTER A WITH DOT ABOVE +0228 ; Lu # LATIN CAPITAL LETTER E WITH CEDILLA +022A ; Lu # LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON +022C ; Lu # LATIN CAPITAL LETTER O WITH TILDE AND MACRON +022E ; Lu # LATIN CAPITAL LETTER O WITH DOT ABOVE +0230 ; Lu # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON +0232 ; Lu # LATIN CAPITAL LETTER Y WITH MACRON +0386 ; Lu # GREEK CAPITAL LETTER ALPHA WITH TONOS +0388..038A ; Lu # [3] GREEK CAPITAL LETTER EPSILON WITH TONOS..GREEK CAPITAL LETTER IOTA WITH TONOS +038C ; Lu # GREEK CAPITAL LETTER OMICRON WITH TONOS +038E..038F ; Lu # [2] GREEK CAPITAL LETTER UPSILON WITH TONOS..GREEK CAPITAL LETTER OMEGA WITH TONOS +0391..03A1 ; Lu # [17] GREEK CAPITAL LETTER ALPHA..GREEK CAPITAL LETTER RHO +03A3..03AB ; Lu # [9] GREEK CAPITAL LETTER SIGMA..GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA +03D2..03D4 ; Lu # [3] GREEK UPSILON WITH HOOK SYMBOL..GREEK UPSILON WITH DIAERESIS AND HOOK SYMBOL +03D8 ; Lu # GREEK LETTER ARCHAIC KOPPA +03DA ; Lu # GREEK LETTER STIGMA +03DC ; Lu # GREEK LETTER DIGAMMA +03DE ; Lu # GREEK LETTER KOPPA +03E0 ; Lu # GREEK LETTER SAMPI +03E2 ; Lu # COPTIC CAPITAL LETTER SHEI +03E4 ; Lu # COPTIC CAPITAL LETTER FEI +03E6 ; Lu # COPTIC CAPITAL LETTER KHEI +03E8 ; Lu # COPTIC CAPITAL LETTER HORI +03EA ; Lu # COPTIC CAPITAL LETTER GANGIA +03EC ; Lu # COPTIC CAPITAL LETTER SHIMA +03EE ; Lu # COPTIC CAPITAL LETTER DEI +03F4 ; Lu # GREEK CAPITAL THETA SYMBOL +0400..042F ; Lu # [48] CYRILLIC CAPITAL LETTER IE WITH GRAVE..CYRILLIC CAPITAL LETTER YA +0460 ; Lu # CYRILLIC CAPITAL LETTER OMEGA +0462 ; Lu # CYRILLIC CAPITAL LETTER YAT +0464 ; Lu # CYRILLIC CAPITAL LETTER IOTIFIED E +0466 ; Lu # CYRILLIC CAPITAL LETTER LITTLE YUS +0468 ; Lu # CYRILLIC CAPITAL LETTER IOTIFIED LITTLE YUS +046A ; Lu # CYRILLIC CAPITAL LETTER BIG YUS +046C ; Lu # CYRILLIC CAPITAL LETTER IOTIFIED BIG YUS +046E ; Lu # CYRILLIC CAPITAL LETTER KSI +0470 ; Lu # CYRILLIC CAPITAL LETTER PSI +0472 ; Lu # CYRILLIC CAPITAL LETTER FITA +0474 ; Lu # CYRILLIC CAPITAL LETTER IZHITSA +0476 ; Lu # CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT +0478 ; Lu # CYRILLIC CAPITAL LETTER UK +047A ; Lu # CYRILLIC CAPITAL LETTER ROUND OMEGA +047C ; Lu # CYRILLIC CAPITAL LETTER OMEGA WITH TITLO +047E ; Lu # CYRILLIC CAPITAL LETTER OT +0480 ; Lu # CYRILLIC CAPITAL LETTER KOPPA +048A ; Lu # CYRILLIC CAPITAL LETTER SHORT I WITH TAIL +048C ; Lu # CYRILLIC CAPITAL LETTER SEMISOFT SIGN +048E ; Lu # CYRILLIC CAPITAL LETTER ER WITH TICK +0490 ; Lu # CYRILLIC CAPITAL LETTER GHE WITH UPTURN +0492 ; Lu # CYRILLIC CAPITAL LETTER GHE WITH STROKE +0494 ; Lu # CYRILLIC CAPITAL LETTER GHE WITH MIDDLE HOOK +0496 ; Lu # CYRILLIC CAPITAL LETTER ZHE WITH DESCENDER +0498 ; Lu # CYRILLIC CAPITAL LETTER ZE WITH DESCENDER +049A ; Lu # CYRILLIC CAPITAL LETTER KA WITH DESCENDER +049C ; Lu # CYRILLIC CAPITAL LETTER KA WITH VERTICAL STROKE +049E ; Lu # CYRILLIC CAPITAL LETTER KA WITH STROKE +04A0 ; Lu # CYRILLIC CAPITAL LETTER BASHKIR KA +04A2 ; Lu # CYRILLIC CAPITAL LETTER EN WITH DESCENDER +04A4 ; Lu # CYRILLIC CAPITAL LIGATURE EN GHE +04A6 ; Lu # CYRILLIC CAPITAL LETTER PE WITH MIDDLE HOOK +04A8 ; Lu # CYRILLIC CAPITAL LETTER ABKHASIAN HA +04AA ; Lu # CYRILLIC CAPITAL LETTER ES WITH DESCENDER +04AC ; Lu # CYRILLIC CAPITAL LETTER TE WITH DESCENDER +04AE ; Lu # CYRILLIC CAPITAL LETTER STRAIGHT U +04B0 ; Lu # CYRILLIC CAPITAL LETTER STRAIGHT U WITH STROKE +04B2 ; Lu # CYRILLIC CAPITAL LETTER HA WITH DESCENDER +04B4 ; Lu # CYRILLIC CAPITAL LIGATURE TE TSE +04B6 ; Lu # CYRILLIC CAPITAL LETTER CHE WITH DESCENDER +04B8 ; Lu # CYRILLIC CAPITAL LETTER CHE WITH VERTICAL STROKE +04BA ; Lu # CYRILLIC CAPITAL LETTER SHHA +04BC ; Lu # CYRILLIC CAPITAL LETTER ABKHASIAN CHE +04BE ; Lu # CYRILLIC CAPITAL LETTER ABKHASIAN CHE WITH DESCENDER +04C0..04C1 ; Lu # [2] CYRILLIC LETTER PALOCHKA..CYRILLIC CAPITAL LETTER ZHE WITH BREVE +04C3 ; Lu # CYRILLIC CAPITAL LETTER KA WITH HOOK +04C5 ; Lu # CYRILLIC CAPITAL LETTER EL WITH TAIL +04C7 ; Lu # CYRILLIC CAPITAL LETTER EN WITH HOOK +04C9 ; Lu # CYRILLIC CAPITAL LETTER EN WITH TAIL +04CB ; Lu # CYRILLIC CAPITAL LETTER KHAKASSIAN CHE +04CD ; Lu # CYRILLIC CAPITAL LETTER EM WITH TAIL +04D0 ; Lu # CYRILLIC CAPITAL LETTER A WITH BREVE +04D2 ; Lu # CYRILLIC CAPITAL LETTER A WITH DIAERESIS +04D4 ; Lu # CYRILLIC CAPITAL LIGATURE A IE +04D6 ; Lu # CYRILLIC CAPITAL LETTER IE WITH BREVE +04D8 ; Lu # CYRILLIC CAPITAL LETTER SCHWA +04DA ; Lu # CYRILLIC CAPITAL LETTER SCHWA WITH DIAERESIS +04DC ; Lu # CYRILLIC CAPITAL LETTER ZHE WITH DIAERESIS +04DE ; Lu # CYRILLIC CAPITAL LETTER ZE WITH DIAERESIS +04E0 ; Lu # CYRILLIC CAPITAL LETTER ABKHASIAN DZE +04E2 ; Lu # CYRILLIC CAPITAL LETTER I WITH MACRON +04E4 ; Lu # CYRILLIC CAPITAL LETTER I WITH DIAERESIS +04E6 ; Lu # CYRILLIC CAPITAL LETTER O WITH DIAERESIS +04E8 ; Lu # CYRILLIC CAPITAL LETTER BARRED O +04EA ; Lu # CYRILLIC CAPITAL LETTER BARRED O WITH DIAERESIS +04EC ; Lu # CYRILLIC CAPITAL LETTER E WITH DIAERESIS +04EE ; Lu # CYRILLIC CAPITAL LETTER U WITH MACRON +04F0 ; Lu # CYRILLIC CAPITAL LETTER U WITH DIAERESIS +04F2 ; Lu # CYRILLIC CAPITAL LETTER U WITH DOUBLE ACUTE +04F4 ; Lu # CYRILLIC CAPITAL LETTER CHE WITH DIAERESIS +04F8 ; Lu # CYRILLIC CAPITAL LETTER YERU WITH DIAERESIS +0500 ; Lu # CYRILLIC CAPITAL LETTER KOMI DE +0502 ; Lu # CYRILLIC CAPITAL LETTER KOMI DJE +0504 ; Lu # CYRILLIC CAPITAL LETTER KOMI ZJE +0506 ; Lu # CYRILLIC CAPITAL LETTER KOMI DZJE +0508 ; Lu # CYRILLIC CAPITAL LETTER KOMI LJE +050A ; Lu # CYRILLIC CAPITAL LETTER KOMI NJE +050C ; Lu # CYRILLIC CAPITAL LETTER KOMI SJE +050E ; Lu # CYRILLIC CAPITAL LETTER KOMI TJE +0531..0556 ; Lu # [38] ARMENIAN CAPITAL LETTER AYB..ARMENIAN CAPITAL LETTER FEH +10A0..10C5 ; Lu # [38] GEORGIAN CAPITAL LETTER AN..GEORGIAN CAPITAL LETTER HOE +1E00 ; Lu # LATIN CAPITAL LETTER A WITH RING BELOW +1E02 ; Lu # LATIN CAPITAL LETTER B WITH DOT ABOVE +1E04 ; Lu # LATIN CAPITAL LETTER B WITH DOT BELOW +1E06 ; Lu # LATIN CAPITAL LETTER B WITH LINE BELOW +1E08 ; Lu # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE +1E0A ; Lu # LATIN CAPITAL LETTER D WITH DOT ABOVE +1E0C ; Lu # LATIN CAPITAL LETTER D WITH DOT BELOW +1E0E ; Lu # LATIN CAPITAL LETTER D WITH LINE BELOW +1E10 ; Lu # LATIN CAPITAL LETTER D WITH CEDILLA +1E12 ; Lu # LATIN CAPITAL LETTER D WITH CIRCUMFLEX BELOW +1E14 ; Lu # LATIN CAPITAL LETTER E WITH MACRON AND GRAVE +1E16 ; Lu # LATIN CAPITAL LETTER E WITH MACRON AND ACUTE +1E18 ; Lu # LATIN CAPITAL LETTER E WITH CIRCUMFLEX BELOW +1E1A ; Lu # LATIN CAPITAL LETTER E WITH TILDE BELOW +1E1C ; Lu # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE +1E1E ; Lu # LATIN CAPITAL LETTER F WITH DOT ABOVE +1E20 ; Lu # LATIN CAPITAL LETTER G WITH MACRON +1E22 ; Lu # LATIN CAPITAL LETTER H WITH DOT ABOVE +1E24 ; Lu # LATIN CAPITAL LETTER H WITH DOT BELOW +1E26 ; Lu # LATIN CAPITAL LETTER H WITH DIAERESIS +1E28 ; Lu # LATIN CAPITAL LETTER H WITH CEDILLA +1E2A ; Lu # LATIN CAPITAL LETTER H WITH BREVE BELOW +1E2C ; Lu # LATIN CAPITAL LETTER I WITH TILDE BELOW +1E2E ; Lu # LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE +1E30 ; Lu # LATIN CAPITAL LETTER K WITH ACUTE +1E32 ; Lu # LATIN CAPITAL LETTER K WITH DOT BELOW +1E34 ; Lu # LATIN CAPITAL LETTER K WITH LINE BELOW +1E36 ; Lu # LATIN CAPITAL LETTER L WITH DOT BELOW +1E38 ; Lu # LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON +1E3A ; Lu # LATIN CAPITAL LETTER L WITH LINE BELOW +1E3C ; Lu # LATIN CAPITAL LETTER L WITH CIRCUMFLEX BELOW +1E3E ; Lu # LATIN CAPITAL LETTER M WITH ACUTE +1E40 ; Lu # LATIN CAPITAL LETTER M WITH DOT ABOVE +1E42 ; Lu # LATIN CAPITAL LETTER M WITH DOT BELOW +1E44 ; Lu # LATIN CAPITAL LETTER N WITH DOT ABOVE +1E46 ; Lu # LATIN CAPITAL LETTER N WITH DOT BELOW +1E48 ; Lu # LATIN CAPITAL LETTER N WITH LINE BELOW +1E4A ; Lu # LATIN CAPITAL LETTER N WITH CIRCUMFLEX BELOW +1E4C ; Lu # LATIN CAPITAL LETTER O WITH TILDE AND ACUTE +1E4E ; Lu # LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS +1E50 ; Lu # LATIN CAPITAL LETTER O WITH MACRON AND GRAVE +1E52 ; Lu # LATIN CAPITAL LETTER O WITH MACRON AND ACUTE +1E54 ; Lu # LATIN CAPITAL LETTER P WITH ACUTE +1E56 ; Lu # LATIN CAPITAL LETTER P WITH DOT ABOVE +1E58 ; Lu # LATIN CAPITAL LETTER R WITH DOT ABOVE +1E5A ; Lu # LATIN CAPITAL LETTER R WITH DOT BELOW +1E5C ; Lu # LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON +1E5E ; Lu # LATIN CAPITAL LETTER R WITH LINE BELOW +1E60 ; Lu # LATIN CAPITAL LETTER S WITH DOT ABOVE +1E62 ; Lu # LATIN CAPITAL LETTER S WITH DOT BELOW +1E64 ; Lu # LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE +1E66 ; Lu # LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE +1E68 ; Lu # LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE +1E6A ; Lu # LATIN CAPITAL LETTER T WITH DOT ABOVE +1E6C ; Lu # LATIN CAPITAL LETTER T WITH DOT BELOW +1E6E ; Lu # LATIN CAPITAL LETTER T WITH LINE BELOW +1E70 ; Lu # LATIN CAPITAL LETTER T WITH CIRCUMFLEX BELOW +1E72 ; Lu # LATIN CAPITAL LETTER U WITH DIAERESIS BELOW +1E74 ; Lu # LATIN CAPITAL LETTER U WITH TILDE BELOW +1E76 ; Lu # LATIN CAPITAL LETTER U WITH CIRCUMFLEX BELOW +1E78 ; Lu # LATIN CAPITAL LETTER U WITH TILDE AND ACUTE +1E7A ; Lu # LATIN CAPITAL LETTER U WITH MACRON AND DIAERESIS +1E7C ; Lu # LATIN CAPITAL LETTER V WITH TILDE +1E7E ; Lu # LATIN CAPITAL LETTER V WITH DOT BELOW +1E80 ; Lu # LATIN CAPITAL LETTER W WITH GRAVE +1E82 ; Lu # LATIN CAPITAL LETTER W WITH ACUTE +1E84 ; Lu # LATIN CAPITAL LETTER W WITH DIAERESIS +1E86 ; Lu # LATIN CAPITAL LETTER W WITH DOT ABOVE +1E88 ; Lu # LATIN CAPITAL LETTER W WITH DOT BELOW +1E8A ; Lu # LATIN CAPITAL LETTER X WITH DOT ABOVE +1E8C ; Lu # LATIN CAPITAL LETTER X WITH DIAERESIS +1E8E ; Lu # LATIN CAPITAL LETTER Y WITH DOT ABOVE +1E90 ; Lu # LATIN CAPITAL LETTER Z WITH CIRCUMFLEX +1E92 ; Lu # LATIN CAPITAL LETTER Z WITH DOT BELOW +1E94 ; Lu # LATIN CAPITAL LETTER Z WITH LINE BELOW +1EA0 ; Lu # LATIN CAPITAL LETTER A WITH DOT BELOW +1EA2 ; Lu # LATIN CAPITAL LETTER A WITH HOOK ABOVE +1EA4 ; Lu # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE +1EA6 ; Lu # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE +1EA8 ; Lu # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE +1EAA ; Lu # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE +1EAC ; Lu # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW +1EAE ; Lu # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE +1EB0 ; Lu # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE +1EB2 ; Lu # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE +1EB4 ; Lu # LATIN CAPITAL LETTER A WITH BREVE AND TILDE +1EB6 ; Lu # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW +1EB8 ; Lu # LATIN CAPITAL LETTER E WITH DOT BELOW +1EBA ; Lu # LATIN CAPITAL LETTER E WITH HOOK ABOVE +1EBC ; Lu # LATIN CAPITAL LETTER E WITH TILDE +1EBE ; Lu # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE +1EC0 ; Lu # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE +1EC2 ; Lu # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE +1EC4 ; Lu # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE +1EC6 ; Lu # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW +1EC8 ; Lu # LATIN CAPITAL LETTER I WITH HOOK ABOVE +1ECA ; Lu # LATIN CAPITAL LETTER I WITH DOT BELOW +1ECC ; Lu # LATIN CAPITAL LETTER O WITH DOT BELOW +1ECE ; Lu # LATIN CAPITAL LETTER O WITH HOOK ABOVE +1ED0 ; Lu # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE +1ED2 ; Lu # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE +1ED4 ; Lu # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE +1ED6 ; Lu # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE +1ED8 ; Lu # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW +1EDA ; Lu # LATIN CAPITAL LETTER O WITH HORN AND ACUTE +1EDC ; Lu # LATIN CAPITAL LETTER O WITH HORN AND GRAVE +1EDE ; Lu # LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE +1EE0 ; Lu # LATIN CAPITAL LETTER O WITH HORN AND TILDE +1EE2 ; Lu # LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW +1EE4 ; Lu # LATIN CAPITAL LETTER U WITH DOT BELOW +1EE6 ; Lu # LATIN CAPITAL LETTER U WITH HOOK ABOVE +1EE8 ; Lu # LATIN CAPITAL LETTER U WITH HORN AND ACUTE +1EEA ; Lu # LATIN CAPITAL LETTER U WITH HORN AND GRAVE +1EEC ; Lu # LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE +1EEE ; Lu # LATIN CAPITAL LETTER U WITH HORN AND TILDE +1EF0 ; Lu # LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW +1EF2 ; Lu # LATIN CAPITAL LETTER Y WITH GRAVE +1EF4 ; Lu # LATIN CAPITAL LETTER Y WITH DOT BELOW +1EF6 ; Lu # LATIN CAPITAL LETTER Y WITH HOOK ABOVE +1EF8 ; Lu # LATIN CAPITAL LETTER Y WITH TILDE +1F08..1F0F ; Lu # [8] GREEK CAPITAL LETTER ALPHA WITH PSILI..GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI +1F18..1F1D ; Lu # [6] GREEK CAPITAL LETTER EPSILON WITH PSILI..GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA +1F28..1F2F ; Lu # [8] GREEK CAPITAL LETTER ETA WITH PSILI..GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI +1F38..1F3F ; Lu # [8] GREEK CAPITAL LETTER IOTA WITH PSILI..GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI +1F48..1F4D ; Lu # [6] GREEK CAPITAL LETTER OMICRON WITH PSILI..GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA +1F59 ; Lu # GREEK CAPITAL LETTER UPSILON WITH DASIA +1F5B ; Lu # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA +1F5D ; Lu # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA +1F5F ; Lu # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI +1F68..1F6F ; Lu # [8] GREEK CAPITAL LETTER OMEGA WITH PSILI..GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI +1FB8..1FBB ; Lu # [4] GREEK CAPITAL LETTER ALPHA WITH VRACHY..GREEK CAPITAL LETTER ALPHA WITH OXIA +1FC8..1FCB ; Lu # [4] GREEK CAPITAL LETTER EPSILON WITH VARIA..GREEK CAPITAL LETTER ETA WITH OXIA +1FD8..1FDB ; Lu # [4] GREEK CAPITAL LETTER IOTA WITH VRACHY..GREEK CAPITAL LETTER IOTA WITH OXIA +1FE8..1FEC ; Lu # [5] GREEK CAPITAL LETTER UPSILON WITH VRACHY..GREEK CAPITAL LETTER RHO WITH DASIA +1FF8..1FFB ; Lu # [4] GREEK CAPITAL LETTER OMICRON WITH VARIA..GREEK CAPITAL LETTER OMEGA WITH OXIA +2102 ; Lu # DOUBLE-STRUCK CAPITAL C +2107 ; Lu # EULER CONSTANT +210B..210D ; Lu # [3] SCRIPT CAPITAL H..DOUBLE-STRUCK CAPITAL H +2110..2112 ; Lu # [3] SCRIPT CAPITAL I..SCRIPT CAPITAL L +2115 ; Lu # DOUBLE-STRUCK CAPITAL N +2119..211D ; Lu # [5] DOUBLE-STRUCK CAPITAL P..DOUBLE-STRUCK CAPITAL R +2124 ; Lu # DOUBLE-STRUCK CAPITAL Z +2126 ; Lu # OHM SIGN +2128 ; Lu # BLACK-LETTER CAPITAL Z +212A..212D ; Lu # [4] KELVIN SIGN..BLACK-LETTER CAPITAL C +2130..2131 ; Lu # [2] SCRIPT CAPITAL E..SCRIPT CAPITAL F +2133 ; Lu # SCRIPT CAPITAL M +213E..213F ; Lu # [2] DOUBLE-STRUCK CAPITAL GAMMA..DOUBLE-STRUCK CAPITAL PI +2145 ; Lu # DOUBLE-STRUCK ITALIC CAPITAL D +FF21..FF3A ; Lu # [26] FULLWIDTH LATIN CAPITAL LETTER A..FULLWIDTH LATIN CAPITAL LETTER Z +10400..10425 ; Lu # [38] DESERET CAPITAL LETTER LONG I..DESERET CAPITAL LETTER ENG +1D400..1D419 ; Lu # [26] MATHEMATICAL BOLD CAPITAL A..MATHEMATICAL BOLD CAPITAL Z +1D434..1D44D ; Lu # [26] MATHEMATICAL ITALIC CAPITAL A..MATHEMATICAL ITALIC CAPITAL Z +1D468..1D481 ; Lu # [26] MATHEMATICAL BOLD ITALIC CAPITAL A..MATHEMATICAL BOLD ITALIC CAPITAL Z +1D49C ; Lu # MATHEMATICAL SCRIPT CAPITAL A +1D49E..1D49F ; Lu # [2] MATHEMATICAL SCRIPT CAPITAL C..MATHEMATICAL SCRIPT CAPITAL D +1D4A2 ; Lu # MATHEMATICAL SCRIPT CAPITAL G +1D4A5..1D4A6 ; Lu # [2] MATHEMATICAL SCRIPT CAPITAL J..MATHEMATICAL SCRIPT CAPITAL K +1D4A9..1D4AC ; Lu # [4] MATHEMATICAL SCRIPT CAPITAL N..MATHEMATICAL SCRIPT CAPITAL Q +1D4AE..1D4B5 ; Lu # [8] MATHEMATICAL SCRIPT CAPITAL S..MATHEMATICAL SCRIPT CAPITAL Z +1D4D0..1D4E9 ; Lu # [26] MATHEMATICAL BOLD SCRIPT CAPITAL A..MATHEMATICAL BOLD SCRIPT CAPITAL Z +1D504..1D505 ; Lu # [2] MATHEMATICAL FRAKTUR CAPITAL A..MATHEMATICAL FRAKTUR CAPITAL B +1D507..1D50A ; Lu # [4] MATHEMATICAL FRAKTUR CAPITAL D..MATHEMATICAL FRAKTUR CAPITAL G +1D50D..1D514 ; Lu # [8] MATHEMATICAL FRAKTUR CAPITAL J..MATHEMATICAL FRAKTUR CAPITAL Q +1D516..1D51C ; Lu # [7] MATHEMATICAL FRAKTUR CAPITAL S..MATHEMATICAL FRAKTUR CAPITAL Y +1D538..1D539 ; Lu # [2] MATHEMATICAL DOUBLE-STRUCK CAPITAL A..MATHEMATICAL DOUBLE-STRUCK CAPITAL B +1D53B..1D53E ; Lu # [4] MATHEMATICAL DOUBLE-STRUCK CAPITAL D..MATHEMATICAL DOUBLE-STRUCK CAPITAL G +1D540..1D544 ; Lu # [5] MATHEMATICAL DOUBLE-STRUCK CAPITAL I..MATHEMATICAL DOUBLE-STRUCK CAPITAL M +1D546 ; Lu # MATHEMATICAL DOUBLE-STRUCK CAPITAL O +1D54A..1D550 ; Lu # [7] MATHEMATICAL DOUBLE-STRUCK CAPITAL S..MATHEMATICAL DOUBLE-STRUCK CAPITAL Y +1D56C..1D585 ; Lu # [26] MATHEMATICAL BOLD FRAKTUR CAPITAL A..MATHEMATICAL BOLD FRAKTUR CAPITAL Z +1D5A0..1D5B9 ; Lu # [26] MATHEMATICAL SANS-SERIF CAPITAL A..MATHEMATICAL SANS-SERIF CAPITAL Z +1D5D4..1D5ED ; Lu # [26] MATHEMATICAL SANS-SERIF BOLD CAPITAL A..MATHEMATICAL SANS-SERIF BOLD CAPITAL Z +1D608..1D621 ; Lu # [26] MATHEMATICAL SANS-SERIF ITALIC CAPITAL A..MATHEMATICAL SANS-SERIF ITALIC CAPITAL Z +1D63C..1D655 ; Lu # [26] MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL A..MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL Z +1D670..1D689 ; Lu # [26] MATHEMATICAL MONOSPACE CAPITAL A..MATHEMATICAL MONOSPACE CAPITAL Z +1D6A8..1D6C0 ; Lu # [25] MATHEMATICAL BOLD CAPITAL ALPHA..MATHEMATICAL BOLD CAPITAL OMEGA +1D6E2..1D6FA ; Lu # [25] MATHEMATICAL ITALIC CAPITAL ALPHA..MATHEMATICAL ITALIC CAPITAL OMEGA +1D71C..1D734 ; Lu # [25] MATHEMATICAL BOLD ITALIC CAPITAL ALPHA..MATHEMATICAL BOLD ITALIC CAPITAL OMEGA +1D756..1D76E ; Lu # [25] MATHEMATICAL SANS-SERIF BOLD CAPITAL ALPHA..MATHEMATICAL SANS-SERIF BOLD CAPITAL OMEGA +1D790..1D7A8 ; Lu # [25] MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL ALPHA..MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL OMEGA + +# Total code points: 1185 + +# ================================================ + +0061..007A ; Ll # [26] LATIN SMALL LETTER A..LATIN SMALL LETTER Z +00AA ; Ll # FEMININE ORDINAL INDICATOR +00B5 ; Ll # MICRO SIGN +00BA ; Ll # MASCULINE ORDINAL INDICATOR +00DF..00F6 ; Ll # [24] LATIN SMALL LETTER SHARP S..LATIN SMALL LETTER O WITH DIAERESIS +00F8..00FF ; Ll # [8] LATIN SMALL LETTER O WITH STROKE..LATIN SMALL LETTER Y WITH DIAERESIS +0101 ; Ll # LATIN SMALL LETTER A WITH MACRON +0103 ; Ll # LATIN SMALL LETTER A WITH BREVE +0105 ; Ll # LATIN SMALL LETTER A WITH OGONEK +0107 ; Ll # LATIN SMALL LETTER C WITH ACUTE +0109 ; Ll # LATIN SMALL LETTER C WITH CIRCUMFLEX +010B ; Ll # LATIN SMALL LETTER C WITH DOT ABOVE +010D ; Ll # LATIN SMALL LETTER C WITH CARON +010F ; Ll # LATIN SMALL LETTER D WITH CARON +0111 ; Ll # LATIN SMALL LETTER D WITH STROKE +0113 ; Ll # LATIN SMALL LETTER E WITH MACRON +0115 ; Ll # LATIN SMALL LETTER E WITH BREVE +0117 ; Ll # LATIN SMALL LETTER E WITH DOT ABOVE +0119 ; Ll # LATIN SMALL LETTER E WITH OGONEK +011B ; Ll # LATIN SMALL LETTER E WITH CARON +011D ; Ll # LATIN SMALL LETTER G WITH CIRCUMFLEX +011F ; Ll # LATIN SMALL LETTER G WITH BREVE +0121 ; Ll # LATIN SMALL LETTER G WITH DOT ABOVE +0123 ; Ll # LATIN SMALL LETTER G WITH CEDILLA +0125 ; Ll # LATIN SMALL LETTER H WITH CIRCUMFLEX +0127 ; Ll # LATIN SMALL LETTER H WITH STROKE +0129 ; Ll # LATIN SMALL LETTER I WITH TILDE +012B ; Ll # LATIN SMALL LETTER I WITH MACRON +012D ; Ll # LATIN SMALL LETTER I WITH BREVE +012F ; Ll # LATIN SMALL LETTER I WITH OGONEK +0131 ; Ll # LATIN SMALL LETTER DOTLESS I +0133 ; Ll # LATIN SMALL LIGATURE IJ +0135 ; Ll # LATIN SMALL LETTER J WITH CIRCUMFLEX +0137..0138 ; Ll # [2] LATIN SMALL LETTER K WITH CEDILLA..LATIN SMALL LETTER KRA +013A ; Ll # LATIN SMALL LETTER L WITH ACUTE +013C ; Ll # LATIN SMALL LETTER L WITH CEDILLA +013E ; Ll # LATIN SMALL LETTER L WITH CARON +0140 ; Ll # LATIN SMALL LETTER L WITH MIDDLE DOT +0142 ; Ll # LATIN SMALL LETTER L WITH STROKE +0144 ; Ll # LATIN SMALL LETTER N WITH ACUTE +0146 ; Ll # LATIN SMALL LETTER N WITH CEDILLA +0148..0149 ; Ll # [2] LATIN SMALL LETTER N WITH CARON..LATIN SMALL LETTER N PRECEDED BY APOSTROPHE +014B ; Ll # LATIN SMALL LETTER ENG +014D ; Ll # LATIN SMALL LETTER O WITH MACRON +014F ; Ll # LATIN SMALL LETTER O WITH BREVE +0151 ; Ll # LATIN SMALL LETTER O WITH DOUBLE ACUTE +0153 ; Ll # LATIN SMALL LIGATURE OE +0155 ; Ll # LATIN SMALL LETTER R WITH ACUTE +0157 ; Ll # LATIN SMALL LETTER R WITH CEDILLA +0159 ; Ll # LATIN SMALL LETTER R WITH CARON +015B ; Ll # LATIN SMALL LETTER S WITH ACUTE +015D ; Ll # LATIN SMALL LETTER S WITH CIRCUMFLEX +015F ; Ll # LATIN SMALL LETTER S WITH CEDILLA +0161 ; Ll # LATIN SMALL LETTER S WITH CARON +0163 ; Ll # LATIN SMALL LETTER T WITH CEDILLA +0165 ; Ll # LATIN SMALL LETTER T WITH CARON +0167 ; Ll # LATIN SMALL LETTER T WITH STROKE +0169 ; Ll # LATIN SMALL LETTER U WITH TILDE +016B ; Ll # LATIN SMALL LETTER U WITH MACRON +016D ; Ll # LATIN SMALL LETTER U WITH BREVE +016F ; Ll # LATIN SMALL LETTER U WITH RING ABOVE +0171 ; Ll # LATIN SMALL LETTER U WITH DOUBLE ACUTE +0173 ; Ll # LATIN SMALL LETTER U WITH OGONEK +0175 ; Ll # LATIN SMALL LETTER W WITH CIRCUMFLEX +0177 ; Ll # LATIN SMALL LETTER Y WITH CIRCUMFLEX +017A ; Ll # LATIN SMALL LETTER Z WITH ACUTE +017C ; Ll # LATIN SMALL LETTER Z WITH DOT ABOVE +017E..0180 ; Ll # [3] LATIN SMALL LETTER Z WITH CARON..LATIN SMALL LETTER B WITH STROKE +0183 ; Ll # LATIN SMALL LETTER B WITH TOPBAR +0185 ; Ll # LATIN SMALL LETTER TONE SIX +0188 ; Ll # LATIN SMALL LETTER C WITH HOOK +018C..018D ; Ll # [2] LATIN SMALL LETTER D WITH TOPBAR..LATIN SMALL LETTER TURNED DELTA +0192 ; Ll # LATIN SMALL LETTER F WITH HOOK +0195 ; Ll # LATIN SMALL LETTER HV +0199..019B ; Ll # [3] LATIN SMALL LETTER K WITH HOOK..LATIN SMALL LETTER LAMBDA WITH STROKE +019E ; Ll # LATIN SMALL LETTER N WITH LONG RIGHT LEG +01A1 ; Ll # LATIN SMALL LETTER O WITH HORN +01A3 ; Ll # LATIN SMALL LETTER OI +01A5 ; Ll # LATIN SMALL LETTER P WITH HOOK +01A8 ; Ll # LATIN SMALL LETTER TONE TWO +01AA..01AB ; Ll # [2] LATIN LETTER REVERSED ESH LOOP..LATIN SMALL LETTER T WITH PALATAL HOOK +01AD ; Ll # LATIN SMALL LETTER T WITH HOOK +01B0 ; Ll # LATIN SMALL LETTER U WITH HORN +01B4 ; Ll # LATIN SMALL LETTER Y WITH HOOK +01B6 ; Ll # LATIN SMALL LETTER Z WITH STROKE +01B9..01BA ; Ll # [2] LATIN SMALL LETTER EZH REVERSED..LATIN SMALL LETTER EZH WITH TAIL +01BD..01BF ; Ll # [3] LATIN SMALL LETTER TONE FIVE..LATIN LETTER WYNN +01C6 ; Ll # LATIN SMALL LETTER DZ WITH CARON +01C9 ; Ll # LATIN SMALL LETTER LJ +01CC ; Ll # LATIN SMALL LETTER NJ +01CE ; Ll # LATIN SMALL LETTER A WITH CARON +01D0 ; Ll # LATIN SMALL LETTER I WITH CARON +01D2 ; Ll # LATIN SMALL LETTER O WITH CARON +01D4 ; Ll # LATIN SMALL LETTER U WITH CARON +01D6 ; Ll # LATIN SMALL LETTER U WITH DIAERESIS AND MACRON +01D8 ; Ll # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE +01DA ; Ll # LATIN SMALL LETTER U WITH DIAERESIS AND CARON +01DC..01DD ; Ll # [2] LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE..LATIN SMALL LETTER TURNED E +01DF ; Ll # LATIN SMALL LETTER A WITH DIAERESIS AND MACRON +01E1 ; Ll # LATIN SMALL LETTER A WITH DOT ABOVE AND MACRON +01E3 ; Ll # LATIN SMALL LETTER AE WITH MACRON +01E5 ; Ll # LATIN SMALL LETTER G WITH STROKE +01E7 ; Ll # LATIN SMALL LETTER G WITH CARON +01E9 ; Ll # LATIN SMALL LETTER K WITH CARON +01EB ; Ll # LATIN SMALL LETTER O WITH OGONEK +01ED ; Ll # LATIN SMALL LETTER O WITH OGONEK AND MACRON +01EF..01F0 ; Ll # [2] LATIN SMALL LETTER EZH WITH CARON..LATIN SMALL LETTER J WITH CARON +01F3 ; Ll # LATIN SMALL LETTER DZ +01F5 ; Ll # LATIN SMALL LETTER G WITH ACUTE +01F9 ; Ll # LATIN SMALL LETTER N WITH GRAVE +01FB ; Ll # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE +01FD ; Ll # LATIN SMALL LETTER AE WITH ACUTE +01FF ; Ll # LATIN SMALL LETTER O WITH STROKE AND ACUTE +0201 ; Ll # LATIN SMALL LETTER A WITH DOUBLE GRAVE +0203 ; Ll # LATIN SMALL LETTER A WITH INVERTED BREVE +0205 ; Ll # LATIN SMALL LETTER E WITH DOUBLE GRAVE +0207 ; Ll # LATIN SMALL LETTER E WITH INVERTED BREVE +0209 ; Ll # LATIN SMALL LETTER I WITH DOUBLE GRAVE +020B ; Ll # LATIN SMALL LETTER I WITH INVERTED BREVE +020D ; Ll # LATIN SMALL LETTER O WITH DOUBLE GRAVE +020F ; Ll # LATIN SMALL LETTER O WITH INVERTED BREVE +0211 ; Ll # LATIN SMALL LETTER R WITH DOUBLE GRAVE +0213 ; Ll # LATIN SMALL LETTER R WITH INVERTED BREVE +0215 ; Ll # LATIN SMALL LETTER U WITH DOUBLE GRAVE +0217 ; Ll # LATIN SMALL LETTER U WITH INVERTED BREVE +0219 ; Ll # LATIN SMALL LETTER S WITH COMMA BELOW +021B ; Ll # LATIN SMALL LETTER T WITH COMMA BELOW +021D ; Ll # LATIN SMALL LETTER YOGH +021F ; Ll # LATIN SMALL LETTER H WITH CARON +0223 ; Ll # LATIN SMALL LETTER OU +0225 ; Ll # LATIN SMALL LETTER Z WITH HOOK +0227 ; Ll # LATIN SMALL LETTER A WITH DOT ABOVE +0229 ; Ll # LATIN SMALL LETTER E WITH CEDILLA +022B ; Ll # LATIN SMALL LETTER O WITH DIAERESIS AND MACRON +022D ; Ll # LATIN SMALL LETTER O WITH TILDE AND MACRON +022F ; Ll # LATIN SMALL LETTER O WITH DOT ABOVE +0231 ; Ll # LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON +0233 ; Ll # LATIN SMALL LETTER Y WITH MACRON +0250..02AD ; Ll # [94] LATIN SMALL LETTER TURNED A..LATIN LETTER BIDENTAL PERCUSSIVE +0390 ; Ll # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS +03AC..03CE ; Ll # [35] GREEK SMALL LETTER ALPHA WITH TONOS..GREEK SMALL LETTER OMEGA WITH TONOS +03D0..03D1 ; Ll # [2] GREEK BETA SYMBOL..GREEK THETA SYMBOL +03D5..03D7 ; Ll # [3] GREEK PHI SYMBOL..GREEK KAI SYMBOL +03D9 ; Ll # GREEK SMALL LETTER ARCHAIC KOPPA +03DB ; Ll # GREEK SMALL LETTER STIGMA +03DD ; Ll # GREEK SMALL LETTER DIGAMMA +03DF ; Ll # GREEK SMALL LETTER KOPPA +03E1 ; Ll # GREEK SMALL LETTER SAMPI +03E3 ; Ll # COPTIC SMALL LETTER SHEI +03E5 ; Ll # COPTIC SMALL LETTER FEI +03E7 ; Ll # COPTIC SMALL LETTER KHEI +03E9 ; Ll # COPTIC SMALL LETTER HORI +03EB ; Ll # COPTIC SMALL LETTER GANGIA +03ED ; Ll # COPTIC SMALL LETTER SHIMA +03EF..03F3 ; Ll # [5] COPTIC SMALL LETTER DEI..GREEK LETTER YOT +03F5 ; Ll # GREEK LUNATE EPSILON SYMBOL +0430..045F ; Ll # [48] CYRILLIC SMALL LETTER A..CYRILLIC SMALL LETTER DZHE +0461 ; Ll # CYRILLIC SMALL LETTER OMEGA +0463 ; Ll # CYRILLIC SMALL LETTER YAT +0465 ; Ll # CYRILLIC SMALL LETTER IOTIFIED E +0467 ; Ll # CYRILLIC SMALL LETTER LITTLE YUS +0469 ; Ll # CYRILLIC SMALL LETTER IOTIFIED LITTLE YUS +046B ; Ll # CYRILLIC SMALL LETTER BIG YUS +046D ; Ll # CYRILLIC SMALL LETTER IOTIFIED BIG YUS +046F ; Ll # CYRILLIC SMALL LETTER KSI +0471 ; Ll # CYRILLIC SMALL LETTER PSI +0473 ; Ll # CYRILLIC SMALL LETTER FITA +0475 ; Ll # CYRILLIC SMALL LETTER IZHITSA +0477 ; Ll # CYRILLIC SMALL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT +0479 ; Ll # CYRILLIC SMALL LETTER UK +047B ; Ll # CYRILLIC SMALL LETTER ROUND OMEGA +047D ; Ll # CYRILLIC SMALL LETTER OMEGA WITH TITLO +047F ; Ll # CYRILLIC SMALL LETTER OT +0481 ; Ll # CYRILLIC SMALL LETTER KOPPA +048B ; Ll # CYRILLIC SMALL LETTER SHORT I WITH TAIL +048D ; Ll # CYRILLIC SMALL LETTER SEMISOFT SIGN +048F ; Ll # CYRILLIC SMALL LETTER ER WITH TICK +0491 ; Ll # CYRILLIC SMALL LETTER GHE WITH UPTURN +0493 ; Ll # CYRILLIC SMALL LETTER GHE WITH STROKE +0495 ; Ll # CYRILLIC SMALL LETTER GHE WITH MIDDLE HOOK +0497 ; Ll # CYRILLIC SMALL LETTER ZHE WITH DESCENDER +0499 ; Ll # CYRILLIC SMALL LETTER ZE WITH DESCENDER +049B ; Ll # CYRILLIC SMALL LETTER KA WITH DESCENDER +049D ; Ll # CYRILLIC SMALL LETTER KA WITH VERTICAL STROKE +049F ; Ll # CYRILLIC SMALL LETTER KA WITH STROKE +04A1 ; Ll # CYRILLIC SMALL LETTER BASHKIR KA +04A3 ; Ll # CYRILLIC SMALL LETTER EN WITH DESCENDER +04A5 ; Ll # CYRILLIC SMALL LIGATURE EN GHE +04A7 ; Ll # CYRILLIC SMALL LETTER PE WITH MIDDLE HOOK +04A9 ; Ll # CYRILLIC SMALL LETTER ABKHASIAN HA +04AB ; Ll # CYRILLIC SMALL LETTER ES WITH DESCENDER +04AD ; Ll # CYRILLIC SMALL LETTER TE WITH DESCENDER +04AF ; Ll # CYRILLIC SMALL LETTER STRAIGHT U +04B1 ; Ll # CYRILLIC SMALL LETTER STRAIGHT U WITH STROKE +04B3 ; Ll # CYRILLIC SMALL LETTER HA WITH DESCENDER +04B5 ; Ll # CYRILLIC SMALL LIGATURE TE TSE +04B7 ; Ll # CYRILLIC SMALL LETTER CHE WITH DESCENDER +04B9 ; Ll # CYRILLIC SMALL LETTER CHE WITH VERTICAL STROKE +04BB ; Ll # CYRILLIC SMALL LETTER SHHA +04BD ; Ll # CYRILLIC SMALL LETTER ABKHASIAN CHE +04BF ; Ll # CYRILLIC SMALL LETTER ABKHASIAN CHE WITH DESCENDER +04C2 ; Ll # CYRILLIC SMALL LETTER ZHE WITH BREVE +04C4 ; Ll # CYRILLIC SMALL LETTER KA WITH HOOK +04C6 ; Ll # CYRILLIC SMALL LETTER EL WITH TAIL +04C8 ; Ll # CYRILLIC SMALL LETTER EN WITH HOOK +04CA ; Ll # CYRILLIC SMALL LETTER EN WITH TAIL +04CC ; Ll # CYRILLIC SMALL LETTER KHAKASSIAN CHE +04CE ; Ll # CYRILLIC SMALL LETTER EM WITH TAIL +04D1 ; Ll # CYRILLIC SMALL LETTER A WITH BREVE +04D3 ; Ll # CYRILLIC SMALL LETTER A WITH DIAERESIS +04D5 ; Ll # CYRILLIC SMALL LIGATURE A IE +04D7 ; Ll # CYRILLIC SMALL LETTER IE WITH BREVE +04D9 ; Ll # CYRILLIC SMALL LETTER SCHWA +04DB ; Ll # CYRILLIC SMALL LETTER SCHWA WITH DIAERESIS +04DD ; Ll # CYRILLIC SMALL LETTER ZHE WITH DIAERESIS +04DF ; Ll # CYRILLIC SMALL LETTER ZE WITH DIAERESIS +04E1 ; Ll # CYRILLIC SMALL LETTER ABKHASIAN DZE +04E3 ; Ll # CYRILLIC SMALL LETTER I WITH MACRON +04E5 ; Ll # CYRILLIC SMALL LETTER I WITH DIAERESIS +04E7 ; Ll # CYRILLIC SMALL LETTER O WITH DIAERESIS +04E9 ; Ll # CYRILLIC SMALL LETTER BARRED O +04EB ; Ll # CYRILLIC SMALL LETTER BARRED O WITH DIAERESIS +04ED ; Ll # CYRILLIC SMALL LETTER E WITH DIAERESIS +04EF ; Ll # CYRILLIC SMALL LETTER U WITH MACRON +04F1 ; Ll # CYRILLIC SMALL LETTER U WITH DIAERESIS +04F3 ; Ll # CYRILLIC SMALL LETTER U WITH DOUBLE ACUTE +04F5 ; Ll # CYRILLIC SMALL LETTER CHE WITH DIAERESIS +04F9 ; Ll # CYRILLIC SMALL LETTER YERU WITH DIAERESIS +0501 ; Ll # CYRILLIC SMALL LETTER KOMI DE +0503 ; Ll # CYRILLIC SMALL LETTER KOMI DJE +0505 ; Ll # CYRILLIC SMALL LETTER KOMI ZJE +0507 ; Ll # CYRILLIC SMALL LETTER KOMI DZJE +0509 ; Ll # CYRILLIC SMALL LETTER KOMI LJE +050B ; Ll # CYRILLIC SMALL LETTER KOMI NJE +050D ; Ll # CYRILLIC SMALL LETTER KOMI SJE +050F ; Ll # CYRILLIC SMALL LETTER KOMI TJE +0561..0587 ; Ll # [39] ARMENIAN SMALL LETTER AYB..ARMENIAN SMALL LIGATURE ECH YIWN +1E01 ; Ll # LATIN SMALL LETTER A WITH RING BELOW +1E03 ; Ll # LATIN SMALL LETTER B WITH DOT ABOVE +1E05 ; Ll # LATIN SMALL LETTER B WITH DOT BELOW +1E07 ; Ll # LATIN SMALL LETTER B WITH LINE BELOW +1E09 ; Ll # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE +1E0B ; Ll # LATIN SMALL LETTER D WITH DOT ABOVE +1E0D ; Ll # LATIN SMALL LETTER D WITH DOT BELOW +1E0F ; Ll # LATIN SMALL LETTER D WITH LINE BELOW +1E11 ; Ll # LATIN SMALL LETTER D WITH CEDILLA +1E13 ; Ll # LATIN SMALL LETTER D WITH CIRCUMFLEX BELOW +1E15 ; Ll # LATIN SMALL LETTER E WITH MACRON AND GRAVE +1E17 ; Ll # LATIN SMALL LETTER E WITH MACRON AND ACUTE +1E19 ; Ll # LATIN SMALL LETTER E WITH CIRCUMFLEX BELOW +1E1B ; Ll # LATIN SMALL LETTER E WITH TILDE BELOW +1E1D ; Ll # LATIN SMALL LETTER E WITH CEDILLA AND BREVE +1E1F ; Ll # LATIN SMALL LETTER F WITH DOT ABOVE +1E21 ; Ll # LATIN SMALL LETTER G WITH MACRON +1E23 ; Ll # LATIN SMALL LETTER H WITH DOT ABOVE +1E25 ; Ll # LATIN SMALL LETTER H WITH DOT BELOW +1E27 ; Ll # LATIN SMALL LETTER H WITH DIAERESIS +1E29 ; Ll # LATIN SMALL LETTER H WITH CEDILLA +1E2B ; Ll # LATIN SMALL LETTER H WITH BREVE BELOW +1E2D ; Ll # LATIN SMALL LETTER I WITH TILDE BELOW +1E2F ; Ll # LATIN SMALL LETTER I WITH DIAERESIS AND ACUTE +1E31 ; Ll # LATIN SMALL LETTER K WITH ACUTE +1E33 ; Ll # LATIN SMALL LETTER K WITH DOT BELOW +1E35 ; Ll # LATIN SMALL LETTER K WITH LINE BELOW +1E37 ; Ll # LATIN SMALL LETTER L WITH DOT BELOW +1E39 ; Ll # LATIN SMALL LETTER L WITH DOT BELOW AND MACRON +1E3B ; Ll # LATIN SMALL LETTER L WITH LINE BELOW +1E3D ; Ll # LATIN SMALL LETTER L WITH CIRCUMFLEX BELOW +1E3F ; Ll # LATIN SMALL LETTER M WITH ACUTE +1E41 ; Ll # LATIN SMALL LETTER M WITH DOT ABOVE +1E43 ; Ll # LATIN SMALL LETTER M WITH DOT BELOW +1E45 ; Ll # LATIN SMALL LETTER N WITH DOT ABOVE +1E47 ; Ll # LATIN SMALL LETTER N WITH DOT BELOW +1E49 ; Ll # LATIN SMALL LETTER N WITH LINE BELOW +1E4B ; Ll # LATIN SMALL LETTER N WITH CIRCUMFLEX BELOW +1E4D ; Ll # LATIN SMALL LETTER O WITH TILDE AND ACUTE +1E4F ; Ll # LATIN SMALL LETTER O WITH TILDE AND DIAERESIS +1E51 ; Ll # LATIN SMALL LETTER O WITH MACRON AND GRAVE +1E53 ; Ll # LATIN SMALL LETTER O WITH MACRON AND ACUTE +1E55 ; Ll # LATIN SMALL LETTER P WITH ACUTE +1E57 ; Ll # LATIN SMALL LETTER P WITH DOT ABOVE +1E59 ; Ll # LATIN SMALL LETTER R WITH DOT ABOVE +1E5B ; Ll # LATIN SMALL LETTER R WITH DOT BELOW +1E5D ; Ll # LATIN SMALL LETTER R WITH DOT BELOW AND MACRON +1E5F ; Ll # LATIN SMALL LETTER R WITH LINE BELOW +1E61 ; Ll # LATIN SMALL LETTER S WITH DOT ABOVE +1E63 ; Ll # LATIN SMALL LETTER S WITH DOT BELOW +1E65 ; Ll # LATIN SMALL LETTER S WITH ACUTE AND DOT ABOVE +1E67 ; Ll # LATIN SMALL LETTER S WITH CARON AND DOT ABOVE +1E69 ; Ll # LATIN SMALL LETTER S WITH DOT BELOW AND DOT ABOVE +1E6B ; Ll # LATIN SMALL LETTER T WITH DOT ABOVE +1E6D ; Ll # LATIN SMALL LETTER T WITH DOT BELOW +1E6F ; Ll # LATIN SMALL LETTER T WITH LINE BELOW +1E71 ; Ll # LATIN SMALL LETTER T WITH CIRCUMFLEX BELOW +1E73 ; Ll # LATIN SMALL LETTER U WITH DIAERESIS BELOW +1E75 ; Ll # LATIN SMALL LETTER U WITH TILDE BELOW +1E77 ; Ll # LATIN SMALL LETTER U WITH CIRCUMFLEX BELOW +1E79 ; Ll # LATIN SMALL LETTER U WITH TILDE AND ACUTE +1E7B ; Ll # LATIN SMALL LETTER U WITH MACRON AND DIAERESIS +1E7D ; Ll # LATIN SMALL LETTER V WITH TILDE +1E7F ; Ll # LATIN SMALL LETTER V WITH DOT BELOW +1E81 ; Ll # LATIN SMALL LETTER W WITH GRAVE +1E83 ; Ll # LATIN SMALL LETTER W WITH ACUTE +1E85 ; Ll # LATIN SMALL LETTER W WITH DIAERESIS +1E87 ; Ll # LATIN SMALL LETTER W WITH DOT ABOVE +1E89 ; Ll # LATIN SMALL LETTER W WITH DOT BELOW +1E8B ; Ll # LATIN SMALL LETTER X WITH DOT ABOVE +1E8D ; Ll # LATIN SMALL LETTER X WITH DIAERESIS +1E8F ; Ll # LATIN SMALL LETTER Y WITH DOT ABOVE +1E91 ; Ll # LATIN SMALL LETTER Z WITH CIRCUMFLEX +1E93 ; Ll # LATIN SMALL LETTER Z WITH DOT BELOW +1E95..1E9B ; Ll # [7] LATIN SMALL LETTER Z WITH LINE BELOW..LATIN SMALL LETTER LONG S WITH DOT ABOVE +1EA1 ; Ll # LATIN SMALL LETTER A WITH DOT BELOW +1EA3 ; Ll # LATIN SMALL LETTER A WITH HOOK ABOVE +1EA5 ; Ll # LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE +1EA7 ; Ll # LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE +1EA9 ; Ll # LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE +1EAB ; Ll # LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE +1EAD ; Ll # LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW +1EAF ; Ll # LATIN SMALL LETTER A WITH BREVE AND ACUTE +1EB1 ; Ll # LATIN SMALL LETTER A WITH BREVE AND GRAVE +1EB3 ; Ll # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE +1EB5 ; Ll # LATIN SMALL LETTER A WITH BREVE AND TILDE +1EB7 ; Ll # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW +1EB9 ; Ll # LATIN SMALL LETTER E WITH DOT BELOW +1EBB ; Ll # LATIN SMALL LETTER E WITH HOOK ABOVE +1EBD ; Ll # LATIN SMALL LETTER E WITH TILDE +1EBF ; Ll # LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE +1EC1 ; Ll # LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE +1EC3 ; Ll # LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE +1EC5 ; Ll # LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE +1EC7 ; Ll # LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW +1EC9 ; Ll # LATIN SMALL LETTER I WITH HOOK ABOVE +1ECB ; Ll # LATIN SMALL LETTER I WITH DOT BELOW +1ECD ; Ll # LATIN SMALL LETTER O WITH DOT BELOW +1ECF ; Ll # LATIN SMALL LETTER O WITH HOOK ABOVE +1ED1 ; Ll # LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE +1ED3 ; Ll # LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE +1ED5 ; Ll # LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE +1ED7 ; Ll # LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE +1ED9 ; Ll # LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW +1EDB ; Ll # LATIN SMALL LETTER O WITH HORN AND ACUTE +1EDD ; Ll # LATIN SMALL LETTER O WITH HORN AND GRAVE +1EDF ; Ll # LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE +1EE1 ; Ll # LATIN SMALL LETTER O WITH HORN AND TILDE +1EE3 ; Ll # LATIN SMALL LETTER O WITH HORN AND DOT BELOW +1EE5 ; Ll # LATIN SMALL LETTER U WITH DOT BELOW +1EE7 ; Ll # LATIN SMALL LETTER U WITH HOOK ABOVE +1EE9 ; Ll # LATIN SMALL LETTER U WITH HORN AND ACUTE +1EEB ; Ll # LATIN SMALL LETTER U WITH HORN AND GRAVE +1EED ; Ll # LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE +1EEF ; Ll # LATIN SMALL LETTER U WITH HORN AND TILDE +1EF1 ; Ll # LATIN SMALL LETTER U WITH HORN AND DOT BELOW +1EF3 ; Ll # LATIN SMALL LETTER Y WITH GRAVE +1EF5 ; Ll # LATIN SMALL LETTER Y WITH DOT BELOW +1EF7 ; Ll # LATIN SMALL LETTER Y WITH HOOK ABOVE +1EF9 ; Ll # LATIN SMALL LETTER Y WITH TILDE +1F00..1F07 ; Ll # [8] GREEK SMALL LETTER ALPHA WITH PSILI..GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI +1F10..1F15 ; Ll # [6] GREEK SMALL LETTER EPSILON WITH PSILI..GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA +1F20..1F27 ; Ll # [8] GREEK SMALL LETTER ETA WITH PSILI..GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI +1F30..1F37 ; Ll # [8] GREEK SMALL LETTER IOTA WITH PSILI..GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI +1F40..1F45 ; Ll # [6] GREEK SMALL LETTER OMICRON WITH PSILI..GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA +1F50..1F57 ; Ll # [8] GREEK SMALL LETTER UPSILON WITH PSILI..GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI +1F60..1F67 ; Ll # [8] GREEK SMALL LETTER OMEGA WITH PSILI..GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI +1F70..1F7D ; Ll # [14] GREEK SMALL LETTER ALPHA WITH VARIA..GREEK SMALL LETTER OMEGA WITH OXIA +1F80..1F87 ; Ll # [8] GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI..GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI +1F90..1F97 ; Ll # [8] GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI..GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI +1FA0..1FA7 ; Ll # [8] GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI..GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI +1FB0..1FB4 ; Ll # [5] GREEK SMALL LETTER ALPHA WITH VRACHY..GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI +1FB6..1FB7 ; Ll # [2] GREEK SMALL LETTER ALPHA WITH PERISPOMENI..GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI +1FBE ; Ll # GREEK PROSGEGRAMMENI +1FC2..1FC4 ; Ll # [3] GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI..GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI +1FC6..1FC7 ; Ll # [2] GREEK SMALL LETTER ETA WITH PERISPOMENI..GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI +1FD0..1FD3 ; Ll # [4] GREEK SMALL LETTER IOTA WITH VRACHY..GREEK SMALL LETTER IOTA WITH DIALYTIKA AND OXIA +1FD6..1FD7 ; Ll # [2] GREEK SMALL LETTER IOTA WITH PERISPOMENI..GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI +1FE0..1FE7 ; Ll # [8] GREEK SMALL LETTER UPSILON WITH VRACHY..GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI +1FF2..1FF4 ; Ll # [3] GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI..GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI +1FF6..1FF7 ; Ll # [2] GREEK SMALL LETTER OMEGA WITH PERISPOMENI..GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI +2071 ; Ll # SUPERSCRIPT LATIN SMALL LETTER I +207F ; Ll # SUPERSCRIPT LATIN SMALL LETTER N +210A ; Ll # SCRIPT SMALL G +210E..210F ; Ll # [2] PLANCK CONSTANT..PLANCK CONSTANT OVER TWO PI +2113 ; Ll # SCRIPT SMALL L +212F ; Ll # SCRIPT SMALL E +2134 ; Ll # SCRIPT SMALL O +2139 ; Ll # INFORMATION SOURCE +213D ; Ll # DOUBLE-STRUCK SMALL GAMMA +2146..2149 ; Ll # [4] DOUBLE-STRUCK ITALIC SMALL D..DOUBLE-STRUCK ITALIC SMALL J +FB00..FB06 ; Ll # [7] LATIN SMALL LIGATURE FF..LATIN SMALL LIGATURE ST +FB13..FB17 ; Ll # [5] ARMENIAN SMALL LIGATURE MEN NOW..ARMENIAN SMALL LIGATURE MEN XEH +FF41..FF5A ; Ll # [26] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH LATIN SMALL LETTER Z +10428..1044D ; Ll # [38] DESERET SMALL LETTER LONG I..DESERET SMALL LETTER ENG +1D41A..1D433 ; Ll # [26] MATHEMATICAL BOLD SMALL A..MATHEMATICAL BOLD SMALL Z +1D44E..1D454 ; Ll # [7] MATHEMATICAL ITALIC SMALL A..MATHEMATICAL ITALIC SMALL G +1D456..1D467 ; Ll # [18] MATHEMATICAL ITALIC SMALL I..MATHEMATICAL ITALIC SMALL Z +1D482..1D49B ; Ll # [26] MATHEMATICAL BOLD ITALIC SMALL A..MATHEMATICAL BOLD ITALIC SMALL Z +1D4B6..1D4B9 ; Ll # [4] MATHEMATICAL SCRIPT SMALL A..MATHEMATICAL SCRIPT SMALL D +1D4BB ; Ll # MATHEMATICAL SCRIPT SMALL F +1D4BD..1D4C0 ; Ll # [4] MATHEMATICAL SCRIPT SMALL H..MATHEMATICAL SCRIPT SMALL K +1D4C2..1D4C3 ; Ll # [2] MATHEMATICAL SCRIPT SMALL M..MATHEMATICAL SCRIPT SMALL N +1D4C5..1D4CF ; Ll # [11] MATHEMATICAL SCRIPT SMALL P..MATHEMATICAL SCRIPT SMALL Z +1D4EA..1D503 ; Ll # [26] MATHEMATICAL BOLD SCRIPT SMALL A..MATHEMATICAL BOLD SCRIPT SMALL Z +1D51E..1D537 ; Ll # [26] MATHEMATICAL FRAKTUR SMALL A..MATHEMATICAL FRAKTUR SMALL Z +1D552..1D56B ; Ll # [26] MATHEMATICAL DOUBLE-STRUCK SMALL A..MATHEMATICAL DOUBLE-STRUCK SMALL Z +1D586..1D59F ; Ll # [26] MATHEMATICAL BOLD FRAKTUR SMALL A..MATHEMATICAL BOLD FRAKTUR SMALL Z +1D5BA..1D5D3 ; Ll # [26] MATHEMATICAL SANS-SERIF SMALL A..MATHEMATICAL SANS-SERIF SMALL Z +1D5EE..1D607 ; Ll # [26] MATHEMATICAL SANS-SERIF BOLD SMALL A..MATHEMATICAL SANS-SERIF BOLD SMALL Z +1D622..1D63B ; Ll # [26] MATHEMATICAL SANS-SERIF ITALIC SMALL A..MATHEMATICAL SANS-SERIF ITALIC SMALL Z +1D656..1D66F ; Ll # [26] MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL A..MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL Z +1D68A..1D6A3 ; Ll # [26] MATHEMATICAL MONOSPACE SMALL A..MATHEMATICAL MONOSPACE SMALL Z +1D6C2..1D6DA ; Ll # [25] MATHEMATICAL BOLD SMALL ALPHA..MATHEMATICAL BOLD SMALL OMEGA +1D6DC..1D6E1 ; Ll # [6] MATHEMATICAL BOLD EPSILON SYMBOL..MATHEMATICAL BOLD PI SYMBOL +1D6FC..1D714 ; Ll # [25] MATHEMATICAL ITALIC SMALL ALPHA..MATHEMATICAL ITALIC SMALL OMEGA +1D716..1D71B ; Ll # [6] MATHEMATICAL ITALIC EPSILON SYMBOL..MATHEMATICAL ITALIC PI SYMBOL +1D736..1D74E ; Ll # [25] MATHEMATICAL BOLD ITALIC SMALL ALPHA..MATHEMATICAL BOLD ITALIC SMALL OMEGA +1D750..1D755 ; Ll # [6] MATHEMATICAL BOLD ITALIC EPSILON SYMBOL..MATHEMATICAL BOLD ITALIC PI SYMBOL +1D770..1D788 ; Ll # [25] MATHEMATICAL SANS-SERIF BOLD SMALL ALPHA..MATHEMATICAL SANS-SERIF BOLD SMALL OMEGA +1D78A..1D78F ; Ll # [6] MATHEMATICAL SANS-SERIF BOLD EPSILON SYMBOL..MATHEMATICAL SANS-SERIF BOLD PI SYMBOL +1D7AA..1D7C2 ; Ll # [25] MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ALPHA..MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL OMEGA +1D7C4..1D7C9 ; Ll # [6] MATHEMATICAL SANS-SERIF BOLD ITALIC EPSILON SYMBOL..MATHEMATICAL SANS-SERIF BOLD ITALIC PI SYMBOL + +# Total code points: 1350 + +# ================================================ + +01C5 ; Lt # LATIN CAPITAL LETTER D WITH SMALL LETTER Z WITH CARON +01C8 ; Lt # LATIN CAPITAL LETTER L WITH SMALL LETTER J +01CB ; Lt # LATIN CAPITAL LETTER N WITH SMALL LETTER J +01F2 ; Lt # LATIN CAPITAL LETTER D WITH SMALL LETTER Z +1F88..1F8F ; Lt # [8] GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI..GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI +1F98..1F9F ; Lt # [8] GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI..GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI +1FA8..1FAF ; Lt # [8] GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI..GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI +1FBC ; Lt # GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI +1FCC ; Lt # GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI +1FFC ; Lt # GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI + +# Total code points: 31 + +# ================================================ + +02B0..02B8 ; Lm # [9] MODIFIER LETTER SMALL H..MODIFIER LETTER SMALL Y +02BB..02C1 ; Lm # [7] MODIFIER LETTER TURNED COMMA..MODIFIER LETTER REVERSED GLOTTAL STOP +02D0..02D1 ; Lm # [2] MODIFIER LETTER TRIANGULAR COLON..MODIFIER LETTER HALF TRIANGULAR COLON +02E0..02E4 ; Lm # [5] MODIFIER LETTER SMALL GAMMA..MODIFIER LETTER SMALL REVERSED GLOTTAL STOP +02EE ; Lm # MODIFIER LETTER DOUBLE APOSTROPHE +037A ; Lm # GREEK YPOGEGRAMMENI +0559 ; Lm # ARMENIAN MODIFIER LETTER LEFT HALF RING +0640 ; Lm # ARABIC TATWEEL +06E5..06E6 ; Lm # [2] ARABIC SMALL WAW..ARABIC SMALL YEH +0E46 ; Lm # THAI CHARACTER MAIYAMOK +0EC6 ; Lm # LAO KO LA +17D7 ; Lm # KHMER SIGN LEK TOO +1843 ; Lm # MONGOLIAN LETTER TODO LONG VOWEL SIGN +3005 ; Lm # IDEOGRAPHIC ITERATION MARK +3031..3035 ; Lm # [5] VERTICAL KANA REPEAT MARK..VERTICAL KANA REPEAT MARK LOWER HALF +303B ; Lm # VERTICAL IDEOGRAPHIC ITERATION MARK +309D..309E ; Lm # [2] HIRAGANA ITERATION MARK..HIRAGANA VOICED ITERATION MARK +30FC..30FE ; Lm # [3] KATAKANA-HIRAGANA PROLONGED SOUND MARK..KATAKANA VOICED ITERATION MARK +FF70 ; Lm # HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK +FF9E..FF9F ; Lm # [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK + +# Total code points: 48 + +# ================================================ + +01BB ; Lo # LATIN LETTER TWO WITH STROKE +01C0..01C3 ; Lo # [4] LATIN LETTER DENTAL CLICK..LATIN LETTER RETROFLEX CLICK +05D0..05EA ; Lo # [27] HEBREW LETTER ALEF..HEBREW LETTER TAV +05F0..05F2 ; Lo # [3] HEBREW LIGATURE YIDDISH DOUBLE VAV..HEBREW LIGATURE YIDDISH DOUBLE YOD +0621..063A ; Lo # [26] ARABIC LETTER HAMZA..ARABIC LETTER GHAIN +0641..064A ; Lo # [10] ARABIC LETTER FEH..ARABIC LETTER YEH +066E..066F ; Lo # [2] ARABIC LETTER DOTLESS BEH..ARABIC LETTER DOTLESS QAF +0671..06D3 ; Lo # [99] ARABIC LETTER ALEF WASLA..ARABIC LETTER YEH BARREE WITH HAMZA ABOVE +06D5 ; Lo # ARABIC LETTER AE +06FA..06FC ; Lo # [3] ARABIC LETTER SHEEN WITH DOT BELOW..ARABIC LETTER GHAIN WITH DOT BELOW +0710 ; Lo # SYRIAC LETTER ALAPH +0712..072C ; Lo # [27] SYRIAC LETTER BETH..SYRIAC LETTER TAW +0780..07A5 ; Lo # [38] THAANA LETTER HAA..THAANA LETTER WAAVU +07B1 ; Lo # THAANA LETTER NAA +0905..0939 ; Lo # [53] DEVANAGARI LETTER A..DEVANAGARI LETTER HA +093D ; Lo # DEVANAGARI SIGN AVAGRAHA +0950 ; Lo # DEVANAGARI OM +0958..0961 ; Lo # [10] DEVANAGARI LETTER QA..DEVANAGARI LETTER VOCALIC LL +0985..098C ; Lo # [8] BENGALI LETTER A..BENGALI LETTER VOCALIC L +098F..0990 ; Lo # [2] BENGALI LETTER E..BENGALI LETTER AI +0993..09A8 ; Lo # [22] BENGALI LETTER O..BENGALI LETTER NA +09AA..09B0 ; Lo # [7] BENGALI LETTER PA..BENGALI LETTER RA +09B2 ; Lo # BENGALI LETTER LA +09B6..09B9 ; Lo # [4] BENGALI LETTER SHA..BENGALI LETTER HA +09DC..09DD ; Lo # [2] BENGALI LETTER RRA..BENGALI LETTER RHA +09DF..09E1 ; Lo # [3] BENGALI LETTER YYA..BENGALI LETTER VOCALIC LL +09F0..09F1 ; Lo # [2] BENGALI LETTER RA WITH MIDDLE DIAGONAL..BENGALI LETTER RA WITH LOWER DIAGONAL +0A05..0A0A ; Lo # [6] GURMUKHI LETTER A..GURMUKHI LETTER UU +0A0F..0A10 ; Lo # [2] GURMUKHI LETTER EE..GURMUKHI LETTER AI +0A13..0A28 ; Lo # [22] GURMUKHI LETTER OO..GURMUKHI LETTER NA +0A2A..0A30 ; Lo # [7] GURMUKHI LETTER PA..GURMUKHI LETTER RA +0A32..0A33 ; Lo # [2] GURMUKHI LETTER LA..GURMUKHI LETTER LLA +0A35..0A36 ; Lo # [2] GURMUKHI LETTER VA..GURMUKHI LETTER SHA +0A38..0A39 ; Lo # [2] GURMUKHI LETTER SA..GURMUKHI LETTER HA +0A59..0A5C ; Lo # [4] GURMUKHI LETTER KHHA..GURMUKHI LETTER RRA +0A5E ; Lo # GURMUKHI LETTER FA +0A72..0A74 ; Lo # [3] GURMUKHI IRI..GURMUKHI EK ONKAR +0A85..0A8B ; Lo # [7] GUJARATI LETTER A..GUJARATI LETTER VOCALIC R +0A8D ; Lo # GUJARATI VOWEL CANDRA E +0A8F..0A91 ; Lo # [3] GUJARATI LETTER E..GUJARATI VOWEL CANDRA O +0A93..0AA8 ; Lo # [22] GUJARATI LETTER O..GUJARATI LETTER NA +0AAA..0AB0 ; Lo # [7] GUJARATI LETTER PA..GUJARATI LETTER RA +0AB2..0AB3 ; Lo # [2] GUJARATI LETTER LA..GUJARATI LETTER LLA +0AB5..0AB9 ; Lo # [5] GUJARATI LETTER VA..GUJARATI LETTER HA +0ABD ; Lo # GUJARATI SIGN AVAGRAHA +0AD0 ; Lo # GUJARATI OM +0AE0 ; Lo # GUJARATI LETTER VOCALIC RR +0B05..0B0C ; Lo # [8] ORIYA LETTER A..ORIYA LETTER VOCALIC L +0B0F..0B10 ; Lo # [2] ORIYA LETTER E..ORIYA LETTER AI +0B13..0B28 ; Lo # [22] ORIYA LETTER O..ORIYA LETTER NA +0B2A..0B30 ; Lo # [7] ORIYA LETTER PA..ORIYA LETTER RA +0B32..0B33 ; Lo # [2] ORIYA LETTER LA..ORIYA LETTER LLA +0B36..0B39 ; Lo # [4] ORIYA LETTER SHA..ORIYA LETTER HA +0B3D ; Lo # ORIYA SIGN AVAGRAHA +0B5C..0B5D ; Lo # [2] ORIYA LETTER RRA..ORIYA LETTER RHA +0B5F..0B61 ; Lo # [3] ORIYA LETTER YYA..ORIYA LETTER VOCALIC LL +0B83 ; Lo # TAMIL SIGN VISARGA +0B85..0B8A ; Lo # [6] TAMIL LETTER A..TAMIL LETTER UU +0B8E..0B90 ; Lo # [3] TAMIL LETTER E..TAMIL LETTER AI +0B92..0B95 ; Lo # [4] TAMIL LETTER O..TAMIL LETTER KA +0B99..0B9A ; Lo # [2] TAMIL LETTER NGA..TAMIL LETTER CA +0B9C ; Lo # TAMIL LETTER JA +0B9E..0B9F ; Lo # [2] TAMIL LETTER NYA..TAMIL LETTER TTA +0BA3..0BA4 ; Lo # [2] TAMIL LETTER NNA..TAMIL LETTER TA +0BA8..0BAA ; Lo # [3] TAMIL LETTER NA..TAMIL LETTER PA +0BAE..0BB5 ; Lo # [8] TAMIL LETTER MA..TAMIL LETTER VA +0BB7..0BB9 ; Lo # [3] TAMIL LETTER SSA..TAMIL LETTER HA +0C05..0C0C ; Lo # [8] TELUGU LETTER A..TELUGU LETTER VOCALIC L +0C0E..0C10 ; Lo # [3] TELUGU LETTER E..TELUGU LETTER AI +0C12..0C28 ; Lo # [23] TELUGU LETTER O..TELUGU LETTER NA +0C2A..0C33 ; Lo # [10] TELUGU LETTER PA..TELUGU LETTER LLA +0C35..0C39 ; Lo # [5] TELUGU LETTER VA..TELUGU LETTER HA +0C60..0C61 ; Lo # [2] TELUGU LETTER VOCALIC RR..TELUGU LETTER VOCALIC LL +0C85..0C8C ; Lo # [8] KANNADA LETTER A..KANNADA LETTER VOCALIC L +0C8E..0C90 ; Lo # [3] KANNADA LETTER E..KANNADA LETTER AI +0C92..0CA8 ; Lo # [23] KANNADA LETTER O..KANNADA LETTER NA +0CAA..0CB3 ; Lo # [10] KANNADA LETTER PA..KANNADA LETTER LLA +0CB5..0CB9 ; Lo # [5] KANNADA LETTER VA..KANNADA LETTER HA +0CDE ; Lo # KANNADA LETTER FA +0CE0..0CE1 ; Lo # [2] KANNADA LETTER VOCALIC RR..KANNADA LETTER VOCALIC LL +0D05..0D0C ; Lo # [8] MALAYALAM LETTER A..MALAYALAM LETTER VOCALIC L +0D0E..0D10 ; Lo # [3] MALAYALAM LETTER E..MALAYALAM LETTER AI +0D12..0D28 ; Lo # [23] MALAYALAM LETTER O..MALAYALAM LETTER NA +0D2A..0D39 ; Lo # [16] MALAYALAM LETTER PA..MALAYALAM LETTER HA +0D60..0D61 ; Lo # [2] MALAYALAM LETTER VOCALIC RR..MALAYALAM LETTER VOCALIC LL +0D85..0D96 ; Lo # [18] SINHALA LETTER AYANNA..SINHALA LETTER AUYANNA +0D9A..0DB1 ; Lo # [24] SINHALA LETTER ALPAPRAANA KAYANNA..SINHALA LETTER DANTAJA NAYANNA +0DB3..0DBB ; Lo # [9] SINHALA LETTER SANYAKA DAYANNA..SINHALA LETTER RAYANNA +0DBD ; Lo # SINHALA LETTER DANTAJA LAYANNA +0DC0..0DC6 ; Lo # [7] SINHALA LETTER VAYANNA..SINHALA LETTER FAYANNA +0E01..0E30 ; Lo # [48] THAI CHARACTER KO KAI..THAI CHARACTER SARA A +0E32..0E33 ; Lo # [2] THAI CHARACTER SARA AA..THAI CHARACTER SARA AM +0E40..0E45 ; Lo # [6] THAI CHARACTER SARA E..THAI CHARACTER LAKKHANGYAO +0E81..0E82 ; Lo # [2] LAO LETTER KO..LAO LETTER KHO SUNG +0E84 ; Lo # LAO LETTER KHO TAM +0E87..0E88 ; Lo # [2] LAO LETTER NGO..LAO LETTER CO +0E8A ; Lo # LAO LETTER SO TAM +0E8D ; Lo # LAO LETTER NYO +0E94..0E97 ; Lo # [4] LAO LETTER DO..LAO LETTER THO TAM +0E99..0E9F ; Lo # [7] LAO LETTER NO..LAO LETTER FO SUNG +0EA1..0EA3 ; Lo # [3] LAO LETTER MO..LAO LETTER LO LING +0EA5 ; Lo # LAO LETTER LO LOOT +0EA7 ; Lo # LAO LETTER WO +0EAA..0EAB ; Lo # [2] LAO LETTER SO SUNG..LAO LETTER HO SUNG +0EAD..0EB0 ; Lo # [4] LAO LETTER O..LAO VOWEL SIGN A +0EB2..0EB3 ; Lo # [2] LAO VOWEL SIGN AA..LAO VOWEL SIGN AM +0EBD ; Lo # LAO SEMIVOWEL SIGN NYO +0EC0..0EC4 ; Lo # [5] LAO VOWEL SIGN E..LAO VOWEL SIGN AI +0EDC..0EDD ; Lo # [2] LAO HO NO..LAO HO MO +0F00 ; Lo # TIBETAN SYLLABLE OM +0F40..0F47 ; Lo # [8] TIBETAN LETTER KA..TIBETAN LETTER JA +0F49..0F6A ; Lo # [34] TIBETAN LETTER NYA..TIBETAN LETTER FIXED-FORM RA +0F88..0F8B ; Lo # [4] TIBETAN SIGN LCE TSA CAN..TIBETAN SIGN GRU MED RGYINGS +1000..1021 ; Lo # [34] MYANMAR LETTER KA..MYANMAR LETTER A +1023..1027 ; Lo # [5] MYANMAR LETTER I..MYANMAR LETTER E +1029..102A ; Lo # [2] MYANMAR LETTER O..MYANMAR LETTER AU +1050..1055 ; Lo # [6] MYANMAR LETTER SHA..MYANMAR LETTER VOCALIC LL +10D0..10F8 ; Lo # [41] GEORGIAN LETTER AN..GEORGIAN LETTER ELIFI +1100..1159 ; Lo # [90] HANGUL CHOSEONG KIYEOK..HANGUL CHOSEONG YEORINHIEUH +115F..11A2 ; Lo # [68] HANGUL CHOSEONG FILLER..HANGUL JUNGSEONG SSANGARAEA +11A8..11F9 ; Lo # [82] HANGUL JONGSEONG KIYEOK..HANGUL JONGSEONG YEORINHIEUH +1200..1206 ; Lo # [7] ETHIOPIC SYLLABLE HA..ETHIOPIC SYLLABLE HO +1208..1246 ; Lo # [63] ETHIOPIC SYLLABLE LA..ETHIOPIC SYLLABLE QO +1248 ; Lo # ETHIOPIC SYLLABLE QWA +124A..124D ; Lo # [4] ETHIOPIC SYLLABLE QWI..ETHIOPIC SYLLABLE QWE +1250..1256 ; Lo # [7] ETHIOPIC SYLLABLE QHA..ETHIOPIC SYLLABLE QHO +1258 ; Lo # ETHIOPIC SYLLABLE QHWA +125A..125D ; Lo # [4] ETHIOPIC SYLLABLE QHWI..ETHIOPIC SYLLABLE QHWE +1260..1286 ; Lo # [39] ETHIOPIC SYLLABLE BA..ETHIOPIC SYLLABLE XO +1288 ; Lo # ETHIOPIC SYLLABLE XWA +128A..128D ; Lo # [4] ETHIOPIC SYLLABLE XWI..ETHIOPIC SYLLABLE XWE +1290..12AE ; Lo # [31] ETHIOPIC SYLLABLE NA..ETHIOPIC SYLLABLE KO +12B0 ; Lo # ETHIOPIC SYLLABLE KWA +12B2..12B5 ; Lo # [4] ETHIOPIC SYLLABLE KWI..ETHIOPIC SYLLABLE KWE +12B8..12BE ; Lo # [7] ETHIOPIC SYLLABLE KXA..ETHIOPIC SYLLABLE KXO +12C0 ; Lo # ETHIOPIC SYLLABLE KXWA +12C2..12C5 ; Lo # [4] ETHIOPIC SYLLABLE KXWI..ETHIOPIC SYLLABLE KXWE +12C8..12CE ; Lo # [7] ETHIOPIC SYLLABLE WA..ETHIOPIC SYLLABLE WO +12D0..12D6 ; Lo # [7] ETHIOPIC SYLLABLE PHARYNGEAL A..ETHIOPIC SYLLABLE PHARYNGEAL O +12D8..12EE ; Lo # [23] ETHIOPIC SYLLABLE ZA..ETHIOPIC SYLLABLE YO +12F0..130E ; Lo # [31] ETHIOPIC SYLLABLE DA..ETHIOPIC SYLLABLE GO +1310 ; Lo # ETHIOPIC SYLLABLE GWA +1312..1315 ; Lo # [4] ETHIOPIC SYLLABLE GWI..ETHIOPIC SYLLABLE GWE +1318..131E ; Lo # [7] ETHIOPIC SYLLABLE GGA..ETHIOPIC SYLLABLE GGO +1320..1346 ; Lo # [39] ETHIOPIC SYLLABLE THA..ETHIOPIC SYLLABLE TZO +1348..135A ; Lo # [19] ETHIOPIC SYLLABLE FA..ETHIOPIC SYLLABLE FYA +13A0..13F4 ; Lo # [85] CHEROKEE LETTER A..CHEROKEE LETTER YV +1401..166C ; Lo # [620] CANADIAN SYLLABICS E..CANADIAN SYLLABICS CARRIER TTSA +166F..1676 ; Lo # [8] CANADIAN SYLLABICS QAI..CANADIAN SYLLABICS NNGAA +1681..169A ; Lo # [26] OGHAM LETTER BEITH..OGHAM LETTER PEITH +16A0..16EA ; Lo # [75] RUNIC LETTER FEHU FEOH FE F..RUNIC LETTER X +1700..170C ; Lo # [13] TAGALOG LETTER A..TAGALOG LETTER YA +170E..1711 ; Lo # [4] TAGALOG LETTER LA..TAGALOG LETTER HA +1720..1731 ; Lo # [18] HANUNOO LETTER A..HANUNOO LETTER HA +1740..1751 ; Lo # [18] BUHID LETTER A..BUHID LETTER HA +1760..176C ; Lo # [13] TAGBANWA LETTER A..TAGBANWA LETTER YA +176E..1770 ; Lo # [3] TAGBANWA LETTER LA..TAGBANWA LETTER SA +1780..17B3 ; Lo # [52] KHMER LETTER KA..KHMER INDEPENDENT VOWEL QAU +17DC ; Lo # KHMER SIGN AVAKRAHASANYA +1820..1842 ; Lo # [35] MONGOLIAN LETTER A..MONGOLIAN LETTER CHI +1844..1877 ; Lo # [52] MONGOLIAN LETTER TODO E..MONGOLIAN LETTER MANCHU ZHA +1880..18A8 ; Lo # [41] MONGOLIAN LETTER ALI GALI ANUSVARA ONE..MONGOLIAN LETTER MANCHU ALI GALI BHA +2135..2138 ; Lo # [4] ALEF SYMBOL..DALET SYMBOL +3006 ; Lo # IDEOGRAPHIC CLOSING MARK +303C ; Lo # MASU MARK +3041..3096 ; Lo # [86] HIRAGANA LETTER SMALL A..HIRAGANA LETTER SMALL KE +309F ; Lo # HIRAGANA DIGRAPH YORI +30A1..30FA ; Lo # [90] KATAKANA LETTER SMALL A..KATAKANA LETTER VO +30FF ; Lo # KATAKANA DIGRAPH KOTO +3105..312C ; Lo # [40] BOPOMOFO LETTER B..BOPOMOFO LETTER GN +3131..318E ; Lo # [94] HANGUL LETTER KIYEOK..HANGUL LETTER ARAEAE +31A0..31B7 ; Lo # [24] BOPOMOFO LETTER BU..BOPOMOFO FINAL LETTER H +31F0..31FF ; Lo # [16] KATAKANA LETTER SMALL KU..KATAKANA LETTER SMALL RO +3400..4DB5 ; Lo # [6582] CJK UNIFIED IDEOGRAPH-3400..CJK UNIFIED IDEOGRAPH-4DB5 +4E00..9FA5 ; Lo # [20902] CJK UNIFIED IDEOGRAPH-4E00..CJK UNIFIED IDEOGRAPH-9FA5 +A000..A48C ; Lo # [1165] YI SYLLABLE IT..YI SYLLABLE YYR +AC00..D7A3 ; Lo # [11172] HANGUL SYLLABLE GA..HANGUL SYLLABLE HIH +F900..FA2D ; Lo # [302] CJK COMPATIBILITY IDEOGRAPH-F900..CJK COMPATIBILITY IDEOGRAPH-FA2D +FA30..FA6A ; Lo # [59] CJK COMPATIBILITY IDEOGRAPH-FA30..CJK COMPATIBILITY IDEOGRAPH-FA6A +FB1D ; Lo # HEBREW LETTER YOD WITH HIRIQ +FB1F..FB28 ; Lo # [10] HEBREW LIGATURE YIDDISH YOD YOD PATAH..HEBREW LETTER WIDE TAV +FB2A..FB36 ; Lo # [13] HEBREW LETTER SHIN WITH SHIN DOT..HEBREW LETTER ZAYIN WITH DAGESH +FB38..FB3C ; Lo # [5] HEBREW LETTER TET WITH DAGESH..HEBREW LETTER LAMED WITH DAGESH +FB3E ; Lo # HEBREW LETTER MEM WITH DAGESH +FB40..FB41 ; Lo # [2] HEBREW LETTER NUN WITH DAGESH..HEBREW LETTER SAMEKH WITH DAGESH +FB43..FB44 ; Lo # [2] HEBREW LETTER FINAL PE WITH DAGESH..HEBREW LETTER PE WITH DAGESH +FB46..FBB1 ; Lo # [108] HEBREW LETTER TSADI WITH DAGESH..ARABIC LETTER YEH BARREE WITH HAMZA ABOVE FINAL FORM +FBD3..FD3D ; Lo # [363] ARABIC LETTER NG ISOLATED FORM..ARABIC LIGATURE ALEF WITH FATHATAN ISOLATED FORM +FD50..FD8F ; Lo # [64] ARABIC LIGATURE TEH WITH JEEM WITH MEEM INITIAL FORM..ARABIC LIGATURE MEEM WITH KHAH WITH MEEM INITIAL FORM +FD92..FDC7 ; Lo # [54] ARABIC LIGATURE MEEM WITH JEEM WITH KHAH INITIAL FORM..ARABIC LIGATURE NOON WITH JEEM WITH YEH FINAL FORM +FDF0..FDFB ; Lo # [12] ARABIC LIGATURE SALLA USED AS KORANIC STOP SIGN ISOLATED FORM..ARABIC LIGATURE JALLAJALALOUHOU +FE70..FE74 ; Lo # [5] ARABIC FATHATAN ISOLATED FORM..ARABIC KASRATAN ISOLATED FORM +FE76..FEFC ; Lo # [135] ARABIC FATHA ISOLATED FORM..ARABIC LIGATURE LAM WITH ALEF FINAL FORM +FF66..FF6F ; Lo # [10] HALFWIDTH KATAKANA LETTER WO..HALFWIDTH KATAKANA LETTER SMALL TU +FF71..FF9D ; Lo # [45] HALFWIDTH KATAKANA LETTER A..HALFWIDTH KATAKANA LETTER N +FFA0..FFBE ; Lo # [31] HALFWIDTH HANGUL FILLER..HALFWIDTH HANGUL LETTER HIEUH +FFC2..FFC7 ; Lo # [6] HALFWIDTH HANGUL LETTER A..HALFWIDTH HANGUL LETTER E +FFCA..FFCF ; Lo # [6] HALFWIDTH HANGUL LETTER YEO..HALFWIDTH HANGUL LETTER OE +FFD2..FFD7 ; Lo # [6] HALFWIDTH HANGUL LETTER YO..HALFWIDTH HANGUL LETTER YU +FFDA..FFDC ; Lo # [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL LETTER I +10300..1031E ; Lo # [31] OLD ITALIC LETTER A..OLD ITALIC LETTER UU +10330..10349 ; Lo # [26] GOTHIC LETTER AHSA..GOTHIC LETTER OTHAL +20000..2A6D6 ; Lo # [42711] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6D6 +2F800..2FA1D ; Lo # [542] CJK COMPATIBILITY IDEOGRAPH-2F800..CJK COMPATIBILITY IDEOGRAPH-2FA1D + +# Total code points: 87343 + +# ================================================ + +0300..034F ; Mn # [80] COMBINING GRAVE ACCENT..COMBINING GRAPHEME JOINER +0360..036F ; Mn # [16] COMBINING DOUBLE TILDE..COMBINING LATIN SMALL LETTER X +0483..0486 ; Mn # [4] COMBINING CYRILLIC TITLO..COMBINING CYRILLIC PSILI PNEUMATA +0591..05A1 ; Mn # [17] HEBREW ACCENT ETNAHTA..HEBREW ACCENT PAZER +05A3..05B9 ; Mn # [23] HEBREW ACCENT MUNAH..HEBREW POINT HOLAM +05BB..05BD ; Mn # [3] HEBREW POINT QUBUTS..HEBREW POINT METEG +05BF ; Mn # HEBREW POINT RAFE +05C1..05C2 ; Mn # [2] HEBREW POINT SHIN DOT..HEBREW POINT SIN DOT +05C4 ; Mn # HEBREW MARK UPPER DOT +064B..0655 ; Mn # [11] ARABIC FATHATAN..ARABIC HAMZA BELOW +0670 ; Mn # ARABIC LETTER SUPERSCRIPT ALEF +06D6..06DC ; Mn # [7] ARABIC SMALL HIGH LIGATURE SAD WITH LAM WITH ALEF MAKSURA..ARABIC SMALL HIGH SEEN +06DF..06E4 ; Mn # [6] ARABIC SMALL HIGH ROUNDED ZERO..ARABIC SMALL HIGH MADDA +06E7..06E8 ; Mn # [2] ARABIC SMALL HIGH YEH..ARABIC SMALL HIGH NOON +06EA..06ED ; Mn # [4] ARABIC EMPTY CENTRE LOW STOP..ARABIC SMALL LOW MEEM +0711 ; Mn # SYRIAC LETTER SUPERSCRIPT ALAPH +0730..074A ; Mn # [27] SYRIAC PTHAHA ABOVE..SYRIAC BARREKH +07A6..07B0 ; Mn # [11] THAANA ABAFILI..THAANA SUKUN +0901..0902 ; Mn # [2] DEVANAGARI SIGN CANDRABINDU..DEVANAGARI SIGN ANUSVARA +093C ; Mn # DEVANAGARI SIGN NUKTA +0941..0948 ; Mn # [8] DEVANAGARI VOWEL SIGN U..DEVANAGARI VOWEL SIGN AI +094D ; Mn # DEVANAGARI SIGN VIRAMA +0951..0954 ; Mn # [4] DEVANAGARI STRESS SIGN UDATTA..DEVANAGARI ACUTE ACCENT +0962..0963 ; Mn # [2] DEVANAGARI VOWEL SIGN VOCALIC L..DEVANAGARI VOWEL SIGN VOCALIC LL +0981 ; Mn # BENGALI SIGN CANDRABINDU +09BC ; Mn # BENGALI SIGN NUKTA +09C1..09C4 ; Mn # [4] BENGALI VOWEL SIGN U..BENGALI VOWEL SIGN VOCALIC RR +09CD ; Mn # BENGALI SIGN VIRAMA +09E2..09E3 ; Mn # [2] BENGALI VOWEL SIGN VOCALIC L..BENGALI VOWEL SIGN VOCALIC LL +0A02 ; Mn # GURMUKHI SIGN BINDI +0A3C ; Mn # GURMUKHI SIGN NUKTA +0A41..0A42 ; Mn # [2] GURMUKHI VOWEL SIGN U..GURMUKHI VOWEL SIGN UU +0A47..0A48 ; Mn # [2] GURMUKHI VOWEL SIGN EE..GURMUKHI VOWEL SIGN AI +0A4B..0A4D ; Mn # [3] GURMUKHI VOWEL SIGN OO..GURMUKHI SIGN VIRAMA +0A70..0A71 ; Mn # [2] GURMUKHI TIPPI..GURMUKHI ADDAK +0A81..0A82 ; Mn # [2] GUJARATI SIGN CANDRABINDU..GUJARATI SIGN ANUSVARA +0ABC ; Mn # GUJARATI SIGN NUKTA +0AC1..0AC5 ; Mn # [5] GUJARATI VOWEL SIGN U..GUJARATI VOWEL SIGN CANDRA E +0AC7..0AC8 ; Mn # [2] GUJARATI VOWEL SIGN E..GUJARATI VOWEL SIGN AI +0ACD ; Mn # GUJARATI SIGN VIRAMA +0B01 ; Mn # ORIYA SIGN CANDRABINDU +0B3C ; Mn # ORIYA SIGN NUKTA +0B3F ; Mn # ORIYA VOWEL SIGN I +0B41..0B43 ; Mn # [3] ORIYA VOWEL SIGN U..ORIYA VOWEL SIGN VOCALIC R +0B4D ; Mn # ORIYA SIGN VIRAMA +0B56 ; Mn # ORIYA AI LENGTH MARK +0B82 ; Mn # TAMIL SIGN ANUSVARA +0BC0 ; Mn # TAMIL VOWEL SIGN II +0BCD ; Mn # TAMIL SIGN VIRAMA +0C3E..0C40 ; Mn # [3] TELUGU VOWEL SIGN AA..TELUGU VOWEL SIGN II +0C46..0C48 ; Mn # [3] TELUGU VOWEL SIGN E..TELUGU VOWEL SIGN AI +0C4A..0C4D ; Mn # [4] TELUGU VOWEL SIGN O..TELUGU SIGN VIRAMA +0C55..0C56 ; Mn # [2] TELUGU LENGTH MARK..TELUGU AI LENGTH MARK +0CBF ; Mn # KANNADA VOWEL SIGN I +0CC6 ; Mn # KANNADA VOWEL SIGN E +0CCC..0CCD ; Mn # [2] KANNADA VOWEL SIGN AU..KANNADA SIGN VIRAMA +0D41..0D43 ; Mn # [3] MALAYALAM VOWEL SIGN U..MALAYALAM VOWEL SIGN VOCALIC R +0D4D ; Mn # MALAYALAM SIGN VIRAMA +0DCA ; Mn # SINHALA SIGN AL-LAKUNA +0DD2..0DD4 ; Mn # [3] SINHALA VOWEL SIGN KETTI IS-PILLA..SINHALA VOWEL SIGN KETTI PAA-PILLA +0DD6 ; Mn # SINHALA VOWEL SIGN DIGA PAA-PILLA +0E31 ; Mn # THAI CHARACTER MAI HAN-AKAT +0E34..0E3A ; Mn # [7] THAI CHARACTER SARA I..THAI CHARACTER PHINTHU +0E47..0E4E ; Mn # [8] THAI CHARACTER MAITAIKHU..THAI CHARACTER YAMAKKAN +0EB1 ; Mn # LAO VOWEL SIGN MAI KAN +0EB4..0EB9 ; Mn # [6] LAO VOWEL SIGN I..LAO VOWEL SIGN UU +0EBB..0EBC ; Mn # [2] LAO VOWEL SIGN MAI KON..LAO SEMIVOWEL SIGN LO +0EC8..0ECD ; Mn # [6] LAO TONE MAI EK..LAO NIGGAHITA +0F18..0F19 ; Mn # [2] TIBETAN ASTROLOGICAL SIGN -KHYUD PA..TIBETAN ASTROLOGICAL SIGN SDONG TSHUGS +0F35 ; Mn # TIBETAN MARK NGAS BZUNG NYI ZLA +0F37 ; Mn # TIBETAN MARK NGAS BZUNG SGOR RTAGS +0F39 ; Mn # TIBETAN MARK TSA -PHRU +0F71..0F7E ; Mn # [14] TIBETAN VOWEL SIGN AA..TIBETAN SIGN RJES SU NGA RO +0F80..0F84 ; Mn # [5] TIBETAN VOWEL SIGN REVERSED I..TIBETAN MARK HALANTA +0F86..0F87 ; Mn # [2] TIBETAN SIGN LCI RTAGS..TIBETAN SIGN YANG RTAGS +0F90..0F97 ; Mn # [8] TIBETAN SUBJOINED LETTER KA..TIBETAN SUBJOINED LETTER JA +0F99..0FBC ; Mn # [36] TIBETAN SUBJOINED LETTER NYA..TIBETAN SUBJOINED LETTER FIXED-FORM RA +0FC6 ; Mn # TIBETAN SYMBOL PADMA GDAN +102D..1030 ; Mn # [4] MYANMAR VOWEL SIGN I..MYANMAR VOWEL SIGN UU +1032 ; Mn # MYANMAR VOWEL SIGN AI +1036..1037 ; Mn # [2] MYANMAR SIGN ANUSVARA..MYANMAR SIGN DOT BELOW +1039 ; Mn # MYANMAR SIGN VIRAMA +1058..1059 ; Mn # [2] MYANMAR VOWEL SIGN VOCALIC L..MYANMAR VOWEL SIGN VOCALIC LL +1712..1714 ; Mn # [3] TAGALOG VOWEL SIGN I..TAGALOG SIGN VIRAMA +1732..1734 ; Mn # [3] HANUNOO VOWEL SIGN I..HANUNOO SIGN PAMUDPOD +1752..1753 ; Mn # [2] BUHID VOWEL SIGN I..BUHID VOWEL SIGN U +1772..1773 ; Mn # [2] TAGBANWA VOWEL SIGN I..TAGBANWA VOWEL SIGN U +17B7..17BD ; Mn # [7] KHMER VOWEL SIGN I..KHMER VOWEL SIGN UA +17C6 ; Mn # KHMER SIGN NIKAHIT +17C9..17D3 ; Mn # [11] KHMER SIGN MUUSIKATOAN..KHMER SIGN BATHAMASAT +180B..180D ; Mn # [3] MONGOLIAN FREE VARIATION SELECTOR ONE..MONGOLIAN FREE VARIATION SELECTOR THREE +18A9 ; Mn # MONGOLIAN LETTER ALI GALI DAGALGA +20D0..20DC ; Mn # [13] COMBINING LEFT HARPOON ABOVE..COMBINING FOUR DOTS ABOVE +20E1 ; Mn # COMBINING LEFT RIGHT ARROW ABOVE +20E5..20EA ; Mn # [6] COMBINING REVERSE SOLIDUS OVERLAY..COMBINING LEFTWARDS ARROW OVERLAY +302A..302F ; Mn # [6] IDEOGRAPHIC LEVEL TONE MARK..HANGUL DOUBLE DOT TONE MARK +3099..309A ; Mn # [2] COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK..COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK +FB1E ; Mn # HEBREW POINT JUDEO-SPANISH VARIKA +FE00..FE0F ; Mn # [16] VARIATION SELECTOR-1..VARIATION SELECTOR-16 +FE20..FE23 ; Mn # [4] COMBINING LIGATURE LEFT HALF..COMBINING DOUBLE TILDE RIGHT HALF +1D167..1D169 ; Mn # [3] MUSICAL SYMBOL COMBINING TREMOLO-1..MUSICAL SYMBOL COMBINING TREMOLO-3 +1D17B..1D182 ; Mn # [8] MUSICAL SYMBOL COMBINING ACCENT..MUSICAL SYMBOL COMBINING LOURE +1D185..1D18B ; Mn # [7] MUSICAL SYMBOL COMBINING DOIT..MUSICAL SYMBOL COMBINING TRIPLE TONGUE +1D1AA..1D1AD ; Mn # [4] MUSICAL SYMBOL COMBINING DOWN BOW..MUSICAL SYMBOL COMBINING SNAP PIZZICATO + +# Total code points: 518 + +# ================================================ + +0488..0489 ; Me # [2] COMBINING CYRILLIC HUNDRED THOUSANDS SIGN..COMBINING CYRILLIC MILLIONS SIGN +06DE ; Me # ARABIC START OF RUB EL HIZB +20DD..20E0 ; Me # [4] COMBINING ENCLOSING CIRCLE..COMBINING ENCLOSING CIRCLE BACKSLASH +20E2..20E4 ; Me # [3] COMBINING ENCLOSING SCREEN..COMBINING ENCLOSING UPWARD POINTING TRIANGLE + +# Total code points: 10 + +# ================================================ + +0903 ; Mc # DEVANAGARI SIGN VISARGA +093E..0940 ; Mc # [3] DEVANAGARI VOWEL SIGN AA..DEVANAGARI VOWEL SIGN II +0949..094C ; Mc # [4] DEVANAGARI VOWEL SIGN CANDRA O..DEVANAGARI VOWEL SIGN AU +0982..0983 ; Mc # [2] BENGALI SIGN ANUSVARA..BENGALI SIGN VISARGA +09BE..09C0 ; Mc # [3] BENGALI VOWEL SIGN AA..BENGALI VOWEL SIGN II +09C7..09C8 ; Mc # [2] BENGALI VOWEL SIGN E..BENGALI VOWEL SIGN AI +09CB..09CC ; Mc # [2] BENGALI VOWEL SIGN O..BENGALI VOWEL SIGN AU +09D7 ; Mc # BENGALI AU LENGTH MARK +0A3E..0A40 ; Mc # [3] GURMUKHI VOWEL SIGN AA..GURMUKHI VOWEL SIGN II +0A83 ; Mc # GUJARATI SIGN VISARGA +0ABE..0AC0 ; Mc # [3] GUJARATI VOWEL SIGN AA..GUJARATI VOWEL SIGN II +0AC9 ; Mc # GUJARATI VOWEL SIGN CANDRA O +0ACB..0ACC ; Mc # [2] GUJARATI VOWEL SIGN O..GUJARATI VOWEL SIGN AU +0B02..0B03 ; Mc # [2] ORIYA SIGN ANUSVARA..ORIYA SIGN VISARGA +0B3E ; Mc # ORIYA VOWEL SIGN AA +0B40 ; Mc # ORIYA VOWEL SIGN II +0B47..0B48 ; Mc # [2] ORIYA VOWEL SIGN E..ORIYA VOWEL SIGN AI +0B4B..0B4C ; Mc # [2] ORIYA VOWEL SIGN O..ORIYA VOWEL SIGN AU +0B57 ; Mc # ORIYA AU LENGTH MARK +0BBE..0BBF ; Mc # [2] TAMIL VOWEL SIGN AA..TAMIL VOWEL SIGN I +0BC1..0BC2 ; Mc # [2] TAMIL VOWEL SIGN U..TAMIL VOWEL SIGN UU +0BC6..0BC8 ; Mc # [3] TAMIL VOWEL SIGN E..TAMIL VOWEL SIGN AI +0BCA..0BCC ; Mc # [3] TAMIL VOWEL SIGN O..TAMIL VOWEL SIGN AU +0BD7 ; Mc # TAMIL AU LENGTH MARK +0C01..0C03 ; Mc # [3] TELUGU SIGN CANDRABINDU..TELUGU SIGN VISARGA +0C41..0C44 ; Mc # [4] TELUGU VOWEL SIGN U..TELUGU VOWEL SIGN VOCALIC RR +0C82..0C83 ; Mc # [2] KANNADA SIGN ANUSVARA..KANNADA SIGN VISARGA +0CBE ; Mc # KANNADA VOWEL SIGN AA +0CC0..0CC4 ; Mc # [5] KANNADA VOWEL SIGN II..KANNADA VOWEL SIGN VOCALIC RR +0CC7..0CC8 ; Mc # [2] KANNADA VOWEL SIGN EE..KANNADA VOWEL SIGN AI +0CCA..0CCB ; Mc # [2] KANNADA VOWEL SIGN O..KANNADA VOWEL SIGN OO +0CD5..0CD6 ; Mc # [2] KANNADA LENGTH MARK..KANNADA AI LENGTH MARK +0D02..0D03 ; Mc # [2] MALAYALAM SIGN ANUSVARA..MALAYALAM SIGN VISARGA +0D3E..0D40 ; Mc # [3] MALAYALAM VOWEL SIGN AA..MALAYALAM VOWEL SIGN II +0D46..0D48 ; Mc # [3] MALAYALAM VOWEL SIGN E..MALAYALAM VOWEL SIGN AI +0D4A..0D4C ; Mc # [3] MALAYALAM VOWEL SIGN O..MALAYALAM VOWEL SIGN AU +0D57 ; Mc # MALAYALAM AU LENGTH MARK +0D82..0D83 ; Mc # [2] SINHALA SIGN ANUSVARAYA..SINHALA SIGN VISARGAYA +0DCF..0DD1 ; Mc # [3] SINHALA VOWEL SIGN AELA-PILLA..SINHALA VOWEL SIGN DIGA AEDA-PILLA +0DD8..0DDF ; Mc # [8] SINHALA VOWEL SIGN GAETTA-PILLA..SINHALA VOWEL SIGN GAYANUKITTA +0DF2..0DF3 ; Mc # [2] SINHALA VOWEL SIGN DIGA GAETTA-PILLA..SINHALA VOWEL SIGN DIGA GAYANUKITTA +0F3E..0F3F ; Mc # [2] TIBETAN SIGN YAR TSHES..TIBETAN SIGN MAR TSHES +0F7F ; Mc # TIBETAN SIGN RNAM BCAD +102C ; Mc # MYANMAR VOWEL SIGN AA +1031 ; Mc # MYANMAR VOWEL SIGN E +1038 ; Mc # MYANMAR SIGN VISARGA +1056..1057 ; Mc # [2] MYANMAR VOWEL SIGN VOCALIC R..MYANMAR VOWEL SIGN VOCALIC RR +17B4..17B6 ; Mc # [3] KHMER VOWEL INHERENT AQ..KHMER VOWEL SIGN AA +17BE..17C5 ; Mc # [8] KHMER VOWEL SIGN OE..KHMER VOWEL SIGN AU +17C7..17C8 ; Mc # [2] KHMER SIGN REAHMUK..KHMER SIGN YUUKALEAPINTU +1D165..1D166 ; Mc # [2] MUSICAL SYMBOL COMBINING STEM..MUSICAL SYMBOL COMBINING SPRECHGESANG STEM +1D16D..1D172 ; Mc # [6] MUSICAL SYMBOL COMBINING AUGMENTATION DOT..MUSICAL SYMBOL COMBINING FLAG-5 + +# Total code points: 125 + +# ================================================ + +0030..0039 ; Nd # [10] DIGIT ZERO..DIGIT NINE +0660..0669 ; Nd # [10] ARABIC-INDIC DIGIT ZERO..ARABIC-INDIC DIGIT NINE +06F0..06F9 ; Nd # [10] EXTENDED ARABIC-INDIC DIGIT ZERO..EXTENDED ARABIC-INDIC DIGIT NINE +0966..096F ; Nd # [10] DEVANAGARI DIGIT ZERO..DEVANAGARI DIGIT NINE +09E6..09EF ; Nd # [10] BENGALI DIGIT ZERO..BENGALI DIGIT NINE +0A66..0A6F ; Nd # [10] GURMUKHI DIGIT ZERO..GURMUKHI DIGIT NINE +0AE6..0AEF ; Nd # [10] GUJARATI DIGIT ZERO..GUJARATI DIGIT NINE +0B66..0B6F ; Nd # [10] ORIYA DIGIT ZERO..ORIYA DIGIT NINE +0BE7..0BEF ; Nd # [9] TAMIL DIGIT ONE..TAMIL DIGIT NINE +0C66..0C6F ; Nd # [10] TELUGU DIGIT ZERO..TELUGU DIGIT NINE +0CE6..0CEF ; Nd # [10] KANNADA DIGIT ZERO..KANNADA DIGIT NINE +0D66..0D6F ; Nd # [10] MALAYALAM DIGIT ZERO..MALAYALAM DIGIT NINE +0E50..0E59 ; Nd # [10] THAI DIGIT ZERO..THAI DIGIT NINE +0ED0..0ED9 ; Nd # [10] LAO DIGIT ZERO..LAO DIGIT NINE +0F20..0F29 ; Nd # [10] TIBETAN DIGIT ZERO..TIBETAN DIGIT NINE +1040..1049 ; Nd # [10] MYANMAR DIGIT ZERO..MYANMAR DIGIT NINE +1369..1371 ; Nd # [9] ETHIOPIC DIGIT ONE..ETHIOPIC DIGIT NINE +17E0..17E9 ; Nd # [10] KHMER DIGIT ZERO..KHMER DIGIT NINE +1810..1819 ; Nd # [10] MONGOLIAN DIGIT ZERO..MONGOLIAN DIGIT NINE +FF10..FF19 ; Nd # [10] FULLWIDTH DIGIT ZERO..FULLWIDTH DIGIT NINE +1D7CE..1D7FF ; Nd # [50] MATHEMATICAL BOLD DIGIT ZERO..MATHEMATICAL MONOSPACE DIGIT NINE + +# Total code points: 248 + +# ================================================ + +16EE..16F0 ; Nl # [3] RUNIC ARLAUG SYMBOL..RUNIC BELGTHOR SYMBOL +2160..2183 ; Nl # [36] ROMAN NUMERAL ONE..ROMAN NUMERAL REVERSED ONE HUNDRED +3007 ; Nl # IDEOGRAPHIC NUMBER ZERO +3021..3029 ; Nl # [9] HANGZHOU NUMERAL ONE..HANGZHOU NUMERAL NINE +3038..303A ; Nl # [3] HANGZHOU NUMERAL TEN..HANGZHOU NUMERAL THIRTY +1034A ; Nl # GOTHIC LETTER NINE HUNDRED + +# Total code points: 53 + +# ================================================ + +00B2..00B3 ; No # [2] SUPERSCRIPT TWO..SUPERSCRIPT THREE +00B9 ; No # SUPERSCRIPT ONE +00BC..00BE ; No # [3] VULGAR FRACTION ONE QUARTER..VULGAR FRACTION THREE QUARTERS +09F4..09F9 ; No # [6] BENGALI CURRENCY NUMERATOR ONE..BENGALI CURRENCY DENOMINATOR SIXTEEN +0BF0..0BF2 ; No # [3] TAMIL NUMBER TEN..TAMIL NUMBER ONE THOUSAND +0F2A..0F33 ; No # [10] TIBETAN DIGIT HALF ONE..TIBETAN DIGIT HALF ZERO +1372..137C ; No # [11] ETHIOPIC NUMBER TEN..ETHIOPIC NUMBER TEN THOUSAND +2070 ; No # SUPERSCRIPT ZERO +2074..2079 ; No # [6] SUPERSCRIPT FOUR..SUPERSCRIPT NINE +2080..2089 ; No # [10] SUBSCRIPT ZERO..SUBSCRIPT NINE +2153..215F ; No # [13] VULGAR FRACTION ONE THIRD..FRACTION NUMERATOR ONE +2460..249B ; No # [60] CIRCLED DIGIT ONE..NUMBER TWENTY FULL STOP +24EA..24FE ; No # [21] CIRCLED DIGIT ZERO..DOUBLE CIRCLED NUMBER TEN +2776..2793 ; No # [30] DINGBAT NEGATIVE CIRCLED DIGIT ONE..DINGBAT NEGATIVE CIRCLED SANS-SERIF NUMBER TEN +3192..3195 ; No # [4] IDEOGRAPHIC ANNOTATION ONE MARK..IDEOGRAPHIC ANNOTATION FOUR MARK +3220..3229 ; No # [10] PARENTHESIZED IDEOGRAPH ONE..PARENTHESIZED IDEOGRAPH TEN +3251..325F ; No # [15] CIRCLED NUMBER TWENTY ONE..CIRCLED NUMBER THIRTY FIVE +3280..3289 ; No # [10] CIRCLED IDEOGRAPH ONE..CIRCLED IDEOGRAPH TEN +32B1..32BF ; No # [15] CIRCLED NUMBER THIRTY SIX..CIRCLED NUMBER FIFTY +10320..10323 ; No # [4] OLD ITALIC NUMERAL ONE..OLD ITALIC NUMERAL FIFTY + +# Total code points: 235 + +# ================================================ + +0020 ; Zs # SPACE +00A0 ; Zs # NO-BREAK SPACE +1680 ; Zs # OGHAM SPACE MARK +2000..200B ; Zs # [12] EN QUAD..ZERO WIDTH SPACE +202F ; Zs # NARROW NO-BREAK SPACE +205F ; Zs # MEDIUM MATHEMATICAL SPACE +3000 ; Zs # IDEOGRAPHIC SPACE + +# Total code points: 18 + +# ================================================ + +2028 ; Zl # LINE SEPARATOR + +# Total code points: 1 + +# ================================================ + +2029 ; Zp # PARAGRAPH SEPARATOR + +# Total code points: 1 + +# ================================================ + +0000..001F ; Cc # [32] .. +007F..009F ; Cc # [33] .. + +# Total code points: 65 + +# ================================================ + +06DD ; Cf # ARABIC END OF AYAH +070F ; Cf # SYRIAC ABBREVIATION MARK +180E ; Cf # MONGOLIAN VOWEL SEPARATOR +200C..200F ; Cf # [4] ZERO WIDTH NON-JOINER..RIGHT-TO-LEFT MARK +202A..202E ; Cf # [5] LEFT-TO-RIGHT EMBEDDING..RIGHT-TO-LEFT OVERRIDE +2060..2063 ; Cf # [4] WORD JOINER..INVISIBLE SEPARATOR +206A..206F ; Cf # [6] INHIBIT SYMMETRIC SWAPPING..NOMINAL DIGIT SHAPES +FEFF ; Cf # ZERO WIDTH NO-BREAK SPACE +FFF9..FFFB ; Cf # [3] INTERLINEAR ANNOTATION ANCHOR..INTERLINEAR ANNOTATION TERMINATOR +1D173..1D17A ; Cf # [8] MUSICAL SYMBOL BEGIN BEAM..MUSICAL SYMBOL END PHRASE +E0001 ; Cf # LANGUAGE TAG +E0020..E007F ; Cf # [96] TAG SPACE..CANCEL TAG + +# Total code points: 131 + +# ================================================ + +E000..F8FF ; Co # [6400] +F0000..FFFFD ; Co # [65534] +100000..10FFFD; Co # [65534] + +# Total code points: 137468 + +# ================================================ + +D800..DFFF ; Cs # [2048] + +# Total code points: 2048 + +# ================================================ + +002D ; Pd # HYPHEN-MINUS +00AD ; Pd # SOFT HYPHEN +058A ; Pd # ARMENIAN HYPHEN +1806 ; Pd # MONGOLIAN TODO SOFT HYPHEN +2010..2015 ; Pd # [6] HYPHEN..HORIZONTAL BAR +301C ; Pd # WAVE DASH +3030 ; Pd # WAVY DASH +30A0 ; Pd # KATAKANA-HIRAGANA DOUBLE HYPHEN +FE31..FE32 ; Pd # [2] PRESENTATION FORM FOR VERTICAL EM DASH..PRESENTATION FORM FOR VERTICAL EN DASH +FE58 ; Pd # SMALL EM DASH +FE63 ; Pd # SMALL HYPHEN-MINUS +FF0D ; Pd # FULLWIDTH HYPHEN-MINUS + +# Total code points: 18 + +# ================================================ + +0028 ; Ps # LEFT PARENTHESIS +005B ; Ps # LEFT SQUARE BRACKET +007B ; Ps # LEFT CURLY BRACKET +0F3A ; Ps # TIBETAN MARK GUG RTAGS GYON +0F3C ; Ps # TIBETAN MARK ANG KHANG GYON +169B ; Ps # OGHAM FEATHER MARK +201A ; Ps # SINGLE LOW-9 QUOTATION MARK +201E ; Ps # DOUBLE LOW-9 QUOTATION MARK +2045 ; Ps # LEFT SQUARE BRACKET WITH QUILL +207D ; Ps # SUPERSCRIPT LEFT PARENTHESIS +208D ; Ps # SUBSCRIPT LEFT PARENTHESIS +2329 ; Ps # LEFT-POINTING ANGLE BRACKET +23B4 ; Ps # TOP SQUARE BRACKET +2768 ; Ps # MEDIUM LEFT PARENTHESIS ORNAMENT +276A ; Ps # MEDIUM FLATTENED LEFT PARENTHESIS ORNAMENT +276C ; Ps # MEDIUM LEFT-POINTING ANGLE BRACKET ORNAMENT +276E ; Ps # HEAVY LEFT-POINTING ANGLE QUOTATION MARK ORNAMENT +2770 ; Ps # HEAVY LEFT-POINTING ANGLE BRACKET ORNAMENT +2772 ; Ps # LIGHT LEFT TORTOISE SHELL BRACKET ORNAMENT +2774 ; Ps # MEDIUM LEFT CURLY BRACKET ORNAMENT +27E6 ; Ps # MATHEMATICAL LEFT WHITE SQUARE BRACKET +27E8 ; Ps # MATHEMATICAL LEFT ANGLE BRACKET +27EA ; Ps # MATHEMATICAL LEFT DOUBLE ANGLE BRACKET +2983 ; Ps # LEFT WHITE CURLY BRACKET +2985 ; Ps # LEFT WHITE PARENTHESIS +2987 ; Ps # Z NOTATION LEFT IMAGE BRACKET +2989 ; Ps # Z NOTATION LEFT BINDING BRACKET +298B ; Ps # LEFT SQUARE BRACKET WITH UNDERBAR +298D ; Ps # LEFT SQUARE BRACKET WITH TICK IN TOP CORNER +298F ; Ps # LEFT SQUARE BRACKET WITH TICK IN BOTTOM CORNER +2991 ; Ps # LEFT ANGLE BRACKET WITH DOT +2993 ; Ps # LEFT ARC LESS-THAN BRACKET +2995 ; Ps # DOUBLE LEFT ARC GREATER-THAN BRACKET +2997 ; Ps # LEFT BLACK TORTOISE SHELL BRACKET +29D8 ; Ps # LEFT WIGGLY FENCE +29DA ; Ps # LEFT DOUBLE WIGGLY FENCE +29FC ; Ps # LEFT-POINTING CURVED ANGLE BRACKET +3008 ; Ps # LEFT ANGLE BRACKET +300A ; Ps # LEFT DOUBLE ANGLE BRACKET +300C ; Ps # LEFT CORNER BRACKET +300E ; Ps # LEFT WHITE CORNER BRACKET +3010 ; Ps # LEFT BLACK LENTICULAR BRACKET +3014 ; Ps # LEFT TORTOISE SHELL BRACKET +3016 ; Ps # LEFT WHITE LENTICULAR BRACKET +3018 ; Ps # LEFT WHITE TORTOISE SHELL BRACKET +301A ; Ps # LEFT WHITE SQUARE BRACKET +301D ; Ps # REVERSED DOUBLE PRIME QUOTATION MARK +FD3E ; Ps # ORNATE LEFT PARENTHESIS +FE35 ; Ps # PRESENTATION FORM FOR VERTICAL LEFT PARENTHESIS +FE37 ; Ps # PRESENTATION FORM FOR VERTICAL LEFT CURLY BRACKET +FE39 ; Ps # PRESENTATION FORM FOR VERTICAL LEFT TORTOISE SHELL BRACKET +FE3B ; Ps # PRESENTATION FORM FOR VERTICAL LEFT BLACK LENTICULAR BRACKET +FE3D ; Ps # PRESENTATION FORM FOR VERTICAL LEFT DOUBLE ANGLE BRACKET +FE3F ; Ps # PRESENTATION FORM FOR VERTICAL LEFT ANGLE BRACKET +FE41 ; Ps # PRESENTATION FORM FOR VERTICAL LEFT CORNER BRACKET +FE43 ; Ps # PRESENTATION FORM FOR VERTICAL LEFT WHITE CORNER BRACKET +FE59 ; Ps # SMALL LEFT PARENTHESIS +FE5B ; Ps # SMALL LEFT CURLY BRACKET +FE5D ; Ps # SMALL LEFT TORTOISE SHELL BRACKET +FF08 ; Ps # FULLWIDTH LEFT PARENTHESIS +FF3B ; Ps # FULLWIDTH LEFT SQUARE BRACKET +FF5B ; Ps # FULLWIDTH LEFT CURLY BRACKET +FF5F ; Ps # FULLWIDTH LEFT WHITE PARENTHESIS +FF62 ; Ps # HALFWIDTH LEFT CORNER BRACKET + +# Total code points: 64 + +# ================================================ + +0029 ; Pe # RIGHT PARENTHESIS +005D ; Pe # RIGHT SQUARE BRACKET +007D ; Pe # RIGHT CURLY BRACKET +0F3B ; Pe # TIBETAN MARK GUG RTAGS GYAS +0F3D ; Pe # TIBETAN MARK ANG KHANG GYAS +169C ; Pe # OGHAM REVERSED FEATHER MARK +2046 ; Pe # RIGHT SQUARE BRACKET WITH QUILL +207E ; Pe # SUPERSCRIPT RIGHT PARENTHESIS +208E ; Pe # SUBSCRIPT RIGHT PARENTHESIS +232A ; Pe # RIGHT-POINTING ANGLE BRACKET +23B5 ; Pe # BOTTOM SQUARE BRACKET +2769 ; Pe # MEDIUM RIGHT PARENTHESIS ORNAMENT +276B ; Pe # MEDIUM FLATTENED RIGHT PARENTHESIS ORNAMENT +276D ; Pe # MEDIUM RIGHT-POINTING ANGLE BRACKET ORNAMENT +276F ; Pe # HEAVY RIGHT-POINTING ANGLE QUOTATION MARK ORNAMENT +2771 ; Pe # HEAVY RIGHT-POINTING ANGLE BRACKET ORNAMENT +2773 ; Pe # LIGHT RIGHT TORTOISE SHELL BRACKET ORNAMENT +2775 ; Pe # MEDIUM RIGHT CURLY BRACKET ORNAMENT +27E7 ; Pe # MATHEMATICAL RIGHT WHITE SQUARE BRACKET +27E9 ; Pe # MATHEMATICAL RIGHT ANGLE BRACKET +27EB ; Pe # MATHEMATICAL RIGHT DOUBLE ANGLE BRACKET +2984 ; Pe # RIGHT WHITE CURLY BRACKET +2986 ; Pe # RIGHT WHITE PARENTHESIS +2988 ; Pe # Z NOTATION RIGHT IMAGE BRACKET +298A ; Pe # Z NOTATION RIGHT BINDING BRACKET +298C ; Pe # RIGHT SQUARE BRACKET WITH UNDERBAR +298E ; Pe # RIGHT SQUARE BRACKET WITH TICK IN BOTTOM CORNER +2990 ; Pe # RIGHT SQUARE BRACKET WITH TICK IN TOP CORNER +2992 ; Pe # RIGHT ANGLE BRACKET WITH DOT +2994 ; Pe # RIGHT ARC GREATER-THAN BRACKET +2996 ; Pe # DOUBLE RIGHT ARC LESS-THAN BRACKET +2998 ; Pe # RIGHT BLACK TORTOISE SHELL BRACKET +29D9 ; Pe # RIGHT WIGGLY FENCE +29DB ; Pe # RIGHT DOUBLE WIGGLY FENCE +29FD ; Pe # RIGHT-POINTING CURVED ANGLE BRACKET +3009 ; Pe # RIGHT ANGLE BRACKET +300B ; Pe # RIGHT DOUBLE ANGLE BRACKET +300D ; Pe # RIGHT CORNER BRACKET +300F ; Pe # RIGHT WHITE CORNER BRACKET +3011 ; Pe # RIGHT BLACK LENTICULAR BRACKET +3015 ; Pe # RIGHT TORTOISE SHELL BRACKET +3017 ; Pe # RIGHT WHITE LENTICULAR BRACKET +3019 ; Pe # RIGHT WHITE TORTOISE SHELL BRACKET +301B ; Pe # RIGHT WHITE SQUARE BRACKET +301E..301F ; Pe # [2] DOUBLE PRIME QUOTATION MARK..LOW DOUBLE PRIME QUOTATION MARK +FD3F ; Pe # ORNATE RIGHT PARENTHESIS +FE36 ; Pe # PRESENTATION FORM FOR VERTICAL RIGHT PARENTHESIS +FE38 ; Pe # PRESENTATION FORM FOR VERTICAL RIGHT CURLY BRACKET +FE3A ; Pe # PRESENTATION FORM FOR VERTICAL RIGHT TORTOISE SHELL BRACKET +FE3C ; Pe # PRESENTATION FORM FOR VERTICAL RIGHT BLACK LENTICULAR BRACKET +FE3E ; Pe # PRESENTATION FORM FOR VERTICAL RIGHT DOUBLE ANGLE BRACKET +FE40 ; Pe # PRESENTATION FORM FOR VERTICAL RIGHT ANGLE BRACKET +FE42 ; Pe # PRESENTATION FORM FOR VERTICAL RIGHT CORNER BRACKET +FE44 ; Pe # PRESENTATION FORM FOR VERTICAL RIGHT WHITE CORNER BRACKET +FE5A ; Pe # SMALL RIGHT PARENTHESIS +FE5C ; Pe # SMALL RIGHT CURLY BRACKET +FE5E ; Pe # SMALL RIGHT TORTOISE SHELL BRACKET +FF09 ; Pe # FULLWIDTH RIGHT PARENTHESIS +FF3D ; Pe # FULLWIDTH RIGHT SQUARE BRACKET +FF5D ; Pe # FULLWIDTH RIGHT CURLY BRACKET +FF60 ; Pe # FULLWIDTH RIGHT WHITE PARENTHESIS +FF63 ; Pe # HALFWIDTH RIGHT CORNER BRACKET + +# Total code points: 63 + +# ================================================ + +005F ; Pc # LOW LINE +203F..2040 ; Pc # [2] UNDERTIE..CHARACTER TIE +30FB ; Pc # KATAKANA MIDDLE DOT +FE33..FE34 ; Pc # [2] PRESENTATION FORM FOR VERTICAL LOW LINE..PRESENTATION FORM FOR VERTICAL WAVY LOW LINE +FE4D..FE4F ; Pc # [3] DASHED LOW LINE..WAVY LOW LINE +FF3F ; Pc # FULLWIDTH LOW LINE +FF65 ; Pc # HALFWIDTH KATAKANA MIDDLE DOT + +# Total code points: 11 + +# ================================================ + +0021..0023 ; Po # [3] EXCLAMATION MARK..NUMBER SIGN +0025..0027 ; Po # [3] PERCENT SIGN..APOSTROPHE +002A ; Po # ASTERISK +002C ; Po # COMMA +002E..002F ; Po # [2] FULL STOP..SOLIDUS +003A..003B ; Po # [2] COLON..SEMICOLON +003F..0040 ; Po # [2] QUESTION MARK..COMMERCIAL AT +005C ; Po # REVERSE SOLIDUS +00A1 ; Po # INVERTED EXCLAMATION MARK +00B7 ; Po # MIDDLE DOT +00BF ; Po # INVERTED QUESTION MARK +037E ; Po # GREEK QUESTION MARK +0387 ; Po # GREEK ANO TELEIA +055A..055F ; Po # [6] ARMENIAN APOSTROPHE..ARMENIAN ABBREVIATION MARK +0589 ; Po # ARMENIAN FULL STOP +05BE ; Po # HEBREW PUNCTUATION MAQAF +05C0 ; Po # HEBREW PUNCTUATION PASEQ +05C3 ; Po # HEBREW PUNCTUATION SOF PASUQ +05F3..05F4 ; Po # [2] HEBREW PUNCTUATION GERESH..HEBREW PUNCTUATION GERSHAYIM +060C ; Po # ARABIC COMMA +061B ; Po # ARABIC SEMICOLON +061F ; Po # ARABIC QUESTION MARK +066A..066D ; Po # [4] ARABIC PERCENT SIGN..ARABIC FIVE POINTED STAR +06D4 ; Po # ARABIC FULL STOP +0700..070D ; Po # [14] SYRIAC END OF PARAGRAPH..SYRIAC HARKLEAN ASTERISCUS +0964..0965 ; Po # [2] DEVANAGARI DANDA..DEVANAGARI DOUBLE DANDA +0970 ; Po # DEVANAGARI ABBREVIATION SIGN +0DF4 ; Po # SINHALA PUNCTUATION KUNDDALIYA +0E4F ; Po # THAI CHARACTER FONGMAN +0E5A..0E5B ; Po # [2] THAI CHARACTER ANGKHANKHU..THAI CHARACTER KHOMUT +0F04..0F12 ; Po # [15] TIBETAN MARK INITIAL YIG MGO MDUN MA..TIBETAN MARK RGYA GRAM SHAD +0F85 ; Po # TIBETAN MARK PALUTA +104A..104F ; Po # [6] MYANMAR SIGN LITTLE SECTION..MYANMAR SYMBOL GENITIVE +10FB ; Po # GEORGIAN PARAGRAPH SEPARATOR +1361..1368 ; Po # [8] ETHIOPIC WORDSPACE..ETHIOPIC PARAGRAPH SEPARATOR +166D..166E ; Po # [2] CANADIAN SYLLABICS CHI SIGN..CANADIAN SYLLABICS FULL STOP +16EB..16ED ; Po # [3] RUNIC SINGLE PUNCTUATION..RUNIC CROSS PUNCTUATION +1735..1736 ; Po # [2] PHILIPPINE SINGLE PUNCTUATION..PHILIPPINE DOUBLE PUNCTUATION +17D4..17D6 ; Po # [3] KHMER SIGN KHAN..KHMER SIGN CAMNUC PII KUUH +17D8..17DA ; Po # [3] KHMER SIGN BEYYAL..KHMER SIGN KOOMUUT +1800..1805 ; Po # [6] MONGOLIAN BIRGA..MONGOLIAN FOUR DOTS +1807..180A ; Po # [4] MONGOLIAN SIBE SYLLABLE BOUNDARY MARKER..MONGOLIAN NIRUGU +2016..2017 ; Po # [2] DOUBLE VERTICAL LINE..DOUBLE LOW LINE +2020..2027 ; Po # [8] DAGGER..HYPHENATION POINT +2030..2038 ; Po # [9] PER MILLE SIGN..CARET +203B..203E ; Po # [4] REFERENCE MARK..OVERLINE +2041..2043 ; Po # [3] CARET INSERTION POINT..HYPHEN BULLET +2047..2051 ; Po # [11] DOUBLE QUESTION MARK..TWO ASTERISKS ALIGNED VERTICALLY +2057 ; Po # QUADRUPLE PRIME +23B6 ; Po # BOTTOM SQUARE BRACKET OVER TOP SQUARE BRACKET +3001..3003 ; Po # [3] IDEOGRAPHIC COMMA..DITTO MARK +303D ; Po # PART ALTERNATION MARK +FE30 ; Po # PRESENTATION FORM FOR VERTICAL TWO DOT LEADER +FE45..FE46 ; Po # [2] SESAME DOT..WHITE SESAME DOT +FE49..FE4C ; Po # [4] DASHED OVERLINE..DOUBLE WAVY OVERLINE +FE50..FE52 ; Po # [3] SMALL COMMA..SMALL FULL STOP +FE54..FE57 ; Po # [4] SMALL SEMICOLON..SMALL EXCLAMATION MARK +FE5F..FE61 ; Po # [3] SMALL NUMBER SIGN..SMALL ASTERISK +FE68 ; Po # SMALL REVERSE SOLIDUS +FE6A..FE6B ; Po # [2] SMALL PERCENT SIGN..SMALL COMMERCIAL AT +FF01..FF03 ; Po # [3] FULLWIDTH EXCLAMATION MARK..FULLWIDTH NUMBER SIGN +FF05..FF07 ; Po # [3] FULLWIDTH PERCENT SIGN..FULLWIDTH APOSTROPHE +FF0A ; Po # FULLWIDTH ASTERISK +FF0C ; Po # FULLWIDTH COMMA +FF0E..FF0F ; Po # [2] FULLWIDTH FULL STOP..FULLWIDTH SOLIDUS +FF1A..FF1B ; Po # [2] FULLWIDTH COLON..FULLWIDTH SEMICOLON +FF1F..FF20 ; Po # [2] FULLWIDTH QUESTION MARK..FULLWIDTH COMMERCIAL AT +FF3C ; Po # FULLWIDTH REVERSE SOLIDUS +FF61 ; Po # HALFWIDTH IDEOGRAPHIC FULL STOP +FF64 ; Po # HALFWIDTH IDEOGRAPHIC COMMA + +# Total code points: 195 + +# ================================================ + +002B ; Sm # PLUS SIGN +003C..003E ; Sm # [3] LESS-THAN SIGN..GREATER-THAN SIGN +007C ; Sm # VERTICAL LINE +007E ; Sm # TILDE +00AC ; Sm # NOT SIGN +00B1 ; Sm # PLUS-MINUS SIGN +00D7 ; Sm # MULTIPLICATION SIGN +00F7 ; Sm # DIVISION SIGN +03F6 ; Sm # GREEK REVERSED LUNATE EPSILON SYMBOL +2044 ; Sm # FRACTION SLASH +2052 ; Sm # COMMERCIAL MINUS SIGN +207A..207C ; Sm # [3] SUPERSCRIPT PLUS SIGN..SUPERSCRIPT EQUALS SIGN +208A..208C ; Sm # [3] SUBSCRIPT PLUS SIGN..SUBSCRIPT EQUALS SIGN +2140..2144 ; Sm # [5] DOUBLE-STRUCK N-ARY SUMMATION..TURNED SANS-SERIF CAPITAL Y +214B ; Sm # TURNED AMPERSAND +2190..2194 ; Sm # [5] LEFTWARDS ARROW..LEFT RIGHT ARROW +219A..219B ; Sm # [2] LEFTWARDS ARROW WITH STROKE..RIGHTWARDS ARROW WITH STROKE +21A0 ; Sm # RIGHTWARDS TWO HEADED ARROW +21A3 ; Sm # RIGHTWARDS ARROW WITH TAIL +21A6 ; Sm # RIGHTWARDS ARROW FROM BAR +21AE ; Sm # LEFT RIGHT ARROW WITH STROKE +21CE..21CF ; Sm # [2] LEFT RIGHT DOUBLE ARROW WITH STROKE..RIGHTWARDS DOUBLE ARROW WITH STROKE +21D2 ; Sm # RIGHTWARDS DOUBLE ARROW +21D4 ; Sm # LEFT RIGHT DOUBLE ARROW +21F4..22FF ; Sm # [268] RIGHT ARROW WITH SMALL CIRCLE..Z NOTATION BAG MEMBERSHIP +2308..230B ; Sm # [4] LEFT CEILING..RIGHT FLOOR +2320..2321 ; Sm # [2] TOP HALF INTEGRAL..BOTTOM HALF INTEGRAL +237C ; Sm # RIGHT ANGLE WITH DOWNWARDS ZIGZAG ARROW +239B..23B3 ; Sm # [25] LEFT PARENTHESIS UPPER HOOK..SUMMATION BOTTOM +25B7 ; Sm # WHITE RIGHT-POINTING TRIANGLE +25C1 ; Sm # WHITE LEFT-POINTING TRIANGLE +25F8..25FF ; Sm # [8] UPPER LEFT TRIANGLE..LOWER RIGHT TRIANGLE +266F ; Sm # MUSIC SHARP SIGN +27D0..27E5 ; Sm # [22] WHITE DIAMOND WITH CENTRED DOT..WHITE SQUARE WITH RIGHTWARDS TICK +27F0..27FF ; Sm # [16] UPWARDS QUADRUPLE ARROW..LONG RIGHTWARDS SQUIGGLE ARROW +2900..2982 ; Sm # [131] RIGHTWARDS TWO-HEADED ARROW WITH VERTICAL STROKE..Z NOTATION TYPE COLON +2999..29D7 ; Sm # [63] DOTTED FENCE..BLACK HOURGLASS +29DC..29FB ; Sm # [32] INCOMPLETE INFINITY..TRIPLE PLUS +29FE..2AFF ; Sm # [258] TINY..N-ARY WHITE VERTICAL BAR +FB29 ; Sm # HEBREW LETTER ALTERNATIVE PLUS SIGN +FE62 ; Sm # SMALL PLUS SIGN +FE64..FE66 ; Sm # [3] SMALL LESS-THAN SIGN..SMALL EQUALS SIGN +FF0B ; Sm # FULLWIDTH PLUS SIGN +FF1C..FF1E ; Sm # [3] FULLWIDTH LESS-THAN SIGN..FULLWIDTH GREATER-THAN SIGN +FF5C ; Sm # FULLWIDTH VERTICAL LINE +FF5E ; Sm # FULLWIDTH TILDE +FFE2 ; Sm # FULLWIDTH NOT SIGN +FFE9..FFEC ; Sm # [4] HALFWIDTH LEFTWARDS ARROW..HALFWIDTH DOWNWARDS ARROW +1D6C1 ; Sm # MATHEMATICAL BOLD NABLA +1D6DB ; Sm # MATHEMATICAL BOLD PARTIAL DIFFERENTIAL +1D6FB ; Sm # MATHEMATICAL ITALIC NABLA +1D715 ; Sm # MATHEMATICAL ITALIC PARTIAL DIFFERENTIAL +1D735 ; Sm # MATHEMATICAL BOLD ITALIC NABLA +1D74F ; Sm # MATHEMATICAL BOLD ITALIC PARTIAL DIFFERENTIAL +1D76F ; Sm # MATHEMATICAL SANS-SERIF BOLD NABLA +1D789 ; Sm # MATHEMATICAL SANS-SERIF BOLD PARTIAL DIFFERENTIAL +1D7A9 ; Sm # MATHEMATICAL SANS-SERIF BOLD ITALIC NABLA +1D7C3 ; Sm # MATHEMATICAL SANS-SERIF BOLD ITALIC PARTIAL DIFFERENTIAL + +# Total code points: 899 + +# ================================================ + +0024 ; Sc # DOLLAR SIGN +00A2..00A5 ; Sc # [4] CENT SIGN..YEN SIGN +09F2..09F3 ; Sc # [2] BENGALI RUPEE MARK..BENGALI RUPEE SIGN +0E3F ; Sc # THAI CURRENCY SYMBOL BAHT +17DB ; Sc # KHMER CURRENCY SYMBOL RIEL +20A0..20B1 ; Sc # [18] EURO-CURRENCY SIGN..PESO SIGN +FDFC ; Sc # RIAL SIGN +FE69 ; Sc # SMALL DOLLAR SIGN +FF04 ; Sc # FULLWIDTH DOLLAR SIGN +FFE0..FFE1 ; Sc # [2] FULLWIDTH CENT SIGN..FULLWIDTH POUND SIGN +FFE5..FFE6 ; Sc # [2] FULLWIDTH YEN SIGN..FULLWIDTH WON SIGN + +# Total code points: 34 + +# ================================================ + +005E ; Sk # CIRCUMFLEX ACCENT +0060 ; Sk # GRAVE ACCENT +00A8 ; Sk # DIAERESIS +00AF ; Sk # MACRON +00B4 ; Sk # ACUTE ACCENT +00B8 ; Sk # CEDILLA +02B9..02BA ; Sk # [2] MODIFIER LETTER PRIME..MODIFIER LETTER DOUBLE PRIME +02C2..02CF ; Sk # [14] MODIFIER LETTER LEFT ARROWHEAD..MODIFIER LETTER LOW ACUTE ACCENT +02D2..02DF ; Sk # [14] MODIFIER LETTER CENTRED RIGHT HALF RING..MODIFIER LETTER CROSS ACCENT +02E5..02ED ; Sk # [9] MODIFIER LETTER EXTRA-HIGH TONE BAR..MODIFIER LETTER UNASPIRATED +0374..0375 ; Sk # [2] GREEK NUMERAL SIGN..GREEK LOWER NUMERAL SIGN +0384..0385 ; Sk # [2] GREEK TONOS..GREEK DIALYTIKA TONOS +1FBD ; Sk # GREEK KORONIS +1FBF..1FC1 ; Sk # [3] GREEK PSILI..GREEK DIALYTIKA AND PERISPOMENI +1FCD..1FCF ; Sk # [3] GREEK PSILI AND VARIA..GREEK PSILI AND PERISPOMENI +1FDD..1FDF ; Sk # [3] GREEK DASIA AND VARIA..GREEK DASIA AND PERISPOMENI +1FED..1FEF ; Sk # [3] GREEK DIALYTIKA AND VARIA..GREEK VARIA +1FFD..1FFE ; Sk # [2] GREEK OXIA..GREEK DASIA +309B..309C ; Sk # [2] KATAKANA-HIRAGANA VOICED SOUND MARK..KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK +FF3E ; Sk # FULLWIDTH CIRCUMFLEX ACCENT +FF40 ; Sk # FULLWIDTH GRAVE ACCENT +FFE3 ; Sk # FULLWIDTH MACRON + +# Total code points: 69 + +# ================================================ + +00A6..00A7 ; So # [2] BROKEN BAR..SECTION SIGN +00A9 ; So # COPYRIGHT SIGN +00AE ; So # REGISTERED SIGN +00B0 ; So # DEGREE SIGN +00B6 ; So # PILCROW SIGN +0482 ; So # CYRILLIC THOUSANDS SIGN +06E9 ; So # ARABIC PLACE OF SAJDAH +06FD..06FE ; So # [2] ARABIC SIGN SINDHI AMPERSAND..ARABIC SIGN SINDHI POSTPOSITION MEN +09FA ; So # BENGALI ISSHAR +0B70 ; So # ORIYA ISSHAR +0F01..0F03 ; So # [3] TIBETAN MARK GTER YIG MGO TRUNCATED A..TIBETAN MARK GTER YIG MGO -UM GTER TSHEG MA +0F13..0F17 ; So # [5] TIBETAN MARK CARET -DZUD RTAGS ME LONG CAN..TIBETAN ASTROLOGICAL SIGN SGRA GCAN -CHAR RTAGS +0F1A..0F1F ; So # [6] TIBETAN SIGN RDEL DKAR GCIG..TIBETAN SIGN RDEL DKAR RDEL NAG +0F34 ; So # TIBETAN MARK BSDUS RTAGS +0F36 ; So # TIBETAN MARK CARET -DZUD RTAGS BZHI MIG CAN +0F38 ; So # TIBETAN MARK CHE MGO +0FBE..0FC5 ; So # [8] TIBETAN KU RU KHA..TIBETAN SYMBOL RDO RJE +0FC7..0FCC ; So # [6] TIBETAN SYMBOL RDO RJE RGYA GRAM..TIBETAN SYMBOL NOR BU BZHI -KHYIL +0FCF ; So # TIBETAN SIGN RDEL NAG GSUM +2100..2101 ; So # [2] ACCOUNT OF..ADDRESSED TO THE SUBJECT +2103..2106 ; So # [4] DEGREE CELSIUS..CADA UNA +2108..2109 ; So # [2] SCRUPLE..DEGREE FAHRENHEIT +2114 ; So # L B BAR SYMBOL +2116..2118 ; So # [3] NUMERO SIGN..SCRIPT CAPITAL P +211E..2123 ; So # [6] PRESCRIPTION TAKE..VERSICLE +2125 ; So # OUNCE SIGN +2127 ; So # INVERTED OHM SIGN +2129 ; So # TURNED GREEK SMALL LETTER IOTA +212E ; So # ESTIMATED SYMBOL +2132 ; So # TURNED CAPITAL F +213A ; So # ROTATED CAPITAL Q +214A ; So # PROPERTY LINE +2195..2199 ; So # [5] UP DOWN ARROW..SOUTH WEST ARROW +219C..219F ; So # [4] LEFTWARDS WAVE ARROW..UPWARDS TWO HEADED ARROW +21A1..21A2 ; So # [2] DOWNWARDS TWO HEADED ARROW..LEFTWARDS ARROW WITH TAIL +21A4..21A5 ; So # [2] LEFTWARDS ARROW FROM BAR..UPWARDS ARROW FROM BAR +21A7..21AD ; So # [7] DOWNWARDS ARROW FROM BAR..LEFT RIGHT WAVE ARROW +21AF..21CD ; So # [31] DOWNWARDS ZIGZAG ARROW..LEFTWARDS DOUBLE ARROW WITH STROKE +21D0..21D1 ; So # [2] LEFTWARDS DOUBLE ARROW..UPWARDS DOUBLE ARROW +21D3 ; So # DOWNWARDS DOUBLE ARROW +21D5..21F3 ; So # [31] UP DOWN DOUBLE ARROW..UP DOWN WHITE ARROW +2300..2307 ; So # [8] DIAMETER SIGN..WAVY LINE +230C..231F ; So # [20] BOTTOM RIGHT CROP..BOTTOM RIGHT CORNER +2322..2328 ; So # [7] FROWN..KEYBOARD +232B..237B ; So # [81] ERASE TO THE LEFT..NOT CHECK MARK +237D..239A ; So # [30] SHOULDERED OPEN BOX..CLEAR SCREEN SYMBOL +23B7..23CE ; So # [24] RADICAL SYMBOL BOTTOM..RETURN SYMBOL +2400..2426 ; So # [39] SYMBOL FOR NULL..SYMBOL FOR SUBSTITUTE FORM TWO +2440..244A ; So # [11] OCR HOOK..OCR DOUBLE BACKSLASH +249C..24E9 ; So # [78] PARENTHESIZED LATIN SMALL LETTER A..CIRCLED LATIN SMALL LETTER Z +2500..25B6 ; So # [183] BOX DRAWINGS LIGHT HORIZONTAL..BLACK RIGHT-POINTING TRIANGLE +25B8..25C0 ; So # [9] BLACK RIGHT-POINTING SMALL TRIANGLE..BLACK LEFT-POINTING TRIANGLE +25C2..25F7 ; So # [54] BLACK LEFT-POINTING SMALL TRIANGLE..WHITE CIRCLE WITH UPPER RIGHT QUADRANT +2600..2613 ; So # [20] BLACK SUN WITH RAYS..SALTIRE +2616..2617 ; So # [2] WHITE SHOGI PIECE..BLACK SHOGI PIECE +2619..266E ; So # [86] REVERSED ROTATED FLORAL HEART BULLET..MUSIC NATURAL SIGN +2670..267D ; So # [14] WEST SYRIAC CROSS..PARTIALLY-RECYCLED PAPER SYMBOL +2680..2689 ; So # [10] DIE FACE-1..BLACK CIRCLE WITH TWO WHITE DOTS +2701..2704 ; So # [4] UPPER BLADE SCISSORS..WHITE SCISSORS +2706..2709 ; So # [4] TELEPHONE LOCATION SIGN..ENVELOPE +270C..2727 ; So # [28] VICTORY HAND..WHITE FOUR POINTED STAR +2729..274B ; So # [35] STRESS OUTLINED WHITE STAR..HEAVY EIGHT TEARDROP-SPOKED PROPELLER ASTERISK +274D ; So # SHADOWED WHITE CIRCLE +274F..2752 ; So # [4] LOWER RIGHT DROP-SHADOWED WHITE SQUARE..UPPER RIGHT SHADOWED WHITE SQUARE +2756 ; So # BLACK DIAMOND MINUS WHITE X +2758..275E ; So # [7] LIGHT VERTICAL BAR..HEAVY DOUBLE COMMA QUOTATION MARK ORNAMENT +2761..2767 ; So # [7] CURVED STEM PARAGRAPH SIGN ORNAMENT..ROTATED FLORAL HEART BULLET +2794 ; So # HEAVY WIDE-HEADED RIGHTWARDS ARROW +2798..27AF ; So # [24] HEAVY SOUTH EAST ARROW..NOTCHED LOWER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW +27B1..27BE ; So # [14] NOTCHED UPPER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW..OPEN-OUTLINED RIGHTWARDS ARROW +2800..28FF ; So # [256] BRAILLE PATTERN BLANK..BRAILLE PATTERN DOTS-12345678 +2E80..2E99 ; So # [26] CJK RADICAL REPEAT..CJK RADICAL RAP +2E9B..2EF3 ; So # [89] CJK RADICAL CHOKE..CJK RADICAL C-SIMPLIFIED TURTLE +2F00..2FD5 ; So # [214] KANGXI RADICAL ONE..KANGXI RADICAL FLUTE +2FF0..2FFB ; So # [12] IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT..IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID +3004 ; So # JAPANESE INDUSTRIAL STANDARD SYMBOL +3012..3013 ; So # [2] POSTAL MARK..GETA MARK +3020 ; So # POSTAL MARK FACE +3036..3037 ; So # [2] CIRCLED POSTAL MARK..IDEOGRAPHIC TELEGRAPH LINE FEED SEPARATOR SYMBOL +303E..303F ; So # [2] IDEOGRAPHIC VARIATION INDICATOR..IDEOGRAPHIC HALF FILL SPACE +3190..3191 ; So # [2] IDEOGRAPHIC ANNOTATION LINKING MARK..IDEOGRAPHIC ANNOTATION REVERSE MARK +3196..319F ; So # [10] IDEOGRAPHIC ANNOTATION TOP MARK..IDEOGRAPHIC ANNOTATION MAN MARK +3200..321C ; So # [29] PARENTHESIZED HANGUL KIYEOK..PARENTHESIZED HANGUL CIEUC U +322A..3243 ; So # [26] PARENTHESIZED IDEOGRAPH MOON..PARENTHESIZED IDEOGRAPH REACH +3260..327B ; So # [28] CIRCLED HANGUL KIYEOK..CIRCLED HANGUL HIEUH A +327F ; So # KOREAN STANDARD SYMBOL +328A..32B0 ; So # [39] CIRCLED IDEOGRAPH MOON..CIRCLED IDEOGRAPH NIGHT +32C0..32CB ; So # [12] IDEOGRAPHIC TELEGRAPH SYMBOL FOR JANUARY..IDEOGRAPHIC TELEGRAPH SYMBOL FOR DECEMBER +32D0..32FE ; So # [47] CIRCLED KATAKANA A..CIRCLED KATAKANA WO +3300..3376 ; So # [119] SQUARE APAATO..SQUARE PC +337B..33DD ; So # [99] SQUARE ERA NAME HEISEI..SQUARE WB +33E0..33FE ; So # [31] IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY ONE..IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY THIRTY-ONE +A490..A4C6 ; So # [55] YI RADICAL QOT..YI RADICAL KE +FFE4 ; So # FULLWIDTH BROKEN BAR +FFE8 ; So # HALFWIDTH FORMS LIGHT VERTICAL +FFED..FFEE ; So # [2] HALFWIDTH BLACK SQUARE..HALFWIDTH WHITE CIRCLE +FFFC..FFFD ; So # [2] OBJECT REPLACEMENT CHARACTER..REPLACEMENT CHARACTER +1D000..1D0F5 ; So # [246] BYZANTINE MUSICAL SYMBOL PSILI..BYZANTINE MUSICAL SYMBOL GORGON NEO KATO +1D100..1D126 ; So # [39] MUSICAL SYMBOL SINGLE BARLINE..MUSICAL SYMBOL DRUM CLEF-2 +1D12A..1D164 ; So # [59] MUSICAL SYMBOL DOUBLE SHARP..MUSICAL SYMBOL ONE HUNDRED TWENTY-EIGHTH NOTE +1D16A..1D16C ; So # [3] MUSICAL SYMBOL FINGERED TREMOLO-1..MUSICAL SYMBOL FINGERED TREMOLO-3 +1D183..1D184 ; So # [2] MUSICAL SYMBOL ARPEGGIATO UP..MUSICAL SYMBOL ARPEGGIATO DOWN +1D18C..1D1A9 ; So # [30] MUSICAL SYMBOL RINFORZANDO..MUSICAL SYMBOL DEGREE SLASH +1D1AE..1D1DD ; So # [48] MUSICAL SYMBOL PEDAL MARK..MUSICAL SYMBOL PES SUBPUNCTIS + +# Total code points: 2496 + +# ================================================ + +00AB ; Pi # LEFT-POINTING DOUBLE ANGLE QUOTATION MARK +2018 ; Pi # LEFT SINGLE QUOTATION MARK +201B..201C ; Pi # [2] SINGLE HIGH-REVERSED-9 QUOTATION MARK..LEFT DOUBLE QUOTATION MARK +201F ; Pi # DOUBLE HIGH-REVERSED-9 QUOTATION MARK +2039 ; Pi # SINGLE LEFT-POINTING ANGLE QUOTATION MARK + +# Total code points: 6 + +# ================================================ + +00BB ; Pf # RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK +2019 ; Pf # RIGHT SINGLE QUOTATION MARK +201D ; Pf # RIGHT DOUBLE QUOTATION MARK +203A ; Pf # SINGLE RIGHT-POINTING ANGLE QUOTATION MARK + +# Total code points: 4 + diff --git a/crates/stdlib/unicode/ucd32/DerivedNumericType-3.2.0.txt b/crates/stdlib/unicode/ucd32/DerivedNumericType-3.2.0.txt new file mode 100644 index 000000000..5f6a34c06 --- /dev/null +++ b/crates/stdlib/unicode/ucd32/DerivedNumericType-3.2.0.txt @@ -0,0 +1,88 @@ +# DerivedNumericType-3.2.0.txt +# +# Unicode Character Database: Derived Property Data +# Generated algorithmically from the Unicode Character Database +# For documentation, see DerivedProperties.html +# Date: 2001-12-09 00:40:57.6 GMT [MD] +# Note: Unassigned and Noncharacter codepoints are omitted, +# except when listing Noncharacter or Cn. +# ================================================ + + +# ================================================ +# Numeric Type (from UnicodeData.txt, field 6/7/8: see UnicodeData.html) +# ================================================ + +00BC..00BE ; numeric # No [3] VULGAR FRACTION ONE QUARTER..VULGAR FRACTION THREE QUARTERS +09F4..09F7 ; numeric # No [4] BENGALI CURRENCY NUMERATOR ONE..BENGALI CURRENCY NUMERATOR FOUR +09F9 ; numeric # No BENGALI CURRENCY DENOMINATOR SIXTEEN +0BF0..0BF2 ; numeric # No [3] TAMIL NUMBER TEN..TAMIL NUMBER ONE THOUSAND +0F2A..0F33 ; numeric # No [10] TIBETAN DIGIT HALF ONE..TIBETAN DIGIT HALF ZERO +1372..137C ; numeric # No [11] ETHIOPIC NUMBER TEN..ETHIOPIC NUMBER TEN THOUSAND +16EE..16F0 ; numeric # Nl [3] RUNIC ARLAUG SYMBOL..RUNIC BELGTHOR SYMBOL +2153..215F ; numeric # No [13] VULGAR FRACTION ONE THIRD..FRACTION NUMERATOR ONE +2160..2182 ; numeric # Nl [35] ROMAN NUMERAL ONE..ROMAN NUMERAL TEN THOUSAND +2469..2473 ; numeric # No [11] CIRCLED NUMBER TEN..CIRCLED NUMBER TWENTY +247D..2487 ; numeric # No [11] PARENTHESIZED NUMBER TEN..PARENTHESIZED NUMBER TWENTY +2491..249B ; numeric # No [11] NUMBER TEN FULL STOP..NUMBER TWENTY FULL STOP +24EB..24F4 ; numeric # No [10] NEGATIVE CIRCLED NUMBER ELEVEN..NEGATIVE CIRCLED NUMBER TWENTY +24FE ; numeric # No DOUBLE CIRCLED NUMBER TEN +277F ; numeric # No DINGBAT NEGATIVE CIRCLED NUMBER TEN +2789 ; numeric # No DINGBAT CIRCLED SANS-SERIF NUMBER TEN +2793 ; numeric # No DINGBAT NEGATIVE CIRCLED SANS-SERIF NUMBER TEN +3007 ; numeric # Nl IDEOGRAPHIC NUMBER ZERO +3021..3029 ; numeric # Nl [9] HANGZHOU NUMERAL ONE..HANGZHOU NUMERAL NINE +3038..303A ; numeric # Nl [3] HANGZHOU NUMERAL TEN..HANGZHOU NUMERAL THIRTY +3192..3195 ; numeric # No [4] IDEOGRAPHIC ANNOTATION ONE MARK..IDEOGRAPHIC ANNOTATION FOUR MARK +3220..3229 ; numeric # No [10] PARENTHESIZED IDEOGRAPH ONE..PARENTHESIZED IDEOGRAPH TEN +3251..325F ; numeric # No [15] CIRCLED NUMBER TWENTY ONE..CIRCLED NUMBER THIRTY FIVE +3280..3289 ; numeric # No [10] CIRCLED IDEOGRAPH ONE..CIRCLED IDEOGRAPH TEN +32B1..32BF ; numeric # No [15] CIRCLED NUMBER THIRTY SIX..CIRCLED NUMBER FIFTY +10320..10323 ; numeric # No [4] OLD ITALIC NUMERAL ONE..OLD ITALIC NUMERAL FIFTY + +# Total code points: 201 + +# ================================================ + +2460..2468 ; digit # No [9] CIRCLED DIGIT ONE..CIRCLED DIGIT NINE +2474..247C ; digit # No [9] PARENTHESIZED DIGIT ONE..PARENTHESIZED DIGIT NINE +2488..2490 ; digit # No [9] DIGIT ONE FULL STOP..DIGIT NINE FULL STOP +24EA ; digit # No CIRCLED DIGIT ZERO +24F5..24FD ; digit # No [9] DOUBLE CIRCLED DIGIT ONE..DOUBLE CIRCLED DIGIT NINE +2776..277E ; digit # No [9] DINGBAT NEGATIVE CIRCLED DIGIT ONE..DINGBAT NEGATIVE CIRCLED DIGIT NINE +2780..2788 ; digit # No [9] DINGBAT CIRCLED SANS-SERIF DIGIT ONE..DINGBAT CIRCLED SANS-SERIF DIGIT NINE +278A..2792 ; digit # No [9] DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT ONE..DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT NINE + +# Total code points: 64 + +# ================================================ + +0030..0039 ; decimal # Nd [10] DIGIT ZERO..DIGIT NINE +00B2..00B3 ; decimal # No [2] SUPERSCRIPT TWO..SUPERSCRIPT THREE +00B9 ; decimal # No SUPERSCRIPT ONE +0660..0669 ; decimal # Nd [10] ARABIC-INDIC DIGIT ZERO..ARABIC-INDIC DIGIT NINE +06F0..06F9 ; decimal # Nd [10] EXTENDED ARABIC-INDIC DIGIT ZERO..EXTENDED ARABIC-INDIC DIGIT NINE +0966..096F ; decimal # Nd [10] DEVANAGARI DIGIT ZERO..DEVANAGARI DIGIT NINE +09E6..09EF ; decimal # Nd [10] BENGALI DIGIT ZERO..BENGALI DIGIT NINE +0A66..0A6F ; decimal # Nd [10] GURMUKHI DIGIT ZERO..GURMUKHI DIGIT NINE +0AE6..0AEF ; decimal # Nd [10] GUJARATI DIGIT ZERO..GUJARATI DIGIT NINE +0B66..0B6F ; decimal # Nd [10] ORIYA DIGIT ZERO..ORIYA DIGIT NINE +0BE7..0BEF ; decimal # Nd [9] TAMIL DIGIT ONE..TAMIL DIGIT NINE +0C66..0C6F ; decimal # Nd [10] TELUGU DIGIT ZERO..TELUGU DIGIT NINE +0CE6..0CEF ; decimal # Nd [10] KANNADA DIGIT ZERO..KANNADA DIGIT NINE +0D66..0D6F ; decimal # Nd [10] MALAYALAM DIGIT ZERO..MALAYALAM DIGIT NINE +0E50..0E59 ; decimal # Nd [10] THAI DIGIT ZERO..THAI DIGIT NINE +0ED0..0ED9 ; decimal # Nd [10] LAO DIGIT ZERO..LAO DIGIT NINE +0F20..0F29 ; decimal # Nd [10] TIBETAN DIGIT ZERO..TIBETAN DIGIT NINE +1040..1049 ; decimal # Nd [10] MYANMAR DIGIT ZERO..MYANMAR DIGIT NINE +1369..1371 ; decimal # Nd [9] ETHIOPIC DIGIT ONE..ETHIOPIC DIGIT NINE +17E0..17E9 ; decimal # Nd [10] KHMER DIGIT ZERO..KHMER DIGIT NINE +1810..1819 ; decimal # Nd [10] MONGOLIAN DIGIT ZERO..MONGOLIAN DIGIT NINE +2070 ; decimal # No SUPERSCRIPT ZERO +2074..2079 ; decimal # No [6] SUPERSCRIPT FOUR..SUPERSCRIPT NINE +2080..2089 ; decimal # No [10] SUBSCRIPT ZERO..SUBSCRIPT NINE +FF10..FF19 ; decimal # Nd [10] FULLWIDTH DIGIT ZERO..FULLWIDTH DIGIT NINE +1D7CE..1D7FF ; decimal # Nd [50] MATHEMATICAL BOLD DIGIT ZERO..MATHEMATICAL MONOSPACE DIGIT NINE + +# Total code points: 268 + diff --git a/crates/stdlib/unicode/ucd32/DerivedNumericValues-3.2.0.txt b/crates/stdlib/unicode/ucd32/DerivedNumericValues-3.2.0.txt new file mode 100644 index 000000000..c02ac5e16 --- /dev/null +++ b/crates/stdlib/unicode/ucd32/DerivedNumericValues-3.2.0.txt @@ -0,0 +1,883 @@ +# DerivedNumericValues-3.2.0.txt +# +# Unicode Character Database: Derived Property Data +# Generated algorithmically from the Unicode Character Database +# For documentation, see DerivedProperties.html +# Date: 2001-12-09 00:41:00.7 GMT [MD] +# Note: Unassigned and Noncharacter codepoints are omitted, +# except when listing Noncharacter or Cn. +# ================================================ + + +# ================================================ +# Numeric Values (from UnicodeData.txt, field 6/7/8) +# ================================================ + +0F33 ; -0.5; numeric # No TIBETAN DIGIT HALF ZERO + +# Total code points: 1 + + +0030 ; 0.0; decimal # Nd DIGIT ZERO +0660 ; 0.0; decimal # Nd ARABIC-INDIC DIGIT ZERO +06F0 ; 0.0; decimal # Nd EXTENDED ARABIC-INDIC DIGIT ZERO +0966 ; 0.0; decimal # Nd DEVANAGARI DIGIT ZERO +09E6 ; 0.0; decimal # Nd BENGALI DIGIT ZERO +0A66 ; 0.0; decimal # Nd GURMUKHI DIGIT ZERO +0AE6 ; 0.0; decimal # Nd GUJARATI DIGIT ZERO +0B66 ; 0.0; decimal # Nd ORIYA DIGIT ZERO +0C66 ; 0.0; decimal # Nd TELUGU DIGIT ZERO +0CE6 ; 0.0; decimal # Nd KANNADA DIGIT ZERO +0D66 ; 0.0; decimal # Nd MALAYALAM DIGIT ZERO +0E50 ; 0.0; decimal # Nd THAI DIGIT ZERO +0ED0 ; 0.0; decimal # Nd LAO DIGIT ZERO +0F20 ; 0.0; decimal # Nd TIBETAN DIGIT ZERO +1040 ; 0.0; decimal # Nd MYANMAR DIGIT ZERO +17E0 ; 0.0; decimal # Nd KHMER DIGIT ZERO +1810 ; 0.0; decimal # Nd MONGOLIAN DIGIT ZERO +2070 ; 0.0; decimal # No SUPERSCRIPT ZERO +2080 ; 0.0; decimal # No SUBSCRIPT ZERO +24EA ; 0.0; digit # No CIRCLED DIGIT ZERO +3007 ; 0.0; numeric # Nl IDEOGRAPHIC NUMBER ZERO +FF10 ; 0.0; decimal # Nd FULLWIDTH DIGIT ZERO +1D7CE ; 0.0; decimal # Nd MATHEMATICAL BOLD DIGIT ZERO +1D7D8 ; 0.0; decimal # Nd MATHEMATICAL DOUBLE-STRUCK DIGIT ZERO +1D7E2 ; 0.0; decimal # Nd MATHEMATICAL SANS-SERIF DIGIT ZERO +1D7EC ; 0.0; decimal # Nd MATHEMATICAL SANS-SERIF BOLD DIGIT ZERO +1D7F6 ; 0.0; decimal # Nd MATHEMATICAL MONOSPACE DIGIT ZERO + +# Total code points: 27 + + +215B ; 0.125; numeric # No VULGAR FRACTION ONE EIGHTH + +# Total code points: 1 + + +2159 ; 0.16666667; numeric # No VULGAR FRACTION ONE SIXTH + +# Total code points: 1 + + +2155 ; 0.2; numeric # No VULGAR FRACTION ONE FIFTH + +# Total code points: 1 + + +00BC ; 0.25; numeric # No VULGAR FRACTION ONE QUARTER + +# Total code points: 1 + + +2153 ; 0.33333334; numeric # No VULGAR FRACTION ONE THIRD + +# Total code points: 1 + + +215C ; 0.375; numeric # No VULGAR FRACTION THREE EIGHTHS + +# Total code points: 1 + + +2156 ; 0.4; numeric # No VULGAR FRACTION TWO FIFTHS + +# Total code points: 1 + + +00BD ; 0.5; numeric # No VULGAR FRACTION ONE HALF +0F2A ; 0.5; numeric # No TIBETAN DIGIT HALF ONE + +# Total code points: 2 + + +2157 ; 0.6; numeric # No VULGAR FRACTION THREE FIFTHS + +# Total code points: 1 + + +215D ; 0.625; numeric # No VULGAR FRACTION FIVE EIGHTHS + +# Total code points: 1 + + +2154 ; 0.6666667; numeric # No VULGAR FRACTION TWO THIRDS + +# Total code points: 1 + + +00BE ; 0.75; numeric # No VULGAR FRACTION THREE QUARTERS + +# Total code points: 1 + + +2158 ; 0.8; numeric # No VULGAR FRACTION FOUR FIFTHS + +# Total code points: 1 + + +215A ; 0.8333333; numeric # No VULGAR FRACTION FIVE SIXTHS + +# Total code points: 1 + + +215E ; 0.875; numeric # No VULGAR FRACTION SEVEN EIGHTHS + +# Total code points: 1 + + +0031 ; 1.0; decimal # Nd DIGIT ONE +00B9 ; 1.0; decimal # No SUPERSCRIPT ONE +0661 ; 1.0; decimal # Nd ARABIC-INDIC DIGIT ONE +06F1 ; 1.0; decimal # Nd EXTENDED ARABIC-INDIC DIGIT ONE +0967 ; 1.0; decimal # Nd DEVANAGARI DIGIT ONE +09E7 ; 1.0; decimal # Nd BENGALI DIGIT ONE +09F4 ; 1.0; numeric # No BENGALI CURRENCY NUMERATOR ONE +0A67 ; 1.0; decimal # Nd GURMUKHI DIGIT ONE +0AE7 ; 1.0; decimal # Nd GUJARATI DIGIT ONE +0B67 ; 1.0; decimal # Nd ORIYA DIGIT ONE +0BE7 ; 1.0; decimal # Nd TAMIL DIGIT ONE +0C67 ; 1.0; decimal # Nd TELUGU DIGIT ONE +0CE7 ; 1.0; decimal # Nd KANNADA DIGIT ONE +0D67 ; 1.0; decimal # Nd MALAYALAM DIGIT ONE +0E51 ; 1.0; decimal # Nd THAI DIGIT ONE +0ED1 ; 1.0; decimal # Nd LAO DIGIT ONE +0F21 ; 1.0; decimal # Nd TIBETAN DIGIT ONE +1041 ; 1.0; decimal # Nd MYANMAR DIGIT ONE +1369 ; 1.0; decimal # Nd ETHIOPIC DIGIT ONE +17E1 ; 1.0; decimal # Nd KHMER DIGIT ONE +1811 ; 1.0; decimal # Nd MONGOLIAN DIGIT ONE +2081 ; 1.0; decimal # No SUBSCRIPT ONE +215F ; 1.0; numeric # No FRACTION NUMERATOR ONE +2160 ; 1.0; numeric # Nl ROMAN NUMERAL ONE +2170 ; 1.0; numeric # Nl SMALL ROMAN NUMERAL ONE +2460 ; 1.0; digit # No CIRCLED DIGIT ONE +2474 ; 1.0; digit # No PARENTHESIZED DIGIT ONE +2488 ; 1.0; digit # No DIGIT ONE FULL STOP +24F5 ; 1.0; digit # No DOUBLE CIRCLED DIGIT ONE +2776 ; 1.0; digit # No DINGBAT NEGATIVE CIRCLED DIGIT ONE +2780 ; 1.0; digit # No DINGBAT CIRCLED SANS-SERIF DIGIT ONE +278A ; 1.0; digit # No DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT ONE +3021 ; 1.0; numeric # Nl HANGZHOU NUMERAL ONE +3192 ; 1.0; numeric # No IDEOGRAPHIC ANNOTATION ONE MARK +3220 ; 1.0; numeric # No PARENTHESIZED IDEOGRAPH ONE +3280 ; 1.0; numeric # No CIRCLED IDEOGRAPH ONE +FF11 ; 1.0; decimal # Nd FULLWIDTH DIGIT ONE +10320 ; 1.0; numeric # No OLD ITALIC NUMERAL ONE +1D7CF ; 1.0; decimal # Nd MATHEMATICAL BOLD DIGIT ONE +1D7D9 ; 1.0; decimal # Nd MATHEMATICAL DOUBLE-STRUCK DIGIT ONE +1D7E3 ; 1.0; decimal # Nd MATHEMATICAL SANS-SERIF DIGIT ONE +1D7ED ; 1.0; decimal # Nd MATHEMATICAL SANS-SERIF BOLD DIGIT ONE +1D7F7 ; 1.0; decimal # Nd MATHEMATICAL MONOSPACE DIGIT ONE + +# Total code points: 43 + + +0F2B ; 1.5; numeric # No TIBETAN DIGIT HALF TWO + +# Total code points: 1 + + +0032 ; 2.0; decimal # Nd DIGIT TWO +00B2 ; 2.0; decimal # No SUPERSCRIPT TWO +0662 ; 2.0; decimal # Nd ARABIC-INDIC DIGIT TWO +06F2 ; 2.0; decimal # Nd EXTENDED ARABIC-INDIC DIGIT TWO +0968 ; 2.0; decimal # Nd DEVANAGARI DIGIT TWO +09E8 ; 2.0; decimal # Nd BENGALI DIGIT TWO +09F5 ; 2.0; numeric # No BENGALI CURRENCY NUMERATOR TWO +0A68 ; 2.0; decimal # Nd GURMUKHI DIGIT TWO +0AE8 ; 2.0; decimal # Nd GUJARATI DIGIT TWO +0B68 ; 2.0; decimal # Nd ORIYA DIGIT TWO +0BE8 ; 2.0; decimal # Nd TAMIL DIGIT TWO +0C68 ; 2.0; decimal # Nd TELUGU DIGIT TWO +0CE8 ; 2.0; decimal # Nd KANNADA DIGIT TWO +0D68 ; 2.0; decimal # Nd MALAYALAM DIGIT TWO +0E52 ; 2.0; decimal # Nd THAI DIGIT TWO +0ED2 ; 2.0; decimal # Nd LAO DIGIT TWO +0F22 ; 2.0; decimal # Nd TIBETAN DIGIT TWO +1042 ; 2.0; decimal # Nd MYANMAR DIGIT TWO +136A ; 2.0; decimal # Nd ETHIOPIC DIGIT TWO +17E2 ; 2.0; decimal # Nd KHMER DIGIT TWO +1812 ; 2.0; decimal # Nd MONGOLIAN DIGIT TWO +2082 ; 2.0; decimal # No SUBSCRIPT TWO +2161 ; 2.0; numeric # Nl ROMAN NUMERAL TWO +2171 ; 2.0; numeric # Nl SMALL ROMAN NUMERAL TWO +2461 ; 2.0; digit # No CIRCLED DIGIT TWO +2475 ; 2.0; digit # No PARENTHESIZED DIGIT TWO +2489 ; 2.0; digit # No DIGIT TWO FULL STOP +24F6 ; 2.0; digit # No DOUBLE CIRCLED DIGIT TWO +2777 ; 2.0; digit # No DINGBAT NEGATIVE CIRCLED DIGIT TWO +2781 ; 2.0; digit # No DINGBAT CIRCLED SANS-SERIF DIGIT TWO +278B ; 2.0; digit # No DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT TWO +3022 ; 2.0; numeric # Nl HANGZHOU NUMERAL TWO +3193 ; 2.0; numeric # No IDEOGRAPHIC ANNOTATION TWO MARK +3221 ; 2.0; numeric # No PARENTHESIZED IDEOGRAPH TWO +3281 ; 2.0; numeric # No CIRCLED IDEOGRAPH TWO +FF12 ; 2.0; decimal # Nd FULLWIDTH DIGIT TWO +1D7D0 ; 2.0; decimal # Nd MATHEMATICAL BOLD DIGIT TWO +1D7DA ; 2.0; decimal # Nd MATHEMATICAL DOUBLE-STRUCK DIGIT TWO +1D7E4 ; 2.0; decimal # Nd MATHEMATICAL SANS-SERIF DIGIT TWO +1D7EE ; 2.0; decimal # Nd MATHEMATICAL SANS-SERIF BOLD DIGIT TWO +1D7F8 ; 2.0; decimal # Nd MATHEMATICAL MONOSPACE DIGIT TWO + +# Total code points: 41 + + +0F2C ; 2.5; numeric # No TIBETAN DIGIT HALF THREE + +# Total code points: 1 + + +0033 ; 3.0; decimal # Nd DIGIT THREE +00B3 ; 3.0; decimal # No SUPERSCRIPT THREE +0663 ; 3.0; decimal # Nd ARABIC-INDIC DIGIT THREE +06F3 ; 3.0; decimal # Nd EXTENDED ARABIC-INDIC DIGIT THREE +0969 ; 3.0; decimal # Nd DEVANAGARI DIGIT THREE +09E9 ; 3.0; decimal # Nd BENGALI DIGIT THREE +09F6 ; 3.0; numeric # No BENGALI CURRENCY NUMERATOR THREE +0A69 ; 3.0; decimal # Nd GURMUKHI DIGIT THREE +0AE9 ; 3.0; decimal # Nd GUJARATI DIGIT THREE +0B69 ; 3.0; decimal # Nd ORIYA DIGIT THREE +0BE9 ; 3.0; decimal # Nd TAMIL DIGIT THREE +0C69 ; 3.0; decimal # Nd TELUGU DIGIT THREE +0CE9 ; 3.0; decimal # Nd KANNADA DIGIT THREE +0D69 ; 3.0; decimal # Nd MALAYALAM DIGIT THREE +0E53 ; 3.0; decimal # Nd THAI DIGIT THREE +0ED3 ; 3.0; decimal # Nd LAO DIGIT THREE +0F23 ; 3.0; decimal # Nd TIBETAN DIGIT THREE +1043 ; 3.0; decimal # Nd MYANMAR DIGIT THREE +136B ; 3.0; decimal # Nd ETHIOPIC DIGIT THREE +17E3 ; 3.0; decimal # Nd KHMER DIGIT THREE +1813 ; 3.0; decimal # Nd MONGOLIAN DIGIT THREE +2083 ; 3.0; decimal # No SUBSCRIPT THREE +2162 ; 3.0; numeric # Nl ROMAN NUMERAL THREE +2172 ; 3.0; numeric # Nl SMALL ROMAN NUMERAL THREE +2462 ; 3.0; digit # No CIRCLED DIGIT THREE +2476 ; 3.0; digit # No PARENTHESIZED DIGIT THREE +248A ; 3.0; digit # No DIGIT THREE FULL STOP +24F7 ; 3.0; digit # No DOUBLE CIRCLED DIGIT THREE +2778 ; 3.0; digit # No DINGBAT NEGATIVE CIRCLED DIGIT THREE +2782 ; 3.0; digit # No DINGBAT CIRCLED SANS-SERIF DIGIT THREE +278C ; 3.0; digit # No DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT THREE +3023 ; 3.0; numeric # Nl HANGZHOU NUMERAL THREE +3194 ; 3.0; numeric # No IDEOGRAPHIC ANNOTATION THREE MARK +3222 ; 3.0; numeric # No PARENTHESIZED IDEOGRAPH THREE +3282 ; 3.0; numeric # No CIRCLED IDEOGRAPH THREE +FF13 ; 3.0; decimal # Nd FULLWIDTH DIGIT THREE +1D7D1 ; 3.0; decimal # Nd MATHEMATICAL BOLD DIGIT THREE +1D7DB ; 3.0; decimal # Nd MATHEMATICAL DOUBLE-STRUCK DIGIT THREE +1D7E5 ; 3.0; decimal # Nd MATHEMATICAL SANS-SERIF DIGIT THREE +1D7EF ; 3.0; decimal # Nd MATHEMATICAL SANS-SERIF BOLD DIGIT THREE +1D7F9 ; 3.0; decimal # Nd MATHEMATICAL MONOSPACE DIGIT THREE + +# Total code points: 41 + + +0F2D ; 3.5; numeric # No TIBETAN DIGIT HALF FOUR + +# Total code points: 1 + + +0034 ; 4.0; decimal # Nd DIGIT FOUR +0664 ; 4.0; decimal # Nd ARABIC-INDIC DIGIT FOUR +06F4 ; 4.0; decimal # Nd EXTENDED ARABIC-INDIC DIGIT FOUR +096A ; 4.0; decimal # Nd DEVANAGARI DIGIT FOUR +09EA ; 4.0; decimal # Nd BENGALI DIGIT FOUR +09F7 ; 4.0; numeric # No BENGALI CURRENCY NUMERATOR FOUR +0A6A ; 4.0; decimal # Nd GURMUKHI DIGIT FOUR +0AEA ; 4.0; decimal # Nd GUJARATI DIGIT FOUR +0B6A ; 4.0; decimal # Nd ORIYA DIGIT FOUR +0BEA ; 4.0; decimal # Nd TAMIL DIGIT FOUR +0C6A ; 4.0; decimal # Nd TELUGU DIGIT FOUR +0CEA ; 4.0; decimal # Nd KANNADA DIGIT FOUR +0D6A ; 4.0; decimal # Nd MALAYALAM DIGIT FOUR +0E54 ; 4.0; decimal # Nd THAI DIGIT FOUR +0ED4 ; 4.0; decimal # Nd LAO DIGIT FOUR +0F24 ; 4.0; decimal # Nd TIBETAN DIGIT FOUR +1044 ; 4.0; decimal # Nd MYANMAR DIGIT FOUR +136C ; 4.0; decimal # Nd ETHIOPIC DIGIT FOUR +17E4 ; 4.0; decimal # Nd KHMER DIGIT FOUR +1814 ; 4.0; decimal # Nd MONGOLIAN DIGIT FOUR +2074 ; 4.0; decimal # No SUPERSCRIPT FOUR +2084 ; 4.0; decimal # No SUBSCRIPT FOUR +2163 ; 4.0; numeric # Nl ROMAN NUMERAL FOUR +2173 ; 4.0; numeric # Nl SMALL ROMAN NUMERAL FOUR +2463 ; 4.0; digit # No CIRCLED DIGIT FOUR +2477 ; 4.0; digit # No PARENTHESIZED DIGIT FOUR +248B ; 4.0; digit # No DIGIT FOUR FULL STOP +24F8 ; 4.0; digit # No DOUBLE CIRCLED DIGIT FOUR +2779 ; 4.0; digit # No DINGBAT NEGATIVE CIRCLED DIGIT FOUR +2783 ; 4.0; digit # No DINGBAT CIRCLED SANS-SERIF DIGIT FOUR +278D ; 4.0; digit # No DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT FOUR +3024 ; 4.0; numeric # Nl HANGZHOU NUMERAL FOUR +3195 ; 4.0; numeric # No IDEOGRAPHIC ANNOTATION FOUR MARK +3223 ; 4.0; numeric # No PARENTHESIZED IDEOGRAPH FOUR +3283 ; 4.0; numeric # No CIRCLED IDEOGRAPH FOUR +FF14 ; 4.0; decimal # Nd FULLWIDTH DIGIT FOUR +1D7D2 ; 4.0; decimal # Nd MATHEMATICAL BOLD DIGIT FOUR +1D7DC ; 4.0; decimal # Nd MATHEMATICAL DOUBLE-STRUCK DIGIT FOUR +1D7E6 ; 4.0; decimal # Nd MATHEMATICAL SANS-SERIF DIGIT FOUR +1D7F0 ; 4.0; decimal # Nd MATHEMATICAL SANS-SERIF BOLD DIGIT FOUR +1D7FA ; 4.0; decimal # Nd MATHEMATICAL MONOSPACE DIGIT FOUR + +# Total code points: 41 + + +0F2E ; 4.5; numeric # No TIBETAN DIGIT HALF FIVE + +# Total code points: 1 + + +0035 ; 5.0; decimal # Nd DIGIT FIVE +0665 ; 5.0; decimal # Nd ARABIC-INDIC DIGIT FIVE +06F5 ; 5.0; decimal # Nd EXTENDED ARABIC-INDIC DIGIT FIVE +096B ; 5.0; decimal # Nd DEVANAGARI DIGIT FIVE +09EB ; 5.0; decimal # Nd BENGALI DIGIT FIVE +0A6B ; 5.0; decimal # Nd GURMUKHI DIGIT FIVE +0AEB ; 5.0; decimal # Nd GUJARATI DIGIT FIVE +0B6B ; 5.0; decimal # Nd ORIYA DIGIT FIVE +0BEB ; 5.0; decimal # Nd TAMIL DIGIT FIVE +0C6B ; 5.0; decimal # Nd TELUGU DIGIT FIVE +0CEB ; 5.0; decimal # Nd KANNADA DIGIT FIVE +0D6B ; 5.0; decimal # Nd MALAYALAM DIGIT FIVE +0E55 ; 5.0; decimal # Nd THAI DIGIT FIVE +0ED5 ; 5.0; decimal # Nd LAO DIGIT FIVE +0F25 ; 5.0; decimal # Nd TIBETAN DIGIT FIVE +1045 ; 5.0; decimal # Nd MYANMAR DIGIT FIVE +136D ; 5.0; decimal # Nd ETHIOPIC DIGIT FIVE +17E5 ; 5.0; decimal # Nd KHMER DIGIT FIVE +1815 ; 5.0; decimal # Nd MONGOLIAN DIGIT FIVE +2075 ; 5.0; decimal # No SUPERSCRIPT FIVE +2085 ; 5.0; decimal # No SUBSCRIPT FIVE +2164 ; 5.0; numeric # Nl ROMAN NUMERAL FIVE +2174 ; 5.0; numeric # Nl SMALL ROMAN NUMERAL FIVE +2464 ; 5.0; digit # No CIRCLED DIGIT FIVE +2478 ; 5.0; digit # No PARENTHESIZED DIGIT FIVE +248C ; 5.0; digit # No DIGIT FIVE FULL STOP +24F9 ; 5.0; digit # No DOUBLE CIRCLED DIGIT FIVE +277A ; 5.0; digit # No DINGBAT NEGATIVE CIRCLED DIGIT FIVE +2784 ; 5.0; digit # No DINGBAT CIRCLED SANS-SERIF DIGIT FIVE +278E ; 5.0; digit # No DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT FIVE +3025 ; 5.0; numeric # Nl HANGZHOU NUMERAL FIVE +3224 ; 5.0; numeric # No PARENTHESIZED IDEOGRAPH FIVE +3284 ; 5.0; numeric # No CIRCLED IDEOGRAPH FIVE +FF15 ; 5.0; decimal # Nd FULLWIDTH DIGIT FIVE +10321 ; 5.0; numeric # No OLD ITALIC NUMERAL FIVE +1D7D3 ; 5.0; decimal # Nd MATHEMATICAL BOLD DIGIT FIVE +1D7DD ; 5.0; decimal # Nd MATHEMATICAL DOUBLE-STRUCK DIGIT FIVE +1D7E7 ; 5.0; decimal # Nd MATHEMATICAL SANS-SERIF DIGIT FIVE +1D7F1 ; 5.0; decimal # Nd MATHEMATICAL SANS-SERIF BOLD DIGIT FIVE +1D7FB ; 5.0; decimal # Nd MATHEMATICAL MONOSPACE DIGIT FIVE + +# Total code points: 40 + + +0F2F ; 5.5; numeric # No TIBETAN DIGIT HALF SIX + +# Total code points: 1 + + +0036 ; 6.0; decimal # Nd DIGIT SIX +0666 ; 6.0; decimal # Nd ARABIC-INDIC DIGIT SIX +06F6 ; 6.0; decimal # Nd EXTENDED ARABIC-INDIC DIGIT SIX +096C ; 6.0; decimal # Nd DEVANAGARI DIGIT SIX +09EC ; 6.0; decimal # Nd BENGALI DIGIT SIX +0A6C ; 6.0; decimal # Nd GURMUKHI DIGIT SIX +0AEC ; 6.0; decimal # Nd GUJARATI DIGIT SIX +0B6C ; 6.0; decimal # Nd ORIYA DIGIT SIX +0BEC ; 6.0; decimal # Nd TAMIL DIGIT SIX +0C6C ; 6.0; decimal # Nd TELUGU DIGIT SIX +0CEC ; 6.0; decimal # Nd KANNADA DIGIT SIX +0D6C ; 6.0; decimal # Nd MALAYALAM DIGIT SIX +0E56 ; 6.0; decimal # Nd THAI DIGIT SIX +0ED6 ; 6.0; decimal # Nd LAO DIGIT SIX +0F26 ; 6.0; decimal # Nd TIBETAN DIGIT SIX +1046 ; 6.0; decimal # Nd MYANMAR DIGIT SIX +136E ; 6.0; decimal # Nd ETHIOPIC DIGIT SIX +17E6 ; 6.0; decimal # Nd KHMER DIGIT SIX +1816 ; 6.0; decimal # Nd MONGOLIAN DIGIT SIX +2076 ; 6.0; decimal # No SUPERSCRIPT SIX +2086 ; 6.0; decimal # No SUBSCRIPT SIX +2165 ; 6.0; numeric # Nl ROMAN NUMERAL SIX +2175 ; 6.0; numeric # Nl SMALL ROMAN NUMERAL SIX +2465 ; 6.0; digit # No CIRCLED DIGIT SIX +2479 ; 6.0; digit # No PARENTHESIZED DIGIT SIX +248D ; 6.0; digit # No DIGIT SIX FULL STOP +24FA ; 6.0; digit # No DOUBLE CIRCLED DIGIT SIX +277B ; 6.0; digit # No DINGBAT NEGATIVE CIRCLED DIGIT SIX +2785 ; 6.0; digit # No DINGBAT CIRCLED SANS-SERIF DIGIT SIX +278F ; 6.0; digit # No DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT SIX +3026 ; 6.0; numeric # Nl HANGZHOU NUMERAL SIX +3225 ; 6.0; numeric # No PARENTHESIZED IDEOGRAPH SIX +3285 ; 6.0; numeric # No CIRCLED IDEOGRAPH SIX +FF16 ; 6.0; decimal # Nd FULLWIDTH DIGIT SIX +1D7D4 ; 6.0; decimal # Nd MATHEMATICAL BOLD DIGIT SIX +1D7DE ; 6.0; decimal # Nd MATHEMATICAL DOUBLE-STRUCK DIGIT SIX +1D7E8 ; 6.0; decimal # Nd MATHEMATICAL SANS-SERIF DIGIT SIX +1D7F2 ; 6.0; decimal # Nd MATHEMATICAL SANS-SERIF BOLD DIGIT SIX +1D7FC ; 6.0; decimal # Nd MATHEMATICAL MONOSPACE DIGIT SIX + +# Total code points: 39 + + +0F30 ; 6.5; numeric # No TIBETAN DIGIT HALF SEVEN + +# Total code points: 1 + + +0037 ; 7.0; decimal # Nd DIGIT SEVEN +0667 ; 7.0; decimal # Nd ARABIC-INDIC DIGIT SEVEN +06F7 ; 7.0; decimal # Nd EXTENDED ARABIC-INDIC DIGIT SEVEN +096D ; 7.0; decimal # Nd DEVANAGARI DIGIT SEVEN +09ED ; 7.0; decimal # Nd BENGALI DIGIT SEVEN +0A6D ; 7.0; decimal # Nd GURMUKHI DIGIT SEVEN +0AED ; 7.0; decimal # Nd GUJARATI DIGIT SEVEN +0B6D ; 7.0; decimal # Nd ORIYA DIGIT SEVEN +0BED ; 7.0; decimal # Nd TAMIL DIGIT SEVEN +0C6D ; 7.0; decimal # Nd TELUGU DIGIT SEVEN +0CED ; 7.0; decimal # Nd KANNADA DIGIT SEVEN +0D6D ; 7.0; decimal # Nd MALAYALAM DIGIT SEVEN +0E57 ; 7.0; decimal # Nd THAI DIGIT SEVEN +0ED7 ; 7.0; decimal # Nd LAO DIGIT SEVEN +0F27 ; 7.0; decimal # Nd TIBETAN DIGIT SEVEN +1047 ; 7.0; decimal # Nd MYANMAR DIGIT SEVEN +136F ; 7.0; decimal # Nd ETHIOPIC DIGIT SEVEN +17E7 ; 7.0; decimal # Nd KHMER DIGIT SEVEN +1817 ; 7.0; decimal # Nd MONGOLIAN DIGIT SEVEN +2077 ; 7.0; decimal # No SUPERSCRIPT SEVEN +2087 ; 7.0; decimal # No SUBSCRIPT SEVEN +2166 ; 7.0; numeric # Nl ROMAN NUMERAL SEVEN +2176 ; 7.0; numeric # Nl SMALL ROMAN NUMERAL SEVEN +2466 ; 7.0; digit # No CIRCLED DIGIT SEVEN +247A ; 7.0; digit # No PARENTHESIZED DIGIT SEVEN +248E ; 7.0; digit # No DIGIT SEVEN FULL STOP +24FB ; 7.0; digit # No DOUBLE CIRCLED DIGIT SEVEN +277C ; 7.0; digit # No DINGBAT NEGATIVE CIRCLED DIGIT SEVEN +2786 ; 7.0; digit # No DINGBAT CIRCLED SANS-SERIF DIGIT SEVEN +2790 ; 7.0; digit # No DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT SEVEN +3027 ; 7.0; numeric # Nl HANGZHOU NUMERAL SEVEN +3226 ; 7.0; numeric # No PARENTHESIZED IDEOGRAPH SEVEN +3286 ; 7.0; numeric # No CIRCLED IDEOGRAPH SEVEN +FF17 ; 7.0; decimal # Nd FULLWIDTH DIGIT SEVEN +1D7D5 ; 7.0; decimal # Nd MATHEMATICAL BOLD DIGIT SEVEN +1D7DF ; 7.0; decimal # Nd MATHEMATICAL DOUBLE-STRUCK DIGIT SEVEN +1D7E9 ; 7.0; decimal # Nd MATHEMATICAL SANS-SERIF DIGIT SEVEN +1D7F3 ; 7.0; decimal # Nd MATHEMATICAL SANS-SERIF BOLD DIGIT SEVEN +1D7FD ; 7.0; decimal # Nd MATHEMATICAL MONOSPACE DIGIT SEVEN + +# Total code points: 39 + + +0F31 ; 7.5; numeric # No TIBETAN DIGIT HALF EIGHT + +# Total code points: 1 + + +0038 ; 8.0; decimal # Nd DIGIT EIGHT +0668 ; 8.0; decimal # Nd ARABIC-INDIC DIGIT EIGHT +06F8 ; 8.0; decimal # Nd EXTENDED ARABIC-INDIC DIGIT EIGHT +096E ; 8.0; decimal # Nd DEVANAGARI DIGIT EIGHT +09EE ; 8.0; decimal # Nd BENGALI DIGIT EIGHT +0A6E ; 8.0; decimal # Nd GURMUKHI DIGIT EIGHT +0AEE ; 8.0; decimal # Nd GUJARATI DIGIT EIGHT +0B6E ; 8.0; decimal # Nd ORIYA DIGIT EIGHT +0BEE ; 8.0; decimal # Nd TAMIL DIGIT EIGHT +0C6E ; 8.0; decimal # Nd TELUGU DIGIT EIGHT +0CEE ; 8.0; decimal # Nd KANNADA DIGIT EIGHT +0D6E ; 8.0; decimal # Nd MALAYALAM DIGIT EIGHT +0E58 ; 8.0; decimal # Nd THAI DIGIT EIGHT +0ED8 ; 8.0; decimal # Nd LAO DIGIT EIGHT +0F28 ; 8.0; decimal # Nd TIBETAN DIGIT EIGHT +1048 ; 8.0; decimal # Nd MYANMAR DIGIT EIGHT +1370 ; 8.0; decimal # Nd ETHIOPIC DIGIT EIGHT +17E8 ; 8.0; decimal # Nd KHMER DIGIT EIGHT +1818 ; 8.0; decimal # Nd MONGOLIAN DIGIT EIGHT +2078 ; 8.0; decimal # No SUPERSCRIPT EIGHT +2088 ; 8.0; decimal # No SUBSCRIPT EIGHT +2167 ; 8.0; numeric # Nl ROMAN NUMERAL EIGHT +2177 ; 8.0; numeric # Nl SMALL ROMAN NUMERAL EIGHT +2467 ; 8.0; digit # No CIRCLED DIGIT EIGHT +247B ; 8.0; digit # No PARENTHESIZED DIGIT EIGHT +248F ; 8.0; digit # No DIGIT EIGHT FULL STOP +24FC ; 8.0; digit # No DOUBLE CIRCLED DIGIT EIGHT +277D ; 8.0; digit # No DINGBAT NEGATIVE CIRCLED DIGIT EIGHT +2787 ; 8.0; digit # No DINGBAT CIRCLED SANS-SERIF DIGIT EIGHT +2791 ; 8.0; digit # No DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT EIGHT +3028 ; 8.0; numeric # Nl HANGZHOU NUMERAL EIGHT +3227 ; 8.0; numeric # No PARENTHESIZED IDEOGRAPH EIGHT +3287 ; 8.0; numeric # No CIRCLED IDEOGRAPH EIGHT +FF18 ; 8.0; decimal # Nd FULLWIDTH DIGIT EIGHT +1D7D6 ; 8.0; decimal # Nd MATHEMATICAL BOLD DIGIT EIGHT +1D7E0 ; 8.0; decimal # Nd MATHEMATICAL DOUBLE-STRUCK DIGIT EIGHT +1D7EA ; 8.0; decimal # Nd MATHEMATICAL SANS-SERIF DIGIT EIGHT +1D7F4 ; 8.0; decimal # Nd MATHEMATICAL SANS-SERIF BOLD DIGIT EIGHT +1D7FE ; 8.0; decimal # Nd MATHEMATICAL MONOSPACE DIGIT EIGHT + +# Total code points: 39 + + +0F32 ; 8.5; numeric # No TIBETAN DIGIT HALF NINE + +# Total code points: 1 + + +0039 ; 9.0; decimal # Nd DIGIT NINE +0669 ; 9.0; decimal # Nd ARABIC-INDIC DIGIT NINE +06F9 ; 9.0; decimal # Nd EXTENDED ARABIC-INDIC DIGIT NINE +096F ; 9.0; decimal # Nd DEVANAGARI DIGIT NINE +09EF ; 9.0; decimal # Nd BENGALI DIGIT NINE +0A6F ; 9.0; decimal # Nd GURMUKHI DIGIT NINE +0AEF ; 9.0; decimal # Nd GUJARATI DIGIT NINE +0B6F ; 9.0; decimal # Nd ORIYA DIGIT NINE +0BEF ; 9.0; decimal # Nd TAMIL DIGIT NINE +0C6F ; 9.0; decimal # Nd TELUGU DIGIT NINE +0CEF ; 9.0; decimal # Nd KANNADA DIGIT NINE +0D6F ; 9.0; decimal # Nd MALAYALAM DIGIT NINE +0E59 ; 9.0; decimal # Nd THAI DIGIT NINE +0ED9 ; 9.0; decimal # Nd LAO DIGIT NINE +0F29 ; 9.0; decimal # Nd TIBETAN DIGIT NINE +1049 ; 9.0; decimal # Nd MYANMAR DIGIT NINE +1371 ; 9.0; decimal # Nd ETHIOPIC DIGIT NINE +17E9 ; 9.0; decimal # Nd KHMER DIGIT NINE +1819 ; 9.0; decimal # Nd MONGOLIAN DIGIT NINE +2079 ; 9.0; decimal # No SUPERSCRIPT NINE +2089 ; 9.0; decimal # No SUBSCRIPT NINE +2168 ; 9.0; numeric # Nl ROMAN NUMERAL NINE +2178 ; 9.0; numeric # Nl SMALL ROMAN NUMERAL NINE +2468 ; 9.0; digit # No CIRCLED DIGIT NINE +247C ; 9.0; digit # No PARENTHESIZED DIGIT NINE +2490 ; 9.0; digit # No DIGIT NINE FULL STOP +24FD ; 9.0; digit # No DOUBLE CIRCLED DIGIT NINE +277E ; 9.0; digit # No DINGBAT NEGATIVE CIRCLED DIGIT NINE +2788 ; 9.0; digit # No DINGBAT CIRCLED SANS-SERIF DIGIT NINE +2792 ; 9.0; digit # No DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT NINE +3029 ; 9.0; numeric # Nl HANGZHOU NUMERAL NINE +3228 ; 9.0; numeric # No PARENTHESIZED IDEOGRAPH NINE +3288 ; 9.0; numeric # No CIRCLED IDEOGRAPH NINE +FF19 ; 9.0; decimal # Nd FULLWIDTH DIGIT NINE +1D7D7 ; 9.0; decimal # Nd MATHEMATICAL BOLD DIGIT NINE +1D7E1 ; 9.0; decimal # Nd MATHEMATICAL DOUBLE-STRUCK DIGIT NINE +1D7EB ; 9.0; decimal # Nd MATHEMATICAL SANS-SERIF DIGIT NINE +1D7F5 ; 9.0; decimal # Nd MATHEMATICAL SANS-SERIF BOLD DIGIT NINE +1D7FF ; 9.0; decimal # Nd MATHEMATICAL MONOSPACE DIGIT NINE + +# Total code points: 39 + + +0BF0 ; 10.0; numeric # No TAMIL NUMBER TEN +1372 ; 10.0; numeric # No ETHIOPIC NUMBER TEN +2169 ; 10.0; numeric # Nl ROMAN NUMERAL TEN +2179 ; 10.0; numeric # Nl SMALL ROMAN NUMERAL TEN +2469 ; 10.0; numeric # No CIRCLED NUMBER TEN +247D ; 10.0; numeric # No PARENTHESIZED NUMBER TEN +2491 ; 10.0; numeric # No NUMBER TEN FULL STOP +24FE ; 10.0; numeric # No DOUBLE CIRCLED NUMBER TEN +277F ; 10.0; numeric # No DINGBAT NEGATIVE CIRCLED NUMBER TEN +2789 ; 10.0; numeric # No DINGBAT CIRCLED SANS-SERIF NUMBER TEN +2793 ; 10.0; numeric # No DINGBAT NEGATIVE CIRCLED SANS-SERIF NUMBER TEN +3038 ; 10.0; numeric # Nl HANGZHOU NUMERAL TEN +3229 ; 10.0; numeric # No PARENTHESIZED IDEOGRAPH TEN +3289 ; 10.0; numeric # No CIRCLED IDEOGRAPH TEN +10322 ; 10.0; numeric # No OLD ITALIC NUMERAL TEN + +# Total code points: 15 + + +216A ; 11.0; numeric # Nl ROMAN NUMERAL ELEVEN +217A ; 11.0; numeric # Nl SMALL ROMAN NUMERAL ELEVEN +246A ; 11.0; numeric # No CIRCLED NUMBER ELEVEN +247E ; 11.0; numeric # No PARENTHESIZED NUMBER ELEVEN +2492 ; 11.0; numeric # No NUMBER ELEVEN FULL STOP +24EB ; 11.0; numeric # No NEGATIVE CIRCLED NUMBER ELEVEN + +# Total code points: 6 + + +216B ; 12.0; numeric # Nl ROMAN NUMERAL TWELVE +217B ; 12.0; numeric # Nl SMALL ROMAN NUMERAL TWELVE +246B ; 12.0; numeric # No CIRCLED NUMBER TWELVE +247F ; 12.0; numeric # No PARENTHESIZED NUMBER TWELVE +2493 ; 12.0; numeric # No NUMBER TWELVE FULL STOP +24EC ; 12.0; numeric # No NEGATIVE CIRCLED NUMBER TWELVE + +# Total code points: 6 + + +246C ; 13.0; numeric # No CIRCLED NUMBER THIRTEEN +2480 ; 13.0; numeric # No PARENTHESIZED NUMBER THIRTEEN +2494 ; 13.0; numeric # No NUMBER THIRTEEN FULL STOP +24ED ; 13.0; numeric # No NEGATIVE CIRCLED NUMBER THIRTEEN + +# Total code points: 4 + + +246D ; 14.0; numeric # No CIRCLED NUMBER FOURTEEN +2481 ; 14.0; numeric # No PARENTHESIZED NUMBER FOURTEEN +2495 ; 14.0; numeric # No NUMBER FOURTEEN FULL STOP +24EE ; 14.0; numeric # No NEGATIVE CIRCLED NUMBER FOURTEEN + +# Total code points: 4 + + +246E ; 15.0; numeric # No CIRCLED NUMBER FIFTEEN +2482 ; 15.0; numeric # No PARENTHESIZED NUMBER FIFTEEN +2496 ; 15.0; numeric # No NUMBER FIFTEEN FULL STOP +24EF ; 15.0; numeric # No NEGATIVE CIRCLED NUMBER FIFTEEN + +# Total code points: 4 + + +09F9 ; 16.0; numeric # No BENGALI CURRENCY DENOMINATOR SIXTEEN +246F ; 16.0; numeric # No CIRCLED NUMBER SIXTEEN +2483 ; 16.0; numeric # No PARENTHESIZED NUMBER SIXTEEN +2497 ; 16.0; numeric # No NUMBER SIXTEEN FULL STOP +24F0 ; 16.0; numeric # No NEGATIVE CIRCLED NUMBER SIXTEEN + +# Total code points: 5 + + +16EE ; 17.0; numeric # Nl RUNIC ARLAUG SYMBOL +2470 ; 17.0; numeric # No CIRCLED NUMBER SEVENTEEN +2484 ; 17.0; numeric # No PARENTHESIZED NUMBER SEVENTEEN +2498 ; 17.0; numeric # No NUMBER SEVENTEEN FULL STOP +24F1 ; 17.0; numeric # No NEGATIVE CIRCLED NUMBER SEVENTEEN + +# Total code points: 5 + + +16EF ; 18.0; numeric # Nl RUNIC TVIMADUR SYMBOL +2471 ; 18.0; numeric # No CIRCLED NUMBER EIGHTEEN +2485 ; 18.0; numeric # No PARENTHESIZED NUMBER EIGHTEEN +2499 ; 18.0; numeric # No NUMBER EIGHTEEN FULL STOP +24F2 ; 18.0; numeric # No NEGATIVE CIRCLED NUMBER EIGHTEEN + +# Total code points: 5 + + +16F0 ; 19.0; numeric # Nl RUNIC BELGTHOR SYMBOL +2472 ; 19.0; numeric # No CIRCLED NUMBER NINETEEN +2486 ; 19.0; numeric # No PARENTHESIZED NUMBER NINETEEN +249A ; 19.0; numeric # No NUMBER NINETEEN FULL STOP +24F3 ; 19.0; numeric # No NEGATIVE CIRCLED NUMBER NINETEEN + +# Total code points: 5 + + +1373 ; 20.0; numeric # No ETHIOPIC NUMBER TWENTY +2473 ; 20.0; numeric # No CIRCLED NUMBER TWENTY +2487 ; 20.0; numeric # No PARENTHESIZED NUMBER TWENTY +249B ; 20.0; numeric # No NUMBER TWENTY FULL STOP +24F4 ; 20.0; numeric # No NEGATIVE CIRCLED NUMBER TWENTY +3039 ; 20.0; numeric # Nl HANGZHOU NUMERAL TWENTY + +# Total code points: 6 + + +3251 ; 21.0; numeric # No CIRCLED NUMBER TWENTY ONE + +# Total code points: 1 + + +3252 ; 22.0; numeric # No CIRCLED NUMBER TWENTY TWO + +# Total code points: 1 + + +3253 ; 23.0; numeric # No CIRCLED NUMBER TWENTY THREE + +# Total code points: 1 + + +3254 ; 24.0; numeric # No CIRCLED NUMBER TWENTY FOUR + +# Total code points: 1 + + +3255 ; 25.0; numeric # No CIRCLED NUMBER TWENTY FIVE + +# Total code points: 1 + + +3256 ; 26.0; numeric # No CIRCLED NUMBER TWENTY SIX + +# Total code points: 1 + + +3257 ; 27.0; numeric # No CIRCLED NUMBER TWENTY SEVEN + +# Total code points: 1 + + +3258 ; 28.0; numeric # No CIRCLED NUMBER TWENTY EIGHT + +# Total code points: 1 + + +3259 ; 29.0; numeric # No CIRCLED NUMBER TWENTY NINE + +# Total code points: 1 + + +1374 ; 30.0; numeric # No ETHIOPIC NUMBER THIRTY +303A ; 30.0; numeric # Nl HANGZHOU NUMERAL THIRTY +325A ; 30.0; numeric # No CIRCLED NUMBER THIRTY + +# Total code points: 3 + + +325B ; 31.0; numeric # No CIRCLED NUMBER THIRTY ONE + +# Total code points: 1 + + +325C ; 32.0; numeric # No CIRCLED NUMBER THIRTY TWO + +# Total code points: 1 + + +325D ; 33.0; numeric # No CIRCLED NUMBER THIRTY THREE + +# Total code points: 1 + + +325E ; 34.0; numeric # No CIRCLED NUMBER THIRTY FOUR + +# Total code points: 1 + + +325F ; 35.0; numeric # No CIRCLED NUMBER THIRTY FIVE + +# Total code points: 1 + + +32B1 ; 36.0; numeric # No CIRCLED NUMBER THIRTY SIX + +# Total code points: 1 + + +32B2 ; 37.0; numeric # No CIRCLED NUMBER THIRTY SEVEN + +# Total code points: 1 + + +32B3 ; 38.0; numeric # No CIRCLED NUMBER THIRTY EIGHT + +# Total code points: 1 + + +32B4 ; 39.0; numeric # No CIRCLED NUMBER THIRTY NINE + +# Total code points: 1 + + +1375 ; 40.0; numeric # No ETHIOPIC NUMBER FORTY +32B5 ; 40.0; numeric # No CIRCLED NUMBER FORTY + +# Total code points: 2 + + +32B6 ; 41.0; numeric # No CIRCLED NUMBER FORTY ONE + +# Total code points: 1 + + +32B7 ; 42.0; numeric # No CIRCLED NUMBER FORTY TWO + +# Total code points: 1 + + +32B8 ; 43.0; numeric # No CIRCLED NUMBER FORTY THREE + +# Total code points: 1 + + +32B9 ; 44.0; numeric # No CIRCLED NUMBER FORTY FOUR + +# Total code points: 1 + + +32BA ; 45.0; numeric # No CIRCLED NUMBER FORTY FIVE + +# Total code points: 1 + + +32BB ; 46.0; numeric # No CIRCLED NUMBER FORTY SIX + +# Total code points: 1 + + +32BC ; 47.0; numeric # No CIRCLED NUMBER FORTY SEVEN + +# Total code points: 1 + + +32BD ; 48.0; numeric # No CIRCLED NUMBER FORTY EIGHT + +# Total code points: 1 + + +32BE ; 49.0; numeric # No CIRCLED NUMBER FORTY NINE + +# Total code points: 1 + + +1376 ; 50.0; numeric # No ETHIOPIC NUMBER FIFTY +216C ; 50.0; numeric # Nl ROMAN NUMERAL FIFTY +217C ; 50.0; numeric # Nl SMALL ROMAN NUMERAL FIFTY +32BF ; 50.0; numeric # No CIRCLED NUMBER FIFTY +10323 ; 50.0; numeric # No OLD ITALIC NUMERAL FIFTY + +# Total code points: 5 + + +1377 ; 60.0; numeric # No ETHIOPIC NUMBER SIXTY + +# Total code points: 1 + + +1378 ; 70.0; numeric # No ETHIOPIC NUMBER SEVENTY + +# Total code points: 1 + + +1379 ; 80.0; numeric # No ETHIOPIC NUMBER EIGHTY + +# Total code points: 1 + + +137A ; 90.0; numeric # No ETHIOPIC NUMBER NINETY + +# Total code points: 1 + + +0BF1 ; 100.0; numeric # No TAMIL NUMBER ONE HUNDRED +137B ; 100.0; numeric # No ETHIOPIC NUMBER HUNDRED +216D ; 100.0; numeric # Nl ROMAN NUMERAL ONE HUNDRED +217D ; 100.0; numeric # Nl SMALL ROMAN NUMERAL ONE HUNDRED + +# Total code points: 4 + + +216E ; 500.0; numeric # Nl ROMAN NUMERAL FIVE HUNDRED +217E ; 500.0; numeric # Nl SMALL ROMAN NUMERAL FIVE HUNDRED + +# Total code points: 2 + + +0BF2 ; 1000.0; numeric # No TAMIL NUMBER ONE THOUSAND +216F ; 1000.0; numeric # Nl ROMAN NUMERAL ONE THOUSAND +217F..2180 ; 1000.0; numeric # Nl [2] SMALL ROMAN NUMERAL ONE THOUSAND..ROMAN NUMERAL ONE THOUSAND C D + +# Total code points: 4 + + +2181 ; 5000.0; numeric # Nl ROMAN NUMERAL FIVE THOUSAND + +# Total code points: 1 + + +137C ; 10000.0; numeric # No ETHIOPIC NUMBER TEN THOUSAND +2182 ; 10000.0; numeric # Nl ROMAN NUMERAL TEN THOUSAND + +# Total code points: 2 + + diff --git a/extra_tests/snippets/builtin_str_unicode.py b/extra_tests/snippets/builtin_str_unicode.py index ca4a99199..ae2701d05 100644 --- a/extra_tests/snippets/builtin_str_unicode.py +++ b/extra_tests/snippets/builtin_str_unicode.py @@ -20,6 +20,13 @@ assert unicodedata.lookup("LATIN SMALL LETTER A") == "a" assert unicodedata.bidirectional("a") == "L" assert unicodedata.east_asian_width("\u231a") == "W" assert unicodedata.normalize("NFC", "bla") == "bla" +square_aruhua = " 30A2 30EB 30D5 30A1" +assert unicodedata.decomposition("\u3301") == square_aruhua +assert unicodedata.ucd_3_2_0.decomposition("\u3301") == square_aruhua + +# These are from NormalizationCorrections.txt +assert unicodedata.decomposition("\uf951") == "964B" +assert unicodedata.ucd_3_2_0.decomposition("\uf951") == "964B" # testing unicodedata.ucd_3_2_0 for idna assert "abcСĤ".encode("idna") == b"xn--abc-7sa390b" @@ -35,6 +42,5 @@ assert b"python.org.".decode("idna") == "python.org." assert b"xn--pythn-mua.org".decode("idna") == "pyth\xf6n.org" assert b"xn--pythn-mua.org.".decode("idna") == "pyth\xf6n.org." -# TODO: add east_asian_width and mirrored -# assert unicodedata.ucd_3_2_0.east_asian_width('\u231a') == 'N' -# assert not unicodedata.ucd_3_2_0.mirrored("\u0f3a") +assert unicodedata.ucd_3_2_0.east_asian_width("\u231a") == "N" +assert not unicodedata.ucd_3_2_0.mirrored("\u0f3a") From c3e1f0fa37f9a2aba9008bca5fd8a426c3f62b0c Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Mon, 15 Jun 2026 05:11:32 +0300 Subject: [PATCH 089/339] Get all builtin types dynamiclly (#8095) --- .gitattributes | 19 ++++++++++--------- crates/doc/generate.py | 18 +----------------- 2 files changed, 11 insertions(+), 26 deletions(-) diff --git a/.gitattributes b/.gitattributes index b3a782dbe..95aed96eb 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,10 +1,13 @@ Lib/** linguist-vendored Cargo.lock linguist-generated *.snap linguist-generated -merge -vm/src/stdlib/ast/gen.rs linguist-generated -merge Lib/*.py text working-tree-encoding=UTF-8 eol=LF **/*.rs text working-tree-encoding=UTF-8 eol=LF -crates/rustpython_doc_db/src/*.inc.rs linguist-generated=true +crates/vm/src/stdlib/ast/gen.rs linguist-generated -merge +crates/doc/src/data.inc.rs generated +crates/compiler-core/src/bytecode/opcode_metadata.rs generated + +.github/workflows/*.lock.yml linguist-generated=true merge=ours # Binary data types *.aif binary @@ -45,10 +48,11 @@ Lib/venv/scripts/posix/* text eol=lf # Language aware diff headers # https://tekin.co.uk/2020/10/better-git-diff-output-for-ruby-python-elixir-and-more # https://gist.github.com/tekin/12500956bd56784728e490d8cef9cb81 -*.css diff=css -*.html diff=html -*.py diff=python -*.md diff=markdown +*.css diff=css +*.html diff=html +*.py diff=python +*.md diff=markdown +*.inc.rs diff=rust # Generated files # https://github.com/github/linguist/blob/master/docs/overrides.md @@ -66,6 +70,3 @@ Lib/test/certdata/*.0 generated Lib/test/levenshtein_examples.json generated Lib/test/test_stable_abi_ctypes.py generated Lib/token.py generated -crates/compiler-core/src/bytecode/opcode_metadata.rs generated - -.github/workflows/*.lock.yml linguist-generated=true merge=ours diff --git a/crates/doc/generate.py b/crates/doc/generate.py index 189e69705..f7b86e075 100644 --- a/crates/doc/generate.py +++ b/crates/doc/generate.py @@ -185,23 +185,7 @@ def find_doc_entries() -> "Iterable[DocEntry]": ) yield from (doc_entry for doc_entry in traverse(__builtins__, __builtins__)) - builtin_types = [ - type(None), - type(bytearray().__iter__()), - type(bytes().__iter__()), - type(dict().__iter__()), - type(dict().items()), - type(dict().items().__iter__()), - type(dict().values()), - type(dict().values().__iter__()), - type(lambda: ...), - type(list().__iter__()), - type(memoryview(b"").__iter__()), - type(range(0).__iter__()), - type(set().__iter__()), - type(str().__iter__()), - type(tuple().__iter__()), - ] + builtin_types = object.__subclasses__() # Add types from the types module (e.g., ModuleType, FunctionType, etc.) for name in dir(types): From d758d60eb127382a06354d048adc3a9aad7690a6 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Mon, 15 Jun 2026 05:12:39 +0300 Subject: [PATCH 090/339] Newtype SigalNum (#8096) * Newtype SigalNum * impl Index for SignalHandlersInner --- Lib/test/test_signal.py | 8 ++ crates/host_env/src/signal.rs | 11 +-- crates/vm/src/signal.rs | 137 +++++++++++++++++++++++++++----- crates/vm/src/stdlib/_signal.rs | 128 ++++++++++++++--------------- crates/vm/src/stdlib/_thread.rs | 39 ++++----- 5 files changed, 210 insertions(+), 113 deletions(-) diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py index 07fc97cb6..a4af92d52 100644 --- a/Lib/test/test_signal.py +++ b/Lib/test/test_signal.py @@ -93,6 +93,7 @@ class PosixTests(unittest.TestCase): self.assertRaises(TypeError, signal.signal, signal.SIGUSR1, None) + @unittest.expectedFailureIf(sys.platform == "android", "TODO: RUSTPYTHON; AssertionError: None is not an instance of ") def test_getsignal(self): hup = signal.signal(signal.SIGHUP, self.trivial_signal_handler) self.assertIsInstance(hup, signal.Handlers) @@ -101,6 +102,7 @@ class PosixTests(unittest.TestCase): signal.signal(signal.SIGHUP, hup) self.assertEqual(signal.getsignal(signal.SIGHUP), hup) + @unittest.expectedFailureIf(sys.platform == "android", "TODO: RUSTPYTHON") def test_no_repr_is_called_on_signal_handler(self): # See https://github.com/python/cpython/issues/112559. @@ -778,6 +780,7 @@ class SiginterruptTest(unittest.TestCase): self.assertFalse(interrupted) +@unittest.skipIf(sys.platform == "android", "TODO: RUSTPYTHON; Error during teardown") @unittest.skipIf(sys.platform == "win32", "Not valid on Windows") @unittest.skipUnless(hasattr(signal, 'getitimer') and hasattr(signal, 'setitimer'), "needs signal.getitimer() and signal.setitimer()") @@ -1264,6 +1267,7 @@ class StressTest(unittest.TestCase): "(> 10 ms.) on this platform (or system too busy)" % (reso,)) + @unittest.skipIf(sys.platform == "android", "TODO: RUSTPYTHON; TypeError: signal handler must be signal.SIG_IGN, signal.SIG_DFL, or a callable object") @unittest.skipUnless(hasattr(signal, "setitimer"), "test needs setitimer()") def test_stress_delivery_dependent(self): @@ -1310,6 +1314,7 @@ class StressTest(unittest.TestCase): # Python handler self.assertEqual(len(sigs), N, "Some signals were lost") + @unittest.skipIf(sys.platform == "android", "TODO: RUSTPYTHON; TypeError: signal handler must be signal.SIG_IGN, signal.SIG_DFL, or a callable object") @unittest.skipUnless(hasattr(signal, "setitimer"), "test needs setitimer()") def test_stress_delivery_simultaneous(self): @@ -1409,6 +1414,7 @@ class StressTest(unittest.TestCase): class RaiseSignalTest(unittest.TestCase): + @unittest.expectedFailureIf(sys.platform == "android", "TODO: RUSTPYTHON; AssertionError: KeyboardInterrupt not raised") def test_sigint(self): with self.assertRaises(KeyboardInterrupt): signal.raise_signal(signal.SIGINT) @@ -1425,6 +1431,7 @@ class RaiseSignalTest(unittest.TestCase): else: raise + @unittest.skipIf(sys.platform == "android", "TODO: RUSTPYTHON; TypeError: signal handler must be signal.SIG_IGN, signal.SIG_DFL, or a callable object") def test_handler(self): is_ok = False def handler(a, b): @@ -1455,6 +1462,7 @@ class RaiseSignalTest(unittest.TestCase): class PidfdSignalTest(unittest.TestCase): + @unittest.expectedFailureIf(sys.platform == "android", "TODO: RUSTPYTHON; AssertionError: KeyboardInterrupt not raised") @unittest.skipUnless( hasattr(signal, "pidfd_send_signal"), "pidfd support not built in", diff --git a/crates/host_env/src/signal.rs b/crates/host_env/src/signal.rs index f9f2a8206..ab1974f37 100644 --- a/crates/host_env/src/signal.rs +++ b/crates/host_env/src/signal.rs @@ -55,10 +55,10 @@ mod ffi { } } -#[cfg(any(unix, windows))] /// # Safety /// /// The caller must ensure `signalnum` is a valid platform signal number. +#[cfg(any(unix, windows))] pub unsafe fn probe_handler(signalnum: i32) -> Option { let handler = unsafe { libc::signal(signalnum, libc::SIG_IGN) }; if handler == libc::SIG_ERR as sighandler_t { @@ -69,11 +69,11 @@ pub unsafe fn probe_handler(signalnum: i32) -> Option { } } -#[cfg(any(unix, windows))] /// # Safety /// /// The caller must ensure `signalnum` is a valid platform signal number and /// `handler` is accepted by the platform signal ABI. +#[cfg(any(unix, windows))] pub unsafe fn install_handler(signalnum: i32, handler: sighandler_t) -> io::Result { let old = unsafe { libc::signal(signalnum, handler) }; if old == libc::SIG_ERR as sighandler_t { @@ -158,7 +158,7 @@ pub fn pthread_sigmask(how: i32, set: &libc::sigset_t) -> io::Result io::Result<()> { let ret = unsafe { libc::syscall( @@ -199,11 +199,6 @@ pub const CTRL_BREAK_EVENT: u32 = 1; #[cfg(windows)] pub const INVALID_SOCKET: libc::SOCKET = windows_sys::Win32::Networking::WinSock::INVALID_SOCKET; -#[cfg(windows)] -pub fn is_valid_signal(signalnum: i32) -> bool { - VALID_SIGNALS.contains(&signalnum) -} - #[cfg(windows)] fn init_winsock() { static WSA_INIT: Once = Once::new(); diff --git a/crates/vm/src/signal.rs b/crates/vm/src/signal.rs index 11fe4f212..eea42f4a8 100644 --- a/crates/vm/src/signal.rs +++ b/crates/vm/src/signal.rs @@ -1,8 +1,7 @@ -use crate::{PyObjectRef, PyResult, VirtualMachine}; use core::{ cell::{Cell, RefCell}, fmt, - ops::{Deref, DerefMut}, + ops::{Deref, DerefMut, Index, IndexMut, Range}, sync::atomic::{AtomicBool, Ordering}, }; use std::sync::mpsc; @@ -10,10 +9,12 @@ use std::sync::mpsc; #[cfg(windows)] use core::sync::atomic::AtomicIsize; -static ANY_TRIGGERED: AtomicBool = AtomicBool::new(false); +use crate::{PyObjectRef, PyResult, TryFromBorrowedObject, TryFromObject, VirtualMachine}; pub(crate) const NSIG: usize = 64; +static ANY_TRIGGERED: AtomicBool = AtomicBool::new(false); + #[expect( clippy::declare_interior_mutable_const, reason = "workaround for const array repeat limitation (rust issue #79270)" @@ -70,22 +71,32 @@ fn trigger_signals(vm: &VirtualMachine) -> PyResult<()> { } let _guard = SignalHandlerGuard; - // unwrap should never fail since we check above - let signal_handlers = vm.signal_handlers.get().unwrap().borrow(); + let signal_handlers = vm + .signal_handlers + .get() + .expect("should never fail since we check above") + .borrow(); + for (signum, trigger) in TRIGGERS.iter().enumerate().skip(1) { let triggered = trigger.swap(false, Ordering::Relaxed); + + // SAFETY: TRIGGERS has the same length as the signal_handlers + let signum = unsafe { SignalNum::new_unchecked(signum as i32) }; + if triggered && let Some(handler) = &signal_handlers[signum] && let Some(callable) = handler.to_callable() { - callable.invoke((signum, vm.ctx.none()), vm)?; + callable.invoke((signum.as_i32(), vm.ctx.none()), vm)?; } } + if let Some(signal_rx) = &vm.signal_rx { for f in signal_rx.rx.try_iter() { f(vm)?; } } + Ok(()) } @@ -109,28 +120,94 @@ pub(crate) fn clear_after_fork() { } } -pub fn assert_in_range(signum: i32, vm: &VirtualMachine) -> PyResult<()> { - if (1..NSIG as i32).contains(&signum) { - Ok(()) - } else { - Err(vm.new_value_error("signal number out of range")) +/// A valid signal number. +#[derive(Clone, Copy, Debug, Eq, PartialEq, PartialOrd, Ord)] +pub struct SignalNum(i32); + +impl SignalNum { + pub(crate) const VALID_RANGE: Range = 1..NSIG as i32; + + /// Alias for: + /// ```rust + /// # use rustpython_vm::signal::SignalNum; + /// + /// unsafe { SignalNum::new_unchecked(libc::SIGINT) }; + /// ``` + #[cfg(any(unix, windows))] + #[allow(dead_code, reason = "Not used on all platforms")] + pub(crate) const SIGINT: Self = Self(libc::SIGINT); + + /// Construct [`Self`] without any validation on the signalnum value. + /// + /// # Safety + /// + /// Caller's responsibility to ensure the signal num is valid. + #[must_use] + pub const unsafe fn new_unchecked(value: i32) -> Self { + Self(value) + } + + /// Get the self as an [`i32`]. + #[must_use] + pub const fn as_i32(&self) -> i32 { + self.0 + } + + /// Get the self as an [`usize`]. + #[must_use] + pub const fn as_usize(&self) -> usize { + self.0 as usize + } +} + +impl fmt::Display for SignalNum { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + fmt::Display::fmt(&self.0, f) + } +} + +impl From for i32 { + fn from(signalnum: SignalNum) -> Self { + signalnum.as_i32() + } +} + +impl TryFrom for SignalNum { + type Error = String; + + fn try_from(value: i32) -> Result { + let bounds = cfg_select! { + all(windows, feature = "host_env") => rustpython_host_env::signal::VALID_SIGNALS, + _ => Self::VALID_RANGE, + }; + + if bounds.contains(&value) { + Ok(Self(value)) + } else { + Err("signal number out of range".into()) + } + } +} + +impl TryFromObject for SignalNum { + fn try_from_object(vm: &VirtualMachine, obj: PyObjectRef) -> PyResult { + Self::try_from(i32::try_from_borrowed_object(vm, &obj)?) + .map_err(|msg| vm.new_value_error(msg)) } } /// Similar to `PyErr_SetInterruptEx` in CPython /// /// Missing signal handler for the given signal number is silently ignored. -#[allow(dead_code)] #[cfg(all(not(target_arch = "wasm32"), feature = "host_env"))] -pub fn set_interrupt_ex(signum: i32, vm: &VirtualMachine) -> PyResult<()> { +pub fn set_interrupt_ex(signum: SignalNum) -> PyResult<()> { use crate::stdlib::_signal::_signal::{SIG_DFL, SIG_IGN, run_signal}; - assert_in_range(signum, vm)?; - match signum as usize { + match signum.as_usize() { SIG_DFL | SIG_IGN => Ok(()), _ => { // interrupt the main thread with given signal number - run_signal(signum); + run_signal(signum.into()); Ok(()) } } @@ -190,16 +267,38 @@ pub fn get_sigint_event() -> Option { if handle == 0 { None } else { Some(handle) } } -pub struct SignalHandlers(Box; NSIG]>>); +pub struct SignalHandlersInner([Option; NSIG]); + +impl Default for SignalHandlersInner { + fn default() -> Self { + Self([const { None }; NSIG]) + } +} + +impl Index for SignalHandlersInner { + type Output = Option; + + fn index(&self, index: SignalNum) -> &Self::Output { + &self.0[index.as_usize()] + } +} + +impl IndexMut for SignalHandlersInner { + fn index_mut(&mut self, index: SignalNum) -> &mut Self::Output { + &mut self.0[index.as_usize()] + } +} + +pub struct SignalHandlers(Box>); impl Default for SignalHandlers { fn default() -> Self { - Self(Box::new(const { RefCell::new([const { None }; NSIG]) })) + Self(Box::new(RefCell::new(SignalHandlersInner::default()))) } } impl Deref for SignalHandlers { - type Target = Box; NSIG]>>; + type Target = Box>; fn deref(&self) -> &Self::Target { &self.0 diff --git a/crates/vm/src/stdlib/_signal.rs b/crates/vm/src/stdlib/_signal.rs index 2d9eaa53a..e3d12568d 100644 --- a/crates/vm/src/stdlib/_signal.rs +++ b/crates/vm/src/stdlib/_signal.rs @@ -8,12 +8,9 @@ pub(crate) mod _signal { use crate::{ Py, PyObjectRef, PyResult, VirtualMachine, - signal::{self, SignalHandlers}, - }; - use core::{ - ops::Range, - sync::atomic::{self, Ordering}, + signal::{self, SignalHandlers, SignalNum}, }; + use core::sync::atomic::{self, Ordering}; cfg_select! { any(unix, windows) => { @@ -42,8 +39,6 @@ pub(crate) mod _signal { _ => usize, }; - const SIGNUM_RANGE: Range = 1..signal::NSIG as i32; - cfg_select! { windows => { type WakeupFdRaw = libc::SOCKET; @@ -94,9 +89,11 @@ pub(crate) mod _signal { #[cfg(not(unix))] #[pyattr] pub const SIG_DFL: sighandler_t = 0; + #[cfg(not(unix))] #[pyattr] pub const SIG_IGN: sighandler_t = 1; + #[cfg(not(unix))] #[allow(dead_code)] pub const SIG_ERR: sighandler_t = -1 as _; @@ -168,11 +165,12 @@ pub(crate) mod _signal { #[cfg(unix)] fn new_itimer_error(msg: &str, vm: &VirtualMachine) -> PyBaseExceptionRef { - vm.new_exception_msg(itimer_error(vm), msg.into()) + vm.new_os_subtype_error(itimer_error(vm), None, msg) + .upcast() } - const _: () = assert!(SIGNUM_RANGE.start.is_positive()); - const _: () = assert!(SIGNUM_RANGE.end.is_positive()); + const _: () = assert!(SignalNum::VALID_RANGE.start.is_positive()); + const _: () = assert!(SignalNum::VALID_RANGE.end.is_positive()); #[cfg(any(unix, windows))] pub(super) fn init_signal_handlers( @@ -183,7 +181,7 @@ pub(crate) mod _signal { let sig_dfl = vm.new_pyobj(SIG_DFL as u8); let sig_ign = vm.new_pyobj(SIG_IGN as u8); - for signum in SIGNUM_RANGE { + for signum in SignalNum::VALID_RANGE { let Some(handler) = (unsafe { host_signal::probe_handler(signum) }) else { continue; }; @@ -195,15 +193,19 @@ pub(crate) mod _signal { None }; + // SAFETY: Trust `SignalNum::VALID_RANGE` + let signum = unsafe { SignalNum::new_unchecked(signum) }; + vm.signal_handlers .get_or_init(SignalHandlers::default) - .borrow_mut()[signum as usize] = py_handler; + .borrow_mut()[signum] = py_handler; } let int_handler = module .get_attr("default_int_handler", vm) .expect("_signal does not have this attr?"); - signal(libc::SIGINT, int_handler, vm).expect("Failed to set sigint handler"); + + signal(SignalNum::SIGINT, int_handler, vm).expect("Failed to set sigint handler"); } } @@ -220,49 +222,44 @@ pub(crate) mod _signal { #[cfg(any(unix, windows))] #[pyfunction] pub fn signal( - signalnum: i32, + signalnum: SignalNum, handler: PyObjectRef, vm: &VirtualMachine, ) -> PyResult> { - signal::assert_in_range(signalnum, vm)?; - - #[cfg(windows)] - if !host_signal::is_valid_signal(signalnum) { - return Err(vm.new_value_error(format!("signal number {signalnum} out of range"))); - } - if !vm.is_main_thread() { - return Err(vm.new_value_error("signal only works in main thread")); + return Err( + vm.new_value_error("signal only works in main thread of the main interpreter") + ); } - let sig_handler = - match usize::try_from_borrowed_object(vm, &handler).ok() { - Some(SIG_DFL) => SIG_DFL, - Some(SIG_IGN) => SIG_IGN, - None if handler.is_callable() => run_signal as *const () as sighandler_t, - _ => return Err(vm.new_type_error( - "signal handler must be signal.SIG_IGN, signal.SIG_DFL, or a callable object", - )), - }; + let sig_handler = if handler.is_callable() { + run_signal as *const () as sighandler_t + } else { + const MSG: &str = + "signal handler must be signal.SIG_IGN, signal.SIG_DFL, or a callable object"; + + usize::try_from_borrowed_object(vm, &handler) + .ok() + .filter(|&v| matches!(v, SIG_DFL | SIG_IGN)) + .ok_or_else(|| vm.new_type_error(MSG))? + }; signal::check_signals(vm)?; - unsafe { host_signal::install_handler(signalnum, sig_handler) } + unsafe { host_signal::install_handler(signalnum.into(), sig_handler) } .map_err(|_| vm.new_os_error("Failed to set signal"))?; let signal_handlers = vm.signal_handlers.get_or_init(SignalHandlers::default); - let old_handler = signal_handlers.borrow_mut()[signalnum as usize].replace(handler); + let old_handler = signal_handlers.borrow_mut()[signalnum].replace(handler); Ok(old_handler) } #[pyfunction] - fn getsignal(signalnum: i32, vm: &VirtualMachine) -> PyResult { - signal::assert_in_range(signalnum, vm)?; + fn getsignal(signalnum: SignalNum, vm: &VirtualMachine) -> PyObjectRef { let signal_handlers = vm.signal_handlers.get_or_init(SignalHandlers::default); - let handler = signal_handlers.borrow()[signalnum as usize] + signal_handlers.borrow()[signalnum] .clone() - .unwrap_or_else(|| vm.ctx.none()); - Ok(handler) + .unwrap_or_else(|| vm.ctx.none()) } #[cfg(unix)] @@ -274,7 +271,7 @@ pub(crate) mod _signal { #[cfg(unix)] #[pyfunction] fn pause(vm: &VirtualMachine) -> PyResult<()> { - host_signal::pause(); + vm.allow_threads(host_signal::pause); signal::check_signals(vm)?; Ok(()) } @@ -332,7 +329,9 @@ pub(crate) mod _signal { }; if !vm.is_main_thread() { - return Err(vm.new_value_error("set_wakeup_fd only works in main thread")); + return Err(vm.new_value_error( + "set_wakeup_fd only works in main thread of the main interpreter", + )); } #[cfg(windows)] @@ -371,16 +370,15 @@ pub(crate) mod _signal { Ok(old_fd as i64) } - #[cfg(target_os = "linux")] + #[cfg(any(target_os = "android", target_os = "linux"))] #[pyfunction] fn pidfd_send_signal( pidfd: i32, - sig: i32, + sig: SignalNum, siginfo: OptionalArg, flags: OptionalArg, vm: &VirtualMachine, ) -> PyResult<()> { - signal::assert_in_range(sig, vm)?; if let OptionalArg::Present(obj) = siginfo && !vm.is_none(&obj) { @@ -388,33 +386,33 @@ pub(crate) mod _signal { } let flags = flags.unwrap_or(0); - host_signal::pidfd_send_signal(pidfd, sig, flags).map_err(|_| vm.new_last_errno_error()) + host_signal::pidfd_send_signal(pidfd, sig.into(), flags) + .map_err(|_| vm.new_last_errno_error()) } #[cfg(all(unix, not(target_os = "redox")))] #[pyfunction(name = "siginterrupt")] - fn py_siginterrupt(signum: i32, flag: i32, vm: &VirtualMachine) -> PyResult<()> { - signal::assert_in_range(signum, vm)?; - host_signal::siginterrupt(signum, flag).map_err(|_| vm.new_last_errno_error()) + fn py_siginterrupt(signum: SignalNum, flag: i32, vm: &VirtualMachine) -> PyResult<()> { + host_signal::siginterrupt(signum.into(), flag).map_err(|_| vm.new_last_errno_error()) } #[cfg(any(unix, windows))] #[pyfunction] fn raise_signal(signalnum: i32, vm: &VirtualMachine) -> PyResult<()> { - signal::assert_in_range(signalnum, vm)?; + let signalnum = SignalNum::try_from(signalnum).map_err(cfg_select! { + windows => { + |_| vm.new_errno_error(libc::EINVAL, "Invalid argument").upcast() + }, + _ => { + |msg| vm.new_value_error(msg) + } + })?; - // On Windows, only certain signals are supported - #[cfg(windows)] - if !host_signal::is_valid_signal(signalnum) { - return Err(vm - .new_errno_error(libc::EINVAL, "Invalid argument") - .upcast()); - } - - host_signal::raise_signal(signalnum) + vm.allow_threads(|| host_signal::raise_signal(signalnum.into())) .map_err(|_| vm.new_os_error(format!("raise_signal failed for signal {signalnum}")))?; // Check if a signal was triggered and handle it + signal::check_signals(vm)?; Ok(()) @@ -422,12 +420,8 @@ pub(crate) mod _signal { #[cfg(any(unix, windows))] #[pyfunction] - fn strsignal(signalnum: i32, vm: &VirtualMachine) -> PyResult> { - if !SIGNUM_RANGE.contains(&signalnum) { - return Err(vm.new_value_error(format!("signal number {signalnum} out of range"))); - } - - Ok(host_signal::strsignal(signalnum)) + fn strsignal(signalnum: SignalNum) -> Option { + host_signal::strsignal(signalnum.into()) } #[pyfunction] @@ -452,7 +446,7 @@ pub(crate) mod _signal { use crate::PyPayload; use crate::builtins::PySet; let set = PySet::default().into_ref(&vm.ctx); - for signum in SIGNUM_RANGE { + for signum in SignalNum::VALID_RANGE { if host_signal::sigset_contains(mask, signum) { set.add(vm.ctx.new_int(signum).into(), vm)?; } @@ -467,8 +461,6 @@ pub(crate) mod _signal { mask: crate::function::ArgIterable, vm: &VirtualMachine, ) -> PyResult { - use crate::convert::IntoPyException; - // Initialize sigset let mut sigset = host_signal::sigemptyset().map_err(|e| e.into_pyexception(vm))?; @@ -481,11 +473,11 @@ pub(crate) mod _signal { let signum = sig .try_to_value::(vm) .ok() - .filter(|v| SIGNUM_RANGE.contains(v)) + .filter(|v| SignalNum::VALID_RANGE.contains(v)) .ok_or_else(|| { vm.new_value_error(format!( "signal number out of range [1, {}]", - SIGNUM_RANGE.end - 1 + SignalNum::VALID_RANGE.end - 1 )) })?; diff --git a/crates/vm/src/stdlib/_thread.rs b/crates/vm/src/stdlib/_thread.rs index 93d42676b..ae612e4d5 100644 --- a/crates/vm/src/stdlib/_thread.rs +++ b/crates/vm/src/stdlib/_thread.rs @@ -13,6 +13,11 @@ pub(crate) use _thread::{ #[pymodule] pub(crate) mod _thread { + use parking_lot::{ + RawMutex, RawThreadId, + lock_api::{RawMutex as RawMutexT, RawMutexTimed, RawReentrantMutex}, + }; + use crate::{ AsObject, Py, PyPayload, PyRef, PyResult, VirtualMachine, builtins::{PyDictRef, PyIntRef, PyStr, PyTupleRef, PyType, PyTypeRef, PyUtf8StrRef}, @@ -21,19 +26,17 @@ pub(crate) mod _thread { function::{ArgCallable, FuncArgs, KwArgs, OptionalArg, PySetterValue, TimeoutSeconds}, types::{Constructor, GetAttr, Representable, SetAttr}, }; - use alloc::{ - fmt, - sync::{Arc, Weak}, - }; - use core::{cell::RefCell, time::Duration}; - use parking_lot::{ - RawMutex, RawThreadId, - lock_api::{RawMutex as RawMutexT, RawMutexTimed, RawReentrantMutex}, - }; + + use alloc::sync::{Arc, Weak}; + use core::{cell::RefCell, fmt, time::Duration}; + use std::thread; + use rustpython_common::str::levenshtein::{MOVE_COST, levenshtein_distance}; #[cfg(any(unix, windows))] use rustpython_host_env::thread as host_thread; - use std::thread; + + #[cfg(all(not(target_arch = "wasm32"), feature = "host_env"))] + use crate::signal::SignalNum; // PYTHREAD_NAME: show current thread name pub(crate) const PYTHREAD_NAME: Option<&str> = cfg_select! { @@ -43,12 +46,11 @@ pub(crate) mod _thread { _ => None, }; - // TIMEOUT_MAX_IN_MICROSECONDS is a value in microseconds - #[cfg(not(target_os = "windows"))] - const TIMEOUT_MAX_IN_MICROSECONDS: i64 = i64::MAX / 1_000; - - #[cfg(target_os = "windows")] - const TIMEOUT_MAX_IN_MICROSECONDS: i64 = 0xffffffff * 1_000; + const TIMEOUT_MAX_IN_MICROSECONDS: i64 = if cfg!(target_os = "windows") { + 0xffffffff * 1_000 + } else { + i64::MAX / 1_000 + }; /// [CPython `SYSTEM_PAGE_SIZE`](https://github.com/python/cpython/blob/v3.14.5/Include/internal/pycore_obmalloc.h#L170) const SYSTEM_PAGE_SIZE: usize = 4 * 1024; @@ -614,8 +616,9 @@ pub(crate) mod _thread { #[cfg(all(not(target_arch = "wasm32"), feature = "host_env"))] #[pyfunction] - fn interrupt_main(signum: OptionalArg, vm: &VirtualMachine) -> PyResult<()> { - crate::signal::set_interrupt_ex(signum.unwrap_or(libc::SIGINT), vm) + fn interrupt_main(signum: OptionalArg) -> PyResult<()> { + let sig = signum.unwrap_or(SignalNum::SIGINT); + crate::signal::set_interrupt_ex(sig) } #[pyfunction] From 271d3c2af17da1b48e4adb32ab7ae14b89735a8a Mon Sep 17 00:00:00 2001 From: Joshua Megnauth <48846352+joshuamegnauth54@users.noreply.github.com> Date: Sun, 14 Jun 2026 22:18:31 -0400 Subject: [PATCH 091/339] host_env: Use Rustix for copy_file_range (#8099) Rustix bypasses `libc` to make direct syscalls on Linux. Rustix is also semantically cleaner than `libc` itself. For `copy_file_range`, the offsets can't be negative but `libc`'s `off_t` type is an `i64` because it's used elsewhere, including for functions that CAN take a negative offset. Rustix is cleaner because the offsets are `u64`. --- Cargo.toml | 2 +- crates/host_env/src/os.rs | 35 +++++++++++++---------------------- crates/vm/src/stdlib/os.rs | 18 ++++++++++++++---- 3 files changed, 28 insertions(+), 27 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index e1f76408e..256a4772a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -284,7 +284,7 @@ radium = "1.1.1" rand = "0.10" rapidhash = "4.4.1" result-like = "0.5.0" -rustix = { version = "1.1", features = ["event", "param", "system"] } +rustix = { version = "1.1", features = ["event", "fs", "param", "system"] } rustls = { version = "0.23.39", default-features = false } rustls-graviola = "0.3" rustls-native-certs = "0.8" diff --git a/crates/host_env/src/os.rs b/crates/host_env/src/os.rs index 8afa07aea..b1d398faa 100644 --- a/crates/host_env/src/os.rs +++ b/crates/host_env/src/os.rs @@ -256,30 +256,14 @@ pub fn system(command: &CStr) -> libc::c_int { #[cfg(target_os = "linux")] pub fn copy_file_range( src: crt_fd::Borrowed<'_>, - offset_src: Option<&mut crt_fd::Offset>, + offset_src: Option<&mut u64>, dst: crt_fd::Borrowed<'_>, - offset_dst: Option<&mut crt_fd::Offset>, + offset_dst: Option<&mut u64>, count: usize, -) -> io::Result { - #[allow(clippy::unnecessary_option_map_or_else)] - let p_offset_src = offset_src.map_or_else(core::ptr::null_mut, |x| x as *mut _); - #[allow(clippy::unnecessary_option_map_or_else)] - let p_offset_dst = offset_dst.map_or_else(core::ptr::null_mut, |x| x as *mut _); - - // Why not use `libc::copy_file_range`: On musl, the libc wrapper may be missing. - let ret = unsafe { - libc::syscall( - libc::SYS_copy_file_range, - src.as_raw(), - p_offset_src, - dst.as_raw(), - p_offset_dst, - count, - 0u32, - ) - }; - - usize::try_from(ret).map_err(|_| io::Error::last_os_error()) +) -> rustix::io::Result { + // `copy_file_range` isn't wrapped in every libc (i.e. musl). + // However, Rustix is a safe wrapper around the syscall that bypasses libc. + rustix::fs::copy_file_range(src, offset_src, dst, offset_dst, count) } pub fn rename( @@ -369,6 +353,13 @@ impl ErrorExt for io::Error { } } +#[cfg(all(not(windows), not(target_arch = "wasm32")))] +impl ErrorExt for rustix::io::Errno { + fn posix_errno(&self) -> i32 { + self.raw_os_error() + } +} + /// Get the last error from C runtime library functions (like _dup, _dup2, _fstat, etc.) /// CRT functions set errno, not GetLastError(), so we need to read errno directly. #[cfg(windows)] diff --git a/crates/vm/src/stdlib/os.rs b/crates/vm/src/stdlib/os.rs index 986a45fb4..d6f6a181a 100644 --- a/crates/vm/src/stdlib/os.rs +++ b/crates/vm/src/stdlib/os.rs @@ -1709,20 +1709,30 @@ pub(super) mod _os { #[cfg(target_os = "linux")] #[pyfunction] - fn copy_file_range(mut args: CopyFileRangeArgs<'_>, vm: &VirtualMachine) -> PyResult { + fn copy_file_range(args: CopyFileRangeArgs<'_>, vm: &VirtualMachine) -> PyResult { let count: usize = args .count .try_into() .map_err(|_| vm.new_value_error("count should >= 0"))?; + let mut offset_src = args + .offset_src + .map(TryInto::try_into) + .transpose() + .map_err(|_| vm.new_value_error("offset_src should be >= 0"))?; + let mut offset_dst = args + .offset_dst + .map(TryInto::try_into) + .transpose() + .map_err(|_| vm.new_value_error("offset_dst should be >= 0"))?; crate::host_env::os::copy_file_range( args.src, - args.offset_src.as_mut(), + offset_src.as_mut(), args.dst, - args.offset_dst.as_mut(), + offset_dst.as_mut(), count, ) - .map_err(|_| vm.new_last_errno_error()) + .map_err(|e| vm.new_errno_error(e.raw_os_error(), e.to_string()).upcast()) } #[pyfunction] From 79c35759613d4cfb7b076751b411eb61166279c6 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Mon, 15 Jun 2026 05:19:01 +0300 Subject: [PATCH 092/339] Update `libregtest` to 3.14.6 (#8100) * Update `test_regrtest.py` to 3.14.6 * Update `libregrtest` * Update unittest * Unmark passing test * Remove `test_set` from env polluters * Revert "Unmark passing test" This reverts commit 82b8c1c228dd77b64903fcfa406ab2c53279a49e. * Revert "Remove `test_set` from env polluters" This reverts commit 5a4040da329c5022a4a1ba38185dbb5163ca7630. * Mark failing test --- Lib/test/libregrtest/__init__.py | 1 - Lib/test/libregrtest/cmdline.py | 54 ++++++++------- Lib/test/libregrtest/main.py | 2 +- Lib/test/libregrtest/runtests.py | 11 ++- Lib/test/libregrtest/save_env.py | 8 +-- Lib/test/libregrtest/single.py | 19 +++--- Lib/test/libregrtest/utils.py | 37 ++++++----- Lib/test/libregrtest/worker.py | 3 + Lib/test/regrtest.py | 2 +- Lib/test/test_regrtest.py | 111 ++++++++++++++++++++----------- Lib/unittest/mock.py | 4 ++ 11 files changed, 151 insertions(+), 101 deletions(-) diff --git a/Lib/test/libregrtest/__init__.py b/Lib/test/libregrtest/__init__.py index 8b1378917..e69de29bb 100644 --- a/Lib/test/libregrtest/__init__.py +++ b/Lib/test/libregrtest/__init__.py @@ -1 +0,0 @@ - diff --git a/Lib/test/libregrtest/cmdline.py b/Lib/test/libregrtest/cmdline.py index e7a12e4d0..2c404f6d8 100644 --- a/Lib/test/libregrtest/cmdline.py +++ b/Lib/test/libregrtest/cmdline.py @@ -130,6 +130,13 @@ resources to test. Currently only the following are defined: tzdata - Run tests that require timezone data. + xpickle - Test pickle and _pickle against Python 3.6, 3.7, 3.8 + and 3.9 to test backwards compatibility. These tests + may take very long to complete. + + wantobjects - Allows to run Tkinter tests with the specified value of + tkinter.wantobjects. + To enable all resources except one, use '-uall,-'. For example, to run all the tests except for the gui tests, give the option '-uall,-gui'. @@ -158,7 +165,7 @@ class Namespace(argparse.Namespace): self.randomize = False self.fromfile = None self.fail_env_changed = False - self.use_resources: list[str] = [] + self.use_resources: dict[str, str | None] = {} self.trace = False self.coverdir = 'coverage' self.runleaks = False @@ -305,7 +312,7 @@ def _create_parser(): group.add_argument('-G', '--failfast', action='store_true', help='fail as soon as a test fails (only with -v or -W)') group.add_argument('-u', '--use', metavar='RES1,RES2,...', - action='append', type=resources_list, + action='extend', type=resources_list, help='specify which special resource intensive tests ' 'to run.' + more_details) group.add_argument('-M', '--memlimit', metavar='LIMIT', @@ -410,11 +417,18 @@ def huntrleaks(string): def resources_list(string): - u = [x.lower() for x in string.split(',')] - for r in u: + u = [] + for x in string.split(','): + r, eq, v = x.partition('=') + r = r.lower() + u.append((r, v if eq else None)) if r == 'all' or r == 'none': + if eq: + raise argparse.ArgumentTypeError('invalid resource: ' + x) continue if r[0] == '-': + if eq: + raise argparse.ArgumentTypeError('invalid resource: ' + x) r = r[1:] if r not in RESOURCE_NAMES: raise argparse.ArgumentTypeError('invalid resource: ' + r) @@ -482,14 +496,14 @@ def _parse_args(args, **kwargs): # Similar to: -u "all" --timeout=1200 if ns.use is None: ns.use = [] - ns.use.insert(0, ['all']) + ns.use[:0] = [('all', None)] if ns.timeout is None: ns.timeout = 1200 # 20 minutes elif ns.fast_ci: # Similar to: -u "all,-cpu" --timeout=600 if ns.use is None: ns.use = [] - ns.use.insert(0, ['all', '-cpu']) + ns.use[:0] = [('all', None), ('-cpu', None)] if ns.timeout is None: ns.timeout = 600 # 10 minutes @@ -527,23 +541,17 @@ def _parse_args(args, **kwargs): if ns.timeout <= 0: ns.timeout = None if ns.use: - for a in ns.use: - for r in a: - if r == 'all': - ns.use_resources[:] = ALL_RESOURCES - continue - if r == 'none': - del ns.use_resources[:] - continue - remove = False - if r[0] == '-': - remove = True - r = r[1:] - if remove: - if r in ns.use_resources: - ns.use_resources.remove(r) - elif r not in ns.use_resources: - ns.use_resources.append(r) + for r, v in ns.use: + if r == 'all': + for r in ALL_RESOURCES: + ns.use_resources[r] = None + elif r == 'none': + ns.use_resources.clear() + elif r[0] == '-': + r = r[1:] + ns.use_resources.pop(r, None) + else: + ns.use_resources[r] = v if ns.random_seed is not None: ns.randomize = True if ns.no_randomize: diff --git a/Lib/test/libregrtest/main.py b/Lib/test/libregrtest/main.py index 0fc254878..d8b9605ea 100644 --- a/Lib/test/libregrtest/main.py +++ b/Lib/test/libregrtest/main.py @@ -118,7 +118,7 @@ class Regrtest: self.junit_filename: StrPath | None = ns.xmlpath self.memory_limit: str | None = ns.memlimit self.gc_threshold: int | None = ns.threshold - self.use_resources: tuple[str, ...] = tuple(ns.use_resources) + self.use_resources: dict[str, str | None] = dict(ns.use_resources) if ns.python: self.python_cmd: tuple[str, ...] | None = tuple(ns.python) else: diff --git a/Lib/test/libregrtest/runtests.py b/Lib/test/libregrtest/runtests.py index 759f24fc2..e6d34d8e6 100644 --- a/Lib/test/libregrtest/runtests.py +++ b/Lib/test/libregrtest/runtests.py @@ -96,7 +96,7 @@ class RunTests: coverage: bool memory_limit: str | None gc_threshold: int | None - use_resources: tuple[str, ...] + use_resources: dict[str, str | None] python_cmd: tuple[str, ...] | None randomize: bool random_seed: int | str @@ -179,7 +179,14 @@ class RunTests: if self.gc_threshold: args.append(f"--threshold={self.gc_threshold}") if self.use_resources: - args.extend(("-u", ','.join(self.use_resources))) + simple = ','.join(resource + for resource, value in self.use_resources.items() + if value is None) + if simple: + args.extend(("-u", simple)) + for resource, value in self.use_resources.items(): + if value is not None: + args.extend(("-u", f"{resource}={value}")) if self.python_cmd: cmd = shlex.join(self.python_cmd) args.extend(("--python", cmd)) diff --git a/Lib/test/libregrtest/save_env.py b/Lib/test/libregrtest/save_env.py index eeb1f17d7..138465012 100644 --- a/Lib/test/libregrtest/save_env.py +++ b/Lib/test/libregrtest/save_env.py @@ -227,9 +227,7 @@ class saved_test_environment: # to track reference leaks. def get_threading__dangling(self): # This copies the weakrefs without making any strong reference - # XXX: RUSTPYTHON - filter out dead threads since gc doesn't clean WeakSet. Revert this line when we have a GC - # return threading._dangling.copy() - return {t for t in threading._dangling if t.is_alive()} + return threading._dangling.copy() def restore_threading__dangling(self, saved): threading._dangling.clear() threading._dangling.update(saved) @@ -240,9 +238,7 @@ class saved_test_environment: # Unjoined process objects can survive after process exits multiprocessing_process._cleanup() # This copies the weakrefs without making any strong reference - # TODO: RUSTPYTHON - filter out dead processes since gc doesn't clean WeakSet. Revert this line when we have a GC - # return multiprocessing_process._dangling.copy() - return {p for p in multiprocessing_process._dangling if p.is_alive()} + return multiprocessing_process._dangling.copy() def restore_multiprocessing_process__dangling(self, saved): multiprocessing_process = self.get_module('multiprocessing.process') multiprocessing_process._dangling.clear() diff --git a/Lib/test/libregrtest/single.py b/Lib/test/libregrtest/single.py index 3dfb0b01d..d0759d262 100644 --- a/Lib/test/libregrtest/single.py +++ b/Lib/test/libregrtest/single.py @@ -145,7 +145,7 @@ def regrtest_runner(result: TestResult, test_func, runtests: RunTests) -> None: # Storage of uncollectable GC objects (gc.garbage) -GC_GARBAGE = [] +GC_GARBAGE: list[object] = [] def _load_run_test(result: TestResult, runtests: RunTests) -> None: @@ -172,16 +172,15 @@ def _load_run_test(result: TestResult, runtests: RunTests) -> None: remove_testfn(test_name, runtests.verbose) - # XXX: RUSTPYTHON, build a functional garbage collector into the interpreter - # if gc.garbage: - # support.environment_altered = True - # print_warning(f"{test_name} created {len(gc.garbage)} " - # f"uncollectable object(s)") + if gc.garbage: + support.environment_altered = True + print_warning(f"{test_name} created {len(gc.garbage)} " + f"uncollectable object(s)") - # # move the uncollectable objects somewhere, - # # so we don't see them again - # GC_GARBAGE.extend(gc.garbage) - # gc.garbage.clear() + # move the uncollectable objects somewhere, + # so we don't see them again + GC_GARBAGE.extend(gc.garbage) + gc.garbage.clear() support.reap_children() diff --git a/Lib/test/libregrtest/utils.py b/Lib/test/libregrtest/utils.py index d94fb84a7..15caba75a 100644 --- a/Lib/test/libregrtest/utils.py +++ b/Lib/test/libregrtest/utils.py @@ -12,7 +12,7 @@ import sys import sysconfig import tempfile import textwrap -from collections.abc import Callable, Iterable +from collections.abc import Callable from test import support from test.support import os_helper @@ -41,7 +41,7 @@ ALL_RESOURCES = ('audio', 'console', 'curses', 'largefile', 'network', # - tzdata: while needed to validate fully test_datetime, it makes # test_datetime too slow (15-20 min on some buildbots) and so is disabled by # default (see bpo-30822). -RESOURCE_NAMES = ALL_RESOURCES + ('extralargefile', 'tzdata') +RESOURCE_NAMES = ALL_RESOURCES + ('extralargefile', 'tzdata', 'xpickle', 'wantobjects') # Types for types hints @@ -150,7 +150,7 @@ def setup_unraisable_hook() -> None: sys.unraisablehook = regrtest_unraisable_hook -orig_threading_excepthook: Callable[..., None] | None = None +orig_threading_excepthook: Callable[..., object] | None = None def regrtest_threading_excepthook(args) -> None: @@ -433,12 +433,6 @@ def get_temp_dir(tmp_dir: StrPath | None = None) -> StrPath: f"unexpectedly returned {tmp_dir!r} on WASI" ) tmp_dir = os.path.join(tmp_dir, 'build') - - # When get_temp_dir() is called in a worker process, - # get_temp_dir() path is different than in the parent process - # which is not a WASI process. So the parent does not create - # the same "tmp_dir" than the test worker process. - os.makedirs(tmp_dir, exist_ok=True) else: tmp_dir = tempfile.gettempdir() @@ -588,21 +582,30 @@ def is_cross_compiled() -> bool: return ('_PYTHON_HOST_PLATFORM' in os.environ) -def format_resources(use_resources: Iterable[str]) -> str: - use_resources = set(use_resources) +def format_resources(use_resources: dict[str, str | None]) -> str: all_resources = set(ALL_RESOURCES) + values = [] + for name in sorted(use_resources): + if use_resources[name] is not None: + values.append(f'{name}={use_resources[name]}') + # Express resources relative to "all" relative_all = ['all'] - for name in sorted(all_resources - use_resources): + for name in sorted(all_resources - set(use_resources)): relative_all.append(f'-{name}') - for name in sorted(use_resources - all_resources): - relative_all.append(f'{name}') - all_text = ','.join(relative_all) + for name in sorted(set(use_resources) - all_resources): + if use_resources[name] is None: + relative_all.append(name) + all_text = ','.join(relative_all + values) all_text = f"resources: {all_text}" # List of enabled resources - text = ','.join(sorted(use_resources)) + resources = [] + for name in sorted(use_resources): + if use_resources[name] is None: + resources.append(name) + text = ','.join(resources + values) text = f"resources ({len(use_resources)}): {text}" # Pick the shortest string (prefer relative to all if lengths are equal) @@ -612,7 +615,7 @@ def format_resources(use_resources: Iterable[str]) -> str: return text -def display_header(use_resources: tuple[str, ...], +def display_header(use_resources: dict[str, str | None], python_cmd: tuple[str, ...] | None) -> None: # Print basic platform information print("==", platform.python_implementation(), *sys.version.split()) diff --git a/Lib/test/libregrtest/worker.py b/Lib/test/libregrtest/worker.py index 1ad67e1ce..4e69ab9d8 100644 --- a/Lib/test/libregrtest/worker.py +++ b/Lib/test/libregrtest/worker.py @@ -127,6 +127,9 @@ def main() -> NoReturn: worker_json = sys.argv[1] tmp_dir = get_temp_dir() + # get_temp_dir() can be different in the worker and the parent process. + # For example, if --tempdir option is used. + os.makedirs(tmp_dir, exist_ok=True) work_dir = get_work_dir(tmp_dir, worker=True) with exit_timeout(): diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py index dd61b0513..46a74fe27 100755 --- a/Lib/test/regrtest.py +++ b/Lib/test/regrtest.py @@ -8,9 +8,9 @@ Run this script with -h or --help for documentation. import os import sys - from test.libregrtest.main import main + # Alias for backward compatibility (just in case) main_in_temp_cwd = main diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py index 82939108b..85db8e14c 100644 --- a/Lib/test/test_regrtest.py +++ b/Lib/test/test_regrtest.py @@ -279,26 +279,56 @@ class ParseArgsTestCase(unittest.TestCase): for opt in '-u', '--use': with self.subTest(opt=opt): ns = self.parse_args([opt, 'gui,network']) - self.assertEqual(ns.use_resources, ['gui', 'network']) + self.assertEqual(ns.use_resources, {'gui': None, 'network': None}) + ns = self.parse_args([opt, 'gui', opt, 'network']) + self.assertEqual(ns.use_resources, {'gui': None, 'network': None}) ns = self.parse_args([opt, 'gui,none,network']) - self.assertEqual(ns.use_resources, ['network']) + self.assertEqual(ns.use_resources, {'network': None}) + ns = self.parse_args([opt, 'gui', opt, 'none', opt, 'network']) + self.assertEqual(ns.use_resources, {'network': None}) - expected = list(cmdline.ALL_RESOURCES) - expected.remove('gui') + expected = dict.fromkeys(cmdline.ALL_RESOURCES) + del expected['gui'] ns = self.parse_args([opt, 'all,-gui']) self.assertEqual(ns.use_resources, expected) + self.checkError([opt], 'expected one argument') self.checkError([opt, 'foo'], 'invalid resource') # all + a resource not part of "all" + expected = dict.fromkeys(cmdline.ALL_RESOURCES) + expected['tzdata'] = None ns = self.parse_args([opt, 'all,tzdata']) - self.assertEqual(ns.use_resources, - list(cmdline.ALL_RESOURCES) + ['tzdata']) + self.assertEqual(ns.use_resources, expected) + ns = self.parse_args([opt, 'all', opt, 'tzdata']) + self.assertEqual(ns.use_resources, expected) # test another resource which is not part of "all" ns = self.parse_args([opt, 'extralargefile']) - self.assertEqual(ns.use_resources, ['extralargefile']) + self.assertEqual(ns.use_resources, {'extralargefile': None}) + + # test resource with value + ns = self.parse_args([opt, 'xpickle=2.7']) + self.assertEqual(ns.use_resources, {'xpickle': '2.7'}) + ns = self.parse_args([opt, 'xpickle=2.7,xpickle=3.3']) + self.assertEqual(ns.use_resources, {'xpickle': '3.3'}) + ns = self.parse_args([opt, 'xpickle=2.7,none']) + self.assertEqual(ns.use_resources, {}) + ns = self.parse_args([opt, 'xpickle=2.7,-xpickle']) + self.assertEqual(ns.use_resources, {}) + + expected = dict.fromkeys(cmdline.ALL_RESOURCES) + expected['xpickle'] = '2.7' + ns = self.parse_args([opt, 'all,xpickle=2.7']) + self.assertEqual(ns.use_resources, expected) + ns = self.parse_args([opt, 'all', opt, 'xpickle=2.7']) + self.assertEqual(ns.use_resources, expected) + + # test invalid resources with value + self.checkError([opt, 'all=0'], 'invalid resource: all=0') + self.checkError([opt, 'none=0'], 'invalid resource: none=0') + self.checkError([opt, 'all,-gui=0'], 'invalid resource: -gui=0') def test_memlimit(self): for opt in '-M', '--memlimit': @@ -459,20 +489,20 @@ class ParseArgsTestCase(unittest.TestCase): self.assertTrue(regrtest.fail_env_changed) self.assertTrue(regrtest.print_slowest) self.assertEqual(regrtest.output_on_failure, output_on_failure) - self.assertEqual(sorted(regrtest.use_resources), sorted(use_resources)) + self.assertEqual(regrtest.use_resources, use_resources) return regrtest def test_fast_ci(self): args = ['--fast-ci'] - use_resources = sorted(cmdline.ALL_RESOURCES) - use_resources.remove('cpu') + use_resources = dict.fromkeys(cmdline.ALL_RESOURCES) + del use_resources['cpu'] regrtest = self.check_ci_mode(args, use_resources) self.assertEqual(regrtest.timeout, 10 * 60) def test_fast_ci_python_cmd(self): args = ['--fast-ci', '--python', 'python -X dev'] - use_resources = sorted(cmdline.ALL_RESOURCES) - use_resources.remove('cpu') + use_resources = dict.fromkeys(cmdline.ALL_RESOURCES) + del use_resources['cpu'] regrtest = self.check_ci_mode(args, use_resources, rerun=False) self.assertEqual(regrtest.timeout, 10 * 60) self.assertEqual(regrtest.python_cmd, ('python', '-X', 'dev')) @@ -480,32 +510,33 @@ class ParseArgsTestCase(unittest.TestCase): def test_fast_ci_resource(self): # it should be possible to override resources individually args = ['--fast-ci', '-u-network'] - use_resources = sorted(cmdline.ALL_RESOURCES) - use_resources.remove('cpu') - use_resources.remove('network') + use_resources = dict.fromkeys(cmdline.ALL_RESOURCES) + del use_resources['cpu'] + del use_resources['network'] self.check_ci_mode(args, use_resources) def test_fast_ci_verbose(self): args = ['--fast-ci', '--verbose'] - use_resources = sorted(cmdline.ALL_RESOURCES) - use_resources.remove('cpu') + use_resources = dict.fromkeys(cmdline.ALL_RESOURCES) + del use_resources['cpu'] regrtest = self.check_ci_mode(args, use_resources, output_on_failure=False) self.assertEqual(regrtest.verbose, True) def test_slow_ci(self): args = ['--slow-ci'] - use_resources = sorted(cmdline.ALL_RESOURCES) + use_resources = dict.fromkeys(cmdline.ALL_RESOURCES) regrtest = self.check_ci_mode(args, use_resources) self.assertEqual(regrtest.timeout, 20 * 60) def test_ci_no_randomize(self): - all_resources = set(cmdline.ALL_RESOURCES) + use_resources = dict.fromkeys(cmdline.ALL_RESOURCES) self.check_ci_mode( - ["--slow-ci", "--no-randomize"], all_resources, randomize=False + ["--slow-ci", "--no-randomize"], use_resources, randomize=False ) + del use_resources['cpu'] self.check_ci_mode( - ["--fast-ci", "--no-randomize"], all_resources - {'cpu'}, randomize=False + ["--fast-ci", "--no-randomize"], use_resources, randomize=False ) def test_dont_add_python_opts(self): @@ -2201,10 +2232,7 @@ class ArgsTestCase(BaseTestCase): self.check_executed_tests(output, tests, stats=3) def check_add_python_opts(self, option): - # --fast-ci and --slow-ci add "-u -W default -bb -E" options to Python - - # Skip test if _testinternalcapi is missing - import_helper.import_module('_testinternalcapi') + # --fast-ci and --slow-ci add "-u -W error -bb -E" options to Python code = textwrap.dedent(r""" import sys @@ -2219,25 +2247,26 @@ class ArgsTestCase(BaseTestCase): use_environment = (support.is_emscripten or support.is_wasi) class WorkerTests(unittest.TestCase): - @unittest.skipUnless(config_get is None, 'need config_get()') + @unittest.skipIf(config_get is None, 'need config_get()') def test_config(self): - config = config_get() # -u option self.assertEqual(config_get('buffered_stdio'), 0) - # -W default option - self.assertTrue(config_get('warnoptions'), ['default']) + # -W error option + self.assertEqual(config_get('warnoptions'), + ['error', 'error::BytesWarning']) # -bb option - self.assertTrue(config_get('bytes_warning'), 2) + self.assertEqual(config_get('bytes_warning'), 2) # -E option - self.assertTrue(config_get('use_environment'), use_environment) + self.assertEqual(config_get('use_environment'), use_environment) def test_python_opts(self): # -u option self.assertTrue(sys.__stdout__.write_through) self.assertTrue(sys.__stderr__.write_through) - # -W default option - self.assertTrue(sys.warnoptions, ['default']) + # -W error option + self.assertEqual(sys.warnoptions, + ['error', 'error::BytesWarning']) # -bb option self.assertEqual(sys.flags.bytes_warning, 2) @@ -2256,9 +2285,11 @@ class ArgsTestCase(BaseTestCase): proc = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, - text=True) + text=True, + env=support.make_clean_env()) self.assertEqual(proc.returncode, 0, proc) + @unittest.expectedFailure # TODO: RUSTPYTHON def test_add_python_opts(self): for opt in ("--fast-ci", "--slow-ci"): with self.subTest(opt=opt): @@ -2445,20 +2476,20 @@ class TestUtils(unittest.TestCase): format_resources = utils.format_resources ALL_RESOURCES = utils.ALL_RESOURCES self.assertEqual( - format_resources(("network",)), + format_resources({"network": None}), 'resources (1): network') self.assertEqual( - format_resources(("audio", "decimal", "network")), + format_resources(dict.fromkeys(("audio", "decimal", "network"))), 'resources (3): audio,decimal,network') self.assertEqual( - format_resources(ALL_RESOURCES), + format_resources(dict.fromkeys(ALL_RESOURCES)), 'resources: all') self.assertEqual( - format_resources(tuple(name for name in ALL_RESOURCES - if name != "cpu")), + format_resources({name: None for name in ALL_RESOURCES + if name != "cpu"}), 'resources: all,-cpu') self.assertEqual( - format_resources((*ALL_RESOURCES, "tzdata")), + format_resources({**dict.fromkeys(ALL_RESOURCES), "tzdata": None}), 'resources: all,tzdata') def test_match_test(self): diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py index 92b81d158..5a8fccf59 100644 --- a/Lib/unittest/mock.py +++ b/Lib/unittest/mock.py @@ -3121,6 +3121,10 @@ class ThreadingMixin(Base): return ret_value + def _increment_mock_call(self, /, *args, **kwargs): + with self._mock_calls_events_lock: + super()._increment_mock_call(*args, **kwargs) + def wait_until_called(self, *, timeout=_timeout_unset): """Wait until the mock object is called. From 4da8a1f1d38105c6c09bb00c643d1e20401b9ad5 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Mon, 15 Jun 2026 05:19:40 +0300 Subject: [PATCH 093/339] Update `xml` to 3.14.6 (#8101) * Update `xml` to 3.14.6 * Update tests * mark failing tests * Align patches --- Lib/test/test_pyexpat.py | 226 ++++++++++++++++++++++++++++++++++- Lib/test/test_xml_etree.py | 79 +++++++++--- Lib/test/test_xmlrpc.py | 11 ++ Lib/xml/etree/ElementTree.py | 96 +++++++++------ Lib/xmlrpc/client.py | 2 +- 5 files changed, 358 insertions(+), 56 deletions(-) diff --git a/Lib/test/test_pyexpat.py b/Lib/test/test_pyexpat.py index afb83d2d9..682abc520 100644 --- a/Lib/test/test_pyexpat.py +++ b/Lib/test/test_pyexpat.py @@ -228,9 +228,9 @@ class ParseTest(unittest.TestCase): "Character data: '\xb5'", "End element: 'root'", ] - for operation, expected_operation in zip(operations, expected_operations): - self.assertEqual(operation, expected_operation) + self.assertEqual(operations, expected_operations) + @unittest.expectedFailure # TODO: RUSTPYTHON def test_parse_bytes(self): out = self.Outputter() parser = expat.ParserCreate(namespace_separator='!') @@ -243,6 +243,7 @@ class ParseTest(unittest.TestCase): # Issue #6697. self.assertRaises(AttributeError, getattr, parser, '\uD800') + @unittest.expectedFailure # TODO: RUSTPYTHON def test_parse_str(self): out = self.Outputter() parser = expat.ParserCreate(namespace_separator='!') @@ -253,6 +254,7 @@ class ParseTest(unittest.TestCase): operations = out.out self._verify_parse_output(operations) + @unittest.expectedFailure # TODO: RUSTPYTHON def test_parse_file(self): # Try parsing a file out = self.Outputter() @@ -278,6 +280,126 @@ class ParseTest(unittest.TestCase): self.assertEqual(expat.ErrorString(cm.exception.code), expat.errors.XML_ERROR_FINISHED) + @unittest.expectedFailure # TODO: RUSTPYTHON + @support.subTests('encoding', [ + 'utf-8', 'utf-16', 'utf-16be', 'utf-16le', + 'iso8859-1', 'iso8859-2', 'iso8859-3', 'iso8859-4', 'iso8859-5', + 'iso8859-6', 'iso8859-7', 'iso8859-8', 'iso8859-9', 'iso8859-10', + 'iso8859-13', 'iso8859-14', 'iso8859-15', 'iso8859-16', + 'cp437', 'cp720', 'cp737', 'cp775', 'cp850', 'cp852', + 'cp855', 'cp856', 'cp857', 'cp858', 'cp860', 'cp861', 'cp862', + 'cp863', 'cp865', 'cp866', 'cp869', 'cp874', 'cp1006', 'cp1125', + 'cp1250', 'cp1251', 'cp1252', 'cp1253', 'cp1254', 'cp1255', + 'cp1256', 'cp1257', 'cp1258', + 'mac-cyrillic', 'mac-greek', 'mac-iceland', 'mac-latin2', + 'mac-roman', 'mac-turkish', + 'koi8-r', 'koi8-t', 'koi8-u', 'kz1048', 'ptcp154', + ]) + def test_supported_encodings(self, encoding): + out = self.Outputter() + parser = expat.ParserCreate() + self._hookup_callbacks(parser, out) + c = 'éπя\u05d0\u060c€'.encode(encoding, 'ignore').decode(encoding)[0] + data = (f'\n' + f'{c}').encode(encoding) + parser.Parse(data, True) + self.assertEqual(out.out, [ + ('XML declaration', ('1.0', encoding, -1)), + "Start element: 'root' {}", + f'Character data: {c!r}', + "End element: 'root'", + ]) + + @unittest.expectedFailure # TODO: RUSTPYTHON + @support.subTests('encoding', [ + 'UTF-8', 'utf-8', 'utf-16', 'utf-16le', 'utf-16be', + 'koi8-u', 'cp1125', 'cp1251', 'iso8859-5', 'mac-cyrillic', + ]) + def test_supported_encodings2(self, encoding): + out = self.Outputter() + parser = expat.ParserCreate() + self._hookup_callbacks(parser, out) + data = (f'\n' + '' + '<корінь атрибут="значення">зміст').encode(encoding) + parser.Parse(data, True) + self.assertEqual(out.out, [ + ('XML declaration', ('1.0', encoding, -1)), + "Comment: ' коментар '", + "Start element: 'корінь' {'атрибут': 'значення'}", + "Character data: 'зміст'", + "End element: 'корінь'", + ]) + + @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: ValueError not raised + @support.subTests('encoding', [ + 'UTF-7', + "Big5-HKSCS", "Big5", + "cp932", "cp949", "cp950", + "EUC_JIS-2004", "EUC_JISX0213", "EUC-JP", "EUC-KR", + "GB18030", "GB2312", "GBK", + "ISO-2022-KR", + "johab", + "Shift_JIS", "Shift_JIS-2004", "Shift_JISX0213", + ]) + def test_unsupported_encodings(self, encoding): + parser = expat.ParserCreate() + data = (f'\n' + '').encode(encoding) + with self.assertRaises(ValueError): + parser.Parse(data, True) + + parser = expat.ParserCreate() + data = (f'\n' + '').encode() + with self.assertRaises(ValueError): + parser.Parse(data, True) + + @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: ExpatError not raised + @support.subTests('encoding', [ + 'cp037', 'cp273', 'cp424', 'cp500', 'cp864', 'cp875', + 'cp1026', 'cp1140', + 'mac_arabic', 'mac_farsi', + ]) + def test_incompatible_encodings(self, encoding): + parser = expat.ParserCreate() + data = (f'\n' + '').encode(encoding) + with self.assertRaises(expat.ExpatError): + parser.Parse(data, True) + + parser = expat.ParserCreate() + data = (f'\n' + '').encode() + with self.assertRaisesRegex(expat.ExpatError, 'unknown encoding'): + parser.Parse(data, True) + + @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: LookupError not raised + @support.subTests('encoding', [ + 'hex_codec', 'rot_13', + ]) + def test_non_text_encodings(self, encoding): + parser = expat.ParserCreate() + data = (f'\n' + '').encode() + with self.assertRaises(LookupError): + parser.Parse(data, True) + + @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: UnicodeError not raised + def test_undefined_encoding(self): + parser = expat.ParserCreate() + data = b'\n' + with self.assertRaises(UnicodeError): + parser.Parse(data, True) + + @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: LookupError not raised + def test_unknown_encoding(self): + parser = expat.ParserCreate() + data = b'\n' + with self.assertRaises(LookupError): + parser.Parse(data, True) + + class NamespaceSeparatorTest(unittest.TestCase): def test_legal(self): # Tests that make sure we get errors when the namespace_separator value @@ -688,6 +810,20 @@ class ChardataBufferTest(unittest.TestCase): parser.Parse(xml2, True) self.assertEqual(self.n, 4) + @support.requires_resource('cpu') + @support.requires_resource('walltime') + @support.bigmemtest(size=2**31, memuse=4, dry_run=False) + def test_large_character_data_does_not_crash(self): + # See https://github.com/python/cpython/issues/148441 + parser = expat.ParserCreate() + parser.buffer_text = True + parser.buffer_size = 2**31 - 1 # INT_MAX + N = 2049 * (1 << 20) - 3 # Character data greater than INT_MAX + self.assertGreater(N, parser.buffer_size) + parser.CharacterDataHandler = lambda text: None + xml_data = b"" + b"A" * N + b"" + self.assertEqual(parser.Parse(xml_data, True), 1) + class ElementDeclHandlerTest(unittest.TestCase): @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: TypeError not raised by Parse def test_trigger_leak(self): @@ -1087,6 +1223,92 @@ class AttackProtectionTestBase(abc.ABC): self.assert_root_parser_failure(setter, 123.45) +@unittest.skipIf(expat.version_info < (2, 4, 0), "requires Expat >= 2.4.0") +class ExpansionProtectionTest(AttackProtectionTestBase, unittest.TestCase): + + def assert_rejected(self, func, /, *args, **kwargs): + """Check that func(*args, **kwargs) hits the allocation limit.""" + msg = ( + r"limit on input amplification factor \(from DTD and entities\) " + r"breached: line \d+, column \d+" + ) + self.assertRaisesRegex(expat.ExpatError, msg, func, *args, **kwargs) + + def set_activation_threshold(self, parser, threshold): + return parser.SetBillionLaughsAttackProtectionActivationThreshold(threshold) + + def set_maximum_amplification(self, parser, max_factor): + return parser.SetBillionLaughsAttackProtectionMaximumAmplification(max_factor) + + @unittest.expectedFailure # TODO: RUSTPYTHON; AttributeError: 'xmlparser' object has no attribute 'SetBillionLaughsAttackProtectionMaximumAmplification' + def test_set_activation_threshold__threshold_reached(self): + parser = expat.ParserCreate() + # Choose a threshold expected to be always reached. + self.set_activation_threshold(parser, 3) + # Check that the threshold is reached by choosing a small factor + # and a payload whose peak amplification factor exceeds it. + self.assertIsNone(self.set_maximum_amplification(parser, 1.0)) + payload = self.exponential_expansion_payload(ncols=10, nrows=4) + self.assert_rejected(parser.Parse, payload, True) + + @unittest.expectedFailure # TODO: RUSTPYTHON; AttributeError: 'xmlparser' object has no attribute 'SetBillionLaughsAttackProtectionMaximumAmplification' + def test_set_activation_threshold__threshold_not_reached(self): + parser = expat.ParserCreate() + # Choose a threshold expected to be never reached. + self.set_activation_threshold(parser, pow(10, 5)) + # Check that the threshold is reached by choosing a small factor + # and a payload whose peak amplification factor exceeds it. + self.assertIsNone(self.set_maximum_amplification(parser, 1.0)) + payload = self.exponential_expansion_payload(ncols=10, nrows=4) + self.assertIsNotNone(parser.Parse(payload, True)) + + @unittest.expectedFailure # TODO: RUSTPYTHON; AttributeError: 'xmlparser' object has no attribute 'SetBillionLaughsAttackProtectionMaximumAmplification' + def test_set_maximum_amplification__amplification_exceeded(self): + parser = expat.ParserCreate() + # Unconditionally enable maximum activation factor. + self.set_activation_threshold(parser, 0) + # Choose a max amplification factor expected to always be exceeded. + self.assertIsNone(self.set_maximum_amplification(parser, 1.0)) + # Craft a payload for which the peak amplification factor is > 1.0. + payload = self.exponential_expansion_payload(ncols=1, nrows=2) + self.assert_rejected(parser.Parse, payload, True) + + @unittest.expectedFailure # TODO: RUSTPYTHON; AttributeError: 'xmlparser' object has no attribute 'SetBillionLaughsAttackProtectionMaximumAmplification' + def test_set_maximum_amplification__amplification_not_exceeded(self): + parser = expat.ParserCreate() + # Unconditionally enable maximum activation factor. + self.set_activation_threshold(parser, 0) + # Choose a max amplification factor expected to never be exceeded. + self.assertIsNone(self.set_maximum_amplification(parser, 1e4)) + # Craft a payload for which the peak amplification factor is < 1e4. + payload = self.exponential_expansion_payload(ncols=1, nrows=2) + self.assertIsNotNone(parser.Parse(payload, True)) + + @unittest.expectedFailure # TODO: RUSTPYTHON; AttributeError: 'xmlparser' object has no attribute 'SetBillionLaughsAttackProtectionMaximumAmplification' + def test_set_activation_threshold__fail_for_subparser(self): + return super().test_set_activation_threshold__fail_for_subparser() + + @unittest.expectedFailure # TODO: RUSTPYTHON; AttributeError: 'xmlparser' object has no attribute 'SetBillionLaughsAttackProtectionMaximumAmplification' + def test_set_activation_threshold__invalid_threshold_type(self): + return super().test_set_activation_threshold__invalid_threshold_type() + + @unittest.expectedFailure # TODO: RUSTPYTHON; AttributeError: 'xmlparser' object has no attribute 'SetBillionLaughsAttackProtectionMaximumAmplification' + def test_set_maximum_amplification__fail_for_subparser(self): + return super().test_set_maximum_amplification__fail_for_subparser() + + @unittest.expectedFailure # TODO: RUSTPYTHON; AttributeError: 'xmlparser' object has no attribute 'SetBillionLaughsAttackProtectionMaximumAmplification' + def test_set_maximum_amplification__infinity(self): + return super().test_set_maximum_amplification__infinity() + + @unittest.expectedFailure # TODO: RUSTPYTHON; AttributeError: 'xmlparser' object has no attribute 'SetBillionLaughsAttackProtectionMaximumAmplification' + def test_set_maximum_amplification__invalid_max_factor_range(self): + return super().test_set_maximum_amplification__invalid_max_factor_range() + + @unittest.expectedFailure # TODO: RUSTPYTHON; AttributeError: 'xmlparser' object has no attribute 'SetBillionLaughsAttackProtectionMaximumAmplification' + def test_set_maximum_amplification__invalid_max_factor_type(self): + return super().test_set_maximum_amplification__invalid_max_factor_type() + + @unittest.skipIf(not hasattr(expat.XMLParserType, "SetAllocTrackerMaximumAmplification"), "requires Python compiled with Expat >= 2.7.2") diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py index 43db6c9b4..6a75126f2 100644 --- a/Lib/test/test_xml_etree.py +++ b/Lib/test/test_xml_etree.py @@ -982,12 +982,12 @@ class ElementTreeTest(unittest.TestCase): check("cp437", '\u221a') check("mac-roman", '\u02da') - def xml(encoding): - return "" % encoding - def bxml(encoding): - return xml(encoding).encode(encoding) + def xml(encoding, body=''): + return "%s" % (encoding, body) + def bxml(encoding, body=''): + return xml(encoding, body).encode(encoding) supported_encodings = [ - 'ascii', 'utf-8', 'utf-8-sig', 'utf-16', 'utf-16be', 'utf-16le', + 'utf-8', 'utf-16', 'utf-16be', 'utf-16le', 'iso8859-1', 'iso8859-2', 'iso8859-3', 'iso8859-4', 'iso8859-5', 'iso8859-6', 'iso8859-7', 'iso8859-8', 'iso8859-9', 'iso8859-10', 'iso8859-13', 'iso8859-14', 'iso8859-15', 'iso8859-16', @@ -998,13 +998,14 @@ class ElementTreeTest(unittest.TestCase): 'cp1256', 'cp1257', 'cp1258', 'mac-cyrillic', 'mac-greek', 'mac-iceland', 'mac-latin2', 'mac-roman', 'mac-turkish', - 'iso2022-jp', 'iso2022-jp-1', 'iso2022-jp-2', 'iso2022-jp-2004', - 'iso2022-jp-3', 'iso2022-jp-ext', - 'koi8-r', 'koi8-t', 'koi8-u', 'kz1048', - 'hz', 'ptcp154', + 'koi8-r', 'koi8-t', 'koi8-u', 'kz1048', 'ptcp154', ] for encoding in supported_encodings: - self.assertEqual(ET.tostring(ET.XML(bxml(encoding))), b'') + with self.subTest(encoding=encoding): + self.assertEqual(ET.tostring(ET.XML(bxml(encoding))), b'') + c = 'éπя\u05d0\u060c€'.encode(encoding, 'ignore').decode(encoding)[0] + self.assertEqual(ET.tostring(ET.XML(bxml(encoding, c))), + ('&#%d;' % ord(c)).encode()) unsupported_ascii_compatible_encodings = [ 'big5', 'big5hkscs', @@ -1016,14 +1017,16 @@ class ElementTreeTest(unittest.TestCase): 'utf-7', ] for encoding in unsupported_ascii_compatible_encodings: - self.assertRaises(ValueError, ET.XML, bxml(encoding)) + with self.subTest(encoding=encoding): + self.assertRaises(ValueError, ET.XML, bxml(encoding)) unsupported_ascii_incompatible_encodings = [ 'cp037', 'cp424', 'cp500', 'cp864', 'cp875', 'cp1026', 'cp1140', 'utf_32', 'utf_32_be', 'utf_32_le', ] for encoding in unsupported_ascii_incompatible_encodings: - self.assertRaises(ET.ParseError, ET.XML, bxml(encoding)) + with self.subTest(encoding=encoding): + self.assertRaises(ET.ParseError, ET.XML, bxml(encoding)) self.assertRaises(ValueError, ET.XML, xml('undefined').encode('ascii')) self.assertRaises(LookupError, ET.XML, xml('xxx').encode('ascii')) @@ -1253,7 +1256,12 @@ class ElementTreeTest(unittest.TestCase): {'': 'http://www.w3.org/2001/XMLSchema', 'ns': 'http://www.w3.org/2001/XMLSchema'}) - def test_processinginstruction(self): + def test_comment_serialization(self): + comm = ET.Comment(' & ham') + # comments are not escaped + self.assertEqual(ET.tostring(comm), b'') + + def test_processinginstruction_serialization(self): # Test ProcessingInstruction directly self.assertEqual(ET.tostring(ET.ProcessingInstruction('test', 'instruction')), @@ -1262,13 +1270,22 @@ class ElementTreeTest(unittest.TestCase): b'') # Issue #2746 - + # processing instructions are not escaped self.assertEqual(ET.tostring(ET.PI('test', '')), b'?>') self.assertEqual(ET.tostring(ET.PI('test', '\xe3'), 'latin-1'), b"\n" b"\xe3?>") + @support.subTests('tag', ("script", "style", "xmp", "iframe", "noembed", "noframes")) + def test_html_cdata_elems_serialization(self, tag): + # content of raw text elements is not escaped in html + tag = tag.title() + elem = ET.Element(tag) + elem.text = '&ham' + self.assertEqual(ET.tostring(elem, method='html'), + ('<%s>&ham' % (tag, tag)).encode()) + def test_html_empty_elems_serialization(self): # issue 15970 # from http://www.w3.org/TR/html401/index/elements.html @@ -1283,6 +1300,14 @@ class ElementTreeTest(unittest.TestCase): method='html') self.assertEqual(serialized, expected) + def test_html_plaintext_serialization(self): + # content of plaintext is not escaped in html + # no end tag for plaintext + elem = ET.Element('PlainText') + elem.text = '&ham' + self.assertEqual(ET.tostring(elem, method='html'), + b'<spam>&ham') + def test_dump_attribute_order(self): # See BPO 34160 e = ET.Element('cirriculum', status='public', company='example') @@ -3613,6 +3638,32 @@ class ElementIterTest(unittest.TestCase): doc = ET.XML("<root>a&amp;<sub>b&amp;</sub>c&amp;</root>") self.assertEqual(''.join(doc.itertext()), 'a&b&c&') + def test_comment(self): + e = ET.Element('root') + e.text = 'before' + comment = ET.Comment('comment') + self.assertEqual(comment.text, 'comment') + comment.tail = 'after' + e.append(comment) + self.assertEqual(''.join(e.itertext()), 'beforeafter') + self.assertEqual(list(e.iter()), [e, comment]) + self.assertEqual(list(e.iter('root')), [e]) + self.assertEqual(''.join(comment.itertext()), '') + self.assertEqual(list(comment.iter()), [comment]) + + def test_processinginstruction(self): + e = ET.Element('root') + e.text = 'before' + pi = ET.PI('test', 'instruction') + self.assertEqual(pi.text, 'test instruction') + pi.tail = 'after' + e.append(pi) + self.assertEqual(''.join(e.itertext()), 'beforeafter') + self.assertEqual(list(e.iter()), [e, pi]) + self.assertEqual(list(e.iter('root')), [e]) + self.assertEqual(''.join(pi.itertext()), '') + self.assertEqual(list(pi.iter()), [pi]) + def test_corners(self): # single root, no subelements a = ET.Element('a') diff --git a/Lib/test/test_xmlrpc.py b/Lib/test/test_xmlrpc.py index bb2a1ef09..8696cfa51 100644 --- a/Lib/test/test_xmlrpc.py +++ b/Lib/test/test_xmlrpc.py @@ -209,6 +209,17 @@ class XMLRPCTestCase(unittest.TestCase): self.assertEqual(xmlrpclib.loads(strg)[0][0], value) self.assertEqual(xmlrpclib.loads(strg)[1], methodname) + def test_dump_escape_methodname(self): + payload = 'foo</methodName><injected attr="evil"/><methodName>bar' + s = xmlrpclib.dumps((), methodname=payload) + self.assertIn( + '<methodName>foo&lt;/methodName&gt;&lt;injected attr="evil"/&gt;' + '&lt;methodName&gt;bar</methodName>', s + ) + self.assertNotIn('<injected attr="evil"/>', s) + load, m = xmlrpclib.loads(s) + self.assertEqual(m, payload) + def test_dump_bytes(self): sample = b"my dog has fleas" self.assertEqual(sample, xmlrpclib.Binary(sample)) diff --git a/Lib/xml/etree/ElementTree.py b/Lib/xml/etree/ElementTree.py index dafe5b1b8..0a4203d37 100644 --- a/Lib/xml/etree/ElementTree.py +++ b/Lib/xml/etree/ElementTree.py @@ -8,8 +8,8 @@ 2. Element represents a single node in this tree. Interactions with the whole document (reading and writing to/from files) are - usually done on the ElementTree level. Interactions with a single XML element - and its sub-elements are done on the Element level. + usually done on the ElementTree level. Interactions with a single XML + element and its sub-elements are done on the Element level. Element is a flexible container object designed to store hierarchical data structures in memory. It can be described as a cross between a list and a @@ -277,7 +277,8 @@ class Element: """Find first matching element by tag name or path. *path* is a string having either an element tag or an XPath, - *namespaces* is an optional mapping from namespace prefix to full name. + *namespaces* is an optional mapping from namespace prefix to full + name. Return the first matching element, or None if no element was found. @@ -289,7 +290,8 @@ class Element: *path* is a string having either an element tag or an XPath, *default* is the value to return if the element was not found, - *namespaces* is an optional mapping from namespace prefix to full name. + *namespaces* is an optional mapping from namespace prefix to full + name. Return text content of first matching element, or default value if none was found. Note that if an element is found having no text @@ -302,7 +304,8 @@ class Element: """Find all matching subelements by tag name or path. *path* is a string having either an element tag or an XPath, - *namespaces* is an optional mapping from namespace prefix to full name. + *namespaces* is an optional mapping from namespace prefix to full + name. Returns list containing all matching elements in document order. @@ -313,7 +316,8 @@ class Element: """Find all matching subelements by tag name or path. *path* is a string having either an element tag or an XPath, - *namespaces* is an optional mapping from namespace prefix to full name. + *namespaces* is an optional mapping from namespace prefix to full + name. Return an iterable yielding all matching elements in document order. @@ -553,8 +557,8 @@ class ElementTree: def parse(self, source, parser=None): """Load external XML document into element tree. - *source* is a file name or file object, *parser* is an optional parser - instance that defaults to XMLParser. + *source* is a file name or file object, *parser* is an optional + parser instance that defaults to XMLParser. ParseError is raised if the parser fails to parse the document. @@ -587,7 +591,8 @@ class ElementTree: def iter(self, tag=None): """Create and return tree iterator for the root element. - The iterator loops over all elements in this tree, in document order. + The iterator loops over all elements in this tree, in document + order. *tag* is a string with the tag name to iterate over (default is to return all elements). @@ -602,7 +607,8 @@ class ElementTree: Same as getroot().find(path), which is Element.find() *path* is a string having either an element tag or an XPath, - *namespaces* is an optional mapping from namespace prefix to full name. + *namespaces* is an optional mapping from namespace prefix to full + name. Return the first matching element, or None if no element was found. @@ -624,7 +630,8 @@ class ElementTree: Same as getroot().findtext(path), which is Element.findtext() *path* is a string having either an element tag or an XPath, - *namespaces* is an optional mapping from namespace prefix to full name. + *namespaces* is an optional mapping from namespace prefix to full + name. Return the first matching element, or None if no element was found. @@ -646,7 +653,8 @@ class ElementTree: Same as getroot().findall(path), which is Element.findall(). *path* is a string having either an element tag or an XPath, - *namespaces* is an optional mapping from namespace prefix to full name. + *namespaces* is an optional mapping from namespace prefix to full + name. Return list containing all matching elements in document order. @@ -693,24 +701,26 @@ class ElementTree: """Write element tree to a file as XML. Arguments: - *file_or_filename* -- file name or a file object opened for writing + *file_or_filename* -- file name or a file object opened for + writing *encoding* -- the output encoding (default: US-ASCII) - *xml_declaration* -- bool indicating if an XML declaration should be - added to the output. If None, an XML declaration - is added if encoding IS NOT either of: - US-ASCII, UTF-8, or Unicode + *xml_declaration* -- bool indicating if an XML declaration should + be added to the output. If None, an XML + declaration is added if encoding IS NOT + either of: US-ASCII, UTF-8, or Unicode - *default_namespace* -- sets the default XML namespace (for "xmlns") + *default_namespace* -- sets the default XML namespace (for + "xmlns") *method* -- either "xml" (default), "html, "text", or "c14n" *short_empty_elements* -- controls the formatting of elements - that contain no content. If True (default) - they are emitted as a single self-closed - tag, otherwise they are emitted as a pair - of start/end tags + that contain no content. If True + (default) they are emitted as a single + self-closed tag, otherwise they are + emitted as a pair of start/end tags """ if self._root is None: @@ -907,9 +917,12 @@ def _serialize_xml(write, elem, qnames, namespaces, if elem.tail: write(_escape_cdata(elem.tail)) +_CDATA_CONTENT_ELEMENTS = {"script", "style", "xmp", "iframe", "noembed", + "noframes", "plaintext"} + HTML_EMPTY = {"area", "base", "basefont", "br", "col", "embed", "frame", "hr", "img", "input", "isindex", "link", "meta", "param", "source", - "track", "wbr"} + "track", "wbr", "plaintext"} def _serialize_html(write, elem, qnames, namespaces, **kwargs): tag = elem.tag @@ -950,7 +963,7 @@ def _serialize_html(write, elem, qnames, namespaces, **kwargs): write(">") ltag = tag.lower() if text: - if ltag == "script" or ltag == "style": + if ltag in _CDATA_CONTENT_ELEMENTS: write(text) else: write(_escape_cdata(text)) @@ -1083,9 +1096,9 @@ def tostring(element, encoding=None, method=None, *, is returned. Otherwise a bytestring is returned. *element* is an Element instance, *encoding* is an optional output - encoding defaulting to US-ASCII, *method* is an optional output which can - be one of "xml" (default), "html", "text" or "c14n", *default_namespace* - sets the default XML namespace (for "xmlns"). + encoding defaulting to US-ASCII, *method* is an optional output which + can be one of "xml" (default), "html", "text" or "c14n", + *default_namespace* sets the default XML namespace (for "xmlns"). Returns an (optionally) encoded string containing the XML data. @@ -1225,7 +1238,8 @@ def iterparse(source, events=None, parser=None): "end" events are reported. *source* is a filename or file object containing XML data, *events* is - a list of events to report back, *parser* is an optional parser instance. + a list of events to report back, *parser* is an optional parser + instance. Returns an iterator providing (event, elem) pairs. @@ -1757,10 +1771,11 @@ class XMLParser: def canonicalize(xml_data=None, *, out=None, from_file=None, **options): """Convert XML to its C14N 2.0 serialised form. - If *out* is provided, it must be a file or file-like object that receives - the serialised canonical XML output (text, not bytes) through its ``.write()`` - method. To write to a file, open it in text mode with encoding "utf-8". - If *out* is not provided, this function returns the output as text string. + If *out* is provided, it must be a file or file-like object that + receives the serialised canonical XML output (text, not bytes) through + its ``.write()`` method. To write to a file, open it in text mode with + encoding "utf-8". If *out* is not provided, this function returns the + output as text string. Either *xml_data* (an XML string) or *from_file* (a file path or file-like object) must be provided as input. @@ -1794,19 +1809,22 @@ class C14NWriterTarget: Serialises parse events to XML C14N 2.0. The *write* function is used for writing out the resulting data stream - as text (not bytes). To write to a file, open it in text mode with encoding - "utf-8" and pass its ``.write`` method. + as text (not bytes). To write to a file, open it in text mode with + encoding "utf-8" and pass its ``.write`` method. Configuration options: - *with_comments*: set to true to include comments - - *strip_text*: set to true to strip whitespace before and after text content - - *rewrite_prefixes*: set to true to replace namespace prefixes by "n{number}" + - *strip_text*: set to true to strip whitespace before and after text + content + - *rewrite_prefixes*: set to true to replace namespace prefixes by + "n{number}" - *qname_aware_tags*: a set of qname aware tag names in which prefixes should be replaced in text content - - *qname_aware_attrs*: a set of qname aware attribute names in which prefixes - should be replaced in text content - - *exclude_attrs*: a set of attribute names that should not be serialised + - *qname_aware_attrs*: a set of qname aware attribute names in which + prefixes should be replaced in text content + - *exclude_attrs*: a set of attribute names that should not be + serialised - *exclude_tags*: a set of tag names that should not be serialised """ def __init__(self, write, *, diff --git a/Lib/xmlrpc/client.py b/Lib/xmlrpc/client.py index f441376d0..84e4e4d11 100644 --- a/Lib/xmlrpc/client.py +++ b/Lib/xmlrpc/client.py @@ -965,7 +965,7 @@ def dumps(params, methodname=None, methodresponse=None, encoding=None, data = ( xmlheader, "<methodCall>\n" - "<methodName>", methodname, "</methodName>\n", + "<methodName>", escape(methodname), "</methodName>\n", data, "</methodCall>\n" ) From a1355939d271d291b668eff46264272375175cbd Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Mon, 15 Jun 2026 05:20:13 +0300 Subject: [PATCH 094/339] Update some libs to 3.14.6 (#8102) --- Lib/test/test_fcntl.py | 121 ++++++++------ Lib/test/test_ioctl.py | 220 +++++++++++++++++++------ Lib/test/test_pstats.py | 4 +- Lib/test/test_tomllib/test_misc.py | 13 ++ Lib/test/test_type_annotations.py | 7 + Lib/test/test_venv.py | 20 +++ Lib/test/test_zipfile/test_core.py | 58 ++++--- Lib/tkinter/__init__.py | 256 ++++++++++++++++------------- Lib/tkinter/scrolledtext.py | 2 +- Lib/tkinter/ttk.py | 7 +- Lib/tomllib/_parser.py | 14 +- Lib/tomllib/mypy.ini | 2 - Lib/traceback.py | 19 +-- Lib/types.py | 21 +-- Lib/typing.py | 124 +++++++------- Lib/venv/scripts/common/activate | 4 +- Lib/zipfile/__init__.py | 64 ++++---- 17 files changed, 603 insertions(+), 353 deletions(-) diff --git a/Lib/test/test_fcntl.py b/Lib/test/test_fcntl.py index 7dab597a9..9f1e2e250 100644 --- a/Lib/test/test_fcntl.py +++ b/Lib/test/test_fcntl.py @@ -1,14 +1,17 @@ """Test program for the fcntl C module. """ +import errno +import multiprocessing import platform import os import struct import sys import unittest -from multiprocessing import Process -from test.support import verbose, cpython_only +from test.support import ( + cpython_only, get_pagesize, is_apple, requires_subprocess, verbose, is_emscripten +) from test.support.import_helper import import_module -from test.support.os_helper import TESTFN, unlink +from test.support.os_helper import TESTFN, unlink, make_bad_fd # Skip test if no fcntl module. @@ -16,37 +19,6 @@ fcntl = import_module('fcntl') -def get_lockdata(): - try: - os.O_LARGEFILE - except AttributeError: - start_len = "ll" - else: - start_len = "qq" - - if (sys.platform.startswith(('netbsd', 'freebsd', 'openbsd')) - or sys.platform == 'darwin'): - if struct.calcsize('l') == 8: - off_t = 'l' - pid_t = 'i' - else: - off_t = 'lxxxx' - pid_t = 'l' - lockdata = struct.pack(off_t + off_t + pid_t + 'hh', 0, 0, 0, - fcntl.F_WRLCK, 0) - elif sys.platform.startswith('gnukfreebsd'): - lockdata = struct.pack('qqihhi', 0, 0, 0, fcntl.F_WRLCK, 0, 0) - elif sys.platform in ['hp-uxB', 'unixware7']: - lockdata = struct.pack('hhlllii', fcntl.F_WRLCK, 0, 0, 0, 0, 0, 0) - else: - lockdata = struct.pack('hh'+start_len+'hh', fcntl.F_WRLCK, 0, 0, 0, 0, 0) - if lockdata: - if verbose: - print('struct.pack: ', repr(lockdata)) - return lockdata - -lockdata = get_lockdata() - class BadFile: def __init__(self, fn): self.fn = fn @@ -78,12 +50,45 @@ class TestFcntl(unittest.TestCase): self.f.close() unlink(TESTFN) + @staticmethod + def get_lockdata(): + try: + os.O_LARGEFILE + except AttributeError: + start_len = "ll" + else: + start_len = "qq" + + if ( + sys.platform.startswith(('netbsd', 'freebsd', 'openbsd')) + or is_apple + ): + if struct.calcsize('l') == 8: + off_t = 'l' + pid_t = 'i' + else: + off_t = 'lxxxx' + pid_t = 'l' + lockdata = struct.pack(off_t + off_t + pid_t + 'hh', 0, 0, 0, + fcntl.F_WRLCK, 0) + elif sys.platform.startswith('gnukfreebsd'): + lockdata = struct.pack('qqihhi', 0, 0, 0, fcntl.F_WRLCK, 0, 0) + elif sys.platform in ['hp-uxB', 'unixware7']: + lockdata = struct.pack('hhlllii', fcntl.F_WRLCK, 0, 0, 0, 0, 0, 0) + else: + lockdata = struct.pack('hh'+start_len+'hh', fcntl.F_WRLCK, 0, 0, 0, 0, 0) + if lockdata: + if verbose: + print('struct.pack: ', repr(lockdata)) + return lockdata + def test_fcntl_fileno(self): # the example from the library docs self.f = open(TESTFN, 'wb') rv = fcntl.fcntl(self.f.fileno(), fcntl.F_SETFL, os.O_NONBLOCK) if verbose: print('Status from fcntl with O_NONBLOCK: ', rv) + lockdata = self.get_lockdata() rv = fcntl.fcntl(self.f.fileno(), fcntl.F_SETLKW, lockdata) if verbose: print('String from fcntl with F_SETLKW: ', repr(rv)) @@ -95,6 +100,7 @@ class TestFcntl(unittest.TestCase): rv = fcntl.fcntl(self.f, fcntl.F_SETFL, os.O_NONBLOCK) if verbose: print('Status from fcntl with O_NONBLOCK: ', rv) + lockdata = self.get_lockdata() rv = fcntl.fcntl(self.f, fcntl.F_SETLKW, lockdata) if verbose: print('String from fcntl with F_SETLKW: ', repr(rv)) @@ -112,7 +118,9 @@ class TestFcntl(unittest.TestCase): @cpython_only def test_fcntl_bad_file_overflow(self): - from _testcapi import INT_MAX, INT_MIN + _testcapi = import_module("_testcapi") + INT_MAX = _testcapi.INT_MAX + INT_MIN = _testcapi.INT_MIN # Issue 15989 with self.assertRaises(OverflowError): fcntl.fcntl(INT_MAX + 1, fcntl.F_SETFL, os.O_NONBLOCK) @@ -124,19 +132,25 @@ class TestFcntl(unittest.TestCase): fcntl.fcntl(BadFile(INT_MIN - 1), fcntl.F_SETFL, os.O_NONBLOCK) @unittest.skipIf( - platform.machine().startswith('arm') and platform.system() == 'Linux', - "ARM Linux returns EINVAL for F_NOTIFY DN_MULTISHOT") + (platform.machine().startswith("arm") and platform.system() == "Linux") + or platform.system() == "Android", + "this platform returns EINVAL for F_NOTIFY DN_MULTISHOT") def test_fcntl_64_bit(self): - # Issue #1309352: fcntl shouldn't fail when the third arg fits in a + # Issue GH-42434: fcntl shouldn't fail when the third arg fits in a # C 'long' but not in a C 'int'. try: cmd = fcntl.F_NOTIFY - # This flag is larger than 2**31 in 64-bit builds + # DN_MULTISHOT is >= 2**31 in 64-bit builds flags = fcntl.DN_MULTISHOT except AttributeError: self.skipTest("F_NOTIFY or DN_MULTISHOT unavailable") fd = os.open(os.path.dirname(os.path.abspath(TESTFN)), os.O_RDONLY) try: + try: + fcntl.fcntl(fd, cmd, fcntl.DN_DELETE) + except OSError as exc: + if exc.errno == errno.EINVAL: + self.skipTest("F_NOTIFY not available by this environment") fcntl.fcntl(fd, cmd, flags) finally: os.close(fd) @@ -155,27 +169,27 @@ class TestFcntl(unittest.TestCase): self.assertRaises(ValueError, fcntl.flock, -1, fcntl.LOCK_SH) self.assertRaises(TypeError, fcntl.flock, 'spam', fcntl.LOCK_SH) - # TODO RustPython - @unittest.skipUnless(sys.platform == 'linux', 'test requires Linux') @unittest.skipIf(platform.system() == "AIX", "AIX returns PermissionError") + @requires_subprocess() def test_lockf_exclusive(self): self.f = open(TESTFN, 'wb+') cmd = fcntl.LOCK_EX | fcntl.LOCK_NB fcntl.lockf(self.f, cmd) - p = Process(target=try_lockf_on_other_process_fail, args=(TESTFN, cmd)) + mp = multiprocessing.get_context('spawn') + p = mp.Process(target=try_lockf_on_other_process_fail, args=(TESTFN, cmd)) p.start() p.join() fcntl.lockf(self.f, fcntl.LOCK_UN) self.assertEqual(p.exitcode, 0) - # TODO RustPython - @unittest.skipUnless(sys.platform == 'linux', 'test requires Linux') @unittest.skipIf(platform.system() == "AIX", "AIX returns PermissionError") + @requires_subprocess() def test_lockf_share(self): self.f = open(TESTFN, 'wb+') cmd = fcntl.LOCK_SH | fcntl.LOCK_NB fcntl.lockf(self.f, cmd) - p = Process(target=try_lockf_on_other_process, args=(TESTFN, cmd)) + mp = multiprocessing.get_context('spawn') + p = mp.Process(target=try_lockf_on_other_process, args=(TESTFN, cmd)) p.start() p.join() fcntl.lockf(self.f, fcntl.LOCK_UN) @@ -183,7 +197,7 @@ class TestFcntl(unittest.TestCase): @cpython_only def test_flock_overflow(self): - import _testcapi + _testcapi = import_module("_testcapi") self.assertRaises(OverflowError, fcntl.flock, _testcapi.INT_MAX+1, fcntl.LOCK_SH) @@ -197,14 +211,16 @@ class TestFcntl(unittest.TestCase): @unittest.skipUnless( hasattr(fcntl, "F_SETPIPE_SZ") and hasattr(fcntl, "F_GETPIPE_SZ"), "F_SETPIPE_SZ and F_GETPIPE_SZ are not available on all platforms.") + @unittest.skipIf(is_emscripten, "Emscripten pipefs doesn't support these") def test_fcntl_f_pipesize(self): test_pipe_r, test_pipe_w = os.pipe() try: # Get the default pipesize with F_GETPIPE_SZ pipesize_default = fcntl.fcntl(test_pipe_w, fcntl.F_GETPIPE_SZ) pipesize = pipesize_default // 2 # A new value to detect change. - if pipesize < 512: # the POSIX minimum - raise unittest.SkitTest( + pagesize_default = get_pagesize() + if pipesize < pagesize_default: # the POSIX minimum + raise unittest.SkipTest( 'default pipesize too small to perform test.') fcntl.fcntl(test_pipe_w, fcntl.F_SETPIPE_SZ, pipesize) self.assertEqual(fcntl.fcntl(test_pipe_w, fcntl.F_GETPIPE_SZ), @@ -213,6 +229,15 @@ class TestFcntl(unittest.TestCase): os.close(test_pipe_r) os.close(test_pipe_w) + @unittest.skipUnless(hasattr(fcntl, 'F_DUPFD'), 'need fcntl.F_DUPFD') + def test_bad_fd(self): + # gh-134744: Test error handling + fd = make_bad_fd() + with self.assertRaises(OSError): + fcntl.fcntl(fd, fcntl.F_DUPFD, 0) + with self.assertRaises(OSError): + fcntl.fcntl(fd, fcntl.F_DUPFD, b'\0' * 1024) + if __name__ == '__main__': unittest.main() diff --git a/Lib/test/test_ioctl.py b/Lib/test/test_ioctl.py index 40f37970f..01e1bfb42 100644 --- a/Lib/test/test_ioctl.py +++ b/Lib/test/test_ioctl.py @@ -1,45 +1,79 @@ import array +import os +import struct +import sys +import threading import unittest -from test.support import get_attribute +from test import support +from test.support import os_helper, threading_helper from test.support.import_helper import import_module -import os, struct fcntl = import_module('fcntl') termios = import_module('termios') -get_attribute(termios, 'TIOCGPGRP') #Can't run tests without this feature -try: - tty = open("/dev/tty", "rb") -except OSError: - raise unittest.SkipTest("Unable to open /dev/tty") -else: - with tty: - # Skip if another process is in foreground - r = fcntl.ioctl(tty, termios.TIOCGPGRP, " ") - rpgrp = struct.unpack("i", r)[0] - if rpgrp not in (os.getpgrp(), os.getsid(0)): - raise unittest.SkipTest("Neither the process group nor the session " - "are attached to /dev/tty") - del tty, r, rpgrp +class IoctlTestsTty(unittest.TestCase): + @classmethod + def setUpClass(cls): + TIOCGPGRP = support.get_attribute(termios, 'TIOCGPGRP') + try: + tty = open("/dev/tty", "rb") + except OSError: + raise unittest.SkipTest("Unable to open /dev/tty") + with tty: + # Skip if another process is in foreground + r = fcntl.ioctl(tty, TIOCGPGRP, struct.pack("i", 0)) + rpgrp = struct.unpack("i", r)[0] + if rpgrp not in (os.getpgrp(), os.getsid(0)): + raise unittest.SkipTest("Neither the process group nor the session " + "are attached to /dev/tty") -try: - import pty -except ImportError: - pty = None - -class IoctlTests(unittest.TestCase): - def test_ioctl(self): + def test_ioctl_immutable_buf(self): # If this process has been put into the background, TIOCGPGRP returns # the session ID instead of the process group id. ids = (os.getpgrp(), os.getsid(0)) with open("/dev/tty", "rb") as tty: - r = fcntl.ioctl(tty, termios.TIOCGPGRP, " ") - rpgrp = struct.unpack("i", r)[0] + # string + buf = " "*8 + r = fcntl.ioctl(tty, termios.TIOCGPGRP, buf) + self.assertIsInstance(r, bytes) + rpgrp = memoryview(r).cast('i')[0] self.assertIn(rpgrp, ids) - def _check_ioctl_mutate_len(self, nbytes=None): + # bytes + buf = b" "*8 + r = fcntl.ioctl(tty, termios.TIOCGPGRP, buf) + self.assertIsInstance(r, bytes) + rpgrp = memoryview(r).cast('i')[0] + self.assertIn(rpgrp, ids) + + # read-only buffer + r = fcntl.ioctl(tty, termios.TIOCGPGRP, memoryview(buf)) + self.assertIsInstance(r, bytes) + rpgrp = memoryview(r).cast('i')[0] + self.assertIn(rpgrp, ids) + + def test_ioctl_mutable_buf(self): + ids = (os.getpgrp(), os.getsid(0)) + with open("/dev/tty", "rb") as tty: + buf = bytearray(b" "*8) + r = fcntl.ioctl(tty, termios.TIOCGPGRP, buf) + self.assertEqual(r, 0) + rpgrp = memoryview(buf).cast('i')[0] + self.assertIn(rpgrp, ids) + + def test_ioctl_no_mutate_buf(self): + ids = (os.getpgrp(), os.getsid(0)) + with open("/dev/tty", "rb") as tty: + buf = bytearray(b" "*8) + save_buf = bytes(buf) + r = fcntl.ioctl(tty, termios.TIOCGPGRP, buf, False) + self.assertEqual(bytes(buf), save_buf) + self.assertIsInstance(r, bytes) + rpgrp = memoryview(r).cast('i')[0] + self.assertIn(rpgrp, ids) + + def _create_int_buf(self, nbytes=None): buf = array.array('i') intsize = buf.itemsize - ids = (os.getpgrp(), os.getsid(0)) # A fill value unlikely to be in `ids` fill = -12345 if nbytes is not None: @@ -48,45 +82,135 @@ class IoctlTests(unittest.TestCase): self.assertEqual(len(buf) * intsize, nbytes) # sanity check else: buf.append(fill) + return buf + + def _check_ioctl_mutate_len(self, nbytes=None): + ids = (os.getpgrp(), os.getsid(0)) + buf = self._create_int_buf(nbytes) with open("/dev/tty", "rb") as tty: - r = fcntl.ioctl(tty, termios.TIOCGPGRP, buf, True) + r = fcntl.ioctl(tty, termios.TIOCGPGRP, buf) rpgrp = buf[0] self.assertEqual(r, 0) self.assertIn(rpgrp, ids) + def _check_ioctl_not_mutate_len(self, nbytes=None): + ids = (os.getpgrp(), os.getsid(0)) + buf = self._create_int_buf(nbytes) + save_buf = bytes(buf) + with open("/dev/tty", "rb") as tty: + r = fcntl.ioctl(tty, termios.TIOCGPGRP, buf, False) + self.assertIsInstance(r, bytes) + self.assertEqual(len(r), len(save_buf)) + self.assertEqual(bytes(buf), save_buf) + rpgrp = array.array('i', r)[0] + rpgrp = memoryview(r).cast('i')[0] + self.assertIn(rpgrp, ids) + + buf = bytes(buf) + with open("/dev/tty", "rb") as tty: + r = fcntl.ioctl(tty, termios.TIOCGPGRP, buf, True) + self.assertIsInstance(r, bytes) + self.assertEqual(len(r), len(save_buf)) + self.assertEqual(buf, save_buf) + rpgrp = array.array('i', r)[0] + rpgrp = memoryview(r).cast('i')[0] + self.assertIn(rpgrp, ids) + def test_ioctl_mutate(self): self._check_ioctl_mutate_len() + self._check_ioctl_not_mutate_len() def test_ioctl_mutate_1024(self): # Issue #9758: a mutable buffer of exactly 1024 bytes wouldn't be # copied back after the system call. self._check_ioctl_mutate_len(1024) + self._check_ioctl_not_mutate_len(1024) def test_ioctl_mutate_2048(self): # Test with a larger buffer, just for the record. self._check_ioctl_mutate_len(2048) + self.assertRaises(ValueError, self._check_ioctl_not_mutate_len, 2048) - def test_ioctl_signed_unsigned_code_param(self): - if not pty: - raise unittest.SkipTest('pty module required') - mfd, sfd = pty.openpty() - try: - if termios.TIOCSWINSZ < 0: - set_winsz_opcode_maybe_neg = termios.TIOCSWINSZ - set_winsz_opcode_pos = termios.TIOCSWINSZ & 0xffffffff - else: - set_winsz_opcode_pos = termios.TIOCSWINSZ - set_winsz_opcode_maybe_neg, = struct.unpack("i", - struct.pack("I", termios.TIOCSWINSZ)) - our_winsz = struct.pack("HHHH",80,25,0,0) - # test both with a positive and potentially negative ioctl code - new_winsz = fcntl.ioctl(mfd, set_winsz_opcode_pos, our_winsz) - new_winsz = fcntl.ioctl(mfd, set_winsz_opcode_maybe_neg, our_winsz) - finally: - os.close(mfd) - os.close(sfd) +@unittest.skipUnless(hasattr(os, 'openpty'), "need os.openpty()") +class IoctlTestsPty(unittest.TestCase): + def setUp(self): + self.master_fd, self.slave_fd = os.openpty() + self.addCleanup(os.close, self.slave_fd) + self.addCleanup(os.close, self.master_fd) + + @unittest.skipUnless(hasattr(termios, 'TCFLSH'), 'requires termios.TCFLSH') + def test_ioctl_clear_input_or_output(self): + wfd = self.slave_fd + rfd = self.master_fd + # The data is buffered in the input buffer on Linux, and in + # the output buffer on other platforms. + inbuf = sys.platform in ('linux', 'android') + + os.write(wfd, b'abcdef') + self.assertEqual(os.read(rfd, 2), b'ab') + if inbuf: + # don't flush input + fcntl.ioctl(rfd, termios.TCFLSH, termios.TCOFLUSH) + else: + # don't flush output + fcntl.ioctl(wfd, termios.TCFLSH, termios.TCIFLUSH) + self.assertEqual(os.read(rfd, 2), b'cd') + if inbuf: + # flush input + fcntl.ioctl(rfd, termios.TCFLSH, termios.TCIFLUSH) + else: + # flush output + fcntl.ioctl(wfd, termios.TCFLSH, termios.TCOFLUSH) + os.write(wfd, b'ABCDEF') + self.assertEqual(os.read(rfd, 1024), b'ABCDEF') + + @support.skip_android_selinux('tcflow') + @unittest.skipUnless(sys.platform in ('linux', 'android'), 'only works on Linux') + @unittest.skipUnless(hasattr(termios, 'TCXONC'), 'requires termios.TCXONC') + def test_ioctl_suspend_and_resume_output(self): + wfd = self.slave_fd + rfd = self.master_fd + write_suspended = threading.Event() + write_finished = threading.Event() + + def writer(): + os.write(wfd, b'abc') + self.assertTrue(write_suspended.wait(support.SHORT_TIMEOUT)) + os.write(wfd, b'def') + write_finished.set() + + with threading_helper.start_threads([threading.Thread(target=writer)]): + self.assertEqual(os.read(rfd, 3), b'abc') + try: + try: + fcntl.ioctl(wfd, termios.TCXONC, termios.TCOOFF) + finally: + write_suspended.set() + self.assertFalse(write_finished.wait(0.5), + 'output was not suspended') + finally: + fcntl.ioctl(wfd, termios.TCXONC, termios.TCOON) + self.assertTrue(write_finished.wait(support.SHORT_TIMEOUT), + 'output was not resumed') + self.assertEqual(os.read(rfd, 1024), b'def') + + def test_ioctl_set_window_size(self): + # (rows, columns, xpixel, ypixel) + our_winsz = struct.pack("HHHH", 20, 40, 0, 0) + result = fcntl.ioctl(self.master_fd, termios.TIOCSWINSZ, our_winsz) + new_winsz = struct.unpack("HHHH", result) + self.assertEqual(new_winsz[:2], (20, 40)) + + @unittest.skipUnless(hasattr(fcntl, 'FICLONE'), 'need fcntl.FICLONE') + def test_bad_fd(self): + # gh-134744: Test error handling + fd = os_helper.make_bad_fd() + with self.assertRaises(OSError): + fcntl.ioctl(fd, fcntl.FICLONE, fd) + with self.assertRaises(OSError): + fcntl.ioctl(fd, fcntl.FICLONE, b'\0' * 1024) if __name__ == "__main__": - unittest.main() \ No newline at end of file + unittest.main() diff --git a/Lib/test/test_pstats.py b/Lib/test/test_pstats.py index d904a6234..b99a66052 100644 --- a/Lib/test/test_pstats.py +++ b/Lib/test/test_pstats.py @@ -58,7 +58,7 @@ class StatsTestCase(unittest.TestCase): temp_storage_new.close() os.remove(temp_storage_new.name) - @unittest.skipUnless(cProfile, 'TODO: RUSTPYTHON; _lsprof not implemented') + @unittest.skipUnless(cProfile, "TODO: RUSTPYTHON; _lsprof not implemented") def test_load_equivalent_to_init(self): stats = pstats.Stats() self.temp_storage = tempfile.NamedTemporaryFile(delete=False) @@ -136,7 +136,7 @@ class StatsTestCase(unittest.TestCase): SortKey.TIME, 'calls') - @unittest.skipUnless(cProfile, 'TODO: RUSTPYTHON; _lsprof not implemented') + @unittest.skipUnless(cProfile, "TODO: RUSTPYTHON; _lsprof not implemented") def test_get_stats_profile(self): def pass1(): pass def pass2(): pass diff --git a/Lib/test/test_tomllib/test_misc.py b/Lib/test/test_tomllib/test_misc.py index 118fde24d..85526ed80 100644 --- a/Lib/test/test_tomllib/test_misc.py +++ b/Lib/test/test_tomllib/test_misc.py @@ -117,6 +117,19 @@ class TestMiscellaneous(unittest.TestCase): recursive_table_toml = nest_count * "key = {" + nest_count * "}" tomllib.loads(recursive_table_toml) + def test_key_recursion_limit(self): + nest_count = tomllib._parser.MAX_KEY_PARTS - 2 + nested_key_toml = "a." * nest_count + "a = 1" + tomllib.loads(nested_key_toml) + + nest_count = tomllib._parser.MAX_KEY_PARTS + 2 + nested_key_toml = "a." * nest_count + "a = 1" + with self.assertRaisesRegex( + RecursionError, + r"TOML key has more than the allowed [0-9]+ parts", + ): + tomllib.loads(nested_key_toml) + def test_types_import(self): """Test that `_types` module runs. diff --git a/Lib/test/test_type_annotations.py b/Lib/test/test_type_annotations.py index 95fca51a5..3f056f2b7 100644 --- a/Lib/test/test_type_annotations.py +++ b/Lib/test/test_type_annotations.py @@ -485,6 +485,13 @@ class DeferredEvaluationTests(unittest.TestCase): ns = run_code("x: [y for y in range(10)]") self.assertEqual(ns["__annotate__"](1), {"x": list(range(10))}) + def test_class_annotation_dunder_classdict(self): + ns = run_code(""" + class C: + __classdict__: int + """) + self.assertEqual(ns["C"].__annotations__, {"__classdict__": int}) + def test_future_annotations(self): code = """ from __future__ import annotations diff --git a/Lib/test/test_venv.py b/Lib/test/test_venv.py index e1eaa2f94..34757c97a 100644 --- a/Lib/test/test_venv.py +++ b/Lib/test/test_venv.py @@ -675,6 +675,26 @@ class BasicTest(BaseTest): self.assertEqual(out, "".encode()) self.assertEqual(err, "".encode()) + # gh-149701: Test exit code is zero even when hashing is disabled + @unittest.skipIf(os.name == 'nt', 'not relevant on Windows') + def test_deactivate_with_strict_bash_opts_and_hashing_disabled(self): + bash = shutil.which("bash") + if bash is None: + self.skipTest("bash required for this test") + rmtree(self.env_dir) + builder = venv.EnvBuilder(clear=True) + builder.create(self.env_dir) + activate = os.path.join(self.env_dir, self.bindir, "activate") + test_script = os.path.join(self.env_dir, "test_hash_disabled.sh") + with open(test_script, "w") as f: + f.write("set -euo pipefail\n" + "set +h\n" # disable hashing + f"source {activate}\n" + "deactivate") + out, err = check_output([bash, test_script]) + self.assertEqual(out, "".encode()) + self.assertEqual(err, "".encode()) + @unittest.skipUnless(sys.platform == 'darwin', 'only relevant on macOS') def test_macos_env(self): diff --git a/Lib/test/test_zipfile/test_core.py b/Lib/test/test_zipfile/test_core.py index 96f8caa94..46f938245 100644 --- a/Lib/test/test_zipfile/test_core.py +++ b/Lib/test/test_zipfile/test_core.py @@ -1890,11 +1890,8 @@ class OtherTests(unittest.TestCase): with zipfile.ZipFile(TESTFN, "r") as zf: zip_info = zf.getinfo("test_source_date_epoch.txt") - get_time = time.localtime(int(os.environ['SOURCE_DATE_EPOCH']))[:6] - # Compare each element of the date_time tuple - # Allow for a 1-second difference - for z_time, g_time in zip(zip_info.date_time, get_time): - self.assertAlmostEqual(z_time, g_time, delta=1) + expected_utc = (2025, 1, 1, 7, 19, 58) + self.assertEqual(zip_info.date_time, expected_utc) def test_write_without_source_date_epoch(self): with os_helper.EnvironmentVarGuard() as env: @@ -1905,9 +1902,13 @@ class OtherTests(unittest.TestCase): with zipfile.ZipFile(TESTFN, "r") as zf: zip_info = zf.getinfo("test_no_source_date_epoch.txt") - current_time = time.localtime()[:6] - for z_time, c_time in zip(zip_info.date_time, current_time): - self.assertAlmostEqual(z_time, c_time, delta=2) + self.assertTimestampAlmostEqual(time.localtime(), zip_info.date_time, tolerance=2) + + def assertTimestampAlmostEqual(self, time1, time2, tolerance): + import datetime + dt1 = datetime.datetime(*time1[:6]) + dt2 = datetime.datetime(*time2[:6]) + self.assertLessEqual((dt1 - dt2).total_seconds(), tolerance) def test_close(self): """Check that the zipfile is closed after the 'with' block.""" @@ -3568,6 +3569,7 @@ class TestExecutablePrependedZip(unittest.TestCase): output = subprocess.check_output([self.exe_zip64, sys.executable]) self.assertIn(b'number in executable: 5', output) + @unittest.skip("TODO: RUSTPYTHON; LookupError: unknown encoding: shift_jis") class EncodedMetadataTests(unittest.TestCase): file_names = ['\u4e00', '\u4e8c', '\u4e09'] # Han 'one', 'two', 'three' @@ -3646,29 +3648,23 @@ class EncodedMetadataTests(unittest.TestCase): def test_read_after_append(self): newname = '\u56db' # Han 'four' - expected_names = [name.encode('shift_jis').decode('cp437') - for name in self.file_names[:2]] + self.file_names[2:] - expected_names.append(newname) - expected_content = (*self.file_content, b"newcontent") + newname2 = 'fünf' # representable in cp437, but still stored as UTF-8 + expected_names = [*self.file_names, newname, newname2] + mojibake_expected_names = [name.encode('shift_jis').decode('cp437') + if i < 2 else name + for i, name in enumerate(expected_names)] + expected_content = (*self.file_content, b"newcontent", b"newcontent2") with zipfile.ZipFile(TESTFN, "a") as zipfp: zipfp.writestr(newname, "newcontent") - self.assertEqual(sorted(zipfp.namelist()), sorted(expected_names)) + zipfp.writestr(newname2, "newcontent2") + self.assertEqual(sorted(zipfp.namelist()), sorted(mojibake_expected_names)) with zipfile.ZipFile(TESTFN, "r") as zipfp: - self._test_read(zipfp, expected_names, expected_content) + self._test_read(zipfp, mojibake_expected_names, expected_content) with zipfile.ZipFile(TESTFN, "r", metadata_encoding='shift_jis') as zipfp: - self.assertEqual(sorted(zipfp.namelist()), sorted(expected_names)) - for i, (name, content) in enumerate(zip(expected_names, expected_content)): - info = zipfp.getinfo(name) - self.assertEqual(info.filename, name) - self.assertEqual(info.file_size, len(content)) - if i < 2: - with self.assertRaises(zipfile.BadZipFile): - zipfp.read(name) - else: - self.assertEqual(zipfp.read(name), content) + self._test_read(zipfp, expected_names, expected_content) def test_write_with_metadata_encoding(self): ZF = zipfile.ZipFile @@ -3677,6 +3673,20 @@ class EncodedMetadataTests(unittest.TestCase): "^metadata_encoding is only"): ZF("nonesuch.zip", mode, metadata_encoding="shift_jis") + def test_add_comment(self): + with zipfile.ZipFile(TESTFN, "r") as zipfp: + mojibake_expected_names = zipfp.namelist() + + with zipfile.ZipFile(TESTFN, "a") as zipfp: + zipfp.comment = b'comment' + self.assertEqual(zipfp.namelist(), mojibake_expected_names) + + with zipfile.ZipFile(TESTFN, "r") as zipfp: + self._test_read(zipfp, mojibake_expected_names, self.file_content) + + with zipfile.ZipFile(TESTFN, "r", metadata_encoding='shift_jis') as zipfp: + self._test_read(zipfp, self.file_names, self.file_content) + def test_cli_with_metadata_encoding(self): errmsg = "Non-conforming encodings not supported with -c." args = ["--metadata-encoding=shift_jis", "-c", "nonesuch", "nonesuch"] diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py index df3b936cc..01ea2ab62 100644 --- a/Lib/tkinter/__init__.py +++ b/Lib/tkinter/__init__.py @@ -7,25 +7,25 @@ Checkbutton, Scale, Listbox, Scrollbar, OptionMenu, Spinbox LabelFrame and PanedWindow. Properties of the widgets are specified with keyword arguments. -Keyword arguments have the same name as the corresponding resource +Keyword arguments have the same name as the corresponding options under Tk. Widgets are positioned with one of the geometry managers Place, Pack or Grid. These managers can be called with methods place, pack, grid available in every Widget. -Actions are bound to events by resources (e.g. keyword argument -command) or with the method bind. +Actions are bound to events by options (e.g. the command +keyword argument) or with the bind() method. Example (Hello, World): import tkinter from tkinter.constants import * tk = tkinter.Tk() frame = tkinter.Frame(tk, relief=RIDGE, borderwidth=2) -frame.pack(fill=BOTH,expand=1) +frame.pack(fill=BOTH, expand=1) label = tkinter.Label(frame, text="Hello, World") label.pack(fill=X, expand=1) -button = tkinter.Button(frame,text="Exit",command=tk.destroy) +button = tkinter.Button(frame, text="Exit", command=tk.destroy) button.pack(side=BOTTOM) tk.mainloop() """ @@ -295,6 +295,8 @@ class Event: ''.join(' %s=%s' % (k, attrs[k]) for k in keys if k in attrs) ) + __class_getitem__ = classmethod(types.GenericAlias) + _support_default_root = True _default_root = None @@ -498,10 +500,14 @@ class Variable: Return the name of the callback. - This deprecated method wraps a deprecated Tcl method that will - likely be removed in the future. Use trace_add() instead. + This deprecated method wraps a deprecated Tcl method removed + in Tcl 9.0. Use trace_add() instead. """ - # TODO: Add deprecation warning + import warnings + warnings.warn( + "trace_variable() is deprecated and not supported with Tcl 9; " + "use trace_add() instead.", + DeprecationWarning, stacklevel=2) cbname = self._register(callback) self._tk.call("trace", "variable", self._name, mode, cbname) return cbname @@ -514,10 +520,14 @@ class Variable: MODE is one of "r", "w", "u" for read, write, undefine. CBNAME is the name of the callback returned from trace_variable or trace. - This deprecated method wraps a deprecated Tcl method that will - likely be removed in the future. Use trace_remove() instead. + This deprecated method wraps a deprecated Tcl method removed + in Tcl 9.0. Use trace_remove() instead. """ - # TODO: Add deprecation warning + import warnings + warnings.warn( + "trace_vdelete() is deprecated and not supported with Tcl 9; " + "use trace_remove() instead.", + DeprecationWarning, stacklevel=2) self._tk.call("trace", "vdelete", self._name, mode, cbname) cbname = self._tk.splitlist(cbname)[0] for m, ca in self.trace_info(): @@ -533,10 +543,14 @@ class Variable: def trace_vinfo(self): """Return all trace callback information. - This deprecated method wraps a deprecated Tcl method that will - likely be removed in the future. Use trace_info() instead. + This deprecated method wraps a deprecated Tcl method removed + in Tcl 9.0. Use trace_info() instead. """ - # TODO: Add deprecation warning + import warnings + warnings.warn( + "trace_vinfo() is deprecated and not supported with Tcl 9; " + "use trace_info() instead.", + DeprecationWarning, stacklevel=2) return [self._tk.splitlist(x) for x in self._tk.splitlist( self._tk.call("trace", "vinfo", self._name))] @@ -833,7 +847,7 @@ class Misc: The focus order first goes to the next child, then to the children of the child recursively and then to the next sibling which is higher in the stacking order. A - widget is omitted if it has the takefocus resource set + widget is omitted if it has the takefocus option set to 0.""" name = self.tk.call('tk_focusNext', self._w) if not name: return None @@ -845,7 +859,7 @@ class Misc: if not name: return None return self._nametowidget(name) - def after(self, ms, func=None, *args): + def after(self, ms, func=None, *args, **kw): """Call function once after given time. MS specifies the time in milliseconds. FUNC gives the @@ -859,7 +873,7 @@ class Misc: else: def callit(): try: - func(*args) + func(*args, **kw) finally: try: self.deletecommand(name) @@ -873,13 +887,13 @@ class Misc: name = self._register(callit) return self.tk.call('after', ms, name) - def after_idle(self, func, *args): + def after_idle(self, func, *args, **kw): """Call FUNC once if the Tcl main loop has no event to process. Return an identifier to cancel the scheduling with after_cancel.""" - return self.after('idle', func, *args) + return self.after('idle', func, *args, **kw) def after_cancel(self, id): """Cancel scheduling of function identified with ID. @@ -1813,18 +1827,24 @@ class Misc: # These used to be defined in Widget: def configure(self, cnf=None, **kw): - """Configure resources of a widget. + """Query or modify the configuration options of the widget. - The values for resources are specified as keyword - arguments. To get an overview about - the allowed keyword arguments call the method keys. + If no arguments are specified, return a dictionary describing + all of the available options for the widget. + + If an option name is specified, then return a tuple describing + the one named option. + + If one or more keyword arguments are specified or a dictionary + is specified, then modify the widget option(s) to have the given + value(s). """ return self._configure('configure', cnf, kw) config = configure def cget(self, key): - """Return the resource value for a KEY given as string.""" + """Return the current value of the configuration option.""" return self.tk.call(self._w, 'cget', '-' + key) __getitem__ = cget @@ -1833,7 +1853,7 @@ class Misc: self.configure({key: value}) def keys(self): - """Return a list of all resource names of this widget.""" + """Return a list of all option names of this widget.""" splitlist = self.tk.splitlist return [splitlist(x)[0][1:] for x in splitlist(self.tk.call(self._w, 'configure'))] @@ -1846,15 +1866,15 @@ class Misc: return '<%s.%s object %s>' % ( self.__class__.__module__, self.__class__.__qualname__, self._w) - # Pack methods that apply to the master + # Pack methods that apply to the container widget _noarg_ = ['_noarg_'] def pack_propagate(self, flag=_noarg_): """Set or get the status for propagation of geometry information. - A boolean argument specifies whether the geometry information - of the slaves will determine the size of this widget. If no argument - is given the current setting will be returned. + A boolean argument specifies whether the size of this container will + be determined by the geometry information of its content. + If no argument is given the current setting will be returned. """ if flag is Misc._noarg_: return self._getboolean(self.tk.call( @@ -1865,28 +1885,28 @@ class Misc: propagate = pack_propagate def pack_slaves(self): - """Return a list of all slaves of this widget - in its packing order.""" + """Returns a list of all of the content widgets in the packing order + for this container.""" return [self._nametowidget(x) for x in self.tk.splitlist( self.tk.call('pack', 'slaves', self._w))] slaves = pack_slaves - # Place method that applies to the master + # Place method that applies to the container widget def place_slaves(self): - """Return a list of all slaves of this widget - in its packing order.""" + """Returns a list of all the content widgets for which this widget is + the container.""" return [self._nametowidget(x) for x in self.tk.splitlist( self.tk.call( 'place', 'slaves', self._w))] - # Grid methods that apply to the master + # Grid methods that apply to the container widget def grid_anchor(self, anchor=None): # new in Tk 8.5 """The anchor value controls how to place the grid within the - master when no row/column has any weight. + container widget when no row/column has any weight. The default anchor is nw.""" self.tk.call('grid', 'anchor', self._w, anchor) @@ -1903,7 +1923,7 @@ class Misc: starts at that cell. The returned integers specify the offset of the upper left - corner in the master widget and the width and height. + corner in the container widget and the width and height. """ args = ('grid', 'bbox', self._w) if column is not None and row is not None: @@ -1952,7 +1972,7 @@ class Misc: def grid_columnconfigure(self, index, cnf={}, **kw): """Configure column INDEX of a grid. - Valid resources are minsize (minimum size of the column), + Valid options are minsize (minimum size of the column), weight (how much does additional space propagate to this column) and pad (how much space to let additionally).""" return self._grid_configure('columnconfigure', index, cnf, kw) @@ -1961,7 +1981,7 @@ class Misc: def grid_location(self, x, y): """Return a tuple of column and row which identify the cell - at which the pixel at position X and Y inside the master + at which the pixel at position X and Y inside the container widget is located.""" return self._getints( self.tk.call( @@ -1970,9 +1990,9 @@ class Misc: def grid_propagate(self, flag=_noarg_): """Set or get the status for propagation of geometry information. - A boolean argument specifies whether the geometry information - of the slaves will determine the size of this widget. If no argument - is given, the current setting will be returned. + A boolean argument specifies whether the size of this container will + be determined by the geometry information of its content. + If no argument is given the current setting will be returned. """ if flag is Misc._noarg_: return self._getboolean(self.tk.call( @@ -1983,7 +2003,7 @@ class Misc: def grid_rowconfigure(self, index, cnf={}, **kw): """Configure row INDEX of a grid. - Valid resources are minsize (minimum size of the row), + Valid options are minsize (minimum size of the row), weight (how much does additional space propagate to this row) and pad (how much space to let additionally).""" return self._grid_configure('rowconfigure', index, cnf, kw) @@ -1998,8 +2018,13 @@ class Misc: size = grid_size def grid_slaves(self, row=None, column=None): - """Return a list of all slaves of this widget - in its packing order.""" + """Returns a list of the content widgets. + + If no arguments are supplied, a list of all of the content in this + container widget is returned, most recently managed first. + If ROW or COLUMN is specified, only the content in the row or + column is returned. + """ args = () if row is not None: args = args + ('-row', row) @@ -2451,9 +2476,7 @@ class Tk(Misc, Wm): self.tk = None if baseName is None: import os - # TODO: RUSTPYTHON - # baseName = os.path.basename(sys.argv[0]) - baseName = "" # sys.argv[0] + baseName = os.path.basename(sys.argv[0]) baseName, ext = os.path.splitext(baseName) if ext not in ('.py', '.pyc'): baseName = baseName + ext @@ -2587,8 +2610,8 @@ class Pack: before=widget - pack it before you will pack widget expand=bool - expand widget if parent size grows fill=NONE or X or Y or BOTH - fill widget if widget grows - in=master - use master to contain this widget - in_=master - see 'in' option description + in=container - use the container widget to contain this widget + in_=container - see 'in' option description ipadx=amount - add internal padding in x direction ipady=amount - add internal padding in y direction padx=amount - add padding in x direction @@ -2627,25 +2650,31 @@ class Place: def place_configure(self, cnf={}, **kw): """Place a widget in the parent widget. Use as options: - in=master - master relative to which the widget is placed - in_=master - see 'in' option description - x=amount - locate anchor of this widget at position x of master - y=amount - locate anchor of this widget at position y of master + in=container - the container widget relative to which this widget is + placed + in_=container - see 'in' option description + x=amount - locate anchor of this widget at position x of the + container widget + y=amount - locate anchor of this widget at position y of the + container widget relx=amount - locate anchor of this widget between 0.0 and 1.0 - relative to width of master (1.0 is right edge) + relative to width of the container widget (1.0 is + right edge) rely=amount - locate anchor of this widget between 0.0 and 1.0 - relative to height of master (1.0 is bottom edge) - anchor=NSEW (or subset) - position anchor according to given direction + relative to height of the container widget (1.0 is + bottom edge) + anchor=NSEW (or subset) - position anchor according to given + direction width=amount - width of this widget in pixel height=amount - height of this widget in pixel relwidth=amount - width of this widget between 0.0 and 1.0 - relative to width of master (1.0 is the same width - as the master) + relative to width of the container widget (1.0 is + the same width as the container widget) relheight=amount - height of this widget between 0.0 and 1.0 - relative to height of master (1.0 is the same - height as the master) + relative to height of the container widget (1.0 + is the same height as the container widget) bordermode="inside" or "outside" - whether to take border width of - master widget into account + the container widget into account """ self.tk.call( ('place', 'configure', self._w) @@ -2681,8 +2710,8 @@ class Grid: """Position a widget in the parent widget in a grid. Use as options: column=number - use cell identified with given column (starting with 0) columnspan=number - this widget will span several columns - in=master - use master to contain this widget - in_=master - see 'in' option description + in=container - use the container widget to contain this widget + in_=container - see 'in' option description ipadx=amount - add internal padding in x direction ipady=amount - add internal padding in y direction padx=amount - add padding in x direction @@ -2805,7 +2834,7 @@ class Toplevel(BaseWidget, Wm): def __init__(self, master=None, cnf={}, **kw): """Construct a toplevel widget with the parent MASTER. - Valid resource names: background, bd, bg, borderwidth, class, + Valid option names: background, bd, bg, borderwidth, class, colormap, container, cursor, height, highlightbackground, highlightcolor, highlightthickness, menu, relief, screen, takefocus, use, visual, width.""" @@ -2882,7 +2911,7 @@ class Canvas(Widget, XView, YView): def __init__(self, master=None, cnf={}, **kw): """Construct a canvas widget with the parent MASTER. - Valid resource names: background, bd, bg, borderwidth, closeenough, + Valid option names: background, bd, bg, borderwidth, closeenough, confine, cursor, height, highlightbackground, highlightcolor, highlightthickness, insertbackground, insertborderwidth, insertofftime, insertontime, insertwidth, offset, relief, @@ -3091,16 +3120,14 @@ class Canvas(Widget, XView, YView): self.tk.call((self._w, 'insert') + args) def itemcget(self, tagOrId, option): - """Return the resource value for an OPTION for item TAGORID.""" + """Return the value of OPTION for item TAGORID.""" return self.tk.call( (self._w, 'itemcget') + (tagOrId, '-'+option)) def itemconfigure(self, tagOrId, cnf=None, **kw): - """Configure resources of an item TAGORID. + """Query or modify the configuration options of an item TAGORID. - The values for resources are specified as keyword - arguments. To get an overview about - the allowed keyword arguments call the method without arguments. + Similar to configure() except that it applies to the specified item. """ return self._configure(('itemconfigure', tagOrId), cnf, kw) @@ -3192,7 +3219,7 @@ class Checkbutton(Widget): def __init__(self, master=None, cnf={}, **kw): """Construct a checkbutton widget with the parent MASTER. - Valid resource names: activebackground, activeforeground, anchor, + Valid option names: activebackground, activeforeground, anchor, background, bd, bg, bitmap, borderwidth, command, cursor, disabledforeground, fg, font, foreground, height, highlightbackground, highlightcolor, highlightthickness, image, @@ -3223,7 +3250,7 @@ class Checkbutton(Widget): self.tk.call(self._w, 'flash') def invoke(self): - """Toggle the button and invoke a command if given as resource.""" + """Toggle the button and invoke a command if given as option.""" return self.tk.call(self._w, 'invoke') def select(self): @@ -3241,7 +3268,7 @@ class Entry(Widget, XView): def __init__(self, master=None, cnf={}, **kw): """Construct an entry widget with the parent MASTER. - Valid resource names: background, bd, bg, borderwidth, cursor, + Valid option names: background, bd, bg, borderwidth, cursor, exportselection, fg, font, foreground, highlightbackground, highlightcolor, highlightthickness, insertbackground, insertborderwidth, insertofftime, insertontime, insertwidth, @@ -3327,7 +3354,7 @@ class Frame(Widget): def __init__(self, master=None, cnf={}, **kw): """Construct a frame widget with the parent MASTER. - Valid resource names: background, bd, bg, borderwidth, class, + Valid option names: background, bd, bg, borderwidth, class, colormap, container, cursor, height, highlightbackground, highlightcolor, highlightthickness, relief, takefocus, visual, width.""" cnf = _cnfmerge((cnf, kw)) @@ -3371,7 +3398,7 @@ class Listbox(Widget, XView, YView): def __init__(self, master=None, cnf={}, **kw): """Construct a listbox widget with the parent MASTER. - Valid resource names: background, bd, bg, borderwidth, cursor, + Valid option names: background, bd, bg, borderwidth, cursor, exportselection, fg, font, foreground, height, highlightbackground, highlightcolor, highlightthickness, relief, selectbackground, selectborderwidth, selectforeground, selectmode, setgrid, takefocus, @@ -3464,18 +3491,15 @@ class Listbox(Widget, XView, YView): return self.tk.getint(self.tk.call(self._w, 'size')) def itemcget(self, index, option): - """Return the resource value for an ITEM and an OPTION.""" + """Return the value of OPTION for item at INDEX.""" return self.tk.call( (self._w, 'itemcget') + (index, '-'+option)) def itemconfigure(self, index, cnf=None, **kw): - """Configure resources of an ITEM. + """Query or modify the configuration options of an item at INDEX. - The values for resources are specified as keyword arguments. - To get an overview about the allowed keyword arguments - call the method without arguments. - Valid resource names: background, bg, foreground, fg, - selectbackground, selectforeground.""" + Similar to configure() except that it applies to the specified item. + """ return self._configure(('itemconfigure', index), cnf, kw) itemconfig = itemconfigure @@ -3487,7 +3511,7 @@ class Menu(Widget): def __init__(self, master=None, cnf={}, **kw): """Construct menu widget with the parent MASTER. - Valid resource names: activebackground, activeborderwidth, + Valid option names: activebackground, activeborderwidth, activeforeground, background, bd, bg, borderwidth, cursor, disabledforeground, fg, font, foreground, postcommand, relief, selectcolor, takefocus, tearoff, tearoffcommand, title, type.""" @@ -3568,11 +3592,15 @@ class Menu(Widget): self.tk.call(self._w, 'delete', index1, index2) def entrycget(self, index, option): - """Return the resource value of a menu item for OPTION at INDEX.""" + """Return the value of OPTION for a menu item at INDEX.""" return self.tk.call(self._w, 'entrycget', index, '-' + option) def entryconfigure(self, index, cnf=None, **kw): - """Configure a menu item at INDEX.""" + """Query or modify the configuration options of a menu item at INDEX. + + Similar to configure() except that it applies to the specified + menu item. + """ return self._configure(('entryconfigure', index), cnf, kw) entryconfig = entryconfigure @@ -3630,7 +3658,7 @@ class Radiobutton(Widget): def __init__(self, master=None, cnf={}, **kw): """Construct a radiobutton widget with the parent MASTER. - Valid resource names: activebackground, activeforeground, anchor, + Valid option names: activebackground, activeforeground, anchor, background, bd, bg, bitmap, borderwidth, command, cursor, disabledforeground, fg, font, foreground, height, highlightbackground, highlightcolor, highlightthickness, image, @@ -3649,7 +3677,7 @@ class Radiobutton(Widget): self.tk.call(self._w, 'flash') def invoke(self): - """Toggle the button and invoke a command if given as resource.""" + """Toggle the button and invoke a command if given as option.""" return self.tk.call(self._w, 'invoke') def select(self): @@ -3663,7 +3691,7 @@ class Scale(Widget): def __init__(self, master=None, cnf={}, **kw): """Construct a scale widget with the parent MASTER. - Valid resource names: activebackground, background, bigincrement, bd, + Valid option names: activebackground, background, bigincrement, bd, bg, borderwidth, command, cursor, digits, fg, font, foreground, from, highlightbackground, highlightcolor, highlightthickness, label, length, orient, relief, repeatdelay, repeatinterval, resolution, @@ -3702,7 +3730,7 @@ class Scrollbar(Widget): def __init__(self, master=None, cnf={}, **kw): """Construct a scrollbar widget with the parent MASTER. - Valid resource names: activebackground, activerelief, + Valid option names: activebackground, activerelief, background, bd, bg, borderwidth, command, cursor, elementborderwidth, highlightbackground, highlightcolor, highlightthickness, jump, orient, @@ -3946,7 +3974,11 @@ class Text(Widget, XView, YView): return self.tk.call(self._w, "image", "cget", index, option) def image_configure(self, index, cnf=None, **kw): - """Configure an embedded image at INDEX.""" + """Query or modify the configuration options of an embedded image at INDEX. + + Similar to configure() except that it applies to the specified + embedded image. + """ return self._configure(('image', 'configure', index), cnf, kw) def image_create(self, index, cnf={}, **kw): @@ -4084,7 +4116,10 @@ class Text(Widget, XView, YView): return self.tk.call(self._w, 'tag', 'cget', tagName, option) def tag_configure(self, tagName, cnf=None, **kw): - """Configure a tag TAGNAME.""" + """Query or modify the configuration options of a tag TAGNAME. + + Similar to configure() except that it applies to the specified tag. + """ return self._configure(('tag', 'configure', tagName), cnf, kw) tag_config = tag_configure @@ -4142,7 +4177,11 @@ class Text(Widget, XView, YView): return self.tk.call(self._w, 'window', 'cget', index, option) def window_configure(self, index, cnf=None, **kw): - """Configure an embedded window at INDEX.""" + """Query or modify the configuration options of an embedded window at INDEX. + + Similar to configure() except that it applies to the specified + embedded window. + """ return self._configure(('window', 'configure', index), cnf, kw) window_config = window_configure @@ -4182,12 +4221,12 @@ class OptionMenu(Menubutton): def __init__(self, master, variable, value, *values, **kwargs): """Construct an optionmenu widget with the parent MASTER, with - the resource textvariable set to VARIABLE, the initially selected + the option textvariable set to VARIABLE, the initially selected value VALUE, the other menu values VALUES and an additional keyword argument command.""" kw = {"borderwidth": 2, "textvariable": variable, "indicatoron": 1, "relief": RAISED, "anchor": "c", - "highlightthickness": 2} + "highlightthickness": 2, "name": kwargs.pop("name", None)} Widget.__init__(self, master, "menubutton", kw) self.widgetName = 'tk_optionMenu' menu = self.__menu = Menu(self, name="menu", tearoff=0) @@ -4284,7 +4323,7 @@ class PhotoImage(Image): def __init__(self, name=None, cnf={}, master=None, **kw): """Create an image with NAME. - Valid resource names: data, format, file, gamma, height, palette, + Valid option names: data, format, file, gamma, height, palette, width.""" Image.__init__(self, 'photo', name, cnf, master, **kw) @@ -4494,7 +4533,7 @@ class PhotoImage(Image): The FORMAT option specifies the name of the image file format handler to be used. If this option is not given, this method uses a format that consists of a tuple (one element per row) of strings - containings space separated (one element per pixel/column) colors + containing space-separated (one element per pixel/column) colors in “#RRGGBB” format (where RR is a pair of hexadecimal digits for the red channel, GG for green, and BB for blue). @@ -4547,7 +4586,7 @@ class BitmapImage(Image): def __init__(self, name=None, cnf={}, master=None, **kw): """Create a bitmap with NAME. - Valid resource names: background, data, file, foreground, maskdata, maskfile.""" + Valid option names: background, data, file, foreground, maskdata, maskfile.""" Image.__init__(self, 'bitmap', name, cnf, master, **kw) @@ -4865,26 +4904,17 @@ class PanedWindow(Widget): return self.sash("place", index, x, y) def panecget(self, child, option): - """Query a management option for window. - - Option may be any value allowed by the paneconfigure subcommand - """ + """Return the value of option for a child window.""" return self.tk.call( (self._w, 'panecget') + (child, '-'+option)) def paneconfigure(self, tagOrId, cnf=None, **kw): - """Query or modify the management options for window. + """Query or modify the configuration options for a child window. - If no option is specified, returns a list describing all - of the available options for pathName. If option is - specified with no value, then the command returns a list - describing the one named option (this list will be identical - to the corresponding sublist of the value returned if no - option is specified). If one or more option-value pairs are - specified, then the command modifies the given widget - option(s) to have the given value(s); in this case the - command returns an empty string. The following options - are supported: + Similar to configure() except that it applies to the specified + window. + + The following options are supported: after window Insert the window after the window specified. window diff --git a/Lib/tkinter/scrolledtext.py b/Lib/tkinter/scrolledtext.py index 4f9a8815b..8dcead5e3 100644 --- a/Lib/tkinter/scrolledtext.py +++ b/Lib/tkinter/scrolledtext.py @@ -23,7 +23,7 @@ class ScrolledText(Text): self.vbar = Scrollbar(self.frame) self.vbar.pack(side=RIGHT, fill=Y) - kw.update({'yscrollcommand': self.vbar.set}) + kw['yscrollcommand'] = self.vbar.set Text.__init__(self, self.frame, **kw) self.pack(side=LEFT, fill=BOTH, expand=True) self.vbar['command'] = self.yview diff --git a/Lib/tkinter/ttk.py b/Lib/tkinter/ttk.py index 073b3ae20..ef2b91dfb 100644 --- a/Lib/tkinter/ttk.py +++ b/Lib/tkinter/ttk.py @@ -321,6 +321,8 @@ def _tclobj_to_py(val): elif hasattr(val, 'typename'): # some other (single) Tcl object val = _convert_stringval(val) + if isinstance(val, tuple) and len(val) == 0: + return '' return val def tclobjs_to_py(adict): @@ -1587,7 +1589,7 @@ class OptionMenu(Menubutton): def __init__(self, master, variable, default=None, *values, **kwargs): """Construct a themed OptionMenu widget with master as the parent, - the resource textvariable set to variable, the initially selected + the option textvariable set to variable, the initially selected value specified by the default parameter, the menu values given by *values and additional keywords. @@ -1601,7 +1603,8 @@ class OptionMenu(Menubutton): A callback that will be invoked after selecting an item. """ kw = {'textvariable': variable, 'style': kwargs.pop('style', None), - 'direction': kwargs.pop('direction', None)} + 'direction': kwargs.pop('direction', None), + 'name': kwargs.pop('name', None)} Menubutton.__init__(self, master, **kw) self['menu'] = tkinter.Menu(self, tearoff=False) diff --git a/Lib/tomllib/_parser.py b/Lib/tomllib/_parser.py index 3ee47aa9e..84e70495d 100644 --- a/Lib/tomllib/_parser.py +++ b/Lib/tomllib/_parser.py @@ -4,6 +4,7 @@ from __future__ import annotations +import sys from types import MappingProxyType from ._re import ( @@ -18,10 +19,17 @@ from ._re import ( TYPE_CHECKING = False if TYPE_CHECKING: from collections.abc import Iterable - from typing import IO, Any + from typing import IO, Any, Final from ._types import Key, ParseFloat, Pos +# Pathologically excessive number of parts in a key runs into quadratic +# behavior (e.g. in Flags.is_). +# Even if keys aren't currently parsed using recursion, they name a +# recursive structure, so it makes sense to limit it using getrecursionlimit() +# and RecursionError. +MAX_KEY_PARTS: Final = sys.getrecursionlimit() + ASCII_CTRL = frozenset(chr(i) for i in range(32)) | frozenset(chr(127)) # Neither of these sets include quotation mark or backslash. They are @@ -462,6 +470,10 @@ def parse_key(src: str, pos: Pos) -> tuple[Pos, Key]: pos = skip_chars(src, pos, TOML_WS) pos, key_part = parse_key_part(src, pos) key += (key_part,) + if len(key) > MAX_KEY_PARTS: + raise RecursionError( + f"TOML key has more than the allowed {MAX_KEY_PARTS} parts" + ) pos = skip_chars(src, pos, TOML_WS) diff --git a/Lib/tomllib/mypy.ini b/Lib/tomllib/mypy.ini index 1761dce45..f7eeffd57 100644 --- a/Lib/tomllib/mypy.ini +++ b/Lib/tomllib/mypy.ini @@ -12,6 +12,4 @@ pretty = True # Enable most stricter settings enable_error_code = ignore-without-code strict = True -strict_bytes = True -local_partial_types = True warn_unreachable = True diff --git a/Lib/traceback.py b/Lib/traceback.py index 79f67b987..227ca8efa 100644 --- a/Lib/traceback.py +++ b/Lib/traceback.py @@ -74,10 +74,10 @@ def extract_tb(tb, limit=None): This is useful for alternate formatting of stack traces. If 'limit' is omitted or None, all entries are extracted. A pre-processed stack trace entry is a FrameSummary object - containing attributes filename, lineno, name, and line - representing the information that is usually printed for a stack - trace. The line is a string with leading and trailing - whitespace stripped; if the source is not available it is None. + representing the information that is usually printed for a + stack trace. The line attribute is a string with + leading and trailing whitespace stripped; if the source is not + available the corresponding attribute is None. """ return StackSummary._extract_from_extended_frame_gen( _walk_tb_with_full_positions(tb), limit=limit) @@ -253,9 +253,8 @@ def extract_stack(f=None, limit=None): The return value has the same format as for extract_tb(). The optional 'f' and 'limit' arguments have the same meaning as for - print_stack(). Each item in the list is a quadruple (filename, - line number, function name, text), and the entries are in order - from oldest to newest stack frame. + print_stack(). Each item in the list is a FrameSummary object, + and the entries are in order from oldest to newest stack frame. """ if f is None: f = sys._getframe().f_back @@ -283,7 +282,7 @@ class FrameSummary: active when the frame was captured. - :attr:`name` The name of the function or method that was executing when the frame was captured. - - :attr:`line` The text from the linecache module for the + - :attr:`line` The text from the linecache module for the line of code that was running when the frame was captured. - :attr:`locals` Either None if locals were not supplied, or a dict mapping the name to the repr() of the variable. @@ -958,7 +957,7 @@ def _extract_caret_anchors_from_line_segment(segment): _WIDE_CHAR_SPECIFIERS = "WF" def _display_width(line, offset=None): - """Calculate the extra amount of width space the given source + """Calculate the amount of width space the given source code segment might take if it were to be displayed on a fixed width output device. Supports wide unicode characters and emojis.""" @@ -1044,7 +1043,7 @@ class TracebackException: def __init__(self, exc_type, exc_value, exc_traceback, *, limit=None, lookup_lines=True, capture_locals=False, compact=False, max_group_width=15, max_group_depth=10, save_exc_type=True, _seen=None): - # NB: we need to accept exc_traceback, exc_value, exc_traceback to + # NB: we need to accept exc_type, exc_value, exc_traceback to # permit backwards compat with the existing API, otherwise we # need stub thunk objects just to glue it together. # Handle loops in __cause__ or __context__. diff --git a/Lib/types.py b/Lib/types.py index fa6324fb4..60a4b22c2 100644 --- a/Lib/types.py +++ b/Lib/types.py @@ -189,18 +189,19 @@ def get_original_bases(cls, /): class DynamicClassAttribute: """Route attribute access on a class to __getattr__. - This is a descriptor, used to define attributes that act differently when - accessed through an instance and through a class. Instance access remains - normal, but access to an attribute through a class will be routed to the - class's __getattr__ method; this is done by raising AttributeError. + This is a descriptor, used to define attributes that act differently + when accessed through an instance and through a class. Instance access + remains normal, but access to an attribute through a class will be + routed to the class's __getattr__ method; this is done by raising + AttributeError. - This allows one to have properties active on an instance, and have virtual - attributes on the class with the same name. (Enum used this between Python - versions 3.4 - 3.9 .) + This allows one to have properties active on an instance, and have + virtual attributes on the class with the same name. (Enum used this + between Python versions 3.4 - 3.9 .) - Subclass from this to use a different method of accessing virtual attributes - and still be treated properly by the inspect module. (Enum uses this since - Python 3.10 .) + Subclass from this to use a different method of accessing virtual + attributes and still be treated properly by the inspect module. (Enum + uses this since Python 3.10 .) """ def __init__(self, fget=None, fset=None, fdel=None, doc=None): diff --git a/Lib/typing.py b/Lib/typing.py index 5da5cb0d2..8c36399a6 100644 --- a/Lib/typing.py +++ b/Lib/typing.py @@ -5,7 +5,7 @@ Among other things, the module includes the following: * Generic, Protocol, and internal machinery to support generic aliases. All subscripted types like X[int], Union[int, str] are generic aliases. * Various "special forms" that have unique meanings in type annotations: - NoReturn, Never, ClassVar, Self, Concatenate, Unpack, and others. + Any, Never, ClassVar, Self, Concatenate, Unpack, and others. * Classes whose instances can be type arguments to generic classes and functions: TypeVar, ParamSpec, TypeVarTuple. * Public helper functions: get_type_hints, overload, cast, final, and others. @@ -588,12 +588,12 @@ class _AnyMeta(type): class Any(metaclass=_AnyMeta): """Special type indicating an unconstrained type. - - Any is compatible with every type. - - Any assumed to have all methods. - - All values assumed to be instances of Any. + - Any is assignable to every type. + - Any assumed to have all methods and attributes. + - All values are assignable to Any. Note that all the above statements are true from the point of view of - static type checkers. At runtime, Any should not be used with instance + static type checkers. At runtime, Any cannot be used with instance checks. """ @@ -712,7 +712,7 @@ def ClassVar(self, parameters): ClassVar accepts only types and cannot be further subscribed. - Note that ClassVar is not a class itself, and should not + Note that ClassVar is not a class itself, and cannot be used with isinstance() or issubclass(). """ item = _type_check(parameters, f'{self} accepts only single type.', allow_special_forms=True) @@ -742,7 +742,7 @@ def Final(self, parameters): @_SpecialForm def Optional(self, parameters): - """Optional[X] is equivalent to Union[X, None].""" + """Optional[X] is equivalent to X | None.""" arg = _type_check(parameters, f"{self} requires a single type.") return Union[arg, type(None)] @@ -785,7 +785,7 @@ def Literal(self, *parameters): def TypeAlias(self, parameters): """Special form for marking type aliases. - Use TypeAlias to indicate that an assignment should + TypeAlias can be used to indicate that an assignment should be recognized as a proper type alias definition by type checkers. @@ -1780,7 +1780,7 @@ def Unpack(self, parameters): def foo(**kwargs: Unpack[Movie]): ... Note that there is only some runtime checking of this operator. Not - everything the runtime allows may be accepted by static type checkers. + everything the runtime allows is accepted by static type checkers. For more information, see PEPs 646 and 692. """ @@ -2261,7 +2261,7 @@ def runtime_checkable(cls): Such protocol can be used with isinstance() and issubclass(). Raise TypeError if applied to a non-protocol class. This allows a simple-minded structural check very similar to - one trick ponies in collections.abc such as Iterable. + one-trick ponies in collections.abc such as Iterable. For example:: @@ -2328,8 +2328,8 @@ def get_type_hints(obj, globalns=None, localns=None, include_extras=False, *, format=None): """Return type hints for an object. - This is often the same as obj.__annotations__, but it handles - forward references encoded as string literals and recursively replaces all + This is often the same as annotationlib.get_annotations(obj) or obj.__annotations__, + but it handles forward references encoded as string literals and recursively replaces all 'Annotated[T, ...]' with 'T' (unless 'include_extras=True'). The argument may be a module, class, method, or function. The annotations @@ -2541,7 +2541,7 @@ def get_args(tp): def is_typeddict(tp): - """Check if an annotation is a TypedDict class. + """Check if an object is a TypedDict class. For example:: @@ -2655,20 +2655,9 @@ _overload_registry = defaultdict(functools.partial(defaultdict, dict)) def overload(func): """Decorator for overloaded functions/methods. - In a stub file, place two or more stub definitions for the same - function in a row, each decorated with @overload. - - For example:: - - @overload - def utf8(value: None) -> None: ... - @overload - def utf8(value: bytes) -> bytes: ... - @overload - def utf8(value: str) -> bytes: ... - - In a non-stub file (i.e. a regular .py file), do the same but - follow it with an implementation. The implementation should *not* + In a non-stub file, place two or more stub definitions for the same + function in a row, each decorated with @overload, followed + by an implementation. The implementation should *not* be decorated with @overload:: @overload @@ -2680,6 +2669,16 @@ def overload(func): def utf8(value): ... # implementation goes here + In a stub file or in an abstract method (for example, in a Protocol definition), + the implementation may be omitted:: + + @overload + def utf8(value: None) -> None: ... + @overload + def utf8(value: bytes) -> bytes: ... + @overload + def utf8(value: str) -> bytes: ... + The overloads for a function can be retrieved at runtime using the get_overloads() function. """ @@ -2714,7 +2713,7 @@ def final(f): """Decorator to indicate final methods and final classes. Use this decorator to indicate to type checkers that the decorated - method cannot be overridden, and decorated class cannot be subclassed. + method cannot be overridden, and the decorated class cannot be subclassed. For example:: @@ -2756,7 +2755,7 @@ T_co = TypeVar('T_co', covariant=True) # Any type covariant containers. V_co = TypeVar('V_co', covariant=True) # Any type covariant containers. VT_co = TypeVar('VT_co', covariant=True) # Value type covariant containers. T_contra = TypeVar('T_contra', contravariant=True) # Ditto contravariant. -# Internal type variable used for Type[]. +# Internal type bound to class object types. CT_co = TypeVar('CT_co', covariant=True, bound=type) @@ -2847,7 +2846,7 @@ Type.__doc__ = \ And a function that takes a class argument that's a subclass of User and returns an instance of the corresponding class:: - def new_user[U](user_class: Type[U]) -> U: + def new_user[U](user_class: type[U]) -> U: user = user_class() # (Here we could write the user object to a database) return user @@ -2860,7 +2859,7 @@ Type.__doc__ = \ @runtime_checkable class SupportsInt(Protocol): - """An ABC with one abstract method __int__.""" + """A protocol with one abstract method __int__.""" __slots__ = () @@ -2871,7 +2870,7 @@ class SupportsInt(Protocol): @runtime_checkable class SupportsFloat(Protocol): - """An ABC with one abstract method __float__.""" + """A protocol with one abstract method __float__.""" __slots__ = () @@ -2882,7 +2881,7 @@ class SupportsFloat(Protocol): @runtime_checkable class SupportsComplex(Protocol): - """An ABC with one abstract method __complex__.""" + """A protocol with one abstract method __complex__.""" __slots__ = () @@ -2893,7 +2892,7 @@ class SupportsComplex(Protocol): @runtime_checkable class SupportsBytes(Protocol): - """An ABC with one abstract method __bytes__.""" + """A protocol with one abstract method __bytes__.""" __slots__ = () @@ -2904,7 +2903,7 @@ class SupportsBytes(Protocol): @runtime_checkable class SupportsIndex(Protocol): - """An ABC with one abstract method __index__.""" + """A protocol with one abstract method __index__.""" __slots__ = () @@ -2915,7 +2914,7 @@ class SupportsIndex(Protocol): @runtime_checkable class SupportsAbs[T](Protocol): - """An ABC with one abstract method __abs__ that is covariant in its return type.""" + """A protocol with one abstract method __abs__ that is covariant in its return type.""" __slots__ = () @@ -2926,7 +2925,7 @@ class SupportsAbs[T](Protocol): @runtime_checkable class SupportsRound[T](Protocol): - """An ABC with one abstract method __round__ that is covariant in its return type.""" + """A protocol with one abstract method __round__ that is covariant in its return type.""" __slots__ = () @@ -3043,7 +3042,7 @@ class NamedTupleMeta(type): def NamedTuple(typename, fields=_sentinel, /, **kwargs): - """Typed version of namedtuple. + """Typed version of collections.namedtuple. Usage:: @@ -3055,8 +3054,8 @@ def NamedTuple(typename, fields=_sentinel, /, **kwargs): Employee = collections.namedtuple('Employee', ['name', 'id']) - The resulting class has an extra __annotations__ attribute, giving a - dict that maps field names to types. (The field names are also in + The types for each field name can be retrieved by calling + annotationlib.get_annotations(Employee). (The field names are also in the _fields attribute, which is part of the namedtuple API.) An alternative equivalent functional syntax is also accepted:: @@ -3145,7 +3144,7 @@ class _TypedDictMeta(type): This method is called when TypedDict is subclassed, or when TypedDict is instantiated. This way - TypedDict supports all three syntax forms described in its docstring. + TypedDict classes can be created through both class-based and functional syntax. Subclasses and instances of TypedDict return actual dictionaries. """ for base in bases: @@ -3294,14 +3293,22 @@ def TypedDict(typename, fields=_sentinel, /, *, total=True): >>> Point2D(x=1, y=2, label='first') == dict(x=1, y=2, label='first') True - The type info can be accessed via the Point2D.__annotations__ dict, and - the Point2D.__required_keys__ and Point2D.__optional_keys__ frozensets. + The type info can be accessed by calling annotationlib.get_annotations(Point2D), and + via the Point2D.__required_keys__ and Point2D.__optional_keys__ frozensets. TypedDict supports an additional equivalent form:: Point2D = TypedDict('Point2D', {'x': int, 'y': int, 'label': str}) By default, all keys must be present in a TypedDict. It is possible - to override this by specifying totality:: + to override this by using the NotRequired and Required special forms:: + + class Point2D(TypedDict): + x: int # the "x" key must always be present (Required is the default) + y: NotRequired[int] # the "y" key can be omitted + + This means that a Point2D TypedDict can have the "y" key omitted, but the "x" key must be present. + Items are required by default, so the Required special form is not necessary in this example. + In addition, the total argument to the TypedDict function can be used to make all items not required:: class Point2D(TypedDict, total=False): x: int @@ -3310,16 +3317,8 @@ def TypedDict(typename, fields=_sentinel, /, *, total=True): This means that a Point2D TypedDict can have any of the keys omitted. A type checker is only expected to support a literal False or True as the value of the total argument. True is the default, and makes all items defined in the - class body be required. - - The Required and NotRequired special forms can also be used to mark - individual keys as being required or not required:: - - class Point2D(TypedDict): - x: int # the "x" key must always be present (Required is the default) - y: NotRequired[int] # the "y" key can be omitted - - See PEP 655 for more details on Required and NotRequired. + class body be required. The Required special form can be used to mark individual + keys as required in a total=False TypedDict. The ReadOnly special form can be used to mark individual keys as immutable for type checkers:: @@ -3328,6 +3327,7 @@ def TypedDict(typename, fields=_sentinel, /, *, total=True): id: ReadOnly[int] # the "id" key must not be modified username: str # the "username" key can be changed + See PEPs 589, 655, and 705 for more information. """ if fields is _sentinel or fields is None: import warnings @@ -3374,7 +3374,7 @@ def Required(self, parameters): year: int m = Movie( - title='The Matrix', # typechecker error if key is omitted + title='The Matrix', # type checker error if key is omitted year=1999, ) @@ -3396,7 +3396,7 @@ def NotRequired(self, parameters): year: NotRequired[int] m = Movie( - title='The Matrix', # typechecker error if key is omitted + title='The Matrix', # type checker error if key is omitted year=1999, ) """ @@ -3416,7 +3416,7 @@ def ReadOnly(self, parameters): def mutate_movie(m: Movie) -> None: m["year"] = 1992 # allowed - m["title"] = "The Matrix" # typechecker error + m["title"] = "The Matrix" # type checker error There is no runtime checking for this property. """ @@ -3503,8 +3503,8 @@ class IO(Generic[AnyStr]): classes (text vs. binary, read vs. write vs. read/write, append-only, unbuffered). The TextIO and BinaryIO subclasses below capture the distinctions between text vs. binary, which is - pervasive in the interface; however we currently do not offer a - way to track the other distinctions in the type system. + pervasive in the interface. For more precise types, define a custom + Protocol. """ __slots__ = () @@ -3594,7 +3594,7 @@ class IO(Generic[AnyStr]): class BinaryIO(IO[bytes]): - """Typed version of the return of open() in binary mode.""" + """Typed approximation of the return of open() in binary mode.""" __slots__ = () @@ -3608,7 +3608,7 @@ class BinaryIO(IO[bytes]): class TextIO(IO[str]): - """Typed version of the return of open() in text mode.""" + """Typed approximation of the return of open() in text mode.""" __slots__ = () @@ -3675,7 +3675,7 @@ def dataclass_transform( field_specifiers: tuple[type[Any] | Callable[..., Any], ...] = (), **kwargs: Any, ) -> _IdentityCallable: - """Decorator to mark an object as providing dataclass-like behaviour. + """Decorator to mark an object as providing dataclass-like behavior. The decorator can be applied to a function, class, or metaclass. diff --git a/Lib/venv/scripts/common/activate b/Lib/venv/scripts/common/activate index 70673a265..241a8650b 100644 --- a/Lib/venv/scripts/common/activate +++ b/Lib/venv/scripts/common/activate @@ -17,7 +17,7 @@ deactivate () { # Call hash to forget past locations. Without forgetting # past locations the $PATH changes we made may not be respected. # See "man bash" for more details. hash is usually a builtin of your shell - hash -r 2> /dev/null + hash -r 2> /dev/null || true if [ -n "${_OLD_VIRTUAL_PS1:-}" ] ; then PS1="${_OLD_VIRTUAL_PS1:-}" @@ -73,4 +73,4 @@ fi # Call hash to forget past commands. Without forgetting # past commands the $PATH changes we made may not be respected -hash -r 2> /dev/null +hash -r 2> /dev/null || true diff --git a/Lib/zipfile/__init__.py b/Lib/zipfile/__init__.py index c8d8d3a2c..2b6e6163b 100644 --- a/Lib/zipfile/__init__.py +++ b/Lib/zipfile/__init__.py @@ -566,8 +566,12 @@ class ZipInfo: return header + filename + extra def _encodeFilenameFlags(self): + if self.flag_bits & _MASK_UTF_FILENAME: + encoding = 'ascii' + else: + encoding = 'cp437' try: - return self.filename.encode('ascii'), self.flag_bits + return self.filename.encode(encoding), self.flag_bits & ~_MASK_UTF_FILENAME except UnicodeEncodeError: return self.filename.encode('utf-8'), self.flag_bits | _MASK_UTF_FILENAME @@ -620,11 +624,12 @@ class ZipInfo: def from_file(cls, filename, arcname=None, *, strict_timestamps=True): """Construct an appropriate ZipInfo for a file on the filesystem. - filename should be the path to a file or directory on the filesystem. + filename should be the path to a file or directory on the + filesystem. - arcname is the name which it will have within the archive (by default, - this will be the same as filename, but without a drive letter and with - leading path separators removed). + arcname is the name which it will have within the archive (by + default, this will be the same as filename, but without a drive + letter and with leading path separators removed). """ if isinstance(filename, os.PathLike): filename = os.fspath(filename) @@ -663,9 +668,12 @@ class ZipInfo: Return self. """ # gh-91279: Set the SOURCE_DATE_EPOCH to a specific timestamp - epoch = os.environ.get('SOURCE_DATE_EPOCH') - get_time = int(epoch) if epoch else time.time() - self.date_time = time.localtime(get_time)[:6] + source_date_epoch = os.environ.get('SOURCE_DATE_EPOCH') + + if source_date_epoch: + self.date_time = time.gmtime(int(source_date_epoch))[:6] + else: + self.date_time = time.localtime(time.time())[:6] self.compress_type = archive.compression self.compress_level = archive.compresslevel @@ -1392,19 +1400,19 @@ class ZipFile: mode: The mode can be either read 'r', write 'w', exclusive create 'x', or append 'a'. compression: ZIP_STORED (no compression), ZIP_DEFLATED (requires zlib), - ZIP_BZIP2 (requires bz2), ZIP_LZMA (requires lzma), or - ZIP_ZSTANDARD (requires compression.zstd). - allowZip64: if True ZipFile will create files with ZIP64 extensions when - needed, otherwise it will raise an exception when this would - be necessary. - compresslevel: None (default for the given compression type) or an integer - specifying the level to pass to the compressor. - When using ZIP_STORED or ZIP_LZMA this keyword has no effect. - When using ZIP_DEFLATED integers 0 through 9 are accepted. - When using ZIP_BZIP2 integers 1 through 9 are accepted. - When using ZIP_ZSTANDARD integers -7 though 22 are common, - see the CompressionParameter enum in compression.zstd for - details. + ZIP_BZIP2 (requires bz2), ZIP_LZMA (requires lzma), or + ZIP_ZSTANDARD (requires compression.zstd). + allowZip64: if True ZipFile will create files with ZIP64 extensions + when needed, otherwise it will raise an exception when this + would be necessary. + compresslevel: None (default for the given compression type) or + an integer specifying the level to pass to the compressor. + When using ZIP_STORED or ZIP_LZMA this keyword has no effect. + When using ZIP_DEFLATED integers 0 through 9 are accepted. + When using ZIP_BZIP2 integers 1 through 9 are accepted. + When using ZIP_ZSTANDARD integers -7 though 22 are common, + see the CompressionParameter enum in compression.zstd for + details. """ @@ -1414,8 +1422,8 @@ class ZipFile: def __init__(self, file, mode="r", compression=ZIP_STORED, allowZip64=True, compresslevel=None, *, strict_timestamps=True, metadata_encoding=None): - """Open the ZIP file with mode read 'r', write 'w', exclusive create 'x', - or append 'a'.""" + """Open the ZIP file with mode read 'r', write 'w', exclusive create + 'x', or append 'a'.""" if mode not in ('r', 'w', 'x', 'a'): raise ValueError("ZipFile requires mode 'r', 'w', 'x', or 'a'") @@ -1693,10 +1701,10 @@ class ZipFile: pwd is the password to decrypt files (only used for reading). - When writing, if the file size is not known in advance but may exceed - 2 GiB, pass force_zip64 to use the ZIP64 format, which can handle large - files. If the size is known in advance, it is best to pass a ZipInfo - instance for name, with zinfo.file_size set. + When writing, if the file size is not known in advance but may + exceed 2 GiB, pass force_zip64 to use the ZIP64 format, which can + handle large files. If the size is known in advance, it is best to + pass a ZipInfo instance for name, with zinfo.file_size set. """ if mode not in {"r", "w"}: raise ValueError('open() requires mode "r" or "w"') @@ -1808,7 +1816,7 @@ class ZipFile: zinfo.compress_size = 0 zinfo.CRC = 0 - zinfo.flag_bits = 0x00 + zinfo.flag_bits = _MASK_UTF_FILENAME if zinfo.compress_type == ZIP_LZMA: # Compressed data includes an end-of-stream (EOS) marker zinfo.flag_bits |= _MASK_COMPRESS_OPTION_1 From 7da696661bbde40c73f288d53be2b5fabd30408b Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Mon, 15 Jun 2026 05:20:48 +0300 Subject: [PATCH 095/339] Reduce number of string clones when compiling python source code (#8103) --- Lib/test/test_thread.py | 2 +- benches/execution.rs | 2 +- benches/microbenchmarks.rs | 4 +-- crates/capi/src/ceval.rs | 2 +- crates/stdlib/src/_opcode.rs | 6 ++--- crates/vm/src/builtins/getset.rs | 7 +++--- crates/vm/src/eval.rs | 2 +- crates/vm/src/import.rs | 4 +-- crates/vm/src/stdlib/builtins.rs | 9 ++----- crates/vm/src/stdlib/sys.rs | 2 +- crates/vm/src/vm/compile.rs | 10 +++++--- crates/vm/src/vm/context.rs | 42 +++++++++++++++----------------- crates/vm/src/vm/interpreter.rs | 4 +-- crates/vm/src/vm/mod.rs | 2 +- crates/vm/src/vm/python_run.rs | 10 ++++---- crates/vm/src/vm/thread.rs | 7 ++++-- crates/wasm/src/vm_class.rs | 4 +-- examples/hello_embed.rs | 2 +- examples/mini_repl.rs | 2 +- src/lib.rs | 7 +++--- src/shell.rs | 2 +- 21 files changed, 63 insertions(+), 69 deletions(-) diff --git a/Lib/test/test_thread.py b/Lib/test/test_thread.py index 60f4d7c7d..dc5517442 100644 --- a/Lib/test/test_thread.py +++ b/Lib/test/test_thread.py @@ -115,7 +115,7 @@ class ThreadRunningTests(BasicThreadTest): thread.stack_size(0) - @unittest.skipIf(__import__("sys").platform == "linux", "TODO: RUSTPYTHON; Flakey on CI") + @unittest.skipIf(__import__("sys").platform in ("linux", "win32"), "TODO: RUSTPYTHON; Flakey on CI") def test__count(self): # Test the _count() function. orig = thread._count() diff --git a/benches/execution.rs b/benches/execution.rs index 2816f0e82..0eef88c8b 100644 --- a/benches/execution.rs +++ b/benches/execution.rs @@ -30,7 +30,7 @@ fn bench_rustpython_code(b: &mut Bencher, name: &str, source: &str) { // Note: bench_cpython is both compiling and executing the code. // As such we compile the code in the benchmark loop as well. b.iter(|| { - let code = vm.compile(source, Mode::Exec, name.to_owned()).unwrap(); + let code = vm.compile(source, Mode::Exec, name).unwrap(); let scope = vm.new_scope_with_builtins(); let res: PyResult = vm.run_code_obj(code.clone(), scope); vm.unwrap_pyresult(res); diff --git a/benches/microbenchmarks.rs b/benches/microbenchmarks.rs index 3fef2f8dd..34e0b6846 100644 --- a/benches/microbenchmarks.rs +++ b/benches/microbenchmarks.rs @@ -118,10 +118,10 @@ fn bench_rustpython_code(group: &mut BenchmarkGroup<WallTime>, bench: &MicroBenc let interp = builder.add_native_modules(&defs).build(); interp.enter(|vm| { let setup_code = vm - .compile(&bench.setup, Mode::Exec, bench.name.to_owned()) + .compile(&bench.setup, Mode::Exec, &bench.name) .expect("Error compiling setup code"); let bench_code = vm - .compile(&bench.code, Mode::Exec, bench.name.to_owned()) + .compile(&bench.code, Mode::Exec, &bench.name) .expect("Error compiling bench code"); let bench_func = |scope| { diff --git a/crates/capi/src/ceval.rs b/crates/capi/src/ceval.rs index be8d9c48b..d28dad4d6 100644 --- a/crates/capi/src/ceval.rs +++ b/crates/capi/src/ceval.rs @@ -38,7 +38,7 @@ pub unsafe extern "C" fn Py_CompileString( } }; - vm.compile(code, mode, filename.to_owned()) + vm.compile(code, mode, filename) .map_err(|err| vm.new_syntax_error(&err, Some(code))) }) } diff --git a/crates/stdlib/src/_opcode.rs b/crates/stdlib/src/_opcode.rs index bfdb06b30..2b2a70b55 100644 --- a/crates/stdlib/src/_opcode.rs +++ b/crates/stdlib/src/_opcode.rs @@ -192,7 +192,7 @@ mod tests { /// /// Memory addresses in the output are replaced with `0xdeadbeef` for consistency. fn dis(source: &str) -> String { - let fname = String::from("<?>"); + const FNAME: &str = "<?>"; let builder = vm::Interpreter::builder(Default::default()); let stdlib_defs = crate::stdlib_module_defs(&builder.ctx); @@ -204,7 +204,7 @@ mod tests { interp.enter(|vm| { let scope = vm.new_scope_with_builtins(); let code_obj = vm - .compile(source.trim(), Mode::Exec, fname.clone()) + .compile(source.trim(), Mode::Exec, FNAME) .map_err(|err| vm.new_syntax_error(&err, Some(source))) .unwrap(); scope.globals.set_item("code", code_obj.into(), vm).unwrap(); @@ -227,7 +227,7 @@ output = re.sub(r'(<code object \w+ at )0x[0-9a-fA-F]+', r'\g<1>0xdeadbeef', tmp "#; let py_code_obj = vm - .compile(py_source, Mode::Exec, fname) + .compile(py_source, Mode::Exec, FNAME) .map_err(|err| vm.new_syntax_error(&err, Some(py_source))) .unwrap(); diff --git a/crates/vm/src/builtins/getset.rs b/crates/vm/src/builtins/getset.rs index ab538922a..a2f687994 100644 --- a/crates/vm/src/builtins/getset.rs +++ b/crates/vm/src/builtins/getset.rs @@ -1,6 +1,5 @@ -/*! Python `attribute` descriptor class. (PyGetSet) +//! Python `attribute` descriptor class. (PyGetSet) -*/ use super::PyType; use crate::{ AsObject, Context, Py, PyObject, PyObjectRef, PyPayload, PyResult, VirtualMachine, @@ -71,9 +70,9 @@ impl GetDescriptor for PyGetSet { impl PyGetSet { #[must_use] - pub fn new(name: String, class: &'static Py<PyType>) -> Self { + pub fn new(name: &str, class: &'static Py<PyType>) -> Self { Self { - name, + name: name.into(), class: PointerSlot::from(class), getter: None, setter: None, diff --git a/crates/vm/src/eval.rs b/crates/vm/src/eval.rs index b69a4e05b..5f52799d0 100644 --- a/crates/vm/src/eval.rs +++ b/crates/vm/src/eval.rs @@ -1,7 +1,7 @@ use crate::{PyResult, VirtualMachine, compiler, scope::Scope}; pub fn eval(vm: &VirtualMachine, source: &str, scope: Scope, source_path: &str) -> PyResult { - match vm.compile(source, compiler::Mode::Eval, source_path.to_owned()) { + match vm.compile(source, compiler::Mode::Eval, source_path) { Ok(bytecode) => { debug!("Code object: {bytecode:?}"); vm.run_code_obj(bytecode, scope) diff --git a/crates/vm/src/import.rs b/crates/vm/src/import.rs index 798bc258b..d7e86422e 100644 --- a/crates/vm/src/import.rs +++ b/crates/vm/src/import.rs @@ -131,7 +131,7 @@ pub fn import_builtin(vm: &VirtualMachine, module_name: &str) -> PyResult { pub fn import_file( vm: &VirtualMachine, module_name: &str, - file_path: String, + file_path: &str, content: &str, ) -> PyResult { let code = vm @@ -151,7 +151,7 @@ pub fn import_source(vm: &VirtualMachine, module_name: &str, content: &str) -> P .compile_with_opts( content, crate::compiler::Mode::Exec, - "<source>".to_owned(), + "<source>", vm.compile_opts(), ) .map_err(|err| vm.new_syntax_error(&err, Some(content)))?; diff --git a/crates/vm/src/stdlib/builtins.rs b/crates/vm/src/stdlib/builtins.rs index 0bd04f332..d0ed32b22 100644 --- a/crates/vm/src/stdlib/builtins.rs +++ b/crates/vm/src/stdlib/builtins.rs @@ -424,12 +424,7 @@ mod builtins { opts.optimize = optimize; let code = vm - .compile_with_opts( - source, - mode, - filename.to_string_lossy().into_owned(), - opts, - ) + .compile_with_opts(source, mode, &filename.to_string_lossy(), opts) .map_err(|err| { (err, Some(source), allow_incomplete).to_pyexception(vm) })?; @@ -632,7 +627,7 @@ mod builtins { #[cfg(feature = "rustpython-compiler")] Either::A(string) => { let source = string.as_str(); - vm.compile(source, mode, "<string>".to_owned()) + vm.compile(source, mode, "<string>") .map_err(|err| vm.new_syntax_error(&err, Some(source)))? } #[cfg(not(feature = "rustpython-compiler"))] diff --git a/crates/vm/src/stdlib/sys.rs b/crates/vm/src/stdlib/sys.rs index ecc6ed170..58324a3c0 100644 --- a/crates/vm/src/stdlib/sys.rs +++ b/crates/vm/src/stdlib/sys.rs @@ -750,7 +750,7 @@ pub mod sys { handle .read_to_string(&mut source) .map_err(|e| vm.new_os_error(format!("Error reading from stdin: {e}")))?; - vm.compile(&source, crate::compiler::Mode::Single, "<stdin>".to_owned()) + vm.compile(&source, crate::compiler::Mode::Single, "<stdin>") .map_err(|e| vm.new_os_error(format!("Error running stdin: {e}")))?; Ok(()) } diff --git a/crates/vm/src/vm/compile.rs b/crates/vm/src/vm/compile.rs index 221df849f..2dbdb17ff 100644 --- a/crates/vm/src/vm/compile.rs +++ b/crates/vm/src/vm/compile.rs @@ -13,7 +13,7 @@ impl VirtualMachine { &self, source: &str, mode: compiler::Mode, - source_path: String, + source_path: &str, ) -> Result<PyRef<PyCode>, CompileError> { self.compile_with_opts(source, mode, source_path, self.compile_opts()) } @@ -22,15 +22,17 @@ impl VirtualMachine { &self, source: &str, mode: compiler::Mode, - source_path: String, + source_path: &str, opts: CompileOpts, ) -> Result<PyRef<PyCode>, CompileError> { - let code = compiler::compile(source, mode, &source_path, opts) + let code = compiler::compile(source, mode, source_path, opts) .map(|code| PyCode::new_ref_from_bytecode(self, code)); + #[cfg(feature = "parser")] if code.is_ok() { - self.emit_string_escape_warnings(source, &source_path); + self.emit_string_escape_warnings(source, source_path); } + code } } diff --git a/crates/vm/src/vm/context.rs b/crates/vm/src/vm/context.rs index 4d16c5d80..226d5f1a1 100644 --- a/crates/vm/src/vm/context.rs +++ b/crates/vm/src/vm/context.rs @@ -333,9 +333,11 @@ impl Context { ) }) .collect(); - let latin1_char_cache: Vec<PyRef<PyStr>> = (0u8..=255) + + let latin1_char_cache = (u8::MIN..=u8::MAX) .map(|b| create_object(PyStr::from(char::from(b)), types.str_type)) - .collect(); + .collect::<Vec<PyRef<PyStr>>>(); + let ascii_char_cache = latin1_char_cache[..128].to_vec(); let true_value = create_object(PyBool(PyInt::from(1)), types.bool_type); @@ -519,19 +521,20 @@ impl Context { fn latin1_singleton_index(s: &PyStr) -> Option<u8> { let mut cps = s.as_wtf8().code_points(); let cp = cps.next()?; - if cps.next().is_some() { - return None; - } - u8::try_from(cp.to_u32()).ok() + + cps.next() + .is_none() + .then(|| u8::try_from(cp.to_u32()).ok())? } #[inline] pub fn new_str(&self, s: impl Into<pystr::PyStr>) -> PyRef<PyStr> { let s = s.into(); if let Some(ch) = Self::latin1_singleton_index(&s) { - return self.latin1_char(ch); + self.latin1_char(ch) + } else { + s.into_ref(self) } - s.into_ref(self) } #[inline] @@ -544,9 +547,10 @@ impl Context { S: Into<PyStr> + AsRef<M>, M: MaybeInternedString, { - match self.interned_str(s.as_ref()) { - Some(s) => s.to_owned(), - None => self.new_str(s), + if let Some(s) = self.interned_str(s.as_ref()) { + s.to_owned() + } else { + self.new_str(s) } } @@ -617,11 +621,7 @@ impl Context { name: &str, bases: Option<Vec<PyTypeRef>>, ) -> PyTypeRef { - let bases = if let Some(bases) = bases { - bases - } else { - vec![self.exceptions.exception_type.to_owned()] - }; + let bases = bases.unwrap_or_else(|| vec![self.exceptions.exception_type.to_owned()]); let mut attrs = PyAttributes::default(); attrs.insert(identifier!(self, __module__), self.new_str(module).into()); @@ -692,21 +692,20 @@ impl Context { pub fn new_readonly_getset<F, T>( &self, - name: impl Into<String>, + name: &str, class: &'static Py<PyType>, f: F, ) -> PyRef<PyGetSet> where F: IntoPyGetterFunc<T>, { - let name = name.into(); let getset = PyGetSet::new(name, class).with_get(f); PyRef::new_ref(getset, self.types.getset_type.to_owned(), None) } pub fn new_static_getset<G, S, T, U>( &self, - name: impl Into<String>, + name: &str, class: &'static Py<PyType>, g: G, s: S, @@ -715,19 +714,18 @@ impl Context { G: IntoPyGetterFunc<T>, S: IntoPySetterFunc<U>, { - let name = name.into(); let getset = PyGetSet::new(name, class).with_get(g).with_set(s); PyRef::new_ref(getset, self.types.getset_type.to_owned(), None) } - /// Creates a new `PyGetSet` with a heap type. + /// Creates a new [`PyGetSet`] with a heap type. /// /// # Safety /// In practice, this constructor is safe because a getset is always owned by its `class` type. /// However, it can be broken if used unconventionally. pub unsafe fn new_getset<G, S, T, U>( &self, - name: impl Into<String>, + name: &str, class: &Py<PyType>, g: G, s: S, diff --git a/crates/vm/src/vm/interpreter.rs b/crates/vm/src/vm/interpreter.rs index 770e49341..79e3e190a 100644 --- a/crates/vm/src/vm/interpreter.rs +++ b/crates/vm/src/vm/interpreter.rs @@ -300,9 +300,7 @@ impl Default for InterpreterBuilder { /// let scope = vm.new_scope_with_builtins(); /// let source = r#"print("Hello World!")"#; /// let code_obj = vm.compile( -/// source, -/// Mode::Exec, -/// "<embedded>".to_owned(), +/// source, Mode::Exec, "<embedded>" /// ).map_err(|err| vm.new_syntax_error(&err, Some(source))).unwrap(); /// vm.run_code_obj(code_obj, scope).unwrap(); /// }); diff --git a/crates/vm/src/vm/mod.rs b/crates/vm/src/vm/mod.rs index 699c751fc..eb6546c02 100644 --- a/crates/vm/src/vm/mod.rs +++ b/crates/vm/src/vm/mod.rs @@ -2285,7 +2285,7 @@ mod tests { let source = "from dir_module.dir_module_inner import value2"; let code_obj = vm - .compile(source, vm::compiler::Mode::Exec, "<embedded>".to_owned()) + .compile(source, vm::compiler::Mode::Exec, "<embedded>") .map_err(|err| vm.new_syntax_error(&err, Some(source))) .unwrap(); diff --git a/crates/vm/src/vm/python_run.rs b/crates/vm/src/vm/python_run.rs index ccb295465..c21b437b5 100644 --- a/crates/vm/src/vm/python_run.rs +++ b/crates/vm/src/vm/python_run.rs @@ -13,13 +13,13 @@ impl VirtualMachine { /// Execute a string of Python code in a new scope with builtins. pub fn run_simple_string(&self, source: &str) -> PyResult { let scope = self.new_scope_with_builtins(); - self.run_string(scope, source, "<string>".to_owned()) + self.run_string(scope, source, "<string>") } /// PyRun_String /// /// Execute a string of Python code with explicit scope and source path. - pub fn run_string(&self, scope: Scope, source: &str, source_path: String) -> PyResult { + pub fn run_string(&self, scope: Scope, source: &str, source_path: &str) -> PyResult { let code_obj = self .compile(source, compiler::Mode::Exec, source_path) .map_err(|err| self.new_syntax_error(&err, Some(source)))?; @@ -40,13 +40,13 @@ impl VirtualMachine { } #[deprecated(note = "use run_string instead")] - pub fn run_code_string(&self, scope: Scope, source: &str, source_path: String) -> PyResult { + pub fn run_code_string(&self, scope: Scope, source: &str, source_path: &str) -> PyResult { self.run_string(scope, source, source_path) } pub fn run_block_expr(&self, scope: Scope, source: &str) -> PyResult { let code_obj = self - .compile(source, compiler::Mode::BlockExpr, "<embedded>".to_owned()) + .compile(source, compiler::Mode::BlockExpr, "<embedded>") .map_err(|err| self.new_syntax_error(&err, Some(source)))?; self.run_code_obj(code_obj, scope) } @@ -108,7 +108,7 @@ mod file_run { match crate::host_env::fs::read_to_string(path) { Ok(source) => { let code_obj = self - .compile(&source, compiler::Mode::Exec, path.to_owned()) + .compile(&source, compiler::Mode::Exec, path) .map_err(|err| self.new_syntax_error(&err, Some(&source)))?; self.run_code_obj(code_obj, scope)?; } diff --git a/crates/vm/src/vm/thread.rs b/crates/vm/src/vm/thread.rs index f89cf818d..33fcec5e4 100644 --- a/crates/vm/src/vm/thread.rs +++ b/crates/vm/src/vm/thread.rs @@ -2,10 +2,11 @@ use super::FramePtr; #[cfg(feature = "threading")] use crate::builtins::PyBaseExceptionRef; -use crate::frame::Frame; -use crate::{AsObject, PyObject, VirtualMachine}; #[cfg(feature = "threading")] use alloc::sync::Arc; + +use crate::frame::Frame; +use crate::{AsObject, PyObject, VirtualMachine}; use core::{ cell::{Cell, RefCell}, ptr::NonNull, @@ -129,6 +130,7 @@ pub fn enter_vm<R>(vm: &VirtualMachine, f: impl FnOnce() -> R) -> R { detach_thread(); } } + set_current_vm(vm, f) } @@ -538,6 +540,7 @@ pub fn cleanup_current_thread_frames(vm: &VirtualMachine) { } else { None }; + #[cfg(all(unix, feature = "threading"))] if let Some(slot) = &_removed && vm.state.stop_the_world.requested.load(Ordering::Acquire) diff --git a/crates/wasm/src/vm_class.rs b/crates/wasm/src/vm_class.rs index cface5b38..08cb49ecf 100644 --- a/crates/wasm/src/vm_class.rs +++ b/crates/wasm/src/vm_class.rs @@ -263,7 +263,7 @@ impl WASMVirtualMachine { ) -> Result<(), JsValue> { self.with_vm(|vm, _| { let code = vm - .compile(source, Mode::Exec, name.clone()) + .compile(source, Mode::Exec, &name) .map_err(convert::syntax_err)?; let attrs = vm.ctx.new_dict(); attrs @@ -327,7 +327,7 @@ impl WASMVirtualMachine { ) -> Result<JsValue, JsValue> { self.with_vm(|vm, StoredVirtualMachine { scope, .. }| { let source_path = source_path.unwrap_or_else(|| "<wasm>".to_owned()); - let code = vm.compile(source, mode, source_path); + let code = vm.compile(source, mode, &source_path); let code = code.map_err(convert::syntax_err)?; let result = vm.run_code_obj(code, scope.clone()); convert::pyresult_to_js_result(vm, result) diff --git a/examples/hello_embed.rs b/examples/hello_embed.rs index 958fdaaf4..9e1cdb829 100644 --- a/examples/hello_embed.rs +++ b/examples/hello_embed.rs @@ -5,7 +5,7 @@ fn main() -> vm::PyResult<()> { let scope = vm.new_scope_with_builtins(); let source = r#"print("Hello World!")"#; let code_obj = vm - .compile(source, vm::compiler::Mode::Exec, "<embedded>".to_owned()) + .compile(source, vm::compiler::Mode::Exec, "<embedded>") .map_err(|err| vm.new_syntax_error(&err, Some(source)))?; vm.run_code_obj(code_obj, scope)?; diff --git a/examples/mini_repl.rs b/examples/mini_repl.rs index d7baa4692..40d111732 100644 --- a/examples/mini_repl.rs +++ b/examples/mini_repl.rs @@ -65,7 +65,7 @@ def fib(n): // this line also automatically prints the output // (note that this is only the case when compiler::Mode::Single is passed to vm.compile) match vm - .compile(&input, vm::compiler::Mode::Single, "<embedded>".to_owned()) + .compile(&input, vm::compiler::Mode::Single, "<embedded>") .map_err(|err| vm.new_syntax_error(&err, Some(&input))) .and_then(|code_obj| vm.run_code_obj(code_obj, scope.clone())) { diff --git a/src/lib.rs b/src/lib.rs index d7dc6255e..9a5cede9b 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -146,7 +146,7 @@ __import__("io").TextIOWrapper( .downcast() .expect("TextIOWrapper.read() should return str"); eprintln!("running get-pip.py..."); - vm.run_string(scope, getpip_code.expect_str(), "get-pip.py".to_owned())?; + vm.run_string(scope, getpip_code.expect_str(), "get-pip.py")?; Ok(()) } @@ -190,7 +190,7 @@ fn run_file(vm: &VirtualMachine, scope: Scope, path: &str) -> PyResult<()> { // The VM itself has no filesystem access. let path = if path.is_empty() { "???" } else { path }; match std::fs::read_to_string(path) { - Ok(source) => vm.run_string(scope, &source, path.to_owned()).map(drop), + Ok(source) => vm.run_string(scope, &source, path).map(drop), Err(err) => Err(vm.new_os_error(err.to_string())), } } @@ -294,8 +294,7 @@ fn run_rustpython(vm: &VirtualMachine, run_mode: RunMode) -> PyResult<()> { let res = match run_mode { RunMode::Command(command) => { debug!("Running command {command}"); - vm.run_string(scope.clone(), &command, "<string>".to_owned()) - .map(drop) + vm.run_string(scope.clone(), &command, "<string>").map(drop) } RunMode::Module(module) => { debug!("Running module {module}"); diff --git a/src/shell.rs b/src/shell.rs index 6c75e9457..bc7ccec5c 100644 --- a/src/shell.rs +++ b/src/shell.rs @@ -32,7 +32,7 @@ fn shell_exec( // was actually compiled. #[cfg(windows)] let source = &source.replace("\r\n", "\n"); - match vm.compile(source, compiler::Mode::Single, "<stdin>".to_owned()) { + match vm.compile(source, compiler::Mode::Single, "<stdin>") { Ok(code) => { if empty_line_given || !continuing_block { // We want to execute the full code From 72052484ca9e0a4c17cf450c96e8b7471d036cd8 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Mon, 15 Jun 2026 05:21:13 +0300 Subject: [PATCH 096/339] clippy `significant_drop_in_scrutinee` & `explicit_deref_methods` (#8104) --- Cargo.toml | 2 + crates/common/src/borrow.rs | 2 +- crates/common/src/format.rs | 2 +- crates/stdlib/src/_asyncio.rs | 49 +++++++++++++++---------- crates/stdlib/src/_sqlite3.rs | 3 +- crates/stdlib/src/array.rs | 12 ++++-- crates/stdlib/src/ssl.rs | 3 +- crates/vm/src/builtins/classmethod.rs | 8 ++-- crates/vm/src/builtins/list.rs | 4 +- crates/vm/src/builtins/property.rs | 24 ++++++++---- crates/vm/src/builtins/set.rs | 17 ++++++--- crates/vm/src/builtins/staticmethod.rs | 9 +++-- crates/vm/src/builtins/type.rs | 8 ++-- crates/vm/src/datastack.rs | 5 ++- crates/vm/src/exceptions.rs | 11 ++++-- crates/vm/src/intern.rs | 7 +++- crates/vm/src/object/core.rs | 9 +++-- crates/vm/src/scope.rs | 2 +- crates/vm/src/stdlib/_ctypes/base.rs | 6 ++- crates/vm/src/stdlib/_ctypes/pointer.rs | 3 +- crates/vm/src/stdlib/_thread.rs | 3 +- crates/vm/src/types/slot.rs | 6 ++- 22 files changed, 124 insertions(+), 71 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 256a4772a..81bbdebeb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -373,6 +373,7 @@ needless_collect = "warn" or_fun_call = "warn" redundant_clone = "warn" search_is_some = "warn" +significant_drop_in_scrutinee = "warn" single_option_map = "warn" trait_duplication_in_bounds = "warn" unused_peekable = "warn" @@ -386,6 +387,7 @@ cloned_instead_of_copied = "warn" collapsible_else_if = "warn" comparison_chain = "warn" duration_suboptimal_units = "warn" +explicit_deref_methods = "warn" explicit_into_iter_loop = "warn" explicit_iter_loop = "warn" filter_map_next = "warn" diff --git a/crates/common/src/borrow.rs b/crates/common/src/borrow.rs index d8389479b..2be5f8275 100644 --- a/crates/common/src/borrow.rs +++ b/crates/common/src/borrow.rs @@ -68,7 +68,7 @@ impl<T: ?Sized> Deref for BorrowedValue<'_, T> { impl fmt::Display for BorrowedValue<'_, str> { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - fmt::Display::fmt(self.deref(), f) + fmt::Display::fmt(&**self, f) } } diff --git a/crates/common/src/format.rs b/crates/common/src/format.rs index af20b5746..ea4598869 100644 --- a/crates/common/src/format.rs +++ b/crates/common/src/format.rs @@ -1054,7 +1054,7 @@ impl FormatSpec { cmp::max(0, (w as i32) - (num_chars as i32) - (sign_str.len() as i32)) }); - let magnitude_str = magnitude_str.deref(); + let magnitude_str = &**magnitude_str; match align { FormatAlign::Left => format!( "{}{}{}", diff --git a/crates/stdlib/src/_asyncio.rs b/crates/stdlib/src/_asyncio.rs index ee5e207d4..48be4115e 100644 --- a/crates/stdlib/src/_asyncio.rs +++ b/crates/stdlib/src/_asyncio.rs @@ -224,10 +224,12 @@ pub(crate) mod _asyncio { } FutureState::Finished => { self.fut_log_tb.store(false, Ordering::Relaxed); - if let Some(exc) = self.fut_exception.read().clone() { + let fut_exception = self.fut_exception.read().clone(); + if let Some(exc) = fut_exception { let exc: PyBaseExceptionRef = exc.downcast().unwrap(); // Restore the original traceback to prevent traceback accumulation - if let Some(tb) = self.fut_exception_tb.read().clone() { + let fut_exception_tb = self.fut_exception_tb.read().clone(); + if let Some(tb) = fut_exception_tb { let _ = exc.set___traceback__(tb, vm); } Err(exc) @@ -612,7 +614,8 @@ pub(crate) mod _asyncio { fn _callbacks(&self, vm: &VirtualMachine) -> PyObjectRef { let mut result = Vec::new(); - if let Some(cb0) = self.fut_callback0.read().clone() { + let fut_callback0 = self.fut_callback0.read().clone(); + if let Some(cb0) = fut_callback0 { let ctx0 = self .fut_context0 .read() @@ -621,7 +624,8 @@ pub(crate) mod _asyncio { result.push(vm.ctx.new_tuple(vec![cb0, ctx0]).into()); } - if let Some(callbacks) = self.fut_callbacks.read().clone() { + let fut_callbacks = self.fut_callbacks.read().clone(); + if let Some(callbacks) = fut_callbacks { let list: PyListRef = callbacks.downcast().unwrap(); for item in list.borrow_vec().iter() { result.push(item.clone()); @@ -792,16 +796,12 @@ pub(crate) mod _asyncio { return Ok(()); } - let exc = zelf.fut_exception.read().clone(); - let exc = match exc { - Some(e) => e, - None => return Ok(()), + let Some(exc) = zelf.fut_exception.read().clone() else { + return Ok(()); }; - let loop_obj = zelf.fut_loop.read().clone(); - let loop_obj = match loop_obj { - Some(l) => l, - None => return Ok(()), + let Some(loop_obj) = zelf.fut_loop.read().clone() else { + return Ok(()); }; // Create context dict for call_exception_handler @@ -816,7 +816,8 @@ pub(crate) mod _asyncio { context.set_item(vm.ctx.intern_str("exception"), exc, vm)?; context.set_item(vm.ctx.intern_str("future"), zelf.to_owned().into(), vm)?; - if let Some(tb) = zelf.fut_source_tb.read().clone() { + let fut_source_tb = zelf.fut_source_tb.read().clone(); + if let Some(tb) = fut_source_tb { context.set_item(vm.ctx.intern_str("source_traceback"), tb, vm)?; } @@ -1248,12 +1249,15 @@ pub(crate) mod _asyncio { FutureState::Cancelled => Err(self.make_cancelled_error_impl(vm)), FutureState::Finished => { self.base.fut_log_tb.store(false, Ordering::Relaxed); - if let Some(exc) = self.base.fut_exception.read().clone() { + let fut_exception = self.base.fut_exception.read().clone(); + if let Some(exc) = fut_exception { let exc: PyBaseExceptionRef = exc.downcast().unwrap(); // Restore the original traceback to prevent traceback accumulation - if let Some(tb) = self.base.fut_exception_tb.read().clone() { + let fut_exception_tb = self.base.fut_exception_tb.read().clone(); + if let Some(tb) = fut_exception_tb { let _ = exc.set___traceback__(tb, vm); } + Err(exc) } else { Ok(self @@ -1517,7 +1521,8 @@ pub(crate) mod _asyncio { let msg_value = args.msg.flatten(); - if let Some(fut_waiter) = self.task_fut_waiter.read().clone() { + let task_fut_waiter = self.task_fut_waiter.read().clone(); + if let Some(fut_waiter) = task_fut_waiter { // Call cancel with msg=msg keyword argument let cancel_args = if let Some(ref m) = msg_value { FuncArgs::new( @@ -1795,7 +1800,9 @@ pub(crate) mod _asyncio { #[pygetset] fn _callbacks(&self, vm: &VirtualMachine) -> PyObjectRef { let mut result: Vec<PyObjectRef> = Vec::new(); - if let Some(cb) = self.base.fut_callback0.read().clone() { + + let fut_callback0 = self.base.fut_callback0.read().clone(); + if let Some(cb) = fut_callback0 { let ctx = self .base .fut_context0 @@ -1804,6 +1811,7 @@ pub(crate) mod _asyncio { .unwrap_or_else(|| vm.ctx.none()); result.push(vm.ctx.new_tuple(vec![cb, ctx]).into()); } + if let Some(callbacks) = self.base.fut_callbacks.read().clone() && let Ok(list) = callbacks.downcast::<PyList>() { @@ -1811,6 +1819,7 @@ pub(crate) mod _asyncio { result.push(item.clone()); } } + // Return None if no callbacks if result.is_empty() { vm.ctx.none() @@ -1859,7 +1868,8 @@ pub(crate) mod _asyncio { )?; context.set_item(vm.ctx.intern_str("task"), zelf.to_owned().into(), vm)?; - if let Some(tb) = zelf.base.fut_source_tb.read().clone() { + let fut_source_tb = zelf.base.fut_source_tb.read().clone(); + if let Some(tb) = fut_source_tb { context.set_item(vm.ctx.intern_str("source_traceback"), tb, vm)?; } @@ -1896,7 +1906,8 @@ pub(crate) mod _asyncio { context.set_item(vm.ctx.intern_str("exception"), exc, vm)?; context.set_item(vm.ctx.intern_str("future"), zelf.to_owned().into(), vm)?; - if let Some(tb) = zelf.base.fut_source_tb.read().clone() { + let fut_source_tb = zelf.base.fut_source_tb.read().clone(); + if let Some(tb) = fut_source_tb { context.set_item(vm.ctx.intern_str("source_traceback"), tb, vm)?; } diff --git a/crates/stdlib/src/_sqlite3.rs b/crates/stdlib/src/_sqlite3.rs index 5dfdf6f4f..cbe9b85c6 100644 --- a/crates/stdlib/src/_sqlite3.rs +++ b/crates/stdlib/src/_sqlite3.rs @@ -1520,7 +1520,8 @@ mod _sqlite3 { #[pygetset] fn autocommit(&self, vm: &VirtualMachine) -> PyObjectRef { - match *self.autocommit.lock() { + let mode = *self.autocommit.lock(); + match mode { AutocommitMode::Enabled => vm.ctx.true_value.clone().into(), AutocommitMode::Disabled => vm.ctx.false_value.clone().into(), AutocommitMode::Legacy => vm.ctx.new_int(LEGACY_TRANSACTION_CONTROL).into(), diff --git a/crates/stdlib/src/array.rs b/crates/stdlib/src/array.rs index e5f8e11a0..a496643fc 100644 --- a/crates/stdlib/src/array.rs +++ b/crates/stdlib/src/array.rs @@ -660,7 +660,8 @@ pub mod array { if let OptionalArg::Present(init) = init { if let Some(init) = init.downcast_ref::<Self>() { - match (spec, init.read().typecode()) { + let value = init.read().typecode(); + match (spec, value) { (spec, ch) if spec == ch => array.frombytes(&init.get_bytes()), (spec, 'u') => { return Err(vm.new_type_error(format!( @@ -1406,12 +1407,15 @@ pub mod array { } impl SelfIter for PyArrayIter {} + impl IterNext for PyArrayIter { fn next(zelf: &Py<Self>, vm: &VirtualMachine) -> PyResult<PyIterReturn> { zelf.internal.lock().next(|array, pos| { - Ok(match array.read().get(pos, vm) { - Some(item) => PyIterReturn::Return(item?), - None => PyIterReturn::StopIteration(None), + let value = array.read().get(pos, vm); + Ok(if let Some(item) = value { + PyIterReturn::Return(item?) + } else { + PyIterReturn::StopIteration(None) }) }) } diff --git a/crates/stdlib/src/ssl.rs b/crates/stdlib/src/ssl.rs index 121e25ed1..d4a01c9b1 100644 --- a/crates/stdlib/src/ssl.rs +++ b/crates/stdlib/src/ssl.rs @@ -3413,7 +3413,8 @@ mod _ssl { // Initialize connection if not already done if conn_guard.is_none() { // Check for pending context change (from SNI callback) - if let Some(new_ctx) = self.pending_context.write().take() { + let pending_context = self.pending_context.write().take(); + if let Some(new_ctx) = pending_context { *self.context.write() = new_ctx; } diff --git a/crates/vm/src/builtins/classmethod.rs b/crates/vm/src/builtins/classmethod.rs index f2821c3f1..a6c69eb50 100644 --- a/crates/vm/src/builtins/classmethod.rs +++ b/crates/vm/src/builtins/classmethod.rs @@ -170,9 +170,11 @@ impl PyClassMethod { #[pygetset] fn __isabstractmethod__(&self, vm: &VirtualMachine) -> PyObjectRef { - match vm.get_attribute_opt(self.callable.lock().clone(), "__isabstractmethod__") { - Ok(Some(is_abstract)) => is_abstract, - _ => vm.ctx.new_bool(false).into(), + let callable = self.callable.lock().clone(); + if let Ok(Some(is_abstract)) = vm.get_attribute_opt(callable, "__isabstractmethod__") { + is_abstract + } else { + vm.ctx.new_bool(false).into() } } diff --git a/crates/vm/src/builtins/list.rs b/crates/vm/src/builtins/list.rs index 2edb48852..2bdbaf63c 100644 --- a/crates/vm/src/builtins/list.rs +++ b/crates/vm/src/builtins/list.rs @@ -398,13 +398,13 @@ impl PyList { let (mut elements, version_before) = { let mut guard = self.elements.write(); let version_before = self.mutation_counter.load(Ordering::Relaxed); - (core::mem::take(guard.deref_mut()), version_before) + (core::mem::take(&mut *guard), version_before) }; let res = do_sort(vm, &mut elements, options.key, options.reverse); let mutated = { let mut guard = self.elements.write(); let mutated = self.mutation_counter.load(Ordering::Relaxed) != version_before; - core::mem::swap(guard.deref_mut(), &mut elements); + core::mem::swap(&mut *guard, &mut elements); mutated }; res?; diff --git a/crates/vm/src/builtins/property.rs b/crates/vm/src/builtins/property.rs index d01477dfc..cff5a8a60 100644 --- a/crates/vm/src/builtins/property.rs +++ b/crates/vm/src/builtins/property.rs @@ -54,9 +54,12 @@ impl GetDescriptor for PyProperty { ) -> PyResult { let (zelf, obj) = Self::_unwrap(&zelf_obj, obj, vm)?; if vm.is_none(&obj) { - Ok(zelf_obj) - } else if let Some(getter) = zelf.getter.read().clone() { - // Clone and release lock before calling Python code to prevent deadlock + return Ok(zelf_obj); + } + + // Clone and release lock before calling Python code to prevent deadlock + let value = zelf.getter.read().clone(); + if let Some(getter) = value { getter.call((obj,), vm) } else { let error_msg = zelf.format_property_error(&obj, "getter", vm)?; @@ -74,7 +77,8 @@ impl PyProperty { // Returns the name if available, None if not found, or propagates errors fn get_property_name(&self, vm: &VirtualMachine) -> PyResult<Option<PyObjectRef>> { // First check if name was set via __set_name__ - if let Some(name) = self.name.read().clone() { + let value = self.name.read().clone(); + if let Some(name) = value { return Ok(Some(name)); } @@ -110,7 +114,8 @@ impl PyProperty { match value { PySetterValue::Assign(value) => { // Clone and release lock before calling Python code to prevent deadlock - if let Some(setter) = zelf.setter.read().clone() { + let set = zelf.setter.read().clone(); + if let Some(setter) = set { setter.call((obj, value), vm).map(drop) } else { let error_msg = zelf.format_property_error(&obj, "setter", vm)?; @@ -119,7 +124,8 @@ impl PyProperty { } PySetterValue::Delete => { // Clone and release lock before calling Python code to prevent deadlock - if let Some(deleter) = zelf.deleter.read().clone() { + let del = zelf.deleter.read().clone(); + if let Some(deleter) = del { deleter.call((obj,), vm).map(drop) } else { let error_msg = zelf.format_property_error(&obj, "deleter", vm)?; @@ -224,7 +230,8 @@ impl PyProperty { Self::init(new_prop_ref.clone(), args, vm)?; // Copy the name if it exists - if let Some(name) = zelf.name.read().clone() { + let value = zelf.name.read().clone(); + if let Some(name) = value { *new_prop_ref.name.write() = Some(name); } @@ -296,7 +303,8 @@ impl PyProperty { #[pygetset(setter)] fn set___isabstractmethod__(&self, value: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> { // Clone and release lock before calling Python code to prevent deadlock - if let Some(getter) = self.getter.read().clone() { + let maybe_getter = self.getter.read().clone(); + if let Some(getter) = maybe_getter { getter.set_attr("__isabstractmethod__", value, vm)?; } Ok(()) diff --git a/crates/vm/src/builtins/set.rs b/crates/vm/src/builtins/set.rs index 136470c18..8b38223fc 100644 --- a/crates/vm/src/builtins/set.rs +++ b/crates/vm/src/builtins/set.rs @@ -5,12 +5,17 @@ use super::{ IterStatus, PositionIterInternal, PyDict, PyDictRef, PyGenericAlias, PyTupleRef, PyType, PyTypeRef, builtins_iter, }; -use crate::common::lock::LazyLock; use crate::{ AsObject, Context, Py, PyObject, PyObjectRef, PyPayload, PyRef, PyResult, TryFromObject, atomic_func, class::PyClassImpl, - common::{ascii, hash::PyHash, lock::PyMutex, rc::PyRc, wtf8::Wtf8Buf}, + common::{ + ascii, + hash::PyHash, + lock::{LazyLock, PyMutex}, + rc::PyRc, + wtf8::Wtf8Buf, + }, convert::ToPyResult, dict_inner::{self, DictSize}, function::{ArgIterable, FuncArgs, OptionalArg, PosArgs, PyArithmeticValue, PyComparisonValue}, @@ -24,9 +29,7 @@ use crate::{ utils::collection_repr, vm::VirtualMachine, }; -use alloc::fmt; -use core::borrow::Borrow; -use core::ops::Deref; +use core::{borrow::Borrow, fmt}; use rustpython_common::{ atomic::{Ordering, PyAtomic, Radium}, hash, @@ -924,10 +927,12 @@ impl Representable for PySet { fn repr_wtf8(zelf: &crate::Py<Self>, vm: &VirtualMachine) -> PyResult<Wtf8Buf> { let class = zelf.class(); let borrowed_name = class.name(); - let class_name = borrowed_name.deref(); + let class_name = &*borrowed_name; + if zelf.inner.len() == 0 { return Ok(Wtf8Buf::from(format!("{class_name}()"))); } + if let Some(_guard) = ReprGuard::enter(vm, zelf.as_object()) { let name = (class_name != "set").then_some(class_name); zelf.inner.repr(name, vm) diff --git a/crates/vm/src/builtins/staticmethod.rs b/crates/vm/src/builtins/staticmethod.rs index 55b03ce77..3a8d451b3 100644 --- a/crates/vm/src/builtins/staticmethod.rs +++ b/crates/vm/src/builtins/staticmethod.rs @@ -144,9 +144,12 @@ impl PyStaticMethod { #[pygetset] fn __isabstractmethod__(&self, vm: &VirtualMachine) -> PyObjectRef { - match vm.get_attribute_opt(self.callable.lock().clone(), "__isabstractmethod__") { - Ok(Some(is_abstract)) => is_abstract, - _ => vm.ctx.new_bool(false).into(), + let callable = self.callable.lock().clone(); + + if let Ok(Some(is_abstract)) = vm.get_attribute_opt(callable, "__isabstractmethod__") { + is_abstract + } else { + vm.ctx.new_bool(false).into() } } diff --git a/crates/vm/src/builtins/type.rs b/crates/vm/src/builtins/type.rs index c097a18a5..b3980c2c7 100644 --- a/crates/vm/src/builtins/type.rs +++ b/crates/vm/src/builtins/type.rs @@ -1281,14 +1281,14 @@ impl Py<PyType> { where F: Fn(&Self) -> R, { - self.mro.read().iter().map(|x| x.deref()).map(f).collect() + self.mro.read().iter().map(|x| &**x).map(f).collect() } pub fn mro_collect(&self) -> Vec<PyRef<PyType>> { self.mro .read() .iter() - .map(|x| x.deref()) + .map(|x| &**x) .map(|x| x.to_owned()) .collect() } @@ -2926,12 +2926,12 @@ fn best_base<'a>(bases: &'a [PyTypeRef], vm: &VirtualMachine) -> PyResult<&'a Py let candidate = solid_base(base_i, vm); if winner.is_none() { winner = Some(candidate); - base = Some(base_i.deref()); + base = Some(&**base_i); } else if winner.unwrap().fast_issubclass(candidate) { // Do nothing } else if candidate.fast_issubclass(winner.unwrap()) { winner = Some(candidate); - base = Some(base_i.deref()); + base = Some(&**base_i); } else { return Err(vm.new_type_error("multiple bases have instance layout conflict")); } diff --git a/crates/vm/src/datastack.rs b/crates/vm/src/datastack.rs index 7529263ac..101369fba 100644 --- a/crates/vm/src/datastack.rs +++ b/crates/vm/src/datastack.rs @@ -23,8 +23,9 @@ const MINIMUM_OVERHEAD: usize = 1000 * core::mem::size_of::<usize>(); /// Alignment for all data stack allocations. const ALIGN: usize = 16; -/// Header for a data stack chunk. The usable data region starts right after -/// this header (aligned to `ALIGN`). +/// Header for a data stack chunk. +/// +/// The usable data region starts right after this header (aligned to [`ALIGN`]). #[repr(C)] struct DataStackChunk { /// Previous chunk in the linked list (NULL for the root chunk). diff --git a/crates/vm/src/exceptions.rs b/crates/vm/src/exceptions.rs index 25f10d28b..df22f4d82 100644 --- a/crates/vm/src/exceptions.rs +++ b/crates/vm/src/exceptions.rs @@ -134,7 +134,9 @@ impl VirtualMachine { exc: &Py<PyBaseException>, ) -> Result<(), W::Error> { let vm = self; - if let Some(tb) = exc.traceback.read().clone() { + + let traceback = exc.traceback.read().clone(); + if let Some(tb) = traceback { writeln!(output, "Traceback (most recent call last):")?; for tb in tb.iter() { write_traceback_entry(output, &tb)?; @@ -162,9 +164,10 @@ impl VirtualMachine { ), }?; - match offer_suggestions(exc, vm) { - Some(suggestions) => writeln!(output, ". Did you mean: '{suggestions}'?"), - None => writeln!(output), + if let Some(suggestions) = offer_suggestions(exc, vm) { + writeln!(output, ". Did you mean: '{suggestions}'?") + } else { + writeln!(output) } } diff --git a/crates/vm/src/intern.rs b/crates/vm/src/intern.rs index 981732f2d..b475b4d9d 100644 --- a/crates/vm/src/intern.rs +++ b/crates/vm/src/intern.rs @@ -151,7 +151,7 @@ impl PyInterned<PyStr> { pub fn as_str(&self) -> &str { self.inner .to_str() - .unwrap_or_else(|| panic!("interned str is always valid UTF-8")) + .expect("interned str is always valid UTF-8") } } @@ -257,6 +257,7 @@ mod sealed { /// A sealed marker trait for `DictKey` types that always become an exact instance of `str` pub trait InternableString: sealed::SealedInternable + ToPyObject + AsRef<Self::Interned> { type Interned: MaybeInternedString + ?Sized; + fn into_pyref_exact(self, str_type: PyTypeRef) -> PyRefExact<PyStr>; } @@ -271,6 +272,7 @@ impl InternableString for String { impl InternableString for &str { type Interned = str; + #[inline] fn into_pyref_exact(self, str_type: PyTypeRef) -> PyRefExact<PyStr> { self.to_owned().into_pyref_exact(str_type) @@ -279,6 +281,7 @@ impl InternableString for &str { impl InternableString for Wtf8Buf { type Interned = Wtf8; + fn into_pyref_exact(self, str_type: PyTypeRef) -> PyRefExact<PyStr> { let obj = PyRef::new_ref(PyStr::from(self), str_type, None); unsafe { PyRefExact::new_unchecked(obj) } @@ -287,6 +290,7 @@ impl InternableString for Wtf8Buf { impl InternableString for &Wtf8 { type Interned = Wtf8; + fn into_pyref_exact(self, str_type: PyTypeRef) -> PyRefExact<PyStr> { self.to_owned().into_pyref_exact(str_type) } @@ -294,6 +298,7 @@ impl InternableString for &Wtf8 { impl InternableString for PyRefExact<PyStr> { type Interned = Py<PyStr>; + #[inline] fn into_pyref_exact(self, _str_type: PyTypeRef) -> PyRefExact<PyStr> { self diff --git a/crates/vm/src/object/core.rs b/crates/vm/src/object/core.rs index 57b190ca3..36bc0df0c 100644 --- a/crates/vm/src/object/core.rs +++ b/crates/vm/src/object/core.rs @@ -1489,7 +1489,7 @@ impl PyObject { #[inline(always)] pub fn class(&self) -> &Py<PyType> { - self.0.typ.deref() + &self.0.typ } pub fn set_class(&self, typ: PyTypeRef, vm: &VirtualMachine) { @@ -1835,7 +1835,8 @@ impl PyObject { result.push(dict_ref.into()); } for slot in &ext.slots { - if let Some(val) = slot.write().take() { + let value = slot.write().take(); + if let Some(val) = value { result.push(val); } } @@ -2130,7 +2131,7 @@ where { #[inline] fn eq(&self, other: &Self) -> bool { - self.deref().eq(other.deref()) + self.deref().eq(&**other) } } @@ -2407,7 +2408,7 @@ where { #[inline] fn eq(&self, other: &Self) -> bool { - self.deref().eq(other.deref()) + self.deref().eq(&**other) } } diff --git a/crates/vm/src/scope.rs b/crates/vm/src/scope.rs index 966e953cd..772d5c176 100644 --- a/crates/vm/src/scope.rs +++ b/crates/vm/src/scope.rs @@ -17,7 +17,7 @@ impl fmt::Debug for Scope { impl Scope { #[inline] #[must_use] - pub fn new(locals: Option<ArgMapping>, globals: PyDictRef) -> Self { + pub const fn new(locals: Option<ArgMapping>, globals: PyDictRef) -> Self { Self { locals, globals } } diff --git a/crates/vm/src/stdlib/_ctypes/base.rs b/crates/vm/src/stdlib/_ctypes/base.rs index 765bacd19..a339e3627 100644 --- a/crates/vm/src/stdlib/_ctypes/base.rs +++ b/crates/vm/src/stdlib/_ctypes/base.rs @@ -709,7 +709,8 @@ impl PyCData { let key = self.unique_key(index); // If we have a base object, find root and store there - if let Some(base_obj) = self.base.read().clone() { + let base = self.base.read().clone(); + if let Some(base_obj) = base { // Find root by walking up the base chain let root_obj = Self::find_root_object(&base_obj); Self::store_in_object(&root_obj, &key, keep, vm)?; @@ -761,7 +762,8 @@ impl PyCData { /// Uses unique_key (hierarchical) so nested fields don't collide. pub fn keep_alive(&self, index: usize, obj: PyObjectRef) { let key = self.unique_key(index); - if let Some(base_obj) = self.base.read().clone() { + let base = self.base.read().clone(); + if let Some(base_obj) = base { let root = Self::find_root_object(&base_obj); if let Some(cdata) = root.downcast_ref::<Self>() { cdata.kept_refs.write().insert(key, obj); diff --git a/crates/vm/src/stdlib/_ctypes/pointer.rs b/crates/vm/src/stdlib/_ctypes/pointer.rs index be165ee9f..36d86282e 100644 --- a/crates/vm/src/stdlib/_ctypes/pointer.rs +++ b/crates/vm/src/stdlib/_ctypes/pointer.rs @@ -373,7 +373,8 @@ impl PyCPointer { zelf.0.keep_ref(1, value.clone(), vm)?; // KeepRef: store GetKeepedObjects(dst) at index 0 - if let Some(kept) = cdata.objects.read().clone() { + let objects = cdata.objects.read().clone(); + if let Some(kept) = objects { zelf.0.keep_ref(0, kept, vm)?; } diff --git a/crates/vm/src/stdlib/_thread.rs b/crates/vm/src/stdlib/_thread.rs index ae612e4d5..f3e6bec89 100644 --- a/crates/vm/src/stdlib/_thread.rs +++ b/crates/vm/src/stdlib/_thread.rs @@ -947,7 +947,8 @@ pub(crate) mod _thread { let thread_id = current_thread_id(); // Fast path: check if dict exists under lock - if let Some(dict) = self.inner.data.lock().get(&thread_id).cloned() { + let value = self.inner.data.lock().get(&thread_id).cloned(); + if let Some(dict) = value { return dict; } diff --git a/crates/vm/src/types/slot.rs b/crates/vm/src/types/slot.rs index c982811fc..a56d1c493 100644 --- a/crates/vm/src/types/slot.rs +++ b/crates/vm/src/types/slot.rs @@ -1552,7 +1552,8 @@ impl PyType { let mro = self.mro.read(); // Look up in self's dict first - if let Some(attr) = self.attributes.read().get(name).cloned() { + let attr_name = self.attributes.read().get(name).cloned(); + if let Some(attr) = attr_name { if let Some(func) = try_extract(&attr, &mro) { return SlotLookupResult::NativeSlot(func); } @@ -1561,7 +1562,8 @@ impl PyType { // Look up in MRO (mro[0] is self, so skip it) for (i, cls) in mro[1..].iter().enumerate() { - if let Some(attr) = cls.attributes.read().get(name).cloned() { + let attr_name = cls.attributes.read().get(name).cloned(); + if let Some(attr) = attr_name { // Use the slice starting from this class in MRO if let Some(func) = try_extract(&attr, &mro[i + 1..]) { return SlotLookupResult::NativeSlot(func); From a1eeee28e4f0321638d1c6e2603760e659ae5944 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Mon, 15 Jun 2026 05:21:28 +0300 Subject: [PATCH 097/339] Update `idlelib` to 3.14.6 (#8105) * Update `idlelib/` to 3.14.6 * Update `test_idle.py` to 3.14.6 --- Lib/idlelib/CREDITS.txt | 48 + Lib/idlelib/ChangeLog | 1591 +++++++++++ Lib/idlelib/HISTORY.txt | 296 ++ Lib/idlelib/Icons/README.txt | 51 + Lib/idlelib/Icons/folder.gif | Bin 0 -> 120 bytes Lib/idlelib/Icons/idle.ico | Bin 0 -> 57746 bytes Lib/idlelib/Icons/idle_16.gif | Bin 0 -> 634 bytes Lib/idlelib/Icons/idle_16.png | Bin 0 -> 1031 bytes Lib/idlelib/Icons/idle_256.png | Bin 0 -> 31216 bytes Lib/idlelib/Icons/idle_32.gif | Bin 0 -> 1019 bytes Lib/idlelib/Icons/idle_32.png | Bin 0 -> 2036 bytes Lib/idlelib/Icons/idle_48.gif | Bin 0 -> 1388 bytes Lib/idlelib/Icons/idle_48.png | Bin 0 -> 3977 bytes Lib/idlelib/Icons/minusnode.gif | Bin 0 -> 75 bytes Lib/idlelib/Icons/openfolder.gif | Bin 0 -> 125 bytes Lib/idlelib/Icons/plusnode.gif | Bin 0 -> 78 bytes Lib/idlelib/Icons/python.gif | Bin 0 -> 380 bytes Lib/idlelib/Icons/tk.gif | Bin 0 -> 72 bytes Lib/idlelib/NEWS2x.txt | 660 +++++ Lib/idlelib/News3.txt | 1415 ++++++++++ Lib/idlelib/README.txt | 290 ++ Lib/idlelib/TODO.txt | 210 ++ Lib/idlelib/__init__.py | 10 + Lib/idlelib/__main__.py | 7 + Lib/idlelib/autocomplete.py | 228 ++ Lib/idlelib/autocomplete_w.py | 498 ++++ Lib/idlelib/autoexpand.py | 96 + Lib/idlelib/browser.py | 260 ++ Lib/idlelib/calltip.py | 205 ++ Lib/idlelib/calltip_w.py | 202 ++ Lib/idlelib/codecontext.py | 270 ++ Lib/idlelib/colorizer.py | 384 +++ Lib/idlelib/config-extensions.def | 62 + Lib/idlelib/config-highlight.def | 105 + Lib/idlelib/config-keys.def | 309 +++ Lib/idlelib/config-main.def | 92 + Lib/idlelib/config.py | 917 +++++++ Lib/idlelib/config_key.py | 354 +++ Lib/idlelib/configdialog.py | 2408 +++++++++++++++++ Lib/idlelib/debugger.py | 602 +++++ Lib/idlelib/debugger_r.py | 390 +++ Lib/idlelib/debugobj.py | 146 + Lib/idlelib/debugobj_r.py | 41 + Lib/idlelib/delegator.py | 34 + Lib/idlelib/dynoption.py | 57 + Lib/idlelib/editor.py | 1721 ++++++++++++ Lib/idlelib/extend.txt | 83 + Lib/idlelib/filelist.py | 132 + Lib/idlelib/format.py | 426 +++ Lib/idlelib/grep.py | 223 ++ Lib/idlelib/help.html | 868 ++++++ Lib/idlelib/help.py | 343 +++ Lib/idlelib/help_about.py | 211 ++ Lib/idlelib/history.py | 106 + Lib/idlelib/hyperparser.py | 312 +++ Lib/idlelib/idle.bat | 4 + Lib/idlelib/idle.py | 14 + Lib/idlelib/idle.pyw | 17 + Lib/idlelib/idle_test/README.txt | 241 ++ Lib/idlelib/idle_test/__init__.py | 23 + Lib/idlelib/idle_test/example_noext | 4 + Lib/idlelib/idle_test/example_stub.pyi | 4 + Lib/idlelib/idle_test/htest.py | 442 +++ Lib/idlelib/idle_test/mock_idle.py | 61 + Lib/idlelib/idle_test/mock_tk.py | 307 +++ Lib/idlelib/idle_test/template.py | 30 + Lib/idlelib/idle_test/test_autocomplete.py | 305 +++ Lib/idlelib/idle_test/test_autocomplete_w.py | 32 + Lib/idlelib/idle_test/test_autoexpand.py | 155 ++ Lib/idlelib/idle_test/test_browser.py | 257 ++ Lib/idlelib/idle_test/test_calltip.py | 372 +++ Lib/idlelib/idle_test/test_calltip_w.py | 29 + Lib/idlelib/idle_test/test_codecontext.py | 455 ++++ Lib/idlelib/idle_test/test_colorizer.py | 623 +++++ Lib/idlelib/idle_test/test_config.py | 805 ++++++ Lib/idlelib/idle_test/test_config_key.py | 356 +++ Lib/idlelib/idle_test/test_configdialog.py | 1580 +++++++++++ Lib/idlelib/idle_test/test_debugger.py | 297 ++ Lib/idlelib/idle_test/test_debugger_r.py | 36 + Lib/idlelib/idle_test/test_debugobj.py | 57 + Lib/idlelib/idle_test/test_debugobj_r.py | 22 + Lib/idlelib/idle_test/test_delegator.py | 44 + Lib/idlelib/idle_test/test_editmenu.py | 74 + Lib/idlelib/idle_test/test_editor.py | 241 ++ Lib/idlelib/idle_test/test_filelist.py | 33 + Lib/idlelib/idle_test/test_format.py | 668 +++++ Lib/idlelib/idle_test/test_grep.py | 156 ++ Lib/idlelib/idle_test/test_help.py | 36 + Lib/idlelib/idle_test/test_help_about.py | 182 ++ Lib/idlelib/idle_test/test_history.py | 172 ++ Lib/idlelib/idle_test/test_hyperparser.py | 276 ++ Lib/idlelib/idle_test/test_iomenu.py | 84 + Lib/idlelib/idle_test/test_macosx.py | 113 + Lib/idlelib/idle_test/test_mainmenu.py | 42 + Lib/idlelib/idle_test/test_multicall.py | 48 + Lib/idlelib/idle_test/test_outwin.py | 172 ++ Lib/idlelib/idle_test/test_parenmatch.py | 112 + Lib/idlelib/idle_test/test_pathbrowser.py | 86 + Lib/idlelib/idle_test/test_percolator.py | 118 + Lib/idlelib/idle_test/test_pyparse.py | 483 ++++ Lib/idlelib/idle_test/test_pyshell.py | 148 + Lib/idlelib/idle_test/test_query.py | 451 +++ Lib/idlelib/idle_test/test_redirector.py | 122 + Lib/idlelib/idle_test/test_replace.py | 294 ++ Lib/idlelib/idle_test/test_rpc.py | 29 + Lib/idlelib/idle_test/test_run.py | 433 +++ Lib/idlelib/idle_test/test_runscript.py | 33 + Lib/idlelib/idle_test/test_scrolledlist.py | 27 + Lib/idlelib/idle_test/test_search.py | 80 + Lib/idlelib/idle_test/test_searchbase.py | 160 ++ Lib/idlelib/idle_test/test_searchengine.py | 332 +++ Lib/idlelib/idle_test/test_sidebar.py | 775 ++++++ Lib/idlelib/idle_test/test_squeezer.py | 467 ++++ Lib/idlelib/idle_test/test_stackviewer.py | 41 + Lib/idlelib/idle_test/test_statusbar.py | 41 + Lib/idlelib/idle_test/test_text.py | 236 ++ Lib/idlelib/idle_test/test_textview.py | 233 ++ Lib/idlelib/idle_test/test_tooltip.py | 161 ++ Lib/idlelib/idle_test/test_tree.py | 60 + Lib/idlelib/idle_test/test_undo.py | 135 + Lib/idlelib/idle_test/test_util.py | 14 + Lib/idlelib/idle_test/test_warning.py | 73 + Lib/idlelib/idle_test/test_window.py | 45 + Lib/idlelib/idle_test/test_zoomheight.py | 39 + Lib/idlelib/idle_test/test_zzdummy.py | 152 ++ .../idle_test/tkinter_testing_utils.py | 62 + Lib/idlelib/iomenu.py | 468 ++++ Lib/idlelib/macosx.py | 278 ++ Lib/idlelib/mainmenu.py | 126 + Lib/idlelib/multicall.py | 451 +++ Lib/idlelib/outwin.py | 188 ++ Lib/idlelib/parenmatch.py | 183 ++ Lib/idlelib/pathbrowser.py | 107 + Lib/idlelib/percolator.py | 120 + Lib/idlelib/pyparse.py | 589 ++++ Lib/idlelib/pyshell.py | 1699 ++++++++++++ Lib/idlelib/query.py | 390 +++ Lib/idlelib/redirector.py | 174 ++ Lib/idlelib/replace.py | 299 ++ Lib/idlelib/rpc.py | 635 +++++ Lib/idlelib/run.py | 653 +++++ Lib/idlelib/runscript.py | 213 ++ Lib/idlelib/scrolledlist.py | 151 ++ Lib/idlelib/search.py | 165 ++ Lib/idlelib/searchbase.py | 210 ++ Lib/idlelib/searchengine.py | 234 ++ Lib/idlelib/sidebar.py | 543 ++++ Lib/idlelib/squeezer.py | 345 +++ Lib/idlelib/stackviewer.py | 134 + Lib/idlelib/statusbar.py | 52 + Lib/idlelib/textview.py | 193 ++ Lib/idlelib/tooltip.py | 190 ++ Lib/idlelib/tree.py | 509 ++++ Lib/idlelib/undo.py | 367 +++ Lib/idlelib/util.py | 37 + Lib/idlelib/window.py | 98 + Lib/idlelib/zoomheight.py | 124 + Lib/idlelib/zzdummy.py | 73 + Lib/test/test_idle.py | 25 + 159 files changed, 40997 insertions(+) create mode 100644 Lib/idlelib/CREDITS.txt create mode 100644 Lib/idlelib/ChangeLog create mode 100644 Lib/idlelib/HISTORY.txt create mode 100644 Lib/idlelib/Icons/README.txt create mode 100644 Lib/idlelib/Icons/folder.gif create mode 100644 Lib/idlelib/Icons/idle.ico create mode 100644 Lib/idlelib/Icons/idle_16.gif create mode 100644 Lib/idlelib/Icons/idle_16.png create mode 100644 Lib/idlelib/Icons/idle_256.png create mode 100644 Lib/idlelib/Icons/idle_32.gif create mode 100644 Lib/idlelib/Icons/idle_32.png create mode 100644 Lib/idlelib/Icons/idle_48.gif create mode 100644 Lib/idlelib/Icons/idle_48.png create mode 100644 Lib/idlelib/Icons/minusnode.gif create mode 100644 Lib/idlelib/Icons/openfolder.gif create mode 100644 Lib/idlelib/Icons/plusnode.gif create mode 100644 Lib/idlelib/Icons/python.gif create mode 100644 Lib/idlelib/Icons/tk.gif create mode 100644 Lib/idlelib/NEWS2x.txt create mode 100644 Lib/idlelib/News3.txt create mode 100644 Lib/idlelib/README.txt create mode 100644 Lib/idlelib/TODO.txt create mode 100644 Lib/idlelib/__init__.py create mode 100644 Lib/idlelib/__main__.py create mode 100644 Lib/idlelib/autocomplete.py create mode 100644 Lib/idlelib/autocomplete_w.py create mode 100644 Lib/idlelib/autoexpand.py create mode 100644 Lib/idlelib/browser.py create mode 100644 Lib/idlelib/calltip.py create mode 100644 Lib/idlelib/calltip_w.py create mode 100644 Lib/idlelib/codecontext.py create mode 100644 Lib/idlelib/colorizer.py create mode 100644 Lib/idlelib/config-extensions.def create mode 100644 Lib/idlelib/config-highlight.def create mode 100644 Lib/idlelib/config-keys.def create mode 100644 Lib/idlelib/config-main.def create mode 100644 Lib/idlelib/config.py create mode 100644 Lib/idlelib/config_key.py create mode 100644 Lib/idlelib/configdialog.py create mode 100644 Lib/idlelib/debugger.py create mode 100644 Lib/idlelib/debugger_r.py create mode 100644 Lib/idlelib/debugobj.py create mode 100644 Lib/idlelib/debugobj_r.py create mode 100644 Lib/idlelib/delegator.py create mode 100644 Lib/idlelib/dynoption.py create mode 100644 Lib/idlelib/editor.py create mode 100644 Lib/idlelib/extend.txt create mode 100644 Lib/idlelib/filelist.py create mode 100644 Lib/idlelib/format.py create mode 100644 Lib/idlelib/grep.py create mode 100644 Lib/idlelib/help.html create mode 100644 Lib/idlelib/help.py create mode 100644 Lib/idlelib/help_about.py create mode 100644 Lib/idlelib/history.py create mode 100644 Lib/idlelib/hyperparser.py create mode 100644 Lib/idlelib/idle.bat create mode 100644 Lib/idlelib/idle.py create mode 100644 Lib/idlelib/idle.pyw create mode 100644 Lib/idlelib/idle_test/README.txt create mode 100644 Lib/idlelib/idle_test/__init__.py create mode 100644 Lib/idlelib/idle_test/example_noext create mode 100644 Lib/idlelib/idle_test/example_stub.pyi create mode 100644 Lib/idlelib/idle_test/htest.py create mode 100644 Lib/idlelib/idle_test/mock_idle.py create mode 100644 Lib/idlelib/idle_test/mock_tk.py create mode 100644 Lib/idlelib/idle_test/template.py create mode 100644 Lib/idlelib/idle_test/test_autocomplete.py create mode 100644 Lib/idlelib/idle_test/test_autocomplete_w.py create mode 100644 Lib/idlelib/idle_test/test_autoexpand.py create mode 100644 Lib/idlelib/idle_test/test_browser.py create mode 100644 Lib/idlelib/idle_test/test_calltip.py create mode 100644 Lib/idlelib/idle_test/test_calltip_w.py create mode 100644 Lib/idlelib/idle_test/test_codecontext.py create mode 100644 Lib/idlelib/idle_test/test_colorizer.py create mode 100644 Lib/idlelib/idle_test/test_config.py create mode 100644 Lib/idlelib/idle_test/test_config_key.py create mode 100644 Lib/idlelib/idle_test/test_configdialog.py create mode 100644 Lib/idlelib/idle_test/test_debugger.py create mode 100644 Lib/idlelib/idle_test/test_debugger_r.py create mode 100644 Lib/idlelib/idle_test/test_debugobj.py create mode 100644 Lib/idlelib/idle_test/test_debugobj_r.py create mode 100644 Lib/idlelib/idle_test/test_delegator.py create mode 100644 Lib/idlelib/idle_test/test_editmenu.py create mode 100644 Lib/idlelib/idle_test/test_editor.py create mode 100644 Lib/idlelib/idle_test/test_filelist.py create mode 100644 Lib/idlelib/idle_test/test_format.py create mode 100644 Lib/idlelib/idle_test/test_grep.py create mode 100644 Lib/idlelib/idle_test/test_help.py create mode 100644 Lib/idlelib/idle_test/test_help_about.py create mode 100644 Lib/idlelib/idle_test/test_history.py create mode 100644 Lib/idlelib/idle_test/test_hyperparser.py create mode 100644 Lib/idlelib/idle_test/test_iomenu.py create mode 100644 Lib/idlelib/idle_test/test_macosx.py create mode 100644 Lib/idlelib/idle_test/test_mainmenu.py create mode 100644 Lib/idlelib/idle_test/test_multicall.py create mode 100644 Lib/idlelib/idle_test/test_outwin.py create mode 100644 Lib/idlelib/idle_test/test_parenmatch.py create mode 100644 Lib/idlelib/idle_test/test_pathbrowser.py create mode 100644 Lib/idlelib/idle_test/test_percolator.py create mode 100644 Lib/idlelib/idle_test/test_pyparse.py create mode 100644 Lib/idlelib/idle_test/test_pyshell.py create mode 100644 Lib/idlelib/idle_test/test_query.py create mode 100644 Lib/idlelib/idle_test/test_redirector.py create mode 100644 Lib/idlelib/idle_test/test_replace.py create mode 100644 Lib/idlelib/idle_test/test_rpc.py create mode 100644 Lib/idlelib/idle_test/test_run.py create mode 100644 Lib/idlelib/idle_test/test_runscript.py create mode 100644 Lib/idlelib/idle_test/test_scrolledlist.py create mode 100644 Lib/idlelib/idle_test/test_search.py create mode 100644 Lib/idlelib/idle_test/test_searchbase.py create mode 100644 Lib/idlelib/idle_test/test_searchengine.py create mode 100644 Lib/idlelib/idle_test/test_sidebar.py create mode 100644 Lib/idlelib/idle_test/test_squeezer.py create mode 100644 Lib/idlelib/idle_test/test_stackviewer.py create mode 100644 Lib/idlelib/idle_test/test_statusbar.py create mode 100644 Lib/idlelib/idle_test/test_text.py create mode 100644 Lib/idlelib/idle_test/test_textview.py create mode 100644 Lib/idlelib/idle_test/test_tooltip.py create mode 100644 Lib/idlelib/idle_test/test_tree.py create mode 100644 Lib/idlelib/idle_test/test_undo.py create mode 100644 Lib/idlelib/idle_test/test_util.py create mode 100644 Lib/idlelib/idle_test/test_warning.py create mode 100644 Lib/idlelib/idle_test/test_window.py create mode 100644 Lib/idlelib/idle_test/test_zoomheight.py create mode 100644 Lib/idlelib/idle_test/test_zzdummy.py create mode 100644 Lib/idlelib/idle_test/tkinter_testing_utils.py create mode 100644 Lib/idlelib/iomenu.py create mode 100644 Lib/idlelib/macosx.py create mode 100644 Lib/idlelib/mainmenu.py create mode 100644 Lib/idlelib/multicall.py create mode 100644 Lib/idlelib/outwin.py create mode 100644 Lib/idlelib/parenmatch.py create mode 100644 Lib/idlelib/pathbrowser.py create mode 100644 Lib/idlelib/percolator.py create mode 100644 Lib/idlelib/pyparse.py create mode 100755 Lib/idlelib/pyshell.py create mode 100644 Lib/idlelib/query.py create mode 100644 Lib/idlelib/redirector.py create mode 100644 Lib/idlelib/replace.py create mode 100644 Lib/idlelib/rpc.py create mode 100644 Lib/idlelib/run.py create mode 100644 Lib/idlelib/runscript.py create mode 100644 Lib/idlelib/scrolledlist.py create mode 100644 Lib/idlelib/search.py create mode 100644 Lib/idlelib/searchbase.py create mode 100644 Lib/idlelib/searchengine.py create mode 100644 Lib/idlelib/sidebar.py create mode 100644 Lib/idlelib/squeezer.py create mode 100644 Lib/idlelib/stackviewer.py create mode 100644 Lib/idlelib/statusbar.py create mode 100644 Lib/idlelib/textview.py create mode 100644 Lib/idlelib/tooltip.py create mode 100644 Lib/idlelib/tree.py create mode 100644 Lib/idlelib/undo.py create mode 100644 Lib/idlelib/util.py create mode 100644 Lib/idlelib/window.py create mode 100644 Lib/idlelib/zoomheight.py create mode 100644 Lib/idlelib/zzdummy.py create mode 100644 Lib/test/test_idle.py diff --git a/Lib/idlelib/CREDITS.txt b/Lib/idlelib/CREDITS.txt new file mode 100644 index 000000000..1b853e8cc --- /dev/null +++ b/Lib/idlelib/CREDITS.txt @@ -0,0 +1,48 @@ +Guido van Rossum, as well as being the creator of the Python language, is the +original creator of IDLE. Other contributors prior to Version 0.8 include +Mark Hammond, Jeremy Hylton, Tim Peters, and Moshe Zadka. + +Until Python 2.3, IDLE's development was carried out in the SF IDLEfork project. The +objective was to develop a version of IDLE which had an execution environment +which could be initialized prior to each run of user code. +IDLefork was merged into the Python code base in 2003. + +The IDLEfork project was initiated by David Scherer, with some help from Peter +Schneider-Kamp and Nicholas Riley. David wrote the first version of the RPC +code and designed a fast turn-around environment for VPython. Guido developed +the RPC code and Remote Debugger currently integrated in IDLE. Bruce Sherwood +contributed considerable time testing and suggesting improvements. + +Besides David and Guido, the main developers who were active on IDLEfork +are Stephen M. Gava, who implemented the configuration GUI, the new +configuration system, and the About dialog, and Kurt B. Kaiser, who completed +the integration of the RPC and remote debugger, implemented the threaded +subprocess, and made a number of usability enhancements. + +Other contributors include Raymond Hettinger, Tony Lownds (Mac integration), +Neal Norwitz (code check and clean-up), Ronald Oussoren (Mac integration), +Noam Raphael (Code Context, Call Tips, many other patches), and Chui Tey (RPC +integration, debugger integration and persistent breakpoints). + +Scott David Daniels, Tal Einat, Hernan Foffani, Christos Georgiou, +Jim Jewett, Martin v. Löwis, Jason Orendorff, Guilherme Polo, Josh Robb, +Nigel Rowe, Bruce Sherwood, Jeff Shute, and Weeble have submitted useful +patches. Thanks, guys! + +Major contributors since 2005: + +- 2005: Tal Einat +- 2010: Terry Jan Reedy (current maintainer) +- 2013: Roger Serwy +- 2014: Saimadhav Heblikar +- 2015: Mark Roseman +- 2017: Louie Lu, Cheryl Sabella, and Serhiy Storchaka +- 2025: Stan Ulbrych + +For additional details refer to NEWS.txt and Changelog. + +If we missed you, feel free to submit a PR with a summary of +contributions (for instance, at least 5 merged PRs). + + + diff --git a/Lib/idlelib/ChangeLog b/Lib/idlelib/ChangeLog new file mode 100644 index 000000000..c8960cfa5 --- /dev/null +++ b/Lib/idlelib/ChangeLog @@ -0,0 +1,1591 @@ +Please refer to the IDLEfork and IDLE CVS repositories for +change details subsequent to the 0.8.1 release. + + +IDLEfork ChangeLog +================== + +2001-07-20 11:35 elguavas + + * README.txt, NEWS.txt: bring up to date for 0.8.1 release + +2001-07-19 16:40 elguavas + + * IDLEFORK.html: replaced by IDLEFORK-index.html + +2001-07-19 16:39 elguavas + + * IDLEFORK-index.html: updated placeholder idlefork homepage + +2001-07-19 14:49 elguavas + + * ChangeLog, EditorWindow.py, INSTALLATION, NEWS.txt, README.txt, + TODO.txt, idlever.py: + minor tidy-ups ready for 0.8.1 alpha tarball release + +2001-07-17 15:12 kbk + + * INSTALLATION, setup.py: INSTALLATION: Remove the coexist.patch + instructions + + **************** setup.py: + + Remove the idles script, add some words on IDLE Fork to the + long_description, and clean up some line spacing. + +2001-07-17 15:01 kbk + + * coexist.patch: Put this in the attic, at least for now... + +2001-07-17 14:59 kbk + + * PyShell.py, idle, idles: Implement idle command interface as + suggested by GvR [idle-dev] 16 July **************** PyShell: Added + functionality: + + usage: idle.py [-c command] [-d] [-i] [-r script] [-s] [-t title] + [arg] ... + + idle file(s) (without options) edit the file(s) + + -c cmd run the command in a shell -d enable the + debugger -i open an interactive shell -i file(s) open a + shell and also an editor window for each file -r script run a file + as a script in a shell -s run $IDLESTARTUP or + $PYTHONSTARTUP before anything else -t title set title of shell + window + + Remaining arguments are applied to the command (-c) or script (-r). + + ****************** idles: Removed the idles script, not needed + + ****************** idle: Removed the IdleConf references, not + required anymore + +2001-07-16 17:08 kbk + + * INSTALLATION, coexist.patch: Added installation instructions. + + Added a patch which modifies idlefork so that it can co-exist with + "official" IDLE in the site-packages directory. This patch is not + necessary if only idlefork IDLE is installed. See INSTALLATION for + further details. + +2001-07-16 15:50 kbk + + * idles: Add a script "idles" which opens a Python Shell window. + + The default behaviour of idlefork idle is to open an editor window + instead of a shell. Complex expressions may be run in a fresh + environment by selecting "run". There are times, however, when a + shell is desired. Though one can be started by "idle -t 'foo'", + this script is more convenient. In addition, a shell and an editor + window can be started in parallel by "idles -e foo.py". + +2001-07-16 15:25 kbk + + * PyShell.py: Call out IDLE Fork in startup message. + +2001-07-16 14:00 kbk + + * PyShell.py, setup.py: Add a script "idles" which opens a Python + Shell window. + + The default behaviour of idlefork idle is to open an editor window + instead of a shell. Complex expressions may be run in a fresh + environment by selecting "run". There are times, however, when a + shell is desired. Though one can be started by "idle -t 'foo'", + this script is more convenient. In addition, a shell and an editor + window can be started in parallel by "idles -e foo.py". + +2001-07-15 03:06 kbk + + * pyclbr.py, tabnanny.py: tabnanny and pyclbr are now found in /Lib + +2001-07-15 02:29 kbk + + * BrowserControl.py: Remove, was retained for 1.5.2 support + +2001-07-14 15:48 kbk + + * setup.py: Installing Idle to site-packages via Distutils does not + copy the Idle help.txt file. + + Ref SF Python Patch 422471 + +2001-07-14 15:26 kbk + + * keydefs.py: py-cvs-2001_07_13 (Rev 1.3) merge + + "Make copy, cut and paste events case insensitive. Reported by + Patrick K. O'Brien on idle-dev. (Should other bindings follow + suit?)" --GvR + +2001-07-14 15:21 kbk + + * idle.py: py-cvs-2001_07_13 (Rev 1.4) merge + + "Move the action of loading the configuration to the IdleConf + module rather than the idle.py script. This has advantages and + disadvantages; the biggest advantage being that we can more easily + have an alternative main program." --GvR + +2001-07-14 15:18 kbk + + * extend.txt: py-cvs-2001_07_13 (Rev 1.4) merge + + "Quick update to the extension mechanism (extend.py is gone, long + live config.txt)" --GvR + +2001-07-14 15:15 kbk + + * StackViewer.py: py-cvs-2001_07_13 (Rev 1.16) merge + + "Refactored, with some future plans in mind. This now uses the new + gotofileline() method defined in FileList.py" --GvR + +2001-07-14 15:10 kbk + + * PyShell.py: py-cvs-2001_07_13 (Rev 1.34) merge + + "Amazing. A very subtle change in policy in descr-branch actually + found a bug here. Here's the deal: Class PyShell derives from + class OutputWindow. Method PyShell.close() wants to invoke its + parent method, but because PyShell long ago was inherited from + class PyShellEditorWindow, it invokes + PyShelEditorWindow.close(self). Now, class PyShellEditorWindow + itself derives from class OutputWindow, and inherits the close() + method from there without overriding it. Under the old rules, + PyShellEditorWindow.close would return an unbound method restricted + to the class that defined the implementation of close(), which was + OutputWindow.close. Under the new rules, the unbound method is + restricted to the class whose method was requested, that is + PyShellEditorWindow, and this was correctly trapped as an error." + --GvR + +2001-07-14 14:59 kbk + + * PyParse.py: py-cvs-2001_07_13 (Rel 1.9) merge + + "Taught IDLE's autoident parser that "yield" is a keyword that + begins a stmt. Along w/ the preceding change to keyword.py, making + all this work w/ a future-stmt just looks harder and harder." + --tim_one + + (From Rel 1.8: "Hack to make this still work with Python 1.5.2. + ;-( " --fdrake) + +2001-07-14 14:51 kbk + + * IdleConf.py: py-cvs-2001_07_13 (Rel 1.7) merge + + "Move the action of loading the configuration to the IdleConf + module rather than the idle.py script. This has advantages and + disadvantages; the biggest advantage being that we can more easily + have an alternative main program." --GvR + +2001-07-14 14:45 kbk + + * FileList.py: py-cvs-2000_07_13 (Rev 1.9) merge + + "Delete goodname() method, which is unused. Add gotofileline(), a + convenience method which I intend to use in a variant. Rename + test() to _test()." --GvR + + This was an interesting merge. The join completely missed removing + goodname(), which was adjacent, but outside of, a small conflict. + I only caught it by comparing the 1.1.3.2/1.1.3.3 diff. CVS ain't + infallible. + +2001-07-14 13:58 kbk + + * EditorWindow.py: py-cvs-2000_07_13 (Rev 1.38) merge "Remove + legacy support for the BrowserControl module; the webbrowser module + has been included since Python 2.0, and that is the preferred + interface." --fdrake + +2001-07-14 13:32 kbk + + * EditorWindow.py, FileList.py, IdleConf.py, PyParse.py, + PyShell.py, StackViewer.py, extend.txt, idle.py, keydefs.py: Import + the 2001 July 13 23:59 GMT version of Python CVS IDLE on the + existing 1.1.3 vendor branch named py-cvs-vendor-branch. Release + tag is py-cvs-2001_07_13. + +2001-07-14 12:02 kbk + + * Icons/python.gif: py-cvs-rel2_1 (Rev 1.2) merge Copied py-cvs rev + 1.2 changed file to idlefork MAIN + +2001-07-14 11:58 kbk + + * Icons/minusnode.gif: py-cvs-rel2_1 (Rev 1.2) merge Copied py-cvs + 1.2 changed file to idlefork MAIN + +2001-07-14 11:23 kbk + + * ScrolledList.py: py-cvs-rel2_1 (rev 1.5) merge - whitespace + normalization + +2001-07-14 11:20 kbk + + * Separator.py: py-cvs-rel2_1 (Rev 1.3) merge - whitespace + normalization + +2001-07-14 11:16 kbk + + * StackViewer.py: py-cvs-rel2_1 (Rev 1.15) merge - whitespace + normalization + +2001-07-14 11:14 kbk + + * ToolTip.py: py-cvs-rel2_1 (Rev 1.2) merge - whitespace + normalization + +2001-07-14 10:13 kbk + + * PyShell.py: cvs-py-rel2_1 (Rev 1.29 - 1.33) merge + + Merged the following py-cvs revs without conflict: 1.29 Reduce + copyright text output at startup 1.30 Delay setting sys.args until + Tkinter is fully initialized 1.31 Whitespace normalization 1.32 + Turn syntax warning into error when interactive 1.33 Fix warning + initialization bug + + Note that module is extensively modified wrt py-cvs + +2001-07-14 06:33 kbk + + * PyParse.py: py-cvs-rel2_1 (Rev 1.6 - 1.8) merge Fix autoindent + bug and deflect Unicode from text.get() + +2001-07-14 06:00 kbk + + * Percolator.py: py-cvs-rel2_1 (Rev 1.3) "move "from Tkinter import + *" to module level" --jhylton + +2001-07-14 05:57 kbk + + * PathBrowser.py: py-cvs-rel2_1 (Rev 1.6) merge - whitespace + normalization + +2001-07-14 05:49 kbk + + * ParenMatch.py: cvs-py-rel2_1 (Rev 1.5) merge - whitespace + normalization + +2001-07-14 03:57 kbk + + * ObjectBrowser.py: py-cvs-rel2_1 (Rev 1.3) merge "Make the test + program work outside IDLE." -- GvR + +2001-07-14 03:52 kbk + + * MultiStatusBar.py: py-cvs-rel2_1 (Rev 1.2) merge - whitespace + normalization + +2001-07-14 03:44 kbk + + * MultiScrolledLists.py: py-cvs-rel2_1 (Rev 1.2) merge - whitespace + normalization + +2001-07-14 03:40 kbk + + * IdleHistory.py: py-cvs-rel2_1 (Rev 1.4) merge - whitespace + normalization + +2001-07-14 03:38 kbk + + * IdleConf.py: py-cvs-rel2_1 (Rev 1.6) merge - whitespace + normalization + +2001-07-13 14:18 kbk + + * IOBinding.py: py-cvs-rel2_1 (Rev 1.4) merge - move "import *" to + module level + +2001-07-13 14:12 kbk + + * FormatParagraph.py: py-cvs-rel2_1 (Rev 1.9) merge - whitespace + normalization + +2001-07-13 14:07 kbk + + * FileList.py: py-cvs-rel2_1 (Rev 1.8) merge - whitespace + normalization + +2001-07-13 13:35 kbk + + * EditorWindow.py: py-cvs-rel2_1 (Rev 1.33 - 1.37) merge + + VP IDLE version depended on VP's ExecBinding.py and spawn.py to get + the path to the Windows Doc directory (relative to python.exe). + Removed this conflicting code in favor of py-cvs updates which on + Windows use a hard coded path relative to the location of this + module. py-cvs updates include support for webbrowser.py. Module + still has BrowserControl.py for 1.5.2 support. + + At this point, the differences wrt py-cvs relate to menu + functionality. + +2001-07-13 11:30 kbk + + * ConfigParser.py: py-cvs-rel2_1 merge - Remove, lives in /Lib + +2001-07-13 10:10 kbk + + * Delegator.py: py-cvs-rel2_1 (Rev 1.3) merge - whitespace + normalization + +2001-07-13 10:07 kbk + + * Debugger.py: py-cvs-rel2_1 (Rev 1.15) merge - whitespace + normalization + +2001-07-13 10:04 kbk + + * ColorDelegator.py: py-cvs-rel2_1 (Rev 1.11 and 1.12) merge + Colorize "as" after "import" / use DEBUG instead of __debug__ + +2001-07-13 09:54 kbk + + * ClassBrowser.py: py-cvs-rel2_1 (Rev 1.12) merge - whitespace + normalization + +2001-07-13 09:41 kbk + + * BrowserControl.py: py-cvs-rel2_1 (Rev 1.1) merge - New File - + Force HEAD to trunk with -f Note: browser.py was renamed + BrowserControl.py 10 May 2000. It provides a collection of classes + and convenience functions to control external browsers "for 1.5.2 + support". It was removed from py-cvs 18 April 2001. + +2001-07-13 09:10 kbk + + * CallTips.py: py-cvs-rel2_1 (Rev 1.8) merge - whitespace + normalization + +2001-07-13 08:26 kbk + + * CallTipWindow.py: py-cvs-rel2_1 (Rev 1.3) merge - whitespace + normalization + +2001-07-13 08:13 kbk + + * AutoExpand.py: py-cvs-rel1_2 (Rev 1.4) merge, "Add Alt-slash to + Unix keydefs (I somehow need it on RH 6.2). Get rid of assignment + to unused self.text.wordlist." --GvR + +2001-07-12 16:54 elguavas + + * ReplaceDialog.py: py-cvs merge, python 1.5.2 compatibility + +2001-07-12 16:46 elguavas + + * ScriptBinding.py: py-cvs merge, better error dialog + +2001-07-12 16:38 elguavas + + * TODO.txt: py-cvs merge, additions + +2001-07-12 15:35 elguavas + + * WindowList.py: py-cvs merge, correct indentation + +2001-07-12 15:24 elguavas + + * config.txt: py-cvs merge, correct typo + +2001-07-12 15:21 elguavas + + * help.txt: py-cvs merge, update colour changing info + +2001-07-12 14:51 elguavas + + * idle.py: py-cvs merge, idle_dir loading changed + +2001-07-12 14:44 elguavas + + * idlever.py: py-cvs merge, version update + +2001-07-11 12:53 kbk + + * BrowserControl.py: Initial revision + +2001-07-11 12:53 kbk + + * AutoExpand.py, BrowserControl.py, CallTipWindow.py, CallTips.py, + ClassBrowser.py, ColorDelegator.py, Debugger.py, Delegator.py, + EditorWindow.py, FileList.py, FormatParagraph.py, IOBinding.py, + IdleConf.py, IdleHistory.py, MultiScrolledLists.py, + MultiStatusBar.py, ObjectBrowser.py, OutputWindow.py, + ParenMatch.py, PathBrowser.py, Percolator.py, PyParse.py, + PyShell.py, RemoteInterp.py, ReplaceDialog.py, ScriptBinding.py, + ScrolledList.py, Separator.py, StackViewer.py, TODO.txt, + ToolTip.py, WindowList.py, config.txt, help.txt, idle, idle.bat, + idle.py, idlever.py, setup.py, Icons/minusnode.gif, + Icons/python.gif: Import the release 2.1 version of Python CVS IDLE + on the existing 1.1.3 vendor branch named py-cvs-vendor-branch, + with release tag py-cvs-rel2_1. + +2001-07-11 12:34 kbk + + * AutoExpand.py, AutoIndent.py, Bindings.py, CallTipWindow.py, + CallTips.py, ChangeLog, ClassBrowser.py, ColorDelegator.py, + Debugger.py, Delegator.py, EditorWindow.py, FileList.py, + FormatParagraph.py, FrameViewer.py, GrepDialog.py, IOBinding.py, + IdleConf.py, IdleHistory.py, MultiScrolledLists.py, + MultiStatusBar.py, NEWS.txt, ObjectBrowser.py, OldStackViewer.py, + OutputWindow.py, ParenMatch.py, PathBrowser.py, Percolator.py, + PyParse.py, PyShell.py, README.txt, RemoteInterp.py, + ReplaceDialog.py, ScriptBinding.py, ScrolledList.py, + SearchBinding.py, SearchDialog.py, SearchDialogBase.py, + SearchEngine.py, Separator.py, StackViewer.py, TODO.txt, + ToolTip.py, TreeWidget.py, UndoDelegator.py, WidgetRedirector.py, + WindowList.py, ZoomHeight.py, __init__.py, config-unix.txt, + config-win.txt, config.txt, eventparse.py, extend.txt, help.txt, + idle.bat, idle.py, idle.pyw, idlever.py, keydefs.py, pyclbr.py, + tabnanny.py, testcode.py, Icons/folder.gif, Icons/minusnode.gif, + Icons/openfolder.gif, Icons/plusnode.gif, Icons/python.gif, + Icons/tk.gif: Import the 9 March 2000 version of Python CVS IDLE as + 1.1.3 vendor branch named py-cvs-vendor-branch. + +2001-07-04 13:43 kbk + + * Icons/: folder.gif, minusnode.gif, openfolder.gif, plusnode.gif, + python.gif, tk.gif: Null commit with -f option to force an uprev + and put HEADs firmly on the trunk. + +2001-07-04 13:15 kbk + + * AutoExpand.py, AutoIndent.py, Bindings.py, CallTipWindow.py, + CallTips.py, ChangeLog, ClassBrowser.py, ColorDelegator.py, + ConfigParser.py, Debugger.py, Delegator.py, EditorWindow.py, + ExecBinding.py, FileList.py, FormatParagraph.py, FrameViewer.py, + GrepDialog.py, IDLEFORK.html, IOBinding.py, IdleConf.py, + IdleHistory.py, MultiScrolledLists.py, MultiStatusBar.py, NEWS.txt, + ObjectBrowser.py, OldStackViewer.py, OutputWindow.py, + ParenMatch.py, PathBrowser.py, Percolator.py, PyParse.py, + PyShell.py, README.txt, Remote.py, RemoteInterp.py, + ReplaceDialog.py, ScriptBinding.py, ScrolledList.py, + SearchBinding.py, SearchDialog.py, SearchDialogBase.py, + SearchEngine.py, Separator.py, StackViewer.py, TODO.txt, + ToolTip.py, TreeWidget.py, UndoDelegator.py, WidgetRedirector.py, + WindowList.py, ZoomHeight.py, __init__.py, config-unix.txt, + config-win.txt, config.txt, eventparse.py, extend.txt, help.txt, + idle, idle.bat, idle.py, idle.pyw, idlever.py, keydefs.py, + loader.py, protocol.py, pyclbr.py, setup.py, spawn.py, tabnanny.py, + testcode.py: Null commit with -f option to force an uprev and put + HEADs firmly on the trunk. + +2001-06-27 10:24 elguavas + + * IDLEFORK.html: updated contact details + +2001-06-25 17:23 elguavas + + * idle, RemoteInterp.py, setup.py: Initial revision + +2001-06-25 17:23 elguavas + + * idle, RemoteInterp.py, setup.py: import current python cvs idle + as a vendor branch + +2001-06-24 15:10 elguavas + + * IDLEFORK.html: tiny change to test new syncmail setup + +2001-06-24 14:41 elguavas + + * IDLEFORK.html: change to new developer contact, also a test + commit for new syncmail setup + +2001-06-23 18:15 elguavas + + * IDLEFORK.html: tiny test update for revitalised idle-fork + +2000-09-24 17:29 nriley + + * protocol.py: Fixes for Python 1.6 compatibility - socket bind and + connect get a tuple instead two arguments. + +2000-09-24 17:28 nriley + + * spawn.py: Change for Python 1.6 compatibility - UNIX's 'os' + module defines 'spawnv' now, so we check for 'fork' first. + +2000-08-15 22:51 nowonder + + * IDLEFORK.html: + corrected email address + +2000-08-15 22:47 nowonder + + * IDLEFORK.html: + added .html file for http://idlefork.sourceforge.net + +2000-08-15 11:13 dscherer + + * AutoExpand.py, AutoIndent.py, Bindings.py, CallTipWindow.py, + CallTips.py, __init__.py, ChangeLog, ClassBrowser.py, + ColorDelegator.py, ConfigParser.py, Debugger.py, Delegator.py, + FileList.py, FormatParagraph.py, FrameViewer.py, GrepDialog.py, + IOBinding.py, IdleConf.py, IdleHistory.py, MultiScrolledLists.py, + MultiStatusBar.py, NEWS.txt, ObjectBrowser.py, OldStackViewer.py, + OutputWindow.py, ParenMatch.py, PathBrowser.py, Percolator.py, + PyParse.py, PyShell.py, README.txt, ReplaceDialog.py, + ScriptBinding.py, ScrolledList.py, SearchBinding.py, + SearchDialog.py, SearchDialogBase.py, SearchEngine.py, + Separator.py, StackViewer.py, TODO.txt, ToolTip.py, TreeWidget.py, + UndoDelegator.py, WidgetRedirector.py, WindowList.py, help.txt, + ZoomHeight.py, config-unix.txt, config-win.txt, config.txt, + eventparse.py, extend.txt, idle.bat, idle.py, idle.pyw, idlever.py, + keydefs.py, loader.py, pyclbr.py, tabnanny.py, testcode.py, + EditorWindow.py, ExecBinding.py, Remote.py, protocol.py, spawn.py, + Icons/folder.gif, Icons/minusnode.gif, Icons/openfolder.gif, + Icons/plusnode.gif, Icons/python.gif, Icons/tk.gif: Initial + revision + +2000-08-15 11:13 dscherer + + * AutoExpand.py, AutoIndent.py, Bindings.py, CallTipWindow.py, + CallTips.py, __init__.py, ChangeLog, ClassBrowser.py, + ColorDelegator.py, ConfigParser.py, Debugger.py, Delegator.py, + FileList.py, FormatParagraph.py, FrameViewer.py, GrepDialog.py, + IOBinding.py, IdleConf.py, IdleHistory.py, MultiScrolledLists.py, + MultiStatusBar.py, NEWS.txt, ObjectBrowser.py, OldStackViewer.py, + OutputWindow.py, ParenMatch.py, PathBrowser.py, Percolator.py, + PyParse.py, PyShell.py, README.txt, ReplaceDialog.py, + ScriptBinding.py, ScrolledList.py, SearchBinding.py, + SearchDialog.py, SearchDialogBase.py, SearchEngine.py, + Separator.py, StackViewer.py, TODO.txt, ToolTip.py, TreeWidget.py, + UndoDelegator.py, WidgetRedirector.py, WindowList.py, help.txt, + ZoomHeight.py, config-unix.txt, config-win.txt, config.txt, + eventparse.py, extend.txt, idle.bat, idle.py, idle.pyw, idlever.py, + keydefs.py, loader.py, pyclbr.py, tabnanny.py, testcode.py, + EditorWindow.py, ExecBinding.py, Remote.py, protocol.py, spawn.py, + Icons/folder.gif, Icons/minusnode.gif, Icons/openfolder.gif, + Icons/plusnode.gif, Icons/python.gif, Icons/tk.gif: Modified IDLE + from VPython 0.2 + + +original IDLE ChangeLog: +======================== + +Tue Feb 15 18:08:19 2000 Guido van Rossum <guido@cnri.reston.va.us> + + * NEWS.txt: Notice status bar and stack viewer. + + * EditorWindow.py: Support for Moshe's status bar. + + * MultiStatusBar.py: Status bar code -- by Moshe Zadka. + + * OldStackViewer.py: + Adding the old stack viewer implementation back, for the debugger. + + * StackViewer.py: New stack viewer, uses a tree widget. + (XXX: the debugger doesn't yet use this.) + + * WindowList.py: + Correct a typo and remove an unqualified except that was hiding the error. + + * ClassBrowser.py: Add an XXX comment about the ClassBrowser AIP. + + * ChangeLog: Updated change log. + + * NEWS.txt: News update. Probably incomplete; what else is new? + + * README.txt: + Updated for pending IDLE 0.5 release (still very rough -- just getting + it out in a more convenient format than CVS). + + * TODO.txt: Tiny addition. + +Thu Sep 9 14:16:02 1999 Guido van Rossum <guido@cnri.reston.va.us> + + * TODO.txt: A few new TODO entries. + +Thu Aug 26 23:06:22 1999 Guido van Rossum <guido@cnri.reston.va.us> + + * Bindings.py: Add Python Documentation entry to Help menu. + + * EditorWindow.py: + Find the help.txt file relative to __file__ or ".", not in sys.path. + (Suggested by Moshe Zadka, but implemented differently.) + + Add <<python-docs>> event which, on Unix, brings up Netscape pointing + to http://www.python.doc/current/ (a local copy would be nice but its + location can't be predicted). Windows solution TBD. + +Wed Aug 11 14:55:43 1999 Guido van Rossum <guido@cnri.reston.va.us> + + * TreeWidget.py: + Moshe noticed an inconsistency in his comment, so I'm rephrasing it to + be clearer. + + * TreeWidget.py: + Patch inspired by Moshe Zadka to search for the Icons directory in the + same directory as __file__, rather than searching for it along sys.path. + This works better when idle is a package. + +Thu Jul 15 13:11:02 1999 Guido van Rossum <guido@cnri.reston.va.us> + + * TODO.txt: New wishes. + +Sat Jul 10 13:17:35 1999 Guido van Rossum <guido@cnri.reston.va.us> + + * IdlePrefs.py: + Make the color for stderr red (i.e. the standard warning/danger/stop + color) rather than green. Suggested by Sam Schulenburg. + +Fri Jun 25 17:26:34 1999 Guido van Rossum <guido@cnri.reston.va.us> + + * PyShell.py: Close debugger when closing. This may break a cycle. + + * Debugger.py: Break cycle on close. + + * ClassBrowser.py: Destroy the tree when closing. + + * TreeWidget.py: Add destroy() method to recursively destroy a tree. + + * PyShell.py: Extend _close() to break cycles. + Break some other cycles too (and destroy the root when done). + + * EditorWindow.py: + Add _close() method that does the actual cleanup (close() asks the + user what they want first if there's unsaved stuff, and may cancel). + It closes more than before. + + Add unload_extensions() method to unload all extensions; called from + _close(). It calls an extension's close() method if it has one. + + * Percolator.py: Add close() method that breaks cycles. + + * WidgetRedirector.py: Add unregister() method. + Unregister everything at closing. + Don't call close() in __del__, rely on explicit call to close(). + + * IOBinding.py, FormatParagraph.py, CallTips.py: + Add close() method that breaks a cycle. + +Fri Jun 11 15:03:00 1999 Guido van Rossum <guido@cnri.reston.va.us> + + * AutoIndent.py, EditorWindow.py, FormatParagraph.py: + Tim Peters smart.patch: + + EditorWindow.py: + + + Added get_tabwidth & set_tabwidth "virtual text" methods, that get/set the + widget's view of what a tab means. + + + Moved TK_TABWIDTH_DEFAULT here from AutoIndent. + + + Renamed Mark's get_selection_index to get_selection_indices (sorry, Mark, + but the name was plain wrong <wink>). + + FormatParagraph.py: renamed use of get_selection_index. + + AutoIndent.py: + + + Moved TK_TABWIDTH_DEFAULT to EditorWindow. + + + Rewrote set_indentation_params to use new VTW get/set_tabwidth methods. + + + Changed smart_backspace_event to delete whitespace back to closest + preceding virtual tab stop or real character (note that this may require + inserting characters if backspacing over a tab!). + + + Nuked almost references to the selection tag, in favor of using + get_selection_indices. The sole exception is in set_region, for which no + "set_selection" abstraction has yet been agreed upon. + + + Had too much fun using the spiffy new features of the format-paragraph + cmd. + +Thu Jun 10 17:48:02 1999 Guido van Rossum <guido@cnri.reston.va.us> + + * FormatParagraph.py: + Code by Mark Hammond to format paragraphs embedded in comments. + Read the comments (which I reformatted using the new feature :-) + for some limitations. + + * EditorWindow.py: + Added abstraction get_selection_index() (Mark Hammond). Also + reformatted some comment blocks to show off a cool feature I'm about + to check in next. + + * ClassBrowser.py: + Adapt to the new pyclbr's support of listing top-level functions. If + this functionality is not present (e.g. when used with a vintage + Python 1.5.2 installation) top-level functions are not listed. + + (Hmm... Any distribution of IDLE 0.5 should probably include a copy + of the new pyclbr.py!) + + * AutoIndent.py: + Fix off-by-one error in Tim's recent change to comment_region(): the + list of lines returned by get_region() contains an empty line at the + end representing the start of the next line, and this shouldn't be + commented out! + + * CallTips.py: + Mark Hammond writes: Here is another change that allows it to work for + class creation - tries to locate an __init__ function. Also updated + the test code to reflect your new "***" change. + + * CallTipWindow.py: + Mark Hammond writes: Tim's suggestion of copying the font for the + CallTipWindow from the text control makes sense, and actually makes + the control look better IMO. + +Wed Jun 9 20:34:57 1999 Guido van Rossum <guido@cnri.reston.va.us> + + * CallTips.py: + Append "..." if the appropriate flag (for varargs) in co_flags is set. + Ditto "***" for kwargs. + +Tue Jun 8 13:06:07 1999 Guido van Rossum <guido@cnri.reston.va.us> + + * ReplaceDialog.py: + Hmm... Tim didn't turn "replace all" into a single undo block. + I think I like it better if it os, so here. + + * ReplaceDialog.py: Tim Peters: made replacement atomic for undo/redo. + + * AutoIndent.py: Tim Peters: + + + Set usetabs=1. Editing pyclbr.py was driving me nuts <0.6 wink>. + usetabs=1 is the Emacs pymode default too, and thanks to indentwidth != + tabwidth magical usetabs disabling, new files are still created with tabs + turned off. The only implication is that if you open a file whose first + indent is a single tab, IDLE will now magically use tabs for that file (and + set indentwidth to 8). Note that the whole scheme doesn't work right for + PythonWin, though, since Windows users typically set tabwidth to 4; Mark + probably has to hide the IDLE algorithm from them (which he already knows). + + + Changed comment_region_event to stick "##" in front of every line. The + "holes" previously left on blank lines were visually confusing (made it + needlessly hard to figure out what to uncomment later). + +Mon Jun 7 15:38:40 1999 Guido van Rossum <guido@cnri.reston.va.us> + + * TreeWidget.py, ObjectBrowser.py: + Remove unnecessary reference to pyclbr from test() code. + + * PyParse.py: Tim Peters: + + Smarter logic for finding a parse synch point. + + Does a half to a fifth the work in normal cases; don't notice the speedup, + but makes more breathing room for other extensions. + + Speeds terrible cases by at least a factor of 10. "Terrible" == e.g. you put + """ at the start of Tkinter.py, undo it, zoom to the bottom, and start + typing in code. Used to take about 8 seconds for ENTER to respond, now some + large fraction of a second. The new code gets indented correctly, despite + that it all remains "string colored" until the colorizer catches up (after + which, ENTER appears instantaneous again). + +Fri Jun 4 19:21:19 1999 Guido van Rossum <guido@cnri.reston.va.us> + + * extend.py: Might as well enable CallTips by default. + If there are too many complaints I'll remove it again or fix it. + +Thu Jun 3 14:32:16 1999 Guido van Rossum <guido@cnri.reston.va.us> + + * AutoIndent.py, EditorWindow.py, PyParse.py: + New offerings by Tim Peters; he writes: + + IDLE is now the first Python editor in the Universe not confused by my + doctest.py <wink>. + + As threatened, this defines IDLE's is_char_in_string function as a + method of EditorWindow. You just need to define one similarly in + whatever it is you pass as editwin to AutoIndent; looking at the + EditorWindow.py part of the patch should make this clear. + + * GrepDialog.py: Enclose pattern in quotes in status message. + + * CallTips.py: + Mark Hammond fixed some comments and improved the way the tip text is + constructed. + +Wed Jun 2 18:18:57 1999 Guido van Rossum <guido@cnri.reston.va.us> + + * CallTips.py: + My fix to Mark's code: restore the universal check on <KeyRelease>. + Always cancel on <Key-Escape> or <ButtonPress>. + + * CallTips.py: + A version that Mark Hammond posted to the newsgroup. Has some newer + stuff for getting the tip. Had to fix the Key-( and Key-) events + for Unix. Will have to re-apply my patch for catching KeyRelease and + ButtonRelease events. + + * CallTipWindow.py, CallTips.py: + Call tips by Mark Hammond (plus tiny fix by me.) + + * IdleHistory.py: + Changes by Mark Hammond: (1) support optional output_sep argument to + the constructor so he can eliminate the sys.ps2 that PythonWin leaves + in the source; (2) remove duplicate history items. + + * AutoIndent.py: + Changes by Mark Hammond to allow using IDLE extensions in PythonWin as + well: make three dialog routines instance variables. + + * EditorWindow.py: + Change by Mark Hammond to allow using IDLE extensions in PythonWin as + well: make three dialog routines instance variables. + +Tue Jun 1 20:06:44 1999 Guido van Rossum <guido@cnri.reston.va.us> + + * AutoIndent.py: Hah! A fix of my own to Tim's code! + Unix bindings for <<toggle-tabs>> and <<change-indentwidth>> were + missing, and somehow that meant the events were never generated, + even though they were in the menu. The new Unix bindings are now + the same as the Windows bindings (M-t and M-u). + + * AutoIndent.py, PyParse.py, PyShell.py: Tim Peters again: + + The new version (attached) is fast enough all the time in every real module + I have <whew!>. You can make it slow by, e.g., creating an open list with + 5,000 90-character identifiers (+ trailing comma) each on its own line, then + adding an item to the end -- but that still consumes less than a second on + my P5-166. Response time in real code appears instantaneous. + + Fixed some bugs. + + New feature: when hitting ENTER and the cursor is beyond the line's leading + indentation, whitespace is removed on both sides of the cursor; before + whitespace was removed only on the left; e.g., assuming the cursor is + between the comma and the space: + + def something(arg1, arg2): + ^ cursor to the left of here, and hit ENTER + arg2): # new line used to end up here + arg2): # but now lines up the way you expect + + New hack: AutoIndent has grown a context_use_ps1 Boolean config option, + defaulting to 0 (false) and set to 1 (only) by PyShell. Reason: handling + the fancy stuff requires looking backward for a parsing synch point; ps1 + lines are the only sensible thing to look for in a shell window, but are a + bad thing to look for in a file window (ps1 lines show up in my module + docstrings often). PythonWin's shell should set this true too. + + Persistent problem: strings containing def/class can still screw things up + completely. No improvement. Simplest workaround is on the user's head, and + consists of inserting e.g. + + def _(): pass + + (or any other def/class) after the end of the multiline string that's + screwing them up. This is especially irksome because IDLE's syntax coloring + is *not* confused, so when this happens the colors don't match the + indentation behavior they see. + + * AutoIndent.py: Tim Peters again: + + [Tim, after adding some bracket smarts to AutoIndent.py] + > ... + > What it can't possibly do without reparsing large gobs of text is + > suggest a reasonable indent level after you've *closed* a bracket + > left open on some previous line. + > ... + + The attached can, and actually fast enough to use -- most of the time. The + code is tricky beyond belief to achieve that, but it works so far; e.g., + + return len(string.expandtabs(str[self.stmt_start : + ^ indents to caret + i], + ^ indents to caret + self.tabwidth)) + 1 + ^ indents to caret + + It's about as smart as pymode now, wrt both bracket and backslash + continuation rules. It does require reparsing large gobs of text, and if it + happens to find something that looks like a "def" or "class" or sys.ps1 + buried in a multiline string, but didn't suck up enough preceding text to + see the start of the string, it's completely hosed. I can't repair that -- + it's just too slow to reparse from the start of the file all the time. + + AutoIndent has grown a new num_context_lines tuple attribute that controls + how far to look back, and-- like other params --this could/should be made + user-overridable at startup and per-file on the fly. + + * PyParse.py: New file by Tim Peters: + + One new file in the attached, PyParse.py. The LineStudier (whatever it was + called <wink>) class was removed from AutoIndent; PyParse subsumes its + functionality. + + * AutoIndent.py: Tim Peters keeps revising this module (more to come): + + Removed "New tabwidth" menu binding. + + Added "a tab means how many spaces?" dialog to block tabify and untabify. I + think prompting for this is good now: they're usually at-most-once-per-file + commands, and IDLE can't let them change tabwidth from the Tk default + anymore, so IDLE can no longer presume to have any idea what a tab means. + + Irony: for the purpose of keeping comments aligned via tabs, Tk's + non-default approach is much nicer than the Emacs/Notepad/Codewright/vi/etc + approach. + + * EditorWindow.py: + 1. Catch NameError on import (could be raised by case mismatch on Windows). + 2. No longer need to reset pyclbr cache and show watch cursor when calling + ClassBrowser -- the ClassBrowser takes care of pyclbr and the TreeWidget + takes care of the watch cursor. + 3. Reset the focus to the current window after error message about class + browser on buffer without filename. + + * Icons/minusnode.gif, Icons/plusnode.gif: Missed a few. + + * ClassBrowser.py, PathBrowser.py: Rewritten based on TreeWidget.py + + * ObjectBrowser.py: Object browser, based on TreeWidget.py. + + * TreeWidget.py: Tree widget done right. + + * ToolTip.py: As yet unused code for tool tips. + + * ScriptBinding.py: + Ensure sys.argv[0] is the script name on Run Script. + + * ZoomHeight.py: Move zoom height functionality to separate function. + + * Icons/folder.gif, Icons/openfolder.gif, Icons/python.gif, Icons/tk.gif: + A few icons used by ../TreeWidget.py and its callers. + + * AutoIndent.py: New version by Tim Peters improves block opening test. + +Fri May 21 04:46:17 1999 Guido van Rossum <guido@cnri.reston.va.us> + + * Attic/History.py, PyShell.py: Rename History to IdleHistory. + Add isatty() to pseudo files. + + * StackViewer.py: Make initial stack viewer wider + + * TODO.txt: New wishes + + * AutoIndent.py, EditorWindow.py, PyShell.py: + Much improved autoindent and handling of tabs, + by Tim Peters. + +Mon May 3 15:49:52 1999 Guido van Rossum <guido@cnri.reston.va.us> + + * AutoIndent.py, EditorWindow.py, FormatParagraph.py, UndoDelegator.py: + Tim Peters writes: + + I'm still unsure, but couldn't stand the virtual event trickery so tried a + different sin (adding undo_block_start/stop methods to the Text instance in + EditorWindow.py). Like it or not, it's efficient and works <wink>. Better + idea? + + Give the attached a whirl. Even if you hate the implementation, I think + you'll like the results. Think I caught all the "block edit" cmds, + including Format Paragraph, plus subtler ones involving smart indents and + backspacing. + + * WidgetRedirector.py: Tim Peters writes: + + [W]hile trying to dope out how redirection works, stumbled into two + possible glitches. In the first, it doesn't appear to make sense to try to + rename a command that's already been destroyed; in the second, the name + "previous" doesn't really bring to mind "ignore the previous value" <wink>. + +Fri Apr 30 19:39:25 1999 Guido van Rossum <guido@cnri.reston.va.us> + + * __init__.py: Support for using idle as a package. + + * PathBrowser.py: + Avoid listing files more than once (e.g. foomodule.so has two hits: + once for foo + module.so, once for foomodule + .so). + +Mon Apr 26 22:20:38 1999 Guido van Rossum <guido@cnri.reston.va.us> + + * ChangeLog, ColorDelegator.py, PyShell.py: Tim Peters strikes again: + + Ho ho ho -- that's trickier than it sounded! The colorizer is working with + "line.col" strings instead of Text marks, and the absolute coordinates of + the point of interest can change across the self.update call (voice of + baffled experience, when two quick backspaces no longer fooled it, but a + backspace followed by a quick ENTER did <wink>). + + Anyway, the attached appears to do the trick. CPU usage goes way up when + typing quickly into a long triple-quoted string, but the latency is fine for + me (a relatively fast typist on a relatively slow machine). Most of the + changes here are left over from reducing the # of vrbl names to help me + reason about the logic better; I hope the code is a *little* easier to + +Fri Apr 23 14:01:25 1999 Guido van Rossum <guido@cnri.reston.va.us> + + * EditorWindow.py: + Provide full arguments to __import__ so it works in packagized IDLE. + +Thu Apr 22 23:20:17 1999 Guido van Rossum <guido@cnri.reston.va.us> + + * help.txt: + Bunch of updates necessary due to recent changes; added docs for File + menu, command line and color preferences. + + * Bindings.py: Remove obsolete 'script' menu. + + * TODO.txt: Several wishes fulfilled. + + * OutputWindow.py: + Moved classes OnDemandOutputWindow and PseudoFile here, + from ScriptBinding.py where they are no longer needed. + + * ScriptBinding.py: + Mostly rewritten. Instead of the old Run module and Debug module, + there are two new commands: + + Import module (F5) imports or reloads the module and also adds its + name to the __main__ namespace. This gets executed in the PyShell + window under control of its debug settings. + + Run script (Control-F5) is similar but executes the contents of the + file directly in the __main__ namespace. + + * PyShell.py: Nits: document use of $IDLESTARTUP; display idle version + + * idlever.py: New version to celebrate new command line + + * OutputWindow.py: Added flush(), for completeness. + + * PyShell.py: + A lot of changes to make the command line more useful. You can now do: + idle.py -e file ... -- to edit files + idle.py script arg ... -- to run a script + idle.py -c cmd arg ... -- to run a command + Other options, see also the usage message (also new!) for more details: + -d -- enable debugger + -s -- run $IDLESTARTUP or $PYTHONSTARTUP + -t title -- set Python Shell window's title + sys.argv is set accordingly, unless -e is used. + sys.path is absolutized, and all relevant paths are inserted into it. + + Other changes: + - the environment in which commands are executed is now the + __main__ module + - explicitly save sys.stdout etc., don't restore from sys.__stdout__ + - new interpreter methods execsource(), execfile(), stuffsource() + - a few small nits + + * TODO.txt: + Some more TODO items. Made up my mind about command line args, + Run/Import, __main__. + + * ColorDelegator.py: + Super-elegant patch by Tim Peters that speeds up colorization + dramatically (up to 15 times he claims). Works by reading more than + one line at a time, up to 100-line chunks (starting with one line and + then doubling up to the limit). On a typical machine (e.g. Tim's + P5-166) this doesn't reduce interactive responsiveness in a noticeable + way. + +Wed Apr 21 15:49:34 1999 Guido van Rossum <guido@cnri.reston.va.us> + + * ColorDelegator.py: + Patch by Tim Peters to speed up colorizing of big multiline strings. + +Tue Apr 20 17:32:52 1999 Guido van Rossum <guido@cnri.reston.va.us> + + * extend.txt: + For an event 'foo-bar', the corresponding method must be called + foo_bar_event(). Therefore, fix the references to zoom_height() in + the example. + + * IdlePrefs.py: Restored the original IDLE color scheme. + + * PyShell.py, IdlePrefs.py, ColorDelegator.py, EditorWindow.py: + Color preferences code by Loren Luke (massaged by me somewhat) + + * SearchEngine.py: + Patch by Mark Favas: it fixes the search engine behaviour where an + unsuccessful search wraps around and re-searches that part of the file + between the start of the search and the end of the file - only really + an issue for very large files, but... (also removes a redundant + m.span() call). + +Mon Apr 19 16:26:02 1999 Guido van Rossum <guido@cnri.reston.va.us> + + * TODO.txt: A few wishes are now fulfilled. + + * AutoIndent.py: Tim Peters implements some of my wishes: + + o Makes the tab key intelligently insert spaces when appropriate + (see Help list banter twixt David Ascher and me; idea stolen from + every other editor on earth <wink>). + + o newline_and_indent_event trims trailing whitespace on the old + line (pymode and Codewright). + + o newline_and_indent_event no longer fooled by trailing whitespace or + comment after ":" (pymode, PTUI). + + o newline_and_indent_event now reduces the new line's indentation after + return, break, continue, raise and pass stmts (pymode). + + The last two are easy to fool in the presence of strings & + continuations, but pymode requires Emacs's high-powered C parsing + functions to avoid that in finite time. + +====================================================================== + Python release 1.5.2c1, IDLE version 0.4 +====================================================================== + +Wed Apr 7 18:41:59 1999 Guido van Rossum <guido@cnri.reston.va.us> + + * README.txt, NEWS.txt: New version. + + * idlever.py: Version bump awaiting impending new release. + (Not much has changed :-( ) + +Mon Mar 29 14:52:28 1999 Guido van Rossum <guido@cnri.reston.va.us> + + * ScriptBinding.py, PyShell.py: + At Tim Peters' recommendation, add a dummy flush() method to + PseudoFile. + +Thu Mar 11 23:21:23 1999 Guido van Rossum <guido@cnri.reston.va.us> + + * PathBrowser.py: Don't crash when sys.path contains an empty string. + + * Attic/Outline.py: This file was never supposed to be part of IDLE. + + * PathBrowser.py: + - Don't crash in the case where a superclass is a string instead of a + pyclbr.Class object; this can happen when the superclass is + unrecognizable (to pyclbr), e.g. when module renaming is used. + + - Show a watch cursor when calling pyclbr (since it may take a while + recursively parsing imported modules!). + +Wed Mar 10 05:18:02 1999 Guido van Rossum <guido@cnri.reston.va.us> + + * EditorWindow.py, Bindings.py: Add PathBrowser to File module + + * PathBrowser.py: "Path browser" - 4 scrolled lists displaying: + directories on sys.path + modules in selected directory + classes in selected module + methods of selected class + + Single clicking in a directory, module or class item updates the next + column with info about the selected item. Double clicking in a + module, class or method item opens the file (and selects the clicked + item if it is a class or method). + + I guess eventually I should be using a tree widget for this, but the + ones I've seen don't work well enough, so for now I use the old + Smalltalk or NeXT style multi-column hierarchical browser. + + * MultiScrolledLists.py: + New utility: multiple scrolled lists in parallel + + * ScrolledList.py: - White background. + - Display "(None)" (or text of your choosing) when empty. + - Don't set the focus. + +====================================================================== + Python release 1.5.2b2, IDLE version 0.3 +====================================================================== + +Wed Feb 17 22:47:41 1999 Guido van Rossum <guido@cnri.reston.va.us> + + * NEWS.txt: News in 0.3. + + * README.txt, idlever.py: Bump version to 0.3. + + * EditorWindow.py: + After all, we don't need to call the callbacks ourselves! + + * WindowList.py: + When deleting, call the callbacks *after* deleting the window from our list! + + * EditorWindow.py: + Fix up the Windows menu via the new callback mechanism instead of + depending on menu post commands (which don't work when the menu is + torn off). + + * WindowList.py: + Support callbacks to patch up Windows menus everywhere. + + * ChangeLog: Oh, why not. Checking in the Emacs-generated change log. + +Tue Feb 16 22:34:17 1999 Guido van Rossum <guido@cnri.reston.va.us> + + * ScriptBinding.py: + Only pop up the stack viewer when requested in the Debug menu. + +Mon Feb 8 22:27:49 1999 Guido van Rossum <guido@cnri.reston.va.us> + + * WindowList.py: Don't crash if a window no longer exists. + + * TODO.txt: Restructured a bit. + +Mon Feb 1 23:06:17 1999 Guido van Rossum <guido@cnri.reston.va.us> + + * PyShell.py: Add current dir or paths of file args to sys.path. + + * Debugger.py: Add canonic() function -- for brand new bdb.py feature. + + * StackViewer.py: Protect against accessing an empty stack. + +Fri Jan 29 20:44:45 1999 Guido van Rossum <guido@cnri.reston.va.us> + + * ZoomHeight.py: + Use only the height to decide whether to zoom in or out. + +Thu Jan 28 22:24:30 1999 Guido van Rossum <guido@cnri.reston.va.us> + + * EditorWindow.py, FileList.py: + Make sure the Tcl variables are shared between windows. + + * PyShell.py, EditorWindow.py, Bindings.py: + Move menu/key binding code from Bindings.py to EditorWindow.py, + with changed APIs -- it makes much more sense there. + Also add a new feature: if the first character of a menu label is + a '!', it gets a checkbox. Checkboxes are bound to Boolean Tcl variables + that can be accessed through the new getvar/setvar/getrawvar API; + the variable is named after the event to which the menu is bound. + + * Debugger.py: Add Quit button to the debugger window. + + * SearchDialog.py: + When find_again() finds exactly the current selection, it's a failure. + + * idle.py, Attic/idle: Rename idle -> idle.py + +Mon Jan 18 15:18:57 1999 Guido van Rossum <guido@cnri.reston.va.us> + + * EditorWindow.py, WindowList.py: Only deiconify when iconic. + + * TODO.txt: Misc + +Tue Jan 12 22:14:34 1999 Guido van Rossum <guido@cnri.reston.va.us> + + * testcode.py, Attic/test.py: + Renamed test.py to testcode.py so one can import Python's + test package from inside IDLE. (Suggested by Jack Jansen.) + + * EditorWindow.py, ColorDelegator.py: + Hack to close a window that is colorizing. + + * Separator.py: Vladimir Marangozov's patch: + The separator dances too much and seems to jump by arbitrary amounts + in arbitrary directions when I try to move it for resizing the frames. + This patch makes it more quiet. + +Mon Jan 11 14:52:40 1999 Guido van Rossum <guido@cnri.reston.va.us> + + * TODO.txt: Some requests have been fulfilled. + + * EditorWindow.py: + Set the cursor to a watch when opening the class browser (which may + take quite a while, browsing multiple files). + + Newer, better center() -- but assumes no wrapping. + + * SearchBinding.py: + Got rid of debug print statement in goto_line_event(). + + * ScriptBinding.py: + I think I like it better if it prints the traceback even when it displays + the stack viewer. + + * Debugger.py: Bind ESC to close-window. + + * ClassBrowser.py: Use a HSeparator between the classes and the items. + Make the list of classes wider by default (40 chars). + Bind ESC to close-window. + + * Separator.py: + Separator classes (draggable divider between two panes). + +Sat Jan 9 22:01:33 1999 Guido van Rossum <guido@cnri.reston.va.us> + + * WindowList.py: + Don't traceback when wakeup() is called when the window has been destroyed. + This can happen when a torn-of Windows menu references closed windows. + And Tim Peters claims that the Windows menu is his favorite to tear off... + + * EditorWindow.py: Allow tearing off of the Windows menu. + + * StackViewer.py: Close on ESC. + + * help.txt: Updated a bunch of things (it was mostly still 0.1!) + + * extend.py: Added ScriptBinding to standard bindings. + + * ScriptBinding.py: + This now actually works. See doc string. It can run a module (i.e. + import or reload) or debug it (same with debugger control). Output + goes to a fresh output window, only created when needed. + +====================================================================== + Python release 1.5.2b1, IDLE version 0.2 +====================================================================== + +Fri Jan 8 17:26:02 1999 Guido van Rossum <guido@cnri.reston.va.us> + + * README.txt, NEWS.txt: What's new in this release. + + * Bindings.py, PyShell.py: + Paul Prescod's patches to allow the stack viewer to pop up when a + traceback is printed. + +Thu Jan 7 00:12:15 1999 Guido van Rossum <guido@cnri.reston.va.us> + + * FormatParagraph.py: + Change paragraph width limit to 70 (like Emacs M-Q). + + * README.txt: + Separating TODO from README. Slight reformulation of features. No + exact release date. + + * TODO.txt: Separating TODO from README. + +Mon Jan 4 21:19:09 1999 Guido van Rossum <guido@cnri.reston.va.us> + + * FormatParagraph.py: + Hm. There was a boundary condition error at the end of the file too. + + * SearchBinding.py: Hm. Add Unix binding for replace, too. + + * keydefs.py: Ran eventparse.py again. + + * FormatParagraph.py: Added Unix Meta-q key binding; + fix find_paragraph when at start of file. + + * AutoExpand.py: Added Meta-/ binding for Unix as alt for Alt-/. + + * SearchBinding.py: + Add unix binding for grep (otherwise the menu entry doesn't work!) + + * ZoomHeight.py: Adjusted Unix height to work with fvwm96. :=( + + * GrepDialog.py: Need to import sys! + + * help.txt, extend.txt, README.txt: Formatted some paragraphs + + * extend.py, FormatParagraph.py: + Add new extension to reformat a (text) paragraph. + + * ZoomHeight.py: Typo in Win specific height setting. + +Sun Jan 3 00:47:35 1999 Guido van Rossum <guido@cnri.reston.va.us> + + * AutoIndent.py: Added something like Tim Peters' backspace patch. + + * ZoomHeight.py: Adapted to Unix (i.e., more hardcoded constants). + +Sat Jan 2 21:28:54 1999 Guido van Rossum <guido@cnri.reston.va.us> + + * keydefs.py, idlever.py, idle.pyw, idle.bat, help.txt, extend.txt, extend.py, eventparse.py, ZoomHeight.py, WindowList.py, UndoDelegator.py, StackViewer.py, SearchEngine.py, SearchDialogBase.py, SearchDialog.py, ScrolledList.py, SearchBinding.py, ScriptBinding.py, ReplaceDialog.py, Attic/README, README.txt, PyShell.py, Attic/PopupMenu.py, OutputWindow.py, IOBinding.py, Attic/HelpWindow.py, History.py, GrepDialog.py, FileList.py, FrameViewer.py, EditorWindow.py, Debugger.py, Delegator.py, ColorDelegator.py, Bindings.py, ClassBrowser.py, AutoExpand.py, AutoIndent.py: + Checking in IDLE 0.2. + + Much has changed -- too much, in fact, to write down. + The big news is that there's a standard way to write IDLE extensions; + see extend.txt. Some sample extensions have been provided, and + some existing code has been converted to extensions. Probably the + biggest new user feature is a new search dialog with more options, + search and replace, and even search in files (grep). + + This is exactly as downloaded from my laptop after returning + from the holidays -- it hasn't even been tested on Unix yet. + +Fri Dec 18 15:52:54 1998 Guido van Rossum <guido@cnri.reston.va.us> + + * FileList.py, ClassBrowser.py: + Fix the class browser to work even when the file is not on sys.path. + +Tue Dec 8 20:39:36 1998 Guido van Rossum <guido@cnri.reston.va.us> + + * Attic/turtle.py: Moved to Python 1.5.2/Lib + +Fri Nov 27 03:19:20 1998 Guido van Rossum <guido@cnri.reston.va.us> + + * help.txt: Typo + + * EditorWindow.py, FileList.py: Support underlining of menu labels + + * Bindings.py: + New approach, separate tables for menus (platform-independent) and key + definitions (platform-specific), and generating accelerator strings + automatically from the key definitions. + +Mon Nov 16 18:37:42 1998 Guido van Rossum <guido@cnri.reston.va.us> + + * Attic/README: Clarify portability and main program. + + * Attic/README: Added intro for 0.1 release and append Grail notes. + +Mon Oct 26 18:49:00 1998 Guido van Rossum <guido@cnri.reston.va.us> + + * Attic/turtle.py: root is now a global called _root + +Sat Oct 24 16:38:38 1998 Guido van Rossum <guido@cnri.reston.va.us> + + * Attic/turtle.py: Raise the root window on reset(). + Different action on WM_DELETE_WINDOW is more likely to do the right thing, + allowing us to destroy old windows. + + * Attic/turtle.py: + Split the goto() function in two: _goto() is the internal one, + using Canvas coordinates, and goto() uses turtle coordinates + and accepts variable argument lists. + + * Attic/turtle.py: Cope with destruction of the window + + * Attic/turtle.py: Turtle graphics + + * Debugger.py: Use of Breakpoint class should be bdb.Breakpoint. + +Mon Oct 19 03:33:40 1998 Guido van Rossum <guido@cnri.reston.va.us> + + * SearchBinding.py: + Speed up the search a bit -- don't drag a mark around... + + * PyShell.py: + Change our special entries from <console#N> to <pyshell#N>. + Patch linecache.checkcache() to keep our special entries alive. + Add popup menu to all editor windows to set a breakpoint. + + * Debugger.py: + Use and pass through the 'force' flag to set_dict() where appropriate. + Default source and globals checkboxes to false. + Don't interact in user_return(). + Add primitive set_breakpoint() method. + + * ColorDelegator.py: + Raise priority of 'sel' tag so its foreground (on Windows) will take + priority over text colorization (which on Windows is almost the + same color as the selection background). + + Define a tag and color for breakpoints ("BREAK"). + + * Attic/PopupMenu.py: Disable "Open stack viewer" and "help" commands. + + * StackViewer.py: + Add optional 'force' argument (default 0) to load_dict(). + If set, redo the display even if it's the same dict. + +Fri Oct 16 21:10:12 1998 Guido van Rossum <guido@cnri.reston.va.us> + + * StackViewer.py: Do nothing when loading the same dict as before. + + * PyShell.py: Details for debugger interface. + + * Debugger.py: + Restructured and more consistent. Save checkboxes across instantiations. + + * EditorWindow.py, Attic/README, Bindings.py: + Get rid of conflicting ^X binding. Use ^W. + + * Debugger.py, StackViewer.py: + Debugger can now show local and global variables. + + * Debugger.py: Oops + + * Debugger.py, PyShell.py: Better debugger support (show stack etc). + + * Attic/PopupMenu.py: Follow renames in StackViewer module + + * StackViewer.py: + Rename classes to StackViewer (the widget) and StackBrowser (the toplevel). + + * ScrolledList.py: Add close() method + + * EditorWindow.py: Clarify 'Open Module' dialog text + + * StackViewer.py: Restructured into a browser and a widget. + +Thu Oct 15 23:27:08 1998 Guido van Rossum <guido@cnri.reston.va.us> + + * ClassBrowser.py, ScrolledList.py: + Generalized the scrolled list which is the base for the class and + method browser into a separate class in its own module. + + * Attic/test.py: Cosmetic change + + * Debugger.py: Don't show function name if there is none + +Wed Oct 14 03:43:05 1998 Guido van Rossum <guido@cnri.reston.va.us> + + * Debugger.py, PyShell.py: Polish the Debugger GUI a bit. + Closing it now also does the right thing. + +Tue Oct 13 23:51:13 1998 Guido van Rossum <guido@cnri.reston.va.us> + + * Debugger.py, PyShell.py, Bindings.py: + Ad primitive debugger interface (so far it will step and show you the + source, but it doesn't yet show the stack). + + * Attic/README: Misc + + * StackViewer.py: Whoops -- referenced self.top before it was set. + + * help.txt: Added history and completion commands. + + * help.txt: Updated + + * FileList.py: Add class browser functionality. + + * StackViewer.py: + Add a close() method and bind to WM_DELETE_WINDOW protocol + + * PyShell.py: Clear the linecache before printing a traceback + + * Bindings.py: Added class browser binding. + + * ClassBrowser.py: Much improved, much left to do. + + * PyShell.py: Make the return key do what I mean more often. + + * ClassBrowser.py: + Adding the beginnings of a Class browser. Incomplete, yet. + + * EditorWindow.py, Bindings.py: + Add new command, "Open module". You select or type a module name, + and it opens the source. + +Mon Oct 12 23:59:27 1998 Guido van Rossum <guido@cnri.reston.va.us> + + * PyShell.py: Subsume functionality from Popup menu in Debug menu. + Other stuff so the PyShell window can be resurrected from the Windows menu. + + * FileList.py: Get rid of PopUp menu. + Create a simple Windows menu. (Imperfect when Untitled windows exist.) + Add wakeup() method: deiconify, raise, focus. + + * EditorWindow.py: Generalize menu creation. + + * Bindings.py: Add Debug and Help menu items. + + * EditorWindow.py: Added a menu bar to every window. + + * Bindings.py: Add menu configuration to the event configuration. + + * Attic/PopupMenu.py: Pass a root to the help window. + + * SearchBinding.py: + Add parent argument to 'go to line number' dialog box. + +Sat Oct 10 19:15:32 1998 Guido van Rossum <guido@cnri.reston.va.us> + + * StackViewer.py: + Add a label at the top showing (very basic) help for the stack viewer. + Add a label at the bottom showing the exception info. + + * Attic/test.py, Attic/idle: Add Unix main script and test program. + + * idle.pyw, help.txt, WidgetRedirector.py, UndoDelegator.py, StackViewer.py, SearchBinding.py, Attic/README, PyShell.py, Attic/PopupMenu.py, Percolator.py, Outline.py, IOBinding.py, History.py, Attic/HelpWindow.py, FrameViewer.py, FileList.py, EditorWindow.py, Delegator.py, ColorDelegator.py, Bindings.py, AutoIndent.py, AutoExpand.py: + Initial checking of Tk-based Python IDE. + Features: text editor with syntax coloring and undo; + subclassed into interactive Python shell which adds history. + diff --git a/Lib/idlelib/HISTORY.txt b/Lib/idlelib/HISTORY.txt new file mode 100644 index 000000000..8bd4e8902 --- /dev/null +++ b/Lib/idlelib/HISTORY.txt @@ -0,0 +1,296 @@ +IDLE History from Python 1.5.2 to 2.1 +===================================== + +This file contains the release messages for previous IDLE releases. +As you read on you go back to the dark ages of IDLE's history. + + +What's New in IDLEfork 0.8.1? +============================= + +*Release date: 22-Jul-2001* + +- New tarball released as a result of the 'revitalisation' of the IDLEfork + project. + +- This release requires python 2.1 or better. Compatibility with earlier + versions of python (especially ancient ones like 1.5x) is no longer a + priority in IDLEfork development. + +- This release is based on a merging of the earlier IDLE fork work with current + cvs IDLE (post IDLE version 0.8), with some minor additional coding by Kurt + B. Kaiser and Stephen M. Gava. + +- This release is basically functional but also contains some known breakages, + particularly with running things from the shell window. Also the debugger is + not working, but I believe this was the case with the previous IDLE fork + release (0.7.1) as well. + +- This release is being made now to mark the point at which IDLEfork is + launching into a new stage of development. + +- IDLEfork CVS will now be branched to enable further development and + exploration of the two "execution in a remote process" patches submitted by + David Scherer (David's is currently in IDLEfork) and GvR, while stabilisation + and development of less heavyweight improvements (like user customisation) + can continue on the trunk. + + +What's New in IDLEfork 0.7.1? +============================== + +*Release date: 15-Aug-2000* + +- First project tarball released. + +- This was the first release of IDLE fork, which at this stage was a + combination of IDLE 0.5 and the VPython idle fork, with additional changes + coded by David Scherer, Peter Schneider-Kamp and Nicholas Riley. + + + +IDLEfork 0.7.1 - 29 May 2000 +----------------------------- + + David Scherer <dscherer@cmu.edu> + +- This is a modification of the CVS version of IDLE 0.5, updated as of + 2000-03-09. It is alpha software and might be unstable. If it breaks, you + get to keep both pieces. + +- If you have problems or suggestions, you should either contact me or post to + the idle-dev mailing list (making it clear that you are using this modified + version of IDLE). + +- Changes: + + - The ExecBinding module, a replacement for ScriptBinding, executes programs + in a separate process, piping standard I/O through an RPC mechanism to an + OnDemandOutputWindow in IDLE. It supports executing unnamed programs + (through a temporary file). It does not yet support debugging. + + - When running programs with ExecBinding, tracebacks will be clipped to + exclude system modules. If, however, a system module calls back into the + user program, that part of the traceback will be shown. + + - The OnDemandOutputWindow class has been improved. In particular, it now + supports a readline() function used to implement user input, and a + scroll_clear() operation which is used to hide the output of a previous run + by scrolling it out of the window. + + - Startup behavior has been changed. By default IDLE starts up with just a + blank editor window, rather than an interactive window. Opening a file in + such a blank window replaces the (nonexistent) contents of that window + instead of creating another window. Because of the need to have a + well-known port for the ExecBinding protocol, only one copy of IDLE can be + running. Additional invocations use the RPC mechanism to report their + command line arguments to the copy already running. + + - The menus have been reorganized. In particular, the excessively large + 'edit' menu has been split up into 'edit', 'format', and 'run'. + + - 'Python Documentation' now works on Windows, if the win32api module is + present. + + - A few key bindings have been changed: F1 now loads Python Documentation + instead of the IDLE help; shift-TAB is now a synonym for unindent. + +- New modules: + + ExecBinding.py Executes program through loader + loader.py Bootstraps user program + protocol.py RPC protocol + Remote.py User-process interpreter + spawn.py OS-specific code to start programs + +- Files modified: + + autoindent.py ( bindings tweaked ) + bindings.py ( menus reorganized ) + config.txt ( execbinding enabled ) + editorwindow.py ( new menus, fixed 'Python Documentation' ) + filelist.py ( hook for "open in same window" ) + formatparagraph.py ( bindings tweaked ) + idle.bat ( removed absolute pathname ) + idle.pyw ( weird bug due to import with same name? ) + iobinding.py ( open in same window, EOL convention ) + keydefs.py ( bindings tweaked ) + outputwindow.py ( readline, scroll_clear, etc ) + pyshell.py ( changed startup behavior ) + readme.txt ( <Recursion on file with id=1234567> ) + + + +IDLE 0.5 - February 2000 - Release Notes +---------------------------------------- + +This is an early release of IDLE, my own attempt at a Tkinter-based +IDE for Python. + +(For a more detailed change log, see the file ChangeLog.) + +FEATURES + +IDLE has the following features: + +- coded in 100% pure Python, using the Tkinter GUI toolkit (i.e. Tcl/Tk) + +- cross-platform: works on Windows and Unix (on the Mac, there are +currently problems with Tcl/Tk) + +- multi-window text editor with multiple undo, Python colorizing +and many other features, e.g. smart indent and call tips + +- Python shell window (a.k.a. interactive interpreter) + +- debugger (not complete, but you can set breakpoints, view and step) + +USAGE + +The main program is in the file "idle.py"; on Unix, you should be able +to run it by typing "./idle.py" to your shell. On Windows, you can +run it by double-clicking it; you can use idle.pyw to avoid popping up +a DOS console. If you want to pass command line arguments on Windows, +use the batch file idle.bat. + +Command line arguments: files passed on the command line are executed, +not opened for editing, unless you give the -e command line option. +Try "./idle.py -h" to see other command line options. + +IDLE requires Python 1.5.2, so it is currently only usable with a +Python 1.5.2 distribution. (An older version of IDLE is distributed +with Python 1.5.2; you can drop this version on top of it.) + +COPYRIGHT + +IDLE is covered by the standard Python copyright notice +(https://www.python.org/doc/copyright). + + +New in IDLE 0.5 (2/15/2000) +--------------------------- + +Tons of stuff, much of it contributed by Tim Peters and Mark Hammond: + +- Status bar, displaying current line/column (Moshe Zadka). + +- Better stack viewer, using tree widget. (XXX Only used by Stack +Viewer menu, not by the debugger.) + +- Format paragraph now recognizes Python block comments and reformats +them correctly (MH) + +- New version of pyclbr.py parses top-level functions and understands +much more of Python's syntax; this is reflected in the class and path +browsers (TP) + +- Much better auto-indent; knows how to indent the insides of +multi-line statements (TP) + +- Call tip window pops up when you type the name of a known function +followed by an open parenthesis. Hit ESC or click elsewhere in the +window to close the tip window (MH) + +- Comment out region now inserts ## to make it stand out more (TP) + +- New path and class browsers based on a tree widget that looks +familiar to Windows users + +- Reworked script running commands to be more intuitive: I/O now +always goes to the *Python Shell* window, and raw_input() works +correctly. You use F5 to import/reload a module: this adds the module +name to the __main__ namespace. You use Control-F5 to run a script: +this runs the script *in* the __main__ namespace. The latter also +sets sys.argv[] to the script name + + +New in IDLE 0.4 (4/7/99) +------------------------ + +Most important change: a new menu entry "File -> Path browser", shows +a 4-column hierarchical browser which lets you browse sys.path, +directories, modules, and classes. Yes, it's a superset of the Class +browser menu entry. There's also a new internal module, +MultiScrolledLists.py, which provides the framework for this dialog. + + +New in IDLE 0.3 (2/17/99) +------------------------- + +Most important changes: + +- Enabled support for running a module, with or without the debugger. +Output goes to a new window. Pressing F5 in a module is effectively a +reload of that module; Control-F5 loads it under the debugger. + +- Re-enable tearing off the Windows menu, and make a torn-off Windows +menu update itself whenever a window is opened or closed. + +- Menu items can now be have a checkbox (when the menu label starts +with "!"); use this for the Debugger and "Auto-open stack viewer" +(was: JIT stack viewer) menu items. + +- Added a Quit button to the Debugger API. + +- The current directory is explicitly inserted into sys.path. + +- Fix the debugger (when using Python 1.5.2b2) to use canonical +filenames for breakpoints, so these actually work. (There's still a +lot of work to be done to the management of breakpoints in the +debugger though.) + +- Closing a window that is still colorizing now actually works. + +- Allow dragging of the separator between the two list boxes in the +class browser. + +- Bind ESC to "close window" of the debugger, stack viewer and class +browser. It removes the selection highlighting in regular text +windows. (These are standard Windows conventions.) + + +New in IDLE 0.2 (1/8/99) +------------------------ + +Lots of changes; here are the highlights: + +General: + +- You can now write and configure your own IDLE extension modules; see +extend.txt. + + +File menu: + +The command to open the Python shell window is now in the File menu. + + +Edit menu: + +New Find dialog with more options; replace dialog; find in files dialog. + +Commands to tabify or untabify a region. + +Command to format a paragraph. + + +Debug menu: + +JIT (Just-In-Time) stack viewer toggle -- if set, the stack viewer +automatically pops up when you get a traceback. + +Windows menu: + +Zoom height -- make the window full height. + + +Help menu: + +The help text now show up in a regular window so you can search and +even edit it if you like. + + + +IDLE 0.1 was distributed with the Python 1.5.2b1 release on 12/22/98. + +====================================================================== diff --git a/Lib/idlelib/Icons/README.txt b/Lib/idlelib/Icons/README.txt new file mode 100644 index 000000000..e245bc0b2 --- /dev/null +++ b/Lib/idlelib/Icons/README.txt @@ -0,0 +1,51 @@ +IDLE-PYTHON LOGOS + +These are sent to tk on Windows, *NIX, and non-Aqua macOS +in pyshell following "# set application icon". + + +2006?: Andrew Clover made variously sized python icons for win23. +https://www.doxdesk.com/software/py/pyicons.html + +2006: 16, 32, and 48 bit .png versions were copied to CPython +as Python application icons, maybe in PC/icons/py.ico. +https://github.com/python/cpython/issues/43372 + +2014: They were copied (perhaps a bit revised) to idlelib/Icons. +https://github.com/python/cpython/issues/64605 +.gif versions were also added. + +2020: Add Clover's 256-bit image. +https://github.com/python/cpython/issues/82620 +Other fixups were done. + +The idle.ico file used for Windows was created with ImageMagick: + $ convert idle_16.png idle_32.png idle_48.png idle_256.png idle.ico +** This needs redoing whenever files are changed. +?? Do Start, Desktop, and Taskbar use idlelib/Icons files? + +Issue added Windows Store PC/icons/idlex44.png and .../idlex150.png. +https://github.com/python/cpython/pull/22817 +?? Should these be updated with major changes? + +2022: Optimize .png images in CPython repository with external program. +https://github.com/python/cpython/pull/21348 +idle.ico (and idlex##) were not updated. + +The idlexx.gif files are only needed for *nix running tcl/tk 8.5. +As of 2022, this was known true for 1 'major' Linux distribution. +(Same would be true for any non-Aqua macOS with 8.5, but now none?) +Can be deleted when we require 8.6 or it is known always used. + +Future: Derivatives of Python logo should be submitted for approval. +PSF Trademark Working Group / Committee psf-trademarks@python.org +https://www.python.org/community/logos/ # Original files +https://www.python.org/psf/trademarks-faq/ +https://www.python.org/psf/trademarks/ # Usage. + + +OTHER GIFS: These are used by browsers using idlelib.tree. +At least some will not be used when tree is replaced by ttk.Treeview. + + +Edited 2024 August 26 by TJR. diff --git a/Lib/idlelib/Icons/folder.gif b/Lib/idlelib/Icons/folder.gif new file mode 100644 index 0000000000000000000000000000000000000000..effe8dc8a00681b3f1c1f5bdd7808a924e3b9b15 GIT binary patch literal 120 zcmZ?wbhEHb<Y(YzSoELa|Nry<|4;aTe!~0r@6Vr4m@t6>2o4-Lp!k!8k%57oK?lSK zsdZqstq4D}EI?FXl_(>3(z3te<q|2Gvsf3dbGfV|5|MdlN$QRT-A5UYw7Ro=)0WcQ XD)C}k%rmC5H;b<)Mn<-=FjxZsZeK7H literal 0 HcmV?d00001 diff --git a/Lib/idlelib/Icons/idle.ico b/Lib/idlelib/Icons/idle.ico new file mode 100644 index 0000000000000000000000000000000000000000..2aa9a8300d9e29670ecbe585f5ab21579dece9c2 GIT binary patch literal 57746 zcmce<2|QK%`aizSico}#5NS4)q6wi$vpN#W&@4$RG?<4-NS%^OG!F>L6q%(`NhPE* zmP)3SA+dh%XV*U0?R(C>=icx4|6i{@*52D*>+?LH&ojQCXNkq)V)3%X#8^1Xv$pWE zSPNJzmc0Cr_gC@x4Sc4i_VfK%7Rz)vzJP<i|NCVYtA7@YH6HKrRebW}bDUVXEo+$2 zkHLPAA2Bg8a-7${o+Be8^`oMqZk<1WzVqV6i!GNfT{?RC@@0{M-;0fnZN)uyT)%#u z{W-qFd*Q-`h0)Q`S#fc3%-gqbnZCY0hK}CeUZ%ah{l&oR<KyF*+}vE|#*G`jxJS*^ zt5?4yB_%PB9z9|@J3E;h?F_TBiectHVHllahB;lwzEvvc9`xN;uU;`79UV+VLj%*; z*vNeN@PT>%{yo#*-_KZmV3-v(46~q|VV-_r7>y$K^_`sSQ&LjcbJf+=G0n}*?9tQH z!@icjY17Ow=8X)K`k8&*z#m`nCM7*Roq7HGHJjG9wl?P5w{Ogo%!^Fej`{5GuE+H@ zpBTpMEyFB%%`ke;8AkIV!>HvmOa$n<bLS58`0-;l?Vmq?X3u-geIXOEQ-|qj{m7gK z&2$gzCWbMsXP8A;3*Dy-GyMU>XcaO{PEHQ<=FJ=S{9nHkNemOWZ#Hv&&s-+y_)hjc z*dPA<(bUT@&R9e3Qihp!k74rj^O+}4p0M|+yStnHtqlM9Ow8UnO!RJT=645OCUC1B z<Gx`&<F;V|6MH6*p?ersFpLrCC@Lyqs;jG+uC6XN@3dz%1?QL)&$-Ms*E!7DUE0ji z?emy}Tl8@~?y=F3J;%ywhPjG$xqtsYQ(9We-ZzpHT1z_9-VHpS<R&nFn{kizKh_n$ zBW9Be3k%uv6YX>j(Lra9%q6;OGaqZ7vDY(X+dRf^D|`Mgoc$-+D=8^q-o1OreE<HP zsjshRT3T8dx*zT3o4oVPO>aZy0@gFqbrJL6_7x&4nR9(sRu+5xX<m{W+6$6Fx<_qo z?LW~%bbb2tiQ!yJ=ZuVuKlY#2j^^deP4g2?_wL<e-}~XihfH>Mw#UHhQ&UqJl0mu; z$r66g)+gFmS{u5S)|mFGprGKNuBH393&2ibuy}qB`tYv~&UfhhG(>;c8F{?a#UT5` zK45r$wKG3{@uxpwmDqQqJMv+0{pq*xA=cds<32_w#=wK#Lz)?{zq<C9&uK1c1qB5) zOG``RjT<+vm@#99!Sw0V=izf$R+bV5S=GT9+!*Y+Uqd}ecZ^;z%$yR2nE`vG1|6IV zUABD8FfV@Ch<`-`@hZc|$EWG#<+T%bs+;5va`N@Xix(fNs;WN0mc6`n>(+T^XJ<QQ zWn}|=Umar%WT$m=1H&wS^~09wK4X~Kn3L?l^A3h7ft}PTU@u7vzW-N;EbPSv%-K!$ zk>r%@GtoeU>?aM9Vc5fdjE;(mif6D7x9QHNn4fGZ*`WEbr#jI8nU5Hz3^wWscpsn5 zp8ucZ`xipw$WD8Ed)xf}`|qYiLtb7U^Web)whofbCtFVTfMk~BmwrdD>9BauFu%bD zF0W=7<ChF$fPEl4rUe?NV)v(DAL#gH&Vg^`zI^$@?Af!&VgLU9b{{`}Wb5A3r%&1Q zmX(#U*W@Svf7p;8cl}|5$rr4G3@m%YFt^$`zxm5^D}FOj9@z7f4QOg=Vh^H$2Kg+G z-y%QK{Prbt#mAI6zC)J@v7g7Dz!rYM>LbIfc?X{e8pxlJ9VVYLP#!1cGR)Xae1>z` zKg*;X`3PTMUz_moa8sg#LksOc*$kqE>`q3+cDDUL1wV8QK7bCIpT;`SK>p06_NP38 zhIu59&<T=9Rp`Wo9EMQ>4QrqyIPU%21Ua&CE-o$(Zf<UN9DmE90Xo256S9*x-1V7D z&U4xR<D{bw`zD<E$)B!;Utj%;Jd$6W1)b1<xTruENFFEMVPDGe_i|*XX?<H;TiJu` zG>w6@&=m>$XS4m+1<())ANB>l*b6!~kOq=R^2r0`Q3vu!Izhgb<Z)aUdwz~gvgh~r z_qU0Nh%g;U2hC4%PG>rj-Dfd3K*Lq|Q1ay|;f|mIO#h4H<2QzJsz$5?8YspfotT{W z;{wk5lW*C(cdvtohld?vF^b3jSP$~Ov=(%vd(LE%+-9+3i7PI1m~(rynbS@>Y<UcY zJW@>Hv&n$%(+|KW(>US1l_46~@`!ki?4x?o|D2y}01b+FXbhx-)`a#y_n;1w<}s7G z2^wM%&s=ty`-ePIOhUdqV5>gkO*H(RpW+ibNGCY*I2Y@H<B$C(9~~GNXmjSw8B?+a z<fA!0pJ<^qp!3rUTbVoFT1+ZvNIWo$9S@N_MnM)RHY1$~-loTnYdkj^u=%Gopktto z-VR%d;}7{K-P*Trp9Ac_9qA(3yPBFB=H<(m>@^|VL+kP7eI@hY*m5S*ON&WypUIZT z>xjuN4$ujTtAgzG*m04^Pa0@4wmf29ON>`t^vNGKNRDD~(g7Nzi!_K18nhlXXm19_ z!0bEx$&Y7w@yrp>a0oQ`A~vHK@t5O&*gu*-C@9G0?Af!XL<7ZM<>lq<HK$nR`Sa%t z{2-eSS_`sAv>$Zbf-KyCEO2z<&*YK5H_+h!@>-7KsRIWNIQaPZ*b$Gk-y{R%i#YiM z=>V+<$s)~7YeEO<L`&Usrn&9~bLCfggieq=((%ij1K-L~TuN&|azKM<puvgz{%UVX zCkn%sGi?penb!Ij|By$-=p1=G?Y@Sl|5yHBj_wm29BhO9%#`RLUke}4_W2}>L<`wQ zS{I^))`0eh)~4hAOXl&pZA`k)JSO45Y=$F`=l3pPZXS1Jni>$C{6p3T^38cIM_+Jv zcX#mf^RuJ9ptYwMgyy7pgw}-Cg4UeQwEmQvkt~p`a^iZr59c7B@V%$tXP~d;%sKEZ zH}D#|j_yZ;=B4`&+#AmR{Mp_RedM>ucF_7^k{K8j-~FqDz5XE~AvVa7O^FtgZ{m++ zp7w&)gX{st2Xt?ae$rfI7dW~KKk?n(-hMM=c^6`&eoU%?!H!k`1p(~&;d|NZPyExG zbNnB@=Eyw714I|iPlIS9UFDqNtG-Q{GG)K5t!)(Yl4i_Fki)+_*z!;NPJ^@dL<bGd z!FkX5J;@~51-gc4p|zlOBAZEcW@l%IV&Z?oCH{gCw*DVJeAwpPxpQp!|5vnd=%DYA z4v;)hj7V`3*$c|4Zr;3k4s-oPVE$s(e|*fgza0BR_p7e1X8U~F1LBFpGiPpE6Z(wi zrTwRPnesi-8SrrCKbV`SV9(EyXO8V5I%tsW(-^oW^qORjlOq$~B(u++Jp<D8xA~^I z>5!v&4jnqgw*P-d2PY0DStNTzIWNV9l;4s({x9Zc&rdva{4dE8%|Z91K{k(cj&z&& zr1?n3C@-Nrn{3p7$v2yM4*$Qd`>*RydqB3AY#+(@PaoM_TwEN8dko{;?7uhz{bR#| z1P%VDgY@g)*|)zW>ARe#P7N1J&J!{)U~u6z>u(JD-oWeVwa$Ryf!8z`PZk#j4~77S zD25z{4nxL?5_@ZmKX3}A{|KkRm46&$XK5|?2Moe42qF3Z<KX%)CLwxh|A))T$tmDW z11rE%9yDl>GR|W#<S<5INMH=XAe`j?k|(+s-B%dn?;NzgB&Q=W<fEdZRzoK<poi~Z zFB{<_>);39;#>`#ZH4b@fIcU}E(dXOaZQ>tXO1eaBc7x&=strmXdV8O^`pHO#25xV zMiFOPtH0xG@HLjSg@uI<uqBEOM!|=Kl6`}}V*6dfeaW_wjUzumK8}7*HVL-qHEhra z@LCIe;w*4V4?R7-X}AyVlMIFw#!w8Rh4z)ODjM{f)|h@Li6M(2wSD{cX|T87@Om=F z-=%*9*1H5a8O0V-nwpx*9E^hOGhs92iwHkSOG{(Z&B2ohQ>IvfzDL)P&xS2)z%@~c ziHUBor*2kOR`U^uFLQKsG(b$WTwGk7Xq$jBNlHp;8uB#rsZ*!Y+DRK27>p-dh}ZuS z{glgOW@d&dDk@IL8itUaC(N9)&SYCFD=XP_l8>i3h-QkxC?=!##1m&w989kvb6?<( zyCHYIxaWJa;jq^o@YCt=A=Q|xhrS0sk3rw2gN6{g_CKYcd@sd<oWb!`bS54+gZvd| z5d9oJIIrpbpYcL8(ICIa8RYjkgYy~Z{NK=zc<C_qaSUX_m-wI<hUh2xApc5xK(P<K zCmKm7D7K<A{4INM@<KY3evt0aHSmdS`e_d-cBOq77)w(8g!jGp{5$;~Iy@CT{B8NC z7(rfMo-O}cT3X5^$25q3iVG+%q1f#9?b~b}rahoNAuNXm(NB3T=?diuoE(>I0LdHa z3GETlmICNyBXCWfpBNV5XoTgd0829gu6F$`iXNSv&!8)$|9|HgLG+_W5vHW1G#&VV z2;oZ<zY-5*b7;*;&WRt|3!<G~)BaP=MT1_`n$vm{y(A073(-yMPcnKQm>l7;guxLG zNca<BV5-33CV~fL;BaGZGfW6lM8uR7xBi`jO+UrPoI&(+24^ogXO520nRws~j*ifo zqa$=C`bkGgURJ;Pfg9<U{lK*eTPOUAFf<2X-JRbVW)pBVwJee-rtR+#kME42I1aLW zc-pjSV;~E@#0U1_kDQCc3(-PyL^S>xAGGeY=Cns7HzfaLcd7nK2jS6#%X9Ex!o>*- zB|O#<co@;Y6&NjHvUL1i`YA@|*ng6Lih*fx_JhvE14qtjU1>i^u1GdGypWEQoRQp< zUU1H&7j&!ymb?@^5Ux+PTEY;i=1W*A@j!JJ!ZOEav%mfy(GOc3Hg@dT>DY%5(lfFx zf5r#NI%hxV%#kZP)B4lz$uH2gWM>8*R2v~YeCcb3SqL7eK9cYQ${qN%KYQJd4^REY zevF`8f%3kAgLvQ!4j+HECmdb|@<F*pX?i4c>3}gq*!~IB7w9lYO@V4FRNtYx!otd* z`V5(&+5%gjfvb}~lTA{F9*{myfjp5;_cP4HKjDE*Klb~uhK9x%*mGavgKQw3IXuvr z<eudES3WrMMY2w^RQ>Q4u(vtvdMwqJi3d8U9zb;wPJM_lSR?T8hdvVzKlPbv0~29W z$HFElfCss>AGQ^@@%n`aHvMD9jQPX<Q%*+X*Zm;<C4a!#57GyE&(Ra2pK|G(@C|J2 zj__>4^{KW%2h}tz!2{J*sJ=uPE=Qk<2aY~-Fm<XeP>qG^Jo4$#f7mG;kN=E**n778 zL)Stm9wMFN@WJ7Q_JI7sz&+vcLT93%>}0anJa%1zu)j;-;T-TsI(7l+r5**#_o&N& z2hwM<Nye~A9DODpIQmR=0ggVCO&XuUzD?J!^pl>Ef1#Y5Gl&Py_>~XNz6|7pUK0;= z5T1YYzz-am`V$D#|JwGEDTg`}4_4s80yRFWEphajY!c}+)fC7kQN59BOdOjuE}LN# zf6)J{T^d33BfdY3+VU90D89r4*+n{&%n%<G^U#@iq0h+Ia^f=j9r;^|d+4|g44Ucz zRFj}S55mGTBX<1T+7SC<{P+MqsV1RC{+aX{c9rz`mpT<^8%B`5;K={1S+kUBFF1qr zmFOngh;|MyWc$h9Q(i-MlYABVHafCUQz0Ck>RW^%Q*Gy0eWsdc80rd#QC}fU-3PS= zj|~P)&>nN<P5Bcx4+CQiwmyRgIyi*?JhSPCy=Tim=n0{Ci0C37h$f<&^nuoyvnOQZ zDK6mb0mTu-Bgub$fHu1>lm;HC9zk_N>XjiLNT10j5gt!GP;KNeY9rM9LbWogj}Q-Z zQ0<)jGbhHFj(x!KKjfcm2Kiu4U4YKS!@$AW4?1&ngwC`doI!jNj`-xP4U_Am$*wC= zeT`~-@!)~<nQRi(`68XP8LGKbosDXJRAcf75A0go&l(T;XO2xG|GW;mf#ZMJAEF<! zz?Of=wJ-5P^1$Ke@9@Flg|2;Hn#AP!YBD+CAp^BBwmyRgs+Dr|nfjK_IO#Cqj=JnR z9o5gNMn(NYUZ|7NK{jdLfEXhQdXM9O*ngs*Bmc8!&sHWHID^B(f3hcieW-clo?;3Q z>oeItT1>`IeI}d4(Pygh5f4<~A|9yDNA*ssxe^a_uwx9w+lw(GVXyibruY}xr?(?$ z&*6W=koQc-K7>#_LF>=qfph*VUVfD=dQUcibm89}<pnqXh%rc?sb0#dkqx-^U&cQ~ zKg~yjY$<0DADqGAfzE%$2g%v5yl`}dXd#<)i)_-r(`WEN$DgeApM5lf)(Q5IE&tWk z)xN|B*+k-l><q<b6sM7YBK(=`4#h%$#tYF;zJY8N#X=O1Qa(Tj)rm_k?_s`wL%wmr z`44^O#267j_4x>NfsQ{T_D?=z(+})~9siL0bM}JPp5l2Ll&4eNPw@`XL-{?eH}OEe zfcyk!Unqwm9>|`O9Fi}jH7W=)V4hwf`a78i7oGnRV?Y-u#vpwrn{>)`36cM|^DnwL z>^)olK}!hfGba|Kwa1>Y_kiLC;(=s>XeWA!$6sZO_@nFSyA<2eUeKD5PP6s-XT6@I z&t#JZ>hr_YD2fA5|H)ea*+(OYS>k~P=>lgEADqG26FPJBgLCHS$e-~-Jd#Y&neI!r z^--iPlj)}m|NJAyApacWrq84v+ssrIr!bvgzdl3#_;2G6L_hZWFd)z|zz=+h4_bek zk8lN&{c7w1tvlfhwB8(kI6TmqzDs_X<ep+A(iQrCHu6dOjAA6Z2l4VJ2iWg<L;Llg z;y-jRj{E~pR;KsF1Fb#jAIUG#!-=VhcKRL3Jn1=SPl#TkpJbl&g>;3^qz|Mcqz^<p zXOIk%&*u0Z%DqX~ASC}0{z<fQ<R3Xn2+>b-(Lpwc){xeZz5kGDqL*HCWQ)%987J?h z{UTi<xhGobOfp2gadd?~r}d!w1NS@%>}dvi8bfK{{~P*=9vZ~Uz`<tX=Z}G(bH4v) zd=M|3J>kd~M>jZUk|W9)XkEx2)829L4bVRkLm1=l9BlguzS;7RHS{H#XdQ@N+FzQB z2H}?^!}J-gDJNc|wWc+v>xgdB1F}E#ImM?WKNM?cLl5YB+D}?{vcaIeAAS42($dnp zCr+F=58UZJh^Cqk)ph>P!Hyp|GD!BH<bkuk)zDj_fovk>^fWi|M(ahoL447f)|qn+ zy(b>%8d_7*AJovP|DQqcKSR$0knGU?(9irHxWU@pyLTS|?Rog@Ac&^A$KS2rj39bB z@elNoZU0H%=yRflWR}*8)|=LuWPt1ho#}J3^CaK2U&I6H0q48KAMsCk7X6-c&}+Ic z?GddB`E&4l33QX)q&nf>J=pYf<dn`F`K2@Qz!{wNr8CVxaB%3N^T5yPyJTm`7STcS zLpc!*qMi7Pii#qPF`Ap3`#+_fcx2PhiT|<QzQhB^E^>I`@W46$6)$WefBqmo=zFv` zoEU=YIwbcbOSI;YedZ(%(DC2U{s;X7<)7qY;C}qKdqVUR|0GK!>-3)NGSSYdkKoyw z$o~cHZ2D;qPW}tu6GC!HK8W}r9i(+4`$4vj{L$ap6IyrTn`DP{h5EGVJ;@B+k9+}a zz!e@Ip8s~;iFP{J`8&ra(wXC9=uA9t#^2o&k}<l5<c8=a{mzE%BwjeQBR;+SU&{Lr zs{iqmjsHNu*zrI7w=eNP>;JEKp*1C2L~#WT+8eS(G{`rQp3<I?EuvZi)u4zMT6fIx z-`JUdQ2fuY*z|McpYR`ACmR21Pbj{p_=on0{2C3CEjkmOWOr!|NMA|biGI=p$m2y! z|G$-)fgFsWz2@MbuoEG)?}Yyl59B*(J<0x&9FRYvH75T=xCyO2?E}REoPD78Wb?^~ zkR3}-PG;vo;Q9ZWcH)CA{~Q^o^RIHwdC$??foGC+dQab>y&&Fcory=1b;waaVubhD zEAp$<WAUH(CZg}(9n`BtJqZ6_4w~bS=XCxZLI3Xej3*pSHjDM0CBXFSuvj(dGiv*B z#w+&w|GP7~VQ_zTG{ZjQ<^RbU(GmMTocsS@)6Kb`$Ip3~A7`$gXP%#DfuCp5pJ%zB zXPuvCkDq5kBS0?~odcIIH5@W{B<<&rg+>M@KSDh&mLPQkSvp<aMD1b=4d$(Kefi1F z<$z4l9>yhJljZXMP8e&U=XfPEF3IWFEgqea9k=w1)rO+6J10-r`D&O&%h9stG@}%y z;-&VLH|;A;lPeY;;pO7y4OsByjfj?I>;B%}`UIcXckbkKxhTyW+}bfy#=+%X^TSV> znmgWP>e+0Kmek&sz(0v=LE9bv7{LuIeh*_ES@*&JM(%GzER}QIxmVv_u}w^thvhA- zyYteh4F1*AdBv0t?5oY6%GLR8q$O9t2`<(=<>>UML)Q7k3^UWaGBb+Bl51q9FL30u zo{4lq$vxYn+gNkoSltz^a?|<q)h1<)e#F>zRfzUlsD%4m{@_{N8ufYK9jPVCEAwZ! zW_G;s5!J2;nqL<_<{ryzLC#d4>1m6_hWwULmp#(+ach@ohUJZWM)d~v?KvIpxe7`- zj*L*Yq8qoD?!6tXhFM+i@?xwd&)RwpwC%go*4uZ)_|o#2G9zPSJ#+Js8>Wts5i#7q zYgb2y<}1hiQG&y=Tx#pBx;Kr;9cjrQFo`E%(@{}j5Pc{pX!YUs_m|#Tw$oSfK&NKc zH>U`eg{jeZJ!LUL-kOe{8t05!N3EK#`*PKUS4|u~!{JpxL&F9mrC}A#okBWHPYKhj z(_gP+K6C@G3U7p`z&!q%(7kOhtQQ7Ea7}hOdT>2!wPJ4E0+~f|ov)Y+8@X#w>M1GL zboJIcXV@fF*6f~D+tDK*X0&|83a>L~WLTbyl{+G}-M%Hx-QW3rFmATs2v@ASS26F= z<E9tKA6je@Q#PwJDXQ<2#pxN_Z>MHves8hr{~R6)YE~rfLmcDVy+$Tc?BU3eHm$U@ zf_|yqNA60)2DK_?j_Z6BH}2T|Xp?J4jvQeHFW@<J9<!HLR0v)u6+Csh_Upd4<O<53 zJ?ogx8YHMP^}1iEL~;3wxZJ5W^MyTU&x<o{s#v1=`b(R>=-l15yLUg=0G!ZKS>oRL zdUi`%eUz+7kx|+=+hdujsZuK8LWrNRH!M#fDV4S?H*GnUb(w;xRl)uJ?k45+?a>(- z`z!kb_9TaBhMYU6;5z5*@G`4IZ7}vbKR%!ErK{`MHZ*))e0A@h;NvKrP%kg875)hl z;z$HNi|Pm2aL<Yq!9U|m!!Q%P!ekzNocrx-6XRfQUDG5um1{U_?2D5*8@+}vVolEc z_Ay2k&m*4VGUGbQWyU&L5;<FQ=a=`TS1O%86^xLPDX6K59)F{@)<#X(2Lu`^<z7y- z@XyViH?{OzZ|_h+UNsF3UKRHU`w!_iN3OP05f%~2Yx=4pRAkaM{*ZT}ZEjne8e*3t zQBlhtTw66!uK<BUMcPiqef#(48}r$kc(0o1XE4S~@0?(mOxj}Im@>UM)AjD|qv4CA z#}5VzqeBJoJb~Q0_1xidwxcVqoZa_PhSiu?<R7gkz`D3>PP;*0q|2KTCgWc1T(x4w zPza*&qD2bF`GZA^A3V@qA%TR`d&r6V%gxOPCz}VKKR<?*``a!%yTSZEUNxV4`?hS~ z?pM{kz{zPUzNj{LZt$Bo>&729UbT9)kBzkOkRiEt$$9nd*5x<WHl$mgJafjkq%r@= z6EP<zrv&%DeYa9m*LS>o#PU8oY0@O2!G%v#Ol*0J)r3_n(^v=dxvo4L#ERZJ61gt+ zTWw@;MTUzif)X_~HBVi6&r_#Ho?NW_bhDqHS46~!i&w7btAux)oj!YZP-myJR^(C* zO-;pV)5Im_+qk+)o5!8_edWaCM~dIhc?Sh4eer@nyE^pHp}|+n?0C7kmP^d<>=QZ2 zgJrXp=EoZQ&OD4KK@J>{VJ$Z?;ZC;<NlaA7Y!%JUzlVo+T#Q5>(ksBvzueOD`;c6* z^vd#)O$XNUXctW8lHZb9yRO@nt3pb9bmY=T3CVXKS-uGluV+EC@nq+bg=Sbvc`Yxq z@e?L^8H~xjy{C!A!WLEB-ZLpok`;aK92dV2*Z$5=^A;`~l(|lIX_R*G>kJpgxpQR! zF2WpXxwOa(782rOp(jvb`}y&M7hD*+e*OBZF){j^H;+5Bbe#Q+QOe`SLAIV$RgF5) z-RG{;<Ld*Fd!i8>IosuP$jgzVMukO0ER>F17jL+Btt>ExC)L%W;l+MfM}P{}j*epb z`ue`z>CNR$U&l|JsAp$4@j-EMSXdZYl232$oHjD8O%Z{1jGr_~f9uu>P$bbq=jD$Z z?|qwWJ|$&GwMcj|->J(AVMf+7PM20!hi<P*Id}Oo|Hxo|JYaF}(WCi$_DqKe2VQL4 zJuCfaPT#hpId6SVj>wV9?k=>OY`(Wgs=te;P3QAH#f%d{s_XXKT_`mYG*k)Chd5cQ z=}tU82J*6N*DjXlmoK|7UcNj=U45v=k`715s<5ai(TK(TKDn%n*CE(n5;1FQR#SPr zXca1)&KlFFpSyN#kZH_sw_ZJeE`i=V*vRN-AB<lA{<{Q(=t5fB$=J3l%cAZ=^R}EK z$zH51{$=0XO`A90PgyAFlrA&z_+b2mM5#@3VDdf;g-AYm@xs5Q#bHdH;nP70a>wrb zVx8{2b-K4<>UfF45E=;y3EeBta;?>1okqd7j1Ju#JjhZ3mi$1QkKFfyme(1_#15!C zb@oQ}e~2=Pxqdxs@?;$~HL>$NX%hSG?yOr@u*}~EWLhVh<){f`#v>qC@?cT@yp=1( zThCU>{;oGgQt0T>qxcROdh+a<4<02>Xs)=qQOLRV4M|Xtwm56|EZJDoNe8s$-ZeJv zbxnKn{JAegVvMS)sBpe+eEEg=cu_>Z(OYM2=)HMHoU7Br=5;}V0pbF_-p=Oy5ZT#d zhRt2AYON-%Hf@@|5`Ulp_nmd38LveynFQ*}vyv)>BNi{XdjPDto3-oSJU0KzGqi`Q zdhBh#7p7P;r>EiAL5-2YoneNfD_5>r(=$BXGHYq9N(@gx<KA?GF$#^vtmPIKL6<Kp z3yX^CUwL-!_U)0s{q~#I&N^Ornuv#M)~tb1gLYsCbeDgZyzv5II*f|J-n}z_Hy-O* z^CG|5x#(dgxzcan_C0*`DD2ME`71K}S-KlHjtv<-_fTx?WV1L^s6@ltw+b*0>*B*@ zQUkrr;}*cRS7s!=g<-nK2<IQ!xgox}Dpj<xB<dh6tZB^HeWH?}p)w`mn?Rs}_rr&a zaUbXkMA0_ie@I1^+w8}Yvjw0-pFcb0wSk&f4legT6rEaH^ECgEu-A$GiwpPH{I+Gw zvzIRq!Odg-ux)tI3At4cT%W|v)~r`<YgEo&dgznBv2Oe12E+%uXW2}RP@6e3@WBJ) z4I4M+I;4s(IKOJ*xza7srZMMMO;p#=`0|lkJi(^a>|XHn_2*93-V8KZtyr6sGxxal zP9<gKy9VD^JI(PupLOzrXzJm%RB7!S@vMaLBLuTIP94$UG*e<QAME|ZP1BJ11oV#) z6O3KR9X?cL0*}~fjYU1&20n_To6SV7mVFeH*>|V^W~$;k*NQ1Z8RolES+-12-==oQ zOS~=4p1r4ghwz3v9XB4UE`0R<hB^EhcX?IhEQj$Yj0|udQuI{o#F+1nld_MrrHc&_ zr(kNlgfCZuv7QQrA3W^|Jl1YpS$B5U-`x+F)8gLqHvGb8KCwKz)TbG*w9;Hvew%%M zuB_Oz?t{IPH>$(ADB$0*`vI>#6NHP!UMv+*nNskOWj~|pM+||`&-Kh#zV3&cwL4n2 zr@oeaA*Cz$$-pMA3>#$l(5B?fOdfw5$9E4$usq9~3VS*l1HVRy8BR`k=~&>?7H(mB z*ilh->;hYETao#CwpX^AfB802JZ(;b?PmGTj*RNQmcoz_k!dH|_^fTLt>p_Uef_Ro zoACKj%b?1n2G~!Q=c<W?-Q8N_59I*^y>50b{zRGf%iEI^2Up#aQBL?>N}<<gEK8*{ z9=r<_Z(`-$|N7<GGR^g+QaQKV61mhonBMC6P<{cSrWbKO=5co~FF7s9V_gzix#QZZ zLpN_u#cm`>x|Vj<8;ehtDtc?)tXOMysIBm2hD7bbDv^W`z1S>k=--Hdy+_6$8tmCB zRAZKQ$<~c4?bxy8YAK!<yTfA?t(nFb>*Et=d@tUz?IBOfDUF`+^FzY*)$eWOeO0|E z_mr(#zgUt;jgVEh-t@d~?gJgCt6wFbGOaB0UOzpyb5UfIm0h8H_<O|<tQSgNi-gpt zd5XHd*N?gy7dNC)sBNrG4<enj<!7a1Pq_6YC!|_U2w8MZdc&Yo7MjC|??nRYqK8dm z9(mLUYp$E))NpTFs7`;kLb7>W-#g9h^efk|PmER7)iRqh=G(}SC$|@k5DDy)tgAaU zC}^R0u~%}l?g8t{ESAO+aVyVlZaSGS!sqLSDmS=lbV>VrRkt2|?NIdn`y4#T)K)9% zA?=<W#Vc`X>#6VA&v#fqa*>w|_#mw&nP%RZzs)Uh-8ivFrt<=#j*o<H<I!^jV+I9% zh}Q5J+>vUir?jl>SgwWs2M?;Nt8;}G`SkSc{nFW)_hI)K9UZ2>qp>7@yTEzRVr}Wz zA-cD+SbAo`lNyfO7rp(s=+-!HTMNG}XA8@O5~{e)iE?$Fo~yj+66^FMeniD^PnS#v zMJ#sqShh?Q0atkn&(NBiYOGqjVUt2!Z>=9v^qI1T6Yu><Vl4dqjvgI0<_%8{;?TX> zct&_{_9A2Bd#3UV3S96e62packN*C<FNz=2BXfp{t+w(UGHS-FjIGZuXIMd>3}r-$ zuAVd+d0$Fb*wlyLE&0~^>0jn=DNP-=UO`20M3K`{9<wO!&Q!f~h;_Y+-+G(I_?0)U zoh@s|Z9AHUyudksh~}J3YmrY}HGN;M==8M&sb*EQbyn@ri7&J3IN=iyuLeXMU~Ry) zwX2&Z?w?+3c4N}ci@xVA#eyEnOo@#YnJj9%iIv^gydyn}rNW!<J#BNz**&9YIyHQt zgl&RDk5M~o{2{%4`(_P#lx%5cceJ<99l`o~7+0I(laDs7d#L9inBbbMI8u7lD8+u! z!G7GshY#N=dkldM0yDT-iQ&V;tS^?<ncXOq&sS55Jq1~Se}o`ZY`#I3MqQnC=zLql zv1R^`gxdOAJ(!DT>sSgR^3np?Sy`hUQb(Z??TKCT`;Q;JtD60Bb$+cbLgMigrFS|z zIEcXM;ICsOn8$5#aNwW6g5sii^SCG;oij%`sF3^A<;2Y;qt9r&jXZYj*vYeJ7c5;W zQj&RcyP=86u!$2Vw%r}IqvrAKR^P?S`taG7DpDpUCb;zQo&8;Twu#nTwg@i0A`W+F zv}{>XK>;tangICT<r01fbP<f6%g&b5SaKmH#d+boyD2`w@jAE`p279bI>a=&o085& zN3$TZT8=d=ppj}iIuy~l^>)s?w(2}Ib5qg?lWP)qCT0BO$x7u&W9_zWqtGnQA{Cau z=Cw<8p{&a*F9g=etB#y;m+Q_EKmZx^;lox0)6ZYLumy!k0~0FkpEP}a-`rdX)08)r zOJ&36&H59MpN9yHnqi;w>C<GaxIs~_ZDLJw`8uBk7rYiL`@qodDPMaK{FHu1xM~<8 zgOo)VJ{N1?nrrSgU0I&LU5o$l?^5zg!D=x)Vl4ufOeS<TR|)v!>RNg|+BD5%<w|vJ z?T|;OHP<^i4Z}*|pXTe`;)swBFHl?>Ig6I*Q+2jn<KsxhtyfUXPS{bc{rmCb^Ddd3 zOG%N0cvhtDkW+BCnGIbZ^x(exvc-#|V`GK!l+Ab*mAfz*h=VEofRS~&S^DIOXVZ-g z5%fl%JbhYmuRv#Obtpwt$JW|=Jp5Li)NCWo4^FTkN@5e1Jgd01RU8X?uDr=cW28-@ z8Kpvfy<LhkXN~}&5C|+A&5zIvfg~62*r4anS4l`p;u&FXjV0?hY~V$TeD&HjF0n7U zu%q*xooBS?X+$jEVrQ2JZvr1(a#8clt(=LC718HnCnXfx4w|qdsnYSw`xVl`3!ngX z-`u`^!A?CEi`2ES7)8O(*|Vde7G{$rWpvzSt}KllmMjem@qOZp-Q29YXx{Hn!?RZT zwPmqpr*B++zTj!oR|vm>@Rjj{w{G3a@~*u#ceJRCh`^dX(?<@e_*96v5Wf4~<Hrjo zH!r`o3Wx~A;Nnsb4;{)-N=sMRzRH_;w<4_<{34So3X#pPsE{5uY?wh+;+aImZ3`DJ zy!a+!+U6%upL(aK&r}oE|18InZ&o|~=ww7hZsPhPZ`HL0A47(eL>@iL?WZ^I?x*iP z9hB@`zH$Z0%#ou<z1!P&HZ(ToZ_)VtG;z@C?~XHg?AIVHHjUAL`59(u(A>Fm4I-|r znuzRX5OTJZlo@C1LeGzfehl@GIC&Cg*Yn~<rNxUE=QyNxoXo+VBVyKmSy9nFAF)Wq zh@8HzYG$FAs;7kKcQ1j_@_V_`RCPvLvD9noPDV!ZEqMk?=OGy)VVp68KfHLpa<DYw zeAhXn&km0etN7k&&s*iV_2I19vsVCi!CX%?mRMShQ&xUbTFS*zQh4_w&LYvJb=`&y z8;%_BeR58J=q}b%jU}=56$aN{C9=F{1qTKWLWYS{*5~q8X<`1uAtAQ=_MI}4!SW++ zBGK5seaZ;A`0^kG8;3(f52`JcL?)HEw`0@QRTGiQDvcX=Atpu$f5-%;ig&fVSk5{9 zgEj50dBe1~6&gO<U66RkwS5epGmb8Ag19CkGldC3a*BMpV<`{v$D2t>VJA-peE)s` ze1V2EOO>0yaY?!fEHE@IEi3bb5M^7f=gxhs!gtiq$%%C+-lMNcbZ4O9x#dc3-T88F zvey@dR3clv|Fx++#)G1V&+VZe->(ezvyF80I~^4zfS`PiyJhtFLuWo1D-A=as)yVT zi5-46eT93qwYL`r{H`V~eDD7KTmS}l@7_&VUnBw+mrL+nGFhm^<GklY@mqw?o+XX? z#&Cum$bSe4y0b16D|2%UQeb`MV+s={3_{ikv-iHGWx;|4{ID0p#Kl*vTIGw39+@Ld zZ**FkG`^6AWx2l$`4bW>a|??^1f&TMZb0Nv6VX*ZW&>1(bm0C5$bG@5>0`(8*(Hxe z{RDY@?w2nbSW)C;ycbFXe0_OAXT!U9dPrgJ+>wQuxOVLtbcXN`fJrcGfxctIi}!LZ zJ9hNw6I2)gt5C9HuVa7t;^D)>CaKBE#|@TCCiS60EB~P!e^@Yj)kIj8g#BF(>#79= z1Z<McLEi%G4<H43kb;`blMlPctE!H3U7{?$^o*7l?h|X3eb!e-b;^|aa6!-Qrr$E3 zBJIz$<QbrpgsSFGz1P0IH`F=R2GB2d=)C*G1y2<TXjPYM#NLzAO&ilLw$8RG4M{CT z<LI<DljQYdweTbt@JjW$bC=Y;4w@$~rn`EzRK&e@hoZ`)&6JS9K#y`r^HM7?Q+Rdg zQRlS_7kJ>Lhq`f_`L#gVuqEnnS{~g8J!)$0?CjuX7eJd}Bchj&ckKMMW=#6)y^WC# z9+2+TYWGoi_||CQLN8=riTtu60?^ffFT((t&6;(Hwm1%;Q9g=%@c<n9rQaOP;@N4# z3O`nnHgtpOA*3#X<ueZE&(kPheO*>NO4K3s^hMPmzA;1lOukm!wl@)D6%0jwZUZa} zO-u^HIkk?_pcfBT`f_1iVK!qeQsMLuHHtkiE%kyM9L-~WED=0($OKfJJciAOVBsJB ztYfQ%ve>gvW`XlZtQJTZc1gZ`+?*561s7EHU@?srFFqXDU0*5!oC?IA4A40f_Sm@1 zcO}dJS^kz}^P`7eLFAjA_2H&(-TGbTg41v>{MEG$Ol!L<P-3Hr8t3>F7PU?8Xmg!I zA`0zf`s)gVnBcC6rPlLhgARuFB-a`3no=7el`B-GbZdxpppFdC_WNeOjoo@RAD6v| zw-U{+7L6(~j1{RoZY4Nk#0U@tJ7Isf0c#p6EG%sFW|=eh&JI4;{+`C{wdUsgTK$KN zYUwXjbsu_E%5yCr%$Ah8N{vZ^xoPjVL56codmXiW$8p=QId!={&oS*N>-0{e_p0*m z7Qq&WMMee#{(y-?a-5~AC{$P|Rr9SW-XrbKo!5u?tUQ;weO%ev|GiOXhilhsm#AkS zcK0M|uTPFWQa&uiHNLa-R(OoKwNAS&_awirj7mq#16+~;QH?@RDk|R3+4trBwBmNY z_f1XtKyRe|=Pg+>B=OAy7zubuB(sPoY8<r){+MEsg1-;9s|;E(VZuB;J#IiArElJd z96G;z?b={CpbeWg9i7_%lm|Kg`IqrRgB~Mffy>F<1_1ofma2Ytr2{rq>E}H%1ETmG z_Nga|3p$*zeQ`IhwF^dS*lR8+pm43NA3n7Ie&U4ogXUS@i**l0JGEUu2p~&**_@#- zq-shH<<>rx@&p!E`s|s${nHWt3Nzl%oH_GkRMbJ!nEA%WgApvL&6wd2OR0!p9>GXj zZ%c;FjMMFJ_P5sZ$aS+q<a9!+c4W)CXUnzT=^Bk>0l!7z;K<ptA*i$l?0;xfa00<U zqK)+c?wm6swLZebi7_l>xyZ2U8txyf$o9~I@k8BVxtUo2(iXzen!eUyS3=Xg*FG|k z6A@kHJNa?AmHXa>%k*3JB--D#olvsI`dH{hiNSDiuxIag&oa97^xUUU_G@sfl<L-S z!4ZUu>p0gH1lA&m?cY>u!U|gK*~eV>cm1^0H;bhJ|0$*-iOPeI@ufVtA)v^IGBcy4 z+8Y{_5P?FM5`hA%3G*aX9!B`K+u7N+@$vj^>*1#XZvhKGTCeD*#|2QyzF_~pePhgP zfH~%F(KuR-zY_@05NIb~F=%&94%gAQ0m*w@GF}Vva>G&km2NQru4!&=9<U}(?8ewU zsT=oVd2{x8ESNZ|g)!>#tG{=rXml9r>~+ttt&A+uVZLYJkB)hv;E>dWf<wr4sKsm6 zs!uYN;LF3k$)eh>ua)U<6*AM<8?LC;8viXW=g@J_Sf|Eft9~alE6>&gjk7b(=jJZ$ z9JM2JDDnshsQ$KXlRTqmZij{2xmp%U%TgtDeJB(y)>r~v|E%%QOP2*K3zc=FMT_#` zL0SV2SA|emh(u<YiOJKOcYVIDy!Y^-#FWkKdJcRq-*Mx@X%-=dIiW`Go#EmFQled& zi@wKB2{bcOZ!u#9Ddd<fxM6ZF8W7R54*|^{5HM)OkrOBUZ{5-Wx(O6HvdaTW7I4oa zfOCOk$!IxRTiDv3-w1>JeVbM9%i2??PK|T<RME~nK0CJ;1%^G7$4`38d{$*X?`a$E z?ZmrvoQm<6NrNUC54r2MwX52L8Q1jjquv27?e@TB7fnq~{Tujd-tjkhSGN{HDK$n8 zAyBP-2~;pqkjLAZw<=}3K5`=z$ke9}d#Gavh`795Agbh`w>Nj%Ylnv=CF?hB;s?Zv zm|c3rh<OeUDz6+gDUu8fPF}fL$F|5Q?5>Yyno!C|;D7Hwec~0H<2{&{+br9CE}%c7 z*e|9@${u62^85trKeEya9uG^mR2jEm7EF6VxzE@)VEXg@2M_c%ZBh=+sa%Hru^BvJ z!UVWPM=cpR90jco{KcdwkNzHysnWtKlN*vhwX~ciKxtQ7*=j4<GpA4Uun@DH$VT-i zmHUb3v0m<S7LQrVSZjGP=}mF5W{&BWJ_kkR+}|Y@jh=ncG{z0EkxSPqQ`66%xg8_D zJfBF|VDk~JCYVh|G(nYs*A54(TMdCW!%P9)vQDiEtUrWQywFy`2F`ytAUfddC|v|r zw%rXLb#D21DuW<KL*Otkrp({9asJ#bLT-tb_NbK@EnO<vH-rVhhUog<g9l@rJCXhY z(?4RQgk)#k&e^6x0diADN0kTwj{sZ^cZzsCWlP@kTH7^#`F?WZDf;%?awbLz4Ib=T zTPU^Izlfio|IIEfnFYZMl9tAly{U7~*n@l$qJFQq*r(Dy3mI>Js@ZNA7x}ASHeGrX zGpsI;HAdU|_?GPWu`)4!ZQ(%_+HFdrI7&EQ%vNgHfi%auJayqKQewRchc?#kcwumI z|HK-nbSjMQo&}UIaaZF~G^*8fpf9|-zq?4s!Em{`^$1U?)$M^fW7X}=ruaHdsb$%Y zds&?R@?cDnnlM7Uy_2$zy!Tr#sdB<v!=S`lZQeDt2CY#C{K}>$m<*b<u;o>{IJ{2v zSDpU$(2SuH%v-^;u04r&S>9rg4AA`{FyF64D8XFNA-N{aeD(gsZve(GnGCfRKh*iE z(cr<Xf;^M@;<5W$Bs~l7?-7@(+c-sN?65(BbADU3YL#EKMy&3W_e;E^C6?4qoIC8W z;l8$w<!f4kGFLU5#c6q#&AZiJfNF1P9Zy)%1QW}7iCgl+JU4QG+9~hyR?2;sSMU*o z6%xp~Vu~i@oga2&tb1qg^$jd_IUa7$GCNraWMlRn_r7oY0sgeOf4CG5r8BGf#vLnZ z(G6@aS*CXFU>W<xIhXEky_V+viYast`Y^;S@YwNLeoqfR`yj(K@9^l2<Pi{g<<b<F z`lf@NG7$67#Jl>4W&nUpJU)>xXxv)Mx=_*bZ0>|HW97THJhV#=X|2v?6mH-ThS*o7 zEb(Zo$!$a^S@K|Ga_r3*K7oYWrXME-E1K)ew=lN;3l>e__Nuvm?9rxC%#(xKUmRDj zE}x^-k$Ur{36m$JIwyYB#16B!)&S%+Mn2-gAMlpsUB+`pXwMDf3(+S_)cLYl@BF;f zHK$KsBBOnvduxhJaoFmS;zxoMCC#R2nKl`_UD}x-rgFntX`!xJc(09k@ZcebQK!z% zOw;|I*;Do6#f+VupDM4cS<BMACn&kPFJ|9Yfw~+P?_RE0A-Pek4wvlS*T-yCx6BkD zJNm^=kYCkRwjp5`x*-a+&f9R;e)R1XTsG<~7JHL#M7B<EWyw;fwZWB!H6!H@NY<U> zJ=`E9c2r9Kr5P(`zJb-V2CFqPwcdvUjt@OiuLrcqW`?(7E-UY$6^hz*qs8xTD^5Kn zziCiSkkxlvI0{2Kx83DVj&UcB@7tansuN<CGAP_w-DrhG|5qy}d8Ey|)_hT&%tc$y z?2el^=QH;Ky&56;d~a1<;6eeao+m}DlRp)gcXo!07*3W?sWZGFUem9mr4@ibcXh;x z5F2gi%;O_Hy``b<8hcP$wX#helE}Y$ZJgMy#k!G8!x<n@nXd1joZCEl|EENK<4Y#J z73)Kruf@iGziFvrB{wAGc%EG@mt|z#*D`;_SI)YhJRICkR1~HN%!*WL)y(dB6ol>( z*LQ|G-%1rOnOy73lgdhPd3Je;)d}NEO=i1lx9$8YVCpI?J>g{iQBljW1{o=-+52`H zjG82WYJXUWP<mJpw-*ZzA-c?N2ftcS%~r1=^WL5lSp7l0X5%2IG;=}c?aA3Q919ky zOW%;y)7+@OD0dqll_W-eacs#c&K(-+JXz|-0=@JTJ15WY);quX>rxa?&o_(h(i?V4 z$SSDHGi{n@nO?%Sn7&?A(Pwd;6VctWyWow*gKcf*KCW;1q}gheL~2wXXW`NXC{y~l zs;Afsjh=E95tXy9DT?Mn^C0Y9+VfYyC)8(uD~r!cLQ31~-12H~7gVUq@XXT2En4;G zwhgj1;Wm-r14Np&qdMy#>ekl$MJM*5SoTf-pom{LcfbriwFG!6*x~TWdpBvB#l=*a z=swdxY=Znd(cP`B<}D;r)*=0^BwWgkt3z6|dQ}{<dfpX34L@;0l9h8}iUkr<%IJ_K z4wLRQnaB^(>IPQV?udGCiIjEmi7DU6!IZ?5eVk)D2!>cB+1zc(1g_OeT#o6rlj1W! z*KxOZ*k2npYScIp*;!w1B{%@K2^=JU_cs)W1B;8i%_OX{tK~Yf9yU8)02aC<t4H}` zQ&a9;&-GSX<sSk^-8;%R<J95hKAEdz<|S&Y3+sPV%2ejHnN7GGd=N6FkaCe1Urn`A z!rGE-Zo*xsOKy)!`;b-PEI5r7SZm9(la-sE3`7o<y<;*%OLI&v=ONgYmXQ&j&{YIm zT*z0~_^2AK_<?B2yHc>5r+ipJERXBw`{UA6o@ZvVs{1=rm%RaqnE5%3|8qs+dL-iT zp1`C0ky7XS2!x$D0c1S@)(vS#T}`f!k&zKApI1Bp6_bsrr){KBIRc7VC+gA71Eh|N z1qbbKse*EWAre^>u@NX4eQZVY4kI@Nc|8CF|D{(b&1lJJ)kczJjXr{P@lvBS9V8yj zMjpJgt!5q}2wODjfbABbp#&`*=S;4l=Do8q(giR^-NT4!Pqt{l>jJnbJiQ}p5V~Vx z$_^pWL5D>CTc_N&PGMULCgTl4!lPNE=kEL6AbrB5Nj?BI)~{DY*%^2RL63kTP{~G$ z;H7pIT`klm(%N<5;zfg1ft#jAIMx*mQW`rpcf-_L|4|M(uU^R@Q<o1fMjw!4wOf~s zv$N!qB}))#NRJ$u2i0A{s_|R9c~BNg^3diSFCKyO?pGE~;P*T1Wh4C^puphS9#MPW zMSKIvJ*URH%WG$`!tAd_3T-s%aqRVoDI1J_8w-bYK8i3R7E`bb(}xa_CzX|fDE=U? zCWI?i*A~DNmD=7UBamLuHzw7-(mVg4==!df*V1xwhUjpZvEz*}0uWT@(IEqYf92lW zj4ln=zOUt6yd5uFE0YA!#UiD;PGTbq&DHlxN(@o$y`7O!T2&>4vNQ4##8q`)K0E`u zQjn9wa@w`aMorrBd-qNg57f{AnrZF(G9Leb0=5Oe&^w!Clh6Md4doISfiSncUUWlt zj;mOPORN97_#)&e0M0`}2f|_&N-G}Uo<$i&L0)RxU7x&uJ>>z*(|SQQaxL*iC4l#^ z{m57%U9sH|h*H#cU%oWQPS|YP<o|rh!i8Kp<1CLG^8tw8GH<a-%~akSyOmA~3~f|h zt?oKys`sLgLT%mkp{<9UpHxUZ$*C*;(%ZLu;&FhbgZ;dHKS~}-QHVThgmU{m!}xO5 zm}NjCZt<~*`Df2~f*0uD*n4Lk*80uar;Qz93p4h1yc5e57GJzrA-tH2<&=IVpvFGR zEPh&ixey|~gZW;_vAp#!l#0bo57IyR!dNg*eZ92*t*AnDieaPl?w)8~30;6|78OWs zwV&&7LUBeo&uoD?qeVYtJkhkWk3AnT+g9sDz47-a`l5c3*;aiYSGxeOC?8W$C}mx8 zcCJFobJ00%x^{c^d=2+|yGGVi?C7y$K*SN?AG~ox1;vcKJiXm}_SgX5LmSul@#A$- zLji1O^gSc;@sS37f|yH6#zjFxO7Ayx^{P*u${k-mN>WNpV&{ZIdB__BM_Mdj?kPTQ zX$=zF4b?ysMIn#L=1T;j<C&c=w-IKxk*X)q8B8^Ff(;56Xpo^s0fhX(3IWb9IVs|@ zV~UJsQl*S~nX{>>Byv%zh5*L~@&iyUIz2tYcgnIQOXlO3u+~pry;}T5_?33g0c}0U z`0V~!cZ-VdPXjcqK5N#<6~^OH4RUjv3wxN{@KGBz`&X|lOZS(aF%}G5yI6q5>Uy=S zWE>hXWT$%QbS8#gLYm~hCZNgOXLuyHpun4EXVKBKcE686c<|+j$+a(YJ1f@jhs+wd zag7<lUD@mmg#Y5DOA2Cw)JC!?2|4hXDN}+AN|5sss%WWV2r_q+tqI|eyu5YsvSr7r zky;|61L&?)c@<T?1s4b*sZ>ph*op!KdI+d=@M>p~EX%tt<=F=VWQwIZB@Z9UPnZyB zG~78u7JrrJ;xe>eDXm!u*tB#jYH&yM<rNiql#dO<y&-0yci+j;qPn<frfjd0Ji6X< zQY4TE&-3E}t>~RwZtd)RqG1gb5Lr12sf2bwl3-?Y)N*Bl?M;TvSUD_p8Ia2~$69V+ zDPce{pi@WzpJ)t;GZlhaz+1qNl;T`6sYMToV7R6eY9%0xAPv>MO~y;j%ogNs3ah)# zm(*>kQeIPf!7yrXXXR$m3CE4ASHpMDJ*~N;|K?(4i;^ju)ufS1#a~<Lc~UyZPQ4<1 znBfj2Mbe{3quN*W?$K#r)`@k_j^YPzNE}4&^=Okm;2F!i>u0XFO*U6YoP{k3_<H5a zm7VQ%^MSP^QxE)TB<-JzN(b!DUW-VxUWGZ4f?XaL>+`4cC*-i|KG($j-d65t8Hp~4 z11-#_9p}#K#g|*{61J|q!b)`9I73-p><+>Y)B1+nFLxI3l-RWv*VM>+Myu*-+$hkC z^T>Re^0MZ7JHO==ar+@fWx@In$5~HcJhzRgdneQesdBr5j-^H+`O9;I8-(P2%WR9> zr_|Qe?bZ3}_mxj<_TXFQarLTM-E}UYy`}2r#$x>OVh_gf09V@E8}rRlL_BSz-%OzN zq6#)JU(d=D4M878N6+a#v-FC^Q}j;26~e|}y>VmR&Y~MB$G1+e$9`_Hw>LmSKV$n# zgB#11E+xFaDs@Nb;AN<1L%tH-dY#WYGftrb;XM`hDT(mPb6%B}+VF4gfARde^g55e zuZ<cbmyGVsL`iVG#G!4*0%A$LZ4VHuD7_QH!vi_RLOFU`vss;f=(Bkv)Y;qDFl&EG z%h!DiXQ~g`q2b(A3+a+H3>{s#E&h%_f-`thughBj++thK#(6&b;G17tQ?_~KsibCp z^b*cHyoX;vpdHa~4Pu8aTeiq=Z|ppl9OW`A5@ixrw{xexRpI0QE0-^~y|CC(+udHT zwfD0UoNr=JW1WDv|4iHZdxa%x!jI3)^g+Ngy1mLiMQjv2;mD`TNTJcG=x>8gLGPze zP0q~PV>iE5Suzm)A)YdP+(9wlV&b#DJw*uit~GsE<K1OvwA!C1XMW>R|A>-zUVW&} z<3~a{NtgOtT(T`xzwn81clq^yjrW+3`Y53PBgc==zk%LQ7*BvW=p>6qd1q>bF!XS? zON+sxMMBsG-~0C$qDRQa!69Vx;88;ont@~F_V@L+Beoja+tn(-%ItY}T4}BXN|njm zq!6G{;aXGkAncTVMFJPK7WN!Kvn7>Ps}D>ApF9ApfqL6lXAyjkLg#oC5>Q%1Xt8|V zx)AD6Mtue?(iNF|rvc4_L9|J&I``}Y;3j^U<jAFlGR{cI!_J<4+(h68EY$Uw7;**g z-fjAXJe<NzVSb+P?m9p>2&6*uD8NAUS)hsP%h#_8Iy!Q|Er8nq`v%OAj~W7O=#sNL z8}1E7VG5Pc_h0wbC86gp6ipkJkScgj0+oS54?%zDlG8JQjSL&*<G0FUMRvHEyi7fO zYl(KReML|2^OeiWs-3I0@7z{o=X=t}dyMy#<fT`H)Z^-3ZrGJ;KSO^^7=_jaQl5Tj z1=EiyL&T+jZh7?8tAgk}MC9tb^oq~34@xQp#+RlRsQVXIS5_``-=;AV(VXE|TX-up z93dB7g9151Jq0w`NzBh}?4W22Wo79RBXZrkUQ^2$oLSCWC!5{7B`i`M(0Ne^P`YIK zIJ7w8znR)Fhk}$_CD?I|B`AH`0vn@3JB$Q&5p4twPJ06iBOR?Gk01BL0y=phAVF{p zB}E(s59@h<gC4XJvE*b)A=JguR|bC%AXpGBwsEG59MPYM3LvOHHihomUWwW+>ic6C zEU~RhLp%%x4iJ`qQ+3v{^6Cix!1qF8%T9-v399el%KCgfewE^bOjekI7Rn2gzxmo; zG`Z%>Zb;U}oM@>za_m_C%6Diz#f=s(U3%zc|4McNPdirDLnBAo4>UGJK#x&eMf-^S z_IKaZSo0R?qlGhg0a_Tj;fmYZUN$@DiJ2{%n{Fu*vDiOpa|v*yp$m;Jl(s$G%;Uu> zk(w8)Dss@LqCTnqo;G?Qcu;T$Jgo52!MV3!--eI7XQ2>&w&`X`qhha1%ift5R%61B zH0!6iWfj%e_LvJc7QJ1i;$ACcb#=kXp5Ekmx9w6cA!~!grtx&Q9n_iph3^RW5s%Nu zq87(pzy9rLo1ejFK6C}-`w2-sDJv_?C@MscJ7R5=9e7Y^2`bdH+%#?KRP<^Z$P#Xe z7W{eIwJCx#P7guQ18@+jh4QheZIiiq$F)PI(O*QEepfGfKnO#0V&YJV`SY$kgYY7| zKyfJFHc@O*D%1uL`RC3uOK2TR2!_bwfEJ--3l-YwVB6KnY6GTo;mVbR&m&Q(1^|s# z-~5RtYvvlmN#jds4MyJ|AX(tQ0S@|?Oc3u6lY`GkL+o%gKNn1!3Y~*{rRSoNT@HGO zCPUvKDb@4n3<deRN4(GsvM%~)@y?OJA9d}y(%N!G-Iu=?lIN3WfY6;aM_=dI+H1MV z{F7$!iAfR?Dj+)gz`Om`y>H;eKQR4W+1X>PSgBP*U?b26b?P!Ihp1-+2*?QGX<GCk zL~lLCd(1lfwS#8KwjJr>L6OmuQGB>*_0@Gw!y2@6qZbFrFd8b5;i22k@6je76cVkh z<O0>zX3rLa-lM@1b_6}hXi$Y2`ZiV~8Dc_lPkB?VQ+j|;nBF;g<GH53DOJsgPw)?Y z)c}8C98hyq=uWRk%o=v&NKVJ{4VPr&%NHFOhPGM2;X&vqMrM;!-!7)P0hF6uL)ecl zP2}<mGq#+%i|!X>6%_MMjd+4=07a;P+iI#(CpsJ|qoecUa=3Sm`lI7*-f`o%%w5f_ z#49&%9_{8%c#H1b2B)6sdj^Y1@#n}sG_y%IONrw(#6F+}8L$cJoTHB)ZF2fDcJ%sO zV~bdxr^Y!OrYhjLte8`*KDu_XU$S}g^deTB?I0j2jB!2svn_@<r%7m4{5D5YCNcI~ zc$N8)DRL?go+NWm+Qgb9E7l@eW4EqZb^a*RMYBy8S=G%PU7NzHtuY^WK+?2;Wn1?2 zE=s9i%N=8D%|tAN2J6-g>*aPVPS}6#Ex?UjyIX!%3vU>lx(xZ<Tk4Yj0C|egm1p-e zvRBQnE0vm|QDKr}ZgjIR+p^W~^44`q>pSn2vdd?vKH<55BRe{wsXnL{em*^=siVhw zYQ$Z_-CK_zKkk-*M^Mh9BGof$#_8=6X(@dy&+cyS!>z9~G?i3y(2M*9f^~SJY7SK; zc@;$bZBQW;gnd9q(}G~MPmsqmOLdUNj-V_c$Z~yqe05t`=mB2H5Ns{V@<1TEYXo#$ zEAQ6l`3XUzin82#$Gq@pPA;cTAQTFy%U4r#ef`~F6k-l9nw@uC77vP)+0921iXDMD zMOGM$HY|k4c-(<HmhF;fo#&J9-JVpb+?w8aHXaRwr-o|qe`X1;`t7%|S?za6=@=Us z-CG~wX&#sL?sw1jHa@XOLMVS%2JGc3@SNLv77Y?&mK)R5+wu!P1@Y<y-zeRpwE0!+ zcBsTb)C2ZF&>lV%p1BRdKN*6^$hUFy$4gO03OdxC-bq+L#F*Umk4Fe#_Z_nPoTtu2 zT_a&n(~BdHn`fL3ZcsJ*U}i987D`I9?^uuJjwv&KBb2X}=>&gE(e=x!s_+AbXyri~ zfg+WG)6J^pOzoaNcl1N#*d`t+d;OzN1BTZ?=M?(g(A5@b0DJ9=AV_AW6E92(ra54i z!PheV^do<%b*{B#a8PoRLp-;zc5mAj^A=c4{<6x(y>mvJevTG<owxTlPmM!Ue>9aC zj^5j#(DEp|=XCboeeUjWxN}0}4R<Sy=X1q#7mK613&v^RpHi}P%((>-*lOf`2wqT8 z0oDSW1Mh5ra03l1>UbUm504+=|8_vTZnC(_fob__l&%9Ep?Vq&1R8}j-?;J!=SL?c ziJQksqR$V4<%@*r!?P>Y9)p_31w1k^I`m+-EGq}C4ur8L@Qhoq1suxC%2I>anDO&h zpfM5Iguc;?i|CrLz4g4j+|V?K;<C+~4Zj`@PkL~D)kH)sdasa-QcpXQArw^thE2i4 z3;XVzm0p|pu6X6jl?wfXCZj|BJ6dLZ(aQ>02_=7InTG(Zz*VE?M{(S^g9S$Rc6MV@ zhV97in}Np^VEqt+!PlVC$O~a2=7Gz@!z~Dq(20U%aR^FWs0+~p4HRu5WWv|*Tc8#2 zH0Kf$mVegt=+N|YsdjU@8?5=}>Z5!2@U%k4cI~Lp51&5Wa&J(S>$wUKS`|_x=kdME z?01Pw!EYi7lD?~D3lvpZK4VeaQh3!LWh0HQ2Exz~pyI#5NCPBAEnn#Bwaj!KTE5mL za?9%%FHFy-+W}}Oxymp2jT@w*Qx7zVp)-)eRsc22SFZFyGZZ0R4ykA`9Hw}ovT_Ye z7m9~&1jD+wN!vxr!yVCc<BO)i3vqG5<7T3#p<{Acf#a>@WE)`8Fz0L6uB}MfZc*Tp zbTrP}@fAy6Q&S2xt2wHRUhtk0!h>Gei=kCWhZE4dnRm77<;w)XLkP7WKVFK6NOAh~ z;Xs{~j!YQkG-vkgQMdpdAE*`M8J4jNtSm1_p)vQSU_j*tTmt;7`IWPKop@BvGLLU7 zQ;}1hIeGFu9y>CSN|I09!rGF%nKfBF?W6p=^*O5U?LogqeQy|Nn45Y@gw>{ljDPlp z++6OAQ|KA{)PfQZ(jb;kuDqRY-l6w-zpvJ-@t<0Mw)JK?Fx$kqWkyE2kZ|-Y0!dfL z(->!Emn!U@aOXuD>bhLlR*h8O;GEWk?q{>_QyT9C6n>Y2Kb$WZ+#J*v@kz_+QSzF` zxZAg9L7+1GI;)Tq2_PXr<qgq#2tG%fo%p21Dh1yxDmDiioCj#~5}IxB>DF2mDa0G2 zU2D98RWsYXdFJuwILKB!_#|0(-D_hL%lFuqe7XL%ad>7;&;FVmzV;k>X95hH^7Tsl z1&BycT@F~W1b8cO-g`R|ou8ML*;Hq_HRSK{w3!!Qt|%rLot!)zb$<NG6IQ+&tQ#dA zYXSifz$pU{@<ym%7plsSW~|}|R#MF;{e576&&+lafiF>TZeCQ2jINtnR}vS;p8B4Z zr7a;PB`$;5qWjSfck%YU=&sS)^-dUIE&3<8kiFpn7Jy^8iKWZyJ!Cd*Y!oh<e7G4< z_4bmDv#a{HUF+}G<;6Y<o_TtdbE>HODY;(V3YFR&$Bq3EY0Lq(W2G6fSZC&e?zSR_ z+aE4ZX3b&^5~?1_JN(`1C6Zxj4Sei^u!!uwA7K#uzQ?D;qK{aath}#$HM4lQ&RKAs zy4;SA>Usol2Nx?VzOjXI!T%DAXWn*L3O<6peW(LeX7l4Sxi{8k1WcKmdIoJ3$UsUO z>w88fZ13ppBb!2%6|_SZSS7NqL(Y*0oF5TVaG=4j9M%RKhY$lsaqr$CdH;{6GXbY^ z@8175&zYx^IV!UhGG;CkDk(Bn8YEPr*fyD!p@E7h(QwF+IWt=-l@z6tS<1XAWc=OF zIq&~}UFUMW=e&iz_wzj8weEG_pH+_&lthYJv!4A`iSXOPb)))XYw!o|q^1%L+e`o_ zBR#sVs;;ZK@{*}uH}|VPb1a4&L)>CZ+MR_04ONYC>6_L?K0GaQ_q^-Z{)Q_}bl1Og zrM7U~IaW}vwS~lBlh$)Gg7e~4`b{yLkNoU-xzpOv`6B%;_3Jjb(phis<4e*;uRaIT zKt_7-?3aucoWvqVHk+qheRZlv%9vp0N|OBg41;pyHFYOTFr$Vc`~fabxyl8f(>|5o ze@;#&Z08Ep(zVaoI-=2aV8r4hbkIQ=nm5a(L()I`6_~xkH=xig`?lNe+EED7y(&(w zA+29^wZ40roULU$-FWs^sn(ZBMXMwFh33-aQt>iQ)5!2pBf0uWF@}F))eFuV%WV_R zGL$|p>}mN+bltke4hHC(jStKd-pRaVbaLpD%RO|q!Los5KU%T8HeMm&^5H*Ua$g{u z@K%@S`3J|t<f?DmV~ocKeu`~5n_g={ZIL5Ot)ZjE^;vw_Snx=ZrL0}x!86tMMt6>h zFzaWW8JX&9bg72%I9~E4$;sgcv;7ACe>25?c<GljA6xJqavynLa)i)$Tm{46X*=G5 z@iSqtu#dJ}GB#r&A2tX#9_OE0I3dIqcXcT~eO}a8EPTFk;2z^2_7D8D`scgL&pYxC z-v7pU?A*EEO@}M}gG2oNKgHj>&vQwmX5^OP8&1~>eq$?^g0*r#*T!4MUAA0;0uL=5 zz9p$c%c42!4D>pqE(^;EjYLXyZH&&~d(ybPJHkyQDLNxg-Z;PB;QOJgssFIo`-hGr z9-!xsemrCX0=*n#!ixhN_#M<3cy2KyEH8YnCI4FNStS>lNV5eEDY$%@Mqp!}4pT~D zHs5l#A9IU44HIv+yC_p*%@v=PB9WkeHBk4fRFHKQTgZlGo_@5rgCcK#oioDhq$`9v zx~A?F*Moow8*V3OgN*VNX>#{6Q-6HY{1etzq3-<6*3H5b`KAv;&lp3eNJT}2b&F`v zli9QiMb4euUl%Jv`uw*E<8HM3lYN*-Y|*MALDdre!xVii3}pF+BkB>dsZML+ed_ck zUDgyt?&#`>eRzVf{G(<fo>x5k6w~o<a3>L-a`cDj0f`aF_w%2jPC*%B7ciAlQ}aDo z!A&$2cXguRw@0~zBRUhoPrnM?lP=*tJl?vv4bf8)g~o=v?o=O`Gpv=->cP6c^RsoP zVBpgH4~gwIA--#mbO`Qmm*S*xMC*uCRjOL+jbn5jbFK|=NaQu9KXdAKxb^l&BlLp# z8yzQ0WR5G1Hf(+-82z_u`rlbD2eoyE30mIZ5R+?mBnpiFR3%0@aUg@IS69C}5(Y5> z1<07c4vO7l$BwB&j!$T2K(F8bmTpI8@waiQ@-G+9RR0lzL!GT)=SK|~b)#dRb)4K# zLk}yORkw_JysMYj73v=k5oSEji0}cGn*=v{12p64_y?Jp^vJp*4M1sf4|P&*CSn2z zEx7skBo2QmB|KpN=Ig32X+lgOG0H6ev+th*kF{$Y)?L{4TZ@#gSJT)B3veT90=T|o z@F^9POMl@;0hLL6gdF3L=9lXEu{clTm<+dMN%9YNzL4YJ#Jp8%Xe~1H9?PcP4nO}a ztb=a<M}@SHLqgj=NoB_yPQ%3i7sr~s)RQBeD%NKoi^5144<n4c1}_>LGhjYS#PihE zjjkPqyn(4!BPMbc6{0wWw1O8j&}|yOdm*e*jI!`@%Mb`%tg!aL{Q+a29{vJU40m+0 z0;YY{bKUp@#P|Ru9R3=vPPoe>iDQncj{iZlM`EAc!q+W)!?;lLQSQUk66YJQj<m2R z?1!Cii|4!Eu`flBb8}@sTUuHM?%0t+pUf+v<IjoO9nNeQs69R_OMwkm>(;J~E^)@d z#ZAje46&-hfp^b;V1#k~)@73G*+tr4mu>e$zQ#+^&c<-CZXhTBq{jUIz-Lev99F7S zd>fO&`BtugqWcM&%%-NMs|(1jr7+ki2W8UgD-?MW5?wiyZzExZS9!nVWK6(u_1iB8 zzd~$mrQT3#Wo|iA-2w#yoviP*K5Oew+^#22#^!eBdP-JK@7}ZL0iqb_`sR_#NkHhI zfiH#;7IxI}RJff2rJ5tI_xw6HeZ`q_?{6*!br|%qF-$<lLgD+VY{$7oQD#ip2?rQj zGJGgus0mqI`or98HMGhLV3me$>U#0wTGXWQl^;KI#vBz0VJQBU|NhGMLumg8I}^4} zAG}h`5Hv6+tg6L-M9cls#BS}2T~4>-`mNR@MEcz9Z9q;S>&Iil$-9@NzpiG-gwWP* zKyv<5Z-}$O)vzljH-xha2jmwqKwTJ$62JI!lDEtH5^oo?lW&CU8@@VX9C0!{CTHdQ zB>BRD;sA#|`jKt{@p_~l?<)AjkpscNa`3r{G-0iFcbCRXA&3gw7L+ybMfz~JnEm*U z=szI`=62#bNlHuOe9$IRn%BA2dyMRV{zl6X)i>g%72z1gBWy+%w$ngIQROws#0r)I zBm{_|W^iy^&XrqN4K$lN?Z`AJyLhsrpq2Gg`K)zv1GQCr5hJeoAbpHBr(cZz`JtBf zE0wL(*w8|qEn>Cm5xc?aZ}Fh4Jl1cYv+sKwGwTPs%8(Z)S$ta8%(DKq;|Y0uqfmgh zH%$M1C`tU%kd|&u)A(U*=lM>UE0tKi>5e#T_|c%I*>5bdkoaEMFfyWwgwH**hSadU zxlt7zN@QbS9c`f5bfByVr7a;BBg>27Ftq4xPLS2qAz;2TId%NFA*#tIIW`;Nl1Aqr zjY1D*F~cYO`nxL5;uCJhh!>hP9jUC#j{`H)7;j>F1)&?68fmKynwlv$SPc2%eU@2Z z+n^vTg3zC&ygUmEMPjOjZg!1?zE#>Sywfp{+_b`!@I=S&g=A3O^(@SVU}k--u=w>< zKD1)<pbL;{F;*a%+L}Duq@)x9$KhWRCPVMv+gJ!?W>b!mkTnk9=vn_On>J%yEfrog z#V!6khknkhWmt`KHYCC-cD1UEUGu;YOY8iA(UMcca0;8{5~p;!nN{mIS~LImBZ{Qn zhpFBRtYI1r3vZl!9ojZgRR2C~8Ct80!gEUkW`<H%%?1`RMW}p~nc1&^)5N6PbDTuw z4DHk#uxqx4h1l-Njq)4H@<;d;L<<i3mGd>*wf?zSjf3=v4xIHqAY}CSb10_M3kV5i zLg>cjp_~#Y{J@11!6jn2c|=wmvRZ5=YiPROB_U|iL^Ji!cY1K=SZAS(R|fG`qDq8D zHWjpv7?u!mXrAP=?2=;%P%j|WnLX%hQl1ZP+?XC*$?qOsw8=a{SidMG%JPjy=h#$l z&15xOSwf^1jpON}$wZWs<9vMNe7$1ezT0W{8uDv`46-<`{nIn4iE?i2T;=!NbT74z zkAh+4s+6I+lUr<JSk@HoJJ9#RC8Cj6iJvd*78gC~+CB|2NYB@LCA@Snynr({F(swB zQR3;<+V^C9Fz~}yEw6f#$;`rL!(VoJohH={pZRtrp<R$yH>qm5W~t?(*r>>G??LJY z>!q|s=~ic6nt7)XiL+)oCe^lxY%BlgIy$*hm7qS3r>vV>?xwvyz}SCH*maY`X~uPD z#M~MAVvbXNa@&t@bgH(Xax?Nrv6roNKk+)bky;K<cC<WnMA`6B+Q*+5NDCh19K2xr z!o4!ZZ~5&WOZr=C`tcjb7Gw_2HC>;lV-{YJvn|q3y<&?IJ2Od`r;EI|JXw^|Np<iJ zn(eTfKc&^sGe9o4I@vHtzuwh^Es?(W@YF|_*!j!bneQZcF!?X@EXCiQ|9jr->alKz z?5wOK?t)E%S1RSy#qa-95s-I8=aWx(Gymy>l#p1Dvx^OU26gu?wTlVT7z{smiq-FE zikrWElgB`2*Aj^#>J-f+&P@ak1TG=bIzdl*l<Y!rN5`OgEzW{#F`=|+Q^jI-iZlBw zO!ItweNFb%1?>Lq;K~)H6@RmrH`0Y8dhBh*>*BIIQ9{+LJn8c+kDeZ1$1eWS%%hh- zX8!No13j)@31K_8^!2XvRsMSgN;b!@Iz&HF<48LDBCm4ddDJRwbARTMJ3SE)5b$Gf z#zK1~##b{2I%4rj$7xQ#I!<$$2k6p{Gh`$-#Yk{oK2gNKXLTsd;;yN*U*Pimr!%dR zb$QP%c?>Qckq_Edv4?ziakJS{Kc}=9t*Ex~N}r(1a;Ts>X(BEd;vuH-=w9XG#k8l3 z3np*`LB9E9zqmhMCVkTM_q=M@;nj?Hvja&z+v>-rrhMq@dW)G>r$089Yw3r)8e8~F zZB^o5$jy$HP^(F><Wf_h%eXl5<e1_DeP_YXiH*U(+ssFig|&A6+rcyC!DYTgGjYri zERo?`Lzz1i>5~~OptEa>&8=iciQNw_d94{{xmthP)QT$MZP4n>e|=53R<a!VSxN5| z+p6vZRg&V5NOX#Q9ChR8iob?P<qEkUY%KH>GZ8Leq!oR-<eeeWtn<Rx$*28-_V|K_ z6xqAF!)#uWnwvP^FI?+zRkeoHv-Csr!r@=lV<7$nD0}J{mC+@|NVu_1`F;CiUZvvy zK~j>;oRcyis-;R<oUC<e7w$!7&f;la-paLtpsWCrVs7M4^3(ouzU?WGqcaXx`!A18 zPD#BKDiw6MVp^gdI{ilS7&Gq1>7I+DPlZ=8Y3X{7fYUOUW>=#B!tY;;L|dp?5lELD zHn+$gs5BQ5aj%Ctlkc|i*lg1+hA5J7jDf)1HEM!Gj6^@RHP^eJ#l4-bV7=XweWn*+ zZ73qXTst35BjvrQ9$RE%8O?l4HgDu~U{QeC?XQTcG;OA7Bzo>uiA`6F^a|@Y`t*Ig z(zjV@?B}@ePnv|?E6z1K*H<s1_^^vVR!gluR-~>Z^OcLz>4QqaeSCWBZgoJ)o}8QM z->TTe_;0XE_Eb^1@O@TV91rc}v(c!RMM5zKOTiNkFw99=EZvEiv{1QP-OQ(-<LP0b z;eJJ>+>4nfN2|igg%Y42!exF$OtG)Xt*Uc>+WC<_b;|Lt4avjwDZTyc^If9lyZx6H z>>OgxFdSjM_{D7C*sH^|gJGUq_%0RRx*uTr>s8A58mo`Lr~K#-vdh=)g1_OQ)Ig|5 z$!}AK46g3_7n3s=t7YZgF|&sR06+PlU&Zlj)~<gK1~x6!Mf1Oj4JrEkmH8oUY9{1r z*nE>LzuWDfg2}0I>a@FizE@<{D2Kbxe9$;O8=xyA6gLF5T-Z8j;%tV_QH`}<Si8Ix zf5<xd-zqE*U^w*jQ{e&Uz#(BG)UO?5!Z%NtbBA!;zsLW#4br_`_!*70_kpnZ`0FJF z#ukimfkB?4w=`kM3H^CMXU(<~EQ>V!y8a=E$L{-u<k?C~17`zY2;*H7PHJnv^G+A- z6@K>HR>{gKEg#Qs|6ZDwmbUu2qhl+|gXz)Mkd>KQh#^#6p$+Vs$+zQFf9(A?#f~ma zZ>gd+c;ep&22Sh$9vEfc{l5_pjJBcv)YR0=-@WA-`e^~EETNDVN9)fJ(_RS)d9}ag zTIFsHcdg~w8iz2eD0FZwIaL4lJj#*((E$u4>*5qxB?m8Pm9N$Kt4PxkTf@gr$c8BE zpv*T(t2gahazB0b?_5KV!}vl<$Ue~p<>Zl3y8(H;4!BY0dPiX`>PFlrm^<vrs}cvR zJ>n%9J5V|jCQf&A^C;0BE+k<gt@lu&??NjLT!5n?DArNGONjFD1SSpiq!<Y>buhJK z#IW?=0k6W>NLa75#MYoXaz%C;wY%22pF9)KN0mu+eT`ARkYq6iteSbJLy)BijuZS# znE6Qqkb-Up*2N8dh0r5?e!iDNqrrmtaw9a_os<?dj4<E1W1x*f0dy8#m+4)-e!V;o zN3XRE5k4+Dvk3myQEu0uZl;`%9L)ENtgJql1&o!wmosvRJ23BJ)WG5VKuEbTTr6x$ zryJcNyS3FG52u**+xQHUEti6h>NTn+s-8_$eb|)D;mm6qTATW4&{g&otIa~<1?lUr zK0sznA0Hk4b{2kia&>-wLghX4n~`2koRqsxU|TV2s$e+W3z1=E=Y185$eL0QsNe{V zqPljsAkSOW$xXvS8ozM^>VwRxDltqxF*0M|;ha5){4NA?D9LEt2{oJWJT>0K7?iUS zoeMksl!$9f(WcSRpfQih<L54S+RnVqR5LaEz*Bn}1A~m==Nya-0W}@E*3V`>(ABf; z)4g$&SKz$cB)@J-Yo39-gvo98jCndkUM;Sht4b?pMUsZqm(-3uHkm(qb82%Qi;_}* z^#ede784{4(&yml{=FBe>Vb3OOH*H^c@jJfnfrq2jKai)goUF7FCmj07@psD9Ci_= z>#wMBd*!_v;T<L-{6y!9*NqR7Fc-w|%Lg0<4y_Q++BfgsVZc0X;sG<EI#*%ga>vQ7 zu$+)cm_rbO)znmDw2Ks1#_s_!^Mwt5K2Yr76);+Y6OqS2(|dJv*bL>YUV&D%bU6PK zf6ubt#`KQkpH;e9XzEfkmwDS0OqRNs)LlcnF46n7`pysSpE|xGPPh4L7X<9iKQR30 z5*Uz`TIlVcj#0L@aC4}Ql4^cutL&GmQmM24FlkvX@o*zM;do%tpQ0mTvM(Dh%}q3Q zS6|v;D*y`wlm{fxxu9C$dx*zlW&k6Ml(zP5S@zrb{Soi^ALM3cMhzotfg8t)Zl_o) zhzB3sxjfYCddqe2sC{3voPHl)?c4Fjkfk$Q(w8hRiS&CO=x*7$l(y#vRpLzL%2Y5< zFROO!U^SifL1s%ngGMFcD!G~Ts29`wUsiF|Z&R$&ylY)HgIL8ytIaq6;nh&Lb7xzd zaFE4kb$KpinrQuA?R{je&7<KpMW3iYRmboIZI6qP^*h`|HUfgP8iueld^oyOmXD8K zM~sNVK^;IB3>X<fEel2rwh1;f|M9O8$cT}MR5w6Rs^F3Uy96UFI=<^uUAcLgd3o_i zHot!J2Ix6S(J7>yq4DF^H_>xGaLAxea5-3C0?{kv{C4|u>#zFByy`5{E$VFQQQ*I= zJr^i_?)YtmQ(r5Kb^I*W)v0?a@@WWrny?ve+(Z%>2>UuK6HqKP-(HsJiT;q>3sp}^ z$A2t<E{@sQ?GK&8GX|cA_uXgcbywyG08Y9&>DaUIDgD0*fV3J(+3AFP%mIv=T{`)> z@Nfd63o&IvQhxTEJR7m)XGYBpYRJ&QpZv6W881s}bcUOa^Nolz!6SL5MS-g>_hxHF zeQPB?c-tPX?_W(1-_!8ud3;f@M;9zTV~2@aup`vf%w4|0iwWr?p>O0N`M(6O5X}pu zZKzn#&xqH4X+>rEA=4k>M~2Fbt5UTGte1icxAzAZdgh1Y=W>)&Yji7DhIkD~H-wM& zr>+JG2MV9WPoJ(9U08CsMauFKt%;{ph2Mi^z>~=1CO<r}O{pUFqXj)KUi+4V7j%7` zEQ5LbUFTMEZ@OSiGimXwBr<89&)~x3b04MlJOlQA&pbxj%v_hkh80!23qNOM#^x%P zx%Z1a8yJgvy~JQ+^<F<BbK}o*&kw^T_2Vh)2%P}y^;kUFT(kLatmAeqDSw-{Eo9L$ z^zx~J{Exo^9w}|H*G$(rmt<P!E?xUTp6uIjP?qd1TEDE?`r~^-%sf-;nw&Qr&0_8{ z<n(%hxxc&z7Fqcy_moXr4ZRn+5}r(U77j?=wQg1?X`9Hd2(mC;WwLKX)s;W%KIh;V z0#^l4Yu(Gk-J=mLqb|I(y}JEjKmVy%JMd@bt4P$x*r{MwDnq7Ei@Cs`MhlWOr^&>; zg6vAukrLbugCK!aipFtDhIbF}J?MhOx;*A-usBPEjK3G3`1oC=cFE7endBd4_L`$W zAouC4LSy}(>Ag?(QQy&#B0bj!Og40Wptj1?MZ~OUVaQMr%r{7<)^2<r*T);|>qZTs zBiqVJN;f5*F&O;R!}P7B?p&$Ym+1tDHx^=kBf`Qi6vWc|`a%}VLS$-487sdZ^;Bc( zwfe=oEFm{iP+jak1UUlZbnx|ykPYLQdq8-SouxnEuItc0x3~;dg1KPhwUwTj9gLt~ z^UIK@TBvWIpV>4ZmYz;Y7@q$2XGWB3^|4(QcUMV9=40GU-zTp(M_cmRecoj8Q*_!2 z&xYj~`SguV(hR+AL2o#F%W9XEJ`2}ff&2kUf*%g3U^9pGw|Mm?hrUByAYAkPIt2pp zJ_IfF+;(3W+F`wcu89N%!3zQXkMPYxM*eSVLl8@VCnD{*dhzVpEzmoloS5g`H3&)1 zYDd*Z9QmM<5&!)^)?ZQ*FAlf+MMc+(^TE}`U}*=;o1HbV-x7?x+S-h)gBf@4HbF&! z{rP18{CG$ih2Bz2xOx?e2j+BBVnK@5Dr=lY7!vBjU#s80&!Jp$Vsa?vbFJS;=j8c{ z^WgzT-^$8Yg^O>OJ>$raDNbk^Gs%u79hohAxn)yqCMuA;#e$7Y)D$`b4d>)S8f|E1 zu3I9|JcE8TCDUR;in(=*@Or>TCUYp`e5c!OuGDA~g2D$wB2FmC>_kWdk2;#+zKsH~ z@-maWy2^PG;Wk2mg4Bxy1_F>qFn%jLu^xM-O<vMsXJ;p}uh7;BG9-~Ce*L-uKLg<f zHn{Qd-wChYe}PFjU!mU;<h#UF4F7chm&3u(oY(RNLgZ-%A>t^gs4Z%MFkn_-4%Zt# z50H#7v_z$y^}+P$ROPUIz=?8`n@3Y_&R2vtDmC`^C9?%@s|<5KRJo!`ZT0!q9K221 z%!FNK<ZMmjY2k*h>t7Q>`vU|Za&%eS-r$V$Ze;Ag&)`}&$K=|&UeC*!q#XT=lw2gS zO@tFeZXz-Sao)&>v}3d$hT3lVf8rI}RTLG&0eHl`pDn5bd_v%0jE>+P#j6c-&X?~# z3sVOnghD~Z^AScuUu)3YT*u`hu_1DRcbwsW4(x2ZDumLBT#=4AW{@ynQST&0U~B>V z0P$v%2qFW_X}EM?z{Pt5>Sv^u1Ji-krWk<?R;{p$mV6;v4ZI3x(QBI8AF{n0@iO>b zQMR2_43l)+g6-s7#Q4A!+d9seMcu$myC-jm_}acmNruGGvuk-~)Ldm<C})BO)*)eC zC<cQE;ZDJvRSwr_Oyu3^zd`WR{RqxvJ0iLUm#Pie9<XWIS>Ly*gH!&9dj061u=5+g z0?`NZMihc5($E3%;z?l&TPs(O$!xy;_89yUFq)46`A0y7@Lept=n+cC>G@&Jr$?bp zn?A7s+ZERoh6n}BXfUYXc?gJzNmnkN>$`~^!{yrN_E%@UR-e7__=ays=O2}s$Lc#C z^j90i`YM0oXlBgpnvBZlu(<2_atoa+#@(OYZ0RM>Nfc>f=s91%hX^q01_I!du2N^P z{LvuWe*gZ6K_=I^Ra{&Ofg1R9;WOeQbr!f?ejJd!Z!=I+=^GY_(Grw>B%6RDyqA^5 z2)jS72b8L~K`@enqmmFwVg1CV2py9M)TU{lWkxZ0<Ys<OPUDlkkAU8Qd(9S(URYJ& zS%Gm1QXT_FenN3f7{ik&cr($WeUSgOO@ag~5$eO2rLJfK2!}LIznI$aLr)_yvYs@_ z|BQ@pCIVy^tHp^@dh_N6$Up!Czs%C=IK{~CP&6w4MkQ?UnO#2%<;@LQ^&ccjwp+=P zu4}pz{gNhVz7}c2hS|y=02p}TO<KKd%52Ee^Y#OeJNp<dAb_dMd#)D^OGaRSjQkon zqI-xL7LN;#jXaHwKTj6D!W14#KAeFBQ3y=U2mk26;*3_t>~K0^E(F^ZUokm`n?2qk z{ox68MOM3a6aE*VH>{}U<j-Mqhs=4`(Q0eQ78?I-3DTwSwOsv8H>T+5G<NROYIt~h zzd+nIHWLLlpS(*m=`1p>&gE1s*aH87b^Hf!ds`qytBG+R6bJxJ7K`vjXY#p7;bFFh zS^+Ka7SS!>D}scgTi3vuI6Kn91pg66+qkIU!*+W$9coB1`Mul1qIaj|>Bb@l(f?@_ zTch<yPZo{3DAN><*zJ4jxNpSn3K!qSLxxir&R7l#SC%@M_j|J_wI18Uppl?E{W20B zl#jbvl}7|fa>|^BtdlI<x_7Ok{)|4b45Bt6KQ3*i6uU1(n|-%y5*_#s>HR+46ZOTn zJ6g?lEJ>RLbu^FGQZcI2*(Pk9?ZlZcH&?2xzSGtSKdIecYDw?)cZSWrZTkbz+osZK z$dofht1v_-cR~^~w7u~dLDjt312Qn>Sty2(!hgXYQ*%PWaWg$Fino%D)|~2-Y`nxP zD@@HRxbmD^Dq!AcZe=ZTIn1Q71>1|w5|G4JlFBKIix(G|8Dlbzk_ykz*{kn-z;-=I z`)lD^U+Ufkw>_jAuU%Kz{H51eeUaS$%R_g-MZ3?$c**@*Oo3IJwSx3-sUTNd{r3Gg zU4xw$GN%*LL*HDGQY@UVmFaSPHsOA0W9!TQ)g9dR?)VAc>2te8qc4SfmK<t^fRGVV znVUP-4H%fM3rWa9hm!L)eZ{UH=YdJRFo(~#`em4wx>rJue0q1=q`vje;nffR%lCz1 z`zIA_b6&_#d}&>GHe$4u#NYeblP8kG)XFALXCg^f<>c|9WWLQ>kE)0ims86aZF~~h z&~4<8yEXNS|0C=XrO^b3O4a*+344z~*pumSVWV=uLk~BYbjlly64zY}${t6kW&^V! z?sn$OQdu>a*0v5i+8-~>{#yT?p7s2iy)*tk@>4@<<4m4@GK}0kc?Q1^ro4Ebuv~rP zgi6YMg_hBd%{O~-(sM;pn*wEN2}Tq8?<QS}bAn`T4cNtQoLPHCQEM3X@?^6IN!#zf zn?FrQo~!JM`N0G#SK7?awg-E95FpxfR{pqdJRR1^t8U#IQB|eOcmG0#7UiBpR@-qx zM1f($BHIr6NlB!az)`{!4#*sMZgKcTA?FB>;)jnPK{oKkqYREUJk5whg-HD=I~igU zwtv4M;6->Q69lMPraIUTA!9(5!R?GAmxYJ(G#P^n#An@+c!v3hKtlY7WP=lzh{}On z4bC^XS~57LVQ0iQCa_U}P@ondQV<YGFkwPA&Hc&C*)PY>)8V9UVvVv~>Z6WW?p*3C z-C(3^sj%pfxJ!0^si!MUX+sz5Cyjlx!*uU?S=T$L@kcud-&@+^%A<S!nuTmE<j|g} z=@u17-WDMWN2~6P6{6qGNL(MO((A#596nbYgao4Phye?nn}eXjzHV7EcD}VQ7N%1G zSBL~vwjE(p1?Ui31D@n{_}DQZ2BrfZPJ5#8FnljeJoFJJC=XB*u^K=i4(f%mudf>H z1I7!4I~k~Jc<<o(tnc&TQQ3ijES}~B1U+~WHI0qEy;%?!Zdqg_3*mb!E-j@e5$HHX zjggg=hIEBrkT`0tpcIjnZHszU!=wG<8sBQk@y`-u<x?HIf`<4nxb=Lp>pp*TK+qzX zp}&87(rjZF|Auq*pCsK6Gf%b7ge4(Eq9^E}nr0#<3k0J`_$v-f_DpB!O&Iz_nvv=I z&s>c-CtLpK7RNryz3+NCp1s9eM)Z$*dh+KOpu<Jr6x>zZbNw9nWn*5xJ2ZsdB=_O< z2d#G-1XjM3f^oOTgwb=`8*UL{G7L^j4&ju>G@ZBvVD!B6aOd}{>ol(we<y)5@sc+K z>0dZ&oiD@KPT0O*>7KTpT-0|C*+`43kYJ*n`R+hz4f<)8CCV4@S#ZKQQKu(NONt}? ztxQ1SslJg|r-9kfQre+(^zq@QdL%)l1rk>06aHxp`myCf?;<@T&l`?{Q`+Up1DwUD zzin&V&e>Rp;}K593vf7$Q>oj&`WN)T+yu)Rff)9mhpI9UeWjjJ5k6Gp)*{UwNL`ED zxB0Lw35+2jzK3at$D0U9+Q||SuaiX9z8dl)v?&bwh2kQFk9{BibNS)H6C1^;5{Kj# zwgg4<^?tC8rqUv3rRd}T?E?*$1WfNgljWXsa=EOO{a0#kFwfZLt8>E#MzQS264@^$ z{FGdWOB8HfE%^8uaDTzO(<4v*+v1YmJ5N7PQpM|A6=@TuSPHa!ks|<EAS9c^xqyNf zNN<$}F3RJlGo3f>9<&khOdMzoZmPLgL%<({N6DwJfvI0g3yxgis2{-P2Mgcet<#g; z)dc1b!2}HC3r>8LLs^-oEBZUu8tF^GUwqktVZrkPNotd47Q1&d0lo?H7ot>P0@5R1 zi?R$-9l&rPGZz=T+TX(4dmrB(MG$IL!q5k&Df}8RLSUX=SEPF`@XOElg*+ki>M0Gy z2aM>pm+<YX5MaN(kIK5S>kO?lTyRmC64u*IFMG1%rS-=L8V3B|UdJY0%i`EQ$i~dx zeCEE-(m~3BaEpPep5b+(N?i{wA6xX&>Db{e<w!ZYNI$>4;+Eu9aTyA&6b32tFEnT2 z{RZDTCF<7erV&nRghF5@5ZZ`30e!@Yz!T<5`#XeTo`)9^UTNYo9o%e|!!Z{$$5l%2 z$RDSmu;@5QepwPRsl^`>b|`fHy0f+=$}HJ|uU_u5rd%1YUpLV%liWkI2vp{>GCmQ! z#?D2vHo;fF$7KzJ8)unR;$lYDNo=hML2)<mnRR3&4Y;rJ@zQVU)%cRExK5!jKiPwd zln(Sgkb<HZzc^hDc57j33~}=<VO?<$^k2@d*i?R@=UDsAA>J?-WvTqEcXr{``$RXp zMl}2p-slv<B+?`JZ8C14_bWX;Ure|#&mdwAtZpSdr*)tHh8lF-B(tMixJGRa&#oof zR~7R;OTR8E=?4z`k8K*B%=S3k@nBO?*Zy=TkEO)FU!`W!BD+44RGqEM^4^nOa+OnT zZ2|o1TOW1Uj#+ZnNE(3Zy$0f^18VzvKV7%j7|s_`yf`$^zk1a%mZmZ{7IvsUBR1~z z><+$Lj7@LC(8<5iZ=EWmH3;4eQcIKDQuWQSTu)V4%`|VPh`em5w#83di=fLK<2%lo zT-2Ujbk`D+rW9ULM4M|D-gKAFWXn#En0NfG{#7nMJ`dzJ4RP>G)3-gVRmnbVz{H+W z<-s!XU8aBSdLJWkEe6r=oF`m)NL;oK6aQ>9bLv`6$z8`(qfp)>TrF=qoh6deGSpXf zrJR6K^hF5Q?6tS|pG5q0as{mPiYyhwpOsb9+x`~zyFOTO8u9P++Qz4M%T0vfR=O94 zH#McJk|>9y;))K}YNcEFFAGpuCUdwpkY8|AOsc#OsG-lEya2y@fh>)K%f%=!Vm84g zK8CVqUMc8P!x>xpV~j%$JX3zr22S4sK2YxEUu#M{LOc+)$h~UnfQDhJ(abHTHT8ZN z5kC(M03Kpd-|djUDItM#m^LhVMm4JOam6d#)s%GB>QwDYdA1%!_3;xYq~zX%n;!`) z6M7CnS?lW$h1d$1UWugiCfzZUGM4Qh-fhL(@3QnZy8qy2=hfB9qwBo8U+fW6V&gO( z|GQ0KMRSLgA35@6j`Z9eiYj$Pz00pnmB+h+HK6g6V1@AM)P{a0liQ?5(g)K4+1N}R z+@5_^H*PjD^jg0^;1Ya(rwhsZyF&sULnsNkC*-N%L$ck!zeHNs%Yd*2X=zzp@uXgf z05%T4A>=@0c5UIHf?Xd{3rs?T!z_Xhh-e|3M}XxBB7`>`9x5<N)}!hGUJYqwJQd+s zV_W#CGOvlA(d+wj;z2`@;_=FXL9o@@rl~mq4uhm^<WqYEumh5SE`{SA-DSdDLj@;= z%GJKP_xHS!T-#8=Xpdu3!s1*C?Ztsz8JAx#awtwrHr5p0j9X}t{&ajwt?%2pY~pIn zy4WprueP>_am|7FKn`MQz&%m7AUg5j-)P+^0nsmr#%B9nBHX!ILBX^IcQJaxDg7?b zXQy4)pTM95(dWSQP$$>BMAXDMEf|S+V3rEO<N#TMfz@mgs62QWC8ZbOxUxNPfCW)D zJe<H{L}&vMiUKiFG|fbi8*DX#b-Qn~FCOU7fip`>ljj8?O~Iz9xQJ;8gr?4Ds=rRp zNZc|M0q520{QIP?5BqigkssYRUv}wKpoc<s>iy{&%7&PbicIp$*Uzuqyc5GLG5j}a zBI589?H=Ay_U7Q*r}t*j%xIYB74hz{Jj@)Oz^6(9u-00tFrTWJ97nkGQT<|Oz6O1$ zDTBxBBkFDCml{eD;Rm!d4GtA@twF91k)L6N72m?X9fgg%Yoop<VgUFkspQ)1Y$jl= z;I#&o4QnN^WdkTAL_py5Lxo9%2-EHy<%H^i*NzoH(&H{#uccZ&=H~F7siS+OlMJPk z>V6GA^0e6V!DPphyL5E{XM-0PbuwfrdF{{kxV%^UT)o_exX-uqRh8RxwOP<-o|oz4 zkY{r`xrx4?QH<AIBS6$JX@~fZkH432q&XaTKW{+-Yi`v!LN$=C=FihJN-aoXyMKTe z6Jh|9cjfptxFTbB@x$Do)rw<{qf!$r<8W~2VS=>%FSkV6!QU4d$!w>Lf|tniz~Aq? zE}j|rKa5MDjT+gXEc6Fa01DWx<D<A?P$`3;61iT-{~kWg+$E=GNn}I)R(4xkqYO;# z)x`-7jVQsbz~j!{w7Qzr7NL9tO(kB<4xhKR%Qk^7CO&VYwb+b&IW~lrER#i;rRf9? z*3VhlBBA6ZuJy@9-k+_vW^rPXO1!pot@9%Sn9L1GtOlIizrO>ph?Hjx4ks@`>D+0p zXMaT~3|>%-uadng0l|lE19=mrBe66FhtuWVDlbZp0u4^syk1?G2k)W~H8GaYB?@Y) zs3goi1p^pySe#~fjeXDni5wV=??jQ?aNJ=h0ZvB~Li`pesX^zqIe0Jz{l>kTn)ILY z4iceIvxplTNihf=)GgP(dDiyq$s&C^dS`qO`J#>5IVf3^Uk@|0MTx#zHkWjhldihE z@j#$$gFvNF!p%cjyK_#|s(7VJ^Cv2rUG_r=(m|Fir^S*S3ArLAZgObUuYx%NK9V<k z_voFsc(QMyhIaML7%)s%5T#5OSF{hP?Zwc!8S!j~^{kFP12jU*>hp0$hhtLz#o)vX zhSr+kFVQZ_H+w&?{^31-V@#-t`{{7bJrM;HxACBi%O0Yq`TIXkGVBtUFGJKJ1K!Bx zkE|m<#YprD$t1>Og|>_Ix$PXPcl@1p>ZTN_z}@ZkHu0~02p=B@(#T0Zo_|lU*}RsW znm<l8S>i2aiu=ZP@0r$R<0Z-!?}K;dKhG|TiM90#p12;F&jM%ZNJGE>T{?GG_O%?j z$!8Y>){f;S*Z72fr$_Ub$$CVDS^Wv)hA+%havwKH<3X`GwkUA?8q=YM^I@yir9Ir^ zryQ!fo^yOYCs_5DmfExQkZVW3yd$ODf!>T^jB$K&vbnd{)k-T*qyF%TxW?nY1yq$J z3!pv&hTzk8kX0<zY8oB3>SXE~^}8N;dd;DE+C{#hT}q0=p^}nznqu9F&)uRm`f0Ak zd=#5Zx8yp7jly}S8*1$AB=3h^srWp){vuA|W4uR5)T-%gTS$d$&%1WkmVV9W1gjWO z68s~pD9Z88atn;ayjI;XwDj@R2HZ{?Wc=VATNvi<)%7l%??l$kLswKuCas3a4b6e% zeL1H^q`BPe-GdK55ujVyTKJr8KgDGCkC-oB-iA}>;%|~j)EGL%t7*b6K{Oo{{554T z?oAL_l?41}+rph|-{Iar&~oxjp@Wf;KX5PZV&^t3sB3DPPkq$53iiD_^BbmQI#{sq z%ySQZsml49!!GHuE!FEY_px6A%NNHppN2CY^Ntd#O=)B_8ZoP|i&72E&SK@wjAZQ| z+PK&+XUdwzBIUd+-W@bLKCVZ%V!Pb17|l!U(|D`dv-BSOG+v@ogaG{CRt|@8@Go|D zPFN6qGfuS|H)*>a@c@C3SY@XR#6beSir_sR36CboOa$K;Re0jUm|8Dkh%ZvgtFmK@ zc>YXmR?0#4q+!~8Q;VW#`E@tR6yJxUv{V<Pa6x@dz8$&ab4;fhZVj%hIQw$3dNO#D zQD_56eUnEiL%<(U82R8^KY7wm9Mi{N@JlS8@D5bdp$zfF05kx1HU@pr3|jdT<A!nf zBPd*lHglU-Ck6Thb|w=y6B73z)?l`J{M0F!K3E!6iKis-0=|A_$Dt1)9p(n3oQ_O{ z|Ih}5ioQ{aE0XMe;zT`SqS1OJ%d{>NG59_a9AzQUcwDg3A^<4sbOD-%itn(U#|LD9 zQ@x+F;fMh_3d#fSG7Bp!6HI83+zKGJgn-I2Ju_3US94T^8EKG#yD!KSLA|@{0&qQl zIjI`@lhx>kYEvHkj9mI|-;YnRe|@G{<$Lm*-Fg0#VcSR?@S%*rK&7-LtoYU0e5XRj zy1ZTg5)P_Jd-VSv2`+!`B-TQ=&1w#QdmEhG{v}XJ5oV<lPJ7Hc=tu-U0?&QSp9!Xh zVWQN2dwb$Yzcno+DCmZ#EU{V&#vxG6iAn}~4onG&Hr+6^^5`_GYF(ODL^<$k#0%Ja zHMP+H(qlw>2bKilk;K+6P#fOLtYpgye=3hEF*&#WuB_yfUD?vH`pRq2m?NTtvj$~V zex~aBzrVU93*&O^y9WLgEf45<^17T;7*)3)nfpl2a7;N?cciN&bq|7`Ax4Sw2iYif z&qOIN83o~?!@ezm(F8uJ0L5c#+ZJm&fH^sGYy-fo!;pWD`V5z0RbnUP3{yZeU{jCz zG7ga#i|V51x-W5yCzuN)VB;EQNw{*6K#X42OX+lY2<#@?UVz}J@h;G}z02^=^_Pvj zFEqwF&+fQy!=qrJyoE39(E5GMuZ}!RJlzm{K2=g6Za_TWrPE*B&6Uk}eVCsu&y$V( zy*%9|r9CV~_r7_O&dVhR$%vl0^YHDz(@0`0sO?N`6u!3>MO_W(A6RY@FdhZ!HNu(% z#@8Kg`Cc&z32xgLx2@!mHilq~8V{(S2US&Rvhzs4qH2MaXFbyWyd8q<Oxl{<jP%3= z08Vm(n(-z<G_sHP-oNg03eYwoAqEsl2KBX9@mIlkL3;SIb3OzSgicv@e+>VH=raN< zo84E3{InCk6znvC*8;*k=3thu({%%{1+WMS2-F?dFamB3cTSdmqiT7@Lsrp?N?~`F zevT~&%gYUuwfeaOCmUX=Y-{`b$G8S(#?tfO(#~>=67{Za2afvrO?QAs{H^dMDFCpA zatyNc3r~H{lV$wF=Et}@YDfZ1fxQZwH`mC@F4fo9AN@w><BK{II#nhZ2>{l}DLg@R z#QM=dM=FAX7`~y<MYNZ|;r}lLYH~^+pj22dr1bRecK#H`?>z250OJCLLLx7KBA=MG zUi-^JLS2NtB=2}8>#!s79vu0YlMn+&R3Nx{P&WS;KZQ_143Z#6VE~mhp#5YYd(oGw zK?gi75aJ2dEyB791Ya?UFwvxAJREV*NK=H907Rkbc(vZbYdV{6X+Wt%O?H%({8*K$ z5|og&>*X#bBN4X)-+VYtI=6-Q3(9;bf7;$_pzzOWR{o09Qo(}lLp%l=Os*d$e#Do} z5%fhBo*QqBXIJakgXn_vdkWrHw-XR4y^FtZ%Vz{l-!r;DWj@X18WZw_B3ZbLgNW#O zSO58RG@H?Jrw(dBFehY~<zgPHKxai_#Vx_2LW^*^Yw)ijJlwIdrj`X*=>@Yl6bX21 zFzxGK2M}S+)RIfvHmz#<e)DiEz53PFrD_(7#iOCl$E)|4$xokMb+L03VX7J0g*rFo z%eIM`On2F~-{<@E-!^fpriReV`L5fsMO*uC2#EVGFEYnNEZ#@JyzQFmA=4Sq*SCwk zYk76Z%UG92{b-KC9Uyv$|3bEn2+*gmztNWwJgeeUE-cN&q!4#!Hq41%irg2h8n9f+ zow)5Kz25ta=?$^0(kJB#_>v4byN`bp_`H|lzJ^q}c~rmaGXu_tK5BHVyFbPg7QxS} zgYpKVW;XI=xA^WbfM#OfSW)euV{f#S^HhaadI$*{f(^0xCL*XCw7KXcKi+G^asvjo zn6PTGe&OhRe6iLx+xSko<ZIse+~4!2(GoF&uG13z)r(l;{ODg`2)(PvlQ`>#f;tRO z&xQG&C*{Q0<P|sd4T*67n>@$jG;9Hi#F)|f`}5ru^X+$agrZ$k{~ASSoRx5!n8{+W zU(3s9%^2oNquq*}T5I%eirhI_bY3HZ)hmEKaq5|E27zs|bkM!cVY`x~U6^@Wh`}jt z+us9s=#(DmA7F=-0kg2aj_OK(hL!R3?+~zAr5MF&XY;mLc15`=$e4-L@iEquRXnrJ z1~0i`1EsC`KMFV8lfRU1SbSZvhvU`;21z%5`k__^KZe^38oN`G{id<(mb=bh-_g@@ ziI+Y)M+L;Vp=uCHFRYFnsJ%$-^O>5aFW@>dPD<u*2Mpi?y<6sop?(LpTxKzaaSkLT z*zv9sO9&1<)vYQUSFHC~4dPJe+D^4zvf4<C;|(fSIM2%Ouq&2F>ST29;rM4N-ge=J z7kL_6(kEvYj6+|o@X!w#unfLB5+oW)``5`a4Ychgo_f97b#D9$j8ez;x)MVbxB~V6 zH&p2w)}NaoLf4T{HCkIwXxv$Hm@>c9OPIlayKm6yZ;Q|2iu#XSgP8-?X5e5ZHpPh0 zla4a|nx|c!>)j(?IW_!o{8rg>X|b6I`4yh^hFQxs1=j7-wVfr|BW9O1*PK2yVIStG zX)^ezPQ*X-)uP5dh2gg>k#0elq;hwkZPjZov{-U84G|)?A+0V?He#6KKi2t?@SuL| znr;(gFuOB|VgmuWFfdAnf5=^r>6{$?@x%T5^Ya*NBC8i}_r%G5h1h_JTnvh9zBm<o z2d=ir@Bp+jDmK6VBiaY>M&I<?q#v|=EXc=2^bpHKpZg*7{6#{YY2xl4b$9P|4HzBk zyYqAA!KZt1haH)d{3g_H2wlmvd4KHPYQwDG$|IvZHc>~dps=1QU%qb70GDtn8+OAa zI<rdND`b^>Z+h>s3$0<KpGCeeXeHUvJCJ+F^&q1t%eOJ0-*c0v81hsoTydUPKgg#C zWa{5hb!%8-8U~>Si|_82my3X~z{sOP`;L`3sMCn?w<N$bTwGkl!oq9UFV}Cxq?zCX zPGKBm`w(*sV&w%kr@$$!_$A$8!7tkvMK9)-cHY?1iH8`pWZgx!nDB<=KL<OX>01g6 z`-P}D4TeO0V~DDhkCbW9GqWY_c~KU)+rfM7)XgQK>Qa;Sg*0}}hu&qCqlDIlN_XB> zUMQyL@&=EmEK<iX$P~DY9vmwRAH%hLH;xf90DcU~FwGrjVf)GRQ};Iu{+Fvh__lM@ zYgXKF=~kkf2!>ch^GKWl7pn>Wfk_cl#O03iuTfZy%gPS{3BEq~OQ1R+c_o#6(>(x* zAKNXVH=~!*o`uzzFRb5v+cH$<4$aYK_8`VHWItTVHCnp5Z_;OqG(-@_@YP}t`guR< zAD(VuS5FPCWCk2nFu%M&m5Zl1Qiizgpm)KsK;$)nQUWIv2Vy<?NcTdDTiE@YFWj1k zh050FMt#R&hOBAK(~#nULc4OiM|`<<Hc#yVyh808mbvlDf4isTu5Xep5t$2Y`McXz zKz=&WaFg)PUuEw7!<&cZ$D@Di+)-~^ir1uV;WYj>KKlb~ee(%eiuGW`S!kP@DiGaa zEMY$?v6aT4P|P^^@SdNRm<%l8QTpT`Z*H?O9tdF}EiLz~2EVwDsx|Vxn3i}29q1Ei zAYf2P#6BNX<Z!T{<N=2Or7Ey>;H?laaYEu(RJ@{9t_Z0KE+w2A(vWvhuDgBn+xm32 ztrrCjqE9GSRSlqNArv>u&^Ij~dl>M`vh2h*;rnOF5-EPQDv_6y9yaDzI-hIUYn0Y6 zgZNQ%{fR9cu~w3Q7zQ7`J$5SX_HAv2B#T>2zqI>B7M98REkk!CP~wu&JAQQmek_nt z*df2SsCb*Mdu5}s2{Q@d4&6WPds%Mo%3j6V%O^PiEwfuL8F@;&{^jgF*}2z+L(Ace zaq|2@=DK6D{TKPn8rH$@MGF8USS4gfBAu@P&bdX)&w{qIO@G=cGa(H^s_V#B%5!sb ztB<p?23Z__zjGWheb&s7dt>+6k!Nf471B9rFS%H6?%IEjc>G<$muW{#?z{8DYrkS| zM;)`6TLSxuJ95ntUYtzchABQk812-j7bn~F#cXn3Tpr^4wd=N_#`%gzZ1t++oMGWD z6JJvJzCgD;N?$dmUuftgLdq}6p>%%op~heS-sq>toWfsj0-_eHnNu1EQ|C2Ho|~N| z0eS7xjxhlllN<{*Q@dr#T`ovoY`c4u(Kn)8jdEPxAxo*QW0xWp59Va6IElH(KJ^*e zz!#%MlR0GM_?H~gWTr)XZyMb$D7vNZA99nV9CN`}B9Gn?ak+`#h-8~zdf*G$pubeE zW?-!fcKRhU;eo&M!BQo-^7-?HZh)7%mTOlRYcYRO^zoo~K5=Owptn4EiKG9ju^2bg zvu1gdhJ&G|Y`1uCIJ(!aA17z9MR{oRksj^7BI3MKp1UnNPNfd(BWG<qJs*j3)R0zZ z&#cZ)SgKUFPZ19bZFDTTXY5;E7e@}f?saIVOEmcWiJXCzu!rTmJ%Tn#9y?R_+4<5q zxW;Alstg4r)w1GZD=`D|(uvZUF;cFq+&!M=U2cF~`)SR8qh#9$)>oJ35+$Fsv$gg? zc6#j$hQqU)e~t{W?yF&X_%oH`_65@{5%0qneXrOnVBsYho0f=0c2xd7X;mK>FKl)E zbyz_w;I*M-Rrxzb-#s_pN4N)MJ*R&d`qGNhW>4v!w^Thb#}I2}bAvH)L#SF;blr;# zhF^10Pc4_`m=-A=FF2K-s8H;4&a<_cd$9OyjVU>$mB|vDDWqNZ%!FKcs-<hvoGRtF zJ2}j-?Eyu@t#G`n#v%*#4)c&W)0;;^qwI$R0^c4wOy#ETppPEpm?Ai8NV(>H`Zt8d zW57&hpIvN=9__Uty-|<O;B8uGvHER_x`({i)z3gUeO_2cVH-IoY#o(K1Sc_gRC>c9 z$soBJg@r-wh$X17jk2C69r)&qrJ~cmQ?!i*C+8N$4l`aa7B&>HHu(C7qP{n6UX+<L zyZ2AV!xJj@yo#4NB!liFb+QTr>LnVwlvds4-yfrH?8=_Ss*6LNRU{|f!n%_@C-O^b zsOwlxX_<WdooRYs<F>Kn;GRK2$FY?S`aO>XepxPzU+;<Ktkaf?KTyxz3tZWc`Zj;6 zZm*hAR}dZG-N~M3@FjXkB$AEx+EF?8MNCbki~!3iGsWw#a5tkRxxA?(>y@kQMVsHc zjx(<(=bA=7Y%_c)AIwWXd8cRdyLOUcS(2tc#x0EwOhObzr|HLa2QEsi-6Q6td*G6b z@>Vp;M*7x|uA8fphlGS0|LL5J>Sx;M$WPh0v{ZeT5===5Dbx^IcAl7L{29>qnnaS@ zv(se9KIe<Svi%je|90|a>%FE%@!|K-_9x|px>jh}x7hY~P(V2ZFB?6a(NFz}&teYy z7lYNR+S^xs!|pNfu;O!l;X;3l<g(dqa>FEZ;}?1@vG`90%fI#<Q+)o%*%41LhuijH z!(f))tgDY*Rlj{@P=+zgM8GDO<>}YW*17djq2^f_LUK2S+C1$4NxyYk;KX%@-{Qw+ z58DjnNArbDh4=2QQUHf5gt;eSHP+aPfNQM}!ES?^qN6Rzm&&}quO;a0NRAWuHL&E| zku5bHcW@jR#$iTm%SKcI%Z|)lE{$*XtA(AlE6!5~23l;@G3#e9utJAA9sM$Al~E*y z-In*4yN6NjfHa|b&0bo#a8FsE^>s(H1plO>>TlV{6ZxboTI;tQl%Rj$Xw^M3x2VKz zurwu6Ao9jzzbZvgf$qyrVE$fAmJh6fQIDt>CR$W#y9nssOb}f|A1RDZzwAs;JWjtv zht&p?jIpd67P5>i>vF@m1fG9bLD&f}sm4AZENXWr;M7m{5tv2`*+Iv7t5W^lAEi#a zmh>h$oe+&=b4<B()h(>ezu~6GH(S_fpwQrZdWn;S;MR=!EkkW$UUkj?sPQ(Aizg4+ z@$0wZ#>$DE(?fo6>p>(pR(7#)+t5P!Jf&juPCxW!+){Mr#I7m7kvn_n&ORcYKc-rh z(!=>$Um$skj<QqH_+IahZU>a9%fA63Ii~n<q^7^$pumW^ZbO&BQXe<$xqJy#+1X8C zPtXAL$<*dTb%Wwn1olESl%SMj#Z=UF`90Xs?TVU=WsMjG$RB_Qk-vx;sq7*bB&MZZ z0U(<Ivk_}5NxcO6!00|g)6iEs!FYgm7K1uSTExP1B7=-395zIhOVG|fyM*X{{rVN7 zO5zW|%IKWsE(Ghy+O=zm&1<mk!rMuRbs%-AMiSc_F|#37X2G2BANZNr!AVH}D7-p4 zI>2yh!rC1WNLAVpRv3!-K~F&#17!uY!9M&^C?U;Ad?TkuK*1{~Yu3Tkh^7UtODEi< zP!5Ps-WaOT$r5)U&EZXG!X85c$OMlAR<M$Khoyn^K7RUi69fcSnXIknr$m29X)cQ? ze48}(ndDRDnGNdMDylm&&>={7nwNfEI+N@!^=2pK1D}brM>>oni^W!UtlWubMyQtn zw{MXqK!NtsA7<y~WZ+UJEXS}&5G*5X=7U>}z_nr~Mk0Kngq;;DOK;t|(|@%3Xg$_j zA-+X;jn<ym5s8#yGa@#FfqaD85Qro^dM*!sUI%g-R6>AS=@^@)z@WgV0KcqpJ1N#p z1gVrv06XwQqwJng!Js1%yYrC7iD(@L3YCyGF@l1}@biPRvXtBgw5Eh|;;ONhjxk%r z->bZiPmV)dTboECVZH<OCB?P;H{2QowqA1iE#U63D+5Gj@tyc6@uL9ggE~RzxA;B* z_dg#D@=|U<9S954%)}zU0qM+0t+dF+Y4-8C#ty-jW?{EATVe$7wUC)#at*F$p{H9U zxC2q<=H}}i-gK00jwglAchWKPNU2Z~f2Me_fE|DYDs&CFGBLOW@RwKSU=s2i&rAt+ z(ys=<1HrI;btc<R^t?{z7Ox2Rwtq(PHUg%PyB8BzB0GQ7qop9T0OMasZSb&|+`b1+ zS}-zjCT=gBJxtGlAn7OdEJs_x{cM>qhQ(O_{)$}aQ71Tn-I}Dttc}FBOgLpNgrp?P z@49YX@>-2PuJThtvlKc`9o8ShAQyOz=cx`UL02O7_T=U1-5zvF^A~c57pwf-CSnf# z@y&}MG082G8K))aW&PBdIUDD>vFYJGQ373XPcpNAJ3<`G0aNuXIXwC*hV58Zj6MX2 zji0}M)x+bD9g+k_7i?p~Sq5troQ@=7zYsEz#Nq>z#Wfxw?nYH~?!-c&3}~xu!_S?R z(H)@R2LJgAPoa;yqoNR;o`@kJa|8nC&0VHnnMr`AL7GHUd$QyXPbpX}z#;F7E(Trz z);FLQsJIDt2B`zD4IKo3>p$=-o|TX|yUEV1xM1+71lI4J@C3;nxd%Kf@b+hxW15L` z0gWR5QQ558avb;jPVvyTHq-C<uZ}c8S(QhBj0O_6F+wQCaIZ??!?q5y0KX8%?Z1>6 zA8jb&>=#aAOx`ErH=?w2NvxXUV^soeWrdACVs(=&xd&l6aRQLmW9)Nktby<L#e7CZ z9mR6Yi+&utexB%I{=PIX52Q;Y-Kt%ztZfNcqBR>&)8iRJ$Ev~xdoi&+@!4zdG7m`W z*a9iLm#eZ>AM~-j+LeoFVBtQlAD)p?P&m~TYbd#~w5VT|go!%%w!j4O0<B1G!a`PJ z_6&IzPgC3;xFT_fAp1p3Rsib`1Mq$KZln}3>fG_v{<5100F9EM!{<(5#Er)lG+@fE zY$6T;XFo1=Odejc>wuK{AAl7MR`~n@GUIE>SpNX`7W^i#O2+NdfiDikVxZ>18_fOS zUwOA|yUtx}d@wj&Kq5vy^!o1<uEnQq$6?8XmjHCtSBo=$gJ5XIuglP=iij=6>_I5- z^FX#>SDdM6AysqDm#%!t!n+POrH6kk*KE|Md%T7B<%+rLuQ}2UulpNq8B-D9e;cw) zfH~>oemzfq(|&0KlH&Ny2?IDDu<8FF@E!t|`Q($wk9mMP_aL>jaY3|pD)&KBQxb!3 z^qz-!#nqxq$k<Z}y&sN{!lNxhZS9BJj4oZ$fg`OU?@b#im3OBVEkOH)ar7gQwb4k! zXa-;#q%&gwXiJOCmBis4KU2fnmpm;LS$6ytzV)m#U2pB)KA*+lQstfXN`7YwO<jL) zbyc5Wx*o)DNZaFyV69KuCD_!(oh;hMO%kV4?iLRF)yIm~oh;em(pdQ1x4@Alq1jj; zCmZfTsVgVd!bP}ZX2fJaU9_1kx>vQO+-os-7qi@xwHDnBa(_wp-f;d}motV5UGOo) z2UIWvnD}S1aq|YUYXm1+`rP@@Q{n+RMM^1^D!Fe-EsS`Qfd-j)_wHMrnj@j|q5;iP zzNK{Ulx_0#Z6>5B{)&@9E;r^kP_}ct&t-Y=jrHe0b+Y?NeCIoBnCR&yVfV;M&|mmj zL~O~D=W!bUvftp&8-oJ^%Ig?hS<Y-)Z>XW=9=cU5hXrFZSz)ObMu%lXtO>xQ^1+_2 zUz(xQ)(qWnpVpsYI<CXxqqKIsAny4-CX0Rb6bU~D$vxa(#}tZ4F-FCE8hZ3ITDPmJ zPCb%X>Sd`7n5Y<LF1VHU@$&v7Bb5SFy)8V#_ATrchggr66d&FCCu09U&+IS56N`Ev zI5-&7JAlr2V6%WNd(@v-DH|>)ZMgg)nYK*Je92fPP<U2j5lJpDy};=~m)hBq{N?jr zUS7;QDuuV{sHA3{-JicuMT^dSbBzxJk#z+2l}rP^uplP$ah)-@Uhxn%zmQR@{dk&X zOKgxxP30(ba#VI&<35VTv)DU>(+>VxBt<x3tw#dWrPLqe2@qomYYGxdM0`kG+zgIf z919S!2#YiR0QLq*!CQ+wF{WhDu3$yL%iwJ~UFZOyG+|>L899kU4r&KR9k{`<$yFTZ z1~E-5K5_jqon2N9&SLP$aNFZBijtKbl9LC>1y?RiD#S5_4<Cao59>aqZFvnn_!+2q zP)T7Bi60iiQpZ}y=qet^S$8=ndg|3J6I(fH2FQyZ1Tvu!(9C0shqk++LR~=Lq?CyQ zTuAz%E5sJ?lVEqnnMYO5I2GrOEp@k_@URpd519m%C;eJe>q8;WeC(@mf6C05@c!Su zbwYo!gjlk?Go~FjT=0&B{Qo2G64TZbae%^L5cpyj{5JR{aY6`hZ65NANE0(@)WsMM z=B72(&d_X#-Lg0yh&KYt&R|t~=Ef?ZbjwlZ5fNvop&)UJVUr8WPM!^k#F81@Cqxbe zyVT*C_5q^CtGh}Rpw)RZr2Ph(6CNN0a^-aKGVXO^hKT}p&x<I%heytGJ}YI-)nhv4 zfq*f5F`$FOJ7v0upGuD7dEVh&wx_kVH34>HESN5}_Wts0X!88_!`nu`AR!eG62T?9 zH=y^uVdY!>XUkNKkb5^h%IA=P6QT2gH6)y@?|}H$4JO2yw@MPfM5gdY;6rP`)*gs< z#6>dJsRm}O2UdfF+>gq%DM`khSoet+i3;!WzJC&h7eEoKcU7$el3qCl>krlwp7%yo z0xFMSG|bNwyaO^yN?bU034byL>(nvYhT)s}Urur~p7;INNsL_QiCt5PYJF?J5y)OV z{D|U~&|t4!^8sZa&6X>E4<Iv9gBgN}q^3}_vM?I>Mw##bTDtCdD*HG5*vdK$Bgw4D z3MnHA*`YM-oH|z7G)T!74Wz=W!fRCaN|G{q2~kK$OLkIZrDOiC=Y4;D`b+tobDr}Z z_kG>h0K*DSr7>V_Z^Hl^-keQIMd#MQEtWC@6cV#EMvOTA%{vlIk8lxSMOAKPjwcp+ zLI5`mgxqBGE*9h92GE*FD@Xdt-<Z|Id>*+@x->Q4L3WhpP(H;aCtu0SlU3ru2PguO zns!bD6Fo3vAlee&hKoHcT}sId26ZR~$dth4AD7XvjAFn<kDxaT_ZU?z{q*`cj$Xs7 z)FPIn<uA9{fTPh1G)n1?ww1-!74K=r_Y_Bh5Dgsu%jJ8-wtxQVJK@2B3Yc7T(D<R& z%s{b1zSVj#%%Cp+J3T$LTxDGtoTd?6JpiT6IwI}SqxC3NQ6K%^nY?=}LRY-@zUduy zPn-`3QveH}fdJ8$6xZP+p|++yZB{UeqHpI1TM}bi=%k?xATyM}Qoxf>gD*JcJQ^tc z0~wF-@})jLtps9^bNm2@N57*)zlZlP=nm(8t`>9wAo)T7Gl1el>-(F~+aPN_N=3}H z1CNtTgMc?VIoX2`FQElK_N0T==;MYyZ%jk65x9k8*|3UWD7p`a2Wss|2qsXzz#xG1 zMSw^W3v6>sXrLqpCVt5^HrGoW>W%G5DBwT~%RM2hy?hBp+0>Q!ZUZvkX3f?TQ8D{j z-PQ<R78YJDD=I;b=K18Mq$u?R({z7vrG?k_Hw`x<b3%9Unscbn7%L+Kxd6#*P`m-_ zzrjEaMt~1800q#(q(`cNp9fGH`VkPa!o3rGz5AbXmwFuEz)jh#!&hBo_Xv9wFm|F) zEO>9?kD0V}u&;3*I=V?jI)F8WmxAyMKSNy)lX<d!&+SBkBI<;k`&KG#OU>C)=Y~)x ziys2TEpTwatKEEDTK8I-$2tgm=Agas%xnHg>BJ^SZsz*)9HITsm}=GXjm^vwO8Jty zrR#oh{Gzu8RsB1^pYJSOOAXG7(ktw~d9>ug12(NT{VIrT$yBk42?JOvkh&8TykJ(6 zh;<+P)E$hIpMi#;ahFuRU{VZjYEu<LZv|1r;b4h`Ud6zGjrjFD7JNQZlltwO6gn2P zaAY_bZEMRsTao9hJ`{dj_zk>F1AThL9FZj0DBuf{^YV4;wCCQE%~^gv7oupf(;+E| zyn&JV>d~9t8mO#+ZZv8FI|IRkJna#sK)w<hJuFc8FSd1cv5HD@ojr5r`0?WeGOAAY z*xK5X(&VYTkWT}5fDLa9#T?x>jJ8NCYAocp30UbVDqpewNcoW7&e-?7YG}fhP0=Ls zL)$`f^Wa`#v=Ip{IB^lAPFA+~C35nB{t~x6jK*+(!3qIAmzYS_p{9kES~d~chW^P- z7s5xFzAn5?ta?PFCgidt<TKCsYiMi{9V0E(t-JVZ7zmMt_YF#5%C<Yv88IU$;din; z20aPd6r3RGnXt~qJq?BzDf8Ad$0`A^Q8zGg&+iL)n3913k#JrF1DHfM@K|t4VozZy z;n?n1TZ6XspMgnHI8F$eLQ0B$qvT4!bNjn60>urw5AFG>jk#s4q0DM3Dr_*?&^@&4 zB)EudWUGv07`yC0hXzVhJu=8q5tNmcWgerMymM3{^({zHCtruI^xwS8-cHlvuvhs< zd{s~}*G?OeQ4Js~pF(>OS$kYGkS4&2egUKF|I%5oZxIhAX%f2WDzKS;Xs*|#UgXGC z%suX8`3pA+4miByDNVRa|3~lud|`g@Ac3(FhDT@)B6JuKSqFbS3|=T(Uonndk-Mgk ztOA4O@rmW}0jSrX(IKo~DBnPa5T2j*>r<U_CQ8|jId{pXtWa+o*CcHqh=T1k|HeNQ zuFMzWYhV`>Zg3`zWWezh*YAsFO>l+xJXv6k9g`w6Qeig7f)J20n@y7sJ7~qQ_0u1E z`U5#--m2pB+`2mou*i{k&n`KCrH}l^7M8>$1$6Fn9<QIsC@#L?&hyywvvkg8rvt0% z%*4VugFkYYf867bsA?AyI2VRie7W$_Z0-f*&j~37bqi<-uo8LPOo^yz`3>@}sdmjz z)|{483Qme;u>6PF)-=JxEzmmLpYpRT++n9qOG9uo%Q=pk6xKS%+!OJIee4k!@9}VQ zQil45JR4jik?bbQ+HRuY`L6eNf0V)Q7o8H?a;K90+<DzLhPTINuz*gQH~i#hrO-g_ z3s-9=OOBXa7I?;in0CE-ajLnu2NbjCAh$hP=&oMgxqUm)tyEA{<ZX1I1_mb}Y)=>D zM>20fE?ym6>e1NXk-@MZT&5@e=h*w;-yZeU<5Lxm&!oXaSg8*S3ndM%CHiU*H;!1# z<caWPi>;06@9!_lttNw7JMk>;f#v?W5@1ec(Da?&@YilW`L$PW1%E2_B1h?97EMku z{u@U*Q~3P%htq=Bx4KfvDKxf`@5~WvYiPGPpu~aupS?mGe%R<(QY4>2kgegr$tKMB zI{%}TL$Y(vj18=>3Oh3k?=JGd0ig-{y?7ThGqbhR)_lNk@kKZ8>}tgWA-!DQa}>Q) zl)WSdV@lK=zT9s@i=MluN?qwc)dhE)7+`I`VyetiG@^0632XAfl}!&Q!2lV%woiwe zfO4926}a$a5qxGcbU|@H5wtiU0&}qz4kias`u-vfqdHzpfxoBABN~peHh|;!wswqs z5fu3nP!-%DIg#@Ou@32{1G+u<x%^xV+|1X50l&cuwz0w=oGQ|eCPiZvwhZj*#ZRGI z#$j4BGTjHgB#s%<he50#gK!w$Po~^J`bB>~&3>UZb#E+MZ_>paL_wgi0A~R93-qy* zq+iGYNhwh`a1P{mGDDb-49Nc28bNK+-{F=VfWXNYA0f5^iqkaF`S?RasN0sa$Vu=& z(PJ$HOR4#*LR7vTe8UsC6ZA$V%2+2GIcnfMKE&cr);t;Y4oI9|`B*uhrkW$SGB)ZN znG(Vf8FEm9oilEgLb7OP<K<}9(n|NEuj)p2T!}7g7KuG#^6<*boHC2gFSgwIW~2CU zw#9(ga936?ukfqnIhu8Q5>4hrh*VlQrHRvdy~G-U;V}C6m%UrdJ33}e3=b{rO1hh4 zyQ8Bc@WH~Hr6qKIpH9m+mjF2cQHqf=`5D|YGHD6@22cpxLjY?dfPWYnMbnhiMA>Nt z7q06|%zr!W>s#lP<ymgqk|M*-_+O9?vJ#~A%gxtsDG-~ZUo5?}Ketn#r46_gq>rRs z6|%};;txm)4F_Z!4e5GU*Qf45!-fjae0dBsaFVDF<D-x#PliWQgI>mO*^k64;oE^K zd-en-OxTj&?G-Q98BCs0M$lgQTuHAfkwpQATTCzCD5G6;&z@uMmoX6TR7Z^7mi(&& zPabBy0S*SMNu0`81aBN^{7rLo;EPXL(vP4--qk?!AyT?hHQQx-dc1o2sAm(qf9KcD zqWZE#gHI`qVQ@O=ty;7ght`olIm%xzFP>NQEz#RBh_yy$Lnte6&KU;})vC<(c9Lys zx)d&ApPO9q3n_895hzDJlp>;BGH({ROU#i4K}bl5b(5My=N78+nbMW3tt0Ca=e|Ti zJ_of*!MsFIP@pFD-O|m+F#TT(1J&&?4-#NwV~e%4v@Fkh@Sp>AVs2TF`(8+T7g3Kt z7QAO>DbCJ#cBhPQQEBP)zU%rK@(3BvXg{gMtj&Jb&#&BCHo+<2x#mPpNT<l^h?i<H z&1krO_#`;Z!b?s}>2<o)YWqSzv)0X>?*?B-s4mzTj{T7nWb^9bvZ7L}|IkNL%O%wL zg4rkm^r1wVkwa`0>lB1KO@g3IdU4^YlDVMB$<g_nB7f{@cxSF9Yz!{qKlkekp${P2 zE3ACdRk_Tqn=z`6HO|WStq)ksRV&LE;QfVYF92Gk<0<G(#ZS1baA{+*AWyB5U26;n zDUyUa*<Wv6IcAtDA;g^l8!&va>3j|f0-!subK1?$8usVcKRlC|#zu+WE^mNAo)7FC z$Z}nPGaan~Y8PZ`>8T1?C}$dv0hLo3oDx4#3-Rj7rb#q#OO{w~#bAGXolo&&39GG> zu`IaTJvLhbONRh$${&)O;^pD-GutKQ{7Y3xd$?-U6cxo}sZ|%ZSLCBh&##05Zt8&Q zOLPD@K7XLmJV(4BXH@2g4|kwL{Y-iyufP@e$bLV+IS~-NzoA3OBkhIiF;=;Y;&Z}) zKr%wh5I(LXdKtw%dzP45r-hnJOrYHc&hQ|+xY)-JpCRI(6TdWICVRwZ!9Or?sUI+; z^zYt8`+)4Ja`u4iPq)?_eA@MCVA3upJNqwQ4v0GMTNe|KJ63C*-{vi~eyzkiW^IZe zUF`2lM@d0#3REBUjmo|rszQ97XMAB79IBcep(6&Q<Rl^=n%F7P+HpB^#<NT}h8{wm z!*^BBM_Cn4F6fIWt0U6K_g4vPcCpJ<^Q4RbhOGa}D@x-R%TUhVFAZ1$J`8fIF=6$z zHK(^wY>g1A2N<yhiNUdp$X>mPVMfqaxY#bZ<^@u{yu5hy%r#o4`$!Vy4&ox7_#T}9 zkEb<6SV=T|7X925sP4}pI(nn0TeB}%Lh6|@$L7Mx`K)ITiH8UpO6vLWA;90=J+Bh? zH4ou@^5nNvjHqHjzgbdJSD&|Wb{>vL(&RV_-OotyvwMa?=RK5Bg&d(;)$`wTSEQH3 zVjE76jy_1WxW*DUM+E><X0vohiSY|3!`(Z{$@BFSa|@`}*Bw4|Xv)ReS%2@!;&h-F z@Q_ugmjd8aYGEUr5VZBW<j+i%JL_l8Sq<uxuo;yy8f6t09{9vhiSp+KtElK?d%Dyt zedW8gK;)WIj$&C3cpJWX&Z3QJYjti$#y}Wi3tfRKJFVAxSX87iIonO8B11C?4TFSz zp$exKcAe!%_g&k?zb5brw+FKogzVw_l{I4Ib@5#Pl3RMb&|xF0t&NTFpZ=@cUw#Q% zS!zNb-{q*}1D)V+@wb+v=xCc^WG3J9^S1)wiY{#q!KlMO5I1jUYx`0DxjhwJs@myi zF4%)L)6X(+>yG{`@7-D~Yrd4&cnsdYMCLI$S>k&sDDQy~5{Uo?2(1<ESu<>`AfU|5 z7-IW2)swBQH|8t`3(5D%Ldi!6*al3Mkdu)S6+Lp^9x>)Z+?RjCwf2Go`kE;W`c7+a zc;?s|aLTZJeOqR@Q)-i1ru-I0g62jrrZ4=x_&k2AmeHHTVs8zaWaQ{3F^W+$mXGuE zJ(dvOzWDyY-X&!#3ya6pjCKVeb}Pt*occEVVMU%nmt9NJ?OiyQZ3_yF#j72oLZv<K zz16>7aHOW70NJY+)6t>KRoH!DpOL($O3hN)Se)|)@kpJ~t!b#~5j!Egv>!{dG`?sc ztzm#(KQ?QI(<{ar-8F<nvx%s4;M#BO>FO$|&FsF}X(xlmw%{ql14>^FYd7ux%rCOB zn@!WPVKDH<A^)uPnz@b<2^Sl_+EASu=Wy+rBqt@MVg7oO;56;XLD>+1#WgHVDDK-n zafZ=QH=LQhvLs&T=#e9tu$p8oyyT1=^mgbZ_7IA(cG%W|#c#I}rX93%cWrObIRg@$ z>P`0=&C8X4l*1howQ{3jV8aA7CKWydFZY6>W76H$_G=CY+&1v}U62j!D@|cHtTon> z-_&zESYDEW{>`jWYc(ya;`zn8%Y%#lsSc}nM@r-M)8aQJy0L_dvTrDgpRgjn1Bc=J z*;6`VntcE4zoVuD%DdRYYIi3SnOyoww~J&>IqI--64IDs$jHl^^<cO-aZP{VQ03=K zRe5=N_p7T#h=b^PP?%Qt1~rYIi5Z)n-_qxuw1$}hN_;2-K1ti2s`ScU3}U1vzmT!t zRF`V{$p~22kK~Pr#ah~R=e29G6`$aB_%?t3;#Fp2fQwVI%to#heto@MJUo76yzeyT zHX;<RMk_5zt=o)tM)`@kGrl|RFPXS2wFvi&xDHnG-f$y~Csw^*wZ_mWWX8qUPCYIg zs+G73U`L%Wu7|zBQ(ATJ#2<L?^SA&aDzq*g_K7?(uF4p<OG@F6`KsLb$Sg|!xoBOV z@9(l3Ot*Ht1#f;Ch7>^_7cMNMB0}y9Q?NP=!;|4h;lAI?Ya+GGCf~U>l%+zW70^=d zyMajsWz&vJ)j?fPiIQUG)@k!-IRJ=p?#+R@b>!~3c@sDb{?^-tp}Gjs68)Y63V@w_ z;%Dd5z!BeyPXNB1xGy{W$cWWcC+YlN48H`gN9Gh1nBjb_<`lh)fEkFH<FaCCIXiWk z?h!{clW%%tXX=WIv=3<|3bRrCgo7$qN2uB}>mFF=Y|2AvKW9y}Alg?%9aZ{!oZXUn z7Gu>z!^0MDm5*KDeT^6#X*gUarMuDo)-^>=!g*<ab`)EWyGc=f=gy-)y;akfpYY09 zWbT=2l$g_)|CS-+vFqb@{R|)A%U^u&y#Bq{v;2bl=-aH^v+DO01vmpXabLcC|5TWr z0|1Aws%B>(75R;N<)(GQ&?6g<Th{?%w)2~HeOs3f$W^V<tG6l!N1G>JmnYAvxL-SF z;E^%c*`Zgr$p}wL*wXS9$=*4MWdf|TwbD*rO<{=7w?f-YU6Soqh*{NP#-}s8vnncQ z%Dw82s-)^_9wYh>@HG19u)14Xb~{I&cn1_fWZ*-5-|iS<P+XE}n^<F~!YOm{)rZo& zFTE?H)9H6#J5MvD0qGuB^Zr^>?FH`zQX07lh*~qOo@`x|{#uS4IWG<51%3B!&tj|P zm~^QeU=7&?1>-ZJEF5b!;lk$9{OVN#TbMQ|5bZF<s6w#_Z(QzfOsALE5T7u}^!6_D zLM_Bo_UO@%kC?^<4M-nEsi=%$ZtL*i;4K~=o}j-H6D^U3KHmUD`x$`pFKC&%S3Aun z1@B6!HN9kaDn&Tqx#X-&$fiF(nF0&a2hHQwh1!LgKCx+hA<jR(wno-moVnt*MS#hh znyI}y1;-i-k1`w_J)_<=dS-R}03<~dOem1-XbJ))92^{eU~>#5o7{f{9bIv(h9BVS zR|vI-4qHWpTIPC`^nz*yjC%q1uyLZCt#cKMozw6@U2t=CtpfgTppD0T8!j;MJf_Ut zrsT9W<Flt<+sO2`iY6NU%@7fz;@Zsrv99D*gJ9=`Zd&WnTa8*dwQDyf-Qo;=@>ufg zF~+FF)sM_W-e;z<d-j}t^rCD^op6e@^p$|O?omV>vv6m%+h!Yfo;v>fnN2o({AmZ? z<Gb1lA5`_S%;!hP`)M1q)*UyLSi9Fdk?{OAN28w}>awL@G&Kr4n6uwZs`!#uL90k} zYQ8SvD}Jyfy}5~@JKIfj<KS>*<HC(kkM;UKTw<J#Czd~KtEHX&V3nav5os$n-26o? zu2UqI`Bp-{{ejmpBT9!E17!U^+|xWzy-9bTYW~DI?e>Sl;j&NTf17nP6|H4Bcv^MN vc}q&~1$k-uY(b^W^uECYAKLqSepA(xP1~&R3N>sa@W)8cOt(Pic<BEC>Mr0o literal 0 HcmV?d00001 diff --git a/Lib/idlelib/Icons/idle_16.gif b/Lib/idlelib/Icons/idle_16.gif new file mode 100644 index 0000000000000000000000000000000000000000..bcedcd640039063616da52d222e949a4b737280f GIT binary patch literal 634 zcmZ?wbhEHb6krfw_!iFKnq2FiTI-rp_y4fL{}aalPnrHdYVrTH{r?NL|1aA8zvA@& zhWr0Z9{=z9{=Xgk|3TpY$6^1UNBw^p|NnKu|F_BiAC=h`&a^FEY+be1u5P1qdaHY8 zt5asDV|Jfw{zQkoDc%)xJ?mE5Hf(cm+T_}{yKw5}`Sa&@&RMf$$&#f@m#$c`V(r?s z>(;H?ym|BX?b~<m+_`)A?!9~W{(ms@|D)Oezs&ysX2t)H>;8Y*zI@lIC3`MxICx>< zkp~A395{UV@X@13Po6w^?%cTx7cShnbLam3`~SaOy8PhP!-o$aKYsk=$&(i^Uc7np z=H0t@|9`)J_5SmR4<9~#`t<qp=WpM>{rK_Y*RNl{fB*jT=g;52e;Ec2DE?$&Wnc(r z&;dCC6ekSq*BkT<nr&=sZS6b5ySoh>JOYD)LW0BWgB^Op4V(jmojttWLYIVk_t-jm zgt~hNg;^_$D_Def+qngY28M=(O1g^4N^c9dck~Q(-n%c<N{VTz-Q3_nYb6N<d1(g5 zPytiBRl8Jf%F9SGs{3&B*vt(KlTcLkJ?kUN$zs^=AEqca>%sy9Mki)gR-QcqLPt+d zk&#;!ut4CULKCA=41?jKBchsJ=3W!C6j@FQs(4QFtk}@t(U_!NwIN{PBGw6-W-=-k b2F%NrX={Y7QDS|%JWyC8XvqZ;4hCxg<9q|( literal 0 HcmV?d00001 diff --git a/Lib/idlelib/Icons/idle_16.png b/Lib/idlelib/Icons/idle_16.png new file mode 100644 index 0000000000000000000000000000000000000000..77d8f711804f954d15520c8f9e40720fd6fb5e64 GIT binary patch literal 1031 zcmZ`$e=yr;7=NiYL)G+l<;*UdURT{_{Z@50KcdK2l0$~rPG@(RVAiQ3y5geNYuB?@ zJH5IxRhpm(QEbV`kQ5hDKO%PRI=|vaBq0ex;<tBi_h0|md-pt_=ks}=&->gxZ$UVn zVrS!Q0|2n2QOS`A-+UEs>_gej-JXHKDmfr50D$H@wmb3r5q~#<8W{#a&ier5UjtwZ zN%<N8vM>M^;sEe20l@L%gZ2nt04#dLL!)ri(9_e?)zt-GKYTvFzP`S;wid|^4GlaV z57FxCYA%;sSy{QVvVxTI^74v`3J!-;RaJ$qYHDhPLSb85n@A+;=;%OiN+go*?(W{+ z-oCy*nM@{?N{5Dq=H}+iX7k3z#@5!>&d$!}=H|e_Kxb#?<mBY~`np=JHW&=k)6;u< zd%L^4Xu3|P8y+5>pP!$do#i~8q+D(B%i@MyE`QwKKQ%Q)%4;4~F8HUH2Asc5Nx42U zGBPnS@kAmIO1_RKupjj({qhCAm+MHG4+B!~27P-2XR;}YY&gY$x>~thu2QM+pG3ad zJQAz&?1g)QDFrw)FPO<Lc+dd17vbL&sGy3)Vw1__lhf#z#Yr!2U07O$Gne293HF^f z8jZBPI=EH_^$Bn>4$giF$3mduEbKo6dp})XUatC6j;9qtT|87p!-+8XS0Ehlg54NY zmI?%d!NI|qnHjxa5B2d-{S`C{TU%Sl$H!M!SG8KLMx%k+Sg4GEFM{Ek0!lrbnwsDW zAC57g+z&qUhcji3jg8ye+bmlbBKk;YRwSJPu3Y(j%_J~yE7yceX@{(6ozICuznKkp z4^d-}KSf;@--J-e`y3928WFL+NIjQ{kosQ)%g&QfL159saKaqH!kP#Qj<Ca#$BIS{ zh;ka;FCiSYOm`wEiL%ME{xfMT)_vIVi9?I<`<JCJbB{5XOxb?+KidT}tdj-Nsb(jT zKO(W^xY6jmubpi{;>Y-<IzvW{0}lXxOaD3jk?LRnY2P~V4!B8S+KkpV%f`kJ6U5K! zzateoM8xD0v{_Gb-=b-B3kI!zkyt5tujIzAYvHZig`bDg!w5-9r__h%Q{vN4P{}{4 zioYmv*>R3pKj0Nu7Bl7}%EdOWv9-!y0x8ntkCWAoe;ka(T|KyqWihS_>Cv1YhI#gP zblOdo$=yQibHC)Ci=8d8B6iCE1c)3}6cv@47GG#iz6~+}=o@@?((NP5W&2{f&j(44 zK^M@9j<N7)7Bile=$(*}hyZwC9+*4k<&K?-!anmpjd^39A7UtDmPSv-YlhS`W=c}_ U{~I!!ZoQfSXgHnB4~)C|FQa7=?EnA( literal 0 HcmV?d00001 diff --git a/Lib/idlelib/Icons/idle_256.png b/Lib/idlelib/Icons/idle_256.png new file mode 100644 index 0000000000000000000000000000000000000000..84ffdfddc6f91814583a2755d8cad268727b5957 GIT binary patch literal 31216 zcmX_ncRW@9AOAUbxi;6{*H&a^Rk&o2&{86VtYnovjuj$AR^;ANw5*KCx{}Pyatm=Y zE8*Jfa)0;p{XKra$Nl5n`@Uzq->=vEyvFnOe5Kf&Ght;CWC8$y)y&lJJOF_7uONU% z(GL!RFK^Nh2oHTLeE_J=V5Yht>A$hArsu5yAY29jpacNerw>8D0pPAO0Q_|ZfK&MZ zz~^7|!S)RO4~9EtRz?hS3?QQz=WMCtGx`wfhJ}eCK>P1QXerAEfY41dL;Z`P<I61! zMLgg3Xnv`-u1dq)T-UI1DXiT3990SVa-XDRa=F_v3du5hv!r{dw^xqE$;mytK_Yz4 zy%BMEiCA$3$9=^%b82aT7B)EGp&b%@b7k^f-_*|^q@}RspFbMaJO+ve7mqD!5B_kD zr|JnkzV*mV#;EsRteYOseob{xX@T4MxJb!NtGKmVThyCg3FwPeeUDT&#!Wu^M0~Z> z`R`gaY{!#;dd<CPnF4O{Y4snSZe`BGDI6Mo$%J=kGK0_9+qL7iV-=1Qx1=iAFIQd{ zIripq`Rkk<dAqUR`#kdA?tAO=+V5`tcxQk0!<|>}-Fh&7Ycrj#3ih?#dR^(|j#bX> zd^H|}N2?}cQFpe!XiiUl`#e-3Gp)8)-%~Fx(d`g#js;qNYq=;tI?I3M#r@MZsW}v~ zlCgs_kG!H*$4uNsLK;lwo&PTbCzhfq>fT06*v3Lw(Bi<>LVv+*)ZrGX7#u59_sQLv z&vOc=3uLo(cZRw0_3Pe3-KY;r_?V-{ogW_fFnsj>D^2%aZol=po~bUen15D}PxeGC zJ_%`N<dO-kY~6pY8BGmcZP}UHXgk}46>3_HpdGHp3|3dyMmUQkqw855;vcAWUy=i# zgIi6jtxFcD{Ske9F2WEY5r4xJXQ=G@In5BWOX*-g++p6O?X=N#rhD*qr(bO_RH>N~ zxAV=;Y40-1wR`1YWsBrA{qytJ+p$K(-SP3cLj5Y`gI5Tc+{HItoH!J9CRWV7KFMn9 zyeUBbFoqMv;5J+t^XqqtBiGGVtGh%uj`jv)!Y`DaEBAfVDF5bq*nG~BMuk11qWzoz z<3%*sK(32bnJq26z28;Qv@$-Mq(}W#{eCLkM^EVFs2W$B3l5)wzAqlD%=yS1mZ5jl zpc(w{%4#fwDCH;PR>a-Abvr$>_(@mSH$1cQ{*3iKrUXtd96z<(zHYz#aMd*XoXm12 zoc&Byp;v}iB0yVyKfTTHQ^>FR7rSYC%l5dBcANImLZRP2oZG@6zOcP-&747(4CW_7 zKUrrQ+nbdchnxm=c8XTZHbff+`;^)oEMUS6Zy}9d!EO_n!@=RsbmduC1DtlW)7C=Y zHeZ{TDw-lO5Y$j+N>qqvxHVZjU`qIiCg)ze-6#Rj+GX_Ae@x7EMb`8E)MN=qA>yU( z1InBNx7c-e33^)E!P8MYdu_v_EH~2iHiyn0h0T6`@CK>&iHtFL;T=JB$Jr@RX6d5V zUHilp?PQQE0T2~^AYJ6-W>}F0hYVP&ZK&)!esX$HmLpl6Bb^aP{saeTlwTc(Sn-`X zQ8vai`44f4oPbQ5$g1-?mn<QkN+>@}&}Rd&wg@85MfnC}!)1_Ybei$gh_gddo4_5< z3c5DlYzuq6U&O~uy_e&6^E`eO{pUrV_ZO#%&M;583ISv&^)gBg&c6<`;gUV~7MWKY zTuofm!Xa>;W<c5EoUXOrVePaA&e(ZbkG7X#9a_swkl5t0&!2X|054%;gG^c~q((O4 z9Y<IN^N(I>;CCh_`pga=V}l`ai?Zg`RIm}<gayaL>6+MG-(RXcSp9uZ=r%>Mb@#>~ z3_3b&FgAweSOHz%*Wgys+)|Np8$OGQjvs1o%S{)92i=kxUyoRaKzX=@vxoEO&BE+$ z2EB3LuP<#|QSktOv+a0sd*5Cp-%<kDM@IQiGW&l5r<UJn!EhEZ!<8NSTXKLP?uASS zBvrb2DaCBCK!P9Rzv}Li;rK{EZqU5&nF6?<?J+Ch*|hM->vYu2Ilk9;Za(7p$Nt5G zcSD)}{+Yp35vwgnHMrW^jP23jMwp~=8pSNxr#RrVfUZlBNNXWoDHsSzRjivmDE!CS ztbjS)>i(`HRjKv+o2PN%ilB1l+$nT7But<bw6kW41H?WR>P3|IqXKr2Fu%)E4WM!N z%~&b?a{=R`&LuxMYdyHZWJ?D=sJ`TqBX$(EbYWV8&;qevu-_ra1grqQpVt|!`R)UT zu*?qn9(J;LoWHcmxx%}1*D;R1=NC7Txv;}edljesXCG+p`_Ats@?F2;<K=(O7{+4` zAokg`=Q0P{FS3==f~A5t|NW?W(K30=RuQL#vPn19jpyOI2tRP5?c0?b+huYrcX(J{ zw46}}(cLWOg~h$%!1x!BlP7m(HZEA}T#6VxFR_<T3-kdJ9RP_%#pFG)9RkghYez)w zW*Y5`XUO=!;?<i6`cOXYR}n~DSzt*9<}iS_1A0H<h^Y(dfFVR}YVUl!E1(lj-(?64 zUGO6xc^b%Z%*`$x_x1)A^28-$nIr%{q6UBI<Ex}H$EM)&rr_oAk0-4L<tRz6z<kk1 zS0WQP8lKyJPsYF^kOhKArt71N;$JcG^AlJcbk)$}9C^S{zhPrF=8iCz!?conZ+d-D z6a@NnizM+o;DYo9;uS(stw{@IVxbzfkq#e}pm|}<pLxM&nQqT;tme7~G6K?uT~XSi zJi^?JID;#yOl<3CGGSx9z6&jC%m784!2z*fv>^_qA&w^ik0+X2mSCp4LaeMd=3q># zX|#O`JlbI;X8e=5=7WaJ=i-`C{CU6)8)cqpv3FQ4Q*z#_d>&RZR>mC2DXQv#LQ1GW zQu}qLT_M5EJzhXsnr&VZ<kT0$0OSVcD_jj1K1ny^9?;SdkI|rEY<^zG$u5PKt*6T+ zpBzQ5Ffkflg?pI-b_w~+`WGEk8wCXzPjbRcVR!6d-H_Aup(Y}`66ZM!n3rQ*q!e^u z7|o!<Q_9<zREkl<yu`t(^3HUOh3}B;0p|718hzy!?Zr7w4PU&Jmnqik1bq_zqe&@9 z4h|{PZUv^DnP&QuGl74dUp#+)xI0I`XvI<<v1`~OfV1>Ch8YmnUZh+L+BMt~a4W)l z9n8ey4Pj;$X`@*<EiE|=);3vyb)DCgX-2nKx!;rkLlcp!1pW9MB-r=9WuZlwp_gBz z0gAm{{KdR#$m-F87L6nvUAmmg5OuzjK(W++DutCumH-{V(hH1;tRUi{mL`3>U;*=U zjnGuo&d(;<a%8du@LlgdU>YzlyhGdnCpsDyAP`zmuhi=H*aFd+iF>3@x4lsR9c->} zit%LX#{Z=7-8Dl8LxQ=rM$LZRHoJ>q7LTn}jJ1F@fCyMmB?L5xP1D^KjFAY7uJ!@@ zKP}~eZEM~Kk%>kd4{;8M?U7PI)zt^4EDSJmw0-iU|Jm)>*6rnqkSXkq6A)`cj|)z= z5h$p4Y9kDqz|7Q;US<#(dl^szpX+2Ff2)%75QoG7H<Vmnmw(zI!Sa7he>@puEd*S6 zMtovOzs^sXm?5uH?Ds)A1>rznAy9Can*$)vpQ3wae(+JpdnE>nny-^y1Qw9{Bpqj9 zhV2!!S<#c8%tw+%9hB%&5{DFCl1|pOFz;7!8^CP6J}EMiQJKsD=nPUi?iPF-X302y zw%XrR3OAHl00#zl%%pA{w>2bqk2>`IXY^d9fc}{4fu+krW%brsQW(>kT$~g@=s*zJ z>k#>(kE8*DICvF?U=;@yKvgDjAS(sXTdX#GJe!HED0QSy;WG|UguoaTM5folz0vK& zOx%d2zA$40f~Wu;ble^N06%VgJOrAPcncqxjj2@+Vi1G?h1aJ$RAC1+GK1dl>WSM; zB0lcV_X`R%TU7G*=vrl`lq6%n+;QQi-v%erPO%o3%Irjpse!=J%Q}ET<c^JI#8qTA zP%8ZD8D09cab1NKYZWOn2D%B#F=4i{>8j$ujo1TyKlGGXC{lcoeh2e>=QoDm0;X>b zEKZrU%P__VM?s>jJ&(f>=M^+5V2U^AjodP1^f4(Y#+p&hyw3J!+5tVlqMKVB(47A~ z3hZa{EX)8-+Fa}{MCv!&q^nR~N%Z~2F_~~koo70xet?Drh>n_5@mup$ynYAfqOWm# zBTJy}h3s@NxsCtD@;BbU-`5IhoM8*sp~SxpEI6Rod13r{{kkIx>q~B}wZ)ZEdAfL> zo-0{yR3eq!NXHp|Dm-|lfnDU3ljQh3U7P1>IB->`C&aA5g)*8~o7Xz$H(ui2^tL<u z-on*A#lcrZ;hjsr*uDiJLTgjozOBe%{28IuY_MBGaf)l_!@qZZ677Sx+Pfc0(qob3 zj!OjmtSJ=YYBBQa{4##<px2a8On-InjI;umv3KwWQ4uIP!Y?&=F4$p?yRHj=!dJe( z!xDa7*+{y!kZq&4`4+L{ev3oKhQJw?e<yG1#+%}gX%1jZP}pI2U;mz+Mh(D)a#m2- z)%o>Hx#{^BPrb+~1Ix(bf+L$1<Y31|fl@W-&IJ1(N<T~Reqwt?PM$-OMqpYi{3Hi- zQtxqoH0sJ`od(x06JPN6WZ@F0GyD@^Nn*VQ3%HO_`>^#XdsuzYpw4@?T`#_<s4wcI z(6dQwTV@Beqg5L962Xo0o*Cp(E%LfqZSc&f(#iV{(R=gJopW*+W#k<vW0<=HaE;mD zY|<WxXm4R+{hi1NIIDf%Wd#Xq{0S_|1M^5OGhPCyrBoQptC)QPX6pL62>~_sLM1w$ zPAH|zEXyD;G7@Q0Sf<+T)%7!EdiffFwy)%v*0lsY)sqobs=vczRx%24LVq+7OOoI3 z)M#vABw$o@lz<G-+BJQ}WQE<Wq~$R5=GDvNE6gXZn-)W8++6z+@JkGe_<5HUcDTQ_ z(VoEr5XHma8j?f^8I>RY9{20c6u*wwjf%u9T=lK7Umf?U+~T=s0pma&dJjg1(AR|p zge-s60TU7};alEbN?zvtyDSp@s|Jh^AHxuTsIZ6fQ%(T{%T3%L?<zSMhw0r)IkHJ3 zV2gk>Zs3MRah=4)DTFeJiZ5CXWU=b>0E}q?>?gGbIT((rn8_Fb{@7!IpVTF_=$Afv zZX9LvM-vV3F_O#&zeLT$y5HFzd_)kU;J+;@I(Jr^H_p)t8c>7m;84gJF5eVM@W^C( znD;GX@rnC@V&fc!rUTv>M}e%uT0=BZLa-|g5Xyo)f81tSC*ZNj3UO(143TF>Kn)|u z1tKm5`H*0DRwf%0y%LKTtk0#uLUm!-WXYi7_Ky}ft0;vuMt?LgJZ9&qb5b?_i7Uh< z!3cMlh#O9qgOLw@VF?=izmD<=nVdxZ_+b?4Wi2POgQw<WCagcp39||QJ1|Ye+38MB zoEG}`HY>>u7ZlZLm|W<u==>EY%L};t=7-{oep{UQJbZMYIwZRC>nM2$%Uv<3gA5-} zt{m`4m(S(!U^HDC)$|NP=d{2&^zteBM;t6t)?yoJp22THP37(l*Ojvu0WlvA11Rlx z&|4w;kjh(P8lu+}VAb|p{Qx}hWnx!$Q7t(H9fTViH3n^+E`$QS6ju<)dTtsmu4lG0 zx2N)cqY<8|u7du8uF^N%Wf(HxHvji4(%1T)5qW^kxy~6myqK9#@7-}ezN#VP^l74w zxKjm^(_P921@r7y(D_-TGB7cUvUDx>h#Hs(ic!E+T)-2o3srufV>SS;*g`_`iuZx4 z4?v9tfDpZ8u6V{sZsaZ_4jiIzi+_Tept?986CqWMTo!O2{ICQ&nXAxJT2wVUL}cf} zh1%O(NKS)0RMTb7(1+xM+aWa(7_y*k7|i}=dMaGNIpyi{&r=DCjLzaN>Kqq_a&Kiq zSDAM_q%z|G^WjZM?+gPzw$%%odcu}w!C}zEWers2lLHW$+g){thWhQu{yYT)=!Ie! z!ER^IGjf{&V_|A2cG1b{Kp3?Sc>go_n%)Q`<a#a|MZE_`3o`=eiKfjE*69@@)19Tl z0|rnJ{?%ANsRJ%^G!)+bTg$Tfg=;fFiVpc`#XZWOHvHGOmi>?zE&*5&lO36zFK8_$ zwp&8R6Bm<^H7qeK(;RAS7i=$tQ5TTw1vJiIJPj(pcG>i?*Co0_e>tRL+2f%(0ZpE~ zyaDH9sNKnUpC*HAYGhgF)x?)Nx;m@>{*>Vrg}{bEUiUCLKK(gDui@^|CxK_C#L}3q z1XE|9Y%92>8v=4(r$;@e7QmfT7tXBoja(iPp4Hq~i$qcT*_r=IwR*DQ$!tmmuGE`E zl^9EB)2-iOdzK72ub0JnLY}fc^q&7x^3#(G@mxD-em)!1f2b0xU3M(~KilL!uf@@r z1aLTjc9X8B7{nR9=y{m-$H!nG!|k@iU?<}={)du99e2CMogI{4n9?Si_WL2d4(<;7 zM@;%>lP9IY(;m=S*lAQj#kBGdWl2a7W@^to^npW7YzPY^wt@2T2+Fz;jO+lFSnA~g zfFh%)<rZKNTkxE#qI0cFG@`%lx-f`42VIG)H@5(&Uk(Md@*meSo}cy0Y5J)8)c1;{ zgP8KkyX2<PSm42qg_I~WwDXtgLJ%4&ZJwd*F?ibWxAl}b6L7;MlxDdk-oMr~BYIXF z2YZW4uso-CxLJ0qX#0nIp5wq#m)=o8_El+`dSbOhPAV4k*?E0*ctF#r@@{L>xB9kp z;&HY-hZz8?KvL<^>J^kjCEe@QY5}qqtV5U=i8*_$pmHd`mehzczVB`=83j534}<Qc zfs%Q^2=LrN$$TQ)E9nJxI5J!pHiWq*-65x=VF?tSjW7+?=Z?DVO<=d<Hs;s#wA*K0 zpA~r_4n|7~&(b0pjM|%S%78o875VQB#doXxi-LC9rZofe>$b+O(Rx1rt+cdpYujDR zh@nOZiG}d%E49b5j8j_={q(YRtXjF`v>aj|JQe|8#=S|vIVG`){C$hm+WLCo+IZ3G zoE9IJC9-_nwV2=Pfu7hrjIs_q(BO1ersJ1+OR6?nVwnM=kMmtwa98jV6irg9U~PUZ zB1wwnyA;eH6q5l4#MOC7zyl;m*z;1lo&0)1!^l@mx_z9JrsK_6V@gEULM&$4#t-VC zKIl9#YUZbYvmE$V+b~5hO(bD(UrYk?>yQ#v(Rueo;%?`1{X|9KgCFTKNto`V;f(0b zh#>W;*%p03|M5m*Y+<T=)mg%vhSxR%%FiwGhTi<-gX#d(+%em6-E`o$=k-TTzY&>m zQ{)yPDbt90#2XKsX@z6AJ_3(XY3ri`p)3Y4z5Hh{jMuB#_=f^w`gT03)`e^FuGCUT z;jYPB_s4b3v0+msyfA$jAZ%fJ*v=2hX(#P;o}NE6_-wzNe9)zZ1769~m4aTp-(4q> zy%ga1g88h(*gb*Ee$J0NnJd(H$Sy*CsR2CxLJc7{ato3|GzP@|m8LH}Ox+g15AN$5 zDRX>G;da;?$sCl2EGQ0;ABSwn)aDhc(J5lM>fEXSS`MDlbl^XEd9LBXczV&&eSSlx zNj_C#@ADHJ?73jB><WyR@v=|=!x!DFEwNlMd1n&9UZ|NQ5F5vcg-7k_J5_8>Zh?_0 zBM>NqL)HQUJ}egK)N?`)yyH1THil15q&FI7-a}lmlEY*g5xJ#vUmm~cwb$5*GS*tF zc=ALbHVqhoiEWp4sF5{&eZ_dCLC`+h$K#cMu4n6V_lB>Ls0nQ4ZF&}jmUBfWnBm3% z6<AKtY=kj?CBvSg9@~s#AY9{CJ;LVY&5Zk?8^P}bF(ePs^hRs;vx$TLaD#96XcizS z0`or+8!3gegylg5soYq{pkNNUNm+k5I@E9M>n!jPL2f;{w0T^fY}3R`j5~JtFVS+a zpSr-he?$5;!LwS5T!DThPtW4uA>V+5>ZlXZ?ye07Id<2>8j&&{-59J*k3z!FpmG;N zYENtXEnH19{Hr*myjwB`tMwW!Eo^z@CGcB~%*S-}T!&#a6X)Qpd>>&sVYf_2X}glT zR;^?9M{gU$Mu(~WHe@#cn1g9f5d6pMhSJ!3PB4U3srJ)MuP_g3vPAYPJZmecAH<0v zss3jO92nC;r1Cr%kdJt~?*DIB{mu57(mZjn^iiWV4v<1F-+p%?sGGr53ewq`tcjop zlr^yN1O{dV<TkDgkACbmXP_aH2+WuQT%s8CHCV*IYLkqHwWjIlgF0zh5Mwi7jN^UG z*o}6sY}r1gar*?sgZ6z=uqW_46^z!Uhw#`FjE0SHW1xDLr0TF^%cLnqj8cW6Iid2_ z4=3rT7dW)2PSc;HLdcK=^ML!(pr-Bb&vb-U;WpL2cl%YZ;6=d@V?Z2+9pbZRu6i;? zPs<+*&%+X2=^5x?ZImvhYaaDn97N+%D?k2-(>T;TB*(K?s6|_A{YuEyxLl^JBZuim zW3dngSDlXcelxW%9M~;>)Cw&4Y^A~4EdIL<gy-F@;5LW7gP~`<w%qd(3VhD5zcK%I z-IBKt`S-m#@r2%rI}!iPKs?Rvv#&8gPZ#&L1%5AaZ6;>n@`3eE_{{lxKh@!xz)m-s zfQEI~Mxm&IfSwpV1GG_K!~yn~_^)d{;>5)wIMh8|MhqMv%L$MFvhILJP?0gSKmHRE zX+(egGgGW7q8Clz_Ql@=RDJQF9_#L?6gmZA`X>=^qr)oTo+(xm;)hkSmA^|Pg7s`f zC%Ti5KYTk{=Fu93+7I-h%9&ZvlZ^P%pKosMxWt@*da5<lzYjk8x~a_Qk52=HVa}QM zNtX}jWc5-e`G}{Y?Nx|nqgRt3dL7(>X_*GOzc%lZGy05G;@x~S=q)!i8f=L55NUmV zS{iKQz@WJxQ{u^pOZ3VJ-E4o4p&d4<7|~G_xqMC>4p?y((YSTxmSSDb<-c_3<P(^z z51+VE@rPeY>+cy<_%Xd^o7@!D?|bF2C%3J_LUyj9N+wX{0qDHeQr|t?KuZT<aew6l zqpr!aBge%z<vf2EUollD^uA{~^8aa6vFII~-nfXixj24T(`~-lK;t$~DEPc7<2m#f z19*L~9B%BolEnUd1k$s5T~%+vo(*{&d|&fXmpYhX>t>?wfjB^cM@u7bp9p8a#U;8c zbs1|*_Q2NM6v7z*ceHq}4zW?k$S;zgkA?X79h|S#iFd@m;<qe6b$lq$dLc%Ir;#r{ ztGzdDH=#Cu_EGUz&05rPl4_DLLu5rC=0dNdn$6Yt0ksXs@sB~OT8(VqJTJEAuV3^u zxqn}^viw7G5#Jbj+`ti6_7b@?9;U%#F&|F-qOP6faULnGfKJyR<6e5McQIE-VRv8? z+^Lc%Y<2pgW_vz$Dd0pgqpx|6TZMJ(<yetS@rrtem*I<a*hotgfZ;yoLgnse4$R~M z7B>WkK5$uIT_f+qe-)FF{q1IM;Dy0s4(N4Dpe2tJC`Gf_cflrD7|7O1(t{}$)bV!l zs}d~y67A4EAC-nic04H6c1)@V2g;qX;07te7fX@N_HM8%4eVW5Zk}p49zjw~TuvPV z`q2xagrP#(SsAm1GvldCja{Dj;K_Nl!Ctih-*nJ38h(9>;gHRxlM|47{u3{LtC(?S zhJU%#TAXvGM}_J3g4&vP83(z{iX+gBh^C`@IG>R4%mexgB!G#B(!nPHfmp974-}`M z`S_)I{P1fkaGdyTeb7vg#T+LS;ImUE4)Af;#_NAES4G960V`RqqSc_ZD5kj?pq~!g zd(4FQ-Z#vK^A@MLLRZI-b$>4En<0pRhYj2qvTW1$H$wmc`U(|)2J42P$b|v{GDp7o zofP1^t;y+AXA!ooI=*B<`nVymDbnRBPmXs6M7n;rMM9;li9j1armB4TMpxxSduvS- z`um86RizgN|9+Y@*7IWJ+Z#KJh~exG=hPsO|Kh(%Sm=-pkl6l_3|dkzpNKkH(R+3y zu0v1XU)3aQhIJ&6<&hkW_>;J~s1~2K0ld~A;4TDM>%u+9nUj&>M}sQ5CG9_Ipn6w# z=kz`#ffY&sEjiMnaS=Z9>bO2)Fe5bUV6ql3_v>_R>=OC0zqM(y$GmRfY0oxTU?3Q3 z+?`RsHiZbE;vr!`=NJAbE)74B0H%%&_Nf1uk!SqwP^hbj*ff)Z)Dsip<BTIm6%tzp zc6IjVvagNPWSU0f1wca%;D*SVZ`T9ybnx)t0LFhM+&ES*1>m@zrok|LPeAx=eB;(e zSR)HZ?CbBQx@7+laHbV_<TJCg@lil-yyy`a&uDQ?D=D_!1J$q(bIM&j+th1-i}3e7 z{Bjq2DmkSMWF`Z+Gw%mVSUoR}8w+8jyquQvuv}uaYZ21MR=)yb#$Q;S*EVkQOgdT! z`xcC9Ug_NOD(MeNXkGka1bpJ$tr&PZ-N1%#%#DlPWRFr9Nx_UKG~t@=gVEfK<a5TH zxGKiwi#5^Is1t0b|5fph<>{3B$t2OCrriGwqUXTIb|yxVnFu$1(LeD<+5OnYHj6j0 zPIqDXlE371v(9DqL!&QI$tTV=ot1iAEr;5)mCAf1#4*60Y{571pKnock?k9imvJc@ z@{HDo@EZDZ_Yn>-oGMHiCPy!C5&mS-^E63|%BT8bs8+-F*;*+G$x#neh0(LnN&F3Z zq(q05nUPW4Aot_r|FUrZxfo{=J9mNDBYTJr&m3MU6#VD$<dlxunwoE$F5T@hW<$uU zZ*G71QwrA05-YFtsfJR>(Y$j-qB8V|NdiqI>PdQ^fO4+>z4_#HIX^k+LaZ9O(rE~O zGAlg)mA`)fMcF;1m%cT3G4U9|$8*Sp6IiYSR?^1GuaN}Way$1o=yjY70WbmWyi562 z-S|~Qc2bjNMT?L4^TxFl+~YS4Y55+JW8*+bgdemJCpyH<93H9jZXsWDQ8OOFq3qev zRtj(yq$`rW@=(neG>66fBX8bMRnT1^_b3ffTLPB_{Cmq5$EhL%H6f{P_hJVgiG+a; zVpRc7b@+{8x8BaOL+Y~kJjFgDTFsCBSd;TYME~_<ph4#5yV8Tn4dqwJ>!l~nPTck+ zHz`7e*gJhE-hWDW>P!5+^a1|gv?2WeM?D=>UBZ+9X)ZuUK<`64Zv_I@HZeh{^wDl1 zf)}#*EY@Zgc<j<dHl<`x>b<|x!hzY0%XOiwXRItY&p*oPOe#evpMeumSg8?;V{2C< znl^jYOAT-K_LrzR8YUN+vACe=JnP`=^+hf4Tt1+cu>q>=*q%~M`0Sv=cn*k-9tmgK z&#PZ6cy;QXY?v-43AjH}EbVZ1No|*H6`E7v-BfO4cLw;nesc|gIM}<a4}u00O<_Q? z1(2MBv>qotD;MJKr|&XgrwdKaZ*chA!LHYQ*M7SA912*m2RNbHx0jJjbM^^mKMOCG zteIZXr<WoJ2w&N%(PRtN4M&(WaRdb*UIGPK@%&_km$ot`3v=Q?bha%+W`istfDxjC z?xI<OeUOKZs;4%JUtFM=T^^=N7UW<de+#R)go}>L9UCd@#Uucp84I6s`r+ThF0WWQ zZJe1*I#B&R{5P|RIH-aiz6)Yy_VKQnsm0kE#<7pLeeOC&!S(Q0`i}=w?a$lzg#7V0 z1~?JQfpgv89lS@;EhDHcx9|-Cs1ZR{WI$PZY5}i=BTr`a>Yjz!DgsIm-FQ-X=bnoL z06MhlBvy2sK>*OuJqy%was>IU&~rQ;Kr~*&g`*JxohH^OS53~pN7JpW)Q*2l`Y@ja za5CbN-zo+G?9yACc2Q4b{xAULMw*^?R{Az5iq9_3yBwq3GAAVhwYTBq5xq?Gcy6#^ ztdK><PD?9p^*+zL6p^+uhL*_}9sjd|v8_Y)K)vPEcJ1gnA1{&I@Dl*!jD_{nam9)! zU98SF@L-@T)rI(M7!;5Rf0Ux6cMVfFAo?p2euj6OQmBsv=DoXN1V>LZVzRN}8v{cQ z4#5i+cfxqbQQ!AONpmznY?-CnkP{%$6Lk?)SaMOu9{YF1t@(Ml7AL^VO#Xa_fozKa zw0M$;=I!3F{LRx+ed>sCUHN+bm@3a?k43Fzu9P9oGYnUQiUtqbPZ4~tU^bh0k?JQY zb?;6_PA1DW^Ag3{=$QoG-X3omT!sq6(^p3Q&P<`h2PXA5oFF=mK#|A^?D2r!5Uy$2 zFpvRh{Zq)|P<^VSxfC9JWvOf!w#@Wc#nTY$>7nc6FQ42MU}~n1tCbnQ5-UqA^<k#4 zyz>uWjf{LU=!YsnHH{~Drc}j6)ta>HJSl08B;}P^Ib;XrpgW=(P|L$%4(uN<#Imh? z@z_7x+8p=3!f&w7KYQ~Zb>Y;e^;w^T27bWzB&^U|s;?C&zr`5AEV)%YR+intXdnQ7 z;=s8UzIUP{j8~MdAo2%C{#m(Ci4u}2_jy_?wG7Wb-m@iGXEi9arvW$6Sc~sH?=}U` z;wmqa7bWQiQWz%3`@4eKre|EYZ{!UNnR)0ngAEI#8^Wfv6KDEVD4w4FjBd{lZNI=k ze+}rvM0==oW?~T@b<y~`t}VsJNS!06&wxLYx{Nvygl*O`_~x<yM(}_sg-t^oL_TcC ze5=;NZE!(x=>g_R$DT&SMfY#9mG5-G^qMW;Cmr<&Z$#cMOX^E@M{u<8VgsFk)R(1G ze1!9LI#@Ts2gm9R=<(;1S30GWXkn(IuhSRiiqrHKMhl+#nEDQGx;(z<*qg3a{;ELe zl0k*Fuaea{yw8N6#KETYXo+RHs&uc1FQrGp@QPNtf4Y_9K<&r+n0gh9yX4z4j+Sf_ zA=6PAE++st^sYEv7EBJznYBtd?x8<!{CQ#SN0-gyG<RCL$!}P4soGX+D)|j%*M#uN zb?Y=QF8p4_>jgR>ulAiuWdmd<xePp6gd-d-TnKTgQX@E$>7e>$CmCJ9l}YUur}CD0 zlly|&^x(8&W)CwV$_yfn1EnnL^WAk|2~=^+XiGC@LuZ`}Ym`-`g?}#T&Fp<}`^Y*y z;X%*%WQ-L}<uF-J40ow?P>)8vcI$1io55YOBuqM3uFdxe(P&d0(RCRAj%-pOoXLs9 zn)!gYLJ0L<j6i0ZfZAtLX|tU40O28^3OC3JDp^=@wAG<1?+Oq+9WcRYLs;ZVfgPzH z<1Mtdwb=<4`>gA`mLtp%_sgEUN?+eI{I=xEvg~laNzRfb>Uh#aVKnhf8zx~WZtK?s z+<CmD4dn4n<i7Zb`&U##*``+B4i7{0!25pN>5o_ev<+wqSWRbn8qs_ttzX!}4InnJ z@%o_XcYLc!bCMOESDxz3S>a@^Soc22jF3>fuE<P_|9<OC+WUj_8Xq<xl^dTD%ZkJQ zuD<_%BQ-sfZXCP(V?HyH%346%T4qdAu*Q#fSGgcx7R)ufpILGCW$GIO|5%uSa%vF7 z+`TKNq^B6c4yZwNcU9qURY4EBU{DfJ>&cLvNoP=K-IIB)<0+W465Qu*;=cNV^{<Ml zz~--6htszfnh*eX$lr|w_TEGP^%99!$dOuR19}wG)HXozWnQ2fcqwB^yJ7Vd2o2fP z-s5gC<PddZ0K2J4!axHxFhui3gO&H_qZdKJvG%tw_eu#d&jPw`aNCFOUbFi<GD!@# ziMK(;)*t`SI1!(;q6Q@#-HGY5%k8D1W;!<t^4MOkt<G3RLaCQ?<b3*gz6*V+oNx40 z8@N!cqm<X)nYs{NRQaNY#ika=zqzt#Ah8{Q;Hcv?&IgoJ_gY``@|~9z19$~{NaLv| zkIqCrH!@%U@y90*z-p5!lYqHw*EM|!I>26NeP>f?mEpW`pZs^h==X_ndRB@SyMkw! z%|G@2bh_<&kWaMw&R}`V=7Kr35WM_&x)rF8H-F;by^XBm)6gD3CXbV|mY)qF6m;8H zN0^AVCC2lQ`V=)@Cf#J{r{1jkm729NsM2o^R7Np)GIV*F(BWck&o>5T|2`rzYq`#S zM-u$1fGf<l$@PocC|1F__?paP%?4;7?h@l2L|*UBq#KNY4S1)R^W)-=s@mHPzfgEn ze%Y1#T`xl(BaWo|PN+vb{8Fz_i<_suI9jc=;+<Ig<}+4`iuro```FYk6X5_vb>(G{ z@gIj=o0XM@_vHiF_tYY9!JH3&kL&><<+6nK%7KnWqi1M<8F%5#Igf({=f=`iM4+w@ zO~=Zsaa_2b#H2h=dxK4e`T{1I-lC`jlwh~rFTY%0-|M*h(K#eF<&#KBOjTwBo4)eC z3?A+ONrUOhdpi!rKf-T0a|6#>Rs`GONIJ&&zcJ%6IL^p!;Kt=OKD%dAi~o=oEq1#5 zy-kaqJyYK@nwPgkwqA$KSkbmWY{iT$`45*|Z)(%KvF?v$4_j6Y?LIvh#{dr_E`|3< zP6gQM{Cc7>7q*%eaeeLH;gZN|Ps)Xsj5oKQe184yAvt8#&(*o{YWmL3pV6`)GFzl9 zv4_{{m||ug(5sTzWifUyZ{?ogF8-I}?Y^A1B|p8*t-hz+pVF*P5GlTtn%n!Ns-$tJ zb~Nm@;inm_f_%YlZ&)&%mbZ}`nvqWHZ*u!5G*wMHvnWE1$slznW`r$AhMmkbS&y5} zqlL8fe8;V9jMJ<FD@l7FtEU9w@oTrE)=#WH=y4Jhe|ulVZft?a81cSv-Ie#2T^G-1 z!S7W+IB~fz^4$M)rj&9Au-D2yGrw&T8<Sq}Z>M$h6=`EEuQ{0Sff|vfmWd&*!u3R{ z%e3GO(oto1K5k_@I{MGyRF13DwoLSTVx9ac*-vk~mA>@;_0szB(=89nfAqy%Huftb z6ZJhm!d3+;&CSMxZMQM(WLe(Wf{X)$Nd3P24l->nb#H2(y><R>^S@)O&XAMpu2?tx zD8jXU8q|)tgAECjy}t2sr@K!q+#;_sSy2Al0^3yeZ2IYX^v%xt@;ewhZfKw$aghZ( zx^1N=JB`#E_5NgeG2v?z!=)hJu)IlHDQRU!mUYwm5#q=*J4R%8f)9*#8fY5Lo2>{X zMy%hh*Lrhs^yO!G`(Ib;C&n~81x7;*PVV@rj{2)dNz&&w2^AltFK*WG>9$-^bLx~j zZZu(n+<cb)je(LgdESZG)uwb;g)J(!pi=uTvGUR4c!+c0bRRxE$?>Q*B$J&ABho_n zsO&jNs>nJ-8`?1bW;*?F>S}y3MVA(M`^k<MIK-HXY0JnK+jt<OPp|l|)(q<29fMuL zIBS-oQ&rZ6F$lyGeE0F?<J@zvPjTxSPsN^=PAYXh#ln@>wkOu3VySZ+_}mYsoO6Tm z!h&(1-X^L_H@02F*6P;k=wB(e^=eA2cu%r~g89cv3EJN>d6hN>gml^=nj6cm*dY8U zsgM0=V>FgF)Ect8Uc+n>L5mJD7g2qGHJx^=Wos+~sS<laUd0ak5V$q}m51)+J`%fD zT{%82yRz>J$VmVwo%mEkk@8&0tA^LSd@TGza-Ni~J~O|il3{&Pn85VO;o6JtM{g?5 zUppRwgc@b1zgeJ&ktFvh;P2RYp7Ls?LpUo3CW7gQRD7Drib+#`Fjwdw`EN>=^2aSo zPqh3o(G+uv`s7ioF?y$ydz`RpI-gi|F?$e6v*Z1t_bZq0Z=BxSttE)|a0`9(P@7!& zaH1t$#+9~l?#a&0!Ke$$Rt+URH**%4q%eR?3>{roiy6Q7Kenj-6E|Vpy<l!oIpmA8 zNp@D(AY{;FAmO(0%0aWht-ndF?s=^v=@Ww|kbLJt#RF|7jz&~`_5om1%ad}9B|80B z#{<{?*-^HuaH+b4#os?~JVr0OzkaCk!A$Elze6$-Fng$-l-TZ}*;QOSPmiUd+C%c2 zJXqt3^On|QvH~x{Ik6km#LJ{%3E6%7M14ofpkr<S!Ot&>yIu1jtz?OlT7qeh`Q0cP z`Nwme!n``);5O#;#&@aO3DNMqbR-b5&WXF_xK-iURDVwB)7eq@9o>?7;4v?yVQY&Y z#{t0eU)Kn`R=q<bFYsjHnv4qe98B)6yPFXbhvz042!X<|>c^<)tow8z7)WAX@m~;K zgm3yQ06?bW@5`S%(?S;KM-f}y=M1^dKKf;(3Dk0^;g3qh_E>)12pe8)kiP<R)BdnH zN=nTAmbIPtEpK+C(qVo}VCw@rRf|Fk>t>#cQnFgRelRD$`oc`DWuo}W+}*Z)r_NZK zUnfKxI74pJK^#p){+SF((EQcmr5)wxx|rh}?q3F23u!R^R}^)Qe`{wC1J3MzW?=(< zW1zwp4Co=5NEAf<e8vN}AyQisX<0rWoO-JP0evPZswZpo6IYE+zhi4x|J8xWbORGW z7Jskz8e}x7)2<@yJkHuaKS;bniW#c!HM)=4PmNxvIli@CpqpqD!0zD74szRDF-Y8O z#V-c`JQ>54V^{V$uC1eUw%O!5?d>`5%C-|lU)r5Ey06i<S`!m0#)N??a=@}PuX*@6 zbc0W^SKO(iHy}1^@^#h?Fa_aEWUNGfKSy_c@zyDU;71j}%coXK5UqDA9oW?s%p~(c z#JP|i<j`Mz#Fx_Y>Pemu#21RsUA7&>W`o%HKLh7X9zeizmgU9b=T5)@Tk;Cj+mWuv zMO+<W@)Cdj8g8Ri%-zG+?$uQFoFD4E>D?F5#R)_iv9-b;p%p>Hf8G(x+ZWIv&V2Jp zWDFmbIagsPU6^v~)^nN*Jf;<?llN0oSG=jxhLWKuOkMmO-{y*UX-x|cj7*<*&n3g} zJrF}(8Ly>7LoD7AKQ36+yi>yYOt7WZ0Xikb)z838>8wMQtkL=<2T9=qYc=bPdXl<Z zX<0%2g#ebrFY2{sDN7S)VfiH0o#Ab>RR24o#6FMDZ;EnIyoN95KPVE#>z^Mxa}~JF zq{PcIJsOQbBYM@m_il?X=phXCaJN?uTtBRm5jA>Wyj%AyE{8fQMoWRzoo`5*lOtu? zv68$RI#7OnC)GGCRam}%KV;=*p>MsN^D)0EH#DJ9_MhRmA&U!kgWtAa>p1=1bQJDZ zkHE-YISu?&-w;<dZAZS-*thiAw%8Soy;|FLLsbx7#ulNiK~5UP2OnEaEO9c+A+@nl zU3=M&bce~SbA2|eFG6G%H`j=<@FryHz1B;|0-!8LEIoIlp4#(@RT|#@)o|{0S&~Ba z=8x^XGn|FwjlW$^FRpjREVWI^AFtFq)?QXbUcEEG;rCloX@0Y=Gi!j=VZQvh`w#zN z1P5|XijR)L%>#N&o40u!XRx14@^gmkeUI+F%$>zQ`nmJW=wKAWyT*TRaSXg3v)8Uy z%S(MSAUfly73pxU?W%go8&;EP%^x4kFgRUYnKZ<*nNzYniv~2|F#j(!P2DF?^2hrw zI*pGww)h=d|5)EYJ?FN=!*p~_vVHo`zxF9@O`W3Akei%8F$w}xrRQ(L)-jOuU==Sx z&j);4v0r_8<P{#7SL$&ydX%)ihlZ{q--iz-9IN5l*e_W0c&#M1t9KX}OZpXe&{s@y z(rlMyqjs#viD@r=W(e9JDm7%#6o64kK0^Pm;3#w<;fvSlw+k=nlZ3ER0*|EZ8ecSd zqp{kRw7(`(mI&Gi&zokwX{u$*{8m?dOsGCxc-z?3w?d-*e}w35H04)d{_Q@G^@2}8 z(q)?uf<RT@>65ilkCdO7N@SslUxZ#sLubMc^B#z-T5o;(M&0ORIeHjIjJZZv=bc<m z;uiZ!U)X;X*AH~22$~BRwKPTTmp)x~EMHwI6*2+1#GyxFhy5G0sFQX3QyVCqwfc~S zDq83=v&w<Rz)}W&)*61)G4P@D^n^ID|M>=Bl@9!0w(RKGwjyPN6Bv#{6XuL`So29v zOuIg4@=;N=cOb$UZ2MjZ<Z4XF!=vbDdNJaH4wldaaiUXk^U-hZBTtIh0z|8-xvjxR zzoONPe#P)ncOCGLZV!C}`M*BDw?JPj*)F}_`Ydq!rV}g3eZKB}z}%K>e2k40{W;FJ z&P{)>^&FJ|K3(6v$h^Bp=jQ(Nb4hgzA14%IkSkg+PXz*<8C#fLuap4rpPmD`*^ajG zBqx?#_R|}s!Z3o<V{VYn`lT!St@Y65Np1`A&OGfSso~pg96ATPjRjHa2%E^3qpbqc zDx6l7*(QdJhDSe`^hEeOo!AwD?LMukq1-%1Z?(~Be-Qt#os}dHp5z(QEY14yz-$5@ zPGrk`#YKE3djE0exJ4lQW5;XFMvQ$e)tlWgw^#29zr9ZfdM{MAiEr#@x5osDP$WIr zn=5&#$<oHGD#FV=nZ%IzME!tw7T9SvwCe#jF*Ma#d+jspIbgi!{S~sB@<nB}(d`G; z6Fw3CIQF5sFox9d?!O(+N!veNp320_zg2uL8fO9c?IUdTw)U4!SGFnc`k5hO7N;~r zJ)A=P*uX0^R>pNVdsIM8<a!CDyv<VjBZSpdKY}y5rj^9~$PjP=_|DSHwv{o{#UFs( z<@^-@A9oB8C6^r5l|AF#Hp~fAx??x>@<h{yuST}tve_iRu%4HFPuO8%+_W@sVkg)r z=cQCL+%C>lzI@f=$H+3{_BrFL?xh!k$GysOL4in3;{5x#Q}IF-e6T9i0RNd#|CnWF zqCK!7P{vpC>zKsT@=BybzYR)K#<O&}PwcB}m941N>FptsXY|zB$IA_U;L*v`Ry<76 zAr5;8n;X|-o|0E555gs(h;^7A8?~Zg`u&b-pF&09so;MNepPB~@8KlE^=%1DDS$Zr z;qKBYA5ek0>Y9oakz5j&cI`_1h(jhY$H8zXhpB91SLlH>z?B~u@(ziP96Q(KsS7L= zchp^!9V*W#Q=PMt&QhY3Y`yxKG<`0nbGf&WeRm#+d2Hpz1nRASum)btZ-tzCqf9a3 z#Oab3;cb5%BsADOuB9~S>az`m{PkgYW(ZUMB1UI9cvJ9sV@MmFQwRvW5j|^h9-c|Y zNO2&esn)$W0vs*vaF(1Fpgq2kLAr|3a!u0*Bgb6vILbk6{i(kk$%P&4)~`DV6@cRH zAqQqXfoCtjhDF5UJ&0fJ9u8?ylpI?}4%`-CF^c%2qZDy*B44g%*}(Q;bdL~zV0|io zrq@ngwb58+{9H4ap8n0TUc^LZww1PQG&NDPJ@2^RN0TKts)?HST*sd!w~;$eOOg<+ zcya2uc4eClC1gcs2<>diw#zqAbEvS8&OUe7Z@9?e*Y_Fi^!}*PYbR+Nr^tB}(d9#( z2GaG2Wk;upOe1>RRp0vb^E$u`!J+YOnDVu=gZo4R0O-x+e!WkRv`^_PC@^sXb!)Za zj7ZH_nQzWtMYPGmdR1Ec?sD_b(i~E0b~DX7@tjKx@0q>~1~s}jA@>t4>_T13?@hnz zxV}E_bfzM1X)8~*?mY)3<f!j%9Rlmy8aco}c<>jIJsmNX*S&hiPbRQ=F)Ef?Z~QvC z=G;x{_?wDTo!7R$Sxsey`7J_DHw=&dx+IBgUr0h|lxxyiPrh_if!7&t5FgI{lpDl) z%9#hs?rj4M%IBr?VY$Lh2P;j7u)OZ?)vkxGk)<`Y57D?>4U^H5y=sKp%$sw%2w-SW zF9GyFu5MvH99_Em+rxAKNjt?AQMW_LS<&?-s;Tfq_9Bj$dY7zGZEz|;?Y>Hydg3~u zL<_eBsN7^tGO2fS*4u5oviX~u(oU|z?#aa`s;FBItz)k*y=j4mI4=eI;<8MEj(e<4 zQuI>q(}&bZ1P9;qAfLsKbQfkID37KOySQvLLFXt7#meJ)eBZLBt0X2`NMOjqzKckI zb(8B}SHnM<c)s^}&`8F6L~K=inT#wHv9kYXIq^)?n5zs&12K(br<>To$z_PPOC|GB z%4od|ZA$nZ%ImVjscRaGd-fEI{zQ@YYoCRfQ>Tx2al1%>SBSUl54M+o(kaLEYMJ_N z^G~{7tuZ1d!0w`@QR9TmtABUTw?sNH1g{P^ex;CTdubVcguI2DZ6N0I%LnWNHez_T z1UcX|>8zHqbK3euCg&nEQ6la0+vO5!w1e=ZSTVgePR6Upr0g6N((Fd+C#}>gr;#y> zYJT0!M~b>&+5qG3iNdIzQ{{T2$Y?>z4yD~m@~6&fjp)?<AMA^1te^9bRmjKvh+XdE zWT&Uwgn^@raAQ2Z{iu%4B@SYSyU=@(%EX~tQ?1dE(x{lhrRsCKO=ORbbS}SFeiXag z*JH}ZtQn6KJsf7AM1A>P<Vkz?qhw?Mpoh$`o8_wG_qTfLekH#9$NP3&B{5}Z;=@>r z>+j_0pvgOhme0)Ln(U4fcU-sMD8E_S!0XXVe6ej_b6a$tk|3->-s8TXHo^vK6JtFR zB$K*TWOSO{H>P_9B6w%RzB$Cc`)8DI3S7;-KFiRmI*h)Kp-5J=tAyP5d)s!+TA+Oz zv9ZsLjLB20NEe4bQV;2__ktw;Xe96N;JLM2#p2lvy$2paE)fjU-4^2ywdj0ZB%QD8 zHr^Vozk0t`FKX~nDf5xig5vfmr=v<$sLgAUKCkFJz&jq|z}X%}pV@6W)<$vv*59r@ zJHB$z^Is38$E(XY5ty9O=vm;`0|k0_N(?b?yKCC+Npwh==-j)5X$3**i-EPu%J9Q^ zL`)t(B}Du1xFmEs$ODXo$xTgHg3*qYi0ljv?a$X*DcR#HqLxuRY;hac_?p6%mB9Qq z71tqxew`0^k6mnPu=H`MN9*A}yhZ*#Rc%>dsvzwCH<I4m3^$q9#C)VGv-`Fz{Lmd4 zbAl4oE@lC|*gdEtvd2%)W#c1!ZnAV2@V@W=Mv6zYh{OrRuG3quGU!y*df$ovh+u*> ze(YL9_c8r*fpEN!D$?wJz*)GH!M>{ee)p~<1M$nBwwd<#H{Kom9b58i_}98$Npgw| zo+k2V)BSBzarBFj^s~Uxz=#Bdp&n{cNZrFz>qhv--B+zg`%4*2xg2~se3_;|>7FaS zHgx%Cn2U1RT`&u<8WY=CMbwxN)2SsyZSSvgG|ii;x~jH;S+S;=8!KXfSK%$H=R9-s z?o4Vl8*F)4Wt~H-g6Wi$*wec`#|SNM<YS%rZw+4D$y&D*g@<tj5Xwa6<UJ2{y7EV6 z_y21ira7knv8Ub~3Q+X@M3tSjCgYnt3rK4tvKS(*I~);nIJTsuQKu=gTe;ajy|oEW zY1?J=ULC5rG3MyLw$pOVgoLDZ{fxY-6XZD%ys43!blSaJ<Cr`sRgP4aC-^=^WLg(y z_jk+)FXM!e;im*~O<A>VIzOWJEioL<jT-}}qX2!_@w-L~VktO>)LRCoaa+vKMS{{U zx}f8ZX@DG=@?g?|Gh>>l&Ug%)DQFXzW@NVhZMIft=d!yfuX;e*EhE!=OAqrusZ?|k zB$0x!*{}xL=^(rB)jT1&BqtdPgFXHICyjceiH<$=Sj&8CCu6%Vik~`VqPOu{PkZWG z>n*br#=e%8)BYW-1(?Zdeod?x_^AT<d*p@1QefdO1fx`+XZIC(v8>I&(U5fy&|;vc z=?Xa5Ezdi+lx<m|%tXT?*&#{b!SrQ@c0VB!^n7UD(<xSfV}utPoX($f$UayTfmp;p z6|6@(;T>TBc_pk?fSD09D_~k)f2r{3B*6mENoviU-{Q+8O>2vP=R+P<lx^+oUk|ZM z28?sQOjkYxcExD@3^5Oc=gW(B%ug5>)HTuhzcIfWK%rbq0Om*UUs5ZK$eDOgIwSjp z5&H~!uvdQZIwNEu0mN$4d*OJDBYK}No*CmKI1V@0#xG^ii#G4g5upo{dy4o*-eWx+ zzz&(8G*)ybW^|=#<-?nsKVFK=j%OA@tbfP`&SCUIX_SFN{L)52qSfnPT`I+w$oM+v zSEQ9^3YBe{%|{0984joBj*4D1%eM)hH;&O`IVzzC3nk6!mq?^IF_kwFgqjn3pQSk= z<{N4c%C2ft=uubr_P-w^qM?CB%r>`h?7sJMjg%`bQs&^ECr_8Ew}C~uJhK<Lv`r-8 zTJjMq2h*Ox#58}F7%^r57}c;0!(}WHRc<iY-((3Dhv*%<B)xkL1S2gcsOxTf&d{`d z6R}Plo9<%7@iXN0|EcS{0-9)}Z6}T1M5I>%5u}44QW6jm1;tJ;N|z1-QWHQ$qzX!J zHc;u(YXZ`wD@cb#X;Kq<fRNnrKj%K&hx?K|%_QH<SN2|et+hMI>+f=8-~AD;lgOUq z-hATTwq$ODj`$a&itt_BTh8{U6ggAh7gNL8$VmN!osWkpCw)2hjFp->xlYf>e^Rs( zhNAkgIgic+t%IO`yY~8nLVec|I@#OH+k1fdE~2XMLOe>)OyZfr)+y3lE{6#G)IH~c zQ?g7CIn5a1YBNkaX$d*$3%g?~<X1~JVVX-qr8zzZ=Euip!Tl|P<hbzXvuEeVPwRk* zg)1HHkS$J>Uv_O5r3>4Y32}cW+wn~6C8#4d{*V`9@a82G^M0haC`;rU&xw+aF|CyU zZrixq(vx*QWS{{m%>3n%Dmvr%*n(tYK_5<x`quo*HgUVPY{fb?Z@X8Nt^Bf>4<_<o zK7Y<*R!1hKjJI_G_fT{IgFH(bG_RBGT`hAaiKnqPBMXBEx61Oq@Su_O6p;~(h`Gw# zVfI#-6Qd0;e5F=aLPYcw<O4!|5pBf+(vO2MWt?~Qk7I06fM@H#n9hMr@2Ubl*(8=8 zxz%};;&&~uq_m;RhVpOF#K7Gzh1nUG0H>f?b7N7(R{+zm4G=qLAum9h&v_my{JFo{ zO#JvAd`%~Uj(awYVBzm*^5nF>ygxjoPYP%}BD^G&)N4Vi+?j&5E6_dDt2rkj_K6Mh zRM#W3U<EvVmc29}+J-D&HM+u`!fy=vZVksIhg?H6XZhU#IIwvHk+FbYZ`<v^mjCk; z2gc!76I;eYhQGA*@rf5X&6<@_!-YuLv5vHRy-vTlgU|Pc3QMed*c$#A5`>B-uR$l0 z9lpF9g$h0)M9ie0cJISoG5W%#5&7N9lQ6fTcn9+|3Jon)rt5`-G7d)=yZNGD;3P3E z;<f`@hq2wOU_vcU^ZmI0M?hpgE=6)%hZGwyQiuf^OZzs?gCVt*wZXp|H)a{n{VPmr zGv_cGN`NXfQeqvLPoEzH?Fc?Drb2^p?G&}BMlKKbo1|CY)92KeTR0#;!X`hhv~s}m zzH5tqrXz9M*&ikbg?uC=D|H76E~#`GvOS~<i@iyA^9dWUPsme40S+5JVPEMX=TD#u zm@@{Yuo!#erQbTQ-16g%>V(IBYfTO)QLp?w;m=;(**f!K?n72??|)+$WTvW=?&OAw zHKp3O)H)s3?`{yUM1ZqoAFuIombO!ftY%z+x!>phAMBy)zeC|VZ}&4!6mL7Z67y`} zUNxSiAt-Kc0R7bFKVmIbbR!SK*8UEmCqbu_Q_#HKT{>rh;jjbAT{{;Hf|W(1CH^Um zB<Ac=?KctyHGb0MC!S+YK?&wVBMzs0h2h_{HEdVm7ozvP<v1f>69<p0Tp9J8#66w? zhVp-cH`uh1M5H`8D^Hgp87W;m^#e!vr~4~$CHHLE+<4Kp1hgpu*|$Bb(Pyc$`Zjw3 zf9W~PGPlE;rwup+P(hd&Z^=CL`A*^Jg4*`?PS^#9jm@kG;g8D@4qA#t#?}KU@Wf#l za$B`YP4@R}56*9U3nGX$XU3>?LQ&t&g_#!ZEA~QE=Yf0;`rdE;5HmO6#pYCnZymP> zgfK0j{3pop>LRcHLMGKJ(H_W)yJU!2Z9qm-@!!BX%2#k8fo}ZmNgQ^y9pN)Q=Y*_b zqp%W)W0AC+Z_wrWk{k`tamCn&QaWUX0ZHoBKw4)BqTIdOW?^q#iDr(Pi_~Tb$I#VT zUA;EScoN`0IRpXgpxgX%MqBLsJa#Y?E-pX{ZOi=l!j*6hEadHKS)n9Q%;=$g#zW*X zV8)wW*i$*3Xa9xDyg5{RXx`%M51z1eBoR-VrWe75*bze<<1?Yk_f(3g6GW!+so~%$ zJ7oaei}Ky`uTl!Mm|zh7q{DB+jN|%NgQjlhSx)9>XLlmbjwI5*c5$c@&ukh0tBr!i zVRG;QU7)Vp@efKdf^fko>?(F4mlB`IW=^2Rasj8iTm(w#G0(MLFR^!LWS$)Vz9O#p z!t#BbUNH;m#*U2}YaQLv??aU57iQpZy_AKpTSSd_oZ2OR4m!MJ!+qp7w?bK66Lnzk zD2*qM6dtx|NPHR&*4_?%3%`HjuV>+N^}P~r^>SLcn}OJFlr#n9+sJuprPcS!vN=Vb z-{PE<t!n$L)@t9yH-S%J23l*{<i2yWBg?k>4R2z3DhNvfSGLu&u|z1=;9{^_A#0yB zU_aMrQtmfY`|=D%@sr2R8|U$LgRS%;)02BrZVyn)d<Za%mI-5Gk3~Jx2AnhsK~hca zVeup2q0%eFC+i?{#Q6C3A=;;PefHG*+&y9RrnT445g9LP<g*}rNK5ETz1q1OlW)`? zdFePTM}Frf9Zdyq?~g@b?c<w%{V1YRzGO=hxDBap6O8#4UeWhN%!9uOKV`(5q4M;B zOa$3?HrXI+482m#{=}sDFrwD(_q*}U<VEXLChDiaH*ji4>Kr!N4nJaBVv5FcQ@q5Y z4{slv(*&W4Mca{dQW#mIvfr4zM4%-S;5WCSl_?0VYi}QZXqqdySz^mZx)Ki>t}uI~ z<!LAc6}8ljV$fDmgTz7zcHfD<5)|;r!fH7K&~A#*7f@xYs|8QK^!&WK#9t68<;5`A zsmY_ndseZbBPz3F+uRayIYF~OpNTx_<!<^bmq*L~ekVd}SuSho<vK#cRJqh(QIxjh zxIET9cV0OpM>h6#m!Nr|dq;7IhlN+tsVOqLz#Kg+dO&#w#{L9!B^~8F+}nRZ**o^+ zZiy+hoBk04D(kirP60`J&w$x~2PyYnerfP(4F5emG05rR&IJqADa#7GY{?3%jUZdv z_xX93jIi6HQo*yusFsUjNv|!v$Be?LyK}@P42|_ev#IuRXSO4OJ8#w6#kIT%Zg<C| z7{QBc0l?3Tk6n;PNg1=#_X*Msw)lLht-)q;-)qTM!vdZ;2AqQa2^P$~qOsQ+WoU=i zpyM24;jrI14LEfVtS{B9>~QtY9LR3PVvws({RuQ>N%Cri4(*V%|BbNEn7=YA2rZv@ zhkT>O`u9-?PNbF_NB6sG(P1%#{w97hH(&ftvV-WObAH!S{Nl3Vub?1{$uwEG56=%Y zVa4Ucy_*+z@dqR1iv-)6zc8=$?CotB@&pCT9`P^LFRMMIuoA%$qEGw2Fg;#K&;CeI zGYCogV0!yZKC|601@uR77jEzZqq-jMu`m8hql4$Tclv5oOmEPM5Mos3zC!?a;M$}x z;d8RW5(?;}`5D(AR=py=a?Y1*_^_=UX!25lFn=M4dTmBBBiahcO|hS+#RBP5QtX&P zOt!4P&bjLJ)fnJ{!4z4RB#y0L+1yPXL;rXowTeL>wDGWx7k&U}SEX@8m*Wh1(yBAE zrE{KWv<jo}yDr@u3_tBGHh#*~>W8%9_*Ahh-0m|@`_CwJtrj2d(Kcywj`&g%z#zQ2 zD&nDP1jtZn-4fGy&!;&RMs;YQnPIsu**H}Q19K0hziwP3vMwghQLZNg*c=>C=(+(; zv3qIfVS<<5r!eUMN$AGlB@XRcQplGkmAdM=uU<I~EB#2^l&!iB&!53C)FoHV-$3N( zkTZ6Z$MDBAgCN^5Z3Q?rjb$8dT(+x%MvmeKA+)CfEq4{3^h;tMRrc-62c5Tj0f5B8 z$A5?3-V1a0i@%Rx02E&WfMC?@o3nQ3;&~#0@}5p+W(&TPS+b~ZdT(98$}|&y%&J&j zfFYK9M$leqwbSZ^X>%>IYd_?5OFs|36K9Al*4vPaPeh0&`Jrz|AH+HSrm}O6_}Xp! z=EO+`VykSn4!?!deqI*gs|#_WhG$TY70Jzv^dY}`b&4c`UWV+|wUc$O<_x%(XfStD zlpC#_ZfRDP!NHqu-3OxbcA*TJcU>zV*u8K5k?CUoW+c@S@b(vWYA$Wn0AyJq07{l+ zfPTm&gtDawLFs1~x@~8z>1~|rSFp49_^WlyszgXY#a(3c@%Bi5Go4KM@ND*Q-jX$U z4E+b$`6M=5Taa79#!iQZ$iUiy$p<}Uj=cuY4Ku5J7a;lRBN03InhyU#7LLj<3p?5a z83*GHbE#?^Qqj8c897|A?xot4lZiE*UR~4j=kw_e>r!hDIh9<ZI1r0K+7<;Op`*F9 ziIzRFufC`qL=80wVJtsOfAjt4UF0D&nV_<$!=D#WP6y$fYiuY)4F+*UQ%5J!37bM7 z$vfH%Kzd?uiCP-r*P@no@idBn#&G+&MP%y1k>lRJA1<+Jy9nGO)SQIb_ZX%N{$^qx zKv66lcdkc)r3`mQZ|319umqXM1#{Wh-g|H&={+1}KO>O?(?#iX2o|w^W|o4IT@J@s znW*26*tVVeeOA@__P;D;XZ-K|kyKH)IlOObMAlbc-nwPWQ`V=<;6twqh&>R>AzhdS zgv=?+^@q(&MC(0+-Ne=@n=veY*lzc5P+-R;q0Ov?fCV2ZJ2hO6WXt|xB>~)5%<c{* z?;|k(Ay%xRF^`}GU!`gW@;%{|ILq8e<-y1Ab3^5#f%}7vV%z(@>%{0*nuX<{B`H{r z?1Kp2UAgD2QU3J=1{2F(#Hs{hLg7P=dc~3Hj1`=+kO+}_|LJzRqA}W^sl0h(gz4aN z&cV^b-o9HazJ`ucHboniFG66~Id(GcoB;iH41fn5MS7kE>#OW!&d5j^R<`8^xZ>~k zU%*=+9S_r1zo^R<_fU?(jnSHf9qpX-HIO48-^;fR^GBCUcdJRRvk6`XxZS@r94uz} zf%Bqbxxckm3XCbOF0kjBNBKt1B6NO)DW5zjmPWlhz9oTK9$ceS;mR(GKm7tmq5KH} zt79g2%FqMT2dgigWJ8hL`>WsZ=za*T=!{C&yaQmdw`~5b6l#1KpxfcQ<p!Aq1&IB0 z_^N9=>oM6X&8h5^^j{LopCZfPLrO$jk;&Y4;ezA3!Ww8-*Aj0*_+3Ga6;MRCicD#| zH-ZVVbx8_7_JqWLWS;H&Z&Z*LoY(E<hfZ>2Io8mHA6G<<haXaC;7Rjet<Z6GH~wEW z9;1ir&v&u`b?m?8zFKo^qm|cy)5A`Jb6yEBeo3y+i^AKBf^$~MQHJHWl-c(k<a4nz zaoS%=KsvQ^<T*!rFAwA_Q6z%*LT8m=jDBX3LVKU-pTsInH^^O&^eRF*Gp>G~!R2}c zZm_iCq)z6n=<cCkk5hkM`v1N=v|W4?Iyhmkw&DP9XH@RNyi2nO-Ogq}!yfzn|A3;~ zEcv|ar84y_8xmkHb0KYeoP24@QQC;D+&7N)TdI*?@ZHU?pzKt!^1wL53)kVSOtVtS z>(gH#Tml^6GAB8HMupa;mEQW~#XiA6dU2?CC)_G+iItfk#mM;QExy`W%lFSc_Fo~* z;p)Ow?NXRNyh0I{_60^YWh-A8F)`XcdU$Ph8b?uZF(nv6?PR_qs!rgPe86%r%4PLX zaT6jQL<D4FfV*3uuIXTYp)vuulS#ARus;FZm8)Pq31o_R40>hY1p|5TfGPuKP=e6C zg>k=Npqgt>UXjtZak-heR}V+YC?Ds0;O?qv$rj7Z*ZZ7$Vv`04hi@JSmyHo+Sn>d6 zG`5M_!cO5Qg?I_B-z&4OE~S3^a&Oz?)@))F0)@z;1u^16d%?0vbI<w|OkVY^Y9opb zR28&wW2%($5&0N~5=P!SIviJb1yhx(sje2T1AncnW9`1D&IesfxWoMeAMKW2?W;%6 zBrb@UM(z2a2VmubOTkt=ZjkFaiSQ@#Em9}*u+{Cne>ng8C_M?#ISJ=lt_Wh3Yy*(h zP#!t+mE*&$qn_JkNY6^Pz$V!Y<iBOULewN&IYJ-U-GFciIE!chrJZq<0-#|aaPBt- zbuX$0)W~O|b!B<-$Mc1858kqct4;RJoS-jR=LD!1m!QhHKH7mm{`(Veyb=`#d~IDr z5Bew5679`|vZK`&Xn;+J#xzzVI$vN>t!s!Z7zNbj83#_5HPd};UEr5s4A*jy<b=;t z`i<f3qEOJpg3%B?%(KI&|6Bk{mNaR)_!&-O?`brTE`q1_WhH^ra%W!%e8kiq%SNY< zmK4VY1dr8_&dokcF8*Va%Rs9^1}FuJV!Qb1*V|~}$u>%V?kxgXK)x0~uQFcU(xS7p z4&jryz0#ze-~Q7ub2tqpV|Mb^VvD{&oS~?6@yYf3eVy{B0olk(&+sN;oNc91q8ntC z1GPv@>&5RcEbxEMrGe`~y_b}0w`p>#6*~eS;$2$5ciuTna+M2Yz8ft{U#@y^HnIrw zrfm|CWs4BWIP7pQn?i`+`M7r`64`WlEJJ<12`{<b=}Zl;r-X@6j*f00FaOdYsN>OB ziL=d9sb7w_IYH9n7#RhE3h-LUIg~sT(FBgsQs1;EmitBXK&V;vt%Jg08;v$vfuZ1k z`;O-!HwRMxmRL8RF5GzEJV#9++E(o)N`UJ9jRxR4VkiFAR2QS}-G>}-T`_2c?UDBE zJ|*k(*CVEh)G5is4nNyL%CRr`2uc%J+%HQ{frX3j#Y}l&kA-#T(c8DH&=ZU(OGjt0 zs8Ai2&B1JUm;}fWA+flbb-tj#NUtF40ipZcq*!2QBNW<AIp#bLgHesnc;&eeXcr3! zMUp}N*!g55HrCW*&wDPj=vyGcp!f?YU#<v{!x37ej;n#)oD>t^*wd7Z8WRQM%gP}b z1a6HE-KeP}K8H+S5kgN`OGf3D)X(hKJsDU9kG6MMB0Z(R%GHVXRgfg0W;#(k64UB# z^}PTs1G<0sfciT|<02E4yaS3iw{5}tusNg-+GnR&(!F!GYh~@w-7+9va35Tt&DsG8 zND;CoO)?GO?hlgN-jCheXC)K!mP@S3o(bO-NK<`784-AF*v;L*Z^2TSEYAjMkj~*) zvdap)7|)ypccPQID&P0xAF3e*d~El%l5W(m7YQdnKqqM7Rddc^;_Aa{xosugjuc7O z5AK6VlKm@bLqoAgv9*XA?fqD<@HN(;zv$V^--P!E>VHFs#S!+f`Z9yk#xc#Qw2)8@ z=K6p*g^iG1Mmuft(XTwgrIO<{3TmL})n`Mz|JHK-s>8KBi_fXXI#NlM>%pbj_ryiS zol8>^lV<C;e%r=9foANaWjZ#tWZQ^~z_+NbXKF6}q`!aB0}L8=`{><+Xnom+Se(}h zT1P7Wr%L+Pln!pyK;ZSV)GHtvgvq>d5D#WCjH;6s<N0gDlG;2_QSH>$;?Ph!b(;8h z1KgRn(Rb~x3QC_f6**b|+2!cMgZn56)J+afLM7G{`_wupW!6m&qFRn+C(Q7%w_ksr zT<7}pMPo3hkDH9BOywD$-m=EVt%g7HBR;VK4ZlL#I9r~VdN^o*=bjf@aG`#UL@Gem zK$FvoBdFQ!o2$O`yF(O-wmNy>b2U`)fCR6vQoPa?bBeHi?cM#~^+ulNBKg)&G9zn1 z-FVW+X$V6m_1Yc6$D#GQFsK<A5P?E;2(|))q=ZG_Co6H@-qjt`;asvi6KdVN3g^h; zjJU8?a4LhYFs_x_y+YrmKAsvD<VYD~8&?|Rt8)no_yKwGVJmr~7qxg{u|$SbJQUee zyA+JkO$G37Op`i!DCo|~`5sldQ2<+g|D7PAj1k&WV?zl`1NfnoTR6E>lz^G@qeQRt z-ccgxnmH{sbf}3)pQ^IbLF>ZpU{bzvI1wr-I#ungR5U$;@vLD593YtOv;l~27ezW` zm*Og<6vHZ=)L7O;QPtH360=(O|9n}y`=w^knUS>CenS++kWBr^ZY~vZPqa6N7X6In zTe-LVa6CvNfT*rf!gr;lf<T<~cS%Ch`IhO8l7rJ%4W77tdF0^n^zK-XN4@e<o<_bJ zkXTFQe+U_GHK>cSs<8KOKO_Z*u=8XkYt~;$6h1--goG*pR5gg2`fR>1nv)TzaQ*PP zX0q61s>TCc&jmpyKCMJ(of)+I^uaFduv}4+;Y9vH482RB81z{?<LmB^W;b4w!WldD zdM0JT#h3Ym(t<d$0vB(@*J*8r$uMMMsDgJ%AR`JJmcOaaet+MiPFI^YFA2&>3%5XR zX9R<HUiqhTCWe>F9t_eFu3?NmT*dUM(v9{H8H0d+*Kqu4O6m8+MRpw4$WG2H=SmF| zQ;_=!G8xaHXimf_yabeoK!TEjzCME){eiv;a~+2ngkOOAP?RBGqn}6*&lgeIrKex0 zuVKbD-MZ$gh~v2oxVGlZ|0}L;LTm{N`dm*s962B(rF88Gmm3F^zI9C`1mY62(J62j zXCe#XdOrhFJYA0pAcq&AI7GKO8w*6WFqF#f%P8s%k;wwu^3_BtRzR24zh%`x6dmh| zbITl<aeLX|($4nt^5n}ynr54}4uqh%Q!c)6fNWX)=$^A2j(SAI_Z!+-EKaGj553=& z^nnw`;Gmu59UY`}^MD{aMI5k1@Pgcw9$#>i%Ij842LA&+MFRRsj%np23UP2m6r3wL z_ARb;GJhlar+9C)G}}2uK*xEEcBf(Y$N<<-wM!AlfWe9rqKXk#&+*TyVF9BP15B^A ze&j%bD9kUBoZltp8pw-{gWb5JP&?}GQB8iAB#<TKY5`C3l0!Kys*8XkG63x?$`pAw z66=+T<fc@+HoKKrhb5<xS^^*4c;xjzKa!e=2We*80I2JA;TCoFLNVk+DPj0ElgfN& z5UTkjMBMH9z8c72m-SK#z_`Uax4A(Ky~p=J>l}L{fu||k^#C6!i;eVN7Erq?MpvEy z%zk-saLk{FTzJ%?j^<;frtMWig`53ayy}nD@2Wz|Ib}e)=<hoo*LB<=7M0vMRWwKs zXoL^lMcJ|u)Dc6C1a?cHDewd?88IyLFdV&}d2iWtyBS~P*{lP@ngDrLxs`Eaqt~oB z=gD5yB1VB@%n%1B(2UCaqGAkcgy+fbFH<)+=1(}o-9jm~!-M1Mb4#62?7;2WTJ);R zu|J6Q*exDwAhe1nM?@mcCQ|z&flSW7Djs<(!KPI-z$nI?hj5?Q;@<i4AA>~G!63C? z{NY{;+5FqI1uKw3K)v6&%3ON`H@Pv>cv4}iex&~*zc!>jBE#{WVZnOV8Iq)oc0%J7 zS+H*5xIODhIiL_}KLRGKQ&_?|LkrmAAhhssh)J#C3&bTn%YEnuFW35X{?!vG{+mnU zAl2Gb{%^{CIHxKdMdo6I)8yrNWFD<@mGZe|d_~(9X-_~Za#C9MY)Lmj7MiWq1{_d# zRfgNSbrh9isfQ4-3hBmf$?jczN_x#%x^0+Q2~=LKrS__g%5wKqg}LT;!3!IdIy3=A zU5%`-B?#4ppLdVSvT@F75BtJ(?p(q&0Iz-CUre&}4V`HF%q_Y)OWr;}YISX=h9@&q z-`LV;(lETFti8NYM>cXv-*_a*E~lz~f{{wDDg8@Na0m(*|Hr`#PCfc_NB6m}?S>NF zW8S|&KcX3RM}{N~GYImj8Cz8EP`ofuJ%c}FF|-;|A$_x3<Xu{XX<4YS%#)Nh(jMnx zdN;bc)`#$1dvyz`mXBx!%F3y{U7-1fMLMZeV=(9eD>3)|_NR^)onthJ&eKxI*3*ER znEB?e-<vymw0K*x-{Gt!_Qud5gzV9kd%h^O;rx+Un_J{XV2XbCNbM6y4b^oo0zl>f zsKhG(VK<J#4p4=B^VXI?F9y#f54rILmdLBrHU_GVW$6K<)*)Y)5E<50mHqd9<V)<@ z^D{w9In`5-{<#q73=Mf>cuT$<GrF*M0qvjxv<Vh>*6sxqdFpX-S(DFPXHZRl1G}D% zA9AC&8c<(Ur7iJpuL?FE?@b-AbnGCGI|G;54`o^0tH3f%Xky4Gvh?~~@HBDM(rY)d zf>p!g0Xtn!q>np@UQzwn1=RYyPTDPb$tGxS)P2i4oJ(hle~7R<1-b*-eqAY|m+?Zj zz)6*+_{;^{B@EsPbtc1q`ZNPItmyVT+Ghsb?TC=}62v$tu$+2Y9VQ0Hi8?DTtF++| zp+I^oGX%Iscc$ws{Q!<RO2~u3PLk``*a*O+MD!iIu=BGLZh%JZ^xD7)UX2@Bz==^< zS2}xbyg;b$OXW=n8_E~ycYWiV67Z7IB<pUC01E0LBkm`Xp!-tLzE|}+wuAAwyK=~@ z>Qs^*uwrC*BQtjo^@!sI1F)WOzfdG7uPV(?Oe+nzz#cirpTrgRn-jPfY-;h_*z4z@ zj6JeNzn?}A(n$qLmY08b6i75`ApEcuy3da1#W5gZHd@fvut@LtNgBZ0?ZO7cr7n0? zNpJTGUJ`(+Rk5KKcqjQ$PZ<FqR-dCZD-{@eJslmgZH@VkSyB-tsNnL2Fj*lGnMga9 z;7K-7vADBnp@$E8;s!Bh7`-{)IOj+J<jZW}*?$XSj5R;*UIwa|JwUtCDgh4eXABq} z|Nda}3uat*trvMebb947;$qVwTKY?zK;*CIZU~LxXstU>QW8#W<G;>4zTwhzv?&>h zMo(${l~FlL8-t1{6&KfpYo1p;4rF+A=rR7`|6+piW0hu5ph`I&0>%FL!vZQet}E$6 z&O{|)Aqcw|<!!!lPd+!`6e5)F96;|*aROjYC@?$pu*<KMiU>IKXSOOz?)yA6zgdHw z^~Ih&>HVn^JSAjP-9m`)wgaLHr-OJSb7Mk$ghl5rj78%9FkqbLs8=D{04u3pXDt8t z7F_h_tJur30F)4#FuZTZEI2n)FAoq|-6DuX=$(^K4QVI_f3+2}i-VRbb57zIasD6S zp+Qwt0qv&hZJXX7-~u$wXuEjs>|FC5MI!bG-6?X4A!x4+)_}7g|GX;aF?5{`rj^GG zoCRJK)r-Ny8yB^r1lQYfi@Z^+b~0y8i@m)tGOslH{Oc8-!cZECOZm;fZHUrjgj&aI zQ|}wqyFqk_6>>sk6vHSaGj(-a9krw>I2R688l!(=#zN_DCSTVSHO`4f02;1$UYC=M zfm}Bq6U3%VbcpbvvF3&7eVj&B#L^!jZxfwiHtHbWOh@oe=<~rO02lpa{)V^gqma@! zu?6D>!pAHWYk@K>@@-b_UhGlx`6AO12=+2%$x`<32h=u^_iTH-`llh#x*4e2J6)K$ zS7gnMGkA83kSLDPd$-FXPsd>y_|}IX#3rLM16*y}ZWnBlN+9;qe)}#Hiuuery$aF5 zW4Ie6xxm^?vyOw~L<Q!Pb?|+8>a=X6Zt6`xck#{r{t@*4U9a`xLKgBlzk&mJxFuP2 zGucR9W8~KJEYmNGCKCTDORf@YBRnL;VY!{I9Ul<tVfbbJyM67FMMa;bHqp^*eQAuB zPjIZ9O6~Os9WphYSt#6X2s-|4muIef3?lkR+L85Ck4SgyOFFa!#KAmx0TyNt39qjX z(`j{Vz1HTBlfm&5RQRHPhaI$qY?s(<Wz>#3v4!f9hiZnxS6?U}9PRDvTTW_zE;H2* zt25Om-t$^tk@OFk_wSgj{AswJ3tGljdgSj0vTz@UzUPF6?-~G5`M5GsFj>s1sTq_q zgSDS^V0F<{dVx_oSuO3n)|q|IDa4JZd8s64yUFzUS5!d-5hP8{tldKgR6DM-etKo% z)_z0@p2~H9u@t5>x$Ts=-E>eE^veijER7X+Hwx9ZPrrG_9bJDEr!w%D-x!V796HRp z_Z4e<AFQGI{O7LRGrD&bj_KwXwSk-<aN3<92?R!bZ133U$qGDg+h85!c0G*Qx5cCK z%vc!h2#-8%7&;|4bZDtMViOjh0K|0^(Xk0$KpjELxp6krI}iIqp!x@#{`}0OtMG@1 z@q;~PcOTxo6p?EVg}%SGCT0@pAcX*8MpNE)bBWBKBl)svFks}_=KIt*nx*PuY8FGR z60ryJx58D`#+(B3ISAs$SwEeP{h<LbFrs2(4+V#8ilI7www(f-5znE>j98{m%HJOF zUQp@|)mBVDoUORMwBM@-sGW6M10C8x{Qh4uIkWcc#<{!0D%~W;%K-4A8=DoCsL0EU z^2s0L5?HFYTeJur)b7lO>0j)$Lc$c9CZ74O`p20w6iiKT^VVGpIPrw<!t`)|^^yf; zv7zTzVBsdykG;N&z}@Q$Z?zFOHd-rPSCYAG6O`<AAD-&!h7qW@;3#1je<s!LQOb5V zBgUc1=Tm5~qwFFq%q%_ODPR?gS-m8il-`X|Q;}o(vFVQC+>fY$-4uIPMPR4lolbL4 zk`LNT_iY72-h22=ogYQoDk5IGwH^Pp6_|2psbT*)6Uaz8zOLrdh6E*5LZ`sUn@%6E zDv!bSqRynS!~+n;I^Mf3=Hc7wpfy%okVL0T#SJsRbE_=<(FTjWuv|AK0z|Z{ThcC= zNp1k;m>&<)=1f+8hfK1jsl6@fX5t#Jk2YdB4PZ`_e1#^j9`TK^c$W@VyU@e<Nh`cd z&v<4f7}sG*zvrrQoPAo0i?8ZzYXL6?K|9_T%9~e7ziX4jT#(<jIPzv+q1Y6cd#iAX z;=ttl-IG=)Z@-;sGD^mZsux42Qrd{N0#V^17dprP9QC}p*%I}$=b+DT8!4LyHsuIy z2VH@@uK{a$8IRex%$FcAI;&zgMY^+|kGig|YKsn0H4%Q4{#d|@v{5tV38w4mr-syG z0IUA%^p}9pRA$tQv_ian6G|08!~TSx(IGehTN$B2;8WSB+nJ8CpKtNgmRuH{PJ?{F zUi}1VCx5Vt)$Q?V5l{o&Swtu3@0c@cYKctp<@>ReqW~6nNxDtzjg(a23EL#k-ugE< zC<muoPjWKlWIxlwz56sQBv$|jG0YX>R0<rFQkkXqd^)f&5tIrJ{xtBB#gDZ+{ye*j z?O}rRkoL0FYk=?}(N$!hexwd`M%|alE?fBVLRlqn!jb3NV<8V;mwa5f;D_qk@_VI1 z<pvHyzk}gDo-`*TK;P*S+}n8C0+S%535pztzKzUX-r@sL0B{oL&4PN@s?-Q^(ZT2F zevqtlkq5f+mvjIFW{)Qo=|L{Mbhe<h)7ynPs<WSPhrjfkJXlc+TWkT6_Q2i<CsZ&1 z@3e(0z4x2<c?Lr_G4jRD-{AS7=;Q0Qz59i>qJ#^1LcVv84g}QofM>@3!Uf7<mJH-? za9kL<_-JdRuJi>03XrGiKLXM&Z%-|WYYEIf-}@e!@|QQ#@j+|T9JJP-m~Ym#*ZMBU zdVH*Hef6Iu5&>)za}8wBp7W3pK>>O;<yL?VN7PA_-RbS0b`Dk0R6z7iBD;p7H<+rs z_@3hZ>!MgXcpf4GOQ3;oIW6MTbSRzX{z5JgedH&MFJ!Gsi{Ks@^<%_9V&9-FgU%R6 z@BL&`<sJmXyt~Hc19KC+BP<sTqn8X{&ik<syb5XeVu;)GWw*}D4y`&pSTbTg34Z~1 zN6>xCzfbEXF4b4}We}OW%{Y@@QWsm&ms}YzOJmwW!nu&2f7I{OyK(+CHB1W`4%hKR z9~zIcjQJgjKdNbyyyj-RMy_u8`{o2n7&J)?9MYw)cZ1jsdYI@O%%_gFrhG#=D|VE$ z&n;{|JazXEuL5VuD&2C`kp8*97YeMvfDRBCOF1((`Pil)!CvnnXM;S(cUxm1?7$Kf z;1lYlsI{ZN#kF7`esllHKd$PROOH`|h=R!^Y@z{i(kky_V2iZYp`KB&<4YqKg~3JP zlN{wwTpCxqVsSg_$M0Y2l-jZ@F|27RaMSCrLbHzaYJ6~GyLCtpA6kLJ6YNC;njhO! z*3DjM#NB%KW6^V$W9zIUtiBa-omic7O>MJrrsO{P6C<~-eH}E~Vuy(CDHmow|2tf8 zJ?p*@NLY9Pd+W?a-adiSC?r-Xmx}GR!c<)gNe&6`FGGxzg9b6r+kf_bFQVN4yuGIt zTX6K#U|URPlHWgD?Q%rR&9_)@n5b0gNp(kQ<?bthC(=^H<ovTAOaBZ49gW5<(-(<+ zbZ7&B5j0<3KHn_ctS5eO@L@#l^|_$WulHY_K*1rZbOdMf;P{i|1($D!bj?o#v;G+& ze#BVIqYBnlJn%`AHo9|qy2NV+0BCLwy(aT61MYsYNePM<;)NR5qfETZ(<27<xw_AB zW3F3I@#q0QM4kT}9$nmj`Hxwff?I9@-I2MXQ*gx@om*A~!Teb@&P++4<s))Mg(E)u zx*myLdj5efl3B3e8!sXBjD?AW;JI_#>%%eqkMCOh^`EakvM@U_7_MfdqAiZ$0<o64 zJ%l1>`h5n{vcu_m<Lfa1ufw&s{@YtI@<n$|1qm5yKLgKSzVg~qWB+BqD&nM1n$uE< zr?k9bjK&t}4DW_gX^~dI_5IJ&saZ6UQ>{`jOGm6sD^;F#`>pT}uHQ%$>zhhxBnaDE zB)K`Ygni|GaQ||N;{=GfH%yG@rv96y<yAxfG<b18)mgT{?gkOYH`Jqepmw=w2cgN@ zs%7kFhn{3#*-B(`d;W|FyP-@>FH5CcvIrHqsjKSZ^Ks>o2jr?ks0rfYJt1`~Ta#hi z!z{Q+!RIO}hL%F$>{Gwuw8l8n=jHY`p`gmp`?tn-Uzln!Ssa!SLb9}rlxU0fPQM~` ztFYqH(d~yK9f0;4lwkxE0eOJSNTRfb4>B+IzW~v7BLGM~@NxVDvHJ=M@)3m9Idn3T z5Bfqu3Efq*AI#A=UrQE-hM)$#aEv&Jj@^>hS8^2-i{heygKY8-QAxjk>&GxLeYrZH z%gp{9I5ypS;5L&d+3z)hi6qz&Y28R3Dr`7IjIn+@K4+53iN5nI?fenN;}{fgh2&0g zU+ZREo0Q2uFBvD<k~boCZRcU<)#Kvp_Dm<<++ok!y*f8mjH%&+NN@lOPWv-~i8DO; zAeW$I*kJ2Nq(k#2AMF$rAWcH(?H<ViUGHmpnY{d-eP<<cd|c3je)y&bWJd)&yGvTH zKFLP7Gb+eU*CocPZlrMSuDk%STp6(4sxZhyiUQ#LlN@_<!<-lyflH4%Tn@a=<pE}3 z#(q+GK*w|{Q0J>3x4Es39r3ufreR}0HI`QV3jcx`Wb!{eq8-&FmrgP{9pcZ6-cmmD z)LepSs%0Hb?B35psErOB$DMvVJ={{+mSCbDY3})waO;ks0_xgiZUXTQ=Lj={s1IdD ztCP=TkO6nG6;UqtJ+A+wTK=xF!1uINM7G7dSo5ML@9_6;A!4Z1XQF5uqvyMAWRa)3 zbbMI8@$|px2b23I;mCs(8At-MG}N!px1@6H^oI`^VGEI3m=WFSA3ohcn@<?EsH~-- zCbXuzR}$Fh-LJaK*M{kKsqJwCRaDv00!iHDDhLXqHCqu8lDd1aPS;deO!@T)wxR{Y zE4v+K(e>3slEx+*>jq|b6+m<wneCL3-$ifqDA5;=6AT*ASjrA>Met<1hCMbfvuQR9 zH@ckj&7-y7XH<QEB7~B7qH9on(&fGQI+6Z5pH(3BV2SpOnCsgkt?jQZ9)EOCs9QE- zaJ}An;z_34AjuJ|qtQIqZHlTT_l%3S5dm@p9?kF)d`N@6>OUV!Mc{HN!p;^5(Mb80 z@BD_F)3K%K>~rAluVAJGQ2eQtP@iS{WwKcFax{8lalwxb|B5Eh5git?@TPIe<+D7T zlcyb8&cU=;TeN(N-n&(}`Y@rU0evX|&NbtA4=z4XYdY~*R$${J(?Bp?pa1Zp(a}B; zIlVGr?Kqa#>OWLG%I?J%6t75PRWEY<)O_WBFtrVM(g4|Bg1$8m>oQw*`?jO87CbD; zkSoN`)pJ3DRLHLEdeUVK1|3@C>23*fz!E61NMbEx>DUGt6abCpK4{Tis%)J+7B4o* zrOgn-_q*cNXUWccvR+CC@hDq-=yrdjrKUoqJu}!QY$x`H=6aRUH@IDx0Jw1;`uQ3F z{)~1p5eIh!vQy$*3;*zBERy?-t&nMxeP_Td`A;N%y&Z&)pUP@SfVlY(bpsFZsA#Pn zjhVJ37~k87;NDT6U@#5{G5J+c&y)E^wb*$u7hN5A;FhuxvR*w#ECy{T+W6cs8W#M5 zN%R&L0Fgt#o1F<&kA;~<Iv=H1F-5w_!B7wG6Hj3f6WXLoNhC|m5i-o#q-2mi(k~?I znbYBd#AJ0@$&#17eW^W)lfxuLymr{*TA3v<`riG)<ma06ho{smcQwTW&{mvX<r`)X z;o5^QyuQ>wsRp-zqC0JbLC_r#LwFW=e<`zoFGAxvotSrfzKV)(&4J4=P=0lcv1t_9 z<XgXycc<h`VQNc^kgY(wdqJkbYBSikk0O6I{D+*wI}uM`v-}Rk7EI9NI;Pkk*x+XS z6v*7!UK$aK9D0Xm>~UNdO#g*v!+o_E)x7XE>@QJBXhNF2G0?i(a?*-+G@y;<t#T~G zJh4Em&!_{BvIrTXF{O(-GY{|oc<gtOt5&o)E>}Cfb;0ihEyGF634U|?>ptVfeO$i1 zrvLint~%Z8z<#cf&T+qTrS)5ChD&-3<kw%;(;(RLW#xKZh5{{7_IK-f=4*~;kI$87 znK$)x+dY33*&&3drgi8%cL%L7uZV#D)KdHFQ?-GL-iZv5W)I-8>sFYaD1HV~$Gnjv zgz^$u!&JtLThh1e+}G`I@<M#Q{M238kX+YN=_qQ682hDN!@ALUX(%-(swPG-oCC9S zrBx+{i_PW7yUS9s>O<_WcXWEJqCE{51}%|gpr>#yP{aK0!^4^8$b=5c)EE?%1EnS6 ztv&Jw?v<ZmkU7{uy=F!|t*?*DZE1Z8CAe(iOv?h!H`H5H%AS2f1G9;vDbJaP-LId> z-_%03nh<|VmC9+;KmIDuXwnhq^WphKJ{Mot5ykF%VqJ*+RJMF|_Ah_FG7l68jJUt} z-E&54;=;$L*d-gkVM2J8hQn{p_8K;&HBPOR&h^}gkD`|YP=t$*zluIoU=EOP*S0$o znL#Hj+v({ih4G?Ou+C|;|70J?oL=*Wp*6HT;EIs{$e`@IkgSO9>sdb=*p-K7G5XmV z+{&wVnFl>5)9HS$=wWbP1Gn^RE1<S_k`6Fs*NxBTbB$CvTX{@6zeDhfRN+Ra=qPWv z^##3rULW--2t7Qr>Rr%NOcSp7d%%})5bhvq4g2XK!ZHuLR1i{Rha;X+o<Qt)X=a8_ zF(fqt>@Z8anX^f(>Yr#^;|*N~Vqd+#w@N-&ln$M`<$z>h_}%rDBY5Yp&xd~MPHmuS z%;qBpMSOvZSB?3{Xld<PK}Nf8`6<6zvozuwuiNpxaK#ci+H7>YUb^nrqJ{z3w@PmH zI=0*8)BCYetrQi3wXyWQEU!Br`{Q=#kw_IUGxtSSSUVG}pT8UD&#sDP{sg?vI?E~L zVlMgd^`)uzV!RURi&g?9@r#&omqeylrv+=Vg;~4X3d4WcIVGwYD6!lhTU0+8hOBX0 zy8k$?n@d>bBQGOWRCamTh87CX@s4#ewjZmKe%u@KO-x#*&hW+y(*>KwdT~NX*LceW zp1o+5d?t74X}O=_t7?WrU)wC!WqTD#Y-{G%3Np>SezUs&74WVbw?5u~$+*$_>9c&) zb!KzMnZ`gO=VON{oU!(Z@zgii_O9WHsLPIMG}vg7`m6Z)6_1yX(jEPd2XVD+i-ool zKJCCULR1war*acrq7AW%xBy5NoQJ4n&1N~?dEN^sg;y1IT;@!VxTgAp=I)7pSABH5 zU{H2+GtS!Y>WEIjiyT_TM^*M(%G0hma&FD)jhRP9CBUIVhD9u6r_gVg9kvJquaht9 zqWkwnp7-rrL*;5Ob*tlLKKz)&v^+RDJ+JqHV8MiEVGt|s=DI?DYyWG*ZDSNw=|qnx zy;muTAq^TZJ}tlZba{c!)#~>6R0Y?3S~aVxHQ4#XTAxjK@2v@kRJOOC$uQ2Z;qkJs zGU4KCapizg%Aq+-ao9$O;2}1MWqIuufA))<^}c~7QC$=4<`Yv8Z!4D3F<=d2<RztL zA-2j9LmPJ~ZH9I&uli|y7eChsC3=<<sWL<3GjiiWk=L19SPsm7_NN4Fm`WIAFlzi% zi(M1C_EO^~Bxou9bM>(vzjj{UMkeurNLVbxaPwzavzgxbNQHYXTYbGeUsXV-ivb|b z*m}O%>Kyo1i5fZ+o~;-jrK<Z@Vn8=!AX_2zQglh}Y=fVjaI8c^IZGLHTs2VzdngIG z#E2G7Bo8v{3wDFF{LrR_(nL+L?@Nf~pWa<i&#mA$H{)LU0;}BY>eo4#$t^X!?#z7^ zSqXL~#Kr?VuedMk_;v{euGLI9WeIIyEMt_e`hnnHkl*DQH1Elz*sbB(YpyL`>8$;c zvQu6LNv(l;o^2a^5U$0<FmZNicL5fXP>ysCQNxa`JG6X_#dVpZ-9#|iTjl%f%cE+* z?^cTqzN9X(EcdThqk&Jid<{hp6O^YXpMRZhoA5yTaN37wJ8x(S`m<+kSn{~EI3pLT z+1eb+Q%>slG32)c{b$~~=Je;(+XfDd<q(ep>@vgDPfP1_w{P6=eet#1f^KULb77AS z$TZmtNPSTg*X=ts{N39xVx5lAGDlw2Jc9`}a(+}I4WG~C=W}0#pQvT#x^DpNa@G4s zozHsKEhaDRaFouX?D#5dOe}$@0q2z32*R^QO!PmV`VI-W{V+}w-D1wtt%7XcY-D`t z?*Zn{-#9M4{w3P`V3^~o`-xY&XWGUu!u#|bS6|51%3U(|yc(mFrQet5ELukSy!lcR zLlY4S#H;aTr6d3VAo=*R*<*(Xj~y@C`#OSOfU=^pqMV|-oTAcQMU9IpiWe1C&nbeR liqI|9pa0JV9$pTvPC@_w3;fFBJi!ZqtCw%+m+IL?{vRb$#5Vu{ literal 0 HcmV?d00001 diff --git a/Lib/idlelib/Icons/idle_32.gif b/Lib/idlelib/Icons/idle_32.gif new file mode 100644 index 0000000000000000000000000000000000000000..a1b12a0531d64a9118dd7ac8fbdcc2907dfe2a29 GIT binary patch literal 1019 zcmV<X0|fj>Nk%w1VITk?0QP?XMPqzMWPM^{V*k7)|Gy~zy(|C0EC0kU|Hm=^$TI)P zGylsr|I9c4!94%OKmX1;|I9uA(LMjuLI2c3|JOzT*hc@>NdMYO|JzId+)V%7P5;YT z|IS?h-%$VCT>s!v|KnBv<W~RXSpVo-|LR}=-*W%tXaDP9|LtP`;&wlAnLlxwKXRKs zbDlnPpFMV?J$9r$cBMUcr#yJ6JA1A=e6c!xvO0aUI(@V`f44+tf<$J6LuZ9UX^28= zjX`UUL2QpfZID22lt6ElS$>;Fd7?vpt~r3YID)-tf|gc;r$K|cZJE1pm$pBL!BCOK zP?O4Qq0VWe(xIWDva+(Yw6wXoxxc@^|M7wU@U*YO)55~S#l^+R$;r&j%+S!#*VotB z*x23O-T(5?|MJ%V^wt0P-PYpm*5mKo<m=ky?bPJ(+UWDy==9;?;p5}u=H}+;=;-U~ z>+J08?(XjI@9+Qm>gn(F@bK{S^Yird^!NAo`T6<#`}_R-`~Uy|A^8La004ggEC2ui z03ZM$000O7fPaF6goTEOhJ1>OevFNHa$aCvh=_cGdt!2OVs3kKZem_mcwm)@n2UUy zaAA^GZgO9zgpI0vjefd*dtY#yv$TJHf_!3hba1=7V0c?ra8ts>!^_rwVAxx5T~xH! z;Jv({VQ^Qc)P8cva(H-fp1ogRUX%h}=z{8QVP9^s@#x^$vxkl#N|mnh*<(x99z}ZQ zw8}Tk4IDah6g|WfilH?;)C{Hj5=M*|K6Fmf0po^ElqEH0z$nrrO~_ig77^S@(9e@K zXk@xjF@(s?LDY;{gmZC^JBCNroRLvv#SkAoj_ND+rCAp+Ven`IiG#+B7gmGx*rD~$ zLY{j6_T<^q2b>=*YIy{(Ht5oyJz@Ce5rd}<6eKxr%!pAnhz}k*_I}Xd!Aw$276ppY zBL%UI#Y2Mt>7fGv06!WkOejH(pu5-Z{5UycgGP)ODunzX9RR@I3lbtgxcmq9F+WFc z*v7pAtKQy8>;zwcfcR@VUF!HLE8|6zJK*e;h`=Dhf!27CsYmALMt2r>u%MVfBE*Lb z6e2t@PoT9Rc5;A0haX17(83CS%!dLAB7A@W1rj{4zySsn;NKq@$??V(88Ly@5DB7i zLW8MAIH3UpY(PzVo3toL9CfIn#1KIwI3ftCQ2+sT2Mo|a85c(Kg&1JO@y{|Sh=5~Q z7IuY%hahrn(S;XYi19@iT-4(S2_STEL4M_(cgQw!FvZjxaCFkj7k-eK-vecgVL)4h plu4u*VN_9z2_;HM#uyIJDa<ftq+o%52q?e-8G;Vlq#=O-06VWb8vOtO literal 0 HcmV?d00001 diff --git a/Lib/idlelib/Icons/idle_32.png b/Lib/idlelib/Icons/idle_32.png new file mode 100644 index 0000000000000000000000000000000000000000..2aaa55805ed5305d9f7a55db870db7fd398ae751 GIT binary patch literal 2036 zcmZ`)c{J3E7yl-Wv1QBhCS{(N$&wn|U<`?&F`1UJ6se45#?nLv*^TVkBBH5YDD|Wv zF=SHq@r0(DOdc^xmT06bBV+k}`~CO+c;}vbKlj{wKj++Y?!D(`9zS|mUIr!u0D!y` z4od_P{!5_{(9&XJ7D14t93mV7fZ9CSHPW_UNnae1001!v0HCJ;z$zG`PXj;%5&&kr z0RUYB0P3N)*e5Vx0^)PzFc#SSC8f_FTmvK0p*Rm3h`9f&V^6RRShehgJ>+_-<96|x z>>VDe-HC1^0|VA3{fph%9dWgXpxS8!)8DX0vIjU)TG^}ZF9P~<@sMk|(pn_@$mvwN z%%>*?`X`)l**0I3{RAJ}j8@=j@ODMJRg%fyug`NA7v*>Z)&p*hbKlDjPN$Jpp7!+g zS5~t{i5r_VZWHym)(E|;S6<$A%aXBH`cB%Nsc4?I1f8U@>i|oP*NYQ$U(}RIm3R|S z|JmZzHx7rBAX9jDhb?X5WDsj89CfpQuz|V!O^}GX!>uFt!+@6)#`(AuKjX}Ci>N=- zXW50l{$vW}pBM2~CMG6{L+prPNJ*>`K#ncU#Fk^wXirnZwfuagnAq4aLZN?ncp+|& zT?O$Fb{>;gQK92gtMM_kB&?~gwY7ED#l?j}-zfHJ6|H}PL(#hDsA@_<ELf9QZc@?~ zXI`f%K_<0b)`-+#)t$Sm_ZB8PtcIlVc_A8XDR=xTcgl#M(t-4(>F&^m<tS%jr|0Gn z#l08TS0jj(?`GBads%#McE<eP#*Uc1l14(J(L)8^etwc51p?R3fZh*O&g#NF;Dtv- zD9NM_)(7%-YQ@dBRjTKY7r~)eJsrHB^kv)2a7897fLUS5NLUbgG7*gzMwBZGU8~&m z)Uv`vb7y)c!V0)k6K^Yyv;cez*QgUIm#b-6km-1L=5?7pMK)EUf!bKGUoDHoK;({> z7M9o4DA3{15(cB)lu*x)`g1BTFOSmA;h>H>JI6^`NbR#$0c?$L>=TJZCmArSTzjVb zT~B5KZjYi8``NQVL{$b7gUR;yNa<Lr@Op1{Y3_rE^B(1D{^~Q^WA;JMXY>^Fzf6`3 zX^N7%6_58-Ej_Z9+P&!*oHNVbci@0arR!jG^n!ZQCWc9j1WIn*>I28UeK#g*d1GCi z(m`Ug*`a5O!_hf>SjCQyp&HzUQ(j(Jy{;iva4mHw@2iDt1~hlvxyz^a;OXmTO%Elt z?LtCAEN>q@iB0M1ayUPH-@U4gg($+;Ha9z0y7~kJK$&Jm_|z!Ot3G1ujg}8%%bSz) zLA@GD=}J+Zb_~NmGMNWgImHcEplKv$o1!E*^gfGk@RmKKnbozzkKOz<*my8quU#Qw z={*_{vgmS%@--u?7v36<L2eMn^Rd>XtrQBG3{CGCY{(&AIj);R9R|H`V&+SV1|)Tx zR6Rt}-at<1D=E*jsiUdVKhutsvdDpfnE|GF;~Srsg~N-Bi{8Vi<mBW+yiQC^Oorp# z2-wy;S{svEOMkHhf%0(ffNUX=d(T=q)7yiuV)!iHYi-JKG=4M0P`a;myhA`9KIb7h zY9{CVBsuBs;XLyBVR!Me&`Lbkmh9f3uzkC+x%pxAZE{T8)R@?O<zD?e&*n4V_;o1h ztB%qo8wgzmoQ{U&kLwwjnQa8=wDj~W?aSbN?S5ZfUG=1lBIQPZPW#$;=+@w9d)ITk zUbo$Sx^){q$!e<!1$e=4Ywhgpj0TuyJ$_Fdp7R;uXu`2$3XK#s_rb4$w&-E2mx+D~ zo3iskhbJr&)}kigRl3C9R5CXhUR%R>2FrD{Ry9>&M<7_Stu<YK7SeX7Dn!#1SlMp- zC^;z#GpdgjzERI|0ME;sp~i|3w?7bD){D(-il!4{dKad~HjeG4?$(`O-+S{7*vHT1 z>6^aeoE*c=?|%zEti#qPxn<#vzd2dIiEA;6r6&9#wFbGmESs4T`l&Os?+fpN2xU;t zhcV4k?aH?4!`?=y!E9GmMoNcJAqY<c&lX+?BW26={%#!&7)-yRZcJ>mu&|H;#p^Z5 zbz41YUeL08UAe$RDeQO@tvW`oQnbu95whnVI_Sc3j898j#BJD<vvjgcIRb&$sBn}H z|I20M-iQd+!;hL|{p1628=9Ss%_CdjH~Y!j`57<$jG1R&4-7ak-Gd`KLM{5{=R+y8 zh6y!<5G|r0eYB<~Qss1$GH3jIn10d20Om!_ba06jC7Jxwm9F5~#ERxv`*nvKsIz?+ zChRwMJr&oXP;o0S3E8SMmsIF4B85X*obK*KD&xMP_W8lbWp1|h)x|`fsT1OwgzLkB znfh6_0=*{k{Ajg^lAth@9{lW1v|jw<;P=(`*ZtRj%zx}SH(E#GN-NdI3u@f;RlA=& zx=PZhu(~wo)fD&hM^TpgfyuC@519Gm!SVg@8@3}MM@-$M_7Kg30dErP!k{MVs#i<G z`p_<`NVzT_BQYmur@xYP_1Wiaz@pW@RN^UJEq@;?PvEnxX<=SAiNT|(b|SUG6-4Jj z@iN}LoO0$LVVZ{lo!TPycla#OCKkOqp_*@?T@XLixG8lZZ)q-delHh%g*xF5r^5Y6 z;r?jfFn<sLW27<C5NU3RG;&2+qD_!!q^SWCv`C2`rf>g6poaJblB55dK&#2V01^Nv MhojhPJMYW?12iYVUH||9 literal 0 HcmV?d00001 diff --git a/Lib/idlelib/Icons/idle_48.gif b/Lib/idlelib/Icons/idle_48.gif new file mode 100644 index 0000000000000000000000000000000000000000..fc5304f31eed32d5f7769e471c3817b58edc10e4 GIT binary patch literal 1388 zcmc(cjXTqM0Kk9dHQZT*lDm{)vZOl|iQCCyo84wNwp=u>93GW(C|BH=#WoYehFD(a zyk$q*4jnz)P{x#(>vT++=qUGCp6NwBeXstC`}_l+=lOg>vB&-V<9r|==p_VUPUnE0 zU7!yE`aQvIAD}{kI|snXL2&N~m<R&HMDXAkco+))3I|#|7$JklWH1#A7AW9pG+2oN z6A57E40w<NX3v6$sbG~3)_(db?OI@__-I!9k!-2|FFhd%%wvfK!O7g{3@-Xy89G%+ zxLA$5+;l9v-7mNA>s&dS)%QbL_xY;6!%SsR;Xp{y&}pF}zIH55G@jXbH?wIhqj^#w z5Y*Jvh{fWLjt-ej*5BU`w8h|`TCmyxmfFC-((B!t+TIDt;Iw>nu3D*+PAm@&4r(-- zsi~>)=|@_v7Hm#0E-tRFu7b^#l{LdN{f5C{0PkMD+I;r`=zn7O8xtc4qCu#S{*O-} z^Y;u|9y6bHrJ#^qK&4WOu9lP*Q79y$kie;?QL!`}1xLjbaYVd;LL{}31bEz0Le;fG zDzm(|j7q>aN(mGK4jT}tl5=r1WdpCgNFux;Xd+?*1u`}Be(^Y8cYm5Xqn#7oZV-zJ zyagT!yVO3b?#?UL>+2hjVu_hGf85m6O0#t#Zdlb5_NUHTI4%Y8>`y+)|DyK0r=!Av z<Rz!TEQ6Te#(W}rh|j-j*XX|2$h*pIb*m<}D|49=98Th&sXiXJW5vrcJo54J*j}+^ zlugCDbG%aLxg5gYM8@UG*)D=&LmjGOTT!H1T2_u;$z|Q;OWx0IKViHv>9`+>qi;l$ z4S&~Fa32-luyCWPW7?uxFRvRq5y+TVkz0ftbM^>dN{fCz4rAp?$xCyNl(0|4tmU7$ znZ9IUZNDq%V%S8zvH6~Tjze;o_4zVHdAZ5kp$|oOMx~_wKBgRGYp>)VYF(I!)Zy=o zl!NIQ({(4=St0TO?C0HKQIn@y`M1-&6L0yBO2%>rUaxcdI4}$=(BA9uGOXAS;~N^A zRT5HwPljNxMc$!<bvsgOvgmoai>y>r6DvQxar)%e@)_n@jM;$IUWUsxb9ohAmAyN0 z7!C8aES+^lJZ-W11bOGsDenGaxGO|Ol_-qNDeqGoJ>EwASnA1+Nn`K-En+y{+}q4E z*a9j^#lS3Fk`%lilC1_qcp;`<=<G<G<?cws!t5fPlN7aw9kyAL-CA$XdCldL>aEBM zJ5#eT2NDB195l?quJw}D_FeltSav%}Xr+m5*u0{M{yCk|P-Hu)_P9h=ags`cb)yNW zUsH$7oJixICe{qjqLHb!ivsFp35af21>`L#$?H7>70xFko_Ab#O7duhA>pXdOAe!L zVo6YLh~-ArJgT|p3zv>ct{EH+=T(RBGPEi$hpkB83#<;?`CE)qHvb62W;{ZNwOwyX zcJFc@lUX9(<cu(QdSs<dU$dr?+~ua)sLQ|8;A@>++2}wQwXRr%6TWR%cxhwt`p!66 zeF6z%+T^|<$?zNv7`w+gn|Q9peE6iY@=X`UN7<}JjAi=BzemBpyrO>I0E2E6cGAM6 zFKl@gd=r!^d(QZj+m<*btYL2(8cuWFqo+>y%y175bZSR^(z*6*`w~;R(>=}$)Y5#u zV~*OLvi-AHJ}oKTG+p$;U`upLpj>Uoq)0PtW|!n6ST$XwS#+oh9*O@(G@$ms-kg#U R*>>0a?W$}#C(H#3_z(F5crE|{ literal 0 HcmV?d00001 diff --git a/Lib/idlelib/Icons/idle_48.png b/Lib/idlelib/Icons/idle_48.png new file mode 100644 index 0000000000000000000000000000000000000000..705eec42e8a64e9f69c5cafca63536deb18ebc68 GIT binary patch literal 3977 zcmZ`+X*`r&+`h+HCd(KeMTjBG(8$m{5wc9io@|Y!vSlkv5>mp9-3%ssQ<j>N5JJ*s zDcQ1Bk}Xn-Ci^mk!F!(f+xy|Y@3Y+ZIlr_1|L3}{lVW3SD#S0z4?&QSxtXyY$Z`Kg z1TRP(xi*qO#_el#(g=d8=>i-N9`KJoZ)SHAg03q;5IG)#HbD{jHw1-&hJV~4Naq#= zi3jJuwABL@yq=b(#?bD6@7;!yEKss1*v$C~$j$yYnsoZ>LlBZ?ZfxY>H(uuw6=3g} zyE`^5uKa9rXpfwno1)>5Aqp}3hl0Gr+#|oT;SD%x%U0E)EPW{Fw?)Fe5f7I%eAh+Q zx!KBG<dNGwW&L)DY=S_=%Q04&K&Xn<X(uH^$@UFMcPBYZJDejD)381td385=`^i7b z3dLIw4i&9u<X!1q;Pf6_A2+p$aDYuL?MB)_j9D8Qw)aYoT8@IsU5xO!B|>F0skQPS zLbC+?ydafnnCl&u%tY9V?Qg&QCPFXztxxT?WHTOO*$Pffx!H*EXk8lDYrN3^Fnwod z=X|EZy{0DFY`f=Y562VaZmjfZA(C1oBqa&*8O`tBaceRJAC{De(AzUCicu-XH!X_M z=AxOM3QEe#BFLo90^O?@uNCgH8Y0(s_86*>Gfg$z8>ME9Z3UewNUyqnEeC#U91CTA zD*nD9Q>4CiL*FbjK5XX8o5>{z@^Vfzx&P+&zy2s>l1Q2f7(?U85%~R&$-TYSR@T;q z)lOIg9vnL`V}g2)GZ81eHZ&LB(wU{aE<(WJ@efq**z3DhmX#4so)nVLK&Yy!+MGU} z@bab3=g*(f3@he?2i)-}yq4DehYxw7W{J4rfN@<Noy{&&BTpDtrUDP9n07r<1Bneg zmFsO|VWdLTDM;*R8T<Mw`}q1AA&m574E(E|qM4ZY)C>%@8LTw@()jBaEv!%(IQh*R zBNSm`DFT&dqM@yw?1W8>T%RvB`$@kMkC2<VCZnjRh*43YkjfKC<ve{Wm_vtvY4+~j z+ec4N->EgZf6dGKv#rJOCVQqH_GoT?{uv^++1M5<k*QD`XIF-F&K<aic^@lhE=p^k zoSms^@}V-HP$;nQr60t#UwLjd?zj$p&SFbF3}5*U*!t}AU=R9Okk;zj+Wf)zM+m*{ zQCjDVE9sMWKl*_HLHBGB0|Nty1cH02TvjLNQAx?P@1gJ9DzVMXu!+${iUtWS5DS&` zr&OG&f4i`LP=*eNB&DP@@c4MJR0l`LqOW!SgME!c%6~A$vu$ZoO*Kx~HQlT8oI}Og zV-1mcwib-8U!DxBM54UNK6<;ewzN+y`U!)vUkSlQGnNks3CUE<GJlBS&+=xZrKOej zDT(fxTHhK@lhV4y#9*&tsBeL*(ONybCzqa-mZ}`p)C}=C_WdaYbIyfVR8)lLb^V%| zpFeu8;d+?%v~ATOEi+T}ft^ZsclX`ON@TT@Aa5Kj9`&E?B?Ot()wV+a(A(jK(;1y! zXapDNT1iRCP$dCF#i*$fPn>{@5sfq%`8pv#JH8#?UhVh4x-h;SRXDx-VPJr*L`Fl; zut*ePaj9K)f%W@0F8|mSA6YqWWD-0c_1LA3-=}szo6Uao_%V0;Wxt@HMC+0hVPXG< z>Kq_dxFie@JJ*%1=m|Ht(nm&I97v?Met2eS>7JaNoZs{FZC@(Rd>k3!w-xiKbMZ$W z(D@v`xyqW^-rhc+{V5NUfcfR6k(n6E*{_uf&m2{cw0#~|aXhGC9*d!Ncxjpy+nFh4 z{r>Z31ko&juAaq)ZmrEt9=%i1@;z9(tB>%}Pt3K-u}AWaJE{gNj>*Z|jy4cYi64<l zAjoypq}pJ(EmVFiJ>Pr{PF_a`BBC&<pT%L<_UVtZmLkSK&#;djc;S7pSwi6H)2BlV z-<lRitIsE~M(X@qUd(@*VarP+?^jog=obl-%J=FNAmdS~>FER%cfi-@BB>gGZ|F;; znf%?3&d$k^E3iIM(odPxM#MsCCUHViN5$?ER9bV@&deUp>lz#w@cuJ5cOWP*a61dj zwdCzB*Crt)A@MgaJw2T*L!TB0{=Tylt<<Hta=ig7jXY96+9R66y%M2^&FXwaRBIZ# z*5JBNkau`>6@TZ}E%)_>Z@x10q^PA<@qp{sZ*Sbt&oxtU(kbvEB8^bogWcVNwNBVG zFo(wo3dhFDJV1T=7}2)*vh-6IwP*ue8a*hj<=_1jGy=`fW2=yTLBi$Y`|9#?o>O&N zf~%{XQDN68_UYXk?PiG+Zf@T$mk*3+;BdjI8oWs@FeusN{^G`s<W^5$9DtoDqDZz~ zN6q79bWB8ptAgmBcb*y#`Y(WVQIB3<wYAiyY%RFyi$=&N%liu5l;h{hFI3?y&+ble z^5X6wW%T~8?5z{+JHCE)p`#;t9h~-gkJL9lwMMz##_}RI79xVY8P+8l`ugdHX!4o* zpi+KeVd0j!aPbH|$uxN}evg0v!O6+V4}N&<nEoW?Go<hD{lB$j<z7UY7!AP>CKF)9 zw$}0}P#^O`9)8&M_4D?idMWE7{RUyO3!jCBg^jaw3UJ))+}yVTM_b%+cPlD{q}wSP zytLNXsVSc@7ls>Ox6ctPrGF4|W)C!>tZ7fD)A?LhyhHiR#`nw=>>zg+Tg6^Bfu1>& z_tF<9@nrk=G@8mS-`9G)X6Y1_<GRyRj;2}l(kcyC+3W)`-xI{GivX5vtgWrd>PjP@ z*4I}hKR(7laaE86(oF1a5KWsK>*Abm^c`Hh+qvhYW<KVJudhPX)8X2th>bhMSGKfP z<{BYS-AyK1>{1>pG-CRt?DWnc-OGhLL&avo!(2%AbgqENi_a@MxXlu%7_y+eH-LY6 z9ZEy>HvYUZ@v}2)E96KG=d+Gmp+U%cL}9xxygy>=HebqWzMVVX(#d7QI|she_p`F6 z$8vf;MFYL4i(V}nl{jxolQ&d}dT_QVONbY~R>a|ro2({I-oc2X`xO^rcD@)u>An!7 zS4b76BlU#!a}L1m+T3V6py03HgSFE&+8nsQ25Di6gSDlB2f3$ugop0~U|sEGb$}Hr z=~^WokNPUyyN|7%{n&Kxh7rGas1c{CvU{HgG1{Fh55KGo4N((6j5kC^nwpw6RJ~rN zy6}bA69|aa>&M@Bbq(B1Y4t?##@))#H^zv?ep_%X$z)=V+a!Mspg!R7u*WSII-k4n z?o{;ZG+FG%-RIc8%M>Np-Bk6&=8cu<b!qM3iF#%0{GoP<xPDfAj}Kr`(jX<I0w>1} z@YdVgyDXyydvG7E=ND^ZoP;TKYLcwlJuQB*J2C01uN`WU<7vGl%@y+HW-Dn*!F<#D zB6&EVZLMin9rXfNss6fAs+{eL-q0l{PU)%I8|LQbP8Th_u8&Y({X0p&Du_hNbjjfi zS}@dD27^JY&Fq^7H0qtdOoltlJU+^*eV-)jm6z`;;PoOo|9H_IRbOhzM60+Pc7i-` z@!U<-epV<22EgiYUU@T`X#3<|n~mAoTua)KF8ia({d&j_G2Am4x%Lsvx36%lHgNQ4 zi|)efTJ^kysX-`x@@9bsMI$jWk@xYL`bu;@&=}#PgZthY*#3MBv&0<gvnTat?d8Yu z;^%nCyH3q8BNP|IYU<3dZO@ucueYU#;+_WwLY-cs#`pgI=z%xC8-L+Mx}qBuT&Qlj z@}uww)T0iQLT+cEf=0REnhdK6z^d&4$6_`=m)iG@20WA1EwFZ~_`>s^c;EJx)k7wA zYdhM(!GS!fealKoLXbB*`={DcszJTY@a-m^vhd?rb+s`8Z%qcd$EWtySdg2eV;&12 zyVT*S?*J*hG*iIg1rW5fbUB%s488}*%gZ4Et$(wx10n?}ir`*93R`gN?!piA-^nW0 z+qf{z9P|5#T^)~Hn7j5PMOpAt1N%!OXTP&PUs-v%2VQdEx{aG#RWCe*4d4ln$KPc# zxs<Z@0BW$ew-=r^Bx-%w*lV-#^XrBMY09qD0mj!zE5x{w#CXEO!qDgY;GR#l`K)xw zUt+kWlgNuFCnD?5$D>xLYkWH3;pO9_|GIj=wzgJ6R@PKOl)}XPxfJfbKgE~}gjlpY zI4le+-mI*wn+kgX^+6~E_f6{(3RQNWkE9|EkwckKocOcP{g3G4kbXxE=Q|bUcj;0+ zJuPkH<;#~=MbVqA;KL<AmHww98XIK*Z2AQTo*qnSYik3Shz1#8J?Zv)U`?R&U%!6c zDlBXRdKCzYi~j!i`dRLFja&p-Sc-_DMek*@9r*$jCGg=1AM3p=60pXWFj7{3*6mAb zsz&1Y`1o-?VHr-~sZ;b30p|)5Fa!`(@<68obOpT^7Z(E_0pc9&UJbUK)*zY23q}OO zF|N}q*0su1K7)+yx^ni>7&2<bdQs0HW;oN%!dx}yQ)s|7PHRR+#@`wdAPp!Es_cqE z9of2|?o&rko;+z;*}Zp6xe=(-rOL`mrZj?^3ykBQS}F}ewqhA(3i}G~U8oy*0Hy#i zec)o9eO+B0j$xG&p|^8P&Z~PaoCanBhr^qOtIwOZFD@=tw;mnNGj5(?@9dP86mI(0 zkIv1^&f=q%JC$2DwyhOJjn17rz(s*vTwENG+;K)>baZ`=0`<r9ZwtE%DJgsMNad|t z3r)LWmX<VqX{54j<ZSh_)_BCEtG0A5EEo*$og^$91o+@<Lt~@<LT`a?Pl<Iw$d|!E z^_1ot$R~rYk#isZ43r-OnxJWG{uLi27JL`zt5OI4z`#JT2RO;JTLlFPAN@l23nngq z`t&KaZ~B#Vim{$4U1odrea;~f$TPg$j2rFC*L6i+>)(G{Wsilt)6(+is~rwVEGtvJ zP>k?{{jNO``Qu$muW#WspQev~UppiY)?h8A+b@U_MZ$Cn7<RV>69_T+g@rQ1jZs^# z#>U1t?3uy)Q2cDWG=X&aTJ?ck;#(I1!%Njps-`9;ct}b71X=IriJNxNCNO=juYueL zXaZ=)Pb_?os!1)C-&uINGDbW}X~yc=5HFuI#c}Eq{>kjL=C_<0VOlm5u_FsPilv@b zY$*fxQ^ioCQ>d3msJG7f5O0t{nmA3I8cs_Mr{RD*rgH?RgTo)fffUEJjQ{k18U$YQ ay5Mu||8H=mDm4f+fXs>3#+3y3*#7|u22An* literal 0 HcmV?d00001 diff --git a/Lib/idlelib/Icons/minusnode.gif b/Lib/idlelib/Icons/minusnode.gif new file mode 100644 index 0000000000000000000000000000000000000000..173e97095913ae40d771c3eef47328fca8cdf84e GIT binary patch literal 75 zcmZ?wbhEHb<YwSz_{hxg|NsB``g#Tih64u<DE?$&Wnf@t&;fFRvfK;|Ofqx&#ZIqb dQ0DM=vTEAvUtu3Awk-FFSeozTEzXP#)&MnN71sa& literal 0 HcmV?d00001 diff --git a/Lib/idlelib/Icons/openfolder.gif b/Lib/idlelib/Icons/openfolder.gif new file mode 100644 index 0000000000000000000000000000000000000000..24aea1bebe8413427326f964ae8b6f9a29641029 GIT binary patch literal 125 zcmZ?wbhEHb6ky<GSoELa|Nja9&rkU9;lug!2@@tT0KtI+2Y{sFPZmZ71~vvAkPt|% z1G7_x*O^}vI2<w=6en!zU87(j;-5J0#Y^7>7fiA{5+57r9a@@xaKl9H#tW>S8=RaE bzBro0!*Kd>PT20+wB2&-H*#hPF<1it%q=nK literal 0 HcmV?d00001 diff --git a/Lib/idlelib/Icons/plusnode.gif b/Lib/idlelib/Icons/plusnode.gif new file mode 100644 index 0000000000000000000000000000000000000000..abedde047f2e2bb307ba903645755a451b7e4f23 GIT binary patch literal 78 zcmZ?wbhEHb<YwSz_{hxg|NsB``g#Tih64u<DE?$&Wnf@t&;fFRvfK;|O!9O3#ZIqb gQ0Cz8@^J4Ef2P~=FoaQdWnqM7t?%R`&WsG!0C!^+#Q*>R literal 0 HcmV?d00001 diff --git a/Lib/idlelib/Icons/python.gif b/Lib/idlelib/Icons/python.gif new file mode 100644 index 0000000000000000000000000000000000000000..01b13e35834038ead38c7e872c2b652a86915d5d GIT binary patch literal 380 zcmV-?0fYWWNk%w1VGsZi0QElr>$@21z9I9$8v4f>{mUEw%pB{&D*w+T|IZ}<&?W!V zE$hWJ=*K<((=h+kF#Xjw`qMf8*E#vsKL6M{?9N61+Cl%@ME~AP|KCpk;#L3SSpVl@ z^5Jgv<8S@xYX9qOGGK=`W{@>#k~V3RH)xhOYL+={mO5{nI&hpjaGX4Go;`G-K6Ii# zcBMdgrb2tFLwu`4eXT`*uSS5eM}e|PgS1G6wn~P&Oo_Zqio8sUzfX<9P>;h>k;ec3 z{{R30A^8La002J#EC2ui01yBW000J=z@PB9yUk)P6=}#6=6tgk3sq_|ZBbULG_wA5 zwiwG4GL@>#-VRrjxm2go`Ios!emosb_JWW8AU_us4_`JkQYvR6ffR%aKZh_bT}>4c z3I{(klOjJH9vc}L7MKVGKQS*WKOG+%8l<KL0zxY(Kd-SB6AB0g1y-;a3=0MU003UG ar40$eUO%!92|lRNKM>9Z1K8d}K>$0ON~f;? literal 0 HcmV?d00001 diff --git a/Lib/idlelib/Icons/tk.gif b/Lib/idlelib/Icons/tk.gif new file mode 100644 index 0000000000000000000000000000000000000000..03bf3832abb7f6b1ca5cad39ff548260e8c8f511 GIT binary patch literal 72 zcmZ?wbhEHb<YVAw_`t~UpMl}Pfdh&^Sy&ku7#VaJfB+=Jz$DMpC$RhFEurj-K3NM= ZqvrmOlsnNItdSZ0tu*#%Y&au>H2}ZE7AF7z literal 0 HcmV?d00001 diff --git a/Lib/idlelib/NEWS2x.txt b/Lib/idlelib/NEWS2x.txt new file mode 100644 index 000000000..372119300 --- /dev/null +++ b/Lib/idlelib/NEWS2x.txt @@ -0,0 +1,660 @@ +What's New in IDLE 2.7? (Merged into 3.1 before 2.7 release.) +======================= +*Release date: 03-Jul-2010* + +- idle.py modified and simplified to better support developing experimental + versions of IDLE which are not installed in the standard location. + +- OutputWindow/PyShell right click menu "Go to file/line" wasn't working with + file paths containing spaces. Bug 5559. + +- Windows: Version string for the .chm help file changed, file not being + accessed Patch 5783 Guilherme Polo + +- Allow multiple IDLE GUI/subprocess pairs to exist simultaneously. Thanks to + David Scherer for suggesting the use of an ephemeral port for the GUI. + Patch 1529142 Weeble. + +- Remove port spec from run.py and fix bug where subprocess fails to + extract port from command line when warnings are present. + +- Tk 8.5 Text widget requires 'wordprocessor' tabstyle attr to handle + mixed space/tab properly. Issue 5129, patch by Guilherme Polo. + +- Issue #3549: On MacOS the preferences menu was not present + +- IDLE would print a "Unhandled server exception!" message when internal + debugging is enabled. + +- Issue #4455: IDLE failed to display the windows list when two windows have + the same title. + +- Issue #4383: When IDLE cannot make the connection to its subprocess, it would + fail to properly display the error message. + +- help() was not paging to the shell. Issue1650. + +- CodeContext was not importing. + +- Corrected two 3.0 compatibility errors reported by Mark Summerfield: + http://mail.python.org/pipermail/python-3000/2007-December/011491.html + +- Shell was not colorizing due to bug introduced at r57998, Bug 1586. + +- Issue #1585: IDLE uses non-existent xrange() function. + +- Windows EOL sequence not converted correctly, encoding error. + Caused file save to fail. Bug 1130. + +- IDLE converted to Python 3000 syntax. + +- Strings became Unicode. + +- CallTips module now uses the inspect module to produce the argspec. + +- IDLE modules now use absolute import instead of implied relative import. + +- atexit call replaces sys.exitfunc. The functionality of delete-exitfunc flag + in config-main.cfg remains unchanged: if set, registered exit functions will + be cleared before IDLE exits. + + +What's New in IDLE 2.6 +====================== +*Release date: 01-Oct-2008*, merged into 3.0 releases detailed above (3.0rc2) + +- Issue #2665: On Windows, an IDLE installation upgraded from an old version + would not start if a custom theme was defined. + +- Home / Control-A toggles between left margin and end of leading white + space. issue1196903, patch by Jeff Shute. + +- Improved AutoCompleteWindow logic. issue2062, patch by Tal Einat. + +- Autocompletion of filenames now support alternate separators, e.g. the + '/' char on Windows. issue2061 Patch by Tal Einat. + +- Configured selection highlighting colors were ignored; updating highlighting + in the config dialog would cause non-Python files to be colored as if they + were Python source; improve use of ColorDelagator. Patch 1334. Tal Einat. + +- ScriptBinding event handlers weren't returning 'break'. Patch 2050, Tal Einat + +- There was an error on exit if no sys.exitfunc was defined. Issue 1647. + +- Could not open files in .idlerc directory if latter was hidden on Windows. + Issue 1743, Issue 1862. + +- Configure Dialog: improved layout for keybinding. Patch 1457 Tal Einat. + +- tabpage.py updated: tabbedPages.py now supports multiple dynamic rows + of tabs. Patch 1612746 Tal Einat. + +- Add confirmation dialog before printing. Patch 1717170 Tal Einat. + +- Show paste position if > 80 col. Patch 1659326 Tal Einat. + +- Update cursor color without restarting. Patch 1725576 Tal Einat. + +- Allow keyboard interrupt only when user code is executing in subprocess. + Patch 1225 Tal Einat (reworked from IDLE-Spoon). + +- configDialog cleanup. Patch 1730217 Tal Einat. + +- textView cleanup. Patch 1718043 Tal Einat. + +- Clean up EditorWindow close. + +- Patch 1693258: Fix for duplicate "preferences" menu-OS X. Backport of r56204. + +- OSX: Avoid crash for those versions of Tcl/Tk which don't have a console + +- Bug in idlelib.MultiCall: Options dialog was crashing IDLE if there was an + option in config-extensions w/o a value. Patch #1672481, Tal Einat + +- Corrected some bugs in AutoComplete. Also, Page Up/Down in ACW implemented; + mouse and cursor selection in ACWindow implemented; double Tab inserts + current selection and closes ACW (similar to double-click and Return); scroll + wheel now works in ACW. Added AutoComplete instructions to IDLE Help. + +- AutoCompleteWindow moved below input line, will move above if there + isn't enough space. Patch 1621265 Tal Einat + +- Calltips now 'handle' tuples in the argument list (display '<tuple>' :) + Suggested solution by Christos Georgiou, Bug 791968. + +- Add 'raw' support to configHandler. Patch 1650174 Tal Einat. + +- Avoid hang when encountering a duplicate in a completion list. Bug 1571112. + +- Patch #1362975: Rework CodeContext indentation algorithm to + avoid hard-coding pixel widths. + +- Bug #813342: Start the IDLE subprocess with -Qnew if the parent + is started with that option. + +- Honor the "Cancel" action in the save dialog (Debian bug #299092) + +- Some syntax errors were being caught by tokenize during the tabnanny + check, resulting in obscure error messages. Do the syntax check + first. Bug 1562716, 1562719 + +- IDLE's version number takes a big jump to match the version number of + the Python release of which it's a part. + + +What's New in IDLE 1.2? +======================= +*Release date: 19-SEP-2006* + +- File menu hotkeys: there were three 'p' assignments. Reassign the + 'Save Copy As' and 'Print' hotkeys to 'y' and 't'. Change the + Shell hotkey from 's' to 'l'. + +- IDLE honors new quit() and exit() commands from site.py Quitter() object. + Patch 1540892, Jim Jewett + +- The 'with' statement is now a Code Context block opener. + Patch 1540851, Jim Jewett + +- Retrieval of previous shell command was not always preserving indentation + (since 1.2a1) Patch 1528468 Tal Einat. + +- Changing tokenize (39046) to detect dedent broke tabnanny check (since 1.2a1) + +- ToggleTab dialog was setting indent to 8 even if cancelled (since 1.2a1). + +- When used w/o subprocess, all exceptions were preceded by an error + message claiming they were IDLE internal errors (since 1.2a1). + +- Bug #1525817: Don't truncate short lines in IDLE's tool tips. + +- Bug #1517990: IDLE keybindings on MacOS X now work correctly + +- Bug #1517996: IDLE now longer shows the default Tk menu when a + path browser, class browser or debugger is the frontmost window on MacOS X + +- EditorWindow.test() was failing. Bug 1417598 + +- EditorWindow failed when used stand-alone if sys.ps1 not set. + Bug 1010370 Dave Florek + +- Tooltips failed on new-syle class __init__ args. Bug 1027566 Loren Guthrie + +- Avoid occasional failure to detect closing paren properly. + Patch 1407280 Tal Einat + +- Rebinding Tab key was inserting 'tab' instead of 'Tab'. Bug 1179168. + +- Colorizer now handles #<builtin> correctly, also unicode strings and + 'as' keyword in comment directly following import command. Closes 1325071. + Patch 1479219 Tal Einat + +- Patch #1162825: Support non-ASCII characters in IDLE window titles. + +- Source file f.flush() after writing; trying to avoid lossage if user + kills GUI. + +- Options / Keys / Advanced dialog made functional. Also, allow binding + of 'movement' keys. + +- 'syntax' patch adds improved calltips and a new class attribute listbox. + MultiCall module allows binding multiple actions to an event. + Patch 906702 Noam Raphael + +- Better indentation after first line of string continuation. + IDLEfork Patch 681992, Noam Raphael + +- Fixed CodeContext alignment problem, following suggestion from Tal Einat. + +- Increased performance in CodeContext extension Patch 936169 Noam Raphael + +- Mac line endings were incorrect when pasting code from some browsers + when using X11 and the Fink distribution. Python Bug 1263656. + +- <Enter> when cursor is on a previous command retrieves that command. Instead + of replacing the input line, the previous command is now appended to the + input line. Indentation is preserved, and undo is enabled. + Patch 1196917 Jeff Shute + +- Clarify "tab/space" Error Dialog and "Tab Width" Dialog associated with + the Untabify command. + +- Corrected "tab/space" Error Dialog to show correct menu for Untabify. + Patch 1196980 Jeff Shute + +- New files are colorized by default, and colorizing is removed when + saving as non-Python files. Patch 1196895 Jeff Shute + Closes Python Bugs 775012 and 800432, partial fix IDLEfork 763524 + +- Improve subprocess link error notification. + +- run.py: use Queue's blocking feature instead of sleeping in the main + loop. Patch # 1190163 Michiel de Hoon + +- Add config-main option to make the 'history' feature non-cyclic. + Default remains cyclic. Python Patch 914546 Noam Raphael. + +- Removed ability to configure tabs indent from Options dialog. This 'feature' + has never worked and no one has complained. It is still possible to set a + default tabs (v. spaces) indent 'manually' via config-main.def (or to turn on + tabs for the current EditorWindow via the Format menu) but IDLE will + encourage indentation via spaces. + +- Enable setting the indentation width using the Options dialog. + Bug # 783877 + +- Add keybindings for del-word-left and del-word-right. + +- Discourage using an indent width other than 8 when using tabs to indent + Python code. + +- Restore use of EditorWindow.set_indentation_params(), was dead code since + Autoindent was merged into EditorWindow. This allows IDLE to conform to the + indentation width of a loaded file. (But it still will not switch to tabs + even if the file uses tabs.) Any change in indent width is local to that + window. + +- Add Tabnanny check before Run/F5, not just when Checking module. + +- If an extension can't be loaded, print warning and skip it instead of + erroring out. + +- Improve error handling when .idlerc can't be created (warn and exit). + +- The GUI was hanging if the shell window was closed while a raw_input() + was pending. Restored the quit() of the readline() mainloop(). + http://mail.python.org/pipermail/idle-dev/2004-December/002307.html + +- The remote procedure call module rpc.py can now access data attributes of + remote registered objects. Changes to these attributes are local, however. + + +What's New in IDLE 1.1? +======================= +*Release date: 30-NOV-2004* + +- On OpenBSD, terminating IDLE with ctrl-c from the command line caused a + stuck subprocess MainThread because only the SocketThread was exiting. + +- Saving a Keyset w/o making changes (by using the "Save as New Custom Key Set" + button) caused IDLE to fail on restart (no new keyset was created in + config-keys.cfg). Also true for Theme/highlights. Python Bug 1064535. + +- A change to the linecache.py API caused IDLE to exit when an exception was + raised while running without the subprocess (-n switch). Python Bug 1063840. + +- When paragraph reformat width was made configurable, a bug was + introduced that caused reformatting of comment blocks to ignore how + far the block was indented, effectively adding the indentation width + to the reformat width. This has been repaired, and the reformat + width is again a bound on the total width of reformatted lines. + +- Improve keyboard focus binding, especially in Windows menu. Improve + window raising, especially in the Windows menu and in the debugger. + IDLEfork 763524. + +- If user passes a non-existent filename on the commandline, just + open a new file, don't raise a dialog. IDLEfork 854928. + +- EditorWindow.py was not finding the .chm help file on Windows. Typo + at Rev 1.54. Python Bug 990954 + +- checking sys.platform for substring 'win' was breaking IDLE docs on Mac + (darwin). Also, Mac Safari browser requires full file:// URIs. SF 900580. + +- Redirect the warning stream to the shell during the ScriptBinding check of + user code and format the warning similarly to an exception for both that + check and for runtime warnings raised in the subprocess. + +- CodeContext hint pane visibility state is now persistent across sessions. + The pane no longer appears in the shell window. Added capability to limit + extensions to shell window or editor windows. Noam Raphael addition + to Patch 936169. + +- Paragraph reformat width is now a configurable parameter in the + Options GUI. + +- New Extension: CodeContext. Provides block structuring hints for code + which has scrolled above an edit window. Patch 936169 Noam Raphael. + +- If nulls somehow got into the strings in recent-files.lst + EditorWindow.update_recent_files_list() was failing. Python Bug 931336. + +- If the normal background is changed via Configure/Highlighting, it will + update immediately, thanks to the previously mentioned patch by Nigel Rowe. + +- Add a highlight theme for builtin keywords. Python Patch 805830 Nigel Rowe + This also fixed IDLEfork bug [ 693418 ] Normal text background color not + refreshed and Python bug [897872 ] Unknown color name on HP-UX + +- rpc.py:SocketIO - Large modules were generating large pickles when downloaded + to the execution server. The return of the OK response from the subprocess + initialization was interfering and causing the sending socket to be not + ready. Add an IO ready test to fix this. Moved the polling IO ready test + into pollpacket(). + +- Fix typo in rpc.py, s/b "pickle.PicklingError" not "pickle.UnpicklingError". + +- Added a Tk error dialog to run.py inform the user if the subprocess can't + connect to the user GUI process. Added a timeout to the GUI's listening + socket. Added Tk error dialogs to PyShell.py to announce a failure to bind + the port or connect to the subprocess. Clean up error handling during + connection initiation phase. This is an update of Python Patch 778323. + +- Print correct exception even if source file changed since shell was + restarted. IDLEfork Patch 869012 Noam Raphael + +- Keybindings with the Shift modifier now work correctly. So do bindings which + use the Space key. Limit unmodified user keybindings to the function keys. + Python Bug 775353, IDLEfork Bugs 755647, 761557 + +- After an exception, run.py was not setting the exception vector. Noam + Raphael suggested correcting this so pdb's postmortem pm() would work. + IDLEfork Patch 844675 + +- IDLE now does not fail to save the file anymore if the Tk buffer is not a + Unicode string, yet eol_convention is. Python Bugs 774680, 788378 + +- IDLE didn't start correctly when Python was installed in "Program Files" on + W2K and XP. Python Bugs 780451, 784183 + +- config-main.def documentation incorrectly referred to idle- instead of + config- filenames. SF 782759 Also added note about .idlerc location. + + +What's New in IDLE 1.0? +======================= +*Release date: 29-Jul-2003* + +- Added a banner to the shell discussing warnings possibly raised by personal + firewall software. Added same comment to README.txt. + +- Calltip error when docstring was None Python Bug 775541 + +- Updated extend.txt, help.txt, and config-extensions.def to correctly + reflect the current status of the configuration system. Python Bug 768469 + +- Fixed: Call Tip Trimming May Loop Forever. Python Patch 769142 (Daniels) + +- Replaced apply(f, args, kwds) with f(*args, **kwargs) to improve performance + Python Patch 768187 + +- Break or continue statements outside a loop were causing IDLE crash + Python Bug 767794 + +- Convert Unicode strings from readline to IOBinding.encoding. Also set + sys.std{in|out|err}.encoding, for both the local and the subprocess case. + SF IDLEfork patch 682347. + +- Extend AboutDialog.ViewFile() to support file encodings. Make the CREDITS + file Latin-1. + +- Updated the About dialog to reflect re-integration into Python. Provide + buttons to display Python's NEWS, License, and Credits, plus additional + buttons for IDLE's README and NEWS. + +- TextViewer() now has a third parameter which allows inserting text into the + viewer instead of reading from a file. + +- (Created the .../Lib/idlelib directory in the Python CVS, which is a clone of + IDLEfork modified to install in the Python environment. The code in the + interrupt module has been moved to thread.interrupt_main(). ) + +- Printing the Shell window was failing if it was not saved first SF 748975 + +- When using the Search in Files dialog, if the user had a selection + highlighted in his Editor window, insert it into the dialog search field. + +- The Python Shell entry was disappearing from the Windows menu. + +- Update the Windows file list when a file name change occurs + +- Change to File / Open Module: always pop up the dialog, using the current + selection as the default value. This is easier to use habitually. + +- Avoided a problem with starting the subprocess when 'localhost' doesn't + resolve to the user's loopback interface. SF 747772 + +- Fixed an issue with highlighted errors never de-colorizing. SF 747677. Also + improved notification of Tabnanny Token Error. + +- File / New will by default save in the directory of the Edit window from + which it was initiated. SF 748973 Guido van Rossum patch. + + +What's New in IDLEfork 0.9b1? +============================= +*Release date: 02-Jun-2003* + +- The current working directory of the execution environment (and shell + following completion of execution) is now that of the module being run. + +- Added the delete-exitfunc option to config-main.def. (This option is not + included in the Options dialog.) Setting this to True (the default) will + cause IDLE to not run sys.exitfunc/atexit when the subprocess exits. + +- IDLE now preserves the line ending codes when editing a file produced on + a different platform. SF 661759, SF 538584 + +- Reduced default editor font size to 10 point and increased window height + to provide a better initial impression on Windows. + +- Options / Fonts/Tabs / Set Base Editor Font: List box was not highlighting + the default font when first installed on Windows. SF 661676 + +- Added Autosave feature: when user runs code from edit window, if the file + has been modified IDLE will silently save it if Autosave is enabled. The + option is set in the Options dialog, and the default is to prompt the + user to save the file. SF 661318 Bruce Sherwood patch. + +- Improved the RESTART annotation in the shell window when the user restarts + the shell while it is generating output. Also improved annotation when user + repeatedly hammers the Ctrl-F6 restart. + +- Allow IDLE to run when not installed and cwd is not the IDLE directory + SF Patch 686254 "Run IDLEfork from any directory without set-up" - Raphael + +- When a module is run from an EditorWindow: if its directory is not in + sys.path, prepend it. This allows the module to import other modules in + the same directory. Do the same for a script run from the command line. + +- Correctly restart the subprocess if it is running user code and the user + attempts to run some other module or restarts the shell. Do the same if + the link is broken and it is possible to restart the subprocess and re- + connect to the GUI. SF RFE 661321. + +- Improved exception reporting when running commands or scripts from the + command line. + +- Added a -n command line switch to start IDLE without the subprocess. + Removed the Shell menu when running in that mode. Updated help messages. + +- Added a comment to the shell startup header to indicate when IDLE is not + using the subprocess. + +- Restore the ability to run without the subprocess. This can be important for + some platforms or configurations. (Running without the subprocess allows the + debugger to trace through parts of IDLE itself, which may or may not be + desirable, depending on your point of view. In addition, the traditional + reload/import tricks must be use if user source code is changed.) This is + helpful for developing IDLE using IDLE, because one instance can be used to + edit the code and a separate instance run to test changes. (Multiple + concurrent IDLE instances with subprocesses is a future feature) + +- Improve the error message a user gets when saving a file with non-ASCII + characters and no source encoding is specified. Done by adding a dialog + 'EncodingMessage', which contains the line to add in a fixed-font entry + widget, and which has a button to add that line to the file automatically. + Also, add a configuration option 'EditorWindow/encoding', which has three + possible values: none, utf-8, and locale. None is the default: IDLE will show + this dialog when non-ASCII characters are encountered. utf-8 means that files + with non-ASCII characters are saved as utf-8-with-bom. locale means that + files are saved in the locale's encoding; the dialog is only displayed if the + source contains characters outside the locale's charset. SF 710733 - Loewis + +- Improved I/O response by tweaking the wait parameter in various + calls to signal.signal(). + +- Implemented a threaded subprocess which allows interrupting a pass + loop in user code using the 'interrupt' extension. User code runs + in MainThread, while the RPCServer is handled by SockThread. This is + necessary because Windows doesn't support signals. + +- Implemented the 'interrupt' extension module, which allows a subthread + to raise a KeyboardInterrupt in the main thread. + +- Attempting to save the shell raised an error related to saving + breakpoints, which are not implemented in the shell + +- Provide a correct message when 'exit' or 'quit' are entered at the + IDLE command prompt SF 695861 + +- Eliminate extra blank line in shell output caused by not flushing + stdout when user code ends with an unterminated print. SF 695861 + +- Moved responsibility for exception formatting (i.e. pruning IDLE internal + calls) out of rpc.py into the client and server. + +- Exit IDLE cleanly even when doing subprocess I/O + +- Handle subprocess interrupt with an RPC message. + +- Restart the subprocess if it terminates itself. (VPython programs do that) + +- Support subclassing of exceptions, including in the shell, by moving the + exception formatting to the subprocess. + + +What's New in IDLEfork 0.9 Alpha 2? +=================================== +*Release date: 27-Jan-2003* + +- Updated INSTALL.txt to claify use of the python2 rpm. + +- Improved formatting in IDLE Help. + +- Run menu: Replace "Run Script" with "Run Module". + +- Code encountering an unhandled exception under the debugger now shows + the correct traceback, with IDLE internal levels pruned out. + +- If an exception occurs entirely in IDLE, don't prune the IDLE internal + modules from the traceback displayed. + +- Class Browser and Path Browser now use Alt-Key-2 for vertical zoom. + +- IDLE icons will now install correctly even when setup.py is run from the + build directory + +- Class Browser now compatible with Python2.3 version of pyclbr.py + +- Left cursor move in presence of selected text now moves from left end + of the selection. + +- Add Meta keybindings to "IDLE Classic Windows" to handle reversed + Alt/Meta on some Linux distros. + +- Change default: IDLE now starts with Python Shell. + +- Removed the File Path from the Additional Help Sources scrolled list. + +- Add capability to access Additional Help Sources on the web if the + Help File Path begins with //http or www. (Otherwise local path is + validated, as before.) + +- Additional Help Sources were not being posted on the Help menu in the + order entered. Implement sorting the list by [HelpFiles] 'option' + number. + +- Add Browse button to New Help Source dialog. Arrange to start in + Python/Doc if platform is Windows, otherwise start in current directory. + +- Put the Additional Help Sources directly on the Help menu instead of in + an Extra Help cascade menu. Rearrange the Help menu so the Additional + Help Sources come last. Update help.txt appropriately. + +- Fix Tk root pop-ups in configSectionNameDialog.py and configDialog.py + +- Uniform capitalization in General tab of ConfigDialog, update the doc string. + +- Fix bug in ConfigDialog where SaveAllChangedConfig() was unexpectedly + deleting Additional Help Sources from the user's config file. + +- Make configHelpSourceEdit OK button the default and bind <Return> + +- Fix Tk root pop-ups in configHelpSourceEdit: error dialogs not attached + to parents. + +- Use os.startfile() to open both Additional Help and Python Help on the + Windows platform. The application associated with the file type will act as + the viewer. Windows help files (.chm) are now supported via the + Settings/General/Additional Help facility. + +- If Python Help files are installed locally on Linux, use them instead of + accessing python.org. + +- Make the methods for finding the Python help docs more robust, and make + them work in the installed configuration, also. + +- On the Save Before Run dialog, make the OK button the default. One + less mouse action! + +- Add a method: EditorWindow.get_geometry() for future use in implementing + window location persistence. + +- Removed the "Help/Advice" menu entry. Thanks, David! We'll remember! + +- Change the "Classic Windows" theme's paste key to be <ctrl-v>. + +- Rearrange the Shell menu to put Stack Viewer entries adjacent. + +- Add the ability to restart the subprocess interpreter from the shell window; + add an associated menu entry "Shell/Restart" with binding Control-F6. Update + IDLE help. + +- Upon a restart, annotate the shell window with a "restart boundary". Add a + shell window menu "Shell/View Restart" with binding F6 to jump to the most + recent restart boundary. + +- Add Shell menu to Python Shell; change "Settings" to "Options". + +- Remove incorrect comment in setup.py: IDLEfork is now installed as a package. + +- Add INSTALL.txt, HISTORY.txt, NEWS.txt to installed configuration. + +- In installer text, fix reference to Visual Python, should be VPython. + Properly credit David Scherer. + +- Modified idle, idle.py, idle.pyw to improve exception handling. + + +What's New in IDLEfork 0.9 Alpha 1? +=================================== +*Release date: 31-Dec-2002* + +- First release of major new functionality. For further details refer to + Idle-dev and/or the Sourceforge CVS. + +- Adapted to the Mac platform. + +- Overhauled the IDLE startup options and revised the idle -h help message, + which provides details of command line usage. + +- Multiple bug fixes and usability enhancements. + +- Introduced the new RPC implementation, which includes a debugger. The output + of user code is to the shell, and the shell may be used to inspect the + environment after the run has finished. (In version 0.8.1 the shell + environment was separate from the environment of the user code.) + +- Introduced the configuration GUI and a new About dialog. + +- Removed David Scherer's Remote Procedure Call code and replaced with Guido + van Rossum's. GvR code has support for the IDLE debugger and uses the shell + to inspect the environment of code Run from an Edit window. Files removed: + ExecBinding.py, loader.py, protocol.py, Remote.py, spawn.py + +-------------------------------------------------------------------- +Refer to HISTORY.txt for additional information on earlier releases. +-------------------------------------------------------------------- diff --git a/Lib/idlelib/News3.txt b/Lib/idlelib/News3.txt new file mode 100644 index 000000000..da3a14581 --- /dev/null +++ b/Lib/idlelib/News3.txt @@ -0,0 +1,1415 @@ +What's New in IDLE 3.14.z +(since 3.14.0) +Released after 2025-10-07 +========================= + + +gh-143774: Better explain the operation of Format / Format Paragraph. +Patch by Terry J. Reedy. + +gh-139742: Colorize t-string prefixes for template strings in IDLE, +as done for f-string prefixes. Patch by Anuradha Agrawal. + +What's New in IDLE 3.14.0 +(since 3.13.0) +Released on 2025-10-07 +========================= + +gh-129873: Simplify displaying the IDLE doc by only copying the text +section of idle.html to idlelib/help.html. Patch by Stan Ulbrych. + +gh-112936: IDLE - Include Shell menu in single-process mode, +though with Restart Shell and View Last Restart disabled. +Patch by Zhikang Yan. + +gh-112938: IDLE - Fix uninteruptable hang when Shell gets +rapid continuous output. + +gh-127060: Set TERM environment variable to 'dumb' to not add ANSI escape +sequences for text color in tracebacks. IDLE does not understand them. +Patch by Victor Stinner. + +gh-122392: Increase currently inadequate vertical spacing for the IDLE +browsers (path, module, and stack) on high-resolution monitors. + + +What's New in IDLE 3.13.0 +(since 3.12.0) +Released on 2024-10-07 +========================= + +gh-120104: Fix padding in config and search dialog windows in IDLE. + +gh-120083: Add explicit black IDLE Hovertip foreground color needed for +recent macOS. Fixes Sonoma showing unreadable white on pale yellow. +Patch by John Riggles. + +gh-122482: Change About IDLE to direct users to discuss.python.org +instead of the now unused idle-dev email and mailing list. + +gh-78889: Stop Shell freezes by blocking user access to non-method +sys.stdout.shell attributes, which are all private. + +gh-78955: Use user-selected color theme for Help => IDLE Doc. + +gh-96905: In idlelib code, stop redefining built-ins 'dict' and 'object'. + +gh-72284: Improve the lists of features, editor key bindings, +and shell key bingings in the IDLE doc. + +gh-113903: Fix rare failure of test.test_idle, in test_configdialog. + +gh-113729: Fix the "Help -> IDLE Doc" menu bug in 3.11.7 and 3.12.1. + +gh-57795: Enter selected text into the Find box when opening +a Replace dialog. Patch by Roger Serwy and Zackery Spytz. + +gh-113269: Fix test_editor hang on macOS Catalina. +Patch by Terry Reedy. + +gh-112939: Fix processing unsaved files when quitting IDLE on macOS. +Patch by Ronald Oussoren and Christopher Chavez. + +gh-79871: Add docstrings to debugger.py. Fix two bugs in +test_debugger and expand coverage by 47%. Patch by Anthony Shaw. + + +What's New in IDLE 3.12.0 +(since 3.11.0) +Released on 2023-10-02 +========================= + +gh-104719: Remove IDLE's modification of tokenize.tabsize and test +other uses of tokenize data and methods. + +gh-104499: Fix completions for Tk Aqua 8.7 (currently blank). + +gh-104486: Make About print both tcl and tk versions if different, +as is expected someday. + +gh-88496 Fix IDLE test hang on macOS. + +gh-103314 Support sys.last_exc after exceptions in Shell. +Patch by Irit Katriel. + + +What's New in IDLE 3.11.0 +(since 3.10.0) +Released on 2022-10-24 +========================= + +gh-97527: Fix a bug in the previous bugfix that caused IDLE to not +start when run with 3.10.8, 3.12.0a1, and at least Microsoft Python +3.10.2288.0 installed without the Lib/test package. 3.11.0 was never +affected. + +gh-65802: Document handling of extensions in Save As dialogs. + +gh-95191: Include prompts when saving Shell (interactive input/output). + +gh-95511: Fix the Shell context menu copy-with-prompts bug of copying +an extra line when one selects whole lines. + +gh-95471: Tweak Edit menu. Move 'Select All' above 'Cut' as it is used +with 'Cut' and 'Copy' but not 'Paste'. Add a separator between 'Replace' +and 'Go to Line' to help IDLE issue triagers. + +gh-95411: Enable using IDLE's module browser with .pyw files. + +gh-89610: Add .pyi as a recognized extension for IDLE on macOS. This allows +opening stub files by double clicking on them in the Finder. + +bpo-28950: Apply IDLE syntax highlighting to `.pyi` files. Add util.py +for common components. Patch by Alex Waygood and Terry Jan Reedy. + +bpo-46630: Make query dialogs on Windows start with a cursor in the +entry box. + +bpo-46591: Make the IDLE doc URL on the About IDLE dialog clickable. + +bpo-45296: Clarify close, quit, and exit in IDLE. In the File menu, +'Close' and 'Exit' are now 'Close Window' (the current one) and 'Exit' +is now 'Exit IDLE' (by closing all windows). In Shell, 'quit()' and +'exit()' mean 'close Shell'. If there are no other windows, +this also exits IDLE. + +bpo-45495: Add context keywords 'case' and 'match' to completions list. + +bpo-45296: On Windows, change exit/quit message to suggest Ctrl-D, which +works, instead of <Ctrl-Z Return>, which does not work in IDLE. + + +What's New in IDLE 3.10.0 +(since 3.9.0) +Released on 2021-10-04 +========================= + +bpo-45193: Make completion boxes appear on Ubuntu again. + +bpo-40128: Mostly fix completions on macOS when not using tcl/tk 8.6.11 +(as with 3.9). + +bpo-33962: Move the indent space setting from the Font tab to the new Windows +tab. Patch by Mark Roseman and Terry Jan Reedy. + +bpo-40468: Split the settings dialog General tab into Windows and Shell/Ed +tabs. Move help sources, which extend the Help menu, to the Extensions tab. +Make space for new options and shorten the dialog. The latter makes the +dialog better fit small screens. + +bpo-44010: Highlight the new match statement's soft keywords: match, case, +and _. This highlighting is not perfect and will be incorrect in some rare +cases, especially for some _s in case patterns. + +bpo-44026: Include interpreter's typo fix suggestions in message line +for NameErrors and AttributeErrors. Patch by E. Paine. + +bpo-41611: Avoid occasional uncaught exceptions and freezing when using +completions on macOS. + +bpo-37903: Add mouse actions to the shell sidebar. Left click and +optional drag selects one or more lines of text, as with the +editor line number sidebar. Right click after selecting text lines +displays a context menu with 'copy with prompts'. This zips together +prompts from the sidebar with lines from the selected text. This option +also appears on the context menu for the text. + +bpo-43981: Fix reference leaks in test_sidebar and test_squeezer. +Patches by Terry Jan Reedy and Pablo Galindo + +bpo-37892: Change Shell input indents from tabs to spaces. Shell input +now 'looks right'. Making this feasible motivated the shell sidebar. + +bpo-37903: Move the Shell input prompt to a side bar. + +bpo-43655: Make window managers on macOS and X Window recognize +IDLE dialog windows as dialogs. + +bpo-42225: Document that IDLE can fail on Unix either from misconfigured IP +masquerade rules or failure displaying complex colored (non-ascii) characters. + +bpo-43283: Document why printing to IDLE's Shell is often slower than +printing to a system terminal and that it can be made faster by +pre-formatting a single string before printing. + +bpo-23544: Disable Debug=>Stack Viewer when user code is running or +Debugger is active, to prevent hang or crash. Patch by Zackery Spytz. + +bpo-43008: Make IDLE invoke :func:`sys.excepthook` in normal, +2-process mode. User hooks were previously ignored. +Patch by Ken Hilton. + +bpo-33065: Fix problem debugging user classes with __repr__ method. + +bpo-32631: Finish zzdummy example extension module: make menu entries +work; add docstrings and tests with 100% coverage. + +bpo-42508: Keep IDLE running on macOS. Remove obsolete workaround +that prevented running files with shortcuts when using new universal2 +installers built on macOS 11. + +bpo-42426: Fix reporting offset of the RE error in searchengine. + +bpo-42416: Display docstrings in IDLE calltips in more cases, +by using inspect.getdoc. + +bpo-33987: Mostly finish using ttk widgets, mainly for editor, +settings, and searches. Some patches by Mark Roseman. + +bpo-40511: Stop unnecessary "flashing" when typing opening and closing +parentheses inside the parentheses of a function call. + +bpo-38439: Add a 256x256 pixel IDLE icon to the Windows .ico file. Created by +Andrew Clover. Remove the low-color gif variations from the .ico file. + +bpo-41775: Make 'IDLE Shell' the shell title. + +bpo-35764: Rewrite the Calltips doc section. + +bpo-40181: In calltips, stop reminding that '/' marks the end of +positional-only arguments. + + +What's New in IDLE 3.9.0 (since 3.8.0) +Released on 2020-10-05? +====================================== + +bpo-41468: Improve IDLE run crash error message (which users should +never see). + +bpo-41373: Save files loaded with no line ending, as when blank, or +different line endings, by setting its line ending to the system +default. Fix regression in 3.8.4 and 3.9.0b4. + +bpo-41300: Save files with non-ascii chars. Fix regression in +3.9.0b4 and 3.8.4. + +bpo-37765: Add keywords to module name completion list. Rewrite +Completions section of IDLE doc. + +bpo-41152: The encoding of ``stdin``, ``stdout`` and ``stderr`` in IDLE +is now always UTF-8. + +bpo-41144: Make Open Module open a special module such as os.path. + +bpo-40723: Make test_idle pass when run after import. +Patch by Florian Dahlitz. + +bpo-38689: IDLE will no longer freeze when inspect.signature fails +when fetching a calltip. + +bpo-27115: For 'Go to Line', use a Query entry box subclass with +IDLE standard behavior and improved error checking. + +bpo-39885: When a context menu is invoked by right-clicking outside +of a selection, clear the selection and move the cursor. Cut and +Copy require that the click be within the selection. + +bpo-39852: Edit "Go to line" now clears any selection, preventing +accidental deletion. It also updates Ln and Col on the status bar. + +bpo-39781: Selecting code context lines no longer causes a jump. + +bpo-39663: Add tests for pyparse find_good_parse_start(). + +bpo-39600: Remove duplicate font names from configuration list. + +bpo-38792: Close a shell calltip if a :exc:`KeyboardInterrupt` +or shell restart occurs. Patch by Zackery Spytz. + +bpo-30780: Add remaining configdialog tests for buttons and +highlights and keys tabs. + +bpo-39388: Settings dialog Cancel button cancels pending changes. + +bpo-39050: Settings dialog Help button again displays help text. + +bpo-32989: Add tests for editor newline_and_indent_event method. +Remove unneeded arguments and dead code from pyparse +find_good_parse_start method. + +bpo-38943: Fix autocomplete windows not always appearing on some +systems. Patch by Johnny Najera. + +bpo-38944: Escape key now closes IDLE completion windows. Patch by +Johnny Najera. + +bpo-38862: 'Strip Trailing Whitespace' on the Format menu removes extra +newlines at the end of non-shell files. + +bpo-38636: Fix IDLE Format menu tab toggle and file indent width. These +functions (default shortcuts Alt-T and Alt-U) were mistakenly disabled +in 3.7.5 and 3.8.0. + +bpo-4630: Add an option to toggle IDLE's cursor blink for shell, +editor, and output windows. See Settings, General, Window Preferences, +Cursor Blink. Patch by Zackery Spytz. + +bpo-26353: Stop adding newline when saving an IDLE shell window. + +bpo-38598: Do not try to compile IDLE shell or output windows. + + +What's New in IDLE 3.8.0 (since 3.7.0) +Released on 2019-10-14 +====================================== + +bpo-36698: IDLE no longer fails when writing non-encodable characters +to stderr. It now escapes them with a backslash, like the regular +Python interpreter. Add an errors field to the standard streams. + +bpo-13153: Improve tkinter's handing of non-BMP (astral) unicode +characters, such as 'rocket \U0001f680'. Whether a proper glyph or +replacement char is displayed depends on the OS and font. For IDLE, +astral chars in code interfere with editing. + +bpo-35379: When exiting IDLE, catch any AttributeError. One happens +when EditorWindow.close is called twice. Printing a traceback, when +IDLE is run from a terminal, is useless and annoying. + +bpo-38183: To avoid test issues, test_idle ignores the user config +directory. It no longer tries to create or access .idlerc or any files +within. Users must run IDLE to discover problems with saving settings. + +bpo-38077: IDLE no longer adds 'argv' to the user namespace when +initializing it. This bug only affected 3.7.4 and 3.8.0b2 to 3.8.0b4. + +bpo-38401: Shell restart lines now fill the window width, always start +with '=', and avoid wrapping unnecessarily. The line will still wrap +if the included file name is long relative to the width. + +bpo-37092: Add mousewheel scrolling for IDLE module, path, and stack +browsers. Patch by George Zhang. + +bpo-35771: To avoid occasional spurious test_idle failures on slower +machines, increase the ``hover_delay`` in test_tooltip. + +bpo-37824: Properly handle user input warnings in IDLE shell. +Cease turning SyntaxWarnings into SyntaxErrors. + +bpo-37929: IDLE Settings dialog now closes properly when there is no +shell window. + +bpo-37849: Fix completions list appearing too high or low when shown +above the current line. + +bpo-36419: Refactor autocompete and improve testing. + +bpo-37748: Reorder the Run menu. Put the most common choice, +Run Module, at the top. + +bpo-37692: Improve highlight config sample with example shell +interaction and better labels for shell elements. + +bpo-37628: Settings dialog no longer expands with font size. +The font and highlight sample boxes gain scrollbars instead. + +bpo-17535: Add optional line numbers for IDLE editor windows. + +bpo-37627: Initialize the Customize Run dialog with the command line +arguments most recently entered before. The user can optionally edit +before submitting them. + +bpo-33610: Code context always shows the correct context when toggled on. + +bpo-36390: Gather Format menu functions into format.py. Combine +paragraph.py, rstrip.py, and format methods from editor.py. + +bpo-37530: Optimize code context to reduce unneeded background activity. +Font and highlight changes now occur along with text changes instead +of after a random delay. + +bpo-27452: Cleanup config.py by inlining RemoveFile and simplifying +the handling of __file__ in CreateConfigHandlers/ + +bpo-26806: To compensate for stack frames added by IDLE and avoid +possible problems with low recursion limits, add 30 to limits in the +user code execution process. Subtract 30 when reporting recursion +limits to make this addition mostly transparent. + +bpo-37325: Fix tab focus traversal order for help source and custom +run dialogs. + +bpo-37321: Both subprocess connection error messages now refer to +the 'Startup failure' section of the IDLE doc. + +bpo-37177: Properly attach search dialogs to their main window so +that they behave like other dialogs and do not get hidden behind +their main window. + +bpo-37039: Adjust "Zoom Height" to individual screens by momentarily +maximizing the window on first use with a particular screen. Changing +screen settings may invalidate the saved height. While a window is +maximized, "Zoom Height" has no effect. + +bpo-35763: Make calltip reminder about '/' meaning positional-only less +obtrusive by only adding it when there is room on the first line. + +bpo-5680: Add 'Run Customized' to the Run menu to run a module with +customized settings. Any command line arguments entered are added +to sys.argv. One can suppress the normal Shell main module restart. + +bpo-35610: Replace now redundant editor.context_use_ps1 with +.prompt_last_line. This finishes change started in bpo-31858. + +bpo-32411: Stop sorting dict created with desired line order. + +bpo-37038: Make idlelib.run runnable; add test clause. + +bpo-36958: Print any argument other than None or int passed to +SystemExit or sys.exit(). + +bpo-36807: When saving a file, call file.flush() and os.fsync() +so bits are flushed to e.g. a USB drive. + +bpo-36429: Fix starting IDLE with pyshell. +Add idlelib.pyshell alias at top; remove pyshell alias at bottom. +Remove obsolete __name__=='__main__' command. + +bpo-30348: Increase test coverage of idlelib.autocomplete by 30%. +Patch by Louie Lu. + +bpo-23205: Add tests and refactor grep's findfiles. + +bpo-36405: Use dict unpacking in idlelib. + +bpo-36396: Remove fgBg param of idlelib.config.GetHighlight(). +This param was only used twice and changed the return type. + +bpo-23216: IDLE: Add docstrings to search modules. + +bpo-36176: Fix IDLE autocomplete & calltip popup colors. +Prevent conflicts with Linux dark themes +(and slightly darken calltip background). + +bpo-36152: Remove colorizer.ColorDelegator.close_when_done and the +corresponding argument of .close(). In IDLE, both have always been +None or False since 2007. + +bpo-36096: Make colorizer state variables instance-only. + +bpo-32129: Avoid blurry IDLE application icon on macOS with Tk 8.6. +Patch by Kevin Walzer. + +bpo-24310: Document settings dialog font tab sample. + +bpo-35689: Add docstrings and tests for colorizer. + +bpo-35833: Revise IDLE doc for control codes sent to Shell. +Add a code example block. + +bpo-35770: IDLE macosx deletes Options => Configure IDLE. +It previously deleted Window => Zoom Height by mistake. +(Zoom Height is now on the Options menu). On Mac, the settings +dialog is accessed via Preferences on the IDLE menu. + +bpo-35769: Change new file name from 'Untitled' to 'untitled'. + +bpo-35660: Fix imports in window module. + +bpo-35641: Properly format calltip for function without docstring. + +bpo-33987: Use ttk Frame for ttk widgets. + +bpo-34055: Fix erroneous 'smart' indents and newlines in IDLE Shell. + +bpo-28097: Add Previous/Next History entries to Shell menu. + +bpo-35591: Find Selection now works when selection not found. + +bpo-35598: Update config_key: use PEP 8 names and ttk widgets, +make some objects global, and add tests. + +bpo-35196: Speed up squeezer line counting. + +bpo-35208: Squeezer now counts wrapped lines before newlines. + +bpo-35555: Gray out Code Context menu entry when it's not applicable. + +bpo-22703: Improve the Code Context and Zoom Height menu labels. +The Code Context menu label now toggles between Show/Hide Code Context. +The Zoom Height menu now toggles between Zoom/Restore Height. +Zoom Height has moved from the Window menu to the Options menu. + +bpo-35521: Document the editor code context feature. +Add some internal references within the IDLE doc. + +bpo-34864: When starting IDLE on MacOS, warn if the system setting +"Prefer tabs when opening documents" is "Always". As previous +documented for this issue, running IDLE with this setting causes +problems. If the setting is changed while IDLE is running, +there will be no warning until IDLE is restarted. + +bpo-35213: Where appropriate, use 'macOS' in idlelib. + +bpo-34864: Document two IDLE on MacOS issues. The System Preferences +Dock "prefer tabs always" setting disables some IDLE features. +Menus are a bit different than as described for Windows and Linux. + +bpo-35202: Remove unused imports in idlelib. + +bpo-33000: Document that IDLE's shell has no line limit. +A program that runs indefinitely can overfill memory. + +bpo-23220: Explain how IDLE's Shell displays output. +Add new subsection "User output in Shell". + +bpo-35099: Improve the doc about IDLE running user code. +"IDLE -- console differences" is renamed "Running user code". +It mostly covers the implications of using custom sys.stdxxx objects. + +bpo-35097: Add IDLE doc subsection explaining editor windows. +Topics include opening, title and status bars, .py* extension, and running. + +Issue 35093: Document the IDLE document viewer in the IDLE doc. +Add a paragraph in "Help and preferences", "Help sources" subsection. + +bpo-1529353: Explain Shell text squeezing in the IDLE doc. + +bpo-35088: Update idlelib.help.copy_string docstring. +We now use git and backporting instead of hg and forward merging. + +bpo-35087: Update idlelib help files for the current doc build. +The main change is the elimination of chapter-section numbers. + +bpo-1529353: Output over N lines (50 by default) is squeezed down to a button. +N can be changed in the PyShell section of the General page of the +Settings dialog. Fewer, but possibly extra long, lines can be squeezed by +right clicking on the output. Squeezed output can be expanded in place +by double-clicking the button or into the clipboard or a separate window +by right-clicking the button. + +bpo-34548: Use configured color theme for read-only text views. + +bpo-33839: Refactor ToolTip and CallTip classes; add documentation +and tests. + +bpo-34047: Fix mouse wheel scrolling direction on macOS. + +bpo-34275: Make calltips always visible on Mac. +Patch by Kevin Walzer. + +bpo-34120: Fix freezing after closing some dialogs on Mac. +This is one of multiple regressions from using newer tcl/tk. + +bpo-33975: Avoid small type when running htests. +Since part of the purpose of human-viewed tests is to determine that +widgets look right, it is important that they look the same for +testing as when running IDLE. + +bpo-33905: Add test for idlelib.stackview.StackBrowser. + +bpo-33924: Change mainmenu.menudefs key 'windows' to 'window'. +Every other menudef key is the lowercase version of the +corresponding main menu entry (in this case, 'Window'). + +bpo-33906: Rename idlelib.windows as window +Match Window on the main menu and remove last plural module name. +Change imports, test, and attribute references to match new name. + +bpo-33917: Fix and document idlelib/idle_test/template.py. +The revised file compiles, runs, and tests OK. idle_test/README.txt +explains how to use it to create new IDLE test files. + +bpo-33904: In rstrip module, rename class RstripExtension as Rstrip. + +bpo-33907: For consistency and clarity, rename calltip objects. +Module calltips and its class CallTips are now calltip and Calltip. +In module calltip_w, class CallTip is now CalltipWindow. + +bpo-33855: Minimally test all IDLE modules. +Standardize the test file format. Add missing test files that import +the tested module and perform at least one test. Check and record the +coverage of each test. + +bpo-33856: Add 'help' to Shell's initial welcome message. + + +What's New in IDLE 3.7.0 (since 3.6.0) +Released on 2018-06-27 +====================================== + +bpo-33656: On Windows, add API call saying that tk scales for DPI. +On Windows 8.1+ or 10, with DPI compatibility properties of the Python +binary unchanged, and a monitor resolution greater than 96 DPI, this +should make text and lines sharper and some colors brighter. +On other systems, it should have no effect. If you have a custom theme, +you may want to adjust a color or two. If perchance it make text worse +on your monitor, you can disable the ctypes.OleDLL call near the top of +pyshell.py and report the problem on python-list or idle-dev@python.org. + +bpo-33768: Clicking on a context line moves that line to the top +of the editor window. + +bpo-33763: Replace the code context label widget with a text widget. + +bpo-33664: Scroll IDLE editor text by lines. +(Previously, the mouse wheel and scrollbar slider moved text by a fixed +number of pixels, resulting in partial lines at the top of the editor +box.) This change also applies to the shell and grep output windows, +but currently not to read-only text views. + +bpo-33679: Enable theme-specific color configuration for Code Context. +(Previously, there was one code context foreground and background font +color setting, default or custom, on the extensions tab, that applied +to all themes.) For built-in themes, the foreground is the same as +normal text and the background is a contrasting gray. Context colors for +custom themes are set on the Highlights tab along with other colors. +When one starts IDLE from a console and loads a custom theme without +definitions for 'context', one will see a warning message on the +console. + +bpo-33642: Display up to maxlines non-blank lines for Code Context. +If there is no current context, show a single blank line. (Previously, +the Code Context had numlines lines, usually with some blank.) The use +of a new option, 'maxlines' (default 15), avoids possible interference +with user settings of the old option, 'numlines' (default 3). + +bpo-33628: Cleanup codecontext.py and its test. + +bpo-32831: Add docstrings and tests for codecontext.py. +Coverage is 100%. Patch by Cheryl Sabella. + +bpo-33564: Code context now recognizes async as a block opener. + +bpo-21474: Update word/identifier definition from ascii to unicode. +In text and entry boxes, this affects selection by double-click, +movement left/right by control-left/right, and deletion left/right +by control-BACKSPACE/DEL. + +bpo-33204: Consistently color invalid string prefixes. +A 'u' string prefix cannot be paired with either 'r' or 'f'. +IDLE now consistently colors as much of the prefix, starting at the +right, as is valid. Revise and extend colorizer test. + +bpo-32984: Set __file__ while running a startup file. +Like Python, IDLE optionally runs 1 startup file in the Shell window +before presenting the first interactive input prompt. For IDLE, +option -s runs a file named in environmental variable IDLESTARTUP or +PYTHONSTARTUP; -r file runs file. Python sets __file__ to the startup +file name before running the file and unsets it before the first +prompt. IDLE now does the same when run normally, without the -n +option. + +bpo-32940: Replace StringTranslatePseudoMapping with faster code. + +bpo-32916: Change 'str' to 'code' in idlelib.pyparse and users. + +bpo-32905: Remove unused code in pyparse module. + +bpo-32874: IDLE - add pyparse tests with 97% coverage. + +bpo-32837: IDLE - require encoding argument for textview.view_file. +Using the system and place-dependent default encoding for open() +is a bad idea for IDLE's system and location-independent files. + +bpo-32826: Add "encoding=utf-8" to open() in IDLE's test_help_about. +GUI test test_file_buttons() only looks at initial ascii-only lines, +but failed on systems where open() defaults to 'ascii' because +readline() internally reads and decodes far enough ahead to encounter +a non-ascii character in CREDITS.txt. + +bpo-32765: Update configdialog General tab create page docstring. +Add new widgets to the widget list. + +bpo-32207: Improve tk event exception tracebacks in IDLE. +When tk event handling is driven by IDLE's run loop, a confusing +and distracting queue.EMPTY traceback context is no longer added +to tk event exception tracebacks. The traceback is now the same +as when event handling is driven by user code. Patch based on +a suggestion by Serhiy Storchaka. + +bpo-32164: Delete unused file idlelib/tabbedpages.py. +Use of TabbedPageSet in configdialog was replaced by ttk.Notebook. + +bpo-32100: Fix old and new bugs in pathbrowser; improve tests. +Patch mostly by Cheryl Sabella. + +bpo-31860: The font sample in the settings dialog is now editable. +Edits persist while IDLE remains open. +Patch by Serhiy Storchake and Terry Jan Reedy. + +bpo-31858: Restrict shell prompt manipulation to the shell. +Editor and output windows only see an empty last prompt line. This +simplifies the code and fixes a minor bug when newline is inserted. +Sys.ps1, if present, is read on Shell start-up, but is not set or changed. +Patch by Terry Jan Reedy. + +bpo-28603: Fix a TypeError that caused a shell restart when printing +a traceback that includes an exception that is unhashable. +Patch by Zane Bitter. + +bpo-13802: Use non-Latin characters in the Font settings sample. +Even if one selects a font that defines a limited subset of the unicode +Basic Multilingual Plane, tcl/tk will use other fonts that define a +character. The expanded example give users of non-Latin characters +a better idea of what they might see in the shell and editors. + +To make room for the expanded sample, frames on the Font tab are +re-arranged. The Font/Tabs help explains a bit about the additions. +Patch by Terry Jan Reedy + +bpo-31460: Simplify the API of IDLE's Module Browser. +Passing a widget instead of an flist with a root widget opens the +option of creating a browser frame that is only part of a window. +Passing a full file name instead of pieces assumed to come from a +.py file opens the possibility of browsing python files that do not +end in .py. + +bpo-31649: Make _htest and _utest parameters keyword-only. +These are used to adjust code for human and unit tests. + +bpo-31459: Rename module browser from Class Browser to Module Browser. +The original module-level class and method browser became a module +browser, with the addition of module-level functions, years ago. +Nested classes and functions were added yesterday. For back- +compatibility, the virtual event <<open-class-browser>>, which +appears on the Keys tab of the Settings dialog, is not changed. +Patch by Cheryl Sabella. + +bpo-1612262: Module browser now shows nested classes and functions. +Original patches for code and tests by Guilherme Polo and +Cheryl Sabella, respectively. Revisions by Terry Jan Reedy. + +bpo-31500: Tk's default fonts now are scaled on HiDPI displays. +This affects all dialogs. Patch by Serhiy Storchaka. + +bpo-31493: Fix code context update and font update timers. +Canceling timers prevents a warning message when test_idle completes. + +bpo-31488: Update non-key options in former extension classes. +When applying configdialog changes, call .reload for each feature class. +Change ParenMatch so updated options affect existing instances attached +to existing editor windows. + +bpo-31477: Improve rstrip entry in IDLE doc. +Strip Trailing Whitespace strips more than blank spaces. +Multiline string literals are not skipped. + +bpo-31480: fix tests to pass with zzdummy extension disabled. (#3590) +To see the example in action, enable it on options extensions tab. + +bpo-31421: Document how IDLE runs tkinter programs. +IDLE calls tcl/tk update in the background in order to make live +interaction and experimentation with tkinter applications much easier. + +bpo-31414: Fix tk entry box tests by deleting first. +Adding to an int entry is not the same as deleting and inserting +because int('') will fail. Patch by Terry Jan Reedy. + +bpo-27099: Convert IDLE's built-in 'extensions' to regular features. + About 10 IDLE features were implemented as supposedly optional +extensions. Their different behavior could be confusing or worse for +users and not good for maintenance. Hence the conversion. + The main difference for users is that user configurable key bindings +for builtin features are now handled uniformly. Now, editing a binding +in a keyset only affects its value in the keyset. All bindings are +defined together in the system-specific default keysets in config- +extensions.def. All custom keysets are saved as a whole in config- +extension.cfg. All take effect as soon as one clicks Apply or Ok. + The affected events are '<<force-open-completions>>', +'<<expand-word>>', '<<force-open-calltip>>', '<<flash-paren>>', +'<<format-paragraph>>', '<<run-module>>', '<<check-module>>', and +'<<zoom-height>>'. Any (global) customizations made before 3.6.3 will +not affect their keyset-specific customization after 3.6.3. and vice +versa. + Initial patch by Charles Wohlganger, revised by Terry Jan Reedy. + +bpo-31051: Rearrange configdialog General tab. +Sort non-Help options into Window (Shell+Editor) and Editor (only). +Leave room for the addition of new options. +Patch by Terry Jan Reedy. + +bpo-30617: Add docstrings and tests for outwin subclass of editor. +Move some data and functions from the class to module level. +Patch by Cheryl Sabella. + +bpo-31287: Do not modify tkinter.messagebox in test_configdialog. +Instead, mask it with an instance mock that can be deleted. +Patch by Terry Jan Reedy. + +bpo-30781: Use ttk widgets in ConfigDialog pages. +These should especially look better on MacOSX. +Patches by Terry Jan Reedy and Cheryl Sabella. + +bpo-31206: Factor HighPage(Frame) class from ConfigDialog. +Patch by Cheryl Sabella. + +bp0-31001: Add tests for configdialog highlight tab. +Patch by Cheryl Sabella. + +bpo-31205: Factor KeysPage(Frame) class from ConfigDialog. +The slightly modified tests continue to pass. +Patch by Cheryl Sabella. + +bpo-31002: Add tests for configdialog keys tab. +Patch by Cheryl Sabella. + +bpo-19903: Change calltipes to use inspect.signature. +Idlelib.calltips.get_argspec now uses inspect.signature instead of +inspect.getfullargspec, like help() does. This improves the signature +in the call tip in a few different cases, including builtins converted +to provide a signature. A message is added if the object is not +callable, has an invalid signature, or if it has positional-only +parameters. Patch by Louie Lu. + +bop-31083: Add an outline of a TabPage class in configdialog. +Add template as comment. Update existing classes to match outline. +Initial patch by Cheryl Sabella. + +bpo-31050: Factor GenPage(Frame) class from ConfigDialog. +The slightly modified tests for the General tab continue to pass. +Patch by Cheryl Sabella. + +bpo-31004: Factor FontPage(Frame) class from ConfigDialog. +The slightly modified tests continue to pass. The General test +broken by the switch to ttk.Notebook is fixed. +Patch mostly by Cheryl Sabella. + +bpo-30781: IDLE - Use ttk Notebook in ConfigDialog. +This improves navigation by tabbing. +Patch by Terry Jan Reedy. + +bpo-31060: IDLE - Finish rearranging methods of ConfigDialog. +Grouping methods pertaining to each tab and the buttons will aid +writing tests and improving the tabs and will enable splitting the +groups into classes. +Patch by Terry Jan Reedy. + +bpo-30853: IDLE -- Factor a VarTrace class out of ConfigDialog. +Instance tracers manages pairs consisting of a tk variable and a +callback function. When tracing is turned on, setting the variable +calls the function. Test coverage for the new class is 100%. +Patch by Terry Jan Reedy. + +bpo-31003: IDLE: Add more tests for General tab. +Patch by Terry Jan Reedy. + +bpo-30993: IDLE - Improve configdialog font page and tests. +*In configdialog: Document causal pathways in create_font_tab +docstring. Simplify some attribute names. Move set_samples calls to +var_changed_font (idea from Cheryl Sabella). Move related functions to +positions after the create widgets function. +* In test_configdialog: Fix test_font_set so not order dependent. Fix +renamed test_indent_scale so it tests the widget. Adjust tests for +movement of set_samples call. Add tests for load functions. Put all +font tests in one class and tab indent tests in another. Except for +two lines, these tests completely cover the related functions. +Patch by Terry Jan Reedy. + +bpo-30981: IDLE -- Add more configdialog font page tests. + +bpo-28523: IDLE: replace 'colour' with 'color' in configdialog. + +bpo-30917: Add tests for idlelib.config.IdleConf. +Increase coverage from 46% to 96%. +Patch by Louie Lu. + +bpo-30913: Document ConfigDialog tk Vars, methods, and widgets in docstrings +This will facilitate improving the dialog and splitting up the class. +Original patch by Cheryl Sabella. + +bpo-30899: Add tests for ConfigParser subclasses in config. +Coverage is 100% for those classes and ConfigChanges. +Patch by Louie Lu. + +bpo-30881: Add docstrings to browser.py. +Patch by Cheryl Sabella. + +bpo-30851: Remove unused tk variables in configdialog. +One is a duplicate, one is set but cannot be altered by users. +Patch by Cheryl Sabella. + +bpo-30870: Select font option with Up and Down keys, as well as with mouse. +Added test increases configdialog coverage to 60% +Patches mostly by Louie Lu. + +bpo-8231: Call config.IdleConf.GetUserCfgDir only once per process. + +bpo-30779: Factor ConfigChanges class from configdialog, put in config; test. +* In config, put dump test code in a function; run it and unittest in + 'if __name__ == '__main__'. +* Add class config.ConfigChanges based on changes_class_v4.py on bpo issue. +* Add class test_config.ChangesTest, partly using configdialog_tests_v1.py. +* Revise configdialog to use ConfigChanges; see tracker msg297804. +* Revise test_configdialog to match configdialog changes. +* Remove configdialog functions unused or moved to ConfigChanges. +Cheryl Sabella contributed parts of the patch. + +bpo-30777: Configdialog - add docstrings and improve comments. +Patch by Cheryl Sabella. + +bpo-30495: Improve textview with docstrings, PEP8 names, and more tests. +Split TextViewer class into ViewWindow, ViewFrame, and TextFrame classes +so that instances of the latter two can be placed with other widgets +within a multiframe window. +Patches by Cheryl Sabella and Terry Jan Reedy. + +bpo-30723: Make several improvements to parenmatch. +* Add 'parens' style to highlight both opener and closer. +* Make 'default' style, which is not default, a synonym for 'opener'. +* Make time-delay work the same with all styles. +* Add help for config dialog extensions tab, including parenmatch. +* Add new tests. +Original patch by Charles Wohlganger. Revisions by Terry Jan Reedy + +bpo-30674: Grep -- Add docstrings. Patch by Cheryl Sabella. + +bpo-21519: IDLE's basic custom key entry dialog now detects +duplicates properly. Original patch by Saimadhav Heblikar. + +bpo-29910: IDLE no longer deletes a character after commenting out a +region by a key shortcut. Add "return 'break'" for this and other +potential conflicts between IDLE and default key bindings. +Patch by Serhiy Storchaka. + +bpo-30728: Modernize idlelib.configdialog: +* replace import * with specific imports; +* lowercase method and attribute lines. +Patch by Cheryl Sabella. + +bpo-6739: Verify user-entered key sequences by trying to bind them +with to a tk widget. Add tests for all 3 validation functions. +Original patch by G Polo. Tests added by Cheryl Sabella. +Code revised and more tests added by Terry Jan Reedy + +bpo-24813: Add icon to help_about and make other changes. + +bpo-15786: Fix several problems with IDLE's autocompletion box. +The following should now work: clicking on selection box items; +using the scrollbar; selecting an item by hitting Return. +Hangs on MacOSX should no longer happen. Patch by Louie Lu. + +bpo-25514: Add doc subsubsection about IDLE failure to start. +Popup no-connection message directs users to this section. + +bpo-30642: Fix reference leaks in IDLE tests. +Patches by Louie Lu and Terry Jan Reedy. + +bpo-30495: Add docstrings for textview.py and use PEP8 names. +Patches by Cheryl Sabella and Terry Jan Reedy. + +bpo-30290: Help-about: use pep8 names and add tests. +Increase coverage to 100%. +Patches by Louie Lu, Cheryl Sabella, and Terry Jan Reedy. + +bpo-30303: Add _utest option to textview; add new tests. +Increase coverage to 100%. +Patches by Louie Lu and Terry Jan Reedy. + +Issue #29071: IDLE colors f-string prefixes but not invalid ur prefixes. + +Issue #28572: Add 10% to coverage of IDLE's test_configdialog. +Update and augment description of the configuration system. + + +What's New in IDLE 3.6.0 (since 3.5.0) +Released on 2016-12-23 +====================================== + +- Issue #15308: Add 'interrupt execution' (^C) to Shell menu. + Patch by Roger Serwy, updated by Bayard Randel. + +- Issue #27922: Stop IDLE tests from 'flashing' gui widgets on the screen. + +- Issue #27891: Consistently group and sort imports within idlelib modules. + +- Issue #17642: add larger font sizes for classroom projection. + +- Add version to title of IDLE help window. + +- Issue #25564: In section on IDLE -- console differences, mention that + using exec means that __builtins__ is defined for each statement. + +- Issue #27821: Fix 3.6.0a3 regression that prevented custom key sets + from being selected when no custom theme was defined. + +- Issue #27714: text_textview and test_autocomplete now pass when re-run + in the same process. This occurs when test_idle fails when run with the + -w option but without -jn. Fix warning from test_config. + +- Issue #27621: Put query response validation error messages in the query + box itself instead of in a separate messagebox. Redo tests to match. + Add Mac OSX refinements. Original patch by Mark Roseman. + +- Issue #27620: Escape key now closes Query box as cancelled. + +- Issue #27609: IDLE: tab after initial whitespace should tab, not + autocomplete. This fixes problem with writing docstrings at least + twice indented. + +- Issue #27609: Explicitly return None when there are also non-None + returns. In a few cases, reverse a condition and eliminate a return. + +- Issue #25507: IDLE no longer runs buggy code because of its tkinter imports. + Users must include the same imports required to run directly in Python. + +- Issue #27173: Add 'IDLE Modern Unix' to the built-in key sets. + Make the default key set depend on the platform. + Add tests for the changes to the config module. + +- Issue #27452: add line counter and crc to IDLE configHandler test dump. + +- Issue #27477: IDLE search dialogs now use ttk widgets. + +- Issue #27173: Add 'IDLE Modern Unix' to the built-in key sets. + Make the default key set depend on the platform. + Add tests for the changes to the config module. + +- Issue #27452: make command line "idle-test> python test_help.py" work. + __file__ is relative when python is started in the file's directory. + +- Issue #27452: add line counter and crc to IDLE configHandler test dump. + +- Issue #27380: IDLE: add query.py with base Query dialog and ttk widgets. + Module had subclasses SectionName, ModuleName, and HelpSource, which are + used to get information from users by configdialog and file =>Load Module. + Each subclass has itw own validity checks. Using ModuleName allows users + to edit bad module names instead of starting over. + Add tests and delete the two files combined into the new one. + +- Issue #27372: Test_idle no longer changes the locale. + +- Issue #27365: Allow non-ascii chars in IDLE NEWS.txt, for contributor names. + +- Issue #27245: IDLE: Cleanly delete custom themes and key bindings. + Previously, when IDLE was started from a console or by import, a cascade + of warnings was emitted. Patch by Serhiy Storchaka. + +- Issue #24137: Run IDLE, test_idle, and htest with tkinter default root disabled. + Fix code and tests that fail with this restriction. + Fix htests to not create a second and redundant root and mainloop. + +- Issue #27310: Fix IDLE.app failure to launch on OS X due to vestigial import. + +- Issue #5124: Paste with text selected now replaces the selection on X11. + This matches how paste works on Windows, Mac, most modern Linux apps, + and ttk widgets. Original patch by Serhiy Storchaka. + +- Issue #24750: Switch all scrollbars in IDLE to ttk versions. + Where needed, minimal tests are added to cover changes. + +- Issue #24759: IDLE requires tk 8.5 and availability ttk widgets. + Delete now unneeded tk version tests and code for older versions. + Add test for IDLE syntax colorizer. + +- Issue #27239: idlelib.macosx.isXyzTk functions initialize as needed. + +- Issue #27262: move Aqua unbinding code, which enable context menus, to macosx. + +- Issue #24759: Make clear in idlelib.idle_test.__init__ that the directory + is a private implementation of test.test_idle and tool for maintainers. + +- Issue #27196: Stop 'ThemeChanged' warnings when running IDLE tests. + These persisted after other warnings were suppressed in #20567. + Apply Serhiy Storchaka's update_idletasks solution to four test files. + Record this additional advice in idle_test/README.txt + +- Issue #20567: Revise idle_test/README.txt with advice about avoiding + tk warning messages from tests. Apply advice to several IDLE tests. + +- Issue # 24225: Update idlelib/README.txt with new file names + and event handlers. + +- Issue #27156: Remove obsolete code not used by IDLE. Replacements: + 1. help.txt, replaced by help.html, is out-of-date and should not be used. + Its dedicated viewer has be replaced by the html viewer in help.py. + 2. 'import idlever; I = idlever.IDLE_VERSION' is the same as + 'import sys; I = version[:version.index(' ')]' + 3. After 'ob = stackviewer.VariablesTreeItem(*args)', + 'ob.keys()' == 'list(ob.object.keys). + 4. In macosc, runningAsOSXAPP == isAquaTk; idCarbonAquaTk == isCarbonTk + +- Issue #27117: Make colorizer htest and turtledemo work with dark themes. + Move code for configuring text widget colors to a new function. + +- Issue #24225: Rename many idlelib/*.py and idle_test/test_*.py files. + Edit files to replace old names with new names when the old name + referred to the module rather than the class it contained. + See the issue and IDLE section in What's New in 3.6 for more. + +- Issue #26673: When tk reports font size as 0, change to size 10. + Such fonts on Linux prevented the configuration dialog from opening. + +- Issue #21939: Add test for IDLE's percolator. + Original patch by Saimadhav Heblikar. + +- Issue #21676: Add test for IDLE's replace dialog. + Original patch by Saimadhav Heblikar. + +- Issue #18410: Add test for IDLE's search dialog. + Original patch by Westley Martínez. + +- Issue #21703: Add test for undo delegator. Patch mostly by + Saimadhav Heblikar . + +- Issue #27044: Add ConfigDialog.remove_var_callbacks to stop memory leaks. + +- Issue #23977: Add more asserts to test_delegator. + +- Issue #20640: Add tests for idlelib.configHelpSourceEdit. + Patch by Saimadhav Heblikar. + +- In the 'IDLE-console differences' section of the IDLE doc, clarify + how running with IDLE affects sys.modules and the standard streams. + +- Issue #25507: fix incorrect change in IOBinding that prevented printing. + Augment IOBinding htest to include all major IOBinding functions. + +- Issue #25905: Revert unwanted conversion of ' to ’ RIGHT SINGLE QUOTATION + MARK in README.txt and open this and NEWS.txt with 'ascii'. + Re-encode CREDITS.txt to utf-8 and open it with 'utf-8'. + +- Issue 15348: Stop the debugger engine (normally in a user process) + before closing the debugger window (running in the IDLE process). + This prevents the RuntimeErrors that were being caught and ignored. + +- Issue #24455: Prevent IDLE from hanging when a) closing the shell while the + debugger is active (15347); b) closing the debugger with the [X] button + (15348); and c) activating the debugger when already active (24455). + The patch by Mark Roseman does this by making two changes. + 1. Suspend and resume the gui.interaction method with the tcl vwait + mechanism intended for this purpose (instead of root.mainloop & .quit). + 2. In gui.run, allow any existing interaction to terminate first. + +- Change 'The program' to 'Your program' in an IDLE 'kill program?' message + to make it clearer that the program referred to is the currently running + user program, not IDLE itself. + +- Issue #24750: Improve the appearance of the IDLE editor window status bar. + Patch by Mark Roseman. + +- Issue #25313: Change the handling of new built-in text color themes to better + address the compatibility problem introduced by the addition of IDLE Dark. + Consistently use the revised idleConf.CurrentTheme everywhere in idlelib. + +- Issue #24782: Extension configuration is now a tab in the IDLE Preferences + dialog rather than a separate dialog. The former tabs are now a sorted + list. Patch by Mark Roseman. + +- Issue #22726: Re-activate the config dialog help button with some content + about the other buttons and the new IDLE Dark theme. + +- Issue #24820: IDLE now has an 'IDLE Dark' built-in text color theme. + It is more or less IDLE Classic inverted, with a cobalt blue background. + Strings, comments, keywords, ... are still green, red, orange, ... . + To use it with IDLEs released before November 2015, hit the + 'Save as New Custom Theme' button and enter a new name, + such as 'Custom Dark'. The custom theme will work with any IDLE + release, and can be modified. + +- Issue #25224: README.txt is now an idlelib index for IDLE developers and + curious users. The previous user content is now in the IDLE doc chapter. + 'IDLE' now means 'Integrated Development and Learning Environment'. + +- Issue #24820: Users can now set breakpoint colors in + Settings -> Custom Highlighting. Original patch by Mark Roseman. + +- Issue #24972: Inactive selection background now matches active selection + background, as configured by users, on all systems. Found items are now + always highlighted on Windows. Initial patch by Mark Roseman. + +- Issue #24570: Idle: make calltip and completion boxes appear on Macs + affected by a tk regression. Initial patch by Mark Roseman. + +- Issue #24988: Idle ScrolledList context menus (used in debugger) + now work on Mac Aqua. Patch by Mark Roseman. + +- Issue #24801: Make right-click for context menu work on Mac Aqua. + Patch by Mark Roseman. + +- Issue #25173: Associate tkinter messageboxes with a specific widget. + For Mac OSX, make them a 'sheet'. Patch by Mark Roseman. + +- Issue #25198: Enhance the initial html viewer now used for Idle Help. + * Properly indent fixed-pitch text (patch by Mark Roseman). + * Give code snippet a very Sphinx-like light blueish-gray background. + * Re-use initial width and height set by users for shell and editor. + * When the Table of Contents (TOC) menu is used, put the section header + at the top of the screen. + +- Issue #25225: Condense and rewrite Idle doc section on text colors. + +- Issue #21995: Explain some differences between IDLE and console Python. + +- Issue #22820: Explain need for *print* when running file from Idle editor. + +- Issue #25224: Doc: augment Idle feature list and no-subprocess section. + +- Issue #25219: Update doc for Idle command line options. + Some were missing and notes were not correct. + +- Issue #24861: Most of idlelib is private and subject to change. + Use idleib.idle.* to start Idle. See idlelib.__init__.__doc__. + +- Issue #25199: Idle: add synchronization comments for future maintainers. + +- Issue #16893: Replace help.txt with help.html for Idle doc display. + The new idlelib/help.html is rstripped Doc/build/html/library/idle.html. + It looks better than help.txt and will better document Idle as released. + The tkinter html viewer that works for this file was written by Mark Roseman. + The now unused EditorWindow.HelpDialog class and helt.txt file are deprecated. + +- Issue #24199: Deprecate unused idlelib.idlever with possible removal in 3.6. + +- Issue #24790: Remove extraneous code (which also create 2 & 3 conflicts). + + +What's New in IDLE 3.5.0? +========================= +*Release date: 2015-09-13* + +- Issue #23672: Allow Idle to edit and run files with astral chars in name. + Patch by Mohd Sanad Zaki Rizvi. + +- Issue 24745: Idle editor default font. Switch from Courier to + platform-sensitive TkFixedFont. This should not affect current customized + font selections. If there is a problem, edit $HOME/.idlerc/config-main.cfg + and remove 'fontxxx' entries from [Editor Window]. Patch by Mark Roseman. + +- Issue #21192: Idle editor. When a file is run, put its name in the restart bar. + Do not print false prompts. Original patch by Adnan Umer. + +- Issue #13884: Idle menus. Remove tearoff lines. Patch by Roger Serwy. + +- Issue #23184: remove unused names and imports in idlelib. + Initial patch by Al Sweigart. + +- Issue #20577: Configuration of the max line length for the FormatParagraph + extension has been moved from the General tab of the Idle preferences dialog + to the FormatParagraph tab of the Config Extensions dialog. + Patch by Tal Einat. + +- Issue #16893: Update Idle doc chapter to match current Idle and add new + information. + +- Issue #3068: Add Idle extension configuration dialog to Options menu. + Changes are written to HOME/.idlerc/config-extensions.cfg. + Original patch by Tal Einat. + +- Issue #16233: A module browser (File : Class Browser, Alt+C) requires an + editor window with a filename. When Class Browser is requested otherwise, + from a shell, output window, or 'Untitled' editor, Idle no longer displays + an error box. It now pops up an Open Module box (Alt+M). If a valid name + is entered and a module is opened, a corresponding browser is also opened. + +- Issue #4832: Save As to type Python files automatically adds .py to the + name you enter (even if your system does not display it). Some systems + automatically add .txt when type is Text files. + +- Issue #21986: Code objects are not normally pickled by the pickle module. + To match this, they are no longer pickled when running under Idle. + +- Issue #23180: Rename IDLE "Windows" menu item to "Window". + Patch by Al Sweigart. + +- Issue #17390: Adjust Editor window title; remove 'Python', + move version to end. + +- Issue #14105: Idle debugger breakpoints no longer disappear + when inserting or deleting lines. + +- Issue #17172: Turtledemo can now be run from Idle. + Currently, the entry is on the Help menu, but it may move to Run. + Patch by Ramchandra Apt and Lita Cho. + +- Issue #21765: Add support for non-ascii identifiers to HyperParser. + +- Issue #21940: Add unittest for WidgetRedirector. Initial patch by Saimadhav + Heblikar. + +- Issue #18592: Add unittest for SearchDialogBase. Patch by Phil Webster. + +- Issue #21694: Add unittest for ParenMatch. Patch by Saimadhav Heblikar. + +- Issue #21686: add unittest for HyperParser. Original patch by Saimadhav + Heblikar. + +- Issue #12387: Add missing upper(lower)case versions of default Windows key + bindings for Idle so Caps Lock does not disable them. Patch by Roger Serwy. + +- Issue #21695: Closing a Find-in-files output window while the search is + still in progress no longer closes Idle. + +- Issue #18910: Add unittest for textView. Patch by Phil Webster. + +- Issue #18292: Add unittest for AutoExpand. Patch by Saihadhav Heblikar. + +- Issue #18409: Add unittest for AutoComplete. Patch by Phil Webster. + +- Issue #21477: htest.py - Improve framework, complete set of tests. + Patches by Saimadhav Heblikar + +- Issue #18104: Add idlelib/idle_test/htest.py with a few sample tests to begin + consolidating and improving human-validated tests of Idle. Change other files + as needed to work with htest. Running the module as __main__ runs all tests. + +- Issue #21139: Change default paragraph width to 72, the PEP 8 recommendation. + +- Issue #21284: Paragraph reformat test passes after user changes reformat width. + +- Issue #17654: Ensure IDLE menus are customized properly on OS X for + non-framework builds and for all variants of Tk. + + +What's New in IDLE 3.4.0? +========================= +*Release date: 2014-03-16* + +- Issue #17390: Display Python version on Idle title bar. + Initial patch by Edmond Burnett. + +- Issue #5066: Update IDLE docs. Patch by Todd Rovito. + +- Issue #17625: Close the replace dialog after it is used. + +- Issue #16226: Fix IDLE Path Browser crash. + (Patch by Roger Serwy) + +- Issue #15853: Prevent IDLE crash on OS X when opening Preferences menu + with certain versions of Tk 8.5. Initial patch by Kevin Walzer. + + +What's New in IDLE 3.3.0? +========================= +*Release date: 2012-09-29* + +- Issue #17625: Close the replace dialog after it is used. + +- Issue #7163: Propagate return value of sys.stdout.write. + +- Issue #15318: Prevent writing to sys.stdin. + +- Issue #4832: Modify IDLE to save files with .py extension by + default on Windows and OS X (Tk 8.5) as it already does with X11 Tk. + +- Issue #13532, #15319: Check that arguments to sys.stdout.write are strings. + +- Issue # 12510: Attempt to get certain tool tips no longer crashes IDLE. + Erroneous tool tips have been corrected. Default added for callables. + +- Issue #10365: File open dialog now works instead of crashing even when + parent window is closed while dialog is open. + +- Issue 14876: use user-selected font for highlight configuration. + +- Issue #14937: Perform auto-completion of filenames in strings even for + non-ASCII filenames. Likewise for identifiers. + +- Issue #8515: Set __file__ when run file in IDLE. + Initial patch by Bruce Frederiksen. + +- IDLE can be launched as `python -m idlelib` + +- Issue #14409: IDLE now properly executes commands in the Shell window + when it cannot read the normal config files on startup and + has to use the built-in default key bindings. + There was previously a bug in one of the defaults. + +- Issue #3573: IDLE hangs when passing invalid command line args + (directory(ies) instead of file(s)). + +- Issue #14018: Update checks for unstable system Tcl/Tk versions on OS X + to include versions shipped with OS X 10.7 and 10.8 in addition to 10.6. + + +What's New in IDLE 3.2.1? +========================= +*Release date: 15-May-11* + +- Issue #6378: Further adjust idle.bat to start associated Python + +- Issue #11896: Save on Close failed despite selecting "Yes" in dialog. + +- Issue #1028: Ctrl-space binding to show completions was causing IDLE to exit. + Tk < 8.5 was sending invalid Unicode null; replaced with valid null. + +- Issue #4676: <Home> toggle failing on Tk 8.5, causing IDLE exits and strange selection + behavior. Improve selection extension behaviour. + +- Issue #3851: <Home> toggle non-functional when NumLock set on Windows. + + +What's New in IDLE 3.1b1? +========================= +*Release date: 06-May-09* + +- Issue #5707: Use of 'filter' in keybindingDialog.py was causing custom key assignment to + fail. Patch by Amaury Forgeot d'Arc. + +- Issue #4815: Offer conversion to UTF-8 if source files have + no encoding declaration and are not encoded in UTF-8. + +- Issue #4008: Fix problems with non-ASCII source files. + +- Issue #4323: Always encode source as UTF-8 without asking + the user (unless a different encoding is declared); remove + user configuration of source encoding; all according to + PEP 3120. + +- Issue #2665: On Windows, an IDLE installation upgraded from an old version + would not start if a custom theme was defined. + +------------------------------------------------------------------------ +Refer to NEWS2x.txt and HISTORY.txt for information on earlier releases. +------------------------------------------------------------------------ diff --git a/Lib/idlelib/README.txt b/Lib/idlelib/README.txt new file mode 100644 index 000000000..76aec5891 --- /dev/null +++ b/Lib/idlelib/README.txt @@ -0,0 +1,290 @@ +README.txt: an index to idlelib files and the IDLE menu. + +IDLE is Python's Integrated Development and Learning +Environment. The user documentation is part of the Library Reference and +is available in IDLE by selecting Help => IDLE Help. This README documents +idlelib for IDLE developers and curious users. + +IDLELIB FILES lists files alphabetically by category, +with a short description of each. + +IDLE MENU show the menu tree, annotated with the module +or module object that implements the corresponding function. + +This file is descriptive, not prescriptive, and may have errors +and omissions and lag behind changes in idlelib. + + +IDLELIB FILES +============= + +Implementation files not in IDLE MENU are marked (nim). + +Startup +------- +__init__.py # import, does nothing +__main__.py # -m, starts IDLE +idle.bat +idle.py +idle.pyw + +Implementation +-------------- +autocomplete.py # Complete attribute names or filenames. +autocomplete_w.py # Display completions. +autoexpand.py # Expand word with previous word in file. +browser.py # Create module browser window. +calltip.py # Create calltip text. +calltip_w.py # Display calltip. +codecontext.py # Show compound statement headers otherwise not visible. +colorizer.py # Colorize text (nim). +config.py # Load, fetch, and save configuration (nim). +configdialog.py # Display user configuration dialogs. +config_key.py # Change keybindings. +debugger.py # Debug code run from shell or editor; show window. +debugger_r.py # Debug code run in remote process. +debugobj.py # Define class used in stackviewer. +debugobj_r.py # Communicate objects between processes with rpc (nim). +delegator.py # Define base class for delegators (nim). +dynoption.py # Define mutable OptionMenu widget (nim) +editor.py # Define most of editor and utility functions. +filelist.py # Open files and manage list of open windows (nim). +format.py # Define format menu options. +grep.py # Find all occurrences of pattern in multiple files. +help.py # Display IDLE's html doc. +help_about.py # Display About IDLE dialog. +history.py # Get previous or next user input in shell (nim) +hyperparser.py # Parse code around a given index. +iomenu.py # Open, read, and write files +macosx.py # Help IDLE run on Macs (nim). +mainmenu.py # Define most of IDLE menu. +multicall.py # Wrap tk widget to allow multiple calls per event (nim). +outwin.py # Create window for grep output. +parenmatch.py # Match fenceposts: (), [], and {}. +pathbrowser.py # Create path browser window. +percolator.py # Manage delegator stack (nim). +pyparse.py # Give information on code indentation +pyshell.py # Start IDLE, manage shell, complete editor window +query.py # Query user for information +redirector.py # Intercept widget subcommands (for percolator) (nim). +replace.py # Search and replace pattern in text. +rpc.py # Communicate between idle and user processes (nim). +run.py # Manage user code execution subprocess. +runscript.py # Check and run user code. +scrolledlist.py # Define scrolledlist widget for IDLE (nim). +search.py # Search for pattern in text. +searchbase.py # Define base for search, replace, and grep dialogs. +searchengine.py # Define engine for all 3 search dialogs. +sidebar.py # Define line number and shell prompt sidebars. +squeezer.py # Squeeze long shell output (nim). +stackviewer.py # View stack after exception. +statusbar.py # Define status bar for windows (nim). +tabbedpages.py # Define tabbed pages widget (nim). +textview.py # Define read-only text widget (nim). +tooltip.py # Define popups for calltips, squeezer (nim). +tree.py # Define tree widget, used in browsers (nim). +undo.py # Manage undo stack. +util.py # Define common objects imported elsewhere (nim). +windows.py # Manage window list and define listed top level. +zoomheight.py # Zoom window to full height of screen. +zzdummy.py # Example extension. + +Configuration +------------- +config-extensions.def # Defaults for extensions +config-highlight.def # Defaults for colorizing +config-keys.def # Defaults for key bindings +config-main.def # Defaults for font and general tabs + +Text +---- +CREDITS.txt # not maintained, displayed by About IDLE +HISTORY.txt # NEWS up to July 2001 +NEWS.txt # commits, displayed by About IDLE +NEWS2.txt # commits to Python2 +README.txt # this file, displayed by About IDLE +TODO.txt # needs review +extend.txt # about writing extensions +help.html # copy of idle.html in docs, displayed by IDLE Help + +Subdirectories +-------------- +Icons # small image files +idle_test # files for human test and automated unit tests + + +IDLE MENUS +========== + +Top level items and most submenu items are defined in mainmenu. +Extensions add submenu items when active. The names given are +found, quoted, in one of these modules, paired with a '<<pseudoevent>>'. +Each pseudoevent is bound to an event handler. Some event handlers +call another function that does the actual work. The annotations below +are intended to at least give the module where the actual work is done. +'eEW' = editor.EditorWindow + +File + New File # eEW.new_callback + Open... # iomenu.open + Open Module # eEw.open_module + Recent Files + Class Browser # eEW.open_class_browser, browser.ClassBrowser + Path Browser # eEW.open_path_browser, pathbrowser + --- + Save # iomenu.save + Save As... # iomenu.save_as + Save Copy As... # iomenu.save_a_copy + --- + Print Window # iomenu.print_window + --- + Close # eEW.close_event + Exit # flist.close_all_callback (bound in eEW) + +Edit + Undo # undodelegator + Redo # undodelegator + --- # eEW.right_menu_event + Cut # eEW.cut + Copy # eEW.copy + Paste # eEW.past + Select All # eEW.select_all (+ see eEW.remove_selection) + --- # Next 5 items use searchengine; dialogs use searchbase + Find # eEW.find_event, search.SearchDialog.find + Find Again # eEW.find_again_event, sSD.find_again + Find Selection # eEW.find_selection_event, sSD.find_selection + Find in Files... # eEW.find_in_files_event, grep + Replace... # eEW.replace_event, replace.ReplaceDialog.replace + Go to Line # eEW.goto_line_event + Show Completions # autocomplete extension and autocompleteWidow (&HP) + Expand Word # autoexpand extension + Show call tip # Calltips extension and CalltipWindow (& Hyperparser) + Show surrounding parens # parenmatch (& Hyperparser) + +Format (Editor only) [fFR = format.FormatRegion] + Format Paragraph # format.FormatParagraph.format_paragraph_event + Indent Region # fFR.indent_region_event + Dedent Region # fFR.dedent_region_event + Comment Out Reg. # fFR.comment_region_event + Uncomment Region # fFR.uncomment_region_event + Tabify Region # fFR.tabify_region_event + Untabify Region # fFR.untabify_region_event + Toggle Tabs # format.Indents.toggle_tabs_event + New Indent Width # format.Indents.change_indentwidth_event + Strip tailing whitespace # format.rstrip + Zin # zzdummy + Zout # zzdummy + +Run (Editor only) + Run Module # runscript.ScriptBinding.run_module_event + Run... Customized # runscript.ScriptBinding.run_custom_event + Check Module # runscript.ScriptBinding.check_module_event + Python Shell # pyshell.Pyshell, pyshell.ModifiedInterpreter + +Shell # pyshell + View Last Restart # pyshell.PyShell.view_restart_mark + Restart Shell # pyshell.PyShell.restart_shell + Previous History # history.History.history_prev + Next History # history.History.history_next + Interrupt Execution # pyshell.PyShell.cancel_callback + +Debug (Shell only) + Go to File/Line # outwin.OutputWindow.goto_file_line + debugger # debugger, debugger_r, PyShell.toggle_debugger + Stack Viewer # stackviewer, PyShell.open_stack_viewer + Auto-open Stack Viewer # stackviewer + +Options + Configure IDLE # eEW.config_dialog, config, configdialog (cd) + (Parts of the dialog) + Buttons # cd.ConfigDialog + Font tab # cd.FontPage, config-main.def + Highlight tab # cd.HighPage, query, config-highlight.def + Keys tab # cd.KeysPage, query, config_key, config_keys.def + Windows tab # cd.WinPage, config_main.def + Shell/Ed tab # cd.ShedPage, config-main.def + Extensions tab # config-extensions.def, corresponding .py files + --- + ... Code Context # codecontext + ... Line Numbers # sidebar + Zoomheight # zoomheight + +Window + <open windows> # windows + +Help + About IDLE # eEW.about_dialog, help_about.AboutDialog + --- + IDLE Help # eEW.help_dialog, help.show_idlehelp + Python Docs # eEW.python_docs + Turtle Demo # eEW.open_turtle_demo + --- + <other help sources> + +<Context Menu> (right click) + Defined in editor, PyShell.pyshell + Cut + Copy + Paste + --- + Go to file/line (shell and output only) + Set Breakpoint (editor only) + Clear Breakpoint (editor only) + Defined in debugger + Go to source line + Show stack frame + +<No menu> +Center Insert # eEW.center_insert_event + + +OTHER TOPICS +============ + +Generally use PEP 8. + +import statements +----------------- +Put imports at the top, unless there is a good reason otherwise. +PEP 8 says to group stdlib, 3rd-party dependencies, and package imports. +For idlelib, the groups are general stdlib, tkinter, and idlelib. +Sort modules within each group, except that tkinter.ttk follows tkinter. +Sort 'from idlelib import mod1' and 'from idlelib.mod2 import object' +together by module, ignoring within module objects. +Put 'import __main__' after other idlelib imports. + +Imports only needed for testing are put not at the top but in an +htest function def or "if __name__ == '__main__'" clause. + +Within module imports like "from idlelib.mod import class" may cause +circular imports to deadlock. Even without this, circular imports may +require at least one of the imports to be delayed until a function call. + +What's New entries +------------------ + +Repository directory Doc/whatsnew/ has a file 3.n.rst for each 3.n +Python version. For the first entry in each file, add subsection +'IDLE and idlelib', in alphabetical position, to the 'Improved Modules' +section. For the rest of cpython, entries to 3.(n+1).rst begin with +the release of 3.n.0b1. For IDLE, entries for features backported from +'main' to '3.n' during its beta period do not got in 3.(n+1).rst. The +latter usually gets its first entry during the 3.n.0 candidate period +or after the 3.n.0 release. + +When, as per PEP 434, feature changes are backported, entries are placed +in the 3.n.rst file *in the main branch* for each Python version n that +gets the backport. (Note: the format of entries have varied between +versions.) Add a line "New in 3.n maintenance releases." before the +first back-ported feature after 3.n.0 is released. Since each older +version file gets a different number of backports, it is easiest to +make a separate PR for each file and label it with the backports +needed. + +Github repository and issues +---------------------------- + +The CPython repository is https://github.com/python/cpython. The +IDLE Issues listing is https://github.com/orgs/python/projects/31. +The main classification is by Topic, based on the IDLE menu. View the +topics list by clicking the [<]] button in the upper right. diff --git a/Lib/idlelib/TODO.txt b/Lib/idlelib/TODO.txt new file mode 100644 index 000000000..41b86b0c6 --- /dev/null +++ b/Lib/idlelib/TODO.txt @@ -0,0 +1,210 @@ +Original IDLE todo, much of it now outdated: +============================================ +TO DO: + +- improve debugger: + - manage breakpoints globally, allow bp deletion, tbreak, cbreak etc. + - real object browser + - help on how to use it (a simple help button will do wonders) + - performance? (updates of large sets of locals are slow) + - better integration of "debug module" + - debugger should be global resource (attached to flist, not to shell) + - fix the stupid bug where you need to step twice + - display class name in stack viewer entries for methods + - suppress tracing through IDLE internals (e.g. print) DONE + - add a button to suppress through a specific module or class or method + - more object inspection to stack viewer, e.g. to view all array items +- insert the initial current directory into sys.path DONE +- default directory attribute for each window instead of only for windows + that have an associated filename +- command expansion from keywords, module contents, other buffers, etc. +- "Recent documents" menu item DONE +- Filter region command +- Optional horizontal scroll bar +- more Emacsisms: + - ^K should cut to buffer + - M-[, M-] to move by paragraphs + - incremental search? +- search should indicate wrap-around in some way +- restructure state sensitive code to avoid testing flags all the time +- persistent user state (e.g. window and cursor positions, bindings) +- make backups when saving +- check file mtimes at various points +- Pluggable interface with RCS/CVS/Perforce/Clearcase +- better help? +- don't open second class browser on same module (nor second path browser) +- unify class and path browsers +- Need to define a standard way whereby one can determine one is running + inside IDLE (needed for Tk mainloop, also handy for $PYTHONSTARTUP) +- Add more utility methods for use by extensions (a la get_selection) +- Way to run command in totally separate interpreter (fork+os.system?) DONE +- Way to find definition of fully-qualified name: + In other words, select "UserDict.UserDict", hit some magic key and + it loads up UserDict.py and finds the first def or class for UserDict. +- need a way to force colorization on/off +- need a way to force auto-indent on/off + +Details: + +- ^O (on Unix -- open-line) should honor autoindent +- after paste, show end of pasted text +- on Windows, should turn short filename to long filename (not only in argv!) + (shouldn't this be done -- or undone -- by ntpath.normpath?) +- new autoindent after colon even indents when the colon is in a comment! +- sometimes forward slashes in pathname remain +- sometimes star in window name remains in Windows menu +- With unix bindings, ESC by itself is ignored +- Sometimes for no apparent reason a selection from the cursor to the + end of the command buffer appears, which is hard to get rid of + because it stays when you are typing! +- The Line/Col in the status bar can be wrong initially in PyShell DONE + +Structural problems: + +- too much knowledge in FileList about EditorWindow (for example) +- should add some primitives for accessing the selection etc. + to repeat cumbersome code over and over + +====================================================================== + +Jeff Bauer suggests: + +- Open Module doesn't appear to handle hierarchical packages. +- Class browser should also allow hierarchical packages. +- Open and Open Module could benefit from a history, DONE + either command line style, or Microsoft recent-file + style. +- Add a Smalltalk-style inspector (i.e. Tkinspect) + +The last suggestion is already a reality, but not yet +integrated into IDLE. I use a module called inspector.py, +that used to be available from python.org(?) It no longer +appears to be in the contributed section, and the source +has no author attribution. + +In any case, the code is useful for visually navigating +an object's attributes, including its container hierarchy. + + >>> from inspector import Tkinspect + >>> Tkinspect(None, myObject) + +Tkinspect could probably be extended and refined to +integrate better into IDLE. + +====================================================================== + +Comparison to PTUI +------------------ + ++ PTUI's help is better (HTML!) + ++ PTUI can attach a shell to any module + ++ PTUI has some more I/O commands: + open multiple + append + examine (what's that?) + +====================================================================== + +Notes after trying to run Grail +------------------------------- + +- Grail does stuff to sys.path based on sys.argv[0]; you must set +sys.argv[0] to something decent first (it is normally set to the path of +the idle script). + +- Grail must be exec'ed in __main__ because that's imported by some +other parts of Grail. + +- Grail uses a module called History and so does idle :-( + +====================================================================== + +Robin Friedrich's items: + +Things I'd like to see: + - I'd like support for shift-click extending the selection. There's a + bug now that it doesn't work the first time you try it. + - Printing is needed. How hard can that be on Windows? FIRST CUT DONE + - The python-mode trick of autoindenting a line with <tab> is neat and + very handy. + - (someday) a spellchecker for docstrings and comments. + - a pagedown/up command key which moves to next class/def statement (top + level) + - split window capability + - DnD text relocation/copying + +Things I don't want to see. + - line numbers... will probably slow things down way too much. + - Please use another icon for the tree browser leaf. The small snake + isn't cutting it. + +---------------------------------------------------------------------- + +- Customizable views (multi-window or multi-pane). (Markus Gritsch) + +- Being able to double click (maybe double right click) on a callable +object in the editor which shows the source of the object, if +possible. (Gerrit Holl) + +- Hooks into the guts, like in Emacs. (Mike Romberg) + +- Sharing the editor with a remote tutor. (Martijn Faassen) + +- Multiple views on the same file. (Tony J Ibbs) + +- Store breakpoints in a global (per-project) database (GvR); Dirk +Heise adds: save some space-trimmed context and search around when +reopening a file that might have been edited by someone else. + +- Capture menu events in extensions without changing the IDLE source. +(Matthias Barmeier) + +- Use overlapping panels (a "notebook" in MFC terms I think) for info +that doesn't need to be accessible simultaneously (e.g. HTML source +and output). Use multi-pane windows for info that does need to be +shown together (e.g. class browser and source). (Albert Brandl) + +- A project should invisibly track all symbols, for instant search, +replace and cross-ref. Projects should be allowed to span multiple +directories, hosts, etc. Project management files are placed in a +directory you specify. A global mapping between project names and +project directories should exist [not so sure --GvR]. (Tim Peters) + +- Merge attr-tips and auto-expand. (Mark Hammond, Tim Peters) + +- Python Shell should behave more like a "shell window" as users know +it -- i.e. you can only edit the current command, and the cursor can't +escape from the command area. (Albert Brandl) + +- Set X11 class to "idle/Idle", set icon and title to something +beginning with "idle" -- for window managers. (Randall Hopper) + +- Config files editable through a preferences dialog. (me) DONE + +- Config files still editable outside the preferences dialog. +(Randall Hopper) DONE + +- When you're editing a command in PyShell, and there are only blank +lines below the cursor, hitting Return should ignore or delete those +blank lines rather than deciding you're not on the last line. (me) + +- Run command (F5 c.s.) should be more like Pythonwin's Run -- a +dialog with options to give command line arguments, run the debugger, +etc. (me) + +- Shouldn't be able to delete part of the prompt (or any text before +it) in the PyShell. (Martijn Faassen) DONE + +- Emacs style auto-fill (also smart about comments and strings). +(Jeremy Hylton) + +- Output of Run Script should go to a separate output window, not to +the shell window. Output of separate runs should all go to the same +window but clearly delimited. (David Scherer) REJECT FIRST, LATTER DONE + +- GUI form designer to kick VB's butt. (Robert Geiger) THAT'S NOT IDLE + +- Printing! Possibly via generation of PDF files which the user must +then send to the printer separately. (Dinu Gherman) FIRST CUT diff --git a/Lib/idlelib/__init__.py b/Lib/idlelib/__init__.py new file mode 100644 index 000000000..791ddeab7 --- /dev/null +++ b/Lib/idlelib/__init__.py @@ -0,0 +1,10 @@ +"""The idlelib package implements the Idle application. + +Idle includes an interactive shell and editor. +Starting with Python 3.6, IDLE requires tcl/tk 8.5 or later. +Use the files named idle.* to start Idle. + +The other files are private implementations. Their details are subject to +change. See PEP 434 for more. Import them at your own risk. +""" +testing = False # Set True by test.test_idle. diff --git a/Lib/idlelib/__main__.py b/Lib/idlelib/__main__.py new file mode 100644 index 000000000..ec3915b26 --- /dev/null +++ b/Lib/idlelib/__main__.py @@ -0,0 +1,7 @@ +""" +IDLE main entry point + +Run IDLE as python -m idlelib +""" +import idlelib.pyshell +idlelib.pyshell.main() diff --git a/Lib/idlelib/autocomplete.py b/Lib/idlelib/autocomplete.py new file mode 100644 index 000000000..032d31225 --- /dev/null +++ b/Lib/idlelib/autocomplete.py @@ -0,0 +1,228 @@ +"""Complete either attribute names or file names. + +Either on demand or after a user-selected delay after a key character, +pop up a list of candidates. +""" +import __main__ +import keyword +import os +import string +import sys + +# Modified keyword list is used in fetch_completions. +completion_kwds = [s for s in keyword.kwlist + if s not in {'True', 'False', 'None'}] # In builtins. +completion_kwds.extend(('match', 'case')) # Context keywords. +completion_kwds.sort() + +# Two types of completions; defined here for autocomplete_w import below. +ATTRS, FILES = 0, 1 +from idlelib import autocomplete_w +from idlelib.config import idleConf +from idlelib.hyperparser import HyperParser + +# Tuples passed to open_completions. +# EvalFunc, Complete, WantWin, Mode +FORCE = True, False, True, None # Control-Space. +TAB = False, True, True, None # Tab. +TRY_A = False, False, False, ATTRS # '.' for attributes. +TRY_F = False, False, False, FILES # '/' in quotes for file name. + +# This string includes all chars that may be in an identifier. +# TODO Update this here and elsewhere. +ID_CHARS = string.ascii_letters + string.digits + "_" + +SEPS = f"{os.sep}{os.altsep if os.altsep else ''}" +TRIGGERS = f".{SEPS}" + +class AutoComplete: + + def __init__(self, editwin=None, tags=None): + self.editwin = editwin + if editwin is not None: # not in subprocess or no-gui test + self.text = editwin.text + self.tags = tags + self.autocompletewindow = None + # id of delayed call, and the index of the text insert when + # the delayed call was issued. If _delayed_completion_id is + # None, there is no delayed call. + self._delayed_completion_id = None + self._delayed_completion_index = None + + @classmethod + def reload(cls): + cls.popupwait = idleConf.GetOption( + "extensions", "AutoComplete", "popupwait", type="int", default=0) + + def _make_autocomplete_window(self): # Makes mocking easier. + return autocomplete_w.AutoCompleteWindow(self.text, tags=self.tags) + + def _remove_autocomplete_window(self, event=None): + if self.autocompletewindow: + self.autocompletewindow.hide_window() + self.autocompletewindow = None + + def force_open_completions_event(self, event): + "(^space) Open completion list, even if a function call is needed." + self.open_completions(FORCE) + return "break" + + def autocomplete_event(self, event): + "(tab) Complete word or open list if multiple options." + if hasattr(event, "mc_state") and event.mc_state or\ + not self.text.get("insert linestart", "insert").strip(): + # A modifier was pressed along with the tab or + # there is only previous whitespace on this line, so tab. + return None + if self.autocompletewindow and self.autocompletewindow.is_active(): + self.autocompletewindow.complete() + return "break" + else: + opened = self.open_completions(TAB) + return "break" if opened else None + + def try_open_completions_event(self, event=None): + "(./) Open completion list after pause with no movement." + lastchar = self.text.get("insert-1c") + if lastchar in TRIGGERS: + args = TRY_A if lastchar == "." else TRY_F + self._delayed_completion_index = self.text.index("insert") + if self._delayed_completion_id is not None: + self.text.after_cancel(self._delayed_completion_id) + self._delayed_completion_id = self.text.after( + self.popupwait, self._delayed_open_completions, args) + + def _delayed_open_completions(self, args): + "Call open_completions if index unchanged." + self._delayed_completion_id = None + if self.text.index("insert") == self._delayed_completion_index: + self.open_completions(args) + + def open_completions(self, args): + """Find the completions and create the AutoCompleteWindow. + Return True if successful (no syntax error or so found). + If complete is True, then if there's nothing to complete and no + start of completion, won't open completions and return False. + If mode is given, will open a completion list only in this mode. + """ + evalfuncs, complete, wantwin, mode = args + # Cancel another delayed call, if it exists. + if self._delayed_completion_id is not None: + self.text.after_cancel(self._delayed_completion_id) + self._delayed_completion_id = None + + hp = HyperParser(self.editwin, "insert") + curline = self.text.get("insert linestart", "insert") + i = j = len(curline) + if hp.is_in_string() and (not mode or mode==FILES): + # Find the beginning of the string. + # fetch_completions will look at the file system to determine + # whether the string value constitutes an actual file name + # XXX could consider raw strings here and unescape the string + # value if it's not raw. + self._remove_autocomplete_window() + mode = FILES + # Find last separator or string start + while i and curline[i-1] not in "'\"" + SEPS: + i -= 1 + comp_start = curline[i:j] + j = i + # Find string start + while i and curline[i-1] not in "'\"": + i -= 1 + comp_what = curline[i:j] + elif hp.is_in_code() and (not mode or mode==ATTRS): + self._remove_autocomplete_window() + mode = ATTRS + while i and (curline[i-1] in ID_CHARS or ord(curline[i-1]) > 127): + i -= 1 + comp_start = curline[i:j] + if i and curline[i-1] == '.': # Need object with attributes. + hp.set_index("insert-%dc" % (len(curline)-(i-1))) + comp_what = hp.get_expression() + if (not comp_what or + (not evalfuncs and comp_what.find('(') != -1)): + return None + else: + comp_what = "" + else: + return None + + if complete and not comp_what and not comp_start: + return None + comp_lists = self.fetch_completions(comp_what, mode) + if not comp_lists[0]: + return None + self.autocompletewindow = self._make_autocomplete_window() + return not self.autocompletewindow.show_window( + comp_lists, "insert-%dc" % len(comp_start), + complete, mode, wantwin) + + def fetch_completions(self, what, mode): + """Return a pair of lists of completions for something. The first list + is a sublist of the second. Both are sorted. + + If there is a Python subprocess, get the comp. list there. Otherwise, + either fetch_completions() is running in the subprocess itself or it + was called in an IDLE EditorWindow before any script had been run. + + The subprocess environment is that of the most recently run script. If + two unrelated modules are being edited some calltips in the current + module may be inoperative if the module was not the last to run. + """ + try: + rpcclt = self.editwin.flist.pyshell.interp.rpcclt + except: + rpcclt = None + if rpcclt: + return rpcclt.remotecall("exec", "get_the_completion_list", + (what, mode), {}) + else: + if mode == ATTRS: + if what == "": # Main module names. + namespace = {**__main__.__builtins__.__dict__, + **__main__.__dict__} + bigl = eval("dir()", namespace) + bigl.extend(completion_kwds) + bigl.sort() + if "__all__" in bigl: + smalll = sorted(eval("__all__", namespace)) + else: + smalll = [s for s in bigl if s[:1] != '_'] + else: + try: + entity = self.get_entity(what) + bigl = dir(entity) + bigl.sort() + if "__all__" in bigl: + smalll = sorted(entity.__all__) + else: + smalll = [s for s in bigl if s[:1] != '_'] + except: + return [], [] + + elif mode == FILES: + if what == "": + what = "." + try: + expandedpath = os.path.expanduser(what) + bigl = os.listdir(expandedpath) + bigl.sort() + smalll = [s for s in bigl if s[:1] != '.'] + except OSError: + return [], [] + + if not smalll: + smalll = bigl + return smalll, bigl + + def get_entity(self, name): + "Lookup name in a namespace spanning sys.modules and __main.dict__." + return eval(name, {**sys.modules, **__main__.__dict__}) + + +AutoComplete.reload() + +if __name__ == '__main__': + from unittest import main + main('idlelib.idle_test.test_autocomplete', verbosity=2) diff --git a/Lib/idlelib/autocomplete_w.py b/Lib/idlelib/autocomplete_w.py new file mode 100644 index 000000000..24320b5a3 --- /dev/null +++ b/Lib/idlelib/autocomplete_w.py @@ -0,0 +1,498 @@ +""" +An auto-completion window for IDLE, used by the autocomplete extension +""" +import platform + +from tkinter import * +from tkinter.ttk import Scrollbar + +from idlelib.autocomplete import FILES, ATTRS +from idlelib.multicall import MC_SHIFT + +HIDE_VIRTUAL_EVENT_NAME = "<<autocompletewindow-hide>>" +HIDE_FOCUS_OUT_SEQUENCE = "<FocusOut>" +HIDE_SEQUENCES = (HIDE_FOCUS_OUT_SEQUENCE, "<ButtonPress>") +KEYPRESS_VIRTUAL_EVENT_NAME = "<<autocompletewindow-keypress>>" +# We need to bind event beyond <Key> so that the function will be called +# before the default specific IDLE function +KEYPRESS_SEQUENCES = ("<Key>", "<Key-BackSpace>", "<Key-Return>", "<Key-Tab>", + "<Key-Up>", "<Key-Down>", "<Key-Home>", "<Key-End>", + "<Key-Prior>", "<Key-Next>", "<Key-Escape>") +KEYRELEASE_VIRTUAL_EVENT_NAME = "<<autocompletewindow-keyrelease>>" +KEYRELEASE_SEQUENCE = "<KeyRelease>" +LISTUPDATE_SEQUENCE = "<B1-ButtonRelease>" +WINCONFIG_SEQUENCE = "<Configure>" +DOUBLECLICK_SEQUENCE = "<B1-Double-ButtonRelease>" + +class AutoCompleteWindow: + + def __init__(self, widget, tags): + # The widget (Text) on which we place the AutoCompleteWindow + self.widget = widget + # Tags to mark inserted text with + self.tags = tags + # The widgets we create + self.autocompletewindow = self.listbox = self.scrollbar = None + # The default foreground and background of a selection. Saved because + # they are changed to the regular colors of list items when the + # completion start is not a prefix of the selected completion + self.origselforeground = self.origselbackground = None + # The list of completions + self.completions = None + # A list with more completions, or None + self.morecompletions = None + # The completion mode, either autocomplete.ATTRS or .FILES. + self.mode = None + # The current completion start, on the text box (a string) + self.start = None + # The index of the start of the completion + self.startindex = None + # The last typed start, used so that when the selection changes, + # the new start will be as close as possible to the last typed one. + self.lasttypedstart = None + # Do we have an indication that the user wants the completion window + # (for example, he clicked the list) + self.userwantswindow = None + # event ids + self.hideid = self.keypressid = self.listupdateid = \ + self.winconfigid = self.keyreleaseid = self.doubleclickid = None + # Flag set if last keypress was a tab + self.lastkey_was_tab = False + # Flag set to avoid recursive <Configure> callback invocations. + self.is_configuring = False + + def _change_start(self, newstart): + min_len = min(len(self.start), len(newstart)) + i = 0 + while i < min_len and self.start[i] == newstart[i]: + i += 1 + if i < len(self.start): + self.widget.delete("%s+%dc" % (self.startindex, i), + "%s+%dc" % (self.startindex, len(self.start))) + if i < len(newstart): + self.widget.insert("%s+%dc" % (self.startindex, i), + newstart[i:], + self.tags) + self.start = newstart + + def _binary_search(self, s): + """Find the first index in self.completions where completions[i] is + greater or equal to s, or the last index if there is no such. + """ + i = 0; j = len(self.completions) + while j > i: + m = (i + j) // 2 + if self.completions[m] >= s: + j = m + else: + i = m + 1 + return min(i, len(self.completions)-1) + + def _complete_string(self, s): + """Assuming that s is the prefix of a string in self.completions, + return the longest string which is a prefix of all the strings which + s is a prefix of them. If s is not a prefix of a string, return s. + """ + first = self._binary_search(s) + if self.completions[first][:len(s)] != s: + # There is not even one completion which s is a prefix of. + return s + # Find the end of the range of completions where s is a prefix of. + i = first + 1 + j = len(self.completions) + while j > i: + m = (i + j) // 2 + if self.completions[m][:len(s)] != s: + j = m + else: + i = m + 1 + last = i-1 + + if first == last: # only one possible completion + return self.completions[first] + + # We should return the maximum prefix of first and last + first_comp = self.completions[first] + last_comp = self.completions[last] + min_len = min(len(first_comp), len(last_comp)) + i = len(s) + while i < min_len and first_comp[i] == last_comp[i]: + i += 1 + return first_comp[:i] + + def _selection_changed(self): + """Call when the selection of the Listbox has changed. + + Updates the Listbox display and calls _change_start. + """ + cursel = int(self.listbox.curselection()[0]) + + self.listbox.see(cursel) + + lts = self.lasttypedstart + selstart = self.completions[cursel] + if self._binary_search(lts) == cursel: + newstart = lts + else: + min_len = min(len(lts), len(selstart)) + i = 0 + while i < min_len and lts[i] == selstart[i]: + i += 1 + newstart = selstart[:i] + self._change_start(newstart) + + if self.completions[cursel][:len(self.start)] == self.start: + # start is a prefix of the selected completion + self.listbox.configure(selectbackground=self.origselbackground, + selectforeground=self.origselforeground) + else: + self.listbox.configure(selectbackground=self.listbox.cget("bg"), + selectforeground=self.listbox.cget("fg")) + # If there are more completions, show them, and call me again. + if self.morecompletions: + self.completions = self.morecompletions + self.morecompletions = None + self.listbox.delete(0, END) + for item in self.completions: + self.listbox.insert(END, item) + self.listbox.select_set(self._binary_search(self.start)) + self._selection_changed() + + def show_window(self, comp_lists, index, complete, mode, userWantsWin): + """Show the autocomplete list, bind events. + + If complete is True, complete the text, and if there is exactly + one matching completion, don't open a list. + """ + # Handle the start we already have + self.completions, self.morecompletions = comp_lists + self.mode = mode + self.startindex = self.widget.index(index) + self.start = self.widget.get(self.startindex, "insert") + if complete: + completed = self._complete_string(self.start) + start = self.start + self._change_start(completed) + i = self._binary_search(completed) + if self.completions[i] == completed and \ + (i == len(self.completions)-1 or + self.completions[i+1][:len(completed)] != completed): + # There is exactly one matching completion + return completed == start + self.userwantswindow = userWantsWin + self.lasttypedstart = self.start + + self.autocompletewindow = acw = Toplevel(self.widget) + acw.withdraw() + acw.wm_overrideredirect(1) + try: + # Prevent grabbing focus on macOS. + acw.tk.call("::tk::unsupported::MacWindowStyle", "style", acw._w, + "help", "noActivates") + except TclError: + pass + self.scrollbar = scrollbar = Scrollbar(acw, orient=VERTICAL) + self.listbox = listbox = Listbox(acw, yscrollcommand=scrollbar.set, + exportselection=False) + for item in self.completions: + listbox.insert(END, item) + self.origselforeground = listbox.cget("selectforeground") + self.origselbackground = listbox.cget("selectbackground") + scrollbar.config(command=listbox.yview) + scrollbar.pack(side=RIGHT, fill=Y) + listbox.pack(side=LEFT, fill=BOTH, expand=True) + #acw.update_idletasks() # Need for tk8.6.8 on macOS: #40128. + acw.lift() # work around bug in Tk 8.5.18+ (issue #24570) + + # Initialize the listbox selection + self.listbox.select_set(self._binary_search(self.start)) + self._selection_changed() + + # bind events + self.hideaid = acw.bind(HIDE_VIRTUAL_EVENT_NAME, self.hide_event) + self.hidewid = self.widget.bind(HIDE_VIRTUAL_EVENT_NAME, self.hide_event) + acw.event_add(HIDE_VIRTUAL_EVENT_NAME, HIDE_FOCUS_OUT_SEQUENCE) + for seq in HIDE_SEQUENCES: + self.widget.event_add(HIDE_VIRTUAL_EVENT_NAME, seq) + + self.keypressid = self.widget.bind(KEYPRESS_VIRTUAL_EVENT_NAME, + self.keypress_event) + for seq in KEYPRESS_SEQUENCES: + self.widget.event_add(KEYPRESS_VIRTUAL_EVENT_NAME, seq) + self.keyreleaseid = self.widget.bind(KEYRELEASE_VIRTUAL_EVENT_NAME, + self.keyrelease_event) + self.widget.event_add(KEYRELEASE_VIRTUAL_EVENT_NAME,KEYRELEASE_SEQUENCE) + self.listupdateid = listbox.bind(LISTUPDATE_SEQUENCE, + self.listselect_event) + self.is_configuring = False + self.winconfigid = acw.bind(WINCONFIG_SEQUENCE, self.winconfig_event) + self.doubleclickid = listbox.bind(DOUBLECLICK_SEQUENCE, + self.doubleclick_event) + return None + + def winconfig_event(self, event): + if self.is_configuring: + # Avoid running on recursive <Configure> callback invocations. + return + + self.is_configuring = True + if not self.is_active(): + return + + # Since the <Configure> event may occur after the completion window is gone, + # catch potential TclError exceptions when accessing acw. See: bpo-41611. + try: + # Position the completion list window + text = self.widget + text.see(self.startindex) + x, y, cx, cy = text.bbox(self.startindex) + acw = self.autocompletewindow + if platform.system().startswith('Windows'): + # On Windows an update() call is needed for the completion + # list window to be created, so that we can fetch its width + # and height. However, this is not needed on other platforms + # (tested on Ubuntu and macOS) but at one point began + # causing freezes on macOS. See issues 37849 and 41611. + acw.update() + acw_width, acw_height = acw.winfo_width(), acw.winfo_height() + text_width, text_height = text.winfo_width(), text.winfo_height() + new_x = text.winfo_rootx() + min(x, max(0, text_width - acw_width)) + new_y = text.winfo_rooty() + y + if (text_height - (y + cy) >= acw_height # enough height below + or y < acw_height): # not enough height above + # place acw below current line + new_y += cy + else: + # place acw above current line + new_y -= acw_height + acw.wm_geometry("+%d+%d" % (new_x, new_y)) + acw.deiconify() + acw.update_idletasks() + except TclError: + pass + + if platform.system().startswith('Windows'): + # See issue 15786. When on Windows platform, Tk will misbehave + # to call winconfig_event multiple times, we need to prevent this, + # otherwise mouse button double click will not be able to used. + try: + acw.unbind(WINCONFIG_SEQUENCE, self.winconfigid) + except TclError: + pass + self.winconfigid = None + + self.is_configuring = False + + def _hide_event_check(self): + if not self.autocompletewindow: + return + + try: + if not self.autocompletewindow.focus_get(): + self.hide_window() + except KeyError: + # See issue 734176, when user click on menu, acw.focus_get() + # will get KeyError. + self.hide_window() + + def hide_event(self, event): + # Hide autocomplete list if it exists and does not have focus or + # mouse click on widget / text area. + if self.is_active(): + if event.type == EventType.FocusOut: + # On Windows platform, it will need to delay the check for + # acw.focus_get() when click on acw, otherwise it will return + # None and close the window + self.widget.after(1, self._hide_event_check) + elif event.type == EventType.ButtonPress: + # ButtonPress event only bind to self.widget + self.hide_window() + + def listselect_event(self, event): + if self.is_active(): + self.userwantswindow = True + cursel = int(self.listbox.curselection()[0]) + self._change_start(self.completions[cursel]) + + def doubleclick_event(self, event): + # Put the selected completion in the text, and close the list + cursel = int(self.listbox.curselection()[0]) + self._change_start(self.completions[cursel]) + self.hide_window() + + def keypress_event(self, event): + if not self.is_active(): + return None + keysym = event.keysym + if hasattr(event, "mc_state"): + state = event.mc_state + else: + state = 0 + if keysym != "Tab": + self.lastkey_was_tab = False + if (len(keysym) == 1 or keysym in ("underscore", "BackSpace") + or (self.mode == FILES and keysym in + ("period", "minus"))) \ + and not (state & ~MC_SHIFT): + # Normal editing of text + if len(keysym) == 1: + self._change_start(self.start + keysym) + elif keysym == "underscore": + self._change_start(self.start + '_') + elif keysym == "period": + self._change_start(self.start + '.') + elif keysym == "minus": + self._change_start(self.start + '-') + else: + # keysym == "BackSpace" + if len(self.start) == 0: + self.hide_window() + return None + self._change_start(self.start[:-1]) + self.lasttypedstart = self.start + self.listbox.select_clear(0, int(self.listbox.curselection()[0])) + self.listbox.select_set(self._binary_search(self.start)) + self._selection_changed() + return "break" + + elif keysym == "Return": + self.complete() + self.hide_window() + return 'break' + + elif (self.mode == ATTRS and keysym in + ("period", "space", "parenleft", "parenright", "bracketleft", + "bracketright")) or \ + (self.mode == FILES and keysym in + ("slash", "backslash", "quotedbl", "apostrophe")) \ + and not (state & ~MC_SHIFT): + # If start is a prefix of the selection, but is not '' when + # completing file names, put the whole + # selected completion. Anyway, close the list. + cursel = int(self.listbox.curselection()[0]) + if self.completions[cursel][:len(self.start)] == self.start \ + and (self.mode == ATTRS or self.start): + self._change_start(self.completions[cursel]) + self.hide_window() + return None + + elif keysym in ("Home", "End", "Prior", "Next", "Up", "Down") and \ + not state: + # Move the selection in the listbox + self.userwantswindow = True + cursel = int(self.listbox.curselection()[0]) + if keysym == "Home": + newsel = 0 + elif keysym == "End": + newsel = len(self.completions)-1 + elif keysym in ("Prior", "Next"): + jump = self.listbox.nearest(self.listbox.winfo_height()) - \ + self.listbox.nearest(0) + if keysym == "Prior": + newsel = max(0, cursel-jump) + else: + assert keysym == "Next" + newsel = min(len(self.completions)-1, cursel+jump) + elif keysym == "Up": + newsel = max(0, cursel-1) + else: + assert keysym == "Down" + newsel = min(len(self.completions)-1, cursel+1) + self.listbox.select_clear(cursel) + self.listbox.select_set(newsel) + self._selection_changed() + self._change_start(self.completions[newsel]) + return "break" + + elif (keysym == "Tab" and not state): + if self.lastkey_was_tab: + # two tabs in a row; insert current selection and close acw + cursel = int(self.listbox.curselection()[0]) + self._change_start(self.completions[cursel]) + self.hide_window() + return "break" + else: + # first tab; let AutoComplete handle the completion + self.userwantswindow = True + self.lastkey_was_tab = True + return None + + elif any(s in keysym for s in ("Shift", "Control", "Alt", + "Meta", "Command", "Option")): + # A modifier key, so ignore + return None + + elif event.char and event.char >= ' ': + # Regular character with a non-length-1 keycode + self._change_start(self.start + event.char) + self.lasttypedstart = self.start + self.listbox.select_clear(0, int(self.listbox.curselection()[0])) + self.listbox.select_set(self._binary_search(self.start)) + self._selection_changed() + return "break" + + else: + # Unknown event, close the window and let it through. + self.hide_window() + return None + + def keyrelease_event(self, event): + if not self.is_active(): + return + if self.widget.index("insert") != \ + self.widget.index("%s+%dc" % (self.startindex, len(self.start))): + # If we didn't catch an event which moved the insert, close window + self.hide_window() + + def is_active(self): + return self.autocompletewindow is not None + + def complete(self): + self._change_start(self._complete_string(self.start)) + # The selection doesn't change. + + def hide_window(self): + if not self.is_active(): + return + + # unbind events + self.autocompletewindow.event_delete(HIDE_VIRTUAL_EVENT_NAME, + HIDE_FOCUS_OUT_SEQUENCE) + for seq in HIDE_SEQUENCES: + self.widget.event_delete(HIDE_VIRTUAL_EVENT_NAME, seq) + + self.autocompletewindow.unbind(HIDE_VIRTUAL_EVENT_NAME, self.hideaid) + self.widget.unbind(HIDE_VIRTUAL_EVENT_NAME, self.hidewid) + self.hideaid = None + self.hidewid = None + for seq in KEYPRESS_SEQUENCES: + self.widget.event_delete(KEYPRESS_VIRTUAL_EVENT_NAME, seq) + self.widget.unbind(KEYPRESS_VIRTUAL_EVENT_NAME, self.keypressid) + self.keypressid = None + self.widget.event_delete(KEYRELEASE_VIRTUAL_EVENT_NAME, + KEYRELEASE_SEQUENCE) + self.widget.unbind(KEYRELEASE_VIRTUAL_EVENT_NAME, self.keyreleaseid) + self.keyreleaseid = None + self.listbox.unbind(LISTUPDATE_SEQUENCE, self.listupdateid) + self.listupdateid = None + if self.winconfigid: + self.autocompletewindow.unbind(WINCONFIG_SEQUENCE, self.winconfigid) + self.winconfigid = None + + # Re-focusOn frame.text (See issue #15786) + self.widget.focus_set() + + # destroy widgets + self.scrollbar.destroy() + self.scrollbar = None + self.listbox.destroy() + self.listbox = None + self.autocompletewindow.destroy() + self.autocompletewindow = None + + +if __name__ == '__main__': + from unittest import main + main('idlelib.idle_test.test_autocomplete_w', verbosity=2, exit=False) + +# TODO: autocomplete/w htest here diff --git a/Lib/idlelib/autoexpand.py b/Lib/idlelib/autoexpand.py new file mode 100644 index 000000000..92f5c84eb --- /dev/null +++ b/Lib/idlelib/autoexpand.py @@ -0,0 +1,96 @@ +'''Complete the current word before the cursor with words in the editor. + +Each menu selection or shortcut key selection replaces the word with a +different word with the same prefix. The search for matches begins +before the target and moves toward the top of the editor. It then starts +after the cursor and moves down. It then returns to the original word and +the cycle starts again. + +Changing the current text line or leaving the cursor in a different +place before requesting the next selection causes AutoExpand to reset +its state. + +There is only one instance of Autoexpand. +''' +import re +import string + + +class AutoExpand: + wordchars = string.ascii_letters + string.digits + "_" + + def __init__(self, editwin): + self.text = editwin.text + self.bell = self.text.bell + self.state = None + + def expand_word_event(self, event): + "Replace the current word with the next expansion." + curinsert = self.text.index("insert") + curline = self.text.get("insert linestart", "insert lineend") + if not self.state: + words = self.getwords() + index = 0 + else: + words, index, insert, line = self.state + if insert != curinsert or line != curline: + words = self.getwords() + index = 0 + if not words: + self.bell() + return "break" + word = self.getprevword() + self.text.delete("insert - %d chars" % len(word), "insert") + newword = words[index] + index = (index + 1) % len(words) + if index == 0: + self.bell() # Warn we cycled around + self.text.insert("insert", newword) + curinsert = self.text.index("insert") + curline = self.text.get("insert linestart", "insert lineend") + self.state = words, index, curinsert, curline + return "break" + + def getwords(self): + "Return a list of words that match the prefix before the cursor." + word = self.getprevword() + if not word: + return [] + before = self.text.get("1.0", "insert wordstart") + wbefore = re.findall(r"\b" + word + r"\w+\b", before) + del before + after = self.text.get("insert wordend", "end") + wafter = re.findall(r"\b" + word + r"\w+\b", after) + del after + if not wbefore and not wafter: + return [] + words = [] + dict = {} + # search backwards through words before + wbefore.reverse() + for w in wbefore: + if dict.get(w): + continue + words.append(w) + dict[w] = w + # search onwards through words after + for w in wafter: + if dict.get(w): + continue + words.append(w) + dict[w] = w + words.append(word) + return words + + def getprevword(self): + "Return the word prefix before the cursor." + line = self.text.get("insert linestart", "insert") + i = len(line) + while i > 0 and line[i-1] in self.wordchars: + i = i-1 + return line[i:] + + +if __name__ == '__main__': + from unittest import main + main('idlelib.idle_test.test_autoexpand', verbosity=2) diff --git a/Lib/idlelib/browser.py b/Lib/idlelib/browser.py new file mode 100644 index 000000000..8b9060e57 --- /dev/null +++ b/Lib/idlelib/browser.py @@ -0,0 +1,260 @@ +"""Module browser. + +XXX TO DO: + +- reparse when source changed (maybe just a button would be OK?) + (or recheck on window popup) +- add popup menu with more options (e.g. doc strings, base classes, imports) +- add base classes to class browser tree +""" + +import os +import pyclbr +import sys + +from idlelib.config import idleConf +from idlelib import pyshell +from idlelib.tree import TreeNode, TreeItem, ScrolledCanvas +from idlelib.util import py_extensions +from idlelib.window import ListedToplevel + + +file_open = None # Method...Item and Class...Item use this. +# Normally pyshell.flist.open, but there is no pyshell.flist for htest. + +# The browser depends on pyclbr and importlib which do not support .pyi files. +browseable_extension_blocklist = ('.pyi',) + + +def is_browseable_extension(path): + _, ext = os.path.splitext(path) + ext = os.path.normcase(ext) + return ext in py_extensions and ext not in browseable_extension_blocklist + + +def transform_children(child_dict, modname=None): + """Transform a child dictionary to an ordered sequence of objects. + + The dictionary maps names to pyclbr information objects. + Filter out imported objects. + Augment class names with bases. + The insertion order of the dictionary is assumed to have been in line + number order, so sorting is not necessary. + + The current tree only calls this once per child_dict as it saves + TreeItems once created. A future tree and tests might violate this, + so a check prevents multiple in-place augmentations. + """ + obs = [] # Use list since values should already be sorted. + for key, obj in child_dict.items(): + if modname is None or obj.module == modname: + if hasattr(obj, 'super') and obj.super and obj.name == key: + # If obj.name != key, it has already been suffixed. + supers = [] + for sup in obj.super: + if isinstance(sup, str): + sname = sup + else: + sname = sup.name + if sup.module != obj.module: + sname = f'{sup.module}.{sname}' + supers.append(sname) + obj.name += '({})'.format(', '.join(supers)) + obs.append(obj) + return obs + + +class ModuleBrowser: + """Browse module classes and functions in IDLE. + """ + # This class is also the base class for pathbrowser.PathBrowser. + # Init and close are inherited, other methods are overridden. + # PathBrowser.__init__ does not call __init__ below. + + def __init__(self, master, path, *, _htest=False, _utest=False): + """Create a window for browsing a module's structure. + + Args: + master: parent for widgets. + path: full path of file to browse. + _htest - bool; change box location when running htest. + -utest - bool; suppress contents when running unittest. + + Global variables: + file_open: Function used for opening a file. + + Instance variables: + name: Module name. + file: Full path and module with supported extension. + Used in creating ModuleBrowserTreeItem as the rootnode for + the tree and subsequently in the children. + """ + self.master = master + self.path = path + self._htest = _htest + self._utest = _utest + self.init() + + def close(self, event=None): + "Dismiss the window and the tree nodes." + self.top.destroy() + self.node.destroy() + + def init(self): + "Create browser tkinter widgets, including the tree." + global file_open + root = self.master + flist = (pyshell.flist if not (self._htest or self._utest) + else pyshell.PyShellFileList(root)) + file_open = flist.open + pyclbr._modules.clear() + + # create top + self.top = top = ListedToplevel(root) + top.protocol("WM_DELETE_WINDOW", self.close) + top.bind("<Escape>", self.close) + if self._htest: # place dialog below parent if running htest + top.geometry("+%d+%d" % + (root.winfo_rootx(), root.winfo_rooty() + 200)) + self.settitle() + top.focus_set() + + # create scrolled canvas + theme = idleConf.CurrentTheme() + background = idleConf.GetHighlight(theme, 'normal')['background'] + sc = ScrolledCanvas(top, bg=background, highlightthickness=0, + takefocus=1) + sc.frame.pack(expand=1, fill="both") + item = self.rootnode() + self.node = node = TreeNode(sc.canvas, None, item) + if not self._utest: + node.update() + node.expand() + + def settitle(self): + "Set the window title." + self.top.wm_title("Module Browser - " + os.path.basename(self.path)) + self.top.wm_iconname("Module Browser") + + def rootnode(self): + "Return a ModuleBrowserTreeItem as the root of the tree." + return ModuleBrowserTreeItem(self.path) + + +class ModuleBrowserTreeItem(TreeItem): + """Browser tree for Python module. + + Uses TreeItem as the basis for the structure of the tree. + Used by both browsers. + """ + + def __init__(self, file): + """Create a TreeItem for the file. + + Args: + file: Full path and module name. + """ + self.file = file + + def GetText(self): + "Return the module name as the text string to display." + return os.path.basename(self.file) + + def GetIconName(self): + "Return the name of the icon to display." + return "python" + + def GetSubList(self): + "Return ChildBrowserTreeItems for children." + return [ChildBrowserTreeItem(obj) for obj in self.listchildren()] + + def OnDoubleClick(self): + "Open a module in an editor window when double clicked." + if not is_browseable_extension(self.file): + return + if not os.path.exists(self.file): + return + file_open(self.file) + + def IsExpandable(self): + "Return True if Python file." + return is_browseable_extension(self.file) + + def listchildren(self): + "Return sequenced classes and functions in the module." + if not is_browseable_extension(self.file): + return [] + dir, base = os.path.split(self.file) + name, _ = os.path.splitext(base) + try: + tree = pyclbr.readmodule_ex(name, [dir] + sys.path) + except ImportError: + return [] + return transform_children(tree, name) + + +class ChildBrowserTreeItem(TreeItem): + """Browser tree for child nodes within the module. + + Uses TreeItem as the basis for the structure of the tree. + """ + + def __init__(self, obj): + "Create a TreeItem for a pyclbr class/function object." + self.obj = obj + self.name = obj.name + self.isfunction = isinstance(obj, pyclbr.Function) + + def GetText(self): + "Return the name of the function/class to display." + name = self.name + if self.isfunction: + return "def " + name + "(...)" + else: + return "class " + name + + def GetIconName(self): + "Return the name of the icon to display." + if self.isfunction: + return "python" + else: + return "folder" + + def IsExpandable(self): + "Return True if self.obj has nested objects." + return self.obj.children != {} + + def GetSubList(self): + "Return ChildBrowserTreeItems for children." + return [ChildBrowserTreeItem(obj) + for obj in transform_children(self.obj.children)] + + def OnDoubleClick(self): + "Open module with file_open and position to lineno." + try: + edit = file_open(self.obj.file) + edit.gotoline(self.obj.lineno) + except (OSError, AttributeError): + pass + + +def _module_browser(parent): # htest # + if len(sys.argv) > 1: # If pass file on command line. + file = sys.argv[1] + else: + file = __file__ + # Add nested objects for htest. + class Nested_in_func(TreeNode): + def nested_in_class(): pass + def closure(): + class Nested_in_closure: pass + ModuleBrowser(parent, file, _htest=True) + + +if __name__ == "__main__": + if len(sys.argv) == 1: # If pass file on command line, unittest fails. + from unittest import main + main('idlelib.idle_test.test_browser', verbosity=2, exit=False) + + from idlelib.idle_test.htest import run + run(_module_browser) diff --git a/Lib/idlelib/calltip.py b/Lib/idlelib/calltip.py new file mode 100644 index 000000000..40bc5a0ad --- /dev/null +++ b/Lib/idlelib/calltip.py @@ -0,0 +1,205 @@ +"""Pop up a reminder of how to call a function. + +Call Tips are floating windows which display function, class, and method +parameter and docstring information when you type an opening parenthesis, and +which disappear when you type a closing parenthesis. +""" +import __main__ +import inspect +import re +import sys +import textwrap +import types + +from idlelib import calltip_w +from idlelib.hyperparser import HyperParser + + +class Calltip: + + def __init__(self, editwin=None): + if editwin is None: # subprocess and test + self.editwin = None + else: + self.editwin = editwin + self.text = editwin.text + self.active_calltip = None + self._calltip_window = self._make_tk_calltip_window + + def close(self): + self._calltip_window = None + + def _make_tk_calltip_window(self): + # See __init__ for usage + return calltip_w.CalltipWindow(self.text) + + def remove_calltip_window(self, event=None): + if self.active_calltip: + self.active_calltip.hidetip() + self.active_calltip = None + + def force_open_calltip_event(self, event): + "The user selected the menu entry or hotkey, open the tip." + self.open_calltip(True) + return "break" + + def try_open_calltip_event(self, event): + """Happens when it would be nice to open a calltip, but not really + necessary, for example after an opening bracket, so function calls + won't be made. + """ + self.open_calltip(False) + + def refresh_calltip_event(self, event): + if self.active_calltip and self.active_calltip.tipwindow: + self.open_calltip(False) + + def open_calltip(self, evalfuncs): + """Maybe close an existing calltip and maybe open a new calltip. + + Called from (force_open|try_open|refresh)_calltip_event functions. + """ + hp = HyperParser(self.editwin, "insert") + sur_paren = hp.get_surrounding_brackets('(') + + # If not inside parentheses, no calltip. + if not sur_paren: + self.remove_calltip_window() + return + + # If a calltip is shown for the current parentheses, do + # nothing. + if self.active_calltip: + opener_line, opener_col = map(int, sur_paren[0].split('.')) + if ( + (opener_line, opener_col) == + (self.active_calltip.parenline, self.active_calltip.parencol) + ): + return + + hp.set_index(sur_paren[0]) + try: + expression = hp.get_expression() + except ValueError: + expression = None + if not expression: + # No expression before the opening parenthesis, e.g. + # because it's in a string or the opener for a tuple: + # Do nothing. + return + + # At this point, the current index is after an opening + # parenthesis, in a section of code, preceded by a valid + # expression. If there is a calltip shown, it's not for the + # same index and should be closed. + self.remove_calltip_window() + + # Simple, fast heuristic: If the preceding expression includes + # an opening parenthesis, it likely includes a function call. + if not evalfuncs and (expression.find('(') != -1): + return + + argspec = self.fetch_tip(expression) + if not argspec: + return + self.active_calltip = self._calltip_window() + self.active_calltip.showtip(argspec, sur_paren[0], sur_paren[1]) + + def fetch_tip(self, expression): + """Return the argument list and docstring of a function or class. + + If there is a Python subprocess, get the calltip there. Otherwise, + either this fetch_tip() is running in the subprocess or it was + called in an IDLE running without the subprocess. + + The subprocess environment is that of the most recently run script. If + two unrelated modules are being edited some calltips in the current + module may be inoperative if the module was not the last to run. + + To find methods, fetch_tip must be fed a fully qualified name. + + """ + try: + rpcclt = self.editwin.flist.pyshell.interp.rpcclt + except AttributeError: + rpcclt = None + if rpcclt: + return rpcclt.remotecall("exec", "get_the_calltip", + (expression,), {}) + else: + return get_argspec(get_entity(expression)) + + +def get_entity(expression): + """Return the object corresponding to expression evaluated + in a namespace spanning sys.modules and __main.dict__. + """ + if expression: + namespace = {**sys.modules, **__main__.__dict__} + try: + return eval(expression, namespace) # Only protect user code. + except BaseException: + # An uncaught exception closes idle, and eval can raise any + # exception, especially if user classes are involved. + return None + +# The following are used in get_argspec and some in tests +_MAX_COLS = 85 +_MAX_LINES = 5 # enough for bytes +_INDENT = ' '*4 # for wrapped signatures +_first_param = re.compile(r'(?<=\()\w*\,?\s*') +_default_callable_argspec = "See source or doc" +_invalid_method = "invalid method signature" + +def get_argspec(ob): + '''Return a string describing the signature of a callable object, or ''. + + For Python-coded functions and methods, the first line is introspected. + Delete 'self' parameter for classes (.__init__) and bound methods. + The next lines are the first lines of the doc string up to the first + empty line or _MAX_LINES. For builtins, this typically includes + the arguments in addition to the return value. + ''' + # Determine function object fob to inspect. + try: + ob_call = ob.__call__ + except BaseException: # Buggy user object could raise anything. + return '' # No popup for non-callables. + # For Get_argspecTest.test_buggy_getattr_class, CallA() & CallB(). + fob = ob_call if isinstance(ob_call, types.MethodType) else ob + + # Initialize argspec and wrap it to get lines. + try: + argspec = str(inspect.signature(fob)) + except Exception as err: + msg = str(err) + if msg.startswith(_invalid_method): + return _invalid_method + else: + argspec = '' + + if isinstance(fob, type) and argspec == '()': + # If fob has no argument, use default callable argspec. + argspec = _default_callable_argspec + + lines = (textwrap.wrap(argspec, _MAX_COLS, subsequent_indent=_INDENT) + if len(argspec) > _MAX_COLS else [argspec] if argspec else []) + + # Augment lines from docstring, if any, and join to get argspec. + doc = inspect.getdoc(ob) + if doc: + for line in doc.split('\n', _MAX_LINES)[:_MAX_LINES]: + line = line.strip() + if not line: + break + if len(line) > _MAX_COLS: + line = line[: _MAX_COLS - 3] + '...' + lines.append(line) + argspec = '\n'.join(lines) + + return argspec or _default_callable_argspec + + +if __name__ == '__main__': + from unittest import main + main('idlelib.idle_test.test_calltip', verbosity=2) diff --git a/Lib/idlelib/calltip_w.py b/Lib/idlelib/calltip_w.py new file mode 100644 index 000000000..938637605 --- /dev/null +++ b/Lib/idlelib/calltip_w.py @@ -0,0 +1,202 @@ +"""A call-tip window class for Tkinter/IDLE. + +After tooltip.py, which uses ideas gleaned from PySol. +Used by calltip.py. +""" +from tkinter import Label, LEFT, SOLID, TclError + +from idlelib.tooltip import TooltipBase + +HIDE_EVENT = "<<calltipwindow-hide>>" +HIDE_SEQUENCES = ("<Key-Escape>", "<FocusOut>") +CHECKHIDE_EVENT = "<<calltipwindow-checkhide>>" +CHECKHIDE_SEQUENCES = ("<KeyRelease>", "<ButtonRelease>") +CHECKHIDE_TIME = 100 # milliseconds + +MARK_RIGHT = "calltipwindowregion_right" + + +class CalltipWindow(TooltipBase): + """A call-tip widget for tkinter text widgets.""" + + def __init__(self, text_widget): + """Create a call-tip; shown by showtip(). + + text_widget: a Text widget with code for which call-tips are desired + """ + # Note: The Text widget will be accessible as self.anchor_widget + super().__init__(text_widget) + + self.label = self.text = None + self.parenline = self.parencol = self.lastline = None + self.hideid = self.checkhideid = None + self.checkhide_after_id = None + + def get_position(self): + """Choose the position of the call-tip.""" + curline = int(self.anchor_widget.index("insert").split('.')[0]) + if curline == self.parenline: + anchor_index = (self.parenline, self.parencol) + else: + anchor_index = (curline, 0) + box = self.anchor_widget.bbox("%d.%d" % anchor_index) + if not box: + box = list(self.anchor_widget.bbox("insert")) + # align to left of window + box[0] = 0 + box[2] = 0 + return box[0] + 2, box[1] + box[3] + + def position_window(self): + "Reposition the window if needed." + curline = int(self.anchor_widget.index("insert").split('.')[0]) + if curline == self.lastline: + return + self.lastline = curline + self.anchor_widget.see("insert") + super().position_window() + + def showtip(self, text, parenleft, parenright): + """Show the call-tip, bind events which will close it and reposition it. + + text: the text to display in the call-tip + parenleft: index of the opening parenthesis in the text widget + parenright: index of the closing parenthesis in the text widget, + or the end of the line if there is no closing parenthesis + """ + # Only called in calltip.Calltip, where lines are truncated + self.text = text + if self.tipwindow or not self.text: + return + + self.anchor_widget.mark_set(MARK_RIGHT, parenright) + self.parenline, self.parencol = map( + int, self.anchor_widget.index(parenleft).split(".")) + + super().showtip() + + self._bind_events() + + def showcontents(self): + """Create the call-tip widget.""" + self.label = Label(self.tipwindow, text=self.text, justify=LEFT, + background="#ffffd0", foreground="black", + relief=SOLID, borderwidth=1, + font=self.anchor_widget['font']) + self.label.pack() + + def checkhide_event(self, event=None): + """Handle CHECK_HIDE_EVENT: call hidetip or reschedule.""" + if not self.tipwindow: + # If the event was triggered by the same event that unbound + # this function, the function will be called nevertheless, + # so do nothing in this case. + return None + + # Hide the call-tip if the insertion cursor moves outside of the + # parenthesis. + curline, curcol = map(int, self.anchor_widget.index("insert").split('.')) + if curline < self.parenline or \ + (curline == self.parenline and curcol <= self.parencol) or \ + self.anchor_widget.compare("insert", ">", MARK_RIGHT): + self.hidetip() + return "break" + + # Not hiding the call-tip. + + self.position_window() + # Re-schedule this function to be called again in a short while. + if self.checkhide_after_id is not None: + self.anchor_widget.after_cancel(self.checkhide_after_id) + self.checkhide_after_id = \ + self.anchor_widget.after(CHECKHIDE_TIME, self.checkhide_event) + return None + + def hide_event(self, event): + """Handle HIDE_EVENT by calling hidetip.""" + if not self.tipwindow: + # See the explanation in checkhide_event. + return None + self.hidetip() + return "break" + + def hidetip(self): + """Hide the call-tip.""" + if not self.tipwindow: + return + + try: + self.label.destroy() + except TclError: + pass + self.label = None + + self.parenline = self.parencol = self.lastline = None + try: + self.anchor_widget.mark_unset(MARK_RIGHT) + except TclError: + pass + + try: + self._unbind_events() + except (TclError, ValueError): + # ValueError may be raised by MultiCall + pass + + super().hidetip() + + def _bind_events(self): + """Bind event handlers.""" + self.checkhideid = self.anchor_widget.bind(CHECKHIDE_EVENT, + self.checkhide_event) + for seq in CHECKHIDE_SEQUENCES: + self.anchor_widget.event_add(CHECKHIDE_EVENT, seq) + self.anchor_widget.after(CHECKHIDE_TIME, self.checkhide_event) + self.hideid = self.anchor_widget.bind(HIDE_EVENT, + self.hide_event) + for seq in HIDE_SEQUENCES: + self.anchor_widget.event_add(HIDE_EVENT, seq) + + def _unbind_events(self): + """Unbind event handlers.""" + for seq in CHECKHIDE_SEQUENCES: + self.anchor_widget.event_delete(CHECKHIDE_EVENT, seq) + self.anchor_widget.unbind(CHECKHIDE_EVENT, self.checkhideid) + self.checkhideid = None + for seq in HIDE_SEQUENCES: + self.anchor_widget.event_delete(HIDE_EVENT, seq) + self.anchor_widget.unbind(HIDE_EVENT, self.hideid) + self.hideid = None + + +def _calltip_window(parent): # htest # + from tkinter import Toplevel, Text, LEFT, BOTH + + top = Toplevel(parent) + top.title("Test call-tips") + x, y = map(int, parent.geometry().split('+')[1:]) + top.geometry("250x100+%d+%d" % (x + 175, y + 150)) + text = Text(top) + text.pack(side=LEFT, fill=BOTH, expand=1) + text.insert("insert", "string.split") + top.update() + + calltip = CalltipWindow(text) + def calltip_show(event): + calltip.showtip("(s='Hello world')", "insert", "end") + def calltip_hide(event): + calltip.hidetip() + text.event_add("<<calltip-show>>", "(") + text.event_add("<<calltip-hide>>", ")") + text.bind("<<calltip-show>>", calltip_show) + text.bind("<<calltip-hide>>", calltip_hide) + + text.focus_set() + + +if __name__ == '__main__': + from unittest import main + main('idlelib.idle_test.test_calltip_w', verbosity=2, exit=False) + + from idlelib.idle_test.htest import run + run(_calltip_window) diff --git a/Lib/idlelib/codecontext.py b/Lib/idlelib/codecontext.py new file mode 100644 index 000000000..f2f44f5f8 --- /dev/null +++ b/Lib/idlelib/codecontext.py @@ -0,0 +1,270 @@ +"""codecontext - display the block context above the edit window + +Once code has scrolled off the top of a window, it can be difficult to +determine which block you are in. This extension implements a pane at the top +of each IDLE edit window which provides block structure hints. These hints are +the lines which contain the block opening keywords, e.g. 'if', for the +enclosing block. The number of hint lines is determined by the maxlines +variable in the codecontext section of config-extensions.def. Lines which do +not open blocks are not shown in the context hints pane. + +For EditorWindows, <<toggle-code-context>> is bound to CodeContext(self). +toggle_code_context_event. +""" +import re +from sys import maxsize as INFINITY + +from tkinter import Frame, Text, TclError +from tkinter.constants import NSEW, SUNKEN + +from idlelib.config import idleConf + +BLOCKOPENERS = {'class', 'def', 'if', 'elif', 'else', 'while', 'for', + 'try', 'except', 'finally', 'with', 'async'} + + +def get_spaces_firstword(codeline, c=re.compile(r"^(\s*)(\w*)")): + "Extract the beginning whitespace and first word from codeline." + return c.match(codeline).groups() + + +def get_line_info(codeline): + """Return tuple of (line indent value, codeline, block start keyword). + + The indentation of empty lines (or comment lines) is INFINITY. + If the line does not start a block, the keyword value is False. + """ + spaces, firstword = get_spaces_firstword(codeline) + indent = len(spaces) + if len(codeline) == indent or codeline[indent] == '#': + indent = INFINITY + opener = firstword in BLOCKOPENERS and firstword + return indent, codeline, opener + + +class CodeContext: + "Display block context above the edit window." + UPDATEINTERVAL = 100 # millisec + + def __init__(self, editwin): + """Initialize settings for context block. + + editwin is the Editor window for the context block. + self.text is the editor window text widget. + + self.context displays the code context text above the editor text. + Initially None, it is toggled via <<toggle-code-context>>. + self.topvisible is the number of the top text line displayed. + self.info is a list of (line number, indent level, line text, + block keyword) tuples for the block structure above topvisible. + self.info[0] is initialized with a 'dummy' line which + starts the toplevel 'block' of the module. + + self.t1 and self.t2 are two timer events on the editor text widget to + monitor for changes to the context text or editor font. + """ + self.editwin = editwin + self.text = editwin.text + self._reset() + + def _reset(self): + self.context = None + self.cell00 = None + self.t1 = None + self.topvisible = 1 + self.info = [(0, -1, "", False)] + + @classmethod + def reload(cls): + "Load class variables from config." + cls.context_depth = idleConf.GetOption("extensions", "CodeContext", + "maxlines", type="int", + default=15) + + def __del__(self): + "Cancel scheduled events." + if self.t1 is not None: + try: + self.text.after_cancel(self.t1) + except TclError: # pragma: no cover + pass + self.t1 = None + + def toggle_code_context_event(self, event=None): + """Toggle code context display. + + If self.context doesn't exist, create it to match the size of the editor + window text (toggle on). If it does exist, destroy it (toggle off). + Return 'break' to complete the processing of the binding. + """ + if self.context is None: + # Calculate the border width and horizontal padding required to + # align the context with the text in the main Text widget. + # + # All values are passed through getint(), since some + # values may be pixel objects, which can't simply be added to ints. + widgets = self.editwin.text, self.editwin.text_frame + # Calculate the required horizontal padding and border width. + padx = 0 + border = 0 + for widget in widgets: + info = (widget.grid_info() + if widget is self.editwin.text + else widget.pack_info()) + padx += widget.tk.getint(info['padx']) + padx += widget.tk.getint(widget.cget('padx')) + border += widget.tk.getint(widget.cget('border')) + context = self.context = Text( + self.editwin.text_frame, + height=1, + width=1, # Don't request more than we get. + highlightthickness=0, + padx=padx, border=border, relief=SUNKEN, state='disabled') + self.update_font() + self.update_highlight_colors() + context.bind('<ButtonRelease-1>', self.jumptoline) + # Get the current context and initiate the recurring update event. + self.timer_event() + # Grid the context widget above the text widget. + context.grid(row=0, column=1, sticky=NSEW) + + line_number_colors = idleConf.GetHighlight(idleConf.CurrentTheme(), + 'linenumber') + self.cell00 = Frame(self.editwin.text_frame, + bg=line_number_colors['background']) + self.cell00.grid(row=0, column=0, sticky=NSEW) + menu_status = 'Hide' + else: + self.context.destroy() + self.context = None + self.cell00.destroy() + self.cell00 = None + self.text.after_cancel(self.t1) + self._reset() + menu_status = 'Show' + self.editwin.update_menu_label(menu='options', index='*ode*ontext', + label=f'{menu_status} Code Context') + return "break" + + def get_context(self, new_topvisible, stopline=1, stopindent=0): + """Return a list of block line tuples and the 'last' indent. + + The tuple fields are (linenum, indent, text, opener). + The list represents header lines from new_topvisible back to + stopline with successively shorter indents > stopindent. + The list is returned ordered by line number. + Last indent returned is the smallest indent observed. + """ + assert stopline > 0 + lines = [] + # The indentation level we are currently in. + lastindent = INFINITY + # For a line to be interesting, it must begin with a block opening + # keyword, and have less indentation than lastindent. + for linenum in range(new_topvisible, stopline-1, -1): + codeline = self.text.get(f'{linenum}.0', f'{linenum}.end') + indent, text, opener = get_line_info(codeline) + if indent < lastindent: + lastindent = indent + if opener in ("else", "elif"): + # Also show the if statement. + lastindent += 1 + if opener and linenum < new_topvisible and indent >= stopindent: + lines.append((linenum, indent, text, opener)) + if lastindent <= stopindent: + break + lines.reverse() + return lines, lastindent + + def update_code_context(self): + """Update context information and lines visible in the context pane. + + No update is done if the text hasn't been scrolled. If the text + was scrolled, the lines that should be shown in the context will + be retrieved and the context area will be updated with the code, + up to the number of maxlines. + """ + new_topvisible = self.editwin.getlineno("@0,0") + if self.topvisible == new_topvisible: # Haven't scrolled. + return + if self.topvisible < new_topvisible: # Scroll down. + lines, lastindent = self.get_context(new_topvisible, + self.topvisible) + # Retain only context info applicable to the region + # between topvisible and new_topvisible. + while self.info[-1][1] >= lastindent: + del self.info[-1] + else: # self.topvisible > new_topvisible: # Scroll up. + stopindent = self.info[-1][1] + 1 + # Retain only context info associated + # with lines above new_topvisible. + while self.info[-1][0] >= new_topvisible: + stopindent = self.info[-1][1] + del self.info[-1] + lines, lastindent = self.get_context(new_topvisible, + self.info[-1][0]+1, + stopindent) + self.info.extend(lines) + self.topvisible = new_topvisible + # Last context_depth context lines. + context_strings = [x[2] for x in self.info[-self.context_depth:]] + showfirst = 0 if context_strings[0] else 1 + # Update widget. + self.context['height'] = len(context_strings) - showfirst + self.context['state'] = 'normal' + self.context.delete('1.0', 'end') + self.context.insert('end', '\n'.join(context_strings[showfirst:])) + self.context['state'] = 'disabled' + + def jumptoline(self, event=None): + """ Show clicked context line at top of editor. + + If a selection was made, don't jump; allow copying. + If no visible context, show the top line of the file. + """ + try: + self.context.index("sel.first") + except TclError: + lines = len(self.info) + if lines == 1: # No context lines are showing. + newtop = 1 + else: + # Line number clicked. + contextline = int(float(self.context.index('insert'))) + # Lines not displayed due to maxlines. + offset = max(1, lines - self.context_depth) - 1 + newtop = self.info[offset + contextline][0] + self.text.yview(f'{newtop}.0') + self.update_code_context() + + def timer_event(self): + "Event on editor text widget triggered every UPDATEINTERVAL ms." + if self.context is not None: + self.update_code_context() + self.t1 = self.text.after(self.UPDATEINTERVAL, self.timer_event) + + def update_font(self): + if self.context is not None: + font = idleConf.GetFont(self.text, 'main', 'EditorWindow') + self.context['font'] = font + + def update_highlight_colors(self): + if self.context is not None: + colors = idleConf.GetHighlight(idleConf.CurrentTheme(), 'context') + self.context['background'] = colors['background'] + self.context['foreground'] = colors['foreground'] + + if self.cell00 is not None: + line_number_colors = idleConf.GetHighlight(idleConf.CurrentTheme(), + 'linenumber') + self.cell00.config(bg=line_number_colors['background']) + + +CodeContext.reload() + + +if __name__ == "__main__": + from unittest import main + main('idlelib.idle_test.test_codecontext', verbosity=2, exit=False) + + # Add htest. diff --git a/Lib/idlelib/colorizer.py b/Lib/idlelib/colorizer.py new file mode 100644 index 000000000..bffa2ddd3 --- /dev/null +++ b/Lib/idlelib/colorizer.py @@ -0,0 +1,384 @@ +import builtins +import keyword +import re +import time + +from idlelib.config import idleConf +from idlelib.delegator import Delegator + +DEBUG = False + + +def any(name, alternates): + "Return a named group pattern matching list of alternates." + return "(?P<%s>" % name + "|".join(alternates) + ")" + + +def make_pat(): + kw = r"\b" + any("KEYWORD", keyword.kwlist) + r"\b" + match_softkw = ( + r"^[ \t]*" + # at beginning of line + possible indentation + r"(?P<MATCH_SOFTKW>match)\b" + + r"(?![ \t]*(?:" + "|".join([ # not followed by ... + r"[:,;=^&|@~)\]}]", # a character which means it can't be a + # pattern-matching statement + r"\b(?:" + r"|".join(keyword.kwlist) + r")\b", # a keyword + ]) + + r"))" + ) + case_default = ( + r"^[ \t]*" + # at beginning of line + possible indentation + r"(?P<CASE_SOFTKW>case)" + + r"[ \t]+(?P<CASE_DEFAULT_UNDERSCORE>_\b)" + ) + case_softkw_and_pattern = ( + r"^[ \t]*" + # at beginning of line + possible indentation + r"(?P<CASE_SOFTKW2>case)\b" + + r"(?![ \t]*(?:" + "|".join([ # not followed by ... + r"_\b", # a lone underscore + r"[:,;=^&|@~)\]}]", # a character which means it can't be a + # pattern-matching case + r"\b(?:" + r"|".join(keyword.kwlist) + r")\b", # a keyword + ]) + + r"))" + ) + builtinlist = [str(name) for name in dir(builtins) + if not name.startswith('_') and + name not in keyword.kwlist] + builtin = r"([^.'\"\\#]\b|^)" + any("BUILTIN", builtinlist) + r"\b" + comment = any("COMMENT", [r"#[^\n]*"]) + stringprefix = r"(?i:r|u|f|fr|rf|b|br|rb|t|rt|tr)?" + sqstring = stringprefix + r"'[^'\\\n]*(\\.[^'\\\n]*)*'?" + dqstring = stringprefix + r'"[^"\\\n]*(\\.[^"\\\n]*)*"?' + sq3string = stringprefix + r"'''[^'\\]*((\\.|'(?!''))[^'\\]*)*(''')?" + dq3string = stringprefix + r'"""[^"\\]*((\\.|"(?!""))[^"\\]*)*(""")?' + string = any("STRING", [sq3string, dq3string, sqstring, dqstring]) + prog = re.compile("|".join([ + builtin, comment, string, kw, + match_softkw, case_default, + case_softkw_and_pattern, + any("SYNC", [r"\n"]), + ]), + re.DOTALL | re.MULTILINE) + return prog + + +prog = make_pat() +idprog = re.compile(r"\s+(\w+)") +prog_group_name_to_tag = { + "MATCH_SOFTKW": "KEYWORD", + "CASE_SOFTKW": "KEYWORD", + "CASE_DEFAULT_UNDERSCORE": "KEYWORD", + "CASE_SOFTKW2": "KEYWORD", +} + + +def matched_named_groups(re_match): + "Get only the non-empty named groups from an re.Match object." + return ((k, v) for (k, v) in re_match.groupdict().items() if v) + + +def color_config(text): + """Set color options of Text widget. + + If ColorDelegator is used, this should be called first. + """ + # Called from htest, TextFrame, Editor, and Turtledemo. + # Not automatic because ColorDelegator does not know 'text'. + theme = idleConf.CurrentTheme() + normal_colors = idleConf.GetHighlight(theme, 'normal') + cursor_color = idleConf.GetHighlight(theme, 'cursor')['foreground'] + select_colors = idleConf.GetHighlight(theme, 'hilite') + text.config( + foreground=normal_colors['foreground'], + background=normal_colors['background'], + insertbackground=cursor_color, + selectforeground=select_colors['foreground'], + selectbackground=select_colors['background'], + inactiveselectbackground=select_colors['background'], # new in 8.5 + ) + + +class ColorDelegator(Delegator): + """Delegator for syntax highlighting (text coloring). + + Instance variables: + delegate: Delegator below this one in the stack, meaning the + one this one delegates to. + + Used to track state: + after_id: Identifier for scheduled after event, which is a + timer for colorizing the text. + allow_colorizing: Boolean toggle for applying colorizing. + colorizing: Boolean flag when colorizing is in process. + stop_colorizing: Boolean flag to end an active colorizing + process. + """ + + def __init__(self): + Delegator.__init__(self) + self.init_state() + self.prog = prog + self.idprog = idprog + self.LoadTagDefs() + + def init_state(self): + "Initialize variables that track colorizing state." + self.after_id = None + self.allow_colorizing = True + self.stop_colorizing = False + self.colorizing = False + + def setdelegate(self, delegate): + """Set the delegate for this instance. + + A delegate is an instance of a Delegator class and each + delegate points to the next delegator in the stack. This + allows multiple delegators to be chained together for a + widget. The bottom delegate for a colorizer is a Text + widget. + + If there is a delegate, also start the colorizing process. + """ + if self.delegate is not None: + self.unbind("<<toggle-auto-coloring>>") + Delegator.setdelegate(self, delegate) + if delegate is not None: + self.config_colors() + self.bind("<<toggle-auto-coloring>>", self.toggle_colorize_event) + self.notify_range("1.0", "end") + else: + # No delegate - stop any colorizing. + self.stop_colorizing = True + self.allow_colorizing = False + + def config_colors(self): + "Configure text widget tags with colors from tagdefs." + for tag, cnf in self.tagdefs.items(): + self.tag_configure(tag, **cnf) + self.tag_raise('sel') + + def LoadTagDefs(self): + "Create dictionary of tag names to text colors." + theme = idleConf.CurrentTheme() + self.tagdefs = { + "COMMENT": idleConf.GetHighlight(theme, "comment"), + "KEYWORD": idleConf.GetHighlight(theme, "keyword"), + "BUILTIN": idleConf.GetHighlight(theme, "builtin"), + "STRING": idleConf.GetHighlight(theme, "string"), + "DEFINITION": idleConf.GetHighlight(theme, "definition"), + "SYNC": {'background': None, 'foreground': None}, + "TODO": {'background': None, 'foreground': None}, + "ERROR": idleConf.GetHighlight(theme, "error"), + # "hit" is used by ReplaceDialog to mark matches. It shouldn't be changed by Colorizer, but + # that currently isn't technically possible. This should be moved elsewhere in the future + # when fixing the "hit" tag's visibility, or when the replace dialog is replaced with a + # non-modal alternative. + "hit": idleConf.GetHighlight(theme, "hit"), + } + if DEBUG: print('tagdefs', self.tagdefs) + + def insert(self, index, chars, tags=None): + "Insert chars into widget at index and mark for colorizing." + index = self.index(index) + self.delegate.insert(index, chars, tags) + self.notify_range(index, index + "+%dc" % len(chars)) + + def delete(self, index1, index2=None): + "Delete chars between indexes and mark for colorizing." + index1 = self.index(index1) + self.delegate.delete(index1, index2) + self.notify_range(index1) + + def notify_range(self, index1, index2=None): + "Mark text changes for processing and restart colorizing, if active." + self.tag_add("TODO", index1, index2) + if self.after_id: + if DEBUG: print("colorizing already scheduled") + return + if self.colorizing: + self.stop_colorizing = True + if DEBUG: print("stop colorizing") + if self.allow_colorizing: + if DEBUG: print("schedule colorizing") + self.after_id = self.after(1, self.recolorize) + return + + def close(self): + if self.after_id: + after_id = self.after_id + self.after_id = None + if DEBUG: print("cancel scheduled recolorizer") + self.after_cancel(after_id) + self.allow_colorizing = False + self.stop_colorizing = True + + def toggle_colorize_event(self, event=None): + """Toggle colorizing on and off. + + When toggling off, if colorizing is scheduled or is in + process, it will be cancelled and/or stopped. + + When toggling on, colorizing will be scheduled. + """ + if self.after_id: + after_id = self.after_id + self.after_id = None + if DEBUG: print("cancel scheduled recolorizer") + self.after_cancel(after_id) + if self.allow_colorizing and self.colorizing: + if DEBUG: print("stop colorizing") + self.stop_colorizing = True + self.allow_colorizing = not self.allow_colorizing + if self.allow_colorizing and not self.colorizing: + self.after_id = self.after(1, self.recolorize) + if DEBUG: + print("auto colorizing turned", + "on" if self.allow_colorizing else "off") + return "break" + + def recolorize(self): + """Timer event (every 1ms) to colorize text. + + Colorizing is only attempted when the text widget exists, + when colorizing is toggled on, and when the colorizing + process is not already running. + + After colorizing is complete, some cleanup is done to + make sure that all the text has been colorized. + """ + self.after_id = None + if not self.delegate: + if DEBUG: print("no delegate") + return + if not self.allow_colorizing: + if DEBUG: print("auto colorizing is off") + return + if self.colorizing: + if DEBUG: print("already colorizing") + return + try: + self.stop_colorizing = False + self.colorizing = True + if DEBUG: print("colorizing...") + t0 = time.perf_counter() + self.recolorize_main() + t1 = time.perf_counter() + if DEBUG: print("%.3f seconds" % (t1-t0)) + finally: + self.colorizing = False + if self.allow_colorizing and self.tag_nextrange("TODO", "1.0"): + if DEBUG: print("reschedule colorizing") + self.after_id = self.after(1, self.recolorize) + + def recolorize_main(self): + "Evaluate text and apply colorizing tags." + next = "1.0" + while todo_tag_range := self.tag_nextrange("TODO", next): + self.tag_remove("SYNC", todo_tag_range[0], todo_tag_range[1]) + sync_tag_range = self.tag_prevrange("SYNC", todo_tag_range[0]) + head = sync_tag_range[1] if sync_tag_range else "1.0" + + chars = "" + next = head + lines_to_get = 1 + ok = False + while not ok: + mark = next + next = self.index(mark + "+%d lines linestart" % + lines_to_get) + lines_to_get = min(lines_to_get * 2, 100) + ok = "SYNC" in self.tag_names(next + "-1c") + line = self.get(mark, next) + ##print head, "get", mark, next, "->", repr(line) + if not line: + return + for tag in self.tagdefs: + self.tag_remove(tag, mark, next) + chars += line + self._add_tags_in_section(chars, head) + if "SYNC" in self.tag_names(next + "-1c"): + head = next + chars = "" + else: + ok = False + if not ok: + # We're in an inconsistent state, and the call to + # update may tell us to stop. It may also change + # the correct value for "next" (since this is a + # line.col string, not a true mark). So leave a + # crumb telling the next invocation to resume here + # in case update tells us to leave. + self.tag_add("TODO", next) + self.update_idletasks() + if self.stop_colorizing: + if DEBUG: print("colorizing stopped") + return + + def _add_tag(self, start, end, head, matched_group_name): + """Add a tag to a given range in the text widget. + + This is a utility function, receiving the range as `start` and + `end` positions, each of which is a number of characters + relative to the given `head` index in the text widget. + + The tag to add is determined by `matched_group_name`, which is + the name of a regular expression "named group" as matched by + by the relevant highlighting regexps. + """ + tag = prog_group_name_to_tag.get(matched_group_name, + matched_group_name) + self.tag_add(tag, + f"{head}+{start:d}c", + f"{head}+{end:d}c") + + def _add_tags_in_section(self, chars, head): + """Parse and add highlighting tags to a given part of the text. + + `chars` is a string with the text to parse and to which + highlighting is to be applied. + + `head` is the index in the text widget where the text is found. + """ + for m in self.prog.finditer(chars): + for name, matched_text in matched_named_groups(m): + a, b = m.span(name) + self._add_tag(a, b, head, name) + if matched_text in ("def", "class"): + if m1 := self.idprog.match(chars, b): + a, b = m1.span(1) + self._add_tag(a, b, head, "DEFINITION") + + def removecolors(self): + "Remove all colorizing tags." + for tag in self.tagdefs: + self.tag_remove(tag, "1.0", "end") + + +def _color_delegator(parent): # htest # + from tkinter import Toplevel, Text + from idlelib.idle_test.test_colorizer import source + from idlelib.percolator import Percolator + + top = Toplevel(parent) + top.title("Test ColorDelegator") + x, y = map(int, parent.geometry().split('+')[1:]) + top.geometry("700x550+%d+%d" % (x + 20, y + 175)) + + text = Text(top, background="white") + text.pack(expand=1, fill="both") + text.insert("insert", source) + text.focus_set() + + color_config(text) + p = Percolator(text) + d = ColorDelegator() + p.insertfilter(d) + + +if __name__ == "__main__": + from unittest import main + main('idlelib.idle_test.test_colorizer', verbosity=2, exit=False) + + from idlelib.idle_test.htest import run + run(_color_delegator) diff --git a/Lib/idlelib/config-extensions.def b/Lib/idlelib/config-extensions.def new file mode 100644 index 000000000..7e23fb0a7 --- /dev/null +++ b/Lib/idlelib/config-extensions.def @@ -0,0 +1,62 @@ +# config-extensions.def +# +# The following sections are for features that are no longer extensions. +# Their options values are left here for back-compatibility. + +[AutoComplete] +popupwait= 2000 + +[CodeContext] +maxlines= 15 + +[FormatParagraph] +max-width= 72 + +[ParenMatch] +style= expression +flash-delay= 500 +bell= True + +# IDLE reads several config files to determine user preferences. This +# file is the default configuration file for IDLE extensions settings. +# +# Each extension must have at least one section, named after the +# extension module. This section must contain an 'enable' item (=True to +# enable the extension, =False to disable it), it may contain +# 'enable_editor' or 'enable_shell' items, to apply it only to editor ir +# shell windows, and may also contain any other general configuration +# items for the extension. Other True/False values will also be +# recognized as boolean by the Extension Configuration dialog. +# +# Each extension must define at least one section named +# ExtensionName_bindings or ExtensionName_cfgBindings. If present, +# ExtensionName_bindings defines virtual event bindings for the +# extension that are not user re-configurable. If present, +# ExtensionName_cfgBindings defines virtual event bindings for the +# extension that may be sensibly re-configured. +# +# If there are no keybindings for a menus' virtual events, include lines +# like <<toggle-code-context>>=. +# +# Currently it is necessary to manually modify this file to change +# extension key bindings and default values. To customize, create +# ~/.idlerc/config-extensions.cfg and append the appropriate customized +# section(s). Those sections will override the defaults in this file. +# +# Note: If a keybinding is already in use when the extension is loaded, +# the extension's virtual event's keybinding will be set to ''. +# +# See config-keys.def for notes on specifying keys and extend.txt for +# information on creating IDLE extensions. + +# A fake extension for testing and example purposes. When enabled and +# invoked, inserts or deletes z-text at beginning of every line. +[ZzDummy] +enable= False +enable_shell = False +enable_editor = True +z-text= Z +[ZzDummy_cfgBindings] +z-in= <Control-Shift-KeyRelease-Insert> +[ZzDummy_bindings] +z-out= <Control-Shift-KeyRelease-Delete> diff --git a/Lib/idlelib/config-highlight.def b/Lib/idlelib/config-highlight.def new file mode 100644 index 000000000..a7b043383 --- /dev/null +++ b/Lib/idlelib/config-highlight.def @@ -0,0 +1,105 @@ +# IDLE reads several config files to determine user preferences. This +# file is the default config file for idle highlight theme settings. + +[IDLE Classic] +normal-foreground= #000000 +normal-background= #ffffff +keyword-foreground= #ff7700 +keyword-background= #ffffff +builtin-foreground= #900090 +builtin-background= #ffffff +comment-foreground= #dd0000 +comment-background= #ffffff +string-foreground= #00aa00 +string-background= #ffffff +definition-foreground= #0000ff +definition-background= #ffffff +hilite-foreground= #000000 +hilite-background= gray +break-foreground= black +break-background= #ffff55 +hit-foreground= #ffffff +hit-background= #000000 +error-foreground= #000000 +error-background= #ff7777 +context-foreground= #000000 +context-background= lightgray +linenumber-foreground= gray +linenumber-background= #ffffff +#cursor (only foreground can be set, restart IDLE) +cursor-foreground= black +#shell window +stdout-foreground= blue +stdout-background= #ffffff +stderr-foreground= red +stderr-background= #ffffff +console-foreground= #770000 +console-background= #ffffff + +[IDLE New] +normal-foreground= #000000 +normal-background= #ffffff +keyword-foreground= #ff7700 +keyword-background= #ffffff +builtin-foreground= #900090 +builtin-background= #ffffff +comment-foreground= #dd0000 +comment-background= #ffffff +string-foreground= #00aa00 +string-background= #ffffff +definition-foreground= #0000ff +definition-background= #ffffff +hilite-foreground= #000000 +hilite-background= gray +break-foreground= black +break-background= #ffff55 +hit-foreground= #ffffff +hit-background= #000000 +error-foreground= #000000 +error-background= #ff7777 +context-foreground= #000000 +context-background= lightgray +linenumber-foreground= gray +linenumber-background= #ffffff +#cursor (only foreground can be set, restart IDLE) +cursor-foreground= black +#shell window +stdout-foreground= blue +stdout-background= #ffffff +stderr-foreground= red +stderr-background= #ffffff +console-foreground= #770000 +console-background= #ffffff + +[IDLE Dark] +comment-foreground = #dd0000 +console-foreground = #ff4d4d +error-foreground = #FFFFFF +hilite-background = #7e7e7e +string-foreground = #02ff02 +stderr-background = #002240 +stderr-foreground = #ffb3b3 +console-background = #002240 +hit-background = #fbfbfb +string-background = #002240 +normal-background = #002240 +hilite-foreground = #FFFFFF +keyword-foreground = #ff8000 +error-background = #c86464 +keyword-background = #002240 +builtin-background = #002240 +break-background = #808000 +builtin-foreground = #ff00ff +definition-foreground = #5e5eff +stdout-foreground = #c2d1fa +definition-background = #002240 +normal-foreground = #FFFFFF +cursor-foreground = #ffffff +stdout-background = #002240 +hit-foreground = #002240 +comment-background = #002240 +break-foreground = #FFFFFF +context-foreground= #ffffff +context-background= #454545 +linenumber-foreground= gray +linenumber-background= #002240 diff --git a/Lib/idlelib/config-keys.def b/Lib/idlelib/config-keys.def new file mode 100644 index 000000000..f71269b5b --- /dev/null +++ b/Lib/idlelib/config-keys.def @@ -0,0 +1,309 @@ +# IDLE reads several config files to determine user preferences. This +# file is the default config file for idle key binding settings. +# Where multiple keys are specified for an action: if they are separated +# by a space (eg. action=<key1> <key2>) then the keys are alternatives, if +# there is no space (eg. action=<key1><key2>) then the keys comprise a +# single 'emacs style' multi-keystoke binding. The tk event specifier 'Key' +# is used in all cases, for consistency in auto key conflict checking in the +# configuration gui. + +[IDLE Classic Windows] +copy=<Control-Key-c> <Control-Key-C> +cut=<Control-Key-x> <Control-Key-X> +paste=<Control-Key-v> <Control-Key-V> +beginning-of-line= <Key-Home> +center-insert=<Control-Key-l> <Control-Key-L> +close-all-windows=<Control-Key-q> <Control-Key-Q> +close-window=<Alt-Key-F4> <Meta-Key-F4> +do-nothing=<Control-Key-F12> +end-of-file=<Control-Key-d> <Control-Key-D> +python-docs=<Key-F1> +python-context-help=<Shift-Key-F1> +history-next=<Alt-Key-n> <Meta-Key-n> <Alt-Key-N> <Meta-Key-N> +history-previous=<Alt-Key-p> <Meta-Key-p> <Alt-Key-P> <Meta-Key-P> +interrupt-execution=<Control-Key-c> <Control-Key-C> +view-restart=<Key-F6> +restart-shell=<Control-Key-F6> +open-class-browser=<Alt-Key-c> <Meta-Key-c> <Alt-Key-C> <Meta-Key-C> +open-module=<Alt-Key-m> <Meta-Key-m> <Alt-Key-M> <Meta-Key-M> +open-new-window=<Control-Key-n> <Control-Key-N> +open-window-from-file=<Control-Key-o> <Control-Key-O> +plain-newline-and-indent=<Control-Key-j> <Control-Key-J> +print-window=<Control-Key-p> <Control-Key-P> +redo=<Control-Shift-Key-Z> <Control-Shift-Key-z> +remove-selection=<Key-Escape> +save-copy-of-window-as-file=<Alt-Shift-Key-S> <Alt-Shift-Key-s> +save-window-as-file=<Control-Shift-Key-S> <Control-Shift-Key-s> +save-window=<Control-Key-s> <Control-Key-S> +select-all=<Control-Key-a> <Control-Key-A> +toggle-auto-coloring=<Control-Key-slash> +undo=<Control-Key-z> <Control-Key-Z> +find=<Control-Key-f> <Control-Key-F> +find-again=<Control-Key-g> <Key-F3> <Control-Key-G> +find-in-files=<Alt-Key-F3> <Meta-Key-F3> +find-selection=<Control-Key-F3> +replace=<Control-Key-h> <Control-Key-H> +goto-line=<Alt-Key-g> <Meta-Key-g> <Alt-Key-G> <Meta-Key-G> +smart-backspace=<Key-BackSpace> +newline-and-indent=<Key-Return> <Key-KP_Enter> +smart-indent=<Key-Tab> +indent-region=<Control-Key-bracketright> +dedent-region=<Control-Key-bracketleft> +comment-region=<Alt-Key-3> <Meta-Key-3> +uncomment-region=<Alt-Key-4> <Meta-Key-4> +tabify-region=<Alt-Key-5> <Meta-Key-5> +untabify-region=<Alt-Key-6> <Meta-Key-6> +toggle-tabs=<Alt-Key-t> <Meta-Key-t> <Alt-Key-T> <Meta-Key-T> +change-indentwidth=<Alt-Key-u> <Meta-Key-u> <Alt-Key-U> <Meta-Key-U> +del-word-left=<Control-Key-BackSpace> +del-word-right=<Control-Key-Delete> +force-open-completions= <Control-Key-space> +expand-word= <Alt-Key-slash> +force-open-calltip= <Control-Key-backslash> +format-paragraph= <Alt-Key-q> +flash-paren= <Control-Key-0> +run-module= <Key-F5> +run-custom= <Shift-Key-F5> +check-module= <Alt-Key-x> +zoom-height= <Alt-Key-2> + +[IDLE Classic Unix] +copy=<Alt-Key-w> <Meta-Key-w> +cut=<Control-Key-w> +paste=<Control-Key-y> +beginning-of-line=<Control-Key-a> <Key-Home> +center-insert=<Control-Key-l> +close-all-windows=<Control-Key-x><Control-Key-c> +close-window=<Control-Key-x><Control-Key-0> +do-nothing=<Control-Key-x> +end-of-file=<Control-Key-d> +history-next=<Alt-Key-n> <Meta-Key-n> +history-previous=<Alt-Key-p> <Meta-Key-p> +interrupt-execution=<Control-Key-c> +view-restart=<Key-F6> +restart-shell=<Control-Key-F6> +open-class-browser=<Control-Key-x><Control-Key-b> +open-module=<Control-Key-x><Control-Key-m> +open-new-window=<Control-Key-x><Control-Key-n> +open-window-from-file=<Control-Key-x><Control-Key-f> +plain-newline-and-indent=<Control-Key-j> +print-window=<Control-x><Control-Key-p> +python-docs=<Control-Key-h> +python-context-help=<Control-Shift-Key-H> +redo=<Alt-Key-z> <Meta-Key-z> +remove-selection=<Key-Escape> +save-copy-of-window-as-file=<Control-Key-x><Control-Key-y> +save-window-as-file=<Control-Key-x><Control-Key-w> +save-window=<Control-Key-x><Control-Key-s> +select-all=<Alt-Key-a> <Meta-Key-a> +toggle-auto-coloring=<Control-Key-slash> +undo=<Control-Key-z> +find=<Control-Key-u><Control-Key-u><Control-Key-s> +find-again=<Control-Key-u><Control-Key-s> +find-in-files=<Alt-Key-s> <Meta-Key-s> +find-selection=<Control-Key-s> +replace=<Control-Key-r> +goto-line=<Alt-Key-g> <Meta-Key-g> +smart-backspace=<Key-BackSpace> +newline-and-indent=<Key-Return> <Key-KP_Enter> +smart-indent=<Key-Tab> +indent-region=<Control-Key-bracketright> +dedent-region=<Control-Key-bracketleft> +comment-region=<Alt-Key-3> +uncomment-region=<Alt-Key-4> +tabify-region=<Alt-Key-5> +untabify-region=<Alt-Key-6> +toggle-tabs=<Alt-Key-t> +change-indentwidth=<Alt-Key-u> +del-word-left=<Alt-Key-BackSpace> +del-word-right=<Alt-Key-d> +force-open-completions= <Control-Key-space> +expand-word= <Alt-Key-slash> +force-open-calltip= <Control-Key-backslash> +format-paragraph= <Alt-Key-q> +flash-paren= <Control-Key-0> +run-module= <Key-F5> +run-custom= <Shift-Key-F5> +check-module= <Alt-Key-x> +zoom-height= <Alt-Key-2> + +[IDLE Modern Unix] +copy = <Control-Shift-Key-C> <Control-Key-Insert> +cut = <Control-Key-x> <Shift-Key-Delete> +paste = <Control-Key-v> <Shift-Key-Insert> +beginning-of-line = <Key-Home> +center-insert = <Control-Key-l> +close-all-windows = <Control-Key-q> +close-window = <Control-Key-w> <Control-Shift-Key-W> +do-nothing = <Control-Key-F12> +end-of-file = <Control-Key-d> +history-next = <Alt-Key-n> <Meta-Key-n> +history-previous = <Alt-Key-p> <Meta-Key-p> +interrupt-execution = <Control-Key-c> +view-restart = <Key-F6> +restart-shell = <Control-Key-F6> +open-class-browser = <Control-Key-b> +open-module = <Control-Key-m> +open-new-window = <Control-Key-n> +open-window-from-file = <Control-Key-o> +plain-newline-and-indent = <Control-Key-j> +print-window = <Control-Key-p> +python-context-help = <Shift-Key-F1> +python-docs = <Key-F1> +redo = <Control-Shift-Key-Z> +remove-selection = <Key-Escape> +save-copy-of-window-as-file = <Alt-Shift-Key-S> +save-window-as-file = <Control-Shift-Key-S> +save-window = <Control-Key-s> +select-all = <Control-Key-a> +toggle-auto-coloring = <Control-Key-slash> +undo = <Control-Key-z> +find = <Control-Key-f> +find-again = <Key-F3> +find-in-files = <Control-Shift-Key-f> +find-selection = <Control-Key-h> +replace = <Control-Key-r> +goto-line = <Control-Key-g> +smart-backspace = <Key-BackSpace> +newline-and-indent = <Key-Return> <Key-KP_Enter> +smart-indent = <Key-Tab> +indent-region = <Control-Key-bracketright> +dedent-region = <Control-Key-bracketleft> +comment-region = <Control-Key-d> +uncomment-region = <Control-Shift-Key-D> +tabify-region = <Alt-Key-5> +untabify-region = <Alt-Key-6> +toggle-tabs = <Control-Key-T> +change-indentwidth = <Alt-Key-u> +del-word-left = <Control-Key-BackSpace> +del-word-right = <Control-Key-Delete> +force-open-completions= <Control-Key-space> +expand-word= <Alt-Key-slash> +force-open-calltip= <Control-Key-backslash> +format-paragraph= <Alt-Key-q> +flash-paren= <Control-Key-0> +run-module= <Key-F5> +run-custom= <Shift-Key-F5> +check-module= <Alt-Key-x> +zoom-height= <Alt-Key-2> + +[IDLE Classic Mac] +copy=<Command-Key-c> +cut=<Command-Key-x> +paste=<Command-Key-v> +beginning-of-line= <Key-Home> +center-insert=<Control-Key-l> +close-all-windows=<Command-Key-q> +close-window=<Command-Key-w> +do-nothing=<Control-Key-F12> +end-of-file=<Control-Key-d> +python-docs=<Key-F1> +python-context-help=<Shift-Key-F1> +history-next=<Control-Key-n> +history-previous=<Control-Key-p> +interrupt-execution=<Control-Key-c> +view-restart=<Key-F6> +restart-shell=<Control-Key-F6> +open-class-browser=<Command-Key-b> +open-module=<Command-Key-m> +open-new-window=<Command-Key-n> +open-window-from-file=<Command-Key-o> +plain-newline-and-indent=<Control-Key-j> +print-window=<Command-Key-p> +redo=<Shift-Command-Key-Z> +remove-selection=<Key-Escape> +save-window-as-file=<Shift-Command-Key-S> +save-window=<Command-Key-s> +save-copy-of-window-as-file=<Option-Command-Key-s> +select-all=<Command-Key-a> +toggle-auto-coloring=<Control-Key-slash> +undo=<Command-Key-z> +find=<Command-Key-f> +find-again=<Command-Key-g> <Key-F3> +find-in-files=<Command-Key-F3> +find-selection=<Shift-Command-Key-F3> +replace=<Command-Key-r> +goto-line=<Command-Key-j> +smart-backspace=<Key-BackSpace> +newline-and-indent=<Key-Return> <Key-KP_Enter> +smart-indent=<Key-Tab> +indent-region=<Command-Key-bracketright> +dedent-region=<Command-Key-bracketleft> +comment-region=<Control-Key-3> +uncomment-region=<Control-Key-4> +tabify-region=<Control-Key-5> +untabify-region=<Control-Key-6> +toggle-tabs=<Control-Key-t> +change-indentwidth=<Control-Key-u> +del-word-left=<Control-Key-BackSpace> +del-word-right=<Control-Key-Delete> +force-open-completions= <Control-Key-space> +expand-word= <Option-Key-slash> +force-open-calltip= <Control-Key-backslash> +format-paragraph= <Option-Key-q> +flash-paren= <Control-Key-0> +run-module= <Key-F5> +run-custom= <Shift-Key-F5> +check-module= <Option-Key-x> +zoom-height= <Option-Key-0> + +[IDLE Classic OSX] +toggle-tabs = <Control-Key-t> +interrupt-execution = <Control-Key-c> +untabify-region = <Control-Key-6> +remove-selection = <Key-Escape> +print-window = <Command-Key-p> +replace = <Command-Key-r> +goto-line = <Command-Key-j> +plain-newline-and-indent = <Control-Key-j> +history-previous = <Control-Key-p> +beginning-of-line = <Control-Key-Left> +end-of-line = <Control-Key-Right> +comment-region = <Control-Key-3> +redo = <Shift-Command-Key-Z> +close-window = <Command-Key-w> +restart-shell = <Control-Key-F6> +save-window-as-file = <Shift-Command-Key-S> +close-all-windows = <Command-Key-q> +view-restart = <Key-F6> +tabify-region = <Control-Key-5> +find-again = <Command-Key-g> <Key-F3> +find = <Command-Key-f> +toggle-auto-coloring = <Control-Key-slash> +select-all = <Command-Key-a> +smart-backspace = <Key-BackSpace> +change-indentwidth = <Control-Key-u> +do-nothing = <Control-Key-F12> +smart-indent = <Key-Tab> +center-insert = <Control-Key-l> +history-next = <Control-Key-n> +del-word-right = <Option-Key-Delete> +undo = <Command-Key-z> +save-window = <Command-Key-s> +uncomment-region = <Control-Key-4> +cut = <Command-Key-x> +find-in-files = <Command-Key-F3> +dedent-region = <Command-Key-bracketleft> +copy = <Command-Key-c> +paste = <Command-Key-v> +indent-region = <Command-Key-bracketright> +del-word-left = <Option-Key-BackSpace> <Option-Command-Key-BackSpace> +newline-and-indent = <Key-Return> <Key-KP_Enter> +end-of-file = <Control-Key-d> +open-class-browser = <Command-Key-b> +open-new-window = <Command-Key-n> +open-module = <Command-Key-m> +find-selection = <Shift-Command-Key-F3> +python-context-help = <Shift-Key-F1> +save-copy-of-window-as-file = <Option-Command-Key-s> +open-window-from-file = <Command-Key-o> +python-docs = <Key-F1> +force-open-completions= <Control-Key-space> +expand-word= <Option-Key-slash> +force-open-calltip= <Control-Key-backslash> +format-paragraph= <Option-Key-q> +flash-paren= <Control-Key-0> +run-module= <Key-F5> +run-custom= <Shift-Key-F5> +check-module= <Option-Key-x> +zoom-height= <Option-Key-0> diff --git a/Lib/idlelib/config-main.def b/Lib/idlelib/config-main.def new file mode 100644 index 000000000..54bdce34a --- /dev/null +++ b/Lib/idlelib/config-main.def @@ -0,0 +1,92 @@ +# IDLE reads several config files to determine user preferences. This +# file is the default config file for general idle settings. +# +# When IDLE starts, it will look in +# the following two sets of files, in order: +# +# default configuration files in idlelib +# -------------------------------------- +# config-main.def default general config file +# config-extensions.def default extension config file +# config-highlight.def default highlighting config file +# config-keys.def default keybinding config file +# +# user configuration files in ~/.idlerc +# ------------------------------------- +# config-main.cfg user general config file +# config-extensions.cfg user extension config file +# config-highlight.cfg user highlighting config file +# config-keys.cfg user keybinding config file +# +# On Windows, the default location of the home directory ('~' above) +# depends on the version. For Windows 10, it is C:\Users\<username>. +# +# Any options the user saves through the config dialog will be saved to +# the relevant user config file. Reverting any general or extension +# setting to the default causes that entry to be wiped from the user +# file and re-read from the default file. This rule applies to each +# item, except that the three editor font items are saved as a group. +# +# User highlighting themes and keybinding sets must have (section) names +# distinct from the default names. All items are added and saved as a +# group. They are retained unless specifically deleted within the config +# dialog. Choosing one of the default themes or keysets just applies the +# relevant settings from the default file. +# +# Additional help sources are listed in the [HelpFiles] section below +# and should be viewable by a web browser. These sources will be listed +# on the Help menu. The pattern, and two examples, are: +# +# <sequence_number = menu item;/path/to/help/source> +# 1 = IDLE;C:/Programs/Python36/Lib/idlelib/help.html +# 2 = Pillow;https://pillow.readthedocs.io/en/latest/ +# +# You can't use a semi-colon in a menu item or path. The path will be +# platform specific because of path separators, drive specs etc. +# +# The default files should not be edited except to add new sections to +# config-extensions.def for added extensions. The user files should be +# modified through the Settings dialog. + +[General] +editor-on-startup= 0 +autosave= 0 +print-command-posix=lpr %%s +print-command-win=start /min notepad /p %%s +delete-exitfunc= 1 + +[EditorWindow] +width= 80 +height= 40 +cursor-blink= 1 +font= TkFixedFont +# For TkFixedFont, the actual size and boldness are obtained from tk +# and override 10 and 0. See idlelib.config.IdleConf.GetFont +font-size= 10 +font-bold= 0 +encoding= none +line-numbers-default= 0 + +[PyShell] +auto-squeeze-min-lines= 50 + +[Indent] +use-spaces= 1 +num-spaces= 4 + +[Theme] +default= 1 +name= IDLE Classic +name2= +# name2 set in user config-main.cfg for themes added after 2015 Oct 1 + +[Keys] +default= 1 +name= +name2= +# name2 set in user config-main.cfg for keys added after 2016 July 1 + +[History] +cyclic=1 + +[HelpFiles] diff --git a/Lib/idlelib/config.py b/Lib/idlelib/config.py new file mode 100644 index 000000000..d10c88a43 --- /dev/null +++ b/Lib/idlelib/config.py @@ -0,0 +1,917 @@ +"""idlelib.config -- Manage IDLE configuration information. + +The comments at the beginning of config-main.def describe the +configuration files and the design implemented to update user +configuration information. In particular, user configuration choices +which duplicate the defaults will be removed from the user's +configuration files, and if a user file becomes empty, it will be +deleted. + +The configuration database maps options to values. Conceptually, the +database keys are tuples (config-type, section, item). As implemented, +there are separate dicts for default and user values. Each has +config-type keys 'main', 'extensions', 'highlight', and 'keys'. The +value for each key is a ConfigParser instance that maps section and item +to values. For 'main' and 'extensions', user values override +default values. For 'highlight' and 'keys', user sections augment the +default sections (and must, therefore, have distinct names). + +Throughout this module there is an emphasis on returning usable defaults +when a problem occurs in returning a requested configuration value back to +idle. This is to allow IDLE to continue to function in spite of errors in +the retrieval of config information. When a default is returned instead of +a requested config value, a message is printed to stderr to aid in +configuration problem notification and resolution. +""" +# TODOs added Oct 2014, tjr + +from configparser import ConfigParser +import os +import sys + +from tkinter.font import Font +import idlelib + +class InvalidConfigType(Exception): pass +class InvalidConfigSet(Exception): pass +class InvalidTheme(Exception): pass + +class IdleConfParser(ConfigParser): + """ + A ConfigParser specialised for idle configuration file handling + """ + def __init__(self, cfgFile, cfgDefaults=None): + """ + cfgFile - string, fully specified configuration file name + """ + self.file = cfgFile # This is currently '' when testing. + ConfigParser.__init__(self, defaults=cfgDefaults, strict=False) + + def Get(self, section, option, type=None, default=None, raw=False): + """ + Get an option value for given section/option or return default. + If type is specified, return as type. + """ + # TODO Use default as fallback, at least if not None + # Should also print Warning(file, section, option). + # Currently may raise ValueError + if not self.has_option(section, option): + return default + if type == 'bool': + return self.getboolean(section, option) + elif type == 'int': + return self.getint(section, option) + else: + return self.get(section, option, raw=raw) + + def GetOptionList(self, section): + "Return a list of options for given section, else []." + if self.has_section(section): + return self.options(section) + else: #return a default value + return [] + + def Load(self): + "Load the configuration file from disk." + if self.file: + self.read(self.file) + +class IdleUserConfParser(IdleConfParser): + """ + IdleConfigParser specialised for user configuration handling. + """ + + def SetOption(self, section, option, value): + """Return True if option is added or changed to value, else False. + + Add section if required. False means option already had value. + """ + if self.has_option(section, option): + if self.get(section, option) == value: + return False + else: + self.set(section, option, value) + return True + else: + if not self.has_section(section): + self.add_section(section) + self.set(section, option, value) + return True + + def RemoveOption(self, section, option): + """Return True if option is removed from section, else False. + + False if either section does not exist or did not have option. + """ + if self.has_section(section): + return self.remove_option(section, option) + return False + + def AddSection(self, section): + "If section doesn't exist, add it." + if not self.has_section(section): + self.add_section(section) + + def RemoveEmptySections(self): + "Remove any sections that have no options." + for section in self.sections(): + if not self.GetOptionList(section): + self.remove_section(section) + + def IsEmpty(self): + "Return True if no sections after removing empty sections." + self.RemoveEmptySections() + return not self.sections() + + def Save(self): + """Update user configuration file. + + If self not empty after removing empty sections, write the file + to disk. Otherwise, remove the file from disk if it exists. + """ + fname = self.file + if fname and fname[0] != '#': + if not self.IsEmpty(): + try: + cfgFile = open(fname, 'w') + except OSError: + os.unlink(fname) + cfgFile = open(fname, 'w') + with cfgFile: + self.write(cfgFile) + elif os.path.exists(self.file): + os.remove(self.file) + +class IdleConf: + """Hold config parsers for all idle config files in singleton instance. + + Default config files, self.defaultCfg -- + for config_type in self.config_types: + (idle install dir)/config-{config-type}.def + + User config files, self.userCfg -- + for config_type in self.config_types: + (user home dir)/.idlerc/config-{config-type}.cfg + """ + def __init__(self, _utest=False): + self.config_types = ('main', 'highlight', 'keys', 'extensions') + self.defaultCfg = {} + self.userCfg = {} + self.cfg = {} # TODO use to select userCfg vs defaultCfg + + # See https://bugs.python.org/issue4630#msg356516 for following. + # self.blink_off_time = <first editor text>['insertofftime'] + + if not _utest: + self.CreateConfigHandlers() + self.LoadCfgFiles() + + def CreateConfigHandlers(self): + "Populate default and user config parser dictionaries." + idledir = os.path.dirname(__file__) + self.userdir = userdir = '' if idlelib.testing else self.GetUserCfgDir() + for cfg_type in self.config_types: + self.defaultCfg[cfg_type] = IdleConfParser( + os.path.join(idledir, f'config-{cfg_type}.def')) + self.userCfg[cfg_type] = IdleUserConfParser( + os.path.join(userdir or '#', f'config-{cfg_type}.cfg')) + + def GetUserCfgDir(self): + """Return a filesystem directory for storing user config files. + + Creates it if required. + """ + cfgDir = '.idlerc' + userDir = os.path.expanduser('~') + if userDir != '~': # expanduser() found user home dir + if not os.path.exists(userDir): + if not idlelib.testing: + warn = ('\n Warning: os.path.expanduser("~") points to\n ' + + userDir + ',\n but the path does not exist.') + try: + print(warn, file=sys.stderr) + except OSError: + pass + userDir = '~' + if userDir == "~": # still no path to home! + # traditionally IDLE has defaulted to os.getcwd(), is this adequate? + userDir = os.getcwd() + userDir = os.path.join(userDir, cfgDir) + if not os.path.exists(userDir): + try: + os.mkdir(userDir) + except OSError: + if not idlelib.testing: + warn = ('\n Warning: unable to create user config directory\n' + + userDir + '\n Check path and permissions.\n Exiting!\n') + try: + print(warn, file=sys.stderr) + except OSError: + pass + raise SystemExit + # TODO continue without userDIr instead of exit + return userDir + + def GetOption(self, configType, section, option, default=None, type=None, + warn_on_default=True, raw=False): + """Return a value for configType section option, or default. + + If type is not None, return a value of that type. Also pass raw + to the config parser. First try to return a valid value + (including type) from a user configuration. If that fails, try + the default configuration. If that fails, return default, with a + default of None. + + Warn if either user or default configurations have an invalid value. + Warn if default is returned and warn_on_default is True. + """ + try: + if self.userCfg[configType].has_option(section, option): + return self.userCfg[configType].Get(section, option, + type=type, raw=raw) + except ValueError: + warning = ('\n Warning: config.py - IdleConf.GetOption -\n' + ' invalid %r value for configuration option %r\n' + ' from section %r: %r' % + (type, option, section, + self.userCfg[configType].Get(section, option, raw=raw))) + _warn(warning, configType, section, option) + try: + if self.defaultCfg[configType].has_option(section,option): + return self.defaultCfg[configType].Get( + section, option, type=type, raw=raw) + except ValueError: + pass + #returning default, print warning + if warn_on_default: + warning = ('\n Warning: config.py - IdleConf.GetOption -\n' + ' problem retrieving configuration option %r\n' + ' from section %r.\n' + ' returning default value: %r' % + (option, section, default)) + _warn(warning, configType, section, option) + return default + + def SetOption(self, configType, section, option, value): + """Set section option to value in user config file.""" + self.userCfg[configType].SetOption(section, option, value) + + def GetSectionList(self, configSet, configType): + """Return sections for configSet configType configuration. + + configSet must be either 'user' or 'default' + configType must be in self.config_types. + """ + if not (configType in self.config_types): + raise InvalidConfigType('Invalid configType specified') + if configSet == 'user': + cfgParser = self.userCfg[configType] + elif configSet == 'default': + cfgParser=self.defaultCfg[configType] + else: + raise InvalidConfigSet('Invalid configSet specified') + return cfgParser.sections() + + def GetHighlight(self, theme, element): + """Return dict of theme element highlight colors. + + The keys are 'foreground' and 'background'. The values are + tkinter color strings for configuring backgrounds and tags. + """ + cfg = ('default' if self.defaultCfg['highlight'].has_section(theme) + else 'user') + theme_dict = self.GetThemeDict(cfg, theme) + fore = theme_dict[element + '-foreground'] + if element == 'cursor': + element = 'normal' + back = theme_dict[element + '-background'] + return {"foreground": fore, "background": back} + + def GetThemeDict(self, type, themeName): + """Return {option:value} dict for elements in themeName. + + type - string, 'default' or 'user' theme type + themeName - string, theme name + Values are loaded over ultimate fallback defaults to guarantee + that all theme elements are present in a newly created theme. + """ + if type == 'user': + cfgParser = self.userCfg['highlight'] + elif type == 'default': + cfgParser = self.defaultCfg['highlight'] + else: + raise InvalidTheme('Invalid theme type specified') + # Provide foreground and background colors for each theme + # element (other than cursor) even though some values are not + # yet used by idle, to allow for their use in the future. + # Default values are generally black and white. + # TODO copy theme from a class attribute. + theme ={'normal-foreground':'#000000', + 'normal-background':'#ffffff', + 'keyword-foreground':'#000000', + 'keyword-background':'#ffffff', + 'builtin-foreground':'#000000', + 'builtin-background':'#ffffff', + 'comment-foreground':'#000000', + 'comment-background':'#ffffff', + 'string-foreground':'#000000', + 'string-background':'#ffffff', + 'definition-foreground':'#000000', + 'definition-background':'#ffffff', + 'hilite-foreground':'#000000', + 'hilite-background':'gray', + 'break-foreground':'#ffffff', + 'break-background':'#000000', + 'hit-foreground':'#ffffff', + 'hit-background':'#000000', + 'error-foreground':'#ffffff', + 'error-background':'#000000', + 'context-foreground':'#000000', + 'context-background':'#ffffff', + 'linenumber-foreground':'#000000', + 'linenumber-background':'#ffffff', + #cursor (only foreground can be set) + 'cursor-foreground':'#000000', + #shell window + 'stdout-foreground':'#000000', + 'stdout-background':'#ffffff', + 'stderr-foreground':'#000000', + 'stderr-background':'#ffffff', + 'console-foreground':'#000000', + 'console-background':'#ffffff', + } + for element in theme: + if not (cfgParser.has_option(themeName, element) or + # Skip warning for new elements. + element.startswith(('context-', 'linenumber-'))): + # Print warning that will return a default color + warning = ('\n Warning: config.IdleConf.GetThemeDict' + ' -\n problem retrieving theme element %r' + '\n from theme %r.\n' + ' returning default color: %r' % + (element, themeName, theme[element])) + _warn(warning, 'highlight', themeName, element) + theme[element] = cfgParser.Get( + themeName, element, default=theme[element]) + return theme + + def CurrentTheme(self): + "Return the name of the currently active text color theme." + return self.current_colors_and_keys('Theme') + + def CurrentKeys(self): + """Return the name of the currently active key set.""" + return self.current_colors_and_keys('Keys') + + def current_colors_and_keys(self, section): + """Return the currently active name for Theme or Keys section. + + idlelib.config-main.def ('default') includes these sections + + [Theme] + default= 1 + name= IDLE Classic + name2= + + [Keys] + default= 1 + name= + name2= + + Item 'name2', is used for built-in ('default') themes and keys + added after 2015 Oct 1 and 2016 July 1. This kludge is needed + because setting 'name' to a builtin not defined in older IDLEs + to display multiple error messages or quit. + See https://bugs.python.org/issue25313. + When default = True, 'name2' takes precedence over 'name', + while older IDLEs will just use name. When default = False, + 'name2' may still be set, but it is ignored. + """ + cfgname = 'highlight' if section == 'Theme' else 'keys' + default = self.GetOption('main', section, 'default', + type='bool', default=True) + name = '' + if default: + name = self.GetOption('main', section, 'name2', default='') + if not name: + name = self.GetOption('main', section, 'name', default='') + if name: + source = self.defaultCfg if default else self.userCfg + if source[cfgname].has_section(name): + return name + return "IDLE Classic" if section == 'Theme' else self.default_keys() + + @staticmethod + def default_keys(): + if sys.platform[:3] == 'win': + return 'IDLE Classic Windows' + elif sys.platform == 'darwin': + return 'IDLE Classic OSX' + else: + return 'IDLE Modern Unix' + + def GetExtensions(self, active_only=True, + editor_only=False, shell_only=False): + """Return extensions in default and user config-extensions files. + + If active_only True, only return active (enabled) extensions + and optionally only editor or shell extensions. + If active_only False, return all extensions. + """ + extns = self.RemoveKeyBindNames( + self.GetSectionList('default', 'extensions')) + userExtns = self.RemoveKeyBindNames( + self.GetSectionList('user', 'extensions')) + for extn in userExtns: + if extn not in extns: #user has added own extension + extns.append(extn) + for extn in ('AutoComplete','CodeContext', + 'FormatParagraph','ParenMatch'): + extns.remove(extn) + # specific exclusions because we are storing config for mainlined old + # extensions in config-extensions.def for backward compatibility + if active_only: + activeExtns = [] + for extn in extns: + if self.GetOption('extensions', extn, 'enable', default=True, + type='bool'): + #the extension is enabled + if editor_only or shell_only: # TODO both True contradict + if editor_only: + option = "enable_editor" + else: + option = "enable_shell" + if self.GetOption('extensions', extn,option, + default=True, type='bool', + warn_on_default=False): + activeExtns.append(extn) + else: + activeExtns.append(extn) + return activeExtns + else: + return extns + + def RemoveKeyBindNames(self, extnNameList): + "Return extnNameList with keybinding section names removed." + return [n for n in extnNameList if not n.endswith(('_bindings', '_cfgBindings'))] + + def GetExtnNameForEvent(self, virtualEvent): + """Return the name of the extension binding virtualEvent, or None. + + virtualEvent - string, name of the virtual event to test for, + without the enclosing '<< >>' + """ + extName = None + vEvent = '<<' + virtualEvent + '>>' + for extn in self.GetExtensions(active_only=0): + for event in self.GetExtensionKeys(extn): + if event == vEvent: + extName = extn # TODO return here? + return extName + + def GetExtensionKeys(self, extensionName): + """Return dict: {configurable extensionName event : active keybinding}. + + Events come from default config extension_cfgBindings section. + Keybindings come from GetCurrentKeySet() active key dict, + where previously used bindings are disabled. + """ + keysName = extensionName + '_cfgBindings' + activeKeys = self.GetCurrentKeySet() + extKeys = {} + if self.defaultCfg['extensions'].has_section(keysName): + eventNames = self.defaultCfg['extensions'].GetOptionList(keysName) + for eventName in eventNames: + event = '<<' + eventName + '>>' + binding = activeKeys[event] + extKeys[event] = binding + return extKeys + + def __GetRawExtensionKeys(self,extensionName): + """Return dict {configurable extensionName event : keybinding list}. + + Events come from default config extension_cfgBindings section. + Keybindings list come from the splitting of GetOption, which + tries user config before default config. + """ + keysName = extensionName+'_cfgBindings' + extKeys = {} + if self.defaultCfg['extensions'].has_section(keysName): + eventNames = self.defaultCfg['extensions'].GetOptionList(keysName) + for eventName in eventNames: + binding = self.GetOption( + 'extensions', keysName, eventName, default='').split() + event = '<<' + eventName + '>>' + extKeys[event] = binding + return extKeys + + def GetExtensionBindings(self, extensionName): + """Return dict {extensionName event : active or defined keybinding}. + + Augment self.GetExtensionKeys(extensionName) with mapping of non- + configurable events (from default config) to GetOption splits, + as in self.__GetRawExtensionKeys. + """ + bindsName = extensionName + '_bindings' + extBinds = self.GetExtensionKeys(extensionName) + #add the non-configurable bindings + if self.defaultCfg['extensions'].has_section(bindsName): + eventNames = self.defaultCfg['extensions'].GetOptionList(bindsName) + for eventName in eventNames: + binding = self.GetOption( + 'extensions', bindsName, eventName, default='').split() + event = '<<' + eventName + '>>' + extBinds[event] = binding + + return extBinds + + def GetKeyBinding(self, keySetName, eventStr): + """Return the keybinding list for keySetName eventStr. + + keySetName - name of key binding set (config-keys section). + eventStr - virtual event, including brackets, as in '<<event>>'. + """ + eventName = eventStr[2:-2] #trim off the angle brackets + binding = self.GetOption('keys', keySetName, eventName, default='', + warn_on_default=False).split() + return binding + + def GetCurrentKeySet(self): + "Return CurrentKeys with 'darwin' modifications." + result = self.GetKeySet(self.CurrentKeys()) + + if sys.platform == "darwin": + # macOS (OS X) Tk variants do not support the "Alt" + # keyboard modifier. Replace it with "Option". + # TODO (Ned?): the "Option" modifier does not work properly + # for Cocoa Tk and XQuartz Tk so we should not use it + # in the default 'OSX' keyset. + for k, v in result.items(): + v2 = [ x.replace('<Alt-', '<Option-') for x in v ] + if v != v2: + result[k] = v2 + + return result + + def GetKeySet(self, keySetName): + """Return event-key dict for keySetName core plus active extensions. + + If a binding defined in an extension is already in use, the + extension binding is disabled by being set to '' + """ + keySet = self.GetCoreKeys(keySetName) + activeExtns = self.GetExtensions(active_only=1) + for extn in activeExtns: + extKeys = self.__GetRawExtensionKeys(extn) + if extKeys: #the extension defines keybindings + for event in extKeys: + if extKeys[event] in keySet.values(): + #the binding is already in use + extKeys[event] = '' #disable this binding + keySet[event] = extKeys[event] #add binding + return keySet + + def IsCoreBinding(self, virtualEvent): + """Return True if the virtual event is one of the core idle key events. + + virtualEvent - string, name of the virtual event to test for, + without the enclosing '<< >>' + """ + return ('<<'+virtualEvent+'>>') in self.GetCoreKeys() + +# TODO make keyBindings a file or class attribute used for test above +# and copied in function below. + + former_extension_events = { # Those with user-configurable keys. + '<<force-open-completions>>', '<<expand-word>>', + '<<force-open-calltip>>', '<<flash-paren>>', '<<format-paragraph>>', + '<<run-module>>', '<<check-module>>', '<<zoom-height>>', + '<<run-custom>>', + } + + def GetCoreKeys(self, keySetName=None): + """Return dict of core virtual-key keybindings for keySetName. + + The default keySetName None corresponds to the keyBindings base + dict. If keySetName is not None, bindings from the config + file(s) are loaded _over_ these defaults, so if there is a + problem getting any core binding there will be an 'ultimate last + resort fallback' to the CUA-ish bindings defined here. + """ + # TODO: = dict(sorted([(v-event, keys), ...]))? + keyBindings={ + # virtual-event: list of key events. + '<<copy>>': ['<Control-c>', '<Control-C>'], + '<<cut>>': ['<Control-x>', '<Control-X>'], + '<<paste>>': ['<Control-v>', '<Control-V>'], + '<<beginning-of-line>>': ['<Control-a>', '<Home>'], + '<<center-insert>>': ['<Control-l>'], + '<<close-all-windows>>': ['<Control-q>'], + '<<close-window>>': ['<Alt-F4>'], + '<<do-nothing>>': ['<Control-x>'], + '<<end-of-file>>': ['<Control-d>'], + '<<python-docs>>': ['<F1>'], + '<<python-context-help>>': ['<Shift-F1>'], + '<<history-next>>': ['<Alt-n>'], + '<<history-previous>>': ['<Alt-p>'], + '<<interrupt-execution>>': ['<Control-c>'], + '<<view-restart>>': ['<F6>'], + '<<restart-shell>>': ['<Control-F6>'], + '<<open-class-browser>>': ['<Alt-c>'], + '<<open-module>>': ['<Alt-m>'], + '<<open-new-window>>': ['<Control-n>'], + '<<open-window-from-file>>': ['<Control-o>'], + '<<plain-newline-and-indent>>': ['<Control-j>'], + '<<print-window>>': ['<Control-p>'], + '<<redo>>': ['<Control-y>'], + '<<remove-selection>>': ['<Escape>'], + '<<save-copy-of-window-as-file>>': ['<Alt-Shift-S>'], + '<<save-window-as-file>>': ['<Alt-s>'], + '<<save-window>>': ['<Control-s>'], + '<<select-all>>': ['<Alt-a>'], + '<<toggle-auto-coloring>>': ['<Control-slash>'], + '<<undo>>': ['<Control-z>'], + '<<find-again>>': ['<Control-g>', '<F3>'], + '<<find-in-files>>': ['<Alt-F3>'], + '<<find-selection>>': ['<Control-F3>'], + '<<find>>': ['<Control-f>'], + '<<replace>>': ['<Control-h>'], + '<<goto-line>>': ['<Alt-g>'], + '<<smart-backspace>>': ['<Key-BackSpace>'], + '<<newline-and-indent>>': ['<Key-Return>', '<Key-KP_Enter>'], + '<<smart-indent>>': ['<Key-Tab>'], + '<<indent-region>>': ['<Control-Key-bracketright>'], + '<<dedent-region>>': ['<Control-Key-bracketleft>'], + '<<comment-region>>': ['<Alt-Key-3>'], + '<<uncomment-region>>': ['<Alt-Key-4>'], + '<<tabify-region>>': ['<Alt-Key-5>'], + '<<untabify-region>>': ['<Alt-Key-6>'], + '<<toggle-tabs>>': ['<Alt-Key-t>'], + '<<change-indentwidth>>': ['<Alt-Key-u>'], + '<<del-word-left>>': ['<Control-Key-BackSpace>'], + '<<del-word-right>>': ['<Control-Key-Delete>'], + '<<force-open-completions>>': ['<Control-Key-space>'], + '<<expand-word>>': ['<Alt-Key-slash>'], + '<<force-open-calltip>>': ['<Control-Key-backslash>'], + '<<flash-paren>>': ['<Control-Key-0>'], + '<<format-paragraph>>': ['<Alt-Key-q>'], + '<<run-module>>': ['<Key-F5>'], + '<<run-custom>>': ['<Shift-Key-F5>'], + '<<check-module>>': ['<Alt-Key-x>'], + '<<zoom-height>>': ['<Alt-Key-2>'], + } + + if keySetName: + if not (self.userCfg['keys'].has_section(keySetName) or + self.defaultCfg['keys'].has_section(keySetName)): + warning = ( + '\n Warning: config.py - IdleConf.GetCoreKeys -\n' + ' key set %r is not defined, using default bindings.' % + (keySetName,) + ) + _warn(warning, 'keys', keySetName) + else: + for event in keyBindings: + binding = self.GetKeyBinding(keySetName, event) + if binding: + keyBindings[event] = binding + # Otherwise return default in keyBindings. + elif event not in self.former_extension_events: + warning = ( + '\n Warning: config.py - IdleConf.GetCoreKeys -\n' + ' problem retrieving key binding for event %r\n' + ' from key set %r.\n' + ' returning default value: %r' % + (event, keySetName, keyBindings[event]) + ) + _warn(warning, 'keys', keySetName, event) + return keyBindings + + def GetExtraHelpSourceList(self, configSet): + """Return list of extra help sources from a given configSet. + + Valid configSets are 'user' or 'default'. Return a list of tuples of + the form (menu_item , path_to_help_file , option), or return the empty + list. 'option' is the sequence number of the help resource. 'option' + values determine the position of the menu items on the Help menu, + therefore the returned list must be sorted by 'option'. + + """ + helpSources = [] + if configSet == 'user': + cfgParser = self.userCfg['main'] + elif configSet == 'default': + cfgParser = self.defaultCfg['main'] + else: + raise InvalidConfigSet('Invalid configSet specified') + options=cfgParser.GetOptionList('HelpFiles') + for option in options: + value=cfgParser.Get('HelpFiles', option, default=';') + if value.find(';') == -1: #malformed config entry with no ';' + menuItem = '' #make these empty + helpPath = '' #so value won't be added to list + else: #config entry contains ';' as expected + value=value.split(';') + menuItem=value[0].strip() + helpPath=value[1].strip() + if menuItem and helpPath: #neither are empty strings + helpSources.append( (menuItem,helpPath,option) ) + helpSources.sort(key=lambda x: x[2]) + return helpSources + + def GetAllExtraHelpSourcesList(self): + """Return a list of the details of all additional help sources. + + Tuples in the list are those of GetExtraHelpSourceList. + """ + allHelpSources = (self.GetExtraHelpSourceList('default') + + self.GetExtraHelpSourceList('user') ) + return allHelpSources + + def GetFont(self, root, configType, section): + """Retrieve a font from configuration (font, font-size, font-bold) + Intercept the special value 'TkFixedFont' and substitute + the actual font, factoring in some tweaks if needed for + appearance sakes. + + The 'root' parameter can normally be any valid Tkinter widget. + + Return a tuple (family, size, weight) suitable for passing + to tkinter.Font + """ + family = self.GetOption(configType, section, 'font', default='courier') + size = self.GetOption(configType, section, 'font-size', type='int', + default='10') + bold = self.GetOption(configType, section, 'font-bold', default=0, + type='bool') + if (family == 'TkFixedFont'): + f = Font(name='TkFixedFont', exists=True, root=root) + actualFont = Font.actual(f) + family = actualFont['family'] + size = actualFont['size'] + if size <= 0: + size = 10 # if font in pixels, ignore actual size + bold = actualFont['weight'] == 'bold' + return (family, size, 'bold' if bold else 'normal') + + def LoadCfgFiles(self): + "Load all configuration files." + for key in self.defaultCfg: + self.defaultCfg[key].Load() + self.userCfg[key].Load() #same keys + + def SaveUserCfgFiles(self): + "Write all loaded user configuration files to disk." + for key in self.userCfg: + self.userCfg[key].Save() + + +idleConf = IdleConf() + +_warned = set() +def _warn(msg, *key): + key = (msg,) + key + if key not in _warned: + try: + print(msg, file=sys.stderr) + except OSError: + pass + _warned.add(key) + + +class ConfigChanges(dict): + """Manage a user's proposed configuration option changes. + + Names used across multiple methods: + page -- one of the 4 top-level dicts representing a + .idlerc/config-x.cfg file. + config_type -- name of a page. + section -- a section within a page/file. + option -- name of an option within a section. + value -- value for the option. + + Methods + add_option: Add option and value to changes. + save_option: Save option and value to config parser. + save_all: Save all the changes to the config parser and file. + delete_section: If section exists, + delete from changes, userCfg, and file. + clear: Clear all changes by clearing each page. + """ + def __init__(self): + "Create a page for each configuration file" + self.pages = [] # List of unhashable dicts. + for config_type in idleConf.config_types: + self[config_type] = {} + self.pages.append(self[config_type]) + + def add_option(self, config_type, section, item, value): + "Add item/value pair for config_type and section." + page = self[config_type] + value = str(value) # Make sure we use a string. + if section not in page: + page[section] = {} + page[section][item] = value + + @staticmethod + def save_option(config_type, section, item, value): + """Return True if the configuration value was added or changed. + + Helper for save_all. + """ + if idleConf.defaultCfg[config_type].has_option(section, item): + if idleConf.defaultCfg[config_type].Get(section, item) == value: + # The setting equals a default setting, remove it from user cfg. + return idleConf.userCfg[config_type].RemoveOption(section, item) + # If we got here, set the option. + return idleConf.userCfg[config_type].SetOption(section, item, value) + + def save_all(self): + """Save configuration changes to the user config file. + + Clear self in preparation for additional changes. + Return changed for testing. + """ + idleConf.userCfg['main'].Save() + + changed = False + for config_type in self: + cfg_type_changed = False + page = self[config_type] + for section in page: + if section == 'HelpFiles': # Remove it for replacement. + idleConf.userCfg['main'].remove_section('HelpFiles') + cfg_type_changed = True + for item, value in page[section].items(): + if self.save_option(config_type, section, item, value): + cfg_type_changed = True + if cfg_type_changed: + idleConf.userCfg[config_type].Save() + changed = True + for config_type in ['keys', 'highlight']: + # Save these even if unchanged! + idleConf.userCfg[config_type].Save() + self.clear() + # ConfigDialog caller must add the following call + # self.save_all_changed_extensions() # Uses a different mechanism. + return changed + + def delete_section(self, config_type, section): + """Delete a section from self, userCfg, and file. + + Used to delete custom themes and keysets. + """ + if section in self[config_type]: + del self[config_type][section] + configpage = idleConf.userCfg[config_type] + configpage.remove_section(section) + configpage.Save() + + def clear(self): + """Clear all 4 pages. + + Called in save_all after saving to idleConf. + XXX Mark window *title* when there are changes; unmark here. + """ + for page in self.pages: + page.clear() + + +# TODO Revise test output, write expanded unittest +def _dump(): # htest # (not really, but ignore in coverage) + from zlib import crc32 + line, crc = 0, 0 + + def sprint(obj): + nonlocal line, crc + txt = str(obj) + line += 1 + crc = crc32(txt.encode(encoding='utf-8'), crc) + print(txt) + #print('***', line, crc, '***') # Uncomment for diagnosis. + + def dumpCfg(cfg): + print('\n', cfg, '\n') # Cfg has variable '0xnnnnnnnn' address. + for key in sorted(cfg): + sections = cfg[key].sections() + sprint(key) + sprint(sections) + for section in sections: + options = cfg[key].options(section) + sprint(section) + sprint(options) + for option in options: + sprint(option + ' = ' + cfg[key].Get(section, option)) + + dumpCfg(idleConf.defaultCfg) + dumpCfg(idleConf.userCfg) + print('\nlines = ', line, ', crc = ', crc, sep='') + + +if __name__ == '__main__': + from unittest import main + main('idlelib.idle_test.test_config', verbosity=2, exit=False) + + _dump() + # Run revised _dump() (700+ lines) as htest? More sorting. + # Perhaps as window with tabs for textviews, making it config viewer. diff --git a/Lib/idlelib/config_key.py b/Lib/idlelib/config_key.py new file mode 100644 index 000000000..e5f67e8d4 --- /dev/null +++ b/Lib/idlelib/config_key.py @@ -0,0 +1,354 @@ +""" +Dialog for building Tkinter accelerator key bindings +""" +from tkinter import Toplevel, Listbox, StringVar, TclError +from tkinter.ttk import Frame, Button, Checkbutton, Entry, Label, Scrollbar +from tkinter import messagebox +from tkinter.simpledialog import _setup_dialog +import string +import sys + + +FUNCTION_KEYS = ('F1', 'F2' ,'F3' ,'F4' ,'F5' ,'F6', + 'F7', 'F8' ,'F9' ,'F10' ,'F11' ,'F12') +ALPHANUM_KEYS = tuple(string.ascii_lowercase + string.digits) +PUNCTUATION_KEYS = tuple('~!@#%^&*()_-+={}[]|;:,.<>/?') +WHITESPACE_KEYS = ('Tab', 'Space', 'Return') +EDIT_KEYS = ('BackSpace', 'Delete', 'Insert') +MOVE_KEYS = ('Home', 'End', 'Page Up', 'Page Down', 'Left Arrow', + 'Right Arrow', 'Up Arrow', 'Down Arrow') +AVAILABLE_KEYS = (ALPHANUM_KEYS + PUNCTUATION_KEYS + FUNCTION_KEYS + + WHITESPACE_KEYS + EDIT_KEYS + MOVE_KEYS) + + +def translate_key(key, modifiers): + "Translate from keycap symbol to the Tkinter keysym." + mapping = {'Space':'space', + '~':'asciitilde', '!':'exclam', '@':'at', '#':'numbersign', + '%':'percent', '^':'asciicircum', '&':'ampersand', + '*':'asterisk', '(':'parenleft', ')':'parenright', + '_':'underscore', '-':'minus', '+':'plus', '=':'equal', + '{':'braceleft', '}':'braceright', + '[':'bracketleft', ']':'bracketright', '|':'bar', + ';':'semicolon', ':':'colon', ',':'comma', '.':'period', + '<':'less', '>':'greater', '/':'slash', '?':'question', + 'Page Up':'Prior', 'Page Down':'Next', + 'Left Arrow':'Left', 'Right Arrow':'Right', + 'Up Arrow':'Up', 'Down Arrow': 'Down', 'Tab':'Tab'} + key = mapping.get(key, key) + if 'Shift' in modifiers and key in string.ascii_lowercase: + key = key.upper() + return f'Key-{key}' + + +class GetKeysFrame(Frame): + + # Dialog title for invalid key sequence + keyerror_title = 'Key Sequence Error' + + def __init__(self, parent, action, current_key_sequences): + """ + parent - parent of this dialog + action - the name of the virtual event these keys will be + mapped to + current_key_sequences - a list of all key sequence lists + currently mapped to virtual events, for overlap checking + """ + super().__init__(parent) + self['borderwidth'] = 2 + self['relief'] = 'sunken' + self.parent = parent + self.action = action + self.current_key_sequences = current_key_sequences + self.result = '' + self.key_string = StringVar(self) + self.key_string.set('') + # Set self.modifiers, self.modifier_label. + self.set_modifiers_for_platform() + self.modifier_vars = [] + for modifier in self.modifiers: + variable = StringVar(self) + variable.set('') + self.modifier_vars.append(variable) + self.advanced = False + self.create_widgets() + + def showerror(self, *args, **kwargs): + # Make testing easier. Replace in #30751. + messagebox.showerror(*args, **kwargs) + + def create_widgets(self): + # Basic entry key sequence. + self.frame_keyseq_basic = Frame(self, name='keyseq_basic') + self.frame_keyseq_basic.grid(row=0, column=0, sticky='nsew', + padx=5, pady=5) + basic_title = Label(self.frame_keyseq_basic, + text=f"New keys for '{self.action}' :") + basic_title.pack(anchor='w') + + basic_keys = Label(self.frame_keyseq_basic, justify='left', + textvariable=self.key_string, relief='groove', + borderwidth=2) + basic_keys.pack(ipadx=5, ipady=5, fill='x') + + # Basic entry controls. + self.frame_controls_basic = Frame(self) + self.frame_controls_basic.grid(row=1, column=0, sticky='nsew', padx=5) + + # Basic entry modifiers. + self.modifier_checkbuttons = {} + column = 0 + for modifier, variable in zip(self.modifiers, self.modifier_vars): + label = self.modifier_label.get(modifier, modifier) + check = Checkbutton(self.frame_controls_basic, + command=self.build_key_string, text=label, + variable=variable, onvalue=modifier, offvalue='') + check.grid(row=0, column=column, padx=2, sticky='w') + self.modifier_checkbuttons[modifier] = check + column += 1 + + # Basic entry help text. + help_basic = Label(self.frame_controls_basic, justify='left', + text="Select the desired modifier keys\n"+ + "above, and the final key from the\n"+ + "list on the right.\n\n" + + "Use upper case Symbols when using\n" + + "the Shift modifier. (Letters will be\n" + + "converted automatically.)") + help_basic.grid(row=1, column=0, columnspan=4, padx=2, sticky='w') + + # Basic entry key list. + self.list_keys_final = Listbox(self.frame_controls_basic, width=15, + height=10, selectmode='single') + self.list_keys_final.insert('end', *AVAILABLE_KEYS) + self.list_keys_final.bind('<ButtonRelease-1>', self.final_key_selected) + self.list_keys_final.grid(row=0, column=4, rowspan=4, sticky='ns') + scroll_keys_final = Scrollbar(self.frame_controls_basic, + orient='vertical', + command=self.list_keys_final.yview) + self.list_keys_final.config(yscrollcommand=scroll_keys_final.set) + scroll_keys_final.grid(row=0, column=5, rowspan=4, sticky='ns') + self.button_clear = Button(self.frame_controls_basic, + text='Clear Keys', + command=self.clear_key_seq) + self.button_clear.grid(row=2, column=0, columnspan=4) + + # Advanced entry key sequence. + self.frame_keyseq_advanced = Frame(self, name='keyseq_advanced') + self.frame_keyseq_advanced.grid(row=0, column=0, sticky='nsew', + padx=5, pady=5) + advanced_title = Label(self.frame_keyseq_advanced, justify='left', + text=f"Enter new binding(s) for '{self.action}' :\n" + + "(These bindings will not be checked for validity!)") + advanced_title.pack(anchor='w') + self.advanced_keys = Entry(self.frame_keyseq_advanced, + textvariable=self.key_string) + self.advanced_keys.pack(fill='x') + + # Advanced entry help text. + self.frame_help_advanced = Frame(self) + self.frame_help_advanced.grid(row=1, column=0, sticky='nsew', padx=5) + help_advanced = Label(self.frame_help_advanced, justify='left', + text="Key bindings are specified using Tkinter keysyms as\n"+ + "in these samples: <Control-f>, <Shift-F2>, <F12>,\n" + "<Control-space>, <Meta-less>, <Control-Alt-Shift-X>.\n" + "Upper case is used when the Shift modifier is present!\n\n" + + "'Emacs style' multi-keystroke bindings are specified as\n" + + "follows: <Control-x><Control-y>, where the first key\n" + + "is the 'do-nothing' keybinding.\n\n" + + "Multiple separate bindings for one action should be\n"+ + "separated by a space, eg., <Alt-v> <Meta-v>." ) + help_advanced.grid(row=0, column=0, sticky='nsew') + + # Switch between basic and advanced. + self.button_level = Button(self, command=self.toggle_level, + text='<< Basic Key Binding Entry') + self.button_level.grid(row=2, column=0, stick='ew', padx=5, pady=5) + self.toggle_level() + + def set_modifiers_for_platform(self): + """Determine list of names of key modifiers for this platform. + + The names are used to build Tk bindings -- it doesn't matter if the + keyboard has these keys; it matters if Tk understands them. The + order is also important: key binding equality depends on it, so + config-keys.def must use the same ordering. + """ + if sys.platform == "darwin": + self.modifiers = ['Shift', 'Control', 'Option', 'Command'] + else: + self.modifiers = ['Control', 'Alt', 'Shift'] + self.modifier_label = {'Control': 'Ctrl'} # Short name. + + def toggle_level(self): + "Toggle between basic and advanced keys." + if self.button_level.cget('text').startswith('Advanced'): + self.clear_key_seq() + self.button_level.config(text='<< Basic Key Binding Entry') + self.frame_keyseq_advanced.lift() + self.frame_help_advanced.lift() + self.advanced_keys.focus_set() + self.advanced = True + else: + self.clear_key_seq() + self.button_level.config(text='Advanced Key Binding Entry >>') + self.frame_keyseq_basic.lift() + self.frame_controls_basic.lift() + self.advanced = False + + def final_key_selected(self, event=None): + "Handler for clicking on key in basic settings list." + self.build_key_string() + + def build_key_string(self): + "Create formatted string of modifiers plus the key." + keylist = modifiers = self.get_modifiers() + final_key = self.list_keys_final.get('anchor') + if final_key: + final_key = translate_key(final_key, modifiers) + keylist.append(final_key) + self.key_string.set(f"<{'-'.join(keylist)}>") + + def get_modifiers(self): + "Return ordered list of modifiers that have been selected." + mod_list = [variable.get() for variable in self.modifier_vars] + return [mod for mod in mod_list if mod] + + def clear_key_seq(self): + "Clear modifiers and keys selection." + self.list_keys_final.select_clear(0, 'end') + self.list_keys_final.yview('moveto', '0.0') + for variable in self.modifier_vars: + variable.set('') + self.key_string.set('') + + def ok(self): + self.result = '' + keys = self.key_string.get().strip() + if not keys: + self.showerror(title=self.keyerror_title, parent=self, + message="No key specified.") + return + if (self.advanced or self.keys_ok(keys)) and self.bind_ok(keys): + self.result = keys + return + + def keys_ok(self, keys): + """Validity check on user's 'basic' keybinding selection. + + Doesn't check the string produced by the advanced dialog because + 'modifiers' isn't set. + """ + final_key = self.list_keys_final.get('anchor') + modifiers = self.get_modifiers() + title = self.keyerror_title + key_sequences = [key for keylist in self.current_key_sequences + for key in keylist] + if not keys.endswith('>'): + self.showerror(title, parent=self, + message='Missing the final Key') + elif (not modifiers + and final_key not in FUNCTION_KEYS + MOVE_KEYS): + self.showerror(title=title, parent=self, + message='No modifier key(s) specified.') + elif (modifiers == ['Shift']) \ + and (final_key not in + FUNCTION_KEYS + MOVE_KEYS + ('Tab', 'Space')): + msg = 'The shift modifier by itself may not be used with'\ + ' this key symbol.' + self.showerror(title=title, parent=self, message=msg) + elif keys in key_sequences: + msg = 'This key combination is already in use.' + self.showerror(title=title, parent=self, message=msg) + else: + return True + return False + + def bind_ok(self, keys): + "Return True if Tcl accepts the new keys else show message." + try: + binding = self.bind(keys, lambda: None) + except TclError as err: + self.showerror( + title=self.keyerror_title, parent=self, + message=(f'The entered key sequence is not accepted.\n\n' + f'Error: {err}')) + return False + else: + self.unbind(keys, binding) + return True + + +class GetKeysWindow(Toplevel): + + def __init__(self, parent, title, action, current_key_sequences, + *, _htest=False, _utest=False): + """ + parent - parent of this dialog + title - string which is the title of the popup dialog + action - string, the name of the virtual event these keys will be + mapped to + current_key_sequences - list, a list of all key sequence lists + currently mapped to virtual events, for overlap checking + _htest - bool, change box location when running htest + _utest - bool, do not wait when running unittest + """ + super().__init__(parent) + self.withdraw() # Hide while setting geometry. + self['borderwidth'] = 5 + self.resizable(height=False, width=False) + # Needed for winfo_reqwidth(). + self.update_idletasks() + # Center dialog over parent (or below htest box). + x = (parent.winfo_rootx() + + (parent.winfo_width()//2 - self.winfo_reqwidth()//2)) + y = (parent.winfo_rooty() + + ((parent.winfo_height()//2 - self.winfo_reqheight()//2) + if not _htest else 150)) + self.geometry(f"+{x}+{y}") + + self.title(title) + self.frame = frame = GetKeysFrame(self, action, current_key_sequences) + self.protocol("WM_DELETE_WINDOW", self.cancel) + frame_buttons = Frame(self) + self.button_ok = Button(frame_buttons, text='OK', + width=8, command=self.ok) + self.button_cancel = Button(frame_buttons, text='Cancel', + width=8, command=self.cancel) + self.button_ok.grid(row=0, column=0, padx=5, pady=5) + self.button_cancel.grid(row=0, column=1, padx=5, pady=5) + frame.pack(side='top', expand=True, fill='both') + frame_buttons.pack(side='bottom', fill='x') + + self.transient(parent) + _setup_dialog(self) + self.grab_set() + if not _utest: + self.deiconify() # Geometry set, unhide. + self.wait_window() + + @property + def result(self): + return self.frame.result + + @result.setter + def result(self, value): + self.frame.result = value + + def ok(self, event=None): + self.frame.ok() + self.grab_release() + self.destroy() + + def cancel(self, event=None): + self.result = '' + self.grab_release() + self.destroy() + + +if __name__ == '__main__': + from unittest import main + main('idlelib.idle_test.test_config_key', verbosity=2, exit=False) + + from idlelib.idle_test.htest import run + run(GetKeysWindow) diff --git a/Lib/idlelib/configdialog.py b/Lib/idlelib/configdialog.py new file mode 100644 index 000000000..e618ef07a --- /dev/null +++ b/Lib/idlelib/configdialog.py @@ -0,0 +1,2408 @@ +"""IDLE Configuration Dialog: support user customization of IDLE by GUI + +Customize font faces, sizes, and colorization attributes. Set indentation +defaults. Customize keybindings. Colorization and keybindings can be +saved as user defined sets. Select startup options including shell/editor +and default window size. Define additional help sources. + +Note that tab width in IDLE is currently fixed at eight due to Tk issues. +Refer to comments in EditorWindow autoindent code for details. + +""" +import re + +from tkinter import (Toplevel, Listbox, Canvas, + StringVar, BooleanVar, IntVar, TRUE, FALSE, + TOP, BOTTOM, RIGHT, LEFT, SOLID, GROOVE, + NONE, BOTH, X, Y, W, E, EW, NS, NSEW, NW, + HORIZONTAL, VERTICAL, ANCHOR, ACTIVE, END, TclError) +from tkinter.ttk import (Frame, LabelFrame, Button, Checkbutton, Entry, Label, + OptionMenu, Notebook, Radiobutton, Scrollbar, Style, + Spinbox, Combobox) +from tkinter import colorchooser +import tkinter.font as tkfont +from tkinter import messagebox + +from idlelib.config import idleConf, ConfigChanges +from idlelib.config_key import GetKeysWindow +from idlelib.dynoption import DynOptionMenu +from idlelib import macosx +from idlelib.query import SectionName, HelpSource +from idlelib.textview import view_text +from idlelib.autocomplete import AutoComplete +from idlelib.codecontext import CodeContext +from idlelib.parenmatch import ParenMatch +from idlelib.format import FormatParagraph +from idlelib.squeezer import Squeezer +from idlelib.textview import ScrollableTextFrame + +changes = ConfigChanges() +# Reload changed options in the following classes. +reloadables = (AutoComplete, CodeContext, ParenMatch, FormatParagraph, + Squeezer) + + +class ConfigDialog(Toplevel): + """Config dialog for IDLE. + """ + + def __init__(self, parent, title='', *, _htest=False, _utest=False): + """Show the tabbed dialog for user configuration. + + Args: + parent - parent of this dialog + title - string which is the title of this popup dialog + _htest - bool, change box location when running htest + _utest - bool, don't wait_window when running unittest + + Note: Focus set on font page fontlist. + + Methods: + create_widgets + cancel: Bound to DELETE_WINDOW protocol. + """ + Toplevel.__init__(self, parent) + self.parent = parent + if _htest: + parent.instance_dict = {} + if not _utest: + self.withdraw() + + self.title(title or 'IDLE Preferences') + x = parent.winfo_rootx() + 20 + y = parent.winfo_rooty() + (30 if not _htest else 150) + self.geometry(f'+{x}+{y}') + # Each theme element key is its display name. + # The first value of the tuple is the sample area tag name. + # The second value is the display name list sort index. + self.create_widgets() + self.resizable(height=FALSE, width=FALSE) + self.transient(parent) + self.protocol("WM_DELETE_WINDOW", self.cancel) + self.fontpage.fontlist.focus_set() + # XXX Decide whether to keep or delete these key bindings. + # Key bindings for this dialog. + # self.bind('<Escape>', self.Cancel) #dismiss dialog, no save + # self.bind('<Alt-a>', self.Apply) #apply changes, save + # self.bind('<F1>', self.Help) #context help + # Attach callbacks after loading config to avoid calling them. + tracers.attach() + + if not _utest: + self.grab_set() + self.wm_deiconify() + self.wait_window() + + def create_widgets(self): + """Create and place widgets for tabbed dialog. + + Widgets Bound to self: + frame: encloses all other widgets + note: Notebook + highpage: HighPage + fontpage: FontPage + keyspage: KeysPage + winpage: WinPage + shedpage: ShedPage + extpage: ExtPage + + Methods: + create_action_buttons + load_configs: Load pages except for extensions. + activate_config_changes: Tell editors to reload. + """ + self.frame = frame = Frame(self, padding=5) + self.frame.grid(sticky="nwes") + self.note = note = Notebook(frame) + self.extpage = ExtPage(note) + self.highpage = HighPage(note, self.extpage) + self.fontpage = FontPage(note, self.highpage) + self.keyspage = KeysPage(note, self.extpage) + self.winpage = WinPage(note) + self.shedpage = ShedPage(note) + + note.add(self.fontpage, text=' Fonts ') + note.add(self.highpage, text='Highlights') + note.add(self.keyspage, text=' Keys ') + note.add(self.winpage, text=' Windows ') + note.add(self.shedpage, text=' Shell/Ed ') + note.add(self.extpage, text='Extensions') + note.enable_traversal() + note.pack(side=TOP, expand=TRUE, fill=BOTH) + self.create_action_buttons().pack(side=BOTTOM) + + def create_action_buttons(self): + """Return frame of action buttons for dialog. + + Methods: + ok + apply + cancel + help + + Widget Structure: + outer: Frame + buttons: Frame + (no assignment): Button (ok) + (no assignment): Button (apply) + (no assignment): Button (cancel) + (no assignment): Button (help) + (no assignment): Frame + """ + if macosx.isAquaTk(): + # Changing the default padding on OSX results in unreadable + # text in the buttons. + padding_args = {} + else: + padding_args = {'padding': (6, 3)} + outer = Frame(self.frame, padding=2) + buttons_frame = Frame(outer, padding=2) + self.buttons = {} + for txt, cmd in ( + ('Ok', self.ok), + ('Apply', self.apply), + ('Cancel', self.cancel), + ('Help', self.help)): + self.buttons[txt] = Button(buttons_frame, text=txt, command=cmd, + takefocus=FALSE, **padding_args) + self.buttons[txt].pack(side=LEFT, padx=5) + # Add space above buttons. + Frame(outer, height=2, borderwidth=0).pack(side=TOP) + buttons_frame.pack(side=BOTTOM) + return outer + + def ok(self): + """Apply config changes, then dismiss dialog.""" + self.apply() + self.destroy() + + def apply(self): + """Apply config changes and leave dialog open.""" + self.deactivate_current_config() + changes.save_all() + self.extpage.save_all_changed_extensions() + self.activate_config_changes() + + def cancel(self): + """Dismiss config dialog. + + Methods: + destroy: inherited + """ + changes.clear() + self.destroy() + + def destroy(self): + global font_sample_text + font_sample_text = self.fontpage.font_sample.get('1.0', 'end') + self.grab_release() + super().destroy() + + def help(self): + """Create textview for config dialog help. + + Attributes accessed: + note + Methods: + view_text: Method from textview module. + """ + page = self.note.tab(self.note.select(), option='text').strip() + view_text(self, title='Help for IDLE preferences', + contents=help_common+help_pages.get(page, '')) + + def deactivate_current_config(self): + """Remove current key bindings in current windows.""" + for instance in self.parent.instance_dict: + instance.RemoveKeybindings() + + def activate_config_changes(self): + """Apply configuration changes to current windows. + + Dynamically update the current parent window instances + with some of the configuration changes. + """ + for instance in self.parent.instance_dict: + instance.ResetColorizer() + instance.ResetFont() + instance.set_notabs_indentwidth() + instance.ApplyKeybindings() + instance.reset_help_menu_entries() + instance.update_cursor_blink() + for klass in reloadables: + klass.reload() + + +# class TabPage(Frame): # A template for Page classes. +# def __init__(self, master): +# super().__init__(master) +# self.create_page_tab() +# self.load_tab_cfg() +# def create_page_tab(self): +# # Define tk vars and register var and callback with tracers. +# # Create subframes and widgets. +# # Pack widgets. +# def load_tab_cfg(self): +# # Initialize widgets with data from idleConf. +# def var_changed_var_name(): +# # For each tk var that needs other than default callback. +# def other_methods(): +# # Define tab-specific behavior. + +font_sample_text = ( + '<ASCII/Latin1>\n' + 'AaBbCcDdEeFfGgHhIiJj\n1234567890#:+=(){}[]\n' + '\u00a2\u00a3\u00a5\u00a7\u00a9\u00ab\u00ae\u00b6\u00bd\u011e' + '\u00c0\u00c1\u00c2\u00c3\u00c4\u00c5\u00c7\u00d0\u00d8\u00df\n' + '\n<IPA,Greek,Cyrillic>\n' + '\u0250\u0255\u0258\u025e\u025f\u0264\u026b\u026e\u0270\u0277' + '\u027b\u0281\u0283\u0286\u028e\u029e\u02a2\u02ab\u02ad\u02af\n' + '\u0391\u03b1\u0392\u03b2\u0393\u03b3\u0394\u03b4\u0395\u03b5' + '\u0396\u03b6\u0397\u03b7\u0398\u03b8\u0399\u03b9\u039a\u03ba\n' + '\u0411\u0431\u0414\u0434\u0416\u0436\u041f\u043f\u0424\u0444' + '\u0427\u0447\u042a\u044a\u042d\u044d\u0460\u0464\u046c\u04dc\n' + '\n<Hebrew, Arabic>\n' + '\u05d0\u05d1\u05d2\u05d3\u05d4\u05d5\u05d6\u05d7\u05d8\u05d9' + '\u05da\u05db\u05dc\u05dd\u05de\u05df\u05e0\u05e1\u05e2\u05e3\n' + '\u0627\u0628\u062c\u062f\u0647\u0648\u0632\u062d\u0637\u064a' + '\u0660\u0661\u0662\u0663\u0664\u0665\u0666\u0667\u0668\u0669\n' + '\n<Devanagari, Tamil>\n' + '\u0966\u0967\u0968\u0969\u096a\u096b\u096c\u096d\u096e\u096f' + '\u0905\u0906\u0907\u0908\u0909\u090a\u090f\u0910\u0913\u0914\n' + '\u0be6\u0be7\u0be8\u0be9\u0bea\u0beb\u0bec\u0bed\u0bee\u0bef' + '\u0b85\u0b87\u0b89\u0b8e\n' + '\n<East Asian>\n' + '\u3007\u4e00\u4e8c\u4e09\u56db\u4e94\u516d\u4e03\u516b\u4e5d\n' + '\u6c49\u5b57\u6f22\u5b57\u4eba\u6728\u706b\u571f\u91d1\u6c34\n' + '\uac00\ub0d0\ub354\ub824\ubaa8\ubd64\uc218\uc720\uc988\uce58\n' + '\u3042\u3044\u3046\u3048\u304a\u30a2\u30a4\u30a6\u30a8\u30aa\n' + ) + + +class FontPage(Frame): + + def __init__(self, master, highpage): + super().__init__(master) + self.highlight_sample = highpage.highlight_sample + self.create_page_font() + self.load_font_cfg() + + def create_page_font(self): + """Return frame of widgets for Font tab. + + Fonts: Enable users to provisionally change font face, size, or + boldness and to see the consequence of proposed choices. Each + action set 3 options in changes structuree and changes the + corresponding aspect of the font sample on this page and + highlight sample on highlight page. + + Function load_font_cfg initializes font vars and widgets from + idleConf entries and tk. + + Fontlist: mouse button 1 click or up or down key invoke + on_fontlist_select(), which sets var font_name. + + Sizelist: clicking the menubutton opens the dropdown menu. A + mouse button 1 click or return key sets var font_size. + + Bold_toggle: clicking the box toggles var font_bold. + + Changing any of the font vars invokes var_changed_font, which + adds all 3 font options to changes and calls set_samples. + Set_samples applies a new font constructed from the font vars to + font_sample and to highlight_sample on the highlight page. + + Widgets for FontPage(Frame): (*) widgets bound to self + frame_font: LabelFrame + frame_font_name: Frame + font_name_title: Label + (*)fontlist: ListBox - font_name + scroll_font: Scrollbar + frame_font_param: Frame + font_size_title: Label + (*)sizelist: DynOptionMenu - font_size + (*)bold_toggle: Checkbutton - font_bold + frame_sample: LabelFrame + (*)font_sample: Label + """ + self.font_name = tracers.add(StringVar(self), self.var_changed_font) + self.font_size = tracers.add(StringVar(self), self.var_changed_font) + self.font_bold = tracers.add(BooleanVar(self), self.var_changed_font) + + # Define frames and widgets. + frame_font = LabelFrame(self, borderwidth=2, relief=GROOVE, + text=' Shell/Editor Font ') + frame_sample = LabelFrame(self, borderwidth=2, relief=GROOVE, + text=' Font Sample (Editable) ') + # frame_font. + frame_font_name = Frame(frame_font) + frame_font_param = Frame(frame_font) + font_name_title = Label( + frame_font_name, justify=LEFT, text='Font Face :') + self.fontlist = Listbox(frame_font_name, height=15, + takefocus=True, exportselection=FALSE) + self.fontlist.bind('<ButtonRelease-1>', self.on_fontlist_select) + self.fontlist.bind('<KeyRelease-Up>', self.on_fontlist_select) + self.fontlist.bind('<KeyRelease-Down>', self.on_fontlist_select) + scroll_font = Scrollbar(frame_font_name) + scroll_font.config(command=self.fontlist.yview) + self.fontlist.config(yscrollcommand=scroll_font.set) + font_size_title = Label(frame_font_param, text='Size :') + self.sizelist = DynOptionMenu(frame_font_param, self.font_size, None) + self.bold_toggle = Checkbutton( + frame_font_param, variable=self.font_bold, + onvalue=1, offvalue=0, text='Bold') + # frame_sample. + font_sample_frame = ScrollableTextFrame(frame_sample) + self.font_sample = font_sample_frame.text + self.font_sample.config(wrap=NONE, width=1, height=1) + self.font_sample.insert(END, font_sample_text) + + # Grid and pack widgets: + self.columnconfigure(1, weight=1) + self.rowconfigure(2, weight=1) + frame_font.grid(row=0, column=0, padx=5, pady=5) + frame_sample.grid(row=0, column=1, rowspan=3, padx=5, pady=5, + sticky='nsew') + # frame_font. + frame_font_name.pack(side=TOP, padx=5, pady=5, fill=X) + frame_font_param.pack(side=TOP, padx=5, pady=5, fill=X) + font_name_title.pack(side=TOP, anchor=W) + self.fontlist.pack(side=LEFT, expand=TRUE, fill=X) + scroll_font.pack(side=LEFT, fill=Y) + font_size_title.pack(side=LEFT, anchor=W) + self.sizelist.pack(side=LEFT, anchor=W) + self.bold_toggle.pack(side=LEFT, anchor=W, padx=20) + # frame_sample. + font_sample_frame.pack(expand=TRUE, fill=BOTH) + + def load_font_cfg(self): + """Load current configuration settings for the font options. + + Retrieve current font with idleConf.GetFont and font families + from tk. Setup fontlist and set font_name. Setup sizelist, + which sets font_size. Set font_bold. Call set_samples. + """ + configured_font = idleConf.GetFont(self, 'main', 'EditorWindow') + font_name = configured_font[0].lower() + font_size = configured_font[1] + font_bold = configured_font[2]=='bold' + + # Set sorted no-duplicate editor font selection list and font_name. + fonts = sorted(set(tkfont.families(self))) + for font in fonts: + self.fontlist.insert(END, font) + self.font_name.set(font_name) + lc_fonts = [s.lower() for s in fonts] + try: + current_font_index = lc_fonts.index(font_name) + self.fontlist.see(current_font_index) + self.fontlist.select_set(current_font_index) + self.fontlist.select_anchor(current_font_index) + self.fontlist.activate(current_font_index) + except ValueError: + pass + # Set font size dropdown. + self.sizelist.SetMenu(('7', '8', '9', '10', '11', '12', '13', '14', + '16', '18', '20', '22', '25', '29', '34', '40'), + font_size) + # Set font weight. + self.font_bold.set(font_bold) + self.set_samples() + + def var_changed_font(self, *params): + """Store changes to font attributes. + + When one font attribute changes, save them all, as they are + not independent from each other. In particular, when we are + overriding the default font, we need to write out everything. + """ + value = self.font_name.get() + changes.add_option('main', 'EditorWindow', 'font', value) + value = self.font_size.get() + changes.add_option('main', 'EditorWindow', 'font-size', value) + value = self.font_bold.get() + changes.add_option('main', 'EditorWindow', 'font-bold', value) + self.set_samples() + + def on_fontlist_select(self, event): + """Handle selecting a font from the list. + + Event can result from either mouse click or Up or Down key. + Set font_name and example displays to selection. + """ + font = self.fontlist.get( + ACTIVE if event.type.name == 'KeyRelease' else ANCHOR) + self.font_name.set(font.lower()) + + def set_samples(self, event=None): + """Update both screen samples with the font settings. + + Called on font initialization and change events. + Accesses font_name, font_size, and font_bold Variables. + Updates font_sample and highlight page highlight_sample. + """ + font_name = self.font_name.get() + font_weight = tkfont.BOLD if self.font_bold.get() else tkfont.NORMAL + new_font = (font_name, self.font_size.get(), font_weight) + self.font_sample['font'] = new_font + self.highlight_sample['font'] = new_font + + +class HighPage(Frame): + + def __init__(self, master, extpage): + super().__init__(master) + self.extpage = extpage + self.cd = master.winfo_toplevel() + self.style = Style(master) + self.create_page_highlight() + self.load_theme_cfg() + + def create_page_highlight(self): + """Return frame of widgets for Highlights tab. + + Enable users to provisionally change foreground and background + colors applied to textual tags. Color mappings are stored in + complete listings called themes. Built-in themes in + idlelib/config-highlight.def are fixed as far as the dialog is + concerned. Any theme can be used as the base for a new custom + theme, stored in .idlerc/config-highlight.cfg. + + Function load_theme_cfg() initializes tk variables and theme + lists and calls paint_theme_sample() and set_highlight_target() + for the current theme. Radiobuttons builtin_theme_on and + custom_theme_on toggle var theme_source, which controls if the + current set of colors are from a builtin or custom theme. + DynOptionMenus builtinlist and customlist contain lists of the + builtin and custom themes, respectively, and the current item + from each list is stored in vars builtin_name and custom_name. + + Function paint_theme_sample() applies the colors from the theme + to the tags in text widget highlight_sample and then invokes + set_color_sample(). Function set_highlight_target() sets the state + of the radiobuttons fg_on and bg_on based on the tag and it also + invokes set_color_sample(). + + Function set_color_sample() sets the background color for the frame + holding the color selector. This provides a larger visual of the + color for the current tag and plane (foreground/background). + + Note: set_color_sample() is called from many places and is often + called more than once when a change is made. It is invoked when + foreground or background is selected (radiobuttons), from + paint_theme_sample() (theme is changed or load_cfg is called), and + from set_highlight_target() (target tag is changed or load_cfg called). + + Button delete_custom invokes delete_custom() to delete + a custom theme from idleConf.userCfg['highlight'] and changes. + Button save_custom invokes save_as_new_theme() which calls + get_new_theme_name() and create_new() to save a custom theme + and its colors to idleConf.userCfg['highlight']. + + Radiobuttons fg_on and bg_on toggle var fg_bg_toggle to control + if the current selected color for a tag is for the foreground or + background. + + DynOptionMenu targetlist contains a readable description of the + tags applied to Python source within IDLE. Selecting one of the + tags from this list populates highlight_target, which has a callback + function set_highlight_target(). + + Text widget highlight_sample displays a block of text (which is + mock Python code) in which is embedded the defined tags and reflects + the color attributes of the current theme and changes for those tags. + Mouse button 1 allows for selection of a tag and updates + highlight_target with that tag value. + + Note: The font in highlight_sample is set through the config in + the fonts tab. + + In other words, a tag can be selected either from targetlist or + by clicking on the sample text within highlight_sample. The + plane (foreground/background) is selected via the radiobutton. + Together, these two (tag and plane) control what color is + shown in set_color_sample() for the current theme. Button set_color + invokes get_color() which displays a ColorChooser to change the + color for the selected tag/plane. If a new color is picked, + it will be saved to changes and the highlight_sample and + frame background will be updated. + + Tk Variables: + color: Color of selected target. + builtin_name: Menu variable for built-in theme. + custom_name: Menu variable for custom theme. + fg_bg_toggle: Toggle for foreground/background color. + Note: this has no callback. + theme_source: Selector for built-in or custom theme. + highlight_target: Menu variable for the highlight tag target. + + Instance Data Attributes: + theme_elements: Dictionary of tags for text highlighting. + The key is the display name and the value is a tuple of + (tag name, display sort order). + + Methods [attachment]: + load_theme_cfg: Load current highlight colors. + get_color: Invoke colorchooser [button_set_color]. + set_color_sample_binding: Call set_color_sample [fg_bg_toggle]. + set_highlight_target: set fg_bg_toggle, set_color_sample(). + set_color_sample: Set frame background to target. + on_new_color_set: Set new color and add option. + paint_theme_sample: Recolor sample. + get_new_theme_name: Get from popup. + create_new: Combine theme with changes and save. + save_as_new_theme: Save [button_save_custom]. + set_theme_type: Command for [theme_source]. + delete_custom: Activate default [button_delete_custom]. + save_new: Save to userCfg['theme'] (is function). + + Widgets of highlights page frame: (*) widgets bound to self + frame_custom: LabelFrame + (*)highlight_sample: Text + (*)frame_color_set: Frame + (*)button_set_color: Button + (*)targetlist: DynOptionMenu - highlight_target + frame_fg_bg_toggle: Frame + (*)fg_on: Radiobutton - fg_bg_toggle + (*)bg_on: Radiobutton - fg_bg_toggle + (*)button_save_custom: Button + frame_theme: LabelFrame + theme_type_title: Label + (*)builtin_theme_on: Radiobutton - theme_source + (*)custom_theme_on: Radiobutton - theme_source + (*)builtinlist: DynOptionMenu - builtin_name + (*)customlist: DynOptionMenu - custom_name + (*)button_delete_custom: Button + (*)theme_message: Label + """ + self.theme_elements = { + # Display-name: internal-config-tag-name. + 'Normal Code or Text': 'normal', + 'Code Context': 'context', + 'Python Keywords': 'keyword', + 'Python Definitions': 'definition', + 'Python Builtins': 'builtin', + 'Python Comments': 'comment', + 'Python Strings': 'string', + 'Selected Text': 'hilite', + 'Found Text': 'hit', + 'Cursor': 'cursor', + 'Editor Breakpoint': 'break', + 'Shell Prompt': 'console', + 'Error Text': 'error', + 'Shell User Output': 'stdout', + 'Shell User Exception': 'stderr', + 'Line Number': 'linenumber', + } + self.builtin_name = tracers.add( + StringVar(self), self.var_changed_builtin_name) + self.custom_name = tracers.add( + StringVar(self), self.var_changed_custom_name) + self.fg_bg_toggle = BooleanVar(self) + self.color = tracers.add( + StringVar(self), self.var_changed_color) + self.theme_source = tracers.add( + BooleanVar(self), self.var_changed_theme_source) + self.highlight_target = tracers.add( + StringVar(self), self.var_changed_highlight_target) + + # Create widgets: + # body frame and section frames. + frame_custom = LabelFrame(self, borderwidth=2, relief=GROOVE, + text=' Custom Highlighting ') + frame_theme = LabelFrame(self, borderwidth=2, relief=GROOVE, + text=' Highlighting Theme ') + # frame_custom. + sample_frame = ScrollableTextFrame( + frame_custom, relief=SOLID, borderwidth=1) + text = self.highlight_sample = sample_frame.text + text.configure( + font=('courier', 12, ''), cursor='hand2', width=1, height=1, + takefocus=FALSE, highlightthickness=0, wrap=NONE) + # Prevent perhaps invisible selection of word or slice. + text.bind('<Double-Button-1>', lambda e: 'break') + text.bind('<B1-Motion>', lambda e: 'break') + string_tags=( + ('# Click selects item.', 'comment'), ('\n', 'normal'), + ('code context section', 'context'), ('\n', 'normal'), + ('| cursor', 'cursor'), ('\n', 'normal'), + ('def', 'keyword'), (' ', 'normal'), + ('func', 'definition'), ('(param):\n ', 'normal'), + ('"Return None."', 'string'), ('\n var0 = ', 'normal'), + ("'string'", 'string'), ('\n var1 = ', 'normal'), + ("'selected'", 'hilite'), ('\n var2 = ', 'normal'), + ("'found'", 'hit'), ('\n var3 = ', 'normal'), + ('list', 'builtin'), ('(', 'normal'), + ('None', 'keyword'), (')\n', 'normal'), + (' breakpoint("line")', 'break'), ('\n\n', 'normal'), + ('>>>', 'console'), (' 3.14**2\n', 'normal'), + ('9.8596', 'stdout'), ('\n', 'normal'), + ('>>>', 'console'), (' pri ', 'normal'), + ('n', 'error'), ('t(\n', 'normal'), + ('SyntaxError', 'stderr'), ('\n', 'normal')) + for string, tag in string_tags: + text.insert(END, string, tag) + n_lines = len(text.get('1.0', END).splitlines()) + for lineno in range(1, n_lines): + text.insert(f'{lineno}.0', + f'{lineno:{len(str(n_lines))}d} ', + 'linenumber') + for element in self.theme_elements: + def tem(event, elem=element): + # event.widget.winfo_top_level().highlight_target.set(elem) + self.highlight_target.set(elem) + text.tag_bind( + self.theme_elements[element], '<ButtonPress-1>', tem) + text['state'] = 'disabled' + self.style.configure('frame_color_set.TFrame', borderwidth=1, + relief='solid') + self.frame_color_set = Frame(frame_custom, style='frame_color_set.TFrame') + frame_fg_bg_toggle = Frame(frame_custom) + self.button_set_color = Button( + self.frame_color_set, text='Choose Color for :', + command=self.get_color) + self.targetlist = DynOptionMenu( + self.frame_color_set, self.highlight_target, None, + highlightthickness=0) #, command=self.set_highlight_targetBinding + self.fg_on = Radiobutton( + frame_fg_bg_toggle, variable=self.fg_bg_toggle, value=1, + text='Foreground', command=self.set_color_sample_binding) + self.bg_on = Radiobutton( + frame_fg_bg_toggle, variable=self.fg_bg_toggle, value=0, + text='Background', command=self.set_color_sample_binding) + self.fg_bg_toggle.set(1) + self.button_save_custom = Button( + frame_custom, text='Save as New Custom Theme', + command=self.save_as_new_theme) + # frame_theme. + theme_type_title = Label(frame_theme, text='Select : ') + self.builtin_theme_on = Radiobutton( + frame_theme, variable=self.theme_source, value=1, + command=self.set_theme_type, text='a Built-in Theme') + self.custom_theme_on = Radiobutton( + frame_theme, variable=self.theme_source, value=0, + command=self.set_theme_type, text='a Custom Theme') + self.builtinlist = DynOptionMenu( + frame_theme, self.builtin_name, None, command=None) + self.customlist = DynOptionMenu( + frame_theme, self.custom_name, None, command=None) + self.button_delete_custom = Button( + frame_theme, text='Delete Custom Theme', + command=self.delete_custom) + self.theme_message = Label(frame_theme, borderwidth=2) + # Pack widgets: + # body. + frame_custom.pack(side=LEFT, padx=5, pady=5, expand=TRUE, fill=BOTH) + frame_theme.pack(side=TOP, padx=5, pady=5, fill=X) + # frame_custom. + self.frame_color_set.pack(side=TOP, padx=5, pady=5, fill=X) + frame_fg_bg_toggle.pack(side=TOP, padx=5, pady=0) + sample_frame.pack( + side=TOP, padx=5, pady=5, expand=TRUE, fill=BOTH) + self.button_set_color.pack(side=TOP, expand=TRUE, fill=X, padx=8, pady=4) + self.targetlist.pack(side=TOP, expand=TRUE, fill=X, padx=8, pady=3) + self.fg_on.pack(side=LEFT, anchor=E) + self.bg_on.pack(side=RIGHT, anchor=W) + self.button_save_custom.pack(side=BOTTOM, fill=X, padx=5, pady=5) + # frame_theme. + theme_type_title.pack(side=TOP, anchor=W, padx=5, pady=5) + self.builtin_theme_on.pack(side=TOP, anchor=W, padx=5) + self.custom_theme_on.pack(side=TOP, anchor=W, padx=5, pady=2) + self.builtinlist.pack(side=TOP, fill=X, padx=5, pady=5) + self.customlist.pack(side=TOP, fill=X, anchor=W, padx=5, pady=5) + self.button_delete_custom.pack(side=TOP, fill=X, padx=5, pady=5) + self.theme_message.pack(side=TOP, fill=X, pady=5) + + def load_theme_cfg(self): + """Load current configuration settings for the theme options. + + Based on the theme_source toggle, the theme is set as + either builtin or custom and the initial widget values + reflect the current settings from idleConf. + + Attributes updated: + theme_source: Set from idleConf. + builtinlist: List of default themes from idleConf. + customlist: List of custom themes from idleConf. + custom_theme_on: Disabled if there are no custom themes. + custom_theme: Message with additional information. + targetlist: Create menu from self.theme_elements. + + Methods: + set_theme_type + paint_theme_sample + set_highlight_target + """ + # Set current theme type radiobutton. + self.theme_source.set(idleConf.GetOption( + 'main', 'Theme', 'default', type='bool', default=1)) + # Set current theme. + current_option = idleConf.CurrentTheme() + # Load available theme option menus. + if self.theme_source.get(): # Default theme selected. + item_list = idleConf.GetSectionList('default', 'highlight') + item_list.sort() + self.builtinlist.SetMenu(item_list, current_option) + item_list = idleConf.GetSectionList('user', 'highlight') + item_list.sort() + if not item_list: + self.custom_theme_on.state(('disabled',)) + self.custom_name.set('- no custom themes -') + else: + self.customlist.SetMenu(item_list, item_list[0]) + else: # User theme selected. + item_list = idleConf.GetSectionList('user', 'highlight') + item_list.sort() + self.customlist.SetMenu(item_list, current_option) + item_list = idleConf.GetSectionList('default', 'highlight') + item_list.sort() + self.builtinlist.SetMenu(item_list, item_list[0]) + self.set_theme_type() + # Load theme element option menu. + theme_names = list(self.theme_elements) + self.targetlist.SetMenu(theme_names, theme_names[0]) + self.paint_theme_sample() + self.set_highlight_target() + + def var_changed_builtin_name(self, *params): + """Process new builtin theme selection. + + Add the changed theme's name to the changed_items and recreate + the sample with the values from the selected theme. + """ + old_themes = ('IDLE Classic', 'IDLE New') + value = self.builtin_name.get() + if value not in old_themes: + if idleConf.GetOption('main', 'Theme', 'name') not in old_themes: + changes.add_option('main', 'Theme', 'name', old_themes[0]) + changes.add_option('main', 'Theme', 'name2', value) + self.theme_message['text'] = 'New theme, see Help' + else: + changes.add_option('main', 'Theme', 'name', value) + changes.add_option('main', 'Theme', 'name2', '') + self.theme_message['text'] = '' + self.paint_theme_sample() + + def var_changed_custom_name(self, *params): + """Process new custom theme selection. + + If a new custom theme is selected, add the name to the + changed_items and apply the theme to the sample. + """ + value = self.custom_name.get() + if value != '- no custom themes -': + changes.add_option('main', 'Theme', 'name', value) + self.paint_theme_sample() + + def var_changed_theme_source(self, *params): + """Process toggle between builtin and custom theme. + + Update the default toggle value and apply the newly + selected theme type. + """ + value = self.theme_source.get() + changes.add_option('main', 'Theme', 'default', value) + if value: + self.var_changed_builtin_name() + else: + self.var_changed_custom_name() + + def var_changed_color(self, *params): + "Process change to color choice." + self.on_new_color_set() + + def var_changed_highlight_target(self, *params): + "Process selection of new target tag for highlighting." + self.set_highlight_target() + + def set_theme_type(self): + """Set available screen options based on builtin or custom theme. + + Attributes accessed: + theme_source + + Attributes updated: + builtinlist + customlist + button_delete_custom + custom_theme_on + + Called from: + handler for builtin_theme_on and custom_theme_on + delete_custom + create_new + load_theme_cfg + """ + if self.theme_source.get(): + self.builtinlist['state'] = 'normal' + self.customlist['state'] = 'disabled' + self.button_delete_custom.state(('disabled',)) + else: + self.builtinlist['state'] = 'disabled' + self.custom_theme_on.state(('!disabled',)) + self.customlist['state'] = 'normal' + self.button_delete_custom.state(('!disabled',)) + + def get_color(self): + """Handle button to select a new color for the target tag. + + If a new color is selected while using a builtin theme, a + name must be supplied to create a custom theme. + + Attributes accessed: + highlight_target + frame_color_set + theme_source + + Attributes updated: + color + + Methods: + get_new_theme_name + create_new + """ + target = self.highlight_target.get() + prev_color = self.style.lookup(self.frame_color_set['style'], + 'background') + rgbTuplet, color_string = colorchooser.askcolor( + parent=self, title='Pick new color for : '+target, + initialcolor=prev_color) + if color_string and (color_string != prev_color): + # User didn't cancel and they chose a new color. + if self.theme_source.get(): # Current theme is a built-in. + message = ('Your changes will be saved as a new Custom Theme. ' + 'Enter a name for your new Custom Theme below.') + new_theme = self.get_new_theme_name(message) + if not new_theme: # User cancelled custom theme creation. + return + else: # Create new custom theme based on previously active theme. + self.create_new(new_theme) + self.color.set(color_string) + else: # Current theme is user defined. + self.color.set(color_string) + + def on_new_color_set(self): + "Display sample of new color selection on the dialog." + new_color = self.color.get() + self.style.configure('frame_color_set.TFrame', background=new_color) + plane = 'foreground' if self.fg_bg_toggle.get() else 'background' + sample_element = self.theme_elements[self.highlight_target.get()] + self.highlight_sample.tag_config(sample_element, **{plane: new_color}) + theme = self.custom_name.get() + theme_element = sample_element + '-' + plane + changes.add_option('highlight', theme, theme_element, new_color) + + def get_new_theme_name(self, message): + "Return name of new theme from query popup." + used_names = (idleConf.GetSectionList('user', 'highlight') + + idleConf.GetSectionList('default', 'highlight')) + new_theme = SectionName( + self, 'New Custom Theme', message, used_names).result + return new_theme + + def save_as_new_theme(self): + """Prompt for new theme name and create the theme. + + Methods: + get_new_theme_name + create_new + """ + new_theme_name = self.get_new_theme_name('New Theme Name:') + if new_theme_name: + self.create_new(new_theme_name) + + def create_new(self, new_theme_name): + """Create a new custom theme with the given name. + + Create the new theme based on the previously active theme + with the current changes applied. Once it is saved, then + activate the new theme. + + Attributes accessed: + builtin_name + custom_name + + Attributes updated: + customlist + theme_source + + Method: + save_new + set_theme_type + """ + if self.theme_source.get(): + theme_type = 'default' + theme_name = self.builtin_name.get() + else: + theme_type = 'user' + theme_name = self.custom_name.get() + new_theme = idleConf.GetThemeDict(theme_type, theme_name) + # Apply any of the old theme's unsaved changes to the new theme. + if theme_name in changes['highlight']: + theme_changes = changes['highlight'][theme_name] + for element in theme_changes: + new_theme[element] = theme_changes[element] + # Save the new theme. + self.save_new(new_theme_name, new_theme) + # Change GUI over to the new theme. + custom_theme_list = idleConf.GetSectionList('user', 'highlight') + custom_theme_list.sort() + self.customlist.SetMenu(custom_theme_list, new_theme_name) + self.theme_source.set(0) + self.set_theme_type() + + def set_highlight_target(self): + """Set fg/bg toggle and color based on highlight tag target. + + Instance variables accessed: + highlight_target + + Attributes updated: + fg_on + bg_on + fg_bg_toggle + + Methods: + set_color_sample + + Called from: + var_changed_highlight_target + load_theme_cfg + """ + if self.highlight_target.get() == 'Cursor': # bg not possible + self.fg_on.state(('disabled',)) + self.bg_on.state(('disabled',)) + self.fg_bg_toggle.set(1) + else: # Both fg and bg can be set. + self.fg_on.state(('!disabled',)) + self.bg_on.state(('!disabled',)) + self.fg_bg_toggle.set(1) + self.set_color_sample() + + def set_color_sample_binding(self, *args): + """Change color sample based on foreground/background toggle. + + Methods: + set_color_sample + """ + self.set_color_sample() + + def set_color_sample(self): + """Set the color of the frame background to reflect the selected target. + + Instance variables accessed: + theme_elements + highlight_target + fg_bg_toggle + highlight_sample + + Attributes updated: + frame_color_set + """ + # Set the color sample area. + tag = self.theme_elements[self.highlight_target.get()] + plane = 'foreground' if self.fg_bg_toggle.get() else 'background' + color = self.highlight_sample.tag_cget(tag, plane) + self.style.configure('frame_color_set.TFrame', background=color) + + def paint_theme_sample(self): + """Apply the theme colors to each element tag in the sample text. + + Instance attributes accessed: + theme_elements + theme_source + builtin_name + custom_name + + Attributes updated: + highlight_sample: Set the tag elements to the theme. + + Methods: + set_color_sample + + Called from: + var_changed_builtin_name + var_changed_custom_name + load_theme_cfg + """ + if self.theme_source.get(): # Default theme + theme = self.builtin_name.get() + else: # User theme + theme = self.custom_name.get() + for element_title in self.theme_elements: + element = self.theme_elements[element_title] + colors = idleConf.GetHighlight(theme, element) + if element == 'cursor': # Cursor sample needs special painting. + colors['background'] = idleConf.GetHighlight( + theme, 'normal')['background'] + # Handle any unsaved changes to this theme. + if theme in changes['highlight']: + theme_dict = changes['highlight'][theme] + if element + '-foreground' in theme_dict: + colors['foreground'] = theme_dict[element + '-foreground'] + if element + '-background' in theme_dict: + colors['background'] = theme_dict[element + '-background'] + self.highlight_sample.tag_config(element, **colors) + self.set_color_sample() + + def save_new(self, theme_name, theme): + """Save a newly created theme to idleConf. + + theme_name - string, the name of the new theme + theme - dictionary containing the new theme + """ + idleConf.userCfg['highlight'].AddSection(theme_name) + for element in theme: + value = theme[element] + idleConf.userCfg['highlight'].SetOption(theme_name, element, value) + + def askyesno(self, *args, **kwargs): + # Make testing easier. Could change implementation. + return messagebox.askyesno(*args, **kwargs) + + def delete_custom(self): + """Handle event to delete custom theme. + + The current theme is deactivated and the default theme is + activated. The custom theme is permanently removed from + the config file. + + Attributes accessed: + custom_name + + Attributes updated: + custom_theme_on + customlist + theme_source + builtin_name + + Methods: + deactivate_current_config + save_all_changed_extensions + activate_config_changes + set_theme_type + """ + theme_name = self.custom_name.get() + delmsg = 'Are you sure you wish to delete the theme %r ?' + if not self.askyesno( + 'Delete Theme', delmsg % theme_name, parent=self): + return + self.cd.deactivate_current_config() + # Remove theme from changes, config, and file. + changes.delete_section('highlight', theme_name) + # Reload user theme list. + item_list = idleConf.GetSectionList('user', 'highlight') + item_list.sort() + if not item_list: + self.custom_theme_on.state(('disabled',)) + self.customlist.SetMenu(item_list, '- no custom themes -') + else: + self.customlist.SetMenu(item_list, item_list[0]) + # Revert to default theme. + self.theme_source.set(idleConf.defaultCfg['main'].Get('Theme', 'default')) + self.builtin_name.set(idleConf.defaultCfg['main'].Get('Theme', 'name')) + # User can't back out of these changes, they must be applied now. + changes.save_all() + self.extpage.save_all_changed_extensions() + self.cd.activate_config_changes() + self.set_theme_type() + + +class KeysPage(Frame): + + def __init__(self, master, extpage): + super().__init__(master) + self.extpage = extpage + self.cd = master.winfo_toplevel() + self.create_page_keys() + self.load_key_cfg() + + def create_page_keys(self): + """Return frame of widgets for Keys tab. + + Enable users to provisionally change both individual and sets of + keybindings (shortcut keys). Except for features implemented as + extensions, keybindings are stored in complete sets called + keysets. Built-in keysets in idlelib/config-keys.def are fixed + as far as the dialog is concerned. Any keyset can be used as the + base for a new custom keyset, stored in .idlerc/config-keys.cfg. + + Function load_key_cfg() initializes tk variables and keyset + lists and calls load_keys_list for the current keyset. + Radiobuttons builtin_keyset_on and custom_keyset_on toggle var + keyset_source, which controls if the current set of keybindings + are from a builtin or custom keyset. DynOptionMenus builtinlist + and customlist contain lists of the builtin and custom keysets, + respectively, and the current item from each list is stored in + vars builtin_name and custom_name. + + Button delete_custom_keys invokes delete_custom_keys() to delete + a custom keyset from idleConf.userCfg['keys'] and changes. Button + save_custom_keys invokes save_as_new_key_set() which calls + get_new_keys_name() and create_new_key_set() to save a custom keyset + and its keybindings to idleConf.userCfg['keys']. + + Listbox bindingslist contains all of the keybindings for the + selected keyset. The keybindings are loaded in load_keys_list() + and are pairs of (event, [keys]) where keys can be a list + of one or more key combinations to bind to the same event. + Mouse button 1 click invokes on_bindingslist_select(), which + allows button_new_keys to be clicked. + + So, an item is selected in listbindings, which activates + button_new_keys, and clicking button_new_keys calls function + get_new_keys(). Function get_new_keys() gets the key mappings from the + current keyset for the binding event item that was selected. The + function then displays another dialog, GetKeysDialog, with the + selected binding event and current keys and allows new key sequences + to be entered for that binding event. If the keys aren't + changed, nothing happens. If the keys are changed and the keyset + is a builtin, function get_new_keys_name() will be called + for input of a custom keyset name. If no name is given, then the + change to the keybinding will abort and no updates will be made. If + a custom name is entered in the prompt or if the current keyset was + already custom (and thus didn't require a prompt), then + idleConf.userCfg['keys'] is updated in function create_new_key_set() + with the change to the event binding. The item listing in bindingslist + is updated with the new keys. Var keybinding is also set which invokes + the callback function, var_changed_keybinding, to add the change to + the 'keys' or 'extensions' changes tracker based on the binding type. + + Tk Variables: + keybinding: Action/key bindings. + + Methods: + load_keys_list: Reload active set. + create_new_key_set: Combine active keyset and changes. + set_keys_type: Command for keyset_source. + save_new_key_set: Save to idleConf.userCfg['keys'] (is function). + deactivate_current_config: Remove keys bindings in editors. + + Widgets for KeysPage(frame): (*) widgets bound to self + frame_key_sets: LabelFrame + frames[0]: Frame + (*)builtin_keyset_on: Radiobutton - var keyset_source + (*)custom_keyset_on: Radiobutton - var keyset_source + (*)builtinlist: DynOptionMenu - var builtin_name, + func keybinding_selected + (*)customlist: DynOptionMenu - var custom_name, + func keybinding_selected + (*)keys_message: Label + frames[1]: Frame + (*)button_delete_custom_keys: Button - delete_custom_keys + (*)button_save_custom_keys: Button - save_as_new_key_set + frame_custom: LabelFrame + frame_target: Frame + target_title: Label + scroll_target_y: Scrollbar + scroll_target_x: Scrollbar + (*)bindingslist: ListBox - on_bindingslist_select + (*)button_new_keys: Button - get_new_keys & ..._name + """ + self.builtin_name = tracers.add( + StringVar(self), self.var_changed_builtin_name) + self.custom_name = tracers.add( + StringVar(self), self.var_changed_custom_name) + self.keyset_source = tracers.add( + BooleanVar(self), self.var_changed_keyset_source) + self.keybinding = tracers.add( + StringVar(self), self.var_changed_keybinding) + + # Create widgets: + # body and section frames. + frame_custom = LabelFrame( + self, borderwidth=2, relief=GROOVE, + text=' Custom Key Bindings ') + frame_key_sets = LabelFrame( + self, borderwidth=2, relief=GROOVE, text=' Key Set ') + # frame_custom. + frame_target = Frame(frame_custom) + target_title = Label(frame_target, text='Action - Key(s)') + scroll_target_y = Scrollbar(frame_target) + scroll_target_x = Scrollbar(frame_target, orient=HORIZONTAL) + self.bindingslist = Listbox( + frame_target, takefocus=FALSE, exportselection=FALSE) + self.bindingslist.bind('<ButtonRelease-1>', + self.on_bindingslist_select) + scroll_target_y['command'] = self.bindingslist.yview + scroll_target_x['command'] = self.bindingslist.xview + self.bindingslist['yscrollcommand'] = scroll_target_y.set + self.bindingslist['xscrollcommand'] = scroll_target_x.set + self.button_new_keys = Button( + frame_custom, text='Get New Keys for Selection', + command=self.get_new_keys, state='disabled') + # frame_key_sets. + frames = [Frame(frame_key_sets, padding=2, borderwidth=0) + for i in range(2)] + self.builtin_keyset_on = Radiobutton( + frames[0], variable=self.keyset_source, value=1, + command=self.set_keys_type, text='Use a Built-in Key Set') + self.custom_keyset_on = Radiobutton( + frames[0], variable=self.keyset_source, value=0, + command=self.set_keys_type, text='Use a Custom Key Set') + self.builtinlist = DynOptionMenu( + frames[0], self.builtin_name, None, command=None) + self.customlist = DynOptionMenu( + frames[0], self.custom_name, None, command=None) + self.button_delete_custom_keys = Button( + frames[1], text='Delete Custom Key Set', + command=self.delete_custom_keys) + self.button_save_custom_keys = Button( + frames[1], text='Save as New Custom Key Set', + command=self.save_as_new_key_set) + self.keys_message = Label(frames[0], borderwidth=2) + + # Pack widgets: + # body. + frame_custom.pack(side=BOTTOM, padx=5, pady=5, expand=TRUE, fill=BOTH) + frame_key_sets.pack(side=BOTTOM, padx=5, pady=5, fill=BOTH) + # frame_custom. + self.button_new_keys.pack(side=BOTTOM, fill=X, padx=5, pady=5) + frame_target.pack(side=LEFT, padx=5, pady=5, expand=TRUE, fill=BOTH) + # frame_target. + frame_target.columnconfigure(0, weight=1) + frame_target.rowconfigure(1, weight=1) + target_title.grid(row=0, column=0, columnspan=2, sticky=W) + self.bindingslist.grid(row=1, column=0, sticky=NSEW) + scroll_target_y.grid(row=1, column=1, sticky=NS) + scroll_target_x.grid(row=2, column=0, sticky=EW) + # frame_key_sets. + self.builtin_keyset_on.grid(row=0, column=0, sticky=W+NS) + self.custom_keyset_on.grid(row=1, column=0, sticky=W+NS) + self.builtinlist.grid(row=0, column=1, sticky=NSEW) + self.customlist.grid(row=1, column=1, sticky=NSEW) + self.keys_message.grid(row=0, column=2, sticky=NSEW, padx=5, pady=5) + self.button_delete_custom_keys.pack(side=LEFT, fill=X, expand=True, padx=2) + self.button_save_custom_keys.pack(side=LEFT, fill=X, expand=True, padx=2) + frames[0].pack(side=TOP, fill=BOTH, expand=True) + frames[1].pack(side=TOP, fill=X, expand=True, pady=2) + + def load_key_cfg(self): + "Load current configuration settings for the keybinding options." + # Set current keys type radiobutton. + self.keyset_source.set(idleConf.GetOption( + 'main', 'Keys', 'default', type='bool', default=1)) + # Set current keys. + current_option = idleConf.CurrentKeys() + # Load available keyset option menus. + if self.keyset_source.get(): # Default theme selected. + item_list = idleConf.GetSectionList('default', 'keys') + item_list.sort() + self.builtinlist.SetMenu(item_list, current_option) + item_list = idleConf.GetSectionList('user', 'keys') + item_list.sort() + if not item_list: + self.custom_keyset_on.state(('disabled',)) + self.custom_name.set('- no custom keys -') + else: + self.customlist.SetMenu(item_list, item_list[0]) + else: # User key set selected. + item_list = idleConf.GetSectionList('user', 'keys') + item_list.sort() + self.customlist.SetMenu(item_list, current_option) + item_list = idleConf.GetSectionList('default', 'keys') + item_list.sort() + self.builtinlist.SetMenu(item_list, idleConf.default_keys()) + self.set_keys_type() + # Load keyset element list. + keyset_name = idleConf.CurrentKeys() + self.load_keys_list(keyset_name) + + def var_changed_builtin_name(self, *params): + "Process selection of builtin key set." + old_keys = ( + 'IDLE Classic Windows', + 'IDLE Classic Unix', + 'IDLE Classic Mac', + 'IDLE Classic OSX', + ) + value = self.builtin_name.get() + if value not in old_keys: + if idleConf.GetOption('main', 'Keys', 'name') not in old_keys: + changes.add_option('main', 'Keys', 'name', old_keys[0]) + changes.add_option('main', 'Keys', 'name2', value) + self.keys_message['text'] = 'New key set, see Help' + else: + changes.add_option('main', 'Keys', 'name', value) + changes.add_option('main', 'Keys', 'name2', '') + self.keys_message['text'] = '' + self.load_keys_list(value) + + def var_changed_custom_name(self, *params): + "Process selection of custom key set." + value = self.custom_name.get() + if value != '- no custom keys -': + changes.add_option('main', 'Keys', 'name', value) + self.load_keys_list(value) + + def var_changed_keyset_source(self, *params): + "Process toggle between builtin key set and custom key set." + value = self.keyset_source.get() + changes.add_option('main', 'Keys', 'default', value) + if value: + self.var_changed_builtin_name() + else: + self.var_changed_custom_name() + + def var_changed_keybinding(self, *params): + "Store change to a keybinding." + value = self.keybinding.get() + key_set = self.custom_name.get() + event = self.bindingslist.get(ANCHOR).split()[0] + if idleConf.IsCoreBinding(event): + changes.add_option('keys', key_set, event, value) + else: # Event is an extension binding. + ext_name = idleConf.GetExtnNameForEvent(event) + ext_keybind_section = ext_name + '_cfgBindings' + changes.add_option('extensions', ext_keybind_section, event, value) + + def set_keys_type(self): + "Set available screen options based on builtin or custom key set." + if self.keyset_source.get(): + self.builtinlist['state'] = 'normal' + self.customlist['state'] = 'disabled' + self.button_delete_custom_keys.state(('disabled',)) + else: + self.builtinlist['state'] = 'disabled' + self.custom_keyset_on.state(('!disabled',)) + self.customlist['state'] = 'normal' + self.button_delete_custom_keys.state(('!disabled',)) + + def get_new_keys(self): + """Handle event to change key binding for selected line. + + A selection of a key/binding in the list of current + bindings pops up a dialog to enter a new binding. If + the current key set is builtin and a binding has + changed, then a name for a custom key set needs to be + entered for the change to be applied. + """ + list_index = self.bindingslist.index(ANCHOR) + binding = self.bindingslist.get(list_index) + bind_name = binding.split()[0] + if self.keyset_source.get(): + current_key_set_name = self.builtin_name.get() + else: + current_key_set_name = self.custom_name.get() + current_bindings = idleConf.GetCurrentKeySet() + if current_key_set_name in changes['keys']: # unsaved changes + key_set_changes = changes['keys'][current_key_set_name] + for event in key_set_changes: + current_bindings[event] = key_set_changes[event].split() + current_key_sequences = list(current_bindings.values()) + new_keys = GetKeysWindow(self, 'Get New Keys', bind_name, + current_key_sequences).result + if new_keys: + if self.keyset_source.get(): # Current key set is a built-in. + message = ('Your changes will be saved as a new Custom Key Set.' + ' Enter a name for your new Custom Key Set below.') + new_keyset = self.get_new_keys_name(message) + if not new_keyset: # User cancelled custom key set creation. + self.bindingslist.select_set(list_index) + self.bindingslist.select_anchor(list_index) + return + else: # Create new custom key set based on previously active key set. + self.create_new_key_set(new_keyset) + self.bindingslist.delete(list_index) + self.bindingslist.insert(list_index, bind_name+' - '+new_keys) + self.bindingslist.select_set(list_index) + self.bindingslist.select_anchor(list_index) + self.keybinding.set(new_keys) + else: + self.bindingslist.select_set(list_index) + self.bindingslist.select_anchor(list_index) + + def get_new_keys_name(self, message): + "Return new key set name from query popup." + used_names = (idleConf.GetSectionList('user', 'keys') + + idleConf.GetSectionList('default', 'keys')) + new_keyset = SectionName( + self, 'New Custom Key Set', message, used_names).result + return new_keyset + + def save_as_new_key_set(self): + "Prompt for name of new key set and save changes using that name." + new_keys_name = self.get_new_keys_name('New Key Set Name:') + if new_keys_name: + self.create_new_key_set(new_keys_name) + + def on_bindingslist_select(self, event): + "Activate button to assign new keys to selected action." + self.button_new_keys.state(('!disabled',)) + + def create_new_key_set(self, new_key_set_name): + """Create a new custom key set with the given name. + + Copy the bindings/keys from the previously active keyset + to the new keyset and activate the new custom keyset. + """ + if self.keyset_source.get(): + prev_key_set_name = self.builtin_name.get() + else: + prev_key_set_name = self.custom_name.get() + prev_keys = idleConf.GetCoreKeys(prev_key_set_name) + new_keys = {} + for event in prev_keys: # Add key set to changed items. + event_name = event[2:-2] # Trim off the angle brackets. + binding = ' '.join(prev_keys[event]) + new_keys[event_name] = binding + # Handle any unsaved changes to prev key set. + if prev_key_set_name in changes['keys']: + key_set_changes = changes['keys'][prev_key_set_name] + for event in key_set_changes: + new_keys[event] = key_set_changes[event] + # Save the new key set. + self.save_new_key_set(new_key_set_name, new_keys) + # Change GUI over to the new key set. + custom_key_list = idleConf.GetSectionList('user', 'keys') + custom_key_list.sort() + self.customlist.SetMenu(custom_key_list, new_key_set_name) + self.keyset_source.set(0) + self.set_keys_type() + + def load_keys_list(self, keyset_name): + """Reload the list of action/key binding pairs for the active key set. + + An action/key binding can be selected to change the key binding. + """ + reselect = False + if self.bindingslist.curselection(): + reselect = True + list_index = self.bindingslist.index(ANCHOR) + keyset = idleConf.GetKeySet(keyset_name) + # 'set' is dict mapping virtual event to list of key events. + bind_names = list(keyset) + bind_names.sort() + self.bindingslist.delete(0, END) + for bind_name in bind_names: + key = ' '.join(keyset[bind_name]) + bind_name = bind_name[2:-2] # Trim double angle brackets. + if keyset_name in changes['keys']: + # Handle any unsaved changes to this key set. + if bind_name in changes['keys'][keyset_name]: + key = changes['keys'][keyset_name][bind_name] + self.bindingslist.insert(END, bind_name+' - '+key) + if reselect: + self.bindingslist.see(list_index) + self.bindingslist.select_set(list_index) + self.bindingslist.select_anchor(list_index) + + @staticmethod + def save_new_key_set(keyset_name, keyset): + """Save a newly created core key set. + + Add keyset to idleConf.userCfg['keys'], not to disk. + If the keyset doesn't exist, it is created. The + binding/keys are taken from the keyset argument. + + keyset_name - string, the name of the new key set + keyset - dictionary containing the new keybindings + """ + idleConf.userCfg['keys'].AddSection(keyset_name) + for event in keyset: + value = keyset[event] + idleConf.userCfg['keys'].SetOption(keyset_name, event, value) + + def askyesno(self, *args, **kwargs): + # Make testing easier. Could change implementation. + return messagebox.askyesno(*args, **kwargs) + + def delete_custom_keys(self): + """Handle event to delete a custom key set. + + Applying the delete deactivates the current configuration and + reverts to the default. The custom key set is permanently + deleted from the config file. + """ + keyset_name = self.custom_name.get() + delmsg = 'Are you sure you wish to delete the key set %r ?' + if not self.askyesno( + 'Delete Key Set', delmsg % keyset_name, parent=self): + return + self.cd.deactivate_current_config() + # Remove key set from changes, config, and file. + changes.delete_section('keys', keyset_name) + # Reload user key set list. + item_list = idleConf.GetSectionList('user', 'keys') + item_list.sort() + if not item_list: + self.custom_keyset_on.state(('disabled',)) + self.customlist.SetMenu(item_list, '- no custom keys -') + else: + self.customlist.SetMenu(item_list, item_list[0]) + # Revert to default key set. + self.keyset_source.set(idleConf.defaultCfg['main'] + .Get('Keys', 'default')) + self.builtin_name.set(idleConf.defaultCfg['main'].Get('Keys', 'name') + or idleConf.default_keys()) + # User can't back out of these changes, they must be applied now. + changes.save_all() + self.extpage.save_all_changed_extensions() + self.cd.activate_config_changes() + self.set_keys_type() + + +class WinPage(Frame): + + def __init__(self, master): + super().__init__(master) + + self.init_validators() + self.create_page_windows() + self.load_windows_cfg() + + def init_validators(self): + digits_or_empty_re = re.compile(r'[0-9]*') + def is_digits_or_empty(s): + "Return 's is blank or contains only digits'" + return digits_or_empty_re.fullmatch(s) is not None + self.digits_only = (self.register(is_digits_or_empty), '%P',) + + def create_page_windows(self): + """Return frame of widgets for Windows tab. + + Enable users to provisionally change general window options. + Function load_windows_cfg initializes tk variable idleConf. + Radiobuttons startup_shell_on and startup_editor_on set var + startup_edit. Entry boxes win_width_int and win_height_int set var + win_width and win_height. Setting var_name invokes the default + callback that adds option to changes. + + Widgets for WinPage(Frame): > vars, bound to self + frame_window: LabelFrame + frame_run: Frame + startup_title: Label + startup_editor_on: Radiobutton > startup_edit + startup_shell_on: Radiobutton > startup_edit + frame_win_size: Frame + win_size_title: Label + win_width_title: Label + win_width_int: Entry > win_width + win_height_title: Label + win_height_int: Entry > win_height + frame_cursor: Frame + indent_title: Label + indent_chooser: Spinbox > indent_spaces + blink_on: Checkbutton > cursor_blink + frame_autocomplete: Frame + auto_wait_title: Label + auto_wait_int: Entry > autocomplete_wait + frame_paren1: Frame + paren_style_title: Label + paren_style_type: OptionMenu > paren_style + frame_paren2: Frame + paren_time_title: Label + paren_flash_time: Entry > flash_delay + bell_on: Checkbutton > paren_bell + frame_format: Frame + format_width_title: Label + format_width_int: Entry > format_width + """ + # Integer values need StringVar because int('') raises. + self.startup_edit = tracers.add( + IntVar(self), ('main', 'General', 'editor-on-startup')) + self.win_width = tracers.add( + StringVar(self), ('main', 'EditorWindow', 'width')) + self.win_height = tracers.add( + StringVar(self), ('main', 'EditorWindow', 'height')) + self.indent_spaces = tracers.add( + StringVar(self), ('main', 'Indent', 'num-spaces')) + self.cursor_blink = tracers.add( + BooleanVar(self), ('main', 'EditorWindow', 'cursor-blink')) + self.autocomplete_wait = tracers.add( + StringVar(self), ('extensions', 'AutoComplete', 'popupwait')) + self.paren_style = tracers.add( + StringVar(self), ('extensions', 'ParenMatch', 'style')) + self.flash_delay = tracers.add( + StringVar(self), ('extensions', 'ParenMatch', 'flash-delay')) + self.paren_bell = tracers.add( + BooleanVar(self), ('extensions', 'ParenMatch', 'bell')) + self.format_width = tracers.add( + StringVar(self), ('extensions', 'FormatParagraph', 'max-width')) + + # Create widgets: + frame_window = LabelFrame(self, borderwidth=2, relief=GROOVE, + text=' Window Preferences') + + frame_run = Frame(frame_window, borderwidth=0) + startup_title = Label(frame_run, text='At Startup') + self.startup_editor_on = Radiobutton( + frame_run, variable=self.startup_edit, value=1, + text="Open Edit Window") + self.startup_shell_on = Radiobutton( + frame_run, variable=self.startup_edit, value=0, + text='Open Shell Window') + + frame_win_size = Frame(frame_window, borderwidth=0) + win_size_title = Label( + frame_win_size, text='Initial Window Size (in characters)') + win_width_title = Label(frame_win_size, text='Width') + self.win_width_int = Entry( + frame_win_size, textvariable=self.win_width, width=3, + validatecommand=self.digits_only, validate='key', + ) + win_height_title = Label(frame_win_size, text='Height') + self.win_height_int = Entry( + frame_win_size, textvariable=self.win_height, width=3, + validatecommand=self.digits_only, validate='key', + ) + + frame_cursor = Frame(frame_window, borderwidth=0) + indent_title = Label(frame_cursor, + text='Indent spaces (4 is standard)') + try: + self.indent_chooser = Spinbox( + frame_cursor, textvariable=self.indent_spaces, + from_=1, to=10, width=2, + validatecommand=self.digits_only, validate='key') + except TclError: + self.indent_chooser = Combobox( + frame_cursor, textvariable=self.indent_spaces, + state="readonly", values=list(range(1,11)), width=3) + cursor_blink_title = Label(frame_cursor, text='Cursor Blink') + self.cursor_blink_bool = Checkbutton(frame_cursor, text="Cursor blink", + variable=self.cursor_blink) + + frame_autocomplete = Frame(frame_window, borderwidth=0,) + auto_wait_title = Label(frame_autocomplete, + text='Completions Popup Wait (milliseconds)') + self.auto_wait_int = Entry( + frame_autocomplete, textvariable=self.autocomplete_wait, + width=6, validatecommand=self.digits_only, validate='key') + + frame_paren1 = Frame(frame_window, borderwidth=0) + paren_style_title = Label(frame_paren1, text='Paren Match Style') + self.paren_style_type = OptionMenu( + frame_paren1, self.paren_style, 'expression', + "opener","parens","expression") + frame_paren2 = Frame(frame_window, borderwidth=0) + paren_time_title = Label( + frame_paren2, text='Time Match Displayed (milliseconds)\n' + '(0 is until next input)') + self.paren_flash_time = Entry( + frame_paren2, textvariable=self.flash_delay, width=6, + validatecommand=self.digits_only, validate='key') + self.bell_on = Checkbutton( + frame_paren2, text="Bell on Mismatch", variable=self.paren_bell) + frame_format = Frame(frame_window, borderwidth=0) + format_width_title = Label(frame_format, + text='Format Paragraph Max Width') + self.format_width_int = Entry( + frame_format, textvariable=self.format_width, width=4, + validatecommand=self.digits_only, validate='key', + ) + + # Pack widgets: + frame_window.pack(side=TOP, padx=5, pady=5, expand=TRUE, fill=BOTH) + # frame_run. + frame_run.pack(side=TOP, padx=5, pady=0, fill=X) + startup_title.pack(side=LEFT, anchor=W, padx=5, pady=5) + self.startup_shell_on.pack(side=RIGHT, anchor=W, padx=5, pady=5) + self.startup_editor_on.pack(side=RIGHT, anchor=W, padx=5, pady=5) + # frame_win_size. + frame_win_size.pack(side=TOP, padx=5, pady=0, fill=X) + win_size_title.pack(side=LEFT, anchor=W, padx=5, pady=5) + self.win_height_int.pack(side=RIGHT, anchor=E, padx=10, pady=5) + win_height_title.pack(side=RIGHT, anchor=E, pady=5) + self.win_width_int.pack(side=RIGHT, anchor=E, padx=10, pady=5) + win_width_title.pack(side=RIGHT, anchor=E, pady=5) + # frame_cursor. + frame_cursor.pack(side=TOP, padx=5, pady=0, fill=X) + indent_title.pack(side=LEFT, anchor=W, padx=5) + self.indent_chooser.pack(side=LEFT, anchor=W, padx=10) + self.cursor_blink_bool.pack(side=RIGHT, anchor=E, padx=15, pady=5) + # frame_autocomplete. + frame_autocomplete.pack(side=TOP, padx=5, pady=0, fill=X) + auto_wait_title.pack(side=LEFT, anchor=W, padx=5, pady=5) + self.auto_wait_int.pack(side=TOP, padx=10, pady=5) + # frame_paren. + frame_paren1.pack(side=TOP, padx=5, pady=0, fill=X) + paren_style_title.pack(side=LEFT, anchor=W, padx=5, pady=5) + self.paren_style_type.pack(side=TOP, padx=10, pady=5) + frame_paren2.pack(side=TOP, padx=5, pady=0, fill=X) + paren_time_title.pack(side=LEFT, anchor=W, padx=5) + self.bell_on.pack(side=RIGHT, anchor=E, padx=15, pady=5) + self.paren_flash_time.pack(side=TOP, anchor=W, padx=15, pady=5) + # frame_format. + frame_format.pack(side=TOP, padx=5, pady=0, fill=X) + format_width_title.pack(side=LEFT, anchor=W, padx=5, pady=5) + self.format_width_int.pack(side=TOP, padx=10, pady=5) + + def load_windows_cfg(self): + # Set variables for all windows. + self.startup_edit.set(idleConf.GetOption( + 'main', 'General', 'editor-on-startup', type='bool')) + self.win_width.set(idleConf.GetOption( + 'main', 'EditorWindow', 'width', type='int')) + self.win_height.set(idleConf.GetOption( + 'main', 'EditorWindow', 'height', type='int')) + self.indent_spaces.set(idleConf.GetOption( + 'main', 'Indent', 'num-spaces', type='int')) + self.cursor_blink.set(idleConf.GetOption( + 'main', 'EditorWindow', 'cursor-blink', type='bool')) + self.autocomplete_wait.set(idleConf.GetOption( + 'extensions', 'AutoComplete', 'popupwait', type='int')) + self.paren_style.set(idleConf.GetOption( + 'extensions', 'ParenMatch', 'style')) + self.flash_delay.set(idleConf.GetOption( + 'extensions', 'ParenMatch', 'flash-delay', type='int')) + self.paren_bell.set(idleConf.GetOption( + 'extensions', 'ParenMatch', 'bell')) + self.format_width.set(idleConf.GetOption( + 'extensions', 'FormatParagraph', 'max-width', type='int')) + + +class ShedPage(Frame): + + def __init__(self, master): + super().__init__(master) + + self.init_validators() + self.create_page_shed() + self.load_shelled_cfg() + + def init_validators(self): + digits_or_empty_re = re.compile(r'[0-9]*') + def is_digits_or_empty(s): + "Return 's is blank or contains only digits'" + return digits_or_empty_re.fullmatch(s) is not None + self.digits_only = (self.register(is_digits_or_empty), '%P',) + + def create_page_shed(self): + """Return frame of widgets for Shell/Ed tab. + + Enable users to provisionally change shell and editor options. + Function load_shed_cfg initializes tk variables using idleConf. + Entry box auto_squeeze_min_lines_int sets + auto_squeeze_min_lines_int. Setting var_name invokes the + default callback that adds option to changes. + + Widgets for ShedPage(Frame): (*) widgets bound to self + frame_shell: LabelFrame + frame_auto_squeeze_min_lines: Frame + auto_squeeze_min_lines_title: Label + (*)auto_squeeze_min_lines_int: Entry - + auto_squeeze_min_lines + frame_editor: LabelFrame + frame_save: Frame + run_save_title: Label + (*)save_ask_on: Radiobutton - autosave + (*)save_auto_on: Radiobutton - autosave + frame_format: Frame + format_width_title: Label + (*)format_width_int: Entry - format_width + frame_line_numbers_default: Frame + line_numbers_default_title: Label + (*)line_numbers_default_bool: Checkbutton - line_numbers_default + frame_context: Frame + context_title: Label + (*)context_int: Entry - context_lines + """ + # Integer values need StringVar because int('') raises. + self.auto_squeeze_min_lines = tracers.add( + StringVar(self), ('main', 'PyShell', 'auto-squeeze-min-lines')) + + self.autosave = tracers.add( + IntVar(self), ('main', 'General', 'autosave')) + self.line_numbers_default = tracers.add( + BooleanVar(self), + ('main', 'EditorWindow', 'line-numbers-default')) + self.context_lines = tracers.add( + StringVar(self), ('extensions', 'CodeContext', 'maxlines')) + + # Create widgets: + frame_shell = LabelFrame(self, borderwidth=2, relief=GROOVE, + text=' Shell Preferences') + frame_editor = LabelFrame(self, borderwidth=2, relief=GROOVE, + text=' Editor Preferences') + # Frame_shell. + frame_auto_squeeze_min_lines = Frame(frame_shell, borderwidth=0) + auto_squeeze_min_lines_title = Label(frame_auto_squeeze_min_lines, + text='Auto-Squeeze Min. Lines:') + self.auto_squeeze_min_lines_int = Entry( + frame_auto_squeeze_min_lines, width=4, + textvariable=self.auto_squeeze_min_lines, + validatecommand=self.digits_only, validate='key', + ) + # Frame_editor. + frame_save = Frame(frame_editor, borderwidth=0) + run_save_title = Label(frame_save, text='At Start of Run (F5) ') + + self.save_ask_on = Radiobutton( + frame_save, variable=self.autosave, value=0, + text="Prompt to Save") + self.save_auto_on = Radiobutton( + frame_save, variable=self.autosave, value=1, + text='No Prompt') + + frame_line_numbers_default = Frame(frame_editor, borderwidth=0) + line_numbers_default_title = Label( + frame_line_numbers_default, text='Show line numbers in new windows') + self.line_numbers_default_bool = Checkbutton( + frame_line_numbers_default, + variable=self.line_numbers_default, + width=1) + + frame_context = Frame(frame_editor, borderwidth=0) + context_title = Label(frame_context, text='Max Context Lines :') + self.context_int = Entry( + frame_context, textvariable=self.context_lines, width=3, + validatecommand=self.digits_only, validate='key', + ) + + # Pack widgets: + frame_shell.pack(side=TOP, padx=5, pady=5, fill=BOTH) + Label(self).pack() # Spacer -- better solution? + frame_editor.pack(side=TOP, padx=5, pady=5, fill=BOTH) + # frame_auto_squeeze_min_lines + frame_auto_squeeze_min_lines.pack(side=TOP, padx=5, pady=0, fill=X) + auto_squeeze_min_lines_title.pack(side=LEFT, anchor=W, padx=5, pady=5) + self.auto_squeeze_min_lines_int.pack(side=TOP, padx=5, pady=5) + # frame_save. + frame_save.pack(side=TOP, padx=5, pady=0, fill=X) + run_save_title.pack(side=LEFT, anchor=W, padx=5, pady=5) + self.save_auto_on.pack(side=RIGHT, anchor=W, padx=5, pady=5) + self.save_ask_on.pack(side=RIGHT, anchor=W, padx=5, pady=5) + # frame_line_numbers_default. + frame_line_numbers_default.pack(side=TOP, padx=5, pady=0, fill=X) + line_numbers_default_title.pack(side=LEFT, anchor=W, padx=5, pady=5) + self.line_numbers_default_bool.pack(side=LEFT, padx=5, pady=5) + # frame_context. + frame_context.pack(side=TOP, padx=5, pady=0, fill=X) + context_title.pack(side=LEFT, anchor=W, padx=5, pady=5) + self.context_int.pack(side=TOP, padx=5, pady=5) + + def load_shelled_cfg(self): + # Set variables for shell windows. + self.auto_squeeze_min_lines.set(idleConf.GetOption( + 'main', 'PyShell', 'auto-squeeze-min-lines', type='int')) + # Set variables for editor windows. + self.autosave.set(idleConf.GetOption( + 'main', 'General', 'autosave', default=0, type='bool')) + self.line_numbers_default.set(idleConf.GetOption( + 'main', 'EditorWindow', 'line-numbers-default', type='bool')) + self.context_lines.set(idleConf.GetOption( + 'extensions', 'CodeContext', 'maxlines', type='int')) + + +class ExtPage(Frame): + def __init__(self, master): + super().__init__(master) + self.ext_defaultCfg = idleConf.defaultCfg['extensions'] + self.ext_userCfg = idleConf.userCfg['extensions'] + self.is_int = self.register(is_int) + self.load_extensions() + self.create_page_extensions() # Requires extension names. + + def create_page_extensions(self): + """Configure IDLE feature extensions and help menu extensions. + + List the feature extensions and a configuration box for the + selected extension. Help menu extensions are in a HelpFrame. + + This code reads the current configuration using idleConf, + supplies a GUI interface to change the configuration values, + and saves the changes using idleConf. + + Some changes may require restarting IDLE. This depends on each + extension's implementation. + + All values are treated as text, and it is up to the user to + supply reasonable values. The only exception to this are the + 'enable*' options, which are boolean, and can be toggled with a + True/False button. + + Methods: + extension_selected: Handle selection from list. + create_extension_frame: Hold widgets for one extension. + set_extension_value: Set in userCfg['extensions']. + save_all_changed_extensions: Call extension page Save(). + """ + self.extension_names = StringVar(self) + + frame_ext = LabelFrame(self, borderwidth=2, relief=GROOVE, + text=' Feature Extensions ') + self.frame_help = HelpFrame(self, borderwidth=2, relief=GROOVE, + text=' Help Menu Extensions ') + + frame_ext.rowconfigure(0, weight=1) + frame_ext.columnconfigure(2, weight=1) + self.extension_list = Listbox(frame_ext, listvariable=self.extension_names, + selectmode='browse') + self.extension_list.bind('<<ListboxSelect>>', self.extension_selected) + scroll = Scrollbar(frame_ext, command=self.extension_list.yview) + self.extension_list.yscrollcommand=scroll.set + self.details_frame = LabelFrame(frame_ext, width=250, height=250) + self.extension_list.grid(column=0, row=0, sticky='nws') + scroll.grid(column=1, row=0, sticky='ns') + self.details_frame.grid(column=2, row=0, sticky='nsew', padx=[10, 0]) + frame_ext.configure(padding=10) + self.config_frame = {} + self.current_extension = None + + self.outerframe = self # TEMPORARY + self.tabbed_page_set = self.extension_list # TEMPORARY + + # Create the frame holding controls for each extension. + ext_names = '' + for ext_name in sorted(self.extensions): + self.create_extension_frame(ext_name) + ext_names = ext_names + '{' + ext_name + '} ' + self.extension_names.set(ext_names) + self.extension_list.selection_set(0) + self.extension_selected(None) + + + frame_ext.grid(row=0, column=0, sticky='nsew') + Label(self).grid(row=1, column=0) # Spacer. Replace with config? + self.frame_help.grid(row=2, column=0, sticky='sew') + + def load_extensions(self): + "Fill self.extensions with data from the default and user configs." + self.extensions = {} + for ext_name in idleConf.GetExtensions(active_only=False): + # Former built-in extensions are already filtered out. + self.extensions[ext_name] = [] + + for ext_name in self.extensions: + opt_list = sorted(self.ext_defaultCfg.GetOptionList(ext_name)) + + # Bring 'enable' options to the beginning of the list. + enables = [opt_name for opt_name in opt_list + if opt_name.startswith('enable')] + for opt_name in enables: + opt_list.remove(opt_name) + opt_list = enables + opt_list + + for opt_name in opt_list: + def_str = self.ext_defaultCfg.Get( + ext_name, opt_name, raw=True) + try: + def_obj = {'True':True, 'False':False}[def_str] + opt_type = 'bool' + except KeyError: + try: + def_obj = int(def_str) + opt_type = 'int' + except ValueError: + def_obj = def_str + opt_type = None + try: + value = self.ext_userCfg.Get( + ext_name, opt_name, type=opt_type, raw=True, + default=def_obj) + except ValueError: # Need this until .Get fixed. + value = def_obj # Bad values overwritten by entry. + var = StringVar(self) + var.set(str(value)) + + self.extensions[ext_name].append({'name': opt_name, + 'type': opt_type, + 'default': def_str, + 'value': value, + 'var': var, + }) + + def extension_selected(self, event): + "Handle selection of an extension from the list." + newsel = self.extension_list.curselection() + if newsel: + newsel = self.extension_list.get(newsel) + if newsel is None or newsel != self.current_extension: + if self.current_extension: + self.details_frame.config(text='') + self.config_frame[self.current_extension].grid_forget() + self.current_extension = None + if newsel: + self.details_frame.config(text=newsel) + self.config_frame[newsel].grid(column=0, row=0, sticky='nsew') + self.current_extension = newsel + + def create_extension_frame(self, ext_name): + """Create a frame holding the widgets to configure one extension""" + f = VerticalScrolledFrame(self.details_frame, height=250, width=250) + self.config_frame[ext_name] = f + entry_area = f.interior + # Create an entry for each configuration option. + for row, opt in enumerate(self.extensions[ext_name]): + # Create a row with a label and entry/checkbutton. + label = Label(entry_area, text=opt['name']) + label.grid(row=row, column=0, sticky=NW) + var = opt['var'] + if opt['type'] == 'bool': + Checkbutton(entry_area, variable=var, + onvalue='True', offvalue='False', width=8 + ).grid(row=row, column=1, sticky=W, padx=7) + elif opt['type'] == 'int': + Entry(entry_area, textvariable=var, validate='key', + validatecommand=(self.is_int, '%P'), width=10 + ).grid(row=row, column=1, sticky=NSEW, padx=7) + + else: # type == 'str' + # Limit size to fit non-expanding space with larger font. + Entry(entry_area, textvariable=var, width=15 + ).grid(row=row, column=1, sticky=NSEW, padx=7) + return + + def set_extension_value(self, section, opt): + """Return True if the configuration was added or changed. + + If the value is the same as the default, then remove it + from user config file. + """ + name = opt['name'] + default = opt['default'] + value = opt['var'].get().strip() or default + opt['var'].set(value) + # if self.defaultCfg.has_section(section): + # Currently, always true; if not, indent to return. + if (value == default): + return self.ext_userCfg.RemoveOption(section, name) + # Set the option. + return self.ext_userCfg.SetOption(section, name, value) + + def save_all_changed_extensions(self): + """Save configuration changes to the user config file. + + Attributes accessed: + extensions + + Methods: + set_extension_value + """ + has_changes = False + for ext_name in self.extensions: + options = self.extensions[ext_name] + for opt in options: + if self.set_extension_value(ext_name, opt): + has_changes = True + if has_changes: + self.ext_userCfg.Save() + + +class HelpFrame(LabelFrame): + + def __init__(self, master, **cfg): + super().__init__(master, **cfg) + self.create_frame_help() + self.load_helplist() + + def create_frame_help(self): + """Create LabelFrame for additional help menu sources. + + load_helplist loads list user_helplist with + name, position pairs and copies names to listbox helplist. + Clicking a name invokes help_source selected. Clicking + button_helplist_name invokes helplist_item_name, which also + changes user_helplist. These functions all call + set_add_delete_state. All but load call update_help_changes to + rewrite changes['main']['HelpFiles']. + + Widgets for HelpFrame(LabelFrame): (*) widgets bound to self + frame_helplist: Frame + (*)helplist: ListBox + scroll_helplist: Scrollbar + frame_buttons: Frame + (*)button_helplist_edit + (*)button_helplist_add + (*)button_helplist_remove + """ + # self = frame_help in dialog (until ExtPage class). + frame_helplist = Frame(self) + self.helplist = Listbox( + frame_helplist, height=5, takefocus=True, + exportselection=FALSE) + scroll_helplist = Scrollbar(frame_helplist) + scroll_helplist['command'] = self.helplist.yview + self.helplist['yscrollcommand'] = scroll_helplist.set + self.helplist.bind('<ButtonRelease-1>', self.help_source_selected) + + frame_buttons = Frame(self) + self.button_helplist_edit = Button( + frame_buttons, text='Edit', state='disabled', + width=8, command=self.helplist_item_edit) + self.button_helplist_add = Button( + frame_buttons, text='Add', + width=8, command=self.helplist_item_add) + self.button_helplist_remove = Button( + frame_buttons, text='Remove', state='disabled', + width=8, command=self.helplist_item_remove) + + # Pack frame_help. + frame_helplist.pack(side=LEFT, padx=5, pady=5, expand=TRUE, fill=BOTH) + self.helplist.pack(side=LEFT, anchor=E, expand=TRUE, fill=BOTH) + scroll_helplist.pack(side=RIGHT, anchor=W, fill=Y) + frame_buttons.pack(side=RIGHT, padx=5, pady=5, fill=Y) + self.button_helplist_edit.pack(side=TOP, anchor=W, pady=5) + self.button_helplist_add.pack(side=TOP, anchor=W) + self.button_helplist_remove.pack(side=TOP, anchor=W, pady=5) + + def help_source_selected(self, event): + "Handle event for selecting additional help." + self.set_add_delete_state() + + def set_add_delete_state(self): + "Toggle the state for the help list buttons based on list entries." + if self.helplist.size() < 1: # No entries in list. + self.button_helplist_edit.state(('disabled',)) + self.button_helplist_remove.state(('disabled',)) + else: # Some entries. + if self.helplist.curselection(): # There currently is a selection. + self.button_helplist_edit.state(('!disabled',)) + self.button_helplist_remove.state(('!disabled',)) + else: # There currently is not a selection. + self.button_helplist_edit.state(('disabled',)) + self.button_helplist_remove.state(('disabled',)) + + def helplist_item_add(self): + """Handle add button for the help list. + + Query for name and location of new help sources and add + them to the list. + """ + help_source = HelpSource(self, 'New Help Source').result + if help_source: + self.user_helplist.append(help_source) + self.helplist.insert(END, help_source[0]) + self.update_help_changes() + + def helplist_item_edit(self): + """Handle edit button for the help list. + + Query with existing help source information and update + config if the values are changed. + """ + item_index = self.helplist.index(ANCHOR) + help_source = self.user_helplist[item_index] + new_help_source = HelpSource( + self, 'Edit Help Source', + menuitem=help_source[0], + filepath=help_source[1], + ).result + if new_help_source and new_help_source != help_source: + self.user_helplist[item_index] = new_help_source + self.helplist.delete(item_index) + self.helplist.insert(item_index, new_help_source[0]) + self.update_help_changes() + self.set_add_delete_state() # Selected will be un-selected + + def helplist_item_remove(self): + """Handle remove button for the help list. + + Delete the help list item from config. + """ + item_index = self.helplist.index(ANCHOR) + del(self.user_helplist[item_index]) + self.helplist.delete(item_index) + self.update_help_changes() + self.set_add_delete_state() + + def update_help_changes(self): + "Clear and rebuild the HelpFiles section in changes" + changes['main']['HelpFiles'] = {} + for num in range(1, len(self.user_helplist) + 1): + changes.add_option( + 'main', 'HelpFiles', str(num), + ';'.join(self.user_helplist[num-1][:2])) + + def load_helplist(self): + # Set additional help sources. + self.user_helplist = idleConf.GetAllExtraHelpSourcesList() + self.helplist.delete(0, 'end') + for help_item in self.user_helplist: + self.helplist.insert(END, help_item[0]) + self.set_add_delete_state() + + +class VarTrace: + """Maintain Tk variables trace state.""" + + def __init__(self): + """Store Tk variables and callbacks. + + untraced: List of tuples (var, callback) + that do not have the callback attached + to the Tk var. + traced: List of tuples (var, callback) where + that callback has been attached to the var. + """ + self.untraced = [] + self.traced = [] + + def clear(self): + "Clear lists (for tests)." + # Call after all tests in a module to avoid memory leaks. + self.untraced.clear() + self.traced.clear() + + def add(self, var, callback): + """Add (var, callback) tuple to untraced list. + + Args: + var: Tk variable instance. + callback: Either function name to be used as a callback + or a tuple with IdleConf config-type, section, and + option names used in the default callback. + + Return: + Tk variable instance. + """ + if isinstance(callback, tuple): + callback = self.make_callback(var, callback) + self.untraced.append((var, callback)) + return var + + @staticmethod + def make_callback(var, config): + "Return default callback function to add values to changes instance." + def default_callback(*params): + "Add config values to changes instance." + changes.add_option(*config, var.get()) + return default_callback + + def attach(self): + "Attach callback to all vars that are not traced." + while self.untraced: + var, callback = self.untraced.pop() + var.trace_add('write', callback) + self.traced.append((var, callback)) + + def detach(self): + "Remove callback from traced vars." + while self.traced: + var, callback = self.traced.pop() + var.trace_remove('write', var.trace_info()[0][1]) + self.untraced.append((var, callback)) + + +tracers = VarTrace() + +help_common = '''\ +When you click either the Apply or Ok buttons, settings in this +dialog that are different from IDLE's default are saved in +a .idlerc directory in your home directory. Except as noted, +these changes apply to all versions of IDLE installed on this +machine. [Cancel] only cancels changes made since the last save. +''' +help_pages = { + 'Fonts/Tabs':''' +Font sample: This shows what a selection of Basic Multilingual Plane +unicode characters look like for the current font selection. If the +selected font does not define a character, Tk attempts to find another +font that does. Substitute glyphs depend on what is available on a +particular system and will not necessarily have the same size as the +font selected. Line contains 20 characters up to Devanagari, 14 for +Tamil, and 10 for East Asia. + +Hebrew and Arabic letters should display right to left, starting with +alef, \u05d0 and \u0627. Arabic digits display left to right. The +Devanagari and Tamil lines start with digits. The East Asian lines +are Chinese digits, Chinese Hanzi, Korean Hangul, and Japanese +Hiragana and Katakana. + +You can edit the font sample. Changes remain until IDLE is closed. +''', + 'Highlights': ''' +Highlighting: +The IDLE Dark color theme is new in October 2015. It can only +be used with older IDLE releases if it is saved as a custom +theme, with a different name. +''', + 'Keys': ''' +Keys: +The IDLE Modern Unix key set is new in June 2016. It can only +be used with older IDLE releases if it is saved as a custom +key set, with a different name. +''', + 'General': ''' +General: + +AutoComplete: Popupwait is milliseconds to wait after key char, without +cursor movement, before popping up completion box. Key char is '.' after +identifier or a '/' (or '\\' on Windows) within a string. + +FormatParagraph: Max-width is max chars in lines after re-formatting. +Use with paragraphs in both strings and comment blocks. + +ParenMatch: Style indicates what is highlighted when closer is entered: +'opener' - opener '({[' corresponding to closer; 'parens' - both chars; +'expression' (default) - also everything in between. Flash-delay is how +long to highlight if cursor is not moved (0 means forever). + +CodeContext: Maxlines is the maximum number of code context lines to +display when Code Context is turned on for an editor window. + +Shell Preferences: Auto-Squeeze Min. Lines is the minimum number of lines +of output to automatically "squeeze". +''', + 'Extensions': ''' +ZzDummy: This extension is provided as an example for how to create and +use an extension. Enable indicates whether the extension is active or +not; likewise enable_editor and enable_shell indicate which windows it +will be active on. For this extension, z-text is the text that will be +inserted at or removed from the beginning of the lines of selected text, +or the current line if no selection. +''', +} + + +def is_int(s): + "Return 's is blank or represents an int'" + if not s: + return True + try: + int(s) + return True + except ValueError: + return False + + +class VerticalScrolledFrame(Frame): + """A pure Tkinter vertically scrollable frame. + + * Use the 'interior' attribute to place widgets inside the scrollable frame + * Construct and pack/place/grid normally + * This frame only allows vertical scrolling + """ + def __init__(self, parent, *args, **kw): + Frame.__init__(self, parent, *args, **kw) + + # Create a canvas object and a vertical scrollbar for scrolling it. + vscrollbar = Scrollbar(self, orient=VERTICAL) + vscrollbar.pack(fill=Y, side=RIGHT, expand=FALSE) + canvas = Canvas(self, borderwidth=0, highlightthickness=0, + yscrollcommand=vscrollbar.set, width=240) + canvas.pack(side=LEFT, fill=BOTH, expand=TRUE) + vscrollbar.config(command=canvas.yview) + + # Reset the view. + canvas.xview_moveto(0) + canvas.yview_moveto(0) + + # Create a frame inside the canvas which will be scrolled with it. + self.interior = interior = Frame(canvas) + interior_id = canvas.create_window(0, 0, window=interior, anchor=NW) + + # Track changes to the canvas and frame width and sync them, + # also updating the scrollbar. + def _configure_interior(event): + # Update the scrollbars to match the size of the inner frame. + size = (interior.winfo_reqwidth(), interior.winfo_reqheight()) + canvas.config(scrollregion="0 0 %s %s" % size) + interior.bind('<Configure>', _configure_interior) + + def _configure_canvas(event): + if interior.winfo_reqwidth() != canvas.winfo_width(): + # Update the inner frame's width to fill the canvas. + canvas.itemconfigure(interior_id, width=canvas.winfo_width()) + canvas.bind('<Configure>', _configure_canvas) + + return + + +if __name__ == '__main__': + from unittest import main + main('idlelib.idle_test.test_configdialog', verbosity=2, exit=False) + + from idlelib.idle_test.htest import run + run(ConfigDialog) diff --git a/Lib/idlelib/debugger.py b/Lib/idlelib/debugger.py new file mode 100644 index 000000000..1fae1d4b0 --- /dev/null +++ b/Lib/idlelib/debugger.py @@ -0,0 +1,602 @@ +"""Debug user code with a GUI interface to a subclass of bdb.Bdb. + +The Idb instance 'idb' and Debugger instance 'gui' need references to each +other or to an rpc proxy for each other. + +If IDLE is started with '-n', so that user code and idb both run in the +IDLE process, Debugger is called without an idb. Debugger.__init__ +calls Idb with its incomplete self. Idb.__init__ stores gui and gui +then stores idb. + +If IDLE is started normally, so that user code executes in a separate +process, debugger_r.start_remote_debugger is called, executing in the +IDLE process. It calls 'start the debugger' in the remote process, +which calls Idb with a gui proxy. Then Debugger is called in the IDLE +for more. +""" + +import bdb +import os + +from tkinter import * +from tkinter.ttk import Frame, Scrollbar + +from idlelib import macosx +from idlelib.scrolledlist import ScrolledList +from idlelib.window import ListedToplevel + + +class Idb(bdb.Bdb): + "Supply user_line and user_exception functions for Bdb." + + def __init__(self, gui): + self.gui = gui # An instance of Debugger or proxy thereof. + super().__init__() + + def user_line(self, frame): + """Handle a user stopping or breaking at a line. + + Convert frame to a string and send it to gui. + """ + if _in_rpc_code(frame): + self.set_step() + return + message = _frame2message(frame) + try: + self.gui.interaction(message, frame) + except TclError: # When closing debugger window with [x] in 3.x + pass + + def user_exception(self, frame, exc_info): + """Handle an the occurrence of an exception.""" + if _in_rpc_code(frame): + self.set_step() + return + message = _frame2message(frame) + self.gui.interaction(message, frame, exc_info) + +def _in_rpc_code(frame): + "Determine if debugger is within RPC code." + if frame.f_code.co_filename.count('rpc.py'): + return True # Skip this frame. + else: + prev_frame = frame.f_back + if prev_frame is None: + return False + prev_name = prev_frame.f_code.co_filename + if 'idlelib' in prev_name and 'debugger' in prev_name: + # catch both idlelib/debugger.py and idlelib/debugger_r.py + # on both Posix and Windows + return False + return _in_rpc_code(prev_frame) + +def _frame2message(frame): + """Return a message string for frame.""" + code = frame.f_code + filename = code.co_filename + lineno = frame.f_lineno + basename = os.path.basename(filename) + message = f"{basename}:{lineno}" + if code.co_name != "?": + message = f"{message}: {code.co_name}()" + return message + + +class Debugger: + """The debugger interface. + + This class handles the drawing of the debugger window and + the interactions with the underlying debugger session. + """ + vstack = None + vsource = None + vlocals = None + vglobals = None + stackviewer = None + localsviewer = None + globalsviewer = None + + def __init__(self, pyshell, idb=None): + """Instantiate and draw a debugger window. + + :param pyshell: An instance of the PyShell Window + :type pyshell: :class:`idlelib.pyshell.PyShell` + + :param idb: An instance of the IDLE debugger (optional) + :type idb: :class:`idlelib.debugger.Idb` + """ + if idb is None: + idb = Idb(self) + self.pyshell = pyshell + self.idb = idb # If passed, a proxy of remote instance. + self.frame = None + self.make_gui() + self.interacting = False + self.nesting_level = 0 + + def run(self, *args): + """Run the debugger.""" + # Deal with the scenario where we've already got a program running + # in the debugger and we want to start another. If that is the case, + # our second 'run' was invoked from an event dispatched not from + # the main event loop, but from the nested event loop in 'interaction' + # below. So our stack looks something like this: + # outer main event loop + # run() + # <running program with traces> + # callback to debugger's interaction() + # nested event loop + # run() for second command + # + # This kind of nesting of event loops causes all kinds of problems + # (see e.g. issue #24455) especially when dealing with running as a + # subprocess, where there's all kinds of extra stuff happening in + # there - insert a traceback.print_stack() to check it out. + # + # By this point, we've already called restart_subprocess() in + # ScriptBinding. However, we also need to unwind the stack back to + # that outer event loop. To accomplish this, we: + # - return immediately from the nested run() + # - abort_loop ensures the nested event loop will terminate + # - the debugger's interaction routine completes normally + # - the restart_subprocess() will have taken care of stopping + # the running program, which will also let the outer run complete + # + # That leaves us back at the outer main event loop, at which point our + # after event can fire, and we'll come back to this routine with a + # clean stack. + if self.nesting_level > 0: + self.abort_loop() + self.root.after(100, lambda: self.run(*args)) + return + try: + self.interacting = True + return self.idb.run(*args) + finally: + self.interacting = False + + def close(self, event=None): + """Close the debugger and window.""" + try: + self.quit() + except Exception: + pass + if self.interacting: + self.top.bell() + return + if self.stackviewer: + self.stackviewer.close(); self.stackviewer = None + # Clean up pyshell if user clicked debugger control close widget. + # (Causes a harmless extra cycle through close_debugger() if user + # toggled debugger from pyshell Debug menu) + self.pyshell.close_debugger() + # Now close the debugger control window.... + self.top.destroy() + + def make_gui(self): + """Draw the debugger gui on the screen.""" + pyshell = self.pyshell + self.flist = pyshell.flist + self.root = root = pyshell.root + self.top = top = ListedToplevel(root) + self.top.wm_title("Debug Control") + self.top.wm_iconname("Debug") + top.wm_protocol("WM_DELETE_WINDOW", self.close) + self.top.bind("<Escape>", self.close) + + self.bframe = bframe = Frame(top) + self.bframe.pack(anchor="w") + self.buttons = bl = [] + + self.bcont = b = Button(bframe, text="Go", command=self.cont) + bl.append(b) + self.bstep = b = Button(bframe, text="Step", command=self.step) + bl.append(b) + self.bnext = b = Button(bframe, text="Over", command=self.next) + bl.append(b) + self.bret = b = Button(bframe, text="Out", command=self.ret) + bl.append(b) + self.bret = b = Button(bframe, text="Quit", command=self.quit) + bl.append(b) + + for b in bl: + b.configure(state="disabled") + b.pack(side="left") + + self.cframe = cframe = Frame(bframe) + self.cframe.pack(side="left") + + if not self.vstack: + self.__class__.vstack = BooleanVar(top) + self.vstack.set(1) + self.bstack = Checkbutton(cframe, + text="Stack", command=self.show_stack, variable=self.vstack) + self.bstack.grid(row=0, column=0) + if not self.vsource: + self.__class__.vsource = BooleanVar(top) + self.bsource = Checkbutton(cframe, + text="Source", command=self.show_source, variable=self.vsource) + self.bsource.grid(row=0, column=1) + if not self.vlocals: + self.__class__.vlocals = BooleanVar(top) + self.vlocals.set(1) + self.blocals = Checkbutton(cframe, + text="Locals", command=self.show_locals, variable=self.vlocals) + self.blocals.grid(row=1, column=0) + if not self.vglobals: + self.__class__.vglobals = BooleanVar(top) + self.bglobals = Checkbutton(cframe, + text="Globals", command=self.show_globals, variable=self.vglobals) + self.bglobals.grid(row=1, column=1) + + self.status = Label(top, anchor="w") + self.status.pack(anchor="w") + self.error = Label(top, anchor="w") + self.error.pack(anchor="w", fill="x") + self.errorbg = self.error.cget("background") + + self.fstack = Frame(top, height=1) + self.fstack.pack(expand=1, fill="both") + self.flocals = Frame(top) + self.flocals.pack(expand=1, fill="both") + self.fglobals = Frame(top, height=1) + self.fglobals.pack(expand=1, fill="both") + + if self.vstack.get(): + self.show_stack() + if self.vlocals.get(): + self.show_locals() + if self.vglobals.get(): + self.show_globals() + + def interaction(self, message, frame, info=None): + self.frame = frame + self.status.configure(text=message) + + if info: + type, value, tb = info + try: + m1 = type.__name__ + except AttributeError: + m1 = "%s" % str(type) + if value is not None: + try: + # TODO redo entire section, tries not needed. + m1 = f"{m1}: {value}" + except: + pass + bg = "yellow" + else: + m1 = "" + tb = None + bg = self.errorbg + self.error.configure(text=m1, background=bg) + + sv = self.stackviewer + if sv: + stack, i = self.idb.get_stack(self.frame, tb) + sv.load_stack(stack, i) + + self.show_variables(1) + + if self.vsource.get(): + self.sync_source_line() + + for b in self.buttons: + b.configure(state="normal") + + self.top.wakeup() + # Nested main loop: Tkinter's main loop is not reentrant, so use + # Tcl's vwait facility, which reenters the event loop until an + # event handler sets the variable we're waiting on. + self.nesting_level += 1 + self.root.tk.call('vwait', '::idledebugwait') + self.nesting_level -= 1 + + for b in self.buttons: + b.configure(state="disabled") + self.status.configure(text="") + self.error.configure(text="", background=self.errorbg) + self.frame = None + + def sync_source_line(self): + frame = self.frame + if not frame: + return + filename, lineno = self.__frame2fileline(frame) + if filename[:1] + filename[-1:] != "<>" and os.path.exists(filename): + self.flist.gotofileline(filename, lineno) + + def __frame2fileline(self, frame): + code = frame.f_code + filename = code.co_filename + lineno = frame.f_lineno + return filename, lineno + + def cont(self): + self.idb.set_continue() + self.abort_loop() + + def step(self): + self.idb.set_step() + self.abort_loop() + + def next(self): + self.idb.set_next(self.frame) + self.abort_loop() + + def ret(self): + self.idb.set_return(self.frame) + self.abort_loop() + + def quit(self): + self.idb.set_quit() + self.abort_loop() + + def abort_loop(self): + self.root.tk.call('set', '::idledebugwait', '1') + + def show_stack(self): + if not self.stackviewer and self.vstack.get(): + self.stackviewer = sv = StackViewer(self.fstack, self.flist, self) + if self.frame: + stack, i = self.idb.get_stack(self.frame, None) + sv.load_stack(stack, i) + else: + sv = self.stackviewer + if sv and not self.vstack.get(): + self.stackviewer = None + sv.close() + self.fstack['height'] = 1 + + def show_source(self): + if self.vsource.get(): + self.sync_source_line() + + def show_frame(self, stackitem): + self.frame = stackitem[0] # lineno is stackitem[1] + self.show_variables() + + def show_locals(self): + lv = self.localsviewer + if self.vlocals.get(): + if not lv: + self.localsviewer = NamespaceViewer(self.flocals, "Locals") + else: + if lv: + self.localsviewer = None + lv.close() + self.flocals['height'] = 1 + self.show_variables() + + def show_globals(self): + gv = self.globalsviewer + if self.vglobals.get(): + if not gv: + self.globalsviewer = NamespaceViewer(self.fglobals, "Globals") + else: + if gv: + self.globalsviewer = None + gv.close() + self.fglobals['height'] = 1 + self.show_variables() + + def show_variables(self, force=0): + lv = self.localsviewer + gv = self.globalsviewer + frame = self.frame + if not frame: + ldict = gdict = None + else: + ldict = frame.f_locals + gdict = frame.f_globals + if lv and gv and ldict is gdict: + ldict = None + if lv: + lv.load_dict(ldict, force, self.pyshell.interp.rpcclt) + if gv: + gv.load_dict(gdict, force, self.pyshell.interp.rpcclt) + + def set_breakpoint(self, filename, lineno): + """Set a filename-lineno breakpoint in the debugger. + + Called from self.load_breakpoints and EW.setbreakpoint + """ + self.idb.set_break(filename, lineno) + + def clear_breakpoint(self, filename, lineno): + self.idb.clear_break(filename, lineno) + + def clear_file_breaks(self, filename): + self.idb.clear_all_file_breaks(filename) + + def load_breakpoints(self): + """Load PyShellEditorWindow breakpoints into subprocess debugger.""" + for editwin in self.pyshell.flist.inversedict: + filename = editwin.io.filename + try: + for lineno in editwin.breakpoints: + self.set_breakpoint(filename, lineno) + except AttributeError: + continue + + +class StackViewer(ScrolledList): + "Code stack viewer for debugger GUI." + + def __init__(self, master, flist, gui): + if macosx.isAquaTk(): + # At least on with the stock AquaTk version on OSX 10.4 you'll + # get a shaking GUI that eventually kills IDLE if the width + # argument is specified. + ScrolledList.__init__(self, master) + else: + ScrolledList.__init__(self, master, width=80) + self.flist = flist + self.gui = gui + self.stack = [] + + def load_stack(self, stack, index=None): + self.stack = stack + self.clear() + for i in range(len(stack)): + frame, lineno = stack[i] + try: + modname = frame.f_globals["__name__"] + except: + modname = "?" + code = frame.f_code + filename = code.co_filename + funcname = code.co_name + import linecache + sourceline = linecache.getline(filename, lineno) + sourceline = sourceline.strip() + if funcname in ("?", "", None): + item = "%s, line %d: %s" % (modname, lineno, sourceline) + else: + item = "%s.%s(), line %d: %s" % (modname, funcname, + lineno, sourceline) + if i == index: + item = "> " + item + self.append(item) + if index is not None: + self.select(index) + + def popup_event(self, event): + "Override base method." + if self.stack: + return ScrolledList.popup_event(self, event) + + def fill_menu(self): + "Override base method." + menu = self.menu + menu.add_command(label="Go to source line", + command=self.goto_source_line) + menu.add_command(label="Show stack frame", + command=self.show_stack_frame) + + def on_select(self, index): + "Override base method." + if 0 <= index < len(self.stack): + self.gui.show_frame(self.stack[index]) + + def on_double(self, index): + "Override base method." + self.show_source(index) + + def goto_source_line(self): + index = self.listbox.index("active") + self.show_source(index) + + def show_stack_frame(self): + index = self.listbox.index("active") + if 0 <= index < len(self.stack): + self.gui.show_frame(self.stack[index]) + + def show_source(self, index): + if not (0 <= index < len(self.stack)): + return + frame, lineno = self.stack[index] + code = frame.f_code + filename = code.co_filename + if os.path.isfile(filename): + edit = self.flist.open(filename) + if edit: + edit.gotoline(lineno) + + +class NamespaceViewer: + "Global/local namespace viewer for debugger GUI." + + def __init__(self, master, title, odict=None): # XXX odict never passed. + width = 0 + height = 40 + if odict: + height = 20*len(odict) # XXX 20 == observed height of Entry widget + self.master = master + self.title = title + import reprlib + self.repr = reprlib.Repr() + self.repr.maxstring = 60 + self.repr.maxother = 60 + self.frame = frame = Frame(master) + self.frame.pack(expand=1, fill="both") + self.label = Label(frame, text=title, borderwidth=2, relief="groove") + self.label.pack(fill="x") + self.vbar = vbar = Scrollbar(frame, name="vbar") + vbar.pack(side="right", fill="y") + self.canvas = canvas = Canvas(frame, + height=min(300, max(40, height)), + scrollregion=(0, 0, width, height)) + canvas.pack(side="left", fill="both", expand=1) + vbar["command"] = canvas.yview + canvas["yscrollcommand"] = vbar.set + self.subframe = subframe = Frame(canvas) + self.sfid = canvas.create_window(0, 0, window=subframe, anchor="nw") + self.load_dict(odict) + + prev_odict = -1 # Needed for initial comparison below. + + def load_dict(self, odict, force=0, rpc_client=None): + if odict is self.prev_odict and not force: + return + subframe = self.subframe + frame = self.frame + for c in list(subframe.children.values()): + c.destroy() + self.prev_odict = None + if not odict: + l = Label(subframe, text="None") + l.grid(row=0, column=0) + else: + #names = sorted(dict) + # + # Because of (temporary) limitations on the dict_keys type (not yet + # public or pickleable), have the subprocess to send a list of + # keys, not a dict_keys object. sorted() will take a dict_keys + # (no subprocess) or a list. + # + # There is also an obscure bug in sorted(dict) where the + # interpreter gets into a loop requesting non-existing dict[0], + # dict[1], dict[2], etc from the debugger_r.DictProxy. + # TODO recheck above; see debugger_r 159ff, debugobj 60. + keys_list = odict.keys() + names = sorted(keys_list) + + row = 0 + for name in names: + value = odict[name] + svalue = self.repr.repr(value) # repr(value) + # Strip extra quotes caused by calling repr on the (already) + # repr'd value sent across the RPC interface: + if rpc_client: + svalue = svalue[1:-1] + l = Label(subframe, text=name) + l.grid(row=row, column=0, sticky="nw") + l = Entry(subframe, width=0, borderwidth=0) + l.insert(0, svalue) + l.grid(row=row, column=1, sticky="nw") + row = row+1 + self.prev_odict = odict + # XXX Could we use a <Configure> callback for the following? + subframe.update_idletasks() # Alas! + width = subframe.winfo_reqwidth() + height = subframe.winfo_reqheight() + canvas = self.canvas + self.canvas["scrollregion"] = (0, 0, width, height) + if height > 300: + canvas["height"] = 300 + frame.pack(expand=1) + else: + canvas["height"] = height + frame.pack(expand=0) + + def close(self): + self.frame.destroy() + + +if __name__ == "__main__": + from unittest import main + main('idlelib.idle_test.test_debugger', verbosity=2, exit=False) + +# TODO: htest? diff --git a/Lib/idlelib/debugger_r.py b/Lib/idlelib/debugger_r.py new file mode 100644 index 000000000..ad3355d9f --- /dev/null +++ b/Lib/idlelib/debugger_r.py @@ -0,0 +1,390 @@ +"""Support for remote Python debugging. + +Some ASCII art to describe the structure: + + IN PYTHON SUBPROCESS # IN IDLE PROCESS + # + # oid='gui_adapter' + +----------+ # +------------+ +-----+ + | GUIProxy |--remote#call-->| GUIAdapter |--calls-->| GUI | ++-----+--calls-->+----------+ # +------------+ +-----+ +| Idb | # / ++-----+<-calls--+------------+ # +----------+<--calls-/ + | IdbAdapter |<--remote#call--| IdbProxy | + +------------+ # +----------+ + oid='idb_adapter' # + +The purpose of the Proxy and Adapter classes is to translate certain +arguments and return values that cannot be transported through the RPC +barrier, in particular frame and traceback objects. + +""" +import reprlib +import types +from idlelib import debugger + +debugging = 0 + +idb_adap_oid = "idb_adapter" +gui_adap_oid = "gui_adapter" + +#======================================= +# +# In the PYTHON subprocess: + +frametable = {} +dicttable = {} +codetable = {} +tracebacktable = {} + +def wrap_frame(frame): + fid = id(frame) + frametable[fid] = frame + return fid + +def wrap_info(info): + "replace info[2], a traceback instance, by its ID" + if info is None: + return None + else: + traceback = info[2] + assert isinstance(traceback, types.TracebackType) + traceback_id = id(traceback) + tracebacktable[traceback_id] = traceback + modified_info = (info[0], info[1], traceback_id) + return modified_info + +class GUIProxy: + + def __init__(self, conn, gui_adap_oid): + self.conn = conn + self.oid = gui_adap_oid + + def interaction(self, message, frame, info=None): + # calls rpc.SocketIO.remotecall() via run.MyHandler instance + # pass frame and traceback object IDs instead of the objects themselves + self.conn.remotecall(self.oid, "interaction", + (message, wrap_frame(frame), wrap_info(info)), + {}) + +class IdbAdapter: + + def __init__(self, idb): + self.idb = idb + + #----------called by an IdbProxy---------- + + def set_step(self): + self.idb.set_step() + + def set_quit(self): + self.idb.set_quit() + + def set_continue(self): + self.idb.set_continue() + + def set_next(self, fid): + frame = frametable[fid] + self.idb.set_next(frame) + + def set_return(self, fid): + frame = frametable[fid] + self.idb.set_return(frame) + + def get_stack(self, fid, tbid): + frame = frametable[fid] + if tbid is None: + tb = None + else: + tb = tracebacktable[tbid] + stack, i = self.idb.get_stack(frame, tb) + stack = [(wrap_frame(frame2), k) for frame2, k in stack] + return stack, i + + def run(self, cmd): + import __main__ + self.idb.run(cmd, __main__.__dict__) + + def set_break(self, filename, lineno): + msg = self.idb.set_break(filename, lineno) + return msg + + def clear_break(self, filename, lineno): + msg = self.idb.clear_break(filename, lineno) + return msg + + def clear_all_file_breaks(self, filename): + msg = self.idb.clear_all_file_breaks(filename) + return msg + + #----------called by a FrameProxy---------- + + def frame_attr(self, fid, name): + frame = frametable[fid] + return getattr(frame, name) + + def frame_globals(self, fid): + frame = frametable[fid] + gdict = frame.f_globals + did = id(gdict) + dicttable[did] = gdict + return did + + def frame_locals(self, fid): + frame = frametable[fid] + ldict = frame.f_locals + did = id(ldict) + dicttable[did] = ldict + return did + + def frame_code(self, fid): + frame = frametable[fid] + code = frame.f_code + cid = id(code) + codetable[cid] = code + return cid + + #----------called by a CodeProxy---------- + + def code_name(self, cid): + code = codetable[cid] + return code.co_name + + def code_filename(self, cid): + code = codetable[cid] + return code.co_filename + + #----------called by a DictProxy---------- + + def dict_keys(self, did): + raise NotImplementedError("dict_keys not public or pickleable") +## return dicttable[did].keys() + + ### Needed until dict_keys type is finished and pickleable. + # xxx finished. pickleable? + ### Will probably need to extend rpc.py:SocketIO._proxify at that time. + def dict_keys_list(self, did): + return list(dicttable[did].keys()) + + def dict_item(self, did, key): + value = dicttable[did][key] + return reprlib.repr(value) # Can't pickle module 'builtins'. + +#----------end class IdbAdapter---------- + + +def start_debugger(rpchandler, gui_adap_oid): + """Start the debugger and its RPC link in the Python subprocess + + Start the subprocess side of the split debugger and set up that side of the + RPC link by instantiating the GUIProxy, Idb debugger, and IdbAdapter + objects and linking them together. Register the IdbAdapter with the + RPCServer to handle RPC requests from the split debugger GUI via the + IdbProxy. + + """ + gui_proxy = GUIProxy(rpchandler, gui_adap_oid) + idb = debugger.Idb(gui_proxy) + idb_adap = IdbAdapter(idb) + rpchandler.register(idb_adap_oid, idb_adap) + return idb_adap_oid + + +#======================================= +# +# In the IDLE process: + + +class FrameProxy: + + def __init__(self, conn, fid): + self._conn = conn + self._fid = fid + self._oid = "idb_adapter" + self._dictcache = {} + + def __getattr__(self, name): + if name[:1] == "_": + raise AttributeError(name) + if name == "f_code": + return self._get_f_code() + if name == "f_globals": + return self._get_f_globals() + if name == "f_locals": + return self._get_f_locals() + return self._conn.remotecall(self._oid, "frame_attr", + (self._fid, name), {}) + + def _get_f_code(self): + cid = self._conn.remotecall(self._oid, "frame_code", (self._fid,), {}) + return CodeProxy(self._conn, self._oid, cid) + + def _get_f_globals(self): + did = self._conn.remotecall(self._oid, "frame_globals", + (self._fid,), {}) + return self._get_dict_proxy(did) + + def _get_f_locals(self): + did = self._conn.remotecall(self._oid, "frame_locals", + (self._fid,), {}) + return self._get_dict_proxy(did) + + def _get_dict_proxy(self, did): + if did in self._dictcache: + return self._dictcache[did] + dp = DictProxy(self._conn, self._oid, did) + self._dictcache[did] = dp + return dp + + +class CodeProxy: + + def __init__(self, conn, oid, cid): + self._conn = conn + self._oid = oid + self._cid = cid + + def __getattr__(self, name): + if name == "co_name": + return self._conn.remotecall(self._oid, "code_name", + (self._cid,), {}) + if name == "co_filename": + return self._conn.remotecall(self._oid, "code_filename", + (self._cid,), {}) + + +class DictProxy: + + def __init__(self, conn, oid, did): + self._conn = conn + self._oid = oid + self._did = did + +## def keys(self): +## return self._conn.remotecall(self._oid, "dict_keys", (self._did,), {}) + + # 'temporary' until dict_keys is a pickleable built-in type + def keys(self): + return self._conn.remotecall(self._oid, + "dict_keys_list", (self._did,), {}) + + def __getitem__(self, key): + return self._conn.remotecall(self._oid, "dict_item", + (self._did, key), {}) + + def __getattr__(self, name): + ##print("*** Failed DictProxy.__getattr__:", name) + raise AttributeError(name) + + +class GUIAdapter: + + def __init__(self, conn, gui): + self.conn = conn + self.gui = gui + + def interaction(self, message, fid, modified_info): + ##print("*** Interaction: (%s, %s, %s)" % (message, fid, modified_info)) + frame = FrameProxy(self.conn, fid) + self.gui.interaction(message, frame, modified_info) + + +class IdbProxy: + + def __init__(self, conn, shell, oid): + self.oid = oid + self.conn = conn + self.shell = shell + + def call(self, methodname, /, *args, **kwargs): + ##print("*** IdbProxy.call %s %s %s" % (methodname, args, kwargs)) + value = self.conn.remotecall(self.oid, methodname, args, kwargs) + ##print("*** IdbProxy.call %s returns %r" % (methodname, value)) + return value + + def run(self, cmd, locals): + # Ignores locals on purpose! + seq = self.conn.asyncqueue(self.oid, "run", (cmd,), {}) + self.shell.interp.active_seq = seq + + def get_stack(self, frame, tbid): + # passing frame and traceback IDs, not the objects themselves + stack, i = self.call("get_stack", frame._fid, tbid) + stack = [(FrameProxy(self.conn, fid), k) for fid, k in stack] + return stack, i + + def set_continue(self): + self.call("set_continue") + + def set_step(self): + self.call("set_step") + + def set_next(self, frame): + self.call("set_next", frame._fid) + + def set_return(self, frame): + self.call("set_return", frame._fid) + + def set_quit(self): + self.call("set_quit") + + def set_break(self, filename, lineno): + msg = self.call("set_break", filename, lineno) + return msg + + def clear_break(self, filename, lineno): + msg = self.call("clear_break", filename, lineno) + return msg + + def clear_all_file_breaks(self, filename): + msg = self.call("clear_all_file_breaks", filename) + return msg + +def start_remote_debugger(rpcclt, pyshell): + """Start the subprocess debugger, initialize the debugger GUI and RPC link + + Request the RPCServer start the Python subprocess debugger and link. Set + up the Idle side of the split debugger by instantiating the IdbProxy, + debugger GUI, and debugger GUIAdapter objects and linking them together. + + Register the GUIAdapter with the RPCClient to handle debugger GUI + interaction requests coming from the subprocess debugger via the GUIProxy. + + The IdbAdapter will pass execution and environment requests coming from the + Idle debugger GUI to the subprocess debugger via the IdbProxy. + + """ + global idb_adap_oid + + idb_adap_oid = rpcclt.remotecall("exec", "start_the_debugger",\ + (gui_adap_oid,), {}) + idb_proxy = IdbProxy(rpcclt, pyshell, idb_adap_oid) + gui = debugger.Debugger(pyshell, idb_proxy) + gui_adap = GUIAdapter(rpcclt, gui) + rpcclt.register(gui_adap_oid, gui_adap) + return gui + +def close_remote_debugger(rpcclt): + """Shut down subprocess debugger and Idle side of debugger RPC link + + Request that the RPCServer shut down the subprocess debugger and link. + Unregister the GUIAdapter, which will cause a GC on the Idle process + debugger and RPC link objects. (The second reference to the debugger GUI + is deleted in pyshell.close_remote_debugger().) + + """ + close_subprocess_debugger(rpcclt) + rpcclt.unregister(gui_adap_oid) + +def close_subprocess_debugger(rpcclt): + rpcclt.remotecall("exec", "stop_the_debugger", (idb_adap_oid,), {}) + +def restart_subprocess_debugger(rpcclt): + idb_adap_oid_ret = rpcclt.remotecall("exec", "start_the_debugger",\ + (gui_adap_oid,), {}) + assert idb_adap_oid_ret == idb_adap_oid, 'Idb restarted with different oid' + + +if __name__ == "__main__": + from unittest import main + main('idlelib.idle_test.test_debugger_r', verbosity=2, exit=False) diff --git a/Lib/idlelib/debugobj.py b/Lib/idlelib/debugobj.py new file mode 100644 index 000000000..fb448ece2 --- /dev/null +++ b/Lib/idlelib/debugobj.py @@ -0,0 +1,146 @@ +"""Define tree items for debug stackviewer, which is only user. +""" +# XXX TO DO: +# - popup menu +# - support partial or total redisplay +# - more doc strings +# - tooltips + +# object browser + +# XXX TO DO: +# - for classes/modules, add "open source" to object browser +from reprlib import Repr + +from idlelib.tree import TreeItem, TreeNode, ScrolledCanvas + +myrepr = Repr() +myrepr.maxstring = 100 +myrepr.maxother = 100 + +class ObjectTreeItem(TreeItem): + def __init__(self, labeltext, object_, setfunction=None): + self.labeltext = labeltext + self.object = object_ + self.setfunction = setfunction + def GetLabelText(self): + return self.labeltext + def GetText(self): + return myrepr.repr(self.object) + def GetIconName(self): + if not self.IsExpandable(): + return "python" + def IsEditable(self): + return self.setfunction is not None + def SetText(self, text): + try: + value = eval(text) + self.setfunction(value) + except: + pass + else: + self.object = value + def IsExpandable(self): + return not not dir(self.object) + def GetSubList(self): + keys = dir(self.object) + sublist = [] + for key in keys: + try: + value = getattr(self.object, key) + except AttributeError: + continue + item = make_objecttreeitem( + str(key) + " =", + value, + lambda value, key=key, object_=self.object: + setattr(object_, key, value)) + sublist.append(item) + return sublist + +class ClassTreeItem(ObjectTreeItem): + def IsExpandable(self): + return True + def GetSubList(self): + sublist = ObjectTreeItem.GetSubList(self) + if len(self.object.__bases__) == 1: + item = make_objecttreeitem("__bases__[0] =", + self.object.__bases__[0]) + else: + item = make_objecttreeitem("__bases__ =", self.object.__bases__) + sublist.insert(0, item) + return sublist + +class AtomicObjectTreeItem(ObjectTreeItem): + def IsExpandable(self): + return False + +class SequenceTreeItem(ObjectTreeItem): + def IsExpandable(self): + return len(self.object) > 0 + def keys(self): + return range(len(self.object)) + def GetSubList(self): + sublist = [] + for key in self.keys(): + try: + value = self.object[key] + except KeyError: + continue + def setfunction(value, key=key, object_=self.object): + object_[key] = value + item = make_objecttreeitem(f"{key!r}:", value, setfunction) + sublist.append(item) + return sublist + +class DictTreeItem(SequenceTreeItem): + def keys(self): + # TODO return sorted(self.object) + keys = list(self.object) + try: + keys.sort() + except: + pass + return keys + +dispatch = { + int: AtomicObjectTreeItem, + float: AtomicObjectTreeItem, + str: AtomicObjectTreeItem, + tuple: SequenceTreeItem, + list: SequenceTreeItem, + dict: DictTreeItem, + type: ClassTreeItem, +} + +def make_objecttreeitem(labeltext, object_, setfunction=None): + t = type(object_) + if t in dispatch: + c = dispatch[t] + else: + c = ObjectTreeItem + return c(labeltext, object_, setfunction) + + +def _debug_object_browser(parent): # htest # + import sys + from tkinter import Toplevel + top = Toplevel(parent) + top.title("Test debug object browser") + x, y = map(int, parent.geometry().split('+')[1:]) + top.geometry("+%d+%d" % (x + 100, y + 175)) + top.configure(bd=0, bg="yellow") + top.focus_set() + sc = ScrolledCanvas(top, bg="white", highlightthickness=0, takefocus=1) + sc.frame.pack(expand=1, fill="both") + item = make_objecttreeitem("sys", sys) + node = TreeNode(sc.canvas, None, item) + node.update() + + +if __name__ == '__main__': + from unittest import main + main('idlelib.idle_test.test_debugobj', verbosity=2, exit=False) + + from idlelib.idle_test.htest import run + run(_debug_object_browser) diff --git a/Lib/idlelib/debugobj_r.py b/Lib/idlelib/debugobj_r.py new file mode 100644 index 000000000..75e75ebe5 --- /dev/null +++ b/Lib/idlelib/debugobj_r.py @@ -0,0 +1,41 @@ +from idlelib import rpc + +def remote_object_tree_item(item): + wrapper = WrappedObjectTreeItem(item) + oid = id(wrapper) + rpc.objecttable[oid] = wrapper + return oid + +class WrappedObjectTreeItem: + # Lives in PYTHON subprocess + + def __init__(self, item): + self.__item = item + + def __getattr__(self, name): + value = getattr(self.__item, name) + return value + + def _GetSubList(self): + sub_list = self.__item._GetSubList() + return list(map(remote_object_tree_item, sub_list)) + +class StubObjectTreeItem: + # Lives in IDLE process + + def __init__(self, sockio, oid): + self.sockio = sockio + self.oid = oid + + def __getattr__(self, name): + value = rpc.MethodProxy(self.sockio, self.oid, name) + return value + + def _GetSubList(self): + sub_list = self.sockio.remotecall(self.oid, "_GetSubList", (), {}) + return [StubObjectTreeItem(self.sockio, oid) for oid in sub_list] + + +if __name__ == '__main__': + from unittest import main + main('idlelib.idle_test.test_debugobj_r', verbosity=2) diff --git a/Lib/idlelib/delegator.py b/Lib/idlelib/delegator.py new file mode 100644 index 000000000..93ae8bbd4 --- /dev/null +++ b/Lib/idlelib/delegator.py @@ -0,0 +1,34 @@ +class Delegator: + + def __init__(self, delegate=None): + self.delegate = delegate + self.__cache = set() + # Cache is used to only remove added attributes + # when changing the delegate. + + def __getattr__(self, name): + attr = getattr(self.delegate, name) # May raise AttributeError + setattr(self, name, attr) + self.__cache.add(name) + return attr + + def resetcache(self): + "Removes added attributes while leaving original attributes." + # Function is really about resetting delegator dict + # to original state. Cache is just a means + for key in self.__cache: + try: + delattr(self, key) + except AttributeError: + pass + self.__cache.clear() + + def setdelegate(self, delegate): + "Reset attributes and change delegate." + self.resetcache() + self.delegate = delegate + + +if __name__ == '__main__': + from unittest import main + main('idlelib.idle_test.test_delegator', verbosity=2) diff --git a/Lib/idlelib/dynoption.py b/Lib/idlelib/dynoption.py new file mode 100644 index 000000000..b8937f710 --- /dev/null +++ b/Lib/idlelib/dynoption.py @@ -0,0 +1,57 @@ +""" +OptionMenu widget modified to allow dynamic menu reconfiguration +and setting of highlightthickness +""" +from tkinter import OptionMenu, _setit, StringVar, Button + +class DynOptionMenu(OptionMenu): + """Add SetMenu and highlightthickness to OptionMenu. + + Highlightthickness adds space around menu button. + """ + def __init__(self, master, variable, value, *values, **kwargs): + highlightthickness = kwargs.pop('highlightthickness', None) + OptionMenu.__init__(self, master, variable, value, *values, **kwargs) + self['highlightthickness'] = highlightthickness + self.variable = variable + self.command = kwargs.get('command') + + def SetMenu(self,valueList,value=None): + """ + clear and reload the menu with a new set of options. + valueList - list of new options + value - initial value to set the optionmenu's menubutton to + """ + self['menu'].delete(0,'end') + for item in valueList: + self['menu'].add_command(label=item, + command=_setit(self.variable,item,self.command)) + if value: + self.variable.set(value) + + +def _dyn_option_menu(parent): # htest # + from tkinter import Toplevel # + StringVar, Button + + top = Toplevel(parent) + top.title("Test dynamic option menu") + x, y = map(int, parent.geometry().split('+')[1:]) + top.geometry("200x100+%d+%d" % (x + 250, y + 175)) + top.focus_set() + + var = StringVar(top) + var.set("Old option set") #Set the default value + dyn = DynOptionMenu(top, var, "old1","old2","old3","old4", + highlightthickness=5) + dyn.pack() + + def update(): + dyn.SetMenu(["new1","new2","new3","new4"], value="new option set") + button = Button(top, text="Change option set", command=update) + button.pack() + + +if __name__ == '__main__': + # Only module without unittests because of intention to replace. + from idlelib.idle_test.htest import run + run(_dyn_option_menu) diff --git a/Lib/idlelib/editor.py b/Lib/idlelib/editor.py new file mode 100644 index 000000000..312893476 --- /dev/null +++ b/Lib/idlelib/editor.py @@ -0,0 +1,1721 @@ +import importlib.abc +import importlib.util +import os +import platform +import re +import string +import sys +import tokenize +import traceback +import webbrowser + +from tkinter import * +from tkinter.font import Font +from tkinter.ttk import Scrollbar +from tkinter import simpledialog +from tkinter import messagebox + +from idlelib.config import idleConf +from idlelib import configdialog +from idlelib import grep +from idlelib import help +from idlelib import help_about +from idlelib import macosx +from idlelib.multicall import MultiCallCreator +from idlelib import pyparse +from idlelib import query +from idlelib import replace +from idlelib import search +from idlelib.tree import wheel_event +from idlelib.util import py_extensions +from idlelib import window +from idlelib.help import _get_dochome + +# The default tab setting for a Text widget, in average-width characters. +TK_TABWIDTH_DEFAULT = 8 +darwin = sys.platform == 'darwin' + +class EditorWindow: + from idlelib.percolator import Percolator + from idlelib.colorizer import ColorDelegator, color_config + from idlelib.undo import UndoDelegator + from idlelib.iomenu import IOBinding, encoding + from idlelib import mainmenu + from idlelib.statusbar import MultiStatusBar + from idlelib.autocomplete import AutoComplete + from idlelib.autoexpand import AutoExpand + from idlelib.calltip import Calltip + from idlelib.codecontext import CodeContext + from idlelib.sidebar import LineNumbers + from idlelib.format import FormatParagraph, FormatRegion, Indents, Rstrip + from idlelib.parenmatch import ParenMatch + from idlelib.zoomheight import ZoomHeight + + filesystemencoding = sys.getfilesystemencoding() # for file names + help_url = None + + allow_code_context = True + allow_line_numbers = True + user_input_insert_tags = None + + def __init__(self, flist=None, filename=None, key=None, root=None): + # Delay import: runscript imports pyshell imports EditorWindow. + from idlelib.runscript import ScriptBinding + + if EditorWindow.help_url is None: + EditorWindow.help_url = _get_dochome() + self.flist = flist + root = root or flist.root + self.root = root + self.menubar = Menu(root) + self.top = top = window.ListedToplevel(root, menu=self.menubar) + if flist: + self.tkinter_vars = flist.vars + #self.top.instance_dict makes flist.inversedict available to + #configdialog.py so it can access all EditorWindow instances + self.top.instance_dict = flist.inversedict + else: + self.tkinter_vars = {} # keys: Tkinter event names + # values: Tkinter variable instances + self.top.instance_dict = {} + self.recent_files_path = idleConf.userdir and os.path.join( + idleConf.userdir, 'recent-files.lst') + + self.prompt_last_line = '' # Override in PyShell + self.text_frame = text_frame = Frame(top) + self.vbar = vbar = Scrollbar(text_frame, name='vbar') + width = idleConf.GetOption('main', 'EditorWindow', 'width', type='int') + text_options = { + 'name': 'text', + 'padx': 5, + 'wrap': 'none', + 'highlightthickness': 0, + 'width': width, + 'tabstyle': 'wordprocessor', # new in 8.5 + 'height': idleConf.GetOption( + 'main', 'EditorWindow', 'height', type='int'), + } + self.text = text = MultiCallCreator(Text)(text_frame, **text_options) + self.top.focused_widget = self.text + + self.createmenubar() + self.apply_bindings() + + self.top.protocol("WM_DELETE_WINDOW", self.close) + self.top.bind("<<close-window>>", self.close_event) + if macosx.isAquaTk(): + # Command-W on editor windows doesn't work without this. + text.bind('<<close-window>>', self.close_event) + # Some OS X systems have only one mouse button, so use + # control-click for popup context menus there. For two + # buttons, AquaTk defines <2> as the right button, not <3>. + text.bind("<Control-Button-1>",self.right_menu_event) + text.bind("<2>", self.right_menu_event) + else: + # Elsewhere, use right-click for popup menus. + text.bind("<3>",self.right_menu_event) + + text.bind('<MouseWheel>', wheel_event) + if text._windowingsystem == 'x11': + text.bind('<Button-4>', wheel_event) + text.bind('<Button-5>', wheel_event) + text.bind('<Configure>', self.handle_winconfig) + text.bind("<<cut>>", self.cut) + text.bind("<<copy>>", self.copy) + text.bind("<<paste>>", self.paste) + text.bind("<<center-insert>>", self.center_insert_event) + text.bind("<<help>>", self.help_dialog) + text.bind("<<python-docs>>", self.python_docs) + text.bind("<<about-idle>>", self.about_dialog) + text.bind("<<open-config-dialog>>", self.config_dialog) + text.bind("<<open-module>>", self.open_module_event) + text.bind("<<do-nothing>>", lambda event: "break") + text.bind("<<select-all>>", self.select_all) + text.bind("<<remove-selection>>", self.remove_selection) + text.bind("<<find>>", self.find_event) + text.bind("<<find-again>>", self.find_again_event) + text.bind("<<find-in-files>>", self.find_in_files_event) + text.bind("<<find-selection>>", self.find_selection_event) + text.bind("<<replace>>", self.replace_event) + text.bind("<<goto-line>>", self.goto_line_event) + text.bind("<<smart-backspace>>",self.smart_backspace_event) + text.bind("<<newline-and-indent>>",self.newline_and_indent_event) + text.bind("<<smart-indent>>",self.smart_indent_event) + self.fregion = fregion = self.FormatRegion(self) + # self.fregion used in smart_indent_event to access indent_region. + text.bind("<<indent-region>>", fregion.indent_region_event) + text.bind("<<dedent-region>>", fregion.dedent_region_event) + text.bind("<<comment-region>>", fregion.comment_region_event) + text.bind("<<uncomment-region>>", fregion.uncomment_region_event) + text.bind("<<tabify-region>>", fregion.tabify_region_event) + text.bind("<<untabify-region>>", fregion.untabify_region_event) + indents = self.Indents(self) + text.bind("<<toggle-tabs>>", indents.toggle_tabs_event) + text.bind("<<change-indentwidth>>", indents.change_indentwidth_event) + text.bind("<Left>", self.move_at_edge_if_selection(0)) + text.bind("<Right>", self.move_at_edge_if_selection(1)) + text.bind("<<del-word-left>>", self.del_word_left) + text.bind("<<del-word-right>>", self.del_word_right) + text.bind("<<beginning-of-line>>", self.home_callback) + + if flist: + flist.inversedict[self] = key + if key: + flist.dict[key] = self + text.bind("<<open-new-window>>", self.new_callback) + text.bind("<<close-all-windows>>", self.flist.close_all_callback) + text.bind("<<open-class-browser>>", self.open_module_browser) + text.bind("<<open-path-browser>>", self.open_path_browser) + text.bind("<<open-turtle-demo>>", self.open_turtle_demo) + + self.set_status_bar() + text_frame.pack(side=LEFT, fill=BOTH, expand=1) + text_frame.rowconfigure(1, weight=1) + text_frame.columnconfigure(1, weight=1) + vbar['command'] = self.handle_yview + vbar.grid(row=1, column=2, sticky=NSEW) + text['yscrollcommand'] = vbar.set + text['font'] = idleConf.GetFont(self.root, 'main', 'EditorWindow') + text.grid(row=1, column=1, sticky=NSEW) + text.focus_set() + self.set_width() + + # usetabs true -> literal tab characters are used by indent and + # dedent cmds, possibly mixed with spaces if + # indentwidth is not a multiple of tabwidth, + # which will cause Tabnanny to nag! + # false -> tab characters are converted to spaces by indent + # and dedent cmds, and ditto TAB keystrokes + # Although use-spaces=0 can be configured manually in config-main.def, + # configuration of tabs v. spaces is not supported in the configuration + # dialog. IDLE promotes the preferred Python indentation: use spaces! + usespaces = idleConf.GetOption('main', 'Indent', + 'use-spaces', type='bool') + self.usetabs = not usespaces + + # tabwidth is the display width of a literal tab character. + # CAUTION: telling Tk to use anything other than its default + # tab setting causes it to use an entirely different tabbing algorithm, + # treating tab stops as fixed distances from the left margin. + # Nobody expects this, so for now tabwidth should never be changed. + self.tabwidth = 8 # must remain 8 until Tk is fixed. + + # indentwidth is the number of screen characters per indent level. + # The recommended Python indentation is four spaces. + self.indentwidth = self.tabwidth + self.set_notabs_indentwidth() + + # Store the current value of the insertofftime now so we can restore + # it if needed. + if not hasattr(idleConf, 'blink_off_time'): + idleConf.blink_off_time = self.text['insertofftime'] + self.update_cursor_blink() + + # When searching backwards for a reliable place to begin parsing, + # first start num_context_lines[0] lines back, then + # num_context_lines[1] lines back if that didn't work, and so on. + # The last value should be huge (larger than the # of lines in a + # conceivable file). + # Making the initial values larger slows things down more often. + self.num_context_lines = 50, 500, 5000000 + self.per = per = self.Percolator(text) + self.undo = undo = self.UndoDelegator() + per.insertfilter(undo) + text.undo_block_start = undo.undo_block_start + text.undo_block_stop = undo.undo_block_stop + undo.set_saved_change_hook(self.saved_change_hook) + # IOBinding implements file I/O and printing functionality + self.io = io = self.IOBinding(self) + io.set_filename_change_hook(self.filename_change_hook) + self.good_load = False + self.set_indentation_params(False) + self.color = None # initialized below in self.ResetColorizer + self.code_context = None # optionally initialized later below + self.line_numbers = None # optionally initialized later below + if filename: + if os.path.exists(filename) and not os.path.isdir(filename): + if io.loadfile(filename): + self.good_load = True + is_py_src = self.ispythonsource(filename) + self.set_indentation_params(is_py_src) + else: + io.set_filename(filename) + self.good_load = True + + self.ResetColorizer() + self.saved_change_hook() + self.update_recent_files_list() + self.load_extensions() + menu = self.menudict.get('window') + if menu: + end = menu.index("end") + if end is None: + end = -1 + if end >= 0: + menu.add_separator() + end = end + 1 + self.wmenu_end = end + window.register_callback(self.postwindowsmenu) + + # Some abstractions so IDLE extensions are cross-IDE + self.askinteger = simpledialog.askinteger + self.askyesno = messagebox.askyesno + self.showerror = messagebox.showerror + + # Add pseudoevents for former extension fixed keys. + # (This probably needs to be done once in the process.) + text.event_add('<<autocomplete>>', '<Key-Tab>') + text.event_add('<<try-open-completions>>', '<KeyRelease-period>', + '<KeyRelease-slash>', '<KeyRelease-backslash>') + text.event_add('<<try-open-calltip>>', '<KeyRelease-parenleft>') + text.event_add('<<refresh-calltip>>', '<KeyRelease-parenright>') + text.event_add('<<paren-closed>>', '<KeyRelease-parenright>', + '<KeyRelease-bracketright>', '<KeyRelease-braceright>') + + # Former extension bindings depends on frame.text being packed + # (called from self.ResetColorizer()). + autocomplete = self.AutoComplete(self, self.user_input_insert_tags) + text.bind("<<autocomplete>>", autocomplete.autocomplete_event) + text.bind("<<try-open-completions>>", + autocomplete.try_open_completions_event) + text.bind("<<force-open-completions>>", + autocomplete.force_open_completions_event) + text.bind("<<expand-word>>", self.AutoExpand(self).expand_word_event) + text.bind("<<format-paragraph>>", + self.FormatParagraph(self).format_paragraph_event) + parenmatch = self.ParenMatch(self) + text.bind("<<flash-paren>>", parenmatch.flash_paren_event) + text.bind("<<paren-closed>>", parenmatch.paren_closed_event) + scriptbinding = ScriptBinding(self) + text.bind("<<check-module>>", scriptbinding.check_module_event) + text.bind("<<run-module>>", scriptbinding.run_module_event) + text.bind("<<run-custom>>", scriptbinding.run_custom_event) + text.bind("<<do-rstrip>>", self.Rstrip(self).do_rstrip) + self.ctip = ctip = self.Calltip(self) + text.bind("<<try-open-calltip>>", ctip.try_open_calltip_event) + #refresh-calltip must come after paren-closed to work right + text.bind("<<refresh-calltip>>", ctip.refresh_calltip_event) + text.bind("<<force-open-calltip>>", ctip.force_open_calltip_event) + text.bind("<<zoom-height>>", self.ZoomHeight(self).zoom_height_event) + if self.allow_code_context: + self.code_context = self.CodeContext(self) + text.bind("<<toggle-code-context>>", + self.code_context.toggle_code_context_event) + else: + self.update_menu_state('options', '*ode*ontext', 'disabled') + if self.allow_line_numbers: + self.line_numbers = self.LineNumbers(self) + if idleConf.GetOption('main', 'EditorWindow', + 'line-numbers-default', type='bool'): + self.toggle_line_numbers_event() + text.bind("<<toggle-line-numbers>>", self.toggle_line_numbers_event) + else: + self.update_menu_state('options', '*ine*umbers', 'disabled') + + def handle_winconfig(self, event=None): + self.set_width() + + def set_width(self): + text = self.text + inner_padding = sum(map(text.tk.getint, [text.cget('border'), + text.cget('padx')])) + pixel_width = text.winfo_width() - 2 * inner_padding + + # Divide the width of the Text widget by the font width, + # which is taken to be the width of '0' (zero). + # http://www.tcl.tk/man/tcl8.6/TkCmd/text.htm#M21 + zero_char_width = \ + Font(text, font=text.cget('font')).measure('0') + self.width = pixel_width // zero_char_width + + def new_callback(self, event): + dirname, basename = self.io.defaultfilename() + self.flist.new(dirname) + return "break" + + def home_callback(self, event): + if (event.state & 4) != 0 and event.keysym == "Home": + # state&4==Control. If <Control-Home>, use the Tk binding. + return None + if self.text.index("iomark") and \ + self.text.compare("iomark", "<=", "insert lineend") and \ + self.text.compare("insert linestart", "<=", "iomark"): + # In Shell on input line, go to just after prompt + insertpt = int(self.text.index("iomark").split(".")[1]) + else: + line = self.text.get("insert linestart", "insert lineend") + for insertpt in range(len(line)): + if line[insertpt] not in (' ','\t'): + break + else: + insertpt=len(line) + lineat = int(self.text.index("insert").split('.')[1]) + if insertpt == lineat: + insertpt = 0 + dest = "insert linestart+"+str(insertpt)+"c" + if (event.state&1) == 0: + # shift was not pressed + self.text.tag_remove("sel", "1.0", "end") + else: + if not self.text.index("sel.first"): + # there was no previous selection + self.text.mark_set("my_anchor", "insert") + else: + if self.text.compare(self.text.index("sel.first"), "<", + self.text.index("insert")): + self.text.mark_set("my_anchor", "sel.first") # extend back + else: + self.text.mark_set("my_anchor", "sel.last") # extend forward + first = self.text.index(dest) + last = self.text.index("my_anchor") + if self.text.compare(first,">",last): + first,last = last,first + self.text.tag_remove("sel", "1.0", "end") + self.text.tag_add("sel", first, last) + self.text.mark_set("insert", dest) + self.text.see("insert") + return "break" + + def set_status_bar(self): + self.status_bar = self.MultiStatusBar(self.top) + sep = Frame(self.top, height=1, borderwidth=1, background='grey75') + if sys.platform == "darwin": + # Insert some padding to avoid obscuring some of the statusbar + # by the resize widget. + self.status_bar.set_label('_padding1', ' ', side=RIGHT) + self.status_bar.set_label('column', 'Col: ?', side=RIGHT) + self.status_bar.set_label('line', 'Ln: ?', side=RIGHT) + self.status_bar.pack(side=BOTTOM, fill=X) + sep.pack(side=BOTTOM, fill=X) + self.text.bind("<<set-line-and-column>>", self.set_line_and_column) + self.text.event_add("<<set-line-and-column>>", + "<KeyRelease>", "<ButtonRelease>") + self.text.after_idle(self.set_line_and_column) + + def set_line_and_column(self, event=None): + line, column = self.text.index(INSERT).split('.') + self.status_bar.set_label('column', 'Col: %s' % column) + self.status_bar.set_label('line', 'Ln: %s' % line) + + + """ Menu definitions and functions. + * self.menubar - the always visible horizontal menu bar. + * mainmenu.menudefs - a list of tuples, one for each menubar item. + Each tuple pairs a lower-case name and list of dropdown items. + Each item is a name, virtual event pair or None for separator. + * mainmenu.default_keydefs - maps events to keys. + * text.keydefs - same. + * cls.menu_specs - menubar name, titlecase display form pairs + with Alt-hotkey indicator. A subset of menudefs items. + * self.menudict - map menu name to dropdown menu. + * self.recent_files_menu - 2nd level cascade in the file cascade. + * self.wmenu_end - set in __init__ (purpose unclear). + + createmenubar, postwindowsmenu, update_menu_label, update_menu_state, + ApplyKeybings (2nd part), reset_help_menu_entries, + _extra_help_callback, update_recent_files_list, + apply_bindings, fill_menus, (other functions?) + """ + + menu_specs = [ + ("file", "_File"), + ("edit", "_Edit"), + ("format", "F_ormat"), + ("run", "_Run"), + ("options", "_Options"), + ("window", "_Window"), + ("help", "_Help"), + ] + + def createmenubar(self): + """Populate the menu bar widget for the editor window. + + Each option on the menubar is itself a cascade-type Menu widget + with the menubar as the parent. The names, labels, and menu + shortcuts for the menubar items are stored in menu_specs. Each + submenu is subsequently populated in fill_menus(), except for + 'Recent Files' which is added to the File menu here. + + Instance variables: + menubar: Menu widget containing first level menu items. + menudict: Dictionary of {menuname: Menu instance} items. The keys + represent the valid menu items for this window and may be a + subset of all the menudefs available. + recent_files_menu: Menu widget contained within the 'file' menudict. + """ + mbar = self.menubar + self.menudict = menudict = {} + for name, label in self.menu_specs: + underline, label = prepstr(label) + postcommand = getattr(self, f'{name}_menu_postcommand', None) + menudict[name] = menu = Menu(mbar, name=name, tearoff=0, + postcommand=postcommand) + mbar.add_cascade(label=label, menu=menu, underline=underline) + if macosx.isCarbonTk(): + # Insert the application menu + menudict['application'] = menu = Menu(mbar, name='apple', + tearoff=0) + mbar.add_cascade(label='IDLE', menu=menu) + self.fill_menus() + self.recent_files_menu = Menu(self.menubar, tearoff=0) + self.menudict['file'].insert_cascade(3, label='Recent Files', + underline=0, + menu=self.recent_files_menu) + self.base_helpmenu_length = self.menudict['help'].index(END) + self.reset_help_menu_entries() + + def postwindowsmenu(self): + """Callback to register window. + + Only called when Window menu exists. + """ + menu = self.menudict['window'] + end = menu.index("end") + if end is None: + end = -1 + if end > self.wmenu_end: + menu.delete(self.wmenu_end+1, end) + window.add_windows_to_menu(menu) + + def update_menu_label(self, menu, index, label): + "Update label for menu item at index." + menuitem = self.menudict[menu] + menuitem.entryconfig(index, label=label) + + def update_menu_state(self, menu, index, state): + "Update state for menu item at index." + menuitem = self.menudict[menu] + menuitem.entryconfig(index, state=state) + + def handle_yview(self, event, *args): + "Handle scrollbar." + if event == 'moveto': + fraction = float(args[0]) + lines = (round(self.getlineno('end') * fraction) - + self.getlineno('@0,0')) + event = 'scroll' + args = (lines, 'units') + self.text.yview(event, *args) + return 'break' + + rmenu = None + + def right_menu_event(self, event): + text = self.text + newdex = text.index(f'@{event.x},{event.y}') + try: + in_selection = (text.compare('sel.first', '<=', newdex) and + text.compare(newdex, '<=', 'sel.last')) + except TclError: + in_selection = False + if not in_selection: + text.tag_remove("sel", "1.0", "end") + text.mark_set("insert", newdex) + if not self.rmenu: + self.make_rmenu() + rmenu = self.rmenu + self.event = event + iswin = sys.platform[:3] == 'win' + if iswin: + text.config(cursor="arrow") + + for item in self.rmenu_specs: + try: + label, eventname, verify_state = item + except ValueError: # see issue1207589 + continue + + if verify_state is None: + continue + state = getattr(self, verify_state)() + rmenu.entryconfigure(label, state=state) + + rmenu.tk_popup(event.x_root, event.y_root) + if iswin: + self.text.config(cursor="ibeam") + return "break" + + rmenu_specs = [ + # ("Label", "<<virtual-event>>", "statefuncname"), ... + ("Close", "<<close-window>>", None), # Example + ] + + def make_rmenu(self): + rmenu = Menu(self.text, tearoff=0) + for item in self.rmenu_specs: + label, eventname = item[0], item[1] + if label is not None: + def command(text=self.text, eventname=eventname): + text.event_generate(eventname) + rmenu.add_command(label=label, command=command) + else: + rmenu.add_separator() + self.rmenu = rmenu + + def rmenu_check_cut(self): + return self.rmenu_check_copy() + + def rmenu_check_copy(self): + try: + indx = self.text.index('sel.first') + except TclError: + return 'disabled' + else: + return 'normal' if indx else 'disabled' + + def rmenu_check_paste(self): + try: + self.text.tk.call('tk::GetSelection', self.text, 'CLIPBOARD') + except TclError: + return 'disabled' + else: + return 'normal' + + def about_dialog(self, event=None): + "Handle Help 'About IDLE' event." + # Synchronize with macosx.overrideRootMenu.about_dialog. + help_about.AboutDialog(self.top) + return "break" + + def config_dialog(self, event=None): + "Handle Options 'Configure IDLE' event." + # Synchronize with macosx.overrideRootMenu.config_dialog. + configdialog.ConfigDialog(self.top,'Settings') + return "break" + + def help_dialog(self, event=None): + "Handle Help 'IDLE Help' event." + # Synchronize with macosx.overrideRootMenu.help_dialog. + if self.root: + parent = self.root + else: + parent = self.top + help.show_idlehelp(parent) + return "break" + + def python_docs(self, event=None): + if sys.platform[:3] == 'win': + try: + os.startfile(self.help_url) + except OSError as why: + messagebox.showerror(title='Document Start Failure', + message=str(why), parent=self.text) + else: + webbrowser.open(self.help_url) + return "break" + + def cut(self,event): + self.text.event_generate("<<Cut>>") + return "break" + + def copy(self,event): + if not self.text.tag_ranges("sel"): + # There is no selection, so do nothing and maybe interrupt. + return None + self.text.event_generate("<<Copy>>") + return "break" + + def paste(self,event): + self.text.event_generate("<<Paste>>") + self.text.see("insert") + return "break" + + def select_all(self, event=None): + self.text.tag_add("sel", "1.0", "end-1c") + self.text.mark_set("insert", "1.0") + self.text.see("insert") + return "break" + + def remove_selection(self, event=None): + self.text.tag_remove("sel", "1.0", "end") + self.text.see("insert") + return "break" + + def move_at_edge_if_selection(self, edge_index): + """Cursor move begins at start or end of selection + + When a left/right cursor key is pressed create and return to Tkinter a + function which causes a cursor move from the associated edge of the + selection. + + """ + self_text_index = self.text.index + self_text_mark_set = self.text.mark_set + edges_table = ("sel.first+1c", "sel.last-1c") + def move_at_edge(event): + if (event.state & 5) == 0: # no shift(==1) or control(==4) pressed + try: + self_text_index("sel.first") + self_text_mark_set("insert", edges_table[edge_index]) + except TclError: + pass + return move_at_edge + + def del_word_left(self, event): + self.text.event_generate('<Meta-Delete>') + return "break" + + def del_word_right(self, event): + self.text.event_generate('<Meta-d>') + return "break" + + def find_event(self, event): + search.find(self.text) + return "break" + + def find_again_event(self, event): + search.find_again(self.text) + return "break" + + def find_selection_event(self, event): + search.find_selection(self.text) + return "break" + + def find_in_files_event(self, event): + grep.grep(self.text, self.io, self.flist) + return "break" + + def replace_event(self, event): + replace.replace(self.text) + return "break" + + def goto_line_event(self, event): + text = self.text + lineno = query.Goto( + text, "Go To Line", + "Enter a positive integer\n" + "('big' = end of file):" + ).result + if lineno is not None: + text.tag_remove("sel", "1.0", "end") + text.mark_set("insert", f'{lineno}.0') + text.see("insert") + self.set_line_and_column() + return "break" + + def open_module(self): + """Get module name from user and open it. + + Return module path or None for calls by open_module_browser + when latter is not invoked in named editor window. + """ + # XXX This, open_module_browser, and open_path_browser + # would fit better in iomenu.IOBinding. + try: + name = self.text.get("sel.first", "sel.last").strip() + except TclError: + name = '' + file_path = query.ModuleName( + self.text, "Open Module", + "Enter the name of a Python module\n" + "to search on sys.path and open:", + name).result + if file_path is not None: + if self.flist: + self.flist.open(file_path) + else: + self.io.loadfile(file_path) + return file_path + + def open_module_event(self, event): + self.open_module() + return "break" + + def open_module_browser(self, event=None): + filename = self.io.filename + if not (self.__class__.__name__ == 'PyShellEditorWindow' + and filename): + filename = self.open_module() + if filename is None: + return "break" + from idlelib import browser + browser.ModuleBrowser(self.root, filename) + return "break" + + def open_path_browser(self, event=None): + from idlelib import pathbrowser + pathbrowser.PathBrowser(self.root) + return "break" + + def open_turtle_demo(self, event = None): + import subprocess + + cmd = [sys.executable, + '-c', + 'from turtledemo.__main__ import main; main()'] + subprocess.Popen(cmd, shell=False) + return "break" + + def gotoline(self, lineno): + if lineno is not None and lineno > 0: + self.text.mark_set("insert", "%d.0" % lineno) + self.text.tag_remove("sel", "1.0", "end") + self.text.tag_add("sel", "insert", "insert +1l") + self.center() + + def ispythonsource(self, filename): + if not filename or os.path.isdir(filename): + return True + base, ext = os.path.splitext(os.path.basename(filename)) + if os.path.normcase(ext) in py_extensions: + return True + line = self.text.get('1.0', '1.0 lineend') + return line.startswith('#!') and 'python' in line + + def close_hook(self): + if self.flist: + self.flist.unregister_maybe_terminate(self) + self.flist = None + + def set_close_hook(self, close_hook): + self.close_hook = close_hook + + def filename_change_hook(self): + if self.flist: + self.flist.filename_changed_edit(self) + self.saved_change_hook() + self.top.update_windowlist_registry(self) + self.ResetColorizer() + + def _addcolorizer(self): + if self.color: + return + if self.ispythonsource(self.io.filename): + self.color = self.ColorDelegator() + # can add more colorizers here... + if self.color: + self.per.insertfilterafter(filter=self.color, after=self.undo) + + def _rmcolorizer(self): + if not self.color: + return + self.color.removecolors() + self.per.removefilter(self.color) + self.color = None + + def ResetColorizer(self): + "Update the color theme" + # Called from self.filename_change_hook and from configdialog.py + self._rmcolorizer() + self._addcolorizer() + EditorWindow.color_config(self.text) + + if self.code_context is not None: + self.code_context.update_highlight_colors() + + if self.line_numbers is not None: + self.line_numbers.update_colors() + + IDENTCHARS = string.ascii_letters + string.digits + "_" + + def colorize_syntax_error(self, text, pos): + text.tag_add("ERROR", pos) + char = text.get(pos) + if char and char in self.IDENTCHARS: + text.tag_add("ERROR", pos + " wordstart", pos) + if '\n' == text.get(pos): # error at line end + text.mark_set("insert", pos) + else: + text.mark_set("insert", pos + "+1c") + text.see(pos) + + def update_cursor_blink(self): + "Update the cursor blink configuration." + cursorblink = idleConf.GetOption( + 'main', 'EditorWindow', 'cursor-blink', type='bool') + if not cursorblink: + self.text['insertofftime'] = 0 + else: + # Restore the original value + self.text['insertofftime'] = idleConf.blink_off_time + + def ResetFont(self): + "Update the text widgets' font if it is changed" + # Called from configdialog.py + + # Update the code context widget first, since its height affects + # the height of the text widget. This avoids double re-rendering. + if self.code_context is not None: + self.code_context.update_font() + # Next, update the line numbers widget, since its width affects + # the width of the text widget. + if self.line_numbers is not None: + self.line_numbers.update_font() + # Finally, update the main text widget. + new_font = idleConf.GetFont(self.root, 'main', 'EditorWindow') + self.text['font'] = new_font + self.set_width() + + def RemoveKeybindings(self): + """Remove the virtual, configurable keybindings. + + Leaves the default Tk Text keybindings. + """ + # Called from configdialog.deactivate_current_config. + self.mainmenu.default_keydefs = keydefs = idleConf.GetCurrentKeySet() + for event, keylist in keydefs.items(): + self.text.event_delete(event, *keylist) + for extensionName in self.get_standard_extension_names(): + xkeydefs = idleConf.GetExtensionBindings(extensionName) + if xkeydefs: + for event, keylist in xkeydefs.items(): + self.text.event_delete(event, *keylist) + + def ApplyKeybindings(self): + """Apply the virtual, configurable keybindings. + + Also update hotkeys to current keyset. + """ + # Called from configdialog.activate_config_changes. + self.mainmenu.default_keydefs = keydefs = idleConf.GetCurrentKeySet() + self.apply_bindings() + for extensionName in self.get_standard_extension_names(): + xkeydefs = idleConf.GetExtensionBindings(extensionName) + if xkeydefs: + self.apply_bindings(xkeydefs) + + # Update menu accelerators. + menuEventDict = {} + for menu in self.mainmenu.menudefs: + menuEventDict[menu[0]] = {} + for item in menu[1]: + if item: + menuEventDict[menu[0]][prepstr(item[0])[1]] = item[1] + for menubarItem in self.menudict: + menu = self.menudict[menubarItem] + end = menu.index(END) + if end is None: + # Skip empty menus + continue + end += 1 + for index in range(0, end): + if menu.type(index) == 'command': + accel = menu.entrycget(index, 'accelerator') + if accel: + itemName = menu.entrycget(index, 'label') + event = '' + if menubarItem in menuEventDict: + if itemName in menuEventDict[menubarItem]: + event = menuEventDict[menubarItem][itemName] + if event: + accel = get_accelerator(keydefs, event) + menu.entryconfig(index, accelerator=accel) + + def set_notabs_indentwidth(self): + "Update the indentwidth if changed and not using tabs in this window" + # Called from configdialog.py + if not self.usetabs: + self.indentwidth = idleConf.GetOption('main', 'Indent','num-spaces', + type='int') + + def reset_help_menu_entries(self): + """Update the additional help entries on the Help menu.""" + help_list = idleConf.GetAllExtraHelpSourcesList() + helpmenu = self.menudict['help'] + # First delete the extra help entries, if any. + helpmenu_length = helpmenu.index(END) + if helpmenu_length > self.base_helpmenu_length: + helpmenu.delete((self.base_helpmenu_length + 1), helpmenu_length) + # Then rebuild them. + if help_list: + helpmenu.add_separator() + for entry in help_list: + cmd = self._extra_help_callback(entry[1]) + helpmenu.add_command(label=entry[0], command=cmd) + # And update the menu dictionary. + self.menudict['help'] = helpmenu + + def _extra_help_callback(self, resource): + """Return a callback that loads resource (file or web page).""" + def display_extra_help(helpfile=resource): + if not helpfile.startswith(('www', 'http')): + helpfile = os.path.normpath(helpfile) + if sys.platform[:3] == 'win': + try: + os.startfile(helpfile) + except OSError as why: + messagebox.showerror(title='Document Start Failure', + message=str(why), parent=self.text) + else: + webbrowser.open(helpfile) + return display_extra_help + + def update_recent_files_list(self, new_file=None): + "Load and update the recent files list and menus" + # TODO: move to iomenu. + rf_list = [] + file_path = self.recent_files_path + if file_path and os.path.exists(file_path): + with open(file_path, + encoding='utf_8', errors='replace') as rf_list_file: + rf_list = rf_list_file.readlines() + if new_file: + new_file = os.path.abspath(new_file) + '\n' + if new_file in rf_list: + rf_list.remove(new_file) # move to top + rf_list.insert(0, new_file) + # clean and save the recent files list + bad_paths = [] + for path in rf_list: + if '\0' in path or not os.path.exists(path[0:-1]): + bad_paths.append(path) + rf_list = [path for path in rf_list if path not in bad_paths] + ulchars = "1234567890ABCDEFGHIJK" + rf_list = rf_list[0:len(ulchars)] + if file_path: + try: + with open(file_path, 'w', + encoding='utf_8', errors='replace') as rf_file: + rf_file.writelines(rf_list) + except OSError as err: + if not getattr(self.root, "recentfiles_message", False): + self.root.recentfiles_message = True + messagebox.showwarning(title='IDLE Warning', + message="Cannot save Recent Files list to disk.\n" + f" {err}\n" + "Select OK to continue.", + parent=self.text) + # for each edit window instance, construct the recent files menu + for instance in self.top.instance_dict: + menu = instance.recent_files_menu + menu.delete(0, END) # clear, and rebuild: + for i, file_name in enumerate(rf_list): + file_name = file_name.rstrip() # zap \n + callback = instance.__recent_file_callback(file_name) + menu.add_command(label=ulchars[i] + " " + file_name, + command=callback, + underline=0) + + def __recent_file_callback(self, file_name): + def open_recent_file(fn_closure=file_name): + self.io.open(editFile=fn_closure) + return open_recent_file + + def saved_change_hook(self): + short = self.short_title() + long = self.long_title() + _py_version = ' (%s)' % platform.python_version() + if short and long and not macosx.isCocoaTk(): + # Don't use both values on macOS because + # that doesn't match platform conventions. + title = short + " - " + long + _py_version + elif short: + if short == "IDLE Shell": + title = short + " " + platform.python_version() + else: + title = short + _py_version + elif long: + title = long + else: + title = "untitled" + icon = short or long or title + if not self.get_saved(): + title = "*%s*" % title + icon = "*%s" % icon + self.top.wm_title(title) + self.top.wm_iconname(icon) + + if macosx.isCocoaTk(): + # Add a proxy icon to the window title + self.top.wm_attributes("-titlepath", long) + + # Maintain the modification status for the window + self.top.wm_attributes("-modified", not self.get_saved()) + + def get_saved(self): + return self.undo.get_saved() + + def set_saved(self, flag): + self.undo.set_saved(flag) + + def reset_undo(self): + self.undo.reset_undo() + + def short_title(self): + filename = self.io.filename + return os.path.basename(filename) if filename else "untitled" + + def long_title(self): + return self.io.filename or "" + + def center_insert_event(self, event): + self.center() + return "break" + + def center(self, mark="insert"): + text = self.text + top, bot = self.getwindowlines() + lineno = self.getlineno(mark) + height = bot - top + newtop = max(1, lineno - height//2) + text.yview(float(newtop)) + + def getwindowlines(self): + text = self.text + top = self.getlineno("@0,0") + bot = self.getlineno("@0,65535") + if top == bot and text.winfo_height() == 1: + # Geometry manager hasn't run yet + height = int(text['height']) + bot = top + height - 1 + return top, bot + + def getlineno(self, mark="insert"): + text = self.text + return int(float(text.index(mark))) + + def get_geometry(self): + "Return (width, height, x, y)" + geom = self.top.wm_geometry() + m = re.match(r"(\d+)x(\d+)\+(-?\d+)\+(-?\d+)", geom) + return list(map(int, m.groups())) + + def close_event(self, event): + self.close() + return "break" + + def maybesave(self): + if self.io: + if not self.get_saved(): + if self.top.state()!='normal': + self.top.deiconify() + self.top.lower() + self.top.lift() + return self.io.maybesave() + + def close(self): + try: + reply = self.maybesave() + if str(reply) != "cancel": + self._close() + return reply + except AttributeError: # bpo-35379: close called twice + pass + + def _close(self): + if self.io.filename: + self.update_recent_files_list(new_file=self.io.filename) + window.unregister_callback(self.postwindowsmenu) + self.unload_extensions() + self.io.close() + self.io = None + self.undo = None + if self.color: + self.color.close() + self.color = None + self.text = None + self.tkinter_vars = None + self.per.close() + self.per = None + self.top.destroy() + if self.close_hook: + # unless override: unregister from flist, terminate if last window + self.close_hook() + + def load_extensions(self): + self.extensions = {} + self.load_standard_extensions() + + def unload_extensions(self): + for ins in list(self.extensions.values()): + if hasattr(ins, "close"): + ins.close() + self.extensions = {} + + def load_standard_extensions(self): + for name in self.get_standard_extension_names(): + try: + self.load_extension(name) + except: + print("Failed to load extension", repr(name)) + traceback.print_exc() + + def get_standard_extension_names(self): + return idleConf.GetExtensions(editor_only=True) + + extfiles = { # Map built-in config-extension section names to file names. + 'ZzDummy': 'zzdummy', + } + + def load_extension(self, name): + fname = self.extfiles.get(name, name) + try: + try: + mod = importlib.import_module('.' + fname, package=__package__) + except (ImportError, TypeError): + mod = importlib.import_module(fname) + except ImportError: + print("\nFailed to import extension: ", name) + raise + cls = getattr(mod, name) + keydefs = idleConf.GetExtensionBindings(name) + if hasattr(cls, "menudefs"): + self.fill_menus(cls.menudefs, keydefs) + ins = cls(self) + self.extensions[name] = ins + if keydefs: + self.apply_bindings(keydefs) + for vevent in keydefs: + methodname = vevent.replace("-", "_") + while methodname[:1] == '<': + methodname = methodname[1:] + while methodname[-1:] == '>': + methodname = methodname[:-1] + methodname = methodname + "_event" + if hasattr(ins, methodname): + self.text.bind(vevent, getattr(ins, methodname)) + + def apply_bindings(self, keydefs=None): + """Add events with keys to self.text.""" + if keydefs is None: + keydefs = self.mainmenu.default_keydefs + text = self.text + text.keydefs = keydefs + for event, keylist in keydefs.items(): + if keylist: + text.event_add(event, *keylist) + + def fill_menus(self, menudefs=None, keydefs=None): + """Fill in dropdown menus used by this window. + + Items whose name begins with '!' become checkbuttons. + Other names indicate commands. None becomes a separator. + """ + if menudefs is None: + menudefs = self.mainmenu.menudefs + if keydefs is None: + keydefs = self.mainmenu.default_keydefs + menudict = self.menudict + text = self.text + for mname, entrylist in menudefs: + menu = menudict.get(mname) + if not menu: + continue + for entry in entrylist: + if entry is None: + menu.add_separator() + else: + label, eventname = entry + checkbutton = (label[:1] == '!') + if checkbutton: + label = label[1:] + underline, label = prepstr(label) + accelerator = get_accelerator(keydefs, eventname) + def command(text=text, eventname=eventname): + text.event_generate(eventname) + if checkbutton: + var = self.get_var_obj(eventname, BooleanVar) + menu.add_checkbutton(label=label, underline=underline, + command=command, accelerator=accelerator, + variable=var) + else: + menu.add_command(label=label, underline=underline, + command=command, + accelerator=accelerator) + + def getvar(self, name): + var = self.get_var_obj(name) + if var: + value = var.get() + return value + else: + raise NameError(name) + + def setvar(self, name, value, vartype=None): + var = self.get_var_obj(name, vartype) + if var: + var.set(value) + else: + raise NameError(name) + + def get_var_obj(self, eventname, vartype=None): + """Return a tkinter variable instance for the event. + """ + var = self.tkinter_vars.get(eventname) + if not var and vartype: + # Create a Tkinter variable object. + self.tkinter_vars[eventname] = var = vartype(self.text) + return var + + # Tk implementations of "virtual text methods" -- each platform + # reusing IDLE's support code needs to define these for its GUI's + # flavor of widget. + + # Is character at text_index in a Python string? Return 0 for + # "guaranteed no", true for anything else. This info is expensive + # to compute ab initio, but is probably already known by the + # platform's colorizer. + + def is_char_in_string(self, text_index): + if self.color: + # Return true iff colorizer hasn't (re)gotten this far + # yet, or the character is tagged as being in a string + return self.text.tag_prevrange("TODO", text_index) or \ + "STRING" in self.text.tag_names(text_index) + else: + # The colorizer is missing: assume the worst + return 1 + + # If a selection is defined in the text widget, return (start, + # end) as Tkinter text indices, otherwise return (None, None) + def get_selection_indices(self): + try: + first = self.text.index("sel.first") + last = self.text.index("sel.last") + return first, last + except TclError: + return None, None + + # Return the text widget's current view of what a tab stop means + # (equivalent width in spaces). + + def get_tk_tabwidth(self): + current = self.text['tabs'] or TK_TABWIDTH_DEFAULT + return int(current) + + # Set the text widget's current view of what a tab stop means. + + def set_tk_tabwidth(self, newtabwidth): + text = self.text + if self.get_tk_tabwidth() != newtabwidth: + # Set text widget tab width + pixels = text.tk.call("font", "measure", text["font"], + "-displayof", text.master, + "n" * newtabwidth) + text.configure(tabs=pixels) + +### begin autoindent code ### (configuration was moved to beginning of class) + + def set_indentation_params(self, is_py_src, guess=True): + if is_py_src and guess: + i = self.guess_indent() + if 2 <= i <= 8: + self.indentwidth = i + if self.indentwidth != self.tabwidth: + self.usetabs = False + self.set_tk_tabwidth(self.tabwidth) + + def smart_backspace_event(self, event): + text = self.text + first, last = self.get_selection_indices() + if first and last: + text.delete(first, last) + text.mark_set("insert", first) + return "break" + # Delete whitespace left, until hitting a real char or closest + # preceding virtual tab stop. + chars = text.get("insert linestart", "insert") + if chars == '': + if text.compare("insert", ">", "1.0"): + # easy: delete preceding newline + text.delete("insert-1c") + else: + text.bell() # at start of buffer + return "break" + if chars[-1] not in " \t": + # easy: delete preceding real char + text.delete("insert-1c") + return "break" + # Ick. It may require *inserting* spaces if we back up over a + # tab character! This is written to be clear, not fast. + tabwidth = self.tabwidth + have = len(chars.expandtabs(tabwidth)) + assert have > 0 + want = ((have - 1) // self.indentwidth) * self.indentwidth + # Debug prompt is multilined.... + ncharsdeleted = 0 + while True: + chars = chars[:-1] + ncharsdeleted = ncharsdeleted + 1 + have = len(chars.expandtabs(tabwidth)) + if have <= want or chars[-1] not in " \t": + break + text.undo_block_start() + text.delete("insert-%dc" % ncharsdeleted, "insert") + if have < want: + text.insert("insert", ' ' * (want - have), + self.user_input_insert_tags) + text.undo_block_stop() + return "break" + + def smart_indent_event(self, event): + # if intraline selection: + # delete it + # elif multiline selection: + # do indent-region + # else: + # indent one level + text = self.text + first, last = self.get_selection_indices() + text.undo_block_start() + try: + if first and last: + if index2line(first) != index2line(last): + return self.fregion.indent_region_event(event) + text.delete(first, last) + text.mark_set("insert", first) + prefix = text.get("insert linestart", "insert") + raw, effective = get_line_indent(prefix, self.tabwidth) + if raw == len(prefix): + # only whitespace to the left + self.reindent_to(effective + self.indentwidth) + else: + # tab to the next 'stop' within or to right of line's text: + if self.usetabs: + pad = '\t' + else: + effective = len(prefix.expandtabs(self.tabwidth)) + n = self.indentwidth + pad = ' ' * (n - effective % n) + text.insert("insert", pad, self.user_input_insert_tags) + text.see("insert") + return "break" + finally: + text.undo_block_stop() + + def newline_and_indent_event(self, event): + """Insert a newline and indentation after Enter keypress event. + + Properly position the cursor on the new line based on information + from the current line. This takes into account if the current line + is a shell prompt, is empty, has selected text, contains a block + opener, contains a block closer, is a continuation line, or + is inside a string. + """ + text = self.text + first, last = self.get_selection_indices() + text.undo_block_start() + try: # Close undo block and expose new line in finally clause. + if first and last: + text.delete(first, last) + text.mark_set("insert", first) + line = text.get("insert linestart", "insert") + + # Count leading whitespace for indent size. + i, n = 0, len(line) + while i < n and line[i] in " \t": + i += 1 + if i == n: + # The cursor is in or at leading indentation in a continuation + # line; just inject an empty line at the start. + text.insert("insert linestart", '\n', + self.user_input_insert_tags) + return "break" + indent = line[:i] + + # Strip whitespace before insert point unless it's in the prompt. + i = 0 + while line and line[-1] in " \t": + line = line[:-1] + i += 1 + if i: + text.delete("insert - %d chars" % i, "insert") + + # Strip whitespace after insert point. + while text.get("insert") in " \t": + text.delete("insert") + + # Insert new line. + text.insert("insert", '\n', self.user_input_insert_tags) + + # Adjust indentation for continuations and block open/close. + # First need to find the last statement. + lno = index2line(text.index('insert')) + y = pyparse.Parser(self.indentwidth, self.tabwidth) + if not self.prompt_last_line: + for context in self.num_context_lines: + startat = max(lno - context, 1) + startatindex = repr(startat) + ".0" + rawtext = text.get(startatindex, "insert") + y.set_code(rawtext) + bod = y.find_good_parse_start( + self._build_char_in_string_func(startatindex)) + if bod is not None or startat == 1: + break + y.set_lo(bod or 0) + else: + r = text.tag_prevrange("console", "insert") + if r: + startatindex = r[1] + else: + startatindex = "1.0" + rawtext = text.get(startatindex, "insert") + y.set_code(rawtext) + y.set_lo(0) + + c = y.get_continuation_type() + if c != pyparse.C_NONE: + # The current statement hasn't ended yet. + if c == pyparse.C_STRING_FIRST_LINE: + # After the first line of a string do not indent at all. + pass + elif c == pyparse.C_STRING_NEXT_LINES: + # Inside a string which started before this line; + # just mimic the current indent. + text.insert("insert", indent, self.user_input_insert_tags) + elif c == pyparse.C_BRACKET: + # Line up with the first (if any) element of the + # last open bracket structure; else indent one + # level beyond the indent of the line with the + # last open bracket. + self.reindent_to(y.compute_bracket_indent()) + elif c == pyparse.C_BACKSLASH: + # If more than one line in this statement already, just + # mimic the current indent; else if initial line + # has a start on an assignment stmt, indent to + # beyond leftmost =; else to beyond first chunk of + # non-whitespace on initial line. + if y.get_num_lines_in_stmt() > 1: + text.insert("insert", indent, + self.user_input_insert_tags) + else: + self.reindent_to(y.compute_backslash_indent()) + else: + assert 0, f"bogus continuation type {c!r}" + return "break" + + # This line starts a brand new statement; indent relative to + # indentation of initial line of closest preceding + # interesting statement. + indent = y.get_base_indent_string() + text.insert("insert", indent, self.user_input_insert_tags) + if y.is_block_opener(): + self.smart_indent_event(event) + elif indent and y.is_block_closer(): + self.smart_backspace_event(event) + return "break" + finally: + text.see("insert") + text.undo_block_stop() + + # Our editwin provides an is_char_in_string function that works + # with a Tk text index, but PyParse only knows about offsets into + # a string. This builds a function for PyParse that accepts an + # offset. + + def _build_char_in_string_func(self, startindex): + def inner(offset, _startindex=startindex, + _icis=self.is_char_in_string): + return _icis(_startindex + "+%dc" % offset) + return inner + + # XXX this isn't bound to anything -- see tabwidth comments +## def change_tabwidth_event(self, event): +## new = self._asktabwidth() +## if new != self.tabwidth: +## self.tabwidth = new +## self.set_indentation_params(0, guess=0) +## return "break" + + # Make string that displays as n leading blanks. + + def _make_blanks(self, n): + if self.usetabs: + ntabs, nspaces = divmod(n, self.tabwidth) + return '\t' * ntabs + ' ' * nspaces + else: + return ' ' * n + + # Delete from beginning of line to insert point, then reinsert + # column logical (meaning use tabs if appropriate) spaces. + + def reindent_to(self, column): + text = self.text + text.undo_block_start() + if text.compare("insert linestart", "!=", "insert"): + text.delete("insert linestart", "insert") + if column: + text.insert("insert", self._make_blanks(column), + self.user_input_insert_tags) + text.undo_block_stop() + + # Guess indentwidth from text content. + # Return guessed indentwidth. This should not be believed unless + # it's in a reasonable range (e.g., it will be 0 if no indented + # blocks are found). + + def guess_indent(self): + opener, indented = IndentSearcher(self.text).run() + if opener and indented: + raw, indentsmall = get_line_indent(opener, self.tabwidth) + raw, indentlarge = get_line_indent(indented, self.tabwidth) + else: + indentsmall = indentlarge = 0 + return indentlarge - indentsmall + + def toggle_line_numbers_event(self, event=None): + if self.line_numbers is None: + return + + if self.line_numbers.is_shown: + self.line_numbers.hide_sidebar() + menu_label = "Show" + else: + self.line_numbers.show_sidebar() + menu_label = "Hide" + self.update_menu_label(menu='options', index='*ine*umbers', + label=f'{menu_label} Line Numbers') + +# "line.col" -> line, as an int +def index2line(index): + return int(float(index)) + + +_line_indent_re = re.compile(r'[ \t]*') +def get_line_indent(line, tabwidth): + """Return a line's indentation as (# chars, effective # of spaces). + + The effective # of spaces is the length after properly "expanding" + the tabs into spaces, as done by str.expandtabs(tabwidth). + """ + m = _line_indent_re.match(line) + return m.end(), len(m.group().expandtabs(tabwidth)) + + +class IndentSearcher: + "Manage initial indent guess, returned by run method." + + def __init__(self, text): + self.text = text + self.i = self.finished = 0 + self.blkopenline = self.indentedline = None + + def readline(self): + if self.finished: + return "" + i = self.i = self.i + 1 + mark = repr(i) + ".0" + if self.text.compare(mark, ">=", "end"): + return "" + return self.text.get(mark, mark + " lineend+1c") + + def tokeneater(self, type, token, start, end, line, + INDENT=tokenize.INDENT, + NAME=tokenize.NAME, + OPENERS=('class', 'def', 'for', 'if', 'match', 'try', + 'while', 'with')): + if self.finished: + pass + elif type == NAME and token in OPENERS: + self.blkopenline = line + elif type == INDENT and self.blkopenline: + self.indentedline = line + self.finished = 1 + + def run(self): + """Return 2 lines containing block opener and indent. + + Either the indent line or both may be None. + """ + try: + tokens = tokenize.generate_tokens(self.readline) + for token in tokens: + self.tokeneater(*token) + except (tokenize.TokenError, SyntaxError): + # Stopping the tokenizer early can trigger spurious errors. + pass + return self.blkopenline, self.indentedline + +### end autoindent code ### + + +def prepstr(s): + """Extract the underscore from a string. + + For example, prepstr("Co_py") returns (2, "Copy"). + + Args: + s: String with underscore. + + Returns: + Tuple of (position of underscore, string without underscore). + """ + i = s.find('_') + if i >= 0: + s = s[:i] + s[i+1:] + return i, s + + +keynames = { + 'bracketleft': '[', + 'bracketright': ']', + 'slash': '/', +} + +def get_accelerator(keydefs, eventname): + """Return a formatted string for the keybinding of an event. + + Convert the first keybinding for a given event to a form that + can be displayed as an accelerator on the menu. + + Args: + keydefs: Dictionary of valid events to keybindings. + eventname: Event to retrieve keybinding for. + + Returns: + Formatted string of the keybinding. + """ + keylist = keydefs.get(eventname) + # issue10940: temporary workaround to prevent hang with OS X Cocoa Tk 8.5 + # if not keylist: + if (not keylist) or (macosx.isCocoaTk() and eventname in { + "<<open-module>>", + "<<goto-line>>", + "<<change-indentwidth>>"}): + return "" + s = keylist[0] + # Convert strings of the form -singlelowercase to -singleuppercase. + s = re.sub(r"-[a-z]\b", lambda m: m.group().upper(), s) + # Convert certain keynames to their symbol. + s = re.sub(r"\b\w+\b", lambda m: keynames.get(m.group(), m.group()), s) + # Remove Key- from string. + s = re.sub("Key-", "", s) + # Convert Cancel to Ctrl-Break. + s = re.sub("Cancel", "Ctrl-Break", s) # dscherer@cmu.edu + # Convert Control to Ctrl-. + s = re.sub("Control-", "Ctrl-", s) + # Change - to +. + s = re.sub("-", "+", s) + # Change >< to space. + s = re.sub("><", " ", s) + # Remove <. + s = re.sub("<", "", s) + # Remove >. + s = re.sub(">", "", s) + return s + + +def fixwordbreaks(root): + # On Windows, tcl/tk breaks 'words' only on spaces, as in Command Prompt. + # We want Motif style everywhere. See #21474, msg218992 and followup. + tk = root.tk + tk.call('tcl_wordBreakAfter', 'a b', 0) # make sure word.tcl is loaded + tk.call('set', 'tcl_wordchars', r'\w') + tk.call('set', 'tcl_nonwordchars', r'\W') + + +def _editor_window(parent): # htest # + # error if close master window first - timer event, after script + root = parent + fixwordbreaks(root) + if sys.argv[1:]: + filename = sys.argv[1] + else: + filename = None + macosx.setupApp(root, None) + edit = EditorWindow(root=root, filename=filename) + text = edit.text + text['height'] = 10 + for i in range(20): + text.insert('insert', ' '*i + str(i) + '\n') + # text.bind("<<close-all-windows>>", edit.close_event) + # Does not stop error, neither does following + # edit.text.bind("<<close-window>>", edit.close_event) + + +if __name__ == '__main__': + from unittest import main + main('idlelib.idle_test.test_editor', verbosity=2, exit=False) + + from idlelib.idle_test.htest import run + run(_editor_window) diff --git a/Lib/idlelib/extend.txt b/Lib/idlelib/extend.txt new file mode 100644 index 000000000..2522758ce --- /dev/null +++ b/Lib/idlelib/extend.txt @@ -0,0 +1,83 @@ +Writing an IDLE extension +========================= + +An IDLE extension can define new key bindings and menu entries for IDLE +edit windows. There is a simple mechanism to load extensions when IDLE +starts up and to attach them to each edit window. (It is also possible +to make other changes to IDLE, but this must be done by editing the IDLE +source code.) + +The list of extensions loaded at startup time is configured by editing +the file config-extensions.def. See below for details. + +An IDLE extension is defined by a class. Methods of the class define +actions that are invoked by event bindings or menu entries. Class (or +instance) variables define the bindings and menu additions; these are +automatically applied by IDLE when the extension is linked to an edit +window. + +An IDLE extension class is instantiated with a single argument, +`editwin', an EditorWindow instance. The extension cannot assume much +about this argument, but it is guaranteed to have the following instance +variables: + + text a Text instance (a widget) + io an IOBinding instance (more about this later) + flist the FileList instance (shared by all edit windows) + +(There are a few more, but they are rarely useful.) + +The extension class must not directly bind Window Manager (e.g. X) events. +Rather, it must define one or more virtual events, e.g. <<z-in>>, and +corresponding methods, e.g. z_in_event(). The virtual events will be +bound to the corresponding methods, and Window Manager events can then be bound +to the virtual events. (This indirection is done so that the key bindings can +easily be changed, and so that other sources of virtual events can exist, such +as menu entries.) + +An extension can define menu entries. This is done with a class or instance +variable named menudefs; it should be a list of pairs, where each pair is a +menu name (lowercase) and a list of menu entries. Each menu entry is either +None (to insert a separator entry) or a pair of strings (menu_label, +virtual_event). Here, menu_label is the label of the menu entry, and +virtual_event is the virtual event to be generated when the entry is selected. +An underscore in the menu label is removed; the character following the +underscore is displayed underlined, to indicate the shortcut character (for +Windows). + +At the moment, extensions cannot define whole new menus; they must define +entries in existing menus. Some menus are not present on some windows; such +entry definitions are then ignored, but key bindings are still applied. (This +should probably be refined in the future.) + +Extensions are not required to define menu entries for all the events they +implement. (They are also not required to create keybindings, but in that +case there must be empty bindings in config-extensions.def) + +Here is a partial example from zzdummy.py: + +class ZzDummy: + + menudefs = [ + ('format', [ + ('Z in', '<<z-in>>'), + ('Z out', '<<z-out>>'), + ] ) + ] + + def __init__(self, editwin): + self.editwin = editwin + + def z_in_event(self, event=None): + "...Do what you want here..." + +The final piece of the puzzle is the file "config-extensions.def", which is +used to configure the loading of extensions and to establish key (or, more +generally, event) bindings to the virtual events defined in the extensions. + +See the comments at the top of config-extensions.def for information. It's +currently necessary to manually modify that file to change IDLE's extension +loading or extension key bindings. + +For further information on binding refer to the Tkinter Resources web page at +python.org and to the Tk Command "bind" man page. diff --git a/Lib/idlelib/filelist.py b/Lib/idlelib/filelist.py new file mode 100644 index 000000000..e27e5d32a --- /dev/null +++ b/Lib/idlelib/filelist.py @@ -0,0 +1,132 @@ +"idlelib.filelist" + +import os +from tkinter import messagebox + + +class FileList: + + # N.B. this import overridden in PyShellFileList. + from idlelib.editor import EditorWindow + + def __init__(self, root): + self.root = root + self.dict = {} + self.inversedict = {} + self.vars = {} # For EditorWindow.getrawvar (shared Tcl variables) + + def open(self, filename, action=None): + assert filename + filename = self.canonize(filename) + if os.path.isdir(filename): + # This can happen when bad filename is passed on command line: + messagebox.showerror( + "File Error", + f"{filename!r} is a directory.", + master=self.root) + return None + key = os.path.normcase(filename) + if key in self.dict: + edit = self.dict[key] + edit.top.wakeup() + return edit + if action: + # Don't create window, perform 'action', e.g. open in same window + return action(filename) + else: + edit = self.EditorWindow(self, filename, key) + if edit.good_load: + return edit + else: + edit._close() + return None + + def gotofileline(self, filename, lineno=None): + edit = self.open(filename) + if edit is not None and lineno is not None: + edit.gotoline(lineno) + + def new(self, filename=None): + return self.EditorWindow(self, filename) + + def close_all_callback(self, *args, **kwds): + for edit in list(self.inversedict): + reply = edit.close() + if reply == "cancel": + break + return "break" + + def unregister_maybe_terminate(self, edit): + try: + key = self.inversedict[edit] + except KeyError: + print("Don't know this EditorWindow object. (close)") + return + if key: + del self.dict[key] + del self.inversedict[edit] + if not self.inversedict: + self.root.quit() + + def filename_changed_edit(self, edit): + edit.saved_change_hook() + try: + key = self.inversedict[edit] + except KeyError: + print("Don't know this EditorWindow object. (rename)") + return + filename = edit.io.filename + if not filename: + if key: + del self.dict[key] + self.inversedict[edit] = None + return + filename = self.canonize(filename) + newkey = os.path.normcase(filename) + if newkey == key: + return + if newkey in self.dict: + conflict = self.dict[newkey] + self.inversedict[conflict] = None + messagebox.showerror( + "Name Conflict", + f"You now have multiple edit windows open for {filename!r}", + master=self.root) + self.dict[newkey] = edit + self.inversedict[edit] = newkey + if key: + try: + del self.dict[key] + except KeyError: + pass + + def canonize(self, filename): + if not os.path.isabs(filename): + try: + pwd = os.getcwd() + except OSError: + pass + else: + filename = os.path.join(pwd, filename) + return os.path.normpath(filename) + + +def _test(): # TODO check and convert to htest + from tkinter import Tk + from idlelib.editor import fixwordbreaks + from idlelib.run import fix_scaling + root = Tk() + fix_scaling(root) + fixwordbreaks(root) + root.withdraw() + flist = FileList(root) + flist.new() + if flist.inversedict: + root.mainloop() + + +if __name__ == '__main__': + from unittest import main + main('idlelib.idle_test.test_filelist', verbosity=2) + +# _test() diff --git a/Lib/idlelib/format.py b/Lib/idlelib/format.py new file mode 100644 index 000000000..4b57a182c --- /dev/null +++ b/Lib/idlelib/format.py @@ -0,0 +1,426 @@ +"""Format all or a selected region (line slice) of text. + +Region formatting options: paragraph, comment block, indent, deindent, +comment, uncomment, tabify, and untabify. + +File renamed from paragraph.py with functions added from editor.py. +""" +import re +from tkinter.messagebox import askyesno +from tkinter.simpledialog import askinteger +from idlelib.config import idleConf + + +class FormatParagraph: + """Format a paragraph, comment block, or selection to a max width. + + Does basic, standard text formatting, and also understands Python + comment blocks. Thus, for editing Python source code, this + extension is really only suitable for reformatting these comment + blocks or triple-quoted strings. + + Known problems with comment reformatting: + * If there is a selection marked, and the first line of the + selection is not complete, the block will probably not be detected + as comments, and will have the normal "text formatting" rules + applied. + * If a comment block has leading whitespace that mixes tabs and + spaces, they will not be considered part of the same block. + * Fancy comments, like this bulleted list, aren't handled :-) + """ + def __init__(self, editwin): + self.editwin = editwin + + @classmethod + def reload(cls): + cls.max_width = idleConf.GetOption('extensions', 'FormatParagraph', + 'max-width', type='int', default=72) + + def close(self): + self.editwin = None + + def format_paragraph_event(self, event, limit=None): + """Formats paragraph to a max width specified in idleConf. + + If text is selected, format_paragraph_event will start breaking lines + at the max width, starting from the beginning selection. + + If no text is selected, format_paragraph_event uses the current + cursor location to determine the paragraph (lines of text surrounded + by blank lines) and formats it. + + The length limit parameter is for testing with a known value. + """ + limit = self.max_width if limit is None else limit + text = self.editwin.text + first, last = self.editwin.get_selection_indices() + if first and last: + data = text.get(first, last) + comment_header = get_comment_header(data) + else: + first, last, comment_header, data = \ + find_paragraph(text, text.index("insert")) + if comment_header: + newdata = reformat_comment(data, limit, comment_header) + else: + newdata = reformat_paragraph(data, limit) + text.tag_remove("sel", "1.0", "end") + + if newdata != data: + text.mark_set("insert", first) + text.undo_block_start() + text.delete(first, last) + text.insert(first, newdata) + text.undo_block_stop() + else: + text.mark_set("insert", last) + text.see("insert") + return "break" + + +FormatParagraph.reload() + +def find_paragraph(text, mark): + """Returns the start/stop indices enclosing the paragraph that mark is in. + + Also returns the comment format string, if any, and paragraph of text + between the start/stop indices. + """ + lineno, col = map(int, mark.split(".")) + line = text.get("%d.0" % lineno, "%d.end" % lineno) + + # Look for start of next paragraph if the index passed in is a blank line + while text.compare("%d.0" % lineno, "<", "end") and is_all_white(line): + lineno = lineno + 1 + line = text.get("%d.0" % lineno, "%d.end" % lineno) + first_lineno = lineno + comment_header = get_comment_header(line) + comment_header_len = len(comment_header) + + # Once start line found, search for end of paragraph (a blank line) + while get_comment_header(line)==comment_header and \ + not is_all_white(line[comment_header_len:]): + lineno = lineno + 1 + line = text.get("%d.0" % lineno, "%d.end" % lineno) + last = "%d.0" % lineno + + # Search back to beginning of paragraph (first blank line before) + lineno = first_lineno - 1 + line = text.get("%d.0" % lineno, "%d.end" % lineno) + while lineno > 0 and \ + get_comment_header(line)==comment_header and \ + not is_all_white(line[comment_header_len:]): + lineno = lineno - 1 + line = text.get("%d.0" % lineno, "%d.end" % lineno) + first = "%d.0" % (lineno+1) + + return first, last, comment_header, text.get(first, last) + +# This should perhaps be replaced with textwrap.wrap +def reformat_paragraph(data, limit): + """Return data reformatted to specified width (limit).""" + lines = data.split("\n") + i = 0 + n = len(lines) + while i < n and is_all_white(lines[i]): + i = i+1 + if i >= n: + return data + indent1 = get_indent(lines[i]) + if i+1 < n and not is_all_white(lines[i+1]): + indent2 = get_indent(lines[i+1]) + else: + indent2 = indent1 + new = lines[:i] + partial = indent1 + while i < n and not is_all_white(lines[i]): + # XXX Should take double space after period (etc.) into account + words = re.split(r"(\s+)", lines[i]) + for j in range(0, len(words), 2): + word = words[j] + if not word: + continue # Can happen when line ends in whitespace + if len((partial + word).expandtabs()) > limit and \ + partial != indent1: + new.append(partial.rstrip()) + partial = indent2 + partial = partial + word + " " + if j+1 < len(words) and words[j+1] != " ": + partial = partial + " " + i = i+1 + new.append(partial.rstrip()) + # XXX Should reformat remaining paragraphs as well + new.extend(lines[i:]) + return "\n".join(new) + +def reformat_comment(data, limit, comment_header): + """Return data reformatted to specified width with comment header.""" + + # Remove header from the comment lines + lc = len(comment_header) + data = "\n".join(line[lc:] for line in data.split("\n")) + # Reformat to maxformatwidth chars or a 20 char width, + # whichever is greater. + format_width = max(limit - len(comment_header), 20) + newdata = reformat_paragraph(data, format_width) + # re-split and re-insert the comment header. + newdata = newdata.split("\n") + # If the block ends in a \n, we don't want the comment prefix + # inserted after it. (Im not sure it makes sense to reformat a + # comment block that is not made of complete lines, but whatever!) + # Can't think of a clean solution, so we hack away + block_suffix = "" + if not newdata[-1]: + block_suffix = "\n" + newdata = newdata[:-1] + return '\n'.join(comment_header+line for line in newdata) + block_suffix + +def is_all_white(line): + """Return True if line is empty or all whitespace.""" + + return re.match(r"^\s*$", line) is not None + +def get_indent(line): + """Return the initial space or tab indent of line.""" + return re.match(r"^([ \t]*)", line).group() + +def get_comment_header(line): + """Return string with leading whitespace and '#' from line or ''. + + A null return indicates that the line is not a comment line. A non- + null return, such as ' #', will be used to find the other lines of + a comment block with the same indent. + """ + m = re.match(r"^([ \t]*#*)", line) + if m is None: return "" + return m.group(1) + + +# Copied from editor.py; importing it would cause an import cycle. +_line_indent_re = re.compile(r'[ \t]*') + +def get_line_indent(line, tabwidth): + """Return a line's indentation as (# chars, effective # of spaces). + + The effective # of spaces is the length after properly "expanding" + the tabs into spaces, as done by str.expandtabs(tabwidth). + """ + m = _line_indent_re.match(line) + return m.end(), len(m.group().expandtabs(tabwidth)) + + +class FormatRegion: + "Format selected text (region)." + + def __init__(self, editwin): + self.editwin = editwin + + def get_region(self): + """Return line information about the selected text region. + + If text is selected, the first and last indices will be + for the selection. If there is no text selected, the + indices will be the current cursor location. + + Return a tuple containing (first index, last index, + string representation of text, list of text lines). + """ + text = self.editwin.text + first, last = self.editwin.get_selection_indices() + if first and last: + head = text.index(first + " linestart") + tail = text.index(last + "-1c lineend +1c") + else: + head = text.index("insert linestart") + tail = text.index("insert lineend +1c") + chars = text.get(head, tail) + lines = chars.split("\n") + return head, tail, chars, lines + + def set_region(self, head, tail, chars, lines): + """Replace the text between the given indices. + + Args: + head: Starting index of text to replace. + tail: Ending index of text to replace. + chars: Expected to be string of current text + between head and tail. + lines: List of new lines to insert between head + and tail. + """ + text = self.editwin.text + newchars = "\n".join(lines) + if newchars == chars: + text.bell() + return + text.tag_remove("sel", "1.0", "end") + text.mark_set("insert", head) + text.undo_block_start() + text.delete(head, tail) + text.insert(head, newchars) + text.undo_block_stop() + text.tag_add("sel", head, "insert") + + def indent_region_event(self, event=None): + "Indent region by indentwidth spaces." + head, tail, chars, lines = self.get_region() + for pos in range(len(lines)): + line = lines[pos] + if line: + raw, effective = get_line_indent(line, self.editwin.tabwidth) + effective = effective + self.editwin.indentwidth + lines[pos] = self.editwin._make_blanks(effective) + line[raw:] + self.set_region(head, tail, chars, lines) + return "break" + + def dedent_region_event(self, event=None): + "Dedent region by indentwidth spaces." + head, tail, chars, lines = self.get_region() + for pos in range(len(lines)): + line = lines[pos] + if line: + raw, effective = get_line_indent(line, self.editwin.tabwidth) + effective = max(effective - self.editwin.indentwidth, 0) + lines[pos] = self.editwin._make_blanks(effective) + line[raw:] + self.set_region(head, tail, chars, lines) + return "break" + + def comment_region_event(self, event=None): + """Comment out each line in region. + + ## is appended to the beginning of each line to comment it out. + """ + head, tail, chars, lines = self.get_region() + for pos in range(len(lines) - 1): + line = lines[pos] + lines[pos] = '##' + line + self.set_region(head, tail, chars, lines) + return "break" + + def uncomment_region_event(self, event=None): + """Uncomment each line in region. + + Remove ## or # in the first positions of a line. If the comment + is not in the beginning position, this command will have no effect. + """ + head, tail, chars, lines = self.get_region() + for pos in range(len(lines)): + line = lines[pos] + if not line: + continue + if line[:2] == '##': + line = line[2:] + elif line[:1] == '#': + line = line[1:] + lines[pos] = line + self.set_region(head, tail, chars, lines) + return "break" + + def tabify_region_event(self, event=None): + "Convert leading spaces to tabs for each line in selected region." + head, tail, chars, lines = self.get_region() + tabwidth = self._asktabwidth() + if tabwidth is None: + return + for pos in range(len(lines)): + line = lines[pos] + if line: + raw, effective = get_line_indent(line, tabwidth) + ntabs, nspaces = divmod(effective, tabwidth) + lines[pos] = '\t' * ntabs + ' ' * nspaces + line[raw:] + self.set_region(head, tail, chars, lines) + return "break" + + def untabify_region_event(self, event=None): + "Expand tabs to spaces for each line in region." + head, tail, chars, lines = self.get_region() + tabwidth = self._asktabwidth() + if tabwidth is None: + return + for pos in range(len(lines)): + lines[pos] = lines[pos].expandtabs(tabwidth) + self.set_region(head, tail, chars, lines) + return "break" + + def _asktabwidth(self): + "Return value for tab width." + return askinteger( + "Tab width", + "Columns per tab? (2-16)", + parent=self.editwin.text, + initialvalue=self.editwin.indentwidth, + minvalue=2, + maxvalue=16) + + +class Indents: + "Change future indents." + + def __init__(self, editwin): + self.editwin = editwin + + def toggle_tabs_event(self, event): + editwin = self.editwin + usetabs = editwin.usetabs + if askyesno( + "Toggle tabs", + "Turn tabs " + ("on", "off")[usetabs] + + "?\nIndent width " + + ("will be", "remains at")[usetabs] + " 8." + + "\n Note: a tab is always 8 columns", + parent=editwin.text): + editwin.usetabs = not usetabs + # Try to prevent inconsistent indentation. + # User must change indent width manually after using tabs. + editwin.indentwidth = 8 + return "break" + + def change_indentwidth_event(self, event): + editwin = self.editwin + new = askinteger( + "Indent width", + "New indent width (2-16)\n(Always use 8 when using tabs)", + parent=editwin.text, + initialvalue=editwin.indentwidth, + minvalue=2, + maxvalue=16) + if new and new != editwin.indentwidth and not editwin.usetabs: + editwin.indentwidth = new + return "break" + + +class Rstrip: # 'Strip Trailing Whitespace" on "Format" menu. + def __init__(self, editwin): + self.editwin = editwin + + def do_rstrip(self, event=None): + text = self.editwin.text + undo = self.editwin.undo + undo.undo_block_start() + + end_line = int(float(text.index('end'))) + for cur in range(1, end_line): + txt = text.get('%i.0' % cur, '%i.end' % cur) + raw = len(txt) + cut = len(txt.rstrip()) + # Since text.delete() marks file as changed, even if not, + # only call it when needed to actually delete something. + if cut < raw: + text.delete('%i.%i' % (cur, cut), '%i.end' % cur) + + if (text.get('end-2c') == '\n' # File ends with at least 1 newline; + and not hasattr(self.editwin, 'interp')): # & is not Shell. + # Delete extra user endlines. + while (text.index('end-1c') > '1.0' # Stop if file empty. + and text.get('end-3c') == '\n'): + text.delete('end-3c') + # Because tk indexes are slice indexes and never raise, + # a file with only newlines will be emptied. + # patchcheck.py does the same. + + undo.undo_block_stop() + + +if __name__ == "__main__": + from unittest import main + main('idlelib.idle_test.test_format', verbosity=2, exit=False) diff --git a/Lib/idlelib/grep.py b/Lib/idlelib/grep.py new file mode 100644 index 000000000..42048ff23 --- /dev/null +++ b/Lib/idlelib/grep.py @@ -0,0 +1,223 @@ +"""Grep dialog for Find in Files functionality. + + Inherits from SearchDialogBase for GUI and uses searchengine + to prepare search pattern. +""" +import fnmatch +import os +import sys + +from tkinter import StringVar, BooleanVar +from tkinter.ttk import Checkbutton # Frame imported in ...Base + +from idlelib.searchbase import SearchDialogBase +from idlelib import searchengine + +# Importing OutputWindow here fails due to import loop +# EditorWindow -> GrepDialog -> OutputWindow -> EditorWindow + + +def grep(text, io=None, flist=None): + """Open the Find in Files dialog. + + Module-level function to access the singleton GrepDialog + instance and open the dialog. If text is selected, it is + used as the search phrase; otherwise, the previous entry + is used. + + Args: + text: Text widget that contains the selected text for + default search phrase. + io: iomenu.IOBinding instance with default path to search. + flist: filelist.FileList instance for OutputWindow parent. + """ + root = text._root() + engine = searchengine.get(root) + if not hasattr(engine, "_grepdialog"): + engine._grepdialog = GrepDialog(root, engine, flist) + dialog = engine._grepdialog + searchphrase = text.get("sel.first", "sel.last") + dialog.open(text, searchphrase, io) + + +def walk_error(msg): + "Handle os.walk error." + print(msg) + + +def findfiles(folder, pattern, recursive): + """Generate file names in dir that match pattern. + + Args: + folder: Root directory to search. + pattern: File pattern to match. + recursive: True to include subdirectories. + """ + for dirpath, _, filenames in os.walk(folder, onerror=walk_error): + yield from (os.path.join(dirpath, name) + for name in filenames + if fnmatch.fnmatch(name, pattern)) + if not recursive: + break + + +class GrepDialog(SearchDialogBase): + "Dialog for searching multiple files." + + title = "Find in Files Dialog" + icon = "Grep" + needwrapbutton = 0 + + def __init__(self, root, engine, flist): + """Create search dialog for searching for a phrase in the file system. + + Uses SearchDialogBase as the basis for the GUI and a + searchengine instance to prepare the search. + + Attributes: + flist: filelist.Filelist instance for OutputWindow parent. + globvar: String value of Entry widget for path to search. + globent: Entry widget for globvar. Created in + create_entries(). + recvar: Boolean value of Checkbutton widget for + traversing through subdirectories. + """ + super().__init__(root, engine) + self.flist = flist + self.globvar = StringVar(root) + self.recvar = BooleanVar(root) + + def open(self, text, searchphrase, io=None): + """Make dialog visible on top of others and ready to use. + + Extend the SearchDialogBase open() to set the initial value + for globvar. + + Args: + text: Multicall object containing the text information. + searchphrase: String phrase to search. + io: iomenu.IOBinding instance containing file path. + """ + SearchDialogBase.open(self, text, searchphrase) + if io: + path = io.filename or "" + else: + path = "" + dir, base = os.path.split(path) + head, tail = os.path.splitext(base) + if not tail: + tail = ".py" + self.globvar.set(os.path.join(dir, "*" + tail)) + + def create_entries(self): + "Create base entry widgets and add widget for search path." + SearchDialogBase.create_entries(self) + self.globent = self.make_entry("In files:", self.globvar)[0] + + def create_other_buttons(self): + "Add check button to recurse down subdirectories." + btn = Checkbutton( + self.make_frame()[0], variable=self.recvar, + text="Recurse down subdirectories") + btn.pack(side="top", fill="both") + + def create_command_buttons(self): + "Create base command buttons and add button for Search Files." + SearchDialogBase.create_command_buttons(self) + self.make_button("Search Files", self.default_command, isdef=True) + + def default_command(self, event=None): + """Grep for search pattern in file path. The default command is bound + to <Return>. + + If entry values are populated, set OutputWindow as stdout + and perform search. The search dialog is closed automatically + when the search begins. + """ + prog = self.engine.getprog() + if not prog: + return + path = self.globvar.get() + if not path: + self.top.bell() + return + from idlelib.outwin import OutputWindow # leave here! + save = sys.stdout + try: + sys.stdout = OutputWindow(self.flist) + self.grep_it(prog, path) + finally: + sys.stdout = save + + def grep_it(self, prog, path): + """Search for prog within the lines of the files in path. + + For the each file in the path directory, open the file and + search each line for the matching pattern. If the pattern is + found, write the file and line information to stdout (which + is an OutputWindow). + + Args: + prog: The compiled, cooked search pattern. + path: String containing the search path. + """ + folder, filepat = os.path.split(path) + if not folder: + folder = os.curdir + filelist = sorted(findfiles(folder, filepat, self.recvar.get())) + self.close() + pat = self.engine.getpat() + print(f"Searching {pat!r} in {path} ...") + hits = 0 + try: + for fn in filelist: + try: + with open(fn, errors='replace') as f: + for lineno, line in enumerate(f, 1): + if line[-1:] == '\n': + line = line[:-1] + if prog.search(line): + sys.stdout.write(f"{fn}: {lineno}: {line}\n") + hits += 1 + except OSError as msg: + print(msg) + print(f"Hits found: {hits}\n(Hint: right-click to open locations.)" + if hits else "No hits.") + except AttributeError: + # Tk window has been closed, OutputWindow.text = None, + # so in OW.write, OW.text.insert fails. + pass + + +def _grep_dialog(parent): # htest # + from tkinter import Toplevel, Text, SEL + from tkinter.ttk import Frame, Button + from idlelib.pyshell import PyShellFileList + + top = Toplevel(parent) + top.title("Test GrepDialog") + x, y = map(int, parent.geometry().split('+')[1:]) + top.geometry(f"+{x}+{y + 175}") + + flist = PyShellFileList(top) + frame = Frame(top) + frame.pack() + text = Text(frame, height=5) + text.pack() + text.insert('1.0', 'import grep') + + def show_grep_dialog(): + text.tag_add(SEL, "1.0", '1.end') + grep(text, flist=flist) + text.tag_remove(SEL, "1.0", '1.end') + + button = Button(frame, text="Show GrepDialog", command=show_grep_dialog) + button.pack() + + +if __name__ == "__main__": + from unittest import main + main('idlelib.idle_test.test_grep', verbosity=2, exit=False) + + from idlelib.idle_test.htest import run + run(_grep_dialog) diff --git a/Lib/idlelib/help.html b/Lib/idlelib/help.html new file mode 100644 index 000000000..eda16ac5b --- /dev/null +++ b/Lib/idlelib/help.html @@ -0,0 +1,868 @@ +<section id="idle"> +<span id="idle-python-editor-and-shell"></span><h1>IDLE — Python editor and shell<a class="headerlink" href="#idle" title="Link to this heading">¶</a></h1> +<p><strong>Source code:</strong> <a class="extlink-source reference external" href="https://github.com/python/cpython/tree/main/Lib/idlelib/">Lib/idlelib/</a></p> +<span class="target" id="index-0"></span><hr class="docutils" /> +<p>IDLE is Python’s Integrated Development and Learning Environment.</p> +<p>IDLE has the following features:</p> +<ul class="simple"> +<li><p>cross-platform: works mostly the same on Windows, Unix, and macOS</p></li> +<li><p>Python shell window (interactive interpreter) with colorizing +of code input, output, and error messages</p></li> +<li><p>multi-window text editor with multiple undo, Python colorizing, +smart indent, call tips, auto completion, and other features</p></li> +<li><p>search within any window, replace within editor windows, and search +through multiple files (grep)</p></li> +<li><p>debugger with persistent breakpoints, stepping, and viewing +of global and local namespaces</p></li> +<li><p>configuration, browsers, and other dialogs</p></li> +</ul> +<p>The IDLE application is implemented in the <a class="reference internal" href="#module-idlelib" title="idlelib: Implementation package for the IDLE shell/editor."><code class="xref py py-mod docutils literal notranslate"><span class="pre">idlelib</span></code></a> package.</p> +<p>This is an <a class="reference internal" href="../glossary.html#term-optional-module"><span class="xref std std-term">optional module</span></a>. +If it is missing from your copy of CPython, +look for documentation from your distributor (that is, +whoever provided Python to you). +If you are the distributor, see <a class="reference internal" href="../using/configure.html#optional-module-requirements"><span class="std std-ref">Requirements for optional modules</span></a>.</p> +<section id="menus"> +<h2>Menus<a class="headerlink" href="#menus" title="Link to this heading">¶</a></h2> +<p>IDLE has two main window types, the Shell window and the Editor window. It is +possible to have multiple editor windows simultaneously. On Windows and +Linux, each has its own top menu. Each menu documented below indicates +which window type it is associated with.</p> +<p>Output windows, such as used for Edit =&gt; Find in Files, are a subtype of editor +window. They currently have the same top menu but a different +default title and context menu.</p> +<p>On macOS, there is one application menu. It dynamically changes according +to the window currently selected. It has an IDLE menu, and some entries +described below are moved around to conform to Apple guidelines.</p> +<section id="file-menu-shell-and-editor"> +<h3>File menu (Shell and Editor)<a class="headerlink" href="#file-menu-shell-and-editor" title="Link to this heading">¶</a></h3> +<dl class="simple"> +<dt>New File</dt><dd><p>Create a new file editing window.</p> +</dd> +<dt>Open…</dt><dd><p>Open an existing file with an Open dialog.</p> +</dd> +<dt>Open Module…</dt><dd><p>Open an existing module (searches sys.path).</p> +</dd> +<dt>Recent Files</dt><dd><p>Open a list of recent files. Click one to open it.</p> +</dd> +</dl> +<dl class="simple" id="index-1"> +<dt>Module Browser</dt><dd><p>Show functions, classes, and methods in the current Editor file in a +tree structure. In the shell, open a module first.</p> +</dd> +<dt>Path Browser</dt><dd><p>Show sys.path directories, modules, functions, classes and methods in a +tree structure.</p> +</dd> +<dt>Save</dt><dd><p>Save the current window to the associated file, if there is one. Windows +that have been changed since being opened or last saved have a * before +and after the window title. If there is no associated file, +do Save As instead.</p> +</dd> +<dt>Save As…</dt><dd><p>Save the current window with a Save As dialog. The file saved becomes the +new associated file for the window. (If your file manager is set to hide +extensions, the current extension will be omitted in the file name box. +If the new filename has no ‘.’, ‘.py’ and ‘.txt’ will be added for Python +and text files, except that on macOS Aqua,’.py’ is added for all files.)</p> +</dd> +<dt>Save Copy As…</dt><dd><p>Save the current window to different file without changing the associated +file. (See Save As note above about filename extensions.)</p> +</dd> +<dt>Print Window</dt><dd><p>Print the current window to the default printer.</p> +</dd> +<dt>Close Window</dt><dd><p>Close the current window (if an unsaved editor, ask to save; if an unsaved +Shell, ask to quit execution). Calling <code class="docutils literal notranslate"><span class="pre">exit()</span></code> or <code class="docutils literal notranslate"><span class="pre">close()</span></code> in the Shell +window also closes Shell. If this is the only window, also exit IDLE.</p> +</dd> +<dt>Exit IDLE</dt><dd><p>Close all windows and quit IDLE (ask to save unsaved edit windows).</p> +</dd> +</dl> +</section> +<section id="edit-menu-shell-and-editor"> +<h3>Edit menu (Shell and Editor)<a class="headerlink" href="#edit-menu-shell-and-editor" title="Link to this heading">¶</a></h3> +<dl class="simple"> +<dt>Undo</dt><dd><p>Undo the last change to the current window. A maximum of 1000 changes may +be undone.</p> +</dd> +<dt>Redo</dt><dd><p>Redo the last undone change to the current window.</p> +</dd> +<dt>Select All</dt><dd><p>Select the entire contents of the current window.</p> +</dd> +<dt>Cut</dt><dd><p>Copy selection into the system-wide clipboard; then delete the selection.</p> +</dd> +<dt>Copy</dt><dd><p>Copy selection into the system-wide clipboard.</p> +</dd> +<dt>Paste</dt><dd><p>Insert contents of the system-wide clipboard into the current window.</p> +</dd> +</dl> +<p>The clipboard functions are also available in context menus.</p> +<dl class="simple"> +<dt>Find…</dt><dd><p>Open a search dialog with many options</p> +</dd> +<dt>Find Again</dt><dd><p>Repeat the last search, if there is one.</p> +</dd> +<dt>Find Selection</dt><dd><p>Search for the currently selected string, if there is one.</p> +</dd> +<dt>Find in Files…</dt><dd><p>Open a file search dialog. Put results in a new output window.</p> +</dd> +<dt>Replace…</dt><dd><p>Open a search-and-replace dialog.</p> +</dd> +<dt>Go to Line</dt><dd><p>Move the cursor to the beginning of the line requested and make that +line visible. A request past the end of the file goes to the end. +Clear any selection and update the line and column status.</p> +</dd> +<dt>Show Completions</dt><dd><p>Open a scrollable list allowing selection of existing names. See +<a class="reference internal" href="#completions"><span class="std std-ref">Completions</span></a> in the Editing and Navigation section below.</p> +</dd> +<dt>Expand Word</dt><dd><p>Expand a prefix you have typed to match a full word in the same window; +repeat to get a different expansion.</p> +</dd> +<dt>Show Call Tip</dt><dd><p>After an unclosed parenthesis for a function, open a small window with +function parameter hints. See <a class="reference internal" href="#calltips"><span class="std std-ref">Calltips</span></a> in the +Editing and Navigation section below.</p> +</dd> +<dt>Show Surrounding Parens</dt><dd><p>Highlight the surrounding parenthesis.</p> +</dd> +</dl> +</section> +<section id="format-menu-editor-window-only"> +<span id="format-menu"></span><h3>Format menu (Editor window only)<a class="headerlink" href="#format-menu-editor-window-only" title="Link to this heading">¶</a></h3> +<dl class="simple"> +<dt>Format Paragraph</dt><dd><p>Rewrap the text block containing the text insert cursor. +Avoid code lines. See <a class="reference internal" href="#format-block"><span class="std std-ref">Format block</span></a> in the +Editing and Navigation section below.</p> +</dd> +<dt>Indent Region</dt><dd><p>Shift selected lines right by the indent width (default 4 spaces).</p> +</dd> +<dt>Dedent Region</dt><dd><p>Shift selected lines left by the indent width (default 4 spaces).</p> +</dd> +<dt>Comment Out Region</dt><dd><p>Insert ## in front of selected lines.</p> +</dd> +<dt>Uncomment Region</dt><dd><p>Remove leading # or ## from selected lines.</p> +</dd> +<dt>Tabify Region</dt><dd><p>Turn <em>leading</em> stretches of spaces into tabs. (Note: We recommend using +4 space blocks to indent Python code.)</p> +</dd> +<dt>Untabify Region</dt><dd><p>Turn <em>all</em> tabs into the correct number of spaces.</p> +</dd> +<dt>Toggle Tabs</dt><dd><p>Open a dialog to switch between indenting with spaces and tabs.</p> +</dd> +<dt>New Indent Width</dt><dd><p>Open a dialog to change indent width. The accepted default by the Python +community is 4 spaces.</p> +</dd> +<dt>Strip Trailing Whitespace</dt><dd><p>Remove trailing space and other whitespace characters after the last +non-whitespace character of a line by applying <a class="reference internal" href="stdtypes.html#str.rstrip" title="str.rstrip"><code class="xref py py-meth docutils literal notranslate"><span class="pre">str.rstrip()</span></code></a> to each line, +including lines within multiline strings. Except for Shell windows, +remove extra newlines at the end of the file.</p> +</dd> +</dl> +</section> +<section id="run-menu-editor-window-only"> +<span id="index-2"></span><h3>Run menu (Editor window only)<a class="headerlink" href="#run-menu-editor-window-only" title="Link to this heading">¶</a></h3> +<dl class="simple" id="run-module"> +<dt>Run Module</dt><dd><p>Do <a class="reference internal" href="#check-module"><span class="std std-ref">Check Module</span></a>. If no error, restart the shell to clean the +environment, then execute the module. Output is displayed in the Shell +window. Note that output requires use of <code class="docutils literal notranslate"><span class="pre">print</span></code> or <code class="docutils literal notranslate"><span class="pre">write</span></code>. +When execution is complete, the Shell retains focus and displays a prompt. +At this point, one may interactively explore the result of execution. +This is similar to executing a file with <code class="docutils literal notranslate"><span class="pre">python</span> <span class="pre">-i</span> <span class="pre">file</span></code> at a command +line.</p> +</dd> +</dl> +<dl class="simple" id="run-custom"> +<dt>Run… Customized</dt><dd><p>Same as <a class="reference internal" href="#run-module"><span class="std std-ref">Run Module</span></a>, but run the module with customized +settings. <em>Command Line Arguments</em> extend <a class="reference internal" href="sys.html#sys.argv" title="sys.argv"><code class="xref py py-data docutils literal notranslate"><span class="pre">sys.argv</span></code></a> as if passed +on a command line. The module can be run in the Shell without restarting.</p> +</dd> +</dl> +<dl class="simple" id="check-module"> +<dt>Check Module</dt><dd><p>Check the syntax of the module currently open in the Editor window. If the +module has not been saved IDLE will either prompt the user to save or +autosave, as selected in the General tab of the Idle Settings dialog. If +there is a syntax error, the approximate location is indicated in the +Editor window.</p> +</dd> +</dl> +<dl class="simple" id="python-shell"> +<dt>Python Shell</dt><dd><p>Open or wake up the Python Shell window.</p> +</dd> +</dl> +</section> +<section id="shell-menu-shell-window-only"> +<h3>Shell menu (Shell window only)<a class="headerlink" href="#shell-menu-shell-window-only" title="Link to this heading">¶</a></h3> +<dl class="simple"> +<dt>View Last Restart</dt><dd><p>Scroll the shell window to the last Shell restart.</p> +</dd> +<dt>Restart Shell</dt><dd><p>Restart the shell to clean the environment and reset display and exception handling.</p> +</dd> +<dt>Previous History</dt><dd><p>Cycle through earlier commands in history which match the current entry.</p> +</dd> +<dt>Next History</dt><dd><p>Cycle through later commands in history which match the current entry.</p> +</dd> +<dt>Interrupt Execution</dt><dd><p>Stop a running program.</p> +</dd> +</dl> +</section> +<section id="debug-menu-shell-window-only"> +<h3>Debug menu (Shell window only)<a class="headerlink" href="#debug-menu-shell-window-only" title="Link to this heading">¶</a></h3> +<dl class="simple"> +<dt>Go to File/Line</dt><dd><p>Look on the current line. with the cursor, and the line above for a filename +and line number. If found, open the file if not already open, and show the +line. Use this to view source lines referenced in an exception traceback +and lines found by Find in Files. Also available in the context menu of +the Shell window and Output windows.</p> +</dd> +</dl> +<dl class="simple" id="index-3"> +<dt>Debugger (toggle)</dt><dd><p>When activated, code entered in the Shell or run from an Editor will run +under the debugger. In the Editor, breakpoints can be set with the context +menu. This feature is still incomplete and somewhat experimental.</p> +</dd> +<dt>Stack Viewer</dt><dd><p>Show the stack traceback of the last exception in a tree widget, with +access to locals and globals.</p> +</dd> +<dt>Auto-open Stack Viewer</dt><dd><p>Toggle automatically opening the stack viewer on an unhandled exception.</p> +</dd> +</dl> +</section> +<section id="options-menu-shell-and-editor"> +<h3>Options menu (Shell and Editor)<a class="headerlink" href="#options-menu-shell-and-editor" title="Link to this heading">¶</a></h3> +<dl class="simple"> +<dt>Configure IDLE</dt><dd><p>Open a configuration dialog and change preferences for the following: +fonts, indentation, keybindings, text color themes, startup windows and +size, additional help sources, and extensions. On macOS, open the +configuration dialog by selecting Preferences in the application +menu. For more details, see +<a class="reference internal" href="#preferences"><span class="std std-ref">Setting preferences</span></a> under Help and preferences.</p> +</dd> +</dl> +<p>Most configuration options apply to all windows or all future windows. +The option items below only apply to the active window.</p> +<dl class="simple"> +<dt>Show/Hide Code Context (Editor Window only)</dt><dd><p>Open a pane at the top of the edit window which shows the block context +of the code which has scrolled above the top of the window. See +<a class="reference internal" href="#code-context"><span class="std std-ref">Code Context</span></a> in the Editing and Navigation section +below.</p> +</dd> +<dt>Show/Hide Line Numbers (Editor Window only)</dt><dd><p>Open a column to the left of the edit window which shows the number +of each line of text. The default is off, which may be changed in the +preferences (see <a class="reference internal" href="#preferences"><span class="std std-ref">Setting preferences</span></a>).</p> +</dd> +<dt>Zoom/Restore Height</dt><dd><p>Toggles the window between normal size and maximum height. The initial size +defaults to 40 lines by 80 chars unless changed on the General tab of the +Configure IDLE dialog. The maximum height for a screen is determined by +momentarily maximizing a window the first time one is zoomed on the screen. +Changing screen settings may invalidate the saved height. This toggle has +no effect when a window is maximized.</p> +</dd> +</dl> +</section> +<section id="window-menu-shell-and-editor"> +<h3>Window menu (Shell and Editor)<a class="headerlink" href="#window-menu-shell-and-editor" title="Link to this heading">¶</a></h3> +<p>Lists the names of all open windows; select one to bring it to the foreground +(deiconifying it if necessary).</p> +</section> +<section id="help-menu-shell-and-editor"> +<h3>Help menu (Shell and Editor)<a class="headerlink" href="#help-menu-shell-and-editor" title="Link to this heading">¶</a></h3> +<dl class="simple"> +<dt>About IDLE</dt><dd><p>Display version, copyright, license, credits, and more.</p> +</dd> +<dt>IDLE Help</dt><dd><p>Display this IDLE document, detailing the menu options, basic editing and +navigation, and other tips.</p> +</dd> +<dt>Python Docs</dt><dd><p>Access local Python documentation, if installed, or start a web browser +and open docs.python.org showing the latest Python documentation.</p> +</dd> +<dt>Turtle Demo</dt><dd><p>Run the turtledemo module with example Python code and turtle drawings.</p> +</dd> +</dl> +<p>Additional help sources may be added here with the Configure IDLE dialog under +the General tab. See the <a class="reference internal" href="#help-sources"><span class="std std-ref">Help sources</span></a> subsection below +for more on Help menu choices.</p> +</section> +<section id="context-menus"> +<span id="index-4"></span><h3>Context menus<a class="headerlink" href="#context-menus" title="Link to this heading">¶</a></h3> +<p>Open a context menu by right-clicking in a window (Control-click on macOS). +Context menus have the standard clipboard functions also on the Edit menu.</p> +<dl class="simple"> +<dt>Cut</dt><dd><p>Copy selection into the system-wide clipboard; then delete the selection.</p> +</dd> +<dt>Copy</dt><dd><p>Copy selection into the system-wide clipboard.</p> +</dd> +<dt>Paste</dt><dd><p>Insert contents of the system-wide clipboard into the current window.</p> +</dd> +</dl> +<p>Editor windows also have breakpoint functions. Lines with a breakpoint set are +specially marked. Breakpoints only have an effect when running under the +debugger. Breakpoints for a file are saved in the user’s <code class="docutils literal notranslate"><span class="pre">.idlerc</span></code> +directory.</p> +<dl class="simple"> +<dt>Set Breakpoint</dt><dd><p>Set a breakpoint on the current line.</p> +</dd> +<dt>Clear Breakpoint</dt><dd><p>Clear the breakpoint on that line.</p> +</dd> +</dl> +<p>Shell and Output windows also have the following.</p> +<dl class="simple"> +<dt>Go to file/line</dt><dd><p>Same as in Debug menu.</p> +</dd> +</dl> +<p>The Shell window also has an output squeezing facility explained in the <em>Python +Shell window</em> subsection below.</p> +<dl class="simple"> +<dt>Squeeze</dt><dd><p>If the cursor is over an output line, squeeze all the output between +the code above and the prompt below down to a ‘Squeezed text’ label.</p> +</dd> +</dl> +</section> +</section> +<section id="editing-and-navigation"> +<span id="id1"></span><h2>Editing and Navigation<a class="headerlink" href="#editing-and-navigation" title="Link to this heading">¶</a></h2> +<section id="editor-windows"> +<h3>Editor windows<a class="headerlink" href="#editor-windows" title="Link to this heading">¶</a></h3> +<p>IDLE may open editor windows when it starts, depending on settings +and how you start IDLE. Thereafter, use the File menu. There can be only +one open editor window for a given file.</p> +<p>The title bar contains the name of the file, the full path, and the version +of Python and IDLE running the window. The status bar contains the line +number (‘Ln’) and column number (‘Col’). Line numbers start with 1; +column numbers with 0.</p> +<p>IDLE assumes that files with a known .py* extension contain Python code +and that other files do not. Run Python code with the Run menu.</p> +</section> +<section id="key-bindings"> +<h3>Key bindings<a class="headerlink" href="#key-bindings" title="Link to this heading">¶</a></h3> +<p>The IDLE insertion cursor is a thin vertical bar between character +positions. When characters are entered, the insertion cursor and +everything to its right moves right one character and +the new character is entered in the new space.</p> +<p>Several non-character keys move the cursor and possibly +delete characters. Deletion does not puts text on the clipboard, +but IDLE has an undo list. Wherever this doc discusses keys, +‘C’ refers to the <kbd class="kbd docutils literal notranslate">Control</kbd> key on Windows and +Unix and the <kbd class="kbd docutils literal notranslate">Command</kbd> key on macOS. (And all such discussions +assume that the keys have not been re-bound to something else.)</p> +<ul class="simple"> +<li><p>Arrow keys move the cursor one character or line.</p></li> +<li><p><kbd class="kbd docutils literal notranslate">C</kbd>-<kbd class="kbd docutils literal notranslate">LeftArrow</kbd> and <kbd class="kbd docutils literal notranslate">C</kbd>-<kbd class="kbd docutils literal notranslate">RightArrow</kbd> moves left or right one word.</p></li> +<li><p><kbd class="kbd docutils literal notranslate">Home</kbd> and <kbd class="kbd docutils literal notranslate">End</kbd> go to the beginning or end of the line.</p></li> +<li><p><kbd class="kbd docutils literal notranslate">Page Up</kbd> and <kbd class="kbd docutils literal notranslate">Page Down</kbd> go up or down one screen.</p></li> +<li><p><kbd class="kbd docutils literal notranslate">C</kbd>-<kbd class="kbd docutils literal notranslate">Home</kbd> and <kbd class="kbd docutils literal notranslate">C</kbd>-<kbd class="kbd docutils literal notranslate">End</kbd> go to beginning or end of the file.</p></li> +<li><p><kbd class="kbd docutils literal notranslate">Backspace</kbd> and <kbd class="kbd docutils literal notranslate">Del</kbd> (or <kbd class="kbd docutils literal notranslate">C</kbd>-<kbd class="kbd docutils literal notranslate">d</kbd>) delete the previous +or next character.</p></li> +<li><p><kbd class="kbd docutils literal notranslate">C</kbd>-<kbd class="kbd docutils literal notranslate">Backspace</kbd> and <kbd class="kbd docutils literal notranslate">C</kbd>-<kbd class="kbd docutils literal notranslate">Del</kbd> delete one word left or right.</p></li> +<li><p><kbd class="kbd docutils literal notranslate">C</kbd>-<kbd class="kbd docutils literal notranslate">k</kbd> deletes (‘kills’) everything to the right.</p></li> +</ul> +<p>Standard keybindings (like <kbd class="kbd docutils literal notranslate">C</kbd>-<kbd class="kbd docutils literal notranslate">c</kbd> to copy and <kbd class="kbd docutils literal notranslate">C</kbd>-<kbd class="kbd docutils literal notranslate">v</kbd> to paste) +may work. Keybindings are selected in the Configure IDLE dialog.</p> +</section> +<section id="automatic-indentation"> +<h3>Automatic indentation<a class="headerlink" href="#automatic-indentation" title="Link to this heading">¶</a></h3> +<p>After a block-opening statement, the next line is indented by 4 spaces (in the +Python Shell window by one tab). After certain keywords (break, return etc.) +the next line is dedented. In leading indentation, <kbd class="kbd docutils literal notranslate">Backspace</kbd> deletes up +to 4 spaces if they are there. <kbd class="kbd docutils literal notranslate">Tab</kbd> inserts spaces (in the Python +Shell window one tab), number depends on Indent width. Currently, tabs +are restricted to four spaces due to Tcl/Tk limitations.</p> +<p>See also the indent/dedent region commands on the +<a class="reference internal" href="#format-menu"><span class="std std-ref">Format menu</span></a>.</p> +</section> +<section id="search-and-replace"> +<h3>Search and Replace<a class="headerlink" href="#search-and-replace" title="Link to this heading">¶</a></h3> +<p>Any selection becomes a search target. However, only selections within +a line work because searches are only performed within lines with the +terminal newline removed. If <code class="docutils literal notranslate"><span class="pre">[x]</span> <span class="pre">Regular</span> <span class="pre">expression</span></code> is checked, the +target is interpreted according to the Python re module.</p> +</section> +<section id="completions"> +<span id="id2"></span><h3>Completions<a class="headerlink" href="#completions" title="Link to this heading">¶</a></h3> +<p>Completions are supplied, when requested and available, for module +names, attributes of classes or functions, or filenames. Each request +method displays a completion box with existing names. (See tab +completions below for an exception.) For any box, change the name +being completed and the item highlighted in the box by +typing and deleting characters; by hitting <kbd class="kbd docutils literal notranslate">Up</kbd>, <kbd class="kbd docutils literal notranslate">Down</kbd>, +<kbd class="kbd docutils literal notranslate">PageUp</kbd>, <kbd class="kbd docutils literal notranslate">PageDown</kbd>, <kbd class="kbd docutils literal notranslate">Home</kbd>, and <kbd class="kbd docutils literal notranslate">End</kbd> keys; +and by a single click within the box. Close the box with <kbd class="kbd docutils literal notranslate">Escape</kbd>, +<kbd class="kbd docutils literal notranslate">Enter</kbd>, and double <kbd class="kbd docutils literal notranslate">Tab</kbd> keys or clicks outside the box. +A double click within the box selects and closes.</p> +<p>One way to open a box is to type a key character and wait for a +predefined interval. This defaults to 2 seconds; customize it +in the settings dialog. (To prevent auto popups, set the delay to a +large number of milliseconds, such as 100000000.) For imported module +names or class or function attributes, type ‘.’. +For filenames in the root directory, type <a class="reference internal" href="os.html#os.sep" title="os.sep"><code class="xref py py-data docutils literal notranslate"><span class="pre">os.sep</span></code></a> or +<a class="reference internal" href="os.html#os.altsep" title="os.altsep"><code class="xref py py-data docutils literal notranslate"><span class="pre">os.altsep</span></code></a> immediately after an opening quote. (On Windows, +one can specify a drive first.) Move into subdirectories by typing a +directory name and a separator.</p> +<p>Instead of waiting, or after a box is closed, open a completion box +immediately with Show Completions on the Edit menu. The default hot +key is <kbd class="kbd docutils literal notranslate">C</kbd>-<kbd class="kbd docutils literal notranslate">space</kbd>. If one types a prefix for the desired name +before opening the box, the first match or near miss is made visible. +The result is the same as if one enters a prefix +after the box is displayed. Show Completions after a quote completes +filenames in the current directory instead of a root directory.</p> +<p>Hitting <kbd class="kbd docutils literal notranslate">Tab</kbd> after a prefix usually has the same effect as Show +Completions. (With no prefix, it indents.) However, if there is only +one match to the prefix, that match is immediately added to the editor +text without opening a box.</p> +<p>Invoking ‘Show Completions’, or hitting <kbd class="kbd docutils literal notranslate">Tab</kbd> after a prefix, +outside of a string and without a preceding ‘.’ opens a box with +keywords, builtin names, and available module-level names.</p> +<p>When editing code in an editor (as oppose to Shell), increase the +available module-level names by running your code +and not restarting the Shell thereafter. This is especially useful +after adding imports at the top of a file. This also increases +possible attribute completions.</p> +<p>Completion boxes initially exclude names beginning with ‘_’ or, for +modules, not included in ‘__all__’. The hidden names can be accessed +by typing ‘_’ after ‘.’, either before or after the box is opened.</p> +</section> +<section id="calltips"> +<span id="id3"></span><h3>Calltips<a class="headerlink" href="#calltips" title="Link to this heading">¶</a></h3> +<p>A calltip is shown automatically when one types <kbd class="kbd docutils literal notranslate">(</kbd> after the name +of an <em>accessible</em> function. A function name expression may include +dots and subscripts. A calltip remains until it is clicked, the cursor +is moved out of the argument area, or <kbd class="kbd docutils literal notranslate">)</kbd> is typed. Whenever the +cursor is in the argument part of a definition, select Edit and “Show +Call Tip” on the menu or enter its shortcut to display a calltip.</p> +<p>The calltip consists of the function’s signature and docstring up to +the latter’s first blank line or the fifth non-blank line. (Some builtin +functions lack an accessible signature.) A ‘/’ or ‘*’ in the signature +indicates that the preceding or following arguments are passed by +position or name (keyword) only. Details are subject to change.</p> +<p>In Shell, the accessible functions depends on what modules have been +imported into the user process, including those imported by Idle itself, +and which definitions have been run, all since the last restart.</p> +<p>For example, restart the Shell and enter <code class="docutils literal notranslate"><span class="pre">itertools.count(</span></code>. A calltip +appears because Idle imports itertools into the user process for its own +use. (This could change.) Enter <code class="docutils literal notranslate"><span class="pre">turtle.write(</span></code> and nothing appears. +Idle does not itself import turtle. The menu entry and shortcut also do +nothing. Enter <code class="docutils literal notranslate"><span class="pre">import</span> <span class="pre">turtle</span></code>. Thereafter, <code class="docutils literal notranslate"><span class="pre">turtle.write(</span></code> +will display a calltip.</p> +<p>In an editor, import statements have no effect until one runs the file. +One might want to run a file after writing import statements, after +adding function definitions, or after opening an existing file.</p> +</section> +<section id="format-block"> +<span id="id4"></span><h3>Format block<a class="headerlink" href="#format-block" title="Link to this heading">¶</a></h3> +<p>Reformat Paragraph rewraps a block (‘paragraph’) of contiguous equally +indented non-blank comments, a similar block of text within a multiline +string, or a selected subset of either. +If needed, add a blank line to separate string from code. +Partial lines in a selection expand to complete lines. +The resulting lines have the same indent as before +but have maximum total length of N columns (characters). +Change the default N of 72 on the Window tab of IDLE Settings.</p> +</section> +<section id="code-context"> +<span id="id5"></span><h3>Code Context<a class="headerlink" href="#code-context" title="Link to this heading">¶</a></h3> +<p>Within an editor window containing Python code, code context can be toggled +in order to show or hide a pane at the top of the window. When shown, this +pane freezes the opening lines for block code, such as those beginning with +<code class="docutils literal notranslate"><span class="pre">class</span></code>, <code class="docutils literal notranslate"><span class="pre">def</span></code>, or <code class="docutils literal notranslate"><span class="pre">if</span></code> keywords, that would have otherwise scrolled +out of view. The size of the pane will be expanded and contracted as needed +to show the all current levels of context, up to the maximum number of +lines defined in the Configure IDLE dialog (which defaults to 15). If there +are no current context lines and the feature is toggled on, a single blank +line will display. Clicking on a line in the context pane will move that +line to the top of the editor.</p> +<p>The text and background colors for the context pane can be configured under +the Highlights tab in the Configure IDLE dialog.</p> +</section> +<section id="shell-window"> +<h3>Shell window<a class="headerlink" href="#shell-window" title="Link to this heading">¶</a></h3> +<p>In IDLE’s Shell, enter, edit, and recall complete statements. (Most +consoles and terminals only work with a single physical line at a time).</p> +<p>Submit a single-line statement for execution by hitting <kbd class="kbd docutils literal notranslate">Return</kbd> +with the cursor anywhere on the line. If a line is extended with +Backslash (<kbd class="kbd docutils literal notranslate">\</kbd>), the cursor must be on the last physical line. +Submit a multi-line compound statement by entering a blank line after +the statement.</p> +<p>When one pastes code into Shell, it is not compiled and possibly executed +until one hits <kbd class="kbd docutils literal notranslate">Return</kbd>, as specified above. +One may edit pasted code first. +If one pastes more than one statement into Shell, the result will be a +<a class="reference internal" href="exceptions.html#SyntaxError" title="SyntaxError"><code class="xref py py-exc docutils literal notranslate"><span class="pre">SyntaxError</span></code></a> when multiple statements are compiled as if they were one.</p> +<p>Lines containing <code class="docutils literal notranslate"><span class="pre">RESTART</span></code> mean that the user execution process has been +re-started. This occurs when the user execution process has crashed, +when one requests a restart on the Shell menu, or when one runs code +in an editor window.</p> +<p>The editing features described in previous subsections work when entering +code interactively. IDLE’s Shell window also responds to the following:</p> +<ul class="simple"> +<li><p><kbd class="kbd docutils literal notranslate">C</kbd>-<kbd class="kbd docutils literal notranslate">c</kbd> attempts to interrupt statement execution (but may fail).</p></li> +<li><p><kbd class="kbd docutils literal notranslate">C</kbd>-<kbd class="kbd docutils literal notranslate">d</kbd> closes Shell if typed at a <code class="docutils literal notranslate"><span class="pre">&gt;&gt;&gt;</span></code> prompt.</p></li> +<li><p><kbd class="kbd docutils literal notranslate">Alt</kbd>-<kbd class="kbd docutils literal notranslate">p</kbd> and <kbd class="kbd docutils literal notranslate">Alt</kbd>-<kbd class="kbd docutils literal notranslate">n</kbd> (<kbd class="kbd docutils literal notranslate">C</kbd>-<kbd class="kbd docutils literal notranslate">p</kbd> and <kbd class="kbd docutils literal notranslate">C</kbd>-<kbd class="kbd docutils literal notranslate">n</kbd> on macOS) +retrieve to the current prompt the previous or next previously +entered statement that matches anything already typed.</p></li> +<li><p><kbd class="kbd docutils literal notranslate">Return</kbd> while the cursor is on any previous statement +appends the latter to anything already typed at the prompt.</p></li> +</ul> +</section> +<section id="text-colors"> +<h3>Text colors<a class="headerlink" href="#text-colors" title="Link to this heading">¶</a></h3> +<p>Idle defaults to black on white text, but colors text with special meanings. +For the shell, these are shell output, shell error, user output, and +user error. For Python code, at the shell prompt or in an editor, these are +keywords, builtin class and function names, names following <code class="docutils literal notranslate"><span class="pre">class</span></code> and +<code class="docutils literal notranslate"><span class="pre">def</span></code>, strings, and comments. For any text window, these are the cursor (when +present), found text (when possible), and selected text.</p> +<p>IDLE also highlights the <a class="reference internal" href="../reference/lexical_analysis.html#soft-keywords"><span class="std std-ref">soft keywords</span></a> <a class="reference internal" href="../reference/compound_stmts.html#match"><code class="xref std std-keyword docutils literal notranslate"><span class="pre">match</span></code></a>, +<a class="reference internal" href="../reference/compound_stmts.html#match"><code class="xref std std-keyword docutils literal notranslate"><span class="pre">case</span></code></a>, and <a class="reference internal" href="../reference/compound_stmts.html#wildcard-patterns"><code class="xref std std-keyword docutils literal notranslate"><span class="pre">_</span></code></a> in +pattern-matching statements. However, this highlighting is not perfect and +will be incorrect in some rare cases, including some <code class="docutils literal notranslate"><span class="pre">_</span></code>-s in <code class="docutils literal notranslate"><span class="pre">case</span></code> +patterns.</p> +<p>Text coloring is done in the background, so uncolorized text is occasionally +visible. To change the color scheme, use the Configure IDLE dialog +Highlighting tab. The marking of debugger breakpoint lines in the editor and +text in popups and dialogs is not user-configurable.</p> +</section> +</section> +<section id="startup-and-code-execution"> +<h2>Startup and Code Execution<a class="headerlink" href="#startup-and-code-execution" title="Link to this heading">¶</a></h2> +<p>Upon startup with the <code class="docutils literal notranslate"><span class="pre">-s</span></code> option, IDLE will execute the file referenced by +the environment variables <span class="target" id="index-5"></span><code class="xref std std-envvar docutils literal notranslate"><span class="pre">IDLESTARTUP</span></code> or <span class="target" id="index-6"></span><a class="reference internal" href="../using/cmdline.html#envvar-PYTHONSTARTUP"><code class="xref std std-envvar docutils literal notranslate"><span class="pre">PYTHONSTARTUP</span></code></a>. +IDLE first checks for <code class="docutils literal notranslate"><span class="pre">IDLESTARTUP</span></code>; if <code class="docutils literal notranslate"><span class="pre">IDLESTARTUP</span></code> is present the file +referenced is run. If <code class="docutils literal notranslate"><span class="pre">IDLESTARTUP</span></code> is not present, IDLE checks for +<code class="docutils literal notranslate"><span class="pre">PYTHONSTARTUP</span></code>. Files referenced by these environment variables are +convenient places to store functions that are used frequently from the IDLE +shell, or for executing import statements to import common modules.</p> +<p>In addition, <code class="docutils literal notranslate"><span class="pre">Tk</span></code> also loads a startup file if it is present. Note that the +Tk file is loaded unconditionally. This additional file is <code class="docutils literal notranslate"><span class="pre">.Idle.py</span></code> and is +looked for in the user’s home directory. Statements in this file will be +executed in the Tk namespace, so this file is not useful for importing +functions to be used from IDLE’s Python shell.</p> +<section id="command-line-usage"> +<span id="idlelib-cli"></span><h3>Command-line usage<a class="headerlink" href="#command-line-usage" title="Link to this heading">¶</a></h3> +<p>IDLE can be invoked from the command line with various options. The general syntax is:</p> +<div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>python<span class="w"> </span>-m<span class="w"> </span>idlelib<span class="w"> </span><span class="o">[</span>options<span class="o">]</span><span class="w"> </span><span class="o">[</span>file<span class="w"> </span>...<span class="o">]</span> +</pre></div> +</div> +<p>The following options are available:</p> +<dl class="std option"> +<dt class="sig sig-object std" id="cmdoption-idle-c"> +<span class="sig-name descname"><span class="pre">-c</span></span><span class="sig-prename descclassname"> <span class="pre">&lt;command&gt;</span></span><a class="headerlink" href="#cmdoption-idle-c" title="Link to this definition">¶</a></dt> +<dd><p>Run the specified Python command in the shell window. +For example, pass <code class="docutils literal notranslate"><span class="pre">-c</span> <span class="pre">&quot;print('Hello,</span> <span class="pre">World!')&quot;</span></code>. +On Windows, the outer quotes must be double quotes as shown.</p> +</dd></dl> + +<dl class="std option"> +<dt class="sig sig-object std" id="cmdoption-idle-d"> +<span class="sig-name descname"><span class="pre">-d</span></span><span class="sig-prename descclassname"></span><a class="headerlink" href="#cmdoption-idle-d" title="Link to this definition">¶</a></dt> +<dd><p>Enable the debugger and open the shell window.</p> +</dd></dl> + +<dl class="std option"> +<dt class="sig sig-object std" id="cmdoption-idle-e"> +<span class="sig-name descname"><span class="pre">-e</span></span><span class="sig-prename descclassname"></span><a class="headerlink" href="#cmdoption-idle-e" title="Link to this definition">¶</a></dt> +<dd><p>Open an editor window.</p> +</dd></dl> + +<dl class="std option"> +<dt class="sig sig-object std" id="cmdoption-idle-h"> +<span class="sig-name descname"><span class="pre">-h</span></span><span class="sig-prename descclassname"></span><a class="headerlink" href="#cmdoption-idle-h" title="Link to this definition">¶</a></dt> +<dd><p>Print a help message with legal combinations of options and exit.</p> +</dd></dl> + +<dl class="std option"> +<dt class="sig sig-object std" id="cmdoption-idle-i"> +<span class="sig-name descname"><span class="pre">-i</span></span><span class="sig-prename descclassname"></span><a class="headerlink" href="#cmdoption-idle-i" title="Link to this definition">¶</a></dt> +<dd><p>Open a shell window.</p> +</dd></dl> + +<dl class="std option"> +<dt class="sig sig-object std" id="cmdoption-idle-r"> +<span class="sig-name descname"><span class="pre">-r</span></span><span class="sig-prename descclassname"> <span class="pre">&lt;file&gt;</span></span><a class="headerlink" href="#cmdoption-idle-r" title="Link to this definition">¶</a></dt> +<dd><p>Run the specified file in the shell window.</p> +</dd></dl> + +<dl class="std option"> +<dt class="sig sig-object std" id="cmdoption-idle-s"> +<span class="sig-name descname"><span class="pre">-s</span></span><span class="sig-prename descclassname"></span><a class="headerlink" href="#cmdoption-idle-s" title="Link to this definition">¶</a></dt> +<dd><p>Run the startup file (as defined by the environment variables <span class="target" id="index-7"></span><code class="xref std std-envvar docutils literal notranslate"><span class="pre">IDLESTARTUP</span></code> or <span class="target" id="index-8"></span><a class="reference internal" href="../using/cmdline.html#envvar-PYTHONSTARTUP"><code class="xref std std-envvar docutils literal notranslate"><span class="pre">PYTHONSTARTUP</span></code></a>) before opening the shell window.</p> +</dd></dl> + +<dl class="std option"> +<dt class="sig sig-object std" id="cmdoption-idle-t"> +<span class="sig-name descname"><span class="pre">-t</span></span><span class="sig-prename descclassname"> <span class="pre">&lt;title&gt;</span></span><a class="headerlink" href="#cmdoption-idle-t" title="Link to this definition">¶</a></dt> +<dd><p>Set the title of the shell window.</p> +</dd></dl> + +<dl class="std option"> +<dt class="sig sig-object std" id="cmdoption-idle-0"> +<span class="sig-name descname"><span class="pre">-</span></span><span class="sig-prename descclassname"></span><a class="headerlink" href="#cmdoption-idle-0" title="Link to this definition">¶</a></dt> +<dd><p>Read and execute standard input in the shell window. This option must be the last one before any arguments.</p> +</dd></dl> + +<p>If arguments are provided:</p> +<ul class="simple"> +<li><p>If <code class="docutils literal notranslate"><span class="pre">-</span></code>, <code class="docutils literal notranslate"><span class="pre">-c</span></code>, or <code class="docutils literal notranslate"><span class="pre">-r</span></code> is used, all arguments are placed in <code class="docutils literal notranslate"><span class="pre">sys.argv[1:]</span></code>, +and <code class="docutils literal notranslate"><span class="pre">sys.argv[0]</span></code> is set to <code class="docutils literal notranslate"><span class="pre">''</span></code>, <code class="docutils literal notranslate"><span class="pre">'-c'</span></code>, or <code class="docutils literal notranslate"><span class="pre">'-r'</span></code> respectively. +No editor window is opened, even if that is the default set in the <em>Options</em> dialog.</p></li> +<li><p>Otherwise, arguments are treated as files to be opened for editing, and <code class="docutils literal notranslate"><span class="pre">sys.argv</span></code> reflects the arguments passed to IDLE itself.</p></li> +</ul> +</section> +<section id="startup-failure"> +<h3>Startup failure<a class="headerlink" href="#startup-failure" title="Link to this heading">¶</a></h3> +<p>IDLE uses a socket to communicate between the IDLE GUI process and the user +code execution process. A connection must be established whenever the Shell +starts or restarts. (The latter is indicated by a divider line that says +‘RESTART’). If the user process fails to connect to the GUI process, it +usually displays a <code class="docutils literal notranslate"><span class="pre">Tk</span></code> error box with a ‘cannot connect’ message +that directs the user here. It then exits.</p> +<p>One specific connection failure on Unix systems results from +misconfigured masquerading rules somewhere in a system’s network setup. +When IDLE is started from a terminal, one will see a message starting +with <code class="docutils literal notranslate"><span class="pre">**</span> <span class="pre">Invalid</span> <span class="pre">host:</span></code>. +The valid value is <code class="docutils literal notranslate"><span class="pre">127.0.0.1</span> <span class="pre">(idlelib.rpc.LOCALHOST)</span></code>. +One can diagnose with <code class="docutils literal notranslate"><span class="pre">tcpconnect</span> <span class="pre">-irv</span> <span class="pre">127.0.0.1</span> <span class="pre">6543</span></code> in one +terminal window and <code class="docutils literal notranslate"><span class="pre">tcplisten</span> <span class="pre">&lt;same</span> <span class="pre">args&gt;</span></code> in another.</p> +<p>A common cause of failure is a user-written file with the same name as a +standard library module, such as <em>random.py</em> and <em>tkinter.py</em>. When such a +file is located in the same directory as a file that is about to be run, +IDLE cannot import the stdlib file. The current fix is to rename the +user file.</p> +<p>Though less common than in the past, an antivirus or firewall program may +stop the connection. If the program cannot be taught to allow the +connection, then it must be turned off for IDLE to work. It is safe to +allow this internal connection because no data is visible on external +ports. A similar problem is a network mis-configuration that blocks +connections.</p> +<p>Python installation issues occasionally stop IDLE: multiple versions can +clash, or a single installation might need admin access. If one undo the +clash, or cannot or does not want to run as admin, it might be easiest to +completely remove Python and start over.</p> +<p>A zombie pythonw.exe process could be a problem. On Windows, use Task +Manager to check for one and stop it if there is. Sometimes a restart +initiated by a program crash or Keyboard Interrupt (control-C) may fail +to connect. Dismissing the error box or using Restart Shell on the Shell +menu may fix a temporary problem.</p> +<p>When IDLE first starts, it attempts to read user configuration files in +<code class="docutils literal notranslate"><span class="pre">~/.idlerc/</span></code> (~ is one’s home directory). If there is a problem, an error +message should be displayed. Leaving aside random disk glitches, this can +be prevented by never editing the files by hand. Instead, use the +configuration dialog, under Options. Once there is an error in a user +configuration file, the best solution may be to delete it and start over +with the settings dialog.</p> +<p>If IDLE quits with no message, and it was not started from a console, try +starting it from a console or terminal (<code class="docutils literal notranslate"><span class="pre">python</span> <span class="pre">-m</span> <span class="pre">idlelib</span></code>) and see if +this results in an error message.</p> +<p>On Unix-based systems with tcl/tk older than <code class="docutils literal notranslate"><span class="pre">8.6.11</span></code> (see +<code class="docutils literal notranslate"><span class="pre">About</span> <span class="pre">IDLE</span></code>) certain characters of certain fonts can cause +a tk failure with a message to the terminal. This can happen either +if one starts IDLE to edit a file with such a character or later +when entering such a character. If one cannot upgrade tcl/tk, +then re-configure IDLE to use a font that works better.</p> +</section> +<section id="running-user-code"> +<h3>Running user code<a class="headerlink" href="#running-user-code" title="Link to this heading">¶</a></h3> +<p>With rare exceptions, the result of executing Python code with IDLE is +intended to be the same as executing the same code by the default method, +directly with Python in a text-mode system console or terminal window. +However, the different interface and operation occasionally affect +visible results. For instance, <code class="docutils literal notranslate"><span class="pre">sys.modules</span></code> starts with more entries, +and <code class="docutils literal notranslate"><span class="pre">threading.active_count()</span></code> returns 2 instead of 1.</p> +<p>By default, IDLE runs user code in a separate OS process rather than in +the user interface process that runs the shell and editor. In the execution +process, it replaces <code class="docutils literal notranslate"><span class="pre">sys.stdin</span></code>, <code class="docutils literal notranslate"><span class="pre">sys.stdout</span></code>, and <code class="docutils literal notranslate"><span class="pre">sys.stderr</span></code> +with objects that get input from and send output to the Shell window. +The original values stored in <code class="docutils literal notranslate"><span class="pre">sys.__stdin__</span></code>, <code class="docutils literal notranslate"><span class="pre">sys.__stdout__</span></code>, and +<code class="docutils literal notranslate"><span class="pre">sys.__stderr__</span></code> are not touched, but may be <code class="docutils literal notranslate"><span class="pre">None</span></code>.</p> +<p>Sending print output from one process to a text widget in another is +slower than printing to a system terminal in the same process. +This has the most effect when printing multiple arguments, as the string +for each argument, each separator, the newline are sent separately. +For development, this is usually not a problem, but if one wants to +print faster in IDLE, format and join together everything one wants +displayed together and then print a single string. Both format strings +and <a class="reference internal" href="stdtypes.html#str.join" title="str.join"><code class="xref py py-meth docutils literal notranslate"><span class="pre">str.join()</span></code></a> can help combine fields and lines.</p> +<p>IDLE’s standard stream replacements are not inherited by subprocesses +created in the execution process, whether directly by user code or by +modules such as multiprocessing. If such subprocess use <code class="docutils literal notranslate"><span class="pre">input</span></code> from +sys.stdin or <code class="docutils literal notranslate"><span class="pre">print</span></code> or <code class="docutils literal notranslate"><span class="pre">write</span></code> to sys.stdout or sys.stderr, +IDLE should be started in a command line window. (On Windows, +use <code class="docutils literal notranslate"><span class="pre">python</span></code> or <code class="docutils literal notranslate"><span class="pre">py</span></code> rather than <code class="docutils literal notranslate"><span class="pre">pythonw</span></code> or <code class="docutils literal notranslate"><span class="pre">pyw</span></code>.) +The secondary subprocess +will then be attached to that window for input and output.</p> +<p>If <code class="docutils literal notranslate"><span class="pre">sys</span></code> is reset by user code, such as with <code class="docutils literal notranslate"><span class="pre">importlib.reload(sys)</span></code>, +IDLE’s changes are lost and input from the keyboard and output to the screen +will not work correctly.</p> +<p>When Shell has the focus, it controls the keyboard and screen. This is +normally transparent, but functions that directly access the keyboard +and screen will not work. These include system-specific functions that +determine whether a key has been pressed and if so, which.</p> +<p>The IDLE code running in the execution process adds frames to the call stack +that would not be there otherwise. IDLE wraps <code class="docutils literal notranslate"><span class="pre">sys.getrecursionlimit</span></code> and +<code class="docutils literal notranslate"><span class="pre">sys.setrecursionlimit</span></code> to reduce the effect of the additional stack +frames.</p> +<p>When user code raises SystemExit either directly or by calling sys.exit, +IDLE returns to a Shell prompt instead of exiting.</p> +</section> +<section id="user-output-in-shell"> +<h3>User output in Shell<a class="headerlink" href="#user-output-in-shell" title="Link to this heading">¶</a></h3> +<p>When a program outputs text, the result is determined by the +corresponding output device. When IDLE executes user code, <code class="docutils literal notranslate"><span class="pre">sys.stdout</span></code> +and <code class="docutils literal notranslate"><span class="pre">sys.stderr</span></code> are connected to the display area of IDLE’s Shell. Some of +its features are inherited from the underlying Tk Text widget. Others +are programmed additions. Where it matters, Shell is designed for development +rather than production runs.</p> +<p>For instance, Shell never throws away output. A program that sends unlimited +output to Shell will eventually fill memory, resulting in a memory error. +In contrast, some system text windows only keep the last n lines of output. +A Windows console, for instance, keeps a user-settable 1 to 9999 lines, +with 300 the default.</p> +<p>A Tk Text widget, and hence IDLE’s Shell, displays characters (codepoints) in +the BMP (Basic Multilingual Plane) subset of Unicode. Which characters are +displayed with a proper glyph and which with a replacement box depends on the +operating system and installed fonts. Tab characters cause the following text +to begin after the next tab stop. (They occur every 8 ‘characters’). Newline +characters cause following text to appear on a new line. Other control +characters are ignored or displayed as a space, box, or something else, +depending on the operating system and font. (Moving the text cursor through +such output with arrow keys may exhibit some surprising spacing behavior.)</p> +<div class="highlight-python3 notranslate"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="n">s</span> <span class="o">=</span> <span class="s1">&#39;a</span><span class="se">\t</span><span class="s1">b</span><span class="se">\a</span><span class="s1">&lt;</span><span class="se">\x02</span><span class="s1">&gt;&lt;</span><span class="se">\r</span><span class="s1">&gt;</span><span class="se">\b</span><span class="s1">c</span><span class="se">\n</span><span class="s1">d&#39;</span> <span class="c1"># Enter 22 chars.</span> +<span class="gp">&gt;&gt;&gt; </span><span class="nb">len</span><span class="p">(</span><span class="n">s</span><span class="p">)</span> +<span class="go">14</span> +<span class="gp">&gt;&gt;&gt; </span><span class="n">s</span> <span class="c1"># Display repr(s)</span> +<span class="go">&#39;a\tb\x07&lt;\x02&gt;&lt;\r&gt;\x08c\nd&#39;</span> +<span class="gp">&gt;&gt;&gt; </span><span class="nb">print</span><span class="p">(</span><span class="n">s</span><span class="p">,</span> <span class="n">end</span><span class="o">=</span><span class="s1">&#39;&#39;</span><span class="p">)</span> <span class="c1"># Display s as is.</span> +<span class="go"># Result varies by OS and font. Try it.</span> +</pre></div> +</div> +<p>The <code class="docutils literal notranslate"><span class="pre">repr</span></code> function is used for interactive echo of expression +values. It returns an altered version of the input string in which +control codes, some BMP codepoints, and all non-BMP codepoints are +replaced with escape codes. As demonstrated above, it allows one to +identify the characters in a string, regardless of how they are displayed.</p> +<p>Normal and error output are generally kept separate (on separate lines) +from code input and each other. They each get different highlight colors.</p> +<p>For SyntaxError tracebacks, the normal ‘^’ marking where the error was +detected is replaced by coloring the text with an error highlight. +When code run from a file causes other exceptions, one may right click +on a traceback line to jump to the corresponding line in an IDLE editor. +The file will be opened if necessary.</p> +<p>Shell has a special facility for squeezing output lines down to a +‘Squeezed text’ label. This is done automatically +for output over N lines (N = 50 by default). +N can be changed in the PyShell section of the General +page of the Settings dialog. Output with fewer lines can be squeezed by +right clicking on the output. This can be useful lines long enough to slow +down scrolling.</p> +<p>Squeezed output is expanded in place by double-clicking the label. +It can also be sent to the clipboard or a separate view window by +right-clicking the label.</p> +</section> +<section id="developing-tkinter-applications"> +<h3>Developing tkinter applications<a class="headerlink" href="#developing-tkinter-applications" title="Link to this heading">¶</a></h3> +<p>IDLE is intentionally different from standard Python in order to +facilitate development of tkinter programs. Enter <code class="docutils literal notranslate"><span class="pre">import</span> <span class="pre">tkinter</span> <span class="pre">as</span> <span class="pre">tk;</span> +<span class="pre">root</span> <span class="pre">=</span> <span class="pre">tk.Tk()</span></code> in standard Python and nothing appears. Enter the same +in IDLE and a tk window appears. In standard Python, one must also enter +<code class="docutils literal notranslate"><span class="pre">root.update()</span></code> to see the window. IDLE does the equivalent in the +background, about 20 times a second, which is about every 50 milliseconds. +Next enter <code class="docutils literal notranslate"><span class="pre">b</span> <span class="pre">=</span> <span class="pre">tk.Button(root,</span> <span class="pre">text='button');</span> <span class="pre">b.pack()</span></code>. Again, +nothing visibly changes in standard Python until one enters <code class="docutils literal notranslate"><span class="pre">root.update()</span></code>.</p> +<p>Most tkinter programs run <code class="docutils literal notranslate"><span class="pre">root.mainloop()</span></code>, which usually does not +return until the tk app is destroyed. If the program is run with +<code class="docutils literal notranslate"><span class="pre">python</span> <span class="pre">-i</span></code> or from an IDLE editor, a <code class="docutils literal notranslate"><span class="pre">&gt;&gt;&gt;</span></code> shell prompt does not +appear until <code class="docutils literal notranslate"><span class="pre">mainloop()</span></code> returns, at which time there is nothing left +to interact with.</p> +<p>When running a tkinter program from an IDLE editor, one can comment out +the mainloop call. One then gets a shell prompt immediately and can +interact with the live application. One just has to remember to +re-enable the mainloop call when running in standard Python.</p> +</section> +<section id="running-without-a-subprocess"> +<h3>Running without a subprocess<a class="headerlink" href="#running-without-a-subprocess" title="Link to this heading">¶</a></h3> +<p>By default, IDLE executes user code in a separate subprocess via a socket, +which uses the internal loopback interface. This connection is not +externally visible and no data is sent to or received from the internet. +If firewall software complains anyway, you can ignore it.</p> +<p>If the attempt to make the socket connection fails, Idle will notify you. +Such failures are sometimes transient, but if persistent, the problem +may be either a firewall blocking the connection or misconfiguration of +a particular system. Until the problem is fixed, one can run Idle with +the -n command line switch.</p> +<p>If IDLE is started with the -n command line switch it will run in a +single process and will not create the subprocess which runs the RPC +Python execution server. This can be useful if Python cannot create +the subprocess or the RPC socket interface on your platform. However, +in this mode user code is not isolated from IDLE itself. Also, the +environment is not restarted when Run/Run Module (F5) is selected. If +your code has been modified, you must reload() the affected modules and +re-import any specific items (e.g. from foo import baz) if the changes +are to take effect. For these reasons, it is preferable to run IDLE +with the default subprocess if at all possible.</p> +<div class="deprecated"> +<p><span class="versionmodified deprecated">Deprecated since version 3.4.</span></p> +</div> +</section> +</section> +<section id="help-and-preferences"> +<h2>Help and Preferences<a class="headerlink" href="#help-and-preferences" title="Link to this heading">¶</a></h2> +<section id="help-sources"> +<span id="id6"></span><h3>Help sources<a class="headerlink" href="#help-sources" title="Link to this heading">¶</a></h3> +<p>Help menu entry “IDLE Help” displays a formatted html version of the +IDLE chapter of the Library Reference. The result, in a read-only +tkinter text window, is close to what one sees in a web browser. +Navigate through the text with a mousewheel, +the scrollbar, or up and down arrow keys held down. +Or click the TOC (Table of Contents) button and select a section +header in the opened box.</p> +<p>Help menu entry “Python Docs” opens the extensive sources of help, +including tutorials, available at <code class="docutils literal notranslate"><span class="pre">docs.python.org/x.y</span></code>, where ‘x.y’ +is the currently running Python version. If your system +has an off-line copy of the docs (this may be an installation option), +that will be opened instead.</p> +<p>Selected URLs can be added or removed from the help menu at any time using the +General tab of the Configure IDLE dialog.</p> +</section> +<section id="setting-preferences"> +<span id="preferences"></span><h3>Setting preferences<a class="headerlink" href="#setting-preferences" title="Link to this heading">¶</a></h3> +<p>The font preferences, highlighting, keys, and general preferences can be +changed via Configure IDLE on the Option menu. +Non-default user settings are saved in a <code class="docutils literal notranslate"><span class="pre">.idlerc</span></code> directory in the user’s +home directory. Problems caused by bad user configuration files are solved +by editing or deleting one or more of the files in <code class="docutils literal notranslate"><span class="pre">.idlerc</span></code>.</p> +<p>On the Font tab, see the text sample for the effect of font face and size +on multiple characters in multiple languages. Edit the sample to add +other characters of personal interest. Use the sample to select +monospaced fonts. If particular characters have problems in Shell or an +editor, add them to the top of the sample and try changing first size +and then font.</p> +<p>On the Highlights and Keys tab, select a built-in or custom color theme +and key set. To use a newer built-in color theme or key set with older +IDLEs, save it as a new custom theme or key set and it well be accessible +to older IDLEs.</p> +</section> +<section id="idle-on-macos"> +<h3>IDLE on macOS<a class="headerlink" href="#idle-on-macos" title="Link to this heading">¶</a></h3> +<p>Under System Preferences: Dock, one can set “Prefer tabs when opening +documents” to “Always”. This setting is not compatible with the tk/tkinter +GUI framework used by IDLE, and it breaks a few IDLE features.</p> +</section> +<section id="extensions"> +<h3>Extensions<a class="headerlink" href="#extensions" title="Link to this heading">¶</a></h3> +<p>IDLE contains an extension facility. Preferences for extensions can be +changed with the Extensions tab of the preferences dialog. See the +beginning of config-extensions.def in the idlelib directory for further +information. The only current default extension is zzdummy, an example +also used for testing.</p> +</section> +</section> +<section id="module-idlelib"> +<span id="idlelib-implementation-of-idle-application"></span><h2>idlelib — implementation of IDLE application<a class="headerlink" href="#module-idlelib" title="Link to this heading">¶</a></h2> +<p><strong>Source code:</strong> <a class="extlink-source reference external" href="https://github.com/python/cpython/tree/main/Lib/idlelib">Lib/idlelib</a></p> +<hr class="docutils" /> +<p>The Lib/idlelib package implements the IDLE application. See the rest +of this page for how to use IDLE.</p> +<p>The files in idlelib are described in idlelib/README.txt. Access it +either in idlelib or click Help =&gt; About IDLE on the IDLE menu. This +file also maps IDLE menu items to the code that implements the item. +Except for files listed under ‘Startup’, the idlelib code is ‘private’ in +sense that feature changes can be backported (see <span class="target" id="index-9"></span><a class="pep reference external" href="https://peps.python.org/pep-0434/"><strong>PEP 434</strong></a>).</p> +</section> +</section> + + diff --git a/Lib/idlelib/help.py b/Lib/idlelib/help.py new file mode 100644 index 000000000..48e7eca28 --- /dev/null +++ b/Lib/idlelib/help.py @@ -0,0 +1,343 @@ +""" help.py: Implement the Idle help menu. +Contents are subject to revision at any time, without notice. + + +Help => About IDLE: display About Idle dialog + +<to be moved here from help_about.py> + + +Help => IDLE Help: Display help.html with proper formatting. +Doc/library/idle.rst (Sphinx)=> Doc/build/html/library/idle.html +(help.copy_strip)=> Lib/idlelib/help.html + +HelpParser - Parse help.html and render to tk Text. + +HelpText - Display formatted help.html. + +HelpFrame - Contain text, scrollbar, and table-of-contents. +(This will be needed for display in a future tabbed window.) + +HelpWindow - Display HelpFrame in a standalone window. + +copy_strip - Copy the text part of idle.html to help.html while rstripping each line. + +show_idlehelp - Create HelpWindow. Called in EditorWindow.help_dialog. + +_get_dochome() - Return path to docs on user's system if present, +otherwise return link to docs.python.org. +""" +import os +import sys +from html.parser import HTMLParser +from os.path import abspath, dirname, isfile, join +from platform import python_version + +from tkinter import Toplevel, Text, Menu +from tkinter.ttk import Frame, Menubutton, Scrollbar, Style +from tkinter import font as tkfont + +from idlelib.config import idleConf +from idlelib.colorizer import color_config + +## About IDLE ## + + +## IDLE Help ## + +class HelpParser(HTMLParser): + """Render help.html into a text widget. + + The overridden handle_xyz methods handle a subset of html tags. + The supplied text should have the needed tag configurations. + The behavior for unsupported tags, such as table, is undefined. + If the tags generated by Sphinx change, this class, especially + the handle_starttag and handle_endtags methods, might have to also. + """ + def __init__(self, text): + HTMLParser.__init__(self, convert_charrefs=True) + self.text = text # Text widget we're rendering into. + self.tags = '' # Current block level text tags to apply. + self.chartags = '' # Current character level text tags. + self.hdrlink = False # Exclude html header links. + self.level = 0 # Track indentation level. + self.pre = False # Displaying preformatted text? + self.hprefix = '' # Heading prefix (like '25.5'?) to remove. + self.nested_dl = False # In a nested <dl>? + self.simplelist = False # In a simple list (no double spacing)? + self.toc = [] # Pair headers with text indexes for toc. + self.header = '' # Text within header tags for toc. + self.prevtag = None # Previous tag info (opener?, tag). + + def indent(self, amt=1): + "Change indent (+1, 0, -1) and tags." + self.level += amt + self.tags = '' if self.level == 0 else 'l'+str(self.level) + + def handle_starttag(self, tag, attrs): + "Handle starttags in help.html." + class_ = '' + for a, v in attrs: + if a == 'class': + class_ = v + s = '' + if tag == 'p' and self.prevtag and not self.prevtag[0]: + # Begin a new block for <p> tags after a closed tag. + # Avoid extra lines, e.g. after <pre> tags. + lastline = self.text.get('end-1c linestart', 'end-1c') + s = '\n\n' if lastline and not lastline.isspace() else '\n' + elif tag == 'span' and class_ == 'pre': + self.chartags = 'pre' + elif tag == 'span' and class_ == 'versionmodified': + self.chartags = 'em' + elif tag == 'em': + self.chartags = 'em' + elif tag in ['ul', 'ol']: + if class_.find('simple') != -1: + s = '\n' + self.simplelist = True + else: + self.simplelist = False + self.indent() + elif tag == 'dl': + if self.level > 0: + self.nested_dl = True + elif tag == 'li': + s = '\n* ' + elif tag == 'dt': + s = '\n\n' if not self.nested_dl else '\n' # Avoid extra line. + self.nested_dl = False + elif tag == 'dd': + self.indent() + s = '\n' + elif tag == 'pre': + self.pre = True + self.text.insert('end', '\n\n') + self.tags = 'preblock' + elif tag == 'a' and class_ == 'headerlink': + self.hdrlink = True + elif tag == 'h1': + self.tags = tag + elif tag in ['h2', 'h3']: + self.header = '' + self.text.insert('end', '\n\n') + self.tags = tag + self.text.insert('end', s, (self.tags, self.chartags)) + self.prevtag = (True, tag) + + def handle_endtag(self, tag): + "Handle endtags in help.html." + if tag in ['h1', 'h2', 'h3']: + assert self.level == 0 + indent = (' ' if tag == 'h3' else + ' ' if tag == 'h2' else + '') + self.toc.append((indent+self.header, self.text.index('insert'))) + self.tags = '' + elif tag in ['span', 'em']: + self.chartags = '' + elif tag == 'a': + self.hdrlink = False + elif tag == 'pre': + self.pre = False + self.tags = '' + elif tag in ['ul', 'dd', 'ol']: + self.indent(-1) + self.prevtag = (False, tag) + + def handle_data(self, data): + "Handle date segments in help.html." + if not self.hdrlink: + d = data if self.pre else data.replace('\n', ' ') + if self.tags == 'h1': + try: + self.hprefix = d[:d.index(' ')] + if not self.hprefix.isdigit(): + self.hprefix = '' + except ValueError: + self.hprefix = '' + if self.tags in ['h1', 'h2', 'h3']: + if (self.hprefix != '' and + d[0:len(self.hprefix)] == self.hprefix): + d = d[len(self.hprefix):] + self.header += d.strip() + self.text.insert('end', d, (self.tags, self.chartags)) + + +class HelpText(Text): + "Display help.html." + def __init__(self, parent, filename): + "Configure tags and feed file to parser." + uwide = idleConf.GetOption('main', 'EditorWindow', 'width', type='int') + uhigh = idleConf.GetOption('main', 'EditorWindow', 'height', type='int') + uhigh = 3 * uhigh // 4 # Lines average 4/3 of editor line height. + Text.__init__(self, parent, wrap='word', highlightthickness=0, + padx=5, borderwidth=0, width=uwide, height=uhigh) + + normalfont = self.findfont(['TkDefaultFont', 'arial', 'helvetica']) + fixedfont = self.findfont(['TkFixedFont', 'monaco', 'courier']) + color_config(self) + self['font'] = (normalfont, 12) + self.tag_configure('em', font=(normalfont, 12, 'italic')) + self.tag_configure('h1', font=(normalfont, 20, 'bold')) + self.tag_configure('h2', font=(normalfont, 18, 'bold')) + self.tag_configure('h3', font=(normalfont, 15, 'bold')) + self.tag_configure('pre', font=(fixedfont, 12)) + preback = self['selectbackground'] + self.tag_configure('preblock', font=(fixedfont, 10), lmargin1=25, + background=preback) + self.tag_configure('l1', lmargin1=25, lmargin2=25) + self.tag_configure('l2', lmargin1=50, lmargin2=50) + self.tag_configure('l3', lmargin1=75, lmargin2=75) + self.tag_configure('l4', lmargin1=100, lmargin2=100) + + self.parser = HelpParser(self) + with open(filename, encoding='utf-8') as f: + contents = f.read() + self.parser.feed(contents) + self['state'] = 'disabled' + + def findfont(self, names): + "Return name of first font family derived from names." + for name in names: + if name.lower() in (x.lower() for x in tkfont.names(root=self)): + font = tkfont.Font(name=name, exists=True, root=self) + return font.actual()['family'] + elif name.lower() in (x.lower() + for x in tkfont.families(root=self)): + return name + + +class HelpFrame(Frame): + "Display html text, scrollbar, and toc." + def __init__(self, parent, filename): + Frame.__init__(self, parent) + self.text = text = HelpText(self, filename) + self.style = Style(parent) + self['style'] = 'helpframe.TFrame' + self.style.configure('helpframe.TFrame', background=text['background']) + self.toc = toc = self.toc_menu(text) + self.scroll = scroll = Scrollbar(self, command=text.yview) + text['yscrollcommand'] = scroll.set + + self.rowconfigure(0, weight=1) + self.columnconfigure(1, weight=1) # Only expand the text widget. + toc.grid(row=0, column=0, sticky='nw') + text.grid(row=0, column=1, sticky='nsew') + scroll.grid(row=0, column=2, sticky='ns') + + def toc_menu(self, text): + "Create table of contents as drop-down menu." + toc = Menubutton(self, text='TOC') + drop = Menu(toc, tearoff=False) + for lbl, dex in text.parser.toc: + drop.add_command(label=lbl, command=lambda dex=dex:text.yview(dex)) + toc['menu'] = drop + return toc + + +class HelpWindow(Toplevel): + "Display frame with rendered html." + def __init__(self, parent, filename, title): + Toplevel.__init__(self, parent) + self.wm_title(title) + self.protocol("WM_DELETE_WINDOW", self.destroy) + self.frame = HelpFrame(self, filename) + self.frame.grid(column=0, row=0, sticky='nsew') + self.grid_columnconfigure(0, weight=1) + self.grid_rowconfigure(0, weight=1) + + +def copy_strip(): # pragma: no cover + """Copy the text part of idle.html to idlelib/help.html while stripping trailing whitespace. + + Files with trailing whitespace cannot be pushed to the git cpython + repository. For 3.x (on Windows), help.html is generated, after + editing idle.rst on the master branch, with + sphinx-build -bhtml . build/html + python_d.exe -c "from idlelib.help import copy_strip; copy_strip()" + Check build/html/library/idle.html, the help.html diff, and the text + displayed by Help => IDLE Help. Add a blurb and create a PR. + + It can be worthwhile to occasionally generate help.html without + touching idle.rst. Changes to the master version and to the doc + build system may result in changes that should not change + the displayed text, but might break HelpParser. + + As long as master and maintenance versions of idle.rst remain the + same, help.html can be backported. The internal Python version + number is not displayed. If maintenance idle.rst diverges from + the master version, then instead of backporting help.html from + master, repeat the procedure above to generate a maintenance + version. + """ + src = join(abspath(dirname(dirname(dirname(__file__)))), + 'Doc', 'build', 'html', 'library', 'idle.html') + dst = join(abspath(dirname(__file__)), 'help.html') + + with open(src, 'r', encoding="utf-8") as inn, open(dst, 'w', encoding="utf-8") as out: + copy = False + for line in inn: + if '<section id="idle">' in line: copy = True + if '<div class="clearer">' in line: break + if copy: out.write(line.strip() + '\n') + + print(f'{src} copied to {dst}') + + +def show_idlehelp(parent): + "Create HelpWindow; called from Idle Help event handler." + filename = join(abspath(dirname(__file__)), 'help.html') + if not isfile(filename): # pragma: no cover + # Try copy_strip, present message. + return + return HelpWindow(parent, filename, 'IDLE Doc (%s)' % python_version()) + + +def _get_dochome(): + "Return path to local docs if present, otherwise link to docs.python.org." + + dochome = os.path.join(sys.base_prefix, 'Doc', 'index.html') + if sys.platform.count('linux'): + # look for html docs in a couple of standard places + pyver = 'python-docs-' + '%s.%s.%s' % sys.version_info[:3] + if os.path.isdir('/var/www/html/python/'): # rpm package manager + dochome = '/var/www/html/python/index.html' + else: + basepath = '/usr/share/doc/' # dnf/apt package managers + dochome = os.path.join(basepath, pyver, 'Doc', 'index.html') + + elif sys.platform[:3] == 'win': + import winreg # Windows only, block only executed once. + docfile = '' + KEY = (rf"Software\Python\PythonCore\{sys.winver}" + r"\Help\Main Python Documentation") + try: + docfile = winreg.QueryValue(winreg.HKEY_CURRENT_USER, KEY) + except FileNotFoundError: + try: + docfile = winreg.QueryValue(winreg.HKEY_LOCAL_MACHINE, KEY) + except FileNotFoundError: + pass + if os.path.isfile(docfile): + dochome = docfile + elif sys.platform == 'darwin': + # documentation may be stored inside a python framework + dochome = os.path.join(sys.base_prefix, + 'Resources/English.lproj/Documentation/index.html') + dochome = os.path.normpath(dochome) + if os.path.isfile(dochome): + if sys.platform == 'darwin': + # Safari requires real file:-URLs + return 'file://' + dochome + return dochome + else: + return "https://docs.python.org/%d.%d/" % sys.version_info[:2] + + +if __name__ == '__main__': + from unittest import main + main('idlelib.idle_test.test_help', verbosity=2, exit=False) + + from idlelib.idle_test.htest import run + run(show_idlehelp) diff --git a/Lib/idlelib/help_about.py b/Lib/idlelib/help_about.py new file mode 100644 index 000000000..750da3732 --- /dev/null +++ b/Lib/idlelib/help_about.py @@ -0,0 +1,211 @@ +"""About Dialog for IDLE + +""" +import os +import sys +import webbrowser +from platform import python_version, architecture + +from tkinter import Toplevel, Frame, Label, Button, PhotoImage +from tkinter import SUNKEN, TOP, BOTTOM, LEFT, X, BOTH, W, EW, NSEW, E + +from idlelib import textview + +pyver = python_version() + +if sys.platform == 'darwin': + bits = '64' if sys.maxsize > 2**32 else '32' +else: + bits = architecture()[0][:2] + + +class AboutDialog(Toplevel): + """Modal about dialog for idle + + """ + def __init__(self, parent, title=None, *, _htest=False, _utest=False): + """Create popup, do not return until tk widget destroyed. + + parent - parent of this dialog + title - string which is title of popup dialog + _htest - bool, change box location when running htest + _utest - bool, don't wait_window when running unittest + """ + Toplevel.__init__(self, parent) + self.configure(borderwidth=5) + # place dialog below parent if running htest + self.geometry("+%d+%d" % ( + parent.winfo_rootx()+30, + parent.winfo_rooty()+(30 if not _htest else 100))) + self.bg = "#bbbbbb" + self.fg = "#000000" + self.create_widgets() + self.resizable(height=False, width=False) + self.title(title or + f'About IDLE {pyver} ({bits} bit)') + self.transient(parent) + self.grab_set() + self.protocol("WM_DELETE_WINDOW", self.ok) + self.parent = parent + self.button_ok.focus_set() + self.bind('<Return>', self.ok) # dismiss dialog + self.bind('<Escape>', self.ok) # dismiss dialog + self._current_textview = None + self._utest = _utest + + if not _utest: + self.deiconify() + self.wait_window() + + def create_widgets(self): + frame = Frame(self, borderwidth=2, relief=SUNKEN) + frame_buttons = Frame(self) + frame_buttons.pack(side=BOTTOM, fill=X) + frame.pack(side=TOP, expand=True, fill=BOTH) + self.button_ok = Button(frame_buttons, text='Close', + command=self.ok) + self.button_ok.pack(padx=5, pady=5) + + frame_background = Frame(frame, bg=self.bg) + frame_background.pack(expand=True, fill=BOTH) + + header = Label(frame_background, text='IDLE', fg=self.fg, + bg=self.bg, font=('courier', 24, 'bold')) + header.grid(row=0, column=0, sticky=E, padx=10, pady=10) + + tkpatch = self._root().getvar('tk_patchLevel') + ext = '.png' if tkpatch >= '8.6' else '.gif' + icon = os.path.join(os.path.abspath(os.path.dirname(__file__)), + 'Icons', f'idle_48{ext}') + self.icon_image = PhotoImage(master=self._root(), file=icon) + logo = Label(frame_background, image=self.icon_image, bg=self.bg) + logo.grid(row=0, column=0, sticky=W, rowspan=2, padx=10, pady=10) + + byline_text = "Python's Integrated Development\nand Learning Environment" + 5*'\n' + byline = Label(frame_background, text=byline_text, justify=LEFT, + fg=self.fg, bg=self.bg) + byline.grid(row=2, column=0, sticky=W, columnspan=3, padx=10, pady=5) + + forums_url = "https://discuss.python.org" + forums = Button(frame_background, text='Python (and IDLE) Discussion', width=35, + highlightbackground=self.bg, + command=lambda: webbrowser.open(forums_url)) + forums.grid(row=6, column=0, sticky=W, padx=10, pady=10) + + + docs_url = ("https://docs.python.org/%d.%d/library/idle.html" % + sys.version_info[:2]) + docs = Button(frame_background, text='IDLE Documentation', width=35, + highlightbackground=self.bg, + command=lambda: webbrowser.open(docs_url)) + docs.grid(row=7, column=0, columnspan=2, sticky=W, padx=10, pady=10) + + + Frame(frame_background, borderwidth=1, relief=SUNKEN, + height=2, bg=self.bg).grid(row=8, column=0, sticky=EW, + columnspan=3, padx=5, pady=5) + + tclver = str(self.info_patchlevel()) + tkver = ' and ' + tkpatch if tkpatch != tclver else '' + versions = f"Python {pyver} with tcl/tk {tclver}{tkver}" + vers = Label(frame_background, text=versions, fg=self.fg, bg=self.bg) + vers.grid(row=9, column=0, sticky=W, padx=10, pady=0) + py_buttons = Frame(frame_background, bg=self.bg) + py_buttons.grid(row=10, column=0, columnspan=2, sticky=NSEW) + self.py_license = Button(py_buttons, text='License', width=8, + highlightbackground=self.bg, + command=self.show_py_license) + self.py_license.pack(side=LEFT, padx=10, pady=10) + self.py_copyright = Button(py_buttons, text='Copyright', width=8, + highlightbackground=self.bg, + command=self.show_py_copyright) + self.py_copyright.pack(side=LEFT, padx=10, pady=10) + self.py_credits = Button(py_buttons, text='Credits', width=8, + highlightbackground=self.bg, + command=self.show_py_credits) + self.py_credits.pack(side=LEFT, padx=10, pady=10) + + Frame(frame_background, borderwidth=1, relief=SUNKEN, + height=2, bg=self.bg).grid(row=11, column=0, sticky=EW, + columnspan=3, padx=5, pady=5) + + idle = Label(frame_background, text='IDLE', fg=self.fg, bg=self.bg) + idle.grid(row=12, column=0, sticky=W, padx=10, pady=0) + idle_buttons = Frame(frame_background, bg=self.bg) + idle_buttons.grid(row=13, column=0, columnspan=3, sticky=NSEW) + self.readme = Button(idle_buttons, text='Readme', width=8, + highlightbackground=self.bg, + command=self.show_readme) + self.readme.pack(side=LEFT, padx=10, pady=10) + self.idle_news = Button(idle_buttons, text='News', width=8, + highlightbackground=self.bg, + command=self.show_idle_news) + self.idle_news.pack(side=LEFT, padx=10, pady=10) + self.idle_credits = Button(idle_buttons, text='Credits', width=8, + highlightbackground=self.bg, + command=self.show_idle_credits) + self.idle_credits.pack(side=LEFT, padx=10, pady=10) + + # License, copyright, and credits are of type _sitebuiltins._Printer + def show_py_license(self): + "Handle License button event." + self.display_printer_text('About - License', license) + + def show_py_copyright(self): + "Handle Copyright button event." + self.display_printer_text('About - Copyright', copyright) + + def show_py_credits(self): + "Handle Python Credits button event." + self.display_printer_text('About - Python Credits', credits) + + # Encode CREDITS.txt to utf-8 for proper version of Loewis. + # Specify others as ascii until need utf-8, so catch errors. + def show_idle_credits(self): + "Handle Idle Credits button event." + self.display_file_text('About - Credits', 'CREDITS.txt', 'utf-8') + + def show_readme(self): + "Handle Readme button event." + self.display_file_text('About - Readme', 'README.txt', 'ascii') + + def show_idle_news(self): + "Handle News button event." + self.display_file_text('About - News', 'News3.txt', 'utf-8') + + def display_printer_text(self, title, printer): + """Create textview for built-in constants. + + Built-in constants have type _sitebuiltins._Printer. The + text is extracted from the built-in and then sent to a text + viewer with self as the parent and title as the title of + the popup. + """ + printer._Printer__setup() + text = '\n'.join(printer._Printer__lines) + self._current_textview = textview.view_text( + self, title, text, _utest=self._utest) + + def display_file_text(self, title, filename, encoding=None): + """Create textview for filename. + + The filename needs to be in the current directory. The path + is sent to a text viewer with self as the parent, title as + the title of the popup, and the file encoding. + """ + fn = os.path.join(os.path.abspath(os.path.dirname(__file__)), filename) + self._current_textview = textview.view_file( + self, title, fn, encoding, _utest=self._utest) + + def ok(self, event=None): + "Dismiss help_about dialog." + self.grab_release() + self.destroy() + + +if __name__ == '__main__': + from unittest import main + main('idlelib.idle_test.test_help_about', verbosity=2, exit=False) + + from idlelib.idle_test.htest import run + run(AboutDialog) diff --git a/Lib/idlelib/history.py b/Lib/idlelib/history.py new file mode 100644 index 000000000..5a9b32aaf --- /dev/null +++ b/Lib/idlelib/history.py @@ -0,0 +1,106 @@ +"Implement Idle Shell history mechanism with History class" + +from idlelib.config import idleConf + + +class History: + ''' Implement Idle Shell history mechanism. + + store - Store source statement (called from pyshell.resetoutput). + fetch - Fetch stored statement matching prefix already entered. + history_next - Bound to <<history-next>> event (default Alt-N). + history_prev - Bound to <<history-prev>> event (default Alt-P). + ''' + def __init__(self, text): + '''Initialize data attributes and bind event methods. + + .text - Idle wrapper of tk Text widget, with .bell(). + .history - source statements, possibly with multiple lines. + .prefix - source already entered at prompt; filters history list. + .pointer - index into history. + .cyclic - wrap around history list (or not). + ''' + self.text = text + self.history = [] + self.prefix = None + self.pointer = None + self.cyclic = idleConf.GetOption("main", "History", "cyclic", 1, "bool") + text.bind("<<history-previous>>", self.history_prev) + text.bind("<<history-next>>", self.history_next) + + def history_next(self, event): + "Fetch later statement; start with earliest if cyclic." + self.fetch(reverse=False) + return "break" + + def history_prev(self, event): + "Fetch earlier statement; start with most recent." + self.fetch(reverse=True) + return "break" + + def fetch(self, reverse): + '''Fetch statement and replace current line in text widget. + + Set prefix and pointer as needed for successive fetches. + Reset them to None, None when returning to the start line. + Sound bell when return to start line or cannot leave a line + because cyclic is False. + ''' + nhist = len(self.history) + pointer = self.pointer + prefix = self.prefix + if pointer is not None and prefix is not None: + if self.text.compare("insert", "!=", "end-1c") or \ + self.text.get("iomark", "end-1c") != self.history[pointer]: + pointer = prefix = None + self.text.mark_set("insert", "end-1c") # != after cursor move + if pointer is None or prefix is None: + prefix = self.text.get("iomark", "end-1c") + if reverse: + pointer = nhist # will be decremented + else: + if self.cyclic: + pointer = -1 # will be incremented + else: # abort history_next + self.text.bell() + return + nprefix = len(prefix) + while True: + pointer += -1 if reverse else 1 + if pointer < 0 or pointer >= nhist: + self.text.bell() + if not self.cyclic and pointer < 0: # abort history_prev + return + else: + if self.text.get("iomark", "end-1c") != prefix: + self.text.delete("iomark", "end-1c") + self.text.insert("iomark", prefix, "stdin") + pointer = prefix = None + break + item = self.history[pointer] + if item[:nprefix] == prefix and len(item) > nprefix: + self.text.delete("iomark", "end-1c") + self.text.insert("iomark", item, "stdin") + break + self.text.see("insert") + self.text.tag_remove("sel", "1.0", "end") + self.pointer = pointer + self.prefix = prefix + + def store(self, source): + "Store Shell input statement into history list." + source = source.strip() + if len(source) > 2: + # avoid duplicates + try: + self.history.remove(source) + except ValueError: + pass + self.history.append(source) + self.pointer = None + self.prefix = None + + +if __name__ == "__main__": + from unittest import main + main('idlelib.idle_test.test_history', verbosity=2, exit=False) diff --git a/Lib/idlelib/hyperparser.py b/Lib/idlelib/hyperparser.py new file mode 100644 index 000000000..76144ee8f --- /dev/null +++ b/Lib/idlelib/hyperparser.py @@ -0,0 +1,312 @@ +"""Provide advanced parsing abilities for ParenMatch and other extensions. + +HyperParser uses PyParser. PyParser mostly gives information on the +proper indentation of code. HyperParser gives additional information on +the structure of code. +""" +from keyword import iskeyword +import string + +from idlelib import pyparse + +# all ASCII chars that may be in an identifier +_ASCII_ID_CHARS = frozenset(string.ascii_letters + string.digits + "_") +# all ASCII chars that may be the first char of an identifier +_ASCII_ID_FIRST_CHARS = frozenset(string.ascii_letters + "_") + +# lookup table for whether 7-bit ASCII chars are valid in a Python identifier +_IS_ASCII_ID_CHAR = [(chr(x) in _ASCII_ID_CHARS) for x in range(128)] +# lookup table for whether 7-bit ASCII chars are valid as the first +# char in a Python identifier +_IS_ASCII_ID_FIRST_CHAR = \ + [(chr(x) in _ASCII_ID_FIRST_CHARS) for x in range(128)] + + +class HyperParser: + def __init__(self, editwin, index): + "To initialize, analyze the surroundings of the given index." + + self.editwin = editwin + self.text = text = editwin.text + + parser = pyparse.Parser(editwin.indentwidth, editwin.tabwidth) + + def index2line(index): + return int(float(index)) + lno = index2line(text.index(index)) + + if not editwin.prompt_last_line: + for context in editwin.num_context_lines: + startat = max(lno - context, 1) + startatindex = repr(startat) + ".0" + stopatindex = "%d.end" % lno + # We add the newline because PyParse requires a newline + # at end. We add a space so that index won't be at end + # of line, so that its status will be the same as the + # char before it, if should. + parser.set_code(text.get(startatindex, stopatindex)+' \n') + bod = parser.find_good_parse_start( + editwin._build_char_in_string_func(startatindex)) + if bod is not None or startat == 1: + break + parser.set_lo(bod or 0) + else: + r = text.tag_prevrange("console", index) + if r: + startatindex = r[1] + else: + startatindex = "1.0" + stopatindex = "%d.end" % lno + # We add the newline because PyParse requires it. We add a + # space so that index won't be at end of line, so that its + # status will be the same as the char before it, if should. + parser.set_code(text.get(startatindex, stopatindex)+' \n') + parser.set_lo(0) + + # We want what the parser has, minus the last newline and space. + self.rawtext = parser.code[:-2] + # Parser.code apparently preserves the statement we are in, so + # that stopatindex can be used to synchronize the string with + # the text box indices. + self.stopatindex = stopatindex + self.bracketing = parser.get_last_stmt_bracketing() + # find which pairs of bracketing are openers. These always + # correspond to a character of rawtext. + self.isopener = [i>0 and self.bracketing[i][1] > + self.bracketing[i-1][1] + for i in range(len(self.bracketing))] + + self.set_index(index) + + def set_index(self, index): + """Set the index to which the functions relate. + + The index must be in the same statement. + """ + indexinrawtext = (len(self.rawtext) - + len(self.text.get(index, self.stopatindex))) + if indexinrawtext < 0: + raise ValueError("Index %s precedes the analyzed statement" + % index) + self.indexinrawtext = indexinrawtext + # find the rightmost bracket to which index belongs + self.indexbracket = 0 + while (self.indexbracket < len(self.bracketing)-1 and + self.bracketing[self.indexbracket+1][0] < self.indexinrawtext): + self.indexbracket += 1 + if (self.indexbracket < len(self.bracketing)-1 and + self.bracketing[self.indexbracket+1][0] == self.indexinrawtext and + not self.isopener[self.indexbracket+1]): + self.indexbracket += 1 + + def is_in_string(self): + """Is the index given to the HyperParser in a string?""" + # The bracket to which we belong should be an opener. + # If it's an opener, it has to have a character. + return (self.isopener[self.indexbracket] and + self.rawtext[self.bracketing[self.indexbracket][0]] + in ('"', "'")) + + def is_in_code(self): + """Is the index given to the HyperParser in normal code?""" + return (not self.isopener[self.indexbracket] or + self.rawtext[self.bracketing[self.indexbracket][0]] + not in ('#', '"', "'")) + + def get_surrounding_brackets(self, openers='([{', mustclose=False): + """Return bracket indexes or None. + + If the index given to the HyperParser is surrounded by a + bracket defined in openers (or at least has one before it), + return the indices of the opening bracket and the closing + bracket (or the end of line, whichever comes first). + + If it is not surrounded by brackets, or the end of line comes + before the closing bracket and mustclose is True, returns None. + """ + + bracketinglevel = self.bracketing[self.indexbracket][1] + before = self.indexbracket + while (not self.isopener[before] or + self.rawtext[self.bracketing[before][0]] not in openers or + self.bracketing[before][1] > bracketinglevel): + before -= 1 + if before < 0: + return None + bracketinglevel = min(bracketinglevel, self.bracketing[before][1]) + after = self.indexbracket + 1 + while (after < len(self.bracketing) and + self.bracketing[after][1] >= bracketinglevel): + after += 1 + + beforeindex = self.text.index("%s-%dc" % + (self.stopatindex, len(self.rawtext)-self.bracketing[before][0])) + if (after >= len(self.bracketing) or + self.bracketing[after][0] > len(self.rawtext)): + if mustclose: + return None + afterindex = self.stopatindex + else: + # We are after a real char, so it is a ')' and we give the + # index before it. + afterindex = self.text.index( + "%s-%dc" % (self.stopatindex, + len(self.rawtext)-(self.bracketing[after][0]-1))) + + return beforeindex, afterindex + + # the set of built-in identifiers which are also keywords, + # i.e. keyword.iskeyword() returns True for them + _ID_KEYWORDS = frozenset({"True", "False", "None"}) + + @classmethod + def _eat_identifier(cls, str, limit, pos): + """Given a string and pos, return the number of chars in the + identifier which ends at pos, or 0 if there is no such one. + + This ignores non-identifier eywords are not identifiers. + """ + is_ascii_id_char = _IS_ASCII_ID_CHAR + + # Start at the end (pos) and work backwards. + i = pos + + # Go backwards as long as the characters are valid ASCII + # identifier characters. This is an optimization, since it + # is faster in the common case where most of the characters + # are ASCII. + while i > limit and ( + ord(str[i - 1]) < 128 and + is_ascii_id_char[ord(str[i - 1])] + ): + i -= 1 + + # If the above loop ended due to reaching a non-ASCII + # character, continue going backwards using the most generic + # test for whether a string contains only valid identifier + # characters. + if i > limit and ord(str[i - 1]) >= 128: + while i - 4 >= limit and ('a' + str[i - 4:pos]).isidentifier(): + i -= 4 + if i - 2 >= limit and ('a' + str[i - 2:pos]).isidentifier(): + i -= 2 + if i - 1 >= limit and ('a' + str[i - 1:pos]).isidentifier(): + i -= 1 + + # The identifier candidate starts here. If it isn't a valid + # identifier, don't eat anything. At this point that is only + # possible if the first character isn't a valid first + # character for an identifier. + if not str[i:pos].isidentifier(): + return 0 + elif i < pos: + # All characters in str[i:pos] are valid ASCII identifier + # characters, so it is enough to check that the first is + # valid as the first character of an identifier. + if not _IS_ASCII_ID_FIRST_CHAR[ord(str[i])]: + return 0 + + # All keywords are valid identifiers, but should not be + # considered identifiers here, except for True, False and None. + if i < pos and ( + iskeyword(str[i:pos]) and + str[i:pos] not in cls._ID_KEYWORDS + ): + return 0 + + return pos - i + + # This string includes all chars that may be in a white space + _whitespace_chars = " \t\n\\" + + def get_expression(self): + """Return a string with the Python expression which ends at the + given index, which is empty if there is no real one. + """ + if not self.is_in_code(): + raise ValueError("get_expression should only be called " + "if index is inside a code.") + + rawtext = self.rawtext + bracketing = self.bracketing + + brck_index = self.indexbracket + brck_limit = bracketing[brck_index][0] + pos = self.indexinrawtext + + last_identifier_pos = pos + postdot_phase = True + + while True: + # Eat whitespaces, comments, and if postdot_phase is False - a dot + while True: + if pos>brck_limit and rawtext[pos-1] in self._whitespace_chars: + # Eat a whitespace + pos -= 1 + elif (not postdot_phase and + pos > brck_limit and rawtext[pos-1] == '.'): + # Eat a dot + pos -= 1 + postdot_phase = True + # The next line will fail if we are *inside* a comment, + # but we shouldn't be. + elif (pos == brck_limit and brck_index > 0 and + rawtext[bracketing[brck_index-1][0]] == '#'): + # Eat a comment + brck_index -= 2 + brck_limit = bracketing[brck_index][0] + pos = bracketing[brck_index+1][0] + else: + # If we didn't eat anything, quit. + break + + if not postdot_phase: + # We didn't find a dot, so the expression end at the + # last identifier pos. + break + + ret = self._eat_identifier(rawtext, brck_limit, pos) + if ret: + # There is an identifier to eat + pos = pos - ret + last_identifier_pos = pos + # Now, to continue the search, we must find a dot. + postdot_phase = False + # (the loop continues now) + + elif pos == brck_limit: + # We are at a bracketing limit. If it is a closing + # bracket, eat the bracket, otherwise, stop the search. + level = bracketing[brck_index][1] + while brck_index > 0 and bracketing[brck_index-1][1] > level: + brck_index -= 1 + if bracketing[brck_index][0] == brck_limit: + # We were not at the end of a closing bracket + break + pos = bracketing[brck_index][0] + brck_index -= 1 + brck_limit = bracketing[brck_index][0] + last_identifier_pos = pos + if rawtext[pos] in "([": + # [] and () may be used after an identifier, so we + # continue. postdot_phase is True, so we don't allow a dot. + pass + else: + # We can't continue after other types of brackets + if rawtext[pos] in "'\"": + # Scan a string prefix + while pos > 0 and rawtext[pos - 1] in "rRbBuU": + pos -= 1 + last_identifier_pos = pos + break + + else: + # We've found an operator or something. + break + + return rawtext[last_identifier_pos:self.indexinrawtext] + + +if __name__ == '__main__': + from unittest import main + main('idlelib.idle_test.test_hyperparser', verbosity=2) diff --git a/Lib/idlelib/idle.bat b/Lib/idlelib/idle.bat new file mode 100644 index 000000000..3d619a37e --- /dev/null +++ b/Lib/idlelib/idle.bat @@ -0,0 +1,4 @@ +@echo off +rem Start IDLE using the appropriate Python interpreter +set CURRDIR=%~dp0 +start "IDLE" "%CURRDIR%..\..\pythonw.exe" "%CURRDIR%idle.pyw" %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/Lib/idlelib/idle.py b/Lib/idlelib/idle.py new file mode 100644 index 000000000..485d5a75a --- /dev/null +++ b/Lib/idlelib/idle.py @@ -0,0 +1,14 @@ +import os.path +import sys + + +# Enable running IDLE with idlelib in a non-standard location. +# This was once used to run development versions of IDLE. +# Because PEP 434 declared idle.py a public interface, +# removal should require deprecation. +idlelib_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) +if idlelib_dir not in sys.path: + sys.path.insert(0, idlelib_dir) + +from idlelib.pyshell import main # This is subject to change +main() diff --git a/Lib/idlelib/idle.pyw b/Lib/idlelib/idle.pyw new file mode 100644 index 000000000..e73c049b7 --- /dev/null +++ b/Lib/idlelib/idle.pyw @@ -0,0 +1,17 @@ +try: + import idlelib.pyshell +except ImportError: + # IDLE is not installed, but maybe pyshell is on sys.path: + from . import pyshell + import os + idledir = os.path.dirname(os.path.abspath(pyshell.__file__)) + if idledir != os.getcwd(): + # We're not in the IDLE directory, help the subprocess find run.py + pypath = os.environ.get('PYTHONPATH', '') + if pypath: + os.environ['PYTHONPATH'] = pypath + ':' + idledir + else: + os.environ['PYTHONPATH'] = idledir + pyshell.main() +else: + idlelib.pyshell.main() diff --git a/Lib/idlelib/idle_test/README.txt b/Lib/idlelib/idle_test/README.txt new file mode 100644 index 000000000..cacd06db8 --- /dev/null +++ b/Lib/idlelib/idle_test/README.txt @@ -0,0 +1,241 @@ +README FOR IDLE TESTS IN IDLELIB.IDLE_TEST + +0. Quick Start + +Automated unit tests were added in 3.3 for Python 3.x. +To run the tests from a command line: + +python -m test.test_idle + +Human-mediated tests were added later in 3.4. + +python -m idlelib.idle_test.htest + + +1. Test Files + +The idle directory, idlelib, has over 60 xyz.py files. The idle_test +subdirectory contains test_xyz.py for each implementation file xyz.py. +To add a test for abc.py, open idle_test/template.py and immediately +Save As test_abc.py. Insert 'abc' on the first line, and replace +'zzdummy' with 'abc. + +Remove the imports of requires and tkinter if not needed. Otherwise, +add to the tkinter imports as needed. + +Add a prefix to 'Test' for the initial test class. The template class +contains code needed or possibly needed for gui tests. See the next +section if doing gui tests. If not, and not needed for further classes, +this code can be removed. + +Add the following at the end of abc.py. If an htest was added first, +insert the import and main lines before the htest lines. + +if __name__ == "__main__": + from unittest import main + main('idlelib.idle_test.test_abc', verbosity=2, exit=False) + +The ', exit=False' is only needed if an htest follows. + + + +2. GUI Tests + +When run as part of the Python test suite, Idle GUI tests need to run +test.support.requires('gui'). A test is a GUI test if it creates a +tkinter.Tk root or master object either directly or indirectly by +instantiating a tkinter or idle class. GUI tests cannot run in test +processes that either have no graphical environment available or are not +allowed to use it. + +To guard a module consisting entirely of GUI tests, start with + +from test.support import requires +requires('gui') + +To guard a test class, put "requires('gui')" in its setUpClass function. +The template.py file does this. + +To avoid interfering with other GUI tests, all GUI objects must be +destroyed and deleted by the end of the test. The Tk root created in a +setUpX function should be destroyed in the corresponding tearDownX and +the module or class attribute deleted. Others widgets should descend +from the single root and the attributes deleted BEFORE root is +destroyed. See https://bugs.python.org/issue20567. + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = tk.Tk() + cls.text = tk.Text(root) + + @classmethod + def tearDownClass(cls): + del cls.text + cls.root.update_idletasks() + cls.root.destroy() + del cls.root + +The update_idletasks call is sometimes needed to prevent the following +warning either when running a test alone or as part of the test suite +(#27196). It should not hurt if not needed. + + can't invoke "event" command: application has been destroyed + ... + "ttk::ThemeChanged" + +If a test creates instance 'e' of EditorWindow, call 'e._close()' before +or as the first part of teardown. The effect of omitting this depends +on the later shutdown. Then enable the after_cancel loop in the +template. This prevents messages like the following. + +bgerror failed to handle background error. + Original error: invalid command name "106096696timer_event" + Error in bgerror: can't invoke "tk" command: application has been destroyed + +Requires('gui') causes the test(s) it guards to be skipped if any of +these conditions are met: + + - The tests are being run by regrtest.py, and it was started without + enabling the "gui" resource with the "-u" command line option. + + - The tests are being run on Windows by a service that is not allowed + to interact with the graphical environment. + + - The tests are being run on Linux and X Windows is not available. + + - The tests are being run on Mac OSX in a process that cannot make a + window manager connection. + + - tkinter.Tk cannot be successfully instantiated for some reason. + + - test.support.use_resources has been set by something other than + regrtest.py and does not contain "gui". + +Tests of non-GUI operations should avoid creating tk widgets. Incidental +uses of tk variables and messageboxes can be replaced by the mock +classes in idle_test/mock_tk.py. The mock text handles some uses of the +tk Text widget. + + +3. Running Unit Tests + +Assume that xyz.py and test_xyz.py both end with a unittest.main() call. +Running either from an Idle editor runs all tests in the test_xyz file +with the version of Python running Idle. Test output appears in the +Shell window. The 'verbosity=2' option lists all test methods in the +file, which is appropriate when developing tests. The 'exit=False' +option is needed in xyx.py files when an htest follows. + +The following command lines also run all test methods, including +GUI tests, in test_xyz.py. (Both '-m idlelib' and '-m idlelib.idle' +start Idle and so cannot run tests.) + +python -m idlelib.xyz +python -m idlelib.idle_test.test_xyz + +The following runs all idle_test/test_*.py tests interactively. + +>>> import unittest +>>> unittest.main('idlelib.idle_test', verbosity=2) + +The following run all Idle tests at a command line. Option '-v' is the +same as 'verbosity=2'. + +python -m unittest -v idlelib.idle_test +python -m test -v -ugui test_idle +python -m test.test_idle + +IDLE tests are 'discovered' by idlelib.idle_test.__init__.load_tests +when this is imported into test.test_idle. Normally, neither file +should be changed when working on individual test modules. The third +command runs unittest indirectly through regrtest. The same happens when +the entire test suite is run with 'python -m test'. So that command must +work for buildbots to stay green. IDLE tests must not disturb the +environment in a way that makes other tests fail (GH-62281). + +To test subsets of modules, see idlelib.idle_test.__init__. This +can be used to find refleaks or possible sources of "Theme changed" +tcl messages (GH-71383). + +To run an individual Testcase or test method, extend the dotted name +given to unittest on the command line or use the test -m option. The +latter allows use of other regrtest options. When using the latter, +all components of the pattern must be present, but any can be replaced +by '*'. + +python -m unittest -v idlelib.idle_test.test_xyz.Test_case.test_meth +python -m test -m idlelib.idle_test.text_xyz.Test_case.test_meth test_idle + +The test suite can be run in an IDLE user process from Shell. +>>> import test.autotest # Issue 25588, 2017/10/13, 3.6.4, 3.7.0a2. +There are currently failures not usually present, and this does not +work when run from the editor. + + +4. Human-mediated Tests + +Human-mediated tests are widget tests that cannot be automated but need +human verification. They are contained in idlelib/idle_test/htest.py, +which has instructions. (Some modules need an auxiliary function, +identified with "# htest # on the header line.) The set is about +complete, though some tests need improvement. To run all htests, run the +htest file from an editor or from the command line with: + +python -m idlelib.idle_test.htest + + +5. Test Coverage + +Install the coverage package into your Python 3.6 site-packages +directory. (Its exact location depends on the OS). +> python3 -m pip install coverage +(On Windows, replace 'python3 with 'py -3.6' or perhaps just 'python'.) + +The problem with running coverage with repository python is that +coverage uses absolute imports for its submodules, hence it needs to be +in a directory in sys.path. One solution: copy the package to the +directory containing the cpython repository. Call it 'dev'. Then run +coverage either directly or from a script in that directory so that +'dev' is prepended to sys.path. + +Either edit or add dev/.coveragerc so it looks something like this. +--- +# .coveragerc sets coverage options. +[run] +branch = True + +[report] +# Regexes for lines to exclude from consideration +exclude_lines = + # Don't complain if non-runnable code isn't run: + if 0: + if __name__ == .__main__.: + + .*# htest # + if not _utest: + if _htest: +--- +The additions for IDLE are 'branch = True', to test coverage both ways, +and the last three exclude lines, to exclude things peculiar to IDLE +that are not executed during tests. + +A script like the following cover.bat (for Windows) is very handy. +--- +@echo off +rem Usage: cover filename [test_ suffix] # proper case required by coverage +rem filename without .py, 2nd parameter if test is not test_filename +setlocal +set py=f:\dev\3x\pcbuild\win32\python_d.exe +set src=idlelib.%1 +if "%2" EQU "" set tst=f:/dev/3x/Lib/idlelib/idle_test/test_%1.py +if "%2" NEQ "" set tst=f:/dev/ex/Lib/idlelib/idle_test/test_%2.py + +%py% -m coverage run --pylib --source=%src% %tst% +%py% -m coverage report --show-missing +%py% -m coverage html +start htmlcov\3x_Lib_idlelib_%1_py.html +rem Above opens new report; htmlcov\index.html displays report index +--- +The second parameter was added for tests of module x not named test_x. +(There were several before modules were renamed, now only one is left.) diff --git a/Lib/idlelib/idle_test/__init__.py b/Lib/idlelib/idle_test/__init__.py new file mode 100644 index 000000000..8eed2699c --- /dev/null +++ b/Lib/idlelib/idle_test/__init__.py @@ -0,0 +1,23 @@ +"""idlelib.idle_test implements test.test_idle, which tests the IDLE +application as part of the stdlib test suite. +Run IDLE tests alone with "python -m test.test_idle (-v)". + +This package and its contained modules are subject to change and +any direct use is at your own risk. +""" +from os.path import dirname + +# test_idle imports load_tests for test discovery (default all). +# To run subsets of idlelib module tests, insert '[<chars>]' after '_'. +# Example: insert '[ac]' for modules beginning with 'a' or 'c'. +# Additional .discover/.addTest pairs with separate inserts work. +# Example: pairs with 'c' and 'g' test c* files and grep. + +def load_tests(loader, standard_tests, pattern): + this_dir = dirname(__file__) + top_dir = dirname(dirname(this_dir)) + module_tests = loader.discover(start_dir=this_dir, + pattern='test_*.py', # Insert here. + top_level_dir=top_dir) + standard_tests.addTests(module_tests) + return standard_tests diff --git a/Lib/idlelib/idle_test/example_noext b/Lib/idlelib/idle_test/example_noext new file mode 100644 index 000000000..7d2510e30 --- /dev/null +++ b/Lib/idlelib/idle_test/example_noext @@ -0,0 +1,4 @@ +#!usr/bin/env python + +def example_function(some_argument): + pass diff --git a/Lib/idlelib/idle_test/example_stub.pyi b/Lib/idlelib/idle_test/example_stub.pyi new file mode 100644 index 000000000..abcdbc175 --- /dev/null +++ b/Lib/idlelib/idle_test/example_stub.pyi @@ -0,0 +1,4 @@ +# An example file to test recognition of a .pyi file as Python source code. + +class Example: + def method(self, argument1: str, argument2: list[int]) -> None: ... diff --git a/Lib/idlelib/idle_test/htest.py b/Lib/idlelib/idle_test/htest.py new file mode 100644 index 000000000..b63ff9ec2 --- /dev/null +++ b/Lib/idlelib/idle_test/htest.py @@ -0,0 +1,442 @@ +"""Run human tests of Idle's window, dialog, and popup widgets. + +run(*tests) Create a master Tk() htest window. Within that, run each +callable in tests after finding the matching test spec in this file. If +tests is empty, run an htest for each spec dict in this file after +finding the matching callable in the module named in the spec. Close +the master window to end testing. + +In a tested module, let X be a global name bound to a callable (class or +function) whose .__name__ attribute is also X (the usual situation). The +first parameter of X must be 'parent' or 'master'. When called, the +first argument will be the root window. X must create a child +Toplevel(parent/master) (or subclass thereof). The Toplevel may be a +test widget or dialog, in which case the callable is the corresponding +class. Or the Toplevel may contain the widget to be tested or set up a +context in which a test widget is invoked. In this latter case, the +callable is a wrapper function that sets up the Toplevel and other +objects. Wrapper function names, such as _editor_window', should start +with '_' and be lowercase. + + +End the module with + +if __name__ == '__main__': + <run unittest.main with 'exit=False'> + from idlelib.idle_test.htest import run + run(callable) # There could be multiple comma-separated callables. + +To have wrapper functions ignored by coverage reports, tag the def +header like so: "def _wrapper(parent): # htest #". Use the same tag +for htest lines in widget code. Make sure that the 'if __name__' line +matches the above. Then have make sure that .coveragerc includes the +following: + +[report] +exclude_lines = + .*# htest # + if __name__ == .__main__.: + +(The "." instead of "'" is intentional and necessary.) + + +To run any X, this file must contain a matching instance of the +following template, with X.__name__ prepended to '_spec'. +When all tests are run, the prefix is use to get X. + +callable_spec = { + 'file': '', + 'kwds': {'title': ''}, + 'msg': "" + } + +file (no .py): run() imports file.py. +kwds: augmented with {'parent':root} and passed to X as **kwds. +title: an example kwd; some widgets need this, delete line if not. +msg: master window hints about testing the widget. + + +TODO test these modules and classes: + autocomplete_w.AutoCompleteWindow + debugger.Debugger + outwin.OutputWindow (indirectly being tested with grep test) + pyshell.PyShellEditorWindow +""" + +import idlelib.pyshell # Set Windows DPI awareness before Tk(). +from importlib import import_module +import textwrap +import tkinter as tk +from tkinter.ttk import Scrollbar +tk.NoDefaultRoot() + +AboutDialog_spec = { + 'file': 'help_about', + 'kwds': {'title': 'help_about test', + '_htest': True, + }, + 'msg': "Click on URL to open in default browser.\n" + "Verify x.y.z versions and test each button, including Close.\n " + } + +# TODO implement ^\; adding '<Control-Key-\\>' to function does not work. +_calltip_window_spec = { + 'file': 'calltip_w', + 'kwds': {}, + 'msg': "Typing '(' should display a calltip.\n" + "Typing ') should hide the calltip.\n" + "So should moving cursor out of argument area.\n" + "Force-open-calltip does not work here.\n" + } + +_color_delegator_spec = { + 'file': 'colorizer', + 'kwds': {}, + 'msg': "The text is sample Python code.\n" + "Ensure components like comments, keywords, builtins,\n" + "string, definitions, and break are correctly colored.\n" + "The default color scheme is in idlelib/config-highlight.def" + } + +ConfigDialog_spec = { + 'file': 'configdialog', + 'kwds': {'title': 'ConfigDialogTest', + '_htest': True,}, + 'msg': "IDLE preferences dialog.\n" + "In the 'Fonts/Tabs' tab, changing font face, should update the " + "font face of the text in the area below it.\nIn the " + "'Highlighting' tab, try different color schemes. Clicking " + "items in the sample program should update the choices above it." + "\nIn the 'Keys', 'General' and 'Extensions' tabs, test settings " + "of interest." + "\n[Ok] to close the dialog.[Apply] to apply the settings and " + "and [Cancel] to revert all changes.\nRe-run the test to ensure " + "changes made have persisted." + } + +CustomRun_spec = { + 'file': 'query', + 'kwds': {'title': 'Customize query.py Run', + '_htest': True}, + 'msg': "Enter with <Return> or [OK]. Print valid entry to Shell\n" + "Arguments are parsed into a list\n" + "Mode is currently restart True or False\n" + "Close dialog with valid entry, <Escape>, [Cancel], [X]" + } + +_debug_object_browser_spec = { + 'file': 'debugobj', + 'kwds': {}, + 'msg': "Double click on items up to the lowest level.\n" + "Attributes of the objects and related information " + "will be displayed side-by-side at each level." + } + +# TODO Improve message +_dyn_option_menu_spec = { + 'file': 'dynoption', + 'kwds': {}, + 'msg': "Select one of the many options in the 'old option set'.\n" + "Click the button to change the option set.\n" + "Select one of the many options in the 'new option set'." + } + +# TODO edit wrapper +_editor_window_spec = { + 'file': 'editor', + 'kwds': {}, + 'msg': "Test editor functions of interest.\n" + "Best to close editor first." + } + +GetKeysWindow_spec = { + 'file': 'config_key', + 'kwds': {'title': 'Test keybindings', + 'action': 'find-again', + 'current_key_sequences': [['<Control-Key-g>', '<Key-F3>', '<Control-Key-G>']], + '_htest': True, + }, + 'msg': "Test for different key modifier sequences.\n" + "<nothing> is invalid.\n" + "No modifier key is invalid.\n" + "Shift key with [a-z],[0-9], function key, move key, tab, space " + "is invalid.\nNo validity checking if advanced key binding " + "entry is used." + } + +_grep_dialog_spec = { + 'file': 'grep', + 'kwds': {}, + 'msg': "Click the 'Show GrepDialog' button.\n" + "Test the various 'Find-in-files' functions.\n" + "The results should be displayed in a new '*Output*' window.\n" + "'Right-click'->'Go to file/line' in the search results\n " + "should open that file in a new EditorWindow." + } + +HelpSource_spec = { + 'file': 'query', + 'kwds': {'title': 'Help name and source', + 'menuitem': 'test', + 'filepath': __file__, + 'used_names': {'abc'}, + '_htest': True}, + 'msg': "Enter menu item name and help file path\n" + "'', > than 30 chars, and 'abc' are invalid menu item names.\n" + "'' and file does not exist are invalid path items.\n" + "Any url ('www...', 'http...') is accepted.\n" + "Test Browse with and without path, as cannot unittest.\n" + "[Ok] or <Return> prints valid entry to shell\n" + "<Escape>, [Cancel], or [X] prints None to shell" + } + +_io_binding_spec = { + 'file': 'iomenu', + 'kwds': {}, + 'msg': "Test the following bindings.\n" + "<Control-o> to open file from dialog.\n" + "Edit the file.\n" + "<Control-p> to print the file.\n" + "<Control-s> to save the file.\n" + "<Alt-s> to save-as another file.\n" + "<Control-c> to save-copy-as another file.\n" + "Check that changes were saved by opening the file elsewhere." + } + +_multi_call_spec = { + 'file': 'multicall', + 'kwds': {}, + 'msg': "The following should trigger a print to console or IDLE Shell.\n" + "Entering and leaving the text area, key entry, <Control-Key>,\n" + "<Alt-Key-a>, <Control-Key-a>, <Alt-Control-Key-a>, \n" + "<Control-Button-1>, <Alt-Button-1> and focusing elsewhere." + } + +_module_browser_spec = { + 'file': 'browser', + 'kwds': {}, + 'msg': textwrap.dedent(""" + "Inspect names of module, class(with superclass if applicable), + "methods and functions. Toggle nested items. Double clicking + "on items prints a traceback for an exception that is ignored.""") + } + +_multistatus_bar_spec = { + 'file': 'statusbar', + 'kwds': {}, + 'msg': "Ensure presence of multi-status bar below text area.\n" + "Click 'Update Status' to change the status text" + } + +PathBrowser_spec = { + 'file': 'pathbrowser', + 'kwds': {'_htest': True}, + 'msg': "Test for correct display of all paths in sys.path.\n" + "Toggle nested items out to the lowest level.\n" + "Double clicking on an item prints a traceback\n" + "for an exception that is ignored." + } + +_percolator_spec = { + 'file': 'percolator', + 'kwds': {}, + 'msg': "There are two tracers which can be toggled using a checkbox.\n" + "Toggling a tracer 'on' by checking it should print tracer " + "output to the console or to the IDLE shell.\n" + "If both the tracers are 'on', the output from the tracer which " + "was switched 'on' later, should be printed first\n" + "Test for actions like text entry, and removal." + } + +Query_spec = { + 'file': 'query', + 'kwds': {'title': 'Query', + 'message': 'Enter something', + 'text0': 'Go', + '_htest': True}, + 'msg': "Enter with <Return> or [Ok]. Print valid entry to Shell\n" + "Blank line, after stripping, is ignored\n" + "Close dialog with valid entry, <Escape>, [Cancel], [X]" + } + + +_replace_dialog_spec = { + 'file': 'replace', + 'kwds': {}, + 'msg': "Click the 'Replace' button.\n" + "Test various replace options in the 'Replace dialog'.\n" + "Click [Close] or [X] to close the 'Replace Dialog'." + } + +_scrolled_list_spec = { + 'file': 'scrolledlist', + 'kwds': {}, + 'msg': "You should see a scrollable list of items\n" + "Selecting (clicking) or double clicking an item " + "prints the name to the console or Idle shell.\n" + "Right clicking an item will display a popup." + } + +_search_dialog_spec = { + 'file': 'search', + 'kwds': {}, + 'msg': "Click the 'Search' button.\n" + "Test various search options in the 'Search dialog'.\n" + "Click [Close] or [X] to close the 'Search Dialog'." + } + +_searchbase_spec = { + 'file': 'searchbase', + 'kwds': {}, + 'msg': "Check the appearance of the base search dialog\n" + "Its only action is to close." + } + +show_idlehelp_spec = { + 'file': 'help', + 'kwds': {}, + 'msg': "If the help text displays, this works.\n" + "Text is selectable. Window is scrollable." + } + +_sidebar_number_scrolling_spec = { + 'file': 'sidebar', + 'kwds': {}, + 'msg': textwrap.dedent("""\ + 1. Click on the line numbers and drag down below the edge of the + window, moving the mouse a bit and then leaving it there for a + while. The text and line numbers should gradually scroll down, + with the selection updated continuously. + + 2. With the lines still selected, click on a line number above + or below the selected lines. Only the line whose number was + clicked should be selected. + + 3. Repeat step #1, dragging to above the window. The text and + line numbers should gradually scroll up, with the selection + updated continuously. + + 4. Repeat step #2, clicking a line number below the selection."""), + } + +_stackbrowser_spec = { + 'file': 'stackviewer', + 'kwds': {}, + 'msg': "A stacktrace for a NameError exception.\n" + "Should have NameError and 1 traceback line." + } + +_tooltip_spec = { + 'file': 'tooltip', + 'kwds': {}, + 'msg': "Place mouse cursor over both the buttons\n" + "A tooltip should appear with some text." + } + +_tree_widget_spec = { + 'file': 'tree', + 'kwds': {}, + 'msg': "The canvas is scrollable.\n" + "Click on folders up to the lowest level." + } + +_undo_delegator_spec = { + 'file': 'undo', + 'kwds': {}, + 'msg': "Click [Undo] to undo any action.\n" + "Click [Redo] to redo any action.\n" + "Click [Dump] to dump the current state " + "by printing to the console or the IDLE shell.\n" + } + +ViewWindow_spec = { + 'file': 'textview', + 'kwds': {'title': 'Test textview', + 'contents': 'The quick brown fox jumps over the lazy dog.\n'*35, + '_htest': True}, + 'msg': "Test for read-only property of text.\n" + "Select text, scroll window, close" + } + +_widget_redirector_spec = { + 'file': 'redirector', + 'kwds': {}, + 'msg': "Every text insert should be printed to the console " + "or the IDLE shell." + } + +def run(*tests): + "Run callables in tests." + root = tk.Tk() + root.title('IDLE htest') + root.resizable(0, 0) + + # A scrollable Label-like constant width text widget. + frameLabel = tk.Frame(root, padx=10) + frameLabel.pack() + text = tk.Text(frameLabel, wrap='word') + text.configure(bg=root.cget('bg'), relief='flat', height=4, width=70) + scrollbar = Scrollbar(frameLabel, command=text.yview) + text.config(yscrollcommand=scrollbar.set) + scrollbar.pack(side='right', fill='y', expand=False) + text.pack(side='left', fill='both', expand=True) + + test_list = [] # Make list of (spec, callable) tuples. + if tests: + for test in tests: + test_spec = globals()[test.__name__ + '_spec'] + test_spec['name'] = test.__name__ + test_list.append((test_spec, test)) + else: + for key, dic in globals().items(): + if key.endswith('_spec'): + test_name = key[:-5] + test_spec = dic + test_spec['name'] = test_name + mod = import_module('idlelib.' + test_spec['file']) + test = getattr(mod, test_name) + test_list.append((test_spec, test)) + test_list.reverse() # So can pop in proper order in next_test. + + test_name = tk.StringVar(root) + callable_object = None + test_kwds = None + + def next_test(): + nonlocal test_name, callable_object, test_kwds + if len(test_list) == 1: + next_button.pack_forget() + test_spec, callable_object = test_list.pop() + test_kwds = test_spec['kwds'] + test_name.set('Test ' + test_spec['name']) + + text['state'] = 'normal' # Enable text replacement. + text.delete('1.0', 'end') + text.insert("1.0", test_spec['msg']) + text['state'] = 'disabled' # Restore read-only property. + + def run_test(_=None): + widget = callable_object(root, **test_kwds) + try: + print(widget.result) # Only true for query classes(?). + except AttributeError: + pass + + def close(_=None): + root.destroy() + + button = tk.Button(root, textvariable=test_name, + default='active', command=run_test) + next_button = tk.Button(root, text="Next", command=next_test) + button.pack() + next_button.pack() + next_button.focus_set() + root.bind('<Key-Return>', run_test) + root.bind('<Key-Escape>', close) + + next_test() + root.mainloop() + + +if __name__ == '__main__': + run() diff --git a/Lib/idlelib/idle_test/mock_idle.py b/Lib/idlelib/idle_test/mock_idle.py new file mode 100644 index 000000000..71fa480ce --- /dev/null +++ b/Lib/idlelib/idle_test/mock_idle.py @@ -0,0 +1,61 @@ +'''Mock classes that imitate idlelib modules or classes. + +Attributes and methods will be added as needed for tests. +''' + +from idlelib.idle_test.mock_tk import Text + +class Func: + '''Record call, capture args, return/raise result set by test. + + When mock function is called, set or use attributes: + self.called - increment call number even if no args, kwds passed. + self.args - capture positional arguments. + self.kwds - capture keyword arguments. + self.result - return or raise value set in __init__. + self.return_self - return self instead, to mock query class return. + + Most common use will probably be to mock instance methods. + Given class instance, can set and delete as instance attribute. + Mock_tk.Var and Mbox_func are special variants of this. + ''' + def __init__(self, result=None, return_self=False): + self.called = 0 + self.result = result + self.return_self = return_self + self.args = None + self.kwds = None + def __call__(self, *args, **kwds): + self.called += 1 + self.args = args + self.kwds = kwds + if isinstance(self.result, BaseException): + raise self.result + elif self.return_self: + return self + else: + return self.result + + +class Editor: + '''Minimally imitate editor.EditorWindow class. + ''' + def __init__(self, flist=None, filename=None, key=None, root=None, + text=None): # Allow real Text with mock Editor. + self.text = text or Text() + self.undo = UndoDelegator() + + def get_selection_indices(self): + first = self.text.index('1.0') + last = self.text.index('end') + return first, last + + +class UndoDelegator: + '''Minimally imitate undo.UndoDelegator class. + ''' + # A real undo block is only needed for user interaction. + def undo_block_start(*args): + pass + def undo_block_stop(*args): + pass diff --git a/Lib/idlelib/idle_test/mock_tk.py b/Lib/idlelib/idle_test/mock_tk.py new file mode 100644 index 000000000..8304734b8 --- /dev/null +++ b/Lib/idlelib/idle_test/mock_tk.py @@ -0,0 +1,307 @@ +"""Classes that replace tkinter gui objects used by an object being tested. + +A gui object is anything with a master or parent parameter, which is +typically required in spite of what the doc strings say. +""" +import re +from _tkinter import TclError + + +class Event: + '''Minimal mock with attributes for testing event handlers. + + This is not a gui object, but is used as an argument for callbacks + that access attributes of the event passed. If a callback ignores + the event, other than the fact that is happened, pass 'event'. + + Keyboard, mouse, window, and other sources generate Event instances. + Event instances have the following attributes: serial (number of + event), time (of event), type (of event as number), widget (in which + event occurred), and x,y (position of mouse). There are other + attributes for specific events, such as keycode for key events. + tkinter.Event.__doc__ has more but is still not complete. + ''' + def __init__(self, **kwds): + "Create event with attributes needed for test" + self.__dict__.update(kwds) + + +class Var: + "Use for String/Int/BooleanVar: incomplete" + def __init__(self, master=None, value=None, name=None): + self.master = master + self.value = value + self.name = name + def set(self, value): + self.value = value + def get(self): + return self.value + + +class Mbox_func: + """Generic mock for messagebox functions, which all have the same signature. + + Instead of displaying a message box, the mock's call method saves the + arguments as instance attributes, which test functions can then examine. + The test can set the result returned to ask function + """ + def __init__(self, result=None): + self.result = result # Return None for all show funcs + def __call__(self, title, message, *args, **kwds): + # Save all args for possible examination by tester + self.title = title + self.message = message + self.args = args + self.kwds = kwds + return self.result # Set by tester for ask functions + + +class Mbox: + """Mock for tkinter.messagebox with an Mbox_func for each function. + + Example usage in test_module.py for testing functions in module.py: + --- +from idlelib.idle_test.mock_tk import Mbox +import module + +orig_mbox = module.messagebox +showerror = Mbox.showerror # example, for attribute access in test methods + +class Test(unittest.TestCase): + + @classmethod + def setUpClass(cls): + module.messagebox = Mbox + + @classmethod + def tearDownClass(cls): + module.messagebox = orig_mbox + --- + For 'ask' functions, set func.result return value before calling the method + that uses the message function. When messagebox functions are the + only GUI calls in a method, this replacement makes the method GUI-free, + """ + askokcancel = Mbox_func() # True or False + askquestion = Mbox_func() # 'yes' or 'no' + askretrycancel = Mbox_func() # True or False + askyesno = Mbox_func() # True or False + askyesnocancel = Mbox_func() # True, False, or None + showerror = Mbox_func() # None + showinfo = Mbox_func() # None + showwarning = Mbox_func() # None + + +class Text: + """A semi-functional non-gui replacement for tkinter.Text text editors. + + The mock's data model is that a text is a list of \n-terminated lines. + The mock adds an empty string at the beginning of the list so that the + index of actual lines start at 1, as with Tk. The methods never see this. + Tk initializes files with a terminal \n that cannot be deleted. It is + invisible in the sense that one cannot move the cursor beyond it. + + This class is only tested (and valid) with strings of ascii chars. + For testing, we are not concerned with Tk Text's treatment of, + for instance, 0-width characters or character + accent. + """ + def __init__(self, master=None, cnf={}, **kw): + '''Initialize mock, non-gui, text-only Text widget. + + At present, all args are ignored. Almost all affect visual behavior. + There are just a few Text-only options that affect text behavior. + ''' + self.data = ['', '\n'] + + def index(self, index): + "Return string version of index decoded according to current text." + return "%s.%s" % self._decode(index, endflag=1) + + def _decode(self, index, endflag=0): + """Return a (line, char) tuple of int indexes into self.data. + + This implements .index without converting the result back to a string. + The result is constrained by the number of lines and linelengths of + self.data. For many indexes, the result is initially (1, 0). + + The input index may have any of several possible forms: + * line.char float: converted to 'line.char' string; + * 'line.char' string, where line and char are decimal integers; + * 'line.char lineend', where lineend='lineend' (and char is ignored); + * 'line.end', where end='end' (same as above); + * 'insert', the positions before terminal \n; + * 'end', whose meaning depends on the endflag passed to ._endex. + * 'sel.first' or 'sel.last', where sel is a tag -- not implemented. + """ + if isinstance(index, (float, bytes)): + index = str(index) + try: + index=index.lower() + except AttributeError: + raise TclError('bad text index "%s"' % index) from None + + lastline = len(self.data) - 1 # same as number of text lines + if index == 'insert': + return lastline, len(self.data[lastline]) - 1 + elif index == 'end': + return self._endex(endflag) + + line, char = index.split('.') + line = int(line) + + # Out of bounds line becomes first or last ('end') index + if line < 1: + return 1, 0 + elif line > lastline: + return self._endex(endflag) + + linelength = len(self.data[line]) -1 # position before/at \n + if char.endswith(' lineend') or char == 'end': + return line, linelength + # Tk requires that ignored chars before ' lineend' be valid int + if m := re.fullmatch(r'end-(\d*)c', char, re.A): # Used by hyperparser. + return line, linelength - int(m.group(1)) + + # Out of bounds char becomes first or last index of line + char = int(char) + if char < 0: + char = 0 + elif char > linelength: + char = linelength + return line, char + + def _endex(self, endflag): + '''Return position for 'end' or line overflow corresponding to endflag. + + -1: position before terminal \n; for .insert(), .delete + 0: position after terminal \n; for .get, .delete index 1 + 1: same viewed as beginning of non-existent next line (for .index) + ''' + n = len(self.data) + if endflag == 1: + return n, 0 + else: + n -= 1 + return n, len(self.data[n]) + endflag + + def insert(self, index, chars): + "Insert chars before the character at index." + + if not chars: # ''.splitlines() is [], not [''] + return + chars = chars.splitlines(True) + if chars[-1][-1] == '\n': + chars.append('') + line, char = self._decode(index, -1) + before = self.data[line][:char] + after = self.data[line][char:] + self.data[line] = before + chars[0] + self.data[line+1:line+1] = chars[1:] + self.data[line+len(chars)-1] += after + + def get(self, index1, index2=None): + "Return slice from index1 to index2 (default is 'index1+1')." + + startline, startchar = self._decode(index1) + if index2 is None: + endline, endchar = startline, startchar+1 + else: + endline, endchar = self._decode(index2) + + if startline == endline: + return self.data[startline][startchar:endchar] + else: + lines = [self.data[startline][startchar:]] + for i in range(startline+1, endline): + lines.append(self.data[i]) + lines.append(self.data[endline][:endchar]) + return ''.join(lines) + + def delete(self, index1, index2=None): + '''Delete slice from index1 to index2 (default is 'index1+1'). + + Adjust default index2 ('index+1) for line ends. + Do not delete the terminal \n at the very end of self.data ([-1][-1]). + ''' + startline, startchar = self._decode(index1, -1) + if index2 is None: + if startchar < len(self.data[startline])-1: + # not deleting \n + endline, endchar = startline, startchar+1 + elif startline < len(self.data) - 1: + # deleting non-terminal \n, convert 'index1+1 to start of next line + endline, endchar = startline+1, 0 + else: + # do not delete terminal \n if index1 == 'insert' + return + else: + endline, endchar = self._decode(index2, -1) + # restricting end position to insert position excludes terminal \n + + if startline == endline and startchar < endchar: + self.data[startline] = self.data[startline][:startchar] + \ + self.data[startline][endchar:] + elif startline < endline: + self.data[startline] = self.data[startline][:startchar] + \ + self.data[endline][endchar:] + startline += 1 + for i in range(startline, endline+1): + del self.data[startline] + + def compare(self, index1, op, index2): + line1, char1 = self._decode(index1) + line2, char2 = self._decode(index2) + if op == '<': + return line1 < line2 or line1 == line2 and char1 < char2 + elif op == '<=': + return line1 < line2 or line1 == line2 and char1 <= char2 + elif op == '>': + return line1 > line2 or line1 == line2 and char1 > char2 + elif op == '>=': + return line1 > line2 or line1 == line2 and char1 >= char2 + elif op == '==': + return line1 == line2 and char1 == char2 + elif op == '!=': + return line1 != line2 or char1 != char2 + else: + raise TclError('''bad comparison operator "%s": ''' + '''must be <, <=, ==, >=, >, or !=''' % op) + + # The following Text methods normally do something and return None. + # Whether doing nothing is sufficient for a test will depend on the test. + + def mark_set(self, name, index): + "Set mark *name* before the character at index." + pass + + def mark_unset(self, *markNames): + "Delete all marks in markNames." + + def tag_remove(self, tagName, index1, index2=None): + "Remove tag tagName from all characters between index1 and index2." + pass + + # The following Text methods affect the graphics screen and return None. + # Doing nothing should always be sufficient for tests. + + def scan_dragto(self, x, y): + "Adjust the view of the text according to scan_mark" + + def scan_mark(self, x, y): + "Remember the current X, Y coordinates." + + def see(self, index): + "Scroll screen to make the character at INDEX is visible." + pass + + # The following is a Misc method inherited by Text. + # It should properly go in a Misc mock, but is included here for now. + + def bind(sequence=None, func=None, add=None): + "Bind to this widget at event sequence a call to function func." + pass + + +class Entry: + "Mock for tkinter.Entry." + def focus_set(self): + pass diff --git a/Lib/idlelib/idle_test/template.py b/Lib/idlelib/idle_test/template.py new file mode 100644 index 000000000..725a55b9c --- /dev/null +++ b/Lib/idlelib/idle_test/template.py @@ -0,0 +1,30 @@ +"Test , coverage %." + +from idlelib import zzdummy +import unittest +from test.support import requires +from tkinter import Tk + + +class Test(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = Tk() + cls.root.withdraw() + + @classmethod + def tearDownClass(cls): + cls.root.update_idletasks() +## for id in cls.root.tk.call('after', 'info'): +## cls.root.after_cancel(id) # Need for EditorWindow. + cls.root.destroy() + del cls.root + + def test_init(self): + self.assertTrue(True) + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_autocomplete.py b/Lib/idlelib/idle_test/test_autocomplete.py new file mode 100644 index 000000000..a811363c1 --- /dev/null +++ b/Lib/idlelib/idle_test/test_autocomplete.py @@ -0,0 +1,305 @@ +"Test autocomplete, coverage 93%." + +import unittest +from unittest.mock import Mock, patch +from test.support import requires +from tkinter import Tk, Text +import os +import __main__ + +import idlelib.autocomplete as ac +import idlelib.autocomplete_w as acw +from idlelib.idle_test.mock_idle import Func +from idlelib.idle_test.mock_tk import Event + + +class DummyEditwin: + def __init__(self, root, text): + self.root = root + self.text = text + self.indentwidth = 8 + self.tabwidth = 8 + self.prompt_last_line = '>>>' # Currently not used by autocomplete. + + +class AutoCompleteTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = Tk() + cls.root.withdraw() + cls.text = Text(cls.root) + cls.editor = DummyEditwin(cls.root, cls.text) + + @classmethod + def tearDownClass(cls): + del cls.editor, cls.text + cls.root.update_idletasks() + cls.root.destroy() + del cls.root + + def setUp(self): + self.text.delete('1.0', 'end') + self.autocomplete = ac.AutoComplete(self.editor) + + def test_init(self): + self.assertEqual(self.autocomplete.editwin, self.editor) + self.assertEqual(self.autocomplete.text, self.text) + + def test_make_autocomplete_window(self): + testwin = self.autocomplete._make_autocomplete_window() + self.assertIsInstance(testwin, acw.AutoCompleteWindow) + + def test_remove_autocomplete_window(self): + acp = self.autocomplete + acp.autocompletewindow = m = Mock() + acp._remove_autocomplete_window() + m.hide_window.assert_called_once() + self.assertIsNone(acp.autocompletewindow) + + def test_force_open_completions_event(self): + # Call _open_completions and break. + acp = self.autocomplete + open_c = Func() + acp.open_completions = open_c + self.assertEqual(acp.force_open_completions_event('event'), 'break') + self.assertEqual(open_c.args[0], ac.FORCE) + + def test_autocomplete_event(self): + Equal = self.assertEqual + acp = self.autocomplete + + # Result of autocomplete event: If modified tab, None. + ev = Event(mc_state=True) + self.assertIsNone(acp.autocomplete_event(ev)) + del ev.mc_state + + # If tab after whitespace, None. + self.text.insert('1.0', ' """Docstring.\n ') + self.assertIsNone(acp.autocomplete_event(ev)) + self.text.delete('1.0', 'end') + + # If active autocomplete window, complete() and 'break'. + self.text.insert('1.0', 're.') + acp.autocompletewindow = mock = Mock() + mock.is_active = Mock(return_value=True) + Equal(acp.autocomplete_event(ev), 'break') + mock.complete.assert_called_once() + acp.autocompletewindow = None + + # If no active autocomplete window, open_completions(), None/break. + open_c = Func(result=False) + acp.open_completions = open_c + Equal(acp.autocomplete_event(ev), None) + Equal(open_c.args[0], ac.TAB) + open_c.result = True + Equal(acp.autocomplete_event(ev), 'break') + Equal(open_c.args[0], ac.TAB) + + def test_try_open_completions_event(self): + Equal = self.assertEqual + text = self.text + acp = self.autocomplete + trycompletions = acp.try_open_completions_event + after = Func(result='after1') + acp.text.after = after + + # If no text or trigger, after not called. + trycompletions() + Equal(after.called, 0) + text.insert('1.0', 're') + trycompletions() + Equal(after.called, 0) + + # Attribute needed, no existing callback. + text.insert('insert', ' re.') + acp._delayed_completion_id = None + trycompletions() + Equal(acp._delayed_completion_index, text.index('insert')) + Equal(after.args, + (acp.popupwait, acp._delayed_open_completions, ac.TRY_A)) + cb1 = acp._delayed_completion_id + Equal(cb1, 'after1') + + # File needed, existing callback cancelled. + text.insert('insert', ' "./Lib/') + after.result = 'after2' + cancel = Func() + acp.text.after_cancel = cancel + trycompletions() + Equal(acp._delayed_completion_index, text.index('insert')) + Equal(cancel.args, (cb1,)) + Equal(after.args, + (acp.popupwait, acp._delayed_open_completions, ac.TRY_F)) + Equal(acp._delayed_completion_id, 'after2') + + def test_delayed_open_completions(self): + Equal = self.assertEqual + acp = self.autocomplete + open_c = Func() + acp.open_completions = open_c + self.text.insert('1.0', '"dict.') + + # Set autocomplete._delayed_completion_id to None. + # Text index changed, don't call open_completions. + acp._delayed_completion_id = 'after' + acp._delayed_completion_index = self.text.index('insert+1c') + acp._delayed_open_completions('dummy') + self.assertIsNone(acp._delayed_completion_id) + Equal(open_c.called, 0) + + # Text index unchanged, call open_completions. + acp._delayed_completion_index = self.text.index('insert') + acp._delayed_open_completions((1, 2, 3, ac.FILES)) + self.assertEqual(open_c.args[0], (1, 2, 3, ac.FILES)) + + def test_oc_cancel_comment(self): + none = self.assertIsNone + acp = self.autocomplete + + # Comment is in neither code or string. + acp._delayed_completion_id = 'after' + after = Func(result='after') + acp.text.after_cancel = after + self.text.insert(1.0, '# comment') + none(acp.open_completions(ac.TAB)) # From 'else' after 'elif'. + none(acp._delayed_completion_id) + + def test_oc_no_list(self): + acp = self.autocomplete + fetch = Func(result=([],[])) + acp.fetch_completions = fetch + self.text.insert('1.0', 'object') + self.assertIsNone(acp.open_completions(ac.TAB)) + self.text.insert('insert', '.') + self.assertIsNone(acp.open_completions(ac.TAB)) + self.assertEqual(fetch.called, 2) + + + def test_open_completions_none(self): + # Test other two None returns. + none = self.assertIsNone + acp = self.autocomplete + + # No object for attributes or need call not allowed. + self.text.insert(1.0, '.') + none(acp.open_completions(ac.TAB)) + self.text.insert('insert', ' int().') + none(acp.open_completions(ac.TAB)) + + # Blank or quote trigger 'if complete ...'. + self.text.delete(1.0, 'end') + self.assertFalse(acp.open_completions(ac.TAB)) + self.text.insert('1.0', '"') + self.assertFalse(acp.open_completions(ac.TAB)) + self.text.delete('1.0', 'end') + + class dummy_acw: + __init__ = Func() + show_window = Func(result=False) + hide_window = Func() + + def test_open_completions(self): + # Test completions of files and attributes. + acp = self.autocomplete + fetch = Func(result=(['tem'],['tem', '_tem'])) + acp.fetch_completions = fetch + def make_acw(): return self.dummy_acw() + acp._make_autocomplete_window = make_acw + + self.text.insert('1.0', 'int.') + acp.open_completions(ac.TAB) + self.assertIsInstance(acp.autocompletewindow, self.dummy_acw) + self.text.delete('1.0', 'end') + + # Test files. + self.text.insert('1.0', '"t') + self.assertTrue(acp.open_completions(ac.TAB)) + self.text.delete('1.0', 'end') + + def test_completion_kwds(self): + self.assertIn('and', ac.completion_kwds) + self.assertIn('case', ac.completion_kwds) + self.assertNotIn('None', ac.completion_kwds) + + def test_fetch_completions(self): + # Test that fetch_completions returns 2 lists: + # For attribute completion, a large list containing all variables, and + # a small list containing non-private variables. + # For file completion, a large list containing all files in the path, + # and a small list containing files that do not start with '.'. + acp = self.autocomplete + small, large = acp.fetch_completions( + '', ac.ATTRS) + if hasattr(__main__, '__file__') and __main__.__file__ != ac.__file__: + self.assertNotIn('AutoComplete', small) # See issue 36405. + + # Test attributes + s, b = acp.fetch_completions('', ac.ATTRS) + self.assertLess(len(small), len(large)) + self.assertTrue(all(filter(lambda x: x.startswith('_'), s))) + self.assertTrue(any(filter(lambda x: x.startswith('_'), b))) + + # Test smalll should respect to __all__. + with patch.dict('__main__.__dict__', {'__all__': ['a', 'b']}): + s, b = acp.fetch_completions('', ac.ATTRS) + self.assertEqual(s, ['a', 'b']) + self.assertIn('__name__', b) # From __main__.__dict__. + self.assertIn('sum', b) # From __main__.__builtins__.__dict__. + self.assertIn('nonlocal', b) # From keyword.kwlist. + pos = b.index('False') # Test False not included twice. + self.assertNotEqual(b[pos+1], 'False') + + # Test attributes with name entity. + mock = Mock() + mock._private = Mock() + with patch.dict('__main__.__dict__', {'foo': mock}): + s, b = acp.fetch_completions('foo', ac.ATTRS) + self.assertNotIn('_private', s) + self.assertIn('_private', b) + self.assertEqual(s, [i for i in sorted(dir(mock)) if i[:1] != '_']) + self.assertEqual(b, sorted(dir(mock))) + + # Test files + def _listdir(path): + # This will be patch and used in fetch_completions. + if path == '.': + return ['foo', 'bar', '.hidden'] + return ['monty', 'python', '.hidden'] + + with patch.object(os, 'listdir', _listdir): + s, b = acp.fetch_completions('', ac.FILES) + self.assertEqual(s, ['bar', 'foo']) + self.assertEqual(b, ['.hidden', 'bar', 'foo']) + + s, b = acp.fetch_completions('~', ac.FILES) + self.assertEqual(s, ['monty', 'python']) + self.assertEqual(b, ['.hidden', 'monty', 'python']) + + def test_get_entity(self): + # Test that a name is in the namespace of sys.modules and + # __main__.__dict__. + acp = self.autocomplete + Equal = self.assertEqual + + Equal(acp.get_entity('int'), int) + + # Test name from sys.modules. + mock = Mock() + with patch.dict('sys.modules', {'tempfile': mock}): + Equal(acp.get_entity('tempfile'), mock) + + # Test name from __main__.__dict__. + di = {'foo': 10, 'bar': 20} + with patch.dict('__main__.__dict__', {'d': di}): + Equal(acp.get_entity('d'), di) + + # Test name not in namespace. + with patch.dict('__main__.__dict__', {}): + with self.assertRaises(NameError): + acp.get_entity('not_exist') + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_autocomplete_w.py b/Lib/idlelib/idle_test/test_autocomplete_w.py new file mode 100644 index 000000000..a59a375c9 --- /dev/null +++ b/Lib/idlelib/idle_test/test_autocomplete_w.py @@ -0,0 +1,32 @@ +"Test autocomplete_w, coverage 11%." + +import unittest +from test.support import requires +from tkinter import Tk, Text + +import idlelib.autocomplete_w as acw + + +class AutoCompleteWindowTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = Tk() + cls.root.withdraw() + cls.text = Text(cls.root) + cls.acw = acw.AutoCompleteWindow(cls.text, tags=None) + + @classmethod + def tearDownClass(cls): + del cls.text, cls.acw + cls.root.update_idletasks() + cls.root.destroy() + del cls.root + + def test_init(self): + self.assertEqual(self.acw.widget, self.text) + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_autoexpand.py b/Lib/idlelib/idle_test/test_autoexpand.py new file mode 100644 index 000000000..e734a8be7 --- /dev/null +++ b/Lib/idlelib/idle_test/test_autoexpand.py @@ -0,0 +1,155 @@ +"Test autoexpand, coverage 100%." + +from idlelib.autoexpand import AutoExpand +import unittest +from test.support import requires +from tkinter import Text, Tk + + +class DummyEditwin: + # AutoExpand.__init__ only needs .text + def __init__(self, text): + self.text = text + +class AutoExpandTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + cls.tk = Tk() + cls.text = Text(cls.tk) + cls.auto_expand = AutoExpand(DummyEditwin(cls.text)) + cls.auto_expand.bell = lambda: None + +# If mock_tk.Text._decode understood indexes 'insert' with suffixed 'linestart', +# 'wordstart', and 'lineend', used by autoexpand, we could use the following +# to run these test on non-gui machines (but check bell). +## try: +## requires('gui') +## #raise ResourceDenied() # Uncomment to test mock. +## except ResourceDenied: +## from idlelib.idle_test.mock_tk import Text +## cls.text = Text() +## cls.text.bell = lambda: None +## else: +## from tkinter import Tk, Text +## cls.tk = Tk() +## cls.text = Text(cls.tk) + + @classmethod + def tearDownClass(cls): + del cls.text, cls.auto_expand + if hasattr(cls, 'tk'): + cls.tk.destroy() + del cls.tk + + def tearDown(self): + self.text.delete('1.0', 'end') + + def test_get_prevword(self): + text = self.text + previous = self.auto_expand.getprevword + equal = self.assertEqual + + equal(previous(), '') + + text.insert('insert', 't') + equal(previous(), 't') + + text.insert('insert', 'his') + equal(previous(), 'this') + + text.insert('insert', ' ') + equal(previous(), '') + + text.insert('insert', 'is') + equal(previous(), 'is') + + text.insert('insert', '\nsample\nstring') + equal(previous(), 'string') + + text.delete('3.0', 'insert') + equal(previous(), '') + + text.delete('1.0', 'end') + equal(previous(), '') + + def test_before_only(self): + previous = self.auto_expand.getprevword + expand = self.auto_expand.expand_word_event + equal = self.assertEqual + + self.text.insert('insert', 'ab ac bx ad ab a') + equal(self.auto_expand.getwords(), ['ab', 'ad', 'ac', 'a']) + expand('event') + equal(previous(), 'ab') + expand('event') + equal(previous(), 'ad') + expand('event') + equal(previous(), 'ac') + expand('event') + equal(previous(), 'a') + + def test_after_only(self): + # Also add punctuation 'noise' that should be ignored. + text = self.text + previous = self.auto_expand.getprevword + expand = self.auto_expand.expand_word_event + equal = self.assertEqual + + text.insert('insert', 'a, [ab] ac: () bx"" cd ac= ad ya') + text.mark_set('insert', '1.1') + equal(self.auto_expand.getwords(), ['ab', 'ac', 'ad', 'a']) + expand('event') + equal(previous(), 'ab') + expand('event') + equal(previous(), 'ac') + expand('event') + equal(previous(), 'ad') + expand('event') + equal(previous(), 'a') + + def test_both_before_after(self): + text = self.text + previous = self.auto_expand.getprevword + expand = self.auto_expand.expand_word_event + equal = self.assertEqual + + text.insert('insert', 'ab xy yz\n') + text.insert('insert', 'a ac by ac') + + text.mark_set('insert', '2.1') + equal(self.auto_expand.getwords(), ['ab', 'ac', 'a']) + expand('event') + equal(previous(), 'ab') + expand('event') + equal(previous(), 'ac') + expand('event') + equal(previous(), 'a') + + def test_other_expand_cases(self): + text = self.text + expand = self.auto_expand.expand_word_event + equal = self.assertEqual + + # no expansion candidate found + equal(self.auto_expand.getwords(), []) + equal(expand('event'), 'break') + + text.insert('insert', 'bx cy dz a') + equal(self.auto_expand.getwords(), []) + + # reset state by successfully expanding once + # move cursor to another position and expand again + text.insert('insert', 'ac xy a ac ad a') + text.mark_set('insert', '1.7') + expand('event') + initial_state = self.auto_expand.state + text.mark_set('insert', '1.end') + expand('event') + new_state = self.auto_expand.state + self.assertNotEqual(initial_state, new_state) + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_browser.py b/Lib/idlelib/idle_test/test_browser.py new file mode 100644 index 000000000..6cfea3888 --- /dev/null +++ b/Lib/idlelib/idle_test/test_browser.py @@ -0,0 +1,257 @@ +"Test browser, coverage 90%." + +from idlelib import browser +from test.support import requires +import unittest +from unittest import mock +from idlelib.idle_test.mock_idle import Func +from idlelib.util import py_extensions + +from collections import deque +import os.path +import pyclbr +from tkinter import Tk + +from idlelib.tree import TreeNode + + +class ModuleBrowserTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = Tk() + cls.root.withdraw() + cls.mb = browser.ModuleBrowser(cls.root, __file__, _utest=True) + + @classmethod + def tearDownClass(cls): + cls.mb.close() + cls.root.update_idletasks() + cls.root.destroy() + del cls.root, cls.mb + + def test_init(self): + mb = self.mb + eq = self.assertEqual + eq(mb.path, __file__) + eq(pyclbr._modules, {}) + self.assertIsInstance(mb.node, TreeNode) + self.assertIsNotNone(browser.file_open) + + def test_settitle(self): + mb = self.mb + self.assertIn(os.path.basename(__file__), mb.top.title()) + self.assertEqual(mb.top.iconname(), 'Module Browser') + + def test_rootnode(self): + mb = self.mb + rn = mb.rootnode() + self.assertIsInstance(rn, browser.ModuleBrowserTreeItem) + + def test_close(self): + mb = self.mb + mb.top.destroy = Func() + mb.node.destroy = Func() + mb.close() + self.assertTrue(mb.top.destroy.called) + self.assertTrue(mb.node.destroy.called) + del mb.top.destroy, mb.node.destroy + + def test_is_browseable_extension(self): + path = "/path/to/file" + for ext in py_extensions: + with self.subTest(ext=ext): + filename = f'{path}{ext}' + actual = browser.is_browseable_extension(filename) + expected = ext not in browser.browseable_extension_blocklist + self.assertEqual(actual, expected) + + +# Nested tree same as in test_pyclbr.py except for supers on C0. C1. +mb = pyclbr +module, fname = 'test', 'test.py' +C0 = mb.Class(module, 'C0', ['base'], fname, 1, end_lineno=9) +F1 = mb._nest_function(C0, 'F1', 3, 5) +C1 = mb._nest_class(C0, 'C1', 6, 9, ['']) +C2 = mb._nest_class(C1, 'C2', 7, 9) +F3 = mb._nest_function(C2, 'F3', 9, 9) +f0 = mb.Function(module, 'f0', fname, 11, end_lineno=15) +f1 = mb._nest_function(f0, 'f1', 12, 14) +f2 = mb._nest_function(f1, 'f2', 13, 13) +c1 = mb._nest_class(f0, 'c1', 15, 15) +mock_pyclbr_tree = {'C0': C0, 'f0': f0} + +# Adjust C0.name, C1.name so tests do not depend on order. +browser.transform_children(mock_pyclbr_tree, 'test') # C0(base) +browser.transform_children(C0.children) # C1() + +# The class below checks that the calls above are correct +# and that duplicate calls have no effect. + + +class TransformChildrenTest(unittest.TestCase): + + def test_transform_module_children(self): + eq = self.assertEqual + transform = browser.transform_children + # Parameter matches tree module. + tcl = list(transform(mock_pyclbr_tree, 'test')) + eq(tcl, [C0, f0]) + eq(tcl[0].name, 'C0(base)') + eq(tcl[1].name, 'f0') + # Check that second call does not change suffix. + tcl = list(transform(mock_pyclbr_tree, 'test')) + eq(tcl[0].name, 'C0(base)') + # Nothing to traverse if parameter name isn't same as tree module. + tcl = list(transform(mock_pyclbr_tree, 'different name')) + eq(tcl, []) + + def test_transform_node_children(self): + eq = self.assertEqual + transform = browser.transform_children + # Class with two children, one name altered. + tcl = list(transform(C0.children)) + eq(tcl, [F1, C1]) + eq(tcl[0].name, 'F1') + eq(tcl[1].name, 'C1()') + tcl = list(transform(C0.children)) + eq(tcl[1].name, 'C1()') + # Function with two children. + eq(list(transform(f0.children)), [f1, c1]) + + +class ModuleBrowserTreeItemTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + cls.mbt = browser.ModuleBrowserTreeItem(fname) + + def test_init(self): + self.assertEqual(self.mbt.file, fname) + + def test_gettext(self): + self.assertEqual(self.mbt.GetText(), fname) + + def test_geticonname(self): + self.assertEqual(self.mbt.GetIconName(), 'python') + + def test_isexpandable(self): + self.assertTrue(self.mbt.IsExpandable()) + + def test_listchildren(self): + save_rex = browser.pyclbr.readmodule_ex + save_tc = browser.transform_children + browser.pyclbr.readmodule_ex = Func(result=mock_pyclbr_tree) + browser.transform_children = Func(result=[f0, C0]) + try: + self.assertEqual(self.mbt.listchildren(), [f0, C0]) + finally: + browser.pyclbr.readmodule_ex = save_rex + browser.transform_children = save_tc + + def test_getsublist(self): + mbt = self.mbt + mbt.listchildren = Func(result=[f0, C0]) + sub0, sub1 = mbt.GetSubList() + del mbt.listchildren + self.assertIsInstance(sub0, browser.ChildBrowserTreeItem) + self.assertIsInstance(sub1, browser.ChildBrowserTreeItem) + self.assertEqual(sub0.name, 'f0') + self.assertEqual(sub1.name, 'C0(base)') + + @mock.patch('idlelib.browser.file_open') + def test_ondoubleclick(self, fopen): + mbt = self.mbt + + with mock.patch('os.path.exists', return_value=False): + mbt.OnDoubleClick() + fopen.assert_not_called() + + with mock.patch('os.path.exists', return_value=True): + mbt.OnDoubleClick() + fopen.assert_called_once_with(fname) + + +class ChildBrowserTreeItemTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + CBT = browser.ChildBrowserTreeItem + cls.cbt_f1 = CBT(f1) + cls.cbt_C1 = CBT(C1) + cls.cbt_F1 = CBT(F1) + + @classmethod + def tearDownClass(cls): + del cls.cbt_C1, cls.cbt_f1, cls.cbt_F1 + + def test_init(self): + eq = self.assertEqual + eq(self.cbt_C1.name, 'C1()') + self.assertFalse(self.cbt_C1.isfunction) + eq(self.cbt_f1.name, 'f1') + self.assertTrue(self.cbt_f1.isfunction) + + def test_gettext(self): + self.assertEqual(self.cbt_C1.GetText(), 'class C1()') + self.assertEqual(self.cbt_f1.GetText(), 'def f1(...)') + + def test_geticonname(self): + self.assertEqual(self.cbt_C1.GetIconName(), 'folder') + self.assertEqual(self.cbt_f1.GetIconName(), 'python') + + def test_isexpandable(self): + self.assertTrue(self.cbt_C1.IsExpandable()) + self.assertTrue(self.cbt_f1.IsExpandable()) + self.assertFalse(self.cbt_F1.IsExpandable()) + + def test_getsublist(self): + eq = self.assertEqual + CBT = browser.ChildBrowserTreeItem + + f1sublist = self.cbt_f1.GetSubList() + self.assertIsInstance(f1sublist[0], CBT) + eq(len(f1sublist), 1) + eq(f1sublist[0].name, 'f2') + + eq(self.cbt_F1.GetSubList(), []) + + @mock.patch('idlelib.browser.file_open') + def test_ondoubleclick(self, fopen): + goto = fopen.return_value.gotoline = mock.Mock() + self.cbt_F1.OnDoubleClick() + fopen.assert_called() + goto.assert_called() + goto.assert_called_with(self.cbt_F1.obj.lineno) + # Failure test would have to raise OSError or AttributeError. + + +class NestedChildrenTest(unittest.TestCase): + "Test that all the nodes in a nested tree are added to the BrowserTree." + + def test_nested(self): + queue = deque() + actual_names = [] + # The tree items are processed in breadth first order. + # Verify that processing each sublist hits every node and + # in the right order. + expected_names = ['f0', 'C0(base)', + 'f1', 'c1', 'F1', 'C1()', + 'f2', 'C2', + 'F3'] + CBT = browser.ChildBrowserTreeItem + queue.extend((CBT(f0), CBT(C0))) + while queue: + cb = queue.popleft() + sublist = cb.GetSubList() + queue.extend(sublist) + self.assertIn(cb.name, cb.GetText()) + self.assertIn(cb.GetIconName(), ('python', 'folder')) + self.assertIs(cb.IsExpandable(), sublist != []) + actual_names.append(cb.name) + self.assertEqual(actual_names, expected_names) + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_calltip.py b/Lib/idlelib/idle_test/test_calltip.py new file mode 100644 index 000000000..28c196a42 --- /dev/null +++ b/Lib/idlelib/idle_test/test_calltip.py @@ -0,0 +1,372 @@ +"Test calltip, coverage 76%" + +from idlelib import calltip +import unittest +from unittest.mock import Mock +import textwrap +import types +import re +from idlelib.idle_test.mock_tk import Text +from test.support import MISSING_C_DOCSTRINGS + + +# Test Class TC is used in multiple get_argspec test methods +class TC: + 'doc' + tip = "(ai=None, *b)" + def __init__(self, ai=None, *b): 'doc' + __init__.tip = "(self, ai=None, *b)" + def t1(self): 'doc' + t1.tip = "(self)" + def t2(self, ai, b=None): 'doc' + t2.tip = "(self, ai, b=None)" + def t3(self, ai, *args): 'doc' + t3.tip = "(self, ai, *args)" + def t4(self, *args): 'doc' + t4.tip = "(self, *args)" + def t5(self, ai, b=None, *args, **kw): 'doc' + t5.tip = "(self, ai, b=None, *args, **kw)" + def t6(no, self): 'doc' + t6.tip = "(no, self)" + def __call__(self, ci): 'doc' + __call__.tip = "(self, ci)" + def nd(self): pass # No doc. + # attaching .tip to wrapped methods does not work + @classmethod + def cm(cls, a): 'doc' + @staticmethod + def sm(b): 'doc' + + +tc = TC() +default_tip = calltip._default_callable_argspec +get_spec = calltip.get_argspec + + +class Get_argspecTest(unittest.TestCase): + # The get_spec function must return a string, even if blank. + # Test a variety of objects to be sure that none cause it to raise + # (quite aside from getting as correct an answer as possible). + # The tests of builtins may break if inspect or the docstrings change, + # but a red buildbot is better than a user crash (as has happened). + # For a simple mismatch, change the expected output to the actual. + + @unittest.skipIf(MISSING_C_DOCSTRINGS, + "Signature information for builtins requires docstrings") + def test_builtins(self): + + def tiptest(obj, out): + self.assertEqual(get_spec(obj), out) + + # Python class that inherits builtin methods + class List(list): "List() doc" + + # Simulate builtin with no docstring for default tip test + class SB: __call__ = None + + if List.__doc__ is not None: + tiptest(List, + f'(iterable=(), /)' + f'\n{List.__doc__}') + tiptest(list.__new__, + '(*args, **kwargs)\n' + 'Create and return a new object. ' + 'See help(type) for accurate signature.') + tiptest(list.__init__, + '(self, /, *args, **kwargs)\n' + 'Initialize self. See help(type(self)) for accurate signature.') + append_doc = "\nAppend object to the end of the list." + tiptest(list.append, '(self, object, /)' + append_doc) + tiptest(List.append, '(self, object, /)' + append_doc) + tiptest([].append, '(object, /)' + append_doc) + # The use of 'object' above matches the signature text. + + tiptest(types.MethodType, + '(function, instance, /)\n' + 'Create a bound instance method object.') + tiptest(SB(), default_tip) + + p = re.compile('') + tiptest(re.sub, '''\ +(pattern, repl, string, count=0, flags=0) +Return the string obtained by replacing the leftmost +non-overlapping occurrences of the pattern in string by the +replacement repl. repl can be either a string or a callable; +if a string, backslash escapes in it are processed. If it is +a callable, it's passed the Match object and must return''') + tiptest(p.sub, '''\ +(repl, string, count=0) +Return the string obtained by replacing the leftmost \ +non-overlapping occurrences o...''') + + def test_signature_wrap(self): + if textwrap.TextWrapper.__doc__ is not None: + self.assertEqual(get_spec(textwrap.TextWrapper), '''\ +(width=70, initial_indent='', subsequent_indent='', expand_tabs=True, + replace_whitespace=True, fix_sentence_endings=False, break_long_words=True, + drop_whitespace=True, break_on_hyphens=True, tabsize=8, *, max_lines=None, + placeholder=' [...]') +Object for wrapping/filling text. The public interface consists of +the wrap() and fill() methods; the other methods are just there for +subclasses to override in order to tweak the default behaviour. +If you want to completely replace the main wrapping algorithm, +you\'ll probably have to override _wrap_chunks().''') + + def test_properly_formatted(self): + + def foo(s='a'*100): + pass + + def bar(s='a'*100): + """Hello Guido""" + pass + + def baz(s='a'*100, z='b'*100): + pass + + indent = calltip._INDENT + + sfoo = "(s='aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"\ + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n" + indent + "aaaaaaaaa"\ + "aaaaaaaaaa')" + sbar = "(s='aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"\ + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n" + indent + "aaaaaaaaa"\ + "aaaaaaaaaa')\nHello Guido" + sbaz = "(s='aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"\ + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n" + indent + "aaaaaaaaa"\ + "aaaaaaaaaa', z='bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"\ + "bbbbbbbbbbbbbbbbb\n" + indent + "bbbbbbbbbbbbbbbbbbbbbb"\ + "bbbbbbbbbbbbbbbbbbbbbb')" + + for func,doc in [(foo, sfoo), (bar, sbar), (baz, sbaz)]: + with self.subTest(func=func, doc=doc): + self.assertEqual(get_spec(func), doc) + + def test_docline_truncation(self): + def f(): pass + f.__doc__ = 'a'*300 + self.assertEqual(get_spec(f), f"()\n{'a'*(calltip._MAX_COLS-3) + '...'}") + + @unittest.skipIf(MISSING_C_DOCSTRINGS, + "Signature information for builtins requires docstrings") + def test_multiline_docstring(self): + # Test fewer lines than max. + self.assertEqual(get_spec(range), + "range(stop) -> range object\n" + "range(start, stop[, step]) -> range object") + + # Test max lines + self.assertEqual(get_spec(bytes), '''\ +bytes(iterable_of_ints) -> bytes +bytes(string, encoding[, errors]) -> bytes +bytes(bytes_or_buffer) -> immutable copy of bytes_or_buffer +bytes(int) -> bytes object of size given by the parameter initialized with null bytes +bytes() -> empty bytes object''') + + def test_multiline_docstring_2(self): + # Test more than max lines + def f(): pass + f.__doc__ = 'a\n' * 15 + self.assertEqual(get_spec(f), '()' + '\na' * calltip._MAX_LINES) + + def test_functions(self): + def t1(): 'doc' + t1.tip = "()" + def t2(a, b=None): 'doc' + t2.tip = "(a, b=None)" + def t3(a, *args): 'doc' + t3.tip = "(a, *args)" + def t4(*args): 'doc' + t4.tip = "(*args)" + def t5(a, b=None, *args, **kw): 'doc' + t5.tip = "(a, b=None, *args, **kw)" + + doc = '\ndoc' if t1.__doc__ is not None else '' + for func in (t1, t2, t3, t4, t5, TC): + with self.subTest(func=func): + self.assertEqual(get_spec(func), func.tip + doc) + + def test_methods(self): + doc = '\ndoc' if TC.__doc__ is not None else '' + for meth in (TC.t1, TC.t2, TC.t3, TC.t4, TC.t5, TC.t6, TC.__call__): + with self.subTest(meth=meth): + self.assertEqual(get_spec(meth), meth.tip + doc) + self.assertEqual(get_spec(TC.cm), "(a)" + doc) + self.assertEqual(get_spec(TC.sm), "(b)" + doc) + + def test_bound_methods(self): + # test that first parameter is correctly removed from argspec + doc = '\ndoc' if TC.__doc__ is not None else '' + for meth, mtip in ((tc.t1, "()"), (tc.t4, "(*args)"), + (tc.t6, "(self)"), (tc.__call__, '(ci)'), + (tc, '(ci)'), (TC.cm, "(a)"),): + with self.subTest(meth=meth, mtip=mtip): + self.assertEqual(get_spec(meth), mtip + doc) + + def test_starred_parameter(self): + # test that starred first parameter is *not* removed from argspec + class C: + def m1(*args): pass + c = C() + for meth, mtip in ((C.m1, '(*args)'), (c.m1, "(*args)"),): + with self.subTest(meth=meth, mtip=mtip): + self.assertEqual(get_spec(meth), mtip) + + def test_invalid_method_get_spec(self): + class C: + def m2(**kwargs): pass + class Test: + def __call__(*, a): pass + + mtip = calltip._invalid_method + self.assertEqual(get_spec(C().m2), mtip) + self.assertEqual(get_spec(Test()), mtip) + + def test_non_ascii_name(self): + # test that re works to delete a first parameter name that + # includes non-ascii chars, such as various forms of A. + uni = "(A\u0391\u0410\u05d0\u0627\u0905\u1e00\u3042, a)" + assert calltip._first_param.sub('', uni) == '(a)' + + def test_no_docstring(self): + for meth, mtip in ((TC.nd, "(self)"), (tc.nd, "()")): + with self.subTest(meth=meth, mtip=mtip): + self.assertEqual(get_spec(meth), mtip) + + def test_buggy_getattr_class(self): + class NoCall: + def __getattr__(self, name): # Not invoked for class attribute. + raise IndexError # Bug. + class CallA(NoCall): + def __call__(self, ci): # Bug does not matter. + pass + class CallB(NoCall): + def __call__(oui, a, b, c): # Non-standard 'self'. + pass + + for meth, mtip in ((NoCall, default_tip), (CallA, default_tip), + (NoCall(), ''), (CallA(), '(ci)'), + (CallB(), '(a, b, c)')): + with self.subTest(meth=meth, mtip=mtip): + self.assertEqual(get_spec(meth), mtip) + + def test_metaclass_class(self): # Failure case for issue 38689. + class Type(type): # Type() requires 3 type args, returns class. + __class__ = property({}.__getitem__, {}.__setitem__) + class Object(metaclass=Type): + __slots__ = '__class__' + for meth, mtip in ((Type, get_spec(type)), (Object, default_tip), + (Object(), '')): + with self.subTest(meth=meth, mtip=mtip): + self.assertEqual(get_spec(meth), mtip) + + def test_non_callables(self): + for obj in (0, 0.0, '0', b'0', [], {}): + with self.subTest(obj=obj): + self.assertEqual(get_spec(obj), '') + + +class Get_entityTest(unittest.TestCase): + def test_bad_entity(self): + self.assertIsNone(calltip.get_entity('1/0')) + def test_good_entity(self): + self.assertIs(calltip.get_entity('int'), int) + + +# Test the 9 Calltip methods. +# open_calltip is about half the code; the others are fairly trivial. +# The default mocks are what are needed for open_calltip. + +class mock_Shell: + "Return mock sufficient to pass to hyperparser." + def __init__(self, text): + text.tag_prevrange = Mock(return_value=None) + self.text = text + self.prompt_last_line = ">>> " + self.indentwidth = 4 + self.tabwidth = 8 + + +class mock_TipWindow: + def __init__(self): + pass + + def showtip(self, text, parenleft, parenright): + self.args = parenleft, parenright + self.parenline, self.parencol = map(int, parenleft.split('.')) + + +class WrappedCalltip(calltip.Calltip): + def _make_tk_calltip_window(self): + return mock_TipWindow() + + def remove_calltip_window(self, event=None): + if self.active_calltip: # Setup to None. + self.active_calltip = None + self.tips_removed += 1 # Setup to 0. + + def fetch_tip(self, expression): + return 'tip' + + +class CalltipTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + cls.text = Text() + cls.ct = WrappedCalltip(mock_Shell(cls.text)) + + def setUp(self): + self.text.delete('1.0', 'end') # Insert and call + self.ct.active_calltip = None + # Test .active_calltip, +args + self.ct.tips_removed = 0 + + def open_close(self, testfunc): + # Open-close template with testfunc called in between. + opentip = self.ct.open_calltip + self.text.insert(1.0, 'f(') + opentip(False) + self.tip = self.ct.active_calltip + testfunc(self) ### + self.text.insert('insert', ')') + opentip(False) + self.assertIsNone(self.ct.active_calltip, None) + + def test_open_close(self): + def args(self): + self.assertEqual(self.tip.args, ('1.1', '1.end')) + self.open_close(args) + + def test_repeated_force(self): + def force(self): + for char in 'abc': + self.text.insert('insert', 'a') + self.ct.open_calltip(True) + self.ct.open_calltip(True) + self.assertIs(self.ct.active_calltip, self.tip) + self.open_close(force) + + def test_repeated_parens(self): + def parens(self): + for context in "a", "'": + with self.subTest(context=context): + self.text.insert('insert', context) + for char in '(()())': + self.text.insert('insert', char) + self.assertIs(self.ct.active_calltip, self.tip) + self.text.insert('insert', "'") + self.open_close(parens) + + def test_comment_parens(self): + def comment(self): + self.text.insert('insert', "# ") + for char in '(()())': + self.text.insert('insert', char) + self.assertIs(self.ct.active_calltip, self.tip) + self.text.insert('insert', "\n") + self.open_close(comment) + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_calltip_w.py b/Lib/idlelib/idle_test/test_calltip_w.py new file mode 100644 index 000000000..a5ec76e15 --- /dev/null +++ b/Lib/idlelib/idle_test/test_calltip_w.py @@ -0,0 +1,29 @@ +"Test calltip_w, coverage 18%." + +from idlelib import calltip_w +import unittest +from test.support import requires +from tkinter import Tk, Text + + +class CallTipWindowTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = Tk() + cls.root.withdraw() + cls.text = Text(cls.root) + cls.calltip = calltip_w.CalltipWindow(cls.text) + + @classmethod + def tearDownClass(cls): + cls.root.update_idletasks() + cls.root.destroy() + del cls.text, cls.root + + def test_init(self): + self.assertEqual(self.calltip.anchor_widget, self.text) + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_codecontext.py b/Lib/idlelib/idle_test/test_codecontext.py new file mode 100644 index 000000000..6969ad73b --- /dev/null +++ b/Lib/idlelib/idle_test/test_codecontext.py @@ -0,0 +1,455 @@ +"Test codecontext, coverage 100%" + +from idlelib import codecontext +import unittest +import unittest.mock +from test.support import requires +from tkinter import NSEW, Tk, Frame, Text, TclError + +from unittest import mock +import re +from idlelib import config + + +usercfg = codecontext.idleConf.userCfg +testcfg = { + 'main': config.IdleUserConfParser(''), + 'highlight': config.IdleUserConfParser(''), + 'keys': config.IdleUserConfParser(''), + 'extensions': config.IdleUserConfParser(''), +} +code_sample = """\ + +class C1: + # Class comment. + def __init__(self, a, b): + self.a = a + self.b = b + def compare(self): + if a > b: + return a + elif a < b: + return b + else: + return None +""" + + +class DummyEditwin: + def __init__(self, root, frame, text): + self.root = root + self.top = root + self.text_frame = frame + self.text = text + self.label = '' + + def getlineno(self, index): + return int(float(self.text.index(index))) + + def update_menu_label(self, **kwargs): + self.label = kwargs['label'] + + +class CodeContextTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + root = cls.root = Tk() + root.withdraw() + frame = cls.frame = Frame(root) + text = cls.text = Text(frame) + text.insert('1.0', code_sample) + # Need to pack for creation of code context text widget. + frame.pack(side='left', fill='both', expand=1) + text.grid(row=1, column=1, sticky=NSEW) + cls.editor = DummyEditwin(root, frame, text) + codecontext.idleConf.userCfg = testcfg + + @classmethod + def tearDownClass(cls): + codecontext.idleConf.userCfg = usercfg + cls.editor.text.delete('1.0', 'end') + del cls.editor, cls.frame, cls.text + cls.root.update_idletasks() + cls.root.destroy() + del cls.root + + def setUp(self): + self.text.yview(0) + self.text['font'] = 'TkFixedFont' + self.cc = codecontext.CodeContext(self.editor) + + self.highlight_cfg = {"background": '#abcdef', + "foreground": '#123456'} + orig_idleConf_GetHighlight = codecontext.idleConf.GetHighlight + def mock_idleconf_GetHighlight(theme, element): + if element == 'context': + return self.highlight_cfg + return orig_idleConf_GetHighlight(theme, element) + GetHighlight_patcher = unittest.mock.patch.object( + codecontext.idleConf, 'GetHighlight', mock_idleconf_GetHighlight) + GetHighlight_patcher.start() + self.addCleanup(GetHighlight_patcher.stop) + + self.font_override = 'TkFixedFont' + def mock_idleconf_GetFont(root, configType, section): + return self.font_override + GetFont_patcher = unittest.mock.patch.object( + codecontext.idleConf, 'GetFont', mock_idleconf_GetFont) + GetFont_patcher.start() + self.addCleanup(GetFont_patcher.stop) + + def tearDown(self): + if self.cc.context: + self.cc.context.destroy() + # Explicitly call __del__ to remove scheduled scripts. + self.cc.__del__() + del self.cc.context, self.cc + + def test_init(self): + eq = self.assertEqual + ed = self.editor + cc = self.cc + + eq(cc.editwin, ed) + eq(cc.text, ed.text) + eq(cc.text['font'], ed.text['font']) + self.assertIsNone(cc.context) + eq(cc.info, [(0, -1, '', False)]) + eq(cc.topvisible, 1) + self.assertIsNone(self.cc.t1) + + def test_del(self): + self.cc.__del__() + + def test_del_with_timer(self): + timer = self.cc.t1 = self.text.after(10000, lambda: None) + self.cc.__del__() + with self.assertRaises(TclError) as cm: + self.root.tk.call('after', 'info', timer) + self.assertIn("doesn't exist", str(cm.exception)) + + def test_reload(self): + codecontext.CodeContext.reload() + self.assertEqual(self.cc.context_depth, 15) + + def test_toggle_code_context_event(self): + eq = self.assertEqual + cc = self.cc + toggle = cc.toggle_code_context_event + + # Make sure code context is off. + if cc.context: + toggle() + + # Toggle on. + toggle() + self.assertIsNotNone(cc.context) + eq(cc.context['font'], self.text['font']) + eq(cc.context['fg'], self.highlight_cfg['foreground']) + eq(cc.context['bg'], self.highlight_cfg['background']) + eq(cc.context.get('1.0', 'end-1c'), '') + eq(cc.editwin.label, 'Hide Code Context') + eq(self.root.tk.call('after', 'info', self.cc.t1)[1], 'timer') + + # Toggle off. + toggle() + self.assertIsNone(cc.context) + eq(cc.editwin.label, 'Show Code Context') + self.assertIsNone(self.cc.t1) + + # Scroll down and toggle back on. + line11_context = '\n'.join(x[2] for x in cc.get_context(11)[0]) + cc.text.yview(11) + toggle() + eq(cc.context.get('1.0', 'end-1c'), line11_context) + + # Toggle off and on again. + toggle() + toggle() + eq(cc.context.get('1.0', 'end-1c'), line11_context) + + def test_get_context(self): + eq = self.assertEqual + gc = self.cc.get_context + + # stopline must be greater than 0. + with self.assertRaises(AssertionError): + gc(1, stopline=0) + + eq(gc(3), ([(2, 0, 'class C1:', 'class')], 0)) + + # Don't return comment. + eq(gc(4), ([(2, 0, 'class C1:', 'class')], 0)) + + # Two indentation levels and no comment. + eq(gc(5), ([(2, 0, 'class C1:', 'class'), + (4, 4, ' def __init__(self, a, b):', 'def')], 0)) + + # Only one 'def' is returned, not both at the same indent level. + eq(gc(10), ([(2, 0, 'class C1:', 'class'), + (7, 4, ' def compare(self):', 'def'), + (8, 8, ' if a > b:', 'if')], 0)) + + # With 'elif', also show the 'if' even though it's at the same level. + eq(gc(11), ([(2, 0, 'class C1:', 'class'), + (7, 4, ' def compare(self):', 'def'), + (8, 8, ' if a > b:', 'if'), + (10, 8, ' elif a < b:', 'elif')], 0)) + + # Set stop_line to not go back to first line in source code. + # Return includes stop_line. + eq(gc(11, stopline=2), ([(2, 0, 'class C1:', 'class'), + (7, 4, ' def compare(self):', 'def'), + (8, 8, ' if a > b:', 'if'), + (10, 8, ' elif a < b:', 'elif')], 0)) + eq(gc(11, stopline=3), ([(7, 4, ' def compare(self):', 'def'), + (8, 8, ' if a > b:', 'if'), + (10, 8, ' elif a < b:', 'elif')], 4)) + eq(gc(11, stopline=8), ([(8, 8, ' if a > b:', 'if'), + (10, 8, ' elif a < b:', 'elif')], 8)) + + # Set stop_indent to test indent level to stop at. + eq(gc(11, stopindent=4), ([(7, 4, ' def compare(self):', 'def'), + (8, 8, ' if a > b:', 'if'), + (10, 8, ' elif a < b:', 'elif')], 4)) + # Check that the 'if' is included. + eq(gc(11, stopindent=8), ([(8, 8, ' if a > b:', 'if'), + (10, 8, ' elif a < b:', 'elif')], 8)) + + def test_update_code_context(self): + eq = self.assertEqual + cc = self.cc + # Ensure code context is active. + if not cc.context: + cc.toggle_code_context_event() + + # Invoke update_code_context without scrolling - nothing happens. + self.assertIsNone(cc.update_code_context()) + eq(cc.info, [(0, -1, '', False)]) + eq(cc.topvisible, 1) + + # Scroll down to line 1. + cc.text.yview(1) + cc.update_code_context() + eq(cc.info, [(0, -1, '', False)]) + eq(cc.topvisible, 2) + eq(cc.context.get('1.0', 'end-1c'), '') + + # Scroll down to line 2. + cc.text.yview(2) + cc.update_code_context() + eq(cc.info, [(0, -1, '', False), (2, 0, 'class C1:', 'class')]) + eq(cc.topvisible, 3) + eq(cc.context.get('1.0', 'end-1c'), 'class C1:') + + # Scroll down to line 3. Since it's a comment, nothing changes. + cc.text.yview(3) + cc.update_code_context() + eq(cc.info, [(0, -1, '', False), (2, 0, 'class C1:', 'class')]) + eq(cc.topvisible, 4) + eq(cc.context.get('1.0', 'end-1c'), 'class C1:') + + # Scroll down to line 4. + cc.text.yview(4) + cc.update_code_context() + eq(cc.info, [(0, -1, '', False), + (2, 0, 'class C1:', 'class'), + (4, 4, ' def __init__(self, a, b):', 'def')]) + eq(cc.topvisible, 5) + eq(cc.context.get('1.0', 'end-1c'), 'class C1:\n' + ' def __init__(self, a, b):') + + # Scroll down to line 11. Last 'def' is removed. + cc.text.yview(11) + cc.update_code_context() + eq(cc.info, [(0, -1, '', False), + (2, 0, 'class C1:', 'class'), + (7, 4, ' def compare(self):', 'def'), + (8, 8, ' if a > b:', 'if'), + (10, 8, ' elif a < b:', 'elif')]) + eq(cc.topvisible, 12) + eq(cc.context.get('1.0', 'end-1c'), 'class C1:\n' + ' def compare(self):\n' + ' if a > b:\n' + ' elif a < b:') + + # No scroll. No update, even though context_depth changed. + cc.update_code_context() + cc.context_depth = 1 + eq(cc.info, [(0, -1, '', False), + (2, 0, 'class C1:', 'class'), + (7, 4, ' def compare(self):', 'def'), + (8, 8, ' if a > b:', 'if'), + (10, 8, ' elif a < b:', 'elif')]) + eq(cc.topvisible, 12) + eq(cc.context.get('1.0', 'end-1c'), 'class C1:\n' + ' def compare(self):\n' + ' if a > b:\n' + ' elif a < b:') + + # Scroll up. + cc.text.yview(5) + cc.update_code_context() + eq(cc.info, [(0, -1, '', False), + (2, 0, 'class C1:', 'class'), + (4, 4, ' def __init__(self, a, b):', 'def')]) + eq(cc.topvisible, 6) + # context_depth is 1. + eq(cc.context.get('1.0', 'end-1c'), ' def __init__(self, a, b):') + + def test_jumptoline(self): + eq = self.assertEqual + cc = self.cc + jump = cc.jumptoline + + if not cc.context: + cc.toggle_code_context_event() + + # Empty context. + cc.text.yview('2.0') + cc.update_code_context() + eq(cc.topvisible, 2) + cc.context.mark_set('insert', '1.5') + jump() + eq(cc.topvisible, 1) + + # 4 lines of context showing. + cc.text.yview('12.0') + cc.update_code_context() + eq(cc.topvisible, 12) + cc.context.mark_set('insert', '3.0') + jump() + eq(cc.topvisible, 8) + + # More context lines than limit. + cc.context_depth = 2 + cc.text.yview('12.0') + cc.update_code_context() + eq(cc.topvisible, 12) + cc.context.mark_set('insert', '1.0') + jump() + eq(cc.topvisible, 8) + + # Context selection stops jump. + cc.text.yview('5.0') + cc.update_code_context() + cc.context.tag_add('sel', '1.0', '2.0') + cc.context.mark_set('insert', '1.0') + jump() # Without selection, to line 2. + eq(cc.topvisible, 5) + + @mock.patch.object(codecontext.CodeContext, 'update_code_context') + def test_timer_event(self, mock_update): + # Ensure code context is not active. + if self.cc.context: + self.cc.toggle_code_context_event() + self.cc.timer_event() + mock_update.assert_not_called() + + # Activate code context. + self.cc.toggle_code_context_event() + self.cc.timer_event() + mock_update.assert_called() + + def test_font(self): + eq = self.assertEqual + cc = self.cc + + orig_font = cc.text['font'] + test_font = 'TkTextFont' + self.assertNotEqual(orig_font, test_font) + + # Ensure code context is not active. + if cc.context is not None: + cc.toggle_code_context_event() + + self.font_override = test_font + # Nothing breaks or changes with inactive code context. + cc.update_font() + + # Activate code context, previous font change is immediately effective. + cc.toggle_code_context_event() + eq(cc.context['font'], test_font) + + # Call the font update, change is picked up. + self.font_override = orig_font + cc.update_font() + eq(cc.context['font'], orig_font) + + def test_highlight_colors(self): + eq = self.assertEqual + cc = self.cc + + orig_colors = dict(self.highlight_cfg) + test_colors = {'background': '#222222', 'foreground': '#ffff00'} + + def assert_colors_are_equal(colors): + eq(cc.context['background'], colors['background']) + eq(cc.context['foreground'], colors['foreground']) + + # Ensure code context is not active. + if cc.context: + cc.toggle_code_context_event() + + self.highlight_cfg = test_colors + # Nothing breaks with inactive code context. + cc.update_highlight_colors() + + # Activate code context, previous colors change is immediately effective. + cc.toggle_code_context_event() + assert_colors_are_equal(test_colors) + + # Call colors update with no change to the configured colors. + cc.update_highlight_colors() + assert_colors_are_equal(test_colors) + + # Call the colors update with code context active, change is picked up. + self.highlight_cfg = orig_colors + cc.update_highlight_colors() + assert_colors_are_equal(orig_colors) + + +class HelperFunctionText(unittest.TestCase): + + def test_get_spaces_firstword(self): + get = codecontext.get_spaces_firstword + test_lines = ( + (' first word', (' ', 'first')), + ('\tfirst word', ('\t', 'first')), + (' \u19D4\u19D2: ', (' ', '\u19D4\u19D2')), + ('no spaces', ('', 'no')), + ('', ('', '')), + ('# TEST COMMENT', ('', '')), + (' (continuation)', (' ', '')) + ) + for line, expected_output in test_lines: + self.assertEqual(get(line), expected_output) + + # Send the pattern in the call. + self.assertEqual(get(' (continuation)', + c=re.compile(r'^(\s*)([^\s]*)')), + (' ', '(continuation)')) + + def test_get_line_info(self): + eq = self.assertEqual + gli = codecontext.get_line_info + lines = code_sample.splitlines() + + # Line 1 is not a BLOCKOPENER. + eq(gli(lines[0]), (codecontext.INFINITY, '', False)) + # Line 2 is a BLOCKOPENER without an indent. + eq(gli(lines[1]), (0, 'class C1:', 'class')) + # Line 3 is not a BLOCKOPENER and does not return the indent level. + eq(gli(lines[2]), (codecontext.INFINITY, ' # Class comment.', False)) + # Line 4 is a BLOCKOPENER and is indented. + eq(gli(lines[3]), (4, ' def __init__(self, a, b):', 'def')) + # Line 8 is a different BLOCKOPENER and is indented. + eq(gli(lines[7]), (8, ' if a > b:', 'if')) + # Test tab. + eq(gli('\tif a == b:'), (1, '\tif a == b:', 'if')) + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_colorizer.py b/Lib/idlelib/idle_test/test_colorizer.py new file mode 100644 index 000000000..40800df97 --- /dev/null +++ b/Lib/idlelib/idle_test/test_colorizer.py @@ -0,0 +1,623 @@ +"Test colorizer, coverage 99%." +from idlelib import colorizer +from test.support import requires +import unittest +from unittest import mock +from idlelib.idle_test.tkinter_testing_utils import run_in_tk_mainloop + +from functools import partial +import textwrap +from tkinter import Tk, Text +from idlelib import config +from idlelib.percolator import Percolator + + +usercfg = colorizer.idleConf.userCfg +testcfg = { + 'main': config.IdleUserConfParser(''), + 'highlight': config.IdleUserConfParser(''), + 'keys': config.IdleUserConfParser(''), + 'extensions': config.IdleUserConfParser(''), +} + +source = textwrap.dedent("""\ + if True: int ('1') # keyword, builtin, string, comment + elif False: print(0) # 'string' in comment + else: float(None) # if in comment + if iF + If + IF: 'keyword matching must respect case' + if'': x or'' # valid keyword-string no-space combinations + async def f(): await g() + # Strings should be entirely colored, including quotes. + 'x', '''x''', "x", \"""x\""" + 'abc\\ + def' + '''abc\\ + def''' + # All valid prefixes for unicode and byte strings should be colored. + r'x', u'x', R'x', U'x', f'x', F'x' + fr'x', Fr'x', fR'x', FR'x', rf'x', rF'x', Rf'x', RF'x' + tr'x', Tr'x', tR'x', TR'x', rt'x', rT'x', Rt'x', RT'x' + b'x',B'x', br'x',Br'x',bR'x',BR'x', rb'x', rB'x',Rb'x',RB'x' + # Invalid combinations of legal characters should be half colored. + ur'x', ru'x', uf'x', fu'x', UR'x', ufr'x', rfu'x', xf'x', fx'x' + match point: + case (x, 0) as _: + print(f"X={x}") + case [_, [_], "_", + _]: + pass + case _ if ("a" if _ else set()): pass + case _: + raise ValueError("Not a point _") + ''' + case _:''' + "match x:" + """) + + +def setUpModule(): + colorizer.idleConf.userCfg = testcfg + + +def tearDownModule(): + colorizer.idleConf.userCfg = usercfg + + +class FunctionTest(unittest.TestCase): + + def test_any(self): + self.assertEqual(colorizer.any('test', ('a', 'b', 'cd')), + '(?P<test>a|b|cd)') + + def test_make_pat(self): + # Tested in more detail by testing prog. + self.assertTrue(colorizer.make_pat()) + + def test_prog(self): + prog = colorizer.prog + eq = self.assertEqual + line = 'def f():\n print("hello")\n' + m = prog.search(line) + eq(m.groupdict()['KEYWORD'], 'def') + m = prog.search(line, m.end()) + eq(m.groupdict()['SYNC'], '\n') + m = prog.search(line, m.end()) + eq(m.groupdict()['BUILTIN'], 'print') + m = prog.search(line, m.end()) + eq(m.groupdict()['STRING'], '"hello"') + m = prog.search(line, m.end()) + eq(m.groupdict()['SYNC'], '\n') + + def test_idprog(self): + idprog = colorizer.idprog + m = idprog.match('nospace') + self.assertIsNone(m) + m = idprog.match(' space') + self.assertEqual(m.group(0), ' space') + + +class ColorConfigTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + root = cls.root = Tk() + root.withdraw() + cls.text = Text(root) + + @classmethod + def tearDownClass(cls): + del cls.text + cls.root.update_idletasks() + cls.root.destroy() + del cls.root + + def test_color_config(self): + text = self.text + eq = self.assertEqual + colorizer.color_config(text) + # Uses IDLE Classic theme as default. + eq(text['background'], '#ffffff') + eq(text['foreground'], '#000000') + eq(text['selectbackground'], 'gray') + eq(text['selectforeground'], '#000000') + eq(text['insertbackground'], 'black') + eq(text['inactiveselectbackground'], 'gray') + + +class ColorDelegatorInstantiationTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + root = cls.root = Tk() + root.withdraw() + cls.text = Text(root) + + @classmethod + def tearDownClass(cls): + del cls.text + cls.root.update_idletasks() + cls.root.destroy() + del cls.root + + def setUp(self): + self.color = colorizer.ColorDelegator() + + def tearDown(self): + self.color.close() + self.text.delete('1.0', 'end') + self.color.resetcache() + del self.color + + def test_init(self): + color = self.color + self.assertIsInstance(color, colorizer.ColorDelegator) + + def test_init_state(self): + # init_state() is called during the instantiation of + # ColorDelegator in setUp(). + color = self.color + self.assertIsNone(color.after_id) + self.assertTrue(color.allow_colorizing) + self.assertFalse(color.colorizing) + self.assertFalse(color.stop_colorizing) + + +class ColorDelegatorTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + root = cls.root = Tk() + root.withdraw() + text = cls.text = Text(root) + cls.percolator = Percolator(text) + # Delegator stack = [Delegator(text)] + + @classmethod + def tearDownClass(cls): + cls.percolator.close() + del cls.percolator, cls.text + cls.root.update_idletasks() + cls.root.destroy() + del cls.root + + def setUp(self): + self.color = colorizer.ColorDelegator() + self.percolator.insertfilter(self.color) + # Calls color.setdelegate(Delegator(text)). + + def tearDown(self): + self.color.close() + self.percolator.removefilter(self.color) + self.text.delete('1.0', 'end') + self.color.resetcache() + del self.color + + def test_setdelegate(self): + # Called in setUp when filter is attached to percolator. + color = self.color + self.assertIsInstance(color.delegate, colorizer.Delegator) + # It is too late to mock notify_range, so test side effect. + self.assertEqual(self.root.tk.call( + 'after', 'info', color.after_id)[1], 'timer') + + def test_LoadTagDefs(self): + highlight = partial(config.idleConf.GetHighlight, theme='IDLE Classic') + for tag, colors in self.color.tagdefs.items(): + with self.subTest(tag=tag): + self.assertIn('background', colors) + self.assertIn('foreground', colors) + if tag not in ('SYNC', 'TODO'): + self.assertEqual(colors, highlight(element=tag.lower())) + + def test_config_colors(self): + text = self.text + highlight = partial(config.idleConf.GetHighlight, theme='IDLE Classic') + for tag in self.color.tagdefs: + for plane in ('background', 'foreground'): + with self.subTest(tag=tag, plane=plane): + if tag in ('SYNC', 'TODO'): + self.assertEqual(text.tag_cget(tag, plane), '') + else: + self.assertEqual(text.tag_cget(tag, plane), + highlight(element=tag.lower())[plane]) + # 'sel' is marked as the highest priority. + self.assertEqual(text.tag_names()[-1], 'sel') + + @mock.patch.object(colorizer.ColorDelegator, 'notify_range') + def test_insert(self, mock_notify): + text = self.text + # Initial text. + text.insert('insert', 'foo') + self.assertEqual(text.get('1.0', 'end'), 'foo\n') + mock_notify.assert_called_with('1.0', '1.0+3c') + # Additional text. + text.insert('insert', 'barbaz') + self.assertEqual(text.get('1.0', 'end'), 'foobarbaz\n') + mock_notify.assert_called_with('1.3', '1.3+6c') + + @mock.patch.object(colorizer.ColorDelegator, 'notify_range') + def test_delete(self, mock_notify): + text = self.text + # Initialize text. + text.insert('insert', 'abcdefghi') + self.assertEqual(text.get('1.0', 'end'), 'abcdefghi\n') + # Delete single character. + text.delete('1.7') + self.assertEqual(text.get('1.0', 'end'), 'abcdefgi\n') + mock_notify.assert_called_with('1.7') + # Delete multiple characters. + text.delete('1.3', '1.6') + self.assertEqual(text.get('1.0', 'end'), 'abcgi\n') + mock_notify.assert_called_with('1.3') + + def test_notify_range(self): + text = self.text + color = self.color + eq = self.assertEqual + + # Colorizing already scheduled. + save_id = color.after_id + eq(self.root.tk.call('after', 'info', save_id)[1], 'timer') + self.assertFalse(color.colorizing) + self.assertFalse(color.stop_colorizing) + self.assertTrue(color.allow_colorizing) + + # Coloring scheduled and colorizing in progress. + color.colorizing = True + color.notify_range('1.0', 'end') + self.assertFalse(color.stop_colorizing) + eq(color.after_id, save_id) + + # No colorizing scheduled and colorizing in progress. + text.after_cancel(save_id) + color.after_id = None + color.notify_range('1.0', '1.0+3c') + self.assertTrue(color.stop_colorizing) + self.assertIsNotNone(color.after_id) + eq(self.root.tk.call('after', 'info', color.after_id)[1], 'timer') + # New event scheduled. + self.assertNotEqual(color.after_id, save_id) + + # No colorizing scheduled and colorizing off. + text.after_cancel(color.after_id) + color.after_id = None + color.allow_colorizing = False + color.notify_range('1.4', '1.4+10c') + # Nothing scheduled when colorizing is off. + self.assertIsNone(color.after_id) + + def test_toggle_colorize_event(self): + color = self.color + eq = self.assertEqual + + # Starts with colorizing allowed and scheduled. + self.assertFalse(color.colorizing) + self.assertFalse(color.stop_colorizing) + self.assertTrue(color.allow_colorizing) + eq(self.root.tk.call('after', 'info', color.after_id)[1], 'timer') + + # Toggle colorizing off. + color.toggle_colorize_event() + self.assertIsNone(color.after_id) + self.assertFalse(color.colorizing) + self.assertFalse(color.stop_colorizing) + self.assertFalse(color.allow_colorizing) + + # Toggle on while colorizing in progress (doesn't add timer). + color.colorizing = True + color.toggle_colorize_event() + self.assertIsNone(color.after_id) + self.assertTrue(color.colorizing) + self.assertFalse(color.stop_colorizing) + self.assertTrue(color.allow_colorizing) + + # Toggle off while colorizing in progress. + color.toggle_colorize_event() + self.assertIsNone(color.after_id) + self.assertTrue(color.colorizing) + self.assertTrue(color.stop_colorizing) + self.assertFalse(color.allow_colorizing) + + # Toggle on while colorizing not in progress. + color.colorizing = False + color.toggle_colorize_event() + eq(self.root.tk.call('after', 'info', color.after_id)[1], 'timer') + self.assertFalse(color.colorizing) + self.assertTrue(color.stop_colorizing) + self.assertTrue(color.allow_colorizing) + + @mock.patch.object(colorizer.ColorDelegator, 'recolorize_main') + def test_recolorize(self, mock_recmain): + text = self.text + color = self.color + eq = self.assertEqual + # Call recolorize manually and not scheduled. + text.after_cancel(color.after_id) + + # No delegate. + save_delegate = color.delegate + color.delegate = None + color.recolorize() + mock_recmain.assert_not_called() + color.delegate = save_delegate + + # Toggle off colorizing. + color.allow_colorizing = False + color.recolorize() + mock_recmain.assert_not_called() + color.allow_colorizing = True + + # Colorizing in progress. + color.colorizing = True + color.recolorize() + mock_recmain.assert_not_called() + color.colorizing = False + + # Colorizing is done, but not completed, so rescheduled. + color.recolorize() + self.assertFalse(color.stop_colorizing) + self.assertFalse(color.colorizing) + mock_recmain.assert_called() + eq(mock_recmain.call_count, 1) + # Rescheduled when TODO tag still exists. + eq(self.root.tk.call('after', 'info', color.after_id)[1], 'timer') + + # No changes to text, so no scheduling added. + text.tag_remove('TODO', '1.0', 'end') + color.recolorize() + self.assertFalse(color.stop_colorizing) + self.assertFalse(color.colorizing) + mock_recmain.assert_called() + eq(mock_recmain.call_count, 2) + self.assertIsNone(color.after_id) + + @mock.patch.object(colorizer.ColorDelegator, 'notify_range') + def test_recolorize_main(self, mock_notify): + text = self.text + color = self.color + eq = self.assertEqual + + text.insert('insert', source) + expected = (('1.0', ('KEYWORD',)), ('1.2', ()), ('1.3', ('KEYWORD',)), + ('1.7', ()), ('1.9', ('BUILTIN',)), ('1.14', ('STRING',)), + ('1.19', ('COMMENT',)), + ('2.1', ('KEYWORD',)), ('2.18', ()), ('2.25', ('COMMENT',)), + ('3.6', ('BUILTIN',)), ('3.12', ('KEYWORD',)), ('3.21', ('COMMENT',)), + ('4.0', ('KEYWORD',)), ('4.3', ()), ('4.6', ()), + ('5.2', ('STRING',)), ('5.8', ('KEYWORD',)), ('5.10', ('STRING',)), + ('6.0', ('KEYWORD',)), ('6.10', ('DEFINITION',)), ('6.11', ()), + ('8.0', ('STRING',)), ('8.4', ()), ('8.5', ('STRING',)), + ('8.12', ()), ('8.14', ('STRING',)), + ('20.0', ('KEYWORD',)), + ('21.4', ('KEYWORD',)), ('21.16', ('KEYWORD',)),# ('21.19', ('KEYWORD',)), + #('23.4', ('KEYWORD',)), ('23.10', ('KEYWORD',)), ('23.14', ('KEYWORD',)), ('23.19', ('STRING',)), + #('24.12', ('KEYWORD',)), + ('25.8', ('KEYWORD',)), + ('26.4', ('KEYWORD',)), ('26.9', ('KEYWORD',)), + ('26.11', ('KEYWORD',)), ('26.15', ('STRING',)), + ('26.19', ('KEYWORD',)), ('26.22', ()), + ('26.24', ('KEYWORD',)), ('26.29', ('BUILTIN',)), ('26.37', ('KEYWORD',)), + ('27.4', ('KEYWORD',)), ('27.9', ('KEYWORD',)),# ('27.11', ('KEYWORD',)), ('27.14', (),), + ('28.25', ('STRING',)), ('28.38', ('STRING',)), + ('30.0', ('STRING',)), + ('31.1', ('STRING',)), + # SYNC at the end of every line. + ('1.55', ('SYNC',)), ('2.50', ('SYNC',)), ('3.34', ('SYNC',)), + ) + + # Nothing marked to do therefore no tags in text. + text.tag_remove('TODO', '1.0', 'end') + color.recolorize_main() + for tag in text.tag_names(): + with self.subTest(tag=tag): + eq(text.tag_ranges(tag), ()) + + # Source marked for processing. + text.tag_add('TODO', '1.0', 'end') + # Check some indexes. + color.recolorize_main() + for index, expected_tags in expected: + with self.subTest(index=index): + eq(text.tag_names(index), expected_tags) + + # Check for some tags for ranges. + eq(text.tag_nextrange('TODO', '1.0'), ()) + eq(text.tag_nextrange('KEYWORD', '1.0'), ('1.0', '1.2')) + eq(text.tag_nextrange('COMMENT', '2.0'), ('2.22', '2.43')) + eq(text.tag_nextrange('SYNC', '2.0'), ('2.43', '3.0')) + eq(text.tag_nextrange('STRING', '2.0'), ('4.17', '4.53')) + eq(text.tag_nextrange('STRING', '8.0'), ('8.0', '8.3')) + eq(text.tag_nextrange('STRING', '8.3'), ('8.5', '8.12')) + eq(text.tag_nextrange('STRING', '8.12'), ('8.14', '8.17')) + eq(text.tag_nextrange('STRING', '8.17'), ('8.19', '8.26')) + eq(text.tag_nextrange('SYNC', '8.0'), ('8.26', '9.0')) + eq(text.tag_nextrange('SYNC', '31.0'), ('31.10', '33.0')) + + def _assert_highlighting(self, source, tag_ranges): + """Check highlighting of a given piece of code. + + This inserts just this code into the Text widget. It will then + check that the resulting highlighting tag ranges exactly match + those described in the given `tag_ranges` dict. + + Note that the irrelevant tags 'sel', 'TODO' and 'SYNC' are + ignored. + """ + text = self.text + + with mock.patch.object(colorizer.ColorDelegator, 'notify_range'): + text.delete('1.0', 'end-1c') + text.insert('insert', source) + text.tag_add('TODO', '1.0', 'end-1c') + self.color.recolorize_main() + + # Make a dict with highlighting tag ranges in the Text widget. + text_tag_ranges = {} + for tag in set(text.tag_names()) - {'sel', 'TODO', 'SYNC'}: + indexes = [rng.string for rng in text.tag_ranges(tag)] + for index_pair in zip(indexes[::2], indexes[1::2]): + text_tag_ranges.setdefault(tag, []).append(index_pair) + + self.assertEqual(text_tag_ranges, tag_ranges) + + with mock.patch.object(colorizer.ColorDelegator, 'notify_range'): + text.delete('1.0', 'end-1c') + + def test_def_statement(self): + # empty def + self._assert_highlighting('def', {'KEYWORD': [('1.0', '1.3')]}) + + # def followed by identifier + self._assert_highlighting('def foo:', {'KEYWORD': [('1.0', '1.3')], + 'DEFINITION': [('1.4', '1.7')]}) + + # def followed by partial identifier + self._assert_highlighting('def fo', {'KEYWORD': [('1.0', '1.3')], + 'DEFINITION': [('1.4', '1.6')]}) + + # def followed by non-keyword + self._assert_highlighting('def ++', {'KEYWORD': [('1.0', '1.3')]}) + + def test_match_soft_keyword(self): + # empty match + self._assert_highlighting('match', {'KEYWORD': [('1.0', '1.5')]}) + + # match followed by partial identifier + self._assert_highlighting('match fo', {'KEYWORD': [('1.0', '1.5')]}) + + # match followed by identifier and colon + self._assert_highlighting('match foo:', {'KEYWORD': [('1.0', '1.5')]}) + + # match followed by keyword + self._assert_highlighting('match and', {'KEYWORD': [('1.6', '1.9')]}) + + # match followed by builtin with keyword prefix + self._assert_highlighting('match int:', {'KEYWORD': [('1.0', '1.5')], + 'BUILTIN': [('1.6', '1.9')]}) + + # match followed by non-text operator + self._assert_highlighting('match^', {}) + self._assert_highlighting('match @', {}) + + # match followed by colon + self._assert_highlighting('match :', {}) + + # match followed by comma + self._assert_highlighting('match\t,', {}) + + # match followed by a lone underscore + self._assert_highlighting('match _:', {'KEYWORD': [('1.0', '1.5')]}) + + def test_case_soft_keyword(self): + # empty case + self._assert_highlighting('case', {'KEYWORD': [('1.0', '1.4')]}) + + # case followed by partial identifier + self._assert_highlighting('case fo', {'KEYWORD': [('1.0', '1.4')]}) + + # case followed by identifier and colon + self._assert_highlighting('case foo:', {'KEYWORD': [('1.0', '1.4')]}) + + # case followed by keyword + self._assert_highlighting('case and', {'KEYWORD': [('1.5', '1.8')]}) + + # case followed by builtin with keyword prefix + self._assert_highlighting('case int:', {'KEYWORD': [('1.0', '1.4')], + 'BUILTIN': [('1.5', '1.8')]}) + + # case followed by non-text operator + self._assert_highlighting('case^', {}) + self._assert_highlighting('case @', {}) + + # case followed by colon + self._assert_highlighting('case :', {}) + + # case followed by comma + self._assert_highlighting('case\t,', {}) + + # case followed by a lone underscore + self._assert_highlighting('case _:', {'KEYWORD': [('1.0', '1.4'), + ('1.5', '1.6')]}) + + def test_long_multiline_string(self): + source = textwrap.dedent('''\ + """a + b + c + d + e""" + ''') + self._assert_highlighting(source, {'STRING': [('1.0', '5.4')]}) + + @run_in_tk_mainloop(delay=50) + def test_incremental_editing(self): + text = self.text + eq = self.assertEqual + + # Simulate typing 'inte'. During this, the highlighting should + # change from normal to keyword to builtin to normal. + text.insert('insert', 'i') + yield + eq(text.tag_nextrange('BUILTIN', '1.0'), ()) + eq(text.tag_nextrange('KEYWORD', '1.0'), ()) + + text.insert('insert', 'n') + yield + eq(text.tag_nextrange('BUILTIN', '1.0'), ()) + eq(text.tag_nextrange('KEYWORD', '1.0'), ('1.0', '1.2')) + + text.insert('insert', 't') + yield + eq(text.tag_nextrange('BUILTIN', '1.0'), ('1.0', '1.3')) + eq(text.tag_nextrange('KEYWORD', '1.0'), ()) + + text.insert('insert', 'e') + yield + eq(text.tag_nextrange('BUILTIN', '1.0'), ()) + eq(text.tag_nextrange('KEYWORD', '1.0'), ()) + + # Simulate deleting three characters from the end of 'inte'. + # During this, the highlighting should change from normal to + # builtin to keyword to normal. + text.delete('insert-1c', 'insert') + yield + eq(text.tag_nextrange('BUILTIN', '1.0'), ('1.0', '1.3')) + eq(text.tag_nextrange('KEYWORD', '1.0'), ()) + + text.delete('insert-1c', 'insert') + yield + eq(text.tag_nextrange('BUILTIN', '1.0'), ()) + eq(text.tag_nextrange('KEYWORD', '1.0'), ('1.0', '1.2')) + + text.delete('insert-1c', 'insert') + yield + eq(text.tag_nextrange('BUILTIN', '1.0'), ()) + eq(text.tag_nextrange('KEYWORD', '1.0'), ()) + + @mock.patch.object(colorizer.ColorDelegator, 'recolorize') + @mock.patch.object(colorizer.ColorDelegator, 'notify_range') + def test_removecolors(self, mock_notify, mock_recolorize): + text = self.text + color = self.color + text.insert('insert', source) + + color.recolorize_main() + # recolorize_main doesn't add these tags. + text.tag_add("ERROR", "1.0") + text.tag_add("TODO", "1.0") + text.tag_add("hit", "1.0") + for tag in color.tagdefs: + with self.subTest(tag=tag): + self.assertNotEqual(text.tag_ranges(tag), ()) + + color.removecolors() + for tag in color.tagdefs: + with self.subTest(tag=tag): + self.assertEqual(text.tag_ranges(tag), ()) + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_config.py b/Lib/idlelib/idle_test/test_config.py new file mode 100644 index 000000000..6d75cf7aa --- /dev/null +++ b/Lib/idlelib/idle_test/test_config.py @@ -0,0 +1,805 @@ +"""Test config, coverage 93%. +(100% for IdleConfParser, IdleUserConfParser*, ConfigChanges). +* Exception is OSError clause in Save method. +Much of IdleConf is also exercised by ConfigDialog and test_configdialog. +""" +from idlelib import config +import sys +import os +import tempfile +from test.support import captured_stderr, findfile +import unittest +from unittest import mock +import idlelib +from idlelib.idle_test.mock_idle import Func + +# Tests should not depend on fortuitous user configurations. +# They must not affect actual user .cfg files. +# Replace user parsers with empty parsers that cannot be saved +# due to getting '' as the filename when created. + +idleConf = config.idleConf +usercfg = idleConf.userCfg +testcfg = {} +usermain = testcfg['main'] = config.IdleUserConfParser('') +userhigh = testcfg['highlight'] = config.IdleUserConfParser('') +userkeys = testcfg['keys'] = config.IdleUserConfParser('') +userextn = testcfg['extensions'] = config.IdleUserConfParser('') + +def setUpModule(): + idleConf.userCfg = testcfg + idlelib.testing = True + +def tearDownModule(): + idleConf.userCfg = usercfg + idlelib.testing = False + + +class IdleConfParserTest(unittest.TestCase): + """Test that IdleConfParser works""" + + config = """ + [one] + one = false + two = true + three = 10 + + [two] + one = a string + two = true + three = false + """ + + def test_get(self): + parser = config.IdleConfParser('') + parser.read_string(self.config) + eq = self.assertEqual + + # Test with type argument. + self.assertIs(parser.Get('one', 'one', type='bool'), False) + self.assertIs(parser.Get('one', 'two', type='bool'), True) + eq(parser.Get('one', 'three', type='int'), 10) + eq(parser.Get('two', 'one'), 'a string') + self.assertIs(parser.Get('two', 'two', type='bool'), True) + self.assertIs(parser.Get('two', 'three', type='bool'), False) + + # Test without type should fallback to string. + eq(parser.Get('two', 'two'), 'true') + eq(parser.Get('two', 'three'), 'false') + + # If option not exist, should return None, or default. + self.assertIsNone(parser.Get('not', 'exist')) + eq(parser.Get('not', 'exist', default='DEFAULT'), 'DEFAULT') + + def test_get_option_list(self): + parser = config.IdleConfParser('') + parser.read_string(self.config) + get_list = parser.GetOptionList + self.assertCountEqual(get_list('one'), ['one', 'two', 'three']) + self.assertCountEqual(get_list('two'), ['one', 'two', 'three']) + self.assertEqual(get_list('not exist'), []) + + def test_load_nothing(self): + parser = config.IdleConfParser('') + parser.Load() + self.assertEqual(parser.sections(), []) + + def test_load_file(self): + # Borrow test/configdata/cfgparser.1 from test_configparser. + config_path = findfile('cfgparser.1', subdir='configdata') + parser = config.IdleConfParser(config_path) + parser.Load() + + self.assertEqual(parser.Get('Foo Bar', 'foo'), 'newbar') + self.assertEqual(parser.GetOptionList('Foo Bar'), ['foo']) + + +class IdleUserConfParserTest(unittest.TestCase): + """Test that IdleUserConfParser works""" + + def new_parser(self, path=''): + return config.IdleUserConfParser(path) + + def test_set_option(self): + parser = self.new_parser() + parser.add_section('Foo') + # Setting new option in existing section should return True. + self.assertTrue(parser.SetOption('Foo', 'bar', 'true')) + # Setting existing option with same value should return False. + self.assertFalse(parser.SetOption('Foo', 'bar', 'true')) + # Setting exiting option with new value should return True. + self.assertTrue(parser.SetOption('Foo', 'bar', 'false')) + self.assertEqual(parser.Get('Foo', 'bar'), 'false') + + # Setting option in new section should create section and return True. + self.assertTrue(parser.SetOption('Bar', 'bar', 'true')) + self.assertCountEqual(parser.sections(), ['Bar', 'Foo']) + self.assertEqual(parser.Get('Bar', 'bar'), 'true') + + def test_remove_option(self): + parser = self.new_parser() + parser.AddSection('Foo') + parser.SetOption('Foo', 'bar', 'true') + + self.assertTrue(parser.RemoveOption('Foo', 'bar')) + self.assertFalse(parser.RemoveOption('Foo', 'bar')) + self.assertFalse(parser.RemoveOption('Not', 'Exist')) + + def test_add_section(self): + parser = self.new_parser() + self.assertEqual(parser.sections(), []) + + # Should not add duplicate section. + # Configparser raises DuplicateError, IdleParser not. + parser.AddSection('Foo') + parser.AddSection('Foo') + parser.AddSection('Bar') + self.assertCountEqual(parser.sections(), ['Bar', 'Foo']) + + def test_remove_empty_sections(self): + parser = self.new_parser() + + parser.AddSection('Foo') + parser.AddSection('Bar') + parser.SetOption('Idle', 'name', 'val') + self.assertCountEqual(parser.sections(), ['Bar', 'Foo', 'Idle']) + parser.RemoveEmptySections() + self.assertEqual(parser.sections(), ['Idle']) + + def test_is_empty(self): + parser = self.new_parser() + + parser.AddSection('Foo') + parser.AddSection('Bar') + self.assertTrue(parser.IsEmpty()) + self.assertEqual(parser.sections(), []) + + parser.SetOption('Foo', 'bar', 'false') + parser.AddSection('Bar') + self.assertFalse(parser.IsEmpty()) + self.assertCountEqual(parser.sections(), ['Foo']) + + def test_save(self): + with tempfile.TemporaryDirectory() as tdir: + path = os.path.join(tdir, 'test.cfg') + parser = self.new_parser(path) + parser.AddSection('Foo') + parser.SetOption('Foo', 'bar', 'true') + + # Should save to path when config is not empty. + self.assertFalse(os.path.exists(path)) + parser.Save() + self.assertTrue(os.path.exists(path)) + + # Should remove the file from disk when config is empty. + parser.remove_section('Foo') + parser.Save() + self.assertFalse(os.path.exists(path)) + + +class IdleConfTest(unittest.TestCase): + """Test for idleConf""" + + @classmethod + def setUpClass(cls): + cls.config_string = {} + + conf = config.IdleConf(_utest=True) + if __name__ != '__main__': + idle_dir = os.path.dirname(__file__) + else: + idle_dir = os.path.abspath(sys.path[0]) + for ctype in conf.config_types: + config_path = os.path.join(idle_dir, '../config-%s.def' % ctype) + with open(config_path) as f: + cls.config_string[ctype] = f.read() + + cls.orig_warn = config._warn + config._warn = Func() + + @classmethod + def tearDownClass(cls): + config._warn = cls.orig_warn + + def new_config(self, _utest=False): + return config.IdleConf(_utest=_utest) + + def mock_config(self): + """Return a mocked idleConf + + Both default and user config used the same config-*.def + """ + conf = config.IdleConf(_utest=True) + for ctype in conf.config_types: + conf.defaultCfg[ctype] = config.IdleConfParser('') + conf.defaultCfg[ctype].read_string(self.config_string[ctype]) + conf.userCfg[ctype] = config.IdleUserConfParser('') + conf.userCfg[ctype].read_string(self.config_string[ctype]) + + return conf + + @unittest.skipIf(sys.platform.startswith('win'), 'this is test for unix system') + def test_get_user_cfg_dir_unix(self): + # Test to get user config directory under unix. + conf = self.new_config(_utest=True) + + # Check normal way should success + with mock.patch('os.path.expanduser', return_value='/home/foo'): + with mock.patch('os.path.exists', return_value=True): + self.assertEqual(conf.GetUserCfgDir(), '/home/foo/.idlerc') + + # Check os.getcwd should success + with mock.patch('os.path.expanduser', return_value='~'): + with mock.patch('os.getcwd', return_value='/home/foo/cpython'): + with mock.patch('os.mkdir'): + self.assertEqual(conf.GetUserCfgDir(), + '/home/foo/cpython/.idlerc') + + # Check user dir not exists and created failed should raise SystemExit + with mock.patch('os.path.join', return_value='/path/not/exists'): + with self.assertRaises(SystemExit): + with self.assertRaises(FileNotFoundError): + conf.GetUserCfgDir() + + @unittest.skipIf(not sys.platform.startswith('win'), 'this is test for Windows system') + def test_get_user_cfg_dir_windows(self): + # Test to get user config directory under Windows. + conf = self.new_config(_utest=True) + + # Check normal way should success + with mock.patch('os.path.expanduser', return_value='C:\\foo'): + with mock.patch('os.path.exists', return_value=True): + self.assertEqual(conf.GetUserCfgDir(), 'C:\\foo\\.idlerc') + + # Check os.getcwd should success + with mock.patch('os.path.expanduser', return_value='~'): + with mock.patch('os.getcwd', return_value='C:\\foo\\cpython'): + with mock.patch('os.mkdir'): + self.assertEqual(conf.GetUserCfgDir(), + 'C:\\foo\\cpython\\.idlerc') + + # Check user dir not exists and created failed should raise SystemExit + with mock.patch('os.path.join', return_value='/path/not/exists'): + with self.assertRaises(SystemExit): + with self.assertRaises(FileNotFoundError): + conf.GetUserCfgDir() + + def test_create_config_handlers(self): + conf = self.new_config(_utest=True) + + # Mock out idle_dir + idle_dir = '/home/foo' + with mock.patch.dict({'__name__': '__foo__'}): + with mock.patch('os.path.dirname', return_value=idle_dir): + conf.CreateConfigHandlers() + + # Check keys are equal + self.assertCountEqual(conf.defaultCfg, conf.config_types) + self.assertCountEqual(conf.userCfg, conf.config_types) + + # Check conf parser are correct type + for default_parser in conf.defaultCfg.values(): + self.assertIsInstance(default_parser, config.IdleConfParser) + for user_parser in conf.userCfg.values(): + self.assertIsInstance(user_parser, config.IdleUserConfParser) + + # Check config path are correct + for cfg_type, parser in conf.defaultCfg.items(): + self.assertEqual(parser.file, + os.path.join(idle_dir, f'config-{cfg_type}.def')) + for cfg_type, parser in conf.userCfg.items(): + self.assertEqual(parser.file, + os.path.join(conf.userdir or '#', f'config-{cfg_type}.cfg')) + + def test_load_cfg_files(self): + conf = self.new_config(_utest=True) + + # Borrow test/configdata/cfgparser.1 from test_configparser. + config_path = findfile('cfgparser.1', subdir='configdata') + conf.defaultCfg['foo'] = config.IdleConfParser(config_path) + conf.userCfg['foo'] = config.IdleUserConfParser(config_path) + + # Load all config from path + conf.LoadCfgFiles() + + eq = self.assertEqual + + # Check defaultCfg is loaded + eq(conf.defaultCfg['foo'].Get('Foo Bar', 'foo'), 'newbar') + eq(conf.defaultCfg['foo'].GetOptionList('Foo Bar'), ['foo']) + + # Check userCfg is loaded + eq(conf.userCfg['foo'].Get('Foo Bar', 'foo'), 'newbar') + eq(conf.userCfg['foo'].GetOptionList('Foo Bar'), ['foo']) + + def test_save_user_cfg_files(self): + conf = self.mock_config() + + with mock.patch('idlelib.config.IdleUserConfParser.Save') as m: + conf.SaveUserCfgFiles() + self.assertEqual(m.call_count, len(conf.userCfg)) + + def test_get_option(self): + conf = self.mock_config() + + eq = self.assertEqual + eq(conf.GetOption('main', 'EditorWindow', 'width'), '80') + eq(conf.GetOption('main', 'EditorWindow', 'width', type='int'), 80) + with mock.patch('idlelib.config._warn') as _warn: + eq(conf.GetOption('main', 'EditorWindow', 'font', type='int'), None) + eq(conf.GetOption('main', 'EditorWindow', 'NotExists'), None) + eq(conf.GetOption('main', 'EditorWindow', 'NotExists', default='NE'), 'NE') + eq(_warn.call_count, 4) + + def test_set_option(self): + conf = self.mock_config() + + conf.SetOption('main', 'Foo', 'bar', 'newbar') + self.assertEqual(conf.GetOption('main', 'Foo', 'bar'), 'newbar') + + def test_get_section_list(self): + conf = self.mock_config() + + self.assertCountEqual( + conf.GetSectionList('default', 'main'), + ['General', 'EditorWindow', 'PyShell', 'Indent', 'Theme', + 'Keys', 'History', 'HelpFiles']) + self.assertCountEqual( + conf.GetSectionList('user', 'main'), + ['General', 'EditorWindow', 'PyShell', 'Indent', 'Theme', + 'Keys', 'History', 'HelpFiles']) + + with self.assertRaises(config.InvalidConfigSet): + conf.GetSectionList('foobar', 'main') + with self.assertRaises(config.InvalidConfigType): + conf.GetSectionList('default', 'notexists') + + def test_get_highlight(self): + conf = self.mock_config() + + eq = self.assertEqual + eq(conf.GetHighlight('IDLE Classic', 'normal'), {'foreground': '#000000', + 'background': '#ffffff'}) + + # Test cursor (this background should be normal-background) + eq(conf.GetHighlight('IDLE Classic', 'cursor'), {'foreground': 'black', + 'background': '#ffffff'}) + + # Test get user themes + conf.SetOption('highlight', 'Foobar', 'normal-foreground', '#747474') + conf.SetOption('highlight', 'Foobar', 'normal-background', '#171717') + with mock.patch('idlelib.config._warn'): + eq(conf.GetHighlight('Foobar', 'normal'), {'foreground': '#747474', + 'background': '#171717'}) + + def test_get_theme_dict(self): + # TODO: finish. + conf = self.mock_config() + + # These two should be the same + self.assertEqual( + conf.GetThemeDict('default', 'IDLE Classic'), + conf.GetThemeDict('user', 'IDLE Classic')) + + with self.assertRaises(config.InvalidTheme): + conf.GetThemeDict('bad', 'IDLE Classic') + + def test_get_current_theme_and_keys(self): + conf = self.mock_config() + + self.assertEqual(conf.CurrentTheme(), conf.current_colors_and_keys('Theme')) + self.assertEqual(conf.CurrentKeys(), conf.current_colors_and_keys('Keys')) + + def test_current_colors_and_keys(self): + conf = self.mock_config() + + self.assertEqual(conf.current_colors_and_keys('Theme'), 'IDLE Classic') + + def test_default_keys(self): + current_platform = sys.platform + conf = self.new_config(_utest=True) + + sys.platform = 'win32' + self.assertEqual(conf.default_keys(), 'IDLE Classic Windows') + + sys.platform = 'darwin' + self.assertEqual(conf.default_keys(), 'IDLE Classic OSX') + + sys.platform = 'some-linux' + self.assertEqual(conf.default_keys(), 'IDLE Modern Unix') + + # Restore platform + sys.platform = current_platform + + def test_get_extensions(self): + userextn.read_string(''' + [ZzDummy] + enable = True + [DISABLE] + enable = False + ''') + eq = self.assertEqual + iGE = idleConf.GetExtensions + eq(iGE(shell_only=True), []) + eq(iGE(), ['ZzDummy']) + eq(iGE(editor_only=True), ['ZzDummy']) + eq(iGE(active_only=False), ['ZzDummy', 'DISABLE']) + eq(iGE(active_only=False, editor_only=True), ['ZzDummy', 'DISABLE']) + userextn.remove_section('ZzDummy') + userextn.remove_section('DISABLE') + + + def test_remove_key_bind_names(self): + conf = self.mock_config() + + self.assertCountEqual( + conf.RemoveKeyBindNames(conf.GetSectionList('default', 'extensions')), + ['AutoComplete', 'CodeContext', 'FormatParagraph', 'ParenMatch', 'ZzDummy']) + + def test_get_extn_name_for_event(self): + userextn.read_string(''' + [ZzDummy] + enable = True + ''') + eq = self.assertEqual + eq(idleConf.GetExtnNameForEvent('z-in'), 'ZzDummy') + eq(idleConf.GetExtnNameForEvent('z-out'), None) + userextn.remove_section('ZzDummy') + + def test_get_extension_keys(self): + userextn.read_string(''' + [ZzDummy] + enable = True + ''') + self.assertEqual(idleConf.GetExtensionKeys('ZzDummy'), + {'<<z-in>>': ['<Control-Shift-KeyRelease-Insert>']}) + userextn.remove_section('ZzDummy') +# need option key test +## key = ['<Option-Key-2>'] if sys.platform == 'darwin' else ['<Alt-Key-2>'] +## eq(conf.GetExtensionKeys('ZoomHeight'), {'<<zoom-height>>': key}) + + def test_get_extension_bindings(self): + userextn.read_string(''' + [ZzDummy] + enable = True + ''') + eq = self.assertEqual + iGEB = idleConf.GetExtensionBindings + eq(iGEB('NotExists'), {}) + expect = {'<<z-in>>': ['<Control-Shift-KeyRelease-Insert>'], + '<<z-out>>': ['<Control-Shift-KeyRelease-Delete>']} + eq(iGEB('ZzDummy'), expect) + userextn.remove_section('ZzDummy') + + def test_get_keybinding(self): + conf = self.mock_config() + + eq = self.assertEqual + eq(conf.GetKeyBinding('IDLE Modern Unix', '<<copy>>'), + ['<Control-Shift-Key-C>', '<Control-Key-Insert>']) + eq(conf.GetKeyBinding('IDLE Classic Unix', '<<copy>>'), + ['<Alt-Key-w>', '<Meta-Key-w>']) + eq(conf.GetKeyBinding('IDLE Classic Windows', '<<copy>>'), + ['<Control-Key-c>', '<Control-Key-C>']) + eq(conf.GetKeyBinding('IDLE Classic Mac', '<<copy>>'), ['<Command-Key-c>']) + eq(conf.GetKeyBinding('IDLE Classic OSX', '<<copy>>'), ['<Command-Key-c>']) + + # Test keybinding not exists + eq(conf.GetKeyBinding('NOT EXISTS', '<<copy>>'), []) + eq(conf.GetKeyBinding('IDLE Modern Unix', 'NOT EXISTS'), []) + + def test_get_current_keyset(self): + current_platform = sys.platform + conf = self.mock_config() + + # Ensure that platform isn't darwin + sys.platform = 'some-linux' + self.assertEqual(conf.GetCurrentKeySet(), conf.GetKeySet(conf.CurrentKeys())) + + # This should not be the same, since replace <Alt- to <Option-. + # Above depended on config-extensions.def having Alt keys, + # which is no longer true. + # sys.platform = 'darwin' + # self.assertNotEqual(conf.GetCurrentKeySet(), conf.GetKeySet(conf.CurrentKeys())) + + # Restore platform + sys.platform = current_platform + + def test_get_keyset(self): + conf = self.mock_config() + + # Conflict with key set, should be disable to '' + conf.defaultCfg['extensions'].add_section('Foobar') + conf.defaultCfg['extensions'].add_section('Foobar_cfgBindings') + conf.defaultCfg['extensions'].set('Foobar', 'enable', 'True') + conf.defaultCfg['extensions'].set('Foobar_cfgBindings', 'newfoo', '<Key-F3>') + self.assertEqual(conf.GetKeySet('IDLE Modern Unix')['<<newfoo>>'], '') + + def test_is_core_binding(self): + # XXX: Should move out the core keys to config file or other place + conf = self.mock_config() + + self.assertTrue(conf.IsCoreBinding('copy')) + self.assertTrue(conf.IsCoreBinding('cut')) + self.assertTrue(conf.IsCoreBinding('del-word-right')) + self.assertFalse(conf.IsCoreBinding('not-exists')) + + def test_extra_help_source_list(self): + # Test GetExtraHelpSourceList and GetAllExtraHelpSourcesList in same + # place to prevent prepare input data twice. + conf = self.mock_config() + + # Test default with no extra help source + self.assertEqual(conf.GetExtraHelpSourceList('default'), []) + self.assertEqual(conf.GetExtraHelpSourceList('user'), []) + with self.assertRaises(config.InvalidConfigSet): + self.assertEqual(conf.GetExtraHelpSourceList('bad'), []) + self.assertCountEqual( + conf.GetAllExtraHelpSourcesList(), + conf.GetExtraHelpSourceList('default') + conf.GetExtraHelpSourceList('user')) + + # Add help source to user config + conf.userCfg['main'].SetOption('HelpFiles', '4', 'Python;https://python.org') # This is bad input + conf.userCfg['main'].SetOption('HelpFiles', '3', 'Python:https://python.org') # This is bad input + conf.userCfg['main'].SetOption('HelpFiles', '2', 'Pillow;https://pillow.readthedocs.io/en/latest/') + conf.userCfg['main'].SetOption('HelpFiles', '1', 'IDLE;C:/Programs/Python36/Lib/idlelib/help.html') + self.assertEqual(conf.GetExtraHelpSourceList('user'), + [('IDLE', 'C:/Programs/Python36/Lib/idlelib/help.html', '1'), + ('Pillow', 'https://pillow.readthedocs.io/en/latest/', '2'), + ('Python', 'https://python.org', '4')]) + self.assertCountEqual( + conf.GetAllExtraHelpSourcesList(), + conf.GetExtraHelpSourceList('default') + conf.GetExtraHelpSourceList('user')) + + def test_get_font(self): + from test.support import requires + from tkinter import Tk + from tkinter.font import Font + conf = self.mock_config() + + requires('gui') + root = Tk() + root.withdraw() + + f = Font.actual(Font(name='TkFixedFont', exists=True, root=root)) + self.assertEqual( + conf.GetFont(root, 'main', 'EditorWindow'), + (f['family'], 10 if f['size'] <= 0 else f['size'], f['weight'])) + + # Cleanup root + root.destroy() + del root + + def test_get_core_keys(self): + conf = self.mock_config() + + eq = self.assertEqual + eq(conf.GetCoreKeys()['<<center-insert>>'], ['<Control-l>']) + eq(conf.GetCoreKeys()['<<copy>>'], ['<Control-c>', '<Control-C>']) + eq(conf.GetCoreKeys()['<<history-next>>'], ['<Alt-n>']) + eq(conf.GetCoreKeys('IDLE Classic Windows')['<<center-insert>>'], + ['<Control-Key-l>', '<Control-Key-L>']) + eq(conf.GetCoreKeys('IDLE Classic OSX')['<<copy>>'], ['<Command-Key-c>']) + eq(conf.GetCoreKeys('IDLE Classic Unix')['<<history-next>>'], + ['<Alt-Key-n>', '<Meta-Key-n>']) + eq(conf.GetCoreKeys('IDLE Modern Unix')['<<history-next>>'], + ['<Alt-Key-n>', '<Meta-Key-n>']) + + +class CurrentColorKeysTest(unittest.TestCase): + """ Test colorkeys function with user config [Theme] and [Keys] patterns. + + colorkeys = config.IdleConf.current_colors_and_keys + Test all patterns written by IDLE and some errors + Item 'default' should really be 'builtin' (versus 'custom). + """ + colorkeys = idleConf.current_colors_and_keys + default_theme = 'IDLE Classic' + default_keys = idleConf.default_keys() + + def test_old_builtin_theme(self): + # On initial installation, user main is blank. + self.assertEqual(self.colorkeys('Theme'), self.default_theme) + # For old default, name2 must be blank. + usermain.read_string(''' + [Theme] + default = True + ''') + # IDLE omits 'name' for default old builtin theme. + self.assertEqual(self.colorkeys('Theme'), self.default_theme) + # IDLE adds 'name' for non-default old builtin theme. + usermain['Theme']['name'] = 'IDLE New' + self.assertEqual(self.colorkeys('Theme'), 'IDLE New') + # Erroneous non-default old builtin reverts to default. + usermain['Theme']['name'] = 'non-existent' + self.assertEqual(self.colorkeys('Theme'), self.default_theme) + usermain.remove_section('Theme') + + def test_new_builtin_theme(self): + # IDLE writes name2 for new builtins. + usermain.read_string(''' + [Theme] + default = True + name2 = IDLE Dark + ''') + self.assertEqual(self.colorkeys('Theme'), 'IDLE Dark') + # Leftover 'name', not removed, is ignored. + usermain['Theme']['name'] = 'IDLE New' + self.assertEqual(self.colorkeys('Theme'), 'IDLE Dark') + # Erroneous non-default new builtin reverts to default. + usermain['Theme']['name2'] = 'non-existent' + self.assertEqual(self.colorkeys('Theme'), self.default_theme) + usermain.remove_section('Theme') + + def test_user_override_theme(self): + # Erroneous custom name (no definition) reverts to default. + usermain.read_string(''' + [Theme] + default = False + name = Custom Dark + ''') + self.assertEqual(self.colorkeys('Theme'), self.default_theme) + # Custom name is valid with matching Section name. + userhigh.read_string('[Custom Dark]\na=b') + self.assertEqual(self.colorkeys('Theme'), 'Custom Dark') + # Name2 is ignored. + usermain['Theme']['name2'] = 'non-existent' + self.assertEqual(self.colorkeys('Theme'), 'Custom Dark') + usermain.remove_section('Theme') + userhigh.remove_section('Custom Dark') + + def test_old_builtin_keys(self): + # On initial installation, user main is blank. + self.assertEqual(self.colorkeys('Keys'), self.default_keys) + # For old default, name2 must be blank, name is always used. + usermain.read_string(''' + [Keys] + default = True + name = IDLE Classic Unix + ''') + self.assertEqual(self.colorkeys('Keys'), 'IDLE Classic Unix') + # Erroneous non-default old builtin reverts to default. + usermain['Keys']['name'] = 'non-existent' + self.assertEqual(self.colorkeys('Keys'), self.default_keys) + usermain.remove_section('Keys') + + def test_new_builtin_keys(self): + # IDLE writes name2 for new builtins. + usermain.read_string(''' + [Keys] + default = True + name2 = IDLE Modern Unix + ''') + self.assertEqual(self.colorkeys('Keys'), 'IDLE Modern Unix') + # Leftover 'name', not removed, is ignored. + usermain['Keys']['name'] = 'IDLE Classic Unix' + self.assertEqual(self.colorkeys('Keys'), 'IDLE Modern Unix') + # Erroneous non-default new builtin reverts to default. + usermain['Keys']['name2'] = 'non-existent' + self.assertEqual(self.colorkeys('Keys'), self.default_keys) + usermain.remove_section('Keys') + + def test_user_override_keys(self): + # Erroneous custom name (no definition) reverts to default. + usermain.read_string(''' + [Keys] + default = False + name = Custom Keys + ''') + self.assertEqual(self.colorkeys('Keys'), self.default_keys) + # Custom name is valid with matching Section name. + userkeys.read_string('[Custom Keys]\na=b') + self.assertEqual(self.colorkeys('Keys'), 'Custom Keys') + # Name2 is ignored. + usermain['Keys']['name2'] = 'non-existent' + self.assertEqual(self.colorkeys('Keys'), 'Custom Keys') + usermain.remove_section('Keys') + userkeys.remove_section('Custom Keys') + + +class ChangesTest(unittest.TestCase): + + empty = {'main':{}, 'highlight':{}, 'keys':{}, 'extensions':{}} + + def load(self): # Test_add_option verifies that this works. + changes = self.changes + changes.add_option('main', 'Msec', 'mitem', 'mval') + changes.add_option('highlight', 'Hsec', 'hitem', 'hval') + changes.add_option('keys', 'Ksec', 'kitem', 'kval') + return changes + + loaded = {'main': {'Msec': {'mitem': 'mval'}}, + 'highlight': {'Hsec': {'hitem': 'hval'}}, + 'keys': {'Ksec': {'kitem':'kval'}}, + 'extensions': {}} + + def setUp(self): + self.changes = config.ConfigChanges() + + def test_init(self): + self.assertEqual(self.changes, self.empty) + + def test_add_option(self): + changes = self.load() + self.assertEqual(changes, self.loaded) + changes.add_option('main', 'Msec', 'mitem', 'mval') + self.assertEqual(changes, self.loaded) + + def test_save_option(self): # Static function does not touch changes. + save_option = self.changes.save_option + self.assertTrue(save_option('main', 'Indent', 'what', '0')) + self.assertFalse(save_option('main', 'Indent', 'what', '0')) + self.assertEqual(usermain['Indent']['what'], '0') + + self.assertTrue(save_option('main', 'Indent', 'use-spaces', '0')) + self.assertEqual(usermain['Indent']['use-spaces'], '0') + self.assertTrue(save_option('main', 'Indent', 'use-spaces', '1')) + self.assertFalse(usermain.has_option('Indent', 'use-spaces')) + usermain.remove_section('Indent') + + def test_save_added(self): + changes = self.load() + self.assertTrue(changes.save_all()) + self.assertEqual(usermain['Msec']['mitem'], 'mval') + self.assertEqual(userhigh['Hsec']['hitem'], 'hval') + self.assertEqual(userkeys['Ksec']['kitem'], 'kval') + changes.add_option('main', 'Msec', 'mitem', 'mval') + self.assertFalse(changes.save_all()) + usermain.remove_section('Msec') + userhigh.remove_section('Hsec') + userkeys.remove_section('Ksec') + + def test_save_help(self): + # Any change to HelpFiles overwrites entire section. + changes = self.changes + changes.save_option('main', 'HelpFiles', 'IDLE', 'idledoc') + changes.add_option('main', 'HelpFiles', 'ELDI', 'codeldi') + changes.save_all() + self.assertFalse(usermain.has_option('HelpFiles', 'IDLE')) + self.assertTrue(usermain.has_option('HelpFiles', 'ELDI')) + + def test_save_default(self): # Cover 2nd and 3rd false branches. + changes = self.changes + changes.add_option('main', 'Indent', 'use-spaces', '1') + # save_option returns False; cfg_type_changed remains False. + + # TODO: test that save_all calls usercfg Saves. + + def test_delete_section(self): + changes = self.load() + changes.delete_section('main', 'fake') # Test no exception. + self.assertEqual(changes, self.loaded) # Test nothing deleted. + for cfgtype, section in (('main', 'Msec'), ('keys', 'Ksec')): + testcfg[cfgtype].SetOption(section, 'name', 'value') + changes.delete_section(cfgtype, section) + with self.assertRaises(KeyError): + changes[cfgtype][section] # Test section gone from changes + testcfg[cfgtype][section] # and from mock userCfg. + # TODO test for save call. + + def test_clear(self): + changes = self.load() + changes.clear() + self.assertEqual(changes, self.empty) + + +class WarningTest(unittest.TestCase): + + def test_warn(self): + Equal = self.assertEqual + config._warned = set() + with captured_stderr() as stderr: + config._warn('warning', 'key') + Equal(config._warned, {('warning','key')}) + Equal(stderr.getvalue(), 'warning'+'\n') + with captured_stderr() as stderr: + config._warn('warning', 'key') + Equal(stderr.getvalue(), '') + with captured_stderr() as stderr: + config._warn('warn2', 'yek') + Equal(config._warned, {('warning','key'), ('warn2','yek')}) + Equal(stderr.getvalue(), 'warn2'+'\n') + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_config_key.py b/Lib/idlelib/idle_test/test_config_key.py new file mode 100644 index 000000000..32f878b84 --- /dev/null +++ b/Lib/idlelib/idle_test/test_config_key.py @@ -0,0 +1,356 @@ +"""Test config_key, coverage 98%. + +Coverage is effectively 100%. Tkinter dialog is mocked, Mac-only line +may be skipped, and dummy function in bind test should not be called. +Not tested: exit with 'self.advanced or self.keys_ok(keys) ...' False. +""" + +from idlelib import config_key +from test.support import requires +import unittest +from unittest import mock +from tkinter import Tk, TclError +from idlelib.idle_test.mock_idle import Func +from idlelib.idle_test.mock_tk import Mbox_func + + +class ValidationTest(unittest.TestCase): + "Test validation methods: ok, keys_ok, bind_ok." + + class Validator(config_key.GetKeysFrame): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + class list_keys_final: + get = Func() + self.list_keys_final = list_keys_final + get_modifiers = Func() + showerror = Mbox_func() + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = Tk() + cls.root.withdraw() + keylist = [['<Key-F12>'], ['<Control-Key-x>', '<Control-Key-X>']] + cls.dialog = cls.Validator(cls.root, '<<Test>>', keylist) + + @classmethod + def tearDownClass(cls): + del cls.dialog + cls.root.update_idletasks() + cls.root.destroy() + del cls.root + + def setUp(self): + self.dialog.showerror.message = '' + # A test that needs a particular final key value should set it. + # A test that sets a non-blank modifier list should reset it to []. + + def test_ok_empty(self): + self.dialog.key_string.set(' ') + self.dialog.ok() + self.assertEqual(self.dialog.result, '') + self.assertEqual(self.dialog.showerror.message, 'No key specified.') + + def test_ok_good(self): + self.dialog.key_string.set('<Key-F11>') + self.dialog.list_keys_final.get.result = 'F11' + self.dialog.ok() + self.assertEqual(self.dialog.result, '<Key-F11>') + self.assertEqual(self.dialog.showerror.message, '') + + def test_keys_no_ending(self): + self.assertFalse(self.dialog.keys_ok('<Control-Shift')) + self.assertIn('Missing the final', self.dialog.showerror.message) + + def test_keys_no_modifier_bad(self): + self.dialog.list_keys_final.get.result = 'A' + self.assertFalse(self.dialog.keys_ok('<Key-A>')) + self.assertIn('No modifier', self.dialog.showerror.message) + + def test_keys_no_modifier_ok(self): + self.dialog.list_keys_final.get.result = 'F11' + self.assertTrue(self.dialog.keys_ok('<Key-F11>')) + self.assertEqual(self.dialog.showerror.message, '') + + def test_keys_shift_bad(self): + self.dialog.list_keys_final.get.result = 'a' + self.dialog.get_modifiers.result = ['Shift'] + self.assertFalse(self.dialog.keys_ok('<a>')) + self.assertIn('shift modifier', self.dialog.showerror.message) + self.dialog.get_modifiers.result = [] + + def test_keys_dup(self): + for mods, final, seq in (([], 'F12', '<Key-F12>'), + (['Control'], 'x', '<Control-Key-x>'), + (['Control'], 'X', '<Control-Key-X>')): + with self.subTest(m=mods, f=final, s=seq): + self.dialog.list_keys_final.get.result = final + self.dialog.get_modifiers.result = mods + self.assertFalse(self.dialog.keys_ok(seq)) + self.assertIn('already in use', self.dialog.showerror.message) + self.dialog.get_modifiers.result = [] + + def test_bind_ok(self): + self.assertTrue(self.dialog.bind_ok('<Control-Shift-Key-a>')) + self.assertEqual(self.dialog.showerror.message, '') + + def test_bind_not_ok(self): + self.assertFalse(self.dialog.bind_ok('<Control-Shift>')) + self.assertIn('not accepted', self.dialog.showerror.message) + + +class ToggleLevelTest(unittest.TestCase): + "Test toggle between Basic and Advanced frames." + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = Tk() + cls.root.withdraw() + cls.dialog = config_key.GetKeysFrame(cls.root, '<<Test>>', []) + + @classmethod + def tearDownClass(cls): + del cls.dialog + cls.root.update_idletasks() + cls.root.destroy() + del cls.root + + def test_toggle_level(self): + dialog = self.dialog + + def stackorder(): + """Get the stack order of the children of the frame. + + winfo_children() stores the children in stack order, so + this can be used to check whether a frame is above or + below another one. + """ + for index, child in enumerate(dialog.winfo_children()): + if child._name == 'keyseq_basic': + basic = index + if child._name == 'keyseq_advanced': + advanced = index + return basic, advanced + + # New window starts at basic level. + self.assertFalse(dialog.advanced) + self.assertIn('Advanced', dialog.button_level['text']) + basic, advanced = stackorder() + self.assertGreater(basic, advanced) + + # Toggle to advanced. + dialog.toggle_level() + self.assertTrue(dialog.advanced) + self.assertIn('Basic', dialog.button_level['text']) + basic, advanced = stackorder() + self.assertGreater(advanced, basic) + + # Toggle to basic. + dialog.button_level.invoke() + self.assertFalse(dialog.advanced) + self.assertIn('Advanced', dialog.button_level['text']) + basic, advanced = stackorder() + self.assertGreater(basic, advanced) + + +class KeySelectionTest(unittest.TestCase): + "Test selecting key on Basic frames." + + class Basic(config_key.GetKeysFrame): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + class list_keys_final: + get = Func() + select_clear = Func() + yview = Func() + self.list_keys_final = list_keys_final + def set_modifiers_for_platform(self): + self.modifiers = ['foo', 'bar', 'BAZ'] + self.modifier_label = {'BAZ': 'ZZZ'} + showerror = Mbox_func() + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = Tk() + cls.root.withdraw() + cls.dialog = cls.Basic(cls.root, '<<Test>>', []) + + @classmethod + def tearDownClass(cls): + del cls.dialog + cls.root.update_idletasks() + cls.root.destroy() + del cls.root + + def setUp(self): + self.dialog.clear_key_seq() + + def test_get_modifiers(self): + dialog = self.dialog + gm = dialog.get_modifiers + eq = self.assertEqual + + # Modifiers are set on/off by invoking the checkbutton. + dialog.modifier_checkbuttons['foo'].invoke() + eq(gm(), ['foo']) + + dialog.modifier_checkbuttons['BAZ'].invoke() + eq(gm(), ['foo', 'BAZ']) + + dialog.modifier_checkbuttons['foo'].invoke() + eq(gm(), ['BAZ']) + + @mock.patch.object(config_key.GetKeysFrame, 'get_modifiers') + def test_build_key_string(self, mock_modifiers): + dialog = self.dialog + key = dialog.list_keys_final + string = dialog.key_string.get + eq = self.assertEqual + + key.get.result = 'a' + mock_modifiers.return_value = [] + dialog.build_key_string() + eq(string(), '<Key-a>') + + mock_modifiers.return_value = ['mymod'] + dialog.build_key_string() + eq(string(), '<mymod-Key-a>') + + key.get.result = '' + mock_modifiers.return_value = ['mymod', 'test'] + dialog.build_key_string() + eq(string(), '<mymod-test>') + + @mock.patch.object(config_key.GetKeysFrame, 'get_modifiers') + def test_final_key_selected(self, mock_modifiers): + dialog = self.dialog + key = dialog.list_keys_final + string = dialog.key_string.get + eq = self.assertEqual + + mock_modifiers.return_value = ['Shift'] + key.get.result = '{' + dialog.final_key_selected() + eq(string(), '<Shift-Key-braceleft>') + + +class CancelWindowTest(unittest.TestCase): + "Simulate user clicking [Cancel] button." + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = Tk() + cls.root.withdraw() + cls.dialog = config_key.GetKeysWindow( + cls.root, 'Title', '<<Test>>', [], _utest=True) + + @classmethod + def tearDownClass(cls): + cls.dialog.cancel() + del cls.dialog + cls.root.update_idletasks() + cls.root.destroy() + del cls.root + + @mock.patch.object(config_key.GetKeysFrame, 'ok') + def test_cancel(self, mock_frame_ok): + self.assertEqual(self.dialog.winfo_class(), 'Toplevel') + self.dialog.button_cancel.invoke() + with self.assertRaises(TclError): + self.dialog.winfo_class() + self.assertEqual(self.dialog.result, '') + mock_frame_ok.assert_not_called() + + +class OKWindowTest(unittest.TestCase): + "Simulate user clicking [OK] button." + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = Tk() + cls.root.withdraw() + cls.dialog = config_key.GetKeysWindow( + cls.root, 'Title', '<<Test>>', [], _utest=True) + + @classmethod + def tearDownClass(cls): + cls.dialog.cancel() + del cls.dialog + cls.root.update_idletasks() + cls.root.destroy() + del cls.root + + @mock.patch.object(config_key.GetKeysFrame, 'ok') + def test_ok(self, mock_frame_ok): + self.assertEqual(self.dialog.winfo_class(), 'Toplevel') + self.dialog.button_ok.invoke() + with self.assertRaises(TclError): + self.dialog.winfo_class() + mock_frame_ok.assert_called() + + +class WindowResultTest(unittest.TestCase): + "Test window result get and set." + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = Tk() + cls.root.withdraw() + cls.dialog = config_key.GetKeysWindow( + cls.root, 'Title', '<<Test>>', [], _utest=True) + + @classmethod + def tearDownClass(cls): + cls.dialog.cancel() + del cls.dialog + cls.root.update_idletasks() + cls.root.destroy() + del cls.root + + def test_result(self): + dialog = self.dialog + eq = self.assertEqual + + dialog.result = '' + eq(dialog.result, '') + eq(dialog.frame.result,'') + + dialog.result = 'bar' + eq(dialog.result,'bar') + eq(dialog.frame.result,'bar') + + dialog.frame.result = 'foo' + eq(dialog.result, 'foo') + eq(dialog.frame.result,'foo') + + +class HelperTest(unittest.TestCase): + "Test module level helper functions." + + def test_translate_key(self): + tr = config_key.translate_key + eq = self.assertEqual + + # Letters return unchanged with no 'Shift'. + eq(tr('q', []), 'Key-q') + eq(tr('q', ['Control', 'Alt']), 'Key-q') + + # 'Shift' uppercases single lowercase letters. + eq(tr('q', ['Shift']), 'Key-Q') + eq(tr('q', ['Control', 'Shift']), 'Key-Q') + eq(tr('q', ['Control', 'Alt', 'Shift']), 'Key-Q') + + # Convert key name to keysym. + eq(tr('Page Up', []), 'Key-Prior') + # 'Shift' doesn't change case when it's not a single char. + eq(tr('*', ['Shift']), 'Key-asterisk') + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_configdialog.py b/Lib/idlelib/idle_test/test_configdialog.py new file mode 100644 index 000000000..2773ed7ce --- /dev/null +++ b/Lib/idlelib/idle_test/test_configdialog.py @@ -0,0 +1,1580 @@ +"""Test configdialog, coverage 94%. + +Half the class creates dialog, half works with user customizations. +""" +from idlelib import configdialog +from test.support import requires +requires('gui') +import unittest +from unittest import mock +from idlelib.idle_test.mock_idle import Func +from tkinter import (Tk, StringVar, IntVar, BooleanVar, DISABLED, NORMAL) +from idlelib import config +from idlelib.configdialog import idleConf, changes, tracers + +# Tests should not depend on fortuitous user configurations. +# They must not affect actual user .cfg files. +# Use solution from test_config: empty parsers with no filename. +usercfg = idleConf.userCfg +testcfg = { + 'main': config.IdleUserConfParser(''), + 'highlight': config.IdleUserConfParser(''), + 'keys': config.IdleUserConfParser(''), + 'extensions': config.IdleUserConfParser(''), +} + +root = None +dialog = None +mainpage = changes['main'] +highpage = changes['highlight'] +keyspage = changes['keys'] +extpage = changes['extensions'] + + +def setUpModule(): + global root, dialog + idleConf.userCfg = testcfg + root = Tk() + # root.withdraw() # Comment out, see issue 30870 + dialog = configdialog.ConfigDialog(root, 'Test', _utest=True) + + +def tearDownModule(): + global root, dialog + idleConf.userCfg = usercfg + tracers.detach() + tracers.clear() + changes.clear() + root.update_idletasks() + root.destroy() + root = dialog = None + + +class ConfigDialogTest(unittest.TestCase): + + def test_deactivate_current_config(self): + pass + + def activate_config_changes(self): + pass + + +class ButtonTest(unittest.TestCase): + + def test_click_ok(self): + d = dialog + apply = d.apply = mock.Mock() + destroy = d.destroy = mock.Mock() + d.buttons['Ok'].invoke() + apply.assert_called_once() + destroy.assert_called_once() + del d.destroy, d.apply + + def test_click_apply(self): + d = dialog + deactivate = d.deactivate_current_config = mock.Mock() + save_ext = d.extpage.save_all_changed_extensions = mock.Mock() + activate = d.activate_config_changes = mock.Mock() + d.buttons['Apply'].invoke() + deactivate.assert_called_once() + save_ext.assert_called_once() + activate.assert_called_once() + del d.extpage.save_all_changed_extensions + del d.activate_config_changes, d.deactivate_current_config + + def test_click_cancel(self): + d = dialog + d.destroy = Func() + changes['main']['something'] = 1 + d.buttons['Cancel'].invoke() + self.assertEqual(changes['main'], {}) + self.assertEqual(d.destroy.called, 1) + del d.destroy + + def test_click_help(self): + dialog.note.select(dialog.keyspage) + with mock.patch.object(configdialog, 'view_text', + new_callable=Func) as view: + dialog.buttons['Help'].invoke() + title, contents = view.kwds['title'], view.kwds['contents'] + self.assertEqual(title, 'Help for IDLE preferences') + self.assertStartsWith(contents, 'When you click') + self.assertEndsWith(contents,'a different name.\n') + + +class FontPageTest(unittest.TestCase): + """Test that font widgets enable users to make font changes. + + Test that widget actions set vars, that var changes add three + options to changes and call set_samples, and that set_samples + changes the font of both sample boxes. + """ + @classmethod + def setUpClass(cls): + page = cls.page = dialog.fontpage + dialog.note.select(page) + page.set_samples = Func() # Mask instance method. + page.update() + + @classmethod + def tearDownClass(cls): + del cls.page.set_samples # Unmask instance method. + + def setUp(self): + changes.clear() + + def test_load_font_cfg(self): + # Leave widget load test to human visual check. + # TODO Improve checks when add IdleConf.get_font_values. + tracers.detach() + d = self.page + d.font_name.set('Fake') + d.font_size.set('1') + d.font_bold.set(True) + d.set_samples.called = 0 + d.load_font_cfg() + self.assertNotEqual(d.font_name.get(), 'Fake') + self.assertNotEqual(d.font_size.get(), '1') + self.assertFalse(d.font_bold.get()) + self.assertEqual(d.set_samples.called, 1) + tracers.attach() + + def test_fontlist_key(self): + # Up and Down keys should select a new font. + d = self.page + if d.fontlist.size() < 2: + self.skipTest('need at least 2 fonts') + fontlist = d.fontlist + fontlist.activate(0) + font = d.fontlist.get('active') + + # Test Down key. + fontlist.focus_force() + fontlist.update() + fontlist.event_generate('<Key-Down>') + fontlist.event_generate('<KeyRelease-Down>') + + down_font = fontlist.get('active') + self.assertNotEqual(down_font, font) + self.assertIn(d.font_name.get(), down_font.lower()) + + # Test Up key. + fontlist.focus_force() + fontlist.update() + fontlist.event_generate('<Key-Up>') + fontlist.event_generate('<KeyRelease-Up>') + + up_font = fontlist.get('active') + self.assertEqual(up_font, font) + self.assertIn(d.font_name.get(), up_font.lower()) + + def test_fontlist_mouse(self): + # Click on item should select that item. + d = self.page + if d.fontlist.size() < 2: + self.skipTest('need at least 2 fonts') + fontlist = d.fontlist + fontlist.activate(0) + + # Select next item in listbox + fontlist.focus_force() + fontlist.see(1) + fontlist.update() + x, y, dx, dy = fontlist.bbox(1) + x += dx // 2 + y += dy // 2 + fontlist.event_generate('<Button-1>', x=x, y=y) + fontlist.event_generate('<ButtonRelease-1>', x=x, y=y) + + font1 = fontlist.get(1) + select_font = fontlist.get('anchor') + self.assertEqual(select_font, font1) + self.assertIn(d.font_name.get(), font1.lower()) + + def test_sizelist(self): + # Click on number should select that number + d = self.page + d.sizelist.variable.set(40) + self.assertEqual(d.font_size.get(), '40') + + def test_bold_toggle(self): + # Click on checkbutton should invert it. + d = self.page + d.font_bold.set(False) + d.bold_toggle.invoke() + self.assertTrue(d.font_bold.get()) + d.bold_toggle.invoke() + self.assertFalse(d.font_bold.get()) + + def test_font_set(self): + # Test that setting a font Variable results in 3 provisional + # change entries and a call to set_samples. Use values sure to + # not be defaults. + + default_font = idleConf.GetFont(root, 'main', 'EditorWindow') + default_size = str(default_font[1]) + default_bold = default_font[2] == 'bold' + d = self.page + d.font_size.set(default_size) + d.font_bold.set(default_bold) + d.set_samples.called = 0 + + d.font_name.set('Test Font') + expected = {'EditorWindow': {'font': 'Test Font', + 'font-size': default_size, + 'font-bold': str(default_bold)}} + self.assertEqual(mainpage, expected) + self.assertEqual(d.set_samples.called, 1) + changes.clear() + + d.font_size.set('20') + expected = {'EditorWindow': {'font': 'Test Font', + 'font-size': '20', + 'font-bold': str(default_bold)}} + self.assertEqual(mainpage, expected) + self.assertEqual(d.set_samples.called, 2) + changes.clear() + + d.font_bold.set(not default_bold) + expected = {'EditorWindow': {'font': 'Test Font', + 'font-size': '20', + 'font-bold': str(not default_bold)}} + self.assertEqual(mainpage, expected) + self.assertEqual(d.set_samples.called, 3) + + def test_set_samples(self): + d = self.page + del d.set_samples # Unmask method for test + orig_samples = d.font_sample, d.highlight_sample + d.font_sample, d.highlight_sample = {}, {} + d.font_name.set('test') + d.font_size.set('5') + d.font_bold.set(1) + expected = {'font': ('test', '5', 'bold')} + + # Test set_samples. + d.set_samples() + self.assertTrue(d.font_sample == d.highlight_sample == expected) + + d.font_sample, d.highlight_sample = orig_samples + d.set_samples = Func() # Re-mask for other tests. + + +class HighPageTest(unittest.TestCase): + """Test that highlight tab widgets enable users to make changes. + + Test that widget actions set vars, that var changes add + options to changes and that themes work correctly. + """ + + @classmethod + def setUpClass(cls): + page = cls.page = dialog.highpage + dialog.note.select(page) + page.set_theme_type = Func() + page.paint_theme_sample = Func() + page.set_highlight_target = Func() + page.set_color_sample = Func() + page.update() + + @classmethod + def tearDownClass(cls): + d = cls.page + del d.set_theme_type, d.paint_theme_sample + del d.set_highlight_target, d.set_color_sample + + def setUp(self): + d = self.page + # The following is needed for test_load_key_cfg, _delete_custom_keys. + # This may indicate a defect in some test or function. + for section in idleConf.GetSectionList('user', 'highlight'): + idleConf.userCfg['highlight'].remove_section(section) + changes.clear() + d.set_theme_type.called = 0 + d.paint_theme_sample.called = 0 + d.set_highlight_target.called = 0 + d.set_color_sample.called = 0 + + def test_load_theme_cfg(self): + tracers.detach() + d = self.page + eq = self.assertEqual + + # Use builtin theme with no user themes created. + idleConf.CurrentTheme = mock.Mock(return_value='IDLE Classic') + d.load_theme_cfg() + self.assertTrue(d.theme_source.get()) + # builtinlist sets variable builtin_name to the CurrentTheme default. + eq(d.builtin_name.get(), 'IDLE Classic') + eq(d.custom_name.get(), '- no custom themes -') + eq(d.custom_theme_on.state(), ('disabled',)) + eq(d.set_theme_type.called, 1) + eq(d.paint_theme_sample.called, 1) + eq(d.set_highlight_target.called, 1) + + # Builtin theme with non-empty user theme list. + idleConf.SetOption('highlight', 'test1', 'option', 'value') + idleConf.SetOption('highlight', 'test2', 'option2', 'value2') + d.load_theme_cfg() + eq(d.builtin_name.get(), 'IDLE Classic') + eq(d.custom_name.get(), 'test1') + eq(d.set_theme_type.called, 2) + eq(d.paint_theme_sample.called, 2) + eq(d.set_highlight_target.called, 2) + + # Use custom theme. + idleConf.CurrentTheme = mock.Mock(return_value='test2') + idleConf.SetOption('main', 'Theme', 'default', '0') + d.load_theme_cfg() + self.assertFalse(d.theme_source.get()) + eq(d.builtin_name.get(), 'IDLE Classic') + eq(d.custom_name.get(), 'test2') + eq(d.set_theme_type.called, 3) + eq(d.paint_theme_sample.called, 3) + eq(d.set_highlight_target.called, 3) + + del idleConf.CurrentTheme + tracers.attach() + + def test_theme_source(self): + eq = self.assertEqual + d = self.page + # Test these separately. + d.var_changed_builtin_name = Func() + d.var_changed_custom_name = Func() + # Builtin selected. + d.builtin_theme_on.invoke() + eq(mainpage, {'Theme': {'default': 'True'}}) + eq(d.var_changed_builtin_name.called, 1) + eq(d.var_changed_custom_name.called, 0) + changes.clear() + + # Custom selected. + d.custom_theme_on.state(('!disabled',)) + d.custom_theme_on.invoke() + self.assertEqual(mainpage, {'Theme': {'default': 'False'}}) + eq(d.var_changed_builtin_name.called, 1) + eq(d.var_changed_custom_name.called, 1) + del d.var_changed_builtin_name, d.var_changed_custom_name + + def test_builtin_name(self): + eq = self.assertEqual + d = self.page + item_list = ['IDLE Classic', 'IDLE Dark', 'IDLE New'] + + # Not in old_themes, defaults name to first item. + idleConf.SetOption('main', 'Theme', 'name', 'spam') + d.builtinlist.SetMenu(item_list, 'IDLE Dark') + eq(mainpage, {'Theme': {'name': 'IDLE Classic', + 'name2': 'IDLE Dark'}}) + eq(d.theme_message['text'], 'New theme, see Help') + eq(d.paint_theme_sample.called, 1) + + # Not in old themes - uses name2. + changes.clear() + idleConf.SetOption('main', 'Theme', 'name', 'IDLE New') + d.builtinlist.SetMenu(item_list, 'IDLE Dark') + eq(mainpage, {'Theme': {'name2': 'IDLE Dark'}}) + eq(d.theme_message['text'], 'New theme, see Help') + eq(d.paint_theme_sample.called, 2) + + # Builtin name in old_themes. + changes.clear() + d.builtinlist.SetMenu(item_list, 'IDLE Classic') + eq(mainpage, {'Theme': {'name': 'IDLE Classic', 'name2': ''}}) + eq(d.theme_message['text'], '') + eq(d.paint_theme_sample.called, 3) + + def test_custom_name(self): + d = self.page + + # If no selections, doesn't get added. + d.customlist.SetMenu([], '- no custom themes -') + self.assertNotIn('Theme', mainpage) + self.assertEqual(d.paint_theme_sample.called, 0) + + # Custom name selected. + changes.clear() + d.customlist.SetMenu(['a', 'b', 'c'], 'c') + self.assertEqual(mainpage, {'Theme': {'name': 'c'}}) + self.assertEqual(d.paint_theme_sample.called, 1) + + def test_color(self): + d = self.page + d.on_new_color_set = Func() + # self.color is only set in get_color through colorchooser. + d.color.set('green') + self.assertEqual(d.on_new_color_set.called, 1) + del d.on_new_color_set + + def test_highlight_target_list_mouse(self): + # Set highlight_target through targetlist. + eq = self.assertEqual + d = self.page + + d.targetlist.SetMenu(['a', 'b', 'c'], 'c') + eq(d.highlight_target.get(), 'c') + eq(d.set_highlight_target.called, 1) + + def test_highlight_target_text_mouse(self): + # Set highlight_target through clicking highlight_sample. + eq = self.assertEqual + d = self.page + hs = d.highlight_sample + hs.focus_force() + + def click_char(index): + "Simulate click on character at *index*." + hs.see(index) + hs.update_idletasks() + x, y, dx, dy = hs.bbox(index) + x += dx // 2 + y += dy // 2 + hs.event_generate('<Enter>', x=0, y=0) + hs.event_generate('<Motion>', x=x, y=y) + hs.event_generate('<ButtonPress-1>', x=x, y=y) + hs.event_generate('<ButtonRelease-1>', x=x, y=y) + + # Reverse theme_elements to make the tag the key. + elem = {tag: element for element, tag in d.theme_elements.items()} + + # If highlight_sample has a tag that isn't in theme_elements, there + # will be a KeyError in the test run. + count = 0 + for tag in hs.tag_names(): + try: + click_char(hs.tag_nextrange(tag, "1.0")[0]) + eq(d.highlight_target.get(), elem[tag]) + count += 1 + eq(d.set_highlight_target.called, count) + except IndexError: + pass # Skip unused theme_elements tag, like 'sel'. + + def test_highlight_sample_double_click(self): + # Test double click on highlight_sample. + eq = self.assertEqual + d = self.page + + hs = d.highlight_sample + hs.focus_force() + hs.see(1.0) + hs.update_idletasks() + + # Test binding from configdialog. + hs.event_generate('<Enter>', x=0, y=0) + hs.event_generate('<Motion>', x=0, y=0) + # Double click is a sequence of two clicks in a row. + for _ in range(2): + hs.event_generate('<ButtonPress-1>', x=0, y=0) + hs.event_generate('<ButtonRelease-1>', x=0, y=0) + + eq(hs.tag_ranges('sel'), ()) + + def test_highlight_sample_b1_motion(self): + # Test button motion on highlight_sample. + eq = self.assertEqual + d = self.page + + hs = d.highlight_sample + hs.focus_force() + hs.see(1.0) + hs.update_idletasks() + + x, y, dx, dy, offset = hs.dlineinfo('1.0') + + # Test binding from configdialog. + hs.event_generate('<Leave>') + hs.event_generate('<Enter>') + hs.event_generate('<Motion>', x=x, y=y) + hs.event_generate('<ButtonPress-1>', x=x, y=y) + hs.event_generate('<B1-Motion>', x=dx, y=dy) + hs.event_generate('<ButtonRelease-1>', x=dx, y=dy) + + eq(hs.tag_ranges('sel'), ()) + + def test_set_theme_type(self): + eq = self.assertEqual + d = self.page + del d.set_theme_type + + # Builtin theme selected. + d.theme_source.set(True) + d.set_theme_type() + eq(d.builtinlist['state'], NORMAL) + eq(d.customlist['state'], DISABLED) + eq(d.button_delete_custom.state(), ('disabled',)) + + # Custom theme selected. + d.theme_source.set(False) + d.set_theme_type() + eq(d.builtinlist['state'], DISABLED) + eq(d.custom_theme_on.state(), ('selected',)) + eq(d.customlist['state'], NORMAL) + eq(d.button_delete_custom.state(), ()) + d.set_theme_type = Func() + + def test_get_color(self): + eq = self.assertEqual + d = self.page + orig_chooser = configdialog.colorchooser.askcolor + chooser = configdialog.colorchooser.askcolor = Func() + gntn = d.get_new_theme_name = Func() + + d.highlight_target.set('Editor Breakpoint') + d.color.set('#ffffff') + + # Nothing selected. + chooser.result = (None, None) + d.button_set_color.invoke() + eq(d.color.get(), '#ffffff') + + # Selection same as previous color. + chooser.result = ('', d.style.lookup(d.frame_color_set['style'], 'background')) + d.button_set_color.invoke() + eq(d.color.get(), '#ffffff') + + # Select different color. + chooser.result = ((222.8671875, 0.0, 0.0), '#de0000') + + # Default theme. + d.color.set('#ffffff') + d.theme_source.set(True) + + # No theme name selected therefore color not saved. + gntn.result = '' + d.button_set_color.invoke() + eq(gntn.called, 1) + eq(d.color.get(), '#ffffff') + # Theme name selected. + gntn.result = 'My New Theme' + d.button_set_color.invoke() + eq(d.custom_name.get(), gntn.result) + eq(d.color.get(), '#de0000') + + # Custom theme. + d.color.set('#ffffff') + d.theme_source.set(False) + d.button_set_color.invoke() + eq(d.color.get(), '#de0000') + + del d.get_new_theme_name + configdialog.colorchooser.askcolor = orig_chooser + + def test_on_new_color_set(self): + d = self.page + color = '#3f7cae' + d.custom_name.set('Python') + d.highlight_target.set('Selected Text') + d.fg_bg_toggle.set(True) + + d.color.set(color) + self.assertEqual(d.style.lookup(d.frame_color_set['style'], 'background'), color) + self.assertEqual(d.highlight_sample.tag_cget('hilite', 'foreground'), color) + self.assertEqual(highpage, + {'Python': {'hilite-foreground': color}}) + + def test_get_new_theme_name(self): + orig_sectionname = configdialog.SectionName + sn = configdialog.SectionName = Func(return_self=True) + d = self.page + + sn.result = 'New Theme' + self.assertEqual(d.get_new_theme_name(''), 'New Theme') + + configdialog.SectionName = orig_sectionname + + def test_save_as_new_theme(self): + d = self.page + gntn = d.get_new_theme_name = Func() + d.theme_source.set(True) + + # No name entered. + gntn.result = '' + d.button_save_custom.invoke() + self.assertNotIn(gntn.result, idleConf.userCfg['highlight']) + + # Name entered. + gntn.result = 'my new theme' + gntn.called = 0 + self.assertNotIn(gntn.result, idleConf.userCfg['highlight']) + d.button_save_custom.invoke() + self.assertIn(gntn.result, idleConf.userCfg['highlight']) + + del d.get_new_theme_name + + def test_create_new_and_save_new(self): + eq = self.assertEqual + d = self.page + + # Use default as previously active theme. + d.theme_source.set(True) + d.builtin_name.set('IDLE Classic') + first_new = 'my new custom theme' + second_new = 'my second custom theme' + + # No changes, so themes are an exact copy. + self.assertNotIn(first_new, idleConf.userCfg) + d.create_new(first_new) + eq(idleConf.GetSectionList('user', 'highlight'), [first_new]) + eq(idleConf.GetThemeDict('default', 'IDLE Classic'), + idleConf.GetThemeDict('user', first_new)) + eq(d.custom_name.get(), first_new) + self.assertFalse(d.theme_source.get()) # Use custom set. + eq(d.set_theme_type.called, 1) + + # Test that changed targets are in new theme. + changes.add_option('highlight', first_new, 'hit-background', 'yellow') + self.assertNotIn(second_new, idleConf.userCfg) + d.create_new(second_new) + eq(idleConf.GetSectionList('user', 'highlight'), [first_new, second_new]) + self.assertNotEqual(idleConf.GetThemeDict('user', first_new), + idleConf.GetThemeDict('user', second_new)) + # Check that difference in themes was in `hit-background` from `changes`. + idleConf.SetOption('highlight', first_new, 'hit-background', 'yellow') + eq(idleConf.GetThemeDict('user', first_new), + idleConf.GetThemeDict('user', second_new)) + + def test_set_highlight_target(self): + eq = self.assertEqual + d = self.page + del d.set_highlight_target + + # Target is cursor. + d.highlight_target.set('Cursor') + eq(d.fg_on.state(), ('disabled', 'selected')) + eq(d.bg_on.state(), ('disabled',)) + self.assertTrue(d.fg_bg_toggle) + eq(d.set_color_sample.called, 1) + + # Target is not cursor. + d.highlight_target.set('Comment') + eq(d.fg_on.state(), ('selected',)) + eq(d.bg_on.state(), ()) + self.assertTrue(d.fg_bg_toggle) + eq(d.set_color_sample.called, 2) + + d.set_highlight_target = Func() + + def test_set_color_sample_binding(self): + d = self.page + scs = d.set_color_sample + + d.fg_on.invoke() + self.assertEqual(scs.called, 1) + + d.bg_on.invoke() + self.assertEqual(scs.called, 2) + + def test_set_color_sample(self): + d = self.page + del d.set_color_sample + d.highlight_target.set('Selected Text') + d.fg_bg_toggle.set(True) + d.set_color_sample() + self.assertEqual( + d.style.lookup(d.frame_color_set['style'], 'background'), + d.highlight_sample.tag_cget('hilite', 'foreground')) + d.set_color_sample = Func() + + def test_paint_theme_sample(self): + eq = self.assertEqual + page = self.page + del page.paint_theme_sample # Delete masking mock. + hs_tag = page.highlight_sample.tag_cget + gh = idleConf.GetHighlight + + # Create custom theme based on IDLE Dark. + page.theme_source.set(True) + page.builtin_name.set('IDLE Dark') + theme = 'IDLE Test' + page.create_new(theme) + page.set_color_sample.called = 0 + + # Base theme with nothing in `changes`. + page.paint_theme_sample() + new_console = {'foreground': 'blue', + 'background': 'yellow',} + for key, value in new_console.items(): + self.assertNotEqual(hs_tag('console', key), value) + eq(page.set_color_sample.called, 1) + + # Apply changes. + for key, value in new_console.items(): + changes.add_option('highlight', theme, 'console-'+key, value) + page.paint_theme_sample() + for key, value in new_console.items(): + eq(hs_tag('console', key), value) + eq(page.set_color_sample.called, 2) + + page.paint_theme_sample = Func() + + def test_delete_custom(self): + eq = self.assertEqual + d = self.page + d.button_delete_custom.state(('!disabled',)) + yesno = d.askyesno = Func() + dialog.deactivate_current_config = Func() + dialog.activate_config_changes = Func() + + theme_name = 'spam theme' + idleConf.userCfg['highlight'].SetOption(theme_name, 'name', 'value') + highpage[theme_name] = {'option': 'True'} + + theme_name2 = 'other theme' + idleConf.userCfg['highlight'].SetOption(theme_name2, 'name', 'value') + highpage[theme_name2] = {'option': 'False'} + + # Force custom theme. + d.custom_theme_on.state(('!disabled',)) + d.custom_theme_on.invoke() + d.custom_name.set(theme_name) + + # Cancel deletion. + yesno.result = False + d.button_delete_custom.invoke() + eq(yesno.called, 1) + eq(highpage[theme_name], {'option': 'True'}) + eq(idleConf.GetSectionList('user', 'highlight'), [theme_name, theme_name2]) + eq(dialog.deactivate_current_config.called, 0) + eq(dialog.activate_config_changes.called, 0) + eq(d.set_theme_type.called, 0) + + # Confirm deletion. + yesno.result = True + d.button_delete_custom.invoke() + eq(yesno.called, 2) + self.assertNotIn(theme_name, highpage) + eq(idleConf.GetSectionList('user', 'highlight'), [theme_name2]) + eq(d.custom_theme_on.state(), ()) + eq(d.custom_name.get(), theme_name2) + eq(dialog.deactivate_current_config.called, 1) + eq(dialog.activate_config_changes.called, 1) + eq(d.set_theme_type.called, 1) + + # Confirm deletion of second theme - empties list. + d.custom_name.set(theme_name2) + yesno.result = True + d.button_delete_custom.invoke() + eq(yesno.called, 3) + self.assertNotIn(theme_name, highpage) + eq(idleConf.GetSectionList('user', 'highlight'), []) + eq(d.custom_theme_on.state(), ('disabled',)) + eq(d.custom_name.get(), '- no custom themes -') + eq(dialog.deactivate_current_config.called, 2) + eq(dialog.activate_config_changes.called, 2) + eq(d.set_theme_type.called, 2) + + del dialog.activate_config_changes, dialog.deactivate_current_config + del d.askyesno + + +class KeysPageTest(unittest.TestCase): + """Test that keys tab widgets enable users to make changes. + + Test that widget actions set vars, that var changes add + options to changes and that key sets works correctly. + """ + + @classmethod + def setUpClass(cls): + page = cls.page = dialog.keyspage + dialog.note.select(page) + page.set_keys_type = Func() + page.load_keys_list = Func() + + @classmethod + def tearDownClass(cls): + page = cls.page + del page.set_keys_type, page.load_keys_list + + def setUp(self): + d = self.page + # The following is needed for test_load_key_cfg, _delete_custom_keys. + # This may indicate a defect in some test or function. + for section in idleConf.GetSectionList('user', 'keys'): + idleConf.userCfg['keys'].remove_section(section) + changes.clear() + d.set_keys_type.called = 0 + d.load_keys_list.called = 0 + + def test_load_key_cfg(self): + tracers.detach() + d = self.page + eq = self.assertEqual + + # Use builtin keyset with no user keysets created. + idleConf.CurrentKeys = mock.Mock(return_value='IDLE Classic OSX') + d.load_key_cfg() + self.assertTrue(d.keyset_source.get()) + # builtinlist sets variable builtin_name to the CurrentKeys default. + eq(d.builtin_name.get(), 'IDLE Classic OSX') + eq(d.custom_name.get(), '- no custom keys -') + eq(d.custom_keyset_on.state(), ('disabled',)) + eq(d.set_keys_type.called, 1) + eq(d.load_keys_list.called, 1) + eq(d.load_keys_list.args, ('IDLE Classic OSX', )) + + # Builtin keyset with non-empty user keyset list. + idleConf.SetOption('keys', 'test1', 'option', 'value') + idleConf.SetOption('keys', 'test2', 'option2', 'value2') + d.load_key_cfg() + eq(d.builtin_name.get(), 'IDLE Classic OSX') + eq(d.custom_name.get(), 'test1') + eq(d.set_keys_type.called, 2) + eq(d.load_keys_list.called, 2) + eq(d.load_keys_list.args, ('IDLE Classic OSX', )) + + # Use custom keyset. + idleConf.CurrentKeys = mock.Mock(return_value='test2') + idleConf.default_keys = mock.Mock(return_value='IDLE Modern Unix') + idleConf.SetOption('main', 'Keys', 'default', '0') + d.load_key_cfg() + self.assertFalse(d.keyset_source.get()) + eq(d.builtin_name.get(), 'IDLE Modern Unix') + eq(d.custom_name.get(), 'test2') + eq(d.set_keys_type.called, 3) + eq(d.load_keys_list.called, 3) + eq(d.load_keys_list.args, ('test2', )) + + del idleConf.CurrentKeys, idleConf.default_keys + tracers.attach() + + def test_keyset_source(self): + eq = self.assertEqual + d = self.page + # Test these separately. + d.var_changed_builtin_name = Func() + d.var_changed_custom_name = Func() + # Builtin selected. + d.builtin_keyset_on.invoke() + eq(mainpage, {'Keys': {'default': 'True'}}) + eq(d.var_changed_builtin_name.called, 1) + eq(d.var_changed_custom_name.called, 0) + changes.clear() + + # Custom selected. + d.custom_keyset_on.state(('!disabled',)) + d.custom_keyset_on.invoke() + self.assertEqual(mainpage, {'Keys': {'default': 'False'}}) + eq(d.var_changed_builtin_name.called, 1) + eq(d.var_changed_custom_name.called, 1) + del d.var_changed_builtin_name, d.var_changed_custom_name + + def test_builtin_name(self): + eq = self.assertEqual + d = self.page + idleConf.userCfg['main'].remove_section('Keys') + item_list = ['IDLE Classic Windows', 'IDLE Classic OSX', + 'IDLE Modern UNIX'] + + # Not in old_keys, defaults name to first item. + d.builtinlist.SetMenu(item_list, 'IDLE Modern UNIX') + eq(mainpage, {'Keys': {'name': 'IDLE Classic Windows', + 'name2': 'IDLE Modern UNIX'}}) + eq(d.keys_message['text'], 'New key set, see Help') + eq(d.load_keys_list.called, 1) + eq(d.load_keys_list.args, ('IDLE Modern UNIX', )) + + # Not in old keys - uses name2. + changes.clear() + idleConf.SetOption('main', 'Keys', 'name', 'IDLE Classic Unix') + d.builtinlist.SetMenu(item_list, 'IDLE Modern UNIX') + eq(mainpage, {'Keys': {'name2': 'IDLE Modern UNIX'}}) + eq(d.keys_message['text'], 'New key set, see Help') + eq(d.load_keys_list.called, 2) + eq(d.load_keys_list.args, ('IDLE Modern UNIX', )) + + # Builtin name in old_keys. + changes.clear() + d.builtinlist.SetMenu(item_list, 'IDLE Classic OSX') + eq(mainpage, {'Keys': {'name': 'IDLE Classic OSX', 'name2': ''}}) + eq(d.keys_message['text'], '') + eq(d.load_keys_list.called, 3) + eq(d.load_keys_list.args, ('IDLE Classic OSX', )) + + def test_custom_name(self): + d = self.page + + # If no selections, doesn't get added. + d.customlist.SetMenu([], '- no custom keys -') + self.assertNotIn('Keys', mainpage) + self.assertEqual(d.load_keys_list.called, 0) + + # Custom name selected. + changes.clear() + d.customlist.SetMenu(['a', 'b', 'c'], 'c') + self.assertEqual(mainpage, {'Keys': {'name': 'c'}}) + self.assertEqual(d.load_keys_list.called, 1) + + def test_keybinding(self): + idleConf.SetOption('extensions', 'ZzDummy', 'enable', 'True') + d = self.page + d.custom_name.set('my custom keys') + d.bindingslist.delete(0, 'end') + d.bindingslist.insert(0, 'copy') + d.bindingslist.insert(1, 'z-in') + d.bindingslist.selection_set(0) + d.bindingslist.selection_anchor(0) + # Core binding - adds to keys. + d.keybinding.set('<Key-F11>') + self.assertEqual(keyspage, + {'my custom keys': {'copy': '<Key-F11>'}}) + + # Not a core binding - adds to extensions. + d.bindingslist.selection_set(1) + d.bindingslist.selection_anchor(1) + d.keybinding.set('<Key-F11>') + self.assertEqual(extpage, + {'ZzDummy_cfgBindings': {'z-in': '<Key-F11>'}}) + + def test_set_keys_type(self): + eq = self.assertEqual + d = self.page + del d.set_keys_type + + # Builtin keyset selected. + d.keyset_source.set(True) + d.set_keys_type() + eq(d.builtinlist['state'], NORMAL) + eq(d.customlist['state'], DISABLED) + eq(d.button_delete_custom_keys.state(), ('disabled',)) + + # Custom keyset selected. + d.keyset_source.set(False) + d.set_keys_type() + eq(d.builtinlist['state'], DISABLED) + eq(d.custom_keyset_on.state(), ('selected',)) + eq(d.customlist['state'], NORMAL) + eq(d.button_delete_custom_keys.state(), ()) + d.set_keys_type = Func() + + def test_get_new_keys(self): + eq = self.assertEqual + d = self.page + orig_getkeysdialog = configdialog.GetKeysWindow + gkd = configdialog.GetKeysWindow = Func(return_self=True) + gnkn = d.get_new_keys_name = Func() + + d.button_new_keys.state(('!disabled',)) + d.bindingslist.delete(0, 'end') + d.bindingslist.insert(0, 'copy - <Control-Shift-Key-C>') + d.bindingslist.selection_set(0) + d.bindingslist.selection_anchor(0) + d.keybinding.set('Key-a') + d.keyset_source.set(True) # Default keyset. + + # Default keyset; no change to binding. + gkd.result = '' + d.button_new_keys.invoke() + eq(d.bindingslist.get('anchor'), 'copy - <Control-Shift-Key-C>') + # Keybinding isn't changed when there isn't a change entered. + eq(d.keybinding.get(), 'Key-a') + + # Default keyset; binding changed. + gkd.result = '<Key-F11>' + # No keyset name selected therefore binding not saved. + gnkn.result = '' + d.button_new_keys.invoke() + eq(gnkn.called, 1) + eq(d.bindingslist.get('anchor'), 'copy - <Control-Shift-Key-C>') + # Keyset name selected. + gnkn.result = 'My New Key Set' + d.button_new_keys.invoke() + eq(d.custom_name.get(), gnkn.result) + eq(d.bindingslist.get('anchor'), 'copy - <Key-F11>') + eq(d.keybinding.get(), '<Key-F11>') + + # User keyset; binding changed. + d.keyset_source.set(False) # Custom keyset. + gnkn.called = 0 + gkd.result = '<Key-p>' + d.button_new_keys.invoke() + eq(gnkn.called, 0) + eq(d.bindingslist.get('anchor'), 'copy - <Key-p>') + eq(d.keybinding.get(), '<Key-p>') + + del d.get_new_keys_name + configdialog.GetKeysWindow = orig_getkeysdialog + + def test_get_new_keys_name(self): + orig_sectionname = configdialog.SectionName + sn = configdialog.SectionName = Func(return_self=True) + d = self.page + + sn.result = 'New Keys' + self.assertEqual(d.get_new_keys_name(''), 'New Keys') + + configdialog.SectionName = orig_sectionname + + def test_save_as_new_key_set(self): + d = self.page + gnkn = d.get_new_keys_name = Func() + d.keyset_source.set(True) + + # No name entered. + gnkn.result = '' + d.button_save_custom_keys.invoke() + + # Name entered. + gnkn.result = 'my new key set' + gnkn.called = 0 + self.assertNotIn(gnkn.result, idleConf.userCfg['keys']) + d.button_save_custom_keys.invoke() + self.assertIn(gnkn.result, idleConf.userCfg['keys']) + + del d.get_new_keys_name + + def test_on_bindingslist_select(self): + d = self.page + b = d.bindingslist + b.delete(0, 'end') + b.insert(0, 'copy') + b.insert(1, 'find') + b.activate(0) + + b.focus_force() + b.see(1) + b.update() + x, y, dx, dy = b.bbox(1) + x += dx // 2 + y += dy // 2 + b.event_generate('<Enter>', x=0, y=0) + b.event_generate('<Motion>', x=x, y=y) + b.event_generate('<Button-1>', x=x, y=y) + b.event_generate('<ButtonRelease-1>', x=x, y=y) + self.assertEqual(b.get('anchor'), 'find') + self.assertEqual(d.button_new_keys.state(), ()) + + def test_create_new_key_set_and_save_new_key_set(self): + eq = self.assertEqual + d = self.page + + # Use default as previously active keyset. + d.keyset_source.set(True) + d.builtin_name.set('IDLE Classic Windows') + first_new = 'my new custom key set' + second_new = 'my second custom keyset' + + # No changes, so keysets are an exact copy. + self.assertNotIn(first_new, idleConf.userCfg) + d.create_new_key_set(first_new) + eq(idleConf.GetSectionList('user', 'keys'), [first_new]) + eq(idleConf.GetKeySet('IDLE Classic Windows'), + idleConf.GetKeySet(first_new)) + eq(d.custom_name.get(), first_new) + self.assertFalse(d.keyset_source.get()) # Use custom set. + eq(d.set_keys_type.called, 1) + + # Test that changed keybindings are in new keyset. + changes.add_option('keys', first_new, 'copy', '<Key-F11>') + self.assertNotIn(second_new, idleConf.userCfg) + d.create_new_key_set(second_new) + eq(idleConf.GetSectionList('user', 'keys'), [first_new, second_new]) + self.assertNotEqual(idleConf.GetKeySet(first_new), + idleConf.GetKeySet(second_new)) + # Check that difference in keysets was in option `copy` from `changes`. + idleConf.SetOption('keys', first_new, 'copy', '<Key-F11>') + eq(idleConf.GetKeySet(first_new), idleConf.GetKeySet(second_new)) + + def test_load_keys_list(self): + eq = self.assertEqual + d = self.page + gks = idleConf.GetKeySet = Func() + del d.load_keys_list + b = d.bindingslist + + b.delete(0, 'end') + b.insert(0, '<<find>>') + b.insert(1, '<<help>>') + gks.result = {'<<copy>>': ['<Control-Key-c>', '<Control-Key-C>'], + '<<force-open-completions>>': ['<Control-Key-space>'], + '<<spam>>': ['<Key-F11>']} + changes.add_option('keys', 'my keys', 'spam', '<Shift-Key-a>') + expected = ('copy - <Control-Key-c> <Control-Key-C>', + 'force-open-completions - <Control-Key-space>', + 'spam - <Shift-Key-a>') + + # No current selection. + d.load_keys_list('my keys') + eq(b.get(0, 'end'), expected) + eq(b.get('anchor'), '') + eq(b.curselection(), ()) + + # Check selection. + b.selection_set(1) + b.selection_anchor(1) + d.load_keys_list('my keys') + eq(b.get(0, 'end'), expected) + eq(b.get('anchor'), 'force-open-completions - <Control-Key-space>') + eq(b.curselection(), (1, )) + + # Change selection. + b.selection_set(2) + b.selection_anchor(2) + d.load_keys_list('my keys') + eq(b.get(0, 'end'), expected) + eq(b.get('anchor'), 'spam - <Shift-Key-a>') + eq(b.curselection(), (2, )) + d.load_keys_list = Func() + + del idleConf.GetKeySet + + def test_delete_custom_keys(self): + eq = self.assertEqual + d = self.page + d.button_delete_custom_keys.state(('!disabled',)) + yesno = d.askyesno = Func() + dialog.deactivate_current_config = Func() + dialog.activate_config_changes = Func() + + keyset_name = 'spam key set' + idleConf.userCfg['keys'].SetOption(keyset_name, 'name', 'value') + keyspage[keyset_name] = {'option': 'True'} + + keyset_name2 = 'other key set' + idleConf.userCfg['keys'].SetOption(keyset_name2, 'name', 'value') + keyspage[keyset_name2] = {'option': 'False'} + + # Force custom keyset. + d.custom_keyset_on.state(('!disabled',)) + d.custom_keyset_on.invoke() + d.custom_name.set(keyset_name) + + # Cancel deletion. + yesno.result = False + d.button_delete_custom_keys.invoke() + eq(yesno.called, 1) + eq(keyspage[keyset_name], {'option': 'True'}) + eq(idleConf.GetSectionList('user', 'keys'), [keyset_name, keyset_name2]) + eq(dialog.deactivate_current_config.called, 0) + eq(dialog.activate_config_changes.called, 0) + eq(d.set_keys_type.called, 0) + + # Confirm deletion. + yesno.result = True + d.button_delete_custom_keys.invoke() + eq(yesno.called, 2) + self.assertNotIn(keyset_name, keyspage) + eq(idleConf.GetSectionList('user', 'keys'), [keyset_name2]) + eq(d.custom_keyset_on.state(), ()) + eq(d.custom_name.get(), keyset_name2) + eq(dialog.deactivate_current_config.called, 1) + eq(dialog.activate_config_changes.called, 1) + eq(d.set_keys_type.called, 1) + + # Confirm deletion of second keyset - empties list. + d.custom_name.set(keyset_name2) + yesno.result = True + d.button_delete_custom_keys.invoke() + eq(yesno.called, 3) + self.assertNotIn(keyset_name, keyspage) + eq(idleConf.GetSectionList('user', 'keys'), []) + eq(d.custom_keyset_on.state(), ('disabled',)) + eq(d.custom_name.get(), '- no custom keys -') + eq(dialog.deactivate_current_config.called, 2) + eq(dialog.activate_config_changes.called, 2) + eq(d.set_keys_type.called, 2) + + del dialog.activate_config_changes, dialog.deactivate_current_config + del d.askyesno + + +class WinPageTest(unittest.TestCase): + """Test that general tab widgets enable users to make changes. + + Test that widget actions set vars, that var changes add + options to changes. + """ + @classmethod + def setUpClass(cls): + page = cls.page = dialog.winpage + dialog.note.select(page) + page.update() + + def setUp(self): + changes.clear() + + def test_load_windows_cfg(self): + # Set to wrong values, load, check right values. + eq = self.assertEqual + d = self.page + d.startup_edit.set(1) + d.win_width.set(1) + d.win_height.set(1) + d.load_windows_cfg() + eq(d.startup_edit.get(), 0) + eq(d.win_width.get(), '80') + eq(d.win_height.get(), '40') + + def test_startup(self): + d = self.page + d.startup_editor_on.invoke() + self.assertEqual(mainpage, + {'General': {'editor-on-startup': '1'}}) + changes.clear() + d.startup_shell_on.invoke() + self.assertEqual(mainpage, + {'General': {'editor-on-startup': '0'}}) + + def test_editor_size(self): + d = self.page + d.win_height_int.delete(0, 'end') + d.win_height_int.insert(0, '11') + self.assertEqual(mainpage, {'EditorWindow': {'height': '11'}}) + changes.clear() + d.win_width_int.delete(0, 'end') + d.win_width_int.insert(0, '11') + self.assertEqual(mainpage, {'EditorWindow': {'width': '11'}}) + + def test_indent_spaces(self): + d = self.page + d.indent_chooser.set(6) + self.assertEqual(d.indent_spaces.get(), '6') + self.assertEqual(mainpage, {'Indent': {'num-spaces': '6'}}) + + def test_cursor_blink(self): + self.page.cursor_blink_bool.invoke() + self.assertEqual(mainpage, {'EditorWindow': {'cursor-blink': 'False'}}) + + def test_autocomplete_wait(self): + self.page.auto_wait_int.delete(0, 'end') + self.page.auto_wait_int.insert(0, '11') + self.assertEqual(extpage, {'AutoComplete': {'popupwait': '11'}}) + + def test_parenmatch(self): + d = self.page + eq = self.assertEqual + d.paren_style_type['menu'].invoke(0) + eq(extpage, {'ParenMatch': {'style': 'opener'}}) + changes.clear() + d.paren_flash_time.delete(0, 'end') + d.paren_flash_time.insert(0, '11') + eq(extpage, {'ParenMatch': {'flash-delay': '11'}}) + changes.clear() + d.bell_on.invoke() + eq(extpage, {'ParenMatch': {'bell': 'False'}}) + + def test_paragraph(self): + self.page.format_width_int.delete(0, 'end') + self.page.format_width_int.insert(0, '11') + self.assertEqual(extpage, {'FormatParagraph': {'max-width': '11'}}) + + +class ShedPageTest(unittest.TestCase): + """Test that shed tab widgets enable users to make changes. + + Test that widget actions set vars, that var changes add + options to changes. + """ + @classmethod + def setUpClass(cls): + page = cls.page = dialog.shedpage + dialog.note.select(page) + page.update() + + def setUp(self): + changes.clear() + + def test_load_shelled_cfg(self): + # Set to wrong values, load, check right values. + eq = self.assertEqual + d = self.page + d.autosave.set(1) + d.load_shelled_cfg() + eq(d.autosave.get(), 0) + + def test_autosave(self): + d = self.page + d.save_auto_on.invoke() + self.assertEqual(mainpage, {'General': {'autosave': '1'}}) + d.save_ask_on.invoke() + self.assertEqual(mainpage, {'General': {'autosave': '0'}}) + + def test_context(self): + self.page.context_int.delete(0, 'end') + self.page.context_int.insert(0, '1') + self.assertEqual(extpage, {'CodeContext': {'maxlines': '1'}}) + + +#unittest.skip("Nothing here yet TODO") +class ExtPageTest(unittest.TestCase): + """Test that the help source list works correctly.""" + @classmethod + def setUpClass(cls): + page = dialog.extpage + dialog.note.select(page) + + +class HelpSourceTest(unittest.TestCase): + """Test that the help source list works correctly.""" + @classmethod + def setUpClass(cls): + page = dialog.extpage + dialog.note.select(page) + frame = cls.frame = page.frame_help + frame.set = frame.set_add_delete_state = Func() + frame.upc = frame.update_help_changes = Func() + frame.update() + + @classmethod + def tearDownClass(cls): + frame = cls.frame + del frame.set, frame.set_add_delete_state + del frame.upc, frame.update_help_changes + frame.helplist.delete(0, 'end') + frame.user_helplist.clear() + + def setUp(self): + changes.clear() + + def test_load_helplist(self): + eq = self.assertEqual + fr = self.frame + fr.helplist.insert('end', 'bad') + fr.user_helplist = ['bad', 'worse'] + idleConf.SetOption('main', 'HelpFiles', '1', 'name;file') + fr.load_helplist() + eq(fr.helplist.get(0, 'end'), ('name',)) + eq(fr.user_helplist, [('name', 'file', '1')]) + + def test_source_selected(self): + fr = self.frame + fr.set = fr.set_add_delete_state + fr.upc = fr.update_help_changes + helplist = fr.helplist + dex = 'end' + helplist.insert(dex, 'source') + helplist.activate(dex) + + helplist.focus_force() + helplist.see(dex) + helplist.update() + x, y, dx, dy = helplist.bbox(dex) + x += dx // 2 + y += dy // 2 + fr.set.called = fr.upc.called = 0 + helplist.event_generate('<Enter>', x=0, y=0) + helplist.event_generate('<Motion>', x=x, y=y) + helplist.event_generate('<Button-1>', x=x, y=y) + helplist.event_generate('<ButtonRelease-1>', x=x, y=y) + self.assertEqual(helplist.get('anchor'), 'source') + self.assertTrue(fr.set.called) + self.assertFalse(fr.upc.called) + + def test_set_add_delete_state(self): + # Call with 0 items, 1 unselected item, 1 selected item. + eq = self.assertEqual + fr = self.frame + del fr.set_add_delete_state # Unmask method. + sad = fr.set_add_delete_state + h = fr.helplist + + h.delete(0, 'end') + sad() + eq(fr.button_helplist_edit.state(), ('disabled',)) + eq(fr.button_helplist_remove.state(), ('disabled',)) + + h.insert(0, 'source') + sad() + eq(fr.button_helplist_edit.state(), ('disabled',)) + eq(fr.button_helplist_remove.state(), ('disabled',)) + + h.selection_set(0) + sad() + eq(fr.button_helplist_edit.state(), ()) + eq(fr.button_helplist_remove.state(), ()) + fr.set_add_delete_state = Func() # Mask method. + + def test_helplist_item_add(self): + # Call without and twice with HelpSource result. + # Double call enables check on order. + eq = self.assertEqual + orig_helpsource = configdialog.HelpSource + hs = configdialog.HelpSource = Func(return_self=True) + fr = self.frame + fr.helplist.delete(0, 'end') + fr.user_helplist.clear() + fr.set.called = fr.upc.called = 0 + + hs.result = '' + fr.helplist_item_add() + self.assertTrue(list(fr.helplist.get(0, 'end')) == + fr.user_helplist == []) + self.assertFalse(fr.upc.called) + + hs.result = ('name1', 'file1') + fr.helplist_item_add() + hs.result = ('name2', 'file2') + fr.helplist_item_add() + eq(fr.helplist.get(0, 'end'), ('name1', 'name2')) + eq(fr.user_helplist, [('name1', 'file1'), ('name2', 'file2')]) + eq(fr.upc.called, 2) + self.assertFalse(fr.set.called) + + configdialog.HelpSource = orig_helpsource + + def test_helplist_item_edit(self): + # Call without and with HelpSource change. + eq = self.assertEqual + orig_helpsource = configdialog.HelpSource + hs = configdialog.HelpSource = Func(return_self=True) + fr = self.frame + fr.helplist.delete(0, 'end') + fr.helplist.insert(0, 'name1') + fr.helplist.selection_set(0) + fr.helplist.selection_anchor(0) + fr.user_helplist.clear() + fr.user_helplist.append(('name1', 'file1')) + fr.set.called = fr.upc.called = 0 + + hs.result = '' + fr.helplist_item_edit() + hs.result = ('name1', 'file1') + fr.helplist_item_edit() + eq(fr.helplist.get(0, 'end'), ('name1',)) + eq(fr.user_helplist, [('name1', 'file1')]) + self.assertFalse(fr.upc.called) + + hs.result = ('name2', 'file2') + fr.helplist_item_edit() + eq(fr.helplist.get(0, 'end'), ('name2',)) + eq(fr.user_helplist, [('name2', 'file2')]) + self.assertTrue(fr.upc.called == fr.set.called == 1) + + configdialog.HelpSource = orig_helpsource + + def test_helplist_item_remove(self): + eq = self.assertEqual + fr = self.frame + fr.helplist.delete(0, 'end') + fr.helplist.insert(0, 'name1') + fr.helplist.selection_set(0) + fr.helplist.selection_anchor(0) + fr.user_helplist.clear() + fr.user_helplist.append(('name1', 'file1')) + fr.set.called = fr.upc.called = 0 + + fr.helplist_item_remove() + eq(fr.helplist.get(0, 'end'), ()) + eq(fr.user_helplist, []) + self.assertTrue(fr.upc.called == fr.set.called == 1) + + def test_update_help_changes(self): + fr = self.frame + del fr.update_help_changes + fr.user_helplist.clear() + fr.user_helplist.append(('name1', 'file1')) + fr.user_helplist.append(('name2', 'file2')) + + fr.update_help_changes() + self.assertEqual(mainpage['HelpFiles'], + {'1': 'name1;file1', '2': 'name2;file2'}) + fr.update_help_changes = Func() + + +class VarTraceTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + cls.tracers = configdialog.VarTrace() + cls.iv = IntVar(root) + cls.bv = BooleanVar(root) + + @classmethod + def tearDownClass(cls): + del cls.tracers, cls.iv, cls.bv + + def setUp(self): + self.tracers.clear() + self.called = 0 + + def var_changed_increment(self, *params): + self.called += 13 + + def var_changed_boolean(self, *params): + pass + + def test_init(self): + tr = self.tracers + tr.__init__() + self.assertEqual(tr.untraced, []) + self.assertEqual(tr.traced, []) + + def test_clear(self): + tr = self.tracers + tr.untraced.append(0) + tr.traced.append(1) + tr.clear() + self.assertEqual(tr.untraced, []) + self.assertEqual(tr.traced, []) + + def test_add(self): + tr = self.tracers + func = Func() + cb = tr.make_callback = mock.Mock(return_value=func) + + iv = tr.add(self.iv, self.var_changed_increment) + self.assertIs(iv, self.iv) + bv = tr.add(self.bv, self.var_changed_boolean) + self.assertIs(bv, self.bv) + + sv = StringVar(root) + sv2 = tr.add(sv, ('main', 'section', 'option')) + self.assertIs(sv2, sv) + cb.assert_called_once() + cb.assert_called_with(sv, ('main', 'section', 'option')) + + expected = [(iv, self.var_changed_increment), + (bv, self.var_changed_boolean), + (sv, func)] + self.assertEqual(tr.traced, []) + self.assertEqual(tr.untraced, expected) + + del tr.make_callback + + def test_make_callback(self): + cb = self.tracers.make_callback(self.iv, ('main', 'section', 'option')) + self.assertTrue(callable(cb)) + self.iv.set(42) + # Not attached, so set didn't invoke the callback. + self.assertNotIn('section', changes['main']) + # Invoke callback manually. + cb() + self.assertIn('section', changes['main']) + self.assertEqual(changes['main']['section']['option'], '42') + changes.clear() + + def test_attach_detach(self): + tr = self.tracers + iv = tr.add(self.iv, self.var_changed_increment) + bv = tr.add(self.bv, self.var_changed_boolean) + expected = [(iv, self.var_changed_increment), + (bv, self.var_changed_boolean)] + + # Attach callbacks and test call increment. + tr.attach() + self.assertEqual(tr.untraced, []) + self.assertCountEqual(tr.traced, expected) + iv.set(1) + self.assertEqual(iv.get(), 1) + self.assertEqual(self.called, 13) + + # Check that only one callback is attached to a variable. + # If more than one callback were attached, then var_changed_increment + # would be called twice and the counter would be 2. + self.called = 0 + tr.attach() + iv.set(1) + self.assertEqual(self.called, 13) + + # Detach callbacks. + self.called = 0 + tr.detach() + self.assertEqual(tr.traced, []) + self.assertCountEqual(tr.untraced, expected) + iv.set(1) + self.assertEqual(self.called, 0) + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_debugger.py b/Lib/idlelib/idle_test/test_debugger.py new file mode 100644 index 000000000..9ca3b3326 --- /dev/null +++ b/Lib/idlelib/idle_test/test_debugger.py @@ -0,0 +1,297 @@ +"""Test debugger, coverage 66% + +Try to make tests pass with draft bdbx, which may replace bdb in 3.13+. +""" + +from idlelib import debugger +from collections import namedtuple +from textwrap import dedent +from tkinter import Tk + +from test.support import requires +import unittest +from unittest import mock +from unittest.mock import Mock, patch + +"""A test python script for the debug tests.""" +TEST_CODE = dedent(""" + i = 1 + i += 2 + if i == 3: + print(i) + """) + + +class MockFrame: + "Minimal mock frame." + + def __init__(self, code, lineno): + self.f_code = code + self.f_lineno = lineno + + +class IdbTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + cls.gui = Mock() + cls.idb = debugger.Idb(cls.gui) + + # Create test and code objects to simulate a debug session. + code_obj = compile(TEST_CODE, 'idlelib/file.py', mode='exec') + frame1 = MockFrame(code_obj, 1) + frame1.f_back = None + frame2 = MockFrame(code_obj, 2) + frame2.f_back = frame1 + cls.frame = frame2 + cls.msg = 'file.py:2: <module>()' + + def test_init(self): + self.assertIs(self.idb.gui, self.gui) + # Won't test super call since two Bdbs are very different. + + def test_user_line(self): + # Test that .user_line() creates a string message for a frame. + self.gui.interaction = Mock() + self.idb.user_line(self.frame) + self.gui.interaction.assert_called_once_with(self.msg, self.frame) + + def test_user_exception(self): + # Test that .user_exception() creates a string message for a frame. + exc_info = (type(ValueError), ValueError(), None) + self.gui.interaction = Mock() + self.idb.user_exception(self.frame, exc_info) + self.gui.interaction.assert_called_once_with( + self.msg, self.frame, exc_info) + + +class FunctionTest(unittest.TestCase): + # Test module functions together. + + def test_functions(self): + rpc_obj = compile(TEST_CODE,'rpc.py', mode='exec') + rpc_frame = MockFrame(rpc_obj, 2) + rpc_frame.f_back = rpc_frame + self.assertTrue(debugger._in_rpc_code(rpc_frame)) + self.assertEqual(debugger._frame2message(rpc_frame), + 'rpc.py:2: <module>()') + + code_obj = compile(TEST_CODE, 'idlelib/debugger.py', mode='exec') + code_frame = MockFrame(code_obj, 1) + code_frame.f_back = None + self.assertFalse(debugger._in_rpc_code(code_frame)) + self.assertEqual(debugger._frame2message(code_frame), + 'debugger.py:1: <module>()') + + code_frame.f_back = code_frame + self.assertFalse(debugger._in_rpc_code(code_frame)) + code_frame.f_back = rpc_frame + self.assertTrue(debugger._in_rpc_code(code_frame)) + + +class DebuggerTest(unittest.TestCase): + "Tests for Debugger that do not need a real root." + + @classmethod + def setUpClass(cls): + cls.pyshell = Mock() + cls.pyshell.root = Mock() + cls.idb = Mock() + with patch.object(debugger.Debugger, 'make_gui'): + cls.debugger = debugger.Debugger(cls.pyshell, cls.idb) + cls.debugger.root = Mock() + + def test_cont(self): + self.debugger.cont() + self.idb.set_continue.assert_called_once() + + def test_step(self): + self.debugger.step() + self.idb.set_step.assert_called_once() + + def test_quit(self): + self.debugger.quit() + self.idb.set_quit.assert_called_once() + + def test_next(self): + with patch.object(self.debugger, 'frame') as frame: + self.debugger.next() + self.idb.set_next.assert_called_once_with(frame) + + def test_ret(self): + with patch.object(self.debugger, 'frame') as frame: + self.debugger.ret() + self.idb.set_return.assert_called_once_with(frame) + + def test_clear_breakpoint(self): + self.debugger.clear_breakpoint('test.py', 4) + self.idb.clear_break.assert_called_once_with('test.py', 4) + + def test_clear_file_breaks(self): + self.debugger.clear_file_breaks('test.py') + self.idb.clear_all_file_breaks.assert_called_once_with('test.py') + + def test_set_load_breakpoints(self): + # Test the .load_breakpoints() method calls idb. + FileIO = namedtuple('FileIO', 'filename') + + class MockEditWindow(object): + def __init__(self, fn, breakpoints): + self.io = FileIO(fn) + self.breakpoints = breakpoints + + self.pyshell.flist = Mock() + self.pyshell.flist.inversedict = ( + MockEditWindow('test1.py', [4, 4]), + MockEditWindow('test2.py', [13, 44, 45]), + ) + self.debugger.set_breakpoint('test0.py', 1) + self.idb.set_break.assert_called_once_with('test0.py', 1) + self.debugger.load_breakpoints() # Call set_breakpoint 5 times. + self.idb.set_break.assert_has_calls( + [mock.call('test0.py', 1), + mock.call('test1.py', 4), + mock.call('test1.py', 4), + mock.call('test2.py', 13), + mock.call('test2.py', 44), + mock.call('test2.py', 45)]) + + def test_sync_source_line(self): + # Test that .sync_source_line() will set the flist.gotofileline with fixed frame. + test_code = compile(TEST_CODE, 'test_sync.py', 'exec') + test_frame = MockFrame(test_code, 1) + self.debugger.frame = test_frame + + self.debugger.flist = Mock() + with patch('idlelib.debugger.os.path.exists', return_value=True): + self.debugger.sync_source_line() + self.debugger.flist.gotofileline.assert_called_once_with('test_sync.py', 1) + + +class DebuggerGuiTest(unittest.TestCase): + """Tests for debugger.Debugger that need tk root. + + close needs debugger.top set in make_gui. + """ + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = root = Tk() + root.withdraw() + cls.pyshell = Mock() + cls.pyshell.root = root + cls.idb = Mock() +# stack tests fail with debugger here. +## cls.debugger = debugger.Debugger(cls.pyshell, cls.idb) +## cls.debugger.root = root +## # real root needed for real make_gui +## # run, interacting, abort_loop + + @classmethod + def tearDownClass(cls): + cls.root.destroy() + del cls.root + + def setUp(self): + self.debugger = debugger.Debugger(self.pyshell, self.idb) + self.debugger.root = self.root + # real root needed for real make_gui + # run, interacting, abort_loop + + def test_run_debugger(self): + self.debugger.run(1, 'two') + self.idb.run.assert_called_once_with(1, 'two') + self.assertEqual(self.debugger.interacting, 0) + + def test_close(self): + # Test closing the window in an idle state. + self.debugger.close() + self.pyshell.close_debugger.assert_called_once() + + def test_show_stack(self): + self.debugger.show_stack() + self.assertEqual(self.debugger.stackviewer.gui, self.debugger) + + def test_show_stack_with_frame(self): + test_frame = MockFrame(None, None) + self.debugger.frame = test_frame + + # Reset the stackviewer to force it to be recreated. + self.debugger.stackviewer = None + self.idb.get_stack.return_value = ([], 0) + self.debugger.show_stack() + + # Check that the newly created stackviewer has the test gui as a field. + self.assertEqual(self.debugger.stackviewer.gui, self.debugger) + self.idb.get_stack.assert_called_once_with(test_frame, None) + + +class StackViewerTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = Tk() + cls.root.withdraw() + + @classmethod + def tearDownClass(cls): + cls.root.destroy() + del cls.root + + def setUp(self): + self.code = compile(TEST_CODE, 'test_stackviewer.py', 'exec') + self.stack = [ + (MockFrame(self.code, 1), 1), + (MockFrame(self.code, 2), 2) + ] + # Create a stackviewer and load the test stack. + self.sv = debugger.StackViewer(self.root, None, None) + self.sv.load_stack(self.stack) + + def test_init(self): + # Test creation of StackViewer. + gui = None + flist = None + master_window = self.root + sv = debugger.StackViewer(master_window, flist, gui) + self.assertHasAttr(sv, 'stack') + + def test_load_stack(self): + # Test the .load_stack() method against a fixed test stack. + # Check the test stack is assigned and the list contains the repr of them. + self.assertEqual(self.sv.stack, self.stack) + self.assertTrue('?.<module>(), line 1:' in self.sv.get(0)) + self.assertEqual(self.sv.get(1), '?.<module>(), line 2: ') + + def test_show_source(self): + # Test the .show_source() method against a fixed test stack. + # Patch out the file list to monitor it + self.sv.flist = Mock() + # Patch out isfile to pretend file exists. + with patch('idlelib.debugger.os.path.isfile', return_value=True) as isfile: + self.sv.show_source(1) + isfile.assert_called_once_with('test_stackviewer.py') + self.sv.flist.open.assert_called_once_with('test_stackviewer.py') + + +class NameSpaceTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = Tk() + cls.root.withdraw() + + @classmethod + def tearDownClass(cls): + cls.root.destroy() + del cls.root + + def test_init(self): + debugger.NamespaceViewer(self.root, 'Test') + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_debugger_r.py b/Lib/idlelib/idle_test/test_debugger_r.py new file mode 100644 index 000000000..cf8af05fe --- /dev/null +++ b/Lib/idlelib/idle_test/test_debugger_r.py @@ -0,0 +1,36 @@ +"Test debugger_r, coverage 30%." + +from idlelib import debugger_r +import unittest + +# Boilerplate likely to be needed for future test classes. +##from test.support import requires +##from tkinter import Tk +##class Test(unittest.TestCase): +## @classmethod +## def setUpClass(cls): +## requires('gui') +## cls.root = Tk() +## @classmethod +## def tearDownClass(cls): +## cls.root.destroy() + +# GUIProxy, IdbAdapter, FrameProxy, CodeProxy, DictProxy, +# GUIAdapter, IdbProxy, and 7 functions still need tests. + +class IdbAdapterTest(unittest.TestCase): + + def test_dict_item_noattr(self): # Issue 33065. + + class BinData: + def __repr__(self): + return self.length + + debugger_r.dicttable[0] = {'BinData': BinData()} + idb = debugger_r.IdbAdapter(None) + self.assertTrue(idb.dict_item(0, 'BinData')) + debugger_r.dicttable.clear() + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_debugobj.py b/Lib/idlelib/idle_test/test_debugobj.py new file mode 100644 index 000000000..90ace4e1b --- /dev/null +++ b/Lib/idlelib/idle_test/test_debugobj.py @@ -0,0 +1,57 @@ +"Test debugobj, coverage 40%." + +from idlelib import debugobj +import unittest + + +class ObjectTreeItemTest(unittest.TestCase): + + def test_init(self): + ti = debugobj.ObjectTreeItem('label', 22) + self.assertEqual(ti.labeltext, 'label') + self.assertEqual(ti.object, 22) + self.assertEqual(ti.setfunction, None) + + +class ClassTreeItemTest(unittest.TestCase): + + def test_isexpandable(self): + ti = debugobj.ClassTreeItem('label', 0) + self.assertTrue(ti.IsExpandable()) + + +class AtomicObjectTreeItemTest(unittest.TestCase): + + def test_isexpandable(self): + ti = debugobj.AtomicObjectTreeItem('label', 0) + self.assertFalse(ti.IsExpandable()) + + +class SequenceTreeItemTest(unittest.TestCase): + + def test_isexpandable(self): + ti = debugobj.SequenceTreeItem('label', ()) + self.assertFalse(ti.IsExpandable()) + ti = debugobj.SequenceTreeItem('label', (1,)) + self.assertTrue(ti.IsExpandable()) + + def test_keys(self): + ti = debugobj.SequenceTreeItem('label', 'abc') + self.assertEqual(list(ti.keys()), [0, 1, 2]) # keys() is a range. + + +class DictTreeItemTest(unittest.TestCase): + + def test_isexpandable(self): + ti = debugobj.DictTreeItem('label', {}) + self.assertFalse(ti.IsExpandable()) + ti = debugobj.DictTreeItem('label', {1:1}) + self.assertTrue(ti.IsExpandable()) + + def test_keys(self): + ti = debugobj.DictTreeItem('label', {1:1, 0:0, 2:2}) + self.assertEqual(ti.keys(), [0, 1, 2]) # keys() is a sorted list. + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_debugobj_r.py b/Lib/idlelib/idle_test/test_debugobj_r.py new file mode 100644 index 000000000..86e51b6cb --- /dev/null +++ b/Lib/idlelib/idle_test/test_debugobj_r.py @@ -0,0 +1,22 @@ +"Test debugobj_r, coverage 56%." + +from idlelib import debugobj_r +import unittest + + +class WrappedObjectTreeItemTest(unittest.TestCase): + + def test_getattr(self): + ti = debugobj_r.WrappedObjectTreeItem(list) + self.assertEqual(ti.append, list.append) + +class StubObjectTreeItemTest(unittest.TestCase): + + def test_init(self): + ti = debugobj_r.StubObjectTreeItem('socket', 1111) + self.assertEqual(ti.sockio, 'socket') + self.assertEqual(ti.oid, 1111) + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_delegator.py b/Lib/idlelib/idle_test/test_delegator.py new file mode 100644 index 000000000..922416297 --- /dev/null +++ b/Lib/idlelib/idle_test/test_delegator.py @@ -0,0 +1,44 @@ +"Test delegator, coverage 100%." + +from idlelib.delegator import Delegator +import unittest + + +class DelegatorTest(unittest.TestCase): + + def test_mydel(self): + # Test a simple use scenario. + + # Initialize an int delegator. + mydel = Delegator(int) + self.assertIs(mydel.delegate, int) + self.assertEqual(mydel._Delegator__cache, set()) + # Trying to access a non-attribute of int fails. + self.assertRaises(AttributeError, mydel.__getattr__, 'xyz') + + # Add real int attribute 'bit_length' by accessing it. + bl = mydel.bit_length + self.assertIs(bl, int.bit_length) + self.assertIs(mydel.__dict__['bit_length'], int.bit_length) + self.assertEqual(mydel._Delegator__cache, {'bit_length'}) + + # Add attribute 'numerator'. + mydel.numerator + self.assertEqual(mydel._Delegator__cache, {'bit_length', 'numerator'}) + + # Delete 'numerator'. + del mydel.numerator + self.assertNotIn('numerator', mydel.__dict__) + # The current implementation leaves it in the name cache. + # self.assertIn('numerator', mydel._Delegator__cache) + # However, this is not required and not part of the specification + + # Change delegate to float, first resetting the attributes. + mydel.setdelegate(float) # calls resetcache + self.assertNotIn('bit_length', mydel.__dict__) + self.assertEqual(mydel._Delegator__cache, set()) + self.assertIs(mydel.delegate, float) + + +if __name__ == '__main__': + unittest.main(verbosity=2, exit=2) diff --git a/Lib/idlelib/idle_test/test_editmenu.py b/Lib/idlelib/idle_test/test_editmenu.py new file mode 100644 index 000000000..17478473a --- /dev/null +++ b/Lib/idlelib/idle_test/test_editmenu.py @@ -0,0 +1,74 @@ +'''Test (selected) IDLE Edit menu items. + +Edit modules have their own test files +''' +from test.support import requires +requires('gui') +import tkinter as tk +from tkinter import ttk +import unittest +from idlelib import pyshell + +class PasteTest(unittest.TestCase): + '''Test pasting into widgets that allow pasting. + + On X11, replacing selections requires tk fix. + ''' + @classmethod + def setUpClass(cls): + cls.root = root = tk.Tk() + cls.root.withdraw() + pyshell.fix_x11_paste(root) + cls.text = tk.Text(root) + cls.entry = tk.Entry(root) + cls.tentry = ttk.Entry(root) + cls.spin = tk.Spinbox(root) + root.clipboard_clear() + root.clipboard_append('two') + + @classmethod + def tearDownClass(cls): + del cls.text, cls.entry, cls.tentry + cls.root.clipboard_clear() + cls.root.update_idletasks() + cls.root.destroy() + del cls.root + + def test_paste_text(self): + "Test pasting into text with and without a selection." + text = self.text + for tag, ans in ('', 'onetwo\n'), ('sel', 'two\n'): + with self.subTest(tag=tag, ans=ans): + text.delete('1.0', 'end') + text.insert('1.0', 'one', tag) + text.event_generate('<<Paste>>') + self.assertEqual(text.get('1.0', 'end'), ans) + + def test_paste_entry(self): + "Test pasting into an entry with and without a selection." + # Generated <<Paste>> fails for tk entry without empty select + # range for 'no selection'. Live widget works fine. + for entry in self.entry, self.tentry: + for end, ans in (0, 'onetwo'), ('end', 'two'): + with self.subTest(entry=entry, end=end, ans=ans): + entry.delete(0, 'end') + entry.insert(0, 'one') + entry.select_range(0, end) + entry.event_generate('<<Paste>>') + self.assertEqual(entry.get(), ans) + + def test_paste_spin(self): + "Test pasting into a spinbox with and without a selection." + # See note above for entry. + spin = self.spin + for end, ans in (0, 'onetwo'), ('end', 'two'): + with self.subTest(end=end, ans=ans): + spin.delete(0, 'end') + spin.insert(0, 'one') + spin.selection('range', 0, end) # see note + spin.event_generate('<<Paste>>') + self.assertEqual(spin.get(), ans) + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_editor.py b/Lib/idlelib/idle_test/test_editor.py new file mode 100644 index 000000000..0dfe2f3c5 --- /dev/null +++ b/Lib/idlelib/idle_test/test_editor.py @@ -0,0 +1,241 @@ +"Test editor, coverage 53%." + +from idlelib import editor +import unittest +from collections import namedtuple +from test.support import requires +from tkinter import Tk, Text + +Editor = editor.EditorWindow + + +class EditorWindowTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = Tk() + cls.root.withdraw() + + @classmethod + def tearDownClass(cls): + cls.root.update_idletasks() + for id in cls.root.tk.call('after', 'info'): + cls.root.after_cancel(id) + cls.root.destroy() + del cls.root + + def test_init(self): + e = Editor(root=self.root) + self.assertEqual(e.root, self.root) + e._close() + + +class GetLineIndentTest(unittest.TestCase): + def test_empty_lines(self): + for tabwidth in [1, 2, 4, 6, 8]: + for line in ['', '\n']: + with self.subTest(line=line, tabwidth=tabwidth): + self.assertEqual( + editor.get_line_indent(line, tabwidth=tabwidth), + (0, 0), + ) + + def test_tabwidth_4(self): + # (line, (raw, effective)) + tests = (('no spaces', (0, 0)), + # Internal space isn't counted. + (' space test', (4, 4)), + ('\ttab test', (1, 4)), + ('\t\tdouble tabs test', (2, 8)), + # Different results when mixing tabs and spaces. + (' \tmixed test', (5, 8)), + (' \t mixed test', (5, 6)), + ('\t mixed test', (5, 8)), + # Spaces not divisible by tabwidth. + (' \tmixed test', (3, 4)), + (' \t mixed test', (3, 5)), + ('\t mixed test', (3, 6)), + # Only checks spaces and tabs. + ('\nnewline test', (0, 0))) + + for line, expected in tests: + with self.subTest(line=line): + self.assertEqual( + editor.get_line_indent(line, tabwidth=4), + expected, + ) + + def test_tabwidth_8(self): + # (line, (raw, effective)) + tests = (('no spaces', (0, 0)), + # Internal space isn't counted. + (' space test', (8, 8)), + ('\ttab test', (1, 8)), + ('\t\tdouble tabs test', (2, 16)), + # Different results when mixing tabs and spaces. + (' \tmixed test', (9, 16)), + (' \t mixed test', (9, 10)), + ('\t mixed test', (9, 16)), + # Spaces not divisible by tabwidth. + (' \tmixed test', (3, 8)), + (' \t mixed test', (3, 9)), + ('\t mixed test', (3, 10)), + # Only checks spaces and tabs. + ('\nnewline test', (0, 0))) + + for line, expected in tests: + with self.subTest(line=line): + self.assertEqual( + editor.get_line_indent(line, tabwidth=8), + expected, + ) + + +def insert(text, string): + text.delete('1.0', 'end') + text.insert('end', string) + text.update_idletasks() # Force update for colorizer to finish. + + +class IndentAndNewlineTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = Tk() + cls.root.withdraw() + cls.window = Editor(root=cls.root) + cls.window.indentwidth = 2 + cls.window.tabwidth = 2 + + @classmethod + def tearDownClass(cls): + cls.window._close() + del cls.window + cls.root.update_idletasks() + for id in cls.root.tk.call('after', 'info'): + cls.root.after_cancel(id) + cls.root.destroy() + del cls.root + + def test_indent_and_newline_event(self): + eq = self.assertEqual + w = self.window + text = w.text + get = text.get + nl = w.newline_and_indent_event + + TestInfo = namedtuple('Tests', ['label', 'text', 'expected', 'mark']) + + tests = (TestInfo('Empty line inserts with no indent.', + ' \n def __init__(self):', + '\n \n def __init__(self):\n', + '1.end'), + TestInfo('Inside bracket before space, deletes space.', + ' def f1(self, a, b):', + ' def f1(self,\n a, b):\n', + '1.14'), + TestInfo('Inside bracket after space, deletes space.', + ' def f1(self, a, b):', + ' def f1(self,\n a, b):\n', + '1.15'), + TestInfo('Inside string with one line - no indent.', + ' """Docstring."""', + ' """Docstring.\n"""\n', + '1.15'), + TestInfo('Inside string with more than one line.', + ' """Docstring.\n Docstring Line 2"""', + ' """Docstring.\n Docstring Line 2\n """\n', + '2.18'), + TestInfo('Backslash with one line.', + 'a =\\', + 'a =\\\n \n', + '1.end'), + TestInfo('Backslash with more than one line.', + 'a =\\\n multiline\\', + 'a =\\\n multiline\\\n \n', + '2.end'), + TestInfo('Block opener - indents +1 level.', + ' def f1(self):\n pass', + ' def f1(self):\n \n pass\n', + '1.end'), + TestInfo('Block closer - dedents -1 level.', + ' def f1(self):\n pass', + ' def f1(self):\n pass\n \n', + '2.end'), + ) + + for test in tests: + with self.subTest(label=test.label): + insert(text, test.text) + text.mark_set('insert', test.mark) + nl(event=None) + eq(get('1.0', 'end'), test.expected) + + # Selected text. + insert(text, ' def f1(self, a, b):\n return a + b') + text.tag_add('sel', '1.17', '1.end') + nl(None) + # Deletes selected text before adding new line. + eq(get('1.0', 'end'), ' def f1(self, a,\n \n return a + b\n') + + +class IndentSearcherTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = Tk() + cls.root.withdraw() + cls.text = Text(cls.root) + + @classmethod + def tearDownClass(cls): + cls.root.destroy() + del cls.root + + def test_searcher(self): + text = self.text + searcher = (self.text) + test_info = (# text, (block, indent)) + ("", (None, None)), + ("[1,", (None, None)), # TokenError + ("if 1:\n", ('if 1:\n', None)), + ("if 1:\n 2\n 3\n", ('if 1:\n', ' 2\n')), + ) + for code, expected_pair in test_info: + with self.subTest(code=code): + insert(text, code) + actual_pair = editor.IndentSearcher(text).run() + self.assertEqual(actual_pair, expected_pair) + + +class RMenuTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = Tk() + cls.root.withdraw() + cls.window = Editor(root=cls.root) + + @classmethod + def tearDownClass(cls): + cls.window._close() + del cls.window + cls.root.update_idletasks() + for id in cls.root.tk.call('after', 'info'): + cls.root.after_cancel(id) + cls.root.destroy() + del cls.root + + class DummyRMenu: + def tk_popup(x, y): pass + + def test_rclick(self): + pass + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_filelist.py b/Lib/idlelib/idle_test/test_filelist.py new file mode 100644 index 000000000..731f1975e --- /dev/null +++ b/Lib/idlelib/idle_test/test_filelist.py @@ -0,0 +1,33 @@ +"Test filelist, coverage 19%." + +from idlelib import filelist +import unittest +from test.support import requires +from tkinter import Tk + +class FileListTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = Tk() + cls.root.withdraw() + + @classmethod + def tearDownClass(cls): + cls.root.update_idletasks() + for id in cls.root.tk.call('after', 'info'): + cls.root.after_cancel(id) + cls.root.destroy() + del cls.root + + def test_new_empty(self): + flist = filelist.FileList(self.root) + self.assertEqual(flist.root, self.root) + e = flist.new() + self.assertEqual(type(e), flist.EditorWindow) + e._close() + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_format.py b/Lib/idlelib/idle_test/test_format.py new file mode 100644 index 000000000..e5e903688 --- /dev/null +++ b/Lib/idlelib/idle_test/test_format.py @@ -0,0 +1,668 @@ +"Test format, coverage 99%." + +from idlelib import format as ft +import unittest +from unittest import mock +from test.support import requires +from tkinter import Tk, Text +from idlelib.editor import EditorWindow +from idlelib.idle_test.mock_idle import Editor as MockEditor + + +class Is_Get_Test(unittest.TestCase): + """Test the is_ and get_ functions""" + test_comment = '# This is a comment' + test_nocomment = 'This is not a comment' + trailingws_comment = '# This is a comment ' + leadingws_comment = ' # This is a comment' + leadingws_nocomment = ' This is not a comment' + + def test_is_all_white(self): + self.assertTrue(ft.is_all_white('')) + self.assertTrue(ft.is_all_white('\t\n\r\f\v')) + self.assertFalse(ft.is_all_white(self.test_comment)) + + def test_get_indent(self): + Equal = self.assertEqual + Equal(ft.get_indent(self.test_comment), '') + Equal(ft.get_indent(self.trailingws_comment), '') + Equal(ft.get_indent(self.leadingws_comment), ' ') + Equal(ft.get_indent(self.leadingws_nocomment), ' ') + + def test_get_comment_header(self): + Equal = self.assertEqual + # Test comment strings + Equal(ft.get_comment_header(self.test_comment), '#') + Equal(ft.get_comment_header(self.trailingws_comment), '#') + Equal(ft.get_comment_header(self.leadingws_comment), ' #') + # Test non-comment strings + Equal(ft.get_comment_header(self.leadingws_nocomment), ' ') + Equal(ft.get_comment_header(self.test_nocomment), '') + + +class FindTest(unittest.TestCase): + """Test the find_paragraph function in paragraph module. + + Using the runcase() function, find_paragraph() is called with 'mark' set at + multiple indexes before and inside the test paragraph. + + It appears that code with the same indentation as a quoted string is grouped + as part of the same paragraph, which is probably incorrect behavior. + """ + + @classmethod + def setUpClass(cls): + from idlelib.idle_test.mock_tk import Text + cls.text = Text() + + def runcase(self, inserttext, stopline, expected): + # Check that find_paragraph returns the expected paragraph when + # the mark index is set to beginning, middle, end of each line + # up to but not including the stop line + text = self.text + text.insert('1.0', inserttext) + for line in range(1, stopline): + linelength = int(text.index("%d.end" % line).split('.')[1]) + for col in (0, linelength//2, linelength): + tempindex = "%d.%d" % (line, col) + self.assertEqual(ft.find_paragraph(text, tempindex), expected) + text.delete('1.0', 'end') + + def test_find_comment(self): + comment = ( + "# Comment block with no blank lines before\n" + "# Comment line\n" + "\n") + self.runcase(comment, 3, ('1.0', '3.0', '#', comment[0:58])) + + comment = ( + "\n" + "# Comment block with whitespace line before and after\n" + "# Comment line\n" + "\n") + self.runcase(comment, 4, ('2.0', '4.0', '#', comment[1:70])) + + comment = ( + "\n" + " # Indented comment block with whitespace before and after\n" + " # Comment line\n" + "\n") + self.runcase(comment, 4, ('2.0', '4.0', ' #', comment[1:82])) + + comment = ( + "\n" + "# Single line comment\n" + "\n") + self.runcase(comment, 3, ('2.0', '3.0', '#', comment[1:23])) + + comment = ( + "\n" + " # Single line comment with leading whitespace\n" + "\n") + self.runcase(comment, 3, ('2.0', '3.0', ' #', comment[1:51])) + + comment = ( + "\n" + "# Comment immediately followed by code\n" + "x = 42\n" + "\n") + self.runcase(comment, 3, ('2.0', '3.0', '#', comment[1:40])) + + comment = ( + "\n" + " # Indented comment immediately followed by code\n" + "x = 42\n" + "\n") + self.runcase(comment, 3, ('2.0', '3.0', ' #', comment[1:53])) + + comment = ( + "\n" + "# Comment immediately followed by indented code\n" + " x = 42\n" + "\n") + self.runcase(comment, 3, ('2.0', '3.0', '#', comment[1:49])) + + def test_find_paragraph(self): + teststring = ( + '"""String with no blank lines before\n' + 'String line\n' + '"""\n' + '\n') + self.runcase(teststring, 4, ('1.0', '4.0', '', teststring[0:53])) + + teststring = ( + "\n" + '"""String with whitespace line before and after\n' + 'String line.\n' + '"""\n' + '\n') + self.runcase(teststring, 5, ('2.0', '5.0', '', teststring[1:66])) + + teststring = ( + '\n' + ' """Indented string with whitespace before and after\n' + ' Comment string.\n' + ' """\n' + '\n') + self.runcase(teststring, 5, ('2.0', '5.0', ' ', teststring[1:85])) + + teststring = ( + '\n' + '"""Single line string."""\n' + '\n') + self.runcase(teststring, 3, ('2.0', '3.0', '', teststring[1:27])) + + teststring = ( + '\n' + ' """Single line string with leading whitespace."""\n' + '\n') + self.runcase(teststring, 3, ('2.0', '3.0', ' ', teststring[1:55])) + + +class ReformatFunctionTest(unittest.TestCase): + """Test the reformat_paragraph function without the editor window.""" + + def test_reformat_paragraph(self): + Equal = self.assertEqual + reform = ft.reformat_paragraph + hw = "O hello world" + Equal(reform(' ', 1), ' ') + Equal(reform("Hello world", 20), "Hello world") + + # Test without leading newline + Equal(reform(hw, 1), "O\nhello\nworld") + Equal(reform(hw, 6), "O\nhello\nworld") + Equal(reform(hw, 7), "O hello\nworld") + Equal(reform(hw, 12), "O hello\nworld") + Equal(reform(hw, 13), "O hello world") + + # Test with leading newline + hw = "\nO hello world" + Equal(reform(hw, 1), "\nO\nhello\nworld") + Equal(reform(hw, 6), "\nO\nhello\nworld") + Equal(reform(hw, 7), "\nO hello\nworld") + Equal(reform(hw, 12), "\nO hello\nworld") + Equal(reform(hw, 13), "\nO hello world") + + +class ReformatCommentTest(unittest.TestCase): + """Test the reformat_comment function without the editor window.""" + + def test_reformat_comment(self): + Equal = self.assertEqual + + # reformat_comment formats to a minimum of 20 characters + test_string = ( + " \"\"\"this is a test of a reformat for a triple quoted string" + " will it reformat to less than 70 characters for me?\"\"\"") + result = ft.reformat_comment(test_string, 70, " ") + expected = ( + " \"\"\"this is a test of a reformat for a triple quoted string will it\n" + " reformat to less than 70 characters for me?\"\"\"") + Equal(result, expected) + + test_comment = ( + "# this is a test of a reformat for a triple quoted string will " + "it reformat to less than 70 characters for me?") + result = ft.reformat_comment(test_comment, 70, "#") + expected = ( + "# this is a test of a reformat for a triple quoted string will it\n" + "# reformat to less than 70 characters for me?") + Equal(result, expected) + + +class FormatClassTest(unittest.TestCase): + def test_init_close(self): + instance = ft.FormatParagraph('editor') + self.assertEqual(instance.editwin, 'editor') + instance.close() + self.assertEqual(instance.editwin, None) + + +# For testing format_paragraph_event, Initialize FormatParagraph with +# a mock Editor with .text and .get_selection_indices. The text must +# be a Text wrapper that adds two methods + +# A real EditorWindow creates unneeded, time-consuming baggage and +# sometimes emits shutdown warnings like this: +# "warning: callback failed in WindowList <class '_tkinter.TclError'> +# : invalid command name ".55131368.windows". +# Calling EditorWindow._close in tearDownClass prevents this but causes +# other problems (windows left open). + +class TextWrapper: + def __init__(self, master): + self.text = Text(master=master) + def __getattr__(self, name): + return getattr(self.text, name) + def undo_block_start(self): pass + def undo_block_stop(self): pass + +class Editor: + def __init__(self, root): + self.text = TextWrapper(root) + get_selection_indices = EditorWindow. get_selection_indices + +class FormatEventTest(unittest.TestCase): + """Test the formatting of text inside a Text widget. + + This is done with FormatParagraph.format.paragraph_event, + which calls functions in the module as appropriate. + """ + test_string = ( + " '''this is a test of a reformat for a triple " + "quoted string will it reformat to less than 70 " + "characters for me?'''\n") + multiline_test_string = ( + " '''The first line is under the max width.\n" + " The second line's length is way over the max width. It goes " + "on and on until it is over 100 characters long.\n" + " Same thing with the third line. It is also way over the max " + "width, but FormatParagraph will fix it.\n" + " '''\n") + multiline_test_comment = ( + "# The first line is under the max width.\n" + "# The second line's length is way over the max width. It goes on " + "and on until it is over 100 characters long.\n" + "# Same thing with the third line. It is also way over the max " + "width, but FormatParagraph will fix it.\n" + "# The fourth line is short like the first line.") + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = Tk() + cls.root.withdraw() + editor = Editor(root=cls.root) + cls.text = editor.text.text # Test code does not need the wrapper. + cls.formatter = ft.FormatParagraph(editor).format_paragraph_event + # Sets the insert mark just after the re-wrapped and inserted text. + + @classmethod + def tearDownClass(cls): + del cls.text, cls.formatter + cls.root.update_idletasks() + cls.root.destroy() + del cls.root + + def test_short_line(self): + self.text.insert('1.0', "Short line\n") + self.formatter("Dummy") + self.assertEqual(self.text.get('1.0', 'insert'), "Short line\n" ) + self.text.delete('1.0', 'end') + + def test_long_line(self): + text = self.text + + # Set cursor ('insert' mark) to '1.0', within text. + text.insert('1.0', self.test_string) + text.mark_set('insert', '1.0') + self.formatter('ParameterDoesNothing', limit=70) + result = text.get('1.0', 'insert') + # find function includes \n + expected = ( +" '''this is a test of a reformat for a triple quoted string will it\n" +" reformat to less than 70 characters for me?'''\n") # yes + self.assertEqual(result, expected) + text.delete('1.0', 'end') + + # Select from 1.11 to line end. + text.insert('1.0', self.test_string) + text.tag_add('sel', '1.11', '1.end') + self.formatter('ParameterDoesNothing', limit=70) + result = text.get('1.0', 'insert') + # selection excludes \n + expected = ( +" '''this is a test of a reformat for a triple quoted string will it reformat\n" +" to less than 70 characters for me?'''") # no + self.assertEqual(result, expected) + text.delete('1.0', 'end') + + def test_multiple_lines(self): + text = self.text + # Select 2 long lines. + text.insert('1.0', self.multiline_test_string) + text.tag_add('sel', '2.0', '4.0') + self.formatter('ParameterDoesNothing', limit=70) + result = text.get('2.0', 'insert') + expected = ( +" The second line's length is way over the max width. It goes on and\n" +" on until it is over 100 characters long. Same thing with the third\n" +" line. It is also way over the max width, but FormatParagraph will\n" +" fix it.\n") + self.assertEqual(result, expected) + text.delete('1.0', 'end') + + def test_comment_block(self): + text = self.text + + # Set cursor ('insert') to '1.0', within block. + text.insert('1.0', self.multiline_test_comment) + self.formatter('ParameterDoesNothing', limit=70) + result = text.get('1.0', 'insert') + expected = ( +"# The first line is under the max width. The second line's length is\n" +"# way over the max width. It goes on and on until it is over 100\n" +"# characters long. Same thing with the third line. It is also way over\n" +"# the max width, but FormatParagraph will fix it. The fourth line is\n" +"# short like the first line.\n") + self.assertEqual(result, expected) + text.delete('1.0', 'end') + + # Select line 2, verify line 1 unaffected. + text.insert('1.0', self.multiline_test_comment) + text.tag_add('sel', '2.0', '3.0') + self.formatter('ParameterDoesNothing', limit=70) + result = text.get('1.0', 'insert') + expected = ( +"# The first line is under the max width.\n" +"# The second line's length is way over the max width. It goes on and\n" +"# on until it is over 100 characters long.\n") + self.assertEqual(result, expected) + text.delete('1.0', 'end') + +# The following block worked with EditorWindow but fails with the mock. +# Lines 2 and 3 get pasted together even though the previous block left +# the previous line alone. More investigation is needed. +## # Select lines 3 and 4 +## text.insert('1.0', self.multiline_test_comment) +## text.tag_add('sel', '3.0', '5.0') +## self.formatter('ParameterDoesNothing') +## result = text.get('3.0', 'insert') +## expected = ( +##"# Same thing with the third line. It is also way over the max width,\n" +##"# but FormatParagraph will fix it. The fourth line is short like the\n" +##"# first line.\n") +## self.assertEqual(result, expected) +## text.delete('1.0', 'end') + + +class DummyEditwin: + def __init__(self, root, text): + self.root = root + self.text = text + self.indentwidth = 4 + self.tabwidth = 4 + self.usetabs = False + self.context_use_ps1 = True + + _make_blanks = EditorWindow._make_blanks + get_selection_indices = EditorWindow.get_selection_indices + + +class FormatRegionTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = Tk() + cls.root.withdraw() + cls.text = Text(cls.root) + cls.text.undo_block_start = mock.Mock() + cls.text.undo_block_stop = mock.Mock() + cls.editor = DummyEditwin(cls.root, cls.text) + cls.formatter = ft.FormatRegion(cls.editor) + + @classmethod + def tearDownClass(cls): + del cls.text, cls.formatter, cls.editor + cls.root.update_idletasks() + cls.root.destroy() + del cls.root + + def setUp(self): + self.text.insert('1.0', self.code_sample) + + def tearDown(self): + self.text.delete('1.0', 'end') + + code_sample = """\ +# WS line needed for test. +class C1: + # Class comment. + def __init__(self, a, b): + self.a = a + self.b = b + + def compare(self): + if a > b: + return a + elif a < b: + return b + else: + return None +""" + + def test_get_region(self): + get = self.formatter.get_region + text = self.text + eq = self.assertEqual + + # Add selection. + text.tag_add('sel', '7.0', '10.0') + expected_lines = ['', + ' def compare(self):', + ' if a > b:', + ''] + eq(get(), ('7.0', '10.0', '\n'.join(expected_lines), expected_lines)) + + # Remove selection. + text.tag_remove('sel', '1.0', 'end') + eq(get(), ('15.0', '16.0', '\n', ['', ''])) + + def test_set_region(self): + set_ = self.formatter.set_region + text = self.text + eq = self.assertEqual + + save_bell = text.bell + text.bell = mock.Mock() + line6 = self.code_sample.splitlines()[5] + line10 = self.code_sample.splitlines()[9] + + text.tag_add('sel', '6.0', '11.0') + head, tail, chars, lines = self.formatter.get_region() + + # No changes. + set_(head, tail, chars, lines) + text.bell.assert_called_once() + eq(text.get('6.0', '11.0'), chars) + eq(text.get('sel.first', 'sel.last'), chars) + text.tag_remove('sel', '1.0', 'end') + + # Alter selected lines by changing lines and adding a newline. + newstring = 'added line 1\n\n\n\n' + newlines = newstring.split('\n') + set_('7.0', '10.0', chars, newlines) + # Selection changed. + eq(text.get('sel.first', 'sel.last'), newstring) + # Additional line added, so last index is changed. + eq(text.get('7.0', '11.0'), newstring) + # Before and after lines unchanged. + eq(text.get('6.0', '7.0-1c'), line6) + eq(text.get('11.0', '12.0-1c'), line10) + text.tag_remove('sel', '1.0', 'end') + + text.bell = save_bell + + def test_indent_region_event(self): + indent = self.formatter.indent_region_event + text = self.text + eq = self.assertEqual + + text.tag_add('sel', '7.0', '10.0') + indent() + # Blank lines aren't affected by indent. + eq(text.get('7.0', '10.0'), ('\n def compare(self):\n if a > b:\n')) + + def test_dedent_region_event(self): + dedent = self.formatter.dedent_region_event + text = self.text + eq = self.assertEqual + + text.tag_add('sel', '7.0', '10.0') + dedent() + # Blank lines aren't affected by dedent. + eq(text.get('7.0', '10.0'), ('\ndef compare(self):\n if a > b:\n')) + + def test_comment_region_event(self): + comment = self.formatter.comment_region_event + text = self.text + eq = self.assertEqual + + text.tag_add('sel', '7.0', '10.0') + comment() + eq(text.get('7.0', '10.0'), ('##\n## def compare(self):\n## if a > b:\n')) + + def test_uncomment_region_event(self): + comment = self.formatter.comment_region_event + uncomment = self.formatter.uncomment_region_event + text = self.text + eq = self.assertEqual + + text.tag_add('sel', '7.0', '10.0') + comment() + uncomment() + eq(text.get('7.0', '10.0'), ('\n def compare(self):\n if a > b:\n')) + + # Only remove comments at the beginning of a line. + text.tag_remove('sel', '1.0', 'end') + text.tag_add('sel', '3.0', '4.0') + uncomment() + eq(text.get('3.0', '3.end'), (' # Class comment.')) + + self.formatter.set_region('3.0', '4.0', '', ['# Class comment.', '']) + uncomment() + eq(text.get('3.0', '3.end'), (' Class comment.')) + + @mock.patch.object(ft.FormatRegion, "_asktabwidth") + def test_tabify_region_event(self, _asktabwidth): + tabify = self.formatter.tabify_region_event + text = self.text + eq = self.assertEqual + + text.tag_add('sel', '7.0', '10.0') + # No tabwidth selected. + _asktabwidth.return_value = None + self.assertIsNone(tabify()) + + _asktabwidth.return_value = 3 + self.assertIsNotNone(tabify()) + eq(text.get('7.0', '10.0'), ('\n\t def compare(self):\n\t\t if a > b:\n')) + + @mock.patch.object(ft.FormatRegion, "_asktabwidth") + def test_untabify_region_event(self, _asktabwidth): + untabify = self.formatter.untabify_region_event + text = self.text + eq = self.assertEqual + + text.tag_add('sel', '7.0', '10.0') + # No tabwidth selected. + _asktabwidth.return_value = None + self.assertIsNone(untabify()) + + _asktabwidth.return_value = 2 + self.formatter.tabify_region_event() + _asktabwidth.return_value = 3 + self.assertIsNotNone(untabify()) + eq(text.get('7.0', '10.0'), ('\n def compare(self):\n if a > b:\n')) + + @mock.patch.object(ft, "askinteger") + def test_ask_tabwidth(self, askinteger): + ask = self.formatter._asktabwidth + askinteger.return_value = 10 + self.assertEqual(ask(), 10) + + +class IndentsTest(unittest.TestCase): + + @mock.patch.object(ft, "askyesno") + def test_toggle_tabs(self, askyesno): + editor = DummyEditwin(None, None) # usetabs == False. + indents = ft.Indents(editor) + askyesno.return_value = True + + indents.toggle_tabs_event(None) + self.assertEqual(editor.usetabs, True) + self.assertEqual(editor.indentwidth, 8) + + indents.toggle_tabs_event(None) + self.assertEqual(editor.usetabs, False) + self.assertEqual(editor.indentwidth, 8) + + @mock.patch.object(ft, "askinteger") + def test_change_indentwidth(self, askinteger): + editor = DummyEditwin(None, None) # indentwidth == 4. + indents = ft.Indents(editor) + + askinteger.return_value = None + indents.change_indentwidth_event(None) + self.assertEqual(editor.indentwidth, 4) + + askinteger.return_value = 3 + indents.change_indentwidth_event(None) + self.assertEqual(editor.indentwidth, 3) + + askinteger.return_value = 5 + editor.usetabs = True + indents.change_indentwidth_event(None) + self.assertEqual(editor.indentwidth, 3) + + +class RstripTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = Tk() + cls.root.withdraw() + cls.text = Text(cls.root) + cls.editor = MockEditor(text=cls.text) + cls.do_rstrip = ft.Rstrip(cls.editor).do_rstrip + + @classmethod + def tearDownClass(cls): + del cls.text, cls.do_rstrip, cls.editor + cls.root.update_idletasks() + cls.root.destroy() + del cls.root + + def tearDown(self): + self.text.delete('1.0', 'end-1c') + + def test_rstrip_lines(self): + original = ( + "Line with an ending tab \n" + "Line ending in 5 spaces \n" + "Linewithnospaces\n" + " indented line\n" + " indented line with trailing space \n" + " \n") + stripped = ( + "Line with an ending tab\n" + "Line ending in 5 spaces\n" + "Linewithnospaces\n" + " indented line\n" + " indented line with trailing space\n") + + self.text.insert('1.0', original) + self.do_rstrip() + self.assertEqual(self.text.get('1.0', 'insert'), stripped) + + def test_rstrip_end(self): + text = self.text + for code in ('', '\n', '\n\n\n'): + with self.subTest(code=code): + text.insert('1.0', code) + self.do_rstrip() + self.assertEqual(text.get('1.0','end-1c'), '') + for code in ('a\n', 'a\n\n', 'a\n\n\n'): + with self.subTest(code=code): + text.delete('1.0', 'end-1c') + text.insert('1.0', code) + self.do_rstrip() + self.assertEqual(text.get('1.0','end-1c'), 'a\n') + + +if __name__ == '__main__': + unittest.main(verbosity=2, exit=2) diff --git a/Lib/idlelib/idle_test/test_grep.py b/Lib/idlelib/idle_test/test_grep.py new file mode 100644 index 000000000..d67dba769 --- /dev/null +++ b/Lib/idlelib/idle_test/test_grep.py @@ -0,0 +1,156 @@ +""" !Changing this line will break Test_findfile.test_found! +Non-gui unit tests for grep.GrepDialog methods. +dummy_command calls grep_it calls findfiles. +An exception raised in one method will fail callers. +Otherwise, tests are mostly independent. +Currently only test grep_it, coverage 51%. +""" +from idlelib import grep +import unittest +from test.support import captured_stdout +from idlelib.idle_test.mock_tk import Var +import os +import re + + +class Dummy_searchengine: + '''GrepDialog.__init__ calls parent SearchDiabolBase which attaches the + passed in SearchEngine instance as attribute 'engine'. Only a few of the + many possible self.engine.x attributes are needed here. + ''' + def getpat(self): + return self._pat + +searchengine = Dummy_searchengine() + + +class Dummy_grep: + # Methods tested + #default_command = GrepDialog.default_command + grep_it = grep.GrepDialog.grep_it + # Other stuff needed + recvar = Var(False) + engine = searchengine + def close(self): # gui method + pass + +_grep = Dummy_grep() + + +class FindfilesTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + cls.realpath = os.path.realpath(__file__) + cls.path = os.path.dirname(cls.realpath) + + @classmethod + def tearDownClass(cls): + del cls.realpath, cls.path + + def test_invaliddir(self): + with captured_stdout() as s: + filelist = list(grep.findfiles('invaliddir', '*.*', False)) + self.assertEqual(filelist, []) + self.assertIn('invalid', s.getvalue()) + + def test_curdir(self): + # Test os.curdir. + ff = grep.findfiles + save_cwd = os.getcwd() + os.chdir(self.path) + filename = 'test_grep.py' + filelist = list(ff(os.curdir, filename, False)) + self.assertIn(os.path.join(os.curdir, filename), filelist) + os.chdir(save_cwd) + + def test_base(self): + ff = grep.findfiles + readme = os.path.join(self.path, 'README.txt') + + # Check for Python files in path where this file lives. + filelist = list(ff(self.path, '*.py', False)) + # This directory has many Python files. + self.assertGreater(len(filelist), 10) + self.assertIn(self.realpath, filelist) + self.assertNotIn(readme, filelist) + + # Look for .txt files in path where this file lives. + filelist = list(ff(self.path, '*.txt', False)) + self.assertNotEqual(len(filelist), 0) + self.assertNotIn(self.realpath, filelist) + self.assertIn(readme, filelist) + + # Look for non-matching pattern. + filelist = list(ff(self.path, 'grep.*', False)) + self.assertEqual(len(filelist), 0) + self.assertNotIn(self.realpath, filelist) + + def test_recurse(self): + ff = grep.findfiles + parent = os.path.dirname(self.path) + grepfile = os.path.join(parent, 'grep.py') + pat = '*.py' + + # Get Python files only in parent directory. + filelist = list(ff(parent, pat, False)) + parent_size = len(filelist) + # Lots of Python files in idlelib. + self.assertGreater(parent_size, 20) + self.assertIn(grepfile, filelist) + # Without subdirectories, this file isn't returned. + self.assertNotIn(self.realpath, filelist) + + # Include subdirectories. + filelist = list(ff(parent, pat, True)) + # More files found now. + self.assertGreater(len(filelist), parent_size) + self.assertIn(grepfile, filelist) + # This file exists in list now. + self.assertIn(self.realpath, filelist) + + # Check another level up the tree. + parent = os.path.dirname(parent) + filelist = list(ff(parent, '*.py', True)) + self.assertIn(self.realpath, filelist) + + +class Grep_itTest(unittest.TestCase): + # Test captured reports with 0 and some hits. + # Should test file names, but Windows reports have mixed / and \ separators + # from incomplete replacement, so 'later'. + + def report(self, pat): + _grep.engine._pat = pat + with captured_stdout() as s: + _grep.grep_it(re.compile(pat), __file__) + lines = s.getvalue().split('\n') + lines.pop() # remove bogus '' after last \n + return lines + + def test_unfound(self): + pat = 'xyz*'*7 + lines = self.report(pat) + self.assertEqual(len(lines), 2) + self.assertIn(pat, lines[0]) + self.assertEqual(lines[1], 'No hits.') + + def test_found(self): + + pat = '""" !Changing this line will break Test_findfile.test_found!' + lines = self.report(pat) + self.assertEqual(len(lines), 5) + self.assertIn(pat, lines[0]) + self.assertIn('py: 1:', lines[1]) # line number 1 + self.assertIn('2', lines[3]) # hits found 2 + self.assertStartsWith(lines[4], '(Hint:') + + +class Default_commandTest(unittest.TestCase): + # To write this, move outwin import to top of GrepDialog + # so it can be replaced by captured_stdout in class setup/teardown. + pass + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_help.py b/Lib/idlelib/idle_test/test_help.py new file mode 100644 index 000000000..ebb02b5c0 --- /dev/null +++ b/Lib/idlelib/idle_test/test_help.py @@ -0,0 +1,36 @@ +"Test help, coverage 94%." + +from idlelib import help +import unittest +from test.support import requires +requires('gui') +from os.path import abspath, dirname, join +from tkinter import Tk + + +class IdleDocTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + "By itself, this tests that file parsed without exception." + cls.root = root = Tk() + root.withdraw() + cls.window = help.show_idlehelp(root) + + @classmethod + def tearDownClass(cls): + del cls.window + cls.root.update_idletasks() + cls.root.destroy() + del cls.root + + def test_1window(self): + self.assertIn('IDLE Doc', self.window.wm_title()) + + def test_4text(self): + text = self.window.frame.text + self.assertEqual(text.get('1.0', '1.end'), ' IDLE — Python editor and shell ') + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_help_about.py b/Lib/idlelib/idle_test/test_help_about.py new file mode 100644 index 000000000..7e16abdb7 --- /dev/null +++ b/Lib/idlelib/idle_test/test_help_about.py @@ -0,0 +1,182 @@ +"""Test help_about, coverage 100%. +help_about.build_bits branches on sys.platform='darwin'. +'100% combines coverage on Mac and others. +""" + +from idlelib import help_about +import unittest +from test.support import requires, findfile +from tkinter import Tk, TclError +from idlelib.idle_test.mock_idle import Func +from idlelib.idle_test.mock_tk import Mbox_func +from idlelib import textview +import os.path +from platform import python_version + +About = help_about.AboutDialog + + +class LiveDialogTest(unittest.TestCase): + """Simulate user clicking buttons other than [Close]. + + Test that invoked textview has text from source. + """ + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = Tk() + cls.root.withdraw() + cls.dialog = About(cls.root, 'About IDLE', _utest=True) + + @classmethod + def tearDownClass(cls): + del cls.dialog + cls.root.update_idletasks() + cls.root.destroy() + del cls.root + + def test_build_bits(self): + self.assertIn(help_about.bits, ('32', '64')) + + def test_dialog_title(self): + """Test about dialog title""" + self.assertEqual(self.dialog.title(), 'About IDLE') + + def test_dialog_logo(self): + """Test about dialog logo.""" + path, file = os.path.split(self.dialog.icon_image['file']) + fn, ext = os.path.splitext(file) + self.assertEqual(fn, 'idle_48') + + def test_printer_buttons(self): + """Test buttons whose commands use printer function.""" + dialog = self.dialog + button_sources = [(dialog.py_license, license, 'license'), + (dialog.py_copyright, copyright, 'copyright'), + (dialog.py_credits, credits, 'credits')] + + for button, printer, name in button_sources: + with self.subTest(name=name): + printer._Printer__setup() + button.invoke() + get = dialog._current_textview.viewframe.textframe.text.get + lines = printer._Printer__lines + if len(lines) < 2: + self.fail(name + ' full text was not found') + self.assertEqual(lines[0], get('1.0', '1.end')) + self.assertEqual(lines[1], get('2.0', '2.end')) + dialog._current_textview.destroy() + + def test_file_buttons(self): + """Test buttons that display files.""" + dialog = self.dialog + button_sources = [(self.dialog.readme, 'README.txt', 'readme'), + (self.dialog.idle_news, 'News3.txt', 'news'), + (self.dialog.idle_credits, 'CREDITS.txt', 'credits')] + + for button, filename, name in button_sources: + with self.subTest(name=name): + button.invoke() + fn = findfile(filename, subdir='idlelib') + get = dialog._current_textview.viewframe.textframe.text.get + with open(fn, encoding='utf-8') as f: + self.assertEqual(f.readline().strip(), get('1.0', '1.end')) + f.readline() + self.assertEqual(f.readline().strip(), get('3.0', '3.end')) + dialog._current_textview.destroy() + + +class DefaultTitleTest(unittest.TestCase): + "Test default title." + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = Tk() + cls.root.withdraw() + cls.dialog = About(cls.root, _utest=True) + + @classmethod + def tearDownClass(cls): + del cls.dialog + cls.root.update_idletasks() + cls.root.destroy() + del cls.root + + def test_dialog_title(self): + """Test about dialog title""" + self.assertEqual(self.dialog.title(), + f'About IDLE {python_version()}' + f' ({help_about.bits} bit)') + + +class CloseTest(unittest.TestCase): + """Simulate user clicking [Close] button""" + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = Tk() + cls.root.withdraw() + cls.dialog = About(cls.root, 'About IDLE', _utest=True) + + @classmethod + def tearDownClass(cls): + del cls.dialog + cls.root.update_idletasks() + cls.root.destroy() + del cls.root + + def test_close(self): + self.assertEqual(self.dialog.winfo_class(), 'Toplevel') + self.dialog.button_ok.invoke() + with self.assertRaises(TclError): + self.dialog.winfo_class() + + +class Dummy_about_dialog: + # Dummy class for testing file display functions. + idle_credits = About.show_idle_credits + idle_readme = About.show_readme + idle_news = About.show_idle_news + # Called by the above + display_file_text = About.display_file_text + _utest = True + + +class DisplayFileTest(unittest.TestCase): + """Test functions that display files. + + While somewhat redundant with gui-based test_file_dialog, + these unit tests run on all buildbots, not just a few. + """ + dialog = Dummy_about_dialog() + + @classmethod + def setUpClass(cls): + cls.orig_error = textview.showerror + cls.orig_view = textview.view_text + cls.error = Mbox_func() + cls.view = Func() + textview.showerror = cls.error + textview.view_text = cls.view + + @classmethod + def tearDownClass(cls): + textview.showerror = cls.orig_error + textview.view_text = cls.orig_view + + def test_file_display(self): + for handler in (self.dialog.idle_credits, + self.dialog.idle_readme, + self.dialog.idle_news): + self.error.message = '' + self.view.called = False + with self.subTest(handler=handler): + handler() + self.assertEqual(self.error.message, '') + self.assertEqual(self.view.called, True) + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_history.py b/Lib/idlelib/idle_test/test_history.py new file mode 100644 index 000000000..675396514 --- /dev/null +++ b/Lib/idlelib/idle_test/test_history.py @@ -0,0 +1,172 @@ +" Test history, coverage 100%." + +from idlelib.history import History +import unittest +from test.support import requires + +import tkinter as tk +from tkinter import Text as tkText +from idlelib.idle_test.mock_tk import Text as mkText +from idlelib.config import idleConf + +line1 = 'a = 7' +line2 = 'b = a' + + +class StoreTest(unittest.TestCase): + '''Tests History.__init__ and History.store with mock Text''' + + @classmethod + def setUpClass(cls): + cls.text = mkText() + cls.history = History(cls.text) + + def tearDown(self): + self.text.delete('1.0', 'end') + self.history.history = [] + + def test_init(self): + self.assertIs(self.history.text, self.text) + self.assertEqual(self.history.history, []) + self.assertIsNone(self.history.prefix) + self.assertIsNone(self.history.pointer) + self.assertEqual(self.history.cyclic, + idleConf.GetOption("main", "History", "cyclic", 1, "bool")) + + def test_store_short(self): + self.history.store('a') + self.assertEqual(self.history.history, []) + self.history.store(' a ') + self.assertEqual(self.history.history, []) + + def test_store_dup(self): + self.history.store(line1) + self.assertEqual(self.history.history, [line1]) + self.history.store(line2) + self.assertEqual(self.history.history, [line1, line2]) + self.history.store(line1) + self.assertEqual(self.history.history, [line2, line1]) + + def test_store_reset(self): + self.history.prefix = line1 + self.history.pointer = 0 + self.history.store(line2) + self.assertIsNone(self.history.prefix) + self.assertIsNone(self.history.pointer) + + +class TextWrapper: + def __init__(self, master): + self.text = tkText(master=master) + self._bell = False + def __getattr__(self, name): + return getattr(self.text, name) + def bell(self): + self._bell = True + + +class FetchTest(unittest.TestCase): + '''Test History.fetch with wrapped tk.Text. + ''' + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = tk.Tk() + cls.root.withdraw() + + def setUp(self): + self.text = text = TextWrapper(self.root) + text.insert('1.0', ">>> ") + text.mark_set('iomark', '1.4') + text.mark_gravity('iomark', 'left') + self.history = History(text) + self.history.history = [line1, line2] + + @classmethod + def tearDownClass(cls): + cls.root.destroy() + del cls.root + + def fetch_test(self, reverse, line, prefix, index, *, bell=False): + # Perform one fetch as invoked by Alt-N or Alt-P + # Test the result. The line test is the most important. + # The last two are diagnostic of fetch internals. + History = self.history + History.fetch(reverse) + + Equal = self.assertEqual + Equal(self.text.get('iomark', 'end-1c'), line) + Equal(self.text._bell, bell) + if bell: + self.text._bell = False + Equal(History.prefix, prefix) + Equal(History.pointer, index) + Equal(self.text.compare("insert", '==', "end-1c"), 1) + + def test_fetch_prev_cyclic(self): + prefix = '' + test = self.fetch_test + test(True, line2, prefix, 1) + test(True, line1, prefix, 0) + test(True, prefix, None, None, bell=True) + + def test_fetch_next_cyclic(self): + prefix = '' + test = self.fetch_test + test(False, line1, prefix, 0) + test(False, line2, prefix, 1) + test(False, prefix, None, None, bell=True) + + # Prefix 'a' tests skip line2, which starts with 'b' + def test_fetch_prev_prefix(self): + prefix = 'a' + self.text.insert('iomark', prefix) + self.fetch_test(True, line1, prefix, 0) + self.fetch_test(True, prefix, None, None, bell=True) + + def test_fetch_next_prefix(self): + prefix = 'a' + self.text.insert('iomark', prefix) + self.fetch_test(False, line1, prefix, 0) + self.fetch_test(False, prefix, None, None, bell=True) + + def test_fetch_prev_noncyclic(self): + prefix = '' + self.history.cyclic = False + test = self.fetch_test + test(True, line2, prefix, 1) + test(True, line1, prefix, 0) + test(True, line1, prefix, 0, bell=True) + + def test_fetch_next_noncyclic(self): + prefix = '' + self.history.cyclic = False + test = self.fetch_test + test(False, prefix, None, None, bell=True) + test(True, line2, prefix, 1) + test(False, prefix, None, None, bell=True) + test(False, prefix, None, None, bell=True) + + def test_fetch_cursor_move(self): + # Move cursor after fetch + self.history.fetch(reverse=True) # initialization + self.text.mark_set('insert', 'iomark') + self.fetch_test(True, line2, None, None, bell=True) + + def test_fetch_edit(self): + # Edit after fetch + self.history.fetch(reverse=True) # initialization + self.text.delete('iomark', 'insert', ) + self.text.insert('iomark', 'a =') + self.fetch_test(True, line1, 'a =', 0) # prefix is reset + + def test_history_prev_next(self): + # Minimally test functions bound to events + self.history.history_prev('dummy event') + self.assertEqual(self.history.pointer, 1) + self.history.history_next('dummy event') + self.assertEqual(self.history.pointer, None) + + +if __name__ == '__main__': + unittest.main(verbosity=2, exit=2) diff --git a/Lib/idlelib/idle_test/test_hyperparser.py b/Lib/idlelib/idle_test/test_hyperparser.py new file mode 100644 index 000000000..343843c41 --- /dev/null +++ b/Lib/idlelib/idle_test/test_hyperparser.py @@ -0,0 +1,276 @@ +"Test hyperparser, coverage 98%." + +from idlelib.hyperparser import HyperParser +import unittest +from test.support import requires +from tkinter import Tk, Text +from idlelib.editor import EditorWindow + +class DummyEditwin: + def __init__(self, text): + self.text = text + self.indentwidth = 8 + self.tabwidth = 8 + self.prompt_last_line = '>>>' + self.num_context_lines = 50, 500, 1000 + + _build_char_in_string_func = EditorWindow._build_char_in_string_func + is_char_in_string = EditorWindow.is_char_in_string + + +class HyperParserTest(unittest.TestCase): + code = ( + '"""This is a module docstring"""\n' + '# this line is a comment\n' + 'x = "this is a string"\n' + "y = 'this is also a string'\n" + 'l = [i for i in range(10)]\n' + 'm = [py*py for # comment\n' + ' py in l]\n' + 'x.__len__\n' + "z = ((r'asdf')+('a')))\n" + '[x for x in\n' + 'for = False\n' + 'cliché = "this is a string with unicode, what a cliché"' + ) + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = Tk() + cls.root.withdraw() + cls.text = Text(cls.root) + cls.editwin = DummyEditwin(cls.text) + + @classmethod + def tearDownClass(cls): + del cls.text, cls.editwin + cls.root.destroy() + del cls.root + + def setUp(self): + self.text.insert('insert', self.code) + + def tearDown(self): + self.text.delete('1.0', 'end') + self.editwin.prompt_last_line = '>>>' + + def get_parser(self, index): + """ + Return a parser object with index at 'index' + """ + return HyperParser(self.editwin, index) + + def test_init(self): + """ + test corner cases in the init method + """ + with self.assertRaises(ValueError) as ve: + self.text.tag_add('console', '1.0', '1.end') + p = self.get_parser('1.5') + self.assertIn('precedes', str(ve.exception)) + + # test without ps1 + self.editwin.prompt_last_line = '' + + # number of lines lesser than 50 + p = self.get_parser('end') + self.assertEqual(p.rawtext, self.text.get('1.0', 'end')) + + # number of lines greater than 50 + self.text.insert('end', self.text.get('1.0', 'end')*4) + p = self.get_parser('54.5') + + def test_is_in_string(self): + get = self.get_parser + + p = get('1.0') + self.assertFalse(p.is_in_string()) + p = get('1.4') + self.assertTrue(p.is_in_string()) + p = get('2.3') + self.assertFalse(p.is_in_string()) + p = get('3.3') + self.assertFalse(p.is_in_string()) + p = get('3.7') + self.assertTrue(p.is_in_string()) + p = get('4.6') + self.assertTrue(p.is_in_string()) + p = get('12.54') + self.assertTrue(p.is_in_string()) + + def test_is_in_code(self): + get = self.get_parser + + p = get('1.0') + self.assertTrue(p.is_in_code()) + p = get('1.1') + self.assertFalse(p.is_in_code()) + p = get('2.5') + self.assertFalse(p.is_in_code()) + p = get('3.4') + self.assertTrue(p.is_in_code()) + p = get('3.6') + self.assertFalse(p.is_in_code()) + p = get('4.14') + self.assertFalse(p.is_in_code()) + + def test_get_surrounding_bracket(self): + get = self.get_parser + + def without_mustclose(parser): + # a utility function to get surrounding bracket + # with mustclose=False + return parser.get_surrounding_brackets(mustclose=False) + + def with_mustclose(parser): + # a utility function to get surrounding bracket + # with mustclose=True + return parser.get_surrounding_brackets(mustclose=True) + + p = get('3.2') + self.assertIsNone(with_mustclose(p)) + self.assertIsNone(without_mustclose(p)) + + p = get('5.6') + self.assertTupleEqual(without_mustclose(p), ('5.4', '5.25')) + self.assertTupleEqual(without_mustclose(p), with_mustclose(p)) + + p = get('5.23') + self.assertTupleEqual(without_mustclose(p), ('5.21', '5.24')) + self.assertTupleEqual(without_mustclose(p), with_mustclose(p)) + + p = get('6.15') + self.assertTupleEqual(without_mustclose(p), ('6.4', '6.end')) + self.assertIsNone(with_mustclose(p)) + + p = get('9.end') + self.assertIsNone(with_mustclose(p)) + self.assertIsNone(without_mustclose(p)) + + def test_get_expression(self): + get = self.get_parser + + p = get('4.2') + self.assertEqual(p.get_expression(), 'y ') + + p = get('4.7') + with self.assertRaises(ValueError) as ve: + p.get_expression() + self.assertIn('is inside a code', str(ve.exception)) + + p = get('5.25') + self.assertEqual(p.get_expression(), 'range(10)') + + p = get('6.7') + self.assertEqual(p.get_expression(), 'py') + + p = get('6.8') + self.assertEqual(p.get_expression(), '') + + p = get('7.9') + self.assertEqual(p.get_expression(), 'py') + + p = get('8.end') + self.assertEqual(p.get_expression(), 'x.__len__') + + p = get('9.13') + self.assertEqual(p.get_expression(), "r'asdf'") + + p = get('9.17') + with self.assertRaises(ValueError) as ve: + p.get_expression() + self.assertIn('is inside a code', str(ve.exception)) + + p = get('10.0') + self.assertEqual(p.get_expression(), '') + + p = get('10.6') + self.assertEqual(p.get_expression(), '') + + p = get('10.11') + self.assertEqual(p.get_expression(), '') + + p = get('11.3') + self.assertEqual(p.get_expression(), '') + + p = get('11.11') + self.assertEqual(p.get_expression(), 'False') + + p = get('12.6') + self.assertEqual(p.get_expression(), 'cliché') + + def test_eat_identifier(self): + def is_valid_id(candidate): + result = HyperParser._eat_identifier(candidate, 0, len(candidate)) + if result == len(candidate): + return True + elif result == 0: + return False + else: + err_msg = "Unexpected result: {} (expected 0 or {}".format( + result, len(candidate) + ) + raise Exception(err_msg) + + # invalid first character which is valid elsewhere in an identifier + self.assertFalse(is_valid_id('2notid')) + + # ASCII-only valid identifiers + self.assertTrue(is_valid_id('valid_id')) + self.assertTrue(is_valid_id('_valid_id')) + self.assertTrue(is_valid_id('valid_id_')) + self.assertTrue(is_valid_id('_2valid_id')) + + # keywords which should be "eaten" + self.assertTrue(is_valid_id('True')) + self.assertTrue(is_valid_id('False')) + self.assertTrue(is_valid_id('None')) + + # keywords which should not be "eaten" + self.assertFalse(is_valid_id('for')) + self.assertFalse(is_valid_id('import')) + self.assertFalse(is_valid_id('return')) + + # valid unicode identifiers + self.assertTrue(is_valid_id('cliche')) + self.assertTrue(is_valid_id('cliché')) + self.assertTrue(is_valid_id('a٢')) + + # invalid unicode identifiers + self.assertFalse(is_valid_id('2a')) + self.assertFalse(is_valid_id('٢a')) + self.assertFalse(is_valid_id('a²')) + + # valid identifier after "punctuation" + self.assertEqual(HyperParser._eat_identifier('+ var', 0, 5), len('var')) + self.assertEqual(HyperParser._eat_identifier('+var', 0, 4), len('var')) + self.assertEqual(HyperParser._eat_identifier('.var', 0, 4), len('var')) + + # invalid identifiers + self.assertFalse(is_valid_id('+')) + self.assertFalse(is_valid_id(' ')) + self.assertFalse(is_valid_id(':')) + self.assertFalse(is_valid_id('?')) + self.assertFalse(is_valid_id('^')) + self.assertFalse(is_valid_id('\\')) + self.assertFalse(is_valid_id('"')) + self.assertFalse(is_valid_id('"a string"')) + + def test_eat_identifier_various_lengths(self): + eat_id = HyperParser._eat_identifier + + for length in range(1, 21): + self.assertEqual(eat_id('a' * length, 0, length), length) + self.assertEqual(eat_id('é' * length, 0, length), length) + self.assertEqual(eat_id('a' + '2' * (length - 1), 0, length), length) + self.assertEqual(eat_id('é' + '2' * (length - 1), 0, length), length) + self.assertEqual(eat_id('é' + 'a' * (length - 1), 0, length), length) + self.assertEqual(eat_id('é' * (length - 1) + 'a', 0, length), length) + self.assertEqual(eat_id('+' * length, 0, length), 0) + self.assertEqual(eat_id('2' + 'a' * (length - 1), 0, length), 0) + self.assertEqual(eat_id('2' + 'é' * (length - 1), 0, length), 0) + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_iomenu.py b/Lib/idlelib/idle_test/test_iomenu.py new file mode 100644 index 000000000..e0642cf0c --- /dev/null +++ b/Lib/idlelib/idle_test/test_iomenu.py @@ -0,0 +1,84 @@ +"Test , coverage 17%." + +from idlelib import iomenu +import unittest +from test.support import requires +from tkinter import Tk +from idlelib.editor import EditorWindow +from idlelib import util +from idlelib.idle_test.mock_idle import Func + +# Fail if either tokenize.open and t.detect_encoding does not exist. +# These are used in loadfile and encode. +# Also used in pyshell.MI.execfile and runscript.tabnanny. +from tokenize import open, detect_encoding +# Remove when we have proper tests that use both. + + +class IOBindingTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = Tk() + cls.root.withdraw() + cls.editwin = EditorWindow(root=cls.root) + cls.io = iomenu.IOBinding(cls.editwin) + + @classmethod + def tearDownClass(cls): + cls.io.close() + cls.editwin._close() + del cls.editwin + cls.root.update_idletasks() + for id in cls.root.tk.call('after', 'info'): + cls.root.after_cancel(id) # Need for EditorWindow. + cls.root.destroy() + del cls.root + + def test_init(self): + self.assertIs(self.io.editwin, self.editwin) + + def test_fixnewlines_end(self): + eq = self.assertEqual + io = self.io + fix = io.fixnewlines + text = io.editwin.text + + # Make the editor temporarily look like Shell. + self.editwin.interp = None + shelltext = '>>> if 1' + self.editwin.get_prompt_text = Func(result=shelltext) + eq(fix(), shelltext) # Get... call and '\n' not added. + del self.editwin.interp, self.editwin.get_prompt_text + + text.insert(1.0, 'a') + eq(fix(), 'a'+io.eol_convention) + eq(text.get('1.0', 'end-1c'), 'a\n') + eq(fix(), 'a'+io.eol_convention) + + +def _extension_in_filetypes(extension): + return any( + f'*{extension}' in filetype_tuple[1] + for filetype_tuple in iomenu.IOBinding.filetypes + ) + + +class FiletypesTest(unittest.TestCase): + def test_python_source_files(self): + for extension in util.py_extensions: + with self.subTest(extension=extension): + self.assertTrue( + _extension_in_filetypes(extension) + ) + + def test_text_files(self): + self.assertTrue(_extension_in_filetypes('.txt')) + + def test_all_files(self): + self.assertTrue(_extension_in_filetypes('')) + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_macosx.py b/Lib/idlelib/idle_test/test_macosx.py new file mode 100644 index 000000000..86da8849e --- /dev/null +++ b/Lib/idlelib/idle_test/test_macosx.py @@ -0,0 +1,113 @@ +"Test macosx, coverage 45% on Windows." + +from idlelib import macosx +import unittest +from test.support import requires +import tkinter as tk +import unittest.mock as mock +from idlelib.filelist import FileList + +mactypes = {'carbon', 'cocoa', 'xquartz'} +nontypes = {'other'} +alltypes = mactypes | nontypes + + +def setUpModule(): + global orig_tktype + orig_tktype = macosx._tk_type + + +def tearDownModule(): + macosx._tk_type = orig_tktype + + +class InitTktypeTest(unittest.TestCase): + "Test _init_tk_type." + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = tk.Tk() + cls.root.withdraw() + cls.orig_platform = macosx.platform + + @classmethod + def tearDownClass(cls): + cls.root.update_idletasks() + cls.root.destroy() + del cls.root + macosx.platform = cls.orig_platform + + def test_init_sets_tktype(self): + "Test that _init_tk_type sets _tk_type according to platform." + for platform, types in ('darwin', alltypes), ('other', nontypes): + with self.subTest(platform=platform): + macosx.platform = platform + macosx._tk_type = None + macosx._init_tk_type() + self.assertIn(macosx._tk_type, types) + + +class IsTypeTkTest(unittest.TestCase): + "Test each of the four isTypeTk predecates." + isfuncs = ((macosx.isAquaTk, ('carbon', 'cocoa')), + (macosx.isCarbonTk, ('carbon')), + (macosx.isCocoaTk, ('cocoa')), + (macosx.isXQuartz, ('xquartz')), + ) + + @mock.patch('idlelib.macosx._init_tk_type') + def test_is_calls_init(self, mockinit): + "Test that each isTypeTk calls _init_tk_type when _tk_type is None." + macosx._tk_type = None + for func, whentrue in self.isfuncs: + with self.subTest(func=func): + func() + self.assertTrue(mockinit.called) + mockinit.reset_mock() + + def test_isfuncs(self): + "Test that each isTypeTk return correct bool." + for func, whentrue in self.isfuncs: + for tktype in alltypes: + with self.subTest(func=func, whentrue=whentrue, tktype=tktype): + macosx._tk_type = tktype + (self.assertTrue if tktype in whentrue else self.assertFalse)\ + (func()) + + +class SetupTest(unittest.TestCase): + "Test setupApp." + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = tk.Tk() + cls.root.withdraw() + def cmd(tkpath, func): + assert isinstance(tkpath, str) + assert isinstance(func, type(cmd)) + cls.root.createcommand = cmd + + @classmethod + def tearDownClass(cls): + cls.root.update_idletasks() + cls.root.destroy() + del cls.root + + @mock.patch('idlelib.macosx.overrideRootMenu') #27312 + def test_setupapp(self, overrideRootMenu): + "Call setupApp with each possible graphics type." + root = self.root + flist = FileList(root) + for tktype in alltypes: + with self.subTest(tktype=tktype): + macosx._tk_type = tktype + macosx.setupApp(root, flist) + if tktype in ('carbon', 'cocoa'): + self.assertTrue(overrideRootMenu.called) + overrideRootMenu.reset_mock() + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_mainmenu.py b/Lib/idlelib/idle_test/test_mainmenu.py new file mode 100644 index 000000000..51d2accfe --- /dev/null +++ b/Lib/idlelib/idle_test/test_mainmenu.py @@ -0,0 +1,42 @@ +"Test mainmenu, coverage 100%." +# Reported as 88%; mocking turtledemo absence would have no point. + +from idlelib import mainmenu +import re +import unittest + + +class MainMenuTest(unittest.TestCase): + + def test_menudefs(self): + actual = [item[0] for item in mainmenu.menudefs] + expect = ['file', 'edit', 'format', 'run', 'shell', + 'debug', 'options', 'window', 'help'] + self.assertEqual(actual, expect) + + def test_default_keydefs(self): + self.assertGreaterEqual(len(mainmenu.default_keydefs), 50) + + def test_tcl_indexes(self): + # Test tcl patterns used to find menuitem to alter. + # On failure, change pattern here and in function(s). + # Patterns here have '.*' for re instead of '*' for tcl. + for menu, pattern in ( + ('debug', '.*tack.*iewer'), # PyShell.debug_menu_postcommand + ('options', '.*ode.*ontext'), # EW.__init__, CodeContext.toggle... + ('options', '.*ine.*umbers'), # EW.__init__, EW.toggle...event. + ): + with self.subTest(menu=menu, pattern=pattern): + for menutup in mainmenu.menudefs: + if menutup[0] == menu: + break + else: + self.assertTrue(0, f"{menu} not in menudefs") + self.assertTrue(any(re.search(pattern, menuitem[0]) + for menuitem in menutup[1] + if menuitem is not None), # Separator. + f"{pattern} not in {menu}") + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_multicall.py b/Lib/idlelib/idle_test/test_multicall.py new file mode 100644 index 000000000..67f28db6b --- /dev/null +++ b/Lib/idlelib/idle_test/test_multicall.py @@ -0,0 +1,48 @@ +"Test multicall, coverage 33%." + +from idlelib import multicall +import unittest +from test.support import requires +from tkinter import Tk, Text + + +class MultiCallTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = Tk() + cls.root.withdraw() + cls.mc = multicall.MultiCallCreator(Text) + + @classmethod + def tearDownClass(cls): + del cls.mc + cls.root.update_idletasks() +## for id in cls.root.tk.call('after', 'info'): +## cls.root.after_cancel(id) # Need for EditorWindow. + cls.root.destroy() + del cls.root + + def test_creator(self): + mc = self.mc + self.assertIs(multicall._multicall_dict[Text], mc) + self.assertIsSubclass(mc, Text) + mc2 = multicall.MultiCallCreator(Text) + self.assertIs(mc, mc2) + + def test_init(self): + mctext = self.mc(self.root) + self.assertIsInstance(mctext._MultiCall__binders, list) + + def test_yview(self): + # Added for tree.wheel_event + # (it depends on yview to not be overridden) + mc = self.mc + self.assertIs(mc.yview, Text.yview) + mctext = self.mc(self.root) + self.assertIs(mctext.yview.__func__, Text.yview) + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_outwin.py b/Lib/idlelib/idle_test/test_outwin.py new file mode 100644 index 000000000..0f13363f8 --- /dev/null +++ b/Lib/idlelib/idle_test/test_outwin.py @@ -0,0 +1,172 @@ +"Test outwin, coverage 76%." + +from idlelib import outwin +import platform +import sys +import unittest +from test.support import requires +from tkinter import Tk, Text +from idlelib.idle_test.mock_tk import Mbox_func +from idlelib.idle_test.mock_idle import Func +from unittest import mock + + +class OutputWindowTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + root = cls.root = Tk() + root.withdraw() + w = cls.window = outwin.OutputWindow(None, None, None, root) + cls.text = w.text = Text(root) + if sys.platform == 'darwin': # Issue 112938 + cls.text.update = cls.text.update_idletasks + # Without this, test write, writelines, and goto... fail. + # The reasons and why macOS-specific are unclear. + + @classmethod + def tearDownClass(cls): + cls.window.close() + del cls.text, cls.window + cls.root.destroy() + del cls.root + + def setUp(self): + self.text.delete('1.0', 'end') + + def test_ispythonsource(self): + # OutputWindow overrides ispythonsource to always return False. + w = self.window + self.assertFalse(w.ispythonsource('test.txt')) + self.assertFalse(w.ispythonsource(__file__)) + + def test_window_title(self): + self.assertEqual(self.window.top.title(), 'Output' + ' (%s)' % platform.python_version()) + + def test_maybesave(self): + w = self.window + eq = self.assertEqual + w.get_saved = Func() + + w.get_saved.result = False + eq(w.maybesave(), 'no') + eq(w.get_saved.called, 1) + + w.get_saved.result = True + eq(w.maybesave(), 'yes') + eq(w.get_saved.called, 2) + del w.get_saved + + def test_write(self): + eq = self.assertEqual + delete = self.text.delete + get = self.text.get + write = self.window.write + + # No new line - insert stays on same line. + delete('1.0', 'end') + test_text = 'test text' + eq(write(test_text), len(test_text)) + eq(get('1.0', '1.end'), 'test text') + eq(get('insert linestart', 'insert lineend'), 'test text') + + # New line - insert moves to next line. + delete('1.0', 'end') + test_text = 'test text\n' + eq(write(test_text), len(test_text)) + eq(get('1.0', '1.end'), 'test text') + eq(get('insert linestart', 'insert lineend'), '') + + # Text after new line is tagged for second line of Text widget. + delete('1.0', 'end') + test_text = 'test text\nLine 2' + eq(write(test_text), len(test_text)) + eq(get('1.0', '1.end'), 'test text') + eq(get('2.0', '2.end'), 'Line 2') + eq(get('insert linestart', 'insert lineend'), 'Line 2') + + # Test tags. + delete('1.0', 'end') + test_text = 'test text\n' + test_text2 = 'Line 2\n' + eq(write(test_text, tags='mytag'), len(test_text)) + eq(write(test_text2, tags='secondtag'), len(test_text2)) + eq(get('mytag.first', 'mytag.last'), test_text) + eq(get('secondtag.first', 'secondtag.last'), test_text2) + eq(get('1.0', '1.end'), test_text.rstrip('\n')) + eq(get('2.0', '2.end'), test_text2.rstrip('\n')) + + def test_writelines(self): + eq = self.assertEqual + get = self.text.get + writelines = self.window.writelines + + writelines(('Line 1\n', 'Line 2\n', 'Line 3\n')) + eq(get('1.0', '1.end'), 'Line 1') + eq(get('2.0', '2.end'), 'Line 2') + eq(get('3.0', '3.end'), 'Line 3') + eq(get('insert linestart', 'insert lineend'), '') + + def test_goto_file_line(self): + eq = self.assertEqual + w = self.window + text = self.text + + w.flist = mock.Mock() + gfl = w.flist.gotofileline = Func() + showerror = w.showerror = Mbox_func() + + # No file/line number. + w.write('Not a file line') + self.assertIsNone(w.goto_file_line()) + eq(gfl.called, 0) + eq(showerror.title, 'No special line') + + # Current file/line number. + w.write(f'{str(__file__)}: 42: spam\n') + w.write(f'{str(__file__)}: 21: spam') + self.assertIsNone(w.goto_file_line()) + eq(gfl.args, (str(__file__), 21)) + + # Previous line has file/line number. + text.delete('1.0', 'end') + w.write(f'{str(__file__)}: 42: spam\n') + w.write('Not a file line') + self.assertIsNone(w.goto_file_line()) + eq(gfl.args, (str(__file__), 42)) + + del w.flist.gotofileline, w.showerror + + +class ModuleFunctionTest(unittest.TestCase): + + @classmethod + def setUp(cls): + outwin.file_line_progs = None + + def test_compile_progs(self): + outwin.compile_progs() + for pat, regex in zip(outwin.file_line_pats, outwin.file_line_progs): + self.assertEqual(regex.pattern, pat) + + @mock.patch('builtins.open') + def test_file_line_helper(self, mock_open): + flh = outwin.file_line_helper + test_lines = ( + (r'foo file "testfile1", line 42, bar', ('testfile1', 42)), + (r'foo testfile2(21) bar', ('testfile2', 21)), + (r' testfile3 : 42: foo bar\n', (' testfile3 ', 42)), + (r'foo testfile4.py :1: ', ('foo testfile4.py ', 1)), + ('testfile5: \u19D4\u19D2: ', ('testfile5', 42)), + (r'testfile6: 42', None), # only one `:` + (r'testfile7 42 text', None) # no separators + ) + for line, expected_output in test_lines: + self.assertEqual(flh(line), expected_output) + if expected_output: + mock_open.assert_called_with(expected_output[0]) + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_parenmatch.py b/Lib/idlelib/idle_test/test_parenmatch.py new file mode 100644 index 000000000..2e10d7cd3 --- /dev/null +++ b/Lib/idlelib/idle_test/test_parenmatch.py @@ -0,0 +1,112 @@ +"""Test parenmatch, coverage 91%. + +This must currently be a gui test because ParenMatch methods use +several text methods not defined on idlelib.idle_test.mock_tk.Text. +""" +from idlelib.parenmatch import ParenMatch +from test.support import requires +requires('gui') + +import unittest +from unittest.mock import Mock +from tkinter import Tk, Text + + +class DummyEditwin: + def __init__(self, text): + self.text = text + self.indentwidth = 8 + self.tabwidth = 8 + self.prompt_last_line = '>>>' # Currently not used by parenmatch. + + +class ParenMatchTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + cls.root = Tk() + cls.root.withdraw() + cls.text = Text(cls.root) + cls.editwin = DummyEditwin(cls.text) + cls.editwin.text_frame = Mock() + + @classmethod + def tearDownClass(cls): + del cls.text, cls.editwin + cls.root.update_idletasks() + cls.root.destroy() + del cls.root + + def tearDown(self): + self.text.delete('1.0', 'end') + + def get_parenmatch(self): + pm = ParenMatch(self.editwin) + pm.bell = lambda: None + return pm + + def test_paren_styles(self): + """ + Test ParenMatch with each style. + """ + text = self.text + pm = self.get_parenmatch() + for style, range1, range2 in ( + ('opener', ('1.10', '1.11'), ('1.10', '1.11')), + ('default',('1.10', '1.11'),('1.10', '1.11')), + ('parens', ('1.14', '1.15'), ('1.15', '1.16')), + ('expression', ('1.10', '1.15'), ('1.10', '1.16'))): + with self.subTest(style=style): + text.delete('1.0', 'end') + pm.STYLE = style + text.insert('insert', 'def foobar(a, b') + + pm.flash_paren_event('event') + self.assertIn('<<parenmatch-check-restore>>', text.event_info()) + if style == 'parens': + self.assertTupleEqual(text.tag_nextrange('paren', '1.0'), + ('1.10', '1.11')) + self.assertTupleEqual( + text.tag_prevrange('paren', 'end'), range1) + + text.insert('insert', ')') + pm.restore_event() + self.assertNotIn('<<parenmatch-check-restore>>', + text.event_info()) + self.assertEqual(text.tag_prevrange('paren', 'end'), ()) + + pm.paren_closed_event('event') + self.assertTupleEqual( + text.tag_prevrange('paren', 'end'), range2) + + def test_paren_corner(self): + """ + Test corner cases in flash_paren_event and paren_closed_event. + + Force execution of conditional expressions and alternate paths. + """ + text = self.text + pm = self.get_parenmatch() + + text.insert('insert', '# Comment.)') + pm.paren_closed_event('event') + + text.insert('insert', '\ndef') + pm.flash_paren_event('event') + pm.paren_closed_event('event') + + text.insert('insert', ' a, *arg)') + pm.paren_closed_event('event') + + def test_handle_restore_timer(self): + pm = self.get_parenmatch() + pm.restore_event = Mock() + pm.handle_restore_timer(0) + self.assertTrue(pm.restore_event.called) + pm.restore_event.reset_mock() + pm.handle_restore_timer(1) + self.assertFalse(pm.restore_event.called) + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_pathbrowser.py b/Lib/idlelib/idle_test/test_pathbrowser.py new file mode 100644 index 000000000..13d8b9e1b --- /dev/null +++ b/Lib/idlelib/idle_test/test_pathbrowser.py @@ -0,0 +1,86 @@ +"Test pathbrowser, coverage 95%." + +from idlelib import pathbrowser +import unittest +from test.support import requires +from tkinter import Tk + +import os.path +import pyclbr # for _modules +import sys # for sys.path + +from idlelib.idle_test.mock_idle import Func +import idlelib # for __file__ +from idlelib import browser +from idlelib.tree import TreeNode + + +class PathBrowserTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = Tk() + cls.root.withdraw() + cls.pb = pathbrowser.PathBrowser(cls.root, _utest=True) + + @classmethod + def tearDownClass(cls): + cls.pb.close() + cls.root.update_idletasks() + cls.root.destroy() + del cls.root, cls.pb + + def test_init(self): + pb = self.pb + eq = self.assertEqual + eq(pb.master, self.root) + eq(pyclbr._modules, {}) + self.assertIsInstance(pb.node, TreeNode) + self.assertIsNotNone(browser.file_open) + + def test_settitle(self): + pb = self.pb + self.assertEqual(pb.top.title(), 'Path Browser') + self.assertEqual(pb.top.iconname(), 'Path Browser') + + def test_rootnode(self): + pb = self.pb + rn = pb.rootnode() + self.assertIsInstance(rn, pathbrowser.PathBrowserTreeItem) + + def test_close(self): + pb = self.pb + pb.top.destroy = Func() + pb.node.destroy = Func() + pb.close() + self.assertTrue(pb.top.destroy.called) + self.assertTrue(pb.node.destroy.called) + del pb.top.destroy, pb.node.destroy + + +class DirBrowserTreeItemTest(unittest.TestCase): + + def test_DirBrowserTreeItem(self): + # Issue16226 - make sure that getting a sublist works + d = pathbrowser.DirBrowserTreeItem('') + d.GetSubList() + self.assertEqual('', d.GetText()) + + dir = os.path.split(os.path.abspath(idlelib.__file__))[0] + self.assertEqual(d.ispackagedir(dir), True) + self.assertEqual(d.ispackagedir(dir + '/Icons'), False) + + +class PathBrowserTreeItemTest(unittest.TestCase): + + def test_PathBrowserTreeItem(self): + p = pathbrowser.PathBrowserTreeItem() + self.assertEqual(p.GetText(), 'sys.path') + sub = p.GetSubList() + self.assertEqual(len(sub), len(sys.path)) + self.assertEqual(type(sub[0]), pathbrowser.DirBrowserTreeItem) + + +if __name__ == '__main__': + unittest.main(verbosity=2, exit=False) diff --git a/Lib/idlelib/idle_test/test_percolator.py b/Lib/idlelib/idle_test/test_percolator.py new file mode 100644 index 000000000..17668ccd1 --- /dev/null +++ b/Lib/idlelib/idle_test/test_percolator.py @@ -0,0 +1,118 @@ +"Test percolator, coverage 100%." + +from idlelib.percolator import Percolator, Delegator +import unittest +from test.support import requires +requires('gui') +from tkinter import Text, Tk, END + + +class MyFilter(Delegator): + def __init__(self): + Delegator.__init__(self, None) + + def insert(self, *args): + self.insert_called_with = args + self.delegate.insert(*args) + + def delete(self, *args): + self.delete_called_with = args + self.delegate.delete(*args) + + def uppercase_insert(self, index, chars, tags=None): + chars = chars.upper() + self.delegate.insert(index, chars) + + def lowercase_insert(self, index, chars, tags=None): + chars = chars.lower() + self.delegate.insert(index, chars) + + def dont_insert(self, index, chars, tags=None): + pass + + +class PercolatorTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + cls.root = Tk() + cls.text = Text(cls.root) + + @classmethod + def tearDownClass(cls): + del cls.text + cls.root.destroy() + del cls.root + + def setUp(self): + self.percolator = Percolator(self.text) + self.filter_one = MyFilter() + self.filter_two = MyFilter() + self.percolator.insertfilter(self.filter_one) + self.percolator.insertfilter(self.filter_two) + + def tearDown(self): + self.percolator.close() + self.text.delete('1.0', END) + + def test_insertfilter(self): + self.assertIsNotNone(self.filter_one.delegate) + self.assertEqual(self.percolator.top, self.filter_two) + self.assertEqual(self.filter_two.delegate, self.filter_one) + self.assertEqual(self.filter_one.delegate, self.percolator.bottom) + + def test_removefilter(self): + filter_three = MyFilter() + self.percolator.removefilter(self.filter_two) + self.assertEqual(self.percolator.top, self.filter_one) + self.assertIsNone(self.filter_two.delegate) + + filter_three = MyFilter() + self.percolator.insertfilter(self.filter_two) + self.percolator.insertfilter(filter_three) + self.percolator.removefilter(self.filter_one) + self.assertEqual(self.percolator.top, filter_three) + self.assertEqual(filter_three.delegate, self.filter_two) + self.assertEqual(self.filter_two.delegate, self.percolator.bottom) + self.assertIsNone(self.filter_one.delegate) + + def test_insert(self): + self.text.insert('insert', 'foo') + self.assertEqual(self.text.get('1.0', END), 'foo\n') + self.assertTupleEqual(self.filter_one.insert_called_with, + ('insert', 'foo', None)) + + def test_modify_insert(self): + self.filter_one.insert = self.filter_one.uppercase_insert + self.text.insert('insert', 'bAr') + self.assertEqual(self.text.get('1.0', END), 'BAR\n') + + def test_modify_chain_insert(self): + filter_three = MyFilter() + self.percolator.insertfilter(filter_three) + self.filter_two.insert = self.filter_two.uppercase_insert + self.filter_one.insert = self.filter_one.lowercase_insert + self.text.insert('insert', 'BaR') + self.assertEqual(self.text.get('1.0', END), 'bar\n') + + def test_dont_insert(self): + self.filter_one.insert = self.filter_one.dont_insert + self.text.insert('insert', 'foo bar') + self.assertEqual(self.text.get('1.0', END), '\n') + self.filter_one.insert = self.filter_one.dont_insert + self.text.insert('insert', 'foo bar') + self.assertEqual(self.text.get('1.0', END), '\n') + + def test_without_filter(self): + self.text.insert('insert', 'hello') + self.assertEqual(self.text.get('1.0', 'end'), 'hello\n') + + def test_delete(self): + self.text.insert('insert', 'foo') + self.text.delete('1.0', '1.2') + self.assertEqual(self.text.get('1.0', END), 'o\n') + self.assertTupleEqual(self.filter_one.delete_called_with, + ('1.0', '1.2')) + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_pyparse.py b/Lib/idlelib/idle_test/test_pyparse.py new file mode 100644 index 000000000..384db566a --- /dev/null +++ b/Lib/idlelib/idle_test/test_pyparse.py @@ -0,0 +1,483 @@ +"Test pyparse, coverage 96%." + +from idlelib import pyparse +import unittest +from collections import namedtuple + + +class ParseMapTest(unittest.TestCase): + + def test_parsemap(self): + keepwhite = {ord(c): ord(c) for c in ' \t\n\r'} + mapping = pyparse.ParseMap(keepwhite) + self.assertEqual(mapping[ord('\t')], ord('\t')) + self.assertEqual(mapping[ord('a')], ord('x')) + self.assertEqual(mapping[1000], ord('x')) + + def test_trans(self): + # trans is the production instance of ParseMap, used in _study1 + parser = pyparse.Parser(4, 4) + self.assertEqual('\t a([{b}])b"c\'d\n'.translate(pyparse.trans), + 'xxx(((x)))x"x\'x\n') + + +class PyParseTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + cls.parser = pyparse.Parser(indentwidth=4, tabwidth=4) + + @classmethod + def tearDownClass(cls): + del cls.parser + + def test_init(self): + self.assertEqual(self.parser.indentwidth, 4) + self.assertEqual(self.parser.tabwidth, 4) + + def test_set_code(self): + eq = self.assertEqual + p = self.parser + setcode = p.set_code + + # Not empty and doesn't end with newline. + with self.assertRaises(AssertionError): + setcode('a') + + tests = ('', + 'a\n') + + for string in tests: + with self.subTest(string=string): + setcode(string) + eq(p.code, string) + eq(p.study_level, 0) + + def test_find_good_parse_start(self): + eq = self.assertEqual + p = self.parser + setcode = p.set_code + start = p.find_good_parse_start + def char_in_string_false(index): return False + + # First line starts with 'def' and ends with ':', then 0 is the pos. + setcode('def spam():\n') + eq(start(char_in_string_false), 0) + + # First line begins with a keyword in the list and ends + # with an open brace, then 0 is the pos. This is how + # hyperparser calls this function as the newline is not added + # in the editor, but rather on the call to setcode. + setcode('class spam( ' + ' \n') + eq(start(char_in_string_false), 0) + + # Split def across lines. + setcode('"""This is a module docstring"""\n' + 'class C:\n' + ' def __init__(self, a,\n' + ' b=True):\n' + ' pass\n' + ) + pos0, pos = 33, 42 # Start of 'class...', ' def' lines. + + # Passing no value or non-callable should fail (issue 32989). + with self.assertRaises(TypeError): + start() + with self.assertRaises(TypeError): + start(False) + + # Make text look like a string. This returns pos as the start + # position, but it's set to None. + self.assertIsNone(start(is_char_in_string=lambda index: True)) + + # Make all text look like it's not in a string. This means that it + # found a good start position. + eq(start(char_in_string_false), pos) + + # If the beginning of the def line is not in a string, then it + # returns that as the index. + eq(start(is_char_in_string=lambda index: index > pos), pos) + # If the beginning of the def line is in a string, then it + # looks for a previous index. + eq(start(is_char_in_string=lambda index: index >= pos), pos0) + # If everything before the 'def' is in a string, then returns None. + # The non-continuation def line returns 44 (see below). + eq(start(is_char_in_string=lambda index: index < pos), None) + + # Code without extra line break in def line - mostly returns the same + # values. + setcode('"""This is a module docstring"""\n' + 'class C:\n' + ' def __init__(self, a, b=True):\n' + ' pass\n' + ) # Does not affect class, def positions. + eq(start(char_in_string_false), pos) + eq(start(is_char_in_string=lambda index: index > pos), pos) + eq(start(is_char_in_string=lambda index: index >= pos), pos0) + # When the def line isn't split, this returns which doesn't match the + # split line test. + eq(start(is_char_in_string=lambda index: index < pos), pos) + + def test_set_lo(self): + code = ( + '"""This is a module docstring"""\n' + 'class C:\n' + ' def __init__(self, a,\n' + ' b=True):\n' + ' pass\n' + ) + pos = 42 + p = self.parser + p.set_code(code) + + # Previous character is not a newline. + with self.assertRaises(AssertionError): + p.set_lo(5) + + # A value of 0 doesn't change self.code. + p.set_lo(0) + self.assertEqual(p.code, code) + + # An index that is preceded by a newline. + p.set_lo(pos) + self.assertEqual(p.code, code[pos:]) + + def test_study1(self): + eq = self.assertEqual + p = self.parser + setcode = p.set_code + study = p._study1 + + (NONE, BACKSLASH, FIRST, NEXT, BRACKET) = range(5) + TestInfo = namedtuple('TestInfo', ['string', 'goodlines', + 'continuation']) + tests = ( + TestInfo('', [0], NONE), + # Docstrings. + TestInfo('"""This is a complete docstring."""\n', [0, 1], NONE), + TestInfo("'''This is a complete docstring.'''\n", [0, 1], NONE), + TestInfo('"""This is a continued docstring.\n', [0, 1], FIRST), + TestInfo("'''This is a continued docstring.\n", [0, 1], FIRST), + TestInfo('"""Closing quote does not match."\n', [0, 1], FIRST), + TestInfo('"""Bracket in docstring [\n', [0, 1], FIRST), + TestInfo("'''Incomplete two line docstring.\n\n", [0, 2], NEXT), + # Single-quoted strings. + TestInfo('"This is a complete string."\n', [0, 1], NONE), + TestInfo('"This is an incomplete string.\n', [0, 1], NONE), + TestInfo("'This is more incomplete.\n\n", [0, 1, 2], NONE), + # Comment (backslash does not continue comments). + TestInfo('# Comment\\\n', [0, 1], NONE), + # Brackets. + TestInfo('("""Complete string in bracket"""\n', [0, 1], BRACKET), + TestInfo('("""Open string in bracket\n', [0, 1], FIRST), + TestInfo('a = (1 + 2) - 5 *\\\n', [0, 1], BACKSLASH), # No bracket. + TestInfo('\n def function1(self, a,\n b):\n', + [0, 1, 3], NONE), + TestInfo('\n def function1(self, a,\\\n', [0, 1, 2], BRACKET), + TestInfo('\n def function1(self, a,\n', [0, 1, 2], BRACKET), + TestInfo('())\n', [0, 1], NONE), # Extra closer. + TestInfo(')(\n', [0, 1], BRACKET), # Extra closer. + # For the mismatched example, it doesn't look like continuation. + TestInfo('{)(]\n', [0, 1], NONE), # Mismatched. + ) + + for test in tests: + with self.subTest(string=test.string): + setcode(test.string) # resets study_level + study() + eq(p.study_level, 1) + eq(p.goodlines, test.goodlines) + eq(p.continuation, test.continuation) + + # Called again, just returns without reprocessing. + self.assertIsNone(study()) + + def test_get_continuation_type(self): + eq = self.assertEqual + p = self.parser + setcode = p.set_code + gettype = p.get_continuation_type + + (NONE, BACKSLASH, FIRST, NEXT, BRACKET) = range(5) + TestInfo = namedtuple('TestInfo', ['string', 'continuation']) + tests = ( + TestInfo('', NONE), + TestInfo('"""This is a continuation docstring.\n', FIRST), + TestInfo("'''This is a multiline-continued docstring.\n\n", NEXT), + TestInfo('a = (1 + 2) - 5 *\\\n', BACKSLASH), + TestInfo('\n def function1(self, a,\\\n', BRACKET) + ) + + for test in tests: + with self.subTest(string=test.string): + setcode(test.string) + eq(gettype(), test.continuation) + + def test_study2(self): + eq = self.assertEqual + p = self.parser + setcode = p.set_code + study = p._study2 + + TestInfo = namedtuple('TestInfo', ['string', 'start', 'end', 'lastch', + 'openbracket', 'bracketing']) + tests = ( + TestInfo('', 0, 0, '', None, ((0, 0),)), + TestInfo("'''This is a multiline continuation docstring.\n\n", + 0, 48, "'", None, ((0, 0), (0, 1), (48, 0))), + TestInfo(' # Comment\\\n', + 0, 12, '', None, ((0, 0), (1, 1), (12, 0))), + # A comment without a space is a special case + TestInfo(' #Comment\\\n', + 0, 0, '', None, ((0, 0),)), + # Backslash continuation. + TestInfo('a = (1 + 2) - 5 *\\\n', + 0, 19, '*', None, ((0, 0), (4, 1), (11, 0))), + # Bracket continuation with close. + TestInfo('\n def function1(self, a,\n b):\n', + 1, 48, ':', None, ((1, 0), (17, 1), (46, 0))), + # Bracket continuation with unneeded backslash. + TestInfo('\n def function1(self, a,\\\n', + 1, 28, ',', 17, ((1, 0), (17, 1))), + # Bracket continuation. + TestInfo('\n def function1(self, a,\n', + 1, 27, ',', 17, ((1, 0), (17, 1))), + # Bracket continuation with comment at end of line with text. + TestInfo('\n def function1(self, a, # End of line comment.\n', + 1, 51, ',', 17, ((1, 0), (17, 1), (28, 2), (51, 1))), + # Multi-line statement with comment line in between code lines. + TestInfo(' a = ["first item",\n # Comment line\n "next item",\n', + 0, 55, ',', 6, ((0, 0), (6, 1), (7, 2), (19, 1), + (23, 2), (38, 1), (42, 2), (53, 1))), + TestInfo('())\n', + 0, 4, ')', None, ((0, 0), (0, 1), (2, 0), (3, 0))), + TestInfo(')(\n', 0, 3, '(', 1, ((0, 0), (1, 0), (1, 1))), + # Wrong closers still decrement stack level. + TestInfo('{)(]\n', + 0, 5, ']', None, ((0, 0), (0, 1), (2, 0), (2, 1), (4, 0))), + # Character after backslash. + TestInfo(':\\a\n', 0, 4, '\\a', None, ((0, 0),)), + TestInfo('\n', 0, 0, '', None, ((0, 0),)), + ) + + for test in tests: + with self.subTest(string=test.string): + setcode(test.string) + study() + eq(p.study_level, 2) + eq(p.stmt_start, test.start) + eq(p.stmt_end, test.end) + eq(p.lastch, test.lastch) + eq(p.lastopenbracketpos, test.openbracket) + eq(p.stmt_bracketing, test.bracketing) + + # Called again, just returns without reprocessing. + self.assertIsNone(study()) + + def test_get_num_lines_in_stmt(self): + eq = self.assertEqual + p = self.parser + setcode = p.set_code + getlines = p.get_num_lines_in_stmt + + TestInfo = namedtuple('TestInfo', ['string', 'lines']) + tests = ( + TestInfo('[x for x in a]\n', 1), # Closed on one line. + TestInfo('[x\nfor x in a\n', 2), # Not closed. + TestInfo('[x\\\nfor x in a\\\n', 2), # "", unneeded backslashes. + TestInfo('[x\nfor x in a\n]\n', 3), # Closed on multi-line. + TestInfo('\n"""Docstring comment L1"""\nL2\nL3\nL4\n', 1), + TestInfo('\n"""Docstring comment L1\nL2"""\nL3\nL4\n', 1), + TestInfo('\n"""Docstring comment L1\\\nL2\\\nL3\\\nL4\\\n', 4), + TestInfo('\n\n"""Docstring comment L1\\\nL2\\\nL3\\\nL4\\\n"""\n', 5) + ) + + # Blank string doesn't have enough elements in goodlines. + setcode('') + with self.assertRaises(IndexError): + getlines() + + for test in tests: + with self.subTest(string=test.string): + setcode(test.string) + eq(getlines(), test.lines) + + def test_compute_bracket_indent(self): + eq = self.assertEqual + p = self.parser + setcode = p.set_code + indent = p.compute_bracket_indent + + TestInfo = namedtuple('TestInfo', ['string', 'spaces']) + tests = ( + TestInfo('def function1(self, a,\n', 14), + # Characters after bracket. + TestInfo('\n def function1(self, a,\n', 18), + TestInfo('\n\tdef function1(self, a,\n', 18), + # No characters after bracket. + TestInfo('\n def function1(\n', 8), + TestInfo('\n\tdef function1(\n', 8), + TestInfo('\n def function1( \n', 8), # Ignore extra spaces. + TestInfo('[\n"first item",\n # Comment line\n "next item",\n', 0), + TestInfo('[\n "first item",\n # Comment line\n "next item",\n', 2), + TestInfo('["first item",\n # Comment line\n "next item",\n', 1), + TestInfo('(\n', 4), + TestInfo('(a\n', 1), + ) + + # Must be C_BRACKET continuation type. + setcode('def function1(self, a, b):\n') + with self.assertRaises(AssertionError): + indent() + + for test in tests: + setcode(test.string) + eq(indent(), test.spaces) + + def test_compute_backslash_indent(self): + eq = self.assertEqual + p = self.parser + setcode = p.set_code + indent = p.compute_backslash_indent + + # Must be C_BACKSLASH continuation type. + errors = (('def function1(self, a, b\\\n'), # Bracket. + (' """ (\\\n'), # Docstring. + ('a = #\\\n'), # Inline comment. + ) + for string in errors: + with self.subTest(string=string): + setcode(string) + with self.assertRaises(AssertionError): + indent() + + TestInfo = namedtuple('TestInfo', ('string', 'spaces')) + tests = (TestInfo('a = (1 + 2) - 5 *\\\n', 4), + TestInfo('a = 1 + 2 - 5 *\\\n', 4), + TestInfo(' a = 1 + 2 - 5 *\\\n', 8), + TestInfo(' a = "spam"\\\n', 6), + TestInfo(' a = \\\n"a"\\\n', 4), + TestInfo(' a = #\\\n"a"\\\n', 5), + TestInfo('a == \\\n', 2), + TestInfo('a != \\\n', 2), + # Difference between containing = and those not. + TestInfo('\\\n', 2), + TestInfo(' \\\n', 6), + TestInfo('\t\\\n', 6), + TestInfo('a\\\n', 3), + TestInfo('{}\\\n', 4), + TestInfo('(1 + 2) - 5 *\\\n', 3), + ) + for test in tests: + with self.subTest(string=test.string): + setcode(test.string) + eq(indent(), test.spaces) + + def test_get_base_indent_string(self): + eq = self.assertEqual + p = self.parser + setcode = p.set_code + baseindent = p.get_base_indent_string + + TestInfo = namedtuple('TestInfo', ['string', 'indent']) + tests = (TestInfo('', ''), + TestInfo('def a():\n', ''), + TestInfo('\tdef a():\n', '\t'), + TestInfo(' def a():\n', ' '), + TestInfo(' def a(\n', ' '), + TestInfo('\t\n def a(\n', ' '), + TestInfo('\t\n # Comment.\n', ' '), + ) + + for test in tests: + with self.subTest(string=test.string): + setcode(test.string) + eq(baseindent(), test.indent) + + def test_is_block_opener(self): + yes = self.assertTrue + no = self.assertFalse + p = self.parser + setcode = p.set_code + opener = p.is_block_opener + + TestInfo = namedtuple('TestInfo', ['string', 'assert_']) + tests = ( + TestInfo('def a():\n', yes), + TestInfo('\n def function1(self, a,\n b):\n', yes), + TestInfo(':\n', yes), + TestInfo('a:\n', yes), + TestInfo('):\n', yes), + TestInfo('(:\n', yes), + TestInfo('":\n', no), + TestInfo('\n def function1(self, a,\n', no), + TestInfo('def function1(self, a):\n pass\n', no), + TestInfo('# A comment:\n', no), + TestInfo('"""A docstring:\n', no), + TestInfo('"""A docstring:\n', no), + ) + + for test in tests: + with self.subTest(string=test.string): + setcode(test.string) + test.assert_(opener()) + + def test_is_block_closer(self): + yes = self.assertTrue + no = self.assertFalse + p = self.parser + setcode = p.set_code + closer = p.is_block_closer + + TestInfo = namedtuple('TestInfo', ['string', 'assert_']) + tests = ( + TestInfo('return\n', yes), + TestInfo('\tbreak\n', yes), + TestInfo(' continue\n', yes), + TestInfo(' raise\n', yes), + TestInfo('pass \n', yes), + TestInfo('pass\t\n', yes), + TestInfo('return #\n', yes), + TestInfo('raised\n', no), + TestInfo('returning\n', no), + TestInfo('# return\n', no), + TestInfo('"""break\n', no), + TestInfo('"continue\n', no), + TestInfo('def function1(self, a):\n pass\n', yes), + ) + + for test in tests: + with self.subTest(string=test.string): + setcode(test.string) + test.assert_(closer()) + + def test_get_last_stmt_bracketing(self): + eq = self.assertEqual + p = self.parser + setcode = p.set_code + bracketing = p.get_last_stmt_bracketing + + TestInfo = namedtuple('TestInfo', ['string', 'bracket']) + tests = ( + TestInfo('', ((0, 0),)), + TestInfo('a\n', ((0, 0),)), + TestInfo('()()\n', ((0, 0), (0, 1), (2, 0), (2, 1), (4, 0))), + TestInfo('(\n)()\n', ((0, 0), (0, 1), (3, 0), (3, 1), (5, 0))), + TestInfo('()\n()\n', ((3, 0), (3, 1), (5, 0))), + TestInfo('()(\n)\n', ((0, 0), (0, 1), (2, 0), (2, 1), (5, 0))), + TestInfo('(())\n', ((0, 0), (0, 1), (1, 2), (3, 1), (4, 0))), + TestInfo('(\n())\n', ((0, 0), (0, 1), (2, 2), (4, 1), (5, 0))), + # Same as matched test. + TestInfo('{)(]\n', ((0, 0), (0, 1), (2, 0), (2, 1), (4, 0))), + TestInfo('(((())\n', + ((0, 0), (0, 1), (1, 2), (2, 3), (3, 4), (5, 3), (6, 2))), + ) + + for test in tests: + with self.subTest(string=test.string): + setcode(test.string) + eq(bracketing(), test.bracket) + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_pyshell.py b/Lib/idlelib/idle_test/test_pyshell.py new file mode 100644 index 000000000..706703965 --- /dev/null +++ b/Lib/idlelib/idle_test/test_pyshell.py @@ -0,0 +1,148 @@ +"Test pyshell, coverage 12%." +# Plus coverage of test_warning. Was 20% with test_openshell. + +from idlelib import pyshell +import unittest +from test.support import requires +from tkinter import Tk + + +class FunctionTest(unittest.TestCase): + # Test stand-alone module level non-gui functions. + + def test_restart_line_wide(self): + eq = self.assertEqual + for file, mul, extra in (('', 22, ''), ('finame', 21, '=')): + width = 60 + bar = mul * '=' + with self.subTest(file=file, bar=bar): + file = file or 'Shell' + line = pyshell.restart_line(width, file) + eq(len(line), width) + eq(line, f"{bar+extra} RESTART: {file} {bar}") + + def test_restart_line_narrow(self): + expect, taglen = "= RESTART: Shell", 16 + for width in (taglen-1, taglen, taglen+1): + with self.subTest(width=width): + self.assertEqual(pyshell.restart_line(width, ''), expect) + self.assertEqual(pyshell.restart_line(taglen+2, ''), expect+' =') + + +class PyShellFileListTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = Tk() + cls.root.withdraw() + + @classmethod + def tearDownClass(cls): + #cls.root.update_idletasks() +## for id in cls.root.tk.call('after', 'info'): +## cls.root.after_cancel(id) # Need for EditorWindow. + cls.root.destroy() + del cls.root + + def test_init(self): + psfl = pyshell.PyShellFileList(self.root) + self.assertEqual(psfl.EditorWindow, pyshell.PyShellEditorWindow) + self.assertIsNone(psfl.pyshell) + +# The following sometimes causes 'invalid command name "109734456recolorize"'. +# Uncommenting after_cancel above prevents this, but results in +# TclError: bad window path name ".!listedtoplevel.!frame.text" +# which is normally prevented by after_cancel. +## def test_openshell(self): +## pyshell.use_subprocess = False +## ps = pyshell.PyShellFileList(self.root).open_shell() +## self.assertIsInstance(ps, pyshell.PyShell) + + +class PyShellRemoveLastNewlineAndSurroundingWhitespaceTest(unittest.TestCase): + regexp = pyshell.PyShell._last_newline_re + + def all_removed(self, text): + self.assertEqual('', self.regexp.sub('', text)) + + def none_removed(self, text): + self.assertEqual(text, self.regexp.sub('', text)) + + def check_result(self, text, expected): + self.assertEqual(expected, self.regexp.sub('', text)) + + def test_empty(self): + self.all_removed('') + + def test_newline(self): + self.all_removed('\n') + + def test_whitespace_no_newline(self): + self.all_removed(' ') + self.all_removed(' ') + self.all_removed(' ') + self.all_removed(' ' * 20) + self.all_removed('\t') + self.all_removed('\t\t') + self.all_removed('\t\t\t') + self.all_removed('\t' * 20) + self.all_removed('\t ') + self.all_removed(' \t') + self.all_removed(' \t \t ') + self.all_removed('\t \t \t') + + def test_newline_with_whitespace(self): + self.all_removed(' \n') + self.all_removed('\t\n') + self.all_removed(' \t\n') + self.all_removed('\t \n') + self.all_removed('\n ') + self.all_removed('\n\t') + self.all_removed('\n \t') + self.all_removed('\n\t ') + self.all_removed(' \n ') + self.all_removed('\t\n ') + self.all_removed(' \n\t') + self.all_removed('\t\n\t') + self.all_removed('\t \t \t\n') + self.all_removed(' \t \t \n') + self.all_removed('\n\t \t \t') + self.all_removed('\n \t \t ') + + def test_multiple_newlines(self): + self.check_result('\n\n', '\n') + self.check_result('\n' * 5, '\n' * 4) + self.check_result('\n' * 5 + '\t', '\n' * 4) + self.check_result('\n' * 20, '\n' * 19) + self.check_result('\n' * 20 + ' ', '\n' * 19) + self.check_result(' \n \n ', ' \n') + self.check_result(' \n\n ', ' \n') + self.check_result(' \n\n', ' \n') + self.check_result('\t\n\n', '\t\n') + self.check_result('\n\n ', '\n') + self.check_result('\n\n\t', '\n') + self.check_result(' \n \n ', ' \n') + self.check_result('\t\n\t\n\t', '\t\n') + + def test_non_whitespace(self): + self.none_removed('a') + self.check_result('a\n', 'a') + self.check_result('a\n ', 'a') + self.check_result('a \n ', 'a') + self.check_result('a \n\t', 'a') + self.none_removed('-') + self.check_result('-\n', '-') + self.none_removed('.') + self.check_result('.\n', '.') + + def test_unsupported_whitespace(self): + self.none_removed('\v') + self.none_removed('\n\v') + self.check_result('\v\n', '\v') + self.none_removed(' \n\v') + self.check_result('\v\n ', '\v') + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_query.py b/Lib/idlelib/idle_test/test_query.py new file mode 100644 index 000000000..a6ef858a8 --- /dev/null +++ b/Lib/idlelib/idle_test/test_query.py @@ -0,0 +1,451 @@ +"""Test query, coverage 93%. + +Non-gui tests for Query, SectionName, ModuleName, and HelpSource use +dummy versions that extract the non-gui methods and add other needed +attributes. GUI tests create an instance of each class and simulate +entries and button clicks. Subclass tests only target the new code in +the subclass definition. + +The appearance of the widgets is checked by the Query and +HelpSource htests. These are run by running query.py. +""" +from idlelib import query +import unittest +from test.support import requires +from tkinter import Tk, END + +import sys +from unittest import mock +from idlelib.idle_test.mock_tk import Var + + +# NON-GUI TESTS + +class QueryTest(unittest.TestCase): + "Test Query base class." + + class Dummy_Query: + # Test the following Query methods. + entry_ok = query.Query.entry_ok + ok = query.Query.ok + cancel = query.Query.cancel + # Add attributes and initialization needed for tests. + def __init__(self, dummy_entry): + self.entry = Var(value=dummy_entry) + self.entry_error = {'text': ''} + self.result = None + self.destroyed = False + def showerror(self, message): + self.entry_error['text'] = message + def destroy(self): + self.destroyed = True + + def test_entry_ok_blank(self): + dialog = self.Dummy_Query(' ') + self.assertEqual(dialog.entry_ok(), None) + self.assertEqual((dialog.result, dialog.destroyed), (None, False)) + self.assertIn('blank line', dialog.entry_error['text']) + + def test_entry_ok_good(self): + dialog = self.Dummy_Query(' good ') + Equal = self.assertEqual + Equal(dialog.entry_ok(), 'good') + Equal((dialog.result, dialog.destroyed), (None, False)) + Equal(dialog.entry_error['text'], '') + + def test_ok_blank(self): + dialog = self.Dummy_Query('') + dialog.entry.focus_set = mock.Mock() + self.assertEqual(dialog.ok(), None) + self.assertTrue(dialog.entry.focus_set.called) + del dialog.entry.focus_set + self.assertEqual((dialog.result, dialog.destroyed), (None, False)) + + def test_ok_good(self): + dialog = self.Dummy_Query('good') + self.assertEqual(dialog.ok(), None) + self.assertEqual((dialog.result, dialog.destroyed), ('good', True)) + + def test_cancel(self): + dialog = self.Dummy_Query('does not matter') + self.assertEqual(dialog.cancel(), None) + self.assertEqual((dialog.result, dialog.destroyed), (None, True)) + + +class SectionNameTest(unittest.TestCase): + "Test SectionName subclass of Query." + + class Dummy_SectionName: + entry_ok = query.SectionName.entry_ok # Function being tested. + used_names = ['used'] + def __init__(self, dummy_entry): + self.entry = Var(value=dummy_entry) + self.entry_error = {'text': ''} + def showerror(self, message): + self.entry_error['text'] = message + + def test_blank_section_name(self): + dialog = self.Dummy_SectionName(' ') + self.assertEqual(dialog.entry_ok(), None) + self.assertIn('no name', dialog.entry_error['text']) + + def test_used_section_name(self): + dialog = self.Dummy_SectionName('used') + self.assertEqual(dialog.entry_ok(), None) + self.assertIn('use', dialog.entry_error['text']) + + def test_long_section_name(self): + dialog = self.Dummy_SectionName('good'*8) + self.assertEqual(dialog.entry_ok(), None) + self.assertIn('longer than 30', dialog.entry_error['text']) + + def test_good_section_name(self): + dialog = self.Dummy_SectionName(' good ') + self.assertEqual(dialog.entry_ok(), 'good') + self.assertEqual(dialog.entry_error['text'], '') + + +class ModuleNameTest(unittest.TestCase): + "Test ModuleName subclass of Query." + + class Dummy_ModuleName: + entry_ok = query.ModuleName.entry_ok # Function being tested. + text0 = '' + def __init__(self, dummy_entry): + self.entry = Var(value=dummy_entry) + self.entry_error = {'text': ''} + def showerror(self, message): + self.entry_error['text'] = message + + def test_blank_module_name(self): + dialog = self.Dummy_ModuleName(' ') + self.assertEqual(dialog.entry_ok(), None) + self.assertIn('no name', dialog.entry_error['text']) + + def test_bogus_module_name(self): + dialog = self.Dummy_ModuleName('__name_xyz123_should_not_exist__') + self.assertEqual(dialog.entry_ok(), None) + self.assertIn('not found', dialog.entry_error['text']) + + def test_c_source_name(self): + dialog = self.Dummy_ModuleName('itertools') + self.assertEqual(dialog.entry_ok(), None) + self.assertIn('source-based', dialog.entry_error['text']) + + def test_good_module_name(self): + dialog = self.Dummy_ModuleName('idlelib') + self.assertEndsWith(dialog.entry_ok(), '__init__.py') + self.assertEqual(dialog.entry_error['text'], '') + dialog = self.Dummy_ModuleName('idlelib.idle') + self.assertEndsWith(dialog.entry_ok(), 'idle.py') + self.assertEqual(dialog.entry_error['text'], '') + + +class GotoTest(unittest.TestCase): + "Test Goto subclass of Query." + + class Dummy_ModuleName: + entry_ok = query.Goto.entry_ok # Function being tested. + def __init__(self, dummy_entry): + self.entry = Var(value=dummy_entry) + self.entry_error = {'text': ''} + def showerror(self, message): + self.entry_error['text'] = message + + def test_bogus_goto(self): + dialog = self.Dummy_ModuleName('a') + self.assertEqual(dialog.entry_ok(), None) + self.assertIn('not a base 10 integer', dialog.entry_error['text']) + + def test_bad_goto(self): + dialog = self.Dummy_ModuleName('0') + self.assertEqual(dialog.entry_ok(), None) + self.assertIn('not a positive integer', dialog.entry_error['text']) + + def test_good_goto(self): + dialog = self.Dummy_ModuleName('1') + self.assertEqual(dialog.entry_ok(), 1) + self.assertEqual(dialog.entry_error['text'], '') + + +# 3 HelpSource test classes each test one method. + +class HelpsourceBrowsefileTest(unittest.TestCase): + "Test browse_file method of ModuleName subclass of Query." + + class Dummy_HelpSource: + browse_file = query.HelpSource.browse_file + pathvar = Var() + + def test_file_replaces_path(self): + dialog = self.Dummy_HelpSource() + # Path is widget entry, either '' or something. + # Func return is file dialog return, either '' or something. + # Func return should override widget entry. + # We need all 4 combinations to test all (most) code paths. + for path, func, result in ( + ('', lambda a,b,c:'', ''), + ('', lambda a,b,c: __file__, __file__), + ('htest', lambda a,b,c:'', 'htest'), + ('htest', lambda a,b,c: __file__, __file__)): + with self.subTest(): + dialog.pathvar.set(path) + dialog.askfilename = func + dialog.browse_file() + self.assertEqual(dialog.pathvar.get(), result) + + +class HelpsourcePathokTest(unittest.TestCase): + "Test path_ok method of HelpSource subclass of Query." + + class Dummy_HelpSource: + path_ok = query.HelpSource.path_ok + def __init__(self, dummy_path): + self.path = Var(value=dummy_path) + self.path_error = {'text': ''} + def showerror(self, message, widget=None): + self.path_error['text'] = message + + orig_platform = query.platform # Set in test_path_ok_file. + @classmethod + def tearDownClass(cls): + query.platform = cls.orig_platform + + def test_path_ok_blank(self): + dialog = self.Dummy_HelpSource(' ') + self.assertEqual(dialog.path_ok(), None) + self.assertIn('no help file', dialog.path_error['text']) + + def test_path_ok_bad(self): + dialog = self.Dummy_HelpSource(__file__ + 'bad-bad-bad') + self.assertEqual(dialog.path_ok(), None) + self.assertIn('not exist', dialog.path_error['text']) + + def test_path_ok_web(self): + dialog = self.Dummy_HelpSource('') + Equal = self.assertEqual + for url in 'www.py.org', 'http://py.org': + with self.subTest(): + dialog.path.set(url) + self.assertEqual(dialog.path_ok(), url) + self.assertEqual(dialog.path_error['text'], '') + + def test_path_ok_file(self): + dialog = self.Dummy_HelpSource('') + for platform, prefix in ('darwin', 'file://'), ('other', ''): + with self.subTest(): + query.platform = platform + dialog.path.set(__file__) + self.assertEqual(dialog.path_ok(), prefix + __file__) + self.assertEqual(dialog.path_error['text'], '') + + +class HelpsourceEntryokTest(unittest.TestCase): + "Test entry_ok method of HelpSource subclass of Query." + + class Dummy_HelpSource: + entry_ok = query.HelpSource.entry_ok + entry_error = {} + path_error = {} + def item_ok(self): + return self.name + def path_ok(self): + return self.path + + def test_entry_ok_helpsource(self): + dialog = self.Dummy_HelpSource() + for name, path, result in ((None, None, None), + (None, 'doc.txt', None), + ('doc', None, None), + ('doc', 'doc.txt', ('doc', 'doc.txt'))): + with self.subTest(): + dialog.name, dialog.path = name, path + self.assertEqual(dialog.entry_ok(), result) + + +# 2 CustomRun test classes each test one method. + +class CustomRunCLIargsokTest(unittest.TestCase): + "Test cli_ok method of the CustomRun subclass of Query." + + class Dummy_CustomRun: + cli_args_ok = query.CustomRun.cli_args_ok + def __init__(self, dummy_entry): + self.entry = Var(value=dummy_entry) + self.entry_error = {'text': ''} + def showerror(self, message): + self.entry_error['text'] = message + + def test_blank_args(self): + dialog = self.Dummy_CustomRun(' ') + self.assertEqual(dialog.cli_args_ok(), []) + + def test_invalid_args(self): + dialog = self.Dummy_CustomRun("'no-closing-quote") + self.assertEqual(dialog.cli_args_ok(), None) + self.assertIn('No closing', dialog.entry_error['text']) + + def test_good_args(self): + args = ['-n', '10', '--verbose', '-p', '/path', '--name'] + dialog = self.Dummy_CustomRun(' '.join(args) + ' "my name"') + self.assertEqual(dialog.cli_args_ok(), args + ["my name"]) + self.assertEqual(dialog.entry_error['text'], '') + + +class CustomRunEntryokTest(unittest.TestCase): + "Test entry_ok method of the CustomRun subclass of Query." + + class Dummy_CustomRun: + entry_ok = query.CustomRun.entry_ok + entry_error = {} + restartvar = Var() + def cli_args_ok(self): + return self.cli_args + + def test_entry_ok_customrun(self): + dialog = self.Dummy_CustomRun() + for restart in {True, False}: + dialog.restartvar.set(restart) + for cli_args, result in ((None, None), + (['my arg'], (['my arg'], restart))): + with self.subTest(restart=restart, cli_args=cli_args): + dialog.cli_args = cli_args + self.assertEqual(dialog.entry_ok(), result) + + +# GUI TESTS + +class QueryGuiTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = root = Tk() + cls.root.withdraw() + cls.dialog = query.Query(root, 'TEST', 'test', _utest=True) + cls.dialog.destroy = mock.Mock() + + @classmethod + def tearDownClass(cls): + del cls.dialog.destroy + del cls.dialog + cls.root.destroy() + del cls.root + + def setUp(self): + self.dialog.entry.delete(0, 'end') + self.dialog.result = None + self.dialog.destroy.reset_mock() + + def test_click_ok(self): + dialog = self.dialog + dialog.entry.insert(0, 'abc') + dialog.button_ok.invoke() + self.assertEqual(dialog.result, 'abc') + self.assertTrue(dialog.destroy.called) + + def test_click_blank(self): + dialog = self.dialog + dialog.button_ok.invoke() + self.assertEqual(dialog.result, None) + self.assertFalse(dialog.destroy.called) + + def test_click_cancel(self): + dialog = self.dialog + dialog.entry.insert(0, 'abc') + dialog.button_cancel.invoke() + self.assertEqual(dialog.result, None) + self.assertTrue(dialog.destroy.called) + + +class SectionnameGuiTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + + def test_click_section_name(self): + root = Tk() + root.withdraw() + dialog = query.SectionName(root, 'T', 't', {'abc'}, _utest=True) + Equal = self.assertEqual + self.assertEqual(dialog.used_names, {'abc'}) + dialog.entry.insert(0, 'okay') + dialog.button_ok.invoke() + self.assertEqual(dialog.result, 'okay') + root.destroy() + + +class ModulenameGuiTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + + def test_click_module_name(self): + root = Tk() + root.withdraw() + dialog = query.ModuleName(root, 'T', 't', 'idlelib', _utest=True) + self.assertEqual(dialog.text0, 'idlelib') + self.assertEqual(dialog.entry.get(), 'idlelib') + dialog.button_ok.invoke() + self.assertEndsWith(dialog.result, '__init__.py') + root.destroy() + + +class GotoGuiTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + + def test_click_module_name(self): + root = Tk() + root.withdraw() + dialog = query.Goto(root, 'T', 't', _utest=True) + dialog.entry.insert(0, '22') + dialog.button_ok.invoke() + self.assertEqual(dialog.result, 22) + root.destroy() + + +class HelpsourceGuiTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + + def test_click_help_source(self): + root = Tk() + root.withdraw() + dialog = query.HelpSource(root, 'T', menuitem='__test__', + filepath=__file__, _utest=True) + Equal = self.assertEqual + Equal(dialog.entry.get(), '__test__') + Equal(dialog.path.get(), __file__) + dialog.button_ok.invoke() + prefix = "file://" if sys.platform == 'darwin' else '' + Equal(dialog.result, ('__test__', prefix + __file__)) + root.destroy() + + +class CustomRunGuiTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + + def test_click_args(self): + root = Tk() + root.withdraw() + dialog = query.CustomRun(root, 'Title', + cli_args=['a', 'b=1'], _utest=True) + self.assertEqual(dialog.entry.get(), 'a b=1') + dialog.entry.insert(END, ' c') + dialog.button_ok.invoke() + self.assertEqual(dialog.result, (['a', 'b=1', 'c'], True)) + root.destroy() + + +if __name__ == '__main__': + unittest.main(verbosity=2, exit=False) diff --git a/Lib/idlelib/idle_test/test_redirector.py b/Lib/idlelib/idle_test/test_redirector.py new file mode 100644 index 000000000..bd486d7da --- /dev/null +++ b/Lib/idlelib/idle_test/test_redirector.py @@ -0,0 +1,122 @@ +"Test redirector, coverage 100%." + +from idlelib.redirector import WidgetRedirector +import unittest +from test.support import requires +from tkinter import Tk, Text, TclError +from idlelib.idle_test.mock_idle import Func + + +class InitCloseTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = Tk() + cls.root.withdraw() + cls.text = Text(cls.root) + + @classmethod + def tearDownClass(cls): + del cls.text + cls.root.destroy() + del cls.root + + def test_init(self): + redir = WidgetRedirector(self.text) + self.assertEqual(redir.widget, self.text) + self.assertEqual(redir.tk, self.text.tk) + self.assertRaises(TclError, WidgetRedirector, self.text) + redir.close() # restore self.tk, self.text + + def test_close(self): + redir = WidgetRedirector(self.text) + redir.register('insert', Func) + redir.close() + self.assertEqual(redir._operations, {}) + self.assertNotHasAttr(self.text, 'widget') + + +class WidgetRedirectorTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = Tk() + cls.root.withdraw() + cls.text = Text(cls.root) + + @classmethod + def tearDownClass(cls): + del cls.text + cls.root.update_idletasks() + cls.root.destroy() + del cls.root + + def setUp(self): + self.redir = WidgetRedirector(self.text) + self.func = Func() + self.orig_insert = self.redir.register('insert', self.func) + self.text.insert('insert', 'asdf') # leaves self.text empty + + def tearDown(self): + self.text.delete('1.0', 'end') + self.redir.close() + + def test_repr(self): # partly for 100% coverage + self.assertIn('Redirector', repr(self.redir)) + self.assertIn('Original', repr(self.orig_insert)) + + def test_register(self): + self.assertEqual(self.text.get('1.0', 'end'), '\n') + self.assertEqual(self.func.args, ('insert', 'asdf')) + self.assertIn('insert', self.redir._operations) + self.assertIn('insert', self.text.__dict__) + self.assertEqual(self.text.insert, self.func) + + def test_original_command(self): + self.assertEqual(self.orig_insert.operation, 'insert') + self.assertEqual(self.orig_insert.tk_call, self.text.tk.call) + self.orig_insert('insert', 'asdf') + self.assertEqual(self.text.get('1.0', 'end'), 'asdf\n') + + def test_unregister(self): + self.assertIsNone(self.redir.unregister('invalid operation name')) + self.assertEqual(self.redir.unregister('insert'), self.func) + self.assertNotIn('insert', self.redir._operations) + self.assertNotIn('insert', self.text.__dict__) + + def test_unregister_no_attribute(self): + del self.text.insert + self.assertEqual(self.redir.unregister('insert'), self.func) + + def test_dispatch_intercept(self): + self.func.__init__(True) + self.assertTrue(self.redir.dispatch('insert', False)) + self.assertFalse(self.func.args[0]) + + def test_dispatch_bypass(self): + self.orig_insert('insert', 'asdf') + # tk.call returns '' where Python would return None + self.assertEqual(self.redir.dispatch('delete', '1.0', 'end'), '') + self.assertEqual(self.text.get('1.0', 'end'), '\n') + + def test_dispatch_error(self): + self.func.__init__(TclError()) + self.assertEqual(self.redir.dispatch('insert', False), '') + self.assertEqual(self.redir.dispatch('invalid'), '') + + def test_command_dispatch(self): + # Test that .__init__ causes redirection of tk calls + # through redir.dispatch + self.root.call(self.text._w, 'insert', 'hello') + self.assertEqual(self.func.args, ('hello',)) + self.assertEqual(self.text.get('1.0', 'end'), '\n') + # Ensure that called through redir .dispatch and not through + # self.text.insert by having mock raise TclError. + self.func.__init__(TclError()) + self.assertEqual(self.root.call(self.text._w, 'insert', 'boo'), '') + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_replace.py b/Lib/idlelib/idle_test/test_replace.py new file mode 100644 index 000000000..6c07389b2 --- /dev/null +++ b/Lib/idlelib/idle_test/test_replace.py @@ -0,0 +1,294 @@ +"Test replace, coverage 78%." + +from idlelib.replace import ReplaceDialog +import unittest +from test.support import requires +requires('gui') +from tkinter import Tk, Text + +from unittest.mock import Mock +from idlelib.idle_test.mock_tk import Mbox +import idlelib.searchengine as se + +orig_mbox = se.messagebox +showerror = Mbox.showerror + + +class ReplaceDialogTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + cls.root = Tk() + cls.root.withdraw() + se.messagebox = Mbox + cls.engine = se.SearchEngine(cls.root) + cls.dialog = ReplaceDialog(cls.root, cls.engine) + cls.dialog.bell = lambda: None + cls.dialog.ok = Mock() + cls.text = Text(cls.root) + cls.text.undo_block_start = Mock() + cls.text.undo_block_stop = Mock() + cls.dialog.text = cls.text + + @classmethod + def tearDownClass(cls): + se.messagebox = orig_mbox + del cls.text, cls.dialog, cls.engine + cls.root.destroy() + del cls.root + + def setUp(self): + self.text.insert('insert', 'This is a sample sTring') + + def tearDown(self): + self.engine.patvar.set('') + self.dialog.replvar.set('') + self.engine.wordvar.set(False) + self.engine.casevar.set(False) + self.engine.revar.set(False) + self.engine.wrapvar.set(True) + self.engine.backvar.set(False) + showerror.title = '' + showerror.message = '' + self.text.delete('1.0', 'end') + + def test_replace_simple(self): + # Test replace function with all options at default setting. + # Wrap around - True + # Regular Expression - False + # Match case - False + # Match word - False + # Direction - Forwards + text = self.text + equal = self.assertEqual + pv = self.engine.patvar + rv = self.dialog.replvar + replace = self.dialog.replace_it + + # test accessor method + self.engine.setpat('asdf') + equal(self.engine.getpat(), pv.get()) + + # text found and replaced + pv.set('a') + rv.set('asdf') + replace() + equal(text.get('1.8', '1.12'), 'asdf') + + # don't "match word" case + text.mark_set('insert', '1.0') + pv.set('is') + rv.set('hello') + replace() + equal(text.get('1.2', '1.7'), 'hello') + + # don't "match case" case + pv.set('string') + rv.set('world') + replace() + equal(text.get('1.23', '1.28'), 'world') + + # without "regular expression" case + text.mark_set('insert', 'end') + text.insert('insert', '\nline42:') + before_text = text.get('1.0', 'end') + pv.set(r'[a-z][\d]+') + replace() + after_text = text.get('1.0', 'end') + equal(before_text, after_text) + + # test with wrap around selected and complete a cycle + text.mark_set('insert', '1.9') + pv.set('i') + rv.set('j') + replace() + equal(text.get('1.8'), 'i') + equal(text.get('2.1'), 'j') + replace() + equal(text.get('2.1'), 'j') + equal(text.get('1.8'), 'j') + before_text = text.get('1.0', 'end') + replace() + after_text = text.get('1.0', 'end') + equal(before_text, after_text) + + # text not found + before_text = text.get('1.0', 'end') + pv.set('foobar') + replace() + after_text = text.get('1.0', 'end') + equal(before_text, after_text) + + # test access method + self.dialog.find_it(0) + + def test_replace_wrap_around(self): + text = self.text + equal = self.assertEqual + pv = self.engine.patvar + rv = self.dialog.replvar + replace = self.dialog.replace_it + self.engine.wrapvar.set(False) + + # replace candidate found both after and before 'insert' + text.mark_set('insert', '1.4') + pv.set('i') + rv.set('j') + replace() + equal(text.get('1.2'), 'i') + equal(text.get('1.5'), 'j') + replace() + equal(text.get('1.2'), 'i') + equal(text.get('1.20'), 'j') + replace() + equal(text.get('1.2'), 'i') + + # replace candidate found only before 'insert' + text.mark_set('insert', '1.8') + pv.set('is') + before_text = text.get('1.0', 'end') + replace() + after_text = text.get('1.0', 'end') + equal(before_text, after_text) + + def test_replace_whole_word(self): + text = self.text + equal = self.assertEqual + pv = self.engine.patvar + rv = self.dialog.replvar + replace = self.dialog.replace_it + self.engine.wordvar.set(True) + + pv.set('is') + rv.set('hello') + replace() + equal(text.get('1.0', '1.4'), 'This') + equal(text.get('1.5', '1.10'), 'hello') + + def test_replace_match_case(self): + equal = self.assertEqual + text = self.text + pv = self.engine.patvar + rv = self.dialog.replvar + replace = self.dialog.replace_it + self.engine.casevar.set(True) + + before_text = self.text.get('1.0', 'end') + pv.set('this') + rv.set('that') + replace() + after_text = self.text.get('1.0', 'end') + equal(before_text, after_text) + + pv.set('This') + replace() + equal(text.get('1.0', '1.4'), 'that') + + def test_replace_regex(self): + equal = self.assertEqual + text = self.text + pv = self.engine.patvar + rv = self.dialog.replvar + replace = self.dialog.replace_it + self.engine.revar.set(True) + + before_text = text.get('1.0', 'end') + pv.set(r'[a-z][\d]+') + rv.set('hello') + replace() + after_text = text.get('1.0', 'end') + equal(before_text, after_text) + + text.insert('insert', '\nline42') + replace() + equal(text.get('2.0', '2.8'), 'linhello') + + pv.set('') + replace() + self.assertIn('error', showerror.title) + self.assertIn('Empty', showerror.message) + + pv.set(r'[\d') + replace() + self.assertIn('error', showerror.title) + self.assertIn('Pattern', showerror.message) + + showerror.title = '' + showerror.message = '' + pv.set('[a]') + rv.set('test\\') + replace() + self.assertIn('error', showerror.title) + self.assertIn('Invalid Replace Expression', showerror.message) + + # test access method + self.engine.setcookedpat("?") + equal(pv.get(), "\\?") + + def test_replace_backwards(self): + equal = self.assertEqual + text = self.text + pv = self.engine.patvar + rv = self.dialog.replvar + replace = self.dialog.replace_it + self.engine.backvar.set(True) + + text.insert('insert', '\nis as ') + + pv.set('is') + rv.set('was') + replace() + equal(text.get('1.2', '1.4'), 'is') + equal(text.get('2.0', '2.3'), 'was') + replace() + equal(text.get('1.5', '1.8'), 'was') + replace() + equal(text.get('1.2', '1.5'), 'was') + + def test_replace_all(self): + text = self.text + pv = self.engine.patvar + rv = self.dialog.replvar + replace_all = self.dialog.replace_all + + text.insert('insert', '\n') + text.insert('insert', text.get('1.0', 'end')*100) + pv.set('is') + rv.set('was') + replace_all() + self.assertNotIn('is', text.get('1.0', 'end')) + + self.engine.revar.set(True) + pv.set('') + replace_all() + self.assertIn('error', showerror.title) + self.assertIn('Empty', showerror.message) + + pv.set('[s][T]') + rv.set('\\') + replace_all() + + self.engine.revar.set(False) + pv.set('text which is not present') + rv.set('foobar') + replace_all() + + def test_default_command(self): + text = self.text + pv = self.engine.patvar + rv = self.dialog.replvar + replace_find = self.dialog.default_command + equal = self.assertEqual + + pv.set('This') + rv.set('was') + replace_find() + equal(text.get('sel.first', 'sel.last'), 'was') + + self.engine.revar.set(True) + pv.set('') + replace_find() + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_rpc.py b/Lib/idlelib/idle_test/test_rpc.py new file mode 100644 index 000000000..81eff398c --- /dev/null +++ b/Lib/idlelib/idle_test/test_rpc.py @@ -0,0 +1,29 @@ +"Test rpc, coverage 20%." + +from idlelib import rpc +import unittest + + + +class CodePicklerTest(unittest.TestCase): + + def test_pickle_unpickle(self): + def f(): return a + b + c + func, (cbytes,) = rpc.pickle_code(f.__code__) + self.assertIs(func, rpc.unpickle_code) + self.assertIn(b'test_rpc.py', cbytes) + code = rpc.unpickle_code(cbytes) + self.assertEqual(code.co_names, ('a', 'b', 'c')) + + def test_code_pickler(self): + self.assertIn(type((lambda:None).__code__), + rpc.CodePickler.dispatch_table) + + def test_dumps(self): + def f(): pass + # The main test here is that pickling code does not raise. + self.assertIn(b'test_rpc.py', rpc.dumps(f.__code__)) + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_run.py b/Lib/idlelib/idle_test/test_run.py new file mode 100644 index 000000000..83ecbffa2 --- /dev/null +++ b/Lib/idlelib/idle_test/test_run.py @@ -0,0 +1,433 @@ +"Test run, coverage 54%." + +from idlelib import run +import io +import sys +from test.support import captured_output, captured_stderr +import unittest +from unittest import mock +import idlelib +from idlelib.idle_test.mock_idle import Func +from test.support import force_not_colorized + +idlelib.testing = True # Use {} for executing test user code. + + +class ExceptionTest(unittest.TestCase): + + def test_print_exception_unhashable(self): + class UnhashableException(Exception): + def __eq__(self, other): + return True + + ex1 = UnhashableException('ex1') + ex2 = UnhashableException('ex2') + try: + raise ex2 from ex1 + except UnhashableException: + try: + raise ex1 + except UnhashableException: + with captured_stderr() as output: + with mock.patch.object(run, 'cleanup_traceback') as ct: + ct.side_effect = lambda t, e: t + run.print_exception() + + tb = output.getvalue().strip().splitlines() + self.assertEqual(11, len(tb)) + self.assertIn('UnhashableException: ex2', tb[3]) + self.assertIn('UnhashableException: ex1', tb[10]) + + data = (('1/0', ZeroDivisionError, "division by zero\n"), + ('abc', NameError, "name 'abc' is not defined. " + "Did you mean: 'abs'? " + "Or did you forget to import 'abc'?\n"), + ('int.reel', AttributeError, + "type object 'int' has no attribute 'reel'. " + "Did you mean: 'real'?\n"), + ) + + @force_not_colorized + def test_get_message(self): + for code, exc, msg in self.data: + with self.subTest(code=code): + try: + eval(compile(code, '', 'eval')) + except exc: + typ, val, tb = sys.exc_info() + actual = run.get_message_lines(typ, val, tb)[0] + expect = f'{exc.__name__}: {msg}' + self.assertEqual(actual, expect) + + @force_not_colorized + @mock.patch.object(run, 'cleanup_traceback', + new_callable=lambda: (lambda t, e: None)) + def test_get_multiple_message(self, mock): + d = self.data + data2 = ((d[0], d[1]), (d[1], d[2]), (d[2], d[0])) + subtests = 0 + for (code1, exc1, msg1), (code2, exc2, msg2) in data2: + with self.subTest(codes=(code1,code2)): + try: + eval(compile(code1, '', 'eval')) + except exc1: + try: + eval(compile(code2, '', 'eval')) + except exc2: + with captured_stderr() as output: + run.print_exception() + actual = output.getvalue() + self.assertIn(msg1, actual) + self.assertIn(msg2, actual) + subtests += 1 + self.assertEqual(subtests, len(data2)) # All subtests ran? + +# StdioFile tests. + +class S(str): + def __str__(self): + return '%s:str' % type(self).__name__ + def __unicode__(self): + return '%s:unicode' % type(self).__name__ + def __len__(self): + return 3 + def __iter__(self): + return iter('abc') + def __getitem__(self, *args): + return '%s:item' % type(self).__name__ + def __getslice__(self, *args): + return '%s:slice' % type(self).__name__ + + +class MockShell: + def __init__(self): + self.reset() + def write(self, *args): + self.written.append(args) + def readline(self): + return self.lines.pop() + def close(self): + pass + def reset(self): + self.written = [] + def push(self, lines): + self.lines = list(lines)[::-1] + + +class StdInputFilesTest(unittest.TestCase): + + def test_misc(self): + shell = MockShell() + f = run.StdInputFile(shell, 'stdin') + self.assertIsInstance(f, io.TextIOBase) + self.assertEqual(f.encoding, 'utf-8') + self.assertEqual(f.errors, 'strict') + self.assertIsNone(f.newlines) + self.assertEqual(f.name, '<stdin>') + self.assertFalse(f.closed) + self.assertTrue(f.isatty()) + self.assertTrue(f.readable()) + self.assertFalse(f.writable()) + self.assertFalse(f.seekable()) + + def test_unsupported(self): + shell = MockShell() + f = run.StdInputFile(shell, 'stdin') + self.assertRaises(OSError, f.fileno) + self.assertRaises(OSError, f.tell) + self.assertRaises(OSError, f.seek, 0) + self.assertRaises(OSError, f.write, 'x') + self.assertRaises(OSError, f.writelines, ['x']) + + def test_read(self): + shell = MockShell() + f = run.StdInputFile(shell, 'stdin') + shell.push(['one\n', 'two\n', '']) + self.assertEqual(f.read(), 'one\ntwo\n') + shell.push(['one\n', 'two\n', '']) + self.assertEqual(f.read(-1), 'one\ntwo\n') + shell.push(['one\n', 'two\n', '']) + self.assertEqual(f.read(None), 'one\ntwo\n') + shell.push(['one\n', 'two\n', 'three\n', '']) + self.assertEqual(f.read(2), 'on') + self.assertEqual(f.read(3), 'e\nt') + self.assertEqual(f.read(10), 'wo\nthree\n') + + shell.push(['one\n', 'two\n']) + self.assertEqual(f.read(0), '') + self.assertRaises(TypeError, f.read, 1.5) + self.assertRaises(TypeError, f.read, '1') + self.assertRaises(TypeError, f.read, 1, 1) + + def test_readline(self): + shell = MockShell() + f = run.StdInputFile(shell, 'stdin') + shell.push(['one\n', 'two\n', 'three\n', 'four\n']) + self.assertEqual(f.readline(), 'one\n') + self.assertEqual(f.readline(-1), 'two\n') + self.assertEqual(f.readline(None), 'three\n') + shell.push(['one\ntwo\n']) + self.assertEqual(f.readline(), 'one\n') + self.assertEqual(f.readline(), 'two\n') + shell.push(['one', 'two', 'three']) + self.assertEqual(f.readline(), 'one') + self.assertEqual(f.readline(), 'two') + shell.push(['one\n', 'two\n', 'three\n']) + self.assertEqual(f.readline(2), 'on') + self.assertEqual(f.readline(1), 'e') + self.assertEqual(f.readline(1), '\n') + self.assertEqual(f.readline(10), 'two\n') + + shell.push(['one\n', 'two\n']) + self.assertEqual(f.readline(0), '') + self.assertRaises(TypeError, f.readlines, 1.5) + self.assertRaises(TypeError, f.readlines, '1') + self.assertRaises(TypeError, f.readlines, 1, 1) + + def test_readlines(self): + shell = MockShell() + f = run.StdInputFile(shell, 'stdin') + shell.push(['one\n', 'two\n', '']) + self.assertEqual(f.readlines(), ['one\n', 'two\n']) + shell.push(['one\n', 'two\n', '']) + self.assertEqual(f.readlines(-1), ['one\n', 'two\n']) + shell.push(['one\n', 'two\n', '']) + self.assertEqual(f.readlines(None), ['one\n', 'two\n']) + shell.push(['one\n', 'two\n', '']) + self.assertEqual(f.readlines(0), ['one\n', 'two\n']) + shell.push(['one\n', 'two\n', '']) + self.assertEqual(f.readlines(3), ['one\n']) + shell.push(['one\n', 'two\n', '']) + self.assertEqual(f.readlines(4), ['one\n', 'two\n']) + + shell.push(['one\n', 'two\n', '']) + self.assertRaises(TypeError, f.readlines, 1.5) + self.assertRaises(TypeError, f.readlines, '1') + self.assertRaises(TypeError, f.readlines, 1, 1) + + def test_close(self): + shell = MockShell() + f = run.StdInputFile(shell, 'stdin') + shell.push(['one\n', 'two\n', '']) + self.assertFalse(f.closed) + self.assertEqual(f.readline(), 'one\n') + f.close() + self.assertFalse(f.closed) + self.assertEqual(f.readline(), 'two\n') + self.assertRaises(TypeError, f.close, 1) + + +class StdOutputFilesTest(unittest.TestCase): + + def test_misc(self): + shell = MockShell() + f = run.StdOutputFile(shell, 'stdout') + self.assertIsInstance(f, io.TextIOBase) + self.assertEqual(f.encoding, 'utf-8') + self.assertEqual(f.errors, 'strict') + self.assertIsNone(f.newlines) + self.assertEqual(f.name, '<stdout>') + self.assertFalse(f.closed) + self.assertTrue(f.isatty()) + self.assertFalse(f.readable()) + self.assertTrue(f.writable()) + self.assertFalse(f.seekable()) + + def test_unsupported(self): + shell = MockShell() + f = run.StdOutputFile(shell, 'stdout') + self.assertRaises(OSError, f.fileno) + self.assertRaises(OSError, f.tell) + self.assertRaises(OSError, f.seek, 0) + self.assertRaises(OSError, f.read, 0) + self.assertRaises(OSError, f.readline, 0) + + def test_write(self): + shell = MockShell() + f = run.StdOutputFile(shell, 'stdout') + f.write('test') + self.assertEqual(shell.written, [('test', 'stdout')]) + shell.reset() + f.write('t\xe8\u015b\U0001d599') + self.assertEqual(shell.written, [('t\xe8\u015b\U0001d599', 'stdout')]) + shell.reset() + + f.write(S('t\xe8\u015b\U0001d599')) + self.assertEqual(shell.written, [('t\xe8\u015b\U0001d599', 'stdout')]) + self.assertEqual(type(shell.written[0][0]), str) + shell.reset() + + self.assertRaises(TypeError, f.write) + self.assertEqual(shell.written, []) + self.assertRaises(TypeError, f.write, b'test') + self.assertRaises(TypeError, f.write, 123) + self.assertEqual(shell.written, []) + self.assertRaises(TypeError, f.write, 'test', 'spam') + self.assertEqual(shell.written, []) + + def test_write_stderr_nonencodable(self): + shell = MockShell() + f = run.StdOutputFile(shell, 'stderr', 'iso-8859-15', 'backslashreplace') + f.write('t\xe8\u015b\U0001d599\xa4') + self.assertEqual(shell.written, [('t\xe8\\u015b\\U0001d599\\xa4', 'stderr')]) + shell.reset() + + f.write(S('t\xe8\u015b\U0001d599\xa4')) + self.assertEqual(shell.written, [('t\xe8\\u015b\\U0001d599\\xa4', 'stderr')]) + self.assertEqual(type(shell.written[0][0]), str) + shell.reset() + + self.assertRaises(TypeError, f.write) + self.assertEqual(shell.written, []) + self.assertRaises(TypeError, f.write, b'test') + self.assertRaises(TypeError, f.write, 123) + self.assertEqual(shell.written, []) + self.assertRaises(TypeError, f.write, 'test', 'spam') + self.assertEqual(shell.written, []) + + def test_writelines(self): + shell = MockShell() + f = run.StdOutputFile(shell, 'stdout') + f.writelines([]) + self.assertEqual(shell.written, []) + shell.reset() + f.writelines(['one\n', 'two']) + self.assertEqual(shell.written, + [('one\n', 'stdout'), ('two', 'stdout')]) + shell.reset() + f.writelines(['on\xe8\n', 'tw\xf2']) + self.assertEqual(shell.written, + [('on\xe8\n', 'stdout'), ('tw\xf2', 'stdout')]) + shell.reset() + + f.writelines([S('t\xe8st')]) + self.assertEqual(shell.written, [('t\xe8st', 'stdout')]) + self.assertEqual(type(shell.written[0][0]), str) + shell.reset() + + self.assertRaises(TypeError, f.writelines) + self.assertEqual(shell.written, []) + self.assertRaises(TypeError, f.writelines, 123) + self.assertEqual(shell.written, []) + self.assertRaises(TypeError, f.writelines, [b'test']) + self.assertRaises(TypeError, f.writelines, [123]) + self.assertEqual(shell.written, []) + self.assertRaises(TypeError, f.writelines, [], []) + self.assertEqual(shell.written, []) + + def test_close(self): + shell = MockShell() + f = run.StdOutputFile(shell, 'stdout') + self.assertFalse(f.closed) + f.write('test') + f.close() + self.assertTrue(f.closed) + self.assertRaises(ValueError, f.write, 'x') + self.assertEqual(shell.written, [('test', 'stdout')]) + f.close() + self.assertRaises(TypeError, f.close, 1) + + +class RecursionLimitTest(unittest.TestCase): + # Test (un)install_recursionlimit_wrappers and fixdoc. + + def test_bad_setrecursionlimit_calls(self): + run.install_recursionlimit_wrappers() + self.addCleanup(run.uninstall_recursionlimit_wrappers) + f = sys.setrecursionlimit + self.assertRaises(TypeError, f, limit=100) + self.assertRaises(TypeError, f, 100, 1000) + self.assertRaises(ValueError, f, 0) + + def test_roundtrip(self): + run.install_recursionlimit_wrappers() + self.addCleanup(run.uninstall_recursionlimit_wrappers) + + # Check that setting the recursion limit works. + orig_reclimit = sys.getrecursionlimit() + self.addCleanup(sys.setrecursionlimit, orig_reclimit) + sys.setrecursionlimit(orig_reclimit + 3) + + # Check that the new limit is returned by sys.getrecursionlimit(). + new_reclimit = sys.getrecursionlimit() + self.assertEqual(new_reclimit, orig_reclimit + 3) + + def test_default_recursion_limit_preserved(self): + orig_reclimit = sys.getrecursionlimit() + run.install_recursionlimit_wrappers() + self.addCleanup(run.uninstall_recursionlimit_wrappers) + new_reclimit = sys.getrecursionlimit() + self.assertEqual(new_reclimit, orig_reclimit) + + def test_fixdoc(self): + # Put here until better place for miscellaneous test. + def func(): "docstring" + run.fixdoc(func, "more") + self.assertEqual(func.__doc__, "docstring\n\nmore") + func.__doc__ = None + run.fixdoc(func, "more") + self.assertEqual(func.__doc__, "more") + + +class HandleErrorTest(unittest.TestCase): + # Method of MyRPCServer + def test_fatal_error(self): + eq = self.assertEqual + with captured_output('__stderr__') as err,\ + mock.patch('idlelib.run.thread.interrupt_main', + new_callable=Func) as func: + try: + raise EOFError + except EOFError: + run.MyRPCServer.handle_error(None, 'abc', '123') + eq(run.exit_now, True) + run.exit_now = False + eq(err.getvalue(), '') + + try: + raise IndexError + except IndexError: + run.MyRPCServer.handle_error(None, 'abc', '123') + eq(run.quitting, True) + run.quitting = False + msg = err.getvalue() + self.assertIn('abc', msg) + self.assertIn('123', msg) + self.assertIn('IndexError', msg) + eq(func.called, 2) + + +class ExecRuncodeTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + cls.addClassCleanup(setattr,run,'print_exception',run.print_exception) + cls.prt = Func() # Need reference. + run.print_exception = cls.prt + mockrpc = mock.Mock() + mockrpc.console.getvar = Func(result=False) + cls.ex = run.Executive(mockrpc) + + @classmethod + def tearDownClass(cls): + assert sys.excepthook == sys.__excepthook__ + + def test_exceptions(self): + ex = self.ex + ex.runcode('1/0') + self.assertIs(ex.user_exc_info[0], ZeroDivisionError) + + self.addCleanup(setattr, sys, 'excepthook', sys.__excepthook__) + sys.excepthook = lambda t, e, tb: run.print_exception(t) + ex.runcode('1/0') + self.assertIs(self.prt.args[0], ZeroDivisionError) + + sys.excepthook = lambda: None + ex.runcode('1/0') + t, e, tb = ex.user_exc_info + self.assertIs(t, TypeError) + self.assertTrue(isinstance(e.__context__, ZeroDivisionError)) + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_runscript.py b/Lib/idlelib/idle_test/test_runscript.py new file mode 100644 index 000000000..5fc60185a --- /dev/null +++ b/Lib/idlelib/idle_test/test_runscript.py @@ -0,0 +1,33 @@ +"Test runscript, coverage 16%." + +from idlelib import runscript +import unittest +from test.support import requires +from tkinter import Tk +from idlelib.editor import EditorWindow + + +class ScriptBindingTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = Tk() + cls.root.withdraw() + + @classmethod + def tearDownClass(cls): + cls.root.update_idletasks() + for id in cls.root.tk.call('after', 'info'): + cls.root.after_cancel(id) # Need for EditorWindow. + cls.root.destroy() + del cls.root + + def test_init(self): + ew = EditorWindow(root=self.root) + sb = runscript.ScriptBinding(ew) + ew._close() + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_scrolledlist.py b/Lib/idlelib/idle_test/test_scrolledlist.py new file mode 100644 index 000000000..2f819fda0 --- /dev/null +++ b/Lib/idlelib/idle_test/test_scrolledlist.py @@ -0,0 +1,27 @@ +"Test scrolledlist, coverage 38%." + +from idlelib.scrolledlist import ScrolledList +import unittest +from test.support import requires +requires('gui') +from tkinter import Tk + + +class ScrolledListTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + cls.root = Tk() + + @classmethod + def tearDownClass(cls): + cls.root.destroy() + del cls.root + + + def test_init(self): + ScrolledList(self.root) + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_search.py b/Lib/idlelib/idle_test/test_search.py new file mode 100644 index 000000000..de703c195 --- /dev/null +++ b/Lib/idlelib/idle_test/test_search.py @@ -0,0 +1,80 @@ +"Test search, coverage 69%." + +from idlelib import search +import unittest +from test.support import requires +requires('gui') +from tkinter import Tk, Text, BooleanVar +from idlelib import searchengine + +# Does not currently test the event handler wrappers. +# A usage test should simulate clicks and check highlighting. +# Tests need to be coordinated with SearchDialogBase tests +# to avoid duplication. + + +class SearchDialogTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + cls.root = Tk() + + @classmethod + def tearDownClass(cls): + cls.root.destroy() + del cls.root + + def setUp(self): + self.engine = searchengine.SearchEngine(self.root) + self.dialog = search.SearchDialog(self.root, self.engine) + self.dialog.bell = lambda: None + self.text = Text(self.root) + self.text.insert('1.0', 'Hello World!') + + def test_find_again(self): + # Search for various expressions + text = self.text + + self.engine.setpat('') + self.assertFalse(self.dialog.find_again(text)) + self.dialog.bell = lambda: None + + self.engine.setpat('Hello') + self.assertTrue(self.dialog.find_again(text)) + + self.engine.setpat('Goodbye') + self.assertFalse(self.dialog.find_again(text)) + + self.engine.setpat('World!') + self.assertTrue(self.dialog.find_again(text)) + + self.engine.setpat('Hello World!') + self.assertTrue(self.dialog.find_again(text)) + + # Regular expression + self.engine.revar = BooleanVar(self.root, True) + self.engine.setpat('W[aeiouy]r') + self.assertTrue(self.dialog.find_again(text)) + + def test_find_selection(self): + # Select some text and make sure it's found + text = self.text + # Add additional line to find + self.text.insert('2.0', 'Hello World!') + + text.tag_add('sel', '1.0', '1.4') # Select 'Hello' + self.assertTrue(self.dialog.find_selection(text)) + + text.tag_remove('sel', '1.0', 'end') + text.tag_add('sel', '1.6', '1.11') # Select 'World!' + self.assertTrue(self.dialog.find_selection(text)) + + text.tag_remove('sel', '1.0', 'end') + text.tag_add('sel', '1.0', '1.11') # Select 'Hello World!' + self.assertTrue(self.dialog.find_selection(text)) + + # Remove additional line + text.delete('2.0', 'end') + +if __name__ == '__main__': + unittest.main(verbosity=2, exit=2) diff --git a/Lib/idlelib/idle_test/test_searchbase.py b/Lib/idlelib/idle_test/test_searchbase.py new file mode 100644 index 000000000..8c9c410eb --- /dev/null +++ b/Lib/idlelib/idle_test/test_searchbase.py @@ -0,0 +1,160 @@ +"Test searchbase, coverage 98%." +# The only thing not covered is inconsequential -- +# testing skipping of suite when self.needwrapbutton is false. + +import unittest +from test.support import requires +from tkinter import Text, Tk, Toplevel +from tkinter.ttk import Frame +from idlelib import searchengine as se +from idlelib import searchbase as sdb +from idlelib.idle_test.mock_idle import Func +## from idlelib.idle_test.mock_tk import Var + +# The ## imports above & following could help make some tests gui-free. +# However, they currently make radiobutton tests fail. +##def setUpModule(): +## # Replace tk objects used to initialize se.SearchEngine. +## se.BooleanVar = Var +## se.StringVar = Var +## +##def tearDownModule(): +## se.BooleanVar = BooleanVar +## se.StringVar = StringVar + + +class SearchDialogBaseTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = Tk() + + @classmethod + def tearDownClass(cls): + cls.root.update_idletasks() + cls.root.destroy() + del cls.root + + def setUp(self): + self.engine = se.SearchEngine(self.root) # None also seems to work + self.dialog = sdb.SearchDialogBase(root=self.root, engine=self.engine) + + def tearDown(self): + self.dialog.close() + + def test_open_and_close(self): + # open calls create_widgets, which needs default_command + self.dialog.default_command = None + + toplevel = Toplevel(self.root) + text = Text(toplevel) + self.dialog.open(text) + self.assertEqual(self.dialog.top.state(), 'normal') + self.dialog.close() + self.assertEqual(self.dialog.top.state(), 'withdrawn') + + self.dialog.open(text, searchphrase="hello") + self.assertEqual(self.dialog.ent.get(), 'hello') + toplevel.update_idletasks() + toplevel.destroy() + + def test_create_widgets(self): + self.dialog.create_entries = Func() + self.dialog.create_option_buttons = Func() + self.dialog.create_other_buttons = Func() + self.dialog.create_command_buttons = Func() + + self.dialog.default_command = None + self.dialog.create_widgets() + + self.assertTrue(self.dialog.create_entries.called) + self.assertTrue(self.dialog.create_option_buttons.called) + self.assertTrue(self.dialog.create_other_buttons.called) + self.assertTrue(self.dialog.create_command_buttons.called) + + def test_make_entry(self): + equal = self.assertEqual + self.dialog.row = 0 + self.dialog.frame = Frame(self.root) + entry, label = self.dialog.make_entry("Test:", 'hello') + equal(label['text'], 'Test:') + + self.assertIn(entry.get(), 'hello') + egi = entry.grid_info() + equal(int(egi['row']), 0) + equal(int(egi['column']), 1) + equal(int(egi['rowspan']), 1) + equal(int(egi['columnspan']), 1) + equal(self.dialog.row, 1) + + def test_create_entries(self): + self.dialog.frame = Frame(self.root) + self.dialog.row = 0 + self.engine.setpat('hello') + self.dialog.create_entries() + self.assertIn(self.dialog.ent.get(), 'hello') + + def test_make_frame(self): + self.dialog.row = 0 + self.dialog.frame = Frame(self.root) + frame, label = self.dialog.make_frame() + self.assertEqual(label, '') + self.assertEqual(str(type(frame)), "<class 'tkinter.ttk.Frame'>") + # self.assertIsInstance(frame, Frame) fails when test is run by + # test_idle not run from IDLE editor. See issue 33987 PR. + + frame, label = self.dialog.make_frame('testlabel') + self.assertEqual(label['text'], 'testlabel') + + def btn_test_setup(self, meth): + self.dialog.frame = Frame(self.root) + self.dialog.row = 0 + return meth() + + def test_create_option_buttons(self): + e = self.engine + for state in (0, 1): + for var in (e.revar, e.casevar, e.wordvar, e.wrapvar): + var.set(state) + frame, options = self.btn_test_setup( + self.dialog.create_option_buttons) + for spec, button in zip (options, frame.pack_slaves()): + var, label = spec + self.assertEqual(button['text'], label) + self.assertEqual(var.get(), state) + + def test_create_other_buttons(self): + for state in (False, True): + var = self.engine.backvar + var.set(state) + frame, others = self.btn_test_setup( + self.dialog.create_other_buttons) + buttons = frame.pack_slaves() + for spec, button in zip(others, buttons): + val, label = spec + self.assertEqual(button['text'], label) + if val == state: + # hit other button, then this one + # indexes depend on button order + self.assertEqual(var.get(), state) + + def test_make_button(self): + self.dialog.frame = Frame(self.root) + self.dialog.buttonframe = Frame(self.dialog.frame) + btn = self.dialog.make_button('Test', self.dialog.close) + self.assertEqual(btn['text'], 'Test') + + def test_create_command_buttons(self): + self.dialog.frame = Frame(self.root) + self.dialog.create_command_buttons() + # Look for close button command in buttonframe + closebuttoncommand = '' + for child in self.dialog.buttonframe.winfo_children(): + if child['text'] == 'Close': + closebuttoncommand = child['command'] + self.assertIn('close', closebuttoncommand) + + +if __name__ == '__main__': + unittest.main(verbosity=2, exit=2) diff --git a/Lib/idlelib/idle_test/test_searchengine.py b/Lib/idlelib/idle_test/test_searchengine.py new file mode 100644 index 000000000..9d9798394 --- /dev/null +++ b/Lib/idlelib/idle_test/test_searchengine.py @@ -0,0 +1,332 @@ +"Test searchengine, coverage 99%." + +from idlelib import searchengine as se +import unittest +# from test.support import requires +from tkinter import BooleanVar, StringVar, TclError # ,Tk, Text +from tkinter import messagebox +from idlelib.idle_test.mock_tk import Var, Mbox +from idlelib.idle_test.mock_tk import Text as mockText +import re + +# With mock replacements, the module does not use any gui widgets. +# The use of tk.Text is avoided (for now, until mock Text is improved) +# by patching instances with an index function returning what is needed. +# This works because mock Text.get does not use .index. +# The tkinter imports are used to restore searchengine. + +def setUpModule(): + # Replace s-e module tkinter imports other than non-gui TclError. + se.BooleanVar = Var + se.StringVar = Var + se.messagebox = Mbox + +def tearDownModule(): + # Restore 'just in case', though other tests should also replace. + se.BooleanVar = BooleanVar + se.StringVar = StringVar + se.messagebox = messagebox + + +class Mock: + def __init__(self, *args, **kwargs): pass + +class GetTest(unittest.TestCase): + # SearchEngine.get returns singleton created & saved on first call. + def test_get(self): + saved_Engine = se.SearchEngine + se.SearchEngine = Mock # monkey-patch class + try: + root = Mock() + engine = se.get(root) + self.assertIsInstance(engine, se.SearchEngine) + self.assertIs(root._searchengine, engine) + self.assertIs(se.get(root), engine) + finally: + se.SearchEngine = saved_Engine # restore class to module + +class GetLineColTest(unittest.TestCase): + # Test simple text-independent helper function + def test_get_line_col(self): + self.assertEqual(se.get_line_col('1.0'), (1, 0)) + self.assertEqual(se.get_line_col('1.11'), (1, 11)) + + self.assertRaises(ValueError, se.get_line_col, ('1.0 lineend')) + self.assertRaises(ValueError, se.get_line_col, ('end')) + +class GetSelectionTest(unittest.TestCase): + # Test text-dependent helper function. +## # Need gui for text.index('sel.first/sel.last/insert'). +## @classmethod +## def setUpClass(cls): +## requires('gui') +## cls.root = Tk() +## +## @classmethod +## def tearDownClass(cls): +## cls.root.destroy() +## del cls.root + + def test_get_selection(self): + # text = Text(master=self.root) + text = mockText() + text.insert('1.0', 'Hello World!') + + # fix text.index result when called in get_selection + def sel(s): + # select entire text, cursor irrelevant + if s == 'sel.first': return '1.0' + if s == 'sel.last': return '1.12' + raise TclError + text.index = sel # replaces .tag_add('sel', '1.0, '1.12') + self.assertEqual(se.get_selection(text), ('1.0', '1.12')) + + def mark(s): + # no selection, cursor after 'Hello' + if s == 'insert': return '1.5' + raise TclError + text.index = mark # replaces .mark_set('insert', '1.5') + self.assertEqual(se.get_selection(text), ('1.5', '1.5')) + + +class ReverseSearchTest(unittest.TestCase): + # Test helper function that searches backwards within a line. + def test_search_reverse(self): + Equal = self.assertEqual + line = "Here is an 'is' test text." + prog = re.compile('is') + Equal(se.search_reverse(prog, line, len(line)).span(), (12, 14)) + Equal(se.search_reverse(prog, line, 14).span(), (12, 14)) + Equal(se.search_reverse(prog, line, 13).span(), (5, 7)) + Equal(se.search_reverse(prog, line, 7).span(), (5, 7)) + Equal(se.search_reverse(prog, line, 6), None) + + +class SearchEngineTest(unittest.TestCase): + # Test class methods that do not use Text widget. + + def setUp(self): + self.engine = se.SearchEngine(root=None) + # Engine.root is only used to create error message boxes. + # The mock replacement ignores the root argument. + + def test_is_get(self): + engine = self.engine + Equal = self.assertEqual + + Equal(engine.getpat(), '') + engine.setpat('hello') + Equal(engine.getpat(), 'hello') + + Equal(engine.isre(), False) + engine.revar.set(1) + Equal(engine.isre(), True) + + Equal(engine.iscase(), False) + engine.casevar.set(1) + Equal(engine.iscase(), True) + + Equal(engine.isword(), False) + engine.wordvar.set(1) + Equal(engine.isword(), True) + + Equal(engine.iswrap(), True) + engine.wrapvar.set(0) + Equal(engine.iswrap(), False) + + Equal(engine.isback(), False) + engine.backvar.set(1) + Equal(engine.isback(), True) + + def test_setcookedpat(self): + engine = self.engine + engine.setcookedpat(r'\s') + self.assertEqual(engine.getpat(), r'\s') + engine.revar.set(1) + engine.setcookedpat(r'\s') + self.assertEqual(engine.getpat(), r'\\s') + + def test_getcookedpat(self): + engine = self.engine + Equal = self.assertEqual + + Equal(engine.getcookedpat(), '') + engine.setpat('hello') + Equal(engine.getcookedpat(), 'hello') + engine.wordvar.set(True) + Equal(engine.getcookedpat(), r'\bhello\b') + engine.wordvar.set(False) + + engine.setpat(r'\s') + Equal(engine.getcookedpat(), r'\\s') + engine.revar.set(True) + Equal(engine.getcookedpat(), r'\s') + + def test_getprog(self): + engine = self.engine + Equal = self.assertEqual + + engine.setpat('Hello') + temppat = engine.getprog() + Equal(temppat.pattern, re.compile('Hello', re.IGNORECASE).pattern) + engine.casevar.set(1) + temppat = engine.getprog() + Equal(temppat.pattern, re.compile('Hello').pattern, 0) + + engine.setpat('') + Equal(engine.getprog(), None) + Equal(Mbox.showerror.message, + 'Error: Empty regular expression') + engine.setpat('+') + engine.revar.set(1) + Equal(engine.getprog(), None) + Equal(Mbox.showerror.message, + 'Error: nothing to repeat\nPattern: +\nOffset: 0') + + def test_report_error(self): + showerror = Mbox.showerror + Equal = self.assertEqual + pat = '[a-z' + msg = 'unexpected end of regular expression' + + Equal(self.engine.report_error(pat, msg), None) + Equal(showerror.title, 'Regular expression error') + expected_message = ("Error: " + msg + "\nPattern: [a-z") + Equal(showerror.message, expected_message) + + Equal(self.engine.report_error(pat, msg, 5), None) + Equal(showerror.title, 'Regular expression error') + expected_message += "\nOffset: 5" + Equal(showerror.message, expected_message) + + +class SearchTest(unittest.TestCase): + # Test that search_text makes right call to right method. + + @classmethod + def setUpClass(cls): +## requires('gui') +## cls.root = Tk() +## cls.text = Text(master=cls.root) + cls.text = mockText() + test_text = ( + 'First line\n' + 'Line with target\n' + 'Last line\n') + cls.text.insert('1.0', test_text) + cls.pat = re.compile('target') + + cls.engine = se.SearchEngine(None) + cls.engine.search_forward = lambda *args: ('f', args) + cls.engine.search_backward = lambda *args: ('b', args) + +## @classmethod +## def tearDownClass(cls): +## cls.root.destroy() +## del cls.root + + def test_search(self): + Equal = self.assertEqual + engine = self.engine + search = engine.search_text + text = self.text + pat = self.pat + + engine.patvar.set(None) + #engine.revar.set(pat) + Equal(search(text), None) + + def mark(s): + # no selection, cursor after 'Hello' + if s == 'insert': return '1.5' + raise TclError + text.index = mark + Equal(search(text, pat), ('f', (text, pat, 1, 5, True, False))) + engine.wrapvar.set(False) + Equal(search(text, pat), ('f', (text, pat, 1, 5, False, False))) + engine.wrapvar.set(True) + engine.backvar.set(True) + Equal(search(text, pat), ('b', (text, pat, 1, 5, True, False))) + engine.backvar.set(False) + + def sel(s): + if s == 'sel.first': return '2.10' + if s == 'sel.last': return '2.16' + raise TclError + text.index = sel + Equal(search(text, pat), ('f', (text, pat, 2, 16, True, False))) + Equal(search(text, pat, True), ('f', (text, pat, 2, 10, True, True))) + engine.backvar.set(True) + Equal(search(text, pat), ('b', (text, pat, 2, 10, True, False))) + Equal(search(text, pat, True), ('b', (text, pat, 2, 16, True, True))) + + +class ForwardBackwardTest(unittest.TestCase): + # Test that search_forward method finds the target. +## @classmethod +## def tearDownClass(cls): +## cls.root.destroy() +## del cls.root + + @classmethod + def setUpClass(cls): + cls.engine = se.SearchEngine(None) +## requires('gui') +## cls.root = Tk() +## cls.text = Text(master=cls.root) + cls.text = mockText() + # search_backward calls index('end-1c') + cls.text.index = lambda index: '4.0' + test_text = ( + 'First line\n' + 'Line with target\n' + 'Last line\n') + cls.text.insert('1.0', test_text) + cls.pat = re.compile('target') + cls.res = (2, (10, 16)) # line, slice indexes of 'target' + cls.failpat = re.compile('xyz') # not in text + cls.emptypat = re.compile(r'\w*') # empty match possible + + def make_search(self, func): + def search(pat, line, col, wrap, ok=0): + res = func(self.text, pat, line, col, wrap, ok) + # res is (line, matchobject) or None + return (res[0], res[1].span()) if res else res + return search + + def test_search_forward(self): + # search for non-empty match + Equal = self.assertEqual + forward = self.make_search(self.engine.search_forward) + pat = self.pat + Equal(forward(pat, 1, 0, True), self.res) + Equal(forward(pat, 3, 0, True), self.res) # wrap + Equal(forward(pat, 3, 0, False), None) # no wrap + Equal(forward(pat, 2, 10, False), self.res) + + Equal(forward(self.failpat, 1, 0, True), None) + Equal(forward(self.emptypat, 2, 9, True, ok=True), (2, (9, 9))) + #Equal(forward(self.emptypat, 2, 9, True), self.res) + # While the initial empty match is correctly ignored, skipping + # the rest of the line and returning (3, (0,4)) seems buggy - tjr. + Equal(forward(self.emptypat, 2, 10, True), self.res) + + def test_search_backward(self): + # search for non-empty match + Equal = self.assertEqual + backward = self.make_search(self.engine.search_backward) + pat = self.pat + Equal(backward(pat, 3, 5, True), self.res) + Equal(backward(pat, 2, 0, True), self.res) # wrap + Equal(backward(pat, 2, 0, False), None) # no wrap + Equal(backward(pat, 2, 16, False), self.res) + + Equal(backward(self.failpat, 3, 9, True), None) + Equal(backward(self.emptypat, 2, 10, True, ok=True), (2, (9,9))) + # Accepted because 9 < 10, not because ok=True. + # It is not clear that ok=True is useful going back - tjr + Equal(backward(self.emptypat, 2, 9, True), (2, (5, 9))) + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_sidebar.py b/Lib/idlelib/idle_test/test_sidebar.py new file mode 100644 index 000000000..4157a4b4d --- /dev/null +++ b/Lib/idlelib/idle_test/test_sidebar.py @@ -0,0 +1,775 @@ +"""Test sidebar, coverage 85%""" +from textwrap import dedent +import sys + +from itertools import chain +import unittest +import unittest.mock +from test.support import requires, swap_attr +from test import support +import tkinter as tk +from idlelib.idle_test.tkinter_testing_utils import run_in_tk_mainloop + +from idlelib.delegator import Delegator +from idlelib.editor import fixwordbreaks +from idlelib.percolator import Percolator +import idlelib.pyshell +from idlelib.pyshell import fix_x11_paste, PyShell, PyShellFileList +from idlelib.run import fix_scaling +import idlelib.sidebar +from idlelib.sidebar import get_end_linenumber, get_lineno + + +class Dummy_editwin: + def __init__(self, text): + self.text = text + self.text_frame = self.text.master + self.per = Percolator(text) + self.undo = Delegator() + self.per.insertfilter(self.undo) + + def setvar(self, name, value): + pass + + def getlineno(self, index): + return int(float(self.text.index(index))) + + +class LineNumbersTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = tk.Tk() + cls.root.withdraw() + + cls.text_frame = tk.Frame(cls.root) + cls.text_frame.pack(side=tk.LEFT, fill=tk.BOTH, expand=True) + cls.text_frame.rowconfigure(1, weight=1) + cls.text_frame.columnconfigure(1, weight=1) + + cls.text = tk.Text(cls.text_frame, width=80, height=24, wrap=tk.NONE) + cls.text.grid(row=1, column=1, sticky=tk.NSEW) + + cls.editwin = Dummy_editwin(cls.text) + cls.editwin.vbar = tk.Scrollbar(cls.text_frame) + + @classmethod + def tearDownClass(cls): + cls.editwin.per.close() + cls.root.update_idletasks() + cls.root.destroy() + del cls.text, cls.text_frame, cls.editwin, cls.root + + def setUp(self): + self.linenumber = idlelib.sidebar.LineNumbers(self.editwin) + + self.highlight_cfg = {"background": '#abcdef', + "foreground": '#123456'} + orig_idleConf_GetHighlight = idlelib.sidebar.idleConf.GetHighlight + def mock_idleconf_GetHighlight(theme, element): + if element == 'linenumber': + return self.highlight_cfg + return orig_idleConf_GetHighlight(theme, element) + GetHighlight_patcher = unittest.mock.patch.object( + idlelib.sidebar.idleConf, 'GetHighlight', mock_idleconf_GetHighlight) + GetHighlight_patcher.start() + self.addCleanup(GetHighlight_patcher.stop) + + self.font_override = 'TkFixedFont' + def mock_idleconf_GetFont(root, configType, section): + return self.font_override + GetFont_patcher = unittest.mock.patch.object( + idlelib.sidebar.idleConf, 'GetFont', mock_idleconf_GetFont) + GetFont_patcher.start() + self.addCleanup(GetFont_patcher.stop) + + def tearDown(self): + self.text.delete('1.0', 'end') + + def get_selection(self): + return tuple(map(str, self.text.tag_ranges('sel'))) + + def get_line_screen_position(self, line): + bbox = self.linenumber.sidebar_text.bbox(f'{line}.end -1c') + x = bbox[0] + 2 + y = bbox[1] + 2 + return x, y + + def assert_state_disabled(self): + state = self.linenumber.sidebar_text.config()['state'] + self.assertEqual(state[-1], tk.DISABLED) + + def get_sidebar_text_contents(self): + return self.linenumber.sidebar_text.get('1.0', tk.END) + + def assert_sidebar_n_lines(self, n_lines): + expected = '\n'.join(chain(map(str, range(1, n_lines + 1)), [''])) + self.assertEqual(self.get_sidebar_text_contents(), expected) + + def assert_text_equals(self, expected): + return self.assertEqual(self.text.get('1.0', 'end'), expected) + + def test_init_empty(self): + self.assert_sidebar_n_lines(1) + + def test_init_not_empty(self): + self.text.insert('insert', 'foo bar\n'*3) + self.assert_text_equals('foo bar\n'*3 + '\n') + self.assert_sidebar_n_lines(4) + + def test_toggle_linenumbering(self): + self.assertEqual(self.linenumber.is_shown, False) + self.linenumber.show_sidebar() + self.assertEqual(self.linenumber.is_shown, True) + self.linenumber.hide_sidebar() + self.assertEqual(self.linenumber.is_shown, False) + self.linenumber.hide_sidebar() + self.assertEqual(self.linenumber.is_shown, False) + self.linenumber.show_sidebar() + self.assertEqual(self.linenumber.is_shown, True) + self.linenumber.show_sidebar() + self.assertEqual(self.linenumber.is_shown, True) + + def test_insert(self): + self.text.insert('insert', 'foobar') + self.assert_text_equals('foobar\n') + self.assert_sidebar_n_lines(1) + self.assert_state_disabled() + + self.text.insert('insert', '\nfoo') + self.assert_text_equals('foobar\nfoo\n') + self.assert_sidebar_n_lines(2) + self.assert_state_disabled() + + self.text.insert('insert', 'hello\n'*2) + self.assert_text_equals('foobar\nfoohello\nhello\n\n') + self.assert_sidebar_n_lines(4) + self.assert_state_disabled() + + self.text.insert('insert', '\nworld') + self.assert_text_equals('foobar\nfoohello\nhello\n\nworld\n') + self.assert_sidebar_n_lines(5) + self.assert_state_disabled() + + def test_delete(self): + self.text.insert('insert', 'foobar') + self.assert_text_equals('foobar\n') + self.text.delete('1.1', '1.3') + self.assert_text_equals('fbar\n') + self.assert_sidebar_n_lines(1) + self.assert_state_disabled() + + self.text.insert('insert', 'foo\n'*2) + self.assert_text_equals('fbarfoo\nfoo\n\n') + self.assert_sidebar_n_lines(3) + self.assert_state_disabled() + + # Deleting up to "2.end" doesn't delete the final newline. + self.text.delete('2.0', '2.end') + self.assert_text_equals('fbarfoo\n\n\n') + self.assert_sidebar_n_lines(3) + self.assert_state_disabled() + + self.text.delete('1.3', 'end') + self.assert_text_equals('fba\n') + self.assert_sidebar_n_lines(1) + self.assert_state_disabled() + + # Text widgets always keep a single '\n' character at the end. + self.text.delete('1.0', 'end') + self.assert_text_equals('\n') + self.assert_sidebar_n_lines(1) + self.assert_state_disabled() + + def test_sidebar_text_width(self): + """ + Test that linenumber text widget is always at the minimum + width + """ + def get_width(): + return self.linenumber.sidebar_text.config()['width'][-1] + + self.assert_sidebar_n_lines(1) + self.assertEqual(get_width(), 1) + + self.text.insert('insert', 'foo') + self.assert_sidebar_n_lines(1) + self.assertEqual(get_width(), 1) + + self.text.insert('insert', 'foo\n'*8) + self.assert_sidebar_n_lines(9) + self.assertEqual(get_width(), 1) + + self.text.insert('insert', 'foo\n') + self.assert_sidebar_n_lines(10) + self.assertEqual(get_width(), 2) + + self.text.insert('insert', 'foo\n') + self.assert_sidebar_n_lines(11) + self.assertEqual(get_width(), 2) + + self.text.delete('insert -1l linestart', 'insert linestart') + self.assert_sidebar_n_lines(10) + self.assertEqual(get_width(), 2) + + self.text.delete('insert -1l linestart', 'insert linestart') + self.assert_sidebar_n_lines(9) + self.assertEqual(get_width(), 1) + + self.text.insert('insert', 'foo\n'*90) + self.assert_sidebar_n_lines(99) + self.assertEqual(get_width(), 2) + + self.text.insert('insert', 'foo\n') + self.assert_sidebar_n_lines(100) + self.assertEqual(get_width(), 3) + + self.text.insert('insert', 'foo\n') + self.assert_sidebar_n_lines(101) + self.assertEqual(get_width(), 3) + + self.text.delete('insert -1l linestart', 'insert linestart') + self.assert_sidebar_n_lines(100) + self.assertEqual(get_width(), 3) + + self.text.delete('insert -1l linestart', 'insert linestart') + self.assert_sidebar_n_lines(99) + self.assertEqual(get_width(), 2) + + self.text.delete('50.0 -1c', 'end -1c') + self.assert_sidebar_n_lines(49) + self.assertEqual(get_width(), 2) + + self.text.delete('5.0 -1c', 'end -1c') + self.assert_sidebar_n_lines(4) + self.assertEqual(get_width(), 1) + + # Text widgets always keep a single '\n' character at the end. + self.text.delete('1.0', 'end -1c') + self.assert_sidebar_n_lines(1) + self.assertEqual(get_width(), 1) + + # The following tests are temporarily disabled due to relying on + # simulated user input and inspecting which text is selected, which + # are fragile and can fail when several GUI tests are run in parallel + # or when the windows created by the test lose focus. + # + # TODO: Re-work these tests or remove them from the test suite. + + @unittest.skip('test disabled') + def test_click_selection(self): + self.linenumber.show_sidebar() + self.text.insert('1.0', 'one\ntwo\nthree\nfour\n') + self.root.update() + + # Click on the second line. + x, y = self.get_line_screen_position(2) + self.linenumber.sidebar_text.event_generate('<Button-1>', x=x, y=y) + self.linenumber.sidebar_text.update() + self.root.update() + + self.assertEqual(self.get_selection(), ('2.0', '3.0')) + + def simulate_drag(self, start_line, end_line): + start_x, start_y = self.get_line_screen_position(start_line) + end_x, end_y = self.get_line_screen_position(end_line) + + self.linenumber.sidebar_text.event_generate('<Button-1>', + x=start_x, y=start_y) + self.root.update() + + def lerp(a, b, steps): + """linearly interpolate from a to b (inclusive) in equal steps""" + last_step = steps - 1 + for i in range(steps): + yield ((last_step - i) / last_step) * a + (i / last_step) * b + + for x, y in zip( + map(int, lerp(start_x, end_x, steps=11)), + map(int, lerp(start_y, end_y, steps=11)), + ): + self.linenumber.sidebar_text.event_generate('<B1-Motion>', x=x, y=y) + self.root.update() + + self.linenumber.sidebar_text.event_generate('<ButtonRelease-1>', + x=end_x, y=end_y) + self.root.update() + + @unittest.skip('test disabled') + def test_drag_selection_down(self): + self.linenumber.show_sidebar() + self.text.insert('1.0', 'one\ntwo\nthree\nfour\nfive\n') + self.root.update() + + # Drag from the second line to the fourth line. + self.simulate_drag(2, 4) + self.assertEqual(self.get_selection(), ('2.0', '5.0')) + + @unittest.skip('test disabled') + def test_drag_selection_up(self): + self.linenumber.show_sidebar() + self.text.insert('1.0', 'one\ntwo\nthree\nfour\nfive\n') + self.root.update() + + # Drag from the fourth line to the second line. + self.simulate_drag(4, 2) + self.assertEqual(self.get_selection(), ('2.0', '5.0')) + + def test_scroll(self): + self.linenumber.show_sidebar() + self.text.insert('1.0', 'line\n' * 100) + self.root.update() + + # Scroll down 10 lines. + self.text.yview_scroll(10, 'unit') + self.root.update() + self.assertEqual(self.text.index('@0,0'), '11.0') + self.assertEqual(self.linenumber.sidebar_text.index('@0,0'), '11.0') + + # Generate a mouse-wheel event and make sure it scrolled up or down. + # The meaning of the "delta" is OS-dependent, so this just checks for + # any change. + self.linenumber.sidebar_text.event_generate('<MouseWheel>', + x=0, y=0, + delta=10) + self.root.update() + self.assertNotEqual(self.text.index('@0,0'), '11.0') + self.assertNotEqual(self.linenumber.sidebar_text.index('@0,0'), '11.0') + + def test_font(self): + ln = self.linenumber + + orig_font = ln.sidebar_text['font'] + test_font = 'TkTextFont' + self.assertNotEqual(orig_font, test_font) + + # Ensure line numbers aren't shown. + ln.hide_sidebar() + + self.font_override = test_font + # Nothing breaks when line numbers aren't shown. + ln.update_font() + + # Activate line numbers, previous font change is immediately effective. + ln.show_sidebar() + self.assertEqual(ln.sidebar_text['font'], test_font) + + # Call the font update with line numbers shown, change is picked up. + self.font_override = orig_font + ln.update_font() + self.assertEqual(ln.sidebar_text['font'], orig_font) + + def test_highlight_colors(self): + ln = self.linenumber + + orig_colors = dict(self.highlight_cfg) + test_colors = {'background': '#222222', 'foreground': '#ffff00'} + + def assert_colors_are_equal(colors): + self.assertEqual(ln.sidebar_text['background'], colors['background']) + self.assertEqual(ln.sidebar_text['foreground'], colors['foreground']) + + # Ensure line numbers aren't shown. + ln.hide_sidebar() + + self.highlight_cfg = test_colors + # Nothing breaks with inactive line numbers. + ln.update_colors() + + # Show line numbers, previous colors change is immediately effective. + ln.show_sidebar() + assert_colors_are_equal(test_colors) + + # Call colors update with no change to the configured colors. + ln.update_colors() + assert_colors_are_equal(test_colors) + + # Call the colors update with line numbers shown, change is picked up. + self.highlight_cfg = orig_colors + ln.update_colors() + assert_colors_are_equal(orig_colors) + + +class ShellSidebarTest(unittest.TestCase): + root: tk.Tk = None + shell: PyShell = None + + @classmethod + def setUpClass(cls): + requires('gui') + + cls.root = root = tk.Tk() + root.withdraw() + + fix_scaling(root) + fixwordbreaks(root) + fix_x11_paste(root) + + cls.flist = flist = PyShellFileList(root) + # See #43981 about macosx.setupApp(root, flist) causing failure. + root.update_idletasks() + + cls.init_shell() + + @classmethod + def tearDownClass(cls): + if cls.shell is not None: + cls.shell.executing = False + cls.shell.close() + cls.shell = None + cls.flist = None + cls.root.update_idletasks() + cls.root.destroy() + cls.root = None + + @classmethod + def init_shell(cls): + cls.shell = cls.flist.open_shell() + cls.shell.pollinterval = 10 + cls.root.update() + cls.n_preface_lines = get_lineno(cls.shell.text, 'end-1c') - 1 + + @classmethod + def reset_shell(cls): + cls.shell.per.bottom.delete(f'{cls.n_preface_lines+1}.0', 'end-1c') + cls.shell.shell_sidebar.update_sidebar() + cls.root.update() + + def setUp(self): + # In some test environments, e.g. Azure Pipelines (as of + # Apr. 2021), sys.stdout is changed between tests. However, + # PyShell relies on overriding sys.stdout when run without a + # sub-process (as done here; see setUpClass). + self._saved_stdout = None + if sys.stdout != self.shell.stdout: + self._saved_stdout = sys.stdout + sys.stdout = self.shell.stdout + + self.reset_shell() + + def tearDown(self): + if self._saved_stdout is not None: + sys.stdout = self._saved_stdout + + def get_sidebar_lines(self): + canvas = self.shell.shell_sidebar.canvas + texts = list(canvas.find(tk.ALL)) + texts_by_y_coords = { + canvas.bbox(text)[1]: canvas.itemcget(text, 'text') + for text in texts + } + line_y_coords = self.get_shell_line_y_coords() + return [texts_by_y_coords.get(y, None) for y in line_y_coords] + + def assert_sidebar_lines_end_with(self, expected_lines): + self.shell.shell_sidebar.update_sidebar() + self.assertEqual( + self.get_sidebar_lines()[-len(expected_lines):], + expected_lines, + ) + + def get_shell_line_y_coords(self): + text = self.shell.text + y_coords = [] + index = text.index("@0,0") + if index.split('.', 1)[1] != '0': + index = text.index(f"{index} +1line linestart") + while (lineinfo := text.dlineinfo(index)) is not None: + y_coords.append(lineinfo[1]) + index = text.index(f"{index} +1line") + return y_coords + + def get_sidebar_line_y_coords(self): + canvas = self.shell.shell_sidebar.canvas + texts = list(canvas.find(tk.ALL)) + texts.sort(key=lambda text: canvas.bbox(text)[1]) + return [canvas.bbox(text)[1] for text in texts] + + def assert_sidebar_lines_synced(self): + self.assertLessEqual( + set(self.get_sidebar_line_y_coords()), + set(self.get_shell_line_y_coords()), + ) + + def do_input(self, input): + shell = self.shell + text = shell.text + for line_index, line in enumerate(input.split('\n')): + if line_index > 0: + text.event_generate('<<newline-and-indent>>') + text.insert('insert', line, 'stdin') + + def test_initial_state(self): + sidebar_lines = self.get_sidebar_lines() + self.assertEqual( + sidebar_lines, + [None] * (len(sidebar_lines) - 1) + ['>>>'], + ) + self.assert_sidebar_lines_synced() + + @run_in_tk_mainloop() + def test_single_empty_input(self): + self.do_input('\n') + yield + self.assert_sidebar_lines_end_with(['>>>', '>>>']) + + @run_in_tk_mainloop() + def test_single_line_statement(self): + self.do_input('1\n') + yield + self.assert_sidebar_lines_end_with(['>>>', None, '>>>']) + + @run_in_tk_mainloop() + def test_multi_line_statement(self): + # Block statements are not indented because IDLE auto-indents. + self.do_input(dedent('''\ + if True: + print(1) + + ''')) + yield + self.assert_sidebar_lines_end_with([ + '>>>', + '...', + '...', + '...', + None, + '>>>', + ]) + + @run_in_tk_mainloop() + def test_single_long_line_wraps(self): + self.do_input('1' * 200 + '\n') + yield + self.assert_sidebar_lines_end_with(['>>>', None, '>>>']) + self.assert_sidebar_lines_synced() + + @run_in_tk_mainloop() + def test_squeeze_multi_line_output(self): + shell = self.shell + text = shell.text + + self.do_input('print("a\\nb\\nc")\n') + yield + self.assert_sidebar_lines_end_with(['>>>', None, None, None, '>>>']) + + text.mark_set('insert', f'insert -1line linestart') + text.event_generate('<<squeeze-current-text>>') + yield + self.assert_sidebar_lines_end_with(['>>>', None, '>>>']) + self.assert_sidebar_lines_synced() + + shell.squeezer.expandingbuttons[0].expand() + yield + self.assert_sidebar_lines_end_with(['>>>', None, None, None, '>>>']) + self.assert_sidebar_lines_synced() + + @run_in_tk_mainloop() + def test_interrupt_recall_undo_redo(self): + text = self.shell.text + # Block statements are not indented because IDLE auto-indents. + initial_sidebar_lines = self.get_sidebar_lines() + + self.do_input(dedent('''\ + if True: + print(1) + ''')) + yield + self.assert_sidebar_lines_end_with(['>>>', '...', '...']) + with_block_sidebar_lines = self.get_sidebar_lines() + self.assertNotEqual(with_block_sidebar_lines, initial_sidebar_lines) + + # Control-C + text.event_generate('<<interrupt-execution>>') + yield + self.assert_sidebar_lines_end_with(['>>>', '...', '...', None, '>>>']) + + # Recall previous via history + text.event_generate('<<history-previous>>') + text.event_generate('<<interrupt-execution>>') + yield + self.assert_sidebar_lines_end_with(['>>>', '...', None, '>>>']) + + # Recall previous via recall + text.mark_set('insert', text.index('insert -2l')) + text.event_generate('<<newline-and-indent>>') + yield + + text.event_generate('<<undo>>') + yield + self.assert_sidebar_lines_end_with(['>>>']) + + text.event_generate('<<redo>>') + yield + self.assert_sidebar_lines_end_with(['>>>', '...']) + + text.event_generate('<<newline-and-indent>>') + text.event_generate('<<newline-and-indent>>') + yield + self.assert_sidebar_lines_end_with( + ['>>>', '...', '...', '...', None, '>>>'] + ) + + @run_in_tk_mainloop() + def test_very_long_wrapped_line(self): + with support.adjust_int_max_str_digits(11_111), \ + swap_attr(self.shell, 'squeezer', None): + self.do_input('x = ' + '1'*10_000 + '\n') + yield + self.assertEqual(self.get_sidebar_lines(), ['>>>']) + + def test_font(self): + sidebar = self.shell.shell_sidebar + + test_font = 'TkTextFont' + + def mock_idleconf_GetFont(root, configType, section): + return test_font + GetFont_patcher = unittest.mock.patch.object( + idlelib.sidebar.idleConf, 'GetFont', mock_idleconf_GetFont) + GetFont_patcher.start() + def cleanup(): + GetFont_patcher.stop() + sidebar.update_font() + self.addCleanup(cleanup) + + def get_sidebar_font(): + canvas = sidebar.canvas + texts = list(canvas.find(tk.ALL)) + fonts = {canvas.itemcget(text, 'font') for text in texts} + self.assertEqual(len(fonts), 1) + return next(iter(fonts)) + + self.assertNotEqual(get_sidebar_font(), test_font) + sidebar.update_font() + self.assertEqual(get_sidebar_font(), test_font) + + def test_highlight_colors(self): + sidebar = self.shell.shell_sidebar + + test_colors = {"background": '#abcdef', "foreground": '#123456'} + + orig_idleConf_GetHighlight = idlelib.sidebar.idleConf.GetHighlight + def mock_idleconf_GetHighlight(theme, element): + if element in ['linenumber', 'console']: + return test_colors + return orig_idleConf_GetHighlight(theme, element) + GetHighlight_patcher = unittest.mock.patch.object( + idlelib.sidebar.idleConf, 'GetHighlight', + mock_idleconf_GetHighlight) + GetHighlight_patcher.start() + def cleanup(): + GetHighlight_patcher.stop() + sidebar.update_colors() + self.addCleanup(cleanup) + + def get_sidebar_colors(): + canvas = sidebar.canvas + texts = list(canvas.find(tk.ALL)) + fgs = {canvas.itemcget(text, 'fill') for text in texts} + self.assertEqual(len(fgs), 1) + fg = next(iter(fgs)) + bg = canvas.cget('background') + return {"background": bg, "foreground": fg} + + self.assertNotEqual(get_sidebar_colors(), test_colors) + sidebar.update_colors() + self.assertEqual(get_sidebar_colors(), test_colors) + + @run_in_tk_mainloop() + def test_mousewheel(self): + sidebar = self.shell.shell_sidebar + text = self.shell.text + + # Enter a 100-line string to scroll the shell screen down. + self.do_input('x = """' + '\n'*100 + '"""\n') + yield + self.assertGreater(get_lineno(text, '@0,0'), 1) + + last_lineno = get_end_linenumber(text) + self.assertIsNotNone(text.dlineinfo(text.index(f'{last_lineno}.0'))) + + # Delta for <MouseWheel>, whose meaning is platform-dependent. + delta = 1 if sidebar.canvas._windowingsystem == 'aqua' else 120 + + # Scroll up. + if sidebar.canvas._windowingsystem == 'x11': + sidebar.canvas.event_generate('<Button-4>', x=0, y=0) + else: + sidebar.canvas.event_generate('<MouseWheel>', x=0, y=0, delta=delta) + yield + self.assertIsNone(text.dlineinfo(text.index(f'{last_lineno}.0'))) + + # Scroll back down. + if sidebar.canvas._windowingsystem == 'x11': + sidebar.canvas.event_generate('<Button-5>', x=0, y=0) + else: + sidebar.canvas.event_generate('<MouseWheel>', x=0, y=0, delta=-delta) + yield + self.assertIsNotNone(text.dlineinfo(text.index(f'{last_lineno}.0'))) + + @run_in_tk_mainloop() + def test_copy(self): + sidebar = self.shell.shell_sidebar + text = self.shell.text + + first_line = get_end_linenumber(text) + + self.do_input(dedent('''\ + if True: + print(1) + + ''')) + yield + + text.tag_add('sel', f'{first_line}.0', 'end-1c') + selected_text = text.get('sel.first', 'sel.last') + self.assertStartsWith(selected_text, 'if True:\n') + self.assertIn('\n1\n', selected_text) + + text.event_generate('<<copy>>') + self.addCleanup(text.clipboard_clear) + + copied_text = text.clipboard_get() + self.assertEqual(copied_text, selected_text) + + @run_in_tk_mainloop() + def test_copy_with_prompts(self): + sidebar = self.shell.shell_sidebar + text = self.shell.text + + first_line = get_end_linenumber(text) + self.do_input(dedent('''\ + if True: + print(1) + + ''')) + yield + + text.tag_add('sel', f'{first_line}.3', 'end-1c') + selected_text = text.get('sel.first', 'sel.last') + self.assertStartsWith(selected_text, 'True:\n') + + selected_lines_text = text.get('sel.first linestart', 'sel.last') + selected_lines = selected_lines_text.split('\n') + selected_lines.pop() # Final '' is a split artifact, not a line. + # Expect a block of input and a single output line. + expected_prompts = \ + ['>>>'] + ['...'] * (len(selected_lines) - 2) + [None] + selected_text_with_prompts = '\n'.join( + line if prompt is None else prompt + ' ' + line + for prompt, line in zip(expected_prompts, + selected_lines, + strict=True) + ) + '\n' + + text.event_generate('<<copy-with-prompts>>') + self.addCleanup(text.clipboard_clear) + + copied_text = text.clipboard_get() + self.assertEqual(copied_text, selected_text_with_prompts) + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_squeezer.py b/Lib/idlelib/idle_test/test_squeezer.py new file mode 100644 index 000000000..86c21f00b --- /dev/null +++ b/Lib/idlelib/idle_test/test_squeezer.py @@ -0,0 +1,467 @@ +"Test squeezer, coverage 95%" + +from textwrap import dedent +from tkinter import Text, Tk +import unittest +from unittest.mock import Mock, NonCallableMagicMock, patch, sentinel, ANY +from test.support import requires + +from idlelib.config import idleConf +from idlelib.percolator import Percolator +from idlelib.squeezer import count_lines_with_wrapping, ExpandingButton, \ + Squeezer +from idlelib import macosx +from idlelib.textview import view_text +from idlelib.tooltip import Hovertip + +SENTINEL_VALUE = sentinel.SENTINEL_VALUE + + +def get_test_tk_root(test_instance): + """Helper for tests: Create a root Tk object.""" + requires('gui') + root = Tk() + root.withdraw() + + def cleanup_root(): + root.update_idletasks() + root.destroy() + test_instance.addCleanup(cleanup_root) + + return root + + +class CountLinesTest(unittest.TestCase): + """Tests for the count_lines_with_wrapping function.""" + def check(self, expected, text, linewidth): + return self.assertEqual( + expected, + count_lines_with_wrapping(text, linewidth), + ) + + def test_count_empty(self): + """Test with an empty string.""" + self.assertEqual(count_lines_with_wrapping(""), 0) + + def test_count_begins_with_empty_line(self): + """Test with a string which begins with a newline.""" + self.assertEqual(count_lines_with_wrapping("\ntext"), 2) + + def test_count_ends_with_empty_line(self): + """Test with a string which ends with a newline.""" + self.assertEqual(count_lines_with_wrapping("text\n"), 1) + + def test_count_several_lines(self): + """Test with several lines of text.""" + self.assertEqual(count_lines_with_wrapping("1\n2\n3\n"), 3) + + def test_empty_lines(self): + self.check(expected=1, text='\n', linewidth=80) + self.check(expected=2, text='\n\n', linewidth=80) + self.check(expected=10, text='\n' * 10, linewidth=80) + + def test_long_line(self): + self.check(expected=3, text='a' * 200, linewidth=80) + self.check(expected=3, text='a' * 200 + '\n', linewidth=80) + + def test_several_lines_different_lengths(self): + text = dedent("""\ + 13 characters + 43 is the number of characters on this line + + 7 chars + 13 characters""") + self.check(expected=5, text=text, linewidth=80) + self.check(expected=5, text=text + '\n', linewidth=80) + self.check(expected=6, text=text, linewidth=40) + self.check(expected=7, text=text, linewidth=20) + self.check(expected=11, text=text, linewidth=10) + + +class SqueezerTest(unittest.TestCase): + """Tests for the Squeezer class.""" + def make_mock_editor_window(self, with_text_widget=False): + """Create a mock EditorWindow instance.""" + editwin = NonCallableMagicMock() + editwin.width = 80 + + if with_text_widget: + editwin.root = get_test_tk_root(self) + text_widget = self.make_text_widget(root=editwin.root) + editwin.text = editwin.per.bottom = text_widget + + return editwin + + def make_squeezer_instance(self, editor_window=None): + """Create an actual Squeezer instance with a mock EditorWindow.""" + if editor_window is None: + editor_window = self.make_mock_editor_window() + squeezer = Squeezer(editor_window) + return squeezer + + def make_text_widget(self, root=None): + if root is None: + root = get_test_tk_root(self) + text_widget = Text(root) + text_widget["font"] = ('Courier', 10) + text_widget.mark_set("iomark", "1.0") + return text_widget + + def set_idleconf_option_with_cleanup(self, configType, section, option, value): + prev_val = idleConf.GetOption(configType, section, option) + idleConf.SetOption(configType, section, option, value) + self.addCleanup(idleConf.SetOption, + configType, section, option, prev_val) + + def test_count_lines(self): + """Test Squeezer.count_lines() with various inputs.""" + editwin = self.make_mock_editor_window() + squeezer = self.make_squeezer_instance(editwin) + + for text_code, line_width, expected in [ + (r"'\n'", 80, 1), + (r"'\n' * 3", 80, 3), + (r"'a' * 40 + '\n'", 80, 1), + (r"'a' * 80 + '\n'", 80, 1), + (r"'a' * 200 + '\n'", 80, 3), + (r"'aa\t' * 20", 80, 2), + (r"'aa\t' * 21", 80, 3), + (r"'aa\t' * 20", 40, 4), + ]: + with self.subTest(text_code=text_code, + line_width=line_width, + expected=expected): + text = eval(text_code) + with patch.object(editwin, 'width', line_width): + self.assertEqual(squeezer.count_lines(text), expected) + + def test_init(self): + """Test the creation of Squeezer instances.""" + editwin = self.make_mock_editor_window() + squeezer = self.make_squeezer_instance(editwin) + self.assertIs(squeezer.editwin, editwin) + self.assertEqual(squeezer.expandingbuttons, []) + + def test_write_no_tags(self): + """Test Squeezer's overriding of the EditorWindow's write() method.""" + editwin = self.make_mock_editor_window() + for text in ['', 'TEXT', 'LONG TEXT' * 1000, 'MANY_LINES\n' * 100]: + editwin.write = orig_write = Mock(return_value=SENTINEL_VALUE) + squeezer = self.make_squeezer_instance(editwin) + + self.assertEqual(squeezer.editwin.write(text, ()), SENTINEL_VALUE) + self.assertEqual(orig_write.call_count, 1) + orig_write.assert_called_with(text, ()) + self.assertEqual(len(squeezer.expandingbuttons), 0) + + def test_write_not_stdout(self): + """Test Squeezer's overriding of the EditorWindow's write() method.""" + for text in ['', 'TEXT', 'LONG TEXT' * 1000, 'MANY_LINES\n' * 100]: + editwin = self.make_mock_editor_window() + editwin.write.return_value = SENTINEL_VALUE + orig_write = editwin.write + squeezer = self.make_squeezer_instance(editwin) + + self.assertEqual(squeezer.editwin.write(text, "stderr"), + SENTINEL_VALUE) + self.assertEqual(orig_write.call_count, 1) + orig_write.assert_called_with(text, "stderr") + self.assertEqual(len(squeezer.expandingbuttons), 0) + + def test_write_stdout(self): + """Test Squeezer's overriding of the EditorWindow's write() method.""" + requires('gui') + editwin = self.make_mock_editor_window() + + for text in ['', 'TEXT']: + editwin.write = orig_write = Mock(return_value=SENTINEL_VALUE) + squeezer = self.make_squeezer_instance(editwin) + squeezer.auto_squeeze_min_lines = 50 + + self.assertEqual(squeezer.editwin.write(text, "stdout"), + SENTINEL_VALUE) + self.assertEqual(orig_write.call_count, 1) + orig_write.assert_called_with(text, "stdout") + self.assertEqual(len(squeezer.expandingbuttons), 0) + + for text in ['LONG TEXT' * 1000, 'MANY_LINES\n' * 100]: + editwin.write = orig_write = Mock(return_value=SENTINEL_VALUE) + squeezer = self.make_squeezer_instance(editwin) + squeezer.auto_squeeze_min_lines = 50 + + self.assertEqual(squeezer.editwin.write(text, "stdout"), None) + self.assertEqual(orig_write.call_count, 0) + self.assertEqual(len(squeezer.expandingbuttons), 1) + + def test_auto_squeeze(self): + """Test that the auto-squeezing creates an ExpandingButton properly.""" + editwin = self.make_mock_editor_window(with_text_widget=True) + text_widget = editwin.text + squeezer = self.make_squeezer_instance(editwin) + squeezer.auto_squeeze_min_lines = 5 + squeezer.count_lines = Mock(return_value=6) + + editwin.write('TEXT\n'*6, "stdout") + self.assertEqual(text_widget.get('1.0', 'end'), '\n') + self.assertEqual(len(squeezer.expandingbuttons), 1) + + def test_squeeze_current_text(self): + """Test the squeeze_current_text method.""" + # Squeezing text should work for both stdout and stderr. + for tag_name in ["stdout", "stderr"]: + editwin = self.make_mock_editor_window(with_text_widget=True) + text_widget = editwin.text + squeezer = self.make_squeezer_instance(editwin) + squeezer.count_lines = Mock(return_value=6) + + # Prepare some text in the Text widget. + text_widget.insert("1.0", "SOME\nTEXT\n", tag_name) + text_widget.mark_set("insert", "1.0") + self.assertEqual(text_widget.get('1.0', 'end'), 'SOME\nTEXT\n\n') + + self.assertEqual(len(squeezer.expandingbuttons), 0) + + # Test squeezing the current text. + retval = squeezer.squeeze_current_text() + self.assertEqual(retval, "break") + self.assertEqual(text_widget.get('1.0', 'end'), '\n\n') + self.assertEqual(len(squeezer.expandingbuttons), 1) + self.assertEqual(squeezer.expandingbuttons[0].s, 'SOME\nTEXT') + + # Test that expanding the squeezed text works and afterwards + # the Text widget contains the original text. + squeezer.expandingbuttons[0].expand() + self.assertEqual(text_widget.get('1.0', 'end'), 'SOME\nTEXT\n\n') + self.assertEqual(len(squeezer.expandingbuttons), 0) + + def test_squeeze_current_text_no_allowed_tags(self): + """Test that the event doesn't squeeze text without a relevant tag.""" + editwin = self.make_mock_editor_window(with_text_widget=True) + text_widget = editwin.text + squeezer = self.make_squeezer_instance(editwin) + squeezer.count_lines = Mock(return_value=6) + + # Prepare some text in the Text widget. + text_widget.insert("1.0", "SOME\nTEXT\n", "TAG") + text_widget.mark_set("insert", "1.0") + self.assertEqual(text_widget.get('1.0', 'end'), 'SOME\nTEXT\n\n') + + self.assertEqual(len(squeezer.expandingbuttons), 0) + + # Test squeezing the current text. + retval = squeezer.squeeze_current_text() + self.assertEqual(retval, "break") + self.assertEqual(text_widget.get('1.0', 'end'), 'SOME\nTEXT\n\n') + self.assertEqual(len(squeezer.expandingbuttons), 0) + + def test_squeeze_text_before_existing_squeezed_text(self): + """Test squeezing text before existing squeezed text.""" + editwin = self.make_mock_editor_window(with_text_widget=True) + text_widget = editwin.text + squeezer = self.make_squeezer_instance(editwin) + squeezer.count_lines = Mock(return_value=6) + + # Prepare some text in the Text widget and squeeze it. + text_widget.insert("1.0", "SOME\nTEXT\n", "stdout") + text_widget.mark_set("insert", "1.0") + squeezer.squeeze_current_text() + self.assertEqual(len(squeezer.expandingbuttons), 1) + + # Test squeezing the current text. + text_widget.insert("1.0", "MORE\nSTUFF\n", "stdout") + text_widget.mark_set("insert", "1.0") + retval = squeezer.squeeze_current_text() + self.assertEqual(retval, "break") + self.assertEqual(text_widget.get('1.0', 'end'), '\n\n\n') + self.assertEqual(len(squeezer.expandingbuttons), 2) + self.assertTrue(text_widget.compare( + squeezer.expandingbuttons[0], + '<', + squeezer.expandingbuttons[1], + )) + + def test_reload(self): + """Test the reload() class-method.""" + editwin = self.make_mock_editor_window(with_text_widget=True) + squeezer = self.make_squeezer_instance(editwin) + + orig_auto_squeeze_min_lines = squeezer.auto_squeeze_min_lines + + # Increase auto-squeeze-min-lines. + new_auto_squeeze_min_lines = orig_auto_squeeze_min_lines + 10 + self.set_idleconf_option_with_cleanup( + 'main', 'PyShell', 'auto-squeeze-min-lines', + str(new_auto_squeeze_min_lines)) + + Squeezer.reload() + self.assertEqual(squeezer.auto_squeeze_min_lines, + new_auto_squeeze_min_lines) + + def test_reload_no_squeezer_instances(self): + """Test that Squeezer.reload() runs without any instances existing.""" + Squeezer.reload() + + +class ExpandingButtonTest(unittest.TestCase): + """Tests for the ExpandingButton class.""" + # In these tests the squeezer instance is a mock, but actual tkinter + # Text and Button instances are created. + def make_mock_squeezer(self): + """Helper for tests: Create a mock Squeezer object.""" + root = get_test_tk_root(self) + squeezer = Mock() + squeezer.editwin.text = Text(root) + squeezer.editwin.per = Percolator(squeezer.editwin.text) + self.addCleanup(squeezer.editwin.per.close) + + # Set default values for the configuration settings. + squeezer.auto_squeeze_min_lines = 50 + return squeezer + + @patch('idlelib.squeezer.Hovertip', autospec=Hovertip) + def test_init(self, MockHovertip): + """Test the simplest creation of an ExpandingButton.""" + squeezer = self.make_mock_squeezer() + text_widget = squeezer.editwin.text + + expandingbutton = ExpandingButton('TEXT', 'TAGS', 50, squeezer) + self.assertEqual(expandingbutton.s, 'TEXT') + + # Check that the underlying tkinter.Button is properly configured. + self.assertEqual(expandingbutton.master, text_widget) + self.assertTrue('50 lines' in expandingbutton.cget('text')) + + # Check that the text widget still contains no text. + self.assertEqual(text_widget.get('1.0', 'end'), '\n') + + # Check that the mouse events are bound. + self.assertIn('<Double-Button-1>', expandingbutton.bind()) + right_button_code = '<Button-%s>' % ('2' if macosx.isAquaTk() else '3') + self.assertIn(right_button_code, expandingbutton.bind()) + + # Check that ToolTip was called once, with appropriate values. + self.assertEqual(MockHovertip.call_count, 1) + MockHovertip.assert_called_with(expandingbutton, ANY, hover_delay=ANY) + + # Check that 'right-click' appears in the tooltip text. + tooltip_text = MockHovertip.call_args[0][1] + self.assertIn('right-click', tooltip_text.lower()) + + def test_expand(self): + """Test the expand event.""" + squeezer = self.make_mock_squeezer() + expandingbutton = ExpandingButton('TEXT', 'TAGS', 50, squeezer) + + # Insert the button into the text widget + # (this is normally done by the Squeezer class). + text_widget = squeezer.editwin.text + text_widget.window_create("1.0", window=expandingbutton) + + # trigger the expand event + retval = expandingbutton.expand(event=Mock()) + self.assertEqual(retval, None) + + # Check that the text was inserted into the text widget. + self.assertEqual(text_widget.get('1.0', 'end'), 'TEXT\n') + + # Check that the 'TAGS' tag was set on the inserted text. + text_end_index = text_widget.index('end-1c') + self.assertEqual(text_widget.get('1.0', text_end_index), 'TEXT') + self.assertEqual(text_widget.tag_nextrange('TAGS', '1.0'), + ('1.0', text_end_index)) + + # Check that the button removed itself from squeezer.expandingbuttons. + self.assertEqual(squeezer.expandingbuttons.remove.call_count, 1) + squeezer.expandingbuttons.remove.assert_called_with(expandingbutton) + + def test_expand_dangerous_oupput(self): + """Test that expanding very long output asks user for confirmation.""" + squeezer = self.make_mock_squeezer() + text = 'a' * 10**5 + expandingbutton = ExpandingButton(text, 'TAGS', 50, squeezer) + expandingbutton.set_is_dangerous() + self.assertTrue(expandingbutton.is_dangerous) + + # Insert the button into the text widget + # (this is normally done by the Squeezer class). + text_widget = expandingbutton.text + text_widget.window_create("1.0", window=expandingbutton) + + # Patch the message box module to always return False. + with patch('idlelib.squeezer.messagebox') as mock_msgbox: + mock_msgbox.askokcancel.return_value = False + mock_msgbox.askyesno.return_value = False + # Trigger the expand event. + retval = expandingbutton.expand(event=Mock()) + + # Check that the event chain was broken and no text was inserted. + self.assertEqual(retval, 'break') + self.assertEqual(expandingbutton.text.get('1.0', 'end-1c'), '') + + # Patch the message box module to always return True. + with patch('idlelib.squeezer.messagebox') as mock_msgbox: + mock_msgbox.askokcancel.return_value = True + mock_msgbox.askyesno.return_value = True + # Trigger the expand event. + retval = expandingbutton.expand(event=Mock()) + + # Check that the event chain wasn't broken and the text was inserted. + self.assertEqual(retval, None) + self.assertEqual(expandingbutton.text.get('1.0', 'end-1c'), text) + + def test_copy(self): + """Test the copy event.""" + # Testing with the actual clipboard proved problematic, so this + # test replaces the clipboard manipulation functions with mocks + # and checks that they are called appropriately. + squeezer = self.make_mock_squeezer() + expandingbutton = ExpandingButton('TEXT', 'TAGS', 50, squeezer) + expandingbutton.clipboard_clear = Mock() + expandingbutton.clipboard_append = Mock() + + # Trigger the copy event. + retval = expandingbutton.copy(event=Mock()) + self.assertEqual(retval, None) + + # Vheck that the expanding button called clipboard_clear() and + # clipboard_append('TEXT') once each. + self.assertEqual(expandingbutton.clipboard_clear.call_count, 1) + self.assertEqual(expandingbutton.clipboard_append.call_count, 1) + expandingbutton.clipboard_append.assert_called_with('TEXT') + + def test_view(self): + """Test the view event.""" + squeezer = self.make_mock_squeezer() + expandingbutton = ExpandingButton('TEXT', 'TAGS', 50, squeezer) + expandingbutton.selection_own = Mock() + + with patch('idlelib.squeezer.view_text', autospec=view_text)\ + as mock_view_text: + # Trigger the view event. + expandingbutton.view(event=Mock()) + + # Check that the expanding button called view_text. + self.assertEqual(mock_view_text.call_count, 1) + + # Check that the proper text was passed. + self.assertEqual(mock_view_text.call_args[0][2], 'TEXT') + + def test_rmenu(self): + """Test the context menu.""" + squeezer = self.make_mock_squeezer() + expandingbutton = ExpandingButton('TEXT', 'TAGS', 50, squeezer) + with patch('tkinter.Menu') as mock_Menu: + mock_menu = Mock() + mock_Menu.return_value = mock_menu + mock_event = Mock() + mock_event.x = 10 + mock_event.y = 10 + expandingbutton.context_menu_event(event=mock_event) + self.assertEqual(mock_menu.add_command.call_count, + len(expandingbutton.rmenu_specs)) + for label, *data in expandingbutton.rmenu_specs: + mock_menu.add_command.assert_any_call(label=label, command=ANY) + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_stackviewer.py b/Lib/idlelib/idle_test/test_stackviewer.py new file mode 100644 index 000000000..55f510382 --- /dev/null +++ b/Lib/idlelib/idle_test/test_stackviewer.py @@ -0,0 +1,41 @@ +"Test stackviewer, coverage 63%." + +from idlelib import stackviewer +import unittest +from test.support import requires +from tkinter import Tk + +from idlelib.tree import TreeNode, ScrolledCanvas + + +class StackBrowserTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + + requires('gui') + cls.root = Tk() + cls.root.withdraw() + + @classmethod + def tearDownClass(cls): + + cls.root.update_idletasks() +## for id in cls.root.tk.call('after', 'info'): +## cls.root.after_cancel(id) # Need for EditorWindow. + cls.root.destroy() + del cls.root + + def test_init(self): + try: + abc + except NameError as exc: + sb = stackviewer.StackBrowser(self.root, exc) + isi = self.assertIsInstance + isi(stackviewer.sc, ScrolledCanvas) + isi(stackviewer.item, stackviewer.StackTreeItem) + isi(stackviewer.node, TreeNode) + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_statusbar.py b/Lib/idlelib/idle_test/test_statusbar.py new file mode 100644 index 000000000..203a57db8 --- /dev/null +++ b/Lib/idlelib/idle_test/test_statusbar.py @@ -0,0 +1,41 @@ +"Test statusbar, coverage 100%." + +from idlelib import statusbar +import unittest +from test.support import requires +from tkinter import Tk + + +class Test(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = Tk() + cls.root.withdraw() + + @classmethod + def tearDownClass(cls): + cls.root.update_idletasks() + cls.root.destroy() + del cls.root + + def test_init(self): + bar = statusbar.MultiStatusBar(self.root) + self.assertEqual(bar.labels, {}) + + def test_set_label(self): + bar = statusbar.MultiStatusBar(self.root) + bar.set_label('left', text='sometext', width=10) + self.assertIn('left', bar.labels) + left = bar.labels['left'] + self.assertEqual(left['text'], 'sometext') + self.assertEqual(left['width'], 10) + bar.set_label('left', text='revised text') + self.assertEqual(left['text'], 'revised text') + bar.set_label('right', text='correct text') + self.assertEqual(bar.labels['right']['text'], 'correct text') + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_text.py b/Lib/idlelib/idle_test/test_text.py new file mode 100644 index 000000000..43a9ba02c --- /dev/null +++ b/Lib/idlelib/idle_test/test_text.py @@ -0,0 +1,236 @@ +''' Test mock_tk.Text class against tkinter.Text class + +Run same tests with both by creating a mixin class. +''' +import unittest +from test.support import requires +from _tkinter import TclError + +class TextTest: + "Define items common to both sets of tests." + + hw = 'hello\nworld' # Several tests insert this after initialization. + hwn = hw+'\n' # \n present at initialization, before insert + + # setUpClass defines cls.Text and maybe cls.root. + # setUp defines self.text from Text and maybe root. + + def test_init(self): + self.assertEqual(self.text.get('1.0'), '\n') + self.assertEqual(self.text.get('end'), '') + + def test_index_empty(self): + index = self.text.index + + for dex in (-1.0, 0.3, '1.-1', '1.0', '1.0 lineend', '1.end', '1.33', + 'insert'): + self.assertEqual(index(dex), '1.0') + + for dex in 'end', 2.0, '2.1', '33.44': + self.assertEqual(index(dex), '2.0') + + def test_index_data(self): + index = self.text.index + self.text.insert('1.0', self.hw) + + for dex in -1.0, 0.3, '1.-1', '1.0': + self.assertEqual(index(dex), '1.0') + + for dex in '1.0 lineend', '1.end', '1.33': + self.assertEqual(index(dex), '1.5') + + for dex in 'end', '33.44': + self.assertEqual(index(dex), '3.0') + + def test_get(self): + get = self.text.get + Equal = self.assertEqual + self.text.insert('1.0', self.hw) + + Equal(get('end'), '') + Equal(get('end', 'end'), '') + Equal(get('1.0'), 'h') + Equal(get('1.0', '1.1'), 'h') + Equal(get('1.0', '1.3'), 'hel') + Equal(get('1.1', '1.3'), 'el') + Equal(get('1.0', '1.0 lineend'), 'hello') + Equal(get('1.0', '1.10'), 'hello') + Equal(get('1.0 lineend'), '\n') + Equal(get('1.1', '2.3'), 'ello\nwor') + Equal(get('1.0', '2.5'), self.hw) + Equal(get('1.0', 'end'), self.hwn) + Equal(get('0.0', '5.0'), self.hwn) + + def test_insert(self): + insert = self.text.insert + get = self.text.get + Equal = self.assertEqual + + insert('1.0', self.hw) + Equal(get('1.0', 'end'), self.hwn) + + insert('1.0', '') # nothing + Equal(get('1.0', 'end'), self.hwn) + + insert('1.0', '*') + Equal(get('1.0', 'end'), '*hello\nworld\n') + + insert('1.0 lineend', '*') + Equal(get('1.0', 'end'), '*hello*\nworld\n') + + insert('2.3', '*') + Equal(get('1.0', 'end'), '*hello*\nwor*ld\n') + + insert('end', 'x') + Equal(get('1.0', 'end'), '*hello*\nwor*ldx\n') + + insert('1.4', 'x\n') + Equal(get('1.0', 'end'), '*helx\nlo*\nwor*ldx\n') + + def test_no_delete(self): + # if index1 == 'insert' or 'end' or >= end, there is no deletion + delete = self.text.delete + get = self.text.get + Equal = self.assertEqual + self.text.insert('1.0', self.hw) + + delete('insert') + Equal(get('1.0', 'end'), self.hwn) + + delete('end') + Equal(get('1.0', 'end'), self.hwn) + + delete('insert', 'end') + Equal(get('1.0', 'end'), self.hwn) + + delete('insert', '5.5') + Equal(get('1.0', 'end'), self.hwn) + + delete('1.4', '1.0') + Equal(get('1.0', 'end'), self.hwn) + + delete('1.4', '1.4') + Equal(get('1.0', 'end'), self.hwn) + + def test_delete_char(self): + delete = self.text.delete + get = self.text.get + Equal = self.assertEqual + self.text.insert('1.0', self.hw) + + delete('1.0') + Equal(get('1.0', '1.end'), 'ello') + + delete('1.0', '1.1') + Equal(get('1.0', '1.end'), 'llo') + + # delete \n and combine 2 lines into 1 + delete('1.end') + Equal(get('1.0', '1.end'), 'lloworld') + + self.text.insert('1.3', '\n') + delete('1.10') + Equal(get('1.0', '1.end'), 'lloworld') + + self.text.insert('1.3', '\n') + delete('1.3', '2.0') + Equal(get('1.0', '1.end'), 'lloworld') + + def test_delete_slice(self): + delete = self.text.delete + get = self.text.get + Equal = self.assertEqual + self.text.insert('1.0', self.hw) + + delete('1.0', '1.0 lineend') + Equal(get('1.0', 'end'), '\nworld\n') + + delete('1.0', 'end') + Equal(get('1.0', 'end'), '\n') + + self.text.insert('1.0', self.hw) + delete('1.0', '2.0') + Equal(get('1.0', 'end'), 'world\n') + + delete('1.0', 'end') + Equal(get('1.0', 'end'), '\n') + + self.text.insert('1.0', self.hw) + delete('1.2', '2.3') + Equal(get('1.0', 'end'), 'held\n') + + def test_multiple_lines(self): # insert and delete + self.text.insert('1.0', 'hello') + + self.text.insert('1.3', '1\n2\n3\n4\n5') + self.assertEqual(self.text.get('1.0', 'end'), 'hel1\n2\n3\n4\n5lo\n') + + self.text.delete('1.3', '5.1') + self.assertEqual(self.text.get('1.0', 'end'), 'hello\n') + + def test_compare(self): + compare = self.text.compare + Equal = self.assertEqual + # need data so indexes not squished to 1,0 + self.text.insert('1.0', 'First\nSecond\nThird\n') + + self.assertRaises(TclError, compare, '2.2', 'op', '2.2') + + for op, less1, less0, equal, greater0, greater1 in ( + ('<', True, True, False, False, False), + ('<=', True, True, True, False, False), + ('>', False, False, False, True, True), + ('>=', False, False, True, True, True), + ('==', False, False, True, False, False), + ('!=', True, True, False, True, True), + ): + Equal(compare('1.1', op, '2.2'), less1, op) + Equal(compare('2.1', op, '2.2'), less0, op) + Equal(compare('2.2', op, '2.2'), equal, op) + Equal(compare('2.3', op, '2.2'), greater0, op) + Equal(compare('3.3', op, '2.2'), greater1, op) + + +class MockTextTest(TextTest, unittest.TestCase): + + @classmethod + def setUpClass(cls): + from idlelib.idle_test.mock_tk import Text + cls.Text = Text + + def setUp(self): + self.text = self.Text() + + + def test_decode(self): + # test endflags (-1, 0) not tested by test_index (which uses +1) + decode = self.text._decode + Equal = self.assertEqual + self.text.insert('1.0', self.hw) + + Equal(decode('end', -1), (2, 5)) + Equal(decode('3.1', -1), (2, 5)) + Equal(decode('end', 0), (2, 6)) + Equal(decode('3.1', 0), (2, 6)) + + +class TkTextTest(TextTest, unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + from tkinter import Tk, Text + cls.Text = Text + cls.root = Tk() + + @classmethod + def tearDownClass(cls): + cls.root.destroy() + del cls.root + + def setUp(self): + self.text = self.Text(self.root) + + +if __name__ == '__main__': + unittest.main(verbosity=2, exit=False) diff --git a/Lib/idlelib/idle_test/test_textview.py b/Lib/idlelib/idle_test/test_textview.py new file mode 100644 index 000000000..7189378ab --- /dev/null +++ b/Lib/idlelib/idle_test/test_textview.py @@ -0,0 +1,233 @@ +"""Test textview, coverage 100%. + +Since all methods and functions create (or destroy) a ViewWindow, which +is a widget containing a widget, etcetera, all tests must be gui tests. +Using mock Text would not change this. Other mocks are used to retrieve +information about calls. +""" +from idlelib import textview as tv +from test.support import requires +requires('gui') + +import os +import unittest +from tkinter import Tk, TclError, CHAR, NONE, WORD +from tkinter.ttk import Button +from idlelib.idle_test.mock_idle import Func +from idlelib.idle_test.mock_tk import Mbox_func + +def setUpModule(): + global root + root = Tk() + root.withdraw() + +def tearDownModule(): + global root + root.update_idletasks() + root.destroy() + del root + +# If we call ViewWindow or wrapper functions with defaults +# modal=True, _utest=False, test hangs on call to wait_window. +# Have also gotten tk error 'can't invoke "event" command'. + + +class VW(tv.ViewWindow): # Used in ViewWindowTest. + transient = Func() + grab_set = Func() + wait_window = Func() + + +# Call wrapper class VW with mock wait_window. +class ViewWindowTest(unittest.TestCase): + + def setUp(self): + VW.transient.__init__() + VW.grab_set.__init__() + VW.wait_window.__init__() + + def test_init_modal(self): + view = VW(root, 'Title', 'test text') + self.assertTrue(VW.transient.called) + self.assertTrue(VW.grab_set.called) + self.assertTrue(VW.wait_window.called) + view.ok() + + def test_init_nonmodal(self): + view = VW(root, 'Title', 'test text', modal=False) + self.assertFalse(VW.transient.called) + self.assertFalse(VW.grab_set.called) + self.assertFalse(VW.wait_window.called) + view.ok() + + def test_ok(self): + view = VW(root, 'Title', 'test text', modal=False) + view.destroy = Func() + view.ok() + self.assertTrue(view.destroy.called) + del view.destroy # Unmask real function. + view.destroy() + + +class AutoHideScrollbarTest(unittest.TestCase): + # Method set is tested in ScrollableTextFrameTest + def test_forbidden_geometry(self): + scroll = tv.AutoHideScrollbar(root) + self.assertRaises(TclError, scroll.pack) + self.assertRaises(TclError, scroll.place) + + +class ScrollableTextFrameTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + cls.root = root = Tk() + root.withdraw() + + @classmethod + def tearDownClass(cls): + cls.root.update_idletasks() + cls.root.destroy() + del cls.root + + def make_frame(self, wrap=NONE, **kwargs): + frame = tv.ScrollableTextFrame(self.root, wrap=wrap, **kwargs) + def cleanup_frame(): + frame.update_idletasks() + frame.destroy() + self.addCleanup(cleanup_frame) + return frame + + def test_line1(self): + frame = self.make_frame() + frame.text.insert('1.0', 'test text') + self.assertEqual(frame.text.get('1.0', '1.end'), 'test text') + + def test_horiz_scrollbar(self): + # The horizontal scrollbar should be shown/hidden according to + # the 'wrap' setting: It should only be shown when 'wrap' is + # set to NONE. + + # wrap = NONE -> with horizontal scrolling + frame = self.make_frame(wrap=NONE) + self.assertEqual(frame.text.cget('wrap'), NONE) + self.assertIsNotNone(frame.xscroll) + + # wrap != NONE -> no horizontal scrolling + for wrap in [CHAR, WORD]: + with self.subTest(wrap=wrap): + frame = self.make_frame(wrap=wrap) + self.assertEqual(frame.text.cget('wrap'), wrap) + self.assertIsNone(frame.xscroll) + + +class ViewFrameTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + cls.root = root = Tk() + root.withdraw() + cls.frame = tv.ViewFrame(root, 'test text') + + @classmethod + def tearDownClass(cls): + del cls.frame + cls.root.update_idletasks() + cls.root.destroy() + del cls.root + + def test_line1(self): + get = self.frame.text.get + self.assertEqual(get('1.0', '1.end'), 'test text') + + +# Call ViewWindow with modal=False. +class ViewFunctionTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + cls.orig_error = tv.showerror + tv.showerror = Mbox_func() + + @classmethod + def tearDownClass(cls): + tv.showerror = cls.orig_error + del cls.orig_error + + def test_view_text(self): + view = tv.view_text(root, 'Title', 'test text', modal=False) + self.assertIsInstance(view, tv.ViewWindow) + self.assertIsInstance(view.viewframe, tv.ViewFrame) + view.viewframe.ok() + + def test_view_file(self): + view = tv.view_file(root, 'Title', __file__, 'ascii', modal=False) + self.assertIsInstance(view, tv.ViewWindow) + self.assertIsInstance(view.viewframe, tv.ViewFrame) + get = view.viewframe.textframe.text.get + self.assertIn('Test', get('1.0', '1.end')) + view.ok() + + def test_bad_file(self): + # Mock showerror will be used; view_file will return None. + view = tv.view_file(root, 'Title', 'abc.xyz', 'ascii', modal=False) + self.assertIsNone(view) + self.assertEqual(tv.showerror.title, 'File Load Error') + + def test_bad_encoding(self): + p = os.path + fn = p.abspath(p.join(p.dirname(__file__), '..', 'CREDITS.txt')) + view = tv.view_file(root, 'Title', fn, 'ascii', modal=False) + self.assertIsNone(view) + self.assertEqual(tv.showerror.title, 'Unicode Decode Error') + + def test_nowrap(self): + view = tv.view_text(root, 'Title', 'test', modal=False, wrap='none') + text_widget = view.viewframe.textframe.text + self.assertEqual(text_widget.cget('wrap'), 'none') + + +# Call ViewWindow with _utest=True. +class ButtonClickTest(unittest.TestCase): + + def setUp(self): + self.view = None + self.called = False + + def tearDown(self): + if self.view: + self.view.destroy() + + def test_view_text_bind_with_button(self): + def _command(): + self.called = True + self.view = tv.view_text(root, 'TITLE_TEXT', 'COMMAND', _utest=True) + button = Button(root, text='BUTTON', command=_command) + button.invoke() + self.addCleanup(button.destroy) + + self.assertEqual(self.called, True) + self.assertEqual(self.view.title(), 'TITLE_TEXT') + self.assertEqual(self.view.viewframe.textframe.text.get('1.0', '1.end'), + 'COMMAND') + + def test_view_file_bind_with_button(self): + def _command(): + self.called = True + self.view = tv.view_file(root, 'TITLE_FILE', __file__, + encoding='ascii', _utest=True) + button = Button(root, text='BUTTON', command=_command) + button.invoke() + self.addCleanup(button.destroy) + + self.assertEqual(self.called, True) + self.assertEqual(self.view.title(), 'TITLE_FILE') + get = self.view.viewframe.textframe.text.get + with open(__file__) as f: + self.assertEqual(get('1.0', '1.end'), f.readline().strip()) + f.readline() + self.assertEqual(get('3.0', '3.end'), f.readline().strip()) + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_tooltip.py b/Lib/idlelib/idle_test/test_tooltip.py new file mode 100644 index 000000000..c616d4fde --- /dev/null +++ b/Lib/idlelib/idle_test/test_tooltip.py @@ -0,0 +1,161 @@ +"""Test tooltip, coverage 100%. + +Coverage is 100% after excluding 6 lines with "# pragma: no cover". +They involve TclErrors that either should or should not happen in a +particular situation, and which are 'pass'ed if they do. +""" + +from idlelib.tooltip import TooltipBase, Hovertip +from test.support import requires +requires('gui') + +from functools import wraps +import time +from tkinter import Button, Tk, Toplevel +import unittest + + +def setUpModule(): + global root + root = Tk() + +def tearDownModule(): + global root + root.update_idletasks() + root.destroy() + del root + + +def add_call_counting(func): + @wraps(func) + def wrapped_func(*args, **kwargs): + wrapped_func.call_args_list.append((args, kwargs)) + return func(*args, **kwargs) + wrapped_func.call_args_list = [] + return wrapped_func + + +def _make_top_and_button(testobj): + global root + top = Toplevel(root) + testobj.addCleanup(top.destroy) + top.title("Test tooltip") + button = Button(top, text='ToolTip test button') + button.pack() + testobj.addCleanup(button.destroy) + top.lift() + return top, button + + +class ToolTipBaseTest(unittest.TestCase): + def setUp(self): + self.top, self.button = _make_top_and_button(self) + + def test_base_class_is_unusable(self): + global root + top = Toplevel(root) + self.addCleanup(top.destroy) + + button = Button(top, text='ToolTip test button') + button.pack() + self.addCleanup(button.destroy) + + with self.assertRaises(NotImplementedError): + tooltip = TooltipBase(button) + tooltip.showtip() + + +class HovertipTest(unittest.TestCase): + def setUp(self): + self.top, self.button = _make_top_and_button(self) + + def is_tipwindow_shown(self, tooltip): + return tooltip.tipwindow and tooltip.tipwindow.winfo_viewable() + + def test_showtip(self): + tooltip = Hovertip(self.button, 'ToolTip text') + self.addCleanup(tooltip.hidetip) + self.assertFalse(self.is_tipwindow_shown(tooltip)) + tooltip.showtip() + self.assertTrue(self.is_tipwindow_shown(tooltip)) + + def test_showtip_twice(self): + tooltip = Hovertip(self.button, 'ToolTip text') + self.addCleanup(tooltip.hidetip) + self.assertFalse(self.is_tipwindow_shown(tooltip)) + tooltip.showtip() + self.assertTrue(self.is_tipwindow_shown(tooltip)) + orig_tipwindow = tooltip.tipwindow + tooltip.showtip() + self.assertTrue(self.is_tipwindow_shown(tooltip)) + self.assertIs(tooltip.tipwindow, orig_tipwindow) + + def test_hidetip(self): + tooltip = Hovertip(self.button, 'ToolTip text') + self.addCleanup(tooltip.hidetip) + tooltip.showtip() + tooltip.hidetip() + self.assertFalse(self.is_tipwindow_shown(tooltip)) + + def test_showtip_on_mouse_enter_no_delay(self): + tooltip = Hovertip(self.button, 'ToolTip text', hover_delay=None) + self.addCleanup(tooltip.hidetip) + tooltip.showtip = add_call_counting(tooltip.showtip) + root.update() + self.assertFalse(self.is_tipwindow_shown(tooltip)) + self.button.event_generate('<Enter>', x=0, y=0) + root.update() + self.assertTrue(self.is_tipwindow_shown(tooltip)) + self.assertGreater(len(tooltip.showtip.call_args_list), 0) + + def test_hover_with_delay(self): + # Run multiple tests requiring an actual delay simultaneously. + + # Test #1: A hover tip with a non-zero delay appears after the delay. + tooltip1 = Hovertip(self.button, 'ToolTip text', hover_delay=100) + self.addCleanup(tooltip1.hidetip) + tooltip1.showtip = add_call_counting(tooltip1.showtip) + root.update() + self.assertFalse(self.is_tipwindow_shown(tooltip1)) + self.button.event_generate('<Enter>', x=0, y=0) + root.update() + self.assertFalse(self.is_tipwindow_shown(tooltip1)) + + # Test #2: A hover tip with a non-zero delay doesn't appear when + # the mouse stops hovering over the base widget before the delay + # expires. + tooltip2 = Hovertip(self.button, 'ToolTip text', hover_delay=100) + self.addCleanup(tooltip2.hidetip) + tooltip2.showtip = add_call_counting(tooltip2.showtip) + root.update() + self.button.event_generate('<Enter>', x=0, y=0) + root.update() + self.button.event_generate('<Leave>', x=0, y=0) + root.update() + + time.sleep(0.15) + root.update() + + # Test #1 assertions. + self.assertTrue(self.is_tipwindow_shown(tooltip1)) + self.assertGreater(len(tooltip1.showtip.call_args_list), 0) + + # Test #2 assertions. + self.assertFalse(self.is_tipwindow_shown(tooltip2)) + self.assertEqual(tooltip2.showtip.call_args_list, []) + + def test_hidetip_on_mouse_leave(self): + tooltip = Hovertip(self.button, 'ToolTip text', hover_delay=None) + self.addCleanup(tooltip.hidetip) + tooltip.showtip = add_call_counting(tooltip.showtip) + root.update() + self.button.event_generate('<Enter>', x=0, y=0) + root.update() + self.button.event_generate('<Leave>', x=0, y=0) + root.update() + self.assertFalse(self.is_tipwindow_shown(tooltip)) + self.assertGreater(len(tooltip.showtip.call_args_list), 0) + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_tree.py b/Lib/idlelib/idle_test/test_tree.py new file mode 100644 index 000000000..b3e4c10cf --- /dev/null +++ b/Lib/idlelib/idle_test/test_tree.py @@ -0,0 +1,60 @@ +"Test tree. coverage 56%." + +from idlelib import tree +import unittest +from test.support import requires +requires('gui') +from tkinter import Tk, EventType, SCROLL + + +class TreeTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + cls.root = Tk() + cls.root.withdraw() + + @classmethod + def tearDownClass(cls): + cls.root.destroy() + del cls.root + + def test_init(self): + # Start with code slightly adapted from htest. + sc = tree.ScrolledCanvas( + self.root, bg="white", highlightthickness=0, takefocus=1) + sc.frame.pack(expand=1, fill="both", side='left') + item = tree.FileTreeItem(tree.ICONDIR) + node = tree.TreeNode(sc.canvas, None, item) + node.expand() + + +class TestScrollEvent(unittest.TestCase): + + def test_wheel_event(self): + # Fake widget class containing `yview` only. + class _Widget: + def __init__(widget, *expected): + widget.expected = expected + def yview(widget, *args): + self.assertTupleEqual(widget.expected, args) + # Fake event class + class _Event: + pass + # (type, delta, num, amount) + tests = ((EventType.MouseWheel, 120, -1, -5), + (EventType.MouseWheel, -120, -1, 5), + (EventType.ButtonPress, -1, 4, -5), + (EventType.ButtonPress, -1, 5, 5)) + + event = _Event() + for ty, delta, num, amount in tests: + event.type = ty + event.delta = delta + event.num = num + res = tree.wheel_event(event, _Widget(SCROLL, amount, "units")) + self.assertEqual(res, "break") + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_undo.py b/Lib/idlelib/idle_test/test_undo.py new file mode 100644 index 000000000..beb5b5820 --- /dev/null +++ b/Lib/idlelib/idle_test/test_undo.py @@ -0,0 +1,135 @@ +"Test undo, coverage 77%." +# Only test UndoDelegator so far. + +from idlelib.undo import UndoDelegator +import unittest +from test.support import requires +requires('gui') + +from unittest.mock import Mock +from tkinter import Text, Tk +from idlelib.percolator import Percolator + + +class UndoDelegatorTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + cls.root = Tk() + cls.text = Text(cls.root) + cls.percolator = Percolator(cls.text) + + @classmethod + def tearDownClass(cls): + cls.percolator.redir.close() + del cls.percolator, cls.text + cls.root.destroy() + del cls.root + + def setUp(self): + self.delegator = UndoDelegator() + self.delegator.bell = Mock() + self.percolator.insertfilter(self.delegator) + + def tearDown(self): + self.percolator.removefilter(self.delegator) + self.text.delete('1.0', 'end') + self.delegator.resetcache() + + def test_undo_event(self): + text = self.text + + text.insert('insert', 'foobar') + text.insert('insert', 'h') + text.event_generate('<<undo>>') + self.assertEqual(text.get('1.0', 'end'), '\n') + + text.insert('insert', 'foo') + text.insert('insert', 'bar') + text.delete('1.2', '1.4') + text.insert('insert', 'hello') + text.event_generate('<<undo>>') + self.assertEqual(text.get('1.0', '1.4'), 'foar') + text.event_generate('<<undo>>') + self.assertEqual(text.get('1.0', '1.6'), 'foobar') + text.event_generate('<<undo>>') + self.assertEqual(text.get('1.0', '1.3'), 'foo') + text.event_generate('<<undo>>') + self.delegator.undo_event('event') + self.assertTrue(self.delegator.bell.called) + + def test_redo_event(self): + text = self.text + + text.insert('insert', 'foo') + text.insert('insert', 'bar') + text.delete('1.0', '1.3') + text.event_generate('<<undo>>') + text.event_generate('<<redo>>') + self.assertEqual(text.get('1.0', '1.3'), 'bar') + text.event_generate('<<redo>>') + self.assertTrue(self.delegator.bell.called) + + def test_dump_event(self): + """ + Dump_event cannot be tested directly without changing + environment variables. So, test statements in dump_event + indirectly + """ + text = self.text + d = self.delegator + + text.insert('insert', 'foo') + text.insert('insert', 'bar') + text.delete('1.2', '1.4') + self.assertTupleEqual((d.pointer, d.can_merge), (3, True)) + text.event_generate('<<undo>>') + self.assertTupleEqual((d.pointer, d.can_merge), (2, False)) + + def test_get_set_saved(self): + # test the getter method get_saved + # test the setter method set_saved + # indirectly test check_saved + d = self.delegator + + self.assertTrue(d.get_saved()) + self.text.insert('insert', 'a') + self.assertFalse(d.get_saved()) + d.saved_change_hook = Mock() + + d.set_saved(True) + self.assertEqual(d.pointer, d.saved) + self.assertTrue(d.saved_change_hook.called) + + d.set_saved(False) + self.assertEqual(d.saved, -1) + self.assertTrue(d.saved_change_hook.called) + + def test_undo_start_stop(self): + # test the undo_block_start and undo_block_stop methods + text = self.text + + text.insert('insert', 'foo') + self.delegator.undo_block_start() + text.insert('insert', 'bar') + text.insert('insert', 'bar') + self.delegator.undo_block_stop() + self.assertEqual(text.get('1.0', '1.3'), 'foo') + + # test another code path + self.delegator.undo_block_start() + text.insert('insert', 'bar') + self.delegator.undo_block_stop() + self.assertEqual(text.get('1.0', '1.3'), 'foo') + + def test_addcmd(self): + text = self.text + # when number of undo operations exceeds max_undo + self.delegator.max_undo = max_undo = 10 + for i in range(max_undo + 10): + text.insert('insert', 'foo') + self.assertLessEqual(len(self.delegator.undolist), max_undo) + + +if __name__ == '__main__': + unittest.main(verbosity=2, exit=False) diff --git a/Lib/idlelib/idle_test/test_util.py b/Lib/idlelib/idle_test/test_util.py new file mode 100644 index 000000000..20721fe98 --- /dev/null +++ b/Lib/idlelib/idle_test/test_util.py @@ -0,0 +1,14 @@ +"""Test util, coverage 100%""" + +import unittest +from idlelib import util + + +class UtilTest(unittest.TestCase): + def test_extensions(self): + for extension in {'.pyi', '.py', '.pyw'}: + self.assertIn(extension, util.py_extensions) + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_warning.py b/Lib/idlelib/idle_test/test_warning.py new file mode 100644 index 000000000..221068c58 --- /dev/null +++ b/Lib/idlelib/idle_test/test_warning.py @@ -0,0 +1,73 @@ +'''Test warnings replacement in pyshell.py and run.py. + +This file could be expanded to include traceback overrides +(in same two modules). If so, change name. +Revise if output destination changes (http://bugs.python.org/issue18318). +Make sure warnings module is left unaltered (http://bugs.python.org/issue18081). +''' +from idlelib import run +from idlelib import pyshell as shell +import unittest +from test.support import captured_stderr +import warnings + +# Try to capture default showwarning before Idle modules are imported. +showwarning = warnings.showwarning +# But if we run this file within idle, we are in the middle of the run.main loop +# and default showwarnings has already been replaced. +running_in_idle = 'idle' in showwarning.__name__ + +# The following was generated from pyshell.idle_formatwarning +# and checked as matching expectation. +idlemsg = ''' +Warning (from warnings module): + File "test_warning.py", line 99 + Line of code +UserWarning: Test +''' +shellmsg = idlemsg + ">>> " + + +class RunWarnTest(unittest.TestCase): + + @unittest.skipIf(running_in_idle, "Does not work when run within Idle.") + def test_showwarnings(self): + self.assertIs(warnings.showwarning, showwarning) + run.capture_warnings(True) + self.assertIs(warnings.showwarning, run.idle_showwarning_subproc) + run.capture_warnings(False) + self.assertIs(warnings.showwarning, showwarning) + + def test_run_show(self): + with captured_stderr() as f: + run.idle_showwarning_subproc( + 'Test', UserWarning, 'test_warning.py', 99, f, 'Line of code') + # The following uses .splitlines to erase line-ending differences + self.assertEqual(idlemsg.splitlines(), f.getvalue().splitlines()) + + +class ShellWarnTest(unittest.TestCase): + + @unittest.skipIf(running_in_idle, "Does not work when run within Idle.") + def test_showwarnings(self): + self.assertIs(warnings.showwarning, showwarning) + shell.capture_warnings(True) + self.assertIs(warnings.showwarning, shell.idle_showwarning) + shell.capture_warnings(False) + self.assertIs(warnings.showwarning, showwarning) + + def test_idle_formatter(self): + # Will fail if format changed without regenerating idlemsg + s = shell.idle_formatwarning( + 'Test', UserWarning, 'test_warning.py', 99, 'Line of code') + self.assertEqual(idlemsg, s) + + def test_shell_show(self): + with captured_stderr() as f: + shell.idle_showwarning( + 'Test', UserWarning, 'test_warning.py', 99, f, 'Line of code') + self.assertEqual(shellmsg.splitlines(), f.getvalue().splitlines()) + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_window.py b/Lib/idlelib/idle_test/test_window.py new file mode 100644 index 000000000..5a2645b9c --- /dev/null +++ b/Lib/idlelib/idle_test/test_window.py @@ -0,0 +1,45 @@ +"Test window, coverage 47%." + +from idlelib import window +import unittest +from test.support import requires +from tkinter import Tk + + +class WindowListTest(unittest.TestCase): + + def test_init(self): + wl = window.WindowList() + self.assertEqual(wl.dict, {}) + self.assertEqual(wl.callbacks, []) + + # Further tests need mock Window. + + +class ListedToplevelTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + window.registry = set() + requires('gui') + cls.root = Tk() + cls.root.withdraw() + + @classmethod + def tearDownClass(cls): + window.registry = window.WindowList() + cls.root.update_idletasks() +## for id in cls.root.tk.call('after', 'info'): +## cls.root.after_cancel(id) # Need for EditorWindow. + cls.root.destroy() + del cls.root + + def test_init(self): + + win = window.ListedToplevel(self.root) + self.assertIn(win, window.registry) + self.assertEqual(win.focused_widget, win) + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_zoomheight.py b/Lib/idlelib/idle_test/test_zoomheight.py new file mode 100644 index 000000000..aa5bdfb4f --- /dev/null +++ b/Lib/idlelib/idle_test/test_zoomheight.py @@ -0,0 +1,39 @@ +"Test zoomheight, coverage 66%." +# Some code is system dependent. + +from idlelib import zoomheight +import unittest +from test.support import requires +from tkinter import Tk +from idlelib.editor import EditorWindow + + +class Test(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + cls.root = Tk() + cls.root.withdraw() + cls.editwin = EditorWindow(root=cls.root) + + @classmethod + def tearDownClass(cls): + cls.editwin._close() + cls.root.update_idletasks() + for id in cls.root.tk.call('after', 'info'): + cls.root.after_cancel(id) # Need for EditorWindow. + cls.root.destroy() + del cls.root + + def test_init(self): + zoom = zoomheight.ZoomHeight(self.editwin) + self.assertIs(zoom.editwin, self.editwin) + + def test_zoom_height_event(self): + zoom = zoomheight.ZoomHeight(self.editwin) + zoom.zoom_height_event() + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/test_zzdummy.py b/Lib/idlelib/idle_test/test_zzdummy.py new file mode 100644 index 000000000..209d8564d --- /dev/null +++ b/Lib/idlelib/idle_test/test_zzdummy.py @@ -0,0 +1,152 @@ +"Test zzdummy, coverage 100%." + +from idlelib import zzdummy +import unittest +from test.support import requires +from tkinter import Tk, Text +from unittest import mock +from idlelib import config +from idlelib import editor +from idlelib import format + + +usercfg = zzdummy.idleConf.userCfg +testcfg = { + 'main': config.IdleUserConfParser(''), + 'highlight': config.IdleUserConfParser(''), + 'keys': config.IdleUserConfParser(''), + 'extensions': config.IdleUserConfParser(''), +} +code_sample = """\ + +class C1: + # Class comment. + def __init__(self, a, b): + self.a = a + self.b = b +""" + + +class DummyEditwin: + get_selection_indices = editor.EditorWindow.get_selection_indices + def __init__(self, root, text): + self.root = root + self.top = root + self.text = text + self.fregion = format.FormatRegion(self) + self.text.undo_block_start = mock.Mock() + self.text.undo_block_stop = mock.Mock() + + +class ZZDummyTest(unittest.TestCase): + + @classmethod + def setUpClass(cls): + requires('gui') + root = cls.root = Tk() + root.withdraw() + text = cls.text = Text(cls.root) + cls.editor = DummyEditwin(root, text) + zzdummy.idleConf.userCfg = testcfg + + @classmethod + def tearDownClass(cls): + zzdummy.idleConf.userCfg = usercfg + del cls.editor, cls.text + cls.root.update_idletasks() + for id in cls.root.tk.call('after', 'info'): + cls.root.after_cancel(id) # Need for EditorWindow. + cls.root.destroy() + del cls.root + + def setUp(self): + text = self.text + text.insert('1.0', code_sample) + text.undo_block_start.reset_mock() + text.undo_block_stop.reset_mock() + zz = self.zz = zzdummy.ZzDummy(self.editor) + zzdummy.ZzDummy.ztext = '# ignore #' + + def tearDown(self): + self.text.delete('1.0', 'end') + del self.zz + + def checklines(self, text, value): + # Verify that there are lines being checked. + end_line = int(float(text.index('end'))) + + # Check each line for the starting text. + actual = [] + for line in range(1, end_line): + txt = text.get(f'{line}.0', f'{line}.end') + actual.append(txt.startswith(value)) + return actual + + def test_init(self): + zz = self.zz + self.assertEqual(zz.editwin, self.editor) + self.assertEqual(zz.text, self.editor.text) + + def test_reload(self): + self.assertEqual(self.zz.ztext, '# ignore #') + testcfg['extensions'].SetOption('ZzDummy', 'z-text', 'spam') + zzdummy.ZzDummy.reload() + self.assertEqual(self.zz.ztext, 'spam') + + def test_z_in_event(self): + eq = self.assertEqual + zz = self.zz + text = zz.text + eq(self.zz.ztext, '# ignore #') + + # No lines have the leading text. + expected = [False, False, False, False, False, False, False] + actual = self.checklines(text, zz.ztext) + eq(expected, actual) + + text.tag_add('sel', '2.0', '4.end') + eq(zz.z_in_event(), 'break') + expected = [False, True, True, True, False, False, False] + actual = self.checklines(text, zz.ztext) + eq(expected, actual) + + text.undo_block_start.assert_called_once() + text.undo_block_stop.assert_called_once() + + def test_z_out_event(self): + eq = self.assertEqual + zz = self.zz + text = zz.text + eq(self.zz.ztext, '# ignore #') + + # Prepend text. + text.tag_add('sel', '2.0', '5.end') + zz.z_in_event() + text.undo_block_start.reset_mock() + text.undo_block_stop.reset_mock() + + # Select a few lines to remove text. + text.tag_remove('sel', '1.0', 'end') + text.tag_add('sel', '3.0', '4.end') + eq(zz.z_out_event(), 'break') + expected = [False, True, False, False, True, False, False] + actual = self.checklines(text, zz.ztext) + eq(expected, actual) + + text.undo_block_start.assert_called_once() + text.undo_block_stop.assert_called_once() + + def test_roundtrip(self): + # Insert and remove to all code should give back original text. + zz = self.zz + text = zz.text + + text.tag_add('sel', '1.0', 'end-1c') + zz.z_in_event() + zz.z_out_event() + + self.assertEqual(text.get('1.0', 'end-1c'), code_sample) + + +if __name__ == '__main__': + unittest.main(verbosity=2) diff --git a/Lib/idlelib/idle_test/tkinter_testing_utils.py b/Lib/idlelib/idle_test/tkinter_testing_utils.py new file mode 100644 index 000000000..a89839bbe --- /dev/null +++ b/Lib/idlelib/idle_test/tkinter_testing_utils.py @@ -0,0 +1,62 @@ +"""Utilities for testing with Tkinter""" +import functools + + +def run_in_tk_mainloop(delay=1): + """Decorator for running a test method with a real Tk mainloop. + + This starts a Tk mainloop before running the test, and stops it + at the end. This is faster and more robust than the common + alternative method of calling .update() and/or .update_idletasks(). + + Test methods using this must be written as generator functions, + using "yield" to allow the mainloop to process events and "after" + callbacks, and then continue the test from that point. + + The delay argument is passed into root.after(...) calls as the number + of ms to wait before passing execution back to the generator function. + + This also assumes that the test class has a .root attribute, + which is a tkinter.Tk object. + + For example (from test_sidebar.py): + + @run_test_with_tk_mainloop() + def test_single_empty_input(self): + self.do_input('\n') + yield + self.assert_sidebar_lines_end_with(['>>>', '>>>']) + """ + def decorator(test_method): + @functools.wraps(test_method) + def new_test_method(self): + test_generator = test_method(self) + root = self.root + # Exceptions raised by self.assert...() need to be raised + # outside of the after() callback in order for the test + # harness to capture them. + exception = None + def after_callback(): + nonlocal exception + try: + next(test_generator) + except StopIteration: + root.quit() + except Exception as exc: + exception = exc + root.quit() + else: + # Schedule the Tk mainloop to call this function again, + # using a robust method of ensuring that it gets a + # chance to process queued events before doing so. + # See: https://stackoverflow.com/q/18499082#comment65004099_38817470 + root.after(delay, root.after_idle, after_callback) + root.after(0, root.after_idle, after_callback) + root.mainloop() + + if exception: + raise exception + + return new_test_method + + return decorator diff --git a/Lib/idlelib/iomenu.py b/Lib/idlelib/iomenu.py new file mode 100644 index 000000000..fc502f7fd --- /dev/null +++ b/Lib/idlelib/iomenu.py @@ -0,0 +1,468 @@ +import io +import os +import shlex +import sys +import tempfile +import tokenize + +from tkinter import filedialog +from tkinter import messagebox +from tkinter.simpledialog import askstring # loadfile encoding. + +from idlelib.config import idleConf +from idlelib.util import py_extensions + +py_extensions = ' '.join("*"+ext for ext in py_extensions) +encoding = 'utf-8' +errors = 'surrogatepass' if sys.platform == 'win32' else 'surrogateescape' + + +class IOBinding: +# One instance per editor Window so methods know which to save, close. +# Open returns focus to self.editwin if aborted. +# EditorWindow.open_module, others, belong here. + + def __init__(self, editwin): + self.editwin = editwin + self.text = editwin.text + self.__id_open = self.text.bind("<<open-window-from-file>>", self.open) + self.__id_save = self.text.bind("<<save-window>>", self.save) + self.__id_saveas = self.text.bind("<<save-window-as-file>>", + self.save_as) + self.__id_savecopy = self.text.bind("<<save-copy-of-window-as-file>>", + self.save_a_copy) + self.fileencoding = 'utf-8' + self.__id_print = self.text.bind("<<print-window>>", self.print_window) + + def close(self): + # Undo command bindings + self.text.unbind("<<open-window-from-file>>", self.__id_open) + self.text.unbind("<<save-window>>", self.__id_save) + self.text.unbind("<<save-window-as-file>>",self.__id_saveas) + self.text.unbind("<<save-copy-of-window-as-file>>", self.__id_savecopy) + self.text.unbind("<<print-window>>", self.__id_print) + # Break cycles + self.editwin = None + self.text = None + self.filename_change_hook = None + + def get_saved(self): + return self.editwin.get_saved() + + def set_saved(self, flag): + self.editwin.set_saved(flag) + + def reset_undo(self): + self.editwin.reset_undo() + + filename_change_hook = None + + def set_filename_change_hook(self, hook): + self.filename_change_hook = hook + + filename = None + file_timestamp = None + dirname = None + + def set_filename(self, filename): + if filename and os.path.isdir(filename): + self.filename = None + self.dirname = filename + else: + self.filename = filename + self.dirname = None + self.set_saved(1) + if self.filename_change_hook: + self.filename_change_hook() + + def open(self, event=None, editFile=None): + flist = self.editwin.flist + # Save in case parent window is closed (ie, during askopenfile()). + if flist: + if not editFile: + filename = self.askopenfile() + else: + filename=editFile + if filename: + # If editFile is valid and already open, flist.open will + # shift focus to its existing window. + # If the current window exists and is a fresh unnamed, + # unmodified editor window (not an interpreter shell), + # pass self.loadfile to flist.open so it will load the file + # in the current window (if the file is not already open) + # instead of a new window. + if (self.editwin and + not getattr(self.editwin, 'interp', None) and + not self.filename and + self.get_saved()): + flist.open(filename, self.loadfile) + else: + flist.open(filename) + else: + if self.text: + self.text.focus_set() + return "break" + + # Code for use outside IDLE: + if self.get_saved(): + reply = self.maybesave() + if reply == "cancel": + self.text.focus_set() + return "break" + if not editFile: + filename = self.askopenfile() + else: + filename=editFile + if filename: + self.loadfile(filename) + else: + self.text.focus_set() + return "break" + + eol_convention = os.linesep # default + + def loadfile(self, filename): + try: + try: + with tokenize.open(filename) as f: + chars = f.read() + fileencoding = f.encoding + eol_convention = f.newlines + file_timestamp = self.getmtime(filename) + converted = False + except (UnicodeDecodeError, SyntaxError): + # Wait for the editor window to appear + self.editwin.text.update() + enc = askstring( + "Specify file encoding", + "The file's encoding is invalid for Python 3.x.\n" + "IDLE will convert it to UTF-8.\n" + "What is the current encoding of the file?", + initialvalue='utf-8', + parent=self.editwin.text) + with open(filename, encoding=enc) as f: + chars = f.read() + fileencoding = f.encoding + eol_convention = f.newlines + file_timestamp = self.getmtime(filename) + converted = True + except OSError as err: + messagebox.showerror("I/O Error", str(err), parent=self.text) + return False + except UnicodeDecodeError: + messagebox.showerror("Decoding Error", + "File %s\nFailed to Decode" % filename, + parent=self.text) + return False + + if not isinstance(eol_convention, str): + # If the file does not contain line separators, it is None. + # If the file contains mixed line separators, it is a tuple. + if eol_convention is not None: + messagebox.showwarning("Mixed Newlines", + "Mixed newlines detected.\n" + "The file will be changed on save.", + parent=self.text) + converted = True + eol_convention = os.linesep # default + + self.text.delete("1.0", "end") + self.set_filename(None) + self.fileencoding = fileencoding + self.eol_convention = eol_convention + self.text.insert("1.0", chars) + self.reset_undo() + self.set_filename(filename) + self.file_timestamp = file_timestamp + if converted: + # We need to save the conversion results first + # before being able to execute the code + self.set_saved(False) + self.text.mark_set("insert", "1.0") + self.text.yview("insert") + self.updaterecentfileslist(filename) + return True + + def maybesave(self): + """Return 'yes', 'no', 'cancel' as appropriate. + + Tkinter messagebox.askyesnocancel converts these tk responses + to True, False, None. Convert back, as now expected elsewhere. + """ + if self.get_saved(): + return "yes" + message = ("Do you want to save " + f"{self.filename or 'this untitled document'}" + " before closing?") + confirm = messagebox.askyesnocancel( + title="Save On Close", + message=message, + default=messagebox.YES, + parent=self.text) + if confirm: + self.save(None) + reply = "yes" if self.get_saved() else "cancel" + else: reply = "cancel" if confirm is None else "no" + self.text.focus_set() + return reply + + def save(self, event): + if not self.filename: + self.save_as(event) + else: + # Check the time of most recent content modification so the + # user doesn't accidentally overwrite a newer version of the file. + try: + file_timestamp = self.getmtime(self.filename) + except OSError: + pass + else: + if self.file_timestamp != file_timestamp: + confirm = messagebox.askokcancel( + title="File has changed", + message=( + "The file has changed on disk since reading it!\n\n" + "Do you really want to overwrite it?"), + default=messagebox.CANCEL, + parent=self.text) + if not confirm: + return "break" + + if self.writefile(self.filename): + self.file_timestamp = self.getmtime(self.filename) + self.set_saved(True) + try: + self.editwin.store_file_breaks() + except AttributeError: # may be a PyShell + pass + self.text.focus_set() + return "break" + + def save_as(self, event): + filename = self.asksavefile() + if filename: + if self.writefile(filename): + self.file_timestamp = self.getmtime(filename) + self.set_filename(filename) + self.set_saved(1) + try: + self.editwin.store_file_breaks() + except AttributeError: + pass + self.text.focus_set() + self.updaterecentfileslist(filename) + return "break" + + def save_a_copy(self, event): + filename = self.asksavefile() + if filename: + self.writefile(filename) + self.text.focus_set() + self.updaterecentfileslist(filename) + return "break" + + def writefile(self, filename): + text = self.fixnewlines() + chars = self.encode(text) + try: + with open(filename, "wb") as f: + f.write(chars) + f.flush() + os.fsync(f.fileno()) + return True + except OSError as msg: + messagebox.showerror("I/O Error", str(msg), + parent=self.text) + return False + + def getmtime(self, filename): + return os.stat(filename).st_mtime + + def fixnewlines(self): + """Return text with os eols. + + Add prompts if shell else final \n if missing. + """ + + if hasattr(self.editwin, "interp"): # Saving shell. + text = self.editwin.get_prompt_text('1.0', self.text.index('end-1c')) + else: + if self.text.get("end-2c") != '\n': + self.text.insert("end-1c", "\n") # Changes 'end-1c' value. + text = self.text.get('1.0', "end-1c") + if self.eol_convention != "\n": + text = text.replace("\n", self.eol_convention) + return text + + def encode(self, chars): + if isinstance(chars, bytes): + # This is either plain ASCII, or Tk was returning mixed-encoding + # text to us. Don't try to guess further. + return chars + # Preserve a BOM that might have been present on opening + if self.fileencoding == 'utf-8-sig': + return chars.encode('utf-8-sig') + # See whether there is anything non-ASCII in it. + # If not, no need to figure out the encoding. + try: + return chars.encode('ascii') + except UnicodeEncodeError: + pass + # Check if there is an encoding declared + try: + encoded = chars.encode('ascii', 'replace') + enc, _ = tokenize.detect_encoding(io.BytesIO(encoded).readline) + return chars.encode(enc) + except SyntaxError as err: + failed = str(err) + except UnicodeEncodeError: + failed = "Invalid encoding '%s'" % enc + messagebox.showerror( + "I/O Error", + "%s.\nSaving as UTF-8" % failed, + parent=self.text) + # Fallback: save as UTF-8, with BOM - ignoring the incorrect + # declared encoding + return chars.encode('utf-8-sig') + + def print_window(self, event): + confirm = messagebox.askokcancel( + title="Print", + message="Print to Default Printer", + default=messagebox.OK, + parent=self.text) + if not confirm: + self.text.focus_set() + return "break" + tempfilename = None + saved = self.get_saved() + if saved: + filename = self.filename + # shell undo is reset after every prompt, looks saved, probably isn't + if not saved or filename is None: + (tfd, tempfilename) = tempfile.mkstemp(prefix='IDLE_tmp_') + filename = tempfilename + os.close(tfd) + if not self.writefile(tempfilename): + os.unlink(tempfilename) + return "break" + platform = os.name + printPlatform = True + if platform == 'posix': #posix platform + command = idleConf.GetOption('main','General', + 'print-command-posix') + command = command + " 2>&1" + elif platform == 'nt': #win32 platform + command = idleConf.GetOption('main','General','print-command-win') + else: #no printing for this platform + printPlatform = False + if printPlatform: #we can try to print for this platform + command = command % shlex.quote(filename) + pipe = os.popen(command, "r") + # things can get ugly on NT if there is no printer available. + output = pipe.read().strip() + status = pipe.close() + if status: + output = "Printing failed (exit status 0x%x)\n" % \ + status + output + if output: + output = "Printing command: %s\n" % repr(command) + output + messagebox.showerror("Print status", output, parent=self.text) + else: #no printing for this platform + message = "Printing is not enabled for this platform: %s" % platform + messagebox.showinfo("Print status", message, parent=self.text) + if tempfilename: + os.unlink(tempfilename) + return "break" + + opendialog = None + savedialog = None + + filetypes = ( + ("Python files", py_extensions, "TEXT"), + ("Text files", "*.txt", "TEXT"), + ("All files", "*"), + ) + + defaultextension = '.py' if sys.platform == 'darwin' else '' + + def askopenfile(self): + dir, base = self.defaultfilename("open") + if not self.opendialog: + self.opendialog = filedialog.Open(parent=self.text, + filetypes=self.filetypes) + filename = self.opendialog.show(initialdir=dir, initialfile=base) + return filename + + def defaultfilename(self, mode="open"): + if self.filename: + return os.path.split(self.filename) + elif self.dirname: + return self.dirname, "" + else: + try: + pwd = os.getcwd() + except OSError: + pwd = "" + return pwd, "" + + def asksavefile(self): + dir, base = self.defaultfilename("save") + if not self.savedialog: + self.savedialog = filedialog.SaveAs( + parent=self.text, + filetypes=self.filetypes, + defaultextension=self.defaultextension) + filename = self.savedialog.show(initialdir=dir, initialfile=base) + return filename + + def updaterecentfileslist(self,filename): + "Update recent file list on all editor windows" + if self.editwin.flist: + self.editwin.update_recent_files_list(filename) + + +def _io_binding(parent): # htest # + from tkinter import Toplevel, Text + + top = Toplevel(parent) + top.title("Test IOBinding") + x, y = map(int, parent.geometry().split('+')[1:]) + top.geometry("+%d+%d" % (x, y + 175)) + + class MyEditWin: + def __init__(self, text): + self.text = text + self.flist = None + self.text.bind("<Control-o>", self.open) + self.text.bind('<Control-p>', self.print) + self.text.bind("<Control-s>", self.save) + self.text.bind("<Alt-s>", self.saveas) + self.text.bind('<Control-c>', self.savecopy) + def get_saved(self): return 0 + def set_saved(self, flag): pass + def reset_undo(self): pass + def open(self, event): + self.text.event_generate("<<open-window-from-file>>") + def print(self, event): + self.text.event_generate("<<print-window>>") + def save(self, event): + self.text.event_generate("<<save-window>>") + def saveas(self, event): + self.text.event_generate("<<save-window-as-file>>") + def savecopy(self, event): + self.text.event_generate("<<save-copy-of-window-as-file>>") + + text = Text(top) + text.pack() + text.focus_set() + editwin = MyEditWin(text) + IOBinding(editwin) + + +if __name__ == "__main__": + from unittest import main + main('idlelib.idle_test.test_iomenu', verbosity=2, exit=False) + + from idlelib.idle_test.htest import run + run(_io_binding) diff --git a/Lib/idlelib/macosx.py b/Lib/idlelib/macosx.py new file mode 100644 index 000000000..332952f45 --- /dev/null +++ b/Lib/idlelib/macosx.py @@ -0,0 +1,278 @@ +""" +A number of functions that enhance IDLE on macOS. +""" +from os.path import expanduser +import plistlib +from sys import platform # Used in _init_tk_type, changed by test. + +import tkinter + + +## Define functions that query the Mac graphics type. +## _tk_type and its initializer are private to this section. + +_tk_type = None + +def _init_tk_type(): + """ Initialize _tk_type for isXyzTk functions. + + This function is only called once, when _tk_type is still None. + """ + global _tk_type + if platform == 'darwin': + + # When running IDLE, GUI is present, test/* may not be. + # When running tests, test/* is present, GUI may not be. + # If not, guess most common. Does not matter for testing. + from idlelib.__init__ import testing + if testing: + from test.support import requires, ResourceDenied + try: + requires('gui') + except ResourceDenied: + _tk_type = "cocoa" + return + + root = tkinter.Tk() + ws = root.tk.call('tk', 'windowingsystem') + if 'x11' in ws: + _tk_type = "xquartz" + elif 'aqua' not in ws: + _tk_type = "other" + elif 'AppKit' in root.tk.call('winfo', 'server', '.'): + _tk_type = "cocoa" + else: + _tk_type = "carbon" + root.destroy() + else: + _tk_type = "other" + return + +def isAquaTk(): + """ + Returns True if IDLE is using a native OS X Tk (Cocoa or Carbon). + """ + if not _tk_type: + _init_tk_type() + return _tk_type == "cocoa" or _tk_type == "carbon" + +def isCarbonTk(): + """ + Returns True if IDLE is using a Carbon Aqua Tk (instead of the + newer Cocoa Aqua Tk). + """ + if not _tk_type: + _init_tk_type() + return _tk_type == "carbon" + +def isCocoaTk(): + """ + Returns True if IDLE is using a Cocoa Aqua Tk. + """ + if not _tk_type: + _init_tk_type() + return _tk_type == "cocoa" + +def isXQuartz(): + """ + Returns True if IDLE is using an OS X X11 Tk. + """ + if not _tk_type: + _init_tk_type() + return _tk_type == "xquartz" + + +def readSystemPreferences(): + """ + Fetch the macOS system preferences. + """ + if platform != 'darwin': + return None + + plist_path = expanduser('~/Library/Preferences/.GlobalPreferences.plist') + try: + with open(plist_path, 'rb') as plist_file: + return plistlib.load(plist_file) + except OSError: + return None + + +def preferTabsPreferenceWarning(): + """ + Warn if "Prefer tabs when opening documents" is set to "Always". + """ + if platform != 'darwin': + return None + + prefs = readSystemPreferences() + if prefs and prefs.get('AppleWindowTabbingMode') == 'always': + return ( + 'WARNING: The system preference "Prefer tabs when opening' + ' documents" is set to "Always". This will cause various problems' + ' with IDLE. For the best experience, change this setting when' + ' running IDLE (via System Preferences -> Dock).' + ) + return None + + +## Fix the menu and related functions. + +def addOpenEventSupport(root, flist): + """ + This ensures that the application will respond to open AppleEvents, which + makes is feasible to use IDLE as the default application for python files. + """ + def doOpenFile(*args): + for fn in args: + flist.open(fn) + + # The command below is a hook in aquatk that is called whenever the app + # receives a file open event. The callback can have multiple arguments, + # one for every file that should be opened. + root.createcommand("::tk::mac::OpenDocument", doOpenFile) + +def hideTkConsole(root): + try: + root.tk.call('console', 'hide') + except tkinter.TclError: + # Some versions of the Tk framework don't have a console object + pass + +def overrideRootMenu(root, flist): + """ + Replace the Tk root menu by something that is more appropriate for + IDLE with an Aqua Tk. + """ + # The menu that is attached to the Tk root (".") is also used by AquaTk for + # all windows that don't specify a menu of their own. The default menubar + # contains a number of menus, none of which are appropriate for IDLE. The + # Most annoying of those is an 'About Tck/Tk...' menu in the application + # menu. + # + # This function replaces the default menubar by a mostly empty one, it + # should only contain the correct application menu and the window menu. + # + # Due to a (mis-)feature of TkAqua the user will also see an empty Help + # menu. + from tkinter import Menu + from idlelib import mainmenu + from idlelib import window + + closeItem = mainmenu.menudefs[0][1][-2] + + # Remove the last 3 items of the file menu: a separator, close window and + # quit. Close window will be reinserted just above the save item, where + # it should be according to the HIG. Quit is in the application menu. + del mainmenu.menudefs[0][1][-3:] + mainmenu.menudefs[0][1].insert(6, closeItem) + + # Remove the 'About' entry from the help menu, it is in the application + # menu + del mainmenu.menudefs[-1][1][0:2] + # Remove the 'Configure Idle' entry from the options menu, it is in the + # application menu as 'Preferences' + del mainmenu.menudefs[-3][1][0:2] + menubar = Menu(root) + root.configure(menu=menubar) + + menu = Menu(menubar, name='window', tearoff=0) + menubar.add_cascade(label='Window', menu=menu, underline=0) + + def postwindowsmenu(menu=menu): + end = menu.index('end') + if end is None: + end = -1 + + if end > 0: + menu.delete(0, end) + window.add_windows_to_menu(menu) + window.register_callback(postwindowsmenu) + + def about_dialog(event=None): + "Handle Help 'About IDLE' event." + # Synchronize with editor.EditorWindow.about_dialog. + from idlelib import help_about + help_about.AboutDialog(root) + + def config_dialog(event=None): + "Handle Options 'Configure IDLE' event." + # Synchronize with editor.EditorWindow.config_dialog. + from idlelib import configdialog + + # Ensure that the root object has an instance_dict attribute, + # mirrors code in EditorWindow (although that sets the attribute + # on an EditorWindow instance that is then passed as the first + # argument to ConfigDialog) + root.instance_dict = flist.inversedict + configdialog.ConfigDialog(root, 'Settings') + + def help_dialog(event=None): + "Handle Help 'IDLE Help' event." + # Synchronize with editor.EditorWindow.help_dialog. + from idlelib import help + help.show_idlehelp(root) + + root.bind('<<about-idle>>', about_dialog) + root.bind('<<open-config-dialog>>', config_dialog) + root.createcommand('::tk::mac::ShowPreferences', config_dialog) + if flist: + root.bind('<<close-all-windows>>', flist.close_all_callback) + + # The binding above doesn't reliably work on all versions of Tk + # on macOS. Adding command definition below does seem to do the + # right thing for now. + root.createcommand('::tk::mac::Quit', flist.close_all_callback) + + if isCarbonTk(): + # for Carbon AquaTk, replace the default Tk apple menu + menu = Menu(menubar, name='apple', tearoff=0) + menubar.add_cascade(label='IDLE', menu=menu) + mainmenu.menudefs.insert(0, + ('application', [ + ('About IDLE', '<<about-idle>>'), + None, + ])) + if isCocoaTk(): + # replace default About dialog with About IDLE one + root.createcommand('tkAboutDialog', about_dialog) + # replace default "Help" item in Help menu + root.createcommand('::tk::mac::ShowHelp', help_dialog) + # remove redundant "IDLE Help" from menu + del mainmenu.menudefs[-1][1][0] + +def fixb2context(root): + '''Removed bad AquaTk Button-2 (right) and Paste bindings. + + They prevent context menu access and seem to be gone in AquaTk8.6. + See issue #24801. + ''' + root.unbind_class('Text', '<B2>') + root.unbind_class('Text', '<B2-Motion>') + root.unbind_class('Text', '<<PasteSelection>>') + +def setupApp(root, flist): + """ + Perform initial OS X customizations if needed. + Called from pyshell.main() after initial calls to Tk() + + There are currently three major versions of Tk in use on OS X: + 1. Aqua Cocoa Tk (native default since OS X 10.6) + 2. Aqua Carbon Tk (original native, 32-bit only, deprecated) + 3. X11 (supported by some third-party distributors, deprecated) + There are various differences among the three that affect IDLE + behavior, primarily with menus, mouse key events, and accelerators. + Some one-time customizations are performed here. + Others are dynamically tested throughout idlelib by calls to the + isAquaTk(), isCarbonTk(), isCocoaTk(), isXQuartz() functions which + are initialized here as well. + """ + if isAquaTk(): + hideTkConsole(root) + overrideRootMenu(root, flist) + addOpenEventSupport(root, flist) + fixb2context(root) + + +if __name__ == '__main__': + from unittest import main + main('idlelib.idle_test.test_macosx', verbosity=2) diff --git a/Lib/idlelib/mainmenu.py b/Lib/idlelib/mainmenu.py new file mode 100644 index 000000000..91a32cebb --- /dev/null +++ b/Lib/idlelib/mainmenu.py @@ -0,0 +1,126 @@ +"""Define the menu contents, hotkeys, and event bindings. + +There is additional configuration information in the EditorWindow class (and +subclasses): the menus are created there based on the menu_specs (class) +variable, and menus not created are silently skipped in the code here. This +makes it possible, for example, to define a Debug menu which is only present in +the PythonShell window, and a Format menu which is only present in the Editor +windows. + +""" +from importlib.util import find_spec + +from idlelib.config import idleConf + +# Warning: menudefs is altered in macosx.overrideRootMenu() +# after it is determined that an OS X Aqua Tk is in use, +# which cannot be done until after Tk() is first called. +# Do not alter the 'file', 'options', or 'help' cascades here +# without altering overrideRootMenu() as well. +# TODO: Make this more robust + +menudefs = [ + # underscore prefixes character to underscore + ('file', [ + ('_New File', '<<open-new-window>>'), + ('_Open...', '<<open-window-from-file>>'), + ('Open _Module...', '<<open-module>>'), + ('Module _Browser', '<<open-class-browser>>'), + ('_Path Browser', '<<open-path-browser>>'), + None, + ('_Save', '<<save-window>>'), + ('Save _As...', '<<save-window-as-file>>'), + ('Save Cop_y As...', '<<save-copy-of-window-as-file>>'), + None, + ('Prin_t Window', '<<print-window>>'), + None, + ('_Close Window', '<<close-window>>'), + ('E_xit IDLE', '<<close-all-windows>>'), + ]), + + ('edit', [ + ('_Undo', '<<undo>>'), + ('_Redo', '<<redo>>'), + None, + ('Select _All', '<<select-all>>'), + ('Cu_t', '<<cut>>'), + ('_Copy', '<<copy>>'), + ('_Paste', '<<paste>>'), + None, + ('_Find...', '<<find>>'), + ('Find A_gain', '<<find-again>>'), + ('Find _Selection', '<<find-selection>>'), + ('Find in Files...', '<<find-in-files>>'), + ('R_eplace...', '<<replace>>'), + None, + ('Go to _Line', '<<goto-line>>'), + ('S_how Completions', '<<force-open-completions>>'), + ('E_xpand Word', '<<expand-word>>'), + ('Show C_all Tip', '<<force-open-calltip>>'), + ('Show Surrounding P_arens', '<<flash-paren>>'), + ]), + + ('format', [ + ('F_ormat Paragraph', '<<format-paragraph>>'), + ('_Indent Region', '<<indent-region>>'), + ('_Dedent Region', '<<dedent-region>>'), + ('Comment _Out Region', '<<comment-region>>'), + ('U_ncomment Region', '<<uncomment-region>>'), + ('Tabify Region', '<<tabify-region>>'), + ('Untabify Region', '<<untabify-region>>'), + ('Toggle Tabs', '<<toggle-tabs>>'), + ('New Indent Width', '<<change-indentwidth>>'), + ('S_trip Trailing Whitespace', '<<do-rstrip>>'), + ]), + + ('run', [ + ('R_un Module', '<<run-module>>'), + ('Run... _Customized', '<<run-custom>>'), + ('C_heck Module', '<<check-module>>'), + ('Python Shell', '<<open-python-shell>>'), + ]), + + ('shell', [ + ('_View Last Restart', '<<view-restart>>'), + ('_Restart Shell', '<<restart-shell>>'), + None, + ('_Previous History', '<<history-previous>>'), + ('_Next History', '<<history-next>>'), + None, + ('_Interrupt Execution', '<<interrupt-execution>>'), + ]), + + ('debug', [ + ('_Go to File/Line', '<<goto-file-line>>'), + ('!_Debugger', '<<toggle-debugger>>'), + ('_Stack Viewer', '<<open-stack-viewer>>'), + ('!_Auto-open Stack Viewer', '<<toggle-jit-stack-viewer>>'), + ]), + + ('options', [ + ('Configure _IDLE', '<<open-config-dialog>>'), + None, + ('Show _Code Context', '<<toggle-code-context>>'), + ('Show _Line Numbers', '<<toggle-line-numbers>>'), + ('_Zoom Height', '<<zoom-height>>'), + ]), + + ('window', [ + ]), + + ('help', [ + ('_About IDLE', '<<about-idle>>'), + None, + ('_IDLE Doc', '<<help>>'), + ('Python _Docs', '<<python-docs>>'), + ]), +] + +if find_spec('turtledemo'): + menudefs[-1][1].append(('Turtle Demo', '<<open-turtle-demo>>')) + +default_keydefs = idleConf.GetCurrentKeySet() + +if __name__ == '__main__': + from unittest import main + main('idlelib.idle_test.test_mainmenu', verbosity=2) diff --git a/Lib/idlelib/multicall.py b/Lib/idlelib/multicall.py new file mode 100644 index 000000000..41f818131 --- /dev/null +++ b/Lib/idlelib/multicall.py @@ -0,0 +1,451 @@ +""" +MultiCall - a class which inherits its methods from a Tkinter widget (Text, for +example), but enables multiple calls of functions per virtual event - all +matching events will be called, not only the most specific one. This is done +by wrapping the event functions - event_add, event_delete and event_info. +MultiCall recognizes only a subset of legal event sequences. Sequences which +are not recognized are treated by the original Tk handling mechanism. A +more-specific event will be called before a less-specific event. + +The recognized sequences are complete one-event sequences (no emacs-style +Ctrl-X Ctrl-C, no shortcuts like <3>), for all types of events. +Key/Button Press/Release events can have modifiers. +The recognized modifiers are Shift, Control, Option and Command for Mac, and +Control, Alt, Shift, Meta/M for other platforms. + +For all events which were handled by MultiCall, a new member is added to the +event instance passed to the binded functions - mc_type. This is one of the +event type constants defined in this module (such as MC_KEYPRESS). +For Key/Button events (which are handled by MultiCall and may receive +modifiers), another member is added - mc_state. This member gives the state +of the recognized modifiers, as a combination of the modifier constants +also defined in this module (for example, MC_SHIFT). +Using these members is absolutely portable. + +The order by which events are called is defined by these rules: +1. A more-specific event will be called before a less-specific event. +2. A recently-binded event will be called before a previously-binded event, + unless this conflicts with the first rule. +Each function will be called at most once for each event. +""" +import re +import sys + +import tkinter + +# the event type constants, which define the meaning of mc_type +MC_KEYPRESS=0; MC_KEYRELEASE=1; MC_BUTTONPRESS=2; MC_BUTTONRELEASE=3; +MC_ACTIVATE=4; MC_CIRCULATE=5; MC_COLORMAP=6; MC_CONFIGURE=7; +MC_DEACTIVATE=8; MC_DESTROY=9; MC_ENTER=10; MC_EXPOSE=11; MC_FOCUSIN=12; +MC_FOCUSOUT=13; MC_GRAVITY=14; MC_LEAVE=15; MC_MAP=16; MC_MOTION=17; +MC_MOUSEWHEEL=18; MC_PROPERTY=19; MC_REPARENT=20; MC_UNMAP=21; MC_VISIBILITY=22; +# the modifier state constants, which define the meaning of mc_state +MC_SHIFT = 1<<0; MC_CONTROL = 1<<2; MC_ALT = 1<<3; MC_META = 1<<5 +MC_OPTION = 1<<6; MC_COMMAND = 1<<7 + +# define the list of modifiers, to be used in complex event types. +if sys.platform == "darwin": + _modifiers = (("Shift",), ("Control",), ("Option",), ("Command",)) + _modifier_masks = (MC_SHIFT, MC_CONTROL, MC_OPTION, MC_COMMAND) +else: + _modifiers = (("Control",), ("Alt",), ("Shift",), ("Meta", "M")) + _modifier_masks = (MC_CONTROL, MC_ALT, MC_SHIFT, MC_META) + +# a dictionary to map a modifier name into its number +_modifier_names = {name: number + for number in range(len(_modifiers)) + for name in _modifiers[number]} + +# In 3.4, if no shell window is ever open, the underlying Tk widget is +# destroyed before .__del__ methods here are called. The following +# is used to selectively ignore shutdown exceptions to avoid +# 'Exception ignored' messages. See http://bugs.python.org/issue20167 +APPLICATION_GONE = "application has been destroyed" + +# A binder is a class which binds functions to one type of event. It has two +# methods: bind and unbind, which get a function and a parsed sequence, as +# returned by _parse_sequence(). There are two types of binders: +# _SimpleBinder handles event types with no modifiers and no detail. +# No Python functions are called when no events are binded. +# _ComplexBinder handles event types with modifiers and a detail. +# A Python function is called each time an event is generated. + +class _SimpleBinder: + def __init__(self, type, widget, widgetinst): + self.type = type + self.sequence = '<'+_types[type][0]+'>' + self.widget = widget + self.widgetinst = widgetinst + self.bindedfuncs = [] + self.handlerid = None + + def bind(self, triplet, func): + if not self.handlerid: + def handler(event, l = self.bindedfuncs, mc_type = self.type): + event.mc_type = mc_type + wascalled = {} + for i in range(len(l)-1, -1, -1): + func = l[i] + if func not in wascalled: + wascalled[func] = True + r = func(event) + if r: + return r + self.handlerid = self.widget.bind(self.widgetinst, + self.sequence, handler) + self.bindedfuncs.append(func) + + def unbind(self, triplet, func): + self.bindedfuncs.remove(func) + if not self.bindedfuncs: + self.widget.unbind(self.widgetinst, self.sequence, self.handlerid) + self.handlerid = None + + def __del__(self): + if self.handlerid: + try: + self.widget.unbind(self.widgetinst, self.sequence, + self.handlerid) + except tkinter.TclError as e: + if not APPLICATION_GONE in e.args[0]: + raise + +# An int in range(1 << len(_modifiers)) represents a combination of modifiers +# (if the least significant bit is on, _modifiers[0] is on, and so on). +# _state_subsets gives for each combination of modifiers, or *state*, +# a list of the states which are a subset of it. This list is ordered by the +# number of modifiers is the state - the most specific state comes first. +_states = range(1 << len(_modifiers)) +_state_names = [''.join(m[0]+'-' + for i, m in enumerate(_modifiers) + if (1 << i) & s) + for s in _states] + +def expand_substates(states): + '''For each item of states return a list containing all combinations of + that item with individual bits reset, sorted by the number of set bits. + ''' + def nbits(n): + "number of bits set in n base 2" + nb = 0 + while n: + n, rem = divmod(n, 2) + nb += rem + return nb + statelist = [] + for state in states: + substates = list({state & x for x in states}) + substates.sort(key=nbits, reverse=True) + statelist.append(substates) + return statelist + +_state_subsets = expand_substates(_states) + +# _state_codes gives for each state, the portable code to be passed as mc_state +_state_codes = [] +for s in _states: + r = 0 + for i in range(len(_modifiers)): + if (1 << i) & s: + r |= _modifier_masks[i] + _state_codes.append(r) + +class _ComplexBinder: + # This class binds many functions, and only unbinds them when it is deleted. + # self.handlerids is the list of seqs and ids of binded handler functions. + # The binded functions sit in a dictionary of lists of lists, which maps + # a detail (or None) and a state into a list of functions. + # When a new detail is discovered, handlers for all the possible states + # are binded. + + def __create_handler(self, lists, mc_type, mc_state): + def handler(event, lists = lists, + mc_type = mc_type, mc_state = mc_state, + ishandlerrunning = self.ishandlerrunning, + doafterhandler = self.doafterhandler): + ishandlerrunning[:] = [True] + event.mc_type = mc_type + event.mc_state = mc_state + wascalled = {} + r = None + for l in lists: + for i in range(len(l)-1, -1, -1): + func = l[i] + if func not in wascalled: + wascalled[func] = True + r = l[i](event) + if r: + break + if r: + break + ishandlerrunning[:] = [] + # Call all functions in doafterhandler and remove them from list + for f in doafterhandler: + f() + doafterhandler[:] = [] + if r: + return r + return handler + + def __init__(self, type, widget, widgetinst): + self.type = type + self.typename = _types[type][0] + self.widget = widget + self.widgetinst = widgetinst + self.bindedfuncs = {None: [[] for s in _states]} + self.handlerids = [] + # we don't want to change the lists of functions while a handler is + # running - it will mess up the loop and anyway, we usually want the + # change to happen from the next event. So we have a list of functions + # for the handler to run after it finishes calling the binded functions. + # It calls them only once. + # ishandlerrunning is a list. An empty one means no, otherwise - yes. + # this is done so that it would be mutable. + self.ishandlerrunning = [] + self.doafterhandler = [] + for s in _states: + lists = [self.bindedfuncs[None][i] for i in _state_subsets[s]] + handler = self.__create_handler(lists, type, _state_codes[s]) + seq = '<'+_state_names[s]+self.typename+'>' + self.handlerids.append((seq, self.widget.bind(self.widgetinst, + seq, handler))) + + def bind(self, triplet, func): + if triplet[2] not in self.bindedfuncs: + self.bindedfuncs[triplet[2]] = [[] for s in _states] + for s in _states: + lists = [ self.bindedfuncs[detail][i] + for detail in (triplet[2], None) + for i in _state_subsets[s] ] + handler = self.__create_handler(lists, self.type, + _state_codes[s]) + seq = "<%s%s-%s>"% (_state_names[s], self.typename, triplet[2]) + self.handlerids.append((seq, self.widget.bind(self.widgetinst, + seq, handler))) + doit = lambda: self.bindedfuncs[triplet[2]][triplet[0]].append(func) + if not self.ishandlerrunning: + doit() + else: + self.doafterhandler.append(doit) + + def unbind(self, triplet, func): + doit = lambda: self.bindedfuncs[triplet[2]][triplet[0]].remove(func) + if not self.ishandlerrunning: + doit() + else: + self.doafterhandler.append(doit) + + def __del__(self): + for seq, id in self.handlerids: + try: + self.widget.unbind(self.widgetinst, seq, id) + except tkinter.TclError as e: + if not APPLICATION_GONE in e.args[0]: + raise + +# define the list of event types to be handled by MultiEvent. the order is +# compatible with the definition of event type constants. +_types = ( + ("KeyPress", "Key"), ("KeyRelease",), ("ButtonPress", "Button"), + ("ButtonRelease",), ("Activate",), ("Circulate",), ("Colormap",), + ("Configure",), ("Deactivate",), ("Destroy",), ("Enter",), ("Expose",), + ("FocusIn",), ("FocusOut",), ("Gravity",), ("Leave",), ("Map",), + ("Motion",), ("MouseWheel",), ("Property",), ("Reparent",), ("Unmap",), + ("Visibility",), +) + +# which binder should be used for every event type? +_binder_classes = (_ComplexBinder,) * 4 + (_SimpleBinder,) * (len(_types)-4) + +# A dictionary to map a type name into its number +_type_names = {name: number + for number in range(len(_types)) + for name in _types[number]} + +_keysym_re = re.compile(r"^\w+$") +_button_re = re.compile(r"^[1-5]$") +def _parse_sequence(sequence): + """Get a string which should describe an event sequence. If it is + successfully parsed as one, return a tuple containing the state (as an int), + the event type (as an index of _types), and the detail - None if none, or a + string if there is one. If the parsing is unsuccessful, return None. + """ + if not sequence or sequence[0] != '<' or sequence[-1] != '>': + return None + words = sequence[1:-1].split('-') + modifiers = 0 + while words and words[0] in _modifier_names: + modifiers |= 1 << _modifier_names[words[0]] + del words[0] + if words and words[0] in _type_names: + type = _type_names[words[0]] + del words[0] + else: + return None + if _binder_classes[type] is _SimpleBinder: + if modifiers or words: + return None + else: + detail = None + else: + # _ComplexBinder + if type in [_type_names[s] for s in ("KeyPress", "KeyRelease")]: + type_re = _keysym_re + else: + type_re = _button_re + + if not words: + detail = None + elif len(words) == 1 and type_re.match(words[0]): + detail = words[0] + else: + return None + + return modifiers, type, detail + +def _triplet_to_sequence(triplet): + if triplet[2]: + return '<'+_state_names[triplet[0]]+_types[triplet[1]][0]+'-'+ \ + triplet[2]+'>' + else: + return '<'+_state_names[triplet[0]]+_types[triplet[1]][0]+'>' + +_multicall_dict = {} +def MultiCallCreator(widget): + """Return a MultiCall class which inherits its methods from the + given widget class (for example, Tkinter.Text). This is used + instead of a templating mechanism. + """ + if widget in _multicall_dict: + return _multicall_dict[widget] + + class MultiCall (widget): + assert issubclass(widget, tkinter.Misc) + + def __init__(self, *args, **kwargs): + widget.__init__(self, *args, **kwargs) + # a dictionary which maps a virtual event to a tuple with: + # 0. the function binded + # 1. a list of triplets - the sequences it is binded to + self.__eventinfo = {} + self.__binders = [_binder_classes[i](i, widget, self) + for i in range(len(_types))] + + def bind(self, sequence=None, func=None, add=None): + #print("bind(%s, %s, %s)" % (sequence, func, add), + # file=sys.__stderr__) + if type(sequence) is str and len(sequence) > 2 and \ + sequence[:2] == "<<" and sequence[-2:] == ">>": + if sequence in self.__eventinfo: + ei = self.__eventinfo[sequence] + if ei[0] is not None: + for triplet in ei[1]: + self.__binders[triplet[1]].unbind(triplet, ei[0]) + ei[0] = func + if ei[0] is not None: + for triplet in ei[1]: + self.__binders[triplet[1]].bind(triplet, func) + else: + self.__eventinfo[sequence] = [func, []] + return widget.bind(self, sequence, func, add) + + def unbind(self, sequence, funcid=None): + if type(sequence) is str and len(sequence) > 2 and \ + sequence[:2] == "<<" and sequence[-2:] == ">>" and \ + sequence in self.__eventinfo: + func, triplets = self.__eventinfo[sequence] + if func is not None: + for triplet in triplets: + self.__binders[triplet[1]].unbind(triplet, func) + self.__eventinfo[sequence][0] = None + return widget.unbind(self, sequence, funcid) + + def event_add(self, virtual, *sequences): + #print("event_add(%s, %s)" % (repr(virtual), repr(sequences)), + # file=sys.__stderr__) + if virtual not in self.__eventinfo: + self.__eventinfo[virtual] = [None, []] + + func, triplets = self.__eventinfo[virtual] + for seq in sequences: + triplet = _parse_sequence(seq) + if triplet is None: + #print("Tkinter event_add(%s)" % seq, file=sys.__stderr__) + widget.event_add(self, virtual, seq) + else: + if func is not None: + self.__binders[triplet[1]].bind(triplet, func) + triplets.append(triplet) + + def event_delete(self, virtual, *sequences): + if virtual not in self.__eventinfo: + return + func, triplets = self.__eventinfo[virtual] + for seq in sequences: + triplet = _parse_sequence(seq) + if triplet is None: + #print("Tkinter event_delete: %s" % seq, file=sys.__stderr__) + widget.event_delete(self, virtual, seq) + else: + if func is not None: + self.__binders[triplet[1]].unbind(triplet, func) + triplets.remove(triplet) + + def event_info(self, virtual=None): + if virtual is None or virtual not in self.__eventinfo: + return widget.event_info(self, virtual) + else: + return tuple(map(_triplet_to_sequence, + self.__eventinfo[virtual][1])) + \ + widget.event_info(self, virtual) + + def __del__(self): + for virtual in self.__eventinfo: + func, triplets = self.__eventinfo[virtual] + if func: + for triplet in triplets: + try: + self.__binders[triplet[1]].unbind(triplet, func) + except tkinter.TclError as e: + if not APPLICATION_GONE in e.args[0]: + raise + + _multicall_dict[widget] = MultiCall + return MultiCall + + +def _multi_call(parent): # htest # + top = tkinter.Toplevel(parent) + top.title("Test MultiCall") + x, y = map(int, parent.geometry().split('+')[1:]) + top.geometry("+%d+%d" % (x, y + 175)) + text = MultiCallCreator(tkinter.Text)(top) + text.pack() + text.focus_set() + + def bindseq(seq, n=[0]): + def handler(event): + print(seq) + text.bind("<<handler%d>>"%n[0], handler) + text.event_add("<<handler%d>>"%n[0], seq) + n[0] += 1 + bindseq("<Key>") + bindseq("<Control-Key>") + bindseq("<Alt-Key-a>") + bindseq("<Control-Key-a>") + bindseq("<Alt-Control-Key-a>") + bindseq("<Key-b>") + bindseq("<Control-Button-1>") + bindseq("<Button-2>") + bindseq("<Alt-Button-1>") + bindseq("<FocusOut>") + bindseq("<Enter>") + bindseq("<Leave>") + + +if __name__ == "__main__": + from unittest import main + main('idlelib.idle_test.test_mainmenu', verbosity=2, exit=False) + + from idlelib.idle_test.htest import run + run(_multi_call) diff --git a/Lib/idlelib/outwin.py b/Lib/idlelib/outwin.py new file mode 100644 index 000000000..8baa65755 --- /dev/null +++ b/Lib/idlelib/outwin.py @@ -0,0 +1,188 @@ +"""Editor window that can serve as an output file. +""" + +import re + +from tkinter import messagebox + +from idlelib.editor import EditorWindow + + +file_line_pats = [ + # order of patterns matters + r'file "([^"]*)", line (\d+)', + r'([^\s]+)\((\d+)\)', + r'^(\s*\S.*?):\s*(\d+):', # Win filename, maybe starting with spaces + r'([^\s]+):\s*(\d+):', # filename or path, ltrim + r'^\s*(\S.*?):\s*(\d+):', # Win abs path with embedded spaces, ltrim +] + +file_line_progs = None + + +def compile_progs(): + "Compile the patterns for matching to file name and line number." + global file_line_progs + file_line_progs = [re.compile(pat, re.IGNORECASE) + for pat in file_line_pats] + + +def file_line_helper(line): + """Extract file name and line number from line of text. + + Check if line of text contains one of the file/line patterns. + If it does and if the file and line are valid, return + a tuple of the file name and line number. If it doesn't match + or if the file or line is invalid, return None. + """ + if not file_line_progs: + compile_progs() + for prog in file_line_progs: + match = prog.search(line) + if match: + filename, lineno = match.group(1, 2) + try: + f = open(filename) + f.close() + break + except OSError: + continue + else: + return None + try: + return filename, int(lineno) + except TypeError: + return None + + +class OutputWindow(EditorWindow): + """An editor window that can serve as an output file. + + Also the future base class for the Python shell window. + This class has no input facilities. + + Adds binding to open a file at a line to the text widget. + """ + + # Our own right-button menu + rmenu_specs = [ + ("Cut", "<<cut>>", "rmenu_check_cut"), + ("Copy", "<<copy>>", "rmenu_check_copy"), + ("Paste", "<<paste>>", "rmenu_check_paste"), + (None, None, None), + ("Go to file/line", "<<goto-file-line>>", None), + ] + + allow_code_context = False + + def __init__(self, *args): + EditorWindow.__init__(self, *args) + self.text.bind("<<goto-file-line>>", self.goto_file_line) + + # Customize EditorWindow + def ispythonsource(self, filename): + "Python source is only part of output: do not colorize." + return False + + def short_title(self): + "Customize EditorWindow title." + return "Output" + + def maybesave(self): + "Customize EditorWindow to not display save file messagebox." + return 'yes' if self.get_saved() else 'no' + + # Act as output file + def write(self, s, tags=(), mark="insert"): + """Write text to text widget. + + The text is inserted at the given index with the provided + tags. The text widget is then scrolled to make it visible + and updated to display it, giving the effect of seeing each + line as it is added. + + Args: + s: Text to insert into text widget. + tags: Tuple of tag strings to apply on the insert. + mark: Index for the insert. + + Return: + Length of text inserted. + """ + assert isinstance(s, str) + self.text.insert(mark, s, tags) + self.text.see(mark) + self.text.update() + return len(s) + + def writelines(self, lines): + "Write each item in lines iterable." + for line in lines: + self.write(line) + + def flush(self): + "No flushing needed as write() directly writes to widget." + pass + + def showerror(self, *args, **kwargs): + messagebox.showerror(*args, **kwargs) + + def goto_file_line(self, event=None): + """Handle request to open file/line. + + If the selected or previous line in the output window + contains a file name and line number, then open that file + name in a new window and position on the line number. + + Otherwise, display an error messagebox. + """ + line = self.text.get("insert linestart", "insert lineend") + result = file_line_helper(line) + if not result: + # Try the previous line. This is handy e.g. in tracebacks, + # where you tend to right-click on the displayed source line + line = self.text.get("insert -1line linestart", + "insert -1line lineend") + result = file_line_helper(line) + if not result: + self.showerror( + "No special line", + "The line you point at doesn't look like " + "a valid file name followed by a line number.", + parent=self.text) + return + filename, lineno = result + self.flist.gotofileline(filename, lineno) + + +# These classes are currently not used but might come in handy +class OnDemandOutputWindow: + + tagdefs = { + # XXX Should use IdlePrefs.ColorPrefs + "stdout": {"foreground": "blue"}, + "stderr": {"foreground": "#007700"}, + } + + def __init__(self, flist): + self.flist = flist + self.owin = None + + def write(self, s, tags, mark): + if not self.owin: + self.setup() + self.owin.write(s, tags, mark) + + def setup(self): + self.owin = owin = OutputWindow(self.flist) + text = owin.text + for tag, cnf in self.tagdefs.items(): + if cnf: + text.tag_configure(tag, **cnf) + text.tag_raise('sel') + self.write = self.owin.write + + +if __name__ == '__main__': + from unittest import main + main('idlelib.idle_test.test_outwin', verbosity=2, exit=False) diff --git a/Lib/idlelib/parenmatch.py b/Lib/idlelib/parenmatch.py new file mode 100644 index 000000000..3fd7aadb2 --- /dev/null +++ b/Lib/idlelib/parenmatch.py @@ -0,0 +1,183 @@ +"""ParenMatch -- for parenthesis matching. + +When you hit a right paren, the cursor should move briefly to the left +paren. Paren here is used generically; the matching applies to +parentheses, square brackets, and curly braces. +""" +from idlelib.hyperparser import HyperParser +from idlelib.config import idleConf + +_openers = {')':'(',']':'[','}':'{'} +CHECK_DELAY = 100 # milliseconds + +class ParenMatch: + """Highlight matching openers and closers, (), [], and {}. + + There are three supported styles of paren matching. When a right + paren (opener) is typed: + + opener -- highlight the matching left paren (closer); + parens -- highlight the left and right parens (opener and closer); + expression -- highlight the entire expression from opener to closer. + (For back compatibility, 'default' is a synonym for 'opener'). + + Flash-delay is the maximum milliseconds the highlighting remains. + Any cursor movement (key press or click) before that removes the + highlight. If flash-delay is 0, there is no maximum. + + TODO: + - Augment bell() with mismatch warning in status window. + - Highlight when cursor is moved to the right of a closer. + This might be too expensive to check. + """ + + RESTORE_VIRTUAL_EVENT_NAME = "<<parenmatch-check-restore>>" + # We want the restore event be called before the usual return and + # backspace events. + RESTORE_SEQUENCES = ("<KeyPress>", "<ButtonPress>", + "<Key-Return>", "<Key-BackSpace>") + + def __init__(self, editwin): + self.editwin = editwin + self.text = editwin.text + # Bind the check-restore event to the function restore_event, + # so that we can then use activate_restore (which calls event_add) + # and deactivate_restore (which calls event_delete). + editwin.text.bind(self.RESTORE_VIRTUAL_EVENT_NAME, + self.restore_event) + self.counter = 0 + self.is_restore_active = 0 + + @classmethod + def reload(cls): + cls.STYLE = idleConf.GetOption( + 'extensions','ParenMatch','style', default='opener') + cls.FLASH_DELAY = idleConf.GetOption( + 'extensions','ParenMatch','flash-delay', type='int',default=500) + cls.BELL = idleConf.GetOption( + 'extensions','ParenMatch','bell', type='bool', default=1) + cls.HILITE_CONFIG = idleConf.GetHighlight(idleConf.CurrentTheme(), + 'hilite') + + def activate_restore(self): + "Activate mechanism to restore text from highlighting." + if not self.is_restore_active: + for seq in self.RESTORE_SEQUENCES: + self.text.event_add(self.RESTORE_VIRTUAL_EVENT_NAME, seq) + self.is_restore_active = True + + def deactivate_restore(self): + "Remove restore event bindings." + if self.is_restore_active: + for seq in self.RESTORE_SEQUENCES: + self.text.event_delete(self.RESTORE_VIRTUAL_EVENT_NAME, seq) + self.is_restore_active = False + + def flash_paren_event(self, event): + "Handle editor 'show surrounding parens' event (menu or shortcut)." + indices = (HyperParser(self.editwin, "insert") + .get_surrounding_brackets()) + self.finish_paren_event(indices) + return "break" + + def paren_closed_event(self, event): + "Handle user input of closer." + # If user bound non-closer to <<paren-closed>>, quit. + closer = self.text.get("insert-1c") + if closer not in _openers: + return + hp = HyperParser(self.editwin, "insert-1c") + if not hp.is_in_code(): + return + indices = hp.get_surrounding_brackets(_openers[closer], True) + self.finish_paren_event(indices) + return # Allow calltips to see ')' + + def finish_paren_event(self, indices): + if indices is None and self.BELL: + self.text.bell() + return + self.activate_restore() + # self.create_tag(indices) + self.tagfuncs.get(self.STYLE, self.create_tag_expression)(self, indices) + # self.set_timeout() + (self.set_timeout_last if self.FLASH_DELAY else + self.set_timeout_none)() + + def restore_event(self, event=None): + "Remove effect of doing match." + self.text.tag_delete("paren") + self.deactivate_restore() + self.counter += 1 # disable the last timer, if there is one. + + def handle_restore_timer(self, timer_count): + if timer_count == self.counter: + self.restore_event() + + # any one of the create_tag_XXX methods can be used depending on + # the style + + def create_tag_opener(self, indices): + """Highlight the single paren that matches""" + self.text.tag_add("paren", indices[0]) + self.text.tag_config("paren", self.HILITE_CONFIG) + + def create_tag_parens(self, indices): + """Highlight the left and right parens""" + if self.text.get(indices[1]) in (')', ']', '}'): + rightindex = indices[1]+"+1c" + else: + rightindex = indices[1] + self.text.tag_add("paren", indices[0], indices[0]+"+1c", rightindex+"-1c", rightindex) + self.text.tag_config("paren", self.HILITE_CONFIG) + + def create_tag_expression(self, indices): + """Highlight the entire expression""" + if self.text.get(indices[1]) in (')', ']', '}'): + rightindex = indices[1]+"+1c" + else: + rightindex = indices[1] + self.text.tag_add("paren", indices[0], rightindex) + self.text.tag_config("paren", self.HILITE_CONFIG) + + tagfuncs = { + 'opener': create_tag_opener, + 'default': create_tag_opener, + 'parens': create_tag_parens, + 'expression': create_tag_expression, + } + + # any one of the set_timeout_XXX methods can be used depending on + # the style + + def set_timeout_none(self): + """Highlight will remain until user input turns it off + or the insert has moved""" + # After CHECK_DELAY, call a function which disables the "paren" tag + # if the event is for the most recent timer and the insert has changed, + # or schedules another call for itself. + self.counter += 1 + def callme(callme, self=self, c=self.counter, + index=self.text.index("insert")): + if index != self.text.index("insert"): + self.handle_restore_timer(c) + else: + self.editwin.text_frame.after(CHECK_DELAY, callme, callme) + self.editwin.text_frame.after(CHECK_DELAY, callme, callme) + + def set_timeout_last(self): + """The last highlight created will be removed after FLASH_DELAY millisecs""" + # associate a counter with an event; only disable the "paren" + # tag if the event is for the most recent timer. + self.counter += 1 + self.editwin.text_frame.after( + self.FLASH_DELAY, + lambda self=self, c=self.counter: self.handle_restore_timer(c)) + + +ParenMatch.reload() + + +if __name__ == '__main__': + from unittest import main + main('idlelib.idle_test.test_parenmatch', verbosity=2) diff --git a/Lib/idlelib/pathbrowser.py b/Lib/idlelib/pathbrowser.py new file mode 100644 index 000000000..48a77875b --- /dev/null +++ b/Lib/idlelib/pathbrowser.py @@ -0,0 +1,107 @@ +import importlib.machinery +import os +import sys + +from idlelib.browser import ModuleBrowser, ModuleBrowserTreeItem +from idlelib.tree import TreeItem + + +class PathBrowser(ModuleBrowser): + + def __init__(self, master, *, _htest=False, _utest=False): + """ + _htest - bool, change box location when running htest + """ + self.master = master + self._htest = _htest + self._utest = _utest + self.init() + + def settitle(self): + "Set window titles." + self.top.wm_title("Path Browser") + self.top.wm_iconname("Path Browser") + + def rootnode(self): + return PathBrowserTreeItem() + + +class PathBrowserTreeItem(TreeItem): + + def GetText(self): + return "sys.path" + + def GetSubList(self): + sublist = [] + for dir in sys.path: + item = DirBrowserTreeItem(dir) + sublist.append(item) + return sublist + + +class DirBrowserTreeItem(TreeItem): + + def __init__(self, dir, packages=[]): + self.dir = dir + self.packages = packages + + def GetText(self): + if not self.packages: + return self.dir + else: + return self.packages[-1] + ": package" + + def GetSubList(self): + try: + names = os.listdir(self.dir or os.curdir) + except OSError: + return [] + packages = [] + for name in names: + file = os.path.join(self.dir, name) + if self.ispackagedir(file): + nn = os.path.normcase(name) + packages.append((nn, name, file)) + packages.sort() + sublist = [] + for nn, name, file in packages: + item = DirBrowserTreeItem(file, self.packages + [name]) + sublist.append(item) + for nn, name in self.listmodules(names): + item = ModuleBrowserTreeItem(os.path.join(self.dir, name)) + sublist.append(item) + return sublist + + def ispackagedir(self, file): + " Return true for directories that are packages." + if not os.path.isdir(file): + return False + init = os.path.join(file, "__init__.py") + return os.path.exists(init) + + def listmodules(self, allnames): + modules = {} + suffixes = importlib.machinery.EXTENSION_SUFFIXES[:] + suffixes += importlib.machinery.SOURCE_SUFFIXES + suffixes += importlib.machinery.BYTECODE_SUFFIXES + sorted = [] + for suff in suffixes: + i = -len(suff) + for name in allnames[:]: + normed_name = os.path.normcase(name) + if normed_name[i:] == suff: + mod_name = name[:i] + if mod_name not in modules: + modules[mod_name] = None + sorted.append((normed_name, name)) + allnames.remove(name) + sorted.sort() + return sorted + + +if __name__ == "__main__": + from unittest import main + main('idlelib.idle_test.test_pathbrowser', verbosity=2, exit=False) + + from idlelib.idle_test.htest import run + run(PathBrowser) diff --git a/Lib/idlelib/percolator.py b/Lib/idlelib/percolator.py new file mode 100644 index 000000000..aa73427c4 --- /dev/null +++ b/Lib/idlelib/percolator.py @@ -0,0 +1,120 @@ +from idlelib.delegator import Delegator +from idlelib.redirector import WidgetRedirector + + +class Percolator: + + def __init__(self, text): + # XXX would be nice to inherit from Delegator + self.text = text + self.redir = WidgetRedirector(text) + self.top = self.bottom = Delegator(text) + self.bottom.insert = self.redir.register("insert", self.insert) + self.bottom.delete = self.redir.register("delete", self.delete) + self.filters = [] + + def close(self): + while self.top is not self.bottom: + self.removefilter(self.top) + self.top = None + self.bottom.setdelegate(None) + self.bottom = None + self.redir.close() + self.redir = None + self.text = None + + def insert(self, index, chars, tags=None): + # Could go away if inheriting from Delegator + self.top.insert(index, chars, tags) + + def delete(self, index1, index2=None): + # Could go away if inheriting from Delegator + self.top.delete(index1, index2) + + def insertfilter(self, filter): + # Perhaps rename to pushfilter()? + assert isinstance(filter, Delegator) + assert filter.delegate is None + filter.setdelegate(self.top) + self.top = filter + + def insertfilterafter(self, filter, after): + assert isinstance(filter, Delegator) + assert isinstance(after, Delegator) + assert filter.delegate is None + + f = self.top + f.resetcache() + while f is not after: + assert f is not self.bottom + f = f.delegate + f.resetcache() + + filter.setdelegate(f.delegate) + f.setdelegate(filter) + + def removefilter(self, filter): + # XXX Perhaps should only support popfilter()? + assert isinstance(filter, Delegator) + assert filter.delegate is not None + f = self.top + if f is filter: + self.top = filter.delegate + filter.setdelegate(None) + else: + while f.delegate is not filter: + assert f is not self.bottom + f.resetcache() + f = f.delegate + f.setdelegate(filter.delegate) + filter.setdelegate(None) + + +def _percolator(parent): # htest # + import tkinter as tk + + class Tracer(Delegator): + def __init__(self, name): + self.name = name + Delegator.__init__(self, None) + + def insert(self, *args): + print(self.name, ": insert", args) + self.delegate.insert(*args) + + def delete(self, *args): + print(self.name, ": delete", args) + self.delegate.delete(*args) + + top = tk.Toplevel(parent) + top.title("Test Percolator") + x, y = map(int, parent.geometry().split('+')[1:]) + top.geometry("+%d+%d" % (x, y + 175)) + text = tk.Text(top) + p = Percolator(text) + pin = p.insertfilter + pout = p.removefilter + t1 = Tracer("t1") + t2 = Tracer("t2") + + def toggle1(): + (pin if var1.get() else pout)(t1) + def toggle2(): + (pin if var2.get() else pout)(t2) + + text.pack() + text.focus_set() + var1 = tk.IntVar(parent) + cb1 = tk.Checkbutton(top, text="Tracer1", command=toggle1, variable=var1) + cb1.pack() + var2 = tk.IntVar(parent) + cb2 = tk.Checkbutton(top, text="Tracer2", command=toggle2, variable=var2) + cb2.pack() + + +if __name__ == "__main__": + from unittest import main + main('idlelib.idle_test.test_percolator', verbosity=2, exit=False) + + from idlelib.idle_test.htest import run + run(_percolator) diff --git a/Lib/idlelib/pyparse.py b/Lib/idlelib/pyparse.py new file mode 100644 index 000000000..8545c63e1 --- /dev/null +++ b/Lib/idlelib/pyparse.py @@ -0,0 +1,589 @@ +"""Define partial Python code Parser used by editor and hyperparser. + +Instances of ParseMap are used with str.translate. + +The following bound search and match functions are defined: +_synchre - start of popular statement; +_junkre - whitespace or comment line; +_match_stringre: string, possibly without closer; +_itemre - line that may have bracket structure start; +_closere - line that must be followed by dedent. +_chew_ordinaryre - non-special characters. +""" +import re + +# Reason last statement is continued (or C_NONE if it's not). +(C_NONE, C_BACKSLASH, C_STRING_FIRST_LINE, + C_STRING_NEXT_LINES, C_BRACKET) = range(5) + +# Find what looks like the start of a popular statement. + +_synchre = re.compile(r""" + ^ + [ \t]* + (?: while + | else + | def + | return + | assert + | break + | class + | continue + | elif + | try + | except + | raise + | import + | yield + ) + \b +""", re.VERBOSE | re.MULTILINE).search + +# Match blank line or non-indenting comment line. + +_junkre = re.compile(r""" + [ \t]* + (?: \# \S .* )? + \n +""", re.VERBOSE).match + +# Match any flavor of string; the terminating quote is optional +# so that we're robust in the face of incomplete program text. + +_match_stringre = re.compile(r""" + \""" [^"\\]* (?: + (?: \\. | "(?!"") ) + [^"\\]* + )* + (?: \""" )? + +| " [^"\\\n]* (?: \\. [^"\\\n]* )* "? + +| ''' [^'\\]* (?: + (?: \\. | '(?!'') ) + [^'\\]* + )* + (?: ''' )? + +| ' [^'\\\n]* (?: \\. [^'\\\n]* )* '? +""", re.VERBOSE | re.DOTALL).match + +# Match a line that starts with something interesting; +# used to find the first item of a bracket structure. + +_itemre = re.compile(r""" + [ \t]* + [^\s#\\] # if we match, m.end()-1 is the interesting char +""", re.VERBOSE).match + +# Match start of statements that should be followed by a dedent. + +_closere = re.compile(r""" + \s* + (?: return + | break + | continue + | raise + | pass + ) + \b +""", re.VERBOSE).match + +# Chew up non-special chars as quickly as possible. If match is +# successful, m.end() less 1 is the index of the last boring char +# matched. If match is unsuccessful, the string starts with an +# interesting char. + +_chew_ordinaryre = re.compile(r""" + [^[\](){}#'"\\]+ +""", re.VERBOSE).match + + +class ParseMap(dict): + r"""Dict subclass that maps anything not in dict to 'x'. + + This is designed to be used with str.translate in study1. + Anything not specifically mapped otherwise becomes 'x'. + Example: replace everything except whitespace with 'x'. + + >>> keepwhite = ParseMap((ord(c), ord(c)) for c in ' \t\n\r') + >>> "a + b\tc\nd".translate(keepwhite) + 'x x x\tx\nx' + """ + # Calling this triples access time; see bpo-32940 + def __missing__(self, key): + return 120 # ord('x') + + +# Map all ascii to 120 to avoid __missing__ call, then replace some. +trans = ParseMap.fromkeys(range(128), 120) +trans.update((ord(c), ord('(')) for c in "({[") # open brackets => '('; +trans.update((ord(c), ord(')')) for c in ")}]") # close brackets => ')'. +trans.update((ord(c), ord(c)) for c in "\"'\\\n#") # Keep these. + + +class Parser: + + def __init__(self, indentwidth, tabwidth): + self.indentwidth = indentwidth + self.tabwidth = tabwidth + + def set_code(self, s): + assert len(s) == 0 or s[-1] == '\n' + self.code = s + self.study_level = 0 + + def find_good_parse_start(self, is_char_in_string): + """ + Return index of a good place to begin parsing, as close to the + end of the string as possible. This will be the start of some + popular stmt like "if" or "def". Return None if none found: + the caller should pass more prior context then, if possible, or + if not (the entire program text up until the point of interest + has already been tried) pass 0 to set_lo(). + + This will be reliable iff given a reliable is_char_in_string() + function, meaning that when it says "no", it's absolutely + guaranteed that the char is not in a string. + """ + code, pos = self.code, None + + # Peek back from the end for a good place to start, + # but don't try too often; pos will be left None, or + # bumped to a legitimate synch point. + limit = len(code) + for tries in range(5): + i = code.rfind(":\n", 0, limit) + if i < 0: + break + i = code.rfind('\n', 0, i) + 1 # start of colon line (-1+1=0) + m = _synchre(code, i, limit) + if m and not is_char_in_string(m.start()): + pos = m.start() + break + limit = i + if pos is None: + # Nothing looks like a block-opener, or stuff does + # but is_char_in_string keeps returning true; most likely + # we're in or near a giant string, the colorizer hasn't + # caught up enough to be helpful, or there simply *aren't* + # any interesting stmts. In any of these cases we're + # going to have to parse the whole thing to be sure, so + # give it one last try from the start, but stop wasting + # time here regardless of the outcome. + m = _synchre(code) + if m and not is_char_in_string(m.start()): + pos = m.start() + return pos + + # Peeking back worked; look forward until _synchre no longer + # matches. + i = pos + 1 + while m := _synchre(code, i): + s, i = m.span() + if not is_char_in_string(s): + pos = s + return pos + + def set_lo(self, lo): + """ Throw away the start of the string. + + Intended to be called with the result of find_good_parse_start(). + """ + assert lo == 0 or self.code[lo-1] == '\n' + if lo > 0: + self.code = self.code[lo:] + + def _study1(self): + """Find the line numbers of non-continuation lines. + + As quickly as humanly possible <wink>, find the line numbers (0- + based) of the non-continuation lines. + Creates self.{goodlines, continuation}. + """ + if self.study_level >= 1: + return + self.study_level = 1 + + # Map all uninteresting characters to "x", all open brackets + # to "(", all close brackets to ")", then collapse runs of + # uninteresting characters. This can cut the number of chars + # by a factor of 10-40, and so greatly speed the following loop. + code = self.code + code = code.translate(trans) + code = code.replace('xxxxxxxx', 'x') + code = code.replace('xxxx', 'x') + code = code.replace('xx', 'x') + code = code.replace('xx', 'x') + code = code.replace('\nx', '\n') + # Replacing x\n with \n would be incorrect because + # x may be preceded by a backslash. + + # March over the squashed version of the program, accumulating + # the line numbers of non-continued stmts, and determining + # whether & why the last stmt is a continuation. + continuation = C_NONE + level = lno = 0 # level is nesting level; lno is line number + self.goodlines = goodlines = [0] + push_good = goodlines.append + i, n = 0, len(code) + while i < n: + ch = code[i] + i = i+1 + + # cases are checked in decreasing order of frequency + if ch == 'x': + continue + + if ch == '\n': + lno = lno + 1 + if level == 0: + push_good(lno) + # else we're in an unclosed bracket structure + continue + + if ch == '(': + level = level + 1 + continue + + if ch == ')': + if level: + level = level - 1 + # else the program is invalid, but we can't complain + continue + + if ch == '"' or ch == "'": + # consume the string + quote = ch + if code[i-1:i+2] == quote * 3: + quote = quote * 3 + firstlno = lno + w = len(quote) - 1 + i = i+w + while i < n: + ch = code[i] + i = i+1 + + if ch == 'x': + continue + + if code[i-1:i+w] == quote: + i = i+w + break + + if ch == '\n': + lno = lno + 1 + if w == 0: + # unterminated single-quoted string + if level == 0: + push_good(lno) + break + continue + + if ch == '\\': + assert i < n + if code[i] == '\n': + lno = lno + 1 + i = i+1 + continue + + # else comment char or paren inside string + + else: + # didn't break out of the loop, so we're still + # inside a string + if (lno - 1) == firstlno: + # before the previous \n in code, we were in the first + # line of the string + continuation = C_STRING_FIRST_LINE + else: + continuation = C_STRING_NEXT_LINES + continue # with outer loop + + if ch == '#': + # consume the comment + i = code.find('\n', i) + assert i >= 0 + continue + + assert ch == '\\' + assert i < n + if code[i] == '\n': + lno = lno + 1 + if i+1 == n: + continuation = C_BACKSLASH + i = i+1 + + # The last stmt may be continued for all 3 reasons. + # String continuation takes precedence over bracket + # continuation, which beats backslash continuation. + if (continuation != C_STRING_FIRST_LINE + and continuation != C_STRING_NEXT_LINES and level > 0): + continuation = C_BRACKET + self.continuation = continuation + + # Push the final line number as a sentinel value, regardless of + # whether it's continued. + assert (continuation == C_NONE) == (goodlines[-1] == lno) + if goodlines[-1] != lno: + push_good(lno) + + def get_continuation_type(self): + self._study1() + return self.continuation + + def _study2(self): + """ + study1 was sufficient to determine the continuation status, + but doing more requires looking at every character. study2 + does this for the last interesting statement in the block. + Creates: + self.stmt_start, stmt_end + slice indices of last interesting stmt + self.stmt_bracketing + the bracketing structure of the last interesting stmt; for + example, for the statement "say(boo) or die", + stmt_bracketing will be ((0, 0), (0, 1), (2, 0), (2, 1), + (4, 0)). Strings and comments are treated as brackets, for + the matter. + self.lastch + last interesting character before optional trailing comment + self.lastopenbracketpos + if continuation is C_BRACKET, index of last open bracket + """ + if self.study_level >= 2: + return + self._study1() + self.study_level = 2 + + # Set p and q to slice indices of last interesting stmt. + code, goodlines = self.code, self.goodlines + i = len(goodlines) - 1 # Index of newest line. + p = len(code) # End of goodlines[i] + while i: + assert p + # Make p be the index of the stmt at line number goodlines[i]. + # Move p back to the stmt at line number goodlines[i-1]. + q = p + for nothing in range(goodlines[i-1], goodlines[i]): + # tricky: sets p to 0 if no preceding newline + p = code.rfind('\n', 0, p-1) + 1 + # The stmt code[p:q] isn't a continuation, but may be blank + # or a non-indenting comment line. + if _junkre(code, p): + i = i-1 + else: + break + if i == 0: + # nothing but junk! + assert p == 0 + q = p + self.stmt_start, self.stmt_end = p, q + + # Analyze this stmt, to find the last open bracket (if any) + # and last interesting character (if any). + lastch = "" + stack = [] # stack of open bracket indices + push_stack = stack.append + bracketing = [(p, 0)] + while p < q: + # suck up all except ()[]{}'"#\\ + m = _chew_ordinaryre(code, p, q) + if m: + # we skipped at least one boring char + newp = m.end() + # back up over totally boring whitespace + i = newp - 1 # index of last boring char + while i >= p and code[i] in " \t\n": + i = i-1 + if i >= p: + lastch = code[i] + p = newp + if p >= q: + break + + ch = code[p] + + if ch in "([{": + push_stack(p) + bracketing.append((p, len(stack))) + lastch = ch + p = p+1 + continue + + if ch in ")]}": + if stack: + del stack[-1] + lastch = ch + p = p+1 + bracketing.append((p, len(stack))) + continue + + if ch == '"' or ch == "'": + # consume string + # Note that study1 did this with a Python loop, but + # we use a regexp here; the reason is speed in both + # cases; the string may be huge, but study1 pre-squashed + # strings to a couple of characters per line. study1 + # also needed to keep track of newlines, and we don't + # have to. + bracketing.append((p, len(stack)+1)) + lastch = ch + p = _match_stringre(code, p, q).end() + bracketing.append((p, len(stack))) + continue + + if ch == '#': + # consume comment and trailing newline + bracketing.append((p, len(stack)+1)) + p = code.find('\n', p, q) + 1 + assert p > 0 + bracketing.append((p, len(stack))) + continue + + assert ch == '\\' + p = p+1 # beyond backslash + assert p < q + if code[p] != '\n': + # the program is invalid, but can't complain + lastch = ch + code[p] + p = p+1 # beyond escaped char + + # end while p < q: + + self.lastch = lastch + self.lastopenbracketpos = stack[-1] if stack else None + self.stmt_bracketing = tuple(bracketing) + + def compute_bracket_indent(self): + """Return number of spaces the next line should be indented. + + Line continuation must be C_BRACKET. + """ + self._study2() + assert self.continuation == C_BRACKET + j = self.lastopenbracketpos + code = self.code + n = len(code) + origi = i = code.rfind('\n', 0, j) + 1 + j = j+1 # one beyond open bracket + # find first list item; set i to start of its line + while j < n: + m = _itemre(code, j) + if m: + j = m.end() - 1 # index of first interesting char + extra = 0 + break + else: + # this line is junk; advance to next line + i = j = code.find('\n', j) + 1 + else: + # nothing interesting follows the bracket; + # reproduce the bracket line's indentation + a level + j = i = origi + while code[j] in " \t": + j = j+1 + extra = self.indentwidth + return len(code[i:j].expandtabs(self.tabwidth)) + extra + + def get_num_lines_in_stmt(self): + """Return number of physical lines in last stmt. + + The statement doesn't have to be an interesting statement. This is + intended to be called when continuation is C_BACKSLASH. + """ + self._study1() + goodlines = self.goodlines + return goodlines[-1] - goodlines[-2] + + def compute_backslash_indent(self): + """Return number of spaces the next line should be indented. + + Line continuation must be C_BACKSLASH. Also assume that the new + line is the first one following the initial line of the stmt. + """ + self._study2() + assert self.continuation == C_BACKSLASH + code = self.code + i = self.stmt_start + while code[i] in " \t": + i = i+1 + startpos = i + + # See whether the initial line starts an assignment stmt; i.e., + # look for an = operator + endpos = code.find('\n', startpos) + 1 + found = level = 0 + while i < endpos: + ch = code[i] + if ch in "([{": + level = level + 1 + i = i+1 + elif ch in ")]}": + if level: + level = level - 1 + i = i+1 + elif ch == '"' or ch == "'": + i = _match_stringre(code, i, endpos).end() + elif ch == '#': + # This line is unreachable because the # makes a comment of + # everything after it. + break + elif level == 0 and ch == '=' and \ + (i == 0 or code[i-1] not in "=<>!") and \ + code[i+1] != '=': + found = 1 + break + else: + i = i+1 + + if found: + # found a legit =, but it may be the last interesting + # thing on the line + i = i+1 # move beyond the = + found = re.match(r"\s*\\", code[i:endpos]) is None + + if not found: + # oh well ... settle for moving beyond the first chunk + # of non-whitespace chars + i = startpos + while code[i] not in " \t\n": + i = i+1 + + return len(code[self.stmt_start:i].expandtabs(\ + self.tabwidth)) + 1 + + def get_base_indent_string(self): + """Return the leading whitespace on the initial line of the last + interesting stmt. + """ + self._study2() + i, n = self.stmt_start, self.stmt_end + j = i + code = self.code + while j < n and code[j] in " \t": + j = j + 1 + return code[i:j] + + def is_block_opener(self): + "Return True if the last interesting statement opens a block." + self._study2() + return self.lastch == ':' + + def is_block_closer(self): + "Return True if the last interesting statement closes a block." + self._study2() + return _closere(self.code, self.stmt_start) is not None + + def get_last_stmt_bracketing(self): + """Return bracketing structure of the last interesting statement. + + The returned tuple is in the format defined in _study2(). + """ + self._study2() + return self.stmt_bracketing + + +if __name__ == '__main__': + from unittest import main + main('idlelib.idle_test.test_pyparse', verbosity=2) diff --git a/Lib/idlelib/pyshell.py b/Lib/idlelib/pyshell.py new file mode 100755 index 000000000..1b7c2af1a --- /dev/null +++ b/Lib/idlelib/pyshell.py @@ -0,0 +1,1699 @@ +#! /usr/bin/env python3 + +import sys +if __name__ == "__main__": + sys.modules['idlelib.pyshell'] = sys.modules['__main__'] + +try: + from tkinter import * +except ImportError: + print("** IDLE can't import Tkinter.\n" + "Your Python may not be configured for Tk. **", file=sys.__stderr__) + raise SystemExit(1) + +if sys.platform == 'win32': + from idlelib.util import fix_win_hidpi + fix_win_hidpi() + +from tkinter import messagebox + +from code import InteractiveInterpreter +import itertools +import linecache +import os +import os.path +import re +import socket +import subprocess +from textwrap import TextWrapper +import threading +import time +import tokenize +import warnings + +from idlelib.colorizer import ColorDelegator +from idlelib.config import idleConf +from idlelib.delegator import Delegator +from idlelib import debugger +from idlelib import debugger_r +from idlelib.editor import EditorWindow, fixwordbreaks +from idlelib.filelist import FileList +from idlelib.outwin import OutputWindow +from idlelib import replace +from idlelib import rpc +from idlelib.run import idle_formatwarning, StdInputFile, StdOutputFile +from idlelib.undo import UndoDelegator + +# Default for testing; defaults to True in main() for running. +use_subprocess = False + +HOST = '127.0.0.1' # python execution server on localhost loopback +PORT = 0 # someday pass in host, port for remote debug capability + +try: # In case IDLE started with -n. + eof = 'Ctrl-D (end-of-file)' + exit.eof = eof + quit.eof = eof +except NameError: # In case python started with -S. + pass + +# Override warnings module to write to warning_stream. Initialize to send IDLE +# internal warnings to the console. ScriptBinding.check_syntax() will +# temporarily redirect the stream to the shell window to display warnings when +# checking user's code. +warning_stream = sys.__stderr__ # None, at least on Windows, if no console. + +def idle_showwarning( + message, category, filename, lineno, file=None, line=None): + """Show Idle-format warning (after replacing warnings.showwarning). + + The differences are the formatter called, the file=None replacement, + which can be None, the capture of the consequence AttributeError, + and the output of a hard-coded prompt. + """ + if file is None: + file = warning_stream + try: + file.write(idle_formatwarning( + message, category, filename, lineno, line=line)) + file.write(">>> ") + except (AttributeError, OSError): + pass # if file (probably __stderr__) is invalid, skip warning. + +_warnings_showwarning = None + +def capture_warnings(capture): + "Replace warning.showwarning with idle_showwarning, or reverse." + + global _warnings_showwarning + if capture: + if _warnings_showwarning is None: + _warnings_showwarning = warnings.showwarning + warnings.showwarning = idle_showwarning + else: + if _warnings_showwarning is not None: + warnings.showwarning = _warnings_showwarning + _warnings_showwarning = None + +capture_warnings(True) + +def extended_linecache_checkcache(filename=None, + orig_checkcache=linecache.checkcache): + """Extend linecache.checkcache to preserve the <pyshell#...> entries + + Rather than repeating the linecache code, patch it to save the + <pyshell#...> entries, call the original linecache.checkcache() + (skipping them), and then restore the saved entries. + + orig_checkcache is bound at definition time to the original + method, allowing it to be patched. + """ + cache = linecache.cache + save = {} + for key in list(cache): + if key[:1] + key[-1:] == '<>': + save[key] = cache.pop(key) + orig_checkcache(filename) + cache.update(save) + +# Patch linecache.checkcache(): +linecache.checkcache = extended_linecache_checkcache + + +class PyShellEditorWindow(EditorWindow): + "Regular text edit window in IDLE, supports breakpoints" + + def __init__(self, *args): + self.breakpoints = [] + EditorWindow.__init__(self, *args) + self.text.bind("<<set-breakpoint>>", self.set_breakpoint_event) + self.text.bind("<<clear-breakpoint>>", self.clear_breakpoint_event) + self.text.bind("<<open-python-shell>>", self.flist.open_shell) + + #TODO: don't read/write this from/to .idlerc when testing + self.breakpointPath = os.path.join( + idleConf.userdir, 'breakpoints.lst') + # whenever a file is changed, restore breakpoints + def filename_changed_hook(old_hook=self.io.filename_change_hook, + self=self): + self.restore_file_breaks() + old_hook() + self.io.set_filename_change_hook(filename_changed_hook) + if self.io.filename: + self.restore_file_breaks() + self.color_breakpoint_text() + + rmenu_specs = [ + ("Cut", "<<cut>>", "rmenu_check_cut"), + ("Copy", "<<copy>>", "rmenu_check_copy"), + ("Paste", "<<paste>>", "rmenu_check_paste"), + (None, None, None), + ("Set Breakpoint", "<<set-breakpoint>>", None), + ("Clear Breakpoint", "<<clear-breakpoint>>", None) + ] + + def color_breakpoint_text(self, color=True): + "Turn colorizing of breakpoint text on or off" + if self.io is None: + # possible due to update in restore_file_breaks + return + if color: + theme = idleConf.CurrentTheme() + cfg = idleConf.GetHighlight(theme, "break") + else: + cfg = {'foreground': '', 'background': ''} + self.text.tag_config('BREAK', cfg) + + def set_breakpoint(self, lineno): + text = self.text + filename = self.io.filename + text.tag_add("BREAK", "%d.0" % lineno, "%d.0" % (lineno+1)) + try: + self.breakpoints.index(lineno) + except ValueError: # only add if missing, i.e. do once + self.breakpoints.append(lineno) + try: # update the subprocess debugger + debug = self.flist.pyshell.interp.debugger + debug.set_breakpoint(filename, lineno) + except: # but debugger may not be active right now.... + pass + + def set_breakpoint_event(self, event=None): + text = self.text + filename = self.io.filename + if not filename: + text.bell() + return + lineno = int(float(text.index("insert"))) + self.set_breakpoint(lineno) + + def clear_breakpoint_event(self, event=None): + text = self.text + filename = self.io.filename + if not filename: + text.bell() + return + lineno = int(float(text.index("insert"))) + try: + self.breakpoints.remove(lineno) + except: + pass + text.tag_remove("BREAK", "insert linestart",\ + "insert lineend +1char") + try: + debug = self.flist.pyshell.interp.debugger + debug.clear_breakpoint(filename, lineno) + except: + pass + + def clear_file_breaks(self): + if self.breakpoints: + text = self.text + filename = self.io.filename + if not filename: + text.bell() + return + self.breakpoints = [] + text.tag_remove("BREAK", "1.0", END) + try: + debug = self.flist.pyshell.interp.debugger + debug.clear_file_breaks(filename) + except: + pass + + def store_file_breaks(self): + "Save breakpoints when file is saved" + # XXX 13 Dec 2002 KBK Currently the file must be saved before it can + # be run. The breaks are saved at that time. If we introduce + # a temporary file save feature the save breaks functionality + # needs to be re-verified, since the breaks at the time the + # temp file is created may differ from the breaks at the last + # permanent save of the file. Currently, a break introduced + # after a save will be effective, but not persistent. + # This is necessary to keep the saved breaks synched with the + # saved file. + # + # Breakpoints are set as tagged ranges in the text. + # Since a modified file has to be saved before it is + # run, and since self.breakpoints (from which the subprocess + # debugger is loaded) is updated during the save, the visible + # breaks stay synched with the subprocess even if one of these + # unexpected breakpoint deletions occurs. + breaks = self.breakpoints + filename = self.io.filename + try: + with open(self.breakpointPath) as fp: + lines = fp.readlines() + except OSError: + lines = [] + try: + with open(self.breakpointPath, "w") as new_file: + for line in lines: + if not line.startswith(filename + '='): + new_file.write(line) + self.update_breakpoints() + breaks = self.breakpoints + if breaks: + new_file.write(filename + '=' + str(breaks) + '\n') + except OSError as err: + if not getattr(self.root, "breakpoint_error_displayed", False): + self.root.breakpoint_error_displayed = True + messagebox.showerror(title='IDLE Error', + message='Unable to update breakpoint list:\n%s' + % str(err), + parent=self.text) + + def restore_file_breaks(self): + self.text.update() # this enables setting "BREAK" tags to be visible + if self.io is None: + # can happen if IDLE closes due to the .update() call + return + filename = self.io.filename + if filename is None: + return + if os.path.isfile(self.breakpointPath): + with open(self.breakpointPath) as fp: + lines = fp.readlines() + for line in lines: + if line.startswith(filename + '='): + breakpoint_linenumbers = eval(line[len(filename)+1:]) + for breakpoint_linenumber in breakpoint_linenumbers: + self.set_breakpoint(breakpoint_linenumber) + + def update_breakpoints(self): + "Retrieves all the breakpoints in the current window" + text = self.text + ranges = text.tag_ranges("BREAK") + linenumber_list = self.ranges_to_linenumbers(ranges) + self.breakpoints = linenumber_list + + def ranges_to_linenumbers(self, ranges): + lines = [] + for index in range(0, len(ranges), 2): + lineno = int(float(ranges[index].string)) + end = int(float(ranges[index+1].string)) + while lineno < end: + lines.append(lineno) + lineno += 1 + return lines + +# XXX 13 Dec 2002 KBK Not used currently +# def saved_change_hook(self): +# "Extend base method - clear breaks if module is modified" +# if not self.get_saved(): +# self.clear_file_breaks() +# EditorWindow.saved_change_hook(self) + + def _close(self): + "Extend base method - clear breaks when module is closed" + self.clear_file_breaks() + EditorWindow._close(self) + + +class PyShellFileList(FileList): + "Extend base class: IDLE supports a shell and breakpoints" + + # override FileList's class variable, instances return PyShellEditorWindow + # instead of EditorWindow when new edit windows are created. + EditorWindow = PyShellEditorWindow + + pyshell = None + + def open_shell(self, event=None): + if self.pyshell: + self.pyshell.top.wakeup() + else: + self.pyshell = PyShell(self) + if self.pyshell: + if not self.pyshell.begin(): + return None + return self.pyshell + + +class ModifiedColorDelegator(ColorDelegator): + "Extend base class: colorizer for the shell window itself" + def recolorize_main(self): + self.tag_remove("TODO", "1.0", "iomark") + self.tag_add("SYNC", "1.0", "iomark") + ColorDelegator.recolorize_main(self) + + def removecolors(self): + # Don't remove shell color tags before "iomark" + for tag in self.tagdefs: + self.tag_remove(tag, "iomark", "end") + + +class ModifiedUndoDelegator(UndoDelegator): + "Extend base class: forbid insert/delete before the I/O mark" + def insert(self, index, chars, tags=None): + try: + if self.delegate.compare(index, "<", "iomark"): + self.delegate.bell() + return + except TclError: + pass + UndoDelegator.insert(self, index, chars, tags) + + def delete(self, index1, index2=None): + try: + if self.delegate.compare(index1, "<", "iomark"): + self.delegate.bell() + return + except TclError: + pass + UndoDelegator.delete(self, index1, index2) + + def undo_event(self, event): + # Temporarily monkey-patch the delegate's .insert() method to + # always use the "stdin" tag. This is needed for undo-ing + # deletions to preserve the "stdin" tag, because UndoDelegator + # doesn't preserve tags for deleted text. + orig_insert = self.delegate.insert + self.delegate.insert = \ + lambda index, chars: orig_insert(index, chars, "stdin") + try: + super().undo_event(event) + finally: + self.delegate.insert = orig_insert + + +class UserInputTaggingDelegator(Delegator): + """Delegator used to tag user input with "stdin".""" + def insert(self, index, chars, tags=None): + if tags is None: + tags = "stdin" + self.delegate.insert(index, chars, tags) + + +class MyRPCClient(rpc.RPCClient): + + def handle_EOF(self): + "Override the base class - just re-raise EOFError" + raise EOFError + +def restart_line(width, filename): # See bpo-38141. + """Return width long restart line formatted with filename. + + Fill line with balanced '='s, with any extras and at least one at + the beginning. Do not end with a trailing space. + """ + tag = f"= RESTART: {filename or 'Shell'} =" + if width >= len(tag): + div, mod = divmod((width -len(tag)), 2) + return f"{(div+mod)*'='}{tag}{div*'='}" + else: + return tag[:-2] # Remove ' ='. + + +class ModifiedInterpreter(InteractiveInterpreter): + + def __init__(self, tkconsole): + self.tkconsole = tkconsole + locals = sys.modules['__main__'].__dict__ + InteractiveInterpreter.__init__(self, locals=locals) + self.restarting = False + self.subprocess_arglist = None + self.port = PORT + self.original_compiler_flags = self.compile.compiler.flags + + _afterid = None + rpcclt = None + rpcsubproc = None + + def spawn_subprocess(self): + if self.subprocess_arglist is None: + self.subprocess_arglist = self.build_subprocess_arglist() + # gh-127060: Disable traceback colors + env = dict(os.environ, TERM='dumb') + self.rpcsubproc = subprocess.Popen(self.subprocess_arglist, env=env) + + def build_subprocess_arglist(self): + assert (self.port!=0), ( + "Socket should have been assigned a port number.") + w = ['-W' + s for s in sys.warnoptions] + # Maybe IDLE is installed and is being accessed via sys.path, + # or maybe it's not installed and the idle.py script is being + # run from the IDLE source directory. + del_exitf = idleConf.GetOption('main', 'General', 'delete-exitfunc', + default=False, type='bool') + command = f"__import__('idlelib.run').run.main({del_exitf!r})" + return [sys.executable] + w + ["-c", command, str(self.port)] + + def start_subprocess(self): + addr = (HOST, self.port) + # GUI makes several attempts to acquire socket, listens for connection + for i in range(3): + time.sleep(i) + try: + self.rpcclt = MyRPCClient(addr) + break + except OSError: + pass + else: + self.display_port_binding_error() + return None + # if PORT was 0, system will assign an 'ephemeral' port. Find it out: + self.port = self.rpcclt.listening_sock.getsockname()[1] + # if PORT was not 0, probably working with a remote execution server + if PORT != 0: + # To allow reconnection within the 2MSL wait (cf. Stevens TCP + # V1, 18.6), set SO_REUSEADDR. Note that this can be problematic + # on Windows since the implementation allows two active sockets on + # the same address! + self.rpcclt.listening_sock.setsockopt(socket.SOL_SOCKET, + socket.SO_REUSEADDR, 1) + self.spawn_subprocess() + #time.sleep(20) # test to simulate GUI not accepting connection + # Accept the connection from the Python execution server + self.rpcclt.listening_sock.settimeout(10) + try: + self.rpcclt.accept() + except TimeoutError: + self.display_no_subprocess_error() + return None + self.rpcclt.register("console", self.tkconsole) + self.rpcclt.register("stdin", self.tkconsole.stdin) + self.rpcclt.register("stdout", self.tkconsole.stdout) + self.rpcclt.register("stderr", self.tkconsole.stderr) + self.rpcclt.register("flist", self.tkconsole.flist) + self.rpcclt.register("linecache", linecache) + self.rpcclt.register("interp", self) + self.transfer_path(with_cwd=True) + self.poll_subprocess() + return self.rpcclt + + def restart_subprocess(self, with_cwd=False, filename=''): + if self.restarting: + return self.rpcclt + self.restarting = True + # close only the subprocess debugger + debug = self.getdebugger() + if debug: + try: + # Only close subprocess debugger, don't unregister gui_adap! + debugger_r.close_subprocess_debugger(self.rpcclt) + except: + pass + # Kill subprocess, spawn a new one, accept connection. + self.rpcclt.close() + self.terminate_subprocess() + console = self.tkconsole + was_executing = console.executing + console.executing = False + self.spawn_subprocess() + try: + self.rpcclt.accept() + except TimeoutError: + self.display_no_subprocess_error() + return None + self.transfer_path(with_cwd=with_cwd) + console.stop_readline() + # annotate restart in shell window and mark it + console.text.delete("iomark", "end-1c") + console.write('\n') + console.write(restart_line(console.width, filename)) + console.text.mark_set("restart", "end-1c") + console.text.mark_gravity("restart", "left") + if not filename: + console.showprompt() + # restart subprocess debugger + if debug: + # Restarted debugger connects to current instance of debug GUI + debugger_r.restart_subprocess_debugger(self.rpcclt) + # reload remote debugger breakpoints for all PyShellEditWindows + debug.load_breakpoints() + self.compile.compiler.flags = self.original_compiler_flags + self.restarting = False + return self.rpcclt + + def __request_interrupt(self): + self.rpcclt.remotecall("exec", "interrupt_the_server", (), {}) + + def interrupt_subprocess(self): + threading.Thread(target=self.__request_interrupt).start() + + def kill_subprocess(self): + if self._afterid is not None: + self.tkconsole.text.after_cancel(self._afterid) + try: + self.rpcclt.listening_sock.close() + except AttributeError: # no socket + pass + try: + self.rpcclt.close() + except AttributeError: # no socket + pass + self.terminate_subprocess() + self.tkconsole.executing = False + self.rpcclt = None + + def terminate_subprocess(self): + "Make sure subprocess is terminated" + try: + self.rpcsubproc.kill() + except OSError: + # process already terminated + return + else: + try: + self.rpcsubproc.wait() + except OSError: + return + + def transfer_path(self, with_cwd=False): + if with_cwd: # Issue 13506 + path = [''] # include Current Working Directory + path.extend(sys.path) + else: + path = sys.path + + self.runcommand("""if 1: + import sys as _sys + _sys.path = {!r} + del _sys + \n""".format(path)) + + active_seq = None + + def poll_subprocess(self): + clt = self.rpcclt + if clt is None: + return + try: + response = clt.pollresponse(self.active_seq, wait=0.05) + except (EOFError, OSError, KeyboardInterrupt): + # lost connection or subprocess terminated itself, restart + # [the KBI is from rpc.SocketIO.handle_EOF()] + if self.tkconsole.closing: + return + response = None + self.restart_subprocess() + if response: + self.tkconsole.resetoutput() + self.active_seq = None + how, what = response + console = self.tkconsole.console + if how == "OK": + if what is not None: + print(repr(what), file=console) + elif how == "EXCEPTION": + if self.tkconsole.getvar("<<toggle-jit-stack-viewer>>"): + self.remote_stack_viewer() + elif how == "ERROR": + errmsg = "pyshell.ModifiedInterpreter: Subprocess ERROR:\n" + print(errmsg, what, file=sys.__stderr__) + print(errmsg, what, file=console) + # we received a response to the currently active seq number: + try: + self.tkconsole.endexecuting() + except AttributeError: # shell may have closed + pass + # Reschedule myself + if not self.tkconsole.closing: + self._afterid = self.tkconsole.text.after( + self.tkconsole.pollinterval, self.poll_subprocess) + + debugger = None + + def setdebugger(self, debugger): + self.debugger = debugger + + def getdebugger(self): + return self.debugger + + def open_remote_stack_viewer(self): + """Initiate the remote stack viewer from a separate thread. + + This method is called from the subprocess, and by returning from this + method we allow the subprocess to unblock. After a bit the shell + requests the subprocess to open the remote stack viewer which returns a + static object looking at the last exception. It is queried through + the RPC mechanism. + + """ + self.tkconsole.text.after(300, self.remote_stack_viewer) + return + + def remote_stack_viewer(self): + from idlelib import debugobj_r + oid = self.rpcclt.remotequeue("exec", "stackviewer", ("flist",), {}) + if oid is None: + self.tkconsole.root.bell() + return + item = debugobj_r.StubObjectTreeItem(self.rpcclt, oid) + from idlelib.tree import ScrolledCanvas, TreeNode + top = Toplevel(self.tkconsole.root) + theme = idleConf.CurrentTheme() + background = idleConf.GetHighlight(theme, 'normal')['background'] + sc = ScrolledCanvas(top, bg=background, highlightthickness=0) + sc.frame.pack(expand=1, fill="both") + node = TreeNode(sc.canvas, None, item) + node.expand() + # XXX Should GC the remote tree when closing the window + + gid = 0 + + def execsource(self, source): + "Like runsource() but assumes complete exec source" + filename = self.stuffsource(source) + self.execfile(filename, source) + + def execfile(self, filename, source=None): + "Execute an existing file" + if source is None: + with tokenize.open(filename) as fp: + source = fp.read() + if use_subprocess: + source = (f"__file__ = r'''{os.path.abspath(filename)}'''\n" + + source + "\ndel __file__") + try: + code = compile(source, filename, "exec") + except (OverflowError, SyntaxError): + self.tkconsole.resetoutput() + print('*** Error in script or command!\n' + 'Traceback (most recent call last):', + file=self.tkconsole.stderr) + InteractiveInterpreter.showsyntaxerror(self, filename) + self.tkconsole.showprompt() + else: + self.runcode(code) + + def runsource(self, source): + "Extend base class method: Stuff the source in the line cache first" + filename = self.stuffsource(source) + # at the moment, InteractiveInterpreter expects str + assert isinstance(source, str) + # InteractiveInterpreter.runsource() calls its runcode() method, + # which is overridden (see below) + return InteractiveInterpreter.runsource(self, source, filename) + + def stuffsource(self, source): + "Stuff source in the filename cache" + filename = "<pyshell#%d>" % self.gid + self.gid = self.gid + 1 + lines = source.split("\n") + linecache.cache[filename] = len(source)+1, 0, lines, filename + return filename + + def prepend_syspath(self, filename): + "Prepend sys.path with file's directory if not already included" + self.runcommand("""if 1: + _filename = {!r} + import sys as _sys + from os.path import dirname as _dirname + _dir = _dirname(_filename) + if not _dir in _sys.path: + _sys.path.insert(0, _dir) + del _filename, _sys, _dirname, _dir + \n""".format(filename)) + + def showsyntaxerror(self, filename=None, **kwargs): + """Override Interactive Interpreter method: Use Colorizing + + Color the offending position instead of printing it and pointing at it + with a caret. + + """ + tkconsole = self.tkconsole + text = tkconsole.text + text.tag_remove("ERROR", "1.0", "end") + type, value, tb = sys.exc_info() + msg = getattr(value, 'msg', '') or value or "<no detail available>" + lineno = getattr(value, 'lineno', '') or 1 + offset = getattr(value, 'offset', '') or 0 + if offset == 0: + lineno += 1 #mark end of offending line + if lineno == 1: + pos = "iomark + %d chars" % (offset-1) + else: + pos = "iomark linestart + %d lines + %d chars" % \ + (lineno-1, offset-1) + tkconsole.colorize_syntax_error(text, pos) + tkconsole.resetoutput() + self.write("SyntaxError: %s\n" % msg) + tkconsole.showprompt() + + def showtraceback(self): + "Extend base class method to reset output properly" + self.tkconsole.resetoutput() + self.checklinecache() + InteractiveInterpreter.showtraceback(self) + if self.tkconsole.getvar("<<toggle-jit-stack-viewer>>"): + self.tkconsole.open_stack_viewer() + + def checklinecache(self): + "Remove keys other than '<pyshell#n>'." + cache = linecache.cache + for key in list(cache): # Iterate list because mutate cache. + if key[:1] + key[-1:] != "<>": + del cache[key] + + def runcommand(self, code): + "Run the code without invoking the debugger" + # The code better not raise an exception! + if self.tkconsole.executing: + self.display_executing_dialog() + return 0 + if self.rpcclt: + self.rpcclt.remotequeue("exec", "runcode", (code,), {}) + else: + exec(code, self.locals) + return 1 + + def runcode(self, code): + "Override base class method" + if self.tkconsole.executing: + self.restart_subprocess() + self.checklinecache() + debugger = self.debugger + try: + self.tkconsole.beginexecuting() + if not debugger and self.rpcclt is not None: + self.active_seq = self.rpcclt.asyncqueue("exec", "runcode", + (code,), {}) + elif debugger: + debugger.run(code, self.locals) + else: + exec(code, self.locals) + except SystemExit: + if not self.tkconsole.closing: + if messagebox.askyesno( + "Exit?", + "Do you want to exit altogether?", + default="yes", + parent=self.tkconsole.text): + raise + else: + self.showtraceback() + else: + raise + except: + if use_subprocess: + print("IDLE internal error in runcode()", + file=self.tkconsole.stderr) + self.showtraceback() + self.tkconsole.endexecuting() + else: + if self.tkconsole.canceled: + self.tkconsole.canceled = False + print("KeyboardInterrupt", file=self.tkconsole.stderr) + else: + self.showtraceback() + finally: + if not use_subprocess: + try: + self.tkconsole.endexecuting() + except AttributeError: # shell may have closed + pass + + def write(self, s): + "Override base class method" + return self.tkconsole.stderr.write(s) + + def display_port_binding_error(self): + messagebox.showerror( + "Port Binding Error", + "IDLE can't bind to a TCP/IP port, which is necessary to " + "communicate with its Python execution server. This might be " + "because no networking is installed on this computer. " + "Run IDLE with the -n command line switch to start without a " + "subprocess and refer to Help/IDLE Help 'Running without a " + "subprocess' for further details.", + parent=self.tkconsole.text) + + def display_no_subprocess_error(self): + messagebox.showerror( + "Subprocess Connection Error", + "IDLE's subprocess didn't make connection.\n" + "See the 'Startup failure' section of the IDLE doc, online at\n" + "https://docs.python.org/3/library/idle.html#startup-failure", + parent=self.tkconsole.text) + + def display_executing_dialog(self): + messagebox.showerror( + "Already executing", + "The Python Shell window is already executing a command; " + "please wait until it is finished.", + parent=self.tkconsole.text) + + +class PyShell(OutputWindow): + from idlelib.squeezer import Squeezer + + shell_title = "IDLE Shell" + + # Override classes + ColorDelegator = ModifiedColorDelegator + UndoDelegator = ModifiedUndoDelegator + + # Override menus + menu_specs = [ + ("file", "_File"), + ("edit", "_Edit"), + ("debug", "_Debug"), + ("options", "_Options"), + ("window", "_Window"), + ("help", "_Help"), + ] + + # Extend right-click context menu + rmenu_specs = OutputWindow.rmenu_specs + [ + ("Squeeze", "<<squeeze-current-text>>"), + ] + _idx = 1 + len(list(itertools.takewhile( + lambda rmenu_item: rmenu_item[0] != "Copy", rmenu_specs) + )) + rmenu_specs.insert(_idx, ("Copy with prompts", + "<<copy-with-prompts>>", + "rmenu_check_copy")) + del _idx + + allow_line_numbers = False + user_input_insert_tags = "stdin" + + # New classes + from idlelib.history import History + from idlelib.sidebar import ShellSidebar + + def __init__(self, flist=None): + ms = self.menu_specs + if ms[2][0] != "shell": + ms.insert(2, ("shell", "She_ll")) + self.interp = ModifiedInterpreter(self) + if flist is None: + root = Tk() + fixwordbreaks(root) + root.withdraw() + flist = PyShellFileList(root) + + self.shell_sidebar = None # initialized below + + OutputWindow.__init__(self, flist, None, None) + + self.usetabs = False + # indentwidth must be 8 when using tabs. See note in EditorWindow: + self.indentwidth = 4 + + self.sys_ps1 = sys.ps1 if hasattr(sys, 'ps1') else '>>>\n' + self.prompt_last_line = self.sys_ps1.split('\n')[-1] + self.prompt = self.sys_ps1 # Changes when debug active + + text = self.text + text.configure(wrap="char") + text.bind("<<newline-and-indent>>", self.enter_callback) + text.bind("<<plain-newline-and-indent>>", self.linefeed_callback) + text.bind("<<interrupt-execution>>", self.cancel_callback) + text.bind("<<end-of-file>>", self.eof_callback) + text.bind("<<open-stack-viewer>>", self.open_stack_viewer) + text.bind("<<toggle-debugger>>", self.toggle_debugger) + text.bind("<<toggle-jit-stack-viewer>>", self.toggle_jit_stack_viewer) + text.bind("<<copy-with-prompts>>", self.copy_with_prompts_callback) + if use_subprocess: + text.bind("<<view-restart>>", self.view_restart_mark) + text.bind("<<restart-shell>>", self.restart_shell) + self.squeezer = self.Squeezer(self) + text.bind("<<squeeze-current-text>>", + self.squeeze_current_text_event) + + self.save_stdout = sys.stdout + self.save_stderr = sys.stderr + self.save_stdin = sys.stdin + from idlelib import iomenu + self.stdin = StdInputFile(self, "stdin", + iomenu.encoding, iomenu.errors) + self.stdout = StdOutputFile(self, "stdout", + iomenu.encoding, iomenu.errors) + self.stderr = StdOutputFile(self, "stderr", + iomenu.encoding, "backslashreplace") + self.console = StdOutputFile(self, "console", + iomenu.encoding, iomenu.errors) + if not use_subprocess: + sys.stdout = self.stdout + sys.stderr = self.stderr + sys.stdin = self.stdin + try: + # page help() text to shell. + import pydoc # import must be done here to capture i/o rebinding. + # XXX KBK 27Dec07 use text viewer someday, but must work w/o subproc + pydoc.pager = pydoc.plainpager + except: + sys.stderr = sys.__stderr__ + raise + # + self.history = self.History(self.text) + # + self.pollinterval = 50 # millisec + + self.shell_sidebar = self.ShellSidebar(self) + + # Insert UserInputTaggingDelegator at the top of the percolator, + # but make calls to text.insert() skip it. This causes only insert + # events generated in Tcl/Tk to go through this delegator. + self.text.insert = self.per.top.insert + self.per.insertfilter(UserInputTaggingDelegator()) + + if not use_subprocess: + # Menu options "View Last Restart" and "Restart Shell" are disabled + self.update_menu_state("shell", 0, "disabled") + self.update_menu_state("shell", 1, "disabled") + + def ResetFont(self): + super().ResetFont() + + if self.shell_sidebar is not None: + self.shell_sidebar.update_font() + + def ResetColorizer(self): + super().ResetColorizer() + + theme = idleConf.CurrentTheme() + tag_colors = { + "stdin": {'background': None, 'foreground': None}, + "stdout": idleConf.GetHighlight(theme, "stdout"), + "stderr": idleConf.GetHighlight(theme, "stderr"), + "console": idleConf.GetHighlight(theme, "normal"), + } + for tag, tag_colors_config in tag_colors.items(): + self.text.tag_configure(tag, **tag_colors_config) + + if self.shell_sidebar is not None: + self.shell_sidebar.update_colors() + + def replace_event(self, event): + replace.replace(self.text, insert_tags="stdin") + return "break" + + def get_standard_extension_names(self): + return idleConf.GetExtensions(shell_only=True) + + def get_prompt_text(self, first, last): + """Return text between first and last with prompts added.""" + text = self.text.get(first, last) + lineno_range = range( + int(float(first)), + int(float(last)) + ) + prompts = [ + self.shell_sidebar.line_prompts.get(lineno) + for lineno in lineno_range + ] + return "\n".join( + line if prompt is None else f"{prompt} {line}" + for prompt, line in zip(prompts, text.splitlines()) + ) + "\n" + + + def copy_with_prompts_callback(self, event=None): + """Copy selected lines to the clipboard, with prompts. + + This makes the copied text useful for doc-tests and interactive + shell code examples. + + This always copies entire lines, even if only part of the first + and/or last lines is selected. + """ + text = self.text + selfirst = text.index('sel.first linestart') + if selfirst is None: # Should not be possible. + return # No selection, do nothing. + sellast = text.index('sel.last') + if sellast[-1] != '0': + sellast = text.index("sel.last+1line linestart") + text.clipboard_clear() + prompt_text = self.get_prompt_text(selfirst, sellast) + text.clipboard_append(prompt_text) + + reading = False + executing = False + canceled = False + endoffile = False + closing = False + _stop_readline_flag = False + + def set_warning_stream(self, stream): + global warning_stream + warning_stream = stream + + def get_warning_stream(self): + return warning_stream + + def toggle_debugger(self, event=None): + if self.executing: + messagebox.showerror("Don't debug now", + "You can only toggle the debugger when idle", + parent=self.text) + self.set_debugger_indicator() + return "break" + else: + db = self.interp.getdebugger() + if db: + self.close_debugger() + else: + self.open_debugger() + + def set_debugger_indicator(self): + db = self.interp.getdebugger() + self.setvar("<<toggle-debugger>>", not not db) + + def toggle_jit_stack_viewer(self, event=None): + pass # All we need is the variable + + def close_debugger(self): + db = self.interp.getdebugger() + if db: + self.interp.setdebugger(None) + db.close() + if self.interp.rpcclt: + debugger_r.close_remote_debugger(self.interp.rpcclt) + self.resetoutput() + self.console.write("[DEBUG OFF]\n") + self.prompt = self.sys_ps1 + self.showprompt() + self.set_debugger_indicator() + + def open_debugger(self): + if self.interp.rpcclt: + dbg_gui = debugger_r.start_remote_debugger(self.interp.rpcclt, + self) + else: + dbg_gui = debugger.Debugger(self) + self.interp.setdebugger(dbg_gui) + dbg_gui.load_breakpoints() + self.prompt = "[DEBUG ON]\n" + self.sys_ps1 + self.showprompt() + self.set_debugger_indicator() + + def debug_menu_postcommand(self): + state = 'disabled' if self.executing else 'normal' + self.update_menu_state('debug', '*tack*iewer', state) + + def beginexecuting(self): + "Helper for ModifiedInterpreter" + self.resetoutput() + self.executing = True + + def endexecuting(self): + "Helper for ModifiedInterpreter" + self.executing = False + self.canceled = False + self.showprompt() + + def close(self): + "Extend EditorWindow.close()" + if self.executing: + response = messagebox.askokcancel( + "Kill?", + "Your program is still running!\n Do you want to kill it?", + default="ok", + parent=self.text) + if response is False: + return "cancel" + self.stop_readline() + self.canceled = True + self.closing = True + return EditorWindow.close(self) + + def _close(self): + "Extend EditorWindow._close(), shut down debugger and execution server" + self.close_debugger() + if use_subprocess: + self.interp.kill_subprocess() + # Restore std streams + sys.stdout = self.save_stdout + sys.stderr = self.save_stderr + sys.stdin = self.save_stdin + # Break cycles + self.interp = None + self.console = None + self.flist.pyshell = None + self.history = None + EditorWindow._close(self) + + def ispythonsource(self, filename): + "Override EditorWindow method: never remove the colorizer" + return True + + def short_title(self): + return self.shell_title + + SPLASHLINE = 'Enter "help" below or click "Help" above for more information.' + + def begin(self): + self.text.mark_set("iomark", "insert") + self.resetoutput() + if use_subprocess: + nosub = '' + client = self.interp.start_subprocess() + if not client: + self.close() + return False + else: + nosub = ("==== No Subprocess ====\n\n" + + "WARNING: Running IDLE without a Subprocess is deprecated\n" + + "and will be removed in a later version. See Help/IDLE Help\n" + + "for details.\n\n") + sys.displayhook = rpc.displayhook + + self.write("Python %s on %s\n%s\n%s" % + (sys.version, sys.platform, self.SPLASHLINE, nosub)) + self.text.focus_force() + self.showprompt() + # User code should use separate default Tk root window + import tkinter + tkinter._support_default_root = True + tkinter._default_root = None + return True + + def stop_readline(self): + if not self.reading: # no nested mainloop to exit. + return + self._stop_readline_flag = True + self.top.quit() + + def readline(self): + save = self.reading + try: + self.reading = True + self.top.mainloop() # nested mainloop() + finally: + self.reading = save + if self._stop_readline_flag: + self._stop_readline_flag = False + return "" + line = self.text.get("iomark", "end-1c") + if len(line) == 0: # may be EOF if we quit our mainloop with Ctrl-C + line = "\n" + self.resetoutput() + if self.canceled: + self.canceled = False + if not use_subprocess: + raise KeyboardInterrupt + if self.endoffile: + self.endoffile = False + line = "" + return line + + def isatty(self): + return True + + def cancel_callback(self, event=None): + try: + if self.text.compare("sel.first", "!=", "sel.last"): + return # Active selection -- always use default binding + except: + pass + if not (self.executing or self.reading): + self.resetoutput() + self.interp.write("KeyboardInterrupt\n") + self.showprompt() + return "break" + self.endoffile = False + self.canceled = True + if (self.executing and self.interp.rpcclt): + if self.interp.getdebugger(): + self.interp.restart_subprocess() + else: + self.interp.interrupt_subprocess() + if self.reading: + self.top.quit() # exit the nested mainloop() in readline() + return "break" + + def eof_callback(self, event): + if self.executing and not self.reading: + return # Let the default binding (delete next char) take over + if not (self.text.compare("iomark", "==", "insert") and + self.text.compare("insert", "==", "end-1c")): + return # Let the default binding (delete next char) take over + if not self.executing: + self.resetoutput() + self.close() + else: + self.canceled = False + self.endoffile = True + self.top.quit() + return "break" + + def linefeed_callback(self, event): + # Insert a linefeed without entering anything (still autoindented) + if self.reading: + self.text.insert("insert", "\n") + self.text.see("insert") + else: + self.newline_and_indent_event(event) + return "break" + + def enter_callback(self, event): + if self.executing and not self.reading: + return # Let the default binding (insert '\n') take over + # If some text is selected, recall the selection + # (but only if this before the I/O mark) + try: + sel = self.text.get("sel.first", "sel.last") + if sel: + if self.text.compare("sel.last", "<=", "iomark"): + self.recall(sel, event) + return "break" + except: + pass + # If we're strictly before the line containing iomark, recall + # the current line, less a leading prompt, less leading or + # trailing whitespace + if self.text.compare("insert", "<", "iomark linestart"): + # Check if there's a relevant stdin range -- if so, use it. + # Note: "stdin" blocks may include several successive statements, + # so look for "console" tags on the newline before each statement + # (and possibly on prompts). + prev = self.text.tag_prevrange("stdin", "insert") + if ( + prev and + self.text.compare("insert", "<", prev[1]) and + # The following is needed to handle empty statements. + "console" not in self.text.tag_names("insert") + ): + prev_cons = self.text.tag_prevrange("console", "insert") + if prev_cons and self.text.compare(prev_cons[1], ">=", prev[0]): + prev = (prev_cons[1], prev[1]) + next_cons = self.text.tag_nextrange("console", "insert") + if next_cons and self.text.compare(next_cons[0], "<", prev[1]): + prev = (prev[0], self.text.index(next_cons[0] + "+1c")) + self.recall(self.text.get(prev[0], prev[1]), event) + return "break" + next = self.text.tag_nextrange("stdin", "insert") + if next and self.text.compare("insert lineend", ">=", next[0]): + next_cons = self.text.tag_nextrange("console", "insert lineend") + if next_cons and self.text.compare(next_cons[0], "<", next[1]): + next = (next[0], self.text.index(next_cons[0] + "+1c")) + self.recall(self.text.get(next[0], next[1]), event) + return "break" + # No stdin mark -- just get the current line, less any prompt + indices = self.text.tag_nextrange("console", "insert linestart") + if indices and \ + self.text.compare(indices[0], "<=", "insert linestart"): + self.recall(self.text.get(indices[1], "insert lineend"), event) + else: + self.recall(self.text.get("insert linestart", "insert lineend"), event) + return "break" + # If we're between the beginning of the line and the iomark, i.e. + # in the prompt area, move to the end of the prompt + if self.text.compare("insert", "<", "iomark"): + self.text.mark_set("insert", "iomark") + # If we're in the current input and there's only whitespace + # beyond the cursor, erase that whitespace first + s = self.text.get("insert", "end-1c") + if s and not s.strip(): + self.text.delete("insert", "end-1c") + # If we're in the current input before its last line, + # insert a newline right at the insert point + if self.text.compare("insert", "<", "end-1c linestart"): + self.newline_and_indent_event(event) + return "break" + # We're in the last line; append a newline and submit it + self.text.mark_set("insert", "end-1c") + if self.reading: + self.text.insert("insert", "\n") + self.text.see("insert") + else: + self.newline_and_indent_event(event) + self.text.update_idletasks() + if self.reading: + self.top.quit() # Break out of recursive mainloop() + else: + self.runit() + return "break" + + def recall(self, s, event): + # remove leading and trailing empty or whitespace lines + s = re.sub(r'^\s*\n', '', s) + s = re.sub(r'\n\s*$', '', s) + lines = s.split('\n') + self.text.undo_block_start() + try: + self.text.tag_remove("sel", "1.0", "end") + self.text.mark_set("insert", "end-1c") + prefix = self.text.get("insert linestart", "insert") + if prefix.rstrip().endswith(':'): + self.newline_and_indent_event(event) + prefix = self.text.get("insert linestart", "insert") + self.text.insert("insert", lines[0].strip(), + self.user_input_insert_tags) + if len(lines) > 1: + orig_base_indent = re.search(r'^([ \t]*)', lines[0]).group(0) + new_base_indent = re.search(r'^([ \t]*)', prefix).group(0) + for line in lines[1:]: + if line.startswith(orig_base_indent): + # replace orig base indentation with new indentation + line = new_base_indent + line[len(orig_base_indent):] + self.text.insert('insert', '\n' + line.rstrip(), + self.user_input_insert_tags) + finally: + self.text.see("insert") + self.text.undo_block_stop() + + _last_newline_re = re.compile(r"[ \t]*(\n[ \t]*)?\z") + def runit(self): + index_before = self.text.index("end-2c") + line = self.text.get("iomark", "end-1c") + # Strip off last newline and surrounding whitespace. + # (To allow you to hit return twice to end a statement.) + line = self._last_newline_re.sub("", line) + input_is_complete = self.interp.runsource(line) + if not input_is_complete: + if self.text.get(index_before) == '\n': + self.text.tag_remove(self.user_input_insert_tags, index_before) + self.shell_sidebar.update_sidebar() + + def open_stack_viewer(self, event=None): # -n mode only + if self.interp.rpcclt: + return self.interp.remote_stack_viewer() + + from idlelib.stackviewer import StackBrowser + try: + StackBrowser(self.root, sys.last_exc, self.flist) + except: + messagebox.showerror("No stack trace", + "There is no stack trace yet.\n" + "(sys.last_exc is not defined)", + parent=self.text) + return None + + def view_restart_mark(self, event=None): + self.text.see("iomark") + self.text.see("restart") + + def restart_shell(self, event=None): + "Callback for Run/Restart Shell Cntl-F6" + self.interp.restart_subprocess(with_cwd=True) + + def showprompt(self): + self.resetoutput() + + prompt = self.prompt + if self.sys_ps1 and prompt.endswith(self.sys_ps1): + prompt = prompt[:-len(self.sys_ps1)] + self.text.tag_add("console", "iomark-1c") + self.console.write(prompt) + + self.shell_sidebar.update_sidebar() + self.text.mark_set("insert", "end-1c") + self.set_line_and_column() + self.io.reset_undo() + + def show_warning(self, msg): + width = self.interp.tkconsole.width + wrapper = TextWrapper(width=width, tabsize=8, expand_tabs=True) + wrapped_msg = '\n'.join(wrapper.wrap(msg)) + if not wrapped_msg.endswith('\n'): + wrapped_msg += '\n' + self.per.bottom.insert("iomark linestart", wrapped_msg, "stderr") + + def resetoutput(self): + source = self.text.get("iomark", "end-1c") + if self.history: + self.history.store(source) + if self.text.get("end-2c") != "\n": + self.text.insert("end-1c", "\n") + self.text.mark_set("iomark", "end-1c") + self.set_line_and_column() + self.ctip.remove_calltip_window() + + def write(self, s, tags=()): + try: + self.text.mark_gravity("iomark", "right") + count = OutputWindow.write(self, s, tags, "iomark") + self.text.mark_gravity("iomark", "left") + except: + raise ###pass # ### 11Aug07 KBK if we are expecting exceptions + # let's find out what they are and be specific. + if self.canceled: + self.canceled = False + if not use_subprocess: + raise KeyboardInterrupt + return count + + def rmenu_check_cut(self): + try: + if self.text.compare('sel.first', '<', 'iomark'): + return 'disabled' + except TclError: # no selection, so the index 'sel.first' doesn't exist + return 'disabled' + return super().rmenu_check_cut() + + def rmenu_check_paste(self): + if self.text.compare('insert','<','iomark'): + return 'disabled' + return super().rmenu_check_paste() + + def squeeze_current_text_event(self, event=None): + self.squeezer.squeeze_current_text() + self.shell_sidebar.update_sidebar() + + def on_squeezed_expand(self, index, text, tags): + self.shell_sidebar.update_sidebar() + + +def fix_x11_paste(root): + "Make paste replace selection on x11. See issue #5124." + if root._windowingsystem == 'x11': + for cls in 'Text', 'Entry', 'Spinbox': + root.bind_class( + cls, + '<<Paste>>', + 'catch {%W delete sel.first sel.last}\n' + + root.bind_class(cls, '<<Paste>>')) + + +usage_msg = """\ + +USAGE: idle [-deins] [-t title] [file]* + idle [-dns] [-t title] (-c cmd | -r file) [arg]* + idle [-dns] [-t title] - [arg]* + + -h print this help message and exit + -n run IDLE without a subprocess (DEPRECATED, + see Help/IDLE Help for details) + +The following options will override the IDLE 'settings' configuration: + + -e open an edit window + -i open a shell window + +The following options imply -i and will open a shell: + + -c cmd run the command in a shell, or + -r file run script from file + + -d enable the debugger + -s run $IDLESTARTUP or $PYTHONSTARTUP before anything else + -t title set title of shell window + +A default edit window will be bypassed when -c, -r, or - are used. + +[arg]* are passed to the command (-c) or script (-r) in sys.argv[1:]. + +Examples: + +idle + Open an edit window or shell depending on IDLE's configuration. + +idle foo.py foobar.py + Edit the files, also open a shell if configured to start with shell. + +idle -est "Baz" foo.py + Run $IDLESTARTUP or $PYTHONSTARTUP, edit foo.py, and open a shell + window with the title "Baz". + +idle -c "import sys; print(sys.argv)" "foo" + Open a shell window and run the command, passing "-c" in sys.argv[0] + and "foo" in sys.argv[1]. + +idle -d -s -r foo.py "Hello World" + Open a shell window, run a startup script, enable the debugger, and + run foo.py, passing "foo.py" in sys.argv[0] and "Hello World" in + sys.argv[1]. + +echo "import sys; print(sys.argv)" | idle - "foobar" + Open a shell window, run the script piped in, passing '' in sys.argv[0] + and "foobar" in sys.argv[1]. +""" + +def main(): + import getopt + from platform import system + from idlelib import testing # bool value + from idlelib import macosx + + global flist, root, use_subprocess + + capture_warnings(True) + use_subprocess = True + enable_shell = False + enable_edit = False + debug = False + cmd = None + script = None + startup = False + try: + opts, args = getopt.getopt(sys.argv[1:], "c:deihnr:st:") + except getopt.error as msg: + print(f"Error: {msg}\n{usage_msg}", file=sys.stderr) + sys.exit(2) + for o, a in opts: + if o == '-c': + cmd = a + enable_shell = True + if o == '-d': + debug = True + enable_shell = True + if o == '-e': + enable_edit = True + if o == '-h': + sys.stdout.write(usage_msg) + sys.exit() + if o == '-i': + enable_shell = True + if o == '-n': + print(" Warning: running IDLE without a subprocess is deprecated.", + file=sys.stderr) + use_subprocess = False + if o == '-r': + script = a + if os.path.isfile(script): + pass + else: + print("No script file: ", script) + sys.exit() + enable_shell = True + if o == '-s': + startup = True + enable_shell = True + if o == '-t': + PyShell.shell_title = a + enable_shell = True + if args and args[0] == '-': + cmd = sys.stdin.read() + enable_shell = True + # process sys.argv and sys.path: + for i in range(len(sys.path)): + sys.path[i] = os.path.abspath(sys.path[i]) + if args and args[0] == '-': + sys.argv = [''] + args[1:] + elif cmd: + sys.argv = ['-c'] + args + elif script: + sys.argv = [script] + args + elif args: + enable_edit = True + pathx = [] + for filename in args: + pathx.append(os.path.dirname(filename)) + for dir in pathx: + dir = os.path.abspath(dir) + if not dir in sys.path: + sys.path.insert(0, dir) + else: + dir = os.getcwd() + if dir not in sys.path: + sys.path.insert(0, dir) + # check the IDLE settings configuration (but command line overrides) + edit_start = idleConf.GetOption('main', 'General', + 'editor-on-startup', type='bool') + enable_edit = enable_edit or edit_start + enable_shell = enable_shell or not enable_edit + + # Setup root. Don't break user code run in IDLE process. + # Don't change environment when testing. + if use_subprocess and not testing: + NoDefaultRoot() + root = Tk(className="Idle") + root.withdraw() + from idlelib.run import fix_scaling + fix_scaling(root) + + # set application icon + icondir = os.path.join(os.path.dirname(__file__), 'Icons') + if system() == 'Windows': + iconfile = os.path.join(icondir, 'idle.ico') + root.wm_iconbitmap(default=iconfile) + elif not macosx.isAquaTk(): + if TkVersion >= 8.6: + ext = '.png' + sizes = (16, 32, 48, 256) + else: + ext = '.gif' + sizes = (16, 32, 48) + iconfiles = [os.path.join(icondir, 'idle_%d%s' % (size, ext)) + for size in sizes] + icons = [PhotoImage(master=root, file=iconfile) + for iconfile in iconfiles] + root.wm_iconphoto(True, *icons) + + # start editor and/or shell windows: + fixwordbreaks(root) + fix_x11_paste(root) + flist = PyShellFileList(root) + macosx.setupApp(root, flist) + + if enable_edit: + if not (cmd or script): + for filename in args[:]: + if flist.open(filename) is None: + # filename is a directory actually, disconsider it + args.remove(filename) + if not args: + flist.new() + + if enable_shell: + shell = flist.open_shell() + if not shell: + return # couldn't open shell + if macosx.isAquaTk() and flist.dict: + # On OSX: when the user has double-clicked on a file that causes + # IDLE to be launched the shell window will open just in front of + # the file she wants to see. Lower the interpreter window when + # there are open files. + shell.top.lower() + else: + shell = flist.pyshell + + # Handle remaining options. If any of these are set, enable_shell + # was set also, so shell must be true to reach here. + if debug: + shell.open_debugger() + if startup: + filename = os.environ.get("IDLESTARTUP") or \ + os.environ.get("PYTHONSTARTUP") + if filename and os.path.isfile(filename): + shell.interp.execfile(filename) + if cmd or script: + shell.interp.runcommand("""if 1: + import sys as _sys + _sys.argv = {!r} + del _sys + \n""".format(sys.argv)) + if cmd: + shell.interp.execsource(cmd) + elif script: + shell.interp.prepend_syspath(script) + shell.interp.execfile(script) + elif shell: + # If there is a shell window and no cmd or script in progress, + # check for problematic issues and print warning message(s) in + # the IDLE shell window; this is less intrusive than always + # opening a separate window. + + # Warn if the "Prefer tabs when opening documents" system + # preference is set to "Always". + prefer_tabs_preference_warning = macosx.preferTabsPreferenceWarning() + if prefer_tabs_preference_warning: + shell.show_warning(prefer_tabs_preference_warning) + + while flist.inversedict: # keep IDLE running while files are open. + root.mainloop() + root.destroy() + capture_warnings(False) + + +if __name__ == "__main__": + main() + +capture_warnings(False) # Make sure turned off; see issue 18081 diff --git a/Lib/idlelib/query.py b/Lib/idlelib/query.py new file mode 100644 index 000000000..5f9bdc031 --- /dev/null +++ b/Lib/idlelib/query.py @@ -0,0 +1,390 @@ +""" +Dialogs that query users and verify the answer before accepting. + +Query is the generic base class for a popup dialog. +The user must either enter a valid answer or close the dialog. +Entries are validated when <Return> is entered or [Ok] is clicked. +Entries are ignored when [Cancel] or [X] are clicked. +The 'return value' is .result set to either a valid answer or None. + +Subclass SectionName gets a name for a new config file section. +Configdialog uses it for new highlight theme and keybinding set names. +Subclass ModuleName gets a name for File => Open Module. +Subclass HelpSource gets menu item and path for additions to Help menu. +""" +# Query and Section name result from splitting GetCfgSectionNameDialog +# of configSectionNameDialog.py (temporarily config_sec.py) into +# generic and specific parts. 3.6 only, July 2016. +# ModuleName.entry_ok came from editor.EditorWindow.load_module. +# HelpSource was extracted from configHelpSourceEdit.py (temporarily +# config_help.py), with darwin code moved from ok to path_ok. + +import importlib.util, importlib.abc +import os +import shlex +from sys import executable, platform # Platform is set for one test. + +from tkinter import Toplevel, StringVar, BooleanVar, W, E, S +from tkinter.ttk import Frame, Button, Entry, Label, Checkbutton +from tkinter import filedialog +from tkinter.font import Font +from tkinter.simpledialog import _setup_dialog + +class Query(Toplevel): + """Base class for getting verified answer from a user. + + For this base class, accept any non-blank string. + """ + def __init__(self, parent, title, message, *, text0='', used_names={}, + _htest=False, _utest=False): + """Create modal popup, return when destroyed. + + Additional subclass init must be done before this unless + _utest=True is passed to suppress wait_window(). + + title - string, title of popup dialog + message - string, informational message to display + text0 - initial value for entry + used_names - names already in use + _htest - bool, change box location when running htest + _utest - bool, leave window hidden and not modal + """ + self.parent = parent # Needed for Font call. + self.message = message + self.text0 = text0 + self.used_names = used_names + + Toplevel.__init__(self, parent) + self.withdraw() # Hide while configuring, especially geometry. + self.title(title) + self.transient(parent) + if not _utest: # Otherwise fail when directly run unittest. + self.grab_set() + + _setup_dialog(self) + if self._windowingsystem == 'aqua': + self.bind("<Command-.>", self.cancel) + self.bind('<Key-Escape>', self.cancel) + self.protocol("WM_DELETE_WINDOW", self.cancel) + self.bind('<Key-Return>', self.ok) + self.bind("<KP_Enter>", self.ok) + + self.create_widgets() + self.update_idletasks() # Need here for winfo_reqwidth below. + self.geometry( # Center dialog over parent (or below htest box). + "+%d+%d" % ( + parent.winfo_rootx() + + (parent.winfo_width()/2 - self.winfo_reqwidth()/2), + parent.winfo_rooty() + + ((parent.winfo_height()/2 - self.winfo_reqheight()/2) + if not _htest else 150) + ) ) + self.resizable(height=False, width=False) + + if not _utest: + self.deiconify() # Unhide now that geometry set. + self.entry.focus_set() + self.wait_window() + + def create_widgets(self, ok_text='OK'): # Do not replace. + """Create entry (rows, extras, buttons. + + Entry stuff on rows 0-2, spanning cols 0-2. + Buttons on row 99, cols 1, 2. + """ + # Bind to self the widgets needed for entry_ok or unittest. + self.frame = frame = Frame(self, padding=10) + frame.grid(column=0, row=0, sticky='news') + frame.grid_columnconfigure(0, weight=1) + + entrylabel = Label(frame, anchor='w', justify='left', + text=self.message) + self.entryvar = StringVar(self, self.text0) + self.entry = Entry(frame, width=30, textvariable=self.entryvar) + self.error_font = Font(name='TkCaptionFont', + exists=True, root=self.parent) + self.entry_error = Label(frame, text=' ', foreground='red', + font=self.error_font) + # Display or blank error by setting ['text'] =. + entrylabel.grid(column=0, row=0, columnspan=3, padx=5, sticky=W) + self.entry.grid(column=0, row=1, columnspan=3, padx=5, sticky=W+E, + pady=[10,0]) + self.entry_error.grid(column=0, row=2, columnspan=3, padx=5, + sticky=W+E) + + self.create_extra() + + self.button_ok = Button( + frame, text=ok_text, default='active', command=self.ok) + self.button_cancel = Button( + frame, text='Cancel', command=self.cancel) + + self.button_ok.grid(column=1, row=99, padx=5) + self.button_cancel.grid(column=2, row=99, padx=5) + + def create_extra(self): pass # Override to add widgets. + + def showerror(self, message, widget=None): + #self.bell(displayof=self) + (widget or self.entry_error)['text'] = 'ERROR: ' + message + + def entry_ok(self): # Example: usually replace. + "Return non-blank entry or None." + entry = self.entry.get().strip() + if not entry: + self.showerror('blank line.') + return None + return entry + + def ok(self, event=None): # Do not replace. + '''If entry is valid, bind it to 'result' and destroy tk widget. + + Otherwise leave dialog open for user to correct entry or cancel. + ''' + self.entry_error['text'] = '' + entry = self.entry_ok() + if entry is not None: + self.result = entry + self.destroy() + else: + # [Ok] moves focus. (<Return> does not.) Move it back. + self.entry.focus_set() + + def cancel(self, event=None): # Do not replace. + "Set dialog result to None and destroy tk widget." + self.result = None + self.destroy() + + def destroy(self): + self.grab_release() + super().destroy() + + +class SectionName(Query): + "Get a name for a config file section name." + # Used in ConfigDialog.GetNewKeysName, .GetNewThemeName (837) + + def __init__(self, parent, title, message, used_names, + *, _htest=False, _utest=False): + super().__init__(parent, title, message, used_names=used_names, + _htest=_htest, _utest=_utest) + + def entry_ok(self): + "Return sensible ConfigParser section name or None." + name = self.entry.get().strip() + if not name: + self.showerror('no name specified.') + return None + elif len(name)>30: + self.showerror('name is longer than 30 characters.') + return None + elif name in self.used_names: + self.showerror('name is already in use.') + return None + return name + + +class ModuleName(Query): + "Get a module name for Open Module menu entry." + # Used in open_module (editor.EditorWindow until move to iobinding). + + def __init__(self, parent, title, message, text0, + *, _htest=False, _utest=False): + super().__init__(parent, title, message, text0=text0, + _htest=_htest, _utest=_utest) + + def entry_ok(self): + "Return entered module name as file path or None." + name = self.entry.get().strip() + if not name: + self.showerror('no name specified.') + return None + # XXX Ought to insert current file's directory in front of path. + try: + spec = importlib.util.find_spec(name) + except (ValueError, ImportError) as msg: + self.showerror(str(msg)) + return None + if spec is None: + self.showerror("module not found.") + return None + if not isinstance(spec.loader, importlib.abc.SourceLoader): + self.showerror("not a source-based module.") + return None + try: + file_path = spec.loader.get_filename(name) + except AttributeError: + self.showerror("loader does not support get_filename.") + return None + except ImportError: + # Some special modules require this (e.g. os.path) + try: + file_path = spec.loader.get_filename() + except TypeError: + self.showerror("loader failed to get filename.") + return None + return file_path + + +class Goto(Query): + "Get a positive line number for editor Go To Line." + # Used in editor.EditorWindow.goto_line_event. + + def entry_ok(self): + try: + lineno = int(self.entry.get()) + except ValueError: + self.showerror('not a base 10 integer.') + return None + if lineno <= 0: + self.showerror('not a positive integer.') + return None + return lineno + + +class HelpSource(Query): + "Get menu name and help source for Help menu." + # Used in ConfigDialog.HelpListItemAdd/Edit, (941/9) + + def __init__(self, parent, title, *, menuitem='', filepath='', + used_names={}, _htest=False, _utest=False): + """Get menu entry and url/local file for Additional Help. + + User enters a name for the Help resource and a web url or file + name. The user can browse for the file. + """ + self.filepath = filepath + message = 'Name for item on Help menu:' + super().__init__( + parent, title, message, text0=menuitem, + used_names=used_names, _htest=_htest, _utest=_utest) + + def create_extra(self): + "Add path widjets to rows 10-12." + frame = self.frame + pathlabel = Label(frame, anchor='w', justify='left', + text='Help File Path: Enter URL or browse for file') + self.pathvar = StringVar(self, self.filepath) + self.path = Entry(frame, textvariable=self.pathvar, width=40) + browse = Button(frame, text='Browse', width=8, + command=self.browse_file) + self.path_error = Label(frame, text=' ', foreground='red', + font=self.error_font) + + pathlabel.grid(column=0, row=10, columnspan=3, padx=5, pady=[10,0], + sticky=W) + self.path.grid(column=0, row=11, columnspan=2, padx=5, sticky=W+E, + pady=[10,0]) + browse.grid(column=2, row=11, padx=5, sticky=W+S) + self.path_error.grid(column=0, row=12, columnspan=3, padx=5, + sticky=W+E) + + def askfilename(self, filetypes, initdir, initfile): # htest # + # Extracted from browse_file so can mock for unittests. + # Cannot unittest as cannot simulate button clicks. + # Test by running htest, such as by running this file. + return filedialog.Open(parent=self, filetypes=filetypes)\ + .show(initialdir=initdir, initialfile=initfile) + + def browse_file(self): + filetypes = [ + ("HTML Files", "*.htm *.html", "TEXT"), + ("Text Files", "*.txt", "TEXT"), + ("All Files", "*")] + path = self.pathvar.get() + if path: + dir, base = os.path.split(path) + else: + base = None + if platform[:3] == 'win': + dir = os.path.join(os.path.dirname(executable), 'Doc') + if not os.path.isdir(dir): + dir = os.getcwd() + else: + dir = os.getcwd() + file = self.askfilename(filetypes, dir, base) + if file: + self.pathvar.set(file) + + item_ok = SectionName.entry_ok # localize for test override + + def path_ok(self): + "Simple validity check for menu file path" + path = self.path.get().strip() + if not path: #no path specified + self.showerror('no help file path specified.', self.path_error) + return None + elif not path.startswith(('www.', 'http')): + if path[:5] == 'file:': + path = path[5:] + if not os.path.exists(path): + self.showerror('help file path does not exist.', + self.path_error) + return None + if platform == 'darwin': # for Mac Safari + path = "file://" + path + return path + + def entry_ok(self): + "Return apparently valid (name, path) or None" + self.path_error['text'] = '' + name = self.item_ok() + path = self.path_ok() + return None if name is None or path is None else (name, path) + +class CustomRun(Query): + """Get settings for custom run of module. + + 1. Command line arguments to extend sys.argv. + 2. Whether to restart Shell or not. + """ + # Used in runscript.run_custom_event + + def __init__(self, parent, title, *, cli_args=[], + _htest=False, _utest=False): + """cli_args is a list of strings. + + The list is assigned to the default Entry StringVar. + The strings are displayed joined by ' ' for display. + """ + message = 'Command Line Arguments for sys.argv:' + super().__init__( + parent, title, message, text0=cli_args, + _htest=_htest, _utest=_utest) + + def create_extra(self): + "Add run mode on rows 10-12." + frame = self.frame + self.restartvar = BooleanVar(self, value=True) + restart = Checkbutton(frame, variable=self.restartvar, onvalue=True, + offvalue=False, text='Restart shell') + self.args_error = Label(frame, text=' ', foreground='red', + font=self.error_font) + + restart.grid(column=0, row=10, columnspan=3, padx=5, sticky='w') + self.args_error.grid(column=0, row=12, columnspan=3, padx=5, + sticky='we') + + def cli_args_ok(self): + "Return command line arg list or None if error." + cli_string = self.entry.get().strip() + try: + cli_args = shlex.split(cli_string, posix=True) + except ValueError as err: + self.showerror(str(err)) + return None + return cli_args + + def entry_ok(self): + "Return apparently valid (cli_args, restart) or None." + cli_args = self.cli_args_ok() + restart = self.restartvar.get() + return None if cli_args is None else (cli_args, restart) + + +if __name__ == '__main__': + from unittest import main + main('idlelib.idle_test.test_query', verbosity=2, exit=False) + + from idlelib.idle_test.htest import run + run(Query, HelpSource, CustomRun) diff --git a/Lib/idlelib/redirector.py b/Lib/idlelib/redirector.py new file mode 100644 index 000000000..8e2ba68d3 --- /dev/null +++ b/Lib/idlelib/redirector.py @@ -0,0 +1,174 @@ +from tkinter import TclError + +class WidgetRedirector: + """Support for redirecting arbitrary widget subcommands. + + Some Tk operations don't normally pass through tkinter. For example, if a + character is inserted into a Text widget by pressing a key, a default Tk + binding to the widget's 'insert' operation is activated, and the Tk library + processes the insert without calling back into tkinter. + + Although a binding to <Key> could be made via tkinter, what we really want + to do is to hook the Tk 'insert' operation itself. For one thing, we want + a text.insert call in idle code to have the same effect as a key press. + + When a widget is instantiated, a Tcl command is created whose name is the + same as the pathname widget._w. This command is used to invoke the various + widget operations, e.g. insert (for a Text widget). We are going to hook + this command and provide a facility ('register') to intercept the widget + operation. We will also intercept method calls on the tkinter class + instance that represents the tk widget. + + In IDLE, WidgetRedirector is used in Percolator to intercept Text + commands. The function being registered provides access to the top + of a Percolator chain. At the bottom of the chain is a call to the + original Tk widget operation. + """ + def __init__(self, widget): + '''Initialize attributes and setup redirection. + + _operations: dict mapping operation name to new function. + widget: the widget whose tcl command is to be intercepted. + tk: widget.tk, a convenience attribute, probably not needed. + orig: new name of the original tcl command. + + Since renaming to orig fails with TclError when orig already + exists, only one WidgetDirector can exist for a given widget. + ''' + self._operations = {} + self.widget = widget # widget instance + self.tk = tk = widget.tk # widget's root + w = widget._w # widget's (full) Tk pathname + self.orig = w + "_orig" + # Rename the Tcl command within Tcl: + tk.call("rename", w, self.orig) + # Create a new Tcl command whose name is the widget's pathname, and + # whose action is to dispatch on the operation passed to the widget: + tk.createcommand(w, self.dispatch) + + def __repr__(self): + w = self.widget + return f"{self.__class__.__name__,}({w.__class__.__name__}<{w._w}>)" + + def close(self): + "Unregister operations and revert redirection created by .__init__." + for operation in list(self._operations): + self.unregister(operation) + widget = self.widget + tk = widget.tk + w = widget._w + # Restore the original widget Tcl command. + tk.deletecommand(w) + tk.call("rename", self.orig, w) + del self.widget, self.tk # Should not be needed + # if instance is deleted after close, as in Percolator. + + def register(self, operation, function): + '''Return OriginalCommand(operation) after registering function. + + Registration adds an operation: function pair to ._operations. + It also adds a widget function attribute that masks the tkinter + class instance method. Method masking operates independently + from command dispatch. + + If a second function is registered for the same operation, the + first function is replaced in both places. + ''' + self._operations[operation] = function + setattr(self.widget, operation, function) + return OriginalCommand(self, operation) + + def unregister(self, operation): + '''Return the function for the operation, or None. + + Deleting the instance attribute unmasks the class attribute. + ''' + if operation in self._operations: + function = self._operations[operation] + del self._operations[operation] + try: + delattr(self.widget, operation) + except AttributeError: + pass + return function + else: + return None + + def dispatch(self, operation, *args): + '''Callback from Tcl which runs when the widget is referenced. + + If an operation has been registered in self._operations, apply the + associated function to the args passed into Tcl. Otherwise, pass the + operation through to Tk via the original Tcl function. + + Note that if a registered function is called, the operation is not + passed through to Tk. Apply the function returned by self.register() + to *args to accomplish that. For an example, see colorizer.py. + + ''' + operation = str(operation) # can be a Tcl_Obj + m = self._operations.get(operation) + try: + if m: + return m(*args) + else: + return self.tk.call((self.orig, operation) + args) + except TclError: + return "" + + +class OriginalCommand: + '''Callable for original tk command that has been redirected. + + Returned by .register; can be used in the function registered. + redir = WidgetRedirector(text) + def my_insert(*args): + print("insert", args) + original_insert(*args) + original_insert = redir.register("insert", my_insert) + ''' + + def __init__(self, redir, operation): + '''Create .tk_call and .orig_and_operation for .__call__ method. + + .redir and .operation store the input args for __repr__. + .tk and .orig copy attributes of .redir (probably not needed). + ''' + self.redir = redir + self.operation = operation + self.tk = redir.tk # redundant with self.redir + self.orig = redir.orig # redundant with self.redir + # These two could be deleted after checking recipient code. + self.tk_call = redir.tk.call + self.orig_and_operation = (redir.orig, operation) + + def __repr__(self): + return f"{self.__class__.__name__,}({self.redir!r}, {self.operation!r})" + + def __call__(self, *args): + return self.tk_call(self.orig_and_operation + args) + + +def _widget_redirector(parent): # htest # + from tkinter import Toplevel, Text + + top = Toplevel(parent) + top.title("Test WidgetRedirector") + x, y = map(int, parent.geometry().split('+')[1:]) + top.geometry("+%d+%d" % (x, y + 175)) + text = Text(top) + text.pack() + text.focus_set() + redir = WidgetRedirector(text) + def my_insert(*args): + print("insert", args) + original_insert(*args) + original_insert = redir.register("insert", my_insert) + + +if __name__ == "__main__": + from unittest import main + main('idlelib.idle_test.test_redirector', verbosity=2, exit=False) + + from idlelib.idle_test.htest import run + run(_widget_redirector) diff --git a/Lib/idlelib/replace.py b/Lib/idlelib/replace.py new file mode 100644 index 000000000..3716d8415 --- /dev/null +++ b/Lib/idlelib/replace.py @@ -0,0 +1,299 @@ +"""Replace dialog for IDLE. Inherits SearchDialogBase for GUI. +Uses idlelib.searchengine.SearchEngine for search capability. +Defines various replace related functions like replace, replace all, +and replace+find. +""" +import re + +from tkinter import StringVar, TclError + +from idlelib.searchbase import SearchDialogBase +from idlelib import searchengine + + +def replace(text, insert_tags=None): + """Create or reuse a singleton ReplaceDialog instance. + + The singleton dialog saves user entries and preferences + across instances. + + Args: + text: Text widget containing the text to be searched. + """ + root = text._root() + engine = searchengine.get(root) + if not hasattr(engine, "_replacedialog"): + engine._replacedialog = ReplaceDialog(root, engine) + dialog = engine._replacedialog + searchphrase = text.get("sel.first", "sel.last") + dialog.open(text, searchphrase, insert_tags=insert_tags) + + +class ReplaceDialog(SearchDialogBase): + "Dialog for finding and replacing a pattern in text." + + title = "Replace Dialog" + icon = "Replace" + + def __init__(self, root, engine): + """Create search dialog for finding and replacing text. + + Uses SearchDialogBase as the basis for the GUI and a + searchengine instance to prepare the search. + + Attributes: + replvar: StringVar containing 'Replace with:' value. + replent: Entry widget for replvar. Created in + create_entries(). + ok: Boolean used in searchengine.search_text to indicate + whether the search includes the selection. + """ + super().__init__(root, engine) + self.replvar = StringVar(root) + self.insert_tags = None + + def open(self, text, searchphrase=None, *, insert_tags=None): + """Make dialog visible on top of others and ready to use. + + Also, set the search to include the current selection + (self.ok). + + Args: + text: Text widget being searched. + searchphrase: String phrase to search. + """ + SearchDialogBase.open(self, text, searchphrase) + self.ok = True + self.insert_tags = insert_tags + + def create_entries(self): + "Create base and additional label and text entry widgets." + SearchDialogBase.create_entries(self) + self.replent = self.make_entry("Replace with:", self.replvar)[0] + + def create_command_buttons(self): + """Create base and additional command buttons. + + The additional buttons are for Find, Replace, + Replace+Find, and Replace All. + """ + SearchDialogBase.create_command_buttons(self) + self.make_button("Find", self.find_it) + self.make_button("Replace", self.replace_it) + self.make_button("Replace+Find", self.default_command, isdef=True) + self.make_button("Replace All", self.replace_all) + + def find_it(self, event=None): + "Handle the Find button." + self.do_find(False) + + def replace_it(self, event=None): + """Handle the Replace button. + + If the find is successful, then perform replace. + """ + if self.do_find(self.ok): + self.do_replace() + + def default_command(self, event=None): + """Handle the Replace+Find button as the default command. + + First performs a replace and then, if the replace was + successful, a find next. + """ + if self.do_find(self.ok): + if self.do_replace(): # Only find next match if replace succeeded. + # A bad re can cause it to fail. + self.do_find(False) + + def _replace_expand(self, m, repl): + "Expand replacement text if regular expression." + if self.engine.isre(): + try: + new = m.expand(repl) + except re.PatternError: + self.engine.report_error(repl, 'Invalid Replace Expression') + new = None + else: + new = repl + + return new + + def replace_all(self, event=None): + """Handle the Replace All button. + + Search text for occurrences of the Find value and replace + each of them. The 'wrap around' value controls the start + point for searching. If wrap isn't set, then the searching + starts at the first occurrence after the current selection; + if wrap is set, the replacement starts at the first line. + The replacement is always done top-to-bottom in the text. + """ + prog = self.engine.getprog() + if not prog: + return + repl = self.replvar.get() + text = self.text + res = self.engine.search_text(text, prog) + if not res: + self.bell() + return + text.tag_remove("sel", "1.0", "end") + text.tag_remove("hit", "1.0", "end") + line = res[0] + col = res[1].start() + if self.engine.iswrap(): + line = 1 + col = 0 + ok = True + first = last = None + # XXX ought to replace circular instead of top-to-bottom when wrapping + text.undo_block_start() + while res := self.engine.search_forward( + text, prog, line, col, wrap=False, ok=ok): + line, m = res + chars = text.get("%d.0" % line, "%d.0" % (line+1)) + orig = m.group() + new = self._replace_expand(m, repl) + if new is None: + break + i, j = m.span() + first = "%d.%d" % (line, i) + last = "%d.%d" % (line, j) + if new == orig: + text.mark_set("insert", last) + else: + text.mark_set("insert", first) + if first != last: + text.delete(first, last) + if new: + text.insert(first, new, self.insert_tags) + col = i + len(new) + ok = False + text.undo_block_stop() + if first and last: + self.show_hit(first, last) + self.close() + + def do_find(self, ok=False): + """Search for and highlight next occurrence of pattern in text. + + No text replacement is done with this option. + """ + if not self.engine.getprog(): + return False + text = self.text + res = self.engine.search_text(text, None, ok) + if not res: + self.bell() + return False + line, m = res + i, j = m.span() + first = "%d.%d" % (line, i) + last = "%d.%d" % (line, j) + self.show_hit(first, last) + self.ok = True + return True + + def do_replace(self): + "Replace search pattern in text with replacement value." + prog = self.engine.getprog() + if not prog: + return False + text = self.text + try: + first = pos = text.index("sel.first") + last = text.index("sel.last") + except TclError: + pos = None + if not pos: + first = last = pos = text.index("insert") + line, col = searchengine.get_line_col(pos) + chars = text.get("%d.0" % line, "%d.0" % (line+1)) + m = prog.match(chars, col) + if not prog: + return False + new = self._replace_expand(m, self.replvar.get()) + if new is None: + return False + text.mark_set("insert", first) + text.undo_block_start() + if m.group(): + text.delete(first, last) + if new: + text.insert(first, new, self.insert_tags) + text.undo_block_stop() + self.show_hit(first, text.index("insert")) + self.ok = False + return True + + def show_hit(self, first, last): + """Highlight text between first and last indices. + + Text is highlighted via the 'hit' tag and the marked + section is brought into view. + + The colors from the 'hit' tag aren't currently shown + when the text is displayed. This is due to the 'sel' + tag being added first, so the colors in the 'sel' + config are seen instead of the colors for 'hit'. + """ + text = self.text + text.mark_set("insert", first) + text.tag_remove("sel", "1.0", "end") + text.tag_add("sel", first, last) + text.tag_remove("hit", "1.0", "end") + if first == last: + text.tag_add("hit", first) + else: + text.tag_add("hit", first, last) + text.see("insert") + text.update_idletasks() + + def close(self, event=None): + "Close the dialog and remove hit tags." + SearchDialogBase.close(self, event) + self.text.tag_remove("hit", "1.0", "end") + self.insert_tags = None + + +def _replace_dialog(parent): # htest # + from tkinter import Toplevel, Text, END, SEL + from tkinter.ttk import Frame, Button + + top = Toplevel(parent) + top.title("Test ReplaceDialog") + x, y = map(int, parent.geometry().split('+')[1:]) + top.geometry("+%d+%d" % (x, y + 175)) + + # mock undo delegator methods + def undo_block_start(): + pass + + def undo_block_stop(): + pass + + frame = Frame(top) + frame.pack() + text = Text(frame, inactiveselectbackground='gray') + text.undo_block_start = undo_block_start + text.undo_block_stop = undo_block_stop + text.pack() + text.insert("insert","This is a sample sTring\nPlus MORE.") + text.focus_set() + + def show_replace(): + text.tag_add(SEL, "1.0", END) + replace(text) + text.tag_remove(SEL, "1.0", END) + + button = Button(frame, text="Replace", command=show_replace) + button.pack() + + +if __name__ == '__main__': + from unittest import main + main('idlelib.idle_test.test_replace', verbosity=2, exit=False) + + from idlelib.idle_test.htest import run + run(_replace_dialog) diff --git a/Lib/idlelib/rpc.py b/Lib/idlelib/rpc.py new file mode 100644 index 000000000..3f0b2230d --- /dev/null +++ b/Lib/idlelib/rpc.py @@ -0,0 +1,635 @@ +"""RPC Implementation, originally written for the Python Idle IDE + +For security reasons, GvR requested that Idle's Python execution server process +connect to the Idle process, which listens for the connection. Since Idle has +only one client per server, this was not a limitation. + + +---------------------------------+ +-------------+ + | socketserver.BaseRequestHandler | | SocketIO | + +---------------------------------+ +-------------+ + ^ | register() | + | | unregister()| + | +-------------+ + | ^ ^ + | | | + | + -------------------+ | + | | | + +-------------------------+ +-----------------+ + | RPCHandler | | RPCClient | + | [attribute of RPCServer]| | | + +-------------------------+ +-----------------+ + +The RPCServer handler class is expected to provide register/unregister methods. +RPCHandler inherits the mix-in class SocketIO, which provides these methods. + +See the Idle run.main() docstring for further information on how this was +accomplished in Idle. + +""" +import builtins +import copyreg +import io +import marshal +import os +import pickle +import queue +import select +import socket +import socketserver +import struct +import sys +import threading +import traceback +import types + +def unpickle_code(ms): + "Return code object from marshal string ms." + co = marshal.loads(ms) + assert isinstance(co, types.CodeType) + return co + +def pickle_code(co): + "Return unpickle function and tuple with marshalled co code object." + assert isinstance(co, types.CodeType) + ms = marshal.dumps(co) + return unpickle_code, (ms,) + +def dumps(obj, protocol=None): + "Return pickled (or marshalled) string for obj." + # IDLE passes 'None' to select pickle.DEFAULT_PROTOCOL. + f = io.BytesIO() + p = CodePickler(f, protocol) + p.dump(obj) + return f.getvalue() + + +class CodePickler(pickle.Pickler): + dispatch_table = {types.CodeType: pickle_code, **copyreg.dispatch_table} + + +BUFSIZE = 8*1024 +LOCALHOST = '127.0.0.1' + +class RPCServer(socketserver.TCPServer): + + def __init__(self, addr, handlerclass=None): + if handlerclass is None: + handlerclass = RPCHandler + socketserver.TCPServer.__init__(self, addr, handlerclass) + + def server_bind(self): + "Override TCPServer method, no bind() phase for connecting entity" + pass + + def server_activate(self): + """Override TCPServer method, connect() instead of listen() + + Due to the reversed connection, self.server_address is actually the + address of the Idle Client to which we are connecting. + + """ + self.socket.connect(self.server_address) + + def get_request(self): + "Override TCPServer method, return already connected socket" + return self.socket, self.server_address + + def handle_error(self, request, client_address): + """Override TCPServer method + + Error message goes to __stderr__. No error message if exiting + normally or socket raised EOF. Other exceptions not handled in + server code will cause os._exit. + + """ + try: + raise + except SystemExit: + raise + except: + erf = sys.__stderr__ + print('\n' + '-'*40, file=erf) + print('Unhandled server exception!', file=erf) + print('Thread: %s' % threading.current_thread().name, file=erf) + print('Client Address: ', client_address, file=erf) + print('Request: ', repr(request), file=erf) + traceback.print_exc(file=erf) + print('\n*** Unrecoverable, server exiting!', file=erf) + print('-'*40, file=erf) + os._exit(0) + +#----------------- end class RPCServer -------------------- + +objecttable = {} +request_queue = queue.Queue(0) +response_queue = queue.Queue(0) + + +class SocketIO: + + nextseq = 0 + + def __init__(self, sock, objtable=None, debugging=None): + self.sockthread = threading.current_thread() + if debugging is not None: + self.debugging = debugging + self.sock = sock + if objtable is None: + objtable = objecttable + self.objtable = objtable + self.responses = {} + self.cvars = {} + + def close(self): + sock = self.sock + self.sock = None + if sock is not None: + sock.close() + + def exithook(self): + "override for specific exit action" + os._exit(0) + + def debug(self, *args): + if not self.debugging: + return + s = self.location + " " + str(threading.current_thread().name) + for a in args: + s = s + " " + str(a) + print(s, file=sys.__stderr__) + + def register(self, oid, object_): + self.objtable[oid] = object_ + + def unregister(self, oid): + try: + del self.objtable[oid] + except KeyError: + pass + + def localcall(self, seq, request): + self.debug("localcall:", request) + try: + how, (oid, methodname, args, kwargs) = request + except TypeError: + return ("ERROR", "Bad request format") + if oid not in self.objtable: + return ("ERROR", f"Unknown object id: {oid!r}") + obj = self.objtable[oid] + if methodname == "__methods__": + methods = {} + _getmethods(obj, methods) + return ("OK", methods) + if methodname == "__attributes__": + attributes = {} + _getattributes(obj, attributes) + return ("OK", attributes) + if not hasattr(obj, methodname): + return ("ERROR", f"Unsupported method name: {methodname!r}") + method = getattr(obj, methodname) + try: + if how == 'CALL': + ret = method(*args, **kwargs) + if isinstance(ret, RemoteObject): + ret = remoteref(ret) + return ("OK", ret) + elif how == 'QUEUE': + request_queue.put((seq, (method, args, kwargs))) + return("QUEUED", None) + else: + return ("ERROR", "Unsupported message type: %s" % how) + except SystemExit: + raise + except KeyboardInterrupt: + raise + except OSError: + raise + except Exception as ex: + return ("CALLEXC", ex) + except: + msg = "*** Internal Error: rpc.py:SocketIO.localcall()\n\n"\ + " Object: %s \n Method: %s \n Args: %s\n" + print(msg % (oid, method, args), file=sys.__stderr__) + traceback.print_exc(file=sys.__stderr__) + return ("EXCEPTION", None) + + def remotecall(self, oid, methodname, args, kwargs): + self.debug("remotecall:asynccall: ", oid, methodname) + seq = self.asynccall(oid, methodname, args, kwargs) + return self.asyncreturn(seq) + + def remotequeue(self, oid, methodname, args, kwargs): + self.debug("remotequeue:asyncqueue: ", oid, methodname) + seq = self.asyncqueue(oid, methodname, args, kwargs) + return self.asyncreturn(seq) + + def asynccall(self, oid, methodname, args, kwargs): + request = ("CALL", (oid, methodname, args, kwargs)) + seq = self.newseq() + if threading.current_thread() != self.sockthread: + cvar = threading.Condition() + self.cvars[seq] = cvar + self.debug(("asynccall:%d:" % seq), oid, methodname, args, kwargs) + self.putmessage((seq, request)) + return seq + + def asyncqueue(self, oid, methodname, args, kwargs): + request = ("QUEUE", (oid, methodname, args, kwargs)) + seq = self.newseq() + if threading.current_thread() != self.sockthread: + cvar = threading.Condition() + self.cvars[seq] = cvar + self.debug(("asyncqueue:%d:" % seq), oid, methodname, args, kwargs) + self.putmessage((seq, request)) + return seq + + def asyncreturn(self, seq): + self.debug("asyncreturn:%d:call getresponse(): " % seq) + response = self.getresponse(seq, wait=0.05) + self.debug(("asyncreturn:%d:response: " % seq), response) + return self.decoderesponse(response) + + def decoderesponse(self, response): + how, what = response + if how == "OK": + return what + if how == "QUEUED": + return None + if how == "EXCEPTION": + self.debug("decoderesponse: EXCEPTION") + return None + if how == "EOF": + self.debug("decoderesponse: EOF") + self.decode_interrupthook() + return None + if how == "ERROR": + self.debug("decoderesponse: Internal ERROR:", what) + raise RuntimeError(what) + if how == "CALLEXC": + self.debug("decoderesponse: Call Exception:", what) + raise what + raise SystemError(how, what) + + def decode_interrupthook(self): + "" + raise EOFError + + def mainloop(self): + """Listen on socket until I/O not ready or EOF + + pollresponse() will loop looking for seq number None, which + never comes, and exit on EOFError. + + """ + try: + self.getresponse(myseq=None, wait=0.05) + except EOFError: + self.debug("mainloop:return") + return + + def getresponse(self, myseq, wait): + response = self._getresponse(myseq, wait) + if response is not None: + how, what = response + if how == "OK": + response = how, self._proxify(what) + return response + + def _proxify(self, obj): + if isinstance(obj, RemoteProxy): + return RPCProxy(self, obj.oid) + if isinstance(obj, list): + return list(map(self._proxify, obj)) + # XXX Check for other types -- not currently needed + return obj + + def _getresponse(self, myseq, wait): + self.debug("_getresponse:myseq:", myseq) + if threading.current_thread() is self.sockthread: + # this thread does all reading of requests or responses + while True: + response = self.pollresponse(myseq, wait) + if response is not None: + return response + else: + # wait for notification from socket handling thread + cvar = self.cvars[myseq] + cvar.acquire() + while myseq not in self.responses: + cvar.wait() + response = self.responses[myseq] + self.debug("_getresponse:%s: thread woke up: response: %s" % + (myseq, response)) + del self.responses[myseq] + del self.cvars[myseq] + cvar.release() + return response + + def newseq(self): + self.nextseq = seq = self.nextseq + 2 + return seq + + def putmessage(self, message): + self.debug("putmessage:%d:" % message[0]) + try: + s = dumps(message) + except pickle.PicklingError: + print("Cannot pickle:", repr(message), file=sys.__stderr__) + raise + s = struct.pack("<i", len(s)) + s + while len(s) > 0: + try: + r, w, x = select.select([], [self.sock], []) + n = self.sock.send(s[:BUFSIZE]) + except (AttributeError, TypeError): + raise OSError("socket no longer exists") + s = s[n:] + + buff = b'' + bufneed = 4 + bufstate = 0 # meaning: 0 => reading count; 1 => reading data + + def pollpacket(self, wait): + self._stage0() + if len(self.buff) < self.bufneed: + r, w, x = select.select([self.sock.fileno()], [], [], wait) + if len(r) == 0: + return None + try: + s = self.sock.recv(BUFSIZE) + except OSError: + raise EOFError + if len(s) == 0: + raise EOFError + self.buff += s + self._stage0() + return self._stage1() + + def _stage0(self): + if self.bufstate == 0 and len(self.buff) >= 4: + s = self.buff[:4] + self.buff = self.buff[4:] + self.bufneed = struct.unpack("<i", s)[0] + self.bufstate = 1 + + def _stage1(self): + if self.bufstate == 1 and len(self.buff) >= self.bufneed: + packet = self.buff[:self.bufneed] + self.buff = self.buff[self.bufneed:] + self.bufneed = 4 + self.bufstate = 0 + return packet + + def pollmessage(self, wait): + packet = self.pollpacket(wait) + if packet is None: + return None + try: + message = pickle.loads(packet) + except pickle.UnpicklingError: + print("-----------------------", file=sys.__stderr__) + print("cannot unpickle packet:", repr(packet), file=sys.__stderr__) + traceback.print_stack(file=sys.__stderr__) + print("-----------------------", file=sys.__stderr__) + raise + return message + + def pollresponse(self, myseq, wait): + """Handle messages received on the socket. + + Some messages received may be asynchronous 'call' or 'queue' requests, + and some may be responses for other threads. + + 'call' requests are passed to self.localcall() with the expectation of + immediate execution, during which time the socket is not serviced. + + 'queue' requests are used for tasks (which may block or hang) to be + processed in a different thread. These requests are fed into + request_queue by self.localcall(). Responses to queued requests are + taken from response_queue and sent across the link with the associated + sequence numbers. Messages in the queues are (sequence_number, + request/response) tuples and code using this module removing messages + from the request_queue is responsible for returning the correct + sequence number in the response_queue. + + pollresponse() will loop until a response message with the myseq + sequence number is received, and will save other responses in + self.responses and notify the owning thread. + + """ + while True: + # send queued response if there is one available + try: + qmsg = response_queue.get(0) + except queue.Empty: + pass + else: + seq, response = qmsg + message = (seq, ('OK', response)) + self.putmessage(message) + # poll for message on link + try: + message = self.pollmessage(wait) + if message is None: # socket not ready + return None + except EOFError: + self.handle_EOF() + return None + except AttributeError: + return None + seq, resq = message + how = resq[0] + self.debug("pollresponse:%d:myseq:%s" % (seq, myseq)) + # process or queue a request + if how in ("CALL", "QUEUE"): + self.debug("pollresponse:%d:localcall:call:" % seq) + response = self.localcall(seq, resq) + self.debug("pollresponse:%d:localcall:response:%s" + % (seq, response)) + if how == "CALL": + self.putmessage((seq, response)) + elif how == "QUEUE": + # don't acknowledge the 'queue' request! + pass + continue + # return if completed message transaction + elif seq == myseq: + return resq + # must be a response for a different thread: + else: + cv = self.cvars.get(seq, None) + # response involving unknown sequence number is discarded, + # probably intended for prior incarnation of server + if cv is not None: + cv.acquire() + self.responses[seq] = resq + cv.notify() + cv.release() + continue + + def handle_EOF(self): + "action taken upon link being closed by peer" + self.EOFhook() + self.debug("handle_EOF") + for key in self.cvars: + cv = self.cvars[key] + cv.acquire() + self.responses[key] = ('EOF', None) + cv.notify() + cv.release() + # call our (possibly overridden) exit function + self.exithook() + + def EOFhook(self): + "Classes using rpc client/server can override to augment EOF action" + pass + +#----------------- end class SocketIO -------------------- + +class RemoteObject: + # Token mix-in class + pass + + +def remoteref(obj): + oid = id(obj) + objecttable[oid] = obj + return RemoteProxy(oid) + + +class RemoteProxy: + + def __init__(self, oid): + self.oid = oid + + +class RPCHandler(socketserver.BaseRequestHandler, SocketIO): + + debugging = False + location = "#S" # Server + + def __init__(self, sock, addr, svr): + svr.current_handler = self ## cgt xxx + SocketIO.__init__(self, sock) + socketserver.BaseRequestHandler.__init__(self, sock, addr, svr) + + def handle(self): + "handle() method required by socketserver" + self.mainloop() + + def get_remote_proxy(self, oid): + return RPCProxy(self, oid) + + +class RPCClient(SocketIO): + + debugging = False + location = "#C" # Client + + nextseq = 1 # Requests coming from the client are odd numbered + + def __init__(self, address, family=socket.AF_INET, type=socket.SOCK_STREAM): + self.listening_sock = socket.socket(family, type) + self.listening_sock.bind(address) + self.listening_sock.listen(1) + + def accept(self): + working_sock, address = self.listening_sock.accept() + if self.debugging: + print("****** Connection request from ", address, file=sys.__stderr__) + if address[0] == LOCALHOST: + SocketIO.__init__(self, working_sock) + else: + print("** Invalid host: ", address, file=sys.__stderr__) + raise OSError + + def get_remote_proxy(self, oid): + return RPCProxy(self, oid) + + +class RPCProxy: + + __methods = None + __attributes = None + + def __init__(self, sockio, oid): + self.sockio = sockio + self.oid = oid + + def __getattr__(self, name): + if self.__methods is None: + self.__getmethods() + if self.__methods.get(name): + return MethodProxy(self.sockio, self.oid, name) + if self.__attributes is None: + self.__getattributes() + if name in self.__attributes: + value = self.sockio.remotecall(self.oid, '__getattribute__', + (name,), {}) + return value + else: + raise AttributeError(name) + + def __getattributes(self): + self.__attributes = self.sockio.remotecall(self.oid, + "__attributes__", (), {}) + + def __getmethods(self): + self.__methods = self.sockio.remotecall(self.oid, + "__methods__", (), {}) + +def _getmethods(obj, methods): + # Helper to get a list of methods from an object + # Adds names to dictionary argument 'methods' + for name in dir(obj): + attr = getattr(obj, name) + if callable(attr): + methods[name] = 1 + if isinstance(obj, type): + for super in obj.__bases__: + _getmethods(super, methods) + +def _getattributes(obj, attributes): + for name in dir(obj): + attr = getattr(obj, name) + if not callable(attr): + attributes[name] = 1 + + +class MethodProxy: + + def __init__(self, sockio, oid, name): + self.sockio = sockio + self.oid = oid + self.name = name + + def __call__(self, /, *args, **kwargs): + value = self.sockio.remotecall(self.oid, self.name, args, kwargs) + return value + + +# XXX KBK 09Sep03 We need a proper unit test for this module. Previously +# existing test code was removed at Rev 1.27 (r34098). + +def displayhook(value): + """Override standard display hook to use non-locale encoding""" + if value is None: + return + # Set '_' to None to avoid recursion + builtins._ = None + text = repr(value) + try: + sys.stdout.write(text) + except UnicodeEncodeError: + # let's use ascii while utf8-bmp codec doesn't present + encoding = 'ascii' + bytes = text.encode(encoding, 'backslashreplace') + text = bytes.decode(encoding, 'strict') + sys.stdout.write(text) + sys.stdout.write("\n") + builtins._ = value + + +if __name__ == '__main__': + from unittest import main + main('idlelib.idle_test.test_rpc', verbosity=2,) diff --git a/Lib/idlelib/run.py b/Lib/idlelib/run.py new file mode 100644 index 000000000..a30db99a6 --- /dev/null +++ b/Lib/idlelib/run.py @@ -0,0 +1,653 @@ +""" idlelib.run + +Simplified, pyshell.ModifiedInterpreter spawns a subprocess with +f'''{sys.executable} -c "__import__('idlelib.run').run.main()"''' +'.run' is needed because __import__ returns idlelib, not idlelib.run. +""" +import contextlib +import functools +import io +import linecache +import queue +import sys +import textwrap +import time +import traceback +import _thread as thread +import threading +import warnings + +import idlelib # testing +from idlelib import autocomplete # AutoComplete, fetch_encodings +from idlelib import calltip # Calltip +from idlelib import debugger_r # start_debugger +from idlelib import debugobj_r # remote_object_tree_item +from idlelib import iomenu # encoding +from idlelib import rpc # multiple objects +from idlelib import stackviewer # StackTreeItem +import __main__ + +import tkinter # Use tcl and, if startup fails, messagebox. +if not hasattr(sys.modules['idlelib.run'], 'firstrun'): + # Undo modifications of tkinter by idlelib imports; see bpo-25507. + for mod in ('simpledialog', 'messagebox', 'font', + 'dialog', 'filedialog', 'commondialog', + 'ttk'): + delattr(tkinter, mod) + del sys.modules['tkinter.' + mod] + # Avoid AttributeError if run again; see bpo-37038. + sys.modules['idlelib.run'].firstrun = False + +LOCALHOST = '127.0.0.1' + +try: + eof = 'Ctrl-D (end-of-file)' + exit.eof = eof + quit.eof = eof +except NameError: # In case subprocess started with -S (maybe in future). + pass + + +def idle_formatwarning(message, category, filename, lineno, line=None): + """Format warnings the IDLE way.""" + + s = "\nWarning (from warnings module):\n" + s += f' File \"{filename}\", line {lineno}\n' + if line is None: + line = linecache.getline(filename, lineno) + line = line.strip() + if line: + s += " %s\n" % line + s += f"{category.__name__}: {message}\n" + return s + +def idle_showwarning_subproc( + message, category, filename, lineno, file=None, line=None): + """Show Idle-format warning after replacing warnings.showwarning. + + The only difference is the formatter called. + """ + if file is None: + file = sys.stderr + try: + file.write(idle_formatwarning( + message, category, filename, lineno, line)) + except OSError: + pass # the file (probably stderr) is invalid - this warning gets lost. + +_warnings_showwarning = None + +def capture_warnings(capture): + "Replace warning.showwarning with idle_showwarning_subproc, or reverse." + + global _warnings_showwarning + if capture: + if _warnings_showwarning is None: + _warnings_showwarning = warnings.showwarning + warnings.showwarning = idle_showwarning_subproc + else: + if _warnings_showwarning is not None: + warnings.showwarning = _warnings_showwarning + _warnings_showwarning = None + +capture_warnings(True) + +if idlelib.testing: + # gh-121008: When testing IDLE, don't create a Tk object to avoid side + # effects such as installing a PyOS_InputHook hook. + def handle_tk_events(): + pass +else: + tcl = tkinter.Tcl() + + def handle_tk_events(tcl=tcl): + """Process any tk events that are ready to be dispatched if tkinter + has been imported, a tcl interpreter has been created and tk has been + loaded.""" + tcl.eval("update") + +# Thread shared globals: Establish a queue between a subthread (which handles +# the socket) and the main thread (which runs user code), plus global +# completion, exit and interruptible (the main thread) flags: + +exit_now = False +quitting = False +interruptible = False + +def main(del_exitfunc=False): + """Start the Python execution server in a subprocess + + In the Python subprocess, RPCServer is instantiated with handlerclass + MyHandler, which inherits register/unregister methods from RPCHandler via + the mix-in class SocketIO. + + When the RPCServer 'server' is instantiated, the TCPServer initialization + creates an instance of run.MyHandler and calls its handle() method. + handle() instantiates a run.Executive object, passing it a reference to the + MyHandler object. That reference is saved as attribute rpchandler of the + Executive instance. The Executive methods have access to the reference and + can pass it on to entities that they command + (e.g. debugger_r.Debugger.start_debugger()). The latter, in turn, can + call MyHandler(SocketIO) register/unregister methods via the reference to + register and unregister themselves. + + """ + global exit_now + global quitting + global no_exitfunc + no_exitfunc = del_exitfunc + #time.sleep(15) # test subprocess not responding + try: + assert(len(sys.argv) > 1) + port = int(sys.argv[-1]) + except: + print("IDLE Subprocess: no IP port passed in sys.argv.", + file=sys.__stderr__) + return + + capture_warnings(True) + sys.argv[:] = [""] + threading.Thread(target=manage_socket, + name='SockThread', + args=((LOCALHOST, port),), + daemon=True, + ).start() + + while True: + try: + if exit_now: + try: + exit() + except KeyboardInterrupt: + # exiting but got an extra KBI? Try again! + continue + try: + request = rpc.request_queue.get(block=True, timeout=0.05) + except queue.Empty: + request = None + # Issue 32207: calling handle_tk_events here adds spurious + # queue.Empty traceback to event handling exceptions. + if request: + seq, (method, args, kwargs) = request + ret = method(*args, **kwargs) + rpc.response_queue.put((seq, ret)) + else: + handle_tk_events() + except KeyboardInterrupt: + if quitting: + exit_now = True + continue + except SystemExit: + capture_warnings(False) + raise + except: + type, value, tb = sys.exc_info() + try: + print_exception() + rpc.response_queue.put((seq, None)) + except: + # Link didn't work, print same exception to __stderr__ + traceback.print_exception(type, value, tb, file=sys.__stderr__) + exit() + else: + continue + +def manage_socket(address): + for i in range(3): + time.sleep(i) + try: + server = MyRPCServer(address, MyHandler) + break + except OSError as err: + print("IDLE Subprocess: OSError: " + err.args[1] + + ", retrying....", file=sys.__stderr__) + socket_error = err + else: + print("IDLE Subprocess: Connection to " + "IDLE GUI failed, exiting.", file=sys.__stderr__) + show_socket_error(socket_error, address) + global exit_now + exit_now = True + return + server.handle_request() # A single request only + +def show_socket_error(err, address): + "Display socket error from manage_socket." + import tkinter + from tkinter.messagebox import showerror + root = tkinter.Tk() + fix_scaling(root) + root.withdraw() + showerror( + "Subprocess Connection Error", + f"IDLE's subprocess can't connect to {address[0]}:{address[1]}.\n" + f"Fatal OSError #{err.errno}: {err.strerror}.\n" + "See the 'Startup failure' section of the IDLE doc, online at\n" + "https://docs.python.org/3/library/idle.html#startup-failure", + parent=root) + root.destroy() + + +def get_message_lines(typ, exc, tb): + "Return line composing the exception message." + if typ in (AttributeError, NameError): + # 3.10+ hints are not directly accessible from python (#44026). + err = io.StringIO() + with contextlib.redirect_stderr(err): + sys.__excepthook__(typ, exc, tb) + return [err.getvalue().split("\n")[-2] + "\n"] + else: + return traceback.format_exception_only(typ, exc) + + +def print_exception(): + import linecache + linecache.checkcache() + flush_stdout() + efile = sys.stderr + typ, val, tb = excinfo = sys.exc_info() + sys.last_type, sys.last_value, sys.last_traceback = excinfo + sys.last_exc = val + seen = set() + + def print_exc(typ, exc, tb): + seen.add(id(exc)) + context = exc.__context__ + cause = exc.__cause__ + if cause is not None and id(cause) not in seen: + print_exc(type(cause), cause, cause.__traceback__) + print("\nThe above exception was the direct cause " + "of the following exception:\n", file=efile) + elif (context is not None and + not exc.__suppress_context__ and + id(context) not in seen): + print_exc(type(context), context, context.__traceback__) + print("\nDuring handling of the above exception, " + "another exception occurred:\n", file=efile) + if tb: + tbe = traceback.extract_tb(tb) + print('Traceback (most recent call last):', file=efile) + exclude = ("run.py", "rpc.py", "threading.py", "queue.py", + "debugger_r.py", "bdb.py") + cleanup_traceback(tbe, exclude) + traceback.print_list(tbe, file=efile) + lines = get_message_lines(typ, exc, tb) + for line in lines: + print(line, end='', file=efile) + + print_exc(typ, val, tb) + +def cleanup_traceback(tb, exclude): + "Remove excluded traces from beginning/end of tb; get cached lines" + orig_tb = tb[:] + while tb: + for rpcfile in exclude: + if tb[0][0].count(rpcfile): + break # found an exclude, break for: and delete tb[0] + else: + break # no excludes, have left RPC code, break while: + del tb[0] + while tb: + for rpcfile in exclude: + if tb[-1][0].count(rpcfile): + break + else: + break + del tb[-1] + if len(tb) == 0: + # exception was in IDLE internals, don't prune! + tb[:] = orig_tb[:] + print("** IDLE Internal Exception: ", file=sys.stderr) + rpchandler = rpc.objecttable['exec'].rpchandler + for i in range(len(tb)): + fn, ln, nm, line = tb[i] + if nm == '?': + nm = "-toplevel-" + if not line and fn.startswith("<pyshell#"): + line = rpchandler.remotecall('linecache', 'getline', + (fn, ln), {}) + tb[i] = fn, ln, nm, line + +def flush_stdout(): + """XXX How to do this now?""" + +def exit(): + """Exit subprocess, possibly after first clearing exit functions. + + If config-main.cfg/.def 'General' 'delete-exitfunc' is True, then any + functions registered with atexit will be removed before exiting. + (VPython support) + + """ + if no_exitfunc: + import atexit + atexit._clear() + capture_warnings(False) + sys.exit(0) + + +def fix_scaling(root): + """Scale fonts on HiDPI displays.""" + import tkinter.font + scaling = float(root.tk.call('tk', 'scaling')) + if scaling > 1.4: + for name in tkinter.font.names(root): + font = tkinter.font.Font(root=root, name=name, exists=True) + size = int(font['size']) + if size < 0: + font['size'] = round(-0.75*size) + + +def fixdoc(fun, text): + tem = (fun.__doc__ + '\n\n') if fun.__doc__ is not None else '' + fun.__doc__ = tem + textwrap.fill(textwrap.dedent(text)) + +RECURSIONLIMIT_DELTA = 30 + +def install_recursionlimit_wrappers(): + """Install wrappers to always add 30 to the recursion limit.""" + # see: bpo-26806 + + @functools.wraps(sys.setrecursionlimit) + def setrecursionlimit(*args, **kwargs): + # mimic the original sys.setrecursionlimit()'s input handling + if kwargs: + raise TypeError( + "setrecursionlimit() takes no keyword arguments") + try: + limit, = args + except ValueError: + raise TypeError(f"setrecursionlimit() takes exactly one " + f"argument ({len(args)} given)") + if not limit > 0: + raise ValueError( + "recursion limit must be greater or equal than 1") + + return setrecursionlimit.__wrapped__(limit + RECURSIONLIMIT_DELTA) + + fixdoc(setrecursionlimit, f"""\ + This IDLE wrapper adds {RECURSIONLIMIT_DELTA} to prevent possible + uninterruptible loops.""") + + @functools.wraps(sys.getrecursionlimit) + def getrecursionlimit(): + return getrecursionlimit.__wrapped__() - RECURSIONLIMIT_DELTA + + fixdoc(getrecursionlimit, f"""\ + This IDLE wrapper subtracts {RECURSIONLIMIT_DELTA} to compensate + for the {RECURSIONLIMIT_DELTA} IDLE adds when setting the limit.""") + + # add the delta to the default recursion limit, to compensate + sys.setrecursionlimit(sys.getrecursionlimit() + RECURSIONLIMIT_DELTA) + + sys.setrecursionlimit = setrecursionlimit + sys.getrecursionlimit = getrecursionlimit + + +def uninstall_recursionlimit_wrappers(): + """Uninstall the recursion limit wrappers from the sys module. + + IDLE only uses this for tests. Users can import run and call + this to remove the wrapping. + """ + if ( + getattr(sys.setrecursionlimit, '__wrapped__', None) and + getattr(sys.getrecursionlimit, '__wrapped__', None) + ): + sys.setrecursionlimit = sys.setrecursionlimit.__wrapped__ + sys.getrecursionlimit = sys.getrecursionlimit.__wrapped__ + sys.setrecursionlimit(sys.getrecursionlimit() - RECURSIONLIMIT_DELTA) + + +class MyRPCServer(rpc.RPCServer): + + def handle_error(self, request, client_address): + """Override RPCServer method for IDLE + + Interrupt the MainThread and exit server if link is dropped. + + """ + global quitting + try: + raise + except SystemExit: + raise + except EOFError: + global exit_now + exit_now = True + thread.interrupt_main() + except: + erf = sys.__stderr__ + print(textwrap.dedent(f""" + {'-'*40} + Unhandled exception in user code execution server!' + Thread: {threading.current_thread().name} + IDLE Client Address: {client_address} + Request: {request!r} + """), file=erf) + traceback.print_exc(limit=-20, file=erf) + print(textwrap.dedent(f""" + *** Unrecoverable, server exiting! + + Users should never see this message; it is likely transient. + If this recurs, report this with a copy of the message + and an explanation of how to make it repeat. + {'-'*40}"""), file=erf) + quitting = True + thread.interrupt_main() + + +# Pseudofiles for shell-remote communication (also used in pyshell) + +class StdioFile(io.TextIOBase): + + def __init__(self, shell, tags, encoding='utf-8', errors='strict'): + self.shell = shell + # GH-78889: accessing unpickleable attributes freezes Shell. + # IDLE only needs methods; allow 'width' for possible use. + self.shell._RPCProxy__attributes = {'width': 1} + self.tags = tags + self._encoding = encoding + self._errors = errors + + @property + def encoding(self): + return self._encoding + + @property + def errors(self): + return self._errors + + @property + def name(self): + return '<%s>' % self.tags + + def isatty(self): + return True + + +class StdOutputFile(StdioFile): + + def writable(self): + return True + + def write(self, s): + if self.closed: + raise ValueError("write to closed file") + s = str.encode(s, self.encoding, self.errors).decode(self.encoding, self.errors) + return self.shell.write(s, self.tags) + + +class StdInputFile(StdioFile): + _line_buffer = '' + + def readable(self): + return True + + def read(self, size=-1): + if self.closed: + raise ValueError("read from closed file") + if size is None: + size = -1 + elif not isinstance(size, int): + raise TypeError('must be int, not ' + type(size).__name__) + result = self._line_buffer + self._line_buffer = '' + if size < 0: + while line := self.shell.readline(): + result += line + else: + while len(result) < size: + line = self.shell.readline() + if not line: break + result += line + self._line_buffer = result[size:] + result = result[:size] + return result + + def readline(self, size=-1): + if self.closed: + raise ValueError("read from closed file") + if size is None: + size = -1 + elif not isinstance(size, int): + raise TypeError('must be int, not ' + type(size).__name__) + line = self._line_buffer or self.shell.readline() + if size < 0: + size = len(line) + eol = line.find('\n', 0, size) + if eol >= 0: + size = eol + 1 + self._line_buffer = line[size:] + return line[:size] + + def close(self): + self.shell.close() + + +class MyHandler(rpc.RPCHandler): + + def handle(self): + """Override base method""" + executive = Executive(self) + self.register("exec", executive) + self.console = self.get_remote_proxy("console") + sys.stdin = StdInputFile(self.console, "stdin", + iomenu.encoding, iomenu.errors) + sys.stdout = StdOutputFile(self.console, "stdout", + iomenu.encoding, iomenu.errors) + sys.stderr = StdOutputFile(self.console, "stderr", + iomenu.encoding, "backslashreplace") + + sys.displayhook = rpc.displayhook + # page help() text to shell. + import pydoc # import must be done here to capture i/o binding + pydoc.pager = pydoc.plainpager + + # Keep a reference to stdin so that it won't try to exit IDLE if + # sys.stdin gets changed from within IDLE's shell. See issue17838. + self._keep_stdin = sys.stdin + + install_recursionlimit_wrappers() + + self.interp = self.get_remote_proxy("interp") + rpc.RPCHandler.getresponse(self, myseq=None, wait=0.05) + + def exithook(self): + "override SocketIO method - wait for MainThread to shut us down" + time.sleep(10) + + def EOFhook(self): + "Override SocketIO method - terminate wait on callback and exit thread" + global quitting + quitting = True + thread.interrupt_main() + + def decode_interrupthook(self): + "interrupt awakened thread" + global quitting + quitting = True + thread.interrupt_main() + + +class Executive: + + def __init__(self, rpchandler): + self.rpchandler = rpchandler + if idlelib.testing is False: + self.locals = __main__.__dict__ + self.calltip = calltip.Calltip() + self.autocomplete = autocomplete.AutoComplete() + else: + self.locals = {} + + def runcode(self, code): + global interruptible + try: + self.user_exc_info = None + interruptible = True + try: + exec(code, self.locals) + finally: + interruptible = False + except SystemExit as e: + if e.args: # SystemExit called with an argument. + ob = e.args[0] + if not isinstance(ob, (type(None), int)): + print('SystemExit: ' + str(ob), file=sys.stderr) + # Return to the interactive prompt. + except: + self.user_exc_info = sys.exc_info() # For testing, hook, viewer. + if quitting: + exit() + if sys.excepthook is sys.__excepthook__: + print_exception() + else: + try: + sys.excepthook(*self.user_exc_info) + except: + self.user_exc_info = sys.exc_info() # For testing. + print_exception() + jit = self.rpchandler.console.getvar("<<toggle-jit-stack-viewer>>") + if jit: + self.rpchandler.interp.open_remote_stack_viewer() + else: + flush_stdout() + + def interrupt_the_server(self): + if interruptible: + thread.interrupt_main() + + def start_the_debugger(self, gui_adap_oid): + return debugger_r.start_debugger(self.rpchandler, gui_adap_oid) + + def stop_the_debugger(self, idb_adap_oid): + "Unregister the Idb Adapter. Link objects and Idb then subject to GC" + self.rpchandler.unregister(idb_adap_oid) + + def get_the_calltip(self, name): + return self.calltip.fetch_tip(name) + + def get_the_completion_list(self, what, mode): + return self.autocomplete.fetch_completions(what, mode) + + def stackviewer(self, flist_oid=None): + if self.user_exc_info: + _, exc, tb = self.user_exc_info + else: + return None + flist = None + if flist_oid is not None: + flist = self.rpchandler.get_remote_proxy(flist_oid) + while tb and tb.tb_frame.f_globals["__name__"] in ["rpc", "run"]: + tb = tb.tb_next + exc.__traceback__ = tb + item = stackviewer.StackTreeItem(exc, flist) + return debugobj_r.remote_object_tree_item(item) + + +if __name__ == '__main__': + from unittest import main + main('idlelib.idle_test.test_run', verbosity=2) + +capture_warnings(False) # Make sure turned off; see bpo-18081. diff --git a/Lib/idlelib/runscript.py b/Lib/idlelib/runscript.py new file mode 100644 index 000000000..55712e904 --- /dev/null +++ b/Lib/idlelib/runscript.py @@ -0,0 +1,213 @@ +"""Execute code from an editor. + +Check module: do a full syntax check of the current module. +Also run the tabnanny to catch any inconsistent tabs. + +Run module: also execute the module's code in the __main__ namespace. +The window must have been saved previously. The module is added to +sys.modules, and is also added to the __main__ namespace. + +TODO: Specify command line arguments in a dialog box. +""" +import os +import tabnanny +import time +import tokenize + +from tkinter import messagebox + +from idlelib.config import idleConf +from idlelib import macosx +from idlelib import pyshell +from idlelib.query import CustomRun +from idlelib import outwin + +indent_message = """Error: Inconsistent indentation detected! + +1) Your indentation is outright incorrect (easy to fix), OR + +2) Your indentation mixes tabs and spaces. + +To fix case 2, change all tabs to spaces by using Edit->Select All followed \ +by Format->Untabify Region and specify the number of columns used by each tab. +""" + + +class ScriptBinding: + + def __init__(self, editwin): + self.editwin = editwin + # Provide instance variables referenced by debugger + # XXX This should be done differently + self.flist = self.editwin.flist + self.root = self.editwin.root + # cli_args is list of strings that extends sys.argv + self.cli_args = [] + self.perf = 0.0 # Workaround for macOS 11 Uni2; see bpo-42508. + + def check_module_event(self, event): + if isinstance(self.editwin, outwin.OutputWindow): + self.editwin.text.bell() + return 'break' + filename = self.getfilename() + if not filename: + return 'break' + if not self.checksyntax(filename): + return 'break' + if not self.tabnanny(filename): + return 'break' + return "break" + + def tabnanny(self, filename): + # XXX: tabnanny should work on binary files as well + with tokenize.open(filename) as f: + try: + tabnanny.process_tokens(tokenize.generate_tokens(f.readline)) + except tokenize.TokenError as msg: + msgtxt, (lineno, start) = msg.args + self.editwin.gotoline(lineno) + self.errorbox("Tabnanny Tokenizing Error", + "Token Error: %s" % msgtxt) + return False + except tabnanny.NannyNag as nag: + # The error messages from tabnanny are too confusing... + self.editwin.gotoline(nag.get_lineno()) + self.errorbox("Tab/space error", indent_message) + return False + return True + + def checksyntax(self, filename): + self.shell = shell = self.flist.open_shell() + saved_stream = shell.get_warning_stream() + shell.set_warning_stream(shell.stderr) + with open(filename, 'rb') as f: + source = f.read() + if b'\r' in source: + source = source.replace(b'\r\n', b'\n') + source = source.replace(b'\r', b'\n') + if source and source[-1] != ord(b'\n'): + source = source + b'\n' + editwin = self.editwin + text = editwin.text + text.tag_remove("ERROR", "1.0", "end") + try: + # If successful, return the compiled code + return compile(source, filename, "exec") + except (SyntaxError, OverflowError, ValueError) as value: + msg = getattr(value, 'msg', '') or value or "<no detail available>" + lineno = getattr(value, 'lineno', '') or 1 + offset = getattr(value, 'offset', '') or 0 + if offset == 0: + lineno += 1 #mark end of offending line + pos = "0.0 + %d lines + %d chars" % (lineno-1, offset-1) + editwin.colorize_syntax_error(text, pos) + self.errorbox("SyntaxError", "%-20s" % msg) + return False + finally: + shell.set_warning_stream(saved_stream) + + def run_custom_event(self, event): + return self.run_module_event(event, customize=True) + + def run_module_event(self, event, *, customize=False): + """Run the module after setting up the environment. + + First check the syntax. Next get customization. If OK, make + sure the shell is active and then transfer the arguments, set + the run environment's working directory to the directory of the + module being executed and also add that directory to its + sys.path if not already included. + """ + if macosx.isCocoaTk() and (time.perf_counter() - self.perf < .05): + return 'break' + if isinstance(self.editwin, outwin.OutputWindow): + self.editwin.text.bell() + return 'break' + filename = self.getfilename() + if not filename: + return 'break' + code = self.checksyntax(filename) + if not code: + return 'break' + if not self.tabnanny(filename): + return 'break' + if customize: + title = f"Customize {self.editwin.short_title()} Run" + run_args = CustomRun(self.shell.text, title, + cli_args=self.cli_args).result + if not run_args: # User cancelled. + return 'break' + self.cli_args, restart = run_args if customize else ([], True) + interp = self.shell.interp + if pyshell.use_subprocess and restart: + interp.restart_subprocess( + with_cwd=False, filename=filename) + dirname = os.path.dirname(filename) + argv = [filename] + if self.cli_args: + argv += self.cli_args + interp.runcommand(f"""if 1: + __file__ = {filename!r} + import sys as _sys + from os.path import basename as _basename + argv = {argv!r} + if (not _sys.argv or + _basename(_sys.argv[0]) != _basename(__file__) or + len(argv) > 1): + _sys.argv = argv + import os as _os + _os.chdir({dirname!r}) + del _sys, argv, _basename, _os + \n""") + interp.prepend_syspath(filename) + # XXX KBK 03Jul04 When run w/o subprocess, runtime warnings still + # go to __stderr__. With subprocess, they go to the shell. + # Need to change streams in pyshell.ModifiedInterpreter. + interp.runcode(code) + return 'break' + + def getfilename(self): + """Get source filename. If not saved, offer to save (or create) file + + The debugger requires a source file. Make sure there is one, and that + the current version of the source buffer has been saved. If the user + declines to save or cancels the Save As dialog, return None. + + If the user has configured IDLE for Autosave, the file will be + silently saved if it already exists and is dirty. + + """ + filename = self.editwin.io.filename + if not self.editwin.get_saved(): + autosave = idleConf.GetOption('main', 'General', + 'autosave', type='bool') + if autosave and filename: + self.editwin.io.save(None) + else: + confirm = self.ask_save_dialog() + self.editwin.text.focus_set() + if confirm: + self.editwin.io.save(None) + filename = self.editwin.io.filename + else: + filename = None + return filename + + def ask_save_dialog(self): + msg = "Source Must Be Saved\n" + 5*' ' + "OK to Save?" + confirm = messagebox.askokcancel(title="Save Before Run or Check", + message=msg, + default=messagebox.OK, + parent=self.editwin.text) + return confirm + + def errorbox(self, title, message): + # XXX This should really be a function of EditorWindow... + messagebox.showerror(title, message, parent=self.editwin.text) + self.editwin.text.focus_set() + self.perf = time.perf_counter() + + +if __name__ == "__main__": + from unittest import main + main('idlelib.idle_test.test_runscript', verbosity=2,) diff --git a/Lib/idlelib/scrolledlist.py b/Lib/idlelib/scrolledlist.py new file mode 100644 index 000000000..4fb418db3 --- /dev/null +++ b/Lib/idlelib/scrolledlist.py @@ -0,0 +1,151 @@ +from tkinter import * +from tkinter.ttk import Frame, Scrollbar + +from idlelib import macosx + + +class ScrolledList: + + default = "(None)" + + def __init__(self, master, **options): + # Create top frame, with scrollbar and listbox + self.master = master + self.frame = frame = Frame(master) + self.frame.pack(fill="both", expand=1) + self.vbar = vbar = Scrollbar(frame, name="vbar") + self.vbar.pack(side="right", fill="y") + self.listbox = listbox = Listbox(frame, exportselection=0, + background="white") + if options: + listbox.configure(options) + listbox.pack(expand=1, fill="both") + # Tie listbox and scrollbar together + vbar["command"] = listbox.yview + listbox["yscrollcommand"] = vbar.set + # Bind events to the list box + listbox.bind("<ButtonRelease-1>", self.click_event) + listbox.bind("<Double-ButtonRelease-1>", self.double_click_event) + if macosx.isAquaTk(): + listbox.bind("<ButtonPress-2>", self.popup_event) + listbox.bind("<Control-Button-1>", self.popup_event) + else: + listbox.bind("<ButtonPress-3>", self.popup_event) + listbox.bind("<Key-Up>", self.up_event) + listbox.bind("<Key-Down>", self.down_event) + # Mark as empty + self.clear() + + def close(self): + self.frame.destroy() + + def clear(self): + self.listbox.delete(0, "end") + self.empty = 1 + self.listbox.insert("end", self.default) + + def append(self, item): + if self.empty: + self.listbox.delete(0, "end") + self.empty = 0 + self.listbox.insert("end", str(item)) + + def get(self, index): + return self.listbox.get(index) + + def click_event(self, event): + self.listbox.activate("@%d,%d" % (event.x, event.y)) + index = self.listbox.index("active") + self.select(index) + self.on_select(index) + return "break" + + def double_click_event(self, event): + index = self.listbox.index("active") + self.select(index) + self.on_double(index) + return "break" + + menu = None + + def popup_event(self, event): + if not self.menu: + self.make_menu() + menu = self.menu + self.listbox.activate("@%d,%d" % (event.x, event.y)) + index = self.listbox.index("active") + self.select(index) + menu.tk_popup(event.x_root, event.y_root) + return "break" + + def make_menu(self): + menu = Menu(self.listbox, tearoff=0) + self.menu = menu + self.fill_menu() + + def up_event(self, event): + index = self.listbox.index("active") + if self.listbox.selection_includes(index): + index = index - 1 + else: + index = self.listbox.size() - 1 + if index < 0: + self.listbox.bell() + else: + self.select(index) + self.on_select(index) + return "break" + + def down_event(self, event): + index = self.listbox.index("active") + if self.listbox.selection_includes(index): + index = index + 1 + else: + index = 0 + if index >= self.listbox.size(): + self.listbox.bell() + else: + self.select(index) + self.on_select(index) + return "break" + + def select(self, index): + self.listbox.focus_set() + self.listbox.activate(index) + self.listbox.selection_clear(0, "end") + self.listbox.selection_set(index) + self.listbox.see(index) + + # Methods to override for specific actions + + def fill_menu(self): + pass + + def on_select(self, index): + pass + + def on_double(self, index): + pass + + +def _scrolled_list(parent): # htest # + top = Toplevel(parent) + x, y = map(int, parent.geometry().split('+')[1:]) + top.geometry("+%d+%d" % (x+200, y + 175)) + + class MyScrolledList(ScrolledList): + def fill_menu(self): self.menu.add_command(label="right click") + def on_select(self, index): print("select", self.get(index)) + def on_double(self, index): print("double", self.get(index)) + + scrolled_list = MyScrolledList(top) + for i in range(30): + scrolled_list.append("Item %02d" % i) + + +if __name__ == '__main__': + from unittest import main + main('idlelib.idle_test.test_scrolledlist', verbosity=2, exit=False) + + from idlelib.idle_test.htest import run + run(_scrolled_list) diff --git a/Lib/idlelib/search.py b/Lib/idlelib/search.py new file mode 100644 index 000000000..935a48322 --- /dev/null +++ b/Lib/idlelib/search.py @@ -0,0 +1,165 @@ +"""Search dialog for Find, Find Again, and Find Selection + functionality. + + Inherits from SearchDialogBase for GUI and uses searchengine + to prepare search pattern. +""" +from tkinter import TclError + +from idlelib import searchengine +from idlelib.searchbase import SearchDialogBase + +def _setup(text): + """Return the new or existing singleton SearchDialog instance. + + The singleton dialog saves user entries and preferences + across instances. + + Args: + text: Text widget containing the text to be searched. + """ + root = text._root() + engine = searchengine.get(root) + if not hasattr(engine, "_searchdialog"): + engine._searchdialog = SearchDialog(root, engine) + return engine._searchdialog + +def find(text): + """Open the search dialog. + + Module-level function to access the singleton SearchDialog + instance and open the dialog. If text is selected, it is + used as the search phrase; otherwise, the previous entry + is used. No search is done with this command. + """ + pat = text.get("sel.first", "sel.last") + return _setup(text).open(text, pat) # Open is inherited from SDBase. + +def find_again(text): + """Repeat the search for the last pattern and preferences. + + Module-level function to access the singleton SearchDialog + instance to search again using the user entries and preferences + from the last dialog. If there was no prior search, open the + search dialog; otherwise, perform the search without showing the + dialog. + """ + return _setup(text).find_again(text) + +def find_selection(text): + """Search for the selected pattern in the text. + + Module-level function to access the singleton SearchDialog + instance to search using the selected text. With a text + selection, perform the search without displaying the dialog. + Without a selection, use the prior entry as the search phrase + and don't display the dialog. If there has been no prior + search, open the search dialog. + """ + return _setup(text).find_selection(text) + + +class SearchDialog(SearchDialogBase): + "Dialog for finding a pattern in text." + + def create_widgets(self): + "Create the base search dialog and add a button for Find Next." + SearchDialogBase.create_widgets(self) + # TODO - why is this here and not in a create_command_buttons? + self.make_button("Find Next", self.default_command, isdef=True) + + def default_command(self, event=None): + "Handle the Find Next button as the default command." + if not self.engine.getprog(): + return + self.find_again(self.text) + + def find_again(self, text): + """Repeat the last search. + + If no search was previously run, open a new search dialog. In + this case, no search is done. + + If a search was previously run, the search dialog won't be + shown and the options from the previous search (including the + search pattern) will be used to find the next occurrence + of the pattern. Next is relative based on direction. + + Position the window to display the located occurrence in the + text. + + Return True if the search was successful and False otherwise. + """ + if not self.engine.getpat(): + self.open(text) + return False + if not self.engine.getprog(): + return False + res = self.engine.search_text(text) + if res: + line, m = res + i, j = m.span() + first = "%d.%d" % (line, i) + last = "%d.%d" % (line, j) + try: + selfirst = text.index("sel.first") + sellast = text.index("sel.last") + if selfirst == first and sellast == last: + self.bell() + return False + except TclError: + pass + text.tag_remove("sel", "1.0", "end") + text.tag_add("sel", first, last) + text.mark_set("insert", self.engine.isback() and first or last) + text.see("insert") + return True + else: + self.bell() + return False + + def find_selection(self, text): + """Search for selected text with previous dialog preferences. + + Instead of using the same pattern for searching (as Find + Again does), this first resets the pattern to the currently + selected text. If the selected text isn't changed, then use + the prior search phrase. + """ + pat = text.get("sel.first", "sel.last") + if pat: + self.engine.setcookedpat(pat) + return self.find_again(text) + + +def _search_dialog(parent): # htest # + "Display search test box." + from tkinter import Toplevel, Text + from tkinter.ttk import Frame, Button + + top = Toplevel(parent) + top.title("Test SearchDialog") + x, y = map(int, parent.geometry().split('+')[1:]) + top.geometry("+%d+%d" % (x, y + 175)) + + frame = Frame(top) + frame.pack() + text = Text(frame, inactiveselectbackground='gray') + text.pack() + text.insert("insert","This is a sample string.\n"*5) + + def show_find(): + text.tag_add('sel', '1.0', 'end') + _setup(text).open(text) + text.tag_remove('sel', '1.0', 'end') + + button = Button(frame, text="Search (selection ignored)", command=show_find) + button.pack() + + +if __name__ == '__main__': + from unittest import main + main('idlelib.idle_test.test_search', verbosity=2, exit=False) + + from idlelib.idle_test.htest import run + run(_search_dialog) diff --git a/Lib/idlelib/searchbase.py b/Lib/idlelib/searchbase.py new file mode 100644 index 000000000..c68a6ca33 --- /dev/null +++ b/Lib/idlelib/searchbase.py @@ -0,0 +1,210 @@ +'''Define SearchDialogBase used by Search, Replace, and Grep dialogs.''' + +from tkinter import Toplevel +from tkinter.ttk import Frame, Entry, Label, Button, Checkbutton, Radiobutton +from tkinter.simpledialog import _setup_dialog + + +class SearchDialogBase: + '''Create most of a 3 or 4 row, 3 column search dialog. + + The left and wide middle column contain: + 1 or 2 labeled text entry lines (make_entry, create_entries); + a row of standard Checkbuttons (make_frame, create_option_buttons), + each of which corresponds to a search engine Variable; + a row of dialog-specific Check/Radiobuttons (create_other_buttons). + + The narrow right column contains command buttons + (make_button, create_command_buttons). + These are bound to functions that execute the command. + + Except for command buttons, this base class is not limited to items + common to all three subclasses. Rather, it is the Find dialog minus + the "Find Next" command, its execution function, and the + default_command attribute needed in create_widgets. The other + dialogs override attributes and methods, the latter to replace and + add widgets. + ''' + + title = "Search Dialog" # replace in subclasses + icon = "Search" + needwrapbutton = 1 # not in Find in Files + + def __init__(self, root, engine): + '''Initialize root, engine, and top attributes. + + top (level widget): set in create_widgets() called from open(). + frame: container for all widgets in dialog. + text (Text searched): set in open(), only used in subclasses(). + ent (ry): created in make_entry() called from create_entry(). + row (of grid): 0 in create_widgets(), +1 in make_entry/frame(). + default_command: set in subclasses, used in create_widgets(). + + title (of dialog): class attribute, override in subclasses. + icon (of dialog): ditto, use unclear if cannot minimize dialog. + ''' + self.root = root + self.bell = root.bell + self.engine = engine + self.top = None + + def open(self, text, searchphrase=None): + "Make dialog visible on top of others and ready to use." + self.text = text + if not self.top: + self.create_widgets() + else: + self.top.deiconify() + self.top.tkraise() + self.top.transient(text.winfo_toplevel()) + if searchphrase: + self.ent.delete(0,"end") + self.ent.insert("end",searchphrase) + self.ent.focus_set() + self.ent.selection_range(0, "end") + self.ent.icursor(0) + self.top.grab_set() + + def close(self, event=None): + "Put dialog away for later use." + if self.top: + self.top.grab_release() + self.top.transient('') + self.top.withdraw() + + def create_widgets(self): + '''Create basic 3 row x 3 col search (find) dialog. + + Other dialogs override subsidiary create_x methods as needed. + Replace and Find-in-Files add another entry row. + ''' + top = Toplevel(self.root) + top.bind("<Return>", self.default_command) + top.bind("<Escape>", self.close) + top.protocol("WM_DELETE_WINDOW", self.close) + top.wm_title(self.title) + top.wm_iconname(self.icon) + _setup_dialog(top) + self.top = top + self.frame = Frame(top, padding=5) + self.frame.grid(sticky="nwes") + top.grid_columnconfigure(0, weight=100) + top.grid_rowconfigure(0, weight=100) + + self.row = 0 + self.frame.grid_columnconfigure(0, pad=2, weight=0) + self.frame.grid_columnconfigure(1, pad=2, minsize=100, weight=100) + + self.create_entries() # row 0 (and maybe 1), cols 0, 1 + self.create_option_buttons() # next row, cols 0, 1 + self.create_other_buttons() # next row, cols 0, 1 + self.create_command_buttons() # col 2, all rows + + def make_entry(self, label_text, var): + '''Return (entry, label), . + + entry - gridded labeled Entry for text entry. + label - Label widget, returned for testing. + ''' + label = Label(self.frame, text=label_text) + label.grid(row=self.row, column=0, sticky="nw") + entry = Entry(self.frame, textvariable=var, exportselection=0) + entry.grid(row=self.row, column=1, sticky="nwe") + self.row = self.row + 1 + return entry, label + + def create_entries(self): + "Create one or more entry lines with make_entry." + self.ent = self.make_entry("Find:", self.engine.patvar)[0] + + def make_frame(self,labeltext=None): + '''Return (frame, label). + + frame - gridded labeled Frame for option or other buttons. + label - Label widget, returned for testing. + ''' + if labeltext: + label = Label(self.frame, text=labeltext) + label.grid(row=self.row, column=0, sticky="nw") + else: + label = '' + frame = Frame(self.frame) + frame.grid(row=self.row, column=1, columnspan=1, sticky="nwe") + self.row = self.row + 1 + return frame, label + + def create_option_buttons(self): + '''Return (filled frame, options) for testing. + + Options is a list of searchengine booleanvar, label pairs. + A gridded frame from make_frame is filled with a Checkbutton + for each pair, bound to the var, with the corresponding label. + ''' + frame = self.make_frame("Options")[0] + engine = self.engine + options = [(engine.revar, "Regular expression"), + (engine.casevar, "Match case"), + (engine.wordvar, "Whole word")] + if self.needwrapbutton: + options.append((engine.wrapvar, "Wrap around")) + for var, label in options: + btn = Checkbutton(frame, variable=var, text=label) + btn.pack(side="left", fill="both") + return frame, options + + def create_other_buttons(self): + '''Return (frame, others) for testing. + + Others is a list of value, label pairs. + A gridded frame from make_frame is filled with radio buttons. + ''' + frame = self.make_frame("Direction")[0] + var = self.engine.backvar + others = [(1, 'Up'), (0, 'Down')] + for val, label in others: + btn = Radiobutton(frame, variable=var, value=val, text=label) + btn.pack(side="left", fill="both") + return frame, others + + def make_button(self, label, command, isdef=0): + "Return command button gridded in command frame." + b = Button(self.buttonframe, + text=label, command=command, + default=isdef and "active" or "normal") + cols,rows=self.buttonframe.grid_size() + b.grid(pady=1,row=rows,column=0,sticky="ew") + self.buttonframe.grid(rowspan=rows+1) + return b + + def create_command_buttons(self): + "Place buttons in vertical command frame gridded on right." + f = self.buttonframe = Frame(self.frame) + f.grid(row=0,column=2,padx=2,pady=2,ipadx=2,ipady=2) + + b = self.make_button("Close", self.close) + b.lower() + + +class _searchbase(SearchDialogBase): # htest # + "Create auto-opening dialog with no text connection." + + def __init__(self, parent): + import re + from idlelib import searchengine + + self.root = parent + self.engine = searchengine.get(parent) + self.create_widgets() + print(parent.geometry()) + width,height, x,y = list(map(int, re.split('[x+]', parent.geometry()))) + self.top.geometry("+%d+%d" % (x + 40, y + 175)) + + def default_command(self, dummy): pass + + +if __name__ == '__main__': + from unittest import main + main('idlelib.idle_test.test_searchbase', verbosity=2, exit=False) + + from idlelib.idle_test.htest import run + run(_searchbase) diff --git a/Lib/idlelib/searchengine.py b/Lib/idlelib/searchengine.py new file mode 100644 index 000000000..ceb38cfae --- /dev/null +++ b/Lib/idlelib/searchengine.py @@ -0,0 +1,234 @@ +'''Define SearchEngine for search dialogs.''' +import re + +from tkinter import StringVar, BooleanVar, TclError +from tkinter import messagebox + +def get(root): + '''Return the singleton SearchEngine instance for the process. + + The single SearchEngine saves settings between dialog instances. + If there is not a SearchEngine already, make one. + ''' + if not hasattr(root, "_searchengine"): + root._searchengine = SearchEngine(root) + # This creates a cycle that persists until root is deleted. + return root._searchengine + + +class SearchEngine: + """Handles searching a text widget for Find, Replace, and Grep.""" + + def __init__(self, root): + '''Initialize Variables that save search state. + + The dialogs bind these to the UI elements present in the dialogs. + ''' + self.root = root # need for report_error() + self.patvar = StringVar(root, '') # search pattern + self.revar = BooleanVar(root, False) # regular expression? + self.casevar = BooleanVar(root, False) # match case? + self.wordvar = BooleanVar(root, False) # match whole word? + self.wrapvar = BooleanVar(root, True) # wrap around buffer? + self.backvar = BooleanVar(root, False) # search backwards? + + # Access methods + + def getpat(self): + return self.patvar.get() + + def setpat(self, pat): + self.patvar.set(pat) + + def isre(self): + return self.revar.get() + + def iscase(self): + return self.casevar.get() + + def isword(self): + return self.wordvar.get() + + def iswrap(self): + return self.wrapvar.get() + + def isback(self): + return self.backvar.get() + + # Higher level access methods + + def setcookedpat(self, pat): + "Set pattern after escaping if re." + # called only in search.py: 66 + if self.isre(): + pat = re.escape(pat) + self.setpat(pat) + + def getcookedpat(self): + pat = self.getpat() + if not self.isre(): # if True, see setcookedpat + pat = re.escape(pat) + if self.isword(): + pat = r"\b%s\b" % pat + return pat + + def getprog(self): + "Return compiled cooked search pattern." + pat = self.getpat() + if not pat: + self.report_error(pat, "Empty regular expression") + return None + pat = self.getcookedpat() + flags = 0 + if not self.iscase(): + flags = flags | re.IGNORECASE + try: + prog = re.compile(pat, flags) + except re.PatternError as e: + self.report_error(pat, e.msg, e.pos) + return None + return prog + + def report_error(self, pat, msg, col=None): + # Derived class could override this with something fancier + msg = "Error: " + str(msg) + if pat: + msg = msg + "\nPattern: " + str(pat) + if col is not None: + msg = msg + "\nOffset: " + str(col) + messagebox.showerror("Regular expression error", + msg, master=self.root) + + def search_text(self, text, prog=None, ok=0): + '''Return (lineno, matchobj) or None for forward/backward search. + + This function calls the right function with the right arguments. + It directly return the result of that call. + + Text is a text widget. Prog is a precompiled pattern. + The ok parameter is a bit complicated as it has two effects. + + If there is a selection, the search begin at either end, + depending on the direction setting and ok, with ok meaning that + the search starts with the selection. Otherwise, search begins + at the insert mark. + + To aid progress, the search functions do not return an empty + match at the starting position unless ok is True. + ''' + + if not prog: + prog = self.getprog() + if not prog: + return None # Compilation failed -- stop + wrap = self.wrapvar.get() + first, last = get_selection(text) + if self.isback(): + if ok: + start = last + else: + start = first + line, col = get_line_col(start) + res = self.search_backward(text, prog, line, col, wrap, ok) + else: + if ok: + start = first + else: + start = last + line, col = get_line_col(start) + res = self.search_forward(text, prog, line, col, wrap, ok) + return res + + def search_forward(self, text, prog, line, col, wrap, ok=0): + wrapped = 0 + startline = line + chars = text.get("%d.0" % line, "%d.0" % (line+1)) + while chars: + m = prog.search(chars[:-1], col) + if m: + if ok or m.end() > col: + return line, m + line = line + 1 + if wrapped and line > startline: + break + col = 0 + ok = 1 + chars = text.get("%d.0" % line, "%d.0" % (line+1)) + if not chars and wrap: + wrapped = 1 + wrap = 0 + line = 1 + chars = text.get("1.0", "2.0") + return None + + def search_backward(self, text, prog, line, col, wrap, ok=0): + wrapped = 0 + startline = line + chars = text.get("%d.0" % line, "%d.0" % (line+1)) + while True: + m = search_reverse(prog, chars[:-1], col) + if m: + if ok or m.start() < col: + return line, m + line = line - 1 + if wrapped and line < startline: + break + ok = 1 + if line <= 0: + if not wrap: + break + wrapped = 1 + wrap = 0 + pos = text.index("end-1c") + line, col = map(int, pos.split(".")) + chars = text.get("%d.0" % line, "%d.0" % (line+1)) + col = len(chars) - 1 + return None + + +def search_reverse(prog, chars, col): + '''Search backwards and return an re match object or None. + + This is done by searching forwards until there is no match. + Prog: compiled re object with a search method returning a match. + Chars: line of text, without \\n. + Col: stop index for the search; the limit for match.end(). + ''' + m = prog.search(chars) + if not m: + return None + found = None + i, j = m.span() # m.start(), m.end() == match slice indexes + while i < col and j <= col: + found = m + if i == j: + j = j+1 + m = prog.search(chars, j) + if not m: + break + i, j = m.span() + return found + +def get_selection(text): + '''Return tuple of 'line.col' indexes from selection or insert mark. + ''' + try: + first = text.index("sel.first") + last = text.index("sel.last") + except TclError: + first = last = None + if not first: + first = text.index("insert") + if not last: + last = first + return first, last + +def get_line_col(index): + '''Return (line, col) tuple of ints from 'line.col' string.''' + line, col = map(int, index.split(".")) # Fails on invalid index + return line, col + + +if __name__ == "__main__": + from unittest import main + main('idlelib.idle_test.test_searchengine', verbosity=2) diff --git a/Lib/idlelib/sidebar.py b/Lib/idlelib/sidebar.py new file mode 100644 index 000000000..aa19a24e3 --- /dev/null +++ b/Lib/idlelib/sidebar.py @@ -0,0 +1,543 @@ +"""Line numbering implementation for IDLE as an extension. +Includes BaseSideBar which can be extended for other sidebar based extensions +""" +import contextlib +import functools +import itertools + +import tkinter as tk +from tkinter.font import Font +from idlelib.config import idleConf +from idlelib.delegator import Delegator +from idlelib import macosx + + +def get_lineno(text, index): + """Return the line number of an index in a Tk text widget.""" + text_index = text.index(index) + return int(float(text_index)) if text_index else None + + +def get_end_linenumber(text): + """Return the number of the last line in a Tk text widget.""" + return get_lineno(text, 'end-1c') + + +def get_displaylines(text, index): + """Display height, in lines, of a logical line in a Tk text widget.""" + return text.count(f"{index} linestart", + f"{index} lineend", + "displaylines", return_ints=True) + +def get_widget_padding(widget): + """Get the total padding of a Tk widget, including its border.""" + # TODO: use also in codecontext.py + manager = widget.winfo_manager() + if manager == 'pack': + info = widget.pack_info() + elif manager == 'grid': + info = widget.grid_info() + else: + raise ValueError(f"Unsupported geometry manager: {manager}") + + # All values are passed through getint(), since some + # values may be pixel objects, which can't simply be added to ints. + padx = sum(map(widget.tk.getint, [ + info['padx'], + widget.cget('padx'), + widget.cget('border'), + ])) + pady = sum(map(widget.tk.getint, [ + info['pady'], + widget.cget('pady'), + widget.cget('border'), + ])) + return padx, pady + + +@contextlib.contextmanager +def temp_enable_text_widget(text): + text.configure(state=tk.NORMAL) + try: + yield + finally: + text.configure(state=tk.DISABLED) + + +class BaseSideBar: + """A base class for sidebars using Text.""" + def __init__(self, editwin): + self.editwin = editwin + self.parent = editwin.text_frame + self.text = editwin.text + + self.is_shown = False + + self.main_widget = self.init_widgets() + + self.bind_events() + + self.update_font() + self.update_colors() + + def init_widgets(self): + """Initialize the sidebar's widgets, returning the main widget.""" + raise NotImplementedError + + def update_font(self): + """Update the sidebar text font, usually after config changes.""" + raise NotImplementedError + + def update_colors(self): + """Update the sidebar text colors, usually after config changes.""" + raise NotImplementedError + + def grid(self): + """Layout the widget, always using grid layout.""" + raise NotImplementedError + + def show_sidebar(self): + if not self.is_shown: + self.grid() + self.is_shown = True + + def hide_sidebar(self): + if self.is_shown: + self.main_widget.grid_forget() + self.is_shown = False + + def yscroll_event(self, *args, **kwargs): + """Hook for vertical scrolling for sub-classes to override.""" + raise NotImplementedError + + def redirect_yscroll_event(self, *args, **kwargs): + """Redirect vertical scrolling to the main editor text widget. + + The scroll bar is also updated. + """ + self.editwin.vbar.set(*args) + return self.yscroll_event(*args, **kwargs) + + def redirect_focusin_event(self, event): + """Redirect focus-in events to the main editor text widget.""" + self.text.focus_set() + return 'break' + + def redirect_mousebutton_event(self, event, event_name): + """Redirect mouse button events to the main editor text widget.""" + self.text.focus_set() + self.text.event_generate(event_name, x=0, y=event.y) + return 'break' + + def redirect_mousewheel_event(self, event): + """Redirect mouse wheel events to the editwin text widget.""" + self.text.event_generate('<MouseWheel>', + x=0, y=event.y, delta=event.delta) + return 'break' + + def bind_events(self): + self.text['yscrollcommand'] = self.redirect_yscroll_event + + # Ensure focus is always redirected to the main editor text widget. + self.main_widget.bind('<FocusIn>', self.redirect_focusin_event) + + # Redirect mouse scrolling to the main editor text widget. + # + # Note that without this, scrolling with the mouse only scrolls + # the line numbers. + self.main_widget.bind('<MouseWheel>', self.redirect_mousewheel_event) + + # Redirect mouse button events to the main editor text widget, + # except for the left mouse button (1). + # + # Note: X-11 sends Button-4 and Button-5 events for the scroll wheel. + def bind_mouse_event(event_name, target_event_name): + handler = functools.partial(self.redirect_mousebutton_event, + event_name=target_event_name) + self.main_widget.bind(event_name, handler) + + for button in [2, 3, 4, 5]: + for event_name in (f'<Button-{button}>', + f'<ButtonRelease-{button}>', + f'<B{button}-Motion>', + ): + bind_mouse_event(event_name, target_event_name=event_name) + + # Convert double- and triple-click events to normal click events, + # since event_generate() doesn't allow generating such events. + for event_name in (f'<Double-Button-{button}>', + f'<Triple-Button-{button}>', + ): + bind_mouse_event(event_name, + target_event_name=f'<Button-{button}>') + + # start_line is set upon <Button-1> to allow selecting a range of rows + # by dragging. It is cleared upon <ButtonRelease-1>. + start_line = None + + # last_y is initially set upon <B1-Leave> and is continuously updated + # upon <B1-Motion>, until <B1-Enter> or the mouse button is released. + # It is used in text_auto_scroll(), which is called repeatedly and + # does have a mouse event available. + last_y = None + + # auto_scrolling_after_id is set whenever text_auto_scroll is + # scheduled via .after(). It is used to stop the auto-scrolling + # upon <B1-Enter>, as well as to avoid scheduling the function several + # times in parallel. + auto_scrolling_after_id = None + + def drag_update_selection_and_insert_mark(y_coord): + """Helper function for drag and selection event handlers.""" + lineno = get_lineno(self.text, f"@0,{y_coord}") + a, b = sorted([start_line, lineno]) + self.text.tag_remove("sel", "1.0", "end") + self.text.tag_add("sel", f"{a}.0", f"{b+1}.0") + self.text.mark_set("insert", + f"{lineno if lineno == a else lineno + 1}.0") + + def b1_mousedown_handler(event): + nonlocal start_line + nonlocal last_y + start_line = int(float(self.text.index(f"@0,{event.y}"))) + last_y = event.y + + drag_update_selection_and_insert_mark(event.y) + self.main_widget.bind('<Button-1>', b1_mousedown_handler) + + def b1_mouseup_handler(event): + # On mouse up, we're no longer dragging. Set the shared persistent + # variables to None to represent this. + nonlocal start_line + nonlocal last_y + start_line = None + last_y = None + self.text.event_generate('<ButtonRelease-1>', x=0, y=event.y) + self.main_widget.bind('<ButtonRelease-1>', b1_mouseup_handler) + + def b1_drag_handler(event): + nonlocal last_y + if last_y is None: # i.e. if not currently dragging + return + last_y = event.y + drag_update_selection_and_insert_mark(event.y) + self.main_widget.bind('<B1-Motion>', b1_drag_handler) + + def text_auto_scroll(): + """Mimic Text auto-scrolling when dragging outside of it.""" + # See: https://github.com/tcltk/tk/blob/064ff9941b4b80b85916a8afe86a6c21fd388b54/library/text.tcl#L670 + nonlocal auto_scrolling_after_id + y = last_y + if y is None: + self.main_widget.after_cancel(auto_scrolling_after_id) + auto_scrolling_after_id = None + return + elif y < 0: + self.text.yview_scroll(-1 + y, 'pixels') + drag_update_selection_and_insert_mark(y) + elif y > self.main_widget.winfo_height(): + self.text.yview_scroll(1 + y - self.main_widget.winfo_height(), + 'pixels') + drag_update_selection_and_insert_mark(y) + auto_scrolling_after_id = \ + self.main_widget.after(50, text_auto_scroll) + + def b1_leave_handler(event): + # Schedule the initial call to text_auto_scroll(), if not already + # scheduled. + nonlocal auto_scrolling_after_id + if auto_scrolling_after_id is None: + nonlocal last_y + last_y = event.y + auto_scrolling_after_id = \ + self.main_widget.after(0, text_auto_scroll) + self.main_widget.bind('<B1-Leave>', b1_leave_handler) + + def b1_enter_handler(event): + # Cancel the scheduling of text_auto_scroll(), if it exists. + nonlocal auto_scrolling_after_id + if auto_scrolling_after_id is not None: + self.main_widget.after_cancel(auto_scrolling_after_id) + auto_scrolling_after_id = None + self.main_widget.bind('<B1-Enter>', b1_enter_handler) + + +class EndLineDelegator(Delegator): + """Generate callbacks with the current end line number. + + The provided callback is called after every insert and delete. + """ + def __init__(self, changed_callback): + Delegator.__init__(self) + self.changed_callback = changed_callback + + def insert(self, index, chars, tags=None): + self.delegate.insert(index, chars, tags) + self.changed_callback(get_end_linenumber(self.delegate)) + + def delete(self, index1, index2=None): + self.delegate.delete(index1, index2) + self.changed_callback(get_end_linenumber(self.delegate)) + + +class LineNumbers(BaseSideBar): + """Line numbers support for editor windows.""" + def __init__(self, editwin): + super().__init__(editwin) + + end_line_delegator = EndLineDelegator(self.update_sidebar_text) + # Insert the delegator after the undo delegator, so that line numbers + # are properly updated after undo and redo actions. + self.editwin.per.insertfilterafter(end_line_delegator, + after=self.editwin.undo) + + def init_widgets(self): + _padx, pady = get_widget_padding(self.text) + self.sidebar_text = tk.Text(self.parent, width=1, wrap=tk.NONE, + padx=2, pady=pady, + borderwidth=0, highlightthickness=0) + self.sidebar_text.config(state=tk.DISABLED) + + self.prev_end = 1 + self._sidebar_width_type = type(self.sidebar_text['width']) + with temp_enable_text_widget(self.sidebar_text): + self.sidebar_text.insert('insert', '1', 'linenumber') + self.sidebar_text.config(takefocus=False, exportselection=False) + self.sidebar_text.tag_config('linenumber', justify=tk.RIGHT) + + end = get_end_linenumber(self.text) + self.update_sidebar_text(end) + + return self.sidebar_text + + def grid(self): + self.sidebar_text.grid(row=1, column=0, sticky=tk.NSEW) + + def update_font(self): + font = idleConf.GetFont(self.text, 'main', 'EditorWindow') + self.sidebar_text['font'] = font + + def update_colors(self): + """Update the sidebar text colors, usually after config changes.""" + colors = idleConf.GetHighlight(idleConf.CurrentTheme(), 'linenumber') + foreground = colors['foreground'] + background = colors['background'] + self.sidebar_text.config( + fg=foreground, bg=background, + selectforeground=foreground, selectbackground=background, + inactiveselectbackground=background, + ) + + def update_sidebar_text(self, end): + """ + Perform the following action: + Each line sidebar_text contains the linenumber for that line + Synchronize with editwin.text so that both sidebar_text and + editwin.text contain the same number of lines""" + if end == self.prev_end: + return + + width_difference = len(str(end)) - len(str(self.prev_end)) + if width_difference: + cur_width = int(float(self.sidebar_text['width'])) + new_width = cur_width + width_difference + self.sidebar_text['width'] = self._sidebar_width_type(new_width) + + with temp_enable_text_widget(self.sidebar_text): + if end > self.prev_end: + new_text = '\n'.join(itertools.chain( + [''], + map(str, range(self.prev_end + 1, end + 1)), + )) + self.sidebar_text.insert(f'end -1c', new_text, 'linenumber') + else: + self.sidebar_text.delete(f'{end+1}.0 -1c', 'end -1c') + + self.prev_end = end + + def yscroll_event(self, *args, **kwargs): + self.sidebar_text.yview_moveto(args[0]) + return 'break' + + +class WrappedLineHeightChangeDelegator(Delegator): + def __init__(self, callback): + """ + callback - Callable, will be called when an insert, delete or replace + action on the text widget may require updating the shell + sidebar. + """ + Delegator.__init__(self) + self.callback = callback + + def insert(self, index, chars, tags=None): + is_single_line = '\n' not in chars + if is_single_line: + before_displaylines = get_displaylines(self, index) + + self.delegate.insert(index, chars, tags) + + if is_single_line: + after_displaylines = get_displaylines(self, index) + if after_displaylines == before_displaylines: + return # no need to update the sidebar + + self.callback() + + def delete(self, index1, index2=None): + if index2 is None: + index2 = index1 + "+1c" + is_single_line = get_lineno(self, index1) == get_lineno(self, index2) + if is_single_line: + before_displaylines = get_displaylines(self, index1) + + self.delegate.delete(index1, index2) + + if is_single_line: + after_displaylines = get_displaylines(self, index1) + if after_displaylines == before_displaylines: + return # no need to update the sidebar + + self.callback() + + +class ShellSidebar(BaseSideBar): + """Sidebar for the PyShell window, for prompts etc.""" + def __init__(self, editwin): + self.canvas = None + self.line_prompts = {} + + super().__init__(editwin) + + change_delegator = \ + WrappedLineHeightChangeDelegator(self.change_callback) + # Insert the TextChangeDelegator after the last delegator, so that + # the sidebar reflects final changes to the text widget contents. + d = self.editwin.per.top + if d.delegate is not self.text: + while d.delegate is not self.editwin.per.bottom: + d = d.delegate + self.editwin.per.insertfilterafter(change_delegator, after=d) + + self.is_shown = True + + def init_widgets(self): + self.canvas = tk.Canvas(self.parent, width=30, + borderwidth=0, highlightthickness=0, + takefocus=False) + self.update_sidebar() + self.grid() + return self.canvas + + def bind_events(self): + super().bind_events() + + self.main_widget.bind( + # AquaTk defines <2> as the right button, not <3>. + "<Button-2>" if macosx.isAquaTk() else "<Button-3>", + self.context_menu_event, + ) + + def context_menu_event(self, event): + rmenu = tk.Menu(self.main_widget, tearoff=0) + has_selection = bool(self.text.tag_nextrange('sel', '1.0')) + def mkcmd(eventname): + return lambda: self.text.event_generate(eventname) + rmenu.add_command(label='Copy', + command=mkcmd('<<copy>>'), + state='normal' if has_selection else 'disabled') + rmenu.add_command(label='Copy with prompts', + command=mkcmd('<<copy-with-prompts>>'), + state='normal' if has_selection else 'disabled') + rmenu.tk_popup(event.x_root, event.y_root) + return "break" + + def grid(self): + self.canvas.grid(row=1, column=0, sticky=tk.NSEW, padx=2, pady=0) + + def change_callback(self): + if self.is_shown: + self.update_sidebar() + + def update_sidebar(self): + text = self.text + text_tagnames = text.tag_names + canvas = self.canvas + line_prompts = self.line_prompts = {} + + canvas.delete(tk.ALL) + + index = text.index("@0,0") + if index.split('.', 1)[1] != '0': + index = text.index(f'{index}+1line linestart') + while (lineinfo := text.dlineinfo(index)) is not None: + y = lineinfo[1] + prev_newline_tagnames = text_tagnames(f"{index} linestart -1c") + prompt = ( + '>>>' if "console" in prev_newline_tagnames else + '...' if "stdin" in prev_newline_tagnames else + None + ) + if prompt: + canvas.create_text(2, y, anchor=tk.NW, text=prompt, + font=self.font, fill=self.colors[0]) + lineno = get_lineno(text, index) + line_prompts[lineno] = prompt + index = text.index(f'{index}+1line') + + def yscroll_event(self, *args, **kwargs): + """Redirect vertical scrolling to the main editor text widget. + + The scroll bar is also updated. + """ + self.change_callback() + return 'break' + + def update_font(self): + """Update the sidebar text font, usually after config changes.""" + font = idleConf.GetFont(self.text, 'main', 'EditorWindow') + tk_font = Font(self.text, font=font) + char_width = max(tk_font.measure(char) for char in ['>', '.']) + self.canvas.configure(width=char_width * 3 + 4) + self.font = font + self.change_callback() + + def update_colors(self): + """Update the sidebar text colors, usually after config changes.""" + linenumbers_colors = idleConf.GetHighlight(idleConf.CurrentTheme(), 'linenumber') + prompt_colors = idleConf.GetHighlight(idleConf.CurrentTheme(), 'console') + foreground = prompt_colors['foreground'] + background = linenumbers_colors['background'] + self.colors = (foreground, background) + self.canvas.configure(background=background) + self.change_callback() + + +def _sidebar_number_scrolling(parent): # htest # + from idlelib.idle_test.test_sidebar import Dummy_editwin + + top = tk.Toplevel(parent) + text_frame = tk.Frame(top) + text_frame.pack(side=tk.LEFT, fill=tk.BOTH, expand=True) + text_frame.rowconfigure(1, weight=1) + text_frame.columnconfigure(1, weight=1) + + font = idleConf.GetFont(top, 'main', 'EditorWindow') + text = tk.Text(text_frame, width=80, height=24, wrap=tk.NONE, font=font) + text.grid(row=1, column=1, sticky=tk.NSEW) + + editwin = Dummy_editwin(text) + editwin.vbar = tk.Scrollbar(text_frame) + + linenumbers = LineNumbers(editwin) + linenumbers.show_sidebar() + + text.insert('1.0', '\n'.join('a'*i for i in range(1, 101))) + + +if __name__ == '__main__': + from unittest import main + main('idlelib.idle_test.test_sidebar', verbosity=2, exit=False) + + from idlelib.idle_test.htest import run + run(_sidebar_number_scrolling) diff --git a/Lib/idlelib/squeezer.py b/Lib/idlelib/squeezer.py new file mode 100644 index 000000000..929c3fd3a --- /dev/null +++ b/Lib/idlelib/squeezer.py @@ -0,0 +1,345 @@ +"""An IDLE extension to avoid having very long texts printed in the shell. + +A common problem in IDLE's interactive shell is printing of large amounts of +text into the shell. This makes looking at the previous history difficult. +Worse, this can cause IDLE to become very slow, even to the point of being +completely unusable. + +This extension will automatically replace long texts with a small button. +Double-clicking this button will remove it and insert the original text instead. +Middle-clicking will copy the text to the clipboard. Right-clicking will open +the text in a separate viewing window. + +Additionally, any output can be manually "squeezed" by the user. This includes +output written to the standard error stream ("stderr"), such as exception +messages and their tracebacks. +""" +import re + +import tkinter as tk +from tkinter import messagebox + +from idlelib.config import idleConf +from idlelib.textview import view_text +from idlelib.tooltip import Hovertip +from idlelib import macosx + + +def count_lines_with_wrapping(s, linewidth=80): + """Count the number of lines in a given string. + + Lines are counted as if the string was wrapped so that lines are never over + linewidth characters long. + + Tabs are considered tabwidth characters long. + """ + tabwidth = 8 # Currently always true in Shell. + pos = 0 + linecount = 1 + current_column = 0 + + for m in re.finditer(r"[\t\n]", s): + # Process the normal chars up to tab or newline. + numchars = m.start() - pos + pos += numchars + current_column += numchars + + # Deal with tab or newline. + if s[pos] == '\n': + # Avoid the `current_column == 0` edge-case, and while we're + # at it, don't bother adding 0. + if current_column > linewidth: + # If the current column was exactly linewidth, divmod + # would give (1,0), even though a new line hadn't yet + # been started. The same is true if length is any exact + # multiple of linewidth. Therefore, subtract 1 before + # dividing a non-empty line. + linecount += (current_column - 1) // linewidth + linecount += 1 + current_column = 0 + else: + assert s[pos] == '\t' + current_column += tabwidth - (current_column % tabwidth) + + # If a tab passes the end of the line, consider the entire + # tab as being on the next line. + if current_column > linewidth: + linecount += 1 + current_column = tabwidth + + pos += 1 # After the tab or newline. + + # Process remaining chars (no more tabs or newlines). + current_column += len(s) - pos + # Avoid divmod(-1, linewidth). + if current_column > 0: + linecount += (current_column - 1) // linewidth + else: + # Text ended with newline; don't count an extra line after it. + linecount -= 1 + + return linecount + + +class ExpandingButton(tk.Button): + """Class for the "squeezed" text buttons used by Squeezer + + These buttons are displayed inside a Tk Text widget in place of text. A + user can then use the button to replace it with the original text, copy + the original text to the clipboard or view the original text in a separate + window. + + Each button is tied to a Squeezer instance, and it knows to update the + Squeezer instance when it is expanded (and therefore removed). + """ + def __init__(self, s, tags, numoflines, squeezer): + self.s = s + self.tags = tags + self.numoflines = numoflines + self.squeezer = squeezer + self.editwin = editwin = squeezer.editwin + self.text = text = editwin.text + # The base Text widget is needed to change text before iomark. + self.base_text = editwin.per.bottom + + line_plurality = "lines" if numoflines != 1 else "line" + button_text = f"Squeezed text ({numoflines} {line_plurality})." + tk.Button.__init__(self, text, text=button_text, + background="#FFFFC0", activebackground="#FFFFE0") + + button_tooltip_text = ( + "Double-click to expand, right-click for more options." + ) + Hovertip(self, button_tooltip_text, hover_delay=80) + + self.bind("<Double-Button-1>", self.expand) + if macosx.isAquaTk(): + # AquaTk defines <2> as the right button, not <3>. + self.bind("<Button-2>", self.context_menu_event) + else: + self.bind("<Button-3>", self.context_menu_event) + self.selection_handle( # X windows only. + lambda offset, length: s[int(offset):int(offset) + int(length)]) + + self.is_dangerous = None + self.after_idle(self.set_is_dangerous) + + def set_is_dangerous(self): + dangerous_line_len = 50 * self.text.winfo_width() + self.is_dangerous = ( + self.numoflines > 1000 or + len(self.s) > 50000 or + any( + len(line_match.group(0)) >= dangerous_line_len + for line_match in re.finditer(r'[^\n]+', self.s) + ) + ) + + def expand(self, event=None): + """expand event handler + + This inserts the original text in place of the button in the Text + widget, removes the button and updates the Squeezer instance. + + If the original text is dangerously long, i.e. expanding it could + cause a performance degradation, ask the user for confirmation. + """ + if self.is_dangerous is None: + self.set_is_dangerous() + if self.is_dangerous: + confirm = messagebox.askokcancel( + title="Expand huge output?", + message="\n\n".join([ + "The squeezed output is very long: %d lines, %d chars.", + "Expanding it could make IDLE slow or unresponsive.", + "It is recommended to view or copy the output instead.", + "Really expand?" + ]) % (self.numoflines, len(self.s)), + default=messagebox.CANCEL, + parent=self.text) + if not confirm: + return "break" + + index = self.text.index(self) + self.base_text.insert(index, self.s, self.tags) + self.base_text.delete(self) + self.editwin.on_squeezed_expand(index, self.s, self.tags) + self.squeezer.expandingbuttons.remove(self) + + def copy(self, event=None): + """copy event handler + + Copy the original text to the clipboard. + """ + self.clipboard_clear() + self.clipboard_append(self.s) + + def view(self, event=None): + """view event handler + + View the original text in a separate text viewer window. + """ + view_text(self.text, "Squeezed Output Viewer", self.s, + modal=False, wrap='none') + + rmenu_specs = ( + # Item structure: (label, method_name). + ('copy', 'copy'), + ('view', 'view'), + ) + + def context_menu_event(self, event): + self.text.mark_set("insert", "@%d,%d" % (event.x, event.y)) + rmenu = tk.Menu(self.text, tearoff=0) + for label, method_name in self.rmenu_specs: + rmenu.add_command(label=label, command=getattr(self, method_name)) + rmenu.tk_popup(event.x_root, event.y_root) + return "break" + + +class Squeezer: + """Replace long outputs in the shell with a simple button. + + This avoids IDLE's shell slowing down considerably, and even becoming + completely unresponsive, when very long outputs are written. + """ + @classmethod + def reload(cls): + """Load class variables from config.""" + cls.auto_squeeze_min_lines = idleConf.GetOption( + "main", "PyShell", "auto-squeeze-min-lines", + type="int", default=50, + ) + + def __init__(self, editwin): + """Initialize settings for Squeezer. + + editwin is the shell's Editor window. + self.text is the editor window text widget. + self.base_test is the actual editor window Tk text widget, rather than + EditorWindow's wrapper. + self.expandingbuttons is the list of all buttons representing + "squeezed" output. + """ + self.editwin = editwin + self.text = text = editwin.text + + # Get the base Text widget of the PyShell object, used to change + # text before the iomark. PyShell deliberately disables changing + # text before the iomark via its 'text' attribute, which is + # actually a wrapper for the actual Text widget. Squeezer, + # however, needs to make such changes. + self.base_text = editwin.per.bottom + + # Twice the text widget's border width and internal padding; + # pre-calculated here for the get_line_width() method. + self.window_width_delta = 2 * ( + int(text.cget('border')) + + int(text.cget('padx')) + ) + + self.expandingbuttons = [] + + # Replace the PyShell instance's write method with a wrapper, + # which inserts an ExpandingButton instead of a long text. + def mywrite(s, tags=(), write=editwin.write): + # Only auto-squeeze text which has just the "stdout" tag. + if tags != "stdout": + return write(s, tags) + + # Only auto-squeeze text with at least the minimum + # configured number of lines. + auto_squeeze_min_lines = self.auto_squeeze_min_lines + # First, a very quick check to skip very short texts. + if len(s) < auto_squeeze_min_lines: + return write(s, tags) + # Now the full line-count check. + numoflines = self.count_lines(s) + if numoflines < auto_squeeze_min_lines: + return write(s, tags) + + # Create an ExpandingButton instance. + expandingbutton = ExpandingButton(s, tags, numoflines, self) + + # Insert the ExpandingButton into the Text widget. + text.mark_gravity("iomark", tk.RIGHT) + text.window_create("iomark", window=expandingbutton, + padx=3, pady=5) + text.see("iomark") + text.update() + text.mark_gravity("iomark", tk.LEFT) + + # Add the ExpandingButton to the Squeezer's list. + self.expandingbuttons.append(expandingbutton) + + editwin.write = mywrite + + def count_lines(self, s): + """Count the number of lines in a given text. + + Before calculation, the tab width and line length of the text are + fetched, so that up-to-date values are used. + + Lines are counted as if the string was wrapped so that lines are never + over linewidth characters long. + + Tabs are considered tabwidth characters long. + """ + return count_lines_with_wrapping(s, self.editwin.width) + + def squeeze_current_text(self): + """Squeeze the text block where the insertion cursor is. + + If the cursor is not in a squeezable block of text, give the + user a small warning and do nothing. + """ + # Set tag_name to the first valid tag found on the "insert" cursor. + tag_names = self.text.tag_names(tk.INSERT) + for tag_name in ("stdout", "stderr"): + if tag_name in tag_names: + break + else: + # The insert cursor doesn't have a "stdout" or "stderr" tag. + self.text.bell() + return "break" + + # Find the range to squeeze. + start, end = self.text.tag_prevrange(tag_name, tk.INSERT + "+1c") + s = self.text.get(start, end) + + # If the last char is a newline, remove it from the range. + if len(s) > 0 and s[-1] == '\n': + end = self.text.index("%s-1c" % end) + s = s[:-1] + + # Delete the text. + self.base_text.delete(start, end) + + # Prepare an ExpandingButton. + numoflines = self.count_lines(s) + expandingbutton = ExpandingButton(s, tag_name, numoflines, self) + + # insert the ExpandingButton to the Text + self.text.window_create(start, window=expandingbutton, + padx=3, pady=5) + + # Insert the ExpandingButton to the list of ExpandingButtons, + # while keeping the list ordered according to the position of + # the buttons in the Text widget. + i = len(self.expandingbuttons) + while i > 0 and self.text.compare(self.expandingbuttons[i-1], + ">", expandingbutton): + i -= 1 + self.expandingbuttons.insert(i, expandingbutton) + + return "break" + + +Squeezer.reload() + + +if __name__ == "__main__": + from unittest import main + main('idlelib.idle_test.test_squeezer', verbosity=2, exit=False) + + # Add htest. diff --git a/Lib/idlelib/stackviewer.py b/Lib/idlelib/stackviewer.py new file mode 100644 index 000000000..95042d4de --- /dev/null +++ b/Lib/idlelib/stackviewer.py @@ -0,0 +1,134 @@ +# Rename to stackbrowser or possibly consolidate with browser. + +import linecache +import os + +import tkinter as tk + +from idlelib.debugobj import ObjectTreeItem, make_objecttreeitem +from idlelib.tree import TreeNode, TreeItem, ScrolledCanvas + +def StackBrowser(root, exc, flist=None, top=None): + global sc, item, node # For testing. + if top is None: + top = tk.Toplevel(root) + sc = ScrolledCanvas(top, bg="white", highlightthickness=0) + sc.frame.pack(expand=1, fill="both") + item = StackTreeItem(exc, flist) + node = TreeNode(sc.canvas, None, item) + node.expand() + + +class StackTreeItem(TreeItem): + + def __init__(self, exc, flist=None): + self.flist = flist + self.stack = self.get_stack(None if exc is None else exc.__traceback__) + self.text = f"{type(exc).__name__}: {str(exc)}" + + def get_stack(self, tb): + stack = [] + if tb and tb.tb_frame is None: + tb = tb.tb_next + while tb is not None: + stack.append((tb.tb_frame, tb.tb_lineno)) + tb = tb.tb_next + return stack + + def GetText(self): # Titlecase names are overrides. + return self.text + + def GetSubList(self): + sublist = [] + for info in self.stack: + item = FrameTreeItem(info, self.flist) + sublist.append(item) + return sublist + + +class FrameTreeItem(TreeItem): + + def __init__(self, info, flist): + self.info = info + self.flist = flist + + def GetText(self): + frame, lineno = self.info + try: + modname = frame.f_globals["__name__"] + except: + modname = "?" + code = frame.f_code + filename = code.co_filename + funcname = code.co_name + sourceline = linecache.getline(filename, lineno) + sourceline = sourceline.strip() + if funcname in ("?", "", None): + item = "%s, line %d: %s" % (modname, lineno, sourceline) + else: + item = "%s.%s(...), line %d: %s" % (modname, funcname, + lineno, sourceline) + return item + + def GetSubList(self): + frame, lineno = self.info + sublist = [] + if frame.f_globals is not frame.f_locals: + item = VariablesTreeItem("<locals>", frame.f_locals, self.flist) + sublist.append(item) + item = VariablesTreeItem("<globals>", frame.f_globals, self.flist) + sublist.append(item) + return sublist + + def OnDoubleClick(self): + if self.flist: + frame, lineno = self.info + filename = frame.f_code.co_filename + if os.path.isfile(filename): + self.flist.gotofileline(filename, lineno) + + +class VariablesTreeItem(ObjectTreeItem): + + def GetText(self): + return self.labeltext + + def GetLabelText(self): + return None + + def IsExpandable(self): + return len(self.object) > 0 + + def GetSubList(self): + sublist = [] + for key in self.object.keys(): # self.object not necessarily dict. + try: + value = self.object[key] + except KeyError: + continue + def setfunction(value, key=key, object_=self.object): + object_[key] = value + item = make_objecttreeitem(key + " =", value, setfunction) + sublist.append(item) + return sublist + + +def _stackbrowser(parent): # htest # + from idlelib.pyshell import PyShellFileList + top = tk.Toplevel(parent) + top.title("Test StackViewer") + x, y = map(int, parent.geometry().split('+')[1:]) + top.geometry("+%d+%d" % (x + 50, y + 175)) + flist = PyShellFileList(top) + try: # to obtain a traceback object + intentional_name_error + except NameError as e: + StackBrowser(top, e, flist=flist, top=top) + + +if __name__ == '__main__': + from unittest import main + main('idlelib.idle_test.test_stackviewer', verbosity=2, exit=False) + + from idlelib.idle_test.htest import run + run(_stackbrowser) diff --git a/Lib/idlelib/statusbar.py b/Lib/idlelib/statusbar.py new file mode 100644 index 000000000..8445d4cc8 --- /dev/null +++ b/Lib/idlelib/statusbar.py @@ -0,0 +1,52 @@ +from tkinter.ttk import Label, Frame + + +class MultiStatusBar(Frame): + + def __init__(self, master, **kw): + Frame.__init__(self, master, **kw) + self.labels = {} + + def set_label(self, name, text='', side='left', width=0): + if name not in self.labels: + label = Label(self, borderwidth=0, anchor='w') + label.pack(side=side, pady=0, padx=4) + self.labels[name] = label + else: + label = self.labels[name] + if width != 0: + label.config(width=width) + label.config(text=text) + + +def _multistatus_bar(parent): # htest # + from tkinter import Toplevel, Text + from tkinter.ttk import Frame, Button + top = Toplevel(parent) + x, y = map(int, parent.geometry().split('+')[1:]) + top.geometry("+%d+%d" %(x, y + 175)) + top.title("Test multistatus bar") + + frame = Frame(top) + text = Text(frame, height=5, width=40) + text.pack() + msb = MultiStatusBar(frame) + msb.set_label("one", "hello") + msb.set_label("two", "world") + msb.pack(side='bottom', fill='x') + + def change(): + msb.set_label("one", "foo") + msb.set_label("two", "bar") + + button = Button(top, text="Update status", command=change) + button.pack(side='bottom') + frame.pack() + + +if __name__ == '__main__': + from unittest import main + main('idlelib.idle_test.test_statusbar', verbosity=2, exit=False) + + from idlelib.idle_test.htest import run + run(_multistatus_bar) diff --git a/Lib/idlelib/textview.py b/Lib/idlelib/textview.py new file mode 100644 index 000000000..23f0f4cb5 --- /dev/null +++ b/Lib/idlelib/textview.py @@ -0,0 +1,193 @@ +"""Simple text browser for IDLE + +""" +from tkinter import Toplevel, Text, TclError,\ + HORIZONTAL, VERTICAL, NS, EW, NSEW, NONE, WORD, SUNKEN +from tkinter.ttk import Frame, Scrollbar, Button +from tkinter.messagebox import showerror + +from idlelib.colorizer import color_config + + +class AutoHideScrollbar(Scrollbar): + """A scrollbar that is automatically hidden when not needed. + + Only the grid geometry manager is supported. + """ + def set(self, lo, hi): + if float(lo) > 0.0 or float(hi) < 1.0: + self.grid() + else: + self.grid_remove() + super().set(lo, hi) + + def pack(self, **kwargs): + raise TclError(f'{self.__class__.__name__} does not support "pack"') + + def place(self, **kwargs): + raise TclError(f'{self.__class__.__name__} does not support "place"') + + +class ScrollableTextFrame(Frame): + """Display text with scrollbar(s).""" + + def __init__(self, master, wrap=NONE, **kwargs): + """Create a frame for Textview. + + master - master widget for this frame + wrap - type of text wrapping to use ('word', 'char' or 'none') + + All parameters except for 'wrap' are passed to Frame.__init__(). + + The Text widget is accessible via the 'text' attribute. + + Note: Changing the wrapping mode of the text widget after + instantiation is not supported. + """ + super().__init__(master, **kwargs) + + text = self.text = Text(self, wrap=wrap) + text.grid(row=0, column=0, sticky=NSEW) + self.grid_rowconfigure(0, weight=1) + self.grid_columnconfigure(0, weight=1) + + # vertical scrollbar + self.yscroll = AutoHideScrollbar(self, orient=VERTICAL, + takefocus=False, + command=text.yview) + self.yscroll.grid(row=0, column=1, sticky=NS) + text['yscrollcommand'] = self.yscroll.set + + # horizontal scrollbar - only when wrap is set to NONE + if wrap == NONE: + self.xscroll = AutoHideScrollbar(self, orient=HORIZONTAL, + takefocus=False, + command=text.xview) + self.xscroll.grid(row=1, column=0, sticky=EW) + text['xscrollcommand'] = self.xscroll.set + else: + self.xscroll = None + + +class ViewFrame(Frame): + "Display TextFrame and Close button." + def __init__(self, parent, contents, wrap='word'): + """Create a frame for viewing text with a "Close" button. + + parent - parent widget for this frame + contents - text to display + wrap - type of text wrapping to use ('word', 'char' or 'none') + + The Text widget is accessible via the 'text' attribute. + """ + super().__init__(parent) + self.parent = parent + self.bind('<Return>', self.ok) + self.bind('<Escape>', self.ok) + self.textframe = ScrollableTextFrame(self, relief=SUNKEN, height=700) + + text = self.text = self.textframe.text + text.insert('1.0', contents) + text.configure(wrap=wrap, highlightthickness=0, state='disabled') + color_config(text) + text.focus_set() + + self.button_ok = button_ok = Button( + self, text='Close', command=self.ok, takefocus=False) + self.textframe.pack(side='top', expand=True, fill='both') + button_ok.pack(side='bottom') + + def ok(self, event=None): + """Dismiss text viewer dialog.""" + self.parent.destroy() + + +class ViewWindow(Toplevel): + "A simple text viewer dialog for IDLE." + + def __init__(self, parent, title, contents, modal=True, wrap=WORD, + *, _htest=False, _utest=False): + """Show the given text in a scrollable window with a 'close' button. + + If modal is left True, users cannot interact with other windows + until the textview window is closed. + + parent - parent of this dialog + title - string which is title of popup dialog + contents - text to display in dialog + wrap - type of text wrapping to use ('word', 'char' or 'none') + _htest - bool; change box location when running htest. + _utest - bool; don't wait_window when running unittest. + """ + super().__init__(parent) + self['borderwidth'] = 5 + # Place dialog below parent if running htest. + x = parent.winfo_rootx() + 10 + y = parent.winfo_rooty() + (10 if not _htest else 100) + self.geometry(f'=750x500+{x}+{y}') + + self.title(title) + self.viewframe = ViewFrame(self, contents, wrap=wrap) + self.protocol("WM_DELETE_WINDOW", self.ok) + self.button_ok = button_ok = Button(self, text='Close', + command=self.ok, takefocus=False) + self.viewframe.pack(side='top', expand=True, fill='both') + + self.is_modal = modal + if self.is_modal: + self.transient(parent) + self.grab_set() + if not _utest: + self.wait_window() + + def ok(self, event=None): + """Dismiss text viewer dialog.""" + if self.is_modal: + self.grab_release() + self.destroy() + + +def view_text(parent, title, contents, modal=True, wrap='word', _utest=False): + """Create text viewer for given text. + + parent - parent of this dialog + title - string which is the title of popup dialog + contents - text to display in this dialog + wrap - type of text wrapping to use ('word', 'char' or 'none') + modal - controls if users can interact with other windows while this + dialog is displayed + _utest - bool; controls wait_window on unittest + """ + return ViewWindow(parent, title, contents, modal, wrap=wrap, _utest=_utest) + + +def view_file(parent, title, filename, encoding, modal=True, wrap='word', + _utest=False): + """Create text viewer for text in filename. + + Return error message if file cannot be read. Otherwise calls view_text + with contents of the file. + """ + try: + with open(filename, encoding=encoding) as file: + contents = file.read() + except OSError: + showerror(title='File Load Error', + message=f'Unable to load file {filename!r} .', + parent=parent) + except UnicodeDecodeError as err: + showerror(title='Unicode Decode Error', + message=str(err), + parent=parent) + else: + return view_text(parent, title, contents, modal, wrap=wrap, + _utest=_utest) + return None + + +if __name__ == '__main__': + from unittest import main + main('idlelib.idle_test.test_textview', verbosity=2, exit=False) + + from idlelib.idle_test.htest import run + run(ViewWindow) diff --git a/Lib/idlelib/tooltip.py b/Lib/idlelib/tooltip.py new file mode 100644 index 000000000..df5b1fe1d --- /dev/null +++ b/Lib/idlelib/tooltip.py @@ -0,0 +1,190 @@ +"""Tools for displaying tool-tips. + +This includes: + * an abstract base-class for different kinds of tooltips + * a simple text-only Tooltip class +""" +from tkinter import * + + +class TooltipBase: + """abstract base class for tooltips""" + + def __init__(self, anchor_widget): + """Create a tooltip. + + anchor_widget: the widget next to which the tooltip will be shown + + Note that a widget will only be shown when showtip() is called. + """ + self.anchor_widget = anchor_widget + self.tipwindow = None + + def __del__(self): + self.hidetip() + + def showtip(self): + """display the tooltip""" + if self.tipwindow: + return + self.tipwindow = tw = Toplevel(self.anchor_widget) + # show no border on the top level window + tw.wm_overrideredirect(1) + try: + # This command is only needed and available on Tk >= 8.4.0 for OSX. + # Without it, call tips intrude on the typing process by grabbing + # the focus. + tw.tk.call("::tk::unsupported::MacWindowStyle", "style", tw._w, + "help", "noActivates") + except TclError: + pass + + self.position_window() + self.showcontents() + self.tipwindow.update_idletasks() # Needed on MacOS -- see #34275. + self.tipwindow.lift() # work around bug in Tk 8.5.18+ (issue #24570) + + def position_window(self): + """(re)-set the tooltip's screen position""" + x, y = self.get_position() + root_x = self.anchor_widget.winfo_rootx() + x + root_y = self.anchor_widget.winfo_rooty() + y + self.tipwindow.wm_geometry("+%d+%d" % (root_x, root_y)) + + def get_position(self): + """choose a screen position for the tooltip""" + # The tip window must be completely outside the anchor widget; + # otherwise when the mouse enters the tip window we get + # a leave event and it disappears, and then we get an enter + # event and it reappears, and so on forever :-( + # + # Note: This is a simplistic implementation; sub-classes will likely + # want to override this. + return 20, self.anchor_widget.winfo_height() + 1 + + def showcontents(self): + """content display hook for sub-classes""" + # See ToolTip for an example + raise NotImplementedError + + def hidetip(self): + """hide the tooltip""" + # Note: This is called by __del__, so careful when overriding/extending + tw = self.tipwindow + self.tipwindow = None + if tw: + try: + tw.destroy() + except TclError: # pragma: no cover + pass + + +class OnHoverTooltipBase(TooltipBase): + """abstract base class for tooltips, with delayed on-hover display""" + + def __init__(self, anchor_widget, hover_delay=1000): + """Create a tooltip with a mouse hover delay. + + anchor_widget: the widget next to which the tooltip will be shown + hover_delay: time to delay before showing the tooltip, in milliseconds + + Note that a widget will only be shown when showtip() is called, + e.g. after hovering over the anchor widget with the mouse for enough + time. + """ + super().__init__(anchor_widget) + self.hover_delay = hover_delay + + self._after_id = None + self._id1 = self.anchor_widget.bind("<Enter>", self._show_event) + self._id2 = self.anchor_widget.bind("<Leave>", self._hide_event) + self._id3 = self.anchor_widget.bind("<Button>", self._hide_event) + + def __del__(self): + try: + self.anchor_widget.unbind("<Enter>", self._id1) + self.anchor_widget.unbind("<Leave>", self._id2) # pragma: no cover + self.anchor_widget.unbind("<Button>", self._id3) # pragma: no cover + except TclError: + pass + super().__del__() + + def _show_event(self, event=None): + """event handler to display the tooltip""" + if self.hover_delay: + self.schedule() + else: + self.showtip() + + def _hide_event(self, event=None): + """event handler to hide the tooltip""" + self.hidetip() + + def schedule(self): + """schedule the future display of the tooltip""" + self.unschedule() + self._after_id = self.anchor_widget.after(self.hover_delay, + self.showtip) + + def unschedule(self): + """cancel the future display of the tooltip""" + after_id = self._after_id + self._after_id = None + if after_id: + self.anchor_widget.after_cancel(after_id) + + def hidetip(self): + """hide the tooltip""" + try: + self.unschedule() + except TclError: # pragma: no cover + pass + super().hidetip() + + +class Hovertip(OnHoverTooltipBase): + "A tooltip that pops up when a mouse hovers over an anchor widget." + def __init__(self, anchor_widget, text, hover_delay=1000, + foreground="#000000", background="#ffffe0"): + """Create a text tooltip with a mouse hover delay. + + anchor_widget: the widget next to which the tooltip will be shown + hover_delay: time to delay before showing the tooltip, in milliseconds + + Note that a widget will only be shown when showtip() is called, + e.g. after hovering over the anchor widget with the mouse for enough + time. + """ + super().__init__(anchor_widget, hover_delay=hover_delay) + self.text = text + self.foreground = foreground + self.background = background + + def showcontents(self): + label = Label(self.tipwindow, text=self.text, justify=LEFT, + relief=SOLID, borderwidth=1, + foreground=self.foreground, background=self.background) + label.pack() + + +def _tooltip(parent): # htest # + top = Toplevel(parent) + top.title("Test tooltip") + x, y = map(int, parent.geometry().split('+')[1:]) + top.geometry("+%d+%d" % (x, y + 150)) + label = Label(top, text="Place your mouse over buttons") + label.pack() + button1 = Button(top, text="Button 1 -- 1/2 second hover delay") + button1.pack() + Hovertip(button1, "This is tooltip text for button1.", hover_delay=500) + button2 = Button(top, text="Button 2 -- no hover delay") + button2.pack() + Hovertip(button2, "This is tooltip\ntext for button2.", hover_delay=None) + + +if __name__ == '__main__': + from unittest import main + main('idlelib.idle_test.test_tooltip', verbosity=2, exit=False) + + from idlelib.idle_test.htest import run + run(_tooltip) diff --git a/Lib/idlelib/tree.py b/Lib/idlelib/tree.py new file mode 100644 index 000000000..182ce7189 --- /dev/null +++ b/Lib/idlelib/tree.py @@ -0,0 +1,509 @@ +# XXX TO DO: +# - popup menu +# - support partial or total redisplay +# - key bindings (instead of quick-n-dirty bindings on Canvas): +# - up/down arrow keys to move focus around +# - ditto for page up/down, home/end +# - left/right arrows to expand/collapse & move out/in +# - more doc strings +# - add icons for "file", "module", "class", "method"; better "python" icon +# - callback for selection??? +# - multiple-item selection +# - tooltips +# - redo geometry without magic numbers +# - keep track of object ids to allow more careful cleaning +# - optimize tree redraw after expand of subnode + +import os + +from tkinter import * +from tkinter.ttk import Frame, Scrollbar + +from idlelib.config import idleConf +from idlelib import zoomheight + +ICONDIR = "Icons" + +# Look for Icons subdirectory in the same directory as this module +try: + _icondir = os.path.join(os.path.dirname(__file__), ICONDIR) +except NameError: + _icondir = ICONDIR +if os.path.isdir(_icondir): + ICONDIR = _icondir +elif not os.path.isdir(ICONDIR): + raise RuntimeError(f"can't find icon directory ({ICONDIR!r})") + +def listicons(icondir=ICONDIR): + """Utility to display the available icons.""" + root = Tk() + import glob + list = glob.glob(os.path.join(glob.escape(icondir), "*.gif")) + list.sort() + images = [] + row = column = 0 + for file in list: + name = os.path.splitext(os.path.basename(file))[0] + image = PhotoImage(file=file, master=root) + images.append(image) + label = Label(root, image=image, bd=1, relief="raised") + label.grid(row=row, column=column) + label = Label(root, text=name) + label.grid(row=row+1, column=column) + column = column + 1 + if column >= 10: + row = row+2 + column = 0 + root.images = images + +def wheel_event(event, widget=None): + """Handle scrollwheel event. + + For wheel up, event.delta = 120*n on Windows, -1*n on darwin, + where n can be > 1 if one scrolls fast. Flicking the wheel + generates up to maybe 20 events with n up to 10 or more 1. + Macs use wheel down (delta = 1*n) to scroll up, so positive + delta means to scroll up on both systems. + + X-11 sends Control-Button-4,5 events instead. + + The widget parameter is needed so browser label bindings can pass + the underlying canvas. + + This function depends on widget.yview to not be overridden by + a subclass. + """ + up = {EventType.MouseWheel: event.delta > 0, + EventType.ButtonPress: event.num == 4} + lines = -5 if up[event.type] else 5 + widget = event.widget if widget is None else widget + widget.yview(SCROLL, lines, 'units') + return 'break' + + +class TreeNode: + + dy = 0 + + def __init__(self, canvas, parent, item): + self.canvas = canvas + self.parent = parent + self.item = item + self.state = 'collapsed' + self.selected = False + self.children = [] + self.x = self.y = None + self.iconimages = {} # cache of PhotoImage instances for icons + + def destroy(self): + for c in self.children[:]: + self.children.remove(c) + c.destroy() + self.parent = None + + def geticonimage(self, name): + try: + return self.iconimages[name] + except KeyError: + pass + file, ext = os.path.splitext(name) + ext = ext or ".gif" + fullname = os.path.join(ICONDIR, file + ext) + image = PhotoImage(master=self.canvas, file=fullname) + self.iconimages[name] = image + return image + + def select(self, event=None): + if self.selected: + return + self.deselectall() + self.selected = True + self.canvas.delete(self.image_id) + self.drawicon() + self.drawtext() + + def deselect(self, event=None): + if not self.selected: + return + self.selected = False + self.canvas.delete(self.image_id) + self.drawicon() + self.drawtext() + + def deselectall(self): + if self.parent: + self.parent.deselectall() + else: + self.deselecttree() + + def deselecttree(self): + if self.selected: + self.deselect() + for child in self.children: + child.deselecttree() + + def flip(self, event=None): + if self.state == 'expanded': + self.collapse() + else: + self.expand() + self.item.OnDoubleClick() + return "break" + + def expand(self, event=None): + if not self.item._IsExpandable(): + return + if self.state != 'expanded': + self.state = 'expanded' + self.update() + self.view() + + def collapse(self, event=None): + if self.state != 'collapsed': + self.state = 'collapsed' + self.update() + + def view(self): + top = self.y - 2 + bottom = self.lastvisiblechild().y + 17 + height = bottom - top + visible_top = self.canvas.canvasy(0) + visible_height = self.canvas.winfo_height() + visible_bottom = self.canvas.canvasy(visible_height) + if visible_top <= top and bottom <= visible_bottom: + return + x0, y0, x1, y1 = self.canvas._getints(self.canvas['scrollregion']) + if top >= visible_top and height <= visible_height: + fraction = top + height - visible_height + else: + fraction = top + fraction = float(fraction) / y1 + self.canvas.yview_moveto(fraction) + + def lastvisiblechild(self): + if self.children and self.state == 'expanded': + return self.children[-1].lastvisiblechild() + else: + return self + + def update(self): + if self.parent: + self.parent.update() + else: + oldcursor = self.canvas['cursor'] + self.canvas['cursor'] = "watch" + self.canvas.update() + self.canvas.delete(ALL) # XXX could be more subtle + self.draw(7, 2) + x0, y0, x1, y1 = self.canvas.bbox(ALL) + self.canvas.configure(scrollregion=(0, 0, x1, y1)) + self.canvas['cursor'] = oldcursor + + def draw(self, x, y): + # XXX This hard-codes too many geometry constants! + self.x, self.y = x, y + self.drawicon() + self.drawtext() + if self.state != 'expanded': + return y + TreeNode.dy + # draw children + if not self.children: + sublist = self.item._GetSubList() + if not sublist: + # _IsExpandable() was mistaken; that's allowed + return y + TreeNode.dy + for item in sublist: + child = self.__class__(self.canvas, self, item) + self.children.append(child) + cx = x+20 + cy = y + TreeNode.dy + cylast = 0 + for child in self.children: + cylast = cy + self.canvas.create_line(x+9, cy+7, cx, cy+7, fill="gray50") + cy = child.draw(cx, cy) + if child.item._IsExpandable(): + if child.state == 'expanded': + iconname = "minusnode" + callback = child.collapse + else: + iconname = "plusnode" + callback = child.expand + image = self.geticonimage(iconname) + id = self.canvas.create_image(x+9, cylast+7, image=image) + # XXX This leaks bindings until canvas is deleted: + self.canvas.tag_bind(id, "<1>", callback) + self.canvas.tag_bind(id, "<Double-1>", lambda x: None) + id = self.canvas.create_line(x+9, y+10, x+9, cylast+7, + ##stipple="gray50", # XXX Seems broken in Tk 8.0.x + fill="gray50") + self.canvas.tag_lower(id) # XXX .lower(id) before Python 1.5.2 + return cy + + def drawicon(self): + if self.selected: + imagename = (self.item.GetSelectedIconName() or + self.item.GetIconName() or + "openfolder") + else: + imagename = self.item.GetIconName() or "folder" + image = self.geticonimage(imagename) + id = self.canvas.create_image(self.x, self.y, anchor="nw", image=image) + self.image_id = id + self.canvas.tag_bind(id, "<1>", self.select) + self.canvas.tag_bind(id, "<Double-1>", self.flip) + + def drawtext(self): + textx = self.x+20-1 + texty = self.y-4 + labeltext = self.item.GetLabelText() + if labeltext: + id = self.canvas.create_text(textx, texty, anchor="nw", + text=labeltext) + self.canvas.tag_bind(id, "<1>", self.select) + self.canvas.tag_bind(id, "<Double-1>", self.flip) + x0, y0, x1, y1 = self.canvas.bbox(id) + textx = max(x1, 200) + 10 + text = self.item.GetText() or "<no text>" + try: + self.entry + except AttributeError: + pass + else: + self.edit_finish() + try: + self.label + except AttributeError: + # padding carefully selected (on Windows) to match Entry widget: + self.label = Label(self.canvas, text=text, bd=0, padx=2, pady=2) + theme = idleConf.CurrentTheme() + if self.selected: + self.label.configure(idleConf.GetHighlight(theme, 'hilite')) + else: + self.label.configure(idleConf.GetHighlight(theme, 'normal')) + id = self.canvas.create_window(textx, texty, + anchor="nw", window=self.label) + self.label.bind("<1>", self.select_or_edit) + self.label.bind("<Double-1>", self.flip) + self.label.bind("<MouseWheel>", lambda e: wheel_event(e, self.canvas)) + if self.label._windowingsystem == 'x11': + self.label.bind("<Button-4>", lambda e: wheel_event(e, self.canvas)) + self.label.bind("<Button-5>", lambda e: wheel_event(e, self.canvas)) + self.text_id = id + if TreeNode.dy == 0: + # The first row doesn't matter what the dy is, just measure its + # size to get the value of the subsequent dy + coords = self.canvas.bbox(id) + TreeNode.dy = max(20, coords[3] - coords[1] - 3) + + def select_or_edit(self, event=None): + if self.selected and self.item.IsEditable(): + self.edit(event) + else: + self.select(event) + + def edit(self, event=None): + self.entry = Entry(self.label, bd=0, highlightthickness=1, width=0) + self.entry.insert(0, self.label['text']) + self.entry.selection_range(0, END) + self.entry.pack(ipadx=5) + self.entry.focus_set() + self.entry.bind("<Return>", self.edit_finish) + self.entry.bind("<Escape>", self.edit_cancel) + + def edit_finish(self, event=None): + try: + entry = self.entry + del self.entry + except AttributeError: + return + text = entry.get() + entry.destroy() + if text and text != self.item.GetText(): + self.item.SetText(text) + text = self.item.GetText() + self.label['text'] = text + self.drawtext() + self.canvas.focus_set() + + def edit_cancel(self, event=None): + try: + entry = self.entry + del self.entry + except AttributeError: + return + entry.destroy() + self.drawtext() + self.canvas.focus_set() + + +class TreeItem: + + """Abstract class representing tree items. + + Methods should typically be overridden, otherwise a default action + is used. + + """ + + def __init__(self): + """Constructor. Do whatever you need to do.""" + + def GetText(self): + """Return text string to display.""" + + def GetLabelText(self): + """Return label text string to display in front of text (if any).""" + + expandable = None + + def _IsExpandable(self): + """Do not override! Called by TreeNode.""" + if self.expandable is None: + self.expandable = self.IsExpandable() + return self.expandable + + def IsExpandable(self): + """Return whether there are subitems.""" + return 1 + + def _GetSubList(self): + """Do not override! Called by TreeNode.""" + if not self.IsExpandable(): + return [] + sublist = self.GetSubList() + if not sublist: + self.expandable = 0 + return sublist + + def IsEditable(self): + """Return whether the item's text may be edited.""" + + def SetText(self, text): + """Change the item's text (if it is editable).""" + + def GetIconName(self): + """Return name of icon to be displayed normally.""" + + def GetSelectedIconName(self): + """Return name of icon to be displayed when selected.""" + + def GetSubList(self): + """Return list of items forming sublist.""" + + def OnDoubleClick(self): + """Called on a double-click on the item.""" + + +# Example application + +class FileTreeItem(TreeItem): + + """Example TreeItem subclass -- browse the file system.""" + + def __init__(self, path): + self.path = path + + def GetText(self): + return os.path.basename(self.path) or self.path + + def IsEditable(self): + return os.path.basename(self.path) != "" + + def SetText(self, text): + newpath = os.path.dirname(self.path) + newpath = os.path.join(newpath, text) + if os.path.dirname(newpath) != os.path.dirname(self.path): + return + try: + os.rename(self.path, newpath) + self.path = newpath + except OSError: + pass + + def GetIconName(self): + if not self.IsExpandable(): + return "python" # XXX wish there was a "file" icon + + def IsExpandable(self): + return os.path.isdir(self.path) + + def GetSubList(self): + try: + names = os.listdir(self.path) + except OSError: + return [] + names.sort(key = os.path.normcase) + sublist = [] + for name in names: + item = FileTreeItem(os.path.join(self.path, name)) + sublist.append(item) + return sublist + + +# A canvas widget with scroll bars and some useful bindings + +class ScrolledCanvas: + + def __init__(self, master, **opts): + if 'yscrollincrement' not in opts: + opts['yscrollincrement'] = 17 + self.master = master + self.frame = Frame(master) + self.frame.rowconfigure(0, weight=1) + self.frame.columnconfigure(0, weight=1) + self.canvas = Canvas(self.frame, **opts) + self.canvas.grid(row=0, column=0, sticky="nsew") + self.vbar = Scrollbar(self.frame, name="vbar") + self.vbar.grid(row=0, column=1, sticky="nse") + self.hbar = Scrollbar(self.frame, name="hbar", orient="horizontal") + self.hbar.grid(row=1, column=0, sticky="ews") + self.canvas['yscrollcommand'] = self.vbar.set + self.vbar['command'] = self.canvas.yview + self.canvas['xscrollcommand'] = self.hbar.set + self.hbar['command'] = self.canvas.xview + self.canvas.bind("<Key-Prior>", self.page_up) + self.canvas.bind("<Key-Next>", self.page_down) + self.canvas.bind("<Key-Up>", self.unit_up) + self.canvas.bind("<Key-Down>", self.unit_down) + self.canvas.bind("<MouseWheel>", wheel_event) + if self.canvas._windowingsystem == 'x11': + self.canvas.bind("<Button-4>", wheel_event) + self.canvas.bind("<Button-5>", wheel_event) + #if isinstance(master, Toplevel) or isinstance(master, Tk): + self.canvas.bind("<Alt-Key-2>", self.zoom_height) + self.canvas.focus_set() + def page_up(self, event): + self.canvas.yview_scroll(-1, "page") + return "break" + def page_down(self, event): + self.canvas.yview_scroll(1, "page") + return "break" + def unit_up(self, event): + self.canvas.yview_scroll(-1, "unit") + return "break" + def unit_down(self, event): + self.canvas.yview_scroll(1, "unit") + return "break" + def zoom_height(self, event): + zoomheight.zoom_height(self.master) + return "break" + + +def _tree_widget(parent): # htest # + top = Toplevel(parent) + x, y = map(int, parent.geometry().split('+')[1:]) + top.geometry("+%d+%d" % (x+50, y+175)) + sc = ScrolledCanvas(top, bg="white", highlightthickness=0, takefocus=1) + sc.frame.pack(expand=1, fill="both", side=LEFT) + item = FileTreeItem(ICONDIR) + node = TreeNode(sc.canvas, None, item) + node.expand() + + +if __name__ == '__main__': + from unittest import main + main('idlelib.idle_test.test_tree', verbosity=2, exit=False) + + from idlelib.idle_test.htest import run + run(_tree_widget) diff --git a/Lib/idlelib/undo.py b/Lib/idlelib/undo.py new file mode 100644 index 000000000..f52446d5f --- /dev/null +++ b/Lib/idlelib/undo.py @@ -0,0 +1,367 @@ +import string + +from idlelib.delegator import Delegator + +# tkinter import not needed because module does not create widgets, +# although many methods operate on text widget arguments. + +#$ event <<redo>> +#$ win <Control-y> +#$ unix <Alt-z> + +#$ event <<undo>> +#$ win <Control-z> +#$ unix <Control-z> + +#$ event <<dump-undo-state>> +#$ win <Control-backslash> +#$ unix <Control-backslash> + + +class UndoDelegator(Delegator): + + max_undo = 1000 + + def __init__(self): + Delegator.__init__(self) + self.reset_undo() + + def setdelegate(self, delegate): + if self.delegate is not None: + self.unbind("<<undo>>") + self.unbind("<<redo>>") + self.unbind("<<dump-undo-state>>") + Delegator.setdelegate(self, delegate) + if delegate is not None: + self.bind("<<undo>>", self.undo_event) + self.bind("<<redo>>", self.redo_event) + self.bind("<<dump-undo-state>>", self.dump_event) + + def dump_event(self, event): + from pprint import pprint + pprint(self.undolist[:self.pointer]) + print("pointer:", self.pointer, end=' ') + print("saved:", self.saved, end=' ') + print("can_merge:", self.can_merge, end=' ') + print("get_saved():", self.get_saved()) + pprint(self.undolist[self.pointer:]) + return "break" + + def reset_undo(self): + self.was_saved = -1 + self.pointer = 0 + self.undolist = [] + self.undoblock = 0 # or a CommandSequence instance + self.set_saved(1) + + def set_saved(self, flag): + if flag: + self.saved = self.pointer + else: + self.saved = -1 + self.can_merge = False + self.check_saved() + + def get_saved(self): + return self.saved == self.pointer + + saved_change_hook = None + + def set_saved_change_hook(self, hook): + self.saved_change_hook = hook + + was_saved = -1 + + def check_saved(self): + is_saved = self.get_saved() + if is_saved != self.was_saved: + self.was_saved = is_saved + if self.saved_change_hook: + self.saved_change_hook() + + def insert(self, index, chars, tags=None): + self.addcmd(InsertCommand(index, chars, tags)) + + def delete(self, index1, index2=None): + self.addcmd(DeleteCommand(index1, index2)) + + # Clients should call undo_block_start() and undo_block_stop() + # around a sequence of editing cmds to be treated as a unit by + # undo & redo. Nested matching calls are OK, and the inner calls + # then act like nops. OK too if no editing cmds, or only one + # editing cmd, is issued in between: if no cmds, the whole + # sequence has no effect; and if only one cmd, that cmd is entered + # directly into the undo list, as if undo_block_xxx hadn't been + # called. The intent of all that is to make this scheme easy + # to use: all the client has to worry about is making sure each + # _start() call is matched by a _stop() call. + + def undo_block_start(self): + if self.undoblock == 0: + self.undoblock = CommandSequence() + self.undoblock.bump_depth() + + def undo_block_stop(self): + if self.undoblock.bump_depth(-1) == 0: + cmd = self.undoblock + self.undoblock = 0 + if len(cmd) > 0: + if len(cmd) == 1: + # no need to wrap a single cmd + cmd = cmd.getcmd(0) + # this blk of cmds, or single cmd, has already + # been done, so don't execute it again + self.addcmd(cmd, 0) + + def addcmd(self, cmd, execute=True): + if execute: + cmd.do(self.delegate) + if self.undoblock != 0: + self.undoblock.append(cmd) + return + if self.can_merge and self.pointer > 0: + lastcmd = self.undolist[self.pointer-1] + if lastcmd.merge(cmd): + return + self.undolist[self.pointer:] = [cmd] + if self.saved > self.pointer: + self.saved = -1 + self.pointer = self.pointer + 1 + if len(self.undolist) > self.max_undo: + ##print "truncating undo list" + del self.undolist[0] + self.pointer = self.pointer - 1 + if self.saved >= 0: + self.saved = self.saved - 1 + self.can_merge = True + self.check_saved() + + def undo_event(self, event): + if self.pointer == 0: + self.bell() + return "break" + cmd = self.undolist[self.pointer - 1] + cmd.undo(self.delegate) + self.pointer = self.pointer - 1 + self.can_merge = False + self.check_saved() + return "break" + + def redo_event(self, event): + if self.pointer >= len(self.undolist): + self.bell() + return "break" + cmd = self.undolist[self.pointer] + cmd.redo(self.delegate) + self.pointer = self.pointer + 1 + self.can_merge = False + self.check_saved() + return "break" + + +class Command: + # Base class for Undoable commands + + tags = None + + def __init__(self, index1, index2, chars, tags=None): + self.marks_before = {} + self.marks_after = {} + self.index1 = index1 + self.index2 = index2 + self.chars = chars + if tags: + self.tags = tags + + def __repr__(self): + s = self.__class__.__name__ + t = (self.index1, self.index2, self.chars, self.tags) + if self.tags is None: + t = t[:-1] + return s + repr(t) + + def do(self, text): + pass + + def redo(self, text): + pass + + def undo(self, text): + pass + + def merge(self, cmd): + return 0 + + def save_marks(self, text): + marks = {} + for name in text.mark_names(): + if name != "insert" and name != "current": + marks[name] = text.index(name) + return marks + + def set_marks(self, text, marks): + for name, index in marks.items(): + text.mark_set(name, index) + + +class InsertCommand(Command): + # Undoable insert command + + def __init__(self, index1, chars, tags=None): + Command.__init__(self, index1, None, chars, tags) + + def do(self, text): + self.marks_before = self.save_marks(text) + self.index1 = text.index(self.index1) + if text.compare(self.index1, ">", "end-1c"): + # Insert before the final newline + self.index1 = text.index("end-1c") + text.insert(self.index1, self.chars, self.tags) + self.index2 = text.index("%s+%dc" % (self.index1, len(self.chars))) + self.marks_after = self.save_marks(text) + ##sys.__stderr__.write("do: %s\n" % self) + + def redo(self, text): + text.mark_set('insert', self.index1) + text.insert(self.index1, self.chars, self.tags) + self.set_marks(text, self.marks_after) + text.see('insert') + ##sys.__stderr__.write("redo: %s\n" % self) + + def undo(self, text): + text.mark_set('insert', self.index1) + text.delete(self.index1, self.index2) + self.set_marks(text, self.marks_before) + text.see('insert') + ##sys.__stderr__.write("undo: %s\n" % self) + + def merge(self, cmd): + if self.__class__ is not cmd.__class__: + return False + if self.index2 != cmd.index1: + return False + if self.tags != cmd.tags: + return False + if len(cmd.chars) != 1: + return False + if self.chars and \ + self.classify(self.chars[-1]) != self.classify(cmd.chars): + return False + self.index2 = cmd.index2 + self.chars = self.chars + cmd.chars + return True + + alphanumeric = string.ascii_letters + string.digits + "_" + + def classify(self, c): + if c in self.alphanumeric: + return "alphanumeric" + if c == "\n": + return "newline" + return "punctuation" + + +class DeleteCommand(Command): + # Undoable delete command + + def __init__(self, index1, index2=None): + Command.__init__(self, index1, index2, None, None) + + def do(self, text): + self.marks_before = self.save_marks(text) + self.index1 = text.index(self.index1) + if self.index2: + self.index2 = text.index(self.index2) + else: + self.index2 = text.index(self.index1 + " +1c") + if text.compare(self.index2, ">", "end-1c"): + # Don't delete the final newline + self.index2 = text.index("end-1c") + self.chars = text.get(self.index1, self.index2) + text.delete(self.index1, self.index2) + self.marks_after = self.save_marks(text) + ##sys.__stderr__.write("do: %s\n" % self) + + def redo(self, text): + text.mark_set('insert', self.index1) + text.delete(self.index1, self.index2) + self.set_marks(text, self.marks_after) + text.see('insert') + ##sys.__stderr__.write("redo: %s\n" % self) + + def undo(self, text): + text.mark_set('insert', self.index1) + text.insert(self.index1, self.chars) + self.set_marks(text, self.marks_before) + text.see('insert') + ##sys.__stderr__.write("undo: %s\n" % self) + + +class CommandSequence(Command): + # Wrapper for a sequence of undoable cmds to be undone/redone + # as a unit + + def __init__(self): + self.cmds = [] + self.depth = 0 + + def __repr__(self): + s = self.__class__.__name__ + strs = [] + for cmd in self.cmds: + strs.append(f" {cmd!r}") + return s + "(\n" + ",\n".join(strs) + "\n)" + + def __len__(self): + return len(self.cmds) + + def append(self, cmd): + self.cmds.append(cmd) + + def getcmd(self, i): + return self.cmds[i] + + def redo(self, text): + for cmd in self.cmds: + cmd.redo(text) + + def undo(self, text): + cmds = self.cmds[:] + cmds.reverse() + for cmd in cmds: + cmd.undo(text) + + def bump_depth(self, incr=1): + self.depth = self.depth + incr + return self.depth + + +def _undo_delegator(parent): # htest # + from tkinter import Toplevel, Text, Button + from idlelib.percolator import Percolator + top = Toplevel(parent) + top.title("Test UndoDelegator") + x, y = map(int, parent.geometry().split('+')[1:]) + top.geometry("+%d+%d" % (x, y + 175)) + + text = Text(top, height=10) + text.pack() + text.focus_set() + p = Percolator(text) + d = UndoDelegator() + p.insertfilter(d) + + undo = Button(top, text="Undo", command=lambda:d.undo_event(None)) + undo.pack(side='left') + redo = Button(top, text="Redo", command=lambda:d.redo_event(None)) + redo.pack(side='left') + dump = Button(top, text="Dump", command=lambda:d.dump_event(None)) + dump.pack(side='left') + + +if __name__ == "__main__": + from unittest import main + main('idlelib.idle_test.test_undo', verbosity=2, exit=False) + + from idlelib.idle_test.htest import run + run(_undo_delegator) diff --git a/Lib/idlelib/util.py b/Lib/idlelib/util.py new file mode 100644 index 000000000..e05604ab4 --- /dev/null +++ b/Lib/idlelib/util.py @@ -0,0 +1,37 @@ +""" +Idlelib objects with no external idlelib dependencies +which are needed in more than one idlelib module. + +They are included here because + a) they don't particularly belong elsewhere; or + b) because inclusion here simplifies the idlelib dependency graph. + +TODO: + * Python versions (editor and help_about), + * tk version and patchlevel (pyshell, help_about, maxos?, editor?), + * std streams (pyshell, run), + * warning stuff (pyshell, run). +""" +import sys + +# .pyw is for Windows; .pyi is for typing stub files. +# The extension order is needed for iomenu open/save dialogs. +py_extensions = ('.py', '.pyw', '.pyi') + + +# Fix for HiDPI screens on Windows. CALL BEFORE ANY TK OPERATIONS! +# URL for arguments for the ...Awareness call below. +# https://msdn.microsoft.com/en-us/library/windows/desktop/dn280512(v=vs.85).aspx +if sys.platform == 'win32': # pragma: no cover + def fix_win_hidpi(): # Called in pyshell and turtledemo. + try: + import ctypes + PROCESS_SYSTEM_DPI_AWARE = 1 # Int required. + ctypes.OleDLL('shcore').SetProcessDpiAwareness(PROCESS_SYSTEM_DPI_AWARE) + except (ImportError, AttributeError, OSError): + pass + + +if __name__ == '__main__': + from unittest import main + main('idlelib.idle_test.test_util', verbosity=2) diff --git a/Lib/idlelib/window.py b/Lib/idlelib/window.py new file mode 100644 index 000000000..460d5b679 --- /dev/null +++ b/Lib/idlelib/window.py @@ -0,0 +1,98 @@ +from tkinter import Toplevel, TclError +import sys + + +class WindowList: + + def __init__(self): + self.dict = {} + self.callbacks = [] + + def add(self, window): + window.after_idle(self.call_callbacks) + self.dict[str(window)] = window + + def delete(self, window): + try: + del self.dict[str(window)] + except KeyError: + # Sometimes, destroy() is called twice + pass + self.call_callbacks() + + def add_windows_to_menu(self, menu): + list = [] + for key in self.dict: + window = self.dict[key] + try: + title = window.get_title() + except TclError: + continue + list.append((title, key, window)) + list.sort() + for title, key, window in list: + menu.add_command(label=title, command=window.wakeup) + + def register_callback(self, callback): + self.callbacks.append(callback) + + def unregister_callback(self, callback): + try: + self.callbacks.remove(callback) + except ValueError: + pass + + def call_callbacks(self): + for callback in self.callbacks: + try: + callback() + except: + t, v, tb = sys.exc_info() + print("warning: callback failed in WindowList", t, ":", v) + + +registry = WindowList() + +add_windows_to_menu = registry.add_windows_to_menu +register_callback = registry.register_callback +unregister_callback = registry.unregister_callback + + +class ListedToplevel(Toplevel): + + def __init__(self, master, **kw): + Toplevel.__init__(self, master, kw) + registry.add(self) + self.focused_widget = self + + def destroy(self): + registry.delete(self) + Toplevel.destroy(self) + # If this is Idle's last window then quit the mainloop + # (Needed for clean exit on Windows 98) + if not registry.dict: + self.quit() + + def update_windowlist_registry(self, window): + registry.call_callbacks() + + def get_title(self): + # Subclass can override + return self.wm_title() + + def wakeup(self): + try: + if self.wm_state() == "iconic": + self.wm_withdraw() + self.wm_deiconify() + self.tkraise() + self.focused_widget.focus_set() + except TclError: + # This can happen when the Window menu was torn off. + # Simply ignore it. + pass + + +if __name__ == "__main__": + from unittest import main + main('idlelib.idle_test.test_window', verbosity=2) diff --git a/Lib/idlelib/zoomheight.py b/Lib/idlelib/zoomheight.py new file mode 100644 index 000000000..cd50c91c1 --- /dev/null +++ b/Lib/idlelib/zoomheight.py @@ -0,0 +1,124 @@ +"Zoom a window to maximum height." + +import re +import sys +import tkinter + + +class WmInfoGatheringError(Exception): + pass + + +class ZoomHeight: + # Cached values for maximized window dimensions, one for each set + # of screen dimensions. + _max_height_and_y_coords = {} + + def __init__(self, editwin): + self.editwin = editwin + self.top = self.editwin.top + + def zoom_height_event(self, event=None): + zoomed = self.zoom_height() + + if zoomed is None: + self.top.bell() + else: + menu_status = 'Restore' if zoomed else 'Zoom' + self.editwin.update_menu_label(menu='options', index='* Height', + label=f'{menu_status} Height') + + return "break" + + def zoom_height(self): + top = self.top + + width, height, x, y = get_window_geometry(top) + + if top.wm_state() != 'normal': + # Can't zoom/restore window height for windows not in the 'normal' + # state, e.g. maximized and full-screen windows. + return None + + try: + maxheight, maxy = self.get_max_height_and_y_coord() + except WmInfoGatheringError: + return None + + if height != maxheight: + # Maximize the window's height. + set_window_geometry(top, (width, maxheight, x, maxy)) + return True + else: + # Restore the window's height. + # + # .wm_geometry('') makes the window revert to the size requested + # by the widgets it contains. + top.wm_geometry('') + return False + + def get_max_height_and_y_coord(self): + top = self.top + + screen_dimensions = (top.winfo_screenwidth(), + top.winfo_screenheight()) + if screen_dimensions not in self._max_height_and_y_coords: + orig_state = top.wm_state() + + # Get window geometry info for maximized windows. + try: + top.wm_state('zoomed') + except tkinter.TclError: + # The 'zoomed' state is not supported by some esoteric WMs, + # such as Xvfb. + raise WmInfoGatheringError( + 'Failed getting geometry of maximized windows, because ' + + 'the "zoomed" window state is unavailable.') + top.update() + maxwidth, maxheight, maxx, maxy = get_window_geometry(top) + if sys.platform == 'win32': + # On Windows, the returned Y coordinate is the one before + # maximizing, so we use 0 which is correct unless a user puts + # their dock on the top of the screen (very rare). + maxy = 0 + maxrooty = top.winfo_rooty() + + # Get the "root y" coordinate for non-maximized windows with their + # y coordinate set to that of maximized windows. This is needed + # to properly handle different title bar heights for non-maximized + # vs. maximized windows, as seen e.g. in Windows 10. + top.wm_state('normal') + top.update() + orig_geom = get_window_geometry(top) + max_y_geom = orig_geom[:3] + (maxy,) + set_window_geometry(top, max_y_geom) + top.update() + max_y_geom_rooty = top.winfo_rooty() + + # Adjust the maximum window height to account for the different + # title bar heights of non-maximized vs. maximized windows. + maxheight += maxrooty - max_y_geom_rooty + + self._max_height_and_y_coords[screen_dimensions] = maxheight, maxy + + set_window_geometry(top, orig_geom) + top.wm_state(orig_state) + + return self._max_height_and_y_coords[screen_dimensions] + + +def get_window_geometry(top): + geom = top.wm_geometry() + m = re.match(r"(\d+)x(\d+)\+(-?\d+)\+(-?\d+)", geom) + return tuple(map(int, m.groups())) + + +def set_window_geometry(top, geometry): + top.wm_geometry("{:d}x{:d}+{:d}+{:d}".format(*geometry)) + + +if __name__ == "__main__": + from unittest import main + main('idlelib.idle_test.test_zoomheight', verbosity=2, exit=False) + + # Add htest? diff --git a/Lib/idlelib/zzdummy.py b/Lib/idlelib/zzdummy.py new file mode 100644 index 000000000..1247e8f1c --- /dev/null +++ b/Lib/idlelib/zzdummy.py @@ -0,0 +1,73 @@ +"""Example extension, also used for testing. + +See extend.txt for more details on creating an extension. +See config-extension.def for configuring an extension. +""" + +from idlelib.config import idleConf +from functools import wraps + + +def format_selection(format_line): + "Apply a formatting function to all of the selected lines." + + @wraps(format_line) + def apply(self, event=None): + head, tail, chars, lines = self.formatter.get_region() + for pos in range(len(lines) - 1): + line = lines[pos] + lines[pos] = format_line(self, line) + self.formatter.set_region(head, tail, chars, lines) + return 'break' + + return apply + + +class ZzDummy: + """Prepend or remove initial text from selected lines.""" + + # Extend the format menu. + menudefs = [ + ('format', [ + ('Z in', '<<z-in>>'), + ('Z out', '<<z-out>>'), + ] ) + ] + + def __init__(self, editwin): + "Initialize the settings for this extension." + self.editwin = editwin + self.text = editwin.text + self.formatter = editwin.fregion + + @classmethod + def reload(cls): + "Load class variables from config." + cls.ztext = idleConf.GetOption('extensions', 'ZzDummy', 'z-text') + + @format_selection + def z_in_event(self, line): + """Insert text at the beginning of each selected line. + + This is bound to the <<z-in>> virtual event when the extensions + are loaded. + """ + return f'{self.ztext}{line}' + + @format_selection + def z_out_event(self, line): + """Remove specific text from the beginning of each selected line. + + This is bound to the <<z-out>> virtual event when the extensions + are loaded. + """ + zlength = 0 if not line.startswith(self.ztext) else len(self.ztext) + return line[zlength:] + + +ZzDummy.reload() + + +if __name__ == "__main__": + import unittest + unittest.main('idlelib.idle_test.test_zzdummy', verbosity=2, exit=False) diff --git a/Lib/test/test_idle.py b/Lib/test/test_idle.py new file mode 100644 index 000000000..3d8b7ecc0 --- /dev/null +++ b/Lib/test/test_idle.py @@ -0,0 +1,25 @@ +import unittest +from test.support.import_helper import import_module +from test.support import check_sanitizer + +if check_sanitizer(address=True, memory=True): + # See gh-90791 for details + raise unittest.SkipTest("Tests involving libX11 can SEGFAULT on ASAN/MSAN builds") + +# Skip test_idle if _tkinter, tkinter, or idlelib are missing. +tk = import_module('tkinter') # Also imports _tkinter. +idlelib = import_module('idlelib') + +# Before importing and executing more of idlelib, +# tell IDLE to avoid changing the environment. +idlelib.testing = True + +# Unittest.main and test.libregrtest.runtest.runtest_inner +# call load_tests, when present here, to discover tests to run. +from idlelib.idle_test import load_tests + +if __name__ == '__main__': + tk.NoDefaultRoot() + unittest.main(exit=False) + tk._support_default_root = True + tk._default_root = None From e65b1fc488659ed4a4f852300b77ea71a4372370 Mon Sep 17 00:00:00 2001 From: Rory Yorke <rory.yorke@gmail.com> Date: Tue, 16 Jun 2026 08:58:12 +0200 Subject: [PATCH 098/339] Dedent -c command-line parameter value (#8056) --- Lib/test/test_cmd_line.py | 1 - Lib/test/test_os.py | 2 +- src/settings.rs | 73 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 73 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py index 50f6c7572..7bb2a1503 100644 --- a/Lib/test/test_cmd_line.py +++ b/Lib/test/test_cmd_line.py @@ -1110,7 +1110,6 @@ class CmdLineTest(unittest.TestCase): ) self.assertEqual(res2int(res), (6000, 6000)) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_cmd_dedent(self): # test that -c auto-dedents its arguments test_cases = [ diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py index 5ba6b3de2..4a8d20f2b 100644 --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -2419,7 +2419,7 @@ class ExecTests(unittest.TestCase): # See https://github.com/python/cpython/issues/137934 and the other # related issues for the reason why we cannot test this on Windows. - @unittest.expectedFailure # TODO: RUSTPYTHON; IndentationError: unexpected indentation + @unittest.expectedFailure # TODO: RUSTPYTHON; TypeError: MyEnv.__getitem__() takes 1 positional argument but 2 were given @unittest.skipIf(os.name == "nt", "POSIX-specific test") @unittest.skipUnless(unix_shell and os.path.exists(unix_shell), "requires a shell") diff --git a/src/settings.rs b/src/settings.rs index 25398cd8f..2074abd97 100644 --- a/src/settings.rs +++ b/src/settings.rs @@ -122,7 +122,11 @@ fn parse_args() -> Result<(CliArgs, RunMode, Vec<String>), lexopt::Error> { Short('B') => args.dont_write_bytecode = true, Short('c') => { let cmd = parser.value()?.string()?; - return Ok((args, RunMode::Command(cmd), argv("-c".to_owned(), parser)?)); + return Ok(( + args, + RunMode::Command(dedent(&cmd)), + argv("-c".to_owned(), parser)?, + )); } Short('d') => args.debug += 1, Short('E') => args.ignore_environment = true, @@ -465,3 +469,70 @@ pub(crate) fn split_paths<T: AsRef<std::ffi::OsStr> + ?Sized>( .into() }) } + +/// Remove common whitespace prefix from all lines in a string. +/// +/// This is like textwrap.dedent, and is used to process -c's code +/// argument. It's different from ruff's dedent, which does not +/// distinguish between tab and space characters when dedenting. +fn dedent(input: &str) -> String { + let mut prefix: Option<String> = None; + let isspace = |c| c == ' ' || c == '\t'; + + // All-whitespace lines become empty. + let deblanked: Vec<&str> = input + .lines() + .map(|line| if line.chars().all(isspace) { "" } else { line }) + .collect(); + + // Find maximum common whitespace prefix, if any. + for line in deblanked.iter() { + if line.is_empty() { + continue; + } + if let Some(ref mut pstr) = prefix { + for (i, (c, pc)) in line.chars().zip(pstr.chars()).enumerate() { + // It's okay if `line` is shorter than `pstr`. At + // least one char in `line` must be non-whitespace, + // and if `line` is shorter than `pstr`, this + // non-whitespace char will be compared to a + // whitespace char, and loop will terminate. + if c != pc { + pstr.truncate(i); + break; + } + } + } else { + let mut pstr = String::new(); + for c in line.chars() { + if isspace(c) { + pstr.push(c); + } else { + break; + } + } + prefix = Some(pstr); + continue; + } + } + + if let Some(pstr) = prefix { + // Strip common prefix. + deblanked + .iter() + .map(|line| { + if line.is_empty() { + String::from("") + } else { + // All non-empty lines start with pstr, must be at + // least pstr.len() long. + String::from(line.get(pstr.len()..).unwrap()) + } + }) + .collect::<Vec<_>>() + .join("\n") + } else { + // No prefix found: all lines blank. + deblanked.join("\n") + } +} From cbfa3307802c61549aa0115cac290eee0525371d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 16 Jun 2026 15:59:36 +0900 Subject: [PATCH 099/339] Update doc DB for CPython 3.14.6 (#8106) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> --- crates/doc/src/data.inc.rs | 15873 +++++++++++++++++++++++++++++++++++ 1 file changed, 15873 insertions(+) diff --git a/crates/doc/src/data.inc.rs b/crates/doc/src/data.inc.rs index 73246d650..a81cf75a9 100644 --- a/crates/doc/src/data.inc.rs +++ b/crates/doc/src/data.inc.rs @@ -9617,6 +9617,341 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "binascii.hexlify" => "Hexadecimal representation of binary data.\n\n sep\n An optional single character or byte to separate hex bytes.\n bytes_per_sep\n How many bytes between separators. Positive values count from the\n right, negative values count from the left.\n\nThe return value is a bytes object. This function is also\navailable as \"b2a_hex()\".", "binascii.unhexlify" => "Binary data of hexadecimal representation.\n\nhexstr must contain an even number of hex digits (upper or lower case).", "builtins" => "Built-in functions, types, exceptions, and other objects.\n\nThis module provides direct access to all 'built-in'\nidentifiers of Python; for example, builtins.len is\nthe full name for the built-in function len().\n\nThis module is not normally accessed explicitly by most\napplications, but can be useful in modules that provide\nobjects with the same name as a built-in value, but in\nwhich the built-in of that name is also needed.", + "builtins.ABC" => "Helper class that provides a standard way to create an ABC using\ninheritance.", + "builtins.ABC.__delattr__" => "Implement delattr(self, name).", + "builtins.ABC.__eq__" => "Return self==value.", + "builtins.ABC.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.ABC.__ge__" => "Return self>=value.", + "builtins.ABC.__getattribute__" => "Return getattr(self, name).", + "builtins.ABC.__getstate__" => "Helper for pickle.", + "builtins.ABC.__gt__" => "Return self>value.", + "builtins.ABC.__hash__" => "Return hash(self).", + "builtins.ABC.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.ABC.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.ABC.__le__" => "Return self<=value.", + "builtins.ABC.__lt__" => "Return self<value.", + "builtins.ABC.__ne__" => "Return self!=value.", + "builtins.ABC.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.ABC.__reduce__" => "Helper for pickle.", + "builtins.ABC.__reduce_ex__" => "Helper for pickle.", + "builtins.ABC.__repr__" => "Return repr(self).", + "builtins.ABC.__setattr__" => "Implement setattr(self, name, value).", + "builtins.ABC.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.ABC.__str__" => "Return str(self).", + "builtins.ABC.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.ALLOW_MISSING" => "Special value for use in realpath().", + "builtins.ALLOW_MISSING.__delattr__" => "Implement delattr(self, name).", + "builtins.ALLOW_MISSING.__eq__" => "Return self==value.", + "builtins.ALLOW_MISSING.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.ALLOW_MISSING.__ge__" => "Return self>=value.", + "builtins.ALLOW_MISSING.__getattribute__" => "Return getattr(self, name).", + "builtins.ALLOW_MISSING.__getstate__" => "Helper for pickle.", + "builtins.ALLOW_MISSING.__gt__" => "Return self>value.", + "builtins.ALLOW_MISSING.__hash__" => "Return hash(self).", + "builtins.ALLOW_MISSING.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.ALLOW_MISSING.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.ALLOW_MISSING.__le__" => "Return self<=value.", + "builtins.ALLOW_MISSING.__lt__" => "Return self<value.", + "builtins.ALLOW_MISSING.__ne__" => "Return self!=value.", + "builtins.ALLOW_MISSING.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.ALLOW_MISSING.__reduce_ex__" => "Helper for pickle.", + "builtins.ALLOW_MISSING.__setattr__" => "Implement setattr(self, name, value).", + "builtins.ALLOW_MISSING.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.ALLOW_MISSING.__str__" => "Return str(self).", + "builtins.ALLOW_MISSING.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.ALLOW_MISSING.__weakref__" => "list of weak references to the object", + "builtins.ANSIColors.__delattr__" => "Implement delattr(self, name).", + "builtins.ANSIColors.__eq__" => "Return self==value.", + "builtins.ANSIColors.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.ANSIColors.__ge__" => "Return self>=value.", + "builtins.ANSIColors.__getattribute__" => "Return getattr(self, name).", + "builtins.ANSIColors.__getstate__" => "Helper for pickle.", + "builtins.ANSIColors.__gt__" => "Return self>value.", + "builtins.ANSIColors.__hash__" => "Return hash(self).", + "builtins.ANSIColors.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.ANSIColors.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.ANSIColors.__le__" => "Return self<=value.", + "builtins.ANSIColors.__lt__" => "Return self<value.", + "builtins.ANSIColors.__ne__" => "Return self!=value.", + "builtins.ANSIColors.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.ANSIColors.__reduce__" => "Helper for pickle.", + "builtins.ANSIColors.__reduce_ex__" => "Helper for pickle.", + "builtins.ANSIColors.__repr__" => "Return repr(self).", + "builtins.ANSIColors.__setattr__" => "Implement setattr(self, name, value).", + "builtins.ANSIColors.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.ANSIColors.__str__" => "Return str(self).", + "builtins.ANSIColors.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.ANSIColors.__weakref__" => "list of weak references to the object", + "builtins.AST.__delattr__" => "Implement delattr(self, name).", + "builtins.AST.__eq__" => "Return self==value.", + "builtins.AST.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.AST.__ge__" => "Return self>=value.", + "builtins.AST.__getattribute__" => "Return getattr(self, name).", + "builtins.AST.__getstate__" => "Helper for pickle.", + "builtins.AST.__gt__" => "Return self>value.", + "builtins.AST.__hash__" => "Return hash(self).", + "builtins.AST.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.AST.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.AST.__le__" => "Return self<=value.", + "builtins.AST.__lt__" => "Return self<value.", + "builtins.AST.__ne__" => "Return self!=value.", + "builtins.AST.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.AST.__reduce_ex__" => "Helper for pickle.", + "builtins.AST.__replace__" => "Return a copy of the AST node with new values for the specified fields.", + "builtins.AST.__repr__" => "Return repr(self).", + "builtins.AST.__setattr__" => "Implement setattr(self, name, value).", + "builtins.AST.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.AST.__str__" => "Return str(self).", + "builtins.AST.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.AbstractEventLoop" => "Abstract event loop.", + "builtins.AbstractEventLoop.__delattr__" => "Implement delattr(self, name).", + "builtins.AbstractEventLoop.__eq__" => "Return self==value.", + "builtins.AbstractEventLoop.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.AbstractEventLoop.__ge__" => "Return self>=value.", + "builtins.AbstractEventLoop.__getattribute__" => "Return getattr(self, name).", + "builtins.AbstractEventLoop.__getstate__" => "Helper for pickle.", + "builtins.AbstractEventLoop.__gt__" => "Return self>value.", + "builtins.AbstractEventLoop.__hash__" => "Return hash(self).", + "builtins.AbstractEventLoop.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.AbstractEventLoop.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.AbstractEventLoop.__le__" => "Return self<=value.", + "builtins.AbstractEventLoop.__lt__" => "Return self<value.", + "builtins.AbstractEventLoop.__ne__" => "Return self!=value.", + "builtins.AbstractEventLoop.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.AbstractEventLoop.__reduce__" => "Helper for pickle.", + "builtins.AbstractEventLoop.__reduce_ex__" => "Helper for pickle.", + "builtins.AbstractEventLoop.__repr__" => "Return repr(self).", + "builtins.AbstractEventLoop.__setattr__" => "Implement setattr(self, name, value).", + "builtins.AbstractEventLoop.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.AbstractEventLoop.__str__" => "Return str(self).", + "builtins.AbstractEventLoop.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.AbstractEventLoop.__weakref__" => "list of weak references to the object", + "builtins.AbstractEventLoop._timer_handle_cancelled" => "Notification that a TimerHandle has been cancelled.", + "builtins.AbstractEventLoop.close" => "Close the loop.\n\nThe loop should not be running.\n\nThis is idempotent and irreversible.\n\nNo other methods should be called after this one.", + "builtins.AbstractEventLoop.connect_accepted_socket" => "Handle an accepted connection.\n\nThis is used by servers that accept connections outside of\nasyncio, but use asyncio to handle connections.\n\nThis method is a coroutine. When completed, the coroutine\nreturns a (transport, protocol) pair.", + "builtins.AbstractEventLoop.connect_read_pipe" => "Register read pipe in event loop. Set the pipe to non-blocking mode.\n\nprotocol_factory should instantiate object with Protocol interface.\npipe is a file-like object.\nReturn pair (transport, protocol), where transport supports the\nReadTransport interface.", + "builtins.AbstractEventLoop.connect_write_pipe" => "Register write pipe in event loop.\n\nprotocol_factory should instantiate object with BaseProtocol\ninterface.\nPipe is file-like object already switched to nonblocking.\nReturn pair (transport, protocol), where transport support\nWriteTransport interface.", + "builtins.AbstractEventLoop.create_datagram_endpoint" => "A coroutine which creates a datagram endpoint.\n\nThis method will try to establish the endpoint in the background.\nWhen successful, the coroutine returns a (transport, protocol) pair.\n\nprotocol_factory must be a callable returning a protocol instance.\n\nsocket family AF_INET, socket.AF_INET6 or socket.AF_UNIX depending\non host (or family if specified), socket type SOCK_DGRAM.\n\nreuse_address tells the kernel to reuse a local socket in\nTIME_WAIT state, without waiting for its natural timeout to\nexpire. If not specified it will automatically be set to True on\nUNIX.\n\nreuse_port tells the kernel to allow this endpoint to be bound to\nthe same port as other existing endpoints are bound to, so long as\nthey all set this flag when being created. This option is not\nsupported on Windows and some UNIX's. If the\n:py:data:`~socket.SO_REUSEPORT` constant is not defined then this\ncapability is unsupported.\n\nallow_broadcast tells the kernel to allow this endpoint to send\nmessages to the broadcast address.\n\nsock can optionally be specified in order to use a preexisting\nsocket object.", + "builtins.AbstractEventLoop.create_server" => "A coroutine which creates a TCP server bound to host and port.\n\nThe return value is a Server object which can be used to stop\nthe service.\n\nIf host is an empty string or None all interfaces are assumed\nand a list of multiple sockets will be returned (most likely\none for IPv4 and another one for IPv6). The host parameter can also\nbe a sequence (e.g. list) of hosts to bind to.\n\nfamily can be set to either AF_INET or AF_INET6 to force the\nsocket to use IPv4 or IPv6. If not set it will be determined\nfrom host (defaults to AF_UNSPEC).\n\nflags is a bitmask for getaddrinfo().\n\nsock can optionally be specified in order to use a preexisting\nsocket object.\n\nbacklog is the maximum number of queued connections passed to\nlisten() (defaults to 100).\n\nssl can be set to an SSLContext to enable SSL over the\naccepted connections.\n\nreuse_address tells the kernel to reuse a local socket in\nTIME_WAIT state, without waiting for its natural timeout to\nexpire. If not specified will automatically be set to True on\nUNIX.\n\nreuse_port tells the kernel to allow this endpoint to be bound to\nthe same port as other existing endpoints are bound to, so long as\nthey all set this flag when being created. This option is not\nsupported on Windows.\n\nkeep_alive set to True keeps connections active by enabling the\nperiodic transmission of messages.\n\nssl_handshake_timeout is the time in seconds that an SSL server\nwill wait for completion of the SSL handshake before aborting the\nconnection. Default is 60s.\n\nssl_shutdown_timeout is the time in seconds that an SSL server\nwill wait for completion of the SSL shutdown procedure\nbefore aborting the connection. Default is 30s.\n\nstart_serving set to True (default) causes the created server\nto start accepting connections immediately. When set to False,\nthe user should await Server.start_serving() or\nServer.serve_forever() to make the server to start accepting\nconnections.", + "builtins.AbstractEventLoop.create_unix_server" => "A coroutine which creates a UNIX Domain Socket server.\n\nThe return value is a Server object, which can be used to stop\nthe service.\n\npath is a str, representing a file system path to bind the\nserver socket to.\n\nsock can optionally be specified in order to use a preexisting\nsocket object.\n\nbacklog is the maximum number of queued connections passed to\nlisten() (defaults to 100).\n\nssl can be set to an SSLContext to enable SSL over the\naccepted connections.\n\nssl_handshake_timeout is the time in seconds that an SSL server\nwill wait for the SSL handshake to complete (defaults to 60s).\n\nssl_shutdown_timeout is the time in seconds that an SSL server\nwill wait for the SSL shutdown to finish (defaults to 30s).\n\nstart_serving set to True (default) causes the created server\nto start accepting connections immediately. When set to False,\nthe user should await Server.start_serving() or\nServer.serve_forever() to make the server to start accepting\nconnections.", + "builtins.AbstractEventLoop.is_closed" => "Returns True if the event loop was closed.", + "builtins.AbstractEventLoop.is_running" => "Return whether the event loop is currently running.", + "builtins.AbstractEventLoop.run_forever" => "Run the event loop until stop() is called.", + "builtins.AbstractEventLoop.run_until_complete" => "Run the event loop until a Future is done.\n\nReturn the Future's result, or raise its exception.", + "builtins.AbstractEventLoop.sendfile" => "Send a file through a transport.\n\nReturn an amount of sent bytes.", + "builtins.AbstractEventLoop.shutdown_asyncgens" => "Shutdown all active asynchronous generators.", + "builtins.AbstractEventLoop.shutdown_default_executor" => "Schedule the shutdown of the default executor.", + "builtins.AbstractEventLoop.start_tls" => "Upgrade a transport to TLS.\n\nReturn a new transport that *protocol* should start using\nimmediately.", + "builtins.AbstractEventLoop.stop" => "Stop the event loop as soon as reasonable.\n\nExactly how soon that is may depend on the implementation, but\nno more I/O callbacks should be scheduled.", + "builtins.AbstractReducer" => "Abstract base class for use in implementing a Reduction class\nsuitable for use in replacing the standard reduction mechanism\nused in multiprocessing.", + "builtins.AbstractReducer.DupFd" => "Return a wrapper for an fd.", + "builtins.AbstractReducer.DupHandle" => "Picklable wrapper for a handle.", + "builtins.AbstractReducer.DupHandle.__delattr__" => "Implement delattr(self, name).", + "builtins.AbstractReducer.DupHandle.__eq__" => "Return self==value.", + "builtins.AbstractReducer.DupHandle.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.AbstractReducer.DupHandle.__ge__" => "Return self>=value.", + "builtins.AbstractReducer.DupHandle.__getattribute__" => "Return getattr(self, name).", + "builtins.AbstractReducer.DupHandle.__getstate__" => "Helper for pickle.", + "builtins.AbstractReducer.DupHandle.__gt__" => "Return self>value.", + "builtins.AbstractReducer.DupHandle.__hash__" => "Return hash(self).", + "builtins.AbstractReducer.DupHandle.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.AbstractReducer.DupHandle.__le__" => "Return self<=value.", + "builtins.AbstractReducer.DupHandle.__lt__" => "Return self<value.", + "builtins.AbstractReducer.DupHandle.__ne__" => "Return self!=value.", + "builtins.AbstractReducer.DupHandle.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.AbstractReducer.DupHandle.__reduce__" => "Helper for pickle.", + "builtins.AbstractReducer.DupHandle.__reduce_ex__" => "Helper for pickle.", + "builtins.AbstractReducer.DupHandle.__repr__" => "Return repr(self).", + "builtins.AbstractReducer.DupHandle.__setattr__" => "Implement setattr(self, name, value).", + "builtins.AbstractReducer.DupHandle.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.AbstractReducer.DupHandle.__str__" => "Return str(self).", + "builtins.AbstractReducer.DupHandle.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.AbstractReducer.DupHandle.__weakref__" => "list of weak references to the object", + "builtins.AbstractReducer.DupHandle.detach" => "Get the handle. This should only be called once.", + "builtins.AbstractReducer.ForkingPickler" => "Pickler subclass used by multiprocessing.", + "builtins.AbstractReducer.ForkingPickler.__delattr__" => "Implement delattr(self, name).", + "builtins.AbstractReducer.ForkingPickler.__eq__" => "Return self==value.", + "builtins.AbstractReducer.ForkingPickler.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.AbstractReducer.ForkingPickler.__ge__" => "Return self>=value.", + "builtins.AbstractReducer.ForkingPickler.__getattribute__" => "Return getattr(self, name).", + "builtins.AbstractReducer.ForkingPickler.__getstate__" => "Helper for pickle.", + "builtins.AbstractReducer.ForkingPickler.__gt__" => "Return self>value.", + "builtins.AbstractReducer.ForkingPickler.__hash__" => "Return hash(self).", + "builtins.AbstractReducer.ForkingPickler.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.AbstractReducer.ForkingPickler.__le__" => "Return self<=value.", + "builtins.AbstractReducer.ForkingPickler.__lt__" => "Return self<value.", + "builtins.AbstractReducer.ForkingPickler.__ne__" => "Return self!=value.", + "builtins.AbstractReducer.ForkingPickler.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.AbstractReducer.ForkingPickler.__reduce__" => "Helper for pickle.", + "builtins.AbstractReducer.ForkingPickler.__reduce_ex__" => "Helper for pickle.", + "builtins.AbstractReducer.ForkingPickler.__repr__" => "Return repr(self).", + "builtins.AbstractReducer.ForkingPickler.__setattr__" => "Implement setattr(self, name, value).", + "builtins.AbstractReducer.ForkingPickler.__sizeof__" => "Returns size in memory, in bytes.", + "builtins.AbstractReducer.ForkingPickler.__str__" => "Return str(self).", + "builtins.AbstractReducer.ForkingPickler.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.AbstractReducer.ForkingPickler.__weakref__" => "list of weak references to the object", + "builtins.AbstractReducer.ForkingPickler.clear_memo" => "Clears the pickler's \"memo\".\n\nThe memo is the data structure that remembers which objects the\npickler has already seen, so that shared or recursive objects are\npickled by reference and not by value. This method is useful when\nre-using picklers.", + "builtins.AbstractReducer.ForkingPickler.dump" => "Write a pickled representation of the given object to the open file.", + "builtins.AbstractReducer.ForkingPickler.loads" => "Read and return an object from the given pickle data.\n\nThe protocol version of the pickle is detected automatically, so no\nprotocol argument is needed. Bytes past the pickled object's\nrepresentation are ignored.\n\nOptional keyword arguments are *fix_imports*, *encoding* and *errors*,\nwhich are used to control compatibility support for pickle stream\ngenerated by Python 2. If *fix_imports* is True, pickle will try to\nmap the old Python 2 names to the new names used in Python 3. The\n*encoding* and *errors* tell pickle how to decode 8-bit string\ninstances pickled by Python 2; these default to 'ASCII' and 'strict',\nrespectively. The *encoding* can be 'bytes' to read these 8-bit\nstring instances as bytes objects.", + "builtins.AbstractReducer.ForkingPickler.register" => "Register a reduce function for a type.", + "builtins.AbstractReducer.__delattr__" => "Implement delattr(self, name).", + "builtins.AbstractReducer.__eq__" => "Return self==value.", + "builtins.AbstractReducer.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.AbstractReducer.__ge__" => "Return self>=value.", + "builtins.AbstractReducer.__getattribute__" => "Return getattr(self, name).", + "builtins.AbstractReducer.__getstate__" => "Helper for pickle.", + "builtins.AbstractReducer.__gt__" => "Return self>value.", + "builtins.AbstractReducer.__hash__" => "Return hash(self).", + "builtins.AbstractReducer.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.AbstractReducer.__le__" => "Return self<=value.", + "builtins.AbstractReducer.__lt__" => "Return self<value.", + "builtins.AbstractReducer.__ne__" => "Return self!=value.", + "builtins.AbstractReducer.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.AbstractReducer.__reduce__" => "Helper for pickle.", + "builtins.AbstractReducer.__reduce_ex__" => "Helper for pickle.", + "builtins.AbstractReducer.__repr__" => "Return repr(self).", + "builtins.AbstractReducer.__setattr__" => "Implement setattr(self, name, value).", + "builtins.AbstractReducer.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.AbstractReducer.__str__" => "Return str(self).", + "builtins.AbstractReducer.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.AbstractReducer.__weakref__" => "list of weak references to the object", + "builtins.AbstractReducer.dump" => "Replacement for pickle.dump() using ForkingPickler.", + "builtins.AbstractReducer.duplicate" => "Duplicate a handle. (target_process is a handle not a pid!)", + "builtins.AbstractReducer.recv_handle" => "Receive a handle over a local connection.", + "builtins.AbstractReducer.recvfds" => "Receive an array of fds over an AF_UNIX socket.", + "builtins.AbstractReducer.register" => "Register a reduce function for a type.", + "builtins.AbstractReducer.send_handle" => "Send a handle over a local connection.", + "builtins.AbstractReducer.sendfds" => "Send an array of fds over an AF_UNIX socket.", + "builtins.AbstractReducer.steal_handle" => "Steal a handle from process identified by source_pid.", + "builtins.AbstractServer" => "Abstract server returned by create_server().", + "builtins.AbstractServer.__delattr__" => "Implement delattr(self, name).", + "builtins.AbstractServer.__eq__" => "Return self==value.", + "builtins.AbstractServer.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.AbstractServer.__ge__" => "Return self>=value.", + "builtins.AbstractServer.__getattribute__" => "Return getattr(self, name).", + "builtins.AbstractServer.__getstate__" => "Helper for pickle.", + "builtins.AbstractServer.__gt__" => "Return self>value.", + "builtins.AbstractServer.__hash__" => "Return hash(self).", + "builtins.AbstractServer.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.AbstractServer.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.AbstractServer.__le__" => "Return self<=value.", + "builtins.AbstractServer.__lt__" => "Return self<value.", + "builtins.AbstractServer.__ne__" => "Return self!=value.", + "builtins.AbstractServer.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.AbstractServer.__reduce__" => "Helper for pickle.", + "builtins.AbstractServer.__reduce_ex__" => "Helper for pickle.", + "builtins.AbstractServer.__repr__" => "Return repr(self).", + "builtins.AbstractServer.__setattr__" => "Implement setattr(self, name, value).", + "builtins.AbstractServer.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.AbstractServer.__str__" => "Return str(self).", + "builtins.AbstractServer.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.AbstractServer.__weakref__" => "list of weak references to the object", + "builtins.AbstractServer.abort_clients" => "Close all active connections immediately.", + "builtins.AbstractServer.close" => "Stop serving. This leaves existing connections open.", + "builtins.AbstractServer.close_clients" => "Close all active connections.", + "builtins.AbstractServer.get_loop" => "Get the event loop the Server object is attached to.", + "builtins.AbstractServer.is_serving" => "Return True if the server is accepting connections.", + "builtins.AbstractServer.serve_forever" => "Start accepting connections until the coroutine is cancelled.\n\nThe server is closed when the coroutine is cancelled.", + "builtins.AbstractServer.start_serving" => "Start accepting connections.\n\nThis method is idempotent, so it can be called when\nthe server is already being serving.", + "builtins.AbstractServer.wait_closed" => "Coroutine to wait until service is closed.", + "builtins.AddrlistClass" => "Address parser class by Ben Escoto.\n\nTo understand what this class does, it helps to have a copy of RFC 2822 in\nfront of you.\n\nNote: this class interface is deprecated and may be removed in the future.\nUse email.utils.AddressList instead.", + "builtins.AddrlistClass.__delattr__" => "Implement delattr(self, name).", + "builtins.AddrlistClass.__eq__" => "Return self==value.", + "builtins.AddrlistClass.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.AddrlistClass.__ge__" => "Return self>=value.", + "builtins.AddrlistClass.__getattribute__" => "Return getattr(self, name).", + "builtins.AddrlistClass.__getstate__" => "Helper for pickle.", + "builtins.AddrlistClass.__gt__" => "Return self>value.", + "builtins.AddrlistClass.__hash__" => "Return hash(self).", + "builtins.AddrlistClass.__init__" => "Initialize a new instance.\n\n'field' is an unparsed address header field, containing\none or more addresses.", + "builtins.AddrlistClass.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.AddrlistClass.__le__" => "Return self<=value.", + "builtins.AddrlistClass.__lt__" => "Return self<value.", + "builtins.AddrlistClass.__ne__" => "Return self!=value.", + "builtins.AddrlistClass.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.AddrlistClass.__reduce__" => "Helper for pickle.", + "builtins.AddrlistClass.__reduce_ex__" => "Helper for pickle.", + "builtins.AddrlistClass.__repr__" => "Return repr(self).", + "builtins.AddrlistClass.__setattr__" => "Implement setattr(self, name, value).", + "builtins.AddrlistClass.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.AddrlistClass.__str__" => "Return str(self).", + "builtins.AddrlistClass.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.AddrlistClass.__weakref__" => "list of weak references to the object", + "builtins.AddrlistClass.getaddress" => "Parse the next address.", + "builtins.AddrlistClass.getaddrlist" => "Parse all addresses.\n\nReturns a list containing all of the addresses.", + "builtins.AddrlistClass.getaddrspec" => "Parse an RFC 2822 addr-spec.", + "builtins.AddrlistClass.getatom" => "Parse an RFC 2822 atom.\n\nOptional atomends specifies a different set of end token delimiters\n(the default is to use self.atomends). This is used e.g. in\ngetphraselist() since phrase endings must not include the '.' (which\nis legal in phrases).", + "builtins.AddrlistClass.getcomment" => "Get a parenthesis-delimited fragment from self's field.", + "builtins.AddrlistClass.getdelimited" => "Parse a header fragment delimited by special characters.\n\n'beginchar' is the start character for the fragment.\nIf self is not looking at an instance of 'beginchar' then\ngetdelimited returns the empty string.\n\n'endchars' is a sequence of allowable end-delimiting characters.\nParsing stops when one of these is encountered.\n\nIf 'allowcomments' is non-zero, embedded RFC 2822 comments are allowed\nwithin the parsed fragment.", + "builtins.AddrlistClass.getdomain" => "Get the complete domain name from an address.", + "builtins.AddrlistClass.getdomainliteral" => "Parse an RFC 2822 domain-literal.", + "builtins.AddrlistClass.getphraselist" => "Parse a sequence of RFC 2822 phrases.\n\nA phrase is a sequence of words, which are in turn either RFC 2822\natoms or quoted-strings. Phrases are canonicalized by squeezing all\nruns of continuous whitespace into one space.", + "builtins.AddrlistClass.getquote" => "Get a quote-delimited fragment from self's field.", + "builtins.AddrlistClass.getrouteaddr" => "Parse a route address (Return-path value).\n\nThis method just skips all the route stuff and returns the addrspec.", + "builtins.AddrlistClass.gotonext" => "Skip white space and extract comments.", + "builtins.Any" => "Special type indicating an unconstrained type.\n\n- Any is assignable to every type.\n- Any assumed to have all methods and attributes.\n- All values are assignable to Any.\n\nNote that all the above statements are true from the point of view of\nstatic type checkers. At runtime, Any cannot be used with instance\nchecks.", + "builtins.Any.__delattr__" => "Implement delattr(self, name).", + "builtins.Any.__eq__" => "Return self==value.", + "builtins.Any.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Any.__ge__" => "Return self>=value.", + "builtins.Any.__getattribute__" => "Return getattr(self, name).", + "builtins.Any.__getstate__" => "Helper for pickle.", + "builtins.Any.__gt__" => "Return self>value.", + "builtins.Any.__hash__" => "Return hash(self).", + "builtins.Any.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Any.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Any.__le__" => "Return self<=value.", + "builtins.Any.__lt__" => "Return self<value.", + "builtins.Any.__ne__" => "Return self!=value.", + "builtins.Any.__reduce__" => "Helper for pickle.", + "builtins.Any.__reduce_ex__" => "Helper for pickle.", + "builtins.Any.__repr__" => "Return repr(self).", + "builtins.Any.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Any.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Any.__str__" => "Return str(self).", + "builtins.Any.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Any.__weakref__" => "list of weak references to the object", + "builtins.ArgResolver.__delattr__" => "Implement delattr(self, name).", + "builtins.ArgResolver.__eq__" => "Return self==value.", + "builtins.ArgResolver.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.ArgResolver.__ge__" => "Return self>=value.", + "builtins.ArgResolver.__getattribute__" => "Return getattr(self, name).", + "builtins.ArgResolver.__getstate__" => "Helper for pickle.", + "builtins.ArgResolver.__gt__" => "Return self>value.", + "builtins.ArgResolver.__hash__" => "Return hash(self).", + "builtins.ArgResolver.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.ArgResolver.__le__" => "Return self<=value.", + "builtins.ArgResolver.__lt__" => "Return self<value.", + "builtins.ArgResolver.__ne__" => "Return self!=value.", + "builtins.ArgResolver.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.ArgResolver.__reduce__" => "Helper for pickle.", + "builtins.ArgResolver.__reduce_ex__" => "Helper for pickle.", + "builtins.ArgResolver.__repr__" => "Return repr(self).", + "builtins.ArgResolver.__setattr__" => "Implement setattr(self, name, value).", + "builtins.ArgResolver.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.ArgResolver.__str__" => "Return str(self).", + "builtins.ArgResolver.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.ArgResolver.__weakref__" => "list of weak references to the object", + "builtins.ArgumentDescriptor.__delattr__" => "Implement delattr(self, name).", + "builtins.ArgumentDescriptor.__eq__" => "Return self==value.", + "builtins.ArgumentDescriptor.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.ArgumentDescriptor.__ge__" => "Return self>=value.", + "builtins.ArgumentDescriptor.__getattribute__" => "Return getattr(self, name).", + "builtins.ArgumentDescriptor.__getstate__" => "Helper for pickle.", + "builtins.ArgumentDescriptor.__gt__" => "Return self>value.", + "builtins.ArgumentDescriptor.__hash__" => "Return hash(self).", + "builtins.ArgumentDescriptor.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.ArgumentDescriptor.__le__" => "Return self<=value.", + "builtins.ArgumentDescriptor.__lt__" => "Return self<value.", + "builtins.ArgumentDescriptor.__ne__" => "Return self!=value.", + "builtins.ArgumentDescriptor.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.ArgumentDescriptor.__reduce__" => "Helper for pickle.", + "builtins.ArgumentDescriptor.__reduce_ex__" => "Helper for pickle.", + "builtins.ArgumentDescriptor.__repr__" => "Return repr(self).", + "builtins.ArgumentDescriptor.__setattr__" => "Implement setattr(self, name, value).", + "builtins.ArgumentDescriptor.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.ArgumentDescriptor.__str__" => "Return str(self).", + "builtins.ArgumentDescriptor.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.ArithmeticError" => "Base class for arithmetic errors.", "builtins.ArithmeticError.__delattr__" => "Implement delattr(self, name).", "builtins.ArithmeticError.__eq__" => "Return self==value.", @@ -9663,6 +9998,51 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.AssertionError.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.AssertionError.add_note" => "Add a note to the exception", "builtins.AssertionError.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.AsyncContextDecorator" => "A base class or mixin that enables async context managers to work as decorators.", + "builtins.AsyncContextDecorator.__delattr__" => "Implement delattr(self, name).", + "builtins.AsyncContextDecorator.__eq__" => "Return self==value.", + "builtins.AsyncContextDecorator.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.AsyncContextDecorator.__ge__" => "Return self>=value.", + "builtins.AsyncContextDecorator.__getattribute__" => "Return getattr(self, name).", + "builtins.AsyncContextDecorator.__getstate__" => "Helper for pickle.", + "builtins.AsyncContextDecorator.__gt__" => "Return self>value.", + "builtins.AsyncContextDecorator.__hash__" => "Return hash(self).", + "builtins.AsyncContextDecorator.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.AsyncContextDecorator.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.AsyncContextDecorator.__le__" => "Return self<=value.", + "builtins.AsyncContextDecorator.__lt__" => "Return self<value.", + "builtins.AsyncContextDecorator.__ne__" => "Return self!=value.", + "builtins.AsyncContextDecorator.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.AsyncContextDecorator.__reduce__" => "Helper for pickle.", + "builtins.AsyncContextDecorator.__reduce_ex__" => "Helper for pickle.", + "builtins.AsyncContextDecorator.__repr__" => "Return repr(self).", + "builtins.AsyncContextDecorator.__setattr__" => "Implement setattr(self, name, value).", + "builtins.AsyncContextDecorator.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.AsyncContextDecorator.__str__" => "Return str(self).", + "builtins.AsyncContextDecorator.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.AsyncContextDecorator.__weakref__" => "list of weak references to the object", + "builtins.AsyncContextDecorator._recreate_cm" => "Return a recreated instance of self.", + "builtins.AsyncIterable.__class_getitem__" => "Represent a PEP 585 generic type\n\nE.g. for t = list[int], t.__origin__ is list and t.__args__ is (int,).", + "builtins.AsyncIterable.__delattr__" => "Implement delattr(self, name).", + "builtins.AsyncIterable.__eq__" => "Return self==value.", + "builtins.AsyncIterable.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.AsyncIterable.__ge__" => "Return self>=value.", + "builtins.AsyncIterable.__getattribute__" => "Return getattr(self, name).", + "builtins.AsyncIterable.__getstate__" => "Helper for pickle.", + "builtins.AsyncIterable.__gt__" => "Return self>value.", + "builtins.AsyncIterable.__hash__" => "Return hash(self).", + "builtins.AsyncIterable.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.AsyncIterable.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.AsyncIterable.__le__" => "Return self<=value.", + "builtins.AsyncIterable.__lt__" => "Return self<value.", + "builtins.AsyncIterable.__ne__" => "Return self!=value.", + "builtins.AsyncIterable.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.AsyncIterable.__reduce__" => "Helper for pickle.", + "builtins.AsyncIterable.__reduce_ex__" => "Helper for pickle.", + "builtins.AsyncIterable.__repr__" => "Return repr(self).", + "builtins.AsyncIterable.__setattr__" => "Implement setattr(self, name, value).", + "builtins.AsyncIterable.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.AsyncIterable.__str__" => "Return str(self).", "builtins.AttributeError" => "Attribute not found.", "builtins.AttributeError.__delattr__" => "Implement delattr(self, name).", "builtins.AttributeError.__eq__" => "Return self==value.", @@ -9687,6 +10067,270 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.AttributeError.name" => "attribute name", "builtins.AttributeError.obj" => "object", "builtins.AttributeError.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.Awaitable.__class_getitem__" => "Represent a PEP 585 generic type\n\nE.g. for t = list[int], t.__origin__ is list and t.__args__ is (int,).", + "builtins.Awaitable.__delattr__" => "Implement delattr(self, name).", + "builtins.Awaitable.__eq__" => "Return self==value.", + "builtins.Awaitable.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Awaitable.__ge__" => "Return self>=value.", + "builtins.Awaitable.__getattribute__" => "Return getattr(self, name).", + "builtins.Awaitable.__getstate__" => "Helper for pickle.", + "builtins.Awaitable.__gt__" => "Return self>value.", + "builtins.Awaitable.__hash__" => "Return hash(self).", + "builtins.Awaitable.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Awaitable.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Awaitable.__le__" => "Return self<=value.", + "builtins.Awaitable.__lt__" => "Return self<value.", + "builtins.Awaitable.__ne__" => "Return self!=value.", + "builtins.Awaitable.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Awaitable.__reduce__" => "Helper for pickle.", + "builtins.Awaitable.__reduce_ex__" => "Helper for pickle.", + "builtins.Awaitable.__repr__" => "Return repr(self).", + "builtins.Awaitable.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Awaitable.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Awaitable.__str__" => "Return str(self).", + "builtins.BZ2Compressor" => "Create a compressor object for compressing data incrementally.\n\n compresslevel\n Compression level, as a number between 1 and 9.\n\nFor one-shot compression, use the compress() function instead.", + "builtins.BZ2Compressor.__delattr__" => "Implement delattr(self, name).", + "builtins.BZ2Compressor.__eq__" => "Return self==value.", + "builtins.BZ2Compressor.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.BZ2Compressor.__ge__" => "Return self>=value.", + "builtins.BZ2Compressor.__getattribute__" => "Return getattr(self, name).", + "builtins.BZ2Compressor.__getstate__" => "Helper for pickle.", + "builtins.BZ2Compressor.__gt__" => "Return self>value.", + "builtins.BZ2Compressor.__hash__" => "Return hash(self).", + "builtins.BZ2Compressor.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.BZ2Compressor.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.BZ2Compressor.__le__" => "Return self<=value.", + "builtins.BZ2Compressor.__lt__" => "Return self<value.", + "builtins.BZ2Compressor.__ne__" => "Return self!=value.", + "builtins.BZ2Compressor.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.BZ2Compressor.__reduce__" => "Helper for pickle.", + "builtins.BZ2Compressor.__reduce_ex__" => "Helper for pickle.", + "builtins.BZ2Compressor.__repr__" => "Return repr(self).", + "builtins.BZ2Compressor.__setattr__" => "Implement setattr(self, name, value).", + "builtins.BZ2Compressor.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.BZ2Compressor.__str__" => "Return str(self).", + "builtins.BZ2Compressor.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.BZ2Compressor.compress" => "Provide data to the compressor object.\n\nReturns a chunk of compressed data if possible, or b'' otherwise.\n\nWhen you have finished providing data to the compressor, call the\nflush() method to finish the compression process.", + "builtins.BZ2Compressor.flush" => "Finish the compression process.\n\nReturns the compressed data left in internal buffers.\n\nThe compressor object may not be used after this method is called.", + "builtins.BZ2Decompressor" => "Create a decompressor object for decompressing data incrementally.\n\nFor one-shot decompression, use the decompress() function instead.", + "builtins.BZ2Decompressor.__delattr__" => "Implement delattr(self, name).", + "builtins.BZ2Decompressor.__eq__" => "Return self==value.", + "builtins.BZ2Decompressor.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.BZ2Decompressor.__ge__" => "Return self>=value.", + "builtins.BZ2Decompressor.__getattribute__" => "Return getattr(self, name).", + "builtins.BZ2Decompressor.__getstate__" => "Helper for pickle.", + "builtins.BZ2Decompressor.__gt__" => "Return self>value.", + "builtins.BZ2Decompressor.__hash__" => "Return hash(self).", + "builtins.BZ2Decompressor.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.BZ2Decompressor.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.BZ2Decompressor.__le__" => "Return self<=value.", + "builtins.BZ2Decompressor.__lt__" => "Return self<value.", + "builtins.BZ2Decompressor.__ne__" => "Return self!=value.", + "builtins.BZ2Decompressor.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.BZ2Decompressor.__reduce__" => "Helper for pickle.", + "builtins.BZ2Decompressor.__reduce_ex__" => "Helper for pickle.", + "builtins.BZ2Decompressor.__repr__" => "Return repr(self).", + "builtins.BZ2Decompressor.__setattr__" => "Implement setattr(self, name, value).", + "builtins.BZ2Decompressor.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.BZ2Decompressor.__str__" => "Return str(self).", + "builtins.BZ2Decompressor.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.BZ2Decompressor.decompress" => "Decompress *data*, returning uncompressed data as bytes.\n\nIf *max_length* is nonnegative, returns at most *max_length* bytes\nof decompressed data. If this limit is reached and further output\ncan be produced, *self.needs_input* will be set to ``False``. In\nthis case, the next call to *decompress()* may provide *data* as b''\nto obtain more of the output.\n\nIf all of the input data was decompressed and returned (either\nbecause this was less than *max_length* bytes, or because\n*max_length* was negative), *self.needs_input* will be set to True.\n\nAttempting to decompress data after the end of stream is reached\nraises an EOFError. Any data found after the end of the stream is\nignored and saved in the unused_data attribute.", + "builtins.BZ2Decompressor.eof" => "True if the end-of-stream marker has been reached.", + "builtins.BZ2Decompressor.needs_input" => "True if more input is needed before more decompressed data can be produced.", + "builtins.BZ2Decompressor.unused_data" => "Data found after the end of the compressed stream.", + "builtins.Barrier" => "Implements a Barrier.\n\nUseful for synchronizing a fixed number of threads at known synchronization\npoints. Threads block on 'wait()' and are simultaneously awoken once they\nhave all made that call.", + "builtins.Barrier.__delattr__" => "Implement delattr(self, name).", + "builtins.Barrier.__eq__" => "Return self==value.", + "builtins.Barrier.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Barrier.__ge__" => "Return self>=value.", + "builtins.Barrier.__getattribute__" => "Return getattr(self, name).", + "builtins.Barrier.__getstate__" => "Helper for pickle.", + "builtins.Barrier.__gt__" => "Return self>value.", + "builtins.Barrier.__hash__" => "Return hash(self).", + "builtins.Barrier.__init__" => "Create a barrier, initialised to 'parties' threads.\n\n'action' is a callable which, when supplied, will be called by one of\nthe threads after they have all entered the barrier and just prior to\nreleasing them all. If a 'timeout' is provided, it is used as the\ndefault for all subsequent 'wait()' calls.", + "builtins.Barrier.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Barrier.__le__" => "Return self<=value.", + "builtins.Barrier.__lt__" => "Return self<value.", + "builtins.Barrier.__ne__" => "Return self!=value.", + "builtins.Barrier.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Barrier.__reduce__" => "Helper for pickle.", + "builtins.Barrier.__reduce_ex__" => "Helper for pickle.", + "builtins.Barrier.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Barrier.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Barrier.__str__" => "Return str(self).", + "builtins.Barrier.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Barrier.__weakref__" => "list of weak references to the object", + "builtins.Barrier.abort" => "Place the barrier into a 'broken' state.\n\nUseful in case of error. Any currently waiting threads and threads\nattempting to 'wait()' will have BrokenBarrierError raised.", + "builtins.Barrier.broken" => "Return True if the barrier is in a broken state.", + "builtins.Barrier.n_waiting" => "Return the number of threads currently waiting at the barrier.", + "builtins.Barrier.parties" => "Return the number of threads required to trip the barrier.", + "builtins.Barrier.reset" => "Reset the barrier to the initial state.\n\nAny threads currently waiting will get the BrokenBarrier exception\nraised.", + "builtins.Barrier.wait" => "Wait for the barrier.\n\nWhen the specified number of threads have started waiting, they are all\nsimultaneously awoken. If an 'action' was provided for the barrier, one\nof the threads will have executed that callback prior to returning.\nReturns an individual index number from 0 to 'parties-1'.", + "builtins.BaseBrowser" => "Parent class for all browsers. Do not use directly.", + "builtins.BaseBrowser.__delattr__" => "Implement delattr(self, name).", + "builtins.BaseBrowser.__eq__" => "Return self==value.", + "builtins.BaseBrowser.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.BaseBrowser.__ge__" => "Return self>=value.", + "builtins.BaseBrowser.__getattribute__" => "Return getattr(self, name).", + "builtins.BaseBrowser.__getstate__" => "Helper for pickle.", + "builtins.BaseBrowser.__gt__" => "Return self>value.", + "builtins.BaseBrowser.__hash__" => "Return hash(self).", + "builtins.BaseBrowser.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.BaseBrowser.__le__" => "Return self<=value.", + "builtins.BaseBrowser.__lt__" => "Return self<value.", + "builtins.BaseBrowser.__ne__" => "Return self!=value.", + "builtins.BaseBrowser.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.BaseBrowser.__reduce__" => "Helper for pickle.", + "builtins.BaseBrowser.__reduce_ex__" => "Helper for pickle.", + "builtins.BaseBrowser.__repr__" => "Return repr(self).", + "builtins.BaseBrowser.__setattr__" => "Implement setattr(self, name, value).", + "builtins.BaseBrowser.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.BaseBrowser.__str__" => "Return str(self).", + "builtins.BaseBrowser.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.BaseBrowser.__weakref__" => "list of weak references to the object", + "builtins.BaseBrowser._check_url" => "Ensures that the URL is safe to pass to subprocesses as a parameter", + "builtins.BaseContext.Array" => "Returns a synchronized shared array", + "builtins.BaseContext.AuthenticationError.__delattr__" => "Implement delattr(self, name).", + "builtins.BaseContext.AuthenticationError.__eq__" => "Return self==value.", + "builtins.BaseContext.AuthenticationError.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.BaseContext.AuthenticationError.__ge__" => "Return self>=value.", + "builtins.BaseContext.AuthenticationError.__getattribute__" => "Return getattr(self, name).", + "builtins.BaseContext.AuthenticationError.__getstate__" => "Helper for pickle.", + "builtins.BaseContext.AuthenticationError.__gt__" => "Return self>value.", + "builtins.BaseContext.AuthenticationError.__hash__" => "Return hash(self).", + "builtins.BaseContext.AuthenticationError.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.BaseContext.AuthenticationError.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.BaseContext.AuthenticationError.__le__" => "Return self<=value.", + "builtins.BaseContext.AuthenticationError.__lt__" => "Return self<value.", + "builtins.BaseContext.AuthenticationError.__ne__" => "Return self!=value.", + "builtins.BaseContext.AuthenticationError.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.BaseContext.AuthenticationError.__reduce_ex__" => "Helper for pickle.", + "builtins.BaseContext.AuthenticationError.__repr__" => "Return repr(self).", + "builtins.BaseContext.AuthenticationError.__setattr__" => "Implement setattr(self, name, value).", + "builtins.BaseContext.AuthenticationError.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.BaseContext.AuthenticationError.__str__" => "Return str(self).", + "builtins.BaseContext.AuthenticationError.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.BaseContext.AuthenticationError.__weakref__" => "list of weak references to the object", + "builtins.BaseContext.AuthenticationError.add_note" => "Add a note to the exception", + "builtins.BaseContext.AuthenticationError.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.BaseContext.Barrier" => "Returns a barrier object", + "builtins.BaseContext.BoundedSemaphore" => "Returns a bounded semaphore object", + "builtins.BaseContext.BufferTooShort.__delattr__" => "Implement delattr(self, name).", + "builtins.BaseContext.BufferTooShort.__eq__" => "Return self==value.", + "builtins.BaseContext.BufferTooShort.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.BaseContext.BufferTooShort.__ge__" => "Return self>=value.", + "builtins.BaseContext.BufferTooShort.__getattribute__" => "Return getattr(self, name).", + "builtins.BaseContext.BufferTooShort.__getstate__" => "Helper for pickle.", + "builtins.BaseContext.BufferTooShort.__gt__" => "Return self>value.", + "builtins.BaseContext.BufferTooShort.__hash__" => "Return hash(self).", + "builtins.BaseContext.BufferTooShort.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.BaseContext.BufferTooShort.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.BaseContext.BufferTooShort.__le__" => "Return self<=value.", + "builtins.BaseContext.BufferTooShort.__lt__" => "Return self<value.", + "builtins.BaseContext.BufferTooShort.__ne__" => "Return self!=value.", + "builtins.BaseContext.BufferTooShort.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.BaseContext.BufferTooShort.__reduce_ex__" => "Helper for pickle.", + "builtins.BaseContext.BufferTooShort.__repr__" => "Return repr(self).", + "builtins.BaseContext.BufferTooShort.__setattr__" => "Implement setattr(self, name, value).", + "builtins.BaseContext.BufferTooShort.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.BaseContext.BufferTooShort.__str__" => "Return str(self).", + "builtins.BaseContext.BufferTooShort.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.BaseContext.BufferTooShort.__weakref__" => "list of weak references to the object", + "builtins.BaseContext.BufferTooShort.add_note" => "Add a note to the exception", + "builtins.BaseContext.BufferTooShort.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.BaseContext.Condition" => "Returns a condition object", + "builtins.BaseContext.Event" => "Returns an event object", + "builtins.BaseContext.JoinableQueue" => "Returns a queue object", + "builtins.BaseContext.Lock" => "Returns a non-recursive lock object", + "builtins.BaseContext.Manager" => "Returns a manager associated with a running server process\n\nThe managers methods such as `Lock()`, `Condition()` and `Queue()`\ncan be used to create shared objects.", + "builtins.BaseContext.Pipe" => "Returns two connection object connected by a pipe", + "builtins.BaseContext.Pool" => "Returns a process pool object", + "builtins.BaseContext.ProcessError.__delattr__" => "Implement delattr(self, name).", + "builtins.BaseContext.ProcessError.__eq__" => "Return self==value.", + "builtins.BaseContext.ProcessError.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.BaseContext.ProcessError.__ge__" => "Return self>=value.", + "builtins.BaseContext.ProcessError.__getattribute__" => "Return getattr(self, name).", + "builtins.BaseContext.ProcessError.__getstate__" => "Helper for pickle.", + "builtins.BaseContext.ProcessError.__gt__" => "Return self>value.", + "builtins.BaseContext.ProcessError.__hash__" => "Return hash(self).", + "builtins.BaseContext.ProcessError.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.BaseContext.ProcessError.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.BaseContext.ProcessError.__le__" => "Return self<=value.", + "builtins.BaseContext.ProcessError.__lt__" => "Return self<value.", + "builtins.BaseContext.ProcessError.__ne__" => "Return self!=value.", + "builtins.BaseContext.ProcessError.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.BaseContext.ProcessError.__reduce_ex__" => "Helper for pickle.", + "builtins.BaseContext.ProcessError.__repr__" => "Return repr(self).", + "builtins.BaseContext.ProcessError.__setattr__" => "Implement setattr(self, name, value).", + "builtins.BaseContext.ProcessError.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.BaseContext.ProcessError.__str__" => "Return str(self).", + "builtins.BaseContext.ProcessError.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.BaseContext.ProcessError.__weakref__" => "list of weak references to the object", + "builtins.BaseContext.ProcessError.add_note" => "Add a note to the exception", + "builtins.BaseContext.ProcessError.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.BaseContext.Queue" => "Returns a queue object", + "builtins.BaseContext.RLock" => "Returns a recursive lock object", + "builtins.BaseContext.RawArray" => "Returns a shared array", + "builtins.BaseContext.RawValue" => "Returns a shared object", + "builtins.BaseContext.Semaphore" => "Returns a semaphore object", + "builtins.BaseContext.SimpleQueue" => "Returns a queue object", + "builtins.BaseContext.TimeoutError.__delattr__" => "Implement delattr(self, name).", + "builtins.BaseContext.TimeoutError.__eq__" => "Return self==value.", + "builtins.BaseContext.TimeoutError.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.BaseContext.TimeoutError.__ge__" => "Return self>=value.", + "builtins.BaseContext.TimeoutError.__getattribute__" => "Return getattr(self, name).", + "builtins.BaseContext.TimeoutError.__getstate__" => "Helper for pickle.", + "builtins.BaseContext.TimeoutError.__gt__" => "Return self>value.", + "builtins.BaseContext.TimeoutError.__hash__" => "Return hash(self).", + "builtins.BaseContext.TimeoutError.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.BaseContext.TimeoutError.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.BaseContext.TimeoutError.__le__" => "Return self<=value.", + "builtins.BaseContext.TimeoutError.__lt__" => "Return self<value.", + "builtins.BaseContext.TimeoutError.__ne__" => "Return self!=value.", + "builtins.BaseContext.TimeoutError.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.BaseContext.TimeoutError.__reduce_ex__" => "Helper for pickle.", + "builtins.BaseContext.TimeoutError.__repr__" => "Return repr(self).", + "builtins.BaseContext.TimeoutError.__setattr__" => "Implement setattr(self, name, value).", + "builtins.BaseContext.TimeoutError.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.BaseContext.TimeoutError.__str__" => "Return str(self).", + "builtins.BaseContext.TimeoutError.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.BaseContext.TimeoutError.__weakref__" => "list of weak references to the object", + "builtins.BaseContext.TimeoutError.add_note" => "Add a note to the exception", + "builtins.BaseContext.TimeoutError.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.BaseContext.Value" => "Returns a synchronized shared object", + "builtins.BaseContext.__delattr__" => "Implement delattr(self, name).", + "builtins.BaseContext.__eq__" => "Return self==value.", + "builtins.BaseContext.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.BaseContext.__ge__" => "Return self>=value.", + "builtins.BaseContext.__getattribute__" => "Return getattr(self, name).", + "builtins.BaseContext.__getstate__" => "Helper for pickle.", + "builtins.BaseContext.__gt__" => "Return self>value.", + "builtins.BaseContext.__hash__" => "Return hash(self).", + "builtins.BaseContext.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.BaseContext.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.BaseContext.__le__" => "Return self<=value.", + "builtins.BaseContext.__lt__" => "Return self<value.", + "builtins.BaseContext.__ne__" => "Return self!=value.", + "builtins.BaseContext.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.BaseContext.__reduce__" => "Helper for pickle.", + "builtins.BaseContext.__reduce_ex__" => "Helper for pickle.", + "builtins.BaseContext.__repr__" => "Return repr(self).", + "builtins.BaseContext.__setattr__" => "Implement setattr(self, name, value).", + "builtins.BaseContext.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.BaseContext.__str__" => "Return str(self).", + "builtins.BaseContext.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.BaseContext.__weakref__" => "list of weak references to the object", + "builtins.BaseContext.active_children" => "Return list of process objects corresponding to live child processes", + "builtins.BaseContext.allow_connection_pickling" => "Install support for sending connections and sockets\nbetween processes", + "builtins.BaseContext.cpu_count" => "Returns the number of CPUs in the system", + "builtins.BaseContext.current_process" => "Return process object representing the current process", + "builtins.BaseContext.freeze_support" => "Check whether this is a fake forked process in a frozen executable.\nIf so then run code specified by commandline and exit.", + "builtins.BaseContext.get_logger" => "Return package logger -- if it does not already exist then\nit is created.", + "builtins.BaseContext.log_to_stderr" => "Turn on logging and add a handler which prints to stderr", + "builtins.BaseContext.parent_process" => "Return process object representing the parent process", + "builtins.BaseContext.reducer" => "Controls how objects will be reduced to a form that can be\nshared with other processes.", + "builtins.BaseContext.set_executable" => "Sets the path to a python.exe or pythonw.exe binary used to run\nchild processes instead of sys.executable when using the 'spawn'\nstart method. Useful for people embedding Python.", + "builtins.BaseContext.set_forkserver_preload" => "Set list of module names to try to load in forkserver process.\nThis is really just a hint.", "builtins.BaseException" => "Common base class for all exceptions", "builtins.BaseException.__delattr__" => "Implement delattr(self, name).", "builtins.BaseException.__eq__" => "Return self==value.", @@ -9736,6 +10380,348 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.BaseExceptionGroup.exceptions" => "nested exceptions", "builtins.BaseExceptionGroup.message" => "exception message", "builtins.BaseExceptionGroup.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.BaseFilter.__delattr__" => "Implement delattr(self, name).", + "builtins.BaseFilter.__eq__" => "Return self==value.", + "builtins.BaseFilter.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.BaseFilter.__ge__" => "Return self>=value.", + "builtins.BaseFilter.__getattribute__" => "Return getattr(self, name).", + "builtins.BaseFilter.__getstate__" => "Helper for pickle.", + "builtins.BaseFilter.__gt__" => "Return self>value.", + "builtins.BaseFilter.__hash__" => "Return hash(self).", + "builtins.BaseFilter.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.BaseFilter.__le__" => "Return self<=value.", + "builtins.BaseFilter.__lt__" => "Return self<value.", + "builtins.BaseFilter.__ne__" => "Return self!=value.", + "builtins.BaseFilter.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.BaseFilter.__reduce__" => "Helper for pickle.", + "builtins.BaseFilter.__reduce_ex__" => "Helper for pickle.", + "builtins.BaseFilter.__repr__" => "Return repr(self).", + "builtins.BaseFilter.__setattr__" => "Implement setattr(self, name, value).", + "builtins.BaseFilter.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.BaseFilter.__str__" => "Return str(self).", + "builtins.BaseFilter.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.BaseFilter.__weakref__" => "list of weak references to the object", + "builtins.BaseProcess" => "Process objects represent activity that is run in a separate process\n\nThe class is analogous to `threading.Thread`", + "builtins.BaseProcess.__delattr__" => "Implement delattr(self, name).", + "builtins.BaseProcess.__eq__" => "Return self==value.", + "builtins.BaseProcess.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.BaseProcess.__ge__" => "Return self>=value.", + "builtins.BaseProcess.__getattribute__" => "Return getattr(self, name).", + "builtins.BaseProcess.__getstate__" => "Helper for pickle.", + "builtins.BaseProcess.__gt__" => "Return self>value.", + "builtins.BaseProcess.__hash__" => "Return hash(self).", + "builtins.BaseProcess.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.BaseProcess.__le__" => "Return self<=value.", + "builtins.BaseProcess.__lt__" => "Return self<value.", + "builtins.BaseProcess.__ne__" => "Return self!=value.", + "builtins.BaseProcess.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.BaseProcess.__reduce__" => "Helper for pickle.", + "builtins.BaseProcess.__reduce_ex__" => "Helper for pickle.", + "builtins.BaseProcess.__setattr__" => "Implement setattr(self, name, value).", + "builtins.BaseProcess.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.BaseProcess.__str__" => "Return str(self).", + "builtins.BaseProcess.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.BaseProcess.__weakref__" => "list of weak references to the object", + "builtins.BaseProcess.close" => "Close the Process object.\n\nThis method releases resources held by the Process object. It is\nan error to call this method if the child process is still running.", + "builtins.BaseProcess.daemon" => "Return whether process is a daemon", + "builtins.BaseProcess.exitcode" => "Return exit code of process or `None` if it has yet to stop", + "builtins.BaseProcess.ident" => "Return identifier (PID) of process or `None` if it has yet to start", + "builtins.BaseProcess.interrupt" => "Terminate process; sends SIGINT signal", + "builtins.BaseProcess.is_alive" => "Return whether process is alive", + "builtins.BaseProcess.join" => "Wait until child process terminates", + "builtins.BaseProcess.kill" => "Terminate process; sends SIGKILL signal or uses TerminateProcess()", + "builtins.BaseProcess.pid" => "Return identifier (PID) of process or `None` if it has yet to start", + "builtins.BaseProcess.run" => "Method to be run in sub-process; can be overridden in sub-class", + "builtins.BaseProcess.sentinel" => "Return a file descriptor (Unix) or handle (Windows) suitable for\nwaiting for process termination.", + "builtins.BaseProcess.start" => "Start child process", + "builtins.BaseProcess.terminate" => "Terminate process; sends SIGTERM signal or uses TerminateProcess()", + "builtins.BaseProtocol" => "Common base class for protocol interfaces.\n\nUsually user implements protocols that derived from BaseProtocol\nlike Protocol or ProcessProtocol.\n\nThe only case when BaseProtocol should be implemented directly is\nwrite-only transport like write pipe", + "builtins.BaseProtocol.__delattr__" => "Implement delattr(self, name).", + "builtins.BaseProtocol.__eq__" => "Return self==value.", + "builtins.BaseProtocol.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.BaseProtocol.__ge__" => "Return self>=value.", + "builtins.BaseProtocol.__getattribute__" => "Return getattr(self, name).", + "builtins.BaseProtocol.__getstate__" => "Helper for pickle.", + "builtins.BaseProtocol.__gt__" => "Return self>value.", + "builtins.BaseProtocol.__hash__" => "Return hash(self).", + "builtins.BaseProtocol.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.BaseProtocol.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.BaseProtocol.__le__" => "Return self<=value.", + "builtins.BaseProtocol.__lt__" => "Return self<value.", + "builtins.BaseProtocol.__ne__" => "Return self!=value.", + "builtins.BaseProtocol.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.BaseProtocol.__reduce__" => "Helper for pickle.", + "builtins.BaseProtocol.__reduce_ex__" => "Helper for pickle.", + "builtins.BaseProtocol.__repr__" => "Return repr(self).", + "builtins.BaseProtocol.__setattr__" => "Implement setattr(self, name, value).", + "builtins.BaseProtocol.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.BaseProtocol.__str__" => "Return str(self).", + "builtins.BaseProtocol.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.BaseProtocol.connection_lost" => "Called when the connection is lost or closed.\n\nThe argument is an exception object or None (the latter\nmeaning a regular EOF is received or the connection was\naborted or closed).", + "builtins.BaseProtocol.connection_made" => "Called when a connection is made.\n\nThe argument is the transport representing the pipe connection.\nTo receive data, wait for data_received() calls.\nWhen the connection is closed, connection_lost() is called.", + "builtins.BaseProtocol.pause_writing" => "Called when the transport's buffer goes over the high-water mark.\n\nPause and resume calls are paired -- pause_writing() is called\nonce when the buffer goes strictly over the high-water mark\n(even if subsequent writes increases the buffer size even\nmore), and eventually resume_writing() is called once when the\nbuffer size reaches the low-water mark.\n\nNote that if the buffer size equals the high-water mark,\npause_writing() is not called -- it must go strictly over.\nConversely, resume_writing() is called when the buffer size is\nequal or lower than the low-water mark. These end conditions\nare important to ensure that things go as expected when either\nmark is zero.\n\nNOTE: This is the only Protocol callback that is not called\nthrough EventLoop.call_soon() -- if it were, it would have no\neffect when it's most needed (when the app keeps writing\nwithout yielding until pause_writing() is called).", + "builtins.BaseProtocol.resume_writing" => "Called when the transport's buffer drains below the low-water mark.\n\nSee pause_writing() for details.", + "builtins.BaseRequestHandler" => "Base class for request handler classes.\n\nThis class is instantiated for each request to be handled. The\nconstructor sets the instance variables request, client_address\nand server, and then calls the handle() method. To implement a\nspecific service, all you need to do is to derive a class which\ndefines a handle() method.\n\nThe handle() method can find the request as self.request, the\nclient address as self.client_address, and the server (in case it\nneeds access to per-server information) as self.server. Since a\nseparate instance is created for each request, the handle() method\ncan define other arbitrary instance variables.", + "builtins.BaseRequestHandler.__delattr__" => "Implement delattr(self, name).", + "builtins.BaseRequestHandler.__eq__" => "Return self==value.", + "builtins.BaseRequestHandler.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.BaseRequestHandler.__ge__" => "Return self>=value.", + "builtins.BaseRequestHandler.__getattribute__" => "Return getattr(self, name).", + "builtins.BaseRequestHandler.__getstate__" => "Helper for pickle.", + "builtins.BaseRequestHandler.__gt__" => "Return self>value.", + "builtins.BaseRequestHandler.__hash__" => "Return hash(self).", + "builtins.BaseRequestHandler.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.BaseRequestHandler.__le__" => "Return self<=value.", + "builtins.BaseRequestHandler.__lt__" => "Return self<value.", + "builtins.BaseRequestHandler.__ne__" => "Return self!=value.", + "builtins.BaseRequestHandler.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.BaseRequestHandler.__reduce__" => "Helper for pickle.", + "builtins.BaseRequestHandler.__reduce_ex__" => "Helper for pickle.", + "builtins.BaseRequestHandler.__repr__" => "Return repr(self).", + "builtins.BaseRequestHandler.__setattr__" => "Implement setattr(self, name, value).", + "builtins.BaseRequestHandler.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.BaseRequestHandler.__str__" => "Return str(self).", + "builtins.BaseRequestHandler.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.BaseRequestHandler.__weakref__" => "list of weak references to the object", + "builtins.BaseSelector" => "Selector abstract base class.\n\nA selector supports registering file objects to be monitored for specific\nI/O events.\n\nA file object is a file descriptor or any object with a `fileno()` method.\nAn arbitrary object can be attached to the file object, which can be used\nfor example to store context information, a callback, etc.\n\nA selector can use various implementations (select(), poll(), epoll()...)\ndepending on the platform. The default `Selector` class uses the most\nefficient implementation on the current platform.", + "builtins.BaseSelector.__delattr__" => "Implement delattr(self, name).", + "builtins.BaseSelector.__eq__" => "Return self==value.", + "builtins.BaseSelector.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.BaseSelector.__ge__" => "Return self>=value.", + "builtins.BaseSelector.__getattribute__" => "Return getattr(self, name).", + "builtins.BaseSelector.__getstate__" => "Helper for pickle.", + "builtins.BaseSelector.__gt__" => "Return self>value.", + "builtins.BaseSelector.__hash__" => "Return hash(self).", + "builtins.BaseSelector.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.BaseSelector.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.BaseSelector.__le__" => "Return self<=value.", + "builtins.BaseSelector.__lt__" => "Return self<value.", + "builtins.BaseSelector.__ne__" => "Return self!=value.", + "builtins.BaseSelector.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.BaseSelector.__reduce__" => "Helper for pickle.", + "builtins.BaseSelector.__reduce_ex__" => "Helper for pickle.", + "builtins.BaseSelector.__repr__" => "Return repr(self).", + "builtins.BaseSelector.__setattr__" => "Implement setattr(self, name, value).", + "builtins.BaseSelector.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.BaseSelector.__str__" => "Return str(self).", + "builtins.BaseSelector.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.BaseSelector.__weakref__" => "list of weak references to the object", + "builtins.BaseSelector.close" => "Close the selector.\n\nThis must be called to make sure that any underlying resource is freed.", + "builtins.BaseSelector.get_key" => "Return the key associated to a registered file object.\n\nReturns:\nSelectorKey for this file object", + "builtins.BaseSelector.get_map" => "Return a mapping of file objects to selector keys.", + "builtins.BaseSelector.modify" => "Change a registered file object monitored events or attached data.\n\nParameters:\nfileobj -- file object or file descriptor\nevents -- events to monitor (bitwise mask of EVENT_READ|EVENT_WRITE)\ndata -- attached data\n\nReturns:\nSelectorKey instance\n\nRaises:\nAnything that unregister() or register() raises", + "builtins.BaseSelector.register" => "Register a file object.\n\nParameters:\nfileobj -- file object or file descriptor\nevents -- events to monitor (bitwise mask of EVENT_READ|EVENT_WRITE)\ndata -- attached data\n\nReturns:\nSelectorKey instance\n\nRaises:\nValueError if events is invalid\nKeyError if fileobj is already registered\nOSError if fileobj is closed or otherwise is unacceptable to\n the underlying system call (if a system call is made)\n\nNote:\nOSError may or may not be raised", + "builtins.BaseSelector.select" => "Perform the actual selection, until some monitored file objects are\nready or a timeout expires.\n\nParameters:\ntimeout -- if timeout > 0, this specifies the maximum wait time, in\n seconds\n if timeout <= 0, the select() call won't block, and will\n report the currently ready file objects\n if timeout is None, select() will block until a monitored\n file object becomes ready\n\nReturns:\nlist of (key, events) for ready file objects\n`events` is a bitwise mask of EVENT_READ|EVENT_WRITE", + "builtins.BaseSelector.unregister" => "Unregister a file object.\n\nParameters:\nfileobj -- file object or file descriptor\n\nReturns:\nSelectorKey instance\n\nRaises:\nKeyError if fileobj is not registered\n\nNote:\nIf fileobj is registered but has since been closed this does\n*not* raise OSError (even if the wrapped syscall does)", + "builtins.BaseServer" => "Base class for server classes.\n\nMethods for the caller:\n\n- __init__(server_address, RequestHandlerClass)\n- serve_forever(poll_interval=0.5)\n- shutdown()\n- handle_request() # if you do not use serve_forever()\n- fileno() -> int # for selector\n\nMethods that may be overridden:\n\n- server_bind()\n- server_activate()\n- get_request() -> request, client_address\n- handle_timeout()\n- verify_request(request, client_address)\n- server_close()\n- process_request(request, client_address)\n- shutdown_request(request)\n- close_request(request)\n- service_actions()\n- handle_error()\n\nMethods for derived classes:\n\n- finish_request(request, client_address)\n\nClass variables that may be overridden by derived classes or\ninstances:\n\n- timeout\n- address_family\n- socket_type\n- allow_reuse_address\n- allow_reuse_port\n\nInstance variables:\n\n- RequestHandlerClass\n- socket", + "builtins.BaseServer.__delattr__" => "Implement delattr(self, name).", + "builtins.BaseServer.__eq__" => "Return self==value.", + "builtins.BaseServer.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.BaseServer.__ge__" => "Return self>=value.", + "builtins.BaseServer.__getattribute__" => "Return getattr(self, name).", + "builtins.BaseServer.__getstate__" => "Helper for pickle.", + "builtins.BaseServer.__gt__" => "Return self>value.", + "builtins.BaseServer.__hash__" => "Return hash(self).", + "builtins.BaseServer.__init__" => "Constructor. May be extended, do not override.", + "builtins.BaseServer.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.BaseServer.__le__" => "Return self<=value.", + "builtins.BaseServer.__lt__" => "Return self<value.", + "builtins.BaseServer.__ne__" => "Return self!=value.", + "builtins.BaseServer.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.BaseServer.__reduce__" => "Helper for pickle.", + "builtins.BaseServer.__reduce_ex__" => "Helper for pickle.", + "builtins.BaseServer.__repr__" => "Return repr(self).", + "builtins.BaseServer.__setattr__" => "Implement setattr(self, name, value).", + "builtins.BaseServer.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.BaseServer.__str__" => "Return str(self).", + "builtins.BaseServer.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.BaseServer.__weakref__" => "list of weak references to the object", + "builtins.BaseServer._handle_request_noblock" => "Handle one request, without blocking.\n\nI assume that selector.select() has returned that the socket is\nreadable before this function was called, so there should be no risk of\nblocking in get_request().", + "builtins.BaseServer.close_request" => "Called to clean up an individual request.", + "builtins.BaseServer.finish_request" => "Finish one request by instantiating RequestHandlerClass.", + "builtins.BaseServer.handle_error" => "Handle an error gracefully. May be overridden.\n\nThe default is to print a traceback and continue.", + "builtins.BaseServer.handle_request" => "Handle one request, possibly blocking.\n\nRespects self.timeout.", + "builtins.BaseServer.handle_timeout" => "Called if no new request arrives within self.timeout.\n\nOverridden by ForkingMixIn.", + "builtins.BaseServer.process_request" => "Call finish_request.\n\nOverridden by ForkingMixIn and ThreadingMixIn.", + "builtins.BaseServer.serve_forever" => "Handle one request at a time until shutdown.\n\nPolls for shutdown every poll_interval seconds. Ignores\nself.timeout. If you need to do periodic tasks, do them in\nanother thread.", + "builtins.BaseServer.server_activate" => "Called by constructor to activate the server.\n\nMay be overridden.", + "builtins.BaseServer.server_close" => "Called to clean-up the server.\n\nMay be overridden.", + "builtins.BaseServer.service_actions" => "Called by the serve_forever() loop.\n\nMay be overridden by a subclass / Mixin to implement any code that\nneeds to be run during the loop.", + "builtins.BaseServer.shutdown" => "Stops the serve_forever loop.\n\nBlocks until the loop has finished. This must be called while\nserve_forever() is running in another thread, or it will\ndeadlock.", + "builtins.BaseServer.shutdown_request" => "Called to shutdown and close an individual request.", + "builtins.BaseServer.verify_request" => "Verify the request. May be overridden.\n\nReturn True if we should proceed with this request.", + "builtins.BaseTestSuite" => "A simple test suite that doesn't provide class or module shared fixtures.", + "builtins.BaseTestSuite.__delattr__" => "Implement delattr(self, name).", + "builtins.BaseTestSuite.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.BaseTestSuite.__ge__" => "Return self>=value.", + "builtins.BaseTestSuite.__getattribute__" => "Return getattr(self, name).", + "builtins.BaseTestSuite.__getstate__" => "Helper for pickle.", + "builtins.BaseTestSuite.__gt__" => "Return self>value.", + "builtins.BaseTestSuite.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.BaseTestSuite.__le__" => "Return self<=value.", + "builtins.BaseTestSuite.__lt__" => "Return self<value.", + "builtins.BaseTestSuite.__ne__" => "Return self!=value.", + "builtins.BaseTestSuite.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.BaseTestSuite.__reduce__" => "Helper for pickle.", + "builtins.BaseTestSuite.__reduce_ex__" => "Helper for pickle.", + "builtins.BaseTestSuite.__setattr__" => "Implement setattr(self, name, value).", + "builtins.BaseTestSuite.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.BaseTestSuite.__str__" => "Return str(self).", + "builtins.BaseTestSuite.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.BaseTestSuite.__weakref__" => "list of weak references to the object", + "builtins.BaseTestSuite._removeTestAtIndex" => "Stop holding a reference to the TestCase at index.", + "builtins.BaseTestSuite.debug" => "Run the tests without collecting errors in a TestResult", + "builtins.BaseTransport" => "Base class for transports.", + "builtins.BaseTransport.__delattr__" => "Implement delattr(self, name).", + "builtins.BaseTransport.__eq__" => "Return self==value.", + "builtins.BaseTransport.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.BaseTransport.__ge__" => "Return self>=value.", + "builtins.BaseTransport.__getattribute__" => "Return getattr(self, name).", + "builtins.BaseTransport.__getstate__" => "Helper for pickle.", + "builtins.BaseTransport.__gt__" => "Return self>value.", + "builtins.BaseTransport.__hash__" => "Return hash(self).", + "builtins.BaseTransport.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.BaseTransport.__le__" => "Return self<=value.", + "builtins.BaseTransport.__lt__" => "Return self<value.", + "builtins.BaseTransport.__ne__" => "Return self!=value.", + "builtins.BaseTransport.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.BaseTransport.__reduce__" => "Helper for pickle.", + "builtins.BaseTransport.__reduce_ex__" => "Helper for pickle.", + "builtins.BaseTransport.__repr__" => "Return repr(self).", + "builtins.BaseTransport.__setattr__" => "Implement setattr(self, name, value).", + "builtins.BaseTransport.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.BaseTransport.__str__" => "Return str(self).", + "builtins.BaseTransport.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.BaseTransport.close" => "Close the transport.\n\nBuffered data will be flushed asynchronously. No more data\nwill be received. After all buffered data is flushed, the\nprotocol's connection_lost() method will (eventually) be\ncalled with None as its argument.", + "builtins.BaseTransport.get_extra_info" => "Get optional transport information.", + "builtins.BaseTransport.get_protocol" => "Return the current protocol.", + "builtins.BaseTransport.is_closing" => "Return True if the transport is closing or closed.", + "builtins.BaseTransport.set_protocol" => "Set a new protocol.", + "builtins.Bdb" => "Generic Python debugger base class.\n\nThis class takes care of details of the trace facility;\na derived class should implement user interaction.\nThe standard debugger class (pdb.Pdb) is an example.\n\nThe optional skip argument must be an iterable of glob-style\nmodule name patterns. The debugger will not step into frames\nthat originate in a module that matches one of these patterns.\nWhether a frame is considered to originate in a certain module\nis determined by the __name__ in the frame globals.", + "builtins.Bdb.__delattr__" => "Implement delattr(self, name).", + "builtins.Bdb.__eq__" => "Return self==value.", + "builtins.Bdb.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Bdb.__ge__" => "Return self>=value.", + "builtins.Bdb.__getattribute__" => "Return getattr(self, name).", + "builtins.Bdb.__getstate__" => "Helper for pickle.", + "builtins.Bdb.__gt__" => "Return self>value.", + "builtins.Bdb.__hash__" => "Return hash(self).", + "builtins.Bdb.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Bdb.__le__" => "Return self<=value.", + "builtins.Bdb.__lt__" => "Return self<value.", + "builtins.Bdb.__ne__" => "Return self!=value.", + "builtins.Bdb.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Bdb.__reduce__" => "Helper for pickle.", + "builtins.Bdb.__reduce_ex__" => "Helper for pickle.", + "builtins.Bdb.__repr__" => "Return repr(self).", + "builtins.Bdb.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Bdb.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Bdb.__str__" => "Return str(self).", + "builtins.Bdb.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Bdb.__weakref__" => "list of weak references to the object", + "builtins.Bdb._add_to_breaks" => "Add breakpoint to breaks, if not already there.", + "builtins.Bdb._lineno_in_frame" => "Return True if the line number is in the frame's code object.", + "builtins.Bdb._load_breaks" => "Apply all breakpoints (set in other instances) to this one.\n\nPopulates this instance's breaks list from the Breakpoint class's\nlist, which can have breakpoints set by another Bdb instance. This\nis necessary for interactive sessions to keep the breakpoints\nactive across multiple calls to run().", + "builtins.Bdb._prune_breaks" => "Prune breakpoints for filename:lineno.\n\nA list of breakpoints is maintained in the Bdb instance and in\nthe Breakpoint class. If a breakpoint in the Bdb instance no\nlonger exists in the Breakpoint class, then it's removed from the\nBdb instance.", + "builtins.Bdb._set_stopinfo" => "Set the attributes for stopping.\n\nIf stoplineno is greater than or equal to 0, then stop at line\ngreater than or equal to the stopline. If stoplineno is -1, then\ndon't stop at all.", + "builtins.Bdb.break_anywhere" => "Return True if there is any breakpoint in that frame", + "builtins.Bdb.break_here" => "Return True if there is an effective breakpoint for this line.\n\nCheck for line or function breakpoint and if in effect.\nDelete temporary breakpoints if effective() says to.", + "builtins.Bdb.canonic" => "Return canonical form of filename.\n\nFor real filenames, the canonical form is a case-normalized (on\ncase insensitive filesystems) absolute path. 'Filenames' with\nangle brackets, such as \"<stdin>\", generated in interactive\nmode, are returned unchanged.", + "builtins.Bdb.clear_all_breaks" => "Delete all existing breakpoints.\n\nIf none were set, return an error message.", + "builtins.Bdb.clear_all_file_breaks" => "Delete all breakpoints in filename.\n\nIf none were set, return an error message.", + "builtins.Bdb.clear_bpbynumber" => "Delete a breakpoint by its index in Breakpoint.bpbynumber.\n\nIf arg is invalid, return an error message.", + "builtins.Bdb.clear_break" => "Delete breakpoints for filename:lineno.\n\nIf no breakpoints were set, return an error message.", + "builtins.Bdb.disable_current_event" => "Disable the current event.", + "builtins.Bdb.dispatch_call" => "Invoke user function and return trace function for call event.\n\nIf the debugger stops on this function call, invoke\nself.user_call(). Raise BdbQuit if self.quitting is set.\nReturn self.trace_dispatch to continue tracing in this scope.", + "builtins.Bdb.dispatch_exception" => "Invoke user function and return trace function for exception event.\n\nIf the debugger stops on this exception, invoke\nself.user_exception(). Raise BdbQuit if self.quitting is set.\nReturn self.trace_dispatch to continue tracing in this scope.", + "builtins.Bdb.dispatch_line" => "Invoke user function and return trace function for line event.\n\nIf the debugger stops on the current line, invoke\nself.user_line(). Raise BdbQuit if self.quitting is set.\nReturn self.trace_dispatch to continue tracing in this scope.", + "builtins.Bdb.dispatch_opcode" => "Invoke user function and return trace function for opcode event.\nIf the debugger stops on the current opcode, invoke\nself.user_opcode(). Raise BdbQuit if self.quitting is set.\nReturn self.trace_dispatch to continue tracing in this scope.\n\nOpcode event will always trigger the user callback. For now the only\nopcode event is from an inline set_trace() and we want to stop there\nunconditionally.", + "builtins.Bdb.dispatch_return" => "Invoke user function and return trace function for return event.\n\nIf the debugger stops on this function return, invoke\nself.user_return(). Raise BdbQuit if self.quitting is set.\nReturn self.trace_dispatch to continue tracing in this scope.", + "builtins.Bdb.do_clear" => "Remove temporary breakpoint.\n\nMust implement in derived classes or get NotImplementedError.", + "builtins.Bdb.format_stack_entry" => "Return a string with information about a stack entry.\n\nThe stack entry frame_lineno is a (frame, lineno) tuple. The\nreturn string contains the canonical filename, the function name\nor '<lambda>', the input arguments, the return value, and the\nline of code (if it exists).", + "builtins.Bdb.get_all_breaks" => "Return all breakpoints that are set.", + "builtins.Bdb.get_bpbynumber" => "Return a breakpoint by its index in Breakpoint.bybpnumber.\n\nFor invalid arg values or if the breakpoint doesn't exist,\nraise a ValueError.", + "builtins.Bdb.get_break" => "Return True if there is a breakpoint for filename:lineno.", + "builtins.Bdb.get_breaks" => "Return all breakpoints for filename:lineno.\n\nIf no breakpoints are set, return an empty list.", + "builtins.Bdb.get_file_breaks" => "Return all lines with breakpoints for filename.\n\nIf no breakpoints are set, return an empty list.", + "builtins.Bdb.get_stack" => "Return a list of (frame, lineno) in a stack trace and a size.\n\nList starts with original calling frame, if there is one.\nSize may be number of frames above or below f.", + "builtins.Bdb.is_skipped_module" => "Return True if module_name matches any skip pattern.", + "builtins.Bdb.reset" => "Set values of attributes as ready to start debugging.", + "builtins.Bdb.restart_events" => "Restart all events.", + "builtins.Bdb.run" => "Debug a statement executed via the exec() function.\n\nglobals defaults to __main__.dict; locals defaults to globals.", + "builtins.Bdb.runcall" => "Debug a single function call.\n\nReturn the result of the function call.", + "builtins.Bdb.runctx" => "For backwards-compatibility. Defers to run().", + "builtins.Bdb.runeval" => "Debug an expression executed via the eval() function.\n\nglobals defaults to __main__.dict; locals defaults to globals.", + "builtins.Bdb.set_break" => "Set a new breakpoint for filename:lineno.\n\nIf lineno doesn't exist for the filename, return an error message.\nThe filename should be in canonical form.", + "builtins.Bdb.set_continue" => "Stop only at breakpoints or when finished.\n\nIf there are no breakpoints, set the system trace function to None.", + "builtins.Bdb.set_next" => "Stop on the next line in or below the given frame.", + "builtins.Bdb.set_quit" => "Set quitting attribute to True.\n\nRaises BdbQuit exception in the next call to a dispatch_*() method.", + "builtins.Bdb.set_return" => "Stop when returning from the given frame.", + "builtins.Bdb.set_step" => "Stop after one line of code.", + "builtins.Bdb.set_stepinstr" => "Stop before the next instruction.", + "builtins.Bdb.set_trace" => "Start debugging from frame.\n\nIf frame is not specified, debugging starts from caller's frame.", + "builtins.Bdb.set_until" => "Stop when the line with the lineno greater than the current one is\nreached or when returning from current frame.", + "builtins.Bdb.stop_here" => "Return True if frame is below the starting frame in the stack.", + "builtins.Bdb.trace_dispatch" => "Dispatch a trace function for debugged frames based on the event.\n\nThis function is installed as the trace function for debugged\nframes. Its return value is the new trace function, which is\nusually itself. The default implementation decides how to\ndispatch a frame, depending on the type of event (passed in as a\nstring) that is about to be executed.\n\nThe event can be one of the following:\n line: A new line of code is going to be executed.\n call: A function is about to be called or another code block\n is entered.\n return: A function or other code block is about to return.\n exception: An exception has occurred.\n c_call: A C function is about to be called.\n c_return: A C function has returned.\n c_exception: A C function has raised an exception.\n\nFor the Python events, specialized functions (see the dispatch_*()\nmethods) are called. For the C events, no action is taken.\n\nThe arg parameter depends on the previous event.", + "builtins.Bdb.user_call" => "Called if we might stop in a function.", + "builtins.Bdb.user_exception" => "Called when we stop on an exception.", + "builtins.Bdb.user_line" => "Called when we stop or break at a line.", + "builtins.Bdb.user_opcode" => "Called when we are about to execute an opcode.", + "builtins.Bdb.user_return" => "Called when a return trap is set here.", + "builtins.Blob.__delattr__" => "Implement delattr(self, name).", + "builtins.Blob.__delitem__" => "Delete self[key].", + "builtins.Blob.__enter__" => "Blob context manager enter.", + "builtins.Blob.__eq__" => "Return self==value.", + "builtins.Blob.__exit__" => "Blob context manager exit.", + "builtins.Blob.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Blob.__ge__" => "Return self>=value.", + "builtins.Blob.__getattribute__" => "Return getattr(self, name).", + "builtins.Blob.__getitem__" => "Return self[key].", + "builtins.Blob.__getstate__" => "Helper for pickle.", + "builtins.Blob.__gt__" => "Return self>value.", + "builtins.Blob.__hash__" => "Return hash(self).", + "builtins.Blob.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Blob.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Blob.__le__" => "Return self<=value.", + "builtins.Blob.__len__" => "Return len(self).", + "builtins.Blob.__lt__" => "Return self<value.", + "builtins.Blob.__ne__" => "Return self!=value.", + "builtins.Blob.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Blob.__reduce__" => "Helper for pickle.", + "builtins.Blob.__reduce_ex__" => "Helper for pickle.", + "builtins.Blob.__repr__" => "Return repr(self).", + "builtins.Blob.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Blob.__setitem__" => "Set self[key] to value.", + "builtins.Blob.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Blob.__str__" => "Return str(self).", + "builtins.Blob.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Blob.close" => "Close the blob.", + "builtins.Blob.read" => "Read data at the current offset position.\n\n length\n Read length in bytes.\n\nIf the end of the blob is reached, the data up to end of file will\nbe returned. When length is not specified, or is negative,\nBlob.read() will read until the end of the blob.", + "builtins.Blob.seek" => "Set the current access position to offset.\n\nThe origin argument defaults to os.SEEK_SET (absolute blob\npositioning). Other values for origin are os.SEEK_CUR (seek\nrelative to the current position) and os.SEEK_END (seek relative to\nthe blob's end).", + "builtins.Blob.tell" => "Return the current access position for the blob.", + "builtins.Blob.write" => "Write data at the current offset.\n\nThis function cannot change the blob length. Writing beyond the end\nof the blob will result in an exception being raised.", + "builtins.BlockFinder" => "Provide a tokeneater() method to detect the end of a code block.", + "builtins.BlockFinder.__delattr__" => "Implement delattr(self, name).", + "builtins.BlockFinder.__eq__" => "Return self==value.", + "builtins.BlockFinder.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.BlockFinder.__ge__" => "Return self>=value.", + "builtins.BlockFinder.__getattribute__" => "Return getattr(self, name).", + "builtins.BlockFinder.__getstate__" => "Helper for pickle.", + "builtins.BlockFinder.__gt__" => "Return self>value.", + "builtins.BlockFinder.__hash__" => "Return hash(self).", + "builtins.BlockFinder.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.BlockFinder.__le__" => "Return self<=value.", + "builtins.BlockFinder.__lt__" => "Return self<value.", + "builtins.BlockFinder.__ne__" => "Return self!=value.", + "builtins.BlockFinder.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.BlockFinder.__reduce__" => "Helper for pickle.", + "builtins.BlockFinder.__reduce_ex__" => "Helper for pickle.", + "builtins.BlockFinder.__repr__" => "Return repr(self).", + "builtins.BlockFinder.__setattr__" => "Implement setattr(self, name, value).", + "builtins.BlockFinder.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.BlockFinder.__str__" => "Return str(self).", + "builtins.BlockFinder.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.BlockFinder.__weakref__" => "list of weak references to the object", "builtins.BlockingIOError" => "I/O operation would block.", "builtins.BlockingIOError.__delattr__" => "Implement delattr(self, name).", "builtins.BlockingIOError.__eq__" => "Return self==value.", @@ -9764,6 +10750,52 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.BlockingIOError.strerror" => "exception strerror", "builtins.BlockingIOError.winerror" => "Win32 exception code", "builtins.BlockingIOError.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.BoundArguments" => "Result of `Signature.bind` call. Holds the mapping of arguments\nto the function's parameters.\n\nHas the following public attributes:\n\n* arguments : dict\n An ordered mutable mapping of parameters' names to arguments' values.\n Does not contain arguments' default values.\n* signature : Signature\n The Signature object that created this instance.\n* args : tuple\n Tuple of positional arguments values.\n* kwargs : dict\n Dict of keyword arguments values.", + "builtins.BoundArguments.__delattr__" => "Implement delattr(self, name).", + "builtins.BoundArguments.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.BoundArguments.__ge__" => "Return self>=value.", + "builtins.BoundArguments.__getattribute__" => "Return getattr(self, name).", + "builtins.BoundArguments.__gt__" => "Return self>value.", + "builtins.BoundArguments.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.BoundArguments.__le__" => "Return self<=value.", + "builtins.BoundArguments.__lt__" => "Return self<value.", + "builtins.BoundArguments.__ne__" => "Return self!=value.", + "builtins.BoundArguments.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.BoundArguments.__reduce__" => "Helper for pickle.", + "builtins.BoundArguments.__reduce_ex__" => "Helper for pickle.", + "builtins.BoundArguments.__setattr__" => "Implement setattr(self, name, value).", + "builtins.BoundArguments.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.BoundArguments.__str__" => "Return str(self).", + "builtins.BoundArguments.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.BoundArguments.__weakref__" => "list of weak references to the object", + "builtins.BoundArguments.apply_defaults" => "Set default values for missing arguments.\n\nFor variable-positional arguments (*args) the default is an\nempty tuple.\n\nFor variable-keyword arguments (**kwargs) the default is an\nempty dict.", + "builtins.Breakpoint" => "Breakpoint class.\n\nImplements temporary breakpoints, ignore counts, disabling and\n(re)-enabling, and conditionals.\n\nBreakpoints are indexed by number through bpbynumber and by\nthe (file, line) tuple using bplist. The former points to a\nsingle instance of class Breakpoint. The latter points to a\nlist of such instances since there may be more than one\nbreakpoint per line.\n\nWhen creating a breakpoint, its associated filename should be\nin canonical form. If funcname is defined, a breakpoint hit will be\ncounted when the first line of that function is executed. A\nconditional breakpoint always counts a hit.", + "builtins.Breakpoint.__delattr__" => "Implement delattr(self, name).", + "builtins.Breakpoint.__eq__" => "Return self==value.", + "builtins.Breakpoint.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Breakpoint.__ge__" => "Return self>=value.", + "builtins.Breakpoint.__getattribute__" => "Return getattr(self, name).", + "builtins.Breakpoint.__getstate__" => "Helper for pickle.", + "builtins.Breakpoint.__gt__" => "Return self>value.", + "builtins.Breakpoint.__hash__" => "Return hash(self).", + "builtins.Breakpoint.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Breakpoint.__le__" => "Return self<=value.", + "builtins.Breakpoint.__lt__" => "Return self<value.", + "builtins.Breakpoint.__ne__" => "Return self!=value.", + "builtins.Breakpoint.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Breakpoint.__reduce__" => "Helper for pickle.", + "builtins.Breakpoint.__reduce_ex__" => "Helper for pickle.", + "builtins.Breakpoint.__repr__" => "Return repr(self).", + "builtins.Breakpoint.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Breakpoint.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Breakpoint.__str__" => "Return a condensed description of the breakpoint.", + "builtins.Breakpoint.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Breakpoint.__weakref__" => "list of weak references to the object", + "builtins.Breakpoint.bpformat" => "Return a string with information about the breakpoint.\n\nThe information includes the breakpoint number, temporary\nstatus, file:line position, break condition, number of times to\nignore, and number of times hit.", + "builtins.Breakpoint.bpprint" => "Print the output of bpformat().\n\nThe optional out argument directs where the output is sent\nand defaults to standard output.", + "builtins.Breakpoint.deleteMe" => "Delete the breakpoint from the list associated to a file:line.\n\nIf it is the last breakpoint in that position, it also deletes\nthe entry for the file:line.", + "builtins.Breakpoint.disable" => "Mark the breakpoint as disabled.", + "builtins.Breakpoint.enable" => "Mark the breakpoint as enabled.", "builtins.BrokenPipeError" => "Broken pipe.", "builtins.BrokenPipeError.__delattr__" => "Implement delattr(self, name).", "builtins.BrokenPipeError.__eq__" => "Return self==value.", @@ -9792,6 +10824,26 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.BrokenPipeError.strerror" => "exception strerror", "builtins.BrokenPipeError.winerror" => "Win32 exception code", "builtins.BrokenPipeError.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.Buffer.__delattr__" => "Implement delattr(self, name).", + "builtins.Buffer.__eq__" => "Return self==value.", + "builtins.Buffer.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Buffer.__ge__" => "Return self>=value.", + "builtins.Buffer.__getattribute__" => "Return getattr(self, name).", + "builtins.Buffer.__getstate__" => "Helper for pickle.", + "builtins.Buffer.__gt__" => "Return self>value.", + "builtins.Buffer.__hash__" => "Return hash(self).", + "builtins.Buffer.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Buffer.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Buffer.__le__" => "Return self<=value.", + "builtins.Buffer.__lt__" => "Return self<value.", + "builtins.Buffer.__ne__" => "Return self!=value.", + "builtins.Buffer.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Buffer.__reduce__" => "Helper for pickle.", + "builtins.Buffer.__reduce_ex__" => "Helper for pickle.", + "builtins.Buffer.__repr__" => "Return repr(self).", + "builtins.Buffer.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Buffer.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Buffer.__str__" => "Return str(self).", "builtins.BufferError" => "Buffer error.", "builtins.BufferError.__delattr__" => "Implement delattr(self, name).", "builtins.BufferError.__eq__" => "Return self==value.", @@ -9815,6 +10867,85 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.BufferError.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.BufferError.add_note" => "Add a note to the exception", "builtins.BufferError.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.BufferingFormatter" => "A formatter suitable for formatting a number of records.", + "builtins.BufferingFormatter.__delattr__" => "Implement delattr(self, name).", + "builtins.BufferingFormatter.__eq__" => "Return self==value.", + "builtins.BufferingFormatter.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.BufferingFormatter.__ge__" => "Return self>=value.", + "builtins.BufferingFormatter.__getattribute__" => "Return getattr(self, name).", + "builtins.BufferingFormatter.__getstate__" => "Helper for pickle.", + "builtins.BufferingFormatter.__gt__" => "Return self>value.", + "builtins.BufferingFormatter.__hash__" => "Return hash(self).", + "builtins.BufferingFormatter.__init__" => "Optionally specify a formatter which will be used to format each\nindividual record.", + "builtins.BufferingFormatter.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.BufferingFormatter.__le__" => "Return self<=value.", + "builtins.BufferingFormatter.__lt__" => "Return self<value.", + "builtins.BufferingFormatter.__ne__" => "Return self!=value.", + "builtins.BufferingFormatter.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.BufferingFormatter.__reduce__" => "Helper for pickle.", + "builtins.BufferingFormatter.__reduce_ex__" => "Helper for pickle.", + "builtins.BufferingFormatter.__repr__" => "Return repr(self).", + "builtins.BufferingFormatter.__setattr__" => "Implement setattr(self, name, value).", + "builtins.BufferingFormatter.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.BufferingFormatter.__str__" => "Return str(self).", + "builtins.BufferingFormatter.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.BufferingFormatter.__weakref__" => "list of weak references to the object", + "builtins.BufferingFormatter.format" => "Format the specified records and return the result as a string.", + "builtins.BufferingFormatter.formatFooter" => "Return the footer string for the specified records.", + "builtins.BufferingFormatter.formatHeader" => "Return the header string for the specified records.", + "builtins.BuiltinImporter" => "Meta path import for built-in modules.\n\nAll methods are either class or static methods to avoid the need to\ninstantiate the class.", + "builtins.BuiltinImporter.__delattr__" => "Implement delattr(self, name).", + "builtins.BuiltinImporter.__eq__" => "Return self==value.", + "builtins.BuiltinImporter.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.BuiltinImporter.__ge__" => "Return self>=value.", + "builtins.BuiltinImporter.__getattribute__" => "Return getattr(self, name).", + "builtins.BuiltinImporter.__getstate__" => "Helper for pickle.", + "builtins.BuiltinImporter.__gt__" => "Return self>value.", + "builtins.BuiltinImporter.__hash__" => "Return hash(self).", + "builtins.BuiltinImporter.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.BuiltinImporter.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.BuiltinImporter.__le__" => "Return self<=value.", + "builtins.BuiltinImporter.__lt__" => "Return self<value.", + "builtins.BuiltinImporter.__ne__" => "Return self!=value.", + "builtins.BuiltinImporter.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.BuiltinImporter.__reduce__" => "Helper for pickle.", + "builtins.BuiltinImporter.__reduce_ex__" => "Helper for pickle.", + "builtins.BuiltinImporter.__repr__" => "Return repr(self).", + "builtins.BuiltinImporter.__setattr__" => "Implement setattr(self, name, value).", + "builtins.BuiltinImporter.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.BuiltinImporter.__str__" => "Return str(self).", + "builtins.BuiltinImporter.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.BuiltinImporter.__weakref__" => "list of weak references to the object", + "builtins.BuiltinImporter.create_module" => "Create a built-in module", + "builtins.BuiltinImporter.exec_module" => "Exec a built-in module", + "builtins.BuiltinImporter.get_code" => "Return None as built-in modules do not have code objects.", + "builtins.BuiltinImporter.get_source" => "Return None as built-in modules do not have source code.", + "builtins.BuiltinImporter.is_package" => "Return False as built-in modules are never packages.", + "builtins.BuiltinImporter.load_module" => "Load the specified module into sys.modules and return it.\n\nThis method is deprecated. Use loader.exec_module() instead.", + "builtins.Bytecode" => "The bytecode operations of a piece of code\n\nInstantiate this with a function, method, other compiled object, string of\ncode, or a code object (as returned by compile()).\n\nIterating over this yields the bytecode operations as Instruction instances.", + "builtins.Bytecode.__delattr__" => "Implement delattr(self, name).", + "builtins.Bytecode.__eq__" => "Return self==value.", + "builtins.Bytecode.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Bytecode.__ge__" => "Return self>=value.", + "builtins.Bytecode.__getattribute__" => "Return getattr(self, name).", + "builtins.Bytecode.__getstate__" => "Helper for pickle.", + "builtins.Bytecode.__gt__" => "Return self>value.", + "builtins.Bytecode.__hash__" => "Return hash(self).", + "builtins.Bytecode.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Bytecode.__le__" => "Return self<=value.", + "builtins.Bytecode.__lt__" => "Return self<value.", + "builtins.Bytecode.__ne__" => "Return self!=value.", + "builtins.Bytecode.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Bytecode.__reduce__" => "Helper for pickle.", + "builtins.Bytecode.__reduce_ex__" => "Helper for pickle.", + "builtins.Bytecode.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Bytecode.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Bytecode.__str__" => "Return str(self).", + "builtins.Bytecode.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Bytecode.__weakref__" => "list of weak references to the object", + "builtins.Bytecode.dis" => "Return a formatted view of the bytecode operations.", + "builtins.Bytecode.from_traceback" => "Construct a Bytecode from the given traceback", + "builtins.Bytecode.info" => "Return formatted information about the code object.", "builtins.BytesWarning" => "Base class for warnings about bytes and buffer related problems, mostly\nrelated to conversion from str or comparing to str.", "builtins.BytesWarning.__delattr__" => "Implement delattr(self, name).", "builtins.BytesWarning.__eq__" => "Return self==value.", @@ -9838,6 +10969,334 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.BytesWarning.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.BytesWarning.add_note" => "Add a note to the exception", "builtins.BytesWarning.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.CArgObject.__delattr__" => "Implement delattr(self, name).", + "builtins.CArgObject.__eq__" => "Return self==value.", + "builtins.CArgObject.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.CArgObject.__ge__" => "Return self>=value.", + "builtins.CArgObject.__getattribute__" => "Return getattr(self, name).", + "builtins.CArgObject.__getstate__" => "Helper for pickle.", + "builtins.CArgObject.__gt__" => "Return self>value.", + "builtins.CArgObject.__hash__" => "Return hash(self).", + "builtins.CArgObject.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.CArgObject.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.CArgObject.__le__" => "Return self<=value.", + "builtins.CArgObject.__lt__" => "Return self<value.", + "builtins.CArgObject.__ne__" => "Return self!=value.", + "builtins.CArgObject.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.CArgObject.__reduce__" => "Helper for pickle.", + "builtins.CArgObject.__reduce_ex__" => "Helper for pickle.", + "builtins.CArgObject.__repr__" => "Return repr(self).", + "builtins.CArgObject.__setattr__" => "Implement setattr(self, name, value).", + "builtins.CArgObject.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.CArgObject.__str__" => "Return str(self).", + "builtins.CArgObject.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.CArgObject._obj" => "the wrapped object", + "builtins.CDLL" => "An instance of this class represents a loaded dll/shared\nlibrary, exporting functions using the standard C calling\nconvention (named 'cdecl' on Windows).\n\nThe exported functions can be accessed as attributes, or by\nindexing with the function name. Examples:\n\n<obj>.qsort -> callable object\n<obj>['qsort'] -> callable object\n\nCalling the functions releases the Python GIL during the call and\nreacquires it afterwards.", + "builtins.CDLL.__delattr__" => "Implement delattr(self, name).", + "builtins.CDLL.__eq__" => "Return self==value.", + "builtins.CDLL.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.CDLL.__ge__" => "Return self>=value.", + "builtins.CDLL.__getattribute__" => "Return getattr(self, name).", + "builtins.CDLL.__getstate__" => "Helper for pickle.", + "builtins.CDLL.__gt__" => "Return self>value.", + "builtins.CDLL.__hash__" => "Return hash(self).", + "builtins.CDLL.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.CDLL.__le__" => "Return self<=value.", + "builtins.CDLL.__lt__" => "Return self<value.", + "builtins.CDLL.__ne__" => "Return self!=value.", + "builtins.CDLL.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.CDLL.__reduce__" => "Helper for pickle.", + "builtins.CDLL.__reduce_ex__" => "Helper for pickle.", + "builtins.CDLL.__setattr__" => "Implement setattr(self, name, value).", + "builtins.CDLL.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.CDLL.__str__" => "Return str(self).", + "builtins.CDLL.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.CDLL.__weakref__" => "list of weak references to the object", + "builtins.CField" => "Structure/Union member", + "builtins.CField.__delattr__" => "Implement delattr(self, name).", + "builtins.CField.__delete__" => "Delete an attribute of instance.", + "builtins.CField.__eq__" => "Return self==value.", + "builtins.CField.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.CField.__ge__" => "Return self>=value.", + "builtins.CField.__get__" => "Return an attribute of instance, which is of type owner.", + "builtins.CField.__getattribute__" => "Return getattr(self, name).", + "builtins.CField.__getstate__" => "Helper for pickle.", + "builtins.CField.__gt__" => "Return self>value.", + "builtins.CField.__hash__" => "Return hash(self).", + "builtins.CField.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.CField.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.CField.__le__" => "Return self<=value.", + "builtins.CField.__lt__" => "Return self<value.", + "builtins.CField.__ne__" => "Return self!=value.", + "builtins.CField.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.CField.__reduce__" => "Helper for pickle.", + "builtins.CField.__reduce_ex__" => "Helper for pickle.", + "builtins.CField.__repr__" => "Return repr(self).", + "builtins.CField.__set__" => "Set an attribute of instance to value.", + "builtins.CField.__setattr__" => "Implement setattr(self, name, value).", + "builtins.CField.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.CField.__str__" => "Return str(self).", + "builtins.CField.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.CField.bit_offset" => "additional offset in bits (relative to byte_offset); zero for non-bitfields", + "builtins.CField.bit_size" => "size of this field in bits", + "builtins.CField.byte_offset" => "offset in bytes of this field. For bitfields: excludes bit_offset.", + "builtins.CField.byte_size" => "size of this field in bytes", + "builtins.CField.is_anonymous" => "true if this field is anonymous", + "builtins.CField.is_bitfield" => "true if this is a bitfield", + "builtins.CField.name" => "name of this field", + "builtins.CField.offset" => "offset in bytes of this field (same as byte_offset)", + "builtins.CField.size" => "size in bytes of this field. For bitfields, this is a legacy packed value; use byte_size instead", + "builtins.CField.type" => "type of this field", + "builtins.CThunkObject" => "CThunkObject", + "builtins.CThunkObject.__delattr__" => "Implement delattr(self, name).", + "builtins.CThunkObject.__eq__" => "Return self==value.", + "builtins.CThunkObject.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.CThunkObject.__ge__" => "Return self>=value.", + "builtins.CThunkObject.__getattribute__" => "Return getattr(self, name).", + "builtins.CThunkObject.__getstate__" => "Helper for pickle.", + "builtins.CThunkObject.__gt__" => "Return self>value.", + "builtins.CThunkObject.__hash__" => "Return hash(self).", + "builtins.CThunkObject.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.CThunkObject.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.CThunkObject.__le__" => "Return self<=value.", + "builtins.CThunkObject.__lt__" => "Return self<value.", + "builtins.CThunkObject.__ne__" => "Return self!=value.", + "builtins.CThunkObject.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.CThunkObject.__reduce__" => "Helper for pickle.", + "builtins.CThunkObject.__reduce_ex__" => "Helper for pickle.", + "builtins.CThunkObject.__repr__" => "Return repr(self).", + "builtins.CThunkObject.__setattr__" => "Implement setattr(self, name, value).", + "builtins.CThunkObject.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.CThunkObject.__str__" => "Return str(self).", + "builtins.CThunkObject.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Calendar" => "Base calendar class. This class doesn't do any formatting. It simply\nprovides data to subclasses.", + "builtins.Calendar.__delattr__" => "Implement delattr(self, name).", + "builtins.Calendar.__eq__" => "Return self==value.", + "builtins.Calendar.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Calendar.__ge__" => "Return self>=value.", + "builtins.Calendar.__getattribute__" => "Return getattr(self, name).", + "builtins.Calendar.__getstate__" => "Helper for pickle.", + "builtins.Calendar.__gt__" => "Return self>value.", + "builtins.Calendar.__hash__" => "Return hash(self).", + "builtins.Calendar.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Calendar.__le__" => "Return self<=value.", + "builtins.Calendar.__lt__" => "Return self<value.", + "builtins.Calendar.__ne__" => "Return self!=value.", + "builtins.Calendar.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Calendar.__reduce__" => "Helper for pickle.", + "builtins.Calendar.__reduce_ex__" => "Helper for pickle.", + "builtins.Calendar.__repr__" => "Return repr(self).", + "builtins.Calendar.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Calendar.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Calendar.__str__" => "Return str(self).", + "builtins.Calendar.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Calendar.__weakref__" => "list of weak references to the object", + "builtins.Calendar.itermonthdates" => "Return an iterator for one month. The iterator will yield datetime.date\nvalues and will always iterate through complete weeks, so it will yield\ndates outside the specified month.", + "builtins.Calendar.itermonthdays" => "Like itermonthdates(), but will yield day numbers. For days outside\nthe specified month the day number is 0.", + "builtins.Calendar.itermonthdays2" => "Like itermonthdates(), but will yield (day number, weekday number)\ntuples. For days outside the specified month the day number is 0.", + "builtins.Calendar.itermonthdays3" => "Like itermonthdates(), but will yield (year, month, day) tuples. Can be\nused for dates outside of datetime.date range.", + "builtins.Calendar.itermonthdays4" => "Like itermonthdates(), but will yield (year, month, day, day_of_week) tuples.\nCan be used for dates outside of datetime.date range.", + "builtins.Calendar.iterweekdays" => "Return an iterator for one week of weekday numbers starting with the\nconfigured first one.", + "builtins.Calendar.monthdatescalendar" => "Return a matrix (list of lists) representing a month's calendar.\nEach row represents a week; week entries are datetime.date values.", + "builtins.Calendar.monthdays2calendar" => "Return a matrix representing a month's calendar.\nEach row represents a week; week entries are\n(day number, weekday number) tuples. Day numbers outside this month\nare zero.", + "builtins.Calendar.monthdayscalendar" => "Return a matrix representing a month's calendar.\nEach row represents a week; days outside this month are zero.", + "builtins.Calendar.yeardatescalendar" => "Return the data for the specified year ready for formatting. The return\nvalue is a list of month rows. Each month row contains up to width months.\nEach month contains between 4 and 6 weeks and each week contains 1-7\ndays. Days are datetime.date objects.", + "builtins.Calendar.yeardays2calendar" => "Return the data for the specified year ready for formatting (similar to\nyeardatescalendar()). Entries in the week lists are\n(day number, weekday number) tuples. Day numbers outside this month are\nzero.", + "builtins.Calendar.yeardayscalendar" => "Return the data for the specified year ready for formatting (similar to\nyeardatescalendar()). Entries in the week lists are day numbers.\nDay numbers outside this month are zero.", + "builtins.CallWrapper" => "Internal class. Stores function to call when some user\ndefined Tcl function is called e.g. after an event occurred.", + "builtins.CallWrapper.__call__" => "Apply first function SUBST to arguments, than FUNC.", + "builtins.CallWrapper.__delattr__" => "Implement delattr(self, name).", + "builtins.CallWrapper.__eq__" => "Return self==value.", + "builtins.CallWrapper.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.CallWrapper.__ge__" => "Return self>=value.", + "builtins.CallWrapper.__getattribute__" => "Return getattr(self, name).", + "builtins.CallWrapper.__getstate__" => "Helper for pickle.", + "builtins.CallWrapper.__gt__" => "Return self>value.", + "builtins.CallWrapper.__hash__" => "Return hash(self).", + "builtins.CallWrapper.__init__" => "Store FUNC, SUBST and WIDGET as members.", + "builtins.CallWrapper.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.CallWrapper.__le__" => "Return self<=value.", + "builtins.CallWrapper.__lt__" => "Return self<value.", + "builtins.CallWrapper.__ne__" => "Return self!=value.", + "builtins.CallWrapper.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.CallWrapper.__reduce__" => "Helper for pickle.", + "builtins.CallWrapper.__reduce_ex__" => "Helper for pickle.", + "builtins.CallWrapper.__repr__" => "Return repr(self).", + "builtins.CallWrapper.__setattr__" => "Implement setattr(self, name, value).", + "builtins.CallWrapper.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.CallWrapper.__str__" => "Return str(self).", + "builtins.CallWrapper.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.CallWrapper.__weakref__" => "list of weak references to the object", + "builtins.Callable.__class_getitem__" => "Represent `Callable[argtypes, resulttype]`.\n\nThis sets ``__args__`` to a tuple containing the flattened\n``argtypes`` followed by ``resulttype``.\n\nExample: ``Callable[[int, str], float]`` sets ``__args__`` to\n``(int, str, float)``.", + "builtins.Callable.__delattr__" => "Implement delattr(self, name).", + "builtins.Callable.__eq__" => "Return self==value.", + "builtins.Callable.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Callable.__ge__" => "Return self>=value.", + "builtins.Callable.__getattribute__" => "Return getattr(self, name).", + "builtins.Callable.__getstate__" => "Helper for pickle.", + "builtins.Callable.__gt__" => "Return self>value.", + "builtins.Callable.__hash__" => "Return hash(self).", + "builtins.Callable.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Callable.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Callable.__le__" => "Return self<=value.", + "builtins.Callable.__lt__" => "Return self<value.", + "builtins.Callable.__ne__" => "Return self!=value.", + "builtins.Callable.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Callable.__reduce__" => "Helper for pickle.", + "builtins.Callable.__reduce_ex__" => "Helper for pickle.", + "builtins.Callable.__repr__" => "Return repr(self).", + "builtins.Callable.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Callable.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Callable.__str__" => "Return str(self).", + "builtins.CallableProxyType.__abs__" => "abs(self)", + "builtins.CallableProxyType.__add__" => "Return self+value.", + "builtins.CallableProxyType.__and__" => "Return self&value.", + "builtins.CallableProxyType.__bool__" => "True if self else False", + "builtins.CallableProxyType.__call__" => "Call self as a function.", + "builtins.CallableProxyType.__contains__" => "Return bool(key in self).", + "builtins.CallableProxyType.__delattr__" => "Implement delattr(self, name).", + "builtins.CallableProxyType.__delitem__" => "Delete self[key].", + "builtins.CallableProxyType.__divmod__" => "Return divmod(self, value).", + "builtins.CallableProxyType.__eq__" => "Return self==value.", + "builtins.CallableProxyType.__float__" => "float(self)", + "builtins.CallableProxyType.__floordiv__" => "Return self//value.", + "builtins.CallableProxyType.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.CallableProxyType.__ge__" => "Return self>=value.", + "builtins.CallableProxyType.__getattribute__" => "Return getattr(self, name).", + "builtins.CallableProxyType.__getitem__" => "Return self[key].", + "builtins.CallableProxyType.__getstate__" => "Helper for pickle.", + "builtins.CallableProxyType.__gt__" => "Return self>value.", + "builtins.CallableProxyType.__iadd__" => "Return self+=value.", + "builtins.CallableProxyType.__iand__" => "Return self&=value.", + "builtins.CallableProxyType.__ifloordiv__" => "Return self//=value.", + "builtins.CallableProxyType.__ilshift__" => "Return self<<=value.", + "builtins.CallableProxyType.__imatmul__" => "Return self@=value.", + "builtins.CallableProxyType.__imod__" => "Return self%=value.", + "builtins.CallableProxyType.__imul__" => "Return self*=value.", + "builtins.CallableProxyType.__index__" => "Return self converted to an integer, if self is suitable for use as an index into a list.", + "builtins.CallableProxyType.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.CallableProxyType.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.CallableProxyType.__int__" => "int(self)", + "builtins.CallableProxyType.__invert__" => "~self", + "builtins.CallableProxyType.__ior__" => "Return self|=value.", + "builtins.CallableProxyType.__ipow__" => "Return self**=value.", + "builtins.CallableProxyType.__irshift__" => "Return self>>=value.", + "builtins.CallableProxyType.__isub__" => "Return self-=value.", + "builtins.CallableProxyType.__iter__" => "Implement iter(self).", + "builtins.CallableProxyType.__itruediv__" => "Return self/=value.", + "builtins.CallableProxyType.__ixor__" => "Return self^=value.", + "builtins.CallableProxyType.__le__" => "Return self<=value.", + "builtins.CallableProxyType.__len__" => "Return len(self).", + "builtins.CallableProxyType.__lshift__" => "Return self<<value.", + "builtins.CallableProxyType.__lt__" => "Return self<value.", + "builtins.CallableProxyType.__matmul__" => "Return self@value.", + "builtins.CallableProxyType.__mod__" => "Return self%value.", + "builtins.CallableProxyType.__mul__" => "Return self*value.", + "builtins.CallableProxyType.__ne__" => "Return self!=value.", + "builtins.CallableProxyType.__neg__" => "-self", + "builtins.CallableProxyType.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.CallableProxyType.__next__" => "Implement next(self).", + "builtins.CallableProxyType.__or__" => "Return self|value.", + "builtins.CallableProxyType.__pos__" => "+self", + "builtins.CallableProxyType.__pow__" => "Return pow(self, value, mod).", + "builtins.CallableProxyType.__radd__" => "Return value+self.", + "builtins.CallableProxyType.__rand__" => "Return value&self.", + "builtins.CallableProxyType.__rdivmod__" => "Return divmod(value, self).", + "builtins.CallableProxyType.__reduce__" => "Helper for pickle.", + "builtins.CallableProxyType.__reduce_ex__" => "Helper for pickle.", + "builtins.CallableProxyType.__repr__" => "Return repr(self).", + "builtins.CallableProxyType.__rfloordiv__" => "Return value//self.", + "builtins.CallableProxyType.__rlshift__" => "Return value<<self.", + "builtins.CallableProxyType.__rmatmul__" => "Return value@self.", + "builtins.CallableProxyType.__rmod__" => "Return value%self.", + "builtins.CallableProxyType.__rmul__" => "Return value*self.", + "builtins.CallableProxyType.__ror__" => "Return value|self.", + "builtins.CallableProxyType.__rpow__" => "Return pow(value, self, mod).", + "builtins.CallableProxyType.__rrshift__" => "Return value>>self.", + "builtins.CallableProxyType.__rshift__" => "Return self>>value.", + "builtins.CallableProxyType.__rsub__" => "Return value-self.", + "builtins.CallableProxyType.__rtruediv__" => "Return value/self.", + "builtins.CallableProxyType.__rxor__" => "Return value^self.", + "builtins.CallableProxyType.__setattr__" => "Implement setattr(self, name, value).", + "builtins.CallableProxyType.__setitem__" => "Set self[key] to value.", + "builtins.CallableProxyType.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.CallableProxyType.__str__" => "Return str(self).", + "builtins.CallableProxyType.__sub__" => "Return self-value.", + "builtins.CallableProxyType.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.CallableProxyType.__truediv__" => "Return self/value.", + "builtins.CallableProxyType.__xor__" => "Return self^value.", + "builtins.Certificate.__delattr__" => "Implement delattr(self, name).", + "builtins.Certificate.__eq__" => "Return self==value.", + "builtins.Certificate.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Certificate.__ge__" => "Return self>=value.", + "builtins.Certificate.__getattribute__" => "Return getattr(self, name).", + "builtins.Certificate.__getstate__" => "Helper for pickle.", + "builtins.Certificate.__gt__" => "Return self>value.", + "builtins.Certificate.__hash__" => "Return hash(self).", + "builtins.Certificate.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Certificate.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Certificate.__le__" => "Return self<=value.", + "builtins.Certificate.__lt__" => "Return self<value.", + "builtins.Certificate.__ne__" => "Return self!=value.", + "builtins.Certificate.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Certificate.__reduce__" => "Helper for pickle.", + "builtins.Certificate.__reduce_ex__" => "Helper for pickle.", + "builtins.Certificate.__repr__" => "Return repr(self).", + "builtins.Certificate.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Certificate.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Certificate.__str__" => "Return str(self).", + "builtins.Certificate.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.ChannelID" => "A channel ID identifies a channel and may be used as an int.", + "builtins.ChannelID.__delattr__" => "Implement delattr(self, name).", + "builtins.ChannelID.__eq__" => "Return self==value.", + "builtins.ChannelID.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.ChannelID.__ge__" => "Return self>=value.", + "builtins.ChannelID.__getattribute__" => "Return getattr(self, name).", + "builtins.ChannelID.__getstate__" => "Helper for pickle.", + "builtins.ChannelID.__gt__" => "Return self>value.", + "builtins.ChannelID.__hash__" => "Return hash(self).", + "builtins.ChannelID.__index__" => "Return self converted to an integer, if self is suitable for use as an index into a list.", + "builtins.ChannelID.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.ChannelID.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.ChannelID.__int__" => "int(self)", + "builtins.ChannelID.__le__" => "Return self<=value.", + "builtins.ChannelID.__lt__" => "Return self<value.", + "builtins.ChannelID.__ne__" => "Return self!=value.", + "builtins.ChannelID.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.ChannelID.__reduce__" => "Helper for pickle.", + "builtins.ChannelID.__reduce_ex__" => "Helper for pickle.", + "builtins.ChannelID.__repr__" => "Return repr(self).", + "builtins.ChannelID.__setattr__" => "Implement setattr(self, name, value).", + "builtins.ChannelID.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.ChannelID.__str__" => "Return str(self).", + "builtins.ChannelID.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.ChannelID.end" => "'send', 'recv', or 'both'", + "builtins.ChannelID.recv" => "the 'recv' end of the channel", + "builtins.ChannelID.send" => "the 'send' end of the channel", + "builtins.Charset" => "Map character sets to their email properties.\n\nThis class provides information about the requirements imposed on email\nfor a specific character set. It also provides convenience routines for\nconverting between character sets, given the availability of the\napplicable codecs. Given a character set, it will do its best to provide\ninformation on how to use that character set in an email in an\nRFC-compliant way.\n\nCertain character sets must be encoded with quoted-printable or base64\nwhen used in email headers or bodies. Certain character sets must be\nconverted outright, and are not allowed in email. Instances of this\nmodule expose the following information about a character set:\n\ninput_charset: The initial character set specified. Common aliases\n are converted to their 'official' email names (e.g. latin_1\n is converted to iso-8859-1). Defaults to 7-bit us-ascii.\n\nheader_encoding: If the character set must be encoded before it can be\n used in an email header, this attribute will be set to\n charset.QP (for quoted-printable), charset.BASE64 (for\n base64 encoding), or charset.SHORTEST for the shortest of\n QP or BASE64 encoding. Otherwise, it will be None.\n\nbody_encoding: Same as header_encoding, but describes the encoding for the\n mail message's body, which indeed may be different than the\n header encoding. charset.SHORTEST is not allowed for\n body_encoding.\n\noutput_charset: Some character sets must be converted before they can be\n used in email headers or bodies. If the input_charset is\n one of them, this attribute will contain the name of the\n charset output will be converted to. Otherwise, it will\n be None.\n\ninput_codec: The name of the Python codec used to convert the\n input_charset to Unicode. If no conversion codec is\n necessary, this attribute will be None.\n\noutput_codec: The name of the Python codec used to convert Unicode\n to the output_charset. If no conversion codec is necessary,\n this attribute will have the same value as the input_codec.", + "builtins.Charset.__delattr__" => "Implement delattr(self, name).", + "builtins.Charset.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Charset.__ge__" => "Return self>=value.", + "builtins.Charset.__getattribute__" => "Return getattr(self, name).", + "builtins.Charset.__getstate__" => "Helper for pickle.", + "builtins.Charset.__gt__" => "Return self>value.", + "builtins.Charset.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Charset.__le__" => "Return self<=value.", + "builtins.Charset.__lt__" => "Return self<value.", + "builtins.Charset.__ne__" => "Return self!=value.", + "builtins.Charset.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Charset.__reduce__" => "Helper for pickle.", + "builtins.Charset.__reduce_ex__" => "Helper for pickle.", + "builtins.Charset.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Charset.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Charset.__str__" => "Return str(self).", + "builtins.Charset.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Charset.__weakref__" => "list of weak references to the object", + "builtins.Charset.body_encode" => "Body-encode a string by converting it first to bytes.\n\nThe type of encoding (base64 or quoted-printable) will be based on\nself.body_encoding. If body_encoding is None, we assume the\noutput charset is a 7bit encoding, so re-encoding the decoded\nstring using the ascii codec produces the correct string version\nof the content.", + "builtins.Charset.get_body_encoding" => "Return the content-transfer-encoding used for body encoding.\n\nThis is either the string 'quoted-printable' or 'base64' depending on\nthe encoding used, or it is a function in which case you should call\nthe function with a single argument, the Message object being\nencoded. The function should then set the Content-Transfer-Encoding\nheader itself to whatever is appropriate.\n\nReturns \"quoted-printable\" if self.body_encoding is QP.\nReturns \"base64\" if self.body_encoding is BASE64.\nReturns conversion function otherwise.", + "builtins.Charset.get_output_charset" => "Return the output character set.\n\nThis is self.output_charset if that is not None, otherwise it is\nself.input_charset.", + "builtins.Charset.header_encode" => "Header-encode a string by converting it first to bytes.\n\nThe type of encoding (base64 or quoted-printable) will be based on\nthis charset's `header_encoding`.\n\n:param string: A unicode string for the header. It must be possible\n to encode this string to bytes using the character set's\n output codec.\n:return: The encoded string, with RFC 2047 chrome.", + "builtins.Charset.header_encode_lines" => "Header-encode a string by converting it first to bytes.\n\nThis is similar to `header_encode()` except that the string is fit\ninto maximum line lengths as given by the argument.\n\n:param string: A unicode string for the header. It must be possible\n to encode this string to bytes using the character set's\n output codec.\n:param maxlengths: Maximum line length iterator. Each element\n returned from this iterator will provide the next maximum line\n length. This parameter is used as an argument to built-in next()\n and should never be exhausted. The maximum line lengths should\n not count the RFC 2047 chrome. These line lengths are only a\n hint; the splitter does the best it can.\n:return: Lines of encoded strings, each with RFC 2047 chrome.", "builtins.ChildProcessError" => "Child process error.", "builtins.ChildProcessError.__delattr__" => "Implement delattr(self, name).", "builtins.ChildProcessError.__eq__" => "Return self==value.", @@ -9866,6 +11325,262 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.ChildProcessError.strerror" => "exception strerror", "builtins.ChildProcessError.winerror" => "Win32 exception code", "builtins.ChildProcessError.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.Cmd" => "A simple framework for writing line-oriented command interpreters.\n\nThese are often useful for test harnesses, administrative tools, and\nprototypes that will later be wrapped in a more sophisticated interface.\n\nA Cmd instance or subclass instance is a line-oriented interpreter\nframework. There is no good reason to instantiate Cmd itself; rather,\nit's useful as a superclass of an interpreter class you define yourself\nin order to inherit Cmd's methods and encapsulate action methods.", + "builtins.Cmd.__delattr__" => "Implement delattr(self, name).", + "builtins.Cmd.__eq__" => "Return self==value.", + "builtins.Cmd.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Cmd.__ge__" => "Return self>=value.", + "builtins.Cmd.__getattribute__" => "Return getattr(self, name).", + "builtins.Cmd.__getstate__" => "Helper for pickle.", + "builtins.Cmd.__gt__" => "Return self>value.", + "builtins.Cmd.__hash__" => "Return hash(self).", + "builtins.Cmd.__init__" => "Instantiate a line-oriented interpreter framework.\n\nThe optional argument 'completekey' is the readline name of a\ncompletion key; it defaults to the Tab key. If completekey is\nnot None and the readline module is available, command completion\nis done automatically. The optional arguments stdin and stdout\nspecify alternate input and output file objects; if not specified,\nsys.stdin and sys.stdout are used.", + "builtins.Cmd.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Cmd.__le__" => "Return self<=value.", + "builtins.Cmd.__lt__" => "Return self<value.", + "builtins.Cmd.__ne__" => "Return self!=value.", + "builtins.Cmd.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Cmd.__reduce__" => "Helper for pickle.", + "builtins.Cmd.__reduce_ex__" => "Helper for pickle.", + "builtins.Cmd.__repr__" => "Return repr(self).", + "builtins.Cmd.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Cmd.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Cmd.__str__" => "Return str(self).", + "builtins.Cmd.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Cmd.__weakref__" => "list of weak references to the object", + "builtins.Cmd.cmdloop" => "Repeatedly issue a prompt, accept input, parse an initial prefix\noff the received input, and dispatch to action methods, passing them\nthe remainder of the line as argument.", + "builtins.Cmd.columnize" => "Display a list of strings as a compact set of columns.\n\nEach column is only as wide as necessary.\nColumns are separated by two spaces (one was not legible enough).", + "builtins.Cmd.complete" => "Return the next possible completion for 'text'.\n\nIf a command has not been entered, then complete against command list.\nOtherwise try to call complete_<command> to get list of completions.", + "builtins.Cmd.completedefault" => "Method called to complete an input line when no command-specific\ncomplete_*() method is available.\n\nBy default, it returns an empty list.", + "builtins.Cmd.default" => "Called on an input line when the command prefix is not recognized.\n\nIf this method is not overridden, it prints an error message and\nreturns.", + "builtins.Cmd.do_help" => "List available commands with \"help\" or detailed help with \"help cmd\".", + "builtins.Cmd.emptyline" => "Called when an empty line is entered in response to the prompt.\n\nIf this method is not overridden, it repeats the last nonempty\ncommand entered.", + "builtins.Cmd.onecmd" => "Interpret the argument as though it had been typed in response\nto the prompt.\n\nThis may be overridden, but should not normally need to be;\nsee the precmd() and postcmd() methods for useful execution hooks.\nThe return value is a flag indicating whether interpretation of\ncommands by the interpreter should stop.", + "builtins.Cmd.parseline" => "Parse the line into a command name and a string containing\nthe arguments. Returns a tuple containing (command, args, line).\n'command' and 'args' may be None if the line couldn't be parsed.", + "builtins.Cmd.postcmd" => "Hook method executed just after a command dispatch is finished.", + "builtins.Cmd.postloop" => "Hook method executed once when the cmdloop() method is about to\nreturn.", + "builtins.Cmd.precmd" => "Hook method executed just before the command line is\ninterpreted, but after the input prompt is generated and issued.", + "builtins.Cmd.preloop" => "Hook method executed once when the cmdloop() method is called.", + "builtins.Codec" => "Defines the interface for stateless encoders/decoders.\n\nThe .encode()/.decode() methods may use different error\nhandling schemes by providing the errors argument. These\nstring values are predefined:\n\n 'strict' - raise a ValueError error (or a subclass)\n 'ignore' - ignore the character and continue with the next\n 'replace' - replace with a suitable replacement character;\n Python will use the official U+FFFD REPLACEMENT\n CHARACTER for the builtin Unicode codecs on\n decoding and '?' on encoding.\n 'surrogateescape' - replace with private code points U+DCnn.\n 'xmlcharrefreplace' - Replace with the appropriate XML\n character reference (only for encoding).\n 'backslashreplace' - Replace with backslashed escape sequences.\n 'namereplace' - Replace with \\N{...} escape sequences\n (only for encoding).\n\nThe set of allowed values can be extended via register_error.", + "builtins.Codec.__delattr__" => "Implement delattr(self, name).", + "builtins.Codec.__eq__" => "Return self==value.", + "builtins.Codec.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Codec.__ge__" => "Return self>=value.", + "builtins.Codec.__getattribute__" => "Return getattr(self, name).", + "builtins.Codec.__getstate__" => "Helper for pickle.", + "builtins.Codec.__gt__" => "Return self>value.", + "builtins.Codec.__hash__" => "Return hash(self).", + "builtins.Codec.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Codec.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Codec.__le__" => "Return self<=value.", + "builtins.Codec.__lt__" => "Return self<value.", + "builtins.Codec.__ne__" => "Return self!=value.", + "builtins.Codec.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Codec.__reduce__" => "Helper for pickle.", + "builtins.Codec.__reduce_ex__" => "Helper for pickle.", + "builtins.Codec.__repr__" => "Return repr(self).", + "builtins.Codec.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Codec.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Codec.__str__" => "Return str(self).", + "builtins.Codec.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Codec.__weakref__" => "list of weak references to the object", + "builtins.Codec.decode" => "Decodes the object input and returns a tuple (output\nobject, length consumed).\n\ninput must be an object which provides the bf_getreadbuf\nbuffer slot. Python strings, buffer objects and memory\nmapped files are examples of objects providing this slot.\n\nerrors defines the error handling to apply. It defaults to\n'strict' handling.\n\nThe method may not store state in the Codec instance. Use\nStreamReader for codecs which have to keep state in order to\nmake decoding efficient.\n\nThe decoder must be able to handle zero length input and\nreturn an empty object of the output object type in this\nsituation.", + "builtins.Codec.encode" => "Encodes the object input and returns a tuple (output\nobject, length consumed).\n\nerrors defines the error handling to apply. It defaults to\n'strict' handling.\n\nThe method may not store state in the Codec instance. Use\nStreamWriter for codecs which have to keep state in order to\nmake encoding efficient.\n\nThe encoder must be able to handle zero length input and\nreturn an empty object of the output object type in this\nsituation.", + "builtins.CommandCompiler" => "Instances of this class have __call__ methods identical in\nsignature to compile_command; the difference is that if the\ninstance compiles program text containing a __future__ statement,\nthe instance 'remembers' and compiles all subsequent program texts\nwith the statement in force.", + "builtins.CommandCompiler.__call__" => "Compile a command and determine whether it is incomplete.\n\nArguments:\n\nsource -- the source string; may contain \\n characters\nfilename -- optional filename from which source was read;\n default \"<input>\"\nsymbol -- optional grammar start symbol; \"single\" (default) or\n \"eval\"\n\nReturn value / exceptions raised:\n\n- Return a code object if the command is complete and valid\n- Return None if the command is incomplete\n- Raise SyntaxError, ValueError or OverflowError if the command is a\n syntax error (OverflowError and ValueError can be produced by\n malformed literals).", + "builtins.CommandCompiler.__delattr__" => "Implement delattr(self, name).", + "builtins.CommandCompiler.__eq__" => "Return self==value.", + "builtins.CommandCompiler.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.CommandCompiler.__ge__" => "Return self>=value.", + "builtins.CommandCompiler.__getattribute__" => "Return getattr(self, name).", + "builtins.CommandCompiler.__getstate__" => "Helper for pickle.", + "builtins.CommandCompiler.__gt__" => "Return self>value.", + "builtins.CommandCompiler.__hash__" => "Return hash(self).", + "builtins.CommandCompiler.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.CommandCompiler.__le__" => "Return self<=value.", + "builtins.CommandCompiler.__lt__" => "Return self<value.", + "builtins.CommandCompiler.__ne__" => "Return self!=value.", + "builtins.CommandCompiler.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.CommandCompiler.__reduce__" => "Helper for pickle.", + "builtins.CommandCompiler.__reduce_ex__" => "Helper for pickle.", + "builtins.CommandCompiler.__repr__" => "Return repr(self).", + "builtins.CommandCompiler.__setattr__" => "Implement setattr(self, name, value).", + "builtins.CommandCompiler.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.CommandCompiler.__str__" => "Return str(self).", + "builtins.CommandCompiler.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.CommandCompiler.__weakref__" => "list of weak references to the object", + "builtins.Compile" => "Instances of this class behave much like the built-in compile\nfunction, but if one is used to compile text containing a future\nstatement, it \"remembers\" and compiles all subsequent program texts\nwith the statement in force.", + "builtins.Compile.__delattr__" => "Implement delattr(self, name).", + "builtins.Compile.__eq__" => "Return self==value.", + "builtins.Compile.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Compile.__ge__" => "Return self>=value.", + "builtins.Compile.__getattribute__" => "Return getattr(self, name).", + "builtins.Compile.__getstate__" => "Helper for pickle.", + "builtins.Compile.__gt__" => "Return self>value.", + "builtins.Compile.__hash__" => "Return hash(self).", + "builtins.Compile.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Compile.__le__" => "Return self<=value.", + "builtins.Compile.__lt__" => "Return self<value.", + "builtins.Compile.__ne__" => "Return self!=value.", + "builtins.Compile.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Compile.__reduce__" => "Helper for pickle.", + "builtins.Compile.__reduce_ex__" => "Helper for pickle.", + "builtins.Compile.__repr__" => "Return repr(self).", + "builtins.Compile.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Compile.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Compile.__str__" => "Return str(self).", + "builtins.Compile.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Compile.__weakref__" => "list of weak references to the object", + "builtins.CompletedProcess" => "A process that has finished running.\n\nThis is returned by run().\n\nAttributes:\n args: The list or str args passed to run().\n returncode: The exit code of the process, negative for signals.\n stdout: The standard output (None if not captured).\n stderr: The standard error (None if not captured).", + "builtins.CompletedProcess.__class_getitem__" => "Represent a PEP 585 generic type\n\nE.g. for t = list[int], t.__origin__ is list and t.__args__ is (int,).", + "builtins.CompletedProcess.__delattr__" => "Implement delattr(self, name).", + "builtins.CompletedProcess.__eq__" => "Return self==value.", + "builtins.CompletedProcess.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.CompletedProcess.__ge__" => "Return self>=value.", + "builtins.CompletedProcess.__getattribute__" => "Return getattr(self, name).", + "builtins.CompletedProcess.__getstate__" => "Helper for pickle.", + "builtins.CompletedProcess.__gt__" => "Return self>value.", + "builtins.CompletedProcess.__hash__" => "Return hash(self).", + "builtins.CompletedProcess.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.CompletedProcess.__le__" => "Return self<=value.", + "builtins.CompletedProcess.__lt__" => "Return self<value.", + "builtins.CompletedProcess.__ne__" => "Return self!=value.", + "builtins.CompletedProcess.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.CompletedProcess.__reduce__" => "Helper for pickle.", + "builtins.CompletedProcess.__reduce_ex__" => "Helper for pickle.", + "builtins.CompletedProcess.__setattr__" => "Implement setattr(self, name, value).", + "builtins.CompletedProcess.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.CompletedProcess.__str__" => "Return str(self).", + "builtins.CompletedProcess.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.CompletedProcess.__weakref__" => "list of weak references to the object", + "builtins.CompletedProcess.check_returncode" => "Raise CalledProcessError if the exit code is non-zero.", + "builtins.Completer.__delattr__" => "Implement delattr(self, name).", + "builtins.Completer.__eq__" => "Return self==value.", + "builtins.Completer.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Completer.__ge__" => "Return self>=value.", + "builtins.Completer.__getattribute__" => "Return getattr(self, name).", + "builtins.Completer.__getstate__" => "Helper for pickle.", + "builtins.Completer.__gt__" => "Return self>value.", + "builtins.Completer.__hash__" => "Return hash(self).", + "builtins.Completer.__init__" => "Create a new completer for the command line.\n\nCompleter([namespace]) -> completer instance.\n\nIf unspecified, the default namespace where completions are performed\nis __main__ (technically, __main__.__dict__). Namespaces should be\ngiven as dictionaries.\n\nCompleter instances should be used as the completion mechanism of\nreadline via the set_completer() call:\n\nreadline.set_completer(Completer(my_namespace).complete)", + "builtins.Completer.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Completer.__le__" => "Return self<=value.", + "builtins.Completer.__lt__" => "Return self<value.", + "builtins.Completer.__ne__" => "Return self!=value.", + "builtins.Completer.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Completer.__reduce__" => "Helper for pickle.", + "builtins.Completer.__reduce_ex__" => "Helper for pickle.", + "builtins.Completer.__repr__" => "Return repr(self).", + "builtins.Completer.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Completer.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Completer.__str__" => "Return str(self).", + "builtins.Completer.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Completer.__weakref__" => "list of weak references to the object", + "builtins.Completer.attr_matches" => "Compute matches when text contains a dot.\n\nAssuming the text is of the form NAME.NAME....[NAME], and is\nevaluable in self.namespace, it will be evaluated and its attributes\n(as revealed by dir()) are used as possible completions. (For class\ninstances, class members are also considered.)\n\nWARNING: this can still invoke arbitrary C code, if an object\nwith a __getattr__ hook is evaluated.", + "builtins.Completer.complete" => "Return the next possible completion for 'text'.\n\nThis is called successively with state == 0, 1, 2, ... until it\nreturns None. The completion should begin with 'text'.", + "builtins.Completer.global_matches" => "Compute matches when text is a simple name.\n\nReturn a list of all keywords, built-in functions and names currently\ndefined in self.namespace that match.", + "builtins.Compress.__delattr__" => "Implement delattr(self, name).", + "builtins.Compress.__eq__" => "Return self==value.", + "builtins.Compress.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Compress.__ge__" => "Return self>=value.", + "builtins.Compress.__getattribute__" => "Return getattr(self, name).", + "builtins.Compress.__getstate__" => "Helper for pickle.", + "builtins.Compress.__gt__" => "Return self>value.", + "builtins.Compress.__hash__" => "Return hash(self).", + "builtins.Compress.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Compress.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Compress.__le__" => "Return self<=value.", + "builtins.Compress.__lt__" => "Return self<value.", + "builtins.Compress.__ne__" => "Return self!=value.", + "builtins.Compress.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Compress.__reduce__" => "Helper for pickle.", + "builtins.Compress.__reduce_ex__" => "Helper for pickle.", + "builtins.Compress.__repr__" => "Return repr(self).", + "builtins.Compress.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Compress.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Compress.__str__" => "Return str(self).", + "builtins.Compress.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Compress.compress" => "Returns a bytes object containing compressed data.\n\n data\n Binary data to be compressed.\n\nAfter calling this function, some of the input data may still\nbe stored in internal buffers for later processing.\nCall the flush() method to clear these buffers.", + "builtins.Compress.copy" => "Return a copy of the compression object.", + "builtins.Compress.flush" => "Return a bytes object containing any remaining compressed data.\n\n mode\n One of the constants Z_SYNC_FLUSH, Z_FULL_FLUSH, Z_FINISH.\n If mode == Z_FINISH, the compressor object can no longer be\n used after calling the flush() method. Otherwise, more data\n can still be compressed.", + "builtins.Condition" => "Class that implements a condition variable.\n\nA condition variable allows one or more threads to wait until they are\nnotified by another thread.\n\nIf the lock argument is given and not None, it must be a Lock or RLock\nobject, and it is used as the underlying lock. Otherwise, a new RLock object\nis created and used as the underlying lock.", + "builtins.Condition.__delattr__" => "Implement delattr(self, name).", + "builtins.Condition.__eq__" => "Return self==value.", + "builtins.Condition.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Condition.__ge__" => "Return self>=value.", + "builtins.Condition.__getattribute__" => "Return getattr(self, name).", + "builtins.Condition.__getstate__" => "Helper for pickle.", + "builtins.Condition.__gt__" => "Return self>value.", + "builtins.Condition.__hash__" => "Return hash(self).", + "builtins.Condition.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Condition.__le__" => "Return self<=value.", + "builtins.Condition.__lt__" => "Return self<value.", + "builtins.Condition.__ne__" => "Return self!=value.", + "builtins.Condition.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Condition.__reduce__" => "Helper for pickle.", + "builtins.Condition.__reduce_ex__" => "Helper for pickle.", + "builtins.Condition.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Condition.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Condition.__str__" => "Return str(self).", + "builtins.Condition.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Condition.__weakref__" => "list of weak references to the object", + "builtins.Condition.notify" => "Wake up one or more threads waiting on this condition, if any.\n\nIf the calling thread has not acquired the lock when this method is\ncalled, a RuntimeError is raised.\n\nThis method wakes up at most n of the threads waiting for the condition\nvariable; it is a no-op if no threads are waiting.", + "builtins.Condition.notifyAll" => "Wake up all threads waiting on this condition.\n\nThis method is deprecated, use notify_all() instead.", + "builtins.Condition.notify_all" => "Wake up all threads waiting on this condition.\n\nIf the calling thread has not acquired the lock when this method\nis called, a RuntimeError is raised.", + "builtins.Condition.wait" => "Wait until notified or until a timeout occurs.\n\nIf the calling thread has not acquired the lock when this method is\ncalled, a RuntimeError is raised.\n\nThis method releases the underlying lock, and then blocks until it is\nawakened by a notify() or notify_all() call for the same condition\nvariable in another thread, or until the optional timeout occurs. Once\nawakened or timed out, it re-acquires the lock and returns.\n\nWhen the timeout argument is present and not None, it should be a\nfloating-point number specifying a timeout for the operation in seconds\n(or fractions thereof).\n\nWhen the underlying lock is an RLock, it is not released using its\nrelease() method, since this may not actually unlock the lock when it\nwas acquired multiple times recursively. Instead, an internal interface\nof the RLock class is used, which really unlocks it even when it has\nbeen recursively acquired several times. Another internal interface is\nthen used to restore the recursion level when the lock is reacquired.", + "builtins.Condition.wait_for" => "Wait until a condition evaluates to True.\n\npredicate should be a callable which result will be interpreted as a\nboolean value. A timeout may be provided giving the maximum time to\nwait.", + "builtins.Connection" => "SQLite database connection object.", + "builtins.Connection.__call__" => "Call self as a function.", + "builtins.Connection.__del__" => "Called when the instance is about to be destroyed.", + "builtins.Connection.__delattr__" => "Implement delattr(self, name).", + "builtins.Connection.__enter__" => "Called when the connection is used as a context manager.\n\nReturns itself as a convenience to the caller.", + "builtins.Connection.__eq__" => "Return self==value.", + "builtins.Connection.__exit__" => "Called when the connection is used as a context manager.\n\nIf there was any exception, a rollback takes place; otherwise we\ncommit.", + "builtins.Connection.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Connection.__ge__" => "Return self>=value.", + "builtins.Connection.__getattribute__" => "Return getattr(self, name).", + "builtins.Connection.__getstate__" => "Helper for pickle.", + "builtins.Connection.__gt__" => "Return self>value.", + "builtins.Connection.__hash__" => "Return hash(self).", + "builtins.Connection.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Connection.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Connection.__le__" => "Return self<=value.", + "builtins.Connection.__lt__" => "Return self<value.", + "builtins.Connection.__ne__" => "Return self!=value.", + "builtins.Connection.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Connection.__reduce__" => "Helper for pickle.", + "builtins.Connection.__reduce_ex__" => "Helper for pickle.", + "builtins.Connection.__repr__" => "Return repr(self).", + "builtins.Connection.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Connection.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Connection.__str__" => "Return str(self).", + "builtins.Connection.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Connection.backup" => "Makes a backup of the database.", + "builtins.Connection.blobopen" => "Open and return a BLOB object.\n\n table\n Table name.\n column\n Column name.\n rowid\n Row id.\n readonly\n Open the BLOB without write permissions.\n name\n Database name.", + "builtins.Connection.close" => "Close the database connection.\n\nAny pending transaction is not committed implicitly.", + "builtins.Connection.commit" => "Commit any pending transaction to the database.\n\nIf there is no open transaction, this method is a no-op.", + "builtins.Connection.create_aggregate" => "Creates a new aggregate.\n\nNote: Passing keyword arguments 'name', 'n_arg' and 'aggregate_class'\nto _sqlite3.Connection.create_aggregate() is deprecated. Parameters\n'name', 'n_arg' and 'aggregate_class' will become positional-only in\nPython 3.15.", + "builtins.Connection.create_collation" => "Creates a collation function.", + "builtins.Connection.create_function" => "Creates a new function.\n\nNote: Passing keyword arguments 'name', 'narg' and 'func' to\n_sqlite3.Connection.create_function() is deprecated. Parameters\n'name', 'narg' and 'func' will become positional-only in Python 3.15.", + "builtins.Connection.create_window_function" => "Creates or redefines an aggregate window function. Non-standard.\n\n name\n The name of the SQL aggregate window function to be created or\n redefined.\n num_params\n The number of arguments the step and inverse methods takes.\n aggregate_class\n A class with step(), finalize(), value(), and inverse() methods.\n Set to None to clear the window function.", + "builtins.Connection.cursor" => "Return a cursor for the connection.", + "builtins.Connection.deserialize" => "Load a serialized database.\n\n data\n The serialized database content.\n name\n Which database to reopen with the deserialization.\n\nThe deserialize interface causes the database connection to\ndisconnect from the target database, and then reopen it as\nan in-memory database based on the given serialized data.\n\nThe deserialize interface will fail with SQLITE_BUSY if the database\nis currently in a read transaction or is involved in a backup\noperation.", + "builtins.Connection.enable_load_extension" => "Enable dynamic loading of SQLite extension modules.", + "builtins.Connection.execute" => "Executes an SQL statement.", + "builtins.Connection.executemany" => "Repeatedly executes an SQL statement.", + "builtins.Connection.executescript" => "Executes multiple SQL statements at once.", + "builtins.Connection.getconfig" => "Query a boolean connection configuration option.\n\n op\n The configuration verb; one of the sqlite3.SQLITE_DBCONFIG codes.", + "builtins.Connection.getlimit" => "Get connection run-time limits.\n\n category\n The limit category to be queried.", + "builtins.Connection.interrupt" => "Abort any pending database operation.", + "builtins.Connection.iterdump" => "Returns iterator to the dump of the database in an SQL text format.\n\n filter\n An optional LIKE pattern for database objects to dump", + "builtins.Connection.load_extension" => "Load SQLite extension module.", + "builtins.Connection.rollback" => "Roll back to the start of any pending transaction.\n\nIf there is no open transaction, this method is a no-op.", + "builtins.Connection.serialize" => "Serialize a database into a byte string.\n\n name\n Which database to serialize.\n\nFor an ordinary on-disk database file, the serialization is just\na copy of the disk file. For an in-memory database or a \"temp\"\ndatabase, the serialization is the same sequence of bytes which\nwould be written to disk if that database were backed up to disk.", + "builtins.Connection.set_authorizer" => "Set authorizer callback.\n\nNote: Passing keyword argument 'authorizer_callback' to\n_sqlite3.Connection.set_authorizer() is deprecated. Parameter\n'authorizer_callback' will become positional-only in Python 3.15.", + "builtins.Connection.set_progress_handler" => "Set progress handler callback.\n\n progress_handler\n A callable that takes no arguments.\n If the callable returns non-zero, the current query is\n terminated, and an exception is raised.\n n\n The number of SQLite virtual machine instructions that are\n executed between invocations of 'progress_handler'.\n\nIf 'progress_handler' is None or 'n' is 0, the progress handler is\ndisabled.\n\nNote: Passing keyword argument 'progress_handler' to\n_sqlite3.Connection.set_progress_handler() is deprecated. Parameter\n'progress_handler' will become positional-only in Python 3.15.", + "builtins.Connection.set_trace_callback" => "Set a trace callback called for each SQL statement (passed as unicode).\n\nNote: Passing keyword argument 'trace_callback' to\n_sqlite3.Connection.set_trace_callback() is deprecated. Parameter\n'trace_callback' will become positional-only in Python 3.15.", + "builtins.Connection.setconfig" => "Set a boolean connection configuration option.\n\n op\n The configuration verb; one of the sqlite3.SQLITE_DBCONFIG codes.", + "builtins.Connection.setlimit" => "Set connection run-time limits.\n\n category\n The limit category to be set.\n limit\n The new limit. If the new limit is a negative number, the limit\n is unchanged.\n\nAttempts to increase a limit above its hard upper bound are silently\ntruncated to the hard upper bound. Regardless of whether or not the\nlimit was changed, the prior value of the limit is returned.", "builtins.ConnectionAbortedError" => "Connection aborted.", "builtins.ConnectionAbortedError.__delattr__" => "Implement delattr(self, name).", "builtins.ConnectionAbortedError.__eq__" => "Return self==value.", @@ -9978,6 +11693,456 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.ConnectionResetError.strerror" => "exception strerror", "builtins.ConnectionResetError.winerror" => "Win32 exception code", "builtins.ConnectionResetError.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.Container.__class_getitem__" => "Represent a PEP 585 generic type\n\nE.g. for t = list[int], t.__origin__ is list and t.__args__ is (int,).", + "builtins.Container.__delattr__" => "Implement delattr(self, name).", + "builtins.Container.__eq__" => "Return self==value.", + "builtins.Container.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Container.__ge__" => "Return self>=value.", + "builtins.Container.__getattribute__" => "Return getattr(self, name).", + "builtins.Container.__getstate__" => "Helper for pickle.", + "builtins.Container.__gt__" => "Return self>value.", + "builtins.Container.__hash__" => "Return hash(self).", + "builtins.Container.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Container.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Container.__le__" => "Return self<=value.", + "builtins.Container.__lt__" => "Return self<value.", + "builtins.Container.__ne__" => "Return self!=value.", + "builtins.Container.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Container.__reduce__" => "Helper for pickle.", + "builtins.Container.__reduce_ex__" => "Helper for pickle.", + "builtins.Container.__repr__" => "Return repr(self).", + "builtins.Container.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Container.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Container.__str__" => "Return str(self).", + "builtins.Context" => "Contains the context for a Decimal instance.\n\nContains:\nprec - precision (for use in rounding, division, square roots..)\nrounding - rounding type (how you round)\ntraps - If traps[exception] = 1, then the exception is\n raised when it is caused. Otherwise, a value is\n substituted in.\nflags - When an exception is caused, flags[exception] is set.\n (Whether or not the trap_enabler is set)\n Should be reset by user of Decimal instance.\nEmin - Minimum exponent\nEmax - Maximum exponent\ncapitals - If 1, 1*10^1 is printed as 1E+1.\n If 0, printed as 1e1\nclamp - If 1, change exponents if too high (Default 0)", + "builtins.Context.Etiny" => "Returns Etiny (= Emin - prec + 1)", + "builtins.Context.Etop" => "Returns maximum exponent (= Emax - prec + 1)", + "builtins.Context.__contains__" => "Return bool(key in self).", + "builtins.Context.__copy__" => "Returns a deep copy from self.", + "builtins.Context.__delattr__" => "Implement delattr(self, name).", + "builtins.Context.__eq__" => "Return self==value.", + "builtins.Context.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Context.__ge__" => "Return self>=value.", + "builtins.Context.__getattribute__" => "Return getattr(self, name).", + "builtins.Context.__getitem__" => "Return self[key].", + "builtins.Context.__getstate__" => "Helper for pickle.", + "builtins.Context.__gt__" => "Return self>value.", + "builtins.Context.__hash__" => "Return hash(self).", + "builtins.Context.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Context.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Context.__iter__" => "Implement iter(self).", + "builtins.Context.__le__" => "Return self<=value.", + "builtins.Context.__len__" => "Return len(self).", + "builtins.Context.__lt__" => "Return self<value.", + "builtins.Context.__ne__" => "Return self!=value.", + "builtins.Context.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Context.__reduce__" => "Helper for pickle.", + "builtins.Context.__reduce_ex__" => "Helper for pickle.", + "builtins.Context.__repr__" => "Show the current context.", + "builtins.Context.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Context.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Context.__str__" => "Return str(self).", + "builtins.Context.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Context.__weakref__" => "list of weak references to the object", + "builtins.Context._ignore_all_flags" => "Ignore all flags, if they are raised", + "builtins.Context._ignore_flags" => "Ignore the flags, if they are raised", + "builtins.Context._raise_error" => "Handles an error\n\nIf the flag is in _ignored_flags, returns the default response.\nOtherwise, it sets the flag, then, if the corresponding\ntrap_enabler is set, it reraises the exception. Otherwise, it returns\nthe default value after setting the flag.", + "builtins.Context._regard_flags" => "Stop ignoring the flags, if they are raised", + "builtins.Context._set_rounding" => "Sets the rounding type.\n\nSets the rounding type, and returns the current (previous)\nrounding type. Often used like:\n\ncontext = context.copy()\n# so you don't change the calling context\n# if an error occurs in the middle.\nrounding = context._set_rounding(ROUND_UP)\nval = self.__sub__(other, context=context)\ncontext._set_rounding(rounding)\n\nThis will make it round up for that operation.", + "builtins.Context._shallow_copy" => "Returns a shallow copy from self.", + "builtins.Context.abs" => "Returns the absolute value of the operand.\n\nIf the operand is negative, the result is the same as using the\nminus operation on the operand. Otherwise, the result is the same\nas using the plus operation on the operand.\n\n>>> ExtendedContext.abs(Decimal('2.1'))\nDecimal('2.1')\n>>> ExtendedContext.abs(Decimal('-100'))\nDecimal('100')\n>>> ExtendedContext.abs(Decimal('101.5'))\nDecimal('101.5')\n>>> ExtendedContext.abs(Decimal('-101.5'))\nDecimal('101.5')\n>>> ExtendedContext.abs(-1)\nDecimal('1')", + "builtins.Context.add" => "Return the sum of the two operands.\n\n>>> ExtendedContext.add(Decimal('12'), Decimal('7.00'))\nDecimal('19.00')\n>>> ExtendedContext.add(Decimal('1E+2'), Decimal('1.01E+4'))\nDecimal('1.02E+4')\n>>> ExtendedContext.add(1, Decimal(2))\nDecimal('3')\n>>> ExtendedContext.add(Decimal(8), 5)\nDecimal('13')\n>>> ExtendedContext.add(5, 5)\nDecimal('10')", + "builtins.Context.canonical" => "Returns the same Decimal object.\n\nAs we do not have different encodings for the same number, the\nreceived object already is in its canonical form.\n\n>>> ExtendedContext.canonical(Decimal('2.50'))\nDecimal('2.50')", + "builtins.Context.clear_flags" => "Reset all flags to zero", + "builtins.Context.clear_traps" => "Reset all traps to zero", + "builtins.Context.compare" => "Compares values numerically.\n\nIf the signs of the operands differ, a value representing each\noperand ('-1' if the operand is less than zero, '0' if the operand\nis zero or negative zero, or '1' if the operand is greater than\nzero) is used in place of that operand for the comparison instead of\nthe actual operand.\n\nThe comparison is then effected by subtracting the second operand\nfrom the first and then returning a value according to the result of\nthe subtraction: '-1' if the result is less than zero, '0' if the\nresult is zero or negative zero, or '1' if the result is greater\nthan zero.\n\n>>> ExtendedContext.compare(Decimal('2.1'), Decimal('3'))\nDecimal('-1')\n>>> ExtendedContext.compare(Decimal('2.1'), Decimal('2.1'))\nDecimal('0')\n>>> ExtendedContext.compare(Decimal('2.1'), Decimal('2.10'))\nDecimal('0')\n>>> ExtendedContext.compare(Decimal('3'), Decimal('2.1'))\nDecimal('1')\n>>> ExtendedContext.compare(Decimal('2.1'), Decimal('-3'))\nDecimal('1')\n>>> ExtendedContext.compare(Decimal('-3'), Decimal('2.1'))\nDecimal('-1')\n>>> ExtendedContext.compare(1, 2)\nDecimal('-1')\n>>> ExtendedContext.compare(Decimal(1), 2)\nDecimal('-1')\n>>> ExtendedContext.compare(1, Decimal(2))\nDecimal('-1')", + "builtins.Context.compare_signal" => "Compares the values of the two operands numerically.\n\nIt's pretty much like compare(), but all NaNs signal, with signaling\nNaNs taking precedence over quiet NaNs.\n\n>>> c = ExtendedContext\n>>> c.compare_signal(Decimal('2.1'), Decimal('3'))\nDecimal('-1')\n>>> c.compare_signal(Decimal('2.1'), Decimal('2.1'))\nDecimal('0')\n>>> c.flags[InvalidOperation] = 0\n>>> print(c.flags[InvalidOperation])\n0\n>>> c.compare_signal(Decimal('NaN'), Decimal('2.1'))\nDecimal('NaN')\n>>> print(c.flags[InvalidOperation])\n1\n>>> c.flags[InvalidOperation] = 0\n>>> print(c.flags[InvalidOperation])\n0\n>>> c.compare_signal(Decimal('sNaN'), Decimal('2.1'))\nDecimal('NaN')\n>>> print(c.flags[InvalidOperation])\n1\n>>> c.compare_signal(-1, 2)\nDecimal('-1')\n>>> c.compare_signal(Decimal(-1), 2)\nDecimal('-1')\n>>> c.compare_signal(-1, Decimal(2))\nDecimal('-1')", + "builtins.Context.compare_total" => "Compares two operands using their abstract representation.\n\nThis is not like the standard compare, which use their numerical\nvalue. Note that a total ordering is defined for all possible\nabstract representations.\n\n>>> ExtendedContext.compare_total(Decimal('12.73'), Decimal('127.9'))\nDecimal('-1')\n>>> ExtendedContext.compare_total(Decimal('-127'), Decimal('12'))\nDecimal('-1')\n>>> ExtendedContext.compare_total(Decimal('12.30'), Decimal('12.3'))\nDecimal('-1')\n>>> ExtendedContext.compare_total(Decimal('12.30'), Decimal('12.30'))\nDecimal('0')\n>>> ExtendedContext.compare_total(Decimal('12.3'), Decimal('12.300'))\nDecimal('1')\n>>> ExtendedContext.compare_total(Decimal('12.3'), Decimal('NaN'))\nDecimal('-1')\n>>> ExtendedContext.compare_total(1, 2)\nDecimal('-1')\n>>> ExtendedContext.compare_total(Decimal(1), 2)\nDecimal('-1')\n>>> ExtendedContext.compare_total(1, Decimal(2))\nDecimal('-1')", + "builtins.Context.compare_total_mag" => "Compares two operands using their abstract representation ignoring sign.\n\nLike compare_total, but with operand's sign ignored and assumed to\nbe 0.", + "builtins.Context.copy" => "Returns a deep copy from self.", + "builtins.Context.copy_abs" => "Returns a copy of the operand with the sign set to 0.\n\n>>> ExtendedContext.copy_abs(Decimal('2.1'))\nDecimal('2.1')\n>>> ExtendedContext.copy_abs(Decimal('-100'))\nDecimal('100')\n>>> ExtendedContext.copy_abs(-1)\nDecimal('1')", + "builtins.Context.copy_decimal" => "Returns a copy of the decimal object.\n\n>>> ExtendedContext.copy_decimal(Decimal('2.1'))\nDecimal('2.1')\n>>> ExtendedContext.copy_decimal(Decimal('-1.00'))\nDecimal('-1.00')\n>>> ExtendedContext.copy_decimal(1)\nDecimal('1')", + "builtins.Context.copy_negate" => "Returns a copy of the operand with the sign inverted.\n\n>>> ExtendedContext.copy_negate(Decimal('101.5'))\nDecimal('-101.5')\n>>> ExtendedContext.copy_negate(Decimal('-101.5'))\nDecimal('101.5')\n>>> ExtendedContext.copy_negate(1)\nDecimal('-1')", + "builtins.Context.copy_sign" => "Copies the second operand's sign to the first one.\n\nIn detail, it returns a copy of the first operand with the sign\nequal to the sign of the second operand.\n\n>>> ExtendedContext.copy_sign(Decimal( '1.50'), Decimal('7.33'))\nDecimal('1.50')\n>>> ExtendedContext.copy_sign(Decimal('-1.50'), Decimal('7.33'))\nDecimal('1.50')\n>>> ExtendedContext.copy_sign(Decimal( '1.50'), Decimal('-7.33'))\nDecimal('-1.50')\n>>> ExtendedContext.copy_sign(Decimal('-1.50'), Decimal('-7.33'))\nDecimal('-1.50')\n>>> ExtendedContext.copy_sign(1, -2)\nDecimal('-1')\n>>> ExtendedContext.copy_sign(Decimal(1), -2)\nDecimal('-1')\n>>> ExtendedContext.copy_sign(1, Decimal(-2))\nDecimal('-1')", + "builtins.Context.create_decimal" => "Creates a new Decimal instance but using self as context.\n\nThis method implements the to-number operation of the\nIBM Decimal specification.", + "builtins.Context.create_decimal_from_float" => "Creates a new Decimal instance from a float but rounding using self\nas the context.\n\n>>> context = Context(prec=5, rounding=ROUND_DOWN)\n>>> context.create_decimal_from_float(3.1415926535897932)\nDecimal('3.1415')\n>>> context = Context(prec=5, traps=[Inexact])\n>>> context.create_decimal_from_float(3.1415926535897932)\nTraceback (most recent call last):\n ...\ndecimal.Inexact: None", + "builtins.Context.divide" => "Decimal division in a specified context.\n\n>>> ExtendedContext.divide(Decimal('1'), Decimal('3'))\nDecimal('0.333333333')\n>>> ExtendedContext.divide(Decimal('2'), Decimal('3'))\nDecimal('0.666666667')\n>>> ExtendedContext.divide(Decimal('5'), Decimal('2'))\nDecimal('2.5')\n>>> ExtendedContext.divide(Decimal('1'), Decimal('10'))\nDecimal('0.1')\n>>> ExtendedContext.divide(Decimal('12'), Decimal('12'))\nDecimal('1')\n>>> ExtendedContext.divide(Decimal('8.00'), Decimal('2'))\nDecimal('4.00')\n>>> ExtendedContext.divide(Decimal('2.400'), Decimal('2.0'))\nDecimal('1.20')\n>>> ExtendedContext.divide(Decimal('1000'), Decimal('100'))\nDecimal('10')\n>>> ExtendedContext.divide(Decimal('1000'), Decimal('1'))\nDecimal('1000')\n>>> ExtendedContext.divide(Decimal('2.40E+6'), Decimal('2'))\nDecimal('1.20E+6')\n>>> ExtendedContext.divide(5, 5)\nDecimal('1')\n>>> ExtendedContext.divide(Decimal(5), 5)\nDecimal('1')\n>>> ExtendedContext.divide(5, Decimal(5))\nDecimal('1')", + "builtins.Context.divide_int" => "Divides two numbers and returns the integer part of the result.\n\n>>> ExtendedContext.divide_int(Decimal('2'), Decimal('3'))\nDecimal('0')\n>>> ExtendedContext.divide_int(Decimal('10'), Decimal('3'))\nDecimal('3')\n>>> ExtendedContext.divide_int(Decimal('1'), Decimal('0.3'))\nDecimal('3')\n>>> ExtendedContext.divide_int(10, 3)\nDecimal('3')\n>>> ExtendedContext.divide_int(Decimal(10), 3)\nDecimal('3')\n>>> ExtendedContext.divide_int(10, Decimal(3))\nDecimal('3')", + "builtins.Context.divmod" => "Return (a // b, a % b).\n\n>>> ExtendedContext.divmod(Decimal(8), Decimal(3))\n(Decimal('2'), Decimal('2'))\n>>> ExtendedContext.divmod(Decimal(8), Decimal(4))\n(Decimal('2'), Decimal('0'))\n>>> ExtendedContext.divmod(8, 4)\n(Decimal('2'), Decimal('0'))\n>>> ExtendedContext.divmod(Decimal(8), 4)\n(Decimal('2'), Decimal('0'))\n>>> ExtendedContext.divmod(8, Decimal(4))\n(Decimal('2'), Decimal('0'))", + "builtins.Context.exp" => "Returns e ** a.\n\n>>> c = ExtendedContext.copy()\n>>> c.Emin = -999\n>>> c.Emax = 999\n>>> c.exp(Decimal('-Infinity'))\nDecimal('0')\n>>> c.exp(Decimal('-1'))\nDecimal('0.367879441')\n>>> c.exp(Decimal('0'))\nDecimal('1')\n>>> c.exp(Decimal('1'))\nDecimal('2.71828183')\n>>> c.exp(Decimal('0.693147181'))\nDecimal('2.00000000')\n>>> c.exp(Decimal('+Infinity'))\nDecimal('Infinity')\n>>> c.exp(10)\nDecimal('22026.4658')", + "builtins.Context.fma" => "Returns a multiplied by b, plus c.\n\nThe first two operands are multiplied together, using multiply,\nthe third operand is then added to the result of that\nmultiplication, using add, all with only one final rounding.\n\n>>> ExtendedContext.fma(Decimal('3'), Decimal('5'), Decimal('7'))\nDecimal('22')\n>>> ExtendedContext.fma(Decimal('3'), Decimal('-5'), Decimal('7'))\nDecimal('-8')\n>>> ExtendedContext.fma(Decimal('888565290'), Decimal('1557.96930'), Decimal('-86087.7578'))\nDecimal('1.38435736E+12')\n>>> ExtendedContext.fma(1, 3, 4)\nDecimal('7')\n>>> ExtendedContext.fma(1, Decimal(3), 4)\nDecimal('7')\n>>> ExtendedContext.fma(1, 3, Decimal(4))\nDecimal('7')", + "builtins.Context.get" => "Return the value for `key` if `key` has the value in the context object.\n\nIf `key` does not exist, return `default`. If `default` is not\ngiven, return None.", + "builtins.Context.is_canonical" => "Return True if the operand is canonical; otherwise return False.\n\nCurrently, the encoding of a Decimal instance is always\ncanonical, so this method returns True for any Decimal.\n\n>>> ExtendedContext.is_canonical(Decimal('2.50'))\nTrue", + "builtins.Context.is_finite" => "Return True if the operand is finite; otherwise return False.\n\nA Decimal instance is considered finite if it is neither\ninfinite nor a NaN.\n\n>>> ExtendedContext.is_finite(Decimal('2.50'))\nTrue\n>>> ExtendedContext.is_finite(Decimal('-0.3'))\nTrue\n>>> ExtendedContext.is_finite(Decimal('0'))\nTrue\n>>> ExtendedContext.is_finite(Decimal('Inf'))\nFalse\n>>> ExtendedContext.is_finite(Decimal('NaN'))\nFalse\n>>> ExtendedContext.is_finite(1)\nTrue", + "builtins.Context.is_infinite" => "Return True if the operand is infinite; otherwise return False.\n\n>>> ExtendedContext.is_infinite(Decimal('2.50'))\nFalse\n>>> ExtendedContext.is_infinite(Decimal('-Inf'))\nTrue\n>>> ExtendedContext.is_infinite(Decimal('NaN'))\nFalse\n>>> ExtendedContext.is_infinite(1)\nFalse", + "builtins.Context.is_nan" => "Return True if the operand is a qNaN or sNaN;\notherwise return False.\n\n>>> ExtendedContext.is_nan(Decimal('2.50'))\nFalse\n>>> ExtendedContext.is_nan(Decimal('NaN'))\nTrue\n>>> ExtendedContext.is_nan(Decimal('-sNaN'))\nTrue\n>>> ExtendedContext.is_nan(1)\nFalse", + "builtins.Context.is_normal" => "Return True if the operand is a normal number;\notherwise return False.\n\n>>> c = ExtendedContext.copy()\n>>> c.Emin = -999\n>>> c.Emax = 999\n>>> c.is_normal(Decimal('2.50'))\nTrue\n>>> c.is_normal(Decimal('0.1E-999'))\nFalse\n>>> c.is_normal(Decimal('0.00'))\nFalse\n>>> c.is_normal(Decimal('-Inf'))\nFalse\n>>> c.is_normal(Decimal('NaN'))\nFalse\n>>> c.is_normal(1)\nTrue", + "builtins.Context.is_qnan" => "Return True if the operand is a quiet NaN; otherwise return False.\n\n>>> ExtendedContext.is_qnan(Decimal('2.50'))\nFalse\n>>> ExtendedContext.is_qnan(Decimal('NaN'))\nTrue\n>>> ExtendedContext.is_qnan(Decimal('sNaN'))\nFalse\n>>> ExtendedContext.is_qnan(1)\nFalse", + "builtins.Context.is_signed" => "Return True if the operand is negative; otherwise return False.\n\n>>> ExtendedContext.is_signed(Decimal('2.50'))\nFalse\n>>> ExtendedContext.is_signed(Decimal('-12'))\nTrue\n>>> ExtendedContext.is_signed(Decimal('-0'))\nTrue\n>>> ExtendedContext.is_signed(8)\nFalse\n>>> ExtendedContext.is_signed(-8)\nTrue", + "builtins.Context.is_snan" => "Return True if the operand is a signaling NaN;\notherwise return False.\n\n>>> ExtendedContext.is_snan(Decimal('2.50'))\nFalse\n>>> ExtendedContext.is_snan(Decimal('NaN'))\nFalse\n>>> ExtendedContext.is_snan(Decimal('sNaN'))\nTrue\n>>> ExtendedContext.is_snan(1)\nFalse", + "builtins.Context.is_subnormal" => "Return True if the operand is subnormal; otherwise return False.\n\n>>> c = ExtendedContext.copy()\n>>> c.Emin = -999\n>>> c.Emax = 999\n>>> c.is_subnormal(Decimal('2.50'))\nFalse\n>>> c.is_subnormal(Decimal('0.1E-999'))\nTrue\n>>> c.is_subnormal(Decimal('0.00'))\nFalse\n>>> c.is_subnormal(Decimal('-Inf'))\nFalse\n>>> c.is_subnormal(Decimal('NaN'))\nFalse\n>>> c.is_subnormal(1)\nFalse", + "builtins.Context.is_zero" => "Return True if the operand is a zero; otherwise return False.\n\n>>> ExtendedContext.is_zero(Decimal('0'))\nTrue\n>>> ExtendedContext.is_zero(Decimal('2.50'))\nFalse\n>>> ExtendedContext.is_zero(Decimal('-0E+2'))\nTrue\n>>> ExtendedContext.is_zero(1)\nFalse\n>>> ExtendedContext.is_zero(0)\nTrue", + "builtins.Context.items" => "Return all variables and their values in the context object.\n\nThe result is returned as a list of 2-tuples (variable, value).", + "builtins.Context.keys" => "Return a list of all variables in the context object.", + "builtins.Context.ln" => "Returns the natural (base e) logarithm of the operand.\n\n>>> c = ExtendedContext.copy()\n>>> c.Emin = -999\n>>> c.Emax = 999\n>>> c.ln(Decimal('0'))\nDecimal('-Infinity')\n>>> c.ln(Decimal('1.000'))\nDecimal('0')\n>>> c.ln(Decimal('2.71828183'))\nDecimal('1.00000000')\n>>> c.ln(Decimal('10'))\nDecimal('2.30258509')\n>>> c.ln(Decimal('+Infinity'))\nDecimal('Infinity')\n>>> c.ln(1)\nDecimal('0')", + "builtins.Context.log10" => "Returns the base 10 logarithm of the operand.\n\n>>> c = ExtendedContext.copy()\n>>> c.Emin = -999\n>>> c.Emax = 999\n>>> c.log10(Decimal('0'))\nDecimal('-Infinity')\n>>> c.log10(Decimal('0.001'))\nDecimal('-3')\n>>> c.log10(Decimal('1.000'))\nDecimal('0')\n>>> c.log10(Decimal('2'))\nDecimal('0.301029996')\n>>> c.log10(Decimal('10'))\nDecimal('1')\n>>> c.log10(Decimal('70'))\nDecimal('1.84509804')\n>>> c.log10(Decimal('+Infinity'))\nDecimal('Infinity')\n>>> c.log10(0)\nDecimal('-Infinity')\n>>> c.log10(1)\nDecimal('0')", + "builtins.Context.logb" => "Returns the exponent of the magnitude of the operand's MSD.\n\nThe result is the integer which is the exponent of the magnitude\nof the most significant digit of the operand (as though the\noperand were truncated to a single digit while maintaining the\nvalue of that digit and without limiting the resulting exponent).\n\n>>> ExtendedContext.logb(Decimal('250'))\nDecimal('2')\n>>> ExtendedContext.logb(Decimal('2.50'))\nDecimal('0')\n>>> ExtendedContext.logb(Decimal('0.03'))\nDecimal('-2')\n>>> ExtendedContext.logb(Decimal('0'))\nDecimal('-Infinity')\n>>> ExtendedContext.logb(1)\nDecimal('0')\n>>> ExtendedContext.logb(10)\nDecimal('1')\n>>> ExtendedContext.logb(100)\nDecimal('2')", + "builtins.Context.logical_and" => "Applies the logical operation 'and' between each operand's digits.\n\nThe operands must be both logical numbers.\n\n>>> ExtendedContext.logical_and(Decimal('0'), Decimal('0'))\nDecimal('0')\n>>> ExtendedContext.logical_and(Decimal('0'), Decimal('1'))\nDecimal('0')\n>>> ExtendedContext.logical_and(Decimal('1'), Decimal('0'))\nDecimal('0')\n>>> ExtendedContext.logical_and(Decimal('1'), Decimal('1'))\nDecimal('1')\n>>> ExtendedContext.logical_and(Decimal('1100'), Decimal('1010'))\nDecimal('1000')\n>>> ExtendedContext.logical_and(Decimal('1111'), Decimal('10'))\nDecimal('10')\n>>> ExtendedContext.logical_and(110, 1101)\nDecimal('100')\n>>> ExtendedContext.logical_and(Decimal(110), 1101)\nDecimal('100')\n>>> ExtendedContext.logical_and(110, Decimal(1101))\nDecimal('100')", + "builtins.Context.logical_invert" => "Invert all the digits in the operand.\n\nThe operand must be a logical number.\n\n>>> ExtendedContext.logical_invert(Decimal('0'))\nDecimal('111111111')\n>>> ExtendedContext.logical_invert(Decimal('1'))\nDecimal('111111110')\n>>> ExtendedContext.logical_invert(Decimal('111111111'))\nDecimal('0')\n>>> ExtendedContext.logical_invert(Decimal('101010101'))\nDecimal('10101010')\n>>> ExtendedContext.logical_invert(1101)\nDecimal('111110010')", + "builtins.Context.logical_or" => "Applies the logical operation 'or' between each operand's digits.\n\nThe operands must be both logical numbers.\n\n>>> ExtendedContext.logical_or(Decimal('0'), Decimal('0'))\nDecimal('0')\n>>> ExtendedContext.logical_or(Decimal('0'), Decimal('1'))\nDecimal('1')\n>>> ExtendedContext.logical_or(Decimal('1'), Decimal('0'))\nDecimal('1')\n>>> ExtendedContext.logical_or(Decimal('1'), Decimal('1'))\nDecimal('1')\n>>> ExtendedContext.logical_or(Decimal('1100'), Decimal('1010'))\nDecimal('1110')\n>>> ExtendedContext.logical_or(Decimal('1110'), Decimal('10'))\nDecimal('1110')\n>>> ExtendedContext.logical_or(110, 1101)\nDecimal('1111')\n>>> ExtendedContext.logical_or(Decimal(110), 1101)\nDecimal('1111')\n>>> ExtendedContext.logical_or(110, Decimal(1101))\nDecimal('1111')", + "builtins.Context.logical_xor" => "Applies the logical operation 'xor' between each operand's digits.\n\nThe operands must be both logical numbers.\n\n>>> ExtendedContext.logical_xor(Decimal('0'), Decimal('0'))\nDecimal('0')\n>>> ExtendedContext.logical_xor(Decimal('0'), Decimal('1'))\nDecimal('1')\n>>> ExtendedContext.logical_xor(Decimal('1'), Decimal('0'))\nDecimal('1')\n>>> ExtendedContext.logical_xor(Decimal('1'), Decimal('1'))\nDecimal('0')\n>>> ExtendedContext.logical_xor(Decimal('1100'), Decimal('1010'))\nDecimal('110')\n>>> ExtendedContext.logical_xor(Decimal('1111'), Decimal('10'))\nDecimal('1101')\n>>> ExtendedContext.logical_xor(110, 1101)\nDecimal('1011')\n>>> ExtendedContext.logical_xor(Decimal(110), 1101)\nDecimal('1011')\n>>> ExtendedContext.logical_xor(110, Decimal(1101))\nDecimal('1011')", + "builtins.Context.max" => "max compares two values numerically and returns the maximum.\n\nIf either operand is a NaN then the general rules apply.\nOtherwise, the operands are compared as though by the compare\noperation. If they are numerically equal then the left-hand operand\nis chosen as the result. Otherwise the maximum (closer to positive\ninfinity) of the two operands is chosen as the result.\n\n>>> ExtendedContext.max(Decimal('3'), Decimal('2'))\nDecimal('3')\n>>> ExtendedContext.max(Decimal('-10'), Decimal('3'))\nDecimal('3')\n>>> ExtendedContext.max(Decimal('1.0'), Decimal('1'))\nDecimal('1')\n>>> ExtendedContext.max(Decimal('7'), Decimal('NaN'))\nDecimal('7')\n>>> ExtendedContext.max(1, 2)\nDecimal('2')\n>>> ExtendedContext.max(Decimal(1), 2)\nDecimal('2')\n>>> ExtendedContext.max(1, Decimal(2))\nDecimal('2')", + "builtins.Context.max_mag" => "Compares the values numerically with their sign ignored.\n\n>>> ExtendedContext.max_mag(Decimal('7'), Decimal('NaN'))\nDecimal('7')\n>>> ExtendedContext.max_mag(Decimal('7'), Decimal('-10'))\nDecimal('-10')\n>>> ExtendedContext.max_mag(1, -2)\nDecimal('-2')\n>>> ExtendedContext.max_mag(Decimal(1), -2)\nDecimal('-2')\n>>> ExtendedContext.max_mag(1, Decimal(-2))\nDecimal('-2')", + "builtins.Context.min" => "min compares two values numerically and returns the minimum.\n\nIf either operand is a NaN then the general rules apply.\nOtherwise, the operands are compared as though by the compare\noperation. If they are numerically equal then the left-hand operand\nis chosen as the result. Otherwise the minimum (closer to negative\ninfinity) of the two operands is chosen as the result.\n\n>>> ExtendedContext.min(Decimal('3'), Decimal('2'))\nDecimal('2')\n>>> ExtendedContext.min(Decimal('-10'), Decimal('3'))\nDecimal('-10')\n>>> ExtendedContext.min(Decimal('1.0'), Decimal('1'))\nDecimal('1.0')\n>>> ExtendedContext.min(Decimal('7'), Decimal('NaN'))\nDecimal('7')\n>>> ExtendedContext.min(1, 2)\nDecimal('1')\n>>> ExtendedContext.min(Decimal(1), 2)\nDecimal('1')\n>>> ExtendedContext.min(1, Decimal(29))\nDecimal('1')", + "builtins.Context.min_mag" => "Compares the values numerically with their sign ignored.\n\n>>> ExtendedContext.min_mag(Decimal('3'), Decimal('-2'))\nDecimal('-2')\n>>> ExtendedContext.min_mag(Decimal('-3'), Decimal('NaN'))\nDecimal('-3')\n>>> ExtendedContext.min_mag(1, -2)\nDecimal('1')\n>>> ExtendedContext.min_mag(Decimal(1), -2)\nDecimal('1')\n>>> ExtendedContext.min_mag(1, Decimal(-2))\nDecimal('1')", + "builtins.Context.minus" => "Minus corresponds to unary prefix minus in Python.\n\nThe operation is evaluated using the same rules as subtract; the\noperation minus(a) is calculated as subtract('0', a) where the '0'\nhas the same exponent as the operand.\n\n>>> ExtendedContext.minus(Decimal('1.3'))\nDecimal('-1.3')\n>>> ExtendedContext.minus(Decimal('-1.3'))\nDecimal('1.3')\n>>> ExtendedContext.minus(1)\nDecimal('-1')", + "builtins.Context.multiply" => "multiply multiplies two operands.\n\nIf either operand is a special value then the general rules apply.\nOtherwise, the operands are multiplied together\n('long multiplication'), resulting in a number which may be as long\nas the sum of the lengths of the two operands.\n\n>>> ExtendedContext.multiply(Decimal('1.20'), Decimal('3'))\nDecimal('3.60')\n>>> ExtendedContext.multiply(Decimal('7'), Decimal('3'))\nDecimal('21')\n>>> ExtendedContext.multiply(Decimal('0.9'), Decimal('0.8'))\nDecimal('0.72')\n>>> ExtendedContext.multiply(Decimal('0.9'), Decimal('-0'))\nDecimal('-0.0')\n>>> ExtendedContext.multiply(Decimal('654321'), Decimal('654321'))\nDecimal('4.28135971E+11')\n>>> ExtendedContext.multiply(7, 7)\nDecimal('49')\n>>> ExtendedContext.multiply(Decimal(7), 7)\nDecimal('49')\n>>> ExtendedContext.multiply(7, Decimal(7))\nDecimal('49')", + "builtins.Context.next_minus" => "Returns the largest representable number smaller than a.\n\n>>> c = ExtendedContext.copy()\n>>> c.Emin = -999\n>>> c.Emax = 999\n>>> ExtendedContext.next_minus(Decimal('1'))\nDecimal('0.999999999')\n>>> c.next_minus(Decimal('1E-1007'))\nDecimal('0E-1007')\n>>> ExtendedContext.next_minus(Decimal('-1.00000003'))\nDecimal('-1.00000004')\n>>> c.next_minus(Decimal('Infinity'))\nDecimal('9.99999999E+999')\n>>> c.next_minus(1)\nDecimal('0.999999999')", + "builtins.Context.next_plus" => "Returns the smallest representable number larger than a.\n\n>>> c = ExtendedContext.copy()\n>>> c.Emin = -999\n>>> c.Emax = 999\n>>> ExtendedContext.next_plus(Decimal('1'))\nDecimal('1.00000001')\n>>> c.next_plus(Decimal('-1E-1007'))\nDecimal('-0E-1007')\n>>> ExtendedContext.next_plus(Decimal('-1.00000003'))\nDecimal('-1.00000002')\n>>> c.next_plus(Decimal('-Infinity'))\nDecimal('-9.99999999E+999')\n>>> c.next_plus(1)\nDecimal('1.00000001')", + "builtins.Context.next_toward" => "Returns the number closest to a, in direction towards b.\n\nThe result is the closest representable number from the first\noperand (but not the first operand) that is in the direction\ntowards the second operand, unless the operands have the same\nvalue.\n\n>>> c = ExtendedContext.copy()\n>>> c.Emin = -999\n>>> c.Emax = 999\n>>> c.next_toward(Decimal('1'), Decimal('2'))\nDecimal('1.00000001')\n>>> c.next_toward(Decimal('-1E-1007'), Decimal('1'))\nDecimal('-0E-1007')\n>>> c.next_toward(Decimal('-1.00000003'), Decimal('0'))\nDecimal('-1.00000002')\n>>> c.next_toward(Decimal('1'), Decimal('0'))\nDecimal('0.999999999')\n>>> c.next_toward(Decimal('1E-1007'), Decimal('-100'))\nDecimal('0E-1007')\n>>> c.next_toward(Decimal('-1.00000003'), Decimal('-10'))\nDecimal('-1.00000004')\n>>> c.next_toward(Decimal('0.00'), Decimal('-0.0000'))\nDecimal('-0.00')\n>>> c.next_toward(0, 1)\nDecimal('1E-1007')\n>>> c.next_toward(Decimal(0), 1)\nDecimal('1E-1007')\n>>> c.next_toward(0, Decimal(1))\nDecimal('1E-1007')", + "builtins.Context.normalize" => "normalize reduces an operand to its simplest form.\n\nEssentially a plus operation with all trailing zeros removed from the\nresult.\n\n>>> ExtendedContext.normalize(Decimal('2.1'))\nDecimal('2.1')\n>>> ExtendedContext.normalize(Decimal('-2.0'))\nDecimal('-2')\n>>> ExtendedContext.normalize(Decimal('1.200'))\nDecimal('1.2')\n>>> ExtendedContext.normalize(Decimal('-120'))\nDecimal('-1.2E+2')\n>>> ExtendedContext.normalize(Decimal('120.00'))\nDecimal('1.2E+2')\n>>> ExtendedContext.normalize(Decimal('0.00'))\nDecimal('0')\n>>> ExtendedContext.normalize(6)\nDecimal('6')", + "builtins.Context.number_class" => "Returns an indication of the class of the operand.\n\nThe class is one of the following strings:\n -sNaN\n -NaN\n -Infinity\n -Normal\n -Subnormal\n -Zero\n +Zero\n +Subnormal\n +Normal\n +Infinity\n\n>>> c = ExtendedContext.copy()\n>>> c.Emin = -999\n>>> c.Emax = 999\n>>> c.number_class(Decimal('Infinity'))\n'+Infinity'\n>>> c.number_class(Decimal('1E-10'))\n'+Normal'\n>>> c.number_class(Decimal('2.50'))\n'+Normal'\n>>> c.number_class(Decimal('0.1E-999'))\n'+Subnormal'\n>>> c.number_class(Decimal('0'))\n'+Zero'\n>>> c.number_class(Decimal('-0'))\n'-Zero'\n>>> c.number_class(Decimal('-0.1E-999'))\n'-Subnormal'\n>>> c.number_class(Decimal('-1E-10'))\n'-Normal'\n>>> c.number_class(Decimal('-2.50'))\n'-Normal'\n>>> c.number_class(Decimal('-Infinity'))\n'-Infinity'\n>>> c.number_class(Decimal('NaN'))\n'NaN'\n>>> c.number_class(Decimal('-NaN'))\n'NaN'\n>>> c.number_class(Decimal('sNaN'))\n'sNaN'\n>>> c.number_class(123)\n'+Normal'", + "builtins.Context.plus" => "Plus corresponds to unary prefix plus in Python.\n\nThe operation is evaluated using the same rules as add; the\noperation plus(a) is calculated as add('0', a) where the '0'\nhas the same exponent as the operand.\n\n>>> ExtendedContext.plus(Decimal('1.3'))\nDecimal('1.3')\n>>> ExtendedContext.plus(Decimal('-1.3'))\nDecimal('-1.3')\n>>> ExtendedContext.plus(-1)\nDecimal('-1')", + "builtins.Context.power" => "Raises a to the power of b, to modulo if given.\n\nWith two arguments, compute a**b. If a is negative then b\nmust be integral. The result will be inexact unless b is\nintegral and the result is finite and can be expressed exactly\nin 'precision' digits.\n\nWith three arguments, compute (a**b) % modulo. For the\nthree argument form, the following restrictions on the\narguments hold:\n\n - all three arguments must be integral\n - b must be nonnegative\n - at least one of a or b must be nonzero\n - modulo must be nonzero and have at most 'precision' digits\n\nThe result of pow(a, b, modulo) is identical to the result\nthat would be obtained by computing (a**b) % modulo with\nunbounded precision, but is computed more efficiently. It is\nalways exact.\n\n>>> c = ExtendedContext.copy()\n>>> c.Emin = -999\n>>> c.Emax = 999\n>>> c.power(Decimal('2'), Decimal('3'))\nDecimal('8')\n>>> c.power(Decimal('-2'), Decimal('3'))\nDecimal('-8')\n>>> c.power(Decimal('2'), Decimal('-3'))\nDecimal('0.125')\n>>> c.power(Decimal('1.7'), Decimal('8'))\nDecimal('69.7575744')\n>>> c.power(Decimal('10'), Decimal('0.301029996'))\nDecimal('2.00000000')\n>>> c.power(Decimal('Infinity'), Decimal('-1'))\nDecimal('0')\n>>> c.power(Decimal('Infinity'), Decimal('0'))\nDecimal('1')\n>>> c.power(Decimal('Infinity'), Decimal('1'))\nDecimal('Infinity')\n>>> c.power(Decimal('-Infinity'), Decimal('-1'))\nDecimal('-0')\n>>> c.power(Decimal('-Infinity'), Decimal('0'))\nDecimal('1')\n>>> c.power(Decimal('-Infinity'), Decimal('1'))\nDecimal('-Infinity')\n>>> c.power(Decimal('-Infinity'), Decimal('2'))\nDecimal('Infinity')\n>>> c.power(Decimal('0'), Decimal('0'))\nDecimal('NaN')\n\n>>> c.power(Decimal('3'), Decimal('7'), Decimal('16'))\nDecimal('11')\n>>> c.power(Decimal('-3'), Decimal('7'), Decimal('16'))\nDecimal('-11')\n>>> c.power(Decimal('-3'), Decimal('8'), Decimal('16'))\nDecimal('1')\n>>> c.power(Decimal('3'), Decimal('7'), Decimal('-16'))\nDecimal('11')\n>>> c.power(Decimal('23E12345'), Decimal('67E189'), Decimal('123456789'))\nDecimal('11729830')\n>>> c.power(Decimal('-0'), Decimal('17'), Decimal('1729'))\nDecimal('-0')\n>>> c.power(Decimal('-23'), Decimal('0'), Decimal('65537'))\nDecimal('1')\n>>> ExtendedContext.power(7, 7)\nDecimal('823543')\n>>> ExtendedContext.power(Decimal(7), 7)\nDecimal('823543')\n>>> ExtendedContext.power(7, Decimal(7), 2)\nDecimal('1')", + "builtins.Context.quantize" => "Returns a value equal to 'a' (rounded), having the exponent of 'b'.\n\nThe coefficient of the result is derived from that of the left-hand\noperand. It may be rounded using the current rounding setting (if\nthe exponent is being increased), multiplied by a positive power of\nten (if the exponent is being decreased), or is unchanged (if the\nexponent is already equal to that of the right-hand operand).\n\nUnlike other operations, if the length of the coefficient after the\nquantize operation would be greater than precision then an Invalid\noperation condition is raised. This guarantees that, unless there\nis an error condition, the exponent of the result of a quantize is\nalways equal to that of the right-hand operand.\n\nAlso unlike other operations, quantize will never raise Underflow,\neven if the result is subnormal and inexact.\n\n>>> ExtendedContext.quantize(Decimal('2.17'), Decimal('0.001'))\nDecimal('2.170')\n>>> ExtendedContext.quantize(Decimal('2.17'), Decimal('0.01'))\nDecimal('2.17')\n>>> ExtendedContext.quantize(Decimal('2.17'), Decimal('0.1'))\nDecimal('2.2')\n>>> ExtendedContext.quantize(Decimal('2.17'), Decimal('1e+0'))\nDecimal('2')\n>>> ExtendedContext.quantize(Decimal('2.17'), Decimal('1e+1'))\nDecimal('0E+1')\n>>> ExtendedContext.quantize(Decimal('-Inf'), Decimal('Infinity'))\nDecimal('-Infinity')\n>>> ExtendedContext.quantize(Decimal('2'), Decimal('Infinity'))\nDecimal('NaN')\n>>> ExtendedContext.quantize(Decimal('-0.1'), Decimal('1'))\nDecimal('-0')\n>>> ExtendedContext.quantize(Decimal('-0'), Decimal('1e+5'))\nDecimal('-0E+5')\n>>> ExtendedContext.quantize(Decimal('+35236450.6'), Decimal('1e-2'))\nDecimal('NaN')\n>>> ExtendedContext.quantize(Decimal('-35236450.6'), Decimal('1e-2'))\nDecimal('NaN')\n>>> ExtendedContext.quantize(Decimal('217'), Decimal('1e-1'))\nDecimal('217.0')\n>>> ExtendedContext.quantize(Decimal('217'), Decimal('1e-0'))\nDecimal('217')\n>>> ExtendedContext.quantize(Decimal('217'), Decimal('1e+1'))\nDecimal('2.2E+2')\n>>> ExtendedContext.quantize(Decimal('217'), Decimal('1e+2'))\nDecimal('2E+2')\n>>> ExtendedContext.quantize(1, 2)\nDecimal('1')\n>>> ExtendedContext.quantize(Decimal(1), 2)\nDecimal('1')\n>>> ExtendedContext.quantize(1, Decimal(2))\nDecimal('1')", + "builtins.Context.radix" => "Just returns 10, as this is Decimal, :)\n\n>>> ExtendedContext.radix()\nDecimal('10')", + "builtins.Context.remainder" => "Returns the remainder from integer division.\n\nThe result is the residue of the dividend after the operation of\ncalculating integer division as described for divide-integer,\nrounded to precision digits if necessary. The sign of the result,\nif non-zero, is the same as that of the original dividend.\n\nThis operation will fail under the same conditions as integer\ndivision (that is, if integer division on the same two operands\nwould fail, the remainder cannot be calculated).\n\n>>> ExtendedContext.remainder(Decimal('2.1'), Decimal('3'))\nDecimal('2.1')\n>>> ExtendedContext.remainder(Decimal('10'), Decimal('3'))\nDecimal('1')\n>>> ExtendedContext.remainder(Decimal('-10'), Decimal('3'))\nDecimal('-1')\n>>> ExtendedContext.remainder(Decimal('10.2'), Decimal('1'))\nDecimal('0.2')\n>>> ExtendedContext.remainder(Decimal('10'), Decimal('0.3'))\nDecimal('0.1')\n>>> ExtendedContext.remainder(Decimal('3.6'), Decimal('1.3'))\nDecimal('1.0')\n>>> ExtendedContext.remainder(22, 6)\nDecimal('4')\n>>> ExtendedContext.remainder(Decimal(22), 6)\nDecimal('4')\n>>> ExtendedContext.remainder(22, Decimal(6))\nDecimal('4')", + "builtins.Context.remainder_near" => "Returns to be \"a - b * n\", where n is the integer nearest the exact\nvalue of \"x / b\" (if two integers are equally near then the even one\nis chosen). If the result is equal to 0 then its sign will be the\nsign of a.\n\nThis operation will fail under the same conditions as integer\ndivision (that is, if integer division on the same two operands\nwould fail, the remainder cannot be calculated).\n\n>>> ExtendedContext.remainder_near(Decimal('2.1'), Decimal('3'))\nDecimal('-0.9')\n>>> ExtendedContext.remainder_near(Decimal('10'), Decimal('6'))\nDecimal('-2')\n>>> ExtendedContext.remainder_near(Decimal('10'), Decimal('3'))\nDecimal('1')\n>>> ExtendedContext.remainder_near(Decimal('-10'), Decimal('3'))\nDecimal('-1')\n>>> ExtendedContext.remainder_near(Decimal('10.2'), Decimal('1'))\nDecimal('0.2')\n>>> ExtendedContext.remainder_near(Decimal('10'), Decimal('0.3'))\nDecimal('0.1')\n>>> ExtendedContext.remainder_near(Decimal('3.6'), Decimal('1.3'))\nDecimal('-0.3')\n>>> ExtendedContext.remainder_near(3, 11)\nDecimal('3')\n>>> ExtendedContext.remainder_near(Decimal(3), 11)\nDecimal('3')\n>>> ExtendedContext.remainder_near(3, Decimal(11))\nDecimal('3')", + "builtins.Context.rotate" => "Returns a rotated copy of a, b times.\n\nThe coefficient of the result is a rotated copy of the digits in\nthe coefficient of the first operand. The number of places of\nrotation is taken from the absolute value of the second operand,\nwith the rotation being to the left if the second operand is\npositive or to the right otherwise.\n\n>>> ExtendedContext.rotate(Decimal('34'), Decimal('8'))\nDecimal('400000003')\n>>> ExtendedContext.rotate(Decimal('12'), Decimal('9'))\nDecimal('12')\n>>> ExtendedContext.rotate(Decimal('123456789'), Decimal('-2'))\nDecimal('891234567')\n>>> ExtendedContext.rotate(Decimal('123456789'), Decimal('0'))\nDecimal('123456789')\n>>> ExtendedContext.rotate(Decimal('123456789'), Decimal('+2'))\nDecimal('345678912')\n>>> ExtendedContext.rotate(1333333, 1)\nDecimal('13333330')\n>>> ExtendedContext.rotate(Decimal(1333333), 1)\nDecimal('13333330')\n>>> ExtendedContext.rotate(1333333, Decimal(1))\nDecimal('13333330')", + "builtins.Context.same_quantum" => "Returns True if the two operands have the same exponent.\n\nThe result is never affected by either the sign or the coefficient\nof either operand.\n\n>>> ExtendedContext.same_quantum(Decimal('2.17'), Decimal('0.001'))\nFalse\n>>> ExtendedContext.same_quantum(Decimal('2.17'), Decimal('0.01'))\nTrue\n>>> ExtendedContext.same_quantum(Decimal('2.17'), Decimal('1'))\nFalse\n>>> ExtendedContext.same_quantum(Decimal('Inf'), Decimal('-Inf'))\nTrue\n>>> ExtendedContext.same_quantum(10000, -1)\nTrue\n>>> ExtendedContext.same_quantum(Decimal(10000), -1)\nTrue\n>>> ExtendedContext.same_quantum(10000, Decimal(-1))\nTrue", + "builtins.Context.scaleb" => "Returns the first operand after adding the second value its exp.\n\n>>> ExtendedContext.scaleb(Decimal('7.50'), Decimal('-2'))\nDecimal('0.0750')\n>>> ExtendedContext.scaleb(Decimal('7.50'), Decimal('0'))\nDecimal('7.50')\n>>> ExtendedContext.scaleb(Decimal('7.50'), Decimal('3'))\nDecimal('7.50E+3')\n>>> ExtendedContext.scaleb(1, 4)\nDecimal('1E+4')\n>>> ExtendedContext.scaleb(Decimal(1), 4)\nDecimal('1E+4')\n>>> ExtendedContext.scaleb(1, Decimal(4))\nDecimal('1E+4')", + "builtins.Context.shift" => "Returns a shifted copy of a, b times.\n\nThe coefficient of the result is a shifted copy of the digits\nin the coefficient of the first operand. The number of places\nto shift is taken from the absolute value of the second operand,\nwith the shift being to the left if the second operand is\npositive or to the right otherwise. Digits shifted into the\ncoefficient are zeros.\n\n>>> ExtendedContext.shift(Decimal('34'), Decimal('8'))\nDecimal('400000000')\n>>> ExtendedContext.shift(Decimal('12'), Decimal('9'))\nDecimal('0')\n>>> ExtendedContext.shift(Decimal('123456789'), Decimal('-2'))\nDecimal('1234567')\n>>> ExtendedContext.shift(Decimal('123456789'), Decimal('0'))\nDecimal('123456789')\n>>> ExtendedContext.shift(Decimal('123456789'), Decimal('+2'))\nDecimal('345678900')\n>>> ExtendedContext.shift(88888888, 2)\nDecimal('888888800')\n>>> ExtendedContext.shift(Decimal(88888888), 2)\nDecimal('888888800')\n>>> ExtendedContext.shift(88888888, Decimal(2))\nDecimal('888888800')", + "builtins.Context.sqrt" => "Square root of a non-negative number to context precision.\n\nIf the result must be inexact, it is rounded using the\nround-half-even algorithm.\n\n>>> ExtendedContext.sqrt(Decimal('0'))\nDecimal('0')\n>>> ExtendedContext.sqrt(Decimal('-0'))\nDecimal('-0')\n>>> ExtendedContext.sqrt(Decimal('0.39'))\nDecimal('0.624499800')\n>>> ExtendedContext.sqrt(Decimal('100'))\nDecimal('10')\n>>> ExtendedContext.sqrt(Decimal('1'))\nDecimal('1')\n>>> ExtendedContext.sqrt(Decimal('1.0'))\nDecimal('1.0')\n>>> ExtendedContext.sqrt(Decimal('1.00'))\nDecimal('1.0')\n>>> ExtendedContext.sqrt(Decimal('7'))\nDecimal('2.64575131')\n>>> ExtendedContext.sqrt(Decimal('10'))\nDecimal('3.16227766')\n>>> ExtendedContext.sqrt(2)\nDecimal('1.41421356')\n>>> ExtendedContext.prec\n9", + "builtins.Context.subtract" => "Return the difference between the two operands.\n\n>>> ExtendedContext.subtract(Decimal('1.3'), Decimal('1.07'))\nDecimal('0.23')\n>>> ExtendedContext.subtract(Decimal('1.3'), Decimal('1.30'))\nDecimal('0.00')\n>>> ExtendedContext.subtract(Decimal('1.3'), Decimal('2.07'))\nDecimal('-0.77')\n>>> ExtendedContext.subtract(8, 5)\nDecimal('3')\n>>> ExtendedContext.subtract(Decimal(8), 5)\nDecimal('3')\n>>> ExtendedContext.subtract(8, Decimal(5))\nDecimal('3')", + "builtins.Context.to_eng_string" => "Convert to a string, using engineering notation if an exponent is needed.\n\nEngineering notation has an exponent which is a multiple of 3. This\ncan leave up to 3 digits to the left of the decimal place and may\nrequire the addition of either one or two trailing zeros.\n\nThe operation is not affected by the context.\n\n>>> ExtendedContext.to_eng_string(Decimal('123E+1'))\n'1.23E+3'\n>>> ExtendedContext.to_eng_string(Decimal('123E+3'))\n'123E+3'\n>>> ExtendedContext.to_eng_string(Decimal('123E-10'))\n'12.3E-9'\n>>> ExtendedContext.to_eng_string(Decimal('-123E-12'))\n'-123E-12'\n>>> ExtendedContext.to_eng_string(Decimal('7E-7'))\n'700E-9'\n>>> ExtendedContext.to_eng_string(Decimal('7E+1'))\n'70'\n>>> ExtendedContext.to_eng_string(Decimal('0E+1'))\n'0.00E+3'", + "builtins.Context.to_integral" => "Rounds to an integer.\n\nWhen the operand has a negative exponent, the result is the same\nas using the quantize() operation using the given operand as the\nleft-hand-operand, 1E+0 as the right-hand-operand, and the precision\nof the operand as the precision setting, except that no flags will\nbe set. The rounding mode is taken from the context.\n\n>>> ExtendedContext.to_integral_value(Decimal('2.1'))\nDecimal('2')\n>>> ExtendedContext.to_integral_value(Decimal('100'))\nDecimal('100')\n>>> ExtendedContext.to_integral_value(Decimal('100.0'))\nDecimal('100')\n>>> ExtendedContext.to_integral_value(Decimal('101.5'))\nDecimal('102')\n>>> ExtendedContext.to_integral_value(Decimal('-101.5'))\nDecimal('-102')\n>>> ExtendedContext.to_integral_value(Decimal('10E+5'))\nDecimal('1.0E+6')\n>>> ExtendedContext.to_integral_value(Decimal('7.89E+77'))\nDecimal('7.89E+77')\n>>> ExtendedContext.to_integral_value(Decimal('-Inf'))\nDecimal('-Infinity')", + "builtins.Context.to_integral_exact" => "Rounds to an integer.\n\nWhen the operand has a negative exponent, the result is the same\nas using the quantize() operation using the given operand as the\nleft-hand-operand, 1E+0 as the right-hand-operand, and the precision\nof the operand as the precision setting; Inexact and Rounded flags\nare allowed in this operation. The rounding mode is taken from the\ncontext.\n\n>>> ExtendedContext.to_integral_exact(Decimal('2.1'))\nDecimal('2')\n>>> ExtendedContext.to_integral_exact(Decimal('100'))\nDecimal('100')\n>>> ExtendedContext.to_integral_exact(Decimal('100.0'))\nDecimal('100')\n>>> ExtendedContext.to_integral_exact(Decimal('101.5'))\nDecimal('102')\n>>> ExtendedContext.to_integral_exact(Decimal('-101.5'))\nDecimal('-102')\n>>> ExtendedContext.to_integral_exact(Decimal('10E+5'))\nDecimal('1.0E+6')\n>>> ExtendedContext.to_integral_exact(Decimal('7.89E+77'))\nDecimal('7.89E+77')\n>>> ExtendedContext.to_integral_exact(Decimal('-Inf'))\nDecimal('-Infinity')", + "builtins.Context.to_integral_value" => "Rounds to an integer.\n\nWhen the operand has a negative exponent, the result is the same\nas using the quantize() operation using the given operand as the\nleft-hand-operand, 1E+0 as the right-hand-operand, and the precision\nof the operand as the precision setting, except that no flags will\nbe set. The rounding mode is taken from the context.\n\n>>> ExtendedContext.to_integral_value(Decimal('2.1'))\nDecimal('2')\n>>> ExtendedContext.to_integral_value(Decimal('100'))\nDecimal('100')\n>>> ExtendedContext.to_integral_value(Decimal('100.0'))\nDecimal('100')\n>>> ExtendedContext.to_integral_value(Decimal('101.5'))\nDecimal('102')\n>>> ExtendedContext.to_integral_value(Decimal('-101.5'))\nDecimal('-102')\n>>> ExtendedContext.to_integral_value(Decimal('10E+5'))\nDecimal('1.0E+6')\n>>> ExtendedContext.to_integral_value(Decimal('7.89E+77'))\nDecimal('7.89E+77')\n>>> ExtendedContext.to_integral_value(Decimal('-Inf'))\nDecimal('-Infinity')", + "builtins.Context.to_sci_string" => "Converts a number to a string, using scientific notation.\n\nThe operation is not affected by the context.", + "builtins.Context.values" => "Return a list of all variables' values in the context object.", + "builtins.ContextDecorator" => "A base class or mixin that enables context managers to work as decorators.", + "builtins.ContextDecorator.__delattr__" => "Implement delattr(self, name).", + "builtins.ContextDecorator.__eq__" => "Return self==value.", + "builtins.ContextDecorator.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.ContextDecorator.__ge__" => "Return self>=value.", + "builtins.ContextDecorator.__getattribute__" => "Return getattr(self, name).", + "builtins.ContextDecorator.__getstate__" => "Helper for pickle.", + "builtins.ContextDecorator.__gt__" => "Return self>value.", + "builtins.ContextDecorator.__hash__" => "Return hash(self).", + "builtins.ContextDecorator.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.ContextDecorator.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.ContextDecorator.__le__" => "Return self<=value.", + "builtins.ContextDecorator.__lt__" => "Return self<value.", + "builtins.ContextDecorator.__ne__" => "Return self!=value.", + "builtins.ContextDecorator.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.ContextDecorator.__reduce__" => "Helper for pickle.", + "builtins.ContextDecorator.__reduce_ex__" => "Helper for pickle.", + "builtins.ContextDecorator.__repr__" => "Return repr(self).", + "builtins.ContextDecorator.__setattr__" => "Implement setattr(self, name, value).", + "builtins.ContextDecorator.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.ContextDecorator.__str__" => "Return str(self).", + "builtins.ContextDecorator.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.ContextDecorator.__weakref__" => "list of weak references to the object", + "builtins.ContextDecorator._recreate_cm" => "Return a recreated instance of self.\n\nAllows an otherwise one-shot context manager like\n_GeneratorContextManager to support use as\na decorator via implicit recreation.\n\nThis is a private interface just for _GeneratorContextManager.\nSee issue #11647 for details.", + "builtins.ContextManager.__delattr__" => "Implement delattr(self, name).", + "builtins.ContextManager.__eq__" => "Return self==value.", + "builtins.ContextManager.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.ContextManager.__ge__" => "Return self>=value.", + "builtins.ContextManager.__getattribute__" => "Return getattr(self, name).", + "builtins.ContextManager.__getstate__" => "Helper for pickle.", + "builtins.ContextManager.__gt__" => "Return self>value.", + "builtins.ContextManager.__hash__" => "Return hash(self).", + "builtins.ContextManager.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.ContextManager.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.ContextManager.__le__" => "Return self<=value.", + "builtins.ContextManager.__lt__" => "Return self<value.", + "builtins.ContextManager.__ne__" => "Return self!=value.", + "builtins.ContextManager.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.ContextManager.__reduce__" => "Helper for pickle.", + "builtins.ContextManager.__reduce_ex__" => "Helper for pickle.", + "builtins.ContextManager.__repr__" => "Return repr(self).", + "builtins.ContextManager.__setattr__" => "Implement setattr(self, name, value).", + "builtins.ContextManager.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.ContextManager.__str__" => "Return str(self).", + "builtins.ContextManager.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.ContextVar.__class_getitem__" => "ContextVars are generic over the type of their contained values", + "builtins.ContextVar.__delattr__" => "Implement delattr(self, name).", + "builtins.ContextVar.__eq__" => "Return self==value.", + "builtins.ContextVar.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.ContextVar.__ge__" => "Return self>=value.", + "builtins.ContextVar.__getattribute__" => "Return getattr(self, name).", + "builtins.ContextVar.__getstate__" => "Helper for pickle.", + "builtins.ContextVar.__gt__" => "Return self>value.", + "builtins.ContextVar.__hash__" => "Return hash(self).", + "builtins.ContextVar.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.ContextVar.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.ContextVar.__le__" => "Return self<=value.", + "builtins.ContextVar.__lt__" => "Return self<value.", + "builtins.ContextVar.__ne__" => "Return self!=value.", + "builtins.ContextVar.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.ContextVar.__reduce__" => "Helper for pickle.", + "builtins.ContextVar.__reduce_ex__" => "Helper for pickle.", + "builtins.ContextVar.__repr__" => "Return repr(self).", + "builtins.ContextVar.__setattr__" => "Implement setattr(self, name, value).", + "builtins.ContextVar.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.ContextVar.__str__" => "Return str(self).", + "builtins.ContextVar.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.ContextVar.get" => "Return a value for the context variable for the current context.\n\nIf there is no value for the variable in the current context, the\nmethod will:\n * return the value of the default argument of the method, if\n provided; or\n * return the default value for the context variable, if it was\n created with one; or\n * raise a LookupError.", + "builtins.ContextVar.reset" => "Reset the context variable.\n\nThe variable is reset to the value it had before the\n`ContextVar.set()` that created the token was used.", + "builtins.ContextVar.set" => "Call to set a new value for the context variable in the current context.\n\nThe required value argument is the new value for the context\nvariable.\n\nReturns a Token object that can be used to restore the variable to\nits previous value via the `ContextVar.reset()` method.", + "builtins.CoverageResults.__delattr__" => "Implement delattr(self, name).", + "builtins.CoverageResults.__eq__" => "Return self==value.", + "builtins.CoverageResults.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.CoverageResults.__ge__" => "Return self>=value.", + "builtins.CoverageResults.__getattribute__" => "Return getattr(self, name).", + "builtins.CoverageResults.__getstate__" => "Helper for pickle.", + "builtins.CoverageResults.__gt__" => "Return self>value.", + "builtins.CoverageResults.__hash__" => "Return hash(self).", + "builtins.CoverageResults.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.CoverageResults.__le__" => "Return self<=value.", + "builtins.CoverageResults.__lt__" => "Return self<value.", + "builtins.CoverageResults.__ne__" => "Return self!=value.", + "builtins.CoverageResults.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.CoverageResults.__reduce__" => "Helper for pickle.", + "builtins.CoverageResults.__reduce_ex__" => "Helper for pickle.", + "builtins.CoverageResults.__repr__" => "Return repr(self).", + "builtins.CoverageResults.__setattr__" => "Implement setattr(self, name, value).", + "builtins.CoverageResults.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.CoverageResults.__str__" => "Return str(self).", + "builtins.CoverageResults.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.CoverageResults.__weakref__" => "list of weak references to the object", + "builtins.CoverageResults.is_ignored_filename" => "Return True if the filename does not refer to a file\nwe want to have reported.", + "builtins.CoverageResults.update" => "Merge in the data from another CoverageResults", + "builtins.CoverageResults.write_results" => "Write the coverage results.\n\n:param show_missing: Show lines that had no hits.\n:param summary: Include coverage summary per module.\n:param coverdir: If None, the results of each module are placed in its\n directory, otherwise it is included in the directory\n specified.\n:param ignore_missing_files: If True, counts for files that no longer\n exist are silently ignored. Otherwise, a missing file\n will raise a FileNotFoundError.", + "builtins.CoverageResults.write_results_file" => "Return a coverage results file in path.", + "builtins.CrossInterpreterBufferView.__buffer__" => "Return a buffer object that exposes the underlying memory of the object.", + "builtins.CrossInterpreterBufferView.__delattr__" => "Implement delattr(self, name).", + "builtins.CrossInterpreterBufferView.__eq__" => "Return self==value.", + "builtins.CrossInterpreterBufferView.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.CrossInterpreterBufferView.__ge__" => "Return self>=value.", + "builtins.CrossInterpreterBufferView.__getattribute__" => "Return getattr(self, name).", + "builtins.CrossInterpreterBufferView.__getstate__" => "Helper for pickle.", + "builtins.CrossInterpreterBufferView.__gt__" => "Return self>value.", + "builtins.CrossInterpreterBufferView.__hash__" => "Return hash(self).", + "builtins.CrossInterpreterBufferView.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.CrossInterpreterBufferView.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.CrossInterpreterBufferView.__le__" => "Return self<=value.", + "builtins.CrossInterpreterBufferView.__lt__" => "Return self<value.", + "builtins.CrossInterpreterBufferView.__ne__" => "Return self!=value.", + "builtins.CrossInterpreterBufferView.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.CrossInterpreterBufferView.__reduce__" => "Helper for pickle.", + "builtins.CrossInterpreterBufferView.__reduce_ex__" => "Helper for pickle.", + "builtins.CrossInterpreterBufferView.__repr__" => "Return repr(self).", + "builtins.CrossInterpreterBufferView.__setattr__" => "Implement setattr(self, name, value).", + "builtins.CrossInterpreterBufferView.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.CrossInterpreterBufferView.__str__" => "Return str(self).", + "builtins.CrossInterpreterBufferView.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Cursor" => "SQLite database cursor class.", + "builtins.Cursor.__delattr__" => "Implement delattr(self, name).", + "builtins.Cursor.__eq__" => "Return self==value.", + "builtins.Cursor.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Cursor.__ge__" => "Return self>=value.", + "builtins.Cursor.__getattribute__" => "Return getattr(self, name).", + "builtins.Cursor.__getstate__" => "Helper for pickle.", + "builtins.Cursor.__gt__" => "Return self>value.", + "builtins.Cursor.__hash__" => "Return hash(self).", + "builtins.Cursor.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Cursor.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Cursor.__iter__" => "Implement iter(self).", + "builtins.Cursor.__le__" => "Return self<=value.", + "builtins.Cursor.__lt__" => "Return self<value.", + "builtins.Cursor.__ne__" => "Return self!=value.", + "builtins.Cursor.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Cursor.__next__" => "Implement next(self).", + "builtins.Cursor.__reduce__" => "Helper for pickle.", + "builtins.Cursor.__reduce_ex__" => "Helper for pickle.", + "builtins.Cursor.__repr__" => "Return repr(self).", + "builtins.Cursor.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Cursor.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Cursor.__str__" => "Return str(self).", + "builtins.Cursor.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Cursor.close" => "Closes the cursor.", + "builtins.Cursor.execute" => "Executes an SQL statement.", + "builtins.Cursor.executemany" => "Repeatedly executes an SQL statement.", + "builtins.Cursor.executescript" => "Executes multiple SQL statements at once.", + "builtins.Cursor.fetchall" => "Fetches all rows from the resultset.", + "builtins.Cursor.fetchmany" => "Fetches several rows from the resultset.\n\n size\n The default value is set by the Cursor.arraysize attribute.", + "builtins.Cursor.fetchone" => "Fetches one row from the resultset.", + "builtins.Cursor.setinputsizes" => "Required by DB-API. Does nothing in sqlite3.", + "builtins.Cursor.setoutputsize" => "Required by DB-API. Does nothing in sqlite3.", + "builtins.DEPRECATED_DEFAULT" => "Sentinel to be used as default arg during deprecation\nperiod of TOMLDecodeError's free-form arguments.", + "builtins.DEPRECATED_DEFAULT.__delattr__" => "Implement delattr(self, name).", + "builtins.DEPRECATED_DEFAULT.__eq__" => "Return self==value.", + "builtins.DEPRECATED_DEFAULT.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.DEPRECATED_DEFAULT.__ge__" => "Return self>=value.", + "builtins.DEPRECATED_DEFAULT.__getattribute__" => "Return getattr(self, name).", + "builtins.DEPRECATED_DEFAULT.__getstate__" => "Helper for pickle.", + "builtins.DEPRECATED_DEFAULT.__gt__" => "Return self>value.", + "builtins.DEPRECATED_DEFAULT.__hash__" => "Return hash(self).", + "builtins.DEPRECATED_DEFAULT.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.DEPRECATED_DEFAULT.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.DEPRECATED_DEFAULT.__le__" => "Return self<=value.", + "builtins.DEPRECATED_DEFAULT.__lt__" => "Return self<value.", + "builtins.DEPRECATED_DEFAULT.__ne__" => "Return self!=value.", + "builtins.DEPRECATED_DEFAULT.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.DEPRECATED_DEFAULT.__reduce__" => "Helper for pickle.", + "builtins.DEPRECATED_DEFAULT.__reduce_ex__" => "Helper for pickle.", + "builtins.DEPRECATED_DEFAULT.__repr__" => "Return repr(self).", + "builtins.DEPRECATED_DEFAULT.__setattr__" => "Implement setattr(self, name, value).", + "builtins.DEPRECATED_DEFAULT.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.DEPRECATED_DEFAULT.__str__" => "Return str(self).", + "builtins.DEPRECATED_DEFAULT.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.DEPRECATED_DEFAULT.__weakref__" => "list of weak references to the object", + "builtins.Decimal" => "Floating-point class for decimal arithmetic.", + "builtins.Decimal.__abs__" => "Returns the absolute value of self.\n\nIf the keyword argument 'round' is false, do not round. The\nexpression self.__abs__(round=False) is equivalent to\nself.copy_abs().", + "builtins.Decimal.__add__" => "Returns self + other.\n\n-INF + INF (or the reverse) cause InvalidOperation errors.", + "builtins.Decimal.__bool__" => "Return True if self is nonzero; otherwise return False.\n\nNaNs and infinities are considered nonzero.", + "builtins.Decimal.__ceil__" => "Return the ceiling of self, as an integer.\n\nFor a finite Decimal instance self, return the least integer n\nsuch that n >= self. If self is infinite or a NaN then a\nPython exception is raised.", + "builtins.Decimal.__delattr__" => "Implement delattr(self, name).", + "builtins.Decimal.__divmod__" => "Return (self // other, self % other)", + "builtins.Decimal.__eq__" => "Return self==value.", + "builtins.Decimal.__float__" => "Float representation.", + "builtins.Decimal.__floor__" => "Return the floor of self, as an integer.\n\nFor a finite Decimal instance self, return the greatest\ninteger n such that n <= self. If self is infinite or a NaN\nthen a Python exception is raised.", + "builtins.Decimal.__floordiv__" => "self // other", + "builtins.Decimal.__format__" => "Format a Decimal instance according to the given specifier.\n\nThe specifier should be a standard format specifier, with the\nform described in PEP 3101. Formatting types 'e', 'E', 'f',\n'F', 'g', 'G', 'n' and '%' are supported. If the formatting\ntype is omitted it defaults to 'g' or 'G', depending on the\nvalue of context.capitals.", + "builtins.Decimal.__ge__" => "Return self>=value.", + "builtins.Decimal.__getattribute__" => "Return getattr(self, name).", + "builtins.Decimal.__getstate__" => "Helper for pickle.", + "builtins.Decimal.__gt__" => "Return self>value.", + "builtins.Decimal.__hash__" => "x.__hash__() <==> hash(x)", + "builtins.Decimal.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Decimal.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Decimal.__int__" => "Converts self to an int, truncating if necessary.", + "builtins.Decimal.__le__" => "Return self<=value.", + "builtins.Decimal.__lt__" => "Return self<value.", + "builtins.Decimal.__mod__" => "self % other", + "builtins.Decimal.__mul__" => "Return self * other.\n\n(+-) INF * 0 (or its reverse) raise InvalidOperation.", + "builtins.Decimal.__ne__" => "Return self!=value.", + "builtins.Decimal.__neg__" => "Returns a copy with the sign switched.\n\nRounds, if it has reason.", + "builtins.Decimal.__new__" => "Create a decimal point instance.\n\n>>> Decimal('3.14') # string input\nDecimal('3.14')\n>>> Decimal((0, (3, 1, 4), -2)) # tuple (sign, digit_tuple, exponent)\nDecimal('3.14')\n>>> Decimal(314) # int\nDecimal('314')\n>>> Decimal(Decimal(314)) # another decimal instance\nDecimal('314')\n>>> Decimal(' 3.14 \\n') # leading and trailing whitespace okay\nDecimal('3.14')", + "builtins.Decimal.__pos__" => "Returns a copy, unless it is a sNaN.\n\nRounds the number (if more than precision digits)", + "builtins.Decimal.__pow__" => "Return self ** other [ % modulo].\n\nWith two arguments, compute self**other.\n\nWith three arguments, compute (self**other) % modulo. For the\nthree argument form, the following restrictions on the\narguments hold:\n\n - all three arguments must be integral\n - other must be nonnegative\n - either self or other (or both) must be nonzero\n - modulo must be nonzero and must have at most p digits,\n where p is the context precision.\n\nIf any of these restrictions is violated the InvalidOperation\nflag is raised.\n\nThe result of pow(self, other, modulo) is identical to the\nresult that would be obtained by computing (self**other) %\nmodulo with unbounded precision, but is computed more\nefficiently. It is always exact.", + "builtins.Decimal.__radd__" => "Returns self + other.\n\n-INF + INF (or the reverse) cause InvalidOperation errors.", + "builtins.Decimal.__rdivmod__" => "Swaps self/other and returns __divmod__.", + "builtins.Decimal.__reduce_ex__" => "Helper for pickle.", + "builtins.Decimal.__repr__" => "Represents the number as an instance of Decimal.", + "builtins.Decimal.__rfloordiv__" => "Swaps self/other and returns __floordiv__.", + "builtins.Decimal.__rmod__" => "Swaps self/other and returns __mod__.", + "builtins.Decimal.__rmul__" => "Return self * other.\n\n(+-) INF * 0 (or its reverse) raise InvalidOperation.", + "builtins.Decimal.__round__" => "Round self to the nearest integer, or to a given precision.\n\nIf only one argument is supplied, round a finite Decimal\ninstance self to the nearest integer. If self is infinite or\na NaN then a Python exception is raised. If self is finite\nand lies exactly halfway between two integers then it is\nrounded to the integer with even last digit.\n\n>>> round(Decimal('123.456'))\n123\n>>> round(Decimal('-456.789'))\n-457\n>>> round(Decimal('-3.0'))\n-3\n>>> round(Decimal('2.5'))\n2\n>>> round(Decimal('3.5'))\n4\n>>> round(Decimal('Inf'))\nTraceback (most recent call last):\n ...\nOverflowError: cannot round an infinity\n>>> round(Decimal('NaN'))\nTraceback (most recent call last):\n ...\nValueError: cannot round a NaN\n\nIf a second argument n is supplied, self is rounded to n\ndecimal places using the rounding mode for the current\ncontext.\n\nFor an integer n, round(self, -n) is exactly equivalent to\nself.quantize(Decimal('1En')).\n\n>>> round(Decimal('123.456'), 0)\nDecimal('123')\n>>> round(Decimal('123.456'), 2)\nDecimal('123.46')\n>>> round(Decimal('123.456'), -2)\nDecimal('1E+2')\n>>> round(Decimal('-Infinity'), 37)\nDecimal('NaN')\n>>> round(Decimal('sNaN123'), 0)\nDecimal('NaN123')", + "builtins.Decimal.__rpow__" => "Swaps self/other and returns __pow__.", + "builtins.Decimal.__rsub__" => "Return other - self", + "builtins.Decimal.__rtruediv__" => "Swaps self/other and returns __truediv__.", + "builtins.Decimal.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Decimal.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Decimal.__str__" => "Return string representation of the number in scientific notation.\n\nCaptures all of the information in the underlying representation.", + "builtins.Decimal.__sub__" => "Return self - other", + "builtins.Decimal.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Decimal.__truediv__" => "Return self / other.", + "builtins.Decimal.__trunc__" => "Converts self to an int, truncating if necessary.", + "builtins.Decimal._check_nans" => "Returns whether the number is not actually one.\n\nif self, other are sNaN, signal\nif self, other are NaN return nan\nreturn 0\n\nDone before operations.", + "builtins.Decimal._cmp" => "Compare the two non-NaN decimal instances self and other.\n\nReturns -1 if self < other, 0 if self == other and 1\nif self > other. This routine is for internal use only.", + "builtins.Decimal._compare_check_nans" => "Version of _check_nans used for the signaling comparisons\ncompare_signal, __le__, __lt__, __ge__, __gt__.\n\nSignal InvalidOperation if either self or other is a (quiet\nor signaling) NaN. Signaling NaNs take precedence over quiet\nNaNs.\n\nReturn 0 if neither operand is a NaN.", + "builtins.Decimal._divide" => "Return (self // other, self % other), to context.prec precision.\n\nAssumes that neither self nor other is a NaN, that self is not\ninfinite and that other is nonzero.", + "builtins.Decimal._fix" => "Round if it is necessary to keep self within prec precision.\n\nRounds and fixes the exponent. Does not raise on a sNaN.\n\nArguments:\nself - Decimal instance\ncontext - context used.", + "builtins.Decimal._fix_nan" => "Decapitate the payload of a NaN to fit the context", + "builtins.Decimal._iseven" => "Returns True if self is even. Assumes self is an integer.", + "builtins.Decimal._isinfinity" => "Returns whether the number is infinite\n\n0 if finite or not a number\n1 if +INF\n-1 if -INF", + "builtins.Decimal._isinteger" => "Returns whether self is an integer", + "builtins.Decimal._islogical" => "Return True if self is a logical operand.\n\nFor being logical, it must be a finite number with a sign of 0,\nan exponent of 0, and a coefficient whose digits must all be\neither 0 or 1.", + "builtins.Decimal._isnan" => "Returns whether the number is not actually one.\n\n0 if a number\n1 if NaN\n2 if sNaN", + "builtins.Decimal._ln_exp_bound" => "Compute a lower bound for the adjusted exponent of self.ln().\nIn other words, compute r such that self.ln() >= 10**r. Assumes\nthat self is finite and positive and that self != 1.", + "builtins.Decimal._log10_exp_bound" => "Compute a lower bound for the adjusted exponent of self.log10().\nIn other words, find r such that self.log10() >= 10**r.\nAssumes that self is finite and positive and that self != 1.", + "builtins.Decimal._power_exact" => "Attempt to compute self**other exactly.\n\nGiven Decimals self and other and an integer p, attempt to\ncompute an exact result for the power self**other, with p\ndigits of precision. Return None if self**other is not\nexactly representable in p digits.\n\nAssumes that elimination of special cases has already been\nperformed: self and other must both be nonspecial; self must\nbe positive and not numerically equal to 1; other must be\nnonzero. For efficiency, other._exp should not be too large,\nso that 10**abs(other._exp) is a feasible calculation.", + "builtins.Decimal._power_modulo" => "Three argument version of __pow__", + "builtins.Decimal._rescale" => "Rescale self so that the exponent is exp, either by padding with zeros\nor by truncating digits, using the given rounding mode.\n\nSpecials are returned without change. This operation is\nquiet: it raises no flags, and uses no information from the\ncontext.\n\nexp = exp to scale to (an integer)\nrounding = rounding mode", + "builtins.Decimal._round" => "Round a nonzero, nonspecial Decimal to a fixed number of\nsignificant figures, using the given rounding mode.\n\nInfinities, NaNs and zeros are returned unaltered.\n\nThis operation is quiet: it raises no flags, and uses no\ninformation from the context.", + "builtins.Decimal._round_05up" => "Round down unless digit prec-1 is 0 or 5.", + "builtins.Decimal._round_ceiling" => "Rounds up (not away from 0 if negative.)", + "builtins.Decimal._round_down" => "Also known as round-towards-0, truncate.", + "builtins.Decimal._round_floor" => "Rounds down (not towards 0 if negative)", + "builtins.Decimal._round_half_down" => "Round 5 down", + "builtins.Decimal._round_half_even" => "Round 5 to even, rest to nearest.", + "builtins.Decimal._round_half_up" => "Rounds 5 up (away from 0)", + "builtins.Decimal._round_up" => "Rounds away from 0.", + "builtins.Decimal.adjusted" => "Return the adjusted exponent of self", + "builtins.Decimal.as_integer_ratio" => "Express a finite Decimal instance in the form n / d.\n\nReturns a pair (n, d) of integers. When called on an infinity\nor NaN, raises OverflowError or ValueError respectively.\n\n>>> Decimal('3.14').as_integer_ratio()\n(157, 50)\n>>> Decimal('-123e5').as_integer_ratio()\n(-12300000, 1)\n>>> Decimal('0.00').as_integer_ratio()\n(0, 1)", + "builtins.Decimal.as_tuple" => "Represents the number as a triple tuple.\n\nTo show the internals exactly as they are.", + "builtins.Decimal.canonical" => "Returns the same Decimal object.\n\nAs we do not have different encodings for the same number, the\nreceived object already is in its canonical form.", + "builtins.Decimal.compare" => "Compare self to other. Return a decimal value:\n\na or b is a NaN ==> Decimal('NaN')\na < b ==> Decimal('-1')\na == b ==> Decimal('0')\na > b ==> Decimal('1')", + "builtins.Decimal.compare_signal" => "Compares self to the other operand numerically.\n\nIt's pretty much like compare(), but all NaNs signal, with signaling\nNaNs taking precedence over quiet NaNs.", + "builtins.Decimal.compare_total" => "Compares self to other using the abstract representations.\n\nThis is not like the standard compare, which use their numerical\nvalue. Note that a total ordering is defined for all possible\nabstract representations.", + "builtins.Decimal.compare_total_mag" => "Compares self to other using abstract repr., ignoring sign.\n\nLike compare_total, but with operand's sign ignored and assumed to\nbe 0.", + "builtins.Decimal.conjugate" => "Return self.", + "builtins.Decimal.copy_abs" => "Returns a copy with the sign set to 0.", + "builtins.Decimal.copy_negate" => "Returns a copy with the sign inverted.", + "builtins.Decimal.copy_sign" => "Returns self with the sign of other.", + "builtins.Decimal.exp" => "Returns e ** self.", + "builtins.Decimal.fma" => "Fused multiply-add.\n\nReturns self*other+third with no rounding of the intermediate\nproduct self*other.\n\nself and other are multiplied together, with no rounding of\nthe result. The third operand is then added to the result,\nand a single final rounding is performed.", + "builtins.Decimal.from_float" => "Converts a float to a decimal number, exactly.\n\nNote that Decimal.from_float(0.1) is not the same as Decimal('0.1').\nSince 0.1 is not exactly representable in binary floating point, the\nvalue is stored as the nearest representable value which is\n0x1.999999999999ap-4. The exact equivalent of the value in decimal\nis 0.1000000000000000055511151231257827021181583404541015625.\n\n>>> Decimal.from_float(0.1)\nDecimal('0.1000000000000000055511151231257827021181583404541015625')\n>>> Decimal.from_float(float('nan'))\nDecimal('NaN')\n>>> Decimal.from_float(float('inf'))\nDecimal('Infinity')\n>>> Decimal.from_float(-float('inf'))\nDecimal('-Infinity')\n>>> Decimal.from_float(-0.0)\nDecimal('-0')", + "builtins.Decimal.from_number" => "Converts a real number to a decimal number, exactly.\n\n>>> Decimal.from_number(314) # int\nDecimal('314')\n>>> Decimal.from_number(0.1) # float\nDecimal('0.1000000000000000055511151231257827021181583404541015625')\n>>> Decimal.from_number(Decimal('3.14')) # another decimal instance\nDecimal('3.14')", + "builtins.Decimal.is_canonical" => "Return True if self is canonical; otherwise return False.\n\nCurrently, the encoding of a Decimal instance is always\ncanonical, so this method returns True for any Decimal.", + "builtins.Decimal.is_finite" => "Return True if self is finite; otherwise return False.\n\nA Decimal instance is considered finite if it is neither\ninfinite nor a NaN.", + "builtins.Decimal.is_infinite" => "Return True if self is infinite; otherwise return False.", + "builtins.Decimal.is_nan" => "Return True if self is a qNaN or sNaN; otherwise return False.", + "builtins.Decimal.is_normal" => "Return True if self is a normal number; otherwise return False.", + "builtins.Decimal.is_qnan" => "Return True if self is a quiet NaN; otherwise return False.", + "builtins.Decimal.is_signed" => "Return True if self is negative; otherwise return False.", + "builtins.Decimal.is_snan" => "Return True if self is a signaling NaN; otherwise return False.", + "builtins.Decimal.is_subnormal" => "Return True if self is subnormal; otherwise return False.", + "builtins.Decimal.is_zero" => "Return True if self is a zero; otherwise return False.", + "builtins.Decimal.ln" => "Returns the natural (base e) logarithm of self.", + "builtins.Decimal.log10" => "Returns the base 10 logarithm of self.", + "builtins.Decimal.logb" => "Returns the exponent of the magnitude of self's MSD.\n\nThe result is the integer which is the exponent of the magnitude\nof the most significant digit of self (as though it were truncated\nto a single digit while maintaining the value of that digit and\nwithout limiting the resulting exponent).", + "builtins.Decimal.logical_and" => "Applies an 'and' operation between self and other's digits.\n\nBoth self and other must be logical numbers.", + "builtins.Decimal.logical_invert" => "Invert all its digits.\n\nThe self must be logical number.", + "builtins.Decimal.logical_or" => "Applies an 'or' operation between self and other's digits.\n\nBoth self and other must be logical numbers.", + "builtins.Decimal.logical_xor" => "Applies an 'xor' operation between self and other's digits.\n\nBoth self and other must be logical numbers.", + "builtins.Decimal.max" => "Returns the larger value.\n\nLike max(self, other) except if one is not a number, returns\nNaN (and signals if one is sNaN). Also rounds.", + "builtins.Decimal.max_mag" => "Compares the values numerically with their sign ignored.", + "builtins.Decimal.min" => "Returns the smaller value.\n\nLike min(self, other) except if one is not a number, returns\nNaN (and signals if one is sNaN). Also rounds.", + "builtins.Decimal.min_mag" => "Compares the values numerically with their sign ignored.", + "builtins.Decimal.next_minus" => "Returns the largest representable number smaller than itself.", + "builtins.Decimal.next_plus" => "Returns the smallest representable number larger than itself.", + "builtins.Decimal.next_toward" => "Returns the number closest to self, in the direction towards other.\n\nThe result is the closest representable number to self\n(excluding self) that is in the direction towards other,\nunless both have the same value. If the two operands are\nnumerically equal, then the result is a copy of self with the\nsign set to be the same as the sign of other.", + "builtins.Decimal.normalize" => "Normalize- strip trailing 0s, change anything equal to 0 to 0e0", + "builtins.Decimal.number_class" => "Returns an indication of the class of self.\n\nThe class is one of the following strings:\n sNaN\n NaN\n -Infinity\n -Normal\n -Subnormal\n -Zero\n +Zero\n +Subnormal\n +Normal\n +Infinity", + "builtins.Decimal.quantize" => "Quantize self so its exponent is the same as that of exp.\n\nSimilar to self._rescale(exp._exp) but with error checking.", + "builtins.Decimal.radix" => "Just returns 10, as this is Decimal, :)", + "builtins.Decimal.remainder_near" => "Remainder nearest to 0- abs(remainder-near) <= other/2", + "builtins.Decimal.rotate" => "Returns a rotated copy of self, value-of-other times.", + "builtins.Decimal.same_quantum" => "Return True if self and other have the same exponent; otherwise\nreturn False.\n\nIf either operand is a special value, the following rules are used:\n * return True if both operands are infinities\n * return True if both operands are NaNs\n * otherwise, return False.", + "builtins.Decimal.scaleb" => "Returns self operand after adding the second value to its exp.", + "builtins.Decimal.shift" => "Returns a shifted copy of self, value-of-other times.", + "builtins.Decimal.sqrt" => "Return the square root of self.", + "builtins.Decimal.to_eng_string" => "Convert to a string, using engineering notation if an exponent is needed.\n\nEngineering notation has an exponent which is a multiple of 3. This\ncan leave up to 3 digits to the left of the decimal place and may\nrequire the addition of either one or two trailing zeros.", + "builtins.Decimal.to_integral" => "Rounds to the nearest integer, without raising inexact, rounded.", + "builtins.Decimal.to_integral_exact" => "Rounds to a nearby integer.\n\nIf no rounding mode is specified, take the rounding mode from\nthe context. This method raises the Rounded and Inexact flags\nwhen appropriate.\n\nSee also: to_integral_value, which does exactly the same as\nthis method except that it doesn't raise Inexact or Rounded.", + "builtins.Decimal.to_integral_value" => "Rounds to the nearest integer, without raising inexact, rounded.", + "builtins.Decompress.__delattr__" => "Implement delattr(self, name).", + "builtins.Decompress.__eq__" => "Return self==value.", + "builtins.Decompress.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Decompress.__ge__" => "Return self>=value.", + "builtins.Decompress.__getattribute__" => "Return getattr(self, name).", + "builtins.Decompress.__getstate__" => "Helper for pickle.", + "builtins.Decompress.__gt__" => "Return self>value.", + "builtins.Decompress.__hash__" => "Return hash(self).", + "builtins.Decompress.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Decompress.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Decompress.__le__" => "Return self<=value.", + "builtins.Decompress.__lt__" => "Return self<value.", + "builtins.Decompress.__ne__" => "Return self!=value.", + "builtins.Decompress.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Decompress.__reduce__" => "Helper for pickle.", + "builtins.Decompress.__reduce_ex__" => "Helper for pickle.", + "builtins.Decompress.__repr__" => "Return repr(self).", + "builtins.Decompress.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Decompress.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Decompress.__str__" => "Return str(self).", + "builtins.Decompress.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Decompress.copy" => "Return a copy of the decompression object.", + "builtins.Decompress.decompress" => "Return a bytes object containing the decompressed version of the data.\n\n data\n The binary data to decompress.\n max_length\n The maximum allowable length of the decompressed data.\n Unconsumed input data will be stored in\n the unconsumed_tail attribute.\n\nAfter calling this function, some of the input data may still be\nstored in internal buffers for later processing.\nCall the flush() method to clear these buffers.", + "builtins.Decompress.flush" => "Return a bytes object containing any remaining decompressed data.\n\n length\n the initial size of the output buffer.", "builtins.DeprecationWarning" => "Base class for warnings about deprecated features.", "builtins.DeprecationWarning.__delattr__" => "Implement delattr(self, name).", "builtins.DeprecationWarning.__eq__" => "Return self==value.", @@ -10001,6 +12166,339 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.DeprecationWarning.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.DeprecationWarning.add_note" => "Add a note to the exception", "builtins.DeprecationWarning.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.Dialect" => "Describe a CSV dialect.\n\nThis must be subclassed (see csv.excel). Valid attributes are:\ndelimiter, quotechar, escapechar, doublequote, skipinitialspace,\nlineterminator, quoting.", + "builtins.Dialect.__delattr__" => "Implement delattr(self, name).", + "builtins.Dialect.__eq__" => "Return self==value.", + "builtins.Dialect.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Dialect.__ge__" => "Return self>=value.", + "builtins.Dialect.__getattribute__" => "Return getattr(self, name).", + "builtins.Dialect.__getstate__" => "Helper for pickle.", + "builtins.Dialect.__gt__" => "Return self>value.", + "builtins.Dialect.__hash__" => "Return hash(self).", + "builtins.Dialect.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Dialect.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Dialect.__le__" => "Return self<=value.", + "builtins.Dialect.__lt__" => "Return self<value.", + "builtins.Dialect.__ne__" => "Return self!=value.", + "builtins.Dialect.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Dialect.__reduce__" => "Helper for pickle.", + "builtins.Dialect.__reduce_ex__" => "Helper for pickle.", + "builtins.Dialect.__repr__" => "Return repr(self).", + "builtins.Dialect.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Dialect.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Dialect.__str__" => "Return str(self).", + "builtins.Dialect.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Dialect.__weakref__" => "list of weak references to the object", + "builtins.Dialog.__delattr__" => "Implement delattr(self, name).", + "builtins.Dialog.__eq__" => "Return self==value.", + "builtins.Dialog.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Dialog.__ge__" => "Return self>=value.", + "builtins.Dialog.__getattribute__" => "Return getattr(self, name).", + "builtins.Dialog.__getstate__" => "Helper for pickle.", + "builtins.Dialog.__gt__" => "Return self>value.", + "builtins.Dialog.__hash__" => "Return hash(self).", + "builtins.Dialog.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Dialog.__le__" => "Return self<=value.", + "builtins.Dialog.__lt__" => "Return self<value.", + "builtins.Dialog.__ne__" => "Return self!=value.", + "builtins.Dialog.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Dialog.__reduce__" => "Helper for pickle.", + "builtins.Dialog.__reduce_ex__" => "Helper for pickle.", + "builtins.Dialog.__repr__" => "Return repr(self).", + "builtins.Dialog.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Dialog.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Dialog.__str__" => "Return str(self).", + "builtins.Dialog.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Dialog.__weakref__" => "list of weak references to the object", + "builtins.DictReader.__class_getitem__" => "Represent a PEP 585 generic type\n\nE.g. for t = list[int], t.__origin__ is list and t.__args__ is (int,).", + "builtins.DictReader.__delattr__" => "Implement delattr(self, name).", + "builtins.DictReader.__eq__" => "Return self==value.", + "builtins.DictReader.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.DictReader.__ge__" => "Return self>=value.", + "builtins.DictReader.__getattribute__" => "Return getattr(self, name).", + "builtins.DictReader.__getstate__" => "Helper for pickle.", + "builtins.DictReader.__gt__" => "Return self>value.", + "builtins.DictReader.__hash__" => "Return hash(self).", + "builtins.DictReader.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.DictReader.__le__" => "Return self<=value.", + "builtins.DictReader.__lt__" => "Return self<value.", + "builtins.DictReader.__ne__" => "Return self!=value.", + "builtins.DictReader.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.DictReader.__reduce__" => "Helper for pickle.", + "builtins.DictReader.__reduce_ex__" => "Helper for pickle.", + "builtins.DictReader.__repr__" => "Return repr(self).", + "builtins.DictReader.__setattr__" => "Implement setattr(self, name, value).", + "builtins.DictReader.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.DictReader.__str__" => "Return str(self).", + "builtins.DictReader.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.DictReader.__weakref__" => "list of weak references to the object", + "builtins.DictRemover" => "deletes a key from a dictionary", + "builtins.DictRemover.__call__" => "Call self as a function.", + "builtins.DictRemover.__delattr__" => "Implement delattr(self, name).", + "builtins.DictRemover.__eq__" => "Return self==value.", + "builtins.DictRemover.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.DictRemover.__ge__" => "Return self>=value.", + "builtins.DictRemover.__getattribute__" => "Return getattr(self, name).", + "builtins.DictRemover.__getstate__" => "Helper for pickle.", + "builtins.DictRemover.__gt__" => "Return self>value.", + "builtins.DictRemover.__hash__" => "Return hash(self).", + "builtins.DictRemover.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.DictRemover.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.DictRemover.__le__" => "Return self<=value.", + "builtins.DictRemover.__lt__" => "Return self<value.", + "builtins.DictRemover.__ne__" => "Return self!=value.", + "builtins.DictRemover.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.DictRemover.__reduce__" => "Helper for pickle.", + "builtins.DictRemover.__reduce_ex__" => "Helper for pickle.", + "builtins.DictRemover.__repr__" => "Return repr(self).", + "builtins.DictRemover.__setattr__" => "Implement setattr(self, name, value).", + "builtins.DictRemover.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.DictRemover.__str__" => "Return str(self).", + "builtins.DictRemover.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.DictWriter.__class_getitem__" => "Represent a PEP 585 generic type\n\nE.g. for t = list[int], t.__origin__ is list and t.__args__ is (int,).", + "builtins.DictWriter.__delattr__" => "Implement delattr(self, name).", + "builtins.DictWriter.__eq__" => "Return self==value.", + "builtins.DictWriter.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.DictWriter.__ge__" => "Return self>=value.", + "builtins.DictWriter.__getattribute__" => "Return getattr(self, name).", + "builtins.DictWriter.__getstate__" => "Helper for pickle.", + "builtins.DictWriter.__gt__" => "Return self>value.", + "builtins.DictWriter.__hash__" => "Return hash(self).", + "builtins.DictWriter.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.DictWriter.__le__" => "Return self<=value.", + "builtins.DictWriter.__lt__" => "Return self<value.", + "builtins.DictWriter.__ne__" => "Return self!=value.", + "builtins.DictWriter.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.DictWriter.__reduce__" => "Helper for pickle.", + "builtins.DictWriter.__reduce_ex__" => "Helper for pickle.", + "builtins.DictWriter.__repr__" => "Return repr(self).", + "builtins.DictWriter.__setattr__" => "Implement setattr(self, name, value).", + "builtins.DictWriter.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.DictWriter.__str__" => "Return str(self).", + "builtins.DictWriter.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.DictWriter.__weakref__" => "list of weak references to the object", + "builtins.Differ" => "Differ is a class for comparing sequences of lines of text, and\nproducing human-readable differences or deltas. Differ uses\nSequenceMatcher both to compare sequences of lines, and to compare\nsequences of characters within similar (near-matching) lines.\n\nEach line of a Differ delta begins with a two-letter code:\n\n '- ' line unique to sequence 1\n '+ ' line unique to sequence 2\n ' ' line common to both sequences\n '? ' line not present in either input sequence\n\nLines beginning with '? ' attempt to guide the eye to intraline\ndifferences, and were not present in either input sequence. These lines\ncan be confusing if the sequences contain tab characters.\n\nNote that Differ makes no claim to produce a *minimal* diff. To the\ncontrary, minimal diffs are often counter-intuitive, because they synch\nup anywhere possible, sometimes accidental matches 100 pages apart.\nRestricting synch points to contiguous matches preserves some notion of\nlocality, at the occasional cost of producing a longer diff.\n\nExample: Comparing two texts.\n\nFirst we set up the texts, sequences of individual single-line strings\nending with newlines (such sequences can also be obtained from the\n`readlines()` method of file-like objects):\n\n>>> text1 = ''' 1. Beautiful is better than ugly.\n... 2. Explicit is better than implicit.\n... 3. Simple is better than complex.\n... 4. Complex is better than complicated.\n... '''.splitlines(keepends=True)\n>>> len(text1)\n4\n>>> text1[0][-1]\n'\\n'\n>>> text2 = ''' 1. Beautiful is better than ugly.\n... 3. Simple is better than complex.\n... 4. Complicated is better than complex.\n... 5. Flat is better than nested.\n... '''.splitlines(keepends=True)\n\nNext we instantiate a Differ object:\n\n>>> d = Differ()\n\nNote that when instantiating a Differ object we may pass functions to\nfilter out line and character 'junk'. See Differ.__init__ for details.\n\nFinally, we compare the two:\n\n>>> result = list(d.compare(text1, text2))\n\n'result' is a list of strings, so let's pretty-print it:\n\n>>> from pprint import pprint as _pprint\n>>> _pprint(result)\n[' 1. Beautiful is better than ugly.\\n',\n '- 2. Explicit is better than implicit.\\n',\n '- 3. Simple is better than complex.\\n',\n '+ 3. Simple is better than complex.\\n',\n '? ++\\n',\n '- 4. Complex is better than complicated.\\n',\n '? ^ ---- ^\\n',\n '+ 4. Complicated is better than complex.\\n',\n '? ++++ ^ ^\\n',\n '+ 5. Flat is better than nested.\\n']\n\nAs a single multi-line string it looks like this:\n\n>>> print(''.join(result), end=\"\")\n 1. Beautiful is better than ugly.\n- 2. Explicit is better than implicit.\n- 3. Simple is better than complex.\n+ 3. Simple is better than complex.\n? ++\n- 4. Complex is better than complicated.\n? ^ ---- ^\n+ 4. Complicated is better than complex.\n? ++++ ^ ^\n+ 5. Flat is better than nested.", + "builtins.Differ.__delattr__" => "Implement delattr(self, name).", + "builtins.Differ.__eq__" => "Return self==value.", + "builtins.Differ.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Differ.__ge__" => "Return self>=value.", + "builtins.Differ.__getattribute__" => "Return getattr(self, name).", + "builtins.Differ.__getstate__" => "Helper for pickle.", + "builtins.Differ.__gt__" => "Return self>value.", + "builtins.Differ.__hash__" => "Return hash(self).", + "builtins.Differ.__init__" => "Construct a text differencer, with optional filters.\n\nThe two optional keyword parameters are for filter functions:\n\n- `linejunk`: A function that should accept a single string argument,\n and return true iff the string is junk. The module-level function\n `IS_LINE_JUNK` may be used to filter out lines without visible\n characters, except for at most one splat ('#'). It is recommended\n to leave linejunk None; the underlying SequenceMatcher class has\n an adaptive notion of \"noise\" lines that's better than any static\n definition the author has ever been able to craft.\n\n- `charjunk`: A function that should accept a string of length 1. The\n module-level function `IS_CHARACTER_JUNK` may be used to filter out\n whitespace characters (a blank or tab; **note**: bad idea to include\n newline in this!). Use of IS_CHARACTER_JUNK is recommended.", + "builtins.Differ.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Differ.__le__" => "Return self<=value.", + "builtins.Differ.__lt__" => "Return self<value.", + "builtins.Differ.__ne__" => "Return self!=value.", + "builtins.Differ.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Differ.__reduce__" => "Helper for pickle.", + "builtins.Differ.__reduce_ex__" => "Helper for pickle.", + "builtins.Differ.__repr__" => "Return repr(self).", + "builtins.Differ.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Differ.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Differ.__str__" => "Return str(self).", + "builtins.Differ.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Differ.__weakref__" => "list of weak references to the object", + "builtins.Differ._dump" => "Generate comparison results for a same-tagged range.", + "builtins.Differ._fancy_replace" => "When replacing one block of lines with another, search the blocks\nfor *similar* lines; the best-matching pair (if any) is used as a\nsynch point, and intraline difference marking is done on the\nsimilar pair. Lots of work, but often worth it.\n\nExample:\n\n>>> d = Differ()\n>>> results = d._fancy_replace(['abcDefghiJkl\\n'], 0, 1,\n... ['abcdefGhijkl\\n'], 0, 1)\n>>> print(''.join(results), end=\"\")\n- abcDefghiJkl\n? ^ ^ ^\n+ abcdefGhijkl\n? ^ ^ ^", + "builtins.Differ._qformat" => "Format \"?\" output and deal with tabs.\n\nExample:\n\n>>> d = Differ()\n>>> results = d._qformat('\\tabcDefghiJkl\\n', '\\tabcdefGhijkl\\n',\n... ' ^ ^ ^ ', ' ^ ^ ^ ')\n>>> for line in results: print(repr(line))\n...\n'- \\tabcDefghiJkl\\n'\n'? \\t ^ ^ ^\\n'\n'+ \\tabcdefGhijkl\\n'\n'? \\t ^ ^ ^\\n'", + "builtins.Differ.compare" => "Compare two sequences of lines; generate the resulting delta.\n\nEach sequence must contain individual single-line strings ending with\nnewlines. Such sequences can be obtained from the `readlines()` method\nof file-like objects. The delta generated also consists of newline-\nterminated strings, ready to be printed as-is via the writelines()\nmethod of a file-like object.\n\nExample:\n\n>>> print(''.join(Differ().compare('one\\ntwo\\nthree\\n'.splitlines(True),\n... 'ore\\ntree\\nemu\\n'.splitlines(True))),\n... end=\"\")\n- one\n? ^\n+ ore\n? ^\n- two\n- three\n? -\n+ tree\n+ emu", + "builtins.DirEntry.__class_getitem__" => "DirEntry is generic over the type of the path (str or bytes)", + "builtins.DirEntry.__delattr__" => "Implement delattr(self, name).", + "builtins.DirEntry.__eq__" => "Return self==value.", + "builtins.DirEntry.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.DirEntry.__fspath__" => "Returns the path for the entry.", + "builtins.DirEntry.__ge__" => "Return self>=value.", + "builtins.DirEntry.__getattribute__" => "Return getattr(self, name).", + "builtins.DirEntry.__getstate__" => "Helper for pickle.", + "builtins.DirEntry.__gt__" => "Return self>value.", + "builtins.DirEntry.__hash__" => "Return hash(self).", + "builtins.DirEntry.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.DirEntry.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.DirEntry.__le__" => "Return self<=value.", + "builtins.DirEntry.__lt__" => "Return self<value.", + "builtins.DirEntry.__ne__" => "Return self!=value.", + "builtins.DirEntry.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.DirEntry.__reduce__" => "Helper for pickle.", + "builtins.DirEntry.__reduce_ex__" => "Helper for pickle.", + "builtins.DirEntry.__repr__" => "Return repr(self).", + "builtins.DirEntry.__setattr__" => "Implement setattr(self, name, value).", + "builtins.DirEntry.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.DirEntry.__str__" => "Return str(self).", + "builtins.DirEntry.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.DirEntry.inode" => "Return inode of the entry; cached per entry.", + "builtins.DirEntry.is_dir" => "Return True if the entry is a directory; cached per entry.", + "builtins.DirEntry.is_file" => "Return True if the entry is a file; cached per entry.", + "builtins.DirEntry.is_junction" => "Return True if the entry is a junction; cached per entry.", + "builtins.DirEntry.is_symlink" => "Return True if the entry is a symbolic link; cached per entry.", + "builtins.DirEntry.name" => "the entry's base filename, relative to scandir() \"path\" argument", + "builtins.DirEntry.path" => "the entry's full path name; equivalent to\nos.path.join(scandir_path, entry.name)", + "builtins.DirEntry.stat" => "Return stat_result object for the entry; cached per entry.", + "builtins.Doc.__delattr__" => "Implement delattr(self, name).", + "builtins.Doc.__eq__" => "Return self==value.", + "builtins.Doc.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Doc.__ge__" => "Return self>=value.", + "builtins.Doc.__getattribute__" => "Return getattr(self, name).", + "builtins.Doc.__getstate__" => "Helper for pickle.", + "builtins.Doc.__gt__" => "Return self>value.", + "builtins.Doc.__hash__" => "Return hash(self).", + "builtins.Doc.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Doc.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Doc.__le__" => "Return self<=value.", + "builtins.Doc.__lt__" => "Return self<value.", + "builtins.Doc.__ne__" => "Return self!=value.", + "builtins.Doc.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Doc.__reduce__" => "Helper for pickle.", + "builtins.Doc.__reduce_ex__" => "Helper for pickle.", + "builtins.Doc.__repr__" => "Return repr(self).", + "builtins.Doc.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Doc.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Doc.__str__" => "Return str(self).", + "builtins.Doc.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Doc.__weakref__" => "list of weak references to the object", + "builtins.Doc.docclass" => "Raise an exception for unimplemented types.", + "builtins.Doc.docdata" => "Raise an exception for unimplemented types.", + "builtins.Doc.docmodule" => "Raise an exception for unimplemented types.", + "builtins.Doc.docother" => "Raise an exception for unimplemented types.", + "builtins.Doc.docproperty" => "Raise an exception for unimplemented types.", + "builtins.Doc.docroutine" => "Raise an exception for unimplemented types.", + "builtins.Doc.document" => "Generate documentation for an object.", + "builtins.Doc.fail" => "Raise an exception for unimplemented types.", + "builtins.Doc.getdocloc" => "Return the location of module docs or None", + "builtins.DocTest" => "A collection of doctest examples that should be run in a single\nnamespace. Each `DocTest` defines the following attributes:\n\n - examples: the list of examples.\n\n - globs: The namespace (aka globals) that the examples should\n be run in.\n\n - name: A name identifying the DocTest (typically, the name of\n the object whose docstring this DocTest was extracted from).\n\n - filename: The name of the file that this DocTest was extracted\n from, or `None` if the filename is unknown.\n\n - lineno: The line number within filename where this DocTest\n begins, or `None` if the line number is unavailable. This\n line number is zero-based, with respect to the beginning of\n the file.\n\n - docstring: The string that the examples were extracted from,\n or `None` if the string is unavailable.", + "builtins.DocTest.__delattr__" => "Implement delattr(self, name).", + "builtins.DocTest.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.DocTest.__ge__" => "Return self>=value.", + "builtins.DocTest.__getattribute__" => "Return getattr(self, name).", + "builtins.DocTest.__getstate__" => "Helper for pickle.", + "builtins.DocTest.__gt__" => "Return self>value.", + "builtins.DocTest.__init__" => "Create a new DocTest containing the given examples. The\nDocTest's globals are initialized with a copy of `globs`.", + "builtins.DocTest.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.DocTest.__le__" => "Return self<=value.", + "builtins.DocTest.__ne__" => "Return self!=value.", + "builtins.DocTest.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.DocTest.__reduce__" => "Helper for pickle.", + "builtins.DocTest.__reduce_ex__" => "Helper for pickle.", + "builtins.DocTest.__setattr__" => "Implement setattr(self, name, value).", + "builtins.DocTest.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.DocTest.__str__" => "Return str(self).", + "builtins.DocTest.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.DocTest.__weakref__" => "list of weak references to the object", + "builtins.DocTestFinder" => "A class used to extract the DocTests that are relevant to a given\nobject, from its docstring and the docstrings of its contained\nobjects. Doctests can currently be extracted from the following\nobject types: modules, functions, classes, methods, staticmethods,\nclassmethods, and properties.", + "builtins.DocTestFinder.__delattr__" => "Implement delattr(self, name).", + "builtins.DocTestFinder.__eq__" => "Return self==value.", + "builtins.DocTestFinder.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.DocTestFinder.__ge__" => "Return self>=value.", + "builtins.DocTestFinder.__getattribute__" => "Return getattr(self, name).", + "builtins.DocTestFinder.__getstate__" => "Helper for pickle.", + "builtins.DocTestFinder.__gt__" => "Return self>value.", + "builtins.DocTestFinder.__hash__" => "Return hash(self).", + "builtins.DocTestFinder.__init__" => "Create a new doctest finder.\n\nThe optional argument `parser` specifies a class or\nfunction that should be used to create new DocTest objects (or\nobjects that implement the same interface as DocTest). The\nsignature for this factory function should match the signature\nof the DocTest constructor.\n\nIf the optional argument `recurse` is false, then `find` will\nonly examine the given object, and not any contained objects.\n\nIf the optional argument `exclude_empty` is false, then `find`\nwill include tests for objects with empty docstrings.", + "builtins.DocTestFinder.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.DocTestFinder.__le__" => "Return self<=value.", + "builtins.DocTestFinder.__lt__" => "Return self<value.", + "builtins.DocTestFinder.__ne__" => "Return self!=value.", + "builtins.DocTestFinder.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.DocTestFinder.__reduce__" => "Helper for pickle.", + "builtins.DocTestFinder.__reduce_ex__" => "Helper for pickle.", + "builtins.DocTestFinder.__repr__" => "Return repr(self).", + "builtins.DocTestFinder.__setattr__" => "Implement setattr(self, name, value).", + "builtins.DocTestFinder.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.DocTestFinder.__str__" => "Return str(self).", + "builtins.DocTestFinder.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.DocTestFinder.__weakref__" => "list of weak references to the object", + "builtins.DocTestFinder._find" => "Find tests for the given object and any contained objects, and\nadd them to `tests`.", + "builtins.DocTestFinder._find_lineno" => "Return a line number of the given object's docstring.\n\nReturns `None` if the given object does not have a docstring.", + "builtins.DocTestFinder._from_module" => "Return true if the given object is defined in the given\nmodule.", + "builtins.DocTestFinder._get_test" => "Return a DocTest for the given object, if it defines a docstring;\notherwise, return None.", + "builtins.DocTestFinder._is_routine" => "Safely unwrap objects and determine if they are functions.", + "builtins.DocTestFinder.find" => "Return a list of the DocTests that are defined by the given\nobject's docstring, or by any of its contained objects'\ndocstrings.\n\nThe optional parameter `module` is the module that contains\nthe given object. If the module is not specified or is None, then\nthe test finder will attempt to automatically determine the\ncorrect module. The object's module is used:\n\n - As a default namespace, if `globs` is not specified.\n - To prevent the DocTestFinder from extracting DocTests\n from objects that are imported from other modules.\n - To find the name of the file containing the object.\n - To help find the line number of the object within its\n file.\n\nContained objects whose module does not match `module` are ignored.\n\nIf `module` is False, no attempt to find the module will be made.\nThis is obscure, of use mostly in tests: if `module` is False, or\nis None but cannot be found automatically, then all objects are\nconsidered to belong to the (non-existent) module, so all contained\nobjects will (recursively) be searched for doctests.\n\nThe globals for each DocTest is formed by combining `globs`\nand `extraglobs` (bindings in `extraglobs` override bindings\nin `globs`). A new copy of the globals dictionary is created\nfor each DocTest. If `globs` is not specified, then it\ndefaults to the module's `__dict__`, if specified, or {}\notherwise. If `extraglobs` is not specified, then it defaults\nto {}.", + "builtins.DocTestParser" => "A class used to parse strings containing doctest examples.", + "builtins.DocTestParser.__delattr__" => "Implement delattr(self, name).", + "builtins.DocTestParser.__eq__" => "Return self==value.", + "builtins.DocTestParser.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.DocTestParser.__ge__" => "Return self>=value.", + "builtins.DocTestParser.__getattribute__" => "Return getattr(self, name).", + "builtins.DocTestParser.__getstate__" => "Helper for pickle.", + "builtins.DocTestParser.__gt__" => "Return self>value.", + "builtins.DocTestParser.__hash__" => "Return hash(self).", + "builtins.DocTestParser.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.DocTestParser.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.DocTestParser.__le__" => "Return self<=value.", + "builtins.DocTestParser.__lt__" => "Return self<value.", + "builtins.DocTestParser.__ne__" => "Return self!=value.", + "builtins.DocTestParser.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.DocTestParser.__reduce__" => "Helper for pickle.", + "builtins.DocTestParser.__reduce_ex__" => "Helper for pickle.", + "builtins.DocTestParser.__repr__" => "Return repr(self).", + "builtins.DocTestParser.__setattr__" => "Implement setattr(self, name, value).", + "builtins.DocTestParser.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.DocTestParser.__str__" => "Return str(self).", + "builtins.DocTestParser.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.DocTestParser.__weakref__" => "list of weak references to the object", + "builtins.DocTestParser._check_prefix" => "Check that every line in the given list starts with the given\nprefix; if any line does not, then raise a ValueError.", + "builtins.DocTestParser._check_prompt_blank" => "Given the lines of a source string (including prompts and\nleading indentation), check to make sure that every prompt is\nfollowed by a space character. If any line is not followed by\na space character, then raise ValueError.", + "builtins.DocTestParser._find_options" => "Return a dictionary containing option overrides extracted from\noption directives in the given source string.\n\n`name` is the string's name, and `lineno` is the line number\nwhere the example starts; both are used for error messages.", + "builtins.DocTestParser._min_indent" => "Return the minimum indentation of any non-blank line in `s`", + "builtins.DocTestParser._parse_example" => "Given a regular expression match from `_EXAMPLE_RE` (`m`),\nreturn a pair `(source, want)`, where `source` is the matched\nexample's source code (with prompts and indentation stripped);\nand `want` is the example's expected output (with indentation\nstripped).\n\n`name` is the string's name, and `lineno` is the line number\nwhere the example starts; both are used for error messages.", + "builtins.DocTestParser.get_doctest" => "Extract all doctest examples from the given string, and\ncollect them into a `DocTest` object.\n\n`globs`, `name`, `filename`, and `lineno` are attributes for\nthe new `DocTest` object. See the documentation for `DocTest`\nfor more information.", + "builtins.DocTestParser.get_examples" => "Extract all doctest examples from the given string, and return\nthem as a list of `Example` objects. Line numbers are\n0-based, because it's most common in doctests that nothing\ninteresting appears on the same line as opening triple-quote,\nand so the first interesting line is called \"line 1\" then.\n\nThe optional argument `name` is a name identifying this\nstring, and is only used for error messages.", + "builtins.DocTestParser.parse" => "Divide the given string into examples and intervening text,\nand return them as a list of alternating Examples and strings.\nLine numbers for the Examples are 0-based. The optional\nargument `name` is a name identifying this string, and is only\nused for error messages.", + "builtins.DocTestRunner" => "A class used to run DocTest test cases, and accumulate statistics.\nThe `run` method is used to process a single DocTest case. It\nreturns a TestResults instance.\n\n >>> save_colorize = _colorize.COLORIZE\n >>> _colorize.COLORIZE = False\n\n >>> tests = DocTestFinder().find(_TestClass)\n >>> runner = DocTestRunner(verbose=False)\n >>> tests.sort(key = lambda test: test.name)\n >>> for test in tests:\n ... print(test.name, '->', runner.run(test))\n _TestClass -> TestResults(failed=0, attempted=2)\n _TestClass.__init__ -> TestResults(failed=0, attempted=2)\n _TestClass.get -> TestResults(failed=0, attempted=2)\n _TestClass.square -> TestResults(failed=0, attempted=1)\n\nThe `summarize` method prints a summary of all the test cases that\nhave been run by the runner, and returns an aggregated TestResults\ninstance:\n\n >>> runner.summarize(verbose=1)\n 4 items passed all tests:\n 2 tests in _TestClass\n 2 tests in _TestClass.__init__\n 2 tests in _TestClass.get\n 1 test in _TestClass.square\n 7 tests in 4 items.\n 7 passed.\n Test passed.\n TestResults(failed=0, attempted=7)\n\nThe aggregated number of tried examples and failed examples is also\navailable via the `tries`, `failures` and `skips` attributes:\n\n >>> runner.tries\n 7\n >>> runner.failures\n 0\n >>> runner.skips\n 0\n\nThe comparison between expected outputs and actual outputs is done\nby an `OutputChecker`. This comparison may be customized with a\nnumber of option flags; see the documentation for `testmod` for\nmore information. If the option flags are insufficient, then the\ncomparison may also be customized by passing a subclass of\n`OutputChecker` to the constructor.\n\nThe test runner's display output can be controlled in two ways.\nFirst, an output function (`out`) can be passed to\n`TestRunner.run`; this function will be called with strings that\nshould be displayed. It defaults to `sys.stdout.write`. If\ncapturing the output is not sufficient, then the display output\ncan be also customized by subclassing DocTestRunner, and\noverriding the methods `report_start`, `report_success`,\n`report_unexpected_exception`, and `report_failure`.\n\n >>> _colorize.COLORIZE = save_colorize", + "builtins.DocTestRunner._DocTestRunner__record_outcome" => "Record the fact that the given DocTest (`test`) generated `failures`\nfailures out of `tries` tried examples.", + "builtins.DocTestRunner._DocTestRunner__run" => "Run the examples in `test`. Write the outcome of each example\nwith one of the `DocTestRunner.report_*` methods, using the\nwriter function `out`. `compileflags` is the set of compiler\nflags that should be used to execute examples. Return a TestResults\ninstance. The examples are run in the namespace `test.globs`.", + "builtins.DocTestRunner.__delattr__" => "Implement delattr(self, name).", + "builtins.DocTestRunner.__eq__" => "Return self==value.", + "builtins.DocTestRunner.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.DocTestRunner.__ge__" => "Return self>=value.", + "builtins.DocTestRunner.__getattribute__" => "Return getattr(self, name).", + "builtins.DocTestRunner.__getstate__" => "Helper for pickle.", + "builtins.DocTestRunner.__gt__" => "Return self>value.", + "builtins.DocTestRunner.__hash__" => "Return hash(self).", + "builtins.DocTestRunner.__init__" => "Create a new test runner.\n\nOptional keyword arg `checker` is the `OutputChecker` that\nshould be used to compare the expected outputs and actual\noutputs of doctest examples.\n\nOptional keyword arg 'verbose' prints lots of stuff if true,\nonly failures if false; by default, it's true iff '-v' is in\nsys.argv.\n\nOptional argument `optionflags` can be used to control how the\ntest runner compares expected output to actual output, and how\nit displays failures. See the documentation for `testmod` for\nmore information.", + "builtins.DocTestRunner.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.DocTestRunner.__le__" => "Return self<=value.", + "builtins.DocTestRunner.__lt__" => "Return self<value.", + "builtins.DocTestRunner.__ne__" => "Return self!=value.", + "builtins.DocTestRunner.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.DocTestRunner.__reduce__" => "Helper for pickle.", + "builtins.DocTestRunner.__reduce_ex__" => "Helper for pickle.", + "builtins.DocTestRunner.__repr__" => "Return repr(self).", + "builtins.DocTestRunner.__setattr__" => "Implement setattr(self, name, value).", + "builtins.DocTestRunner.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.DocTestRunner.__str__" => "Return str(self).", + "builtins.DocTestRunner.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.DocTestRunner.__weakref__" => "list of weak references to the object", + "builtins.DocTestRunner.report_failure" => "Report that the given example failed.", + "builtins.DocTestRunner.report_start" => "Report that the test runner is about to process the given\nexample. (Only displays a message if verbose=True)", + "builtins.DocTestRunner.report_success" => "Report that the given example ran successfully. (Only\ndisplays a message if verbose=True)", + "builtins.DocTestRunner.report_unexpected_exception" => "Report that the given example raised an unexpected exception.", + "builtins.DocTestRunner.run" => "Run the examples in `test`, and display the results using the\nwriter function `out`.\n\nThe examples are run in the namespace `test.globs`. If\n`clear_globs` is true (the default), then this namespace will\nbe cleared after the test runs, to help with garbage\ncollection. If you would like to examine the namespace after\nthe test completes, then use `clear_globs=False`.\n\n`compileflags` gives the set of flags that should be used by\nthe Python compiler when running the examples. If not\nspecified, then it will default to the set of future-import\nflags that apply to `globs`.\n\nThe output of each example is checked using\n`DocTestRunner.check_output`, and the results are formatted by\nthe `DocTestRunner.report_*` methods.", + "builtins.DocTestRunner.summarize" => "Print a summary of all the test cases that have been run by\nthis DocTestRunner, and return a TestResults instance.\n\nThe optional `verbose` argument controls how detailed the\nsummary is. If the verbosity is not specified, then the\nDocTestRunner's verbosity is used.", + "builtins.DupHandle" => "Picklable wrapper for a handle.", + "builtins.DupHandle.__delattr__" => "Implement delattr(self, name).", + "builtins.DupHandle.__eq__" => "Return self==value.", + "builtins.DupHandle.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.DupHandle.__ge__" => "Return self>=value.", + "builtins.DupHandle.__getattribute__" => "Return getattr(self, name).", + "builtins.DupHandle.__getstate__" => "Helper for pickle.", + "builtins.DupHandle.__gt__" => "Return self>value.", + "builtins.DupHandle.__hash__" => "Return hash(self).", + "builtins.DupHandle.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.DupHandle.__le__" => "Return self<=value.", + "builtins.DupHandle.__lt__" => "Return self<value.", + "builtins.DupHandle.__ne__" => "Return self!=value.", + "builtins.DupHandle.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.DupHandle.__reduce__" => "Helper for pickle.", + "builtins.DupHandle.__reduce_ex__" => "Helper for pickle.", + "builtins.DupHandle.__repr__" => "Return repr(self).", + "builtins.DupHandle.__setattr__" => "Implement setattr(self, name, value).", + "builtins.DupHandle.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.DupHandle.__str__" => "Return str(self).", + "builtins.DupHandle.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.DupHandle.__weakref__" => "list of weak references to the object", + "builtins.DupHandle.detach" => "Get the handle. This should only be called once.", "builtins.DynamicClassAttribute" => "Route attribute access on a class to __getattr__.\n\nThis is a descriptor, used to define attributes that act differently\nwhen accessed through an instance and through a class. Instance access\nremains normal, but access to an attribute through a class will be\nrouted to the class's __getattr__ method; this is done by raising\nAttributeError.\n\nThis allows one to have properties active on an instance, and have\nvirtual attributes on the class with the same name. (Enum used this\nbetween Python versions 3.4 - 3.9 .)\n\nSubclass from this to use a different method of accessing virtual\nattributes and still be treated properly by the inspect module. (Enum\nuses this since Python 3.10 .)", "builtins.DynamicClassAttribute.__delattr__" => "Implement delattr(self, name).", "builtins.DynamicClassAttribute.__eq__" => "Return self==value.", @@ -10046,6 +12544,87 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.EOFError.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.EOFError.add_note" => "Add a note to the exception", "builtins.EOFError.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.Element.__bool__" => "True if self else False", + "builtins.Element.__delattr__" => "Implement delattr(self, name).", + "builtins.Element.__delitem__" => "Delete self[key].", + "builtins.Element.__eq__" => "Return self==value.", + "builtins.Element.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Element.__ge__" => "Return self>=value.", + "builtins.Element.__getattribute__" => "Return getattr(self, name).", + "builtins.Element.__getitem__" => "Return self[key].", + "builtins.Element.__gt__" => "Return self>value.", + "builtins.Element.__hash__" => "Return hash(self).", + "builtins.Element.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Element.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Element.__le__" => "Return self<=value.", + "builtins.Element.__len__" => "Return len(self).", + "builtins.Element.__lt__" => "Return self<value.", + "builtins.Element.__ne__" => "Return self!=value.", + "builtins.Element.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Element.__reduce__" => "Helper for pickle.", + "builtins.Element.__reduce_ex__" => "Helper for pickle.", + "builtins.Element.__repr__" => "Return repr(self).", + "builtins.Element.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Element.__setitem__" => "Set self[key] to value.", + "builtins.Element.__str__" => "Return str(self).", + "builtins.Element.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Element.attrib" => "A dictionary containing the element's attributes", + "builtins.Element.tag" => "A string identifying what kind of data this element represents", + "builtins.Element.tail" => "A string of text directly after the end tag, or None", + "builtins.Element.text" => "A string of text directly after the start tag, or None", + "builtins.Encoder" => "Encoder(markers, default, encoder, indent, key_separator, item_separator, sort_keys, skipkeys, allow_nan)", + "builtins.Encoder.__call__" => "Call self as a function.", + "builtins.Encoder.__delattr__" => "Implement delattr(self, name).", + "builtins.Encoder.__eq__" => "Return self==value.", + "builtins.Encoder.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Encoder.__ge__" => "Return self>=value.", + "builtins.Encoder.__getattribute__" => "Return getattr(self, name).", + "builtins.Encoder.__getstate__" => "Helper for pickle.", + "builtins.Encoder.__gt__" => "Return self>value.", + "builtins.Encoder.__hash__" => "Return hash(self).", + "builtins.Encoder.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Encoder.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Encoder.__le__" => "Return self<=value.", + "builtins.Encoder.__lt__" => "Return self<value.", + "builtins.Encoder.__ne__" => "Return self!=value.", + "builtins.Encoder.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Encoder.__reduce__" => "Helper for pickle.", + "builtins.Encoder.__reduce_ex__" => "Helper for pickle.", + "builtins.Encoder.__repr__" => "Return repr(self).", + "builtins.Encoder.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Encoder.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Encoder.__str__" => "Return str(self).", + "builtins.Encoder.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Encoder.default" => "default", + "builtins.Encoder.encoder" => "encoder", + "builtins.Encoder.indent" => "indent", + "builtins.Encoder.item_separator" => "item_separator", + "builtins.Encoder.key_separator" => "key_separator", + "builtins.Encoder.markers" => "markers", + "builtins.Encoder.skipkeys" => "skipkeys", + "builtins.Encoder.sort_keys" => "sort_keys", + "builtins.EncodingMap.__delattr__" => "Implement delattr(self, name).", + "builtins.EncodingMap.__eq__" => "Return self==value.", + "builtins.EncodingMap.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.EncodingMap.__ge__" => "Return self>=value.", + "builtins.EncodingMap.__getattribute__" => "Return getattr(self, name).", + "builtins.EncodingMap.__getstate__" => "Helper for pickle.", + "builtins.EncodingMap.__gt__" => "Return self>value.", + "builtins.EncodingMap.__hash__" => "Return hash(self).", + "builtins.EncodingMap.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.EncodingMap.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.EncodingMap.__le__" => "Return self<=value.", + "builtins.EncodingMap.__lt__" => "Return self<value.", + "builtins.EncodingMap.__ne__" => "Return self!=value.", + "builtins.EncodingMap.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.EncodingMap.__reduce__" => "Helper for pickle.", + "builtins.EncodingMap.__reduce_ex__" => "Helper for pickle.", + "builtins.EncodingMap.__repr__" => "Return repr(self).", + "builtins.EncodingMap.__setattr__" => "Implement setattr(self, name, value).", + "builtins.EncodingMap.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.EncodingMap.__str__" => "Return str(self).", + "builtins.EncodingMap.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.EncodingMap.size" => "Return the size (in bytes) of this object.", "builtins.EncodingWarning" => "Base class for warnings about encodings.", "builtins.EncodingWarning.__delattr__" => "Implement delattr(self, name).", "builtins.EncodingWarning.__eq__" => "Return self==value.", @@ -10069,6 +12648,47 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.EncodingWarning.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.EncodingWarning.add_note" => "Add a note to the exception", "builtins.EncodingWarning.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.Enum" => "Create a collection of name/value pairs.\n\nExample enumeration:\n\n>>> class Color(Enum):\n... RED = 1\n... BLUE = 2\n... GREEN = 3\n\nAccess them by:\n\n- attribute access:\n\n >>> Color.RED\n <Color.RED: 1>\n\n- value lookup:\n\n >>> Color(1)\n <Color.RED: 1>\n\n- name lookup:\n\n >>> Color['RED']\n <Color.RED: 1>\n\nEnumerations can be iterated over, and know how many members they have:\n\n>>> len(Color)\n3\n\n>>> list(Color)\n[<Color.RED: 1>, <Color.BLUE: 2>, <Color.GREEN: 3>]\n\nMethods can be added to enumerations, and members can have their own\nattributes -- see the documentation for details.", + "builtins.Enum.__contains__" => "Return True if `value` is in `cls`.\n\n`value` is in `cls` if:\n1) `value` is a member of `cls`, or\n2) `value` is the value of one of the `cls`'s members.\n3) `value` is a pseudo-member (flags)", + "builtins.Enum.__getitem__" => "Return the member matching `name`.", + "builtins.Enum.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Enum.__iter__" => "Return members in definition order.", + "builtins.Enum.__len__" => "Return the number of members (no aliases)", + "builtins.EnvBuilder" => "This class exists to allow virtual environment creation to be\ncustomized. The constructor parameters determine the builder's\nbehaviour when called upon to create a virtual environment.\n\nBy default, the builder makes the system (global) site-packages dir\n*un*available to the created environment.\n\nIf invoked using the Python -m option, the default is to use copying\non Windows platforms but symlinks elsewhere. If instantiated some\nother way, the default is to *not* use symlinks.\n\n:param system_site_packages: If True, the system (global) site-packages\n dir is available to created environments.\n:param clear: If True, delete the contents of the environment directory if\n it already exists, before environment creation.\n:param symlinks: If True, attempt to symlink rather than copy files into\n virtual environment.\n:param upgrade: If True, upgrade an existing virtual environment.\n:param with_pip: If True, ensure pip is installed in the virtual\n environment\n:param prompt: Alternative terminal prefix for the environment.\n:param upgrade_deps: Update the base venv modules to the latest on PyPI\n:param scm_ignore_files: Create ignore files for the SCMs specified by the\n iterable.", + "builtins.EnvBuilder.__delattr__" => "Implement delattr(self, name).", + "builtins.EnvBuilder.__eq__" => "Return self==value.", + "builtins.EnvBuilder.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.EnvBuilder.__ge__" => "Return self>=value.", + "builtins.EnvBuilder.__getattribute__" => "Return getattr(self, name).", + "builtins.EnvBuilder.__getstate__" => "Helper for pickle.", + "builtins.EnvBuilder.__gt__" => "Return self>value.", + "builtins.EnvBuilder.__hash__" => "Return hash(self).", + "builtins.EnvBuilder.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.EnvBuilder.__le__" => "Return self<=value.", + "builtins.EnvBuilder.__lt__" => "Return self<value.", + "builtins.EnvBuilder.__ne__" => "Return self!=value.", + "builtins.EnvBuilder.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.EnvBuilder.__reduce__" => "Helper for pickle.", + "builtins.EnvBuilder.__reduce_ex__" => "Helper for pickle.", + "builtins.EnvBuilder.__repr__" => "Return repr(self).", + "builtins.EnvBuilder.__setattr__" => "Implement setattr(self, name, value).", + "builtins.EnvBuilder.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.EnvBuilder.__str__" => "Return str(self).", + "builtins.EnvBuilder.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.EnvBuilder.__weakref__" => "list of weak references to the object", + "builtins.EnvBuilder._call_new_python" => "Executes the newly created Python using safe-ish options", + "builtins.EnvBuilder._same_path" => "Check whether two paths appear the same.\n\nWhether they refer to the same file is irrelevant; we're testing for\nwhether a human reader would look at the path string and easily tell\nthat they're the same file.", + "builtins.EnvBuilder._setup_pip" => "Installs or upgrades pip in a virtual environment", + "builtins.EnvBuilder.create" => "Create a virtual environment in a directory.\n\n:param env_dir: The target directory to create an environment in.", + "builtins.EnvBuilder.create_configuration" => "Create a configuration file indicating where the environment's Python\nwas copied from, and whether the system site-packages should be made\navailable in the environment.\n\n:param context: The information for the environment creation request\n being processed.", + "builtins.EnvBuilder.create_git_ignore_file" => "Create a .gitignore file in the environment directory.\n\nThe contents of the file cause the entire environment directory to be\nignored by git.", + "builtins.EnvBuilder.ensure_directories" => "Create the directories for the environment.\n\nReturns a context object which holds paths in the environment,\nfor use by subsequent logic.", + "builtins.EnvBuilder.install_scripts" => "Install scripts into the created environment from a directory.\n\n:param context: The information for the environment creation request\n being processed.\n:param path: Absolute pathname of a directory containing script.\n Scripts in the 'common' subdirectory of this directory,\n and those in the directory named for the platform\n being run on, are installed in the created environment.\n Placeholder variables are replaced with environment-\n specific values.", + "builtins.EnvBuilder.post_setup" => "Hook for post-setup modification of the venv. Subclasses may install\nadditional packages or scripts here, add activation shell scripts, etc.\n\n:param context: The information for the environment creation request\n being processed.", + "builtins.EnvBuilder.replace_variables" => "Replace variable placeholders in script text with context-specific\nvariables.\n\nReturn the text passed in , but with variables replaced.\n\n:param text: The text in which to replace placeholder variables.\n:param context: The information for the environment creation request\n being processed.", + "builtins.EnvBuilder.setup_python" => "Set up a Python executable in the environment.\n\n:param context: The information for the environment creation request\n being processed.", + "builtins.EnvBuilder.setup_scripts" => "Set up scripts into the created environment from a directory.\n\nThis method installs the default scripts into the environment\nbeing created. You can prevent the default installation by overriding\nthis method if you really need to, or if you need to specify\na different location for the scripts to install. By default, the\n'scripts' directory in the venv package is used as the source of\nscripts to install.", + "builtins.EnvBuilder.symlink_or_copy" => "Try symlinking a file, and if that fails, fall back to copying.\n(Unused on Windows, because we can't just copy a failed symlink file: we\nswitch to a different set of files instead.)", "builtins.EnvironmentError" => "Base class for I/O related errors.", "builtins.EnvironmentError.__delattr__" => "Implement delattr(self, name).", "builtins.EnvironmentError.__eq__" => "Return self==value.", @@ -10097,6 +12717,54 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.EnvironmentError.strerror" => "exception strerror", "builtins.EnvironmentError.winerror" => "Win32 exception code", "builtins.EnvironmentError.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.Event" => "Container for the properties of an event.\n\nInstances of this type are generated if one of the following events occurs:\n\nKeyPress, KeyRelease - for keyboard events\nButtonPress, ButtonRelease, Motion, Enter, Leave, MouseWheel - for mouse events\nVisibility, Unmap, Map, Expose, FocusIn, FocusOut, Circulate,\nColormap, Gravity, Reparent, Property, Destroy, Activate,\nDeactivate - for window events.\n\nIf a callback function for one of these events is registered\nusing bind, bind_all, bind_class, or tag_bind, the callback is\ncalled with an Event as first argument. It will have the\nfollowing attributes (in braces are the event types for which\nthe attribute is valid):\n\n serial - serial number of event\nnum - mouse button pressed (ButtonPress, ButtonRelease)\nfocus - whether the window has the focus (Enter, Leave)\nheight - height of the exposed window (Configure, Expose)\nwidth - width of the exposed window (Configure, Expose)\nkeycode - keycode of the pressed key (KeyPress, KeyRelease)\nstate - state of the event as a number (ButtonPress, ButtonRelease,\n Enter, KeyPress, KeyRelease,\n Leave, Motion)\nstate - state as a string (Visibility)\ntime - when the event occurred\nx - x-position of the mouse\ny - y-position of the mouse\nx_root - x-position of the mouse on the screen\n (ButtonPress, ButtonRelease, KeyPress, KeyRelease, Motion)\ny_root - y-position of the mouse on the screen\n (ButtonPress, ButtonRelease, KeyPress, KeyRelease, Motion)\nchar - pressed character (KeyPress, KeyRelease)\nsend_event - see X/Windows documentation\nkeysym - keysym of the event as a string (KeyPress, KeyRelease)\nkeysym_num - keysym of the event as a number (KeyPress, KeyRelease)\ntype - type of the event as a number\nwidget - widget in which the event occurred\ndelta - delta of wheel movement (MouseWheel)", + "builtins.Event.__class_getitem__" => "Represent a PEP 585 generic type\n\nE.g. for t = list[int], t.__origin__ is list and t.__args__ is (int,).", + "builtins.Event.__delattr__" => "Implement delattr(self, name).", + "builtins.Event.__eq__" => "Return self==value.", + "builtins.Event.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Event.__ge__" => "Return self>=value.", + "builtins.Event.__getattribute__" => "Return getattr(self, name).", + "builtins.Event.__getstate__" => "Helper for pickle.", + "builtins.Event.__gt__" => "Return self>value.", + "builtins.Event.__hash__" => "Return hash(self).", + "builtins.Event.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Event.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Event.__le__" => "Return self<=value.", + "builtins.Event.__lt__" => "Return self<value.", + "builtins.Event.__ne__" => "Return self!=value.", + "builtins.Event.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Event.__reduce__" => "Helper for pickle.", + "builtins.Event.__reduce_ex__" => "Helper for pickle.", + "builtins.Event.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Event.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Event.__str__" => "Return str(self).", + "builtins.Event.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Event.__weakref__" => "list of weak references to the object", + "builtins.Event.clear" => "Reset the internal flag to false.\n\nSubsequently, threads calling wait() will block until set() is called to\nset the internal flag to true again.", + "builtins.Event.isSet" => "Return true if and only if the internal flag is true.\n\nThis method is deprecated, use is_set() instead.", + "builtins.Event.is_set" => "Return true if and only if the internal flag is true.", + "builtins.Event.set" => "Set the internal flag to true.\n\nAll threads waiting for it to become true are awakened. Threads\nthat call wait() once the flag is true will not block at all.", + "builtins.Event.wait" => "Block until the internal flag is true.\n\nIf the internal flag is true on entry, return immediately. Otherwise,\nblock until another thread calls set() to set the flag to true, or until\nthe optional timeout occurs.\n\nWhen the timeout argument is present and not None, it should be a\nfloating-point number specifying a timeout for the operation in seconds\n(or fractions thereof).\n\nThis method returns the internal flag on exit, so it will always return\n``True`` except if a timeout is given and the operation times out, when\nit will return ``False``.", + "builtins.Example" => "A single doctest example, consisting of source code and expected\noutput. `Example` defines the following attributes:\n\n - source: A single Python statement, always ending with a newline.\n The constructor adds a newline if needed.\n\n - want: The expected output from running the source code (either\n from stdout, or a traceback in case of exception). `want` ends\n with a newline unless it's empty, in which case it's an empty\n string. The constructor adds a newline if needed.\n\n - exc_msg: The exception message generated by the example, if\n the example is expected to generate an exception; or `None` if\n it is not expected to generate an exception. This exception\n message is compared against the return value of\n `traceback.format_exception_only()`. `exc_msg` ends with a\n newline unless it's `None`. The constructor adds a newline\n if needed.\n\n - lineno: The line number within the DocTest string containing\n this Example where the Example begins. This line number is\n zero-based, with respect to the beginning of the DocTest.\n\n - indent: The example's indentation in the DocTest string.\n I.e., the number of space characters that precede the\n example's first prompt.\n\n - options: A dictionary mapping from option flags to True or\n False, which is used to override default options for this\n example. Any option flags not contained in this dictionary\n are left at their default value (as specified by the\n DocTestRunner's optionflags). By default, no options are set.", + "builtins.Example.__delattr__" => "Implement delattr(self, name).", + "builtins.Example.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Example.__ge__" => "Return self>=value.", + "builtins.Example.__getattribute__" => "Return getattr(self, name).", + "builtins.Example.__getstate__" => "Helper for pickle.", + "builtins.Example.__gt__" => "Return self>value.", + "builtins.Example.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Example.__le__" => "Return self<=value.", + "builtins.Example.__lt__" => "Return self<value.", + "builtins.Example.__ne__" => "Return self!=value.", + "builtins.Example.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Example.__reduce__" => "Helper for pickle.", + "builtins.Example.__reduce_ex__" => "Helper for pickle.", + "builtins.Example.__repr__" => "Return repr(self).", + "builtins.Example.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Example.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Example.__str__" => "Return str(self).", + "builtins.Example.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Example.__weakref__" => "list of weak references to the object", "builtins.Exception" => "Common base class for all non-exit exceptions.", "builtins.Exception.__delattr__" => "Implement delattr(self, name).", "builtins.Exception.__eq__" => "Return self==value.", @@ -10146,6 +12814,108 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.ExceptionGroup.exceptions" => "nested exceptions", "builtins.ExceptionGroup.message" => "exception message", "builtins.ExceptionGroup.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.Executor" => "This is an abstract base class for concrete asynchronous executors.", + "builtins.Executor.__delattr__" => "Implement delattr(self, name).", + "builtins.Executor.__eq__" => "Return self==value.", + "builtins.Executor.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Executor.__ge__" => "Return self>=value.", + "builtins.Executor.__getattribute__" => "Return getattr(self, name).", + "builtins.Executor.__getstate__" => "Helper for pickle.", + "builtins.Executor.__gt__" => "Return self>value.", + "builtins.Executor.__hash__" => "Return hash(self).", + "builtins.Executor.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Executor.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Executor.__le__" => "Return self<=value.", + "builtins.Executor.__lt__" => "Return self<value.", + "builtins.Executor.__ne__" => "Return self!=value.", + "builtins.Executor.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Executor.__reduce__" => "Helper for pickle.", + "builtins.Executor.__reduce_ex__" => "Helper for pickle.", + "builtins.Executor.__repr__" => "Return repr(self).", + "builtins.Executor.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Executor.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Executor.__str__" => "Return str(self).", + "builtins.Executor.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Executor.__weakref__" => "list of weak references to the object", + "builtins.Executor.map" => "Returns an iterator equivalent to map(fn, iter).\n\nArgs:\n fn: A callable that will take as many arguments as there are\n passed iterables.\n timeout: The maximum number of seconds to wait. If None, then\n there is no limit on the wait time.\n chunksize: The size of the chunks the iterable will be broken\n into before being passed to a child process. This argument\n is only used by ProcessPoolExecutor; it is ignored by\n ThreadPoolExecutor.\n buffersize: The number of submitted tasks whose results have not\n yet been yielded. If the buffer is full, iteration over the\n iterables pauses until a result is yielded from the buffer.\n If None, all input elements are eagerly collected, and\n a task is submitted for each.\n\nReturns:\n An iterator equivalent to: map(func, *iterables) but the calls\n may be evaluated out-of-order.\n\nRaises:\n TimeoutError: If the entire result iterator could not be\n generated before the given timeout.\n Exception: If fn(*args) raises for any values.", + "builtins.Executor.shutdown" => "Clean-up the resources associated with the Executor.\n\nIt is safe to call this method several times. Otherwise, no other\nmethods can be called after this one.\n\nArgs:\n wait: If True then shutdown will not return until all running\n futures have finished executing and the resources used by\n the executor have been reclaimed.\n cancel_futures: If True then shutdown will cancel all pending\n futures. Futures that are completed or running will not be\n cancelled.", + "builtins.Executor.submit" => "Submits a callable to be executed with the given arguments.\n\nSchedules the callable to be executed as fn(*args, **kwargs) and\nreturns a Future instance representing the execution of the\ncallable.\n\nReturns:\n A Future representing the given call.", + "builtins.FTP" => "An FTP client class.\n\nTo create a connection, call the class using these arguments:\n host, user, passwd, acct, timeout, source_address, encoding\n\nThe first four arguments are all strings, and have default value ''.\nThe parameter ´timeout´ must be numeric and defaults to None if not\npassed, meaning that no timeout will be set on any ftp socket(s).\nIf a timeout is passed, then this is now the default timeout for all ftp\nsocket operations for this instance.\nThe last parameter is the encoding of filenames, which defaults to utf-8.\n\nThen use self.connect() with optional host and port argument.\n\nTo download a file, use ftp.retrlines('RETR ' + filename),\nor ftp.retrbinary() with slightly different arguments.\nTo upload a file, use ftp.storlines() or ftp.storbinary(),\nwhich have an open file as argument (see their definitions\nbelow for details).\nThe download/upload functions first issue appropriate TYPE\nand PORT or PASV commands.", + "builtins.FTP.__delattr__" => "Implement delattr(self, name).", + "builtins.FTP.__eq__" => "Return self==value.", + "builtins.FTP.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.FTP.__ge__" => "Return self>=value.", + "builtins.FTP.__getattribute__" => "Return getattr(self, name).", + "builtins.FTP.__getstate__" => "Helper for pickle.", + "builtins.FTP.__gt__" => "Return self>value.", + "builtins.FTP.__hash__" => "Return hash(self).", + "builtins.FTP.__init__" => "Initialization method (called by class instantiation).\nInitialize host to localhost, port to standard ftp port.\nOptional arguments are host (for connect()),\nand user, passwd, acct (for login()).", + "builtins.FTP.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.FTP.__le__" => "Return self<=value.", + "builtins.FTP.__lt__" => "Return self<value.", + "builtins.FTP.__ne__" => "Return self!=value.", + "builtins.FTP.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.FTP.__reduce__" => "Helper for pickle.", + "builtins.FTP.__reduce_ex__" => "Helper for pickle.", + "builtins.FTP.__repr__" => "Return repr(self).", + "builtins.FTP.__setattr__" => "Implement setattr(self, name, value).", + "builtins.FTP.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.FTP.__str__" => "Return str(self).", + "builtins.FTP.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.FTP.__weakref__" => "list of weak references to the object", + "builtins.FTP.abort" => "Abort a file transfer. Uses out-of-band data.\nThis does not follow the procedure from the RFC to send Telnet\nIP and Synch; that doesn't seem to work with the servers I've\ntried. Instead, just send the ABOR command as OOB data.", + "builtins.FTP.acct" => "Send new account name.", + "builtins.FTP.close" => "Close the connection without assuming anything about it.", + "builtins.FTP.connect" => "Connect to host. Arguments are:\n- host: hostname to connect to (string, default previous host)\n- port: port to connect to (integer, default previous port)\n- timeout: the timeout to set against the ftp socket(s)\n- source_address: a 2-tuple (host, port) for the socket to bind\n to as its source address before connecting.", + "builtins.FTP.cwd" => "Change to a directory.", + "builtins.FTP.debug" => "Set the debugging level.\nThe required argument level means:\n0: no debugging output (default)\n1: print commands and responses but not body text etc.\n2: also print raw lines read and sent before stripping CR/LF", + "builtins.FTP.delete" => "Delete a file.", + "builtins.FTP.dir" => "List a directory in long form.\nBy default list current directory to stdout.\nOptional last argument is callback function; all\nnon-empty arguments before it are concatenated to the\nLIST command. (This *should* only be used for a pathname.)", + "builtins.FTP.getwelcome" => "Get the welcome message from the server.\n(this is read and squirreled away by connect())", + "builtins.FTP.login" => "Login, default anonymous.", + "builtins.FTP.makepasv" => "Internal: Does the PASV or EPSV handshake -> (address, port)", + "builtins.FTP.makeport" => "Create a new socket and send a PORT command for it.", + "builtins.FTP.mkd" => "Make a directory, return its full pathname.", + "builtins.FTP.mlsd" => "List a directory in a standardized format by using MLSD\ncommand (RFC-3659). If path is omitted the current directory\nis assumed. \"facts\" is a list of strings representing the type\nof information desired (e.g. [\"type\", \"size\", \"perm\"]).\n\nReturn a generator object yielding a tuple of two elements\nfor every file found in path.\nFirst element is the file name, the second one is a dictionary\nincluding a variable number of \"facts\" depending on the server\nand whether \"facts\" argument has been provided.", + "builtins.FTP.nlst" => "Return a list of files in a given directory (default the current).", + "builtins.FTP.ntransfercmd" => "Initiate a transfer over the data connection.\n\nIf the transfer is active, send a port command and the\ntransfer command, and accept the connection. If the server is\npassive, send a pasv command, connect to it, and start the\ntransfer command. Either way, return the socket for the\nconnection and the expected size of the transfer. The\nexpected size may be None if it could not be determined.\n\nOptional 'rest' argument can be a string that is sent as the\nargument to a REST command. This is essentially a server\nmarker used to tell the server to skip over any data up to the\ngiven marker.", + "builtins.FTP.pwd" => "Return current working directory.", + "builtins.FTP.quit" => "Quit, and close the connection.", + "builtins.FTP.rename" => "Rename a file.", + "builtins.FTP.retrbinary" => "Retrieve data in binary mode. A new port is created for you.\n\nArgs:\n cmd: A RETR command.\n callback: A single parameter callable to be called on each\n block of data read.\n blocksize: The maximum number of bytes to read from the\n socket at one time. [default: 8192]\n rest: Passed to transfercmd(). [default: None]\n\nReturns:\n The response code.", + "builtins.FTP.retrlines" => "Retrieve data in line mode. A new port is created for you.\n\nArgs:\n cmd: A RETR, LIST, or NLST command.\n callback: An optional single parameter callable that is called\n for each line with the trailing CRLF stripped.\n [default: print_line()]\n\nReturns:\n The response code.", + "builtins.FTP.rmd" => "Remove a directory.", + "builtins.FTP.sendcmd" => "Send a command and return the response.", + "builtins.FTP.sendeprt" => "Send an EPRT command with the current host and the given port number.", + "builtins.FTP.sendport" => "Send a PORT command with the current host and the given\nport number.", + "builtins.FTP.set_debuglevel" => "Set the debugging level.\nThe required argument level means:\n0: no debugging output (default)\n1: print commands and responses but not body text etc.\n2: also print raw lines read and sent before stripping CR/LF", + "builtins.FTP.set_pasv" => "Use passive or active mode for data transfers.\nWith a false argument, use the normal PORT mode,\nWith a true argument, use the PASV command.", + "builtins.FTP.size" => "Retrieve the size of a file.", + "builtins.FTP.storbinary" => "Store a file in binary mode. A new port is created for you.\n\nArgs:\n cmd: A STOR command.\n fp: A file-like object with a read(num_bytes) method.\n blocksize: The maximum data size to read from fp and send over\n the connection at once. [default: 8192]\n callback: An optional single parameter callable that is called on\n each block of data after it is sent. [default: None]\n rest: Passed to transfercmd(). [default: None]\n\nReturns:\n The response code.", + "builtins.FTP.storlines" => "Store a file in line mode. A new port is created for you.\n\nArgs:\n cmd: A STOR command.\n fp: A file-like object with a readline() method.\n callback: An optional single parameter callable that is called on\n each line after it is sent. [default: None]\n\nReturns:\n The response code.", + "builtins.FTP.transfercmd" => "Like ntransfercmd() but returns only the socket.", + "builtins.FTP.voidcmd" => "Send a command and expect a response beginning with '2'.", + "builtins.FTP.voidresp" => "Expect a response beginning with '2'.", + "builtins.Field.__class_getitem__" => "Represent a PEP 585 generic type\n\nE.g. for t = list[int], t.__origin__ is list and t.__args__ is (int,).", + "builtins.Field.__delattr__" => "Implement delattr(self, name).", + "builtins.Field.__eq__" => "Return self==value.", + "builtins.Field.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Field.__ge__" => "Return self>=value.", + "builtins.Field.__getattribute__" => "Return getattr(self, name).", + "builtins.Field.__getstate__" => "Helper for pickle.", + "builtins.Field.__gt__" => "Return self>value.", + "builtins.Field.__hash__" => "Return hash(self).", + "builtins.Field.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Field.__le__" => "Return self<=value.", + "builtins.Field.__lt__" => "Return self<value.", + "builtins.Field.__ne__" => "Return self!=value.", + "builtins.Field.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Field.__reduce__" => "Helper for pickle.", + "builtins.Field.__reduce_ex__" => "Helper for pickle.", + "builtins.Field.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Field.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Field.__str__" => "Return str(self).", + "builtins.Field.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.FileExistsError" => "File already exists.", "builtins.FileExistsError.__delattr__" => "Implement delattr(self, name).", "builtins.FileExistsError.__eq__" => "Return self==value.", @@ -10174,6 +12944,79 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.FileExistsError.strerror" => "exception strerror", "builtins.FileExistsError.winerror" => "Win32 exception code", "builtins.FileExistsError.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.FileFinder" => "File-based finder.\n\nInteractions with the file system are cached for performance, being\nrefreshed when the directory the finder is handling has been modified.", + "builtins.FileFinder.__delattr__" => "Implement delattr(self, name).", + "builtins.FileFinder.__eq__" => "Return self==value.", + "builtins.FileFinder.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.FileFinder.__ge__" => "Return self>=value.", + "builtins.FileFinder.__getattribute__" => "Return getattr(self, name).", + "builtins.FileFinder.__getstate__" => "Helper for pickle.", + "builtins.FileFinder.__gt__" => "Return self>value.", + "builtins.FileFinder.__hash__" => "Return hash(self).", + "builtins.FileFinder.__init__" => "Initialize with the path to search on and a variable number of\n2-tuples containing the loader and the file suffixes the loader\nrecognizes.", + "builtins.FileFinder.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.FileFinder.__le__" => "Return self<=value.", + "builtins.FileFinder.__lt__" => "Return self<value.", + "builtins.FileFinder.__ne__" => "Return self!=value.", + "builtins.FileFinder.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.FileFinder.__reduce__" => "Helper for pickle.", + "builtins.FileFinder.__reduce_ex__" => "Helper for pickle.", + "builtins.FileFinder.__setattr__" => "Implement setattr(self, name, value).", + "builtins.FileFinder.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.FileFinder.__str__" => "Return str(self).", + "builtins.FileFinder.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.FileFinder.__weakref__" => "list of weak references to the object", + "builtins.FileFinder._fill_cache" => "Fill the cache of potential modules and packages for this directory.", + "builtins.FileFinder.find_spec" => "Try to find a spec for the specified module.\n\nReturns the matching spec, or None if not found.", + "builtins.FileFinder.invalidate_caches" => "Invalidate the directory mtime.", + "builtins.FileFinder.path_hook" => "A class method which returns a closure to use on sys.path_hook\nwhich will return an instance using the specified loaders and the path\ncalled on the closure.\n\nIf the path called on the closure is not a directory, ImportError is\nraised.", + "builtins.FileInput" => "FileInput([files[, inplace[, backup]]], *, mode=None, openhook=None)\n\nClass FileInput is the implementation of the module; its methods\nfilename(), lineno(), fileline(), isfirstline(), isstdin(), fileno(),\nnextfile() and close() correspond to the functions of the same name\nin the module.\nIn addition it has a readline() method which returns the next\ninput line, and a __getitem__() method which implements the\nsequence behavior. The sequence must be accessed in strictly\nsequential order; random access and readline() cannot be mixed.", + "builtins.FileInput.__class_getitem__" => "Represent a PEP 585 generic type\n\nE.g. for t = list[int], t.__origin__ is list and t.__args__ is (int,).", + "builtins.FileInput.__delattr__" => "Implement delattr(self, name).", + "builtins.FileInput.__eq__" => "Return self==value.", + "builtins.FileInput.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.FileInput.__ge__" => "Return self>=value.", + "builtins.FileInput.__getattribute__" => "Return getattr(self, name).", + "builtins.FileInput.__getstate__" => "Helper for pickle.", + "builtins.FileInput.__gt__" => "Return self>value.", + "builtins.FileInput.__hash__" => "Return hash(self).", + "builtins.FileInput.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.FileInput.__le__" => "Return self<=value.", + "builtins.FileInput.__lt__" => "Return self<value.", + "builtins.FileInput.__ne__" => "Return self!=value.", + "builtins.FileInput.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.FileInput.__reduce__" => "Helper for pickle.", + "builtins.FileInput.__reduce_ex__" => "Helper for pickle.", + "builtins.FileInput.__repr__" => "Return repr(self).", + "builtins.FileInput.__setattr__" => "Implement setattr(self, name, value).", + "builtins.FileInput.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.FileInput.__str__" => "Return str(self).", + "builtins.FileInput.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.FileInput.__weakref__" => "list of weak references to the object", + "builtins.FileLoader" => "Base file loader class which implements the loader protocol methods that\nrequire file system usage.", + "builtins.FileLoader.__delattr__" => "Implement delattr(self, name).", + "builtins.FileLoader.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.FileLoader.__ge__" => "Return self>=value.", + "builtins.FileLoader.__getattribute__" => "Return getattr(self, name).", + "builtins.FileLoader.__getstate__" => "Helper for pickle.", + "builtins.FileLoader.__gt__" => "Return self>value.", + "builtins.FileLoader.__init__" => "Cache the module name and the path to the file found by the\nfinder.", + "builtins.FileLoader.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.FileLoader.__le__" => "Return self<=value.", + "builtins.FileLoader.__lt__" => "Return self<value.", + "builtins.FileLoader.__ne__" => "Return self!=value.", + "builtins.FileLoader.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.FileLoader.__reduce__" => "Helper for pickle.", + "builtins.FileLoader.__reduce_ex__" => "Helper for pickle.", + "builtins.FileLoader.__repr__" => "Return repr(self).", + "builtins.FileLoader.__setattr__" => "Implement setattr(self, name, value).", + "builtins.FileLoader.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.FileLoader.__str__" => "Return str(self).", + "builtins.FileLoader.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.FileLoader.__weakref__" => "list of weak references to the object", + "builtins.FileLoader.get_data" => "Return the data from path as raw bytes.", + "builtins.FileLoader.get_filename" => "Return the path to the source file as found by the finder.", + "builtins.FileLoader.load_module" => "Load a module from a file.\n\nThis method is deprecated. Use exec_module() instead.", "builtins.FileNotFoundError" => "File not found.", "builtins.FileNotFoundError.__delattr__" => "Implement delattr(self, name).", "builtins.FileNotFoundError.__eq__" => "Return self==value.", @@ -10202,6 +13045,99 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.FileNotFoundError.strerror" => "exception strerror", "builtins.FileNotFoundError.winerror" => "Win32 exception code", "builtins.FileNotFoundError.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.FileType" => "Deprecated factory for creating file object types\n\nInstances of FileType are typically passed as type= arguments to the\nArgumentParser add_argument() method.\n\nKeyword Arguments:\n - mode -- A string indicating how the file is to be opened. Accepts the\n same values as the builtin open() function.\n - bufsize -- The file's desired buffer size. Accepts the same values as\n the builtin open() function.\n - encoding -- The file's encoding. Accepts the same values as the\n builtin open() function.\n - errors -- A string indicating how encoding and decoding errors are to\n be handled. Accepts the same value as the builtin open() function.", + "builtins.FileType.__delattr__" => "Implement delattr(self, name).", + "builtins.FileType.__eq__" => "Return self==value.", + "builtins.FileType.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.FileType.__ge__" => "Return self>=value.", + "builtins.FileType.__getattribute__" => "Return getattr(self, name).", + "builtins.FileType.__getstate__" => "Helper for pickle.", + "builtins.FileType.__gt__" => "Return self>value.", + "builtins.FileType.__hash__" => "Return hash(self).", + "builtins.FileType.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.FileType.__le__" => "Return self<=value.", + "builtins.FileType.__lt__" => "Return self<value.", + "builtins.FileType.__ne__" => "Return self!=value.", + "builtins.FileType.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.FileType.__reduce__" => "Helper for pickle.", + "builtins.FileType.__reduce_ex__" => "Helper for pickle.", + "builtins.FileType.__setattr__" => "Implement setattr(self, name, value).", + "builtins.FileType.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.FileType.__str__" => "Return str(self).", + "builtins.FileType.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.FileType.__weakref__" => "list of weak references to the object", + "builtins.Filter" => "Filter instances are used to perform arbitrary filtering of LogRecords.\n\nLoggers and Handlers can optionally use Filter instances to filter\nrecords as desired. The base filter class only allows events which are\nbelow a certain point in the logger hierarchy. For example, a filter\ninitialized with \"A.B\" will allow events logged by loggers \"A.B\",\n\"A.B.C\", \"A.B.C.D\", \"A.B.D\" etc. but not \"A.BB\", \"B.A.B\" etc. If\ninitialized with the empty string, all events are passed.", + "builtins.Filter.__delattr__" => "Implement delattr(self, name).", + "builtins.Filter.__eq__" => "Return self==value.", + "builtins.Filter.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Filter.__ge__" => "Return self>=value.", + "builtins.Filter.__getattribute__" => "Return getattr(self, name).", + "builtins.Filter.__getstate__" => "Helper for pickle.", + "builtins.Filter.__gt__" => "Return self>value.", + "builtins.Filter.__hash__" => "Return hash(self).", + "builtins.Filter.__init__" => "Initialize a filter.\n\nInitialize with the name of the logger which, together with its\nchildren, will have its events allowed through the filter. If no\nname is specified, allow every event.", + "builtins.Filter.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Filter.__le__" => "Return self<=value.", + "builtins.Filter.__lt__" => "Return self<value.", + "builtins.Filter.__ne__" => "Return self!=value.", + "builtins.Filter.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Filter.__reduce__" => "Helper for pickle.", + "builtins.Filter.__reduce_ex__" => "Helper for pickle.", + "builtins.Filter.__repr__" => "Return repr(self).", + "builtins.Filter.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Filter.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Filter.__str__" => "Return str(self).", + "builtins.Filter.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Filter.__weakref__" => "list of weak references to the object", + "builtins.Filter.filter" => "Determine if the specified record is to be logged.\n\nReturns True if the record should be logged, or False otherwise.\nIf deemed appropriate, the record may be modified in-place.", + "builtins.Filterer" => "A base class for loggers and handlers which allows them to share\ncommon code.", + "builtins.Filterer.__delattr__" => "Implement delattr(self, name).", + "builtins.Filterer.__eq__" => "Return self==value.", + "builtins.Filterer.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Filterer.__ge__" => "Return self>=value.", + "builtins.Filterer.__getattribute__" => "Return getattr(self, name).", + "builtins.Filterer.__getstate__" => "Helper for pickle.", + "builtins.Filterer.__gt__" => "Return self>value.", + "builtins.Filterer.__hash__" => "Return hash(self).", + "builtins.Filterer.__init__" => "Initialize the list of filters to be an empty list.", + "builtins.Filterer.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Filterer.__le__" => "Return self<=value.", + "builtins.Filterer.__lt__" => "Return self<value.", + "builtins.Filterer.__ne__" => "Return self!=value.", + "builtins.Filterer.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Filterer.__reduce__" => "Helper for pickle.", + "builtins.Filterer.__reduce_ex__" => "Helper for pickle.", + "builtins.Filterer.__repr__" => "Return repr(self).", + "builtins.Filterer.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Filterer.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Filterer.__str__" => "Return str(self).", + "builtins.Filterer.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Filterer.__weakref__" => "list of weak references to the object", + "builtins.Filterer.addFilter" => "Add the specified filter to this handler.", + "builtins.Filterer.filter" => "Determine if a record is loggable by consulting all the filters.\n\nThe default is to allow the record to be logged; any filter can veto\nthis by returning a false value.\nIf a filter attached to a handler returns a log record instance,\nthen that instance is used in place of the original log record in\nany further processing of the event by that handler.\nIf a filter returns any other true value, the original log record\nis used in any further processing of the event by that handler.\n\nIf none of the filters return false values, this method returns\na log record.\nIf any of the filters return a false value, this method returns\na false value.\n\n.. versionchanged:: 3.2\n\n Allow filters to be just callables.\n\n.. versionchanged:: 3.12\n Allow filters to return a LogRecord instead of\n modifying it in place.", + "builtins.Filterer.removeFilter" => "Remove the specified filter from this handler.", + "builtins.Flags" => "Flags that map to parsed keys/namespaces.", + "builtins.Flags.__delattr__" => "Implement delattr(self, name).", + "builtins.Flags.__eq__" => "Return self==value.", + "builtins.Flags.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Flags.__ge__" => "Return self>=value.", + "builtins.Flags.__getattribute__" => "Return getattr(self, name).", + "builtins.Flags.__getstate__" => "Helper for pickle.", + "builtins.Flags.__gt__" => "Return self>value.", + "builtins.Flags.__hash__" => "Return hash(self).", + "builtins.Flags.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Flags.__le__" => "Return self<=value.", + "builtins.Flags.__lt__" => "Return self<value.", + "builtins.Flags.__ne__" => "Return self!=value.", + "builtins.Flags.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Flags.__reduce__" => "Helper for pickle.", + "builtins.Flags.__reduce_ex__" => "Helper for pickle.", + "builtins.Flags.__repr__" => "Return repr(self).", + "builtins.Flags.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Flags.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Flags.__str__" => "Return str(self).", + "builtins.Flags.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Flags.__weakref__" => "list of weak references to the object", "builtins.FloatingPointError" => "Floating-point operation failed.", "builtins.FloatingPointError.__delattr__" => "Implement delattr(self, name).", "builtins.FloatingPointError.__eq__" => "Return self==value.", @@ -10225,6 +13161,304 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.FloatingPointError.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.FloatingPointError.add_note" => "Add a note to the exception", "builtins.FloatingPointError.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.ForkingMixIn" => "Mix-in class to handle each request in a new process.", + "builtins.ForkingMixIn.__delattr__" => "Implement delattr(self, name).", + "builtins.ForkingMixIn.__eq__" => "Return self==value.", + "builtins.ForkingMixIn.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.ForkingMixIn.__ge__" => "Return self>=value.", + "builtins.ForkingMixIn.__getattribute__" => "Return getattr(self, name).", + "builtins.ForkingMixIn.__getstate__" => "Helper for pickle.", + "builtins.ForkingMixIn.__gt__" => "Return self>value.", + "builtins.ForkingMixIn.__hash__" => "Return hash(self).", + "builtins.ForkingMixIn.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.ForkingMixIn.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.ForkingMixIn.__le__" => "Return self<=value.", + "builtins.ForkingMixIn.__lt__" => "Return self<value.", + "builtins.ForkingMixIn.__ne__" => "Return self!=value.", + "builtins.ForkingMixIn.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.ForkingMixIn.__reduce__" => "Helper for pickle.", + "builtins.ForkingMixIn.__reduce_ex__" => "Helper for pickle.", + "builtins.ForkingMixIn.__repr__" => "Return repr(self).", + "builtins.ForkingMixIn.__setattr__" => "Implement setattr(self, name, value).", + "builtins.ForkingMixIn.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.ForkingMixIn.__str__" => "Return str(self).", + "builtins.ForkingMixIn.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.ForkingMixIn.__weakref__" => "list of weak references to the object", + "builtins.ForkingMixIn.collect_children" => "Internal routine to wait for children that have exited.", + "builtins.ForkingMixIn.handle_timeout" => "Wait for zombies after self.timeout seconds of inactivity.\n\nMay be extended, do not override.", + "builtins.ForkingMixIn.process_request" => "Fork a new subprocess to process the request.", + "builtins.ForkingMixIn.service_actions" => "Collect the zombie child processes regularly in the ForkingMixIn.\n\nservice_actions is called in the BaseServer's serve_forever loop.", + "builtins.Formatter" => "Formatter instances are used to convert a LogRecord to text.\n\nFormatters need to know how a LogRecord is constructed. They are\nresponsible for converting a LogRecord to (usually) a string which can\nbe interpreted by either a human or an external system. The base Formatter\nallows a formatting string to be specified. If none is supplied, the\nstyle-dependent default value, \"%(message)s\", \"{message}\", or\n\"${message}\", is used.\n\nThe Formatter can be initialized with a format string which makes use of\nknowledge of the LogRecord attributes - e.g. the default value mentioned\nabove makes use of the fact that the user's message and arguments are pre-\nformatted into a LogRecord's message attribute. Currently, the useful\nattributes in a LogRecord are described by:\n\n%(name)s Name of the logger (logging channel)\n%(levelno)s Numeric logging level for the message (DEBUG, INFO,\n WARNING, ERROR, CRITICAL)\n%(levelname)s Text logging level for the message (\"DEBUG\", \"INFO\",\n \"WARNING\", \"ERROR\", \"CRITICAL\")\n%(pathname)s Full pathname of the source file where the logging\n call was issued (if available)\n%(filename)s Filename portion of pathname\n%(module)s Module (name portion of filename)\n%(lineno)d Source line number where the logging call was issued\n (if available)\n%(funcName)s Function name\n%(created)f Time when the LogRecord was created (time.time_ns() / 1e9\n return value)\n%(asctime)s Textual time when the LogRecord was created\n%(msecs)d Millisecond portion of the creation time\n%(relativeCreated)d Time in milliseconds when the LogRecord was created,\n relative to the time the logging module was loaded\n (typically at application startup time)\n%(thread)d Thread ID (if available)\n%(threadName)s Thread name (if available)\n%(taskName)s Task name (if available)\n%(process)d Process ID (if available)\n%(processName)s Process name (if available)\n%(message)s The result of record.getMessage(), computed just as\n the record is emitted", + "builtins.Formatter.__delattr__" => "Implement delattr(self, name).", + "builtins.Formatter.__eq__" => "Return self==value.", + "builtins.Formatter.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Formatter.__ge__" => "Return self>=value.", + "builtins.Formatter.__getattribute__" => "Return getattr(self, name).", + "builtins.Formatter.__getstate__" => "Helper for pickle.", + "builtins.Formatter.__gt__" => "Return self>value.", + "builtins.Formatter.__hash__" => "Return hash(self).", + "builtins.Formatter.__init__" => "Initialize the formatter with specified format strings.\n\nInitialize the formatter either with the specified format string, or a\ndefault as described above. Allow for specialized date formatting with\nthe optional datefmt argument. If datefmt is omitted, you get an\nISO8601-like (or RFC 3339-like) format.\n\nUse a style parameter of '%', '{' or '$' to specify that you want to\nuse one of %-formatting, :meth:`str.format` (``{}``) formatting or\n:class:`string.Template` formatting in your format string.\n\n.. versionchanged:: 3.2\n Added the ``style`` parameter.", + "builtins.Formatter.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Formatter.__le__" => "Return self<=value.", + "builtins.Formatter.__lt__" => "Return self<value.", + "builtins.Formatter.__ne__" => "Return self!=value.", + "builtins.Formatter.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Formatter.__reduce__" => "Helper for pickle.", + "builtins.Formatter.__reduce_ex__" => "Helper for pickle.", + "builtins.Formatter.__repr__" => "Return repr(self).", + "builtins.Formatter.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Formatter.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Formatter.__str__" => "Return str(self).", + "builtins.Formatter.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Formatter.__weakref__" => "list of weak references to the object", + "builtins.Formatter.converter" => "localtime([seconds]) -> (tm_year,tm_mon,tm_mday,tm_hour,tm_min,\n tm_sec,tm_wday,tm_yday,tm_isdst)\n\nConvert seconds since the Epoch to a time tuple expressing local time.\nWhen 'seconds' is not passed in, convert the current time instead.", + "builtins.Formatter.format" => "Format the specified record as text.\n\nThe record's attribute dictionary is used as the operand to a\nstring formatting operation which yields the returned string.\nBefore formatting the dictionary, a couple of preparatory steps\nare carried out. The message attribute of the record is computed\nusing LogRecord.getMessage(). If the formatting string uses the\ntime (as determined by a call to usesTime(), formatTime() is\ncalled to format the event time. If there is exception information,\nit is formatted using formatException() and appended to the message.", + "builtins.Formatter.formatException" => "Format and return the specified exception information as a string.\n\nThis default implementation just uses\ntraceback.print_exception()", + "builtins.Formatter.formatStack" => "This method is provided as an extension point for specialized\nformatting of stack information.\n\nThe input data is a string as returned from a call to\n:func:`traceback.print_stack`, but with the last trailing newline\nremoved.\n\nThe base implementation just returns the value passed in.", + "builtins.Formatter.formatTime" => "Return the creation time of the specified LogRecord as formatted text.\n\nThis method should be called from format() by a formatter which\nwants to make use of a formatted time. This method can be overridden\nin formatters to provide for any specific requirement, but the\nbasic behaviour is as follows: if datefmt (a string) is specified,\nit is used with time.strftime() to format the creation time of the\nrecord. Otherwise, an ISO8601-like (or RFC 3339-like) format is used.\nThe resulting string is returned. This function uses a user-configurable\nfunction to convert the creation time to a tuple. By default,\ntime.localtime() is used; to change this for a particular formatter\ninstance, set the 'converter' attribute to a function with the same\nsignature as time.localtime() or time.gmtime(). To change it for all\nformatters, for example if you want all logging times to be shown in GMT,\nset the 'converter' attribute in the Formatter class.", + "builtins.Formatter.print_instruction_line" => "Format instruction details for inclusion in disassembly output.", + "builtins.Formatter.usesTime" => "Check if the format uses the creation time of the record.", + "builtins.ForwardRef" => "Wrapper that holds a forward reference.\n\nConstructor arguments:\n* arg: a string representing the code to be evaluated.\n* module: the module where the forward reference was created.\n Must be a string, not a module object.\n* owner: The owning object (module, class, or function).\n* is_argument: Does nothing, retained for compatibility.\n* is_class: True if the forward reference was created in class scope.", + "builtins.ForwardRef.__delattr__" => "Implement delattr(self, name).", + "builtins.ForwardRef.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.ForwardRef.__ge__" => "Return self>=value.", + "builtins.ForwardRef.__getattribute__" => "Return getattr(self, name).", + "builtins.ForwardRef.__getstate__" => "Helper for pickle.", + "builtins.ForwardRef.__gt__" => "Return self>value.", + "builtins.ForwardRef.__le__" => "Return self<=value.", + "builtins.ForwardRef.__lt__" => "Return self<value.", + "builtins.ForwardRef.__ne__" => "Return self!=value.", + "builtins.ForwardRef.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.ForwardRef.__reduce__" => "Helper for pickle.", + "builtins.ForwardRef.__reduce_ex__" => "Helper for pickle.", + "builtins.ForwardRef.__setattr__" => "Implement setattr(self, name, value).", + "builtins.ForwardRef.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.ForwardRef.__str__" => "Return str(self).", + "builtins.ForwardRef.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.ForwardRef.__weakref__" => "list of weak references to the object", + "builtins.ForwardRef.evaluate" => "Evaluate the forward reference and return the value.\n\nIf the forward reference cannot be evaluated, raise an exception.", + "builtins.Frame" => "Frame of a traceback.", + "builtins.Frame.__delattr__" => "Implement delattr(self, name).", + "builtins.Frame.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Frame.__ge__" => "Return a >= b. Computed by @total_ordering from (not a < b).", + "builtins.Frame.__getattribute__" => "Return getattr(self, name).", + "builtins.Frame.__getstate__" => "Helper for pickle.", + "builtins.Frame.__gt__" => "Return a > b. Computed by @total_ordering from (not a < b) and (a != b).", + "builtins.Frame.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Frame.__le__" => "Return a <= b. Computed by @total_ordering from (a < b) or (a == b).", + "builtins.Frame.__ne__" => "Return self!=value.", + "builtins.Frame.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Frame.__reduce__" => "Helper for pickle.", + "builtins.Frame.__reduce_ex__" => "Helper for pickle.", + "builtins.Frame.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Frame.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Frame.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.FrameCallGraphEntry" => "FrameCallGraphEntry(frame: frame)", + "builtins.FrameCallGraphEntry.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.FrameCallGraphEntry.__ge__" => "Return self>=value.", + "builtins.FrameCallGraphEntry.__getattribute__" => "Return getattr(self, name).", + "builtins.FrameCallGraphEntry.__gt__" => "Return self>value.", + "builtins.FrameCallGraphEntry.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.FrameCallGraphEntry.__le__" => "Return self<=value.", + "builtins.FrameCallGraphEntry.__lt__" => "Return self<value.", + "builtins.FrameCallGraphEntry.__ne__" => "Return self!=value.", + "builtins.FrameCallGraphEntry.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.FrameCallGraphEntry.__reduce__" => "Helper for pickle.", + "builtins.FrameCallGraphEntry.__reduce_ex__" => "Helper for pickle.", + "builtins.FrameCallGraphEntry.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.FrameCallGraphEntry.__str__" => "Return str(self).", + "builtins.FrameCallGraphEntry.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.FrameInfo" => "Information about a Zstandard frame.", + "builtins.FrameInfo.__delattr__" => "Implement delattr(self, name).", + "builtins.FrameInfo.__eq__" => "Return self==value.", + "builtins.FrameInfo.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.FrameInfo.__ge__" => "Return self>=value.", + "builtins.FrameInfo.__getattribute__" => "Return getattr(self, name).", + "builtins.FrameInfo.__getstate__" => "Helper for pickle.", + "builtins.FrameInfo.__gt__" => "Return self>value.", + "builtins.FrameInfo.__hash__" => "Return hash(self).", + "builtins.FrameInfo.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.FrameInfo.__le__" => "Return self<=value.", + "builtins.FrameInfo.__lt__" => "Return self<value.", + "builtins.FrameInfo.__ne__" => "Return self!=value.", + "builtins.FrameInfo.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.FrameInfo.__reduce__" => "Helper for pickle.", + "builtins.FrameInfo.__reduce_ex__" => "Helper for pickle.", + "builtins.FrameInfo.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.FrameInfo.__str__" => "Return str(self).", + "builtins.FrameInfo.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.FrameLocalsProxy.__delattr__" => "Implement delattr(self, name).", + "builtins.FrameLocalsProxy.__delitem__" => "Delete self[key].", + "builtins.FrameLocalsProxy.__eq__" => "Return self==value.", + "builtins.FrameLocalsProxy.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.FrameLocalsProxy.__ge__" => "Return self>=value.", + "builtins.FrameLocalsProxy.__getattribute__" => "Return getattr(self, name).", + "builtins.FrameLocalsProxy.__getstate__" => "Helper for pickle.", + "builtins.FrameLocalsProxy.__gt__" => "Return self>value.", + "builtins.FrameLocalsProxy.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.FrameLocalsProxy.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.FrameLocalsProxy.__ior__" => "Return self|=value.", + "builtins.FrameLocalsProxy.__iter__" => "Implement iter(self).", + "builtins.FrameLocalsProxy.__le__" => "Return self<=value.", + "builtins.FrameLocalsProxy.__len__" => "Return len(self).", + "builtins.FrameLocalsProxy.__lt__" => "Return self<value.", + "builtins.FrameLocalsProxy.__ne__" => "Return self!=value.", + "builtins.FrameLocalsProxy.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.FrameLocalsProxy.__or__" => "Return self|value.", + "builtins.FrameLocalsProxy.__reduce__" => "Helper for pickle.", + "builtins.FrameLocalsProxy.__reduce_ex__" => "Helper for pickle.", + "builtins.FrameLocalsProxy.__repr__" => "Return repr(self).", + "builtins.FrameLocalsProxy.__ror__" => "Return value|self.", + "builtins.FrameLocalsProxy.__setattr__" => "Implement setattr(self, name, value).", + "builtins.FrameLocalsProxy.__setitem__" => "Set self[key] to value.", + "builtins.FrameLocalsProxy.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.FrameLocalsProxy.__str__" => "Return str(self).", + "builtins.FrameLocalsProxy.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.FrameSummary" => "Information about a single frame from a traceback.\n\n- :attr:`filename` The filename for the frame.\n- :attr:`lineno` The line within filename for the frame that was\n active when the frame was captured.\n- :attr:`name` The name of the function or method that was executing\n when the frame was captured.\n- :attr:`line` The text from the linecache module for the line\n of code that was running when the frame was captured.\n- :attr:`locals` Either None if locals were not supplied, or a dict\n mapping the name to the repr() of the variable.", + "builtins.FrameSummary.__delattr__" => "Implement delattr(self, name).", + "builtins.FrameSummary.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.FrameSummary.__ge__" => "Return self>=value.", + "builtins.FrameSummary.__getattribute__" => "Return getattr(self, name).", + "builtins.FrameSummary.__getstate__" => "Helper for pickle.", + "builtins.FrameSummary.__gt__" => "Return self>value.", + "builtins.FrameSummary.__init__" => "Construct a FrameSummary.\n\n:param lookup_line: If True, `linecache` is consulted for the source\n code line. Otherwise, the line will be looked up when first needed.\n:param locals: If supplied the frame locals, which will be captured as\n object representations.\n:param line: If provided, use this instead of looking up the line in\n the linecache.", + "builtins.FrameSummary.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.FrameSummary.__le__" => "Return self<=value.", + "builtins.FrameSummary.__lt__" => "Return self<value.", + "builtins.FrameSummary.__ne__" => "Return self!=value.", + "builtins.FrameSummary.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.FrameSummary.__reduce__" => "Helper for pickle.", + "builtins.FrameSummary.__reduce_ex__" => "Helper for pickle.", + "builtins.FrameSummary.__setattr__" => "Implement setattr(self, name, value).", + "builtins.FrameSummary.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.FrameSummary.__str__" => "Return str(self).", + "builtins.FrameSummary.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.FrozenImporter" => "Meta path import for frozen modules.\n\nAll methods are either class or static methods to avoid the need to\ninstantiate the class.", + "builtins.FrozenImporter.__delattr__" => "Implement delattr(self, name).", + "builtins.FrozenImporter.__eq__" => "Return self==value.", + "builtins.FrozenImporter.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.FrozenImporter.__ge__" => "Return self>=value.", + "builtins.FrozenImporter.__getattribute__" => "Return getattr(self, name).", + "builtins.FrozenImporter.__getstate__" => "Helper for pickle.", + "builtins.FrozenImporter.__gt__" => "Return self>value.", + "builtins.FrozenImporter.__hash__" => "Return hash(self).", + "builtins.FrozenImporter.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.FrozenImporter.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.FrozenImporter.__le__" => "Return self<=value.", + "builtins.FrozenImporter.__lt__" => "Return self<value.", + "builtins.FrozenImporter.__ne__" => "Return self!=value.", + "builtins.FrozenImporter.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.FrozenImporter.__reduce__" => "Helper for pickle.", + "builtins.FrozenImporter.__reduce_ex__" => "Helper for pickle.", + "builtins.FrozenImporter.__repr__" => "Return repr(self).", + "builtins.FrozenImporter.__setattr__" => "Implement setattr(self, name, value).", + "builtins.FrozenImporter.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.FrozenImporter.__str__" => "Return str(self).", + "builtins.FrozenImporter.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.FrozenImporter.__weakref__" => "list of weak references to the object", + "builtins.FrozenImporter.create_module" => "Set __file__, if able.", + "builtins.FrozenImporter.get_code" => "Return the code object for the frozen module.", + "builtins.FrozenImporter.get_source" => "Return None as frozen modules do not have source code.", + "builtins.FrozenImporter.is_package" => "Return True if the frozen module is a package.", + "builtins.FrozenImporter.load_module" => "Load a frozen module.\n\nThis method is deprecated. Use exec_module() instead.", + "builtins.FunctionProfile" => "FunctionProfile(ncalls: str, tottime: float, percall_tottime: float, cumtime: float, percall_cumtime: float, file_name: str, line_number: int)", + "builtins.FunctionProfile.__delattr__" => "Implement delattr(self, name).", + "builtins.FunctionProfile.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.FunctionProfile.__ge__" => "Return self>=value.", + "builtins.FunctionProfile.__getattribute__" => "Return getattr(self, name).", + "builtins.FunctionProfile.__getstate__" => "Helper for pickle.", + "builtins.FunctionProfile.__gt__" => "Return self>value.", + "builtins.FunctionProfile.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.FunctionProfile.__le__" => "Return self<=value.", + "builtins.FunctionProfile.__lt__" => "Return self<value.", + "builtins.FunctionProfile.__ne__" => "Return self!=value.", + "builtins.FunctionProfile.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.FunctionProfile.__reduce__" => "Helper for pickle.", + "builtins.FunctionProfile.__reduce_ex__" => "Helper for pickle.", + "builtins.FunctionProfile.__setattr__" => "Implement setattr(self, name, value).", + "builtins.FunctionProfile.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.FunctionProfile.__str__" => "Return str(self).", + "builtins.FunctionProfile.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.FunctionProfile.__weakref__" => "list of weak references to the object", + "builtins.Future" => "This class is *almost* compatible with concurrent.futures.Future.\n\nDifferences:\n\n- This class is not thread-safe.\n\n- result() and exception() do not take a timeout argument and\n raise an exception when the future isn't done yet.\n\n- Callbacks registered with add_done_callback() are always called\n via the event loop's call_soon().\n\n- This class is not compatible with the wait() and as_completed()\n methods in the concurrent.futures package.", + "builtins.Future._Future__schedule_callbacks" => "Internal: Ask the event loop to call all callbacks.\n\nThe callbacks are scheduled to be called as soon as possible. Also\nclears the callback list.", + "builtins.Future.__await__" => "Return an iterator to be used in await expression.", + "builtins.Future.__class_getitem__" => "Represent a PEP 585 generic type\n\nE.g. for t = list[int], t.__origin__ is list and t.__args__ is (int,).", + "builtins.Future.__del__" => "Called when the instance is about to be destroyed.", + "builtins.Future.__delattr__" => "Implement delattr(self, name).", + "builtins.Future.__eq__" => "Return self==value.", + "builtins.Future.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Future.__ge__" => "Return self>=value.", + "builtins.Future.__getattribute__" => "Return getattr(self, name).", + "builtins.Future.__getstate__" => "Helper for pickle.", + "builtins.Future.__gt__" => "Return self>value.", + "builtins.Future.__hash__" => "Return hash(self).", + "builtins.Future.__init__" => "Initialize the future.\n\nThe optional event_loop argument allows explicitly setting the event\nloop object used by the future. If it's not provided, the future uses\nthe default event loop.", + "builtins.Future.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Future.__iter__" => "Implement iter(self).", + "builtins.Future.__le__" => "Return self<=value.", + "builtins.Future.__lt__" => "Return self<value.", + "builtins.Future.__ne__" => "Return self!=value.", + "builtins.Future.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Future.__reduce__" => "Helper for pickle.", + "builtins.Future.__reduce_ex__" => "Helper for pickle.", + "builtins.Future.__repr__" => "Return repr(self).", + "builtins.Future.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Future.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Future.__str__" => "Return str(self).", + "builtins.Future.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Future.__weakref__" => "list of weak references to the object", + "builtins.Future._make_cancelled_error" => "Create the CancelledError to raise if the Future is cancelled.\n\nThis should only be called once when handling a cancellation since\nit erases the saved context exception value.", + "builtins.Future.add_done_callback" => "Add a callback to be run when the future becomes done.\n\nThe callback is called with a single argument - the future object. If\nthe future is already done when this is called, the callback is\nscheduled with call_soon.", + "builtins.Future.cancel" => "Cancel the future and schedule callbacks.\n\nIf the future is already done or cancelled, return False. Otherwise,\nchange the future's state to cancelled, schedule the callbacks and\nreturn True.", + "builtins.Future.cancelled" => "Return True if the future was cancelled.", + "builtins.Future.done" => "Return True if the future is done.\n\nDone means either that a result / exception are available, or that the\nfuture was cancelled.", + "builtins.Future.exception" => "Return the exception that was set on this future.\n\nThe exception (or None if no exception was set) is returned only if\nthe future is done. If the future has been cancelled, raises\nCancelledError. If the future isn't done yet, raises\nInvalidStateError.", + "builtins.Future.get_loop" => "Return the event loop the Future is bound to.", + "builtins.Future.remove_done_callback" => "Remove all instances of a callback from the \"call when done\" list.\n\nReturns the number of callbacks removed.", + "builtins.Future.result" => "Return the result this future represents.\n\nIf the future has been cancelled, raises CancelledError. If the\nfuture's result isn't yet available, raises InvalidStateError. If\nthe future is done and has an exception set, this exception is raised.", + "builtins.Future.running" => "Return True if the future is currently executing.", + "builtins.Future.set_exception" => "Mark the future done and set an exception.\n\nIf the future is already done when this method is called, raises\nInvalidStateError.", + "builtins.Future.set_result" => "Mark the future done and set its result.\n\nIf the future is already done when this method is called, raises\nInvalidStateError.", + "builtins.Future.set_running_or_notify_cancel" => "Mark the future as running or process any cancel notifications.\n\nShould only be used by Executor implementations and unit tests.\n\nIf the future has been cancelled (cancel() was called and returned\nTrue) then any threads waiting on the future completing (though\ncalls to as_completed() or wait()) are notified and False is\nreturned.\n\nIf the future was not cancelled then it is put in the running state\n(future calls to running() will return True) and True is returned.\n\nThis method should be called by Executor implementations before\nexecuting the work associated with this future. If this method\nreturns False then the work should not be executed.\n\nReturns:\n False if the Future was cancelled, True otherwise.\n\nRaises:\n RuntimeError: if this method was already called or if\n set_result() or set_exception() was called.", + "builtins.FutureCallGraph" => "FutureCallGraph(future: _asyncio.Future, call_stack: tuple['FrameCallGraphEntry', ...], awaited_by: tuple['FutureCallGraph', ...])", + "builtins.FutureCallGraph.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.FutureCallGraph.__ge__" => "Return self>=value.", + "builtins.FutureCallGraph.__getattribute__" => "Return getattr(self, name).", + "builtins.FutureCallGraph.__gt__" => "Return self>value.", + "builtins.FutureCallGraph.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.FutureCallGraph.__le__" => "Return self<=value.", + "builtins.FutureCallGraph.__lt__" => "Return self<value.", + "builtins.FutureCallGraph.__ne__" => "Return self!=value.", + "builtins.FutureCallGraph.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.FutureCallGraph.__reduce__" => "Helper for pickle.", + "builtins.FutureCallGraph.__reduce_ex__" => "Helper for pickle.", + "builtins.FutureCallGraph.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.FutureCallGraph.__str__" => "Return str(self).", + "builtins.FutureCallGraph.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.FutureIter.__delattr__" => "Implement delattr(self, name).", + "builtins.FutureIter.__eq__" => "Return self==value.", + "builtins.FutureIter.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.FutureIter.__ge__" => "Return self>=value.", + "builtins.FutureIter.__getattribute__" => "Return getattr(self, name).", + "builtins.FutureIter.__getstate__" => "Helper for pickle.", + "builtins.FutureIter.__gt__" => "Return self>value.", + "builtins.FutureIter.__hash__" => "Return hash(self).", + "builtins.FutureIter.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.FutureIter.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.FutureIter.__iter__" => "Implement iter(self).", + "builtins.FutureIter.__le__" => "Return self<=value.", + "builtins.FutureIter.__lt__" => "Return self<value.", + "builtins.FutureIter.__ne__" => "Return self!=value.", + "builtins.FutureIter.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.FutureIter.__next__" => "Implement next(self).", + "builtins.FutureIter.__reduce__" => "Helper for pickle.", + "builtins.FutureIter.__reduce_ex__" => "Helper for pickle.", + "builtins.FutureIter.__repr__" => "Return repr(self).", + "builtins.FutureIter.__setattr__" => "Implement setattr(self, name, value).", + "builtins.FutureIter.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.FutureIter.__str__" => "Return str(self).", + "builtins.FutureIter.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.FutureWarning" => "Base class for warnings about constructs that will change semantically\nin the future.", "builtins.FutureWarning.__delattr__" => "Implement delattr(self, name).", "builtins.FutureWarning.__eq__" => "Return self==value.", @@ -10248,6 +13482,31 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.FutureWarning.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.FutureWarning.add_note" => "Add a note to the exception", "builtins.FutureWarning.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.Generator" => "Generates output from a Message object tree.\n\nThis basic generator writes the message to the given file object as plain\ntext.", + "builtins.Generator.__delattr__" => "Implement delattr(self, name).", + "builtins.Generator.__eq__" => "Return self==value.", + "builtins.Generator.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Generator.__ge__" => "Return self>=value.", + "builtins.Generator.__getattribute__" => "Return getattr(self, name).", + "builtins.Generator.__getstate__" => "Helper for pickle.", + "builtins.Generator.__gt__" => "Return self>value.", + "builtins.Generator.__hash__" => "Return hash(self).", + "builtins.Generator.__init__" => "Create the generator for message flattening.\n\noutfp is the output file-like object for writing the message to. It\nmust have a write() method.\n\nOptional mangle_from_ is a flag that, when True (the default if policy\nis not set), escapes From_ lines in the body of the message by putting\na '>' in front of them.\n\nOptional maxheaderlen specifies the longest length for a non-continued\nheader. When a header line is longer (in characters, with tabs\nexpanded to 8 spaces) than maxheaderlen, the header will split as\ndefined in the Header class. Set maxheaderlen to zero to disable\nheader wrapping. The default is 78, as recommended (but not required)\nby RFC 5322 section 2.1.1.\n\nThe policy keyword specifies a policy object that controls a number of\naspects of the generator's operation. If no policy is specified,\nthe policy associated with the Message object passed to the\nflatten method is used.", + "builtins.Generator.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Generator.__le__" => "Return self<=value.", + "builtins.Generator.__lt__" => "Return self<value.", + "builtins.Generator.__ne__" => "Return self!=value.", + "builtins.Generator.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Generator.__reduce__" => "Helper for pickle.", + "builtins.Generator.__reduce_ex__" => "Helper for pickle.", + "builtins.Generator.__repr__" => "Return repr(self).", + "builtins.Generator.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Generator.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Generator.__str__" => "Return str(self).", + "builtins.Generator.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Generator.__weakref__" => "list of weak references to the object", + "builtins.Generator.clone" => "Clone this generator with the exact same options.", + "builtins.Generator.flatten" => "Print the message object tree rooted at msg to the output file\nspecified when the Generator instance was created.\n\nunixfrom is a flag that forces the printing of a Unix From_ delimiter\nbefore the first object in the message tree. If the original message\nhas no From_ delimiter, a 'standard' one is crafted. By default, this\nis False to inhibit the printing of any From_ delimiter.\n\nNote that for subobjects, no From_ line is printed.\n\nlinesep specifies the characters used to indicate a new line in\nthe output. The default value is determined by the policy specified\nwhen the Generator instance was created or, if none was specified,\nfrom the policy associated with the msg.", "builtins.GeneratorExit" => "Request that a generator exit.", "builtins.GeneratorExit.__delattr__" => "Implement delattr(self, name).", "builtins.GeneratorExit.__eq__" => "Return self==value.", @@ -10271,6 +13530,29 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.GeneratorExit.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.GeneratorExit.add_note" => "Add a note to the exception", "builtins.GeneratorExit.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.Generic" => "Abstract base class for generic types.\n\nOn Python 3.12 and newer, generic classes implicitly inherit from\nGeneric when they declare a parameter list after the class's name::\n\n class Mapping[KT, VT]:\n def __getitem__(self, key: KT) -> VT:\n ...\n # Etc.\n\nOn older versions of Python, however, generic classes have to\nexplicitly inherit from Generic.\n\nAfter a class has been declared to be generic, it can then be used as\nfollows::\n\n def lookup_name[KT, VT](mapping: Mapping[KT, VT], key: KT, default: VT) -> VT:\n try:\n return mapping[key]\n except KeyError:\n return default", + "builtins.Generic.__class_getitem__" => "Parameterizes a generic class.\n\nAt least, parameterizing a generic class is the *main* thing this\nmethod does. For example, for some generic class `Foo`, this is called\nwhen we do `Foo[int]` - there, with `cls=Foo` and `params=int`.\n\nHowever, note that this method is also called when defining generic\nclasses in the first place with `class Foo[T]: ...`.", + "builtins.Generic.__delattr__" => "Implement delattr(self, name).", + "builtins.Generic.__eq__" => "Return self==value.", + "builtins.Generic.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Generic.__ge__" => "Return self>=value.", + "builtins.Generic.__getattribute__" => "Return getattr(self, name).", + "builtins.Generic.__getstate__" => "Helper for pickle.", + "builtins.Generic.__gt__" => "Return self>value.", + "builtins.Generic.__hash__" => "Return hash(self).", + "builtins.Generic.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Generic.__init_subclass__" => "Function to initialize subclasses.", + "builtins.Generic.__le__" => "Return self<=value.", + "builtins.Generic.__lt__" => "Return self<value.", + "builtins.Generic.__ne__" => "Return self!=value.", + "builtins.Generic.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Generic.__reduce__" => "Helper for pickle.", + "builtins.Generic.__reduce_ex__" => "Helper for pickle.", + "builtins.Generic.__repr__" => "Return repr(self).", + "builtins.Generic.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Generic.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Generic.__str__" => "Return str(self).", + "builtins.Generic.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.GenericAlias" => "Represent a PEP 585 generic type\n\nE.g. for t = list[int], t.__origin__ is list and t.__args__ is (int,).", "builtins.GenericAlias.__call__" => "Call self as a function.", "builtins.GenericAlias.__delattr__" => "Implement delattr(self, name).", @@ -10298,6 +13580,526 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.GenericAlias.__sizeof__" => "Size of object in memory, in bytes.", "builtins.GenericAlias.__str__" => "Return str(self).", "builtins.GenericAlias.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Grid" => "Geometry manager Grid.\n\nBase class to use the methods grid_* in every widget.", + "builtins.Grid.__delattr__" => "Implement delattr(self, name).", + "builtins.Grid.__eq__" => "Return self==value.", + "builtins.Grid.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Grid.__ge__" => "Return self>=value.", + "builtins.Grid.__getattribute__" => "Return getattr(self, name).", + "builtins.Grid.__getstate__" => "Helper for pickle.", + "builtins.Grid.__gt__" => "Return self>value.", + "builtins.Grid.__hash__" => "Return hash(self).", + "builtins.Grid.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Grid.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Grid.__le__" => "Return self<=value.", + "builtins.Grid.__lt__" => "Return self<value.", + "builtins.Grid.__ne__" => "Return self!=value.", + "builtins.Grid.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Grid.__reduce__" => "Helper for pickle.", + "builtins.Grid.__reduce_ex__" => "Helper for pickle.", + "builtins.Grid.__repr__" => "Return repr(self).", + "builtins.Grid.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Grid.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Grid.__str__" => "Return str(self).", + "builtins.Grid.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Grid.__weakref__" => "list of weak references to the object", + "builtins.Grid.bbox" => "Return a tuple of integer coordinates for the bounding\nbox of this widget controlled by the geometry manager grid.\n\nIf COLUMN, ROW is given the bounding box applies from\nthe cell with row and column 0 to the specified\ncell. If COL2 and ROW2 are given the bounding box\nstarts at that cell.\n\nThe returned integers specify the offset of the upper left\ncorner in the container widget and the width and height.", + "builtins.Grid.columnconfigure" => "Configure column INDEX of a grid.\n\nValid options are minsize (minimum size of the column),\nweight (how much does additional space propagate to this column)\nand pad (how much space to let additionally).", + "builtins.Grid.config" => "Position a widget in the parent widget in a grid. Use as options:\ncolumn=number - use cell identified with given column (starting with 0)\ncolumnspan=number - this widget will span several columns\nin=container - use the container widget to contain this widget\nin_=container - see 'in' option description\nipadx=amount - add internal padding in x direction\nipady=amount - add internal padding in y direction\npadx=amount - add padding in x direction\npady=amount - add padding in y direction\nrow=number - use cell identified with given row (starting with 0)\nrowspan=number - this widget will span several rows\nsticky=NSEW - if cell is larger on which sides will this\n widget stick to the cell boundary", + "builtins.Grid.configure" => "Position a widget in the parent widget in a grid. Use as options:\ncolumn=number - use cell identified with given column (starting with 0)\ncolumnspan=number - this widget will span several columns\nin=container - use the container widget to contain this widget\nin_=container - see 'in' option description\nipadx=amount - add internal padding in x direction\nipady=amount - add internal padding in y direction\npadx=amount - add padding in x direction\npady=amount - add padding in y direction\nrow=number - use cell identified with given row (starting with 0)\nrowspan=number - this widget will span several rows\nsticky=NSEW - if cell is larger on which sides will this\n widget stick to the cell boundary", + "builtins.Grid.forget" => "Unmap this widget.", + "builtins.Grid.grid" => "Position a widget in the parent widget in a grid. Use as options:\ncolumn=number - use cell identified with given column (starting with 0)\ncolumnspan=number - this widget will span several columns\nin=container - use the container widget to contain this widget\nin_=container - see 'in' option description\nipadx=amount - add internal padding in x direction\nipady=amount - add internal padding in y direction\npadx=amount - add padding in x direction\npady=amount - add padding in y direction\nrow=number - use cell identified with given row (starting with 0)\nrowspan=number - this widget will span several rows\nsticky=NSEW - if cell is larger on which sides will this\n widget stick to the cell boundary", + "builtins.Grid.grid_bbox" => "Return a tuple of integer coordinates for the bounding\nbox of this widget controlled by the geometry manager grid.\n\nIf COLUMN, ROW is given the bounding box applies from\nthe cell with row and column 0 to the specified\ncell. If COL2 and ROW2 are given the bounding box\nstarts at that cell.\n\nThe returned integers specify the offset of the upper left\ncorner in the container widget and the width and height.", + "builtins.Grid.grid_columnconfigure" => "Configure column INDEX of a grid.\n\nValid options are minsize (minimum size of the column),\nweight (how much does additional space propagate to this column)\nand pad (how much space to let additionally).", + "builtins.Grid.grid_configure" => "Position a widget in the parent widget in a grid. Use as options:\ncolumn=number - use cell identified with given column (starting with 0)\ncolumnspan=number - this widget will span several columns\nin=container - use the container widget to contain this widget\nin_=container - see 'in' option description\nipadx=amount - add internal padding in x direction\nipady=amount - add internal padding in y direction\npadx=amount - add padding in x direction\npady=amount - add padding in y direction\nrow=number - use cell identified with given row (starting with 0)\nrowspan=number - this widget will span several rows\nsticky=NSEW - if cell is larger on which sides will this\n widget stick to the cell boundary", + "builtins.Grid.grid_forget" => "Unmap this widget.", + "builtins.Grid.grid_info" => "Return information about the options\nfor positioning this widget in a grid.", + "builtins.Grid.grid_location" => "Return a tuple of column and row which identify the cell\nat which the pixel at position X and Y inside the container\nwidget is located.", + "builtins.Grid.grid_propagate" => "Set or get the status for propagation of geometry information.\n\nA boolean argument specifies whether the size of this container will\nbe determined by the geometry information of its content.\nIf no argument is given the current setting will be returned.", + "builtins.Grid.grid_remove" => "Unmap this widget but remember the grid options.", + "builtins.Grid.grid_rowconfigure" => "Configure row INDEX of a grid.\n\nValid options are minsize (minimum size of the row),\nweight (how much does additional space propagate to this row)\nand pad (how much space to let additionally).", + "builtins.Grid.grid_size" => "Return a tuple of the number of column and rows in the grid.", + "builtins.Grid.grid_slaves" => "Returns a list of the content widgets.\n\nIf no arguments are supplied, a list of all of the content in this\ncontainer widget is returned, most recently managed first.\nIf ROW or COLUMN is specified, only the content in the row or\ncolumn is returned.", + "builtins.Grid.info" => "Return information about the options\nfor positioning this widget in a grid.", + "builtins.Grid.location" => "Return a tuple of column and row which identify the cell\nat which the pixel at position X and Y inside the container\nwidget is located.", + "builtins.Grid.propagate" => "Set or get the status for propagation of geometry information.\n\nA boolean argument specifies whether the size of this container will\nbe determined by the geometry information of its content.\nIf no argument is given the current setting will be returned.", + "builtins.Grid.rowconfigure" => "Configure row INDEX of a grid.\n\nValid options are minsize (minimum size of the row),\nweight (how much does additional space propagate to this row)\nand pad (how much space to let additionally).", + "builtins.Grid.size" => "Return a tuple of the number of column and rows in the grid.", + "builtins.Grid.slaves" => "Returns a list of the content widgets.\n\nIf no arguments are supplied, a list of all of the content in this\ncontainer widget is returned, most recently managed first.\nIf ROW or COLUMN is specified, only the content in the row or\ncolumn is returned.", + "builtins.HASH" => "A hash is an object used to calculate a checksum of a string of information.\n\nMethods:\n\nupdate() -- updates the current digest with an additional string\ndigest() -- return the current digest value\nhexdigest() -- return the current digest as a string of hexadecimal digits\ncopy() -- return a copy of the current hash object\n\nAttributes:\n\nname -- the hash algorithm being used by this object\ndigest_size -- number of bytes in this hashes output", + "builtins.HASH.__delattr__" => "Implement delattr(self, name).", + "builtins.HASH.__eq__" => "Return self==value.", + "builtins.HASH.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.HASH.__ge__" => "Return self>=value.", + "builtins.HASH.__getattribute__" => "Return getattr(self, name).", + "builtins.HASH.__getstate__" => "Helper for pickle.", + "builtins.HASH.__gt__" => "Return self>value.", + "builtins.HASH.__hash__" => "Return hash(self).", + "builtins.HASH.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.HASH.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.HASH.__le__" => "Return self<=value.", + "builtins.HASH.__lt__" => "Return self<value.", + "builtins.HASH.__ne__" => "Return self!=value.", + "builtins.HASH.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.HASH.__reduce__" => "Helper for pickle.", + "builtins.HASH.__reduce_ex__" => "Helper for pickle.", + "builtins.HASH.__repr__" => "Return repr(self).", + "builtins.HASH.__setattr__" => "Implement setattr(self, name, value).", + "builtins.HASH.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.HASH.__str__" => "Return str(self).", + "builtins.HASH.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.HASH.copy" => "Return a copy of the hash object.", + "builtins.HASH.digest" => "Return the digest value as a bytes object.", + "builtins.HASH.hexdigest" => "Return the digest value as a string of hexadecimal digits.", + "builtins.HASH.update" => "Update this hash object's state with the provided string.", + "builtins.HMAC" => "RFC 2104 HMAC class. Also complies with RFC 4231.\n\nThis supports the API for Cryptographic Hash Functions (PEP 247).", + "builtins.HMAC.__delattr__" => "Implement delattr(self, name).", + "builtins.HMAC.__eq__" => "Return self==value.", + "builtins.HMAC.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.HMAC.__ge__" => "Return self>=value.", + "builtins.HMAC.__getattribute__" => "Return getattr(self, name).", + "builtins.HMAC.__getstate__" => "Helper for pickle.", + "builtins.HMAC.__gt__" => "Return self>value.", + "builtins.HMAC.__hash__" => "Return hash(self).", + "builtins.HMAC.__init__" => "Create a new HMAC object.\n\nkey: bytes or buffer, key for the keyed hash object.\nmsg: bytes or buffer, Initial input for the hash or None.\ndigestmod: A hash name suitable for hashlib.new(). *OR*\n A hashlib constructor returning a new hash object. *OR*\n A module supporting PEP 247.\n\n Required as of 3.8, despite its position after the optional\n msg argument. Passing it as a keyword argument is\n recommended, though not required for legacy API reasons.", + "builtins.HMAC.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.HMAC.__le__" => "Return self<=value.", + "builtins.HMAC.__lt__" => "Return self<value.", + "builtins.HMAC.__ne__" => "Return self!=value.", + "builtins.HMAC.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.HMAC.__reduce__" => "Helper for pickle.", + "builtins.HMAC.__reduce_ex__" => "Helper for pickle.", + "builtins.HMAC.__repr__" => "Return repr(self).", + "builtins.HMAC.__setattr__" => "Implement setattr(self, name, value).", + "builtins.HMAC.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.HMAC.__str__" => "Return str(self).", + "builtins.HMAC.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.HMAC._current" => "Return a hash object for the current state.\n\nTo be used only internally with digest() and hexdigest().", + "builtins.HMAC.copy" => "Return a separate copy of this hashing object.\n\nAn update to this copy won't affect the original object.", + "builtins.HMAC.digest" => "Return the hash value of this hashing object.\n\nThis returns the hmac value as bytes. The object is\nnot altered in any way by this function; you can continue\nupdating the object after calling this function.", + "builtins.HMAC.hexdigest" => "Like digest(), but returns a string of hexadecimal digits instead.", + "builtins.HMAC.update" => "Feed data from msg into this hashing object.", + "builtins.HTTPMethod" => "HTTP methods and descriptions\n\nMethods from the following RFCs are all observed:\n\n * RFC 9110: HTTP Semantics, obsoletes 7231, which obsoleted 2616\n * RFC 5789: PATCH Method for HTTP", + "builtins.HTTPMethod.__delattr__" => "Implement delattr(self, name).", + "builtins.HTTPMethod.__eq__" => "Return self==value.", + "builtins.HTTPMethod.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.HTTPMethod.__ge__" => "Return self>=value.", + "builtins.HTTPMethod.__getattribute__" => "Return getattr(self, name).", + "builtins.HTTPMethod.__getstate__" => "Helper for pickle.", + "builtins.HTTPMethod.__gt__" => "Return self>value.", + "builtins.HTTPMethod.__hash__" => "Return hash(self).", + "builtins.HTTPMethod.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.HTTPMethod.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.HTTPMethod.__le__" => "Return self<=value.", + "builtins.HTTPMethod.__lt__" => "Return self<value.", + "builtins.HTTPMethod.__ne__" => "Return self!=value.", + "builtins.HTTPMethod.__reduce__" => "Helper for pickle.", + "builtins.HTTPMethod.__reduce_ex__" => "Helper for pickle.", + "builtins.HTTPMethod.__setattr__" => "Implement setattr(self, name, value).", + "builtins.HTTPMethod.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.HTTPMethod.__str__" => "Return str(self).", + "builtins.HTTPMethod.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.HTTPMethod.__weakref__" => "list of weak references to the object", + "builtins.HTTPStatus" => "HTTP status codes and reason phrases\n\nStatus codes from the following RFCs are all observed:\n\n * RFC 9110: HTTP Semantics, obsoletes 7231, which obsoleted 2616\n * RFC 6585: Additional HTTP Status Codes\n * RFC 3229: Delta encoding in HTTP\n * RFC 4918: HTTP Extensions for WebDAV, obsoletes 2518\n * RFC 5842: Binding Extensions to WebDAV\n * RFC 7238: Permanent Redirect\n * RFC 2295: Transparent Content Negotiation in HTTP\n * RFC 2774: An HTTP Extension Framework\n * RFC 7725: An HTTP Status Code to Report Legal Obstacles\n * RFC 7540: Hypertext Transfer Protocol Version 2 (HTTP/2)\n * RFC 2324: Hyper Text Coffee Pot Control Protocol (HTCPCP/1.0)\n * RFC 8297: An HTTP Status Code for Indicating Hints\n * RFC 8470: Using Early Data in HTTP", + "builtins.HTTPStatus.__delattr__" => "Implement delattr(self, name).", + "builtins.HTTPStatus.__eq__" => "Return self==value.", + "builtins.HTTPStatus.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.HTTPStatus.__ge__" => "Return self>=value.", + "builtins.HTTPStatus.__getattribute__" => "Return getattr(self, name).", + "builtins.HTTPStatus.__getstate__" => "Helper for pickle.", + "builtins.HTTPStatus.__gt__" => "Return self>value.", + "builtins.HTTPStatus.__hash__" => "Return hash(self).", + "builtins.HTTPStatus.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.HTTPStatus.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.HTTPStatus.__le__" => "Return self<=value.", + "builtins.HTTPStatus.__lt__" => "Return self<value.", + "builtins.HTTPStatus.__ne__" => "Return self!=value.", + "builtins.HTTPStatus.__reduce__" => "Helper for pickle.", + "builtins.HTTPStatus.__reduce_ex__" => "Helper for pickle.", + "builtins.HTTPStatus.__repr__" => "Return repr(self).", + "builtins.HTTPStatus.__setattr__" => "Implement setattr(self, name, value).", + "builtins.HTTPStatus.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.HTTPStatus.__str__" => "Return str(self).", + "builtins.HTTPStatus.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.HTTPStatus.__weakref__" => "list of weak references to the object", + "builtins.Handle" => "Object returned by callback registration methods.", + "builtins.Handle.__delattr__" => "Implement delattr(self, name).", + "builtins.Handle.__eq__" => "Return self==value.", + "builtins.Handle.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Handle.__ge__" => "Return self>=value.", + "builtins.Handle.__getattribute__" => "Return getattr(self, name).", + "builtins.Handle.__getstate__" => "Helper for pickle.", + "builtins.Handle.__gt__" => "Return self>value.", + "builtins.Handle.__hash__" => "Return hash(self).", + "builtins.Handle.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Handle.__le__" => "Return self<=value.", + "builtins.Handle.__lt__" => "Return self<value.", + "builtins.Handle.__ne__" => "Return self!=value.", + "builtins.Handle.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Handle.__reduce__" => "Helper for pickle.", + "builtins.Handle.__reduce_ex__" => "Helper for pickle.", + "builtins.Handle.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Handle.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Handle.__str__" => "Return str(self).", + "builtins.Handle.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Handle.__weakref__" => "list of weak references to the object", + "builtins.Hashable.__delattr__" => "Implement delattr(self, name).", + "builtins.Hashable.__eq__" => "Return self==value.", + "builtins.Hashable.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Hashable.__ge__" => "Return self>=value.", + "builtins.Hashable.__getattribute__" => "Return getattr(self, name).", + "builtins.Hashable.__getstate__" => "Helper for pickle.", + "builtins.Hashable.__gt__" => "Return self>value.", + "builtins.Hashable.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Hashable.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Hashable.__le__" => "Return self<=value.", + "builtins.Hashable.__lt__" => "Return self<value.", + "builtins.Hashable.__ne__" => "Return self!=value.", + "builtins.Hashable.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Hashable.__reduce__" => "Helper for pickle.", + "builtins.Hashable.__reduce_ex__" => "Helper for pickle.", + "builtins.Hashable.__repr__" => "Return repr(self).", + "builtins.Hashable.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Hashable.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Hashable.__str__" => "Return str(self).", + "builtins.Header.__delattr__" => "Implement delattr(self, name).", + "builtins.Header.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Header.__ge__" => "Return self>=value.", + "builtins.Header.__getattribute__" => "Return getattr(self, name).", + "builtins.Header.__getstate__" => "Helper for pickle.", + "builtins.Header.__gt__" => "Return self>value.", + "builtins.Header.__init__" => "Create a MIME-compliant header that can contain many character sets.\n\nOptional s is the initial header value. If None, the initial header\nvalue is not set. You can later append to the header with .append()\nmethod calls. s may be a byte string or a Unicode string, but see the\n.append() documentation for semantics.\n\nOptional charset serves two purposes: it has the same meaning as the\ncharset argument to the .append() method. It also sets the default\ncharacter set for all subsequent .append() calls that omit the charset\nargument. If charset is not provided in the constructor, the us-ascii\ncharset is used both as s's initial charset and as the default for\nsubsequent .append() calls.\n\nThe maximum line length can be specified explicitly via maxlinelen. For\nsplitting the first line to a shorter value (to account for the field\nheader which isn't included in s, e.g. 'Subject') pass in the name of\nthe field in header_name. The default maxlinelen is 78 as recommended\nby RFC 2822.\n\ncontinuation_ws must be RFC 2822 compliant folding whitespace (usually\neither a space or a hard tab) which will be prepended to continuation\nlines.\n\nerrors is passed through to the .append() call.", + "builtins.Header.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Header.__le__" => "Return self<=value.", + "builtins.Header.__lt__" => "Return self<value.", + "builtins.Header.__ne__" => "Return self!=value.", + "builtins.Header.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Header.__reduce__" => "Helper for pickle.", + "builtins.Header.__reduce_ex__" => "Helper for pickle.", + "builtins.Header.__repr__" => "Return repr(self).", + "builtins.Header.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Header.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Header.__str__" => "Return the string value of the header.", + "builtins.Header.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Header.__weakref__" => "list of weak references to the object", + "builtins.Header._nonctext" => "True if string s is not a ctext character of RFC822.", + "builtins.Header.append" => "Append a string to the MIME header.\n\nOptional charset, if given, should be a Charset instance or the name\nof a character set (which will be converted to a Charset instance). A\nvalue of None (the default) means that the charset given in the\nconstructor is used.\n\ns may be a byte string or a Unicode string. If it is a byte string\n(i.e. isinstance(s, str) is false), then charset is the encoding of\nthat byte string, and a UnicodeError will be raised if the string\ncannot be decoded with that charset. If s is a Unicode string, then\ncharset is a hint specifying the character set of the characters in\nthe string. In either case, when producing an RFC 2822 compliant\nheader using RFC 2047 rules, the string will be encoded using the\noutput codec of the charset. If the string cannot be encoded to the\noutput codec, a UnicodeError will be raised.\n\nOptional 'errors' is passed as the errors argument to the decode\ncall if s is a byte string.", + "builtins.Header.encode" => "Encode a message header into an RFC-compliant format.\n\nThere are many issues involved in converting a given string for use in\nan email header. Only certain character sets are readable in most\nemail clients, and as header strings can only contain a subset of\n7-bit ASCII, care must be taken to properly convert and encode (with\nBase64 or quoted-printable) header strings. In addition, there is a\n75-character length limit on any given encoded header field, so\nline-wrapping must be performed, even with double-byte character sets.\n\nOptional maxlinelen specifies the maximum length of each generated\nline, exclusive of the linesep string. Individual lines may be longer\nthan maxlinelen if a folding point cannot be found. The first line\nwill be shorter by the length of the header name plus \": \" if a header\nname was specified at Header construction time. The default value for\nmaxlinelen is determined at header construction time.\n\nOptional splitchars is a string containing characters which should be\ngiven extra weight by the splitting algorithm during normal header\nwrapping. This is in very rough support of RFC 2822's 'higher level\nsyntactic breaks': split points preceded by a splitchar are preferred\nduring line splitting, with the characters preferred in the order in\nwhich they appear in the string. Space and tab may be included in the\nstring to indicate whether preference should be given to one over the\nother as a split point when other split chars do not appear in the line\nbeing split. Splitchars does not affect RFC 2047 encoded lines.\n\nOptional linesep is a string to be used to separate the lines of\nthe value. The default value is the most useful for typical\nPython applications, but it can be set to \\r\\n to produce RFC-compliant\nline separators when needed.", + "builtins.HelpFormatter" => "Abstract base class for formatting option help. OptionParser\ninstances should use one of the HelpFormatter subclasses for\nformatting help; by default IndentedHelpFormatter is used.\n\nInstance attributes:\n parser : OptionParser\n the controlling OptionParser instance\n indent_increment : int\n the number of columns to indent per nesting level\n max_help_position : int\n the maximum starting column for option help text\n help_position : int\n the calculated starting column for option help text;\n initially the same as the maximum\n width : int\n total number of columns for output (pass None to constructor for\n this value to be taken from the $COLUMNS environment variable)\n level : int\n current indentation level\n current_indent : int\n current indentation level (in columns)\n help_width : int\n number of columns available for option help text (calculated)\n default_tag : str\n text to replace with each option's default value, \"%default\"\n by default. Set to false value to disable default value expansion.\n option_strings : { Option : str }\n maps Option instances to the snippet of help text explaining\n the syntax of that option, e.g. \"-h, --help\" or\n \"-fFILE, --file=FILE\"\n _short_opt_fmt : str\n format string controlling how short options with values are\n printed in help text. Must be either \"%s%s\" (\"-fFILE\") or\n \"%s %s\" (\"-f FILE\"), because those are the two syntaxes that\n Optik supports.\n _long_opt_fmt : str\n similar but for long options; must be either \"%s %s\" (\"--file FILE\")\n or \"%s=%s\" (\"--file=FILE\").", + "builtins.HelpFormatter._Section.__delattr__" => "Implement delattr(self, name).", + "builtins.HelpFormatter._Section.__eq__" => "Return self==value.", + "builtins.HelpFormatter._Section.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.HelpFormatter._Section.__ge__" => "Return self>=value.", + "builtins.HelpFormatter._Section.__getattribute__" => "Return getattr(self, name).", + "builtins.HelpFormatter._Section.__getstate__" => "Helper for pickle.", + "builtins.HelpFormatter._Section.__gt__" => "Return self>value.", + "builtins.HelpFormatter._Section.__hash__" => "Return hash(self).", + "builtins.HelpFormatter._Section.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.HelpFormatter._Section.__le__" => "Return self<=value.", + "builtins.HelpFormatter._Section.__lt__" => "Return self<value.", + "builtins.HelpFormatter._Section.__ne__" => "Return self!=value.", + "builtins.HelpFormatter._Section.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.HelpFormatter._Section.__reduce__" => "Helper for pickle.", + "builtins.HelpFormatter._Section.__reduce_ex__" => "Helper for pickle.", + "builtins.HelpFormatter._Section.__repr__" => "Return repr(self).", + "builtins.HelpFormatter._Section.__setattr__" => "Implement setattr(self, name, value).", + "builtins.HelpFormatter._Section.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.HelpFormatter._Section.__str__" => "Return str(self).", + "builtins.HelpFormatter._Section.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.HelpFormatter._Section.__weakref__" => "list of weak references to the object", + "builtins.HelpFormatter.__delattr__" => "Implement delattr(self, name).", + "builtins.HelpFormatter.__eq__" => "Return self==value.", + "builtins.HelpFormatter.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.HelpFormatter.__ge__" => "Return self>=value.", + "builtins.HelpFormatter.__getattribute__" => "Return getattr(self, name).", + "builtins.HelpFormatter.__getstate__" => "Helper for pickle.", + "builtins.HelpFormatter.__gt__" => "Return self>value.", + "builtins.HelpFormatter.__hash__" => "Return hash(self).", + "builtins.HelpFormatter.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.HelpFormatter.__le__" => "Return self<=value.", + "builtins.HelpFormatter.__lt__" => "Return self<value.", + "builtins.HelpFormatter.__ne__" => "Return self!=value.", + "builtins.HelpFormatter.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.HelpFormatter.__reduce__" => "Helper for pickle.", + "builtins.HelpFormatter.__reduce_ex__" => "Helper for pickle.", + "builtins.HelpFormatter.__repr__" => "Return repr(self).", + "builtins.HelpFormatter.__setattr__" => "Implement setattr(self, name, value).", + "builtins.HelpFormatter.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.HelpFormatter.__str__" => "Return str(self).", + "builtins.HelpFormatter.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.HelpFormatter.__weakref__" => "list of weak references to the object", + "builtins.HelpFormatter._format_text" => "Format a paragraph of free-form text for inclusion in the\nhelp output at the current indentation level.", + "builtins.HelpFormatter._get_actions_usage_parts" => "Get usage parts with split index for optionals/positionals.\n\nReturns (parts, pos_start) where pos_start is the index in parts\nwhere positionals begin.\nThis preserves mutually exclusive group formatting across the\noptionals/positionals boundary (gh-75949).", + "builtins.HelpFormatter.format_option_strings" => "Return a comma-separated list of option strings & metavariables.", + "builtins.Helper.__delattr__" => "Implement delattr(self, name).", + "builtins.Helper.__eq__" => "Return self==value.", + "builtins.Helper.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Helper.__ge__" => "Return self>=value.", + "builtins.Helper.__getattribute__" => "Return getattr(self, name).", + "builtins.Helper.__getstate__" => "Helper for pickle.", + "builtins.Helper.__gt__" => "Return self>value.", + "builtins.Helper.__hash__" => "Return hash(self).", + "builtins.Helper.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Helper.__le__" => "Return self<=value.", + "builtins.Helper.__lt__" => "Return self<value.", + "builtins.Helper.__ne__" => "Return self!=value.", + "builtins.Helper.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Helper.__reduce__" => "Helper for pickle.", + "builtins.Helper.__reduce_ex__" => "Helper for pickle.", + "builtins.Helper.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Helper.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Helper.__str__" => "Return str(self).", + "builtins.Helper.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Helper.__weakref__" => "list of weak references to the object", + "builtins.Helper._gettopic" => "Return unbuffered tuple of (topic, xrefs).\n\nIf an error occurs here, the exception is caught and displayed by\nthe url handler.\n\nThis function duplicates the showtopic method but returns its\nresult directly so it can be formatted for display in an html page.", + "builtins.Helper.getline" => "Read one line, using input() when appropriate.", + "builtins.HtmlDiff" => "For producing HTML side by side comparison with change highlights.\n\nThis class can be used to create an HTML table (or a complete HTML file\ncontaining the table) showing a side by side, line by line comparison\nof text with inter-line and intra-line change highlights. The table can\nbe generated in either full or contextual difference mode.\n\nThe following methods are provided for HTML generation:\n\nmake_table -- generates HTML for a single side by side table\nmake_file -- generates complete HTML file with a single side by side table\n\nSee tools/scripts/diff.py for an example usage of this class.", + "builtins.HtmlDiff.__delattr__" => "Implement delattr(self, name).", + "builtins.HtmlDiff.__eq__" => "Return self==value.", + "builtins.HtmlDiff.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.HtmlDiff.__ge__" => "Return self>=value.", + "builtins.HtmlDiff.__getattribute__" => "Return getattr(self, name).", + "builtins.HtmlDiff.__getstate__" => "Helper for pickle.", + "builtins.HtmlDiff.__gt__" => "Return self>value.", + "builtins.HtmlDiff.__hash__" => "Return hash(self).", + "builtins.HtmlDiff.__init__" => "HtmlDiff instance initializer\n\nArguments:\ntabsize -- tab stop spacing, defaults to 8.\nwrapcolumn -- column number where lines are broken and wrapped,\n defaults to None where lines are not wrapped.\nlinejunk,charjunk -- keyword arguments passed into ndiff() (used by\n HtmlDiff() to generate the side by side HTML differences). See\n ndiff() documentation for argument default values and descriptions.", + "builtins.HtmlDiff.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.HtmlDiff.__le__" => "Return self<=value.", + "builtins.HtmlDiff.__lt__" => "Return self<value.", + "builtins.HtmlDiff.__ne__" => "Return self!=value.", + "builtins.HtmlDiff.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.HtmlDiff.__reduce__" => "Helper for pickle.", + "builtins.HtmlDiff.__reduce_ex__" => "Helper for pickle.", + "builtins.HtmlDiff.__repr__" => "Return repr(self).", + "builtins.HtmlDiff.__setattr__" => "Implement setattr(self, name, value).", + "builtins.HtmlDiff.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.HtmlDiff.__str__" => "Return str(self).", + "builtins.HtmlDiff.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.HtmlDiff.__weakref__" => "list of weak references to the object", + "builtins.HtmlDiff._collect_lines" => "Collects mdiff output into separate lists\n\nBefore storing the mdiff from/to data into a list, it is converted\ninto a single line of text with HTML markup.", + "builtins.HtmlDiff._convert_flags" => "Makes list of \"next\" links", + "builtins.HtmlDiff._format_line" => "Returns HTML markup of \"from\" / \"to\" text lines\n\nside -- 0 or 1 indicating \"from\" or \"to\" text\nflag -- indicates if difference on line\nlinenum -- line number (used for line number column)\ntext -- line text to be marked up", + "builtins.HtmlDiff._line_wrapper" => "Returns iterator that splits (wraps) mdiff text lines", + "builtins.HtmlDiff._make_prefix" => "Create unique anchor prefixes", + "builtins.HtmlDiff._split_line" => "Builds list of text lines by splitting text lines at wrap point\n\nThis function will determine if the input text line needs to be\nwrapped (split) into separate lines. If so, the first wrap point\nwill be determined and the first line appended to the output\ntext line list. This function is used recursively to handle\nthe second part of the split line to further split it.", + "builtins.HtmlDiff._tab_newline_replace" => "Returns from/to line lists with tabs expanded and newlines removed.\n\nInstead of tab characters being replaced by the number of spaces\nneeded to fill in to the next tab stop, this function will fill\nthe space with tab characters. This is done so that the difference\nalgorithms can identify changes in a file when tabs are replaced by\nspaces and vice versa. At the end of the HTML generation, the tab\ncharacters will be replaced with a nonbreakable space.", + "builtins.HtmlDiff.make_file" => "Returns HTML file of side by side comparison with change highlights\n\nArguments:\nfromlines -- list of \"from\" lines\ntolines -- list of \"to\" lines\nfromdesc -- \"from\" file column header string\ntodesc -- \"to\" file column header string\ncontext -- set to True for contextual differences (defaults to False\n which shows full differences).\nnumlines -- number of context lines. When context is set True,\n controls number of lines displayed before and after the change.\n When context is False, controls the number of lines to place\n the \"next\" link anchors before the next change (so click of\n \"next\" link jumps to just before the change).\ncharset -- charset of the HTML document", + "builtins.HtmlDiff.make_table" => "Returns HTML table of side by side comparison with change highlights\n\nArguments:\nfromlines -- list of \"from\" lines\ntolines -- list of \"to\" lines\nfromdesc -- \"from\" file column header string\ntodesc -- \"to\" file column header string\ncontext -- set to True for contextual differences (defaults to False\n which shows full differences).\nnumlines -- number of context lines. When context is set True,\n controls number of lines displayed before and after the change.\n When context is False, controls the number of lines to place\n the \"next\" link anchors before the next change (so click of\n \"next\" link jumps to just before the change).", + "builtins.IMAP4" => "IMAP4 client class.\n\nInstantiate with: IMAP4([host[, port[, timeout=None]]])\n\n host - host's name (default: localhost);\n port - port number (default: standard IMAP4 port).\n timeout - socket timeout (default: None)\n If timeout is not given or is None,\n the global default socket timeout is used\n\nAll IMAP4rev1 commands are supported by methods of the same\nname (in lowercase).\n\nAll arguments to commands are converted to strings, except for\nAUTHENTICATE, and the last argument to APPEND which is passed as\nan IMAP4 literal. If necessary (the string contains any\nnon-printing characters or white-space and isn't enclosed with\neither parentheses or double quotes) each string is quoted.\nHowever, the 'password' argument to the LOGIN command is always\nquoted. If you want to avoid having an argument string quoted\n(eg: the 'flags' argument to STORE) then enclose the string in\nparentheses (eg: \"(\\Deleted)\").\n\nEach command returns a tuple: (type, [data, ...]) where 'type'\nis usually 'OK' or 'NO', and 'data' is either the text from the\ntagged response, or untagged results from command. Each 'data'\nis either a string, or a tuple. If a tuple, then the first part\nis the header of the response, and the second part contains\nthe data (ie: 'literal' value).\n\nErrors raise the exception class <instance>.error(\"<reason>\").\nIMAP4 server errors raise <instance>.abort(\"<reason>\"),\nwhich is a sub-class of 'error'. Mailbox status changes\nfrom READ-WRITE to READ-ONLY raise the exception class\n<instance>.readonly(\"<reason>\"), which is a sub-class of 'abort'.\n\n\"error\" exceptions imply a program error.\n\"abort\" exceptions imply the connection should be reset, and\n the command re-tried.\n\"readonly\" exceptions imply the command should be re-tried.\n\nNote: to use this module, you must read the RFCs pertaining to the\nIMAP4 protocol, as the semantics of the arguments to each IMAP4\ncommand are left to the invoker, not to mention the results. Also,\nmost IMAP servers implement a sub-set of the commands available here.", + "builtins.IMAP4._CRAM_MD5_AUTH" => "Authobject to use with CRAM-MD5 authentication.", + "builtins.IMAP4.__delattr__" => "Implement delattr(self, name).", + "builtins.IMAP4.__eq__" => "Return self==value.", + "builtins.IMAP4.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.IMAP4.__ge__" => "Return self>=value.", + "builtins.IMAP4.__getattribute__" => "Return getattr(self, name).", + "builtins.IMAP4.__getstate__" => "Helper for pickle.", + "builtins.IMAP4.__gt__" => "Return self>value.", + "builtins.IMAP4.__hash__" => "Return hash(self).", + "builtins.IMAP4.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.IMAP4.__le__" => "Return self<=value.", + "builtins.IMAP4.__lt__" => "Return self<value.", + "builtins.IMAP4.__ne__" => "Return self!=value.", + "builtins.IMAP4.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.IMAP4.__reduce__" => "Helper for pickle.", + "builtins.IMAP4.__reduce_ex__" => "Helper for pickle.", + "builtins.IMAP4.__repr__" => "Return repr(self).", + "builtins.IMAP4.__setattr__" => "Implement setattr(self, name, value).", + "builtins.IMAP4.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.IMAP4.__str__" => "Return str(self).", + "builtins.IMAP4.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.IMAP4.__weakref__" => "list of weak references to the object", + "builtins.IMAP4._responsetimeout.__delattr__" => "Implement delattr(self, name).", + "builtins.IMAP4._responsetimeout.__eq__" => "Return self==value.", + "builtins.IMAP4._responsetimeout.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.IMAP4._responsetimeout.__ge__" => "Return self>=value.", + "builtins.IMAP4._responsetimeout.__getattribute__" => "Return getattr(self, name).", + "builtins.IMAP4._responsetimeout.__getstate__" => "Helper for pickle.", + "builtins.IMAP4._responsetimeout.__gt__" => "Return self>value.", + "builtins.IMAP4._responsetimeout.__hash__" => "Return hash(self).", + "builtins.IMAP4._responsetimeout.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.IMAP4._responsetimeout.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.IMAP4._responsetimeout.__le__" => "Return self<=value.", + "builtins.IMAP4._responsetimeout.__lt__" => "Return self<value.", + "builtins.IMAP4._responsetimeout.__ne__" => "Return self!=value.", + "builtins.IMAP4._responsetimeout.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.IMAP4._responsetimeout.__reduce_ex__" => "Helper for pickle.", + "builtins.IMAP4._responsetimeout.__repr__" => "Return repr(self).", + "builtins.IMAP4._responsetimeout.__setattr__" => "Implement setattr(self, name, value).", + "builtins.IMAP4._responsetimeout.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.IMAP4._responsetimeout.__str__" => "Return str(self).", + "builtins.IMAP4._responsetimeout.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.IMAP4._responsetimeout.__weakref__" => "list of weak references to the object", + "builtins.IMAP4._responsetimeout.add_note" => "Add a note to the exception", + "builtins.IMAP4._responsetimeout.errno" => "POSIX exception code", + "builtins.IMAP4._responsetimeout.filename" => "exception filename", + "builtins.IMAP4._responsetimeout.filename2" => "second exception filename", + "builtins.IMAP4._responsetimeout.strerror" => "exception strerror", + "builtins.IMAP4._responsetimeout.winerror" => "Win32 exception code", + "builtins.IMAP4._responsetimeout.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.IMAP4.abort.__delattr__" => "Implement delattr(self, name).", + "builtins.IMAP4.abort.__eq__" => "Return self==value.", + "builtins.IMAP4.abort.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.IMAP4.abort.__ge__" => "Return self>=value.", + "builtins.IMAP4.abort.__getattribute__" => "Return getattr(self, name).", + "builtins.IMAP4.abort.__getstate__" => "Helper for pickle.", + "builtins.IMAP4.abort.__gt__" => "Return self>value.", + "builtins.IMAP4.abort.__hash__" => "Return hash(self).", + "builtins.IMAP4.abort.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.IMAP4.abort.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.IMAP4.abort.__le__" => "Return self<=value.", + "builtins.IMAP4.abort.__lt__" => "Return self<value.", + "builtins.IMAP4.abort.__ne__" => "Return self!=value.", + "builtins.IMAP4.abort.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.IMAP4.abort.__reduce_ex__" => "Helper for pickle.", + "builtins.IMAP4.abort.__repr__" => "Return repr(self).", + "builtins.IMAP4.abort.__setattr__" => "Implement setattr(self, name, value).", + "builtins.IMAP4.abort.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.IMAP4.abort.__str__" => "Return str(self).", + "builtins.IMAP4.abort.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.IMAP4.abort.__weakref__" => "list of weak references to the object", + "builtins.IMAP4.abort.add_note" => "Add a note to the exception", + "builtins.IMAP4.abort.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.IMAP4.append" => "Append message to named mailbox.\n\n(typ, [data]) = <instance>.append(mailbox, flags, date_time, message)\n\n All args except 'message' can be None.", + "builtins.IMAP4.authenticate" => "Authenticate command - requires response processing.\n\n'mechanism' specifies which authentication mechanism is to\nbe used - it must appear in <instance>.capabilities in the\nform AUTH=<mechanism>.\n\n'authobject' must be a callable object:\n\n data = authobject(response)\n\nIt will be called to process server continuation responses; the\nresponse argument it is passed will be a bytes. It should return bytes\ndata that will be base64 encoded and sent to the server. It should\nreturn None if the client abort response '*' should be sent instead.", + "builtins.IMAP4.capability" => "(typ, [data]) = <instance>.capability()\nFetch capabilities list from server.", + "builtins.IMAP4.check" => "Checkpoint mailbox on server.\n\n(typ, [data]) = <instance>.check()", + "builtins.IMAP4.close" => "Close currently selected mailbox.\n\nDeleted messages are removed from writable mailbox.\nThis is the recommended command before 'LOGOUT'.\n\n(typ, [data]) = <instance>.close()", + "builtins.IMAP4.copy" => "Copy 'message_set' messages onto end of 'new_mailbox'.\n\n(typ, [data]) = <instance>.copy(message_set, new_mailbox)", + "builtins.IMAP4.create" => "Create new mailbox.\n\n(typ, [data]) = <instance>.create(mailbox)", + "builtins.IMAP4.delete" => "Delete old mailbox.\n\n(typ, [data]) = <instance>.delete(mailbox)", + "builtins.IMAP4.deleteacl" => "Delete the ACLs (remove any rights) set for who on mailbox.\n\n(typ, [data]) = <instance>.deleteacl(mailbox, who)", + "builtins.IMAP4.enable" => "Send an RFC5161 enable string to the server.\n\n(typ, [data]) = <instance>.enable(capability)", + "builtins.IMAP4.error.__delattr__" => "Implement delattr(self, name).", + "builtins.IMAP4.error.__eq__" => "Return self==value.", + "builtins.IMAP4.error.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.IMAP4.error.__ge__" => "Return self>=value.", + "builtins.IMAP4.error.__getattribute__" => "Return getattr(self, name).", + "builtins.IMAP4.error.__getstate__" => "Helper for pickle.", + "builtins.IMAP4.error.__gt__" => "Return self>value.", + "builtins.IMAP4.error.__hash__" => "Return hash(self).", + "builtins.IMAP4.error.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.IMAP4.error.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.IMAP4.error.__le__" => "Return self<=value.", + "builtins.IMAP4.error.__lt__" => "Return self<value.", + "builtins.IMAP4.error.__ne__" => "Return self!=value.", + "builtins.IMAP4.error.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.IMAP4.error.__reduce_ex__" => "Helper for pickle.", + "builtins.IMAP4.error.__repr__" => "Return repr(self).", + "builtins.IMAP4.error.__setattr__" => "Implement setattr(self, name, value).", + "builtins.IMAP4.error.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.IMAP4.error.__str__" => "Return str(self).", + "builtins.IMAP4.error.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.IMAP4.error.__weakref__" => "list of weak references to the object", + "builtins.IMAP4.error.add_note" => "Add a note to the exception", + "builtins.IMAP4.error.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.IMAP4.expunge" => "Permanently remove deleted items from selected mailbox.\n\nGenerates 'EXPUNGE' response for each deleted message.\n\n(typ, [data]) = <instance>.expunge()\n\n'data' is list of 'EXPUNGE'd message numbers in order received.", + "builtins.IMAP4.fetch" => "Fetch (parts of) messages.\n\n(typ, [data, ...]) = <instance>.fetch(message_set, message_parts)\n\n'message_parts' should be a string of selected parts\nenclosed in parentheses, eg: \"(UID BODY[TEXT])\".\n\n'data' are tuples of message part envelope and data.", + "builtins.IMAP4.getacl" => "Get the ACLs for a mailbox.\n\n(typ, [data]) = <instance>.getacl(mailbox)", + "builtins.IMAP4.getannotation" => "(typ, [data]) = <instance>.getannotation(mailbox, entry, attribute)\nRetrieve ANNOTATIONs.", + "builtins.IMAP4.getquota" => "Get the quota root's resource usage and limits.\n\nPart of the IMAP4 QUOTA extension defined in rfc2087.\n\n(typ, [data]) = <instance>.getquota(root)", + "builtins.IMAP4.getquotaroot" => "Get the list of quota roots for the named mailbox.\n\n(typ, [[QUOTAROOT responses...], [QUOTA responses]]) = <instance>.getquotaroot(mailbox)", + "builtins.IMAP4.idle" => "Return an iterable IDLE context manager producing untagged responses.\nIf the argument is not None, limit iteration to 'duration' seconds.\n\nwith M.idle(duration=29 * 60) as idler:\n for typ, data in idler:\n print(typ, data)\n\nNote: 'duration' requires a socket connection (not IMAP4_stream).", + "builtins.IMAP4.list" => "List mailbox names in directory matching pattern.\n\n(typ, [data]) = <instance>.list(directory='\"\"', pattern='*')\n\n'data' is list of LIST responses.", + "builtins.IMAP4.login" => "Identify client using plaintext password.\n\n(typ, [data]) = <instance>.login(user, password)\n\nNB: 'password' will be quoted.", + "builtins.IMAP4.login_cram_md5" => "Force use of CRAM-MD5 authentication.\n\n(typ, [data]) = <instance>.login_cram_md5(user, password)", + "builtins.IMAP4.logout" => "Shutdown connection to server.\n\n(typ, [data]) = <instance>.logout()\n\nReturns server 'BYE' response.", + "builtins.IMAP4.lsub" => "List 'subscribed' mailbox names in directory matching pattern.\n\n(typ, [data, ...]) = <instance>.lsub(directory='\"\"', pattern='*')\n\n'data' are tuples of message part envelope and data.", + "builtins.IMAP4.myrights" => "Show my ACLs for a mailbox (i.e. the rights that I have on mailbox).\n\n(typ, [data]) = <instance>.myrights(mailbox)", + "builtins.IMAP4.namespace" => "Returns IMAP namespaces ala rfc2342\n\n(typ, [data, ...]) = <instance>.namespace()", + "builtins.IMAP4.noop" => "Send NOOP command.\n\n(typ, [data]) = <instance>.noop()", + "builtins.IMAP4.open" => "Setup connection to remote server on \"host:port\"\n (default: localhost:standard IMAP4 port).\nThis connection will be used by the routines:\n read, readline, send, shutdown.", + "builtins.IMAP4.partial" => "Fetch truncated part of a message.\n\n(typ, [data, ...]) = <instance>.partial(message_num, message_part, start, length)\n\n'data' is tuple of message part envelope and data.", + "builtins.IMAP4.proxyauth" => "Assume authentication as \"user\".\n\nAllows an authorised administrator to proxy into any user's\nmailbox.\n\n(typ, [data]) = <instance>.proxyauth(user)", + "builtins.IMAP4.read" => "Read 'size' bytes from remote.", + "builtins.IMAP4.readline" => "Read line from remote.", + "builtins.IMAP4.readonly.__delattr__" => "Implement delattr(self, name).", + "builtins.IMAP4.readonly.__eq__" => "Return self==value.", + "builtins.IMAP4.readonly.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.IMAP4.readonly.__ge__" => "Return self>=value.", + "builtins.IMAP4.readonly.__getattribute__" => "Return getattr(self, name).", + "builtins.IMAP4.readonly.__getstate__" => "Helper for pickle.", + "builtins.IMAP4.readonly.__gt__" => "Return self>value.", + "builtins.IMAP4.readonly.__hash__" => "Return hash(self).", + "builtins.IMAP4.readonly.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.IMAP4.readonly.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.IMAP4.readonly.__le__" => "Return self<=value.", + "builtins.IMAP4.readonly.__lt__" => "Return self<value.", + "builtins.IMAP4.readonly.__ne__" => "Return self!=value.", + "builtins.IMAP4.readonly.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.IMAP4.readonly.__reduce_ex__" => "Helper for pickle.", + "builtins.IMAP4.readonly.__repr__" => "Return repr(self).", + "builtins.IMAP4.readonly.__setattr__" => "Implement setattr(self, name, value).", + "builtins.IMAP4.readonly.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.IMAP4.readonly.__str__" => "Return str(self).", + "builtins.IMAP4.readonly.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.IMAP4.readonly.__weakref__" => "list of weak references to the object", + "builtins.IMAP4.readonly.add_note" => "Add a note to the exception", + "builtins.IMAP4.readonly.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.IMAP4.recent" => "Return most recent 'RECENT' responses if any exist,\nelse prompt server for an update using the 'NOOP' command.\n\n(typ, [data]) = <instance>.recent()\n\n'data' is None if no new messages,\nelse list of RECENT responses, most recent last.", + "builtins.IMAP4.rename" => "Rename old mailbox name to new.\n\n(typ, [data]) = <instance>.rename(oldmailbox, newmailbox)", + "builtins.IMAP4.response" => "Return data for response 'code' if received, or None.\n\nOld value for response 'code' is cleared.\n\n(code, [data]) = <instance>.response(code)", + "builtins.IMAP4.search" => "Search mailbox for matching messages.\n\n(typ, [data]) = <instance>.search(charset, criterion, ...)\n\n'data' is space separated list of matching message numbers.\nIf UTF8 is enabled, charset MUST be None.", + "builtins.IMAP4.select" => "Select a mailbox.\n\nFlush all untagged responses.\n\n(typ, [data]) = <instance>.select(mailbox='INBOX', readonly=False)\n\n'data' is count of messages in mailbox ('EXISTS' response).\n\nMandated responses are ('FLAGS', 'EXISTS', 'RECENT', 'UIDVALIDITY'), so\nother responses should be obtained via <instance>.response('FLAGS') etc.", + "builtins.IMAP4.send" => "Send data to remote.", + "builtins.IMAP4.setacl" => "Set a mailbox acl.\n\n(typ, [data]) = <instance>.setacl(mailbox, who, what)", + "builtins.IMAP4.setannotation" => "(typ, [data]) = <instance>.setannotation(mailbox[, entry, attribute]+)\nSet ANNOTATIONs.", + "builtins.IMAP4.setquota" => "Set the quota root's resource limits.\n\n(typ, [data]) = <instance>.setquota(root, limits)", + "builtins.IMAP4.shutdown" => "Close I/O established in \"open\".", + "builtins.IMAP4.socket" => "Return socket instance used to connect to IMAP4 server.\n\nsocket = <instance>.socket()", + "builtins.IMAP4.sort" => "IMAP4rev1 extension SORT command.\n\n(typ, [data]) = <instance>.sort(sort_criteria, charset, search_criteria, ...)", + "builtins.IMAP4.status" => "Request named status conditions for mailbox.\n\n(typ, [data]) = <instance>.status(mailbox, names)", + "builtins.IMAP4.store" => "Alters flag dispositions for messages in mailbox.\n\n(typ, [data]) = <instance>.store(message_set, command, flags)", + "builtins.IMAP4.subscribe" => "Subscribe to new mailbox.\n\n(typ, [data]) = <instance>.subscribe(mailbox)", + "builtins.IMAP4.thread" => "IMAPrev1 extension THREAD command.\n\n(type, [data]) = <instance>.thread(threading_algorithm, charset, search_criteria, ...)", + "builtins.IMAP4.uid" => "Execute \"command arg ...\" with messages identified by UID,\n rather than message number.\n\n(typ, [data]) = <instance>.uid(command, arg1, arg2, ...)\n\nReturns response appropriate to 'command'.", + "builtins.IMAP4.unselect" => "Free server's resources associated with the selected mailbox\nand returns the server to the authenticated state.\nThis command performs the same actions as CLOSE, except\nthat no messages are permanently removed from the currently\nselected mailbox.\n\n(typ, [data]) = <instance>.unselect()", + "builtins.IMAP4.unsubscribe" => "Unsubscribe from old mailbox.\n\n(typ, [data]) = <instance>.unsubscribe(mailbox)", + "builtins.IMAP4.xatom" => "Allow simple extension commands\n notified by server in CAPABILITY response.\n\nAssumes command is legal in current state.\n\n(typ, [data]) = <instance>.xatom(name, arg, ...)\n\nReturns response appropriate to extension command 'name'.", + "builtins.IOBase" => "The abstract base class for all I/O classes.\n\nThis class provides dummy implementations for many methods that\nderived classes can override selectively; the default implementations\nrepresent a file that cannot be read, written or seeked.\n\nEven though IOBase does not declare read or write because\ntheir signatures will vary, implementations and clients should\nconsider those methods part of the interface. Also, implementations\nmay raise UnsupportedOperation when operations they do not support are\ncalled.\n\nThe basic type used for binary data read from or written to a file is\nbytes. Other bytes-like objects are accepted as method arguments too.\nText I/O classes work with str data.\n\nNote that calling any method (even inquiries) on a closed stream is\nundefined. Implementations may raise OSError in this case.\n\nIOBase (and its subclasses) support the iterator protocol, meaning\nthat an IOBase object can be iterated over yielding the lines in a\nstream.\n\nIOBase also supports the :keyword:`with` statement. In this example,\nfp is closed after the suite of the with statement is complete:\n\nwith open('spam.txt', 'r') as fp:\n fp.write('Spam and eggs!')", + "builtins.IOBase.__del__" => "Destructor. Calls close().", + "builtins.IOBase.__delattr__" => "Implement delattr(self, name).", + "builtins.IOBase.__enter__" => "Context management protocol. Returns self (an instance of IOBase).", + "builtins.IOBase.__eq__" => "Return self==value.", + "builtins.IOBase.__exit__" => "Context management protocol. Calls close()", + "builtins.IOBase.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.IOBase.__ge__" => "Return self>=value.", + "builtins.IOBase.__getattribute__" => "Return getattr(self, name).", + "builtins.IOBase.__getstate__" => "Helper for pickle.", + "builtins.IOBase.__gt__" => "Return self>value.", + "builtins.IOBase.__hash__" => "Return hash(self).", + "builtins.IOBase.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.IOBase.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.IOBase.__le__" => "Return self<=value.", + "builtins.IOBase.__lt__" => "Return self<value.", + "builtins.IOBase.__ne__" => "Return self!=value.", + "builtins.IOBase.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.IOBase.__reduce__" => "Helper for pickle.", + "builtins.IOBase.__reduce_ex__" => "Helper for pickle.", + "builtins.IOBase.__repr__" => "Return repr(self).", + "builtins.IOBase.__setattr__" => "Implement setattr(self, name, value).", + "builtins.IOBase.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.IOBase.__str__" => "Return str(self).", + "builtins.IOBase.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.IOBase.__weakref__" => "list of weak references to the object", + "builtins.IOBase._checkClosed" => "Internal: raise a ValueError if file is closed", + "builtins.IOBase._checkReadable" => "Internal: raise UnsupportedOperation if file is not readable", + "builtins.IOBase._checkSeekable" => "Internal: raise UnsupportedOperation if file is not seekable", + "builtins.IOBase._checkWritable" => "Internal: raise UnsupportedOperation if file is not writable", + "builtins.IOBase._unsupported" => "Internal: raise an OSError exception for unsupported operations.", + "builtins.IOBase.close" => "Flush and close the IO object.\n\nThis method has no effect if the file is already closed.", + "builtins.IOBase.closed" => "closed: bool. True iff the file has been closed.\n\nFor backwards compatibility, this is a property, not a predicate.", + "builtins.IOBase.fileno" => "Returns underlying file descriptor (an int) if one exists.\n\nAn OSError is raised if the IO object does not use a file\ndescriptor.", + "builtins.IOBase.flush" => "Flush write buffers, if applicable.\n\nThis is not implemented for read-only and non-blocking streams.", + "builtins.IOBase.isatty" => "Return a bool indicating whether this is an 'interactive' stream.\n\nReturn False if it can't be determined.", + "builtins.IOBase.readable" => "Return a bool indicating whether object was opened for reading.\n\nIf False, read() will raise OSError.", + "builtins.IOBase.readline" => "Read and return a line of bytes from the stream.\n\nIf size is specified, at most size bytes will be read.\nSize should be an int.\n\nThe line terminator is always b'\\n' for binary files; for text\nfiles, the newlines argument to open can be used to select the line\nterminator(s) recognized.", + "builtins.IOBase.readlines" => "Return a list of lines from the stream.\n\nhint can be specified to control the number of lines read: no more\nlines will be read if the total size (in bytes/characters) of all\nlines so far exceeds hint.", + "builtins.IOBase.seek" => "Change stream position.\n\nChange the stream position to byte offset pos. Argument pos is\ninterpreted relative to the position indicated by whence. Values\nfor whence are ints:\n\n* 0 -- start of stream (the default); offset should be zero or\n positive\n* 1 -- current stream position; offset may be negative\n* 2 -- end of stream; offset is usually negative\nSome operating systems / file systems could provide additional\nvalues.\n\nReturn an int indicating the new absolute position.", + "builtins.IOBase.seekable" => "Return a bool indicating whether object supports random access.\n\nIf False, seek(), tell() and truncate() will raise OSError.\nThis method may need to do a test seek().", + "builtins.IOBase.tell" => "Return an int indicating the current stream position.", + "builtins.IOBase.truncate" => "Truncate file to size bytes.\n\nSize defaults to the current IO position as reported by tell().\nReturn the new size.", + "builtins.IOBase.writable" => "Return a bool indicating whether object was opened for writing.\n\nIf False, write() and truncate() will raise OSError.", + "builtins.IOBase.writelines" => "Write a list of lines to the stream.\n\nLine separators are not added, so it is usual for each of the lines\nprovided to have a line separator at the end.", "builtins.IOError" => "Base class for I/O related errors.", "builtins.IOError.__delattr__" => "Implement delattr(self, name).", "builtins.IOError.__eq__" => "Return self==value.", @@ -10326,6 +14128,55 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.IOError.strerror" => "exception strerror", "builtins.IOError.winerror" => "Win32 exception code", "builtins.IOError.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.Idler" => "Iterable IDLE context manager: start IDLE & produce untagged responses.\n\nAn object of this type is returned by the IMAP4.idle() method.\n\nNote: The name and structure of this class are subject to change.", + "builtins.Idler.__delattr__" => "Implement delattr(self, name).", + "builtins.Idler.__eq__" => "Return self==value.", + "builtins.Idler.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Idler.__ge__" => "Return self>=value.", + "builtins.Idler.__getattribute__" => "Return getattr(self, name).", + "builtins.Idler.__getstate__" => "Helper for pickle.", + "builtins.Idler.__gt__" => "Return self>value.", + "builtins.Idler.__hash__" => "Return hash(self).", + "builtins.Idler.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Idler.__le__" => "Return self<=value.", + "builtins.Idler.__lt__" => "Return self<value.", + "builtins.Idler.__ne__" => "Return self!=value.", + "builtins.Idler.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Idler.__reduce__" => "Helper for pickle.", + "builtins.Idler.__reduce_ex__" => "Helper for pickle.", + "builtins.Idler.__repr__" => "Return repr(self).", + "builtins.Idler.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Idler.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Idler.__str__" => "Return str(self).", + "builtins.Idler.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Idler.__weakref__" => "list of weak references to the object", + "builtins.Idler.burst" => "Yield a burst of responses no more than 'interval' seconds apart.\n\nwith M.idle() as idler:\n # get a response and any others following by < 0.1 seconds\n batch = list(idler.burst())\n print(f'processing {len(batch)} responses...')\n print(batch)\n\nNote: This generator requires a socket connection (not IMAP4_stream).", + "builtins.Image" => "Base class for images.", + "builtins.Image.__delattr__" => "Implement delattr(self, name).", + "builtins.Image.__eq__" => "Return self==value.", + "builtins.Image.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Image.__ge__" => "Return self>=value.", + "builtins.Image.__getattribute__" => "Return getattr(self, name).", + "builtins.Image.__getstate__" => "Helper for pickle.", + "builtins.Image.__gt__" => "Return self>value.", + "builtins.Image.__hash__" => "Return hash(self).", + "builtins.Image.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Image.__le__" => "Return self<=value.", + "builtins.Image.__lt__" => "Return self<value.", + "builtins.Image.__ne__" => "Return self!=value.", + "builtins.Image.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Image.__reduce__" => "Helper for pickle.", + "builtins.Image.__reduce_ex__" => "Helper for pickle.", + "builtins.Image.__repr__" => "Return repr(self).", + "builtins.Image.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Image.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Image.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Image.__weakref__" => "list of weak references to the object", + "builtins.Image.config" => "Configure the image.", + "builtins.Image.configure" => "Configure the image.", + "builtins.Image.height" => "Return the height of the image.", + "builtins.Image.type" => "Return the type of the image, e.g. \"photo\" or \"bitmap\".", + "builtins.Image.width" => "Return the width of the image.", "builtins.ImportError" => "Import can't find module, or can't find name in module.", "builtins.ImportError.__delattr__" => "Implement delattr(self, name).", "builtins.ImportError.__eq__" => "Return self==value.", @@ -10376,6 +14227,82 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.ImportWarning.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.ImportWarning.add_note" => "Add a note to the exception", "builtins.ImportWarning.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.IncrementalDecoder" => "An IncrementalDecoder decodes an input in multiple steps. The input can\nbe passed piece by piece to the decode() method. The IncrementalDecoder\nremembers the state of the decoding process between calls to decode().", + "builtins.IncrementalDecoder.__delattr__" => "Implement delattr(self, name).", + "builtins.IncrementalDecoder.__eq__" => "Return self==value.", + "builtins.IncrementalDecoder.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.IncrementalDecoder.__ge__" => "Return self>=value.", + "builtins.IncrementalDecoder.__getattribute__" => "Return getattr(self, name).", + "builtins.IncrementalDecoder.__getstate__" => "Helper for pickle.", + "builtins.IncrementalDecoder.__gt__" => "Return self>value.", + "builtins.IncrementalDecoder.__hash__" => "Return hash(self).", + "builtins.IncrementalDecoder.__init__" => "Create an IncrementalDecoder instance.\n\nThe IncrementalDecoder may use different error handling schemes by\nproviding the errors keyword argument. See the module docstring\nfor a list of possible values.", + "builtins.IncrementalDecoder.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.IncrementalDecoder.__le__" => "Return self<=value.", + "builtins.IncrementalDecoder.__lt__" => "Return self<value.", + "builtins.IncrementalDecoder.__ne__" => "Return self!=value.", + "builtins.IncrementalDecoder.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.IncrementalDecoder.__reduce__" => "Helper for pickle.", + "builtins.IncrementalDecoder.__reduce_ex__" => "Helper for pickle.", + "builtins.IncrementalDecoder.__repr__" => "Return repr(self).", + "builtins.IncrementalDecoder.__setattr__" => "Implement setattr(self, name, value).", + "builtins.IncrementalDecoder.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.IncrementalDecoder.__str__" => "Return str(self).", + "builtins.IncrementalDecoder.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.IncrementalDecoder.__weakref__" => "list of weak references to the object", + "builtins.IncrementalDecoder.decode" => "Decode input and returns the resulting object.", + "builtins.IncrementalDecoder.getstate" => "Return the current state of the decoder.\n\nThis must be a (buffered_input, additional_state_info) tuple.\nbuffered_input must be a bytes object containing bytes that\nwere passed to decode() that have not yet been converted.\nadditional_state_info must be a non-negative integer\nrepresenting the state of the decoder WITHOUT yet having\nprocessed the contents of buffered_input. In the initial state\nand after reset(), getstate() must return (b\"\", 0).", + "builtins.IncrementalDecoder.reset" => "Reset the decoder to the initial state.", + "builtins.IncrementalDecoder.setstate" => "Set the current state of the decoder.\n\nstate must have been returned by getstate(). The effect of\nsetstate((b\"\", 0)) must be equivalent to reset().", + "builtins.IncrementalEncoder" => "An IncrementalEncoder encodes an input in multiple steps. The input can\nbe passed piece by piece to the encode() method. The IncrementalEncoder\nremembers the state of the encoding process between calls to encode().", + "builtins.IncrementalEncoder.__delattr__" => "Implement delattr(self, name).", + "builtins.IncrementalEncoder.__eq__" => "Return self==value.", + "builtins.IncrementalEncoder.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.IncrementalEncoder.__ge__" => "Return self>=value.", + "builtins.IncrementalEncoder.__getattribute__" => "Return getattr(self, name).", + "builtins.IncrementalEncoder.__getstate__" => "Helper for pickle.", + "builtins.IncrementalEncoder.__gt__" => "Return self>value.", + "builtins.IncrementalEncoder.__hash__" => "Return hash(self).", + "builtins.IncrementalEncoder.__init__" => "Creates an IncrementalEncoder instance.\n\nThe IncrementalEncoder may use different error handling schemes by\nproviding the errors keyword argument. See the module docstring\nfor a list of possible values.", + "builtins.IncrementalEncoder.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.IncrementalEncoder.__le__" => "Return self<=value.", + "builtins.IncrementalEncoder.__lt__" => "Return self<value.", + "builtins.IncrementalEncoder.__ne__" => "Return self!=value.", + "builtins.IncrementalEncoder.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.IncrementalEncoder.__reduce__" => "Helper for pickle.", + "builtins.IncrementalEncoder.__reduce_ex__" => "Helper for pickle.", + "builtins.IncrementalEncoder.__repr__" => "Return repr(self).", + "builtins.IncrementalEncoder.__setattr__" => "Implement setattr(self, name, value).", + "builtins.IncrementalEncoder.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.IncrementalEncoder.__str__" => "Return str(self).", + "builtins.IncrementalEncoder.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.IncrementalEncoder.__weakref__" => "list of weak references to the object", + "builtins.IncrementalEncoder.encode" => "Encodes input and returns the resulting object.", + "builtins.IncrementalEncoder.getstate" => "Return the current state of the encoder.", + "builtins.IncrementalEncoder.reset" => "Resets the encoder to the initial state.", + "builtins.IncrementalEncoder.setstate" => "Set the current state of the encoder. state must have been\nreturned by getstate().", + "builtins.IncrementalNewlineDecoder" => "Codec used when reading a file in universal newlines mode.\n\nIt wraps another incremental decoder, translating \\r\\n and \\r into \\n.\nIt also records the types of newlines encountered. When used with\ntranslate=False, it ensures that the newline sequence is returned in\none piece. When used with decoder=None, it expects unicode strings as\ndecode input and translates newlines without first invoking an external\ndecoder.", + "builtins.IncrementalNewlineDecoder.__delattr__" => "Implement delattr(self, name).", + "builtins.IncrementalNewlineDecoder.__eq__" => "Return self==value.", + "builtins.IncrementalNewlineDecoder.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.IncrementalNewlineDecoder.__ge__" => "Return self>=value.", + "builtins.IncrementalNewlineDecoder.__getattribute__" => "Return getattr(self, name).", + "builtins.IncrementalNewlineDecoder.__getstate__" => "Helper for pickle.", + "builtins.IncrementalNewlineDecoder.__gt__" => "Return self>value.", + "builtins.IncrementalNewlineDecoder.__hash__" => "Return hash(self).", + "builtins.IncrementalNewlineDecoder.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.IncrementalNewlineDecoder.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.IncrementalNewlineDecoder.__le__" => "Return self<=value.", + "builtins.IncrementalNewlineDecoder.__lt__" => "Return self<value.", + "builtins.IncrementalNewlineDecoder.__ne__" => "Return self!=value.", + "builtins.IncrementalNewlineDecoder.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.IncrementalNewlineDecoder.__reduce__" => "Helper for pickle.", + "builtins.IncrementalNewlineDecoder.__reduce_ex__" => "Helper for pickle.", + "builtins.IncrementalNewlineDecoder.__repr__" => "Return repr(self).", + "builtins.IncrementalNewlineDecoder.__setattr__" => "Implement setattr(self, name, value).", + "builtins.IncrementalNewlineDecoder.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.IncrementalNewlineDecoder.__str__" => "Return str(self).", + "builtins.IncrementalNewlineDecoder.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.IndentationError" => "Improper indentation.", "builtins.IndentationError.__delattr__" => "Implement delattr(self, name).", "builtins.IndentationError.__eq__" => "Return self==value.", @@ -10431,6 +14358,130 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.IndexError.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.IndexError.add_note" => "Add a note to the exception", "builtins.IndexError.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.InitVar.__delattr__" => "Implement delattr(self, name).", + "builtins.InitVar.__eq__" => "Return self==value.", + "builtins.InitVar.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.InitVar.__ge__" => "Return self>=value.", + "builtins.InitVar.__getattribute__" => "Return getattr(self, name).", + "builtins.InitVar.__getstate__" => "Helper for pickle.", + "builtins.InitVar.__gt__" => "Return self>value.", + "builtins.InitVar.__hash__" => "Return hash(self).", + "builtins.InitVar.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.InitVar.__le__" => "Return self<=value.", + "builtins.InitVar.__lt__" => "Return self<value.", + "builtins.InitVar.__ne__" => "Return self!=value.", + "builtins.InitVar.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.InitVar.__reduce__" => "Helper for pickle.", + "builtins.InitVar.__reduce_ex__" => "Helper for pickle.", + "builtins.InitVar.__setattr__" => "Implement setattr(self, name, value).", + "builtins.InitVar.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.InitVar.__str__" => "Return str(self).", + "builtins.InitVar.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.InitializedState" => "Mix-in to save the initialization state for pickling.", + "builtins.InitializedState.__delattr__" => "Implement delattr(self, name).", + "builtins.InitializedState.__eq__" => "Return self==value.", + "builtins.InitializedState.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.InitializedState.__ge__" => "Return self>=value.", + "builtins.InitializedState.__getattribute__" => "Return getattr(self, name).", + "builtins.InitializedState.__gt__" => "Return self>value.", + "builtins.InitializedState.__hash__" => "Return hash(self).", + "builtins.InitializedState.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.InitializedState.__le__" => "Return self<=value.", + "builtins.InitializedState.__lt__" => "Return self<value.", + "builtins.InitializedState.__ne__" => "Return self!=value.", + "builtins.InitializedState.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.InitializedState.__reduce__" => "Helper for pickle.", + "builtins.InitializedState.__reduce_ex__" => "Helper for pickle.", + "builtins.InitializedState.__repr__" => "Return repr(self).", + "builtins.InitializedState.__setattr__" => "Implement setattr(self, name, value).", + "builtins.InitializedState.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.InitializedState.__str__" => "Return str(self).", + "builtins.InitializedState.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.InitializedState.__weakref__" => "list of weak references to the object", + "builtins.InstructionSequence" => "InstructionSequenceType()\n--\n\nCreate a new InstructionSequence object.", + "builtins.InstructionSequence.__delattr__" => "Implement delattr(self, name).", + "builtins.InstructionSequence.__eq__" => "Return self==value.", + "builtins.InstructionSequence.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.InstructionSequence.__ge__" => "Return self>=value.", + "builtins.InstructionSequence.__getattribute__" => "Return getattr(self, name).", + "builtins.InstructionSequence.__getstate__" => "Helper for pickle.", + "builtins.InstructionSequence.__gt__" => "Return self>value.", + "builtins.InstructionSequence.__hash__" => "Return hash(self).", + "builtins.InstructionSequence.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.InstructionSequence.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.InstructionSequence.__le__" => "Return self<=value.", + "builtins.InstructionSequence.__lt__" => "Return self<value.", + "builtins.InstructionSequence.__ne__" => "Return self!=value.", + "builtins.InstructionSequence.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.InstructionSequence.__reduce__" => "Helper for pickle.", + "builtins.InstructionSequence.__reduce_ex__" => "Helper for pickle.", + "builtins.InstructionSequence.__repr__" => "Return repr(self).", + "builtins.InstructionSequence.__setattr__" => "Implement setattr(self, name, value).", + "builtins.InstructionSequence.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.InstructionSequence.__str__" => "Return str(self).", + "builtins.InstructionSequence.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.InstructionSequence.add_nested" => "Add a nested sequence.", + "builtins.InstructionSequence.addop" => "Append an instruction.", + "builtins.InstructionSequence.get_instructions" => "Return the instructions as a list of tuples or labels.", + "builtins.InstructionSequence.get_nested" => "Add a nested sequence.", + "builtins.InstructionSequence.new_label" => "Return a new label.", + "builtins.InstructionSequence.use_label" => "Place label at current location.", + "builtins.InteractiveInterpreter" => "Base class for InteractiveConsole.\n\nThis class deals with parsing and interpreter state (the user's\nnamespace); it doesn't deal with input buffering or prompting or\ninput file naming (the filename is always passed in explicitly).", + "builtins.InteractiveInterpreter.__delattr__" => "Implement delattr(self, name).", + "builtins.InteractiveInterpreter.__eq__" => "Return self==value.", + "builtins.InteractiveInterpreter.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.InteractiveInterpreter.__ge__" => "Return self>=value.", + "builtins.InteractiveInterpreter.__getattribute__" => "Return getattr(self, name).", + "builtins.InteractiveInterpreter.__getstate__" => "Helper for pickle.", + "builtins.InteractiveInterpreter.__gt__" => "Return self>value.", + "builtins.InteractiveInterpreter.__hash__" => "Return hash(self).", + "builtins.InteractiveInterpreter.__init__" => "Constructor.\n\nThe optional 'locals' argument specifies a mapping to use as the\nnamespace in which code will be executed; it defaults to a newly\ncreated dictionary with key \"__name__\" set to \"__console__\" and\nkey \"__doc__\" set to None.", + "builtins.InteractiveInterpreter.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.InteractiveInterpreter.__le__" => "Return self<=value.", + "builtins.InteractiveInterpreter.__lt__" => "Return self<value.", + "builtins.InteractiveInterpreter.__ne__" => "Return self!=value.", + "builtins.InteractiveInterpreter.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.InteractiveInterpreter.__reduce__" => "Helper for pickle.", + "builtins.InteractiveInterpreter.__reduce_ex__" => "Helper for pickle.", + "builtins.InteractiveInterpreter.__repr__" => "Return repr(self).", + "builtins.InteractiveInterpreter.__setattr__" => "Implement setattr(self, name, value).", + "builtins.InteractiveInterpreter.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.InteractiveInterpreter.__str__" => "Return str(self).", + "builtins.InteractiveInterpreter.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.InteractiveInterpreter.__weakref__" => "list of weak references to the object", + "builtins.InteractiveInterpreter.runcode" => "Execute a code object.\n\nWhen an exception occurs, self.showtraceback() is called to\ndisplay a traceback. All exceptions are caught except\nSystemExit, which is reraised.\n\nA note about KeyboardInterrupt: this exception may occur\nelsewhere in this code, and may not always be caught. The\ncaller should be prepared to deal with it.", + "builtins.InteractiveInterpreter.runsource" => "Compile and run some source in the interpreter.\n\nArguments are as for compile_command().\n\nOne of several things can happen:\n\n1) The input is incorrect; compile_command() raised an\nexception (SyntaxError or OverflowError). A syntax traceback\nwill be printed by calling the showsyntaxerror() method.\n\n2) The input is incomplete, and more input is required;\ncompile_command() returned None. Nothing happens.\n\n3) The input is complete; compile_command() returned a code\nobject. The code is executed by calling self.runcode() (which\nalso handles run-time exceptions, except for SystemExit).\n\nThe return value is True in case 2, False in the other cases (unless\nan exception is raised). The return value can be used to\ndecide whether to use sys.ps1 or sys.ps2 to prompt the next\nline.", + "builtins.InteractiveInterpreter.showsyntaxerror" => "Display the syntax error that just occurred.\n\nThis doesn't display a stack trace because there isn't one.\n\nIf a filename is given, it is stuffed in the exception instead\nof what was there before (because Python's parser always uses\n\"<string>\" when reading from a string).\n\nThe output is written by self.write(), below.", + "builtins.InteractiveInterpreter.showtraceback" => "Display the exception that just occurred.\n\nWe remove the first stack item because it is our own code.\n\nThe output is written by self.write(), below.", + "builtins.InteractiveInterpreter.write" => "Write a string.\n\nThe base implementation writes to sys.stderr; a subclass may\nreplace this with a different implementation.", + "builtins.Interpolation" => "Dummy interpolation that passes the value through with no changes.", + "builtins.Interpolation.__class_getitem__" => "Interpolations are generic over the types of their values", + "builtins.Interpolation.__delattr__" => "Implement delattr(self, name).", + "builtins.Interpolation.__eq__" => "Return self==value.", + "builtins.Interpolation.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Interpolation.__ge__" => "Return self>=value.", + "builtins.Interpolation.__getattribute__" => "Return getattr(self, name).", + "builtins.Interpolation.__getstate__" => "Helper for pickle.", + "builtins.Interpolation.__gt__" => "Return self>value.", + "builtins.Interpolation.__hash__" => "Return hash(self).", + "builtins.Interpolation.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Interpolation.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Interpolation.__le__" => "Return self<=value.", + "builtins.Interpolation.__lt__" => "Return self<value.", + "builtins.Interpolation.__ne__" => "Return self!=value.", + "builtins.Interpolation.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Interpolation.__reduce__" => "Helper for pickle.", + "builtins.Interpolation.__reduce_ex__" => "Helper for pickle.", + "builtins.Interpolation.__repr__" => "Return repr(self).", + "builtins.Interpolation.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Interpolation.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Interpolation.__str__" => "Return str(self).", + "builtins.Interpolation.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Interpolation.__weakref__" => "list of weak references to the object", + "builtins.Interpolation.conversion" => "Conversion", + "builtins.Interpolation.expression" => "Expression", + "builtins.Interpolation.format_spec" => "Format specifier", + "builtins.Interpolation.value" => "Value", "builtins.InterruptedError" => "Interrupted by signal.", "builtins.InterruptedError.__delattr__" => "Implement delattr(self, name).", "builtins.InterruptedError.__eq__" => "Return self==value.", @@ -10459,6 +14510,29 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.InterruptedError.strerror" => "exception strerror", "builtins.InterruptedError.winerror" => "Win32 exception code", "builtins.InterruptedError.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.IocpProactor" => "Proactor implementation using IOCP.", + "builtins.IocpProactor.__delattr__" => "Implement delattr(self, name).", + "builtins.IocpProactor.__eq__" => "Return self==value.", + "builtins.IocpProactor.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.IocpProactor.__ge__" => "Return self>=value.", + "builtins.IocpProactor.__getattribute__" => "Return getattr(self, name).", + "builtins.IocpProactor.__getstate__" => "Helper for pickle.", + "builtins.IocpProactor.__gt__" => "Return self>value.", + "builtins.IocpProactor.__hash__" => "Return hash(self).", + "builtins.IocpProactor.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.IocpProactor.__le__" => "Return self<=value.", + "builtins.IocpProactor.__lt__" => "Return self<value.", + "builtins.IocpProactor.__ne__" => "Return self!=value.", + "builtins.IocpProactor.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.IocpProactor.__reduce__" => "Helper for pickle.", + "builtins.IocpProactor.__reduce_ex__" => "Helper for pickle.", + "builtins.IocpProactor.__setattr__" => "Implement setattr(self, name, value).", + "builtins.IocpProactor.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.IocpProactor.__str__" => "Return str(self).", + "builtins.IocpProactor.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.IocpProactor.__weakref__" => "list of weak references to the object", + "builtins.IocpProactor._unregister" => "Unregister an overlapped object.\n\nCall this method when its future has been cancelled. The event can\nalready be signalled (pending in the proactor event queue). It is also\nsafe if the event is never signalled (because it was cancelled).", + "builtins.IocpProactor.wait_for_handle" => "Wait for a handle.\n\nReturn a Future object. The result of the future is True if the wait\ncompleted, or False if the wait did not complete (on timeout).", "builtins.IsADirectoryError" => "Operation doesn't work on directories.", "builtins.IsADirectoryError.__delattr__" => "Implement delattr(self, name).", "builtins.IsADirectoryError.__eq__" => "Return self==value.", @@ -10487,6 +14561,78 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.IsADirectoryError.strerror" => "exception strerror", "builtins.IsADirectoryError.winerror" => "Win32 exception code", "builtins.IsADirectoryError.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.Iterable.__class_getitem__" => "Represent a PEP 585 generic type\n\nE.g. for t = list[int], t.__origin__ is list and t.__args__ is (int,).", + "builtins.Iterable.__delattr__" => "Implement delattr(self, name).", + "builtins.Iterable.__eq__" => "Return self==value.", + "builtins.Iterable.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Iterable.__ge__" => "Return self>=value.", + "builtins.Iterable.__getattribute__" => "Return getattr(self, name).", + "builtins.Iterable.__getstate__" => "Helper for pickle.", + "builtins.Iterable.__gt__" => "Return self>value.", + "builtins.Iterable.__hash__" => "Return hash(self).", + "builtins.Iterable.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Iterable.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Iterable.__le__" => "Return self<=value.", + "builtins.Iterable.__lt__" => "Return self<value.", + "builtins.Iterable.__ne__" => "Return self!=value.", + "builtins.Iterable.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Iterable.__reduce__" => "Helper for pickle.", + "builtins.Iterable.__reduce_ex__" => "Helper for pickle.", + "builtins.Iterable.__repr__" => "Return repr(self).", + "builtins.Iterable.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Iterable.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Iterable.__str__" => "Return str(self).", + "builtins.JSONDecoder" => "Simple JSON <https://json.org> decoder\n\nPerforms the following translations in decoding by default:\n\n+---------------+-------------------+\n| JSON | Python |\n+===============+===================+\n| object | dict |\n+---------------+-------------------+\n| array | list |\n+---------------+-------------------+\n| string | str |\n+---------------+-------------------+\n| number (int) | int |\n+---------------+-------------------+\n| number (real) | float |\n+---------------+-------------------+\n| true | True |\n+---------------+-------------------+\n| false | False |\n+---------------+-------------------+\n| null | None |\n+---------------+-------------------+\n\nIt also understands ``NaN``, ``Infinity``, and ``-Infinity`` as\ntheir corresponding ``float`` values, which is outside the JSON spec.", + "builtins.JSONDecoder.__delattr__" => "Implement delattr(self, name).", + "builtins.JSONDecoder.__eq__" => "Return self==value.", + "builtins.JSONDecoder.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.JSONDecoder.__ge__" => "Return self>=value.", + "builtins.JSONDecoder.__getattribute__" => "Return getattr(self, name).", + "builtins.JSONDecoder.__getstate__" => "Helper for pickle.", + "builtins.JSONDecoder.__gt__" => "Return self>value.", + "builtins.JSONDecoder.__hash__" => "Return hash(self).", + "builtins.JSONDecoder.__init__" => "``object_hook``, if specified, will be called with the result\nof every JSON object decoded and its return value will be used in\nplace of the given ``dict``. This can be used to provide custom\ndeserializations (e.g. to support JSON-RPC class hinting).\n\n``object_pairs_hook``, if specified will be called with the result\nof every JSON object decoded with an ordered list of pairs. The\nreturn value of ``object_pairs_hook`` will be used instead of the\n``dict``. This feature can be used to implement custom decoders.\nIf ``object_hook`` is also defined, the ``object_pairs_hook`` takes\npriority.\n\n``parse_float``, if specified, will be called with the string\nof every JSON float to be decoded. By default this is equivalent to\nfloat(num_str). This can be used to use another datatype or parser\nfor JSON floats (e.g. decimal.Decimal).\n\n``parse_int``, if specified, will be called with the string\nof every JSON int to be decoded. By default this is equivalent to\nint(num_str). This can be used to use another datatype or parser\nfor JSON integers (e.g. float).\n\n``parse_constant``, if specified, will be called with one of the\nfollowing strings: -Infinity, Infinity, NaN.\nThis can be used to raise an exception if invalid JSON numbers\nare encountered.\n\nIf ``strict`` is false (true is the default), then control\ncharacters will be allowed inside strings. Control characters in\nthis context are those with character codes in the 0-31 range,\nincluding ``'\\t'`` (tab), ``'\\n'``, ``'\\r'`` and ``'\\0'``.", + "builtins.JSONDecoder.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.JSONDecoder.__le__" => "Return self<=value.", + "builtins.JSONDecoder.__lt__" => "Return self<value.", + "builtins.JSONDecoder.__ne__" => "Return self!=value.", + "builtins.JSONDecoder.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.JSONDecoder.__reduce__" => "Helper for pickle.", + "builtins.JSONDecoder.__reduce_ex__" => "Helper for pickle.", + "builtins.JSONDecoder.__repr__" => "Return repr(self).", + "builtins.JSONDecoder.__setattr__" => "Implement setattr(self, name, value).", + "builtins.JSONDecoder.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.JSONDecoder.__str__" => "Return str(self).", + "builtins.JSONDecoder.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.JSONDecoder.__weakref__" => "list of weak references to the object", + "builtins.JSONDecoder.decode" => "Return the Python representation of ``s`` (a ``str`` instance\ncontaining a JSON document).", + "builtins.JSONDecoder.raw_decode" => "Decode a JSON document from ``s`` (a ``str`` beginning with\na JSON document) and return a 2-tuple of the Python\nrepresentation and the index in ``s`` where the document ended.\n\nThis can be used to decode a JSON document from a string that may\nhave extraneous data at the end.", + "builtins.JSONEncoder" => "Extensible JSON <https://json.org> encoder for Python data structures.\n\nSupports the following objects and types by default:\n\n+-------------------+---------------+\n| Python | JSON |\n+===================+===============+\n| dict | object |\n+-------------------+---------------+\n| list, tuple | array |\n+-------------------+---------------+\n| str | string |\n+-------------------+---------------+\n| int, float | number |\n+-------------------+---------------+\n| True | true |\n+-------------------+---------------+\n| False | false |\n+-------------------+---------------+\n| None | null |\n+-------------------+---------------+\n\nTo extend this to recognize other objects, subclass and implement a\n``.default()`` method with another method that returns a serializable\nobject for ``o`` if possible, otherwise it should call the superclass\nimplementation (to raise ``TypeError``).", + "builtins.JSONEncoder.__delattr__" => "Implement delattr(self, name).", + "builtins.JSONEncoder.__eq__" => "Return self==value.", + "builtins.JSONEncoder.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.JSONEncoder.__ge__" => "Return self>=value.", + "builtins.JSONEncoder.__getattribute__" => "Return getattr(self, name).", + "builtins.JSONEncoder.__getstate__" => "Helper for pickle.", + "builtins.JSONEncoder.__gt__" => "Return self>value.", + "builtins.JSONEncoder.__hash__" => "Return hash(self).", + "builtins.JSONEncoder.__init__" => "Constructor for JSONEncoder, with sensible defaults.\n\nIf skipkeys is false, then it is a TypeError to attempt\nencoding of keys that are not str, int, float, bool or None.\nIf skipkeys is True, such items are simply skipped.\n\nIf ensure_ascii is true, the output is guaranteed to be str objects\nwith all incoming non-ASCII and non-printable characters escaped.\nIf ensure_ascii is false, the output can contain non-ASCII and\nnon-printable characters.\n\nIf check_circular is true, then lists, dicts, and custom encoded\nobjects will be checked for circular references during encoding to\nprevent an infinite recursion (which would cause an RecursionError).\nOtherwise, no such check takes place.\n\nIf allow_nan is true, then NaN, Infinity, and -Infinity will be\nencoded as such. This behavior is not JSON specification compliant,\nbut is consistent with most JavaScript based encoders and decoders.\nOtherwise, it will be a ValueError to encode such floats.\n\nIf sort_keys is true, then the output of dictionaries will be\nsorted by key; this is useful for regression tests to ensure\nthat JSON serializations can be compared on a day-to-day basis.\n\nIf indent is a non-negative integer, then JSON array\nelements and object members will be pretty-printed with that\nindent level. An indent level of 0 will only insert newlines.\nNone is the most compact representation.\n\nIf specified, separators should be an (item_separator,\nkey_separator) tuple. The default is (', ', ': ') if *indent* is\n``None`` and (',', ': ') otherwise. To get the most compact JSON\nrepresentation, you should specify (',', ':') to eliminate\nwhitespace.\n\nIf specified, default is a function that gets called for objects\nthat can't otherwise be serialized. It should return a JSON\nencodable version of the object or raise a ``TypeError``.", + "builtins.JSONEncoder.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.JSONEncoder.__le__" => "Return self<=value.", + "builtins.JSONEncoder.__lt__" => "Return self<value.", + "builtins.JSONEncoder.__ne__" => "Return self!=value.", + "builtins.JSONEncoder.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.JSONEncoder.__reduce__" => "Helper for pickle.", + "builtins.JSONEncoder.__reduce_ex__" => "Helper for pickle.", + "builtins.JSONEncoder.__repr__" => "Return repr(self).", + "builtins.JSONEncoder.__setattr__" => "Implement setattr(self, name, value).", + "builtins.JSONEncoder.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.JSONEncoder.__str__" => "Return str(self).", + "builtins.JSONEncoder.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.JSONEncoder.__weakref__" => "list of weak references to the object", + "builtins.JSONEncoder.default" => "Implement this method in a subclass such that it returns\na serializable object for ``o``, or calls the base implementation\n(to raise a ``TypeError``).\n\nFor example, to support arbitrary iterators, you could\nimplement default like this::\n\n def default(self, o):\n try:\n iterable = iter(o)\n except TypeError:\n pass\n else:\n return list(iterable)\n # Let the base class default method raise the TypeError\n return super().default(o)", + "builtins.JSONEncoder.encode" => "Return a JSON string representation of a Python data structure.\n\n>>> from json.encoder import JSONEncoder\n>>> JSONEncoder().encode({\"foo\": [\"bar\", \"baz\"]})\n'{\"foo\": [\"bar\", \"baz\"]}'", + "builtins.JSONEncoder.iterencode" => "Encode the given object and yield each string\nrepresentation as available.\n\nFor example::\n\n for chunk in JSONEncoder().iterencode(bigobject):\n mysocket.write(chunk)", "builtins.KeyError" => "Mapping key not found.", "builtins.KeyError.__delattr__" => "Implement delattr(self, name).", "builtins.KeyError.__eq__" => "Return self==value.", @@ -10510,6 +14656,28 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.KeyError.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.KeyError.add_note" => "Add a note to the exception", "builtins.KeyError.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.KeyWrapper.__call__" => "Call self as a function.", + "builtins.KeyWrapper.__delattr__" => "Implement delattr(self, name).", + "builtins.KeyWrapper.__eq__" => "Return self==value.", + "builtins.KeyWrapper.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.KeyWrapper.__ge__" => "Return self>=value.", + "builtins.KeyWrapper.__getattribute__" => "Return getattr(self, name).", + "builtins.KeyWrapper.__getstate__" => "Helper for pickle.", + "builtins.KeyWrapper.__gt__" => "Return self>value.", + "builtins.KeyWrapper.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.KeyWrapper.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.KeyWrapper.__le__" => "Return self<=value.", + "builtins.KeyWrapper.__lt__" => "Return self<value.", + "builtins.KeyWrapper.__ne__" => "Return self!=value.", + "builtins.KeyWrapper.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.KeyWrapper.__reduce__" => "Helper for pickle.", + "builtins.KeyWrapper.__reduce_ex__" => "Helper for pickle.", + "builtins.KeyWrapper.__repr__" => "Return repr(self).", + "builtins.KeyWrapper.__setattr__" => "Implement setattr(self, name, value).", + "builtins.KeyWrapper.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.KeyWrapper.__str__" => "Return str(self).", + "builtins.KeyWrapper.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.KeyWrapper.obj" => "Value wrapped by a key function.", "builtins.KeyboardInterrupt" => "Program interrupted by user.", "builtins.KeyboardInterrupt.__delattr__" => "Implement delattr(self, name).", "builtins.KeyboardInterrupt.__eq__" => "Return self==value.", @@ -10533,6 +14701,211 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.KeyboardInterrupt.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.KeyboardInterrupt.add_note" => "Add a note to the exception", "builtins.KeyboardInterrupt.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.LZMACompressor" => "LZMACompressor(format=FORMAT_XZ, check=-1, preset=None, filters=None)\n\nCreate a compressor object for compressing data incrementally.\n\nformat specifies the container format to use for the output. This can\nbe FORMAT_XZ (default), FORMAT_ALONE, or FORMAT_RAW.\n\ncheck specifies the integrity check to use. For FORMAT_XZ, the default\nis CHECK_CRC64. FORMAT_ALONE and FORMAT_RAW do not support integrity\nchecks; for these formats, check must be omitted, or be CHECK_NONE.\n\nThe settings used by the compressor can be specified either as a\npreset compression level (with the 'preset' argument), or in detail\nas a custom filter chain (with the 'filters' argument). For FORMAT_XZ\nand FORMAT_ALONE, the default is to use the PRESET_DEFAULT preset\nlevel. For FORMAT_RAW, the caller must always specify a filter chain;\nthe raw compressor does not support preset compression levels.\n\npreset (if provided) should be an integer in the range 0-9, optionally\nOR-ed with the constant PRESET_EXTREME.\n\nfilters (if provided) should be a sequence of dicts. Each dict should\nhave an entry for \"id\" indicating the ID of the filter, plus\nadditional entries for options to the filter.\n\nFor one-shot compression, use the compress() function instead.", + "builtins.LZMACompressor.__delattr__" => "Implement delattr(self, name).", + "builtins.LZMACompressor.__eq__" => "Return self==value.", + "builtins.LZMACompressor.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.LZMACompressor.__ge__" => "Return self>=value.", + "builtins.LZMACompressor.__getattribute__" => "Return getattr(self, name).", + "builtins.LZMACompressor.__getstate__" => "Helper for pickle.", + "builtins.LZMACompressor.__gt__" => "Return self>value.", + "builtins.LZMACompressor.__hash__" => "Return hash(self).", + "builtins.LZMACompressor.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.LZMACompressor.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.LZMACompressor.__le__" => "Return self<=value.", + "builtins.LZMACompressor.__lt__" => "Return self<value.", + "builtins.LZMACompressor.__ne__" => "Return self!=value.", + "builtins.LZMACompressor.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.LZMACompressor.__reduce__" => "Helper for pickle.", + "builtins.LZMACompressor.__reduce_ex__" => "Helper for pickle.", + "builtins.LZMACompressor.__repr__" => "Return repr(self).", + "builtins.LZMACompressor.__setattr__" => "Implement setattr(self, name, value).", + "builtins.LZMACompressor.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.LZMACompressor.__str__" => "Return str(self).", + "builtins.LZMACompressor.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.LZMACompressor.__weakref__" => "list of weak references to the object", + "builtins.LZMACompressor.compress" => "Provide data to the compressor object.\n\nReturns a chunk of compressed data if possible, or b'' otherwise.\n\nWhen you have finished providing data to the compressor, call the\nflush() method to finish the compression process.", + "builtins.LZMACompressor.flush" => "Finish the compression process.\n\nReturns the compressed data left in internal buffers.\n\nThe compressor object may not be used after this method is called.", + "builtins.LZMADecompressor" => "Create a decompressor object for decompressing data incrementally.\n\n format\n Specifies the container format of the input stream. If this is\n FORMAT_AUTO (the default), the decompressor will automatically detect\n whether the input is FORMAT_XZ or FORMAT_ALONE. Streams created with\n FORMAT_RAW cannot be autodetected.\n memlimit\n Limit the amount of memory used by the decompressor. This will cause\n decompression to fail if the input cannot be decompressed within the\n given limit.\n filters\n A custom filter chain. This argument is required for FORMAT_RAW, and\n not accepted with any other format. When provided, this should be a\n sequence of dicts, each indicating the ID and options for a single\n filter.\n\nFor one-shot decompression, use the decompress() function instead.", + "builtins.LZMADecompressor.__delattr__" => "Implement delattr(self, name).", + "builtins.LZMADecompressor.__eq__" => "Return self==value.", + "builtins.LZMADecompressor.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.LZMADecompressor.__ge__" => "Return self>=value.", + "builtins.LZMADecompressor.__getattribute__" => "Return getattr(self, name).", + "builtins.LZMADecompressor.__getstate__" => "Helper for pickle.", + "builtins.LZMADecompressor.__gt__" => "Return self>value.", + "builtins.LZMADecompressor.__hash__" => "Return hash(self).", + "builtins.LZMADecompressor.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.LZMADecompressor.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.LZMADecompressor.__le__" => "Return self<=value.", + "builtins.LZMADecompressor.__lt__" => "Return self<value.", + "builtins.LZMADecompressor.__ne__" => "Return self!=value.", + "builtins.LZMADecompressor.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.LZMADecompressor.__reduce__" => "Helper for pickle.", + "builtins.LZMADecompressor.__reduce_ex__" => "Helper for pickle.", + "builtins.LZMADecompressor.__repr__" => "Return repr(self).", + "builtins.LZMADecompressor.__setattr__" => "Implement setattr(self, name, value).", + "builtins.LZMADecompressor.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.LZMADecompressor.__str__" => "Return str(self).", + "builtins.LZMADecompressor.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.LZMADecompressor.__weakref__" => "list of weak references to the object", + "builtins.LZMADecompressor.check" => "ID of the integrity check used by the input stream.", + "builtins.LZMADecompressor.decompress" => "Decompress *data*, returning uncompressed data as bytes.\n\nIf *max_length* is nonnegative, returns at most *max_length* bytes\nof decompressed data. If this limit is reached and further output\ncan be produced, *self.needs_input* will be set to ``False``. In\nthis case, the next call to *decompress()* may provide *data* as b''\nto obtain more of the output.\n\nIf all of the input data was decompressed and returned (either\nbecause this was less than *max_length* bytes, or because\n*max_length* was negative), *self.needs_input* will be set to True.\n\nAttempting to decompress data after the end of stream is reached\nraises an EOFError. Any data found after the end of the stream is\nignored and saved in the unused_data attribute.", + "builtins.LZMADecompressor.eof" => "True if the end-of-stream marker has been reached.", + "builtins.LZMADecompressor.needs_input" => "True if more input is needed before more decompressed data can be produced.", + "builtins.LZMADecompressor.unused_data" => "Data found after the end of the compressed stream.", + "builtins.LibraryLoader.__class_getitem__" => "Represent a PEP 585 generic type\n\nE.g. for t = list[int], t.__origin__ is list and t.__args__ is (int,).", + "builtins.LibraryLoader.__delattr__" => "Implement delattr(self, name).", + "builtins.LibraryLoader.__eq__" => "Return self==value.", + "builtins.LibraryLoader.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.LibraryLoader.__ge__" => "Return self>=value.", + "builtins.LibraryLoader.__getattribute__" => "Return getattr(self, name).", + "builtins.LibraryLoader.__getstate__" => "Helper for pickle.", + "builtins.LibraryLoader.__gt__" => "Return self>value.", + "builtins.LibraryLoader.__hash__" => "Return hash(self).", + "builtins.LibraryLoader.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.LibraryLoader.__le__" => "Return self<=value.", + "builtins.LibraryLoader.__lt__" => "Return self<value.", + "builtins.LibraryLoader.__ne__" => "Return self!=value.", + "builtins.LibraryLoader.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.LibraryLoader.__reduce__" => "Helper for pickle.", + "builtins.LibraryLoader.__reduce_ex__" => "Helper for pickle.", + "builtins.LibraryLoader.__repr__" => "Return repr(self).", + "builtins.LibraryLoader.__setattr__" => "Implement setattr(self, name, value).", + "builtins.LibraryLoader.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.LibraryLoader.__str__" => "Return str(self).", + "builtins.LibraryLoader.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.LibraryLoader.__weakref__" => "list of weak references to the object", + "builtins.Loader" => "Abstract base class for import loaders.", + "builtins.Loader.__delattr__" => "Implement delattr(self, name).", + "builtins.Loader.__eq__" => "Return self==value.", + "builtins.Loader.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Loader.__ge__" => "Return self>=value.", + "builtins.Loader.__getattribute__" => "Return getattr(self, name).", + "builtins.Loader.__getstate__" => "Helper for pickle.", + "builtins.Loader.__gt__" => "Return self>value.", + "builtins.Loader.__hash__" => "Return hash(self).", + "builtins.Loader.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Loader.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Loader.__le__" => "Return self<=value.", + "builtins.Loader.__lt__" => "Return self<value.", + "builtins.Loader.__ne__" => "Return self!=value.", + "builtins.Loader.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Loader.__reduce__" => "Helper for pickle.", + "builtins.Loader.__reduce_ex__" => "Helper for pickle.", + "builtins.Loader.__repr__" => "Return repr(self).", + "builtins.Loader.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Loader.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Loader.__str__" => "Return str(self).", + "builtins.Loader.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Loader.__weakref__" => "list of weak references to the object", + "builtins.Loader.create_module" => "Return a module to initialize and into which to load.\n\nThis method should raise ImportError if anything prevents it\nfrom creating a new module. It may return None to indicate\nthat the spec should create the new module.", + "builtins.Loader.load_module" => "Return the loaded module.\n\nThe module must be added to sys.modules and have import-related\nattributes set properly. The fullname is a str.\n\nImportError is raised on failure.\n\nThis method is deprecated in favor of loader.exec_module(). If\nexec_module() exists then it is used to provide a backwards-compatible\nfunctionality for this method.", + "builtins.LocaleTime" => "Stores and handles locale-specific information related to time.\n\nATTRIBUTES:\n f_weekday -- full weekday names (7-item list)\n a_weekday -- abbreviated weekday names (7-item list)\n f_month -- full month names (13-item list; dummy value in [0], which\n is added by code)\n a_month -- abbreviated month names (13-item list, dummy value in\n [0], which is added by code)\n am_pm -- AM/PM representation (2-item list)\n LC_date_time -- format string for date/time representation (string)\n LC_date -- format string for date representation (string)\n LC_time -- format string for time representation (string)\n timezone -- daylight- and non-daylight-savings timezone representation\n (2-item list of sets)\n lang -- Language used by instance (2-item tuple)", + "builtins.LocaleTime._LocaleTime__find_month_format" => "Find the month format appropriate for the current locale.\n\nIn some locales (for example French and Hebrew), the default month\nused in __calc_date_time has the same name in full and abbreviated\nform. Also, the month name can by accident match other part of the\nrepresentation: the day of the week name (for example in Morisyen)\nor the month number (for example in Japanese). Thus, cycle months\nof the year and find all positions that match the month name for\neach month, If no common positions are found, the representation\ndoes not use the month name.", + "builtins.LocaleTime._LocaleTime__find_weekday_format" => "Find the day of the week format appropriate for the current locale.\n\nSimilar to __find_month_format().", + "builtins.LocaleTime.__delattr__" => "Implement delattr(self, name).", + "builtins.LocaleTime.__eq__" => "Return self==value.", + "builtins.LocaleTime.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.LocaleTime.__ge__" => "Return self>=value.", + "builtins.LocaleTime.__getattribute__" => "Return getattr(self, name).", + "builtins.LocaleTime.__getstate__" => "Helper for pickle.", + "builtins.LocaleTime.__gt__" => "Return self>value.", + "builtins.LocaleTime.__hash__" => "Return hash(self).", + "builtins.LocaleTime.__init__" => "Set all attributes.\n\nOrder of methods called matters for dependency reasons.\n\nThe locale language is set at the offset and then checked again before\nexiting. This is to make sure that the attributes were not set with a\nmix of information from more than one locale. This would most likely\nhappen when using threads where one thread calls a locale-dependent\nfunction while another thread changes the locale while the function in\nthe other thread is still running. Proper coding would call for\nlocks to prevent changing the locale while locale-dependent code is\nrunning. The check here is done in case someone does not think about\ndoing this.\n\nOnly other possible issue is if someone changed the timezone and did\nnot call tz.tzset . That is an issue for the programmer, though,\nsince changing the timezone is worthless without that call.", + "builtins.LocaleTime.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.LocaleTime.__le__" => "Return self<=value.", + "builtins.LocaleTime.__lt__" => "Return self<value.", + "builtins.LocaleTime.__ne__" => "Return self!=value.", + "builtins.LocaleTime.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.LocaleTime.__reduce__" => "Helper for pickle.", + "builtins.LocaleTime.__reduce_ex__" => "Helper for pickle.", + "builtins.LocaleTime.__repr__" => "Return repr(self).", + "builtins.LocaleTime.__setattr__" => "Implement setattr(self, name, value).", + "builtins.LocaleTime.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.LocaleTime.__str__" => "Return str(self).", + "builtins.LocaleTime.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.LocaleTime.__weakref__" => "list of weak references to the object", + "builtins.LogRecord" => "A LogRecord instance represents an event being logged.\n\nLogRecord instances are created every time something is logged. They\ncontain all the information pertinent to the event being logged. The\nmain information passed in is in msg and args, which are combined\nusing str(msg) % args to create the message field of the record. The\nrecord also includes information such as when the record was created,\nthe source line where the logging call was made, and any exception\ninformation to be logged.", + "builtins.LogRecord.__delattr__" => "Implement delattr(self, name).", + "builtins.LogRecord.__eq__" => "Return self==value.", + "builtins.LogRecord.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.LogRecord.__ge__" => "Return self>=value.", + "builtins.LogRecord.__getattribute__" => "Return getattr(self, name).", + "builtins.LogRecord.__getstate__" => "Helper for pickle.", + "builtins.LogRecord.__gt__" => "Return self>value.", + "builtins.LogRecord.__hash__" => "Return hash(self).", + "builtins.LogRecord.__init__" => "Initialize a logging record with interesting information.", + "builtins.LogRecord.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.LogRecord.__le__" => "Return self<=value.", + "builtins.LogRecord.__lt__" => "Return self<value.", + "builtins.LogRecord.__ne__" => "Return self!=value.", + "builtins.LogRecord.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.LogRecord.__reduce__" => "Helper for pickle.", + "builtins.LogRecord.__reduce_ex__" => "Helper for pickle.", + "builtins.LogRecord.__setattr__" => "Implement setattr(self, name, value).", + "builtins.LogRecord.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.LogRecord.__str__" => "Return str(self).", + "builtins.LogRecord.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.LogRecord.__weakref__" => "list of weak references to the object", + "builtins.LogRecord.getMessage" => "Return the message for this LogRecord.\n\nReturn the message for this LogRecord after merging any user-supplied\narguments with the message.", + "builtins.Logcat.__delattr__" => "Implement delattr(self, name).", + "builtins.Logcat.__eq__" => "Return self==value.", + "builtins.Logcat.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Logcat.__ge__" => "Return self>=value.", + "builtins.Logcat.__getattribute__" => "Return getattr(self, name).", + "builtins.Logcat.__getstate__" => "Helper for pickle.", + "builtins.Logcat.__gt__" => "Return self>value.", + "builtins.Logcat.__hash__" => "Return hash(self).", + "builtins.Logcat.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Logcat.__le__" => "Return self<=value.", + "builtins.Logcat.__lt__" => "Return self<value.", + "builtins.Logcat.__ne__" => "Return self!=value.", + "builtins.Logcat.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Logcat.__reduce__" => "Helper for pickle.", + "builtins.Logcat.__reduce_ex__" => "Helper for pickle.", + "builtins.Logcat.__repr__" => "Return repr(self).", + "builtins.Logcat.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Logcat.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Logcat.__str__" => "Return str(self).", + "builtins.Logcat.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Logcat.__weakref__" => "list of weak references to the object", + "builtins.LoggerAdapter" => "An adapter for loggers which makes it easier to specify contextual\ninformation in logging output.", + "builtins.LoggerAdapter.__class_getitem__" => "Represent a PEP 585 generic type\n\nE.g. for t = list[int], t.__origin__ is list and t.__args__ is (int,).", + "builtins.LoggerAdapter.__delattr__" => "Implement delattr(self, name).", + "builtins.LoggerAdapter.__eq__" => "Return self==value.", + "builtins.LoggerAdapter.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.LoggerAdapter.__ge__" => "Return self>=value.", + "builtins.LoggerAdapter.__getattribute__" => "Return getattr(self, name).", + "builtins.LoggerAdapter.__getstate__" => "Helper for pickle.", + "builtins.LoggerAdapter.__gt__" => "Return self>value.", + "builtins.LoggerAdapter.__hash__" => "Return hash(self).", + "builtins.LoggerAdapter.__init__" => "Initialize the adapter with a logger and an optional dict-like object\nwhich provides contextual information. This constructor signature\nallows easy stacking of LoggerAdapters, if so desired.\n\nYou can effectively pass keyword arguments as shown in the\nfollowing example:\n\nadapter = LoggerAdapter(someLogger, dict(p1=v1, p2=\"v2\"))\n\nBy default, LoggerAdapter objects will drop the \"extra\" argument\npassed on the individual log calls to use its own instead.\n\nInitializing it with merge_extra=True will instead merge both\nmaps when logging, the individual call extra taking precedence\nover the LoggerAdapter instance extra\n\n.. versionchanged:: 3.13\n The *merge_extra* argument was added.", + "builtins.LoggerAdapter.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.LoggerAdapter.__le__" => "Return self<=value.", + "builtins.LoggerAdapter.__lt__" => "Return self<value.", + "builtins.LoggerAdapter.__ne__" => "Return self!=value.", + "builtins.LoggerAdapter.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.LoggerAdapter.__reduce__" => "Helper for pickle.", + "builtins.LoggerAdapter.__reduce_ex__" => "Helper for pickle.", + "builtins.LoggerAdapter.__setattr__" => "Implement setattr(self, name, value).", + "builtins.LoggerAdapter.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.LoggerAdapter.__str__" => "Return str(self).", + "builtins.LoggerAdapter.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.LoggerAdapter.__weakref__" => "list of weak references to the object", + "builtins.LoggerAdapter._log" => "Low-level log implementation, proxied to allow nested logger adapters.", + "builtins.LoggerAdapter.critical" => "Delegate a critical call to the underlying logger.", + "builtins.LoggerAdapter.debug" => "Delegate a debug call to the underlying logger.", + "builtins.LoggerAdapter.error" => "Delegate an error call to the underlying logger.", + "builtins.LoggerAdapter.exception" => "Delegate an exception call to the underlying logger.", + "builtins.LoggerAdapter.getEffectiveLevel" => "Get the effective level for the underlying logger.", + "builtins.LoggerAdapter.hasHandlers" => "See if the underlying logger has any handlers.", + "builtins.LoggerAdapter.info" => "Delegate an info call to the underlying logger.", + "builtins.LoggerAdapter.isEnabledFor" => "Is this logger enabled for level 'level'?", + "builtins.LoggerAdapter.log" => "Delegate a log call to the underlying logger, after adding\ncontextual information from this adapter instance.", + "builtins.LoggerAdapter.process" => "Process the logging message and keyword arguments passed in to\na logging call to insert contextual information. You can either\nmanipulate the message itself, the keyword args or both. Return\nthe message and kwargs modified (or not) to suit your needs.\n\nNormally, you'll only need to override this one method in a\nLoggerAdapter subclass for your specific needs.", + "builtins.LoggerAdapter.setLevel" => "Set the specified level on the underlying logger.", + "builtins.LoggerAdapter.warning" => "Delegate a warning call to the underlying logger.", "builtins.LookupError" => "Base class for lookup errors.", "builtins.LookupError.__delattr__" => "Implement delattr(self, name).", "builtins.LookupError.__eq__" => "Return self==value.", @@ -10556,6 +14929,170 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.LookupError.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.LookupError.add_note" => "Add a note to the exception", "builtins.LookupError.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.MISSING.__delattr__" => "Implement delattr(self, name).", + "builtins.MISSING.__eq__" => "Return self==value.", + "builtins.MISSING.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.MISSING.__ge__" => "Return self>=value.", + "builtins.MISSING.__getattribute__" => "Return getattr(self, name).", + "builtins.MISSING.__getstate__" => "Helper for pickle.", + "builtins.MISSING.__gt__" => "Return self>value.", + "builtins.MISSING.__hash__" => "Return hash(self).", + "builtins.MISSING.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.MISSING.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.MISSING.__le__" => "Return self<=value.", + "builtins.MISSING.__lt__" => "Return self<value.", + "builtins.MISSING.__ne__" => "Return self!=value.", + "builtins.MISSING.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.MISSING.__reduce__" => "Helper for pickle.", + "builtins.MISSING.__reduce_ex__" => "Helper for pickle.", + "builtins.MISSING.__repr__" => "Return repr(self).", + "builtins.MISSING.__setattr__" => "Implement setattr(self, name, value).", + "builtins.MISSING.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.MISSING.__str__" => "Return str(self).", + "builtins.MISSING.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Mailbox" => "A group of messages in a particular place.", + "builtins.Mailbox.__class_getitem__" => "Represent a PEP 585 generic type\n\nE.g. for t = list[int], t.__origin__ is list and t.__args__ is (int,).", + "builtins.Mailbox.__contains__" => "Return True if the keyed message exists, False otherwise.", + "builtins.Mailbox.__delattr__" => "Implement delattr(self, name).", + "builtins.Mailbox.__eq__" => "Return self==value.", + "builtins.Mailbox.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Mailbox.__ge__" => "Return self>=value.", + "builtins.Mailbox.__getattribute__" => "Return getattr(self, name).", + "builtins.Mailbox.__getitem__" => "Return the keyed message; raise KeyError if it doesn't exist.", + "builtins.Mailbox.__getstate__" => "Helper for pickle.", + "builtins.Mailbox.__gt__" => "Return self>value.", + "builtins.Mailbox.__hash__" => "Return hash(self).", + "builtins.Mailbox.__init__" => "Initialize a Mailbox instance.", + "builtins.Mailbox.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Mailbox.__le__" => "Return self<=value.", + "builtins.Mailbox.__len__" => "Return a count of messages in the mailbox.", + "builtins.Mailbox.__lt__" => "Return self<value.", + "builtins.Mailbox.__ne__" => "Return self!=value.", + "builtins.Mailbox.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Mailbox.__reduce__" => "Helper for pickle.", + "builtins.Mailbox.__reduce_ex__" => "Helper for pickle.", + "builtins.Mailbox.__repr__" => "Return repr(self).", + "builtins.Mailbox.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Mailbox.__setitem__" => "Replace the keyed message; raise KeyError if it doesn't exist.", + "builtins.Mailbox.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Mailbox.__str__" => "Return str(self).", + "builtins.Mailbox.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Mailbox.__weakref__" => "list of weak references to the object", + "builtins.Mailbox._dump_message" => "Dump message contents to target file.", + "builtins.Mailbox.add" => "Add message and return assigned key.", + "builtins.Mailbox.clear" => "Delete all messages.", + "builtins.Mailbox.close" => "Flush and close the mailbox.", + "builtins.Mailbox.discard" => "If the keyed message exists, remove it.", + "builtins.Mailbox.flush" => "Write any pending changes to the disk.", + "builtins.Mailbox.get" => "Return the keyed message, or default if it doesn't exist.", + "builtins.Mailbox.get_bytes" => "Return a byte string representation or raise a KeyError.", + "builtins.Mailbox.get_file" => "Return a file-like representation or raise a KeyError.", + "builtins.Mailbox.get_message" => "Return a Message representation or raise a KeyError.", + "builtins.Mailbox.get_string" => "Return a string representation or raise a KeyError.\n\nUses email.message.Message to create a 7bit clean string\nrepresentation of the message.", + "builtins.Mailbox.items" => "Return a list of (key, message) tuples. Memory intensive.", + "builtins.Mailbox.iteritems" => "Return an iterator over (key, message) tuples.", + "builtins.Mailbox.iterkeys" => "Return an iterator over keys.", + "builtins.Mailbox.itervalues" => "Return an iterator over all messages.", + "builtins.Mailbox.keys" => "Return a list of keys.", + "builtins.Mailbox.lock" => "Lock the mailbox.", + "builtins.Mailbox.pop" => "Delete the keyed message and return it, or default.", + "builtins.Mailbox.popitem" => "Delete an arbitrary (key, message) pair and return it.", + "builtins.Mailbox.remove" => "Remove the keyed message; raise KeyError if it doesn't exist.", + "builtins.Mailbox.unlock" => "Unlock the mailbox if it is locked.", + "builtins.Mailbox.update" => "Change the messages that correspond to certain keys.", + "builtins.Mailbox.values" => "Return a list of messages. Memory intensive.", + "builtins.Manager" => "There is [under normal circumstances] just one Manager instance, which\nholds the hierarchy of loggers.", + "builtins.Manager.__delattr__" => "Implement delattr(self, name).", + "builtins.Manager.__eq__" => "Return self==value.", + "builtins.Manager.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Manager.__ge__" => "Return self>=value.", + "builtins.Manager.__getattribute__" => "Return getattr(self, name).", + "builtins.Manager.__getstate__" => "Helper for pickle.", + "builtins.Manager.__gt__" => "Return self>value.", + "builtins.Manager.__hash__" => "Return hash(self).", + "builtins.Manager.__init__" => "Initialize the manager with the root node of the logger hierarchy.", + "builtins.Manager.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Manager.__le__" => "Return self<=value.", + "builtins.Manager.__lt__" => "Return self<value.", + "builtins.Manager.__ne__" => "Return self!=value.", + "builtins.Manager.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Manager.__reduce__" => "Helper for pickle.", + "builtins.Manager.__reduce_ex__" => "Helper for pickle.", + "builtins.Manager.__repr__" => "Return repr(self).", + "builtins.Manager.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Manager.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Manager.__str__" => "Return str(self).", + "builtins.Manager.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Manager.__weakref__" => "list of weak references to the object", + "builtins.Manager._clear_cache" => "Clear the cache for all loggers in loggerDict\nCalled when level changes are made", + "builtins.Manager._fixupChildren" => "Ensure that children of the placeholder ph are connected to the\nspecified logger.", + "builtins.Manager._fixupParents" => "Ensure that there are either loggers or placeholders all the way\nfrom the specified logger to the root of the logger hierarchy.", + "builtins.Manager.getLogger" => "Get a logger with the specified name (channel name), creating it\nif it doesn't yet exist. This name is a dot-separated hierarchical\nname, such as \"a\", \"a.b\", \"a.b.c\" or similar.\n\nIf a PlaceHolder existed for the specified name [i.e. the logger\ndidn't exist but a child of it did], replace it with the created\nlogger and fix up the parent/child references which pointed to the\nplaceholder to now point to the logger.", + "builtins.Manager.setLogRecordFactory" => "Set the factory to be used when instantiating a log record with this\nManager.", + "builtins.Manager.setLoggerClass" => "Set the class to be used when instantiating a logger with this Manager.", + "builtins.Match" => "The result of re.match() and re.search().\nMatch objects always have a boolean value of True.", + "builtins.Match.__class_getitem__" => "Matches are generic over the type of string which was matched (str or bytes)", + "builtins.Match.__delattr__" => "Implement delattr(self, name).", + "builtins.Match.__eq__" => "Return self==value.", + "builtins.Match.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Match.__ge__" => "Return self>=value.", + "builtins.Match.__getattribute__" => "Return getattr(self, name).", + "builtins.Match.__getitem__" => "Return self[key].", + "builtins.Match.__getstate__" => "Helper for pickle.", + "builtins.Match.__gt__" => "Return self>value.", + "builtins.Match.__hash__" => "Return hash(self).", + "builtins.Match.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Match.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Match.__le__" => "Return self<=value.", + "builtins.Match.__lt__" => "Return self<value.", + "builtins.Match.__ne__" => "Return self!=value.", + "builtins.Match.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Match.__reduce__" => "Helper for pickle.", + "builtins.Match.__reduce_ex__" => "Helper for pickle.", + "builtins.Match.__repr__" => "Return repr(self).", + "builtins.Match.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Match.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Match.__str__" => "Return str(self).", + "builtins.Match.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Match.end" => "Return index of the end of the substring matched by group.", + "builtins.Match.endpos" => "The index into the string beyond which the RE engine will not go.", + "builtins.Match.expand" => "Return the string obtained by doing backslash substitution on the string template, as done by the sub() method.", + "builtins.Match.group" => "group([group1, ...]) -> str or tuple.\n Return subgroup(s) of the match by indices or names.\n For 0 returns the entire match.", + "builtins.Match.groupdict" => "Return a dictionary containing all the named subgroups of the match, keyed by the subgroup name.\n\n default\n Is used for groups that did not participate in the match.", + "builtins.Match.groups" => "Return a tuple containing all the subgroups of the match, from 1.\n\n default\n Is used for groups that did not participate in the match.", + "builtins.Match.lastgroup" => "The name of the last matched capturing group.", + "builtins.Match.lastindex" => "The integer index of the last matched capturing group.", + "builtins.Match.pos" => "The index into the string at which the RE engine started looking for a match.", + "builtins.Match.re" => "The regular expression object.", + "builtins.Match.span" => "For match object m, return the 2-tuple (m.start(group), m.end(group)).", + "builtins.Match.start" => "Return index of the start of the substring matched by group.", + "builtins.Match.string" => "The string passed to match() or search().", + "builtins.MemoryBIO.__delattr__" => "Implement delattr(self, name).", + "builtins.MemoryBIO.__eq__" => "Return self==value.", + "builtins.MemoryBIO.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.MemoryBIO.__ge__" => "Return self>=value.", + "builtins.MemoryBIO.__getattribute__" => "Return getattr(self, name).", + "builtins.MemoryBIO.__getstate__" => "Helper for pickle.", + "builtins.MemoryBIO.__gt__" => "Return self>value.", + "builtins.MemoryBIO.__hash__" => "Return hash(self).", + "builtins.MemoryBIO.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.MemoryBIO.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.MemoryBIO.__le__" => "Return self<=value.", + "builtins.MemoryBIO.__lt__" => "Return self<value.", + "builtins.MemoryBIO.__ne__" => "Return self!=value.", + "builtins.MemoryBIO.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.MemoryBIO.__reduce__" => "Helper for pickle.", + "builtins.MemoryBIO.__reduce_ex__" => "Helper for pickle.", + "builtins.MemoryBIO.__repr__" => "Return repr(self).", + "builtins.MemoryBIO.__setattr__" => "Implement setattr(self, name, value).", + "builtins.MemoryBIO.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.MemoryBIO.__str__" => "Return str(self).", + "builtins.MemoryBIO.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.MemoryBIO.eof" => "Whether the memory BIO is at EOF.", + "builtins.MemoryBIO.pending" => "The number of bytes pending in the memory BIO.", + "builtins.MemoryBIO.read" => "Read up to size bytes from the memory BIO.\n\nIf size is not specified, read the entire buffer.\nIf the return value is an empty bytes instance, this means either\nEOF or that no data is available. Use the \"eof\" property to\ndistinguish between the two.", + "builtins.MemoryBIO.write" => "Writes the bytes b into the memory BIO.\n\nReturns the number of bytes written.", + "builtins.MemoryBIO.write_eof" => "Write an EOF marker to the memory BIO.\n\nWhen all data has been read, the \"eof\" property will be True.", "builtins.MemoryError" => "Out of memory.", "builtins.MemoryError.__delattr__" => "Implement delattr(self, name).", "builtins.MemoryError.__eq__" => "Return self==value.", @@ -10579,6 +15116,335 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.MemoryError.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.MemoryError.add_note" => "Add a note to the exception", "builtins.MemoryError.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.Message" => "Basic message object.\n\nA message object is defined as something that has a bunch of RFC 5322\nheaders and a payload. It may optionally have an envelope header\n(a.k.a. Unix-From or From_ header). If the message is a container (i.e. a\nmultipart or a message/rfc822), then the payload is a list of Message\nobjects, otherwise it is a string.\n\nMessage objects implement part of the 'mapping' interface, which assumes\nthere is exactly one occurrence of the header per message. Some headers\ndo in fact appear multiple times (e.g. Received) and for those headers,\nyou must use the explicit API to set or get all the headers. Not all of\nthe mapping methods are implemented.", + "builtins.Message.__bytes__" => "Return the entire formatted message as a bytes object.", + "builtins.Message.__delattr__" => "Implement delattr(self, name).", + "builtins.Message.__delitem__" => "Delete all occurrences of a header, if present.\n\nDoes not raise an exception if the header is missing.", + "builtins.Message.__eq__" => "Return self==value.", + "builtins.Message.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Message.__ge__" => "Return self>=value.", + "builtins.Message.__getattribute__" => "Return getattr(self, name).", + "builtins.Message.__getitem__" => "Get a header value.\n\nReturn None if the header is missing instead of raising an exception.\n\nNote that if the header appeared multiple times, exactly which\noccurrence gets returned is undefined. Use get_all() to get all\nthe values matching a header field name.", + "builtins.Message.__getstate__" => "Helper for pickle.", + "builtins.Message.__gt__" => "Return self>value.", + "builtins.Message.__hash__" => "Return hash(self).", + "builtins.Message.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Message.__le__" => "Return self<=value.", + "builtins.Message.__len__" => "Return the total number of headers, including duplicates.", + "builtins.Message.__lt__" => "Return self<value.", + "builtins.Message.__ne__" => "Return self!=value.", + "builtins.Message.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Message.__reduce__" => "Helper for pickle.", + "builtins.Message.__reduce_ex__" => "Helper for pickle.", + "builtins.Message.__repr__" => "Return repr(self).", + "builtins.Message.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Message.__setitem__" => "Set the value of a header.\n\nNote: this does not overwrite an existing header with the same field\nname. Use __delitem__() first to delete any existing headers.", + "builtins.Message.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Message.__str__" => "Return the entire formatted message as a string.", + "builtins.Message.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Message.__weakref__" => "list of weak references to the object", + "builtins.Message.add_header" => "Extended header setting.\n\nname is the header field to add. keyword arguments can be used to set\nadditional parameters for the header field, with underscores converted\nto dashes. Normally the parameter will be added as key=\"value\" unless\nvalue is None, in which case only the key will be added. If a\nparameter value contains non-ASCII characters it can be specified as a\nthree-tuple of (charset, language, value), in which case it will be\nencoded according to RFC2231 rules. Otherwise it will be encoded using\nthe utf-8 charset and a language of ''.\n\nExamples:\n\nmsg.add_header('content-disposition', 'attachment', filename='bud.gif')\nmsg.add_header('content-disposition', 'attachment',\n filename=('utf-8', '', 'Fußballer.ppt'))\nmsg.add_header('content-disposition', 'attachment',\n filename='Fußballer.ppt'))", + "builtins.Message.as_bytes" => "Return the entire formatted message as a bytes object.\n\nOptional 'unixfrom', when true, means include the Unix From_ envelope\nheader. 'policy' is passed to the BytesGenerator instance used to\nserialize the message; if not specified the policy associated with\nthe message instance is used.", + "builtins.Message.as_string" => "Return the entire formatted message as a string.\n\nOptional 'unixfrom', when true, means include the Unix From_ envelope\nheader. For backward compatibility reasons, if maxheaderlen is\nnot specified it defaults to 0, so you must override it explicitly\nif you want a different maxheaderlen. 'policy' is passed to the\nGenerator instance used to serialize the message; if it is not\nspecified the policy associated with the message instance is used.\n\nIf the message object contains binary data that is not encoded\naccording to RFC standards, the non-compliant data will be replaced by\nunicode \"unknown character\" code points.", + "builtins.Message.attach" => "Add the given payload to the current payload.\n\nThe current payload will always be a list of objects after this method\nis called. If you want to set the payload to a scalar object, use\nset_payload() instead.", + "builtins.Message.del_param" => "Remove the given parameter completely from the Content-Type header.\n\nThe header will be re-written in place without the parameter or its\nvalue. All values will be quoted as necessary unless requote is\nFalse. Optional header specifies an alternative to the Content-Type\nheader.", + "builtins.Message.get" => "Get a header value.\n\nLike __getitem__() but return failobj instead of None when the field\nis missing.", + "builtins.Message.get_all" => "Return a list of all the values for the named field.\n\nThese will be sorted in the order they appeared in the original\nmessage, and may contain duplicates. Any fields deleted and\nre-inserted are always appended to the header list.\n\nIf no such fields exist, failobj is returned (defaults to None).", + "builtins.Message.get_boundary" => "Return the boundary associated with the payload if present.\n\nThe boundary is extracted from the Content-Type header's 'boundary'\nparameter, and it is unquoted.", + "builtins.Message.get_charset" => "Return the Charset instance associated with the message's payload.", + "builtins.Message.get_charsets" => "Return a list containing the charset(s) used in this message.\n\nThe returned list of items describes the Content-Type headers'\ncharset parameter for this message and all the subparts in its\npayload.\n\nEach item will either be a string (the value of the charset parameter\nin the Content-Type header of that part) or the value of the\n'failobj' parameter (defaults to None), if the part does not have a\nmain MIME type of \"text\", or the charset is not defined.\n\nThe list will contain one string for each part of the message, plus\none for the container message (i.e. self), so that a non-multipart\nmessage will still return a list of length 1.", + "builtins.Message.get_content_charset" => "Return the charset parameter of the Content-Type header.\n\nThe returned string is always coerced to lower case. If there is no\nContent-Type header, or if that header has no charset parameter,\nfailobj is returned.", + "builtins.Message.get_content_disposition" => "Return the message's content-disposition if it exists, or None.\n\nThe return values can be either 'inline', 'attachment' or None\naccording to the rfc2183.", + "builtins.Message.get_content_maintype" => "Return the message's main content type.\n\nThis is the 'maintype' part of the string returned by\nget_content_type().", + "builtins.Message.get_content_subtype" => "Returns the message's sub-content type.\n\nThis is the 'subtype' part of the string returned by\nget_content_type().", + "builtins.Message.get_content_type" => "Return the message's content type.\n\nThe returned string is coerced to lower case of the form\n'maintype/subtype'. If there was no Content-Type header in the\nmessage, the default type as given by get_default_type() will be\nreturned. Since according to RFC 2045, messages always have a default\ntype this will always return a value.\n\nRFC 2045 defines a message's default type to be text/plain unless it\nappears inside a multipart/digest container, in which case it would be\nmessage/rfc822.", + "builtins.Message.get_default_type" => "Return the 'default' content type.\n\nMost messages have a default content type of text/plain, except for\nmessages that are subparts of multipart/digest containers. Such\nsubparts have a default content type of message/rfc822.", + "builtins.Message.get_filename" => "Return the filename associated with the payload if present.\n\nThe filename is extracted from the Content-Disposition header's\n'filename' parameter, and it is unquoted. If that header is missing\nthe 'filename' parameter, this method falls back to looking for the\n'name' parameter.", + "builtins.Message.get_param" => "Return the parameter value if found in the Content-Type header.\n\nOptional failobj is the object to return if there is no Content-Type\nheader, or the Content-Type header has no such parameter. Optional\nheader is the header to search instead of Content-Type.\n\nParameter keys are always compared case insensitively. The return\nvalue can either be a string, or a 3-tuple if the parameter was RFC\n2231 encoded. When it's a 3-tuple, the elements of the value are of\nthe form (CHARSET, LANGUAGE, VALUE). Note that both CHARSET and\nLANGUAGE can be None, in which case you should consider VALUE to be\nencoded in the us-ascii charset. You can usually ignore LANGUAGE.\nThe parameter value (either the returned string, or the VALUE item in\nthe 3-tuple) is always unquoted, unless unquote is set to False.\n\nIf your application doesn't care whether the parameter was RFC 2231\nencoded, it can turn the return value into a string as follows:\n\n rawparam = msg.get_param('foo')\n param = email.utils.collapse_rfc2231_value(rawparam)", + "builtins.Message.get_params" => "Return the message's Content-Type parameters, as a list.\n\nThe elements of the returned list are 2-tuples of key/value pairs, as\nsplit on the '=' sign. The left hand side of the '=' is the key,\nwhile the right hand side is the value. If there is no '=' sign in\nthe parameter the value is the empty string. The value is as\ndescribed in the get_param() method.\n\nOptional failobj is the object to return if there is no Content-Type\nheader. Optional header is the header to search instead of\nContent-Type. If unquote is True, the value is unquoted.", + "builtins.Message.get_payload" => "Return a reference to the payload.\n\nThe payload will either be a list object or a string. If you mutate\nthe list object, you modify the message's payload in place. Optional\ni returns that index into the payload.\n\nOptional decode is a flag indicating whether the payload should be\ndecoded or not, according to the Content-Transfer-Encoding header\n(default is False).\n\nWhen True and the message is not a multipart, the payload will be\ndecoded if this header's value is `quoted-printable' or `base64'. If\nsome other encoding is used, or the header is missing, or if the\npayload has bogus data (i.e. bogus base64 or uuencoded data), the\npayload is returned as-is.\n\nIf the message is a multipart and the decode flag is True, then None\nis returned.", + "builtins.Message.is_multipart" => "Return True if the message consists of multiple parts.", + "builtins.Message.items" => "Get all the message's header fields and values.\n\nThese will be sorted in the order they appeared in the original\nmessage, or were added to the message, and may contain duplicates.\nAny fields deleted and re-inserted are always appended to the header\nlist.", + "builtins.Message.keys" => "Return a list of all the message's header field names.\n\nThese will be sorted in the order they appeared in the original\nmessage, or were added to the message, and may contain duplicates.\nAny fields deleted and re-inserted are always appended to the header\nlist.", + "builtins.Message.raw_items" => "Return the (name, value) header pairs without modification.\n\nThis is an \"internal\" API, intended only for use by a generator.", + "builtins.Message.replace_header" => "Replace a header.\n\nReplace the first matching header found in the message, retaining\nheader order and case. If no matching header was found, a KeyError is\nraised.", + "builtins.Message.set_boundary" => "Set the boundary parameter in Content-Type to 'boundary'.\n\nThis is subtly different than deleting the Content-Type header and\nadding a new one with a new boundary parameter via add_header(). The\nmain difference is that using the set_boundary() method preserves the\norder of the Content-Type header in the original message.\n\nHeaderParseError is raised if the message has no Content-Type header.", + "builtins.Message.set_charset" => "Set the charset of the payload to a given character set.\n\ncharset can be a Charset instance, a string naming a character set, or\nNone. If it is a string it will be converted to a Charset instance.\nIf charset is None, the charset parameter will be removed from the\nContent-Type field. Anything else will generate a TypeError.\n\nThe message will be assumed to be of type text/* encoded with\ncharset.input_charset. It will be converted to charset.output_charset\nand encoded properly, if needed, when generating the plain text\nrepresentation of the message. MIME headers (MIME-Version,\nContent-Type, Content-Transfer-Encoding) will be added as needed.", + "builtins.Message.set_default_type" => "Set the 'default' content type.\n\nctype should be either \"text/plain\" or \"message/rfc822\", although this\nis not enforced. The default content type is not stored in the\nContent-Type header.", + "builtins.Message.set_param" => "Set a parameter in the Content-Type header.\n\nIf the parameter already exists in the header, its value will be\nreplaced with the new value.\n\nIf header is Content-Type and has not yet been defined for this\nmessage, it will be set to \"text/plain\" and the new parameter and\nvalue will be appended as per RFC 2045.\n\nAn alternate header can be specified in the header argument, and all\nparameters will be quoted as necessary unless requote is False.\n\nIf charset is specified, the parameter will be encoded according to RFC\n2231. Optional language specifies the RFC 2231 language, defaulting\nto the empty string. Both charset and language should be strings.", + "builtins.Message.set_payload" => "Set the payload to the given value.\n\nOptional charset sets the message's default character set. See\nset_charset() for details.", + "builtins.Message.set_raw" => "Store name and value in the model without modification.\n\nThis is an \"internal\" API, intended only for use by a parser.", + "builtins.Message.set_type" => "Set the main type and subtype for the Content-Type header.\n\ntype must be a string in the form \"maintype/subtype\", otherwise a\nValueError is raised.\n\nThis method replaces the Content-Type header, keeping all the\nparameters in place. If requote is False, this leaves the existing\nheader's quoting as is. Otherwise, the parameters will be quoted (the\ndefault).\n\nAn alternative header can be specified in the header argument. When\nthe Content-Type header is set, we'll always also add a MIME-Version\nheader.", + "builtins.Message.values" => "Return a list of all the message's header values.\n\nThese will be sorted in the order they appeared in the original\nmessage, or were added to the message, and may contain duplicates.\nAny fields deleted and re-inserted are always appended to the header\nlist.", + "builtins.Message.walk" => "Walk over the message tree, yielding each subpart.\n\nThe walk is performed in depth-first order. This method is a\ngenerator.", + "builtins.MimeTypes" => "MIME-types datastore.\n\nThis datastore can handle information from mime.types-style files\nand supports basic determination of MIME type from a filename or\nURL, and can guess a reasonable extension given a MIME type.", + "builtins.MimeTypes.__delattr__" => "Implement delattr(self, name).", + "builtins.MimeTypes.__eq__" => "Return self==value.", + "builtins.MimeTypes.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.MimeTypes.__ge__" => "Return self>=value.", + "builtins.MimeTypes.__getattribute__" => "Return getattr(self, name).", + "builtins.MimeTypes.__getstate__" => "Helper for pickle.", + "builtins.MimeTypes.__gt__" => "Return self>value.", + "builtins.MimeTypes.__hash__" => "Return hash(self).", + "builtins.MimeTypes.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.MimeTypes.__le__" => "Return self<=value.", + "builtins.MimeTypes.__lt__" => "Return self<value.", + "builtins.MimeTypes.__ne__" => "Return self!=value.", + "builtins.MimeTypes.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.MimeTypes.__reduce__" => "Helper for pickle.", + "builtins.MimeTypes.__reduce_ex__" => "Helper for pickle.", + "builtins.MimeTypes.__repr__" => "Return repr(self).", + "builtins.MimeTypes.__setattr__" => "Implement setattr(self, name, value).", + "builtins.MimeTypes.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.MimeTypes.__str__" => "Return str(self).", + "builtins.MimeTypes.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.MimeTypes.__weakref__" => "list of weak references to the object", + "builtins.MimeTypes.add_type" => "Add a mapping between a type and an extension.\n\nWhen the extension is already known, the new\ntype will replace the old one. When the type\nis already known the extension will be added\nto the list of known extensions.\n\nIf strict is true, information will be added to\nlist of standard types, else to the list of non-standard\ntypes.\n\nValid extensions are empty or start with a '.'.", + "builtins.MimeTypes.guess_all_extensions" => "Guess the extensions for a file based on its MIME type.\n\nReturn value is a list of strings giving the possible filename\nextensions, including the leading dot ('.'). The extension is not\nguaranteed to have been associated with any particular data stream,\nbut would be mapped to the MIME type 'type' by guess_type().\n\nOptional 'strict' argument when false adds a bunch of commonly found,\nbut non-standard types.", + "builtins.MimeTypes.guess_extension" => "Guess the extension for a file based on its MIME type.\n\nReturn value is a string giving a filename extension,\nincluding the leading dot ('.'). The extension is not\nguaranteed to have been associated with any particular data\nstream, but would be mapped to the MIME type 'type' by\nguess_type(). If no extension can be guessed for 'type', None\nis returned.\n\nOptional 'strict' argument when false adds a bunch of commonly found,\nbut non-standard types.", + "builtins.MimeTypes.guess_file_type" => "Guess the type of a file based on its path.\n\nSimilar to guess_type(), but takes file path instead of URL.", + "builtins.MimeTypes.guess_type" => "Guess the type of a file which is either a URL or a path-like object.\n\nReturn value is a tuple (type, encoding) where type is None if\nthe type can't be guessed (no or unknown suffix) or a string\nof the form type/subtype, usable for a MIME Content-type\nheader; and encoding is None for no encoding or the name of\nthe program used to encode (e.g. compress or gzip). The\nmappings are table driven. Encoding suffixes are case\nsensitive; type suffixes are first tried case sensitive, then\ncase insensitive.\n\nThe suffixes .tgz, .taz and .tz (case sensitive!) are all\nmapped to '.tar.gz'. (This is table-driven too, using the\ndictionary suffix_map.)\n\nOptional 'strict' argument when False adds a bunch of commonly found,\nbut non-standard types.", + "builtins.MimeTypes.read" => "Read a single mime.types-format file, specified by pathname.\n\nIf strict is true, information will be added to\nlist of standard types, else to the list of non-standard\ntypes.", + "builtins.MimeTypes.read_windows_registry" => "Load the MIME types database from Windows registry.\n\nIf strict is true, information will be added to\nlist of standard types, else to the list of non-standard\ntypes.", + "builtins.MimeTypes.readfp" => "Read a single mime.types-format file.\n\nIf strict is true, information will be added to\nlist of standard types, else to the list of non-standard\ntypes.", + "builtins.Misc" => "Internal class.\n\nBase class which defines methods common for interior widgets.", + "builtins.Misc._Misc__winfo_getint" => "Internal function.", + "builtins.Misc._Misc__winfo_parseitem" => "Internal function.", + "builtins.Misc.__delattr__" => "Implement delattr(self, name).", + "builtins.Misc.__eq__" => "Return self==value.", + "builtins.Misc.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Misc.__ge__" => "Return self>=value.", + "builtins.Misc.__getattribute__" => "Return getattr(self, name).", + "builtins.Misc.__getitem__" => "Return the current value of the configuration option.", + "builtins.Misc.__getstate__" => "Helper for pickle.", + "builtins.Misc.__gt__" => "Return self>value.", + "builtins.Misc.__hash__" => "Return hash(self).", + "builtins.Misc.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Misc.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Misc.__le__" => "Return self<=value.", + "builtins.Misc.__lt__" => "Return self<value.", + "builtins.Misc.__ne__" => "Return self!=value.", + "builtins.Misc.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Misc.__reduce__" => "Helper for pickle.", + "builtins.Misc.__reduce_ex__" => "Helper for pickle.", + "builtins.Misc.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Misc.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Misc.__str__" => "Return the window path name of this widget.", + "builtins.Misc.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Misc.__weakref__" => "list of weak references to the object", + "builtins.Misc._bind" => "Internal function.", + "builtins.Misc._configure" => "Internal function.", + "builtins.Misc._displayof" => "Internal function.", + "builtins.Misc._getboolean" => "Internal function.", + "builtins.Misc._getconfigure" => "Call Tcl configure command and return the result as a dict.", + "builtins.Misc._getdoubles" => "Internal function.", + "builtins.Misc._getints" => "Internal function.", + "builtins.Misc._grid_configure" => "Internal function.", + "builtins.Misc._nametowidget" => "Return the Tkinter instance of a widget identified by\nits Tcl name NAME.", + "builtins.Misc._options" => "Internal function.", + "builtins.Misc._register" => "Return a newly created Tcl function. If this\nfunction is called, the Python function FUNC will\nbe executed. An optional function SUBST can\nbe given which will be executed before FUNC.", + "builtins.Misc._report_exception" => "Internal function.", + "builtins.Misc._root" => "Internal function.", + "builtins.Misc._substitute" => "Internal function.", + "builtins.Misc._windowingsystem" => "Internal function.", + "builtins.Misc.after" => "Call function once after given time.\n\nMS specifies the time in milliseconds. FUNC gives the\nfunction which shall be called. Additional parameters\nare given as parameters to the function call. Return\nidentifier to cancel scheduling with after_cancel.", + "builtins.Misc.after_cancel" => "Cancel scheduling of function identified with ID.\n\nIdentifier returned by after or after_idle must be\ngiven as first parameter.", + "builtins.Misc.after_idle" => "Call FUNC once if the Tcl main loop has no event to\nprocess.\n\nReturn an identifier to cancel the scheduling with\nafter_cancel.", + "builtins.Misc.after_info" => "Return information about existing event handlers.\n\nWith no argument, return a tuple of the identifiers for all existing\nevent handlers created by the after and after_idle commands for this\ninterpreter. If id is supplied, it specifies an existing handler; id\nmust have been the return value from some previous call to after or\nafter_idle and it must not have triggered yet or been canceled. If the\nid doesn't exist, a TclError is raised. Otherwise, the return value is\na tuple containing (script, type) where script is a reference to the\nfunction to be called by the event handler and type is either 'idle'\nor 'timer' to indicate what kind of event handler it is.", + "builtins.Misc.anchor" => "The anchor value controls how to place the grid within the\ncontainer widget when no row/column has any weight.\n\nThe default anchor is nw.", + "builtins.Misc.bbox" => "Return a tuple of integer coordinates for the bounding\nbox of this widget controlled by the geometry manager grid.\n\nIf COLUMN, ROW is given the bounding box applies from\nthe cell with row and column 0 to the specified\ncell. If COL2 and ROW2 are given the bounding box\nstarts at that cell.\n\nThe returned integers specify the offset of the upper left\ncorner in the container widget and the width and height.", + "builtins.Misc.bell" => "Ring a display's bell.", + "builtins.Misc.bind" => "Bind to this widget at event SEQUENCE a call to function FUNC.\n\nSEQUENCE is a string of concatenated event\npatterns. An event pattern is of the form\n<MODIFIER-MODIFIER-TYPE-DETAIL> where MODIFIER is one\nof Control, Mod2, M2, Shift, Mod3, M3, Lock, Mod4, M4,\nButton1, B1, Mod5, M5 Button2, B2, Meta, M, Button3,\nB3, Alt, Button4, B4, Double, Button5, B5 Triple,\nMod1, M1. TYPE is one of Activate, Enter, Map,\nButtonPress, Button, Expose, Motion, ButtonRelease\nFocusIn, MouseWheel, Circulate, FocusOut, Property,\nColormap, Gravity Reparent, Configure, KeyPress, Key,\nUnmap, Deactivate, KeyRelease Visibility, Destroy,\nLeave and DETAIL is the button number for ButtonPress,\nButtonRelease and DETAIL is the Keysym for KeyPress and\nKeyRelease. Examples are\n<Control-Button-1> for pressing Control and mouse button 1 or\n<Alt-A> for pressing A and the Alt key (KeyPress can be omitted).\nAn event pattern can also be a virtual event of the form\n<<AString>> where AString can be arbitrary. This\nevent can be generated by event_generate.\nIf events are concatenated they must appear shortly\nafter each other.\n\nFUNC will be called if the event sequence occurs with an\ninstance of Event as argument. If the return value of FUNC is\n\"break\" no further bound function is invoked.\n\nAn additional boolean parameter ADD specifies whether FUNC will\nbe called additionally to the other bound function or whether\nit will replace the previous function.\n\nBind will return an identifier to allow deletion of the bound function with\nunbind without memory leak.\n\nIf FUNC or SEQUENCE is omitted the bound function or list\nof bound events are returned.", + "builtins.Misc.bind_all" => "Bind to all widgets at an event SEQUENCE a call to function FUNC.\nAn additional boolean parameter ADD specifies whether FUNC will\nbe called additionally to the other bound function or whether\nit will replace the previous function. See bind for the return value.", + "builtins.Misc.bind_class" => "Bind to widgets with bindtag CLASSNAME at event\nSEQUENCE a call of function FUNC. An additional\nboolean parameter ADD specifies whether FUNC will be\ncalled additionally to the other bound function or\nwhether it will replace the previous function. See bind for\nthe return value.", + "builtins.Misc.bindtags" => "Set or get the list of bindtags for this widget.\n\nWith no argument return the list of all bindtags associated with\nthis widget. With a list of strings as argument the bindtags are\nset to this list. The bindtags determine in which order events are\nprocessed (see bind).", + "builtins.Misc.busy" => "Make this widget appear busy.\n\nThe specified widget and its descendants will be blocked from\nuser interactions. Normally update() should be called\nimmediately afterward to insure that the hold operation is in\neffect before the application starts its processing.\n\nThe only supported configuration option is:\n\n cursor: the cursor to be displayed when the widget is made\n busy.", + "builtins.Misc.busy_cget" => "Return the value of busy configuration option.\n\nThe widget must have been previously made busy by\ntk_busy_hold(). Option may have any of the values accepted by\ntk_busy_hold().", + "builtins.Misc.busy_config" => "Query or modify the busy configuration options.\n\nThe widget must have been previously made busy by\ntk_busy_hold(). Options may have any of the values accepted by\ntk_busy_hold().\n\nPlease note that the option database is referenced by the widget\nname or class. For example, if a Frame widget with name \"frame\"\nis to be made busy, the busy cursor can be specified for it by\neither call:\n\n w.option_add('*frame.busyCursor', 'gumby')\n w.option_add('*Frame.BusyCursor', 'gumby')", + "builtins.Misc.busy_configure" => "Query or modify the busy configuration options.\n\nThe widget must have been previously made busy by\ntk_busy_hold(). Options may have any of the values accepted by\ntk_busy_hold().\n\nPlease note that the option database is referenced by the widget\nname or class. For example, if a Frame widget with name \"frame\"\nis to be made busy, the busy cursor can be specified for it by\neither call:\n\n w.option_add('*frame.busyCursor', 'gumby')\n w.option_add('*Frame.BusyCursor', 'gumby')", + "builtins.Misc.busy_current" => "Return a list of widgets that are currently busy.\n\nIf a pattern is given, only busy widgets whose path names match\na pattern are returned.", + "builtins.Misc.busy_forget" => "Make this widget no longer busy.\n\nUser events will again be received by the widget.", + "builtins.Misc.busy_hold" => "Make this widget appear busy.\n\nThe specified widget and its descendants will be blocked from\nuser interactions. Normally update() should be called\nimmediately afterward to insure that the hold operation is in\neffect before the application starts its processing.\n\nThe only supported configuration option is:\n\n cursor: the cursor to be displayed when the widget is made\n busy.", + "builtins.Misc.busy_status" => "Return True if the widget is busy, False otherwise.", + "builtins.Misc.cget" => "Return the current value of the configuration option.", + "builtins.Misc.clipboard_append" => "Append STRING to the Tk clipboard.\n\nA widget specified at the optional displayof keyword\nargument specifies the target display. The clipboard\ncan be retrieved with selection_get.", + "builtins.Misc.clipboard_clear" => "Clear the data in the Tk clipboard.\n\nA widget specified for the optional displayof keyword\nargument specifies the target display.", + "builtins.Misc.clipboard_get" => "Retrieve data from the clipboard on window's display.\n\nThe window keyword defaults to the root window of the Tkinter\napplication.\n\nThe type keyword specifies the form in which the data is\nto be returned and should be an atom name such as STRING\nor FILE_NAME. Type defaults to STRING, except on X11, where the default\nis to try UTF8_STRING and fall back to STRING.\n\nThis command is equivalent to:\n\nselection_get(CLIPBOARD)", + "builtins.Misc.columnconfigure" => "Configure column INDEX of a grid.\n\nValid options are minsize (minimum size of the column),\nweight (how much does additional space propagate to this column)\nand pad (how much space to let additionally).", + "builtins.Misc.config" => "Query or modify the configuration options of the widget.\n\nIf no arguments are specified, return a dictionary describing\nall of the available options for the widget.\n\nIf an option name is specified, then return a tuple describing\nthe one named option.\n\nIf one or more keyword arguments are specified or a dictionary\nis specified, then modify the widget option(s) to have the given\nvalue(s).", + "builtins.Misc.configure" => "Query or modify the configuration options of the widget.\n\nIf no arguments are specified, return a dictionary describing\nall of the available options for the widget.\n\nIf an option name is specified, then return a tuple describing\nthe one named option.\n\nIf one or more keyword arguments are specified or a dictionary\nis specified, then modify the widget option(s) to have the given\nvalue(s).", + "builtins.Misc.deletecommand" => "Internal function.\n\nDelete the Tcl command provided in NAME.", + "builtins.Misc.destroy" => "Internal function.\n\nDelete all Tcl commands created for\nthis widget in the Tcl interpreter.", + "builtins.Misc.event_add" => "Bind a virtual event VIRTUAL (of the form <<Name>>)\nto an event SEQUENCE such that the virtual event is triggered\nwhenever SEQUENCE occurs.", + "builtins.Misc.event_delete" => "Unbind a virtual event VIRTUAL from SEQUENCE.", + "builtins.Misc.event_generate" => "Generate an event SEQUENCE. Additional\nkeyword arguments specify parameter of the event\n(e.g. x, y, rootx, rooty).", + "builtins.Misc.event_info" => "Return a list of all virtual events or the information\nabout the SEQUENCE bound to the virtual event VIRTUAL.", + "builtins.Misc.focus" => "Direct input focus to this widget.\n\nIf the application currently does not have the focus\nthis widget will get the focus if the application gets\nthe focus through the window manager.", + "builtins.Misc.focus_displayof" => "Return the widget which has currently the focus on the\ndisplay where this widget is located.\n\nReturn None if the application does not have the focus.", + "builtins.Misc.focus_force" => "Direct input focus to this widget even if the\napplication does not have the focus. Use with\ncaution!", + "builtins.Misc.focus_get" => "Return the widget which has currently the focus in the\napplication.\n\nUse focus_displayof to allow working with several\ndisplays. Return None if application does not have\nthe focus.", + "builtins.Misc.focus_lastfor" => "Return the widget which would have the focus if top level\nfor this widget gets the focus from the window manager.", + "builtins.Misc.focus_set" => "Direct input focus to this widget.\n\nIf the application currently does not have the focus\nthis widget will get the focus if the application gets\nthe focus through the window manager.", + "builtins.Misc.getboolean" => "Return a boolean value for Tcl boolean values true and false given as parameter.", + "builtins.Misc.getvar" => "Return value of Tcl variable NAME.", + "builtins.Misc.grab_current" => "Return widget which has currently the grab in this application\nor None.", + "builtins.Misc.grab_release" => "Release grab for this widget if currently set.", + "builtins.Misc.grab_set" => "Set grab for this widget.\n\nA grab directs all events to this and descendant\nwidgets in the application.", + "builtins.Misc.grab_set_global" => "Set global grab for this widget.\n\nA global grab directs all events to this and\ndescendant widgets on the display. Use with caution -\nother applications do not get events anymore.", + "builtins.Misc.grab_status" => "Return None, \"local\" or \"global\" if this widget has\nno, a local or a global grab.", + "builtins.Misc.grid_anchor" => "The anchor value controls how to place the grid within the\ncontainer widget when no row/column has any weight.\n\nThe default anchor is nw.", + "builtins.Misc.grid_bbox" => "Return a tuple of integer coordinates for the bounding\nbox of this widget controlled by the geometry manager grid.\n\nIf COLUMN, ROW is given the bounding box applies from\nthe cell with row and column 0 to the specified\ncell. If COL2 and ROW2 are given the bounding box\nstarts at that cell.\n\nThe returned integers specify the offset of the upper left\ncorner in the container widget and the width and height.", + "builtins.Misc.grid_columnconfigure" => "Configure column INDEX of a grid.\n\nValid options are minsize (minimum size of the column),\nweight (how much does additional space propagate to this column)\nand pad (how much space to let additionally).", + "builtins.Misc.grid_location" => "Return a tuple of column and row which identify the cell\nat which the pixel at position X and Y inside the container\nwidget is located.", + "builtins.Misc.grid_propagate" => "Set or get the status for propagation of geometry information.\n\nA boolean argument specifies whether the size of this container will\nbe determined by the geometry information of its content.\nIf no argument is given the current setting will be returned.", + "builtins.Misc.grid_rowconfigure" => "Configure row INDEX of a grid.\n\nValid options are minsize (minimum size of the row),\nweight (how much does additional space propagate to this row)\nand pad (how much space to let additionally).", + "builtins.Misc.grid_size" => "Return a tuple of the number of column and rows in the grid.", + "builtins.Misc.grid_slaves" => "Returns a list of the content widgets.\n\nIf no arguments are supplied, a list of all of the content in this\ncontainer widget is returned, most recently managed first.\nIf ROW or COLUMN is specified, only the content in the row or\ncolumn is returned.", + "builtins.Misc.image_names" => "Return a list of all existing image names.", + "builtins.Misc.image_types" => "Return a list of all available image types (e.g. photo bitmap).", + "builtins.Misc.info_patchlevel" => "Returns the exact version of the Tcl library.", + "builtins.Misc.keys" => "Return a list of all option names of this widget.", + "builtins.Misc.lift" => "Raise this widget in the stacking order.", + "builtins.Misc.lower" => "Lower this widget in the stacking order.", + "builtins.Misc.mainloop" => "Call the mainloop of Tk.", + "builtins.Misc.nametowidget" => "Return the Tkinter instance of a widget identified by\nits Tcl name NAME.", + "builtins.Misc.option_add" => "Set a VALUE (second parameter) for an option\nPATTERN (first parameter).\n\nAn optional third parameter gives the numeric priority\n(defaults to 80).", + "builtins.Misc.option_clear" => "Clear the option database.\n\nIt will be reloaded if option_add is called.", + "builtins.Misc.option_get" => "Return the value for an option NAME for this widget\nwith CLASSNAME.\n\nValues with higher priority override lower values.", + "builtins.Misc.option_readfile" => "Read file FILENAME into the option database.\n\nAn optional second parameter gives the numeric\npriority.", + "builtins.Misc.pack_propagate" => "Set or get the status for propagation of geometry information.\n\nA boolean argument specifies whether the size of this container will\nbe determined by the geometry information of its content.\nIf no argument is given the current setting will be returned.", + "builtins.Misc.pack_slaves" => "Returns a list of all of the content widgets in the packing order\nfor this container.", + "builtins.Misc.place_slaves" => "Returns a list of all the content widgets for which this widget is\nthe container.", + "builtins.Misc.propagate" => "Set or get the status for propagation of geometry information.\n\nA boolean argument specifies whether the size of this container will\nbe determined by the geometry information of its content.\nIf no argument is given the current setting will be returned.", + "builtins.Misc.quit" => "Quit the Tcl interpreter. All widgets will be destroyed.", + "builtins.Misc.register" => "Return a newly created Tcl function. If this\nfunction is called, the Python function FUNC will\nbe executed. An optional function SUBST can\nbe given which will be executed before FUNC.", + "builtins.Misc.rowconfigure" => "Configure row INDEX of a grid.\n\nValid options are minsize (minimum size of the row),\nweight (how much does additional space propagate to this row)\nand pad (how much space to let additionally).", + "builtins.Misc.selection_clear" => "Clear the current X selection.", + "builtins.Misc.selection_get" => "Return the contents of the current X selection.\n\nA keyword parameter selection specifies the name of\nthe selection and defaults to PRIMARY. A keyword\nparameter displayof specifies a widget on the display\nto use. A keyword parameter type specifies the form of data to be\nfetched, defaulting to STRING except on X11, where UTF8_STRING is tried\nbefore STRING.", + "builtins.Misc.selection_handle" => "Specify a function COMMAND to call if the X\nselection owned by this widget is queried by another\napplication.\n\nThis function must return the contents of the\nselection. The function will be called with the\narguments OFFSET and LENGTH which allows the chunking\nof very long selections. The following keyword\nparameters can be provided:\nselection - name of the selection (default PRIMARY),\ntype - type of the selection (e.g. STRING, FILE_NAME).", + "builtins.Misc.selection_own" => "Become owner of X selection.\n\nA keyword parameter selection specifies the name of\nthe selection (default PRIMARY).", + "builtins.Misc.selection_own_get" => "Return owner of X selection.\n\nThe following keyword parameter can\nbe provided:\nselection - name of the selection (default PRIMARY),\ntype - type of the selection (e.g. STRING, FILE_NAME).", + "builtins.Misc.send" => "Send Tcl command CMD to different interpreter INTERP to be executed.", + "builtins.Misc.setvar" => "Set Tcl variable NAME to VALUE.", + "builtins.Misc.size" => "Return a tuple of the number of column and rows in the grid.", + "builtins.Misc.slaves" => "Returns a list of all of the content widgets in the packing order\nfor this container.", + "builtins.Misc.tk_bisque" => "Change the color scheme to light brown as used in Tk 3.6 and before.", + "builtins.Misc.tk_busy" => "Make this widget appear busy.\n\nThe specified widget and its descendants will be blocked from\nuser interactions. Normally update() should be called\nimmediately afterward to insure that the hold operation is in\neffect before the application starts its processing.\n\nThe only supported configuration option is:\n\n cursor: the cursor to be displayed when the widget is made\n busy.", + "builtins.Misc.tk_busy_cget" => "Return the value of busy configuration option.\n\nThe widget must have been previously made busy by\ntk_busy_hold(). Option may have any of the values accepted by\ntk_busy_hold().", + "builtins.Misc.tk_busy_config" => "Query or modify the busy configuration options.\n\nThe widget must have been previously made busy by\ntk_busy_hold(). Options may have any of the values accepted by\ntk_busy_hold().\n\nPlease note that the option database is referenced by the widget\nname or class. For example, if a Frame widget with name \"frame\"\nis to be made busy, the busy cursor can be specified for it by\neither call:\n\n w.option_add('*frame.busyCursor', 'gumby')\n w.option_add('*Frame.BusyCursor', 'gumby')", + "builtins.Misc.tk_busy_configure" => "Query or modify the busy configuration options.\n\nThe widget must have been previously made busy by\ntk_busy_hold(). Options may have any of the values accepted by\ntk_busy_hold().\n\nPlease note that the option database is referenced by the widget\nname or class. For example, if a Frame widget with name \"frame\"\nis to be made busy, the busy cursor can be specified for it by\neither call:\n\n w.option_add('*frame.busyCursor', 'gumby')\n w.option_add('*Frame.BusyCursor', 'gumby')", + "builtins.Misc.tk_busy_current" => "Return a list of widgets that are currently busy.\n\nIf a pattern is given, only busy widgets whose path names match\na pattern are returned.", + "builtins.Misc.tk_busy_forget" => "Make this widget no longer busy.\n\nUser events will again be received by the widget.", + "builtins.Misc.tk_busy_hold" => "Make this widget appear busy.\n\nThe specified widget and its descendants will be blocked from\nuser interactions. Normally update() should be called\nimmediately afterward to insure that the hold operation is in\neffect before the application starts its processing.\n\nThe only supported configuration option is:\n\n cursor: the cursor to be displayed when the widget is made\n busy.", + "builtins.Misc.tk_busy_status" => "Return True if the widget is busy, False otherwise.", + "builtins.Misc.tk_focusFollowsMouse" => "The widget under mouse will get automatically focus. Can not\nbe disabled easily.", + "builtins.Misc.tk_focusNext" => "Return the next widget in the focus order which follows\nwidget which has currently the focus.\n\nThe focus order first goes to the next child, then to\nthe children of the child recursively and then to the\nnext sibling which is higher in the stacking order. A\nwidget is omitted if it has the takefocus option set\nto 0.", + "builtins.Misc.tk_focusPrev" => "Return previous widget in the focus order. See tk_focusNext for details.", + "builtins.Misc.tk_setPalette" => "Set a new color scheme for all widget elements.\n\nA single color as argument will cause that all colors of Tk\nwidget elements are derived from this.\nAlternatively several keyword parameters and its associated\ncolors can be given. The following keywords are valid:\nactiveBackground, foreground, selectColor,\nactiveForeground, highlightBackground, selectBackground,\nbackground, highlightColor, selectForeground,\ndisabledForeground, insertBackground, troughColor.", + "builtins.Misc.tk_strictMotif" => "Set Tcl internal variable, whether the look and feel\nshould adhere to Motif.\n\nA parameter of 1 means adhere to Motif (e.g. no color\nchange if mouse passes over slider).\nReturns the set value.", + "builtins.Misc.tkraise" => "Raise this widget in the stacking order.", + "builtins.Misc.unbind" => "Unbind for this widget the event SEQUENCE.\n\nIf FUNCID is given, only unbind the function identified with FUNCID\nand also delete the corresponding Tcl command.\n\nOtherwise destroy the current binding for SEQUENCE, leaving SEQUENCE\nunbound.", + "builtins.Misc.unbind_all" => "Unbind for all widgets for event SEQUENCE all functions.", + "builtins.Misc.unbind_class" => "Unbind for all widgets with bindtag CLASSNAME for event SEQUENCE\nall functions.", + "builtins.Misc.update" => "Enter event loop until all pending events have been processed by Tcl.", + "builtins.Misc.update_idletasks" => "Enter event loop until all idle callbacks have been called. This\nwill update the display of windows but not process events caused by\nthe user.", + "builtins.Misc.wait_variable" => "Wait until the variable is modified.\n\nA parameter of type IntVar, StringVar, DoubleVar or\nBooleanVar must be given.", + "builtins.Misc.wait_visibility" => "Wait until the visibility of a WIDGET changes\n(e.g. it appears).\n\nIf no parameter is given self is used.", + "builtins.Misc.wait_window" => "Wait until a WIDGET is destroyed.\n\nIf no parameter is given self is used.", + "builtins.Misc.waitvar" => "Wait until the variable is modified.\n\nA parameter of type IntVar, StringVar, DoubleVar or\nBooleanVar must be given.", + "builtins.Misc.winfo_atom" => "Return integer which represents atom NAME.", + "builtins.Misc.winfo_atomname" => "Return name of atom with identifier ID.", + "builtins.Misc.winfo_cells" => "Return number of cells in the colormap for this widget.", + "builtins.Misc.winfo_children" => "Return a list of all widgets which are children of this widget.", + "builtins.Misc.winfo_class" => "Return window class name of this widget.", + "builtins.Misc.winfo_colormapfull" => "Return True if at the last color request the colormap was full.", + "builtins.Misc.winfo_containing" => "Return the widget which is at the root coordinates ROOTX, ROOTY.", + "builtins.Misc.winfo_depth" => "Return the number of bits per pixel.", + "builtins.Misc.winfo_exists" => "Return true if this widget exists.", + "builtins.Misc.winfo_fpixels" => "Return the number of pixels for the given distance NUMBER\n(e.g. \"3c\") as float.", + "builtins.Misc.winfo_geometry" => "Return geometry string for this widget in the form \"widthxheight+X+Y\".", + "builtins.Misc.winfo_height" => "Return height of this widget.", + "builtins.Misc.winfo_id" => "Return identifier ID for this widget.", + "builtins.Misc.winfo_interps" => "Return the name of all Tcl interpreters for this display.", + "builtins.Misc.winfo_ismapped" => "Return true if this widget is mapped.", + "builtins.Misc.winfo_manager" => "Return the window manager name for this widget.", + "builtins.Misc.winfo_name" => "Return the name of this widget.", + "builtins.Misc.winfo_parent" => "Return the name of the parent of this widget.", + "builtins.Misc.winfo_pathname" => "Return the pathname of the widget given by ID.", + "builtins.Misc.winfo_pixels" => "Rounded integer value of winfo_fpixels.", + "builtins.Misc.winfo_pointerx" => "Return the x coordinate of the pointer on the root window.", + "builtins.Misc.winfo_pointerxy" => "Return a tuple of x and y coordinates of the pointer on the root window.", + "builtins.Misc.winfo_pointery" => "Return the y coordinate of the pointer on the root window.", + "builtins.Misc.winfo_reqheight" => "Return requested height of this widget.", + "builtins.Misc.winfo_reqwidth" => "Return requested width of this widget.", + "builtins.Misc.winfo_rgb" => "Return a tuple of integer RGB values in range(65536) for color in this widget.", + "builtins.Misc.winfo_rootx" => "Return x coordinate of upper left corner of this widget on the\nroot window.", + "builtins.Misc.winfo_rooty" => "Return y coordinate of upper left corner of this widget on the\nroot window.", + "builtins.Misc.winfo_screen" => "Return the screen name of this widget.", + "builtins.Misc.winfo_screencells" => "Return the number of the cells in the colormap of the screen\nof this widget.", + "builtins.Misc.winfo_screendepth" => "Return the number of bits per pixel of the root window of the\nscreen of this widget.", + "builtins.Misc.winfo_screenheight" => "Return the number of pixels of the height of the screen of this widget\nin pixel.", + "builtins.Misc.winfo_screenmmheight" => "Return the number of pixels of the height of the screen of\nthis widget in mm.", + "builtins.Misc.winfo_screenmmwidth" => "Return the number of pixels of the width of the screen of\nthis widget in mm.", + "builtins.Misc.winfo_screenvisual" => "Return one of the strings directcolor, grayscale, pseudocolor,\nstaticcolor, staticgray, or truecolor for the default\ncolormodel of this screen.", + "builtins.Misc.winfo_screenwidth" => "Return the number of pixels of the width of the screen of\nthis widget in pixel.", + "builtins.Misc.winfo_server" => "Return information of the X-Server of the screen of this widget in\nthe form \"XmajorRminor vendor vendorVersion\".", + "builtins.Misc.winfo_toplevel" => "Return the toplevel widget of this widget.", + "builtins.Misc.winfo_viewable" => "Return true if the widget and all its higher ancestors are mapped.", + "builtins.Misc.winfo_visual" => "Return one of the strings directcolor, grayscale, pseudocolor,\nstaticcolor, staticgray, or truecolor for the\ncolormodel of this widget.", + "builtins.Misc.winfo_visualid" => "Return the X identifier for the visual for this widget.", + "builtins.Misc.winfo_visualsavailable" => "Return a list of all visuals available for the screen\nof this widget.\n\nEach item in the list consists of a visual name (see winfo_visual), a\ndepth and if includeids is true is given also the X identifier.", + "builtins.Misc.winfo_vrootheight" => "Return the height of the virtual root window associated with this\nwidget in pixels. If there is no virtual root window return the\nheight of the screen.", + "builtins.Misc.winfo_vrootwidth" => "Return the width of the virtual root window associated with this\nwidget in pixel. If there is no virtual root window return the\nwidth of the screen.", + "builtins.Misc.winfo_vrootx" => "Return the x offset of the virtual root relative to the root\nwindow of the screen of this widget.", + "builtins.Misc.winfo_vrooty" => "Return the y offset of the virtual root relative to the root\nwindow of the screen of this widget.", + "builtins.Misc.winfo_width" => "Return the width of this widget.", + "builtins.Misc.winfo_x" => "Return the x coordinate of the upper left corner of this widget\nin the parent.", + "builtins.Misc.winfo_y" => "Return the y coordinate of the upper left corner of this widget\nin the parent.", + "builtins.Module.__delattr__" => "Implement delattr(self, name).", + "builtins.Module.__eq__" => "Return self==value.", + "builtins.Module.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Module.__ge__" => "Return self>=value.", + "builtins.Module.__getattribute__" => "Return getattr(self, name).", + "builtins.Module.__getstate__" => "Helper for pickle.", + "builtins.Module.__gt__" => "Return self>value.", + "builtins.Module.__hash__" => "Return hash(self).", + "builtins.Module.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Module.__le__" => "Return self<=value.", + "builtins.Module.__lt__" => "Return self<value.", + "builtins.Module.__ne__" => "Return self!=value.", + "builtins.Module.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Module.__reduce__" => "Helper for pickle.", + "builtins.Module.__reduce_ex__" => "Helper for pickle.", + "builtins.Module.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Module.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Module.__str__" => "Return str(self).", + "builtins.Module.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Module.__weakref__" => "list of weak references to the object", + "builtins.ModuleFinder.__delattr__" => "Implement delattr(self, name).", + "builtins.ModuleFinder.__eq__" => "Return self==value.", + "builtins.ModuleFinder.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.ModuleFinder.__ge__" => "Return self>=value.", + "builtins.ModuleFinder.__getattribute__" => "Return getattr(self, name).", + "builtins.ModuleFinder.__getstate__" => "Helper for pickle.", + "builtins.ModuleFinder.__gt__" => "Return self>value.", + "builtins.ModuleFinder.__hash__" => "Return hash(self).", + "builtins.ModuleFinder.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.ModuleFinder.__le__" => "Return self<=value.", + "builtins.ModuleFinder.__lt__" => "Return self<value.", + "builtins.ModuleFinder.__ne__" => "Return self!=value.", + "builtins.ModuleFinder.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.ModuleFinder.__reduce__" => "Helper for pickle.", + "builtins.ModuleFinder.__reduce_ex__" => "Helper for pickle.", + "builtins.ModuleFinder.__repr__" => "Return repr(self).", + "builtins.ModuleFinder.__setattr__" => "Implement setattr(self, name, value).", + "builtins.ModuleFinder.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.ModuleFinder.__str__" => "Return str(self).", + "builtins.ModuleFinder.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.ModuleFinder.__weakref__" => "list of weak references to the object", + "builtins.ModuleFinder.any_missing" => "Return a list of modules that appear to be missing. Use\nany_missing_maybe() if you want to know which modules are\ncertain to be missing, and which *may* be missing.", + "builtins.ModuleFinder.any_missing_maybe" => "Return two lists, one with modules that are certainly missing\nand one with modules that *may* be missing. The latter names could\neither be submodules *or* just global names in the package.\n\nThe reason it can't always be determined is that it's impossible to\ntell which names are imported when \"from module import *\" is done\nwith an extension module, short of actually importing it.", + "builtins.ModuleFinder.report" => "Print a report to stdout, listing the found modules with their\npaths, as well as modules that are missing, or seem to be missing.", "builtins.ModuleNotFoundError" => "Module not found.", "builtins.ModuleNotFoundError.__delattr__" => "Implement delattr(self, name).", "builtins.ModuleNotFoundError.__eq__" => "Return self==value.", @@ -10606,6 +15472,160 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.ModuleNotFoundError.name_from" => "name imported from module", "builtins.ModuleNotFoundError.path" => "module path", "builtins.ModuleNotFoundError.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.ModuleScanner" => "An interruptible scanner that searches module synopses.", + "builtins.ModuleScanner.__delattr__" => "Implement delattr(self, name).", + "builtins.ModuleScanner.__eq__" => "Return self==value.", + "builtins.ModuleScanner.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.ModuleScanner.__ge__" => "Return self>=value.", + "builtins.ModuleScanner.__getattribute__" => "Return getattr(self, name).", + "builtins.ModuleScanner.__getstate__" => "Helper for pickle.", + "builtins.ModuleScanner.__gt__" => "Return self>value.", + "builtins.ModuleScanner.__hash__" => "Return hash(self).", + "builtins.ModuleScanner.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.ModuleScanner.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.ModuleScanner.__le__" => "Return self<=value.", + "builtins.ModuleScanner.__lt__" => "Return self<value.", + "builtins.ModuleScanner.__ne__" => "Return self!=value.", + "builtins.ModuleScanner.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.ModuleScanner.__reduce__" => "Helper for pickle.", + "builtins.ModuleScanner.__reduce_ex__" => "Helper for pickle.", + "builtins.ModuleScanner.__repr__" => "Return repr(self).", + "builtins.ModuleScanner.__setattr__" => "Implement setattr(self, name, value).", + "builtins.ModuleScanner.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.ModuleScanner.__str__" => "Return str(self).", + "builtins.ModuleScanner.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.ModuleScanner.__weakref__" => "list of weak references to the object", + "builtins.ModuleSpec" => "The specification for a module, used for loading.\n\nA module's spec is the source for information about the module. For\ndata associated with the module, including source, use the spec's\nloader.\n\n`name` is the absolute name of the module. `loader` is the loader\nto use when loading the module. `parent` is the name of the\npackage the module is in. The parent is derived from the name.\n\n`is_package` determines if the module is considered a package or\nnot. On modules this is reflected by the `__path__` attribute.\n\n`origin` is the specific location used by the loader from which to\nload the module, if that information is available. When filename is\nset, origin will match.\n\n`has_location` indicates that a spec's \"origin\" reflects a location.\nWhen this is True, `__file__` attribute of the module is set.\n\n`cached` is the location of the cached bytecode file, if any. It\ncorresponds to the `__cached__` attribute.\n\n`submodule_search_locations` is the sequence of path entries to\nsearch when importing submodules. If set, is_package should be\nTrue--and False otherwise.\n\nPackages are simply modules that (may) have submodules. If a spec\nhas a non-None value in `submodule_search_locations`, the import\nsystem will consider modules loaded from the spec as packages.\n\nOnly finders (see importlib.abc.MetaPathFinder and\nimportlib.abc.PathEntryFinder) should modify ModuleSpec instances.", + "builtins.ModuleSpec.__delattr__" => "Implement delattr(self, name).", + "builtins.ModuleSpec.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.ModuleSpec.__ge__" => "Return self>=value.", + "builtins.ModuleSpec.__getattribute__" => "Return getattr(self, name).", + "builtins.ModuleSpec.__getstate__" => "Helper for pickle.", + "builtins.ModuleSpec.__gt__" => "Return self>value.", + "builtins.ModuleSpec.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.ModuleSpec.__le__" => "Return self<=value.", + "builtins.ModuleSpec.__lt__" => "Return self<value.", + "builtins.ModuleSpec.__ne__" => "Return self!=value.", + "builtins.ModuleSpec.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.ModuleSpec.__reduce__" => "Helper for pickle.", + "builtins.ModuleSpec.__reduce_ex__" => "Helper for pickle.", + "builtins.ModuleSpec.__setattr__" => "Implement setattr(self, name, value).", + "builtins.ModuleSpec.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.ModuleSpec.__str__" => "Return str(self).", + "builtins.ModuleSpec.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.ModuleSpec.__weakref__" => "list of weak references to the object", + "builtins.ModuleSpec.parent" => "The name of the module's parent.", + "builtins.MultibyteCodec.__delattr__" => "Implement delattr(self, name).", + "builtins.MultibyteCodec.__eq__" => "Return self==value.", + "builtins.MultibyteCodec.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.MultibyteCodec.__ge__" => "Return self>=value.", + "builtins.MultibyteCodec.__getattribute__" => "Return getattr(self, name).", + "builtins.MultibyteCodec.__getstate__" => "Helper for pickle.", + "builtins.MultibyteCodec.__gt__" => "Return self>value.", + "builtins.MultibyteCodec.__hash__" => "Return hash(self).", + "builtins.MultibyteCodec.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.MultibyteCodec.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.MultibyteCodec.__le__" => "Return self<=value.", + "builtins.MultibyteCodec.__lt__" => "Return self<value.", + "builtins.MultibyteCodec.__ne__" => "Return self!=value.", + "builtins.MultibyteCodec.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.MultibyteCodec.__reduce__" => "Helper for pickle.", + "builtins.MultibyteCodec.__reduce_ex__" => "Helper for pickle.", + "builtins.MultibyteCodec.__repr__" => "Return repr(self).", + "builtins.MultibyteCodec.__setattr__" => "Implement setattr(self, name, value).", + "builtins.MultibyteCodec.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.MultibyteCodec.__str__" => "Return str(self).", + "builtins.MultibyteCodec.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.MultibyteCodec.decode" => "Decodes 'input'.\n\n'errors' may be given to set a different error handling scheme.\nDefault is 'strict' meaning that encoding errors raise\na UnicodeDecodeError. Other possible values are 'ignore' and\n'replace' as well as any other name registered with\ncodecs.register_error that is able to handle UnicodeDecodeErrors.\"", + "builtins.MultibyteCodec.encode" => "Return an encoded string version of 'input'.\n\n'errors' may be given to set a different error handling scheme.\nDefault is 'strict' meaning that encoding errors raise\na UnicodeEncodeError. Other possible values are 'ignore', 'replace'\nand 'xmlcharrefreplace' as well as any other name registered with\ncodecs.register_error that can handle UnicodeEncodeErrors.", + "builtins.MultibyteIncrementalDecoder.__delattr__" => "Implement delattr(self, name).", + "builtins.MultibyteIncrementalDecoder.__eq__" => "Return self==value.", + "builtins.MultibyteIncrementalDecoder.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.MultibyteIncrementalDecoder.__ge__" => "Return self>=value.", + "builtins.MultibyteIncrementalDecoder.__getattribute__" => "Return getattr(self, name).", + "builtins.MultibyteIncrementalDecoder.__getstate__" => "Helper for pickle.", + "builtins.MultibyteIncrementalDecoder.__gt__" => "Return self>value.", + "builtins.MultibyteIncrementalDecoder.__hash__" => "Return hash(self).", + "builtins.MultibyteIncrementalDecoder.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.MultibyteIncrementalDecoder.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.MultibyteIncrementalDecoder.__le__" => "Return self<=value.", + "builtins.MultibyteIncrementalDecoder.__lt__" => "Return self<value.", + "builtins.MultibyteIncrementalDecoder.__ne__" => "Return self!=value.", + "builtins.MultibyteIncrementalDecoder.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.MultibyteIncrementalDecoder.__reduce__" => "Helper for pickle.", + "builtins.MultibyteIncrementalDecoder.__reduce_ex__" => "Helper for pickle.", + "builtins.MultibyteIncrementalDecoder.__repr__" => "Return repr(self).", + "builtins.MultibyteIncrementalDecoder.__setattr__" => "Implement setattr(self, name, value).", + "builtins.MultibyteIncrementalDecoder.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.MultibyteIncrementalDecoder.__str__" => "Return str(self).", + "builtins.MultibyteIncrementalDecoder.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.MultibyteIncrementalDecoder.errors" => "how to treat errors", + "builtins.MultibyteIncrementalEncoder.__delattr__" => "Implement delattr(self, name).", + "builtins.MultibyteIncrementalEncoder.__eq__" => "Return self==value.", + "builtins.MultibyteIncrementalEncoder.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.MultibyteIncrementalEncoder.__ge__" => "Return self>=value.", + "builtins.MultibyteIncrementalEncoder.__getattribute__" => "Return getattr(self, name).", + "builtins.MultibyteIncrementalEncoder.__getstate__" => "Helper for pickle.", + "builtins.MultibyteIncrementalEncoder.__gt__" => "Return self>value.", + "builtins.MultibyteIncrementalEncoder.__hash__" => "Return hash(self).", + "builtins.MultibyteIncrementalEncoder.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.MultibyteIncrementalEncoder.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.MultibyteIncrementalEncoder.__le__" => "Return self<=value.", + "builtins.MultibyteIncrementalEncoder.__lt__" => "Return self<value.", + "builtins.MultibyteIncrementalEncoder.__ne__" => "Return self!=value.", + "builtins.MultibyteIncrementalEncoder.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.MultibyteIncrementalEncoder.__reduce__" => "Helper for pickle.", + "builtins.MultibyteIncrementalEncoder.__reduce_ex__" => "Helper for pickle.", + "builtins.MultibyteIncrementalEncoder.__repr__" => "Return repr(self).", + "builtins.MultibyteIncrementalEncoder.__setattr__" => "Implement setattr(self, name, value).", + "builtins.MultibyteIncrementalEncoder.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.MultibyteIncrementalEncoder.__str__" => "Return str(self).", + "builtins.MultibyteIncrementalEncoder.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.MultibyteIncrementalEncoder.errors" => "how to treat errors", + "builtins.MultibyteStreamReader.__delattr__" => "Implement delattr(self, name).", + "builtins.MultibyteStreamReader.__eq__" => "Return self==value.", + "builtins.MultibyteStreamReader.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.MultibyteStreamReader.__ge__" => "Return self>=value.", + "builtins.MultibyteStreamReader.__getattribute__" => "Return getattr(self, name).", + "builtins.MultibyteStreamReader.__getstate__" => "Helper for pickle.", + "builtins.MultibyteStreamReader.__gt__" => "Return self>value.", + "builtins.MultibyteStreamReader.__hash__" => "Return hash(self).", + "builtins.MultibyteStreamReader.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.MultibyteStreamReader.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.MultibyteStreamReader.__le__" => "Return self<=value.", + "builtins.MultibyteStreamReader.__lt__" => "Return self<value.", + "builtins.MultibyteStreamReader.__ne__" => "Return self!=value.", + "builtins.MultibyteStreamReader.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.MultibyteStreamReader.__reduce__" => "Helper for pickle.", + "builtins.MultibyteStreamReader.__reduce_ex__" => "Helper for pickle.", + "builtins.MultibyteStreamReader.__repr__" => "Return repr(self).", + "builtins.MultibyteStreamReader.__setattr__" => "Implement setattr(self, name, value).", + "builtins.MultibyteStreamReader.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.MultibyteStreamReader.__str__" => "Return str(self).", + "builtins.MultibyteStreamReader.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.MultibyteStreamReader.errors" => "how to treat errors", + "builtins.MultibyteStreamWriter.__delattr__" => "Implement delattr(self, name).", + "builtins.MultibyteStreamWriter.__eq__" => "Return self==value.", + "builtins.MultibyteStreamWriter.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.MultibyteStreamWriter.__ge__" => "Return self>=value.", + "builtins.MultibyteStreamWriter.__getattribute__" => "Return getattr(self, name).", + "builtins.MultibyteStreamWriter.__getstate__" => "Helper for pickle.", + "builtins.MultibyteStreamWriter.__gt__" => "Return self>value.", + "builtins.MultibyteStreamWriter.__hash__" => "Return hash(self).", + "builtins.MultibyteStreamWriter.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.MultibyteStreamWriter.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.MultibyteStreamWriter.__le__" => "Return self<=value.", + "builtins.MultibyteStreamWriter.__lt__" => "Return self<value.", + "builtins.MultibyteStreamWriter.__ne__" => "Return self!=value.", + "builtins.MultibyteStreamWriter.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.MultibyteStreamWriter.__reduce__" => "Helper for pickle.", + "builtins.MultibyteStreamWriter.__reduce_ex__" => "Helper for pickle.", + "builtins.MultibyteStreamWriter.__repr__" => "Return repr(self).", + "builtins.MultibyteStreamWriter.__setattr__" => "Implement setattr(self, name, value).", + "builtins.MultibyteStreamWriter.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.MultibyteStreamWriter.__str__" => "Return str(self).", + "builtins.MultibyteStreamWriter.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.MultibyteStreamWriter.errors" => "how to treat errors", "builtins.NameError" => "Name not found globally.", "builtins.NameError.__delattr__" => "Implement delattr(self, name).", "builtins.NameError.__eq__" => "Return self==value.", @@ -10630,6 +15650,138 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.NameError.add_note" => "Add a note to the exception", "builtins.NameError.name" => "name", "builtins.NameError.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.NamedTuple.__delattr__" => "Implement delattr(self, name).", + "builtins.NamedTuple.__eq__" => "Return self==value.", + "builtins.NamedTuple.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.NamedTuple.__ge__" => "Return self>=value.", + "builtins.NamedTuple.__getattribute__" => "Return getattr(self, name).", + "builtins.NamedTuple.__getstate__" => "Helper for pickle.", + "builtins.NamedTuple.__gt__" => "Return self>value.", + "builtins.NamedTuple.__hash__" => "Return hash(self).", + "builtins.NamedTuple.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.NamedTuple.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.NamedTuple.__le__" => "Return self<=value.", + "builtins.NamedTuple.__lt__" => "Return self<value.", + "builtins.NamedTuple.__ne__" => "Return self!=value.", + "builtins.NamedTuple.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.NamedTuple.__reduce__" => "Helper for pickle.", + "builtins.NamedTuple.__reduce_ex__" => "Helper for pickle.", + "builtins.NamedTuple.__repr__" => "Return repr(self).", + "builtins.NamedTuple.__setattr__" => "Implement setattr(self, name, value).", + "builtins.NamedTuple.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.NamedTuple.__str__" => "Return str(self).", + "builtins.NamedTuple.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.NamedTuple.__weakref__" => "list of weak references to the object", + "builtins.NamespaceLoader.__delattr__" => "Implement delattr(self, name).", + "builtins.NamespaceLoader.__eq__" => "Return self==value.", + "builtins.NamespaceLoader.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.NamespaceLoader.__ge__" => "Return self>=value.", + "builtins.NamespaceLoader.__getattribute__" => "Return getattr(self, name).", + "builtins.NamespaceLoader.__getstate__" => "Helper for pickle.", + "builtins.NamespaceLoader.__gt__" => "Return self>value.", + "builtins.NamespaceLoader.__hash__" => "Return hash(self).", + "builtins.NamespaceLoader.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.NamespaceLoader.__le__" => "Return self<=value.", + "builtins.NamespaceLoader.__lt__" => "Return self<value.", + "builtins.NamespaceLoader.__ne__" => "Return self!=value.", + "builtins.NamespaceLoader.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.NamespaceLoader.__reduce__" => "Helper for pickle.", + "builtins.NamespaceLoader.__reduce_ex__" => "Helper for pickle.", + "builtins.NamespaceLoader.__repr__" => "Return repr(self).", + "builtins.NamespaceLoader.__setattr__" => "Implement setattr(self, name, value).", + "builtins.NamespaceLoader.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.NamespaceLoader.__str__" => "Return str(self).", + "builtins.NamespaceLoader.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.NamespaceLoader.__weakref__" => "list of weak references to the object", + "builtins.NamespaceLoader.create_module" => "Use default semantics for module creation.", + "builtins.NamespaceLoader.load_module" => "Load a namespace module.\n\nThis method is deprecated. Use exec_module() instead.", + "builtins.NestedDict.__delattr__" => "Implement delattr(self, name).", + "builtins.NestedDict.__eq__" => "Return self==value.", + "builtins.NestedDict.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.NestedDict.__ge__" => "Return self>=value.", + "builtins.NestedDict.__getattribute__" => "Return getattr(self, name).", + "builtins.NestedDict.__getstate__" => "Helper for pickle.", + "builtins.NestedDict.__gt__" => "Return self>value.", + "builtins.NestedDict.__hash__" => "Return hash(self).", + "builtins.NestedDict.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.NestedDict.__le__" => "Return self<=value.", + "builtins.NestedDict.__lt__" => "Return self<value.", + "builtins.NestedDict.__ne__" => "Return self!=value.", + "builtins.NestedDict.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.NestedDict.__reduce__" => "Helper for pickle.", + "builtins.NestedDict.__reduce_ex__" => "Helper for pickle.", + "builtins.NestedDict.__repr__" => "Return repr(self).", + "builtins.NestedDict.__setattr__" => "Implement setattr(self, name, value).", + "builtins.NestedDict.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.NestedDict.__str__" => "Return str(self).", + "builtins.NestedDict.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.NestedDict.__weakref__" => "list of weak references to the object", + "builtins.NewType" => "NewType creates simple unique types with almost zero runtime overhead.\n\nNewType(name, tp) is considered a subtype of tp\nby static type checkers. At runtime, NewType(name, tp) returns\na dummy callable that simply returns its argument.\n\nUsage::\n\n UserId = NewType('UserId', int)\n\n def name_by_id(user_id: UserId) -> str:\n ...\n\n UserId('user') # Fails type check\n\n name_by_id(42) # Fails type check\n name_by_id(UserId(42)) # OK\n\n num = UserId(5) + 1 # type: int", + "builtins.NewType.__delattr__" => "Implement delattr(self, name).", + "builtins.NewType.__eq__" => "Return self==value.", + "builtins.NewType.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.NewType.__ge__" => "Return self>=value.", + "builtins.NewType.__getattribute__" => "Return getattr(self, name).", + "builtins.NewType.__getstate__" => "Helper for pickle.", + "builtins.NewType.__gt__" => "Return self>value.", + "builtins.NewType.__hash__" => "Return hash(self).", + "builtins.NewType.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.NewType.__le__" => "Return self<=value.", + "builtins.NewType.__lt__" => "Return self<value.", + "builtins.NewType.__ne__" => "Return self!=value.", + "builtins.NewType.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.NewType.__reduce_ex__" => "Helper for pickle.", + "builtins.NewType.__setattr__" => "Implement setattr(self, name, value).", + "builtins.NewType.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.NewType.__str__" => "Return str(self).", + "builtins.NewType.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.NewType.__weakref__" => "list of weak references to the object", + "builtins.NoDefaultType" => "The type of the NoDefault singleton.", + "builtins.NoDefaultType.__delattr__" => "Implement delattr(self, name).", + "builtins.NoDefaultType.__eq__" => "Return self==value.", + "builtins.NoDefaultType.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.NoDefaultType.__ge__" => "Return self>=value.", + "builtins.NoDefaultType.__getattribute__" => "Return getattr(self, name).", + "builtins.NoDefaultType.__getstate__" => "Helper for pickle.", + "builtins.NoDefaultType.__gt__" => "Return self>value.", + "builtins.NoDefaultType.__hash__" => "Return hash(self).", + "builtins.NoDefaultType.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.NoDefaultType.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.NoDefaultType.__le__" => "Return self<=value.", + "builtins.NoDefaultType.__lt__" => "Return self<value.", + "builtins.NoDefaultType.__ne__" => "Return self!=value.", + "builtins.NoDefaultType.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.NoDefaultType.__reduce_ex__" => "Helper for pickle.", + "builtins.NoDefaultType.__repr__" => "Return repr(self).", + "builtins.NoDefaultType.__setattr__" => "Implement setattr(self, name, value).", + "builtins.NoDefaultType.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.NoDefaultType.__str__" => "Return str(self).", + "builtins.NoDefaultType.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.NodeVisitor" => "A node visitor base class that walks the abstract syntax tree and calls a\nvisitor function for every node found. This function may return a value\nwhich is forwarded by the `visit` method.\n\nThis class is meant to be subclassed, with the subclass adding visitor\nmethods.\n\nPer default the visitor functions for the nodes are ``'visit_'`` +\nclass name of the node. So a `TryFinally` node visit function would\nbe `visit_TryFinally`. This behavior can be changed by overriding\nthe `visit` method. If no visitor function exists for a node\n(return value `None`) the `generic_visit` visitor is used instead.\n\nDon't use the `NodeVisitor` if you want to apply changes to nodes during\ntraversing. For this a special visitor exists (`NodeTransformer`) that\nallows modifications.", + "builtins.NodeVisitor.__delattr__" => "Implement delattr(self, name).", + "builtins.NodeVisitor.__eq__" => "Return self==value.", + "builtins.NodeVisitor.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.NodeVisitor.__ge__" => "Return self>=value.", + "builtins.NodeVisitor.__getattribute__" => "Return getattr(self, name).", + "builtins.NodeVisitor.__getstate__" => "Helper for pickle.", + "builtins.NodeVisitor.__gt__" => "Return self>value.", + "builtins.NodeVisitor.__hash__" => "Return hash(self).", + "builtins.NodeVisitor.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.NodeVisitor.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.NodeVisitor.__le__" => "Return self<=value.", + "builtins.NodeVisitor.__lt__" => "Return self<value.", + "builtins.NodeVisitor.__ne__" => "Return self!=value.", + "builtins.NodeVisitor.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.NodeVisitor.__reduce__" => "Helper for pickle.", + "builtins.NodeVisitor.__reduce_ex__" => "Helper for pickle.", + "builtins.NodeVisitor.__repr__" => "Return repr(self).", + "builtins.NodeVisitor.__setattr__" => "Implement setattr(self, name, value).", + "builtins.NodeVisitor.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.NodeVisitor.__str__" => "Return str(self).", + "builtins.NodeVisitor.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.NodeVisitor.__weakref__" => "list of weak references to the object", + "builtins.NodeVisitor.generic_visit" => "Called if no explicit visitor function exists for a node.", + "builtins.NodeVisitor.visit" => "Visit a node.", "builtins.NoneType" => "The type of the None singleton.", "builtins.NoneType.__bool__" => "True if self else False", "builtins.NoneType.__delattr__" => "Implement delattr(self, name).", @@ -10653,6 +15805,48 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.NoneType.__sizeof__" => "Size of object in memory, in bytes.", "builtins.NoneType.__str__" => "Return str(self).", "builtins.NoneType.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.NormalDist" => "Normal distribution of a random variable", + "builtins.NormalDist.__add__" => "Add a constant or another NormalDist instance.\n\nIf *other* is a constant, translate mu by the constant,\nleaving sigma unchanged.\n\nIf *other* is a NormalDist, add both the means and the variances.\nMathematically, this works only if the two distributions are\nindependent or if they are jointly normally distributed.", + "builtins.NormalDist.__delattr__" => "Implement delattr(self, name).", + "builtins.NormalDist.__eq__" => "Two NormalDist objects are equal if their mu and sigma are both equal.", + "builtins.NormalDist.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.NormalDist.__ge__" => "Return self>=value.", + "builtins.NormalDist.__getattribute__" => "Return getattr(self, name).", + "builtins.NormalDist.__gt__" => "Return self>value.", + "builtins.NormalDist.__hash__" => "NormalDist objects hash equal if their mu and sigma are both equal.", + "builtins.NormalDist.__init__" => "NormalDist where mu is the mean and sigma is the standard deviation.", + "builtins.NormalDist.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.NormalDist.__le__" => "Return self<=value.", + "builtins.NormalDist.__lt__" => "Return self<value.", + "builtins.NormalDist.__mul__" => "Multiply both mu and sigma by a constant.\n\nUsed for rescaling, perhaps to change measurement units.\nSigma is scaled with the absolute value of the constant.", + "builtins.NormalDist.__ne__" => "Return self!=value.", + "builtins.NormalDist.__neg__" => "Negates mu while keeping sigma the same.", + "builtins.NormalDist.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.NormalDist.__pos__" => "Return a copy of the instance.", + "builtins.NormalDist.__radd__" => "Add a constant or another NormalDist instance.\n\nIf *other* is a constant, translate mu by the constant,\nleaving sigma unchanged.\n\nIf *other* is a NormalDist, add both the means and the variances.\nMathematically, this works only if the two distributions are\nindependent or if they are jointly normally distributed.", + "builtins.NormalDist.__reduce__" => "Helper for pickle.", + "builtins.NormalDist.__reduce_ex__" => "Helper for pickle.", + "builtins.NormalDist.__rmul__" => "Multiply both mu and sigma by a constant.\n\nUsed for rescaling, perhaps to change measurement units.\nSigma is scaled with the absolute value of the constant.", + "builtins.NormalDist.__rsub__" => "Subtract a NormalDist from a constant or another NormalDist.", + "builtins.NormalDist.__setattr__" => "Implement setattr(self, name, value).", + "builtins.NormalDist.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.NormalDist.__str__" => "Return str(self).", + "builtins.NormalDist.__sub__" => "Subtract a constant or another NormalDist instance.\n\nIf *other* is a constant, translate by the constant mu,\nleaving sigma unchanged.\n\nIf *other* is a NormalDist, subtract the means and add the variances.\nMathematically, this works only if the two distributions are\nindependent or if they are jointly normally distributed.", + "builtins.NormalDist.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.NormalDist.__truediv__" => "Divide both mu and sigma by a constant.\n\nUsed for rescaling, perhaps to change measurement units.\nSigma is scaled with the absolute value of the constant.", + "builtins.NormalDist.cdf" => "Cumulative distribution function. P(X <= x)", + "builtins.NormalDist.from_samples" => "Make a normal distribution instance from sample data.", + "builtins.NormalDist.inv_cdf" => "Inverse cumulative distribution function. x : P(X <= x) = p\n\nFinds the value of the random variable such that the probability of\nthe variable being less than or equal to that value equals the given\nprobability.\n\nThis function is also called the percent point function or quantile\nfunction.", + "builtins.NormalDist.mean" => "Arithmetic mean of the normal distribution.", + "builtins.NormalDist.median" => "Return the median of the normal distribution", + "builtins.NormalDist.mode" => "Return the mode of the normal distribution\n\nThe mode is the value x where which the probability density\nfunction (pdf) takes its maximum value.", + "builtins.NormalDist.overlap" => "Compute the overlapping coefficient (OVL) between two normal distributions.\n\nMeasures the agreement between two normal probability distributions.\nReturns a value between 0.0 and 1.0 giving the overlapping area in\nthe two underlying probability density functions.\n\n >>> N1 = NormalDist(2.4, 1.6)\n >>> N2 = NormalDist(3.2, 2.0)\n >>> N1.overlap(N2)\n 0.8035050657330205", + "builtins.NormalDist.pdf" => "Probability density function. P(x <= X < x+dx) / dx", + "builtins.NormalDist.quantiles" => "Divide into *n* continuous intervals with equal probability.\n\nReturns a list of (n - 1) cut points separating the intervals.\n\nSet *n* to 4 for quartiles (the default). Set *n* to 10 for deciles.\nSet *n* to 100 for percentiles which gives the 99 cuts points that\nseparate the normal distribution in to 100 equal sized groups.", + "builtins.NormalDist.samples" => "Generate *n* samples for a given mean and standard deviation.", + "builtins.NormalDist.stdev" => "Standard deviation of the normal distribution.", + "builtins.NormalDist.variance" => "Square of the standard deviation.", + "builtins.NormalDist.zscore" => "Compute the Standard Score. (x - mean) / stdev\n\nDescribes *x* in terms of the number of standard deviations\nabove or below the mean of the normal distribution.", "builtins.NotADirectoryError" => "Operation only works on directories.", "builtins.NotADirectoryError.__delattr__" => "Implement delattr(self, name).", "builtins.NotADirectoryError.__eq__" => "Return self==value.", @@ -10726,6 +15920,48 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.NotImplementedType.__sizeof__" => "Size of object in memory, in bytes.", "builtins.NotImplementedType.__str__" => "Return str(self).", "builtins.NotImplementedType.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.NullTranslations.__delattr__" => "Implement delattr(self, name).", + "builtins.NullTranslations.__eq__" => "Return self==value.", + "builtins.NullTranslations.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.NullTranslations.__ge__" => "Return self>=value.", + "builtins.NullTranslations.__getattribute__" => "Return getattr(self, name).", + "builtins.NullTranslations.__getstate__" => "Helper for pickle.", + "builtins.NullTranslations.__gt__" => "Return self>value.", + "builtins.NullTranslations.__hash__" => "Return hash(self).", + "builtins.NullTranslations.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.NullTranslations.__le__" => "Return self<=value.", + "builtins.NullTranslations.__lt__" => "Return self<value.", + "builtins.NullTranslations.__ne__" => "Return self!=value.", + "builtins.NullTranslations.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.NullTranslations.__reduce__" => "Helper for pickle.", + "builtins.NullTranslations.__reduce_ex__" => "Helper for pickle.", + "builtins.NullTranslations.__repr__" => "Return repr(self).", + "builtins.NullTranslations.__setattr__" => "Implement setattr(self, name, value).", + "builtins.NullTranslations.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.NullTranslations.__str__" => "Return str(self).", + "builtins.NullTranslations.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.NullTranslations.__weakref__" => "list of weak references to the object", + "builtins.Number" => "All numbers inherit from this class.\n\nIf you just want to check if an argument x is a number, without\ncaring what kind, use isinstance(x, Number).", + "builtins.Number.__delattr__" => "Implement delattr(self, name).", + "builtins.Number.__eq__" => "Return self==value.", + "builtins.Number.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Number.__ge__" => "Return self>=value.", + "builtins.Number.__getattribute__" => "Return getattr(self, name).", + "builtins.Number.__getstate__" => "Helper for pickle.", + "builtins.Number.__gt__" => "Return self>value.", + "builtins.Number.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Number.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Number.__le__" => "Return self<=value.", + "builtins.Number.__lt__" => "Return self<value.", + "builtins.Number.__ne__" => "Return self!=value.", + "builtins.Number.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Number.__reduce__" => "Helper for pickle.", + "builtins.Number.__reduce_ex__" => "Helper for pickle.", + "builtins.Number.__repr__" => "Return repr(self).", + "builtins.Number.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Number.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Number.__str__" => "Return str(self).", + "builtins.Number.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.OSError" => "Base class for I/O related errors.", "builtins.OSError.__delattr__" => "Implement delattr(self, name).", "builtins.OSError.__eq__" => "Return self==value.", @@ -10754,6 +15990,117 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.OSError.strerror" => "exception strerror", "builtins.OSError.winerror" => "Win32 exception code", "builtins.OSError.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.OpcodeInfo.__delattr__" => "Implement delattr(self, name).", + "builtins.OpcodeInfo.__eq__" => "Return self==value.", + "builtins.OpcodeInfo.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.OpcodeInfo.__ge__" => "Return self>=value.", + "builtins.OpcodeInfo.__getattribute__" => "Return getattr(self, name).", + "builtins.OpcodeInfo.__getstate__" => "Helper for pickle.", + "builtins.OpcodeInfo.__gt__" => "Return self>value.", + "builtins.OpcodeInfo.__hash__" => "Return hash(self).", + "builtins.OpcodeInfo.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.OpcodeInfo.__le__" => "Return self<=value.", + "builtins.OpcodeInfo.__lt__" => "Return self<value.", + "builtins.OpcodeInfo.__ne__" => "Return self!=value.", + "builtins.OpcodeInfo.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.OpcodeInfo.__reduce__" => "Helper for pickle.", + "builtins.OpcodeInfo.__reduce_ex__" => "Helper for pickle.", + "builtins.OpcodeInfo.__repr__" => "Return repr(self).", + "builtins.OpcodeInfo.__setattr__" => "Implement setattr(self, name, value).", + "builtins.OpcodeInfo.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.OpcodeInfo.__str__" => "Return str(self).", + "builtins.OpcodeInfo.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Option" => "Instance attributes:\n _short_opts : [string]\n _long_opts : [string]\n\n action : string\n type : string\n dest : string\n default : any\n nargs : int\n const : any\n choices : [string]\n callback : function\n callback_args : (any*)\n callback_kwargs : { string : any }\n help : string\n metavar : string", + "builtins.Option.__delattr__" => "Implement delattr(self, name).", + "builtins.Option.__eq__" => "Return self==value.", + "builtins.Option.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Option.__ge__" => "Return self>=value.", + "builtins.Option.__getattribute__" => "Return getattr(self, name).", + "builtins.Option.__getstate__" => "Helper for pickle.", + "builtins.Option.__gt__" => "Return self>value.", + "builtins.Option.__hash__" => "Return hash(self).", + "builtins.Option.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Option.__le__" => "Return self<=value.", + "builtins.Option.__lt__" => "Return self<value.", + "builtins.Option.__ne__" => "Return self!=value.", + "builtins.Option.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Option.__reduce__" => "Helper for pickle.", + "builtins.Option.__reduce_ex__" => "Helper for pickle.", + "builtins.Option.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Option.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Option.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Option.__weakref__" => "list of weak references to the object", + "builtins.OptionContainer" => "Abstract base class.\n\nClass attributes:\n standard_option_list : [Option]\n list of standard options that will be accepted by all instances\n of this parser class (intended to be overridden by subclasses).\n\nInstance attributes:\n option_list : [Option]\n the list of Option objects contained by this OptionContainer\n _short_opt : { string : Option }\n dictionary mapping short option strings, eg. \"-f\" or \"-X\",\n to the Option instances that implement them. If an Option\n has multiple short option strings, it will appear in this\n dictionary multiple times. [1]\n _long_opt : { string : Option }\n dictionary mapping long option strings, eg. \"--file\" or\n \"--exclude\", to the Option instances that implement them.\n Again, a given Option can occur multiple times in this\n dictionary. [1]\n defaults : { string : any }\n dictionary mapping option destination names to default\n values for each destination [1]\n\n[1] These mappings are common to (shared by) all components of the\n controlling OptionParser, where they are initially created.", + "builtins.OptionContainer.__delattr__" => "Implement delattr(self, name).", + "builtins.OptionContainer.__eq__" => "Return self==value.", + "builtins.OptionContainer.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.OptionContainer.__ge__" => "Return self>=value.", + "builtins.OptionContainer.__getattribute__" => "Return getattr(self, name).", + "builtins.OptionContainer.__getstate__" => "Helper for pickle.", + "builtins.OptionContainer.__gt__" => "Return self>value.", + "builtins.OptionContainer.__hash__" => "Return hash(self).", + "builtins.OptionContainer.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.OptionContainer.__le__" => "Return self<=value.", + "builtins.OptionContainer.__lt__" => "Return self<value.", + "builtins.OptionContainer.__ne__" => "Return self!=value.", + "builtins.OptionContainer.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.OptionContainer.__reduce__" => "Helper for pickle.", + "builtins.OptionContainer.__reduce_ex__" => "Helper for pickle.", + "builtins.OptionContainer.__repr__" => "Return repr(self).", + "builtins.OptionContainer.__setattr__" => "Implement setattr(self, name, value).", + "builtins.OptionContainer.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.OptionContainer.__str__" => "Return str(self).", + "builtins.OptionContainer.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.OptionContainer.__weakref__" => "list of weak references to the object", + "builtins.OptionContainer.add_option" => "add_option(Option)\nadd_option(opt_str, ..., kwarg=val, ...)", + "builtins.OptionContainer.destroy" => "see OptionParser.destroy().", + "builtins.Output.__delattr__" => "Implement delattr(self, name).", + "builtins.Output.__eq__" => "Return self==value.", + "builtins.Output.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Output.__ge__" => "Return self>=value.", + "builtins.Output.__getattribute__" => "Return getattr(self, name).", + "builtins.Output.__getstate__" => "Helper for pickle.", + "builtins.Output.__gt__" => "Return self>value.", + "builtins.Output.__hash__" => "Return hash(self).", + "builtins.Output.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Output.__le__" => "Return self<=value.", + "builtins.Output.__lt__" => "Return self<value.", + "builtins.Output.__ne__" => "Return self!=value.", + "builtins.Output.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Output.__reduce__" => "Helper for pickle.", + "builtins.Output.__reduce_ex__" => "Helper for pickle.", + "builtins.Output.__repr__" => "Return repr(self).", + "builtins.Output.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Output.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Output.__str__" => "Return str(self).", + "builtins.Output.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Output.__weakref__" => "list of weak references to the object", + "builtins.OutputChecker" => "A class used to check whether the actual output from a doctest\nexample matches the expected output. `OutputChecker` defines two\nmethods: `check_output`, which compares a given pair of outputs,\nand returns true if they match; and `output_difference`, which\nreturns a string describing the differences between two outputs.", + "builtins.OutputChecker.__delattr__" => "Implement delattr(self, name).", + "builtins.OutputChecker.__eq__" => "Return self==value.", + "builtins.OutputChecker.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.OutputChecker.__ge__" => "Return self>=value.", + "builtins.OutputChecker.__getattribute__" => "Return getattr(self, name).", + "builtins.OutputChecker.__getstate__" => "Helper for pickle.", + "builtins.OutputChecker.__gt__" => "Return self>value.", + "builtins.OutputChecker.__hash__" => "Return hash(self).", + "builtins.OutputChecker.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.OutputChecker.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.OutputChecker.__le__" => "Return self<=value.", + "builtins.OutputChecker.__lt__" => "Return self<value.", + "builtins.OutputChecker.__ne__" => "Return self!=value.", + "builtins.OutputChecker.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.OutputChecker.__reduce__" => "Helper for pickle.", + "builtins.OutputChecker.__reduce_ex__" => "Helper for pickle.", + "builtins.OutputChecker.__repr__" => "Return repr(self).", + "builtins.OutputChecker.__setattr__" => "Implement setattr(self, name, value).", + "builtins.OutputChecker.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.OutputChecker.__str__" => "Return str(self).", + "builtins.OutputChecker.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.OutputChecker.__weakref__" => "list of weak references to the object", + "builtins.OutputChecker._toAscii" => "Convert string to hex-escaped ASCII string.", + "builtins.OutputChecker.check_output" => "Return True iff the actual output from an example (`got`)\nmatches the expected output (`want`). These strings are\nalways considered to match if they are identical; but\ndepending on what option flags the test runner is using,\nseveral non-exact match types are also possible. See the\ndocumentation for `TestRunner` for more information about\noption flags.", + "builtins.OutputChecker.output_difference" => "Return a string describing the differences between the\nexpected output for a given example (`example`) and the actual\noutput (`got`). `optionflags` is the set of option flags used\nto compare `want` and `got`.", "builtins.OverflowError" => "Result too large to be represented.", "builtins.OverflowError.__delattr__" => "Implement delattr(self, name).", "builtins.OverflowError.__eq__" => "Return self==value.", @@ -10777,6 +16124,360 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.OverflowError.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.OverflowError.add_note" => "Add a note to the exception", "builtins.OverflowError.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.Overlapped" => "OVERLAPPED structure wrapper.", + "builtins.Overlapped.AcceptEx" => "Start overlapped wait for client to connect.", + "builtins.Overlapped.ConnectEx" => "Start overlapped connect.\n\nclient_handle should be unbound.", + "builtins.Overlapped.ConnectNamedPipe" => "Start overlapped wait for a client to connect.", + "builtins.Overlapped.ReadFile" => "Start overlapped read.", + "builtins.Overlapped.ReadFileInto" => "Start overlapped receive.", + "builtins.Overlapped.TransmitFile" => "Transmit file data over a connected socket.", + "builtins.Overlapped.WSARecv" => "Start overlapped receive.", + "builtins.Overlapped.WSARecvFrom" => "Start overlapped receive.", + "builtins.Overlapped.WSARecvFromInto" => "Start overlapped receive.", + "builtins.Overlapped.WSARecvInto" => "Start overlapped receive.", + "builtins.Overlapped.WSASend" => "Start overlapped send.", + "builtins.Overlapped.WSASendTo" => "Start overlapped sendto over a connectionless (UDP) socket.", + "builtins.Overlapped.WriteFile" => "Start overlapped write.", + "builtins.Overlapped.__delattr__" => "Implement delattr(self, name).", + "builtins.Overlapped.__eq__" => "Return self==value.", + "builtins.Overlapped.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Overlapped.__ge__" => "Return self>=value.", + "builtins.Overlapped.__getattribute__" => "Return getattr(self, name).", + "builtins.Overlapped.__getstate__" => "Helper for pickle.", + "builtins.Overlapped.__gt__" => "Return self>value.", + "builtins.Overlapped.__hash__" => "Return hash(self).", + "builtins.Overlapped.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Overlapped.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Overlapped.__le__" => "Return self<=value.", + "builtins.Overlapped.__lt__" => "Return self<value.", + "builtins.Overlapped.__ne__" => "Return self!=value.", + "builtins.Overlapped.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Overlapped.__reduce__" => "Helper for pickle.", + "builtins.Overlapped.__reduce_ex__" => "Helper for pickle.", + "builtins.Overlapped.__repr__" => "Return repr(self).", + "builtins.Overlapped.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Overlapped.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Overlapped.__str__" => "Return str(self).", + "builtins.Overlapped.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Overlapped.address" => "Address of overlapped structure", + "builtins.Overlapped.cancel" => "Cancel overlapped operation.", + "builtins.Overlapped.error" => "Error from last operation", + "builtins.Overlapped.event" => "Overlapped event handle", + "builtins.Overlapped.getresult" => "Retrieve result of operation.\n\nIf wait is true then it blocks until the operation is finished. If\nwait is false and the operation is still pending then an error is\nraised.", + "builtins.Overlapped.pending" => "Whether the operation is pending", + "builtins.POP3" => "This class supports both the minimal and optional command sets.\nArguments can be strings or integers (where appropriate)\n(e.g.: retr(1) and retr('1') both work equally well.\n\nMinimal Command Set:\n USER name user(name)\n PASS string pass_(string)\n STAT stat()\n LIST [msg] list(msg = None)\n RETR msg retr(msg)\n DELE msg dele(msg)\n NOOP noop()\n RSET rset()\n QUIT quit()\n\nOptional Commands (some servers support these):\n RPOP name rpop(name)\n APOP name digest apop(name, digest)\n TOP msg n top(msg, n)\n UIDL [msg] uidl(msg = None)\n CAPA capa()\n STLS stls()\n UTF8 utf8()\n\nRaises one exception: 'error_proto'.\n\nInstantiate with:\n POP3(hostname, port=110)\n\nNB: the POP protocol locks the mailbox from user\n authorization until QUIT, so be sure to get in, suck\n the messages, and quit, each time you access the\n mailbox.\n\n POP is a line-based protocol, which means large mail\n messages consume lots of python cycles reading them\n line-by-line.\n\n If it's available on your mail server, use IMAP4\n instead, it doesn't suffer from the two problems\n above.", + "builtins.POP3.__delattr__" => "Implement delattr(self, name).", + "builtins.POP3.__eq__" => "Return self==value.", + "builtins.POP3.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.POP3.__ge__" => "Return self>=value.", + "builtins.POP3.__getattribute__" => "Return getattr(self, name).", + "builtins.POP3.__getstate__" => "Helper for pickle.", + "builtins.POP3.__gt__" => "Return self>value.", + "builtins.POP3.__hash__" => "Return hash(self).", + "builtins.POP3.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.POP3.__le__" => "Return self<=value.", + "builtins.POP3.__lt__" => "Return self<value.", + "builtins.POP3.__ne__" => "Return self!=value.", + "builtins.POP3.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.POP3.__reduce__" => "Helper for pickle.", + "builtins.POP3.__reduce_ex__" => "Helper for pickle.", + "builtins.POP3.__repr__" => "Return repr(self).", + "builtins.POP3.__setattr__" => "Implement setattr(self, name, value).", + "builtins.POP3.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.POP3.__str__" => "Return str(self).", + "builtins.POP3.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.POP3.__weakref__" => "list of weak references to the object", + "builtins.POP3.apop" => "Authorisation\n\n- only possible if server has supplied a timestamp in initial greeting.\n\nArgs:\n user - mailbox user;\n password - mailbox password.\n\nNB: mailbox is locked by server from here to 'quit()'", + "builtins.POP3.capa" => "Return server capabilities (RFC 2449) as a dictionary\n>>> c=poplib.POP3('localhost')\n>>> c.capa()\n{'IMPLEMENTATION': ['Cyrus', 'POP3', 'server', 'v2.2.12'],\n 'TOP': [], 'LOGIN-DELAY': ['0'], 'AUTH-RESP-CODE': [],\n 'EXPIRE': ['NEVER'], 'USER': [], 'STLS': [], 'PIPELINING': [],\n 'UIDL': [], 'RESP-CODES': []}\n>>>\n\nReally, according to RFC 2449, the cyrus folks should avoid\nhaving the implementation split into multiple arguments...", + "builtins.POP3.close" => "Close the connection without assuming anything about it.", + "builtins.POP3.dele" => "Delete message number 'which'.\n\nResult is 'response'.", + "builtins.POP3.list" => "Request listing, return result.\n\nResult without a message number argument is in form\n['response', ['mesg_num octets', ...], octets].\n\nResult when a message number argument is given is a\nsingle response: the \"scan listing\" for that message.", + "builtins.POP3.noop" => "Does nothing.\n\nOne supposes the response indicates the server is alive.", + "builtins.POP3.pass_" => "Send password, return response\n\n(response includes message count, mailbox size).\n\nNB: mailbox is locked by server from here to 'quit()'", + "builtins.POP3.quit" => "Signoff: commit changes on server, unlock mailbox, close connection.", + "builtins.POP3.retr" => "Retrieve whole message number 'which'.\n\nResult is in form ['response', ['line', ...], octets].", + "builtins.POP3.rpop" => "Send RPOP command to access the mailbox with an alternate user.", + "builtins.POP3.rset" => "Unmark all messages marked for deletion.", + "builtins.POP3.stat" => "Get mailbox status.\n\nResult is tuple of 2 ints (message count, mailbox size)", + "builtins.POP3.stls" => "Start a TLS session on the active connection as specified in RFC 2595.\n\ncontext - a ssl.SSLContext", + "builtins.POP3.top" => "Retrieve message header of message number 'which'\nand first 'howmuch' lines of message body.\n\nResult is in form ['response', ['line', ...], octets].", + "builtins.POP3.uidl" => "Return message digest (unique id) list.\n\nIf 'which', result contains unique id for that message\nin the form 'response mesgnum uid', otherwise result is\nthe list ['response', ['mesgnum uid', ...], octets]", + "builtins.POP3.user" => "Send user name, return response\n\n(should indicate password required).", + "builtins.POP3.utf8" => "Try to enter UTF-8 mode (see RFC 6856). Returns server response.", + "builtins.Pack" => "Geometry manager Pack.\n\nBase class to use the methods pack_* in every widget.", + "builtins.Pack.__delattr__" => "Implement delattr(self, name).", + "builtins.Pack.__eq__" => "Return self==value.", + "builtins.Pack.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Pack.__ge__" => "Return self>=value.", + "builtins.Pack.__getattribute__" => "Return getattr(self, name).", + "builtins.Pack.__getstate__" => "Helper for pickle.", + "builtins.Pack.__gt__" => "Return self>value.", + "builtins.Pack.__hash__" => "Return hash(self).", + "builtins.Pack.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Pack.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Pack.__le__" => "Return self<=value.", + "builtins.Pack.__lt__" => "Return self<value.", + "builtins.Pack.__ne__" => "Return self!=value.", + "builtins.Pack.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Pack.__reduce__" => "Helper for pickle.", + "builtins.Pack.__reduce_ex__" => "Helper for pickle.", + "builtins.Pack.__repr__" => "Return repr(self).", + "builtins.Pack.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Pack.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Pack.__str__" => "Return str(self).", + "builtins.Pack.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Pack.__weakref__" => "list of weak references to the object", + "builtins.Pack.config" => "Pack a widget in the parent widget. Use as options:\nafter=widget - pack it after you have packed widget\nanchor=NSEW (or subset) - position widget according to\n given direction\nbefore=widget - pack it before you will pack widget\nexpand=bool - expand widget if parent size grows\nfill=NONE or X or Y or BOTH - fill widget if widget grows\nin=container - use the container widget to contain this widget\nin_=container - see 'in' option description\nipadx=amount - add internal padding in x direction\nipady=amount - add internal padding in y direction\npadx=amount - add padding in x direction\npady=amount - add padding in y direction\nside=TOP or BOTTOM or LEFT or RIGHT - where to add this widget.", + "builtins.Pack.configure" => "Pack a widget in the parent widget. Use as options:\nafter=widget - pack it after you have packed widget\nanchor=NSEW (or subset) - position widget according to\n given direction\nbefore=widget - pack it before you will pack widget\nexpand=bool - expand widget if parent size grows\nfill=NONE or X or Y or BOTH - fill widget if widget grows\nin=container - use the container widget to contain this widget\nin_=container - see 'in' option description\nipadx=amount - add internal padding in x direction\nipady=amount - add internal padding in y direction\npadx=amount - add padding in x direction\npady=amount - add padding in y direction\nside=TOP or BOTTOM or LEFT or RIGHT - where to add this widget.", + "builtins.Pack.forget" => "Unmap this widget and do not use it for the packing order.", + "builtins.Pack.info" => "Return information about the packing options\nfor this widget.", + "builtins.Pack.pack" => "Pack a widget in the parent widget. Use as options:\nafter=widget - pack it after you have packed widget\nanchor=NSEW (or subset) - position widget according to\n given direction\nbefore=widget - pack it before you will pack widget\nexpand=bool - expand widget if parent size grows\nfill=NONE or X or Y or BOTH - fill widget if widget grows\nin=container - use the container widget to contain this widget\nin_=container - see 'in' option description\nipadx=amount - add internal padding in x direction\nipady=amount - add internal padding in y direction\npadx=amount - add padding in x direction\npady=amount - add padding in y direction\nside=TOP or BOTTOM or LEFT or RIGHT - where to add this widget.", + "builtins.Pack.pack_configure" => "Pack a widget in the parent widget. Use as options:\nafter=widget - pack it after you have packed widget\nanchor=NSEW (or subset) - position widget according to\n given direction\nbefore=widget - pack it before you will pack widget\nexpand=bool - expand widget if parent size grows\nfill=NONE or X or Y or BOTH - fill widget if widget grows\nin=container - use the container widget to contain this widget\nin_=container - see 'in' option description\nipadx=amount - add internal padding in x direction\nipady=amount - add internal padding in y direction\npadx=amount - add padding in x direction\npady=amount - add padding in y direction\nside=TOP or BOTTOM or LEFT or RIGHT - where to add this widget.", + "builtins.Pack.pack_forget" => "Unmap this widget and do not use it for the packing order.", + "builtins.Pack.pack_info" => "Return information about the packing options\nfor this widget.", + "builtins.Pack.pack_propagate" => "Set or get the status for propagation of geometry information.\n\nA boolean argument specifies whether the size of this container will\nbe determined by the geometry information of its content.\nIf no argument is given the current setting will be returned.", + "builtins.Pack.pack_slaves" => "Returns a list of all of the content widgets in the packing order\nfor this container.", + "builtins.Pack.propagate" => "Set or get the status for propagation of geometry information.\n\nA boolean argument specifies whether the size of this container will\nbe determined by the geometry information of its content.\nIf no argument is given the current setting will be returned.", + "builtins.Pack.slaves" => "Returns a list of all of the content widgets in the packing order\nfor this container.", + "builtins.ParamSpec" => "Parameter specification variable.\n\nThe preferred way to construct a parameter specification is via the\ndedicated syntax for generic functions, classes, and type aliases,\nwhere the use of '**' creates a parameter specification::\n\n type IntFunc[**P] = Callable[P, int]\n\nThe following syntax creates a parameter specification that defaults\nto a callable accepting two positional-only arguments of types int\nand str:\n\n type IntFuncDefault[**P = [int, str]] = Callable[P, int]\n\nFor compatibility with Python 3.11 and earlier, ParamSpec objects\ncan also be created as follows::\n\n P = ParamSpec('P')\n DefaultP = ParamSpec('DefaultP', default=[int, str])\n\nParameter specification variables exist primarily for the benefit of\nstatic type checkers. They are used to forward the parameter types of\none callable to another callable, a pattern commonly found in\nhigher-order functions and decorators. They are only valid when used\nin ``Concatenate``, or as the first argument to ``Callable``, or as\nparameters for user-defined Generics. See class Generic for more\ninformation on generic types.\n\nAn example for annotating a decorator::\n\n def add_logging[**P, T](f: Callable[P, T]) -> Callable[P, T]:\n '''A type-safe decorator to add logging to a function.'''\n def inner(*args: P.args, **kwargs: P.kwargs) -> T:\n logging.info(f'{f.__name__} was called')\n return f(*args, **kwargs)\n return inner\n\n @add_logging\n def add_two(x: float, y: float) -> float:\n '''Add two numbers together.'''\n return x + y\n\nParameter specification variables can be introspected. e.g.::\n\n >>> P = ParamSpec(\"P\")\n >>> P.__name__\n 'P'\n\nNote that only parameter specification variables defined in the global\nscope can be pickled.", + "builtins.ParamSpec.__default__" => "The default value for this ParamSpec.", + "builtins.ParamSpec.__delattr__" => "Implement delattr(self, name).", + "builtins.ParamSpec.__eq__" => "Return self==value.", + "builtins.ParamSpec.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.ParamSpec.__ge__" => "Return self>=value.", + "builtins.ParamSpec.__getattribute__" => "Return getattr(self, name).", + "builtins.ParamSpec.__getstate__" => "Helper for pickle.", + "builtins.ParamSpec.__gt__" => "Return self>value.", + "builtins.ParamSpec.__hash__" => "Return hash(self).", + "builtins.ParamSpec.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.ParamSpec.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.ParamSpec.__le__" => "Return self<=value.", + "builtins.ParamSpec.__lt__" => "Return self<value.", + "builtins.ParamSpec.__ne__" => "Return self!=value.", + "builtins.ParamSpec.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.ParamSpec.__or__" => "Return self|value.", + "builtins.ParamSpec.__reduce_ex__" => "Helper for pickle.", + "builtins.ParamSpec.__repr__" => "Return repr(self).", + "builtins.ParamSpec.__ror__" => "Return value|self.", + "builtins.ParamSpec.__setattr__" => "Implement setattr(self, name, value).", + "builtins.ParamSpec.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.ParamSpec.__str__" => "Return str(self).", + "builtins.ParamSpec.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.ParamSpec.args" => "Represents positional arguments.", + "builtins.ParamSpec.kwargs" => "Represents keyword arguments.", + "builtins.ParamSpecArgs" => "The args for a ParamSpec object.\n\nGiven a ParamSpec object P, P.args is an instance of ParamSpecArgs.\n\nParamSpecArgs objects have a reference back to their ParamSpec::\n\n >>> P = ParamSpec(\"P\")\n >>> P.args.__origin__ is P\n True\n\nThis type is meant for runtime introspection and has no special meaning\nto static type checkers.", + "builtins.ParamSpecArgs.__delattr__" => "Implement delattr(self, name).", + "builtins.ParamSpecArgs.__eq__" => "Return self==value.", + "builtins.ParamSpecArgs.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.ParamSpecArgs.__ge__" => "Return self>=value.", + "builtins.ParamSpecArgs.__getattribute__" => "Return getattr(self, name).", + "builtins.ParamSpecArgs.__getstate__" => "Helper for pickle.", + "builtins.ParamSpecArgs.__gt__" => "Return self>value.", + "builtins.ParamSpecArgs.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.ParamSpecArgs.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.ParamSpecArgs.__le__" => "Return self<=value.", + "builtins.ParamSpecArgs.__lt__" => "Return self<value.", + "builtins.ParamSpecArgs.__ne__" => "Return self!=value.", + "builtins.ParamSpecArgs.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.ParamSpecArgs.__reduce__" => "Helper for pickle.", + "builtins.ParamSpecArgs.__reduce_ex__" => "Helper for pickle.", + "builtins.ParamSpecArgs.__repr__" => "Return repr(self).", + "builtins.ParamSpecArgs.__setattr__" => "Implement setattr(self, name, value).", + "builtins.ParamSpecArgs.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.ParamSpecArgs.__str__" => "Return str(self).", + "builtins.ParamSpecArgs.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.ParamSpecKwargs" => "The kwargs for a ParamSpec object.\n\nGiven a ParamSpec object P, P.kwargs is an instance of ParamSpecKwargs.\n\nParamSpecKwargs objects have a reference back to their ParamSpec::\n\n >>> P = ParamSpec(\"P\")\n >>> P.kwargs.__origin__ is P\n True\n\nThis type is meant for runtime introspection and has no special meaning\nto static type checkers.", + "builtins.ParamSpecKwargs.__delattr__" => "Implement delattr(self, name).", + "builtins.ParamSpecKwargs.__eq__" => "Return self==value.", + "builtins.ParamSpecKwargs.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.ParamSpecKwargs.__ge__" => "Return self>=value.", + "builtins.ParamSpecKwargs.__getattribute__" => "Return getattr(self, name).", + "builtins.ParamSpecKwargs.__getstate__" => "Helper for pickle.", + "builtins.ParamSpecKwargs.__gt__" => "Return self>value.", + "builtins.ParamSpecKwargs.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.ParamSpecKwargs.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.ParamSpecKwargs.__le__" => "Return self<=value.", + "builtins.ParamSpecKwargs.__lt__" => "Return self<value.", + "builtins.ParamSpecKwargs.__ne__" => "Return self!=value.", + "builtins.ParamSpecKwargs.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.ParamSpecKwargs.__reduce__" => "Helper for pickle.", + "builtins.ParamSpecKwargs.__reduce_ex__" => "Helper for pickle.", + "builtins.ParamSpecKwargs.__repr__" => "Return repr(self).", + "builtins.ParamSpecKwargs.__setattr__" => "Implement setattr(self, name, value).", + "builtins.ParamSpecKwargs.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.ParamSpecKwargs.__str__" => "Return str(self).", + "builtins.ParamSpecKwargs.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Parameter" => "Represents a parameter in a function signature.\n\nHas the following public attributes:\n\n* name : str\n The name of the parameter as a string.\n* default : object\n The default value for the parameter if specified. If the\n parameter has no default value, this attribute is set to\n `Parameter.empty`.\n* annotation\n The annotation for the parameter if specified. If the\n parameter has no annotation, this attribute is set to\n `Parameter.empty`.\n* kind\n Describes how argument values are bound to the parameter.\n Possible values: `Parameter.POSITIONAL_ONLY`,\n `Parameter.POSITIONAL_OR_KEYWORD`, `Parameter.VAR_POSITIONAL`,\n `Parameter.KEYWORD_ONLY`, `Parameter.VAR_KEYWORD`.\n Every value has a `description` attribute describing meaning.", + "builtins.Parameter.__delattr__" => "Implement delattr(self, name).", + "builtins.Parameter.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Parameter.__ge__" => "Return self>=value.", + "builtins.Parameter.__getattribute__" => "Return getattr(self, name).", + "builtins.Parameter.__getstate__" => "Helper for pickle.", + "builtins.Parameter.__gt__" => "Return self>value.", + "builtins.Parameter.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Parameter.__le__" => "Return self<=value.", + "builtins.Parameter.__lt__" => "Return self<value.", + "builtins.Parameter.__ne__" => "Return self!=value.", + "builtins.Parameter.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Parameter.__reduce_ex__" => "Helper for pickle.", + "builtins.Parameter.__replace__" => "Creates a customized copy of the Parameter.", + "builtins.Parameter.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Parameter.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Parameter.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Parameter.empty" => "Marker object for Signature.empty and Parameter.empty.", + "builtins.Parameter.empty.__delattr__" => "Implement delattr(self, name).", + "builtins.Parameter.empty.__eq__" => "Return self==value.", + "builtins.Parameter.empty.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Parameter.empty.__ge__" => "Return self>=value.", + "builtins.Parameter.empty.__getattribute__" => "Return getattr(self, name).", + "builtins.Parameter.empty.__getstate__" => "Helper for pickle.", + "builtins.Parameter.empty.__gt__" => "Return self>value.", + "builtins.Parameter.empty.__hash__" => "Return hash(self).", + "builtins.Parameter.empty.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Parameter.empty.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Parameter.empty.__le__" => "Return self<=value.", + "builtins.Parameter.empty.__lt__" => "Return self<value.", + "builtins.Parameter.empty.__ne__" => "Return self!=value.", + "builtins.Parameter.empty.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Parameter.empty.__reduce__" => "Helper for pickle.", + "builtins.Parameter.empty.__reduce_ex__" => "Helper for pickle.", + "builtins.Parameter.empty.__repr__" => "Return repr(self).", + "builtins.Parameter.empty.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Parameter.empty.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Parameter.empty.__str__" => "Return str(self).", + "builtins.Parameter.empty.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Parameter.empty.__weakref__" => "list of weak references to the object", + "builtins.Parameter.replace" => "Creates a customized copy of the Parameter.", + "builtins.ParserBase" => "Parser base class which provides some common support methods used\nby the SGML/HTML and XHTML parsers.", + "builtins.ParserBase.__delattr__" => "Implement delattr(self, name).", + "builtins.ParserBase.__eq__" => "Return self==value.", + "builtins.ParserBase.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.ParserBase.__ge__" => "Return self>=value.", + "builtins.ParserBase.__getattribute__" => "Return getattr(self, name).", + "builtins.ParserBase.__getstate__" => "Helper for pickle.", + "builtins.ParserBase.__gt__" => "Return self>value.", + "builtins.ParserBase.__hash__" => "Return hash(self).", + "builtins.ParserBase.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.ParserBase.__le__" => "Return self<=value.", + "builtins.ParserBase.__lt__" => "Return self<value.", + "builtins.ParserBase.__ne__" => "Return self!=value.", + "builtins.ParserBase.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.ParserBase.__reduce__" => "Helper for pickle.", + "builtins.ParserBase.__reduce_ex__" => "Helper for pickle.", + "builtins.ParserBase.__repr__" => "Return repr(self).", + "builtins.ParserBase.__setattr__" => "Implement setattr(self, name, value).", + "builtins.ParserBase.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.ParserBase.__str__" => "Return str(self).", + "builtins.ParserBase.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.ParserBase.__weakref__" => "list of weak references to the object", + "builtins.ParserBase.getpos" => "Return current line number and offset.", + "builtins.Path" => "A :class:`importlib.resources.abc.Traversable` interface for zip files.\n\nImplements many of the features users enjoy from\n:class:`pathlib.Path`.\n\nConsider a zip file with this structure::\n\n .\n ├── a.txt\n └── b\n ├── c.txt\n └── d\n └── e.txt\n\n>>> data = io.BytesIO()\n>>> zf = ZipFile(data, 'w')\n>>> zf.writestr('a.txt', 'content of a')\n>>> zf.writestr('b/c.txt', 'content of c')\n>>> zf.writestr('b/d/e.txt', 'content of e')\n>>> zf.filename = 'mem/abcde.zip'\n\nPath accepts the zipfile object itself or a filename\n\n>>> path = Path(zf)\n\nFrom there, several path operations are available.\n\nDirectory iteration (including the zip file itself):\n\n>>> a, b = path.iterdir()\n>>> a\nPath('mem/abcde.zip', 'a.txt')\n>>> b\nPath('mem/abcde.zip', 'b/')\n\nname property:\n\n>>> b.name\n'b'\n\njoin with divide operator:\n\n>>> c = b / 'c.txt'\n>>> c\nPath('mem/abcde.zip', 'b/c.txt')\n>>> c.name\n'c.txt'\n\nRead text:\n\n>>> c.read_text(encoding='utf-8')\n'content of c'\n\nexistence:\n\n>>> c.exists()\nTrue\n>>> (b / 'missing.txt').exists()\nFalse\n\nCoercion to string:\n\n>>> import os\n>>> str(c).replace(os.sep, posixpath.sep)\n'mem/abcde.zip/b/c.txt'\n\nAt the root, ``name``, ``filename``, and ``parent``\nresolve to the zipfile.\n\n>>> str(path)\n'mem/abcde.zip/'\n>>> path.name\n'abcde.zip'\n>>> path.filename == pathlib.Path('mem/abcde.zip')\nTrue\n>>> str(path.parent)\n'mem'\n\nIf the zipfile has no filename, such attributes are not\nvalid and accessing them will raise an Exception.\n\n>>> zf.filename = None\n>>> path.name\nTraceback (most recent call last):\n...\nTypeError: ...\n\n>>> path.filename\nTraceback (most recent call last):\n...\nTypeError: ...\n\n>>> path.parent\nTraceback (most recent call last):\n...\nTypeError: ...\n\n# workaround python/cpython#106763\n>>> pass", + "builtins.Path.__delattr__" => "Implement delattr(self, name).", + "builtins.Path.__eq__" => ">>> Path(zipfile.ZipFile(io.BytesIO(), 'w')) == 'foo'\nFalse", + "builtins.Path.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Path.__ge__" => "Return self>=value.", + "builtins.Path.__getattribute__" => "Return getattr(self, name).", + "builtins.Path.__getstate__" => "Helper for pickle.", + "builtins.Path.__gt__" => "Return self>value.", + "builtins.Path.__init__" => "Construct a Path from a ZipFile or filename.\n\nNote: When the source is an existing ZipFile object,\nits type (__class__) will be mutated to a\nspecialized type. If the caller wishes to retain the\noriginal type, the caller should either create a\nseparate ZipFile object or pass a filename.", + "builtins.Path.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Path.__le__" => "Return self<=value.", + "builtins.Path.__lt__" => "Return self<value.", + "builtins.Path.__ne__" => "Return self!=value.", + "builtins.Path.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Path.__reduce__" => "Helper for pickle.", + "builtins.Path.__reduce_ex__" => "Helper for pickle.", + "builtins.Path.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Path.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Path.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Path.__weakref__" => "list of weak references to the object", + "builtins.Path.is_symlink" => "Return whether this path is a symlink.", + "builtins.Path.open" => "Open this entry as text or binary following the semantics\nof ``pathlib.Path.open()`` by passing arguments through\nto io.TextIOWrapper().", + "builtins.PathFinder" => "Meta path finder for sys.path and package __path__ attributes.", + "builtins.PathFinder.__delattr__" => "Implement delattr(self, name).", + "builtins.PathFinder.__eq__" => "Return self==value.", + "builtins.PathFinder.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.PathFinder.__ge__" => "Return self>=value.", + "builtins.PathFinder.__getattribute__" => "Return getattr(self, name).", + "builtins.PathFinder.__getstate__" => "Helper for pickle.", + "builtins.PathFinder.__gt__" => "Return self>value.", + "builtins.PathFinder.__hash__" => "Return hash(self).", + "builtins.PathFinder.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.PathFinder.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.PathFinder.__le__" => "Return self<=value.", + "builtins.PathFinder.__lt__" => "Return self<value.", + "builtins.PathFinder.__ne__" => "Return self!=value.", + "builtins.PathFinder.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.PathFinder.__reduce__" => "Helper for pickle.", + "builtins.PathFinder.__reduce_ex__" => "Helper for pickle.", + "builtins.PathFinder.__repr__" => "Return repr(self).", + "builtins.PathFinder.__setattr__" => "Implement setattr(self, name, value).", + "builtins.PathFinder.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.PathFinder.__str__" => "Return str(self).", + "builtins.PathFinder.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.PathFinder.__weakref__" => "list of weak references to the object", + "builtins.PathFinder._get_spec" => "Find the loader or namespace_path for this module/package name.", + "builtins.PathFinder._path_hooks" => "Search sys.path_hooks for a finder for 'path'.", + "builtins.PathFinder._path_importer_cache" => "Get the finder for the path entry from sys.path_importer_cache.\n\nIf the path entry is not in the cache, find the appropriate finder\nand cache it. If no finder is available, store None.", + "builtins.PathFinder.find_distributions" => "Find distributions.\n\nReturn an iterable of all Distribution instances capable of\nloading the metadata for packages matching ``context.name``\n(or all names if ``None`` indicated) along the paths in the list\nof directories ``context.path``.", + "builtins.PathFinder.find_spec" => "Try to find a spec for 'fullname' on sys.path or 'path'.\n\nThe search is based on sys.path_hooks and sys.path_importer_cache.", + "builtins.PathFinder.invalidate_caches" => "Call the invalidate_caches() method on all path entry finders\nstored in sys.path_importer_cache (where implemented).", + "builtins.Pattern" => "Compiled regular expression object.", + "builtins.Pattern.__class_getitem__" => "Patterns are generic over the type of string they handle (str or bytes)", + "builtins.Pattern.__delattr__" => "Implement delattr(self, name).", + "builtins.Pattern.__eq__" => "Return self==value.", + "builtins.Pattern.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Pattern.__ge__" => "Return self>=value.", + "builtins.Pattern.__getattribute__" => "Return getattr(self, name).", + "builtins.Pattern.__getstate__" => "Helper for pickle.", + "builtins.Pattern.__gt__" => "Return self>value.", + "builtins.Pattern.__hash__" => "Return hash(self).", + "builtins.Pattern.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Pattern.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Pattern.__le__" => "Return self<=value.", + "builtins.Pattern.__lt__" => "Return self<value.", + "builtins.Pattern.__ne__" => "Return self!=value.", + "builtins.Pattern.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Pattern.__reduce__" => "Helper for pickle.", + "builtins.Pattern.__reduce_ex__" => "Helper for pickle.", + "builtins.Pattern.__repr__" => "Return repr(self).", + "builtins.Pattern.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Pattern.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Pattern.__str__" => "Return str(self).", + "builtins.Pattern.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Pattern.findall" => "Return a list of all non-overlapping matches of pattern in string.", + "builtins.Pattern.finditer" => "Return an iterator over all non-overlapping matches for the RE pattern in string.\n\nFor each match, the iterator returns a match object.", + "builtins.Pattern.flags" => "The regex matching flags.", + "builtins.Pattern.fullmatch" => "Matches against all of the string.", + "builtins.Pattern.groupindex" => "A dictionary mapping group names to group numbers.", + "builtins.Pattern.groups" => "The number of capturing groups in the pattern.", + "builtins.Pattern.match" => "Matches zero or more characters at the beginning of the string.", + "builtins.Pattern.pattern" => "The pattern string from which the RE object was compiled.", + "builtins.Pattern.search" => "Scan through string looking for a match, and return a corresponding match object instance.\n\nReturn None if no position in the string matches.", + "builtins.Pattern.split" => "Split string by the occurrences of pattern.", + "builtins.Pattern.sub" => "Return the string obtained by replacing the leftmost non-overlapping occurrences of pattern in string by the replacement repl.", + "builtins.Pattern.subn" => "Return the tuple (new_string, number_of_subs_made) found by replacing the leftmost non-overlapping occurrences of pattern with the replacement repl.", + "builtins.Pdata.__delattr__" => "Implement delattr(self, name).", + "builtins.Pdata.__eq__" => "Return self==value.", + "builtins.Pdata.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Pdata.__ge__" => "Return self>=value.", + "builtins.Pdata.__getattribute__" => "Return getattr(self, name).", + "builtins.Pdata.__getstate__" => "Helper for pickle.", + "builtins.Pdata.__gt__" => "Return self>value.", + "builtins.Pdata.__hash__" => "Return hash(self).", + "builtins.Pdata.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Pdata.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Pdata.__le__" => "Return self<=value.", + "builtins.Pdata.__lt__" => "Return self<value.", + "builtins.Pdata.__ne__" => "Return self!=value.", + "builtins.Pdata.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Pdata.__reduce__" => "Helper for pickle.", + "builtins.Pdata.__reduce_ex__" => "Helper for pickle.", + "builtins.Pdata.__repr__" => "Return repr(self).", + "builtins.Pdata.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Pdata.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Pdata.__str__" => "Return str(self).", + "builtins.Pdata.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.PendingDeprecationWarning" => "Base class for warnings about features which will be deprecated\nin the future.", "builtins.PendingDeprecationWarning.__delattr__" => "Implement delattr(self, name).", "builtins.PendingDeprecationWarning.__eq__" => "Return self==value.", @@ -10800,6 +16501,28 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.PendingDeprecationWarning.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.PendingDeprecationWarning.add_note" => "Add a note to the exception", "builtins.PendingDeprecationWarning.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.PercentStyle.__delattr__" => "Implement delattr(self, name).", + "builtins.PercentStyle.__eq__" => "Return self==value.", + "builtins.PercentStyle.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.PercentStyle.__ge__" => "Return self>=value.", + "builtins.PercentStyle.__getattribute__" => "Return getattr(self, name).", + "builtins.PercentStyle.__getstate__" => "Helper for pickle.", + "builtins.PercentStyle.__gt__" => "Return self>value.", + "builtins.PercentStyle.__hash__" => "Return hash(self).", + "builtins.PercentStyle.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.PercentStyle.__le__" => "Return self<=value.", + "builtins.PercentStyle.__lt__" => "Return self<value.", + "builtins.PercentStyle.__ne__" => "Return self!=value.", + "builtins.PercentStyle.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.PercentStyle.__reduce__" => "Helper for pickle.", + "builtins.PercentStyle.__reduce_ex__" => "Helper for pickle.", + "builtins.PercentStyle.__repr__" => "Return repr(self).", + "builtins.PercentStyle.__setattr__" => "Implement setattr(self, name, value).", + "builtins.PercentStyle.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.PercentStyle.__str__" => "Return str(self).", + "builtins.PercentStyle.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.PercentStyle.__weakref__" => "list of weak references to the object", + "builtins.PercentStyle.validate" => "Validate the input format, ensure it matches the correct style", "builtins.PermissionError" => "Not enough permissions.", "builtins.PermissionError.__delattr__" => "Implement delattr(self, name).", "builtins.PermissionError.__eq__" => "Return self==value.", @@ -10828,6 +16551,285 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.PermissionError.strerror" => "exception strerror", "builtins.PermissionError.winerror" => "Win32 exception code", "builtins.PermissionError.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.PickleBuffer" => "Wrapper for potentially out-of-band buffers", + "builtins.PickleBuffer.__buffer__" => "Return a buffer object that exposes the underlying memory of the object.", + "builtins.PickleBuffer.__delattr__" => "Implement delattr(self, name).", + "builtins.PickleBuffer.__eq__" => "Return self==value.", + "builtins.PickleBuffer.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.PickleBuffer.__ge__" => "Return self>=value.", + "builtins.PickleBuffer.__getattribute__" => "Return getattr(self, name).", + "builtins.PickleBuffer.__getstate__" => "Helper for pickle.", + "builtins.PickleBuffer.__gt__" => "Return self>value.", + "builtins.PickleBuffer.__hash__" => "Return hash(self).", + "builtins.PickleBuffer.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.PickleBuffer.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.PickleBuffer.__le__" => "Return self<=value.", + "builtins.PickleBuffer.__lt__" => "Return self<value.", + "builtins.PickleBuffer.__ne__" => "Return self!=value.", + "builtins.PickleBuffer.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.PickleBuffer.__reduce__" => "Helper for pickle.", + "builtins.PickleBuffer.__reduce_ex__" => "Helper for pickle.", + "builtins.PickleBuffer.__release_buffer__" => "Release the buffer object that exposes the underlying memory of the object.", + "builtins.PickleBuffer.__repr__" => "Return repr(self).", + "builtins.PickleBuffer.__setattr__" => "Implement setattr(self, name, value).", + "builtins.PickleBuffer.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.PickleBuffer.__str__" => "Return str(self).", + "builtins.PickleBuffer.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.PickleBuffer.raw" => "Return a memoryview of the raw memory underlying this buffer.\nWill raise BufferError is the buffer isn't contiguous.", + "builtins.PickleBuffer.release" => "Release the underlying buffer exposed by the PickleBuffer object.", + "builtins.Pickler" => "This takes a binary file for writing a pickle data stream.\n\nThe optional *protocol* argument tells the pickler to use the given\nprotocol; supported protocols are 0, 1, 2, 3, 4 and 5. The default\nprotocol is 5. It was introduced in Python 3.8, and is incompatible\nwith previous versions.\n\nSpecifying a negative protocol version selects the highest protocol\nversion supported. The higher the protocol used, the more recent the\nversion of Python needed to read the pickle produced.\n\nThe *file* argument must have a write() method that accepts a single\nbytes argument. It can thus be a file object opened for binary\nwriting, an io.BytesIO instance, or any other custom object that meets\nthis interface.\n\nIf *fix_imports* is True and protocol is less than 3, pickle will try\nto map the new Python 3 names to the old module names used in Python\n2, so that the pickle data stream is readable with Python 2.\n\nIf *buffer_callback* is None (the default), buffer views are\nserialized into *file* as part of the pickle stream.\n\nIf *buffer_callback* is not None, then it can be called any number\nof times with a buffer view. If the callback returns a false value\n(such as None), the given buffer is out-of-band; otherwise the\nbuffer is serialized in-band, i.e. inside the pickle stream.\n\nIt is an error if *buffer_callback* is not None and *protocol*\nis None or smaller than 5.", + "builtins.Pickler.__delattr__" => "Implement delattr(self, name).", + "builtins.Pickler.__eq__" => "Return self==value.", + "builtins.Pickler.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Pickler.__ge__" => "Return self>=value.", + "builtins.Pickler.__getattribute__" => "Return getattr(self, name).", + "builtins.Pickler.__getstate__" => "Helper for pickle.", + "builtins.Pickler.__gt__" => "Return self>value.", + "builtins.Pickler.__hash__" => "Return hash(self).", + "builtins.Pickler.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Pickler.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Pickler.__le__" => "Return self<=value.", + "builtins.Pickler.__lt__" => "Return self<value.", + "builtins.Pickler.__ne__" => "Return self!=value.", + "builtins.Pickler.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Pickler.__reduce__" => "Helper for pickle.", + "builtins.Pickler.__reduce_ex__" => "Helper for pickle.", + "builtins.Pickler.__repr__" => "Return repr(self).", + "builtins.Pickler.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Pickler.__sizeof__" => "Returns size in memory, in bytes.", + "builtins.Pickler.__str__" => "Return str(self).", + "builtins.Pickler.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Pickler.clear_memo" => "Clears the pickler's \"memo\".\n\nThe memo is the data structure that remembers which objects the\npickler has already seen, so that shared or recursive objects are\npickled by reference and not by value. This method is useful when\nre-using picklers.", + "builtins.Pickler.dump" => "Write a pickled representation of the given object to the open file.", + "builtins.PicklerMemoProxy.__delattr__" => "Implement delattr(self, name).", + "builtins.PicklerMemoProxy.__eq__" => "Return self==value.", + "builtins.PicklerMemoProxy.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.PicklerMemoProxy.__ge__" => "Return self>=value.", + "builtins.PicklerMemoProxy.__getattribute__" => "Return getattr(self, name).", + "builtins.PicklerMemoProxy.__getstate__" => "Helper for pickle.", + "builtins.PicklerMemoProxy.__gt__" => "Return self>value.", + "builtins.PicklerMemoProxy.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.PicklerMemoProxy.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.PicklerMemoProxy.__le__" => "Return self<=value.", + "builtins.PicklerMemoProxy.__lt__" => "Return self<value.", + "builtins.PicklerMemoProxy.__ne__" => "Return self!=value.", + "builtins.PicklerMemoProxy.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.PicklerMemoProxy.__reduce__" => "Implement pickle support.", + "builtins.PicklerMemoProxy.__reduce_ex__" => "Helper for pickle.", + "builtins.PicklerMemoProxy.__repr__" => "Return repr(self).", + "builtins.PicklerMemoProxy.__setattr__" => "Implement setattr(self, name, value).", + "builtins.PicklerMemoProxy.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.PicklerMemoProxy.__str__" => "Return str(self).", + "builtins.PicklerMemoProxy.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.PicklerMemoProxy.clear" => "Remove all items from memo.", + "builtins.PicklerMemoProxy.copy" => "Copy the memo to a new object.", + "builtins.PipeHandle" => "Wrapper for an overlapped pipe handle which is vaguely file-object like.\n\nThe IOCP event loop can use these instead of socket objects.", + "builtins.PipeHandle.__delattr__" => "Implement delattr(self, name).", + "builtins.PipeHandle.__eq__" => "Return self==value.", + "builtins.PipeHandle.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.PipeHandle.__ge__" => "Return self>=value.", + "builtins.PipeHandle.__getattribute__" => "Return getattr(self, name).", + "builtins.PipeHandle.__getstate__" => "Helper for pickle.", + "builtins.PipeHandle.__gt__" => "Return self>value.", + "builtins.PipeHandle.__hash__" => "Return hash(self).", + "builtins.PipeHandle.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.PipeHandle.__le__" => "Return self<=value.", + "builtins.PipeHandle.__lt__" => "Return self<value.", + "builtins.PipeHandle.__ne__" => "Return self!=value.", + "builtins.PipeHandle.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.PipeHandle.__reduce__" => "Helper for pickle.", + "builtins.PipeHandle.__reduce_ex__" => "Helper for pickle.", + "builtins.PipeHandle.__setattr__" => "Implement setattr(self, name, value).", + "builtins.PipeHandle.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.PipeHandle.__str__" => "Return str(self).", + "builtins.PipeHandle.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.PipeHandle.__weakref__" => "list of weak references to the object", + "builtins.PipeServer" => "Class representing a pipe server.\n\nThis is much like a bound, listening socket.", + "builtins.PipeServer.__delattr__" => "Implement delattr(self, name).", + "builtins.PipeServer.__eq__" => "Return self==value.", + "builtins.PipeServer.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.PipeServer.__ge__" => "Return self>=value.", + "builtins.PipeServer.__getattribute__" => "Return getattr(self, name).", + "builtins.PipeServer.__getstate__" => "Helper for pickle.", + "builtins.PipeServer.__gt__" => "Return self>value.", + "builtins.PipeServer.__hash__" => "Return hash(self).", + "builtins.PipeServer.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.PipeServer.__le__" => "Return self<=value.", + "builtins.PipeServer.__lt__" => "Return self<value.", + "builtins.PipeServer.__ne__" => "Return self!=value.", + "builtins.PipeServer.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.PipeServer.__reduce__" => "Helper for pickle.", + "builtins.PipeServer.__reduce_ex__" => "Helper for pickle.", + "builtins.PipeServer.__repr__" => "Return repr(self).", + "builtins.PipeServer.__setattr__" => "Implement setattr(self, name, value).", + "builtins.PipeServer.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.PipeServer.__str__" => "Return str(self).", + "builtins.PipeServer.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.PipeServer.__weakref__" => "list of weak references to the object", + "builtins.Place" => "Geometry manager Place.\n\nBase class to use the methods place_* in every widget.", + "builtins.Place.__delattr__" => "Implement delattr(self, name).", + "builtins.Place.__eq__" => "Return self==value.", + "builtins.Place.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Place.__ge__" => "Return self>=value.", + "builtins.Place.__getattribute__" => "Return getattr(self, name).", + "builtins.Place.__getstate__" => "Helper for pickle.", + "builtins.Place.__gt__" => "Return self>value.", + "builtins.Place.__hash__" => "Return hash(self).", + "builtins.Place.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Place.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Place.__le__" => "Return self<=value.", + "builtins.Place.__lt__" => "Return self<value.", + "builtins.Place.__ne__" => "Return self!=value.", + "builtins.Place.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Place.__reduce__" => "Helper for pickle.", + "builtins.Place.__reduce_ex__" => "Helper for pickle.", + "builtins.Place.__repr__" => "Return repr(self).", + "builtins.Place.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Place.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Place.__str__" => "Return str(self).", + "builtins.Place.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Place.__weakref__" => "list of weak references to the object", + "builtins.Place.config" => "Place a widget in the parent widget. Use as options:\nin=container - the container widget relative to which this widget is\n placed\nin_=container - see 'in' option description\nx=amount - locate anchor of this widget at position x of the\n container widget\ny=amount - locate anchor of this widget at position y of the\n container widget\nrelx=amount - locate anchor of this widget between 0.0 and 1.0\n relative to width of the container widget (1.0 is\n right edge)\nrely=amount - locate anchor of this widget between 0.0 and 1.0\n relative to height of the container widget (1.0 is\n bottom edge)\nanchor=NSEW (or subset) - position anchor according to given\n direction\nwidth=amount - width of this widget in pixel\nheight=amount - height of this widget in pixel\nrelwidth=amount - width of this widget between 0.0 and 1.0\n relative to width of the container widget (1.0 is\n the same width as the container widget)\nrelheight=amount - height of this widget between 0.0 and 1.0\n relative to height of the container widget (1.0\n is the same height as the container widget)\nbordermode=\"inside\" or \"outside\" - whether to take border width of\n the container widget into account", + "builtins.Place.configure" => "Place a widget in the parent widget. Use as options:\nin=container - the container widget relative to which this widget is\n placed\nin_=container - see 'in' option description\nx=amount - locate anchor of this widget at position x of the\n container widget\ny=amount - locate anchor of this widget at position y of the\n container widget\nrelx=amount - locate anchor of this widget between 0.0 and 1.0\n relative to width of the container widget (1.0 is\n right edge)\nrely=amount - locate anchor of this widget between 0.0 and 1.0\n relative to height of the container widget (1.0 is\n bottom edge)\nanchor=NSEW (or subset) - position anchor according to given\n direction\nwidth=amount - width of this widget in pixel\nheight=amount - height of this widget in pixel\nrelwidth=amount - width of this widget between 0.0 and 1.0\n relative to width of the container widget (1.0 is\n the same width as the container widget)\nrelheight=amount - height of this widget between 0.0 and 1.0\n relative to height of the container widget (1.0\n is the same height as the container widget)\nbordermode=\"inside\" or \"outside\" - whether to take border width of\n the container widget into account", + "builtins.Place.forget" => "Unmap this widget.", + "builtins.Place.info" => "Return information about the placing options\nfor this widget.", + "builtins.Place.place" => "Place a widget in the parent widget. Use as options:\nin=container - the container widget relative to which this widget is\n placed\nin_=container - see 'in' option description\nx=amount - locate anchor of this widget at position x of the\n container widget\ny=amount - locate anchor of this widget at position y of the\n container widget\nrelx=amount - locate anchor of this widget between 0.0 and 1.0\n relative to width of the container widget (1.0 is\n right edge)\nrely=amount - locate anchor of this widget between 0.0 and 1.0\n relative to height of the container widget (1.0 is\n bottom edge)\nanchor=NSEW (or subset) - position anchor according to given\n direction\nwidth=amount - width of this widget in pixel\nheight=amount - height of this widget in pixel\nrelwidth=amount - width of this widget between 0.0 and 1.0\n relative to width of the container widget (1.0 is\n the same width as the container widget)\nrelheight=amount - height of this widget between 0.0 and 1.0\n relative to height of the container widget (1.0\n is the same height as the container widget)\nbordermode=\"inside\" or \"outside\" - whether to take border width of\n the container widget into account", + "builtins.Place.place_configure" => "Place a widget in the parent widget. Use as options:\nin=container - the container widget relative to which this widget is\n placed\nin_=container - see 'in' option description\nx=amount - locate anchor of this widget at position x of the\n container widget\ny=amount - locate anchor of this widget at position y of the\n container widget\nrelx=amount - locate anchor of this widget between 0.0 and 1.0\n relative to width of the container widget (1.0 is\n right edge)\nrely=amount - locate anchor of this widget between 0.0 and 1.0\n relative to height of the container widget (1.0 is\n bottom edge)\nanchor=NSEW (or subset) - position anchor according to given\n direction\nwidth=amount - width of this widget in pixel\nheight=amount - height of this widget in pixel\nrelwidth=amount - width of this widget between 0.0 and 1.0\n relative to width of the container widget (1.0 is\n the same width as the container widget)\nrelheight=amount - height of this widget between 0.0 and 1.0\n relative to height of the container widget (1.0\n is the same height as the container widget)\nbordermode=\"inside\" or \"outside\" - whether to take border width of\n the container widget into account", + "builtins.Place.place_forget" => "Unmap this widget.", + "builtins.Place.place_info" => "Return information about the placing options\nfor this widget.", + "builtins.Place.place_slaves" => "Returns a list of all the content widgets for which this widget is\nthe container.", + "builtins.Place.slaves" => "Returns a list of all the content widgets for which this widget is\nthe container.", + "builtins.PlaceHolder" => "PlaceHolder instances are used in the Manager logger hierarchy to take\nthe place of nodes for which no loggers have been defined. This class is\nintended for internal use only and not as part of the public API.", + "builtins.PlaceHolder.__delattr__" => "Implement delattr(self, name).", + "builtins.PlaceHolder.__eq__" => "Return self==value.", + "builtins.PlaceHolder.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.PlaceHolder.__ge__" => "Return self>=value.", + "builtins.PlaceHolder.__getattribute__" => "Return getattr(self, name).", + "builtins.PlaceHolder.__getstate__" => "Helper for pickle.", + "builtins.PlaceHolder.__gt__" => "Return self>value.", + "builtins.PlaceHolder.__hash__" => "Return hash(self).", + "builtins.PlaceHolder.__init__" => "Initialize with the specified logger being a child of this placeholder.", + "builtins.PlaceHolder.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.PlaceHolder.__le__" => "Return self<=value.", + "builtins.PlaceHolder.__lt__" => "Return self<value.", + "builtins.PlaceHolder.__ne__" => "Return self!=value.", + "builtins.PlaceHolder.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.PlaceHolder.__reduce__" => "Helper for pickle.", + "builtins.PlaceHolder.__reduce_ex__" => "Helper for pickle.", + "builtins.PlaceHolder.__repr__" => "Return repr(self).", + "builtins.PlaceHolder.__setattr__" => "Implement setattr(self, name, value).", + "builtins.PlaceHolder.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.PlaceHolder.__str__" => "Return str(self).", + "builtins.PlaceHolder.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.PlaceHolder.__weakref__" => "list of weak references to the object", + "builtins.PlaceHolder.append" => "Add the specified logger as a child of this placeholder.", + "builtins.Popen" => "Execute a child program in a new process.\n\nFor a complete description of the arguments see the Python documentation.\n\nArguments:\n args: A string, or a sequence of program arguments.\n\n bufsize: supplied as the buffering argument to the open() function when\n creating the stdin/stdout/stderr pipe file objects\n\n executable: A replacement program to execute.\n\n stdin, stdout and stderr: These specify the executed programs' standard\n input, standard output and standard error file handles, respectively.\n\n preexec_fn: (POSIX only) An object to be called in the child process\n just before the child is executed.\n\n close_fds: Controls closing or inheriting of file descriptors.\n\n shell: If true, the command will be executed through the shell.\n\n cwd: Sets the current directory before the child is executed.\n\n env: Defines the environment variables for the new process.\n\n text: If true, decode stdin, stdout and stderr using the given encoding\n (if set) or the system default otherwise.\n\n universal_newlines: Alias of text, provided for backwards compatibility.\n\n startupinfo and creationflags (Windows only)\n\n restore_signals (POSIX only)\n\n start_new_session (POSIX only)\n\n process_group (POSIX only)\n\n group (POSIX only)\n\n extra_groups (POSIX only)\n\n user (POSIX only)\n\n umask (POSIX only)\n\n pass_fds (POSIX only)\n\n encoding and errors: Text mode encoding and error handling to use for\n file objects stdin, stdout and stderr.\n\nAttributes:\n stdin, stdout, stderr, pid, returncode", + "builtins.Popen.__class_getitem__" => "Represent a PEP 585 generic type\n\nE.g. for t = list[int], t.__origin__ is list and t.__args__ is (int,).", + "builtins.Popen.__delattr__" => "Implement delattr(self, name).", + "builtins.Popen.__eq__" => "Return self==value.", + "builtins.Popen.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Popen.__ge__" => "Return self>=value.", + "builtins.Popen.__getattribute__" => "Return getattr(self, name).", + "builtins.Popen.__getstate__" => "Helper for pickle.", + "builtins.Popen.__gt__" => "Return self>value.", + "builtins.Popen.__hash__" => "Return hash(self).", + "builtins.Popen.__init__" => "Create new Popen instance.", + "builtins.Popen.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Popen.__le__" => "Return self<=value.", + "builtins.Popen.__lt__" => "Return self<value.", + "builtins.Popen.__ne__" => "Return self!=value.", + "builtins.Popen.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Popen.__reduce__" => "Helper for pickle.", + "builtins.Popen.__reduce_ex__" => "Helper for pickle.", + "builtins.Popen.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Popen.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Popen.__str__" => "Return str(self).", + "builtins.Popen.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Popen.__weakref__" => "list of weak references to the object", + "builtins.Popen._check_timeout" => "Convenience for checking if a timeout has expired.", + "builtins.Popen._execute_child" => "Execute program (MS Windows version)", + "builtins.Popen._filter_handle_list" => "Filter out console handles that can't be used\nin lpAttributeList[\"handle_list\"] and make sure the list\nisn't empty. This also removes duplicate handles.", + "builtins.Popen._get_handles" => "Construct and return tuple with IO objects:\np2cread, p2cwrite, c2pread, c2pwrite, errread, errwrite", + "builtins.Popen._handle_exitstatus" => "All callers to this function MUST hold self._waitpid_lock.", + "builtins.Popen._internal_poll" => "Check if child process has terminated. Returns returncode\nattribute.\n\nThis method is called by __del__, so it can only refer to objects\nin its local scope.", + "builtins.Popen._make_inheritable" => "Return a duplicate of handle, which is inheritable", + "builtins.Popen._on_error_fd_closer" => "Helper to ensure file descriptors opened in _get_handles are closed", + "builtins.Popen._posix_spawn" => "Execute program using os.posix_spawn().", + "builtins.Popen._remaining_time" => "Convenience for _communicate when computing timeouts.", + "builtins.Popen._try_wait" => "All callers to this function MUST hold self._waitpid_lock.", + "builtins.Popen._wait" => "Internal implementation of wait() on Windows.", + "builtins.Popen.communicate" => "Interact with process: Send data to stdin and close it.\nRead data from stdout and stderr, until end-of-file is\nreached. Wait for process to terminate.\n\nThe optional \"input\" argument should be data to be sent to the\nchild process, or None, if no data should be sent to the child.\ncommunicate() returns a tuple (stdout, stderr).\n\nBy default, all communication is in bytes, and therefore any\n\"input\" should be bytes, and the (stdout, stderr) will be bytes.\nIf in text mode (indicated by self.text_mode), any \"input\" should\nbe a string, and (stdout, stderr) will be strings decoded\naccording to locale encoding, or by \"encoding\" if set. Text mode\nis triggered by setting any of text, encoding, errors or\nuniversal_newlines.", + "builtins.Popen.kill" => "Terminates the process.", + "builtins.Popen.poll" => "Check if child process has terminated. Set and return returncode\nattribute.", + "builtins.Popen.send_signal" => "Send a signal to the process.", + "builtins.Popen.terminate" => "Terminates the process.", + "builtins.Popen.wait" => "Wait for child process to terminate; returns self.returncode.", + "builtins.PrepareProtocol" => "PEP 246 style object adaption protocol type.", + "builtins.PrepareProtocol.__delattr__" => "Implement delattr(self, name).", + "builtins.PrepareProtocol.__eq__" => "Return self==value.", + "builtins.PrepareProtocol.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.PrepareProtocol.__ge__" => "Return self>=value.", + "builtins.PrepareProtocol.__getattribute__" => "Return getattr(self, name).", + "builtins.PrepareProtocol.__getstate__" => "Helper for pickle.", + "builtins.PrepareProtocol.__gt__" => "Return self>value.", + "builtins.PrepareProtocol.__hash__" => "Return hash(self).", + "builtins.PrepareProtocol.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.PrepareProtocol.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.PrepareProtocol.__le__" => "Return self<=value.", + "builtins.PrepareProtocol.__lt__" => "Return self<value.", + "builtins.PrepareProtocol.__ne__" => "Return self!=value.", + "builtins.PrepareProtocol.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.PrepareProtocol.__reduce__" => "Helper for pickle.", + "builtins.PrepareProtocol.__reduce_ex__" => "Helper for pickle.", + "builtins.PrepareProtocol.__repr__" => "Return repr(self).", + "builtins.PrepareProtocol.__setattr__" => "Implement setattr(self, name, value).", + "builtins.PrepareProtocol.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.PrepareProtocol.__str__" => "Return str(self).", + "builtins.PrepareProtocol.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.PrettyPrinter.__delattr__" => "Implement delattr(self, name).", + "builtins.PrettyPrinter.__eq__" => "Return self==value.", + "builtins.PrettyPrinter.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.PrettyPrinter.__ge__" => "Return self>=value.", + "builtins.PrettyPrinter.__getattribute__" => "Return getattr(self, name).", + "builtins.PrettyPrinter.__getstate__" => "Helper for pickle.", + "builtins.PrettyPrinter.__gt__" => "Return self>value.", + "builtins.PrettyPrinter.__hash__" => "Return hash(self).", + "builtins.PrettyPrinter.__init__" => "Handle pretty printing operations onto a stream using a set of\nconfigured parameters.\n\nindent\n Number of spaces to indent for each level of nesting.\n\nwidth\n Attempted maximum number of columns in the output.\n\ndepth\n The maximum depth to print out nested structures.\n\nstream\n The desired output stream. If omitted (or false), the standard\n output stream available at construction will be used.\n\ncompact\n If true, several items will be combined in one line.\n\nsort_dicts\n If true, dict keys are sorted.\n\nunderscore_numbers\n If true, digit groups are separated with underscores.", + "builtins.PrettyPrinter.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.PrettyPrinter.__le__" => "Return self<=value.", + "builtins.PrettyPrinter.__lt__" => "Return self<value.", + "builtins.PrettyPrinter.__ne__" => "Return self!=value.", + "builtins.PrettyPrinter.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.PrettyPrinter.__reduce__" => "Helper for pickle.", + "builtins.PrettyPrinter.__reduce_ex__" => "Helper for pickle.", + "builtins.PrettyPrinter.__repr__" => "Return repr(self).", + "builtins.PrettyPrinter.__setattr__" => "Implement setattr(self, name, value).", + "builtins.PrettyPrinter.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.PrettyPrinter.__str__" => "Return str(self).", + "builtins.PrettyPrinter.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.PrettyPrinter.__weakref__" => "list of weak references to the object", + "builtins.PrettyPrinter.format" => "Format object for a specific context, returning a string\nand flags indicating whether the representation is 'readable'\nand whether the object represents a recursive construct.", + "builtins.Process.__delattr__" => "Implement delattr(self, name).", + "builtins.Process.__eq__" => "Return self==value.", + "builtins.Process.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Process.__ge__" => "Return self>=value.", + "builtins.Process.__getattribute__" => "Return getattr(self, name).", + "builtins.Process.__getstate__" => "Helper for pickle.", + "builtins.Process.__gt__" => "Return self>value.", + "builtins.Process.__hash__" => "Return hash(self).", + "builtins.Process.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Process.__le__" => "Return self<=value.", + "builtins.Process.__lt__" => "Return self<value.", + "builtins.Process.__ne__" => "Return self!=value.", + "builtins.Process.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Process.__reduce__" => "Helper for pickle.", + "builtins.Process.__reduce_ex__" => "Helper for pickle.", + "builtins.Process.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Process.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Process.__str__" => "Return str(self).", + "builtins.Process.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Process.__weakref__" => "list of weak references to the object", + "builtins.Process.wait" => "Wait until the process exit and return the process return code.", "builtins.ProcessLookupError" => "Process not found.", "builtins.ProcessLookupError.__delattr__" => "Implement delattr(self, name).", "builtins.ProcessLookupError.__eq__" => "Return self==value.", @@ -10856,6 +16858,209 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.ProcessLookupError.strerror" => "exception strerror", "builtins.ProcessLookupError.winerror" => "Win32 exception code", "builtins.ProcessLookupError.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.Profile" => "Profiler class.\n\nself.cur is always a tuple. Each such tuple corresponds to a stack\nframe that is currently active (self.cur[-2]). The following are the\ndefinitions of its members. We use this external \"parallel stack\" to\navoid contaminating the program that we are profiling. (old profiler\nused to write into the frames local dictionary!!) Derived classes\ncan change the definition of some entries, as long as they leave\n[-2:] intact (frame and previous tuple). In case an internal error is\ndetected, the -3 element is used as the function name.\n\n[ 0] = Time that needs to be charged to the parent frame's function.\n It is used so that a function call will not have to access the\n timing data for the parent frame.\n[ 1] = Total time spent in this frame's function, excluding time in\n subfunctions (this latter is tallied in cur[2]).\n[ 2] = Total time spent in subfunctions, excluding time executing the\n frame's function (this latter is tallied in cur[1]).\n[-3] = Name of the function that corresponds to this frame.\n[-2] = Actual frame that we correspond to (used to sync exception handling).\n[-1] = Our parent 6-tuple (corresponds to frame.f_back).\n\nTiming data for each function is stored as a 5-tuple in the dictionary\nself.timings[]. The index is always the name stored in self.cur[-3].\nThe following are the definitions of the members:\n\n[0] = The number of times this function was called, not counting direct\n or indirect recursion,\n[1] = Number of times this function appears on the stack, minus one\n[2] = Total time spent internal to this function\n[3] = Cumulative time that this function was present on the stack. In\n non-recursive functions, this is the total execution time from start\n to finish of each invocation of a function, including time spent in\n all subfunctions.\n[4] = A dictionary indicating for each function name, the number of times\n it was called by us.", + "builtins.Profile.__delattr__" => "Implement delattr(self, name).", + "builtins.Profile.__eq__" => "Return self==value.", + "builtins.Profile.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Profile.__ge__" => "Return self>=value.", + "builtins.Profile.__getattribute__" => "Return getattr(self, name).", + "builtins.Profile.__getstate__" => "Helper for pickle.", + "builtins.Profile.__gt__" => "Return self>value.", + "builtins.Profile.__hash__" => "Return hash(self).", + "builtins.Profile.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Profile.__le__" => "Return self<=value.", + "builtins.Profile.__lt__" => "Return self<value.", + "builtins.Profile.__ne__" => "Return self!=value.", + "builtins.Profile.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Profile.__reduce__" => "Helper for pickle.", + "builtins.Profile.__reduce_ex__" => "Helper for pickle.", + "builtins.Profile.__repr__" => "Return repr(self).", + "builtins.Profile.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Profile.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Profile.__str__" => "Return str(self).", + "builtins.Profile.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Profile.__weakref__" => "list of weak references to the object", + "builtins.Profile.fake_code.__delattr__" => "Implement delattr(self, name).", + "builtins.Profile.fake_code.__eq__" => "Return self==value.", + "builtins.Profile.fake_code.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Profile.fake_code.__ge__" => "Return self>=value.", + "builtins.Profile.fake_code.__getattribute__" => "Return getattr(self, name).", + "builtins.Profile.fake_code.__getstate__" => "Helper for pickle.", + "builtins.Profile.fake_code.__gt__" => "Return self>value.", + "builtins.Profile.fake_code.__hash__" => "Return hash(self).", + "builtins.Profile.fake_code.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Profile.fake_code.__le__" => "Return self<=value.", + "builtins.Profile.fake_code.__lt__" => "Return self<value.", + "builtins.Profile.fake_code.__ne__" => "Return self!=value.", + "builtins.Profile.fake_code.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Profile.fake_code.__reduce__" => "Helper for pickle.", + "builtins.Profile.fake_code.__reduce_ex__" => "Helper for pickle.", + "builtins.Profile.fake_code.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Profile.fake_code.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Profile.fake_code.__str__" => "Return str(self).", + "builtins.Profile.fake_code.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Profile.fake_code.__weakref__" => "list of weak references to the object", + "builtins.Profile.fake_frame.__delattr__" => "Implement delattr(self, name).", + "builtins.Profile.fake_frame.__eq__" => "Return self==value.", + "builtins.Profile.fake_frame.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Profile.fake_frame.__ge__" => "Return self>=value.", + "builtins.Profile.fake_frame.__getattribute__" => "Return getattr(self, name).", + "builtins.Profile.fake_frame.__getstate__" => "Helper for pickle.", + "builtins.Profile.fake_frame.__gt__" => "Return self>value.", + "builtins.Profile.fake_frame.__hash__" => "Return hash(self).", + "builtins.Profile.fake_frame.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Profile.fake_frame.__le__" => "Return self<=value.", + "builtins.Profile.fake_frame.__lt__" => "Return self<value.", + "builtins.Profile.fake_frame.__ne__" => "Return self!=value.", + "builtins.Profile.fake_frame.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Profile.fake_frame.__reduce__" => "Helper for pickle.", + "builtins.Profile.fake_frame.__reduce_ex__" => "Helper for pickle.", + "builtins.Profile.fake_frame.__repr__" => "Return repr(self).", + "builtins.Profile.fake_frame.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Profile.fake_frame.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Profile.fake_frame.__str__" => "Return str(self).", + "builtins.Profile.fake_frame.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Profile.fake_frame.__weakref__" => "list of weak references to the object", + "builtins.Profiler" => "Build a profiler object using the specified timer function.\n\nThe default timer is a fast built-in one based on real time.\nFor custom timer functions returning integers, 'timeunit' can\nbe a float specifying a scale (that is, how long each integer unit\nis, in seconds).", + "builtins.Profiler.__delattr__" => "Implement delattr(self, name).", + "builtins.Profiler.__eq__" => "Return self==value.", + "builtins.Profiler.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Profiler.__ge__" => "Return self>=value.", + "builtins.Profiler.__getattribute__" => "Return getattr(self, name).", + "builtins.Profiler.__getstate__" => "Helper for pickle.", + "builtins.Profiler.__gt__" => "Return self>value.", + "builtins.Profiler.__hash__" => "Return hash(self).", + "builtins.Profiler.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Profiler.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Profiler.__le__" => "Return self<=value.", + "builtins.Profiler.__lt__" => "Return self<value.", + "builtins.Profiler.__ne__" => "Return self!=value.", + "builtins.Profiler.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Profiler.__reduce__" => "Helper for pickle.", + "builtins.Profiler.__reduce_ex__" => "Helper for pickle.", + "builtins.Profiler.__repr__" => "Return repr(self).", + "builtins.Profiler.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Profiler.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Profiler.__str__" => "Return str(self).", + "builtins.Profiler.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Profiler.clear" => "Clear all profiling information collected so far.", + "builtins.Profiler.disable" => "Stop collecting profiling information.", + "builtins.Profiler.enable" => "Start collecting profiling information.\n\n subcalls\n If True, also records for each function\n statistics separated according to its current caller.\n builtins\n If True, records the time spent in\n built-in functions separately from their caller.", + "builtins.Profiler.getstats" => "list of profiler_entry objects.\n\ngetstats() -> list of profiler_entry objects\n\nReturn all information collected by the profiler.\nEach profiler_entry is a tuple-like object with the\nfollowing attributes:\n\n code code object\n callcount how many times this was called\n reccallcount how many times called recursively\n totaltime total time in this entry\n inlinetime inline time in this entry (not in subcalls)\n calls details of the calls\n\nThe calls attribute is either None or a list of\nprofiler_subentry objects:\n\n code called code object\n callcount how many times this is called\n reccallcount how many times this is called recursively\n totaltime total time spent in this call\n inlinetime inline time (not in further subcalls)", + "builtins.ProxyType.__abs__" => "abs(self)", + "builtins.ProxyType.__add__" => "Return self+value.", + "builtins.ProxyType.__and__" => "Return self&value.", + "builtins.ProxyType.__bool__" => "True if self else False", + "builtins.ProxyType.__contains__" => "Return bool(key in self).", + "builtins.ProxyType.__delattr__" => "Implement delattr(self, name).", + "builtins.ProxyType.__delitem__" => "Delete self[key].", + "builtins.ProxyType.__divmod__" => "Return divmod(self, value).", + "builtins.ProxyType.__eq__" => "Return self==value.", + "builtins.ProxyType.__float__" => "float(self)", + "builtins.ProxyType.__floordiv__" => "Return self//value.", + "builtins.ProxyType.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.ProxyType.__ge__" => "Return self>=value.", + "builtins.ProxyType.__getattribute__" => "Return getattr(self, name).", + "builtins.ProxyType.__getitem__" => "Return self[key].", + "builtins.ProxyType.__getstate__" => "Helper for pickle.", + "builtins.ProxyType.__gt__" => "Return self>value.", + "builtins.ProxyType.__iadd__" => "Return self+=value.", + "builtins.ProxyType.__iand__" => "Return self&=value.", + "builtins.ProxyType.__ifloordiv__" => "Return self//=value.", + "builtins.ProxyType.__ilshift__" => "Return self<<=value.", + "builtins.ProxyType.__imatmul__" => "Return self@=value.", + "builtins.ProxyType.__imod__" => "Return self%=value.", + "builtins.ProxyType.__imul__" => "Return self*=value.", + "builtins.ProxyType.__index__" => "Return self converted to an integer, if self is suitable for use as an index into a list.", + "builtins.ProxyType.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.ProxyType.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.ProxyType.__int__" => "int(self)", + "builtins.ProxyType.__invert__" => "~self", + "builtins.ProxyType.__ior__" => "Return self|=value.", + "builtins.ProxyType.__ipow__" => "Return self**=value.", + "builtins.ProxyType.__irshift__" => "Return self>>=value.", + "builtins.ProxyType.__isub__" => "Return self-=value.", + "builtins.ProxyType.__iter__" => "Implement iter(self).", + "builtins.ProxyType.__itruediv__" => "Return self/=value.", + "builtins.ProxyType.__ixor__" => "Return self^=value.", + "builtins.ProxyType.__le__" => "Return self<=value.", + "builtins.ProxyType.__len__" => "Return len(self).", + "builtins.ProxyType.__lshift__" => "Return self<<value.", + "builtins.ProxyType.__lt__" => "Return self<value.", + "builtins.ProxyType.__matmul__" => "Return self@value.", + "builtins.ProxyType.__mod__" => "Return self%value.", + "builtins.ProxyType.__mul__" => "Return self*value.", + "builtins.ProxyType.__ne__" => "Return self!=value.", + "builtins.ProxyType.__neg__" => "-self", + "builtins.ProxyType.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.ProxyType.__next__" => "Implement next(self).", + "builtins.ProxyType.__or__" => "Return self|value.", + "builtins.ProxyType.__pos__" => "+self", + "builtins.ProxyType.__pow__" => "Return pow(self, value, mod).", + "builtins.ProxyType.__radd__" => "Return value+self.", + "builtins.ProxyType.__rand__" => "Return value&self.", + "builtins.ProxyType.__rdivmod__" => "Return divmod(value, self).", + "builtins.ProxyType.__reduce__" => "Helper for pickle.", + "builtins.ProxyType.__reduce_ex__" => "Helper for pickle.", + "builtins.ProxyType.__repr__" => "Return repr(self).", + "builtins.ProxyType.__rfloordiv__" => "Return value//self.", + "builtins.ProxyType.__rlshift__" => "Return value<<self.", + "builtins.ProxyType.__rmatmul__" => "Return value@self.", + "builtins.ProxyType.__rmod__" => "Return value%self.", + "builtins.ProxyType.__rmul__" => "Return value*self.", + "builtins.ProxyType.__ror__" => "Return value|self.", + "builtins.ProxyType.__rpow__" => "Return pow(value, self, mod).", + "builtins.ProxyType.__rrshift__" => "Return value>>self.", + "builtins.ProxyType.__rshift__" => "Return self>>value.", + "builtins.ProxyType.__rsub__" => "Return value-self.", + "builtins.ProxyType.__rtruediv__" => "Return value/self.", + "builtins.ProxyType.__rxor__" => "Return value^self.", + "builtins.ProxyType.__setattr__" => "Implement setattr(self, name, value).", + "builtins.ProxyType.__setitem__" => "Set self[key] to value.", + "builtins.ProxyType.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.ProxyType.__str__" => "Return str(self).", + "builtins.ProxyType.__sub__" => "Return self-value.", + "builtins.ProxyType.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.ProxyType.__truediv__" => "Return self/value.", + "builtins.ProxyType.__xor__" => "Return self^value.", + "builtins.PurePath" => "Base class for manipulating paths without I/O.\n\nPurePath represents a filesystem path and offers operations which\ndon't imply any actual filesystem I/O. Depending on your system,\ninstantiating a PurePath will return either a PurePosixPath or a\nPureWindowsPath object. You can also instantiate either of these classes\ndirectly, regardless of your system.", + "builtins.PurePath.__bytes__" => "Return the bytes representation of the path. This is only\nrecommended to use under Unix.", + "builtins.PurePath.__delattr__" => "Implement delattr(self, name).", + "builtins.PurePath.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.PurePath.__getattribute__" => "Return getattr(self, name).", + "builtins.PurePath.__getstate__" => "Helper for pickle.", + "builtins.PurePath.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.PurePath.__ne__" => "Return self!=value.", + "builtins.PurePath.__new__" => "Construct a PurePath from one or several strings and or existing\nPurePath objects. The strings and path objects are combined so as\nto yield a canonicalized path, which is incorporated into the\nnew PurePath object.", + "builtins.PurePath.__reduce_ex__" => "Helper for pickle.", + "builtins.PurePath.__setattr__" => "Implement setattr(self, name, value).", + "builtins.PurePath.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.PurePath.__str__" => "Return the string representation of the path, suitable for\npassing to system calls.", + "builtins.PurePath.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.PurePath._parse_pattern" => "Parse a glob pattern to a list of parts. This is much like\n_parse_path, except:\n\n- Rather than normalizing and returning the drive and root, we raise\n NotImplementedError if either are present.\n- If the path has no real parts, we raise ValueError.\n- If the path ends in a slash, then a final empty part is added.", + "builtins.PurePath.anchor" => "The concatenation of the drive and root, or ''.", + "builtins.PurePath.as_posix" => "Return the string representation of the path with forward (/)\nslashes.", + "builtins.PurePath.as_uri" => "Return the path as a URI.", + "builtins.PurePath.drive" => "The drive prefix (letter or UNC path), if any.", + "builtins.PurePath.full_match" => "Return True if this path matches the given glob-style pattern. The\npattern is matched against the entire path.", + "builtins.PurePath.is_absolute" => "True if the path is absolute (has both a root and, if applicable,\na drive).", + "builtins.PurePath.is_relative_to" => "Return True if the path is relative to another path or False.", + "builtins.PurePath.is_reserved" => "Return True if the path contains one of the special names reserved\nby the system, if any.", + "builtins.PurePath.joinpath" => "Combine this path with one or several arguments, and return a\nnew path representing either a subpath (if all arguments are relative\npaths) or a totally different path (if one of the arguments is\nanchored).", + "builtins.PurePath.match" => "Return True if this path matches the given pattern. If the pattern is\nrelative, matching is done from the right; otherwise, the entire path\nis matched. The recursive wildcard '**' is *not* supported by this\nmethod.", + "builtins.PurePath.name" => "The final path component, if any.", + "builtins.PurePath.parent" => "The logical parent of the path.", + "builtins.PurePath.parents" => "A sequence of this path's logical parents.", + "builtins.PurePath.parts" => "An object providing sequence-like access to the\ncomponents in the filesystem path.", + "builtins.PurePath.relative_to" => "Return the relative path to another path identified by the passed\narguments. If the operation is not possible (because this is not\nrelated to the other path), raise ValueError.\n\nThe *walk_up* parameter controls whether `..` may be used to resolve\nthe path.", + "builtins.PurePath.root" => "The root of the path, if any.", + "builtins.PurePath.stem" => "The final path component, minus its last suffix.", + "builtins.PurePath.suffix" => "The final component's last suffix, if any.\n\nThis includes the leading period. For example: '.txt'", + "builtins.PurePath.suffixes" => "A list of the final component's suffixes, if any.\n\nThese include the leading periods. For example: ['.tar', '.gz']", + "builtins.PurePath.with_name" => "Return a new path with the file name changed.", + "builtins.PurePath.with_segments" => "Construct a new path object from any number of path-like objects.\nSubclasses may override this method to customize how new path objects\nare created from methods like `iterdir()`.", + "builtins.PurePath.with_stem" => "Return a new path with the stem changed.", + "builtins.PurePath.with_suffix" => "Return a new path with the file suffix changed. If the path\nhas no suffix, add given suffix. If the given suffix is an empty\nstring, remove the suffix from the path.", "builtins.PyCapsule" => "Capsule objects let you wrap a C \"void *\" pointer in a Python\nobject. They're a way of passing data through the Python interpreter\nwithout creating your own custom type.\n\nCapsules are used for communication between extension modules.\nThey provide a way for an extension module to export a C interface\nto other extension modules, so that extension modules can use the\nPython import mechanism to link to one another.", "builtins.PyCapsule.__delattr__" => "Implement delattr(self, name).", "builtins.PyCapsule.__eq__" => "Return self==value.", @@ -10878,6 +17083,59 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.PyCapsule.__sizeof__" => "Size of object in memory, in bytes.", "builtins.PyCapsule.__str__" => "Return str(self).", "builtins.PyCapsule.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.PyHKEY" => "PyHKEY Object - A Python object, representing a win32 registry key.\n\nThis object wraps a Windows HKEY object, automatically closing it when\nthe object is destroyed. To guarantee cleanup, you can call either\nthe Close() method on the PyHKEY, or the CloseKey() method.\n\nAll functions which accept a handle object also accept an integer --\nhowever, use of the handle object is encouraged.\n\nFunctions:\nClose() - Closes the underlying handle.\nDetach() - Returns the integer Win32 handle, detaching it from the object\n\nProperties:\nhandle - The integer Win32 handle.\n\nOperations:\n__bool__ - Handles with an open object return true, otherwise false.\n__int__ - Converting a handle to an integer returns the Win32 handle.\n__enter__, __exit__ - Context manager support for 'with' statement,\nautomatically closes handle.", + "builtins.PyHKEY.Close" => "Closes the underlying Windows handle.\n\nIf the handle is already closed, no error is raised.", + "builtins.PyHKEY.Detach" => "Detaches the Windows handle from the handle object.\n\nThe result is the value of the handle before it is detached. If the\nhandle is already detached, this will return zero.\n\nAfter calling this function, the handle is effectively invalidated,\nbut the handle is not closed. You would call this function when you\nneed the underlying win32 handle to exist beyond the lifetime of the\nhandle object.", + "builtins.PyHKEY.__abs__" => "abs(self)", + "builtins.PyHKEY.__add__" => "Return self+value.", + "builtins.PyHKEY.__and__" => "Return self&value.", + "builtins.PyHKEY.__bool__" => "True if self else False", + "builtins.PyHKEY.__delattr__" => "Implement delattr(self, name).", + "builtins.PyHKEY.__divmod__" => "Return divmod(self, value).", + "builtins.PyHKEY.__eq__" => "Return self==value.", + "builtins.PyHKEY.__float__" => "float(self)", + "builtins.PyHKEY.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.PyHKEY.__ge__" => "Return self>=value.", + "builtins.PyHKEY.__getattribute__" => "Return getattr(self, name).", + "builtins.PyHKEY.__getstate__" => "Helper for pickle.", + "builtins.PyHKEY.__gt__" => "Return self>value.", + "builtins.PyHKEY.__hash__" => "Return hash(self).", + "builtins.PyHKEY.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.PyHKEY.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.PyHKEY.__int__" => "int(self)", + "builtins.PyHKEY.__invert__" => "~self", + "builtins.PyHKEY.__le__" => "Return self<=value.", + "builtins.PyHKEY.__lshift__" => "Return self<<value.", + "builtins.PyHKEY.__lt__" => "Return self<value.", + "builtins.PyHKEY.__mod__" => "Return self%value.", + "builtins.PyHKEY.__mul__" => "Return self*value.", + "builtins.PyHKEY.__ne__" => "Return self!=value.", + "builtins.PyHKEY.__neg__" => "-self", + "builtins.PyHKEY.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.PyHKEY.__or__" => "Return self|value.", + "builtins.PyHKEY.__pos__" => "+self", + "builtins.PyHKEY.__pow__" => "Return pow(self, value, mod).", + "builtins.PyHKEY.__radd__" => "Return value+self.", + "builtins.PyHKEY.__rand__" => "Return value&self.", + "builtins.PyHKEY.__rdivmod__" => "Return divmod(value, self).", + "builtins.PyHKEY.__reduce__" => "Helper for pickle.", + "builtins.PyHKEY.__reduce_ex__" => "Helper for pickle.", + "builtins.PyHKEY.__repr__" => "Return repr(self).", + "builtins.PyHKEY.__rlshift__" => "Return value<<self.", + "builtins.PyHKEY.__rmod__" => "Return value%self.", + "builtins.PyHKEY.__rmul__" => "Return value*self.", + "builtins.PyHKEY.__ror__" => "Return value|self.", + "builtins.PyHKEY.__rpow__" => "Return pow(value, self, mod).", + "builtins.PyHKEY.__rrshift__" => "Return value>>self.", + "builtins.PyHKEY.__rshift__" => "Return self>>value.", + "builtins.PyHKEY.__rsub__" => "Return value-self.", + "builtins.PyHKEY.__rxor__" => "Return value^self.", + "builtins.PyHKEY.__setattr__" => "Implement setattr(self, name, value).", + "builtins.PyHKEY.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.PyHKEY.__str__" => "Return str(self).", + "builtins.PyHKEY.__sub__" => "Return self-value.", + "builtins.PyHKEY.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.PyHKEY.__xor__" => "Return self^value.", "builtins.PythonFinalizationError" => "Operation blocked during Python finalization.", "builtins.PythonFinalizationError.__delattr__" => "Implement delattr(self, name).", "builtins.PythonFinalizationError.__eq__" => "Return self==value.", @@ -10901,6 +17159,139 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.PythonFinalizationError.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.PythonFinalizationError.add_note" => "Add a note to the exception", "builtins.PythonFinalizationError.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.Queue" => "Create a queue object with a given maximum size.\n\nIf maxsize is <= 0, the queue size is infinite.", + "builtins.Queue.__class_getitem__" => "Represent a PEP 585 generic type\n\nE.g. for t = list[int], t.__origin__ is list and t.__args__ is (int,).", + "builtins.Queue.__delattr__" => "Implement delattr(self, name).", + "builtins.Queue.__eq__" => "Return self==value.", + "builtins.Queue.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Queue.__ge__" => "Return self>=value.", + "builtins.Queue.__getattribute__" => "Return getattr(self, name).", + "builtins.Queue.__getstate__" => "Helper for pickle.", + "builtins.Queue.__gt__" => "Return self>value.", + "builtins.Queue.__hash__" => "Return hash(self).", + "builtins.Queue.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Queue.__le__" => "Return self<=value.", + "builtins.Queue.__lt__" => "Return self<value.", + "builtins.Queue.__ne__" => "Return self!=value.", + "builtins.Queue.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Queue.__reduce__" => "Helper for pickle.", + "builtins.Queue.__reduce_ex__" => "Helper for pickle.", + "builtins.Queue.__repr__" => "Return repr(self).", + "builtins.Queue.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Queue.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Queue.__str__" => "Return str(self).", + "builtins.Queue.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Queue.__weakref__" => "list of weak references to the object", + "builtins.Queue.empty" => "Return True if the queue is empty, False otherwise (not reliable!).\n\nThis method is likely to be removed at some point. Use qsize() == 0\nas a direct substitute, but be aware that either approach risks a race\ncondition where a queue can grow before the result of empty() or\nqsize() can be used.\n\nTo create code that needs to wait for all queued tasks to be\ncompleted, the preferred technique is to use the join() method.", + "builtins.Queue.full" => "Return True if the queue is full, False otherwise (not reliable!).\n\nThis method is likely to be removed at some point. Use qsize() >= n\nas a direct substitute, but be aware that either approach risks a race\ncondition where a queue can shrink before the result of full() or\nqsize() can be used.", + "builtins.Queue.get" => "Remove and return an item from the queue.\n\nIf optional args 'block' is true and 'timeout' is None (the default),\nblock if necessary until an item is available. If 'timeout' is\na non-negative number, it blocks at most 'timeout' seconds and raises\nthe Empty exception if no item was available within that time.\nOtherwise ('block' is false), return an item if one is immediately\navailable, else raise the Empty exception ('timeout' is ignored\nin that case).\n\nRaises ShutDown if the queue has been shut down and is empty,\nor if the queue has been shut down immediately.", + "builtins.Queue.get_nowait" => "Remove and return an item from the queue without blocking.\n\nOnly get an item if one is immediately available. Otherwise\nraise the Empty exception.", + "builtins.Queue.join" => "Blocks until all items in the Queue have been gotten and processed.\n\nThe count of unfinished tasks goes up whenever an item is added to the\nqueue. The count goes down whenever a consumer thread calls task_done()\nto indicate the item was retrieved and all work on it is complete.\n\nWhen the count of unfinished tasks drops to zero, join() unblocks.", + "builtins.Queue.put" => "Put an item into the queue.\n\nIf optional args 'block' is true and 'timeout' is None (the default),\nblock if necessary until a free slot is available. If 'timeout' is\na non-negative number, it blocks at most 'timeout' seconds and raises\nthe Full exception if no free slot was available within that time.\nOtherwise ('block' is false), put an item on the queue if a free slot\nis immediately available, else raise the Full exception ('timeout'\nis ignored in that case).\n\nRaises ShutDown if the queue has been shut down.", + "builtins.Queue.put_nowait" => "Put an item into the queue without blocking.\n\nOnly enqueue the item if a free slot is immediately available.\nOtherwise raise the Full exception.", + "builtins.Queue.qsize" => "Return the approximate size of the queue (not reliable!).", + "builtins.Queue.shutdown" => "Shut-down the queue, making queue gets and puts raise ShutDown.\n\nBy default, gets will only raise once the queue is empty. Set\n'immediate' to True to make gets raise immediately instead.\n\nAll blocked callers of put() and get() will be unblocked.\n\nIf 'immediate', the queue is drained and unfinished tasks\nis reduced by the number of drained tasks. If unfinished tasks\nis reduced to zero, callers of Queue.join are unblocked.", + "builtins.Queue.task_done" => "Indicate that a formerly enqueued task is complete.\n\nUsed by Queue consumer threads. For each get() used to fetch a task,\na subsequent call to task_done() tells the queue that the processing\non the task is complete.\n\nIf a join() is currently blocking, it will resume when all items\nhave been processed (meaning that a task_done() call was received\nfor every item that had been put() into the queue).\n\nRaises a ValueError if called more times than there were items\nplaced in the queue.", + "builtins.Quitter.__delattr__" => "Implement delattr(self, name).", + "builtins.Quitter.__eq__" => "Return self==value.", + "builtins.Quitter.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Quitter.__ge__" => "Return self>=value.", + "builtins.Quitter.__getattribute__" => "Return getattr(self, name).", + "builtins.Quitter.__getstate__" => "Helper for pickle.", + "builtins.Quitter.__gt__" => "Return self>value.", + "builtins.Quitter.__hash__" => "Return hash(self).", + "builtins.Quitter.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Quitter.__le__" => "Return self<=value.", + "builtins.Quitter.__lt__" => "Return self<value.", + "builtins.Quitter.__ne__" => "Return self!=value.", + "builtins.Quitter.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Quitter.__reduce__" => "Helper for pickle.", + "builtins.Quitter.__reduce_ex__" => "Helper for pickle.", + "builtins.Quitter.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Quitter.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Quitter.__str__" => "Return str(self).", + "builtins.Quitter.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Quitter.__weakref__" => "list of weak references to the object", + "builtins.RLock.__delattr__" => "Implement delattr(self, name).", + "builtins.RLock.__enter__" => "Lock the lock.", + "builtins.RLock.__eq__" => "Return self==value.", + "builtins.RLock.__exit__" => "Release the lock.", + "builtins.RLock.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.RLock.__ge__" => "Return self>=value.", + "builtins.RLock.__getattribute__" => "Return getattr(self, name).", + "builtins.RLock.__getstate__" => "Helper for pickle.", + "builtins.RLock.__gt__" => "Return self>value.", + "builtins.RLock.__hash__" => "Return hash(self).", + "builtins.RLock.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.RLock.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.RLock.__le__" => "Return self<=value.", + "builtins.RLock.__lt__" => "Return self<value.", + "builtins.RLock.__ne__" => "Return self!=value.", + "builtins.RLock.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.RLock.__reduce__" => "Helper for pickle.", + "builtins.RLock.__reduce_ex__" => "Helper for pickle.", + "builtins.RLock.__repr__" => "Return repr(self).", + "builtins.RLock.__setattr__" => "Implement setattr(self, name, value).", + "builtins.RLock.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.RLock.__str__" => "Return str(self).", + "builtins.RLock.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.RLock._acquire_restore" => "For internal use by `threading.Condition`.", + "builtins.RLock._is_owned" => "For internal use by `threading.Condition`.", + "builtins.RLock._recursion_count" => "For internal use by reentrancy checks.", + "builtins.RLock._release_save" => "For internal use by `threading.Condition`.", + "builtins.RLock.acquire" => "Lock the lock. `blocking` indicates whether we should wait\nfor the lock to be available or not. If `blocking` is False\nand another thread holds the lock, the method will return False\nimmediately. If `blocking` is True and another thread holds\nthe lock, the method will wait for the lock to be released,\ntake it and then return True.\n(note: the blocking operation is interruptible.)\n\nIn all other cases, the method will return True immediately.\nPrecisely, if the current thread already holds the lock, its\ninternal counter is simply incremented. If nobody holds the lock,\nthe lock is taken and its internal counter initialized to 1.", + "builtins.RLock.locked" => "locked()\n\nReturn a boolean indicating whether this object is locked right now.", + "builtins.RLock.release" => "Release the lock, allowing another thread that is blocked waiting for\nthe lock to acquire the lock. The lock must be in the locked state,\nand must be locked by the same thread that unlocks it; otherwise a\n`RuntimeError` is raised.\n\nDo note that if the lock was acquire()d several times in a row by the\ncurrent thread, release() needs to be called as many times for the lock\nto be available for other threads.", + "builtins.Random" => "Random() -> create a random number generator with its own internal state.", + "builtins.Random.__delattr__" => "Implement delattr(self, name).", + "builtins.Random.__eq__" => "Return self==value.", + "builtins.Random.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Random.__ge__" => "Return self>=value.", + "builtins.Random.__getattribute__" => "Return getattr(self, name).", + "builtins.Random.__getstate__" => "Helper for pickle.", + "builtins.Random.__gt__" => "Return self>value.", + "builtins.Random.__hash__" => "Return hash(self).", + "builtins.Random.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Random.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Random.__le__" => "Return self<=value.", + "builtins.Random.__lt__" => "Return self<value.", + "builtins.Random.__ne__" => "Return self!=value.", + "builtins.Random.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Random.__reduce__" => "Helper for pickle.", + "builtins.Random.__reduce_ex__" => "Helper for pickle.", + "builtins.Random.__repr__" => "Return repr(self).", + "builtins.Random.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Random.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Random.__str__" => "Return str(self).", + "builtins.Random.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Random.getrandbits" => "getrandbits(k) -> x. Generates an int with k random bits.", + "builtins.Random.getstate" => "getstate() -> tuple containing the current state.", + "builtins.Random.random" => "random() -> x in the interval [0, 1).", + "builtins.Random.seed" => "seed([n]) -> None.\n\nDefaults to use urandom and falls back to a combination\nof the current time and the process identifier.", + "builtins.Random.setstate" => "setstate(state) -> None. Restores generator state.", + "builtins.Reader" => "Protocol for simple I/O reader instances.\n\nThis protocol only supports blocking I/O.", + "builtins.Reader.__class_getitem__" => "Represent a PEP 585 generic type\n\nE.g. for t = list[int], t.__origin__ is list and t.__args__ is (int,).", + "builtins.Reader.__delattr__" => "Implement delattr(self, name).", + "builtins.Reader.__eq__" => "Return self==value.", + "builtins.Reader.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Reader.__ge__" => "Return self>=value.", + "builtins.Reader.__getattribute__" => "Return getattr(self, name).", + "builtins.Reader.__getstate__" => "Helper for pickle.", + "builtins.Reader.__gt__" => "Return self>value.", + "builtins.Reader.__hash__" => "Return hash(self).", + "builtins.Reader.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Reader.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Reader.__le__" => "Return self<=value.", + "builtins.Reader.__lt__" => "Return self<value.", + "builtins.Reader.__ne__" => "Return self!=value.", + "builtins.Reader.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Reader.__reduce__" => "Helper for pickle.", + "builtins.Reader.__reduce_ex__" => "Helper for pickle.", + "builtins.Reader.__repr__" => "Return repr(self).", + "builtins.Reader.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Reader.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Reader.__str__" => "Return str(self).", + "builtins.Reader.read" => "Read data from the input stream and return it.\n\nIf *size* is specified, at most *size* items (bytes/characters) will be\nread.", "builtins.RecursionError" => "Recursion limit exceeded.", "builtins.RecursionError.__delattr__" => "Implement delattr(self, name).", "builtins.RecursionError.__eq__" => "Return self==value.", @@ -10947,6 +17338,102 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.ReferenceError.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.ReferenceError.add_note" => "Add a note to the exception", "builtins.ReferenceError.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.ReferenceType.__call__" => "Call self as a function.", + "builtins.ReferenceType.__class_getitem__" => "Weakrefs are generic over the type of the referenced object.", + "builtins.ReferenceType.__delattr__" => "Implement delattr(self, name).", + "builtins.ReferenceType.__eq__" => "Return self==value.", + "builtins.ReferenceType.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.ReferenceType.__ge__" => "Return self>=value.", + "builtins.ReferenceType.__getattribute__" => "Return getattr(self, name).", + "builtins.ReferenceType.__getstate__" => "Helper for pickle.", + "builtins.ReferenceType.__gt__" => "Return self>value.", + "builtins.ReferenceType.__hash__" => "Return hash(self).", + "builtins.ReferenceType.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.ReferenceType.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.ReferenceType.__le__" => "Return self<=value.", + "builtins.ReferenceType.__lt__" => "Return self<value.", + "builtins.ReferenceType.__ne__" => "Return self!=value.", + "builtins.ReferenceType.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.ReferenceType.__reduce__" => "Helper for pickle.", + "builtins.ReferenceType.__reduce_ex__" => "Helper for pickle.", + "builtins.ReferenceType.__repr__" => "Return repr(self).", + "builtins.ReferenceType.__setattr__" => "Implement setattr(self, name, value).", + "builtins.ReferenceType.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.ReferenceType.__str__" => "Return str(self).", + "builtins.ReferenceType.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.RemoteUnwinder" => "RemoteUnwinder(pid): Inspect stack of a remote Python process.", + "builtins.RemoteUnwinder.__delattr__" => "Implement delattr(self, name).", + "builtins.RemoteUnwinder.__eq__" => "Return self==value.", + "builtins.RemoteUnwinder.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.RemoteUnwinder.__ge__" => "Return self>=value.", + "builtins.RemoteUnwinder.__getattribute__" => "Return getattr(self, name).", + "builtins.RemoteUnwinder.__getstate__" => "Helper for pickle.", + "builtins.RemoteUnwinder.__gt__" => "Return self>value.", + "builtins.RemoteUnwinder.__hash__" => "Return hash(self).", + "builtins.RemoteUnwinder.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.RemoteUnwinder.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.RemoteUnwinder.__le__" => "Return self<=value.", + "builtins.RemoteUnwinder.__lt__" => "Return self<value.", + "builtins.RemoteUnwinder.__ne__" => "Return self!=value.", + "builtins.RemoteUnwinder.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.RemoteUnwinder.__reduce__" => "Helper for pickle.", + "builtins.RemoteUnwinder.__reduce_ex__" => "Helper for pickle.", + "builtins.RemoteUnwinder.__repr__" => "Return repr(self).", + "builtins.RemoteUnwinder.__setattr__" => "Implement setattr(self, name, value).", + "builtins.RemoteUnwinder.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.RemoteUnwinder.__str__" => "Return str(self).", + "builtins.RemoteUnwinder.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.RemoteUnwinder.get_all_awaited_by" => "Get all tasks and their awaited_by relationships from the remote process.\n\nThis provides a tree structure showing which tasks are waiting for other tasks.\n\nFor each task, returns:\n1. The call stack frames leading to where the task is currently executing\n2. The name of the task\n3. A list of tasks that this task is waiting for, with their own frames/names/etc\n\nReturns a list of [frames, task_name, subtasks] where:\n- frames: List of (func_name, filename, lineno) showing the call stack\n- task_name: String identifier for the task\n- subtasks: List of tasks being awaited by this task, in same format\n\nRaises:\n RuntimeError: If AsyncioDebug section is not available in the remote process\n MemoryError: If memory allocation fails\n OSError: If reading from the remote process fails\n\nExample output:\n[\n [\n [(\"c5\", \"script.py\", 10), (\"c4\", \"script.py\", 14)],\n \"c2_root\",\n [\n [\n [(\"c1\", \"script.py\", 23)],\n \"sub_main_2\",\n [...]\n ],\n [...]\n ]\n ]\n]", + "builtins.RemoteUnwinder.get_async_stack_trace" => "Get the currently running async tasks and their dependency graphs from the remote process.\n\nThis returns information about running tasks and all tasks that are waiting for them,\nforming a complete dependency graph for each thread's active task.\n\nFor each thread with a running task, returns the running task plus all tasks that\ntransitively depend on it (tasks waiting for the running task, tasks waiting for\nthose tasks, etc.).\n\nReturns a list of per-thread results, where each thread result contains:\n- Thread ID\n- List of task information for the running task and all its waiters\n\nEach task info contains:\n- Task ID (memory address)\n- Task name\n- Call stack frames: List of (func_name, filename, lineno)\n- List of tasks waiting for this task (recursive structure)\n\nRaises:\n RuntimeError: If AsyncioDebug section is not available in the target process\n MemoryError: If memory allocation fails\n OSError: If reading from the remote process fails\n\nExample output (similar structure to get_all_awaited_by but only for running tasks):\n[\n (140234, [\n (4345585712, 'main_task',\n [(\"run_server\", \"server.py\", 127), (\"main\", \"app.py\", 23)],\n [\n (4345585800, 'worker_1', [...], [...]),\n (4345585900, 'worker_2', [...], [...])\n ])\n ])\n]", + "builtins.RemoteUnwinder.get_stack_trace" => "Returns a list of stack traces for threads in the target process.\n\nEach element in the returned list is a tuple of (thread_id, frame_list), where:\n- thread_id is the OS thread identifier\n- frame_list is a list of tuples (function_name, filename, line_number) representing\n the Python stack frames for that thread, ordered from most recent to oldest\n\nThe threads returned depend on the initialization parameters:\n- If only_active_thread was True: returns only the thread holding the GIL\n- If all_threads was True: returns all threads\n- Otherwise: returns only the main thread\n\nExample:\n [\n (1234, [\n ('process_data', 'worker.py', 127),\n ('run_worker', 'worker.py', 45),\n ('main', 'app.py', 23)\n ]),\n (1235, [\n ('handle_request', 'server.py', 89),\n ('serve_forever', 'server.py', 52)\n ])\n ]\n\nRaises:\n RuntimeError: If there is an error copying memory from the target process\n OSError: If there is an error accessing the target process\n PermissionError: If access to the target process is denied\n UnicodeDecodeError: If there is an error decoding strings from the target process", + "builtins.Repr.__delattr__" => "Implement delattr(self, name).", + "builtins.Repr.__eq__" => "Return self==value.", + "builtins.Repr.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Repr.__ge__" => "Return self>=value.", + "builtins.Repr.__getattribute__" => "Return getattr(self, name).", + "builtins.Repr.__getstate__" => "Helper for pickle.", + "builtins.Repr.__gt__" => "Return self>value.", + "builtins.Repr.__hash__" => "Return hash(self).", + "builtins.Repr.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Repr.__le__" => "Return self<=value.", + "builtins.Repr.__lt__" => "Return self<value.", + "builtins.Repr.__ne__" => "Return self!=value.", + "builtins.Repr.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Repr.__reduce__" => "Helper for pickle.", + "builtins.Repr.__reduce_ex__" => "Helper for pickle.", + "builtins.Repr.__repr__" => "Return repr(self).", + "builtins.Repr.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Repr.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Repr.__str__" => "Return str(self).", + "builtins.Repr.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Repr.__weakref__" => "list of weak references to the object", + "builtins.ResourceReader" => "Abstract base class for loaders to provide resource reading support.", + "builtins.ResourceReader.__delattr__" => "Implement delattr(self, name).", + "builtins.ResourceReader.__eq__" => "Return self==value.", + "builtins.ResourceReader.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.ResourceReader.__ge__" => "Return self>=value.", + "builtins.ResourceReader.__getattribute__" => "Return getattr(self, name).", + "builtins.ResourceReader.__getstate__" => "Helper for pickle.", + "builtins.ResourceReader.__gt__" => "Return self>value.", + "builtins.ResourceReader.__hash__" => "Return hash(self).", + "builtins.ResourceReader.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.ResourceReader.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.ResourceReader.__le__" => "Return self<=value.", + "builtins.ResourceReader.__lt__" => "Return self<value.", + "builtins.ResourceReader.__ne__" => "Return self!=value.", + "builtins.ResourceReader.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.ResourceReader.__reduce__" => "Helper for pickle.", + "builtins.ResourceReader.__reduce_ex__" => "Helper for pickle.", + "builtins.ResourceReader.__repr__" => "Return repr(self).", + "builtins.ResourceReader.__setattr__" => "Implement setattr(self, name, value).", + "builtins.ResourceReader.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.ResourceReader.__str__" => "Return str(self).", + "builtins.ResourceReader.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.ResourceReader.__weakref__" => "list of weak references to the object", + "builtins.ResourceReader.contents" => "Return an iterable of entries in `package`.", + "builtins.ResourceReader.is_resource" => "Return True if the named 'path' is a resource.\n\nFiles are resources, directories are not.", + "builtins.ResourceReader.open_resource" => "Return an opened, file-like object for binary reading.\n\nThe 'resource' argument is expected to represent only a file name.\nIf the resource cannot be found, FileNotFoundError is raised.", + "builtins.ResourceReader.resource_path" => "Return the file system path to the specified resource.\n\nThe 'resource' argument is expected to represent only a file name.\nIf the resource does not exist on the file system, raise\nFileNotFoundError.", "builtins.ResourceWarning" => "Base class for warnings about resource usage.", "builtins.ResourceWarning.__delattr__" => "Implement delattr(self, name).", "builtins.ResourceWarning.__eq__" => "Return self==value.", @@ -10970,6 +17457,56 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.ResourceWarning.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.ResourceWarning.add_note" => "Add a note to the exception", "builtins.ResourceWarning.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.Row.__delattr__" => "Implement delattr(self, name).", + "builtins.Row.__eq__" => "Return self==value.", + "builtins.Row.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Row.__ge__" => "Return self>=value.", + "builtins.Row.__getattribute__" => "Return getattr(self, name).", + "builtins.Row.__getitem__" => "Return self[key].", + "builtins.Row.__getstate__" => "Helper for pickle.", + "builtins.Row.__gt__" => "Return self>value.", + "builtins.Row.__hash__" => "Return hash(self).", + "builtins.Row.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Row.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Row.__iter__" => "Implement iter(self).", + "builtins.Row.__le__" => "Return self<=value.", + "builtins.Row.__len__" => "Return len(self).", + "builtins.Row.__lt__" => "Return self<value.", + "builtins.Row.__ne__" => "Return self!=value.", + "builtins.Row.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Row.__reduce__" => "Helper for pickle.", + "builtins.Row.__reduce_ex__" => "Helper for pickle.", + "builtins.Row.__repr__" => "Return repr(self).", + "builtins.Row.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Row.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Row.__str__" => "Return str(self).", + "builtins.Row.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Row.keys" => "Returns the keys of the row.", + "builtins.Runner" => "A context manager that controls event loop life cycle.\n\nThe context manager always creates a new event loop,\nallows to run async functions inside it,\nand properly finalizes the loop at the context manager exit.\n\nIf debug is True, the event loop will be run in debug mode.\nIf loop_factory is passed, it is used for new event loop creation.\n\nasyncio.run(main(), debug=True)\n\nis a shortcut for\n\nwith asyncio.Runner(debug=True) as runner:\n runner.run(main())\n\nThe run() method can be called multiple times within the runner's\ncontext.\n\nThis can be useful for interactive console (e.g. IPython),\nunittest runners, console tools, -- everywhere when async code\nis called from existing sync framework and where the preferred single\nasyncio.run() call doesn't work.", + "builtins.Runner.__delattr__" => "Implement delattr(self, name).", + "builtins.Runner.__eq__" => "Return self==value.", + "builtins.Runner.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Runner.__ge__" => "Return self>=value.", + "builtins.Runner.__getattribute__" => "Return getattr(self, name).", + "builtins.Runner.__getstate__" => "Helper for pickle.", + "builtins.Runner.__gt__" => "Return self>value.", + "builtins.Runner.__hash__" => "Return hash(self).", + "builtins.Runner.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Runner.__le__" => "Return self<=value.", + "builtins.Runner.__lt__" => "Return self<value.", + "builtins.Runner.__ne__" => "Return self!=value.", + "builtins.Runner.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Runner.__reduce__" => "Helper for pickle.", + "builtins.Runner.__reduce_ex__" => "Helper for pickle.", + "builtins.Runner.__repr__" => "Return repr(self).", + "builtins.Runner.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Runner.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Runner.__str__" => "Return str(self).", + "builtins.Runner.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Runner.__weakref__" => "list of weak references to the object", + "builtins.Runner.close" => "Shutdown and close event loop.", + "builtins.Runner.get_loop" => "Return embedded event loop.", + "builtins.Runner.run" => "Run code in the embedded event loop.", "builtins.RuntimeError" => "Unspecified run-time error.", "builtins.RuntimeError.__delattr__" => "Implement delattr(self, name).", "builtins.RuntimeError.__eq__" => "Return self==value.", @@ -11016,6 +17553,634 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.RuntimeWarning.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.RuntimeWarning.add_note" => "Add a note to the exception", "builtins.RuntimeWarning.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.SHA224Type.__delattr__" => "Implement delattr(self, name).", + "builtins.SHA224Type.__eq__" => "Return self==value.", + "builtins.SHA224Type.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.SHA224Type.__ge__" => "Return self>=value.", + "builtins.SHA224Type.__getattribute__" => "Return getattr(self, name).", + "builtins.SHA224Type.__getstate__" => "Helper for pickle.", + "builtins.SHA224Type.__gt__" => "Return self>value.", + "builtins.SHA224Type.__hash__" => "Return hash(self).", + "builtins.SHA224Type.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.SHA224Type.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.SHA224Type.__le__" => "Return self<=value.", + "builtins.SHA224Type.__lt__" => "Return self<value.", + "builtins.SHA224Type.__ne__" => "Return self!=value.", + "builtins.SHA224Type.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.SHA224Type.__reduce__" => "Helper for pickle.", + "builtins.SHA224Type.__reduce_ex__" => "Helper for pickle.", + "builtins.SHA224Type.__repr__" => "Return repr(self).", + "builtins.SHA224Type.__setattr__" => "Implement setattr(self, name, value).", + "builtins.SHA224Type.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.SHA224Type.__str__" => "Return str(self).", + "builtins.SHA224Type.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.SHA224Type.copy" => "Return a copy of the hash object.", + "builtins.SHA224Type.digest" => "Return the digest value as a bytes object.", + "builtins.SHA224Type.hexdigest" => "Return the digest value as a string of hexadecimal digits.", + "builtins.SHA224Type.update" => "Update this hash object's state with the provided string.", + "builtins.SHA256Type.__delattr__" => "Implement delattr(self, name).", + "builtins.SHA256Type.__eq__" => "Return self==value.", + "builtins.SHA256Type.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.SHA256Type.__ge__" => "Return self>=value.", + "builtins.SHA256Type.__getattribute__" => "Return getattr(self, name).", + "builtins.SHA256Type.__getstate__" => "Helper for pickle.", + "builtins.SHA256Type.__gt__" => "Return self>value.", + "builtins.SHA256Type.__hash__" => "Return hash(self).", + "builtins.SHA256Type.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.SHA256Type.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.SHA256Type.__le__" => "Return self<=value.", + "builtins.SHA256Type.__lt__" => "Return self<value.", + "builtins.SHA256Type.__ne__" => "Return self!=value.", + "builtins.SHA256Type.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.SHA256Type.__reduce__" => "Helper for pickle.", + "builtins.SHA256Type.__reduce_ex__" => "Helper for pickle.", + "builtins.SHA256Type.__repr__" => "Return repr(self).", + "builtins.SHA256Type.__setattr__" => "Implement setattr(self, name, value).", + "builtins.SHA256Type.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.SHA256Type.__str__" => "Return str(self).", + "builtins.SHA256Type.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.SHA256Type.copy" => "Return a copy of the hash object.", + "builtins.SHA256Type.digest" => "Return the digest value as a bytes object.", + "builtins.SHA256Type.hexdigest" => "Return the digest value as a string of hexadecimal digits.", + "builtins.SHA256Type.update" => "Update this hash object's state with the provided string.", + "builtins.SHA384Type.__delattr__" => "Implement delattr(self, name).", + "builtins.SHA384Type.__eq__" => "Return self==value.", + "builtins.SHA384Type.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.SHA384Type.__ge__" => "Return self>=value.", + "builtins.SHA384Type.__getattribute__" => "Return getattr(self, name).", + "builtins.SHA384Type.__getstate__" => "Helper for pickle.", + "builtins.SHA384Type.__gt__" => "Return self>value.", + "builtins.SHA384Type.__hash__" => "Return hash(self).", + "builtins.SHA384Type.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.SHA384Type.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.SHA384Type.__le__" => "Return self<=value.", + "builtins.SHA384Type.__lt__" => "Return self<value.", + "builtins.SHA384Type.__ne__" => "Return self!=value.", + "builtins.SHA384Type.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.SHA384Type.__reduce__" => "Helper for pickle.", + "builtins.SHA384Type.__reduce_ex__" => "Helper for pickle.", + "builtins.SHA384Type.__repr__" => "Return repr(self).", + "builtins.SHA384Type.__setattr__" => "Implement setattr(self, name, value).", + "builtins.SHA384Type.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.SHA384Type.__str__" => "Return str(self).", + "builtins.SHA384Type.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.SHA384Type.copy" => "Return a copy of the hash object.", + "builtins.SHA384Type.digest" => "Return the digest value as a bytes object.", + "builtins.SHA384Type.hexdigest" => "Return the digest value as a string of hexadecimal digits.", + "builtins.SHA384Type.update" => "Update this hash object's state with the provided string.", + "builtins.SHA512Type.__delattr__" => "Implement delattr(self, name).", + "builtins.SHA512Type.__eq__" => "Return self==value.", + "builtins.SHA512Type.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.SHA512Type.__ge__" => "Return self>=value.", + "builtins.SHA512Type.__getattribute__" => "Return getattr(self, name).", + "builtins.SHA512Type.__getstate__" => "Helper for pickle.", + "builtins.SHA512Type.__gt__" => "Return self>value.", + "builtins.SHA512Type.__hash__" => "Return hash(self).", + "builtins.SHA512Type.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.SHA512Type.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.SHA512Type.__le__" => "Return self<=value.", + "builtins.SHA512Type.__lt__" => "Return self<value.", + "builtins.SHA512Type.__ne__" => "Return self!=value.", + "builtins.SHA512Type.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.SHA512Type.__reduce__" => "Helper for pickle.", + "builtins.SHA512Type.__reduce_ex__" => "Helper for pickle.", + "builtins.SHA512Type.__repr__" => "Return repr(self).", + "builtins.SHA512Type.__setattr__" => "Implement setattr(self, name, value).", + "builtins.SHA512Type.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.SHA512Type.__str__" => "Return str(self).", + "builtins.SHA512Type.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.SHA512Type.copy" => "Return a copy of the hash object.", + "builtins.SHA512Type.digest" => "Return the digest value as a bytes object.", + "builtins.SHA512Type.hexdigest" => "Return the digest value as a string of hexadecimal digits.", + "builtins.SHA512Type.update" => "Update this hash object's state with the provided string.", + "builtins.SMTP" => "This class manages a connection to an SMTP or ESMTP server.\nSMTP Objects:\n SMTP objects have the following attributes:\n helo_resp\n This is the message given by the server in response to the\n most recent HELO command.\n\n ehlo_resp\n This is the message given by the server in response to the\n most recent EHLO command. This is usually multiline.\n\n does_esmtp\n This is a True value _after you do an EHLO command_, if the\n server supports ESMTP.\n\n esmtp_features\n This is a dictionary, which, if the server supports ESMTP,\n will _after you do an EHLO command_, contain the names of the\n SMTP service extensions this server supports, and their\n parameters (if any).\n\n Note, all extension names are mapped to lower case in the\n dictionary.\n\n See each method's docstrings for details. In general, there is a\n method of the same name to perform each SMTP command. There is also a\n method called 'sendmail' that will do an entire mail transaction.", + "builtins.SMTP.__delattr__" => "Implement delattr(self, name).", + "builtins.SMTP.__eq__" => "Return self==value.", + "builtins.SMTP.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.SMTP.__ge__" => "Return self>=value.", + "builtins.SMTP.__getattribute__" => "Return getattr(self, name).", + "builtins.SMTP.__getstate__" => "Helper for pickle.", + "builtins.SMTP.__gt__" => "Return self>value.", + "builtins.SMTP.__hash__" => "Return hash(self).", + "builtins.SMTP.__init__" => "Initialize a new instance.\n\nIf specified, `host` is the name of the remote host to which to\nconnect. If specified, `port` specifies the port to which to connect.\nBy default, smtplib.SMTP_PORT is used. If a host is specified the\nconnect method is called, and if it returns anything other than a\nsuccess code an SMTPConnectError is raised. If specified,\n`local_hostname` is used as the FQDN of the local host in the HELO/EHLO\ncommand. Otherwise, the local hostname is found using\nsocket.getfqdn(). The `source_address` parameter takes a 2-tuple (host,\nport) for the socket to bind to as its source address before\nconnecting. If the host is '' and port is 0, the OS default behavior\nwill be used.", + "builtins.SMTP.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.SMTP.__le__" => "Return self<=value.", + "builtins.SMTP.__lt__" => "Return self<value.", + "builtins.SMTP.__ne__" => "Return self!=value.", + "builtins.SMTP.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.SMTP.__reduce__" => "Helper for pickle.", + "builtins.SMTP.__reduce_ex__" => "Helper for pickle.", + "builtins.SMTP.__repr__" => "Return repr(self).", + "builtins.SMTP.__setattr__" => "Implement setattr(self, name, value).", + "builtins.SMTP.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.SMTP.__str__" => "Return str(self).", + "builtins.SMTP.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.SMTP.__weakref__" => "list of weak references to the object", + "builtins.SMTP._rset" => "Internal 'rset' command which ignores any SMTPServerDisconnected error.\n\nUsed internally in the library, since the server disconnected error\nshould appear to the application when the *next* command is issued, if\nwe are doing an internal \"safety\" reset.", + "builtins.SMTP.auth" => "Authentication command - requires response processing.\n\n'mechanism' specifies which authentication mechanism is to\nbe used - the valid values are those listed in the 'auth'\nelement of 'esmtp_features'.\n\n'authobject' must be a callable object taking a single argument:\n\n data = authobject(challenge)\n\nIt will be called to process the server's challenge response; the\nchallenge argument it is passed will be a bytes. It should return\nan ASCII string that will be base64 encoded and sent to the server.\n\nKeyword arguments:\n - initial_response_ok: Allow sending the RFC 4954 initial-response\n to the AUTH command, if the authentication methods supports it.", + "builtins.SMTP.auth_cram_md5" => "Authobject to use with CRAM-MD5 authentication. Requires self.user\nand self.password to be set.", + "builtins.SMTP.auth_login" => "Authobject to use with LOGIN authentication. Requires self.user and\nself.password to be set.", + "builtins.SMTP.auth_plain" => "Authobject to use with PLAIN authentication. Requires self.user and\nself.password to be set.", + "builtins.SMTP.close" => "Close the connection to the SMTP server.", + "builtins.SMTP.connect" => "Connect to a host on a given port.\n\nIf the hostname ends with a colon (':') followed by a number, and\nthere is no port specified, that suffix will be stripped off and the\nnumber interpreted as the port number to use.\n\nNote: This method is automatically invoked by __init__, if a host is\nspecified during instantiation.", + "builtins.SMTP.data" => "SMTP 'DATA' command -- sends message data to server.\n\nAutomatically quotes lines beginning with a period per rfc821.\nRaises SMTPDataError if there is an unexpected reply to the\nDATA command; the return value from this method is the final\nresponse code received when the all data is sent. If msg\nis a string, lone '\\r' and '\\n' characters are converted to\n'\\r\\n' characters. If msg is bytes, it is transmitted as is.", + "builtins.SMTP.docmd" => "Send a command, and return its response code.", + "builtins.SMTP.ehlo" => "SMTP 'ehlo' command.\nHostname to send for this command defaults to the FQDN of the local\nhost.", + "builtins.SMTP.ehlo_or_helo_if_needed" => "Call self.ehlo() and/or self.helo() if needed.\n\nIf there has been no previous EHLO or HELO command this session, this\nmethod tries ESMTP EHLO first.\n\nThis method may raise the following exceptions:\n\n SMTPHeloError The server didn't reply properly to\n the helo greeting.", + "builtins.SMTP.expn" => "SMTP 'expn' command -- expands a mailing list.", + "builtins.SMTP.getreply" => "Get a reply from the server.\n\nReturns a tuple consisting of:\n\n - server response code (e.g. '250', or such, if all goes well)\n Note: returns -1 if it can't read response code.\n\n - server response string corresponding to response code (multiline\n responses are converted to a single, multiline string).\n\nRaises SMTPServerDisconnected if end-of-file is reached.", + "builtins.SMTP.has_extn" => "Does the server support a given SMTP service extension?", + "builtins.SMTP.helo" => "SMTP 'helo' command.\nHostname to send for this command defaults to the FQDN of the local\nhost.", + "builtins.SMTP.help" => "SMTP 'help' command.\nReturns help text from server.", + "builtins.SMTP.login" => "Log in on an SMTP server that requires authentication.\n\nThe arguments are:\n - user: The user name to authenticate with.\n - password: The password for the authentication.\n\nKeyword arguments:\n - initial_response_ok: Allow sending the RFC 4954 initial-response\n to the AUTH command, if the authentication methods supports it.\n\nIf there has been no previous EHLO or HELO command this session, this\nmethod tries ESMTP EHLO first.\n\nThis method will return normally if the authentication was successful.\n\nThis method may raise the following exceptions:\n\n SMTPHeloError The server didn't reply properly to\n the helo greeting.\n SMTPAuthenticationError The server didn't accept the username/\n password combination.\n SMTPNotSupportedError The AUTH command is not supported by the\n server.\n SMTPException No suitable authentication method was\n found.", + "builtins.SMTP.mail" => "SMTP 'mail' command -- begins mail xfer session.\n\nThis method may raise the following exceptions:\n\n SMTPNotSupportedError The options parameter includes 'SMTPUTF8'\n but the SMTPUTF8 extension is not supported by\n the server.", + "builtins.SMTP.noop" => "SMTP 'noop' command -- doesn't do anything :>", + "builtins.SMTP.putcmd" => "Send a command to the server.", + "builtins.SMTP.quit" => "Terminate the SMTP session.", + "builtins.SMTP.rcpt" => "SMTP 'rcpt' command -- indicates 1 recipient for this mail.", + "builtins.SMTP.rset" => "SMTP 'rset' command -- resets session.", + "builtins.SMTP.send" => "Send 's' to the server.", + "builtins.SMTP.send_message" => "Converts message to a bytestring and passes it to sendmail.\n\nThe arguments are as for sendmail, except that msg is an\nemail.message.Message object. If from_addr is None or to_addrs is\nNone, these arguments are taken from the headers of the Message as\ndescribed in RFC 5322 (a ValueError is raised if there is more than\none set of 'Resent-' headers). Regardless of the values of from_addr and\nto_addr, any Bcc field (or Resent-Bcc field, when the Message is a\nresent) of the Message object won't be transmitted. The Message\nobject is then serialized using email.generator.BytesGenerator and\nsendmail is called to transmit the message. If the sender or any of\nthe recipient addresses contain non-ASCII and the server advertises the\nSMTPUTF8 capability, the policy is cloned with utf8 set to True for the\nserialization, and SMTPUTF8 and BODY=8BITMIME are asserted on the send.\nIf the server does not support SMTPUTF8, an SMTPNotSupported error is\nraised. Otherwise the generator is called without modifying the\npolicy.", + "builtins.SMTP.sendmail" => "This command performs an entire mail transaction.\n\nThe arguments are:\n - from_addr : The address sending this mail.\n - to_addrs : A list of addresses to send this mail to. A bare\n string will be treated as a list with 1 address.\n - msg : The message to send.\n - mail_options : List of ESMTP options (such as 8bitmime) for the\n mail command.\n - rcpt_options : List of ESMTP options (such as DSN commands) for\n all the rcpt commands.\n\nmsg may be a string containing characters in the ASCII range, or a byte\nstring. A string is encoded to bytes using the ascii codec, and lone\n\\r and \\n characters are converted to \\r\\n characters.\n\nIf there has been no previous EHLO or HELO command this session, this\nmethod tries ESMTP EHLO first. If the server does ESMTP, message size\nand each of the specified options will be passed to it. If EHLO\nfails, HELO will be tried and ESMTP options suppressed.\n\nThis method will return normally if the mail is accepted for at least\none recipient. It returns a dictionary, with one entry for each\nrecipient that was refused. Each entry contains a tuple of the SMTP\nerror code and the accompanying error message sent by the server.\n\nThis method may raise the following exceptions:\n\n SMTPHeloError The server didn't reply properly to\n the helo greeting.\n SMTPRecipientsRefused The server rejected ALL recipients\n (no mail was sent).\n SMTPSenderRefused The server didn't accept the from_addr.\n SMTPDataError The server replied with an unexpected\n error code (other than a refusal of\n a recipient).\n SMTPNotSupportedError The mail_options parameter includes 'SMTPUTF8'\n but the SMTPUTF8 extension is not supported by\n the server.\n\nNote: the connection will be open even after an exception is raised.\n\nExample:\n\n >>> import smtplib\n >>> s=smtplib.SMTP(\"localhost\")\n >>> tolist=[\"one@one.org\",\"two@two.org\",\"three@three.org\",\"four@four.org\"]\n >>> msg = '''\\\n ... From: Me@my.org\n ... Subject: testin'...\n ...\n ... This is a test '''\n >>> s.sendmail(\"me@my.org\",tolist,msg)\n { \"three@three.org\" : ( 550 ,\"User unknown\" ) }\n >>> s.quit()\n\nIn the above example, the message was accepted for delivery to three\nof the four addresses, and one was rejected, with the error code\n550. If all addresses are accepted, then the method will return an\nempty dictionary.", + "builtins.SMTP.set_debuglevel" => "Set the debug output level.\n\nA non-false value results in debug messages for connection and for all\nmessages sent to and received from the server.", + "builtins.SMTP.starttls" => "Puts the connection to the SMTP server into TLS mode.\n\nIf there has been no previous EHLO or HELO command this session, this\nmethod tries ESMTP EHLO first.\n\nIf the server supports TLS, this will encrypt the rest of the SMTP\nsession. If you provide the context parameter,\nthe identity of the SMTP server and client can be checked. This,\nhowever, depends on whether the socket module really checks the\ncertificates.\n\nThis method may raise the following exceptions:\n\n SMTPHeloError The server didn't reply properly to\n the helo greeting.", + "builtins.SMTP.verify" => "SMTP 'verify' command -- checks for address validity.", + "builtins.SMTP.vrfy" => "SMTP 'verify' command -- checks for address validity.", + "builtins.SRE_Scanner.__delattr__" => "Implement delattr(self, name).", + "builtins.SRE_Scanner.__eq__" => "Return self==value.", + "builtins.SRE_Scanner.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.SRE_Scanner.__ge__" => "Return self>=value.", + "builtins.SRE_Scanner.__getattribute__" => "Return getattr(self, name).", + "builtins.SRE_Scanner.__getstate__" => "Helper for pickle.", + "builtins.SRE_Scanner.__gt__" => "Return self>value.", + "builtins.SRE_Scanner.__hash__" => "Return hash(self).", + "builtins.SRE_Scanner.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.SRE_Scanner.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.SRE_Scanner.__le__" => "Return self<=value.", + "builtins.SRE_Scanner.__lt__" => "Return self<value.", + "builtins.SRE_Scanner.__ne__" => "Return self!=value.", + "builtins.SRE_Scanner.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.SRE_Scanner.__reduce__" => "Helper for pickle.", + "builtins.SRE_Scanner.__reduce_ex__" => "Helper for pickle.", + "builtins.SRE_Scanner.__repr__" => "Return repr(self).", + "builtins.SRE_Scanner.__setattr__" => "Implement setattr(self, name, value).", + "builtins.SRE_Scanner.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.SRE_Scanner.__str__" => "Return str(self).", + "builtins.SRE_Scanner.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.SRE_Template.__delattr__" => "Implement delattr(self, name).", + "builtins.SRE_Template.__eq__" => "Return self==value.", + "builtins.SRE_Template.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.SRE_Template.__ge__" => "Return self>=value.", + "builtins.SRE_Template.__getattribute__" => "Return getattr(self, name).", + "builtins.SRE_Template.__getstate__" => "Helper for pickle.", + "builtins.SRE_Template.__gt__" => "Return self>value.", + "builtins.SRE_Template.__hash__" => "Return hash(self).", + "builtins.SRE_Template.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.SRE_Template.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.SRE_Template.__le__" => "Return self<=value.", + "builtins.SRE_Template.__lt__" => "Return self<value.", + "builtins.SRE_Template.__ne__" => "Return self!=value.", + "builtins.SRE_Template.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.SRE_Template.__reduce__" => "Helper for pickle.", + "builtins.SRE_Template.__reduce_ex__" => "Helper for pickle.", + "builtins.SRE_Template.__repr__" => "Return repr(self).", + "builtins.SRE_Template.__setattr__" => "Implement setattr(self, name, value).", + "builtins.SRE_Template.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.SRE_Template.__str__" => "Return str(self).", + "builtins.SRE_Template.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.SSLObject" => "This class implements an interface on top of a low-level SSL object as\nimplemented by OpenSSL. This object captures the state of an SSL connection\nbut does not provide any network IO itself. IO needs to be performed\nthrough separate \"BIO\" objects which are OpenSSL's IO abstraction layer.\n\nThis class does not have a public constructor. Instances are returned by\n``SSLContext.wrap_bio``. This class is typically used by framework authors\nthat want to implement asynchronous IO for SSL through memory buffers.\n\nWhen compared to ``SSLSocket``, this object lacks the following features:\n\n * Any form of network IO, including methods such as ``recv`` and ``send``.\n * The ``do_handshake_on_connect`` and ``suppress_ragged_eofs`` machinery.", + "builtins.SSLObject.__delattr__" => "Implement delattr(self, name).", + "builtins.SSLObject.__eq__" => "Return self==value.", + "builtins.SSLObject.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.SSLObject.__ge__" => "Return self>=value.", + "builtins.SSLObject.__getattribute__" => "Return getattr(self, name).", + "builtins.SSLObject.__getstate__" => "Helper for pickle.", + "builtins.SSLObject.__gt__" => "Return self>value.", + "builtins.SSLObject.__hash__" => "Return hash(self).", + "builtins.SSLObject.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.SSLObject.__le__" => "Return self<=value.", + "builtins.SSLObject.__lt__" => "Return self<value.", + "builtins.SSLObject.__ne__" => "Return self!=value.", + "builtins.SSLObject.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.SSLObject.__reduce__" => "Helper for pickle.", + "builtins.SSLObject.__reduce_ex__" => "Helper for pickle.", + "builtins.SSLObject.__repr__" => "Return repr(self).", + "builtins.SSLObject.__setattr__" => "Implement setattr(self, name, value).", + "builtins.SSLObject.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.SSLObject.__str__" => "Return str(self).", + "builtins.SSLObject.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.SSLObject.__weakref__" => "list of weak references to the object", + "builtins.SSLObject.cipher" => "Return the currently selected cipher as a 3-tuple ``(name,\nssl_version, secret_bits)``.", + "builtins.SSLObject.compression" => "Return the current compression algorithm in use, or ``None`` if\ncompression was not negotiated or not supported by one of the peers.", + "builtins.SSLObject.context" => "The SSLContext that is currently in use.", + "builtins.SSLObject.do_handshake" => "Start the SSL/TLS handshake.", + "builtins.SSLObject.get_channel_binding" => "Get channel binding data for current connection. Raise ValueError\nif the requested `cb_type` is not supported. Return bytes of the data\nor None if the data is not available (e.g. before the handshake).", + "builtins.SSLObject.get_unverified_chain" => "Returns raw certificate chain provided by the other\nend of the SSL channel as a list of DER-encoded bytes.", + "builtins.SSLObject.get_verified_chain" => "Returns verified certificate chain provided by the other\nend of the SSL channel as a list of DER-encoded bytes.\n\nIf certificate verification was disabled method acts the same as\n``SSLSocket.get_unverified_chain``.", + "builtins.SSLObject.getpeercert" => "Returns a formatted version of the data in the certificate provided\nby the other end of the SSL channel.\n\nReturn None if no certificate was provided, {} if a certificate was\nprovided, but not validated.", + "builtins.SSLObject.pending" => "Return the number of bytes that can be read immediately.", + "builtins.SSLObject.read" => "Read up to 'len' bytes from the SSL object and return them.\n\nIf 'buffer' is provided, read into this buffer and return the number of\nbytes read.", + "builtins.SSLObject.selected_alpn_protocol" => "Return the currently selected ALPN protocol as a string, or ``None``\nif a next protocol was not negotiated or if ALPN is not supported by one\nof the peers.", + "builtins.SSLObject.selected_npn_protocol" => "Return the currently selected NPN protocol as a string, or ``None``\nif a next protocol was not negotiated or if NPN is not supported by one\nof the peers.", + "builtins.SSLObject.server_hostname" => "The currently set server hostname (for SNI), or ``None`` if no\nserver hostname is set.", + "builtins.SSLObject.server_side" => "Whether this is a server-side socket.", + "builtins.SSLObject.session" => "The SSLSession for client socket.", + "builtins.SSLObject.session_reused" => "Was the client session reused during handshake", + "builtins.SSLObject.shared_ciphers" => "Return a list of ciphers shared by the client during the handshake or\nNone if this is not a valid server connection.", + "builtins.SSLObject.unwrap" => "Start the SSL shutdown handshake.", + "builtins.SSLObject.version" => "Return a string identifying the protocol version used by the\ncurrent SSL channel.", + "builtins.SSLObject.write" => "Write 'data' to the SSL object and return the number of bytes\nwritten.\n\nThe 'data' argument must support the buffer interface.", + "builtins.SSLSession.__delattr__" => "Implement delattr(self, name).", + "builtins.SSLSession.__eq__" => "Return self==value.", + "builtins.SSLSession.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.SSLSession.__ge__" => "Return self>=value.", + "builtins.SSLSession.__getattribute__" => "Return getattr(self, name).", + "builtins.SSLSession.__getstate__" => "Helper for pickle.", + "builtins.SSLSession.__gt__" => "Return self>value.", + "builtins.SSLSession.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.SSLSession.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.SSLSession.__le__" => "Return self<=value.", + "builtins.SSLSession.__lt__" => "Return self<value.", + "builtins.SSLSession.__ne__" => "Return self!=value.", + "builtins.SSLSession.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.SSLSession.__reduce__" => "Helper for pickle.", + "builtins.SSLSession.__reduce_ex__" => "Helper for pickle.", + "builtins.SSLSession.__repr__" => "Return repr(self).", + "builtins.SSLSession.__setattr__" => "Implement setattr(self, name, value).", + "builtins.SSLSession.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.SSLSession.__str__" => "Return str(self).", + "builtins.SSLSession.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.SSLSession.has_ticket" => "Does the session contain a ticket?", + "builtins.SSLSession.id" => "Session ID.", + "builtins.SSLSession.ticket_lifetime_hint" => "Ticket life time hint.", + "builtins.SSLSession.time" => "Session creation time (seconds since epoch).", + "builtins.SSLSession.timeout" => "Session timeout (delta in seconds).", + "builtins.STARTUPINFO.__delattr__" => "Implement delattr(self, name).", + "builtins.STARTUPINFO.__eq__" => "Return self==value.", + "builtins.STARTUPINFO.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.STARTUPINFO.__ge__" => "Return self>=value.", + "builtins.STARTUPINFO.__getattribute__" => "Return getattr(self, name).", + "builtins.STARTUPINFO.__getstate__" => "Helper for pickle.", + "builtins.STARTUPINFO.__gt__" => "Return self>value.", + "builtins.STARTUPINFO.__hash__" => "Return hash(self).", + "builtins.STARTUPINFO.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.STARTUPINFO.__le__" => "Return self<=value.", + "builtins.STARTUPINFO.__lt__" => "Return self<value.", + "builtins.STARTUPINFO.__ne__" => "Return self!=value.", + "builtins.STARTUPINFO.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.STARTUPINFO.__reduce__" => "Helper for pickle.", + "builtins.STARTUPINFO.__reduce_ex__" => "Helper for pickle.", + "builtins.STARTUPINFO.__repr__" => "Return repr(self).", + "builtins.STARTUPINFO.__setattr__" => "Implement setattr(self, name, value).", + "builtins.STARTUPINFO.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.STARTUPINFO.__str__" => "Return str(self).", + "builtins.STARTUPINFO.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.STARTUPINFO.__weakref__" => "list of weak references to the object", + "builtins.SafeUUID.__delattr__" => "Implement delattr(self, name).", + "builtins.SafeUUID.__eq__" => "Return self==value.", + "builtins.SafeUUID.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.SafeUUID.__ge__" => "Return self>=value.", + "builtins.SafeUUID.__getattribute__" => "Return getattr(self, name).", + "builtins.SafeUUID.__getstate__" => "Helper for pickle.", + "builtins.SafeUUID.__gt__" => "Return self>value.", + "builtins.SafeUUID.__hash__" => "Return hash(self).", + "builtins.SafeUUID.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.SafeUUID.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.SafeUUID.__le__" => "Return self<=value.", + "builtins.SafeUUID.__lt__" => "Return self<value.", + "builtins.SafeUUID.__ne__" => "Return self!=value.", + "builtins.SafeUUID.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.SafeUUID.__reduce__" => "Helper for pickle.", + "builtins.SafeUUID.__reduce_ex__" => "Helper for pickle.", + "builtins.SafeUUID.__repr__" => "Return repr(self).", + "builtins.SafeUUID.__setattr__" => "Implement setattr(self, name, value).", + "builtins.SafeUUID.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.SafeUUID.__str__" => "Return str(self).", + "builtins.SafeUUID.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.SafeUUID.__weakref__" => "list of weak references to the object", + "builtins.ScandirIterator.__del__" => "Called when the instance is about to be destroyed.", + "builtins.ScandirIterator.__delattr__" => "Implement delattr(self, name).", + "builtins.ScandirIterator.__eq__" => "Return self==value.", + "builtins.ScandirIterator.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.ScandirIterator.__ge__" => "Return self>=value.", + "builtins.ScandirIterator.__getattribute__" => "Return getattr(self, name).", + "builtins.ScandirIterator.__getstate__" => "Helper for pickle.", + "builtins.ScandirIterator.__gt__" => "Return self>value.", + "builtins.ScandirIterator.__hash__" => "Return hash(self).", + "builtins.ScandirIterator.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.ScandirIterator.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.ScandirIterator.__iter__" => "Implement iter(self).", + "builtins.ScandirIterator.__le__" => "Return self<=value.", + "builtins.ScandirIterator.__lt__" => "Return self<value.", + "builtins.ScandirIterator.__ne__" => "Return self!=value.", + "builtins.ScandirIterator.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.ScandirIterator.__next__" => "Implement next(self).", + "builtins.ScandirIterator.__reduce__" => "Helper for pickle.", + "builtins.ScandirIterator.__reduce_ex__" => "Helper for pickle.", + "builtins.ScandirIterator.__repr__" => "Return repr(self).", + "builtins.ScandirIterator.__setattr__" => "Implement setattr(self, name, value).", + "builtins.ScandirIterator.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.ScandirIterator.__str__" => "Return str(self).", + "builtins.ScandirIterator.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Scanner" => "JSON scanner object", + "builtins.Scanner.__call__" => "Call self as a function.", + "builtins.Scanner.__delattr__" => "Implement delattr(self, name).", + "builtins.Scanner.__eq__" => "Return self==value.", + "builtins.Scanner.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Scanner.__ge__" => "Return self>=value.", + "builtins.Scanner.__getattribute__" => "Return getattr(self, name).", + "builtins.Scanner.__getstate__" => "Helper for pickle.", + "builtins.Scanner.__gt__" => "Return self>value.", + "builtins.Scanner.__hash__" => "Return hash(self).", + "builtins.Scanner.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Scanner.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Scanner.__le__" => "Return self<=value.", + "builtins.Scanner.__lt__" => "Return self<value.", + "builtins.Scanner.__ne__" => "Return self!=value.", + "builtins.Scanner.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Scanner.__reduce__" => "Helper for pickle.", + "builtins.Scanner.__reduce_ex__" => "Helper for pickle.", + "builtins.Scanner.__repr__" => "Return repr(self).", + "builtins.Scanner.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Scanner.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Scanner.__str__" => "Return str(self).", + "builtins.Scanner.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Scanner.__weakref__" => "list of weak references to the object", + "builtins.Scanner.object_hook" => "object_hook", + "builtins.Scanner.parse_constant" => "parse_constant", + "builtins.Scanner.parse_float" => "parse_float", + "builtins.Scanner.parse_int" => "parse_int", + "builtins.Scanner.strict" => "strict", + "builtins.SemLock" => "Semaphore/Mutex type", + "builtins.SemLock.__delattr__" => "Implement delattr(self, name).", + "builtins.SemLock.__enter__" => "Enter the semaphore/lock.", + "builtins.SemLock.__eq__" => "Return self==value.", + "builtins.SemLock.__exit__" => "Exit the semaphore/lock.", + "builtins.SemLock.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.SemLock.__ge__" => "Return self>=value.", + "builtins.SemLock.__getattribute__" => "Return getattr(self, name).", + "builtins.SemLock.__getstate__" => "Helper for pickle.", + "builtins.SemLock.__gt__" => "Return self>value.", + "builtins.SemLock.__hash__" => "Return hash(self).", + "builtins.SemLock.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.SemLock.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.SemLock.__le__" => "Return self<=value.", + "builtins.SemLock.__lt__" => "Return self<value.", + "builtins.SemLock.__ne__" => "Return self!=value.", + "builtins.SemLock.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.SemLock.__reduce__" => "Helper for pickle.", + "builtins.SemLock.__reduce_ex__" => "Helper for pickle.", + "builtins.SemLock.__repr__" => "Return repr(self).", + "builtins.SemLock.__setattr__" => "Implement setattr(self, name, value).", + "builtins.SemLock.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.SemLock.__str__" => "Return str(self).", + "builtins.SemLock.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.SemLock._after_fork" => "Rezero the net acquisition count after fork().", + "builtins.SemLock._count" => "Num of `acquire()`s minus num of `release()`s for this process.", + "builtins.SemLock._get_value" => "Get the value of the semaphore.", + "builtins.SemLock._is_mine" => "Whether the lock is owned by this thread.", + "builtins.SemLock._is_zero" => "Return whether semaphore has value zero.", + "builtins.SemLock.acquire" => "Acquire the semaphore/lock.", + "builtins.SemLock.handle" => "", + "builtins.SemLock.kind" => "", + "builtins.SemLock.maxvalue" => "", + "builtins.SemLock.name" => "", + "builtins.SemLock.release" => "Release the semaphore/lock.", + "builtins.Semaphore" => "This class implements semaphore objects.\n\nSemaphores manage a counter representing the number of release() calls minus\nthe number of acquire() calls, plus an initial value. The acquire() method\nblocks if necessary until it can return without making the counter\nnegative. If not given, value defaults to 1.", + "builtins.Semaphore.__delattr__" => "Implement delattr(self, name).", + "builtins.Semaphore.__enter__" => "Acquire a semaphore, decrementing the internal counter by one.\n\nWhen invoked without arguments: if the internal counter is larger than\nzero on entry, decrement it by one and return immediately. If it is zero\non entry, block, waiting until some other thread has called release() to\nmake it larger than zero. This is done with proper interlocking so that\nif multiple acquire() calls are blocked, release() will wake exactly one\nof them up. The implementation may pick one at random, so the order in\nwhich blocked threads are awakened should not be relied on. There is no\nreturn value in this case.\n\nWhen invoked with blocking set to true, do the same thing as when called\nwithout arguments, and return true.\n\nWhen invoked with blocking set to false, do not block. If a call without\nan argument would block, return false immediately; otherwise, do the\nsame thing as when called without arguments, and return true.\n\nWhen invoked with a timeout other than None, it will block for at\nmost timeout seconds. If acquire does not complete successfully in\nthat interval, return false. Return true otherwise.", + "builtins.Semaphore.__eq__" => "Return self==value.", + "builtins.Semaphore.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Semaphore.__ge__" => "Return self>=value.", + "builtins.Semaphore.__getattribute__" => "Return getattr(self, name).", + "builtins.Semaphore.__getstate__" => "Helper for pickle.", + "builtins.Semaphore.__gt__" => "Return self>value.", + "builtins.Semaphore.__hash__" => "Return hash(self).", + "builtins.Semaphore.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Semaphore.__le__" => "Return self<=value.", + "builtins.Semaphore.__lt__" => "Return self<value.", + "builtins.Semaphore.__ne__" => "Return self!=value.", + "builtins.Semaphore.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Semaphore.__reduce__" => "Helper for pickle.", + "builtins.Semaphore.__reduce_ex__" => "Helper for pickle.", + "builtins.Semaphore.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Semaphore.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Semaphore.__str__" => "Return str(self).", + "builtins.Semaphore.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Semaphore.__weakref__" => "list of weak references to the object", + "builtins.Semaphore.acquire" => "Acquire a semaphore, decrementing the internal counter by one.\n\nWhen invoked without arguments: if the internal counter is larger than\nzero on entry, decrement it by one and return immediately. If it is zero\non entry, block, waiting until some other thread has called release() to\nmake it larger than zero. This is done with proper interlocking so that\nif multiple acquire() calls are blocked, release() will wake exactly one\nof them up. The implementation may pick one at random, so the order in\nwhich blocked threads are awakened should not be relied on. There is no\nreturn value in this case.\n\nWhen invoked with blocking set to true, do the same thing as when called\nwithout arguments, and return true.\n\nWhen invoked with blocking set to false, do not block. If a call without\nan argument would block, return false immediately; otherwise, do the\nsame thing as when called without arguments, and return true.\n\nWhen invoked with a timeout other than None, it will block for at\nmost timeout seconds. If acquire does not complete successfully in\nthat interval, return false. Return true otherwise.", + "builtins.Semaphore.release" => "Release a semaphore, incrementing the internal counter by one or more.\n\nWhen the counter is zero on entry and another thread is waiting for it\nto become larger than zero again, wake up that thread.", + "builtins.SequenceMatcher" => "SequenceMatcher is a flexible class for comparing pairs of sequences of\nany type, so long as the sequence elements are hashable. The basic\nalgorithm predates, and is a little fancier than, an algorithm\npublished in the late 1980's by Ratcliff and Obershelp under the\nhyperbolic name \"gestalt pattern matching\". The basic idea is to find\nthe longest contiguous matching subsequence that contains no \"junk\"\nelements (R-O doesn't address junk). The same idea is then applied\nrecursively to the pieces of the sequences to the left and to the right\nof the matching subsequence. This does not yield minimal edit\nsequences, but does tend to yield matches that \"look right\" to people.\n\nSequenceMatcher tries to compute a \"human-friendly diff\" between two\nsequences. Unlike e.g. UNIX(tm) diff, the fundamental notion is the\nlongest *contiguous* & junk-free matching subsequence. That's what\ncatches peoples' eyes. The Windows(tm) windiff has another interesting\nnotion, pairing up elements that appear uniquely in each sequence.\nThat, and the method here, appear to yield more intuitive difference\nreports than does diff. This method appears to be the least vulnerable\nto syncing up on blocks of \"junk lines\", though (like blank lines in\nordinary text files, or maybe \"<P>\" lines in HTML files). That may be\nbecause this is the only method of the 3 that has a *concept* of\n\"junk\" <wink>.\n\nExample, comparing two strings, and considering blanks to be \"junk\":\n\n>>> s = SequenceMatcher(lambda x: x == \" \",\n... \"private Thread currentThread;\",\n... \"private volatile Thread currentThread;\")\n>>>\n\n.ratio() returns a float in [0, 1], measuring the \"similarity\" of the\nsequences. As a rule of thumb, a .ratio() value over 0.6 means the\nsequences are close matches:\n\n>>> print(round(s.ratio(), 2))\n0.87\n>>>\n\nIf you're only interested in where the sequences match,\n.get_matching_blocks() is handy:\n\n>>> for block in s.get_matching_blocks():\n... print(\"a[%d] and b[%d] match for %d elements\" % block)\na[0] and b[0] match for 8 elements\na[8] and b[17] match for 21 elements\na[29] and b[38] match for 0 elements\n\nNote that the last tuple returned by .get_matching_blocks() is always a\ndummy, (len(a), len(b), 0), and this is the only case in which the last\ntuple element (number of elements matched) is 0.\n\nIf you want to know how to change the first sequence into the second,\nuse .get_opcodes():\n\n>>> for opcode in s.get_opcodes():\n... print(\"%6s a[%d:%d] b[%d:%d]\" % opcode)\n equal a[0:8] b[0:8]\ninsert a[8:8] b[8:17]\n equal a[8:29] b[17:38]\n\nSee the Differ class for a fancy human-friendly file differencer, which\nuses SequenceMatcher both to compare sequences of lines, and to compare\nsequences of characters within similar (near-matching) lines.\n\nSee also function get_close_matches() in this module, which shows how\nsimple code building on SequenceMatcher can be used to do useful work.\n\nTiming: Basic R-O is cubic time worst case and quadratic time expected\ncase. SequenceMatcher is quadratic time for the worst case and has\nexpected-case behavior dependent in a complicated way on how many\nelements the sequences have in common; best case time is linear.", + "builtins.SequenceMatcher.__class_getitem__" => "Represent a PEP 585 generic type\n\nE.g. for t = list[int], t.__origin__ is list and t.__args__ is (int,).", + "builtins.SequenceMatcher.__delattr__" => "Implement delattr(self, name).", + "builtins.SequenceMatcher.__eq__" => "Return self==value.", + "builtins.SequenceMatcher.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.SequenceMatcher.__ge__" => "Return self>=value.", + "builtins.SequenceMatcher.__getattribute__" => "Return getattr(self, name).", + "builtins.SequenceMatcher.__getstate__" => "Helper for pickle.", + "builtins.SequenceMatcher.__gt__" => "Return self>value.", + "builtins.SequenceMatcher.__hash__" => "Return hash(self).", + "builtins.SequenceMatcher.__init__" => "Construct a SequenceMatcher.\n\nOptional arg isjunk is None (the default), or a one-argument\nfunction that takes a sequence element and returns true iff the\nelement is junk. None is equivalent to passing \"lambda x: 0\", i.e.\nno elements are considered to be junk. For example, pass\n lambda x: x in \" \\t\"\nif you're comparing lines as sequences of characters, and don't\nwant to synch up on blanks or hard tabs.\n\nOptional arg a is the first of two sequences to be compared. By\ndefault, an empty string. The elements of a must be hashable. See\nalso .set_seqs() and .set_seq1().\n\nOptional arg b is the second of two sequences to be compared. By\ndefault, an empty string. The elements of b must be hashable. See\nalso .set_seqs() and .set_seq2().\n\nOptional arg autojunk should be set to False to disable the\n\"automatic junk heuristic\" that treats popular elements as junk\n(see module documentation for more information).", + "builtins.SequenceMatcher.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.SequenceMatcher.__le__" => "Return self<=value.", + "builtins.SequenceMatcher.__lt__" => "Return self<value.", + "builtins.SequenceMatcher.__ne__" => "Return self!=value.", + "builtins.SequenceMatcher.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.SequenceMatcher.__reduce__" => "Helper for pickle.", + "builtins.SequenceMatcher.__reduce_ex__" => "Helper for pickle.", + "builtins.SequenceMatcher.__repr__" => "Return repr(self).", + "builtins.SequenceMatcher.__setattr__" => "Implement setattr(self, name, value).", + "builtins.SequenceMatcher.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.SequenceMatcher.__str__" => "Return str(self).", + "builtins.SequenceMatcher.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.SequenceMatcher.__weakref__" => "list of weak references to the object", + "builtins.SequenceMatcher.find_longest_match" => "Find longest matching block in a[alo:ahi] and b[blo:bhi].\n\nBy default it will find the longest match in the entirety of a and b.\n\nIf isjunk is not defined:\n\nReturn (i,j,k) such that a[i:i+k] is equal to b[j:j+k], where\n alo <= i <= i+k <= ahi\n blo <= j <= j+k <= bhi\nand for all (i',j',k') meeting those conditions,\n k >= k'\n i <= i'\n and if i == i', j <= j'\n\nIn other words, of all maximal matching blocks, return one that\nstarts earliest in a, and of all those maximal matching blocks that\nstart earliest in a, return the one that starts earliest in b.\n\n>>> s = SequenceMatcher(None, \" abcd\", \"abcd abcd\")\n>>> s.find_longest_match(0, 5, 0, 9)\nMatch(a=0, b=4, size=5)\n\nIf isjunk is defined, first the longest matching block is\ndetermined as above, but with the additional restriction that no\njunk element appears in the block. Then that block is extended as\nfar as possible by matching (only) junk elements on both sides. So\nthe resulting block never matches on junk except as identical junk\nhappens to be adjacent to an \"interesting\" match.\n\nHere's the same example as before, but considering blanks to be\njunk. That prevents \" abcd\" from matching the \" abcd\" at the tail\nend of the second sequence directly. Instead only the \"abcd\" can\nmatch, and matches the leftmost \"abcd\" in the second sequence:\n\n>>> s = SequenceMatcher(lambda x: x==\" \", \" abcd\", \"abcd abcd\")\n>>> s.find_longest_match(0, 5, 0, 9)\nMatch(a=1, b=0, size=4)\n\nIf no blocks match, return (alo, blo, 0).\n\n>>> s = SequenceMatcher(None, \"ab\", \"c\")\n>>> s.find_longest_match(0, 2, 0, 1)\nMatch(a=0, b=0, size=0)", + "builtins.SequenceMatcher.get_grouped_opcodes" => "Isolate change clusters by eliminating ranges with no changes.\n\nReturn a generator of groups with up to n lines of context.\nEach group is in the same format as returned by get_opcodes().\n\n>>> from pprint import pprint\n>>> a = list(map(str, range(1,40)))\n>>> b = a[:]\n>>> b[8:8] = ['i'] # Make an insertion\n>>> b[20] += 'x' # Make a replacement\n>>> b[23:28] = [] # Make a deletion\n>>> b[30] += 'y' # Make another replacement\n>>> pprint(list(SequenceMatcher(None,a,b).get_grouped_opcodes()))\n[[('equal', 5, 8, 5, 8), ('insert', 8, 8, 8, 9), ('equal', 8, 11, 9, 12)],\n [('equal', 16, 19, 17, 20),\n ('replace', 19, 20, 20, 21),\n ('equal', 20, 22, 21, 23),\n ('delete', 22, 27, 23, 23),\n ('equal', 27, 30, 23, 26)],\n [('equal', 31, 34, 27, 30),\n ('replace', 34, 35, 30, 31),\n ('equal', 35, 38, 31, 34)]]", + "builtins.SequenceMatcher.get_matching_blocks" => "Return list of triples describing matching subsequences.\n\nEach triple is of the form (i, j, n), and means that\na[i:i+n] == b[j:j+n]. The triples are monotonically increasing in\ni and in j. New in Python 2.5, it's also guaranteed that if\n(i, j, n) and (i', j', n') are adjacent triples in the list, and\nthe second is not the last triple in the list, then i+n != i' or\nj+n != j'. IOW, adjacent triples never describe adjacent equal\nblocks.\n\nThe last triple is a dummy, (len(a), len(b), 0), and is the only\ntriple with n==0.\n\n>>> s = SequenceMatcher(None, \"abxcd\", \"abcd\")\n>>> list(s.get_matching_blocks())\n[Match(a=0, b=0, size=2), Match(a=3, b=2, size=2), Match(a=5, b=4, size=0)]", + "builtins.SequenceMatcher.get_opcodes" => "Return list of 5-tuples describing how to turn a into b.\n\nEach tuple is of the form (tag, i1, i2, j1, j2). The first tuple\nhas i1 == j1 == 0, and remaining tuples have i1 == the i2 from the\ntuple preceding it, and likewise for j1 == the previous j2.\n\nThe tags are strings, with these meanings:\n\n'replace': a[i1:i2] should be replaced by b[j1:j2]\n'delete': a[i1:i2] should be deleted.\n Note that j1==j2 in this case.\n'insert': b[j1:j2] should be inserted at a[i1:i1].\n Note that i1==i2 in this case.\n'equal': a[i1:i2] == b[j1:j2]\n\n>>> a = \"qabxcd\"\n>>> b = \"abycdf\"\n>>> s = SequenceMatcher(None, a, b)\n>>> for tag, i1, i2, j1, j2 in s.get_opcodes():\n... print((\"%7s a[%d:%d] (%s) b[%d:%d] (%s)\" %\n... (tag, i1, i2, a[i1:i2], j1, j2, b[j1:j2])))\n delete a[0:1] (q) b[0:0] ()\n equal a[1:3] (ab) b[0:2] (ab)\nreplace a[3:4] (x) b[2:3] (y)\n equal a[4:6] (cd) b[3:5] (cd)\n insert a[6:6] () b[5:6] (f)", + "builtins.SequenceMatcher.quick_ratio" => "Return an upper bound on ratio() relatively quickly.\n\nThis isn't defined beyond that it is an upper bound on .ratio(), and\nis faster to compute.", + "builtins.SequenceMatcher.ratio" => "Return a measure of the sequences' similarity (float in [0,1]).\n\nWhere T is the total number of elements in both sequences, and\nM is the number of matches, this is 2.0*M / T.\nNote that this is 1 if the sequences are identical, and 0 if\nthey have nothing in common.\n\n.ratio() is expensive to compute if you haven't already computed\n.get_matching_blocks() or .get_opcodes(), in which case you may\nwant to try .quick_ratio() or .real_quick_ratio() first to get an\nupper bound.\n\n>>> s = SequenceMatcher(None, \"abcd\", \"bcde\")\n>>> s.ratio()\n0.75\n>>> s.quick_ratio()\n0.75\n>>> s.real_quick_ratio()\n1.0", + "builtins.SequenceMatcher.real_quick_ratio" => "Return an upper bound on ratio() very quickly.\n\nThis isn't defined beyond that it is an upper bound on .ratio(), and\nis faster to compute than either .ratio() or .quick_ratio().", + "builtins.SequenceMatcher.set_seq1" => "Set the first sequence to be compared.\n\nThe second sequence to be compared is not changed.\n\n>>> s = SequenceMatcher(None, \"abcd\", \"bcde\")\n>>> s.ratio()\n0.75\n>>> s.set_seq1(\"bcde\")\n>>> s.ratio()\n1.0\n>>>\n\nSequenceMatcher computes and caches detailed information about the\nsecond sequence, so if you want to compare one sequence S against\nmany sequences, use .set_seq2(S) once and call .set_seq1(x)\nrepeatedly for each of the other sequences.\n\nSee also set_seqs() and set_seq2().", + "builtins.SequenceMatcher.set_seq2" => "Set the second sequence to be compared.\n\nThe first sequence to be compared is not changed.\n\n>>> s = SequenceMatcher(None, \"abcd\", \"bcde\")\n>>> s.ratio()\n0.75\n>>> s.set_seq2(\"abcd\")\n>>> s.ratio()\n1.0\n>>>\n\nSequenceMatcher computes and caches detailed information about the\nsecond sequence, so if you want to compare one sequence S against\nmany sequences, use .set_seq2(S) once and call .set_seq1(x)\nrepeatedly for each of the other sequences.\n\nSee also set_seqs() and set_seq1().", + "builtins.SequenceMatcher.set_seqs" => "Set the two sequences to be compared.\n\n>>> s = SequenceMatcher()\n>>> s.set_seqs(\"abcd\", \"bcde\")\n>>> s.ratio()\n0.75", + "builtins.Shape" => "Data structure modeling shapes.\n\nattribute _type is one of \"polygon\", \"image\", \"compound\"\nattribute _data is - depending on _type a poygon-tuple,\nan image or a list constructed using the addcomponent method.", + "builtins.Shape.__delattr__" => "Implement delattr(self, name).", + "builtins.Shape.__eq__" => "Return self==value.", + "builtins.Shape.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Shape.__ge__" => "Return self>=value.", + "builtins.Shape.__getattribute__" => "Return getattr(self, name).", + "builtins.Shape.__getstate__" => "Helper for pickle.", + "builtins.Shape.__gt__" => "Return self>value.", + "builtins.Shape.__hash__" => "Return hash(self).", + "builtins.Shape.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Shape.__le__" => "Return self<=value.", + "builtins.Shape.__lt__" => "Return self<value.", + "builtins.Shape.__ne__" => "Return self!=value.", + "builtins.Shape.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Shape.__reduce__" => "Helper for pickle.", + "builtins.Shape.__reduce_ex__" => "Helper for pickle.", + "builtins.Shape.__repr__" => "Return repr(self).", + "builtins.Shape.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Shape.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Shape.__str__" => "Return str(self).", + "builtins.Shape.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Shape.__weakref__" => "list of weak references to the object", + "builtins.Shape.addcomponent" => "Add component to a shape of type compound.\n\nArguments: poly is a polygon, i. e. a tuple of number pairs.\nfill is the fillcolor of the component,\noutline is the outline color of the component.\n\ncall (for a Shapeobject namend s):\n-- s.addcomponent(((0,0), (10,10), (-10,10)), \"red\", \"blue\")\n\nExample:\n>>> poly = ((0,0),(10,-5),(0,10),(-10,-5))\n>>> s = Shape(\"compound\")\n>>> s.addcomponent(poly, \"red\", \"blue\")\n>>> # .. add more components and then use register_shape()", + "builtins.SignalDictMixin.__delattr__" => "Implement delattr(self, name).", + "builtins.SignalDictMixin.__delitem__" => "Delete self[key].", + "builtins.SignalDictMixin.__eq__" => "Return self==value.", + "builtins.SignalDictMixin.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.SignalDictMixin.__ge__" => "Return self>=value.", + "builtins.SignalDictMixin.__getattribute__" => "Return getattr(self, name).", + "builtins.SignalDictMixin.__getitem__" => "Return self[key].", + "builtins.SignalDictMixin.__getstate__" => "Helper for pickle.", + "builtins.SignalDictMixin.__gt__" => "Return self>value.", + "builtins.SignalDictMixin.__hash__" => "Return hash(self).", + "builtins.SignalDictMixin.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.SignalDictMixin.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.SignalDictMixin.__iter__" => "Implement iter(self).", + "builtins.SignalDictMixin.__le__" => "Return self<=value.", + "builtins.SignalDictMixin.__len__" => "Return len(self).", + "builtins.SignalDictMixin.__lt__" => "Return self<value.", + "builtins.SignalDictMixin.__ne__" => "Return self!=value.", + "builtins.SignalDictMixin.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.SignalDictMixin.__reduce__" => "Helper for pickle.", + "builtins.SignalDictMixin.__reduce_ex__" => "Helper for pickle.", + "builtins.SignalDictMixin.__repr__" => "Return repr(self).", + "builtins.SignalDictMixin.__setattr__" => "Implement setattr(self, name, value).", + "builtins.SignalDictMixin.__setitem__" => "Set self[key] to value.", + "builtins.SignalDictMixin.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.SignalDictMixin.__str__" => "Return str(self).", + "builtins.SignalDictMixin.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Signature" => "A Signature object represents the overall signature of a function.\nIt stores a Parameter object for each parameter accepted by the\nfunction, as well as information specific to the function itself.\n\nA Signature object has the following public attributes and methods:\n\n* parameters : OrderedDict\n An ordered mapping of parameters' names to the corresponding\n Parameter objects (keyword-only arguments are in the same order\n as listed in `code.co_varnames`).\n* return_annotation : object\n The annotation for the return type of the function if specified.\n If the function has no annotation for its return type, this\n attribute is set to `Signature.empty`.\n* bind(*args, **kwargs) -> BoundArguments\n Creates a mapping from positional and keyword arguments to\n parameters.\n* bind_partial(*args, **kwargs) -> BoundArguments\n Creates a partial mapping from positional and keyword arguments\n to parameters (simulating 'functools.partial' behavior.)", + "builtins.Signature.__delattr__" => "Implement delattr(self, name).", + "builtins.Signature.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Signature.__ge__" => "Return self>=value.", + "builtins.Signature.__getattribute__" => "Return getattr(self, name).", + "builtins.Signature.__getstate__" => "Helper for pickle.", + "builtins.Signature.__gt__" => "Return self>value.", + "builtins.Signature.__init__" => "Constructs Signature from the given list of Parameter\nobjects and 'return_annotation'. All arguments are optional.", + "builtins.Signature.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Signature.__le__" => "Return self<=value.", + "builtins.Signature.__lt__" => "Return self<value.", + "builtins.Signature.__ne__" => "Return self!=value.", + "builtins.Signature.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Signature.__reduce_ex__" => "Helper for pickle.", + "builtins.Signature.__replace__" => "Creates a customized copy of the Signature.\nPass 'parameters' and/or 'return_annotation' arguments\nto override them in the new copy.", + "builtins.Signature.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Signature.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Signature.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Signature._bind" => "Private method. Don't use directly.", + "builtins.Signature._bound_arguments_cls" => "Result of `Signature.bind` call. Holds the mapping of arguments\nto the function's parameters.\n\nHas the following public attributes:\n\n* arguments : dict\n An ordered mutable mapping of parameters' names to arguments' values.\n Does not contain arguments' default values.\n* signature : Signature\n The Signature object that created this instance.\n* args : tuple\n Tuple of positional arguments values.\n* kwargs : dict\n Dict of keyword arguments values.", + "builtins.Signature._bound_arguments_cls.__delattr__" => "Implement delattr(self, name).", + "builtins.Signature._bound_arguments_cls.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Signature._bound_arguments_cls.__ge__" => "Return self>=value.", + "builtins.Signature._bound_arguments_cls.__getattribute__" => "Return getattr(self, name).", + "builtins.Signature._bound_arguments_cls.__gt__" => "Return self>value.", + "builtins.Signature._bound_arguments_cls.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Signature._bound_arguments_cls.__le__" => "Return self<=value.", + "builtins.Signature._bound_arguments_cls.__lt__" => "Return self<value.", + "builtins.Signature._bound_arguments_cls.__ne__" => "Return self!=value.", + "builtins.Signature._bound_arguments_cls.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Signature._bound_arguments_cls.__reduce__" => "Helper for pickle.", + "builtins.Signature._bound_arguments_cls.__reduce_ex__" => "Helper for pickle.", + "builtins.Signature._bound_arguments_cls.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Signature._bound_arguments_cls.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Signature._bound_arguments_cls.__str__" => "Return str(self).", + "builtins.Signature._bound_arguments_cls.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Signature._bound_arguments_cls.__weakref__" => "list of weak references to the object", + "builtins.Signature._bound_arguments_cls.apply_defaults" => "Set default values for missing arguments.\n\nFor variable-positional arguments (*args) the default is an\nempty tuple.\n\nFor variable-keyword arguments (**kwargs) the default is an\nempty dict.", + "builtins.Signature._parameter_cls" => "Represents a parameter in a function signature.\n\nHas the following public attributes:\n\n* name : str\n The name of the parameter as a string.\n* default : object\n The default value for the parameter if specified. If the\n parameter has no default value, this attribute is set to\n `Parameter.empty`.\n* annotation\n The annotation for the parameter if specified. If the\n parameter has no annotation, this attribute is set to\n `Parameter.empty`.\n* kind\n Describes how argument values are bound to the parameter.\n Possible values: `Parameter.POSITIONAL_ONLY`,\n `Parameter.POSITIONAL_OR_KEYWORD`, `Parameter.VAR_POSITIONAL`,\n `Parameter.KEYWORD_ONLY`, `Parameter.VAR_KEYWORD`.\n Every value has a `description` attribute describing meaning.", + "builtins.Signature._parameter_cls.__delattr__" => "Implement delattr(self, name).", + "builtins.Signature._parameter_cls.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Signature._parameter_cls.__ge__" => "Return self>=value.", + "builtins.Signature._parameter_cls.__getattribute__" => "Return getattr(self, name).", + "builtins.Signature._parameter_cls.__getstate__" => "Helper for pickle.", + "builtins.Signature._parameter_cls.__gt__" => "Return self>value.", + "builtins.Signature._parameter_cls.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Signature._parameter_cls.__le__" => "Return self<=value.", + "builtins.Signature._parameter_cls.__lt__" => "Return self<value.", + "builtins.Signature._parameter_cls.__ne__" => "Return self!=value.", + "builtins.Signature._parameter_cls.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Signature._parameter_cls.__reduce_ex__" => "Helper for pickle.", + "builtins.Signature._parameter_cls.__replace__" => "Creates a customized copy of the Parameter.", + "builtins.Signature._parameter_cls.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Signature._parameter_cls.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Signature._parameter_cls.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Signature._parameter_cls.empty" => "Marker object for Signature.empty and Parameter.empty.", + "builtins.Signature._parameter_cls.empty.__delattr__" => "Implement delattr(self, name).", + "builtins.Signature._parameter_cls.empty.__eq__" => "Return self==value.", + "builtins.Signature._parameter_cls.empty.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Signature._parameter_cls.empty.__ge__" => "Return self>=value.", + "builtins.Signature._parameter_cls.empty.__getattribute__" => "Return getattr(self, name).", + "builtins.Signature._parameter_cls.empty.__getstate__" => "Helper for pickle.", + "builtins.Signature._parameter_cls.empty.__gt__" => "Return self>value.", + "builtins.Signature._parameter_cls.empty.__hash__" => "Return hash(self).", + "builtins.Signature._parameter_cls.empty.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Signature._parameter_cls.empty.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Signature._parameter_cls.empty.__le__" => "Return self<=value.", + "builtins.Signature._parameter_cls.empty.__lt__" => "Return self<value.", + "builtins.Signature._parameter_cls.empty.__ne__" => "Return self!=value.", + "builtins.Signature._parameter_cls.empty.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Signature._parameter_cls.empty.__reduce__" => "Helper for pickle.", + "builtins.Signature._parameter_cls.empty.__reduce_ex__" => "Helper for pickle.", + "builtins.Signature._parameter_cls.empty.__repr__" => "Return repr(self).", + "builtins.Signature._parameter_cls.empty.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Signature._parameter_cls.empty.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Signature._parameter_cls.empty.__str__" => "Return str(self).", + "builtins.Signature._parameter_cls.empty.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Signature._parameter_cls.empty.__weakref__" => "list of weak references to the object", + "builtins.Signature._parameter_cls.replace" => "Creates a customized copy of the Parameter.", + "builtins.Signature.bind" => "Get a BoundArguments object, that maps the passed `args`\nand `kwargs` to the function's signature. Raises `TypeError`\nif the passed arguments can not be bound.", + "builtins.Signature.bind_partial" => "Get a BoundArguments object, that partially maps the\npassed `args` and `kwargs` to the function's signature.\nRaises `TypeError` if the passed arguments can not be bound.", + "builtins.Signature.empty" => "Marker object for Signature.empty and Parameter.empty.", + "builtins.Signature.empty.__delattr__" => "Implement delattr(self, name).", + "builtins.Signature.empty.__eq__" => "Return self==value.", + "builtins.Signature.empty.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Signature.empty.__ge__" => "Return self>=value.", + "builtins.Signature.empty.__getattribute__" => "Return getattr(self, name).", + "builtins.Signature.empty.__getstate__" => "Helper for pickle.", + "builtins.Signature.empty.__gt__" => "Return self>value.", + "builtins.Signature.empty.__hash__" => "Return hash(self).", + "builtins.Signature.empty.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Signature.empty.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Signature.empty.__le__" => "Return self<=value.", + "builtins.Signature.empty.__lt__" => "Return self<value.", + "builtins.Signature.empty.__ne__" => "Return self!=value.", + "builtins.Signature.empty.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Signature.empty.__reduce__" => "Helper for pickle.", + "builtins.Signature.empty.__reduce_ex__" => "Helper for pickle.", + "builtins.Signature.empty.__repr__" => "Return repr(self).", + "builtins.Signature.empty.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Signature.empty.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Signature.empty.__str__" => "Return str(self).", + "builtins.Signature.empty.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Signature.empty.__weakref__" => "list of weak references to the object", + "builtins.Signature.format" => "Create a string representation of the Signature object.\n\nIf *max_width* integer is passed,\nsignature will try to fit into the *max_width*.\nIf signature is longer than *max_width*,\nall parameters will be on separate lines.\n\nIf *quote_annotation_strings* is False, annotations\nin the signature are displayed without opening and closing quotation\nmarks. This is useful when the signature was created with the\nSTRING format or when ``from __future__ import annotations`` was used.", + "builtins.Signature.from_callable" => "Constructs Signature for the given callable object.", + "builtins.Signature.replace" => "Creates a customized copy of the Signature.\nPass 'parameters' and/or 'return_annotation' arguments\nto override them in the new copy.", + "builtins.SimpleDialog.__delattr__" => "Implement delattr(self, name).", + "builtins.SimpleDialog.__eq__" => "Return self==value.", + "builtins.SimpleDialog.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.SimpleDialog.__ge__" => "Return self>=value.", + "builtins.SimpleDialog.__getattribute__" => "Return getattr(self, name).", + "builtins.SimpleDialog.__getstate__" => "Helper for pickle.", + "builtins.SimpleDialog.__gt__" => "Return self>value.", + "builtins.SimpleDialog.__hash__" => "Return hash(self).", + "builtins.SimpleDialog.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.SimpleDialog.__le__" => "Return self<=value.", + "builtins.SimpleDialog.__lt__" => "Return self<value.", + "builtins.SimpleDialog.__ne__" => "Return self!=value.", + "builtins.SimpleDialog.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.SimpleDialog.__reduce__" => "Helper for pickle.", + "builtins.SimpleDialog.__reduce_ex__" => "Helper for pickle.", + "builtins.SimpleDialog.__repr__" => "Return repr(self).", + "builtins.SimpleDialog.__setattr__" => "Implement setattr(self, name, value).", + "builtins.SimpleDialog.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.SimpleDialog.__str__" => "Return str(self).", + "builtins.SimpleDialog.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.SimpleDialog.__weakref__" => "list of weak references to the object", "builtins.SimpleNamespace" => "A simple attribute-based namespace.", "builtins.SimpleNamespace.__delattr__" => "Implement delattr(self, name).", "builtins.SimpleNamespace.__eq__" => "Return self==value.", @@ -11038,6 +18203,246 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.SimpleNamespace.__sizeof__" => "Size of object in memory, in bytes.", "builtins.SimpleNamespace.__str__" => "Return str(self).", "builtins.SimpleNamespace.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.SimpleQueue" => "Simple, unbounded, reentrant FIFO queue.", + "builtins.SimpleQueue.__class_getitem__" => "SimpleQueues are generic over the type of their contents", + "builtins.SimpleQueue.__delattr__" => "Implement delattr(self, name).", + "builtins.SimpleQueue.__eq__" => "Return self==value.", + "builtins.SimpleQueue.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.SimpleQueue.__ge__" => "Return self>=value.", + "builtins.SimpleQueue.__getattribute__" => "Return getattr(self, name).", + "builtins.SimpleQueue.__getstate__" => "Helper for pickle.", + "builtins.SimpleQueue.__gt__" => "Return self>value.", + "builtins.SimpleQueue.__hash__" => "Return hash(self).", + "builtins.SimpleQueue.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.SimpleQueue.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.SimpleQueue.__le__" => "Return self<=value.", + "builtins.SimpleQueue.__lt__" => "Return self<value.", + "builtins.SimpleQueue.__ne__" => "Return self!=value.", + "builtins.SimpleQueue.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.SimpleQueue.__reduce__" => "Helper for pickle.", + "builtins.SimpleQueue.__reduce_ex__" => "Helper for pickle.", + "builtins.SimpleQueue.__repr__" => "Return repr(self).", + "builtins.SimpleQueue.__setattr__" => "Implement setattr(self, name, value).", + "builtins.SimpleQueue.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.SimpleQueue.__str__" => "Return str(self).", + "builtins.SimpleQueue.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.SimpleQueue.empty" => "Return True if the queue is empty, False otherwise (not reliable!).", + "builtins.SimpleQueue.get" => "Remove and return an item from the queue.\n\nIf optional args 'block' is true and 'timeout' is None (the\ndefault), block if necessary until an item is available. If\n'timeout' is a non-negative number, it blocks at most 'timeout'\nseconds and raises the Empty exception if no item was available\nwithin that time.\nOtherwise ('block' is false), return an item if one is immediately\navailable, else raise the Empty exception ('timeout' is ignored\nin that case).", + "builtins.SimpleQueue.get_nowait" => "Remove and return an item from the queue without blocking.\n\nOnly get an item if one is immediately available. Otherwise\nraise the Empty exception.", + "builtins.SimpleQueue.put" => "Put the item on the queue.\n\nThe optional 'block' and 'timeout' arguments are ignored, as this\nmethod never blocks. They are provided for compatibility with the\nQueue class.", + "builtins.SimpleQueue.put_nowait" => "Put an item into the queue without blocking.\n\nThis is exactly equivalent to `put(item)` and is only provided\nfor compatibility with the Queue class.", + "builtins.SimpleQueue.qsize" => "Return the approximate size of the queue (not reliable!).", + "builtins.Sized.__delattr__" => "Implement delattr(self, name).", + "builtins.Sized.__eq__" => "Return self==value.", + "builtins.Sized.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Sized.__ge__" => "Return self>=value.", + "builtins.Sized.__getattribute__" => "Return getattr(self, name).", + "builtins.Sized.__getstate__" => "Helper for pickle.", + "builtins.Sized.__gt__" => "Return self>value.", + "builtins.Sized.__hash__" => "Return hash(self).", + "builtins.Sized.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Sized.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Sized.__le__" => "Return self<=value.", + "builtins.Sized.__lt__" => "Return self<value.", + "builtins.Sized.__ne__" => "Return self!=value.", + "builtins.Sized.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Sized.__reduce__" => "Helper for pickle.", + "builtins.Sized.__reduce_ex__" => "Helper for pickle.", + "builtins.Sized.__repr__" => "Return repr(self).", + "builtins.Sized.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Sized.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Sized.__str__" => "Return str(self).", + "builtins.Snapshot" => "Snapshot of traces of memory blocks allocated by Python.", + "builtins.Snapshot.__delattr__" => "Implement delattr(self, name).", + "builtins.Snapshot.__eq__" => "Return self==value.", + "builtins.Snapshot.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Snapshot.__ge__" => "Return self>=value.", + "builtins.Snapshot.__getattribute__" => "Return getattr(self, name).", + "builtins.Snapshot.__getstate__" => "Helper for pickle.", + "builtins.Snapshot.__gt__" => "Return self>value.", + "builtins.Snapshot.__hash__" => "Return hash(self).", + "builtins.Snapshot.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Snapshot.__le__" => "Return self<=value.", + "builtins.Snapshot.__lt__" => "Return self<value.", + "builtins.Snapshot.__ne__" => "Return self!=value.", + "builtins.Snapshot.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Snapshot.__reduce__" => "Helper for pickle.", + "builtins.Snapshot.__reduce_ex__" => "Helper for pickle.", + "builtins.Snapshot.__repr__" => "Return repr(self).", + "builtins.Snapshot.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Snapshot.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Snapshot.__str__" => "Return str(self).", + "builtins.Snapshot.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Snapshot.__weakref__" => "list of weak references to the object", + "builtins.Snapshot.compare_to" => "Compute the differences with an old snapshot old_snapshot. Get\nstatistics as a sorted list of StatisticDiff instances, grouped by\ngroup_by.", + "builtins.Snapshot.dump" => "Write the snapshot into a file.", + "builtins.Snapshot.filter_traces" => "Create a new Snapshot instance with a filtered traces sequence, filters\nis a list of Filter or DomainFilter instances. If filters is an empty\nlist, return a new Snapshot instance with a copy of the traces.", + "builtins.Snapshot.load" => "Load a snapshot from a file.", + "builtins.Snapshot.statistics" => "Group statistics by key_type. Return a sorted list of Statistic\ninstances.", + "builtins.Sniffer" => "\"Sniffs\" the format of a CSV file (i.e. delimiter, quotechar)\nReturns a Dialect object.", + "builtins.Sniffer.__delattr__" => "Implement delattr(self, name).", + "builtins.Sniffer.__eq__" => "Return self==value.", + "builtins.Sniffer.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Sniffer.__ge__" => "Return self>=value.", + "builtins.Sniffer.__getattribute__" => "Return getattr(self, name).", + "builtins.Sniffer.__getstate__" => "Helper for pickle.", + "builtins.Sniffer.__gt__" => "Return self>value.", + "builtins.Sniffer.__hash__" => "Return hash(self).", + "builtins.Sniffer.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Sniffer.__le__" => "Return self<=value.", + "builtins.Sniffer.__lt__" => "Return self<value.", + "builtins.Sniffer.__ne__" => "Return self!=value.", + "builtins.Sniffer.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Sniffer.__reduce__" => "Helper for pickle.", + "builtins.Sniffer.__reduce_ex__" => "Helper for pickle.", + "builtins.Sniffer.__repr__" => "Return repr(self).", + "builtins.Sniffer.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Sniffer.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Sniffer.__str__" => "Return str(self).", + "builtins.Sniffer.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Sniffer.__weakref__" => "list of weak references to the object", + "builtins.Sniffer._guess_delimiter" => "The delimiter /should/ occur the same number of times on\neach row. However, due to malformed data, it may not. We don't want\nan all or nothing approach, so we allow for small variations in this\nnumber.\n 1) build a table of the frequency of each character on every line.\n 2) build a table of frequencies of this frequency (meta-frequency?),\n e.g. 'x occurred 5 times in 10 rows, 6 times in 1000 rows,\n 7 times in 2 rows'\n 3) use the mode of the meta-frequency to determine the /expected/\n frequency for that character\n 4) find out how often the character actually meets that goal\n 5) the character that best meets its goal is the delimiter\nFor performance reasons, the data is evaluated in chunks, so it can\ntry and evaluate the smallest portion of the data possible, evaluating\nadditional chunks as necessary.", + "builtins.Sniffer._guess_quote_and_delimiter" => "Looks for text enclosed between two identical quotes\n(the probable quotechar) which are preceded and followed\nby the same character (the probable delimiter).\nFor example:\n ,'some text',\nThe quote with the most wins, same with the delimiter.\nIf there is no quotechar the delimiter can't be determined\nthis way.", + "builtins.Sniffer.sniff" => "Returns a dialect (or None) corresponding to the sample", + "builtins.StackObject.__delattr__" => "Implement delattr(self, name).", + "builtins.StackObject.__eq__" => "Return self==value.", + "builtins.StackObject.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.StackObject.__ge__" => "Return self>=value.", + "builtins.StackObject.__getattribute__" => "Return getattr(self, name).", + "builtins.StackObject.__getstate__" => "Helper for pickle.", + "builtins.StackObject.__gt__" => "Return self>value.", + "builtins.StackObject.__hash__" => "Return hash(self).", + "builtins.StackObject.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.StackObject.__le__" => "Return self<=value.", + "builtins.StackObject.__lt__" => "Return self<value.", + "builtins.StackObject.__ne__" => "Return self!=value.", + "builtins.StackObject.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.StackObject.__reduce__" => "Helper for pickle.", + "builtins.StackObject.__reduce_ex__" => "Helper for pickle.", + "builtins.StackObject.__setattr__" => "Implement setattr(self, name, value).", + "builtins.StackObject.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.StackObject.__str__" => "Return str(self).", + "builtins.StackObject.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.State.__delattr__" => "Implement delattr(self, name).", + "builtins.State.__eq__" => "Return self==value.", + "builtins.State.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.State.__ge__" => "Return self>=value.", + "builtins.State.__getattribute__" => "Return getattr(self, name).", + "builtins.State.__getstate__" => "Helper for pickle.", + "builtins.State.__gt__" => "Return self>value.", + "builtins.State.__hash__" => "Return hash(self).", + "builtins.State.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.State.__le__" => "Return self<=value.", + "builtins.State.__lt__" => "Return self<value.", + "builtins.State.__ne__" => "Return self!=value.", + "builtins.State.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.State.__reduce__" => "Helper for pickle.", + "builtins.State.__reduce_ex__" => "Helper for pickle.", + "builtins.State.__repr__" => "Return repr(self).", + "builtins.State.__setattr__" => "Implement setattr(self, name, value).", + "builtins.State.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.State.__str__" => "Return str(self).", + "builtins.State.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.State.__weakref__" => "list of weak references to the object", + "builtins.Statement.__delattr__" => "Implement delattr(self, name).", + "builtins.Statement.__eq__" => "Return self==value.", + "builtins.Statement.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Statement.__ge__" => "Return self>=value.", + "builtins.Statement.__getattribute__" => "Return getattr(self, name).", + "builtins.Statement.__getstate__" => "Helper for pickle.", + "builtins.Statement.__gt__" => "Return self>value.", + "builtins.Statement.__hash__" => "Return hash(self).", + "builtins.Statement.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Statement.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Statement.__le__" => "Return self<=value.", + "builtins.Statement.__lt__" => "Return self<value.", + "builtins.Statement.__ne__" => "Return self!=value.", + "builtins.Statement.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Statement.__reduce__" => "Helper for pickle.", + "builtins.Statement.__reduce_ex__" => "Helper for pickle.", + "builtins.Statement.__repr__" => "Return repr(self).", + "builtins.Statement.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Statement.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Statement.__str__" => "Return str(self).", + "builtins.Statement.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Statistic" => "Statistic difference on memory allocations between two Snapshot instance.", + "builtins.Statistic.__delattr__" => "Implement delattr(self, name).", + "builtins.Statistic.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Statistic.__ge__" => "Return self>=value.", + "builtins.Statistic.__getattribute__" => "Return getattr(self, name).", + "builtins.Statistic.__getstate__" => "Helper for pickle.", + "builtins.Statistic.__gt__" => "Return self>value.", + "builtins.Statistic.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Statistic.__le__" => "Return self<=value.", + "builtins.Statistic.__lt__" => "Return self<value.", + "builtins.Statistic.__ne__" => "Return self!=value.", + "builtins.Statistic.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Statistic.__reduce__" => "Helper for pickle.", + "builtins.Statistic.__reduce_ex__" => "Helper for pickle.", + "builtins.Statistic.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Statistic.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Statistic.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.StatisticDiff" => "Statistic difference on memory allocations between an old and a new\nSnapshot instance.", + "builtins.StatisticDiff.__delattr__" => "Implement delattr(self, name).", + "builtins.StatisticDiff.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.StatisticDiff.__ge__" => "Return self>=value.", + "builtins.StatisticDiff.__getattribute__" => "Return getattr(self, name).", + "builtins.StatisticDiff.__getstate__" => "Helper for pickle.", + "builtins.StatisticDiff.__gt__" => "Return self>value.", + "builtins.StatisticDiff.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.StatisticDiff.__le__" => "Return self<=value.", + "builtins.StatisticDiff.__lt__" => "Return self<value.", + "builtins.StatisticDiff.__ne__" => "Return self!=value.", + "builtins.StatisticDiff.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.StatisticDiff.__reduce__" => "Helper for pickle.", + "builtins.StatisticDiff.__reduce_ex__" => "Helper for pickle.", + "builtins.StatisticDiff.__setattr__" => "Implement setattr(self, name, value).", + "builtins.StatisticDiff.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.StatisticDiff.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Stats" => "This class is used for creating reports from data generated by the\nProfile class. It is a \"friend\" of that class, and imports data either\nby direct access to members of Profile class, or by reading in a dictionary\nthat was emitted (via marshal) from the Profile class.\n\nThe big change from the previous Profiler (in terms of raw functionality)\nis that an \"add()\" method has been provided to combine Stats from\nseveral distinct profile runs. Both the constructor and the add()\nmethod now take arbitrarily many file names as arguments.\n\nAll the print methods now take an argument that indicates how many lines\nto print. If the arg is a floating-point number between 0 and 1.0, then\nit is taken as a decimal percentage of the available lines to be printed\n(e.g., .1 means print 10% of all available lines). If it is an integer,\nit is taken to mean the number of lines of data that you wish to have\nprinted.\n\nThe sort_stats() method now processes some additional options (i.e., in\naddition to the old -1, 0, 1, or 2 that are respectively interpreted as\n'stdname', 'calls', 'time', and 'cumulative'). It takes either an\narbitrary number of quoted strings or SortKey enum to select the sort\norder.\n\nFor example sort_stats('time', 'name') or sort_stats(SortKey.TIME,\nSortKey.NAME) sorts on the major key of 'internal function time', and on\nthe minor key of 'the name of the function'. Look at the two tables in\nsort_stats() and get_sort_arg_defs(self) for more examples.\n\nAll methods return self, so you can string together commands like:\n Stats('foo', 'goo').strip_dirs().sort_stats('calls'). print_stats(5).print_callers(5)", + "builtins.Stats.__delattr__" => "Implement delattr(self, name).", + "builtins.Stats.__eq__" => "Return self==value.", + "builtins.Stats.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Stats.__ge__" => "Return self>=value.", + "builtins.Stats.__getattribute__" => "Return getattr(self, name).", + "builtins.Stats.__getstate__" => "Helper for pickle.", + "builtins.Stats.__gt__" => "Return self>value.", + "builtins.Stats.__hash__" => "Return hash(self).", + "builtins.Stats.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Stats.__le__" => "Return self<=value.", + "builtins.Stats.__lt__" => "Return self<value.", + "builtins.Stats.__ne__" => "Return self!=value.", + "builtins.Stats.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Stats.__reduce__" => "Helper for pickle.", + "builtins.Stats.__reduce_ex__" => "Helper for pickle.", + "builtins.Stats.__repr__" => "Return repr(self).", + "builtins.Stats.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Stats.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Stats.__str__" => "Return str(self).", + "builtins.Stats.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Stats.__weakref__" => "list of weak references to the object", + "builtins.Stats.dump_stats" => "Write the profile data to a file we know how to load back.", + "builtins.Stats.get_sort_arg_defs" => "Expand all abbreviations that are unique.", + "builtins.Stats.get_stats_profile" => "This method returns an instance of StatsProfile, which contains a mapping\nof function names to instances of FunctionProfile. Each FunctionProfile\ninstance holds information related to the function's profile such as how\nlong the function took to run, how many times it was called, etc...", + "builtins.StatsProfile" => "Class for keeping track of an item in inventory.", + "builtins.StatsProfile.__delattr__" => "Implement delattr(self, name).", + "builtins.StatsProfile.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.StatsProfile.__ge__" => "Return self>=value.", + "builtins.StatsProfile.__getattribute__" => "Return getattr(self, name).", + "builtins.StatsProfile.__getstate__" => "Helper for pickle.", + "builtins.StatsProfile.__gt__" => "Return self>value.", + "builtins.StatsProfile.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.StatsProfile.__le__" => "Return self<=value.", + "builtins.StatsProfile.__lt__" => "Return self<value.", + "builtins.StatsProfile.__ne__" => "Return self!=value.", + "builtins.StatsProfile.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.StatsProfile.__reduce__" => "Helper for pickle.", + "builtins.StatsProfile.__reduce_ex__" => "Helper for pickle.", + "builtins.StatsProfile.__setattr__" => "Implement setattr(self, name, value).", + "builtins.StatsProfile.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.StatsProfile.__str__" => "Return str(self).", + "builtins.StatsProfile.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.StatsProfile.__weakref__" => "list of weak references to the object", "builtins.StopAsyncIteration" => "Signal the end from iterator.__anext__().", "builtins.StopAsyncIteration.__delattr__" => "Implement delattr(self, name).", "builtins.StopAsyncIteration.__eq__" => "Return self==value.", @@ -11085,6 +18490,285 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.StopIteration.add_note" => "Add a note to the exception", "builtins.StopIteration.value" => "generator return value", "builtins.StopIteration.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.StreamReader.__delattr__" => "Implement delattr(self, name).", + "builtins.StreamReader.__eq__" => "Return self==value.", + "builtins.StreamReader.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.StreamReader.__ge__" => "Return self>=value.", + "builtins.StreamReader.__getattribute__" => "Return getattr(self, name).", + "builtins.StreamReader.__getstate__" => "Helper for pickle.", + "builtins.StreamReader.__gt__" => "Return self>value.", + "builtins.StreamReader.__hash__" => "Return hash(self).", + "builtins.StreamReader.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.StreamReader.__le__" => "Return self<=value.", + "builtins.StreamReader.__lt__" => "Return self<value.", + "builtins.StreamReader.__ne__" => "Return self!=value.", + "builtins.StreamReader.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.StreamReader.__reduce__" => "Helper for pickle.", + "builtins.StreamReader.__reduce_ex__" => "Helper for pickle.", + "builtins.StreamReader.__setattr__" => "Implement setattr(self, name, value).", + "builtins.StreamReader.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.StreamReader.__str__" => "Return str(self).", + "builtins.StreamReader.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.StreamReader.__weakref__" => "list of weak references to the object", + "builtins.StreamReader._wait_for_data" => "Wait until feed_data() or feed_eof() is called.\n\nIf stream was paused, automatically resume it.", + "builtins.StreamReader._wakeup_waiter" => "Wakeup read*() functions waiting for data or EOF.", + "builtins.StreamReader.at_eof" => "Return True if the buffer is empty and 'feed_eof' was called.", + "builtins.StreamReader.read" => "Read up to `n` bytes from the stream.\n\nIf `n` is not provided or set to -1,\nread until EOF, then return all read bytes.\nIf EOF was received and the internal buffer is empty,\nreturn an empty bytes object.\n\nIf `n` is 0, return an empty bytes object immediately.\n\nIf `n` is positive, return at most `n` available bytes\nas soon as at least 1 byte is available in the internal buffer.\nIf EOF is received before any byte is read, return an empty\nbytes object.\n\nReturned value is not limited with limit, configured at stream\ncreation.\n\nIf stream was paused, this function will automatically resume it if\nneeded.", + "builtins.StreamReader.readexactly" => "Read exactly `n` bytes.\n\nRaise an IncompleteReadError if EOF is reached before `n` bytes can be\nread. The IncompleteReadError.partial attribute of the exception will\ncontain the partial read bytes.\n\nif n is zero, return empty bytes object.\n\nReturned value is not limited with limit, configured at stream\ncreation.\n\nIf stream was paused, this function will automatically resume it if\nneeded.", + "builtins.StreamReader.readline" => "Read chunk of data from the stream until newline (b'\\n') is found.\n\nOn success, return chunk that ends with newline. If only partial\nline can be read due to EOF, return incomplete line without\nterminating newline. When EOF was reached while no bytes read,\nempty bytes object is returned.\n\nIf limit is reached, ValueError will be raised. In that case, if\nnewline was found, complete line including newline will be removed\nfrom internal buffer. Else, internal buffer will be cleared.\nLimit is compared against part of the line without newline.\n\nIf stream was paused, this function will automatically resume it if\nneeded.", + "builtins.StreamReader.readuntil" => "Read data from the stream until ``separator`` is found.\n\nOn success, the data and separator will be removed from the\ninternal buffer (consumed). Returned data will include the\nseparator at the end.\n\nConfigured stream limit is used to check result. Limit sets the\nmaximal length of data that can be returned, not counting the\nseparator.\n\nIf an EOF occurs and the complete separator is still not found,\nan IncompleteReadError exception will be raised, and the internal\nbuffer will be reset. The IncompleteReadError.partial attribute\nmay contain the separator partially.\n\nIf the data cannot be read because of over limit, a\nLimitOverrunError exception will be raised, and the data\nwill be left in the internal buffer, so it can be read again.\n\nThe ``separator`` may also be a tuple of separators. In this\ncase the return value will be the shortest possible that has any\nseparator as the suffix. For the purposes of LimitOverrunError,\nthe shortest possible separator is considered to be the one that\nmatched.", + "builtins.StreamReaderWriter" => "StreamReaderWriter instances allow wrapping streams which\nwork in both read and write modes.\n\nThe design is such that one can use the factory functions\nreturned by the codec.lookup() function to construct the\ninstance.", + "builtins.StreamReaderWriter.__delattr__" => "Implement delattr(self, name).", + "builtins.StreamReaderWriter.__eq__" => "Return self==value.", + "builtins.StreamReaderWriter.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.StreamReaderWriter.__ge__" => "Return self>=value.", + "builtins.StreamReaderWriter.__getattr__" => "Inherit all other methods from the underlying stream.", + "builtins.StreamReaderWriter.__getattribute__" => "Return getattr(self, name).", + "builtins.StreamReaderWriter.__getstate__" => "Helper for pickle.", + "builtins.StreamReaderWriter.__gt__" => "Return self>value.", + "builtins.StreamReaderWriter.__hash__" => "Return hash(self).", + "builtins.StreamReaderWriter.__init__" => "Creates a StreamReaderWriter instance.\n\nstream must be a Stream-like object.\n\nReader, Writer must be factory functions or classes\nproviding the StreamReader, StreamWriter interface resp.\n\nError handling is done in the same way as defined for the\nStreamWriter/Readers.", + "builtins.StreamReaderWriter.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.StreamReaderWriter.__le__" => "Return self<=value.", + "builtins.StreamReaderWriter.__lt__" => "Return self<value.", + "builtins.StreamReaderWriter.__ne__" => "Return self!=value.", + "builtins.StreamReaderWriter.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.StreamReaderWriter.__next__" => "Return the next decoded line from the input stream.", + "builtins.StreamReaderWriter.__reduce__" => "Helper for pickle.", + "builtins.StreamReaderWriter.__repr__" => "Return repr(self).", + "builtins.StreamReaderWriter.__setattr__" => "Implement setattr(self, name, value).", + "builtins.StreamReaderWriter.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.StreamReaderWriter.__str__" => "Return str(self).", + "builtins.StreamReaderWriter.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.StreamReaderWriter.__weakref__" => "list of weak references to the object", + "builtins.StreamRecoder" => "StreamRecoder instances translate data from one encoding to another.\n\nThey use the complete set of APIs returned by the\ncodecs.lookup() function to implement their task.\n\nData written to the StreamRecoder is first decoded into an\nintermediate format (depending on the \"decode\" codec) and then\nwritten to the underlying stream using an instance of the provided\nWriter class.\n\nIn the other direction, data is read from the underlying stream using\na Reader instance and then encoded and returned to the caller.", + "builtins.StreamRecoder.__delattr__" => "Implement delattr(self, name).", + "builtins.StreamRecoder.__eq__" => "Return self==value.", + "builtins.StreamRecoder.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.StreamRecoder.__ge__" => "Return self>=value.", + "builtins.StreamRecoder.__getattr__" => "Inherit all other methods from the underlying stream.", + "builtins.StreamRecoder.__getattribute__" => "Return getattr(self, name).", + "builtins.StreamRecoder.__getstate__" => "Helper for pickle.", + "builtins.StreamRecoder.__gt__" => "Return self>value.", + "builtins.StreamRecoder.__hash__" => "Return hash(self).", + "builtins.StreamRecoder.__init__" => "Creates a StreamRecoder instance which implements a two-way\nconversion: encode and decode work on the frontend (the\ndata visible to .read() and .write()) while Reader and Writer\nwork on the backend (the data in stream).\n\nYou can use these objects to do transparent\ntranscodings from e.g. latin-1 to utf-8 and back.\n\nstream must be a file-like object.\n\nencode and decode must adhere to the Codec interface; Reader and\nWriter must be factory functions or classes providing the\nStreamReader and StreamWriter interfaces resp.\n\nError handling is done in the same way as defined for the\nStreamWriter/Readers.", + "builtins.StreamRecoder.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.StreamRecoder.__le__" => "Return self<=value.", + "builtins.StreamRecoder.__lt__" => "Return self<value.", + "builtins.StreamRecoder.__ne__" => "Return self!=value.", + "builtins.StreamRecoder.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.StreamRecoder.__next__" => "Return the next decoded line from the input stream.", + "builtins.StreamRecoder.__reduce__" => "Helper for pickle.", + "builtins.StreamRecoder.__repr__" => "Return repr(self).", + "builtins.StreamRecoder.__setattr__" => "Implement setattr(self, name, value).", + "builtins.StreamRecoder.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.StreamRecoder.__str__" => "Return str(self).", + "builtins.StreamRecoder.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.StreamRecoder.__weakref__" => "list of weak references to the object", + "builtins.StreamWriter" => "Wraps a Transport.\n\nThis exposes write(), writelines(), [can_]write_eof(),\nget_extra_info() and close(). It adds drain() which returns an\noptional Future on which you can wait for flow control. It also\nadds a transport property which references the Transport\ndirectly.", + "builtins.StreamWriter.__delattr__" => "Implement delattr(self, name).", + "builtins.StreamWriter.__eq__" => "Return self==value.", + "builtins.StreamWriter.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.StreamWriter.__ge__" => "Return self>=value.", + "builtins.StreamWriter.__getattribute__" => "Return getattr(self, name).", + "builtins.StreamWriter.__getstate__" => "Helper for pickle.", + "builtins.StreamWriter.__gt__" => "Return self>value.", + "builtins.StreamWriter.__hash__" => "Return hash(self).", + "builtins.StreamWriter.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.StreamWriter.__le__" => "Return self<=value.", + "builtins.StreamWriter.__lt__" => "Return self<value.", + "builtins.StreamWriter.__ne__" => "Return self!=value.", + "builtins.StreamWriter.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.StreamWriter.__reduce__" => "Helper for pickle.", + "builtins.StreamWriter.__reduce_ex__" => "Helper for pickle.", + "builtins.StreamWriter.__setattr__" => "Implement setattr(self, name, value).", + "builtins.StreamWriter.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.StreamWriter.__str__" => "Return str(self).", + "builtins.StreamWriter.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.StreamWriter.__weakref__" => "list of weak references to the object", + "builtins.StreamWriter.drain" => "Flush the write buffer.\n\nThe intended use is to write\n\n w.write(data)\n await w.drain()", + "builtins.StreamWriter.start_tls" => "Upgrade an existing stream-based connection to TLS.", + "builtins.Struct" => "Struct(fmt) --> compiled struct object", + "builtins.Struct.__delattr__" => "Implement delattr(self, name).", + "builtins.Struct.__eq__" => "Return self==value.", + "builtins.Struct.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Struct.__ge__" => "Return self>=value.", + "builtins.Struct.__getattribute__" => "Return getattr(self, name).", + "builtins.Struct.__getstate__" => "Helper for pickle.", + "builtins.Struct.__gt__" => "Return self>value.", + "builtins.Struct.__hash__" => "Return hash(self).", + "builtins.Struct.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Struct.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Struct.__le__" => "Return self<=value.", + "builtins.Struct.__lt__" => "Return self<value.", + "builtins.Struct.__ne__" => "Return self!=value.", + "builtins.Struct.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Struct.__reduce__" => "Helper for pickle.", + "builtins.Struct.__reduce_ex__" => "Helper for pickle.", + "builtins.Struct.__repr__" => "Return repr(self).", + "builtins.Struct.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Struct.__sizeof__" => "S.__sizeof__() -> size of S in memory, in bytes", + "builtins.Struct.__str__" => "Return str(self).", + "builtins.Struct.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Struct.format" => "struct format string", + "builtins.Struct.iter_unpack" => "Return an iterator yielding tuples.\n\nTuples are unpacked from the given bytes source, like a repeated\ninvocation of unpack_from().\n\nRequires that the bytes length be a multiple of the struct size.", + "builtins.Struct.pack" => "S.pack(v1, v2, ...) -> bytes\n\nReturn a bytes object containing values v1, v2, ... packed according\nto the format string S.format. See help(struct) for more on format\nstrings.", + "builtins.Struct.pack_into" => "S.pack_into(buffer, offset, v1, v2, ...)\n\nPack the values v1, v2, ... according to the format string S.format\nand write the packed bytes into the writable buffer buf starting at\noffset. Note that the offset is a required argument. See\nhelp(struct) for more on format strings.", + "builtins.Struct.size" => "struct size in bytes", + "builtins.Struct.unpack" => "Return a tuple containing unpacked values.\n\nUnpack according to the format string Struct.format. The buffer's size\nin bytes must be Struct.size.\n\nSee help(struct) for more on format strings.", + "builtins.Struct.unpack_from" => "Return a tuple containing unpacked values.\n\nValues are unpacked according to the format string Struct.format.\n\nThe buffer's size in bytes, starting at position offset, must be\nat least Struct.size.\n\nSee help(struct) for more on format strings.", + "builtins.StructParam_Type.__delattr__" => "Implement delattr(self, name).", + "builtins.StructParam_Type.__eq__" => "Return self==value.", + "builtins.StructParam_Type.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.StructParam_Type.__ge__" => "Return self>=value.", + "builtins.StructParam_Type.__getattribute__" => "Return getattr(self, name).", + "builtins.StructParam_Type.__getstate__" => "Helper for pickle.", + "builtins.StructParam_Type.__gt__" => "Return self>value.", + "builtins.StructParam_Type.__hash__" => "Return hash(self).", + "builtins.StructParam_Type.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.StructParam_Type.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.StructParam_Type.__le__" => "Return self<=value.", + "builtins.StructParam_Type.__lt__" => "Return self<value.", + "builtins.StructParam_Type.__ne__" => "Return self!=value.", + "builtins.StructParam_Type.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.StructParam_Type.__reduce__" => "Helper for pickle.", + "builtins.StructParam_Type.__reduce_ex__" => "Helper for pickle.", + "builtins.StructParam_Type.__repr__" => "Return repr(self).", + "builtins.StructParam_Type.__setattr__" => "Implement setattr(self, name, value).", + "builtins.StructParam_Type.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.StructParam_Type.__str__" => "Return str(self).", + "builtins.StructParam_Type.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.StructUnionLayout.__delattr__" => "Implement delattr(self, name).", + "builtins.StructUnionLayout.__eq__" => "Return self==value.", + "builtins.StructUnionLayout.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.StructUnionLayout.__ge__" => "Return self>=value.", + "builtins.StructUnionLayout.__getattribute__" => "Return getattr(self, name).", + "builtins.StructUnionLayout.__getstate__" => "Helper for pickle.", + "builtins.StructUnionLayout.__gt__" => "Return self>value.", + "builtins.StructUnionLayout.__hash__" => "Return hash(self).", + "builtins.StructUnionLayout.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.StructUnionLayout.__le__" => "Return self<=value.", + "builtins.StructUnionLayout.__lt__" => "Return self<value.", + "builtins.StructUnionLayout.__ne__" => "Return self!=value.", + "builtins.StructUnionLayout.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.StructUnionLayout.__reduce__" => "Helper for pickle.", + "builtins.StructUnionLayout.__reduce_ex__" => "Helper for pickle.", + "builtins.StructUnionLayout.__repr__" => "Return repr(self).", + "builtins.StructUnionLayout.__setattr__" => "Implement setattr(self, name, value).", + "builtins.StructUnionLayout.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.StructUnionLayout.__str__" => "Return str(self).", + "builtins.StructUnionLayout.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.StructUnionLayout.__weakref__" => "list of weak references to the object", + "builtins.SubPattern.__delattr__" => "Implement delattr(self, name).", + "builtins.SubPattern.__eq__" => "Return self==value.", + "builtins.SubPattern.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.SubPattern.__ge__" => "Return self>=value.", + "builtins.SubPattern.__getattribute__" => "Return getattr(self, name).", + "builtins.SubPattern.__getstate__" => "Helper for pickle.", + "builtins.SubPattern.__gt__" => "Return self>value.", + "builtins.SubPattern.__hash__" => "Return hash(self).", + "builtins.SubPattern.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.SubPattern.__le__" => "Return self<=value.", + "builtins.SubPattern.__lt__" => "Return self<value.", + "builtins.SubPattern.__ne__" => "Return self!=value.", + "builtins.SubPattern.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.SubPattern.__reduce__" => "Helper for pickle.", + "builtins.SubPattern.__reduce_ex__" => "Helper for pickle.", + "builtins.SubPattern.__setattr__" => "Implement setattr(self, name, value).", + "builtins.SubPattern.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.SubPattern.__str__" => "Return str(self).", + "builtins.SubPattern.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.SubPattern.__weakref__" => "list of weak references to the object", + "builtins.Symbol.__delattr__" => "Implement delattr(self, name).", + "builtins.Symbol.__eq__" => "Return self==value.", + "builtins.Symbol.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Symbol.__ge__" => "Return self>=value.", + "builtins.Symbol.__getattribute__" => "Return getattr(self, name).", + "builtins.Symbol.__getstate__" => "Helper for pickle.", + "builtins.Symbol.__gt__" => "Return self>value.", + "builtins.Symbol.__hash__" => "Return hash(self).", + "builtins.Symbol.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Symbol.__le__" => "Return self<=value.", + "builtins.Symbol.__lt__" => "Return self<value.", + "builtins.Symbol.__ne__" => "Return self!=value.", + "builtins.Symbol.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Symbol.__reduce__" => "Helper for pickle.", + "builtins.Symbol.__reduce_ex__" => "Helper for pickle.", + "builtins.Symbol.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Symbol.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Symbol.__str__" => "Return str(self).", + "builtins.Symbol.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Symbol.__weakref__" => "list of weak references to the object", + "builtins.Symbol.get_name" => "Return a name of a symbol.", + "builtins.Symbol.get_namespace" => "Return the single namespace bound to this name.\n\nRaises ValueError if the name is bound to multiple namespaces\nor no namespace.", + "builtins.Symbol.get_namespaces" => "Return a list of namespaces bound to this name", + "builtins.Symbol.is_annotated" => "Return *True* if the symbol is annotated.", + "builtins.Symbol.is_assigned" => "Return *True* if a symbol is assigned to.", + "builtins.Symbol.is_comp_cell" => "Return *True* if the symbol is a cell in an inlined comprehension.", + "builtins.Symbol.is_comp_iter" => "Return *True* if the symbol is a comprehension iteration variable.", + "builtins.Symbol.is_declared_global" => "Return *True* if the symbol is declared global\nwith a global statement.", + "builtins.Symbol.is_free" => "Return *True* if a referenced symbol is\nnot assigned to.", + "builtins.Symbol.is_free_class" => "Return *True* if a class-scoped symbol is free from\nthe perspective of a method.", + "builtins.Symbol.is_global" => "Return *True* if the symbol is global.", + "builtins.Symbol.is_imported" => "Return *True* if the symbol is created from\nan import statement.", + "builtins.Symbol.is_local" => "Return *True* if the symbol is local.", + "builtins.Symbol.is_namespace" => "Returns *True* if name binding introduces new namespace.\n\nIf the name is used as the target of a function or class\nstatement, this will be true.\n\nNote that a single name can be bound to multiple objects. If\nis_namespace() is true, the name may also be bound to other\nobjects, like an int or list, that does not introduce a new\nnamespace.", + "builtins.Symbol.is_nonlocal" => "Return *True* if the symbol is nonlocal.", + "builtins.Symbol.is_parameter" => "Return *True* if the symbol is a parameter.", + "builtins.Symbol.is_referenced" => "Return *True* if the symbol is used in\nits block.", + "builtins.Symbol.is_type_parameter" => "Return *True* if the symbol is a type parameter.", + "builtins.SymbolTable.__delattr__" => "Implement delattr(self, name).", + "builtins.SymbolTable.__eq__" => "Return self==value.", + "builtins.SymbolTable.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.SymbolTable.__ge__" => "Return self>=value.", + "builtins.SymbolTable.__getattribute__" => "Return getattr(self, name).", + "builtins.SymbolTable.__getstate__" => "Helper for pickle.", + "builtins.SymbolTable.__gt__" => "Return self>value.", + "builtins.SymbolTable.__hash__" => "Return hash(self).", + "builtins.SymbolTable.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.SymbolTable.__le__" => "Return self<=value.", + "builtins.SymbolTable.__lt__" => "Return self<value.", + "builtins.SymbolTable.__ne__" => "Return self!=value.", + "builtins.SymbolTable.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.SymbolTable.__reduce__" => "Helper for pickle.", + "builtins.SymbolTable.__reduce_ex__" => "Helper for pickle.", + "builtins.SymbolTable.__setattr__" => "Implement setattr(self, name, value).", + "builtins.SymbolTable.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.SymbolTable.__str__" => "Return str(self).", + "builtins.SymbolTable.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.SymbolTable.__weakref__" => "list of weak references to the object", + "builtins.SymbolTable.get_children" => "Return a list of the nested symbol tables.", + "builtins.SymbolTable.get_id" => "Return an identifier for the table.", + "builtins.SymbolTable.get_identifiers" => "Return a view object containing the names of symbols in the table.", + "builtins.SymbolTable.get_lineno" => "Return the number of the first line in the\nblock for the table.", + "builtins.SymbolTable.get_name" => "Return the table's name.\n\nThis corresponds to the name of the class, function\nor 'top' if the table is for a class, function or\nglobal respectively.", + "builtins.SymbolTable.get_symbols" => "Return a list of *Symbol* instances for\nnames in the table.", + "builtins.SymbolTable.get_type" => "Return the type of the symbol table.\n\nThe value returned is one of the values in\nthe ``SymbolTableType`` enumeration.", + "builtins.SymbolTable.has_children" => "Return *True* if the block has nested namespaces.", + "builtins.SymbolTable.is_nested" => "Return *True* if the block is a nested class\nor function.", + "builtins.SymbolTable.is_optimized" => "Return *True* if the locals in the table\nare optimizable.", + "builtins.SymbolTable.lookup" => "Lookup a *name* in the table.\n\nReturns a *Symbol* instance.", + "builtins.SymbolTableFactory.__delattr__" => "Implement delattr(self, name).", + "builtins.SymbolTableFactory.__eq__" => "Return self==value.", + "builtins.SymbolTableFactory.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.SymbolTableFactory.__ge__" => "Return self>=value.", + "builtins.SymbolTableFactory.__getattribute__" => "Return getattr(self, name).", + "builtins.SymbolTableFactory.__getstate__" => "Helper for pickle.", + "builtins.SymbolTableFactory.__gt__" => "Return self>value.", + "builtins.SymbolTableFactory.__hash__" => "Return hash(self).", + "builtins.SymbolTableFactory.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.SymbolTableFactory.__le__" => "Return self<=value.", + "builtins.SymbolTableFactory.__lt__" => "Return self<value.", + "builtins.SymbolTableFactory.__ne__" => "Return self!=value.", + "builtins.SymbolTableFactory.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.SymbolTableFactory.__reduce__" => "Helper for pickle.", + "builtins.SymbolTableFactory.__reduce_ex__" => "Helper for pickle.", + "builtins.SymbolTableFactory.__repr__" => "Return repr(self).", + "builtins.SymbolTableFactory.__setattr__" => "Implement setattr(self, name, value).", + "builtins.SymbolTableFactory.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.SymbolTableFactory.__str__" => "Return str(self).", + "builtins.SymbolTableFactory.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.SymbolTableFactory.__weakref__" => "list of weak references to the object", "builtins.SyntaxError" => "Invalid syntax.", "builtins.SyntaxError.__delattr__" => "Implement delattr(self, name).", "builtins.SyntaxError.__eq__" => "Return self==value.", @@ -11187,6 +18871,112 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.SystemExit.add_note" => "Add a note to the exception", "builtins.SystemExit.code" => "exception code", "builtins.SystemExit.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.TNavigator" => "Navigation part of the RawTurtle.\nImplements methods for turtle movement.", + "builtins.TNavigator.__delattr__" => "Implement delattr(self, name).", + "builtins.TNavigator.__eq__" => "Return self==value.", + "builtins.TNavigator.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.TNavigator.__ge__" => "Return self>=value.", + "builtins.TNavigator.__getattribute__" => "Return getattr(self, name).", + "builtins.TNavigator.__getstate__" => "Helper for pickle.", + "builtins.TNavigator.__gt__" => "Return self>value.", + "builtins.TNavigator.__hash__" => "Return hash(self).", + "builtins.TNavigator.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.TNavigator.__le__" => "Return self<=value.", + "builtins.TNavigator.__lt__" => "Return self<value.", + "builtins.TNavigator.__ne__" => "Return self!=value.", + "builtins.TNavigator.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.TNavigator.__reduce__" => "Helper for pickle.", + "builtins.TNavigator.__reduce_ex__" => "Helper for pickle.", + "builtins.TNavigator.__repr__" => "Return repr(self).", + "builtins.TNavigator.__setattr__" => "Implement setattr(self, name, value).", + "builtins.TNavigator.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.TNavigator.__str__" => "Return str(self).", + "builtins.TNavigator.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.TNavigator.__weakref__" => "list of weak references to the object", + "builtins.TNavigator._delay" => "dummy method - to be overwritten by child class", + "builtins.TNavigator._go" => "move turtle forward by specified distance", + "builtins.TNavigator._goto" => "move turtle to position end.", + "builtins.TNavigator._rotate" => "Turn turtle counterclockwise by specified angle if angle > 0.", + "builtins.TNavigator._setDegreesPerAU" => "Helper function for degrees() and radians()", + "builtins.TNavigator._setmode" => "Set turtle-mode to 'standard', 'world' or 'logo'.", + "builtins.TNavigator._tracer" => "dummy method - to be overwritten by child class", + "builtins.TNavigator.back" => "Move the turtle backward by distance.\n\nAliases: back | backward | bk\n\nArgument:\ndistance -- a number\n\nMove the turtle backward by distance, opposite to the direction the\nturtle is headed. Do not change the turtle's heading.\n\nExample (for a Turtle instance named turtle):\n>>> turtle.position()\n(0.00,0.00)\n>>> turtle.backward(30)\n>>> turtle.position()\n(-30.00,0.00)", + "builtins.TNavigator.backward" => "Move the turtle backward by distance.\n\nAliases: back | backward | bk\n\nArgument:\ndistance -- a number\n\nMove the turtle backward by distance, opposite to the direction the\nturtle is headed. Do not change the turtle's heading.\n\nExample (for a Turtle instance named turtle):\n>>> turtle.position()\n(0.00,0.00)\n>>> turtle.backward(30)\n>>> turtle.position()\n(-30.00,0.00)", + "builtins.TNavigator.bk" => "Move the turtle backward by distance.\n\nAliases: back | backward | bk\n\nArgument:\ndistance -- a number\n\nMove the turtle backward by distance, opposite to the direction the\nturtle is headed. Do not change the turtle's heading.\n\nExample (for a Turtle instance named turtle):\n>>> turtle.position()\n(0.00,0.00)\n>>> turtle.backward(30)\n>>> turtle.position()\n(-30.00,0.00)", + "builtins.TNavigator.circle" => "Draw a circle with given radius.\n\nArguments:\nradius -- a number\nextent (optional) -- a number\nsteps (optional) -- an integer\n\nDraw a circle with given radius. The center is radius units left\nof the turtle; extent - an angle - determines which part of the\ncircle is drawn. If extent is not given, draw the entire circle.\nIf extent is not a full circle, one endpoint of the arc is the\ncurrent pen position. Draw the arc in counterclockwise direction\nif radius is positive, otherwise in clockwise direction. Finally\nthe direction of the turtle is changed by the amount of extent.\n\nAs the circle is approximated by an inscribed regular polygon,\nsteps determines the number of steps to use. If not given,\nit will be calculated automatically. Maybe used to draw regular\npolygons.\n\ncall: circle(radius) # full circle\n--or: circle(radius, extent) # arc\n--or: circle(radius, extent, steps)\n--or: circle(radius, steps=6) # 6-sided polygon\n\nExample (for a Turtle instance named turtle):\n>>> turtle.circle(50)\n>>> turtle.circle(120, 180) # semicircle", + "builtins.TNavigator.degrees" => "Set angle measurement units to degrees.\n\nOptional argument:\nfullcircle - a number\n\nSet angle measurement units, i. e. set number\nof 'degrees' for a full circle. Default value is\n360 degrees.\n\nExample (for a Turtle instance named turtle):\n>>> turtle.left(90)\n>>> turtle.heading()\n90\n\nChange angle measurement unit to grad (also known as gon,\ngrade, or gradian and equals 1/100-th of the right angle.)\n>>> turtle.degrees(400.0)\n>>> turtle.heading()\n100", + "builtins.TNavigator.distance" => "Return the distance from the turtle to (x,y) in turtle step units.\n\nArguments:\nx -- a number or a pair/vector of numbers or a turtle instance\ny -- a number None None\n\ncall: distance(x, y) # two coordinates\n--or: distance((x, y)) # a pair (tuple) of coordinates\n--or: distance(vec) # e.g. as returned by pos()\n--or: distance(mypen) # where mypen is another turtle\n\nExample (for a Turtle instance named turtle):\n>>> turtle.pos()\n(0.00,0.00)\n>>> turtle.distance(30,40)\n50.0\n>>> pen = Turtle()\n>>> pen.forward(77)\n>>> turtle.distance(pen)\n77.0", + "builtins.TNavigator.fd" => "Move the turtle forward by the specified distance.\n\nAliases: forward | fd\n\nArgument:\ndistance -- a number (integer or float)\n\nMove the turtle forward by the specified distance, in the direction\nthe turtle is headed.\n\nExample (for a Turtle instance named turtle):\n>>> turtle.position()\n(0.00,0.00)\n>>> turtle.forward(25)\n>>> turtle.position()\n(25.00,0.00)\n>>> turtle.forward(-75)\n>>> turtle.position()\n(-50.00,0.00)", + "builtins.TNavigator.forward" => "Move the turtle forward by the specified distance.\n\nAliases: forward | fd\n\nArgument:\ndistance -- a number (integer or float)\n\nMove the turtle forward by the specified distance, in the direction\nthe turtle is headed.\n\nExample (for a Turtle instance named turtle):\n>>> turtle.position()\n(0.00,0.00)\n>>> turtle.forward(25)\n>>> turtle.position()\n(25.00,0.00)\n>>> turtle.forward(-75)\n>>> turtle.position()\n(-50.00,0.00)", + "builtins.TNavigator.goto" => "Move turtle to an absolute position.\n\nAliases: setpos | setposition | goto:\n\nArguments:\nx -- a number or a pair/vector of numbers\ny -- a number None\n\ncall: goto(x, y) # two coordinates\n--or: goto((x, y)) # a pair (tuple) of coordinates\n--or: goto(vec) # e.g. as returned by pos()\n\nMove turtle to an absolute position. If the pen is down,\na line will be drawn. The turtle's orientation does not change.\n\nExample (for a Turtle instance named turtle):\n>>> tp = turtle.pos()\n>>> tp\n(0.00,0.00)\n>>> turtle.setpos(60,30)\n>>> turtle.pos()\n(60.00,30.00)\n>>> turtle.setpos((20,80))\n>>> turtle.pos()\n(20.00,80.00)\n>>> turtle.setpos(tp)\n>>> turtle.pos()\n(0.00,0.00)", + "builtins.TNavigator.heading" => "Return the turtle's current heading.\n\nNo arguments.\n\nExample (for a Turtle instance named turtle):\n>>> turtle.left(67)\n>>> turtle.heading()\n67.0", + "builtins.TNavigator.home" => "Move turtle to the origin - coordinates (0,0).\n\nNo arguments.\n\nMove turtle to the origin - coordinates (0,0) and set its\nheading to its start-orientation (which depends on mode).\n\nExample (for a Turtle instance named turtle):\n>>> turtle.home()", + "builtins.TNavigator.left" => "Turn turtle left by angle units.\n\nAliases: left | lt\n\nArgument:\nangle -- a number (integer or float)\n\nTurn turtle left by angle units. (Units are by default degrees,\nbut can be set via the degrees() and radians() functions.)\nAngle orientation depends on mode. (See this.)\n\nExample (for a Turtle instance named turtle):\n>>> turtle.heading()\n22.0\n>>> turtle.left(45)\n>>> turtle.heading()\n67.0", + "builtins.TNavigator.lt" => "Turn turtle left by angle units.\n\nAliases: left | lt\n\nArgument:\nangle -- a number (integer or float)\n\nTurn turtle left by angle units. (Units are by default degrees,\nbut can be set via the degrees() and radians() functions.)\nAngle orientation depends on mode. (See this.)\n\nExample (for a Turtle instance named turtle):\n>>> turtle.heading()\n22.0\n>>> turtle.left(45)\n>>> turtle.heading()\n67.0", + "builtins.TNavigator.pos" => "Return the turtle's current location (x,y), as a Vec2D-vector.\n\nAliases: pos | position\n\nNo arguments.\n\nExample (for a Turtle instance named turtle):\n>>> turtle.pos()\n(0.00, 240.00)", + "builtins.TNavigator.position" => "Return the turtle's current location (x,y), as a Vec2D-vector.\n\nAliases: pos | position\n\nNo arguments.\n\nExample (for a Turtle instance named turtle):\n>>> turtle.pos()\n(0.00, 240.00)", + "builtins.TNavigator.radians" => "Set the angle measurement units to radians.\n\nNo arguments.\n\nExample (for a Turtle instance named turtle):\n>>> turtle.heading()\n90\n>>> turtle.radians()\n>>> turtle.heading()\n1.5707963267948966", + "builtins.TNavigator.reset" => "reset turtle to its initial values\n\nWill be overwritten by parent class", + "builtins.TNavigator.right" => "Turn turtle right by angle units.\n\nAliases: right | rt\n\nArgument:\nangle -- a number (integer or float)\n\nTurn turtle right by angle units. (Units are by default degrees,\nbut can be set via the degrees() and radians() functions.)\nAngle orientation depends on mode. (See this.)\n\nExample (for a Turtle instance named turtle):\n>>> turtle.heading()\n22.0\n>>> turtle.right(45)\n>>> turtle.heading()\n337.0", + "builtins.TNavigator.rt" => "Turn turtle right by angle units.\n\nAliases: right | rt\n\nArgument:\nangle -- a number (integer or float)\n\nTurn turtle right by angle units. (Units are by default degrees,\nbut can be set via the degrees() and radians() functions.)\nAngle orientation depends on mode. (See this.)\n\nExample (for a Turtle instance named turtle):\n>>> turtle.heading()\n22.0\n>>> turtle.right(45)\n>>> turtle.heading()\n337.0", + "builtins.TNavigator.seth" => "Set the orientation of the turtle to to_angle.\n\nAliases: setheading | seth\n\nArgument:\nto_angle -- a number (integer or float)\n\nSet the orientation of the turtle to to_angle.\nHere are some common directions in degrees:\n\n standard - mode: logo-mode:\n-------------------|--------------------\n 0 - east 0 - north\n 90 - north 90 - east\n 180 - west 180 - south\n 270 - south 270 - west\n\nExample (for a Turtle instance named turtle):\n>>> turtle.setheading(90)\n>>> turtle.heading()\n90", + "builtins.TNavigator.setheading" => "Set the orientation of the turtle to to_angle.\n\nAliases: setheading | seth\n\nArgument:\nto_angle -- a number (integer or float)\n\nSet the orientation of the turtle to to_angle.\nHere are some common directions in degrees:\n\n standard - mode: logo-mode:\n-------------------|--------------------\n 0 - east 0 - north\n 90 - north 90 - east\n 180 - west 180 - south\n 270 - south 270 - west\n\nExample (for a Turtle instance named turtle):\n>>> turtle.setheading(90)\n>>> turtle.heading()\n90", + "builtins.TNavigator.setpos" => "Move turtle to an absolute position.\n\nAliases: setpos | setposition | goto:\n\nArguments:\nx -- a number or a pair/vector of numbers\ny -- a number None\n\ncall: goto(x, y) # two coordinates\n--or: goto((x, y)) # a pair (tuple) of coordinates\n--or: goto(vec) # e.g. as returned by pos()\n\nMove turtle to an absolute position. If the pen is down,\na line will be drawn. The turtle's orientation does not change.\n\nExample (for a Turtle instance named turtle):\n>>> tp = turtle.pos()\n>>> tp\n(0.00,0.00)\n>>> turtle.setpos(60,30)\n>>> turtle.pos()\n(60.00,30.00)\n>>> turtle.setpos((20,80))\n>>> turtle.pos()\n(20.00,80.00)\n>>> turtle.setpos(tp)\n>>> turtle.pos()\n(0.00,0.00)", + "builtins.TNavigator.setposition" => "Move turtle to an absolute position.\n\nAliases: setpos | setposition | goto:\n\nArguments:\nx -- a number or a pair/vector of numbers\ny -- a number None\n\ncall: goto(x, y) # two coordinates\n--or: goto((x, y)) # a pair (tuple) of coordinates\n--or: goto(vec) # e.g. as returned by pos()\n\nMove turtle to an absolute position. If the pen is down,\na line will be drawn. The turtle's orientation does not change.\n\nExample (for a Turtle instance named turtle):\n>>> tp = turtle.pos()\n>>> tp\n(0.00,0.00)\n>>> turtle.setpos(60,30)\n>>> turtle.pos()\n(60.00,30.00)\n>>> turtle.setpos((20,80))\n>>> turtle.pos()\n(20.00,80.00)\n>>> turtle.setpos(tp)\n>>> turtle.pos()\n(0.00,0.00)", + "builtins.TNavigator.setx" => "Set the turtle's first coordinate to x\n\nArgument:\nx -- a number (integer or float)\n\nSet the turtle's first coordinate to x, leave second coordinate\nunchanged.\n\nExample (for a Turtle instance named turtle):\n>>> turtle.position()\n(0.00, 240.00)\n>>> turtle.setx(10)\n>>> turtle.position()\n(10.00, 240.00)", + "builtins.TNavigator.sety" => "Set the turtle's second coordinate to y\n\nArgument:\ny -- a number (integer or float)\n\nSet the turtle's first coordinate to x, second coordinate remains\nunchanged.\n\nExample (for a Turtle instance named turtle):\n>>> turtle.position()\n(0.00, 40.00)\n>>> turtle.sety(-10)\n>>> turtle.position()\n(0.00, -10.00)", + "builtins.TNavigator.speed" => "dummy method - to be overwritten by child class", + "builtins.TNavigator.teleport" => "To be overwritten by child class RawTurtle.\nIncludes no TPen references.", + "builtins.TNavigator.towards" => "Return the angle of the line from the turtle's position to (x, y).\n\nArguments:\nx -- a number or a pair/vector of numbers or a turtle instance\ny -- a number None None\n\ncall: distance(x, y) # two coordinates\n--or: distance((x, y)) # a pair (tuple) of coordinates\n--or: distance(vec) # e.g. as returned by pos()\n--or: distance(mypen) # where mypen is another turtle\n\nReturn the angle, between the line from turtle-position to position\nspecified by x, y and the turtle's start orientation. (Depends on\nmodes - \"standard\" or \"logo\")\n\nExample (for a Turtle instance named turtle):\n>>> turtle.pos()\n(10.00, 10.00)\n>>> turtle.towards(0,0)\n225.0", + "builtins.TNavigator.xcor" => "Return the turtle's x coordinate.\n\nNo arguments.\n\nExample (for a Turtle instance named turtle):\n>>> reset()\n>>> turtle.left(60)\n>>> turtle.forward(100)\n>>> print(turtle.xcor())\n50.0", + "builtins.TNavigator.ycor" => "Return the turtle's y coordinate\n---\nNo arguments.\n\nExample (for a Turtle instance named turtle):\n>>> reset()\n>>> turtle.left(60)\n>>> turtle.forward(100)\n>>> print(turtle.ycor())\n86.6025403784", + "builtins.TPen" => "Drawing part of the RawTurtle.\nImplements drawing properties.", + "builtins.TPen.__delattr__" => "Implement delattr(self, name).", + "builtins.TPen.__eq__" => "Return self==value.", + "builtins.TPen.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.TPen.__ge__" => "Return self>=value.", + "builtins.TPen.__getattribute__" => "Return getattr(self, name).", + "builtins.TPen.__getstate__" => "Helper for pickle.", + "builtins.TPen.__gt__" => "Return self>value.", + "builtins.TPen.__hash__" => "Return hash(self).", + "builtins.TPen.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.TPen.__le__" => "Return self<=value.", + "builtins.TPen.__lt__" => "Return self<value.", + "builtins.TPen.__ne__" => "Return self!=value.", + "builtins.TPen.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.TPen.__reduce__" => "Helper for pickle.", + "builtins.TPen.__reduce_ex__" => "Helper for pickle.", + "builtins.TPen.__repr__" => "Return repr(self).", + "builtins.TPen.__setattr__" => "Implement setattr(self, name, value).", + "builtins.TPen.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.TPen.__str__" => "Return str(self).", + "builtins.TPen.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.TPen.__weakref__" => "list of weak references to the object", + "builtins.TPen._color" => "dummy method - to be overwritten by child class", + "builtins.TPen._colorstr" => "dummy method - to be overwritten by child class", + "builtins.TPen._newLine" => "dummy method - to be overwritten by child class", + "builtins.TPen._update" => "dummy method - to be overwritten by child class", + "builtins.TPen.color" => "Return or set the pencolor and fillcolor.\n\nArguments:\nSeveral input formats are allowed.\nThey use 0 to 3 arguments as follows:\n - color()\n Return the current pencolor and the current fillcolor as\n a pair of color specification strings or tuples as returned\n by pencolor() and fillcolor().\n - color(colorstring), color((r,g,b)), color(r,g,b)\n Inputs as in pencolor(), set both, fillcolor and pencolor,\n to the given value.\n - color(colorstring1, colorstring2), color((r1,g1,b1), (r2,g2,b2))\n Equivalent to pencolor(colorstring1) and fillcolor(colorstring2)\n and analogously if the other input format is used.\n\nIf turtleshape is a polygon, outline and interior of that polygon\nis drawn with the newly set colors.\nFor more info see: pencolor, fillcolor\n\nExample (for a Turtle instance named turtle):\n>>> turtle.color('red', 'green')\n>>> turtle.color()\n('red', 'green')\n>>> colormode(255)\n>>> color(('#285078', '#a0c8f0'))\n>>> color()\n((40.0, 80.0, 120.0), (160.0, 200.0, 240.0))", + "builtins.TPen.down" => "Pull the pen down -- drawing when moving.\n\nAliases: pendown | pd | down\n\nNo argument.\n\nExample (for a Turtle instance named turtle):\n>>> turtle.pendown()", + "builtins.TPen.fillcolor" => "Return or set the fillcolor.\n\nArguments:\nFour input formats are allowed:\n - fillcolor()\n Return the current fillcolor as color specification string,\n possibly in tuple format (see example). May be used as\n input to another color/pencolor/fillcolor/bgcolor call.\n - fillcolor(colorstring)\n Set fillcolor to colorstring, which is a Tk color\n specification string, such as \"red\", \"yellow\", or \"#33cc8c\".\n - fillcolor((r, g, b))\n Set fillcolor to the RGB color represented by the tuple of\n r, g, and b. Each of r, g, and b must be in the range\n 0..colormode, where colormode is either 1.0 or 255 (see\n colormode()).\n - fillcolor(r, g, b)\n Set fillcolor to the RGB color represented by r, g, and b.\n Each of r, g, and b must be in the range 0..colormode.\n\nIf turtleshape is a polygon, the interior of that polygon is drawn\nwith the newly set fillcolor.\n\nExample (for a Turtle instance named turtle):\n>>> turtle.fillcolor('violet')\n>>> turtle.fillcolor()\n'violet'\n>>> colormode(255)\n>>> turtle.fillcolor('#ffffff')\n>>> turtle.fillcolor()\n(255.0, 255.0, 255.0)", + "builtins.TPen.hideturtle" => "Makes the turtle invisible.\n\nAliases: hideturtle | ht\n\nNo argument.\n\nIt's a good idea to do this while you're in the\nmiddle of a complicated drawing, because hiding\nthe turtle speeds up the drawing observably.\n\nExample (for a Turtle instance named turtle):\n>>> turtle.hideturtle()", + "builtins.TPen.ht" => "Makes the turtle invisible.\n\nAliases: hideturtle | ht\n\nNo argument.\n\nIt's a good idea to do this while you're in the\nmiddle of a complicated drawing, because hiding\nthe turtle speeds up the drawing observably.\n\nExample (for a Turtle instance named turtle):\n>>> turtle.hideturtle()", + "builtins.TPen.isdown" => "Return True if pen is down, False if it's up.\n\nNo argument.\n\nExample (for a Turtle instance named turtle):\n>>> turtle.penup()\n>>> turtle.isdown()\nFalse\n>>> turtle.pendown()\n>>> turtle.isdown()\nTrue", + "builtins.TPen.isvisible" => "Return True if the Turtle is shown, False if it's hidden.\n\nNo argument.\n\nExample (for a Turtle instance named turtle):\n>>> turtle.hideturtle()\n>>> print(turtle.isvisible())\nFalse", + "builtins.TPen.pd" => "Pull the pen down -- drawing when moving.\n\nAliases: pendown | pd | down\n\nNo argument.\n\nExample (for a Turtle instance named turtle):\n>>> turtle.pendown()", + "builtins.TPen.pen" => "Return or set the pen's attributes.\n\nArguments:\n pen -- a dictionary with some or all of the below listed keys.\n **pendict -- one or more keyword-arguments with the below\n listed keys as keywords.\n\nReturn or set the pen's attributes in a 'pen-dictionary'\nwith the following key/value pairs:\n \"shown\" : True/False\n \"pendown\" : True/False\n \"pencolor\" : color-string or color-tuple\n \"fillcolor\" : color-string or color-tuple\n \"pensize\" : positive number\n \"speed\" : number in range 0..10\n \"resizemode\" : \"auto\" or \"user\" or \"noresize\"\n \"stretchfactor\": (positive number, positive number)\n \"shearfactor\": number\n \"outline\" : positive number\n \"tilt\" : number\n\nThis dictionary can be used as argument for a subsequent\npen()-call to restore the former pen-state. Moreover one\nor more of these attributes can be provided as keyword-arguments.\nThis can be used to set several pen attributes in one statement.\n\n\nExamples (for a Turtle instance named turtle):\n>>> turtle.pen(fillcolor=\"black\", pencolor=\"red\", pensize=10)\n>>> turtle.pen()\n{'pensize': 10, 'shown': True, 'resizemode': 'auto', 'outline': 1,\n'pencolor': 'red', 'pendown': True, 'fillcolor': 'black',\n'stretchfactor': (1,1), 'speed': 3, 'shearfactor': 0.0}\n>>> penstate=turtle.pen()\n>>> turtle.color(\"yellow\",\"\")\n>>> turtle.penup()\n>>> turtle.pen()\n{'pensize': 10, 'shown': True, 'resizemode': 'auto', 'outline': 1,\n'pencolor': 'yellow', 'pendown': False, 'fillcolor': '',\n'stretchfactor': (1,1), 'speed': 3, 'shearfactor': 0.0}\n>>> p.pen(penstate, fillcolor=\"green\")\n>>> p.pen()\n{'pensize': 10, 'shown': True, 'resizemode': 'auto', 'outline': 1,\n'pencolor': 'red', 'pendown': True, 'fillcolor': 'green',\n'stretchfactor': (1,1), 'speed': 3, 'shearfactor': 0.0}", + "builtins.TPen.pencolor" => "Return or set the pencolor.\n\nArguments:\nFour input formats are allowed:\n - pencolor()\n Return the current pencolor as color specification string or\n as a tuple (see example). May be used as input to another\n color/pencolor/fillcolor/bgcolor call.\n - pencolor(colorstring)\n Set pencolor to colorstring, which is a Tk color\n specification string, such as \"red\", \"yellow\", or \"#33cc8c\".\n - pencolor((r, g, b))\n Set pencolor to the RGB color represented by the tuple of\n r, g, and b. Each of r, g, and b must be in the range\n 0..colormode, where colormode is either 1.0 or 255 (see\n colormode()).\n - pencolor(r, g, b)\n Set pencolor to the RGB color represented by r, g, and b.\n Each of r, g, and b must be in the range 0..colormode.\n\nIf turtleshape is a polygon, the outline of that polygon is drawn\nwith the newly set pencolor.\n\nExample (for a Turtle instance named turtle):\n>>> turtle.pencolor('brown')\n>>> turtle.pencolor()\n'brown'\n>>> colormode(255)\n>>> turtle.pencolor('#32c18f')\n>>> turtle.pencolor()\n(50.0, 193.0, 143.0)", + "builtins.TPen.pendown" => "Pull the pen down -- drawing when moving.\n\nAliases: pendown | pd | down\n\nNo argument.\n\nExample (for a Turtle instance named turtle):\n>>> turtle.pendown()", + "builtins.TPen.pensize" => "Set or return the line thickness.\n\nAliases: pensize | width\n\nArgument:\nwidth -- positive number\n\nSet the line thickness to width or return it. If resizemode is set\nto \"auto\" and turtleshape is a polygon, that polygon is drawn with\nthe same line thickness. If no argument is given, current pensize\nis returned.\n\nExample (for a Turtle instance named turtle):\n>>> turtle.pensize()\n1\n>>> turtle.pensize(10) # from here on lines of width 10 are drawn", + "builtins.TPen.penup" => "Pull the pen up -- no drawing when moving.\n\nAliases: penup | pu | up\n\nNo argument\n\nExample (for a Turtle instance named turtle):\n>>> turtle.penup()", + "builtins.TPen.pu" => "Pull the pen up -- no drawing when moving.\n\nAliases: penup | pu | up\n\nNo argument\n\nExample (for a Turtle instance named turtle):\n>>> turtle.penup()", + "builtins.TPen.resizemode" => "Set resizemode to one of the values: \"auto\", \"user\", \"noresize\".\n\n(Optional) Argument:\nrmode -- one of the strings \"auto\", \"user\", \"noresize\"\n\nDifferent resizemodes have the following effects:\n - \"auto\" adapts the appearance of the turtle\n corresponding to the value of pensize.\n - \"user\" adapts the appearance of the turtle according to the\n values of stretchfactor and outlinewidth (outline),\n which are set by shapesize()\n - \"noresize\" no adaption of the turtle's appearance takes place.\nIf no argument is given, return current resizemode.\nresizemode(\"user\") is called by a call of shapesize with arguments.\n\n\nExamples (for a Turtle instance named turtle):\n>>> turtle.resizemode(\"noresize\")\n>>> turtle.resizemode()\n'noresize'", + "builtins.TPen.showturtle" => "Makes the turtle visible.\n\nAliases: showturtle | st\n\nNo argument.\n\nExample (for a Turtle instance named turtle):\n>>> turtle.hideturtle()\n>>> turtle.showturtle()", + "builtins.TPen.speed" => "Return or set the turtle's speed.\n\nOptional argument:\nspeed -- an integer in the range 0..10 or a speedstring (see below)\n\nSet the turtle's speed to an integer value in the range 0 .. 10.\nIf no argument is given: return current speed.\n\nIf input is a number greater than 10 or smaller than 0.5,\nspeed is set to 0.\nSpeedstrings are mapped to speedvalues in the following way:\n 'fastest' : 0\n 'fast' : 10\n 'normal' : 6\n 'slow' : 3\n 'slowest' : 1\nspeeds from 1 to 10 enforce increasingly faster animation of\nline drawing and turtle turning.\n\nAttention:\nspeed = 0 : *no* animation takes place. forward/back makes turtle jump\nand likewise left/right make the turtle turn instantly.\n\nExample (for a Turtle instance named turtle):\n>>> turtle.speed(3)", + "builtins.TPen.st" => "Makes the turtle visible.\n\nAliases: showturtle | st\n\nNo argument.\n\nExample (for a Turtle instance named turtle):\n>>> turtle.hideturtle()\n>>> turtle.showturtle()", + "builtins.TPen.teleport" => "To be overwritten by child class RawTurtle.\nIncludes no TNavigator references.", + "builtins.TPen.up" => "Pull the pen up -- no drawing when moving.\n\nAliases: penup | pu | up\n\nNo argument\n\nExample (for a Turtle instance named turtle):\n>>> turtle.penup()", + "builtins.TPen.width" => "Set or return the line thickness.\n\nAliases: pensize | width\n\nArgument:\nwidth -- positive number\n\nSet the line thickness to width or return it. If resizemode is set\nto \"auto\" and turtleshape is a polygon, that polygon is drawn with\nthe same line thickness. If no argument is given, current pensize\nis returned.\n\nExample (for a Turtle instance named turtle):\n>>> turtle.pensize()\n1\n>>> turtle.pensize(10) # from here on lines of width 10 are drawn", "builtins.TabError" => "Improper mixture of spaces and tabs.", "builtins.TabError.__delattr__" => "Implement delattr(self, name).", "builtins.TabError.__eq__" => "Return self==value.", @@ -11219,6 +19009,764 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.TabError.print_file_and_line" => "exception print_file_and_line", "builtins.TabError.text" => "exception text", "builtins.TabError.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.TarFile" => "The TarFile Class provides an interface to tar archives.", + "builtins.TarFile.__delattr__" => "Implement delattr(self, name).", + "builtins.TarFile.__eq__" => "Return self==value.", + "builtins.TarFile.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.TarFile.__ge__" => "Return self>=value.", + "builtins.TarFile.__getattribute__" => "Return getattr(self, name).", + "builtins.TarFile.__getstate__" => "Helper for pickle.", + "builtins.TarFile.__gt__" => "Return self>value.", + "builtins.TarFile.__hash__" => "Return hash(self).", + "builtins.TarFile.__init__" => "Open an (uncompressed) tar archive 'name'. 'mode' is either 'r' to\nread from an existing archive, 'a' to append data to an existing\nfile or 'w' to create a new file overwriting an existing one. 'mode'\ndefaults to 'r'.\nIf 'fileobj' is given, it is used for reading or writing data. If it\ncan be determined, 'mode' is overridden by 'fileobj's mode.\n'fileobj' is not closed, when TarFile is closed.", + "builtins.TarFile.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.TarFile.__iter__" => "Provide an iterator object.", + "builtins.TarFile.__le__" => "Return self<=value.", + "builtins.TarFile.__lt__" => "Return self<value.", + "builtins.TarFile.__ne__" => "Return self!=value.", + "builtins.TarFile.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.TarFile.__reduce__" => "Helper for pickle.", + "builtins.TarFile.__reduce_ex__" => "Helper for pickle.", + "builtins.TarFile.__repr__" => "Return repr(self).", + "builtins.TarFile.__setattr__" => "Implement setattr(self, name, value).", + "builtins.TarFile.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.TarFile.__str__" => "Return str(self).", + "builtins.TarFile.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.TarFile.__weakref__" => "list of weak references to the object", + "builtins.TarFile._check" => "Check if TarFile is still open, and if the operation's mode\ncorresponds to TarFile's mode.", + "builtins.TarFile._dbg" => "Write debugging output to sys.stderr.", + "builtins.TarFile._extract_member" => "Extract the filtered TarInfo object tarinfo to a physical\nfile called targetpath.\n\nfilter_function is only used when extracting a *different*\nmember (e.g. as fallback to creating a symlink)", + "builtins.TarFile._extract_one" => "Extract from filtered tarinfo to disk.\n\nfilter_function is only used when extracting a *different*\nmember (e.g. as fallback to creating a symlink)", + "builtins.TarFile._find_link_target" => "Find the target member of a symlink or hardlink member in the\narchive.", + "builtins.TarFile._get_extract_tarinfo" => "Get (filtered, unfiltered) TarInfos from *member*\n\n*member* might be a string.\n\nReturn (None, None) if not found.", + "builtins.TarFile._getmember" => "Find an archive member by name from bottom to top.\nIf tarinfo is given, it is used as the starting point.", + "builtins.TarFile._handle_fatal_error" => "Handle \"fatal\" error according to self.errorlevel", + "builtins.TarFile._handle_nonfatal_error" => "Handle non-fatal error (ExtractError) according to errorlevel", + "builtins.TarFile._load" => "Read through the entire archive file and look for readable\nmembers. This should not run if the file is set to stream.", + "builtins.TarFile.add" => "Add the file 'name' to the archive. 'name' may be any type of file\n(directory, fifo, symbolic link, etc.). If given, 'arcname'\nspecifies an alternative name for the file in the archive.\nDirectories are added recursively by default. This can be avoided by\nsetting 'recursive' to False. 'filter' is a function\nthat expects a TarInfo object argument and returns the changed\nTarInfo object, if it returns None the TarInfo object will be\nexcluded from the archive.", + "builtins.TarFile.addfile" => "Add the TarInfo object 'tarinfo' to the archive.\n\nIf 'tarinfo' represents a non zero-size regular file, the 'fileobj'\nargument should be a binary file, and tarinfo.size bytes are read\nfrom it and added to the archive. You can create TarInfo objects\ndirectly, or by using gettarinfo().", + "builtins.TarFile.bz2open" => "Open bzip2 compressed tar archive name for reading or writing.\nAppending is not allowed.", + "builtins.TarFile.chmod" => "Set file permissions of targetpath according to tarinfo.", + "builtins.TarFile.chown" => "Set owner of targetpath according to tarinfo. If numeric_owner\nis True, use .gid/.uid instead of .gname/.uname. If numeric_owner\nis False, fall back to .gid/.uid when the search based on name\nfails.", + "builtins.TarFile.close" => "Close the TarFile. In write-mode, two finishing zero blocks are\nappended to the archive.", + "builtins.TarFile.extract" => "Extract a member from the archive to the current working directory,\nusing its full name. Its file information is extracted as accurately\nas possible. 'member' may be a filename or a TarInfo object. You can\nspecify a different directory using 'path'. File attributes (owner,\nmtime, mode) are set unless 'set_attrs' is False. If 'numeric_owner'\nis True, only the numbers for user/group names are used and not\nthe names.\n\nThe 'filter' function will be called before extraction.\nIt can return a changed TarInfo or None to skip the member.\nString names of common filters are accepted.", + "builtins.TarFile.extractall" => "Extract all members from the archive to the current working\ndirectory and set owner, modification time and permissions on\ndirectories afterwards. 'path' specifies a different directory\nto extract to. 'members' is optional and must be a subset of the\nlist returned by getmembers(). If 'numeric_owner' is True, only\nthe numbers for user/group names are used and not the names.\n\nThe 'filter' function will be called on each member just\nbefore extraction.\nIt can return a changed TarInfo or None to skip the member.\nString names of common filters are accepted.", + "builtins.TarFile.extractfile" => "Extract a member from the archive as a file object. 'member' may be\na filename or a TarInfo object. If 'member' is a regular file or\na link, an io.BufferedReader object is returned. For all other\nexisting members, None is returned. If 'member' does not appear\nin the archive, KeyError is raised.", + "builtins.TarFile.fileobject.__del__" => "Called when the instance is about to be destroyed.", + "builtins.TarFile.fileobject.__delattr__" => "Implement delattr(self, name).", + "builtins.TarFile.fileobject.__eq__" => "Return self==value.", + "builtins.TarFile.fileobject.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.TarFile.fileobject.__ge__" => "Return self>=value.", + "builtins.TarFile.fileobject.__getattribute__" => "Return getattr(self, name).", + "builtins.TarFile.fileobject.__gt__" => "Return self>value.", + "builtins.TarFile.fileobject.__hash__" => "Return hash(self).", + "builtins.TarFile.fileobject.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.TarFile.fileobject.__iter__" => "Implement iter(self).", + "builtins.TarFile.fileobject.__le__" => "Return self<=value.", + "builtins.TarFile.fileobject.__lt__" => "Return self<value.", + "builtins.TarFile.fileobject.__ne__" => "Return self!=value.", + "builtins.TarFile.fileobject.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.TarFile.fileobject.__next__" => "Implement next(self).", + "builtins.TarFile.fileobject.__reduce__" => "Helper for pickle.", + "builtins.TarFile.fileobject.__reduce_ex__" => "Helper for pickle.", + "builtins.TarFile.fileobject.__repr__" => "Return repr(self).", + "builtins.TarFile.fileobject.__setattr__" => "Implement setattr(self, name, value).", + "builtins.TarFile.fileobject.__str__" => "Return str(self).", + "builtins.TarFile.fileobject.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.TarFile.fileobject.readlines" => "Return a list of lines from the stream.\n\nhint can be specified to control the number of lines read: no more\nlines will be read if the total size (in bytes/characters) of all\nlines so far exceeds hint.", + "builtins.TarFile.fileobject.writable" => "Return whether object was opened for writing.\n\nIf False, write() will raise OSError.", + "builtins.TarFile.fileobject.write" => "Write buffer b to the IO stream.\n\nReturn the number of bytes written, which is always\nthe length of b in bytes.\n\nRaise BlockingIOError if the buffer is full and the\nunderlying raw stream cannot accept more data at the moment.", + "builtins.TarFile.fileobject.writelines" => "Write a list of lines to stream.\n\nLine separators are not added, so it is usual for each of the\nlines provided to have a line separator at the end.", + "builtins.TarFile.getmember" => "Return a TarInfo object for member 'name'. If 'name' can not be\nfound in the archive, KeyError is raised. If a member occurs more\nthan once in the archive, its last occurrence is assumed to be the\nmost up-to-date version.", + "builtins.TarFile.getmembers" => "Return the members of the archive as a list of TarInfo objects. The\nlist has the same order as the members in the archive.", + "builtins.TarFile.getnames" => "Return the members of the archive as a list of their names. It has\nthe same order as the list returned by getmembers().", + "builtins.TarFile.gettarinfo" => "Create a TarInfo object from the result of os.stat or equivalent\non an existing file. The file is either named by 'name', or\nspecified as a file object 'fileobj' with a file descriptor. If\ngiven, 'arcname' specifies an alternative name for the file in the\narchive, otherwise, the name is taken from the 'name' attribute of\n'fileobj', or the 'name' argument. The name should be a text\nstring.", + "builtins.TarFile.gzopen" => "Open gzip compressed tar archive name for reading or writing.\nAppending is not allowed.", + "builtins.TarFile.list" => "Print a table of contents to sys.stdout.\n\nIf 'verbose' is False, only the names of the members are printed.\nIf it is True, an 'ls -l'-like output is produced. 'members' is\noptional and must be a subset of the list returned by getmembers().", + "builtins.TarFile.makedev" => "Make a character or block device called targetpath.", + "builtins.TarFile.makedir" => "Make a directory called targetpath.", + "builtins.TarFile.makefifo" => "Make a fifo called targetpath.", + "builtins.TarFile.makefile" => "Make a file called targetpath.", + "builtins.TarFile.makelink_with_filter" => "Make a (symbolic) link called targetpath. If it cannot be created\n(platform limitation), we try to make a copy of the referenced file\ninstead of a link.\n\nfilter_function is only used when extracting a *different*\nmember (e.g. as fallback to creating a link).", + "builtins.TarFile.makeunknown" => "Make a file from a TarInfo object with an unknown type\nat targetpath.", + "builtins.TarFile.next" => "Return the next member of the archive as a TarInfo object, when\nTarFile is opened for reading. Return None if there is no more\navailable.", + "builtins.TarFile.open" => "Open a tar archive for reading, writing or appending. Return\nan appropriate TarFile class.\n\nmode:\n'r' or 'r:*' open for reading with transparent compression\n'r:' open for reading exclusively uncompressed\n'r:gz' open for reading with gzip compression\n'r:bz2' open for reading with bzip2 compression\n'r:xz' open for reading with lzma compression\n'r:zst' open for reading with zstd compression\n'a' or 'a:' open for appending, creating the file if necessary\n'w' or 'w:' open for writing without compression\n'w:gz' open for writing with gzip compression\n'w:bz2' open for writing with bzip2 compression\n'w:xz' open for writing with lzma compression\n'w:zst' open for writing with zstd compression\n\n'x' or 'x:' create a tarfile exclusively without compression, raise\n an exception if the file is already created\n'x:gz' create a gzip compressed tarfile, raise an exception\n if the file is already created\n'x:bz2' create a bzip2 compressed tarfile, raise an exception\n if the file is already created\n'x:xz' create an lzma compressed tarfile, raise an exception\n if the file is already created\n'x:zst' create a zstd compressed tarfile, raise an exception\n if the file is already created\n\n'r|*' open a stream of tar blocks with transparent compression\n'r|' open an uncompressed stream of tar blocks for reading\n'r|gz' open a gzip compressed stream of tar blocks\n'r|bz2' open a bzip2 compressed stream of tar blocks\n'r|xz' open an lzma compressed stream of tar blocks\n'r|zst' open a zstd compressed stream of tar blocks\n'w|' open an uncompressed stream for writing\n'w|gz' open a gzip compressed stream for writing\n'w|bz2' open a bzip2 compressed stream for writing\n'w|xz' open an lzma compressed stream for writing\n'w|zst' open a zstd compressed stream for writing", + "builtins.TarFile.tarinfo" => "Informational class which holds the details about an\narchive member given by a tar header block.\nTarInfo objects are returned by TarFile.getmember(),\nTarFile.getmembers() and TarFile.gettarinfo() and are\nusually created internally.", + "builtins.TarFile.tarinfo.__delattr__" => "Implement delattr(self, name).", + "builtins.TarFile.tarinfo.__eq__" => "Return self==value.", + "builtins.TarFile.tarinfo.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.TarFile.tarinfo.__ge__" => "Return self>=value.", + "builtins.TarFile.tarinfo.__getattribute__" => "Return getattr(self, name).", + "builtins.TarFile.tarinfo.__getstate__" => "Helper for pickle.", + "builtins.TarFile.tarinfo.__gt__" => "Return self>value.", + "builtins.TarFile.tarinfo.__hash__" => "Return hash(self).", + "builtins.TarFile.tarinfo.__init__" => "Construct a TarInfo object. name is the optional name\nof the member.", + "builtins.TarFile.tarinfo.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.TarFile.tarinfo.__le__" => "Return self<=value.", + "builtins.TarFile.tarinfo.__lt__" => "Return self<value.", + "builtins.TarFile.tarinfo.__ne__" => "Return self!=value.", + "builtins.TarFile.tarinfo.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.TarFile.tarinfo.__reduce__" => "Helper for pickle.", + "builtins.TarFile.tarinfo.__reduce_ex__" => "Helper for pickle.", + "builtins.TarFile.tarinfo.__setattr__" => "Implement setattr(self, name, value).", + "builtins.TarFile.tarinfo.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.TarFile.tarinfo.__str__" => "Return str(self).", + "builtins.TarFile.tarinfo.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.TarFile.tarinfo._apply_pax_info" => "Replace fields with supplemental information from a previous\npax extended or global header.", + "builtins.TarFile.tarinfo._block" => "Round up a byte count by BLOCKSIZE and return it,\ne.g. _block(834) => 1024.", + "builtins.TarFile.tarinfo._create_gnu_long_header" => "Return a GNUTYPE_LONGNAME or GNUTYPE_LONGLINK sequence\nfor name.", + "builtins.TarFile.tarinfo._create_header" => "Return a header block. info is a dictionary with file\ninformation, format must be one of the *_FORMAT constants.", + "builtins.TarFile.tarinfo._create_pax_generic_header" => "Return a POSIX.1-2008 extended or global header sequence\nthat contains a list of keyword, value pairs. The values\nmust be strings.", + "builtins.TarFile.tarinfo._create_payload" => "Return the string payload filled with zero bytes\nup to the next 512 byte border.", + "builtins.TarFile.tarinfo._decode_pax_field" => "Decode a single field from a pax record.", + "builtins.TarFile.tarinfo._frombuf" => "Construct a TarInfo object from a 512 byte bytes object.\n\nIf ``dircheck`` is set to ``True`` then ``AREGTYPE`` headers will\nbe normalized to ``DIRTYPE`` if the name ends in a trailing slash.\n``dircheck`` must be set to ``False`` if this function is called\non a follow-up header such as ``GNUTYPE_LONGNAME``.", + "builtins.TarFile.tarinfo._fromtarfile" => "See dircheck documentation in _frombuf().", + "builtins.TarFile.tarinfo._posix_split_name" => "Split a name longer than 100 chars into a prefix\nand a name part.", + "builtins.TarFile.tarinfo._proc_builtin" => "Process a builtin type or an unknown type which\nwill be treated as a regular file.", + "builtins.TarFile.tarinfo._proc_gnulong" => "Process the blocks that hold a GNU longname\nor longlink member.", + "builtins.TarFile.tarinfo._proc_gnusparse_00" => "Process a GNU tar extended sparse header, version 0.0.", + "builtins.TarFile.tarinfo._proc_gnusparse_01" => "Process a GNU tar extended sparse header, version 0.1.", + "builtins.TarFile.tarinfo._proc_gnusparse_10" => "Process a GNU tar extended sparse header, version 1.0.", + "builtins.TarFile.tarinfo._proc_member" => "Choose the right processing method depending on\nthe type and call it.", + "builtins.TarFile.tarinfo._proc_pax" => "Process an extended or global header as described in\nPOSIX.1-2008.", + "builtins.TarFile.tarinfo._proc_sparse" => "Process a GNU sparse header plus extra headers.", + "builtins.TarFile.tarinfo.create_gnu_header" => "Return the object as a GNU header block sequence.", + "builtins.TarFile.tarinfo.create_pax_global_header" => "Return the object as a pax global header block sequence.", + "builtins.TarFile.tarinfo.create_pax_header" => "Return the object as a ustar header block. If it cannot be\nrepresented this way, prepend a pax extended header sequence\nwith supplement information.", + "builtins.TarFile.tarinfo.create_ustar_header" => "Return the object as a ustar header block.", + "builtins.TarFile.tarinfo.frombuf" => "Construct a TarInfo object from a 512 byte bytes object.\n\nTo support the old v7 tar format AREGTYPE headers are\ntransformed to DIRTYPE headers if their name ends in '/'.", + "builtins.TarFile.tarinfo.fromtarfile" => "Return the next TarInfo object from TarFile object\ntarfile.", + "builtins.TarFile.tarinfo.get_info" => "Return the TarInfo's attributes as a dictionary.", + "builtins.TarFile.tarinfo.isblk" => "Return True if it is a block device.", + "builtins.TarFile.tarinfo.ischr" => "Return True if it is a character device.", + "builtins.TarFile.tarinfo.isdev" => "Return True if it is one of character device, block device or FIFO.", + "builtins.TarFile.tarinfo.isdir" => "Return True if it is a directory.", + "builtins.TarFile.tarinfo.isfifo" => "Return True if it is a FIFO.", + "builtins.TarFile.tarinfo.isfile" => "Return True if the Tarinfo object is a regular file.", + "builtins.TarFile.tarinfo.islnk" => "Return True if it is a hard link.", + "builtins.TarFile.tarinfo.isreg" => "Return True if the Tarinfo object is a regular file.", + "builtins.TarFile.tarinfo.issym" => "Return True if it is a symbolic link.", + "builtins.TarFile.tarinfo.linkpath" => "In pax headers, \"linkname\" is called \"linkpath\".", + "builtins.TarFile.tarinfo.path" => "In pax headers, \"name\" is called \"path\".", + "builtins.TarFile.tarinfo.replace" => "Return a deep copy of self with the given attributes replaced.", + "builtins.TarFile.tarinfo.tobuf" => "Return a tar header as a string of 512 byte blocks.", + "builtins.TarFile.taropen" => "Open uncompressed tar archive name for reading or writing.", + "builtins.TarFile.utime" => "Set modification time of targetpath according to tarinfo.", + "builtins.TarFile.xzopen" => "Open lzma compressed tar archive name for reading or writing.\nAppending is not allowed.", + "builtins.TarFile.zstopen" => "Open zstd compressed tar archive name for reading or writing.\nAppending is not allowed.", + "builtins.TarInfo" => "Informational class which holds the details about an\narchive member given by a tar header block.\nTarInfo objects are returned by TarFile.getmember(),\nTarFile.getmembers() and TarFile.gettarinfo() and are\nusually created internally.", + "builtins.TarInfo.__delattr__" => "Implement delattr(self, name).", + "builtins.TarInfo.__eq__" => "Return self==value.", + "builtins.TarInfo.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.TarInfo.__ge__" => "Return self>=value.", + "builtins.TarInfo.__getattribute__" => "Return getattr(self, name).", + "builtins.TarInfo.__getstate__" => "Helper for pickle.", + "builtins.TarInfo.__gt__" => "Return self>value.", + "builtins.TarInfo.__hash__" => "Return hash(self).", + "builtins.TarInfo.__init__" => "Construct a TarInfo object. name is the optional name\nof the member.", + "builtins.TarInfo.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.TarInfo.__le__" => "Return self<=value.", + "builtins.TarInfo.__lt__" => "Return self<value.", + "builtins.TarInfo.__ne__" => "Return self!=value.", + "builtins.TarInfo.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.TarInfo.__reduce__" => "Helper for pickle.", + "builtins.TarInfo.__reduce_ex__" => "Helper for pickle.", + "builtins.TarInfo.__setattr__" => "Implement setattr(self, name, value).", + "builtins.TarInfo.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.TarInfo.__str__" => "Return str(self).", + "builtins.TarInfo.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.TarInfo._apply_pax_info" => "Replace fields with supplemental information from a previous\npax extended or global header.", + "builtins.TarInfo._block" => "Round up a byte count by BLOCKSIZE and return it,\ne.g. _block(834) => 1024.", + "builtins.TarInfo._create_gnu_long_header" => "Return a GNUTYPE_LONGNAME or GNUTYPE_LONGLINK sequence\nfor name.", + "builtins.TarInfo._create_header" => "Return a header block. info is a dictionary with file\ninformation, format must be one of the *_FORMAT constants.", + "builtins.TarInfo._create_pax_generic_header" => "Return a POSIX.1-2008 extended or global header sequence\nthat contains a list of keyword, value pairs. The values\nmust be strings.", + "builtins.TarInfo._create_payload" => "Return the string payload filled with zero bytes\nup to the next 512 byte border.", + "builtins.TarInfo._decode_pax_field" => "Decode a single field from a pax record.", + "builtins.TarInfo._frombuf" => "Construct a TarInfo object from a 512 byte bytes object.\n\nIf ``dircheck`` is set to ``True`` then ``AREGTYPE`` headers will\nbe normalized to ``DIRTYPE`` if the name ends in a trailing slash.\n``dircheck`` must be set to ``False`` if this function is called\non a follow-up header such as ``GNUTYPE_LONGNAME``.", + "builtins.TarInfo._fromtarfile" => "See dircheck documentation in _frombuf().", + "builtins.TarInfo._posix_split_name" => "Split a name longer than 100 chars into a prefix\nand a name part.", + "builtins.TarInfo._proc_builtin" => "Process a builtin type or an unknown type which\nwill be treated as a regular file.", + "builtins.TarInfo._proc_gnulong" => "Process the blocks that hold a GNU longname\nor longlink member.", + "builtins.TarInfo._proc_gnusparse_00" => "Process a GNU tar extended sparse header, version 0.0.", + "builtins.TarInfo._proc_gnusparse_01" => "Process a GNU tar extended sparse header, version 0.1.", + "builtins.TarInfo._proc_gnusparse_10" => "Process a GNU tar extended sparse header, version 1.0.", + "builtins.TarInfo._proc_member" => "Choose the right processing method depending on\nthe type and call it.", + "builtins.TarInfo._proc_pax" => "Process an extended or global header as described in\nPOSIX.1-2008.", + "builtins.TarInfo._proc_sparse" => "Process a GNU sparse header plus extra headers.", + "builtins.TarInfo.create_gnu_header" => "Return the object as a GNU header block sequence.", + "builtins.TarInfo.create_pax_global_header" => "Return the object as a pax global header block sequence.", + "builtins.TarInfo.create_pax_header" => "Return the object as a ustar header block. If it cannot be\nrepresented this way, prepend a pax extended header sequence\nwith supplement information.", + "builtins.TarInfo.create_ustar_header" => "Return the object as a ustar header block.", + "builtins.TarInfo.frombuf" => "Construct a TarInfo object from a 512 byte bytes object.\n\nTo support the old v7 tar format AREGTYPE headers are\ntransformed to DIRTYPE headers if their name ends in '/'.", + "builtins.TarInfo.fromtarfile" => "Return the next TarInfo object from TarFile object\ntarfile.", + "builtins.TarInfo.get_info" => "Return the TarInfo's attributes as a dictionary.", + "builtins.TarInfo.isblk" => "Return True if it is a block device.", + "builtins.TarInfo.ischr" => "Return True if it is a character device.", + "builtins.TarInfo.isdev" => "Return True if it is one of character device, block device or FIFO.", + "builtins.TarInfo.isdir" => "Return True if it is a directory.", + "builtins.TarInfo.isfifo" => "Return True if it is a FIFO.", + "builtins.TarInfo.isfile" => "Return True if the Tarinfo object is a regular file.", + "builtins.TarInfo.islnk" => "Return True if it is a hard link.", + "builtins.TarInfo.isreg" => "Return True if the Tarinfo object is a regular file.", + "builtins.TarInfo.issym" => "Return True if it is a symbolic link.", + "builtins.TarInfo.linkpath" => "In pax headers, \"linkname\" is called \"linkpath\".", + "builtins.TarInfo.path" => "In pax headers, \"name\" is called \"path\".", + "builtins.TarInfo.replace" => "Return a deep copy of self with the given attributes replaced.", + "builtins.TarInfo.tobuf" => "Return a tar header as a string of 512 byte blocks.", + "builtins.TaskGroup" => "Asynchronous context manager for managing groups of tasks.\n\nExample use:\n\n async with asyncio.TaskGroup() as group:\n task1 = group.create_task(some_coroutine(...))\n task2 = group.create_task(other_coroutine(...))\n print(\"Both tasks have completed now.\")\n\nAll tasks are awaited when the context manager exits.\n\nAny exceptions other than `asyncio.CancelledError` raised within\na task will cancel all remaining tasks and wait for them to exit.\nThe exceptions are then combined and raised as an `ExceptionGroup`.", + "builtins.TaskGroup.__delattr__" => "Implement delattr(self, name).", + "builtins.TaskGroup.__eq__" => "Return self==value.", + "builtins.TaskGroup.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.TaskGroup.__ge__" => "Return self>=value.", + "builtins.TaskGroup.__getattribute__" => "Return getattr(self, name).", + "builtins.TaskGroup.__getstate__" => "Helper for pickle.", + "builtins.TaskGroup.__gt__" => "Return self>value.", + "builtins.TaskGroup.__hash__" => "Return hash(self).", + "builtins.TaskGroup.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.TaskGroup.__le__" => "Return self<=value.", + "builtins.TaskGroup.__lt__" => "Return self<value.", + "builtins.TaskGroup.__ne__" => "Return self!=value.", + "builtins.TaskGroup.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.TaskGroup.__reduce__" => "Helper for pickle.", + "builtins.TaskGroup.__reduce_ex__" => "Helper for pickle.", + "builtins.TaskGroup.__setattr__" => "Implement setattr(self, name, value).", + "builtins.TaskGroup.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.TaskGroup.__str__" => "Return str(self).", + "builtins.TaskGroup.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.TaskGroup.__weakref__" => "list of weak references to the object", + "builtins.TaskGroup.create_task" => "Create a new task in this group and return it.\n\nSimilar to `asyncio.create_task`.", + "builtins.TaskStepMethWrapper.__call__" => "Call self as a function.", + "builtins.TaskStepMethWrapper.__delattr__" => "Implement delattr(self, name).", + "builtins.TaskStepMethWrapper.__eq__" => "Return self==value.", + "builtins.TaskStepMethWrapper.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.TaskStepMethWrapper.__ge__" => "Return self>=value.", + "builtins.TaskStepMethWrapper.__getattribute__" => "Return getattr(self, name).", + "builtins.TaskStepMethWrapper.__getstate__" => "Helper for pickle.", + "builtins.TaskStepMethWrapper.__gt__" => "Return self>value.", + "builtins.TaskStepMethWrapper.__hash__" => "Return hash(self).", + "builtins.TaskStepMethWrapper.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.TaskStepMethWrapper.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.TaskStepMethWrapper.__le__" => "Return self<=value.", + "builtins.TaskStepMethWrapper.__lt__" => "Return self<value.", + "builtins.TaskStepMethWrapper.__ne__" => "Return self!=value.", + "builtins.TaskStepMethWrapper.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.TaskStepMethWrapper.__reduce__" => "Helper for pickle.", + "builtins.TaskStepMethWrapper.__reduce_ex__" => "Helper for pickle.", + "builtins.TaskStepMethWrapper.__repr__" => "Return repr(self).", + "builtins.TaskStepMethWrapper.__setattr__" => "Implement setattr(self, name, value).", + "builtins.TaskStepMethWrapper.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.TaskStepMethWrapper.__str__" => "Return str(self).", + "builtins.TaskStepMethWrapper.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Tbuffer" => "Ring buffer used as undobuffer for RawTurtle objects.", + "builtins.Tbuffer.__delattr__" => "Implement delattr(self, name).", + "builtins.Tbuffer.__eq__" => "Return self==value.", + "builtins.Tbuffer.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Tbuffer.__ge__" => "Return self>=value.", + "builtins.Tbuffer.__getattribute__" => "Return getattr(self, name).", + "builtins.Tbuffer.__getstate__" => "Helper for pickle.", + "builtins.Tbuffer.__gt__" => "Return self>value.", + "builtins.Tbuffer.__hash__" => "Return hash(self).", + "builtins.Tbuffer.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Tbuffer.__le__" => "Return self<=value.", + "builtins.Tbuffer.__lt__" => "Return self<value.", + "builtins.Tbuffer.__ne__" => "Return self!=value.", + "builtins.Tbuffer.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Tbuffer.__reduce__" => "Helper for pickle.", + "builtins.Tbuffer.__reduce_ex__" => "Helper for pickle.", + "builtins.Tbuffer.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Tbuffer.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Tbuffer.__str__" => "Return str(self).", + "builtins.Tbuffer.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Tbuffer.__weakref__" => "list of weak references to the object", + "builtins.Tcl_Obj.__delattr__" => "Implement delattr(self, name).", + "builtins.Tcl_Obj.__eq__" => "Return self==value.", + "builtins.Tcl_Obj.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Tcl_Obj.__ge__" => "Return self>=value.", + "builtins.Tcl_Obj.__getattribute__" => "Return getattr(self, name).", + "builtins.Tcl_Obj.__getstate__" => "Helper for pickle.", + "builtins.Tcl_Obj.__gt__" => "Return self>value.", + "builtins.Tcl_Obj.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Tcl_Obj.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Tcl_Obj.__le__" => "Return self<=value.", + "builtins.Tcl_Obj.__lt__" => "Return self<value.", + "builtins.Tcl_Obj.__ne__" => "Return self!=value.", + "builtins.Tcl_Obj.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Tcl_Obj.__reduce__" => "Helper for pickle.", + "builtins.Tcl_Obj.__reduce_ex__" => "Helper for pickle.", + "builtins.Tcl_Obj.__repr__" => "Return repr(self).", + "builtins.Tcl_Obj.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Tcl_Obj.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Tcl_Obj.__str__" => "Return str(self).", + "builtins.Tcl_Obj.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Tcl_Obj.string" => "the string representation of this object, either as str or bytes", + "builtins.Tcl_Obj.typename" => "name of the Tcl type", + "builtins.Template" => "A string class for supporting $-substitutions.", + "builtins.Template.__add__" => "Return self+value.", + "builtins.Template.__class_getitem__" => "Template supports [] for generic usage", + "builtins.Template.__delattr__" => "Implement delattr(self, name).", + "builtins.Template.__eq__" => "Return self==value.", + "builtins.Template.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Template.__ge__" => "Return self>=value.", + "builtins.Template.__getattribute__" => "Return getattr(self, name).", + "builtins.Template.__getstate__" => "Helper for pickle.", + "builtins.Template.__gt__" => "Return self>value.", + "builtins.Template.__hash__" => "Return hash(self).", + "builtins.Template.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Template.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Template.__iter__" => "Implement iter(self).", + "builtins.Template.__le__" => "Return self<=value.", + "builtins.Template.__lt__" => "Return self<value.", + "builtins.Template.__ne__" => "Return self!=value.", + "builtins.Template.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Template.__reduce__" => "Helper for pickle.", + "builtins.Template.__reduce_ex__" => "Helper for pickle.", + "builtins.Template.__repr__" => "Return repr(self).", + "builtins.Template.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Template.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Template.__str__" => "Return str(self).", + "builtins.Template.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Template.__weakref__" => "list of weak references to the object", + "builtins.Template.interpolations" => "Interpolations", + "builtins.Template.strings" => "Strings", + "builtins.Template.values" => "Values of interpolations", + "builtins.TemplateIter" => "Template iterator object", + "builtins.TemplateIter.__delattr__" => "Implement delattr(self, name).", + "builtins.TemplateIter.__eq__" => "Return self==value.", + "builtins.TemplateIter.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.TemplateIter.__ge__" => "Return self>=value.", + "builtins.TemplateIter.__getattribute__" => "Return getattr(self, name).", + "builtins.TemplateIter.__getstate__" => "Helper for pickle.", + "builtins.TemplateIter.__gt__" => "Return self>value.", + "builtins.TemplateIter.__hash__" => "Return hash(self).", + "builtins.TemplateIter.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.TemplateIter.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.TemplateIter.__iter__" => "Implement iter(self).", + "builtins.TemplateIter.__le__" => "Return self<=value.", + "builtins.TemplateIter.__lt__" => "Return self<value.", + "builtins.TemplateIter.__ne__" => "Return self!=value.", + "builtins.TemplateIter.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.TemplateIter.__next__" => "Implement next(self).", + "builtins.TemplateIter.__reduce__" => "Helper for pickle.", + "builtins.TemplateIter.__reduce_ex__" => "Helper for pickle.", + "builtins.TemplateIter.__repr__" => "Return repr(self).", + "builtins.TemplateIter.__setattr__" => "Implement setattr(self, name, value).", + "builtins.TemplateIter.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.TemplateIter.__str__" => "Return str(self).", + "builtins.TemplateIter.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.TemporaryDirectory" => "Create and return a temporary directory. This has the same\nbehavior as mkdtemp but can be used as a context manager. For\nexample:\n\n with TemporaryDirectory() as tmpdir:\n ...\n\nUpon exiting the context, the directory and everything contained\nin it are removed (unless delete=False is passed or an exception\nis raised during cleanup and ignore_cleanup_errors is not True).\n\nOptional Arguments:\n suffix - A str suffix for the directory name. (see mkdtemp)\n prefix - A str prefix for the directory name. (see mkdtemp)\n dir - A directory to create this temp dir in. (see mkdtemp)\n ignore_cleanup_errors - False; ignore exceptions during cleanup?\n delete - True; whether the directory is automatically deleted.", + "builtins.TemporaryDirectory.__class_getitem__" => "Represent a PEP 585 generic type\n\nE.g. for t = list[int], t.__origin__ is list and t.__args__ is (int,).", + "builtins.TemporaryDirectory.__delattr__" => "Implement delattr(self, name).", + "builtins.TemporaryDirectory.__eq__" => "Return self==value.", + "builtins.TemporaryDirectory.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.TemporaryDirectory.__ge__" => "Return self>=value.", + "builtins.TemporaryDirectory.__getattribute__" => "Return getattr(self, name).", + "builtins.TemporaryDirectory.__getstate__" => "Helper for pickle.", + "builtins.TemporaryDirectory.__gt__" => "Return self>value.", + "builtins.TemporaryDirectory.__hash__" => "Return hash(self).", + "builtins.TemporaryDirectory.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.TemporaryDirectory.__le__" => "Return self<=value.", + "builtins.TemporaryDirectory.__lt__" => "Return self<value.", + "builtins.TemporaryDirectory.__ne__" => "Return self!=value.", + "builtins.TemporaryDirectory.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.TemporaryDirectory.__reduce__" => "Helper for pickle.", + "builtins.TemporaryDirectory.__reduce_ex__" => "Helper for pickle.", + "builtins.TemporaryDirectory.__setattr__" => "Implement setattr(self, name, value).", + "builtins.TemporaryDirectory.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.TemporaryDirectory.__str__" => "Return str(self).", + "builtins.TemporaryDirectory.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.TemporaryDirectory.__weakref__" => "list of weak references to the object", + "builtins.TestCase" => "A class whose instances are single test cases.\n\nBy default, the test code itself should be placed in a method named\n'runTest'.\n\nIf the fixture may be used for many test cases, create as\nmany test methods as are needed. When instantiating such a TestCase\nsubclass, specify in the constructor arguments the name of the test method\nthat the instance is to execute.\n\nTest authors should subclass TestCase for their own tests. Construction\nand deconstruction of the test's environment ('fixture') can be\nimplemented by overriding the 'setUp' and 'tearDown' methods respectively.\n\nIf it is necessary to override the __init__ method, the base class\n__init__ method must always be called. It is important that subclasses\nshould not change the signature of their __init__ method, since instances\nof the classes are instantiated automatically by parts of the framework\nin order to be run.\n\nWhen subclassing TestCase, you can set these attributes:\n* failureException: determines which exception will be raised when\n the instance's assertion methods fail; test methods raising this\n exception will be deemed to have 'failed' rather than 'errored'.\n* longMessage: determines whether long messages (including repr of\n objects used in assert methods) will be printed on failure in *addition*\n to any explicit message passed.\n* maxDiff: sets the maximum length of a diff in failure messages\n by assert methods using difflib. It is looked up as an instance\n attribute so can be configured by individual tests if required.", + "builtins.TestCase.__delattr__" => "Implement delattr(self, name).", + "builtins.TestCase.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.TestCase.__ge__" => "Return self>=value.", + "builtins.TestCase.__getattribute__" => "Return getattr(self, name).", + "builtins.TestCase.__getstate__" => "Helper for pickle.", + "builtins.TestCase.__gt__" => "Return self>value.", + "builtins.TestCase.__init__" => "Create an instance of the class that will use the named test\nmethod when executed. Raises a ValueError if the instance does\nnot have a method with the specified name.", + "builtins.TestCase.__le__" => "Return self<=value.", + "builtins.TestCase.__lt__" => "Return self<value.", + "builtins.TestCase.__ne__" => "Return self!=value.", + "builtins.TestCase.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.TestCase.__reduce__" => "Helper for pickle.", + "builtins.TestCase.__reduce_ex__" => "Helper for pickle.", + "builtins.TestCase.__setattr__" => "Implement setattr(self, name, value).", + "builtins.TestCase.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.TestCase.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.TestCase.__weakref__" => "list of weak references to the object", + "builtins.TestCase._assertNotWarns" => "The opposite of assertWarns. Private due to low demand.", + "builtins.TestCase._baseAssertEqual" => "The default assertEqual implementation, not type specific.", + "builtins.TestCase._formatMessage" => "Honour the longMessage attribute when generating failure messages.\nIf longMessage is False this means:\n* Use only an explicit message if it is provided\n* Otherwise use the standard message for the assert\n\nIf longMessage is True:\n* Use the standard message\n* If an explicit message is provided, plus ' : ' and the explicit message", + "builtins.TestCase._getAssertEqualityFunc" => "Get a detailed comparison function for the types of the two args.\n\nReturns: A callable accepting (first, second, msg=None) that will\nraise a failure exception if first != second with a useful human\nreadable error message for those types.", + "builtins.TestCase.addClassCleanup" => "Same as addCleanup, except the cleanup items are called even if\nsetUpClass fails (unlike tearDownClass).", + "builtins.TestCase.addCleanup" => "Add a function, with arguments, to be called when the test is\ncompleted. Functions added are called on a LIFO basis and are\ncalled after tearDown on test failure or success.\n\nCleanup items are called even if setUp fails (unlike tearDown).", + "builtins.TestCase.addTypeEqualityFunc" => "Add a type specific assertEqual style function to compare a type.\n\nThis method is for use by TestCase subclasses that need to register\ntheir own type equality functions to provide nicer error messages.\n\nArgs:\n typeobj: The data type to call this function on when both values\n are of the same type in assertEqual().\n function: The callable taking two arguments and an optional\n msg= argument that raises self.failureException with a\n useful error message when the two arguments are not equal.", + "builtins.TestCase.assertAlmostEqual" => "Fail if the two objects are unequal as determined by their\ndifference rounded to the given number of decimal places\n(default 7) and comparing to zero, or by comparing that the\ndifference between the two objects is more than the given\ndelta.\n\nNote that decimal places (from zero) are usually not the same\nas significant digits (measured from the most significant digit).\n\nIf the two objects compare equal then they will automatically\ncompare almost equal.", + "builtins.TestCase.assertCountEqual" => "Asserts that two iterables have the same elements, the same number of\ntimes, without regard to order.\n\n self.assertEqual(Counter(list(first)),\n Counter(list(second)))\n\n Example:\n - [0, 1, 1] and [1, 0, 1] compare equal.\n - [0, 0, 1] and [0, 1] compare unequal.", + "builtins.TestCase.assertEqual" => "Fail if the two objects are unequal as determined by the '=='\noperator.", + "builtins.TestCase.assertFalse" => "Check that the expression is false.", + "builtins.TestCase.assertGreater" => "Just like self.assertTrue(a > b), but with a nicer default message.", + "builtins.TestCase.assertGreaterEqual" => "Just like self.assertTrue(a >= b), but with a nicer default message.", + "builtins.TestCase.assertIn" => "Just like self.assertTrue(a in b), but with a nicer default message.", + "builtins.TestCase.assertIs" => "Just like self.assertTrue(a is b), but with a nicer default message.", + "builtins.TestCase.assertIsInstance" => "Same as self.assertTrue(isinstance(obj, cls)), with a nicer\ndefault message.", + "builtins.TestCase.assertIsNone" => "Same as self.assertTrue(obj is None), with a nicer default message.", + "builtins.TestCase.assertIsNot" => "Just like self.assertTrue(a is not b), but with a nicer default message.", + "builtins.TestCase.assertIsNotNone" => "Included for symmetry with assertIsNone.", + "builtins.TestCase.assertLess" => "Just like self.assertTrue(a < b), but with a nicer default message.", + "builtins.TestCase.assertLessEqual" => "Just like self.assertTrue(a <= b), but with a nicer default message.", + "builtins.TestCase.assertListEqual" => "A list-specific equality assertion.\n\nArgs:\n list1: The first list to compare.\n list2: The second list to compare.\n msg: Optional message to use on failure instead of a list of\n differences.", + "builtins.TestCase.assertLogs" => "Fail unless a log message of level *level* or higher is emitted\non *logger_name* or its children. If omitted, *level* defaults to\nINFO and *logger* defaults to the root logger.\n\nThis method must be used as a context manager, and will yield\na recording object with two attributes: `output` and `records`.\nAt the end of the context manager, the `output` attribute will\nbe a list of the matching formatted log messages and the\n`records` attribute will be a list of the corresponding LogRecord\nobjects.\n\nExample::\n\n with self.assertLogs('foo', level='INFO') as cm:\n logging.getLogger('foo').info('first message')\n logging.getLogger('foo.bar').error('second message')\n self.assertEqual(cm.output, ['INFO:foo:first message',\n 'ERROR:foo.bar:second message'])", + "builtins.TestCase.assertMultiLineEqual" => "Assert that two multi-line strings are equal.", + "builtins.TestCase.assertNoLogs" => "Fail unless no log messages of level *level* or higher are emitted\non *logger_name* or its children.\n\nThis method must be used as a context manager.", + "builtins.TestCase.assertNotAlmostEqual" => "Fail if the two objects are equal as determined by their\ndifference rounded to the given number of decimal places\n(default 7) and comparing to zero, or by comparing that the\ndifference between the two objects is less than the given delta.\n\nNote that decimal places (from zero) are usually not the same\nas significant digits (measured from the most significant digit).\n\nObjects that are equal automatically fail.", + "builtins.TestCase.assertNotEqual" => "Fail if the two objects are equal as determined by the '!='\noperator.", + "builtins.TestCase.assertNotIn" => "Just like self.assertTrue(a not in b), but with a nicer default message.", + "builtins.TestCase.assertNotIsInstance" => "Included for symmetry with assertIsInstance.", + "builtins.TestCase.assertNotRegex" => "Fail the test if the text matches the regular expression.", + "builtins.TestCase.assertRaises" => "Fail unless an exception of class expected_exception is raised\nby the callable when invoked with specified positional and\nkeyword arguments. If a different type of exception is\nraised, it will not be caught, and the test case will be\ndeemed to have suffered an error, exactly as for an\nunexpected exception.\n\nIf called with the callable and arguments omitted, will return a\ncontext object used like this::\n\n with self.assertRaises(SomeException):\n do_something()\n\nAn optional keyword argument 'msg' can be provided when assertRaises\nis used as a context object.\n\nThe context manager keeps a reference to the exception as\nthe 'exception' attribute. This allows you to inspect the\nexception after the assertion::\n\n with self.assertRaises(SomeException) as cm:\n do_something()\n the_exception = cm.exception\n self.assertEqual(the_exception.error_code, 3)", + "builtins.TestCase.assertRaisesRegex" => "Asserts that the message in a raised exception matches a regex.\n\nArgs:\n expected_exception: Exception class expected to be raised.\n expected_regex: Regex (re.Pattern object or string) expected\n to be found in error message.\n args: Function to be called and extra positional args.\n kwargs: Extra kwargs.\n msg: Optional message used in case of failure. Can only be used\n when assertRaisesRegex is used as a context manager.", + "builtins.TestCase.assertRegex" => "Fail the test unless the text matches the regular expression.", + "builtins.TestCase.assertSequenceEqual" => "An equality assertion for ordered sequences (like lists and tuples).\n\nFor the purposes of this function, a valid ordered sequence type is one\nwhich can be indexed, has a length, and has an equality operator.\n\nArgs:\n seq1: The first sequence to compare.\n seq2: The second sequence to compare.\n seq_type: The expected datatype of the sequences, or None if no\n datatype should be enforced.\n msg: Optional message to use on failure instead of a list of\n differences.", + "builtins.TestCase.assertSetEqual" => "A set-specific equality assertion.\n\nArgs:\n set1: The first set to compare.\n set2: The second set to compare.\n msg: Optional message to use on failure instead of a list of\n differences.\n\nassertSetEqual uses ducktyping to support different types of sets, and\nis optimized for sets specifically (parameters must support a\ndifference method).", + "builtins.TestCase.assertTrue" => "Check that the expression is true.", + "builtins.TestCase.assertTupleEqual" => "A tuple-specific equality assertion.\n\nArgs:\n tuple1: The first tuple to compare.\n tuple2: The second tuple to compare.\n msg: Optional message to use on failure instead of a list of\n differences.", + "builtins.TestCase.assertWarns" => "Fail unless a warning of class warnClass is triggered\nby the callable when invoked with specified positional and\nkeyword arguments. If a different type of warning is\ntriggered, it will not be handled: depending on the other\nwarning filtering rules in effect, it might be silenced, printed\nout, or raised as an exception.\n\nIf called with the callable and arguments omitted, will return a\ncontext object used like this::\n\n with self.assertWarns(SomeWarning):\n do_something()\n\nAn optional keyword argument 'msg' can be provided when assertWarns\nis used as a context object.\n\nThe context manager keeps a reference to the first matching\nwarning as the 'warning' attribute; similarly, the 'filename'\nand 'lineno' attributes give you information about the line\nof Python code from which the warning was triggered.\nThis allows you to inspect the warning after the assertion::\n\n with self.assertWarns(SomeWarning) as cm:\n do_something()\n the_warning = cm.warning\n self.assertEqual(the_warning.some_attribute, 147)", + "builtins.TestCase.assertWarnsRegex" => "Asserts that the message in a triggered warning matches a regexp.\nBasic functioning is similar to assertWarns() with the addition\nthat only warnings whose messages also match the regular expression\nare considered successful matches.\n\nArgs:\n expected_warning: Warning class expected to be triggered.\n expected_regex: Regex (re.Pattern object or string) expected\n to be found in error message.\n args: Function to be called and extra positional args.\n kwargs: Extra kwargs.\n msg: Optional message used in case of failure. Can only be used\n when assertWarnsRegex is used as a context manager.", + "builtins.TestCase.debug" => "Run the test without collecting errors in a TestResult", + "builtins.TestCase.doClassCleanups" => "Execute all class cleanup functions. Normally called for you after\ntearDownClass.", + "builtins.TestCase.doCleanups" => "Execute all cleanup functions. Normally called for you after\ntearDown.", + "builtins.TestCase.enterClassContext" => "Same as enterContext, but class-wide.", + "builtins.TestCase.enterContext" => "Enters the supplied context manager.\n\nIf successful, also adds its __exit__ method as a cleanup\nfunction and returns the result of the __enter__ method.", + "builtins.TestCase.fail" => "Fail immediately, with the given message.", + "builtins.TestCase.failureException" => "Assertion failed.", + "builtins.TestCase.failureException.__delattr__" => "Implement delattr(self, name).", + "builtins.TestCase.failureException.__eq__" => "Return self==value.", + "builtins.TestCase.failureException.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.TestCase.failureException.__ge__" => "Return self>=value.", + "builtins.TestCase.failureException.__getattribute__" => "Return getattr(self, name).", + "builtins.TestCase.failureException.__getstate__" => "Helper for pickle.", + "builtins.TestCase.failureException.__gt__" => "Return self>value.", + "builtins.TestCase.failureException.__hash__" => "Return hash(self).", + "builtins.TestCase.failureException.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.TestCase.failureException.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.TestCase.failureException.__le__" => "Return self<=value.", + "builtins.TestCase.failureException.__lt__" => "Return self<value.", + "builtins.TestCase.failureException.__ne__" => "Return self!=value.", + "builtins.TestCase.failureException.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.TestCase.failureException.__reduce_ex__" => "Helper for pickle.", + "builtins.TestCase.failureException.__repr__" => "Return repr(self).", + "builtins.TestCase.failureException.__setattr__" => "Implement setattr(self, name, value).", + "builtins.TestCase.failureException.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.TestCase.failureException.__str__" => "Return str(self).", + "builtins.TestCase.failureException.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.TestCase.failureException.add_note" => "Add a note to the exception", + "builtins.TestCase.failureException.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.TestCase.setUp" => "Hook method for setting up the test fixture before exercising it.", + "builtins.TestCase.setUpClass" => "Hook method for setting up class fixture before running tests in the class.", + "builtins.TestCase.shortDescription" => "Returns a one-line description of the test, or None if no\ndescription has been provided.\n\nThe default implementation of this method returns the first line of\nthe specified test method's docstring.", + "builtins.TestCase.skipTest" => "Skip this test.", + "builtins.TestCase.subTest" => "Return a context manager that will return the enclosed block\nof code in a subtest identified by the optional message and\nkeyword parameters. A failure in the subtest marks the test\ncase as failed but resumes execution at the end of the enclosed\nblock, allowing further test code to be executed.", + "builtins.TestCase.tearDown" => "Hook method for deconstructing the test fixture after testing it.", + "builtins.TestCase.tearDownClass" => "Hook method for deconstructing the class fixture after running all tests in the class.", + "builtins.TestLoader" => "This class is responsible for loading tests according to various criteria\nand returning them wrapped in a TestSuite", + "builtins.TestLoader.__delattr__" => "Implement delattr(self, name).", + "builtins.TestLoader.__eq__" => "Return self==value.", + "builtins.TestLoader.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.TestLoader.__ge__" => "Return self>=value.", + "builtins.TestLoader.__getattribute__" => "Return getattr(self, name).", + "builtins.TestLoader.__getstate__" => "Helper for pickle.", + "builtins.TestLoader.__gt__" => "Return self>value.", + "builtins.TestLoader.__hash__" => "Return hash(self).", + "builtins.TestLoader.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.TestLoader.__le__" => "Return self<=value.", + "builtins.TestLoader.__lt__" => "Return self<value.", + "builtins.TestLoader.__ne__" => "Return self!=value.", + "builtins.TestLoader.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.TestLoader.__reduce__" => "Helper for pickle.", + "builtins.TestLoader.__reduce_ex__" => "Helper for pickle.", + "builtins.TestLoader.__repr__" => "Return repr(self).", + "builtins.TestLoader.__setattr__" => "Implement setattr(self, name, value).", + "builtins.TestLoader.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.TestLoader.__str__" => "Return str(self).", + "builtins.TestLoader.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.TestLoader.__weakref__" => "list of weak references to the object", + "builtins.TestLoader._find_test_path" => "Used by discovery.\n\nLoads tests from a single file, or a directories' __init__.py when\npassed the directory.\n\nReturns a tuple (None_or_tests_from_file, should_recurse).", + "builtins.TestLoader._find_tests" => "Used by discovery. Yields test suites it loads.", + "builtins.TestLoader.discover" => "Find and return all test modules from the specified start\ndirectory, recursing into subdirectories to find them and return all\ntests found within them. Only test files that match the pattern will\nbe loaded. (Using shell style pattern matching.)\n\nAll test modules must be importable from the top level of the project.\nIf the start directory is not the top level directory then the top\nlevel directory must be specified separately.\n\nIf a test package name (directory with '__init__.py') matches the\npattern then the package will be checked for a 'load_tests' function. If\nthis exists then it will be called with (loader, tests, pattern) unless\nthe package has already had load_tests called from the same discovery\ninvocation, in which case the package module object is not scanned for\ntests - this ensures that when a package uses discover to further\ndiscover child tests that infinite recursion does not happen.\n\nIf load_tests exists then discovery does *not* recurse into the package,\nload_tests is responsible for loading all tests in the package.\n\nThe pattern is deliberately not stored as a loader attribute so that\npackages can continue discovery themselves. top_level_dir is stored so\nload_tests does not need to pass this argument in to loader.discover().\n\nPaths are sorted before being imported to ensure reproducible execution\norder even on filesystems with non-alphabetical ordering like ext3/4.", + "builtins.TestLoader.getTestCaseNames" => "Return a sorted sequence of method names found within testCaseClass", + "builtins.TestLoader.loadTestsFromModule" => "Return a suite of all test cases contained in the given module", + "builtins.TestLoader.loadTestsFromName" => "Return a suite of all test cases given a string specifier.\n\nThe name may resolve either to a module, a test case class, a\ntest method within a test case class, or a callable object which\nreturns a TestCase or TestSuite instance.\n\nThe method optionally resolves the names relative to a given module.", + "builtins.TestLoader.loadTestsFromNames" => "Return a suite of all test cases found using the given sequence\nof string specifiers. See 'loadTestsFromName()'.", + "builtins.TestLoader.loadTestsFromTestCase" => "Return a suite of all test cases contained in testCaseClass", + "builtins.TestLoader.sortTestMethodsUsing" => "Return -1 if x < y, 0 if x == y and 1 if x > y", + "builtins.TestLoader.suiteClass" => "A test suite is a composite test consisting of a number of TestCases.\n\nFor use, create an instance of TestSuite, then add test case instances.\nWhen all tests have been added, the suite can be passed to a test\nrunner, such as TextTestRunner. It will run the individual test cases\nin the order in which they were added, aggregating the results. When\nsubclassing, do not forget to call the base class constructor.", + "builtins.TestLoader.suiteClass.__delattr__" => "Implement delattr(self, name).", + "builtins.TestLoader.suiteClass.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.TestLoader.suiteClass.__ge__" => "Return self>=value.", + "builtins.TestLoader.suiteClass.__getattribute__" => "Return getattr(self, name).", + "builtins.TestLoader.suiteClass.__getstate__" => "Helper for pickle.", + "builtins.TestLoader.suiteClass.__gt__" => "Return self>value.", + "builtins.TestLoader.suiteClass.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.TestLoader.suiteClass.__le__" => "Return self<=value.", + "builtins.TestLoader.suiteClass.__lt__" => "Return self<value.", + "builtins.TestLoader.suiteClass.__ne__" => "Return self!=value.", + "builtins.TestLoader.suiteClass.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.TestLoader.suiteClass.__reduce__" => "Helper for pickle.", + "builtins.TestLoader.suiteClass.__reduce_ex__" => "Helper for pickle.", + "builtins.TestLoader.suiteClass.__setattr__" => "Implement setattr(self, name, value).", + "builtins.TestLoader.suiteClass.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.TestLoader.suiteClass.__str__" => "Return str(self).", + "builtins.TestLoader.suiteClass.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.TestLoader.suiteClass.__weakref__" => "list of weak references to the object", + "builtins.TestLoader.suiteClass._removeTestAtIndex" => "Stop holding a reference to the TestCase at index.", + "builtins.TestLoader.suiteClass.debug" => "Run the tests without collecting errors in a TestResult", + "builtins.TestProgram" => "A command-line program that runs a set of tests; this is primarily\nfor making test modules conveniently executable.", + "builtins.TestProgram.__delattr__" => "Implement delattr(self, name).", + "builtins.TestProgram.__eq__" => "Return self==value.", + "builtins.TestProgram.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.TestProgram.__ge__" => "Return self>=value.", + "builtins.TestProgram.__getattribute__" => "Return getattr(self, name).", + "builtins.TestProgram.__getstate__" => "Helper for pickle.", + "builtins.TestProgram.__gt__" => "Return self>value.", + "builtins.TestProgram.__hash__" => "Return hash(self).", + "builtins.TestProgram.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.TestProgram.__le__" => "Return self<=value.", + "builtins.TestProgram.__lt__" => "Return self<value.", + "builtins.TestProgram.__ne__" => "Return self!=value.", + "builtins.TestProgram.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.TestProgram.__reduce__" => "Helper for pickle.", + "builtins.TestProgram.__reduce_ex__" => "Helper for pickle.", + "builtins.TestProgram.__repr__" => "Return repr(self).", + "builtins.TestProgram.__setattr__" => "Implement setattr(self, name, value).", + "builtins.TestProgram.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.TestProgram.__str__" => "Return str(self).", + "builtins.TestProgram.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.TestProgram.__weakref__" => "list of weak references to the object", + "builtins.TestResult" => "Holder for test result information.\n\nTest results are automatically managed by the TestCase and TestSuite\nclasses, and do not need to be explicitly manipulated by writers of tests.\n\nEach instance holds the total number of tests run, and collections of\nfailures and errors that occurred among those test runs. The collections\ncontain tuples of (testcase, exceptioninfo), where exceptioninfo is the\nformatted traceback of the error that occurred.", + "builtins.TestResult.__delattr__" => "Implement delattr(self, name).", + "builtins.TestResult.__eq__" => "Return self==value.", + "builtins.TestResult.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.TestResult.__ge__" => "Return self>=value.", + "builtins.TestResult.__getattribute__" => "Return getattr(self, name).", + "builtins.TestResult.__getstate__" => "Helper for pickle.", + "builtins.TestResult.__gt__" => "Return self>value.", + "builtins.TestResult.__hash__" => "Return hash(self).", + "builtins.TestResult.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.TestResult.__le__" => "Return self<=value.", + "builtins.TestResult.__lt__" => "Return self<value.", + "builtins.TestResult.__ne__" => "Return self!=value.", + "builtins.TestResult.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.TestResult.__reduce__" => "Helper for pickle.", + "builtins.TestResult.__reduce_ex__" => "Helper for pickle.", + "builtins.TestResult.__setattr__" => "Implement setattr(self, name, value).", + "builtins.TestResult.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.TestResult.__str__" => "Return str(self).", + "builtins.TestResult.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.TestResult.__weakref__" => "list of weak references to the object", + "builtins.TestResult._exc_info_to_string" => "Converts a sys.exc_info()-style tuple of values into a string.", + "builtins.TestResult._remove_unittest_tb_frames" => "Truncates usercode tb at the first unittest frame.\n\nIf the first frame of the traceback is in user code,\nthe prefix up to the first unittest frame is returned.\nIf the first frame is already in the unittest module,\nthe traceback is not modified.", + "builtins.TestResult.addDuration" => "Called when a test finished to run, regardless of its outcome.\n*test* is the test case corresponding to the test method.\n*elapsed* is the time represented in seconds, and it includes the\nexecution of cleanup functions.", + "builtins.TestResult.addError" => "Called when an error has occurred. 'err' is a tuple of values as\nreturned by sys.exc_info().", + "builtins.TestResult.addExpectedFailure" => "Called when an expected failure/error occurred.", + "builtins.TestResult.addFailure" => "Called when an error has occurred. 'err' is a tuple of values as\nreturned by sys.exc_info().", + "builtins.TestResult.addSkip" => "Called when a test is skipped.", + "builtins.TestResult.addSubTest" => "Called at the end of a subtest.\n'err' is None if the subtest ended successfully, otherwise it's a\ntuple of values as returned by sys.exc_info().", + "builtins.TestResult.addSuccess" => "Called when a test has completed successfully", + "builtins.TestResult.addUnexpectedSuccess" => "Called when a test was expected to fail, but succeed.", + "builtins.TestResult.printErrors" => "Called by TestRunner after test run", + "builtins.TestResult.startTest" => "Called when the given test is about to be run", + "builtins.TestResult.startTestRun" => "Called once before any tests are executed.\n\nSee startTest for a method called before each test.", + "builtins.TestResult.stop" => "Indicates that the tests should be aborted.", + "builtins.TestResult.stopTest" => "Called when the given test has been run", + "builtins.TestResult.stopTestRun" => "Called once after all tests are executed.\n\nSee stopTest for a method called after each test.", + "builtins.TestResult.wasSuccessful" => "Tells whether or not this result was a success.", + "builtins.TextTestRunner" => "A test runner class that displays results in textual form.\n\nIt prints out the names of tests as they are run, errors as they\noccur, and a summary of the results at the end of the test run.", + "builtins.TextTestRunner.__delattr__" => "Implement delattr(self, name).", + "builtins.TextTestRunner.__eq__" => "Return self==value.", + "builtins.TextTestRunner.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.TextTestRunner.__ge__" => "Return self>=value.", + "builtins.TextTestRunner.__getattribute__" => "Return getattr(self, name).", + "builtins.TextTestRunner.__getstate__" => "Helper for pickle.", + "builtins.TextTestRunner.__gt__" => "Return self>value.", + "builtins.TextTestRunner.__hash__" => "Return hash(self).", + "builtins.TextTestRunner.__init__" => "Construct a TextTestRunner.\n\nSubclasses should accept **kwargs to ensure compatibility as the\ninterface changes.", + "builtins.TextTestRunner.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.TextTestRunner.__le__" => "Return self<=value.", + "builtins.TextTestRunner.__lt__" => "Return self<value.", + "builtins.TextTestRunner.__ne__" => "Return self!=value.", + "builtins.TextTestRunner.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.TextTestRunner.__reduce__" => "Helper for pickle.", + "builtins.TextTestRunner.__reduce_ex__" => "Helper for pickle.", + "builtins.TextTestRunner.__repr__" => "Return repr(self).", + "builtins.TextTestRunner.__setattr__" => "Implement setattr(self, name, value).", + "builtins.TextTestRunner.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.TextTestRunner.__str__" => "Return str(self).", + "builtins.TextTestRunner.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.TextTestRunner.__weakref__" => "list of weak references to the object", + "builtins.TextTestRunner.resultclass" => "A test result class that can print formatted text results to a stream.\n\nUsed by TextTestRunner.", + "builtins.TextTestRunner.resultclass.__delattr__" => "Implement delattr(self, name).", + "builtins.TextTestRunner.resultclass.__eq__" => "Return self==value.", + "builtins.TextTestRunner.resultclass.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.TextTestRunner.resultclass.__ge__" => "Return self>=value.", + "builtins.TextTestRunner.resultclass.__getattribute__" => "Return getattr(self, name).", + "builtins.TextTestRunner.resultclass.__getstate__" => "Helper for pickle.", + "builtins.TextTestRunner.resultclass.__gt__" => "Return self>value.", + "builtins.TextTestRunner.resultclass.__hash__" => "Return hash(self).", + "builtins.TextTestRunner.resultclass.__init__" => "Construct a TextTestResult. Subclasses should accept **kwargs\nto ensure compatibility as the interface changes.", + "builtins.TextTestRunner.resultclass.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.TextTestRunner.resultclass.__le__" => "Return self<=value.", + "builtins.TextTestRunner.resultclass.__lt__" => "Return self<value.", + "builtins.TextTestRunner.resultclass.__ne__" => "Return self!=value.", + "builtins.TextTestRunner.resultclass.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.TextTestRunner.resultclass.__reduce__" => "Helper for pickle.", + "builtins.TextTestRunner.resultclass.__reduce_ex__" => "Helper for pickle.", + "builtins.TextTestRunner.resultclass.__setattr__" => "Implement setattr(self, name, value).", + "builtins.TextTestRunner.resultclass.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.TextTestRunner.resultclass.__str__" => "Return str(self).", + "builtins.TextTestRunner.resultclass.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.TextTestRunner.resultclass.__weakref__" => "list of weak references to the object", + "builtins.TextTestRunner.resultclass._exc_info_to_string" => "Converts a sys.exc_info()-style tuple of values into a string.", + "builtins.TextTestRunner.resultclass._remove_unittest_tb_frames" => "Truncates usercode tb at the first unittest frame.\n\nIf the first frame of the traceback is in user code,\nthe prefix up to the first unittest frame is returned.\nIf the first frame is already in the unittest module,\nthe traceback is not modified.", + "builtins.TextTestRunner.resultclass.addDuration" => "Called when a test finished to run, regardless of its outcome.\n*test* is the test case corresponding to the test method.\n*elapsed* is the time represented in seconds, and it includes the\nexecution of cleanup functions.", + "builtins.TextTestRunner.resultclass.startTestRun" => "Called once before any tests are executed.\n\nSee startTest for a method called before each test.", + "builtins.TextTestRunner.resultclass.stop" => "Indicates that the tests should be aborted.", + "builtins.TextTestRunner.resultclass.stopTest" => "Called when the given test has been run", + "builtins.TextTestRunner.resultclass.stopTestRun" => "Called once after all tests are executed.\n\nSee stopTest for a method called after each test.", + "builtins.TextTestRunner.resultclass.wasSuccessful" => "Tells whether or not this result was a success.", + "builtins.TextTestRunner.run" => "Run the given test case or test suite.", + "builtins.TextWrapper" => "Object for wrapping/filling text. The public interface consists of\nthe wrap() and fill() methods; the other methods are just there for\nsubclasses to override in order to tweak the default behaviour.\nIf you want to completely replace the main wrapping algorithm,\nyou'll probably have to override _wrap_chunks().\n\nSeveral instance attributes control various aspects of wrapping:\n width (default: 70)\n the maximum width of wrapped lines (unless break_long_words\n is false)\n initial_indent (default: \"\")\n string that will be prepended to the first line of wrapped\n output. Counts towards the line's width.\n subsequent_indent (default: \"\")\n string that will be prepended to all lines save the first\n of wrapped output; also counts towards each line's width.\n expand_tabs (default: true)\n Expand tabs in input text to spaces before further processing.\n Each tab will become 0 .. 'tabsize' spaces, depending on its position\n in its line. If false, each tab is treated as a single character.\n tabsize (default: 8)\n Expand tabs in input text to 0 .. 'tabsize' spaces, unless\n 'expand_tabs' is false.\n replace_whitespace (default: true)\n Replace all whitespace characters in the input text by spaces\n after tab expansion. Note that if expand_tabs is false and\n replace_whitespace is true, every tab will be converted to a\n single space!\n fix_sentence_endings (default: false)\n Ensure that sentence-ending punctuation is always followed\n by two spaces. Off by default because the algorithm is\n (unavoidably) imperfect.\n break_long_words (default: true)\n Break words longer than 'width'. If false, those words will not\n be broken, and some lines might be longer than 'width'.\n break_on_hyphens (default: true)\n Allow breaking hyphenated words. If true, wrapping will occur\n preferably on whitespaces and right after hyphens part of\n compound words.\n drop_whitespace (default: true)\n Drop leading and trailing whitespace from lines.\n max_lines (default: None)\n Truncate wrapped lines.\n placeholder (default: ' [...]')\n Append to the last line of truncated text.", + "builtins.TextWrapper.__delattr__" => "Implement delattr(self, name).", + "builtins.TextWrapper.__eq__" => "Return self==value.", + "builtins.TextWrapper.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.TextWrapper.__ge__" => "Return self>=value.", + "builtins.TextWrapper.__getattribute__" => "Return getattr(self, name).", + "builtins.TextWrapper.__getstate__" => "Helper for pickle.", + "builtins.TextWrapper.__gt__" => "Return self>value.", + "builtins.TextWrapper.__hash__" => "Return hash(self).", + "builtins.TextWrapper.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.TextWrapper.__le__" => "Return self<=value.", + "builtins.TextWrapper.__lt__" => "Return self<value.", + "builtins.TextWrapper.__ne__" => "Return self!=value.", + "builtins.TextWrapper.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.TextWrapper.__reduce__" => "Helper for pickle.", + "builtins.TextWrapper.__reduce_ex__" => "Helper for pickle.", + "builtins.TextWrapper.__repr__" => "Return repr(self).", + "builtins.TextWrapper.__setattr__" => "Implement setattr(self, name, value).", + "builtins.TextWrapper.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.TextWrapper.__str__" => "Return str(self).", + "builtins.TextWrapper.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.TextWrapper.__weakref__" => "list of weak references to the object", + "builtins.TextWrapper._fix_sentence_endings" => "_fix_sentence_endings(chunks : [string])\n\nCorrect for sentence endings buried in 'chunks'. Eg. when the\noriginal text contains \"... foo.\\nBar ...\", munge_whitespace()\nand split() will convert that to [..., \"foo.\", \" \", \"Bar\", ...]\nwhich has one too few spaces; this method simply changes the one\nspace to two.", + "builtins.TextWrapper._handle_long_word" => "_handle_long_word(chunks : [string],\n cur_line : [string],\n cur_len : int, width : int)\n\nHandle a chunk of text (most likely a word, not whitespace) that\nis too long to fit in any line.", + "builtins.TextWrapper._munge_whitespace" => "_munge_whitespace(text : string) -> string\n\nMunge whitespace in text: expand tabs and convert all other\nwhitespace characters to spaces. Eg. \" foo\\tbar\\n\\nbaz\"\nbecomes \" foo bar baz\".", + "builtins.TextWrapper._split" => "_split(text : string) -> [string]\n\nSplit the text to wrap into indivisible chunks. Chunks are\nnot quite the same as words; see _wrap_chunks() for full\ndetails. As an example, the text\n Look, goof-ball -- use the -b option!\nbreaks into the following chunks:\n 'Look,', ' ', 'goof-', 'ball', ' ', '--', ' ',\n 'use', ' ', 'the', ' ', '-b', ' ', 'option!'\nif break_on_hyphens is True, or in:\n 'Look,', ' ', 'goof-ball', ' ', '--', ' ',\n 'use', ' ', 'the', ' ', '-b', ' ', option!'\notherwise.", + "builtins.TextWrapper._wrap_chunks" => "_wrap_chunks(chunks : [string]) -> [string]\n\nWrap a sequence of text chunks and return a list of lines of\nlength 'self.width' or less. (If 'break_long_words' is false,\nsome lines may be longer than this.) Chunks correspond roughly\nto words and the whitespace between them: each chunk is\nindivisible (modulo 'break_long_words'), but a line break can\ncome between any two chunks. Chunks should not have internal\nwhitespace; ie. a chunk is either all whitespace or a \"word\".\nWhitespace chunks will be removed from the beginning and end of\nlines, but apart from that whitespace is preserved.", + "builtins.TextWrapper.fill" => "fill(text : string) -> string\n\nReformat the single paragraph in 'text' to fit in lines of no\nmore than 'self.width' columns, and return a new string\ncontaining the entire wrapped paragraph.", + "builtins.TextWrapper.wrap" => "wrap(text : string) -> [string]\n\nReformat the single paragraph in 'text' so it fits in lines of\nno more than 'self.width' columns, and return a list of wrapped\nlines. Tabs in 'text' are expanded with string.expandtabs(),\nand all other whitespace characters (including newline) are\nconverted to space.", + "builtins.Theme" => "A suite of themes for all sections of Python.\n\nWhen adding a new one, remember to also modify `copy_with` and `no_colors`\nbelow.", + "builtins.Theme.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Theme.__ge__" => "Return self>=value.", + "builtins.Theme.__getattribute__" => "Return getattr(self, name).", + "builtins.Theme.__getstate__" => "Helper for pickle.", + "builtins.Theme.__gt__" => "Return self>value.", + "builtins.Theme.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Theme.__le__" => "Return self<=value.", + "builtins.Theme.__lt__" => "Return self<value.", + "builtins.Theme.__ne__" => "Return self!=value.", + "builtins.Theme.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Theme.__reduce__" => "Helper for pickle.", + "builtins.Theme.__reduce_ex__" => "Helper for pickle.", + "builtins.Theme.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Theme.__str__" => "Return str(self).", + "builtins.Theme.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Theme.__weakref__" => "list of weak references to the object", + "builtins.Theme.copy_with" => "Return a new Theme based on this instance with some sections replaced.\n\nThemes are immutable to protect against accidental modifications that\ncould lead to invalid terminal states.", + "builtins.Theme.no_colors" => "Return a new Theme where colors in all sections are empty strings.\n\nThis allows writing user code as if colors are always used. The color\nfields will be ANSI color code strings when colorization is desired\nand possible, and empty strings otherwise.", + "builtins.Thread" => "A class that represents a thread of control.\n\nThis class can be safely subclassed in a limited fashion. There are two ways\nto specify the activity: by passing a callable object to the constructor, or\nby overriding the run() method in a subclass.", + "builtins.Thread.__delattr__" => "Implement delattr(self, name).", + "builtins.Thread.__eq__" => "Return self==value.", + "builtins.Thread.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Thread.__ge__" => "Return self>=value.", + "builtins.Thread.__getattribute__" => "Return getattr(self, name).", + "builtins.Thread.__getstate__" => "Helper for pickle.", + "builtins.Thread.__gt__" => "Return self>value.", + "builtins.Thread.__hash__" => "Return hash(self).", + "builtins.Thread.__init__" => "This constructor should always be called with keyword arguments. Arguments are:\n\n*group* should be None; reserved for future extension when a ThreadGroup\nclass is implemented.\n\n*target* is the callable object to be invoked by the run()\nmethod. Defaults to None, meaning nothing is called.\n\n*name* is the thread name. By default, a unique name is constructed of\nthe form \"Thread-N\" where N is a small decimal number.\n\n*args* is a list or tuple of arguments for the target invocation. Defaults to ().\n\n*kwargs* is a dictionary of keyword arguments for the target\ninvocation. Defaults to {}.\n\n*context* is the contextvars.Context value to use for the thread.\nThe default value is None, which means to check\nsys.flags.thread_inherit_context. If that flag is true, use a copy\nof the context of the caller. If false, use an empty context. To\nexplicitly start with an empty context, pass a new instance of\ncontextvars.Context(). To explicitly start with a copy of the current\ncontext, pass the value from contextvars.copy_context().\n\nIf a subclass overrides the constructor, it must make sure to invoke\nthe base class constructor (Thread.__init__()) before doing anything\nelse to the thread.", + "builtins.Thread.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Thread.__le__" => "Return self<=value.", + "builtins.Thread.__lt__" => "Return self<value.", + "builtins.Thread.__ne__" => "Return self!=value.", + "builtins.Thread.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Thread.__reduce__" => "Helper for pickle.", + "builtins.Thread.__reduce_ex__" => "Helper for pickle.", + "builtins.Thread.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Thread.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Thread.__str__" => "Return str(self).", + "builtins.Thread.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Thread.__weakref__" => "list of weak references to the object", + "builtins.Thread._delete" => "Remove current thread from the dict of currently running threads.", + "builtins.Thread.daemon" => "A boolean value indicating whether this thread is a daemon thread.\n\nThis must be set before start() is called, otherwise RuntimeError is\nraised. Its initial value is inherited from the creating thread; the\nmain thread is not a daemon thread and therefore all threads created in\nthe main thread default to daemon = False.\n\nThe entire Python program exits when only daemon threads are left.", + "builtins.Thread.getName" => "Return a string used for identification purposes only.\n\nThis method is deprecated, use the name attribute instead.", + "builtins.Thread.ident" => "Thread identifier of this thread or None if it has not been started.\n\nThis is a nonzero integer. See the get_ident() function. Thread\nidentifiers may be recycled when a thread exits and another thread is\ncreated. The identifier is available even after the thread has exited.", + "builtins.Thread.isDaemon" => "Return whether this thread is a daemon.\n\nThis method is deprecated, use the daemon attribute instead.", + "builtins.Thread.is_alive" => "Return whether the thread is alive.\n\nThis method returns True just before the run() method starts until just\nafter the run() method terminates. See also the module function\nenumerate().", + "builtins.Thread.join" => "Wait until the thread terminates.\n\nThis blocks the calling thread until the thread whose join() method is\ncalled terminates -- either normally or through an unhandled exception\nor until the optional timeout occurs.\n\nWhen the timeout argument is present and not None, it should be a\nfloating-point number specifying a timeout for the operation in seconds\n(or fractions thereof). As join() always returns None, you must call\nis_alive() after join() to decide whether a timeout happened -- if the\nthread is still alive, the join() call timed out.\n\nWhen the timeout argument is not present or None, the operation will\nblock until the thread terminates.\n\nA thread can be join()ed many times.\n\njoin() raises a RuntimeError if an attempt is made to join the current\nthread as that would cause a deadlock. It is also an error to join() a\nthread before it has been started and attempts to do so raises the same\nexception.", + "builtins.Thread.name" => "A string used for identification purposes only.\n\nIt has no semantics. Multiple threads may be given the same name. The\ninitial name is set by the constructor.", + "builtins.Thread.native_id" => "Native integral thread ID of this thread, or None if it has not been started.\n\nThis is a non-negative integer. See the get_native_id() function.\nThis represents the Thread ID as reported by the kernel.", + "builtins.Thread.run" => "Method representing the thread's activity.\n\nYou may override this method in a subclass. The standard run() method\ninvokes the callable object passed to the object's constructor as the\ntarget argument, if any, with sequential and keyword arguments taken\nfrom the args and kwargs arguments, respectively.", + "builtins.Thread.setDaemon" => "Set whether this thread is a daemon.\n\nThis method is deprecated, use the .daemon property instead.", + "builtins.Thread.setName" => "Set the name string for this thread.\n\nThis method is deprecated, use the name attribute instead.", + "builtins.Thread.start" => "Start the thread's activity.\n\nIt must be called at most once per thread object. It arranges for the\nobject's run() method to be invoked in a separate thread of control.\n\nThis method will raise a RuntimeError if called more than once on the\nsame thread object.", + "builtins.ThreadingMixIn" => "Mix-in class to handle each request in a new thread.", + "builtins.ThreadingMixIn.__delattr__" => "Implement delattr(self, name).", + "builtins.ThreadingMixIn.__eq__" => "Return self==value.", + "builtins.ThreadingMixIn.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.ThreadingMixIn.__ge__" => "Return self>=value.", + "builtins.ThreadingMixIn.__getattribute__" => "Return getattr(self, name).", + "builtins.ThreadingMixIn.__getstate__" => "Helper for pickle.", + "builtins.ThreadingMixIn.__gt__" => "Return self>value.", + "builtins.ThreadingMixIn.__hash__" => "Return hash(self).", + "builtins.ThreadingMixIn.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.ThreadingMixIn.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.ThreadingMixIn.__le__" => "Return self<=value.", + "builtins.ThreadingMixIn.__lt__" => "Return self<value.", + "builtins.ThreadingMixIn.__ne__" => "Return self!=value.", + "builtins.ThreadingMixIn.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.ThreadingMixIn.__reduce__" => "Helper for pickle.", + "builtins.ThreadingMixIn.__reduce_ex__" => "Helper for pickle.", + "builtins.ThreadingMixIn.__repr__" => "Return repr(self).", + "builtins.ThreadingMixIn.__setattr__" => "Implement setattr(self, name, value).", + "builtins.ThreadingMixIn.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.ThreadingMixIn.__str__" => "Return str(self).", + "builtins.ThreadingMixIn.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.ThreadingMixIn.__weakref__" => "list of weak references to the object", + "builtins.ThreadingMixIn.process_request" => "Start a new thread to process the request.", + "builtins.ThreadingMixIn.process_request_thread" => "Same as in BaseServer but as a thread.\n\nIn addition, exception handling is done here.", + "builtins.Timeout" => "Asynchronous context manager for cancelling overdue coroutines.\n\nUse `timeout()` or `timeout_at()` rather than instantiating this class\ndirectly.", + "builtins.Timeout.__delattr__" => "Implement delattr(self, name).", + "builtins.Timeout.__eq__" => "Return self==value.", + "builtins.Timeout.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Timeout.__ge__" => "Return self>=value.", + "builtins.Timeout.__getattribute__" => "Return getattr(self, name).", + "builtins.Timeout.__getstate__" => "Helper for pickle.", + "builtins.Timeout.__gt__" => "Return self>value.", + "builtins.Timeout.__hash__" => "Return hash(self).", + "builtins.Timeout.__init__" => "Schedule a timeout that will trigger at a given loop time.\n\n- If `when` is `None`, the timeout will never trigger.\n- If `when < loop.time()`, the timeout will trigger on the next\n iteration of the event loop.", + "builtins.Timeout.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Timeout.__le__" => "Return self<=value.", + "builtins.Timeout.__lt__" => "Return self<value.", + "builtins.Timeout.__ne__" => "Return self!=value.", + "builtins.Timeout.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Timeout.__reduce__" => "Helper for pickle.", + "builtins.Timeout.__reduce_ex__" => "Helper for pickle.", + "builtins.Timeout.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Timeout.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Timeout.__str__" => "Return str(self).", + "builtins.Timeout.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Timeout.__weakref__" => "list of weak references to the object", + "builtins.Timeout.expired" => "Is timeout expired during execution?", + "builtins.Timeout.reschedule" => "Reschedule the timeout.", + "builtins.Timeout.when" => "Return the current deadline.", "builtins.TimeoutError" => "Timeout expired.", "builtins.TimeoutError.__delattr__" => "Implement delattr(self, name).", "builtins.TimeoutError.__eq__" => "Return self==value.", @@ -11247,6 +19795,348 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.TimeoutError.strerror" => "exception strerror", "builtins.TimeoutError.winerror" => "Win32 exception code", "builtins.TimeoutError.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.Timer" => "Class for timing execution speed of small code snippets.\n\nThe constructor takes a statement to be timed, an additional\nstatement used for setup, and a timer function. Both statements\ndefault to 'pass'; the timer function is platform-dependent (see\nmodule doc string). If 'globals' is specified, the code will be\nexecuted within that namespace (as opposed to inside timeit's\nnamespace).\n\nTo measure the execution time of the first statement, use the\ntimeit() method. The repeat() method is a convenience to call\ntimeit() multiple times and return a list of results.\n\nThe statements may contain newlines, as long as they don't contain\nmulti-line string literals.", + "builtins.Timer.__delattr__" => "Implement delattr(self, name).", + "builtins.Timer.__eq__" => "Return self==value.", + "builtins.Timer.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Timer.__ge__" => "Return self>=value.", + "builtins.Timer.__getattribute__" => "Return getattr(self, name).", + "builtins.Timer.__getstate__" => "Helper for pickle.", + "builtins.Timer.__gt__" => "Return self>value.", + "builtins.Timer.__hash__" => "Return hash(self).", + "builtins.Timer.__init__" => "Constructor. See class doc string.", + "builtins.Timer.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Timer.__le__" => "Return self<=value.", + "builtins.Timer.__lt__" => "Return self<value.", + "builtins.Timer.__ne__" => "Return self!=value.", + "builtins.Timer.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Timer.__reduce__" => "Helper for pickle.", + "builtins.Timer.__reduce_ex__" => "Helper for pickle.", + "builtins.Timer.__repr__" => "Return repr(self).", + "builtins.Timer.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Timer.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Timer.__str__" => "Return str(self).", + "builtins.Timer.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Timer.__weakref__" => "list of weak references to the object", + "builtins.Timer.autorange" => "Return the number of loops and time taken so that total time >= 0.2.\n\nCalls the timeit method with increasing numbers from the sequence\n1, 2, 5, 10, 20, 50, ... until the time taken is at least 0.2\nsecond. Returns (number, time_taken).\n\nIf *callback* is given and is not None, it will be called after\neach trial with two arguments: ``callback(number, time_taken)``.", + "builtins.Timer.print_exc" => "Helper to print a traceback from the timed code.\n\nTypical use:\n\n t = Timer(...) # outside the try/except\n try:\n t.timeit(...) # or t.repeat(...)\n except:\n t.print_exc()\n\nThe advantage over the standard traceback is that source lines\nin the compiled template will be displayed.\n\nThe optional file argument directs where the traceback is\nsent; it defaults to sys.stderr.", + "builtins.Timer.repeat" => "Call timeit() a few times.\n\nThis is a convenience function that calls the timeit()\nrepeatedly, returning a list of results. The first argument\nspecifies how many times to call timeit(), defaulting to 5;\nthe second argument specifies the timer argument, defaulting\nto one million.\n\nNote: it's tempting to calculate mean and standard deviation\nfrom the result vector and report these. However, this is not\nvery useful. In a typical case, the lowest value gives a\nlower bound for how fast your machine can run the given code\nsnippet; higher values in the result vector are typically not\ncaused by variability in Python's speed, but by other\nprocesses interfering with your timing accuracy. So the min()\nof the result is probably the only number you should be\ninterested in. After that, you should look at the entire\nvector and apply common sense rather than statistics.", + "builtins.Timer.timeit" => "Time 'number' executions of the main statement.\n\nTo be precise, this executes the setup statement once, and\nthen returns the time it takes to execute the main statement\na number of times, as float seconds if using the default timer. The\nargument is the number of times through the loop, defaulting\nto one million. The main statement, the setup statement and\nthe timer function to be used are passed to the constructor.", + "builtins.Token.__class_getitem__" => "Tokens are generic over the same type as the ContextVar which created them.", + "builtins.Token.__delattr__" => "Implement delattr(self, name).", + "builtins.Token.__enter__" => "Enter into Token context manager.", + "builtins.Token.__eq__" => "Return self==value.", + "builtins.Token.__exit__" => "Exit from Token context manager, restore the linked ContextVar.", + "builtins.Token.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Token.__ge__" => "Return self>=value.", + "builtins.Token.__getattribute__" => "Return getattr(self, name).", + "builtins.Token.__getstate__" => "Helper for pickle.", + "builtins.Token.__gt__" => "Return self>value.", + "builtins.Token.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Token.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Token.__le__" => "Return self<=value.", + "builtins.Token.__lt__" => "Return self<value.", + "builtins.Token.__ne__" => "Return self!=value.", + "builtins.Token.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Token.__reduce__" => "Helper for pickle.", + "builtins.Token.__reduce_ex__" => "Helper for pickle.", + "builtins.Token.__repr__" => "Return repr(self).", + "builtins.Token.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Token.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Token.__str__" => "Return str(self).", + "builtins.Token.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Tokenizer.__delattr__" => "Implement delattr(self, name).", + "builtins.Tokenizer.__eq__" => "Return self==value.", + "builtins.Tokenizer.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Tokenizer.__ge__" => "Return self>=value.", + "builtins.Tokenizer.__getattribute__" => "Return getattr(self, name).", + "builtins.Tokenizer.__getstate__" => "Helper for pickle.", + "builtins.Tokenizer.__gt__" => "Return self>value.", + "builtins.Tokenizer.__hash__" => "Return hash(self).", + "builtins.Tokenizer.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Tokenizer.__le__" => "Return self<=value.", + "builtins.Tokenizer.__lt__" => "Return self<value.", + "builtins.Tokenizer.__ne__" => "Return self!=value.", + "builtins.Tokenizer.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Tokenizer.__reduce__" => "Helper for pickle.", + "builtins.Tokenizer.__reduce_ex__" => "Helper for pickle.", + "builtins.Tokenizer.__repr__" => "Return repr(self).", + "builtins.Tokenizer.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Tokenizer.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Tokenizer.__str__" => "Return str(self).", + "builtins.Tokenizer.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Tokenizer.__weakref__" => "list of weak references to the object", + "builtins.TokenizerIter.__delattr__" => "Implement delattr(self, name).", + "builtins.TokenizerIter.__eq__" => "Return self==value.", + "builtins.TokenizerIter.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.TokenizerIter.__ge__" => "Return self>=value.", + "builtins.TokenizerIter.__getattribute__" => "Return getattr(self, name).", + "builtins.TokenizerIter.__getstate__" => "Helper for pickle.", + "builtins.TokenizerIter.__gt__" => "Return self>value.", + "builtins.TokenizerIter.__hash__" => "Return hash(self).", + "builtins.TokenizerIter.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.TokenizerIter.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.TokenizerIter.__iter__" => "Implement iter(self).", + "builtins.TokenizerIter.__le__" => "Return self<=value.", + "builtins.TokenizerIter.__lt__" => "Return self<value.", + "builtins.TokenizerIter.__ne__" => "Return self!=value.", + "builtins.TokenizerIter.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.TokenizerIter.__next__" => "Implement next(self).", + "builtins.TokenizerIter.__reduce__" => "Helper for pickle.", + "builtins.TokenizerIter.__reduce_ex__" => "Helper for pickle.", + "builtins.TokenizerIter.__repr__" => "Return repr(self).", + "builtins.TokenizerIter.__setattr__" => "Implement setattr(self, name, value).", + "builtins.TokenizerIter.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.TokenizerIter.__str__" => "Return str(self).", + "builtins.TokenizerIter.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.TopologicalSorter" => "Provides functionality to topologically sort a graph of hashable nodes", + "builtins.TopologicalSorter.__class_getitem__" => "Represent a PEP 585 generic type\n\nE.g. for t = list[int], t.__origin__ is list and t.__args__ is (int,).", + "builtins.TopologicalSorter.__delattr__" => "Implement delattr(self, name).", + "builtins.TopologicalSorter.__eq__" => "Return self==value.", + "builtins.TopologicalSorter.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.TopologicalSorter.__ge__" => "Return self>=value.", + "builtins.TopologicalSorter.__getattribute__" => "Return getattr(self, name).", + "builtins.TopologicalSorter.__getstate__" => "Helper for pickle.", + "builtins.TopologicalSorter.__gt__" => "Return self>value.", + "builtins.TopologicalSorter.__hash__" => "Return hash(self).", + "builtins.TopologicalSorter.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.TopologicalSorter.__le__" => "Return self<=value.", + "builtins.TopologicalSorter.__lt__" => "Return self<value.", + "builtins.TopologicalSorter.__ne__" => "Return self!=value.", + "builtins.TopologicalSorter.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.TopologicalSorter.__reduce__" => "Helper for pickle.", + "builtins.TopologicalSorter.__reduce_ex__" => "Helper for pickle.", + "builtins.TopologicalSorter.__repr__" => "Return repr(self).", + "builtins.TopologicalSorter.__setattr__" => "Implement setattr(self, name, value).", + "builtins.TopologicalSorter.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.TopologicalSorter.__str__" => "Return str(self).", + "builtins.TopologicalSorter.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.TopologicalSorter.__weakref__" => "list of weak references to the object", + "builtins.TopologicalSorter.add" => "Add a new node and its predecessors to the graph.\n\nBoth the *node* and all elements in *predecessors* must be hashable.\n\nIf called multiple times with the same node argument, the set of dependencies\nwill be the union of all dependencies passed in.\n\nIt is possible to add a node with no dependencies (*predecessors* is not provided)\nas well as provide a dependency twice. If a node that has not been provided before\nis included among *predecessors* it will be automatically added to the graph with\nno predecessors of its own.\n\nRaises ValueError if called after \"prepare\".", + "builtins.TopologicalSorter.done" => "Marks a set of nodes returned by \"get_ready\" as processed.\n\nThis method unblocks any successor of each node in *nodes* for being returned\nin the future by a call to \"get_ready\".\n\nRaises ValueError if any node in *nodes* has already been marked as\nprocessed by a previous call to this method, if a node was not added to the\ngraph by using \"add\" or if called without calling \"prepare\" previously or if\nnode has not yet been returned by \"get_ready\".", + "builtins.TopologicalSorter.get_ready" => "Return a tuple of all the nodes that are ready.\n\nInitially it returns all nodes with no predecessors; once those are marked\nas processed by calling \"done\", further calls will return all new nodes that\nhave all their predecessors already processed. Once no more progress can be made,\nempty tuples are returned.\n\nRaises ValueError if called without calling \"prepare\" previously.", + "builtins.TopologicalSorter.is_active" => "Return ``True`` if more progress can be made and ``False`` otherwise.\n\nProgress can be made if cycles do not block the resolution and either there\nare still nodes ready that haven't yet been returned by \"get_ready\" or the\nnumber of nodes marked \"done\" is less than the number that have been returned\nby \"get_ready\".\n\nRaises ValueError if called without calling \"prepare\" previously.", + "builtins.TopologicalSorter.prepare" => "Mark the graph as finished and check for cycles in the graph.\n\nIf any cycle is detected, \"CycleError\" will be raised, but \"get_ready\" can\nstill be used to obtain as many nodes as possible until cycles block more\nprogress. After a call to this function, the graph cannot be modified and\ntherefore no more nodes can be added using \"add\".\n\nRaise ValueError if nodes have already been passed out of the sorter.", + "builtins.TopologicalSorter.static_order" => "Returns an iterable of nodes in a topological order.\n\nThe particular order that is returned may depend on the specific\norder in which the items were inserted in the graph.\n\nUsing this method does not require to call \"prepare\" or \"done\". If any\ncycle is detected, :exc:`CycleError` will be raised.", + "builtins.Trace" => "Trace of a memory block.", + "builtins.Trace.__delattr__" => "Implement delattr(self, name).", + "builtins.Trace.__eq__" => "Return self==value.", + "builtins.Trace.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Trace.__ge__" => "Return self>=value.", + "builtins.Trace.__getattribute__" => "Return getattr(self, name).", + "builtins.Trace.__getstate__" => "Helper for pickle.", + "builtins.Trace.__gt__" => "Return self>value.", + "builtins.Trace.__hash__" => "Return hash(self).", + "builtins.Trace.__init__" => "@param count true iff it should count number of times each\n line is executed\n@param trace true iff it should print out each line that is\n being counted\n@param countfuncs true iff it should just output a list of\n (filename, modulename, funcname,) for functions\n that were called at least once; This overrides\n 'count' and 'trace'\n@param ignoremods a list of the names of modules to ignore\n@param ignoredirs a list of the names of directories to ignore\n all of the (recursive) contents of\n@param infile file from which to read stored counts to be\n added into the results\n@param outfile file in which to write the results\n@param timing true iff timing information be displayed", + "builtins.Trace.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Trace.__le__" => "Return self<=value.", + "builtins.Trace.__lt__" => "Return self<value.", + "builtins.Trace.__ne__" => "Return self!=value.", + "builtins.Trace.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Trace.__reduce__" => "Helper for pickle.", + "builtins.Trace.__reduce_ex__" => "Helper for pickle.", + "builtins.Trace.__repr__" => "Return repr(self).", + "builtins.Trace.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Trace.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Trace.__str__" => "Return str(self).", + "builtins.Trace.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Trace.__weakref__" => "list of weak references to the object", + "builtins.Trace.globaltrace_countfuncs" => "Handler for call events.\n\nAdds (filename, modulename, funcname) to the self._calledfuncs dict.", + "builtins.Trace.globaltrace_lt" => "Handler for call events.\n\nIf the code block being entered is to be ignored, returns 'None',\nelse returns self.localtrace.", + "builtins.Trace.globaltrace_trackcallers" => "Handler for call events.\n\nAdds information about who called who to the self._callers dict.", + "builtins.TracebackException" => "An exception ready for rendering.\n\nThe traceback module captures enough attributes from the original exception\nto this intermediary form to ensure that no references are held, while\nstill being able to fully print or format it.\n\nmax_group_width and max_group_depth control the formatting of exception\ngroups. The depth refers to the nesting level of the group, and the width\nrefers to the size of a single exception group's exceptions array. The\nformatted output is truncated when either limit is exceeded.\n\nUse `from_exception` to create TracebackException instances from exception\nobjects, or the constructor to create TracebackException instances from\nindividual components.\n\n- :attr:`__cause__` A TracebackException of the original *__cause__*.\n- :attr:`__context__` A TracebackException of the original *__context__*.\n- :attr:`exceptions` For exception groups - a list of TracebackException\n instances for the nested *exceptions*. ``None`` for other exceptions.\n- :attr:`__suppress_context__` The *__suppress_context__* value from the\n original exception.\n- :attr:`stack` A `StackSummary` representing the traceback.\n- :attr:`exc_type` (deprecated) The class of the original traceback.\n- :attr:`exc_type_str` String display of exc_type\n- :attr:`filename` For syntax errors - the filename where the error\n occurred.\n- :attr:`lineno` For syntax errors - the linenumber where the error\n occurred.\n- :attr:`end_lineno` For syntax errors - the end linenumber where the error\n occurred. Can be `None` if not present.\n- :attr:`text` For syntax errors - the text where the error\n occurred.\n- :attr:`offset` For syntax errors - the offset into the text where the\n error occurred.\n- :attr:`end_offset` For syntax errors - the end offset into the text where\n the error occurred. Can be `None` if not present.\n- :attr:`msg` For syntax errors - the compiler error message.", + "builtins.TracebackException.__delattr__" => "Implement delattr(self, name).", + "builtins.TracebackException.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.TracebackException.__ge__" => "Return self>=value.", + "builtins.TracebackException.__getattribute__" => "Return getattr(self, name).", + "builtins.TracebackException.__getstate__" => "Helper for pickle.", + "builtins.TracebackException.__gt__" => "Return self>value.", + "builtins.TracebackException.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.TracebackException.__le__" => "Return self<=value.", + "builtins.TracebackException.__lt__" => "Return self<value.", + "builtins.TracebackException.__ne__" => "Return self!=value.", + "builtins.TracebackException.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.TracebackException.__reduce__" => "Helper for pickle.", + "builtins.TracebackException.__reduce_ex__" => "Helper for pickle.", + "builtins.TracebackException.__repr__" => "Return repr(self).", + "builtins.TracebackException.__setattr__" => "Implement setattr(self, name, value).", + "builtins.TracebackException.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.TracebackException.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.TracebackException.__weakref__" => "list of weak references to the object", + "builtins.TracebackException._format_syntax_error" => "Format SyntaxError exceptions (internal helper).", + "builtins.TracebackException._load_lines" => "Private API. force all lines in the stack to be loaded.", + "builtins.TracebackException.format" => "Format the exception.\n\nIf chain is not *True*, *__cause__* and *__context__* will not be formatted.\n\nThe return value is a generator of strings, each ending in a newline and\nsome containing internal newlines. `print_exception` is a wrapper around\nthis method which just prints the lines to a file.\n\nThe message indicating which exception occurred is always the last\nstring in the output.", + "builtins.TracebackException.format_exception_only" => "Format the exception part of the traceback.\n\nThe return value is a generator of strings, each ending in a newline.\n\nGenerator yields the exception message.\nFor :exc:`SyntaxError` exceptions, it\nalso yields (before the exception message)\nseveral lines that (when printed)\ndisplay detailed information about where the syntax error occurred.\nFollowing the message, generator also yields\nall the exception's ``__notes__``.\n\nWhen *show_group* is ``True``, and the exception is an instance of\n:exc:`BaseExceptionGroup`, the nested exceptions are included as\nwell, recursively, with indentation relative to their nesting depth.", + "builtins.TracebackException.from_exception" => "Create a TracebackException from an exception.", + "builtins.TracebackException.print" => "Print the result of self.format(chain=chain) to 'file'.", + "builtins.Translator" => ">>> Translator('xyz')\nTraceback (most recent call last):\n...\nAssertionError: Invalid separators\n\n>>> Translator('')\nTraceback (most recent call last):\n...\nAssertionError: Invalid separators", + "builtins.Translator.__delattr__" => "Implement delattr(self, name).", + "builtins.Translator.__eq__" => "Return self==value.", + "builtins.Translator.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Translator.__ge__" => "Return self>=value.", + "builtins.Translator.__getattribute__" => "Return getattr(self, name).", + "builtins.Translator.__getstate__" => "Helper for pickle.", + "builtins.Translator.__gt__" => "Return self>value.", + "builtins.Translator.__hash__" => "Return hash(self).", + "builtins.Translator.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Translator.__le__" => "Return self<=value.", + "builtins.Translator.__lt__" => "Return self<value.", + "builtins.Translator.__ne__" => "Return self!=value.", + "builtins.Translator.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Translator.__reduce__" => "Helper for pickle.", + "builtins.Translator.__reduce_ex__" => "Helper for pickle.", + "builtins.Translator.__repr__" => "Return repr(self).", + "builtins.Translator.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Translator.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Translator.__str__" => "Return str(self).", + "builtins.Translator.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Translator.__weakref__" => "list of weak references to the object", + "builtins.Translator.extend" => "Extend regex for pattern-wide concerns.\n\nApply '(?s:)' to create a non-matching group that\nmatches newlines (valid on Unix).\n\nAppend '\\z' to imply fullmatch even when match is used.", + "builtins.Translator.match_dirs" => "Ensure that zipfile.Path directory names are matched.\n\nzipfile.Path directory names always end in a slash.", + "builtins.Translator.replace" => "Perform the replacements for a match from :func:`separate`.", + "builtins.Translator.restrict_rglob" => "Raise ValueError if ** appears in anything but a full path segment.\n\n>>> Translator().translate('**foo')\nTraceback (most recent call last):\n...\nValueError: ** must appear alone in a path segment", + "builtins.Translator.star_not_empty" => "Ensure that * will not match an empty segment.", + "builtins.Translator.translate" => "Given a glob pattern, produce a regex that matches it.", + "builtins.Translator.translate_core" => "Given a glob pattern, produce a regex that matches it.\n\n>>> t = Translator()\n>>> t.translate_core('*.txt').replace('\\\\\\\\', '')\n'[^/]*\\\\.txt'\n>>> t.translate_core('a?txt')\n'a[^/]txt'\n>>> t.translate_core('**/*').replace('\\\\\\\\', '')\n'.*/[^/][^/]*'", + "builtins.TransportSocket" => "A socket-like wrapper for exposing real transport sockets.\n\nThese objects can be safely returned by APIs like\n`transport.get_extra_info('socket')`. All potentially disruptive\noperations (like \"socket.close()\") are banned.", + "builtins.TransportSocket.__delattr__" => "Implement delattr(self, name).", + "builtins.TransportSocket.__eq__" => "Return self==value.", + "builtins.TransportSocket.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.TransportSocket.__ge__" => "Return self>=value.", + "builtins.TransportSocket.__getattribute__" => "Return getattr(self, name).", + "builtins.TransportSocket.__gt__" => "Return self>value.", + "builtins.TransportSocket.__hash__" => "Return hash(self).", + "builtins.TransportSocket.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.TransportSocket.__le__" => "Return self<=value.", + "builtins.TransportSocket.__lt__" => "Return self<value.", + "builtins.TransportSocket.__ne__" => "Return self!=value.", + "builtins.TransportSocket.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.TransportSocket.__reduce__" => "Helper for pickle.", + "builtins.TransportSocket.__reduce_ex__" => "Helper for pickle.", + "builtins.TransportSocket.__setattr__" => "Implement setattr(self, name, value).", + "builtins.TransportSocket.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.TransportSocket.__str__" => "Return str(self).", + "builtins.TransportSocket.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.TreeBuilder.__delattr__" => "Implement delattr(self, name).", + "builtins.TreeBuilder.__eq__" => "Return self==value.", + "builtins.TreeBuilder.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.TreeBuilder.__ge__" => "Return self>=value.", + "builtins.TreeBuilder.__getattribute__" => "Return getattr(self, name).", + "builtins.TreeBuilder.__getstate__" => "Helper for pickle.", + "builtins.TreeBuilder.__gt__" => "Return self>value.", + "builtins.TreeBuilder.__hash__" => "Return hash(self).", + "builtins.TreeBuilder.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.TreeBuilder.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.TreeBuilder.__le__" => "Return self<=value.", + "builtins.TreeBuilder.__lt__" => "Return self<value.", + "builtins.TreeBuilder.__ne__" => "Return self!=value.", + "builtins.TreeBuilder.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.TreeBuilder.__reduce__" => "Helper for pickle.", + "builtins.TreeBuilder.__reduce_ex__" => "Helper for pickle.", + "builtins.TreeBuilder.__repr__" => "Return repr(self).", + "builtins.TreeBuilder.__setattr__" => "Implement setattr(self, name, value).", + "builtins.TreeBuilder.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.TreeBuilder.__str__" => "Return str(self).", + "builtins.TreeBuilder.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.TupleComp" => "This class provides a generic function for comparing any two tuples.\nEach instance records a list of tuple-indices (from most significant\nto least significant), and sort direction (ascending or descending) for\neach tuple-index. The compare functions can then be used as the function\nargument to the system sort() function when a list of tuples need to be\nsorted in the instances order.", + "builtins.TupleComp.__delattr__" => "Implement delattr(self, name).", + "builtins.TupleComp.__eq__" => "Return self==value.", + "builtins.TupleComp.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.TupleComp.__ge__" => "Return self>=value.", + "builtins.TupleComp.__getattribute__" => "Return getattr(self, name).", + "builtins.TupleComp.__getstate__" => "Helper for pickle.", + "builtins.TupleComp.__gt__" => "Return self>value.", + "builtins.TupleComp.__hash__" => "Return hash(self).", + "builtins.TupleComp.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.TupleComp.__le__" => "Return self<=value.", + "builtins.TupleComp.__lt__" => "Return self<value.", + "builtins.TupleComp.__ne__" => "Return self!=value.", + "builtins.TupleComp.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.TupleComp.__reduce__" => "Helper for pickle.", + "builtins.TupleComp.__reduce_ex__" => "Helper for pickle.", + "builtins.TupleComp.__repr__" => "Return repr(self).", + "builtins.TupleComp.__setattr__" => "Implement setattr(self, name, value).", + "builtins.TupleComp.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.TupleComp.__str__" => "Return str(self).", + "builtins.TupleComp.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.TupleComp.__weakref__" => "list of weak references to the object", + "builtins.TurtleScreenBase" => "Provide the basic graphics functionality.\nInterface between Tkinter and turtle.py.\n\nTo port turtle.py to some different graphics toolkit\na corresponding TurtleScreenBase class has to be implemented.", + "builtins.TurtleScreenBase.__delattr__" => "Implement delattr(self, name).", + "builtins.TurtleScreenBase.__eq__" => "Return self==value.", + "builtins.TurtleScreenBase.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.TurtleScreenBase.__ge__" => "Return self>=value.", + "builtins.TurtleScreenBase.__getattribute__" => "Return getattr(self, name).", + "builtins.TurtleScreenBase.__getstate__" => "Helper for pickle.", + "builtins.TurtleScreenBase.__gt__" => "Return self>value.", + "builtins.TurtleScreenBase.__hash__" => "Return hash(self).", + "builtins.TurtleScreenBase.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.TurtleScreenBase.__le__" => "Return self<=value.", + "builtins.TurtleScreenBase.__lt__" => "Return self<value.", + "builtins.TurtleScreenBase.__ne__" => "Return self!=value.", + "builtins.TurtleScreenBase.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.TurtleScreenBase.__reduce__" => "Helper for pickle.", + "builtins.TurtleScreenBase.__reduce_ex__" => "Helper for pickle.", + "builtins.TurtleScreenBase.__repr__" => "Return repr(self).", + "builtins.TurtleScreenBase.__setattr__" => "Implement setattr(self, name, value).", + "builtins.TurtleScreenBase.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.TurtleScreenBase.__str__" => "Return str(self).", + "builtins.TurtleScreenBase.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.TurtleScreenBase.__weakref__" => "list of weak references to the object", + "builtins.TurtleScreenBase._bgcolor" => "Set canvas' backgroundcolor if color is not None,\nelse return backgroundcolor.", + "builtins.TurtleScreenBase._blankimage" => "return a blank image object", + "builtins.TurtleScreenBase._createimage" => "Create and return image item on canvas.", + "builtins.TurtleScreenBase._createline" => "Create an invisible line item on canvas self.cv)", + "builtins.TurtleScreenBase._createpoly" => "Create an invisible polygon item on canvas self.cv)", + "builtins.TurtleScreenBase._delay" => "Delay subsequent canvas actions for delay ms.", + "builtins.TurtleScreenBase._delete" => "Delete graphics item from canvas.\nIf item is\"all\" delete all graphics items.", + "builtins.TurtleScreenBase._drawimage" => "Configure image item as to draw image object\nat position (x,y) on canvas)", + "builtins.TurtleScreenBase._drawline" => "Configure lineitem according to provided arguments:\ncoordlist is sequence of coordinates\nfill is drawing color\nwidth is width of drawn line.\ntop is a boolean value, which specifies if polyitem\nwill be put on top of the canvas' displaylist so it\nwill not be covered by other items.", + "builtins.TurtleScreenBase._drawpoly" => "Configure polygonitem polyitem according to provided\narguments:\ncoordlist is sequence of coordinates\nfill is filling color\noutline is outline color\ntop is a boolean value, which specifies if polyitem\nwill be put on top of the canvas' displaylist so it\nwill not be covered by other items.", + "builtins.TurtleScreenBase._image" => "return an image object containing the\nimagedata from an image file named filename.", + "builtins.TurtleScreenBase._iscolorstring" => "Check if the string color is a legal Tkinter color string.", + "builtins.TurtleScreenBase._listen" => "Set focus on canvas (in order to collect key-events)", + "builtins.TurtleScreenBase._onclick" => "Bind fun to mouse-click event on turtle.\nfun must be a function with two arguments, the coordinates\nof the clicked point on the canvas.\nnum, the number of the mouse-button defaults to 1", + "builtins.TurtleScreenBase._ondrag" => "Bind fun to mouse-move-event (with pressed mouse button) on turtle.\nfun must be a function with two arguments, the coordinates of the\nactual mouse position on the canvas.\nnum, the number of the mouse-button defaults to 1\n\nEvery sequence of mouse-move-events on a turtle is preceded by a\nmouse-click event on that turtle.", + "builtins.TurtleScreenBase._onkeypress" => "If key is given, bind fun to key-press event of key.\nOtherwise bind fun to any key-press.\nCanvas must have focus. See method listen.", + "builtins.TurtleScreenBase._onkeyrelease" => "Bind fun to key-release event of key.\nCanvas must have focus. See method listen", + "builtins.TurtleScreenBase._onrelease" => "Bind fun to mouse-button-release event on turtle.\nfun must be a function with two arguments, the coordinates\nof the point on the canvas where mouse button is released.\nnum, the number of the mouse-button defaults to 1\n\nIf a turtle is clicked, first _onclick-event will be performed,\nthen _onscreensclick-event.", + "builtins.TurtleScreenBase._onscreenclick" => "Bind fun to mouse-click event on canvas.\nfun must be a function with two arguments, the coordinates\nof the clicked point on the canvas.\nnum, the number of the mouse-button defaults to 1\n\nIf a turtle is clicked, first _onclick-event will be performed,\nthen _onscreensclick-event.", + "builtins.TurtleScreenBase._ontimer" => "Install a timer, which calls fun after t milliseconds.", + "builtins.TurtleScreenBase._pointlist" => "returns list of coordinate-pairs of points of item\nExample (for insiders):\n>>> from turtle import *\n>>> getscreen()._pointlist(getturtle().turtle._item)\n[(0.0, 9.9999999999999982), (0.0, -9.9999999999999982),\n(9.9999999999999982, 0.0)]\n>>>", + "builtins.TurtleScreenBase._resize" => "Resize the canvas the turtles are drawing on. Does\nnot alter the drawing window.", + "builtins.TurtleScreenBase._setbgpic" => "Configure image item as to draw image object\nat center of canvas. Set item to the first item\nin the displaylist, so it will be drawn below\nany other item .", + "builtins.TurtleScreenBase._type" => "Return 'line' or 'polygon' or 'image' depending on\ntype of item.", + "builtins.TurtleScreenBase._update" => "Redraw graphics items on canvas", + "builtins.TurtleScreenBase._window_size" => "Return the width and height of the turtle window.", + "builtins.TurtleScreenBase._write" => "Write txt at pos in canvas with specified font\nand color.\nReturn text item and x-coord of right bottom corner\nof text's bounding box.", + "builtins.TurtleScreenBase.mainloop" => "Starts event loop - calling Tkinter's mainloop function.\n\nNo argument.\n\nMust be last statement in a turtle graphics program.\nMust NOT be used if a script is run from within IDLE in -n mode\n(No subprocess) - for interactive use of turtle graphics.\n\nExample (for a TurtleScreen instance named screen):\n>>> screen.mainloop()", + "builtins.TurtleScreenBase.numinput" => "Pop up a dialog window for input of a number.\n\nArguments: title is the title of the dialog window,\nprompt is a text mostly describing what numerical information to input.\ndefault: default value\nminval: minimum value for input\nmaxval: maximum value for input\n\nThe number input must be in the range minval .. maxval if these are\ngiven. If not, a hint is issued and the dialog remains open for\ncorrection. Return the number input.\nIf the dialog is canceled, return None.\n\nExample (for a TurtleScreen instance named screen):\n>>> screen.numinput(\"Poker\", \"Your stakes:\", 1000, minval=10, maxval=10000)", + "builtins.TurtleScreenBase.textinput" => "Pop up a dialog window for input of a string.\n\nArguments: title is the title of the dialog window,\nprompt is a text mostly describing what information to input.\n\nReturn the string input\nIf the dialog is canceled, return None.\n\nExample (for a TurtleScreen instance named screen):\n>>> screen.textinput(\"NIM\", \"Name of first player:\")", + "builtins.TypeAliasType" => "Type alias.\n\nType aliases are created through the type statement::\n\n type Alias = int\n\nIn this example, Alias and int will be treated equivalently by static\ntype checkers.\n\nAt runtime, Alias is an instance of TypeAliasType. The __name__\nattribute holds the name of the type alias. The value of the type alias\nis stored in the __value__ attribute. It is evaluated lazily, so the\nvalue is computed only if the attribute is accessed.\n\nType aliases can also be generic::\n\n type ListOrSet[T] = list[T] | set[T]\n\nIn this case, the type parameters of the alias are stored in the\n__type_params__ attribute.\n\nSee PEP 695 for more information.", + "builtins.TypeAliasType.__delattr__" => "Implement delattr(self, name).", + "builtins.TypeAliasType.__eq__" => "Return self==value.", + "builtins.TypeAliasType.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.TypeAliasType.__ge__" => "Return self>=value.", + "builtins.TypeAliasType.__getattribute__" => "Return getattr(self, name).", + "builtins.TypeAliasType.__getitem__" => "Return self[key].", + "builtins.TypeAliasType.__getstate__" => "Helper for pickle.", + "builtins.TypeAliasType.__gt__" => "Return self>value.", + "builtins.TypeAliasType.__hash__" => "Return hash(self).", + "builtins.TypeAliasType.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.TypeAliasType.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.TypeAliasType.__iter__" => "Implement iter(self).", + "builtins.TypeAliasType.__le__" => "Return self<=value.", + "builtins.TypeAliasType.__lt__" => "Return self<value.", + "builtins.TypeAliasType.__ne__" => "Return self!=value.", + "builtins.TypeAliasType.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.TypeAliasType.__or__" => "Return self|value.", + "builtins.TypeAliasType.__reduce_ex__" => "Helper for pickle.", + "builtins.TypeAliasType.__repr__" => "Return repr(self).", + "builtins.TypeAliasType.__ror__" => "Return value|self.", + "builtins.TypeAliasType.__setattr__" => "Implement setattr(self, name, value).", + "builtins.TypeAliasType.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.TypeAliasType.__str__" => "Return str(self).", + "builtins.TypeAliasType.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.TypeError" => "Inappropriate argument type.", "builtins.TypeError.__delattr__" => "Implement delattr(self, name).", "builtins.TypeError.__eq__" => "Return self==value.", @@ -11270,6 +20160,139 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.TypeError.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.TypeError.add_note" => "Add a note to the exception", "builtins.TypeError.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.TypeVar" => "Type variable.\n\nThe preferred way to construct a type variable is via the dedicated\nsyntax for generic functions, classes, and type aliases::\n\n class Sequence[T]: # T is a TypeVar\n ...\n\nThis syntax can also be used to create bound and constrained type\nvariables::\n\n # S is a TypeVar bound to str\n class StrSequence[S: str]:\n ...\n\n # A is a TypeVar constrained to str or bytes\n class StrOrBytesSequence[A: (str, bytes)]:\n ...\n\nType variables can also have defaults:\n\n class IntDefault[T = int]:\n ...\n\nHowever, if desired, reusable type variables can also be constructed\nmanually, like so::\n\n T = TypeVar('T') # Can be anything\n S = TypeVar('S', bound=str) # Can be any subtype of str\n A = TypeVar('A', str, bytes) # Must be exactly str or bytes\n D = TypeVar('D', default=int) # Defaults to int\n\nType variables exist primarily for the benefit of static type\ncheckers. They serve as the parameters for generic types as well\nas for generic function and type alias definitions.\n\nThe variance of type variables is inferred by type checkers when they\nare created through the type parameter syntax and when\n``infer_variance=True`` is passed. Manually created type variables may\nbe explicitly marked covariant or contravariant by passing\n``covariant=True`` or ``contravariant=True``. By default, manually\ncreated type variables are invariant. See PEP 484 and PEP 695 for more\ndetails.", + "builtins.TypeVar.__delattr__" => "Implement delattr(self, name).", + "builtins.TypeVar.__eq__" => "Return self==value.", + "builtins.TypeVar.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.TypeVar.__ge__" => "Return self>=value.", + "builtins.TypeVar.__getattribute__" => "Return getattr(self, name).", + "builtins.TypeVar.__getstate__" => "Helper for pickle.", + "builtins.TypeVar.__gt__" => "Return self>value.", + "builtins.TypeVar.__hash__" => "Return hash(self).", + "builtins.TypeVar.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.TypeVar.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.TypeVar.__le__" => "Return self<=value.", + "builtins.TypeVar.__lt__" => "Return self<value.", + "builtins.TypeVar.__ne__" => "Return self!=value.", + "builtins.TypeVar.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.TypeVar.__or__" => "Return self|value.", + "builtins.TypeVar.__reduce_ex__" => "Helper for pickle.", + "builtins.TypeVar.__repr__" => "Return repr(self).", + "builtins.TypeVar.__ror__" => "Return value|self.", + "builtins.TypeVar.__setattr__" => "Implement setattr(self, name, value).", + "builtins.TypeVar.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.TypeVar.__str__" => "Return str(self).", + "builtins.TypeVar.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.TypeVarTuple" => "Type variable tuple. A specialized form of type variable that enables\nvariadic generics.\n\nThe preferred way to construct a type variable tuple is via the\ndedicated syntax for generic functions, classes, and type aliases,\nwhere a single '*' indicates a type variable tuple::\n\n def move_first_element_to_last[T, *Ts](tup: tuple[T, *Ts]) -> tuple[*Ts, T]:\n return (*tup[1:], tup[0])\n\nType variables tuples can have default values:\n\n type AliasWithDefault[*Ts = (str, int)] = tuple[*Ts]\n\nFor compatibility with Python 3.11 and earlier, TypeVarTuple objects\ncan also be created as follows::\n\n Ts = TypeVarTuple('Ts') # Can be given any name\n DefaultTs = TypeVarTuple('Ts', default=(str, int))\n\nJust as a TypeVar (type variable) is a placeholder for a single type,\na TypeVarTuple is a placeholder for an *arbitrary* number of types. For\nexample, if we define a generic class using a TypeVarTuple::\n\n class C[*Ts]: ...\n\nThen we can parameterize that class with an arbitrary number of type\narguments::\n\n C[int] # Fine\n C[int, str] # Also fine\n C[()] # Even this is fine\n\nFor more details, see PEP 646.\n\nNote that only TypeVarTuples defined in the global scope can be\npickled.", + "builtins.TypeVarTuple.__default__" => "The default value for this TypeVarTuple.", + "builtins.TypeVarTuple.__delattr__" => "Implement delattr(self, name).", + "builtins.TypeVarTuple.__eq__" => "Return self==value.", + "builtins.TypeVarTuple.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.TypeVarTuple.__ge__" => "Return self>=value.", + "builtins.TypeVarTuple.__getattribute__" => "Return getattr(self, name).", + "builtins.TypeVarTuple.__getstate__" => "Helper for pickle.", + "builtins.TypeVarTuple.__gt__" => "Return self>value.", + "builtins.TypeVarTuple.__hash__" => "Return hash(self).", + "builtins.TypeVarTuple.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.TypeVarTuple.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.TypeVarTuple.__iter__" => "Implement iter(self).", + "builtins.TypeVarTuple.__le__" => "Return self<=value.", + "builtins.TypeVarTuple.__lt__" => "Return self<value.", + "builtins.TypeVarTuple.__ne__" => "Return self!=value.", + "builtins.TypeVarTuple.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.TypeVarTuple.__reduce_ex__" => "Helper for pickle.", + "builtins.TypeVarTuple.__repr__" => "Return repr(self).", + "builtins.TypeVarTuple.__setattr__" => "Implement setattr(self, name, value).", + "builtins.TypeVarTuple.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.TypeVarTuple.__str__" => "Return str(self).", + "builtins.TypeVarTuple.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.TypedDict.__delattr__" => "Implement delattr(self, name).", + "builtins.TypedDict.__eq__" => "Return self==value.", + "builtins.TypedDict.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.TypedDict.__ge__" => "Return self>=value.", + "builtins.TypedDict.__getattribute__" => "Return getattr(self, name).", + "builtins.TypedDict.__getstate__" => "Helper for pickle.", + "builtins.TypedDict.__gt__" => "Return self>value.", + "builtins.TypedDict.__hash__" => "Return hash(self).", + "builtins.TypedDict.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.TypedDict.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.TypedDict.__le__" => "Return self<=value.", + "builtins.TypedDict.__lt__" => "Return self<value.", + "builtins.TypedDict.__ne__" => "Return self!=value.", + "builtins.TypedDict.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.TypedDict.__reduce__" => "Helper for pickle.", + "builtins.TypedDict.__reduce_ex__" => "Helper for pickle.", + "builtins.TypedDict.__repr__" => "Return repr(self).", + "builtins.TypedDict.__setattr__" => "Implement setattr(self, name, value).", + "builtins.TypedDict.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.TypedDict.__str__" => "Return str(self).", + "builtins.TypedDict.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.TypedDict.__weakref__" => "list of weak references to the object", + "builtins.UCD.__delattr__" => "Implement delattr(self, name).", + "builtins.UCD.__eq__" => "Return self==value.", + "builtins.UCD.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.UCD.__ge__" => "Return self>=value.", + "builtins.UCD.__getattribute__" => "Return getattr(self, name).", + "builtins.UCD.__getstate__" => "Helper for pickle.", + "builtins.UCD.__gt__" => "Return self>value.", + "builtins.UCD.__hash__" => "Return hash(self).", + "builtins.UCD.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.UCD.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.UCD.__le__" => "Return self<=value.", + "builtins.UCD.__lt__" => "Return self<value.", + "builtins.UCD.__ne__" => "Return self!=value.", + "builtins.UCD.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.UCD.__reduce__" => "Helper for pickle.", + "builtins.UCD.__reduce_ex__" => "Helper for pickle.", + "builtins.UCD.__repr__" => "Return repr(self).", + "builtins.UCD.__setattr__" => "Implement setattr(self, name, value).", + "builtins.UCD.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.UCD.__str__" => "Return str(self).", + "builtins.UCD.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.UCD.bidirectional" => "Returns the bidirectional class assigned to the character chr as string.\n\nIf no such value is defined, an empty string is returned.", + "builtins.UCD.category" => "Returns the general category assigned to the character chr as string.", + "builtins.UCD.combining" => "Returns the canonical combining class assigned to the character chr as integer.\n\nReturns 0 if no combining class is defined.", + "builtins.UCD.decimal" => "Converts a Unicode character into its equivalent decimal value.\n\nReturns the decimal value assigned to the character chr as integer.\nIf no such value is defined, default is returned, or, if not given,\nValueError is raised.", + "builtins.UCD.decomposition" => "Returns the character decomposition mapping assigned to the character chr as string.\n\nAn empty string is returned in case no such mapping is defined.", + "builtins.UCD.digit" => "Converts a Unicode character into its equivalent digit value.\n\nReturns the digit value assigned to the character chr as integer.\nIf no such value is defined, default is returned, or, if not given,\nValueError is raised.", + "builtins.UCD.east_asian_width" => "Returns the east asian width assigned to the character chr as string.", + "builtins.UCD.is_normalized" => "Return whether the Unicode string unistr is in the normal form 'form'.\n\nValid values for form are 'NFC', 'NFKC', 'NFD', and 'NFKD'.", + "builtins.UCD.lookup" => "Look up character by name.\n\nIf a character with the given name is found, return the\ncorresponding character. If not found, KeyError is raised.", + "builtins.UCD.mirrored" => "Returns the mirrored property assigned to the character chr as integer.\n\nReturns 1 if the character has been identified as a \"mirrored\"\ncharacter in bidirectional text, 0 otherwise.", + "builtins.UCD.name" => "Returns the name assigned to the character chr as a string.\n\nIf no name is defined, default is returned, or, if not given,\nValueError is raised.", + "builtins.UCD.normalize" => "Return the normal form 'form' for the Unicode string unistr.\n\nValid values for form are 'NFC', 'NFKC', 'NFD', and 'NFKD'.", + "builtins.UCD.numeric" => "Converts a Unicode character into its equivalent numeric value.\n\nReturns the numeric value assigned to the character chr as float.\nIf no such value is defined, default is returned, or, if not given,\nValueError is raised.", + "builtins.UID.__delattr__" => "Implement delattr(self, name).", + "builtins.UID.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.UID.__ge__" => "Return self>=value.", + "builtins.UID.__getattribute__" => "Return getattr(self, name).", + "builtins.UID.__getstate__" => "Helper for pickle.", + "builtins.UID.__gt__" => "Return self>value.", + "builtins.UID.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.UID.__le__" => "Return self<=value.", + "builtins.UID.__lt__" => "Return self<value.", + "builtins.UID.__ne__" => "Return self!=value.", + "builtins.UID.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.UID.__reduce_ex__" => "Helper for pickle.", + "builtins.UID.__setattr__" => "Implement setattr(self, name, value).", + "builtins.UID.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.UID.__str__" => "Return str(self).", + "builtins.UID.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.UID.__weakref__" => "list of weak references to the object", + "builtins.UUID" => "Instances of the UUID class represent UUIDs as specified in RFC 4122.\nUUID objects are immutable, hashable, and usable as dictionary keys.\nConverting a UUID to a string with str() yields something in the form\n'12345678-1234-1234-1234-123456789abc'. The UUID constructor accepts\nfive possible forms: a similar string of hexadecimal digits, or a tuple\nof six integer fields (with 32-bit, 16-bit, 16-bit, 8-bit, 8-bit, and\n48-bit values respectively) as an argument named 'fields', or a string\nof 16 bytes (with all the integer fields in big-endian order) as an\nargument named 'bytes', or a string of 16 bytes (with the first three\nfields in little-endian order) as an argument named 'bytes_le', or a\nsingle 128-bit integer as an argument named 'int'.\n\nUUIDs have these read-only attributes:\n\n bytes the UUID as a 16-byte string (containing the six\n integer fields in big-endian byte order)\n\n bytes_le the UUID as a 16-byte string (with time_low, time_mid,\n and time_hi_version in little-endian byte order)\n\n fields a tuple of the six integer fields of the UUID,\n which are also available as six individual attributes\n and two derived attributes. Those attributes are not\n always relevant to all UUID versions:\n\n The 'time_*' attributes are only relevant to version 1.\n\n The 'clock_seq*' and 'node' attributes are only relevant\n to versions 1 and 6.\n\n The 'time' attribute is only relevant to versions 1, 6\n and 7.\n\n time_low the first 32 bits of the UUID\n time_mid the next 16 bits of the UUID\n time_hi_version the next 16 bits of the UUID\n clock_seq_hi_variant the next 8 bits of the UUID\n clock_seq_low the next 8 bits of the UUID\n node the last 48 bits of the UUID\n\n time the 60-bit timestamp for UUIDv1/v6,\n or the 48-bit timestamp for UUIDv7\n clock_seq the 14-bit sequence number\n\n hex the UUID as a 32-character hexadecimal string\n\n int the UUID as a 128-bit integer\n\n urn the UUID as a URN as specified in RFC 4122/9562\n\n variant the UUID variant (one of the constants RESERVED_NCS,\n RFC_4122, RESERVED_MICROSOFT, or RESERVED_FUTURE)\n\n version the UUID version number (1 through 8, meaningful only\n when the variant is RFC_4122)\n\n is_safe An enum indicating whether the UUID has been generated in\n a way that is safe for multiprocessing applications, via\n uuid_generate_time_safe(3).", + "builtins.UUID.__delattr__" => "Implement delattr(self, name).", + "builtins.UUID.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.UUID.__getattribute__" => "Return getattr(self, name).", + "builtins.UUID.__init__" => "Create a UUID from either a string of 32 hexadecimal digits,\na string of 16 bytes as the 'bytes' argument, a string of 16 bytes\nin little-endian order as the 'bytes_le' argument, a tuple of six\nintegers (32-bit time_low, 16-bit time_mid, 16-bit time_hi_version,\n8-bit clock_seq_hi_variant, 8-bit clock_seq_low, 48-bit node) as\nthe 'fields' argument, or a single 128-bit integer as the 'int'\nargument. When a string of hex digits is given, curly braces,\nhyphens, and a URN prefix are all optional. For example, these\nexpressions all yield the same UUID:\n\nUUID('{12345678-1234-5678-1234-567812345678}')\nUUID('12345678123456781234567812345678')\nUUID('urn:uuid:12345678-1234-5678-1234-567812345678')\nUUID(bytes='\\x12\\x34\\x56\\x78'*4)\nUUID(bytes_le='\\x78\\x56\\x34\\x12\\x34\\x12\\x78\\x56' +\n '\\x12\\x34\\x56\\x78\\x12\\x34\\x56\\x78')\nUUID(fields=(0x12345678, 0x1234, 0x5678, 0x12, 0x34, 0x567812345678))\nUUID(int=0x12345678123456781234567812345678)\n\nExactly one of 'hex', 'bytes', 'bytes_le', 'fields', or 'int' must\nbe given. The 'version' argument is optional; if given, the resulting\nUUID will have its variant and version set according to RFC 4122,\noverriding the given 'hex', 'bytes', 'bytes_le', 'fields', or 'int'.\n\nis_safe is an enum exposed as an attribute on the instance. It\nindicates whether the UUID has been generated in a way that is safe\nfor multiprocessing applications, via uuid_generate_time_safe(3).", + "builtins.UUID.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.UUID.__ne__" => "Return self!=value.", + "builtins.UUID.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.UUID.__reduce__" => "Helper for pickle.", + "builtins.UUID.__reduce_ex__" => "Helper for pickle.", + "builtins.UUID.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.UUID.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.UUID.__weakref__" => "list of weak references to the object", + "builtins.UUID._from_int" => "Create a UUID from an integer *value*. Internal use only.", "builtins.UnboundLocalError" => "Local name referenced but not bound to a value.", "builtins.UnboundLocalError.__delattr__" => "Implement delattr(self, name).", "builtins.UnboundLocalError.__eq__" => "Return self==value.", @@ -11452,6 +20475,74 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.Union.__sizeof__" => "Size of object in memory, in bytes.", "builtins.Union.__str__" => "Return str(self).", "builtins.Union.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Unpickler" => "This takes a binary file for reading a pickle data stream.\n\nThe protocol version of the pickle is detected automatically, so no\nprotocol argument is needed. Bytes past the pickled object's\nrepresentation are ignored.\n\nThe argument *file* must have two methods, a read() method that takes\nan integer argument, and a readline() method that requires no\narguments. Both methods should return bytes. Thus *file* can be a\nbinary file object opened for reading, an io.BytesIO object, or any\nother custom object that meets this interface.\n\nOptional keyword arguments are *fix_imports*, *encoding* and *errors*,\nwhich are used to control compatibility support for pickle stream\ngenerated by Python 2. If *fix_imports* is True, pickle will try to\nmap the old Python 2 names to the new names used in Python 3. The\n*encoding* and *errors* tell pickle how to decode 8-bit string\ninstances pickled by Python 2; these default to 'ASCII' and 'strict',\nrespectively. The *encoding* can be 'bytes' to read these 8-bit\nstring instances as bytes objects.", + "builtins.Unpickler.__delattr__" => "Implement delattr(self, name).", + "builtins.Unpickler.__eq__" => "Return self==value.", + "builtins.Unpickler.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Unpickler.__ge__" => "Return self>=value.", + "builtins.Unpickler.__getattribute__" => "Return getattr(self, name).", + "builtins.Unpickler.__getstate__" => "Helper for pickle.", + "builtins.Unpickler.__gt__" => "Return self>value.", + "builtins.Unpickler.__hash__" => "Return hash(self).", + "builtins.Unpickler.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Unpickler.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Unpickler.__le__" => "Return self<=value.", + "builtins.Unpickler.__lt__" => "Return self<value.", + "builtins.Unpickler.__ne__" => "Return self!=value.", + "builtins.Unpickler.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Unpickler.__reduce__" => "Helper for pickle.", + "builtins.Unpickler.__reduce_ex__" => "Helper for pickle.", + "builtins.Unpickler.__repr__" => "Return repr(self).", + "builtins.Unpickler.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Unpickler.__sizeof__" => "Returns size in memory, in bytes.", + "builtins.Unpickler.__str__" => "Return str(self).", + "builtins.Unpickler.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Unpickler.find_class" => "Return an object from a specified module.\n\nIf necessary, the module will be imported. Subclasses may override\nthis method (e.g. to restrict unpickling of arbitrary classes and\nfunctions).\n\nThis method is called whenever a class or a function object is\nneeded. Both arguments passed are str objects.", + "builtins.Unpickler.load" => "Load a pickle.\n\nRead a pickled object representation from the open file object given\nin the constructor, and return the reconstituted object hierarchy\nspecified therein.", + "builtins.UnpicklerMemoProxy.__delattr__" => "Implement delattr(self, name).", + "builtins.UnpicklerMemoProxy.__eq__" => "Return self==value.", + "builtins.UnpicklerMemoProxy.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.UnpicklerMemoProxy.__ge__" => "Return self>=value.", + "builtins.UnpicklerMemoProxy.__getattribute__" => "Return getattr(self, name).", + "builtins.UnpicklerMemoProxy.__getstate__" => "Helper for pickle.", + "builtins.UnpicklerMemoProxy.__gt__" => "Return self>value.", + "builtins.UnpicklerMemoProxy.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.UnpicklerMemoProxy.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.UnpicklerMemoProxy.__le__" => "Return self<=value.", + "builtins.UnpicklerMemoProxy.__lt__" => "Return self<value.", + "builtins.UnpicklerMemoProxy.__ne__" => "Return self!=value.", + "builtins.UnpicklerMemoProxy.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.UnpicklerMemoProxy.__reduce__" => "Implement pickling support.", + "builtins.UnpicklerMemoProxy.__reduce_ex__" => "Helper for pickle.", + "builtins.UnpicklerMemoProxy.__repr__" => "Return repr(self).", + "builtins.UnpicklerMemoProxy.__setattr__" => "Implement setattr(self, name, value).", + "builtins.UnpicklerMemoProxy.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.UnpicklerMemoProxy.__str__" => "Return str(self).", + "builtins.UnpicklerMemoProxy.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.UnpicklerMemoProxy.clear" => "Remove all items from memo.", + "builtins.UnpicklerMemoProxy.copy" => "Copy the memo to a new object.", + "builtins.Untokenizer.__delattr__" => "Implement delattr(self, name).", + "builtins.Untokenizer.__eq__" => "Return self==value.", + "builtins.Untokenizer.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Untokenizer.__ge__" => "Return self>=value.", + "builtins.Untokenizer.__getattribute__" => "Return getattr(self, name).", + "builtins.Untokenizer.__getstate__" => "Helper for pickle.", + "builtins.Untokenizer.__gt__" => "Return self>value.", + "builtins.Untokenizer.__hash__" => "Return hash(self).", + "builtins.Untokenizer.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Untokenizer.__le__" => "Return self<=value.", + "builtins.Untokenizer.__lt__" => "Return self<value.", + "builtins.Untokenizer.__ne__" => "Return self!=value.", + "builtins.Untokenizer.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Untokenizer.__reduce__" => "Helper for pickle.", + "builtins.Untokenizer.__reduce_ex__" => "Helper for pickle.", + "builtins.Untokenizer.__repr__" => "Return repr(self).", + "builtins.Untokenizer.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Untokenizer.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Untokenizer.__str__" => "Return str(self).", + "builtins.Untokenizer.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Untokenizer.__weakref__" => "list of weak references to the object", + "builtins.Untokenizer.add_backslash_continuation" => "Add backslash continuation characters if the row has increased\nwithout encountering a newline token.\n\nThis also inserts the correct amount of whitespace before the backslash.", "builtins.UserWarning" => "Base class for warnings generated by user code.", "builtins.UserWarning.__delattr__" => "Implement delattr(self, name).", "builtins.UserWarning.__eq__" => "Return self==value.", @@ -11498,6 +20589,57 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.ValueError.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.ValueError.add_note" => "Add a note to the exception", "builtins.ValueError.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.Values.__delattr__" => "Implement delattr(self, name).", + "builtins.Values.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Values.__ge__" => "Return self>=value.", + "builtins.Values.__getattribute__" => "Return getattr(self, name).", + "builtins.Values.__getstate__" => "Helper for pickle.", + "builtins.Values.__gt__" => "Return self>value.", + "builtins.Values.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Values.__le__" => "Return self<=value.", + "builtins.Values.__lt__" => "Return self<value.", + "builtins.Values.__ne__" => "Return self!=value.", + "builtins.Values.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Values.__reduce__" => "Helper for pickle.", + "builtins.Values.__reduce_ex__" => "Helper for pickle.", + "builtins.Values.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Values.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Values.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Values.__weakref__" => "list of weak references to the object", + "builtins.Values._update_careful" => "Update the option values from an arbitrary dictionary, but only\nuse keys from dict that already have a corresponding attribute\nin self. Any keys in dict without a corresponding attribute\nare silently ignored.", + "builtins.Values._update_loose" => "Update the option values from an arbitrary dictionary,\nusing all keys from the dictionary regardless of whether\nthey have a corresponding attribute in self or not.", + "builtins.Variable" => "Class to define value holders for e.g. buttons.\n\nSubclasses StringVar, IntVar, DoubleVar, BooleanVar are specializations\nthat constrain the type of the value returned from get().", + "builtins.Variable.__del__" => "Unset the variable in Tcl.", + "builtins.Variable.__delattr__" => "Implement delattr(self, name).", + "builtins.Variable.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Variable.__ge__" => "Return self>=value.", + "builtins.Variable.__getattribute__" => "Return getattr(self, name).", + "builtins.Variable.__getstate__" => "Helper for pickle.", + "builtins.Variable.__gt__" => "Return self>value.", + "builtins.Variable.__init__" => "Construct a variable\n\nMASTER can be given as master widget.\nVALUE is an optional value (defaults to \"\")\nNAME is an optional Tcl name (defaults to PY_VARnum).\n\nIf NAME matches an existing variable and VALUE is omitted\nthen the existing value is retained.", + "builtins.Variable.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Variable.__le__" => "Return self<=value.", + "builtins.Variable.__lt__" => "Return self<value.", + "builtins.Variable.__ne__" => "Return self!=value.", + "builtins.Variable.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Variable.__reduce__" => "Helper for pickle.", + "builtins.Variable.__reduce_ex__" => "Helper for pickle.", + "builtins.Variable.__repr__" => "Return repr(self).", + "builtins.Variable.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Variable.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Variable.__str__" => "Return the name of the variable in Tcl.", + "builtins.Variable.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Variable.__weakref__" => "list of weak references to the object", + "builtins.Variable.get" => "Return value of variable.", + "builtins.Variable.initialize" => "Set the variable to VALUE.", + "builtins.Variable.set" => "Set the variable to VALUE.", + "builtins.Variable.trace" => "Define a trace callback for the variable.\n\nMODE is one of \"r\", \"w\", \"u\" for read, write, undefine.\nCALLBACK must be a function which is called when\nthe variable is read, written or undefined.\n\nReturn the name of the callback.\n\nThis deprecated method wraps a deprecated Tcl method removed\nin Tcl 9.0. Use trace_add() instead.", + "builtins.Variable.trace_add" => "Define a trace callback for the variable.\n\nMode is one of \"read\", \"write\", \"unset\", or a list or tuple of\nsuch strings.\nCallback must be a function which is called when the variable is\nread, written or unset.\n\nReturn the name of the callback.", + "builtins.Variable.trace_info" => "Return all trace callback information.", + "builtins.Variable.trace_remove" => "Delete the trace callback for a variable.\n\nMode is one of \"read\", \"write\", \"unset\" or a list or tuple of\nsuch strings. Must be same as were specified in trace_add().\ncbname is the name of the callback returned from trace_add().", + "builtins.Variable.trace_variable" => "Define a trace callback for the variable.\n\nMODE is one of \"r\", \"w\", \"u\" for read, write, undefine.\nCALLBACK must be a function which is called when\nthe variable is read, written or undefined.\n\nReturn the name of the callback.\n\nThis deprecated method wraps a deprecated Tcl method removed\nin Tcl 9.0. Use trace_add() instead.", + "builtins.Variable.trace_vdelete" => "Delete the trace callback for a variable.\n\nMODE is one of \"r\", \"w\", \"u\" for read, write, undefine.\nCBNAME is the name of the callback returned from trace_variable or trace.\n\nThis deprecated method wraps a deprecated Tcl method removed\nin Tcl 9.0. Use trace_remove() instead.", + "builtins.Variable.trace_vinfo" => "Return all trace callback information.\n\nThis deprecated method wraps a deprecated Tcl method removed\nin Tcl 9.0. Use trace_info() instead.", "builtins.Warning" => "Base class for warning categories.", "builtins.Warning.__delattr__" => "Implement delattr(self, name).", "builtins.Warning.__eq__" => "Return self==value.", @@ -11521,6 +20663,104 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.Warning.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.Warning.add_note" => "Add a note to the exception", "builtins.Warning.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.WarningMessage.__delattr__" => "Implement delattr(self, name).", + "builtins.WarningMessage.__eq__" => "Return self==value.", + "builtins.WarningMessage.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.WarningMessage.__ge__" => "Return self>=value.", + "builtins.WarningMessage.__getattribute__" => "Return getattr(self, name).", + "builtins.WarningMessage.__getstate__" => "Helper for pickle.", + "builtins.WarningMessage.__gt__" => "Return self>value.", + "builtins.WarningMessage.__hash__" => "Return hash(self).", + "builtins.WarningMessage.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.WarningMessage.__le__" => "Return self<=value.", + "builtins.WarningMessage.__lt__" => "Return self<value.", + "builtins.WarningMessage.__ne__" => "Return self!=value.", + "builtins.WarningMessage.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.WarningMessage.__reduce__" => "Helper for pickle.", + "builtins.WarningMessage.__reduce_ex__" => "Helper for pickle.", + "builtins.WarningMessage.__setattr__" => "Implement setattr(self, name, value).", + "builtins.WarningMessage.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.WarningMessage.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.WarningMessage.__weakref__" => "list of weak references to the object", + "builtins.Wave_read" => "Variables used in this class:\n\nThese variables are available to the user though appropriate\nmethods of this class:\n_file -- the open file with methods read(), close(), and seek()\n set through the __init__() method\n_nchannels -- the number of audio channels\n available through the getnchannels() method\n_nframes -- the number of audio frames\n available through the getnframes() method\n_sampwidth -- the number of bytes per audio sample\n available through the getsampwidth() method\n_framerate -- the sampling frequency\n available through the getframerate() method\n_comptype -- the AIFF-C compression type ('NONE' if AIFF)\n available through the getcomptype() method\n_compname -- the human-readable AIFF-C compression type\n available through the getcomptype() method\n_soundpos -- the position in the audio stream\n available through the tell() method, set through the\n setpos() method\n\nThese variables are used internally only:\n_fmt_chunk_read -- 1 iff the FMT chunk has been read\n_data_seek_needed -- 1 iff positioned correctly in audio\n file for readframes()\n_data_chunk -- instantiation of a chunk class for the DATA chunk\n_framesize -- size of one frame in the file", + "builtins.Wave_read.__delattr__" => "Implement delattr(self, name).", + "builtins.Wave_read.__eq__" => "Return self==value.", + "builtins.Wave_read.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Wave_read.__ge__" => "Return self>=value.", + "builtins.Wave_read.__getattribute__" => "Return getattr(self, name).", + "builtins.Wave_read.__getstate__" => "Helper for pickle.", + "builtins.Wave_read.__gt__" => "Return self>value.", + "builtins.Wave_read.__hash__" => "Return hash(self).", + "builtins.Wave_read.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Wave_read.__le__" => "Return self<=value.", + "builtins.Wave_read.__lt__" => "Return self<value.", + "builtins.Wave_read.__ne__" => "Return self!=value.", + "builtins.Wave_read.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Wave_read.__reduce__" => "Helper for pickle.", + "builtins.Wave_read.__reduce_ex__" => "Helper for pickle.", + "builtins.Wave_read.__repr__" => "Return repr(self).", + "builtins.Wave_read.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Wave_read.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Wave_read.__str__" => "Return str(self).", + "builtins.Wave_read.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Wave_read.__weakref__" => "list of weak references to the object", + "builtins.Wave_write" => "Variables used in this class:\n\nThese variables are user settable through appropriate methods\nof this class:\n_file -- the open file with methods write(), close(), tell(), seek()\n set through the __init__() method\n_comptype -- the AIFF-C compression type ('NONE' in AIFF)\n set through the setcomptype() or setparams() method\n_compname -- the human-readable AIFF-C compression type\n set through the setcomptype() or setparams() method\n_nchannels -- the number of audio channels\n set through the setnchannels() or setparams() method\n_sampwidth -- the number of bytes per audio sample\n set through the setsampwidth() or setparams() method\n_framerate -- the sampling frequency\n set through the setframerate() or setparams() method\n_nframes -- the number of audio frames written to the header\n set through the setnframes() or setparams() method\n\nThese variables are used internally only:\n_datalength -- the size of the audio samples written to the header\n_nframeswritten -- the number of frames actually written\n_datawritten -- the size of the audio samples actually written", + "builtins.Wave_write.__delattr__" => "Implement delattr(self, name).", + "builtins.Wave_write.__eq__" => "Return self==value.", + "builtins.Wave_write.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Wave_write.__ge__" => "Return self>=value.", + "builtins.Wave_write.__getattribute__" => "Return getattr(self, name).", + "builtins.Wave_write.__getstate__" => "Helper for pickle.", + "builtins.Wave_write.__gt__" => "Return self>value.", + "builtins.Wave_write.__hash__" => "Return hash(self).", + "builtins.Wave_write.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Wave_write.__le__" => "Return self<=value.", + "builtins.Wave_write.__lt__" => "Return self<value.", + "builtins.Wave_write.__ne__" => "Return self!=value.", + "builtins.Wave_write.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Wave_write.__reduce__" => "Helper for pickle.", + "builtins.Wave_write.__reduce_ex__" => "Helper for pickle.", + "builtins.Wave_write.__repr__" => "Return repr(self).", + "builtins.Wave_write.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Wave_write.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Wave_write.__str__" => "Return str(self).", + "builtins.Wave_write.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Wave_write.__weakref__" => "list of weak references to the object", + "builtins.WeakSet.__class_getitem__" => "Represent a PEP 585 generic type\n\nE.g. for t = list[int], t.__origin__ is list and t.__args__ is (int,).", + "builtins.WeakSet.__delattr__" => "Implement delattr(self, name).", + "builtins.WeakSet.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.WeakSet.__getattribute__" => "Return getattr(self, name).", + "builtins.WeakSet.__getstate__" => "Helper for pickle.", + "builtins.WeakSet.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.WeakSet.__ne__" => "Return self!=value.", + "builtins.WeakSet.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.WeakSet.__reduce_ex__" => "Helper for pickle.", + "builtins.WeakSet.__setattr__" => "Implement setattr(self, name, value).", + "builtins.WeakSet.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.WeakSet.__str__" => "Return str(self).", + "builtins.WeakSet.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.WeakSet.__weakref__" => "list of weak references to the object", + "builtins.Whitespace.__delattr__" => "Implement delattr(self, name).", + "builtins.Whitespace.__eq__" => "Return self==value.", + "builtins.Whitespace.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Whitespace.__ge__" => "Return self>=value.", + "builtins.Whitespace.__getattribute__" => "Return getattr(self, name).", + "builtins.Whitespace.__getstate__" => "Helper for pickle.", + "builtins.Whitespace.__gt__" => "Return self>value.", + "builtins.Whitespace.__hash__" => "Return hash(self).", + "builtins.Whitespace.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Whitespace.__le__" => "Return self<=value.", + "builtins.Whitespace.__lt__" => "Return self<value.", + "builtins.Whitespace.__ne__" => "Return self!=value.", + "builtins.Whitespace.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Whitespace.__reduce__" => "Helper for pickle.", + "builtins.Whitespace.__reduce_ex__" => "Helper for pickle.", + "builtins.Whitespace.__repr__" => "Return repr(self).", + "builtins.Whitespace.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Whitespace.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Whitespace.__str__" => "Return str(self).", + "builtins.Whitespace.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Whitespace.__weakref__" => "list of weak references to the object", "builtins.WindowsError" => "Base class for I/O related errors.", "builtins.WindowsError.__delattr__" => "Implement delattr(self, name).", "builtins.WindowsError.__eq__" => "Return self==value.", @@ -11549,6 +20789,210 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.WindowsError.strerror" => "exception strerror", "builtins.WindowsError.winerror" => "Win32 exception code", "builtins.WindowsError.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.WindowsRegistryFinder" => "Meta path finder for modules declared in the Windows registry.", + "builtins.WindowsRegistryFinder.__delattr__" => "Implement delattr(self, name).", + "builtins.WindowsRegistryFinder.__eq__" => "Return self==value.", + "builtins.WindowsRegistryFinder.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.WindowsRegistryFinder.__ge__" => "Return self>=value.", + "builtins.WindowsRegistryFinder.__getattribute__" => "Return getattr(self, name).", + "builtins.WindowsRegistryFinder.__getstate__" => "Helper for pickle.", + "builtins.WindowsRegistryFinder.__gt__" => "Return self>value.", + "builtins.WindowsRegistryFinder.__hash__" => "Return hash(self).", + "builtins.WindowsRegistryFinder.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.WindowsRegistryFinder.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.WindowsRegistryFinder.__le__" => "Return self<=value.", + "builtins.WindowsRegistryFinder.__lt__" => "Return self<value.", + "builtins.WindowsRegistryFinder.__ne__" => "Return self!=value.", + "builtins.WindowsRegistryFinder.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.WindowsRegistryFinder.__reduce__" => "Helper for pickle.", + "builtins.WindowsRegistryFinder.__reduce_ex__" => "Helper for pickle.", + "builtins.WindowsRegistryFinder.__repr__" => "Return repr(self).", + "builtins.WindowsRegistryFinder.__setattr__" => "Implement setattr(self, name, value).", + "builtins.WindowsRegistryFinder.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.WindowsRegistryFinder.__str__" => "Return str(self).", + "builtins.WindowsRegistryFinder.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.WindowsRegistryFinder.__weakref__" => "list of weak references to the object", + "builtins.Wm" => "Provides functions for the communication with the window manager.", + "builtins.Wm.__delattr__" => "Implement delattr(self, name).", + "builtins.Wm.__eq__" => "Return self==value.", + "builtins.Wm.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Wm.__ge__" => "Return self>=value.", + "builtins.Wm.__getattribute__" => "Return getattr(self, name).", + "builtins.Wm.__getstate__" => "Helper for pickle.", + "builtins.Wm.__gt__" => "Return self>value.", + "builtins.Wm.__hash__" => "Return hash(self).", + "builtins.Wm.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Wm.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Wm.__le__" => "Return self<=value.", + "builtins.Wm.__lt__" => "Return self<value.", + "builtins.Wm.__ne__" => "Return self!=value.", + "builtins.Wm.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Wm.__reduce__" => "Helper for pickle.", + "builtins.Wm.__reduce_ex__" => "Helper for pickle.", + "builtins.Wm.__repr__" => "Return repr(self).", + "builtins.Wm.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Wm.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Wm.__str__" => "Return str(self).", + "builtins.Wm.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.Wm.__weakref__" => "list of weak references to the object", + "builtins.Wm.aspect" => "Instruct the window manager to set the aspect ratio (width/height)\nof this widget to be between MINNUMER/MINDENOM and MAXNUMER/MAXDENOM. Return a tuple\nof the actual values if no argument is given.", + "builtins.Wm.attributes" => "Return or sets platform specific attributes.\n\nWhen called with a single argument return_python_dict=True,\nreturn a dict of the platform specific attributes and their values.\nWhen called without arguments or with a single argument\nreturn_python_dict=False, return a tuple containing intermixed\nattribute names with the minus prefix and their values.\n\nWhen called with a single string value, return the value for the\nspecific option. When called with keyword arguments, set the\ncorresponding attributes.", + "builtins.Wm.client" => "Store NAME in WM_CLIENT_MACHINE property of this widget. Return\ncurrent value.", + "builtins.Wm.colormapwindows" => "Store list of window names (WLIST) into WM_COLORMAPWINDOWS property\nof this widget. This list contains windows whose colormaps differ from their\nparents. Return current list of widgets if WLIST is empty.", + "builtins.Wm.command" => "Store VALUE in WM_COMMAND property. It is the command\nwhich shall be used to invoke the application. Return current\ncommand if VALUE is None.", + "builtins.Wm.deiconify" => "Deiconify this widget. If it was never mapped it will not be mapped.\nOn Windows it will raise this widget and give it the focus.", + "builtins.Wm.focusmodel" => "Set focus model to MODEL. \"active\" means that this widget will claim\nthe focus itself, \"passive\" means that the window manager shall give\nthe focus. Return current focus model if MODEL is None.", + "builtins.Wm.forget" => "The window will be unmapped from the screen and will no longer\nbe managed by wm. toplevel windows will be treated like frame\nwindows once they are no longer managed by wm, however, the menu\noption configuration will be remembered and the menus will return\nonce the widget is managed again.", + "builtins.Wm.frame" => "Return identifier for decorative frame of this widget if present.", + "builtins.Wm.geometry" => "Set geometry to NEWGEOMETRY of the form =widthxheight+x+y. Return\ncurrent value if None is given.", + "builtins.Wm.grid" => "Instruct the window manager that this widget shall only be\nresized on grid boundaries. WIDTHINC and HEIGHTINC are the width and\nheight of a grid unit in pixels. BASEWIDTH and BASEHEIGHT are the\nnumber of grid units requested in Tk_GeometryRequest.", + "builtins.Wm.group" => "Set the group leader widgets for related widgets to PATHNAME. Return\nthe group leader of this widget if None is given.", + "builtins.Wm.iconbitmap" => "Set bitmap for the iconified widget to BITMAP. Return\nthe bitmap if None is given.\n\nUnder Windows, the DEFAULT parameter can be used to set the icon\nfor the widget and any descendants that don't have an icon set\nexplicitly. DEFAULT can be the relative path to a .ico file\n(example: root.iconbitmap(default='myicon.ico') ). See Tk\ndocumentation for more information.", + "builtins.Wm.iconify" => "Display widget as icon.", + "builtins.Wm.iconmask" => "Set mask for the icon bitmap of this widget. Return the\nmask if None is given.", + "builtins.Wm.iconname" => "Set the name of the icon for this widget. Return the name if\nNone is given.", + "builtins.Wm.iconphoto" => "Sets the titlebar icon for this window based on the named photo\nimages passed through args. If default is True, this is applied to\nall future created toplevels as well.\n\nThe data in the images is taken as a snapshot at the time of\ninvocation. If the images are later changed, this is not reflected\nto the titlebar icons. Multiple images are accepted to allow\ndifferent images sizes to be provided. The window manager may scale\nprovided icons to an appropriate size.\n\nOn Windows, the images are packed into a Windows icon structure.\nThis will override an icon specified to wm_iconbitmap, and vice\nversa.\n\nOn X, the images are arranged into the _NET_WM_ICON X property,\nwhich most modern window managers support. An icon specified by\nwm_iconbitmap may exist simultaneously.\n\nOn Macintosh, this currently does nothing.", + "builtins.Wm.iconposition" => "Set the position of the icon of this widget to X and Y. Return\na tuple of the current values of X and X if None is given.", + "builtins.Wm.iconwindow" => "Set widget PATHNAME to be displayed instead of icon. Return the current\nvalue if None is given.", + "builtins.Wm.manage" => "The widget specified will become a stand alone top-level window.\nThe window will be decorated with the window managers title bar,\netc.", + "builtins.Wm.maxsize" => "Set max WIDTH and HEIGHT for this widget. If the window is gridded\nthe values are given in grid units. Return the current values if None\nis given.", + "builtins.Wm.minsize" => "Set min WIDTH and HEIGHT for this widget. If the window is gridded\nthe values are given in grid units. Return the current values if None\nis given.", + "builtins.Wm.overrideredirect" => "Instruct the window manager to ignore this widget\nif BOOLEAN is given with 1. Return the current value if None\nis given.", + "builtins.Wm.positionfrom" => "Instruct the window manager that the position of this widget shall\nbe defined by the user if WHO is \"user\", and by its own policy if WHO is\n\"program\".", + "builtins.Wm.protocol" => "Bind function FUNC to command NAME for this widget.\nReturn the function bound to NAME if None is given. NAME could be\ne.g. \"WM_SAVE_YOURSELF\" or \"WM_DELETE_WINDOW\".", + "builtins.Wm.resizable" => "Instruct the window manager whether this width can be resized\nin WIDTH or HEIGHT. Both values are boolean values.", + "builtins.Wm.sizefrom" => "Instruct the window manager that the size of this widget shall\nbe defined by the user if WHO is \"user\", and by its own policy if WHO is\n\"program\".", + "builtins.Wm.state" => "Query or set the state of this widget as one of normal, icon,\niconic (see wm_iconwindow), withdrawn, or zoomed (Windows only).", + "builtins.Wm.title" => "Set the title of this widget.", + "builtins.Wm.transient" => "Instruct the window manager that this widget is transient\nwith regard to widget MASTER.", + "builtins.Wm.withdraw" => "Withdraw this widget from the screen such that it is unmapped\nand forgotten by the window manager. Re-draw it with wm_deiconify.", + "builtins.Wm.wm_aspect" => "Instruct the window manager to set the aspect ratio (width/height)\nof this widget to be between MINNUMER/MINDENOM and MAXNUMER/MAXDENOM. Return a tuple\nof the actual values if no argument is given.", + "builtins.Wm.wm_attributes" => "Return or sets platform specific attributes.\n\nWhen called with a single argument return_python_dict=True,\nreturn a dict of the platform specific attributes and their values.\nWhen called without arguments or with a single argument\nreturn_python_dict=False, return a tuple containing intermixed\nattribute names with the minus prefix and their values.\n\nWhen called with a single string value, return the value for the\nspecific option. When called with keyword arguments, set the\ncorresponding attributes.", + "builtins.Wm.wm_client" => "Store NAME in WM_CLIENT_MACHINE property of this widget. Return\ncurrent value.", + "builtins.Wm.wm_colormapwindows" => "Store list of window names (WLIST) into WM_COLORMAPWINDOWS property\nof this widget. This list contains windows whose colormaps differ from their\nparents. Return current list of widgets if WLIST is empty.", + "builtins.Wm.wm_command" => "Store VALUE in WM_COMMAND property. It is the command\nwhich shall be used to invoke the application. Return current\ncommand if VALUE is None.", + "builtins.Wm.wm_deiconify" => "Deiconify this widget. If it was never mapped it will not be mapped.\nOn Windows it will raise this widget and give it the focus.", + "builtins.Wm.wm_focusmodel" => "Set focus model to MODEL. \"active\" means that this widget will claim\nthe focus itself, \"passive\" means that the window manager shall give\nthe focus. Return current focus model if MODEL is None.", + "builtins.Wm.wm_forget" => "The window will be unmapped from the screen and will no longer\nbe managed by wm. toplevel windows will be treated like frame\nwindows once they are no longer managed by wm, however, the menu\noption configuration will be remembered and the menus will return\nonce the widget is managed again.", + "builtins.Wm.wm_frame" => "Return identifier for decorative frame of this widget if present.", + "builtins.Wm.wm_geometry" => "Set geometry to NEWGEOMETRY of the form =widthxheight+x+y. Return\ncurrent value if None is given.", + "builtins.Wm.wm_grid" => "Instruct the window manager that this widget shall only be\nresized on grid boundaries. WIDTHINC and HEIGHTINC are the width and\nheight of a grid unit in pixels. BASEWIDTH and BASEHEIGHT are the\nnumber of grid units requested in Tk_GeometryRequest.", + "builtins.Wm.wm_group" => "Set the group leader widgets for related widgets to PATHNAME. Return\nthe group leader of this widget if None is given.", + "builtins.Wm.wm_iconbitmap" => "Set bitmap for the iconified widget to BITMAP. Return\nthe bitmap if None is given.\n\nUnder Windows, the DEFAULT parameter can be used to set the icon\nfor the widget and any descendants that don't have an icon set\nexplicitly. DEFAULT can be the relative path to a .ico file\n(example: root.iconbitmap(default='myicon.ico') ). See Tk\ndocumentation for more information.", + "builtins.Wm.wm_iconify" => "Display widget as icon.", + "builtins.Wm.wm_iconmask" => "Set mask for the icon bitmap of this widget. Return the\nmask if None is given.", + "builtins.Wm.wm_iconname" => "Set the name of the icon for this widget. Return the name if\nNone is given.", + "builtins.Wm.wm_iconphoto" => "Sets the titlebar icon for this window based on the named photo\nimages passed through args. If default is True, this is applied to\nall future created toplevels as well.\n\nThe data in the images is taken as a snapshot at the time of\ninvocation. If the images are later changed, this is not reflected\nto the titlebar icons. Multiple images are accepted to allow\ndifferent images sizes to be provided. The window manager may scale\nprovided icons to an appropriate size.\n\nOn Windows, the images are packed into a Windows icon structure.\nThis will override an icon specified to wm_iconbitmap, and vice\nversa.\n\nOn X, the images are arranged into the _NET_WM_ICON X property,\nwhich most modern window managers support. An icon specified by\nwm_iconbitmap may exist simultaneously.\n\nOn Macintosh, this currently does nothing.", + "builtins.Wm.wm_iconposition" => "Set the position of the icon of this widget to X and Y. Return\na tuple of the current values of X and X if None is given.", + "builtins.Wm.wm_iconwindow" => "Set widget PATHNAME to be displayed instead of icon. Return the current\nvalue if None is given.", + "builtins.Wm.wm_manage" => "The widget specified will become a stand alone top-level window.\nThe window will be decorated with the window managers title bar,\netc.", + "builtins.Wm.wm_maxsize" => "Set max WIDTH and HEIGHT for this widget. If the window is gridded\nthe values are given in grid units. Return the current values if None\nis given.", + "builtins.Wm.wm_minsize" => "Set min WIDTH and HEIGHT for this widget. If the window is gridded\nthe values are given in grid units. Return the current values if None\nis given.", + "builtins.Wm.wm_overrideredirect" => "Instruct the window manager to ignore this widget\nif BOOLEAN is given with 1. Return the current value if None\nis given.", + "builtins.Wm.wm_positionfrom" => "Instruct the window manager that the position of this widget shall\nbe defined by the user if WHO is \"user\", and by its own policy if WHO is\n\"program\".", + "builtins.Wm.wm_protocol" => "Bind function FUNC to command NAME for this widget.\nReturn the function bound to NAME if None is given. NAME could be\ne.g. \"WM_SAVE_YOURSELF\" or \"WM_DELETE_WINDOW\".", + "builtins.Wm.wm_resizable" => "Instruct the window manager whether this width can be resized\nin WIDTH or HEIGHT. Both values are boolean values.", + "builtins.Wm.wm_sizefrom" => "Instruct the window manager that the size of this widget shall\nbe defined by the user if WHO is \"user\", and by its own policy if WHO is\n\"program\".", + "builtins.Wm.wm_state" => "Query or set the state of this widget as one of normal, icon,\niconic (see wm_iconwindow), withdrawn, or zoomed (Windows only).", + "builtins.Wm.wm_title" => "Set the title of this widget.", + "builtins.Wm.wm_transient" => "Instruct the window manager that this widget is transient\nwith regard to widget MASTER.", + "builtins.Wm.wm_withdraw" => "Withdraw this widget from the screen such that it is unmapped\nand forgotten by the window manager. Re-draw it with wm_deiconify.", + "builtins.Writer" => "Protocol for simple I/O writer instances.\n\nThis protocol only supports blocking I/O.", + "builtins.Writer.__class_getitem__" => "Represent a PEP 585 generic type\n\nE.g. for t = list[int], t.__origin__ is list and t.__args__ is (int,).", + "builtins.Writer.__delattr__" => "Implement delattr(self, name).", + "builtins.Writer.__eq__" => "Return self==value.", + "builtins.Writer.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.Writer.__ge__" => "Return self>=value.", + "builtins.Writer.__getattribute__" => "Return getattr(self, name).", + "builtins.Writer.__getstate__" => "Helper for pickle.", + "builtins.Writer.__gt__" => "Return self>value.", + "builtins.Writer.__hash__" => "Return hash(self).", + "builtins.Writer.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.Writer.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.Writer.__le__" => "Return self<=value.", + "builtins.Writer.__lt__" => "Return self<value.", + "builtins.Writer.__ne__" => "Return self!=value.", + "builtins.Writer.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.Writer.__reduce__" => "Helper for pickle.", + "builtins.Writer.__reduce_ex__" => "Helper for pickle.", + "builtins.Writer.__repr__" => "Return repr(self).", + "builtins.Writer.__setattr__" => "Implement setattr(self, name, value).", + "builtins.Writer.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.Writer.__str__" => "Return str(self).", + "builtins.Writer.write" => "Write *data* to the output stream and return the number of items written.", + "builtins.XMLParser.__delattr__" => "Implement delattr(self, name).", + "builtins.XMLParser.__eq__" => "Return self==value.", + "builtins.XMLParser.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.XMLParser.__ge__" => "Return self>=value.", + "builtins.XMLParser.__getattribute__" => "Return getattr(self, name).", + "builtins.XMLParser.__getstate__" => "Helper for pickle.", + "builtins.XMLParser.__gt__" => "Return self>value.", + "builtins.XMLParser.__hash__" => "Return hash(self).", + "builtins.XMLParser.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.XMLParser.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.XMLParser.__le__" => "Return self<=value.", + "builtins.XMLParser.__lt__" => "Return self<value.", + "builtins.XMLParser.__ne__" => "Return self!=value.", + "builtins.XMLParser.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.XMLParser.__reduce__" => "Helper for pickle.", + "builtins.XMLParser.__reduce_ex__" => "Helper for pickle.", + "builtins.XMLParser.__repr__" => "Return repr(self).", + "builtins.XMLParser.__setattr__" => "Implement setattr(self, name, value).", + "builtins.XMLParser.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.XMLParser.__str__" => "Return str(self).", + "builtins.XMLParser.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.XView" => "Mix-in class for querying and changing the horizontal position\nof a widget's window.", + "builtins.XView.__delattr__" => "Implement delattr(self, name).", + "builtins.XView.__eq__" => "Return self==value.", + "builtins.XView.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.XView.__ge__" => "Return self>=value.", + "builtins.XView.__getattribute__" => "Return getattr(self, name).", + "builtins.XView.__getstate__" => "Helper for pickle.", + "builtins.XView.__gt__" => "Return self>value.", + "builtins.XView.__hash__" => "Return hash(self).", + "builtins.XView.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.XView.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.XView.__le__" => "Return self<=value.", + "builtins.XView.__lt__" => "Return self<value.", + "builtins.XView.__ne__" => "Return self!=value.", + "builtins.XView.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.XView.__reduce__" => "Helper for pickle.", + "builtins.XView.__reduce_ex__" => "Helper for pickle.", + "builtins.XView.__repr__" => "Return repr(self).", + "builtins.XView.__setattr__" => "Implement setattr(self, name, value).", + "builtins.XView.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.XView.__str__" => "Return str(self).", + "builtins.XView.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.XView.__weakref__" => "list of weak references to the object", + "builtins.XView.xview" => "Query and change the horizontal position of the view.", + "builtins.XView.xview_moveto" => "Adjusts the view in the window so that FRACTION of the\ntotal width of the canvas is off-screen to the left.", + "builtins.XView.xview_scroll" => "Shift the x-view according to NUMBER which is measured in \"units\"\nor \"pages\" (WHAT).", + "builtins.YView" => "Mix-in class for querying and changing the vertical position\nof a widget's window.", + "builtins.YView.__delattr__" => "Implement delattr(self, name).", + "builtins.YView.__eq__" => "Return self==value.", + "builtins.YView.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.YView.__ge__" => "Return self>=value.", + "builtins.YView.__getattribute__" => "Return getattr(self, name).", + "builtins.YView.__getstate__" => "Helper for pickle.", + "builtins.YView.__gt__" => "Return self>value.", + "builtins.YView.__hash__" => "Return hash(self).", + "builtins.YView.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.YView.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.YView.__le__" => "Return self<=value.", + "builtins.YView.__lt__" => "Return self<value.", + "builtins.YView.__ne__" => "Return self!=value.", + "builtins.YView.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.YView.__reduce__" => "Helper for pickle.", + "builtins.YView.__reduce_ex__" => "Helper for pickle.", + "builtins.YView.__repr__" => "Return repr(self).", + "builtins.YView.__setattr__" => "Implement setattr(self, name, value).", + "builtins.YView.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.YView.__str__" => "Return str(self).", + "builtins.YView.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.YView.__weakref__" => "list of weak references to the object", + "builtins.YView.yview" => "Query and change the vertical position of the view.", + "builtins.YView.yview_moveto" => "Adjusts the view in the window so that FRACTION of the\ntotal height of the canvas is off-screen to the top.", + "builtins.YView.yview_scroll" => "Shift the y-view according to NUMBER which is measured in\n\"units\" or \"pages\" (WHAT).", "builtins.ZeroDivisionError" => "Second argument to a division or modulo operation was zero.", "builtins.ZeroDivisionError.__delattr__" => "Implement delattr(self, name).", "builtins.ZeroDivisionError.__eq__" => "Return self==value.", @@ -11572,6 +21016,1304 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.ZeroDivisionError.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.ZeroDivisionError.add_note" => "Add a note to the exception", "builtins.ZeroDivisionError.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins.ZipFile" => "Class with methods to open, read, write, close, list zip files.\n\nz = ZipFile(file, mode=\"r\", compression=ZIP_STORED, allowZip64=True,\n compresslevel=None)\n\nfile: Either the path to the file, or a file-like object.\n If it is a path, the file will be opened and closed by ZipFile.\nmode: The mode can be either read 'r', write 'w', exclusive create 'x',\n or append 'a'.\ncompression: ZIP_STORED (no compression), ZIP_DEFLATED (requires zlib),\n ZIP_BZIP2 (requires bz2), ZIP_LZMA (requires lzma), or\n ZIP_ZSTANDARD (requires compression.zstd).\nallowZip64: if True ZipFile will create files with ZIP64 extensions\n when needed, otherwise it will raise an exception when this\n would be necessary.\ncompresslevel: None (default for the given compression type) or\n an integer specifying the level to pass to the compressor.\n When using ZIP_STORED or ZIP_LZMA this keyword has no effect.\n When using ZIP_DEFLATED integers 0 through 9 are accepted.\n When using ZIP_BZIP2 integers 1 through 9 are accepted.\n When using ZIP_ZSTANDARD integers -7 though 22 are common,\n see the CompressionParameter enum in compression.zstd for\n details.", + "builtins.ZipFile._RealGetContents" => "Read in the table of contents for the ZIP file.", + "builtins.ZipFile.__del__" => "Call the \"close()\" method in case the user forgot.", + "builtins.ZipFile.__delattr__" => "Implement delattr(self, name).", + "builtins.ZipFile.__eq__" => "Return self==value.", + "builtins.ZipFile.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.ZipFile.__ge__" => "Return self>=value.", + "builtins.ZipFile.__getattribute__" => "Return getattr(self, name).", + "builtins.ZipFile.__getstate__" => "Helper for pickle.", + "builtins.ZipFile.__gt__" => "Return self>value.", + "builtins.ZipFile.__hash__" => "Return hash(self).", + "builtins.ZipFile.__init__" => "Open the ZIP file with mode read 'r', write 'w', exclusive create\n'x', or append 'a'.", + "builtins.ZipFile.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.ZipFile.__le__" => "Return self<=value.", + "builtins.ZipFile.__lt__" => "Return self<value.", + "builtins.ZipFile.__ne__" => "Return self!=value.", + "builtins.ZipFile.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.ZipFile.__reduce__" => "Helper for pickle.", + "builtins.ZipFile.__reduce_ex__" => "Helper for pickle.", + "builtins.ZipFile.__setattr__" => "Implement setattr(self, name, value).", + "builtins.ZipFile.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.ZipFile.__str__" => "Return str(self).", + "builtins.ZipFile.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.ZipFile.__weakref__" => "list of weak references to the object", + "builtins.ZipFile._extract_member" => "Extract the ZipInfo object 'member' to a physical\nfile on the path targetpath.", + "builtins.ZipFile._sanitize_windows_name" => "Replace bad characters and remove trailing dots from parts.", + "builtins.ZipFile._writecheck" => "Check for errors before writing a file to the archive.", + "builtins.ZipFile.close" => "Close the file, and for mode 'w', 'x' and 'a' write the ending\nrecords.", + "builtins.ZipFile.comment" => "The comment text associated with the ZIP file.", + "builtins.ZipFile.extract" => "Extract a member from the archive to the current working directory,\nusing its full name. Its file information is extracted as accurately\nas possible. 'member' may be a filename or a ZipInfo object. You can\nspecify a different directory using 'path'. You can specify the\npassword to decrypt the file using 'pwd'.", + "builtins.ZipFile.extractall" => "Extract all members from the archive to the current working\ndirectory. 'path' specifies a different directory to extract to.\n'members' is optional and must be a subset of the list returned\nby namelist(). You can specify the password to decrypt all files\nusing 'pwd'.", + "builtins.ZipFile.getinfo" => "Return the instance of ZipInfo given 'name'.", + "builtins.ZipFile.infolist" => "Return a list of class ZipInfo instances for files in the\narchive.", + "builtins.ZipFile.mkdir" => "Creates a directory inside the zip archive.", + "builtins.ZipFile.namelist" => "Return a list of file names in the archive.", + "builtins.ZipFile.open" => "Return file-like object for 'name'.\n\nname is a string for the file name within the ZIP file, or a ZipInfo\nobject.\n\nmode should be 'r' to read a file already in the ZIP file, or 'w' to\nwrite to a file newly added to the archive.\n\npwd is the password to decrypt files (only used for reading).\n\nWhen writing, if the file size is not known in advance but may\nexceed 2 GiB, pass force_zip64 to use the ZIP64 format, which can\nhandle large files. If the size is known in advance, it is best to\npass a ZipInfo instance for name, with zinfo.file_size set.", + "builtins.ZipFile.printdir" => "Print a table of contents for the zip file.", + "builtins.ZipFile.read" => "Return file bytes for name. 'pwd' is the password to decrypt\nencrypted files.", + "builtins.ZipFile.setpassword" => "Set default password for encrypted files.", + "builtins.ZipFile.testzip" => "Read all the files and check the CRC.\n\nReturn None if all files could be read successfully, or the name\nof the offending file otherwise.", + "builtins.ZipFile.write" => "Put the bytes from filename into the archive under the name\narcname.", + "builtins.ZipFile.writestr" => "Write a file into the archive. The contents is 'data', which\nmay be either a 'str' or a 'bytes' instance; if it is a 'str',\nit is encoded as UTF-8 first.\n'zinfo_or_arcname' is either a ZipInfo instance or\nthe name of the file in the archive.", + "builtins.ZipInfo" => "Class with attributes describing each file in the ZIP archive.", + "builtins.ZipInfo.FileHeader" => "Return the per-file header as a bytes object.\n\nWhen the optional zip64 arg is None rather than a bool, we will\ndecide based upon the file_size and compress_size, if known,\nFalse otherwise.", + "builtins.ZipInfo.__delattr__" => "Implement delattr(self, name).", + "builtins.ZipInfo.__eq__" => "Return self==value.", + "builtins.ZipInfo.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.ZipInfo.__ge__" => "Return self>=value.", + "builtins.ZipInfo.__getattribute__" => "Return getattr(self, name).", + "builtins.ZipInfo.__getstate__" => "Helper for pickle.", + "builtins.ZipInfo.__gt__" => "Return self>value.", + "builtins.ZipInfo.__hash__" => "Return hash(self).", + "builtins.ZipInfo.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.ZipInfo.__le__" => "Return self<=value.", + "builtins.ZipInfo.__lt__" => "Return self<value.", + "builtins.ZipInfo.__ne__" => "Return self!=value.", + "builtins.ZipInfo.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.ZipInfo.__reduce__" => "Helper for pickle.", + "builtins.ZipInfo.__reduce_ex__" => "Helper for pickle.", + "builtins.ZipInfo.__setattr__" => "Implement setattr(self, name, value).", + "builtins.ZipInfo.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.ZipInfo.__str__" => "Return str(self).", + "builtins.ZipInfo.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.ZipInfo._for_archive" => "Resolve suitable defaults from the archive.\n\nResolve the date_time, compression attributes, and external attributes\nto suitable defaults as used by :method:`ZipFile.writestr`.\n\nReturn self.", + "builtins.ZipInfo.from_file" => "Construct an appropriate ZipInfo for a file on the filesystem.\n\nfilename should be the path to a file or directory on the\nfilesystem.\n\narcname is the name which it will have within the archive (by\ndefault, this will be the same as filename, but without a drive\nletter and with leading path separators removed).", + "builtins.ZipInfo.is_dir" => "Return True if this archive member is a directory.", + "builtins.ZstdCompressor" => "Create a compressor object for compressing data incrementally.\n\n level\n The compression level to use. Defaults to COMPRESSION_LEVEL_DEFAULT.\n options\n A dict object that contains advanced compression parameters.\n zstd_dict\n A ZstdDict object, a pre-trained Zstandard dictionary.\n\nThread-safe at method level. For one-shot compression, use the\ncompress() function instead.", + "builtins.ZstdCompressor.__delattr__" => "Implement delattr(self, name).", + "builtins.ZstdCompressor.__eq__" => "Return self==value.", + "builtins.ZstdCompressor.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.ZstdCompressor.__ge__" => "Return self>=value.", + "builtins.ZstdCompressor.__getattribute__" => "Return getattr(self, name).", + "builtins.ZstdCompressor.__getstate__" => "Helper for pickle.", + "builtins.ZstdCompressor.__gt__" => "Return self>value.", + "builtins.ZstdCompressor.__hash__" => "Return hash(self).", + "builtins.ZstdCompressor.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.ZstdCompressor.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.ZstdCompressor.__le__" => "Return self<=value.", + "builtins.ZstdCompressor.__lt__" => "Return self<value.", + "builtins.ZstdCompressor.__ne__" => "Return self!=value.", + "builtins.ZstdCompressor.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.ZstdCompressor.__reduce__" => "Helper for pickle.", + "builtins.ZstdCompressor.__reduce_ex__" => "Helper for pickle.", + "builtins.ZstdCompressor.__repr__" => "Return repr(self).", + "builtins.ZstdCompressor.__setattr__" => "Implement setattr(self, name, value).", + "builtins.ZstdCompressor.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.ZstdCompressor.__str__" => "Return str(self).", + "builtins.ZstdCompressor.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.ZstdCompressor.compress" => "Provide data to the compressor object.\n\n mode\n Can be these 3 values ZstdCompressor.CONTINUE,\n ZstdCompressor.FLUSH_BLOCK, ZstdCompressor.FLUSH_FRAME\n\nReturn a chunk of compressed data if possible, or b'' otherwise.\nWhen you have finished providing data to the compressor, call the\nflush() method to finish the compression process.", + "builtins.ZstdCompressor.flush" => "Finish the compression process.\n\n mode\n Can be these 2 values ZstdCompressor.FLUSH_FRAME,\n ZstdCompressor.FLUSH_BLOCK\n\nFlush any remaining data left in internal buffers. Since Zstandard\ndata consists of one or more independent frames, the compressor\nobject can still be used after this method is called.", + "builtins.ZstdCompressor.last_mode" => "The last mode used to this compressor object, its value can be .CONTINUE,\n.FLUSH_BLOCK, .FLUSH_FRAME. Initialized to .FLUSH_FRAME.\n\nIt can be used to get the current state of a compressor, such as, data\nflushed, or a frame ended.", + "builtins.ZstdCompressor.set_pledged_input_size" => "Set the uncompressed content size to be written into the frame header.\n\n size\n The size of the uncompressed data to be provided to the compressor.\n\nThis method can be used to ensure the header of the frame about to\nbe written includes the size of the data, unless the\nCompressionParameter.content_size_flag is set to False.\nIf last_mode != FLUSH_FRAME, then a RuntimeError is raised.\n\nIt is important to ensure that the pledged data size matches the\nactual data size. If they do not match the compressed output data\nmay be corrupted and the final chunk written may be lost.", + "builtins.ZstdDecompressor" => "Create a decompressor object for decompressing data incrementally.\n\n zstd_dict\n A ZstdDict object, a pre-trained Zstandard dictionary.\n options\n A dict object that contains advanced decompression parameters.\n\nThread-safe at method level. For one-shot decompression, use the\ndecompress() function instead.", + "builtins.ZstdDecompressor.__delattr__" => "Implement delattr(self, name).", + "builtins.ZstdDecompressor.__eq__" => "Return self==value.", + "builtins.ZstdDecompressor.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.ZstdDecompressor.__ge__" => "Return self>=value.", + "builtins.ZstdDecompressor.__getattribute__" => "Return getattr(self, name).", + "builtins.ZstdDecompressor.__getstate__" => "Helper for pickle.", + "builtins.ZstdDecompressor.__gt__" => "Return self>value.", + "builtins.ZstdDecompressor.__hash__" => "Return hash(self).", + "builtins.ZstdDecompressor.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.ZstdDecompressor.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.ZstdDecompressor.__le__" => "Return self<=value.", + "builtins.ZstdDecompressor.__lt__" => "Return self<value.", + "builtins.ZstdDecompressor.__ne__" => "Return self!=value.", + "builtins.ZstdDecompressor.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.ZstdDecompressor.__reduce__" => "Helper for pickle.", + "builtins.ZstdDecompressor.__reduce_ex__" => "Helper for pickle.", + "builtins.ZstdDecompressor.__repr__" => "Return repr(self).", + "builtins.ZstdDecompressor.__setattr__" => "Implement setattr(self, name, value).", + "builtins.ZstdDecompressor.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.ZstdDecompressor.__str__" => "Return str(self).", + "builtins.ZstdDecompressor.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.ZstdDecompressor.decompress" => "Decompress *data*, returning uncompressed bytes if possible, or b'' otherwise.\n\n data\n A bytes-like object, Zstandard data to be decompressed.\n max_length\n Maximum size of returned data. When it is negative, the size of\n output buffer is unlimited. When it is nonnegative, returns at\n most max_length bytes of decompressed data.\n\nIf *max_length* is nonnegative, returns at most *max_length* bytes\nof decompressed data. If this limit is reached and further output\ncan be produced, *self.needs_input* will be set to ``False``. In\nthis case, the next call to *decompress()* may provide *data* as b''\nto obtain more of the output.\n\nIf all of the input data was decompressed and returned (either\nbecause this was less than *max_length* bytes, or because\n*max_length* was negative), *self.needs_input* will be set to True.\n\nAttempting to decompress data after the end of a frame is reached\nraises an EOFError. Any data found after the end of the frame is\nignored and saved in the self.unused_data attribute.", + "builtins.ZstdDecompressor.eof" => "True means the end of the first frame has been reached. If decompress data\nafter that, an EOFError exception will be raised.", + "builtins.ZstdDecompressor.needs_input" => "If the max_length output limit in .decompress() method has been reached,\nand the decompressor has (or may has) unconsumed input data, it will be set\nto False. In this case, passing b'' to the .decompress() method may output\nfurther data.", + "builtins.ZstdDecompressor.unused_data" => "A bytes object of un-consumed input data.\n\nWhen ZstdDecompressor object stops after a frame is\ndecompressed, unused input data after the frame. Otherwise this\nwill be b''.", + "builtins.ZstdDict" => "Represents a Zstandard dictionary.\n\n dict_content\n The content of a Zstandard dictionary as a bytes-like object.\n is_raw\n If true, perform no checks on *dict_content*, useful for some\n advanced cases. Otherwise, check that the content represents\n a Zstandard dictionary created by the zstd library or CLI.\n\nThe dictionary can be used for compression or decompression, and can be\nshared by multiple ZstdCompressor or ZstdDecompressor objects.", + "builtins.ZstdDict.__delattr__" => "Implement delattr(self, name).", + "builtins.ZstdDict.__eq__" => "Return self==value.", + "builtins.ZstdDict.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.ZstdDict.__ge__" => "Return self>=value.", + "builtins.ZstdDict.__getattribute__" => "Return getattr(self, name).", + "builtins.ZstdDict.__getstate__" => "Helper for pickle.", + "builtins.ZstdDict.__gt__" => "Return self>value.", + "builtins.ZstdDict.__hash__" => "Return hash(self).", + "builtins.ZstdDict.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.ZstdDict.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.ZstdDict.__le__" => "Return self<=value.", + "builtins.ZstdDict.__len__" => "Return len(self).", + "builtins.ZstdDict.__lt__" => "Return self<value.", + "builtins.ZstdDict.__ne__" => "Return self!=value.", + "builtins.ZstdDict.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.ZstdDict.__reduce__" => "Helper for pickle.", + "builtins.ZstdDict.__reduce_ex__" => "Helper for pickle.", + "builtins.ZstdDict.__repr__" => "Return repr(self).", + "builtins.ZstdDict.__setattr__" => "Implement setattr(self, name, value).", + "builtins.ZstdDict.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.ZstdDict.__str__" => "Return str(self).", + "builtins.ZstdDict.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.ZstdDict.as_digested_dict" => "Load as a digested dictionary to compressor.\n\nPass this attribute as zstd_dict argument:\ncompress(dat, zstd_dict=zd.as_digested_dict)\n\n1. Some advanced compression parameters of compressor may be\n overridden by parameters of digested dictionary.\n2. ZstdDict has a digested dictionaries cache for each compression\n level. It's faster when loading again a digested dictionary with\n the same compression level.\n3. No need to use this for decompression.", + "builtins.ZstdDict.as_prefix" => "Load as a prefix to compressor/decompressor.\n\nPass this attribute as zstd_dict argument:\ncompress(dat, zstd_dict=zd.as_prefix)\n\n1. Prefix is compatible with long distance matching, while\n dictionary is not.\n2. It only works for the first frame, then the\n compressor/decompressor will return to no prefix state.\n3. When decompressing, must use the same prefix as when compressing.", + "builtins.ZstdDict.as_undigested_dict" => "Load as an undigested dictionary to compressor.\n\nPass this attribute as zstd_dict argument:\ncompress(dat, zstd_dict=zd.as_undigested_dict)\n\n1. The advanced compression parameters of compressor will not be\n overridden.\n2. Loading an undigested dictionary is costly. If load an undigested\n dictionary multiple times, consider reusing a compressor object.\n3. No need to use this for decompression.", + "builtins.ZstdDict.dict_content" => "The content of a Zstandard dictionary, as a bytes object.", + "builtins.ZstdDict.dict_id" => "The Zstandard dictionary, an int between 0 and 2**32.\n\nA non-zero value represents an ordinary Zstandard dictionary,\nconforming to the standardised format.\n\nA value of zero indicates a 'raw content' dictionary,\nwithout any restrictions on format or content.", + "builtins._AbstractEventLoopPolicy" => "Abstract policy for accessing the event loop.", + "builtins._AbstractEventLoopPolicy.__delattr__" => "Implement delattr(self, name).", + "builtins._AbstractEventLoopPolicy.__eq__" => "Return self==value.", + "builtins._AbstractEventLoopPolicy.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._AbstractEventLoopPolicy.__ge__" => "Return self>=value.", + "builtins._AbstractEventLoopPolicy.__getattribute__" => "Return getattr(self, name).", + "builtins._AbstractEventLoopPolicy.__getstate__" => "Helper for pickle.", + "builtins._AbstractEventLoopPolicy.__gt__" => "Return self>value.", + "builtins._AbstractEventLoopPolicy.__hash__" => "Return hash(self).", + "builtins._AbstractEventLoopPolicy.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._AbstractEventLoopPolicy.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._AbstractEventLoopPolicy.__le__" => "Return self<=value.", + "builtins._AbstractEventLoopPolicy.__lt__" => "Return self<value.", + "builtins._AbstractEventLoopPolicy.__ne__" => "Return self!=value.", + "builtins._AbstractEventLoopPolicy.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._AbstractEventLoopPolicy.__reduce__" => "Helper for pickle.", + "builtins._AbstractEventLoopPolicy.__reduce_ex__" => "Helper for pickle.", + "builtins._AbstractEventLoopPolicy.__repr__" => "Return repr(self).", + "builtins._AbstractEventLoopPolicy.__setattr__" => "Implement setattr(self, name, value).", + "builtins._AbstractEventLoopPolicy.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._AbstractEventLoopPolicy.__str__" => "Return str(self).", + "builtins._AbstractEventLoopPolicy.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._AbstractEventLoopPolicy.__weakref__" => "list of weak references to the object", + "builtins._AbstractEventLoopPolicy.get_event_loop" => "Get the event loop for the current context.\n\nReturns an event loop object implementing the AbstractEventLoop interface,\nor raises an exception in case no event loop has been set for the\ncurrent context and the current policy does not specify to create one.\n\nIt should never return None.", + "builtins._AbstractEventLoopPolicy.new_event_loop" => "Create and return a new event loop object according to this\npolicy's rules. If there's need to set this loop as the event loop for\nthe current context, set_event_loop must be called explicitly.", + "builtins._AbstractEventLoopPolicy.set_event_loop" => "Set the event loop for the current context to loop.", + "builtins._AcquireFutures" => "A context manager that does an ordered acquire of Future conditions.", + "builtins._AcquireFutures.__delattr__" => "Implement delattr(self, name).", + "builtins._AcquireFutures.__eq__" => "Return self==value.", + "builtins._AcquireFutures.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._AcquireFutures.__ge__" => "Return self>=value.", + "builtins._AcquireFutures.__getattribute__" => "Return getattr(self, name).", + "builtins._AcquireFutures.__getstate__" => "Helper for pickle.", + "builtins._AcquireFutures.__gt__" => "Return self>value.", + "builtins._AcquireFutures.__hash__" => "Return hash(self).", + "builtins._AcquireFutures.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._AcquireFutures.__le__" => "Return self<=value.", + "builtins._AcquireFutures.__lt__" => "Return self<value.", + "builtins._AcquireFutures.__ne__" => "Return self!=value.", + "builtins._AcquireFutures.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._AcquireFutures.__reduce__" => "Helper for pickle.", + "builtins._AcquireFutures.__reduce_ex__" => "Helper for pickle.", + "builtins._AcquireFutures.__repr__" => "Return repr(self).", + "builtins._AcquireFutures.__setattr__" => "Implement setattr(self, name, value).", + "builtins._AcquireFutures.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._AcquireFutures.__str__" => "Return str(self).", + "builtins._AcquireFutures.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._AcquireFutures.__weakref__" => "list of weak references to the object", + "builtins._ActionsContainer.__delattr__" => "Implement delattr(self, name).", + "builtins._ActionsContainer.__eq__" => "Return self==value.", + "builtins._ActionsContainer.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._ActionsContainer.__ge__" => "Return self>=value.", + "builtins._ActionsContainer.__getattribute__" => "Return getattr(self, name).", + "builtins._ActionsContainer.__getstate__" => "Helper for pickle.", + "builtins._ActionsContainer.__gt__" => "Return self>value.", + "builtins._ActionsContainer.__hash__" => "Return hash(self).", + "builtins._ActionsContainer.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._ActionsContainer.__le__" => "Return self<=value.", + "builtins._ActionsContainer.__lt__" => "Return self<value.", + "builtins._ActionsContainer.__ne__" => "Return self!=value.", + "builtins._ActionsContainer.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._ActionsContainer.__reduce__" => "Helper for pickle.", + "builtins._ActionsContainer.__reduce_ex__" => "Helper for pickle.", + "builtins._ActionsContainer.__repr__" => "Return repr(self).", + "builtins._ActionsContainer.__setattr__" => "Implement setattr(self, name, value).", + "builtins._ActionsContainer.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._ActionsContainer.__str__" => "Return str(self).", + "builtins._ActionsContainer.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._ActionsContainer.__weakref__" => "list of weak references to the object", + "builtins._ActionsContainer.add_argument" => "add_argument(dest, ..., name=value, ...)\nadd_argument(option_string, option_string, ..., name=value, ...)", + "builtins._AddedDllDirectory.__delattr__" => "Implement delattr(self, name).", + "builtins._AddedDllDirectory.__eq__" => "Return self==value.", + "builtins._AddedDllDirectory.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._AddedDllDirectory.__ge__" => "Return self>=value.", + "builtins._AddedDllDirectory.__getattribute__" => "Return getattr(self, name).", + "builtins._AddedDllDirectory.__getstate__" => "Helper for pickle.", + "builtins._AddedDllDirectory.__gt__" => "Return self>value.", + "builtins._AddedDllDirectory.__hash__" => "Return hash(self).", + "builtins._AddedDllDirectory.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._AddedDllDirectory.__le__" => "Return self<=value.", + "builtins._AddedDllDirectory.__lt__" => "Return self<value.", + "builtins._AddedDllDirectory.__ne__" => "Return self!=value.", + "builtins._AddedDllDirectory.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._AddedDllDirectory.__reduce__" => "Helper for pickle.", + "builtins._AddedDllDirectory.__reduce_ex__" => "Helper for pickle.", + "builtins._AddedDllDirectory.__setattr__" => "Implement setattr(self, name, value).", + "builtins._AddedDllDirectory.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._AddedDllDirectory.__str__" => "Return str(self).", + "builtins._AddedDllDirectory.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._AddedDllDirectory.__weakref__" => "list of weak references to the object", + "builtins._AsCompletedIterator" => "Iterator of awaitables representing tasks of asyncio.as_completed.\n\nAs an asynchronous iterator, iteration yields futures as they finish. As a\nplain iterator, new coroutines are yielded that will return or raise the\nresult of the next underlying future to complete.", + "builtins._AsCompletedIterator.__delattr__" => "Implement delattr(self, name).", + "builtins._AsCompletedIterator.__eq__" => "Return self==value.", + "builtins._AsCompletedIterator.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._AsCompletedIterator.__ge__" => "Return self>=value.", + "builtins._AsCompletedIterator.__getattribute__" => "Return getattr(self, name).", + "builtins._AsCompletedIterator.__getstate__" => "Helper for pickle.", + "builtins._AsCompletedIterator.__gt__" => "Return self>value.", + "builtins._AsCompletedIterator.__hash__" => "Return hash(self).", + "builtins._AsCompletedIterator.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._AsCompletedIterator.__le__" => "Return self<=value.", + "builtins._AsCompletedIterator.__lt__" => "Return self<value.", + "builtins._AsCompletedIterator.__ne__" => "Return self!=value.", + "builtins._AsCompletedIterator.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._AsCompletedIterator.__reduce__" => "Helper for pickle.", + "builtins._AsCompletedIterator.__reduce_ex__" => "Helper for pickle.", + "builtins._AsCompletedIterator.__repr__" => "Return repr(self).", + "builtins._AsCompletedIterator.__setattr__" => "Implement setattr(self, name, value).", + "builtins._AsCompletedIterator.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._AsCompletedIterator.__str__" => "Return str(self).", + "builtins._AsCompletedIterator.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._AsCompletedIterator.__weakref__" => "list of weak references to the object", + "builtins._AttributeHolder" => "Abstract base class that provides __repr__.\n\nThe __repr__ method returns a string in the format::\n ClassName(attr=name, attr=name, ...)\nThe attributes are determined either by a class-level attribute,\n'_kwarg_names', or by inspecting the instance __dict__.", + "builtins._AttributeHolder.__delattr__" => "Implement delattr(self, name).", + "builtins._AttributeHolder.__eq__" => "Return self==value.", + "builtins._AttributeHolder.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._AttributeHolder.__ge__" => "Return self>=value.", + "builtins._AttributeHolder.__getattribute__" => "Return getattr(self, name).", + "builtins._AttributeHolder.__getstate__" => "Helper for pickle.", + "builtins._AttributeHolder.__gt__" => "Return self>value.", + "builtins._AttributeHolder.__hash__" => "Return hash(self).", + "builtins._AttributeHolder.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._AttributeHolder.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._AttributeHolder.__le__" => "Return self<=value.", + "builtins._AttributeHolder.__lt__" => "Return self<value.", + "builtins._AttributeHolder.__ne__" => "Return self!=value.", + "builtins._AttributeHolder.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._AttributeHolder.__reduce__" => "Helper for pickle.", + "builtins._AttributeHolder.__reduce_ex__" => "Helper for pickle.", + "builtins._AttributeHolder.__setattr__" => "Implement setattr(self, name, value).", + "builtins._AttributeHolder.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._AttributeHolder.__str__" => "Return str(self).", + "builtins._AttributeHolder.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._AttributeHolder.__weakref__" => "list of weak references to the object", + "builtins._Authenticator" => "Private class to provide en/decoding\nfor base64-based authentication conversation.", + "builtins._Authenticator.__delattr__" => "Implement delattr(self, name).", + "builtins._Authenticator.__eq__" => "Return self==value.", + "builtins._Authenticator.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._Authenticator.__ge__" => "Return self>=value.", + "builtins._Authenticator.__getattribute__" => "Return getattr(self, name).", + "builtins._Authenticator.__getstate__" => "Helper for pickle.", + "builtins._Authenticator.__gt__" => "Return self>value.", + "builtins._Authenticator.__hash__" => "Return hash(self).", + "builtins._Authenticator.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._Authenticator.__le__" => "Return self<=value.", + "builtins._Authenticator.__lt__" => "Return self<value.", + "builtins._Authenticator.__ne__" => "Return self!=value.", + "builtins._Authenticator.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._Authenticator.__reduce__" => "Helper for pickle.", + "builtins._Authenticator.__reduce_ex__" => "Helper for pickle.", + "builtins._Authenticator.__repr__" => "Return repr(self).", + "builtins._Authenticator.__setattr__" => "Implement setattr(self, name, value).", + "builtins._Authenticator.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._Authenticator.__str__" => "Return str(self).", + "builtins._Authenticator.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._Authenticator.__weakref__" => "list of weak references to the object", + "builtins._BaseConstants.__delattr__" => "Implement delattr(self, name).", + "builtins._BaseConstants.__eq__" => "Return self==value.", + "builtins._BaseConstants.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._BaseConstants.__ge__" => "Return self>=value.", + "builtins._BaseConstants.__getattribute__" => "Return getattr(self, name).", + "builtins._BaseConstants.__getstate__" => "Helper for pickle.", + "builtins._BaseConstants.__gt__" => "Return self>value.", + "builtins._BaseConstants.__hash__" => "Return hash(self).", + "builtins._BaseConstants.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._BaseConstants.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._BaseConstants.__le__" => "Return self<=value.", + "builtins._BaseConstants.__lt__" => "Return self<value.", + "builtins._BaseConstants.__ne__" => "Return self!=value.", + "builtins._BaseConstants.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._BaseConstants.__reduce__" => "Helper for pickle.", + "builtins._BaseConstants.__reduce_ex__" => "Helper for pickle.", + "builtins._BaseConstants.__repr__" => "Return repr(self).", + "builtins._BaseConstants.__setattr__" => "Implement setattr(self, name, value).", + "builtins._BaseConstants.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._BaseConstants.__str__" => "Return str(self).", + "builtins._BaseConstants.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._BaseConstants.__weakref__" => "list of weak references to the object", + "builtins._BaseExitStack" => "A base class for ExitStack and AsyncExitStack.", + "builtins._BaseExitStack.__delattr__" => "Implement delattr(self, name).", + "builtins._BaseExitStack.__eq__" => "Return self==value.", + "builtins._BaseExitStack.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._BaseExitStack.__ge__" => "Return self>=value.", + "builtins._BaseExitStack.__getattribute__" => "Return getattr(self, name).", + "builtins._BaseExitStack.__getstate__" => "Helper for pickle.", + "builtins._BaseExitStack.__gt__" => "Return self>value.", + "builtins._BaseExitStack.__hash__" => "Return hash(self).", + "builtins._BaseExitStack.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._BaseExitStack.__le__" => "Return self<=value.", + "builtins._BaseExitStack.__lt__" => "Return self<value.", + "builtins._BaseExitStack.__ne__" => "Return self!=value.", + "builtins._BaseExitStack.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._BaseExitStack.__reduce__" => "Helper for pickle.", + "builtins._BaseExitStack.__reduce_ex__" => "Helper for pickle.", + "builtins._BaseExitStack.__repr__" => "Return repr(self).", + "builtins._BaseExitStack.__setattr__" => "Implement setattr(self, name, value).", + "builtins._BaseExitStack.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._BaseExitStack.__str__" => "Return str(self).", + "builtins._BaseExitStack.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._BaseExitStack.__weakref__" => "list of weak references to the object", + "builtins._BaseExitStack._push_cm_exit" => "Helper to correctly register callbacks to __exit__ methods.", + "builtins._BaseExitStack.callback" => "Registers an arbitrary callback and arguments.\n\nCannot suppress exceptions.", + "builtins._BaseExitStack.enter_context" => "Enters the supplied context manager.\n\nIf successful, also pushes its __exit__ method as a callback and\nreturns the result of the __enter__ method.", + "builtins._BaseExitStack.pop_all" => "Preserve the context stack by transferring it to a new instance.", + "builtins._BaseExitStack.push" => "Registers a callback with the standard __exit__ method signature.\n\nCan suppress exceptions the same way __exit__ method can.\nAlso accepts any object with an __exit__ method (registering a call\nto the method instead of the object itself).", + "builtins._BaseTestCaseContext.__delattr__" => "Implement delattr(self, name).", + "builtins._BaseTestCaseContext.__eq__" => "Return self==value.", + "builtins._BaseTestCaseContext.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._BaseTestCaseContext.__ge__" => "Return self>=value.", + "builtins._BaseTestCaseContext.__getattribute__" => "Return getattr(self, name).", + "builtins._BaseTestCaseContext.__getstate__" => "Helper for pickle.", + "builtins._BaseTestCaseContext.__gt__" => "Return self>value.", + "builtins._BaseTestCaseContext.__hash__" => "Return hash(self).", + "builtins._BaseTestCaseContext.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._BaseTestCaseContext.__le__" => "Return self<=value.", + "builtins._BaseTestCaseContext.__lt__" => "Return self<value.", + "builtins._BaseTestCaseContext.__ne__" => "Return self!=value.", + "builtins._BaseTestCaseContext.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._BaseTestCaseContext.__reduce__" => "Helper for pickle.", + "builtins._BaseTestCaseContext.__reduce_ex__" => "Helper for pickle.", + "builtins._BaseTestCaseContext.__repr__" => "Return repr(self).", + "builtins._BaseTestCaseContext.__setattr__" => "Implement setattr(self, name, value).", + "builtins._BaseTestCaseContext.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._BaseTestCaseContext.__str__" => "Return str(self).", + "builtins._BaseTestCaseContext.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._BaseTestCaseContext.__weakref__" => "list of weak references to the object", + "builtins._BaseV4" => "Base IPv4 object.\n\nThe following methods are used by IPv4 objects in both single IP\naddresses and networks.", + "builtins._BaseV4.__delattr__" => "Implement delattr(self, name).", + "builtins._BaseV4.__eq__" => "Return self==value.", + "builtins._BaseV4.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._BaseV4.__ge__" => "Return self>=value.", + "builtins._BaseV4.__getattribute__" => "Return getattr(self, name).", + "builtins._BaseV4.__getstate__" => "Helper for pickle.", + "builtins._BaseV4.__gt__" => "Return self>value.", + "builtins._BaseV4.__hash__" => "Return hash(self).", + "builtins._BaseV4.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._BaseV4.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._BaseV4.__le__" => "Return self<=value.", + "builtins._BaseV4.__lt__" => "Return self<value.", + "builtins._BaseV4.__ne__" => "Return self!=value.", + "builtins._BaseV4.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._BaseV4.__reduce__" => "Helper for pickle.", + "builtins._BaseV4.__reduce_ex__" => "Helper for pickle.", + "builtins._BaseV4.__repr__" => "Return repr(self).", + "builtins._BaseV4.__setattr__" => "Implement setattr(self, name, value).", + "builtins._BaseV4.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._BaseV4.__str__" => "Return str(self).", + "builtins._BaseV4.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._BaseV4._ip_int_from_string" => "Turn the given IP string into an integer for comparison.\n\nArgs:\n ip_str: A string, the IP ip_str.\n\nReturns:\n The IP ip_str as an integer.\n\nRaises:\n AddressValueError: if ip_str isn't a valid IPv4 Address.", + "builtins._BaseV4._make_netmask" => "Make a (netmask, prefix_len) tuple from the given argument.\n\nArgument can be:\n- an integer (the prefix length)\n- a string representing the prefix length (e.g. \"24\")\n- a string representing the prefix netmask (e.g. \"255.255.255.0\")", + "builtins._BaseV4._parse_octet" => "Convert a decimal octet into an integer.\n\nArgs:\n octet_str: A string, the number to parse.\n\nReturns:\n The octet as an integer.\n\nRaises:\n ValueError: if the octet isn't strictly a decimal from [0..255].", + "builtins._BaseV4._reverse_pointer" => "Return the reverse DNS pointer name for the IPv4 address.\n\nThis implements the method described in RFC1035 3.5.", + "builtins._BaseV4._string_from_ip_int" => "Turns a 32-bit integer into dotted decimal notation.\n\nArgs:\n ip_int: An integer, the IP address.\n\nReturns:\n The IP address as a string in dotted decimal notation.", + "builtins._BaseV6" => "Base IPv6 object.\n\nThe following methods are used by IPv6 objects in both single IP\naddresses and networks.", + "builtins._BaseV6.__delattr__" => "Implement delattr(self, name).", + "builtins._BaseV6.__eq__" => "Return self==value.", + "builtins._BaseV6.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._BaseV6.__ge__" => "Return self>=value.", + "builtins._BaseV6.__getattribute__" => "Return getattr(self, name).", + "builtins._BaseV6.__getstate__" => "Helper for pickle.", + "builtins._BaseV6.__gt__" => "Return self>value.", + "builtins._BaseV6.__hash__" => "Return hash(self).", + "builtins._BaseV6.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._BaseV6.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._BaseV6.__le__" => "Return self<=value.", + "builtins._BaseV6.__lt__" => "Return self<value.", + "builtins._BaseV6.__ne__" => "Return self!=value.", + "builtins._BaseV6.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._BaseV6.__reduce__" => "Helper for pickle.", + "builtins._BaseV6.__reduce_ex__" => "Helper for pickle.", + "builtins._BaseV6.__repr__" => "Return repr(self).", + "builtins._BaseV6.__setattr__" => "Implement setattr(self, name, value).", + "builtins._BaseV6.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._BaseV6.__str__" => "Return str(self).", + "builtins._BaseV6.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._BaseV6._compress_hextets" => "Compresses a list of hextets.\n\nCompresses a list of strings, replacing the longest continuous\nsequence of \"0\" in the list with \"\" and adding empty strings at\nthe beginning or at the end of the string such that subsequently\ncalling \":\".join(hextets) will produce the compressed version of\nthe IPv6 address.\n\nArgs:\n hextets: A list of strings, the hextets to compress.\n\nReturns:\n A list of strings.", + "builtins._BaseV6._explode_shorthand_ip_string" => "Expand a shortened IPv6 address.\n\nReturns:\n A string, the expanded IPv6 address.", + "builtins._BaseV6._ip_int_from_string" => "Turn an IPv6 ip_str into an integer.\n\nArgs:\n ip_str: A string, the IPv6 ip_str.\n\nReturns:\n An int, the IPv6 address\n\nRaises:\n AddressValueError: if ip_str isn't a valid IPv6 Address.", + "builtins._BaseV6._make_netmask" => "Make a (netmask, prefix_len) tuple from the given argument.\n\nArgument can be:\n- an integer (the prefix length)\n- a string representing the prefix length (e.g. \"24\")\n- a string representing the prefix netmask (e.g. \"255.255.255.0\")", + "builtins._BaseV6._parse_hextet" => "Convert an IPv6 hextet string into an integer.\n\nArgs:\n hextet_str: A string, the number to parse.\n\nReturns:\n The hextet as an integer.\n\nRaises:\n ValueError: if the input isn't strictly a hex number from\n [0..FFFF].", + "builtins._BaseV6._reverse_pointer" => "Return the reverse DNS pointer name for the IPv6 address.\n\nThis implements the method described in RFC3596 2.5.", + "builtins._BaseV6._split_scope_id" => "Helper function to parse IPv6 string address with scope id.\n\nSee RFC 4007 for details.\n\nArgs:\n ip_str: A string, the IPv6 address.\n\nReturns:\n (addr, scope_id) tuple.", + "builtins._BaseV6._string_from_ip_int" => "Turns a 128-bit integer into hexadecimal notation.\n\nArgs:\n ip_int: An integer, the IP address.\n\nReturns:\n A string, the hexadecimal representation of the address.\n\nRaises:\n ValueError: The address is bigger than 128 bits of all ones.", + "builtins._BinaryPlistParser" => "Read or write a binary plist file, following the description of the binary\nformat. Raise InvalidFileException in case of error, otherwise return the\nroot object.\n\nsee also: http://opensource.apple.com/source/CF/CF-744.18/CFBinaryPList.c", + "builtins._BinaryPlistParser.__delattr__" => "Implement delattr(self, name).", + "builtins._BinaryPlistParser.__eq__" => "Return self==value.", + "builtins._BinaryPlistParser.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._BinaryPlistParser.__ge__" => "Return self>=value.", + "builtins._BinaryPlistParser.__getattribute__" => "Return getattr(self, name).", + "builtins._BinaryPlistParser.__getstate__" => "Helper for pickle.", + "builtins._BinaryPlistParser.__gt__" => "Return self>value.", + "builtins._BinaryPlistParser.__hash__" => "Return hash(self).", + "builtins._BinaryPlistParser.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._BinaryPlistParser.__le__" => "Return self<=value.", + "builtins._BinaryPlistParser.__lt__" => "Return self<value.", + "builtins._BinaryPlistParser.__ne__" => "Return self!=value.", + "builtins._BinaryPlistParser.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._BinaryPlistParser.__reduce__" => "Helper for pickle.", + "builtins._BinaryPlistParser.__reduce_ex__" => "Helper for pickle.", + "builtins._BinaryPlistParser.__repr__" => "Return repr(self).", + "builtins._BinaryPlistParser.__setattr__" => "Implement setattr(self, name, value).", + "builtins._BinaryPlistParser.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._BinaryPlistParser.__str__" => "Return str(self).", + "builtins._BinaryPlistParser.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._BinaryPlistParser.__weakref__" => "list of weak references to the object", + "builtins._BinaryPlistParser._get_size" => "return the size of the next object.", + "builtins._BinaryPlistParser._read_object" => "read the object by reference.\n\nMay recursively read sub-objects (content of an array/dict/set)", + "builtins._BinaryPlistWriter.__delattr__" => "Implement delattr(self, name).", + "builtins._BinaryPlistWriter.__eq__" => "Return self==value.", + "builtins._BinaryPlistWriter.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._BinaryPlistWriter.__ge__" => "Return self>=value.", + "builtins._BinaryPlistWriter.__getattribute__" => "Return getattr(self, name).", + "builtins._BinaryPlistWriter.__getstate__" => "Helper for pickle.", + "builtins._BinaryPlistWriter.__gt__" => "Return self>value.", + "builtins._BinaryPlistWriter.__hash__" => "Return hash(self).", + "builtins._BinaryPlistWriter.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._BinaryPlistWriter.__le__" => "Return self<=value.", + "builtins._BinaryPlistWriter.__lt__" => "Return self<value.", + "builtins._BinaryPlistWriter.__ne__" => "Return self!=value.", + "builtins._BinaryPlistWriter.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._BinaryPlistWriter.__reduce__" => "Helper for pickle.", + "builtins._BinaryPlistWriter.__reduce_ex__" => "Helper for pickle.", + "builtins._BinaryPlistWriter.__repr__" => "Return repr(self).", + "builtins._BinaryPlistWriter.__setattr__" => "Implement setattr(self, name, value).", + "builtins._BinaryPlistWriter.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._BinaryPlistWriter.__str__" => "Return str(self).", + "builtins._BinaryPlistWriter.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._BinaryPlistWriter.__weakref__" => "list of weak references to the object", + "builtins._BlockingOnManager" => "A context manager responsible to updating ``_blocking_on``.", + "builtins._BlockingOnManager.__delattr__" => "Implement delattr(self, name).", + "builtins._BlockingOnManager.__enter__" => "Mark the running thread as waiting for self.lock. via _blocking_on.", + "builtins._BlockingOnManager.__eq__" => "Return self==value.", + "builtins._BlockingOnManager.__exit__" => "Remove self.lock from this thread's _blocking_on list.", + "builtins._BlockingOnManager.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._BlockingOnManager.__ge__" => "Return self>=value.", + "builtins._BlockingOnManager.__getattribute__" => "Return getattr(self, name).", + "builtins._BlockingOnManager.__getstate__" => "Helper for pickle.", + "builtins._BlockingOnManager.__gt__" => "Return self>value.", + "builtins._BlockingOnManager.__hash__" => "Return hash(self).", + "builtins._BlockingOnManager.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._BlockingOnManager.__le__" => "Return self<=value.", + "builtins._BlockingOnManager.__lt__" => "Return self<value.", + "builtins._BlockingOnManager.__ne__" => "Return self!=value.", + "builtins._BlockingOnManager.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._BlockingOnManager.__reduce__" => "Helper for pickle.", + "builtins._BlockingOnManager.__reduce_ex__" => "Helper for pickle.", + "builtins._BlockingOnManager.__repr__" => "Return repr(self).", + "builtins._BlockingOnManager.__setattr__" => "Implement setattr(self, name, value).", + "builtins._BlockingOnManager.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._BlockingOnManager.__str__" => "Return str(self).", + "builtins._BlockingOnManager.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._BlockingOnManager.__weakref__" => "list of weak references to the object", + "builtins._BytesIOBuffer.__buffer__" => "Return a buffer object that exposes the underlying memory of the object.", + "builtins._BytesIOBuffer.__delattr__" => "Implement delattr(self, name).", + "builtins._BytesIOBuffer.__eq__" => "Return self==value.", + "builtins._BytesIOBuffer.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._BytesIOBuffer.__ge__" => "Return self>=value.", + "builtins._BytesIOBuffer.__getattribute__" => "Return getattr(self, name).", + "builtins._BytesIOBuffer.__getstate__" => "Helper for pickle.", + "builtins._BytesIOBuffer.__gt__" => "Return self>value.", + "builtins._BytesIOBuffer.__hash__" => "Return hash(self).", + "builtins._BytesIOBuffer.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._BytesIOBuffer.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._BytesIOBuffer.__le__" => "Return self<=value.", + "builtins._BytesIOBuffer.__lt__" => "Return self<value.", + "builtins._BytesIOBuffer.__ne__" => "Return self!=value.", + "builtins._BytesIOBuffer.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._BytesIOBuffer.__reduce__" => "Helper for pickle.", + "builtins._BytesIOBuffer.__reduce_ex__" => "Helper for pickle.", + "builtins._BytesIOBuffer.__release_buffer__" => "Release the buffer object that exposes the underlying memory of the object.", + "builtins._BytesIOBuffer.__repr__" => "Return repr(self).", + "builtins._BytesIOBuffer.__setattr__" => "Implement setattr(self, name, value).", + "builtins._BytesIOBuffer.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._BytesIOBuffer.__str__" => "Return str(self).", + "builtins._BytesIOBuffer.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._C.__delattr__" => "Implement delattr(self, name).", + "builtins._C.__eq__" => "Return self==value.", + "builtins._C.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._C.__ge__" => "Return self>=value.", + "builtins._C.__getattribute__" => "Return getattr(self, name).", + "builtins._C.__getstate__" => "Helper for pickle.", + "builtins._C.__gt__" => "Return self>value.", + "builtins._C.__hash__" => "Return hash(self).", + "builtins._C.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._C.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._C.__le__" => "Return self<=value.", + "builtins._C.__lt__" => "Return self<value.", + "builtins._C.__ne__" => "Return self!=value.", + "builtins._C.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._C.__reduce__" => "Helper for pickle.", + "builtins._C.__reduce_ex__" => "Helper for pickle.", + "builtins._C.__repr__" => "Return repr(self).", + "builtins._C.__setattr__" => "Implement setattr(self, name, value).", + "builtins._C.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._C.__str__" => "Return str(self).", + "builtins._C.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._C.__weakref__" => "list of weak references to the object", + "builtins._CData" => "XXX to be provided", + "builtins._CData.__buffer__" => "Return a buffer object that exposes the underlying memory of the object.", + "builtins._CData.__ctypes_from_outparam__" => "default __ctypes_from_outparam__ method returns self.", + "builtins._CData.__delattr__" => "Implement delattr(self, name).", + "builtins._CData.__eq__" => "Return self==value.", + "builtins._CData.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._CData.__ge__" => "Return self>=value.", + "builtins._CData.__getattribute__" => "Return getattr(self, name).", + "builtins._CData.__getstate__" => "Helper for pickle.", + "builtins._CData.__gt__" => "Return self>value.", + "builtins._CData.__hash__" => "Return hash(self).", + "builtins._CData.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._CData.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._CData.__le__" => "Return self<=value.", + "builtins._CData.__lt__" => "Return self<value.", + "builtins._CData.__ne__" => "Return self!=value.", + "builtins._CData.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._CData.__reduce_ex__" => "Helper for pickle.", + "builtins._CData.__repr__" => "Return repr(self).", + "builtins._CData.__setattr__" => "Implement setattr(self, name, value).", + "builtins._CData.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._CData.__str__" => "Return str(self).", + "builtins._CData.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._CData._b_base_" => "the base object", + "builtins._CData._b_needsfree_" => "whether the object owns the memory or not", + "builtins._CData._objects" => "internal objects tree (NEVER CHANGE THIS OBJECT!)", + "builtins._Chunk.__delattr__" => "Implement delattr(self, name).", + "builtins._Chunk.__eq__" => "Return self==value.", + "builtins._Chunk.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._Chunk.__ge__" => "Return self>=value.", + "builtins._Chunk.__getattribute__" => "Return getattr(self, name).", + "builtins._Chunk.__getstate__" => "Helper for pickle.", + "builtins._Chunk.__gt__" => "Return self>value.", + "builtins._Chunk.__hash__" => "Return hash(self).", + "builtins._Chunk.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._Chunk.__le__" => "Return self<=value.", + "builtins._Chunk.__lt__" => "Return self<value.", + "builtins._Chunk.__ne__" => "Return self!=value.", + "builtins._Chunk.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._Chunk.__reduce__" => "Helper for pickle.", + "builtins._Chunk.__reduce_ex__" => "Helper for pickle.", + "builtins._Chunk.__repr__" => "Return repr(self).", + "builtins._Chunk.__setattr__" => "Implement setattr(self, name, value).", + "builtins._Chunk.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._Chunk.__str__" => "Return str(self).", + "builtins._Chunk.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._Chunk.__weakref__" => "list of weak references to the object", + "builtins._Chunk.getname" => "Return the name (ID) of the current chunk.", + "builtins._Chunk.read" => "Read at most size bytes from the chunk.\nIf size is omitted or negative, read until the end\nof the chunk.", + "builtins._Chunk.seek" => "Seek to specified position into the chunk.\nDefault position is 0 (start of chunk).\nIf the file is not seekable, this will result in an error.", + "builtins._Chunk.skip" => "Skip the rest of the chunk.\nIf you are not interested in the contents of the chunk,\nthis method should be called so that the file points to\nthe start of the next chunk.", + "builtins._CommentSpec.__delattr__" => "Implement delattr(self, name).", + "builtins._CommentSpec.__eq__" => "Return self==value.", + "builtins._CommentSpec.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._CommentSpec.__ge__" => "Return self>=value.", + "builtins._CommentSpec.__getattribute__" => "Return getattr(self, name).", + "builtins._CommentSpec.__getstate__" => "Helper for pickle.", + "builtins._CommentSpec.__gt__" => "Return self>value.", + "builtins._CommentSpec.__hash__" => "Return hash(self).", + "builtins._CommentSpec.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._CommentSpec.__le__" => "Return self<=value.", + "builtins._CommentSpec.__lt__" => "Return self<value.", + "builtins._CommentSpec.__ne__" => "Return self!=value.", + "builtins._CommentSpec.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._CommentSpec.__reduce__" => "Helper for pickle.", + "builtins._CommentSpec.__reduce_ex__" => "Helper for pickle.", + "builtins._CommentSpec.__repr__" => "Return repr(self).", + "builtins._CommentSpec.__setattr__" => "Implement setattr(self, name, value).", + "builtins._CommentSpec.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._CommentSpec.__str__" => "Return str(self).", + "builtins._CommentSpec.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._CommentSpec.__weakref__" => "list of weak references to the object", + "builtins._ConstEvaluator" => "Internal type for implementing evaluation functions.", + "builtins._ConstEvaluator.__call__" => "Call self as a function.", + "builtins._ConstEvaluator.__delattr__" => "Implement delattr(self, name).", + "builtins._ConstEvaluator.__eq__" => "Return self==value.", + "builtins._ConstEvaluator.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._ConstEvaluator.__ge__" => "Return self>=value.", + "builtins._ConstEvaluator.__getattribute__" => "Return getattr(self, name).", + "builtins._ConstEvaluator.__getstate__" => "Helper for pickle.", + "builtins._ConstEvaluator.__gt__" => "Return self>value.", + "builtins._ConstEvaluator.__hash__" => "Return hash(self).", + "builtins._ConstEvaluator.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._ConstEvaluator.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._ConstEvaluator.__le__" => "Return self<=value.", + "builtins._ConstEvaluator.__lt__" => "Return self<value.", + "builtins._ConstEvaluator.__ne__" => "Return self!=value.", + "builtins._ConstEvaluator.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._ConstEvaluator.__reduce__" => "Helper for pickle.", + "builtins._ConstEvaluator.__reduce_ex__" => "Helper for pickle.", + "builtins._ConstEvaluator.__repr__" => "Return repr(self).", + "builtins._ConstEvaluator.__setattr__" => "Implement setattr(self, name, value).", + "builtins._ConstEvaluator.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._ConstEvaluator.__str__" => "Return str(self).", + "builtins._ConstEvaluator.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._Context.__delattr__" => "Implement delattr(self, name).", + "builtins._Context.__eq__" => "Return self==value.", + "builtins._Context.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._Context.__ge__" => "Return self>=value.", + "builtins._Context.__getattribute__" => "Return getattr(self, name).", + "builtins._Context.__getstate__" => "Helper for pickle.", + "builtins._Context.__gt__" => "Return self>value.", + "builtins._Context.__hash__" => "Return hash(self).", + "builtins._Context.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._Context.__le__" => "Return self<=value.", + "builtins._Context.__lt__" => "Return self<value.", + "builtins._Context.__ne__" => "Return self!=value.", + "builtins._Context.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._Context.__reduce__" => "Helper for pickle.", + "builtins._Context.__reduce_ex__" => "Helper for pickle.", + "builtins._Context.__repr__" => "Return repr(self).", + "builtins._Context.__setattr__" => "Implement setattr(self, name, value).", + "builtins._Context.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._Context.__str__" => "Return str(self).", + "builtins._Context.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._Context.__weakref__" => "list of weak references to the object", + "builtins._ContextManager" => "Context manager class to support localcontext().\n\nSets a copy of the supplied context in __enter__() and restores\nthe previous decimal context in __exit__()", + "builtins._ContextManager.__delattr__" => "Implement delattr(self, name).", + "builtins._ContextManager.__eq__" => "Return self==value.", + "builtins._ContextManager.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._ContextManager.__ge__" => "Return self>=value.", + "builtins._ContextManager.__getattribute__" => "Return getattr(self, name).", + "builtins._ContextManager.__getstate__" => "Helper for pickle.", + "builtins._ContextManager.__gt__" => "Return self>value.", + "builtins._ContextManager.__hash__" => "Return hash(self).", + "builtins._ContextManager.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._ContextManager.__le__" => "Return self<=value.", + "builtins._ContextManager.__lt__" => "Return self<value.", + "builtins._ContextManager.__ne__" => "Return self!=value.", + "builtins._ContextManager.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._ContextManager.__reduce__" => "Helper for pickle.", + "builtins._ContextManager.__reduce_ex__" => "Helper for pickle.", + "builtins._ContextManager.__repr__" => "Return repr(self).", + "builtins._ContextManager.__setattr__" => "Implement setattr(self, name, value).", + "builtins._ContextManager.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._ContextManager.__str__" => "Return str(self).", + "builtins._ContextManager.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._ContextManager.__weakref__" => "list of weak references to the object", + "builtins._ContextManagerMixin.__delattr__" => "Implement delattr(self, name).", + "builtins._ContextManagerMixin.__eq__" => "Return self==value.", + "builtins._ContextManagerMixin.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._ContextManagerMixin.__ge__" => "Return self>=value.", + "builtins._ContextManagerMixin.__getattribute__" => "Return getattr(self, name).", + "builtins._ContextManagerMixin.__getstate__" => "Helper for pickle.", + "builtins._ContextManagerMixin.__gt__" => "Return self>value.", + "builtins._ContextManagerMixin.__hash__" => "Return hash(self).", + "builtins._ContextManagerMixin.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._ContextManagerMixin.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._ContextManagerMixin.__le__" => "Return self<=value.", + "builtins._ContextManagerMixin.__lt__" => "Return self<value.", + "builtins._ContextManagerMixin.__ne__" => "Return self!=value.", + "builtins._ContextManagerMixin.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._ContextManagerMixin.__reduce__" => "Helper for pickle.", + "builtins._ContextManagerMixin.__reduce_ex__" => "Helper for pickle.", + "builtins._ContextManagerMixin.__repr__" => "Return repr(self).", + "builtins._ContextManagerMixin.__setattr__" => "Implement setattr(self, name, value).", + "builtins._ContextManagerMixin.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._ContextManagerMixin.__str__" => "Return str(self).", + "builtins._ContextManagerMixin.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._ContextManagerMixin.__weakref__" => "list of weak references to the object", + "builtins._DataclassParams.__delattr__" => "Implement delattr(self, name).", + "builtins._DataclassParams.__eq__" => "Return self==value.", + "builtins._DataclassParams.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._DataclassParams.__ge__" => "Return self>=value.", + "builtins._DataclassParams.__getattribute__" => "Return getattr(self, name).", + "builtins._DataclassParams.__getstate__" => "Helper for pickle.", + "builtins._DataclassParams.__gt__" => "Return self>value.", + "builtins._DataclassParams.__hash__" => "Return hash(self).", + "builtins._DataclassParams.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._DataclassParams.__le__" => "Return self<=value.", + "builtins._DataclassParams.__lt__" => "Return self<value.", + "builtins._DataclassParams.__ne__" => "Return self!=value.", + "builtins._DataclassParams.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._DataclassParams.__reduce__" => "Helper for pickle.", + "builtins._DataclassParams.__reduce_ex__" => "Helper for pickle.", + "builtins._DataclassParams.__setattr__" => "Implement setattr(self, name, value).", + "builtins._DataclassParams.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._DataclassParams.__str__" => "Return str(self).", + "builtins._DataclassParams.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._DebugResult" => "Used by the TestSuite to hold previous class when running in debug.", + "builtins._DebugResult.__delattr__" => "Implement delattr(self, name).", + "builtins._DebugResult.__eq__" => "Return self==value.", + "builtins._DebugResult.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._DebugResult.__ge__" => "Return self>=value.", + "builtins._DebugResult.__getattribute__" => "Return getattr(self, name).", + "builtins._DebugResult.__getstate__" => "Helper for pickle.", + "builtins._DebugResult.__gt__" => "Return self>value.", + "builtins._DebugResult.__hash__" => "Return hash(self).", + "builtins._DebugResult.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._DebugResult.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._DebugResult.__le__" => "Return self<=value.", + "builtins._DebugResult.__lt__" => "Return self<value.", + "builtins._DebugResult.__ne__" => "Return self!=value.", + "builtins._DebugResult.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._DebugResult.__reduce__" => "Helper for pickle.", + "builtins._DebugResult.__reduce_ex__" => "Helper for pickle.", + "builtins._DebugResult.__repr__" => "Return repr(self).", + "builtins._DebugResult.__setattr__" => "Implement setattr(self, name, value).", + "builtins._DebugResult.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._DebugResult.__str__" => "Return str(self).", + "builtins._DebugResult.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._DebugResult.__weakref__" => "list of weak references to the object", + "builtins._DeleteDummyThreadOnDel" => "Helper class to remove a dummy thread from threading._active on __del__.", + "builtins._DeleteDummyThreadOnDel.__delattr__" => "Implement delattr(self, name).", + "builtins._DeleteDummyThreadOnDel.__eq__" => "Return self==value.", + "builtins._DeleteDummyThreadOnDel.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._DeleteDummyThreadOnDel.__ge__" => "Return self>=value.", + "builtins._DeleteDummyThreadOnDel.__getattribute__" => "Return getattr(self, name).", + "builtins._DeleteDummyThreadOnDel.__getstate__" => "Helper for pickle.", + "builtins._DeleteDummyThreadOnDel.__gt__" => "Return self>value.", + "builtins._DeleteDummyThreadOnDel.__hash__" => "Return hash(self).", + "builtins._DeleteDummyThreadOnDel.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._DeleteDummyThreadOnDel.__le__" => "Return self<=value.", + "builtins._DeleteDummyThreadOnDel.__lt__" => "Return self<value.", + "builtins._DeleteDummyThreadOnDel.__ne__" => "Return self!=value.", + "builtins._DeleteDummyThreadOnDel.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._DeleteDummyThreadOnDel.__reduce__" => "Helper for pickle.", + "builtins._DeleteDummyThreadOnDel.__reduce_ex__" => "Helper for pickle.", + "builtins._DeleteDummyThreadOnDel.__repr__" => "Return repr(self).", + "builtins._DeleteDummyThreadOnDel.__setattr__" => "Implement setattr(self, name, value).", + "builtins._DeleteDummyThreadOnDel.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._DeleteDummyThreadOnDel.__str__" => "Return str(self).", + "builtins._DeleteDummyThreadOnDel.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._DeleteDummyThreadOnDel.__weakref__" => "list of weak references to the object", + "builtins._DumbXMLWriter.__delattr__" => "Implement delattr(self, name).", + "builtins._DumbXMLWriter.__eq__" => "Return self==value.", + "builtins._DumbXMLWriter.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._DumbXMLWriter.__ge__" => "Return self>=value.", + "builtins._DumbXMLWriter.__getattribute__" => "Return getattr(self, name).", + "builtins._DumbXMLWriter.__getstate__" => "Helper for pickle.", + "builtins._DumbXMLWriter.__gt__" => "Return self>value.", + "builtins._DumbXMLWriter.__hash__" => "Return hash(self).", + "builtins._DumbXMLWriter.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._DumbXMLWriter.__le__" => "Return self<=value.", + "builtins._DumbXMLWriter.__lt__" => "Return self<value.", + "builtins._DumbXMLWriter.__ne__" => "Return self!=value.", + "builtins._DumbXMLWriter.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._DumbXMLWriter.__reduce__" => "Helper for pickle.", + "builtins._DumbXMLWriter.__reduce_ex__" => "Helper for pickle.", + "builtins._DumbXMLWriter.__repr__" => "Return repr(self).", + "builtins._DumbXMLWriter.__setattr__" => "Implement setattr(self, name, value).", + "builtins._DumbXMLWriter.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._DumbXMLWriter.__str__" => "Return str(self).", + "builtins._DumbXMLWriter.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._DumbXMLWriter.__weakref__" => "list of weak references to the object", + "builtins._DummyModuleLock" => "A simple _ModuleLock equivalent for Python builds without\nmulti-threading support.", + "builtins._DummyModuleLock.__delattr__" => "Implement delattr(self, name).", + "builtins._DummyModuleLock.__eq__" => "Return self==value.", + "builtins._DummyModuleLock.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._DummyModuleLock.__ge__" => "Return self>=value.", + "builtins._DummyModuleLock.__getattribute__" => "Return getattr(self, name).", + "builtins._DummyModuleLock.__getstate__" => "Helper for pickle.", + "builtins._DummyModuleLock.__gt__" => "Return self>value.", + "builtins._DummyModuleLock.__hash__" => "Return hash(self).", + "builtins._DummyModuleLock.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._DummyModuleLock.__le__" => "Return self<=value.", + "builtins._DummyModuleLock.__lt__" => "Return self<value.", + "builtins._DummyModuleLock.__ne__" => "Return self!=value.", + "builtins._DummyModuleLock.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._DummyModuleLock.__reduce__" => "Helper for pickle.", + "builtins._DummyModuleLock.__reduce_ex__" => "Helper for pickle.", + "builtins._DummyModuleLock.__setattr__" => "Implement setattr(self, name, value).", + "builtins._DummyModuleLock.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._DummyModuleLock.__str__" => "Return str(self).", + "builtins._DummyModuleLock.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._DummyModuleLock.__weakref__" => "list of weak references to the object", + "builtins._ErrorHolder" => "Placeholder for a TestCase inside a result. As far as a TestResult\nis concerned, this looks exactly like a unit test. Used to insert\narbitrary errors into a test suite run.", + "builtins._ErrorHolder.__delattr__" => "Implement delattr(self, name).", + "builtins._ErrorHolder.__eq__" => "Return self==value.", + "builtins._ErrorHolder.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._ErrorHolder.__ge__" => "Return self>=value.", + "builtins._ErrorHolder.__getattribute__" => "Return getattr(self, name).", + "builtins._ErrorHolder.__getstate__" => "Helper for pickle.", + "builtins._ErrorHolder.__gt__" => "Return self>value.", + "builtins._ErrorHolder.__hash__" => "Return hash(self).", + "builtins._ErrorHolder.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._ErrorHolder.__le__" => "Return self<=value.", + "builtins._ErrorHolder.__lt__" => "Return self<value.", + "builtins._ErrorHolder.__ne__" => "Return self!=value.", + "builtins._ErrorHolder.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._ErrorHolder.__reduce__" => "Helper for pickle.", + "builtins._ErrorHolder.__reduce_ex__" => "Helper for pickle.", + "builtins._ErrorHolder.__setattr__" => "Implement setattr(self, name, value).", + "builtins._ErrorHolder.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._ErrorHolder.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._ErrorHolder.__weakref__" => "list of weak references to the object", + "builtins._Example.__delattr__" => "Implement delattr(self, name).", + "builtins._Example.__eq__" => "Return self==value.", + "builtins._Example.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._Example.__ge__" => "Return self>=value.", + "builtins._Example.__getattribute__" => "Return getattr(self, name).", + "builtins._Example.__getstate__" => "Helper for pickle.", + "builtins._Example.__gt__" => "Return self>value.", + "builtins._Example.__hash__" => "Return hash(self).", + "builtins._Example.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._Example.__le__" => "Return self<=value.", + "builtins._Example.__lt__" => "Return self<value.", + "builtins._Example.__ne__" => "Return self!=value.", + "builtins._Example.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._Example.__reduce__" => "Helper for pickle.", + "builtins._Example.__reduce_ex__" => "Helper for pickle.", + "builtins._Example.__repr__" => "Return repr(self).", + "builtins._Example.__setattr__" => "Implement setattr(self, name, value).", + "builtins._Example.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._Example.__str__" => "Return str(self).", + "builtins._Example.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._Example.__weakref__" => "list of weak references to the object", + "builtins._ExceptionPrintContext.__delattr__" => "Implement delattr(self, name).", + "builtins._ExceptionPrintContext.__eq__" => "Return self==value.", + "builtins._ExceptionPrintContext.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._ExceptionPrintContext.__ge__" => "Return self>=value.", + "builtins._ExceptionPrintContext.__getattribute__" => "Return getattr(self, name).", + "builtins._ExceptionPrintContext.__getstate__" => "Helper for pickle.", + "builtins._ExceptionPrintContext.__gt__" => "Return self>value.", + "builtins._ExceptionPrintContext.__hash__" => "Return hash(self).", + "builtins._ExceptionPrintContext.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._ExceptionPrintContext.__le__" => "Return self<=value.", + "builtins._ExceptionPrintContext.__lt__" => "Return self<value.", + "builtins._ExceptionPrintContext.__ne__" => "Return self!=value.", + "builtins._ExceptionPrintContext.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._ExceptionPrintContext.__reduce__" => "Helper for pickle.", + "builtins._ExceptionPrintContext.__reduce_ex__" => "Helper for pickle.", + "builtins._ExceptionPrintContext.__repr__" => "Return repr(self).", + "builtins._ExceptionPrintContext.__setattr__" => "Implement setattr(self, name, value).", + "builtins._ExceptionPrintContext.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._ExceptionPrintContext.__str__" => "Return str(self).", + "builtins._ExceptionPrintContext.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._ExceptionPrintContext.__weakref__" => "list of weak references to the object", + "builtins._ExecutableTarget.__delattr__" => "Implement delattr(self, name).", + "builtins._ExecutableTarget.__eq__" => "Return self==value.", + "builtins._ExecutableTarget.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._ExecutableTarget.__ge__" => "Return self>=value.", + "builtins._ExecutableTarget.__getattribute__" => "Return getattr(self, name).", + "builtins._ExecutableTarget.__getstate__" => "Helper for pickle.", + "builtins._ExecutableTarget.__gt__" => "Return self>value.", + "builtins._ExecutableTarget.__hash__" => "Return hash(self).", + "builtins._ExecutableTarget.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._ExecutableTarget.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._ExecutableTarget.__le__" => "Return self<=value.", + "builtins._ExecutableTarget.__lt__" => "Return self<value.", + "builtins._ExecutableTarget.__ne__" => "Return self!=value.", + "builtins._ExecutableTarget.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._ExecutableTarget.__reduce__" => "Helper for pickle.", + "builtins._ExecutableTarget.__reduce_ex__" => "Helper for pickle.", + "builtins._ExecutableTarget.__repr__" => "Return repr(self).", + "builtins._ExecutableTarget.__setattr__" => "Implement setattr(self, name, value).", + "builtins._ExecutableTarget.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._ExecutableTarget.__str__" => "Return str(self).", + "builtins._ExecutableTarget.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._ExecutableTarget.__weakref__" => "list of weak references to the object", + "builtins._FIELD_BASE.__delattr__" => "Implement delattr(self, name).", + "builtins._FIELD_BASE.__eq__" => "Return self==value.", + "builtins._FIELD_BASE.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._FIELD_BASE.__ge__" => "Return self>=value.", + "builtins._FIELD_BASE.__getattribute__" => "Return getattr(self, name).", + "builtins._FIELD_BASE.__getstate__" => "Helper for pickle.", + "builtins._FIELD_BASE.__gt__" => "Return self>value.", + "builtins._FIELD_BASE.__hash__" => "Return hash(self).", + "builtins._FIELD_BASE.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._FIELD_BASE.__le__" => "Return self<=value.", + "builtins._FIELD_BASE.__lt__" => "Return self<value.", + "builtins._FIELD_BASE.__ne__" => "Return self!=value.", + "builtins._FIELD_BASE.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._FIELD_BASE.__reduce__" => "Helper for pickle.", + "builtins._FIELD_BASE.__reduce_ex__" => "Helper for pickle.", + "builtins._FIELD_BASE.__setattr__" => "Implement setattr(self, name, value).", + "builtins._FIELD_BASE.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._FIELD_BASE.__str__" => "Return str(self).", + "builtins._FIELD_BASE.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._FIELD_BASE.__weakref__" => "list of weak references to the object", + "builtins._Feature.__delattr__" => "Implement delattr(self, name).", + "builtins._Feature.__eq__" => "Return self==value.", + "builtins._Feature.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._Feature.__ge__" => "Return self>=value.", + "builtins._Feature.__getattribute__" => "Return getattr(self, name).", + "builtins._Feature.__getstate__" => "Helper for pickle.", + "builtins._Feature.__gt__" => "Return self>value.", + "builtins._Feature.__hash__" => "Return hash(self).", + "builtins._Feature.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._Feature.__le__" => "Return self<=value.", + "builtins._Feature.__lt__" => "Return self<value.", + "builtins._Feature.__ne__" => "Return self!=value.", + "builtins._Feature.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._Feature.__reduce__" => "Helper for pickle.", + "builtins._Feature.__reduce_ex__" => "Helper for pickle.", + "builtins._Feature.__setattr__" => "Implement setattr(self, name, value).", + "builtins._Feature.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._Feature.__str__" => "Return str(self).", + "builtins._Feature.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._Feature.__weakref__" => "list of weak references to the object", + "builtins._Feature.getMandatoryRelease" => "Return release in which this feature will become mandatory.\n\nThis is a 5-tuple, of the same form as sys.version_info, or, if\nthe feature was dropped, or the release date is undetermined, is None.", + "builtins._Feature.getOptionalRelease" => "Return first release in which this feature was recognized.\n\nThis is a 5-tuple, of the same form as sys.version_info.", + "builtins._FileInFile" => "A thin wrapper around an existing file object that\nprovides a part of its data as an individual file\nobject.", + "builtins._FileInFile.__delattr__" => "Implement delattr(self, name).", + "builtins._FileInFile.__eq__" => "Return self==value.", + "builtins._FileInFile.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._FileInFile.__ge__" => "Return self>=value.", + "builtins._FileInFile.__getattribute__" => "Return getattr(self, name).", + "builtins._FileInFile.__getstate__" => "Helper for pickle.", + "builtins._FileInFile.__gt__" => "Return self>value.", + "builtins._FileInFile.__hash__" => "Return hash(self).", + "builtins._FileInFile.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._FileInFile.__le__" => "Return self<=value.", + "builtins._FileInFile.__lt__" => "Return self<value.", + "builtins._FileInFile.__ne__" => "Return self!=value.", + "builtins._FileInFile.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._FileInFile.__reduce__" => "Helper for pickle.", + "builtins._FileInFile.__reduce_ex__" => "Helper for pickle.", + "builtins._FileInFile.__repr__" => "Return repr(self).", + "builtins._FileInFile.__setattr__" => "Implement setattr(self, name, value).", + "builtins._FileInFile.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._FileInFile.__str__" => "Return str(self).", + "builtins._FileInFile.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._FileInFile.__weakref__" => "list of weak references to the object", + "builtins._FileInFile.read" => "Read data from the file.", + "builtins._FileInFile.seek" => "Seek to a position in the file.", + "builtins._FileInFile.tell" => "Return the current file position.", + "builtins._Final" => "Mixin to prohibit subclassing.", + "builtins._Final.__delattr__" => "Implement delattr(self, name).", + "builtins._Final.__eq__" => "Return self==value.", + "builtins._Final.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._Final.__ge__" => "Return self>=value.", + "builtins._Final.__getattribute__" => "Return getattr(self, name).", + "builtins._Final.__getstate__" => "Helper for pickle.", + "builtins._Final.__gt__" => "Return self>value.", + "builtins._Final.__hash__" => "Return hash(self).", + "builtins._Final.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._Final.__le__" => "Return self<=value.", + "builtins._Final.__lt__" => "Return self<value.", + "builtins._Final.__ne__" => "Return self!=value.", + "builtins._Final.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._Final.__reduce__" => "Helper for pickle.", + "builtins._Final.__reduce_ex__" => "Helper for pickle.", + "builtins._Final.__repr__" => "Return repr(self).", + "builtins._Final.__setattr__" => "Implement setattr(self, name, value).", + "builtins._Final.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._Final.__str__" => "Return str(self).", + "builtins._Final.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._Final.__weakref__" => "list of weak references to the object", + "builtins._Framer.__delattr__" => "Implement delattr(self, name).", + "builtins._Framer.__eq__" => "Return self==value.", + "builtins._Framer.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._Framer.__ge__" => "Return self>=value.", + "builtins._Framer.__getattribute__" => "Return getattr(self, name).", + "builtins._Framer.__getstate__" => "Helper for pickle.", + "builtins._Framer.__gt__" => "Return self>value.", + "builtins._Framer.__hash__" => "Return hash(self).", + "builtins._Framer.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._Framer.__le__" => "Return self<=value.", + "builtins._Framer.__lt__" => "Return self<value.", + "builtins._Framer.__ne__" => "Return self!=value.", + "builtins._Framer.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._Framer.__reduce__" => "Helper for pickle.", + "builtins._Framer.__reduce_ex__" => "Helper for pickle.", + "builtins._Framer.__repr__" => "Return repr(self).", + "builtins._Framer.__setattr__" => "Implement setattr(self, name, value).", + "builtins._Framer.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._Framer.__str__" => "Return str(self).", + "builtins._Framer.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._Framer.__weakref__" => "list of weak references to the object", + "builtins._FuncBuilder.__delattr__" => "Implement delattr(self, name).", + "builtins._FuncBuilder.__eq__" => "Return self==value.", + "builtins._FuncBuilder.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._FuncBuilder.__ge__" => "Return self>=value.", + "builtins._FuncBuilder.__getattribute__" => "Return getattr(self, name).", + "builtins._FuncBuilder.__getstate__" => "Helper for pickle.", + "builtins._FuncBuilder.__gt__" => "Return self>value.", + "builtins._FuncBuilder.__hash__" => "Return hash(self).", + "builtins._FuncBuilder.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._FuncBuilder.__le__" => "Return self<=value.", + "builtins._FuncBuilder.__lt__" => "Return self<value.", + "builtins._FuncBuilder.__ne__" => "Return self!=value.", + "builtins._FuncBuilder.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._FuncBuilder.__reduce__" => "Helper for pickle.", + "builtins._FuncBuilder.__reduce_ex__" => "Helper for pickle.", + "builtins._FuncBuilder.__repr__" => "Return repr(self).", + "builtins._FuncBuilder.__setattr__" => "Implement setattr(self, name, value).", + "builtins._FuncBuilder.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._FuncBuilder.__str__" => "Return str(self).", + "builtins._FuncBuilder.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._FuncBuilder.__weakref__" => "list of weak references to the object", + "builtins._GeneratorContextManagerBase" => "Shared functionality for @contextmanager and @asynccontextmanager.", + "builtins._GeneratorContextManagerBase.__delattr__" => "Implement delattr(self, name).", + "builtins._GeneratorContextManagerBase.__eq__" => "Return self==value.", + "builtins._GeneratorContextManagerBase.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._GeneratorContextManagerBase.__ge__" => "Return self>=value.", + "builtins._GeneratorContextManagerBase.__getattribute__" => "Return getattr(self, name).", + "builtins._GeneratorContextManagerBase.__getstate__" => "Helper for pickle.", + "builtins._GeneratorContextManagerBase.__gt__" => "Return self>value.", + "builtins._GeneratorContextManagerBase.__hash__" => "Return hash(self).", + "builtins._GeneratorContextManagerBase.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._GeneratorContextManagerBase.__le__" => "Return self<=value.", + "builtins._GeneratorContextManagerBase.__lt__" => "Return self<value.", + "builtins._GeneratorContextManagerBase.__ne__" => "Return self!=value.", + "builtins._GeneratorContextManagerBase.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._GeneratorContextManagerBase.__reduce__" => "Helper for pickle.", + "builtins._GeneratorContextManagerBase.__reduce_ex__" => "Helper for pickle.", + "builtins._GeneratorContextManagerBase.__repr__" => "Return repr(self).", + "builtins._GeneratorContextManagerBase.__setattr__" => "Implement setattr(self, name, value).", + "builtins._GeneratorContextManagerBase.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._GeneratorContextManagerBase.__str__" => "Return str(self).", + "builtins._GeneratorContextManagerBase.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._GeneratorContextManagerBase.__weakref__" => "list of weak references to the object", + "builtins._GeneratorWrapper.__delattr__" => "Implement delattr(self, name).", + "builtins._GeneratorWrapper.__eq__" => "Return self==value.", + "builtins._GeneratorWrapper.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._GeneratorWrapper.__ge__" => "Return self>=value.", + "builtins._GeneratorWrapper.__getattribute__" => "Return getattr(self, name).", + "builtins._GeneratorWrapper.__getstate__" => "Helper for pickle.", + "builtins._GeneratorWrapper.__gt__" => "Return self>value.", + "builtins._GeneratorWrapper.__hash__" => "Return hash(self).", + "builtins._GeneratorWrapper.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._GeneratorWrapper.__le__" => "Return self<=value.", + "builtins._GeneratorWrapper.__lt__" => "Return self<value.", + "builtins._GeneratorWrapper.__ne__" => "Return self!=value.", + "builtins._GeneratorWrapper.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._GeneratorWrapper.__reduce__" => "Helper for pickle.", + "builtins._GeneratorWrapper.__reduce_ex__" => "Helper for pickle.", + "builtins._GeneratorWrapper.__repr__" => "Return repr(self).", + "builtins._GeneratorWrapper.__setattr__" => "Implement setattr(self, name, value).", + "builtins._GeneratorWrapper.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._GeneratorWrapper.__str__" => "Return str(self).", + "builtins._GeneratorWrapper.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._GeneratorWrapper.__weakref__" => "list of weak references to the object", + "builtins._GlobberBase" => "Abstract class providing shell-style pattern matching and globbing.", + "builtins._GlobberBase.__delattr__" => "Implement delattr(self, name).", + "builtins._GlobberBase.__eq__" => "Return self==value.", + "builtins._GlobberBase.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._GlobberBase.__ge__" => "Return self>=value.", + "builtins._GlobberBase.__getattribute__" => "Return getattr(self, name).", + "builtins._GlobberBase.__getstate__" => "Helper for pickle.", + "builtins._GlobberBase.__gt__" => "Return self>value.", + "builtins._GlobberBase.__hash__" => "Return hash(self).", + "builtins._GlobberBase.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._GlobberBase.__le__" => "Return self<=value.", + "builtins._GlobberBase.__lt__" => "Return self<value.", + "builtins._GlobberBase.__ne__" => "Return self!=value.", + "builtins._GlobberBase.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._GlobberBase.__reduce__" => "Helper for pickle.", + "builtins._GlobberBase.__reduce_ex__" => "Helper for pickle.", + "builtins._GlobberBase.__repr__" => "Return repr(self).", + "builtins._GlobberBase.__setattr__" => "Implement setattr(self, name, value).", + "builtins._GlobberBase.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._GlobberBase.__str__" => "Return str(self).", + "builtins._GlobberBase.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._GlobberBase.__weakref__" => "list of weak references to the object", + "builtins._GlobberBase.concat_path" => "Implements path concatenation.", + "builtins._GlobberBase.lexists" => "Implements os.path.lexists().", + "builtins._GlobberBase.literal_selector" => "Returns a function that selects a literal descendant of a path.", + "builtins._GlobberBase.recursive_selector" => "Returns a function that selects a given path and all its children,\nrecursively, filtering by pattern.", + "builtins._GlobberBase.scandir" => "Like os.scandir(), but generates (entry, name, path) tuples.", + "builtins._GlobberBase.select_exists" => "Yields the given path, if it exists.", + "builtins._GlobberBase.selector" => "Returns a function that selects from a given path, walking and\nfiltering according to the glob-style pattern parts in *parts*.", + "builtins._GlobberBase.special_selector" => "Returns a function that selects special children of the given path.", + "builtins._GlobberBase.wildcard_selector" => "Returns a function that selects direct children of a given path,\nfiltering by pattern.", + "builtins._HAS_DEFAULT_FACTORY_CLASS.__delattr__" => "Implement delattr(self, name).", + "builtins._HAS_DEFAULT_FACTORY_CLASS.__eq__" => "Return self==value.", + "builtins._HAS_DEFAULT_FACTORY_CLASS.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._HAS_DEFAULT_FACTORY_CLASS.__ge__" => "Return self>=value.", + "builtins._HAS_DEFAULT_FACTORY_CLASS.__getattribute__" => "Return getattr(self, name).", + "builtins._HAS_DEFAULT_FACTORY_CLASS.__getstate__" => "Helper for pickle.", + "builtins._HAS_DEFAULT_FACTORY_CLASS.__gt__" => "Return self>value.", + "builtins._HAS_DEFAULT_FACTORY_CLASS.__hash__" => "Return hash(self).", + "builtins._HAS_DEFAULT_FACTORY_CLASS.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._HAS_DEFAULT_FACTORY_CLASS.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._HAS_DEFAULT_FACTORY_CLASS.__le__" => "Return self<=value.", + "builtins._HAS_DEFAULT_FACTORY_CLASS.__lt__" => "Return self<value.", + "builtins._HAS_DEFAULT_FACTORY_CLASS.__ne__" => "Return self!=value.", + "builtins._HAS_DEFAULT_FACTORY_CLASS.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._HAS_DEFAULT_FACTORY_CLASS.__reduce__" => "Helper for pickle.", + "builtins._HAS_DEFAULT_FACTORY_CLASS.__reduce_ex__" => "Helper for pickle.", + "builtins._HAS_DEFAULT_FACTORY_CLASS.__setattr__" => "Implement setattr(self, name, value).", + "builtins._HAS_DEFAULT_FACTORY_CLASS.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._HAS_DEFAULT_FACTORY_CLASS.__str__" => "Return str(self).", + "builtins._HAS_DEFAULT_FACTORY_CLASS.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._HAS_DEFAULT_FACTORY_CLASS.__weakref__" => "list of weak references to the object", + "builtins._Helper" => "Define the builtin 'help'.\n\nThis is a wrapper around pydoc.help that provides a helpful message\nwhen 'help' is typed at the Python interactive prompt.\n\nCalling help() at the Python prompt starts an interactive help session.\nCalling help(thing) prints help for the python object 'thing'.", + "builtins._Helper.__delattr__" => "Implement delattr(self, name).", + "builtins._Helper.__eq__" => "Return self==value.", + "builtins._Helper.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._Helper.__ge__" => "Return self>=value.", + "builtins._Helper.__getattribute__" => "Return getattr(self, name).", + "builtins._Helper.__getstate__" => "Helper for pickle.", + "builtins._Helper.__gt__" => "Return self>value.", + "builtins._Helper.__hash__" => "Return hash(self).", + "builtins._Helper.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._Helper.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._Helper.__le__" => "Return self<=value.", + "builtins._Helper.__lt__" => "Return self<value.", + "builtins._Helper.__ne__" => "Return self!=value.", + "builtins._Helper.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._Helper.__reduce__" => "Helper for pickle.", + "builtins._Helper.__reduce_ex__" => "Helper for pickle.", + "builtins._Helper.__setattr__" => "Implement setattr(self, name, value).", + "builtins._Helper.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._Helper.__str__" => "Return str(self).", + "builtins._Helper.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._Helper.__weakref__" => "list of weak references to the object", + "builtins._IOBase" => "The abstract base class for all I/O classes.\n\nThis class provides dummy implementations for many methods that\nderived classes can override selectively; the default implementations\nrepresent a file that cannot be read, written or seeked.\n\nEven though IOBase does not declare read, readinto, or write because\ntheir signatures will vary, implementations and clients should\nconsider those methods part of the interface. Also, implementations\nmay raise UnsupportedOperation when operations they do not support are\ncalled.\n\nThe basic type used for binary data read from or written to a file is\nbytes. Other bytes-like objects are accepted as method arguments too.\nIn some cases (such as readinto), a writable object is required. Text\nI/O classes work with str data.\n\nNote that calling any method (except additional calls to close(),\nwhich are ignored) on a closed stream should raise a ValueError.\n\nIOBase (and its subclasses) support the iterator protocol, meaning\nthat an IOBase object can be iterated over yielding the lines in a\nstream.\n\nIOBase also supports the :keyword:`with` statement. In this example,\nfp is closed after the suite of the with statement is complete:\n\nwith open('spam.txt', 'r') as fp:\n fp.write('Spam and eggs!')", + "builtins._IOBase.__del__" => "Called when the instance is about to be destroyed.", + "builtins._IOBase.__delattr__" => "Implement delattr(self, name).", + "builtins._IOBase.__eq__" => "Return self==value.", + "builtins._IOBase.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._IOBase.__ge__" => "Return self>=value.", + "builtins._IOBase.__getattribute__" => "Return getattr(self, name).", + "builtins._IOBase.__getstate__" => "Helper for pickle.", + "builtins._IOBase.__gt__" => "Return self>value.", + "builtins._IOBase.__hash__" => "Return hash(self).", + "builtins._IOBase.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._IOBase.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._IOBase.__iter__" => "Implement iter(self).", + "builtins._IOBase.__le__" => "Return self<=value.", + "builtins._IOBase.__lt__" => "Return self<value.", + "builtins._IOBase.__ne__" => "Return self!=value.", + "builtins._IOBase.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._IOBase.__next__" => "Implement next(self).", + "builtins._IOBase.__reduce__" => "Helper for pickle.", + "builtins._IOBase.__reduce_ex__" => "Helper for pickle.", + "builtins._IOBase.__repr__" => "Return repr(self).", + "builtins._IOBase.__setattr__" => "Implement setattr(self, name, value).", + "builtins._IOBase.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._IOBase.__str__" => "Return str(self).", + "builtins._IOBase.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._IOBase.close" => "Flush and close the IO object.\n\nThis method has no effect if the file is already closed.", + "builtins._IOBase.fileno" => "Return underlying file descriptor if one exists.\n\nRaise OSError if the IO object does not use a file descriptor.", + "builtins._IOBase.flush" => "Flush write buffers, if applicable.\n\nThis is not implemented for read-only and non-blocking streams.", + "builtins._IOBase.isatty" => "Return whether this is an 'interactive' stream.\n\nReturn False if it can't be determined.", + "builtins._IOBase.readable" => "Return whether object was opened for reading.\n\nIf False, read() will raise OSError.", + "builtins._IOBase.readline" => "Read and return a line from the stream.\n\nIf size is specified, at most size bytes will be read.\n\nThe line terminator is always b'\\n' for binary files; for text\nfiles, the newlines argument to open can be used to select the line\nterminator(s) recognized.", + "builtins._IOBase.readlines" => "Return a list of lines from the stream.\n\nhint can be specified to control the number of lines read: no more\nlines will be read if the total size (in bytes/characters) of all\nlines so far exceeds hint.", + "builtins._IOBase.seek" => "Change the stream position to the given byte offset.\n\n offset\n The stream position, relative to 'whence'.\n whence\n The relative position to seek from.\n\nThe offset is interpreted relative to the position indicated by\nwhence. Values for whence are:\n\n* os.SEEK_SET or 0 -- start of stream (the default); offset should\n be zero or positive\n* os.SEEK_CUR or 1 -- current stream position; offset may be\n negative\n* os.SEEK_END or 2 -- end of stream; offset is usually negative\n\nReturn the new absolute position.", + "builtins._IOBase.seekable" => "Return whether object supports random access.\n\nIf False, seek(), tell() and truncate() will raise OSError.\nThis method may need to do a test seek().", + "builtins._IOBase.tell" => "Return current stream position.", + "builtins._IOBase.truncate" => "Truncate file to size bytes.\n\nFile pointer is left unchanged. Size defaults to the current IO\nposition as reported by tell(). Return the new size.", + "builtins._IOBase.writable" => "Return whether object was opened for writing.\n\nIf False, write() will raise OSError.", + "builtins._IOBase.writelines" => "Write a list of lines to stream.\n\nLine separators are not added, so it is usual for each of the\nlines provided to have a line separator at the end.", + "builtins._IPAddressBase" => "The mother class.", + "builtins._IPAddressBase.__delattr__" => "Implement delattr(self, name).", + "builtins._IPAddressBase.__eq__" => "Return self==value.", + "builtins._IPAddressBase.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._IPAddressBase.__ge__" => "Return self>=value.", + "builtins._IPAddressBase.__getattribute__" => "Return getattr(self, name).", + "builtins._IPAddressBase.__getstate__" => "Helper for pickle.", + "builtins._IPAddressBase.__gt__" => "Return self>value.", + "builtins._IPAddressBase.__hash__" => "Return hash(self).", + "builtins._IPAddressBase.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._IPAddressBase.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._IPAddressBase.__le__" => "Return self<=value.", + "builtins._IPAddressBase.__lt__" => "Return self<value.", + "builtins._IPAddressBase.__ne__" => "Return self!=value.", + "builtins._IPAddressBase.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._IPAddressBase.__reduce_ex__" => "Helper for pickle.", + "builtins._IPAddressBase.__repr__" => "Return repr(self).", + "builtins._IPAddressBase.__setattr__" => "Implement setattr(self, name, value).", + "builtins._IPAddressBase.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._IPAddressBase.__str__" => "Return str(self).", + "builtins._IPAddressBase.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._IPAddressBase._ip_int_from_prefix" => "Turn the prefix length into a bitwise netmask\n\nArgs:\n prefixlen: An integer, the prefix length.\n\nReturns:\n An integer.", + "builtins._IPAddressBase._prefix_from_ip_int" => "Return prefix length from the bitwise netmask.\n\nArgs:\n ip_int: An integer, the netmask in expanded bitwise format\n\nReturns:\n An integer, the prefix length.\n\nRaises:\n ValueError: If the input intermingles zeroes & ones", + "builtins._IPAddressBase._prefix_from_ip_string" => "Turn a netmask/hostmask string into a prefix length\n\nArgs:\n ip_str: The netmask/hostmask to be converted\n\nReturns:\n An integer, the prefix length.\n\nRaises:\n NetmaskValueError: If the input is not a valid netmask/hostmask", + "builtins._IPAddressBase._prefix_from_prefix_string" => "Return prefix length from a numeric string\n\nArgs:\n prefixlen_str: The string to be converted\n\nReturns:\n An integer, the prefix length.\n\nRaises:\n NetmaskValueError: If the input is not a valid netmask", + "builtins._IPAddressBase._split_addr_prefix" => "Helper function to parse address of Network/Interface.\n\nArg:\n address: Argument of Network/Interface.\n\nReturns:\n (addr, prefix) tuple.", + "builtins._IPAddressBase.compressed" => "Return the shorthand version of the IP address as a string.", + "builtins._IPAddressBase.exploded" => "Return the longhand version of the IP address as a string.", + "builtins._IPAddressBase.reverse_pointer" => "The name of the reverse DNS pointer for the IP address, e.g.:\n>>> ipaddress.ip_address(\"127.0.0.1\").reverse_pointer\n'1.0.0.127.in-addr.arpa'\n>>> ipaddress.ip_address(\"2001:db8::1\").reverse_pointer\n'1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.8.b.d.0.1.0.0.2.ip6.arpa'", + "builtins._IPv4Constants.__delattr__" => "Implement delattr(self, name).", + "builtins._IPv4Constants.__eq__" => "Return self==value.", + "builtins._IPv4Constants.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._IPv4Constants.__ge__" => "Return self>=value.", + "builtins._IPv4Constants.__getattribute__" => "Return getattr(self, name).", + "builtins._IPv4Constants.__getstate__" => "Helper for pickle.", + "builtins._IPv4Constants.__gt__" => "Return self>value.", + "builtins._IPv4Constants.__hash__" => "Return hash(self).", + "builtins._IPv4Constants.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._IPv4Constants.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._IPv4Constants.__le__" => "Return self<=value.", + "builtins._IPv4Constants.__lt__" => "Return self<value.", + "builtins._IPv4Constants.__ne__" => "Return self!=value.", + "builtins._IPv4Constants.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._IPv4Constants.__reduce__" => "Helper for pickle.", + "builtins._IPv4Constants.__reduce_ex__" => "Helper for pickle.", + "builtins._IPv4Constants.__repr__" => "Return repr(self).", + "builtins._IPv4Constants.__setattr__" => "Implement setattr(self, name, value).", + "builtins._IPv4Constants.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._IPv4Constants.__str__" => "Return str(self).", + "builtins._IPv4Constants.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._IPv4Constants.__weakref__" => "list of weak references to the object", + "builtins._IPv6Constants.__delattr__" => "Implement delattr(self, name).", + "builtins._IPv6Constants.__eq__" => "Return self==value.", + "builtins._IPv6Constants.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._IPv6Constants.__ge__" => "Return self>=value.", + "builtins._IPv6Constants.__getattribute__" => "Return getattr(self, name).", + "builtins._IPv6Constants.__getstate__" => "Helper for pickle.", + "builtins._IPv6Constants.__gt__" => "Return self>value.", + "builtins._IPv6Constants.__hash__" => "Return hash(self).", + "builtins._IPv6Constants.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._IPv6Constants.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._IPv6Constants.__le__" => "Return self<=value.", + "builtins._IPv6Constants.__lt__" => "Return self<value.", + "builtins._IPv6Constants.__ne__" => "Return self!=value.", + "builtins._IPv6Constants.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._IPv6Constants.__reduce__" => "Helper for pickle.", + "builtins._IPv6Constants.__reduce_ex__" => "Helper for pickle.", + "builtins._IPv6Constants.__repr__" => "Return repr(self).", + "builtins._IPv6Constants.__setattr__" => "Implement setattr(self, name, value).", + "builtins._IPv6Constants.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._IPv6Constants.__str__" => "Return str(self).", + "builtins._IPv6Constants.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._IPv6Constants.__weakref__" => "list of weak references to the object", + "builtins._Ignore.__delattr__" => "Implement delattr(self, name).", + "builtins._Ignore.__eq__" => "Return self==value.", + "builtins._Ignore.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._Ignore.__ge__" => "Return self>=value.", + "builtins._Ignore.__getattribute__" => "Return getattr(self, name).", + "builtins._Ignore.__getstate__" => "Helper for pickle.", + "builtins._Ignore.__gt__" => "Return self>value.", + "builtins._Ignore.__hash__" => "Return hash(self).", + "builtins._Ignore.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._Ignore.__le__" => "Return self<=value.", + "builtins._Ignore.__lt__" => "Return self<value.", + "builtins._Ignore.__ne__" => "Return self!=value.", + "builtins._Ignore.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._Ignore.__reduce__" => "Helper for pickle.", + "builtins._Ignore.__reduce_ex__" => "Helper for pickle.", + "builtins._Ignore.__repr__" => "Return repr(self).", + "builtins._Ignore.__setattr__" => "Implement setattr(self, name, value).", + "builtins._Ignore.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._Ignore.__str__" => "Return str(self).", + "builtins._Ignore.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._Ignore.__weakref__" => "list of weak references to the object", + "builtins._ImportLockContext" => "Context manager for the import lock.", + "builtins._ImportLockContext.__delattr__" => "Implement delattr(self, name).", + "builtins._ImportLockContext.__enter__" => "Acquire the import lock.", + "builtins._ImportLockContext.__eq__" => "Return self==value.", + "builtins._ImportLockContext.__exit__" => "Release the import lock regardless of any raised exceptions.", + "builtins._ImportLockContext.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._ImportLockContext.__ge__" => "Return self>=value.", + "builtins._ImportLockContext.__getattribute__" => "Return getattr(self, name).", + "builtins._ImportLockContext.__getstate__" => "Helper for pickle.", + "builtins._ImportLockContext.__gt__" => "Return self>value.", + "builtins._ImportLockContext.__hash__" => "Return hash(self).", + "builtins._ImportLockContext.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._ImportLockContext.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._ImportLockContext.__le__" => "Return self<=value.", + "builtins._ImportLockContext.__lt__" => "Return self<value.", + "builtins._ImportLockContext.__ne__" => "Return self!=value.", + "builtins._ImportLockContext.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._ImportLockContext.__reduce__" => "Helper for pickle.", + "builtins._ImportLockContext.__reduce_ex__" => "Helper for pickle.", + "builtins._ImportLockContext.__repr__" => "Return repr(self).", + "builtins._ImportLockContext.__setattr__" => "Implement setattr(self, name, value).", + "builtins._ImportLockContext.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._ImportLockContext.__str__" => "Return str(self).", + "builtins._ImportLockContext.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._ImportLockContext.__weakref__" => "list of weak references to the object", "builtins._IncompleteInputError" => "incomplete input.", "builtins._IncompleteInputError.__delattr__" => "Implement delattr(self, name).", "builtins._IncompleteInputError.__eq__" => "Return self==value.", @@ -11604,13 +22346,2415 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins._IncompleteInputError.print_file_and_line" => "exception print_file_and_line", "builtins._IncompleteInputError.text" => "exception text", "builtins._IncompleteInputError.with_traceback" => "Set self.__traceback__ to tb and return self.", + "builtins._Info.__delattr__" => "Implement delattr(self, name).", + "builtins._Info.__eq__" => "Return self==value.", + "builtins._Info.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._Info.__ge__" => "Return self>=value.", + "builtins._Info.__getattribute__" => "Return getattr(self, name).", + "builtins._Info.__getstate__" => "Helper for pickle.", + "builtins._Info.__gt__" => "Return self>value.", + "builtins._Info.__hash__" => "Return hash(self).", + "builtins._Info.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._Info.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._Info.__le__" => "Return self<=value.", + "builtins._Info.__lt__" => "Return self<value.", + "builtins._Info.__ne__" => "Return self!=value.", + "builtins._Info.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._Info.__reduce__" => "Helper for pickle.", + "builtins._Info.__reduce_ex__" => "Helper for pickle.", + "builtins._Info.__repr__" => "Return repr(self).", + "builtins._Info.__setattr__" => "Implement setattr(self, name, value).", + "builtins._Info.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._Info.__str__" => "Return str(self).", + "builtins._Info.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._InterruptHandler.__delattr__" => "Implement delattr(self, name).", + "builtins._InterruptHandler.__eq__" => "Return self==value.", + "builtins._InterruptHandler.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._InterruptHandler.__ge__" => "Return self>=value.", + "builtins._InterruptHandler.__getattribute__" => "Return getattr(self, name).", + "builtins._InterruptHandler.__getstate__" => "Helper for pickle.", + "builtins._InterruptHandler.__gt__" => "Return self>value.", + "builtins._InterruptHandler.__hash__" => "Return hash(self).", + "builtins._InterruptHandler.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._InterruptHandler.__le__" => "Return self<=value.", + "builtins._InterruptHandler.__lt__" => "Return self<value.", + "builtins._InterruptHandler.__ne__" => "Return self!=value.", + "builtins._InterruptHandler.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._InterruptHandler.__reduce__" => "Helper for pickle.", + "builtins._InterruptHandler.__reduce_ex__" => "Helper for pickle.", + "builtins._InterruptHandler.__repr__" => "Return repr(self).", + "builtins._InterruptHandler.__setattr__" => "Implement setattr(self, name, value).", + "builtins._InterruptHandler.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._InterruptHandler.__str__" => "Return str(self).", + "builtins._InterruptHandler.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._InterruptHandler.__weakref__" => "list of weak references to the object", + "builtins._KW_ONLY_TYPE.__delattr__" => "Implement delattr(self, name).", + "builtins._KW_ONLY_TYPE.__eq__" => "Return self==value.", + "builtins._KW_ONLY_TYPE.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._KW_ONLY_TYPE.__ge__" => "Return self>=value.", + "builtins._KW_ONLY_TYPE.__getattribute__" => "Return getattr(self, name).", + "builtins._KW_ONLY_TYPE.__getstate__" => "Helper for pickle.", + "builtins._KW_ONLY_TYPE.__gt__" => "Return self>value.", + "builtins._KW_ONLY_TYPE.__hash__" => "Return hash(self).", + "builtins._KW_ONLY_TYPE.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._KW_ONLY_TYPE.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._KW_ONLY_TYPE.__le__" => "Return self<=value.", + "builtins._KW_ONLY_TYPE.__lt__" => "Return self<value.", + "builtins._KW_ONLY_TYPE.__ne__" => "Return self!=value.", + "builtins._KW_ONLY_TYPE.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._KW_ONLY_TYPE.__reduce__" => "Helper for pickle.", + "builtins._KW_ONLY_TYPE.__reduce_ex__" => "Helper for pickle.", + "builtins._KW_ONLY_TYPE.__repr__" => "Return repr(self).", + "builtins._KW_ONLY_TYPE.__setattr__" => "Implement setattr(self, name, value).", + "builtins._KW_ONLY_TYPE.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._KW_ONLY_TYPE.__str__" => "Return str(self).", + "builtins._KW_ONLY_TYPE.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._KW_ONLY_TYPE.__weakref__" => "list of weak references to the object", + "builtins._LazyAnnotationLib.__delattr__" => "Implement delattr(self, name).", + "builtins._LazyAnnotationLib.__eq__" => "Return self==value.", + "builtins._LazyAnnotationLib.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._LazyAnnotationLib.__ge__" => "Return self>=value.", + "builtins._LazyAnnotationLib.__getattribute__" => "Return getattr(self, name).", + "builtins._LazyAnnotationLib.__getstate__" => "Helper for pickle.", + "builtins._LazyAnnotationLib.__gt__" => "Return self>value.", + "builtins._LazyAnnotationLib.__hash__" => "Return hash(self).", + "builtins._LazyAnnotationLib.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._LazyAnnotationLib.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._LazyAnnotationLib.__le__" => "Return self<=value.", + "builtins._LazyAnnotationLib.__lt__" => "Return self<value.", + "builtins._LazyAnnotationLib.__ne__" => "Return self!=value.", + "builtins._LazyAnnotationLib.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._LazyAnnotationLib.__reduce__" => "Helper for pickle.", + "builtins._LazyAnnotationLib.__reduce_ex__" => "Helper for pickle.", + "builtins._LazyAnnotationLib.__repr__" => "Return repr(self).", + "builtins._LazyAnnotationLib.__setattr__" => "Implement setattr(self, name, value).", + "builtins._LazyAnnotationLib.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._LazyAnnotationLib.__str__" => "Return str(self).", + "builtins._LazyAnnotationLib.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._LazyAnnotationLib.__weakref__" => "list of weak references to the object", + "builtins._Link.__delattr__" => "Implement delattr(self, name).", + "builtins._Link.__eq__" => "Return self==value.", + "builtins._Link.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._Link.__ge__" => "Return self>=value.", + "builtins._Link.__getattribute__" => "Return getattr(self, name).", + "builtins._Link.__getstate__" => "Helper for pickle.", + "builtins._Link.__gt__" => "Return self>value.", + "builtins._Link.__hash__" => "Return hash(self).", + "builtins._Link.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._Link.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._Link.__le__" => "Return self<=value.", + "builtins._Link.__lt__" => "Return self<value.", + "builtins._Link.__ne__" => "Return self!=value.", + "builtins._Link.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._Link.__reduce__" => "Helper for pickle.", + "builtins._Link.__reduce_ex__" => "Helper for pickle.", + "builtins._Link.__repr__" => "Return repr(self).", + "builtins._Link.__setattr__" => "Implement setattr(self, name, value).", + "builtins._Link.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._Link.__str__" => "Return str(self).", + "builtins._Link.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._Link.__weakref__" => "list of weak references to the object", + "builtins._LoaderBasics" => "Base class of common code needed by both SourceLoader and\nSourcelessFileLoader.", + "builtins._LoaderBasics.__delattr__" => "Implement delattr(self, name).", + "builtins._LoaderBasics.__eq__" => "Return self==value.", + "builtins._LoaderBasics.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._LoaderBasics.__ge__" => "Return self>=value.", + "builtins._LoaderBasics.__getattribute__" => "Return getattr(self, name).", + "builtins._LoaderBasics.__getstate__" => "Helper for pickle.", + "builtins._LoaderBasics.__gt__" => "Return self>value.", + "builtins._LoaderBasics.__hash__" => "Return hash(self).", + "builtins._LoaderBasics.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._LoaderBasics.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._LoaderBasics.__le__" => "Return self<=value.", + "builtins._LoaderBasics.__lt__" => "Return self<value.", + "builtins._LoaderBasics.__ne__" => "Return self!=value.", + "builtins._LoaderBasics.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._LoaderBasics.__reduce__" => "Helper for pickle.", + "builtins._LoaderBasics.__reduce_ex__" => "Helper for pickle.", + "builtins._LoaderBasics.__repr__" => "Return repr(self).", + "builtins._LoaderBasics.__setattr__" => "Implement setattr(self, name, value).", + "builtins._LoaderBasics.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._LoaderBasics.__str__" => "Return str(self).", + "builtins._LoaderBasics.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._LoaderBasics.__weakref__" => "list of weak references to the object", + "builtins._LoaderBasics.create_module" => "Use default semantics for module creation.", + "builtins._LoaderBasics.exec_module" => "Execute the module.", + "builtins._LoaderBasics.is_package" => "Concrete implementation of InspectLoader.is_package by checking if\nthe path returned by get_filename has a filename of '__init__.py'.", + "builtins._LoaderBasics.load_module" => "This method is deprecated.", + "builtins._Lock.__delattr__" => "Implement delattr(self, name).", + "builtins._Lock.__eq__" => "Return self==value.", + "builtins._Lock.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._Lock.__ge__" => "Return self>=value.", + "builtins._Lock.__getattribute__" => "Return getattr(self, name).", + "builtins._Lock.__getstate__" => "Helper for pickle.", + "builtins._Lock.__gt__" => "Return self>value.", + "builtins._Lock.__hash__" => "Return hash(self).", + "builtins._Lock.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._Lock.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._Lock.__le__" => "Return self<=value.", + "builtins._Lock.__lt__" => "Return self<value.", + "builtins._Lock.__ne__" => "Return self!=value.", + "builtins._Lock.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._Lock.__reduce__" => "Helper for pickle.", + "builtins._Lock.__reduce_ex__" => "Helper for pickle.", + "builtins._Lock.__repr__" => "Return repr(self).", + "builtins._Lock.__setattr__" => "Implement setattr(self, name, value).", + "builtins._Lock.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._Lock.__str__" => "Return str(self).", + "builtins._Lock.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._Lock.__weakref__" => "list of weak references to the object", + "builtins._Log10Memoize" => "Class to compute, store, and allow retrieval of, digits of the\nconstant log(10) = 2.302585.... This constant is needed by\nDecimal.ln, Decimal.log10, Decimal.exp and Decimal.__pow__.", + "builtins._Log10Memoize.__delattr__" => "Implement delattr(self, name).", + "builtins._Log10Memoize.__eq__" => "Return self==value.", + "builtins._Log10Memoize.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._Log10Memoize.__ge__" => "Return self>=value.", + "builtins._Log10Memoize.__getattribute__" => "Return getattr(self, name).", + "builtins._Log10Memoize.__getstate__" => "Helper for pickle.", + "builtins._Log10Memoize.__gt__" => "Return self>value.", + "builtins._Log10Memoize.__hash__" => "Return hash(self).", + "builtins._Log10Memoize.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._Log10Memoize.__le__" => "Return self<=value.", + "builtins._Log10Memoize.__lt__" => "Return self<value.", + "builtins._Log10Memoize.__ne__" => "Return self!=value.", + "builtins._Log10Memoize.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._Log10Memoize.__reduce__" => "Helper for pickle.", + "builtins._Log10Memoize.__reduce_ex__" => "Helper for pickle.", + "builtins._Log10Memoize.__repr__" => "Return repr(self).", + "builtins._Log10Memoize.__setattr__" => "Implement setattr(self, name, value).", + "builtins._Log10Memoize.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._Log10Memoize.__str__" => "Return str(self).", + "builtins._Log10Memoize.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._Log10Memoize.__weakref__" => "list of weak references to the object", + "builtins._Log10Memoize.getdigits" => "Given an integer p >= 0, return floor(10**p)*log(10).\n\nFor example, self.getdigits(3) returns 2302.", + "builtins._LoopBoundMixin.__delattr__" => "Implement delattr(self, name).", + "builtins._LoopBoundMixin.__eq__" => "Return self==value.", + "builtins._LoopBoundMixin.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._LoopBoundMixin.__ge__" => "Return self>=value.", + "builtins._LoopBoundMixin.__getattribute__" => "Return getattr(self, name).", + "builtins._LoopBoundMixin.__getstate__" => "Helper for pickle.", + "builtins._LoopBoundMixin.__gt__" => "Return self>value.", + "builtins._LoopBoundMixin.__hash__" => "Return hash(self).", + "builtins._LoopBoundMixin.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._LoopBoundMixin.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._LoopBoundMixin.__le__" => "Return self<=value.", + "builtins._LoopBoundMixin.__lt__" => "Return self<value.", + "builtins._LoopBoundMixin.__ne__" => "Return self!=value.", + "builtins._LoopBoundMixin.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._LoopBoundMixin.__reduce__" => "Helper for pickle.", + "builtins._LoopBoundMixin.__reduce_ex__" => "Helper for pickle.", + "builtins._LoopBoundMixin.__repr__" => "Return repr(self).", + "builtins._LoopBoundMixin.__setattr__" => "Implement setattr(self, name, value).", + "builtins._LoopBoundMixin.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._LoopBoundMixin.__str__" => "Return str(self).", + "builtins._LoopBoundMixin.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._LoopBoundMixin.__weakref__" => "list of weak references to the object", + "builtins._LowLevelFile" => "Low-level file object. Supports reading and writing.\nIt is used instead of a regular file object for streaming\naccess.", + "builtins._LowLevelFile.__delattr__" => "Implement delattr(self, name).", + "builtins._LowLevelFile.__eq__" => "Return self==value.", + "builtins._LowLevelFile.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._LowLevelFile.__ge__" => "Return self>=value.", + "builtins._LowLevelFile.__getattribute__" => "Return getattr(self, name).", + "builtins._LowLevelFile.__getstate__" => "Helper for pickle.", + "builtins._LowLevelFile.__gt__" => "Return self>value.", + "builtins._LowLevelFile.__hash__" => "Return hash(self).", + "builtins._LowLevelFile.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._LowLevelFile.__le__" => "Return self<=value.", + "builtins._LowLevelFile.__lt__" => "Return self<value.", + "builtins._LowLevelFile.__ne__" => "Return self!=value.", + "builtins._LowLevelFile.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._LowLevelFile.__reduce__" => "Helper for pickle.", + "builtins._LowLevelFile.__reduce_ex__" => "Helper for pickle.", + "builtins._LowLevelFile.__repr__" => "Return repr(self).", + "builtins._LowLevelFile.__setattr__" => "Implement setattr(self, name, value).", + "builtins._LowLevelFile.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._LowLevelFile.__str__" => "Return str(self).", + "builtins._LowLevelFile.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._LowLevelFile.__weakref__" => "list of weak references to the object", + "builtins._MISSING_TYPE.__delattr__" => "Implement delattr(self, name).", + "builtins._MISSING_TYPE.__eq__" => "Return self==value.", + "builtins._MISSING_TYPE.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._MISSING_TYPE.__ge__" => "Return self>=value.", + "builtins._MISSING_TYPE.__getattribute__" => "Return getattr(self, name).", + "builtins._MISSING_TYPE.__getstate__" => "Helper for pickle.", + "builtins._MISSING_TYPE.__gt__" => "Return self>value.", + "builtins._MISSING_TYPE.__hash__" => "Return hash(self).", + "builtins._MISSING_TYPE.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._MISSING_TYPE.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._MISSING_TYPE.__le__" => "Return self<=value.", + "builtins._MISSING_TYPE.__lt__" => "Return self<value.", + "builtins._MISSING_TYPE.__ne__" => "Return self!=value.", + "builtins._MISSING_TYPE.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._MISSING_TYPE.__reduce__" => "Helper for pickle.", + "builtins._MISSING_TYPE.__reduce_ex__" => "Helper for pickle.", + "builtins._MISSING_TYPE.__repr__" => "Return repr(self).", + "builtins._MISSING_TYPE.__setattr__" => "Implement setattr(self, name, value).", + "builtins._MISSING_TYPE.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._MISSING_TYPE.__str__" => "Return str(self).", + "builtins._MISSING_TYPE.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._MISSING_TYPE.__weakref__" => "list of weak references to the object", + "builtins._ModifiedArgv0.__delattr__" => "Implement delattr(self, name).", + "builtins._ModifiedArgv0.__eq__" => "Return self==value.", + "builtins._ModifiedArgv0.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._ModifiedArgv0.__ge__" => "Return self>=value.", + "builtins._ModifiedArgv0.__getattribute__" => "Return getattr(self, name).", + "builtins._ModifiedArgv0.__getstate__" => "Helper for pickle.", + "builtins._ModifiedArgv0.__gt__" => "Return self>value.", + "builtins._ModifiedArgv0.__hash__" => "Return hash(self).", + "builtins._ModifiedArgv0.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._ModifiedArgv0.__le__" => "Return self<=value.", + "builtins._ModifiedArgv0.__lt__" => "Return self<value.", + "builtins._ModifiedArgv0.__ne__" => "Return self!=value.", + "builtins._ModifiedArgv0.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._ModifiedArgv0.__reduce__" => "Helper for pickle.", + "builtins._ModifiedArgv0.__reduce_ex__" => "Helper for pickle.", + "builtins._ModifiedArgv0.__repr__" => "Return repr(self).", + "builtins._ModifiedArgv0.__setattr__" => "Implement setattr(self, name, value).", + "builtins._ModifiedArgv0.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._ModifiedArgv0.__str__" => "Return str(self).", + "builtins._ModifiedArgv0.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._ModifiedArgv0.__weakref__" => "list of weak references to the object", + "builtins._ModuleLock" => "A recursive lock implementation which is able to detect deadlocks\n(e.g. thread 1 trying to take locks A then B, and thread 2 trying to\ntake locks B then A).", + "builtins._ModuleLock.__delattr__" => "Implement delattr(self, name).", + "builtins._ModuleLock.__eq__" => "Return self==value.", + "builtins._ModuleLock.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._ModuleLock.__ge__" => "Return self>=value.", + "builtins._ModuleLock.__getattribute__" => "Return getattr(self, name).", + "builtins._ModuleLock.__getstate__" => "Helper for pickle.", + "builtins._ModuleLock.__gt__" => "Return self>value.", + "builtins._ModuleLock.__hash__" => "Return hash(self).", + "builtins._ModuleLock.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._ModuleLock.__le__" => "Return self<=value.", + "builtins._ModuleLock.__lt__" => "Return self<value.", + "builtins._ModuleLock.__ne__" => "Return self!=value.", + "builtins._ModuleLock.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._ModuleLock.__reduce__" => "Helper for pickle.", + "builtins._ModuleLock.__reduce_ex__" => "Helper for pickle.", + "builtins._ModuleLock.__setattr__" => "Implement setattr(self, name, value).", + "builtins._ModuleLock.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._ModuleLock.__str__" => "Return str(self).", + "builtins._ModuleLock.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._ModuleLock.__weakref__" => "list of weak references to the object", + "builtins._ModuleLock.acquire" => "Acquire the module lock. If a potential deadlock is detected,\na _DeadlockError is raised.\nOtherwise, the lock is always acquired and True is returned.", + "builtins._ModuleLockManager.__delattr__" => "Implement delattr(self, name).", + "builtins._ModuleLockManager.__eq__" => "Return self==value.", + "builtins._ModuleLockManager.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._ModuleLockManager.__ge__" => "Return self>=value.", + "builtins._ModuleLockManager.__getattribute__" => "Return getattr(self, name).", + "builtins._ModuleLockManager.__getstate__" => "Helper for pickle.", + "builtins._ModuleLockManager.__gt__" => "Return self>value.", + "builtins._ModuleLockManager.__hash__" => "Return hash(self).", + "builtins._ModuleLockManager.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._ModuleLockManager.__le__" => "Return self<=value.", + "builtins._ModuleLockManager.__lt__" => "Return self<value.", + "builtins._ModuleLockManager.__ne__" => "Return self!=value.", + "builtins._ModuleLockManager.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._ModuleLockManager.__reduce__" => "Helper for pickle.", + "builtins._ModuleLockManager.__reduce_ex__" => "Helper for pickle.", + "builtins._ModuleLockManager.__repr__" => "Return repr(self).", + "builtins._ModuleLockManager.__setattr__" => "Implement setattr(self, name, value).", + "builtins._ModuleLockManager.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._ModuleLockManager.__str__" => "Return str(self).", + "builtins._ModuleLockManager.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._ModuleLockManager.__weakref__" => "list of weak references to the object", + "builtins._MonitoringTracer.__delattr__" => "Implement delattr(self, name).", + "builtins._MonitoringTracer.__eq__" => "Return self==value.", + "builtins._MonitoringTracer.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._MonitoringTracer.__ge__" => "Return self>=value.", + "builtins._MonitoringTracer.__getattribute__" => "Return getattr(self, name).", + "builtins._MonitoringTracer.__getstate__" => "Helper for pickle.", + "builtins._MonitoringTracer.__gt__" => "Return self>value.", + "builtins._MonitoringTracer.__hash__" => "Return hash(self).", + "builtins._MonitoringTracer.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._MonitoringTracer.__le__" => "Return self<=value.", + "builtins._MonitoringTracer.__lt__" => "Return self<value.", + "builtins._MonitoringTracer.__ne__" => "Return self!=value.", + "builtins._MonitoringTracer.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._MonitoringTracer.__reduce__" => "Helper for pickle.", + "builtins._MonitoringTracer.__reduce_ex__" => "Helper for pickle.", + "builtins._MonitoringTracer.__repr__" => "Return repr(self).", + "builtins._MonitoringTracer.__setattr__" => "Implement setattr(self, name, value).", + "builtins._MonitoringTracer.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._MonitoringTracer.__str__" => "Return str(self).", + "builtins._MonitoringTracer.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._MonitoringTracer.__weakref__" => "list of weak references to the object", + "builtins._NamespacePath" => "Represents a namespace package's path. It uses the module name\nto find its parent module, and from there it looks up the parent's\n__path__. When this changes, the module's own path is recomputed,\nusing path_finder. For top-level modules, the parent module's path\nis sys.path.", + "builtins._NamespacePath.__delattr__" => "Implement delattr(self, name).", + "builtins._NamespacePath.__eq__" => "Return self==value.", + "builtins._NamespacePath.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._NamespacePath.__ge__" => "Return self>=value.", + "builtins._NamespacePath.__getattribute__" => "Return getattr(self, name).", + "builtins._NamespacePath.__getstate__" => "Helper for pickle.", + "builtins._NamespacePath.__gt__" => "Return self>value.", + "builtins._NamespacePath.__hash__" => "Return hash(self).", + "builtins._NamespacePath.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._NamespacePath.__le__" => "Return self<=value.", + "builtins._NamespacePath.__lt__" => "Return self<value.", + "builtins._NamespacePath.__ne__" => "Return self!=value.", + "builtins._NamespacePath.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._NamespacePath.__reduce__" => "Helper for pickle.", + "builtins._NamespacePath.__reduce_ex__" => "Helper for pickle.", + "builtins._NamespacePath.__setattr__" => "Implement setattr(self, name, value).", + "builtins._NamespacePath.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._NamespacePath.__str__" => "Return str(self).", + "builtins._NamespacePath.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._NamespacePath.__weakref__" => "list of weak references to the object", + "builtins._NamespacePath._find_parent_path_names" => "Returns a tuple of (parent-module-name, parent-path-attr-name)", + "builtins._NetlocResultMixinBase" => "Shared methods for the parsed result objects containing a netloc element", + "builtins._NetlocResultMixinBase.__class_getitem__" => "Represent a PEP 585 generic type\n\nE.g. for t = list[int], t.__origin__ is list and t.__args__ is (int,).", + "builtins._NetlocResultMixinBase.__delattr__" => "Implement delattr(self, name).", + "builtins._NetlocResultMixinBase.__eq__" => "Return self==value.", + "builtins._NetlocResultMixinBase.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._NetlocResultMixinBase.__ge__" => "Return self>=value.", + "builtins._NetlocResultMixinBase.__getattribute__" => "Return getattr(self, name).", + "builtins._NetlocResultMixinBase.__getstate__" => "Helper for pickle.", + "builtins._NetlocResultMixinBase.__gt__" => "Return self>value.", + "builtins._NetlocResultMixinBase.__hash__" => "Return hash(self).", + "builtins._NetlocResultMixinBase.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._NetlocResultMixinBase.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._NetlocResultMixinBase.__le__" => "Return self<=value.", + "builtins._NetlocResultMixinBase.__lt__" => "Return self<value.", + "builtins._NetlocResultMixinBase.__ne__" => "Return self!=value.", + "builtins._NetlocResultMixinBase.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._NetlocResultMixinBase.__reduce__" => "Helper for pickle.", + "builtins._NetlocResultMixinBase.__reduce_ex__" => "Helper for pickle.", + "builtins._NetlocResultMixinBase.__repr__" => "Return repr(self).", + "builtins._NetlocResultMixinBase.__setattr__" => "Implement setattr(self, name, value).", + "builtins._NetlocResultMixinBase.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._NetlocResultMixinBase.__str__" => "Return str(self).", + "builtins._NetlocResultMixinBase.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._NoThreads" => "Degenerate version of _Threads.", + "builtins._NoThreads.__delattr__" => "Implement delattr(self, name).", + "builtins._NoThreads.__eq__" => "Return self==value.", + "builtins._NoThreads.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._NoThreads.__ge__" => "Return self>=value.", + "builtins._NoThreads.__getattribute__" => "Return getattr(self, name).", + "builtins._NoThreads.__getstate__" => "Helper for pickle.", + "builtins._NoThreads.__gt__" => "Return self>value.", + "builtins._NoThreads.__hash__" => "Return hash(self).", + "builtins._NoThreads.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._NoThreads.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._NoThreads.__le__" => "Return self<=value.", + "builtins._NoThreads.__lt__" => "Return self<value.", + "builtins._NoThreads.__ne__" => "Return self!=value.", + "builtins._NoThreads.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._NoThreads.__reduce__" => "Helper for pickle.", + "builtins._NoThreads.__reduce_ex__" => "Helper for pickle.", + "builtins._NoThreads.__repr__" => "Return repr(self).", + "builtins._NoThreads.__setattr__" => "Implement setattr(self, name, value).", + "builtins._NoThreads.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._NoThreads.__str__" => "Return str(self).", + "builtins._NoThreads.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._NoThreads.__weakref__" => "list of weak references to the object", + "builtins._NodeInfo.__delattr__" => "Implement delattr(self, name).", + "builtins._NodeInfo.__eq__" => "Return self==value.", + "builtins._NodeInfo.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._NodeInfo.__ge__" => "Return self>=value.", + "builtins._NodeInfo.__getattribute__" => "Return getattr(self, name).", + "builtins._NodeInfo.__getstate__" => "Helper for pickle.", + "builtins._NodeInfo.__gt__" => "Return self>value.", + "builtins._NodeInfo.__hash__" => "Return hash(self).", + "builtins._NodeInfo.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._NodeInfo.__le__" => "Return self<=value.", + "builtins._NodeInfo.__lt__" => "Return self<value.", + "builtins._NodeInfo.__ne__" => "Return self!=value.", + "builtins._NodeInfo.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._NodeInfo.__reduce__" => "Helper for pickle.", + "builtins._NodeInfo.__reduce_ex__" => "Helper for pickle.", + "builtins._NodeInfo.__repr__" => "Return repr(self).", + "builtins._NodeInfo.__setattr__" => "Implement setattr(self, name, value).", + "builtins._NodeInfo.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._NodeInfo.__str__" => "Return str(self).", + "builtins._NodeInfo.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._NotIterable" => "Mixin to prevent iteration, without being compatible with Iterable.\n\nThat is, we could do::\n\n def __iter__(self): raise TypeError()\n\nBut this would make users of this mixin duck type-compatible with\ncollections.abc.Iterable - isinstance(foo, Iterable) would be True.\n\nLuckily, we can instead prevent iteration by setting __iter__ to None, which\nis treated specially.", + "builtins._NotIterable.__delattr__" => "Implement delattr(self, name).", + "builtins._NotIterable.__eq__" => "Return self==value.", + "builtins._NotIterable.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._NotIterable.__ge__" => "Return self>=value.", + "builtins._NotIterable.__getattribute__" => "Return getattr(self, name).", + "builtins._NotIterable.__getstate__" => "Helper for pickle.", + "builtins._NotIterable.__gt__" => "Return self>value.", + "builtins._NotIterable.__hash__" => "Return hash(self).", + "builtins._NotIterable.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._NotIterable.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._NotIterable.__le__" => "Return self<=value.", + "builtins._NotIterable.__lt__" => "Return self<value.", + "builtins._NotIterable.__ne__" => "Return self!=value.", + "builtins._NotIterable.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._NotIterable.__reduce__" => "Helper for pickle.", + "builtins._NotIterable.__reduce_ex__" => "Helper for pickle.", + "builtins._NotIterable.__repr__" => "Return repr(self).", + "builtins._NotIterable.__setattr__" => "Implement setattr(self, name, value).", + "builtins._NotIterable.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._NotIterable.__str__" => "Return str(self).", + "builtins._NotIterable.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._Object" => "Information about Python class or function.", + "builtins._Object.__delattr__" => "Implement delattr(self, name).", + "builtins._Object.__eq__" => "Return self==value.", + "builtins._Object.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._Object.__ge__" => "Return self>=value.", + "builtins._Object.__getattribute__" => "Return getattr(self, name).", + "builtins._Object.__getstate__" => "Helper for pickle.", + "builtins._Object.__gt__" => "Return self>value.", + "builtins._Object.__hash__" => "Return hash(self).", + "builtins._Object.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._Object.__le__" => "Return self<=value.", + "builtins._Object.__lt__" => "Return self<value.", + "builtins._Object.__ne__" => "Return self!=value.", + "builtins._Object.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._Object.__reduce__" => "Helper for pickle.", + "builtins._Object.__reduce_ex__" => "Helper for pickle.", + "builtins._Object.__repr__" => "Return repr(self).", + "builtins._Object.__setattr__" => "Implement setattr(self, name, value).", + "builtins._Object.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._Object.__str__" => "Return str(self).", + "builtins._Object.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._Object.__weakref__" => "list of weak references to the object", + "builtins._Outcome.__delattr__" => "Implement delattr(self, name).", + "builtins._Outcome.__eq__" => "Return self==value.", + "builtins._Outcome.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._Outcome.__ge__" => "Return self>=value.", + "builtins._Outcome.__getattribute__" => "Return getattr(self, name).", + "builtins._Outcome.__getstate__" => "Helper for pickle.", + "builtins._Outcome.__gt__" => "Return self>value.", + "builtins._Outcome.__hash__" => "Return hash(self).", + "builtins._Outcome.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._Outcome.__le__" => "Return self<=value.", + "builtins._Outcome.__lt__" => "Return self<value.", + "builtins._Outcome.__ne__" => "Return self!=value.", + "builtins._Outcome.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._Outcome.__reduce__" => "Helper for pickle.", + "builtins._Outcome.__reduce_ex__" => "Helper for pickle.", + "builtins._Outcome.__repr__" => "Return repr(self).", + "builtins._Outcome.__setattr__" => "Implement setattr(self, name, value).", + "builtins._Outcome.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._Outcome.__str__" => "Return str(self).", + "builtins._Outcome.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._Outcome.__weakref__" => "list of weak references to the object", + "builtins._PaddedFile" => "Minimal read-only file object that prepends a string to the contents\nof an actual file. Shouldn't be used outside of gzip.py, as it lacks\nessential functionality.", + "builtins._PaddedFile.__delattr__" => "Implement delattr(self, name).", + "builtins._PaddedFile.__eq__" => "Return self==value.", + "builtins._PaddedFile.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._PaddedFile.__ge__" => "Return self>=value.", + "builtins._PaddedFile.__getattribute__" => "Return getattr(self, name).", + "builtins._PaddedFile.__getstate__" => "Helper for pickle.", + "builtins._PaddedFile.__gt__" => "Return self>value.", + "builtins._PaddedFile.__hash__" => "Return hash(self).", + "builtins._PaddedFile.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._PaddedFile.__le__" => "Return self<=value.", + "builtins._PaddedFile.__lt__" => "Return self<value.", + "builtins._PaddedFile.__ne__" => "Return self!=value.", + "builtins._PaddedFile.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._PaddedFile.__reduce__" => "Helper for pickle.", + "builtins._PaddedFile.__reduce_ex__" => "Helper for pickle.", + "builtins._PaddedFile.__repr__" => "Return repr(self).", + "builtins._PaddedFile.__setattr__" => "Implement setattr(self, name, value).", + "builtins._PaddedFile.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._PaddedFile.__str__" => "Return str(self).", + "builtins._PaddedFile.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._PaddedFile.__weakref__" => "list of weak references to the object", + "builtins._PathInfoBase.__delattr__" => "Implement delattr(self, name).", + "builtins._PathInfoBase.__eq__" => "Return self==value.", + "builtins._PathInfoBase.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._PathInfoBase.__ge__" => "Return self>=value.", + "builtins._PathInfoBase.__getattribute__" => "Return getattr(self, name).", + "builtins._PathInfoBase.__getstate__" => "Helper for pickle.", + "builtins._PathInfoBase.__gt__" => "Return self>value.", + "builtins._PathInfoBase.__hash__" => "Return hash(self).", + "builtins._PathInfoBase.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._PathInfoBase.__le__" => "Return self<=value.", + "builtins._PathInfoBase.__lt__" => "Return self<value.", + "builtins._PathInfoBase.__ne__" => "Return self!=value.", + "builtins._PathInfoBase.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._PathInfoBase.__reduce__" => "Helper for pickle.", + "builtins._PathInfoBase.__reduce_ex__" => "Helper for pickle.", + "builtins._PathInfoBase.__setattr__" => "Implement setattr(self, name, value).", + "builtins._PathInfoBase.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._PathInfoBase.__str__" => "Return str(self).", + "builtins._PathInfoBase.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._PathInfoBase._access_time_ns" => "Return the access time in nanoseconds.", + "builtins._PathInfoBase._bsd_flags" => "Return the flags.", + "builtins._PathInfoBase._file_id" => "Returns the identifier of the file.", + "builtins._PathInfoBase._mod_time_ns" => "Return the modify time in nanoseconds.", + "builtins._PathInfoBase._posix_permissions" => "Return the POSIX file permissions.", + "builtins._PathInfoBase._stat" => "Return the status as an os.stat_result, or None if stat() fails and\nignore_errors is true.", + "builtins._PathInfoBase._xattrs" => "Return the xattrs as a list of (attr, value) pairs, or an empty\nlist if extended attributes aren't supported.", + "builtins._PdbClient.__delattr__" => "Implement delattr(self, name).", + "builtins._PdbClient.__eq__" => "Return self==value.", + "builtins._PdbClient.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._PdbClient.__ge__" => "Return self>=value.", + "builtins._PdbClient.__getattribute__" => "Return getattr(self, name).", + "builtins._PdbClient.__getstate__" => "Helper for pickle.", + "builtins._PdbClient.__gt__" => "Return self>value.", + "builtins._PdbClient.__hash__" => "Return hash(self).", + "builtins._PdbClient.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._PdbClient.__le__" => "Return self<=value.", + "builtins._PdbClient.__lt__" => "Return self<value.", + "builtins._PdbClient.__ne__" => "Return self!=value.", + "builtins._PdbClient.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._PdbClient.__reduce__" => "Helper for pickle.", + "builtins._PdbClient.__reduce_ex__" => "Helper for pickle.", + "builtins._PdbClient.__repr__" => "Return repr(self).", + "builtins._PdbClient.__setattr__" => "Implement setattr(self, name, value).", + "builtins._PdbClient.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._PdbClient.__str__" => "Return str(self).", + "builtins._PdbClient.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._PdbClient.__weakref__" => "list of weak references to the object", + "builtins._Pickler.__delattr__" => "Implement delattr(self, name).", + "builtins._Pickler.__eq__" => "Return self==value.", + "builtins._Pickler.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._Pickler.__ge__" => "Return self>=value.", + "builtins._Pickler.__getattribute__" => "Return getattr(self, name).", + "builtins._Pickler.__getstate__" => "Helper for pickle.", + "builtins._Pickler.__gt__" => "Return self>value.", + "builtins._Pickler.__hash__" => "Return hash(self).", + "builtins._Pickler.__init__" => "This takes a binary file for writing a pickle data stream.\n\nThe optional *protocol* argument tells the pickler to use the\ngiven protocol; supported protocols are 0, 1, 2, 3, 4 and 5.\nThe default protocol is 5. It was introduced in Python 3.8, and\nis incompatible with previous versions.\n\nSpecifying a negative protocol version selects the highest\nprotocol version supported. The higher the protocol used, the\nmore recent the version of Python needed to read the pickle\nproduced.\n\nThe *file* argument must have a write() method that accepts a\nsingle bytes argument. It can thus be a file object opened for\nbinary writing, an io.BytesIO instance, or any other custom\nobject that meets this interface.\n\nIf *fix_imports* is True and *protocol* is less than 3, pickle\nwill try to map the new Python 3 names to the old module names\nused in Python 2, so that the pickle data stream is readable\nwith Python 2.\n\nIf *buffer_callback* is None (the default), buffer views are\nserialized into *file* as part of the pickle stream.\n\nIf *buffer_callback* is not None, then it can be called any number\nof times with a buffer view. If the callback returns a false value\n(such as None), the given buffer is out-of-band; otherwise the\nbuffer is serialized in-band, i.e. inside the pickle stream.\n\nIt is an error if *buffer_callback* is not None and *protocol*\nis None or smaller than 5.", + "builtins._Pickler.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._Pickler.__le__" => "Return self<=value.", + "builtins._Pickler.__lt__" => "Return self<value.", + "builtins._Pickler.__ne__" => "Return self!=value.", + "builtins._Pickler.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._Pickler.__reduce__" => "Helper for pickle.", + "builtins._Pickler.__reduce_ex__" => "Helper for pickle.", + "builtins._Pickler.__repr__" => "Return repr(self).", + "builtins._Pickler.__setattr__" => "Implement setattr(self, name, value).", + "builtins._Pickler.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._Pickler.__str__" => "Return str(self).", + "builtins._Pickler.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._Pickler.__weakref__" => "list of weak references to the object", + "builtins._Pickler.clear_memo" => "Clears the pickler's \"memo\".\n\nThe memo is the data structure that remembers which objects the\npickler has already seen, so that shared or recursive objects\nare pickled by reference and not by value. This method is\nuseful when re-using picklers.", + "builtins._Pickler.dump" => "Write a pickled representation of obj to the open file.", + "builtins._Pickler.memoize" => "Store an object in the memo.", + "builtins._PidfdChildWatcher" => "Child watcher implementation using Linux's pid file descriptors.\n\nThis child watcher polls process file descriptors (pidfds) to await child\nprocess termination. In some respects, PidfdChildWatcher is a \"Goldilocks\"\nchild watcher implementation. It doesn't require signals or threads, doesn't\ninterfere with any processes launched outside the event loop, and scales\nlinearly with the number of subprocesses launched by the event loop. The\nmain disadvantage is that pidfds are specific to Linux, and only work on\nrecent (5.3+) kernels.", + "builtins._PidfdChildWatcher.__delattr__" => "Implement delattr(self, name).", + "builtins._PidfdChildWatcher.__eq__" => "Return self==value.", + "builtins._PidfdChildWatcher.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._PidfdChildWatcher.__ge__" => "Return self>=value.", + "builtins._PidfdChildWatcher.__getattribute__" => "Return getattr(self, name).", + "builtins._PidfdChildWatcher.__getstate__" => "Helper for pickle.", + "builtins._PidfdChildWatcher.__gt__" => "Return self>value.", + "builtins._PidfdChildWatcher.__hash__" => "Return hash(self).", + "builtins._PidfdChildWatcher.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._PidfdChildWatcher.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._PidfdChildWatcher.__le__" => "Return self<=value.", + "builtins._PidfdChildWatcher.__lt__" => "Return self<value.", + "builtins._PidfdChildWatcher.__ne__" => "Return self!=value.", + "builtins._PidfdChildWatcher.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._PidfdChildWatcher.__reduce__" => "Helper for pickle.", + "builtins._PidfdChildWatcher.__reduce_ex__" => "Helper for pickle.", + "builtins._PidfdChildWatcher.__repr__" => "Return repr(self).", + "builtins._PidfdChildWatcher.__setattr__" => "Implement setattr(self, name, value).", + "builtins._PidfdChildWatcher.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._PidfdChildWatcher.__str__" => "Return str(self).", + "builtins._PidfdChildWatcher.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._PidfdChildWatcher.__weakref__" => "list of weak references to the object", + "builtins._PlaceholderType" => "The type of the Placeholder singleton.\n\nUsed as a placeholder for partial arguments.", + "builtins._PlaceholderType.__delattr__" => "Implement delattr(self, name).", + "builtins._PlaceholderType.__eq__" => "Return self==value.", + "builtins._PlaceholderType.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._PlaceholderType.__ge__" => "Return self>=value.", + "builtins._PlaceholderType.__getattribute__" => "Return getattr(self, name).", + "builtins._PlaceholderType.__getstate__" => "Helper for pickle.", + "builtins._PlaceholderType.__gt__" => "Return self>value.", + "builtins._PlaceholderType.__hash__" => "Return hash(self).", + "builtins._PlaceholderType.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._PlaceholderType.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._PlaceholderType.__le__" => "Return self<=value.", + "builtins._PlaceholderType.__lt__" => "Return self<value.", + "builtins._PlaceholderType.__ne__" => "Return self!=value.", + "builtins._PlaceholderType.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._PlaceholderType.__reduce_ex__" => "Helper for pickle.", + "builtins._PlaceholderType.__repr__" => "Return repr(self).", + "builtins._PlaceholderType.__setattr__" => "Implement setattr(self, name, value).", + "builtins._PlaceholderType.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._PlaceholderType.__str__" => "Return str(self).", + "builtins._PlaceholderType.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._PlistParser.__delattr__" => "Implement delattr(self, name).", + "builtins._PlistParser.__eq__" => "Return self==value.", + "builtins._PlistParser.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._PlistParser.__ge__" => "Return self>=value.", + "builtins._PlistParser.__getattribute__" => "Return getattr(self, name).", + "builtins._PlistParser.__getstate__" => "Helper for pickle.", + "builtins._PlistParser.__gt__" => "Return self>value.", + "builtins._PlistParser.__hash__" => "Return hash(self).", + "builtins._PlistParser.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._PlistParser.__le__" => "Return self<=value.", + "builtins._PlistParser.__lt__" => "Return self<value.", + "builtins._PlistParser.__ne__" => "Return self!=value.", + "builtins._PlistParser.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._PlistParser.__reduce__" => "Helper for pickle.", + "builtins._PlistParser.__reduce_ex__" => "Helper for pickle.", + "builtins._PlistParser.__repr__" => "Return repr(self).", + "builtins._PlistParser.__setattr__" => "Implement setattr(self, name, value).", + "builtins._PlistParser.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._PlistParser.__str__" => "Return str(self).", + "builtins._PlistParser.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._PlistParser.__weakref__" => "list of weak references to the object", + "builtins._PointerTypeCache.__delattr__" => "Implement delattr(self, name).", + "builtins._PointerTypeCache.__eq__" => "Return self==value.", + "builtins._PointerTypeCache.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._PointerTypeCache.__ge__" => "Return self>=value.", + "builtins._PointerTypeCache.__getattribute__" => "Return getattr(self, name).", + "builtins._PointerTypeCache.__getstate__" => "Helper for pickle.", + "builtins._PointerTypeCache.__gt__" => "Return self>value.", + "builtins._PointerTypeCache.__hash__" => "Return hash(self).", + "builtins._PointerTypeCache.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._PointerTypeCache.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._PointerTypeCache.__le__" => "Return self<=value.", + "builtins._PointerTypeCache.__lt__" => "Return self<value.", + "builtins._PointerTypeCache.__ne__" => "Return self!=value.", + "builtins._PointerTypeCache.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._PointerTypeCache.__reduce__" => "Helper for pickle.", + "builtins._PointerTypeCache.__reduce_ex__" => "Helper for pickle.", + "builtins._PointerTypeCache.__repr__" => "Return repr(self).", + "builtins._PointerTypeCache.__setattr__" => "Implement setattr(self, name, value).", + "builtins._PointerTypeCache.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._PointerTypeCache.__str__" => "Return str(self).", + "builtins._PointerTypeCache.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._PointerTypeCache.__weakref__" => "list of weak references to the object", + "builtins._PolicyBase" => "Policy Object basic framework.\n\nThis class is useless unless subclassed. A subclass should define\nclass attributes with defaults for any values that are to be\nmanaged by the Policy object. The constructor will then allow\nnon-default values to be set for these attributes at instance\ncreation time. The instance will be callable, taking these same\nattributes keyword arguments, and returning a new instance\nidentical to the called instance except for those values changed\nby the keyword arguments. Instances may be added, yielding new\ninstances with any non-default values from the right hand\noperand overriding those in the left hand operand. That is,\n\n A + B == A(<non-default values of B>)\n\nThe repr of an instance can be used to reconstruct the object\nif and only if the repr of the values can be used to reconstruct\nthose values.", + "builtins._PolicyBase.__add__" => "Non-default values from right operand override those from left.\n\nThe object returned is a new instance of the subclass.", + "builtins._PolicyBase.__delattr__" => "Implement delattr(self, name).", + "builtins._PolicyBase.__eq__" => "Return self==value.", + "builtins._PolicyBase.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._PolicyBase.__ge__" => "Return self>=value.", + "builtins._PolicyBase.__getattribute__" => "Return getattr(self, name).", + "builtins._PolicyBase.__getstate__" => "Helper for pickle.", + "builtins._PolicyBase.__gt__" => "Return self>value.", + "builtins._PolicyBase.__hash__" => "Return hash(self).", + "builtins._PolicyBase.__init__" => "Create new Policy, possibly overriding some defaults.\n\nSee class docstring for a list of overridable attributes.", + "builtins._PolicyBase.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._PolicyBase.__le__" => "Return self<=value.", + "builtins._PolicyBase.__lt__" => "Return self<value.", + "builtins._PolicyBase.__ne__" => "Return self!=value.", + "builtins._PolicyBase.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._PolicyBase.__reduce__" => "Helper for pickle.", + "builtins._PolicyBase.__reduce_ex__" => "Helper for pickle.", + "builtins._PolicyBase.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._PolicyBase.__str__" => "Return str(self).", + "builtins._PolicyBase.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._PolicyBase.__weakref__" => "list of weak references to the object", + "builtins._PolicyBase.clone" => "Return a new instance with specified attributes changed.\n\nThe new instance has the same attribute values as the current object,\nexcept for the changes passed in as keyword arguments.", + "builtins._Printer" => "interactive prompt objects for printing the license text, a list of\ncontributors and the copyright notice.", + "builtins._Printer.__delattr__" => "Implement delattr(self, name).", + "builtins._Printer.__eq__" => "Return self==value.", + "builtins._Printer.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._Printer.__ge__" => "Return self>=value.", + "builtins._Printer.__getattribute__" => "Return getattr(self, name).", + "builtins._Printer.__getstate__" => "Helper for pickle.", + "builtins._Printer.__gt__" => "Return self>value.", + "builtins._Printer.__hash__" => "Return hash(self).", + "builtins._Printer.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._Printer.__le__" => "Return self<=value.", + "builtins._Printer.__lt__" => "Return self<value.", + "builtins._Printer.__ne__" => "Return self!=value.", + "builtins._Printer.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._Printer.__reduce__" => "Helper for pickle.", + "builtins._Printer.__reduce_ex__" => "Helper for pickle.", + "builtins._Printer.__setattr__" => "Implement setattr(self, name, value).", + "builtins._Printer.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._Printer.__str__" => "Return str(self).", + "builtins._Printer.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._Printer.__weakref__" => "list of weak references to the object", + "builtins._Processor.__delattr__" => "Implement delattr(self, name).", + "builtins._Processor.__eq__" => "Return self==value.", + "builtins._Processor.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._Processor.__ge__" => "Return self>=value.", + "builtins._Processor.__getattribute__" => "Return getattr(self, name).", + "builtins._Processor.__getstate__" => "Helper for pickle.", + "builtins._Processor.__gt__" => "Return self>value.", + "builtins._Processor.__hash__" => "Return hash(self).", + "builtins._Processor.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._Processor.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._Processor.__le__" => "Return self<=value.", + "builtins._Processor.__lt__" => "Return self<value.", + "builtins._Processor.__ne__" => "Return self!=value.", + "builtins._Processor.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._Processor.__reduce__" => "Helper for pickle.", + "builtins._Processor.__reduce_ex__" => "Helper for pickle.", + "builtins._Processor.__repr__" => "Return repr(self).", + "builtins._Processor.__setattr__" => "Implement setattr(self, name, value).", + "builtins._Processor.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._Processor.__str__" => "Return str(self).", + "builtins._Processor.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._Processor.__weakref__" => "list of weak references to the object", + "builtins._Processor.from_subprocess" => "Fall back to `uname -p`", + "builtins._ProxyFile" => "A read-only wrapper of a file.", + "builtins._ProxyFile.__class_getitem__" => "Represent a PEP 585 generic type\n\nE.g. for t = list[int], t.__origin__ is list and t.__args__ is (int,).", + "builtins._ProxyFile.__delattr__" => "Implement delattr(self, name).", + "builtins._ProxyFile.__enter__" => "Context management protocol support.", + "builtins._ProxyFile.__eq__" => "Return self==value.", + "builtins._ProxyFile.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._ProxyFile.__ge__" => "Return self>=value.", + "builtins._ProxyFile.__getattribute__" => "Return getattr(self, name).", + "builtins._ProxyFile.__getstate__" => "Helper for pickle.", + "builtins._ProxyFile.__gt__" => "Return self>value.", + "builtins._ProxyFile.__hash__" => "Return hash(self).", + "builtins._ProxyFile.__init__" => "Initialize a _ProxyFile.", + "builtins._ProxyFile.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._ProxyFile.__iter__" => "Iterate over lines.", + "builtins._ProxyFile.__le__" => "Return self<=value.", + "builtins._ProxyFile.__lt__" => "Return self<value.", + "builtins._ProxyFile.__ne__" => "Return self!=value.", + "builtins._ProxyFile.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._ProxyFile.__reduce__" => "Helper for pickle.", + "builtins._ProxyFile.__reduce_ex__" => "Helper for pickle.", + "builtins._ProxyFile.__repr__" => "Return repr(self).", + "builtins._ProxyFile.__setattr__" => "Implement setattr(self, name, value).", + "builtins._ProxyFile.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._ProxyFile.__str__" => "Return str(self).", + "builtins._ProxyFile.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._ProxyFile.__weakref__" => "list of weak references to the object", + "builtins._ProxyFile._read" => "Read size bytes using read_method.", + "builtins._ProxyFile.close" => "Close the file.", + "builtins._ProxyFile.read" => "Read bytes.", + "builtins._ProxyFile.read1" => "Read bytes.", + "builtins._ProxyFile.readline" => "Read a line.", + "builtins._ProxyFile.readlines" => "Read multiple lines.", + "builtins._ProxyFile.seek" => "Change position.", + "builtins._ProxyFile.tell" => "Return the position.", + "builtins._PySimpleQueue" => "Simple, unbounded FIFO queue.\n\nThis pure Python implementation is not reentrant.", + "builtins._PySimpleQueue.__class_getitem__" => "Represent a PEP 585 generic type\n\nE.g. for t = list[int], t.__origin__ is list and t.__args__ is (int,).", + "builtins._PySimpleQueue.__delattr__" => "Implement delattr(self, name).", + "builtins._PySimpleQueue.__eq__" => "Return self==value.", + "builtins._PySimpleQueue.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._PySimpleQueue.__ge__" => "Return self>=value.", + "builtins._PySimpleQueue.__getattribute__" => "Return getattr(self, name).", + "builtins._PySimpleQueue.__getstate__" => "Helper for pickle.", + "builtins._PySimpleQueue.__gt__" => "Return self>value.", + "builtins._PySimpleQueue.__hash__" => "Return hash(self).", + "builtins._PySimpleQueue.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._PySimpleQueue.__le__" => "Return self<=value.", + "builtins._PySimpleQueue.__lt__" => "Return self<value.", + "builtins._PySimpleQueue.__ne__" => "Return self!=value.", + "builtins._PySimpleQueue.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._PySimpleQueue.__reduce__" => "Helper for pickle.", + "builtins._PySimpleQueue.__reduce_ex__" => "Helper for pickle.", + "builtins._PySimpleQueue.__repr__" => "Return repr(self).", + "builtins._PySimpleQueue.__setattr__" => "Implement setattr(self, name, value).", + "builtins._PySimpleQueue.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._PySimpleQueue.__str__" => "Return str(self).", + "builtins._PySimpleQueue.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._PySimpleQueue.__weakref__" => "list of weak references to the object", + "builtins._PySimpleQueue.empty" => "Return True if the queue is empty, False otherwise (not reliable!).", + "builtins._PySimpleQueue.get" => "Remove and return an item from the queue.\n\nIf optional args 'block' is true and 'timeout' is None (the default),\nblock if necessary until an item is available. If 'timeout' is\na non-negative number, it blocks at most 'timeout' seconds and raises\nthe Empty exception if no item was available within that time.\nOtherwise ('block' is false), return an item if one is immediately\navailable, else raise the Empty exception ('timeout' is ignored\nin that case).", + "builtins._PySimpleQueue.get_nowait" => "Remove and return an item from the queue without blocking.\n\nOnly get an item if one is immediately available. Otherwise\nraise the Empty exception.", + "builtins._PySimpleQueue.put" => "Put the item on the queue.\n\nThe optional 'block' and 'timeout' arguments are ignored, as this method\nnever blocks. They are provided for compatibility with the Queue class.", + "builtins._PySimpleQueue.put_nowait" => "Put an item into the queue without blocking.\n\nThis is exactly equivalent to `put(item, block=False)` and is only provided\nfor compatibility with the Queue class.", + "builtins._PySimpleQueue.qsize" => "Return the approximate size of the queue (not reliable!).", + "builtins._RLock" => "This class implements reentrant lock objects.\n\nA reentrant lock must be released by the thread that acquired it. Once a\nthread has acquired a reentrant lock, the same thread may acquire it\nagain without blocking; the thread must release it once for each time it\nhas acquired it.", + "builtins._RLock.__delattr__" => "Implement delattr(self, name).", + "builtins._RLock.__enter__" => "Acquire a lock, blocking or non-blocking.\n\nWhen invoked without arguments: if this thread already owns the lock,\nincrement the recursion level by one, and return immediately. Otherwise,\nif another thread owns the lock, block until the lock is unlocked. Once\nthe lock is unlocked (not owned by any thread), then grab ownership, set\nthe recursion level to one, and return. If more than one thread is\nblocked waiting until the lock is unlocked, only one at a time will be\nable to grab ownership of the lock. There is no return value in this\ncase.\n\nWhen invoked with the blocking argument set to true, do the same thing\nas when called without arguments, and return true.\n\nWhen invoked with the blocking argument set to false, do not block. If a\ncall without an argument would block, return false immediately;\notherwise, do the same thing as when called without arguments, and\nreturn true.\n\nWhen invoked with the floating-point timeout argument set to a positive\nvalue, block for at most the number of seconds specified by timeout\nand as long as the lock cannot be acquired. Return true if the lock has\nbeen acquired, false if the timeout has elapsed.", + "builtins._RLock.__eq__" => "Return self==value.", + "builtins._RLock.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._RLock.__ge__" => "Return self>=value.", + "builtins._RLock.__getattribute__" => "Return getattr(self, name).", + "builtins._RLock.__getstate__" => "Helper for pickle.", + "builtins._RLock.__gt__" => "Return self>value.", + "builtins._RLock.__hash__" => "Return hash(self).", + "builtins._RLock.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._RLock.__le__" => "Return self<=value.", + "builtins._RLock.__lt__" => "Return self<value.", + "builtins._RLock.__ne__" => "Return self!=value.", + "builtins._RLock.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._RLock.__reduce__" => "Helper for pickle.", + "builtins._RLock.__reduce_ex__" => "Helper for pickle.", + "builtins._RLock.__setattr__" => "Implement setattr(self, name, value).", + "builtins._RLock.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._RLock.__str__" => "Return str(self).", + "builtins._RLock.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._RLock.__weakref__" => "list of weak references to the object", + "builtins._RLock.acquire" => "Acquire a lock, blocking or non-blocking.\n\nWhen invoked without arguments: if this thread already owns the lock,\nincrement the recursion level by one, and return immediately. Otherwise,\nif another thread owns the lock, block until the lock is unlocked. Once\nthe lock is unlocked (not owned by any thread), then grab ownership, set\nthe recursion level to one, and return. If more than one thread is\nblocked waiting until the lock is unlocked, only one at a time will be\nable to grab ownership of the lock. There is no return value in this\ncase.\n\nWhen invoked with the blocking argument set to true, do the same thing\nas when called without arguments, and return true.\n\nWhen invoked with the blocking argument set to false, do not block. If a\ncall without an argument would block, return false immediately;\notherwise, do the same thing as when called without arguments, and\nreturn true.\n\nWhen invoked with the floating-point timeout argument set to a positive\nvalue, block for at most the number of seconds specified by timeout\nand as long as the lock cannot be acquired. Return true if the lock has\nbeen acquired, false if the timeout has elapsed.", + "builtins._RLock.locked" => "Return whether this object is locked.", + "builtins._RLock.release" => "Release a lock, decrementing the recursion level.\n\nIf after the decrement it is zero, reset the lock to unlocked (not owned\nby any thread), and if any other threads are blocked waiting for the\nlock to become unlocked, allow exactly one of them to proceed. If after\nthe decrement the recursion level is still nonzero, the lock remains\nlocked and owned by the calling thread.\n\nOnly call this method when the calling thread owns the lock. A\nRuntimeError is raised if this method is called when the lock is\nunlocked.\n\nThere is no return value.", + "builtins._RandomNameSequence" => "An instance of _RandomNameSequence generates an endless\nsequence of unpredictable strings which can safely be incorporated\ninto file names. Each string is eight characters long. Multiple\nthreads can safely use the same instance at the same time.\n\n_RandomNameSequence is an iterator.", + "builtins._RandomNameSequence.__delattr__" => "Implement delattr(self, name).", + "builtins._RandomNameSequence.__eq__" => "Return self==value.", + "builtins._RandomNameSequence.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._RandomNameSequence.__ge__" => "Return self>=value.", + "builtins._RandomNameSequence.__getattribute__" => "Return getattr(self, name).", + "builtins._RandomNameSequence.__getstate__" => "Helper for pickle.", + "builtins._RandomNameSequence.__gt__" => "Return self>value.", + "builtins._RandomNameSequence.__hash__" => "Return hash(self).", + "builtins._RandomNameSequence.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._RandomNameSequence.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._RandomNameSequence.__le__" => "Return self<=value.", + "builtins._RandomNameSequence.__lt__" => "Return self<value.", + "builtins._RandomNameSequence.__ne__" => "Return self!=value.", + "builtins._RandomNameSequence.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._RandomNameSequence.__reduce__" => "Helper for pickle.", + "builtins._RandomNameSequence.__reduce_ex__" => "Helper for pickle.", + "builtins._RandomNameSequence.__repr__" => "Return repr(self).", + "builtins._RandomNameSequence.__setattr__" => "Implement setattr(self, name, value).", + "builtins._RandomNameSequence.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._RandomNameSequence.__str__" => "Return str(self).", + "builtins._RandomNameSequence.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._RandomNameSequence.__weakref__" => "list of weak references to the object", + "builtins._ReadState.__delattr__" => "Implement delattr(self, name).", + "builtins._ReadState.__eq__" => "Return self==value.", + "builtins._ReadState.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._ReadState.__ge__" => "Return self>=value.", + "builtins._ReadState.__getattribute__" => "Return getattr(self, name).", + "builtins._ReadState.__getstate__" => "Helper for pickle.", + "builtins._ReadState.__gt__" => "Return self>value.", + "builtins._ReadState.__hash__" => "Return hash(self).", + "builtins._ReadState.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._ReadState.__le__" => "Return self<=value.", + "builtins._ReadState.__lt__" => "Return self<value.", + "builtins._ReadState.__ne__" => "Return self!=value.", + "builtins._ReadState.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._ReadState.__reduce__" => "Helper for pickle.", + "builtins._ReadState.__reduce_ex__" => "Helper for pickle.", + "builtins._ReadState.__repr__" => "Return repr(self).", + "builtins._ReadState.__setattr__" => "Implement setattr(self, name, value).", + "builtins._ReadState.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._ReadState.__str__" => "Return str(self).", + "builtins._ReadState.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._ReadState.__weakref__" => "list of weak references to the object", + "builtins._ResultMixinBytes" => "Standard approach to decoding parsed results from bytes to str", + "builtins._ResultMixinBytes.__delattr__" => "Implement delattr(self, name).", + "builtins._ResultMixinBytes.__eq__" => "Return self==value.", + "builtins._ResultMixinBytes.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._ResultMixinBytes.__ge__" => "Return self>=value.", + "builtins._ResultMixinBytes.__getattribute__" => "Return getattr(self, name).", + "builtins._ResultMixinBytes.__getstate__" => "Helper for pickle.", + "builtins._ResultMixinBytes.__gt__" => "Return self>value.", + "builtins._ResultMixinBytes.__hash__" => "Return hash(self).", + "builtins._ResultMixinBytes.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._ResultMixinBytes.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._ResultMixinBytes.__le__" => "Return self<=value.", + "builtins._ResultMixinBytes.__lt__" => "Return self<value.", + "builtins._ResultMixinBytes.__ne__" => "Return self!=value.", + "builtins._ResultMixinBytes.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._ResultMixinBytes.__reduce__" => "Helper for pickle.", + "builtins._ResultMixinBytes.__reduce_ex__" => "Helper for pickle.", + "builtins._ResultMixinBytes.__repr__" => "Return repr(self).", + "builtins._ResultMixinBytes.__setattr__" => "Implement setattr(self, name, value).", + "builtins._ResultMixinBytes.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._ResultMixinBytes.__str__" => "Return str(self).", + "builtins._ResultMixinBytes.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._ResultMixinStr" => "Standard approach to encoding parsed results from str to bytes", + "builtins._ResultMixinStr.__delattr__" => "Implement delattr(self, name).", + "builtins._ResultMixinStr.__eq__" => "Return self==value.", + "builtins._ResultMixinStr.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._ResultMixinStr.__ge__" => "Return self>=value.", + "builtins._ResultMixinStr.__getattribute__" => "Return getattr(self, name).", + "builtins._ResultMixinStr.__getstate__" => "Helper for pickle.", + "builtins._ResultMixinStr.__gt__" => "Return self>value.", + "builtins._ResultMixinStr.__hash__" => "Return hash(self).", + "builtins._ResultMixinStr.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._ResultMixinStr.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._ResultMixinStr.__le__" => "Return self<=value.", + "builtins._ResultMixinStr.__lt__" => "Return self<value.", + "builtins._ResultMixinStr.__ne__" => "Return self!=value.", + "builtins._ResultMixinStr.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._ResultMixinStr.__reduce__" => "Helper for pickle.", + "builtins._ResultMixinStr.__reduce_ex__" => "Helper for pickle.", + "builtins._ResultMixinStr.__repr__" => "Return repr(self).", + "builtins._ResultMixinStr.__setattr__" => "Implement setattr(self, name, value).", + "builtins._ResultMixinStr.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._ResultMixinStr.__str__" => "Return str(self).", + "builtins._ResultMixinStr.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._SSLContext.__delattr__" => "Implement delattr(self, name).", + "builtins._SSLContext.__eq__" => "Return self==value.", + "builtins._SSLContext.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._SSLContext.__ge__" => "Return self>=value.", + "builtins._SSLContext.__getattribute__" => "Return getattr(self, name).", + "builtins._SSLContext.__getstate__" => "Helper for pickle.", + "builtins._SSLContext.__gt__" => "Return self>value.", + "builtins._SSLContext.__hash__" => "Return hash(self).", + "builtins._SSLContext.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._SSLContext.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._SSLContext.__le__" => "Return self<=value.", + "builtins._SSLContext.__lt__" => "Return self<value.", + "builtins._SSLContext.__ne__" => "Return self!=value.", + "builtins._SSLContext.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._SSLContext.__reduce__" => "Helper for pickle.", + "builtins._SSLContext.__reduce_ex__" => "Helper for pickle.", + "builtins._SSLContext.__repr__" => "Return repr(self).", + "builtins._SSLContext.__setattr__" => "Implement setattr(self, name, value).", + "builtins._SSLContext.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._SSLContext.__str__" => "Return str(self).", + "builtins._SSLContext.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._SSLContext.cert_store_stats" => "Returns quantities of loaded X.509 certificates.\n\nX.509 certificates with a CA extension and certificate revocation\nlists inside the context's cert store.\n\nNOTE: Certificates in a capath directory aren't loaded unless they\nhave been used at least once.", + "builtins._SSLContext.get_ca_certs" => "Returns a list of dicts with information of loaded CA certs.\n\nIf the optional argument is True, returns a DER-encoded copy of the\nCA certificate.\n\nNOTE: Certificates in a capath directory aren't loaded unless they\nhave been used at least once.", + "builtins._SSLContext.num_tickets" => "Control the number of TLSv1.3 session tickets.", + "builtins._SSLContext.security_level" => "The current security level.", + "builtins._SSLContext.sni_callback" => "Set a callback that will be called when a server name is provided by the SSL/TLS client in the SNI extension.\n\nIf the argument is None then the callback is disabled. The method\nis called with the SSLSocket, the server name as a string, and the\nSSLContext object.\n\nSee RFC 6066 for details of the SNI extension.", + "builtins._SSLSocket.__delattr__" => "Implement delattr(self, name).", + "builtins._SSLSocket.__eq__" => "Return self==value.", + "builtins._SSLSocket.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._SSLSocket.__ge__" => "Return self>=value.", + "builtins._SSLSocket.__getattribute__" => "Return getattr(self, name).", + "builtins._SSLSocket.__getstate__" => "Helper for pickle.", + "builtins._SSLSocket.__gt__" => "Return self>value.", + "builtins._SSLSocket.__hash__" => "Return hash(self).", + "builtins._SSLSocket.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._SSLSocket.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._SSLSocket.__le__" => "Return self<=value.", + "builtins._SSLSocket.__lt__" => "Return self<value.", + "builtins._SSLSocket.__ne__" => "Return self!=value.", + "builtins._SSLSocket.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._SSLSocket.__reduce__" => "Helper for pickle.", + "builtins._SSLSocket.__reduce_ex__" => "Helper for pickle.", + "builtins._SSLSocket.__repr__" => "Return repr(self).", + "builtins._SSLSocket.__setattr__" => "Implement setattr(self, name, value).", + "builtins._SSLSocket.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._SSLSocket.__str__" => "Return str(self).", + "builtins._SSLSocket.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._SSLSocket.context" => "This changes the context associated with the SSLSocket.\n\nThis is typically used from within a callback function set by the\nsni_callback on the SSLContext to change the certificate information\nassociated with the SSLSocket before the cryptographic exchange\nhandshake messages.", + "builtins._SSLSocket.get_channel_binding" => "Get channel binding data for current connection.\n\nRaise ValueError if the requested `cb_type` is not supported.\nReturn bytes of the data or None if the data is not available (e.g.\nbefore the handshake).\nOnly 'tls-unique' channel binding data from RFC 5929 is supported.", + "builtins._SSLSocket.getpeercert" => "Returns the certificate for the peer.\n\nIf no certificate was provided, returns None. If a certificate was\nprovided, but not validated, returns an empty dictionary. Otherwise\nreturns a dict containing information about the peer certificate.\n\nIf the optional argument is True, returns a DER-encoded copy of the\npeer certificate, or None if no certificate was provided. This will\nreturn the certificate even if it wasn't validated.", + "builtins._SSLSocket.owner" => "The Python-level owner of this object.\n\nPassed as \"self\" in servername callback.", + "builtins._SSLSocket.pending" => "Returns the number of already decrypted bytes available for read, pending on the connection.", + "builtins._SSLSocket.read" => "read(size, [buffer])\nRead up to size bytes from the SSL socket.", + "builtins._SSLSocket.server_hostname" => "The currently set server hostname (for SNI).", + "builtins._SSLSocket.server_side" => "Whether this is a server-side socket.", + "builtins._SSLSocket.session" => "The underlying SSLSession object.", + "builtins._SSLSocket.session_reused" => "Was the client session reused during handshake?", + "builtins._SSLSocket.shutdown" => "Does the SSL shutdown handshake with the remote end.", + "builtins._SSLSocket.verify_client_post_handshake" => "Initiate TLS 1.3 post-handshake authentication", + "builtins._SSLSocket.write" => "Writes the bytes-like object b into the SSL object.\n\nReturns the number of bytes written.", + "builtins._Section.__delattr__" => "Implement delattr(self, name).", + "builtins._Section.__eq__" => "Return self==value.", + "builtins._Section.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._Section.__ge__" => "Return self>=value.", + "builtins._Section.__getattribute__" => "Return getattr(self, name).", + "builtins._Section.__getstate__" => "Helper for pickle.", + "builtins._Section.__gt__" => "Return self>value.", + "builtins._Section.__hash__" => "Return hash(self).", + "builtins._Section.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._Section.__le__" => "Return self<=value.", + "builtins._Section.__lt__" => "Return self<value.", + "builtins._Section.__ne__" => "Return self!=value.", + "builtins._Section.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._Section.__reduce__" => "Helper for pickle.", + "builtins._Section.__reduce_ex__" => "Helper for pickle.", + "builtins._Section.__repr__" => "Return repr(self).", + "builtins._Section.__setattr__" => "Implement setattr(self, name, value).", + "builtins._Section.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._Section.__str__" => "Return str(self).", + "builtins._Section.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._Section.__weakref__" => "list of weak references to the object", + "builtins._SelectorContext.__delattr__" => "Implement delattr(self, name).", + "builtins._SelectorContext.__eq__" => "Return self==value.", + "builtins._SelectorContext.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._SelectorContext.__ge__" => "Return self>=value.", + "builtins._SelectorContext.__getattribute__" => "Return getattr(self, name).", + "builtins._SelectorContext.__getstate__" => "Helper for pickle.", + "builtins._SelectorContext.__gt__" => "Return self>value.", + "builtins._SelectorContext.__hash__" => "Return hash(self).", + "builtins._SelectorContext.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._SelectorContext.__le__" => "Return self<=value.", + "builtins._SelectorContext.__lt__" => "Return self<value.", + "builtins._SelectorContext.__ne__" => "Return self!=value.", + "builtins._SelectorContext.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._SelectorContext.__reduce__" => "Helper for pickle.", + "builtins._SelectorContext.__reduce_ex__" => "Helper for pickle.", + "builtins._SelectorContext.__repr__" => "Return repr(self).", + "builtins._SelectorContext.__setattr__" => "Implement setattr(self, name, value).", + "builtins._SelectorContext.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._SelectorContext.__str__" => "Return str(self).", + "builtins._SelectorContext.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._SelectorContext.__weakref__" => "list of weak references to the object", + "builtins._Sentinel.__delattr__" => "Implement delattr(self, name).", + "builtins._Sentinel.__eq__" => "Return self==value.", + "builtins._Sentinel.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._Sentinel.__ge__" => "Return self>=value.", + "builtins._Sentinel.__getattribute__" => "Return getattr(self, name).", + "builtins._Sentinel.__getstate__" => "Helper for pickle.", + "builtins._Sentinel.__gt__" => "Return self>value.", + "builtins._Sentinel.__hash__" => "Return hash(self).", + "builtins._Sentinel.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._Sentinel.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._Sentinel.__le__" => "Return self<=value.", + "builtins._Sentinel.__lt__" => "Return self<value.", + "builtins._Sentinel.__ne__" => "Return self!=value.", + "builtins._Sentinel.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._Sentinel.__reduce__" => "Helper for pickle.", + "builtins._Sentinel.__reduce_ex__" => "Helper for pickle.", + "builtins._Sentinel.__setattr__" => "Implement setattr(self, name, value).", + "builtins._Sentinel.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._Sentinel.__str__" => "Return str(self).", + "builtins._Sentinel.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._Sentinel.__weakref__" => "list of weak references to the object", + "builtins._SharedFile.__delattr__" => "Implement delattr(self, name).", + "builtins._SharedFile.__eq__" => "Return self==value.", + "builtins._SharedFile.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._SharedFile.__ge__" => "Return self>=value.", + "builtins._SharedFile.__getattribute__" => "Return getattr(self, name).", + "builtins._SharedFile.__getstate__" => "Helper for pickle.", + "builtins._SharedFile.__gt__" => "Return self>value.", + "builtins._SharedFile.__hash__" => "Return hash(self).", + "builtins._SharedFile.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._SharedFile.__le__" => "Return self<=value.", + "builtins._SharedFile.__lt__" => "Return self<value.", + "builtins._SharedFile.__ne__" => "Return self!=value.", + "builtins._SharedFile.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._SharedFile.__reduce__" => "Helper for pickle.", + "builtins._SharedFile.__reduce_ex__" => "Helper for pickle.", + "builtins._SharedFile.__repr__" => "Return repr(self).", + "builtins._SharedFile.__setattr__" => "Implement setattr(self, name, value).", + "builtins._SharedFile.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._SharedFile.__str__" => "Return str(self).", + "builtins._SharedFile.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._SharedFile.__weakref__" => "list of weak references to the object", + "builtins._Stream" => "Class that serves as an adapter between TarFile and\na stream-like object. The stream-like object only\nneeds to have a read() or write() method that works with bytes,\nand the method is accessed blockwise.\nUse of gzip or bzip2 compression is possible.\nA stream-like object could be for example: sys.stdin.buffer,\nsys.stdout.buffer, a socket, a tape device etc.\n\n_Stream is intended to be used only internally.", + "builtins._Stream._Stream__read" => "Return size bytes from stream. If internal buffer is empty,\nread another block from the stream.", + "builtins._Stream._Stream__write" => "Write string s to the stream if a whole new block\nis ready to be written.", + "builtins._Stream.__delattr__" => "Implement delattr(self, name).", + "builtins._Stream.__eq__" => "Return self==value.", + "builtins._Stream.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._Stream.__ge__" => "Return self>=value.", + "builtins._Stream.__getattribute__" => "Return getattr(self, name).", + "builtins._Stream.__getstate__" => "Helper for pickle.", + "builtins._Stream.__gt__" => "Return self>value.", + "builtins._Stream.__hash__" => "Return hash(self).", + "builtins._Stream.__init__" => "Construct a _Stream object.", + "builtins._Stream.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._Stream.__le__" => "Return self<=value.", + "builtins._Stream.__lt__" => "Return self<value.", + "builtins._Stream.__ne__" => "Return self!=value.", + "builtins._Stream.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._Stream.__reduce__" => "Helper for pickle.", + "builtins._Stream.__reduce_ex__" => "Helper for pickle.", + "builtins._Stream.__repr__" => "Return repr(self).", + "builtins._Stream.__setattr__" => "Implement setattr(self, name, value).", + "builtins._Stream.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._Stream.__str__" => "Return str(self).", + "builtins._Stream.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._Stream.__weakref__" => "list of weak references to the object", + "builtins._Stream._init_read_gz" => "Initialize for reading a gzip compressed fileobj.", + "builtins._Stream._init_write_gz" => "Initialize for writing with gzip compression.", + "builtins._Stream._read" => "Return size bytes from the stream.", + "builtins._Stream.close" => "Close the _Stream object. No operation should be\ndone on it afterwards.", + "builtins._Stream.read" => "Return the next size number of bytes from the stream.", + "builtins._Stream.seek" => "Set the stream's file pointer to pos. Negative seeking\nis forbidden.", + "builtins._Stream.tell" => "Return the stream's file pointer position.", + "builtins._Stream.write" => "Write string s to the stream.", + "builtins._StreamProxy" => "Small proxy class that enables transparent compression\ndetection for the Stream interface (mode 'r|*').", + "builtins._StreamProxy.__delattr__" => "Implement delattr(self, name).", + "builtins._StreamProxy.__eq__" => "Return self==value.", + "builtins._StreamProxy.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._StreamProxy.__ge__" => "Return self>=value.", + "builtins._StreamProxy.__getattribute__" => "Return getattr(self, name).", + "builtins._StreamProxy.__getstate__" => "Helper for pickle.", + "builtins._StreamProxy.__gt__" => "Return self>value.", + "builtins._StreamProxy.__hash__" => "Return hash(self).", + "builtins._StreamProxy.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._StreamProxy.__le__" => "Return self<=value.", + "builtins._StreamProxy.__lt__" => "Return self<value.", + "builtins._StreamProxy.__ne__" => "Return self!=value.", + "builtins._StreamProxy.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._StreamProxy.__reduce__" => "Helper for pickle.", + "builtins._StreamProxy.__reduce_ex__" => "Helper for pickle.", + "builtins._StreamProxy.__repr__" => "Return repr(self).", + "builtins._StreamProxy.__setattr__" => "Implement setattr(self, name, value).", + "builtins._StreamProxy.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._StreamProxy.__str__" => "Return str(self).", + "builtins._StreamProxy.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._StreamProxy.__weakref__" => "list of weak references to the object", + "builtins._Stringifier.__delattr__" => "Implement delattr(self, name).", + "builtins._Stringifier.__getattribute__" => "Return getattr(self, name).", + "builtins._Stringifier.__getstate__" => "Helper for pickle.", + "builtins._Stringifier.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._Stringifier.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._Stringifier.__reduce__" => "Helper for pickle.", + "builtins._Stringifier.__reduce_ex__" => "Helper for pickle.", + "builtins._Stringifier.__setattr__" => "Implement setattr(self, name, value).", + "builtins._Stringifier.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._Stringifier.__str__" => "Return str(self).", + "builtins._Stringifier.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._Stringifier.__weakref__" => "list of weak references to the object", + "builtins._TZifHeader.__delattr__" => "Implement delattr(self, name).", + "builtins._TZifHeader.__eq__" => "Return self==value.", + "builtins._TZifHeader.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._TZifHeader.__ge__" => "Return self>=value.", + "builtins._TZifHeader.__getattribute__" => "Return getattr(self, name).", + "builtins._TZifHeader.__getstate__" => "Helper for pickle.", + "builtins._TZifHeader.__gt__" => "Return self>value.", + "builtins._TZifHeader.__hash__" => "Return hash(self).", + "builtins._TZifHeader.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._TZifHeader.__le__" => "Return self<=value.", + "builtins._TZifHeader.__lt__" => "Return self<value.", + "builtins._TZifHeader.__ne__" => "Return self!=value.", + "builtins._TZifHeader.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._TZifHeader.__reduce__" => "Helper for pickle.", + "builtins._TZifHeader.__reduce_ex__" => "Helper for pickle.", + "builtins._TZifHeader.__repr__" => "Return repr(self).", + "builtins._TZifHeader.__setattr__" => "Implement setattr(self, name, value).", + "builtins._TZifHeader.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._TZifHeader.__str__" => "Return str(self).", + "builtins._TZifHeader.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._Tellable.__delattr__" => "Implement delattr(self, name).", + "builtins._Tellable.__eq__" => "Return self==value.", + "builtins._Tellable.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._Tellable.__ge__" => "Return self>=value.", + "builtins._Tellable.__getattribute__" => "Return getattr(self, name).", + "builtins._Tellable.__getstate__" => "Helper for pickle.", + "builtins._Tellable.__gt__" => "Return self>value.", + "builtins._Tellable.__hash__" => "Return hash(self).", + "builtins._Tellable.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._Tellable.__le__" => "Return self<=value.", + "builtins._Tellable.__lt__" => "Return self<value.", + "builtins._Tellable.__ne__" => "Return self!=value.", + "builtins._Tellable.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._Tellable.__reduce__" => "Helper for pickle.", + "builtins._Tellable.__reduce_ex__" => "Helper for pickle.", + "builtins._Tellable.__repr__" => "Return repr(self).", + "builtins._Tellable.__setattr__" => "Implement setattr(self, name, value).", + "builtins._Tellable.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._Tellable.__str__" => "Return str(self).", + "builtins._Tellable.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._Tellable.__weakref__" => "list of weak references to the object", + "builtins._TempModule" => "Temporarily replace a module in sys.modules with an empty namespace", + "builtins._TempModule.__delattr__" => "Implement delattr(self, name).", + "builtins._TempModule.__eq__" => "Return self==value.", + "builtins._TempModule.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._TempModule.__ge__" => "Return self>=value.", + "builtins._TempModule.__getattribute__" => "Return getattr(self, name).", + "builtins._TempModule.__getstate__" => "Helper for pickle.", + "builtins._TempModule.__gt__" => "Return self>value.", + "builtins._TempModule.__hash__" => "Return hash(self).", + "builtins._TempModule.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._TempModule.__le__" => "Return self<=value.", + "builtins._TempModule.__lt__" => "Return self<value.", + "builtins._TempModule.__ne__" => "Return self!=value.", + "builtins._TempModule.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._TempModule.__reduce__" => "Helper for pickle.", + "builtins._TempModule.__reduce_ex__" => "Helper for pickle.", + "builtins._TempModule.__repr__" => "Return repr(self).", + "builtins._TempModule.__setattr__" => "Implement setattr(self, name, value).", + "builtins._TempModule.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._TempModule.__str__" => "Return str(self).", + "builtins._TempModule.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._TempModule.__weakref__" => "list of weak references to the object", + "builtins._TemplatePattern.__delattr__" => "Implement delattr(self, name).", + "builtins._TemplatePattern.__eq__" => "Return self==value.", + "builtins._TemplatePattern.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._TemplatePattern.__ge__" => "Return self>=value.", + "builtins._TemplatePattern.__getattribute__" => "Return getattr(self, name).", + "builtins._TemplatePattern.__getstate__" => "Helper for pickle.", + "builtins._TemplatePattern.__gt__" => "Return self>value.", + "builtins._TemplatePattern.__hash__" => "Return hash(self).", + "builtins._TemplatePattern.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._TemplatePattern.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._TemplatePattern.__le__" => "Return self<=value.", + "builtins._TemplatePattern.__lt__" => "Return self<value.", + "builtins._TemplatePattern.__ne__" => "Return self!=value.", + "builtins._TemplatePattern.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._TemplatePattern.__reduce__" => "Helper for pickle.", + "builtins._TemplatePattern.__reduce_ex__" => "Helper for pickle.", + "builtins._TemplatePattern.__repr__" => "Return repr(self).", + "builtins._TemplatePattern.__setattr__" => "Implement setattr(self, name, value).", + "builtins._TemplatePattern.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._TemplatePattern.__str__" => "Return str(self).", + "builtins._TemplatePattern.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._TemplatePattern.__weakref__" => "list of weak references to the object", + "builtins._TemporaryFileCloser" => "A separate object allowing proper closing of a temporary file's\nunderlying file object, without adding a __del__ method to the\ntemporary file.", + "builtins._TemporaryFileCloser.__delattr__" => "Implement delattr(self, name).", + "builtins._TemporaryFileCloser.__eq__" => "Return self==value.", + "builtins._TemporaryFileCloser.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._TemporaryFileCloser.__ge__" => "Return self>=value.", + "builtins._TemporaryFileCloser.__getattribute__" => "Return getattr(self, name).", + "builtins._TemporaryFileCloser.__getstate__" => "Helper for pickle.", + "builtins._TemporaryFileCloser.__gt__" => "Return self>value.", + "builtins._TemporaryFileCloser.__hash__" => "Return hash(self).", + "builtins._TemporaryFileCloser.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._TemporaryFileCloser.__le__" => "Return self<=value.", + "builtins._TemporaryFileCloser.__lt__" => "Return self<value.", + "builtins._TemporaryFileCloser.__ne__" => "Return self!=value.", + "builtins._TemporaryFileCloser.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._TemporaryFileCloser.__reduce__" => "Helper for pickle.", + "builtins._TemporaryFileCloser.__reduce_ex__" => "Helper for pickle.", + "builtins._TemporaryFileCloser.__repr__" => "Return repr(self).", + "builtins._TemporaryFileCloser.__setattr__" => "Implement setattr(self, name, value).", + "builtins._TemporaryFileCloser.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._TemporaryFileCloser.__str__" => "Return str(self).", + "builtins._TemporaryFileCloser.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._TemporaryFileCloser.__weakref__" => "list of weak references to the object", + "builtins._TemporaryFileWrapper" => "Temporary file wrapper\n\nThis class provides a wrapper around files opened for\ntemporary use. In particular, it seeks to automatically\nremove the file when it is no longer needed.", + "builtins._TemporaryFileWrapper.__delattr__" => "Implement delattr(self, name).", + "builtins._TemporaryFileWrapper.__eq__" => "Return self==value.", + "builtins._TemporaryFileWrapper.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._TemporaryFileWrapper.__ge__" => "Return self>=value.", + "builtins._TemporaryFileWrapper.__getattribute__" => "Return getattr(self, name).", + "builtins._TemporaryFileWrapper.__getstate__" => "Helper for pickle.", + "builtins._TemporaryFileWrapper.__gt__" => "Return self>value.", + "builtins._TemporaryFileWrapper.__hash__" => "Return hash(self).", + "builtins._TemporaryFileWrapper.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._TemporaryFileWrapper.__le__" => "Return self<=value.", + "builtins._TemporaryFileWrapper.__lt__" => "Return self<value.", + "builtins._TemporaryFileWrapper.__ne__" => "Return self!=value.", + "builtins._TemporaryFileWrapper.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._TemporaryFileWrapper.__reduce__" => "Helper for pickle.", + "builtins._TemporaryFileWrapper.__reduce_ex__" => "Helper for pickle.", + "builtins._TemporaryFileWrapper.__setattr__" => "Implement setattr(self, name, value).", + "builtins._TemporaryFileWrapper.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._TemporaryFileWrapper.__str__" => "Return str(self).", + "builtins._TemporaryFileWrapper.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._TemporaryFileWrapper.__weakref__" => "list of weak references to the object", + "builtins._TemporaryFileWrapper.close" => "Close the temporary file, possibly deleting it.", + "builtins._TestClass" => "A pointless class, for sanity-checking of docstring testing.\n\nMethods:\n square()\n get()\n\n>>> _TestClass(13).get() + _TestClass(-12).get()\n1\n>>> hex(_TestClass(13).square().get())\n'0xa9'", + "builtins._TestClass.__delattr__" => "Implement delattr(self, name).", + "builtins._TestClass.__eq__" => "Return self==value.", + "builtins._TestClass.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._TestClass.__ge__" => "Return self>=value.", + "builtins._TestClass.__getattribute__" => "Return getattr(self, name).", + "builtins._TestClass.__getstate__" => "Helper for pickle.", + "builtins._TestClass.__gt__" => "Return self>value.", + "builtins._TestClass.__hash__" => "Return hash(self).", + "builtins._TestClass.__init__" => "val -> _TestClass object with associated value val.\n\n>>> t = _TestClass(123)\n>>> print(t.get())\n123", + "builtins._TestClass.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._TestClass.__le__" => "Return self<=value.", + "builtins._TestClass.__lt__" => "Return self<value.", + "builtins._TestClass.__ne__" => "Return self!=value.", + "builtins._TestClass.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._TestClass.__reduce__" => "Helper for pickle.", + "builtins._TestClass.__reduce_ex__" => "Helper for pickle.", + "builtins._TestClass.__repr__" => "Return repr(self).", + "builtins._TestClass.__setattr__" => "Implement setattr(self, name, value).", + "builtins._TestClass.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._TestClass.__str__" => "Return str(self).", + "builtins._TestClass.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._TestClass.__weakref__" => "list of weak references to the object", + "builtins._TestClass.get" => "get() -> return TestClass's associated value.\n\n>>> x = _TestClass(-42)\n>>> print(x.get())\n-42", + "builtins._TestClass.square" => "square() -> square TestClass's associated value\n\n>>> _TestClass(13).square().get()\n169", + "builtins._ThreadHandle.__delattr__" => "Implement delattr(self, name).", + "builtins._ThreadHandle.__eq__" => "Return self==value.", + "builtins._ThreadHandle.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._ThreadHandle.__ge__" => "Return self>=value.", + "builtins._ThreadHandle.__getattribute__" => "Return getattr(self, name).", + "builtins._ThreadHandle.__getstate__" => "Helper for pickle.", + "builtins._ThreadHandle.__gt__" => "Return self>value.", + "builtins._ThreadHandle.__hash__" => "Return hash(self).", + "builtins._ThreadHandle.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._ThreadHandle.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._ThreadHandle.__le__" => "Return self<=value.", + "builtins._ThreadHandle.__lt__" => "Return self<value.", + "builtins._ThreadHandle.__ne__" => "Return self!=value.", + "builtins._ThreadHandle.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._ThreadHandle.__reduce__" => "Helper for pickle.", + "builtins._ThreadHandle.__reduce_ex__" => "Helper for pickle.", + "builtins._ThreadHandle.__repr__" => "Return repr(self).", + "builtins._ThreadHandle.__setattr__" => "Implement setattr(self, name, value).", + "builtins._ThreadHandle.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._ThreadHandle.__str__" => "Return str(self).", + "builtins._ThreadHandle.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._ThreadedChildWatcher" => "Threaded child watcher implementation.\n\nThe watcher uses a thread per process\nfor waiting for the process finish.\n\nIt doesn't require subscription on POSIX signal\nbut a thread creation is not free.\n\nThe watcher has O(1) complexity, its performance doesn't depend\non amount of spawn processes.", + "builtins._ThreadedChildWatcher.__delattr__" => "Implement delattr(self, name).", + "builtins._ThreadedChildWatcher.__eq__" => "Return self==value.", + "builtins._ThreadedChildWatcher.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._ThreadedChildWatcher.__ge__" => "Return self>=value.", + "builtins._ThreadedChildWatcher.__getattribute__" => "Return getattr(self, name).", + "builtins._ThreadedChildWatcher.__getstate__" => "Helper for pickle.", + "builtins._ThreadedChildWatcher.__gt__" => "Return self>value.", + "builtins._ThreadedChildWatcher.__hash__" => "Return hash(self).", + "builtins._ThreadedChildWatcher.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._ThreadedChildWatcher.__le__" => "Return self<=value.", + "builtins._ThreadedChildWatcher.__lt__" => "Return self<value.", + "builtins._ThreadedChildWatcher.__ne__" => "Return self!=value.", + "builtins._ThreadedChildWatcher.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._ThreadedChildWatcher.__reduce__" => "Helper for pickle.", + "builtins._ThreadedChildWatcher.__reduce_ex__" => "Helper for pickle.", + "builtins._ThreadedChildWatcher.__repr__" => "Return repr(self).", + "builtins._ThreadedChildWatcher.__setattr__" => "Implement setattr(self, name, value).", + "builtins._ThreadedChildWatcher.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._ThreadedChildWatcher.__str__" => "Return str(self).", + "builtins._ThreadedChildWatcher.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._ThreadedChildWatcher.__weakref__" => "list of weak references to the object", + "builtins._TurtleImage" => "Helper class: Datatype to store Turtle attributes", + "builtins._TurtleImage.__delattr__" => "Implement delattr(self, name).", + "builtins._TurtleImage.__eq__" => "Return self==value.", + "builtins._TurtleImage.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._TurtleImage.__ge__" => "Return self>=value.", + "builtins._TurtleImage.__getattribute__" => "Return getattr(self, name).", + "builtins._TurtleImage.__getstate__" => "Helper for pickle.", + "builtins._TurtleImage.__gt__" => "Return self>value.", + "builtins._TurtleImage.__hash__" => "Return hash(self).", + "builtins._TurtleImage.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._TurtleImage.__le__" => "Return self<=value.", + "builtins._TurtleImage.__lt__" => "Return self<value.", + "builtins._TurtleImage.__ne__" => "Return self!=value.", + "builtins._TurtleImage.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._TurtleImage.__reduce__" => "Helper for pickle.", + "builtins._TurtleImage.__reduce_ex__" => "Helper for pickle.", + "builtins._TurtleImage.__repr__" => "Return repr(self).", + "builtins._TurtleImage.__setattr__" => "Implement setattr(self, name, value).", + "builtins._TurtleImage.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._TurtleImage.__str__" => "Return str(self).", + "builtins._TurtleImage.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._TurtleImage.__weakref__" => "list of weak references to the object", + "builtins._TypingEllipsis" => "Internal placeholder for ... (ellipsis).", + "builtins._TypingEllipsis.__delattr__" => "Implement delattr(self, name).", + "builtins._TypingEllipsis.__eq__" => "Return self==value.", + "builtins._TypingEllipsis.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._TypingEllipsis.__ge__" => "Return self>=value.", + "builtins._TypingEllipsis.__getattribute__" => "Return getattr(self, name).", + "builtins._TypingEllipsis.__getstate__" => "Helper for pickle.", + "builtins._TypingEllipsis.__gt__" => "Return self>value.", + "builtins._TypingEllipsis.__hash__" => "Return hash(self).", + "builtins._TypingEllipsis.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._TypingEllipsis.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._TypingEllipsis.__le__" => "Return self<=value.", + "builtins._TypingEllipsis.__lt__" => "Return self<value.", + "builtins._TypingEllipsis.__ne__" => "Return self!=value.", + "builtins._TypingEllipsis.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._TypingEllipsis.__reduce__" => "Helper for pickle.", + "builtins._TypingEllipsis.__reduce_ex__" => "Helper for pickle.", + "builtins._TypingEllipsis.__repr__" => "Return repr(self).", + "builtins._TypingEllipsis.__setattr__" => "Implement setattr(self, name, value).", + "builtins._TypingEllipsis.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._TypingEllipsis.__str__" => "Return str(self).", + "builtins._TypingEllipsis.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._TypingEllipsis.__weakref__" => "list of weak references to the object", + "builtins._Unframer.__delattr__" => "Implement delattr(self, name).", + "builtins._Unframer.__eq__" => "Return self==value.", + "builtins._Unframer.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._Unframer.__ge__" => "Return self>=value.", + "builtins._Unframer.__getattribute__" => "Return getattr(self, name).", + "builtins._Unframer.__getstate__" => "Helper for pickle.", + "builtins._Unframer.__gt__" => "Return self>value.", + "builtins._Unframer.__hash__" => "Return hash(self).", + "builtins._Unframer.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._Unframer.__le__" => "Return self<=value.", + "builtins._Unframer.__lt__" => "Return self<value.", + "builtins._Unframer.__ne__" => "Return self!=value.", + "builtins._Unframer.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._Unframer.__reduce__" => "Helper for pickle.", + "builtins._Unframer.__reduce_ex__" => "Helper for pickle.", + "builtins._Unframer.__repr__" => "Return repr(self).", + "builtins._Unframer.__setattr__" => "Implement setattr(self, name, value).", + "builtins._Unframer.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._Unframer.__str__" => "Return str(self).", + "builtins._Unframer.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._Unframer.__weakref__" => "list of weak references to the object", + "builtins._UnionGenericAlias" => "Compatibility hack.\n\nA class named _UnionGenericAlias used to be used to implement\ntyping.Union. This class exists to serve as a shim to preserve\nthe meaning of some code that used to use _UnionGenericAlias\ndirectly.", + "builtins._UnionGenericAlias.__delattr__" => "Implement delattr(self, name).", + "builtins._UnionGenericAlias.__eq__" => "Return self==value.", + "builtins._UnionGenericAlias.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._UnionGenericAlias.__ge__" => "Return self>=value.", + "builtins._UnionGenericAlias.__getattribute__" => "Return getattr(self, name).", + "builtins._UnionGenericAlias.__getstate__" => "Helper for pickle.", + "builtins._UnionGenericAlias.__gt__" => "Return self>value.", + "builtins._UnionGenericAlias.__hash__" => "Return hash(self).", + "builtins._UnionGenericAlias.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._UnionGenericAlias.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._UnionGenericAlias.__le__" => "Return self<=value.", + "builtins._UnionGenericAlias.__lt__" => "Return self<value.", + "builtins._UnionGenericAlias.__ne__" => "Return self!=value.", + "builtins._UnionGenericAlias.__reduce__" => "Helper for pickle.", + "builtins._UnionGenericAlias.__reduce_ex__" => "Helper for pickle.", + "builtins._UnionGenericAlias.__repr__" => "Return repr(self).", + "builtins._UnionGenericAlias.__setattr__" => "Implement setattr(self, name, value).", + "builtins._UnionGenericAlias.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._UnionGenericAlias.__str__" => "Return str(self).", + "builtins._UnionGenericAlias.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._UnionGenericAlias.__weakref__" => "list of weak references to the object", + "builtins._Unknown.__delattr__" => "Implement delattr(self, name).", + "builtins._Unknown.__eq__" => "Return self==value.", + "builtins._Unknown.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._Unknown.__ge__" => "Return self>=value.", + "builtins._Unknown.__getattribute__" => "Return getattr(self, name).", + "builtins._Unknown.__getstate__" => "Helper for pickle.", + "builtins._Unknown.__gt__" => "Return self>value.", + "builtins._Unknown.__hash__" => "Return hash(self).", + "builtins._Unknown.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._Unknown.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._Unknown.__le__" => "Return self<=value.", + "builtins._Unknown.__lt__" => "Return self<value.", + "builtins._Unknown.__ne__" => "Return self!=value.", + "builtins._Unknown.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._Unknown.__reduce__" => "Helper for pickle.", + "builtins._Unknown.__reduce_ex__" => "Helper for pickle.", + "builtins._Unknown.__setattr__" => "Implement setattr(self, name, value).", + "builtins._Unknown.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._Unknown.__str__" => "Return str(self).", + "builtins._Unknown.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._Unknown.__weakref__" => "list of weak references to the object", + "builtins._UnnamedSection.__delattr__" => "Implement delattr(self, name).", + "builtins._UnnamedSection.__eq__" => "Return self==value.", + "builtins._UnnamedSection.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._UnnamedSection.__ge__" => "Return self>=value.", + "builtins._UnnamedSection.__getattribute__" => "Return getattr(self, name).", + "builtins._UnnamedSection.__getstate__" => "Helper for pickle.", + "builtins._UnnamedSection.__gt__" => "Return self>value.", + "builtins._UnnamedSection.__hash__" => "Return hash(self).", + "builtins._UnnamedSection.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._UnnamedSection.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._UnnamedSection.__le__" => "Return self<=value.", + "builtins._UnnamedSection.__lt__" => "Return self<value.", + "builtins._UnnamedSection.__ne__" => "Return self!=value.", + "builtins._UnnamedSection.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._UnnamedSection.__reduce__" => "Helper for pickle.", + "builtins._UnnamedSection.__reduce_ex__" => "Helper for pickle.", + "builtins._UnnamedSection.__setattr__" => "Implement setattr(self, name, value).", + "builtins._UnnamedSection.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._UnnamedSection.__str__" => "Return str(self).", + "builtins._UnnamedSection.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._UnnamedSection.__weakref__" => "list of weak references to the object", + "builtins._Unpickler.__delattr__" => "Implement delattr(self, name).", + "builtins._Unpickler.__eq__" => "Return self==value.", + "builtins._Unpickler.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._Unpickler.__ge__" => "Return self>=value.", + "builtins._Unpickler.__getattribute__" => "Return getattr(self, name).", + "builtins._Unpickler.__getstate__" => "Helper for pickle.", + "builtins._Unpickler.__gt__" => "Return self>value.", + "builtins._Unpickler.__hash__" => "Return hash(self).", + "builtins._Unpickler.__init__" => "This takes a binary file for reading a pickle data stream.\n\nThe protocol version of the pickle is detected automatically, so\nno proto argument is needed.\n\nThe argument *file* must have two methods, a read() method that\ntakes an integer argument, and a readline() method that requires\nno arguments. Both methods should return bytes. Thus *file*\ncan be a binary file object opened for reading, an io.BytesIO\nobject, or any other custom object that meets this interface.\n\nThe file-like object must have two methods, a read() method\nthat takes an integer argument, and a readline() method that\nrequires no arguments. Both methods should return bytes.\nThus file-like object can be a binary file object opened for\nreading, a BytesIO object, or any other custom object that\nmeets this interface.\n\nIf *buffers* is not None, it should be an iterable of buffer-enabled\nobjects that is consumed each time the pickle stream references\nan out-of-band buffer view. Such buffers have been given in order\nto the *buffer_callback* of a Pickler object.\n\nIf *buffers* is None (the default), then the buffers are taken\nfrom the pickle stream, assuming they are serialized there.\nIt is an error for *buffers* to be None if the pickle stream\nwas produced with a non-None *buffer_callback*.\n\nOther optional arguments are *fix_imports*, *encoding* and\n*errors*, which are used to control compatibility support for\npickle stream generated by Python 2. If *fix_imports* is True,\npickle will try to map the old Python 2 names to the new names\nused in Python 3. The *encoding* and *errors* tell pickle how\nto decode 8-bit string instances pickled by Python 2; these\ndefault to 'ASCII' and 'strict', respectively. *encoding* can be\n'bytes' to read these 8-bit string instances as bytes objects.", + "builtins._Unpickler.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._Unpickler.__le__" => "Return self<=value.", + "builtins._Unpickler.__lt__" => "Return self<value.", + "builtins._Unpickler.__ne__" => "Return self!=value.", + "builtins._Unpickler.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._Unpickler.__reduce__" => "Helper for pickle.", + "builtins._Unpickler.__reduce_ex__" => "Helper for pickle.", + "builtins._Unpickler.__repr__" => "Return repr(self).", + "builtins._Unpickler.__setattr__" => "Implement setattr(self, name, value).", + "builtins._Unpickler.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._Unpickler.__str__" => "Return str(self).", + "builtins._Unpickler.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._Unpickler.__weakref__" => "list of weak references to the object", + "builtins._Unpickler.load" => "Read a pickled object representation from the open file.\n\nReturn the reconstituted object hierarchy specified in the file.", + "builtins._Utils" => "Support class for utility functions which are shared by\nprofile.py and cProfile.py modules.\nNot supposed to be used directly.", + "builtins._Utils.__delattr__" => "Implement delattr(self, name).", + "builtins._Utils.__eq__" => "Return self==value.", + "builtins._Utils.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._Utils.__ge__" => "Return self>=value.", + "builtins._Utils.__getattribute__" => "Return getattr(self, name).", + "builtins._Utils.__getstate__" => "Helper for pickle.", + "builtins._Utils.__gt__" => "Return self>value.", + "builtins._Utils.__hash__" => "Return hash(self).", + "builtins._Utils.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._Utils.__le__" => "Return self<=value.", + "builtins._Utils.__lt__" => "Return self<value.", + "builtins._Utils.__ne__" => "Return self!=value.", + "builtins._Utils.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._Utils.__reduce__" => "Helper for pickle.", + "builtins._Utils.__reduce_ex__" => "Helper for pickle.", + "builtins._Utils.__repr__" => "Return repr(self).", + "builtins._Utils.__setattr__" => "Implement setattr(self, name, value).", + "builtins._Utils.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._Utils.__str__" => "Return str(self).", + "builtins._Utils.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._Utils.__weakref__" => "list of weak references to the object", + "builtins._ValueFormatter.__delattr__" => "Implement delattr(self, name).", + "builtins._ValueFormatter.__eq__" => "Return self==value.", + "builtins._ValueFormatter.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._ValueFormatter.__ge__" => "Return self>=value.", + "builtins._ValueFormatter.__getattribute__" => "Return getattr(self, name).", + "builtins._ValueFormatter.__getstate__" => "Helper for pickle.", + "builtins._ValueFormatter.__gt__" => "Return self>value.", + "builtins._ValueFormatter.__hash__" => "Return hash(self).", + "builtins._ValueFormatter.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._ValueFormatter.__le__" => "Return self<=value.", + "builtins._ValueFormatter.__lt__" => "Return self<value.", + "builtins._ValueFormatter.__ne__" => "Return self!=value.", + "builtins._ValueFormatter.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._ValueFormatter.__reduce__" => "Helper for pickle.", + "builtins._ValueFormatter.__reduce_ex__" => "Helper for pickle.", + "builtins._ValueFormatter.__repr__" => "Return repr(self).", + "builtins._ValueFormatter.__setattr__" => "Implement setattr(self, name, value).", + "builtins._ValueFormatter.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._ValueFormatter.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._ValueFormatter.__weakref__" => "list of weak references to the object", + "builtins._Waiter" => "Provides the event that wait() and as_completed() block on.", + "builtins._Waiter.__delattr__" => "Implement delattr(self, name).", + "builtins._Waiter.__eq__" => "Return self==value.", + "builtins._Waiter.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._Waiter.__ge__" => "Return self>=value.", + "builtins._Waiter.__getattribute__" => "Return getattr(self, name).", + "builtins._Waiter.__getstate__" => "Helper for pickle.", + "builtins._Waiter.__gt__" => "Return self>value.", + "builtins._Waiter.__hash__" => "Return hash(self).", + "builtins._Waiter.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._Waiter.__le__" => "Return self<=value.", + "builtins._Waiter.__lt__" => "Return self<value.", + "builtins._Waiter.__ne__" => "Return self!=value.", + "builtins._Waiter.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._Waiter.__reduce__" => "Helper for pickle.", + "builtins._Waiter.__reduce_ex__" => "Helper for pickle.", + "builtins._Waiter.__repr__" => "Return repr(self).", + "builtins._Waiter.__setattr__" => "Implement setattr(self, name, value).", + "builtins._Waiter.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._Waiter.__str__" => "Return str(self).", + "builtins._Waiter.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._Waiter.__weakref__" => "list of weak references to the object", + "builtins._WeakValueDictionary.__delattr__" => "Implement delattr(self, name).", + "builtins._WeakValueDictionary.__eq__" => "Return self==value.", + "builtins._WeakValueDictionary.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._WeakValueDictionary.__ge__" => "Return self>=value.", + "builtins._WeakValueDictionary.__getattribute__" => "Return getattr(self, name).", + "builtins._WeakValueDictionary.__getstate__" => "Helper for pickle.", + "builtins._WeakValueDictionary.__gt__" => "Return self>value.", + "builtins._WeakValueDictionary.__hash__" => "Return hash(self).", + "builtins._WeakValueDictionary.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._WeakValueDictionary.__le__" => "Return self<=value.", + "builtins._WeakValueDictionary.__lt__" => "Return self<value.", + "builtins._WeakValueDictionary.__ne__" => "Return self!=value.", + "builtins._WeakValueDictionary.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._WeakValueDictionary.__reduce__" => "Helper for pickle.", + "builtins._WeakValueDictionary.__reduce_ex__" => "Helper for pickle.", + "builtins._WeakValueDictionary.__repr__" => "Return repr(self).", + "builtins._WeakValueDictionary.__setattr__" => "Implement setattr(self, name, value).", + "builtins._WeakValueDictionary.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._WeakValueDictionary.__str__" => "Return str(self).", + "builtins._WeakValueDictionary.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._WeakValueDictionary.__weakref__" => "list of weak references to the object", + "builtins._WorkRep.__delattr__" => "Implement delattr(self, name).", + "builtins._WorkRep.__eq__" => "Return self==value.", + "builtins._WorkRep.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._WorkRep.__ge__" => "Return self>=value.", + "builtins._WorkRep.__getattribute__" => "Return getattr(self, name).", + "builtins._WorkRep.__getstate__" => "Helper for pickle.", + "builtins._WorkRep.__gt__" => "Return self>value.", + "builtins._WorkRep.__hash__" => "Return hash(self).", + "builtins._WorkRep.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._WorkRep.__le__" => "Return self<=value.", + "builtins._WorkRep.__lt__" => "Return self<value.", + "builtins._WorkRep.__ne__" => "Return self!=value.", + "builtins._WorkRep.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._WorkRep.__reduce__" => "Helper for pickle.", + "builtins._WorkRep.__reduce_ex__" => "Helper for pickle.", + "builtins._WorkRep.__setattr__" => "Implement setattr(self, name, value).", + "builtins._WorkRep.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._WorkRep.__str__" => "Return str(self).", + "builtins._WorkRep.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._WritelnDecorator" => "Used to decorate file-like objects with a handy 'writeln' method", + "builtins._WritelnDecorator.__delattr__" => "Implement delattr(self, name).", + "builtins._WritelnDecorator.__eq__" => "Return self==value.", + "builtins._WritelnDecorator.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._WritelnDecorator.__ge__" => "Return self>=value.", + "builtins._WritelnDecorator.__getattribute__" => "Return getattr(self, name).", + "builtins._WritelnDecorator.__getstate__" => "Helper for pickle.", + "builtins._WritelnDecorator.__gt__" => "Return self>value.", + "builtins._WritelnDecorator.__hash__" => "Return hash(self).", + "builtins._WritelnDecorator.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._WritelnDecorator.__le__" => "Return self<=value.", + "builtins._WritelnDecorator.__lt__" => "Return self<value.", + "builtins._WritelnDecorator.__ne__" => "Return self!=value.", + "builtins._WritelnDecorator.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._WritelnDecorator.__reduce__" => "Helper for pickle.", + "builtins._WritelnDecorator.__reduce_ex__" => "Helper for pickle.", + "builtins._WritelnDecorator.__repr__" => "Return repr(self).", + "builtins._WritelnDecorator.__setattr__" => "Implement setattr(self, name, value).", + "builtins._WritelnDecorator.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._WritelnDecorator.__str__" => "Return str(self).", + "builtins._WritelnDecorator.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._WritelnDecorator.__weakref__" => "list of weak references to the object", + "builtins._ZlibDecompressor" => "Create a decompressor object for decompressing data incrementally.\n\n wbits = 15\n zdict\n The predefined compression dictionary. This is a sequence of bytes\n (such as a bytes object) containing subsequences that are expected\n to occur frequently in the data that is to be compressed. Those\n subsequences that are expected to be most common should come at the\n end of the dictionary. This must be the same dictionary as used by the\n compressor that produced the input data.", + "builtins._ZlibDecompressor.__delattr__" => "Implement delattr(self, name).", + "builtins._ZlibDecompressor.__eq__" => "Return self==value.", + "builtins._ZlibDecompressor.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._ZlibDecompressor.__ge__" => "Return self>=value.", + "builtins._ZlibDecompressor.__getattribute__" => "Return getattr(self, name).", + "builtins._ZlibDecompressor.__getstate__" => "Helper for pickle.", + "builtins._ZlibDecompressor.__gt__" => "Return self>value.", + "builtins._ZlibDecompressor.__hash__" => "Return hash(self).", + "builtins._ZlibDecompressor.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._ZlibDecompressor.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._ZlibDecompressor.__le__" => "Return self<=value.", + "builtins._ZlibDecompressor.__lt__" => "Return self<value.", + "builtins._ZlibDecompressor.__ne__" => "Return self!=value.", + "builtins._ZlibDecompressor.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._ZlibDecompressor.__reduce__" => "Helper for pickle.", + "builtins._ZlibDecompressor.__reduce_ex__" => "Helper for pickle.", + "builtins._ZlibDecompressor.__repr__" => "Return repr(self).", + "builtins._ZlibDecompressor.__setattr__" => "Implement setattr(self, name, value).", + "builtins._ZlibDecompressor.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._ZlibDecompressor.__str__" => "Return str(self).", + "builtins._ZlibDecompressor.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._ZlibDecompressor.decompress" => "Decompress *data*, returning uncompressed data as bytes.\n\nIf *max_length* is nonnegative, returns at most *max_length* bytes\nof decompressed data. If this limit is reached and further output\ncan be produced, *self.needs_input* will be set to ``False``. In\nthis case, the next call to *decompress()* may provide *data* as b''\nto obtain more of the output.\n\nIf all of the input data was decompressed and returned (either\nbecause this was less than *max_length* bytes, or because\n*max_length* was negative), *self.needs_input* will be set to True.\n\nAttempting to decompress data after the end of stream is reached\nraises an EOFError. Any data found after the end of the stream is\nignored and saved in the unused_data attribute.", + "builtins._ZlibDecompressor.eof" => "True if the end-of-stream marker has been reached.", + "builtins._ZlibDecompressor.needs_input" => "True if more input is needed before more decompressed data can be produced.", + "builtins._ZlibDecompressor.unused_data" => "Data found after the end of the compressed stream.", "builtins.__build_class__" => "__build_class__(func, name, /, *bases, [metaclass], **kwds) -> class\n\nInternal helper function used by the class statement.", "builtins.__import__" => "Import a module.\n\nBecause this function is meant for use by the Python\ninterpreter and not for general use, it is better to use\nimportlib.import_module() to programmatically import a module.\n\nThe globals argument is only used to determine the context;\nthey are not modified. The locals argument is unused. The fromlist\nshould be a list of names to emulate ``from name import ...``, or an\nempty list to emulate ``import name``.\nWhen importing a module from a package, note that __import__('A.B', ...)\nreturns package A when fromlist is empty, but its submodule B when\nfromlist is not empty. The level argument is used to determine whether\nto perform absolute or relative imports: 0 is absolute, while a positive\nnumber is the number of parent directories to search relative to the\ncurrent module.", + "builtins._abc_data" => "Internal state held by ABC machinery.", + "builtins._abc_data.__delattr__" => "Implement delattr(self, name).", + "builtins._abc_data.__eq__" => "Return self==value.", + "builtins._abc_data.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._abc_data.__ge__" => "Return self>=value.", + "builtins._abc_data.__getattribute__" => "Return getattr(self, name).", + "builtins._abc_data.__getstate__" => "Helper for pickle.", + "builtins._abc_data.__gt__" => "Return self>value.", + "builtins._abc_data.__hash__" => "Return hash(self).", + "builtins._abc_data.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._abc_data.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._abc_data.__le__" => "Return self<=value.", + "builtins._abc_data.__lt__" => "Return self<value.", + "builtins._abc_data.__ne__" => "Return self!=value.", + "builtins._abc_data.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._abc_data.__reduce__" => "Helper for pickle.", + "builtins._abc_data.__reduce_ex__" => "Helper for pickle.", + "builtins._abc_data.__repr__" => "Return repr(self).", + "builtins._abc_data.__setattr__" => "Implement setattr(self, name, value).", + "builtins._abc_data.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._abc_data.__str__" => "Return str(self).", + "builtins._abc_data.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._auto_null.__delattr__" => "Implement delattr(self, name).", + "builtins._auto_null.__eq__" => "Return self==value.", + "builtins._auto_null.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._auto_null.__ge__" => "Return self>=value.", + "builtins._auto_null.__getattribute__" => "Return getattr(self, name).", + "builtins._auto_null.__getstate__" => "Helper for pickle.", + "builtins._auto_null.__gt__" => "Return self>value.", + "builtins._auto_null.__hash__" => "Return hash(self).", + "builtins._auto_null.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._auto_null.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._auto_null.__le__" => "Return self<=value.", + "builtins._auto_null.__lt__" => "Return self<value.", + "builtins._auto_null.__ne__" => "Return self!=value.", + "builtins._auto_null.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._auto_null.__reduce__" => "Helper for pickle.", + "builtins._auto_null.__reduce_ex__" => "Helper for pickle.", + "builtins._auto_null.__setattr__" => "Implement setattr(self, name, value).", + "builtins._auto_null.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._auto_null.__str__" => "Return str(self).", + "builtins._auto_null.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._auto_null.__weakref__" => "list of weak references to the object", + "builtins._buffer_wrapper.__delattr__" => "Implement delattr(self, name).", + "builtins._buffer_wrapper.__eq__" => "Return self==value.", + "builtins._buffer_wrapper.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._buffer_wrapper.__ge__" => "Return self>=value.", + "builtins._buffer_wrapper.__getattribute__" => "Return getattr(self, name).", + "builtins._buffer_wrapper.__getstate__" => "Helper for pickle.", + "builtins._buffer_wrapper.__gt__" => "Return self>value.", + "builtins._buffer_wrapper.__hash__" => "Return hash(self).", + "builtins._buffer_wrapper.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._buffer_wrapper.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._buffer_wrapper.__le__" => "Return self<=value.", + "builtins._buffer_wrapper.__lt__" => "Return self<value.", + "builtins._buffer_wrapper.__ne__" => "Return self!=value.", + "builtins._buffer_wrapper.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._buffer_wrapper.__reduce__" => "Helper for pickle.", + "builtins._buffer_wrapper.__reduce_ex__" => "Helper for pickle.", + "builtins._buffer_wrapper.__release_buffer__" => "Release the buffer object that exposes the underlying memory of the object.", + "builtins._buffer_wrapper.__repr__" => "Return repr(self).", + "builtins._buffer_wrapper.__setattr__" => "Implement setattr(self, name, value).", + "builtins._buffer_wrapper.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._buffer_wrapper.__str__" => "Return str(self).", + "builtins._buffer_wrapper.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._del_safe.WIFSTOPPED" => "Return True if the process returning status was stopped.", + "builtins._del_safe.WSTOPSIG" => "Return the signal that stopped the process that provided the status value.", + "builtins._del_safe.__delattr__" => "Implement delattr(self, name).", + "builtins._del_safe.__eq__" => "Return self==value.", + "builtins._del_safe.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._del_safe.__ge__" => "Return self>=value.", + "builtins._del_safe.__getattribute__" => "Return getattr(self, name).", + "builtins._del_safe.__getstate__" => "Helper for pickle.", + "builtins._del_safe.__gt__" => "Return self>value.", + "builtins._del_safe.__hash__" => "Return hash(self).", + "builtins._del_safe.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._del_safe.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._del_safe.__le__" => "Return self<=value.", + "builtins._del_safe.__lt__" => "Return self<value.", + "builtins._del_safe.__ne__" => "Return self!=value.", + "builtins._del_safe.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._del_safe.__reduce__" => "Helper for pickle.", + "builtins._del_safe.__reduce_ex__" => "Helper for pickle.", + "builtins._del_safe.__repr__" => "Return repr(self).", + "builtins._del_safe.__setattr__" => "Implement setattr(self, name, value).", + "builtins._del_safe.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._del_safe.__str__" => "Return str(self).", + "builtins._del_safe.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._del_safe.__weakref__" => "list of weak references to the object", + "builtins._del_safe.waitpid" => "Wait for completion of a given child process.\n\nReturns a tuple of information regarding the child process:\n (pid, status)\n\nThe options argument is ignored on Windows.", + "builtins._del_safe.waitstatus_to_exitcode" => "Convert a wait status to an exit code.\n\nOn Unix:\n\n* If WIFEXITED(status) is true, return WEXITSTATUS(status).\n* If WIFSIGNALED(status) is true, return -WTERMSIG(status).\n* Otherwise, raise a ValueError.\n\nOn Windows, return status shifted right by 8 bits.\n\nOn Unix, if the process is being traced or if waitpid() was called with\nWUNTRACED option, the caller must first check if WIFSTOPPED(status) is\ntrue. This function must not be called if WIFSTOPPED(status) is true.", + "builtins._deque_iterator.__delattr__" => "Implement delattr(self, name).", + "builtins._deque_iterator.__eq__" => "Return self==value.", + "builtins._deque_iterator.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._deque_iterator.__ge__" => "Return self>=value.", + "builtins._deque_iterator.__getattribute__" => "Return getattr(self, name).", + "builtins._deque_iterator.__getstate__" => "Helper for pickle.", + "builtins._deque_iterator.__gt__" => "Return self>value.", + "builtins._deque_iterator.__hash__" => "Return hash(self).", + "builtins._deque_iterator.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._deque_iterator.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._deque_iterator.__iter__" => "Implement iter(self).", + "builtins._deque_iterator.__le__" => "Return self<=value.", + "builtins._deque_iterator.__length_hint__" => "Private method returning an estimate of len(list(it)).", + "builtins._deque_iterator.__lt__" => "Return self<value.", + "builtins._deque_iterator.__ne__" => "Return self!=value.", + "builtins._deque_iterator.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._deque_iterator.__next__" => "Implement next(self).", + "builtins._deque_iterator.__reduce__" => "Return state information for pickling.", + "builtins._deque_iterator.__reduce_ex__" => "Helper for pickle.", + "builtins._deque_iterator.__repr__" => "Return repr(self).", + "builtins._deque_iterator.__setattr__" => "Implement setattr(self, name, value).", + "builtins._deque_iterator.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._deque_iterator.__str__" => "Return str(self).", + "builtins._deque_iterator.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._deque_reverse_iterator.__delattr__" => "Implement delattr(self, name).", + "builtins._deque_reverse_iterator.__eq__" => "Return self==value.", + "builtins._deque_reverse_iterator.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._deque_reverse_iterator.__ge__" => "Return self>=value.", + "builtins._deque_reverse_iterator.__getattribute__" => "Return getattr(self, name).", + "builtins._deque_reverse_iterator.__getstate__" => "Helper for pickle.", + "builtins._deque_reverse_iterator.__gt__" => "Return self>value.", + "builtins._deque_reverse_iterator.__hash__" => "Return hash(self).", + "builtins._deque_reverse_iterator.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._deque_reverse_iterator.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._deque_reverse_iterator.__iter__" => "Implement iter(self).", + "builtins._deque_reverse_iterator.__le__" => "Return self<=value.", + "builtins._deque_reverse_iterator.__length_hint__" => "Private method returning an estimate of len(list(it)).", + "builtins._deque_reverse_iterator.__lt__" => "Return self<value.", + "builtins._deque_reverse_iterator.__ne__" => "Return self!=value.", + "builtins._deque_reverse_iterator.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._deque_reverse_iterator.__next__" => "Implement next(self).", + "builtins._deque_reverse_iterator.__reduce__" => "Return state information for pickling.", + "builtins._deque_reverse_iterator.__reduce_ex__" => "Helper for pickle.", + "builtins._deque_reverse_iterator.__repr__" => "Return repr(self).", + "builtins._deque_reverse_iterator.__setattr__" => "Implement setattr(self, name, value).", + "builtins._deque_reverse_iterator.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._deque_reverse_iterator.__str__" => "Return str(self).", + "builtins._deque_reverse_iterator.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._element_iterator.__delattr__" => "Implement delattr(self, name).", + "builtins._element_iterator.__eq__" => "Return self==value.", + "builtins._element_iterator.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._element_iterator.__ge__" => "Return self>=value.", + "builtins._element_iterator.__getattribute__" => "Return getattr(self, name).", + "builtins._element_iterator.__getstate__" => "Helper for pickle.", + "builtins._element_iterator.__gt__" => "Return self>value.", + "builtins._element_iterator.__hash__" => "Return hash(self).", + "builtins._element_iterator.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._element_iterator.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._element_iterator.__iter__" => "Implement iter(self).", + "builtins._element_iterator.__le__" => "Return self<=value.", + "builtins._element_iterator.__lt__" => "Return self<value.", + "builtins._element_iterator.__ne__" => "Return self!=value.", + "builtins._element_iterator.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._element_iterator.__next__" => "Implement next(self).", + "builtins._element_iterator.__reduce__" => "Helper for pickle.", + "builtins._element_iterator.__reduce_ex__" => "Helper for pickle.", + "builtins._element_iterator.__repr__" => "Return repr(self).", + "builtins._element_iterator.__setattr__" => "Implement setattr(self, name, value).", + "builtins._element_iterator.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._element_iterator.__str__" => "Return str(self).", + "builtins._element_iterator.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._empty" => "Marker object for Signature.empty and Parameter.empty.", + "builtins._empty.__delattr__" => "Implement delattr(self, name).", + "builtins._empty.__eq__" => "Return self==value.", + "builtins._empty.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._empty.__ge__" => "Return self>=value.", + "builtins._empty.__getattribute__" => "Return getattr(self, name).", + "builtins._empty.__getstate__" => "Helper for pickle.", + "builtins._empty.__gt__" => "Return self>value.", + "builtins._empty.__hash__" => "Return hash(self).", + "builtins._empty.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._empty.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._empty.__le__" => "Return self<=value.", + "builtins._empty.__lt__" => "Return self<value.", + "builtins._empty.__ne__" => "Return self!=value.", + "builtins._empty.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._empty.__reduce__" => "Helper for pickle.", + "builtins._empty.__reduce_ex__" => "Helper for pickle.", + "builtins._empty.__repr__" => "Return repr(self).", + "builtins._empty.__setattr__" => "Implement setattr(self, name, value).", + "builtins._empty.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._empty.__str__" => "Return str(self).", + "builtins._empty.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._empty.__weakref__" => "list of weak references to the object", + "builtins._grouper.__delattr__" => "Implement delattr(self, name).", + "builtins._grouper.__eq__" => "Return self==value.", + "builtins._grouper.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._grouper.__ge__" => "Return self>=value.", + "builtins._grouper.__getattribute__" => "Return getattr(self, name).", + "builtins._grouper.__getstate__" => "Helper for pickle.", + "builtins._grouper.__gt__" => "Return self>value.", + "builtins._grouper.__hash__" => "Return hash(self).", + "builtins._grouper.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._grouper.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._grouper.__iter__" => "Implement iter(self).", + "builtins._grouper.__le__" => "Return self<=value.", + "builtins._grouper.__lt__" => "Return self<value.", + "builtins._grouper.__ne__" => "Return self!=value.", + "builtins._grouper.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._grouper.__next__" => "Implement next(self).", + "builtins._grouper.__reduce__" => "Helper for pickle.", + "builtins._grouper.__reduce_ex__" => "Helper for pickle.", + "builtins._grouper.__repr__" => "Return repr(self).", + "builtins._grouper.__setattr__" => "Implement setattr(self, name, value).", + "builtins._grouper.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._grouper.__str__" => "Return str(self).", + "builtins._grouper.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._incompatible_extension_module_restrictions" => "A context manager that can temporarily skip the compatibility check.\n\nNOTE: This function is meant to accommodate an unusual case; one\nwhich is likely to eventually go away. There's is a pretty good\nchance this is not what you were looking for.\n\nWARNING: Using this function to disable the check can lead to\nunexpected behavior and even crashes. It should only be used during\nextension module development.\n\nIf \"disable_check\" is True then the compatibility check will not\nhappen while the context manager is active. Otherwise the check\n*will* happen.\n\nNormally, extensions that do not support multiple interpreters\nmay not be imported in a subinterpreter. That implies modules\nthat do not implement multi-phase init or that explicitly of out.\n\nLikewise for modules import in a subinterpreter with its own GIL\nwhen the extension does not support a per-interpreter GIL. This\nimplies the module does not have a Py_mod_multiple_interpreters slot\nset to Py_MOD_PER_INTERPRETER_GIL_SUPPORTED.\n\nIn both cases, this context manager may be used to temporarily\ndisable the check for compatible extension modules.\n\nYou can get the same effect as this function by implementing the\nbasic interface of multi-phase init (PEP 489) and lying about\nsupport for multiple interpreters (or per-interpreter GIL).", + "builtins._incompatible_extension_module_restrictions.__delattr__" => "Implement delattr(self, name).", + "builtins._incompatible_extension_module_restrictions.__eq__" => "Return self==value.", + "builtins._incompatible_extension_module_restrictions.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._incompatible_extension_module_restrictions.__ge__" => "Return self>=value.", + "builtins._incompatible_extension_module_restrictions.__getattribute__" => "Return getattr(self, name).", + "builtins._incompatible_extension_module_restrictions.__getstate__" => "Helper for pickle.", + "builtins._incompatible_extension_module_restrictions.__gt__" => "Return self>value.", + "builtins._incompatible_extension_module_restrictions.__hash__" => "Return hash(self).", + "builtins._incompatible_extension_module_restrictions.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._incompatible_extension_module_restrictions.__le__" => "Return self<=value.", + "builtins._incompatible_extension_module_restrictions.__lt__" => "Return self<value.", + "builtins._incompatible_extension_module_restrictions.__ne__" => "Return self!=value.", + "builtins._incompatible_extension_module_restrictions.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._incompatible_extension_module_restrictions.__reduce__" => "Helper for pickle.", + "builtins._incompatible_extension_module_restrictions.__reduce_ex__" => "Helper for pickle.", + "builtins._incompatible_extension_module_restrictions.__repr__" => "Return repr(self).", + "builtins._incompatible_extension_module_restrictions.__setattr__" => "Implement setattr(self, name, value).", + "builtins._incompatible_extension_module_restrictions.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._incompatible_extension_module_restrictions.__str__" => "Return str(self).", + "builtins._incompatible_extension_module_restrictions.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._incompatible_extension_module_restrictions.__weakref__" => "list of weak references to the object", + "builtins._local" => "Thread-local data", + "builtins._local.__delattr__" => "Implement delattr(self, name).", + "builtins._local.__eq__" => "Return self==value.", + "builtins._local.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._local.__ge__" => "Return self>=value.", + "builtins._local.__getattribute__" => "Return getattr(self, name).", + "builtins._local.__getstate__" => "Helper for pickle.", + "builtins._local.__gt__" => "Return self>value.", + "builtins._local.__hash__" => "Return hash(self).", + "builtins._local.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._local.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._local.__le__" => "Return self<=value.", + "builtins._local.__lt__" => "Return self<value.", + "builtins._local.__ne__" => "Return self!=value.", + "builtins._local.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._local.__reduce__" => "Helper for pickle.", + "builtins._local.__reduce_ex__" => "Helper for pickle.", + "builtins._local.__repr__" => "Return repr(self).", + "builtins._local.__setattr__" => "Implement setattr(self, name, value).", + "builtins._local.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._local.__str__" => "Return str(self).", + "builtins._local.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._localdummy" => "Thread-local dummy", + "builtins._localdummy.__delattr__" => "Implement delattr(self, name).", + "builtins._localdummy.__eq__" => "Return self==value.", + "builtins._localdummy.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._localdummy.__ge__" => "Return self>=value.", + "builtins._localdummy.__getattribute__" => "Return getattr(self, name).", + "builtins._localdummy.__getstate__" => "Helper for pickle.", + "builtins._localdummy.__gt__" => "Return self>value.", + "builtins._localdummy.__hash__" => "Return hash(self).", + "builtins._localdummy.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._localdummy.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._localdummy.__le__" => "Return self<=value.", + "builtins._localdummy.__lt__" => "Return self<value.", + "builtins._localdummy.__ne__" => "Return self!=value.", + "builtins._localdummy.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._localdummy.__reduce__" => "Helper for pickle.", + "builtins._localdummy.__reduce_ex__" => "Helper for pickle.", + "builtins._localdummy.__repr__" => "Return repr(self).", + "builtins._localdummy.__setattr__" => "Implement setattr(self, name, value).", + "builtins._localdummy.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._localdummy.__str__" => "Return str(self).", + "builtins._localdummy.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._localimpl" => "A class managing thread-local dicts", + "builtins._localimpl.__delattr__" => "Implement delattr(self, name).", + "builtins._localimpl.__eq__" => "Return self==value.", + "builtins._localimpl.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._localimpl.__ge__" => "Return self>=value.", + "builtins._localimpl.__getattribute__" => "Return getattr(self, name).", + "builtins._localimpl.__getstate__" => "Helper for pickle.", + "builtins._localimpl.__gt__" => "Return self>value.", + "builtins._localimpl.__hash__" => "Return hash(self).", + "builtins._localimpl.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._localimpl.__le__" => "Return self<=value.", + "builtins._localimpl.__lt__" => "Return self<value.", + "builtins._localimpl.__ne__" => "Return self!=value.", + "builtins._localimpl.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._localimpl.__reduce__" => "Helper for pickle.", + "builtins._localimpl.__reduce_ex__" => "Helper for pickle.", + "builtins._localimpl.__repr__" => "Return repr(self).", + "builtins._localimpl.__setattr__" => "Implement setattr(self, name, value).", + "builtins._localimpl.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._localimpl.__str__" => "Return str(self).", + "builtins._localimpl.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._localimpl.__weakref__" => "list of weak references to the object", + "builtins._localimpl.create_dict" => "Create a new dict for the current thread, and return it.", + "builtins._localimpl.get_dict" => "Return the dict for the current thread. Raises KeyError if none\ndefined.", + "builtins._localized_day.__delattr__" => "Implement delattr(self, name).", + "builtins._localized_day.__eq__" => "Return self==value.", + "builtins._localized_day.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._localized_day.__ge__" => "Return self>=value.", + "builtins._localized_day.__getattribute__" => "Return getattr(self, name).", + "builtins._localized_day.__getstate__" => "Helper for pickle.", + "builtins._localized_day.__gt__" => "Return self>value.", + "builtins._localized_day.__hash__" => "Return hash(self).", + "builtins._localized_day.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._localized_day.__le__" => "Return self<=value.", + "builtins._localized_day.__lt__" => "Return self<value.", + "builtins._localized_day.__ne__" => "Return self!=value.", + "builtins._localized_day.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._localized_day.__reduce__" => "Helper for pickle.", + "builtins._localized_day.__reduce_ex__" => "Helper for pickle.", + "builtins._localized_day.__repr__" => "Return repr(self).", + "builtins._localized_day.__setattr__" => "Implement setattr(self, name, value).", + "builtins._localized_day.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._localized_day.__str__" => "Return str(self).", + "builtins._localized_day.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._localized_day.__weakref__" => "list of weak references to the object", + "builtins._localized_month.__delattr__" => "Implement delattr(self, name).", + "builtins._localized_month.__eq__" => "Return self==value.", + "builtins._localized_month.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._localized_month.__ge__" => "Return self>=value.", + "builtins._localized_month.__getattribute__" => "Return getattr(self, name).", + "builtins._localized_month.__getstate__" => "Helper for pickle.", + "builtins._localized_month.__gt__" => "Return self>value.", + "builtins._localized_month.__hash__" => "Return hash(self).", + "builtins._localized_month.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._localized_month.__le__" => "Return self<=value.", + "builtins._localized_month.__lt__" => "Return self<value.", + "builtins._localized_month.__ne__" => "Return self!=value.", + "builtins._localized_month.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._localized_month.__reduce__" => "Helper for pickle.", + "builtins._localized_month.__reduce_ex__" => "Helper for pickle.", + "builtins._localized_month.__repr__" => "Return repr(self).", + "builtins._localized_month.__setattr__" => "Implement setattr(self, name, value).", + "builtins._localized_month.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._localized_month.__str__" => "Return str(self).", + "builtins._localized_month.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._localized_month.__weakref__" => "list of weak references to the object", + "builtins._lru_cache_wrapper" => "Create a cached callable that wraps another function.\n\nuser_function: the function being cached\n\nmaxsize: 0 for no caching\n None for unlimited cache size\n n for a bounded cache\n\ntyped: False cache f(3) and f(3.0) as identical calls\n True cache f(3) and f(3.0) as distinct calls\n\ncache_info_type: namedtuple class with the fields:\n hits misses currsize maxsize", + "builtins._lru_cache_wrapper.__call__" => "Call self as a function.", + "builtins._lru_cache_wrapper.__delattr__" => "Implement delattr(self, name).", + "builtins._lru_cache_wrapper.__eq__" => "Return self==value.", + "builtins._lru_cache_wrapper.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._lru_cache_wrapper.__ge__" => "Return self>=value.", + "builtins._lru_cache_wrapper.__get__" => "Return an attribute of instance, which is of type owner.", + "builtins._lru_cache_wrapper.__getattribute__" => "Return getattr(self, name).", + "builtins._lru_cache_wrapper.__getstate__" => "Helper for pickle.", + "builtins._lru_cache_wrapper.__gt__" => "Return self>value.", + "builtins._lru_cache_wrapper.__hash__" => "Return hash(self).", + "builtins._lru_cache_wrapper.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._lru_cache_wrapper.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._lru_cache_wrapper.__le__" => "Return self<=value.", + "builtins._lru_cache_wrapper.__lt__" => "Return self<value.", + "builtins._lru_cache_wrapper.__ne__" => "Return self!=value.", + "builtins._lru_cache_wrapper.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._lru_cache_wrapper.__reduce_ex__" => "Helper for pickle.", + "builtins._lru_cache_wrapper.__repr__" => "Return repr(self).", + "builtins._lru_cache_wrapper.__setattr__" => "Implement setattr(self, name, value).", + "builtins._lru_cache_wrapper.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._lru_cache_wrapper.__str__" => "Return str(self).", + "builtins._lru_cache_wrapper.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._lru_cache_wrapper.cache_clear" => "Clear the cache and cache statistics", + "builtins._lru_cache_wrapper.cache_info" => "Report cache statistics", + "builtins._lru_list_elem.__delattr__" => "Implement delattr(self, name).", + "builtins._lru_list_elem.__eq__" => "Return self==value.", + "builtins._lru_list_elem.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._lru_list_elem.__ge__" => "Return self>=value.", + "builtins._lru_list_elem.__getattribute__" => "Return getattr(self, name).", + "builtins._lru_list_elem.__getstate__" => "Helper for pickle.", + "builtins._lru_list_elem.__gt__" => "Return self>value.", + "builtins._lru_list_elem.__hash__" => "Return hash(self).", + "builtins._lru_list_elem.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._lru_list_elem.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._lru_list_elem.__le__" => "Return self<=value.", + "builtins._lru_list_elem.__lt__" => "Return self<value.", + "builtins._lru_list_elem.__ne__" => "Return self!=value.", + "builtins._lru_list_elem.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._lru_list_elem.__reduce__" => "Helper for pickle.", + "builtins._lru_list_elem.__reduce_ex__" => "Helper for pickle.", + "builtins._lru_list_elem.__repr__" => "Return repr(self).", + "builtins._lru_list_elem.__setattr__" => "Implement setattr(self, name, value).", + "builtins._lru_list_elem.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._lru_list_elem.__str__" => "Return str(self).", + "builtins._lru_list_elem.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._netrclex.__delattr__" => "Implement delattr(self, name).", + "builtins._netrclex.__eq__" => "Return self==value.", + "builtins._netrclex.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._netrclex.__ge__" => "Return self>=value.", + "builtins._netrclex.__getattribute__" => "Return getattr(self, name).", + "builtins._netrclex.__getstate__" => "Helper for pickle.", + "builtins._netrclex.__gt__" => "Return self>value.", + "builtins._netrclex.__hash__" => "Return hash(self).", + "builtins._netrclex.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._netrclex.__le__" => "Return self<=value.", + "builtins._netrclex.__lt__" => "Return self<value.", + "builtins._netrclex.__ne__" => "Return self!=value.", + "builtins._netrclex.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._netrclex.__reduce__" => "Helper for pickle.", + "builtins._netrclex.__reduce_ex__" => "Helper for pickle.", + "builtins._netrclex.__repr__" => "Return repr(self).", + "builtins._netrclex.__setattr__" => "Implement setattr(self, name, value).", + "builtins._netrclex.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._netrclex.__str__" => "Return str(self).", + "builtins._netrclex.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._netrclex.__weakref__" => "list of weak references to the object", + "builtins._not_given.__delattr__" => "Implement delattr(self, name).", + "builtins._not_given.__eq__" => "Return self==value.", + "builtins._not_given.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._not_given.__ge__" => "Return self>=value.", + "builtins._not_given.__getattribute__" => "Return getattr(self, name).", + "builtins._not_given.__getstate__" => "Helper for pickle.", + "builtins._not_given.__gt__" => "Return self>value.", + "builtins._not_given.__hash__" => "Return hash(self).", + "builtins._not_given.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._not_given.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._not_given.__le__" => "Return self<=value.", + "builtins._not_given.__lt__" => "Return self<value.", + "builtins._not_given.__ne__" => "Return self!=value.", + "builtins._not_given.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._not_given.__reduce__" => "Helper for pickle.", + "builtins._not_given.__reduce_ex__" => "Helper for pickle.", + "builtins._not_given.__setattr__" => "Implement setattr(self, name, value).", + "builtins._not_given.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._not_given.__str__" => "Return str(self).", + "builtins._not_given.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._not_given.__weakref__" => "list of weak references to the object", + "builtins._proto_member" => "intermediate step for enum members between class execution and final creation", + "builtins._proto_member.__delattr__" => "Implement delattr(self, name).", + "builtins._proto_member.__eq__" => "Return self==value.", + "builtins._proto_member.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._proto_member.__ge__" => "Return self>=value.", + "builtins._proto_member.__getattribute__" => "Return getattr(self, name).", + "builtins._proto_member.__getstate__" => "Helper for pickle.", + "builtins._proto_member.__gt__" => "Return self>value.", + "builtins._proto_member.__hash__" => "Return hash(self).", + "builtins._proto_member.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._proto_member.__le__" => "Return self<=value.", + "builtins._proto_member.__lt__" => "Return self<value.", + "builtins._proto_member.__ne__" => "Return self!=value.", + "builtins._proto_member.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._proto_member.__reduce__" => "Helper for pickle.", + "builtins._proto_member.__reduce_ex__" => "Helper for pickle.", + "builtins._proto_member.__repr__" => "Return repr(self).", + "builtins._proto_member.__set_name__" => "convert each quasi-member into an instance of the new enum class", + "builtins._proto_member.__setattr__" => "Implement setattr(self, name, value).", + "builtins._proto_member.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._proto_member.__str__" => "Return str(self).", + "builtins._proto_member.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._proto_member.__weakref__" => "list of weak references to the object", + "builtins._safe_key" => "Helper function for key functions when sorting unorderable objects.\n\nThe wrapped-object will fallback to a Py2.x style comparison for\nunorderable types (sorting first comparing the type name and then by\nthe obj ids). Does not work recursively, so dict.items() must have\n_safe_key applied to both the key and the value.", + "builtins._safe_key.__delattr__" => "Implement delattr(self, name).", + "builtins._safe_key.__eq__" => "Return self==value.", + "builtins._safe_key.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._safe_key.__ge__" => "Return self>=value.", + "builtins._safe_key.__getattribute__" => "Return getattr(self, name).", + "builtins._safe_key.__getstate__" => "Helper for pickle.", + "builtins._safe_key.__gt__" => "Return self>value.", + "builtins._safe_key.__hash__" => "Return hash(self).", + "builtins._safe_key.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._safe_key.__le__" => "Return self<=value.", + "builtins._safe_key.__ne__" => "Return self!=value.", + "builtins._safe_key.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._safe_key.__reduce__" => "Helper for pickle.", + "builtins._safe_key.__reduce_ex__" => "Helper for pickle.", + "builtins._safe_key.__repr__" => "Return repr(self).", + "builtins._safe_key.__setattr__" => "Implement setattr(self, name, value).", + "builtins._safe_key.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._safe_key.__str__" => "Return str(self).", + "builtins._safe_key.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._setit" => "Internal class. It wraps the command in the widget OptionMenu.", + "builtins._setit.__delattr__" => "Implement delattr(self, name).", + "builtins._setit.__eq__" => "Return self==value.", + "builtins._setit.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._setit.__ge__" => "Return self>=value.", + "builtins._setit.__getattribute__" => "Return getattr(self, name).", + "builtins._setit.__getstate__" => "Helper for pickle.", + "builtins._setit.__gt__" => "Return self>value.", + "builtins._setit.__hash__" => "Return hash(self).", + "builtins._setit.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._setit.__le__" => "Return self<=value.", + "builtins._setit.__lt__" => "Return self<value.", + "builtins._setit.__ne__" => "Return self!=value.", + "builtins._setit.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._setit.__reduce__" => "Helper for pickle.", + "builtins._setit.__reduce_ex__" => "Helper for pickle.", + "builtins._setit.__repr__" => "Return repr(self).", + "builtins._setit.__setattr__" => "Implement setattr(self, name, value).", + "builtins._setit.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._setit.__str__" => "Return str(self).", + "builtins._setit.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._setit.__weakref__" => "list of weak references to the object", + "builtins._singledispatchmethod_get.__delattr__" => "Implement delattr(self, name).", + "builtins._singledispatchmethod_get.__eq__" => "Return self==value.", + "builtins._singledispatchmethod_get.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._singledispatchmethod_get.__ge__" => "Return self>=value.", + "builtins._singledispatchmethod_get.__getattribute__" => "Return getattr(self, name).", + "builtins._singledispatchmethod_get.__getstate__" => "Helper for pickle.", + "builtins._singledispatchmethod_get.__gt__" => "Return self>value.", + "builtins._singledispatchmethod_get.__hash__" => "Return hash(self).", + "builtins._singledispatchmethod_get.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._singledispatchmethod_get.__le__" => "Return self<=value.", + "builtins._singledispatchmethod_get.__lt__" => "Return self<value.", + "builtins._singledispatchmethod_get.__ne__" => "Return self!=value.", + "builtins._singledispatchmethod_get.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._singledispatchmethod_get.__reduce__" => "Helper for pickle.", + "builtins._singledispatchmethod_get.__reduce_ex__" => "Helper for pickle.", + "builtins._singledispatchmethod_get.__setattr__" => "Implement setattr(self, name, value).", + "builtins._singledispatchmethod_get.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._singledispatchmethod_get.__str__" => "Return str(self).", + "builtins._singledispatchmethod_get.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._singledispatchmethod_get.__weakref__" => "list of weak references to the object", + "builtins._swapped_meta.__delattr__" => "Implement delattr(self, name).", + "builtins._swapped_meta.__eq__" => "Return self==value.", + "builtins._swapped_meta.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._swapped_meta.__ge__" => "Return self>=value.", + "builtins._swapped_meta.__getattribute__" => "Return getattr(self, name).", + "builtins._swapped_meta.__getstate__" => "Helper for pickle.", + "builtins._swapped_meta.__gt__" => "Return self>value.", + "builtins._swapped_meta.__hash__" => "Return hash(self).", + "builtins._swapped_meta.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._swapped_meta.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._swapped_meta.__le__" => "Return self<=value.", + "builtins._swapped_meta.__lt__" => "Return self<value.", + "builtins._swapped_meta.__ne__" => "Return self!=value.", + "builtins._swapped_meta.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._swapped_meta.__reduce__" => "Helper for pickle.", + "builtins._swapped_meta.__reduce_ex__" => "Helper for pickle.", + "builtins._swapped_meta.__repr__" => "Return repr(self).", + "builtins._swapped_meta.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._swapped_meta.__str__" => "Return str(self).", + "builtins._swapped_meta.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._swapped_meta.__weakref__" => "list of weak references to the object", + "builtins._tee" => "Iterator wrapped to make it copyable.", + "builtins._tee.__copy__" => "Returns an independent iterator.", + "builtins._tee.__delattr__" => "Implement delattr(self, name).", + "builtins._tee.__eq__" => "Return self==value.", + "builtins._tee.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._tee.__ge__" => "Return self>=value.", + "builtins._tee.__getattribute__" => "Return getattr(self, name).", + "builtins._tee.__getstate__" => "Helper for pickle.", + "builtins._tee.__gt__" => "Return self>value.", + "builtins._tee.__hash__" => "Return hash(self).", + "builtins._tee.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._tee.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._tee.__iter__" => "Implement iter(self).", + "builtins._tee.__le__" => "Return self<=value.", + "builtins._tee.__lt__" => "Return self<value.", + "builtins._tee.__ne__" => "Return self!=value.", + "builtins._tee.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._tee.__next__" => "Implement next(self).", + "builtins._tee.__reduce__" => "Helper for pickle.", + "builtins._tee.__reduce_ex__" => "Helper for pickle.", + "builtins._tee.__repr__" => "Return repr(self).", + "builtins._tee.__setattr__" => "Implement setattr(self, name, value).", + "builtins._tee.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._tee.__str__" => "Return str(self).", + "builtins._tee.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._tee_dataobject" => "teedataobject(iterable, values, next, /)\n--\n\nData container common to multiple tee objects.", + "builtins._tee_dataobject.__delattr__" => "Implement delattr(self, name).", + "builtins._tee_dataobject.__eq__" => "Return self==value.", + "builtins._tee_dataobject.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._tee_dataobject.__ge__" => "Return self>=value.", + "builtins._tee_dataobject.__getattribute__" => "Return getattr(self, name).", + "builtins._tee_dataobject.__getstate__" => "Helper for pickle.", + "builtins._tee_dataobject.__gt__" => "Return self>value.", + "builtins._tee_dataobject.__hash__" => "Return hash(self).", + "builtins._tee_dataobject.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._tee_dataobject.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._tee_dataobject.__le__" => "Return self<=value.", + "builtins._tee_dataobject.__lt__" => "Return self<value.", + "builtins._tee_dataobject.__ne__" => "Return self!=value.", + "builtins._tee_dataobject.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._tee_dataobject.__reduce__" => "Helper for pickle.", + "builtins._tee_dataobject.__reduce_ex__" => "Helper for pickle.", + "builtins._tee_dataobject.__repr__" => "Return repr(self).", + "builtins._tee_dataobject.__setattr__" => "Implement setattr(self, name, value).", + "builtins._tee_dataobject.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._tee_dataobject.__str__" => "Return str(self).", + "builtins._tee_dataobject.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._tuplegetter.__delattr__" => "Implement delattr(self, name).", + "builtins._tuplegetter.__delete__" => "Delete an attribute of instance.", + "builtins._tuplegetter.__eq__" => "Return self==value.", + "builtins._tuplegetter.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._tuplegetter.__ge__" => "Return self>=value.", + "builtins._tuplegetter.__get__" => "Return an attribute of instance, which is of type owner.", + "builtins._tuplegetter.__getattribute__" => "Return getattr(self, name).", + "builtins._tuplegetter.__getstate__" => "Helper for pickle.", + "builtins._tuplegetter.__gt__" => "Return self>value.", + "builtins._tuplegetter.__hash__" => "Return hash(self).", + "builtins._tuplegetter.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._tuplegetter.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._tuplegetter.__le__" => "Return self<=value.", + "builtins._tuplegetter.__lt__" => "Return self<value.", + "builtins._tuplegetter.__ne__" => "Return self!=value.", + "builtins._tuplegetter.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._tuplegetter.__reduce_ex__" => "Helper for pickle.", + "builtins._tuplegetter.__repr__" => "Return repr(self).", + "builtins._tuplegetter.__set__" => "Set an attribute of instance to value.", + "builtins._tuplegetter.__setattr__" => "Implement setattr(self, name, value).", + "builtins._tuplegetter.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._tuplegetter.__str__" => "Return str(self).", + "builtins._tuplegetter.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._void" => "A private marker - used in Parameter & Signature.", + "builtins._void.__delattr__" => "Implement delattr(self, name).", + "builtins._void.__eq__" => "Return self==value.", + "builtins._void.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._void.__ge__" => "Return self>=value.", + "builtins._void.__getattribute__" => "Return getattr(self, name).", + "builtins._void.__getstate__" => "Helper for pickle.", + "builtins._void.__gt__" => "Return self>value.", + "builtins._void.__hash__" => "Return hash(self).", + "builtins._void.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins._void.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._void.__le__" => "Return self<=value.", + "builtins._void.__lt__" => "Return self<value.", + "builtins._void.__ne__" => "Return self!=value.", + "builtins._void.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._void.__reduce__" => "Helper for pickle.", + "builtins._void.__reduce_ex__" => "Helper for pickle.", + "builtins._void.__repr__" => "Return repr(self).", + "builtins._void.__setattr__" => "Implement setattr(self, name, value).", + "builtins._void.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._void.__str__" => "Return str(self).", + "builtins._void.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._void.__weakref__" => "list of weak references to the object", + "builtins._wrap_close.__delattr__" => "Implement delattr(self, name).", + "builtins._wrap_close.__eq__" => "Return self==value.", + "builtins._wrap_close.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins._wrap_close.__ge__" => "Return self>=value.", + "builtins._wrap_close.__getattribute__" => "Return getattr(self, name).", + "builtins._wrap_close.__getstate__" => "Helper for pickle.", + "builtins._wrap_close.__gt__" => "Return self>value.", + "builtins._wrap_close.__hash__" => "Return hash(self).", + "builtins._wrap_close.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins._wrap_close.__le__" => "Return self<=value.", + "builtins._wrap_close.__lt__" => "Return self<value.", + "builtins._wrap_close.__ne__" => "Return self!=value.", + "builtins._wrap_close.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins._wrap_close.__reduce__" => "Helper for pickle.", + "builtins._wrap_close.__reduce_ex__" => "Helper for pickle.", + "builtins._wrap_close.__repr__" => "Return repr(self).", + "builtins._wrap_close.__setattr__" => "Implement setattr(self, name, value).", + "builtins._wrap_close.__sizeof__" => "Size of object in memory, in bytes.", + "builtins._wrap_close.__str__" => "Return str(self).", + "builtins._wrap_close.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins._wrap_close.__weakref__" => "list of weak references to the object", "builtins.abs" => "Return the absolute value of the argument.", + "builtins.accumulate" => "Return series of accumulated sums (or other binary function results).", + "builtins.accumulate.__delattr__" => "Implement delattr(self, name).", + "builtins.accumulate.__eq__" => "Return self==value.", + "builtins.accumulate.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.accumulate.__ge__" => "Return self>=value.", + "builtins.accumulate.__getattribute__" => "Return getattr(self, name).", + "builtins.accumulate.__getstate__" => "Helper for pickle.", + "builtins.accumulate.__gt__" => "Return self>value.", + "builtins.accumulate.__hash__" => "Return hash(self).", + "builtins.accumulate.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.accumulate.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.accumulate.__iter__" => "Implement iter(self).", + "builtins.accumulate.__le__" => "Return self<=value.", + "builtins.accumulate.__lt__" => "Return self<value.", + "builtins.accumulate.__ne__" => "Return self!=value.", + "builtins.accumulate.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.accumulate.__next__" => "Implement next(self).", + "builtins.accumulate.__reduce__" => "Helper for pickle.", + "builtins.accumulate.__reduce_ex__" => "Helper for pickle.", + "builtins.accumulate.__repr__" => "Return repr(self).", + "builtins.accumulate.__setattr__" => "Implement setattr(self, name, value).", + "builtins.accumulate.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.accumulate.__str__" => "Return str(self).", + "builtins.accumulate.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.aiter" => "Return an AsyncIterator for an AsyncIterable object.", "builtins.all" => "Return True if bool(x) is True for all values x in the iterable.\n\nIf the iterable is empty, return True.", "builtins.anext" => "Return the next item from the async iterator.\n\nIf default is given and the async iterator is exhausted,\nit is returned instead of raising StopAsyncIteration.", + "builtins.anext_awaitable.__await__" => "Return an iterator to be used in await expression.", + "builtins.anext_awaitable.__delattr__" => "Implement delattr(self, name).", + "builtins.anext_awaitable.__eq__" => "Return self==value.", + "builtins.anext_awaitable.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.anext_awaitable.__ge__" => "Return self>=value.", + "builtins.anext_awaitable.__getattribute__" => "Return getattr(self, name).", + "builtins.anext_awaitable.__getstate__" => "Helper for pickle.", + "builtins.anext_awaitable.__gt__" => "Return self>value.", + "builtins.anext_awaitable.__hash__" => "Return hash(self).", + "builtins.anext_awaitable.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.anext_awaitable.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.anext_awaitable.__iter__" => "Implement iter(self).", + "builtins.anext_awaitable.__le__" => "Return self<=value.", + "builtins.anext_awaitable.__lt__" => "Return self<value.", + "builtins.anext_awaitable.__ne__" => "Return self!=value.", + "builtins.anext_awaitable.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.anext_awaitable.__next__" => "Implement next(self).", + "builtins.anext_awaitable.__reduce__" => "Helper for pickle.", + "builtins.anext_awaitable.__reduce_ex__" => "Helper for pickle.", + "builtins.anext_awaitable.__repr__" => "Return repr(self).", + "builtins.anext_awaitable.__setattr__" => "Implement setattr(self, name, value).", + "builtins.anext_awaitable.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.anext_awaitable.__str__" => "Return str(self).", + "builtins.anext_awaitable.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.anext_awaitable.close" => "close() -> raise GeneratorExit inside generator.", + "builtins.anext_awaitable.send" => "send(arg) -> send 'arg' into the wrapped iterator,\nreturn next yielded value or raise StopIteration.", + "builtins.anext_awaitable.throw" => "throw(value)\nthrow(typ[,val[,tb]])\n\nraise exception in the wrapped iterator, return next yielded value\nor raise StopIteration.\nthe (type, val, tb) signature is deprecated, \nand may be removed in a future version of Python.", "builtins.any" => "Return True if bool(x) is True for any x in the iterable.\n\nIf the iterable is empty, return False.", + "builtins.array" => "array(typecode [, initializer]) -> array\n\nReturn a new array whose items are restricted by typecode, and\ninitialized from the optional initializer value, which must be a list,\nstring or iterable over elements of the appropriate type.\n\nArrays represent basic values and behave very much like lists, except\nthe type of objects stored in them is constrained. The type is specified\nat object creation time by using a type code, which is a single character.\nThe following type codes are defined:\n\n Type code C Type Minimum size in bytes\n 'b' signed integer 1\n 'B' unsigned integer 1\n 'u' Unicode character 2 (see note)\n 'h' signed integer 2\n 'H' unsigned integer 2\n 'i' signed integer 2\n 'I' unsigned integer 2\n 'l' signed integer 4\n 'L' unsigned integer 4\n 'q' signed integer 8 (see note)\n 'Q' unsigned integer 8 (see note)\n 'f' floating-point 4\n 'd' floating-point 8\n\nNOTE: The 'u' typecode corresponds to Python's unicode character. On\nnarrow builds this is 2-bytes on wide builds this is 4-bytes.\n\nNOTE: The 'q' and 'Q' type codes are only available if the platform\nC compiler used to build Python supports 'long long', or, on Windows,\n'__int64'.\n\nMethods:\n\nappend() -- append a new item to the end of the array\nbuffer_info() -- return information giving the current memory info\nbyteswap() -- byteswap all the items of the array\ncount() -- return number of occurrences of an object\nextend() -- extend array by appending multiple elements from an iterable\nfromfile() -- read items from a file object\nfromlist() -- append items from the list\nfrombytes() -- append items from the string\nindex() -- return index of first occurrence of an object\ninsert() -- insert a new item into the array at a provided position\npop() -- remove and return item (default last)\nremove() -- remove first occurrence of an object\nreverse() -- reverse the order of the items in the array\ntofile() -- write all items to a file object\ntolist() -- return the array converted to an ordinary list\ntobytes() -- return the array converted to a string\n\nAttributes:\n\ntypecode -- the typecode character used to create the array\nitemsize -- the length in bytes of one array item", + "builtins.array.__add__" => "Return self+value.", + "builtins.array.__buffer__" => "Return a buffer object that exposes the underlying memory of the object.", + "builtins.array.__class_getitem__" => "Arrays are generic over the type of their elements", + "builtins.array.__contains__" => "Return bool(key in self).", + "builtins.array.__copy__" => "Return a copy of the array.", + "builtins.array.__deepcopy__" => "Return a copy of the array.", + "builtins.array.__delattr__" => "Implement delattr(self, name).", + "builtins.array.__delitem__" => "Delete self[key].", + "builtins.array.__eq__" => "Return self==value.", + "builtins.array.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.array.__ge__" => "Return self>=value.", + "builtins.array.__getattribute__" => "Return getattr(self, name).", + "builtins.array.__getitem__" => "Return self[key].", + "builtins.array.__getstate__" => "Helper for pickle.", + "builtins.array.__gt__" => "Return self>value.", + "builtins.array.__iadd__" => "Implement self+=value.", + "builtins.array.__imul__" => "Implement self*=value.", + "builtins.array.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.array.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.array.__iter__" => "Implement iter(self).", + "builtins.array.__le__" => "Return self<=value.", + "builtins.array.__len__" => "Return len(self).", + "builtins.array.__lt__" => "Return self<value.", + "builtins.array.__mul__" => "Return self*value.", + "builtins.array.__ne__" => "Return self!=value.", + "builtins.array.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.array.__reduce__" => "Helper for pickle.", + "builtins.array.__reduce_ex__" => "Return state information for pickling.", + "builtins.array.__release_buffer__" => "Release the buffer object that exposes the underlying memory of the object.", + "builtins.array.__repr__" => "Return repr(self).", + "builtins.array.__rmul__" => "Return value*self.", + "builtins.array.__setattr__" => "Implement setattr(self, name, value).", + "builtins.array.__setitem__" => "Set self[key] to value.", + "builtins.array.__sizeof__" => "Size of the array in memory, in bytes.", + "builtins.array.__str__" => "Return str(self).", + "builtins.array.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.array.append" => "Append new value v to the end of the array.", + "builtins.array.buffer_info" => "Return a tuple (address, length) giving the current memory address and the length in items of the buffer used to hold array's contents.\n\nThe length should be multiplied by the itemsize attribute to\ncalculate the buffer length in bytes.", + "builtins.array.byteswap" => "Byteswap all items of the array.\n\nIf the items in the array are not 1, 2, 4, or 8 bytes in size,\nRuntimeError is raised.", + "builtins.array.clear" => "Remove all items from the array.", + "builtins.array.count" => "Return number of occurrences of v in the array.", + "builtins.array.extend" => "Append items to the end of the array.", + "builtins.array.frombytes" => "Appends items from the string, interpreting it as an array of machine values, as if it had been read from a file using the fromfile() method.", + "builtins.array.fromfile" => "Read n objects from the file object f and append them to the end of the array.", + "builtins.array.fromlist" => "Append items to array from list.", + "builtins.array.fromunicode" => "Extends this array with data from the unicode string ustr.\n\nThe array must be a unicode type array; otherwise a ValueError is\nraised. Use array.frombytes(ustr.encode(...)) to append Unicode\ndata to an array of some other type.", + "builtins.array.index" => "Return index of first occurrence of v in the array.\n\nRaise ValueError if the value is not present.", + "builtins.array.insert" => "Insert a new item v into the array before position i.", + "builtins.array.itemsize" => "the size, in bytes, of one array item", + "builtins.array.pop" => "Return the i-th element and delete it from the array.\n\ni defaults to -1.", + "builtins.array.remove" => "Remove the first occurrence of v in the array.", + "builtins.array.reverse" => "Reverse the order of the items in the array.", + "builtins.array.tobytes" => "Convert the array to an array of machine values and return the bytes representation.", + "builtins.array.tofile" => "Write all items (as machine values) to the file object f.", + "builtins.array.tolist" => "Convert array to an ordinary list with the same items.", + "builtins.array.tounicode" => "Extends this array with data from the unicode string ustr.\n\nConvert the array to a unicode string. The array must be a unicode\ntype array; otherwise a ValueError is raised. Use\narray.tobytes().decode() to obtain a unicode string from an array of\nsome other type.", + "builtins.array.typecode" => "the typecode character used to create the array", + "builtins.arrayiterator.__delattr__" => "Implement delattr(self, name).", + "builtins.arrayiterator.__eq__" => "Return self==value.", + "builtins.arrayiterator.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.arrayiterator.__ge__" => "Return self>=value.", + "builtins.arrayiterator.__getattribute__" => "Return getattr(self, name).", + "builtins.arrayiterator.__getstate__" => "Helper for pickle.", + "builtins.arrayiterator.__gt__" => "Return self>value.", + "builtins.arrayiterator.__hash__" => "Return hash(self).", + "builtins.arrayiterator.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.arrayiterator.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.arrayiterator.__iter__" => "Implement iter(self).", + "builtins.arrayiterator.__le__" => "Return self<=value.", + "builtins.arrayiterator.__lt__" => "Return self<value.", + "builtins.arrayiterator.__ne__" => "Return self!=value.", + "builtins.arrayiterator.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.arrayiterator.__next__" => "Implement next(self).", + "builtins.arrayiterator.__reduce__" => "Return state information for pickling.", + "builtins.arrayiterator.__reduce_ex__" => "Helper for pickle.", + "builtins.arrayiterator.__repr__" => "Return repr(self).", + "builtins.arrayiterator.__setattr__" => "Implement setattr(self, name, value).", + "builtins.arrayiterator.__setstate__" => "Set state information for unpickling.", + "builtins.arrayiterator.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.arrayiterator.__str__" => "Return str(self).", + "builtins.arrayiterator.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.ascii" => "Return an ASCII-only representation of an object.\n\nAs repr(), return a string containing a printable representation of an\nobject, but escape the non-ASCII characters in the string returned by\nrepr() using \\\\x, \\\\u or \\\\U escapes. This generates a string similar\nto that returned by repr() in Python 2.", "builtins.async_generator.__aiter__" => "Return an awaitable, that resolves in asynchronous iterator.", "builtins.async_generator.__anext__" => "Return a value or raise StopAsyncIteration.", @@ -11641,7 +24785,204 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.async_generator.ag_await" => "object being awaited on, or None", "builtins.async_generator.asend" => "asend(v) -> send 'v' in generator.", "builtins.async_generator.athrow" => "athrow(value)\nathrow(type[,value[,tb]])\n\nraise exception in generator.\nthe (type, val, tb) signature is deprecated, \nand may be removed in a future version of Python.", + "builtins.async_generator_asend.__await__" => "Return an iterator to be used in await expression.", + "builtins.async_generator_asend.__del__" => "Called when the instance is about to be destroyed.", + "builtins.async_generator_asend.__delattr__" => "Implement delattr(self, name).", + "builtins.async_generator_asend.__eq__" => "Return self==value.", + "builtins.async_generator_asend.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.async_generator_asend.__ge__" => "Return self>=value.", + "builtins.async_generator_asend.__getattribute__" => "Return getattr(self, name).", + "builtins.async_generator_asend.__getstate__" => "Helper for pickle.", + "builtins.async_generator_asend.__gt__" => "Return self>value.", + "builtins.async_generator_asend.__hash__" => "Return hash(self).", + "builtins.async_generator_asend.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.async_generator_asend.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.async_generator_asend.__iter__" => "Implement iter(self).", + "builtins.async_generator_asend.__le__" => "Return self<=value.", + "builtins.async_generator_asend.__lt__" => "Return self<value.", + "builtins.async_generator_asend.__ne__" => "Return self!=value.", + "builtins.async_generator_asend.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.async_generator_asend.__next__" => "Implement next(self).", + "builtins.async_generator_asend.__reduce__" => "Helper for pickle.", + "builtins.async_generator_asend.__reduce_ex__" => "Helper for pickle.", + "builtins.async_generator_asend.__repr__" => "Return repr(self).", + "builtins.async_generator_asend.__setattr__" => "Implement setattr(self, name, value).", + "builtins.async_generator_asend.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.async_generator_asend.__str__" => "Return str(self).", + "builtins.async_generator_asend.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.async_generator_asend.close" => "close() -> raise GeneratorExit inside generator.", + "builtins.async_generator_asend.send" => "send(value) -> send 'value' into generator,\nreturn next yielded value or raise StopIteration.", + "builtins.async_generator_asend.throw" => "throw(value)\nthrow(type[,value[,tb]])\n\nRaise exception in generator, return next yielded value or raise\nStopIteration.\nthe (type, val, tb) signature is deprecated, \nand may be removed in a future version of Python.", + "builtins.async_generator_athrow.__await__" => "Return an iterator to be used in await expression.", + "builtins.async_generator_athrow.__del__" => "Called when the instance is about to be destroyed.", + "builtins.async_generator_athrow.__delattr__" => "Implement delattr(self, name).", + "builtins.async_generator_athrow.__eq__" => "Return self==value.", + "builtins.async_generator_athrow.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.async_generator_athrow.__ge__" => "Return self>=value.", + "builtins.async_generator_athrow.__getattribute__" => "Return getattr(self, name).", + "builtins.async_generator_athrow.__getstate__" => "Helper for pickle.", + "builtins.async_generator_athrow.__gt__" => "Return self>value.", + "builtins.async_generator_athrow.__hash__" => "Return hash(self).", + "builtins.async_generator_athrow.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.async_generator_athrow.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.async_generator_athrow.__iter__" => "Implement iter(self).", + "builtins.async_generator_athrow.__le__" => "Return self<=value.", + "builtins.async_generator_athrow.__lt__" => "Return self<value.", + "builtins.async_generator_athrow.__ne__" => "Return self!=value.", + "builtins.async_generator_athrow.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.async_generator_athrow.__next__" => "Implement next(self).", + "builtins.async_generator_athrow.__reduce__" => "Helper for pickle.", + "builtins.async_generator_athrow.__reduce_ex__" => "Helper for pickle.", + "builtins.async_generator_athrow.__repr__" => "Return repr(self).", + "builtins.async_generator_athrow.__setattr__" => "Implement setattr(self, name, value).", + "builtins.async_generator_athrow.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.async_generator_athrow.__str__" => "Return str(self).", + "builtins.async_generator_athrow.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.async_generator_athrow.close" => "close() -> raise GeneratorExit inside generator.", + "builtins.async_generator_athrow.send" => "send(value) -> send 'value' into generator,\nreturn next yielded value or raise StopIteration.", + "builtins.async_generator_athrow.throw" => "throw(value)\nthrow(type[,value[,tb]])\n\nRaise exception in generator, return next yielded value or raise\nStopIteration.\nthe (type, val, tb) signature is deprecated, \nand may be removed in a future version of Python.", + "builtins.async_generator_wrapped_value.__delattr__" => "Implement delattr(self, name).", + "builtins.async_generator_wrapped_value.__eq__" => "Return self==value.", + "builtins.async_generator_wrapped_value.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.async_generator_wrapped_value.__ge__" => "Return self>=value.", + "builtins.async_generator_wrapped_value.__getattribute__" => "Return getattr(self, name).", + "builtins.async_generator_wrapped_value.__getstate__" => "Helper for pickle.", + "builtins.async_generator_wrapped_value.__gt__" => "Return self>value.", + "builtins.async_generator_wrapped_value.__hash__" => "Return hash(self).", + "builtins.async_generator_wrapped_value.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.async_generator_wrapped_value.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.async_generator_wrapped_value.__le__" => "Return self<=value.", + "builtins.async_generator_wrapped_value.__lt__" => "Return self<value.", + "builtins.async_generator_wrapped_value.__ne__" => "Return self!=value.", + "builtins.async_generator_wrapped_value.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.async_generator_wrapped_value.__reduce__" => "Helper for pickle.", + "builtins.async_generator_wrapped_value.__reduce_ex__" => "Helper for pickle.", + "builtins.async_generator_wrapped_value.__repr__" => "Return repr(self).", + "builtins.async_generator_wrapped_value.__setattr__" => "Implement setattr(self, name, value).", + "builtins.async_generator_wrapped_value.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.async_generator_wrapped_value.__str__" => "Return str(self).", + "builtins.async_generator_wrapped_value.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.attrgetter" => "Return a callable object that fetches the given attribute(s) from its operand.\nAfter f = attrgetter('name'), the call f(r) returns r.name.\nAfter g = attrgetter('name', 'date'), the call g(r) returns (r.name, r.date).\nAfter h = attrgetter('name.first', 'name.last'), the call h(r) returns\n(r.name.first, r.name.last).", + "builtins.attrgetter.__call__" => "Call self as a function.", + "builtins.attrgetter.__delattr__" => "Implement delattr(self, name).", + "builtins.attrgetter.__eq__" => "Return self==value.", + "builtins.attrgetter.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.attrgetter.__ge__" => "Return self>=value.", + "builtins.attrgetter.__getattribute__" => "Return getattr(self, name).", + "builtins.attrgetter.__getstate__" => "Helper for pickle.", + "builtins.attrgetter.__gt__" => "Return self>value.", + "builtins.attrgetter.__hash__" => "Return hash(self).", + "builtins.attrgetter.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.attrgetter.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.attrgetter.__le__" => "Return self<=value.", + "builtins.attrgetter.__lt__" => "Return self<value.", + "builtins.attrgetter.__ne__" => "Return self!=value.", + "builtins.attrgetter.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.attrgetter.__reduce__" => "Return state information for pickling", + "builtins.attrgetter.__reduce_ex__" => "Helper for pickle.", + "builtins.attrgetter.__repr__" => "Return repr(self).", + "builtins.attrgetter.__setattr__" => "Implement setattr(self, name, value).", + "builtins.attrgetter.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.attrgetter.__str__" => "Return str(self).", + "builtins.attrgetter.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.auto" => "Instances are replaced with an appropriate value in Enum class suites.", + "builtins.auto.__delattr__" => "Implement delattr(self, name).", + "builtins.auto.__eq__" => "Return self==value.", + "builtins.auto.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.auto.__ge__" => "Return self>=value.", + "builtins.auto.__getattribute__" => "Return getattr(self, name).", + "builtins.auto.__getstate__" => "Helper for pickle.", + "builtins.auto.__gt__" => "Return self>value.", + "builtins.auto.__hash__" => "Return hash(self).", + "builtins.auto.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.auto.__le__" => "Return self<=value.", + "builtins.auto.__lt__" => "Return self<value.", + "builtins.auto.__ne__" => "Return self!=value.", + "builtins.auto.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.auto.__reduce__" => "Helper for pickle.", + "builtins.auto.__reduce_ex__" => "Helper for pickle.", + "builtins.auto.__setattr__" => "Implement setattr(self, name, value).", + "builtins.auto.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.auto.__str__" => "Return str(self).", + "builtins.auto.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.auto.__weakref__" => "list of weak references to the object", + "builtins.batched" => "Batch data into tuples of length n. The last batch may be shorter than n.\n\nLoops over the input iterable and accumulates data into tuples\nup to size n. The input is consumed lazily, just enough to\nfill a batch. The result is yielded as soon as a batch is full\nor when the input iterable is exhausted.\n\n >>> for batch in batched('ABCDEFG', 3):\n ... print(batch)\n ...\n ('A', 'B', 'C')\n ('D', 'E', 'F')\n ('G',)\n\nIf \"strict\" is True, raises a ValueError if the final batch is shorter\nthan n.", + "builtins.batched.__delattr__" => "Implement delattr(self, name).", + "builtins.batched.__eq__" => "Return self==value.", + "builtins.batched.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.batched.__ge__" => "Return self>=value.", + "builtins.batched.__getattribute__" => "Return getattr(self, name).", + "builtins.batched.__getstate__" => "Helper for pickle.", + "builtins.batched.__gt__" => "Return self>value.", + "builtins.batched.__hash__" => "Return hash(self).", + "builtins.batched.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.batched.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.batched.__iter__" => "Implement iter(self).", + "builtins.batched.__le__" => "Return self<=value.", + "builtins.batched.__lt__" => "Return self<value.", + "builtins.batched.__ne__" => "Return self!=value.", + "builtins.batched.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.batched.__next__" => "Implement next(self).", + "builtins.batched.__reduce__" => "Helper for pickle.", + "builtins.batched.__reduce_ex__" => "Helper for pickle.", + "builtins.batched.__repr__" => "Return repr(self).", + "builtins.batched.__setattr__" => "Implement setattr(self, name, value).", + "builtins.batched.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.batched.__str__" => "Return str(self).", + "builtins.batched.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.bin" => "Return the binary representation of an integer.\n\n >>> bin(2796202)\n '0b1010101010101010101010'", + "builtins.blake2b" => "Return a new BLAKE2b hash object.", + "builtins.blake2b.__delattr__" => "Implement delattr(self, name).", + "builtins.blake2b.__eq__" => "Return self==value.", + "builtins.blake2b.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.blake2b.__ge__" => "Return self>=value.", + "builtins.blake2b.__getattribute__" => "Return getattr(self, name).", + "builtins.blake2b.__getstate__" => "Helper for pickle.", + "builtins.blake2b.__gt__" => "Return self>value.", + "builtins.blake2b.__hash__" => "Return hash(self).", + "builtins.blake2b.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.blake2b.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.blake2b.__le__" => "Return self<=value.", + "builtins.blake2b.__lt__" => "Return self<value.", + "builtins.blake2b.__ne__" => "Return self!=value.", + "builtins.blake2b.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.blake2b.__reduce__" => "Helper for pickle.", + "builtins.blake2b.__reduce_ex__" => "Helper for pickle.", + "builtins.blake2b.__repr__" => "Return repr(self).", + "builtins.blake2b.__setattr__" => "Implement setattr(self, name, value).", + "builtins.blake2b.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.blake2b.__str__" => "Return str(self).", + "builtins.blake2b.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.blake2b.copy" => "Return a copy of the hash object.", + "builtins.blake2b.digest" => "Return the digest value as a bytes object.", + "builtins.blake2b.hexdigest" => "Return the digest value as a string of hexadecimal digits.", + "builtins.blake2b.update" => "Update this hash object's state with the provided bytes-like object.", + "builtins.blake2s" => "Return a new BLAKE2s hash object.", + "builtins.blake2s.__delattr__" => "Implement delattr(self, name).", + "builtins.blake2s.__eq__" => "Return self==value.", + "builtins.blake2s.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.blake2s.__ge__" => "Return self>=value.", + "builtins.blake2s.__getattribute__" => "Return getattr(self, name).", + "builtins.blake2s.__getstate__" => "Helper for pickle.", + "builtins.blake2s.__gt__" => "Return self>value.", + "builtins.blake2s.__hash__" => "Return hash(self).", + "builtins.blake2s.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.blake2s.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.blake2s.__le__" => "Return self<=value.", + "builtins.blake2s.__lt__" => "Return self<value.", + "builtins.blake2s.__ne__" => "Return self!=value.", + "builtins.blake2s.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.blake2s.__reduce__" => "Helper for pickle.", + "builtins.blake2s.__reduce_ex__" => "Helper for pickle.", + "builtins.blake2s.__repr__" => "Return repr(self).", + "builtins.blake2s.__setattr__" => "Implement setattr(self, name, value).", + "builtins.blake2s.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.blake2s.__str__" => "Return str(self).", + "builtins.blake2s.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.blake2s.copy" => "Return a copy of the hash object.", + "builtins.blake2s.digest" => "Return the digest value as a bytes object.", + "builtins.blake2s.hexdigest" => "Return the digest value as a string of hexadecimal digits.", + "builtins.blake2s.update" => "Update this hash object's state with the provided bytes-like object.", "builtins.bool" => "Returns True when the argument is true, False otherwise.\nThe builtins True and False are the only two instances of the class bool.\nThe class bool is a subclass of the class int, and cannot be subclassed.", "builtins.bool.__abs__" => "abs(self)", "builtins.bool.__add__" => "Return self+value.", @@ -11948,7 +25289,74 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.bytes_iterator.__sizeof__" => "Size of object in memory, in bytes.", "builtins.bytes_iterator.__str__" => "Return str(self).", "builtins.bytes_iterator.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.cached_property.__class_getitem__" => "Represent a PEP 585 generic type\n\nE.g. for t = list[int], t.__origin__ is list and t.__args__ is (int,).", + "builtins.cached_property.__delattr__" => "Implement delattr(self, name).", + "builtins.cached_property.__eq__" => "Return self==value.", + "builtins.cached_property.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.cached_property.__ge__" => "Return self>=value.", + "builtins.cached_property.__getattribute__" => "Return getattr(self, name).", + "builtins.cached_property.__getstate__" => "Helper for pickle.", + "builtins.cached_property.__gt__" => "Return self>value.", + "builtins.cached_property.__hash__" => "Return hash(self).", + "builtins.cached_property.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.cached_property.__le__" => "Return self<=value.", + "builtins.cached_property.__lt__" => "Return self<value.", + "builtins.cached_property.__ne__" => "Return self!=value.", + "builtins.cached_property.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.cached_property.__reduce__" => "Helper for pickle.", + "builtins.cached_property.__reduce_ex__" => "Helper for pickle.", + "builtins.cached_property.__repr__" => "Return repr(self).", + "builtins.cached_property.__setattr__" => "Implement setattr(self, name, value).", + "builtins.cached_property.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.cached_property.__str__" => "Return str(self).", + "builtins.cached_property.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.cached_property.__weakref__" => "list of weak references to the object", "builtins.callable" => "Return whether the object is callable (i.e., some kind of function).\n\nNote that classes are callable, as are instances of classes with a\n__call__() method.", + "builtins.callable_iterator.__delattr__" => "Implement delattr(self, name).", + "builtins.callable_iterator.__eq__" => "Return self==value.", + "builtins.callable_iterator.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.callable_iterator.__ge__" => "Return self>=value.", + "builtins.callable_iterator.__getattribute__" => "Return getattr(self, name).", + "builtins.callable_iterator.__getstate__" => "Helper for pickle.", + "builtins.callable_iterator.__gt__" => "Return self>value.", + "builtins.callable_iterator.__hash__" => "Return hash(self).", + "builtins.callable_iterator.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.callable_iterator.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.callable_iterator.__iter__" => "Implement iter(self).", + "builtins.callable_iterator.__le__" => "Return self<=value.", + "builtins.callable_iterator.__lt__" => "Return self<value.", + "builtins.callable_iterator.__ne__" => "Return self!=value.", + "builtins.callable_iterator.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.callable_iterator.__next__" => "Implement next(self).", + "builtins.callable_iterator.__reduce__" => "Return state information for pickling.", + "builtins.callable_iterator.__reduce_ex__" => "Helper for pickle.", + "builtins.callable_iterator.__repr__" => "Return repr(self).", + "builtins.callable_iterator.__setattr__" => "Implement setattr(self, name, value).", + "builtins.callable_iterator.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.callable_iterator.__str__" => "Return str(self).", + "builtins.callable_iterator.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.catch_warnings" => "A context manager that copies and restores the warnings filter upon\nexiting the context.\n\nThe 'record' argument specifies whether warnings should be captured by a\ncustom implementation of warnings.showwarning() and be appended to a list\nreturned by the context manager. Otherwise None is returned by the context\nmanager. The objects appended to the list are arguments whose attributes\nmirror the arguments to showwarning().\n\nThe 'module' argument is to specify an alternative module to the module\nnamed 'warnings' and imported under that name. This argument is only useful\nwhen testing the warnings module itself.\n\nIf the 'action' argument is not None, the remaining arguments are passed\nto warnings.simplefilter() as if it were called immediately on entering the\ncontext.", + "builtins.catch_warnings.__delattr__" => "Implement delattr(self, name).", + "builtins.catch_warnings.__eq__" => "Return self==value.", + "builtins.catch_warnings.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.catch_warnings.__ge__" => "Return self>=value.", + "builtins.catch_warnings.__getattribute__" => "Return getattr(self, name).", + "builtins.catch_warnings.__getstate__" => "Helper for pickle.", + "builtins.catch_warnings.__gt__" => "Return self>value.", + "builtins.catch_warnings.__hash__" => "Return hash(self).", + "builtins.catch_warnings.__init__" => "Specify whether to record warnings and if an alternative module\nshould be used other than sys.modules['warnings'].", + "builtins.catch_warnings.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.catch_warnings.__le__" => "Return self<=value.", + "builtins.catch_warnings.__lt__" => "Return self<value.", + "builtins.catch_warnings.__ne__" => "Return self!=value.", + "builtins.catch_warnings.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.catch_warnings.__reduce__" => "Helper for pickle.", + "builtins.catch_warnings.__reduce_ex__" => "Helper for pickle.", + "builtins.catch_warnings.__setattr__" => "Implement setattr(self, name, value).", + "builtins.catch_warnings.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.catch_warnings.__str__" => "Return str(self).", + "builtins.catch_warnings.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.catch_warnings.__weakref__" => "list of weak references to the object", "builtins.cell" => "Create a new cell object.\n\n contents\n the contents of the cell. If not specified, the cell will be empty,\n and \n further attempts to access its cell_contents attribute will\n raise a ValueError.", "builtins.cell.__delattr__" => "Implement delattr(self, name).", "builtins.cell.__eq__" => "Return self==value.", @@ -11970,6 +25378,32 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.cell.__sizeof__" => "Size of object in memory, in bytes.", "builtins.cell.__str__" => "Return str(self).", "builtins.cell.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.chain" => "Return a chain object whose .__next__() method returns elements from the\nfirst iterable until it is exhausted, then elements from the next\niterable, until all of the iterables are exhausted.", + "builtins.chain.__class_getitem__" => "chain is generic over the type of its contents.\nThis is the union of the types of the input iterable contents.", + "builtins.chain.__delattr__" => "Implement delattr(self, name).", + "builtins.chain.__eq__" => "Return self==value.", + "builtins.chain.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.chain.__ge__" => "Return self>=value.", + "builtins.chain.__getattribute__" => "Return getattr(self, name).", + "builtins.chain.__getstate__" => "Helper for pickle.", + "builtins.chain.__gt__" => "Return self>value.", + "builtins.chain.__hash__" => "Return hash(self).", + "builtins.chain.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.chain.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.chain.__iter__" => "Implement iter(self).", + "builtins.chain.__le__" => "Return self<=value.", + "builtins.chain.__lt__" => "Return self<value.", + "builtins.chain.__ne__" => "Return self!=value.", + "builtins.chain.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.chain.__next__" => "Implement next(self).", + "builtins.chain.__reduce__" => "Helper for pickle.", + "builtins.chain.__reduce_ex__" => "Helper for pickle.", + "builtins.chain.__repr__" => "Return repr(self).", + "builtins.chain.__setattr__" => "Implement setattr(self, name, value).", + "builtins.chain.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.chain.__str__" => "Return str(self).", + "builtins.chain.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.chain.from_iterable" => "Alternative chain() constructor taking a single iterable argument that evaluates lazily.", "builtins.chr" => "Return a Unicode string of one character with ordinal i; 0 <= i <= 0x10ffff.", "builtins.classmethod" => "Convert a function to be a class method.\n\nA class method receives the class as implicit first argument,\njust like an instance method receives the instance.\nTo declare a class method, use this idiom:\n\n class C:\n @classmethod\n def f(cls, arg1, arg2, argN):\n ...\n\nIt can be called either on the class (e.g. C.f()) or on an instance\n(e.g. C().f()). The instance is ignored except for its class.\nIf a class method is called for a derived class, the derived class\nobject is passed as the implied first argument.\n\nClass methods are different than C++ or Java static methods.\nIf you want those, see the staticmethod builtin.", "builtins.classmethod.__delattr__" => "Implement delattr(self, name).", @@ -12041,6 +25475,54 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.code.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.code._varname_from_oparg" => "(internal-only) Return the local variable name for the given oparg.\n\nWARNING: this method is for internal use only and may change or go\naway.", "builtins.code.replace" => "Return a copy of the code object with new values for the specified fields.", + "builtins.combinations" => "Return successive r-length combinations of elements in the iterable.\n\ncombinations(range(4), 3) --> (0,1,2), (0,1,3), (0,2,3), (1,2,3)", + "builtins.combinations.__delattr__" => "Implement delattr(self, name).", + "builtins.combinations.__eq__" => "Return self==value.", + "builtins.combinations.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.combinations.__ge__" => "Return self>=value.", + "builtins.combinations.__getattribute__" => "Return getattr(self, name).", + "builtins.combinations.__getstate__" => "Helper for pickle.", + "builtins.combinations.__gt__" => "Return self>value.", + "builtins.combinations.__hash__" => "Return hash(self).", + "builtins.combinations.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.combinations.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.combinations.__iter__" => "Implement iter(self).", + "builtins.combinations.__le__" => "Return self<=value.", + "builtins.combinations.__lt__" => "Return self<value.", + "builtins.combinations.__ne__" => "Return self!=value.", + "builtins.combinations.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.combinations.__next__" => "Implement next(self).", + "builtins.combinations.__reduce__" => "Helper for pickle.", + "builtins.combinations.__reduce_ex__" => "Helper for pickle.", + "builtins.combinations.__repr__" => "Return repr(self).", + "builtins.combinations.__setattr__" => "Implement setattr(self, name, value).", + "builtins.combinations.__sizeof__" => "Returns size in memory, in bytes.", + "builtins.combinations.__str__" => "Return str(self).", + "builtins.combinations.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.combinations_with_replacement" => "Return successive r-length combinations of elements in the iterable allowing individual elements to have successive repeats.\n\ncombinations_with_replacement('ABC', 2) --> ('A','A'), ('A','B'), ('A','C'), ('B','B'), ('B','C'), ('C','C')", + "builtins.combinations_with_replacement.__delattr__" => "Implement delattr(self, name).", + "builtins.combinations_with_replacement.__eq__" => "Return self==value.", + "builtins.combinations_with_replacement.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.combinations_with_replacement.__ge__" => "Return self>=value.", + "builtins.combinations_with_replacement.__getattribute__" => "Return getattr(self, name).", + "builtins.combinations_with_replacement.__getstate__" => "Helper for pickle.", + "builtins.combinations_with_replacement.__gt__" => "Return self>value.", + "builtins.combinations_with_replacement.__hash__" => "Return hash(self).", + "builtins.combinations_with_replacement.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.combinations_with_replacement.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.combinations_with_replacement.__iter__" => "Implement iter(self).", + "builtins.combinations_with_replacement.__le__" => "Return self<=value.", + "builtins.combinations_with_replacement.__lt__" => "Return self<value.", + "builtins.combinations_with_replacement.__ne__" => "Return self!=value.", + "builtins.combinations_with_replacement.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.combinations_with_replacement.__next__" => "Implement next(self).", + "builtins.combinations_with_replacement.__reduce__" => "Helper for pickle.", + "builtins.combinations_with_replacement.__reduce_ex__" => "Helper for pickle.", + "builtins.combinations_with_replacement.__repr__" => "Return repr(self).", + "builtins.combinations_with_replacement.__setattr__" => "Implement setattr(self, name, value).", + "builtins.combinations_with_replacement.__sizeof__" => "Returns size in memory, in bytes.", + "builtins.combinations_with_replacement.__str__" => "Return str(self).", + "builtins.combinations_with_replacement.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.compile" => "Compile source into a code object that can be executed by exec() or eval().\n\nThe source code may represent a Python module, statement or\nexpression.\nThe filename will be used for run-time error messages.\nThe mode must be 'exec' to compile a module, 'single' to compile a\nsingle (interactive) statement, or 'eval' to compile an expression.\nThe flags argument, if present, controls which future statements\ninfluence the compilation of the code.\nThe dont_inherit argument, if true, stops the compilation inheriting\nthe effects of any future statements in effect in the code calling\ncompile; if absent or false these statements do influence the\ncompilation, in addition to any features explicitly specified.", "builtins.complex" => "Create a complex number from a string or numbers.\n\nIf a string is given, parse it as a complex number.\nIf a single number is given, convert it to a complex number.\nIf the 'real' or 'imag' arguments are given, create a complex number\nwith the specified real and imaginary components.", "builtins.complex.__abs__" => "abs(self)", @@ -12083,6 +25565,30 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.complex.from_number" => "Convert number to a complex floating-point number.", "builtins.complex.imag" => "the imaginary part of a complex number", "builtins.complex.real" => "the real part of a complex number", + "builtins.compress" => "Return data elements corresponding to true selector elements.\n\nForms a shorter iterator from selected data elements using the selectors\nto choose the data elements.", + "builtins.compress.__delattr__" => "Implement delattr(self, name).", + "builtins.compress.__eq__" => "Return self==value.", + "builtins.compress.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.compress.__ge__" => "Return self>=value.", + "builtins.compress.__getattribute__" => "Return getattr(self, name).", + "builtins.compress.__getstate__" => "Helper for pickle.", + "builtins.compress.__gt__" => "Return self>value.", + "builtins.compress.__hash__" => "Return hash(self).", + "builtins.compress.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.compress.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.compress.__iter__" => "Implement iter(self).", + "builtins.compress.__le__" => "Return self<=value.", + "builtins.compress.__lt__" => "Return self<value.", + "builtins.compress.__ne__" => "Return self!=value.", + "builtins.compress.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.compress.__next__" => "Implement next(self).", + "builtins.compress.__reduce__" => "Helper for pickle.", + "builtins.compress.__reduce_ex__" => "Helper for pickle.", + "builtins.compress.__repr__" => "Return repr(self).", + "builtins.compress.__setattr__" => "Implement setattr(self, name, value).", + "builtins.compress.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.compress.__str__" => "Return str(self).", + "builtins.compress.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.coroutine.__await__" => "Return an iterator to be used in await expression.", "builtins.coroutine.__class_getitem__" => "coroutines are generic over the types of their yield, send, and return values", "builtins.coroutine.__del__" => "Called when the instance is about to be destroyed.", @@ -12111,7 +25617,231 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.coroutine.cr_await" => "object being awaited on, or None", "builtins.coroutine.send" => "send(arg) -> send 'arg' into coroutine,\nreturn next iterated value or raise StopIteration.", "builtins.coroutine.throw" => "throw(value)\nthrow(type[,value[,traceback]])\n\nRaise exception in coroutine, return next iterated value or raise\nStopIteration.\nthe (type, val, tb) signature is deprecated, \nand may be removed in a future version of Python.", + "builtins.coroutine_wrapper" => "A wrapper object implementing __await__ for coroutines.", + "builtins.coroutine_wrapper.__delattr__" => "Implement delattr(self, name).", + "builtins.coroutine_wrapper.__eq__" => "Return self==value.", + "builtins.coroutine_wrapper.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.coroutine_wrapper.__ge__" => "Return self>=value.", + "builtins.coroutine_wrapper.__getattribute__" => "Return getattr(self, name).", + "builtins.coroutine_wrapper.__getstate__" => "Helper for pickle.", + "builtins.coroutine_wrapper.__gt__" => "Return self>value.", + "builtins.coroutine_wrapper.__hash__" => "Return hash(self).", + "builtins.coroutine_wrapper.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.coroutine_wrapper.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.coroutine_wrapper.__iter__" => "Implement iter(self).", + "builtins.coroutine_wrapper.__le__" => "Return self<=value.", + "builtins.coroutine_wrapper.__lt__" => "Return self<value.", + "builtins.coroutine_wrapper.__ne__" => "Return self!=value.", + "builtins.coroutine_wrapper.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.coroutine_wrapper.__next__" => "Implement next(self).", + "builtins.coroutine_wrapper.__reduce__" => "Helper for pickle.", + "builtins.coroutine_wrapper.__reduce_ex__" => "Helper for pickle.", + "builtins.coroutine_wrapper.__repr__" => "Return repr(self).", + "builtins.coroutine_wrapper.__setattr__" => "Implement setattr(self, name, value).", + "builtins.coroutine_wrapper.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.coroutine_wrapper.__str__" => "Return str(self).", + "builtins.coroutine_wrapper.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.coroutine_wrapper.close" => "close() -> raise GeneratorExit inside coroutine.", + "builtins.coroutine_wrapper.send" => "send(arg) -> send 'arg' into coroutine,\nreturn next iterated value or raise StopIteration.", + "builtins.coroutine_wrapper.throw" => "throw(value)\nthrow(type[,value[,traceback]])\n\nRaise exception in coroutine, return next iterated value or raise\nStopIteration.\nthe (type, val, tb) signature is deprecated, \nand may be removed in a future version of Python.", + "builtins.count" => "Return a count object whose .__next__() method returns consecutive values.\n\nEquivalent to:\n def count(firstval=0, step=1):\n x = firstval\n while 1:\n yield x\n x += step", + "builtins.count.__delattr__" => "Implement delattr(self, name).", + "builtins.count.__eq__" => "Return self==value.", + "builtins.count.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.count.__ge__" => "Return self>=value.", + "builtins.count.__getattribute__" => "Return getattr(self, name).", + "builtins.count.__getstate__" => "Helper for pickle.", + "builtins.count.__gt__" => "Return self>value.", + "builtins.count.__hash__" => "Return hash(self).", + "builtins.count.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.count.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.count.__iter__" => "Implement iter(self).", + "builtins.count.__le__" => "Return self<=value.", + "builtins.count.__lt__" => "Return self<value.", + "builtins.count.__ne__" => "Return self!=value.", + "builtins.count.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.count.__next__" => "Implement next(self).", + "builtins.count.__reduce__" => "Helper for pickle.", + "builtins.count.__reduce_ex__" => "Helper for pickle.", + "builtins.count.__repr__" => "Return repr(self).", + "builtins.count.__setattr__" => "Implement setattr(self, name, value).", + "builtins.count.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.count.__str__" => "Return str(self).", + "builtins.count.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.cycle" => "Return elements from the iterable until it is exhausted. Then repeat the sequence indefinitely.", + "builtins.cycle.__delattr__" => "Implement delattr(self, name).", + "builtins.cycle.__eq__" => "Return self==value.", + "builtins.cycle.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.cycle.__ge__" => "Return self>=value.", + "builtins.cycle.__getattribute__" => "Return getattr(self, name).", + "builtins.cycle.__getstate__" => "Helper for pickle.", + "builtins.cycle.__gt__" => "Return self>value.", + "builtins.cycle.__hash__" => "Return hash(self).", + "builtins.cycle.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.cycle.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.cycle.__iter__" => "Implement iter(self).", + "builtins.cycle.__le__" => "Return self<=value.", + "builtins.cycle.__lt__" => "Return self<value.", + "builtins.cycle.__ne__" => "Return self!=value.", + "builtins.cycle.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.cycle.__next__" => "Implement next(self).", + "builtins.cycle.__reduce__" => "Helper for pickle.", + "builtins.cycle.__reduce_ex__" => "Helper for pickle.", + "builtins.cycle.__repr__" => "Return repr(self).", + "builtins.cycle.__setattr__" => "Implement setattr(self, name, value).", + "builtins.cycle.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.cycle.__str__" => "Return str(self).", + "builtins.cycle.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.date" => "Concrete date type.\n\nConstructors:\n\n__new__()\nfromtimestamp()\ntoday()\nfromordinal()\nstrptime()\n\nOperators:\n\n__repr__, __str__\n__eq__, __le__, __lt__, __ge__, __gt__, __hash__\n__add__, __radd__, __sub__ (add/radd only with timedelta arg)\n\nMethods:\n\ntimetuple()\ntoordinal()\nweekday()\nisoweekday(), isocalendar(), isoformat()\nctime()\nstrftime()\n\nProperties (readonly):\nyear, month, day", + "builtins.date.__add__" => "Add a date to a timedelta.", + "builtins.date.__delattr__" => "Implement delattr(self, name).", + "builtins.date.__eq__" => "Return self==value.", + "builtins.date.__format__" => "Formats self with strftime.", + "builtins.date.__ge__" => "Return self>=value.", + "builtins.date.__getattribute__" => "Return getattr(self, name).", + "builtins.date.__getstate__" => "Helper for pickle.", + "builtins.date.__gt__" => "Return self>value.", + "builtins.date.__hash__" => "Hash.", + "builtins.date.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.date.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.date.__le__" => "Return self<=value.", + "builtins.date.__lt__" => "Return self<value.", + "builtins.date.__ne__" => "Return self!=value.", + "builtins.date.__new__" => "Constructor.\n\nArguments:\n\nyear, month, day (required, base 1)", + "builtins.date.__radd__" => "Add a date to a timedelta.", + "builtins.date.__reduce__" => "__reduce__() -> (cls, state)", + "builtins.date.__reduce_ex__" => "Helper for pickle.", + "builtins.date.__replace__" => "Return a new date with new values for the specified fields.", + "builtins.date.__repr__" => "Convert to formal string, for repr().\n\n>>> d = date(2010, 1, 1)\n>>> repr(d)\n'datetime.date(2010, 1, 1)'", + "builtins.date.__rsub__" => "Return value-self.", + "builtins.date.__setattr__" => "Implement setattr(self, name, value).", + "builtins.date.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.date.__str__" => "Return the date formatted according to ISO.\n\nThis is 'YYYY-MM-DD'.\n\nReferences:\n- https://www.w3.org/TR/NOTE-datetime\n- https://www.cl.cam.ac.uk/~mgk25/iso-time.html", + "builtins.date.__sub__" => "Subtract two dates, or a date and a timedelta.", + "builtins.date.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.date.ctime" => "Return ctime() style string.", + "builtins.date.day" => "day (1-31)", + "builtins.date.fromisocalendar" => "Construct a date from the ISO year, week number and weekday.\n\nThis is the inverse of the date.isocalendar() function", + "builtins.date.fromisoformat" => "Construct a date from a string in ISO 8601 format.", + "builtins.date.fromordinal" => "Construct a date from a proleptic Gregorian ordinal.\n\nJanuary 1 of year 1 is day 1. Only the year, month and day are\nnon-zero in the result.", + "builtins.date.fromtimestamp" => "Construct a date from a POSIX timestamp (like time.time()).", + "builtins.date.isocalendar" => "Return a named tuple containing ISO year, week number, and weekday.\n\nThe first ISO week of the year is the (Mon-Sun) week\ncontaining the year's first Thursday; everything else derives\nfrom that.\n\nThe first week is 1; Monday is 1 ... Sunday is 7.\n\nISO calendar algorithm taken from\nhttps://www.phys.uu.nl/~vgent/calendar/isocalendar.htm\n(used with permission)", + "builtins.date.isoformat" => "Return the date formatted according to ISO.\n\nThis is 'YYYY-MM-DD'.\n\nReferences:\n- https://www.w3.org/TR/NOTE-datetime\n- https://www.cl.cam.ac.uk/~mgk25/iso-time.html", + "builtins.date.isoweekday" => "Return day of the week, where Monday == 1 ... Sunday == 7.", + "builtins.date.month" => "month (1-12)", + "builtins.date.replace" => "Return a new date with new values for the specified fields.", + "builtins.date.strftime" => "Format using strftime().\n\nExample: \"%d/%m/%Y, %H:%M:%S\"", + "builtins.date.strptime" => "Parse a date string according to the given format (like time.strptime()).", + "builtins.date.timetuple" => "Return local time tuple compatible with time.localtime().", + "builtins.date.today" => "Construct a date from time.time().", + "builtins.date.toordinal" => "Return proleptic Gregorian ordinal for the year, month and day.\n\nJanuary 1 of year 1 is day 1. Only the year, month and day values\ncontribute to the result.", + "builtins.date.weekday" => "Return day of the week, where Monday == 0 ... Sunday == 6.", + "builtins.date.year" => "year (1-9999)", + "builtins.dbm.__bool__" => "True if self else False", + "builtins.dbm.__contains__" => "Return bool(key in self).", + "builtins.dbm.__delattr__" => "Implement delattr(self, name).", + "builtins.dbm.__delitem__" => "Delete self[key].", + "builtins.dbm.__eq__" => "Return self==value.", + "builtins.dbm.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.dbm.__ge__" => "Return self>=value.", + "builtins.dbm.__getattribute__" => "Return getattr(self, name).", + "builtins.dbm.__getitem__" => "Return self[key].", + "builtins.dbm.__getstate__" => "Helper for pickle.", + "builtins.dbm.__gt__" => "Return self>value.", + "builtins.dbm.__hash__" => "Return hash(self).", + "builtins.dbm.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.dbm.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.dbm.__le__" => "Return self<=value.", + "builtins.dbm.__len__" => "Return len(self).", + "builtins.dbm.__lt__" => "Return self<value.", + "builtins.dbm.__ne__" => "Return self!=value.", + "builtins.dbm.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.dbm.__reduce__" => "Helper for pickle.", + "builtins.dbm.__reduce_ex__" => "Helper for pickle.", + "builtins.dbm.__repr__" => "Return repr(self).", + "builtins.dbm.__setattr__" => "Implement setattr(self, name, value).", + "builtins.dbm.__setitem__" => "Set self[key] to value.", + "builtins.dbm.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.dbm.__str__" => "Return str(self).", + "builtins.dbm.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.dbm.clear" => "Remove all items from the database.", + "builtins.dbm.close" => "Close the database.", + "builtins.dbm.get" => "Return the value for key if present, otherwise default.", + "builtins.dbm.keys" => "Return a list of all keys in the database.", + "builtins.dbm.setdefault" => "Return the value for key if present, otherwise default.\n\nIf key is not in the database, it is inserted with default as the\nvalue.", "builtins.delattr" => "Deletes the named attribute from the given object.\n\ndelattr(x, 'y') is equivalent to ``del x.y``", + "builtins.deprecated" => "Indicate that a class, function or overload is deprecated.\n\nWhen this decorator is applied to an object, the type checker\nwill generate a diagnostic on usage of the deprecated object.\n\nUsage:\n\n @deprecated(\"Use B instead\")\n class A:\n pass\n\n @deprecated(\"Use g instead\")\n def f():\n pass\n\n @overload\n @deprecated(\"int support is deprecated\")\n def g(x: int) -> int: ...\n @overload\n def g(x: str) -> int: ...\n\nThe warning specified by *category* will be emitted at runtime\non use of deprecated objects. For functions, that happens on calls;\nfor classes, on instantiation and on creation of subclasses.\nIf the *category* is ``None``, no warning is emitted at runtime.\nThe *stacklevel* determines where the\nwarning is emitted. If it is ``1`` (the default), the warning\nis emitted at the direct caller of the deprecated object; if it\nis higher, it is emitted further up the stack.\nStatic type checker behavior is not affected by the *category*\nand *stacklevel* arguments.\n\nThe deprecation message passed to the decorator is saved in the\n``__deprecated__`` attribute on the decorated object.\nIf applied to an overload, the decorator\nmust be after the ``@overload`` decorator for the attribute to\nexist on the overload as returned by ``get_overloads()``.\n\nSee PEP 702 for details.", + "builtins.deprecated.__delattr__" => "Implement delattr(self, name).", + "builtins.deprecated.__eq__" => "Return self==value.", + "builtins.deprecated.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.deprecated.__ge__" => "Return self>=value.", + "builtins.deprecated.__getattribute__" => "Return getattr(self, name).", + "builtins.deprecated.__getstate__" => "Helper for pickle.", + "builtins.deprecated.__gt__" => "Return self>value.", + "builtins.deprecated.__hash__" => "Return hash(self).", + "builtins.deprecated.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.deprecated.__le__" => "Return self<=value.", + "builtins.deprecated.__lt__" => "Return self<value.", + "builtins.deprecated.__ne__" => "Return self!=value.", + "builtins.deprecated.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.deprecated.__reduce__" => "Helper for pickle.", + "builtins.deprecated.__reduce_ex__" => "Helper for pickle.", + "builtins.deprecated.__repr__" => "Return repr(self).", + "builtins.deprecated.__setattr__" => "Implement setattr(self, name, value).", + "builtins.deprecated.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.deprecated.__str__" => "Return str(self).", + "builtins.deprecated.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.deprecated.__weakref__" => "list of weak references to the object", + "builtins.deque" => "A list-like sequence optimized for data accesses near its endpoints.", + "builtins.deque.__add__" => "Return self+value.", + "builtins.deque.__class_getitem__" => "deques are generic over the type of their contents", + "builtins.deque.__contains__" => "Return bool(key in self).", + "builtins.deque.__copy__" => "Return a shallow copy of a deque.", + "builtins.deque.__delattr__" => "Implement delattr(self, name).", + "builtins.deque.__delitem__" => "Delete self[key].", + "builtins.deque.__eq__" => "Return self==value.", + "builtins.deque.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.deque.__ge__" => "Return self>=value.", + "builtins.deque.__getattribute__" => "Return getattr(self, name).", + "builtins.deque.__getitem__" => "Return self[key].", + "builtins.deque.__getstate__" => "Helper for pickle.", + "builtins.deque.__gt__" => "Return self>value.", + "builtins.deque.__iadd__" => "Implement self+=value.", + "builtins.deque.__imul__" => "Implement self*=value.", + "builtins.deque.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.deque.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.deque.__iter__" => "Implement iter(self).", + "builtins.deque.__le__" => "Return self<=value.", + "builtins.deque.__len__" => "Return len(self).", + "builtins.deque.__lt__" => "Return self<value.", + "builtins.deque.__mul__" => "Return self*value.", + "builtins.deque.__ne__" => "Return self!=value.", + "builtins.deque.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.deque.__reduce__" => "Return state information for pickling.", + "builtins.deque.__reduce_ex__" => "Helper for pickle.", + "builtins.deque.__repr__" => "Return repr(self).", + "builtins.deque.__reversed__" => "Return a reverse iterator over the deque.", + "builtins.deque.__rmul__" => "Return value*self.", + "builtins.deque.__setattr__" => "Implement setattr(self, name, value).", + "builtins.deque.__setitem__" => "Set self[key] to value.", + "builtins.deque.__sizeof__" => "Return the size of the deque in memory, in bytes.", + "builtins.deque.__str__" => "Return str(self).", + "builtins.deque.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.deque.append" => "Add an element to the right side of the deque.", + "builtins.deque.appendleft" => "Add an element to the left side of the deque.", + "builtins.deque.clear" => "Remove all elements from the deque.", + "builtins.deque.copy" => "Return a shallow copy of a deque.", + "builtins.deque.count" => "Return number of occurrences of value.", + "builtins.deque.extend" => "Extend the right side of the deque with elements from the iterable.", + "builtins.deque.extendleft" => "Extend the left side of the deque with elements from the iterable.", + "builtins.deque.index" => "Return first index of value.\n\nRaises ValueError if the value is not present.", + "builtins.deque.insert" => "Insert value before index.", + "builtins.deque.maxlen" => "maximum size of a deque or None if unbounded", + "builtins.deque.pop" => "Remove and return the rightmost element.", + "builtins.deque.popleft" => "Remove and return the leftmost element.", + "builtins.deque.remove" => "Remove first occurrence of value.", + "builtins.deque.reverse" => "Reverse *IN PLACE*.", + "builtins.deque.rotate" => "Rotate the deque n steps to the right. If n is negative, rotates left.", "builtins.dict" => "dict() -> new empty dictionary\ndict(mapping) -> new dictionary initialized from a mapping object's\n (key, value) pairs\ndict(iterable) -> new dictionary initialized as if via:\n d = {}\n for k, v in iterable:\n d[k] = v\ndict(**kwargs) -> new dictionary initialized with the name=value pairs\n in the keyword argument list. For example: dict(one=1, two=2)", "builtins.dict.__class_getitem__" => "dicts are generic over two types, signifying (respectively) the types of their keys and values", "builtins.dict.__contains__" => "True if the dictionary has the specified key, else False.", @@ -12237,6 +25967,112 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.dict_keyiterator.__sizeof__" => "Size of object in memory, in bytes.", "builtins.dict_keyiterator.__str__" => "Return str(self).", "builtins.dict_keyiterator.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.dict_keys.__and__" => "Return self&value.", + "builtins.dict_keys.__contains__" => "Return bool(key in self).", + "builtins.dict_keys.__delattr__" => "Implement delattr(self, name).", + "builtins.dict_keys.__eq__" => "Return self==value.", + "builtins.dict_keys.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.dict_keys.__ge__" => "Return self>=value.", + "builtins.dict_keys.__getattribute__" => "Return getattr(self, name).", + "builtins.dict_keys.__getstate__" => "Helper for pickle.", + "builtins.dict_keys.__gt__" => "Return self>value.", + "builtins.dict_keys.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.dict_keys.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.dict_keys.__iter__" => "Implement iter(self).", + "builtins.dict_keys.__le__" => "Return self<=value.", + "builtins.dict_keys.__len__" => "Return len(self).", + "builtins.dict_keys.__lt__" => "Return self<value.", + "builtins.dict_keys.__ne__" => "Return self!=value.", + "builtins.dict_keys.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.dict_keys.__or__" => "Return self|value.", + "builtins.dict_keys.__rand__" => "Return value&self.", + "builtins.dict_keys.__reduce__" => "Helper for pickle.", + "builtins.dict_keys.__reduce_ex__" => "Helper for pickle.", + "builtins.dict_keys.__repr__" => "Return repr(self).", + "builtins.dict_keys.__reversed__" => "Return a reverse iterator over the dict keys.", + "builtins.dict_keys.__ror__" => "Return value|self.", + "builtins.dict_keys.__rsub__" => "Return value-self.", + "builtins.dict_keys.__rxor__" => "Return value^self.", + "builtins.dict_keys.__setattr__" => "Implement setattr(self, name, value).", + "builtins.dict_keys.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.dict_keys.__str__" => "Return str(self).", + "builtins.dict_keys.__sub__" => "Return self-value.", + "builtins.dict_keys.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.dict_keys.__xor__" => "Return self^value.", + "builtins.dict_keys.isdisjoint" => "Return True if the view and the given iterable have a null intersection.", + "builtins.dict_keys.mapping" => "dictionary that this view refers to", + "builtins.dict_reverseitemiterator.__delattr__" => "Implement delattr(self, name).", + "builtins.dict_reverseitemiterator.__eq__" => "Return self==value.", + "builtins.dict_reverseitemiterator.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.dict_reverseitemiterator.__ge__" => "Return self>=value.", + "builtins.dict_reverseitemiterator.__getattribute__" => "Return getattr(self, name).", + "builtins.dict_reverseitemiterator.__getstate__" => "Helper for pickle.", + "builtins.dict_reverseitemiterator.__gt__" => "Return self>value.", + "builtins.dict_reverseitemiterator.__hash__" => "Return hash(self).", + "builtins.dict_reverseitemiterator.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.dict_reverseitemiterator.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.dict_reverseitemiterator.__iter__" => "Implement iter(self).", + "builtins.dict_reverseitemiterator.__le__" => "Return self<=value.", + "builtins.dict_reverseitemiterator.__length_hint__" => "Private method returning an estimate of len(list(it)).", + "builtins.dict_reverseitemiterator.__lt__" => "Return self<value.", + "builtins.dict_reverseitemiterator.__ne__" => "Return self!=value.", + "builtins.dict_reverseitemiterator.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.dict_reverseitemiterator.__next__" => "Implement next(self).", + "builtins.dict_reverseitemiterator.__reduce__" => "Return state information for pickling.", + "builtins.dict_reverseitemiterator.__reduce_ex__" => "Helper for pickle.", + "builtins.dict_reverseitemiterator.__repr__" => "Return repr(self).", + "builtins.dict_reverseitemiterator.__setattr__" => "Implement setattr(self, name, value).", + "builtins.dict_reverseitemiterator.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.dict_reverseitemiterator.__str__" => "Return str(self).", + "builtins.dict_reverseitemiterator.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.dict_reversekeyiterator.__delattr__" => "Implement delattr(self, name).", + "builtins.dict_reversekeyiterator.__eq__" => "Return self==value.", + "builtins.dict_reversekeyiterator.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.dict_reversekeyiterator.__ge__" => "Return self>=value.", + "builtins.dict_reversekeyiterator.__getattribute__" => "Return getattr(self, name).", + "builtins.dict_reversekeyiterator.__getstate__" => "Helper for pickle.", + "builtins.dict_reversekeyiterator.__gt__" => "Return self>value.", + "builtins.dict_reversekeyiterator.__hash__" => "Return hash(self).", + "builtins.dict_reversekeyiterator.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.dict_reversekeyiterator.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.dict_reversekeyiterator.__iter__" => "Implement iter(self).", + "builtins.dict_reversekeyiterator.__le__" => "Return self<=value.", + "builtins.dict_reversekeyiterator.__length_hint__" => "Private method returning an estimate of len(list(it)).", + "builtins.dict_reversekeyiterator.__lt__" => "Return self<value.", + "builtins.dict_reversekeyiterator.__ne__" => "Return self!=value.", + "builtins.dict_reversekeyiterator.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.dict_reversekeyiterator.__next__" => "Implement next(self).", + "builtins.dict_reversekeyiterator.__reduce__" => "Return state information for pickling.", + "builtins.dict_reversekeyiterator.__reduce_ex__" => "Helper for pickle.", + "builtins.dict_reversekeyiterator.__repr__" => "Return repr(self).", + "builtins.dict_reversekeyiterator.__setattr__" => "Implement setattr(self, name, value).", + "builtins.dict_reversekeyiterator.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.dict_reversekeyiterator.__str__" => "Return str(self).", + "builtins.dict_reversekeyiterator.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.dict_reversevalueiterator.__delattr__" => "Implement delattr(self, name).", + "builtins.dict_reversevalueiterator.__eq__" => "Return self==value.", + "builtins.dict_reversevalueiterator.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.dict_reversevalueiterator.__ge__" => "Return self>=value.", + "builtins.dict_reversevalueiterator.__getattribute__" => "Return getattr(self, name).", + "builtins.dict_reversevalueiterator.__getstate__" => "Helper for pickle.", + "builtins.dict_reversevalueiterator.__gt__" => "Return self>value.", + "builtins.dict_reversevalueiterator.__hash__" => "Return hash(self).", + "builtins.dict_reversevalueiterator.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.dict_reversevalueiterator.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.dict_reversevalueiterator.__iter__" => "Implement iter(self).", + "builtins.dict_reversevalueiterator.__le__" => "Return self<=value.", + "builtins.dict_reversevalueiterator.__length_hint__" => "Private method returning an estimate of len(list(it)).", + "builtins.dict_reversevalueiterator.__lt__" => "Return self<value.", + "builtins.dict_reversevalueiterator.__ne__" => "Return self!=value.", + "builtins.dict_reversevalueiterator.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.dict_reversevalueiterator.__next__" => "Implement next(self).", + "builtins.dict_reversevalueiterator.__reduce__" => "Return state information for pickling.", + "builtins.dict_reversevalueiterator.__reduce_ex__" => "Helper for pickle.", + "builtins.dict_reversevalueiterator.__repr__" => "Return repr(self).", + "builtins.dict_reversevalueiterator.__setattr__" => "Implement setattr(self, name, value).", + "builtins.dict_reversevalueiterator.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.dict_reversevalueiterator.__str__" => "Return str(self).", + "builtins.dict_reversevalueiterator.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.dict_valueiterator.__delattr__" => "Implement delattr(self, name).", "builtins.dict_valueiterator.__eq__" => "Return self==value.", "builtins.dict_valueiterator.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", @@ -12286,8 +26122,76 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.dict_values.__str__" => "Return str(self).", "builtins.dict_values.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.dict_values.mapping" => "dictionary that this view refers to", + "builtins.different_locale.__delattr__" => "Implement delattr(self, name).", + "builtins.different_locale.__eq__" => "Return self==value.", + "builtins.different_locale.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.different_locale.__ge__" => "Return self>=value.", + "builtins.different_locale.__getattribute__" => "Return getattr(self, name).", + "builtins.different_locale.__getstate__" => "Helper for pickle.", + "builtins.different_locale.__gt__" => "Return self>value.", + "builtins.different_locale.__hash__" => "Return hash(self).", + "builtins.different_locale.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.different_locale.__le__" => "Return self<=value.", + "builtins.different_locale.__lt__" => "Return self<value.", + "builtins.different_locale.__ne__" => "Return self!=value.", + "builtins.different_locale.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.different_locale.__reduce__" => "Helper for pickle.", + "builtins.different_locale.__reduce_ex__" => "Helper for pickle.", + "builtins.different_locale.__repr__" => "Return repr(self).", + "builtins.different_locale.__setattr__" => "Implement setattr(self, name, value).", + "builtins.different_locale.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.different_locale.__str__" => "Return str(self).", + "builtins.different_locale.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.different_locale.__weakref__" => "list of weak references to the object", "builtins.dir" => "dir([object]) -> list of strings\n\nIf called without an argument, return the names in the current scope.\nElse, return an alphabetized list of names comprising (some of) the\nattributes of the given object, and of attributes reachable from it.\nIf the object supplies a method named __dir__, it will be used;\notherwise the default dir() logic is used and returns:\n for a module object: the module's attributes.\n for a class object: its attributes, and recursively the attributes\n of its bases.\n for any other object: its attributes, its class's attributes, and\n recursively the attributes of its class's base classes.", + "builtins.dircmp" => "A class that manages the comparison of 2 directories.\n\ndircmp(a, b, ignore=None, hide=None, *, shallow=True)\n A and B are directories.\n IGNORE is a list of names to ignore,\n defaults to DEFAULT_IGNORES.\n HIDE is a list of names to hide,\n defaults to [os.curdir, os.pardir].\n SHALLOW specifies whether to just check the stat signature (do not read\n the files).\n defaults to True.\n\nHigh level usage:\n x = dircmp(dir1, dir2)\n x.report() -> prints a report on the differences between dir1 and dir2\n or\n x.report_partial_closure() -> prints report on differences between dir1\n and dir2, and reports on common immediate subdirectories.\n x.report_full_closure() -> like report_partial_closure,\n but fully recursive.\n\nAttributes:\n left_list, right_list: The files in dir1 and dir2,\n filtered by hide and ignore.\n common: a list of names in both dir1 and dir2.\n left_only, right_only: names only in dir1, dir2.\n common_dirs: subdirectories in both dir1 and dir2.\n common_files: files in both dir1 and dir2.\n common_funny: names in both dir1 and dir2 where the type differs between\n dir1 and dir2, or the name is not stat-able.\n same_files: list of identical files.\n diff_files: list of filenames which differ.\n funny_files: list of files which could not be compared.\n subdirs: a dictionary of dircmp instances (or MyDirCmp instances if this\n object is of type MyDirCmp, a subclass of dircmp), keyed by names\n in common_dirs.", + "builtins.dircmp.__class_getitem__" => "Represent a PEP 585 generic type\n\nE.g. for t = list[int], t.__origin__ is list and t.__args__ is (int,).", + "builtins.dircmp.__delattr__" => "Implement delattr(self, name).", + "builtins.dircmp.__eq__" => "Return self==value.", + "builtins.dircmp.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.dircmp.__ge__" => "Return self>=value.", + "builtins.dircmp.__getattribute__" => "Return getattr(self, name).", + "builtins.dircmp.__getstate__" => "Helper for pickle.", + "builtins.dircmp.__gt__" => "Return self>value.", + "builtins.dircmp.__hash__" => "Return hash(self).", + "builtins.dircmp.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.dircmp.__le__" => "Return self<=value.", + "builtins.dircmp.__lt__" => "Return self<value.", + "builtins.dircmp.__ne__" => "Return self!=value.", + "builtins.dircmp.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.dircmp.__reduce__" => "Helper for pickle.", + "builtins.dircmp.__reduce_ex__" => "Helper for pickle.", + "builtins.dircmp.__repr__" => "Return repr(self).", + "builtins.dircmp.__setattr__" => "Implement setattr(self, name, value).", + "builtins.dircmp.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.dircmp.__str__" => "Return str(self).", + "builtins.dircmp.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.dircmp.__weakref__" => "list of weak references to the object", "builtins.divmod" => "Return the tuple (x//y, x%y). Invariant: div*y + mod == x.", + "builtins.dropwhile" => "Drop items from the iterable while predicate(item) is true.\n\nAfterwards, return every element until the iterable is exhausted.", + "builtins.dropwhile.__delattr__" => "Implement delattr(self, name).", + "builtins.dropwhile.__eq__" => "Return self==value.", + "builtins.dropwhile.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.dropwhile.__ge__" => "Return self>=value.", + "builtins.dropwhile.__getattribute__" => "Return getattr(self, name).", + "builtins.dropwhile.__getstate__" => "Helper for pickle.", + "builtins.dropwhile.__gt__" => "Return self>value.", + "builtins.dropwhile.__hash__" => "Return hash(self).", + "builtins.dropwhile.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.dropwhile.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.dropwhile.__iter__" => "Implement iter(self).", + "builtins.dropwhile.__le__" => "Return self<=value.", + "builtins.dropwhile.__lt__" => "Return self<value.", + "builtins.dropwhile.__ne__" => "Return self!=value.", + "builtins.dropwhile.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.dropwhile.__next__" => "Implement next(self).", + "builtins.dropwhile.__reduce__" => "Helper for pickle.", + "builtins.dropwhile.__reduce_ex__" => "Helper for pickle.", + "builtins.dropwhile.__repr__" => "Return repr(self).", + "builtins.dropwhile.__setattr__" => "Implement setattr(self, name, value).", + "builtins.dropwhile.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.dropwhile.__str__" => "Return str(self).", + "builtins.dropwhile.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.ellipsis" => "The type of the Ellipsis singleton.", "builtins.ellipsis.__delattr__" => "Implement delattr(self, name).", "builtins.ellipsis.__eq__" => "Return self==value.", @@ -12334,8 +26238,102 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.enumerate.__sizeof__" => "Size of object in memory, in bytes.", "builtins.enumerate.__str__" => "Return str(self).", "builtins.enumerate.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.epoll" => "select.epoll(sizehint=-1, flags=0)\n\nReturns an epolling object\n\nsizehint must be a positive integer or -1 for the default size. The\nsizehint is used to optimize internal data structures. It doesn't limit\nthe maximum number of monitored events.", + "builtins.epoll.__delattr__" => "Implement delattr(self, name).", + "builtins.epoll.__eq__" => "Return self==value.", + "builtins.epoll.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.epoll.__ge__" => "Return self>=value.", + "builtins.epoll.__getattribute__" => "Return getattr(self, name).", + "builtins.epoll.__getstate__" => "Helper for pickle.", + "builtins.epoll.__gt__" => "Return self>value.", + "builtins.epoll.__hash__" => "Return hash(self).", + "builtins.epoll.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.epoll.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.epoll.__le__" => "Return self<=value.", + "builtins.epoll.__lt__" => "Return self<value.", + "builtins.epoll.__ne__" => "Return self!=value.", + "builtins.epoll.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.epoll.__reduce__" => "Helper for pickle.", + "builtins.epoll.__reduce_ex__" => "Helper for pickle.", + "builtins.epoll.__repr__" => "Return repr(self).", + "builtins.epoll.__setattr__" => "Implement setattr(self, name, value).", + "builtins.epoll.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.epoll.__str__" => "Return str(self).", + "builtins.epoll.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.epoll.close" => "Close the epoll control file descriptor.\n\nFurther operations on the epoll object will raise an exception.", + "builtins.epoll.closed" => "True if the epoll handler is closed", + "builtins.epoll.fileno" => "Return the epoll control file descriptor.", + "builtins.epoll.fromfd" => "Create an epoll object from a given control fd.", + "builtins.epoll.modify" => "Modify event mask for a registered file descriptor.\n\n fd\n the target file descriptor of the operation\n eventmask\n a bit set composed of the various EPOLL constants", + "builtins.epoll.poll" => "Wait for events on the epoll file descriptor.\n\n timeout\n the maximum time to wait in seconds (as float);\n a timeout of None or -1 makes poll wait indefinitely\n maxevents\n the maximum number of events returned; -1 means no limit\n\nReturns a list containing any descriptors that have events to\nreport, as a list of (fd, events) 2-tuples.", + "builtins.epoll.register" => "Registers a new fd or raises an OSError if the fd is already registered.\n\n fd\n the target file descriptor of the operation\n eventmask\n a bit set composed of the various EPOLL constants\n\nThe epoll interface supports all file descriptors that support poll.", + "builtins.epoll.unregister" => "Remove a registered file descriptor from the epoll object.\n\n fd\n the target file descriptor of the operation", "builtins.eval" => "Evaluate the given source in the context of globals and locals.\n\nThe source may be a string representing a Python expression\nor a code object as returned by compile().\nThe globals must be a dictionary and locals can be any mapping,\ndefaulting to the current globals and locals.\nIf only globals is given, locals defaults to it.", "builtins.exec" => "Execute the given source in the context of globals and locals.\n\nThe source may be a string representing one or more Python statements\nor a code object as returned by compile().\nThe globals must be a dictionary and locals can be any mapping,\ndefaulting to the current globals and locals.\nIf only globals is given, locals defaults to it.\nThe closure must be a tuple of cellvars, and can only be used\nwhen source is a code object requiring exactly that many cellvars.", + "builtins.fake_code.__delattr__" => "Implement delattr(self, name).", + "builtins.fake_code.__eq__" => "Return self==value.", + "builtins.fake_code.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.fake_code.__ge__" => "Return self>=value.", + "builtins.fake_code.__getattribute__" => "Return getattr(self, name).", + "builtins.fake_code.__getstate__" => "Helper for pickle.", + "builtins.fake_code.__gt__" => "Return self>value.", + "builtins.fake_code.__hash__" => "Return hash(self).", + "builtins.fake_code.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.fake_code.__le__" => "Return self<=value.", + "builtins.fake_code.__lt__" => "Return self<value.", + "builtins.fake_code.__ne__" => "Return self!=value.", + "builtins.fake_code.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.fake_code.__reduce__" => "Helper for pickle.", + "builtins.fake_code.__reduce_ex__" => "Helper for pickle.", + "builtins.fake_code.__setattr__" => "Implement setattr(self, name, value).", + "builtins.fake_code.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.fake_code.__str__" => "Return str(self).", + "builtins.fake_code.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.fake_code.__weakref__" => "list of weak references to the object", + "builtins.fake_frame.__delattr__" => "Implement delattr(self, name).", + "builtins.fake_frame.__eq__" => "Return self==value.", + "builtins.fake_frame.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.fake_frame.__ge__" => "Return self>=value.", + "builtins.fake_frame.__getattribute__" => "Return getattr(self, name).", + "builtins.fake_frame.__getstate__" => "Helper for pickle.", + "builtins.fake_frame.__gt__" => "Return self>value.", + "builtins.fake_frame.__hash__" => "Return hash(self).", + "builtins.fake_frame.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.fake_frame.__le__" => "Return self<=value.", + "builtins.fake_frame.__lt__" => "Return self<value.", + "builtins.fake_frame.__ne__" => "Return self!=value.", + "builtins.fake_frame.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.fake_frame.__reduce__" => "Helper for pickle.", + "builtins.fake_frame.__reduce_ex__" => "Helper for pickle.", + "builtins.fake_frame.__repr__" => "Return repr(self).", + "builtins.fake_frame.__setattr__" => "Implement setattr(self, name, value).", + "builtins.fake_frame.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.fake_frame.__str__" => "Return str(self).", + "builtins.fake_frame.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.fake_frame.__weakref__" => "list of weak references to the object", + "builtins.fieldnameiterator.__delattr__" => "Implement delattr(self, name).", + "builtins.fieldnameiterator.__eq__" => "Return self==value.", + "builtins.fieldnameiterator.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.fieldnameiterator.__ge__" => "Return self>=value.", + "builtins.fieldnameiterator.__getattribute__" => "Return getattr(self, name).", + "builtins.fieldnameiterator.__getstate__" => "Helper for pickle.", + "builtins.fieldnameiterator.__gt__" => "Return self>value.", + "builtins.fieldnameiterator.__hash__" => "Return hash(self).", + "builtins.fieldnameiterator.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.fieldnameiterator.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.fieldnameiterator.__iter__" => "Implement iter(self).", + "builtins.fieldnameiterator.__le__" => "Return self<=value.", + "builtins.fieldnameiterator.__lt__" => "Return self<value.", + "builtins.fieldnameiterator.__ne__" => "Return self!=value.", + "builtins.fieldnameiterator.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.fieldnameiterator.__next__" => "Implement next(self).", + "builtins.fieldnameiterator.__reduce__" => "Helper for pickle.", + "builtins.fieldnameiterator.__reduce_ex__" => "Helper for pickle.", + "builtins.fieldnameiterator.__repr__" => "Return repr(self).", + "builtins.fieldnameiterator.__setattr__" => "Implement setattr(self, name, value).", + "builtins.fieldnameiterator.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.fieldnameiterator.__str__" => "Return str(self).", + "builtins.fieldnameiterator.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.filter" => "Return an iterator yielding those items of iterable for which\nfunction(item) is true. If function is None, return the items that\nare true.", "builtins.filter.__delattr__" => "Implement delattr(self, name).", "builtins.filter.__eq__" => "Return self==value.", @@ -12360,6 +26358,76 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.filter.__sizeof__" => "Size of object in memory, in bytes.", "builtins.filter.__str__" => "Return str(self).", "builtins.filter.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.filterfalse" => "Return those items of iterable for which function(item) is false.\n\nIf function is None, return the items that are false.", + "builtins.filterfalse.__delattr__" => "Implement delattr(self, name).", + "builtins.filterfalse.__eq__" => "Return self==value.", + "builtins.filterfalse.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.filterfalse.__ge__" => "Return self>=value.", + "builtins.filterfalse.__getattribute__" => "Return getattr(self, name).", + "builtins.filterfalse.__getstate__" => "Helper for pickle.", + "builtins.filterfalse.__gt__" => "Return self>value.", + "builtins.filterfalse.__hash__" => "Return hash(self).", + "builtins.filterfalse.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.filterfalse.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.filterfalse.__iter__" => "Implement iter(self).", + "builtins.filterfalse.__le__" => "Return self<=value.", + "builtins.filterfalse.__lt__" => "Return self<value.", + "builtins.filterfalse.__ne__" => "Return self!=value.", + "builtins.filterfalse.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.filterfalse.__next__" => "Implement next(self).", + "builtins.filterfalse.__reduce__" => "Helper for pickle.", + "builtins.filterfalse.__reduce_ex__" => "Helper for pickle.", + "builtins.filterfalse.__repr__" => "Return repr(self).", + "builtins.filterfalse.__setattr__" => "Implement setattr(self, name, value).", + "builtins.filterfalse.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.filterfalse.__str__" => "Return str(self).", + "builtins.filterfalse.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.finalize" => "Class for finalization of weakrefable objects\n\nfinalize(obj, func, *args, **kwargs) returns a callable finalizer\nobject which will be called when obj is garbage collected. The\nfirst time the finalizer is called it evaluates func(*arg, **kwargs)\nand returns the result. After this the finalizer is dead, and\ncalling it just returns None.\n\nWhen the program exits any remaining finalizers for which the\natexit attribute is true will be run in reverse order of creation.\nBy default atexit is true.", + "builtins.finalize._Info.__delattr__" => "Implement delattr(self, name).", + "builtins.finalize._Info.__eq__" => "Return self==value.", + "builtins.finalize._Info.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.finalize._Info.__ge__" => "Return self>=value.", + "builtins.finalize._Info.__getattribute__" => "Return getattr(self, name).", + "builtins.finalize._Info.__getstate__" => "Helper for pickle.", + "builtins.finalize._Info.__gt__" => "Return self>value.", + "builtins.finalize._Info.__hash__" => "Return hash(self).", + "builtins.finalize._Info.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.finalize._Info.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.finalize._Info.__le__" => "Return self<=value.", + "builtins.finalize._Info.__lt__" => "Return self<value.", + "builtins.finalize._Info.__ne__" => "Return self!=value.", + "builtins.finalize._Info.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.finalize._Info.__reduce__" => "Helper for pickle.", + "builtins.finalize._Info.__reduce_ex__" => "Helper for pickle.", + "builtins.finalize._Info.__repr__" => "Return repr(self).", + "builtins.finalize._Info.__setattr__" => "Implement setattr(self, name, value).", + "builtins.finalize._Info.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.finalize._Info.__str__" => "Return str(self).", + "builtins.finalize._Info.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.finalize.__call__" => "If alive then mark as dead and return func(*args, **kwargs);\notherwise return None", + "builtins.finalize.__delattr__" => "Implement delattr(self, name).", + "builtins.finalize.__eq__" => "Return self==value.", + "builtins.finalize.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.finalize.__ge__" => "Return self>=value.", + "builtins.finalize.__getattribute__" => "Return getattr(self, name).", + "builtins.finalize.__getstate__" => "Helper for pickle.", + "builtins.finalize.__gt__" => "Return self>value.", + "builtins.finalize.__hash__" => "Return hash(self).", + "builtins.finalize.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.finalize.__le__" => "Return self<=value.", + "builtins.finalize.__lt__" => "Return self<value.", + "builtins.finalize.__ne__" => "Return self!=value.", + "builtins.finalize.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.finalize.__reduce__" => "Helper for pickle.", + "builtins.finalize.__reduce_ex__" => "Helper for pickle.", + "builtins.finalize.__setattr__" => "Implement setattr(self, name, value).", + "builtins.finalize.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.finalize.__str__" => "Return str(self).", + "builtins.finalize.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.finalize.alive" => "Whether finalizer is alive", + "builtins.finalize.atexit" => "Whether finalizer should be called at exit", + "builtins.finalize.detach" => "If alive then mark as dead and return (obj, func, args, kwargs);\notherwise return None", + "builtins.finalize.peek" => "If alive then return (obj, func, args, kwargs);\notherwise return None", "builtins.float" => "Convert a string or number to a floating-point number, if possible.", "builtins.float.__abs__" => "abs(self)", "builtins.float.__add__" => "Return self+value.", @@ -12418,6 +26486,29 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.float.is_integer" => "Return True if the float is an integer.", "builtins.float.real" => "the real part of a complex number", "builtins.format" => "Return type(value).__format__(value, format_spec)\n\nMany built-in types implement format_spec according to the\nFormat Specification Mini-language. See help('FORMATTING').\n\nIf type(value) does not supply a method named __format__\nand format_spec is empty, then str(value) is returned.\nSee also help('SPECIALMETHODS').", + "builtins.formatteriterator.__delattr__" => "Implement delattr(self, name).", + "builtins.formatteriterator.__eq__" => "Return self==value.", + "builtins.formatteriterator.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.formatteriterator.__ge__" => "Return self>=value.", + "builtins.formatteriterator.__getattribute__" => "Return getattr(self, name).", + "builtins.formatteriterator.__getstate__" => "Helper for pickle.", + "builtins.formatteriterator.__gt__" => "Return self>value.", + "builtins.formatteriterator.__hash__" => "Return hash(self).", + "builtins.formatteriterator.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.formatteriterator.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.formatteriterator.__iter__" => "Implement iter(self).", + "builtins.formatteriterator.__le__" => "Return self<=value.", + "builtins.formatteriterator.__lt__" => "Return self<value.", + "builtins.formatteriterator.__ne__" => "Return self!=value.", + "builtins.formatteriterator.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.formatteriterator.__next__" => "Implement next(self).", + "builtins.formatteriterator.__reduce__" => "Helper for pickle.", + "builtins.formatteriterator.__reduce_ex__" => "Helper for pickle.", + "builtins.formatteriterator.__repr__" => "Return repr(self).", + "builtins.formatteriterator.__setattr__" => "Implement setattr(self, name, value).", + "builtins.formatteriterator.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.formatteriterator.__str__" => "Return str(self).", + "builtins.formatteriterator.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.frame.__delattr__" => "Implement delattr(self, name).", "builtins.frame.__eq__" => "Return self==value.", "builtins.frame.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", @@ -12517,6 +26608,43 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.function.__str__" => "Return str(self).", "builtins.function.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.function.__type_params__" => "Get the declared type parameters for a function.", + "builtins.gdbm" => "This object represents a GDBM database.\nGDBM objects behave like mappings (dictionaries), except that keys and\nvalues are always immutable bytes-like objects or strings. Printing\na GDBM object doesn't print the keys and values, and the items() and\nvalues() methods are not supported.\n\nGDBM objects also support additional operations such as firstkey,\nnextkey, reorganize, and sync.", + "builtins.gdbm.__bool__" => "True if self else False", + "builtins.gdbm.__contains__" => "Return bool(key in self).", + "builtins.gdbm.__delattr__" => "Implement delattr(self, name).", + "builtins.gdbm.__delitem__" => "Delete self[key].", + "builtins.gdbm.__eq__" => "Return self==value.", + "builtins.gdbm.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.gdbm.__ge__" => "Return self>=value.", + "builtins.gdbm.__getattribute__" => "Return getattr(self, name).", + "builtins.gdbm.__getitem__" => "Return self[key].", + "builtins.gdbm.__getstate__" => "Helper for pickle.", + "builtins.gdbm.__gt__" => "Return self>value.", + "builtins.gdbm.__hash__" => "Return hash(self).", + "builtins.gdbm.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.gdbm.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.gdbm.__le__" => "Return self<=value.", + "builtins.gdbm.__len__" => "Return len(self).", + "builtins.gdbm.__lt__" => "Return self<value.", + "builtins.gdbm.__ne__" => "Return self!=value.", + "builtins.gdbm.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.gdbm.__reduce__" => "Helper for pickle.", + "builtins.gdbm.__reduce_ex__" => "Helper for pickle.", + "builtins.gdbm.__repr__" => "Return repr(self).", + "builtins.gdbm.__setattr__" => "Implement setattr(self, name, value).", + "builtins.gdbm.__setitem__" => "Set self[key] to value.", + "builtins.gdbm.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.gdbm.__str__" => "Return str(self).", + "builtins.gdbm.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.gdbm.clear" => "Remove all items from the database.", + "builtins.gdbm.close" => "Close the database.", + "builtins.gdbm.firstkey" => "Return the starting key for the traversal.\n\nIt's possible to loop over every key in the database using this\nmethod and the nextkey() method. The traversal is ordered by GDBM's\ninternal hash values, and won't be sorted by the key values.", + "builtins.gdbm.get" => "Get the value for key, or default if not present.", + "builtins.gdbm.keys" => "Get a list of all keys in the database.", + "builtins.gdbm.nextkey" => "Returns the key that follows key in the traversal.\n\nThe following code prints every key in the database db, without\nhaving to create a list in memory that contains them all:\n\n k = db.firstkey()\n while k is not None:\n print(k)\n k = db.nextkey(k)", + "builtins.gdbm.reorganize" => "Reorganize the database.\n\nIf you have carried out a lot of deletions and would like to shrink\nthe space used by the GDBM file, this routine will reorganize the\ndatabase. GDBM will not shorten the length of a database file\nexcept by using this reorganization; otherwise, deleted file space\nwill be kept and reused as new (key,value) pairs are added.", + "builtins.gdbm.setdefault" => "Get value for key, or set it to default and return default if not present.", + "builtins.gdbm.sync" => "Flush the database to the disk file.\n\nWhen the database has been opened in fast mode, this method forces\nany unwritten data to be written to the disk.", "builtins.generator.__class_getitem__" => "generators are generic over the types of their yield, send, and return values", "builtins.generator.__del__" => "Called when the instance is about to be destroyed.", "builtins.generator.__delattr__" => "Implement delattr(self, name).", @@ -12546,6 +26674,28 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.generator.gi_yieldfrom" => "object being iterated by yield from, or None", "builtins.generator.send" => "send(value) -> send 'value' into generator,\nreturn next yielded value or raise StopIteration.", "builtins.generator.throw" => "throw(value)\nthrow(type[,value[,tb]])\n\nRaise exception in generator, return next yielded value or raise\nStopIteration.\nthe (type, val, tb) signature is deprecated, \nand may be removed in a future version of Python.", + "builtins.generic_alias_iterator.__delattr__" => "Implement delattr(self, name).", + "builtins.generic_alias_iterator.__eq__" => "Return self==value.", + "builtins.generic_alias_iterator.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.generic_alias_iterator.__ge__" => "Return self>=value.", + "builtins.generic_alias_iterator.__getattribute__" => "Return getattr(self, name).", + "builtins.generic_alias_iterator.__getstate__" => "Helper for pickle.", + "builtins.generic_alias_iterator.__gt__" => "Return self>value.", + "builtins.generic_alias_iterator.__hash__" => "Return hash(self).", + "builtins.generic_alias_iterator.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.generic_alias_iterator.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.generic_alias_iterator.__iter__" => "Implement iter(self).", + "builtins.generic_alias_iterator.__le__" => "Return self<=value.", + "builtins.generic_alias_iterator.__lt__" => "Return self<value.", + "builtins.generic_alias_iterator.__ne__" => "Return self!=value.", + "builtins.generic_alias_iterator.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.generic_alias_iterator.__next__" => "Implement next(self).", + "builtins.generic_alias_iterator.__reduce_ex__" => "Helper for pickle.", + "builtins.generic_alias_iterator.__repr__" => "Return repr(self).", + "builtins.generic_alias_iterator.__setattr__" => "Implement setattr(self, name, value).", + "builtins.generic_alias_iterator.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.generic_alias_iterator.__str__" => "Return str(self).", + "builtins.generic_alias_iterator.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.getattr" => "getattr(object, name[, default]) -> value\n\nGet a named attribute from an object.\n\ngetattr(x, 'y') is equivalent to x.y.\nWhen a default argument is given, it is returned when the attribute\ndoesn't exist; without it, an exception is raised in that case.", "builtins.getset_descriptor.__delattr__" => "Implement delattr(self, name).", "builtins.getset_descriptor.__delete__" => "Delete an attribute of instance.", @@ -12572,11 +26722,143 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.getset_descriptor.__str__" => "Return str(self).", "builtins.getset_descriptor.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.globals" => "Return the dictionary containing the current scope's global variables.\n\nNOTE: Updates to this dictionary *will* affect name lookups in the\ncurrent global scope and vice-versa.", + "builtins.groupby" => "make an iterator that returns consecutive keys and groups from the iterable\n\n iterable\n Elements to divide into groups according to the key function.\n key\n A function for computing the group category for each element.\n If the key function is not specified or is None, the element itself\n is used for grouping.", + "builtins.groupby.__delattr__" => "Implement delattr(self, name).", + "builtins.groupby.__eq__" => "Return self==value.", + "builtins.groupby.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.groupby.__ge__" => "Return self>=value.", + "builtins.groupby.__getattribute__" => "Return getattr(self, name).", + "builtins.groupby.__getstate__" => "Helper for pickle.", + "builtins.groupby.__gt__" => "Return self>value.", + "builtins.groupby.__hash__" => "Return hash(self).", + "builtins.groupby.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.groupby.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.groupby.__iter__" => "Implement iter(self).", + "builtins.groupby.__le__" => "Return self<=value.", + "builtins.groupby.__lt__" => "Return self<value.", + "builtins.groupby.__ne__" => "Return self!=value.", + "builtins.groupby.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.groupby.__next__" => "Implement next(self).", + "builtins.groupby.__reduce__" => "Helper for pickle.", + "builtins.groupby.__reduce_ex__" => "Helper for pickle.", + "builtins.groupby.__repr__" => "Return repr(self).", + "builtins.groupby.__setattr__" => "Implement setattr(self, name, value).", + "builtins.groupby.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.groupby.__str__" => "Return str(self).", + "builtins.groupby.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.hamt.__contains__" => "Return bool(key in self).", + "builtins.hamt.__delattr__" => "Implement delattr(self, name).", + "builtins.hamt.__eq__" => "Return self==value.", + "builtins.hamt.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.hamt.__ge__" => "Return self>=value.", + "builtins.hamt.__getattribute__" => "Return getattr(self, name).", + "builtins.hamt.__getitem__" => "Return self[key].", + "builtins.hamt.__getstate__" => "Helper for pickle.", + "builtins.hamt.__gt__" => "Return self>value.", + "builtins.hamt.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.hamt.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.hamt.__iter__" => "Implement iter(self).", + "builtins.hamt.__le__" => "Return self<=value.", + "builtins.hamt.__len__" => "Return len(self).", + "builtins.hamt.__lt__" => "Return self<value.", + "builtins.hamt.__ne__" => "Return self!=value.", + "builtins.hamt.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.hamt.__reduce__" => "Helper for pickle.", + "builtins.hamt.__reduce_ex__" => "Helper for pickle.", + "builtins.hamt.__repr__" => "Return repr(self).", + "builtins.hamt.__setattr__" => "Implement setattr(self, name, value).", + "builtins.hamt.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.hamt.__str__" => "Return str(self).", + "builtins.hamt.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.hamt_array_node.__delattr__" => "Implement delattr(self, name).", + "builtins.hamt_array_node.__eq__" => "Return self==value.", + "builtins.hamt_array_node.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.hamt_array_node.__ge__" => "Return self>=value.", + "builtins.hamt_array_node.__getattribute__" => "Return getattr(self, name).", + "builtins.hamt_array_node.__getstate__" => "Helper for pickle.", + "builtins.hamt_array_node.__gt__" => "Return self>value.", + "builtins.hamt_array_node.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.hamt_array_node.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.hamt_array_node.__le__" => "Return self<=value.", + "builtins.hamt_array_node.__lt__" => "Return self<value.", + "builtins.hamt_array_node.__ne__" => "Return self!=value.", + "builtins.hamt_array_node.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.hamt_array_node.__reduce__" => "Helper for pickle.", + "builtins.hamt_array_node.__reduce_ex__" => "Helper for pickle.", + "builtins.hamt_array_node.__repr__" => "Return repr(self).", + "builtins.hamt_array_node.__setattr__" => "Implement setattr(self, name, value).", + "builtins.hamt_array_node.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.hamt_array_node.__str__" => "Return str(self).", + "builtins.hamt_array_node.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.hamt_bitmap_node.__delattr__" => "Implement delattr(self, name).", + "builtins.hamt_bitmap_node.__eq__" => "Return self==value.", + "builtins.hamt_bitmap_node.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.hamt_bitmap_node.__ge__" => "Return self>=value.", + "builtins.hamt_bitmap_node.__getattribute__" => "Return getattr(self, name).", + "builtins.hamt_bitmap_node.__getstate__" => "Helper for pickle.", + "builtins.hamt_bitmap_node.__gt__" => "Return self>value.", + "builtins.hamt_bitmap_node.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.hamt_bitmap_node.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.hamt_bitmap_node.__le__" => "Return self<=value.", + "builtins.hamt_bitmap_node.__lt__" => "Return self<value.", + "builtins.hamt_bitmap_node.__ne__" => "Return self!=value.", + "builtins.hamt_bitmap_node.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.hamt_bitmap_node.__reduce__" => "Helper for pickle.", + "builtins.hamt_bitmap_node.__reduce_ex__" => "Helper for pickle.", + "builtins.hamt_bitmap_node.__repr__" => "Return repr(self).", + "builtins.hamt_bitmap_node.__setattr__" => "Implement setattr(self, name, value).", + "builtins.hamt_bitmap_node.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.hamt_bitmap_node.__str__" => "Return str(self).", + "builtins.hamt_bitmap_node.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.hamt_collision_node.__delattr__" => "Implement delattr(self, name).", + "builtins.hamt_collision_node.__eq__" => "Return self==value.", + "builtins.hamt_collision_node.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.hamt_collision_node.__ge__" => "Return self>=value.", + "builtins.hamt_collision_node.__getattribute__" => "Return getattr(self, name).", + "builtins.hamt_collision_node.__getstate__" => "Helper for pickle.", + "builtins.hamt_collision_node.__gt__" => "Return self>value.", + "builtins.hamt_collision_node.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.hamt_collision_node.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.hamt_collision_node.__le__" => "Return self<=value.", + "builtins.hamt_collision_node.__lt__" => "Return self<value.", + "builtins.hamt_collision_node.__ne__" => "Return self!=value.", + "builtins.hamt_collision_node.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.hamt_collision_node.__reduce__" => "Helper for pickle.", + "builtins.hamt_collision_node.__reduce_ex__" => "Helper for pickle.", + "builtins.hamt_collision_node.__repr__" => "Return repr(self).", + "builtins.hamt_collision_node.__setattr__" => "Implement setattr(self, name, value).", + "builtins.hamt_collision_node.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.hamt_collision_node.__str__" => "Return str(self).", + "builtins.hamt_collision_node.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.hasattr" => "Return whether the object has an attribute with the given name.\n\nThis is done by calling getattr(obj, name) and catching AttributeError.", "builtins.hash" => "Return the integer hash value for the given object.\n\nTwo objects that compare equal must also have the same hash value, but\nthe reverse is not necessarily true. Hash values may differ between\nPython processes. Not all objects are hashable; calling hash() on an\nunhashable object raises TypeError.", "builtins.hex" => "Return the hexadecimal representation of an integer.\n\n >>> hex(12648430)\n '0xc0ffee'", "builtins.id" => "Return the identity of an object.\n\nThis is guaranteed to be unique among simultaneously existing objects.\n(CPython uses the object's memory address.)", "builtins.input" => "Read a string from standard input. The trailing newline is stripped.\n\nThe prompt string, if given, is printed to standard output without a\ntrailing newline before reading input.\n\nIf the user hits EOF (*nix: Ctrl-D, Windows: Ctrl-Z+Return), raise\nEOFError.\nOn *nix systems, readline is used if available.", + "builtins.instancemethod" => "Bind a function to a class.", + "builtins.instancemethod.__call__" => "Call self as a function.", + "builtins.instancemethod.__delattr__" => "Implement delattr(self, name).", + "builtins.instancemethod.__eq__" => "Return self==value.", + "builtins.instancemethod.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.instancemethod.__func__" => "the function (or other callable) implementing a method", + "builtins.instancemethod.__ge__" => "Return self>=value.", + "builtins.instancemethod.__get__" => "Return an attribute of instance, which is of type owner.", + "builtins.instancemethod.__getattribute__" => "Return getattr(self, name).", + "builtins.instancemethod.__getstate__" => "Helper for pickle.", + "builtins.instancemethod.__gt__" => "Return self>value.", + "builtins.instancemethod.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.instancemethod.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.instancemethod.__le__" => "Return self<=value.", + "builtins.instancemethod.__lt__" => "Return self<value.", + "builtins.instancemethod.__ne__" => "Return self!=value.", + "builtins.instancemethod.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.instancemethod.__reduce__" => "Helper for pickle.", + "builtins.instancemethod.__reduce_ex__" => "Helper for pickle.", + "builtins.instancemethod.__repr__" => "Return repr(self).", + "builtins.instancemethod.__setattr__" => "Implement setattr(self, name, value).", + "builtins.instancemethod.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.instancemethod.__str__" => "Return str(self).", + "builtins.instancemethod.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.int" => "int([x]) -> integer\nint(x, base=10) -> integer\n\nConvert a number or string to an integer, or return 0 if no arguments\nare given. If x is a number, return x.__int__(). For floating-point\nnumbers, this truncates towards zero.\n\nIf x is not a number or if base is given, then x must be a string,\nbytes, or bytearray instance representing an integer literal in the\ngiven base. The literal can be preceded by '+' or '-' and be surrounded\nby whitespace. The base defaults to 10. Valid bases are 0 and 2-36.\nBase 0 means to interpret the base from the string as an integer\niteral.\n>>> int('0b100', base=0)\n4", "builtins.int.__abs__" => "abs(self)", "builtins.int.__add__" => "Return self+value.", @@ -12649,9 +26931,223 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.int.real" => "the real part of a complex number", "builtins.int.to_bytes" => "Return an array of bytes representing an integer.\n\n length\n Length of bytes object to use. An OverflowError is raised if\n the integer is not representable with the given number of bytes.\n Default is length 1.\n byteorder\n The byte order used to represent the integer. If byteorder is\n 'big', the most significant byte is at the beginning of the byte\n array. If byteorder is 'little', the most significant byte is at\n the end of the byte array. To request the native byte order of\n the host system, use sys.byteorder as the byte order value.\n Default is to use 'big'.\n signed\n Determines whether two's complement is used to represent the\n integer. If signed is False and a negative integer is given,\n an OverflowError is raised.", "builtins.isinstance" => "Return whether an object is an instance of a class or of a subclass thereof.\n\nA tuple, as in ``isinstance(x, (A, B, ...))``, may be given as the\ntarget to check against. This is equivalent to ``isinstance(x, A) or\nisinstance(x, B) or ...`` etc.", + "builtins.islice" => "islice(iterable, stop) --> islice object\nislice(iterable, start, stop[, step]) --> islice object\n\nReturn an iterator whose next() method returns selected values from an\niterable. If start is specified, will skip all preceding elements;\notherwise, start defaults to zero. Step defaults to one. If\nspecified as another value, step determines how many values are\nskipped between successive calls. Works like a slice() on a list\nbut returns an iterator.", + "builtins.islice.__delattr__" => "Implement delattr(self, name).", + "builtins.islice.__eq__" => "Return self==value.", + "builtins.islice.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.islice.__ge__" => "Return self>=value.", + "builtins.islice.__getattribute__" => "Return getattr(self, name).", + "builtins.islice.__getstate__" => "Helper for pickle.", + "builtins.islice.__gt__" => "Return self>value.", + "builtins.islice.__hash__" => "Return hash(self).", + "builtins.islice.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.islice.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.islice.__iter__" => "Implement iter(self).", + "builtins.islice.__le__" => "Return self<=value.", + "builtins.islice.__lt__" => "Return self<value.", + "builtins.islice.__ne__" => "Return self!=value.", + "builtins.islice.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.islice.__next__" => "Implement next(self).", + "builtins.islice.__reduce__" => "Helper for pickle.", + "builtins.islice.__reduce_ex__" => "Helper for pickle.", + "builtins.islice.__repr__" => "Return repr(self).", + "builtins.islice.__setattr__" => "Implement setattr(self, name, value).", + "builtins.islice.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.islice.__str__" => "Return str(self).", + "builtins.islice.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.issubclass" => "Return whether 'cls' is derived from another class or is the same class.\n\nA tuple, as in ``issubclass(x, (A, B, ...))``, may be given as the\ntarget to check against. This is equivalent to ``issubclass(x, A) or\nissubclass(x, B) or ...``.", + "builtins.itemgetter" => "Return a callable object that fetches the given item(s) from its operand.\nAfter f = itemgetter(2), the call f(r) returns r[2].\nAfter g = itemgetter(2, 5, 3), the call g(r) returns (r[2], r[5], r[3])", + "builtins.itemgetter.__call__" => "Call self as a function.", + "builtins.itemgetter.__delattr__" => "Implement delattr(self, name).", + "builtins.itemgetter.__eq__" => "Return self==value.", + "builtins.itemgetter.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.itemgetter.__ge__" => "Return self>=value.", + "builtins.itemgetter.__getattribute__" => "Return getattr(self, name).", + "builtins.itemgetter.__getstate__" => "Helper for pickle.", + "builtins.itemgetter.__gt__" => "Return self>value.", + "builtins.itemgetter.__hash__" => "Return hash(self).", + "builtins.itemgetter.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.itemgetter.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.itemgetter.__le__" => "Return self<=value.", + "builtins.itemgetter.__lt__" => "Return self<value.", + "builtins.itemgetter.__ne__" => "Return self!=value.", + "builtins.itemgetter.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.itemgetter.__reduce__" => "Return state information for pickling", + "builtins.itemgetter.__reduce_ex__" => "Helper for pickle.", + "builtins.itemgetter.__repr__" => "Return repr(self).", + "builtins.itemgetter.__setattr__" => "Implement setattr(self, name, value).", + "builtins.itemgetter.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.itemgetter.__str__" => "Return str(self).", + "builtins.itemgetter.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.items.__delattr__" => "Implement delattr(self, name).", + "builtins.items.__eq__" => "Return self==value.", + "builtins.items.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.items.__ge__" => "Return self>=value.", + "builtins.items.__getattribute__" => "Return getattr(self, name).", + "builtins.items.__getstate__" => "Helper for pickle.", + "builtins.items.__gt__" => "Return self>value.", + "builtins.items.__hash__" => "Return hash(self).", + "builtins.items.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.items.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.items.__iter__" => "Implement iter(self).", + "builtins.items.__le__" => "Return self<=value.", + "builtins.items.__len__" => "Return len(self).", + "builtins.items.__lt__" => "Return self<value.", + "builtins.items.__ne__" => "Return self!=value.", + "builtins.items.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.items.__next__" => "Implement next(self).", + "builtins.items.__reduce__" => "Helper for pickle.", + "builtins.items.__reduce_ex__" => "Helper for pickle.", + "builtins.items.__repr__" => "Return repr(self).", + "builtins.items.__setattr__" => "Implement setattr(self, name, value).", + "builtins.items.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.items.__str__" => "Return str(self).", + "builtins.items.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.iter" => "iter(iterable) -> iterator\niter(callable, sentinel) -> iterator\n\nGet an iterator from an object. In the first form, the argument must\nsupply its own iterator, or be a sequence.\nIn the second form, the callable is called until it returns the\nsentinel.", + "builtins.iterator.__delattr__" => "Implement delattr(self, name).", + "builtins.iterator.__eq__" => "Return self==value.", + "builtins.iterator.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.iterator.__ge__" => "Return self>=value.", + "builtins.iterator.__getattribute__" => "Return getattr(self, name).", + "builtins.iterator.__getstate__" => "Helper for pickle.", + "builtins.iterator.__gt__" => "Return self>value.", + "builtins.iterator.__hash__" => "Return hash(self).", + "builtins.iterator.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.iterator.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.iterator.__iter__" => "Implement iter(self).", + "builtins.iterator.__le__" => "Return self<=value.", + "builtins.iterator.__length_hint__" => "Private method returning an estimate of len(list(it)).", + "builtins.iterator.__lt__" => "Return self<value.", + "builtins.iterator.__ne__" => "Return self!=value.", + "builtins.iterator.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.iterator.__next__" => "Implement next(self).", + "builtins.iterator.__reduce__" => "Return state information for pickling.", + "builtins.iterator.__reduce_ex__" => "Helper for pickle.", + "builtins.iterator.__repr__" => "Return repr(self).", + "builtins.iterator.__setattr__" => "Implement setattr(self, name, value).", + "builtins.iterator.__setstate__" => "Set state information for unpickling.", + "builtins.iterator.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.iterator.__str__" => "Return str(self).", + "builtins.iterator.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.kevent" => "kevent(ident, filter=KQ_FILTER_READ, flags=KQ_EV_ADD, fflags=0, data=0, udata=0)\n\nThis object is the equivalent of the struct kevent for the C API.\n\nSee the kqueue manpage for more detailed information about the meaning\nof the arguments.\n\nOne minor note: while you might hope that udata could store a\nreference to a python object, it cannot, because it is impossible to\nkeep a proper reference count of the object once it's passed into the\nkernel. Therefore, I have restricted it to only storing an integer. I\nrecommend ignoring it and simply using the 'ident' field to key off\nof. You could also set up a dictionary on the python side to store a\nudata->object mapping.", + "builtins.kevent.__delattr__" => "Implement delattr(self, name).", + "builtins.kevent.__eq__" => "Return self==value.", + "builtins.kevent.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.kevent.__ge__" => "Return self>=value.", + "builtins.kevent.__getattribute__" => "Return getattr(self, name).", + "builtins.kevent.__getstate__" => "Helper for pickle.", + "builtins.kevent.__gt__" => "Return self>value.", + "builtins.kevent.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.kevent.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.kevent.__le__" => "Return self<=value.", + "builtins.kevent.__lt__" => "Return self<value.", + "builtins.kevent.__ne__" => "Return self!=value.", + "builtins.kevent.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.kevent.__reduce__" => "Helper for pickle.", + "builtins.kevent.__reduce_ex__" => "Helper for pickle.", + "builtins.kevent.__repr__" => "Return repr(self).", + "builtins.kevent.__setattr__" => "Implement setattr(self, name, value).", + "builtins.kevent.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.kevent.__str__" => "Return str(self).", + "builtins.kevent.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.keys.__delattr__" => "Implement delattr(self, name).", + "builtins.keys.__eq__" => "Return self==value.", + "builtins.keys.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.keys.__ge__" => "Return self>=value.", + "builtins.keys.__getattribute__" => "Return getattr(self, name).", + "builtins.keys.__getstate__" => "Helper for pickle.", + "builtins.keys.__gt__" => "Return self>value.", + "builtins.keys.__hash__" => "Return hash(self).", + "builtins.keys.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.keys.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.keys.__iter__" => "Implement iter(self).", + "builtins.keys.__le__" => "Return self<=value.", + "builtins.keys.__len__" => "Return len(self).", + "builtins.keys.__lt__" => "Return self<value.", + "builtins.keys.__ne__" => "Return self!=value.", + "builtins.keys.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.keys.__next__" => "Implement next(self).", + "builtins.keys.__reduce__" => "Helper for pickle.", + "builtins.keys.__reduce_ex__" => "Helper for pickle.", + "builtins.keys.__repr__" => "Return repr(self).", + "builtins.keys.__setattr__" => "Implement setattr(self, name, value).", + "builtins.keys.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.keys.__str__" => "Return str(self).", + "builtins.keys.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.kqueue" => "Kqueue syscall wrapper.\n\nFor example, to start watching a socket for input:\n>>> kq = kqueue()\n>>> sock = socket()\n>>> sock.connect((host, port))\n>>> kq.control([kevent(sock, KQ_FILTER_WRITE, KQ_EV_ADD)], 0)\n\nTo wait one second for it to become writeable:\n>>> kq.control(None, 1, 1000)\n\nTo stop listening:\n>>> kq.control([kevent(sock, KQ_FILTER_WRITE, KQ_EV_DELETE)], 0)", + "builtins.kqueue.__del__" => "Called when the instance is about to be destroyed.", + "builtins.kqueue.__delattr__" => "Implement delattr(self, name).", + "builtins.kqueue.__eq__" => "Return self==value.", + "builtins.kqueue.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.kqueue.__ge__" => "Return self>=value.", + "builtins.kqueue.__getattribute__" => "Return getattr(self, name).", + "builtins.kqueue.__getstate__" => "Helper for pickle.", + "builtins.kqueue.__gt__" => "Return self>value.", + "builtins.kqueue.__hash__" => "Return hash(self).", + "builtins.kqueue.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.kqueue.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.kqueue.__le__" => "Return self<=value.", + "builtins.kqueue.__lt__" => "Return self<value.", + "builtins.kqueue.__ne__" => "Return self!=value.", + "builtins.kqueue.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.kqueue.__reduce__" => "Helper for pickle.", + "builtins.kqueue.__reduce_ex__" => "Helper for pickle.", + "builtins.kqueue.__repr__" => "Return repr(self).", + "builtins.kqueue.__setattr__" => "Implement setattr(self, name, value).", + "builtins.kqueue.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.kqueue.__str__" => "Return str(self).", + "builtins.kqueue.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.kqueue.close" => "Close the kqueue control file descriptor.\n\nFurther operations on the kqueue object will raise an exception.", + "builtins.kqueue.closed" => "True if the kqueue handler is closed", + "builtins.kqueue.control" => "Calls the kernel kevent function.\n\n changelist\n Must be an iterable of kevent objects describing the changes to be made\n to the kernel's watch list or None.\n maxevents\n The maximum number of events that the kernel will return.\n timeout\n The maximum time to wait in seconds, or else None to wait forever.\n This accepts floats for smaller timeouts, too.", + "builtins.kqueue.fileno" => "Return the kqueue control file descriptor.", + "builtins.kqueue.fromfd" => "Create a kqueue object from a given control fd.", + "builtins.legacy_event_handler.__call__" => "Call self as a function.", + "builtins.legacy_event_handler.__delattr__" => "Implement delattr(self, name).", + "builtins.legacy_event_handler.__eq__" => "Return self==value.", + "builtins.legacy_event_handler.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.legacy_event_handler.__ge__" => "Return self>=value.", + "builtins.legacy_event_handler.__getattribute__" => "Return getattr(self, name).", + "builtins.legacy_event_handler.__getstate__" => "Helper for pickle.", + "builtins.legacy_event_handler.__gt__" => "Return self>value.", + "builtins.legacy_event_handler.__hash__" => "Return hash(self).", + "builtins.legacy_event_handler.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.legacy_event_handler.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.legacy_event_handler.__le__" => "Return self<=value.", + "builtins.legacy_event_handler.__lt__" => "Return self<value.", + "builtins.legacy_event_handler.__ne__" => "Return self!=value.", + "builtins.legacy_event_handler.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.legacy_event_handler.__reduce__" => "Helper for pickle.", + "builtins.legacy_event_handler.__reduce_ex__" => "Helper for pickle.", + "builtins.legacy_event_handler.__repr__" => "Return repr(self).", + "builtins.legacy_event_handler.__setattr__" => "Implement setattr(self, name, value).", + "builtins.legacy_event_handler.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.legacy_event_handler.__str__" => "Return str(self).", + "builtins.legacy_event_handler.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.len" => "Return the number of items in a container.", + "builtins.line_iterator.__delattr__" => "Implement delattr(self, name).", + "builtins.line_iterator.__eq__" => "Return self==value.", + "builtins.line_iterator.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.line_iterator.__ge__" => "Return self>=value.", + "builtins.line_iterator.__getattribute__" => "Return getattr(self, name).", + "builtins.line_iterator.__getstate__" => "Helper for pickle.", + "builtins.line_iterator.__gt__" => "Return self>value.", + "builtins.line_iterator.__hash__" => "Return hash(self).", + "builtins.line_iterator.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.line_iterator.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.line_iterator.__iter__" => "Implement iter(self).", + "builtins.line_iterator.__le__" => "Return self<=value.", + "builtins.line_iterator.__lt__" => "Return self<value.", + "builtins.line_iterator.__ne__" => "Return self!=value.", + "builtins.line_iterator.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.line_iterator.__next__" => "Implement next(self).", + "builtins.line_iterator.__reduce__" => "Helper for pickle.", + "builtins.line_iterator.__reduce_ex__" => "Helper for pickle.", + "builtins.line_iterator.__repr__" => "Return repr(self).", + "builtins.line_iterator.__setattr__" => "Implement setattr(self, name, value).", + "builtins.line_iterator.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.line_iterator.__str__" => "Return str(self).", + "builtins.line_iterator.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.list" => "Built-in mutable sequence.\n\nIf no argument is given, the constructor creates a new empty list.\nThe argument must be an iterable if specified.", "builtins.list.__add__" => "Return self+value.", "builtins.list.__class_getitem__" => "lists are generic over the type of their contents", @@ -12722,7 +27218,125 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.list_iterator.__sizeof__" => "Size of object in memory, in bytes.", "builtins.list_iterator.__str__" => "Return str(self).", "builtins.list_iterator.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.list_reverseiterator.__delattr__" => "Implement delattr(self, name).", + "builtins.list_reverseiterator.__eq__" => "Return self==value.", + "builtins.list_reverseiterator.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.list_reverseiterator.__ge__" => "Return self>=value.", + "builtins.list_reverseiterator.__getattribute__" => "Return getattr(self, name).", + "builtins.list_reverseiterator.__getstate__" => "Helper for pickle.", + "builtins.list_reverseiterator.__gt__" => "Return self>value.", + "builtins.list_reverseiterator.__hash__" => "Return hash(self).", + "builtins.list_reverseiterator.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.list_reverseiterator.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.list_reverseiterator.__iter__" => "Implement iter(self).", + "builtins.list_reverseiterator.__le__" => "Return self<=value.", + "builtins.list_reverseiterator.__length_hint__" => "Private method returning an estimate of len(list(it)).", + "builtins.list_reverseiterator.__lt__" => "Return self<value.", + "builtins.list_reverseiterator.__ne__" => "Return self!=value.", + "builtins.list_reverseiterator.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.list_reverseiterator.__next__" => "Implement next(self).", + "builtins.list_reverseiterator.__reduce__" => "Return state information for pickling.", + "builtins.list_reverseiterator.__reduce_ex__" => "Helper for pickle.", + "builtins.list_reverseiterator.__repr__" => "Return repr(self).", + "builtins.list_reverseiterator.__setattr__" => "Implement setattr(self, name, value).", + "builtins.list_reverseiterator.__setstate__" => "Set state information for unpickling.", + "builtins.list_reverseiterator.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.list_reverseiterator.__str__" => "Return str(self).", + "builtins.list_reverseiterator.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.local.__eq__" => "Return self==value.", + "builtins.local.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.local.__ge__" => "Return self>=value.", + "builtins.local.__getstate__" => "Helper for pickle.", + "builtins.local.__gt__" => "Return self>value.", + "builtins.local.__hash__" => "Return hash(self).", + "builtins.local.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.local.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.local.__le__" => "Return self<=value.", + "builtins.local.__lt__" => "Return self<value.", + "builtins.local.__ne__" => "Return self!=value.", + "builtins.local.__reduce__" => "Helper for pickle.", + "builtins.local.__reduce_ex__" => "Helper for pickle.", + "builtins.local.__repr__" => "Return repr(self).", + "builtins.local.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.local.__str__" => "Return str(self).", + "builtins.local.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.locals" => "Return a dictionary containing the current scope's local variables.\n\nNOTE: Whether or not updates to this dictionary will affect name\nlookups in the local scope and vice-versa is *implementation\ndependent* and not covered by any backwards compatibility\nguarantees.", + "builtins.lock" => "A lock object is a synchronization primitive. To create a lock,\ncall threading.Lock(). Methods are:\n\nacquire() -- lock the lock, possibly blocking until it can be obtained\nrelease() -- unlock of the lock\nlocked() -- test whether the lock is currently locked\n\nA lock is not owned by the thread that locked it; another thread may\nunlock it. A thread attempting to lock a lock that it has already locked\nwill block until another thread unlocks it. Deadlocks may ensue.", + "builtins.lock.__delattr__" => "Implement delattr(self, name).", + "builtins.lock.__enter__" => "Lock the lock.", + "builtins.lock.__eq__" => "Return self==value.", + "builtins.lock.__exit__" => "Release the lock.", + "builtins.lock.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.lock.__ge__" => "Return self>=value.", + "builtins.lock.__getattribute__" => "Return getattr(self, name).", + "builtins.lock.__getstate__" => "Helper for pickle.", + "builtins.lock.__gt__" => "Return self>value.", + "builtins.lock.__hash__" => "Return hash(self).", + "builtins.lock.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.lock.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.lock.__le__" => "Return self<=value.", + "builtins.lock.__lt__" => "Return self<value.", + "builtins.lock.__ne__" => "Return self!=value.", + "builtins.lock.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.lock.__reduce__" => "Helper for pickle.", + "builtins.lock.__reduce_ex__" => "Helper for pickle.", + "builtins.lock.__repr__" => "Return repr(self).", + "builtins.lock.__setattr__" => "Implement setattr(self, name, value).", + "builtins.lock.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.lock.__str__" => "Return str(self).", + "builtins.lock.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.lock.acquire" => "Lock the lock. Without argument, this blocks if the lock is already\nlocked (even by the same thread), waiting for another thread to release\nthe lock, and return True once the lock is acquired.\nWith an argument, this will only block if the argument is true,\nand the return value reflects whether the lock is acquired.\nThe blocking operation is interruptible.", + "builtins.lock.acquire_lock" => "An obsolete synonym of acquire().", + "builtins.lock.locked" => "Return whether the lock is in the locked state.", + "builtins.lock.locked_lock" => "An obsolete synonym of locked().", + "builtins.lock.release" => "Release the lock, allowing another thread that is blocked waiting for\nthe lock to acquire the lock. The lock must be in the locked state,\nbut it needn't be locked by the same thread that unlocks it.", + "builtins.lock.release_lock" => "An obsolete synonym of release().", + "builtins.longrange_iterator.__delattr__" => "Implement delattr(self, name).", + "builtins.longrange_iterator.__eq__" => "Return self==value.", + "builtins.longrange_iterator.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.longrange_iterator.__ge__" => "Return self>=value.", + "builtins.longrange_iterator.__getattribute__" => "Return getattr(self, name).", + "builtins.longrange_iterator.__getstate__" => "Helper for pickle.", + "builtins.longrange_iterator.__gt__" => "Return self>value.", + "builtins.longrange_iterator.__hash__" => "Return hash(self).", + "builtins.longrange_iterator.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.longrange_iterator.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.longrange_iterator.__iter__" => "Implement iter(self).", + "builtins.longrange_iterator.__le__" => "Return self<=value.", + "builtins.longrange_iterator.__length_hint__" => "Private method returning an estimate of len(list(it)).", + "builtins.longrange_iterator.__lt__" => "Return self<value.", + "builtins.longrange_iterator.__ne__" => "Return self!=value.", + "builtins.longrange_iterator.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.longrange_iterator.__next__" => "Implement next(self).", + "builtins.longrange_iterator.__reduce__" => "Return state information for pickling.", + "builtins.longrange_iterator.__reduce_ex__" => "Helper for pickle.", + "builtins.longrange_iterator.__repr__" => "Return repr(self).", + "builtins.longrange_iterator.__setattr__" => "Implement setattr(self, name, value).", + "builtins.longrange_iterator.__setstate__" => "Set state information for unpickling.", + "builtins.longrange_iterator.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.longrange_iterator.__str__" => "Return str(self).", + "builtins.longrange_iterator.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.managedbuffer.__delattr__" => "Implement delattr(self, name).", + "builtins.managedbuffer.__eq__" => "Return self==value.", + "builtins.managedbuffer.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.managedbuffer.__ge__" => "Return self>=value.", + "builtins.managedbuffer.__getattribute__" => "Return getattr(self, name).", + "builtins.managedbuffer.__getstate__" => "Helper for pickle.", + "builtins.managedbuffer.__gt__" => "Return self>value.", + "builtins.managedbuffer.__hash__" => "Return hash(self).", + "builtins.managedbuffer.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.managedbuffer.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.managedbuffer.__le__" => "Return self<=value.", + "builtins.managedbuffer.__lt__" => "Return self<value.", + "builtins.managedbuffer.__ne__" => "Return self!=value.", + "builtins.managedbuffer.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.managedbuffer.__reduce__" => "Helper for pickle.", + "builtins.managedbuffer.__reduce_ex__" => "Helper for pickle.", + "builtins.managedbuffer.__repr__" => "Return repr(self).", + "builtins.managedbuffer.__setattr__" => "Implement setattr(self, name, value).", + "builtins.managedbuffer.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.managedbuffer.__str__" => "Return str(self).", + "builtins.managedbuffer.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.map" => "Make an iterator that computes the function using arguments from\neach of the iterables. Stops when the shortest iterable is exhausted.\n\nIf strict is true and one of the arguments is exhausted before the\nothers, raise a ValueError.", "builtins.map.__delattr__" => "Implement delattr(self, name).", "builtins.map.__eq__" => "Return self==value.", @@ -12785,6 +27399,53 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.mappingproxy.keys" => "D.keys() -> a set-like object providing a view on D's keys", "builtins.mappingproxy.values" => "D.values() -> an object providing a view on D's values", "builtins.max" => "max(iterable, *[, default=obj, key=func]) -> value\nmax(arg1, arg2, *args, *[, key=func]) -> value\n\nWith a single iterable argument, return its biggest item. The\ndefault keyword-only argument specifies an object to return if\nthe provided iterable is empty.\nWith two or more positional arguments, return the largest argument.", + "builtins.md5.__delattr__" => "Implement delattr(self, name).", + "builtins.md5.__eq__" => "Return self==value.", + "builtins.md5.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.md5.__ge__" => "Return self>=value.", + "builtins.md5.__getattribute__" => "Return getattr(self, name).", + "builtins.md5.__getstate__" => "Helper for pickle.", + "builtins.md5.__gt__" => "Return self>value.", + "builtins.md5.__hash__" => "Return hash(self).", + "builtins.md5.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.md5.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.md5.__le__" => "Return self<=value.", + "builtins.md5.__lt__" => "Return self<value.", + "builtins.md5.__ne__" => "Return self!=value.", + "builtins.md5.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.md5.__reduce__" => "Helper for pickle.", + "builtins.md5.__reduce_ex__" => "Helper for pickle.", + "builtins.md5.__repr__" => "Return repr(self).", + "builtins.md5.__setattr__" => "Implement setattr(self, name, value).", + "builtins.md5.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.md5.__str__" => "Return str(self).", + "builtins.md5.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.md5.copy" => "Return a copy of the hash object.", + "builtins.md5.digest" => "Return the digest value as a bytes object.", + "builtins.md5.hexdigest" => "Return the digest value as a string of hexadecimal digits.", + "builtins.md5.update" => "Update this hash object's state with the provided string.", + "builtins.member" => "Forces item to become an Enum member during class creation.", + "builtins.member.__delattr__" => "Implement delattr(self, name).", + "builtins.member.__eq__" => "Return self==value.", + "builtins.member.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.member.__ge__" => "Return self>=value.", + "builtins.member.__getattribute__" => "Return getattr(self, name).", + "builtins.member.__getstate__" => "Helper for pickle.", + "builtins.member.__gt__" => "Return self>value.", + "builtins.member.__hash__" => "Return hash(self).", + "builtins.member.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.member.__le__" => "Return self<=value.", + "builtins.member.__lt__" => "Return self<value.", + "builtins.member.__ne__" => "Return self!=value.", + "builtins.member.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.member.__reduce__" => "Helper for pickle.", + "builtins.member.__reduce_ex__" => "Helper for pickle.", + "builtins.member.__repr__" => "Return repr(self).", + "builtins.member.__setattr__" => "Implement setattr(self, name, value).", + "builtins.member.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.member.__str__" => "Return str(self).", + "builtins.member.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.member.__weakref__" => "list of weak references to the object", "builtins.member_descriptor.__delattr__" => "Implement delattr(self, name).", "builtins.member_descriptor.__delete__" => "Delete an attribute of instance.", "builtins.member_descriptor.__eq__" => "Return self==value.", @@ -12951,7 +27612,58 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.method_descriptor.__sizeof__" => "Size of object in memory, in bytes.", "builtins.method_descriptor.__str__" => "Return str(self).", "builtins.method_descriptor.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.methodcaller" => "Return a callable object that calls the given method on its operand.\nAfter f = methodcaller('name'), the call f(r) returns r.name().\nAfter g = methodcaller('name', 'date', foo=1), the call g(r) returns\nr.name('date', foo=1).", + "builtins.methodcaller.__call__" => "Call self as a function.", + "builtins.methodcaller.__delattr__" => "Implement delattr(self, name).", + "builtins.methodcaller.__eq__" => "Return self==value.", + "builtins.methodcaller.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.methodcaller.__ge__" => "Return self>=value.", + "builtins.methodcaller.__getattribute__" => "Return getattr(self, name).", + "builtins.methodcaller.__getstate__" => "Helper for pickle.", + "builtins.methodcaller.__gt__" => "Return self>value.", + "builtins.methodcaller.__hash__" => "Return hash(self).", + "builtins.methodcaller.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.methodcaller.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.methodcaller.__le__" => "Return self<=value.", + "builtins.methodcaller.__lt__" => "Return self<value.", + "builtins.methodcaller.__ne__" => "Return self!=value.", + "builtins.methodcaller.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.methodcaller.__reduce__" => "Return state information for pickling", + "builtins.methodcaller.__reduce_ex__" => "Helper for pickle.", + "builtins.methodcaller.__repr__" => "Return repr(self).", + "builtins.methodcaller.__setattr__" => "Implement setattr(self, name, value).", + "builtins.methodcaller.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.methodcaller.__str__" => "Return str(self).", + "builtins.methodcaller.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.min" => "min(iterable, *[, default=obj, key=func]) -> value\nmin(arg1, arg2, *args, *[, key=func]) -> value\n\nWith a single iterable argument, return its smallest item. The\ndefault keyword-only argument specifies an object to return if\nthe provided iterable is empty.\nWith two or more positional arguments, return the smallest argument.", + "builtins.mmap" => "Windows: mmap(fileno, length[, tagname[, access[, offset]]])\n\nMaps length bytes from the file specified by the file handle fileno,\nand returns a mmap object. If length is larger than the current size\nof the file, the file is extended to contain length bytes. If length\nis 0, the maximum length of the map is the current size of the file,\nexcept that if the file is empty Windows raises an exception (you cannot\ncreate an empty mapping on Windows).\n\nUnix: mmap(fileno, length[, flags[, prot[, access[, offset[, trackfd]]]]])\n\nMaps length bytes from the file specified by the file descriptor fileno,\nand returns a mmap object. If length is 0, the maximum length of the map\nwill be the current size of the file when mmap is called.\nflags specifies the nature of the mapping. MAP_PRIVATE creates a\nprivate copy-on-write mapping, so changes to the contents of the mmap\nobject will be private to this process, and MAP_SHARED creates a mapping\nthat's shared with all other processes mapping the same areas of the file.\nThe default value is MAP_SHARED.\n\nTo map anonymous memory, pass -1 as the fileno (both versions).", + "builtins.mmap.__buffer__" => "Return a buffer object that exposes the underlying memory of the object.", + "builtins.mmap.__delattr__" => "Implement delattr(self, name).", + "builtins.mmap.__delitem__" => "Delete self[key].", + "builtins.mmap.__eq__" => "Return self==value.", + "builtins.mmap.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.mmap.__ge__" => "Return self>=value.", + "builtins.mmap.__getattribute__" => "Return getattr(self, name).", + "builtins.mmap.__getitem__" => "Return self[key].", + "builtins.mmap.__getstate__" => "Helper for pickle.", + "builtins.mmap.__gt__" => "Return self>value.", + "builtins.mmap.__hash__" => "Return hash(self).", + "builtins.mmap.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.mmap.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.mmap.__le__" => "Return self<=value.", + "builtins.mmap.__len__" => "Return len(self).", + "builtins.mmap.__lt__" => "Return self<value.", + "builtins.mmap.__ne__" => "Return self!=value.", + "builtins.mmap.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.mmap.__reduce__" => "Helper for pickle.", + "builtins.mmap.__reduce_ex__" => "Helper for pickle.", + "builtins.mmap.__release_buffer__" => "Release the buffer object that exposes the underlying memory of the object.", + "builtins.mmap.__repr__" => "Return repr(self).", + "builtins.mmap.__setattr__" => "Implement setattr(self, name, value).", + "builtins.mmap.__setitem__" => "Set self[key] to value.", + "builtins.mmap.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.mmap.__str__" => "Return str(self).", + "builtins.mmap.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.module" => "Create a module object.\n\nThe name must be a string; the optional doc argument can have any type.", "builtins.module.__delattr__" => "Implement delattr(self, name).", "builtins.module.__eq__" => "Return self==value.", @@ -12974,7 +27686,72 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.module.__sizeof__" => "Size of object in memory, in bytes.", "builtins.module.__str__" => "Return str(self).", "builtins.module.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.moduledef.__delattr__" => "Implement delattr(self, name).", + "builtins.moduledef.__eq__" => "Return self==value.", + "builtins.moduledef.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.moduledef.__ge__" => "Return self>=value.", + "builtins.moduledef.__getattribute__" => "Return getattr(self, name).", + "builtins.moduledef.__getstate__" => "Helper for pickle.", + "builtins.moduledef.__gt__" => "Return self>value.", + "builtins.moduledef.__hash__" => "Return hash(self).", + "builtins.moduledef.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.moduledef.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.moduledef.__le__" => "Return self<=value.", + "builtins.moduledef.__lt__" => "Return self<value.", + "builtins.moduledef.__ne__" => "Return self!=value.", + "builtins.moduledef.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.moduledef.__reduce__" => "Helper for pickle.", + "builtins.moduledef.__reduce_ex__" => "Helper for pickle.", + "builtins.moduledef.__repr__" => "Return repr(self).", + "builtins.moduledef.__setattr__" => "Implement setattr(self, name, value).", + "builtins.moduledef.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.moduledef.__str__" => "Return str(self).", + "builtins.moduledef.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.netrc.__delattr__" => "Implement delattr(self, name).", + "builtins.netrc.__eq__" => "Return self==value.", + "builtins.netrc.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.netrc.__ge__" => "Return self>=value.", + "builtins.netrc.__getattribute__" => "Return getattr(self, name).", + "builtins.netrc.__getstate__" => "Helper for pickle.", + "builtins.netrc.__gt__" => "Return self>value.", + "builtins.netrc.__hash__" => "Return hash(self).", + "builtins.netrc.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.netrc.__le__" => "Return self<=value.", + "builtins.netrc.__lt__" => "Return self<value.", + "builtins.netrc.__ne__" => "Return self!=value.", + "builtins.netrc.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.netrc.__reduce__" => "Helper for pickle.", + "builtins.netrc.__reduce_ex__" => "Helper for pickle.", + "builtins.netrc.__repr__" => "Dump the class data in the format of a .netrc file.", + "builtins.netrc.__setattr__" => "Implement setattr(self, name, value).", + "builtins.netrc.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.netrc.__str__" => "Return str(self).", + "builtins.netrc.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.netrc.__weakref__" => "list of weak references to the object", + "builtins.netrc.authenticators" => "Return a (user, account, password) tuple for given host.", "builtins.next" => "next(iterator[, default])\n\nReturn the next item from the iterator. If default is given and the\niterator is exhausted, it is returned instead of raising StopIteration.", + "builtins.nonmember" => "Protects item from becoming an Enum member during class creation.", + "builtins.nonmember.__delattr__" => "Implement delattr(self, name).", + "builtins.nonmember.__eq__" => "Return self==value.", + "builtins.nonmember.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.nonmember.__ge__" => "Return self>=value.", + "builtins.nonmember.__getattribute__" => "Return getattr(self, name).", + "builtins.nonmember.__getstate__" => "Helper for pickle.", + "builtins.nonmember.__gt__" => "Return self>value.", + "builtins.nonmember.__hash__" => "Return hash(self).", + "builtins.nonmember.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.nonmember.__le__" => "Return self<=value.", + "builtins.nonmember.__lt__" => "Return self<value.", + "builtins.nonmember.__ne__" => "Return self!=value.", + "builtins.nonmember.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.nonmember.__reduce__" => "Helper for pickle.", + "builtins.nonmember.__reduce_ex__" => "Helper for pickle.", + "builtins.nonmember.__repr__" => "Return repr(self).", + "builtins.nonmember.__setattr__" => "Implement setattr(self, name, value).", + "builtins.nonmember.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.nonmember.__str__" => "Return str(self).", + "builtins.nonmember.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.nonmember.__weakref__" => "list of weak references to the object", "builtins.object" => "The base class of the class hierarchy.\n\nWhen called, it accepts no arguments and returns a new featureless\ninstance that has no instance attributes and cannot be given any.", "builtins.object.__delattr__" => "Implement delattr(self, name).", "builtins.object.__eq__" => "Return self==value.", @@ -12998,10 +27775,235 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.object.__str__" => "Return str(self).", "builtins.object.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.oct" => "Return the octal representation of an integer.\n\n >>> oct(342391)\n '0o1234567'", + "builtins.odict_iterator.__delattr__" => "Implement delattr(self, name).", + "builtins.odict_iterator.__eq__" => "Return self==value.", + "builtins.odict_iterator.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.odict_iterator.__ge__" => "Return self>=value.", + "builtins.odict_iterator.__getattribute__" => "Return getattr(self, name).", + "builtins.odict_iterator.__getstate__" => "Helper for pickle.", + "builtins.odict_iterator.__gt__" => "Return self>value.", + "builtins.odict_iterator.__hash__" => "Return hash(self).", + "builtins.odict_iterator.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.odict_iterator.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.odict_iterator.__iter__" => "Implement iter(self).", + "builtins.odict_iterator.__le__" => "Return self<=value.", + "builtins.odict_iterator.__lt__" => "Return self<value.", + "builtins.odict_iterator.__ne__" => "Return self!=value.", + "builtins.odict_iterator.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.odict_iterator.__next__" => "Implement next(self).", + "builtins.odict_iterator.__reduce__" => "Return state information for pickling", + "builtins.odict_iterator.__reduce_ex__" => "Helper for pickle.", + "builtins.odict_iterator.__repr__" => "Return repr(self).", + "builtins.odict_iterator.__setattr__" => "Implement setattr(self, name, value).", + "builtins.odict_iterator.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.odict_iterator.__str__" => "Return str(self).", + "builtins.odict_iterator.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.open" => "Open file and return a stream. Raise OSError upon failure.\n\nfile is either a text or byte string giving the name (and the path\nif the file isn't in the current working directory) of the file to\nbe opened or an integer file descriptor of the file to be\nwrapped. (If a file descriptor is given, it is closed when the\nreturned I/O object is closed, unless closefd is set to False.)\n\nmode is an optional string that specifies the mode in which the file\nis opened. It defaults to 'r' which means open for reading in text\nmode. Other common values are 'w' for writing (truncating the file if\nit already exists), 'x' for creating and writing to a new file, and\n'a' for appending (which on some Unix systems, means that all writes\nappend to the end of the file regardless of the current seek position).\nIn text mode, if encoding is not specified the encoding used is platform\ndependent: locale.getencoding() is called to get the current locale\nencoding. (For reading and writing raw bytes use binary mode and leave\nencoding unspecified.) The available modes are:\n\n========= ==========================================================\nCharacter Meaning\n--------- ----------------------------------------------------------\n'r' open for reading (default)\n'w' open for writing, truncating the file first\n'x' create a new file and open it for writing\n'a' open for writing, appending to the end of the file if it\n exists\n'b' binary mode\n't' text mode (default)\n'+' open a disk file for updating (reading and writing)\n========= ==========================================================\n\nThe default mode is 'rt' (open for reading text). For binary random\naccess, the mode 'w+b' opens and truncates the file to 0 bytes, while\n'r+b' opens the file without truncation. The 'x' mode implies 'w' and\nraises an `FileExistsError` if the file already exists.\n\nPython distinguishes between files opened in binary and text modes,\neven when the underlying operating system doesn't. Files opened in\nbinary mode (appending 'b' to the mode argument) return contents as\nbytes objects without any decoding. In text mode (the default, or when\n't' is appended to the mode argument), the contents of the file are\nreturned as strings, the bytes having been first decoded using a\nplatform-dependent encoding or using the specified encoding if given.\n\nbuffering is an optional integer used to set the buffering policy.\nPass 0 to switch buffering off (only allowed in binary mode), 1 to\nselect line buffering (only usable in text mode), and an integer > 1 to\nindicate the size of a fixed-size chunk buffer. When no buffering\nargument is given, the default buffering policy works as follows:\n\n* Binary files are buffered in fixed-size chunks; the size of the buffer\n is max(min(blocksize, 8 MiB), DEFAULT_BUFFER_SIZE) when the device\n block size is available.\n On most systems, the buffer will typically be 128 kilobytes long.\n\n* \"Interactive\" text files (files for which isatty() returns True)\n use line buffering. Other text files use the policy described above\n for binary files.\n\nencoding is the name of the encoding used to decode or encode the\nfile. This should only be used in text mode. The default encoding is\nplatform dependent, but any encoding supported by Python can be\npassed. See the codecs module for the list of supported encodings.\n\nerrors is an optional string that specifies how encoding errors are to\nbe handled---this argument should not be used in binary mode. Pass\n'strict' to raise a ValueError exception if there is an encoding error\n(the default of None has the same effect), or pass 'ignore' to ignore\nerrors. (Note that ignoring encoding errors can lead to data loss.)\nSee the documentation for codecs.register or run 'help(codecs.Codec)'\nfor a list of the permitted encoding error strings.\n\nnewline controls how universal newlines works (it only applies to text\nmode). It can be None, '', '\\n', '\\r', and '\\r\\n'. It works as\nfollows:\n\n* On input, if newline is None, universal newlines mode is enabled.\n Lines in the input can end in '\\n', '\\r', or '\\r\\n', and these are\n translated into '\\n' before being returned to the caller. If it is\n '', universal newline mode is enabled, but line endings are returned\n to the caller untranslated. If it has any of the other legal values,\n input lines are only terminated by the given string, and the line\n ending is returned to the caller untranslated.\n\n* On output, if newline is None, any '\\n' characters written are\n translated to the system default line separator, os.linesep. If\n newline is '' or '\\n', no translation takes place. If newline is any\n of the other legal values, any '\\n' characters written are translated\n to the given string.\n\nIf closefd is False, the underlying file descriptor will be kept open\nwhen the file is closed. This does not work when a file name is given\nand must be True in that case.\n\nA custom opener can be used by passing a callable as *opener*. The\nunderlying file descriptor for the file object is then obtained by\ncalling *opener* with (*file*, *flags*). *opener* must return an open\nfile descriptor (passing os.open as *opener* results in functionality\nsimilar to passing None).\n\nopen() returns a file object whose type depends on the mode, and\nthrough which the standard file operations such as reading and writing\nare performed. When open() is used to open a file in a text mode ('w',\n'r', 'wt', 'rt', etc.), it returns a TextIOWrapper. When used to open\na file in a binary mode, the returned class varies: in read binary\nmode, it returns a BufferedReader; in write binary and append binary\nmodes, it returns a BufferedWriter, and in read/write mode, it returns\na BufferedRandom.\n\nIt is also possible to use a string or bytearray as a file for both\nreading and writing. For strings StringIO can be used like a file\nopened in a text mode, and for bytes a BytesIO can be used like a file\nopened in a binary mode.", "builtins.ord" => "Return the ordinal value of a character.\n\nIf the argument is a one-character string, return the Unicode code\npoint of that character.\n\nIf the argument is a bytes or bytearray object of length 1, return its\nsingle byte value.", + "builtins.pairwise" => "Return an iterator of overlapping pairs taken from the input iterator.\n\n s -> (s0,s1), (s1,s2), (s2, s3), ...", + "builtins.pairwise.__delattr__" => "Implement delattr(self, name).", + "builtins.pairwise.__eq__" => "Return self==value.", + "builtins.pairwise.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.pairwise.__ge__" => "Return self>=value.", + "builtins.pairwise.__getattribute__" => "Return getattr(self, name).", + "builtins.pairwise.__getstate__" => "Helper for pickle.", + "builtins.pairwise.__gt__" => "Return self>value.", + "builtins.pairwise.__hash__" => "Return hash(self).", + "builtins.pairwise.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.pairwise.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.pairwise.__iter__" => "Implement iter(self).", + "builtins.pairwise.__le__" => "Return self<=value.", + "builtins.pairwise.__lt__" => "Return self<value.", + "builtins.pairwise.__ne__" => "Return self!=value.", + "builtins.pairwise.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.pairwise.__next__" => "Implement next(self).", + "builtins.pairwise.__reduce__" => "Helper for pickle.", + "builtins.pairwise.__reduce_ex__" => "Helper for pickle.", + "builtins.pairwise.__repr__" => "Return repr(self).", + "builtins.pairwise.__setattr__" => "Implement setattr(self, name, value).", + "builtins.pairwise.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.pairwise.__str__" => "Return str(self).", + "builtins.pairwise.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.panel.__delattr__" => "Implement delattr(self, name).", + "builtins.panel.__eq__" => "Return self==value.", + "builtins.panel.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.panel.__ge__" => "Return self>=value.", + "builtins.panel.__getattribute__" => "Return getattr(self, name).", + "builtins.panel.__getstate__" => "Helper for pickle.", + "builtins.panel.__gt__" => "Return self>value.", + "builtins.panel.__hash__" => "Return hash(self).", + "builtins.panel.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.panel.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.panel.__le__" => "Return self<=value.", + "builtins.panel.__lt__" => "Return self<value.", + "builtins.panel.__ne__" => "Return self!=value.", + "builtins.panel.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.panel.__reduce__" => "Helper for pickle.", + "builtins.panel.__reduce_ex__" => "Helper for pickle.", + "builtins.panel.__repr__" => "Return repr(self).", + "builtins.panel.__setattr__" => "Implement setattr(self, name, value).", + "builtins.panel.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.panel.__str__" => "Return str(self).", + "builtins.panel.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.panel.above" => "Return the panel above the current panel.", + "builtins.panel.below" => "Return the panel below the current panel.", + "builtins.panel.bottom" => "Push the panel to the bottom of the stack.", + "builtins.panel.hidden" => "Return True if the panel is hidden (not visible), False otherwise.", + "builtins.panel.hide" => "Hide the panel.\n\nThis does not delete the object, it just makes the window on screen\ninvisible.", + "builtins.panel.move" => "Move the panel to the screen coordinates (y, x).", + "builtins.panel.replace" => "Change the window associated with the panel to the window win.", + "builtins.panel.set_userptr" => "Set the panel's user pointer to obj.", + "builtins.panel.show" => "Display the panel (which might have been hidden).", + "builtins.panel.top" => "Push panel to the top of the stack.", + "builtins.panel.userptr" => "Return the user pointer for the panel.", + "builtins.panel.window" => "Return the window object associated with the panel.", + "builtins.partial" => "Create a new function with partial application of the given arguments\nand keywords.", + "builtins.partial.__call__" => "Call self as a function.", + "builtins.partial.__class_getitem__" => "partial is generic over the wrapped function's return type", + "builtins.partial.__delattr__" => "Implement delattr(self, name).", + "builtins.partial.__eq__" => "Return self==value.", + "builtins.partial.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.partial.__ge__" => "Return self>=value.", + "builtins.partial.__get__" => "Return an attribute of instance, which is of type owner.", + "builtins.partial.__getattribute__" => "Return getattr(self, name).", + "builtins.partial.__getstate__" => "Helper for pickle.", + "builtins.partial.__gt__" => "Return self>value.", + "builtins.partial.__hash__" => "Return hash(self).", + "builtins.partial.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.partial.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.partial.__le__" => "Return self<=value.", + "builtins.partial.__lt__" => "Return self<value.", + "builtins.partial.__ne__" => "Return self!=value.", + "builtins.partial.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.partial.__reduce_ex__" => "Helper for pickle.", + "builtins.partial.__repr__" => "Return repr(self).", + "builtins.partial.__setattr__" => "Implement setattr(self, name, value).", + "builtins.partial.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.partial.__str__" => "Return str(self).", + "builtins.partial.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.partial.args" => "tuple of arguments to future partial calls", + "builtins.partial.func" => "function object to use in future partial calls", + "builtins.partial.keywords" => "dictionary of keyword arguments to future partial calls", + "builtins.partialmethod" => "Method descriptor with partial application of the given arguments\nand keywords.\n\nSupports wrapping existing descriptors and handles non-descriptor\ncallables as instance methods.", + "builtins.partialmethod.__class_getitem__" => "Represent a PEP 585 generic type\n\nE.g. for t = list[int], t.__origin__ is list and t.__args__ is (int,).", + "builtins.partialmethod.__delattr__" => "Implement delattr(self, name).", + "builtins.partialmethod.__eq__" => "Return self==value.", + "builtins.partialmethod.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.partialmethod.__ge__" => "Return self>=value.", + "builtins.partialmethod.__getattribute__" => "Return getattr(self, name).", + "builtins.partialmethod.__getstate__" => "Helper for pickle.", + "builtins.partialmethod.__gt__" => "Return self>value.", + "builtins.partialmethod.__hash__" => "Return hash(self).", + "builtins.partialmethod.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.partialmethod.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.partialmethod.__le__" => "Return self<=value.", + "builtins.partialmethod.__lt__" => "Return self<value.", + "builtins.partialmethod.__ne__" => "Return self!=value.", + "builtins.partialmethod.__reduce__" => "Helper for pickle.", + "builtins.partialmethod.__reduce_ex__" => "Helper for pickle.", + "builtins.partialmethod.__setattr__" => "Implement setattr(self, name, value).", + "builtins.partialmethod.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.partialmethod.__str__" => "Return str(self).", + "builtins.partialmethod.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.partialmethod.__weakref__" => "list of weak references to the object", + "builtins.permutations" => "Return successive r-length permutations of elements in the iterable.\n\npermutations(range(3), 2) --> (0,1), (0,2), (1,0), (1,2), (2,0), (2,1)", + "builtins.permutations.__delattr__" => "Implement delattr(self, name).", + "builtins.permutations.__eq__" => "Return self==value.", + "builtins.permutations.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.permutations.__ge__" => "Return self>=value.", + "builtins.permutations.__getattribute__" => "Return getattr(self, name).", + "builtins.permutations.__getstate__" => "Helper for pickle.", + "builtins.permutations.__gt__" => "Return self>value.", + "builtins.permutations.__hash__" => "Return hash(self).", + "builtins.permutations.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.permutations.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.permutations.__iter__" => "Implement iter(self).", + "builtins.permutations.__le__" => "Return self<=value.", + "builtins.permutations.__lt__" => "Return self<value.", + "builtins.permutations.__ne__" => "Return self!=value.", + "builtins.permutations.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.permutations.__next__" => "Implement next(self).", + "builtins.permutations.__reduce__" => "Helper for pickle.", + "builtins.permutations.__reduce_ex__" => "Helper for pickle.", + "builtins.permutations.__repr__" => "Return repr(self).", + "builtins.permutations.__setattr__" => "Implement setattr(self, name, value).", + "builtins.permutations.__sizeof__" => "Returns size in memory, in bytes.", + "builtins.permutations.__str__" => "Return str(self).", + "builtins.permutations.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.poll.__delattr__" => "Implement delattr(self, name).", + "builtins.poll.__eq__" => "Return self==value.", + "builtins.poll.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.poll.__ge__" => "Return self>=value.", + "builtins.poll.__getattribute__" => "Return getattr(self, name).", + "builtins.poll.__getstate__" => "Helper for pickle.", + "builtins.poll.__gt__" => "Return self>value.", + "builtins.poll.__hash__" => "Return hash(self).", + "builtins.poll.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.poll.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.poll.__le__" => "Return self<=value.", + "builtins.poll.__lt__" => "Return self<value.", + "builtins.poll.__ne__" => "Return self!=value.", + "builtins.poll.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.poll.__reduce__" => "Helper for pickle.", + "builtins.poll.__reduce_ex__" => "Helper for pickle.", + "builtins.poll.__repr__" => "Return repr(self).", + "builtins.poll.__setattr__" => "Implement setattr(self, name, value).", + "builtins.poll.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.poll.__str__" => "Return str(self).", + "builtins.poll.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.poll.modify" => "Modify an already registered file descriptor.\n\n fd\n either an integer, or an object with a fileno() method returning\n an int\n eventmask\n a bitmask describing the type of events to check for", + "builtins.poll.poll" => "Polls the set of registered file descriptors.\n\n timeout\n The maximum time to wait in milliseconds, or else None (or a negative\n value) to wait indefinitely.\n\nReturns a list containing any descriptors that have events or errors\nto report, as a list of (fd, event) 2-tuples.", + "builtins.poll.register" => "Register a file descriptor with the polling object.\n\n fd\n either an integer, or an object with a fileno() method returning an int\n eventmask\n an optional bitmask describing the type of events to check for", + "builtins.poll.unregister" => "Remove a file descriptor being tracked by the polling object.", + "builtins.positions_iterator.__delattr__" => "Implement delattr(self, name).", + "builtins.positions_iterator.__eq__" => "Return self==value.", + "builtins.positions_iterator.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.positions_iterator.__ge__" => "Return self>=value.", + "builtins.positions_iterator.__getattribute__" => "Return getattr(self, name).", + "builtins.positions_iterator.__getstate__" => "Helper for pickle.", + "builtins.positions_iterator.__gt__" => "Return self>value.", + "builtins.positions_iterator.__hash__" => "Return hash(self).", + "builtins.positions_iterator.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.positions_iterator.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.positions_iterator.__iter__" => "Implement iter(self).", + "builtins.positions_iterator.__le__" => "Return self<=value.", + "builtins.positions_iterator.__lt__" => "Return self<value.", + "builtins.positions_iterator.__ne__" => "Return self!=value.", + "builtins.positions_iterator.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.positions_iterator.__next__" => "Implement next(self).", + "builtins.positions_iterator.__reduce__" => "Helper for pickle.", + "builtins.positions_iterator.__reduce_ex__" => "Helper for pickle.", + "builtins.positions_iterator.__repr__" => "Return repr(self).", + "builtins.positions_iterator.__setattr__" => "Implement setattr(self, name, value).", + "builtins.positions_iterator.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.positions_iterator.__str__" => "Return str(self).", + "builtins.positions_iterator.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.pow" => "Equivalent to base**exp with 2 arguments or base**exp % mod with 3 arguments\n\nSome types, such as ints, are able to use a more efficient algorithm\nwhen invoked using the three argument form.", "builtins.print" => "Prints the values to a stream, or to sys.stdout by default.\n\n sep\n string inserted between values, default a space.\n end\n string appended after the last value, default a newline.\n file\n a file-like object (stream); defaults to the current sys.stdout.\n flush\n whether to forcibly flush the stream.", + "builtins.product" => "Cartesian product of input iterables. Equivalent to nested for-loops.\n\nFor example, product(A, B) returns the same as: ((x,y) for x in A for y in B).\nThe leftmost iterators are in the outermost for-loop, so the output tuples\ncycle in a manner similar to an odometer (with the rightmost element changing\non every iteration).\n\nTo compute the product of an iterable with itself, specify the number\nof repetitions with the optional repeat keyword argument. For example,\nproduct(A, repeat=4) means the same as product(A, A, A, A).\n\nproduct('ab', range(3)) --> ('a',0) ('a',1) ('a',2) ('b',0) ('b',1) ('b',2)\nproduct((0,1), (0,1), (0,1)) --> (0,0,0) (0,0,1) (0,1,0) (0,1,1) (1,0,0) ...", + "builtins.product.__delattr__" => "Implement delattr(self, name).", + "builtins.product.__eq__" => "Return self==value.", + "builtins.product.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.product.__ge__" => "Return self>=value.", + "builtins.product.__getattribute__" => "Return getattr(self, name).", + "builtins.product.__getstate__" => "Helper for pickle.", + "builtins.product.__gt__" => "Return self>value.", + "builtins.product.__hash__" => "Return hash(self).", + "builtins.product.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.product.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.product.__iter__" => "Implement iter(self).", + "builtins.product.__le__" => "Return self<=value.", + "builtins.product.__lt__" => "Return self<value.", + "builtins.product.__ne__" => "Return self!=value.", + "builtins.product.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.product.__next__" => "Implement next(self).", + "builtins.product.__reduce__" => "Helper for pickle.", + "builtins.product.__reduce_ex__" => "Helper for pickle.", + "builtins.product.__repr__" => "Return repr(self).", + "builtins.product.__setattr__" => "Implement setattr(self, name, value).", + "builtins.product.__sizeof__" => "Returns size in memory, in bytes.", + "builtins.product.__str__" => "Return str(self).", + "builtins.product.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.property" => "Property attribute.\n\n fget\n function to be used for getting an attribute value\n fset\n function to be used for setting an attribute value\n fdel\n function to be used for del'ing an attribute\n doc\n docstring\n\nTypical use is to define a managed attribute x:\n\nclass C(object):\n def getx(self): return self._x\n def setx(self, value): self._x = value\n def delx(self): del self._x\n x = property(getx, setx, delx, \"I'm the 'x' property.\")\n\nDecorators make defining new properties or modifying existing ones easy:\n\nclass C(object):\n @property\n def x(self):\n \"I am the 'x' property.\"\n return self._x\n @x.setter\n def x(self, value):\n self._x = value\n @x.deleter\n def x(self):\n del self._x", "builtins.property.__delattr__" => "Implement delattr(self, name).", "builtins.property.__delete__" => "Delete an attribute of instance.", @@ -13085,6 +28087,55 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.range_iterator.__sizeof__" => "Size of object in memory, in bytes.", "builtins.range_iterator.__str__" => "Return str(self).", "builtins.range_iterator.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.reader" => "CSV reader\n\nReader objects are responsible for reading and parsing tabular data\nin CSV format.", + "builtins.reader.__delattr__" => "Implement delattr(self, name).", + "builtins.reader.__eq__" => "Return self==value.", + "builtins.reader.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.reader.__ge__" => "Return self>=value.", + "builtins.reader.__getattribute__" => "Return getattr(self, name).", + "builtins.reader.__getstate__" => "Helper for pickle.", + "builtins.reader.__gt__" => "Return self>value.", + "builtins.reader.__hash__" => "Return hash(self).", + "builtins.reader.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.reader.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.reader.__iter__" => "Implement iter(self).", + "builtins.reader.__le__" => "Return self<=value.", + "builtins.reader.__lt__" => "Return self<value.", + "builtins.reader.__ne__" => "Return self!=value.", + "builtins.reader.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.reader.__next__" => "Implement next(self).", + "builtins.reader.__reduce__" => "Helper for pickle.", + "builtins.reader.__reduce_ex__" => "Helper for pickle.", + "builtins.reader.__repr__" => "Return repr(self).", + "builtins.reader.__setattr__" => "Implement setattr(self, name, value).", + "builtins.reader.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.reader.__str__" => "Return str(self).", + "builtins.reader.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.repeat" => "repeat(object [,times]) -> create an iterator which returns the object\nfor the specified number of times. If not specified, returns the object\nendlessly.", + "builtins.repeat.__delattr__" => "Implement delattr(self, name).", + "builtins.repeat.__eq__" => "Return self==value.", + "builtins.repeat.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.repeat.__ge__" => "Return self>=value.", + "builtins.repeat.__getattribute__" => "Return getattr(self, name).", + "builtins.repeat.__getstate__" => "Helper for pickle.", + "builtins.repeat.__gt__" => "Return self>value.", + "builtins.repeat.__hash__" => "Return hash(self).", + "builtins.repeat.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.repeat.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.repeat.__iter__" => "Implement iter(self).", + "builtins.repeat.__le__" => "Return self<=value.", + "builtins.repeat.__length_hint__" => "Private method returning an estimate of len(list(it)).", + "builtins.repeat.__lt__" => "Return self<value.", + "builtins.repeat.__ne__" => "Return self!=value.", + "builtins.repeat.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.repeat.__next__" => "Implement next(self).", + "builtins.repeat.__reduce__" => "Helper for pickle.", + "builtins.repeat.__reduce_ex__" => "Helper for pickle.", + "builtins.repeat.__repr__" => "Return repr(self).", + "builtins.repeat.__setattr__" => "Implement setattr(self, name, value).", + "builtins.repeat.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.repeat.__str__" => "Return str(self).", + "builtins.repeat.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.repr" => "Return the canonical string representation of the object.\n\nFor many object types, including most builtins, eval(repr(obj)) == obj.", "builtins.reversed" => "Return a reverse iterator over the values of the given sequence.", "builtins.reversed.__delattr__" => "Implement delattr(self, name).", @@ -13113,6 +28164,34 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.reversed.__str__" => "Return str(self).", "builtins.reversed.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.round" => "Round a number to a given precision in decimal digits.\n\nThe return value is an integer if ndigits is omitted or None.\nOtherwise the return value has the same type as the number. ndigits\nmay be negative.", + "builtins.scheduler.__delattr__" => "Implement delattr(self, name).", + "builtins.scheduler.__eq__" => "Return self==value.", + "builtins.scheduler.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.scheduler.__ge__" => "Return self>=value.", + "builtins.scheduler.__getattribute__" => "Return getattr(self, name).", + "builtins.scheduler.__getstate__" => "Helper for pickle.", + "builtins.scheduler.__gt__" => "Return self>value.", + "builtins.scheduler.__hash__" => "Return hash(self).", + "builtins.scheduler.__init__" => "Initialize a new instance, passing the time and delay\nfunctions", + "builtins.scheduler.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.scheduler.__le__" => "Return self<=value.", + "builtins.scheduler.__lt__" => "Return self<value.", + "builtins.scheduler.__ne__" => "Return self!=value.", + "builtins.scheduler.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.scheduler.__reduce__" => "Helper for pickle.", + "builtins.scheduler.__reduce_ex__" => "Helper for pickle.", + "builtins.scheduler.__repr__" => "Return repr(self).", + "builtins.scheduler.__setattr__" => "Implement setattr(self, name, value).", + "builtins.scheduler.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.scheduler.__str__" => "Return str(self).", + "builtins.scheduler.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.scheduler.__weakref__" => "list of weak references to the object", + "builtins.scheduler.cancel" => "Remove an event from the queue.\n\nThis must be presented the ID as returned by enter().\nIf the event is not in the queue, this raises ValueError.", + "builtins.scheduler.empty" => "Check whether the queue is empty.", + "builtins.scheduler.enter" => "A variant that specifies the time as a relative time.\n\nThis is actually the more commonly used interface.", + "builtins.scheduler.enterabs" => "Enter a new event in the queue at an absolute time.\n\nReturns an ID for the event which can be used to remove it,\nif necessary.", + "builtins.scheduler.queue" => "An ordered list of upcoming events.\n\nEvents are named tuples with fields for:\n time, priority, action, arguments, kwargs", + "builtins.scheduler.run" => "Execute events until the queue is empty.\nIf blocking is False executes the scheduled events due to\nexpire soonest (if any) and then return the deadline of the\nnext scheduled call in the scheduler.\n\nWhen there is a positive delay until the first event, the\ndelay function is called and the event is left in the queue;\notherwise, the event is removed from the queue and executed\n(its action function is called, passing it the argument). If\nthe delay function returns prematurely, it is simply\nrestarted.\n\nIt is legal for both the delay function and the action\nfunction to modify the queue or to raise an exception;\nexceptions are not caught but the scheduler's state remains\nwell-defined so run() may be called again.\n\nA questionable hack is added to allow other threads to run:\njust after an event is executed, a delay of 0 is executed, to\navoid monopolizing the CPU when other threads are also\nrunnable.", "builtins.set" => "Build an unordered collection of unique elements.", "builtins.set.__and__" => "Return self&value.", "builtins.set.__class_getitem__" => "sets are generic over the type of their elements", @@ -13192,6 +28271,237 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.set_iterator.__str__" => "Return str(self).", "builtins.set_iterator.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.setattr" => "Sets the named attribute on the given object to the specified value.\n\nsetattr(x, 'y', v) is equivalent to ``x.y = v``", + "builtins.sha1.__delattr__" => "Implement delattr(self, name).", + "builtins.sha1.__eq__" => "Return self==value.", + "builtins.sha1.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.sha1.__ge__" => "Return self>=value.", + "builtins.sha1.__getattribute__" => "Return getattr(self, name).", + "builtins.sha1.__getstate__" => "Helper for pickle.", + "builtins.sha1.__gt__" => "Return self>value.", + "builtins.sha1.__hash__" => "Return hash(self).", + "builtins.sha1.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.sha1.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.sha1.__le__" => "Return self<=value.", + "builtins.sha1.__lt__" => "Return self<value.", + "builtins.sha1.__ne__" => "Return self!=value.", + "builtins.sha1.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.sha1.__reduce__" => "Helper for pickle.", + "builtins.sha1.__reduce_ex__" => "Helper for pickle.", + "builtins.sha1.__repr__" => "Return repr(self).", + "builtins.sha1.__setattr__" => "Implement setattr(self, name, value).", + "builtins.sha1.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.sha1.__str__" => "Return str(self).", + "builtins.sha1.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.sha1.copy" => "Return a copy of the hash object.", + "builtins.sha1.digest" => "Return the digest value as a bytes object.", + "builtins.sha1.hexdigest" => "Return the digest value as a string of hexadecimal digits.", + "builtins.sha1.update" => "Update this hash object's state with the provided string.", + "builtins.sha3_224" => "sha3_224([data], *, usedforsecurity=True) -> SHA3 object\n\nReturn a new SHA3 hash object with a hashbit length of 28 bytes.", + "builtins.sha3_224.__delattr__" => "Implement delattr(self, name).", + "builtins.sha3_224.__eq__" => "Return self==value.", + "builtins.sha3_224.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.sha3_224.__ge__" => "Return self>=value.", + "builtins.sha3_224.__getattribute__" => "Return getattr(self, name).", + "builtins.sha3_224.__getstate__" => "Helper for pickle.", + "builtins.sha3_224.__gt__" => "Return self>value.", + "builtins.sha3_224.__hash__" => "Return hash(self).", + "builtins.sha3_224.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.sha3_224.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.sha3_224.__le__" => "Return self<=value.", + "builtins.sha3_224.__lt__" => "Return self<value.", + "builtins.sha3_224.__ne__" => "Return self!=value.", + "builtins.sha3_224.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.sha3_224.__reduce__" => "Helper for pickle.", + "builtins.sha3_224.__reduce_ex__" => "Helper for pickle.", + "builtins.sha3_224.__repr__" => "Return repr(self).", + "builtins.sha3_224.__setattr__" => "Implement setattr(self, name, value).", + "builtins.sha3_224.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.sha3_224.__str__" => "Return str(self).", + "builtins.sha3_224.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.sha3_224.copy" => "Return a copy of the hash object.", + "builtins.sha3_224.digest" => "Return the digest value as a bytes object.", + "builtins.sha3_224.hexdigest" => "Return the digest value as a string of hexadecimal digits.", + "builtins.sha3_224.update" => "Update this hash object's state with the provided bytes-like object.", + "builtins.sha3_256" => "sha3_256([data], *, usedforsecurity=True) -> SHA3 object\n\nReturn a new SHA3 hash object with a hashbit length of 32 bytes.", + "builtins.sha3_256.__delattr__" => "Implement delattr(self, name).", + "builtins.sha3_256.__eq__" => "Return self==value.", + "builtins.sha3_256.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.sha3_256.__ge__" => "Return self>=value.", + "builtins.sha3_256.__getattribute__" => "Return getattr(self, name).", + "builtins.sha3_256.__getstate__" => "Helper for pickle.", + "builtins.sha3_256.__gt__" => "Return self>value.", + "builtins.sha3_256.__hash__" => "Return hash(self).", + "builtins.sha3_256.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.sha3_256.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.sha3_256.__le__" => "Return self<=value.", + "builtins.sha3_256.__lt__" => "Return self<value.", + "builtins.sha3_256.__ne__" => "Return self!=value.", + "builtins.sha3_256.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.sha3_256.__reduce__" => "Helper for pickle.", + "builtins.sha3_256.__reduce_ex__" => "Helper for pickle.", + "builtins.sha3_256.__repr__" => "Return repr(self).", + "builtins.sha3_256.__setattr__" => "Implement setattr(self, name, value).", + "builtins.sha3_256.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.sha3_256.__str__" => "Return str(self).", + "builtins.sha3_256.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.sha3_256.copy" => "Return a copy of the hash object.", + "builtins.sha3_256.digest" => "Return the digest value as a bytes object.", + "builtins.sha3_256.hexdigest" => "Return the digest value as a string of hexadecimal digits.", + "builtins.sha3_256.update" => "Update this hash object's state with the provided bytes-like object.", + "builtins.sha3_384" => "sha3_384([data], *, usedforsecurity=True) -> SHA3 object\n\nReturn a new SHA3 hash object with a hashbit length of 48 bytes.", + "builtins.sha3_384.__delattr__" => "Implement delattr(self, name).", + "builtins.sha3_384.__eq__" => "Return self==value.", + "builtins.sha3_384.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.sha3_384.__ge__" => "Return self>=value.", + "builtins.sha3_384.__getattribute__" => "Return getattr(self, name).", + "builtins.sha3_384.__getstate__" => "Helper for pickle.", + "builtins.sha3_384.__gt__" => "Return self>value.", + "builtins.sha3_384.__hash__" => "Return hash(self).", + "builtins.sha3_384.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.sha3_384.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.sha3_384.__le__" => "Return self<=value.", + "builtins.sha3_384.__lt__" => "Return self<value.", + "builtins.sha3_384.__ne__" => "Return self!=value.", + "builtins.sha3_384.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.sha3_384.__reduce__" => "Helper for pickle.", + "builtins.sha3_384.__reduce_ex__" => "Helper for pickle.", + "builtins.sha3_384.__repr__" => "Return repr(self).", + "builtins.sha3_384.__setattr__" => "Implement setattr(self, name, value).", + "builtins.sha3_384.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.sha3_384.__str__" => "Return str(self).", + "builtins.sha3_384.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.sha3_384.copy" => "Return a copy of the hash object.", + "builtins.sha3_384.digest" => "Return the digest value as a bytes object.", + "builtins.sha3_384.hexdigest" => "Return the digest value as a string of hexadecimal digits.", + "builtins.sha3_384.update" => "Update this hash object's state with the provided bytes-like object.", + "builtins.sha3_512" => "sha3_512([data], *, usedforsecurity=True) -> SHA3 object\n\nReturn a new SHA3 hash object with a hashbit length of 64 bytes.", + "builtins.sha3_512.__delattr__" => "Implement delattr(self, name).", + "builtins.sha3_512.__eq__" => "Return self==value.", + "builtins.sha3_512.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.sha3_512.__ge__" => "Return self>=value.", + "builtins.sha3_512.__getattribute__" => "Return getattr(self, name).", + "builtins.sha3_512.__getstate__" => "Helper for pickle.", + "builtins.sha3_512.__gt__" => "Return self>value.", + "builtins.sha3_512.__hash__" => "Return hash(self).", + "builtins.sha3_512.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.sha3_512.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.sha3_512.__le__" => "Return self<=value.", + "builtins.sha3_512.__lt__" => "Return self<value.", + "builtins.sha3_512.__ne__" => "Return self!=value.", + "builtins.sha3_512.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.sha3_512.__reduce__" => "Helper for pickle.", + "builtins.sha3_512.__reduce_ex__" => "Helper for pickle.", + "builtins.sha3_512.__repr__" => "Return repr(self).", + "builtins.sha3_512.__setattr__" => "Implement setattr(self, name, value).", + "builtins.sha3_512.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.sha3_512.__str__" => "Return str(self).", + "builtins.sha3_512.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.sha3_512.copy" => "Return a copy of the hash object.", + "builtins.sha3_512.digest" => "Return the digest value as a bytes object.", + "builtins.sha3_512.hexdigest" => "Return the digest value as a string of hexadecimal digits.", + "builtins.sha3_512.update" => "Update this hash object's state with the provided bytes-like object.", + "builtins.shake_128" => "shake_128([data], *, usedforsecurity=True) -> SHAKE object\n\nReturn a new SHAKE hash object.", + "builtins.shake_128.__delattr__" => "Implement delattr(self, name).", + "builtins.shake_128.__eq__" => "Return self==value.", + "builtins.shake_128.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.shake_128.__ge__" => "Return self>=value.", + "builtins.shake_128.__getattribute__" => "Return getattr(self, name).", + "builtins.shake_128.__getstate__" => "Helper for pickle.", + "builtins.shake_128.__gt__" => "Return self>value.", + "builtins.shake_128.__hash__" => "Return hash(self).", + "builtins.shake_128.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.shake_128.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.shake_128.__le__" => "Return self<=value.", + "builtins.shake_128.__lt__" => "Return self<value.", + "builtins.shake_128.__ne__" => "Return self!=value.", + "builtins.shake_128.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.shake_128.__reduce__" => "Helper for pickle.", + "builtins.shake_128.__reduce_ex__" => "Helper for pickle.", + "builtins.shake_128.__repr__" => "Return repr(self).", + "builtins.shake_128.__setattr__" => "Implement setattr(self, name, value).", + "builtins.shake_128.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.shake_128.__str__" => "Return str(self).", + "builtins.shake_128.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.shake_128.copy" => "Return a copy of the hash object.", + "builtins.shake_128.digest" => "Return the digest value as a bytes object.", + "builtins.shake_128.hexdigest" => "Return the digest value as a string of hexadecimal digits.", + "builtins.shake_128.update" => "Update this hash object's state with the provided bytes-like object.", + "builtins.shake_256" => "shake_256([data], *, usedforsecurity=True) -> SHAKE object\n\nReturn a new SHAKE hash object.", + "builtins.shake_256.__delattr__" => "Implement delattr(self, name).", + "builtins.shake_256.__eq__" => "Return self==value.", + "builtins.shake_256.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.shake_256.__ge__" => "Return self>=value.", + "builtins.shake_256.__getattribute__" => "Return getattr(self, name).", + "builtins.shake_256.__getstate__" => "Helper for pickle.", + "builtins.shake_256.__gt__" => "Return self>value.", + "builtins.shake_256.__hash__" => "Return hash(self).", + "builtins.shake_256.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.shake_256.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.shake_256.__le__" => "Return self<=value.", + "builtins.shake_256.__lt__" => "Return self<value.", + "builtins.shake_256.__ne__" => "Return self!=value.", + "builtins.shake_256.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.shake_256.__reduce__" => "Helper for pickle.", + "builtins.shake_256.__reduce_ex__" => "Helper for pickle.", + "builtins.shake_256.__repr__" => "Return repr(self).", + "builtins.shake_256.__setattr__" => "Implement setattr(self, name, value).", + "builtins.shake_256.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.shake_256.__str__" => "Return str(self).", + "builtins.shake_256.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.shake_256.copy" => "Return a copy of the hash object.", + "builtins.shake_256.digest" => "Return the digest value as a bytes object.", + "builtins.shake_256.hexdigest" => "Return the digest value as a string of hexadecimal digits.", + "builtins.shake_256.update" => "Update this hash object's state with the provided bytes-like object.", + "builtins.shlex" => "A lexical analyzer class for simple shell-like syntaxes.", + "builtins.shlex.__delattr__" => "Implement delattr(self, name).", + "builtins.shlex.__eq__" => "Return self==value.", + "builtins.shlex.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.shlex.__ge__" => "Return self>=value.", + "builtins.shlex.__getattribute__" => "Return getattr(self, name).", + "builtins.shlex.__getstate__" => "Helper for pickle.", + "builtins.shlex.__gt__" => "Return self>value.", + "builtins.shlex.__hash__" => "Return hash(self).", + "builtins.shlex.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.shlex.__le__" => "Return self<=value.", + "builtins.shlex.__lt__" => "Return self<value.", + "builtins.shlex.__ne__" => "Return self!=value.", + "builtins.shlex.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.shlex.__reduce__" => "Helper for pickle.", + "builtins.shlex.__reduce_ex__" => "Helper for pickle.", + "builtins.shlex.__repr__" => "Return repr(self).", + "builtins.shlex.__setattr__" => "Implement setattr(self, name, value).", + "builtins.shlex.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.shlex.__str__" => "Return str(self).", + "builtins.shlex.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.shlex.__weakref__" => "list of weak references to the object", + "builtins.shlex.error_leader" => "Emit a C-compiler-like, Emacs-friendly error-message leader.", + "builtins.shlex.get_token" => "Get a token from the input stream (or from stack if it's nonempty)", + "builtins.shlex.pop_source" => "Pop the input source stack.", + "builtins.shlex.push_source" => "Push an input source onto the lexer's input source stack.", + "builtins.shlex.push_token" => "Push a token onto the stack popped by the get_token method", + "builtins.shlex.sourcehook" => "Hook called on a filename to be sourced.", + "builtins.singledispatchmethod" => "Single-dispatch generic method descriptor.\n\nSupports wrapping existing descriptors.", + "builtins.singledispatchmethod.__delattr__" => "Implement delattr(self, name).", + "builtins.singledispatchmethod.__eq__" => "Return self==value.", + "builtins.singledispatchmethod.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.singledispatchmethod.__ge__" => "Return self>=value.", + "builtins.singledispatchmethod.__getattribute__" => "Return getattr(self, name).", + "builtins.singledispatchmethod.__getstate__" => "Helper for pickle.", + "builtins.singledispatchmethod.__gt__" => "Return self>value.", + "builtins.singledispatchmethod.__hash__" => "Return hash(self).", + "builtins.singledispatchmethod.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.singledispatchmethod.__le__" => "Return self<=value.", + "builtins.singledispatchmethod.__lt__" => "Return self<value.", + "builtins.singledispatchmethod.__ne__" => "Return self!=value.", + "builtins.singledispatchmethod.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.singledispatchmethod.__reduce__" => "Helper for pickle.", + "builtins.singledispatchmethod.__reduce_ex__" => "Helper for pickle.", + "builtins.singledispatchmethod.__setattr__" => "Implement setattr(self, name, value).", + "builtins.singledispatchmethod.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.singledispatchmethod.__str__" => "Return str(self).", + "builtins.singledispatchmethod.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.singledispatchmethod.__weakref__" => "list of weak references to the object", + "builtins.singledispatchmethod.register" => "generic_method.register(cls, func) -> func\n\nRegisters a new implementation for the given *cls* on a *generic_method*.", "builtins.slice" => "slice(stop)\nslice(start, stop[, step])\n\nCreate a slice object.\n\nThis is used for extended slicing (e.g. a[0:10:2]).", "builtins.slice.__delattr__" => "Implement delattr(self, name).", "builtins.slice.__eq__" => "Return self==value.", @@ -13215,7 +28525,88 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.slice.__str__" => "Return str(self).", "builtins.slice.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.slice.indices" => "S.indices(len) -> (start, stop, stride)\n\nAssuming a sequence of length len, calculate the start and stop\nindices, and the stride length of the extended slice described by\nS. Out of bounds indices are clipped in a manner consistent with the\nhandling of normal slices.", + "builtins.socket" => "socket(family=AF_INET, type=SOCK_STREAM, proto=0) -> socket object\nsocket(family=-1, type=-1, proto=-1, fileno=None) -> socket object\n\nOpen a socket of the given type. The family argument specifies the\naddress family; it defaults to AF_INET. The type argument specifies\nwhether this is a stream (SOCK_STREAM, this is the default)\nor datagram (SOCK_DGRAM) socket. The protocol argument defaults to 0,\nspecifying the default protocol. Keyword arguments are accepted.\nThe socket is created as non-inheritable.\n\nWhen a fileno is passed in, family, type and proto are auto-detected,\nunless they are explicitly set.\n\nA socket object represents one endpoint of a network connection.\n\nMethods of socket objects (keyword arguments not allowed):\n\n_accept() -- accept connection, returning new socket fd and client address\nbind(addr) -- bind the socket to a local address\nclose() -- close the socket\nconnect(addr) -- connect the socket to a remote address\nconnect_ex(addr) -- connect, return an error code instead of an exception\ndup() -- return a new socket fd duplicated from fileno()\nfileno() -- return underlying file descriptor\ngetpeername() -- return remote address [*]\ngetsockname() -- return local address\ngetsockopt(level, optname[, buflen]) -- get socket options\ngettimeout() -- return timeout or None\nlisten([n]) -- start listening for incoming connections\nrecv(buflen[, flags]) -- receive data\nrecv_into(buffer[, nbytes[, flags]]) -- receive data (into a buffer)\nrecvfrom(buflen[, flags]) -- receive data and sender's address\nrecvfrom_into(buffer[, nbytes, [, flags]])\n -- receive data and sender's address (into a buffer)\nsendall(data[, flags]) -- send all data\nsend(data[, flags]) -- send data, may not send all of it\nsendto(data[, flags], addr) -- send data to a given address\nsetblocking(bool) -- set or clear the blocking I/O flag\ngetblocking() -- return True if socket is blocking, False if non-blocking\nsetsockopt(level, optname, value[, optlen]) -- set socket options\nsettimeout(None | float) -- set or clear the timeout\nshutdown(how) -- shut down traffic in one or both directions\n\n [*] not available on all platforms!", + "builtins.socket.__del__" => "Called when the instance is about to be destroyed.", + "builtins.socket.__delattr__" => "Implement delattr(self, name).", + "builtins.socket.__eq__" => "Return self==value.", + "builtins.socket.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.socket.__ge__" => "Return self>=value.", + "builtins.socket.__getattribute__" => "Return getattr(self, name).", + "builtins.socket.__getstate__" => "Helper for pickle.", + "builtins.socket.__gt__" => "Return self>value.", + "builtins.socket.__hash__" => "Return hash(self).", + "builtins.socket.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.socket.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.socket.__le__" => "Return self<=value.", + "builtins.socket.__lt__" => "Return self<value.", + "builtins.socket.__ne__" => "Return self!=value.", + "builtins.socket.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.socket.__reduce__" => "Helper for pickle.", + "builtins.socket.__reduce_ex__" => "Helper for pickle.", + "builtins.socket.__repr__" => "Return repr(self).", + "builtins.socket.__setattr__" => "Implement setattr(self, name, value).", + "builtins.socket.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.socket.__str__" => "Return str(self).", + "builtins.socket.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.socket._accept" => "_accept() -> (integer, address info)\n\nWait for an incoming connection. Return a new socket file descriptor\nrepresenting the connection, and the address of the client.\nFor IP sockets, the address info is a pair (hostaddr, port).", + "builtins.socket.bind" => "bind(address)\n\nBind the socket to a local address. For IP sockets, the address is a\npair (host, port); the host must refer to the local host. For raw packet\nsockets the address is a tuple (ifname, proto [,pkttype [,hatype [,addr]]])", + "builtins.socket.close" => "close()\n\nClose the socket. It cannot be used after this call.", + "builtins.socket.connect" => "connect(address)\n\nConnect the socket to a remote address. For IP sockets, the address\nis a pair (host, port).", + "builtins.socket.connect_ex" => "connect_ex(address) -> errno\n\nThis is like connect(address), but returns an error code (the errno value)\ninstead of raising an exception when an error occurs.", + "builtins.socket.detach" => "detach()\n\nClose the socket object without closing the underlying file descriptor.\nThe object cannot be used after this call, but the file descriptor\ncan be reused for other purposes. The file descriptor is returned.", + "builtins.socket.family" => "the socket family", + "builtins.socket.fileno" => "fileno() -> integer\n\nReturn the integer file descriptor of the socket.", + "builtins.socket.getblocking" => "getblocking()\n\nReturns True if socket is in blocking mode, or False if it\nis in non-blocking mode.", + "builtins.socket.getpeername" => "getpeername() -> address info\n\nReturn the address of the remote endpoint. For IP sockets, the address\ninfo is a pair (hostaddr, port).", + "builtins.socket.getsockname" => "getsockname() -> address info\n\nReturn the address of the local endpoint. The format depends on the\naddress family. For IPv4 sockets, the address info is a pair\n(hostaddr, port). For IPv6 sockets, the address info is a 4-tuple\n(hostaddr, port, flowinfo, scope_id).", + "builtins.socket.getsockopt" => "getsockopt(level, option[, buffersize]) -> value\n\nGet a socket option. See the Unix manual for level and option.\nIf a nonzero buffersize argument is given, the return value is a\nstring of that length; otherwise it is an integer.", + "builtins.socket.gettimeout" => "gettimeout() -> timeout\n\nReturns the timeout in seconds (float) associated with socket\noperations. A timeout of None indicates that timeouts on socket\noperations are disabled.", + "builtins.socket.ioctl" => "ioctl(cmd, option) -> long\n\nControl the socket with WSAIoctl syscall. Currently supported 'cmd' values are\nSIO_RCVALL: 'option' must be one of the socket.RCVALL_* constants.\nSIO_KEEPALIVE_VALS: 'option' is a tuple of (onoff, timeout, interval).\nSIO_LOOPBACK_FAST_PATH: 'option' is a boolean value, and is disabled by default", + "builtins.socket.listen" => "listen([backlog])\n\nEnable a server to accept connections. If backlog is specified, it must be\nat least 0 (if it is lower, it is set to 0); it specifies the number of\nunaccepted connections that the system will allow before refusing new\nconnections. If not specified, a default reasonable value is chosen.", + "builtins.socket.proto" => "the socket protocol", + "builtins.socket.recv" => "recv(buffersize[, flags]) -> data\n\nReceive up to buffersize bytes from the socket. For the optional flags\nargument, see the Unix manual. When no data is available, block until\nat least one byte is available or until the remote end is closed. When\nthe remote end is closed and all data is read, return the empty string.", + "builtins.socket.recv_into" => "recv_into(buffer, [nbytes[, flags]]) -> nbytes_read\n\nA version of recv() that stores its data into a buffer rather than creating\na new string. Receive up to buffersize bytes from the socket. If buffersize\nis not specified (or 0), receive up to the size available in the given buffer.\n\nSee recv() for documentation about the flags.", + "builtins.socket.recvfrom" => "recvfrom(buffersize[, flags]) -> (data, address info)\n\nLike recv(buffersize, flags) but also return the sender's address info.", + "builtins.socket.recvfrom_into" => "recvfrom_into(buffer[, nbytes[, flags]]) -> (nbytes, address info)\n\nLike recv_into(buffer[, nbytes[, flags]]) but also return the sender's address info.", + "builtins.socket.recvmsg" => "recvmsg(bufsize[, ancbufsize[, flags]]) -> (data, ancdata, msg_flags, address)\n\nReceive normal data (up to bufsize bytes) and ancillary data from the\nsocket. The ancbufsize argument sets the size in bytes of the\ninternal buffer used to receive the ancillary data; it defaults to 0,\nmeaning that no ancillary data will be received. Appropriate buffer\nsizes for ancillary data can be calculated using CMSG_SPACE() or\nCMSG_LEN(), and items which do not fit into the buffer might be\ntruncated or discarded. The flags argument defaults to 0 and has the\nsame meaning as for recv().\n\nThe return value is a 4-tuple: (data, ancdata, msg_flags, address).\nThe data item is a bytes object holding the non-ancillary data\nreceived. The ancdata item is a list of zero or more tuples\n(cmsg_level, cmsg_type, cmsg_data) representing the ancillary data\n(control messages) received: cmsg_level and cmsg_type are integers\nspecifying the protocol level and protocol-specific type respectively,\nand cmsg_data is a bytes object holding the associated data. The\nmsg_flags item is the bitwise OR of various flags indicating\nconditions on the received message; see your system documentation for\ndetails. If the receiving socket is unconnected, address is the\naddress of the sending socket, if available; otherwise, its value is\nunspecified.\n\nIf recvmsg() raises an exception after the system call returns, it\nwill first attempt to close any file descriptors received via the\nSCM_RIGHTS mechanism.", + "builtins.socket.recvmsg_into" => "recvmsg_into(buffers[, ancbufsize[, flags]]) -> (nbytes, ancdata, msg_flags, address)\n\nReceive normal data and ancillary data from the socket, scattering the\nnon-ancillary data into a series of buffers. The buffers argument\nmust be an iterable of objects that export writable buffers\n(e.g. bytearray objects); these will be filled with successive chunks\nof the non-ancillary data until it has all been written or there are\nno more buffers. The ancbufsize argument sets the size in bytes of\nthe internal buffer used to receive the ancillary data; it defaults to\n0, meaning that no ancillary data will be received. Appropriate\nbuffer sizes for ancillary data can be calculated using CMSG_SPACE()\nor CMSG_LEN(), and items which do not fit into the buffer might be\ntruncated or discarded. The flags argument defaults to 0 and has the\nsame meaning as for recv().\n\nThe return value is a 4-tuple: (nbytes, ancdata, msg_flags, address).\nThe nbytes item is the total number of bytes of non-ancillary data\nwritten into the buffers. The ancdata item is a list of zero or more\ntuples (cmsg_level, cmsg_type, cmsg_data) representing the ancillary\ndata (control messages) received: cmsg_level and cmsg_type are\nintegers specifying the protocol level and protocol-specific type\nrespectively, and cmsg_data is a bytes object holding the associated\ndata. The msg_flags item is the bitwise OR of various flags\nindicating conditions on the received message; see your system\ndocumentation for details. If the receiving socket is unconnected,\naddress is the address of the sending socket, if available; otherwise,\nits value is unspecified.\n\nIf recvmsg_into() raises an exception after the system call returns,\nit will first attempt to close any file descriptors received via the\nSCM_RIGHTS mechanism.", + "builtins.socket.send" => "send(data[, flags]) -> count\n\nSend a data string to the socket. For the optional flags\nargument, see the Unix manual. Return the number of bytes\nsent; this may be less than len(data) if the network is busy.", + "builtins.socket.sendall" => "sendall(data[, flags])\n\nSend a data string to the socket. For the optional flags\nargument, see the Unix manual. This calls send() repeatedly\nuntil all data is sent. If an error occurs, it's impossible\nto tell how much data has been sent.", + "builtins.socket.sendmsg" => "sendmsg(buffers[, ancdata[, flags[, address]]]) -> count\n\nSend normal and ancillary data to the socket, gathering the\nnon-ancillary data from a series of buffers and concatenating it into\na single message. The buffers argument specifies the non-ancillary\ndata as an iterable of bytes-like objects (e.g. bytes objects).\nThe ancdata argument specifies the ancillary data (control messages)\nas an iterable of zero or more tuples (cmsg_level, cmsg_type,\ncmsg_data), where cmsg_level and cmsg_type are integers specifying the\nprotocol level and protocol-specific type respectively, and cmsg_data\nis a bytes-like object holding the associated data. The flags\nargument defaults to 0 and has the same meaning as for send(). If\naddress is supplied and not None, it sets a destination address for\nthe message. The return value is the number of bytes of non-ancillary\ndata sent.", + "builtins.socket.sendmsg_afalg" => "sendmsg_afalg([msg], *, op[, iv[, assoclen[, flags=MSG_MORE]]])\n\nSet operation mode, IV and length of associated data for an AF_ALG\noperation socket.", + "builtins.socket.sendto" => "sendto(data[, flags], address) -> count\n\nLike send(data, flags) but allows specifying the destination address.\nFor IP sockets, the address is a pair (hostaddr, port).", + "builtins.socket.setblocking" => "setblocking(flag)\n\nSet the socket to blocking (flag is true) or non-blocking (false).\nsetblocking(True) is equivalent to settimeout(None);\nsetblocking(False) is equivalent to settimeout(0.0).", + "builtins.socket.setsockopt" => "setsockopt(level, option, value: int)\nsetsockopt(level, option, value: buffer)\nsetsockopt(level, option, None, optlen: int)\n\nSet a socket option. See the Unix manual for level and option.\nThe value argument can either be an integer, a string buffer, or\nNone, optlen.", + "builtins.socket.settimeout" => "settimeout(timeout)\n\nSet a timeout on socket operations. 'timeout' can be a float,\ngiving in seconds, or None. Setting a timeout of None disables\nthe timeout feature and is equivalent to setblocking(1).\nSetting a timeout of zero is the same as setblocking(0).", + "builtins.socket.share" => "share(process_id) -> bytes\n\nShare the socket with another process. The target process id\nmust be provided and the resulting bytes object passed to the target\nprocess. There the shared socket can be instantiated by calling\nsocket.fromshare().", + "builtins.socket.shutdown" => "shutdown(flag)\n\nShut down the reading side of the socket (flag == SHUT_RD), the writing side\nof the socket (flag == SHUT_WR), or both ends (flag == SHUT_RDWR).", + "builtins.socket.timeout" => "the socket timeout", + "builtins.socket.type" => "the socket type", "builtins.sorted" => "Return a new list containing all items from the iterable in ascending order.\n\nA custom key function can be supplied to customize the sort order, and the\nreverse flag can be set to request the result in descending order.", + "builtins.starmap" => "Return an iterator whose values are returned from the function evaluated with an argument tuple taken from the given sequence.", + "builtins.starmap.__delattr__" => "Implement delattr(self, name).", + "builtins.starmap.__eq__" => "Return self==value.", + "builtins.starmap.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.starmap.__ge__" => "Return self>=value.", + "builtins.starmap.__getattribute__" => "Return getattr(self, name).", + "builtins.starmap.__getstate__" => "Helper for pickle.", + "builtins.starmap.__gt__" => "Return self>value.", + "builtins.starmap.__hash__" => "Return hash(self).", + "builtins.starmap.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.starmap.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.starmap.__iter__" => "Implement iter(self).", + "builtins.starmap.__le__" => "Return self<=value.", + "builtins.starmap.__lt__" => "Return self<value.", + "builtins.starmap.__ne__" => "Return self!=value.", + "builtins.starmap.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.starmap.__next__" => "Implement next(self).", + "builtins.starmap.__reduce__" => "Helper for pickle.", + "builtins.starmap.__reduce_ex__" => "Helper for pickle.", + "builtins.starmap.__repr__" => "Return repr(self).", + "builtins.starmap.__setattr__" => "Implement setattr(self, name, value).", + "builtins.starmap.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.starmap.__str__" => "Return str(self).", + "builtins.starmap.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.staticmethod" => "Convert a function to be a static method.\n\nA static method does not receive an implicit first argument.\nTo declare a static method, use this idiom:\n\n class C:\n @staticmethod\n def f(arg1, arg2, argN):\n ...\n\nIt can be called either on the class (e.g. C.f()) or on an instance\n(e.g. C().f()). Both the class and the instance are ignored, and\nneither is passed implicitly as the first argument to the method.\n\nStatic methods in Python are similar to those found in Java or C++.\nFor a more advanced concept, see the classmethod builtin.", "builtins.staticmethod.__call__" => "Call self as a function.", "builtins.staticmethod.__delattr__" => "Implement delattr(self, name).", @@ -13240,6 +28631,30 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.staticmethod.__sizeof__" => "Size of object in memory, in bytes.", "builtins.staticmethod.__str__" => "Return str(self).", "builtins.staticmethod.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.stderrprinter.__delattr__" => "Implement delattr(self, name).", + "builtins.stderrprinter.__eq__" => "Return self==value.", + "builtins.stderrprinter.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.stderrprinter.__ge__" => "Return self>=value.", + "builtins.stderrprinter.__getattribute__" => "Return getattr(self, name).", + "builtins.stderrprinter.__getstate__" => "Helper for pickle.", + "builtins.stderrprinter.__gt__" => "Return self>value.", + "builtins.stderrprinter.__hash__" => "Return hash(self).", + "builtins.stderrprinter.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.stderrprinter.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.stderrprinter.__le__" => "Return self<=value.", + "builtins.stderrprinter.__lt__" => "Return self<value.", + "builtins.stderrprinter.__ne__" => "Return self!=value.", + "builtins.stderrprinter.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.stderrprinter.__reduce__" => "Helper for pickle.", + "builtins.stderrprinter.__reduce_ex__" => "Helper for pickle.", + "builtins.stderrprinter.__repr__" => "Return repr(self).", + "builtins.stderrprinter.__setattr__" => "Implement setattr(self, name, value).", + "builtins.stderrprinter.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.stderrprinter.__str__" => "Return str(self).", + "builtins.stderrprinter.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.stderrprinter.closed" => "True if the file is closed", + "builtins.stderrprinter.encoding" => "Encoding of the file", + "builtins.stderrprinter.mode" => "String giving the file mode", "builtins.str" => "str(object='') -> str\nstr(bytes_or_buffer[, encoding[, errors]]) -> str\n\nCreate a new string object from the given object. If encoding or\nerrors is specified, then the object must expose a data buffer\nthat will be decoded using the given encoding and error handler.\nOtherwise, returns the result of object.__str__() (if defined)\nor repr(object).\nencoding defaults to 'utf-8'.\nerrors defaults to 'strict'.", "builtins.str.__add__" => "Return self+value.", "builtins.str.__contains__" => "Return bool(key in self).", @@ -13343,6 +28758,31 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.str_ascii_iterator.__sizeof__" => "Size of object in memory, in bytes.", "builtins.str_ascii_iterator.__str__" => "Return str(self).", "builtins.str_ascii_iterator.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.str_iterator.__delattr__" => "Implement delattr(self, name).", + "builtins.str_iterator.__eq__" => "Return self==value.", + "builtins.str_iterator.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.str_iterator.__ge__" => "Return self>=value.", + "builtins.str_iterator.__getattribute__" => "Return getattr(self, name).", + "builtins.str_iterator.__getstate__" => "Helper for pickle.", + "builtins.str_iterator.__gt__" => "Return self>value.", + "builtins.str_iterator.__hash__" => "Return hash(self).", + "builtins.str_iterator.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.str_iterator.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.str_iterator.__iter__" => "Implement iter(self).", + "builtins.str_iterator.__le__" => "Return self<=value.", + "builtins.str_iterator.__length_hint__" => "Private method returning an estimate of len(list(it)).", + "builtins.str_iterator.__lt__" => "Return self<value.", + "builtins.str_iterator.__ne__" => "Return self!=value.", + "builtins.str_iterator.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.str_iterator.__next__" => "Implement next(self).", + "builtins.str_iterator.__reduce__" => "Return state information for pickling.", + "builtins.str_iterator.__reduce_ex__" => "Helper for pickle.", + "builtins.str_iterator.__repr__" => "Return repr(self).", + "builtins.str_iterator.__setattr__" => "Implement setattr(self, name, value).", + "builtins.str_iterator.__setstate__" => "Set state information for unpickling.", + "builtins.str_iterator.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.str_iterator.__str__" => "Return str(self).", + "builtins.str_iterator.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.sum" => "Return the sum of a 'start' value (default: 0) plus an iterable of numbers\n\nWhen the iterable is empty, return the start value.\nThis function is intended specifically for use with numeric values and\nmay reject non-numeric types.", "builtins.super" => "super() -> same as super(__class__, <first argument>)\nsuper(type) -> unbound super object\nsuper(type, obj) -> bound super object; requires isinstance(obj, type)\nsuper(type, type2) -> bound super object; requires\n issubclass(type2, type)\nTypical use to call a cooperative superclass method:\nclass C(B):\n def meth(self, arg):\n super().meth(arg)\nThis works for class methods too:\nclass C(B):\n @classmethod\n def cmeth(cls, arg):\n super().cmeth(arg)", "builtins.super.__delattr__" => "Implement delattr(self, name).", @@ -13370,6 +28810,176 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.super.__str__" => "Return str(self).", "builtins.super.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.super.__thisclass__" => "the class invoking super()", + "builtins.symtable entry.__delattr__" => "Implement delattr(self, name).", + "builtins.symtable entry.__eq__" => "Return self==value.", + "builtins.symtable entry.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.symtable entry.__ge__" => "Return self>=value.", + "builtins.symtable entry.__getattribute__" => "Return getattr(self, name).", + "builtins.symtable entry.__getstate__" => "Helper for pickle.", + "builtins.symtable entry.__gt__" => "Return self>value.", + "builtins.symtable entry.__hash__" => "Return hash(self).", + "builtins.symtable entry.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.symtable entry.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.symtable entry.__le__" => "Return self<=value.", + "builtins.symtable entry.__lt__" => "Return self<value.", + "builtins.symtable entry.__ne__" => "Return self!=value.", + "builtins.symtable entry.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.symtable entry.__reduce__" => "Helper for pickle.", + "builtins.symtable entry.__reduce_ex__" => "Helper for pickle.", + "builtins.symtable entry.__repr__" => "Return repr(self).", + "builtins.symtable entry.__setattr__" => "Implement setattr(self, name, value).", + "builtins.symtable entry.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.symtable entry.__str__" => "Return str(self).", + "builtins.symtable entry.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.takewhile" => "Return successive entries from an iterable as long as the predicate evaluates to true for each entry.", + "builtins.takewhile.__delattr__" => "Implement delattr(self, name).", + "builtins.takewhile.__eq__" => "Return self==value.", + "builtins.takewhile.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.takewhile.__ge__" => "Return self>=value.", + "builtins.takewhile.__getattribute__" => "Return getattr(self, name).", + "builtins.takewhile.__getstate__" => "Helper for pickle.", + "builtins.takewhile.__gt__" => "Return self>value.", + "builtins.takewhile.__hash__" => "Return hash(self).", + "builtins.takewhile.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.takewhile.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.takewhile.__iter__" => "Implement iter(self).", + "builtins.takewhile.__le__" => "Return self<=value.", + "builtins.takewhile.__lt__" => "Return self<value.", + "builtins.takewhile.__ne__" => "Return self!=value.", + "builtins.takewhile.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.takewhile.__next__" => "Implement next(self).", + "builtins.takewhile.__reduce__" => "Helper for pickle.", + "builtins.takewhile.__reduce_ex__" => "Helper for pickle.", + "builtins.takewhile.__repr__" => "Return repr(self).", + "builtins.takewhile.__setattr__" => "Implement setattr(self, name, value).", + "builtins.takewhile.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.takewhile.__str__" => "Return str(self).", + "builtins.takewhile.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.time" => "Time with time zone.\n\nConstructors:\n\n__new__()\nstrptime()\n\nOperators:\n\n__repr__, __str__\n__eq__, __le__, __lt__, __ge__, __gt__, __hash__\n\nMethods:\n\nstrftime()\nisoformat()\nutcoffset()\ntzname()\ndst()\n\nProperties (readonly):\nhour, minute, second, microsecond, tzinfo, fold", + "builtins.time.__delattr__" => "Implement delattr(self, name).", + "builtins.time.__eq__" => "Return self==value.", + "builtins.time.__format__" => "Formats self with strftime.", + "builtins.time.__ge__" => "Return self>=value.", + "builtins.time.__getattribute__" => "Return getattr(self, name).", + "builtins.time.__getstate__" => "Helper for pickle.", + "builtins.time.__gt__" => "Return self>value.", + "builtins.time.__hash__" => "Hash.", + "builtins.time.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.time.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.time.__le__" => "Return self<=value.", + "builtins.time.__lt__" => "Return self<value.", + "builtins.time.__ne__" => "Return self!=value.", + "builtins.time.__new__" => "Constructor.\n\nArguments:\n\nhour, minute (required)\nsecond, microsecond (default to zero)\ntzinfo (default to None)\nfold (keyword only, default to zero)", + "builtins.time.__reduce__" => "__reduce__() -> (cls, state)", + "builtins.time.__reduce_ex__" => "__reduce_ex__(proto) -> (cls, state)", + "builtins.time.__replace__" => "Return a new time with new values for the specified fields.", + "builtins.time.__repr__" => "Convert to formal string, for repr().", + "builtins.time.__setattr__" => "Implement setattr(self, name, value).", + "builtins.time.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.time.__str__" => "Return the time formatted according to ISO.\n\nThe full format is 'HH:MM:SS.mmmmmm+zz:zz'. By default, the fractional\npart is omitted if self.microsecond == 0.\n\nThe optional argument timespec specifies the number of additional\nterms of the time to include. Valid options are 'auto', 'hours',\n'minutes', 'seconds', 'milliseconds' and 'microseconds'.", + "builtins.time.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.time._tzstr" => "Return formatted timezone offset (+xx:xx) or an empty string.", + "builtins.time.dst" => "Return 0 if DST is not in effect, or the DST offset (as timedelta\npositive eastward) if DST is in effect.\n\nThis is purely informational; the DST offset has already been added to\nthe UTC offset returned by utcoffset() if applicable, so there's no\nneed to consult dst() unless you're interested in displaying the DST\ninfo.", + "builtins.time.fromisoformat" => "Construct a time from a string in one of the ISO 8601 formats.", + "builtins.time.hour" => "hour (0-23)", + "builtins.time.isoformat" => "Return the time formatted according to ISO.\n\nThe full format is 'HH:MM:SS.mmmmmm+zz:zz'. By default, the fractional\npart is omitted if self.microsecond == 0.\n\nThe optional argument timespec specifies the number of additional\nterms of the time to include. Valid options are 'auto', 'hours',\n'minutes', 'seconds', 'milliseconds' and 'microseconds'.", + "builtins.time.microsecond" => "microsecond (0-999999)", + "builtins.time.minute" => "minute (0-59)", + "builtins.time.replace" => "Return a new time with new values for the specified fields.", + "builtins.time.second" => "second (0-59)", + "builtins.time.strftime" => "Format using strftime(). The date part of the timestamp passed\nto underlying strftime should not be used.", + "builtins.time.strptime" => "string, format -> new time parsed from a string (like time.strptime()).", + "builtins.time.tzinfo" => "timezone info object", + "builtins.time.tzname" => "Return the timezone name.\n\nNote that the name is 100% informational -- there's no requirement that\nit mean anything in particular. For example, \"GMT\", \"UTC\", \"-500\",\n\"-5:00\", \"EDT\", \"US/Eastern\", \"America/New York\" are all valid replies.", + "builtins.time.utcoffset" => "Return the timezone offset as timedelta, positive east of UTC\n(negative west of UTC).", + "builtins.timedelta" => "Represent the difference between two datetime objects.\n\nSupported operators:\n\n- add, subtract timedelta\n- unary plus, minus, abs\n- compare to timedelta\n- multiply, divide by int\n\nIn addition, datetime supports subtraction of two datetime objects\nreturning a timedelta, and addition or subtraction of a datetime\nand a timedelta giving a datetime.\n\nRepresentation: (days, seconds, microseconds).", + "builtins.timedelta.__abs__" => "abs(self)", + "builtins.timedelta.__add__" => "Return self+value.", + "builtins.timedelta.__bool__" => "True if self else False", + "builtins.timedelta.__delattr__" => "Implement delattr(self, name).", + "builtins.timedelta.__divmod__" => "Return divmod(self, value).", + "builtins.timedelta.__eq__" => "Return self==value.", + "builtins.timedelta.__floordiv__" => "Return self//value.", + "builtins.timedelta.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.timedelta.__ge__" => "Return self>=value.", + "builtins.timedelta.__getattribute__" => "Return getattr(self, name).", + "builtins.timedelta.__getstate__" => "Helper for pickle.", + "builtins.timedelta.__gt__" => "Return self>value.", + "builtins.timedelta.__hash__" => "Return hash(self).", + "builtins.timedelta.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.timedelta.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.timedelta.__le__" => "Return self<=value.", + "builtins.timedelta.__lt__" => "Return self<value.", + "builtins.timedelta.__mod__" => "Return self%value.", + "builtins.timedelta.__mul__" => "Return self*value.", + "builtins.timedelta.__ne__" => "Return self!=value.", + "builtins.timedelta.__neg__" => "-self", + "builtins.timedelta.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.timedelta.__pos__" => "+self", + "builtins.timedelta.__radd__" => "Return value+self.", + "builtins.timedelta.__rdivmod__" => "Return divmod(value, self).", + "builtins.timedelta.__reduce__" => "__reduce__() -> (cls, state)", + "builtins.timedelta.__reduce_ex__" => "Helper for pickle.", + "builtins.timedelta.__repr__" => "Return repr(self).", + "builtins.timedelta.__rfloordiv__" => "Return value//self.", + "builtins.timedelta.__rmod__" => "Return value%self.", + "builtins.timedelta.__rmul__" => "Return value*self.", + "builtins.timedelta.__rsub__" => "Return value-self.", + "builtins.timedelta.__rtruediv__" => "Return value/self.", + "builtins.timedelta.__setattr__" => "Implement setattr(self, name, value).", + "builtins.timedelta.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.timedelta.__str__" => "Return str(self).", + "builtins.timedelta.__sub__" => "Return self-value.", + "builtins.timedelta.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.timedelta.__truediv__" => "Return self/value.", + "builtins.timedelta.days" => "days", + "builtins.timedelta.microseconds" => "microseconds", + "builtins.timedelta.seconds" => "seconds", + "builtins.timedelta.total_seconds" => "Total seconds in the duration.", + "builtins.tkapp.__delattr__" => "Implement delattr(self, name).", + "builtins.tkapp.__eq__" => "Return self==value.", + "builtins.tkapp.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.tkapp.__ge__" => "Return self>=value.", + "builtins.tkapp.__getattribute__" => "Return getattr(self, name).", + "builtins.tkapp.__getstate__" => "Helper for pickle.", + "builtins.tkapp.__gt__" => "Return self>value.", + "builtins.tkapp.__hash__" => "Return hash(self).", + "builtins.tkapp.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.tkapp.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.tkapp.__le__" => "Return self<=value.", + "builtins.tkapp.__lt__" => "Return self<value.", + "builtins.tkapp.__ne__" => "Return self!=value.", + "builtins.tkapp.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.tkapp.__reduce__" => "Helper for pickle.", + "builtins.tkapp.__reduce_ex__" => "Helper for pickle.", + "builtins.tkapp.__repr__" => "Return repr(self).", + "builtins.tkapp.__setattr__" => "Implement setattr(self, name, value).", + "builtins.tkapp.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.tkapp.__str__" => "Return str(self).", + "builtins.tkapp.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.tkapp.gettrace" => "Get the tracing function.", + "builtins.tkapp.settrace" => "Set the tracing function.", + "builtins.tktimertoken.__delattr__" => "Implement delattr(self, name).", + "builtins.tktimertoken.__eq__" => "Return self==value.", + "builtins.tktimertoken.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.tktimertoken.__ge__" => "Return self>=value.", + "builtins.tktimertoken.__getattribute__" => "Return getattr(self, name).", + "builtins.tktimertoken.__getstate__" => "Helper for pickle.", + "builtins.tktimertoken.__gt__" => "Return self>value.", + "builtins.tktimertoken.__hash__" => "Return hash(self).", + "builtins.tktimertoken.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.tktimertoken.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.tktimertoken.__le__" => "Return self<=value.", + "builtins.tktimertoken.__lt__" => "Return self<value.", + "builtins.tktimertoken.__ne__" => "Return self!=value.", + "builtins.tktimertoken.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.tktimertoken.__reduce__" => "Helper for pickle.", + "builtins.tktimertoken.__reduce_ex__" => "Helper for pickle.", + "builtins.tktimertoken.__repr__" => "Return repr(self).", + "builtins.tktimertoken.__setattr__" => "Implement setattr(self, name, value).", + "builtins.tktimertoken.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.tktimertoken.__str__" => "Return str(self).", + "builtins.tktimertoken.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.traceback" => "Create a new traceback object.", "builtins.traceback.__delattr__" => "Implement delattr(self, name).", "builtins.traceback.__eq__" => "Return self==value.", @@ -13501,7 +29111,186 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.type.__subclasses__" => "Return a list of immediate subclasses.", "builtins.type.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.type.mro" => "Return a type's method resolution order.", + "builtins.tzinfo" => "Abstract base class for time zone info classes.\n\nSubclasses must override the tzname(), utcoffset() and dst() methods.", + "builtins.tzinfo.__delattr__" => "Implement delattr(self, name).", + "builtins.tzinfo.__eq__" => "Return self==value.", + "builtins.tzinfo.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.tzinfo.__ge__" => "Return self>=value.", + "builtins.tzinfo.__getattribute__" => "Return getattr(self, name).", + "builtins.tzinfo.__getstate__" => "Helper for pickle.", + "builtins.tzinfo.__gt__" => "Return self>value.", + "builtins.tzinfo.__hash__" => "Return hash(self).", + "builtins.tzinfo.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.tzinfo.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.tzinfo.__le__" => "Return self<=value.", + "builtins.tzinfo.__lt__" => "Return self<value.", + "builtins.tzinfo.__ne__" => "Return self!=value.", + "builtins.tzinfo.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.tzinfo.__reduce__" => "-> (cls, state)", + "builtins.tzinfo.__reduce_ex__" => "Helper for pickle.", + "builtins.tzinfo.__repr__" => "Return repr(self).", + "builtins.tzinfo.__setattr__" => "Implement setattr(self, name, value).", + "builtins.tzinfo.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.tzinfo.__str__" => "Return str(self).", + "builtins.tzinfo.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.tzinfo.dst" => "datetime -> DST offset as timedelta, positive for east of UTC.\n\nReturn 0 if DST not in effect. utcoffset() must include the DST\noffset.", + "builtins.tzinfo.fromutc" => "datetime in UTC -> datetime in local time.", + "builtins.tzinfo.tzname" => "datetime -> string name of time zone.", + "builtins.tzinfo.utcoffset" => "datetime -> timedelta, positive for east of UTC, negative for west of UTC", + "builtins.unpack_iterator.__delattr__" => "Implement delattr(self, name).", + "builtins.unpack_iterator.__eq__" => "Return self==value.", + "builtins.unpack_iterator.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.unpack_iterator.__ge__" => "Return self>=value.", + "builtins.unpack_iterator.__getattribute__" => "Return getattr(self, name).", + "builtins.unpack_iterator.__getstate__" => "Helper for pickle.", + "builtins.unpack_iterator.__gt__" => "Return self>value.", + "builtins.unpack_iterator.__hash__" => "Return hash(self).", + "builtins.unpack_iterator.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.unpack_iterator.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.unpack_iterator.__iter__" => "Implement iter(self).", + "builtins.unpack_iterator.__le__" => "Return self<=value.", + "builtins.unpack_iterator.__lt__" => "Return self<value.", + "builtins.unpack_iterator.__ne__" => "Return self!=value.", + "builtins.unpack_iterator.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.unpack_iterator.__next__" => "Implement next(self).", + "builtins.unpack_iterator.__reduce__" => "Helper for pickle.", + "builtins.unpack_iterator.__reduce_ex__" => "Helper for pickle.", + "builtins.unpack_iterator.__repr__" => "Return repr(self).", + "builtins.unpack_iterator.__setattr__" => "Implement setattr(self, name, value).", + "builtins.unpack_iterator.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.unpack_iterator.__str__" => "Return str(self).", + "builtins.unpack_iterator.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.uop_executor.__delattr__" => "Implement delattr(self, name).", + "builtins.uop_executor.__eq__" => "Return self==value.", + "builtins.uop_executor.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.uop_executor.__ge__" => "Return self>=value.", + "builtins.uop_executor.__getattribute__" => "Return getattr(self, name).", + "builtins.uop_executor.__getitem__" => "Return self[key].", + "builtins.uop_executor.__getstate__" => "Helper for pickle.", + "builtins.uop_executor.__gt__" => "Return self>value.", + "builtins.uop_executor.__hash__" => "Return hash(self).", + "builtins.uop_executor.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.uop_executor.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.uop_executor.__le__" => "Return self<=value.", + "builtins.uop_executor.__len__" => "Return len(self).", + "builtins.uop_executor.__lt__" => "Return self<value.", + "builtins.uop_executor.__ne__" => "Return self!=value.", + "builtins.uop_executor.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.uop_executor.__reduce__" => "Helper for pickle.", + "builtins.uop_executor.__reduce_ex__" => "Helper for pickle.", + "builtins.uop_executor.__repr__" => "Return repr(self).", + "builtins.uop_executor.__setattr__" => "Implement setattr(self, name, value).", + "builtins.uop_executor.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.uop_executor.__str__" => "Return str(self).", + "builtins.uop_executor.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.values.__delattr__" => "Implement delattr(self, name).", + "builtins.values.__eq__" => "Return self==value.", + "builtins.values.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.values.__ge__" => "Return self>=value.", + "builtins.values.__getattribute__" => "Return getattr(self, name).", + "builtins.values.__getstate__" => "Helper for pickle.", + "builtins.values.__gt__" => "Return self>value.", + "builtins.values.__hash__" => "Return hash(self).", + "builtins.values.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.values.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.values.__iter__" => "Implement iter(self).", + "builtins.values.__le__" => "Return self<=value.", + "builtins.values.__len__" => "Return len(self).", + "builtins.values.__lt__" => "Return self<value.", + "builtins.values.__ne__" => "Return self!=value.", + "builtins.values.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.values.__next__" => "Implement next(self).", + "builtins.values.__reduce__" => "Helper for pickle.", + "builtins.values.__reduce_ex__" => "Helper for pickle.", + "builtins.values.__repr__" => "Return repr(self).", + "builtins.values.__setattr__" => "Implement setattr(self, name, value).", + "builtins.values.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.values.__str__" => "Return str(self).", + "builtins.values.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.vars" => "vars([object]) -> dictionary\n\nWithout arguments, equivalent to locals().\nWith an argument, equivalent to object.__dict__.", + "builtins.verify" => "Check an enumeration for various constraints. (see EnumCheck)", + "builtins.verify.__delattr__" => "Implement delattr(self, name).", + "builtins.verify.__eq__" => "Return self==value.", + "builtins.verify.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.verify.__ge__" => "Return self>=value.", + "builtins.verify.__getattribute__" => "Return getattr(self, name).", + "builtins.verify.__getstate__" => "Helper for pickle.", + "builtins.verify.__gt__" => "Return self>value.", + "builtins.verify.__hash__" => "Return hash(self).", + "builtins.verify.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.verify.__le__" => "Return self<=value.", + "builtins.verify.__lt__" => "Return self<value.", + "builtins.verify.__ne__" => "Return self!=value.", + "builtins.verify.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.verify.__reduce__" => "Helper for pickle.", + "builtins.verify.__reduce_ex__" => "Helper for pickle.", + "builtins.verify.__repr__" => "Return repr(self).", + "builtins.verify.__setattr__" => "Implement setattr(self, name, value).", + "builtins.verify.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.verify.__str__" => "Return str(self).", + "builtins.verify.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.verify.__weakref__" => "list of weak references to the object", + "builtins.window.__delattr__" => "Implement delattr(self, name).", + "builtins.window.__eq__" => "Return self==value.", + "builtins.window.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.window.__ge__" => "Return self>=value.", + "builtins.window.__getattribute__" => "Return getattr(self, name).", + "builtins.window.__getstate__" => "Helper for pickle.", + "builtins.window.__gt__" => "Return self>value.", + "builtins.window.__hash__" => "Return hash(self).", + "builtins.window.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.window.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.window.__le__" => "Return self<=value.", + "builtins.window.__lt__" => "Return self<value.", + "builtins.window.__ne__" => "Return self!=value.", + "builtins.window.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.window.__reduce__" => "Helper for pickle.", + "builtins.window.__reduce_ex__" => "Helper for pickle.", + "builtins.window.__repr__" => "Return repr(self).", + "builtins.window.__setattr__" => "Implement setattr(self, name, value).", + "builtins.window.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.window.__str__" => "Return str(self).", + "builtins.window.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.window.addch" => "addch([y, x,] ch, [attr=_curses.A_NORMAL])\nPaint the character.\n\n y\n Y-coordinate.\n x\n X-coordinate.\n ch\n Character to add.\n attr\n Attributes for the character.\n\nPaint character ch at (y, x) with attributes attr,\noverwriting any character previously painted at that location.\nBy default, the character position and attributes are the\ncurrent settings for the window object.", + "builtins.window.addnstr" => "addnstr([y, x,] str, n, [attr])\nPaint at most n characters of the string.\n\n y\n Y-coordinate.\n x\n X-coordinate.\n str\n String to add.\n n\n Maximal number of characters.\n attr\n Attributes for characters.\n\nPaint at most n characters of the string str at (y, x) with\nattributes attr, overwriting anything previously on the display.\nBy default, the character position and attributes are the\ncurrent settings for the window object.", + "builtins.window.addstr" => "addstr([y, x,] str, [attr])\nPaint the string.\n\n y\n Y-coordinate.\n x\n X-coordinate.\n str\n String to add.\n attr\n Attributes for characters.\n\nPaint the string str at (y, x) with attributes attr,\noverwriting anything previously on the display.\nBy default, the character position and attributes are the\ncurrent settings for the window object.", + "builtins.window.attroff" => "Remove attribute attr from the \"background\" set.", + "builtins.window.attron" => "Add attribute attr to the \"background\" set.", + "builtins.window.attrset" => "Set the \"background\" set of attributes.", + "builtins.window.bkgd" => "Set the background property of the window.\n\n ch\n Background character.\n attr\n Background attributes.", + "builtins.window.bkgdset" => "Set the window's background.\n\n ch\n Background character.\n attr\n Background attributes.", + "builtins.window.border" => "Draw a border around the edges of the window.\n\n ls\n Left side.\n rs\n Right side.\n ts\n Top side.\n bs\n Bottom side.\n tl\n Upper-left corner.\n tr\n Upper-right corner.\n bl\n Bottom-left corner.\n br\n Bottom-right corner.\n\nEach parameter specifies the character to use for a specific part of\nthe border. The characters can be specified as integers or as\none-character strings. A 0 value for any parameter will cause the\ndefault character to be used for that parameter.", + "builtins.window.box" => "box([verch=0, horch=0])\nDraw a border around the edges of the window.\n\n verch\n Left and right side.\n horch\n Top and bottom side.\n\nSimilar to border(), but both ls and rs are verch and both ts and bs\nare horch. The default corner characters are always used by this\nfunction.", + "builtins.window.chgat" => "chgat([y, x,] [n=-1,] attr)\nSet the attributes of characters.\n\n y\n Y-coordinate.\n x\n X-coordinate.\n n\n Number of characters.\n attr\n Attributes for characters.\n\nSet the attributes of num characters at the current cursor position, or at\nposition (y, x) if supplied. If no value of num is given or num = -1, the\nattribute will be set on all the characters to the end of the line. This\nfunction does not move the cursor. The changed line will be touched using\nthe touchline() method so that the contents will be redisplayed by the next\nwindow refresh.", + "builtins.window.delch" => "delch([y, x])\nDelete any character at (y, x).\n\n y\n Y-coordinate.\n x\n X-coordinate.", + "builtins.window.derwin" => "derwin([nlines=0, ncols=0,] begin_y, begin_x)\nCreate a sub-window (window-relative coordinates).\n\n nlines\n Height.\n ncols\n Width.\n begin_y\n Top side y-coordinate.\n begin_x\n Left side x-coordinate.\n\nderwin() is the same as calling subwin(), except that begin_y and\nbegin_x are relative to the origin of the window, rather than\nrelative to the entire screen.", + "builtins.window.echochar" => "Add character ch with attribute attr, and refresh.\n\n ch\n Character to add.\n attr\n Attributes for the character.", + "builtins.window.enclose" => "Return True if the screen-relative coordinates are enclosed by the window.\n\n y\n Y-coordinate.\n x\n X-coordinate.", + "builtins.window.encoding" => "the typecode character used to create the array", + "builtins.window.get_wch" => "get_wch([y, x])\nGet a wide character from terminal keyboard.\n\n y\n Y-coordinate.\n x\n X-coordinate.\n\nReturn a character for most keys, or an integer for function keys,\nkeypad keys, and other special keys.", + "builtins.window.getbkgd" => "Return the window's current background character/attribute pair.", + "builtins.window.getch" => "getch([y, x])\nGet a character code from terminal keyboard.\n\n y\n Y-coordinate.\n x\n X-coordinate.\n\nThe integer returned does not have to be in ASCII range: function\nkeys, keypad keys and so on return numbers higher than 256. In\nno-delay mode, -1 is returned if there is no input, else getch()\nwaits until a key is pressed.", + "builtins.window.getkey" => "getkey([y, x])\nGet a character (string) from terminal keyboard.\n\n y\n Y-coordinate.\n x\n X-coordinate.\n\nReturning a string instead of an integer, as getch() does. Function\nkeys, keypad keys and other special keys return a multibyte string\ncontaining the key name. In no-delay mode, an exception is raised\nif there is no input.", + "builtins.window.getstr" => "getstr([[y, x,] n=2047])\nRead a string from the user, with primitive line editing capacity.\n\n y\n Y-coordinate.\n x\n X-coordinate.\n n\n Maximal number of characters.", + "builtins.window.hline" => "hline([y, x,] ch, n, [attr=_curses.A_NORMAL])\nDisplay a horizontal line.\n\n y\n Starting Y-coordinate.\n x\n Starting X-coordinate.\n ch\n Character to draw.\n n\n Line length.\n attr\n Attributes for the characters.", + "builtins.window.inch" => "inch([y, x])\nReturn the character at the given position in the window.\n\n y\n Y-coordinate.\n x\n X-coordinate.\n\nThe bottom 8 bits are the character proper, and upper bits are the\nattributes.", + "builtins.window.insch" => "insch([y, x,] ch, [attr=_curses.A_NORMAL])\nInsert a character before the current or specified position.\n\n y\n Y-coordinate.\n x\n X-coordinate.\n ch\n Character to insert.\n attr\n Attributes for the character.\n\nAll characters to the right of the cursor are shifted one position\nright, with the rightmost characters on the line being lost.", + "builtins.window.insnstr" => "insnstr([y, x,] str, n, [attr])\nInsert at most n characters of the string.\n\n y\n Y-coordinate.\n x\n X-coordinate.\n str\n String to insert.\n n\n Maximal number of characters.\n attr\n Attributes for characters.\n\nInsert a character string (as many characters as will fit on the\nline) before the character under the cursor, up to n characters. If\nn is zero or negative, the entire string is inserted. All\ncharacters to the right of the cursor are shifted right, with the\nrightmost characters on the line being lost. The cursor position\ndoes not change (after moving to y, x, if specified).", + "builtins.window.insstr" => "insstr([y, x,] str, [attr])\nInsert the string before the current or specified position.\n\n y\n Y-coordinate.\n x\n X-coordinate.\n str\n String to insert.\n attr\n Attributes for characters.\n\nInsert a character string (as many characters as will fit on the\nline) before the character under the cursor. All characters to the\nright of the cursor are shifted right, with the rightmost characters\non the line being lost. The cursor position does not change (after\nmoving to y, x, if specified).", + "builtins.window.instr" => "instr([y, x,] n=2047)\nReturn a string of characters, extracted from the window.\n\n y\n Y-coordinate.\n x\n X-coordinate.\n n\n Maximal number of characters.\n\nReturn a string of characters, extracted from the window starting at the\ncurrent cursor position, or at y, x if specified. Attributes are stripped\nfrom the characters. If n is specified, instr() returns a string at most\nn characters long (exclusive of the trailing NUL).", + "builtins.window.is_linetouched" => "Return True if the specified line was modified, otherwise return False.\n\n line\n Line number.\n\nRaise a curses.error exception if line is not valid for the given\nwindow.", + "builtins.window.noutrefresh" => "noutrefresh([pminrow, pmincol, sminrow, smincol, smaxrow, smaxcol])\nMark for refresh but wait.\n\nThis function updates the data structure representing the desired\nstate of the window, but does not force an update of the physical\nscreen. To accomplish that, call doupdate().", + "builtins.window.overlay" => "overlay(destwin, [sminrow, smincol, dminrow, dmincol, dmaxrow, dmaxcol])\nOverlay the window on top of destwin.\n\nThe windows need not be the same size, only the overlapping region\nis copied. This copy is non-destructive, which means that the\ncurrent background character does not overwrite the old contents of\ndestwin.\n\nTo get fine-grained control over the copied region, the second form\nof overlay() can be used. sminrow and smincol are the upper-left\ncoordinates of the source window, and the other variables mark\na rectangle in the destination window.", + "builtins.window.overwrite" => "overwrite(destwin, [sminrow, smincol, dminrow, dmincol, dmaxrow,\n dmaxcol])\nOverwrite the window on top of destwin.\n\nThe windows need not be the same size, in which case only the\noverlapping region is copied. This copy is destructive, which means\nthat the current background character overwrites the old contents of\ndestwin.\n\nTo get fine-grained control over the copied region, the second form\nof overwrite() can be used. sminrow and smincol are the upper-left\ncoordinates of the source window, the other variables mark\na rectangle in the destination window.", + "builtins.window.putwin" => "Write all data associated with the window into the provided file object.\n\nThis information can be later retrieved using the getwin() function.", + "builtins.window.redrawln" => "Mark the specified lines corrupted.\n\n beg\n Starting line number.\n num\n The number of lines.\n\nThey should be completely redrawn on the next refresh() call.", + "builtins.window.refresh" => "refresh([pminrow, pmincol, sminrow, smincol, smaxrow, smaxcol])\nUpdate the display immediately.\n\nSynchronize actual screen with previous drawing/deleting methods.\nThe 6 optional arguments can only be specified when the window is\na pad created with newpad(). The additional parameters are needed\nto indicate what part of the pad and screen are involved. pminrow\nand pmincol specify the upper left-hand corner of the rectangle to\nbe displayed in the pad. sminrow, smincol, smaxrow, and smaxcol\nspecify the edges of the rectangle to be displayed on the screen.\nThe lower right-hand corner of the rectangle to be displayed in the\npad is calculated from the screen coordinates, since the rectangles\nmust be the same size. Both rectangles must be entirely contained\nwithin their respective structures. Negative values of pminrow,\npmincol, sminrow, or smincol are treated as if they were zero.", + "builtins.window.scroll" => "scroll([lines=1])\nScroll the screen or scrolling region.\n\n lines\n Number of lines to scroll.\n\nScroll upward if the argument is positive and downward if it is\nnegative.", + "builtins.window.setscrreg" => "Define a software scrolling region.\n\n top\n First line number.\n bottom\n Last line number.\n\nAll scrolling actions will take place in this region.", + "builtins.window.subpad" => "subwin([nlines=0, ncols=0,] begin_y, begin_x)\nCreate a sub-window (screen-relative coordinates).\n\n nlines\n Height.\n ncols\n Width.\n begin_y\n Top side y-coordinate.\n begin_x\n Left side x-coordinate.\n\nBy default, the sub-window will extend from the specified position\nto the lower right corner of the window.", + "builtins.window.subwin" => "subwin([nlines=0, ncols=0,] begin_y, begin_x)\nCreate a sub-window (screen-relative coordinates).\n\n nlines\n Height.\n ncols\n Width.\n begin_y\n Top side y-coordinate.\n begin_x\n Left side x-coordinate.\n\nBy default, the sub-window will extend from the specified position\nto the lower right corner of the window.", + "builtins.window.touchline" => "touchline(start, count, [changed=True])\nPretend count lines have been changed, starting with line start.\n\nIf changed is supplied, it specifies whether the affected lines are\nmarked as having been changed (changed=True) or unchanged\n(changed=False).", + "builtins.window.vline" => "vline([y, x,] ch, n, [attr=_curses.A_NORMAL])\nDisplay a vertical line.\n\n y\n Starting Y-coordinate.\n x\n Starting X-coordinate.\n ch\n Character to draw.\n n\n Line length.\n attr\n Attributes for the character.", "builtins.wrapper_descriptor.__call__" => "Call self as a function.", "builtins.wrapper_descriptor.__delattr__" => "Implement delattr(self, name).", "builtins.wrapper_descriptor.__eq__" => "Return self==value.", @@ -13524,6 +29313,66 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.wrapper_descriptor.__sizeof__" => "Size of object in memory, in bytes.", "builtins.wrapper_descriptor.__str__" => "Return str(self).", "builtins.wrapper_descriptor.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.writer" => "CSV writer\n\nWriter objects are responsible for generating tabular data\nin CSV format from sequence input.", + "builtins.writer.__delattr__" => "Implement delattr(self, name).", + "builtins.writer.__eq__" => "Return self==value.", + "builtins.writer.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.writer.__ge__" => "Return self>=value.", + "builtins.writer.__getattribute__" => "Return getattr(self, name).", + "builtins.writer.__getstate__" => "Helper for pickle.", + "builtins.writer.__gt__" => "Return self>value.", + "builtins.writer.__hash__" => "Return hash(self).", + "builtins.writer.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.writer.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.writer.__le__" => "Return self<=value.", + "builtins.writer.__lt__" => "Return self<value.", + "builtins.writer.__ne__" => "Return self!=value.", + "builtins.writer.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.writer.__reduce__" => "Helper for pickle.", + "builtins.writer.__reduce_ex__" => "Helper for pickle.", + "builtins.writer.__repr__" => "Return repr(self).", + "builtins.writer.__setattr__" => "Implement setattr(self, name, value).", + "builtins.writer.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.writer.__str__" => "Return str(self).", + "builtins.writer.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.writer.writerow" => "Construct and write a CSV record from an iterable of fields.\n\nNon-string elements will be converted to string.", + "builtins.writer.writerows" => "Construct and write a series of iterables to a csv file.\n\nNon-string elements will be converted to string.", + "builtins.xmlparser" => "XML parser", + "builtins.xmlparser.ExternalEntityParserCreate" => "Create a parser for parsing an external entity based on the information passed to the ExternalEntityRefHandler.", + "builtins.xmlparser.GetBase" => "Return base URL string for the parser.", + "builtins.xmlparser.GetInputContext" => "Return the untranslated text of the input that caused the current event.\n\nIf the event was generated by a large amount of text (such as\na start tag for an element with many attributes), not all of the\ntext may be available.", + "builtins.xmlparser.GetReparseDeferralEnabled" => "Retrieve reparse deferral enabled status; always returns false with Expat <2.6.0.", + "builtins.xmlparser.Parse" => "Parse XML data.\n\n'isfinal' should be true at end of input.", + "builtins.xmlparser.ParseFile" => "Parse XML data from file-like object.", + "builtins.xmlparser.SetAllocTrackerActivationThreshold" => "Sets the number of allocated bytes of dynamic memory needed to activate protection against disproportionate use of RAM.\n\nParser objects usually have an allocation activation threshold of 64 MiB,\nbut the actual default value depends on the underlying Expat library.", + "builtins.xmlparser.SetAllocTrackerMaximumAmplification" => "Sets the maximum amplification factor between direct input and bytes of dynamic memory allocated.\n\nThe amplification factor is calculated as \"allocated / direct\" while\nparsing, where \"direct\" is the number of bytes read from the primary\ndocument in parsing and \"allocated\" is the number of bytes of\ndynamic memory allocated in the parser hierarchy.\n\nThe 'max_factor' value must be a non-NaN floating point value\ngreater than or equal to 1.0. Amplification factors greater than\n100.0 can be observed near the start of parsing even with benign\nfiles in practice. In particular, the activation threshold should\nbe carefully chosen to avoid false positives.\n\nParser objects usually have a maximum amplification factor of 100,\nbut the actual default value depends on the underlying Expat library.", + "builtins.xmlparser.SetBase" => "Set the base URL for the parser.", + "builtins.xmlparser.SetBillionLaughsAttackProtectionActivationThreshold" => "Sets the number of output bytes needed to activate protection against billion laughs attacks.\n\nThe number of output bytes includes amplification from entity expansion\nand reading DTD files.\n\nParser objects usually have a protection activation threshold of 8 MiB,\nbut the actual default value depends on the underlying Expat library.\n\nActivation thresholds below 4 MiB are known to break support for DITA 1.3\npayload and are hence not recommended.", + "builtins.xmlparser.SetBillionLaughsAttackProtectionMaximumAmplification" => "Sets the maximum tolerated amplification factor for protection against billion laughs attacks.\n\nThe amplification factor is calculated as \"(direct + indirect) / direct\"\nwhile parsing, where \"direct\" is the number of bytes read from the primary\ndocument in parsing and \"indirect\" is the number of bytes added by expanding\nentities and reading external DTD files, combined.\n\nThe 'max_factor' value must be a non-NaN floating point value greater than\nor equal to 1.0. Amplification factors greater than 30,000 can be observed\nin the middle of parsing even with benign files in practice. In particular,\nthe activation threshold should be carefully chosen to avoid false positives.\n\nParser objects usually have a maximum amplification factor of 100,\nbut the actual default value depends on the underlying Expat library.", + "builtins.xmlparser.SetParamEntityParsing" => "Controls parsing of parameter entities (including the external DTD subset).\n\nPossible flag values are XML_PARAM_ENTITY_PARSING_NEVER,\nXML_PARAM_ENTITY_PARSING_UNLESS_STANDALONE and\nXML_PARAM_ENTITY_PARSING_ALWAYS. Returns true if setting the flag\nwas successful.", + "builtins.xmlparser.SetReparseDeferralEnabled" => "Enable/Disable reparse deferral; enabled by default with Expat >=2.6.0.", + "builtins.xmlparser.UseForeignDTD" => "Allows the application to provide an artificial external subset if one is not specified as part of the document instance.\n\nThis readily allows the use of a 'default' document type controlled\nby the application, while still getting the advantage of providing\ndocument type information to the parser. 'flag' defaults to True if\nnot provided.", + "builtins.xmlparser.__delattr__" => "Implement delattr(self, name).", + "builtins.xmlparser.__eq__" => "Return self==value.", + "builtins.xmlparser.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.xmlparser.__ge__" => "Return self>=value.", + "builtins.xmlparser.__getattribute__" => "Return getattr(self, name).", + "builtins.xmlparser.__getstate__" => "Helper for pickle.", + "builtins.xmlparser.__gt__" => "Return self>value.", + "builtins.xmlparser.__hash__" => "Return hash(self).", + "builtins.xmlparser.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.xmlparser.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.xmlparser.__le__" => "Return self<=value.", + "builtins.xmlparser.__lt__" => "Return self<value.", + "builtins.xmlparser.__ne__" => "Return self!=value.", + "builtins.xmlparser.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.xmlparser.__reduce__" => "Helper for pickle.", + "builtins.xmlparser.__reduce_ex__" => "Helper for pickle.", + "builtins.xmlparser.__repr__" => "Return repr(self).", + "builtins.xmlparser.__setattr__" => "Implement setattr(self, name, value).", + "builtins.xmlparser.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.xmlparser.__str__" => "Return str(self).", + "builtins.xmlparser.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "builtins.zip" => "The zip object yields n-length tuples, where n is the number of\niterables passed as positional arguments to zip(). The i-th element\nin every tuple comes from the i-th iterable argument to zip(). This\ncontinues until the shortest argument is exhausted.\n\nIf strict is true and one of the arguments is exhausted before the\nothers, raise a ValueError.\n\n >>> list(zip('abcdefg', range(3), range(4)))\n [('a', 0, 0), ('b', 1, 1), ('c', 2, 2)]", "builtins.zip.__delattr__" => "Implement delattr(self, name).", "builtins.zip.__eq__" => "Return self==value.", @@ -13549,6 +29398,30 @@ pub static DB: phf::Map<&'static str, &'static str> = phf::phf_map! { "builtins.zip.__sizeof__" => "Size of object in memory, in bytes.", "builtins.zip.__str__" => "Return str(self).", "builtins.zip.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", + "builtins.zip_longest" => "Return a zip_longest object whose .__next__() method returns a tuple where\nthe i-th element comes from the i-th iterable argument. The .__next__()\nmethod continues until the longest iterable in the argument sequence\nis exhausted and then it raises StopIteration. When the shorter iterables\nare exhausted, the fillvalue is substituted in their place. The fillvalue\ndefaults to None or can be specified by a keyword argument.", + "builtins.zip_longest.__delattr__" => "Implement delattr(self, name).", + "builtins.zip_longest.__eq__" => "Return self==value.", + "builtins.zip_longest.__format__" => "Default object formatter.\n\nReturn str(self) if format_spec is empty. Raise TypeError otherwise.", + "builtins.zip_longest.__ge__" => "Return self>=value.", + "builtins.zip_longest.__getattribute__" => "Return getattr(self, name).", + "builtins.zip_longest.__getstate__" => "Helper for pickle.", + "builtins.zip_longest.__gt__" => "Return self>value.", + "builtins.zip_longest.__hash__" => "Return hash(self).", + "builtins.zip_longest.__init__" => "Initialize self. See help(type(self)) for accurate signature.", + "builtins.zip_longest.__init_subclass__" => "This method is called when a class is subclassed.\n\nThe default implementation does nothing. It may be\noverridden to extend subclasses.", + "builtins.zip_longest.__iter__" => "Implement iter(self).", + "builtins.zip_longest.__le__" => "Return self<=value.", + "builtins.zip_longest.__lt__" => "Return self<value.", + "builtins.zip_longest.__ne__" => "Return self!=value.", + "builtins.zip_longest.__new__" => "Create and return a new object. See help(type) for accurate signature.", + "builtins.zip_longest.__next__" => "Implement next(self).", + "builtins.zip_longest.__reduce__" => "Helper for pickle.", + "builtins.zip_longest.__reduce_ex__" => "Helper for pickle.", + "builtins.zip_longest.__repr__" => "Return repr(self).", + "builtins.zip_longest.__setattr__" => "Implement setattr(self, name, value).", + "builtins.zip_longest.__sizeof__" => "Size of object in memory, in bytes.", + "builtins.zip_longest.__str__" => "Return str(self).", + "builtins.zip_longest.__subclasshook__" => "Abstract classes can override this to customize issubclass().\n\nThis is invoked early on by abc.ABCMeta.__subclasscheck__().\nIt should return True, False or NotImplemented. If it returns\nNotImplemented, the normal algorithm is used. Otherwise, it\noverrides the normal algorithm (and the outcome is cached).", "cmath" => "This module provides access to mathematical functions for complex\nnumbers.", "cmath.acos" => "Return the arc cosine of z.", "cmath.acosh" => "Return the inverse hyperbolic cosine of z.", From f4e76cf9e0f543013f8ef5d444285b84cc546a15 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jun 2026 16:10:30 +0900 Subject: [PATCH 100/339] Bump https://github.com/astral-sh/ruff-pre-commit (#8110) Bumps [https://github.com/astral-sh/ruff-pre-commit](https://github.com/astral-sh/ruff-pre-commit) from v0.15.15 to 0.15.16. - [Release notes](https://github.com/astral-sh/ruff-pre-commit/releases) - [Commits](https://github.com/astral-sh/ruff-pre-commit/compare/v0.15.15...v0.15.16) --- updated-dependencies: - dependency-name: https://github.com/astral-sh/ruff-pre-commit dependency-version: 0.15.16 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index fd879f2ac..39481edaa 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -10,7 +10,7 @@ repos: priority: 0 - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.15.15 + rev: v0.15.16 hooks: - id: ruff-format priority: 0 From 047538e224bb3aea74ccde98b174259e8e380e35 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jun 2026 16:10:45 +0900 Subject: [PATCH 101/339] Bump actions/checkout from 6.0.2 to 6.0.3 (#8111) Bumps [actions/checkout](https://github.com/actions/checkout) from 6.0.2 to 6.0.3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/de0fac2e4500dabe0009e67214ff5f5447ce83dd...df4cb1c069e1874edd31b4311f1884172cec0e10) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: 6.0.3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 24 +++++++++++------------ .github/workflows/cron-ci.yaml | 8 ++++---- .github/workflows/lib-deps-check.yaml | 4 ++-- .github/workflows/release.yml | 6 +++--- .github/workflows/update-caches.yml | 2 +- .github/workflows/update-doc-db.yml | 4 ++-- .github/workflows/update-libs-status.yaml | 4 ++-- .github/workflows/upgrade-pylib.lock.yml | 4 ++-- 8 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 357f7510a..b7597aeff 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -43,7 +43,7 @@ jobs: # Flag that is raised when any rust code is changed. rust_code: ${{ steps.check_rust_code.outputs.changed }} steps: - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: fetch-depth: 0 persist-credentials: false @@ -87,7 +87,7 @@ jobs: os: [macos-latest, ubuntu-latest, windows-2025] fail-fast: false steps: - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: persist-credentials: false @@ -203,7 +203,7 @@ jobs: target: x86_64-apple-darwin fail-fast: false steps: - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: persist-credentials: false @@ -313,7 +313,7 @@ jobs: timeout: 50 fail-fast: false steps: - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: persist-credentials: false @@ -457,7 +457,7 @@ jobs: - ubuntu-latest - windows-latest steps: - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: persist-credentials: false @@ -495,7 +495,7 @@ jobs: needs.determine_changes.outputs.rust_code == 'true' || github.ref == 'refs/heads/main' steps: - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: persist-credentials: false @@ -518,7 +518,7 @@ jobs: pull-requests: write security-events: write # for zizmor steps: - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: persist-credentials: false @@ -558,7 +558,7 @@ jobs: echo "version=${version}" >> "$GITHUB_OUTPUT" - name: Clone CPython - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: repository: python/cpython path: cpython @@ -596,7 +596,7 @@ jobs: env: NIGHTLY_CHANNEL: nightly steps: - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: persist-credentials: false @@ -631,7 +631,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 steps: - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: persist-credentials: false @@ -746,7 +746,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 steps: - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: persist-credentials: false @@ -798,7 +798,7 @@ jobs: name: cargo doc runs-on: ubuntu-latest steps: - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: persist-credentials: false diff --git a/.github/workflows/cron-ci.yaml b/.github/workflows/cron-ci.yaml index 2c0e25882..6165b2046 100644 --- a/.github/workflows/cron-ci.yaml +++ b/.github/workflows/cron-ci.yaml @@ -27,7 +27,7 @@ jobs: env: INSTA_WORKSPACE_ROOT: ${{ github.workspace }} steps: - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: persist-credentials: false @@ -67,7 +67,7 @@ jobs: # Disable this scheduled job when running on a fork. if: ${{ github.repository == 'RustPython/RustPython' || github.event_name != 'schedule' }} steps: - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: persist-credentials: true @@ -105,7 +105,7 @@ jobs: # Disable this scheduled job when running on a fork. if: ${{ github.repository == 'RustPython/RustPython' || github.event_name != 'schedule' }} steps: - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: persist-credentials: true @@ -168,7 +168,7 @@ jobs: # Disable this scheduled job when running on a fork. if: ${{ github.repository == 'RustPython/RustPython' || github.event_name != 'schedule' }} steps: - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: persist-credentials: true diff --git a/.github/workflows/lib-deps-check.yaml b/.github/workflows/lib-deps-check.yaml index 66ecd46d7..e74dd561b 100644 --- a/.github/workflows/lib-deps-check.yaml +++ b/.github/workflows/lib-deps-check.yaml @@ -18,7 +18,7 @@ jobs: timeout-minutes: 10 steps: - name: Checkout base branch - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: # Use base branch for scripts (security: don't run PR code with elevated permissions) ref: ${{ github.event.pull_request.base.ref }} @@ -41,7 +41,7 @@ jobs: echo "version=${version}" >> "$GITHUB_OUTPUT" - name: Checkout CPython - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: repository: python/cpython path: cpython diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index be92c5e47..21a0068cb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -52,7 +52,7 @@ jobs: # target: aarch64-pc-windows-msvc fail-fast: false steps: - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: persist-credentials: false @@ -91,7 +91,7 @@ jobs: permissions: contents: read steps: - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: persist-credentials: false @@ -156,7 +156,7 @@ jobs: permissions: contents: write # for creating a release steps: - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: persist-credentials: false diff --git a/.github/workflows/update-caches.yml b/.github/workflows/update-caches.yml index 392717e5a..fc524fa73 100644 --- a/.github/workflows/update-caches.yml +++ b/.github/workflows/update-caches.yml @@ -39,7 +39,7 @@ jobs: target: "" steps: - name: Checkout RustPython main branch - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: repository: RustPython/RustPython ref: main diff --git a/.github/workflows/update-doc-db.yml b/.github/workflows/update-doc-db.yml index e17307557..a543f428c 100644 --- a/.github/workflows/update-doc-db.yml +++ b/.github/workflows/update-doc-db.yml @@ -30,7 +30,7 @@ jobs: - windows-latest - macos-latest steps: - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: persist-credentials: false sparse-checkout: | @@ -58,7 +58,7 @@ jobs: contents: write pull-requests: write steps: - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: persist-credentials: true ref: ${{ inputs.base-ref }} diff --git a/.github/workflows/update-libs-status.yaml b/.github/workflows/update-libs-status.yaml index db32c7a3e..837586913 100644 --- a/.github/workflows/update-libs-status.yaml +++ b/.github/workflows/update-libs-status.yaml @@ -21,7 +21,7 @@ jobs: if: ${{ github.repository == 'RustPython/RustPython' }} steps: - name: Clone RustPython - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: path: rustpython persist-credentials: false @@ -37,7 +37,7 @@ jobs: echo "version=${version}" >> "$GITHUB_OUTPUT" - name: Clone CPython - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: repository: python/cpython path: cpython diff --git a/.github/workflows/upgrade-pylib.lock.yml b/.github/workflows/upgrade-pylib.lock.yml index aa1ec98e2..1a028f728 100644 --- a/.github/workflows/upgrade-pylib.lock.yml +++ b/.github/workflows/upgrade-pylib.lock.yml @@ -103,7 +103,7 @@ jobs: with: destination: /opt/gh-aw/actions - name: Checkout repository - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: persist-credentials: false - name: Setup Python @@ -1061,7 +1061,7 @@ jobs: path: /tmp/gh-aw/ - name: Checkout repository if: ((!cancelled()) && (needs.agent.result != 'skipped')) && (contains(needs.agent.outputs.output_types, 'create_pull_request')) - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: token: ${{ github.token }} persist-credentials: false From 19943ba24fe7d846afbad9781fe4612d9a65456d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jun 2026 16:10:53 +0900 Subject: [PATCH 102/339] Bump cargo-bins/cargo-binstall from 1.19.1 to 1.20.0 (#8112) Bumps [cargo-bins/cargo-binstall](https://github.com/cargo-bins/cargo-binstall) from 1.19.1 to 1.20.0. - [Release notes](https://github.com/cargo-bins/cargo-binstall/releases) - [Changelog](https://github.com/cargo-bins/cargo-binstall/blob/main/release-plz.toml) - [Commits](https://github.com/cargo-bins/cargo-binstall/compare/aaa84a43aec4955a42c5ffc65d258961e39f276e...30b5ca8b54e1dcffd9548bc87ede1531310fdc67) --- updated-dependencies: - dependency-name: cargo-bins/cargo-binstall dependency-version: 1.20.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b7597aeff..abc2173c6 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -501,7 +501,7 @@ jobs: - uses: dtolnay/rust-toolchain@stable - - uses: cargo-bins/cargo-binstall@aaa84a43aec4955a42c5ffc65d258961e39f276e # v1.19.1 + - uses: cargo-bins/cargo-binstall@30b5ca8b54e1dcffd9548bc87ede1531310fdc67 # v1.20.0 - name: cargo shear run: | From 66559e1c0a05528b75f9da4a700e31ffa91d0e08 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jun 2026 16:11:06 +0900 Subject: [PATCH 103/339] Bump codecov/codecov-action from 6.0.1 to 7.0.0 (#8113) Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 6.0.1 to 7.0.0. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-action/compare/e79a6962e0d4c0c17b229090214935d2e33f8354...fb8b3582c8e4def4969c97caa2f19720cb33a72f) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-version: 7.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/cron-ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cron-ci.yaml b/.github/workflows/cron-ci.yaml index 6165b2046..1a009e1cd 100644 --- a/.github/workflows/cron-ci.yaml +++ b/.github/workflows/cron-ci.yaml @@ -57,7 +57,7 @@ jobs: - name: Upload to Codecov if: ${{ github.event_name != 'pull_request' }} - uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1 + uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0 with: files: ./codecov.lcov From 1a797018d7b1b920314b0f7e1da3b308c228688a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jun 2026 16:11:14 +0900 Subject: [PATCH 104/339] Bump memchr from 2.8.1 to 2.8.2 (#8114) Bumps [memchr](https://github.com/BurntSushi/memchr) from 2.8.1 to 2.8.2. - [Commits](https://github.com/BurntSushi/memchr/compare/2.8.1...2.8.2) --- updated-dependencies: - dependency-name: memchr dependency-version: 2.8.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 93e167358..bf1354fa0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2321,9 +2321,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.8.1" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b947ae49db0d222b1dbc6b113ce7248a3fc3a6ca21b696717bfc000ba4484d8" +checksum = "88904434abc2901f197fe8cc55f0445e7ded921dba5911dad2e2b39b48e663c4" [[package]] name = "memmap2" From 7b2e6a570f05ca606edee7c42135a67855c8f551 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jun 2026 17:11:50 +0900 Subject: [PATCH 105/339] Bump taiki-e/install-action from 2.81.1 to 2.81.8 (#8115) Bumps [taiki-e/install-action](https://github.com/taiki-e/install-action) from 2.81.1 to 2.81.8. - [Release notes](https://github.com/taiki-e/install-action/releases) - [Changelog](https://github.com/taiki-e/install-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/taiki-e/install-action/compare/e49978b799e49ff429d162b7a30601a569ab6538...0631aa6515c7d545823c67cfae7ef4fc7f490154) --- updated-dependencies: - dependency-name: taiki-e/install-action dependency-version: 2.81.8 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/cron-ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cron-ci.yaml b/.github/workflows/cron-ci.yaml index 1a009e1cd..5721a6426 100644 --- a/.github/workflows/cron-ci.yaml +++ b/.github/workflows/cron-ci.yaml @@ -33,7 +33,7 @@ jobs: - uses: dtolnay/rust-toolchain@stable - - uses: taiki-e/install-action@e49978b799e49ff429d162b7a30601a569ab6538 # v2.81.1 + - uses: taiki-e/install-action@0631aa6515c7d545823c67cfae7ef4fc7f490154 # v2.81.8 with: tool: cargo-llvm-cov From 5893c688c9b354a9c9d1da64ab3aeb9b36eea66a Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Tue, 16 Jun 2026 11:15:01 +0300 Subject: [PATCH 106/339] Fix builtin class names not being interned (#8116) --- Lib/test/test_dataclasses/__init__.py | 1 - Lib/test/test_pydoc/test_pydoc.py | 1 - crates/vm/src/builtins/asyncgenerator.rs | 1 + crates/vm/src/function/method.rs | 8 ++++++++ crates/vm/src/function/mod.rs | 2 +- crates/vm/src/types/zoo.rs | 3 +++ 6 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_dataclasses/__init__.py b/Lib/test/test_dataclasses/__init__.py index 1b8c810a7..1a6dc850a 100644 --- a/Lib/test/test_dataclasses/__init__.py +++ b/Lib/test/test_dataclasses/__init__.py @@ -3977,7 +3977,6 @@ class TestSlots(unittest.TestCase): # that we create internally. self.assertEqual(CorrectSuper.args, ["default", "default"]) - @unittest.skip("TODO: RUSTPYTHON; Crash - static type name must be already interned but async_generator_wrapped_value is not") def test_original_class_is_gced(self): # gh-135228: Make sure when we replace the class with slots=True, the original class # gets garbage collected. diff --git a/Lib/test/test_pydoc/test_pydoc.py b/Lib/test/test_pydoc/test_pydoc.py index 066b9b4db..46f8ba60f 100644 --- a/Lib/test/test_pydoc/test_pydoc.py +++ b/Lib/test/test_pydoc/test_pydoc.py @@ -556,7 +556,6 @@ class PydocDocTest(unittest.TestCase): self.assertEqual(stripid("<type 'exceptions.Exception'>"), "<type 'exceptions.Exception'>") - @unittest.skip("TODO: RUSTPYTHON; Panic") def test_builtin_with_more_than_four_children(self): """Tests help on builtin object which have more than four child classes. diff --git a/crates/vm/src/builtins/asyncgenerator.rs b/crates/vm/src/builtins/asyncgenerator.rs index 9edf38c43..dea40062a 100644 --- a/crates/vm/src/builtins/asyncgenerator.rs +++ b/crates/vm/src/builtins/asyncgenerator.rs @@ -818,4 +818,5 @@ pub(crate) fn init(ctx: &'static Context) { PyAsyncGenASend::extend_class(ctx, ctx.types.async_generator_asend); PyAsyncGenAThrow::extend_class(ctx, ctx.types.async_generator_athrow); PyAnextAwaitable::extend_class(ctx, ctx.types.anext_awaitable); + PyAsyncGenWrappedValue::extend_class(ctx, ctx.types.async_generator_wrapped_value); } diff --git a/crates/vm/src/function/method.rs b/crates/vm/src/function/method.rs index ee483e361..12eda50c9 100644 --- a/crates/vm/src/function/method.rs +++ b/crates/vm/src/function/method.rs @@ -5,6 +5,7 @@ use crate::{ builtin_func::{PyNativeFunction, PyNativeMethod}, descriptor::PyMethodDescriptor, }, + class::PyClassDef, function::{IntoPyNativeFn, PyNativeFn}, }; @@ -331,3 +332,10 @@ impl Py<HeapMethodDef> { #[pyclass] impl HeapMethodDef {} + +pub(crate) fn init(ctx: &'static Context) { + // TODO: Should we extend the class instead of interning only the name? + // HeapMethodDef::extend_class(ctx, ctx.types.method_def); + + let _ = ctx.intern_str(HeapMethodDef::NAME); +} diff --git a/crates/vm/src/function/mod.rs b/crates/vm/src/function/mod.rs index 4be94e3f0..7eb87fea3 100644 --- a/crates/vm/src/function/mod.rs +++ b/crates/vm/src/function/mod.rs @@ -5,7 +5,7 @@ mod builtin; mod either; mod fspath; mod getset; -mod method; +pub(crate) mod method; mod number; mod protocol; mod time; diff --git a/crates/vm/src/types/zoo.rs b/crates/vm/src/types/zoo.rs index 0394f672c..13d439345 100644 --- a/crates/vm/src/types/zoo.rs +++ b/crates/vm/src/types/zoo.rs @@ -266,5 +266,8 @@ impl TypeZoo { template::init(context); descriptor::init(context); crate::stdlib::_typing::init(context); + + // RustPython specific + crate::function::method::init(context); } } From 47d13480c65a3680abd0d18d9385411cca673d01 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jun 2026 22:37:10 +0900 Subject: [PATCH 107/339] Bump launch-editor from 2.10.0 to 2.14.1 in /wasm/demo (#8119) Bumps [launch-editor](https://github.com/vitejs/launch-editor) from 2.10.0 to 2.14.1. - [Commits](https://github.com/vitejs/launch-editor/compare/v2.10.0...v2.14.1) --- updated-dependencies: - dependency-name: launch-editor dependency-version: 2.14.1 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- wasm/demo/package-lock.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/wasm/demo/package-lock.json b/wasm/demo/package-lock.json index c0ecfc83f..21385a868 100644 --- a/wasm/demo/package-lock.json +++ b/wasm/demo/package-lock.json @@ -3440,14 +3440,14 @@ } }, "node_modules/launch-editor": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.10.0.tgz", - "integrity": "sha512-D7dBRJo/qcGX9xlvt/6wUYzQxjh5G1RvZPgPv8vi4KRU99DVQL/oW7tnVOCCTm2HGeo3C5HvGE5Yrh6UBoZ0vA==", + "version": "2.14.1", + "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.14.1.tgz", + "integrity": "sha512-QWBrQsMpH7gPr965dsKD/3cKWiNoTjpATQf++Xq63N6sKRGMwlVXz41O1IZTMfZQgBctD/K5Zt06+/I6pP6+HA==", "dev": true, "license": "MIT", "dependencies": { - "picocolors": "^1.0.0", - "shell-quote": "^1.8.1" + "picocolors": "^1.1.1", + "shell-quote": "^1.8.4" } }, "node_modules/loader-runner": { From 40197480e983454d11c6f31185449bf48573815f Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Tue, 16 Jun 2026 16:38:01 +0300 Subject: [PATCH 108/339] Use KwArgs newtype struct (#8120) --- crates/vm/src/frame.rs | 16 ++--- crates/vm/src/function/argument.rs | 100 ++++++++++++++++------------- crates/vm/src/stdlib/_operator.rs | 4 +- 3 files changed, 65 insertions(+), 55 deletions(-) diff --git a/crates/vm/src/frame.rs b/crates/vm/src/frame.rs index 92cae41a0..fe0078718 100644 --- a/crates/vm/src/frame.rs +++ b/crates/vm/src/frame.rs @@ -26,7 +26,7 @@ use crate::{ convert::{ToPyObject, ToPyResult}, coroutine::Coro, exceptions::ExceptionCtor, - function::{ArgMapping, Either, FuncArgs, PyMethodFlags}, + function::{ArgMapping, Either, FuncArgs, KwArgs, PyMethodFlags}, object::PyAtomicBorrow, object::{Traverse, TraverseFn}, protocol::{PyIter, PyIterReturn, PyMapping}, @@ -42,7 +42,6 @@ use core::cell::UnsafeCell; use core::sync::atomic; use core::sync::atomic::AtomicPtr; use core::sync::atomic::Ordering::{Acquire, Relaxed}; -use indexmap::IndexMap; use itertools::Itertools; use malachite_bigint::BigInt; use num_traits::Zero; @@ -6460,7 +6459,7 @@ impl ExecutingFrame<'_> { fn collect_positional_args(&mut self, nargs: u32) -> FuncArgs { FuncArgs { args: self.pop_multiple(nargs as usize).collect(), - kwargs: IndexMap::new(), + ..Default::default() } } @@ -6483,9 +6482,8 @@ impl ExecutingFrame<'_> { fn collect_ex_args(&mut self, vm: &VirtualMachine) -> PyResult<FuncArgs> { let kwargs_or_null = self.pop_value_opt(); - let kwargs = if let Some(kw_obj) = kwargs_or_null { - let mut kwargs = IndexMap::new(); - + let mut kwargs = KwArgs::default(); + if let Some(kw_obj) = kwargs_or_null { // Stack: [callable, self_or_null, args_tuple] let callable = self.nth_value(2); let func_str = Self::object_function_str(callable, vm); @@ -6497,11 +6495,9 @@ impl ExecutingFrame<'_> { let value = kw_obj.get_item(&*key, vm)?; kwargs.insert(key_str.as_str().to_owned(), value); Ok(()) - })?; - kwargs - } else { - IndexMap::new() + })? }; + let args_obj = self.pop_value(); let args = if let Some(tuple) = args_obj.downcast_ref::<PyTuple>() { tuple.as_slice().to_vec() diff --git a/crates/vm/src/function/argument.rs b/crates/vm/src/function/argument.rs index 40408531c..c37475ba4 100644 --- a/crates/vm/src/function/argument.rs +++ b/crates/vm/src/function/argument.rs @@ -4,7 +4,7 @@ use crate::{ convert::ToPyObject, object::{Traverse, TraverseFn}, }; -use core::ops::RangeInclusive; +use core::ops::{Deref, DerefMut, RangeInclusive}; use indexmap::IndexMap; use itertools::Itertools; @@ -60,20 +60,14 @@ into_func_args_from_tuple!((v1, T1), (v2, T2), (v3, T3), (v4, T4), (v5, T5), (v6 // The number of limitation came from: // https://rust-lang.github.io/rust-clippy/master/index.html#too_many_arguments -/// The `FuncArgs` struct is one of the most used structs then creating +/// The `FuncArgs` struct is one of the most used structs when creating /// a rust function that can be called from python. It holds both positional /// arguments, as well as keyword arguments passed to the function. #[derive(Debug, Default, Clone, Traverse)] pub struct FuncArgs { pub args: Vec<PyObjectRef>, // sorted map, according to https://www.python.org/dev/peps/pep-0468/ - pub kwargs: IndexMap<String, PyObjectRef>, -} - -unsafe impl Traverse for IndexMap<String, PyObjectRef> { - fn traverse(&self, tracer_fn: &mut TraverseFn<'_>) { - self.values().for_each(|v| v.traverse(tracer_fn)); - } + pub kwargs: KwArgs, } /// Conversion from vector of python objects to function arguments. @@ -84,7 +78,7 @@ where fn from(args: A) -> Self { Self { args: args.into().into_vec(), - kwargs: IndexMap::new(), + ..Default::default() } } } @@ -92,8 +86,8 @@ where impl From<KwArgs> for FuncArgs { fn from(kwargs: KwArgs) -> Self { Self { - args: Vec::new(), - kwargs: kwargs.0, + kwargs, + ..Default::default() } } } @@ -111,8 +105,10 @@ impl FuncArgs { K: Into<KwArgs>, { let PosArgs(args) = args.into(); - let KwArgs(kwargs) = kwargs.into(); - Self { args, kwargs } + Self { + args, + kwargs: kwargs.into(), + } } pub fn with_kwargs_names<A, KW>(mut args: A, kwarg_names: KW) -> Self @@ -127,7 +123,7 @@ impl FuncArgs { let pos_args = args.by_ref().take(pos_arg_count).collect(); - let kwargs = kwarg_names.zip_eq(args).collect::<IndexMap<_, _>>(); + let kwargs = kwarg_names.zip_eq(args).collect(); Self { args: pos_args, @@ -147,8 +143,10 @@ impl FuncArgs { ) -> Self { debug_assert!(nargs <= args.len()); debug_assert!(kwnames.is_none_or(|kw| nargs + kw.len() <= args.len())); + let pos_args = args[..nargs].to_vec(); - let kwargs = if let Some(names) = kwnames { + + let kwargs = kwnames.map_or_else(KwArgs::default, |names| { names .iter() .zip(&args[nargs..nargs + names.len()]) @@ -161,9 +159,8 @@ impl FuncArgs { (key, val.clone()) }) .collect() - } else { - IndexMap::new() - }; + }); + Self { args: pos_args, kwargs, @@ -179,7 +176,7 @@ impl FuncArgs { ) -> Self { debug_assert!(nargs <= args.len()); debug_assert!(kwnames.is_none_or(|kw| nargs + kw.len() <= args.len())); - let kwargs = if let Some(names) = kwnames { + let kwargs = kwnames.map_or_else(KwArgs::default, |names| { let kw_count = names.len(); names .iter() @@ -193,9 +190,8 @@ impl FuncArgs { (key, val) }) .collect() - } else { - IndexMap::new() - }; + }); + args.truncate(nargs); Self { args, kwargs } } @@ -404,15 +400,35 @@ impl<T: TryFromObject> FromArgOptional for T { /// KwArgs is only for functions that accept arbitrary keyword arguments. For /// functions that accept only *specific* named arguments, a rust struct with /// an appropriate FromArgs implementation must be created. -#[derive(Clone)] +#[derive(Clone, Debug)] pub struct KwArgs<T = PyObjectRef>(IndexMap<String, T>); +impl<T> Default for KwArgs<T> { + fn default() -> Self { + Self(IndexMap::new()) + } +} + +impl<T> Deref for KwArgs<T> { + type Target = IndexMap<String, T>; + + fn deref(&self) -> &Self::Target { + &self.0 + } +} + +impl<T> DerefMut for KwArgs<T> { + fn deref_mut(&mut self) -> &mut Self::Target { + &mut self.0 + } +} + unsafe impl<T> Traverse for KwArgs<T> where T: Traverse, { fn traverse(&self, tracer_fn: &mut TraverseFn<'_>) { - self.0.iter().map(|(_, v)| v.traverse(tracer_fn)).count(); + self.values().for_each(|v| v.traverse(tracer_fn)); } } @@ -423,12 +439,7 @@ impl<T> KwArgs<T> { } pub fn pop_kwarg(&mut self, name: &str) -> Option<T> { - self.0.swap_remove(name) - } - - #[must_use] - pub fn is_empty(self) -> bool { - self.0.is_empty() + self.swap_remove(name) } } @@ -438,9 +449,21 @@ impl<T> FromIterator<(String, T)> for KwArgs<T> { } } -impl<T> Default for KwArgs<T> { - fn default() -> Self { - Self(IndexMap::new()) +impl<'a, T> IntoIterator for &'a KwArgs<T> { + type Item = (&'a String, &'a T); + type IntoIter = indexmap::map::Iter<'a, String, T>; + + fn into_iter(self) -> Self::IntoIter { + self.0.iter() + } +} + +impl<T> IntoIterator for KwArgs<T> { + type Item = (String, T); + type IntoIter = indexmap::map::IntoIter<String, T>; + + fn into_iter(self) -> Self::IntoIter { + self.0.into_iter() } } @@ -457,15 +480,6 @@ where } } -impl<T> IntoIterator for KwArgs<T> { - type Item = (String, T); - type IntoIter = indexmap::map::IntoIter<String, T>; - - fn into_iter(self) -> Self::IntoIter { - self.0.into_iter() - } -} - /// A list of positional argument values. /// /// A built-in function with a `PosArgs` parameter is analogous to a Python diff --git a/crates/vm/src/stdlib/_operator.rs b/crates/vm/src/stdlib/_operator.rs index 6d7de468b..e4db04605 100644 --- a/crates/vm/src/stdlib/_operator.rs +++ b/crates/vm/src/stdlib/_operator.rs @@ -6,7 +6,7 @@ mod _operator { AsObject, Py, PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine, builtins::{PyInt, PyIntRef, PyStr, PyStrRef, PyTupleRef, PyType, PyTypeRef, PyUtf8StrRef}, common::wtf8::{Wtf8, Wtf8Buf}, - function::{ArgBytesLike, Either, FuncArgs, KwArgs, OptionalArg}, + function::{ArgBytesLike, Either, FuncArgs, OptionalArg}, protocol::PyIter, recursion::ReprGuard, types::{Callable, Constructor, PyComparisonOp, Representable}, @@ -564,7 +564,7 @@ mod _operator { let partial = vm.import("functools", 0)?.get_attr("partial", vm)?; let args = FuncArgs::new( vec![zelf.class().to_owned().into(), zelf.name.clone().into()], - KwArgs::new(zelf.args.kwargs.clone()), + zelf.args.kwargs.clone(), ); let callable = partial.call(args, vm)?; Ok(vm.new_tuple((callable, vm.ctx.new_tuple(zelf.args.args.clone())))) From 697a441e7072024142aacf640eae49bb4ade9a57 Mon Sep 17 00:00:00 2001 From: Joshua Megnauth <48846352+joshuamegnauth54@users.noreply.github.com> Date: Wed, 17 Jun 2026 00:24:01 -0400 Subject: [PATCH 109/339] host_env: `renameat` support for `os.rename` (#8118) Python's `os.rename` supports renaming a path relative to a directory descriptor - essentially, `renameat`. The syscall and its Rustix wrapper does all of the work, so this patch mainly updates the Python signature to forward to the implementation. As of this patch, `os.rename` is still incorrect for Windows because it always replaces the destination file. I added a small note for future contributors (or myself, since I might tackle it) as a reminder of what's broken. --- crates/host_env/src/os.rs | 33 +++++++++++++++++++++++++++++++-- crates/vm/src/stdlib/os.rs | 31 +++++++++++++++++++++++++------ 2 files changed, 56 insertions(+), 8 deletions(-) diff --git a/crates/host_env/src/os.rs b/crates/host_env/src/os.rs index b1d398faa..bd2a5acb9 100644 --- a/crates/host_env/src/os.rs +++ b/crates/host_env/src/os.rs @@ -1,7 +1,6 @@ // spell-checker:disable // TODO: we can move more os-specific bindings/interfaces from stdlib::{os, posix, nt} to here -#[cfg(any(unix, windows, target_os = "wasi"))] use crate::crt_fd; #[cfg(windows)] use crate::fs; @@ -10,6 +9,8 @@ use core::ffi::CStr; use core::str::Utf8Error; #[cfg(windows)] use core::time::Duration; +#[cfg(unix)] +use rustix::fd::AsFd; use std::{ env, ffi::{OsStr, OsString}, @@ -266,11 +267,39 @@ pub fn copy_file_range( rustix::fs::copy_file_range(src, offset_src, dst, offset_dst, count) } +#[cfg(not(unix))] pub fn rename( from: impl AsRef<std::path::Path>, + from_fd: Option<crt_fd::Borrowed<'_>>, to: impl AsRef<std::path::Path>, + to_fd: Option<crt_fd::Borrowed<'_>>, ) -> io::Result<()> { - std::fs::rename(from, to) + if from_fd.is_none() && to_fd.is_none() { + // TODO: Rust's implementation always overwrites the file so ensure consistency between + // operating systems. We need to use windows-sys directly to distinguish between + // os.rename and os.replace. + std::fs::rename(from, to) + } else { + core::hint::cold_path(); + Err(io::Error::new( + io::ErrorKind::Unsupported, + "renameat is not available on this platform", + )) + } +} + +#[cfg(unix)] +pub fn rename( + from: impl AsRef<std::path::Path>, + from_fd: Option<crt_fd::Borrowed<'_>>, + to: impl AsRef<std::path::Path>, + to_fd: Option<crt_fd::Borrowed<'_>>, +) -> io::Result<()> { + let from = from.as_ref(); + let from_fd = from_fd.as_ref().map_or(rustix::fs::CWD, AsFd::as_fd); + let to = to.as_ref(); + let to_fd = to_fd.as_ref().map_or(rustix::fs::CWD, AsFd::as_fd); + rustix::fs::renameat(from_fd, from, to_fd, to).map_err(Into::into) } #[cfg(windows)] diff --git a/crates/vm/src/stdlib/os.rs b/crates/vm/src/stdlib/os.rs index d6f6a181a..4a1cbe2ae 100644 --- a/crates/vm/src/stdlib/os.rs +++ b/crates/vm/src/stdlib/os.rs @@ -189,6 +189,7 @@ pub(super) mod _os { const UTIME_DIR_FD: bool = cfg!(not(any(windows, target_os = "redox"))); pub(crate) const SYMLINK_DIR_FD: bool = cfg!(not(any(windows, target_os = "redox"))); pub(crate) const UNLINK_DIR_FD: bool = cfg!(not(any(windows, target_os = "redox"))); + const RENAME_DIR_FD: bool = cfg!(unix); const RMDIR_DIR_FD: bool = cfg!(not(any(windows, target_os = "redox"))); const SCANDIR_FD: bool = cfg!(all(unix, not(target_os = "redox"))); @@ -1377,19 +1378,37 @@ pub(super) mod _os { FsPath::try_from_path_like(path, false, vm) } + #[derive(FromArgs)] + struct RenameArgs<'fd> { + #[pyarg(positional)] + src: PyObjectRef, + #[pyarg(positional)] + dst: PyObjectRef, + #[pyarg(any, default)] + src_dir_fd: OptionalArg<crt_fd::Borrowed<'fd>>, + #[pyarg(any, default)] + dst_dir_fd: OptionalArg<crt_fd::Borrowed<'fd>>, + } + #[pyfunction] #[pyfunction(name = "replace")] - fn rename(src: PyObjectRef, dst: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> { + fn rename(args: RenameArgs<'_>, vm: &VirtualMachine) -> PyResult<()> { let src = PathConverter::new() .function("rename") .argument("src") - .try_path(src, vm)?; + .try_path(args.src, vm)?; let dst = PathConverter::new() .function("rename") .argument("dst") - .try_path(dst, vm)?; + .try_path(args.dst, vm)?; - crate::host_env::os::rename(&src.path, &dst.path).map_err(|err| { + crate::host_env::os::rename( + &src, + args.src_dir_fd.into_option(), + &dst, + args.dst_dir_fd.into_option(), + ) + .map_err(|err| { let builder = err.to_os_error_builder(vm); let builder = builder.filename(src.filename(vm)); let builder = builder.filename2(dst.filename(vm)); @@ -1932,8 +1951,8 @@ pub(super) mod _os { SupportFunc::new("readlink", Some(false), None, Some(false)), SupportFunc::new("remove", Some(false), Some(UNLINK_DIR_FD), Some(false)), SupportFunc::new("unlink", Some(false), Some(UNLINK_DIR_FD), Some(false)), - SupportFunc::new("rename", Some(false), None, Some(false)), - SupportFunc::new("replace", Some(false), None, Some(false)), // TODO: Fix replace + SupportFunc::new("rename", Some(false), Some(RENAME_DIR_FD), Some(false)), + SupportFunc::new("replace", Some(false), Some(RENAME_DIR_FD), Some(false)), // TODO: Fix replace SupportFunc::new("rmdir", Some(false), Some(RMDIR_DIR_FD), Some(false)), SupportFunc::new("scandir", Some(SCANDIR_FD), Some(false), Some(false)), SupportFunc::new("stat", Some(true), Some(STAT_DIR_FD), Some(true)), From 11da0b42c32c3a7fc3ac743f8d7f4c4996ded815 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Wed, 17 Jun 2026 07:24:36 +0300 Subject: [PATCH 110/339] clippy `enum_glob_use` (#8121) --- Cargo.toml | 1 + crates/codegen/src/compile.rs | 33 +++++++-- crates/codegen/src/symboltable.rs | 19 ++--- crates/common/src/cformat.rs | 65 ++++++++-------- crates/common/src/str.rs | 7 +- crates/compiler-core/src/bytecode.rs | 107 +++++++++++++-------------- crates/compiler-core/src/marshal.rs | 59 ++++++++------- crates/derive-impl/src/pyclass.rs | 19 ++--- crates/derive-impl/src/util.rs | 21 +++--- crates/stdlib/src/array.rs | 23 +++--- crates/stdlib/src/binascii.rs | 17 +++-- crates/stdlib/src/unicodedata.rs | 18 ++--- crates/vm/src/buffer.rs | 79 ++++++++++---------- crates/vm/src/builtins/dict.rs | 14 ++-- crates/vm/src/builtins/float.rs | 8 +- crates/vm/src/codecs.rs | 40 +++++----- crates/vm/src/protocol/callable.rs | 17 ++--- crates/vm/src/stdlib/_imp.rs | 17 +++-- crates/vm/src/stdlib/marshal.rs | 38 +++++----- crates/vm/src/stdlib/winsound.rs | 20 +++-- 20 files changed, 319 insertions(+), 303 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 81bbdebeb..76ba350d1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -387,6 +387,7 @@ cloned_instead_of_copied = "warn" collapsible_else_if = "warn" comparison_chain = "warn" duration_suboptimal_units = "warn" +enum_glob_use = "warn" explicit_deref_methods = "warn" explicit_into_iter_loop = "warn" explicit_iter_loop = "warn" diff --git a/crates/codegen/src/compile.rs b/crates/codegen/src/compile.rs index c3b86ce46..797ef891d 100644 --- a/crates/codegen/src/compile.rs +++ b/crates/codegen/src/compile.rs @@ -7005,23 +7005,42 @@ impl Compiler { /// [CPython `compiler_addcompare`](https://github.com/python/cpython/blob/627894459a84be3488a1789919679c997056a03c/Python/compile.c#L2880-L2924) fn compile_addcompare(&mut self, op: &ast::CmpOp) { - use bytecode::ComparisonOperator::*; match op { - ast::CmpOp::Eq => emit!(self, Instruction::CompareOp { opname: Equal }), - ast::CmpOp::NotEq => emit!(self, Instruction::CompareOp { opname: NotEqual }), - ast::CmpOp::Lt => emit!(self, Instruction::CompareOp { opname: Less }), + ast::CmpOp::Eq => emit!( + self, + Instruction::CompareOp { + opname: ComparisonOperator::Equal + } + ), + ast::CmpOp::NotEq => emit!( + self, + Instruction::CompareOp { + opname: ComparisonOperator::NotEqual + } + ), + ast::CmpOp::Lt => emit!( + self, + Instruction::CompareOp { + opname: ComparisonOperator::Less + } + ), ast::CmpOp::LtE => emit!( self, Instruction::CompareOp { - opname: LessOrEqual + opname: ComparisonOperator::LessOrEqual + } + ), + ast::CmpOp::Gt => emit!( + self, + Instruction::CompareOp { + opname: ComparisonOperator::Greater } ), - ast::CmpOp::Gt => emit!(self, Instruction::CompareOp { opname: Greater }), ast::CmpOp::GtE => { emit!( self, Instruction::CompareOp { - opname: GreaterOrEqual + opname: ComparisonOperator::GreaterOrEqual } ) } diff --git a/crates/codegen/src/symboltable.rs b/crates/codegen/src/symboltable.rs index 10144597f..cd9ee4f0a 100644 --- a/crates/codegen/src/symboltable.rs +++ b/crates/codegen/src/symboltable.rs @@ -2568,16 +2568,15 @@ impl SymbolTableBuilder { } fn scan_pattern(&mut self, pattern: &ast::Pattern) -> SymbolTableResult { - use ast::Pattern::*; match pattern { - MatchValue(ast::PatternMatchValue { value, .. }) => { + ast::Pattern::MatchValue(ast::PatternMatchValue { value, .. }) => { self.scan_expression(value, ExpressionContext::Load)? } - MatchSingleton(_) => {} - MatchSequence(ast::PatternMatchSequence { patterns, .. }) => { + ast::Pattern::MatchSingleton(_) => {} + ast::Pattern::MatchSequence(ast::PatternMatchSequence { patterns, .. }) => { self.scan_patterns(patterns)? } - MatchMapping(ast::PatternMatchMapping { + ast::Pattern::MatchMapping(ast::PatternMatchMapping { keys, patterns, rest, @@ -2589,19 +2588,19 @@ impl SymbolTableBuilder { self.register_ident(rest, SymbolUsage::Assigned)?; } } - MatchClass(ast::PatternMatchClass { cls, arguments, .. }) => { + ast::Pattern::MatchClass(ast::PatternMatchClass { cls, arguments, .. }) => { self.scan_expression(cls, ExpressionContext::Load)?; self.scan_patterns(&arguments.patterns)?; for kw in &arguments.keywords { self.scan_pattern(&kw.pattern)?; } } - MatchStar(ast::PatternMatchStar { name, .. }) => { + ast::Pattern::MatchStar(ast::PatternMatchStar { name, .. }) => { if let Some(name) = name { self.register_ident(name, SymbolUsage::Assigned)?; } } - MatchAs(ast::PatternMatchAs { pattern, name, .. }) => { + ast::Pattern::MatchAs(ast::PatternMatchAs { pattern, name, .. }) => { if let Some(pattern) = pattern { self.scan_pattern(pattern)?; } @@ -2609,7 +2608,9 @@ impl SymbolTableBuilder { self.register_ident(name, SymbolUsage::Assigned)?; } } - MatchOr(ast::PatternMatchOr { patterns, .. }) => self.scan_patterns(patterns)?, + ast::Pattern::MatchOr(ast::PatternMatchOr { patterns, .. }) => { + self.scan_patterns(patterns)? + } } Ok(()) } diff --git a/crates/common/src/cformat.rs b/crates/common/src/cformat.rs index 373fdebe1..d71b0a09a 100644 --- a/crates/common/src/cformat.rs +++ b/crates/common/src/cformat.rs @@ -35,18 +35,17 @@ pub struct CFormatError { impl fmt::Display for CFormatError { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - use CFormatErrorType::*; match self.typ { - UnmatchedKeyParentheses => write!(f, "incomplete format key"), - IncompleteFormat => write!(f, "incomplete format"), - UnsupportedFormatChar(c) => write!( + CFormatErrorType::UnmatchedKeyParentheses => write!(f, "incomplete format key"), + CFormatErrorType::IncompleteFormat => write!(f, "incomplete format"), + CFormatErrorType::UnsupportedFormatChar(c) => write!( f, "unsupported format character '{}' ({:#x}) at index {}", c, c.to_u32(), self.index ), - IntTooBig => write!(f, "width/precision too big"), + CFormatErrorType::IntTooBig => write!(f, "width/precision too big"), _ => write!(f, "unexpected error parsing format string"), } } @@ -78,11 +77,9 @@ pub enum CFloatType { impl CFloatType { const fn case(self) -> Case { - use CFloatType::*; - match self { - ExponentLower | PointDecimalLower | GeneralLower => Case::Lower, - ExponentUpper | PointDecimalUpper | GeneralUpper => Case::Upper, + Self::ExponentLower | Self::PointDecimalLower | Self::GeneralLower => Case::Lower, + Self::ExponentUpper | Self::PointDecimalUpper | Self::GeneralUpper => Case::Upper, } } } @@ -443,16 +440,16 @@ impl CFormatSpec { #[must_use] pub fn format_number(&self, num: &BigInt) -> String { - use CNumberType::*; let CFormatType::Number(format_type) = self.format_type else { unreachable!() }; + let magnitude = num.abs(); let prefix = if self.flags.contains(CConversionFlags::ALTERNATE_FORM) { match format_type { - Octal => "0o", - HexLower => "0x", - HexUpper => "0X", + CNumberType::Octal => "0o", + CNumberType::HexLower => "0x", + CNumberType::HexUpper => "0X", _ => "", } } else { @@ -460,10 +457,12 @@ impl CFormatSpec { }; let magnitude_string: String = match format_type { - DecimalD | DecimalI | DecimalU => magnitude.to_str_radix(10), - Octal => magnitude.to_str_radix(8), - HexLower => magnitude.to_str_radix(16), - HexUpper => { + CNumberType::DecimalD | CNumberType::DecimalI | CNumberType::DecimalU => { + magnitude.to_str_radix(10) + } + CNumberType::Octal => magnitude.to_str_radix(8), + CNumberType::HexLower => magnitude.to_str_radix(16), + CNumberType::HexUpper => { let mut result = magnitude.to_str_radix(16); result.make_ascii_uppercase(); result @@ -621,35 +620,33 @@ where C: FormatChar, I: Iterator<Item = C>, { - use CFloatType::*; - use CNumberType::*; let (index, c) = iter.next().ok_or_else(|| { ( CFormatErrorType::IncompleteFormat, iter.peek().map_or(0, |x| x.0), ) })?; - let format_type = match c.to_char_lossy() { - 'd' => CFormatType::Number(DecimalD), - 'i' => CFormatType::Number(DecimalI), - 'u' => CFormatType::Number(DecimalU), - 'o' => CFormatType::Number(Octal), - 'x' => CFormatType::Number(HexLower), - 'X' => CFormatType::Number(HexUpper), - 'e' => CFormatType::Float(ExponentLower), - 'E' => CFormatType::Float(ExponentUpper), - 'f' => CFormatType::Float(PointDecimalLower), - 'F' => CFormatType::Float(PointDecimalUpper), - 'g' => CFormatType::Float(GeneralLower), - 'G' => CFormatType::Float(GeneralUpper), + + Ok(match c.to_char_lossy() { + 'd' => CFormatType::Number(CNumberType::DecimalD), + 'i' => CFormatType::Number(CNumberType::DecimalI), + 'u' => CFormatType::Number(CNumberType::DecimalU), + 'o' => CFormatType::Number(CNumberType::Octal), + 'x' => CFormatType::Number(CNumberType::HexLower), + 'X' => CFormatType::Number(CNumberType::HexUpper), + 'e' => CFormatType::Float(CFloatType::ExponentLower), + 'E' => CFormatType::Float(CFloatType::ExponentUpper), + 'f' => CFormatType::Float(CFloatType::PointDecimalLower), + 'F' => CFormatType::Float(CFloatType::PointDecimalUpper), + 'g' => CFormatType::Float(CFloatType::GeneralLower), + 'G' => CFormatType::Float(CFloatType::GeneralUpper), 'c' => CFormatType::Character(CCharacterType::Character), 'r' => CFormatType::String(CFormatConversion::Repr), 's' => CFormatType::String(CFormatConversion::Str), 'b' => CFormatType::String(CFormatConversion::Bytes), 'a' => CFormatType::String(CFormatConversion::Ascii), _ => return Err((CFormatErrorType::UnsupportedFormatChar(c.into()), index)), - }; - Ok(format_type) + }) } fn parse_quantity<C, I>(iter: &mut ParseIter<I>) -> Result<Option<CFormatQuantity>, ParsingError> diff --git a/crates/common/src/str.rs b/crates/common/src/str.rs index 3fddef04b..c006a5f4d 100644 --- a/crates/common/src/str.rs +++ b/crates/common/src/str.rs @@ -25,11 +25,10 @@ impl core::ops::BitOr for StrKind { type Output = Self; fn bitor(self, other: Self) -> Self { - use StrKind::*; match (self, other) { - (Wtf8, _) | (_, Wtf8) => Wtf8, - (Utf8, _) | (_, Utf8) => Utf8, - (Ascii, Ascii) => Ascii, + (Self::Wtf8, _) | (_, Self::Wtf8) => Self::Wtf8, + (Self::Utf8, _) | (_, Self::Utf8) => Self::Utf8, + (Self::Ascii, Self::Ascii) => Self::Ascii, } } } diff --git a/crates/compiler-core/src/bytecode.rs b/crates/compiler-core/src/bytecode.rs index 5872c0ffb..e5ef24815 100644 --- a/crates/compiler-core/src/bytecode.rs +++ b/crates/compiler-core/src/bytecode.rs @@ -293,21 +293,19 @@ impl Constant for ConstantData { type Name = String; fn borrow_constant(&self) -> BorrowedConstant<'_, Self> { - use BorrowedConstant::*; - match self { - Self::Integer { value } => Integer { value }, - Self::Float { value } => Float { value: *value }, - Self::Complex { value } => Complex { value: *value }, - Self::Boolean { value } => Boolean { value: *value }, - Self::Str { value } => Str { value }, - Self::Bytes { value } => Bytes { value }, - Self::Code { code } => Code { code }, - Self::Tuple { elements } => Tuple { elements }, - Self::Slice { elements } => Slice { elements }, - Self::Frozenset { elements } => Frozenset { elements }, - Self::None => None, - Self::Ellipsis => Ellipsis, + Self::Integer { value } => BorrowedConstant::Integer { value }, + Self::Float { value } => BorrowedConstant::Float { value: *value }, + Self::Complex { value } => BorrowedConstant::Complex { value: *value }, + Self::Boolean { value } => BorrowedConstant::Boolean { value: *value }, + Self::Str { value } => BorrowedConstant::Str { value }, + Self::Bytes { value } => BorrowedConstant::Bytes { value }, + Self::Code { code } => BorrowedConstant::Code { code }, + Self::Tuple { elements } => BorrowedConstant::Tuple { elements }, + Self::Slice { elements } => BorrowedConstant::Slice { elements }, + Self::Frozenset { elements } => BorrowedConstant::Frozenset { elements }, + Self::None => BorrowedConstant::None, + Self::Ellipsis => BorrowedConstant::Ellipsis, } } } @@ -913,23 +911,23 @@ pub enum ConstantData { impl PartialEq for ConstantData { fn eq(&self, other: &Self) -> bool { - use ConstantData::*; - match (self, other) { - (Integer { value: a }, Integer { value: b }) => a == b, - (Float { value: a }, Float { value: b }) => a.to_bits() == b.to_bits(), - (Complex { value: a }, Complex { value: b }) => { + (Self::Integer { value: a }, Self::Integer { value: b }) => a == b, + (Self::Float { value: a }, Self::Float { value: b }) => a.to_bits() == b.to_bits(), + (Self::Complex { value: a }, Self::Complex { value: b }) => { a.re.to_bits() == b.re.to_bits() && a.im.to_bits() == b.im.to_bits() } - (Boolean { value: a }, Boolean { value: b }) => a == b, - (Str { value: a }, Str { value: b }) => a == b, - (Bytes { value: a }, Bytes { value: b }) => a == b, - (Code { code: a }, Code { code: b }) => core::ptr::eq(a.as_ref(), b.as_ref()), - (Tuple { elements: a }, Tuple { elements: b }) => a == b, - (Slice { elements: a }, Slice { elements: b }) => a == b, - (Frozenset { elements: a }, Frozenset { elements: b }) => a == b, - (None, None) => true, - (Ellipsis, Ellipsis) => true, + (Self::Boolean { value: a }, Self::Boolean { value: b }) => a == b, + (Self::Str { value: a }, Self::Str { value: b }) => a == b, + (Self::Bytes { value: a }, Self::Bytes { value: b }) => a == b, + (Self::Code { code: a }, Self::Code { code: b }) => { + core::ptr::eq(a.as_ref(), b.as_ref()) + } + (Self::Tuple { elements: a }, Self::Tuple { elements: b }) => a == b, + (Self::Slice { elements: a }, Self::Slice { elements: b }) => a == b, + (Self::Frozenset { elements: a }, Self::Frozenset { elements: b }) => a == b, + (Self::None, Self::None) => true, + (Self::Ellipsis, Self::Ellipsis) => true, _ => false, } } @@ -939,25 +937,24 @@ impl Eq for ConstantData {} impl hash::Hash for ConstantData { fn hash<H: hash::Hasher>(&self, state: &mut H) { - use ConstantData::*; - mem::discriminant(self).hash(state); + match self { - Integer { value } => value.hash(state), - Float { value } => value.to_bits().hash(state), - Complex { value } => { + Self::Integer { value } => value.hash(state), + Self::Float { value } => value.to_bits().hash(state), + Self::Complex { value } => { value.re.to_bits().hash(state); value.im.to_bits().hash(state); } - Boolean { value } => value.hash(state), - Str { value } => value.hash(state), - Bytes { value } => value.hash(state), - Code { code } => core::ptr::hash(code.as_ref(), state), - Tuple { elements } => elements.hash(state), - Slice { elements } => elements.hash(state), - Frozenset { elements } => elements.hash(state), - None => {} - Ellipsis => {} + Self::Boolean { value } => value.hash(state), + Self::Str { value } => value.hash(state), + Self::Bytes { value } => value.hash(state), + Self::Code { code } => core::ptr::hash(code.as_ref(), state), + Self::Tuple { elements } => elements.hash(state), + Self::Slice { elements } => elements.hash(state), + Self::Frozenset { elements } => elements.hash(state), + Self::None => {} + Self::Ellipsis => {} } } } @@ -1040,41 +1037,39 @@ impl<C: Constant> BorrowedConstant<'_, C> { #[must_use] pub fn to_owned(self) -> ConstantData { - use ConstantData::*; - match self { - BorrowedConstant::Integer { value } => Integer { + BorrowedConstant::Integer { value } => ConstantData::Integer { value: value.clone(), }, - BorrowedConstant::Float { value } => Float { value }, - BorrowedConstant::Complex { value } => Complex { value }, - BorrowedConstant::Boolean { value } => Boolean { value }, - BorrowedConstant::Str { value } => Str { + BorrowedConstant::Float { value } => ConstantData::Float { value }, + BorrowedConstant::Complex { value } => ConstantData::Complex { value }, + BorrowedConstant::Boolean { value } => ConstantData::Boolean { value }, + BorrowedConstant::Str { value } => ConstantData::Str { value: value.to_owned(), }, - BorrowedConstant::Bytes { value } => Bytes { + BorrowedConstant::Bytes { value } => ConstantData::Bytes { value: value.to_owned(), }, - BorrowedConstant::Code { code } => Code { + BorrowedConstant::Code { code } => ConstantData::Code { code: Box::new(code.map_clone_bag(&BasicBag)), }, - BorrowedConstant::Tuple { elements } => Tuple { + BorrowedConstant::Tuple { elements } => ConstantData::Tuple { elements: elements .iter() .map(|c| c.borrow_constant().to_owned()) .collect(), }, - BorrowedConstant::Slice { elements } => Slice { + BorrowedConstant::Slice { elements } => ConstantData::Slice { elements: Box::new(elements.each_ref().map(|c| c.borrow_constant().to_owned())), }, - BorrowedConstant::Frozenset { elements } => Frozenset { + BorrowedConstant::Frozenset { elements } => ConstantData::Frozenset { elements: elements .iter() .map(|c| c.borrow_constant().to_owned()) .collect(), }, - BorrowedConstant::None => None, - BorrowedConstant::Ellipsis => Ellipsis, + BorrowedConstant::None => ConstantData::None, + BorrowedConstant::Ellipsis => ConstantData::Ellipsis, } } } diff --git a/crates/compiler-core/src/marshal.rs b/crates/compiler-core/src/marshal.rs index 0c28a83e7..a2a23054e 100644 --- a/crates/compiler-core/src/marshal.rs +++ b/crates/compiler-core/src/marshal.rs @@ -81,37 +81,36 @@ impl TryFrom<u8> for Type { type Error = MarshalError; fn try_from(value: u8) -> Result<Self> { - use Type::*; Ok(match value { - b'0' => Null, - b'N' => None, - b'F' => False, - b'T' => True, - b'S' => StopIter, - b'.' => Ellipsis, - b'i' => Int, - b'I' => Int64, - b'l' => Long, - b'f' => FloatStr, - b'g' => Float, - b'x' => ComplexStr, - b'y' => Complex, - b's' => Bytes, - b't' => Interned, - b'r' => Ref, - b'(' => Tuple, - b')' => SmallTuple, - b'[' => List, - b'{' => Dict, - b'c' => Code, - b'u' => Unicode, - b'<' => Set, - b'>' => FrozenSet, - b':' => Slice, - b'a' => Ascii, - b'A' => AsciiInterned, - b'z' => ShortAscii, - b'Z' => ShortAsciiInterned, + b'0' => Self::Null, + b'N' => Self::None, + b'F' => Self::False, + b'T' => Self::True, + b'S' => Self::StopIter, + b'.' => Self::Ellipsis, + b'i' => Self::Int, + b'I' => Self::Int64, + b'l' => Self::Long, + b'f' => Self::FloatStr, + b'g' => Self::Float, + b'x' => Self::ComplexStr, + b'y' => Self::Complex, + b's' => Self::Bytes, + b't' => Self::Interned, + b'r' => Self::Ref, + b'(' => Self::Tuple, + b')' => Self::SmallTuple, + b'[' => Self::List, + b'{' => Self::Dict, + b'c' => Self::Code, + b'u' => Self::Unicode, + b'<' => Self::Set, + b'>' => Self::FrozenSet, + b':' => Self::Slice, + b'a' => Self::Ascii, + b'A' => Self::AsciiInterned, + b'z' => Self::ShortAscii, + b'Z' => Self::ShortAsciiInterned, _ => return Err(MarshalError::BadType), }) } diff --git a/crates/derive-impl/src/pyclass.rs b/crates/derive-impl/src/pyclass.rs index d892db17e..d5bae7eeb 100644 --- a/crates/derive-impl/src/pyclass.rs +++ b/crates/derive-impl/src/pyclass.rs @@ -1949,24 +1949,25 @@ fn impl_item_new<Item>( where Item: ItemLike + ToTokens + GetIdent, { - use AttrName::*; match attr_name { - attr_name @ (Method | ClassMethod | StaticMethod) => Box::new(MethodItem { + attr_name @ (AttrName::Method | AttrName::ClassMethod | AttrName::StaticMethod) => { + Box::new(MethodItem { + inner: ContentItemInner { index, attr_name }, + }) + } + AttrName::GetSet => Box::new(GetSetItem { inner: ContentItemInner { index, attr_name }, }), - GetSet => Box::new(GetSetItem { + AttrName::Slot => Box::new(SlotItem { inner: ContentItemInner { index, attr_name }, }), - Slot => Box::new(SlotItem { + AttrName::Attr => Box::new(AttributeItem { inner: ContentItemInner { index, attr_name }, }), - Attr => Box::new(AttributeItem { + AttrName::ExtendClass => Box::new(ExtendClassItem { inner: ContentItemInner { index, attr_name }, }), - ExtendClass => Box::new(ExtendClassItem { - inner: ContentItemInner { index, attr_name }, - }), - Member => Box::new(MemberItem { + AttrName::Member => Box::new(MemberItem { inner: ContentItemInner { index, attr_name }, }), } diff --git a/crates/derive-impl/src/util.rs b/crates/derive-impl/src/util.rs index 52e1fa236..60b2296ce 100644 --- a/crates/derive-impl/src/util.rs +++ b/crates/derive-impl/src/util.rs @@ -2,7 +2,7 @@ use itertools::Itertools; use proc_macro2::{Span, TokenStream}; use quote::{ToTokens, quote}; use std::collections::{HashMap, HashSet}; -use syn::{Attribute, Ident, Result, Signature, UseTree, spanned::Spanned}; +use syn::{Attribute, FnArg, Ident, Result, Signature, UseTree, spanned::Spanned}; use syn_ext::{ ext::{AttributeExt as SynAttributeExt, *}, types::*, @@ -609,11 +609,10 @@ impl AttributeExt for Attribute { } pub(crate) fn pyclass_ident_and_attrs(item: &syn::Item) -> Result<(&Ident, &[Attribute])> { - use syn::Item::*; Ok(match item { - Struct(syn::ItemStruct { ident, attrs, .. }) => (ident, attrs), - Enum(syn::ItemEnum { ident, attrs, .. }) => (ident, attrs), - Use(item_use) => ( + syn::Item::Struct(syn::ItemStruct { ident, attrs, .. }) => (ident, attrs), + syn::Item::Enum(syn::ItemEnum { ident, attrs, .. }) => (ident, attrs), + syn::Item::Use(item_use) => ( iter_use_idents(item_use, |ident, _is_unique| Ok(ident))? .into_iter() .exactly_one() @@ -635,10 +634,9 @@ pub(crate) fn pyclass_ident_and_attrs(item: &syn::Item) -> Result<(&Ident, &[Att } pub(crate) fn pyexception_ident_and_attrs(item: &syn::Item) -> Result<(&Ident, &[Attribute])> { - use syn::Item::*; Ok(match item { - Struct(syn::ItemStruct { ident, attrs, .. }) => (ident, attrs), - Enum(syn::ItemEnum { ident, attrs, .. }) => (ident, attrs), + syn::Item::Struct(syn::ItemStruct { ident, attrs, .. }) => (ident, attrs), + syn::Item::Enum(syn::ItemEnum { ident, attrs, .. }) => (ident, attrs), other => { bail_span!(other, "#[pyexception] can only be on a struct or enum",) } @@ -741,7 +739,7 @@ pub(crate) fn infer_native_call_flags(sig: &Signature, drop_first_typed: usize) // METH_* calling convention flags used by CALL specialization. let mut typed_args = Vec::new(); for arg in &sig.inputs { - let syn::FnArg::Typed(typed) = arg else { + let FnArg::Typed(typed) = arg else { continue; }; let ty_tokens = &typed.ty; @@ -811,10 +809,9 @@ fn func_sig(sig: &Signature) -> String { sig.inputs .iter() .filter_map(|arg| { - use syn::FnArg::*; let arg = match arg { - Typed(typed) => typed, - Receiver(_) => return Some("$self".to_owned()), + FnArg::Typed(typed) => typed, + FnArg::Receiver(_) => return Some("$self".to_owned()), }; let ty = arg.ty.as_ref(); let ty = quote!(#ty).to_string(); diff --git a/crates/stdlib/src/array.rs b/crates/stdlib/src/array.rs index a496643fc..e9b389949 100644 --- a/crates/stdlib/src/array.rs +++ b/crates/stdlib/src/array.rs @@ -1448,16 +1448,21 @@ pub mod array { impl From<MachineFormatCode> for u8 { fn from(code: MachineFormatCode) -> Self { - use MachineFormatCode::*; match code { - Int8 { signed } => signed as Self, - Int16 { signed, big_endian } => 2 + signed as Self * 2 + big_endian as Self, - Int32 { signed, big_endian } => 6 + signed as Self * 2 + big_endian as Self, - Int64 { signed, big_endian } => 10 + signed as Self * 2 + big_endian as Self, - Ieee754Float { big_endian } => 14 + big_endian as Self, - Ieee754Double { big_endian } => 16 + big_endian as Self, - Utf16 { big_endian } => 18 + big_endian as Self, - Utf32 { big_endian } => 20 + big_endian as Self, + MachineFormatCode::Int8 { signed } => signed as Self, + MachineFormatCode::Int16 { signed, big_endian } => { + 2 + signed as Self * 2 + big_endian as Self + } + MachineFormatCode::Int32 { signed, big_endian } => { + 6 + signed as Self * 2 + big_endian as Self + } + MachineFormatCode::Int64 { signed, big_endian } => { + 10 + signed as Self * 2 + big_endian as Self + } + MachineFormatCode::Ieee754Float { big_endian } => 14 + big_endian as Self, + MachineFormatCode::Ieee754Double { big_endian } => 16 + big_endian as Self, + MachineFormatCode::Utf16 { big_endian } => 18 + big_endian as Self, + MachineFormatCode::Utf32 { big_endian } => 20 + big_endian as Self, } } } diff --git a/crates/stdlib/src/binascii.rs b/crates/stdlib/src/binascii.rs index bbeaa331e..30e9b379a 100644 --- a/crates/stdlib/src/binascii.rs +++ b/crates/stdlib/src/binascii.rs @@ -849,20 +849,21 @@ fn new_binascii_error<T: Into<Wtf8Buf>>(msg: T, vm: &VirtualMachine) -> PyBaseEx impl ToPyException for Base64DecodeError { fn to_pyexception(&self, vm: &VirtualMachine) -> PyBaseExceptionRef { - use base64::DecodeError::*; + use base64::DecodeError; + let message = match &self.0 { - InvalidByte(0, PAD) => "Leading padding not allowed".to_owned(), - InvalidByte(_, PAD) => "Discontinuous padding not allowed".to_owned(), - InvalidByte(_, _) => "Only base64 data is allowed".to_owned(), - InvalidLastSymbol(_, PAD) => "Excess data after padding".to_owned(), - InvalidLastSymbol(length, _) => { + DecodeError::InvalidByte(0, PAD) => "Leading padding not allowed".to_owned(), + DecodeError::InvalidByte(_, PAD) => "Discontinuous padding not allowed".to_owned(), + DecodeError::InvalidByte(_, _) => "Only base64 data is allowed".to_owned(), + DecodeError::InvalidLastSymbol(_, PAD) => "Excess data after padding".to_owned(), + DecodeError::InvalidLastSymbol(length, _) => { format!( "Invalid base64-encoded string: number of data characters {length} cannot be 1 more than a multiple of 4" ) } // TODO: clean up errors - InvalidLength(_) => "Incorrect padding".to_owned(), - InvalidPadding => "Incorrect padding".to_owned(), + DecodeError::InvalidLength(_) => "Incorrect padding".to_owned(), + DecodeError::InvalidPadding => "Incorrect padding".to_owned(), }; new_binascii_error(format!("error decoding base64: {message}"), vm) } diff --git a/crates/stdlib/src/unicodedata.rs b/crates/stdlib/src/unicodedata.rs index e848daade..4152118f5 100644 --- a/crates/stdlib/src/unicodedata.rs +++ b/crates/stdlib/src/unicodedata.rs @@ -162,7 +162,7 @@ mod unicodedata { use super::{ BIDI_CLASS, BIDI_MIRRORED, COMBINING_CLASS, DECOMP_COMPAT, DECOMP_RANGE, DECOMP_UPDATES, - EAST_ASIAN_WIDTH, GENERAL_CATEGORY, NUMERIC_TYPE_DIFF, NormalizeForm::*, UNICODE_VERSION, + EAST_ASIAN_WIDTH, GENERAL_CATEGORY, NUMERIC_TYPE_DIFF, NormalizeForm, UNICODE_VERSION, UnicodeVersion, lookup_numeric_val, lookup_property, }; use crate::vm::{ @@ -337,22 +337,22 @@ mod unicodedata { fn normalize(&self, form: super::NormalizeForm, unistr: PyStrRef) -> Wtf8Buf { let text = unistr.as_wtf8(); match form { - Nfc => { + NormalizeForm::Nfc => { let normalizer = ComposingNormalizerBorrowed::new_nfc(); text.map_utf8(|s| normalizer.normalize_iter(s.chars())) .collect() } - Nfkc => { + NormalizeForm::Nfkc => { let normalizer = ComposingNormalizerBorrowed::new_nfkc(); text.map_utf8(|s| normalizer.normalize_iter(s.chars())) .collect() } - Nfd => { + NormalizeForm::Nfd => { let normalizer = DecomposingNormalizerBorrowed::new_nfd(); text.map_utf8(|s| normalizer.normalize_iter(s.chars())) .collect() } - Nfkd => { + NormalizeForm::Nfkd => { let normalizer = DecomposingNormalizerBorrowed::new_nfkd(); text.map_utf8(|s| normalizer.normalize_iter(s.chars())) .collect() @@ -364,22 +364,22 @@ mod unicodedata { fn is_normalized(&self, form: super::NormalizeForm, unistr: PyStrRef) -> bool { let text = unistr.as_wtf8(); let normalized: Wtf8Buf = match form { - Nfc => { + NormalizeForm::Nfc => { let normalizer = ComposingNormalizerBorrowed::new_nfc(); text.map_utf8(|s| normalizer.normalize_iter(s.chars())) .collect() } - Nfkc => { + NormalizeForm::Nfkc => { let normalizer = ComposingNormalizerBorrowed::new_nfkc(); text.map_utf8(|s| normalizer.normalize_iter(s.chars())) .collect() } - Nfd => { + NormalizeForm::Nfd => { let normalizer = DecomposingNormalizerBorrowed::new_nfd(); text.map_utf8(|s| normalizer.normalize_iter(s.chars())) .collect() } - Nfkd => { + NormalizeForm::Nfkd => { let normalizer = DecomposingNormalizerBorrowed::new_nfkd(); text.map_utf8(|s| normalizer.normalize_iter(s.chars())) .collect() diff --git a/crates/vm/src/buffer.rs b/crates/vm/src/buffer.rs index c3ad10e89..255250485 100644 --- a/crates/vm/src/buffer.rs +++ b/crates/vm/src/buffer.rs @@ -112,7 +112,6 @@ impl fmt::Debug for FormatType { impl FormatType { fn info(self, e: Endianness) -> &'static FormatInfo { - use FormatType::*; use mem::{align_of, size_of}; macro_rules! native_info { @@ -140,71 +139,71 @@ impl FormatType { macro_rules! match_nonnative { ($zelf:expr, $end:ty) => {{ match $zelf { - Pad | Str | Pascal => &FormatInfo { + Self::Pad | Self::Str | Self::Pascal => &FormatInfo { size: size_of::<u8>(), align: 0, pack: None, unpack: None, }, - SByte => nonnative_info!(i8, $end), - UByte => nonnative_info!(u8, $end), - Char => &FormatInfo { + Self::SByte => nonnative_info!(i8, $end), + Self::UByte => nonnative_info!(u8, $end), + Self::Char => &FormatInfo { size: size_of::<u8>(), align: 0, pack: Some(pack_char), unpack: Some(unpack_char), }, - Short => nonnative_info!(i16, $end), - UShort => nonnative_info!(u16, $end), - Int | Long => nonnative_info!(i32, $end), - UInt | ULong => nonnative_info!(u32, $end), - LongLong => nonnative_info!(i64, $end), - ULongLong => nonnative_info!(u64, $end), - Bool => nonnative_info!(bool, $end), - Half => nonnative_info!(f16, $end), - Float => nonnative_info!(f32, $end), - Double => nonnative_info!(f64, $end), - LongDouble => nonnative_info!(f64, $end), // long double same as double - PyObject => nonnative_info!(usize, $end), // pointer size - _ => unreachable!(), // size_t or void* + Self::Short => nonnative_info!(i16, $end), + Self::UShort => nonnative_info!(u16, $end), + Self::Int | Self::Long => nonnative_info!(i32, $end), + Self::UInt | Self::ULong => nonnative_info!(u32, $end), + Self::LongLong => nonnative_info!(i64, $end), + Self::ULongLong => nonnative_info!(u64, $end), + Self::Bool => nonnative_info!(bool, $end), + Self::Half => nonnative_info!(f16, $end), + Self::Float => nonnative_info!(f32, $end), + Self::Double => nonnative_info!(f64, $end), + Self::LongDouble => nonnative_info!(f64, $end), // long double same as double + Self::PyObject => nonnative_info!(usize, $end), // pointer size + _ => unreachable!(), // size_t or void* } }}; } match e { Endianness::Native => match self { - Pad | Str | Pascal => &FormatInfo { + Self::Pad | Self::Str | Self::Pascal => &FormatInfo { size: size_of::<raw::c_char>(), align: 0, pack: None, unpack: None, }, - SByte => native_info!(raw::c_schar), - UByte => native_info!(raw::c_uchar), - Char => &FormatInfo { + Self::SByte => native_info!(raw::c_schar), + Self::UByte => native_info!(raw::c_uchar), + Self::Char => &FormatInfo { size: size_of::<raw::c_char>(), align: 0, pack: Some(pack_char), unpack: Some(unpack_char), }, - WideChar => native_info!(wchar_t), - Short => native_info!(raw::c_short), - UShort => native_info!(raw::c_ushort), - Int => native_info!(raw::c_int), - UInt => native_info!(raw::c_uint), - Long => native_info!(raw::c_long), - ULong => native_info!(raw::c_ulong), - SSizeT => native_info!(isize), // ssize_t == isize - SizeT => native_info!(usize), // size_t == usize - LongLong => native_info!(raw::c_longlong), - ULongLong => native_info!(raw::c_ulonglong), - Bool => native_info!(bool), - Half => native_info!(f16), - Float => native_info!(raw::c_float), - Double => native_info!(raw::c_double), - LongDouble => native_info!(raw::c_double), // long double same as double for now - VoidP => native_info!(*mut raw::c_void), - PyObject => native_info!(*mut raw::c_void), // pointer to PyObject + Self::WideChar => native_info!(wchar_t), + Self::Short => native_info!(raw::c_short), + Self::UShort => native_info!(raw::c_ushort), + Self::Int => native_info!(raw::c_int), + Self::UInt => native_info!(raw::c_uint), + Self::Long => native_info!(raw::c_long), + Self::ULong => native_info!(raw::c_ulong), + Self::SSizeT => native_info!(isize), // ssize_t == isize + Self::SizeT => native_info!(usize), // size_t == usize + Self::LongLong => native_info!(raw::c_longlong), + Self::ULongLong => native_info!(raw::c_ulonglong), + Self::Bool => native_info!(bool), + Self::Half => native_info!(f16), + Self::Float => native_info!(raw::c_float), + Self::Double => native_info!(raw::c_double), + Self::LongDouble => native_info!(raw::c_double), // long double same as double for now + Self::VoidP => native_info!(*mut raw::c_void), + Self::PyObject => native_info!(*mut raw::c_void), // pointer to PyObject }, Endianness::Big => match_nonnative!(self, BigEndian), Endianness::Little => match_nonnative!(self, LittleEndian), diff --git a/crates/vm/src/builtins/dict.rs b/crates/vm/src/builtins/dict.rs index 74a7bc690..db97045f0 100644 --- a/crates/vm/src/builtins/dict.rs +++ b/crates/vm/src/builtins/dict.rs @@ -15,9 +15,7 @@ use crate::{ class::{PyClassDef, PyClassImpl}, common::ascii, dict_inner::{self, DictKey}, - function::{ - ArgIterable, FuncArgs, KwArgs, OptionalArg, PyArithmeticValue::*, PyComparisonValue, - }, + function::{ArgIterable, FuncArgs, KwArgs, OptionalArg, PyArithmeticValue, PyComparisonValue}, iter::PyExactSizeIterator, protocol::{PyIterIter, PyIterReturn, PyMappingMethods, PyNumberMethods, PySequenceMethods}, recursion::ReprGuard, @@ -478,7 +476,7 @@ impl Py<PyDict> { .map(|x| x.map(|eq| !eq)); } if !op.eval_ord(self.__len__().cmp(&other.__len__())) { - return Ok(Implemented(false)); + return Ok(PyArithmeticValue::Implemented(false)); } let (superset, subset) = if self.__len__() < other.__len__() { (other, self) @@ -492,15 +490,15 @@ impl Py<PyDict> { continue; } if item && !vm.bool_eq(&v1, &v2)? { - return Ok(Implemented(false)); + return Ok(PyArithmeticValue::Implemented(false)); } } None => { - return Ok(Implemented(false)); + return Ok(PyArithmeticValue::Implemented(false)); } } } - Ok(Implemented(true)) + Ok(PyArithmeticValue::Implemented(true)) } #[cfg_attr(feature = "flame-it", flame("PyDictRef"))] @@ -1289,7 +1287,7 @@ trait ViewSetOps: DictView { ref _dictitems @ PyDictItems => {} ref _dictkeys @ PyDictKeys => {} _ => { - return Ok(NotImplemented); + return Ok(PyArithmeticValue::NotImplemented); } }); let lhs: Vec<PyObjectRef> = zelf.as_object().to_owned().try_into_value(vm)?; diff --git a/crates/vm/src/builtins/float.rs b/crates/vm/src/builtins/float.rs index f36f9de79..db6478d66 100644 --- a/crates/vm/src/builtins/float.rs +++ b/crates/vm/src/builtins/float.rs @@ -9,12 +9,12 @@ use crate::{ common::{float_ops, format::FormatSpec, hash, wtf8::Wtf8Buf}, convert::{IntoPyException, ToPyObject, ToPyResult}, function::{ - ArgBytesLike, FuncArgs, OptionalArg, OptionalOption, PyArithmeticValue::*, - PyComparisonValue, + ArgBytesLike, FuncArgs, OptionalArg, OptionalOption, PyArithmeticValue, PyComparisonValue, }, protocol::PyNumberMethods, types::{AsNumber, Callable, Comparable, Constructor, Hashable, PyComparisonOp, Representable}, }; + use core::cell::Cell; use core::ptr::NonNull; use malachite_bigint::{BigInt, ToBigInt}; @@ -446,9 +446,9 @@ impl Comparable for PyFloat { PyComparisonOp::Gt => float_ops::gt_int(a, b), } } else { - return Ok(NotImplemented); + return Ok(PyArithmeticValue::NotImplemented); }; - Ok(Implemented(ret)) + Ok(PyArithmeticValue::Implemented(ret)) } } diff --git a/crates/vm/src/codecs.rs b/crates/vm/src/codecs.rs index 03340d423..a07ffb47e 100644 --- a/crates/vm/src/codecs.rs +++ b/crates/vm/src/codecs.rs @@ -816,16 +816,20 @@ impl<'a> EncodeErrorHandler<PyEncodeContext<'a>> for StandardError { range: Range<StrSize>, reason: Option<&str>, ) -> PyResult<(EncodeReplace<PyEncodeContext<'a>>, StrSize)> { - use StandardError::*; - // use errors::*; match self { - Strict => errors::Strict.handle_encode_error(ctx, range, reason), - Ignore => errors::Ignore.handle_encode_error(ctx, range, reason), - Replace => errors::Replace.handle_encode_error(ctx, range, reason), - XmlCharRefReplace => errors::XmlCharRefReplace.handle_encode_error(ctx, range, reason), - BackslashReplace => errors::BackslashReplace.handle_encode_error(ctx, range, reason), - SurrogatePass => SurrogatePass.handle_encode_error(ctx, range, reason), - SurrogateEscape => errors::SurrogateEscape.handle_encode_error(ctx, range, reason), + Self::Strict => errors::Strict.handle_encode_error(ctx, range, reason), + Self::Ignore => errors::Ignore.handle_encode_error(ctx, range, reason), + Self::Replace => errors::Replace.handle_encode_error(ctx, range, reason), + Self::XmlCharRefReplace => { + errors::XmlCharRefReplace.handle_encode_error(ctx, range, reason) + } + Self::BackslashReplace => { + errors::BackslashReplace.handle_encode_error(ctx, range, reason) + } + Self::SurrogatePass => SurrogatePass.handle_encode_error(ctx, range, reason), + Self::SurrogateEscape => { + errors::SurrogateEscape.handle_encode_error(ctx, range, reason) + } } } } @@ -837,19 +841,20 @@ impl<'a> DecodeErrorHandler<PyDecodeContext<'a>> for StandardError { byte_range: Range<usize>, reason: Option<&str>, ) -> PyResult<(PyStrRef, usize)> { - use StandardError::*; match self { - Strict => errors::Strict.handle_decode_error(ctx, byte_range, reason), - Ignore => errors::Ignore.handle_decode_error(ctx, byte_range, reason), - Replace => errors::Replace.handle_decode_error(ctx, byte_range, reason), - XmlCharRefReplace => Err(ctx + Self::Strict => errors::Strict.handle_decode_error(ctx, byte_range, reason), + Self::Ignore => errors::Ignore.handle_decode_error(ctx, byte_range, reason), + Self::Replace => errors::Replace.handle_decode_error(ctx, byte_range, reason), + Self::XmlCharRefReplace => Err(ctx .vm .new_type_error("don't know how to handle UnicodeDecodeError in error callback")), - BackslashReplace => { + Self::BackslashReplace => { errors::BackslashReplace.handle_decode_error(ctx, byte_range, reason) } - SurrogatePass => self::SurrogatePass.handle_decode_error(ctx, byte_range, reason), - SurrogateEscape => errors::SurrogateEscape.handle_decode_error(ctx, byte_range, reason), + Self::SurrogatePass => self::SurrogatePass.handle_decode_error(ctx, byte_range, reason), + Self::SurrogateEscape => { + errors::SurrogateEscape.handle_decode_error(ctx, byte_range, reason) + } } } } @@ -858,6 +863,7 @@ pub(crate) struct ErrorsHandler<'a> { errors: &'a Py<PyUtf8Str>, resolved: OnceCell<ResolvedError>, } + enum ResolvedError { Standard(StandardError), Handler(PyObjectRef), diff --git a/crates/vm/src/protocol/callable.rs b/crates/vm/src/protocol/callable.rs index 515eb7520..42d0ac194 100644 --- a/crates/vm/src/protocol/callable.rs +++ b/crates/vm/src/protocol/callable.rs @@ -178,16 +178,15 @@ impl TraceEvent { impl core::fmt::Display for TraceEvent { fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { - use TraceEvent::*; match self { - Call => write!(f, "call"), - Return => write!(f, "return"), - Exception => write!(f, "exception"), - Line => write!(f, "line"), - Opcode => write!(f, "opcode"), - CCall => write!(f, "c_call"), - CReturn => write!(f, "c_return"), - CException => write!(f, "c_exception"), + Self::Call => write!(f, "call"), + Self::Return => write!(f, "return"), + Self::Exception => write!(f, "exception"), + Self::Line => write!(f, "line"), + Self::Opcode => write!(f, "opcode"), + Self::CCall => write!(f, "c_call"), + Self::CReturn => write!(f, "c_return"), + Self::CException => write!(f, "c_exception"), } } } diff --git a/crates/vm/src/stdlib/_imp.rs b/crates/vm/src/stdlib/_imp.rs index 216921e1c..7021895c9 100644 --- a/crates/vm/src/stdlib/_imp.rs +++ b/crates/vm/src/stdlib/_imp.rs @@ -123,14 +123,13 @@ enum FrozenError { impl FrozenError { fn to_pyexception(&self, mod_name: &str, vm: &VirtualMachine) -> PyBaseExceptionRef { - use FrozenError::*; let msg = match self { - BadName | NotFound => format!("No such frozen object named {mod_name}"), - Disabled => format!( + Self::BadName | Self::NotFound => format!("No such frozen object named {mod_name}"), + Self::Disabled => format!( "Frozen modules are disabled and the frozen object named {mod_name} is not essential" ), - Excluded => format!("Excluded frozen object named {mod_name}"), - Invalid => format!("Frozen object named {mod_name} is invalid"), + Self::Excluded => format!("Excluded frozen object named {mod_name}"), + Self::Invalid => format!("Frozen object named {mod_name} is invalid"), }; vm.new_import_error(msg, vm.ctx.new_utf8_str(mod_name)) } @@ -173,6 +172,8 @@ mod _imp { import, version, }; + use super::FrozenError; + #[pyattr] fn check_hash_based_pycs(vm: &VirtualMachine) -> PyStrRef { vm.ctx @@ -312,8 +313,6 @@ mod _imp { withdata: OptionalArg<bool>, vm: &VirtualMachine, ) -> PyResult<Option<(Option<PyRef<PyMemoryView>>, bool, Option<PyStrRef>)>> { - use super::FrozenError::*; - if withdata.into_option().is_some() { // this is keyword-only argument in CPython unimplemented!(); @@ -322,7 +321,9 @@ mod _imp { let name_str = name.as_str(); let info = match super::find_frozen(name_str, vm) { Ok(info) => info, - Err(NotFound | Disabled | BadName) => return Ok(None), + Err(FrozenError::NotFound | FrozenError::Disabled | FrozenError::BadName) => { + return Ok(None); + } Err(e) => return Err(e.to_pyexception(name_str, vm)), }; diff --git a/crates/vm/src/stdlib/marshal.rs b/crates/vm/src/stdlib/marshal.rs index 2429b58a9..ace3aff58 100644 --- a/crates/vm/src/stdlib/marshal.rs +++ b/crates/vm/src/stdlib/marshal.rs @@ -19,7 +19,7 @@ mod decl { }; use malachite_bigint::BigInt; use num_traits::Zero; - use rustpython_compiler_core::marshal; + use rustpython_compiler_core::marshal::{self, DumpableValue}; #[pyattr(name = "version")] use marshal::FORMAT_VERSION; @@ -32,57 +32,57 @@ mod decl { fn with_dump<R>( &self, - f: impl FnOnce(marshal::DumpableValue<'_, Self>) -> R, + f: impl FnOnce(DumpableValue<'_, Self>) -> R, ) -> Result<R, Self::Error> { - use marshal::DumpableValue::*; if self.is(PyStopIteration::static_type()) { - return Ok(f(StopIter)); + return Ok(f(DumpableValue::StopIter)); } + let ret = match_class!(match self { - PyNone => f(None), - PyEllipsis => f(Ellipsis), + PyNone => f(DumpableValue::None), + PyEllipsis => f(DumpableValue::Ellipsis), ref pyint @ PyInt => { if self.class().is(PyBool::static_type()) { - f(Boolean(!pyint.as_bigint().is_zero())) + f(DumpableValue::Boolean(!pyint.as_bigint().is_zero())) } else { - f(Integer(pyint.as_bigint())) + f(DumpableValue::Integer(pyint.as_bigint())) } } ref pyfloat @ PyFloat => { - f(Float(pyfloat.to_f64())) + f(DumpableValue::Float(pyfloat.to_f64())) } ref pycomplex @ PyComplex => { - f(Complex(pycomplex.to_complex64())) + f(DumpableValue::Complex(pycomplex.to_complex64())) } ref pystr @ PyStr => { - f(Str(pystr.as_wtf8())) + f(DumpableValue::Str(pystr.as_wtf8())) } ref pylist @ PyList => { - f(List(&pylist.borrow_vec())) + f(DumpableValue::List(&pylist.borrow_vec())) } ref pyset @ PySet => { let elements = pyset.elements(); - f(Set(&elements)) + f(DumpableValue::Set(&elements)) } ref pyfrozen @ PyFrozenSet => { let elements = pyfrozen.elements(); - f(Frozenset(&elements)) + f(DumpableValue::Frozenset(&elements)) } ref pytuple @ PyTuple => { - f(Tuple(pytuple.as_slice())) + f(DumpableValue::Tuple(pytuple.as_slice())) } ref pydict @ PyDict => { let entries = pydict.into_iter().collect::<Vec<_>>(); - f(Dict(&entries)) + f(DumpableValue::Dict(&entries)) } ref bytes @ PyBytes => { - f(Bytes(bytes.as_bytes())) + f(DumpableValue::Bytes(bytes.as_bytes())) } ref bytes @ PyByteArray => { - f(Bytes(&bytes.borrow_buf())) + f(DumpableValue::Bytes(&bytes.borrow_buf())) } ref co @ PyCode => { - f(Code(co)) + f(DumpableValue::Code(co)) } _ => return Err(DumpError), }); diff --git a/crates/vm/src/stdlib/winsound.rs b/crates/vm/src/stdlib/winsound.rs index e8214a8fd..67d7c8a7f 100644 --- a/crates/vm/src/stdlib/winsound.rs +++ b/crates/vm/src/stdlib/winsound.rs @@ -5,12 +5,12 @@ pub(crate) use winsound::module_def; #[pymodule] mod winsound { - use crate::builtins::{PyBytes, PyStr}; + use crate::builtins::{PyBaseExceptionRef, PyBytes, PyStr}; use crate::convert::{IntoPyException, TryFromBorrowedObject}; use crate::host_env::windows::ToWideString; use crate::protocol::PyBuffer; use crate::{AsObject, PyObjectRef, PyResult, VirtualMachine}; - use rustpython_host_env::winsound::{PlaySoundSource, play_sound}; + use rustpython_host_env::winsound::{PlaySoundError, PlaySoundSource, play_sound}; // PlaySound flags #[pyattr] @@ -68,16 +68,14 @@ mod winsound { flags: i32, } - fn map_play_err( - vm: &VirtualMachine, - ) -> impl FnOnce( - rustpython_host_env::winsound::PlaySoundError, - ) -> crate::builtins::PyBaseExceptionRef - + '_ { - use rustpython_host_env::winsound::PlaySoundError::*; + fn map_play_err(vm: &VirtualMachine) -> impl FnOnce(PlaySoundError) -> PyBaseExceptionRef + '_ { |err| match err { - MemoryAsyncRejected => vm.new_runtime_error("Cannot play asynchronously from memory"), - MemoryFlagWithoutBuffer | CallFailed => vm.new_runtime_error("Failed to play sound"), + PlaySoundError::MemoryAsyncRejected => { + vm.new_runtime_error("Cannot play asynchronously from memory") + } + PlaySoundError::MemoryFlagWithoutBuffer | PlaySoundError::CallFailed => { + vm.new_runtime_error("Failed to play sound") + } } } From 455e2624ade9c759e867401736af68c4dd172da2 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Wed, 17 Jun 2026 07:24:59 +0300 Subject: [PATCH 111/339] Clippy `ref_option` (#8122) --- Cargo.toml | 2 ++ crates/derive-impl/src/compile_bytecode.rs | 8 ++++---- crates/stdlib/src/socket.rs | 6 +++--- crates/vm/src/builtins/module.rs | 2 +- crates/vm/src/builtins/type.rs | 18 ++++++++---------- crates/vm/src/frame.rs | 18 +++++++++--------- crates/vm/src/getpath.rs | 22 +++++++++++----------- crates/vm/src/import.rs | 5 +++-- crates/vm/src/stdlib/_ast/validate.rs | 8 ++++---- 9 files changed, 45 insertions(+), 44 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 76ba350d1..9166b7e2e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -403,6 +403,7 @@ iter_filter_is_some = "warn" manual_is_variant_and = "warn" map_unwrap_or = "warn" match_bool = "warn" +mismatching_type_param_order = "warn" must_use_candidate = "warn" mut_mut = "warn" needless_bitwise_bool = "warn" @@ -410,6 +411,7 @@ needless_for_each = "warn" option_as_ref_cloned = "warn" ptr_offset_by_literal = "warn" redundant_else = "warn" +ref_option = "warn" return_self_not_must_use = "warn" uninlined_format_args = "warn" unnecessary_wraps = "warn" diff --git a/crates/derive-impl/src/compile_bytecode.rs b/crates/derive-impl/src/compile_bytecode.rs index 05197440e..842b21f07 100644 --- a/crates/derive-impl/src/compile_bytecode.rs +++ b/crates/derive-impl/src/compile_bytecode.rs @@ -227,7 +227,7 @@ impl PyCompileArgs { let mut source: Option<CompilationSource> = None; let mut crate_name = None; - fn assert_source_empty(source: &Option<CompilationSource>) -> Result<(), syn::Error> { + fn assert_source_empty(source: Option<&CompilationSource>) -> Result<(), syn::Error> { if let Some(source) = source { Err(syn::Error::new( source.span.0, @@ -263,14 +263,14 @@ impl PyCompileArgs { } else if ident == "module_name" { module_name = Some(check_str()?.value()) } else if ident == "source" { - assert_source_empty(&source)?; + assert_source_empty(source.as_ref())?; let code = check_str()?.value(); source = Some(CompilationSource { kind: CompilationSourceKind::SourceCode(code), span: (ident.span(), meta.input.cursor().span()), }); } else if ident == "file" { - assert_source_empty(&source)?; + assert_source_empty(source.as_ref())?; let (base, rel_path) = str_path()?; source = Some(CompilationSource { kind: CompilationSourceKind::File { base, rel_path }, @@ -281,7 +281,7 @@ impl PyCompileArgs { bail_span!(ident, "py_compile doesn't accept dir") } - assert_source_empty(&source)?; + assert_source_empty(source.as_ref())?; let (base, rel_path) = str_path()?; source = Some(CompilationSource { kind: CompilationSourceKind::Dir { base, rel_path }, diff --git a/crates/stdlib/src/socket.rs b/crates/stdlib/src/socket.rs index ecc4add0c..e3ce52b94 100644 --- a/crates/stdlib/src/socket.rs +++ b/crates/stdlib/src/socket.rs @@ -1085,7 +1085,7 @@ mod _socket { loop { if deadline.is_some() || matches!(wait_kind, SockWaitKind::Connect) { let sock = self.sock()?; - sock_wait_deadline(&sock, wait_kind, &deadline, vm)?; + sock_wait_deadline(&sock, wait_kind, deadline.as_ref(), vm)?; } let err = loop { @@ -2452,7 +2452,7 @@ mod _socket { timeout: Option<Duration>, vm: &VirtualMachine, ) -> PyResult<bool> { - match sock_wait_deadline(sock, wait_kind, &timeout.map(Deadline::new), vm) { + match sock_wait_deadline(sock, wait_kind, timeout.map(Deadline::new).as_ref(), vm) { Ok(()) => Ok(false), Err(IoOrPyException::Timeout) => Ok(true), Err(e) => Err(e.into_pyexception(vm)), @@ -2463,7 +2463,7 @@ mod _socket { fn sock_wait_deadline( sock: &Socket, wait_kind: SockWaitKind, - deadline: &Option<Deadline>, + deadline: Option<&Deadline>, vm: &VirtualMachine, ) -> Result<(), IoOrPyException> { #[cfg(unix)] diff --git a/crates/vm/src/builtins/module.rs b/crates/vm/src/builtins/module.rs index 51d90e9b3..904109072 100644 --- a/crates/vm/src/builtins/module.rs +++ b/crates/vm/src/builtins/module.rs @@ -180,7 +180,7 @@ impl Py<PyModule> { .flatten() .filter(|s| !vm.is_none(s)); - let origin = get_spec_file_origin(&spec, vm); + let origin = get_spec_file_origin(spec.as_ref(), vm); let is_possibly_shadowing = origin .as_ref() diff --git a/crates/vm/src/builtins/type.rs b/crates/vm/src/builtins/type.rs index b3980c2c7..d26c81a7b 100644 --- a/crates/vm/src/builtins/type.rs +++ b/crates/vm/src/builtins/type.rs @@ -806,8 +806,8 @@ impl PyType { // Note: inherit_slots is called in PyClassImpl::init_class after // slots are fully initialized by make_slots() - Self::set_new(&new_type.slots, &new_type.base); - Self::set_alloc(&new_type.slots, &new_type.base); + Self::set_new(&new_type.slots, new_type.base.as_ref()); + Self::set_alloc(&new_type.slots, new_type.base.as_ref()); let weakref_type = super::PyWeak::static_type(); for base in new_type.bases.read().iter() { @@ -853,25 +853,23 @@ impl PyType { self.update_slot::<true>(attr_name, ctx); } - Self::set_new(&self.slots, &self.base); - Self::set_alloc(&self.slots, &self.base); + Self::set_new(&self.slots, self.base.as_ref()); + Self::set_alloc(&self.slots, self.base.as_ref()); } - fn set_new(slots: &PyTypeSlots, base: &Option<PyTypeRef>) { + fn set_new(slots: &PyTypeSlots, base: Option<&PyTypeRef>) { if slots.flags.contains(PyTypeFlags::DISALLOW_INSTANTIATION) { slots.new.store(None) } else if slots.new.load().is_none() { - slots - .new - .store(base.as_ref().and_then(|base| base.slots.new.load())) + slots.new.store(base.and_then(|base| base.slots.new.load())) } } - fn set_alloc(slots: &PyTypeSlots, base: &Option<PyTypeRef>) { + fn set_alloc(slots: &PyTypeSlots, base: Option<&PyTypeRef>) { if slots.alloc.load().is_none() { slots .alloc - .store(base.as_ref().and_then(|base| base.slots.alloc.load())); + .store(base.and_then(|base| base.slots.alloc.load())); } } diff --git a/crates/vm/src/frame.rs b/crates/vm/src/frame.rs index fe0078718..7050d8517 100644 --- a/crates/vm/src/frame.rs +++ b/crates/vm/src/frame.rs @@ -340,11 +340,11 @@ impl LocalsPlus { /// Get a reference to a stack slot by index from the bottom. #[inline(always)] - fn stack_index(&self, idx: usize) -> &Option<PyStackRef> { + fn stack_index(&self, idx: usize) -> Option<&PyStackRef> { debug_assert!(idx < self.stack_top as usize); let data = self.data_as_slice(); let raw_idx = self.nlocalsplus as usize + idx; - unsafe { &*(data.as_ptr().add(raw_idx) as *const Option<PyStackRef>) } + unsafe { (*(data.as_ptr().add(raw_idx) as *const Option<PyStackRef>)).as_ref() } } /// Get a mutable reference to a stack slot by index from the bottom. @@ -358,7 +358,7 @@ impl LocalsPlus { /// Get the last stack element (top of stack). #[inline(always)] - fn stack_last(&self) -> Option<&Option<PyStackRef>> { + fn stack_last(&self) -> Option<Option<&PyStackRef>> { if self.stack_top == 0 { None } else { @@ -2343,8 +2343,8 @@ impl ExecutingFrame<'_> { let idx = index.get(arg) as usize; let stack_len = self.localsplus.stack_len(); debug_assert!(stack_len >= idx, "CopyItem: stack underflow"); - let value = self.localsplus.stack_index(stack_len - idx).clone(); - self.push_stackref_opt(value); + let value = self.localsplus.stack_index(stack_len - idx); + self.push_stackref_opt(value.cloned()); Ok(None) } Instruction::CopyFreeVars { n } => { @@ -3567,10 +3567,10 @@ impl ExecutingFrame<'_> { let stack_len = self.localsplus.stack_len(); let exit_func = expect_unchecked( - self.localsplus.stack_index(stack_len - 5).clone(), + self.localsplus.stack_index(stack_len - 5), "WithExceptStart: exit_func is NULL", ); - let self_or_null = self.localsplus.stack_index(stack_len - 4).clone(); + let self_or_null = self.localsplus.stack_index(stack_len - 4); let (tp, val, tb) = if let Some(ref exc) = exc { vm.split_exception(exc.clone()) @@ -3579,7 +3579,7 @@ impl ExecutingFrame<'_> { }; let exit_res = if let Some(self_exit) = self_or_null { - exit_func.call((self_exit.to_pyobj(), tp, val, tb), vm)? + exit_func.call((self_exit.clone().to_pyobj(), tp, val, tb), vm)? } else { exit_func.call((tp, val, tb), vm)? }; @@ -6233,7 +6233,7 @@ impl ExecutingFrame<'_> { .ok() .filter(|s| !vm.is_none(s)); - let origin = get_spec_file_origin(&spec, vm); + let origin = get_spec_file_origin(spec.as_ref(), vm); let is_possibly_shadowing = origin .as_ref() diff --git a/crates/vm/src/getpath.rs b/crates/vm/src/getpath.rs index 63f922a63..38aa122db 100644 --- a/crates/vm/src/getpath.rs +++ b/crates/vm/src/getpath.rs @@ -132,15 +132,15 @@ pub fn init_path_config(settings: &Settings) -> Paths { }; // Step 2: Check for venv (pyvenv.cfg) and get 'home' - let (venv_prefix, home_dir) = detect_venv(&exe_dir); + let (venv_prefix, home_dir) = detect_venv(exe_dir.as_ref()); let search_dir = home_dir.clone().or(exe_dir); // Step 3: Check for build directory - let build_prefix = detect_build_directory(&search_dir); + let build_prefix = detect_build_directory(search_dir.as_ref()); // Step 4: Calculate prefix via landmark search // When in venv, search_dir is home_dir, so this gives us the base Python's prefix - let calculated_prefix = calculate_prefix(&search_dir, &build_prefix); + let calculated_prefix = calculate_prefix(search_dir.as_ref(), build_prefix.as_ref()); // Step 5: Set prefix and base_prefix if venv_prefix.is_some() { @@ -161,13 +161,13 @@ pub fn init_path_config(settings: &Settings) -> Paths { // In venv: exec_prefix = prefix (venv directory) paths.prefix.clone() } else { - calculate_exec_prefix(&search_dir, &paths.prefix) + calculate_exec_prefix(search_dir.as_ref(), paths.prefix.as_ref()) }; paths.base_exec_prefix = paths.base_prefix.clone(); // Step 7: Calculate base_executable (if not already set by __PYVENV_LAUNCHER__) if paths.base_executable.is_empty() { - paths.base_executable = calculate_base_executable(executable.as_ref(), &home_dir); + paths.base_executable = calculate_base_executable(executable.as_ref(), home_dir.as_ref()); } // Step 8: Build module_search_paths @@ -195,7 +195,7 @@ fn default_prefix() -> String { /// Detect virtual environment by looking for pyvenv.cfg /// Returns (venv_prefix, home_dir from pyvenv.cfg) -fn detect_venv(exe_dir: &Option<PathBuf>) -> (Option<PathBuf>, Option<PathBuf>) { +fn detect_venv(exe_dir: Option<&PathBuf>) -> (Option<PathBuf>, Option<PathBuf>) { // Try exe_dir/../pyvenv.cfg first (standard venv layout: venv/bin/python) if let Some(dir) = exe_dir && let Some(venv_dir) = dir.parent() @@ -222,8 +222,8 @@ fn detect_venv(exe_dir: &Option<PathBuf>) -> (Option<PathBuf>, Option<PathBuf>) } /// Detect if running from a build directory -fn detect_build_directory(exe_dir: &Option<PathBuf>) -> Option<PathBuf> { - let dir = exe_dir.as_ref()?; +fn detect_build_directory(exe_dir: Option<&PathBuf>) -> Option<PathBuf> { + let dir = exe_dir?; // Check for pybuilddir.txt (indicates build directory) if dir.join(platform::BUILDDIR_TXT).exists() { @@ -240,7 +240,7 @@ fn detect_build_directory(exe_dir: &Option<PathBuf>) -> Option<PathBuf> { } /// Calculate prefix by searching for landmarks -fn calculate_prefix(exe_dir: &Option<PathBuf>, build_prefix: &Option<PathBuf>) -> String { +fn calculate_prefix(exe_dir: Option<&PathBuf>, build_prefix: Option<&PathBuf>) -> String { // 1. If build directory detected, use it if let Some(bp) = build_prefix { return bp.to_string_lossy().into_owned(); @@ -266,7 +266,7 @@ fn calculate_prefix(exe_dir: &Option<PathBuf>, build_prefix: &Option<PathBuf>) - } /// Calculate exec_prefix -fn calculate_exec_prefix(exe_dir: &Option<PathBuf>, prefix: &str) -> String { +fn calculate_exec_prefix(exe_dir: Option<&PathBuf>, prefix: &str) -> String { #[cfg(windows)] { // Windows: exec_prefix == prefix @@ -289,7 +289,7 @@ fn calculate_exec_prefix(exe_dir: &Option<PathBuf>, prefix: &str) -> String { } /// Calculate base_executable -fn calculate_base_executable(executable: Option<&PathBuf>, home_dir: &Option<PathBuf>) -> String { +fn calculate_base_executable(executable: Option<&PathBuf>, home_dir: Option<&PathBuf>) -> String { // If in venv and we have home, construct base_executable from home if let (Some(exe), Some(home)) = (executable, home_dir) && let Some(exe_name) = exe.file_name() diff --git a/crates/vm/src/import.rs b/crates/vm/src/import.rs index d7e86422e..5c418b35d 100644 --- a/crates/vm/src/import.rs +++ b/crates/vm/src/import.rs @@ -267,10 +267,11 @@ pub fn remove_importlib_frames(vm: &VirtualMachine, exc: &Py<PyBaseException>) { /// Get origin path from a module spec, checking has_location first. pub(crate) fn get_spec_file_origin( - spec: &Option<PyObjectRef>, + spec: Option<&PyObjectRef>, vm: &VirtualMachine, ) -> Option<String> { - let spec = spec.as_ref()?; + let spec = spec?; + let has_location = spec .get_attr("has_location", vm) .ok() diff --git a/crates/vm/src/stdlib/_ast/validate.rs b/crates/vm/src/stdlib/_ast/validate.rs index 9957fe4ee..cad37d386 100644 --- a/crates/vm/src/stdlib/_ast/validate.rs +++ b/crates/vm/src/stdlib/_ast/validate.rs @@ -279,7 +279,7 @@ fn validate_typeparam(vm: &VirtualMachine, tp: &ast::TypeParam) -> PyResult<()> fn validate_type_params( vm: &VirtualMachine, - type_params: &Option<Box<ast::TypeParams>>, + type_params: Option<&ast::TypeParams>, ) -> PyResult<()> { if let Some(type_params) = type_params { for tp in &type_params.type_params { @@ -478,7 +478,7 @@ fn validate_stmt(vm: &VirtualMachine, stmt: &ast::Stmt) -> PyResult<()> { "FunctionDef" }; validate_body(vm, &func.body, owner)?; - validate_type_params(vm, &func.type_params)?; + validate_type_params(vm, func.type_params.as_deref())?; validate_parameters(vm, &func.parameters)?; validate_decorators(vm, &func.decorator_list)?; if let Some(returns) = &func.returns { @@ -488,7 +488,7 @@ fn validate_stmt(vm: &VirtualMachine, stmt: &ast::Stmt) -> PyResult<()> { } ast::Stmt::ClassDef(class_def) => { validate_body(vm, &class_def.body, "ClassDef")?; - validate_type_params(vm, &class_def.type_params)?; + validate_type_params(vm, class_def.type_params.as_deref())?; if let Some(arguments) = &class_def.arguments { validate_exprs(vm, &arguments.args, ast::ExprContext::Load, false)?; validate_keywords(vm, &arguments.keywords)?; @@ -525,7 +525,7 @@ fn validate_stmt(vm: &VirtualMachine, stmt: &ast::Stmt) -> PyResult<()> { return Err(vm.new_type_error("TypeAlias with non-Name name")); } validate_expr(vm, &alias.name, ast::ExprContext::Store)?; - validate_type_params(vm, &alias.type_params)?; + validate_type_params(vm, alias.type_params.as_deref())?; validate_expr(vm, &alias.value, ast::ExprContext::Load) } ast::Stmt::For(for_stmt) => { From 63b99b899625ade158da58e923ffe8c20bff8323 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Wed, 17 Jun 2026 07:25:38 +0300 Subject: [PATCH 112/339] More clippy rules (#8123) * clippy `bool_to_int_with_if` * doc_link_with_quotes * ip_constant * single_char_pattern * windows --- Cargo.toml | 12 ++++++++++++ crates/codegen/src/compile.rs | 6 +++--- crates/host_env/src/ctypes.rs | 8 ++------ crates/host_env/src/overlapped.rs | 2 +- crates/stdlib/src/ssl.rs | 2 +- crates/vm/src/builtins/range.rs | 7 +------ crates/vm/src/stdlib/_ast.rs | 5 ++++- crates/vm/src/stdlib/_ctypes/base.rs | 6 +----- crates/vm/src/warn.rs | 6 +++--- 9 files changed, 28 insertions(+), 26 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 9166b7e2e..280b64f01 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -382,10 +382,12 @@ use_self = "warn" useless_let_if_seq = "warn" # pedantic lints to enforce gradually +bool_to_int_with_if = "warn" checked_conversions = "warn" cloned_instead_of_copied = "warn" collapsible_else_if = "warn" comparison_chain = "warn" +doc_link_with_quotes = "warn" duration_suboptimal_units = "warn" enum_glob_use = "warn" explicit_deref_methods = "warn" @@ -398,8 +400,11 @@ from_iter_instead_of_collect = "warn" inconsistent_struct_constructor = "warn" index_refutable_slice = "warn" inefficient_to_string = "warn" +ip_constant = "warn" iter_filter_is_ok = "warn" iter_filter_is_some = "warn" +large_futures = "warn" +manual_instant_elapsed = "warn" manual_is_variant_and = "warn" map_unwrap_or = "warn" match_bool = "warn" @@ -408,11 +413,18 @@ must_use_candidate = "warn" mut_mut = "warn" needless_bitwise_bool = "warn" needless_for_each = "warn" +non_std_lazy_statics = "warn" option_as_ref_cloned = "warn" ptr_offset_by_literal = "warn" +range_minus_one = "warn" +range_plus_one = "warn" redundant_else = "warn" ref_option = "warn" return_self_not_must_use = "warn" +single_char_pattern = "warn" +unchecked_time_subtraction = "warn" uninlined_format_args = "warn" +unnecessary_box_returns = "warn" +unnecessary_join = "warn" unnecessary_wraps = "warn" unnested_or_patterns = "warn" diff --git a/crates/codegen/src/compile.rs b/crates/codegen/src/compile.rs index 797ef891d..476aa35e3 100644 --- a/crates/codegen/src/compile.rs +++ b/crates/codegen/src/compile.rs @@ -4411,10 +4411,10 @@ impl Compiler { .chain(parameters.kwonlyargs.iter().map(|x| &x.parameter)) .chain(parameters.kwarg.as_deref()); - let num_annotations: u32 = + let num_annotations = u32::try_from(parameters_iter.filter(|p| p.annotation.is_some()).count()) .expect("too many annotations") - + if returns.is_some() { 1 } else { 0 }; + + u32::from(returns.is_some()); // Compile annotations inside the annotation scope let parameters_iter = parameters @@ -6925,7 +6925,7 @@ impl Compiler { let has_default = num_cases > 1 && is_trailing_wildcard_default(&cases.last().unwrap().pattern); - let case_count = num_cases - if has_default { 1 } else { 0 }; + let case_count = num_cases - usize::from(has_default); for (i, m) in cases.iter().enumerate().take(case_count) { // Only copy the subject if not on the last case if i != case_count - 1 { diff --git a/crates/host_env/src/ctypes.rs b/crates/host_env/src/ctypes.rs index ae64b06cf..9bfd41c28 100644 --- a/crates/host_env/src/ctypes.rs +++ b/crates/host_env/src/ctypes.rs @@ -1096,7 +1096,7 @@ pub fn simple_storage_value_to_bytes_endian( result } "?" => match value { - SimpleStorageValue::Bool(value) => vec![if value { 1 } else { 0 }], + SimpleStorageValue::Bool(value) => vec![u8::from(value)], _ => vec![0], }, "v" => match value { @@ -1435,11 +1435,7 @@ pub fn ffi_value_from_type_code(type_code: &str, buffer: &[u8]) -> FfiValue { .map_or(0.0, f64::from_ne_bytes), ), "z" | "Z" | "P" | "O" => FfiValue::Pointer(read_pointer_from_buffer(buffer)), - "?" => FfiValue::U8(if buffer.first().is_some_and(|&b| b != 0) { - 1 - } else { - 0 - }), + "?" => FfiValue::U8(u8::from(buffer.first().is_some_and(|&b| b != 0))), "u" => FfiValue::U32(buffer.first_chunk().copied().map_or(0, u32::from_ne_bytes)), _ => FfiValue::Pointer(0), } diff --git a/crates/host_env/src/overlapped.rs b/crates/host_env/src/overlapped.rs index d84897d62..be5e75f58 100644 --- a/crates/host_env/src/overlapped.rs +++ b/crates/host_env/src/overlapped.rs @@ -892,7 +892,7 @@ unsafe extern "system" fn post_to_queue_callback( unsafe { let _ = windows_sys::Win32::System::IO::PostQueuedCompletionStatus( data.completion_port, - if timer_or_wait_fired { 1 } else { 0 }, + u32::from(timer_or_wait_fired), 0, data.overlapped, ); diff --git a/crates/stdlib/src/ssl.rs b/crates/stdlib/src/ssl.rs index d4a01c9b1..35cb17940 100644 --- a/crates/stdlib/src/ssl.rs +++ b/crates/stdlib/src/ssl.rs @@ -3496,7 +3496,7 @@ mod _ssl { // When server_hostname=None, use an IP address to suppress SNI // no hostname = no SNI extension ServerName::IpAddress( - core::net::IpAddr::V4(core::net::Ipv4Addr::new(127, 0, 0, 1)).into(), + core::net::IpAddr::V4(core::net::Ipv4Addr::LOCALHOST).into(), ) }; diff --git a/crates/vm/src/builtins/range.rs b/crates/vm/src/builtins/range.rs index ef141cdd6..415d34fdb 100644 --- a/crates/vm/src/builtins/range.rs +++ b/crates/vm/src/builtins/range.rs @@ -406,12 +406,7 @@ impl Py<PyRange> { #[pymethod] fn count(&self, item: PyObjectRef, vm: &VirtualMachine) -> PyResult<usize> { if let Ok(int) = item.clone().downcast::<PyInt>() { - let count = if self.index_of(int.as_bigint()).is_some() { - 1 - } else { - 0 - }; - Ok(count) + Ok(usize::from(self.index_of(int.as_bigint()).is_some())) } else { // Dealing with classes who might compare equal with ints in their // __eq__, slow search. diff --git a/crates/vm/src/stdlib/_ast.rs b/crates/vm/src/stdlib/_ast.rs index 57da9b3c3..38e0d546f 100644 --- a/crates/vm/src/stdlib/_ast.rs +++ b/crates/vm/src/stdlib/_ast.rs @@ -512,14 +512,17 @@ pub(crate) fn parse_func_type( fn type_ignores_from_source(vm: &VirtualMachine, source: &str) -> Vec<PyObjectRef> { let mut ignores = Vec::new(); for (idx, line) in source.lines().enumerate() { - let Some(pos) = line.find("#") else { + let Some(pos) = line.find('#') else { continue; }; + let comment = &line[pos + 1..]; let comment = comment.trim_start(); + let Some(rest) = comment.strip_prefix("type: ignore") else { continue; }; + let tag = rest.trim_start(); let tag = if tag.is_empty() { "" } else { tag }; let node = NodeAst diff --git a/crates/vm/src/stdlib/_ctypes/base.rs b/crates/vm/src/stdlib/_ctypes/base.rs index a339e3627..62856c4ce 100644 --- a/crates/vm/src/stdlib/_ctypes/base.rs +++ b/crates/vm/src/stdlib/_ctypes/base.rs @@ -1111,11 +1111,7 @@ impl PyCData { fn _b_needsfree_(&self) -> i32 { // Borrowed (from_address) or has base object → 0 (don't free) // Owned and no base → 1 (need to free) - if self.is_borrowed() || self.base.read().is_some() { - 0 - } else { - 1 - } + i32::from(!(self.is_borrowed() || self.base.read().is_some())) } // CDataType_methods - shared across all ctypes types diff --git a/crates/vm/src/warn.rs b/crates/vm/src/warn.rs index 081a9621b..6500e8de0 100644 --- a/crates/vm/src/warn.rs +++ b/crates/vm/src/warn.rs @@ -138,7 +138,7 @@ fn get_warnings_attr( module.get_attr(attr_name, vm).ok() } -/// Get the warnings filters list from sys.modules['warnings'].filters, +/// Get the warnings filters list from `sys.modules['warnings'].filters`, /// falling back to vm.state.warnings.filters. fn get_warnings_filters(vm: &VirtualMachine) -> PyListRef { if let Some(filters_obj) = get_warnings_attr(vm, identifier!(&vm.ctx, filters), false) @@ -149,7 +149,7 @@ fn get_warnings_filters(vm: &VirtualMachine) -> PyListRef { vm.state.warnings.filters.clone() } -/// Get the default action from sys.modules['warnings']._defaultaction, +/// Get the default action from `sys.modules['warnings']._defaultaction`, /// falling back to vm.state.warnings.default_action. fn get_default_action(vm: &VirtualMachine) -> PyResult<PyObjectRef> { if let Some(action) = get_warnings_attr(vm, identifier!(&vm.ctx, defaultaction), false) { @@ -164,7 +164,7 @@ fn get_default_action(vm: &VirtualMachine) -> PyResult<PyObjectRef> { Ok(vm.state.warnings.default_action.clone().into()) } -/// Get the once registry from sys.modules['warnings']._onceregistry, +/// Get the once registry from `sys.modules['warnings']._onceregistry`, /// falling back to vm.state.warnings.once_registry. fn get_once_registry(vm: &VirtualMachine) -> PyResult<PyObjectRef> { if let Some(registry) = get_warnings_attr(vm, identifier!(&vm.ctx, onceregistry), false) { From 51b9b2ef9195e852c910166dc7b9e2bc69ad5c45 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Jun 2026 14:01:03 -0400 Subject: [PATCH 113/339] Bump the openssl group across 1 directory with 2 updates (#8124) Bumps the openssl group with 1 update in the / directory: [openssl](https://github.com/rust-openssl/rust-openssl). Updates `openssl` from 0.10.80 to 0.10.81 - [Release notes](https://github.com/rust-openssl/rust-openssl/releases) - [Commits](https://github.com/rust-openssl/rust-openssl/compare/openssl-v0.10.80...openssl-v0.10.81) Updates `openssl-sys` from 0.9.116 to 0.9.117 - [Release notes](https://github.com/rust-openssl/rust-openssl/releases) - [Commits](https://github.com/rust-openssl/rust-openssl/compare/openssl-sys-v0.9.116...openssl-sys-v0.9.117) --- updated-dependencies: - dependency-name: openssl dependency-version: 0.10.81 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: openssl - dependency-name: openssl-sys dependency-version: 0.9.117 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: openssl ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bf1354fa0..2f916ef8c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2534,9 +2534,9 @@ checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e" [[package]] name = "openssl" -version = "0.10.80" +version = "0.10.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a45fa2aa886c42762255da344f0a0d313e254066c46aad76f300c3d3da62d967" +checksum = "77823a27f0babb03091cb9ed9ef80af3b39dbc82f97e8fa530374b7dafd87a45" dependencies = [ "bitflags 2.13.0", "cfg-if", @@ -2574,9 +2574,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.116" +version = "0.9.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28a22dc7140cda5f096e5e7724a6962ca81a7f8bfd2979f9b18c11af56318c4" +checksum = "b47e7e6bb2c38cd930d25a23b40fa52e068c10e85f3e03a7f5ba5aaca5713695" dependencies = [ "cc", "libc", @@ -4369,7 +4369,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ "fastrand", - "getrandom 0.3.4", + "getrandom 0.4.2", "once_cell", "rustix", "windows-sys 0.61.2", From a1b54bc4e723a3c739e93f41c60427c2b9b7f1c5 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Mon, 22 Jun 2026 07:17:21 +0300 Subject: [PATCH 114/339] General code nits (#8107) * General nits * compiler * cformat * gc_state * fix release compile * Fix logic error * revert bad logic error * don't inline elapsed_time --- crates/stdlib/src/pystruct.rs | 7 +- crates/vm/src/anystr.rs | 40 +++--- crates/vm/src/buffer.rs | 9 +- crates/vm/src/builtins/float.rs | 4 +- crates/vm/src/builtins/staticmethod.rs | 1 + crates/vm/src/byte.rs | 5 +- crates/vm/src/cformat.rs | 161 ++++++++++++++----------- crates/vm/src/class.rs | 24 ++-- crates/vm/src/codecs.rs | 86 ++++++++----- crates/vm/src/compiler.rs | 65 +++++----- crates/vm/src/convert/try_from.rs | 10 +- crates/vm/src/gc_state.rs | 37 +++--- crates/vm/src/recursion.rs | 10 +- crates/vm/src/suggestion.rs | 3 +- 14 files changed, 268 insertions(+), 194 deletions(-) diff --git a/crates/stdlib/src/pystruct.rs b/crates/stdlib/src/pystruct.rs index 8cf1023c8..c525942e3 100644 --- a/crates/stdlib/src/pystruct.rs +++ b/crates/stdlib/src/pystruct.rs @@ -51,9 +51,8 @@ pub(crate) mod _struct { s } b @ PyBytes => { - let ascii_str = ascii::AsciiStr::from_ascii(&b).map_err(|_| { - new_struct_error(vm, "bad char in struct format".to_owned()) - })?; + let ascii_str = ascii::AsciiStr::from_ascii(&b) + .map_err(|_| new_struct_error(vm, "bad char in struct format"))?; vm.ctx.new_str(ascii_str) } other => @@ -192,7 +191,7 @@ pub(crate) mod _struct { if format_spec.size == 0 { Err(new_struct_error( vm, - "cannot iteratively unpack with a struct of length 0".to_owned(), + "cannot iteratively unpack with a struct of length 0", )) } else if !buffer.len().is_multiple_of(format_spec.size) { Err(new_struct_error( diff --git a/crates/vm/src/anystr.rs b/crates/vm/src/anystr.rs index f1c35ecd6..3aa40eaf3 100644 --- a/crates/vm/src/anystr.rs +++ b/crates/vm/src/anystr.rs @@ -1,15 +1,16 @@ +use core::ops::Range; + +use icu_properties::props::{ + BinaryProperty, EnumeratedProperty, GeneralCategory, GeneralCategoryGroup, +}; +use num_traits::{cast::ToPrimitive, sign::Signed}; + use crate::{ Py, PyObject, PyObjectRef, PyResult, TryFromObject, VirtualMachine, builtins::{PyIntRef, PyTuple}, convert::TryFromBorrowedObject, function::OptionalOption, }; -use icu_properties::props::{ - BinaryProperty, EnumeratedProperty, GeneralCategory, GeneralCategoryGroup, -}; -use num_traits::{cast::ToPrimitive, sign::Signed}; - -use core::ops::Range; #[derive(FromArgs)] pub struct SplitArgs<T: TryFromObject> { @@ -422,6 +423,7 @@ pub(crate) trait AnyStr { } lower = true; } + lower } @@ -439,6 +441,7 @@ pub(crate) trait AnyStr { } upper = true; } + upper } @@ -461,10 +464,12 @@ pub(crate) trait AnyStr { { return false; } + if !all_cased && VALID::for_char(c) { all_cased = true; } } + all_cased } } @@ -484,18 +489,19 @@ where F: Fn(T) -> PyResult<bool>, M: Fn(&PyObject) -> String, { - match obj.try_to_value::<T>(vm) { - Ok(single) => (predicate)(single), - Err(_) => { - let tuple: &Py<PyTuple> = obj - .try_to_value(vm) - .map_err(|_| vm.new_type_error((message)(obj)))?; - for obj in tuple { - if single_or_tuple_any(obj, predicate, message, vm)? { - return Ok(true); - } + if let Ok(single) = obj.try_to_value::<T>(vm) { + (predicate)(single) + } else { + let tuple: &Py<PyTuple> = obj + .try_to_value(vm) + .map_err(|_| vm.new_type_error((message)(obj)))?; + + for obj in tuple { + if single_or_tuple_any(obj, predicate, message, vm)? { + return Ok(true); } - Ok(false) } + + Ok(false) } } diff --git a/crates/vm/src/buffer.rs b/crates/vm/src/buffer.rs index 255250485..a174e2fd6 100644 --- a/crates/vm/src/buffer.rs +++ b/crates/vm/src/buffer.rs @@ -5,8 +5,10 @@ use crate::{ convert::ToPyObject, function::{ArgBytesLike, ArgIntoBool, ArgIntoFloat}, }; -use alloc::fmt; -use core::{iter::Peekable, mem}; + +use rustpython_common::wtf8::Wtf8Buf; + +use core::{fmt, iter::Peekable, mem}; use half::f16; use itertools::Itertools; use malachite_bigint::BigInt; @@ -736,9 +738,8 @@ pub fn struct_error_type(vm: &VirtualMachine) -> &'static PyTypeRef { INSTANCE.get_or_init(|| vm.ctx.new_exception_type("struct", "error", None)) } -pub fn new_struct_error(vm: &VirtualMachine, msg: impl Into<String>) -> PyBaseExceptionRef { +pub fn new_struct_error<T: Into<Wtf8Buf>>(vm: &VirtualMachine, msg: T) -> PyBaseExceptionRef { // can't just STRUCT_ERROR.get().unwrap() cause this could be called before from buffer // machinery, independent of whether _struct was ever imported - let msg: String = msg.into(); vm.new_exception_msg(struct_error_type(vm).clone(), msg.into()) } diff --git a/crates/vm/src/builtins/float.rs b/crates/vm/src/builtins/float.rs index db6478d66..6f9fd382b 100644 --- a/crates/vm/src/builtins/float.rs +++ b/crates/vm/src/builtins/float.rs @@ -84,6 +84,7 @@ impl ToPyObject for f64 { vm.ctx.new_float(self).into() } } + impl ToPyObject for f32 { fn to_pyobject(self, vm: &VirtualMachine) -> PyObjectRef { vm.ctx.new_float(f64::from(self)).into() @@ -156,8 +157,7 @@ fn inner_divmod(v1: f64, v2: f64, vm: &VirtualMachine) -> PyResult<(f64, f64)> { pub(crate) fn float_pow(v1: f64, v2: f64, vm: &VirtualMachine) -> PyResult { if v1.is_zero() && v2.is_sign_negative() { - let msg = "zero to a negative power"; - Err(vm.new_zero_division_error(msg.to_owned())) + Err(vm.new_zero_division_error("zero to a negative power")) } else if v1.is_sign_negative() && (v2.floor() - v2).abs() > f64::EPSILON { let v1 = Complex64::new(v1, 0.); let v2 = Complex64::new(v2, 0.); diff --git a/crates/vm/src/builtins/staticmethod.rs b/crates/vm/src/builtins/staticmethod.rs index 3a8d451b3..1ab697a0a 100644 --- a/crates/vm/src/builtins/staticmethod.rs +++ b/crates/vm/src/builtins/staticmethod.rs @@ -68,6 +68,7 @@ impl PyStaticMethod { callable: PyMutex::new(callable), } } + #[deprecated(note = "use PyStaticMethod::new(...).into_ref() instead")] pub fn new_ref(callable: PyObjectRef, ctx: &Context) -> PyRef<Self> { Self::new(callable).into_ref(ctx) diff --git a/crates/vm/src/byte.rs b/crates/vm/src/byte.rs index d9e927cbf..933ddead4 100644 --- a/crates/vm/src/byte.rs +++ b/crates/vm/src/byte.rs @@ -1,8 +1,9 @@ //! byte operation APIs -use crate::object::AsObject; -use crate::{PyObject, PyResult, VirtualMachine}; + use num_traits::ToPrimitive; +use crate::{AsObject, PyObject, PyResult, VirtualMachine}; + pub fn bytes_from_object(vm: &VirtualMachine, obj: &PyObject) -> PyResult<Vec<u8>> { if let Ok(elements) = obj.try_bytes_like(vm, |bytes| bytes.to_vec()) { return Ok(elements); diff --git a/crates/vm/src/cformat.rs b/crates/vm/src/cformat.rs index 6bf6062c8..3bba0e5f8 100644 --- a/crates/vm/src/cformat.rs +++ b/crates/vm/src/cformat.rs @@ -3,8 +3,9 @@ //! Implementation of Printf-Style string formatting //! as per the [Python Docs](https://docs.python.org/3/library/stdtypes.html#printf-style-string-formatting). -use crate::common::cformat::*; -use crate::common::wtf8::{CodePoint, Wtf8, Wtf8Buf}; +use itertools::Itertools; +use num_traits::cast::ToPrimitive; + use crate::{ AsObject, PyObject, PyObjectRef, PyResult, TryFromBorrowedObject, TryFromObject, VirtualMachine, @@ -12,12 +13,18 @@ use crate::{ PyBaseExceptionRef, PyByteArray, PyBytes, PyFloat, PyInt, PyStr, int::check_int_to_str_digits, try_f64_to_bigint, tuple, }, + common::{ + cformat::{ + CCharacterType, CConversionFlags, CFormatBytes, CFormatConversion, CFormatPart, + CFormatPrecision, CFormatQuantity, CFormatSpec, CFormatSpecKeyed, CFormatType, + CFormatWtf8, CNumberType, + }, + wtf8::{CodePoint, Wtf8, Wtf8Buf}, + }, function::ArgIntoFloat, protocol::PyBuffer, stdlib::builtins, }; -use itertools::Itertools; -use num_traits::cast::ToPrimitive; fn spec_format_bytes( vm: &VirtualMachine, @@ -39,11 +46,12 @@ fn spec_format_bytes( let bytes = vm .get_special_method(&obj, identifier!(vm, __bytes__))? .ok_or_else(|| { - vm.new_type_error(format!( + let msg = format!( "%b requires a bytes-like object, or an object that \ implements __bytes__, not '{}'", obj.class().name() - )) + ); + vm.new_type_error(msg) })? .invoke((), vm)?; let bytes = PyBytes::try_from_borrowed_object(vm, &bytes)?; @@ -71,6 +79,7 @@ fn spec_format_bytes( check_int_to_str_digits(i.as_bigint(), vm)?; return Ok(spec.format_number(i.as_bigint()).into_bytes()); } + if let Some(method) = vm.get_method(obj.clone(), identifier!(vm, __int__)) { let result = method?.call((), vm)?; if let Some(i) = result.downcast_ref::<PyInt>() { @@ -78,6 +87,7 @@ fn spec_format_bytes( return Ok(spec.format_number(i.as_bigint()).into_bytes()); } } + Err(vm.new_type_error(format!( "%{} format: a real number is required, not {}", spec.format_type.to_char(), @@ -301,6 +311,7 @@ fn try_update_quantity_from_tuple<'a, I: Iterator<Item = &'a PyObjectRef>>( let Some(CFormatQuantity::FromValuesTuple) = q else { return Ok(()); }; + let element = elements.next(); f.insert(try_conversion_flag_from_tuple( vm, @@ -319,6 +330,7 @@ fn try_update_precision_from_tuple<'a, I: Iterator<Item = &'a PyObjectRef>>( let Some(CFormatPrecision::Quantity(CFormatQuantity::FromValuesTuple)) = p else { return Ok(()); }; + let quantity = try_update_quantity_from_element(vm, elements.next().map(|v| v.as_ref()))?; *p = Some(CFormatPrecision::Quantity(quantity)); Ok(()) @@ -347,42 +359,45 @@ pub(crate) fn cformat_bytes( && !values_obj.fast_isinstance(vm.ctx.types.bytearray_type); if num_specifiers == 0 { - // literal only - return if is_mapping - || values_obj + if !is_mapping + && values_obj .downcast_ref::<tuple::PyTuple>() - .is_some_and(|e| e.is_empty()) + .is_none_or(|e| !e.is_empty()) { - for (_, part) in format.iter_mut() { - match part { - CFormatPart::Literal(literal) => result.append(literal), - CFormatPart::Spec(_) => unreachable!(), - } + return Err(vm.new_type_error("not all arguments converted during bytes formatting")); + } + + // literal only + for (_, part) in format.iter_mut() { + if let CFormatPart::Literal(literal) = part { + result.append(literal) + } else { + unreachable!() } - Ok(result) - } else { - Err(vm.new_type_error("not all arguments converted during bytes formatting")) - }; + } + + return Ok(result); } if mapping_required { + if !is_mapping { + return Err(vm.new_type_error("format requires a mapping")); + } + // dict - return if is_mapping { - for (_, part) in format { - match part { - CFormatPart::Literal(literal) => result.extend(literal), - CFormatPart::Spec(CFormatSpecKeyed { mapping_key, spec }) => { - let key = mapping_key.unwrap(); - let value = values_obj.get_item(&key, vm)?; - let part_result = spec_format_bytes(vm, &spec, value)?; - result.extend(part_result); - } + for (_, part) in format { + match part { + CFormatPart::Literal(literal) => result.extend(literal), + CFormatPart::Spec(CFormatSpecKeyed { mapping_key, spec }) => { + let key = mapping_key.unwrap(); + let value = values_obj.get_item(&key, vm)?; + let part_result = spec_format_bytes(vm, &spec, value)?; + result.extend(part_result); } } - Ok(result) - } else { - Err(vm.new_type_error("format requires a mapping")) - }; + } + + return Ok(result); } // tuple @@ -405,18 +420,18 @@ pub(crate) fn cformat_bytes( )?; try_update_precision_from_tuple(vm, &mut value_iter, &mut spec.precision)?; - let value = match value_iter.next() { - Some(obj) => Ok(obj.clone()), - None => Err(vm.new_type_error("not enough arguments for format string")), - }?; - let part_result = spec_format_bytes(vm, &spec, value)?; + let Some(value) = value_iter.next() else { + return Err(vm.new_type_error("not enough arguments for format string")); + }; + + let part_result = spec_format_bytes(vm, &spec, value.clone())?; result.extend(part_result); } } } // check that all arguments were converted - if value_iter.next().is_some() && !is_mapping { + if !is_mapping && value_iter.next().is_some() { Err(vm.new_type_error("not all arguments converted during bytes formatting")) } else { Ok(result) @@ -441,41 +456,44 @@ pub(crate) fn cformat_string( && !values_obj.fast_isinstance(vm.ctx.types.str_type); if num_specifiers == 0 { - // literal only - return if is_mapping - || values_obj + if !is_mapping + && values_obj .downcast_ref::<tuple::PyTuple>() - .is_some_and(|e| e.is_empty()) + .is_none_or(|e| !e.is_empty()) { - for (_, part) in format.iter() { - match part { - CFormatPart::Literal(literal) => result.push_wtf8(literal), - CFormatPart::Spec(_) => unreachable!(), - } + return Err(vm.new_type_error("not all arguments converted during string formatting")); + } + + // literal only + for (_, part) in format.iter() { + if let CFormatPart::Literal(literal) = part { + result.push_wtf8(literal) + } else { + unreachable!() } - Ok(result) - } else { - Err(vm.new_type_error("not all arguments converted during string formatting")) - }; + } + + return Ok(result); } if mapping_required { + if !is_mapping { + return Err(vm.new_type_error("format requires a mapping")); + } + // dict - return if is_mapping { - for (idx, part) in format { - match part { - CFormatPart::Literal(literal) => result.push_wtf8(&literal), - CFormatPart::Spec(CFormatSpecKeyed { mapping_key, spec }) => { - let value = values_obj.get_item(&mapping_key.unwrap(), vm)?; - let part_result = spec_format_string(vm, &spec, value, idx)?; - result.push_wtf8(&part_result); - } + for (idx, part) in format { + match part { + CFormatPart::Literal(literal) => result.push_wtf8(&literal), + CFormatPart::Spec(CFormatSpecKeyed { mapping_key, spec }) => { + let value = values_obj.get_item(&mapping_key.unwrap(), vm)?; + let part_result = spec_format_string(vm, &spec, value, idx)?; + result.push_wtf8(&part_result); } } - Ok(result) - } else { - Err(vm.new_type_error("format requires a mapping")) - }; + } + + return Ok(result); } // tuple @@ -484,6 +502,7 @@ pub(crate) fn cformat_string( } else { core::slice::from_ref(&values_obj) }; + let mut value_iter = values.iter(); for (idx, part) in format { @@ -498,18 +517,18 @@ pub(crate) fn cformat_string( )?; try_update_precision_from_tuple(vm, &mut value_iter, &mut spec.precision)?; - let value = match value_iter.next() { - Some(obj) => Ok(obj.clone()), - None => Err(vm.new_type_error("not enough arguments for format string")), - }?; - let part_result = spec_format_string(vm, &spec, value, idx)?; + let Some(value) = value_iter.next() else { + return Err(vm.new_type_error("not enough arguments for format string")); + }; + + let part_result = spec_format_string(vm, &spec, value.clone(), idx)?; result.push_wtf8(&part_result); } } } // check that all arguments were converted - if value_iter.next().is_some() && !is_mapping { + if !is_mapping && value_iter.next().is_some() { Err(vm.new_type_error("not all arguments converted during string formatting")) } else { Ok(result) diff --git a/crates/vm/src/class.rs b/crates/vm/src/class.rs index 2e8af54f9..364ae7211 100644 --- a/crates/vm/src/class.rs +++ b/crates/vm/src/class.rs @@ -66,16 +66,19 @@ pub fn add_operators(class: &'static Py<PyType>, ctx: &Context) { pub trait StaticType { // Ideally, saving PyType is better than PyTypeRef fn static_cell() -> &'static static_cell::StaticCell<PyTypeRef>; + #[inline] #[must_use] fn static_metaclass() -> &'static Py<PyType> { PyType::static_type() } + #[inline] #[must_use] fn static_baseclass() -> &'static Py<PyType> { PyBaseObject::static_type() } + #[inline] #[must_use] fn static_type() -> &'static Py<PyType> { @@ -87,6 +90,7 @@ pub trait StaticType { } Self::static_cell().get().unwrap_or_else(|| fail()) } + #[must_use] fn init_manually(typ: PyTypeRef) -> &'static Py<PyType> { let cell = Self::static_cell(); @@ -94,6 +98,7 @@ pub trait StaticType { .unwrap_or_else(|_| panic!("double initialization from init_manually")); cell.get().unwrap() } + #[must_use] fn init_builtin_type() -> &'static Py<PyType> where @@ -105,6 +110,7 @@ pub trait StaticType { .unwrap_or_else(|_| panic!("double initialization of {}", Self::NAME)); cell.get().unwrap() } + #[must_use] fn create_static_type() -> PyTypeRef where @@ -137,14 +143,19 @@ pub trait PyClassDef { pub trait PyClassImpl: PyClassDef { const TP_FLAGS: PyTypeFlags = PyTypeFlags::DEFAULT; + const METHOD_DEFS: &'static [PyMethodDef]; + + fn impl_extend_class(ctx: &'static Context, class: &'static Py<PyType>); + + fn extend_slots(slots: &mut PyTypeSlots); + fn extend_class(ctx: &'static Context, class: &'static Py<PyType>) where Self: Sized, { + // NOTE: `is_created_with_flags` if only available when debug_assertions is true #[cfg(debug_assertions)] - { - assert!(class.slots.flags.is_created_with_flags()); - } + debug_assert!(class.slots.flags.is_created_with_flags()); let _ = ctx.intern_str(Self::NAME); // intern type name @@ -161,7 +172,9 @@ pub trait PyClassImpl: PyClassDef { .into(), ); } + Self::impl_extend_class(ctx, class); + if let Some(doc) = Self::DOC { // Only set __doc__ if it doesn't already exist (e.g., as a member descriptor) // This matches CPython's behavior in type_dict_set_doc @@ -170,6 +183,7 @@ pub trait PyClassImpl: PyClassDef { class.set_attr(doc_attr_name, ctx.new_str(doc).into()); } } + if let Some(module_name) = Self::MODULE_NAME { let module_key = identifier!(ctx, __module__); // Don't overwrite a getset descriptor for __module__ (e.g. TypeAliasType @@ -230,10 +244,6 @@ pub trait PyClassImpl: PyClassDef { .to_owned() } - fn impl_extend_class(ctx: &'static Context, class: &'static Py<PyType>); - const METHOD_DEFS: &'static [PyMethodDef]; - fn extend_slots(slots: &mut PyTypeSlots); - fn make_slots() -> PyTypeSlots { let mut slots = PyTypeSlots { flags: Self::TP_FLAGS, diff --git a/crates/vm/src/codecs.rs b/crates/vm/src/codecs.rs index a07ffb47e..c06caefef 100644 --- a/crates/vm/src/codecs.rs +++ b/crates/vm/src/codecs.rs @@ -1,14 +1,19 @@ +use alloc::borrow::Cow; +use core::ops::{Deref, Range}; +use std::collections::HashMap; + use rustpython_common::{ + ascii, borrow::BorrowedValue, encodings::{ CodecContext, DecodeContext, DecodeErrorHandler, EncodeContext, EncodeErrorHandler, EncodeReplace, StrBuffer, StrSize, errors, }, + lock::{OnceCell, PyRwLock}, str::StrKind, wtf8::{CodePoint, Wtf8, Wtf8Buf}, }; -use crate::common::lock::OnceCell; use crate::{ AsObject, Context, Py, PyObject, PyObjectRef, PyResult, TryFromBorrowedObject, TryFromObject, VirtualMachine, @@ -16,13 +21,9 @@ use crate::{ PyBaseExceptionRef, PyBytes, PyBytesRef, PyStr, PyStrRef, PyTuple, PyTupleRef, PyUtf8Str, PyUtf8StrRef, }, - common::{ascii, lock::PyRwLock}, convert::ToPyObject, function::{ArgBytesLike, PyMethodDef}, }; -use alloc::borrow::Cow; -use core::ops::{self, Range}; -use std::collections::HashMap; pub struct CodecsRegistry { inner: PyRwLock<RegistryInner>, @@ -39,6 +40,7 @@ pub(crate) const DEFAULT_ENCODING: &str = "utf-8"; #[derive(Clone)] #[repr(transparent)] pub struct PyCodec(PyTupleRef); + impl PyCodec { #[inline] pub fn from_tuple(tuple: PyTupleRef) -> Result<Self, PyTupleRef> { @@ -48,10 +50,12 @@ impl PyCodec { Err(tuple) } } + #[inline] pub fn into_tuple(self) -> PyTupleRef { self.0 } + #[inline] pub fn as_tuple(&self) -> &Py<PyTuple> { &self.0 @@ -61,6 +65,7 @@ impl PyCodec { pub fn get_encode_func(&self) -> &PyObject { &self.0[0] } + #[inline] pub fn get_decode_func(&self) -> &PyObject { &self.0[1] @@ -116,10 +121,7 @@ impl PyCodec { errors: Option<PyStrRef>, vm: &VirtualMachine, ) -> PyResult { - let args = match errors { - Some(e) => vec![e.into()], - None => vec![], - }; + let args = errors.map_or_else(Vec::new, |e| vec![e.into()]); vm.call_method(self.0.as_object(), "incrementalencoder", args) } @@ -128,10 +130,7 @@ impl PyCodec { errors: Option<PyStrRef>, vm: &VirtualMachine, ) -> PyResult { - let args = match errors { - Some(e) => vec![e.into()], - None => vec![], - }; + let args = errors.map_or_else(Vec::new, |e| vec![e.into()]); vm.call_method(self.0.as_object(), "incrementaldecoder", args) } } @@ -191,16 +190,17 @@ impl CodecsRegistry { ("namereplace", methods[5].build_function(ctx)), ("surrogatepass", methods[6].build_function(ctx)), ("surrogateescape", methods[7].build_function(ctx)), - ]; - let errors = errors - .into_iter() - .map(|(name, f)| (name.to_owned(), f.into())) - .collect(); + ] + .into_iter() + .map(|(name, f)| (name.to_owned(), f.into())) + .collect(); + let inner = RegistryInner { search_path: Vec::new(), search_cache: HashMap::new(), errors, }; + Self { inner: PyRwLock::new(inner), } @@ -210,6 +210,7 @@ impl CodecsRegistry { if !search_function.is_callable() { return Err(vm.new_type_error("argument must be callable")); } + self.inner.write().search_path.push(search_function); Ok(()) } @@ -250,6 +251,7 @@ impl CodecsRegistry { } inner.search_path.clone() }; + let encoding: PyUtf8StrRef = vm.ctx.new_utf8_str(encoding.as_ref()); for func in search_path { let res = func.call((encoding.clone(),), vm)?; @@ -264,6 +266,7 @@ impl CodecsRegistry { return Ok(codec.clone()); } } + Err(vm.new_lookup_error(format!("unknown encoding: {encoding}"))) } @@ -274,6 +277,7 @@ impl CodecsRegistry { vm: &VirtualMachine, ) -> PyResult<PyCodec> { let codec = self.lookup(encoding, vm)?; + if codec.is_text_codec(vm)? { Ok(codec) } else { @@ -430,7 +434,7 @@ fn normalize_encoding_name(encoding: &str) -> Cow<'_, str> { out.into() } -#[derive(Eq, PartialEq)] +#[derive(Clone, Copy, Eq, PartialEq)] enum StandardEncoding { Utf8, Utf16Be, @@ -455,12 +459,14 @@ impl StandardEncoding { let encoding = encoding .strip_prefix(|c| ['-', '_'].contains(&c)) .unwrap_or(encoding); + if encoding == "8" { Some(Self::Utf8) } else if let Some(encoding) = encoding.strip_prefix("16") { if encoding.is_empty() { return Some(Self::UTF_16_NE); } + let encoding = encoding.strip_prefix(['-', '_']).unwrap_or(encoding); match encoding { "be" => Some(Self::Utf16Be), @@ -471,6 +477,7 @@ impl StandardEncoding { if encoding.is_empty() { return Some(Self::UTF_32_NE); } + let encoding = encoding.strip_prefix(['-', '_']).unwrap_or(encoding); match encoding { "be" => Some(Self::Utf32Be), @@ -504,10 +511,12 @@ impl<'a> EncodeErrorHandler<PyEncodeContext<'a>> for SurrogatePass { let mut out: Vec<u8> = Vec::with_capacity(num_chars * 4); for ch in err_str.code_points() { let c = ch.to_u32(); - let 0xd800..=0xdfff = c else { + + if !(0xd800..=0xdfff).contains(&c) { // Not a surrogate, fail with original exception return Err(ctx.error_encoding(range, reason)); - }; + } + match standard_encoding { StandardEncoding::Utf8 => out.extend(ch.encode_wtf8(&mut [0; 4]).as_bytes()), StandardEncoding::Utf16Le => out.extend((c as u16).to_le_bytes()), @@ -601,7 +610,9 @@ impl<'a> PyEncodeContext<'a> { impl CodecContext for PyEncodeContext<'_> { type Error = PyBaseExceptionRef; + type StrBuf = PyStrRef; + type BytesBuf = PyBytesRef; fn string(&self, s: Wtf8Buf) -> Self::StrBuf { @@ -612,6 +623,7 @@ impl CodecContext for PyEncodeContext<'_> { self.vm.ctx.new_bytes(b) } } + impl EncodeContext for PyEncodeContext<'_> { fn full_data(&self) -> &Wtf8 { self.data.as_wtf8() @@ -690,12 +702,15 @@ pub(crate) struct PyDecodeContext<'a> { pos: usize, exception: OnceCell<PyBaseExceptionRef>, } + enum PyDecodeData<'a> { Original(BorrowedValue<'a, [u8]>), Modified(PyBytesRef), } -impl ops::Deref for PyDecodeData<'_> { + +impl Deref for PyDecodeData<'_> { type Target = [u8]; + fn deref(&self) -> &Self::Target { match self { PyDecodeData::Original(data) => data, @@ -719,7 +734,9 @@ impl<'a> PyDecodeContext<'a> { impl CodecContext for PyDecodeContext<'_> { type Error = PyBaseExceptionRef; + type StrBuf = PyStrRef; + type BytesBuf = PyBytesRef; fn string(&self, s: Wtf8Buf) -> Self::StrBuf { @@ -730,6 +747,7 @@ impl CodecContext for PyDecodeContext<'_> { self.vm.ctx.new_bytes(b) } } + impl DecodeContext for PyDecodeContext<'_> { fn full_data(&self) -> &[u8] { &self.data @@ -872,17 +890,19 @@ enum ResolvedError { impl<'a> ErrorsHandler<'a> { #[inline] pub(crate) fn new(errors: Option<&'a Py<PyUtf8Str>>, vm: &VirtualMachine) -> Self { - match errors { - Some(errors) => Self { + if let Some(errors) = errors { + Self { errors, resolved: OnceCell::new(), - }, - None => Self { + } + } else { + Self { errors: identifier_utf8!(vm, strict), resolved: OnceCell::from(ResolvedError::Standard(StandardError::Strict)), - }, + } } } + #[inline] fn resolve(&self, vm: &VirtualMachine) -> PyResult<&ResolvedError> { if let Some(val) = self.resolved.get() { @@ -901,11 +921,13 @@ impl<'a> ErrorsHandler<'a> { Ok(self.resolved.get().unwrap()) } } + impl StrBuffer for PyStrRef { fn is_compatible_with(&self, kind: StrKind) -> bool { self.kind() <= kind } } + impl<'a> EncodeErrorHandler<PyEncodeContext<'a>> for ErrorsHandler<'_> { fn handle_encode_error( &self, @@ -956,6 +978,7 @@ impl<'a> EncodeErrorHandler<PyEncodeContext<'a>> for ErrorsHandler<'_> { Ok((replace, restart)) } } + impl<'a> DecodeErrorHandler<PyDecodeContext<'a>> for ErrorsHandler<'_> { fn handle_decode_error( &self, @@ -1110,8 +1133,10 @@ where fn extract_unicode_error_range(err: &PyObject, vm: &VirtualMachine) -> PyResult<Range<usize>> { let start = err.get_attr("start", vm)?; let start = start.try_into_value(vm)?; + let end = err.get_attr("end", vm)?; let end = end.try_into_value(vm)?; + Ok(Range { start, end }) } @@ -1134,10 +1159,12 @@ fn update_unicode_error_attrs( fn is_encode_err(err: &PyObject, vm: &VirtualMachine) -> bool { err.fast_isinstance(vm.ctx.exceptions.unicode_encode_error) } + #[inline] fn is_decode_err(err: &PyObject, vm: &VirtualMachine) -> bool { err.fast_isinstance(vm.ctx.exceptions.unicode_decode_error) } + #[inline] fn is_translate_err(err: &PyObject, vm: &VirtualMachine) -> bool { err.fast_isinstance(vm.ctx.exceptions.unicode_translate_error) @@ -1151,10 +1178,9 @@ fn bad_err_type(err: PyObjectRef, vm: &VirtualMachine) -> PyBaseExceptionRef { } fn strict_errors(err: PyObjectRef, vm: &VirtualMachine) -> PyResult { - let err = err + Err(err .downcast() - .unwrap_or_else(|_| vm.new_type_error("codec must pass exception instance")); - Err(err) + .unwrap_or_else(|_| vm.new_type_error("codec must pass exception instance"))) } fn ignore_errors(err: PyObjectRef, vm: &VirtualMachine) -> PyResult<(PyObjectRef, usize)> { diff --git a/crates/vm/src/compiler.rs b/crates/vm/src/compiler.rs index 25fa33302..9842bc0d1 100644 --- a/crates/vm/src/compiler.rs +++ b/crates/vm/src/compiler.rs @@ -1,45 +1,42 @@ +#[cfg(all(not(feature = "compiler"), feature = "parser", feature = "codegen",))] +compile_error!("Use --features=compiler to enable both parser and codegen"); + #[cfg(feature = "codegen")] pub use rustpython_codegen::CompileOpts; -#[cfg(feature = "compiler")] -pub use rustpython_compiler::*; - -#[cfg(not(feature = "compiler"))] -pub use rustpython_compiler_core::Mode; - -#[cfg(not(feature = "compiler"))] -pub use rustpython_compiler_core as core; - -#[cfg(not(feature = "compiler"))] -pub use ruff_python_parser as parser; - -#[cfg(not(feature = "compiler"))] -mod error { - #[cfg(all(feature = "parser", feature = "codegen"))] - panic!("Use --features=compiler to enable both parser and codegen"); - - #[derive(Debug, thiserror::Error)] - pub enum CompileErrorType { - #[cfg(feature = "codegen")] - #[error(transparent)] - Codegen(#[from] super::codegen::error::CodegenErrorType), - #[cfg(feature = "parser")] - #[error(transparent)] - Parse(#[from] super::parser::ParseErrorType), +cfg_select! { + feature = "compiler" => { + pub use rustpython_compiler::*; } + _ => { + pub use ruff_python_parser as parser; - #[derive(Debug, thiserror::Error)] - pub enum CompileError { - #[cfg(feature = "codegen")] - #[error(transparent)] - Codegen(#[from] super::codegen::error::CodegenError), - #[cfg(feature = "parser")] - #[error(transparent)] - Parse(#[from] super::parser::ParseError), + pub use rustpython_compiler_core::Mode; + pub use rustpython_compiler_core as core; } } + #[cfg(not(feature = "compiler"))] -pub use error::{CompileError, CompileErrorType}; +#[derive(Debug, thiserror::Error)] +pub enum CompileErrorType { + #[cfg(feature = "codegen")] + #[error(transparent)] + Codegen(#[from] super::codegen::error::CodegenErrorType), + #[cfg(feature = "parser")] + #[error(transparent)] + Parse(#[from] super::parser::ParseErrorType), +} + +#[cfg(not(feature = "compiler"))] +#[derive(Debug, thiserror::Error)] +pub enum CompileError { + #[cfg(feature = "codegen")] + #[error(transparent)] + Codegen(#[from] super::codegen::error::CodegenError), + #[cfg(feature = "parser")] + #[error(transparent)] + Parse(#[from] super::parser::ParseError), +} #[cfg(any(feature = "parser", feature = "codegen"))] impl crate::convert::ToPyException for (CompileError, Option<&str>) { diff --git a/crates/vm/src/convert/try_from.rs b/crates/vm/src/convert/try_from.rs index 85d6f5e20..10b1449d7 100644 --- a/crates/vm/src/convert/try_from.rs +++ b/crates/vm/src/convert/try_from.rs @@ -1,10 +1,11 @@ +use malachite_bigint::Sign; +use num_traits::ToPrimitive; + use crate::{ Py, VirtualMachine, builtins::PyFloat, object::{AsObject, PyObject, PyObjectRef, PyPayload, PyRef, PyResult}, }; -use malachite_bigint::Sign; -use num_traits::ToPrimitive; /// Implemented by any type that can be created from a Python object. /// @@ -62,7 +63,7 @@ impl PyObject { } } -/// Lower-cost variation of `TryFromObject` +/// Lower-cost variation of [`TryFromObject`]. pub trait TryFromBorrowedObject<'a>: Sized where Self: 'a, @@ -126,12 +127,15 @@ impl TryFromObject for core::time::Duration { fn try_from_object(vm: &VirtualMachine, obj: PyObjectRef) -> PyResult<Self> { if let Some(float) = obj.downcast_ref::<PyFloat>() { let f = float.to_f64(); + if f.is_nan() { return Err(vm.new_value_error("Invalid value NaN (not a number)")); } + if f < 0.0 { return Err(vm.new_value_error("negative duration")); } + if !f.is_finite() || f > u64::MAX as f64 { return Err(vm.new_overflow_error("timestamp too large to convert to C PyTime_t")); } diff --git a/crates/vm/src/gc_state.rs b/crates/vm/src/gc_state.rs index ecb34fcc8..93596a9da 100644 --- a/crates/vm/src/gc_state.rs +++ b/crates/vm/src/gc_state.rs @@ -10,14 +10,14 @@ use core::ptr::NonNull; use core::sync::atomic::{AtomicBool, AtomicU32, AtomicUsize, Ordering}; use std::collections::HashSet; -#[cfg(not(target_arch = "wasm32"))] -fn elapsed_secs(start: &std::time::Instant) -> f64 { - start.elapsed().as_secs_f64() -} - -#[cfg(target_arch = "wasm32")] -fn elapsed_secs(_start: &()) -> f64 { - 0.0 +fn elapsed_secs( + #[cfg(target_arch = "wasm32")] _start: &(), + #[cfg(not(target_arch = "wasm32"))] start: &std::time::Instant, +) -> f64 { + cfg_select! { + target_arch = "wasm32" => 0.0, + _ => start.elapsed().as_secs_f64(), + } } bitflags::bitflags! { @@ -38,7 +38,7 @@ bitflags::bitflags! { } /// Result from a single collection run -#[derive(Debug, Default)] +#[derive(Clone, Copy, Debug, Default)] pub struct CollectResult { pub collected: usize, pub uncollectable: usize, @@ -47,7 +47,7 @@ pub struct CollectResult { } /// Statistics for a single generation (gc_generation_stats) -#[derive(Debug, Default)] +#[derive(Clone, Copy, Debug, Default)] pub struct GcStats { pub collections: usize, pub collected: usize, @@ -176,7 +176,7 @@ impl Default for GcState { impl GcState { #[must_use] - pub fn new() -> Self { + pub const fn new() -> Self { Self { generations: [ GcGeneration::new(2000), // young @@ -393,10 +393,10 @@ impl GcState { return CollectResult::default(); }; - #[cfg(not(target_arch = "wasm32"))] - let start_time = std::time::Instant::now(); - #[cfg(target_arch = "wasm32")] - let start_time = (); + let start_time = cfg_select! { + target_arch = "wasm32" => (), + _ => std::time::Instant::now(), + }; // Memory barrier to ensure visibility of all reference count updates // from other threads before we start analyzing the object graph. @@ -431,7 +431,9 @@ impl GcState { for i in 0..reset_end { self.generations[i].count.store(0, Ordering::SeqCst); } + let duration = elapsed_secs(&start_time); + self.generations[generation].update_stats(0, 0, 0, duration); return CollectResult { collected: 0, @@ -556,7 +558,9 @@ impl GcState { for i in 0..reset_end { self.generations[i].count.store(0, Ordering::SeqCst); } + let duration = elapsed_secs(&start_time); + self.generations[generation].update_stats(0, 0, candidates, duration); return CollectResult { collected: 0, @@ -577,7 +581,9 @@ impl GcState { for i in 0..reset_end { self.generations[i].count.store(0, Ordering::SeqCst); } + let duration = elapsed_secs(&start_time); + self.generations[generation].update_stats(0, 0, candidates, duration); return CollectResult { collected: 0, @@ -726,6 +732,7 @@ impl GcState { } let duration = elapsed_secs(&start_time); + self.generations[generation].update_stats(collected, 0, candidates, duration); CollectResult { diff --git a/crates/vm/src/recursion.rs b/crates/vm/src/recursion.rs index 7392cca4d..dea7898c8 100644 --- a/crates/vm/src/recursion.rs +++ b/crates/vm/src/recursion.rs @@ -1,14 +1,15 @@ use crate::{AsObject, PyObject, VirtualMachine}; +/// A guard to protect repr methods from recursion into itself. pub struct ReprGuard<'vm> { vm: &'vm VirtualMachine, id: usize, } -/// A guard to protect repr methods from recursion into itself, impl<'vm> ReprGuard<'vm> { - /// Returns None if the guard against 'obj' is still held otherwise returns the guard. The guard - /// which is released if dropped. + /// Returns None if the guard against 'obj' is still held otherwise returns the guard. + /// + /// The guard which is released if dropped. pub fn enter(vm: &'vm VirtualMachine, obj: &PyObject) -> Option<Self> { let mut guards = vm.repr_guards.borrow_mut(); @@ -18,8 +19,9 @@ impl<'vm> ReprGuard<'vm> { if guards.contains(&id) { return None; } + guards.insert(id); - Some(ReprGuard { vm, id }) + Some(Self { vm, id }) } } diff --git a/crates/vm/src/suggestion.rs b/crates/vm/src/suggestion.rs index b48b78af7..69ce8f5f6 100644 --- a/crates/vm/src/suggestion.rs +++ b/crates/vm/src/suggestion.rs @@ -1,13 +1,14 @@ //! This module provides functionality to suggest similar names for attributes or variables. //! This is used during tracebacks. +use core::iter::ExactSizeIterator; + use crate::{ AsObject, Py, PyObject, PyObjectRef, VirtualMachine, builtins::{PyStr, PyStrRef}, exceptions::types::PyBaseException, sliceable::SliceableSequenceOp, }; -use core::iter::ExactSizeIterator; use rustpython_common::str::levenshtein::{MOVE_COST, levenshtein_distance}; const MAX_CANDIDATE_ITEMS: usize = 750; From 6d25033da67ac14036b3f50a15972296a05b088d Mon Sep 17 00:00:00 2001 From: Kwak Byoung Min <67214970+doma17@users.noreply.github.com> Date: Mon, 22 Jun 2026 13:17:55 +0900 Subject: [PATCH 115/339] Support csv writer QUOTE_STRINGS and QUOTE_NOTNULL (#8109) * Support csv quoting modes added in Python 3.12 Implement writer handling for QUOTE_STRINGS and QUOTE_NOTNULL so the exported constants no longer panic and follow CPython behavior for string, non-null, None, and quotechar validation cases. Constraint: RustPython contribution policy requires CPython-compatible behavior through Rust-side changes and regression coverage outside Lib/. Rejected: Marking CPython Lib tests or hiding the constants | would preserve a runtime panic for supported public constants. Confidence: high Scope-risk: narrow Directive: Keep QUOTE_STRINGS and QUOTE_NOTNULL writer behavior aligned with CPython's csv module when extending dialect validation. Tested: cargo check -p rustpython-stdlib; cargo run --release -- extra_tests/snippets/stdlib_csv.py; cargo run --release -- -m test test_csv; cargo clippy; pre-commit run --all-files via temporary venv/PATH shim; cargo test --workspace --exclude rustpython_wasm --exclude rustpython-venvlauncher -- --test-threads=1 Not-tested: Remote CI and PR creation were not run because remote git operations require explicit approval. Assisted-by: Codex:gpt-5.5 * Update crates/stdlib/src/csv.rs Co-authored-by: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> * Update crates/stdlib/src/csv.rs Co-authored-by: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> * Keep csv writer follow-up lint clean Apply maintainer-requested expression cleanups and rustfmt wrapping so the PR lint job can pass without changing behavior. Constraint: GitHub Actions Lint failed on rustfmt output after the review suggestion. Rejected: Changing csv writer semantics | the failing check was formatting-only and all behavior tests already passed. Confidence: high Scope-risk: narrow Directive: Keep future review suggestions rustfmt-clean before pushing. Tested: cargo fmt --check; cargo check -p rustpython-stdlib; cargo run --release -- extra_tests/snippets/stdlib_csv.py; cargo run --release -- -m test test_csv; cargo clippy; pre-commit run --all-files; cargo test --workspace --exclude rustpython_wasm --exclude rustpython-venvlauncher -- --test-threads=1 Not-tested: Remote CI has not rerun yet; this commit will trigger it after push. Assisted-by: Codex:gpt-5.5 --------- Co-authored-by: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> --- crates/stdlib/src/csv.rs | 114 ++++++++++++++++++++++++++++- extra_tests/snippets/stdlib_csv.py | 25 +++++++ 2 files changed, 136 insertions(+), 3 deletions(-) diff --git a/crates/stdlib/src/csv.rs b/crates/stdlib/src/csv.rs index f72800276..bd80cf7ec 100644 --- a/crates/stdlib/src/csv.rs +++ b/crates/stdlib/src/csv.rs @@ -466,8 +466,7 @@ mod _csv { QuoteStyle::All => Self::Always, QuoteStyle::Nonnumeric => Self::NonNumeric, QuoteStyle::None => Self::Never, - QuoteStyle::Strings => todo!(), - QuoteStyle::Notnull => todo!(), + QuoteStyle::Strings | QuoteStyle::Notnull => Self::Necessary, } } } @@ -661,7 +660,10 @@ mod _csv { |_| { vm.new_type_error(r#""quotechar" must be a 1-character string"#) } )?)), PyNone => { - if let Some(QuoteStyle::All) = res.quoting { + if res + .quoting + .is_some_and(|quoting| quoting != QuoteStyle::None) + { return Err(ArgumentError::Exception( vm.new_type_error("quotechar must be set if quoting enabled"), )); @@ -1114,6 +1116,55 @@ mod _csv { } } + fn write_quoted_field( + output: &mut Vec<u8>, + data: &[u8], + dialect: PyDialect, + vm: &VirtualMachine, + ) -> PyResult<()> { + let quotechar = dialect + .quotechar + .ok_or_else(|| vm.new_type_error("quotechar must be set if quoting enabled"))?; + output.push(quotechar); + for &byte in data { + if byte == quotechar { + if dialect.doublequote { + output.push(quotechar); + output.push(quotechar); + } else if let Some(escapechar) = dialect.escapechar { + output.push(escapechar); + output.push(byte); + } else { + return Err(new_csv_error(vm, "need to escape, but no escapechar set")); + } + } else { + if dialect.escapechar == Some(byte) { + output.push(byte); + } + output.push(byte); + } + } + output.push(quotechar); + Ok(()) + } + + fn field_needs_quotes(data: &[u8], dialect: PyDialect) -> bool { + data.iter().any(|&byte| { + byte == dialect.delimiter + || dialect.quotechar == Some(byte) + || matches!(byte, b'\r' | b'\n') + || matches!(dialect.lineterminator, Terminator::Any(t) if byte == t) + }) + } + + fn write_lineterminator(output: &mut Vec<u8>, terminator: Terminator) { + match terminator { + Terminator::CRLF => output.extend_from_slice(b"\r\n"), + Terminator::Any(byte) => output.push(byte), + _ => unreachable!(), + } + } + #[pyclass(flags(DISALLOW_INSTANTIATION))] impl Writer { #[pygetset(name = "dialect")] @@ -1121,8 +1172,65 @@ mod _csv { self.dialect } + fn writerow_quoted_strings(&self, row: PyObjectRef, vm: &VirtualMachine) -> PyResult { + let _state = self.state.lock(); + let row: ArgIterable = ArgIterable::try_from_object(vm, row.clone()).map_err(|_e| { + new_csv_error( + vm, + format!("'{}' object is not iterable", row.class().name()), + ) + })?; + let fields = row.iter(vm)?.collect::<PyResult<Vec<_>>>()?; + let single_field = fields.len() == 1; + let mut output = Vec::new(); + + for (index, field) in fields.into_iter().enumerate() { + if index > 0 { + output.push(self.dialect.delimiter); + } + + let stringified; + let (data, is_str, is_none): (&[u8], bool, bool) = match_class!(match field { + ref s @ PyStr => (s.as_bytes(), true, false), + crate::builtins::PyNone => (b"", false, true), + ref obj => { + stringified = obj.str(vm)?; + (stringified.as_bytes(), false, false) + } + }); + + let should_quote = match self.dialect.quoting { + QuoteStyle::Strings => is_str || field_needs_quotes(data, self.dialect), + QuoteStyle::Notnull => !is_none, + _ => unreachable!(), + }; + if should_quote { + write_quoted_field(&mut output, data, self.dialect, vm)?; + } else if single_field && data.is_empty() { + return Err(new_csv_error( + vm, + "single empty field record must be quoted", + )); + } else { + output.extend_from_slice(data); + } + } + + write_lineterminator(&mut output, self.dialect.lineterminator); + let s = core::str::from_utf8(&output) + .map_err(|_| vm.new_unicode_decode_error("csv not utf8"))?; + self.write.call((s,), vm) + } + #[pymethod] fn writerow(&self, row: PyObjectRef, vm: &VirtualMachine) -> PyResult { + if matches!( + self.dialect.quoting, + QuoteStyle::Strings | QuoteStyle::Notnull + ) { + return self.writerow_quoted_strings(row, vm); + } + let mut state = self.state.lock(); let WriteState { buffer, writer } = &mut *state; diff --git a/extra_tests/snippets/stdlib_csv.py b/extra_tests/snippets/stdlib_csv.py index eb3461e90..aa7b41223 100644 --- a/extra_tests/snippets/stdlib_csv.py +++ b/extra_tests/snippets/stdlib_csv.py @@ -1,4 +1,5 @@ import csv +import io from testutils import assert_raises @@ -47,3 +48,27 @@ def test_delim(): test_delim() + + +def test_quote_strings_and_notnull_writer(): + string_buf = io.StringIO() + csv.writer(string_buf, quoting=csv.QUOTE_STRINGS).writerow(["x", 1, None, ""]) + assert string_buf.getvalue() == '"x",1,,""\r\n' + + notnull_buf = io.StringIO() + csv.writer(notnull_buf, quoting=csv.QUOTE_NOTNULL).writerow(["x", 1, None, ""]) + assert notnull_buf.getvalue() == '"x","1",,""\r\n' + + for quoting in (csv.QUOTE_STRINGS, csv.QUOTE_NOTNULL): + buf = io.StringIO() + csv.writer(buf, quoting=quoting).writerow([None, None]) + assert buf.getvalue() == ",\r\n" + + with assert_raises(csv.Error): + csv.writer(io.StringIO(), quoting=quoting).writerow([None]) + + with assert_raises(TypeError): + csv.writer(io.StringIO(), quoting=quoting, quotechar=None) + + +test_quote_strings_and_notnull_writer() From 80d392ddc3b7bc11e85fef90b2ae05e3d0a3991e Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Mon, 22 Jun 2026 10:28:35 +0300 Subject: [PATCH 116/339] Skip flaky test at `test_thread.py` (#8125) --- Lib/test/test_thread.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/test/test_thread.py b/Lib/test/test_thread.py index dc5517442..22b19ee3d 100644 --- a/Lib/test/test_thread.py +++ b/Lib/test/test_thread.py @@ -115,7 +115,7 @@ class ThreadRunningTests(BasicThreadTest): thread.stack_size(0) - @unittest.skipIf(__import__("sys").platform in ("linux", "win32"), "TODO: RUSTPYTHON; Flakey on CI") + @unittest.skip("TODO: RUSTPYTHON; Flakey on CI") def test__count(self): # Test the _count() function. orig = thread._count() From 432df16bddd2ad3f0584fb63ab8b962ad7906b07 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Mon, 22 Jun 2026 10:30:23 +0300 Subject: [PATCH 117/339] Align patches at `test_types.py` (#8126) * Align patches at `test_types.py` * Add missing methods for `_io.TextIOBase` --- Lib/test/test_memoryio.py | 4 ---- Lib/test/test_types.py | 5 ++--- crates/vm/src/stdlib/_io.rs | 30 ++++++++++++++++++++++++++++++ 3 files changed, 32 insertions(+), 7 deletions(-) diff --git a/Lib/test/test_memoryio.py b/Lib/test/test_memoryio.py index 7214a3770..0ae486005 100644 --- a/Lib/test/test_memoryio.py +++ b/Lib/test/test_memoryio.py @@ -1026,10 +1026,6 @@ class CStringIOTest(PyStringIOTest): def test_flags(self): return super().test_flags() - @unittest.expectedFailure # TODO: RUSTPYTHON; AttributeError: 'StringIO' object has no attribute 'detach' - def test_detach(self): - return super().test_detach() - @unittest.expectedFailure # TODO: RUSTPYTHON; AttributeError: 'StringIO' object has no attribute 'newlines'. Did you mean: 'readlines'? def test_newlines_property(self): return super().test_newlines_property() diff --git a/Lib/test/test_types.py b/Lib/test/test_types.py index 01da70b4c..63bc0803e 100644 --- a/Lib/test/test_types.py +++ b/Lib/test/test_types.py @@ -45,7 +45,6 @@ def clear_typing_caches(): class TypesTests(unittest.TestCase): - @unittest.skipUnless(c_types, "TODO: RUSTPYTHON; requires _types module") def test_names(self): c_only_names = {'CapsuleType'} ignored = {'new_class', 'resolve_bases', 'prepare_class', @@ -636,7 +635,7 @@ class TypesTests(unittest.TestCase): self.assertIsInstance(object.__lt__, types.WrapperDescriptorType) self.assertIsInstance(int.__lt__, types.WrapperDescriptorType) - @unittest.expectedFailure # TODO: RUSTPYTHON; No signature found in builtin method __get__ of 'method_descriptor' objects. + @unittest.expectedFailure # TODO: RUSTPYTHON; ValueError: no signature found for builtin <method-wrapper '__get__' of wrapper_descriptor object @unittest.skipIf(MISSING_C_DOCSTRINGS, "Signature information for builtins requires docstrings") def test_dunder_get_signature(self): @@ -661,7 +660,7 @@ class TypesTests(unittest.TestCase): self.assertIsInstance(int.from_bytes, types.BuiltinMethodType) self.assertIsInstance(int.__new__, types.BuiltinMethodType) - @unittest.expectedFailure # TODO: RUSTPYTHON; ModuleNotFoundError: No module named '_queue' + @unittest.expectedFailure # TODO: RUSTPYTHON; TypeError: descriptor 'read' needs a type, not 'StringIO', as arg 2 def test_method_descriptor_crash(self): # gh-132747: The default __get__() implementation in C was unable # to handle a second argument of None when called from Python diff --git a/crates/vm/src/stdlib/_io.rs b/crates/vm/src/stdlib/_io.rs index 423d5bc67..dd01c46fd 100644 --- a/crates/vm/src/stdlib/_io.rs +++ b/crates/vm/src/stdlib/_io.rs @@ -789,11 +789,41 @@ mod _io { #[pyclass(flags(BASETYPE, HAS_WEAKREF))] impl _TextIOBase { + #[pymethod] + fn read(zelf: PyObjectRef, _size: OptionalArg, vm: &VirtualMachine) -> PyResult { + _unsupported(vm, &zelf, "read") + } + + #[pymethod] + fn write(zelf: PyObjectRef, _b: PyObjectRef, vm: &VirtualMachine) -> PyResult { + _unsupported(vm, &zelf, "write") + } + + #[pymethod] + fn truncate(zelf: PyObjectRef, _pos: OptionalArg, vm: &VirtualMachine) -> PyResult { + _unsupported(vm, &zelf, "truncate") + } + + #[pymethod] + fn readline(zelf: PyObjectRef, vm: &VirtualMachine) -> PyResult { + _unsupported(vm, &zelf, "readline") + } + + #[pymethod] + fn detach(zelf: PyObjectRef, vm: &VirtualMachine) -> PyResult { + _unsupported(vm, &zelf, "detach") + } + #[pygetset] fn encoding(_zelf: PyObjectRef, vm: &VirtualMachine) -> PyObjectRef { vm.ctx.none() } + #[pygetset] + fn newlines(_zelf: PyObjectRef, vm: &VirtualMachine) -> PyObjectRef { + vm.ctx.none() + } + #[pygetset] fn errors(_zelf: PyObjectRef, vm: &VirtualMachine) -> PyObjectRef { vm.ctx.none() From 9f2c4e14a9451260e834ce07beedcb76c6869b09 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Mon, 22 Jun 2026 10:30:51 +0300 Subject: [PATCH 118/339] More clippy rules (#8127) * clippy `elidable_lifetime_names` * large_types_passed_by_value * trivially_copy_pass_by_ref * type_repetition_in_bounds * copy_iterator * collection_is_never_read * same_functions_in_if_condition * unnecessary_struct_initialization * clippy on windows * ssl windows --- Cargo.toml | 8 ++++++ crates/codegen/src/compile.rs | 46 +++++++++++++++--------------- crates/codegen/src/ir.rs | 15 ++++++---- crates/common/src/format.rs | 17 +++++++---- crates/host_env/src/crt_fd.rs | 9 +++--- crates/host_env/src/fileutils.rs | 10 +++---- crates/host_env/src/signal.rs | 4 +-- crates/stdlib/src/_asyncio.rs | 2 +- crates/stdlib/src/binascii.rs | 11 +++---- crates/stdlib/src/ssl.rs | 8 +++--- crates/vm/src/builtins/float.rs | 4 +++ crates/vm/src/builtins/type.rs | 2 +- crates/vm/src/protocol/callable.rs | 6 ++-- crates/vm/src/protocol/number.rs | 22 +++++++------- crates/vm/src/protocol/sequence.rs | 2 +- crates/vm/src/stdlib/_ast.rs | 5 ++-- crates/vm/src/stdlib/_io.rs | 2 +- crates/vm/src/stdlib/_signal.rs | 4 +-- crates/vm/src/types/slot.rs | 11 ++++--- crates/vm/src/vm/thread.rs | 3 +- crates/vm/src/vm/vm_new.rs | 6 ++-- 21 files changed, 112 insertions(+), 85 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 280b64f01..677de28ef 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -363,6 +363,7 @@ std_instead_of_core = "warn" tests_outside_test_module = "warn" # nursery lints to enforce gradually +collection_is_never_read = "warn" debug_assert_with_mut_call = "warn" derive_partial_eq_without_eq = "warn" imprecise_flops = "warn" @@ -376,6 +377,8 @@ search_is_some = "warn" significant_drop_in_scrutinee = "warn" single_option_map = "warn" trait_duplication_in_bounds = "warn" +type_repetition_in_bounds = "warn" +unnecessary_struct_initialization = "warn" unused_peekable = "warn" unused_rounding = "warn" use_self = "warn" @@ -387,8 +390,10 @@ checked_conversions = "warn" cloned_instead_of_copied = "warn" collapsible_else_if = "warn" comparison_chain = "warn" +copy_iterator = "warn" doc_link_with_quotes = "warn" duration_suboptimal_units = "warn" +elidable_lifetime_names = "warn" enum_glob_use = "warn" explicit_deref_methods = "warn" explicit_into_iter_loop = "warn" @@ -404,6 +409,7 @@ ip_constant = "warn" iter_filter_is_ok = "warn" iter_filter_is_some = "warn" large_futures = "warn" +large_types_passed_by_value = "warn" manual_instant_elapsed = "warn" manual_is_variant_and = "warn" map_unwrap_or = "warn" @@ -421,7 +427,9 @@ range_plus_one = "warn" redundant_else = "warn" ref_option = "warn" return_self_not_must_use = "warn" +same_functions_in_if_condition = "warn" single_char_pattern = "warn" +trivially_copy_pass_by_ref = "warn" unchecked_time_subtraction = "warn" uninlined_format_args = "warn" unnecessary_box_returns = "warn" diff --git a/crates/codegen/src/compile.rs b/crates/codegen/src/compile.rs index 476aa35e3..45c7dce60 100644 --- a/crates/codegen/src/compile.rs +++ b/crates/codegen/src/compile.rs @@ -2091,7 +2091,7 @@ impl Compiler { self.emit_resume_for_scope(CompilerScope::Module, 1); emit!(self, PseudoInstruction::AnnotationsPlaceholder); - let (doc, statements) = split_doc_with_range(&body.body, &self.opts); + let (doc, statements) = split_doc_with_range(&body.body, self.opts); let module_start_loc = self.module_start_location(&body.body); // Handle annotation bookkeeping before the docstring assignment, as // codegen_body() does after _PyCodegen_Module() inserts the prefix set. @@ -3075,7 +3075,7 @@ impl Compiler { } ast::Stmt::AugAssign(ast::StmtAugAssign { target, op, value, .. - }) => self.compile_augassign(target, op, value)?, + }) => self.compile_augassign(target, *op, value)?, ast::Stmt::AnnAssign(ast::StmtAnnAssign { target, annotation, @@ -4294,7 +4294,7 @@ impl Compiler { self.set_qualname(); // Handle docstring - store in co_consts[0] if present - let (doc_info, body) = split_doc_with_range(body, &self.opts); + let (doc_info, body) = split_doc_with_range(body, self.opts); let doc_str = doc_info.as_ref().map(|(doc, _)| doc); if let Some(doc) = &doc_str { // Docstring present: store in co_consts[0] and set HAS_DOCSTRING flag @@ -5137,7 +5137,7 @@ impl Compiler { self.code_stack.last_mut().unwrap().private = Some(name.to_owned()); // 2. Set up class namespace - let (doc_str, body) = split_doc_with_range(body, &self.opts); + let (doc_str, body) = split_doc_with_range(body, self.opts); let class_body_prefix_range = self.source_line_start_range(firstlineno); self.set_source_range(class_body_prefix_range); @@ -7004,7 +7004,7 @@ impl Compiler { } /// [CPython `compiler_addcompare`](https://github.com/python/cpython/blob/627894459a84be3488a1789919679c997056a03c/Python/compile.c#L2880-L2924) - fn compile_addcompare(&mut self, op: &ast::CmpOp) { + fn compile_addcompare(&mut self, op: ast::CmpOp) { match op { ast::CmpOp::Eq => emit!( self, @@ -7096,7 +7096,7 @@ impl Compiler { if mid_comparators.is_empty() { self.compile_expression(last_comparator)?; self.set_source_range(compare_range); - self.compile_addcompare(last_op); + self.compile_addcompare(*last_op); return Ok(()); } @@ -7112,7 +7112,7 @@ impl Compiler { emit!(self, Instruction::Swap { i: 2 }); emit!(self, Instruction::Copy { i: 2 }); - self.compile_addcompare(op); + self.compile_addcompare(*op); // if comparison result is false, we break with this value; if true, try the next one. emit!(self, Instruction::Copy { i: 1 }); @@ -7123,7 +7123,7 @@ impl Compiler { self.compile_expression(last_comparator)?; self.set_source_range(compare_range); - self.compile_addcompare(last_op); + self.compile_addcompare(*last_op); let end = self.new_block(); emit!(self, PseudoInstruction::JumpNoInterrupt { delta: end }); @@ -7154,7 +7154,7 @@ impl Compiler { self.compile_expression(left)?; self.compile_expression(last_comparator)?; self.set_source_range(compare_range); - self.compile_addcompare(last_op); + self.compile_addcompare(*last_op); self.emit_pop_jump_by_condition(condition, target_block); return Ok(()); } @@ -7167,14 +7167,14 @@ impl Compiler { self.set_source_range(compare_range); emit!(self, Instruction::Swap { i: 2 }); emit!(self, Instruction::Copy { i: 2 }); - self.compile_addcompare(op); + self.compile_addcompare(*op); emit!(self, Instruction::ToBool); emit!(self, Instruction::PopJumpIfFalse { delta: cleanup }); } self.compile_expression(last_comparator)?; self.set_source_range(compare_range); - self.compile_addcompare(last_op); + self.compile_addcompare(*last_op); emit!(self, Instruction::ToBool); self.emit_pop_jump_by_condition(condition, target_block); let end = self.new_block(); @@ -7446,7 +7446,7 @@ impl Compiler { fn compile_augassign( &mut self, target: &ast::Expr, - op: &ast::Operator, + op: ast::Operator, value: &ast::Expr, ) -> CompileResult<()> { let stmt_range = self.current_source_range; @@ -7559,7 +7559,7 @@ impl Compiler { Ok(()) } - fn compile_op(&mut self, op: &ast::Operator, inplace: bool) { + fn compile_op(&mut self, op: ast::Operator, inplace: bool) { let bin_op = match op { ast::Operator::Add => BinaryOperator::Add, ast::Operator::Sub => BinaryOperator::Subtract, @@ -7687,7 +7687,7 @@ impl Compiler { /// Compile a boolean operation as an expression. /// This means, that the last value remains on the stack. - fn compile_bool_op(&mut self, op: &ast::BoolOp, values: &[ast::Expr]) -> CompileResult<()> { + fn compile_bool_op(&mut self, op: ast::BoolOp, values: &[ast::Expr]) -> CompileResult<()> { let boolop_range = self.current_source_range; let after_block = self.new_block(); let (last_value, prefix_values) = values.split_last().unwrap(); @@ -7707,7 +7707,7 @@ impl Compiler { /// Emit CPython-style pseudo conditional jump for short-circuit evaluation. /// flowgraph.c lowers it to `COPY 1; TO_BOOL; POP_JUMP_IF_*`. - fn emit_short_circuit_test(&mut self, op: &ast::BoolOp, target: BlockIdx) { + fn emit_short_circuit_test(&mut self, op: ast::BoolOp, target: BlockIdx) { match op { ast::BoolOp::And => { emit!(self, PseudoInstruction::JumpIfFalse { delta: target }); @@ -7962,7 +7962,7 @@ impl Compiler { func, arguments, .. }) => self.compile_call(func, arguments)?, ast::Expr::BoolOp(ast::ExprBoolOp { op, values, .. }) => { - self.compile_bool_op(op, values)? + self.compile_bool_op(*op, values)? } ast::Expr::BinOp(ast::ExprBinOp { left, op, right, .. @@ -7972,7 +7972,7 @@ impl Compiler { // Restore full expression range before emitting the operation self.set_source_range(range); - self.compile_op(op, false); + self.compile_op(*op, false); } ast::Expr::Subscript(ast::ExprSubscript { value, slice, ctx, .. @@ -12000,10 +12000,10 @@ fn expandtabs(input: &str, tab_size: usize) -> String { expanded_str } -fn split_doc_with_range<'a>( - body: &'a [ast::Stmt], - opts: &CompileOpts, -) -> (Option<(String, TextRange)>, &'a [ast::Stmt]) { +fn split_doc_with_range( + body: &[ast::Stmt], + opts: CompileOpts, +) -> (Option<(String, TextRange)>, &[ast::Stmt]) { if let Some((ast::Stmt::Expr(expr), body_rest)) = body.split_first() { let doc_comment = match &*expr.value { ast::Expr::StringLiteral(value) => Some((&value.value, expr.value.range())), @@ -12023,7 +12023,7 @@ fn split_doc_with_range<'a>( } #[cfg(test)] -fn split_doc<'a>(body: &'a [ast::Stmt], opts: &CompileOpts) -> (Option<String>, &'a [ast::Stmt]) { +fn split_doc(body: &[ast::Stmt], opts: CompileOpts) -> (Option<String>, &[ast::Stmt]) { let (doc, body) = split_doc_with_range(body, opts); (doc.map(|(doc, _)| doc), body) } @@ -12452,7 +12452,7 @@ def f(x, y, z): in_async_scope: is_async, }; compiler.set_qualname(); - let (_doc_str, body) = split_doc(body, &compiler.opts); + let (_doc_str, body) = split_doc(body, compiler.opts); let start_label = compiler.use_cpython_function_start_label(); let is_gen = is_async || compiler.current_symbol_table().is_generator; let stop_iteration_block = if is_gen { diff --git a/crates/codegen/src/ir.rs b/crates/codegen/src/ir.rs index f22efe8e5..74f558688 100644 --- a/crates/codegen/src/ir.rs +++ b/crates/codegen/src/ir.rs @@ -3291,9 +3291,9 @@ fn optimize_lists_and_sets( const VISITED: i32 = -1; /// flowgraph.c SWAPPABLE -fn is_swappable(instr: &AnyInstruction) -> bool { +fn is_swappable(instr: AnyInstruction) -> bool { matches!( - (*instr).into(), + instr.into(), AnyOpcode::Real(Opcode::StoreFast | Opcode::PopTop) | AnyOpcode::Pseudo(PseudoOpcode::StoreFastMaybeNull) ) @@ -3315,17 +3315,22 @@ fn next_swappable_instruction(block: &Block, mut i: usize, lineno: i32) -> Optio if i >= block.instruction_used { return None; } + let info = &block.instructions[i]; let info_lineno = instruction_lineno(info); + if lineno >= 0 && info_lineno != lineno { return None; } + if matches!(info.instr, AnyInstruction::Real(Instruction::Nop)) { continue; } - if is_swappable(&info.instr) { + + if is_swappable(info.instr) { return Some(i); } + return None; } } @@ -5440,7 +5445,7 @@ fn basicblock_add_jump( } /// pycore_opcode_utils.h IS_CONDITIONAL_JUMP_OPCODE -fn is_conditional_jump_opcode(instr: &AnyInstruction) -> bool { +fn is_conditional_jump_opcode(instr: AnyInstruction) -> bool { matches!( instr.real().map(Into::into), Some( @@ -5524,7 +5529,7 @@ fn normalize_jumps_in_block( let Some(last_ins) = basicblock_last_instr(&blocks[idx]).copied() else { return Ok(()); }; - if !is_conditional_jump_opcode(&last_ins.instr) { + if !is_conditional_jump_opcode(last_ins.instr) { return Ok(()); } debug_assert!(!last_ins.instr.is_assembler()); diff --git a/crates/common/src/format.rs b/crates/common/src/format.rs index ea4598869..5510dce41 100644 --- a/crates/common/src/format.rs +++ b/crates/common/src/format.rs @@ -141,8 +141,8 @@ impl FormatParse for FormatGrouping { } } -impl From<&FormatGrouping> for char { - fn from(fg: &FormatGrouping) -> Self { +impl From<FormatGrouping> for char { + fn from(fg: FormatGrouping) -> Self { match fg { FormatGrouping::Comma => ',', FormatGrouping::Underscore => '_', @@ -150,6 +150,12 @@ impl From<&FormatGrouping> for char { } } +impl From<&FormatGrouping> for char { + fn from(fg: &FormatGrouping) -> Self { + Self::from(*fg) + } +} + #[derive(Clone, Copy, Debug, PartialEq, Eq)] pub enum FormatType { String, @@ -322,7 +328,7 @@ impl FormatSpec { return Err(FormatSpecError::DecimalDigitsTooMany); } let (grouping_option, text) = FormatGrouping::parse(text); - if let Some(grouping) = &grouping_option { + if let Some(grouping) = grouping_option { Self::validate_separator(grouping, text)?; } let (precision, text) = parse_precision(text)?; @@ -349,11 +355,12 @@ impl FormatSpec { }) } - fn validate_separator(grouping: &FormatGrouping, text: &Wtf8) -> Result<(), FormatSpecError> { + fn validate_separator(grouping: FormatGrouping, text: &Wtf8) -> Result<(), FormatSpecError> { let mut chars = text.code_points().peekable(); + let grouping_char = char::from(grouping); match chars.peek().and_then(|cp| CodePoint::to_char(*cp)) { Some(c) if c == ',' || c == '_' => { - if c == char::from(grouping) { + if c == grouping_char { Err(FormatSpecError::UnspecifiedFormat(c, c)) } else { Err(FormatSpecError::ExclusiveFormat(',', '_')) diff --git a/crates/host_env/src/crt_fd.rs b/crates/host_env/src/crt_fd.rs index c49d661b3..ee21934be 100644 --- a/crates/host_env/src/crt_fd.rs +++ b/crates/host_env/src/crt_fd.rs @@ -112,7 +112,7 @@ mod win { } #[inline] - pub(super) fn as_raw_fd(&self) -> Raw { + pub(super) fn as_raw_fd(self) -> Raw { self.fd } } @@ -140,12 +140,13 @@ pub struct Borrowed<'fd> { inner: BorrowedInner<'fd>, } -impl<'fd> PartialEq for Borrowed<'fd> { +impl PartialEq for Borrowed<'_> { fn eq(&self, other: &Self) -> bool { self.as_raw() == other.as_raw() } } -impl<'fd> Eq for Borrowed<'fd> {} + +impl Eq for Borrowed<'_> {} impl fmt::Debug for Borrowed<'_> { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { @@ -250,7 +251,7 @@ impl IntoRawFd for Owned { } } -impl<'fd> Borrowed<'fd> { +impl Borrowed<'_> { /// Create a `crt_fd::Borrowed` from a raw file descriptor. /// /// # Safety diff --git a/crates/host_env/src/fileutils.rs b/crates/host_env/src/fileutils.rs index 79cee1cb5..c9e366e3d 100644 --- a/crates/host_env/src/fileutils.rs +++ b/crates/host_env/src/fileutils.rs @@ -165,8 +165,8 @@ pub mod windows { (time_out, nsec_out as _) } - fn file_time_to_time_t_nsec(in_ptr: &FILETIME) -> (libc::time_t, libc::c_int) { - let in_val: i64 = unsafe { core::mem::transmute_copy(in_ptr) }; + fn file_time_to_time_t_nsec(in_ptr: FILETIME) -> (libc::time_t, libc::c_int) { + let in_val: i64 = unsafe { core::mem::transmute_copy(&in_ptr) }; let nsec_out = (in_val % 10_000_000) * 100; // FILETIME is in units of 100 nsec. let time_out = (in_val / 10_000_000) - SECS_BETWEEN_EPOCHS; (time_out, nsec_out as _) @@ -196,10 +196,10 @@ pub mod windows { ) } else { ( - file_time_to_time_t_nsec(&info.ftCreationTime), + file_time_to_time_t_nsec(info.ftCreationTime), (0, 0), - file_time_to_time_t_nsec(&info.ftLastWriteTime), - file_time_to_time_t_nsec(&info.ftLastAccessTime), + file_time_to_time_t_nsec(info.ftLastWriteTime), + file_time_to_time_t_nsec(info.ftLastAccessTime), ) }; let st_nlink = info.nNumberOfLinks as i32; diff --git a/crates/host_env/src/signal.rs b/crates/host_env/src/signal.rs index ab1974f37..cd11998e5 100644 --- a/crates/host_env/src/signal.rs +++ b/crates/host_env/src/signal.rs @@ -327,8 +327,8 @@ pub fn valid_signals(max_signum: usize) -> io::Result<Vec<i32>> { } #[cfg(unix)] -pub fn sigset_contains(mask: &libc::sigset_t, signum: i32) -> bool { - unsafe { libc::sigismember(mask, signum) == 1 } +pub fn sigset_contains(mask: libc::sigset_t, signum: i32) -> bool { + unsafe { libc::sigismember(&mask, signum) == 1 } } #[cfg(windows)] diff --git a/crates/stdlib/src/_asyncio.rs b/crates/stdlib/src/_asyncio.rs index 48be4115e..0c74310ea 100644 --- a/crates/stdlib/src/_asyncio.rs +++ b/crates/stdlib/src/_asyncio.rs @@ -101,7 +101,7 @@ pub(crate) mod _asyncio { } impl FutureState { - fn as_str(&self) -> &'static str { + const fn as_str(self) -> &'static str { match self { Self::Pending => "PENDING", Self::Cancelled => "CANCELLED", diff --git a/crates/stdlib/src/binascii.rs b/crates/stdlib/src/binascii.rs index 30e9b379a..ac9452358 100644 --- a/crates/stdlib/src/binascii.rs +++ b/crates/stdlib/src/binascii.rs @@ -386,18 +386,18 @@ mod decl { } #[inline] - fn uu_a2b_read(c: &u8, vm: &VirtualMachine) -> PyResult<u8> { + fn uu_a2b_read(c: u8, vm: &VirtualMachine) -> PyResult<u8> { // Check the character for legality // The 64 instead of the expected 63 is because // there are a few uuencodes out there that use // '`' as zero instead of space. - if !(b' '..=(b' ' + 64)).contains(c) { - if [b'\r', b'\n'].contains(c) { + if !(b' '..=(b' ' + 64)).contains(&c) { + if [b'\r', b'\n'].contains(&c) { return Ok(0); } return Err(super::new_binascii_error("Illegal char", vm)); } - Ok((*c - b' ') & 0x3f) + Ok((c - b' ') & 0x3f) } #[derive(FromArgs)] @@ -407,6 +407,7 @@ mod decl { #[pyarg(named, default = false)] header: bool, } + #[pyfunction] fn a2b_qp(args: A2bQpArgs) -> PyResult<Vec<u8>> { let s = args.data; @@ -760,7 +761,7 @@ mod decl { let (char_a, char_b, char_c, char_d) = { let mut chunk = chunk .iter() - .map(|x| uu_a2b_read(x, vm)) + .map(|&x| uu_a2b_read(x, vm)) .collect::<Result<Vec<_>, _>>()?; while chunk.len() < 4 { chunk.push(0); diff --git a/crates/stdlib/src/ssl.rs b/crates/stdlib/src/ssl.rs index 35cb17940..edcdf18fa 100644 --- a/crates/stdlib/src/ssl.rs +++ b/crates/stdlib/src/ssl.rs @@ -461,7 +461,7 @@ mod _ssl { // Generate a synthetic session ID from server name and timestamp // NOTE: This is NOT the actual TLS session ID, just a unique identifier - fn generate_session_id_from_metadata(server_name: &str, time: &SystemTime) -> Vec<u8> { + fn generate_session_id_from_metadata(server_name: &str, time: SystemTime) -> Vec<u8> { let mut hasher = Sha256::new(); hasher.update(server_name.as_bytes()); hasher.update( @@ -507,7 +507,7 @@ mod _ssl { _server_name: server_name_str.as_ref().to_string(), session_id: generate_session_id_from_metadata( server_name_str.as_ref(), - &creation_time, + creation_time, ), creation_time, lifetime: 7200, // TLS 1.2 default session lifetime @@ -551,7 +551,7 @@ mod _ssl { _server_name: server_name_str.to_string(), session_id: generate_session_id_from_metadata( server_name_str.as_ref(), - &creation_time, + creation_time, ), creation_time, lifetime: 7200, // Default TLS 1.3 ticket lifetime (Rustls uses this) @@ -2501,7 +2501,7 @@ mod _ssl { } else { // Create new session ID if not in cache let time = std::time::SystemTime::now(); - (generate_session_id_from_metadata(name, &time), time, 7200) + (generate_session_id_from_metadata(name, time), time, 7200) } } else { // No server name, use defaults diff --git a/crates/vm/src/builtins/float.rs b/crates/vm/src/builtins/float.rs index 6f9fd382b..5a12c4cbf 100644 --- a/crates/vm/src/builtins/float.rs +++ b/crates/vm/src/builtins/float.rs @@ -254,6 +254,10 @@ fn float_from_string(val: PyObjectRef, vm: &VirtualMachine) -> PyResult<f64> { }) } +#[expect( + clippy::trivially_copy_pass_by_ref, + reason = "Needs to comply with a signature" +)] #[pyclass( flags(BASETYPE, _MATCH_SELF), with(Comparable, Hashable, Constructor, AsNumber, Representable) diff --git a/crates/vm/src/builtins/type.rs b/crates/vm/src/builtins/type.rs index d26c81a7b..89321189b 100644 --- a/crates/vm/src/builtins/type.rs +++ b/crates/vm/src/builtins/type.rs @@ -370,7 +370,7 @@ unsafe impl<T> Sync for PointerSlot<T> {} unsafe impl<T> Send for PointerSlot<T> {} impl<T> PointerSlot<T> { - pub(crate) const unsafe fn borrow_static(&self) -> &'static T { + pub(crate) const unsafe fn borrow_static(self) -> &'static T { unsafe { self.0.as_ref() } } } diff --git a/crates/vm/src/protocol/callable.rs b/crates/vm/src/protocol/callable.rs index 42d0ac194..c9afbd5af 100644 --- a/crates/vm/src/protocol/callable.rs +++ b/crates/vm/src/protocol/callable.rs @@ -151,7 +151,7 @@ pub(crate) enum TraceEvent { impl TraceEvent { /// Whether sys.settrace receives this event. #[must_use] - const fn is_trace_event(&self) -> bool { + const fn is_trace_event(self) -> bool { matches!( self, Self::Call | Self::Return | Self::Exception | Self::Line | Self::Opcode @@ -162,7 +162,7 @@ impl TraceEvent { /// In legacy_tracing.c, profile callbacks are only registered for /// PY_RETURN, PY_UNWIND, C_CALL, C_RETURN, C_RAISE. #[must_use] - const fn is_profile_event(&self) -> bool { + const fn is_profile_event(self) -> bool { matches!( self, Self::Call | Self::Return | Self::CCall | Self::CReturn | Self::CException @@ -171,7 +171,7 @@ impl TraceEvent { /// Whether this event is dispatched only when f_trace_opcodes is set. #[must_use] - pub(crate) const fn is_opcode_event(&self) -> bool { + pub(crate) const fn is_opcode_event(self) -> bool { matches!(self, Self::Opcode) } } diff --git a/crates/vm/src/protocol/number.rs b/crates/vm/src/protocol/number.rs index 86b126538..301499aa1 100644 --- a/crates/vm/src/protocol/number.rs +++ b/crates/vm/src/protocol/number.rs @@ -631,18 +631,6 @@ impl Deref for PyNumber<'_> { } } -impl<'a> PyNumber<'a> { - // PyNumber_Check - slots are now inherited - #[must_use] - pub fn check(obj: &PyObject) -> bool { - let methods = &obj.class().slots.as_number; - let has_number = methods.int.load().is_some() - || methods.index.load().is_some() - || methods.float.load().is_some(); - has_number || obj.downcastable::<PyComplex>() - } -} - impl PyNumber<'_> { // PyIndex_Check #[must_use] @@ -736,6 +724,16 @@ and may be removed in a future version of Python." } }) } + + // PyNumber_Check - slots are now inherited + #[must_use] + pub fn check(obj: &PyObject) -> bool { + let methods = &obj.class().slots.as_number; + let has_number = methods.int.load().is_some() + || methods.index.load().is_some() + || methods.float.load().is_some(); + has_number || obj.downcastable::<PyComplex>() + } } pub fn handle_bytes_to_int_err( diff --git a/crates/vm/src/protocol/sequence.rs b/crates/vm/src/protocol/sequence.rs index dbef92c66..774e579ee 100644 --- a/crates/vm/src/protocol/sequence.rs +++ b/crates/vm/src/protocol/sequence.rs @@ -286,7 +286,7 @@ impl PySequence<'_> { } fn _ass_slice( - &self, + self, start: isize, stop: isize, value: Option<PyObjectRef>, diff --git a/crates/vm/src/stdlib/_ast.rs b/crates/vm/src/stdlib/_ast.rs index 38e0d546f..6bbbbefe5 100644 --- a/crates/vm/src/stdlib/_ast.rs +++ b/crates/vm/src/stdlib/_ast.rs @@ -720,11 +720,12 @@ fn fold_expr(expr: &mut ast::Expr) { let Expr::NumberLiteral(left) = binop.left.as_ref() else { return; }; + let Expr::NumberLiteral(right) = binop.right.as_ref() else { return; }; - if let Some(number) = fold_number_binop(&left.value, &binop.op, &right.value) { + if let Some(number) = fold_number_binop(&left.value, binop.op, &right.value) { *expr = Expr::NumberLiteral(ast::ExprNumberLiteral { node_index: binop.node_index.clone(), range: binop.range, @@ -737,7 +738,7 @@ fn fold_expr(expr: &mut ast::Expr) { #[cfg(feature = "parser")] fn fold_number_binop( left: &ast::Number, - op: &ast::Operator, + op: ast::Operator, right: &ast::Number, ) -> Option<ast::Number> { let (left_real, left_imag, left_is_complex) = number_to_complex(left)?; diff --git a/crates/vm/src/stdlib/_io.rs b/crates/vm/src/stdlib/_io.rs index dd01c46fd..580add647 100644 --- a/crates/vm/src/stdlib/_io.rs +++ b/crates/vm/src/stdlib/_io.rs @@ -2340,7 +2340,7 @@ mod _io { impl Newlines { /// returns position where the new line starts if found, otherwise position at which to /// continue the search after more is read into the buffer - fn find_newline(&self, s: &Wtf8) -> Result<usize, usize> { + fn find_newline(self, s: &Wtf8) -> Result<usize, usize> { let len = s.len(); match self { Self::Universal | Self::Lf => s.find("\n".as_ref()).map(|p| p + 1).ok_or(len), diff --git a/crates/vm/src/stdlib/_signal.rs b/crates/vm/src/stdlib/_signal.rs index e3d12568d..71063d895 100644 --- a/crates/vm/src/stdlib/_signal.rs +++ b/crates/vm/src/stdlib/_signal.rs @@ -442,7 +442,7 @@ pub(crate) mod _signal { } #[cfg(unix)] - fn sigset_to_pyset(mask: &libc::sigset_t, vm: &VirtualMachine) -> PyResult { + fn sigset_to_pyset(mask: libc::sigset_t, vm: &VirtualMachine) -> PyResult { use crate::PyPayload; use crate::builtins::PySet; let set = PySet::default().into_ref(&vm.ctx); @@ -491,7 +491,7 @@ pub(crate) mod _signal { signal::check_signals(vm)?; // Convert old mask to Python set - sigset_to_pyset(&old_mask, vm) + sigset_to_pyset(old_mask, vm) } #[cfg(any(unix, windows))] diff --git a/crates/vm/src/types/slot.rs b/crates/vm/src/types/slot.rs index a56d1c493..4197e1554 100644 --- a/crates/vm/src/types/slot.rs +++ b/crates/vm/src/types/slot.rs @@ -202,10 +202,13 @@ impl PyTypeSlots { #[must_use] pub fn heap_default() -> Self { + /* Self { - // init: AtomicCell::new(Some(init_wrapper)), + init: AtomicCell::new(Some(init_wrapper)), ..Default::default() } + */ + Self::default() } } @@ -663,7 +666,7 @@ impl PyType { // NOTE: Collect into Vec first to avoid issues during iteration let defs: Vec<_> = find_slot_defs_by_name(name.as_str()).collect(); for def in defs { - self.update_one_slot::<ADD>(&def.accessor, name, ctx); + self.update_one_slot::<ADD>(def.accessor, name, ctx); } // Recursively update subclasses that don't have their own definition @@ -689,7 +692,7 @@ impl PyType { // Update subclass's slots for def in find_slot_defs_by_name(name.as_str()) { - subclass.update_one_slot::<ADD>(&def.accessor, name, ctx); + subclass.update_one_slot::<ADD>(def.accessor, name, ctx); } // Recurse into subclass's subclasses @@ -700,7 +703,7 @@ impl PyType { /// Update a single slot fn update_one_slot<const ADD: bool>( &self, - accessor: &SlotAccessor, + accessor: SlotAccessor, name: &'static PyStrInterned, ctx: &Context, ) { diff --git a/crates/vm/src/vm/thread.rs b/crates/vm/src/vm/thread.rs index 33fcec5e4..26d8db9d7 100644 --- a/crates/vm/src/vm/thread.rs +++ b/crates/vm/src/vm/thread.rs @@ -671,8 +671,7 @@ impl VirtualMachine { #[cfg(feature = "threading")] pub fn start_thread<F, R>(&self, f: F) -> std::thread::JoinHandle<R> where - F: FnOnce(&Self) -> R, - F: Send + 'static, + F: Send + 'static + FnOnce(&Self) -> R, R: Send + 'static, { let func = self.new_thread().make_spawn_func(f); diff --git a/crates/vm/src/vm/vm_new.rs b/crates/vm/src/vm/vm_new.rs index 30b8e6b1a..4db965855 100644 --- a/crates/vm/src/vm/vm_new.rs +++ b/crates/vm/src/vm/vm_new.rs @@ -65,8 +65,8 @@ impl SyntaxErrorInfo { #[cfg(feature = "parser")] #[must_use] - const fn handle_expected_token(expected: &TokenKind, found: &TokenKind) -> &'static str { - match (*expected, *found) { + const fn handle_expected_token(expected: TokenKind, found: TokenKind) -> &'static str { + match (expected, found) { (TokenKind::Colon, TokenKind::Newline) => "expected ':'", (TokenKind::Lpar, _) => "expected '('", @@ -110,7 +110,7 @@ impl SyntaxErrorInfo { ParseErrorType::UnexpectedExpressionToken => format!("invalid syntax: {}", self.msg), ParseErrorType::ExpectedToken { expected, found } => { - Self::handle_expected_token(expected, found).into() + Self::handle_expected_token(*expected, *found).into() } ParseErrorType::InvalidStarredExpressionUsage => { From 02a05ee67b394a1b14eb4076cc0eabddfdfc65c7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jun 2026 16:32:37 +0900 Subject: [PATCH 119/339] Bump insta from 1.47.2 to 1.48.0 (#8130) Bumps [insta](https://github.com/mitsuhiko/insta) from 1.47.2 to 1.48.0. - [Release notes](https://github.com/mitsuhiko/insta/releases) - [Changelog](https://github.com/mitsuhiko/insta/blob/master/CHANGELOG.md) - [Commits](https://github.com/mitsuhiko/insta/compare/1.47.2...1.48.0) --- updated-dependencies: - dependency-name: insta dependency-version: 1.48.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2f916ef8c..d49aab2d5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -100,7 +100,7 @@ version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -111,7 +111,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -1145,7 +1145,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -1237,7 +1237,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -1811,9 +1811,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.47.2" +version = "1.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4a6248eb93a4401ed2f37dfe8ea592d3cf05b7cf4f8efa867b6895af7e094e" +checksum = "86f0f8fee8c926415c58d6ae43a08523a26faccb2323f5e6b644fe7dd4ef6b82" dependencies = [ "console", "once_cell", @@ -1971,7 +1971,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "160f2eade097f30263b548aae5deb12ad349c909baa710fa24b92c9090b2e006" dependencies = [ "scopeguard", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -3349,7 +3349,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -3425,7 +3425,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -4228,7 +4228,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52d1cfed4120b4d927bf7c0f86d2087a4a7d6027c906d9f9d525a80573b9be51" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -4369,10 +4369,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ "fastrand", - "getrandom 0.4.2", + "getrandom 0.3.4", "once_cell", "rustix", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -4918,7 +4918,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] From 2ce6fd0e41beb848df6bc75035beb322e2a4f3b2 Mon Sep 17 00:00:00 2001 From: Bas Schoenmaeckers <7943856+bschoenmaeckers@users.noreply.github.com> Date: Mon, 22 Jun 2026 09:38:33 +0200 Subject: [PATCH 120/339] Add stdlib to c-api (#8133) --- Cargo.lock | 1 + crates/capi/Cargo.toml | 7 ++----- crates/capi/src/import.rs | 7 +++++++ crates/capi/src/pylifecycle.rs | 15 ++++++++++++++- 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d49aab2d5..8c39aa024 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3479,6 +3479,7 @@ dependencies = [ "itertools 0.14.0", "num-complex", "pyo3", + "rustpython-pylib", "rustpython-stdlib", "rustpython-vm", ] diff --git a/crates/capi/Cargo.toml b/crates/capi/Cargo.toml index 70b7fc4b8..601989faa 100644 --- a/crates/capi/Cargo.toml +++ b/crates/capi/Cargo.toml @@ -15,15 +15,12 @@ crate-type = ["cdylib", "rlib"] bitflags = { workspace = true } itertools = { workspace = true } num-complex = { workspace = true } -rustpython-vm = { workspace = true, features = ["threading", "compiler"] } +rustpython-vm = { workspace = true, features = ["threading", "compiler", "importlib", "host_env"] } rustpython-stdlib = {workspace = true, features = ["threading"] } +rustpython-pylib = { workspace = true } [dev-dependencies] pyo3 = { workspace = true, features = ["auto-initialize", "abi3"] } [lints] workspace = true - -[package.metadata.cargo-shear] -# Not a direct dependency (yet), but we need to enable threading support in the stdlib. -ignored = ["rustpython-stdlib"] diff --git a/crates/capi/src/import.rs b/crates/capi/src/import.rs index d380d1f82..3550baa14 100644 --- a/crates/capi/src/import.rs +++ b/crates/capi/src/import.rs @@ -19,4 +19,11 @@ mod tests { let _module = py.import("sys").unwrap(); }) } + + #[test] + fn import_stdlib() { + Python::attach(|py| { + let _module = py.import("types").unwrap(); + }) + } } diff --git a/crates/capi/src/pylifecycle.rs b/crates/capi/src/pylifecycle.rs index 6760b2822..df964d117 100644 --- a/crates/capi/src/pylifecycle.rs +++ b/crates/capi/src/pylifecycle.rs @@ -2,6 +2,7 @@ use crate::get_main_interpreter; use crate::pyerrors::init_exception_statics; use crate::pystate::ensure_thread_has_vm_attached; use core::ffi::c_int; +use rustpython_vm::common::rc::PyRc; use rustpython_vm::vm::thread::ThreadedVirtualMachine; use rustpython_vm::{Context, Interpreter}; use std::sync::Mutex; @@ -32,7 +33,19 @@ pub extern "C" fn Py_InitializeEx(_initsigs: c_int) { if interp.is_none() { // Safety: Interpreter was not initialized before, so we can safely assume the statics are not used unsafe { init_exception_statics(&Context::genesis().exceptions) }; - *interp = Interpreter::with_init(Default::default(), |_vm| {}).into(); + let builder = Interpreter::builder(Default::default()); + let defs = rustpython_stdlib::stdlib_module_defs(&builder.ctx); + *interp = builder + .add_native_modules(&defs) + .init_hook(|vm| { + let state = PyRc::get_mut(&mut vm.state).unwrap(); + let path = rustpython_pylib::LIB_PATH.to_owned(); + + state.config.paths.stdlib_dir = Some(path.clone()); + state.config.paths.module_search_paths.insert(0, path); + }) + .build() + .into(); drop(interp); ensure_thread_has_vm_attached(); } From 619f423084203c5cfc23de3229b0ba97b2819c48 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Mon, 22 Jun 2026 10:42:54 +0300 Subject: [PATCH 121/339] Replace `&String` -> `&str` (#8136) --- crates/vm/src/builtins/module.rs | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/crates/vm/src/builtins/module.rs b/crates/vm/src/builtins/module.rs index 904109072..e62967558 100644 --- a/crates/vm/src/builtins/module.rs +++ b/crates/vm/src/builtins/module.rs @@ -231,7 +231,7 @@ impl Py<PyModule> { } else { // Check for uninitialized submodule let submodule_initializing = - is_uninitialized_submodule(mod_name_str.as_ref(), name, vm); + is_uninitialized_submodule(mod_name_str.as_deref(), name, vm); if submodule_initializing { Err(vm.new_attribute_error(format!( "cannot access submodule '{name}' of module '{mod_display}' \ @@ -461,29 +461,29 @@ pub(crate) fn init(context: &'static Context) { /// Check if {module_name}.{name} is an uninitialized submodule in sys.modules. fn is_uninitialized_submodule( - module_name: Option<&String>, + module_name: Option<&str>, name: &Py<PyStr>, vm: &VirtualMachine, ) -> bool { - let mod_name = match module_name { - Some(n) => n.as_str(), - None => return false, + let Some(mod_name) = module_name else { + return false; }; + + let Ok(sys_modules) = vm.sys_module.get_attr("modules", vm) else { + return false; + }; + let full_name = format!("{mod_name}.{name}"); - let sys_modules = match vm.sys_module.get_attr("modules", vm).ok() { - Some(m) => m, - None => return false, + let Ok(sub_mod) = sys_modules.get_item(&full_name, vm) else { + return false; }; - let sub_mod = match sys_modules.get_item(&full_name, vm).ok() { - Some(m) => m, - None => return false, - }; - let spec = match sub_mod.get_attr("__spec__", vm).ok() { - Some(s) if !vm.is_none(&s) => s, + + let spec = match sub_mod.get_attr("__spec__", vm) { + Ok(s) if !vm.is_none(&s) => s, _ => return false, }; + spec.get_attr("_initializing", vm) - .ok() - .and_then(|v| v.try_to_bool(vm).ok()) + .and_then(|v| v.try_to_bool(vm)) .unwrap_or(false) } From 866f7ca812a0ab2117661eb8ba0f1c392c972fc8 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Mon, 22 Jun 2026 10:44:08 +0300 Subject: [PATCH 122/339] Fix symtable type_param_block name (#8137) --- Lib/test/test_symtable.py | 32 +++++++++++++------------------ crates/codegen/src/symboltable.rs | 30 ++++++++++++++++++++++++++--- crates/vm/src/stdlib/_symtable.rs | 31 +++++++++++------------------- 3 files changed, 51 insertions(+), 42 deletions(-) diff --git a/Lib/test/test_symtable.py b/Lib/test/test_symtable.py index 1653ab4a7..f36bbcaea 100644 --- a/Lib/test/test_symtable.py +++ b/Lib/test/test_symtable.py @@ -190,20 +190,15 @@ class SymtableTest(unittest.TestCase): foo = find_block(top, "foo") Alias = find_block(top, "Alias") GenericAlias = find_block(top, "GenericAlias") - # XXX: RUSTPYTHON - # GenericAlias_inner = find_block(GenericAlias, "GenericAlias") + GenericAlias_inner = find_block(GenericAlias, "GenericAlias") generic_spam = find_block(top, "generic_spam") - # XXX: RUSTPYTHON - # generic_spam_inner = find_block(generic_spam, "generic_spam") + generic_spam_inner = find_block(generic_spam, "generic_spam") GenericMine = find_block(top, "GenericMine") - # XXX: RUSTPYTHON - # GenericMine_inner = find_block(GenericMine, "GenericMine") - # XXX: RUSTPYTHON - # T = find_block(GenericMine, "T") - # XXX: RUSTPYTHON - # U = find_block(GenericMine, "U") + GenericMine_inner = find_block(GenericMine, "GenericMine") + T = find_block(GenericMine, "T") + U = find_block(GenericMine, "U") - @unittest.expectedFailure # TODO: RUSTPYTHON + @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: <SymbolTableType.ANNOTATION: 'annotation'> != 'type alias' def test_type(self): self.assertEqual(self.top.get_type(), "module") self.assertEqual(self.Mine.get_type(), "class") @@ -221,7 +216,6 @@ class SymtableTest(unittest.TestCase): self.assertEqual(self.T.get_type(), "type variable") self.assertEqual(self.U.get_type(), "type variable") - @unittest.expectedFailure # TODO: RUSTPYTHON def test_id(self): self.assertGreater(self.top.get_id(), 0) self.assertGreater(self.Mine.get_id(), 0) @@ -254,7 +248,7 @@ class SymtableTest(unittest.TestCase): self.assertEqual(self.top.get_lineno(), 0) self.assertEqual(self.spam.get_lineno(), 14) - @unittest.expectedFailure # TODO: RUSTPYTHON + @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: Lists differ: [] != ['a', 'b', 'internal', 'kw', 'other_internal', 'some_var', 'var', 'x'] def test_function_info(self): func = self.spam self.assertEqual(sorted(func.get_parameters()), ["a", "b", "kw", "var"]) @@ -337,7 +331,7 @@ class SymtableTest(unittest.TestCase): self.assertTrue(self.Mine.lookup("a_method").is_assigned()) self.assertFalse(self.internal.lookup("x").is_assigned()) - @unittest.expectedFailure # TODO: RUSTPYTHON + @unittest.expectedFailure # TODO: RUSTPYTHON; IndexError: list index out of range def test_annotated(self): st1 = symtable.symtable('def f():\n x: int\n', 'test', 'exec') st2 = st1.get_children()[1] @@ -375,7 +369,7 @@ class SymtableTest(unittest.TestCase): self.assertEqual(self.spam.lookup("x").get_name(), "x") self.assertEqual(self.Mine.get_name(), "Mine") - @unittest.expectedFailure # TODO: RUSTPYTHON + @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: Tuples differ: () != ('a_method',) def test_class_get_methods(self): deprecation_mess = ( re.escape('symtable.Class.get_methods() is deprecated ' @@ -457,7 +451,7 @@ class SymtableTest(unittest.TestCase): check_body('\n'.join((gen, func)), ('genexpr',)) check_body('\n'.join((func, gen)), ('genexpr',)) - @unittest.expectedFailure # TODO: RUSTPYTHON + @unittest.expectedFailure # TODO: RUSTPYTHON; SyntaxError: name 'x' is parameter and global def test_filename_correct(self): ### Bug tickler: SyntaxError file name correct whether error raised ### while parsing or building symbol table. @@ -489,7 +483,7 @@ class SymtableTest(unittest.TestCase): def test_exec(self): symbols = symtable.symtable("def f(x): return x", "?", "exec") - @unittest.expectedFailure # TODO: RUSTPYTHON + @unittest.expectedFailure # TODO: RUSTPYTHON; TypeError: Expected type 'str' but 'bytes' found. def test_bytes(self): top = symtable.symtable(TEST_CODE.encode('utf8'), "?", "exec") self.assertIsNotNone(find_block(top, "Mine")) @@ -503,7 +497,7 @@ class SymtableTest(unittest.TestCase): self.assertEqual(str(self.top), "<SymbolTable for module ?>") self.assertEqual(str(self.spam), "<Function SymbolTable for spam in ?>") - @unittest.expectedFailure # TODO: RUSTPYTHON + @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: AssertionError: "<symbol 'glob': 0, DEF_GLOBAL>" != "<symbol 'glob': GLOBAL_IMPLICIT, USE>" def test_symbol_repr(self): self.assertEqual(repr(self.spam.lookup("glob")), "<symbol 'glob': GLOBAL_IMPLICIT, USE>") @@ -579,7 +573,7 @@ class ComprehensionTests(unittest.TestCase): class CommandLineTest(unittest.TestCase): maxDiff = None - @unittest.expectedFailure # TODO: RUSTPYTHON + @unittest.expectedFailure # TODO: RUSTPYTHON; TypeError: Expected type 'str' but 'bytes' found. def test_file(self): filename = os_helper.TESTFN self.addCleanup(os_helper.unlink, filename) diff --git a/crates/codegen/src/symboltable.rs b/crates/codegen/src/symboltable.rs index cd9ee4f0a..27ba10eba 100644 --- a/crates/codegen/src/symboltable.rs +++ b/crates/codegen/src/symboltable.rs @@ -184,6 +184,30 @@ pub enum SymbolScope { Cell, } +impl SymbolScope { + /// Returns the [`i32`] representation of this symbol scope. + /// + /// # See also + /// [CPython's definition](https://github.com/python/cpython/blob/v3.14.6/Include/internal/pycore_symtable.h#L180-L184) + #[must_use] + pub const fn as_i32(&self) -> i32 { + match self { + Self::Unknown => 0, + Self::Local => 1, + Self::GlobalExplicit => 2, + Self::GlobalImplicit => 3, + Self::Free => 4, + Self::Cell => 5, + } + } +} + +impl From<SymbolScope> for i32 { + fn from(scope: SymbolScope) -> Self { + scope.as_i32() + } +} + bitflags! { #[derive(Copy, Clone, Debug, PartialEq, Eq)] pub struct SymbolFlags: u16 { @@ -1510,7 +1534,7 @@ impl SymbolTableBuilder { // annotation scopes are nested inside and can see type parameters. if let Some(type_params) = type_params { self.enter_type_param_block( - &format!("<generic parameters of {}>", name.as_str()), + name.as_str(), self.line_index_start(type_params.range), false, true, @@ -1563,7 +1587,7 @@ impl SymbolTableBuilder { let prev_class = self.class_name.take(); if let Some(type_params) = type_params { self.enter_type_param_block( - &format!("<generic parameters of {}>", name.as_str()), + name.as_str(), self.line_index_start(type_params.range), true, // for_class: enable selective mangling false, @@ -1876,7 +1900,7 @@ impl SymbolTableBuilder { let is_generic = type_params.is_some(); if let Some(type_params) = type_params { self.enter_type_param_block( - &format!("<generic parameters of {alias_name}>"), + &alias_name, self.line_index_start(type_params.range), false, false, diff --git a/crates/vm/src/stdlib/_symtable.rs b/crates/vm/src/stdlib/_symtable.rs index 4945cbeed..4c6ec75f5 100644 --- a/crates/vm/src/stdlib/_symtable.rs +++ b/crates/vm/src/stdlib/_symtable.rs @@ -13,6 +13,9 @@ mod _symtable { CompilerScope, Symbol, SymbolFlags, SymbolScope, SymbolTable, }; + /// [CPython's `SCOPE_OFFSET`](https://github.com/python/cpython/blob/v3.14.6/Include/internal/pycore_symtable.h#L176) + const SCOPE_OFFSET: i32 = 12; + // Consts as defined at // https://github.com/python/cpython/blob/6cb20a219a860eaf687b2d968b41c480c7461909/Include/internal/pycore_symtable.h#L156 @@ -55,32 +58,23 @@ mod _symtable { #[pyattr] pub(super) const DEF_BOUND: i32 = DEF_LOCAL | DEF_PARAM | DEF_IMPORT; - #[pyattr] - pub(super) const SCOPE_OFFSET: i32 = 12; - #[pyattr] pub(super) const SCOPE_MASK: i32 = DEF_GLOBAL | DEF_LOCAL | DEF_PARAM | DEF_NONLOCAL; #[pyattr] - pub(super) const LOCAL: i32 = 1; + pub(super) const LOCAL: i32 = SymbolScope::Local.as_i32(); #[pyattr] - pub(super) const GLOBAL_EXPLICIT: i32 = 2; + pub(super) const GLOBAL_EXPLICIT: i32 = SymbolScope::GlobalExplicit.as_i32(); #[pyattr] - pub(super) const GLOBAL_IMPLICIT: i32 = 3; + pub(super) const GLOBAL_IMPLICIT: i32 = SymbolScope::GlobalImplicit.as_i32(); #[pyattr] - pub(super) const FREE: i32 = 4; + pub(super) const FREE: i32 = SymbolScope::Free.as_i32(); #[pyattr] - pub(super) const CELL: i32 = 5; - - #[pyattr] - pub(super) const GENERATOR: i32 = 1; - - #[pyattr] - pub(super) const GENERATOR_EXPRESSION: i32 = 2; + pub(super) const CELL: i32 = SymbolScope::Cell.as_i32(); #[pyattr] pub(super) const SCOPE_OFF: i32 = SCOPE_OFFSET; @@ -98,16 +92,13 @@ mod _symtable { pub(super) const TYPE_ANNOTATION: i32 = 3; #[pyattr] - pub(super) const TYPE_TYPE_VAR_BOUND: i32 = 4; + pub(super) const TYPE_TYPE_ALIAS: i32 = 4; #[pyattr] - pub(super) const TYPE_TYPE_ALIAS: i32 = 5; + pub(super) const TYPE_TYPE_PARAMETERS: i32 = 5; #[pyattr] - pub(super) const TYPE_TYPE_PARAMETERS: i32 = 6; - - #[pyattr] - pub(super) const TYPE_TYPE_VARIABLE: i32 = 7; + pub(super) const TYPE_TYPE_VARIABLE: i32 = 6; #[pyfunction] fn symtable( From c6e254fbdc837aa4cbfbf033f475cd93c83995f6 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Mon, 22 Jun 2026 10:46:17 +0300 Subject: [PATCH 123/339] General code nits (#8135) * General nitpicks * Move Compiler::constant_truthiness to a ConstantData method * More code cleanup * bytecode::CodeFlags -> CodeFlags * More code clenaups --- Cargo.lock | 1 + crates/codegen/src/compile.rs | 394 +++++++++++---------------- crates/codegen/src/ir.rs | 345 ++++++++--------------- crates/codegen/src/string_parser.rs | 1 + crates/compiler-core/Cargo.toml | 1 + crates/compiler-core/src/bytecode.rs | 26 ++ crates/vm/src/function/buffer.rs | 23 +- crates/vm/src/function/builtin.rs | 7 +- crates/vm/src/function/either.rs | 24 +- crates/vm/src/function/getset.rs | 4 +- crates/vm/src/function/method.rs | 1 + crates/vm/src/py_io.rs | 20 +- crates/vm/src/py_serde.rs | 5 +- crates/vm/src/readline.rs | 2 +- 14 files changed, 364 insertions(+), 490 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8c39aa024..600805878 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3553,6 +3553,7 @@ dependencies = [ "lz4_flex", "malachite-bigint", "num-complex", + "num-traits", "rustpython-ruff_source_file", "rustpython-wtf8", ] diff --git a/crates/codegen/src/compile.rs b/crates/codegen/src/compile.rs index 45c7dce60..0ad465fb2 100644 --- a/crates/codegen/src/compile.rs +++ b/crates/codegen/src/compile.rs @@ -24,13 +24,15 @@ use num_complex::Complex; use num_traits::{Num, ToPrimitive, Zero}; use ruff_python_ast as ast; use ruff_text_size::{Ranged, TextRange, TextSize}; + use rustpython_compiler_core::{ Mode, OneIndexed, PositionEncoding, SourceFile, SourceLocation, bytecode::{ self, AnyInstruction, AnyOpcode, Arg as OpArgMarker, BinaryOperator, BuildSliceArgCount, - CodeObject, ComparisonOperator, ConstantData, ConvertValueOparg, Instruction, - IntrinsicFunction1, Invert, LoadAttr, LoadSuperAttr, OpArg, OpArgType, PseudoInstruction, - SpecialMethod, UnpackExArgs, oparg, + CodeFlags, CodeObject, ComparisonOperator, ConstantData, ConvertValueOparg, Instruction, + IntrinsicFunction1, Invert, LoadAttr, LoadSuperAttr, MakeFunctionFlag, MakeFunctionFlags, + OpArg, OpArgType, Opcode, PseudoInstruction, PseudoOpcode, SpecialMethod, UnpackExArgs, + oparg, }, }; use rustpython_wtf8::Wtf8Buf; @@ -63,12 +65,9 @@ impl ExprExt for ast::Expr { fn is_constant_slice(&self) -> bool { match self { Self::Slice(s) => { - let lower_const = - s.lower.is_none() || s.lower.as_deref().is_some_and(|e| e.is_constant()); - let upper_const = - s.upper.is_none() || s.upper.as_deref().is_some_and(|e| e.is_constant()); - let step_const = - s.step.is_none() || s.step.as_deref().is_some_and(|e| e.is_constant()); + let lower_const = s.lower.as_deref().is_none_or(|e| e.is_constant()); + let upper_const = s.upper.as_deref().is_none_or(|e| e.is_constant()); + let step_const = s.step.as_deref().is_none_or(|e| e.is_constant()); lower_const && upper_const && step_const } _ => false, @@ -458,22 +457,6 @@ enum CollectionType { const STACK_USE_GUIDELINE: u32 = 30; impl Compiler { - fn constant_truthiness(constant: &ConstantData) -> bool { - match constant { - ConstantData::Tuple { elements } | ConstantData::Frozenset { elements } => { - !elements.is_empty() - } - ConstantData::Integer { value } => !value.is_zero(), - ConstantData::Float { value } => *value != 0.0, - ConstantData::Complex { value } => value.re != 0.0 || value.im != 0.0, - ConstantData::Boolean { value } => *value, - ConstantData::Str { value } => !value.is_empty(), - ConstantData::Bytes { value } => !value.is_empty(), - ConstantData::Code { .. } | ConstantData::Slice { .. } | ConstantData::Ellipsis => true, - ConstantData::None => false, - } - } - fn new(opts: CompileOpts, source_file: SourceFile, code_name: &str) -> Self { let module_code = ir::CodeInfo { // CPython convention: top-level module / interactive / @@ -484,7 +467,7 @@ impl Compiler { // empty flags. frame.rs:725-731 then binds locals to globals // for module/REPL frames whose `scope.locals` is None - the // correct semantics for `exec(code, globals)` and module init. - flags: bytecode::CodeFlags::empty(), + flags: CodeFlags::empty(), source_path: source_file.name().to_owned(), private: None, blocks: vec![ir::Block::default()], @@ -1196,13 +1179,10 @@ impl Compiler { let source_path = self.source_file.name().to_owned(); // Lookup symbol table entry using key (_PySymtable_Lookup) - let ste = match self.symbol_table_stack.get(key) { - Some(v) => v, - None => { - return Err(self.error(CodegenErrorType::SyntaxError( - "unknown symbol table entry".to_owned(), - ))); - } + let Some(ste) = self.symbol_table_stack.get(key) else { + return Err(self.error(CodegenErrorType::SyntaxError( + "unknown symbol table entry".into(), + ))); }; // Use varnames from symbol table (already collected in definition order) @@ -1273,16 +1253,21 @@ impl Compiler { .collect() }) .unwrap_or_default(); - let mut free_names: Vec<_> = ste + + let mut free_names = ste .symbols .iter() .filter(|(_, s)| { - s.scope == SymbolScope::Free - || (scope_type != CompilerScope::Class - && s.flags.contains(SymbolFlags::FREE_CLASS)) - || (scope_type == CompilerScope::Class - && s.flags.contains(SymbolFlags::FREE_CLASS) - && self.has_enclosing_non_module_code_scope()) + if s.scope == SymbolScope::Free { + return true; + } + + let has_free_class = s.flags.contains(SymbolFlags::FREE_CLASS); + if scope_type == CompilerScope::Class { + has_free_class && self.has_enclosing_non_module_code_scope() + } else { + has_free_class + } }) .filter(|(name, symbol)| { if !matches!( @@ -1294,7 +1279,8 @@ impl Compiler { !(annotation_free_names.contains(*name) && symbol.flags.is_empty()) }) .map(|(name, _)| name.clone()) - .collect(); + .collect::<Vec<_>>(); + free_names.sort(); for name in free_names { freevar_cache.insert(name); @@ -1302,28 +1288,23 @@ impl Compiler { // Initialize u_metadata fields let (mut flags, posonlyarg_count, arg_count, kwonlyarg_count) = match scope_type { - CompilerScope::Module => (bytecode::CodeFlags::empty(), 0, 0, 0), - CompilerScope::Class => (bytecode::CodeFlags::empty(), 0, 0, 0), + CompilerScope::Module => (CodeFlags::empty(), 0, 0, 0), + CompilerScope::Class => (CodeFlags::empty(), 0, 0, 0), CompilerScope::Function | CompilerScope::AsyncFunction | CompilerScope::Lambda => ( - bytecode::CodeFlags::NEWLOCALS | bytecode::CodeFlags::OPTIMIZED, + CodeFlags::NEWLOCALS | CodeFlags::OPTIMIZED, 0, // Will be set later in enter_function 0, // Will be set later in enter_function 0, // Will be set later in enter_function ), CompilerScope::Comprehension => ( - bytecode::CodeFlags::NEWLOCALS | bytecode::CodeFlags::OPTIMIZED, + CodeFlags::NEWLOCALS | CodeFlags::OPTIMIZED, 0, 1, // comprehensions take one argument (.0) 0, ), - CompilerScope::TypeParams => ( - bytecode::CodeFlags::NEWLOCALS | bytecode::CodeFlags::OPTIMIZED, - 0, - 0, - 0, - ), + CompilerScope::TypeParams => (CodeFlags::NEWLOCALS | CodeFlags::OPTIMIZED, 0, 0, 0), CompilerScope::Annotation => ( - bytecode::CodeFlags::NEWLOCALS | bytecode::CodeFlags::OPTIMIZED, + CodeFlags::NEWLOCALS | CodeFlags::OPTIMIZED, 1, // format is positional-only 1, // annotation scope takes one argument (format) 0, @@ -1331,7 +1312,7 @@ impl Compiler { }; if ste.is_method { - flags |= bytecode::CodeFlags::METHOD; + flags |= CodeFlags::METHOD; } // CPython sets CO_NESTED from symtable's ste_nested, not merely @@ -1347,12 +1328,12 @@ impl Compiler { | CompilerScope::Annotation | CompilerScope::TypeParams ) { - flags | bytecode::CodeFlags::NESTED + flags | CodeFlags::NESTED } else { flags }; if self.future_annotations { - flags |= bytecode::CodeFlags::FUTURE_ANNOTATIONS; + flags |= CodeFlags::FUTURE_ANNOTATIONS; } // Get private name from parent scope @@ -1436,10 +1417,7 @@ impl Compiler { let except_handler = None; self.cpython_cfg_builder_addop(ir::InstructionInfo { - instr: Instruction::Resume { - context: OpArgMarker::marker(), - } - .into(), + instr: Opcode::Resume.into(), arg: OpArg::new(oparg::ResumeLocation::AtFuncStart.into()), target: BlockIdx::NULL, location, @@ -1477,9 +1455,7 @@ impl Compiler { // Preserve flags computed from the symbol-table context. info.flags = flags | (info.flags - & (bytecode::CodeFlags::NESTED - | bytecode::CodeFlags::METHOD - | bytecode::CodeFlags::FUTURE_ANNOTATIONS)); + & (CodeFlags::NESTED | CodeFlags::METHOD | CodeFlags::FUTURE_ANNOTATIONS)); info.metadata.argcount = arg_count; info.metadata.posonlyargcount = posonlyarg_count; info.metadata.kwonlyargcount = kwonlyarg_count; @@ -2074,7 +2050,7 @@ impl Compiler { if self.future_annotations { self.current_code_info() .flags - .insert(bytecode::CodeFlags::FUTURE_ANNOTATIONS); + .insert(CodeFlags::FUTURE_ANNOTATIONS); } // Module-level __conditional_annotations__ cell @@ -2145,7 +2121,7 @@ impl Compiler { if self.future_annotations { self.current_code_info() .flags - .insert(bytecode::CodeFlags::FUTURE_ANNOTATIONS); + .insert(CodeFlags::FUTURE_ANNOTATIONS); } self.symbol_table_stack.push(symbol_table); let module_start_loc = self.module_start_location(body); @@ -2485,11 +2461,13 @@ impl Compiler { let current_table = self.current_symbol_table(); if current_table.typ == CompilerScope::Class && !self.current_code_info().in_inlined_comp - && ((usage == NameUsage::Load - && (name == "__class__" - || name == "__classdict__" - || name == "__conditional_annotations__")) - || (name == "__conditional_annotations__" && usage == NameUsage::Store)) + && matches!( + (usage, name.as_ref()), + ( + NameUsage::Load, + "__class__" | "__classdict__" | "__conditional_annotations__" + ) | (NameUsage::Store, "__conditional_annotations__") + ) { Some(SymbolScope::Cell) } else { @@ -3150,7 +3128,7 @@ impl Compiler { let code = self.exit_scope(); self.ctx = prev_ctx; - self.make_closure(code, bytecode::MakeFunctionFlags::new())?; + self.make_closure(code, MakeFunctionFlags::new())?; emit!(self, Instruction::PushNull); emit!(self, Instruction::Call { argc: 0 }); } else { @@ -3228,7 +3206,7 @@ impl Compiler { } self.push_output( - bytecode::CodeFlags::NEWLOCALS | bytecode::CodeFlags::OPTIMIZED, + CodeFlags::NEWLOCALS | CodeFlags::OPTIMIZED, parameters.posonlyargs.len().to_u32(), (parameters.posonlyargs.len() + parameters.args.len()).to_u32(), parameters.kwonlyargs.len().to_u32(), @@ -3246,11 +3224,11 @@ impl Compiler { } if let Some(name) = parameters.vararg.as_deref() { - self.current_code_info().flags |= bytecode::CodeFlags::VARARGS; + self.current_code_info().flags |= CodeFlags::VARARGS; self.varname(name.name.as_str()); } if let Some(name) = parameters.kwarg.as_deref() { - self.current_code_info().flags |= bytecode::CodeFlags::VARKEYWORDS; + self.current_code_info().flags |= CodeFlags::VARKEYWORDS; self.varname(name.name.as_str()); } @@ -3333,10 +3311,7 @@ impl Compiler { self.ctx = prev_ctx; self.set_source_range(expr_range); - self.make_closure( - code, - bytecode::MakeFunctionFlags::from([bytecode::MakeFunctionFlag::Defaults]), - )?; + self.make_closure(code, MakeFunctionFlags::from([MakeFunctionFlag::Defaults]))?; Ok(()) } @@ -3376,10 +3351,7 @@ impl Compiler { let code = self.exit_scope(); self.ctx = prev_ctx; self.set_source_range(alias_range); - self.make_closure( - code, - bytecode::MakeFunctionFlags::from([bytecode::MakeFunctionFlag::Defaults]), - )?; + self.make_closure(code, MakeFunctionFlags::from([MakeFunctionFlag::Defaults]))?; Ok(()) } @@ -4206,7 +4178,7 @@ impl Compiler { parameters: &ast::Parameters, loc: TextRange, ) -> CompileResult<bytecode::MakeFunctionFlags> { - let mut funcflags = bytecode::MakeFunctionFlags::new(); + let mut funcflags = MakeFunctionFlags::new(); // Handle positional defaults let defaults: Vec<_> = core::iter::empty() @@ -4227,7 +4199,7 @@ impl Compiler { count: defaults.len().to_u32() } ); - funcflags.insert(bytecode::MakeFunctionFlag::Defaults); + funcflags.insert(MakeFunctionFlag::Defaults); } // Handle keyword-only defaults @@ -4254,7 +4226,7 @@ impl Compiler { count: kw_with_defaults.len().to_u32(), } ); - funcflags.insert(bytecode::MakeFunctionFlag::KwOnlyDefaults); + funcflags.insert(MakeFunctionFlag::KwOnlyDefaults); } Ok(funcflags) @@ -4275,7 +4247,7 @@ impl Compiler { self.enter_function(name, parameters)?; self.current_code_info() .flags - .set(bytecode::CodeFlags::COROUTINE, is_async); + .set(CodeFlags::COROUTINE, is_async); // Set up context let prev_ctx = self.ctx; @@ -4304,7 +4276,7 @@ impl Compiler { .insert_full(ConstantData::Str { value: (*doc).to_string().into(), }); - self.current_code_info().flags |= bytecode::CodeFlags::HAS_DOCSTRING; + self.current_code_info().flags |= CodeFlags::HAS_DOCSTRING; } let start_label = self.use_cpython_function_start_label(); @@ -4460,7 +4432,7 @@ impl Compiler { // Make a closure from the code object self.set_source_range(func_range); - self.make_closure(annotate_code, bytecode::MakeFunctionFlags::new())?; + self.make_closure(annotate_code, MakeFunctionFlags::new())?; Ok(true) } @@ -4684,7 +4656,7 @@ impl Compiler { // Make a closure from the code object self.set_source_range(loc); - self.make_closure(annotate_code, bytecode::MakeFunctionFlags::new())?; + self.make_closure(annotate_code, MakeFunctionFlags::new())?; // Store as __annotate_func__ for classes, __annotate__ for modules let name = if parent_scope_type == CompilerScope::Class { @@ -4737,10 +4709,10 @@ impl Compiler { if is_generic { // Count args to pass to type params scope - if funcflags.contains(&bytecode::MakeFunctionFlag::Defaults) { + if funcflags.contains(&MakeFunctionFlag::Defaults) { num_typeparam_args += 1; } - if funcflags.contains(&bytecode::MakeFunctionFlag::KwOnlyDefaults) { + if funcflags.contains(&MakeFunctionFlag::KwOnlyDefaults) { num_typeparam_args += 1; } if num_typeparam_args == 2 { @@ -4750,7 +4722,7 @@ impl Compiler { // Enter type params scope let type_params_name = format!("<generic parameters of {name}>"); self.push_output( - bytecode::CodeFlags::OPTIMIZED | bytecode::CodeFlags::NEWLOCALS, + CodeFlags::OPTIMIZED | CodeFlags::NEWLOCALS, 0, num_typeparam_args, 0, @@ -4767,13 +4739,13 @@ impl Compiler { // Add parameter names to varnames for the type params scope // These will be passed as arguments when the closure is called let current_info = self.current_code_info(); - if funcflags.contains(&bytecode::MakeFunctionFlag::Defaults) { + if funcflags.contains(&MakeFunctionFlag::Defaults) { current_info .metadata .varnames .insert(".defaults".to_owned()); } - if funcflags.contains(&bytecode::MakeFunctionFlag::KwOnlyDefaults) { + if funcflags.contains(&MakeFunctionFlag::KwOnlyDefaults) { current_info .metadata .varnames @@ -4791,9 +4763,9 @@ impl Compiler { } // Compile annotations as closure (PEP 649) - let mut annotations_flag = bytecode::MakeFunctionFlags::new(); + let mut annotations_flag = MakeFunctionFlags::new(); if self.compile_annotations_closure(name, parameters, returns, def_source_range)? { - annotations_flag.insert(bytecode::MakeFunctionFlag::Annotate); + annotations_flag.insert(MakeFunctionFlag::Annotate); } // Compile function body @@ -4834,7 +4806,7 @@ impl Compiler { self.ctx = saved_ctx; // Make closure for type params code - self.make_closure(type_params_code, bytecode::MakeFunctionFlags::new())?; + self.make_closure(type_params_code, MakeFunctionFlags::new())?; if num_typeparam_args > 0 { emit!( @@ -4873,31 +4845,36 @@ impl Compiler { /// Determines if a variable should be CELL or FREE type // = get_ref_type fn get_ref_type(&self, name: &str) -> Result<SymbolScope, CodegenErrorType> { - let table = self.symbol_table_stack.last().unwrap(); + let table = self.current_symbol_table(); // Special handling for __class__, __classdict__, and __conditional_annotations__ in class scope // This should only apply when we're actually IN a class body, // not when we're in a method nested inside a class. if table.typ == CompilerScope::Class - && (name == "__class__" - || name == "__classdict__" - || name == "__conditional_annotations__") + && matches!( + name, + "__class__" | "__classdict__" | "__conditional_annotations__" + ) { return Ok(SymbolScope::Cell); } - match table.lookup(name) { - Some(symbol) => match symbol.scope { - SymbolScope::Cell => Ok(SymbolScope::Cell), - SymbolScope::Free => Ok(SymbolScope::Free), - _ if symbol.flags.contains(SymbolFlags::FREE_CLASS) => Ok(SymbolScope::Free), - _ => Err(CodegenErrorType::SyntaxError(format!( - "get_ref_type: invalid scope for '{name}'" - ))), - }, - None => Err(CodegenErrorType::SyntaxError(format!( + + let Some(symbol) = table.lookup(name) else { + return Err(CodegenErrorType::SyntaxError(format!( "get_ref_type: cannot find symbol '{name}'" - ))), - } + ))); + }; + + Ok(match symbol.scope { + SymbolScope::Cell => SymbolScope::Cell, + SymbolScope::Free => SymbolScope::Free, + _ if symbol.flags.contains(SymbolFlags::FREE_CLASS) => SymbolScope::Free, + _ => { + return Err(CodegenErrorType::SyntaxError(format!( + "get_ref_type: invalid scope for '{name}'" + ))); + } + }) } /// Loads closure variables if needed and creates a function object @@ -4990,57 +4967,57 @@ impl Compiler { emit!( self, Instruction::SetFunctionAttribute { - flag: bytecode::MakeFunctionFlag::Closure + flag: MakeFunctionFlag::Closure } ); } // Set annotations if present - if flags.contains(&bytecode::MakeFunctionFlag::Annotations) { + if flags.contains(&MakeFunctionFlag::Annotations) { emit!( self, Instruction::SetFunctionAttribute { - flag: bytecode::MakeFunctionFlag::Annotations + flag: MakeFunctionFlag::Annotations } ); } // Set __annotate__ closure if present (PEP 649) - if flags.contains(&bytecode::MakeFunctionFlag::Annotate) { + if flags.contains(&MakeFunctionFlag::Annotate) { emit!( self, Instruction::SetFunctionAttribute { - flag: bytecode::MakeFunctionFlag::Annotate + flag: MakeFunctionFlag::Annotate } ); } // Set kwdefaults if present - if flags.contains(&bytecode::MakeFunctionFlag::KwOnlyDefaults) { + if flags.contains(&MakeFunctionFlag::KwOnlyDefaults) { emit!( self, Instruction::SetFunctionAttribute { - flag: bytecode::MakeFunctionFlag::KwOnlyDefaults + flag: MakeFunctionFlag::KwOnlyDefaults } ); } // Set defaults if present - if flags.contains(&bytecode::MakeFunctionFlag::Defaults) { + if flags.contains(&MakeFunctionFlag::Defaults) { emit!( self, Instruction::SetFunctionAttribute { - flag: bytecode::MakeFunctionFlag::Defaults + flag: MakeFunctionFlag::Defaults } ); } // Set type_params if present - if flags.contains(&bytecode::MakeFunctionFlag::TypeParams) { + if flags.contains(&MakeFunctionFlag::TypeParams) { emit!( self, Instruction::SetFunctionAttribute { - flag: bytecode::MakeFunctionFlag::TypeParams + flag: MakeFunctionFlag::TypeParams } ); } @@ -5302,7 +5279,7 @@ impl Compiler { if is_generic { let type_params_name = format!("<generic parameters of {name}>"); self.push_output( - bytecode::CodeFlags::OPTIMIZED | bytecode::CodeFlags::NEWLOCALS, + CodeFlags::OPTIMIZED | CodeFlags::NEWLOCALS, 0, 0, 0, @@ -5345,7 +5322,7 @@ impl Compiler { // Create the class body function with the .type_params closure // captured through the class code object's freevars. - self.make_closure(class_code, bytecode::MakeFunctionFlags::new())?; + self.make_closure(class_code, MakeFunctionFlags::new())?; self.emit_load_const(ConstantData::Str { value: name.into() }); // Create .generic_base after the class function and name are on the @@ -5496,7 +5473,7 @@ impl Compiler { // Execute the type params function self.set_source_range(class_source_range); - self.make_closure(type_params_code, bytecode::MakeFunctionFlags::new())?; + self.make_closure(type_params_code, MakeFunctionFlags::new())?; self.set_source_range(class_source_range); emit!(self, Instruction::PushNull); self.set_source_range(class_source_range); @@ -5507,7 +5484,7 @@ impl Compiler { emit!(self, Instruction::PushNull); // Create class function with closure - self.make_closure(class_code, bytecode::MakeFunctionFlags::new())?; + self.make_closure(class_code, MakeFunctionFlags::new())?; self.emit_load_const(ConstantData::Str { value: name.into() }); if let Some(arguments) = arguments { @@ -8225,12 +8202,12 @@ impl Compiler { } self.enter_function(&name, params)?; - let mut func_flags = bytecode::MakeFunctionFlags::new(); + let mut func_flags = MakeFunctionFlags::new(); if have_defaults { - func_flags.insert(bytecode::MakeFunctionFlag::Defaults); + func_flags.insert(MakeFunctionFlag::Defaults); } if have_kwdefaults { - func_flags.insert(bytecode::MakeFunctionFlag::KwOnlyDefaults); + func_flags.insert(MakeFunctionFlag::KwOnlyDefaults); } // Set qualname for lambda @@ -8270,12 +8247,7 @@ impl Compiler { }) => { self.compile_comprehension( "<listcomp>", - Some( - Instruction::BuildList { - count: OpArgMarker::marker(), - } - .into(), - ), + Some(Opcode::BuildList.into()), generators, &|compiler, collection_add_i| { compiler.compile_comprehension_element(elt)?; @@ -8303,12 +8275,7 @@ impl Compiler { }) => { self.compile_comprehension( "<setcomp>", - Some( - Instruction::BuildSet { - count: OpArgMarker::marker(), - } - .into(), - ), + Some(Opcode::BuildSet.into()), generators, &|compiler, collection_add_i| { compiler.compile_comprehension_element(elt)?; @@ -8337,12 +8304,7 @@ impl Compiler { }) => { self.compile_comprehension( "<dictcomp>", - Some( - Instruction::BuildMap { - count: OpArgMarker::marker(), - } - .into(), - ), + Some(Opcode::BuildMap.into()), generators, &|compiler, collection_add_i| { // changed evaluation order for Py38 named expression PEP 572 @@ -9309,9 +9271,7 @@ impl Compiler { if let Some(info) = self.code_stack.last_mut() { info.flags = flags | (info.flags - & (bytecode::CodeFlags::NESTED - | bytecode::CodeFlags::METHOD - | bytecode::CodeFlags::FUTURE_ANNOTATIONS)); + & (CodeFlags::NESTED | CodeFlags::METHOD | CodeFlags::FUTURE_ANNOTATIONS)); info.metadata.argcount = arg_count; info.metadata.posonlyargcount = posonlyarg_count; info.metadata.kwonlyargcount = kwonlyarg_count; @@ -9395,9 +9355,9 @@ impl Compiler { in_async_scope: prev_ctx.in_async_scope || is_async, }; - let flags = bytecode::CodeFlags::NEWLOCALS | bytecode::CodeFlags::OPTIMIZED; + let flags = CodeFlags::NEWLOCALS | CodeFlags::OPTIMIZED; let flags = if is_async { - flags | bytecode::CodeFlags::COROUTINE + flags | CodeFlags::COROUTINE } else { flags }; @@ -9593,7 +9553,7 @@ impl Compiler { // Create comprehension function with closure self.set_source_range(comprehension_range); - self.make_closure(code, bytecode::MakeFunctionFlags::new())?; + self.make_closure(code, MakeFunctionFlags::new())?; // Evaluate iterated item and get its iterator. self.compile_comprehension_iter(outermost)?; @@ -10092,18 +10052,22 @@ impl Compiler { } let instr = instr.into(); let opcode = AnyOpcode::from(instr); + debug_assert!( !instr.is_assembler(), "CPython codegen_addop_* must not emit assembler-only opcodes" ); + debug_assert!( opcode.has_arg() || instr.has_target() || u32::from(arg) == 0, "CPython _PyInstructionSequence_Addop requires either OPCODE_HAS_ARG, HAS_TARGET, or oparg == 0" ); + debug_assert!( target == BlockIdx::NULL || instr.has_target(), "CPython codegen_addop_j only accepts HAS_TARGET opcodes" ); + let range = self.current_source_range; let source = self.source_file.to_source_code(); let location = source.source_location(range.start(), PositionEncoding::Utf8); @@ -10187,6 +10151,7 @@ impl Compiler { .blocks .first_mut() .expect("code unit must have an entry block"); + debug_assert!( entry .used_instructions() @@ -10200,14 +10165,11 @@ impl Compiler { }), "scope entry must start with a function-start RESUME" ); + debug_assert!( !entry.used_instructions().iter().any(|info| matches!( - info.instr.real(), - Some( - Instruction::ReturnGenerator - | Instruction::MakeCell { .. } - | Instruction::CopyFreeVars { .. } - ) + info.instr.real_opcode(), + Some(Opcode::ReturnGenerator | Opcode::MakeCell | Opcode::CopyFreeVars) )), "CPython inserts StopIteration cleanup before CFG prefix instructions" ); @@ -10555,7 +10517,7 @@ impl Compiler { } (ast::UnaryOp::Not, ConstantData::Tuple { .. }) => return Ok(None), (ast::UnaryOp::Not, value) => ConstantData::Boolean { - value: !Self::constant_truthiness(&value), + value: !value.truthiness(), }, _ => return Ok(None), } @@ -10575,9 +10537,9 @@ impl Compiler { let mut selected = first; match op { ast::BoolOp::Or => { - if !Self::constant_truthiness(&selected) { + if !selected.truthiness() { for constant in iter { - let is_truthy = Self::constant_truthiness(&constant); + let is_truthy = constant.truthiness(); selected = constant; if is_truthy { break; @@ -10586,9 +10548,9 @@ impl Compiler { } } ast::BoolOp::And => { - if Self::constant_truthiness(&selected) { + if selected.truthiness() { for constant in iter { - let is_truthy = Self::constant_truthiness(&constant); + let is_truthy = constant.truthiness(); selected = constant; if !is_truthy { break; @@ -10914,12 +10876,17 @@ impl Compiler { _ => {} } } + if !found_loop { - if is_break { - return Err(self.error_ranged(CodegenErrorType::InvalidBreak, range)); - } - return Err(self.error_ranged(CodegenErrorType::InvalidContinue, range)); + let err_type = if is_break { + CodegenErrorType::InvalidBreak + } else { + CodegenErrorType::InvalidContinue + }; + + return Err(self.error_ranged(err_type, range)); } + return Ok(()); } @@ -10956,12 +10923,7 @@ impl Compiler { } else { self.set_source_range(range); }; - self.emit_jump_label( - PseudoInstruction::Jump { - delta: OpArgMarker::marker(), - }, - target_label, - ); + self.emit_jump_label(PseudoOpcode::Jump, target_label); if unwind_loc.is_none() { self.set_no_location(); } @@ -11191,10 +11153,10 @@ impl Compiler { let is_async = self.ctx.func == FunctionContext::AsyncFunction; let flags = &mut self.current_code_info().flags; if is_async { - flags.remove(bytecode::CodeFlags::COROUTINE); - flags.insert(bytecode::CodeFlags::ASYNC_GENERATOR); + flags.remove(CodeFlags::COROUTINE); + flags.insert(CodeFlags::ASYNC_GENERATOR); } else { - flags.insert(bytecode::CodeFlags::GENERATOR); + flags.insert(CodeFlags::GENERATOR); } } @@ -12238,10 +12200,8 @@ mod tests { fn assert_scope_exit_locations(code: &CodeObject) { for (instr, (location, _)) in code.instructions.iter().zip(code.locations.iter()) { if matches!( - instr.op, - Instruction::ReturnValue - | Instruction::RaiseVarargs { .. } - | Instruction::Reraise { .. } + instr.op.into(), + Opcode::ReturnValue | Opcode::RaiseVarargs | Opcode::Reraise ) { assert!( location.line.get() > 0, @@ -12439,7 +12399,7 @@ def f(x, y, z): compiler .current_code_info() .flags - .set(bytecode::CodeFlags::COROUTINE, is_async); + .set(CodeFlags::COROUTINE, is_async); let prev_ctx = compiler.ctx; compiler.ctx = CompileContext { @@ -14757,13 +14717,13 @@ def f(): for code in [method, async_method, lambda, genexpr] { assert!( - code.flags.contains(bytecode::CodeFlags::METHOD), + code.flags.contains(CodeFlags::METHOD), "class-scope function-like code should carry CO_METHOD like CPython 3.14, got {:?}", code.flags ); } assert!( - !module_function.flags.contains(bytecode::CodeFlags::METHOD), + !module_function.flags.contains(CodeFlags::METHOD), "module-scope function must not carry CO_METHOD" ); } @@ -14782,11 +14742,11 @@ class C: let class_code = find_code(&code, "C").expect("missing class code"); let lambda = find_code(class_code, "<lambda>").expect("missing lambda code"); assert!( - lambda.flags.contains(bytecode::CodeFlags::NESTED), + lambda.flags.contains(CodeFlags::NESTED), "lambda under inlined class comprehension should stay nested" ); assert!( - !lambda.flags.contains(bytecode::CodeFlags::METHOD), + !lambda.flags.contains(CodeFlags::METHOD), "CPython creates this lambda while the current symtable block is the comprehension, not the class" ); } @@ -14822,37 +14782,17 @@ async def ag(): let coroutine = find_code(&code, "c").expect("missing coroutine code"); let async_generator = find_code(&code, "ag").expect("missing async generator code"); - assert!(generator.flags.contains(bytecode::CodeFlags::GENERATOR)); - assert!(!generator.flags.contains(bytecode::CodeFlags::COROUTINE)); - assert!( - !generator - .flags - .contains(bytecode::CodeFlags::ASYNC_GENERATOR) - ); + assert!(generator.flags.contains(CodeFlags::GENERATOR)); + assert!(!generator.flags.contains(CodeFlags::COROUTINE)); + assert!(!generator.flags.contains(CodeFlags::ASYNC_GENERATOR)); - assert!(coroutine.flags.contains(bytecode::CodeFlags::COROUTINE)); - assert!(!coroutine.flags.contains(bytecode::CodeFlags::GENERATOR)); - assert!( - !coroutine - .flags - .contains(bytecode::CodeFlags::ASYNC_GENERATOR) - ); + assert!(coroutine.flags.contains(CodeFlags::COROUTINE)); + assert!(!coroutine.flags.contains(CodeFlags::GENERATOR)); + assert!(!coroutine.flags.contains(CodeFlags::ASYNC_GENERATOR)); - assert!( - async_generator - .flags - .contains(bytecode::CodeFlags::ASYNC_GENERATOR) - ); - assert!( - !async_generator - .flags - .contains(bytecode::CodeFlags::GENERATOR) - ); - assert!( - !async_generator - .flags - .contains(bytecode::CodeFlags::COROUTINE) - ); + assert!(async_generator.flags.contains(CodeFlags::ASYNC_GENERATOR)); + assert!(!async_generator.flags.contains(CodeFlags::GENERATOR)); + assert!(!async_generator.flags.contains(CodeFlags::COROUTINE)); } #[test] @@ -24093,15 +24033,11 @@ def f(): return C ", ); - assert!(code.flags.contains(bytecode::CodeFlags::FUTURE_ANNOTATIONS)); + assert!(code.flags.contains(CodeFlags::FUTURE_ANNOTATIONS)); let f = find_code(&code, "f").expect("missing f code"); - assert!(f.flags.contains(bytecode::CodeFlags::FUTURE_ANNOTATIONS)); + assert!(f.flags.contains(CodeFlags::FUTURE_ANNOTATIONS)); let class_code = find_code(f, "C").expect("missing C code"); - assert!( - class_code - .flags - .contains(bytecode::CodeFlags::FUTURE_ANNOTATIONS) - ); + assert!(class_code.flags.contains(CodeFlags::FUTURE_ANNOTATIONS)); } #[test] @@ -24120,7 +24056,7 @@ def outer(): let class_annotate = find_code(class_code, "__annotate__").expect("missing class annotation code"); assert!( - !class_annotate.flags.contains(bytecode::CodeFlags::NESTED), + !class_annotate.flags.contains(CodeFlags::NESTED), "module-level class annotation scope should not be nested" ); @@ -24129,7 +24065,7 @@ def outer(): let nested_annotate = find_code(nested_class, "__annotate__").expect("missing nested annotation code"); assert!( - nested_annotate.flags.contains(bytecode::CodeFlags::NESTED), + nested_annotate.flags.contains(CodeFlags::NESTED), "annotation scope under a nested class should be nested" ); } @@ -24144,25 +24080,25 @@ type A[T] = T ); let outer_lambda = find_code(&code, "<lambda>").expect("missing outer lambda code"); assert!( - !outer_lambda.flags.contains(bytecode::CodeFlags::NESTED), + !outer_lambda.flags.contains(CodeFlags::NESTED), "module-level lambda should not be nested" ); let inner_lambda = find_direct_child_code(outer_lambda, "<lambda>").expect("missing inner lambda code"); assert!( - inner_lambda.flags.contains(bytecode::CodeFlags::NESTED), + inner_lambda.flags.contains(CodeFlags::NESTED), "lambda inside lambda should be nested" ); let type_params = find_code(&code, "<generic parameters of A>").expect("missing type params code"); assert!( - !type_params.flags.contains(bytecode::CodeFlags::NESTED), + !type_params.flags.contains(CodeFlags::NESTED), "module-level type-parameter scope should not be nested" ); let type_alias = find_direct_child_code(type_params, "A").expect("missing type alias code"); assert!( - type_alias.flags.contains(bytecode::CodeFlags::NESTED), + type_alias.flags.contains(CodeFlags::NESTED), "type alias body inside type-parameter scope should be nested" ); } diff --git a/crates/codegen/src/ir.rs b/crates/codegen/src/ir.rs index 74f558688..58e68b487 100644 --- a/crates/codegen/src/ir.rs +++ b/crates/codegen/src/ir.rs @@ -9,10 +9,10 @@ use rustpython_wtf8::Wtf8Buf; use rustpython_compiler_core::{ OneIndexed, SourceLocation, bytecode::{ - AnyInstruction, AnyOpcode, Arg, CO_FAST_ARG_KW, CO_FAST_ARG_POS, CO_FAST_ARG_VAR, - CO_FAST_CELL, CO_FAST_FREE, CO_FAST_HIDDEN, CO_FAST_LOCAL, CodeFlags, CodeObject, CodeUnit, - CodeUnits, ConstantData, InstrDisplayContext, Instruction, IntrinsicFunction1, OpArg, - OpArgByte, Opcode, PseudoInstruction, PseudoOpcode, PyCodeLocationInfoKind, oparg, + AnyInstruction, AnyOpcode, CO_FAST_ARG_KW, CO_FAST_ARG_POS, CO_FAST_ARG_VAR, CO_FAST_CELL, + CO_FAST_FREE, CO_FAST_HIDDEN, CO_FAST_LOCAL, CodeFlags, CodeObject, CodeUnit, CodeUnits, + ConstantData, InstrDisplayContext, Instruction, IntrinsicFunction1, OpArg, OpArgByte, + Opcode, PseudoInstruction, PseudoOpcode, PyCodeLocationInfoKind, oparg, }, varint::{write_signed_varint, write_varint}, }; @@ -832,7 +832,7 @@ fn instr_size(instr: &InstructionInfo) -> usize { } /// pycore_opcode_metadata.h is_pseudo_target -fn is_pseudo_target(pseudo: PseudoOpcode, target: Opcode) -> bool { +const fn is_pseudo_target(pseudo: PseudoOpcode, target: Opcode) -> bool { match pseudo { PseudoOpcode::LoadClosure => matches!(target, Opcode::LoadFast), PseudoOpcode::StoreFastMaybeNull => matches!(target, Opcode::StoreFast), @@ -874,16 +874,11 @@ fn resolve_unconditional_jumps( AnyInstruction::Pseudo(PseudoInstruction::Jump { .. }) => { debug_assert!(is_pseudo_target(PseudoOpcode::Jump, Opcode::JumpForward)); debug_assert!(is_pseudo_target(PseudoOpcode::Jump, Opcode::JumpBackward)); + if is_forward { - instr.instr = Instruction::JumpForward { - delta: Arg::marker(), - } - .into(); + instr.instr = Opcode::JumpForward.into(); } else { - instr.instr = Instruction::JumpBackward { - delta: Arg::marker(), - } - .into(); + instr.instr = Opcode::JumpBackward.into(); } } AnyInstruction::Pseudo(PseudoInstruction::JumpNoInterrupt { .. }) => { @@ -896,15 +891,9 @@ fn resolve_unconditional_jumps( Opcode::JumpBackwardNoInterrupt )); if is_forward { - instr.instr = Instruction::JumpForward { - delta: Arg::marker(), - } - .into(); + instr.instr = Opcode::JumpForward.into(); } else { - instr.instr = Instruction::JumpBackwardNoInterrupt { - delta: Arg::marker(), - } - .into(); + instr.instr = Opcode::JumpBackwardNoInterrupt.into(); } } _ => { @@ -1319,7 +1308,8 @@ impl Block { &self.instructions[..self.instruction_used] } - pub(crate) fn is_empty(&self) -> bool { + #[must_use] + pub(crate) const fn is_empty(&self) -> bool { self.instruction_used == 0 } } @@ -1717,10 +1707,7 @@ impl CodeInfo { &mut self.instr_sequence, 0, InstructionInfo { - instr: PseudoInstruction::SetupCleanup { - delta: Arg::marker(), - } - .into(), + instr: PseudoOpcode::SetupCleanup.into(), arg: instruction_sequence_label_oparg(handler_label), target: BlockIdx::NULL, location: SourceLocation::default(), @@ -1851,7 +1838,6 @@ fn optimized_cfg_to_instruction_sequence( } impl CodeInfo { - #[allow(clippy::needless_range_loop)] pub fn finalize_code( mut self, opts: &crate::compile::CompileOpts, @@ -2016,7 +2002,7 @@ fn insert_prefix_instructions( entry, ncellsused, InstructionInfo { - instr: Instruction::MakeCell { i: Arg::marker() }.into(), + instr: Opcode::MakeCell.into(), arg: OpArg::new(oldindex as u32), target: BlockIdx::NULL, location: SourceLocation::default(), @@ -2034,7 +2020,7 @@ fn insert_prefix_instructions( entry, 0, InstructionInfo { - instr: Instruction::CopyFreeVars { n: Arg::marker() }.into(), + instr: Opcode::CopyFreeVars.into(), arg: OpArg::new(nfreevars as u32), target: BlockIdx::NULL, location: SourceLocation::default(), @@ -2153,7 +2139,7 @@ fn eval_const_unaryop( } (ConstantData::Boolean { .. }, Instruction::UnaryInvert, None) => None, (_, Instruction::UnaryNot, None) => Some(ConstantData::Boolean { - value: !constant_truthiness(operand), + value: !operand.truthiness(), }), ( ConstantData::Integer { value }, @@ -2183,22 +2169,6 @@ fn eval_const_unaryop( } } -fn constant_truthiness(constant: &ConstantData) -> bool { - match constant { - ConstantData::Tuple { elements } | ConstantData::Frozenset { elements } => { - !elements.is_empty() - } - ConstantData::Integer { value } => !value.is_zero(), - ConstantData::Float { value } => *value != 0.0, - ConstantData::Complex { value } => value.re != 0.0 || value.im != 0.0, - ConstantData::Boolean { value } => *value, - ConstantData::Str { value } => !value.is_empty(), - ConstantData::Bytes { value } => !value.is_empty(), - ConstantData::Code { .. } | ConstantData::Slice { .. } | ConstantData::Ellipsis => true, - ConstantData::None => false, - } -} - fn load_const_truthiness( instr: Instruction, arg: OpArg, @@ -2207,7 +2177,7 @@ fn load_const_truthiness( match instr { Instruction::LoadConst { consti } => { let constant = &metadata.consts[consti.get(arg).as_usize()]; - Some(constant_truthiness(constant)) + Some(constant.truthiness()) } Instruction::LoadSmallInt { i } => Some(i.get(arg) != 0), _ => None, @@ -2234,10 +2204,7 @@ fn instr_make_load_const( let const_idx = add_const(metadata, constant)?; instr_set_op1( instr, - Instruction::LoadConst { - consti: Arg::marker(), - } - .into(), + Opcode::LoadConst.into(), OpArg::new(const_idx as u32), ); Ok(()) @@ -2260,12 +2227,7 @@ fn fold_const_unaryop( oparg::IntrinsicFunction1::UnaryPositive ) => { - ( - Instruction::CallIntrinsic1 { - func: Arg::marker(), - }, - Some(func.get(instr.arg)), - ) + (Opcode::CallIntrinsic1.into(), Some(func.get(instr.arg))) } _ => return Ok(false), }; @@ -2337,9 +2299,10 @@ fn fold_const_binop( ) -> crate::InternalResult<bool> { use oparg::BinaryOperator as BinOp; - let Some(Instruction::BinaryOp { .. }) = block.instructions[i].instr.real() else { + let Some(Opcode::BinaryOp) = block.instructions[i].instr.real_opcode() else { return Ok(false); }; + let Some(operand_indices) = (if let Some(start) = i.checked_sub(1) { get_const_loading_instrs(block, start, 2)? } else { @@ -2347,18 +2310,22 @@ fn fold_const_binop( }) else { return Ok(false); }; + let op_raw = u32::from(block.instructions[i].arg); let Ok(op) = BinOp::try_from(op_raw) else { return Ok(false); }; + let left = get_const_value(metadata, &block.instructions[operand_indices[0]]); let right = get_const_value(metadata, &block.instructions[operand_indices[1]]); let (Some(left_val), Some(right_val)) = (left, right) else { return Ok(false); }; + let Some(result_const) = eval_const_binop(&left_val, &right_val, op) else { return Ok(false); }; + nop_out(block, &operand_indices); instr_make_load_const(metadata, &mut block.instructions[i], result_const)?; Ok(true) @@ -2366,13 +2333,13 @@ fn fold_const_binop( /// flowgraph.c loads_const fn loads_const(info: &InstructionInfo) -> bool { - info.instr.has_const() || matches!(info.instr.real(), Some(Instruction::LoadSmallInt { .. })) + info.instr.has_const() || matches!(info.instr.real_opcode(), Some(Opcode::LoadSmallInt)) } /// flowgraph.c get_const_value fn get_const_value(metadata: &CodeUnitMetadata, info: &InstructionInfo) -> Option<ConstantData> { - match info.instr.real() { - Some(Instruction::LoadSmallInt { .. }) => { + match info.instr.real_opcode() { + Some(Opcode::LoadSmallInt) => { let v = u32::from(info.arg) as i32; Some(ConstantData::Integer { value: BigInt::from(v), @@ -3059,7 +3026,7 @@ fn fold_tuple_of_constants( block: &mut Block, i: usize, ) -> crate::InternalResult<bool> { - let Some(Instruction::BuildTuple { .. }) = block.instructions[i].instr.real() else { + let Some(Opcode::BuildTuple) = block.instructions[i].instr.real_opcode() else { return Ok(false); }; @@ -3237,16 +3204,11 @@ fn optimize_lists_and_sets( nop_out(block, &operand_indices); let build_instr = if is_list { - Instruction::BuildList { - count: Arg::marker(), - } - .into() + Opcode::BuildList } else { - Instruction::BuildSet { - count: Arg::marker(), - } - .into() - }; + Opcode::BuildSet + } + .into(); instr_set_op1(&mut block.instructions[i - 2], build_instr, OpArg::new(0)); block.instructions[i - 2].location = folded_loc; block.instructions[i - 2].end_location = end_loc; @@ -3254,10 +3216,7 @@ fn optimize_lists_and_sets( instr_set_op1( &mut block.instructions[i - 1], - Instruction::LoadConst { - consti: Arg::marker(), - } - .into(), + Opcode::LoadConst.into(), OpArg::new(const_idx as u32), ); @@ -3278,10 +3237,7 @@ fn optimize_lists_and_sets( instr_set_op1( &mut block.instructions[i], - Instruction::LoadConst { - consti: Arg::marker(), - } - .into(), + Opcode::LoadConst.into(), OpArg::new(const_idx as u32), ); Ok(true) @@ -3338,21 +3294,21 @@ fn next_swappable_instruction(block: &Block, mut i: usize, lineno: i32) -> Optio /// flowgraph.c swaptimize fn swaptimize(block: &mut Block, ix: &mut usize) -> crate::InternalResult<()> { debug_assert!(matches!( - block.instructions[*ix].instr.real(), - Some(Instruction::Swap { .. }) + block.instructions[*ix].instr.real_opcode(), + Some(Opcode::Swap) )); let mut depth = u32::from(block.instructions[*ix].arg) as usize; let mut len = 1usize; let mut more = false; let limit = block.instruction_used - *ix; while len < limit { - match block.instructions[*ix + len].instr.real() { - Some(Instruction::Swap { .. }) => { + match block.instructions[*ix + len].instr.real_opcode() { + Some(Opcode::Swap) => { depth = depth.max(u32::from(block.instructions[*ix + len].arg) as usize); more = true; len += 1; } - Some(Instruction::Nop) => { + Some(Opcode::Nop) => { len += 1; } _ => break, @@ -3377,7 +3333,7 @@ fn swaptimize(block: &mut Block, ix: &mut usize) -> crate::InternalResult<()> { i = 0; while i < len { let info = &block.instructions[*ix + i]; - if matches!(info.instr.real(), Some(Instruction::Swap { .. })) { + if matches!(info.instr.real_opcode(), Some(Opcode::Swap)) { let oparg = u32::from(info.arg) as usize; stack.swap(0, oparg - 1); } @@ -3421,15 +3377,15 @@ fn apply_static_swaps(block: &mut Block, mut i: isize) { while i >= 0 { let idx = i as usize; debug_assert!(idx < block.instruction_used); - let swap_arg = match block.instructions[idx].instr.real() { - Some(Instruction::Swap { .. }) => u32::from(block.instructions[idx].arg), - Some(Instruction::Nop | Instruction::PopTop | Instruction::StoreFast { .. }) => { + let swap_arg = match block.instructions[idx].instr.real_opcode() { + Some(Opcode::Swap) => u32::from(block.instructions[idx].arg), + Some(Opcode::Nop | Opcode::PopTop | Opcode::StoreFast) => { i -= 1; continue; } _ if matches!( - block.instructions[idx].instr.pseudo(), - Some(PseudoInstruction::StoreFastMaybeNull { .. }) + block.instructions[idx].instr.pseudo_opcode(), + Some(PseudoOpcode::StoreFastMaybeNull) ) => { i -= 1; @@ -3477,8 +3433,8 @@ fn apply_static_swaps_block(block: &mut Block) -> crate::InternalResult<()> { let mut i = 0; while i < block.instruction_used { if matches!( - block.instructions[i].instr.real(), - Some(Instruction::Swap { .. }) + block.instructions[i].instr.real_opcode(), + Some(Opcode::Swap) ) { swaptimize(block, &mut i)?; apply_static_swaps(block, i as isize); @@ -3548,11 +3504,11 @@ fn basicblock_optimize_load_const( let next_arg = next.arg; if let Some(is_true) = load_const_truthiness(const_instr, const_arg, metadata) { - let const_jump = match (next.instr.real(), next.instr.pseudo()) { - (_, Some(PseudoInstruction::JumpIfTrue { .. })) => Some((true, false)), - (_, Some(PseudoInstruction::JumpIfFalse { .. })) => Some((false, false)), - (Some(Instruction::PopJumpIfTrue { .. }), _) => Some((true, true)), - (Some(Instruction::PopJumpIfFalse { .. }), _) => Some((false, true)), + let const_jump = match (next.instr.real_opcode(), next.instr.pseudo_opcode()) { + (_, Some(PseudoOpcode::JumpIfTrue)) => Some((true, false)), + (_, Some(PseudoOpcode::JumpIfFalse)) => Some((false, false)), + (Some(Opcode::PopJumpIfTrue), _) => Some((true, true)), + (Some(Opcode::PopJumpIfFalse), _) => Some((false, true)), _ => None, }; if let Some((jump_if_true, pops_condition)) = const_jump { @@ -3560,10 +3516,7 @@ fn basicblock_optimize_load_const( set_to_nop(&mut block.instructions[i]); } if is_true == jump_if_true { - block.instructions[i + 1].instr = PseudoInstruction::Jump { - delta: Arg::marker(), - } - .into(); + block.instructions[i + 1].instr = PseudoOpcode::Jump.into(); } else { set_to_nop(&mut block.instructions[i + 1]); } @@ -3624,13 +3577,9 @@ fn basicblock_optimize_load_const( set_to_nop(&mut block.instructions[i]); set_to_nop(&mut block.instructions[i + 1]); block.instructions[jump_idx].instr = if invert { - Instruction::PopJumpIfNotNone { - delta: Arg::marker(), - } + Opcode::PopJumpIfNotNone } else { - Instruction::PopJumpIfNone { - delta: Arg::marker(), - } + Opcode::PopJumpIfNone } .into(); i = jump_idx; @@ -3648,10 +3597,7 @@ fn basicblock_optimize_load_const( set_to_nop(&mut block.instructions[i]); instr_set_op1( &mut block.instructions[i + 1], - Instruction::LoadConst { - consti: Arg::marker(), - } - .into(), + Opcode::LoadConst.into(), OpArg::new(const_idx as u32), ); i += 1; @@ -3729,8 +3675,7 @@ fn optimize_basic_block( } 2 | 3 => { set_to_nop(&mut blocks[bi].instructions[i]); - blocks[bi].instructions[i + 1].instr = - Instruction::Swap { i: Arg::marker() }.into(); + blocks[bi].instructions[i + 1].instr = Opcode::Swap.into(); i += 1; continue; } @@ -3925,7 +3870,6 @@ fn optimize_basic_block( } /// flowgraph.c remove_redundant_nops_and_pairs -#[allow(clippy::if_same_then_else, clippy::useless_let_if_seq)] #[allow(clippy::unnecessary_wraps)] fn remove_redundant_nops_and_pairs(blocks: &mut [Block]) -> crate::InternalResult<()> { let mut done = false; @@ -3947,29 +3891,21 @@ fn remove_redundant_nops_and_pairs(blocks: &mut [Block]) -> crate::InternalResul instr = Some((block_idx, instr_idx)); let instr_info = blocks[block_idx.idx()].instructions[instr_idx]; let mut prev_opcode = None; - let mut prev_oparg = 0; - if let Some((prev_block, prev_instr_idx)) = prev_instr { + let prev_oparg = if let Some((prev_block, prev_instr_idx)) = prev_instr { let prev_info = blocks[prev_block.idx()].instructions[prev_instr_idx]; - prev_opcode = prev_info.instr.real(); - prev_oparg = match prev_info.instr.real() { + prev_opcode = prev_info.instr.real_opcode(); + match prev_info.instr.real() { Some(Instruction::Copy { i }) => i.get(prev_info.arg), _ => u32::from(prev_info.arg), - }; - } - let opcode = instr_info.instr.real(); - let mut is_redundant_pair = false; - if matches!(opcode, Some(Instruction::PopTop)) { - if matches!( - prev_opcode, - Some(Instruction::LoadConst { .. } | Instruction::LoadSmallInt { .. }) - ) { - is_redundant_pair = true; - } else if matches!(prev_opcode, Some(Instruction::Copy { .. })) - && prev_oparg == 1 - { - is_redundant_pair = true; } - } + } else { + 0 + }; + + let opcode = instr_info.instr.real_opcode(); + let is_redundant_pair = matches!(opcode, Some(Opcode::PopTop)) + && (matches!(prev_opcode, Some(Opcode::LoadConst | Opcode::LoadSmallInt)) + || (prev_oparg == 1 && matches!(prev_opcode, Some(Opcode::Copy)))); if is_redundant_pair { let (prev_block, prev_instr_idx) = @@ -3980,10 +3916,10 @@ fn remove_redundant_nops_and_pairs(blocks: &mut [Block]) -> crate::InternalResul } } - let mut instr_is_jump = false; - if let Some((instr_block, instr_idx)) = instr { - instr_is_jump = is_jump(&blocks[instr_block.idx()].instructions[instr_idx]); - } + let instr_is_jump = instr.is_some_and(|(instr_block, instr_idx)| { + is_jump(&blocks[instr_block.idx()].instructions[instr_idx]) + }); + let block = &blocks[block_idx.idx()]; if instr_is_jump || !bb_has_fallthrough(block) { instr = None; @@ -4327,18 +4263,13 @@ fn optimize_load_fast(blocks: &mut [Block]) -> crate::InternalResult<()> { i += 1; continue; } - match info.instr.real() { - Some(Instruction::LoadFast { .. }) => { - info.instr = Instruction::LoadFastBorrow { - var_num: Arg::marker(), - } - .into(); + + match info.instr.real_opcode() { + Some(Opcode::LoadFast) => { + info.instr = Opcode::LoadFastBorrow.into(); } - Some(Instruction::LoadFastLoadFast { .. }) => { - info.instr = Instruction::LoadFastBorrowLoadFastBorrow { - var_nums: Arg::marker(), - } - .into(); + Some(Opcode::LoadFastLoadFast) => { + info.instr = Opcode::LoadFastBorrowLoadFastBorrow.into(); } _ => {} } @@ -4621,10 +4552,7 @@ fn insert_superinstructions(blocks: &mut [Block]) -> crate::InternalResult<usize make_super_instruction( &mut inst1[0], &mut rest[0], - Instruction::LoadFastLoadFast { - var_nums: Arg::marker(), - } - .into(), + Opcode::LoadFastLoadFast.into(), ); } } @@ -4634,10 +4562,7 @@ fn insert_superinstructions(blocks: &mut [Block]) -> crate::InternalResult<usize make_super_instruction( &mut inst1[0], &mut rest[0], - Instruction::StoreFastLoadFast { - var_nums: Arg::marker(), - } - .into(), + Opcode::StoreFastLoadFast.into(), ); } Some(Instruction::StoreFast { .. }) => { @@ -4645,10 +4570,7 @@ fn insert_superinstructions(blocks: &mut [Block]) -> crate::InternalResult<usize make_super_instruction( &mut inst1[0], &mut rest[0], - Instruction::StoreFastStoreFast { - var_nums: Arg::marker(), - } - .into(), + Opcode::StoreFastStoreFast.into(), ); } _ => {} @@ -4665,6 +4587,7 @@ fn insert_superinstructions(blocks: &mut [Block]) -> crate::InternalResult<usize } /// flowgraph.c LoadFastInstrFlag +#[derive(Clone, Copy, Eq, PartialEq)] #[repr(u8)] enum LoadFastInstrFlag { SupportKilled = 1, @@ -4795,6 +4718,7 @@ fn stackdepth_push( } /// flowgraph.c stack_effects +#[derive(Clone, Copy, Eq, PartialEq)] struct StackEffects { net: i32, } @@ -5468,29 +5392,24 @@ fn convert_pseudo_conditional_jumps(blocks: &mut [Block]) -> crate::InternalResu let instr = block.instructions[i]; let opcode = instr.instr; if matches!( - opcode.pseudo(), - Some(PseudoInstruction::JumpIfFalse { .. } | PseudoInstruction::JumpIfTrue { .. }) + opcode.pseudo_opcode(), + Some(PseudoOpcode::JumpIfFalse | PseudoOpcode::JumpIfTrue) ) { debug_assert_eq!(i, block.instruction_used - 1); block.instructions[i].instr = - if matches!(opcode.pseudo(), Some(PseudoInstruction::JumpIfFalse { .. })) { - Instruction::PopJumpIfFalse { - delta: Arg::marker(), - } - .into() + if matches!(opcode.pseudo_opcode(), Some(PseudoOpcode::JumpIfFalse)) { + Opcode::PopJumpIfFalse } else { - Instruction::PopJumpIfTrue { - delta: Arg::marker(), - } - .into() - }; + Opcode::PopJumpIfTrue + } + .into(); let location = instr.location; let end_location = instr.end_location; let except_handler = instr.except_handler; let lineno_override = instr.lineno_override; let copy = InstructionInfo { - instr: Instruction::Copy { i: Arg::marker() }.into(), + instr: Opcode::Copy.into(), arg: OpArg::new(1), target: BlockIdx::NULL, location, @@ -5502,7 +5421,7 @@ fn convert_pseudo_conditional_jumps(blocks: &mut [Block]) -> crate::InternalResu i += 1; let to_bool = InstructionInfo { - instr: Instruction::ToBool.into(), + instr: Opcode::ToBool.into(), arg: OpArg::new(0), target: BlockIdx::NULL, location, @@ -5552,7 +5471,7 @@ fn normalize_jumps_in_block( return Ok(()); } - let reversed_opcode = match AnyOpcode::from(last_ins.instr).real() { + let reversed_opcode = match last_ins.instr.real_opcode() { Some(Opcode::PopJumpIfNotNone) => Opcode::PopJumpIfNone.into(), Some(Opcode::PopJumpIfNone) => Opcode::PopJumpIfNotNone.into(), Some(Opcode::PopJumpIfFalse) => Opcode::PopJumpIfTrue.into(), @@ -5770,10 +5689,7 @@ fn remove_redundant_nops(blocks: &mut [Block]) -> crate::InternalResult<usize> { /// flowgraph.c no_redundant_nops #[cfg(debug_assertions)] fn no_redundant_nops(blocks: &mut [Block]) -> bool { - match remove_redundant_nops(blocks) { - Ok(0) => true, - Ok(_) | Err(_) => false, - } + matches!(remove_redundant_nops(blocks), Ok(0)) } /// flowgraph.c remove_redundant_jumps @@ -6745,10 +6661,7 @@ pub(crate) fn convert_pseudo_ops(blocks: &mut [Block]) -> crate::InternalResult< PseudoOpcode::StoreFastMaybeNull, Opcode::StoreFast )); - info.instr = Instruction::StoreFast { - var_num: Arg::marker(), - } - .into(); + info.instr = Opcode::StoreFast.into(); } } block_idx = next; @@ -6972,10 +6885,7 @@ mod tests { assert!(except_stack_top(&stack, &blocks).is_none()); let setup = InstructionInfo { - instr: PseudoInstruction::SetupWith { - delta: Arg::marker(), - } - .into(), + instr: PseudoOpcode::SetupWith.into(), arg: OpArg::new(0), target: BlockIdx::new(1), location: SourceLocation::default(), @@ -7294,14 +7204,9 @@ mod tests { #[test] fn static_swaps_respect_cpython_no_location_line_boundary() { let mut block = Block::default(); - let mut swap = test_instr(Instruction::Swap { i: Arg::marker() }, 60); + let mut swap = test_instr(Opcode::Swap.into(), 60); swap.arg = OpArg::new(2); - let mut store = test_instr( - Instruction::StoreFast { - var_num: Arg::marker(), - }, - 60, - ); + let mut store = test_instr(Opcode::StoreFast.into(), 60); store.arg = OpArg::new(0); let mut pop = test_instr(Instruction::PopTop, 60); pop.lineno_override = Some(NO_LOCATION_OVERRIDE); @@ -7328,14 +7233,9 @@ mod tests { )); let mut block = Block::default(); - let mut swap = test_instr(Instruction::Swap { i: Arg::marker() }, 70); + let mut swap = test_instr(Opcode::Swap.into(), 70); swap.arg = OpArg::new(2); - let mut store = test_instr( - Instruction::StoreFast { - var_num: Arg::marker(), - }, - 70, - ); + let mut store = test_instr(Opcode::StoreFast.into(), 70); store.arg = OpArg::new(0); store.lineno_override = Some(NO_LOCATION_OVERRIDE); let pop = test_instr(Instruction::PopTop, 71); @@ -7348,32 +7248,24 @@ mod tests { // Conversely, when the first swaperand has NO_LOCATION, CPython passes // `-1` as the line filter and does not enforce a boundary. assert!(matches!( - block.instructions[0].instr.real(), - Some(Instruction::Nop) + block.instructions[0].instr.real_opcode(), + Some(Opcode::Nop) )); assert!(matches!( - block.instructions[1].instr.real(), - Some(Instruction::PopTop) + block.instructions[1].instr.real_opcode(), + Some(Opcode::PopTop) )); assert!(matches!( - block.instructions[2].instr.real(), - Some(Instruction::StoreFast { .. }) + block.instructions[2].instr.real_opcode(), + Some(Opcode::StoreFast) )); } #[test] fn optimize_load_const_tracks_cpython_copy_of_load_const() { let mut block = Block::default(); - test_block_push( - &mut block, - test_instr( - Instruction::LoadConst { - consti: Arg::marker(), - }, - 80, - ), - ); - let mut copy = test_instr(Instruction::Copy { i: Arg::marker() }, 80); + test_block_push(&mut block, test_instr(Opcode::LoadConst.into(), 80)); + let mut copy = test_instr(Opcode::Copy.into(), 80); copy.arg = OpArg::new(1); test_block_push(&mut block, copy); test_block_push(&mut block, test_instr(Instruction::ToBool, 80)); @@ -7414,17 +7306,9 @@ mod tests { #[test] fn optimize_load_fast_records_no_input_opcode_ref_at_cpython_produced_index() { let mut block = Block::default(); - test_block_push( - &mut block, - test_instr( - Instruction::LoadFast { - var_num: Arg::marker(), - }, - 10, - ), - ); + test_block_push(&mut block, test_instr(Opcode::LoadFast.into(), 10)); test_block_push(&mut block, test_instr(Instruction::GetLen, 10)); - let mut swap = test_instr(Instruction::Swap { i: Arg::marker() }, 10); + let mut swap = test_instr(Opcode::Swap.into(), 10); swap.arg = OpArg::new(2); test_block_push(&mut block, swap); test_block_push(&mut block, test_instr(Instruction::PopTop, 10)); @@ -7472,12 +7356,7 @@ mod tests { let mut mortal = test_instr(Instruction::Nop, 90); mortal.instr = Opcode::LoadConstMortal.into(); mortal.arg = OpArg::new(right as u32); - let mut build = test_instr( - Instruction::BuildTuple { - count: Arg::marker(), - }, - 90, - ); + let mut build = test_instr(Opcode::BuildTuple.into(), 90); build.arg = OpArg::new(2); let mut block = Block::default(); for info in [immortal, mortal, build] { diff --git a/crates/codegen/src/string_parser.rs b/crates/codegen/src/string_parser.rs index ee6c08a56..0b5bcfffc 100644 --- a/crates/codegen/src/string_parser.rs +++ b/crates/codegen/src/string_parser.rs @@ -13,6 +13,7 @@ use rustpython_wtf8::{CodePoint, Wtf8, Wtf8Buf}; // use ruff_python_parser::{LexicalError, LexicalErrorType}; type LexicalError = Infallible; +#[derive(Clone, Copy, Debug, Eq, PartialEq)] enum EscapedChar { Literal(CodePoint), Escape(char), diff --git a/crates/compiler-core/Cargo.toml b/crates/compiler-core/Cargo.toml index 7d6d116f5..22201597d 100644 --- a/crates/compiler-core/Cargo.toml +++ b/crates/compiler-core/Cargo.toml @@ -18,6 +18,7 @@ bitflagset = { workspace = true } itertools = { workspace = true } malachite-bigint = { workspace = true } num-complex = { workspace = true } +num-traits = { workspace = true } lz4_flex = { workspace = true } diff --git a/crates/compiler-core/src/bytecode.rs b/crates/compiler-core/src/bytecode.rs index e5ef24815..ee6b6e5d9 100644 --- a/crates/compiler-core/src/bytecode.rs +++ b/crates/compiler-core/src/bytecode.rs @@ -17,6 +17,7 @@ use core::{ use itertools::Itertools; use malachite_bigint::BigInt; use num_complex::Complex64; +use num_traits::Zero; use rustpython_wtf8::{Wtf8, Wtf8Buf}; pub use crate::bytecode::{ @@ -909,6 +910,31 @@ pub enum ConstantData { Ellipsis, } +impl ConstantData { + /// Whether or not python would return True/False for the given constant data. + /// + /// ```py + /// bool(0) # False + /// bool(1) # True + /// bool([]) # False + /// bool(...) # True + /// ``` + #[must_use] + pub fn truthiness(&self) -> bool { + match self { + Self::Tuple { elements } | Self::Frozenset { elements } => !elements.is_empty(), + Self::Integer { value } => !value.is_zero(), + Self::Float { value } => *value != 0.0, + Self::Complex { value } => value.re != 0.0 || value.im != 0.0, + Self::Boolean { value } => *value, + Self::Str { value } => !value.is_empty(), + Self::Bytes { value } => !value.is_empty(), + Self::Code { .. } | Self::Slice { .. } | Self::Ellipsis => true, + Self::None => false, + } + } +} + impl PartialEq for ConstantData { fn eq(&self, other: &Self) -> bool { match (self, other) { diff --git a/crates/vm/src/function/buffer.rs b/crates/vm/src/function/buffer.rs index 028f3633d..213193bb9 100644 --- a/crates/vm/src/function/buffer.rs +++ b/crates/vm/src/function/buffer.rs @@ -13,11 +13,10 @@ use crate::{ pub struct ArgBytesLike(PyBuffer); impl PyObject { - pub fn try_bytes_like<R>( - &self, - vm: &VirtualMachine, - f: impl FnOnce(&[u8]) -> R, - ) -> PyResult<R> { + pub fn try_bytes_like<F, R>(&self, vm: &VirtualMachine, f: F) -> PyResult<R> + where + F: FnOnce(&[u8]) -> R, + { let buffer = PyBuffer::try_from_borrowed_object(vm, self)?; buffer .as_contiguous() @@ -25,11 +24,10 @@ impl PyObject { .ok_or_else(|| vm.new_buffer_error("non-contiguous buffer is not a bytes-like object")) } - pub fn try_rw_bytes_like<R>( - &self, - vm: &VirtualMachine, - f: impl FnOnce(&mut [u8]) -> R, - ) -> PyResult<R> { + pub fn try_rw_bytes_like<F, R>(&self, vm: &VirtualMachine, f: F) -> PyResult<R> + where + F: FnOnce(&mut [u8]) -> R, + { let buffer = PyBuffer::try_from_borrowed_object(vm, self)?; buffer .as_contiguous_mut() @@ -207,7 +205,10 @@ impl ArgAsciiBuffer { } #[inline] - pub fn with_ref<R>(&self, f: impl FnOnce(&[u8]) -> R) -> R { + pub fn with_ref<F, R>(&self, f: F) -> R + where + F: FnOnce(&[u8]) -> R, + { match self { Self::String(s) => f(s.as_bytes()), Self::Buffer(buffer) => buffer.with_ref(f), diff --git a/crates/vm/src/function/builtin.rs b/crates/vm/src/function/builtin.rs index 4fed5e4cf..47cb8dfcb 100644 --- a/crates/vm/src/function/builtin.rs +++ b/crates/vm/src/function/builtin.rs @@ -11,8 +11,9 @@ pub trait PyNativeFn: Fn(&VirtualMachine, FuncArgs) -> PyResult + PyThreadingConstraint + 'static { } -impl<F: Fn(&VirtualMachine, FuncArgs) -> PyResult + PyThreadingConstraint + 'static> PyNativeFn - for F + +impl<F> PyNativeFn for F where + F: Fn(&VirtualMachine, FuncArgs) -> PyResult + PyThreadingConstraint + 'static { } @@ -103,8 +104,10 @@ use sealed::PyNativeFnInternal; #[doc(hidden)] pub struct OwnedParam<T>(PhantomData<T>); + #[doc(hidden)] pub struct BorrowedParam<T>(PhantomData<T>); + #[doc(hidden)] pub struct RefParam<T>(PhantomData<T>); diff --git a/crates/vm/src/function/either.rs b/crates/vm/src/function/either.rs index 9ee7f028b..e7f6091b2 100644 --- a/crates/vm/src/function/either.rs +++ b/crates/vm/src/function/either.rs @@ -8,7 +8,11 @@ pub enum Either<A, B> { B(B), } -impl<A: Borrow<PyObject>, B: Borrow<PyObject>> Borrow<PyObject> for Either<A, B> { +impl<A, B> Borrow<PyObject> for Either<A, B> +where + A: Borrow<PyObject>, + B: Borrow<PyObject>, +{ #[inline(always)] fn borrow(&self) -> &PyObject { match self { @@ -18,7 +22,11 @@ impl<A: Borrow<PyObject>, B: Borrow<PyObject>> Borrow<PyObject> for Either<A, B> } } -impl<A: AsRef<PyObject>, B: AsRef<PyObject>> AsRef<PyObject> for Either<A, B> { +impl<A, B> AsRef<PyObject> for Either<A, B> +where + A: AsRef<PyObject>, + B: AsRef<PyObject>, +{ #[inline(always)] fn as_ref(&self) -> &PyObject { match self { @@ -28,7 +36,11 @@ impl<A: AsRef<PyObject>, B: AsRef<PyObject>> AsRef<PyObject> for Either<A, B> { } } -impl<A: Into<Self>, B: Into<Self>> From<Either<A, B>> for PyObjectRef { +impl<A, B> From<Either<A, B>> for PyObjectRef +where + A: Into<Self>, + B: Into<Self>, +{ #[inline(always)] fn from(value: Either<A, B>) -> Self { match value { @@ -38,7 +50,11 @@ impl<A: Into<Self>, B: Into<Self>> From<Either<A, B>> for PyObjectRef { } } -impl<A: ToPyObject, B: ToPyObject> ToPyObject for Either<A, B> { +impl<A, B> ToPyObject for Either<A, B> +where + A: ToPyObject, + B: ToPyObject, +{ #[inline(always)] fn to_pyobject(self, vm: &VirtualMachine) -> PyObjectRef { match self { diff --git a/crates/vm/src/function/getset.rs b/crates/vm/src/function/getset.rs index bcd745f56..a1c003dbc 100644 --- a/crates/vm/src/function/getset.rs +++ b/crates/vm/src/function/getset.rs @@ -1,6 +1,4 @@ -/*! Python `attribute` descriptor class. (PyGetSet) - -*/ +//! Python `attribute` descriptor class. (PyGetSet) use crate::{ Py, PyObjectRef, PyPayload, PyRef, PyResult, TryFromObject, VirtualMachine, convert::ToPyResult, diff --git a/crates/vm/src/function/method.rs b/crates/vm/src/function/method.rs index 12eda50c9..f0497fb38 100644 --- a/crates/vm/src/function/method.rs +++ b/crates/vm/src/function/method.rs @@ -254,6 +254,7 @@ impl PyMethodDef { all_methods } + #[must_use] const fn const_copy(&self) -> Self { Self { name: self.name, diff --git a/crates/vm/src/py_io.rs b/crates/vm/src/py_io.rs index 5649463b3..aa3fea8e5 100644 --- a/crates/vm/src/py_io.rs +++ b/crates/vm/src/py_io.rs @@ -1,14 +1,15 @@ +use core::{fmt, ops}; +use std::io; + use crate::{ PyObject, PyObjectRef, PyResult, VirtualMachine, builtins::{PyBaseExceptionRef, PyBytes, PyStr}, common::ascii, }; -use alloc::fmt; -use core::ops; -use std::io; pub trait Write { type Error; + fn write_fmt(&mut self, args: fmt::Arguments<'_>) -> Result<(), Self::Error>; } @@ -24,10 +25,12 @@ impl<T> IoWriter<T> { impl<T> ops::Deref for IoWriter<T> { type Target = T; + fn deref(&self) -> &T { &self.0 } } + impl<T> ops::DerefMut for IoWriter<T> { fn deref_mut(&mut self) -> &mut T { &mut self.0 @@ -39,6 +42,7 @@ where W: io::Write, { type Error = io::Error; + fn write_fmt(&mut self, args: fmt::Arguments<'_>) -> io::Result<()> { <W as io::Write>::write_fmt(&mut self.0, args) } @@ -46,6 +50,7 @@ where impl Write for String { type Error = fmt::Error; + fn write_fmt(&mut self, args: fmt::Arguments<'_>) -> fmt::Result { <Self as fmt::Write>::write_fmt(self, args) } @@ -55,8 +60,10 @@ pub struct PyWriter<'vm>(pub PyObjectRef, pub &'vm VirtualMachine); impl Write for PyWriter<'_> { type Error = PyBaseExceptionRef; + fn write_fmt(&mut self, args: fmt::Arguments<'_>) -> Result<(), Self::Error> { - let PyWriter(obj, vm) = self; + let Self(obj, vm) = self; + vm.call_method(obj, "write", (args.to_string(),)).map(drop) } } @@ -70,6 +77,7 @@ pub fn file_readline(obj: &PyObject, size: Option<usize>, vm: &VirtualMachine) - vec![vm.ctx.new_str(ascii!("EOF when reading a line")).into()], ) }; + let ret = match_class!(match ret { s @ PyStr => { // Use as_wtf8() to handle strings with surrogates (e.g., surrogateescape) @@ -77,6 +85,7 @@ pub fn file_readline(obj: &PyObject, size: Option<usize>, vm: &VirtualMachine) - if s_wtf8.is_empty() { return Err(eof_err()); } + // '\n' is ASCII, so we can check bytes directly if s_wtf8.as_bytes().last() == Some(&b'\n') { let no_nl = &s_wtf8[..s_wtf8.len() - 1]; @@ -90,13 +99,14 @@ pub fn file_readline(obj: &PyObject, size: Option<usize>, vm: &VirtualMachine) - if buf.is_empty() { return Err(eof_err()); } + if buf.last() == Some(&b'\n') { vm.ctx.new_bytes(buf[..buf.len() - 1].to_owned()).into() } else { b.into() } } - _ => return Err(vm.new_type_error("object.readline() returned non-string".to_owned())), + _ => return Err(vm.new_type_error("object.readline() returned non-string")), }); Ok(ret) } diff --git a/crates/vm/src/py_serde.rs b/crates/vm/src/py_serde.rs index 945068113..50ea4422b 100644 --- a/crates/vm/src/py_serde.rs +++ b/crates/vm/src/py_serde.rs @@ -111,8 +111,9 @@ pub struct PyObjectDeserializer<'c> { } impl<'c> PyObjectDeserializer<'c> { - pub fn new(vm: &'c VirtualMachine) -> Self { - PyObjectDeserializer { vm } + #[must_use] + pub const fn new(vm: &'c VirtualMachine) -> Self { + Self { vm } } } diff --git a/crates/vm/src/readline.rs b/crates/vm/src/readline.rs index bd0ecd739..53475358c 100644 --- a/crates/vm/src/readline.rs +++ b/crates/vm/src/readline.rs @@ -12,7 +12,7 @@ pub enum ReadlineResult { Line(String), Eof, Interrupt, - Io(std::io::Error), + Io(io::Error), #[cfg(unix)] OsError(String), Other(OtherError), From 221d95cbbea4371e37de94064f25fe77fe61b489 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Mon, 22 Jun 2026 10:46:53 +0300 Subject: [PATCH 124/339] Run windows tests with `-u all` (#8134) * Enable all test resources on windows * Mark tests * mark wmi test --- .github/workflows/ci.yaml | 3 ++- Lib/test/test_codecmaps_kr.py | 2 +- Lib/test/test_codecmaps_tw.py | 2 +- Lib/test/test_tokenize.py | 1 + Lib/test/test_venv.py | 1 + Lib/test/test_winconsoleio.py | 1 + Lib/test/test_winsound.py | 1 + Lib/test/test_wmi.py | 1 + 8 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index abc2173c6..72599d287 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -306,7 +306,8 @@ jobs: skips: [] timeout: 60 - os: windows-2025 - extra_test_args: [] # TODO: Enable '-u all' + extra_test_args: + - '-u all' env_polluting_tests: - test_set skips: [] diff --git a/Lib/test/test_codecmaps_kr.py b/Lib/test/test_codecmaps_kr.py index b8376d366..a6409239d 100644 --- a/Lib/test/test_codecmaps_kr.py +++ b/Lib/test/test_codecmaps_kr.py @@ -11,7 +11,7 @@ class TestCP949Map(multibytecodec_support.TestBase_Mapping, encoding = 'cp949' mapfileurl = 'http://www.pythontest.net/unicode/CP949.TXT' - @unittest.expectedFailure # TODO: RUSTPYTHON; LookupError: unknown encoding: cp949 + @unittest.expectedFailureIf(__import__("sys").platform in ("android", "darwin", "linux"), "TODO: RUSTPYTHON; LookupError: unknown encoding: cp949") def test_mapping_file(self): return super().test_mapping_file() diff --git a/Lib/test/test_codecmaps_tw.py b/Lib/test/test_codecmaps_tw.py index 4a1359ce7..2fcf59c9f 100644 --- a/Lib/test/test_codecmaps_tw.py +++ b/Lib/test/test_codecmaps_tw.py @@ -27,7 +27,7 @@ class TestCP950Map(multibytecodec_support.TestBase_Mapping, (b"\xFFxy", "replace", "\ufffdxy"), ) - @unittest.expectedFailure # TODO: RUSTPYTHON; LookupError: unknown encoding: cp950 + @unittest.expectedFailureIf(__import__("sys").platform in ("android", "darwin", "linux"), "TODO: RUSTPYTHON; LookupError: unknown encoding: cp950") def test_errorhandle(self): return super().test_errorhandle() diff --git a/Lib/test/test_tokenize.py b/Lib/test/test_tokenize.py index 394a87c36..5ed844c34 100644 --- a/Lib/test/test_tokenize.py +++ b/Lib/test/test_tokenize.py @@ -2173,6 +2173,7 @@ if 1: # Two string literals on the same line self.check_roundtrip("'' ''") + @unittest.skipIf(support.is_resource_enabled("cpu") and __import__("sys").platform == "win32", "TODO: RUSTPYTHON; Timeout after 10 minutes") def test_random_files(self): # Test roundtrip on random python modules. # pass the '-ucpu' option to process the full directory. diff --git a/Lib/test/test_venv.py b/Lib/test/test_venv.py index 34757c97a..2ea5f5022 100644 --- a/Lib/test/test_venv.py +++ b/Lib/test/test_venv.py @@ -1094,6 +1094,7 @@ class EnsurePipTest(BaseTest): f"**Subprocess Error**\n{err}" ) + @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON; FileNotFoundError: [WinError 2] No such file or directory") @requires_venv_with_pip() @requires_resource('cpu') def test_with_pip(self): diff --git a/Lib/test/test_winconsoleio.py b/Lib/test/test_winconsoleio.py index 1bae884ed..516d55632 100644 --- a/Lib/test/test_winconsoleio.py +++ b/Lib/test/test_winconsoleio.py @@ -142,6 +142,7 @@ class WindowsConsoleIOTests(unittest.TestCase): with ConIO('CONOUT$', 'w') as f: self.assertEqual(f.write(b''), 0) + @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON") @requires_resource('console') def test_write(self): testcases = [] diff --git a/Lib/test/test_winsound.py b/Lib/test/test_winsound.py index 9724d830a..d013d8396 100644 --- a/Lib/test/test_winsound.py +++ b/Lib/test/test_winsound.py @@ -100,6 +100,7 @@ class MessageBeepTest(unittest.TestCase): class PlaySoundTest(unittest.TestCase): + @unittest.expectedFailureIfWindows("TODO: RUSTPYTHON; TypeError: a bytes-like object is required, not 'str'") def test_errors(self): self.assertRaises(TypeError, winsound.PlaySound) self.assertRaises(TypeError, winsound.PlaySound, "bad", "bad") diff --git a/Lib/test/test_wmi.py b/Lib/test/test_wmi.py index 90eb40439..e2d924c97 100644 --- a/Lib/test/test_wmi.py +++ b/Lib/test/test_wmi.py @@ -59,6 +59,7 @@ class WmiTests(unittest.TestCase): with self.assertRaises(ValueError): wmi_exec_query("not select, just in case someone tries something") + @unittest.skipIf(__import__("sys").platform == "win32", "TODO: RUSTPYTHON; Timeout after 10 minutes") @support.requires_resource('cpu') def test_wmi_query_overflow(self): # Ensure very big queries fail From a70a2bb4b852b586edbf08c9165824183f8bed14 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Mon, 22 Jun 2026 15:56:50 +0300 Subject: [PATCH 125/339] Use `ast::visitor::Visitor` for collection annotations (#8139) --- crates/codegen/src/compile.rs | 70 +++++++++++------------------------ 1 file changed, 21 insertions(+), 49 deletions(-) diff --git a/crates/codegen/src/compile.rs b/crates/codegen/src/compile.rs index 0ad465fb2..893198d26 100644 --- a/crates/codegen/src/compile.rs +++ b/crates/codegen/src/compile.rs @@ -4442,55 +4442,28 @@ impl Compiler { /// order as symbol-table construction so the annotation scope's /// `sub_tables` cursor stays aligned. fn collect_annotations(body: &[ast::Stmt]) -> Vec<&ast::StmtAnnAssign> { - fn walk<'a>(stmts: &'a [ast::Stmt], out: &mut Vec<&'a ast::StmtAnnAssign>) { - for stmt in stmts { + use ast::visitor::Visitor; + + #[derive(Default)] + struct AnnotationsVisitor<'a> { + annotations: Vec<&'a ast::StmtAnnAssign>, + } + + impl<'a> Visitor<'a> for AnnotationsVisitor<'a> { + fn visit_stmt(&mut self, stmt: &'a ast::Stmt) { match stmt { - ast::Stmt::AnnAssign(stmt) => out.push(stmt), - ast::Stmt::If(ast::StmtIf { - body, - elif_else_clauses, - .. - }) => { - walk(body, out); - for clause in elif_else_clauses { - walk(&clause.body, out); - } - } - ast::Stmt::For(ast::StmtFor { body, orelse, .. }) - | ast::Stmt::While(ast::StmtWhile { body, orelse, .. }) => { - walk(body, out); - walk(orelse, out); - } - ast::Stmt::With(ast::StmtWith { body, .. }) => walk(body, out), - ast::Stmt::Try(ast::StmtTry { - body, - handlers, - orelse, - finalbody, - .. - }) => { - walk(body, out); - for handler in handlers { - let ast::ExceptHandler::ExceptHandler( - ast::ExceptHandlerExceptHandler { body, .. }, - ) = handler; - walk(body, out); - } - walk(orelse, out); - walk(finalbody, out); - } - ast::Stmt::Match(ast::StmtMatch { cases, .. }) => { - for case in cases { - walk(&case.body, out); - } - } - _ => {} + ast::Stmt::AnnAssign(ann_assign) => self.annotations.push(ann_assign), + ast::Stmt::ClassDef(_) | ast::Stmt::FunctionDef(_) => {} + _ => ast::visitor::walk_stmt(self, stmt), } } } - let mut annotations = Vec::new(); - walk(body, &mut annotations); - annotations + + let mut visitor = AnnotationsVisitor::default(); + for stmt in body { + visitor.visit_stmt(stmt); + } + visitor.annotations } fn compile_annotation_for_symbol_cursor_only( @@ -4509,12 +4482,11 @@ impl Compiler { ) -> CompileResult<bool> { let loc = loc.unwrap_or(self.current_source_range); let annotations = Self::collect_annotations(body); - let simple_annotation_count = annotations + let has_simple_annotation = annotations .iter() - .filter(|stmt| stmt.simple && matches!(stmt.target.as_ref(), ast::Expr::Name(_))) - .count(); + .any(|stmt| stmt.simple && matches!(stmt.target.as_ref(), ast::Expr::Name(_))); - if simple_annotation_count == 0 { + if !has_simple_annotation { return Ok(false); } From d0390e4fdbe1682890761cf61d5e139f69991343 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jun 2026 21:57:04 +0900 Subject: [PATCH 126/339] Bump webpack-dev-server from 5.2.4 to 5.2.5 in /wasm/demo (#8140) Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 5.2.4 to 5.2.5. - [Release notes](https://github.com/webpack/webpack-dev-server/releases) - [Changelog](https://github.com/webpack/webpack-dev-server/blob/main/CHANGELOG.md) - [Commits](https://github.com/webpack/webpack-dev-server/compare/v5.2.4...v5.2.5) --- updated-dependencies: - dependency-name: webpack-dev-server dependency-version: 5.2.5 dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- wasm/demo/package-lock.json | 8 ++++---- wasm/demo/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/wasm/demo/package-lock.json b/wasm/demo/package-lock.json index 21385a868..33be8e601 100644 --- a/wasm/demo/package-lock.json +++ b/wasm/demo/package-lock.json @@ -24,7 +24,7 @@ "serve": "^14.2.6", "webpack": "^5.105.0", "webpack-cli": "^6.0.1", - "webpack-dev-server": "^5.2.4" + "webpack-dev-server": "^5.2.5" } }, "node_modules/@codemirror/autocomplete": { @@ -5691,9 +5691,9 @@ } }, "node_modules/webpack-dev-server": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-5.2.4.tgz", - "integrity": "sha512-GqDPGZN9bRqKBTkp4aWkobDDHMsrXKoGSdOH56smIri8qR0JG8gfL8/v/f/OZR3/OKXjG8uwJbFVhKm/FNU/UA==", + "version": "5.2.5", + "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-5.2.5.tgz", + "integrity": "sha512-4wZtCquSuv9CKX8oybo+mqxtxZqWz47uM1Ch94lxowBztOhWCbhqvRbfC/mODOwxgV2brY+JGZpHq58/SuVFYg==", "dev": true, "license": "MIT", "dependencies": { diff --git a/wasm/demo/package.json b/wasm/demo/package.json index 0b22c24ea..04d7aa78c 100644 --- a/wasm/demo/package.json +++ b/wasm/demo/package.json @@ -19,7 +19,7 @@ "serve": "^14.2.6", "webpack": "^5.105.0", "webpack-cli": "^6.0.1", - "webpack-dev-server": "^5.2.4" + "webpack-dev-server": "^5.2.5" }, "scripts": { "dev": "webpack serve", From c95b48c1b39c9ba49e9f5049bd15784d7f2d6f55 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Mon, 22 Jun 2026 16:56:35 +0300 Subject: [PATCH 127/339] Remove duplicated code in `compile.rs` (#8141) --- crates/codegen/src/compile.rs | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/crates/codegen/src/compile.rs b/crates/codegen/src/compile.rs index 893198d26..a6d6cadf0 100644 --- a/crates/codegen/src/compile.rs +++ b/crates/codegen/src/compile.rs @@ -39,7 +39,7 @@ use rustpython_wtf8::Wtf8Buf; /// Extension trait for `ast::Expr` to add constant checking methods trait ExprExt { - /// Check if an expression is a constant literal + /// Returns true if the expression is a constant literal with no side effects. fn is_constant(&self) -> bool; /// Check if a slice expression has all constant elements @@ -2782,7 +2782,7 @@ impl Compiler { // In interactive mode, always compile (to print the result). let dominated_by_interactive = self.interactive && !self.ctx.in_func() && !self.ctx.in_class; - if !dominated_by_interactive && Self::is_const_expression(value) { + if !dominated_by_interactive && value.is_constant() { emit!(self, Instruction::Nop); } else { self.compile_expression(value)?; @@ -7881,19 +7881,6 @@ impl Compiler { send_block } - /// Returns true if the expression is a constant with no side effects. - fn is_const_expression(expr: &ast::Expr) -> bool { - matches!( - expr, - ast::Expr::StringLiteral(_) - | ast::Expr::BytesLiteral(_) - | ast::Expr::NumberLiteral(_) - | ast::Expr::BooleanLiteral(_) - | ast::Expr::NoneLiteral(_) - | ast::Expr::EllipsisLiteral(_) - ) - } - fn compile_expression(&mut self, expression: &ast::Expr) -> CompileResult<()> { trace!("Compiling {expression:?}"); let range = expression.range(); From 6533a7844aac99b7d26976fa999d5d84197a6bce Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Mon, 22 Jun 2026 16:57:48 +0300 Subject: [PATCH 128/339] Newtype for `[ir::Block]` (#8142) --- crates/codegen/src/compile.rs | 13 +- crates/codegen/src/ir.rs | 542 +++++++++++++++++++--------------- 2 files changed, 310 insertions(+), 245 deletions(-) diff --git a/crates/codegen/src/compile.rs b/crates/codegen/src/compile.rs index a6d6cadf0..a178a23bd 100644 --- a/crates/codegen/src/compile.rs +++ b/crates/codegen/src/compile.rs @@ -12,7 +12,7 @@ use crate::{ IndexMap, IndexSet, ToPythonName, error::{CodegenError, CodegenErrorType, InternalError, PatternUnreachableReason}, - ir::{self, BlockIdx}, + ir::{self, Block, BlockIdx, Blocks}, preprocess, symboltable::{self, CompilerScope, Symbol, SymbolFlags, SymbolScope, SymbolTable}, unparse::UnparseExpr, @@ -470,7 +470,7 @@ impl Compiler { flags: CodeFlags::empty(), source_path: source_file.name().to_owned(), private: None, - blocks: vec![ir::Block::default()], + blocks: Blocks::from([Block::default()]), current_block: BlockIdx::new(0), instr_sequence: ir::InstructionSequence::new(), instr_sequence_label_map: ir::InstructionSequenceLabelMap::new(), @@ -547,8 +547,9 @@ impl Compiler { saved_annotations_instr_sequence, ) = { let code = self.current_code_info(); + ( - mem::replace(&mut code.blocks, vec![ir::Block::default()]), + mem::replace(&mut code.blocks, Blocks::from([Block::default()])), mem::replace(&mut code.current_block, BlockIdx::new(0)), mem::replace(&mut code.instr_sequence, ir::InstructionSequence::new()), mem::replace( @@ -1348,7 +1349,7 @@ impl Compiler { flags, source_path, private, - blocks: vec![ir::Block::default()], + blocks: Blocks::from([Block::default()]), current_block: BlockIdx::new(0), instr_sequence: ir::InstructionSequence::new(), instr_sequence_label_map: ir::InstructionSequenceLabelMap::new(), @@ -10983,7 +10984,7 @@ impl Compiler { unwrap_internal(self, result); let code = self.current_code_info(); let idx = BlockIdx::new(code.blocks.len().to_u32()); - code.blocks.push(ir::Block::default()); + code.blocks.push(Block::default()); let result = code.push_unmapped_instr_sequence_label(); unwrap_internal(self, result); idx @@ -10998,7 +10999,7 @@ impl Compiler { unwrap_internal(self, result); let code = self.current_code_info(); let idx = BlockIdx::new(code.blocks.len().to_u32()); - code.blocks.push(ir::Block::default()); + code.blocks.push(Block::default()); let result = code.push_unlabeled_instr_sequence_block(); unwrap_internal(self, result); idx diff --git a/crates/codegen/src/ir.rs b/crates/codegen/src/ir.rs index 58e68b487..e7b50659e 100644 --- a/crates/codegen/src/ir.rs +++ b/crates/codegen/src/ir.rs @@ -1,4 +1,4 @@ -use core::ops; +use core::ops::{Deref, DerefMut, Index, IndexMut}; use crate::{IndexMap, IndexSet, error::InternalError}; use malachite_bigint::BigInt; @@ -141,7 +141,7 @@ impl ConstantPool { } } -impl ops::Index<usize> for ConstantPool { +impl Index<usize> for ConstantPool { type Output = ConstantData; fn index(&self, idx: usize) -> &Self::Output { @@ -190,44 +190,34 @@ impl BlockIdx { Self(value) } + /// Returns the inner [`u32`] value. + #[must_use] + pub const fn as_u32(self) -> u32 { + self.0 + } + + /// Returns the inner value as a [`usize`]. + #[must_use] + pub const fn as_usize(self) -> usize { + self.0 as usize + } + /// Returns the inner value as a [`usize`]. #[must_use] pub const fn idx(self) -> usize { - self.0 as usize + self.as_usize() } } impl From<BlockIdx> for u32 { fn from(block_idx: BlockIdx) -> Self { - block_idx.0 + block_idx.as_u32() } } -impl ops::Index<BlockIdx> for [Block] { - type Output = Block; - - fn index(&self, idx: BlockIdx) -> &Block { - &self[idx.idx()] - } -} - -impl ops::IndexMut<BlockIdx> for [Block] { - fn index_mut(&mut self, idx: BlockIdx) -> &mut Block { - &mut self[idx.idx()] - } -} - -impl ops::Index<BlockIdx> for Vec<Block> { - type Output = Block; - - fn index(&self, idx: BlockIdx) -> &Block { - &self[idx.idx()] - } -} - -impl ops::IndexMut<BlockIdx> for Vec<Block> { - fn index_mut(&mut self, idx: BlockIdx) -> &mut Block { - &mut self[idx.idx()] +impl From<BlockIdx> for usize { + fn from(block_idx: BlockIdx) -> Self { + block_idx.as_usize() } } @@ -449,16 +439,16 @@ fn basicblock_insert_instruction( /// flowgraph.c basicblock_append_instructions fn basicblock_append_block_instructions( - blocks: &mut [Block], + blocks: &mut Blocks, to: BlockIdx, from: BlockIdx, ) -> crate::InternalResult<()> { debug_assert_ne!(to, from); - let from_len = blocks[from.idx()].instruction_used; + let from_len = blocks[from].instruction_used; for i in 0..from_len { - let info = blocks[from.idx()].instructions[i]; - let off = basicblock_next_instr(&mut blocks[to.idx()])?; - blocks[to.idx()].instructions[off] = info; + let info = blocks[from].instructions[i]; + let off = basicblock_next_instr(&mut blocks[to])?; + blocks[to].instructions[off] = info; } Ok(()) } @@ -765,7 +755,7 @@ fn instruction_sequence_apply_label_map( /// flowgraph.c _PyCfg_ToInstructionSequence fn cfg_to_instruction_sequence( - blocks: &mut [Block], + blocks: &mut Blocks, instr_sequence: &mut InstructionSequence, ) -> crate::InternalResult<()> { let mut label_id = 0; @@ -1314,6 +1304,100 @@ impl Block { } } +#[derive(Clone, Debug, Default)] +pub struct Blocks(Vec<Block>); + +impl Blocks { + pub fn try_reserve( + &mut self, + additional: usize, + ) -> Result<(), alloc::collections::TryReserveError> { + self.0.try_reserve(additional) + } + + pub fn push(&mut self, value: Block) { + self.0.push(value) + } +} + +impl From<Vec<Block>> for Blocks { + fn from(value: Vec<Block>) -> Self { + Self(value) + } +} + +impl From<Box<[Block]>> for Blocks { + fn from(value: Box<[Block]>) -> Self { + Self(value.into()) + } +} + +impl From<&[Block]> for Blocks { + fn from(value: &[Block]) -> Self { + Self(value.to_vec()) + } +} + +impl From<&mut [Block]> for Blocks { + fn from(value: &mut [Block]) -> Self { + Self(value.to_vec()) + } +} + +impl<const N: usize> From<[Block; N]> for Blocks { + fn from(value: [Block; N]) -> Self { + Self(value.into()) + } +} + +impl<const N: usize> From<&[Block; N]> for Blocks { + fn from(value: &[Block; N]) -> Self { + Self(value.to_vec()) + } +} + +impl Deref for Blocks { + type Target = [Block]; + + fn deref(&self) -> &Self::Target { + &self.0 + } +} + +impl DerefMut for Blocks { + fn deref_mut(&mut self) -> &mut Self::Target { + &mut self.0 + } +} + +impl Index<usize> for Blocks { + type Output = Block; + + fn index(&self, idx: usize) -> &Self::Output { + &self.0[idx] + } +} + +impl IndexMut<usize> for Blocks { + fn index_mut(&mut self, idx: usize) -> &mut Self::Output { + &mut self.0[idx] + } +} + +impl Index<BlockIdx> for Blocks { + type Output = Block; + + fn index(&self, block_idx: BlockIdx) -> &Self::Output { + &self.0[block_idx.as_usize()] + } +} + +impl IndexMut<BlockIdx> for Blocks { + fn index_mut(&mut self, block_idx: BlockIdx) -> &mut Self::Output { + &mut self.0[block_idx.as_usize()] + } +} + pub(crate) const START_DEPTH_UNSET: i32 = i32::MIN; const CO_MAXBLOCKS: usize = 20; @@ -1541,7 +1625,7 @@ pub struct CodeInfo { pub source_path: String, pub private: Option<String>, // For private name mangling, mostly for class - pub blocks: Vec<Block>, + pub blocks: Blocks, pub current_block: BlockIdx, pub(crate) instr_sequence: InstructionSequence, pub(crate) instr_sequence_label_map: InstructionSequenceLabelMap, @@ -1751,7 +1835,7 @@ impl CodeInfo { fn optimize_code_unit( metadata: &mut CodeUnitMetadata, - blocks: &mut Vec<Block>, + blocks: &mut Blocks, instr_sequence: InstructionSequence, nlocals: usize, nparams: usize, @@ -1776,7 +1860,7 @@ fn optimize_code_unit( fn optimize_cfg( metadata: &mut CodeUnitMetadata, - blocks: &mut Vec<Block>, + blocks: &mut Blocks, firstlineno: OneIndexed, ) -> crate::InternalResult<()> { // flowgraph.c optimize_cfg @@ -1798,7 +1882,7 @@ fn optimize_cfg( optimize_load_const(metadata, blocks)?; let mut block_idx = BlockIdx(0); while block_idx != BlockIdx::NULL { - let next_block = blocks[block_idx.idx()].next; + let next_block = blocks[block_idx].next; optimize_basic_block(blocks, metadata, block_idx)?; block_idx = next_block; } @@ -1816,7 +1900,7 @@ fn optimize_cfg( fn optimized_cfg_to_instruction_sequence( metadata: &CodeUnitMetadata, flags: CodeFlags, - blocks: &mut Vec<Block>, + blocks: &mut Blocks, ) -> crate::InternalResult<(u32, usize, InstructionSequence)> { // Phase 2: _PyCfg_OptimizedCfgToInstructionSequence (flowgraph.c) convert_pseudo_conditional_jumps(blocks)?; @@ -1938,7 +2022,7 @@ fn is_generator(flags: CodeFlags) -> bool { /// flowgraph.c insert_prefix_instructions fn insert_prefix_instructions( metadata: &CodeUnitMetadata, - blocks: &mut [Block], + blocks: &mut Blocks, cellfixedoffsets: &[i32], nfreevars: usize, flags: CodeFlags, @@ -2036,7 +2120,7 @@ fn insert_prefix_instructions( /// flowgraph.c prepare_localsplus fn prepare_localsplus( metadata: &CodeUnitMetadata, - blocks: &mut [Block], + blocks: &mut Blocks, flags: CodeFlags, ) -> crate::InternalResult<usize> { let nlocals = metadata.varnames.len(); @@ -2060,11 +2144,11 @@ fn prepare_localsplus( } /// flowgraph.c remove_unreachable -fn remove_unreachable(blocks: &mut [Block]) -> crate::InternalResult<()> { +fn remove_unreachable(blocks: &mut Blocks) -> crate::InternalResult<()> { let mut block_idx = BlockIdx(0); while block_idx != BlockIdx::NULL { - blocks[block_idx.idx()].predecessors = 0; - block_idx = blocks[block_idx.idx()].next; + blocks[block_idx].predecessors = 0; + block_idx = blocks[block_idx].next; } let mut stack = make_cfg_traversal_stack(blocks)?; @@ -2075,12 +2159,12 @@ fn remove_unreachable(blocks: &mut [Block]) -> crate::InternalResult<()> { let idx = current.idx(); let next = blocks[idx].next; if next != BlockIdx::NULL && bb_has_fallthrough(&blocks[idx]) { - if !blocks[next.idx()].visited { - debug_assert_eq!(blocks[next.idx()].predecessors, 0); + if !blocks[next].visited { + debug_assert_eq!(blocks[next].predecessors, 0); stack.push(next); - blocks[next.idx()].visited = true; + blocks[next].visited = true; } - blocks[next.idx()].predecessors += 1; + blocks[next].predecessors += 1; } let instr_count = blocks[idx].instruction_used; @@ -3612,7 +3696,7 @@ fn basicblock_optimize_load_const( /// flowgraph.c optimize_load_const fn optimize_load_const( metadata: &mut CodeUnitMetadata, - blocks: &mut [Block], + blocks: &mut Blocks, ) -> crate::InternalResult<()> { let mut block_idx = BlockIdx(0); while block_idx != BlockIdx::NULL { @@ -3626,7 +3710,7 @@ fn optimize_load_const( /// flowgraph.c optimize_basic_block fn optimize_basic_block( - blocks: &mut [Block], + blocks: &mut Blocks, metadata: &mut CodeUnitMetadata, block_idx: BlockIdx, ) -> crate::InternalResult<()> { @@ -3871,7 +3955,7 @@ fn optimize_basic_block( /// flowgraph.c remove_redundant_nops_and_pairs #[allow(clippy::unnecessary_wraps)] -fn remove_redundant_nops_and_pairs(blocks: &mut [Block]) -> crate::InternalResult<()> { +fn remove_redundant_nops_and_pairs(blocks: &mut Blocks) -> crate::InternalResult<()> { let mut done = false; while !done { @@ -3910,17 +3994,17 @@ fn remove_redundant_nops_and_pairs(blocks: &mut [Block]) -> crate::InternalResul if is_redundant_pair { let (prev_block, prev_instr_idx) = prev_instr.expect("redundant pair has previous"); - set_to_nop(&mut blocks[prev_block.idx()].instructions[prev_instr_idx]); - set_to_nop(&mut blocks[block_idx.idx()].instructions[instr_idx]); + set_to_nop(&mut blocks[prev_block].instructions[prev_instr_idx]); + set_to_nop(&mut blocks[block_idx].instructions[instr_idx]); done = false; } } let instr_is_jump = instr.is_some_and(|(instr_block, instr_idx)| { - is_jump(&blocks[instr_block.idx()].instructions[instr_idx]) + is_jump(&blocks[instr_block].instructions[instr_idx]) }); - let block = &blocks[block_idx.idx()]; + let block = &blocks[block_idx]; if instr_is_jump || !bb_has_fallthrough(block) { instr = None; } @@ -3933,7 +4017,7 @@ fn remove_redundant_nops_and_pairs(blocks: &mut [Block]) -> crate::InternalResul /// flowgraph.c remove_unused_consts #[allow(clippy::needless_range_loop)] fn remove_unused_consts( - blocks: &mut [Block], + blocks: &mut Blocks, consts: &mut ConstantPool, ) -> crate::InternalResult<()> { let nconsts = consts.len(); @@ -4031,7 +4115,7 @@ fn remove_unused_consts( Ok(()) } -fn optimize_load_fast(blocks: &mut [Block]) -> crate::InternalResult<()> { +fn optimize_load_fast(blocks: &mut Blocks) -> crate::InternalResult<()> { let mut max_instrs = 0; let mut current = BlockIdx(0); while current != BlockIdx::NULL { @@ -4280,7 +4364,7 @@ fn optimize_load_fast(blocks: &mut [Block]) -> crate::InternalResult<()> { } /// flowgraph.c calculate_stackdepth -fn calculate_stackdepth(blocks: &mut [Block]) -> crate::InternalResult<u32> { +fn calculate_stackdepth(blocks: &mut Blocks) -> crate::InternalResult<u32> { let mut current = BlockIdx(0); while current != BlockIdx::NULL { blocks[current.idx()].start_depth = START_DEPTH_UNSET; @@ -4415,7 +4499,7 @@ impl CodeInfo { )); let mut block_idx = BlockIdx(0); while block_idx != BlockIdx::NULL { - let next_block = self.blocks[block_idx.idx()].next; + let next_block = self.blocks[block_idx].next; optimize_basic_block(&mut self.blocks, &mut self.metadata, block_idx)?; block_idx = next_block; } @@ -4536,7 +4620,7 @@ fn make_super_instruction( } /// flowgraph.c insert_superinstructions -fn insert_superinstructions(blocks: &mut [Block]) -> crate::InternalResult<usize> { +fn insert_superinstructions(blocks: &mut Blocks) -> crate::InternalResult<usize> { let mut block_idx = BlockIdx(0); while block_idx != BlockIdx::NULL { let next_block = blocks[block_idx.idx()].next; @@ -4685,22 +4769,22 @@ fn local_as_ref_local(local: usize) -> isize { /// flowgraph.c load_fast_push_block fn load_fast_push_block( worklist: &mut CfgTraversalStack, - blocks: &mut [Block], + blocks: &mut Blocks, target: BlockIdx, start_depth: usize, ) { debug_assert!(target != BlockIdx::NULL); - debug_assert!(blocks[target.idx()].start_depth >= 0); - debug_assert_eq!(blocks[target.idx()].start_depth as usize, start_depth,); - if !blocks[target.idx()].visited { - blocks[target.idx()].visited = true; + debug_assert!(blocks[target].start_depth >= 0); + debug_assert_eq!(blocks[target].start_depth as usize, start_depth,); + if !blocks[target].visited { + blocks[target].visited = true; worklist.push(target); } } fn stackdepth_push( stack: &mut CfgTraversalStack, - blocks: &mut [Block], + blocks: &mut Blocks, target: BlockIdx, depth: i32, ) -> crate::InternalResult<()> { @@ -5060,25 +5144,25 @@ fn assemble_exception_table( /// Mark exception handler target blocks. /// flowgraph.c mark_except_handlers #[allow(clippy::unnecessary_wraps)] -pub(crate) fn mark_except_handlers(blocks: &mut [Block]) -> crate::InternalResult<()> { +pub(crate) fn mark_except_handlers(blocks: &mut Blocks) -> crate::InternalResult<()> { #[cfg(debug_assertions)] { let mut block_idx = BlockIdx(0); while block_idx != BlockIdx::NULL { - assert!(!blocks[block_idx.idx()].except_handler); - block_idx = blocks[block_idx.idx()].next; + assert!(!blocks[block_idx].except_handler); + block_idx = blocks[block_idx].next; } } let mut block_idx = BlockIdx(0); while block_idx != BlockIdx::NULL { - let next = blocks[block_idx.idx()].next; - let instr_count = blocks[block_idx.idx()].instruction_used; + let next = blocks[block_idx].next; + let instr_count = blocks[block_idx].instruction_used; for i in 0..instr_count { - let instr = blocks[block_idx.idx()].instructions[i]; + let instr = blocks[block_idx].instructions[i]; if is_block_push(&instr) { debug_assert!(instr.target != BlockIdx::NULL); - blocks[instr.target.idx()].except_handler = true; + blocks[instr.target].except_handler = true; } } block_idx = next; @@ -5103,7 +5187,7 @@ pub(crate) fn mark_except_handlers(blocks: &mut [Block]) -> crate::InternalResul /// optimize_cfg). This matches CPython's behavior and is necessary for /// optimize_load_fast to terminate fall-through at those placeholders. /// flowgraph.c mark_warm -fn mark_warm(blocks: &mut [Block]) -> crate::InternalResult<()> { +fn mark_warm(blocks: &mut Blocks) -> crate::InternalResult<()> { let mut stack = make_cfg_traversal_stack(blocks)?; stack.push(BlockIdx(0)); blocks[0].visited = true; @@ -5113,8 +5197,7 @@ fn mark_warm(blocks: &mut [Block]) -> crate::InternalResult<()> { blocks[idx].warm = true; let next = blocks[idx].next; - if next != BlockIdx::NULL && bb_has_fallthrough(&blocks[idx]) && !blocks[next.idx()].visited - { + if next != BlockIdx::NULL && bb_has_fallthrough(&blocks[idx]) && !blocks[next].visited { stack.push(next); blocks[next.idx()].visited = true; } @@ -5135,7 +5218,7 @@ fn mark_warm(blocks: &mut [Block]) -> crate::InternalResult<()> { Ok(()) } -fn mark_cold(blocks: &mut [Block]) -> crate::InternalResult<()> { +fn mark_cold(blocks: &mut Blocks) -> crate::InternalResult<()> { let mut block_idx = BlockIdx(0); while block_idx != BlockIdx::NULL { let block = &mut blocks[block_idx.idx()]; @@ -5189,7 +5272,7 @@ fn mark_cold(blocks: &mut [Block]) -> crate::InternalResult<()> { } /// flowgraph.c push_cold_blocks_to_end -fn push_cold_blocks_to_end(blocks: &mut Vec<Block>) -> crate::InternalResult<()> { +fn push_cold_blocks_to_end(blocks: &mut Blocks) -> crate::InternalResult<()> { if blocks[0].next == BlockIdx::NULL { return Ok(()); } @@ -5200,21 +5283,21 @@ fn push_cold_blocks_to_end(blocks: &mut Vec<Block>) -> crate::InternalResult<()> // If a cold block falls through to a warm block, add an explicit jump let mut block_idx = BlockIdx(0); while block_idx != BlockIdx::NULL { - let next = blocks[block_idx.idx()].next; - if blocks[block_idx.idx()].cold - && bb_has_fallthrough(&blocks[block_idx.idx()]) + let next = blocks[block_idx].next; + if blocks[block_idx].cold + && bb_has_fallthrough(&blocks[block_idx]) && next != BlockIdx::NULL - && blocks[next.idx()].warm + && blocks[next].warm { let explicit_jump = blocks_new_block(blocks)?; - if !is_label(blocks[next.idx()].cpython_label) { - blocks[next.idx()].cpython_label = InstructionSequenceLabel::from_index(next_label); + if !is_label(blocks[next].cpython_label) { + blocks[next].cpython_label = InstructionSequenceLabel::from_index(next_label); next_label += 1; } - let jump_label = blocks[next.idx()].cpython_label; + let jump_label = blocks[next].cpython_label; debug_assert!(is_label(jump_label)); basicblock_addop( - &mut blocks[explicit_jump.idx()], + &mut blocks[explicit_jump], InstructionInfo { instr: PseudoOpcode::JumpNoInterrupt.into(), arg: instruction_sequence_label_oparg(jump_label), @@ -5225,16 +5308,16 @@ fn push_cold_blocks_to_end(blocks: &mut Vec<Block>) -> crate::InternalResult<()> lineno_override: Some(NO_LOCATION_OVERRIDE), }, )?; - blocks[explicit_jump.idx()].cold = true; - blocks[explicit_jump.idx()].next = next; - blocks[explicit_jump.idx()].predecessors = 1; - blocks[block_idx.idx()].next = explicit_jump; - let target = blocks[explicit_jump.idx()].next; - let last = basicblock_last_instr_mut(&mut blocks[explicit_jump.idx()]) + blocks[explicit_jump].cold = true; + blocks[explicit_jump].next = next; + blocks[explicit_jump].predecessors = 1; + blocks[block_idx].next = explicit_jump; + let target = blocks[explicit_jump].next; + let last = basicblock_last_instr_mut(&mut blocks[explicit_jump]) .expect("missing explicit jump"); last.target = target; } - block_idx = blocks[block_idx.idx()].next; + block_idx = blocks[block_idx].next; } assert!(!blocks[0].cold); @@ -5242,45 +5325,41 @@ fn push_cold_blocks_to_end(blocks: &mut Vec<Block>) -> crate::InternalResult<()> let mut cold_blocks_tail: BlockIdx = BlockIdx::NULL; let mut block_idx = BlockIdx(0); - while blocks[block_idx.idx()].next != BlockIdx::NULL { - debug_assert!(!blocks[block_idx.idx()].cold); - while blocks[block_idx.idx()].next != BlockIdx::NULL - && !blocks[blocks[block_idx.idx()].next.idx()].cold - { - block_idx = blocks[block_idx.idx()].next; + while blocks[block_idx].next != BlockIdx::NULL { + debug_assert!(!blocks[block_idx].cold); + while blocks[block_idx].next != BlockIdx::NULL && !blocks[blocks[block_idx].next].cold { + block_idx = blocks[block_idx].next; } - if blocks[block_idx.idx()].next == BlockIdx::NULL { + if blocks[block_idx].next == BlockIdx::NULL { break; } - debug_assert!(!blocks[block_idx.idx()].cold); - debug_assert!(blocks[blocks[block_idx.idx()].next.idx()].cold); + debug_assert!(!blocks[block_idx].cold); + debug_assert!(blocks[blocks[block_idx].next].cold); - let mut block_end = blocks[block_idx.idx()].next; - while blocks[block_end.idx()].next != BlockIdx::NULL - && blocks[blocks[block_end.idx()].next.idx()].cold - { - block_end = blocks[block_end.idx()].next; + let mut block_end = blocks[block_idx].next; + while blocks[block_end].next != BlockIdx::NULL && blocks[blocks[block_end].next].cold { + block_end = blocks[block_end].next; } - debug_assert!(blocks[block_end.idx()].cold); + debug_assert!(blocks[block_end].cold); debug_assert!( - blocks[block_end.idx()].next == BlockIdx::NULL - || !blocks[blocks[block_end.idx()].next.idx()].cold + blocks[block_end].next == BlockIdx::NULL || !blocks[blocks[block_end].next].cold ); if cold_blocks == BlockIdx::NULL { - cold_blocks = blocks[block_idx.idx()].next; + cold_blocks = blocks[block_idx].next; } else { - blocks[cold_blocks_tail.idx()].next = blocks[block_idx.idx()].next; + blocks[cold_blocks_tail].next = blocks[block_idx].next; } + cold_blocks_tail = block_end; - blocks[block_idx.idx()].next = blocks[block_end.idx()].next; - blocks[block_end.idx()].next = BlockIdx::NULL; + blocks[block_idx].next = blocks[block_end].next; + blocks[block_end].next = BlockIdx::NULL; } - debug_assert!(blocks[block_idx.idx()].next == BlockIdx::NULL); - blocks[block_idx.idx()].next = cold_blocks; + debug_assert!(blocks[block_idx].next == BlockIdx::NULL); + blocks[block_idx].next = cold_blocks; if cold_blocks != BlockIdx::NULL { remove_redundant_nops_and_jumps(blocks)?; @@ -5289,10 +5368,10 @@ fn push_cold_blocks_to_end(blocks: &mut Vec<Block>) -> crate::InternalResult<()> } /// flowgraph.c check_cfg -fn check_cfg(blocks: &[Block]) -> crate::InternalResult<()> { +fn check_cfg(blocks: &Blocks) -> crate::InternalResult<()> { let mut block_idx = BlockIdx(0); while block_idx != BlockIdx::NULL { - let block = &blocks[block_idx.idx()]; + let block = &blocks[block_idx]; for i in 0..block.instruction_used { let opcode = block.instructions[i].instr; debug_assert!(!opcode.is_assembler()); @@ -5307,7 +5386,7 @@ fn check_cfg(blocks: &[Block]) -> crate::InternalResult<()> { /// flowgraph.c jump_thread fn jump_thread( - blocks: &mut [Block], + blocks: &mut Blocks, block_idx: BlockIdx, instr_idx: usize, target: &InstructionInfo, @@ -5328,7 +5407,7 @@ fn jump_thread( /// flowgraph.c basicblock_add_jump fn basicblock_add_jump( - blocks: &mut [Block], + blocks: &mut Blocks, block_idx: BlockIdx, instr: AnyInstruction, target: BlockIdx, @@ -5382,7 +5461,7 @@ fn is_conditional_jump_opcode(instr: AnyInstruction) -> bool { } /// flowgraph.c convert_pseudo_conditional_jumps -fn convert_pseudo_conditional_jumps(blocks: &mut [Block]) -> crate::InternalResult<()> { +fn convert_pseudo_conditional_jumps(blocks: &mut Blocks) -> crate::InternalResult<()> { let mut block_idx = BlockIdx(0); while block_idx != BlockIdx::NULL { let next = blocks[block_idx.idx()].next; @@ -5440,10 +5519,7 @@ fn convert_pseudo_conditional_jumps(blocks: &mut [Block]) -> crate::InternalResu } /// flowgraph.c normalize_jumps_in_block -fn normalize_jumps_in_block( - blocks: &mut Vec<Block>, - block_idx: BlockIdx, -) -> crate::InternalResult<()> { +fn normalize_jumps_in_block(blocks: &mut Blocks, block_idx: BlockIdx) -> crate::InternalResult<()> { let idx = block_idx.idx(); let Some(last_ins) = basicblock_last_instr(&blocks[idx]).copied() else { return Ok(()); @@ -5521,7 +5597,7 @@ fn normalize_jumps_in_block( } /// flowgraph.c normalize_jumps -fn normalize_jumps(blocks: &mut Vec<Block>) -> crate::InternalResult<()> { +fn normalize_jumps(blocks: &mut Blocks) -> crate::InternalResult<()> { let mut current = BlockIdx(0); while current != BlockIdx::NULL { blocks[current.idx()].visited = false; @@ -5540,10 +5616,10 @@ fn normalize_jumps(blocks: &mut Vec<Block>) -> crate::InternalResult<()> { /// flowgraph.c basicblock_inline_small_or_no_lineno_blocks fn basicblock_inline_small_or_no_lineno_blocks( - blocks: &mut [Block], + blocks: &mut Blocks, block_idx: BlockIdx, ) -> crate::InternalResult<bool> { - let Some(last) = basicblock_last_instr(&blocks[block_idx.idx()]).copied() else { + let Some(last) = basicblock_last_instr(&blocks[block_idx]).copied() else { return Ok(false); }; if !last.instr.is_unconditional_jump() { @@ -5552,19 +5628,19 @@ fn basicblock_inline_small_or_no_lineno_blocks( let target = last.target; debug_assert!(target != BlockIdx::NULL); - let small_exit_block = basicblock_exits_scope(&blocks[target.idx()]) - && blocks[target.idx()].instruction_used <= MAX_COPY_SIZE; - let no_lineno_no_fallthrough = basicblock_has_no_lineno(&blocks[target.idx()]) - && !bb_has_fallthrough(&blocks[target.idx()]); + let small_exit_block = + basicblock_exits_scope(&blocks[target]) && blocks[target].instruction_used <= MAX_COPY_SIZE; + let no_lineno_no_fallthrough = + basicblock_has_no_lineno(&blocks[target]) && !bb_has_fallthrough(&blocks[target]); if small_exit_block || no_lineno_no_fallthrough { debug_assert!(is_jump(&last)); let removed_jump_opcode = last.instr; - let last = basicblock_last_instr_mut(&mut blocks[block_idx.idx()]) + let last = basicblock_last_instr_mut(&mut blocks[block_idx]) .expect("non-empty block has last instruction"); set_to_nop(last); basicblock_append_block_instructions(blocks, block_idx, target)?; if no_lineno_no_fallthrough { - let last = basicblock_last_instr_mut(&mut blocks[block_idx.idx()]).unwrap(); + let last = basicblock_last_instr_mut(&mut blocks[block_idx]).unwrap(); if last.instr.is_unconditional_jump() && matches!( removed_jump_opcode.into(), @@ -5574,14 +5650,14 @@ fn basicblock_inline_small_or_no_lineno_blocks( last.instr = PseudoOpcode::Jump.into(); } } - blocks[target.idx()].predecessors -= 1; + blocks[target].predecessors -= 1; return Ok(true); } Ok(false) } /// flowgraph.c inline_small_or_no_lineno_blocks -fn inline_small_or_no_lineno_blocks(blocks: &mut [Block]) -> crate::InternalResult<bool> { +fn inline_small_or_no_lineno_blocks(blocks: &mut Blocks) -> crate::InternalResult<bool> { loop { let mut changes = false; let mut current = BlockIdx(0); @@ -5603,7 +5679,7 @@ fn inline_small_or_no_lineno_blocks(blocks: &mut [Block]) -> crate::InternalResu /// flowgraph.c basicblock_remove_redundant_nops #[allow(clippy::unnecessary_wraps)] fn basicblock_remove_redundant_nops( - blocks: &mut [Block], + blocks: &mut Blocks, block_idx: BlockIdx, ) -> crate::InternalResult<usize> { let bi = block_idx.idx(); @@ -5674,7 +5750,7 @@ fn basicblock_remove_redundant_nops( /// flowgraph.c remove_redundant_nops #[allow(clippy::unnecessary_wraps)] -fn remove_redundant_nops(blocks: &mut [Block]) -> crate::InternalResult<usize> { +fn remove_redundant_nops(blocks: &mut Blocks) -> crate::InternalResult<usize> { let mut changes = 0; let mut current = BlockIdx(0); while current != BlockIdx::NULL { @@ -5688,12 +5764,12 @@ fn remove_redundant_nops(blocks: &mut [Block]) -> crate::InternalResult<usize> { /// flowgraph.c no_redundant_nops #[cfg(debug_assertions)] -fn no_redundant_nops(blocks: &mut [Block]) -> bool { +fn no_redundant_nops(blocks: &mut Blocks) -> bool { matches!(remove_redundant_nops(blocks), Ok(0)) } /// flowgraph.c remove_redundant_jumps -fn remove_redundant_jumps(blocks: &mut [Block]) -> crate::InternalResult<usize> { +fn remove_redundant_jumps(blocks: &mut Blocks) -> crate::InternalResult<usize> { let mut changes = 0; let mut current = BlockIdx(0); while current != BlockIdx::NULL { @@ -5722,7 +5798,7 @@ fn remove_redundant_jumps(blocks: &mut [Block]) -> crate::InternalResult<usize> /// flowgraph.c no_redundant_jumps #[cfg(debug_assertions)] -fn no_redundant_jumps(blocks: &[Block]) -> bool { +fn no_redundant_jumps(blocks: &Blocks) -> bool { let mut current = BlockIdx(0); while current != BlockIdx::NULL { let block = &blocks[current.idx()]; @@ -5750,7 +5826,7 @@ fn no_redundant_jumps(blocks: &[Block]) -> bool { true } -fn remove_redundant_nops_and_jumps(blocks: &mut [Block]) -> crate::InternalResult<()> { +fn remove_redundant_nops_and_jumps(blocks: &mut Blocks) -> crate::InternalResult<()> { loop { // Convergence is guaranteed because the number of redundant jumps and // nops only decreases. @@ -5764,7 +5840,7 @@ fn remove_redundant_nops_and_jumps(blocks: &mut [Block]) -> crate::InternalResul } /// flowgraph.c make_cfg_traversal_stack -fn make_cfg_traversal_stack(blocks: &mut [Block]) -> crate::InternalResult<CfgTraversalStack> { +fn make_cfg_traversal_stack(blocks: &mut Blocks) -> crate::InternalResult<CfgTraversalStack> { debug_assert!(!blocks.is_empty()); let mut nblocks = 0; let mut current = BlockIdx(0); @@ -5784,7 +5860,7 @@ fn make_cfg_traversal_stack(blocks: &mut [Block]) -> crate::InternalResult<CfgTr Ok(stack) } -fn blocks_new_block(blocks: &mut Vec<Block>) -> crate::InternalResult<BlockIdx> { +fn blocks_new_block(blocks: &mut Blocks) -> crate::InternalResult<BlockIdx> { blocks .try_reserve(1) .map_err(|_| InternalError::MalformedControlFlowGraph)?; @@ -5800,7 +5876,7 @@ fn blocks_new_block(blocks: &mut Vec<Block>) -> crate::InternalResult<BlockIdx> /// flowgraph.c struct _PyCfgBuilder struct CfgBuilder { - blocks: Vec<Block>, + blocks: Blocks, entry: BlockIdx, block_list: BlockIdx, current: BlockIdx, @@ -5837,7 +5913,7 @@ fn init_cfg_builder(g: &mut CfgBuilder) -> crate::InternalResult<()> { /// flowgraph.c _PyCfgBuilder_New fn cfg_builder_new() -> crate::InternalResult<CfgBuilder> { let mut builder = CfgBuilder { - blocks: Vec::new(), + blocks: Blocks::default(), entry: BlockIdx::NULL, block_list: BlockIdx::NULL, current: BlockIdx::NULL, @@ -5887,7 +5963,7 @@ fn cfg_builder_use_label( /// flowgraph.c _PyCfgBuilder_Addop fn cfg_builder_addop(g: &mut CfgBuilder, info: InstructionInfo) -> crate::InternalResult<()> { cfg_builder_maybe_start_new_block(g)?; - basicblock_addop(&mut g.blocks[g.current.idx()], info) + basicblock_addop(&mut g.blocks[g.current], info) } /// flowgraph.c cfg_builder_check @@ -5935,7 +6011,7 @@ fn cfg_builder_check_size(g: &CfgBuilder) -> crate::InternalResult<()> { } /// flowgraph.c translate_jump_labels_to_targets -fn translate_jump_labels_to_targets(blocks: &mut [Block]) -> crate::InternalResult<()> { +fn translate_jump_labels_to_targets(blocks: &mut Blocks) -> crate::InternalResult<()> { let max_label = get_max_label(blocks); let label_count = (max_label + 1) as usize; if label_count > usize::MAX / core::mem::size_of::<usize>() { @@ -5947,7 +6023,7 @@ fn translate_jump_labels_to_targets(blocks: &mut [Block]) -> crate::InternalResu let mut block_idx = BlockIdx(0); while block_idx != BlockIdx::NULL { - let block = &blocks[block_idx.idx()]; + let block = &blocks[block_idx]; if is_label(block.cpython_label) { let label_id = block.cpython_label; debug_assert!(label_id.0 <= max_label); @@ -5958,20 +6034,17 @@ fn translate_jump_labels_to_targets(blocks: &mut [Block]) -> crate::InternalResu block_idx = BlockIdx(0); while block_idx != BlockIdx::NULL { - let next = blocks[block_idx.idx()].next; - for i in 0..blocks[block_idx.idx()].instruction_used { - let info = &mut blocks[block_idx.idx()].instructions[i]; + let next = blocks[block_idx].next; + for i in 0..blocks[block_idx].instruction_used { + let info = &mut blocks[block_idx].instructions[i]; debug_assert_eq!(info.target, BlockIdx::NULL); if info.instr.has_target() { let lbl = u32::from(info.arg) as i32; debug_assert!(lbl >= 0 && lbl <= max_label); let target = label_to_block[lbl as usize]; debug_assert!(target != BlockIdx::NULL); - debug_assert_eq!( - blocks[target.idx()].cpython_label, - InstructionSequenceLabel(lbl) - ); info.target = target; + debug_assert_eq!(blocks[target].cpython_label, InstructionSequenceLabel(lbl)); } } block_idx = next; @@ -5982,7 +6055,7 @@ fn translate_jump_labels_to_targets(blocks: &mut [Block]) -> crate::InternalResu /// flowgraph.c _PyCfg_FromInstructionSequence fn cfg_from_instruction_sequence( mut instr_sequence: InstructionSequence, -) -> crate::InternalResult<Vec<Block>> { +) -> crate::InternalResult<Blocks> { instruction_sequence_apply_label_map(&mut instr_sequence)?; let mut builder = cfg_builder_new()?; @@ -6061,7 +6134,7 @@ fn cfg_from_instruction_sequence( /// flowgraph.c maybe_push fn maybe_push( - blocks: &mut [Block], + blocks: &mut Blocks, worklist: &mut CfgTraversalStack, block: BlockIdx, unsafe_mask: u64, @@ -6081,7 +6154,7 @@ fn maybe_push( /// flowgraph.c scan_block_for_locals fn scan_block_for_locals( - blocks: &mut [Block], + blocks: &mut Blocks, block_idx: BlockIdx, worklist: &mut CfgTraversalStack, ) { @@ -6150,7 +6223,7 @@ fn scan_block_for_locals( } /// flowgraph.c fast_scan_many_locals -fn fast_scan_many_locals(blocks: &mut [Block], nlocals: usize) -> crate::InternalResult<()> { +fn fast_scan_many_locals(blocks: &mut Blocks, nlocals: usize) -> crate::InternalResult<()> { debug_assert!(nlocals > LOCAL_UNSAFE_MASK_BITS); let mut states = Vec::new(); states @@ -6198,7 +6271,7 @@ fn fast_scan_many_locals(blocks: &mut [Block], nlocals: usize) -> crate::Interna /// flowgraph.c add_checks_for_loads_of_uninitialized_variables fn add_checks_for_loads_of_uninitialized_variables( - blocks: &mut [Block], + blocks: &mut Blocks, mut nlocals: usize, nparams: usize, ) -> crate::InternalResult<()> { @@ -6232,9 +6305,9 @@ fn add_checks_for_loads_of_uninitialized_variables( } /// Follow chain of empty blocks to find first non-empty block. -fn next_nonempty_block(blocks: &[Block], mut idx: BlockIdx) -> BlockIdx { - while idx != BlockIdx::NULL && blocks[idx.idx()].instruction_used == 0 { - idx = blocks[idx.idx()].next; +fn next_nonempty_block(blocks: &Blocks, mut idx: BlockIdx) -> BlockIdx { + while idx != BlockIdx::NULL && blocks[idx].instruction_used == 0 { + idx = blocks[idx].next; } idx } @@ -6333,10 +6406,7 @@ fn basicblock_has_no_lineno(block: &Block) -> bool { } /// flowgraph.c copy_basicblock -fn copy_basicblock( - blocks: &mut Vec<Block>, - block_idx: BlockIdx, -) -> crate::InternalResult<BlockIdx> { +fn copy_basicblock(blocks: &mut Blocks, block_idx: BlockIdx) -> crate::InternalResult<BlockIdx> { debug_assert!(bb_no_fallthrough(&blocks[block_idx.idx()])); let result = blocks_new_block(blocks)?; basicblock_append_block_instructions(blocks, result, block_idx)?; @@ -6344,7 +6414,7 @@ fn copy_basicblock( } /// flowgraph.c get_max_label -fn get_max_label(blocks: &[Block]) -> i32 { +fn get_max_label(blocks: &Blocks) -> i32 { let mut lbl = -1; let mut current = BlockIdx(0); while current != BlockIdx::NULL { @@ -6355,61 +6425,58 @@ fn get_max_label(blocks: &[Block]) -> i32 { lbl } -fn duplicate_exits_without_lineno(blocks: &mut Vec<Block>) -> crate::InternalResult<()> { +fn duplicate_exits_without_lineno(blocks: &mut Blocks) -> crate::InternalResult<()> { let mut next_lbl = get_max_label(blocks) + 1; let entryblock = BlockIdx(0); let mut b = entryblock; while b != BlockIdx::NULL { - let Some(last) = basicblock_last_instr(&blocks[b.idx()]).copied() else { - b = blocks[b.idx()].next; + let Some(last) = basicblock_last_instr(&blocks[b]).copied() else { + b = blocks[b].next; continue; }; if is_jump(&last) { debug_assert!(last.target != BlockIdx::NULL); let target = next_nonempty_block(blocks, last.target); debug_assert!(target != BlockIdx::NULL); - if is_exit_or_eval_check_without_lineno(&blocks[target.idx()]) - && blocks[target.idx()].predecessors > 1 + if is_exit_or_eval_check_without_lineno(&blocks[target]) + && blocks[target].predecessors > 1 { let new_target = copy_basicblock(blocks, target)?; instr_set_location( - &mut blocks[new_target.idx()].instructions[0], + &mut blocks[new_target].instructions[0], instr_location(&last), ); - let last_mut = basicblock_last_instr_mut(&mut blocks[b.idx()]).unwrap(); + let last_mut = basicblock_last_instr_mut(&mut blocks[b]).unwrap(); last_mut.target = new_target; - blocks[target.idx()].predecessors -= 1; - blocks[new_target.idx()].predecessors = 1; - blocks[new_target.idx()].next = blocks[target.idx()].next; - blocks[new_target.idx()].cpython_label = InstructionSequenceLabel(next_lbl); + blocks[target].predecessors -= 1; + blocks[new_target].predecessors = 1; + blocks[new_target].next = blocks[target].next; + blocks[new_target].cpython_label = InstructionSequenceLabel(next_lbl); next_lbl += 1; - blocks[target.idx()].next = new_target; + blocks[target].next = new_target; } } - b = blocks[b.idx()].next; + b = blocks[b].next; } b = entryblock; while b != BlockIdx::NULL { - let next = blocks[b.idx()].next; - if bb_has_fallthrough(&blocks[b.idx()]) + let next = blocks[b].next; + if bb_has_fallthrough(&blocks[b]) && next != BlockIdx::NULL - && blocks[b.idx()].instruction_used != 0 - && is_exit_or_eval_check_without_lineno(&blocks[next.idx()]) + && blocks[b].instruction_used != 0 + && is_exit_or_eval_check_without_lineno(&blocks[next]) { - let last = *basicblock_last_instr(&blocks[b.idx()]).expect("block has instructions"); - instr_set_location( - &mut blocks[next.idx()].instructions[0], - instr_location(&last), - ); + let last = *basicblock_last_instr(&blocks[b]).expect("block has instructions"); + instr_set_location(&mut blocks[next].instructions[0], instr_location(&last)); } - b = blocks[b.idx()].next; + b = blocks[b].next; } Ok(()) } -fn propagate_line_numbers(blocks: &mut [Block]) { +fn propagate_line_numbers(blocks: &mut Blocks) { let mut current = BlockIdx(0); while current != BlockIdx::NULL { let idx = current.idx(); @@ -6431,30 +6498,30 @@ fn propagate_line_numbers(blocks: &mut [Block]) { if bb_has_fallthrough(&blocks[idx]) { debug_assert!(next != BlockIdx::NULL); if next != BlockIdx::NULL - && blocks[next.idx()].predecessors == 1 - && blocks[next.idx()].instruction_used != 0 - && instruction_is_no_location(&blocks[next.idx()].instructions[0]) + && blocks[next].predecessors == 1 + && blocks[next].instruction_used != 0 + && instruction_is_no_location(&blocks[next].instructions[0]) { - instr_set_location(&mut blocks[next.idx()].instructions[0], prev_location); + instr_set_location(&mut blocks[next].instructions[0], prev_location); } } if is_jump(&last) { let target = last.target; debug_assert!(target != BlockIdx::NULL); - if blocks[target.idx()].predecessors == 1 { - let instr = basicblock_raw_first_instr_mut(&mut blocks[target.idx()]); + if blocks[target].predecessors == 1 { + let instr = basicblock_raw_first_instr_mut(&mut blocks[target]); if instruction_is_no_location(instr) { instr_set_location(instr, prev_location); } } } - current = blocks[current.idx()].next; + current = blocks[current].next; } } fn resolve_line_numbers( - blocks: &mut Vec<Block>, + blocks: &mut Blocks, _firstlineno: OneIndexed, ) -> crate::InternalResult<()> { duplicate_exits_without_lineno(blocks)?; @@ -6481,7 +6548,7 @@ fn copy_except_stack(stack: &CfgExceptStack) -> crate::InternalResult<CfgExceptS } /// flowgraph.c except_stack_top -fn except_stack_top(stack: &CfgExceptStack, blocks: &[Block]) -> Option<ExceptHandlerInfo> { +fn except_stack_top(stack: &CfgExceptStack, blocks: &Blocks) -> Option<ExceptHandlerInfo> { debug_assert!(stack.depth <= CO_MAXBLOCKS + 1); let handler_block = stack.handlers[stack.depth]; if handler_block == BlockIdx::NULL { @@ -6489,7 +6556,7 @@ fn except_stack_top(stack: &CfgExceptStack, blocks: &[Block]) -> Option<ExceptHa } Some(ExceptHandlerInfo { handler_block, - preserve_lasti: blocks[handler_block.idx()].preserve_lasti, + preserve_lasti: blocks[handler_block].preserve_lasti, }) } @@ -6497,7 +6564,7 @@ fn except_stack_top(stack: &CfgExceptStack, blocks: &[Block]) -> Option<ExceptHa fn push_except_block( stack: &mut CfgExceptStack, setup: InstructionInfo, - blocks: &mut [Block], + blocks: &mut Blocks, ) -> Option<ExceptHandlerInfo> { debug_assert!(is_block_push(&setup)); let instr = setup.instr; @@ -6507,7 +6574,7 @@ fn push_except_block( instr.pseudo(), Some(PseudoInstruction::SetupWith { .. } | PseudoInstruction::SetupCleanup { .. }) ) { - blocks[target.idx()].preserve_lasti = true; + blocks[target].preserve_lasti = true; } debug_assert!(stack.depth <= CO_MAXBLOCKS); stack.depth += 1; @@ -6517,14 +6584,14 @@ fn push_except_block( } /// flowgraph.c pop_except_block -fn pop_except_block(stack: &mut CfgExceptStack, blocks: &[Block]) -> Option<ExceptHandlerInfo> { +fn pop_except_block(stack: &mut CfgExceptStack, blocks: &Blocks) -> Option<ExceptHandlerInfo> { debug_assert!(stack.depth > 0); stack.depth -= 1; debug_assert!(stack.depth <= CO_MAXBLOCKS); except_stack_top(stack, blocks) } -pub(crate) fn label_exception_targets(blocks: &mut [Block]) -> crate::InternalResult<()> { +pub(crate) fn label_exception_targets(blocks: &mut Blocks) -> crate::InternalResult<()> { let mut todo = make_cfg_traversal_stack(blocks)?; todo.push(BlockIdx(0)); @@ -6553,12 +6620,12 @@ pub(crate) fn label_exception_targets(blocks: &mut [Block]) -> crate::InternalRe if is_block_push(&info) { debug_assert!(target != BlockIdx::NULL); - if !blocks[target.idx()].visited { - blocks[target.idx()].except_stack = Some(copy_except_stack( + if !blocks[target].visited { + blocks[target].except_stack = Some(copy_except_stack( stack.as_ref().expect("active exception stack"), )?); todo.push(target); - blocks[target.idx()].visited = true; + blocks[target].visited = true; } handler = push_except_block( stack.as_mut().expect("active exception stack"), @@ -6576,20 +6643,20 @@ pub(crate) fn label_exception_targets(blocks: &mut [Block]) -> crate::InternalRe // when this block can also fall through, otherwise transfer it // to the jump target. debug_assert!(target != BlockIdx::NULL); - if !blocks[target.idx()].visited { + if !blocks[target].visited { if bb_has_fallthrough(&blocks[bi]) { - blocks[target.idx()].except_stack = Some(copy_except_stack( + blocks[target].except_stack = Some(copy_except_stack( stack.as_ref().expect("active exception stack"), )?); } else { - blocks[target.idx()].except_stack = stack.take(); + blocks[target].except_stack = stack.take(); stack_transferred = true; todo.push(target); - blocks[target.idx()].visited = true; + blocks[target].visited = true; break; } todo.push(target); - blocks[target.idx()].visited = true; + blocks[target].visited = true; } } else if matches!(instr.real(), Some(Instruction::YieldValue { .. })) { blocks[bi].instructions[i].except_handler = handler; @@ -6614,10 +6681,10 @@ pub(crate) fn label_exception_targets(blocks: &mut [Block]) -> crate::InternalRe let next = blocks[bi].next; if !stack_transferred && bb_has_fallthrough(&blocks[bi]) { debug_assert!(next != BlockIdx::NULL); - if next != BlockIdx::NULL && !blocks[next.idx()].visited { - blocks[next.idx()].except_stack = stack.take(); + if next != BlockIdx::NULL && !blocks[next].visited { + blocks[next].except_stack = stack.take(); todo.push(next); - blocks[next.idx()].visited = true; + blocks[next].visited = true; } } } @@ -6625,7 +6692,7 @@ pub(crate) fn label_exception_targets(blocks: &mut [Block]) -> crate::InternalRe { let mut block_idx = BlockIdx(0); while block_idx != BlockIdx::NULL { - let block = &blocks[block_idx.idx()]; + let block = &blocks[block_idx]; debug_assert!(block.except_stack.is_none()); block_idx = block.next; } @@ -6635,7 +6702,7 @@ pub(crate) fn label_exception_targets(blocks: &mut [Block]) -> crate::InternalRe /// Convert remaining pseudo ops to real instructions or NOP. /// flowgraph.c convert_pseudo_ops -pub(crate) fn convert_pseudo_ops(blocks: &mut [Block]) -> crate::InternalResult<()> { +pub(crate) fn convert_pseudo_ops(blocks: &mut Blocks) -> crate::InternalResult<()> { let mut block_idx = BlockIdx(0); while block_idx != BlockIdx::NULL { let next = blocks[block_idx.idx()].next; @@ -6703,7 +6770,7 @@ pub(crate) fn build_cellfixedoffsets( #[allow(clippy::needless_range_loop)] pub(crate) fn fix_cell_offsets( metadata: &CodeUnitMetadata, - blocks: &mut [Block], + blocks: &mut Blocks, cellfixedoffsets: &mut [i32], ) -> usize { let nlocals = metadata.varnames.len(); @@ -6802,7 +6869,7 @@ mod tests { flags: CodeFlags::empty(), source_path: "source_path".to_owned(), private: None, - blocks: vec![block], + blocks: Blocks::from([block]), current_block: BlockIdx::new(0), instr_sequence: instruction_sequence_new(), instr_sequence_label_map: InstructionSequenceLabelMap::new(), @@ -6881,7 +6948,7 @@ mod tests { assert_eq!(stack.handlers.len(), CO_MAXBLOCKS + 2); assert_eq!(stack.handlers[0], BlockIdx::NULL); - let mut blocks = vec![Block::default(), Block::default()]; + let mut blocks = Blocks::from([Block::default(), Block::default()]); assert!(except_stack_top(&stack, &blocks).is_none()); let setup = InstructionInfo { @@ -6942,7 +7009,7 @@ mod tests { #[test] fn cfg_traversal_stack_resets_visited_and_allocates_for_blocks() { - let mut blocks = vec![Block::default(), Block::default()]; + let mut blocks = Blocks::from([Block::default(), Block::default()]); blocks[0].next = BlockIdx::new(1); blocks[0].visited = true; blocks[1].visited = true; @@ -7156,7 +7223,7 @@ mod tests { handler_block: BlockIdx::new(5), preserve_lasti: false, }; - let mut blocks = vec![Block::default(), Block::default()]; + let mut blocks = Blocks::from([Block::default(), Block::default()]); let mut stale = test_instr(Instruction::Nop, 41); stale.except_handler = Some(handler); test_block_push(&mut blocks[0], stale); @@ -7180,7 +7247,7 @@ mod tests { assert_eq!(info.target, BlockIdx::new(1)); - let mut blocks = vec![Block::default(), Block::default()]; + let mut blocks = Blocks::from([Block::default(), Block::default()]); test_block_push(&mut blocks[0], info); blocks[0].next = BlockIdx::new(1); @@ -7195,7 +7262,7 @@ mod tests { fn cfg_to_instruction_sequence_requires_target_for_target_opcodes() { let mut block = Block::default(); test_block_push(&mut block, test_jump(BlockIdx::NULL, 51)); - let mut blocks = vec![block]; + let mut blocks = Blocks::from([block]); let mut instr_sequence = instruction_sequence_new(); let _ = cfg_to_instruction_sequence(&mut blocks, &mut instr_sequence); @@ -7393,7 +7460,7 @@ mod tests { #[test] fn resolve_line_numbers_duplicates_exit_blocks_like_cpython() { let exit = BlockIdx::new(2); - let mut blocks = vec![Block::default(), Block::default(), Block::default()]; + let mut blocks = Blocks::from([Block::default(), Block::default(), Block::default()]); blocks[0].cpython_label = InstructionSequenceLabel::from_index(0); blocks[1].cpython_label = InstructionSequenceLabel::from_index(1); blocks[2].cpython_label = InstructionSequenceLabel::from_index(2); @@ -7412,15 +7479,12 @@ mod tests { let duplicate = blocks[0].instructions[0].target; assert_ne!(duplicate, exit); assert_eq!( - blocks[duplicate.idx()].cpython_label, + blocks[duplicate].cpython_label, InstructionSequenceLabel::from_index(3) ); - assert_eq!( - instruction_lineno(&blocks[duplicate.idx()].instructions[0]), - 10 - ); + assert_eq!(instruction_lineno(&blocks[duplicate].instructions[0]), 10); assert_eq!(blocks[1].instructions[0].target, exit); - assert_eq!(instruction_lineno(&blocks[exit.idx()].instructions[0]), 20); + assert_eq!(instruction_lineno(&blocks[exit].instructions[0]), 20); } #[test] @@ -7431,7 +7495,7 @@ mod tests { block.instructions[1].lineno_override = Some(NEXT_LOCATION_OVERRIDE); test_block_push(&mut block, test_instr(Instruction::ReturnValue, 30)); block.instructions[2].lineno_override = Some(NO_LOCATION_OVERRIDE); - let mut blocks = vec![block]; + let mut blocks = [block].into(); remove_unreachable(&mut blocks).expect("remove_unreachable succeeds"); propagate_line_numbers(&mut blocks); @@ -7452,7 +7516,7 @@ mod tests { #[test] fn propagate_line_numbers_updates_empty_jump_target_raw_slot_like_cpython() { - let mut blocks = vec![Block::default(), Block::default(), Block::default()]; + let mut blocks = Blocks::from([Block::default(), Block::default(), Block::default()]); blocks[0].next = BlockIdx::new(2); test_block_push(&mut blocks[0], test_cond_jump(BlockIdx::new(1), 10)); test_block_push(&mut blocks[1], test_instr(Instruction::Nop, 20)); @@ -7486,12 +7550,12 @@ mod tests { #[test] fn jump_threading_rechecks_new_jump_like_cpython() { - let mut blocks = vec![ + let mut blocks = Blocks::from([ Block::default(), Block::default(), Block::default(), Block::default(), - ]; + ]); for (i, block) in blocks.iter_mut().enumerate() { block.cpython_label = InstructionSequenceLabel::from_index(i as i32); } From 7350a5b70982b8fa422ec9ba24eb37f3b16c7364 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Tue, 23 Jun 2026 16:47:10 +0300 Subject: [PATCH 129/339] Implement `collections.defaultdict` in rust (#8132) --- Lib/collections/__init__.py | 3 +- Lib/collections/_defaultdict.py | 62 -------- Lib/test/test_dataclasses/__init__.py | 2 - crates/vm/src/builtins/dict.rs | 4 +- crates/vm/src/stdlib/_collections.rs | 201 +++++++++++++++++++++++++- 5 files changed, 199 insertions(+), 73 deletions(-) delete mode 100644 Lib/collections/_defaultdict.py diff --git a/Lib/collections/__init__.py b/Lib/collections/__init__.py index 3d3bbd7a3..803de0c67 100644 --- a/Lib/collections/__init__.py +++ b/Lib/collections/__init__.py @@ -57,8 +57,7 @@ except ImportError: try: from _collections import defaultdict except ImportError: - # TODO: RUSTPYTHON - implement defaultdict in Rust - from ._defaultdict import defaultdict + pass heapq = None # Lazily imported diff --git a/Lib/collections/_defaultdict.py b/Lib/collections/_defaultdict.py deleted file mode 100644 index cb9d403c8..000000000 --- a/Lib/collections/_defaultdict.py +++ /dev/null @@ -1,62 +0,0 @@ -from reprlib import recursive_repr as _recursive_repr - -class defaultdict(dict): - def __init__(self, *args, **kwargs): - if len(args) >= 1: - default_factory = args[0] - if default_factory is not None and not callable(default_factory): - raise TypeError("first argument must be callable or None") - args = args[1:] - else: - default_factory = None - super().__init__(*args, **kwargs) - self.default_factory = default_factory - - def __missing__(self, key): - if self.default_factory is not None: - val = self.default_factory() - else: - raise KeyError(key) - # CPython parity: a recursive __missing__ via factory() may have - # already populated key; preserve that value instead of overwriting. - if key in self: - return self[key] - self[key] = val - return val - - @_recursive_repr() - def __repr_factory(factory): - return repr(factory) - - def __repr__(self): - return f"{type(self).__name__}({defaultdict.__repr_factory(self.default_factory)}, {dict.__repr__(self)})" - - def copy(self): - return type(self)(self.default_factory, self) - - __copy__ = copy - - def __reduce__(self): - if self.default_factory is not None: - args = self.default_factory, - else: - args = () - return type(self), args, None, None, iter(self.items()) - - def __or__(self, other): - if not isinstance(other, dict): - return NotImplemented - - new = defaultdict(self.default_factory, self) - new.update(other) - return new - - def __ror__(self, other): - if not isinstance(other, dict): - return NotImplemented - - new = defaultdict(self.default_factory, other) - new.update(self) - return new - -defaultdict.__module__ = 'collections' diff --git a/Lib/test/test_dataclasses/__init__.py b/Lib/test/test_dataclasses/__init__.py index 1a6dc850a..96f421832 100644 --- a/Lib/test/test_dataclasses/__init__.py +++ b/Lib/test/test_dataclasses/__init__.py @@ -1795,7 +1795,6 @@ class TestCase(unittest.TestCase): self.assertIsNot(d['f'], t) self.assertEqual(d['f'].my_a(), 6) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_helper_asdict_defaultdict(self): # Ensure asdict() does not throw exceptions when a # defaultdict is a member of a dataclass @@ -1938,7 +1937,6 @@ class TestCase(unittest.TestCase): t = astuple(c, tuple_factory=list) self.assertEqual(t, ['outer', T(1, ['inner', T(11, 12, 13)], 2)]) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_helper_astuple_defaultdict(self): # Ensure astuple() does not throw exceptions when a # defaultdict is a member of a dataclass diff --git a/crates/vm/src/builtins/dict.rs b/crates/vm/src/builtins/dict.rs index db97045f0..06791410e 100644 --- a/crates/vm/src/builtins/dict.rs +++ b/crates/vm/src/builtins/dict.rs @@ -387,7 +387,7 @@ impl PyDict { } #[pymethod] - fn setdefault( + pub(crate) fn setdefault( &self, key: PyObjectRef, default: OptionalArg<PyObjectRef>, @@ -406,7 +406,7 @@ impl PyDict { } #[pymethod] - fn update( + pub(crate) fn update( &self, dict_obj: OptionalArg<PyObjectRef>, kwargs: KwArgs, diff --git a/crates/vm/src/stdlib/_collections.rs b/crates/vm/src/stdlib/_collections.rs index 4f580ab5d..c7cce5c73 100644 --- a/crates/vm/src/stdlib/_collections.rs +++ b/crates/vm/src/stdlib/_collections.rs @@ -7,18 +7,19 @@ mod _collections { atomic_func, builtins::{ IterStatus::{Active, Exhausted}, - PositionIterInternal, PyGenericAlias, PyInt, PyStr, PyType, PyTypeRef, + PositionIterInternal, PyDict, PyGenericAlias, PyInt, PyStr, PyType, PyTypeRef, }, common::lock::{PyMutex, PyRwLock, PyRwLockReadGuard, PyRwLockWriteGuard}, - function::{KwArgs, OptionalArg, PyComparisonValue}, + convert::ToPyObject, + function::{FuncArgs, KwArgs, OptionalArg, PyComparisonValue}, iter::PyExactSizeIterator, - protocol::{PyIterReturn, PyNumberMethods, PySequenceMethods}, + protocol::{PyIterReturn, PyMappingMethods, PyNumberMethods, PySequenceMethods}, recursion::ReprGuard, sequence::{MutObjectSequenceOp, OptionalRangeArgs}, sliceable::SequenceIndexOp, types::{ - AsNumber, AsSequence, Comparable, Constructor, DefaultConstructor, Initializer, - IterNext, Iterable, PyComparisonOp, Representable, SelfIter, + AsMapping, AsNumber, AsSequence, Comparable, Constructor, DefaultConstructor, + Initializer, IterNext, Iterable, PyComparisonOp, Representable, SelfIter, }, utils::collection_repr, }; @@ -746,4 +747,194 @@ mod _collections { }) } } + + #[pyattr] + #[pyclass( + module = "collections", + name = "defaultdict", + base = PyDict, + unhashable = true + )] + #[derive(Debug, Default)] + struct PyDefaultDict { + dict: PyDict, + default_factory: PyRwLock<Option<PyObjectRef>>, + } + + #[pyclass( + with(AsMapping, AsNumber, Constructor, Initializer, Representable), + flags(BASETYPE, MAPPING, HAS_DICT) + )] + impl PyDefaultDict { + #[pygetset] + fn default_factory(&self) -> Option<PyObjectRef> { + self.default_factory.read().clone() + } + + #[pygetset(name = "default_factory", setter)] + fn default_factory_setter(&self, value: PyObjectRef, vm: &VirtualMachine) { + *self.default_factory.write() = if value.is(&vm.ctx.none()) { + None + } else { + Some(value) + }; + } + + #[pymethod] + fn __missing__(&self, key: PyObjectRef, vm: &VirtualMachine) -> PyResult { + let factory = self.default_factory(); + + if let Some(f) = factory { + let value = f.call((), vm)?; + self.dict.setdefault(key, value.into(), vm) + } else { + Err(vm.new_key_error(key)) + } + } + + #[pymethod] + #[pymethod(name = "__copy__")] + fn copy(&self) -> Self { + let default_factory = self.default_factory(); + + Self { + dict: self.dict.copy(), + default_factory: PyRwLock::new(default_factory), + } + } + + #[pymethod] + fn __reduce__(zelf: PyRef<Self>, vm: &VirtualMachine) -> PyResult { + let cls = zelf.class().to_owned(); + + let default_factory = zelf.default_factory(); + let factory_tuple_elements = + default_factory.map_or_else(Vec::new, |factory| vec![factory]); + let factory_tuple = vm.ctx.new_tuple(factory_tuple_elements); + + let items_fn = zelf.as_object().get_attr("items", vm)?; + let items_iter = items_fn.call((), vm)?; + let iter = items_iter.get_iter(vm)?; + let none = vm.ctx.none(); + + Ok(vm + .ctx + .new_tuple(vec![ + cls.into(), + factory_tuple.into(), + none.clone(), + none, + iter.into(), + ]) + .into()) + } + } + + impl PyDefaultDict { + fn __or__(lhs: PyObjectRef, rhs: PyObjectRef, vm: &VirtualMachine) -> PyResult { + let not_implemented = || Ok(vm.ctx.not_implemented.clone().into()); + + let (default_factory, dict) = if let Some(zelf) = lhs.downcast_ref::<Self>() { + if !rhs.fast_isinstance(vm.ctx.types.dict_type) { + return not_implemented(); + } + + (zelf.default_factory(), zelf.dict.copy()) + } else if let Some(zelf) = rhs.downcast_ref::<Self>() { + let Some(dict) = lhs.downcast_ref::<PyDict>() else { + return not_implemented(); + }; + + (zelf.default_factory(), dict.copy()) + } else { + return Err(vm.new_type_error(format!( + "unsupported operand type(s) for |: '{}' and '{}'", + lhs.class().name(), + rhs.class().name() + ))); + }; + + dict.update(rhs.into(), KwArgs::default(), vm)?; + + Ok(Self { + dict, + default_factory: PyRwLock::new(default_factory), + } + .to_pyobject(vm)) + } + } + + impl DefaultConstructor for PyDefaultDict {} + + impl Initializer for PyDefaultDict { + type Args = FuncArgs; + + fn init(zelf: PyRef<Self>, mut args: Self::Args, vm: &VirtualMachine) -> PyResult<()> { + let default_factory = args.take_positional().map_or(Ok(None), |factory| { + let is_none = factory.is(&vm.ctx.none()); + + if !is_none && !factory.is_callable() { + Err(vm.new_type_error("first argument must be callable or None")) + } else if is_none { + Ok(None) + } else { + Ok(Some(factory)) + } + })?; + + *zelf.default_factory.write() = default_factory; + + zelf.dict.update( + OptionalArg::from_option(args.take_positional()), + args.kwargs, + vm, + )?; + + Ok(()) + } + } + + impl Representable for PyDefaultDict { + fn repr_str(zelf: &Py<Self>, vm: &VirtualMachine) -> PyResult<String> { + let default_factory = zelf.default_factory.read(); + + let factory_repr = match default_factory.as_ref() { + Some(factory) => { + if let Some(_guard) = ReprGuard::enter(vm, factory) { + factory.repr(vm)?.to_string() + } else { + String::from("...") + } + } + None => String::from("None"), + }; + + let dict_repr = Representable::repr(&zelf.dict.copy().into_ref(&vm.ctx), vm)?; + + Ok(format!( + "{}({}, {})", + zelf.class().name(), + factory_repr, + dict_repr + )) + } + } + + impl AsMapping for PyDefaultDict { + fn as_mapping() -> &'static PyMappingMethods { + PyDict::as_mapping() + } + } + + impl AsNumber for PyDefaultDict { + fn as_number() -> &'static PyNumberMethods { + static AS_NUMBER: PyNumberMethods = PyNumberMethods { + or: Some(|a, b, vm| { + PyDefaultDict::__or__(a.to_pyobject(vm), b.to_pyobject(vm), vm) + }), + ..PyNumberMethods::NOT_IMPLEMENTED + }; + &AS_NUMBER + } + } } From 2c32ad602e2ffe3b1d90c7cf5413f6755a87993d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jun 2026 22:47:28 +0900 Subject: [PATCH 130/339] Bump https://github.com/astral-sh/ruff-pre-commit (#8143) Bumps [https://github.com/astral-sh/ruff-pre-commit](https://github.com/astral-sh/ruff-pre-commit) from v0.15.16 to 0.15.17. - [Release notes](https://github.com/astral-sh/ruff-pre-commit/releases) - [Commits](https://github.com/astral-sh/ruff-pre-commit/compare/v0.15.16...v0.15.17) --- updated-dependencies: - dependency-name: https://github.com/astral-sh/ruff-pre-commit dependency-version: 0.15.17 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 39481edaa..6e71920d5 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -10,7 +10,7 @@ repos: priority: 0 - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.15.16 + rev: v0.15.17 hooks: - id: ruff-format priority: 0 From 976f00042d327764706806f4c6e6cfd1f1af72d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jun 2026 22:47:34 +0900 Subject: [PATCH 131/339] Bump github/gh-aw from 0.77.5 to 0.79.9 (#8144) Bumps [github/gh-aw](https://github.com/github/gh-aw) from 0.77.5 to 0.79.9. - [Release notes](https://github.com/github/gh-aw/releases) - [Changelog](https://github.com/github/gh-aw/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/gh-aw/compare/f990bbb7eb83981a203d4b5eccdc24f677e950c7...54ad1f83a833db4de127cf278b00438e19a103a0) --- updated-dependencies: - dependency-name: github/gh-aw dependency-version: 0.79.9 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/upgrade-pylib.lock.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/upgrade-pylib.lock.yml b/.github/workflows/upgrade-pylib.lock.yml index 1a028f728..17361719a 100644 --- a/.github/workflows/upgrade-pylib.lock.yml +++ b/.github/workflows/upgrade-pylib.lock.yml @@ -58,7 +58,7 @@ jobs: comment_repo: "" steps: - name: Setup Scripts - uses: github/gh-aw/actions/setup@f990bbb7eb83981a203d4b5eccdc24f677e950c7 # v0.77.5 + uses: github/gh-aw/actions/setup@54ad1f83a833db4de127cf278b00438e19a103a0 # v0.79.9 with: destination: /opt/gh-aw/actions - name: Check workflow file timestamps @@ -99,7 +99,7 @@ jobs: secret_verification_result: ${{ steps.validate-secret.outputs.verification_result }} steps: - name: Setup Scripts - uses: github/gh-aw/actions/setup@f990bbb7eb83981a203d4b5eccdc24f677e950c7 # v0.77.5 + uses: github/gh-aw/actions/setup@54ad1f83a833db4de127cf278b00438e19a103a0 # v0.79.9 with: destination: /opt/gh-aw/actions - name: Checkout repository @@ -806,7 +806,7 @@ jobs: total_count: ${{ steps.missing_tool.outputs.total_count }} steps: - name: Setup Scripts - uses: github/gh-aw/actions/setup@f990bbb7eb83981a203d4b5eccdc24f677e950c7 # v0.77.5 + uses: github/gh-aw/actions/setup@54ad1f83a833db4de127cf278b00438e19a103a0 # v0.79.9 with: destination: /opt/gh-aw/actions - name: Download agent output artifact @@ -927,7 +927,7 @@ jobs: success: ${{ steps.parse_results.outputs.success }} steps: - name: Setup Scripts - uses: github/gh-aw/actions/setup@f990bbb7eb83981a203d4b5eccdc24f677e950c7 # v0.77.5 + uses: github/gh-aw/actions/setup@54ad1f83a833db4de127cf278b00438e19a103a0 # v0.79.9 with: destination: /opt/gh-aw/actions - name: Download agent artifacts @@ -1039,7 +1039,7 @@ jobs: process_safe_outputs_temporary_id_map: ${{ steps.process_safe_outputs.outputs.temporary_id_map }} steps: - name: Setup Scripts - uses: github/gh-aw/actions/setup@f990bbb7eb83981a203d4b5eccdc24f677e950c7 # v0.77.5 + uses: github/gh-aw/actions/setup@54ad1f83a833db4de127cf278b00438e19a103a0 # v0.79.9 with: destination: /opt/gh-aw/actions - name: Download agent output artifact From f410bcab32466d9f820210813d5d70409c988736 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jun 2026 22:47:46 +0900 Subject: [PATCH 132/339] Bump https://github.com/rbubley/mirrors-prettier from v3.8.3 to 3.8.4 (#8145) Bumps [https://github.com/rbubley/mirrors-prettier](https://github.com/rbubley/mirrors-prettier) from v3.8.3 to 3.8.4. - [Commits](https://github.com/rbubley/mirrors-prettier/compare/v3.8.3...v3.8.4) --- updated-dependencies: - dependency-name: https://github.com/rbubley/mirrors-prettier dependency-version: 3.8.4 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6e71920d5..07edb8a05 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -77,7 +77,7 @@ repos: priority: 0 - repo: https://github.com/rbubley/mirrors-prettier - rev: v3.8.3 + rev: v3.8.4 hooks: - id: prettier files: '^wasm/.*$' From ae09ab195e116c1a0f740cb4323f285dfe22c282 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jun 2026 22:47:52 +0900 Subject: [PATCH 133/339] Bump the malachite group across 1 directory with 3 updates (#8146) Bumps the malachite group with 2 updates in the / directory: [malachite-bigint](https://github.com/mhogrefe/malachite) and [malachite-q](https://github.com/mhogrefe/malachite). Updates `malachite-bigint` from 0.9.1 to 0.9.2 - [Release notes](https://github.com/mhogrefe/malachite/releases) - [Commits](https://github.com/mhogrefe/malachite/compare/v0.9.1...v0.9.2) Updates `malachite-q` from 0.9.1 to 0.9.2 - [Release notes](https://github.com/mhogrefe/malachite/releases) - [Commits](https://github.com/mhogrefe/malachite/compare/v0.9.1...v0.9.2) Updates `malachite-base` from 0.9.1 to 0.9.2 - [Release notes](https://github.com/mhogrefe/malachite/releases) - [Commits](https://github.com/mhogrefe/malachite/compare/v0.9.1...v0.9.2) --- updated-dependencies: - dependency-name: malachite-bigint dependency-version: 0.9.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: malachite - dependency-name: malachite-q dependency-version: 0.9.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: malachite - dependency-name: malachite-base dependency-version: 0.9.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: malachite ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 600805878..c13822218 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2240,9 +2240,9 @@ dependencies = [ [[package]] name = "malachite-base" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8b6f86fdbb1eb9955946be91775239dfcb0acdb1a51bb07d5fc9b8c854f5ccd" +checksum = "a4f44099731f17094b07825c88ccb5fbd1bfa1f82fafff7daa33e8b8652db16e" dependencies = [ "hashbrown 0.16.1", "itertools 0.14.0", @@ -2252,9 +2252,9 @@ dependencies = [ [[package]] name = "malachite-bigint" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fcd6e504ffc67db2b3c6d5e90e08054646e2b04f42115a5460bf1c1e37d3bc" +checksum = "cc58206ba15e9c406e20c95c5f86efa07b12f94080945908e910b3a0faa23fef" dependencies = [ "malachite-base", "malachite-nz", @@ -2265,9 +2265,9 @@ dependencies = [ [[package]] name = "malachite-nz" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0197a2f5cfee19d59178e282985c6ca79a9233e26a2adcf40acb693896aa09f6" +checksum = "a137660cdba20f136c8a223125f08088adb4e0b72fbb8466f08c43e31cc0427d" dependencies = [ "itertools 0.14.0", "libm", @@ -2277,11 +2277,12 @@ dependencies = [ [[package]] name = "malachite-q" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be2add95162aede090c48f0ee51bea7d328847ce3180aa44588111f846cc116b" +checksum = "5ffcbeed95e34c0fcc3864ccd146e129cbbf7de1513d3afbcfb47c7674c82d94" dependencies = [ "itertools 0.14.0", + "libm", "malachite-base", "malachite-nz", ] From 3a5a1c216cd6e9644737eb1fa142bf396c656397 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jun 2026 22:48:02 +0900 Subject: [PATCH 134/339] Bump getrandom in the random group across 1 directory (#8149) Bumps the random group with 1 update in the / directory: [getrandom](https://github.com/rust-random/getrandom). Updates `getrandom` from 0.4.2 to 0.4.3 - [Changelog](https://github.com/rust-random/getrandom/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-random/getrandom/compare/v0.4.2...v0.4.3) --- updated-dependencies: - dependency-name: getrandom dependency-version: 0.4.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: random ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 186 +++-------------------------------------------------- 1 file changed, 9 insertions(+), 177 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c13822218..6c88e96bb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1322,12 +1322,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "foldhash" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" - [[package]] name = "foldhash" version = "0.2.0" @@ -1457,17 +1451,15 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555" +checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099" dependencies = [ "cfg-if", "js-sys", "libc", "r-efi 6.0.0", "rand_core 0.10.1", - "wasip2", - "wasip3", "wasm-bindgen", ] @@ -1510,22 +1502,13 @@ dependencies = [ "zerocopy", ] -[[package]] -name = "hashbrown" -version = "0.15.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" -dependencies = [ - "foldhash 0.1.5", -] - [[package]] name = "hashbrown" version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" dependencies = [ - "foldhash 0.2.0", + "foldhash", ] [[package]] @@ -1534,7 +1517,7 @@ version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51" dependencies = [ - "foldhash 0.2.0", + "foldhash", ] [[package]] @@ -1781,12 +1764,6 @@ dependencies = [ "zerovec", ] -[[package]] -name = "id-arena" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954" - [[package]] name = "indexmap" version = "2.14.0" @@ -1795,8 +1772,6 @@ checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9" dependencies = [ "equivalent", "hashbrown 0.17.0", - "serde", - "serde_core", ] [[package]] @@ -1996,12 +1971,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -[[package]] -name = "leb128fmt" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" - [[package]] name = "lexical-parse-float" version = "1.0.6" @@ -3103,7 +3072,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207" dependencies = [ "chacha20", - "getrandom 0.4.2", + "getrandom 0.4.3", "rand_core 0.10.1", ] @@ -3514,7 +3483,7 @@ version = "0.5.0" dependencies = [ "ascii", "bitflags 2.13.0", - "getrandom 0.4.2", + "getrandom 0.4.3", "itertools 0.14.0", "libc", "lock_api", @@ -3602,7 +3571,7 @@ name = "rustpython-host_env" version = "0.5.0" dependencies = [ "bitflags 2.13.0", - "getrandom 0.4.2", + "getrandom 0.4.3", "junction", "libc", "libffi", @@ -4605,12 +4574,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" -[[package]] -name = "unicode-xid" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" - [[package]] name = "unicode_names2" version = "1.3.0" @@ -4684,7 +4647,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "144d6b123cef80b301b8f72a9e2ca4370ddec21950d0a103dd22c437006d2db7" dependencies = [ "atomic", - "getrandom 0.4.2", + "getrandom 0.4.3", "js-sys", "wasm-bindgen", ] @@ -4723,16 +4686,7 @@ version = "1.0.3+wasi-0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6" dependencies = [ - "wit-bindgen 0.57.1", -] - -[[package]] -name = "wasip3" -version = "0.4.0+wasi-0.3.0-rc-2026-01-06" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5" -dependencies = [ - "wit-bindgen 0.51.0", + "wit-bindgen", ] [[package]] @@ -4790,40 +4744,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "wasm-encoder" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319" -dependencies = [ - "leb128fmt", - "wasmparser", -] - -[[package]] -name = "wasm-metadata" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" -dependencies = [ - "anyhow", - "indexmap", - "wasm-encoder", - "wasmparser", -] - -[[package]] -name = "wasmparser" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" -dependencies = [ - "bitflags 2.13.0", - "hashbrown 0.15.5", - "indexmap", - "semver", -] - [[package]] name = "wasmtime-internal-core" version = "45.0.1" @@ -5161,100 +5081,12 @@ dependencies = [ "version_check", ] -[[package]] -name = "wit-bindgen" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" -dependencies = [ - "wit-bindgen-rust-macro", -] - [[package]] name = "wit-bindgen" version = "0.57.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" -[[package]] -name = "wit-bindgen-core" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc" -dependencies = [ - "anyhow", - "heck", - "wit-parser", -] - -[[package]] -name = "wit-bindgen-rust" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" -dependencies = [ - "anyhow", - "heck", - "indexmap", - "prettyplease", - "syn", - "wasm-metadata", - "wit-bindgen-core", - "wit-component", -] - -[[package]] -name = "wit-bindgen-rust-macro" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a" -dependencies = [ - "anyhow", - "prettyplease", - "proc-macro2", - "quote", - "syn", - "wit-bindgen-core", - "wit-bindgen-rust", -] - -[[package]] -name = "wit-component" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" -dependencies = [ - "anyhow", - "bitflags 2.13.0", - "indexmap", - "log", - "serde", - "serde_derive", - "serde_json", - "wasm-encoder", - "wasm-metadata", - "wasmparser", - "wit-parser", -] - -[[package]] -name = "wit-parser" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" -dependencies = [ - "anyhow", - "id-arena", - "indexmap", - "log", - "semver", - "serde", - "serde_derive", - "serde_json", - "unicode-xid", - "wasmparser", -] - [[package]] name = "write16" version = "1.0.0" From eeb4a37ea0e93ac70ddbd7b3240131e746560577 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jun 2026 22:48:10 +0900 Subject: [PATCH 135/339] Bump webpki-roots in the webpki-root group across 1 directory (#8150) Bumps the webpki-root group with 1 update in the / directory: [webpki-roots](https://github.com/rustls/webpki-roots). Updates `webpki-roots` from 1.0.7 to 1.0.8 - [Release notes](https://github.com/rustls/webpki-roots/releases) - [Commits](https://github.com/rustls/webpki-roots/compare/v/1.0.7...v/1.0.8) --- updated-dependencies: - dependency-name: webpki-roots dependency-version: 1.0.8 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: webpki-root ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6c88e96bb..6de30d4ad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4787,9 +4787,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52f5ee44c96cf55f1b349600768e3ece3a8f26010c05265ab73f945bb1a2eb9d" +checksum = "bf85cb06032201fa7c6f829d7db5a7e5aa45bcc0655327713065f6f0576731bf" dependencies = [ "rustls-pki-types", ] From c81f5c2fba92e120f12ba7f1e221984b77d9fabe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jun 2026 22:48:17 +0900 Subject: [PATCH 136/339] Bump which from 8.0.3 to 8.0.4 (#8151) Bumps [which](https://github.com/harryfei/which-rs) from 8.0.3 to 8.0.4. - [Release notes](https://github.com/harryfei/which-rs/releases) - [Changelog](https://github.com/harryfei/which-rs/blob/master/CHANGELOG.md) - [Commits](https://github.com/harryfei/which-rs/compare/8.0.3...8.0.4) --- updated-dependencies: - dependency-name: which dependency-version: 8.0.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6de30d4ad..743e293f1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4796,9 +4796,9 @@ dependencies = [ [[package]] name = "which" -version = "8.0.3" +version = "8.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c789537cf2f7f55be8e6192f92e464174ee55f91af622777f7f1ceb0dbccd03e" +checksum = "48d7cd18d4acb58fb3cdfe9ea54e6cd96a4e7d4cc45c56338b236e82dad47248" dependencies = [ "libc", ] From 4009560fff1d2beb92de22362af83a7630e40533 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Tue, 23 Jun 2026 16:49:58 +0300 Subject: [PATCH 137/339] Use `stable` toolchain when updating caches (#8153) --- .github/workflows/update-caches.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-caches.yml b/.github/workflows/update-caches.yml index fc524fa73..5e99abac6 100644 --- a/.github/workflows/update-caches.yml +++ b/.github/workflows/update-caches.yml @@ -46,7 +46,7 @@ jobs: persist-credentials: false - name: Setup Rust - uses: dtolnay/rust-toolchain@3c5f7ea28cd621ae0bf5283f0e981fb97b8a7af9 + uses: dtolnay/rust-toolchain@stable with: toolchain: ${{ matrix.toolchain }} target: ${{ matrix.target }} From 5f6605c7c4741dfd7e455408e13f58ca8c2acdc4 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Tue, 23 Jun 2026 16:50:53 +0300 Subject: [PATCH 138/339] Move some of free standing functions to be `ir::Blocks` method (#8154) --- crates/codegen/src/ir.rs | 2184 +++++++++++++++++++------------------- 1 file changed, 1111 insertions(+), 1073 deletions(-) diff --git a/crates/codegen/src/ir.rs b/crates/codegen/src/ir.rs index e7b50659e..5728ddfbe 100644 --- a/crates/codegen/src/ir.rs +++ b/crates/codegen/src/ir.rs @@ -437,22 +437,6 @@ fn basicblock_insert_instruction( Ok(()) } -/// flowgraph.c basicblock_append_instructions -fn basicblock_append_block_instructions( - blocks: &mut Blocks, - to: BlockIdx, - from: BlockIdx, -) -> crate::InternalResult<()> { - debug_assert_ne!(to, from); - let from_len = blocks[from].instruction_used; - for i in 0..from_len { - let info = blocks[from].instructions[i]; - let off = basicblock_next_instr(&mut blocks[to])?; - blocks[to].instructions[off] = info; - } - Ok(()) -} - /// flowgraph.c direct `b_iused = 0` fn basicblock_clear(block: &mut Block) { block.instruction_used = 0; @@ -753,60 +737,6 @@ fn instruction_sequence_apply_label_map( Ok(()) } -/// flowgraph.c _PyCfg_ToInstructionSequence -fn cfg_to_instruction_sequence( - blocks: &mut Blocks, - instr_sequence: &mut InstructionSequence, -) -> crate::InternalResult<()> { - let mut label_id = 0; - let mut block_idx = BlockIdx(0); - while block_idx != BlockIdx::NULL { - blocks[block_idx.idx()].cpython_label = InstructionSequenceLabel::from_index(label_id); - label_id += 1; - block_idx = blocks[block_idx.idx()].next; - } - - block_idx = BlockIdx(0); - while block_idx != BlockIdx::NULL { - let block_label = blocks[block_idx.idx()].cpython_label; - debug_assert!(is_label(block_label)); - instruction_sequence_use_label(instr_sequence, block_label)?; - - let instr_count = blocks[block_idx.idx()].instruction_used; - for i in 0..instr_count { - if blocks[block_idx.idx()].instructions[i].instr.has_target() { - let target_block = blocks[block_idx.idx()].instructions[i].target; - debug_assert!(target_block != BlockIdx::NULL); - let lbl = blocks[target_block.idx()].cpython_label; - debug_assert!(is_label(lbl)); - blocks[block_idx.idx()].instructions[i].arg = OpArg::new(lbl.0 as u32); - } - - let mut info = blocks[block_idx.idx()].instructions[i]; - info.target = BlockIdx::NULL; - let except_handler = info.except_handler.take(); - let entry = instruction_sequence_addop(instr_sequence, info)?; - let hi = &mut entry.except_handler; - if let Some(handler) = except_handler { - debug_assert!(handler.handler_block != BlockIdx::NULL); - let lbl = blocks[handler.handler_block.idx()].cpython_label; - debug_assert!(is_label(lbl)); - let start_depth = blocks[handler.handler_block.idx()].start_depth; - debug_assert!(start_depth >= 0); - hi.h_label = lbl.0; - hi.start_depth = start_depth; - hi.preserve_lasti = i32::from(handler.preserve_lasti); - } else { - hi.h_label = NO_EXCEPTION_HANDLER_LABEL; - } - } - block_idx = blocks[block_idx.idx()].next; - } - - instruction_sequence_apply_label_map(instr_sequence)?; - Ok(()) -} - /// assemble.c instr_size fn instr_size(instr: &InstructionInfo) -> usize { let opcode = instr.instr.expect_real(); @@ -1307,6 +1237,7 @@ impl Block { #[derive(Clone, Debug, Default)] pub struct Blocks(Vec<Block>); +// Vec like methods impl Blocks { pub fn try_reserve( &mut self, @@ -1320,6 +1251,1057 @@ impl Blocks { } } +// CPython functions + +impl Blocks { + /// # See also + /// [CPython's remove_unreachable](https://github.com/python/cpython/blob/v3.14.6/Python/flowgraph.c#L995-L1041) + pub fn remove_unreachable(&mut self) -> crate::InternalResult<()> { + let mut block_idx = BlockIdx(0); + while block_idx != BlockIdx::NULL { + self[block_idx].predecessors = 0; + block_idx = self[block_idx].next; + } + + let mut stack = self.make_cfg_traversal_stack()?; + self[0].predecessors = 1; + stack.push(BlockIdx(0)); + self[0].visited = true; + while let Some(current) = stack.pop() { + let idx = current.idx(); + let next = self[idx].next; + if next != BlockIdx::NULL && bb_has_fallthrough(&self[idx]) { + if !self[next].visited { + debug_assert_eq!(self[next].predecessors, 0); + stack.push(next); + self[next].visited = true; + } + self[next].predecessors += 1; + } + + let instr_count = self[idx].instruction_used; + for i in 0..instr_count { + let instr = self[idx].instructions[i]; + if is_jump(&instr) || is_block_push(&instr) { + let target = instr.target; + debug_assert!(target != BlockIdx::NULL); + let target_idx = target.idx(); + if !self[target_idx].visited { + stack.push(target); + self[target_idx].visited = true; + } + self[target_idx].predecessors += 1; + } + } + } + + block_idx = BlockIdx(0); + while block_idx != BlockIdx::NULL { + let next = self[block_idx].next; + if self[block_idx].predecessors == 0 { + let block = &mut self[block_idx]; + basicblock_clear(block); + block.except_handler = false; + } + block_idx = next; + } + Ok(()) + } + + /// flowgraph.c basicblock_append_instructions + fn basicblock_append_block_instructions( + &mut self, + to: BlockIdx, + from: BlockIdx, + ) -> crate::InternalResult<()> { + debug_assert_ne!(to, from); + + let from_len = self[from].instruction_used; + for i in 0..from_len { + let info = self[from].instructions[i]; + let off = basicblock_next_instr(&mut self[to])?; + self[to].instructions[off] = info; + } + + Ok(()) + } + + /// flowgraph.c copy_basicblock + fn copy_basicblock(&mut self, block_idx: BlockIdx) -> crate::InternalResult<BlockIdx> { + debug_assert!(bb_no_fallthrough(&self[block_idx])); + + let result = blocks_new_block(self)?; + self.basicblock_append_block_instructions(result, block_idx)?; + Ok(result) + } + + fn duplicate_exits_without_lineno(&mut self) -> crate::InternalResult<()> { + let mut next_lbl = get_max_label(self) + 1; + + let entryblock = BlockIdx(0); + let mut b = entryblock; + while b != BlockIdx::NULL { + let Some(last) = basicblock_last_instr(&self[b]).copied() else { + b = self[b].next; + continue; + }; + + if is_jump(&last) { + debug_assert!(last.target != BlockIdx::NULL); + + let target = next_nonempty_block(self, last.target); + + debug_assert!(target != BlockIdx::NULL); + + if is_exit_or_eval_check_without_lineno(&self[target]) + && self[target].predecessors > 1 + { + let new_target = self.copy_basicblock(target)?; + instr_set_location( + &mut self[new_target].instructions[0], + instr_location(&last), + ); + let last_mut = basicblock_last_instr_mut(&mut self[b]).unwrap(); + last_mut.target = new_target; + self[target].predecessors -= 1; + self[new_target].predecessors = 1; + self[new_target].next = self[target].next; + self[new_target].cpython_label = InstructionSequenceLabel(next_lbl); + next_lbl += 1; + self[target].next = new_target; + } + } + b = self[b].next; + } + + b = entryblock; + while b != BlockIdx::NULL { + let next = self[b].next; + if bb_has_fallthrough(&self[b]) + && next != BlockIdx::NULL + && self[b].instruction_used != 0 + && is_exit_or_eval_check_without_lineno(&self[next]) + { + let last = *basicblock_last_instr(&self[b]).expect("block has instructions"); + instr_set_location(&mut self[next].instructions[0], instr_location(&last)); + } + b = self[b].next; + } + + Ok(()) + } + + fn resolve_line_numbers(&mut self, _firstlineno: OneIndexed) -> crate::InternalResult<()> { + self.duplicate_exits_without_lineno()?; + self.propagate_line_numbers(); + Ok(()) + } + + /// flowgraph.c optimize_basic_block + fn optimize_basic_block( + &mut self, + metadata: &mut CodeUnitMetadata, + block_idx: BlockIdx, + ) -> crate::InternalResult<()> { + let mut nop = InstructionInfo { + instr: Instruction::Nop.into(), + arg: OpArg::NULL, + target: BlockIdx::NULL, + location: SourceLocation::default(), + end_location: SourceLocation::default(), + except_handler: None, + lineno_override: None, + }; + instr_set_op0(&mut nop, Instruction::Nop.into()); + let mut i = 0; + while i < self[block_idx].instruction_used { + let inst = self[block_idx].instructions[i]; + debug_assert!(!inst.instr.is_assembler()); + let target = if inst.instr.has_target() { + let target = inst.target; + debug_assert!(target != BlockIdx::NULL); + debug_assert!(self[target.idx()].instruction_used != 0); + debug_assert!(!self[target.idx()].instructions[0].instr.is_assembler()); + self[target.idx()].instructions[0] + } else { + nop + }; + + let nextop = self[block_idx] + .instructions + .get(i + 1) + .and_then(|next| next.instr.real()); + + match inst.instr { + AnyInstruction::Real(Instruction::BuildTuple { .. }) => { + let oparg = u32::from(inst.arg); + if matches!(nextop, Some(Instruction::UnpackSequence { .. })) + && u32::from(self[block_idx].instructions[i + 1].arg) == oparg + { + match oparg { + 1 => { + set_to_nop(&mut self[block_idx].instructions[i]); + set_to_nop(&mut self[block_idx].instructions[i + 1]); + i += 1; + continue; + } + 2 | 3 => { + set_to_nop(&mut self[block_idx].instructions[i]); + self[block_idx].instructions[i + 1].instr = Opcode::Swap.into(); + i += 1; + continue; + } + _ => {} + } + } + fold_tuple_of_constants(metadata, &mut self[block_idx], i)?; + } + AnyInstruction::Real( + Instruction::BuildList { .. } | Instruction::BuildSet { .. }, + ) => { + optimize_lists_and_sets(metadata, &mut self[block_idx], i, nextop)?; + } + AnyInstruction::Real( + Instruction::PopJumpIfNotNone { .. } | Instruction::PopJumpIfNone { .. }, + ) if matches!(target.instr.into(), AnyOpcode::Pseudo(PseudoOpcode::Jump)) + && jump_thread(self, block_idx, i, &target, inst.instr)? => + { + continue; + } + AnyInstruction::Real(Instruction::PopJumpIfFalse { .. }) + if matches!(target.instr.into(), AnyOpcode::Pseudo(PseudoOpcode::Jump)) + && jump_thread(self, block_idx, i, &target, inst.instr)? => + { + continue; + } + AnyInstruction::Real(Instruction::PopJumpIfTrue { .. }) + if matches!(target.instr.into(), AnyOpcode::Pseudo(PseudoOpcode::Jump)) + && jump_thread(self, block_idx, i, &target, inst.instr)? => + { + continue; + } + AnyInstruction::Pseudo( + pseudo @ (PseudoInstruction::JumpIfFalse { .. } + | PseudoInstruction::JumpIfTrue { .. }), + ) => { + let opcode = pseudo.into(); + match target.instr.pseudo().map(Into::into) { + Some(PseudoOpcode::Jump) + if jump_thread(self, block_idx, i, &target, opcode)? => + { + continue; + } + Some(PseudoOpcode::JumpIfFalse) + if matches!( + opcode, + AnyInstruction::Pseudo(PseudoInstruction::JumpIfFalse { .. }) + ) && jump_thread(self, block_idx, i, &target, opcode)? => + { + continue; + } + Some(PseudoOpcode::JumpIfTrue) + if matches!( + opcode, + AnyInstruction::Pseudo(PseudoInstruction::JumpIfTrue { .. }) + ) && jump_thread(self, block_idx, i, &target, opcode)? => + { + continue; + } + Some(PseudoOpcode::JumpIfFalse | PseudoOpcode::JumpIfTrue) => { + let next = self[inst.target.idx()].next; + debug_assert!(next != BlockIdx::NULL); + debug_assert!(next != inst.target); + self[block_idx].instructions[i].target = next; + continue; + } + _ => {} + } + } + AnyInstruction::Pseudo( + PseudoInstruction::Jump { .. } | PseudoInstruction::JumpNoInterrupt { .. }, + ) => match target.instr.into() { + AnyOpcode::Pseudo(PseudoOpcode::Jump) + if jump_thread(self, block_idx, i, &target, PseudoOpcode::Jump.into())? => + { + continue; + } + AnyOpcode::Pseudo(PseudoOpcode::JumpNoInterrupt) + if jump_thread(self, block_idx, i, &target, inst.instr)? => + { + continue; + } + _ => {} + }, + // CPython leaves FOR_ITER jump threading disabled. + AnyInstruction::Real(Instruction::ForIter { .. }) => {} + AnyInstruction::Real(Instruction::StoreFast { .. }) + if matches!(nextop, Some(Instruction::StoreFast { .. })) + && u32::from(inst.arg) + == u32::from(self[block_idx].instructions[i + 1].arg) + && instruction_lineno(&self[block_idx].instructions[i]) + == instruction_lineno(&self[block_idx].instructions[i + 1]) => + { + self[block_idx].instructions[i].instr = Instruction::PopTop.into(); + self[block_idx].instructions[i].arg = OpArg::NULL; + } + AnyInstruction::Real(Instruction::Swap { .. }) if u32::from(inst.arg) == 1 => { + set_to_nop(&mut self[block_idx].instructions[i]); + } + AnyInstruction::Real(Instruction::LoadGlobal { .. }) + if matches!(nextop, Some(Instruction::PushNull)) + && (u32::from(inst.arg) & 1) == 0 => + { + instr_set_op1( + &mut self[block_idx].instructions[i], + inst.instr, + OpArg::new(u32::from(inst.arg) | 1), + ); + set_to_nop(&mut self[block_idx].instructions[i + 1]); + } + AnyInstruction::Real(Instruction::CompareOp { .. }) + if matches!(nextop, Some(Instruction::ToBool)) => + { + set_to_nop(&mut self[block_idx].instructions[i]); + instr_set_op1( + &mut self[block_idx].instructions[i + 1], + inst.instr, + OpArg::new(u32::from(inst.arg) | oparg::COMPARE_OP_BOOL_MASK), + ); + i += 1; + continue; + } + AnyInstruction::Real(Instruction::ContainsOp { .. } | Instruction::IsOp { .. }) + if matches!(nextop, Some(Instruction::ToBool)) => + { + set_to_nop(&mut self[block_idx].instructions[i]); + instr_set_op1( + &mut self[block_idx].instructions[i + 1], + inst.instr, + inst.arg, + ); + i += 1; + continue; + } + AnyInstruction::Real(Instruction::ContainsOp { .. } | Instruction::IsOp { .. }) + if matches!(nextop, Some(Instruction::UnaryNot)) => + { + set_to_nop(&mut self[block_idx].instructions[i]); + let inverted = u32::from(inst.arg) ^ 1; + debug_assert!(inverted == 0 || inverted == 1); + instr_set_op1( + &mut self[block_idx].instructions[i + 1], + inst.instr, + OpArg::new(inverted), + ); + i += 1; + continue; + } + AnyInstruction::Real(Instruction::ToBool) + if matches!(nextop, Some(Instruction::ToBool)) => + { + set_to_nop(&mut self[block_idx].instructions[i]); + i += 1; + continue; + } + AnyInstruction::Real(Instruction::UnaryNot) => { + if matches!(nextop, Some(Instruction::ToBool)) { + set_to_nop(&mut self[block_idx].instructions[i]); + instr_set_op0(&mut self[block_idx].instructions[i + 1], inst.instr); + i += 1; + continue; + } + if matches!(nextop, Some(Instruction::UnaryNot)) { + set_to_nop(&mut self[block_idx].instructions[i]); + set_to_nop(&mut self[block_idx].instructions[i + 1]); + i += 1; + continue; + } + fold_const_unaryop(metadata, &mut self[block_idx], i)?; + } + AnyInstruction::Real(Instruction::UnaryInvert | Instruction::UnaryNegative) => { + fold_const_unaryop(metadata, &mut self[block_idx], i)?; + } + AnyInstruction::Real(Instruction::CallIntrinsic1 { func }) => { + match func.get(inst.arg) { + IntrinsicFunction1::ListToTuple => { + if matches!(nextop, Some(Instruction::GetIter)) { + set_to_nop(&mut self[block_idx].instructions[i]); + } else { + fold_constant_intrinsic_list_to_tuple( + metadata, + &mut self[block_idx], + i, + )?; + } + } + IntrinsicFunction1::UnaryPositive => { + fold_const_unaryop(metadata, &mut self[block_idx], i)?; + } + _ => {} + } + } + AnyInstruction::Real(Instruction::BinaryOp { .. }) => { + fold_const_binop(metadata, &mut self[block_idx], i)?; + } + _ => {} + } + + i += 1; + } + apply_static_swaps_block(&mut self[block_idx])?; + Ok(()) + } + + /// flowgraph.c _PyCfg_ToInstructionSequence + fn cfg_to_instruction_sequence( + &mut self, + instr_sequence: &mut InstructionSequence, + ) -> crate::InternalResult<()> { + let mut label_id = 0; + let mut block_idx = BlockIdx(0); + while block_idx != BlockIdx::NULL { + self[block_idx].cpython_label = InstructionSequenceLabel::from_index(label_id); + label_id += 1; + block_idx = self[block_idx].next; + } + + block_idx = BlockIdx(0); + while block_idx != BlockIdx::NULL { + let block_label = self[block_idx].cpython_label; + debug_assert!(is_label(block_label)); + instruction_sequence_use_label(instr_sequence, block_label)?; + + let instr_count = self[block_idx].instruction_used; + for i in 0..instr_count { + if self[block_idx].instructions[i].instr.has_target() { + let target_block = self[block_idx].instructions[i].target; + debug_assert!(target_block != BlockIdx::NULL); + let lbl = self[target_block].cpython_label; + debug_assert!(is_label(lbl)); + self[block_idx].instructions[i].arg = OpArg::new(lbl.0 as u32); + } + + let mut info = self[block_idx].instructions[i]; + info.target = BlockIdx::NULL; + let except_handler = info.except_handler.take(); + let entry = instruction_sequence_addop(instr_sequence, info)?; + let hi = &mut entry.except_handler; + if let Some(handler) = except_handler { + debug_assert!(handler.handler_block != BlockIdx::NULL); + let lbl = self[handler.handler_block].cpython_label; + debug_assert!(is_label(lbl)); + let start_depth = self[handler.handler_block].start_depth; + debug_assert!(start_depth >= 0); + hi.h_label = lbl.0; + hi.start_depth = start_depth; + hi.preserve_lasti = i32::from(handler.preserve_lasti); + } else { + hi.h_label = NO_EXCEPTION_HANDLER_LABEL; + } + } + block_idx = self[block_idx].next; + } + + instruction_sequence_apply_label_map(instr_sequence)?; + Ok(()) + } + + fn optimize_load_fast(&mut self) -> crate::InternalResult<()> { + let mut max_instrs = 0; + let mut current = BlockIdx(0); + while current != BlockIdx::NULL { + max_instrs = max_instrs.max(self[current].instruction_used); + current = self[current].next; + } + + let mut instr_flags = Vec::new(); + instr_flags + .try_reserve_exact(max_instrs) + .map_err(|_| InternalError::MalformedControlFlowGraph)?; + instr_flags.resize(max_instrs, 0u8); + let mut refs = RefStack { + refs: Vec::new(), + size: 0, + capacity: 0, + }; + let mut worklist = self.make_cfg_traversal_stack()?; + worklist.push(BlockIdx(0)); + self[0].start_depth = 0; + self[0].visited = true; + while let Some(block_idx) = worklist.pop() { + let instr_count = self[block_idx].instruction_used; + instr_flags[..instr_count].fill(0); + debug_assert!(self[block_idx].start_depth >= 0); + let start_depth = self[block_idx].start_depth as usize; + ref_stack_clear(&mut refs); + for _ in 0..start_depth { + push_ref(&mut refs, DUMMY_INSTR, NOT_LOCAL)?; + } + + for i in 0..instr_count { + let info = self[block_idx].instructions[i]; + let instr = info.instr; + let arg_u32 = u32::from(info.arg); + debug_assert!(!matches!(instr.real(), Some(Instruction::ExtendedArg))); + + match instr { + AnyInstruction::Real(Instruction::DeleteFast { var_num }) => { + kill_local( + &mut instr_flags, + &refs, + local_as_ref_local(usize::from(var_num.get(info.arg))), + ); + } + AnyInstruction::Real(Instruction::LoadFast { var_num }) => { + push_ref( + &mut refs, + i as isize, + local_as_ref_local(usize::from(var_num.get(info.arg))), + )?; + } + AnyInstruction::Real(Instruction::LoadFastAndClear { var_num }) => { + let local = local_as_ref_local(usize::from(var_num.get(info.arg))); + kill_local(&mut instr_flags, &refs, local); + push_ref(&mut refs, i as isize, local)?; + } + AnyInstruction::Real(Instruction::LoadFastLoadFast { .. }) => { + let local1 = (arg_u32 >> 4) as isize; + let local2 = (arg_u32 & 15) as isize; + push_ref(&mut refs, i as isize, local1)?; + push_ref(&mut refs, i as isize, local2)?; + } + AnyInstruction::Real(Instruction::StoreFast { var_num }) => { + let r = ref_stack_pop(&mut refs); + store_local( + &mut instr_flags, + &refs, + local_as_ref_local(usize::from(var_num.get(info.arg))), + r, + ); + } + AnyInstruction::Real(Instruction::StoreFastLoadFast { .. }) => { + let r = ref_stack_pop(&mut refs); + store_local(&mut instr_flags, &refs, (arg_u32 >> 4) as isize, r); + push_ref(&mut refs, i as isize, (arg_u32 & 15) as isize)?; + } + AnyInstruction::Real(Instruction::StoreFastStoreFast { .. }) => { + let r1 = ref_stack_pop(&mut refs); + store_local(&mut instr_flags, &refs, (arg_u32 >> 4) as isize, r1); + let r2 = ref_stack_pop(&mut refs); + store_local(&mut instr_flags, &refs, (arg_u32 & 15) as isize, r2); + } + AnyInstruction::Real(Instruction::Copy { i: _ }) => { + let depth = arg_u32 as usize; + assert!(depth > 0); + assert!(refs.size >= depth); + let r = ref_stack_at(&refs, refs.size - depth); + push_ref(&mut refs, r.instr, r.local)?; + } + AnyInstruction::Real(Instruction::Swap { i: _ }) => { + let depth = arg_u32 as usize; + assert!(depth >= 2); + assert!(refs.size >= depth); + ref_stack_swap_top(&mut refs, depth); + } + AnyInstruction::Real( + Instruction::FormatSimple + | Instruction::GetAnext + | Instruction::GetLen + | Instruction::GetYieldFromIter + | Instruction::ImportFrom { .. } + | Instruction::MatchKeys + | Instruction::MatchMapping + | Instruction::MatchSequence + | Instruction::WithExceptStart, + ) => { + let effect = instr.stack_effect_info(arg_u32); + let net_pushed = effect.pushed() as isize - effect.popped() as isize; + debug_assert!(net_pushed >= 0); + // CPython optimize_load_fast() shadows the outer + // instruction index in this produced-value loop. + for produced in 0..net_pushed { + push_ref(&mut refs, produced, NOT_LOCAL)?; + } + } + AnyInstruction::Real( + Instruction::DictMerge { .. } + | Instruction::DictUpdate { .. } + | Instruction::ListAppend { .. } + | Instruction::ListExtend { .. } + | Instruction::MapAdd { .. } + | Instruction::Reraise { .. } + | Instruction::SetAdd { .. } + | Instruction::SetUpdate { .. }, + ) => { + let effect = instr.stack_effect_info(arg_u32); + let net_popped = effect.popped() as isize - effect.pushed() as isize; + debug_assert!(net_popped > 0); + for _ in 0..net_popped { + let _ = ref_stack_pop(&mut refs); + } + } + AnyInstruction::Real( + Instruction::EndSend | Instruction::SetFunctionAttribute { .. }, + ) => { + let effect = instr.stack_effect_info(arg_u32); + debug_assert_eq!(effect.popped(), 2); + debug_assert_eq!(effect.pushed(), 1); + let tos = ref_stack_pop(&mut refs); + let _ = ref_stack_pop(&mut refs); + push_ref(&mut refs, tos.instr, tos.local)?; + } + AnyInstruction::Real(Instruction::CheckExcMatch) => { + let _ = ref_stack_pop(&mut refs); + push_ref(&mut refs, i as isize, NOT_LOCAL)?; + } + AnyInstruction::Real(Instruction::ForIter { .. }) => { + let target = info.target; + debug_assert!(target != BlockIdx::NULL); + load_fast_push_block(&mut worklist, self, target, refs.size + 1); + push_ref(&mut refs, i as isize, NOT_LOCAL)?; + } + AnyInstruction::Real( + Instruction::LoadAttr { .. } | Instruction::LoadSuperAttr { .. }, + ) => { + let self_ref = ref_stack_pop(&mut refs); + if matches!(instr.real(), Some(Instruction::LoadSuperAttr { .. })) { + let _ = ref_stack_pop(&mut refs); + let _ = ref_stack_pop(&mut refs); + } + push_ref(&mut refs, i as isize, NOT_LOCAL)?; + if arg_u32 & 1 != 0 { + push_ref(&mut refs, self_ref.instr, self_ref.local)?; + } + } + AnyInstruction::Real( + Instruction::LoadSpecial { .. } | Instruction::PushExcInfo, + ) => { + let tos = ref_stack_pop(&mut refs); + push_ref(&mut refs, i as isize, NOT_LOCAL)?; + push_ref(&mut refs, tos.instr, tos.local)?; + } + AnyInstruction::Real(Instruction::Send { .. }) => { + let target = info.target; + debug_assert!(target != BlockIdx::NULL); + load_fast_push_block(&mut worklist, self, target, refs.size); + let _ = ref_stack_pop(&mut refs); + push_ref(&mut refs, i as isize, NOT_LOCAL)?; + } + _ => { + let effect = instr.stack_effect_info(arg_u32); + let num_popped = effect.popped() as usize; + let num_pushed = effect.pushed() as usize; + let target = info.target; + if instr.has_target() { + debug_assert!(target != BlockIdx::NULL); + debug_assert!(refs.size >= num_popped); + let target_depth = refs.size - num_popped + num_pushed; + load_fast_push_block(&mut worklist, self, target, target_depth); + } + if !is_block_push(&info) { + for _ in 0..num_popped { + let _ = ref_stack_pop(&mut refs); + } + for _ in 0..num_pushed { + push_ref(&mut refs, i as isize, NOT_LOCAL)?; + } + } + } + } + } + + let fallthrough = self[block_idx].next; + let term = basicblock_last_instr(&self[block_idx]).copied(); + if let Some(term) = term + && fallthrough != BlockIdx::NULL + && !term.instr.is_unconditional_jump() + && !term.instr.is_scope_exit() + { + debug_assert!(bb_has_fallthrough(&self[block_idx])); + load_fast_push_block(&mut worklist, self, fallthrough, refs.size); + } + + for i in 0..refs.size { + let r = ref_stack_at(&refs, i); + if r.instr != DUMMY_INSTR { + instr_flags[r.instr as usize] |= LoadFastInstrFlag::RefUnconsumed as u8; + } + } + + let block = &mut self[block_idx]; + let iused = block.instruction_used; + let mut i = 0; + while i < iused { + let info = &mut block.instructions[i]; + if instr_flags[i] != 0 { + i += 1; + continue; + } + + match info.instr.real_opcode() { + Some(Opcode::LoadFast) => { + info.instr = Opcode::LoadFastBorrow.into(); + } + Some(Opcode::LoadFastLoadFast) => { + info.instr = Opcode::LoadFastBorrowLoadFastBorrow.into(); + } + _ => {} + } + i += 1; + } + } + + Ok(()) + } + + fn propagate_line_numbers(&mut self) { + let mut current = BlockIdx(0); + while current != BlockIdx::NULL { + let Some(last) = basicblock_last_instr(&self[current]).copied() else { + current = self[current].next; + continue; + }; + + let mut prev_location = no_instruction_location(); + for i in 0..self[current].instruction_used { + if instruction_is_no_location(&self[current].instructions[i]) { + instr_set_location(&mut self[current].instructions[i], prev_location); + } else { + prev_location = instr_location(&self[current].instructions[i]); + } + } + + let next = self[current].next; + if bb_has_fallthrough(&self[current]) { + debug_assert!(next != BlockIdx::NULL); + if next != BlockIdx::NULL + && self[next].predecessors == 1 + && self[next].instruction_used != 0 + && instruction_is_no_location(&self[next].instructions[0]) + { + instr_set_location(&mut self[next].instructions[0], prev_location); + } + } + + if is_jump(&last) { + let target = last.target; + debug_assert!(target != BlockIdx::NULL); + if self[target].predecessors == 1 { + let instr = basicblock_raw_first_instr_mut(&mut self[target]); + if instruction_is_no_location(instr) { + instr_set_location(instr, prev_location); + } + } + } + current = self[current].next; + } + } + + /// flowgraph.c remove_redundant_nops_and_pairs + fn remove_redundant_nops_and_pairs(&mut self) -> crate::InternalResult<()> { + let mut done = false; + + while !done { + done = true; + let mut instr: Option<(BlockIdx, usize)> = None; + let mut block_idx = BlockIdx::new(0); + + while block_idx != BlockIdx::NULL { + basicblock_remove_redundant_nops(self, block_idx)?; + if is_label(self[block_idx].cpython_label) { + instr = None; + } + + let len = self[block_idx].instruction_used; + for instr_idx in 0..len { + let prev_instr = instr; + instr = Some((block_idx, instr_idx)); + let instr_info = self[block_idx].instructions[instr_idx]; + let mut prev_opcode = None; + let prev_oparg = if let Some((prev_block, prev_instr_idx)) = prev_instr { + let prev_info = self[prev_block].instructions[prev_instr_idx]; + prev_opcode = prev_info.instr.real_opcode(); + match prev_info.instr.real() { + Some(Instruction::Copy { i }) => i.get(prev_info.arg), + _ => u32::from(prev_info.arg), + } + } else { + 0 + }; + + let opcode = instr_info.instr.real_opcode(); + let is_redundant_pair = matches!(opcode, Some(Opcode::PopTop)) + && (matches!(prev_opcode, Some(Opcode::LoadConst | Opcode::LoadSmallInt)) + || (prev_oparg == 1 && matches!(prev_opcode, Some(Opcode::Copy)))); + + if is_redundant_pair { + let (prev_block, prev_instr_idx) = + prev_instr.expect("redundant pair has previous"); + set_to_nop(&mut self[prev_block].instructions[prev_instr_idx]); + set_to_nop(&mut self[block_idx].instructions[instr_idx]); + done = false; + } + } + + let instr_is_jump = instr.is_some_and(|(instr_block, instr_idx)| { + is_jump(&self[instr_block].instructions[instr_idx]) + }); + + let block = &self[block_idx]; + if instr_is_jump || !bb_has_fallthrough(block) { + instr = None; + } + block_idx = block.next; + } + } + Ok(()) + } + + /// flowgraph.c calculate_stackdepth + fn calculate_stackdepth(&mut self) -> crate::InternalResult<u32> { + let mut current = BlockIdx(0); + while current != BlockIdx::NULL { + self[current.idx()].start_depth = START_DEPTH_UNSET; + current = self[current.idx()].next; + } + let mut stack = self.make_cfg_traversal_stack()?; + let mut maxdepth = 0i32; + stackdepth_push(&mut stack, self, BlockIdx(0), 0)?; + while let Some(block_idx) = stack.pop() { + let mut depth = self[block_idx].start_depth; + debug_assert!(depth >= 0); + let mut next = self[block_idx].next; + let instr_count = self[block_idx].instruction_used; + for i in 0..instr_count { + let ins = self[block_idx].instructions[i]; + let instr = &ins.instr; + let effects = get_stack_effects(*instr, ins.arg, 0)?; + let new_depth = depth + effects.net; + if new_depth < 0 { + return Err(InternalError::StackUnderflow); + } + maxdepth = maxdepth.max(depth); + if instr.has_target() && !matches!(instr.real(), Some(Instruction::EndAsyncFor)) { + debug_assert!(ins.target != BlockIdx::NULL); + let effects = get_stack_effects(*instr, ins.arg, 1)?; + let target_depth = depth + effects.net; + debug_assert!(target_depth >= 0); + maxdepth = maxdepth.max(depth); + stackdepth_push(&mut stack, self, ins.target, target_depth)?; + } + depth = new_depth; + debug_assert!(!instr.is_assembler()); + if instr.is_unconditional_jump() || instr.is_scope_exit() { + next = BlockIdx::NULL; + break; + } + } + + if next != BlockIdx::NULL { + debug_assert!(bb_has_fallthrough(&self[block_idx])); + stackdepth_push(&mut stack, self, next, depth)?; + } + } + + let stackdepth = maxdepth; + Ok(stackdepth as u32) + } + + /// flowgraph.c make_cfg_traversal_stack + fn make_cfg_traversal_stack(&mut self) -> crate::InternalResult<CfgTraversalStack> { + debug_assert!(!self.is_empty()); + + let mut nblocks = 0; + let mut current = BlockIdx(0); + while current != BlockIdx::NULL { + self[current].visited = false; + nblocks += 1; + current = self[current].next; + } + debug_assert!(nblocks > 0); + let mut stack = Vec::new(); + stack + .try_reserve_exact(nblocks) + .map_err(|_| InternalError::MalformedControlFlowGraph)?; + stack.resize(nblocks, BlockIdx::NULL); + let stack = CfgTraversalStack { stack, sp: 0 }; + debug_assert_eq!(stack.capacity(), nblocks); + Ok(stack) + } + + /// flowgraph.c normalize_jumps + fn normalize_jumps(&mut self) -> crate::InternalResult<()> { + let mut current = BlockIdx(0); + while current != BlockIdx::NULL { + self[current].visited = false; + current = self[current].next; + } + + let mut current = BlockIdx(0); + while current != BlockIdx::NULL { + self[current].visited = true; + normalize_jumps_in_block(self, current)?; + current = self[current].next; + } + + Ok(()) + } + + /// flowgraph.c remove_unused_consts + #[allow(clippy::needless_range_loop)] + fn remove_unused_consts(&mut self, consts: &mut ConstantPool) -> crate::InternalResult<()> { + let nconsts = consts.len(); + if nconsts == 0 { + return Ok(()); + } + + let mut index_map = Vec::new(); + index_map + .try_reserve_exact(nconsts) + .map_err(|_| InternalError::MalformedControlFlowGraph)?; + index_map.resize(nconsts, 0isize); + for i in 1..nconsts { + index_map[i] = -1; + } + // The first constant may be docstring; keep it always. + index_map[0] = 0; + + // Mark used consts. + let mut block_idx = BlockIdx(0); + while block_idx != BlockIdx::NULL { + let block = &self[block_idx]; + for i in 0..block.instruction_used { + let instr = &block.instructions[i]; + if instr.instr.has_const() { + let index = u32::from(instr.arg) as usize; + debug_assert!(index < nconsts); + index_map[index] = index as isize; + } + } + block_idx = block.next; + } + + // Now index_map[i] == i if consts[i] is used, -1 otherwise. + // Condense consts. + let mut n_used_consts = 0; + for i in 0..nconsts { + if index_map[i] != -1 { + debug_assert_eq!(index_map[i], i as isize); + index_map[n_used_consts] = index_map[i]; + n_used_consts += 1; + } + } + + if n_used_consts == nconsts { + return Ok(()); + } + + // Move all used consts to the beginning of the consts list. + debug_assert!(n_used_consts < nconsts); + for i in 0..n_used_consts { + let old_index = index_map[i] as usize; + debug_assert!(i <= old_index && old_index < nconsts); + if i != old_index { + let value = consts.constants[old_index].clone(); + consts.constants[i] = value; + } + } + + // Truncate the consts list at its new size. + consts.constants.truncate(n_used_consts); + + // Adjust const indices in the bytecode. + let mut reverse_index_map = Vec::new(); + reverse_index_map + .try_reserve_exact(nconsts) + .map_err(|_| InternalError::MalformedControlFlowGraph)?; + reverse_index_map.resize(nconsts, 0isize); + for i in 0..nconsts { + reverse_index_map[i] = -1; + } + for i in 0..n_used_consts { + let old_index = index_map[i]; + debug_assert!(old_index != -1); + let old_index = old_index as usize; + debug_assert_eq!(reverse_index_map[old_index], -1); + reverse_index_map[old_index] = i as isize; + } + + block_idx = BlockIdx(0); + while block_idx != BlockIdx::NULL { + let next_block = self[block_idx.idx()].next; + let block = &mut self[block_idx]; + for i in 0..block.instruction_used { + let instr = &mut block.instructions[i]; + if instr.instr.has_const() { + let index = u32::from(instr.arg) as usize; + debug_assert!(reverse_index_map[index] >= 0); + debug_assert!(reverse_index_map[index] < n_used_consts as isize); + instr.arg = OpArg::new(reverse_index_map[index] as u32); + } + } + block_idx = next_block; + } + Ok(()) + } + + /// flowgraph.c insert_superinstructions + fn insert_superinstructions(&mut self) -> crate::InternalResult<usize> { + let mut block_idx = BlockIdx(0); + while block_idx != BlockIdx::NULL { + let next_block = self[block_idx].next; + let block = &mut self[block_idx]; + for i in 0..block.instruction_used { + let nextop = (i + 1 < block.instruction_used) + .then(|| block.instructions[i + 1].instr.real_opcode()) + .flatten(); + + match (block.instructions[i].instr.real_opcode(), nextop) { + (Some(Opcode::LoadFast), _) => { + if matches!(nextop, Some(Opcode::LoadFast)) { + let (inst1, rest) = block.instructions[i..].split_at_mut(1); + make_super_instruction( + &mut inst1[0], + &mut rest[0], + Opcode::LoadFastLoadFast.into(), + ); + } + } + + (Some(Opcode::StoreFast), Some(Opcode::LoadFast)) => { + let (inst1, rest) = block.instructions[i..].split_at_mut(1); + make_super_instruction( + &mut inst1[0], + &mut rest[0], + Opcode::StoreFastLoadFast.into(), + ); + } + + (Some(Opcode::StoreFast), Some(Opcode::StoreFast)) => { + let (inst1, rest) = block.instructions[i..].split_at_mut(1); + make_super_instruction( + &mut inst1[0], + &mut rest[0], + Opcode::StoreFastStoreFast.into(), + ); + } + + (_, _) => {} + } + } + + block_idx = next_block; + } + + let res = remove_redundant_nops(self)?; + + #[cfg(debug_assertions)] + assert!(no_redundant_nops(self)); + + Ok(res) + } +} + impl From<Vec<Block>> for Blocks { fn from(value: Vec<Block>) -> Self { Self(value) @@ -1846,15 +2828,15 @@ fn optimize_code_unit( mark_except_handlers(blocks)?; label_exception_targets(blocks)?; optimize_cfg(metadata, blocks, metadata.firstlineno)?; - remove_unused_consts(blocks, &mut metadata.consts)?; + blocks.remove_unused_consts(&mut metadata.consts)?; add_checks_for_loads_of_uninitialized_variables(blocks, nlocals, nparams)?; // CPython inserts superinstructions in _PyCfg_OptimizeCodeUnit, before // later jump normalization / block reordering can create adjacencies // that never exist at this stage in flowgraph.c. - insert_superinstructions(blocks)?; + blocks.insert_superinstructions()?; push_cold_blocks_to_end(blocks)?; // CPython resolves line numbers again after cold-block extraction. - resolve_line_numbers(blocks, metadata.firstlineno)?; + blocks.resolve_line_numbers(metadata.firstlineno)?; Ok(()) } @@ -1872,25 +2854,25 @@ fn optimize_cfg( // CPython does not re-run instruction-sequence label-map/CFG conversion // after this point. Unreferenced label blocks left by jump inlining // remain block boundaries and can preserve line-marker NOPs. - remove_unreachable(blocks)?; + blocks.remove_unreachable()?; // CPython optimize_cfg resolves line numbers before local checks and // superinstruction insertion, so fusion decisions see propagated // source locations. - resolve_line_numbers(blocks, firstlineno)?; + blocks.resolve_line_numbers(firstlineno)?; // CPython optimize_cfg() runs optimize_load_const() and then // optimize_basic_block() after line numbers are resolved. optimize_load_const(metadata, blocks)?; let mut block_idx = BlockIdx(0); while block_idx != BlockIdx::NULL { let next_block = blocks[block_idx].next; - optimize_basic_block(blocks, metadata, block_idx)?; + blocks.optimize_basic_block(metadata, block_idx)?; block_idx = next_block; } - remove_redundant_nops_and_pairs(blocks)?; + blocks.remove_redundant_nops_and_pairs()?; // CPython optimize_cfg() removes newly-unreachable blocks and // redundant NOP/jump chains before _PyCfg_OptimizeCodeUnit() prunes // unused constants. - remove_unreachable(blocks)?; + blocks.remove_unreachable()?; remove_redundant_nops_and_jumps(blocks)?; #[cfg(debug_assertions)] assert!(no_redundant_jumps(blocks)); @@ -1904,20 +2886,20 @@ fn optimized_cfg_to_instruction_sequence( ) -> crate::InternalResult<(u32, usize, InstructionSequence)> { // Phase 2: _PyCfg_OptimizedCfgToInstructionSequence (flowgraph.c) convert_pseudo_conditional_jumps(blocks)?; - let max_stackdepth = calculate_stackdepth(blocks)?; + let max_stackdepth = blocks.calculate_stackdepth()?; debug_assert!(!is_generator(flags) || max_stackdepth != 0); let nlocalsplus = prepare_localsplus(metadata, blocks, flags)?; // Match CPython order: pseudo ops are lowered after stackdepth and // localsplus preparation, before normalize_jumps. convert_pseudo_ops(blocks)?; - normalize_jumps(blocks)?; + blocks.normalize_jumps()?; #[cfg(debug_assertions)] assert!(no_redundant_jumps(blocks)); // optimize_load_fast: after normalize_jumps - optimize_load_fast(blocks)?; + blocks.optimize_load_fast()?; let mut instr_sequence = instruction_sequence_new(); - cfg_to_instruction_sequence(blocks, &mut instr_sequence)?; + blocks.cfg_to_instruction_sequence(&mut instr_sequence)?; Ok((max_stackdepth, nlocalsplus, instr_sequence)) } @@ -2143,60 +3125,6 @@ fn prepare_localsplus( Ok(nlocalsplus) } -/// flowgraph.c remove_unreachable -fn remove_unreachable(blocks: &mut Blocks) -> crate::InternalResult<()> { - let mut block_idx = BlockIdx(0); - while block_idx != BlockIdx::NULL { - blocks[block_idx].predecessors = 0; - block_idx = blocks[block_idx].next; - } - - let mut stack = make_cfg_traversal_stack(blocks)?; - blocks[0].predecessors = 1; - stack.push(BlockIdx(0)); - blocks[0].visited = true; - while let Some(current) = stack.pop() { - let idx = current.idx(); - let next = blocks[idx].next; - if next != BlockIdx::NULL && bb_has_fallthrough(&blocks[idx]) { - if !blocks[next].visited { - debug_assert_eq!(blocks[next].predecessors, 0); - stack.push(next); - blocks[next].visited = true; - } - blocks[next].predecessors += 1; - } - - let instr_count = blocks[idx].instruction_used; - for i in 0..instr_count { - let instr = blocks[idx].instructions[i]; - if is_jump(&instr) || is_block_push(&instr) { - let target = instr.target; - debug_assert!(target != BlockIdx::NULL); - let target_idx = target.idx(); - if !blocks[target_idx].visited { - stack.push(target); - blocks[target_idx].visited = true; - } - blocks[target_idx].predecessors += 1; - } - } - } - - block_idx = BlockIdx(0); - while block_idx != BlockIdx::NULL { - let i = block_idx.idx(); - let next = blocks[i].next; - if blocks[i].predecessors == 0 { - let block = &mut blocks[i]; - basicblock_clear(block); - block.except_handler = false; - } - block_idx = next; - } - Ok(()) -} - /// flowgraph.c eval_const_unaryop fn eval_const_unaryop( operand: &ConstantData, @@ -3708,711 +4636,6 @@ fn optimize_load_const( Ok(()) } -/// flowgraph.c optimize_basic_block -fn optimize_basic_block( - blocks: &mut Blocks, - metadata: &mut CodeUnitMetadata, - block_idx: BlockIdx, -) -> crate::InternalResult<()> { - let bi = block_idx.idx(); - let mut nop = InstructionInfo { - instr: Instruction::Nop.into(), - arg: OpArg::NULL, - target: BlockIdx::NULL, - location: SourceLocation::default(), - end_location: SourceLocation::default(), - except_handler: None, - lineno_override: None, - }; - instr_set_op0(&mut nop, Instruction::Nop.into()); - let mut i = 0; - while i < blocks[bi].instruction_used { - let inst = blocks[bi].instructions[i]; - debug_assert!(!inst.instr.is_assembler()); - let target = if inst.instr.has_target() { - let target = inst.target; - debug_assert!(target != BlockIdx::NULL); - debug_assert!(blocks[target.idx()].instruction_used != 0); - debug_assert!(!blocks[target.idx()].instructions[0].instr.is_assembler()); - blocks[target.idx()].instructions[0] - } else { - nop - }; - - let nextop = blocks[bi] - .instructions - .get(i + 1) - .and_then(|next| next.instr.real()); - - match inst.instr { - AnyInstruction::Real(Instruction::BuildTuple { .. }) => { - let oparg = u32::from(inst.arg); - if matches!(nextop, Some(Instruction::UnpackSequence { .. })) - && u32::from(blocks[bi].instructions[i + 1].arg) == oparg - { - match oparg { - 1 => { - set_to_nop(&mut blocks[bi].instructions[i]); - set_to_nop(&mut blocks[bi].instructions[i + 1]); - i += 1; - continue; - } - 2 | 3 => { - set_to_nop(&mut blocks[bi].instructions[i]); - blocks[bi].instructions[i + 1].instr = Opcode::Swap.into(); - i += 1; - continue; - } - _ => {} - } - } - fold_tuple_of_constants(metadata, &mut blocks[bi], i)?; - } - AnyInstruction::Real(Instruction::BuildList { .. } | Instruction::BuildSet { .. }) => { - optimize_lists_and_sets(metadata, &mut blocks[bi], i, nextop)?; - } - AnyInstruction::Real( - Instruction::PopJumpIfNotNone { .. } | Instruction::PopJumpIfNone { .. }, - ) if matches!(target.instr.into(), AnyOpcode::Pseudo(PseudoOpcode::Jump)) - && jump_thread(blocks, block_idx, i, &target, inst.instr)? => - { - continue; - } - AnyInstruction::Real(Instruction::PopJumpIfFalse { .. }) - if matches!(target.instr.into(), AnyOpcode::Pseudo(PseudoOpcode::Jump)) - && jump_thread(blocks, block_idx, i, &target, inst.instr)? => - { - continue; - } - AnyInstruction::Real(Instruction::PopJumpIfTrue { .. }) - if matches!(target.instr.into(), AnyOpcode::Pseudo(PseudoOpcode::Jump)) - && jump_thread(blocks, block_idx, i, &target, inst.instr)? => - { - continue; - } - AnyInstruction::Pseudo( - pseudo @ (PseudoInstruction::JumpIfFalse { .. } - | PseudoInstruction::JumpIfTrue { .. }), - ) => { - let opcode = pseudo.into(); - match target.instr.pseudo().map(Into::into) { - Some(PseudoOpcode::Jump) - if jump_thread(blocks, block_idx, i, &target, opcode)? => - { - continue; - } - Some(PseudoOpcode::JumpIfFalse) - if matches!( - opcode, - AnyInstruction::Pseudo(PseudoInstruction::JumpIfFalse { .. }) - ) && jump_thread(blocks, block_idx, i, &target, opcode)? => - { - continue; - } - Some(PseudoOpcode::JumpIfTrue) - if matches!( - opcode, - AnyInstruction::Pseudo(PseudoInstruction::JumpIfTrue { .. }) - ) && jump_thread(blocks, block_idx, i, &target, opcode)? => - { - continue; - } - Some(PseudoOpcode::JumpIfFalse | PseudoOpcode::JumpIfTrue) => { - let next = blocks[inst.target.idx()].next; - debug_assert!(next != BlockIdx::NULL); - debug_assert!(next != inst.target); - blocks[bi].instructions[i].target = next; - continue; - } - _ => {} - } - } - AnyInstruction::Pseudo( - PseudoInstruction::Jump { .. } | PseudoInstruction::JumpNoInterrupt { .. }, - ) => match target.instr.into() { - AnyOpcode::Pseudo(PseudoOpcode::Jump) - if jump_thread(blocks, block_idx, i, &target, PseudoOpcode::Jump.into())? => - { - continue; - } - AnyOpcode::Pseudo(PseudoOpcode::JumpNoInterrupt) - if jump_thread(blocks, block_idx, i, &target, inst.instr)? => - { - continue; - } - _ => {} - }, - // CPython leaves FOR_ITER jump threading disabled. - AnyInstruction::Real(Instruction::ForIter { .. }) => {} - AnyInstruction::Real(Instruction::StoreFast { .. }) - if matches!(nextop, Some(Instruction::StoreFast { .. })) - && u32::from(inst.arg) == u32::from(blocks[bi].instructions[i + 1].arg) - && instruction_lineno(&blocks[bi].instructions[i]) - == instruction_lineno(&blocks[bi].instructions[i + 1]) => - { - blocks[bi].instructions[i].instr = Instruction::PopTop.into(); - blocks[bi].instructions[i].arg = OpArg::NULL; - } - AnyInstruction::Real(Instruction::Swap { .. }) if u32::from(inst.arg) == 1 => { - set_to_nop(&mut blocks[bi].instructions[i]); - } - AnyInstruction::Real(Instruction::LoadGlobal { .. }) - if matches!(nextop, Some(Instruction::PushNull)) - && (u32::from(inst.arg) & 1) == 0 => - { - instr_set_op1( - &mut blocks[bi].instructions[i], - inst.instr, - OpArg::new(u32::from(inst.arg) | 1), - ); - set_to_nop(&mut blocks[bi].instructions[i + 1]); - } - AnyInstruction::Real(Instruction::CompareOp { .. }) - if matches!(nextop, Some(Instruction::ToBool)) => - { - set_to_nop(&mut blocks[bi].instructions[i]); - instr_set_op1( - &mut blocks[bi].instructions[i + 1], - inst.instr, - OpArg::new(u32::from(inst.arg) | oparg::COMPARE_OP_BOOL_MASK), - ); - i += 1; - continue; - } - AnyInstruction::Real(Instruction::ContainsOp { .. } | Instruction::IsOp { .. }) - if matches!(nextop, Some(Instruction::ToBool)) => - { - set_to_nop(&mut blocks[bi].instructions[i]); - instr_set_op1(&mut blocks[bi].instructions[i + 1], inst.instr, inst.arg); - i += 1; - continue; - } - AnyInstruction::Real(Instruction::ContainsOp { .. } | Instruction::IsOp { .. }) - if matches!(nextop, Some(Instruction::UnaryNot)) => - { - set_to_nop(&mut blocks[bi].instructions[i]); - let inverted = u32::from(inst.arg) ^ 1; - debug_assert!(inverted == 0 || inverted == 1); - instr_set_op1( - &mut blocks[bi].instructions[i + 1], - inst.instr, - OpArg::new(inverted), - ); - i += 1; - continue; - } - AnyInstruction::Real(Instruction::ToBool) - if matches!(nextop, Some(Instruction::ToBool)) => - { - set_to_nop(&mut blocks[bi].instructions[i]); - i += 1; - continue; - } - AnyInstruction::Real(Instruction::UnaryNot) => { - if matches!(nextop, Some(Instruction::ToBool)) { - set_to_nop(&mut blocks[bi].instructions[i]); - instr_set_op0(&mut blocks[bi].instructions[i + 1], inst.instr); - i += 1; - continue; - } - if matches!(nextop, Some(Instruction::UnaryNot)) { - set_to_nop(&mut blocks[bi].instructions[i]); - set_to_nop(&mut blocks[bi].instructions[i + 1]); - i += 1; - continue; - } - fold_const_unaryop(metadata, &mut blocks[bi], i)?; - } - AnyInstruction::Real(Instruction::UnaryInvert | Instruction::UnaryNegative) => { - fold_const_unaryop(metadata, &mut blocks[bi], i)?; - } - AnyInstruction::Real(Instruction::CallIntrinsic1 { func }) => { - match func.get(inst.arg) { - IntrinsicFunction1::ListToTuple => { - if matches!(nextop, Some(Instruction::GetIter)) { - set_to_nop(&mut blocks[bi].instructions[i]); - } else { - fold_constant_intrinsic_list_to_tuple(metadata, &mut blocks[bi], i)?; - } - } - IntrinsicFunction1::UnaryPositive => { - fold_const_unaryop(metadata, &mut blocks[bi], i)?; - } - _ => {} - } - } - AnyInstruction::Real(Instruction::BinaryOp { .. }) => { - fold_const_binop(metadata, &mut blocks[bi], i)?; - } - _ => {} - } - - i += 1; - } - apply_static_swaps_block(&mut blocks[block_idx])?; - Ok(()) -} - -/// flowgraph.c remove_redundant_nops_and_pairs -#[allow(clippy::unnecessary_wraps)] -fn remove_redundant_nops_and_pairs(blocks: &mut Blocks) -> crate::InternalResult<()> { - let mut done = false; - - while !done { - done = true; - let mut instr: Option<(BlockIdx, usize)> = None; - let mut block_idx = BlockIdx::new(0); - - while block_idx != BlockIdx::NULL { - basicblock_remove_redundant_nops(blocks, block_idx)?; - if is_label(blocks[block_idx.idx()].cpython_label) { - instr = None; - } - - let len = blocks[block_idx.idx()].instruction_used; - for instr_idx in 0..len { - let prev_instr = instr; - instr = Some((block_idx, instr_idx)); - let instr_info = blocks[block_idx.idx()].instructions[instr_idx]; - let mut prev_opcode = None; - let prev_oparg = if let Some((prev_block, prev_instr_idx)) = prev_instr { - let prev_info = blocks[prev_block.idx()].instructions[prev_instr_idx]; - prev_opcode = prev_info.instr.real_opcode(); - match prev_info.instr.real() { - Some(Instruction::Copy { i }) => i.get(prev_info.arg), - _ => u32::from(prev_info.arg), - } - } else { - 0 - }; - - let opcode = instr_info.instr.real_opcode(); - let is_redundant_pair = matches!(opcode, Some(Opcode::PopTop)) - && (matches!(prev_opcode, Some(Opcode::LoadConst | Opcode::LoadSmallInt)) - || (prev_oparg == 1 && matches!(prev_opcode, Some(Opcode::Copy)))); - - if is_redundant_pair { - let (prev_block, prev_instr_idx) = - prev_instr.expect("redundant pair has previous"); - set_to_nop(&mut blocks[prev_block].instructions[prev_instr_idx]); - set_to_nop(&mut blocks[block_idx].instructions[instr_idx]); - done = false; - } - } - - let instr_is_jump = instr.is_some_and(|(instr_block, instr_idx)| { - is_jump(&blocks[instr_block].instructions[instr_idx]) - }); - - let block = &blocks[block_idx]; - if instr_is_jump || !bb_has_fallthrough(block) { - instr = None; - } - block_idx = block.next; - } - } - Ok(()) -} - -/// flowgraph.c remove_unused_consts -#[allow(clippy::needless_range_loop)] -fn remove_unused_consts( - blocks: &mut Blocks, - consts: &mut ConstantPool, -) -> crate::InternalResult<()> { - let nconsts = consts.len(); - if nconsts == 0 { - return Ok(()); - } - - let mut index_map = Vec::new(); - index_map - .try_reserve_exact(nconsts) - .map_err(|_| InternalError::MalformedControlFlowGraph)?; - index_map.resize(nconsts, 0isize); - for i in 1..nconsts { - index_map[i] = -1; - } - // The first constant may be docstring; keep it always. - index_map[0] = 0; - - // Mark used consts. - let mut block_idx = BlockIdx(0); - while block_idx != BlockIdx::NULL { - let block = &blocks[block_idx]; - for i in 0..block.instruction_used { - let instr = &block.instructions[i]; - if instr.instr.has_const() { - let index = u32::from(instr.arg) as usize; - debug_assert!(index < nconsts); - index_map[index] = index as isize; - } - } - block_idx = block.next; - } - - // Now index_map[i] == i if consts[i] is used, -1 otherwise. - // Condense consts. - let mut n_used_consts = 0; - for i in 0..nconsts { - if index_map[i] != -1 { - debug_assert_eq!(index_map[i], i as isize); - index_map[n_used_consts] = index_map[i]; - n_used_consts += 1; - } - } - - if n_used_consts == nconsts { - return Ok(()); - } - - // Move all used consts to the beginning of the consts list. - debug_assert!(n_used_consts < nconsts); - for i in 0..n_used_consts { - let old_index = index_map[i] as usize; - debug_assert!(i <= old_index && old_index < nconsts); - if i != old_index { - let value = consts.constants[old_index].clone(); - consts.constants[i] = value; - } - } - - // Truncate the consts list at its new size. - consts.constants.truncate(n_used_consts); - - // Adjust const indices in the bytecode. - let mut reverse_index_map = Vec::new(); - reverse_index_map - .try_reserve_exact(nconsts) - .map_err(|_| InternalError::MalformedControlFlowGraph)?; - reverse_index_map.resize(nconsts, 0isize); - for i in 0..nconsts { - reverse_index_map[i] = -1; - } - for i in 0..n_used_consts { - let old_index = index_map[i]; - debug_assert!(old_index != -1); - let old_index = old_index as usize; - debug_assert_eq!(reverse_index_map[old_index], -1); - reverse_index_map[old_index] = i as isize; - } - - block_idx = BlockIdx(0); - while block_idx != BlockIdx::NULL { - let next_block = blocks[block_idx.idx()].next; - let block = &mut blocks[block_idx]; - for i in 0..block.instruction_used { - let instr = &mut block.instructions[i]; - if instr.instr.has_const() { - let index = u32::from(instr.arg) as usize; - debug_assert!(reverse_index_map[index] >= 0); - debug_assert!(reverse_index_map[index] < n_used_consts as isize); - instr.arg = OpArg::new(reverse_index_map[index] as u32); - } - } - block_idx = next_block; - } - Ok(()) -} - -fn optimize_load_fast(blocks: &mut Blocks) -> crate::InternalResult<()> { - let mut max_instrs = 0; - let mut current = BlockIdx(0); - while current != BlockIdx::NULL { - max_instrs = max_instrs.max(blocks[current.idx()].instruction_used); - current = blocks[current.idx()].next; - } - let mut instr_flags = Vec::new(); - instr_flags - .try_reserve_exact(max_instrs) - .map_err(|_| InternalError::MalformedControlFlowGraph)?; - instr_flags.resize(max_instrs, 0u8); - let mut refs = RefStack { - refs: Vec::new(), - size: 0, - capacity: 0, - }; - let mut worklist = make_cfg_traversal_stack(blocks)?; - worklist.push(BlockIdx(0)); - blocks[0].start_depth = 0; - blocks[0].visited = true; - while let Some(block_idx) = worklist.pop() { - let block_i = block_idx.idx(); - - let instr_count = blocks[block_i].instruction_used; - instr_flags[..instr_count].fill(0); - debug_assert!(blocks[block_i].start_depth >= 0); - let start_depth = blocks[block_i].start_depth as usize; - ref_stack_clear(&mut refs); - for _ in 0..start_depth { - push_ref(&mut refs, DUMMY_INSTR, NOT_LOCAL)?; - } - - for i in 0..instr_count { - let info = blocks[block_i].instructions[i]; - let instr = info.instr; - let arg_u32 = u32::from(info.arg); - debug_assert!(!matches!(instr.real(), Some(Instruction::ExtendedArg))); - - match instr { - AnyInstruction::Real(Instruction::DeleteFast { var_num }) => { - kill_local( - &mut instr_flags, - &refs, - local_as_ref_local(usize::from(var_num.get(info.arg))), - ); - } - AnyInstruction::Real(Instruction::LoadFast { var_num }) => { - push_ref( - &mut refs, - i as isize, - local_as_ref_local(usize::from(var_num.get(info.arg))), - )?; - } - AnyInstruction::Real(Instruction::LoadFastAndClear { var_num }) => { - let local = local_as_ref_local(usize::from(var_num.get(info.arg))); - kill_local(&mut instr_flags, &refs, local); - push_ref(&mut refs, i as isize, local)?; - } - AnyInstruction::Real(Instruction::LoadFastLoadFast { .. }) => { - let local1 = (arg_u32 >> 4) as isize; - let local2 = (arg_u32 & 15) as isize; - push_ref(&mut refs, i as isize, local1)?; - push_ref(&mut refs, i as isize, local2)?; - } - AnyInstruction::Real(Instruction::StoreFast { var_num }) => { - let r = ref_stack_pop(&mut refs); - store_local( - &mut instr_flags, - &refs, - local_as_ref_local(usize::from(var_num.get(info.arg))), - r, - ); - } - AnyInstruction::Real(Instruction::StoreFastLoadFast { .. }) => { - let r = ref_stack_pop(&mut refs); - store_local(&mut instr_flags, &refs, (arg_u32 >> 4) as isize, r); - push_ref(&mut refs, i as isize, (arg_u32 & 15) as isize)?; - } - AnyInstruction::Real(Instruction::StoreFastStoreFast { .. }) => { - let r1 = ref_stack_pop(&mut refs); - store_local(&mut instr_flags, &refs, (arg_u32 >> 4) as isize, r1); - let r2 = ref_stack_pop(&mut refs); - store_local(&mut instr_flags, &refs, (arg_u32 & 15) as isize, r2); - } - AnyInstruction::Real(Instruction::Copy { i: _ }) => { - let depth = arg_u32 as usize; - assert!(depth > 0); - assert!(refs.size >= depth); - let r = ref_stack_at(&refs, refs.size - depth); - push_ref(&mut refs, r.instr, r.local)?; - } - AnyInstruction::Real(Instruction::Swap { i: _ }) => { - let depth = arg_u32 as usize; - assert!(depth >= 2); - assert!(refs.size >= depth); - ref_stack_swap_top(&mut refs, depth); - } - AnyInstruction::Real( - Instruction::FormatSimple - | Instruction::GetAnext - | Instruction::GetLen - | Instruction::GetYieldFromIter - | Instruction::ImportFrom { .. } - | Instruction::MatchKeys - | Instruction::MatchMapping - | Instruction::MatchSequence - | Instruction::WithExceptStart, - ) => { - let effect = instr.stack_effect_info(arg_u32); - let net_pushed = effect.pushed() as isize - effect.popped() as isize; - debug_assert!(net_pushed >= 0); - // CPython optimize_load_fast() shadows the outer - // instruction index in this produced-value loop. - for produced in 0..net_pushed { - push_ref(&mut refs, produced, NOT_LOCAL)?; - } - } - AnyInstruction::Real( - Instruction::DictMerge { .. } - | Instruction::DictUpdate { .. } - | Instruction::ListAppend { .. } - | Instruction::ListExtend { .. } - | Instruction::MapAdd { .. } - | Instruction::Reraise { .. } - | Instruction::SetAdd { .. } - | Instruction::SetUpdate { .. }, - ) => { - let effect = instr.stack_effect_info(arg_u32); - let net_popped = effect.popped() as isize - effect.pushed() as isize; - debug_assert!(net_popped > 0); - for _ in 0..net_popped { - let _ = ref_stack_pop(&mut refs); - } - } - AnyInstruction::Real( - Instruction::EndSend | Instruction::SetFunctionAttribute { .. }, - ) => { - let effect = instr.stack_effect_info(arg_u32); - debug_assert_eq!(effect.popped(), 2); - debug_assert_eq!(effect.pushed(), 1); - let tos = ref_stack_pop(&mut refs); - let _ = ref_stack_pop(&mut refs); - push_ref(&mut refs, tos.instr, tos.local)?; - } - AnyInstruction::Real(Instruction::CheckExcMatch) => { - let _ = ref_stack_pop(&mut refs); - push_ref(&mut refs, i as isize, NOT_LOCAL)?; - } - AnyInstruction::Real(Instruction::ForIter { .. }) => { - let target = info.target; - debug_assert!(target != BlockIdx::NULL); - load_fast_push_block(&mut worklist, blocks, target, refs.size + 1); - push_ref(&mut refs, i as isize, NOT_LOCAL)?; - } - AnyInstruction::Real( - Instruction::LoadAttr { .. } | Instruction::LoadSuperAttr { .. }, - ) => { - let self_ref = ref_stack_pop(&mut refs); - if matches!(instr.real(), Some(Instruction::LoadSuperAttr { .. })) { - let _ = ref_stack_pop(&mut refs); - let _ = ref_stack_pop(&mut refs); - } - push_ref(&mut refs, i as isize, NOT_LOCAL)?; - if arg_u32 & 1 != 0 { - push_ref(&mut refs, self_ref.instr, self_ref.local)?; - } - } - AnyInstruction::Real( - Instruction::LoadSpecial { .. } | Instruction::PushExcInfo, - ) => { - let tos = ref_stack_pop(&mut refs); - push_ref(&mut refs, i as isize, NOT_LOCAL)?; - push_ref(&mut refs, tos.instr, tos.local)?; - } - AnyInstruction::Real(Instruction::Send { .. }) => { - let target = info.target; - debug_assert!(target != BlockIdx::NULL); - load_fast_push_block(&mut worklist, blocks, target, refs.size); - let _ = ref_stack_pop(&mut refs); - push_ref(&mut refs, i as isize, NOT_LOCAL)?; - } - _ => { - let effect = instr.stack_effect_info(arg_u32); - let num_popped = effect.popped() as usize; - let num_pushed = effect.pushed() as usize; - let target = info.target; - if instr.has_target() { - debug_assert!(target != BlockIdx::NULL); - debug_assert!(refs.size >= num_popped); - let target_depth = refs.size - num_popped + num_pushed; - load_fast_push_block(&mut worklist, blocks, target, target_depth); - } - if !is_block_push(&info) { - for _ in 0..num_popped { - let _ = ref_stack_pop(&mut refs); - } - for _ in 0..num_pushed { - push_ref(&mut refs, i as isize, NOT_LOCAL)?; - } - } - } - } - } - - let fallthrough = blocks[block_i].next; - let term = basicblock_last_instr(&blocks[block_i]).copied(); - if let Some(term) = term - && fallthrough != BlockIdx::NULL - && !term.instr.is_unconditional_jump() - && !term.instr.is_scope_exit() - { - debug_assert!(bb_has_fallthrough(&blocks[block_i])); - load_fast_push_block(&mut worklist, blocks, fallthrough, refs.size); - } - - for i in 0..refs.size { - let r = ref_stack_at(&refs, i); - if r.instr != DUMMY_INSTR { - instr_flags[r.instr as usize] |= LoadFastInstrFlag::RefUnconsumed as u8; - } - } - - let block = &mut blocks[block_idx]; - let iused = block.instruction_used; - let mut i = 0; - while i < iused { - let info = &mut block.instructions[i]; - if instr_flags[i] != 0 { - i += 1; - continue; - } - - match info.instr.real_opcode() { - Some(Opcode::LoadFast) => { - info.instr = Opcode::LoadFastBorrow.into(); - } - Some(Opcode::LoadFastLoadFast) => { - info.instr = Opcode::LoadFastBorrowLoadFastBorrow.into(); - } - _ => {} - } - i += 1; - } - } - Ok(()) -} - -/// flowgraph.c calculate_stackdepth -fn calculate_stackdepth(blocks: &mut Blocks) -> crate::InternalResult<u32> { - let mut current = BlockIdx(0); - while current != BlockIdx::NULL { - blocks[current.idx()].start_depth = START_DEPTH_UNSET; - current = blocks[current.idx()].next; - } - let mut stack = make_cfg_traversal_stack(blocks)?; - let mut maxdepth = 0i32; - stackdepth_push(&mut stack, blocks, BlockIdx(0), 0)?; - while let Some(block_idx) = stack.pop() { - let idx = block_idx.idx(); - let mut depth = blocks[idx].start_depth; - debug_assert!(depth >= 0); - let mut next = blocks[idx].next; - let instr_count = blocks[idx].instruction_used; - for i in 0..instr_count { - let ins = blocks[idx].instructions[i]; - let instr = &ins.instr; - let effects = get_stack_effects(*instr, ins.arg, 0)?; - let new_depth = depth + effects.net; - if new_depth < 0 { - return Err(InternalError::StackUnderflow); - } - maxdepth = maxdepth.max(depth); - if instr.has_target() && !matches!(instr.real(), Some(Instruction::EndAsyncFor)) { - debug_assert!(ins.target != BlockIdx::NULL); - let effects = get_stack_effects(*instr, ins.arg, 1)?; - let target_depth = depth + effects.net; - debug_assert!(target_depth >= 0); - maxdepth = maxdepth.max(depth); - stackdepth_push(&mut stack, blocks, ins.target, target_depth)?; - } - depth = new_depth; - debug_assert!(!instr.is_assembler()); - if instr.is_unconditional_jump() || instr.is_scope_exit() { - next = BlockIdx::NULL; - break; - } - } - if next != BlockIdx::NULL { - debug_assert!(bb_has_fallthrough(&blocks[idx])); - stackdepth_push(&mut stack, blocks, next, depth)?; - } - } - - let stackdepth = maxdepth; - Ok(stackdepth as u32) -} - #[cfg(test)] impl CodeInfo { fn debug_block_dump(&self) -> String { @@ -4490,8 +4713,9 @@ impl CodeInfo { "after_inline_small_or_no_lineno_blocks".to_owned(), self.debug_block_dump(), )); - remove_unreachable(&mut self.blocks)?; - resolve_line_numbers(&mut self.blocks, self.metadata.firstlineno)?; + self.blocks.remove_unreachable()?; + self.blocks + .resolve_line_numbers(self.metadata.firstlineno)?; optimize_load_const(&mut self.metadata, &mut self.blocks)?; trace.push(( "after_optimize_load_const".to_owned(), @@ -4500,19 +4724,21 @@ impl CodeInfo { let mut block_idx = BlockIdx(0); while block_idx != BlockIdx::NULL { let next_block = self.blocks[block_idx].next; - optimize_basic_block(&mut self.blocks, &mut self.metadata, block_idx)?; + self.blocks + .optimize_basic_block(&mut self.metadata, block_idx)?; block_idx = next_block; } trace.push(( "after_optimize_basic_block".to_owned(), self.debug_block_dump(), )); - remove_redundant_nops_and_pairs(&mut self.blocks)?; - remove_unreachable(&mut self.blocks)?; + self.blocks.remove_redundant_nops_and_pairs()?; + self.blocks.remove_unreachable()?; remove_redundant_nops_and_jumps(&mut self.blocks)?; #[cfg(debug_assertions)] assert!(no_redundant_jumps(&self.blocks)); - remove_unused_consts(&mut self.blocks, &mut self.metadata.consts)?; + self.blocks + .remove_unused_consts(&mut self.metadata.consts)?; trace.push(( "after_optimize_cfg_cleanup".to_owned(), self.debug_block_dump(), @@ -4520,13 +4746,14 @@ impl CodeInfo { let nlocals = self.metadata.varnames.len(); let nparams = self.nparams; add_checks_for_loads_of_uninitialized_variables(&mut self.blocks, nlocals, nparams)?; - insert_superinstructions(&mut self.blocks)?; + self.blocks.insert_superinstructions()?; push_cold_blocks_to_end(&mut self.blocks)?; trace.push(( "after_push_cold_before_chain_reorder".to_owned(), self.debug_block_dump(), )); - resolve_line_numbers(&mut self.blocks, self.metadata.firstlineno)?; + self.blocks + .resolve_line_numbers(self.metadata.firstlineno)?; trace.push(( "after_push_cold_resolve_line_numbers".to_owned(), self.debug_block_dump(), @@ -4543,7 +4770,7 @@ impl CodeInfo { self.debug_block_dump(), )); - let _max_stackdepth = calculate_stackdepth(&mut self.blocks)?; + let _max_stackdepth = self.blocks.calculate_stackdepth()?; let _nlocalsplus = prepare_localsplus(&self.metadata, &mut self.blocks, self.flags)?; convert_pseudo_ops(&mut self.blocks)?; trace.push(( @@ -4551,11 +4778,11 @@ impl CodeInfo { self.debug_block_dump(), )); - normalize_jumps(&mut self.blocks)?; + self.blocks.normalize_jumps()?; #[cfg(debug_assertions)] assert!(no_redundant_jumps(&self.blocks)); trace.push(("after_normalize_jumps".to_owned(), self.debug_block_dump())); - optimize_load_fast(&mut self.blocks)?; + self.blocks.optimize_load_fast()?; trace.push(( "after_optimize_load_fast".to_owned(), self.debug_block_dump(), @@ -4619,57 +4846,6 @@ fn make_super_instruction( set_to_nop(inst2); } -/// flowgraph.c insert_superinstructions -fn insert_superinstructions(blocks: &mut Blocks) -> crate::InternalResult<usize> { - let mut block_idx = BlockIdx(0); - while block_idx != BlockIdx::NULL { - let next_block = blocks[block_idx.idx()].next; - let block = &mut blocks[block_idx]; - for i in 0..block.instruction_used { - let nextop = (i + 1 < block.instruction_used) - .then(|| block.instructions[i + 1].instr.real()) - .flatten(); - match block.instructions[i].instr.real() { - Some(Instruction::LoadFast { .. }) => { - if matches!(nextop, Some(Instruction::LoadFast { .. })) { - let (inst1, rest) = block.instructions[i..].split_at_mut(1); - make_super_instruction( - &mut inst1[0], - &mut rest[0], - Opcode::LoadFastLoadFast.into(), - ); - } - } - Some(Instruction::StoreFast { .. }) => match nextop { - Some(Instruction::LoadFast { .. }) => { - let (inst1, rest) = block.instructions[i..].split_at_mut(1); - make_super_instruction( - &mut inst1[0], - &mut rest[0], - Opcode::StoreFastLoadFast.into(), - ); - } - Some(Instruction::StoreFast { .. }) => { - let (inst1, rest) = block.instructions[i..].split_at_mut(1); - make_super_instruction( - &mut inst1[0], - &mut rest[0], - Opcode::StoreFastStoreFast.into(), - ); - } - _ => {} - }, - _ => {} - } - } - block_idx = next_block; - } - let res = remove_redundant_nops(blocks)?; - #[cfg(debug_assertions)] - assert!(no_redundant_nops(blocks)); - Ok(res) -} - /// flowgraph.c LoadFastInstrFlag #[derive(Clone, Copy, Eq, PartialEq)] #[repr(u8)] @@ -5188,7 +5364,7 @@ pub(crate) fn mark_except_handlers(blocks: &mut Blocks) -> crate::InternalResult /// optimize_load_fast to terminate fall-through at those placeholders. /// flowgraph.c mark_warm fn mark_warm(blocks: &mut Blocks) -> crate::InternalResult<()> { - let mut stack = make_cfg_traversal_stack(blocks)?; + let mut stack = blocks.make_cfg_traversal_stack()?; stack.push(BlockIdx(0)); blocks[0].visited = true; while let Some(block_idx) = stack.pop() { @@ -5221,7 +5397,7 @@ fn mark_warm(blocks: &mut Blocks) -> crate::InternalResult<()> { fn mark_cold(blocks: &mut Blocks) -> crate::InternalResult<()> { let mut block_idx = BlockIdx(0); while block_idx != BlockIdx::NULL { - let block = &mut blocks[block_idx.idx()]; + let block = &mut blocks[block_idx]; debug_assert!(!block.cold); debug_assert!(!block.warm); block_idx = block.next; @@ -5229,7 +5405,7 @@ fn mark_cold(blocks: &mut Blocks) -> crate::InternalResult<()> { mark_warm(blocks)?; - let mut cold_stack = make_cfg_traversal_stack(blocks)?; + let mut cold_stack = blocks.make_cfg_traversal_stack()?; block_idx = BlockIdx(0); while block_idx != BlockIdx::NULL { let i = block_idx.idx(); @@ -5596,24 +5772,6 @@ fn normalize_jumps_in_block(blocks: &mut Blocks, block_idx: BlockIdx) -> crate:: Ok(()) } -/// flowgraph.c normalize_jumps -fn normalize_jumps(blocks: &mut Blocks) -> crate::InternalResult<()> { - let mut current = BlockIdx(0); - while current != BlockIdx::NULL { - blocks[current.idx()].visited = false; - current = blocks[current.idx()].next; - } - - let mut current = BlockIdx(0); - while current != BlockIdx::NULL { - let idx = current.idx(); - blocks[idx].visited = true; - normalize_jumps_in_block(blocks, current)?; - current = blocks[idx].next; - } - Ok(()) -} - /// flowgraph.c basicblock_inline_small_or_no_lineno_blocks fn basicblock_inline_small_or_no_lineno_blocks( blocks: &mut Blocks, @@ -5638,7 +5796,7 @@ fn basicblock_inline_small_or_no_lineno_blocks( let last = basicblock_last_instr_mut(&mut blocks[block_idx]) .expect("non-empty block has last instruction"); set_to_nop(last); - basicblock_append_block_instructions(blocks, block_idx, target)?; + blocks.basicblock_append_block_instructions(block_idx, target)?; if no_lineno_no_fallthrough { let last = basicblock_last_instr_mut(&mut blocks[block_idx]).unwrap(); if last.instr.is_unconditional_jump() @@ -5839,27 +5997,6 @@ fn remove_redundant_nops_and_jumps(blocks: &mut Blocks) -> crate::InternalResult Ok(()) } -/// flowgraph.c make_cfg_traversal_stack -fn make_cfg_traversal_stack(blocks: &mut Blocks) -> crate::InternalResult<CfgTraversalStack> { - debug_assert!(!blocks.is_empty()); - let mut nblocks = 0; - let mut current = BlockIdx(0); - while current != BlockIdx::NULL { - blocks[current.idx()].visited = false; - nblocks += 1; - current = blocks[current.idx()].next; - } - debug_assert!(nblocks > 0); - let mut stack = Vec::new(); - stack - .try_reserve_exact(nblocks) - .map_err(|_| InternalError::MalformedControlFlowGraph)?; - stack.resize(nblocks, BlockIdx::NULL); - let stack = CfgTraversalStack { stack, sp: 0 }; - debug_assert_eq!(stack.capacity(), nblocks); - Ok(stack) -} - fn blocks_new_block(blocks: &mut Blocks) -> crate::InternalResult<BlockIdx> { blocks .try_reserve(1) @@ -6284,7 +6421,7 @@ fn add_checks_for_loads_of_uninitialized_variables( nlocals = LOCAL_UNSAFE_MASK_BITS; } - let mut worklist = make_cfg_traversal_stack(blocks)?; + let mut worklist = blocks.make_cfg_traversal_stack()?; let mut start_mask = 0u64; for i in nparams..nlocals { start_mask |= 1u64 << i; @@ -6405,14 +6542,6 @@ fn basicblock_has_no_lineno(block: &Block) -> bool { true } -/// flowgraph.c copy_basicblock -fn copy_basicblock(blocks: &mut Blocks, block_idx: BlockIdx) -> crate::InternalResult<BlockIdx> { - debug_assert!(bb_no_fallthrough(&blocks[block_idx.idx()])); - let result = blocks_new_block(blocks)?; - basicblock_append_block_instructions(blocks, result, block_idx)?; - Ok(result) -} - /// flowgraph.c get_max_label fn get_max_label(blocks: &Blocks) -> i32 { let mut lbl = -1; @@ -6425,110 +6554,6 @@ fn get_max_label(blocks: &Blocks) -> i32 { lbl } -fn duplicate_exits_without_lineno(blocks: &mut Blocks) -> crate::InternalResult<()> { - let mut next_lbl = get_max_label(blocks) + 1; - - let entryblock = BlockIdx(0); - let mut b = entryblock; - while b != BlockIdx::NULL { - let Some(last) = basicblock_last_instr(&blocks[b]).copied() else { - b = blocks[b].next; - continue; - }; - if is_jump(&last) { - debug_assert!(last.target != BlockIdx::NULL); - let target = next_nonempty_block(blocks, last.target); - debug_assert!(target != BlockIdx::NULL); - if is_exit_or_eval_check_without_lineno(&blocks[target]) - && blocks[target].predecessors > 1 - { - let new_target = copy_basicblock(blocks, target)?; - instr_set_location( - &mut blocks[new_target].instructions[0], - instr_location(&last), - ); - let last_mut = basicblock_last_instr_mut(&mut blocks[b]).unwrap(); - last_mut.target = new_target; - blocks[target].predecessors -= 1; - blocks[new_target].predecessors = 1; - blocks[new_target].next = blocks[target].next; - blocks[new_target].cpython_label = InstructionSequenceLabel(next_lbl); - next_lbl += 1; - blocks[target].next = new_target; - } - } - b = blocks[b].next; - } - - b = entryblock; - while b != BlockIdx::NULL { - let next = blocks[b].next; - if bb_has_fallthrough(&blocks[b]) - && next != BlockIdx::NULL - && blocks[b].instruction_used != 0 - && is_exit_or_eval_check_without_lineno(&blocks[next]) - { - let last = *basicblock_last_instr(&blocks[b]).expect("block has instructions"); - instr_set_location(&mut blocks[next].instructions[0], instr_location(&last)); - } - b = blocks[b].next; - } - Ok(()) -} - -fn propagate_line_numbers(blocks: &mut Blocks) { - let mut current = BlockIdx(0); - while current != BlockIdx::NULL { - let idx = current.idx(); - let Some(last) = basicblock_last_instr(&blocks[idx]).copied() else { - current = blocks[idx].next; - continue; - }; - - let mut prev_location = no_instruction_location(); - for i in 0..blocks[idx].instruction_used { - if instruction_is_no_location(&blocks[idx].instructions[i]) { - instr_set_location(&mut blocks[idx].instructions[i], prev_location); - } else { - prev_location = instr_location(&blocks[idx].instructions[i]); - } - } - - let next = blocks[idx].next; - if bb_has_fallthrough(&blocks[idx]) { - debug_assert!(next != BlockIdx::NULL); - if next != BlockIdx::NULL - && blocks[next].predecessors == 1 - && blocks[next].instruction_used != 0 - && instruction_is_no_location(&blocks[next].instructions[0]) - { - instr_set_location(&mut blocks[next].instructions[0], prev_location); - } - } - - if is_jump(&last) { - let target = last.target; - debug_assert!(target != BlockIdx::NULL); - if blocks[target].predecessors == 1 { - let instr = basicblock_raw_first_instr_mut(&mut blocks[target]); - if instruction_is_no_location(instr) { - instr_set_location(instr, prev_location); - } - } - } - current = blocks[current].next; - } -} - -fn resolve_line_numbers( - blocks: &mut Blocks, - _firstlineno: OneIndexed, -) -> crate::InternalResult<()> { - duplicate_exits_without_lineno(blocks)?; - propagate_line_numbers(blocks); - Ok(()) -} - /// flowgraph.c make_except_stack #[allow(clippy::unnecessary_wraps)] fn make_except_stack() -> crate::InternalResult<CfgExceptStack> { @@ -6592,7 +6617,7 @@ fn pop_except_block(stack: &mut CfgExceptStack, blocks: &Blocks) -> Option<Excep } pub(crate) fn label_exception_targets(blocks: &mut Blocks) -> crate::InternalResult<()> { - let mut todo = make_cfg_traversal_stack(blocks)?; + let mut todo = blocks.make_cfg_traversal_stack()?; todo.push(BlockIdx(0)); blocks[0].visited = true; @@ -7014,7 +7039,7 @@ mod tests { blocks[0].visited = true; blocks[1].visited = true; - let mut stack = make_cfg_traversal_stack(&mut blocks).unwrap(); + let mut stack = blocks.make_cfg_traversal_stack().unwrap(); assert!(!blocks[0].visited); assert!(!blocks[1].visited); assert!(stack.capacity() >= 2); @@ -7230,7 +7255,8 @@ mod tests { basicblock_clear(&mut blocks[0]); test_block_push(&mut blocks[1], test_instr(Instruction::PopTop, 42)); - basicblock_append_block_instructions(&mut blocks, BlockIdx::new(0), BlockIdx::new(1)) + blocks + .basicblock_append_block_instructions(BlockIdx::new(0), BlockIdx::new(1)) .expect("basicblock_append_block_instructions succeeds"); // CPython `basicblock_append_instructions()` obtains a slot with @@ -7252,7 +7278,8 @@ mod tests { blocks[0].next = BlockIdx::new(1); let mut instr_sequence = instruction_sequence_new(); - cfg_to_instruction_sequence(&mut blocks, &mut instr_sequence) + blocks + .cfg_to_instruction_sequence(&mut instr_sequence) .expect("non-target NOP should ignore stale CPython i_target"); } @@ -7265,7 +7292,7 @@ mod tests { let mut blocks = Blocks::from([block]); let mut instr_sequence = instruction_sequence_new(); - let _ = cfg_to_instruction_sequence(&mut blocks, &mut instr_sequence); + let _ = blocks.cfg_to_instruction_sequence(&mut instr_sequence); } #[test] @@ -7381,7 +7408,9 @@ mod tests { test_block_push(&mut block, test_instr(Instruction::PopTop, 10)); let mut code = test_code_info(block); - optimize_load_fast(&mut code.blocks).expect("optimize_load_fast succeeds"); + code.blocks + .optimize_load_fast() + .expect("optimize_load_fast succeeds"); // CPython `optimize_load_fast()` shadows the outer instruction index in // the produced-value loop for GET_LEN, so the produced ref is recorded @@ -7471,8 +7500,12 @@ mod tests { test_block_push(&mut blocks[2], test_instr(Instruction::ReturnValue, 30)); blocks[2].instructions[0].lineno_override = Some(NO_LOCATION_OVERRIDE); - remove_unreachable(&mut blocks).expect("remove_unreachable succeeds"); - resolve_line_numbers(&mut blocks, OneIndexed::MIN).expect("resolve_line_numbers succeeds"); + blocks + .remove_unreachable() + .expect("remove_unreachable succeeds"); + blocks + .resolve_line_numbers(OneIndexed::MIN) + .expect("resolve_line_numbers succeeds"); // CPython `duplicate_exits_without_lineno()` copies a shared exit block // reached by jumps so each copy can inherit its sole predecessor's line. @@ -7495,10 +7528,12 @@ mod tests { block.instructions[1].lineno_override = Some(NEXT_LOCATION_OVERRIDE); test_block_push(&mut block, test_instr(Instruction::ReturnValue, 30)); block.instructions[2].lineno_override = Some(NO_LOCATION_OVERRIDE); - let mut blocks = [block].into(); + let mut blocks = Blocks::from([block]); - remove_unreachable(&mut blocks).expect("remove_unreachable succeeds"); - propagate_line_numbers(&mut blocks); + blocks + .remove_unreachable() + .expect("remove_unreachable succeeds"); + blocks.propagate_line_numbers(); // CPython `propagate_line_numbers()` only copies over NO_LOCATION // (`lineno == NO_LOCATION`). `NEXT_LOCATION` (`lineno == -2`) becomes the @@ -7524,8 +7559,10 @@ mod tests { basicblock_clear(&mut blocks[1]); test_block_push(&mut blocks[2], test_instr(Instruction::ReturnValue, 30)); - remove_unreachable(&mut blocks).expect("remove_unreachable succeeds"); - propagate_line_numbers(&mut blocks); + blocks + .remove_unreachable() + .expect("remove_unreachable succeeds"); + blocks.propagate_line_numbers(); // CPython `propagate_line_numbers()` directly reads `target->b_instr[0]` // for jump targets without checking `b_iused`. If @@ -7568,7 +7605,8 @@ mod tests { test_block_push(&mut blocks[3], test_instr(Instruction::ReturnValue, 40)); let mut metadata = test_code_info(Block::default()).metadata; - optimize_basic_block(&mut blocks, &mut metadata, BlockIdx::new(0)) + blocks + .optimize_basic_block(&mut metadata, BlockIdx::new(0)) .expect("valid jump chain"); // CPython `optimize_basic_block()` continues after `jump_thread()`, so From a7aebe645b3d46ed31b88b018e892cd0199833bb Mon Sep 17 00:00:00 2001 From: Joshua Megnauth <48846352+joshuamegnauth54@users.noreply.github.com> Date: Wed, 24 Jun 2026 08:58:57 -0400 Subject: [PATCH 139/339] unicodedata: Remove UnicodeVersion struct (#8131) --- crates/stdlib/src/unicodedata.rs | 89 +++++++++++++------------------- 1 file changed, 36 insertions(+), 53 deletions(-) diff --git a/crates/stdlib/src/unicodedata.rs b/crates/stdlib/src/unicodedata.rs index 4152118f5..b373b083e 100644 --- a/crates/stdlib/src/unicodedata.rs +++ b/crates/stdlib/src/unicodedata.rs @@ -4,11 +4,7 @@ // spell-checker:ignore codep decomp DECOMP nfkc unistr unidata -use core::{ - cmp::Ordering, - fmt::{self, Display, Formatter}, - hint::cold_path, -}; +use core::{cmp::Ordering, hint::cold_path}; pub(crate) use unicodedata::module_def; @@ -28,25 +24,6 @@ include!(concat!( "/generated/unicode_numeric_value.rs" )); -#[derive(Clone, Copy, Debug, PartialEq)] -struct UnicodeVersion { - pub major: u8, - pub minor: u8, - pub micro: u8, -} - -impl Display for UnicodeVersion { - fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result { - write!(f, "{}.{}.{}", self.major, self.minor, self.micro) - } -} - -const UNICODE_VERSION: UnicodeVersion = UnicodeVersion { - major: char::UNICODE_VERSION.0, - minor: char::UNICODE_VERSION.1, - micro: char::UNICODE_VERSION.2, -}; - #[derive(Clone, Copy)] #[repr(u8)] enum DecompositionType { @@ -118,8 +95,8 @@ fn lookup_property<T: Copy>(table: &[(u32, u32, T)], ch: char) -> Option<T> { .map(|i| table[i].2) } -fn lookup_numeric_val(ch: char, version: UnicodeVersion) -> Option<f64> { - if version.major > 3 { +fn lookup_numeric_val(ch: char, modern: bool) -> Option<f64> { + if modern { lookup_property(NUMERIC_VALUES, ch) } else { cold_path(); @@ -162,8 +139,8 @@ mod unicodedata { use super::{ BIDI_CLASS, BIDI_MIRRORED, COMBINING_CLASS, DECOMP_COMPAT, DECOMP_RANGE, DECOMP_UPDATES, - EAST_ASIAN_WIDTH, GENERAL_CATEGORY, NUMERIC_TYPE_DIFF, NormalizeForm, UNICODE_VERSION, - UnicodeVersion, lookup_numeric_val, lookup_property, + EAST_ASIAN_WIDTH, GENERAL_CATEGORY, NUMERIC_TYPE_DIFF, NormalizeForm, lookup_numeric_val, + lookup_property, }; use crate::vm::{ Py, PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine, @@ -186,7 +163,7 @@ mod unicodedata { __module_exec(vm, module); // Add UCD methods as module-level functions - let ucd: PyObjectRef = Ucd::new(UNICODE_VERSION).into_ref(&vm.ctx).into(); + let ucd: PyObjectRef = Ucd::new(true).into_ref(&vm.ctx).into(); for attr in [ "category", @@ -213,12 +190,12 @@ mod unicodedata { #[pyclass(name = "UCD")] #[derive(Debug, PyPayload)] pub(super) struct Ucd { - unic_version: UnicodeVersion, + modern: bool, } impl Ucd { - pub(super) const fn new(unic_version: UnicodeVersion) -> Self { - Self { unic_version } + pub(super) const fn new(modern: bool) -> Self { + Self { modern } } fn extract_char(&self, character: PyStrRef, vm: &VirtualMachine) -> PyResult<CodePoint> { @@ -238,7 +215,7 @@ mod unicodedata { let Some(c) = c.to_char() else { return GeneralCategory::Surrogate.short_name(); }; - if self.unic_version.major > 3 { + if self.modern { Some(GeneralCategory::for_char(c)) } else { cold_path(); @@ -291,7 +268,7 @@ mod unicodedata { self.extract_char(character, vm).map(|c| { c.to_char() .and_then(|c| { - if self.unic_version.major > 3 { + if self.modern { Some(BidiClass::for_char(c)) } else { cold_path(); @@ -312,7 +289,7 @@ mod unicodedata { self.extract_char(character, vm).map(|c| { c.to_char() .and_then(|c| { - if self.unic_version.major > 3 { + if self.modern { Some(EastAsianWidth::for_char(c)) } else { cold_path(); @@ -392,7 +369,7 @@ mod unicodedata { fn mirrored(&self, character: PyStrRef, vm: &VirtualMachine) -> PyResult<i32> { self.extract_char(character, vm).map(|c| { c.to_char().map_or(0, |c| { - (if self.unic_version.major > 3 { + (if self.modern { BidiMirrored::for_char(c) } else { cold_path(); @@ -418,7 +395,7 @@ mod unicodedata { self.extract_char(character, vm).map(|c| { c.to_char() .and_then(|c| { - if self.unic_version.major > 3 { + if self.modern { Some(CanonicalCombiningClass::for_char(c)) } else { cold_path(); @@ -442,7 +419,7 @@ mod unicodedata { // For 3.2.0, we use the original decomp for compatibility while ignoring the update. // // Finally, we don't have to do anything for the latest UCD as it's already updated. - if self.unic_version.major == 3 + if self.modern && let Some((_, original)) = DECOMP_UPDATES .iter() .find(|&&(codep, _original)| codep == ch as u32) @@ -485,7 +462,7 @@ mod unicodedata { fn numeric_type_matches(&self, ch: CodePoint, expected: &[NumericType]) -> Option<char> { let ch = ch.to_char()?; - let actual = if self.unic_version.major > 3 { + let actual = if self.modern { NumericType::for_char(ch) } else { cold_path(); @@ -506,7 +483,7 @@ mod unicodedata { let expected = [NumericType::Decimal, NumericType::Digit]; self.numeric_type_matches(ch, &expected) .and_then(|ch| { - let value = lookup_numeric_val(ch, UNICODE_VERSION)?; + let value = lookup_numeric_val(ch, true)?; (value.trunc() == value).then(|| vm.ctx.new_int(value as u64).into()) }) .or_else(|| default.present()) @@ -525,7 +502,7 @@ mod unicodedata { let expected = [NumericType::Decimal]; self.numeric_type_matches(ch, &expected) .and_then(|ch| { - let value = lookup_numeric_val(ch, self.unic_version)?; + let value = lookup_numeric_val(ch, self.modern)?; (value.trunc() == value).then(|| vm.ctx.new_int(value as u64).into()) }) .or_else(|| default.present()) @@ -544,8 +521,7 @@ mod unicodedata { let expected = &NumericType::ALL_VALUES[1..]; self.numeric_type_matches(ch, expected) .and_then(|ch| { - lookup_numeric_val(ch, self.unic_version) - .map(|value| vm.ctx.new_float(value).into()) + lookup_numeric_val(ch, self.modern).map(|value| vm.ctx.new_float(value).into()) }) .or_else(|| default.present()) .map(Option::Some) @@ -554,24 +530,31 @@ mod unicodedata { #[pygetset] fn unidata_version(&self) -> String { - self.unic_version.to_string() + if self.modern { + format!( + "{}.{}.{}", + char::UNICODE_VERSION.0, + char::UNICODE_VERSION.1, + char::UNICODE_VERSION.2 + ) + } else { + "3.2.0".into() + } } } #[pyattr] fn ucd_3_2_0(vm: &VirtualMachine) -> PyRef<Ucd> { - Ucd { - unic_version: UnicodeVersion { - major: 3, - minor: 2, - micro: 0, - }, - } - .into_ref(&vm.ctx) + Ucd::new(false).into_ref(&vm.ctx) } #[pyattr] fn unidata_version(_vm: &VirtualMachine) -> String { - UNICODE_VERSION.to_string() + format!( + "{}.{}.{}", + char::UNICODE_VERSION.0, + char::UNICODE_VERSION.1, + char::UNICODE_VERSION.2 + ) } } From c57a986c7c6afa250965f4e0f191de5d7c46e2a2 Mon Sep 17 00:00:00 2001 From: Bas Schoenmaeckers <7943856+bschoenmaeckers@users.noreply.github.com> Date: Thu, 25 Jun 2026 07:00:32 +0200 Subject: [PATCH 140/339] Add remaining float functions to c-apo (#8157) --- crates/capi/src/floatobject.rs | 33 +++++++++++++++++++++++++++++++++ crates/vm/src/builtins/float.rs | 2 +- crates/vm/src/builtins/mod.rs | 1 + 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/crates/capi/src/floatobject.rs b/crates/capi/src/floatobject.rs index f1bb07810..831ca32af 100644 --- a/crates/capi/src/floatobject.rs +++ b/crates/capi/src/floatobject.rs @@ -1,6 +1,8 @@ use crate::object::define_py_check; use crate::{PyObject, pystate::with_vm}; use core::ffi::c_double; +use core::ptr::NonNull; +use rustpython_vm::AsObject; use rustpython_vm::builtins::PyFloat; define_py_check!(fn PyFloat_Check, types.float_type); @@ -24,6 +26,37 @@ pub unsafe extern "C" fn PyFloat_AsDouble(obj: *mut PyObject) -> c_double { }) } +#[unsafe(no_mangle)] +pub extern "C" fn PyFloat_GetMax() -> c_double { + c_double::MAX +} + +#[unsafe(no_mangle)] +pub extern "C" fn PyFloat_GetMin() -> c_double { + c_double::MIN_POSITIVE +} + +#[unsafe(no_mangle)] +pub extern "C" fn PyFloat_GetInfo() -> *mut PyObject { + with_vm(|vm| { + vm.sys_module + .as_object() + .get_attr("float_info", vm) + .map(|obj| obj.into_raw().as_ptr()) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyFloat_FromString(obj: *mut PyObject) -> *mut PyObject { + with_vm(|vm| { + let obj = NonNull::new(obj) + .ok_or_else(|| vm.new_type_error("float() argument must be a string or a number"))?; + let obj = unsafe { obj.as_ref() }.to_owned(); + let float = rustpython_vm::builtins::parse_float_from_string(obj, vm)?; + Ok(vm.ctx.new_float(float)) + }) +} + #[cfg(false)] mod tests { use core::f64::consts::PI; diff --git a/crates/vm/src/builtins/float.rs b/crates/vm/src/builtins/float.rs index 5a12c4cbf..36846640e 100644 --- a/crates/vm/src/builtins/float.rs +++ b/crates/vm/src/builtins/float.rs @@ -205,7 +205,7 @@ impl Constructor for PyFloat { } } -fn float_from_string(val: PyObjectRef, vm: &VirtualMachine) -> PyResult<f64> { +pub fn float_from_string(val: PyObjectRef, vm: &VirtualMachine) -> PyResult<f64> { let (bytearray, buffer, buffer_lock, mapped_string); let b = if let Some(s) = val.downcast_ref::<PyStr>() { use crate::common::str::PyKindStr; diff --git a/crates/vm/src/builtins/mod.rs b/crates/vm/src/builtins/mod.rs index 27b52dacb..eba5af366 100644 --- a/crates/vm/src/builtins/mod.rs +++ b/crates/vm/src/builtins/mod.rs @@ -98,6 +98,7 @@ pub(crate) mod union_; pub use union_::{PyUnion, make_union}; pub(crate) mod descriptor; +pub use float::float_from_string as parse_float_from_string; pub use float::try_to_bigint as try_f64_to_bigint; pub use int::try_to_float as try_bigint_to_f64; From c76190ad36a0a9699fd0c202fae35fc509bd4d96 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jun 2026 14:00:42 +0900 Subject: [PATCH 141/339] Bump taiki-e/install-action from 2.81.8 to 2.81.11 (#8147) Bumps [taiki-e/install-action](https://github.com/taiki-e/install-action) from 2.81.8 to 2.81.11. - [Release notes](https://github.com/taiki-e/install-action/releases) - [Changelog](https://github.com/taiki-e/install-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/taiki-e/install-action/compare/0631aa6515c7d545823c67cfae7ef4fc7f490154...15449e3094499af05d8d964a1c884208e4b8b595) --- updated-dependencies: - dependency-name: taiki-e/install-action dependency-version: 2.81.11 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/cron-ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cron-ci.yaml b/.github/workflows/cron-ci.yaml index 5721a6426..4e5ed04ea 100644 --- a/.github/workflows/cron-ci.yaml +++ b/.github/workflows/cron-ci.yaml @@ -33,7 +33,7 @@ jobs: - uses: dtolnay/rust-toolchain@stable - - uses: taiki-e/install-action@0631aa6515c7d545823c67cfae7ef4fc7f490154 # v2.81.8 + - uses: taiki-e/install-action@15449e3094499af05d8d964a1c884208e4b8b595 # v2.81.11 with: tool: cargo-llvm-cov From f81c3202819723c02222f6c2fa7eb0292c87deec Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Thu, 25 Jun 2026 08:21:11 +0300 Subject: [PATCH 142/339] Move some of free standing functions to be ir::Blocks methods (part 2) (#8155) * mark_except_handlers * mark_warm * mark_cold * push_cold_blocks_to_end * check_cfg * jump thread * basicblock_add_jump * convert_pseudo_conditional_jumps * normalize_jumps_in_block * basicblock_inline_small_or_no_lineno_blocks * inline_small_or_no_lineno_blocks * basicblock_remove_redundant_nops * remove_redundant_nops * no_redundant_nops * remove_redundant_jumps * no_redundant_jumps * remove_redundant_nops_and_jumps * blocks_new_block * clippy --- crates/codegen/src/ir.rs | 1428 +++++++++++++++++++------------------- 1 file changed, 715 insertions(+), 713 deletions(-) diff --git a/crates/codegen/src/ir.rs b/crates/codegen/src/ir.rs index 5728ddfbe..548b57d85 100644 --- a/crates/codegen/src/ir.rs +++ b/crates/codegen/src/ir.rs @@ -1330,7 +1330,7 @@ impl Blocks { fn copy_basicblock(&mut self, block_idx: BlockIdx) -> crate::InternalResult<BlockIdx> { debug_assert!(bb_no_fallthrough(&self[block_idx])); - let result = blocks_new_block(self)?; + let result = self.blocks_new_block()?; self.basicblock_append_block_instructions(result, block_idx)?; Ok(result) } @@ -1464,19 +1464,19 @@ impl Blocks { AnyInstruction::Real( Instruction::PopJumpIfNotNone { .. } | Instruction::PopJumpIfNone { .. }, ) if matches!(target.instr.into(), AnyOpcode::Pseudo(PseudoOpcode::Jump)) - && jump_thread(self, block_idx, i, &target, inst.instr)? => + && self.jump_thread(block_idx, i, &target, inst.instr)? => { continue; } AnyInstruction::Real(Instruction::PopJumpIfFalse { .. }) if matches!(target.instr.into(), AnyOpcode::Pseudo(PseudoOpcode::Jump)) - && jump_thread(self, block_idx, i, &target, inst.instr)? => + && self.jump_thread(block_idx, i, &target, inst.instr)? => { continue; } AnyInstruction::Real(Instruction::PopJumpIfTrue { .. }) if matches!(target.instr.into(), AnyOpcode::Pseudo(PseudoOpcode::Jump)) - && jump_thread(self, block_idx, i, &target, inst.instr)? => + && self.jump_thread(block_idx, i, &target, inst.instr)? => { continue; } @@ -1487,7 +1487,7 @@ impl Blocks { let opcode = pseudo.into(); match target.instr.pseudo().map(Into::into) { Some(PseudoOpcode::Jump) - if jump_thread(self, block_idx, i, &target, opcode)? => + if self.jump_thread(block_idx, i, &target, opcode)? => { continue; } @@ -1495,7 +1495,7 @@ impl Blocks { if matches!( opcode, AnyInstruction::Pseudo(PseudoInstruction::JumpIfFalse { .. }) - ) && jump_thread(self, block_idx, i, &target, opcode)? => + ) && self.jump_thread(block_idx, i, &target, opcode)? => { continue; } @@ -1503,12 +1503,12 @@ impl Blocks { if matches!( opcode, AnyInstruction::Pseudo(PseudoInstruction::JumpIfTrue { .. }) - ) && jump_thread(self, block_idx, i, &target, opcode)? => + ) && self.jump_thread(block_idx, i, &target, opcode)? => { continue; } Some(PseudoOpcode::JumpIfFalse | PseudoOpcode::JumpIfTrue) => { - let next = self[inst.target.idx()].next; + let next = self[inst.target].next; debug_assert!(next != BlockIdx::NULL); debug_assert!(next != inst.target); self[block_idx].instructions[i].target = next; @@ -1521,12 +1521,17 @@ impl Blocks { PseudoInstruction::Jump { .. } | PseudoInstruction::JumpNoInterrupt { .. }, ) => match target.instr.into() { AnyOpcode::Pseudo(PseudoOpcode::Jump) - if jump_thread(self, block_idx, i, &target, PseudoOpcode::Jump.into())? => + if self.jump_thread( + block_idx, + i, + &target, + PseudoOpcode::Jump.into(), + )? => { continue; } AnyOpcode::Pseudo(PseudoOpcode::JumpNoInterrupt) - if jump_thread(self, block_idx, i, &target, inst.instr)? => + if self.jump_thread(block_idx, i, &target, inst.instr)? => { continue; } @@ -2007,7 +2012,7 @@ impl Blocks { let mut block_idx = BlockIdx::new(0); while block_idx != BlockIdx::NULL { - basicblock_remove_redundant_nops(self, block_idx)?; + self.basicblock_remove_redundant_nops(block_idx)?; if is_label(self[block_idx].cpython_label) { instr = None; } @@ -2140,7 +2145,7 @@ impl Blocks { let mut current = BlockIdx(0); while current != BlockIdx::NULL { self[current].visited = true; - normalize_jumps_in_block(self, current)?; + self.normalize_jumps_in_block(current)?; current = self[current].next; } @@ -2293,13 +2298,687 @@ impl Blocks { block_idx = next_block; } - let res = remove_redundant_nops(self)?; + let res = self.remove_redundant_nops()?; #[cfg(debug_assertions)] - assert!(no_redundant_nops(self)); + assert!(self.no_redundant_nops()); Ok(res) } + + /// Mark exception handler target blocks. + /// flowgraph.c mark_except_handlers + #[allow(clippy::unnecessary_wraps)] + pub(crate) fn mark_except_handlers(&mut self) -> crate::InternalResult<()> { + #[cfg(debug_assertions)] + { + let mut block_idx = BlockIdx(0); + while block_idx != BlockIdx::NULL { + assert!(!self[block_idx].except_handler); + block_idx = self[block_idx].next; + } + } + + let mut block_idx = BlockIdx(0); + while block_idx != BlockIdx::NULL { + let next = self[block_idx].next; + let instr_count = self[block_idx].instruction_used; + for i in 0..instr_count { + let instr = self[block_idx].instructions[i]; + if is_block_push(&instr) { + debug_assert!(instr.target != BlockIdx::NULL); + self[instr.target].except_handler = true; + } + } + block_idx = next; + } + Ok(()) + } + + /// flowgraph.c mark_cold (two-pass to match CPython). + /// + /// Phase 1 (mark_warm): propagate "warm" from entry via fall-through and + /// jump targets. CPython asserts while visiting warm blocks that they are not + /// exception handlers. + /// + /// Phase 2 (mark_cold): propagate "cold" from except_handler blocks via + /// forward edges. Blocks reached only via runtime exception dispatch are + /// marked cold and pushed to the end by push_cold_blocks_to_end. + /// + /// Blocks reached by neither phase remain `cold=false`. They are typically + /// empty unreachable placeholders left by remove_unreachable; they stay in + /// their original chain position (e.g. between entry and the post-try + /// continuation for a nested try/except whose inner_end was emptied by + /// optimize_cfg). This matches CPython's behavior and is necessary for + /// optimize_load_fast to terminate fall-through at those placeholders. + /// flowgraph.c mark_warm + fn mark_warm(&mut self) -> crate::InternalResult<()> { + let mut stack = self.make_cfg_traversal_stack()?; + stack.push(BlockIdx(0)); + self[0].visited = true; + while let Some(block_idx) = stack.pop() { + debug_assert!(!self[block_idx].except_handler); + self[block_idx].warm = true; + + let next = self[block_idx].next; + if next != BlockIdx::NULL && bb_has_fallthrough(&self[block_idx]) && !self[next].visited + { + stack.push(next); + self[next].visited = true; + } + + let instr_count = self[block_idx].instruction_used; + for i in 0..instr_count { + let instr = self[block_idx].instructions[i]; + if is_jump(&instr) { + let target = instr.target; + debug_assert!(target != BlockIdx::NULL); + if !self[target].visited { + stack.push(target); + self[target].visited = true; + } + } + } + } + Ok(()) + } + + fn mark_cold(&mut self) -> crate::InternalResult<()> { + let mut block_idx = BlockIdx(0); + while block_idx != BlockIdx::NULL { + let block = &mut self[block_idx]; + debug_assert!(!block.cold); + debug_assert!(!block.warm); + block_idx = block.next; + } + + self.mark_warm()?; + + let mut cold_stack = self.make_cfg_traversal_stack()?; + block_idx = BlockIdx(0); + while block_idx != BlockIdx::NULL { + let next = self[block_idx].next; + let block = &self[block_idx]; + if block.except_handler { + debug_assert!(!block.warm); + cold_stack.push(block_idx); + self[block_idx].visited = true; + } + block_idx = next; + } + + while let Some(block_idx) = cold_stack.pop() { + self[block_idx].cold = true; + let next = self[block_idx].next; + if next != BlockIdx::NULL + && bb_has_fallthrough(&self[block_idx]) + && !self[next].warm + && !self[next].visited + { + cold_stack.push(next); + self[next].visited = true; + } + + let instr_count = self[block_idx].instruction_used; + for i in 0..instr_count { + let instr = self[block_idx].instructions[i]; + if is_jump(&instr) { + debug_assert_eq!(i, instr_count - 1); + let target = instr.target; + debug_assert!(target != BlockIdx::NULL); + if !self[target].warm && !self[target].visited { + cold_stack.push(target); + self[target].visited = true; + } + } + } + } + Ok(()) + } + + /// flowgraph.c push_cold_blocks_to_end + fn push_cold_blocks_to_end(&mut self) -> crate::InternalResult<()> { + if self[0].next == BlockIdx::NULL { + return Ok(()); + } + + self.mark_cold()?; + let mut next_label = get_max_label(self) + 1; + + // If a cold block falls through to a warm block, add an explicit jump + let mut block_idx = BlockIdx(0); + while block_idx != BlockIdx::NULL { + let next = self[block_idx].next; + if self[block_idx].cold + && bb_has_fallthrough(&self[block_idx]) + && next != BlockIdx::NULL + && self[next].warm + { + let explicit_jump = self.blocks_new_block()?; + if !is_label(self[next].cpython_label) { + self[next].cpython_label = InstructionSequenceLabel::from_index(next_label); + next_label += 1; + } + let jump_label = self[next].cpython_label; + debug_assert!(is_label(jump_label)); + basicblock_addop( + &mut self[explicit_jump], + InstructionInfo { + instr: PseudoOpcode::JumpNoInterrupt.into(), + arg: instruction_sequence_label_oparg(jump_label), + target: BlockIdx::NULL, + location: SourceLocation::default(), + end_location: SourceLocation::default(), + except_handler: None, + lineno_override: Some(NO_LOCATION_OVERRIDE), + }, + )?; + self[explicit_jump].cold = true; + self[explicit_jump].next = next; + self[explicit_jump].predecessors = 1; + self[block_idx].next = explicit_jump; + let target = self[explicit_jump].next; + let last = basicblock_last_instr_mut(&mut self[explicit_jump]) + .expect("missing explicit jump"); + last.target = target; + } + block_idx = self[block_idx].next; + } + + assert!(!self[0].cold); + let mut cold_blocks: BlockIdx = BlockIdx::NULL; + let mut cold_blocks_tail: BlockIdx = BlockIdx::NULL; + let mut block_idx = BlockIdx(0); + + while self[block_idx].next != BlockIdx::NULL { + debug_assert!(!self[block_idx].cold); + while self[block_idx].next != BlockIdx::NULL && !self[self[block_idx].next].cold { + block_idx = self[block_idx].next; + } + + if self[block_idx].next == BlockIdx::NULL { + break; + } + + debug_assert!(!self[block_idx].cold); + debug_assert!(self[self[block_idx].next].cold); + + let mut block_end = self[block_idx].next; + while self[block_end].next != BlockIdx::NULL && self[self[block_end].next].cold { + block_end = self[block_end].next; + } + + debug_assert!(self[block_end].cold); + debug_assert!( + self[block_end].next == BlockIdx::NULL || !self[self[block_end].next].cold + ); + + if cold_blocks == BlockIdx::NULL { + cold_blocks = self[block_idx].next; + } else { + self[cold_blocks_tail].next = self[block_idx].next; + } + + cold_blocks_tail = block_end; + self[block_idx].next = self[block_end].next; + self[block_end].next = BlockIdx::NULL; + } + + debug_assert!(self[block_idx].next == BlockIdx::NULL); + self[block_idx].next = cold_blocks; + + if cold_blocks != BlockIdx::NULL { + self.remove_redundant_nops_and_jumps()?; + } + Ok(()) + } + + /// flowgraph.c check_cfg + fn check_cfg(&self) -> crate::InternalResult<()> { + let mut block_idx = BlockIdx(0); + while block_idx != BlockIdx::NULL { + let block = &self[block_idx]; + for i in 0..block.instruction_used { + let opcode = block.instructions[i].instr; + debug_assert!(!opcode.is_assembler()); + if opcode.is_terminator() && i != block.instruction_used - 1 { + return Err(InternalError::MalformedControlFlowGraph); + } + } + block_idx = block.next; + } + Ok(()) + } + + /// flowgraph.c jump_thread + fn jump_thread( + &mut self, + block_idx: BlockIdx, + instr_idx: usize, + target: &InstructionInfo, + opcode: AnyInstruction, + ) -> crate::InternalResult<bool> { + debug_assert!(is_jump(&self[block_idx].instructions[instr_idx])); + debug_assert!(is_jump(target)); + debug_assert_eq!(instr_idx + 1, self[block_idx].instruction_used); + debug_assert!(target.target != BlockIdx::NULL); + if self[block_idx].instructions[instr_idx].target != target.target { + set_to_nop(&mut self[block_idx].instructions[instr_idx]); + self.basicblock_add_jump(block_idx, opcode, target.target, target)?; + return Ok(true); + } + Ok(false) + } + + /// flowgraph.c basicblock_add_jump + fn basicblock_add_jump( + &mut self, + block_idx: BlockIdx, + instr: AnyInstruction, + target: BlockIdx, + loc_source: &InstructionInfo, + ) -> crate::InternalResult<()> { + let last = basicblock_last_instr(&self[block_idx]); + if last.is_some_and(is_jump) { + return Err(InternalError::MalformedControlFlowGraph); + } + debug_assert!(target != BlockIdx::NULL); + let label = self[target].cpython_label; + debug_assert!(is_label(label)); + let arg = instruction_sequence_label_oparg(label); + let block = &mut self[block_idx]; + basicblock_addop( + block, + InstructionInfo { + instr, + arg, + target: BlockIdx::NULL, + location: loc_source.location, + end_location: loc_source.end_location, + except_handler: None, + lineno_override: loc_source.lineno_override, + }, + )?; + let last = basicblock_last_instr_mut(block).expect("missing jump"); + debug_assert!(match (last.instr, instr) { + (AnyInstruction::Real(last), AnyInstruction::Real(opcode)) => + last.as_opcode() == opcode.as_opcode(), + (AnyInstruction::Pseudo(last), AnyInstruction::Pseudo(opcode)) => + last.as_opcode() == opcode.as_opcode(), + _ => false, + }); + last.target = target; + Ok(()) + } + + /// flowgraph.c convert_pseudo_conditional_jumps + fn convert_pseudo_conditional_jumps(&mut self) -> crate::InternalResult<()> { + let mut block_idx = BlockIdx(0); + while block_idx != BlockIdx::NULL { + let next = self[block_idx].next; + let block = &mut self[block_idx]; + let mut i = 0; + while i < block.instruction_used { + let instr = block.instructions[i]; + let opcode = instr.instr; + if matches!( + opcode.pseudo_opcode(), + Some(PseudoOpcode::JumpIfFalse | PseudoOpcode::JumpIfTrue) + ) { + debug_assert_eq!(i, block.instruction_used - 1); + block.instructions[i].instr = + if matches!(opcode.pseudo_opcode(), Some(PseudoOpcode::JumpIfFalse)) { + Opcode::PopJumpIfFalse + } else { + Opcode::PopJumpIfTrue + } + .into(); + + let location = instr.location; + let end_location = instr.end_location; + let except_handler = instr.except_handler; + let lineno_override = instr.lineno_override; + let copy = InstructionInfo { + instr: Opcode::Copy.into(), + arg: OpArg::new(1), + target: BlockIdx::NULL, + location, + end_location, + except_handler, + lineno_override, + }; + basicblock_insert_instruction(block, i, copy)?; + i += 1; + + let to_bool = InstructionInfo { + instr: Opcode::ToBool.into(), + arg: OpArg::new(0), + target: BlockIdx::NULL, + location, + end_location, + except_handler, + lineno_override, + }; + basicblock_insert_instruction(block, i, to_bool)?; + i += 1; + } + i += 1; + } + block_idx = next; + } + Ok(()) + } + + /// flowgraph.c normalize_jumps_in_block + fn normalize_jumps_in_block(&mut self, block_idx: BlockIdx) -> crate::InternalResult<()> { + let Some(last_ins) = basicblock_last_instr(&self[block_idx]).copied() else { + return Ok(()); + }; + if !is_conditional_jump_opcode(last_ins.instr) { + return Ok(()); + } + debug_assert!(!last_ins.instr.is_assembler()); + + debug_assert!(last_ins.target != BlockIdx::NULL); + let is_forward = !self[last_ins.target].visited; + + if is_forward { + // Insert NOT_TAKEN after forward conditional jump. + let not_taken = InstructionInfo { + instr: Opcode::NotTaken.into(), + arg: OpArg::new(0), + target: BlockIdx::NULL, + location: last_ins.location, + end_location: last_ins.end_location, + except_handler: None, + lineno_override: last_ins.lineno_override, + }; + basicblock_addop(&mut self[block_idx], not_taken)?; + return Ok(()); + } + + let reversed_opcode = match last_ins.instr.real_opcode() { + Some(Opcode::PopJumpIfNotNone) => Opcode::PopJumpIfNone.into(), + Some(Opcode::PopJumpIfNone) => Opcode::PopJumpIfNotNone.into(), + Some(Opcode::PopJumpIfFalse) => Opcode::PopJumpIfTrue.into(), + Some(Opcode::PopJumpIfTrue) => Opcode::PopJumpIfFalse.into(), + _ => unreachable!("conditional jump has reverse opcode"), + }; + + // Transform 'conditional jump T' to 'reversed_jump b_next' followed by + // 'jump_backwards T'. + let loc = last_ins.location; + let end_loc = last_ins.end_location; + + let target = last_ins.target; + let backwards_jump_idx = self.blocks_new_block()?; + basicblock_addop( + &mut self[backwards_jump_idx], + InstructionInfo { + instr: Opcode::NotTaken.into(), + arg: OpArg::new(0), + target: BlockIdx::NULL, + location: loc, + end_location: end_loc, + except_handler: None, + lineno_override: last_ins.lineno_override, + }, + )?; + self.basicblock_add_jump( + backwards_jump_idx, + PseudoOpcode::Jump.into(), + target, + &last_ins, + )?; + self[backwards_jump_idx].start_depth = self[target].start_depth; + + let old_next = self[block_idx].next; + debug_assert!(old_next != BlockIdx::NULL); + + let last_mut = basicblock_last_instr_mut(&mut self[block_idx]).unwrap(); + last_mut.instr = reversed_opcode; + last_mut.target = old_next; + + self[backwards_jump_idx].cold = self[block_idx].cold; + self[backwards_jump_idx].next = old_next; + self[block_idx].next = backwards_jump_idx; + Ok(()) + } + + /// flowgraph.c basicblock_inline_small_or_no_lineno_blocks + fn basicblock_inline_small_or_no_lineno_blocks( + &mut self, + block_idx: BlockIdx, + ) -> crate::InternalResult<bool> { + let Some(last) = basicblock_last_instr(&self[block_idx]).copied() else { + return Ok(false); + }; + + if !last.instr.is_unconditional_jump() { + return Ok(false); + } + + let target = last.target; + debug_assert!(target != BlockIdx::NULL); + let small_exit_block = + basicblock_exits_scope(&self[target]) && self[target].instruction_used <= MAX_COPY_SIZE; + let no_lineno_no_fallthrough = + basicblock_has_no_lineno(&self[target]) && !bb_has_fallthrough(&self[target]); + if small_exit_block || no_lineno_no_fallthrough { + debug_assert!(is_jump(&last)); + let removed_jump_opcode = last.instr; + let last = basicblock_last_instr_mut(&mut self[block_idx]) + .expect("non-empty block has last instruction"); + set_to_nop(last); + self.basicblock_append_block_instructions(block_idx, target)?; + if no_lineno_no_fallthrough { + let last = basicblock_last_instr_mut(&mut self[block_idx]).unwrap(); + if last.instr.is_unconditional_jump() + && matches!( + removed_jump_opcode.into(), + AnyOpcode::Pseudo(PseudoOpcode::Jump) + ) + { + last.instr = PseudoOpcode::Jump.into(); + } + } + self[target].predecessors -= 1; + return Ok(true); + } + Ok(false) + } + + /// flowgraph.c inline_small_or_no_lineno_blocks + fn inline_small_or_no_lineno_blocks(&mut self) -> crate::InternalResult<bool> { + loop { + let mut changes = false; + let mut current = BlockIdx(0); + while current != BlockIdx::NULL { + let next = self[current].next; + let res = self.basicblock_inline_small_or_no_lineno_blocks(current)?; + if res { + changes = true; + } + + current = next; + } + if !changes { + return Ok(changes); + } + } + } + + /// flowgraph.c basicblock_remove_redundant_nops + #[allow(clippy::unnecessary_wraps)] + fn basicblock_remove_redundant_nops( + &mut self, + block_idx: BlockIdx, + ) -> crate::InternalResult<usize> { + let mut dest = 0; + let mut prev_lineno = -1i32; + let instr_count = self[block_idx].instruction_used; + + for src in 0..instr_count { + let instr = self[block_idx].instructions[src]; + let lineno = instruction_lineno(&instr); + + if matches!(instr.instr.real(), Some(Instruction::Nop)) { + if lineno < 0 { + continue; + } + if prev_lineno == lineno { + continue; + } + if src < instr_count - 1 { + let next_lineno = instruction_lineno(&self[block_idx].instructions[src + 1]); + if next_lineno == lineno { + continue; + } + if next_lineno < 0 { + instr_set_loc( + &mut self[block_idx].instructions[src + 1], + instr.location, + instr.end_location, + instr.lineno_override, + ); + continue; + } + } else { + let next = next_nonempty_block(self, self[block_idx].next); + if next != BlockIdx::NULL { + let mut next_loc = no_linetable_location(); + let mut next_i = 0; + while next_i < self[next].instruction_used { + let instr = self[next].instructions[next_i]; + if matches!(instr.instr.real(), Some(Instruction::Nop)) + && instruction_lineno(&instr) < 0 + { + next_i += 1; + continue; + } + next_loc = instruction_linetable_location(&instr); + break; + } + if lineno == next_loc.line { + continue; + } + } + } + } + + if dest != src { + self[block_idx].instructions[dest] = self[block_idx].instructions[src]; + } + dest += 1; + prev_lineno = lineno; + } + + debug_assert!(dest <= instr_count); + let num_removed = instr_count - dest; + self[block_idx].instruction_used = dest; + Ok(num_removed) + } + + /// flowgraph.c remove_redundant_nops + #[allow(clippy::unnecessary_wraps)] + fn remove_redundant_nops(&mut self) -> crate::InternalResult<usize> { + let mut changes = 0; + let mut current = BlockIdx(0); + while current != BlockIdx::NULL { + let next = self[current].next; + let change = self.basicblock_remove_redundant_nops(current)?; + changes += change; + current = next; + } + Ok(changes) + } + + /// flowgraph.c no_redundant_nops + #[cfg(debug_assertions)] + fn no_redundant_nops(&mut self) -> bool { + matches!(self.remove_redundant_nops(), Ok(0)) + } + + /// flowgraph.c remove_redundant_jumps + fn remove_redundant_jumps(&mut self) -> crate::InternalResult<usize> { + let mut changes = 0; + let mut current = BlockIdx(0); + while current != BlockIdx::NULL { + let Some(last) = basicblock_last_instr(&self[current]).copied() else { + current = self[current].next; + continue; + }; + + debug_assert!(!last.instr.is_assembler()); + if last.instr.is_unconditional_jump() { + let jump_target = next_nonempty_block(self, last.target); + if jump_target == BlockIdx::NULL { + return Err(InternalError::MalformedControlFlowGraph); + } + let next = next_nonempty_block(self, self[current].next); + if jump_target == next { + changes += 1; + let last = basicblock_last_instr_mut(&mut self[current]).unwrap(); + set_to_nop(last); + } + } + current = self[current].next; + } + Ok(changes) + } + + /// flowgraph.c no_redundant_jumps + #[cfg(debug_assertions)] + fn no_redundant_jumps(&self) -> bool { + let mut current = BlockIdx(0); + while current != BlockIdx::NULL { + let block = &self[current]; + if let Some(last) = basicblock_last_instr(block) + && last.instr.is_unconditional_jump() + { + let next = next_nonempty_block(self, block.next); + let jump_target = next_nonempty_block(self, last.target); + if jump_target == next { + assert!(next != BlockIdx::NULL); + if instruction_lineno(last) == instruction_lineno(&self[next].instructions[0]) { + assert_ne!( + instruction_lineno(last), + instruction_lineno(&self[next].instructions[0]), + "redundant jump has same line as fallthrough target" + ); + return false; + } + } + } + current = block.next; + } + true + } + + fn remove_redundant_nops_and_jumps(&mut self) -> crate::InternalResult<()> { + loop { + // Convergence is guaranteed because the number of redundant jumps and + // nops only decreases. + let removed_nops = self.remove_redundant_nops()?; + let removed_jumps = self.remove_redundant_jumps()?; + if removed_nops + removed_jumps == 0 { + break; + } + } + Ok(()) + } + + fn blocks_new_block(&mut self) -> crate::InternalResult<BlockIdx> { + self.try_reserve(1) + .map_err(|_| InternalError::MalformedControlFlowGraph)?; + let block_idx = BlockIdx( + self.len() + .to_u32() + .ok_or(InternalError::MalformedControlFlowGraph)?, + ); + self.push(Block::default()); + Ok(block_idx) + } } impl From<Vec<Block>> for Blocks { @@ -2825,7 +3504,7 @@ fn optimize_code_unit( // Phase 1: _PyCfg_OptimizeCodeUnit (flowgraph.c) *blocks = cfg_from_instruction_sequence(instr_sequence)?; translate_jump_labels_to_targets(blocks)?; - mark_except_handlers(blocks)?; + blocks.mark_except_handlers()?; label_exception_targets(blocks)?; optimize_cfg(metadata, blocks, metadata.firstlineno)?; blocks.remove_unused_consts(&mut metadata.consts)?; @@ -2834,7 +3513,7 @@ fn optimize_code_unit( // later jump normalization / block reordering can create adjacencies // that never exist at this stage in flowgraph.c. blocks.insert_superinstructions()?; - push_cold_blocks_to_end(blocks)?; + blocks.push_cold_blocks_to_end()?; // CPython resolves line numbers again after cold-block extraction. blocks.resolve_line_numbers(metadata.firstlineno)?; Ok(()) @@ -2849,8 +3528,8 @@ fn optimize_cfg( // CPython optimize_cfg() starts with check_cfg() and raises // SystemError if a jump or scope exit is not the last instruction in // its block. - check_cfg(blocks)?; - inline_small_or_no_lineno_blocks(blocks)?; + blocks.check_cfg()?; + blocks.inline_small_or_no_lineno_blocks()?; // CPython does not re-run instruction-sequence label-map/CFG conversion // after this point. Unreferenced label blocks left by jump inlining // remain block boundaries and can preserve line-marker NOPs. @@ -2873,9 +3552,9 @@ fn optimize_cfg( // redundant NOP/jump chains before _PyCfg_OptimizeCodeUnit() prunes // unused constants. blocks.remove_unreachable()?; - remove_redundant_nops_and_jumps(blocks)?; + blocks.remove_redundant_nops_and_jumps()?; #[cfg(debug_assertions)] - assert!(no_redundant_jumps(blocks)); + assert!(blocks.no_redundant_jumps()); Ok(()) } @@ -2885,7 +3564,7 @@ fn optimized_cfg_to_instruction_sequence( blocks: &mut Blocks, ) -> crate::InternalResult<(u32, usize, InstructionSequence)> { // Phase 2: _PyCfg_OptimizedCfgToInstructionSequence (flowgraph.c) - convert_pseudo_conditional_jumps(blocks)?; + blocks.convert_pseudo_conditional_jumps()?; let max_stackdepth = blocks.calculate_stackdepth()?; debug_assert!(!is_generator(flags) || max_stackdepth != 0); let nlocalsplus = prepare_localsplus(metadata, blocks, flags)?; @@ -2894,7 +3573,7 @@ fn optimized_cfg_to_instruction_sequence( convert_pseudo_ops(blocks)?; blocks.normalize_jumps()?; #[cfg(debug_assertions)] - assert!(no_redundant_jumps(blocks)); + assert!(blocks.no_redundant_jumps()); // optimize_load_fast: after normalize_jumps blocks.optimize_load_fast()?; @@ -4705,10 +5384,10 @@ impl CodeInfo { self.debug_block_dump(), )); translate_jump_labels_to_targets(&mut self.blocks)?; - mark_except_handlers(&mut self.blocks)?; + self.blocks.mark_except_handlers()?; label_exception_targets(&mut self.blocks)?; - check_cfg(&self.blocks)?; - inline_small_or_no_lineno_blocks(&mut self.blocks)?; + self.blocks.check_cfg()?; + self.blocks.inline_small_or_no_lineno_blocks()?; trace.push(( "after_inline_small_or_no_lineno_blocks".to_owned(), self.debug_block_dump(), @@ -4734,9 +5413,11 @@ impl CodeInfo { )); self.blocks.remove_redundant_nops_and_pairs()?; self.blocks.remove_unreachable()?; - remove_redundant_nops_and_jumps(&mut self.blocks)?; + self.blocks.remove_redundant_nops_and_jumps()?; + #[cfg(debug_assertions)] - assert!(no_redundant_jumps(&self.blocks)); + assert!(self.blocks.no_redundant_jumps()); + self.blocks .remove_unused_consts(&mut self.metadata.consts)?; trace.push(( @@ -4747,7 +5428,7 @@ impl CodeInfo { let nparams = self.nparams; add_checks_for_loads_of_uninitialized_variables(&mut self.blocks, nlocals, nparams)?; self.blocks.insert_superinstructions()?; - push_cold_blocks_to_end(&mut self.blocks)?; + self.blocks.push_cold_blocks_to_end()?; trace.push(( "after_push_cold_before_chain_reorder".to_owned(), self.debug_block_dump(), @@ -4764,7 +5445,7 @@ impl CodeInfo { self.debug_block_dump(), )); - convert_pseudo_conditional_jumps(&mut self.blocks)?; + self.blocks.convert_pseudo_conditional_jumps()?; trace.push(( "after_convert_pseudo_conditional_jumps".to_owned(), self.debug_block_dump(), @@ -4779,8 +5460,10 @@ impl CodeInfo { )); self.blocks.normalize_jumps()?; + #[cfg(debug_assertions)] - assert!(no_redundant_jumps(&self.blocks)); + assert!(self.blocks.no_redundant_jumps()); + trace.push(("after_normalize_jumps".to_owned(), self.debug_block_dump())); self.blocks.optimize_load_fast()?; trace.push(( @@ -5317,312 +6000,6 @@ fn assemble_exception_table( Ok(table.into_boxed_slice()) } -/// Mark exception handler target blocks. -/// flowgraph.c mark_except_handlers -#[allow(clippy::unnecessary_wraps)] -pub(crate) fn mark_except_handlers(blocks: &mut Blocks) -> crate::InternalResult<()> { - #[cfg(debug_assertions)] - { - let mut block_idx = BlockIdx(0); - while block_idx != BlockIdx::NULL { - assert!(!blocks[block_idx].except_handler); - block_idx = blocks[block_idx].next; - } - } - - let mut block_idx = BlockIdx(0); - while block_idx != BlockIdx::NULL { - let next = blocks[block_idx].next; - let instr_count = blocks[block_idx].instruction_used; - for i in 0..instr_count { - let instr = blocks[block_idx].instructions[i]; - if is_block_push(&instr) { - debug_assert!(instr.target != BlockIdx::NULL); - blocks[instr.target].except_handler = true; - } - } - block_idx = next; - } - Ok(()) -} - -/// flowgraph.c mark_cold (two-pass to match CPython). -/// -/// Phase 1 (mark_warm): propagate "warm" from entry via fall-through and -/// jump targets. CPython asserts while visiting warm blocks that they are not -/// exception handlers. -/// -/// Phase 2 (mark_cold): propagate "cold" from except_handler blocks via -/// forward edges. Blocks reached only via runtime exception dispatch are -/// marked cold and pushed to the end by push_cold_blocks_to_end. -/// -/// Blocks reached by neither phase remain `cold=false`. They are typically -/// empty unreachable placeholders left by remove_unreachable; they stay in -/// their original chain position (e.g. between entry and the post-try -/// continuation for a nested try/except whose inner_end was emptied by -/// optimize_cfg). This matches CPython's behavior and is necessary for -/// optimize_load_fast to terminate fall-through at those placeholders. -/// flowgraph.c mark_warm -fn mark_warm(blocks: &mut Blocks) -> crate::InternalResult<()> { - let mut stack = blocks.make_cfg_traversal_stack()?; - stack.push(BlockIdx(0)); - blocks[0].visited = true; - while let Some(block_idx) = stack.pop() { - let idx = block_idx.idx(); - debug_assert!(!blocks[idx].except_handler); - blocks[idx].warm = true; - - let next = blocks[idx].next; - if next != BlockIdx::NULL && bb_has_fallthrough(&blocks[idx]) && !blocks[next].visited { - stack.push(next); - blocks[next.idx()].visited = true; - } - - let instr_count = blocks[idx].instruction_used; - for i in 0..instr_count { - let instr = blocks[idx].instructions[i]; - if is_jump(&instr) { - let target = instr.target; - debug_assert!(target != BlockIdx::NULL); - if !blocks[target.idx()].visited { - stack.push(target); - blocks[target.idx()].visited = true; - } - } - } - } - Ok(()) -} - -fn mark_cold(blocks: &mut Blocks) -> crate::InternalResult<()> { - let mut block_idx = BlockIdx(0); - while block_idx != BlockIdx::NULL { - let block = &mut blocks[block_idx]; - debug_assert!(!block.cold); - debug_assert!(!block.warm); - block_idx = block.next; - } - - mark_warm(blocks)?; - - let mut cold_stack = blocks.make_cfg_traversal_stack()?; - block_idx = BlockIdx(0); - while block_idx != BlockIdx::NULL { - let i = block_idx.idx(); - let next = blocks[i].next; - let block = &blocks[i]; - if block.except_handler { - debug_assert!(!block.warm); - cold_stack.push(block_idx); - blocks[i].visited = true; - } - block_idx = next; - } - while let Some(block_idx) = cold_stack.pop() { - let idx = block_idx.idx(); - blocks[idx].cold = true; - let next = blocks[idx].next; - if next != BlockIdx::NULL && bb_has_fallthrough(&blocks[idx]) { - let next_idx = next.idx(); - if !blocks[next_idx].warm && !blocks[next_idx].visited { - cold_stack.push(next); - blocks[next_idx].visited = true; - } - } - - let instr_count = blocks[idx].instruction_used; - for i in 0..instr_count { - let instr = blocks[idx].instructions[i]; - if is_jump(&instr) { - debug_assert_eq!(i, instr_count - 1); - let target = instr.target; - debug_assert!(target != BlockIdx::NULL); - if !blocks[target.idx()].warm && !blocks[target.idx()].visited { - cold_stack.push(target); - blocks[target.idx()].visited = true; - } - } - } - } - Ok(()) -} - -/// flowgraph.c push_cold_blocks_to_end -fn push_cold_blocks_to_end(blocks: &mut Blocks) -> crate::InternalResult<()> { - if blocks[0].next == BlockIdx::NULL { - return Ok(()); - } - - mark_cold(blocks)?; - let mut next_label = get_max_label(blocks) + 1; - - // If a cold block falls through to a warm block, add an explicit jump - let mut block_idx = BlockIdx(0); - while block_idx != BlockIdx::NULL { - let next = blocks[block_idx].next; - if blocks[block_idx].cold - && bb_has_fallthrough(&blocks[block_idx]) - && next != BlockIdx::NULL - && blocks[next].warm - { - let explicit_jump = blocks_new_block(blocks)?; - if !is_label(blocks[next].cpython_label) { - blocks[next].cpython_label = InstructionSequenceLabel::from_index(next_label); - next_label += 1; - } - let jump_label = blocks[next].cpython_label; - debug_assert!(is_label(jump_label)); - basicblock_addop( - &mut blocks[explicit_jump], - InstructionInfo { - instr: PseudoOpcode::JumpNoInterrupt.into(), - arg: instruction_sequence_label_oparg(jump_label), - target: BlockIdx::NULL, - location: SourceLocation::default(), - end_location: SourceLocation::default(), - except_handler: None, - lineno_override: Some(NO_LOCATION_OVERRIDE), - }, - )?; - blocks[explicit_jump].cold = true; - blocks[explicit_jump].next = next; - blocks[explicit_jump].predecessors = 1; - blocks[block_idx].next = explicit_jump; - let target = blocks[explicit_jump].next; - let last = basicblock_last_instr_mut(&mut blocks[explicit_jump]) - .expect("missing explicit jump"); - last.target = target; - } - block_idx = blocks[block_idx].next; - } - - assert!(!blocks[0].cold); - let mut cold_blocks: BlockIdx = BlockIdx::NULL; - let mut cold_blocks_tail: BlockIdx = BlockIdx::NULL; - let mut block_idx = BlockIdx(0); - - while blocks[block_idx].next != BlockIdx::NULL { - debug_assert!(!blocks[block_idx].cold); - while blocks[block_idx].next != BlockIdx::NULL && !blocks[blocks[block_idx].next].cold { - block_idx = blocks[block_idx].next; - } - if blocks[block_idx].next == BlockIdx::NULL { - break; - } - - debug_assert!(!blocks[block_idx].cold); - debug_assert!(blocks[blocks[block_idx].next].cold); - - let mut block_end = blocks[block_idx].next; - while blocks[block_end].next != BlockIdx::NULL && blocks[blocks[block_end].next].cold { - block_end = blocks[block_end].next; - } - - debug_assert!(blocks[block_end].cold); - debug_assert!( - blocks[block_end].next == BlockIdx::NULL || !blocks[blocks[block_end].next].cold - ); - - if cold_blocks == BlockIdx::NULL { - cold_blocks = blocks[block_idx].next; - } else { - blocks[cold_blocks_tail].next = blocks[block_idx].next; - } - - cold_blocks_tail = block_end; - blocks[block_idx].next = blocks[block_end].next; - blocks[block_end].next = BlockIdx::NULL; - } - - debug_assert!(blocks[block_idx].next == BlockIdx::NULL); - blocks[block_idx].next = cold_blocks; - - if cold_blocks != BlockIdx::NULL { - remove_redundant_nops_and_jumps(blocks)?; - } - Ok(()) -} - -/// flowgraph.c check_cfg -fn check_cfg(blocks: &Blocks) -> crate::InternalResult<()> { - let mut block_idx = BlockIdx(0); - while block_idx != BlockIdx::NULL { - let block = &blocks[block_idx]; - for i in 0..block.instruction_used { - let opcode = block.instructions[i].instr; - debug_assert!(!opcode.is_assembler()); - if opcode.is_terminator() && i != block.instruction_used - 1 { - return Err(InternalError::MalformedControlFlowGraph); - } - } - block_idx = block.next; - } - Ok(()) -} - -/// flowgraph.c jump_thread -fn jump_thread( - blocks: &mut Blocks, - block_idx: BlockIdx, - instr_idx: usize, - target: &InstructionInfo, - opcode: AnyInstruction, -) -> crate::InternalResult<bool> { - let bi = block_idx.idx(); - debug_assert!(is_jump(&blocks[bi].instructions[instr_idx])); - debug_assert!(is_jump(target)); - debug_assert_eq!(instr_idx + 1, blocks[bi].instruction_used); - debug_assert!(target.target != BlockIdx::NULL); - if blocks[bi].instructions[instr_idx].target != target.target { - set_to_nop(&mut blocks[bi].instructions[instr_idx]); - basicblock_add_jump(blocks, block_idx, opcode, target.target, target)?; - return Ok(true); - } - Ok(false) -} - -/// flowgraph.c basicblock_add_jump -fn basicblock_add_jump( - blocks: &mut Blocks, - block_idx: BlockIdx, - instr: AnyInstruction, - target: BlockIdx, - loc_source: &InstructionInfo, -) -> crate::InternalResult<()> { - let bi = block_idx.idx(); - let last = basicblock_last_instr(&blocks[bi]); - if last.is_some_and(is_jump) { - return Err(InternalError::MalformedControlFlowGraph); - } - debug_assert!(target != BlockIdx::NULL); - let label = blocks[target.idx()].cpython_label; - debug_assert!(is_label(label)); - let arg = instruction_sequence_label_oparg(label); - let block = &mut blocks[bi]; - basicblock_addop( - block, - InstructionInfo { - instr, - arg, - target: BlockIdx::NULL, - location: loc_source.location, - end_location: loc_source.end_location, - except_handler: None, - lineno_override: loc_source.lineno_override, - }, - )?; - let last = basicblock_last_instr_mut(block).expect("missing jump"); - debug_assert!(match (last.instr, instr) { - (AnyInstruction::Real(last), AnyInstruction::Real(opcode)) => - last.as_opcode() == opcode.as_opcode(), - (AnyInstruction::Pseudo(last), AnyInstruction::Pseudo(opcode)) => - last.as_opcode() == opcode.as_opcode(), - _ => false, - }); - last.target = target; - Ok(()) -} - /// pycore_opcode_utils.h IS_CONDITIONAL_JUMP_OPCODE fn is_conditional_jump_opcode(instr: AnyInstruction) -> bool { matches!( @@ -5636,381 +6013,6 @@ fn is_conditional_jump_opcode(instr: AnyInstruction) -> bool { ) } -/// flowgraph.c convert_pseudo_conditional_jumps -fn convert_pseudo_conditional_jumps(blocks: &mut Blocks) -> crate::InternalResult<()> { - let mut block_idx = BlockIdx(0); - while block_idx != BlockIdx::NULL { - let next = blocks[block_idx.idx()].next; - let block = &mut blocks[block_idx.idx()]; - let mut i = 0; - while i < block.instruction_used { - let instr = block.instructions[i]; - let opcode = instr.instr; - if matches!( - opcode.pseudo_opcode(), - Some(PseudoOpcode::JumpIfFalse | PseudoOpcode::JumpIfTrue) - ) { - debug_assert_eq!(i, block.instruction_used - 1); - block.instructions[i].instr = - if matches!(opcode.pseudo_opcode(), Some(PseudoOpcode::JumpIfFalse)) { - Opcode::PopJumpIfFalse - } else { - Opcode::PopJumpIfTrue - } - .into(); - - let location = instr.location; - let end_location = instr.end_location; - let except_handler = instr.except_handler; - let lineno_override = instr.lineno_override; - let copy = InstructionInfo { - instr: Opcode::Copy.into(), - arg: OpArg::new(1), - target: BlockIdx::NULL, - location, - end_location, - except_handler, - lineno_override, - }; - basicblock_insert_instruction(block, i, copy)?; - i += 1; - - let to_bool = InstructionInfo { - instr: Opcode::ToBool.into(), - arg: OpArg::new(0), - target: BlockIdx::NULL, - location, - end_location, - except_handler, - lineno_override, - }; - basicblock_insert_instruction(block, i, to_bool)?; - i += 1; - } - i += 1; - } - block_idx = next; - } - Ok(()) -} - -/// flowgraph.c normalize_jumps_in_block -fn normalize_jumps_in_block(blocks: &mut Blocks, block_idx: BlockIdx) -> crate::InternalResult<()> { - let idx = block_idx.idx(); - let Some(last_ins) = basicblock_last_instr(&blocks[idx]).copied() else { - return Ok(()); - }; - if !is_conditional_jump_opcode(last_ins.instr) { - return Ok(()); - } - debug_assert!(!last_ins.instr.is_assembler()); - - debug_assert!(last_ins.target != BlockIdx::NULL); - let is_forward = !blocks[last_ins.target.idx()].visited; - - if is_forward { - // Insert NOT_TAKEN after forward conditional jump. - let not_taken = InstructionInfo { - instr: Opcode::NotTaken.into(), - arg: OpArg::new(0), - target: BlockIdx::NULL, - location: last_ins.location, - end_location: last_ins.end_location, - except_handler: None, - lineno_override: last_ins.lineno_override, - }; - basicblock_addop(&mut blocks[idx], not_taken)?; - return Ok(()); - } - - let reversed_opcode = match last_ins.instr.real_opcode() { - Some(Opcode::PopJumpIfNotNone) => Opcode::PopJumpIfNone.into(), - Some(Opcode::PopJumpIfNone) => Opcode::PopJumpIfNotNone.into(), - Some(Opcode::PopJumpIfFalse) => Opcode::PopJumpIfTrue.into(), - Some(Opcode::PopJumpIfTrue) => Opcode::PopJumpIfFalse.into(), - _ => unreachable!("conditional jump has reverse opcode"), - }; - - // Transform 'conditional jump T' to 'reversed_jump b_next' followed by - // 'jump_backwards T'. - let loc = last_ins.location; - let end_loc = last_ins.end_location; - - let target = last_ins.target; - let backwards_jump_idx = blocks_new_block(blocks)?; - basicblock_addop( - &mut blocks[backwards_jump_idx.idx()], - InstructionInfo { - instr: Opcode::NotTaken.into(), - arg: OpArg::new(0), - target: BlockIdx::NULL, - location: loc, - end_location: end_loc, - except_handler: None, - lineno_override: last_ins.lineno_override, - }, - )?; - basicblock_add_jump( - blocks, - backwards_jump_idx, - PseudoOpcode::Jump.into(), - target, - &last_ins, - )?; - blocks[backwards_jump_idx.idx()].start_depth = blocks[target.idx()].start_depth; - - let old_next = blocks[idx].next; - debug_assert!(old_next != BlockIdx::NULL); - - let last_mut = basicblock_last_instr_mut(&mut blocks[idx]).unwrap(); - last_mut.instr = reversed_opcode; - last_mut.target = old_next; - - blocks[backwards_jump_idx.idx()].cold = blocks[idx].cold; - blocks[backwards_jump_idx.idx()].next = old_next; - blocks[idx].next = backwards_jump_idx; - Ok(()) -} - -/// flowgraph.c basicblock_inline_small_or_no_lineno_blocks -fn basicblock_inline_small_or_no_lineno_blocks( - blocks: &mut Blocks, - block_idx: BlockIdx, -) -> crate::InternalResult<bool> { - let Some(last) = basicblock_last_instr(&blocks[block_idx]).copied() else { - return Ok(false); - }; - if !last.instr.is_unconditional_jump() { - return Ok(false); - } - - let target = last.target; - debug_assert!(target != BlockIdx::NULL); - let small_exit_block = - basicblock_exits_scope(&blocks[target]) && blocks[target].instruction_used <= MAX_COPY_SIZE; - let no_lineno_no_fallthrough = - basicblock_has_no_lineno(&blocks[target]) && !bb_has_fallthrough(&blocks[target]); - if small_exit_block || no_lineno_no_fallthrough { - debug_assert!(is_jump(&last)); - let removed_jump_opcode = last.instr; - let last = basicblock_last_instr_mut(&mut blocks[block_idx]) - .expect("non-empty block has last instruction"); - set_to_nop(last); - blocks.basicblock_append_block_instructions(block_idx, target)?; - if no_lineno_no_fallthrough { - let last = basicblock_last_instr_mut(&mut blocks[block_idx]).unwrap(); - if last.instr.is_unconditional_jump() - && matches!( - removed_jump_opcode.into(), - AnyOpcode::Pseudo(PseudoOpcode::Jump) - ) - { - last.instr = PseudoOpcode::Jump.into(); - } - } - blocks[target].predecessors -= 1; - return Ok(true); - } - Ok(false) -} - -/// flowgraph.c inline_small_or_no_lineno_blocks -fn inline_small_or_no_lineno_blocks(blocks: &mut Blocks) -> crate::InternalResult<bool> { - loop { - let mut changes = false; - let mut current = BlockIdx(0); - while current != BlockIdx::NULL { - let next = blocks[current.idx()].next; - let res = basicblock_inline_small_or_no_lineno_blocks(blocks, current)?; - if res { - changes = true; - } - - current = next; - } - if !changes { - return Ok(changes); - } - } -} - -/// flowgraph.c basicblock_remove_redundant_nops -#[allow(clippy::unnecessary_wraps)] -fn basicblock_remove_redundant_nops( - blocks: &mut Blocks, - block_idx: BlockIdx, -) -> crate::InternalResult<usize> { - let bi = block_idx.idx(); - let mut dest = 0; - let mut prev_lineno = -1i32; - let instr_count = blocks[bi].instruction_used; - - for src in 0..instr_count { - let instr = blocks[bi].instructions[src]; - let lineno = instruction_lineno(&instr); - - if matches!(instr.instr.real(), Some(Instruction::Nop)) { - if lineno < 0 { - continue; - } - if prev_lineno == lineno { - continue; - } - if src < instr_count - 1 { - let next_lineno = instruction_lineno(&blocks[bi].instructions[src + 1]); - if next_lineno == lineno { - continue; - } - if next_lineno < 0 { - instr_set_loc( - &mut blocks[bi].instructions[src + 1], - instr.location, - instr.end_location, - instr.lineno_override, - ); - continue; - } - } else { - let next = next_nonempty_block(blocks, blocks[bi].next); - if next != BlockIdx::NULL { - let mut next_loc = no_linetable_location(); - let mut next_i = 0; - while next_i < blocks[next.idx()].instruction_used { - let instr = blocks[next.idx()].instructions[next_i]; - if matches!(instr.instr.real(), Some(Instruction::Nop)) - && instruction_lineno(&instr) < 0 - { - next_i += 1; - continue; - } - next_loc = instruction_linetable_location(&instr); - break; - } - if lineno == next_loc.line { - continue; - } - } - } - } - - if dest != src { - blocks[bi].instructions[dest] = blocks[bi].instructions[src]; - } - dest += 1; - prev_lineno = lineno; - } - - debug_assert!(dest <= instr_count); - let num_removed = instr_count - dest; - blocks[bi].instruction_used = dest; - Ok(num_removed) -} - -/// flowgraph.c remove_redundant_nops -#[allow(clippy::unnecessary_wraps)] -fn remove_redundant_nops(blocks: &mut Blocks) -> crate::InternalResult<usize> { - let mut changes = 0; - let mut current = BlockIdx(0); - while current != BlockIdx::NULL { - let next = blocks[current.idx()].next; - let change = basicblock_remove_redundant_nops(blocks, current)?; - changes += change; - current = next; - } - Ok(changes) -} - -/// flowgraph.c no_redundant_nops -#[cfg(debug_assertions)] -fn no_redundant_nops(blocks: &mut Blocks) -> bool { - matches!(remove_redundant_nops(blocks), Ok(0)) -} - -/// flowgraph.c remove_redundant_jumps -fn remove_redundant_jumps(blocks: &mut Blocks) -> crate::InternalResult<usize> { - let mut changes = 0; - let mut current = BlockIdx(0); - while current != BlockIdx::NULL { - let block_idx = current.idx(); - let Some(last) = basicblock_last_instr(&blocks[block_idx]).copied() else { - current = blocks[block_idx].next; - continue; - }; - debug_assert!(!last.instr.is_assembler()); - if last.instr.is_unconditional_jump() { - let jump_target = next_nonempty_block(blocks, last.target); - if jump_target == BlockIdx::NULL { - return Err(InternalError::MalformedControlFlowGraph); - } - let next = next_nonempty_block(blocks, blocks[block_idx].next); - if jump_target == next { - changes += 1; - let last = basicblock_last_instr_mut(&mut blocks[block_idx]).unwrap(); - set_to_nop(last); - } - } - current = blocks[block_idx].next; - } - Ok(changes) -} - -/// flowgraph.c no_redundant_jumps -#[cfg(debug_assertions)] -fn no_redundant_jumps(blocks: &Blocks) -> bool { - let mut current = BlockIdx(0); - while current != BlockIdx::NULL { - let block = &blocks[current.idx()]; - if let Some(last) = basicblock_last_instr(block) - && last.instr.is_unconditional_jump() - { - let next = next_nonempty_block(blocks, block.next); - let jump_target = next_nonempty_block(blocks, last.target); - if jump_target == next { - assert!(next != BlockIdx::NULL); - if instruction_lineno(last) - == instruction_lineno(&blocks[next.idx()].instructions[0]) - { - assert_ne!( - instruction_lineno(last), - instruction_lineno(&blocks[next.idx()].instructions[0]), - "redundant jump has same line as fallthrough target" - ); - return false; - } - } - } - current = block.next; - } - true -} - -fn remove_redundant_nops_and_jumps(blocks: &mut Blocks) -> crate::InternalResult<()> { - loop { - // Convergence is guaranteed because the number of redundant jumps and - // nops only decreases. - let removed_nops = remove_redundant_nops(blocks)?; - let removed_jumps = remove_redundant_jumps(blocks)?; - if removed_nops + removed_jumps == 0 { - break; - } - } - Ok(()) -} - -fn blocks_new_block(blocks: &mut Blocks) -> crate::InternalResult<BlockIdx> { - blocks - .try_reserve(1) - .map_err(|_| InternalError::MalformedControlFlowGraph)?; - let block_idx = BlockIdx( - blocks - .len() - .to_u32() - .ok_or(InternalError::MalformedControlFlowGraph)?, - ); - blocks.push(Block::default()); - Ok(block_idx) -} - /// flowgraph.c struct _PyCfgBuilder struct CfgBuilder { blocks: Blocks, @@ -6022,7 +6024,7 @@ struct CfgBuilder { /// flowgraph.c cfg_builder_new_block fn cfg_builder_new_block(g: &mut CfgBuilder) -> crate::InternalResult<BlockIdx> { - let block = blocks_new_block(&mut g.blocks)?; + let block = g.blocks.blocks_new_block()?; g.blocks[block.idx()].allocation_next = g.block_list; g.blocks[block.idx()].cpython_label = InstructionSequenceLabel::NO_LABEL; g.block_list = block; @@ -6760,7 +6762,7 @@ pub(crate) fn convert_pseudo_ops(blocks: &mut Blocks) -> crate::InternalResult<( } // CPython flowgraph.c::convert_pseudo_ops() finishes by calling // remove_redundant_nops_and_jumps(). - remove_redundant_nops_and_jumps(blocks) + blocks.remove_redundant_nops_and_jumps() } /// flowgraph.c build_cellfixedoffsets From 64feb290948442964311a18cfa33f02bd42c9ec2 Mon Sep 17 00:00:00 2001 From: Bas Schoenmaeckers <7943856+bschoenmaeckers@users.noreply.github.com> Date: Thu, 25 Jun 2026 15:20:44 +0200 Subject: [PATCH 143/339] Add more number functions to c-api (#8158) --- crates/capi/src/abstract_/number.rs | 202 ++++++++++++++++++++++++++++ 1 file changed, 202 insertions(+) diff --git a/crates/capi/src/abstract_/number.rs b/crates/capi/src/abstract_/number.rs index c5ec492a7..b1dc627d8 100644 --- a/crates/capi/src/abstract_/number.rs +++ b/crates/capi/src/abstract_/number.rs @@ -1,15 +1,217 @@ use crate::{PyObject, pystate::with_vm}; +use core::ffi::c_int; +use rustpython_vm::protocol::PyNumber; #[unsafe(no_mangle)] pub unsafe extern "C" fn PyNumber_Add(o1: *mut PyObject, o2: *mut PyObject) -> *mut PyObject { with_vm(|vm| vm._add(unsafe { &*o1 }, unsafe { &*o2 })) } +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyIndex_Check(obj: *mut PyObject) -> c_int { + with_vm(|_vm| unsafe { obj.as_ref() }.is_some_and(|obj| obj.number().is_index())) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyNumber_Absolute(o: *mut PyObject) -> *mut PyObject { + with_vm(|vm| vm._abs(unsafe { &*o })) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyNumber_And(o1: *mut PyObject, o2: *mut PyObject) -> *mut PyObject { + with_vm(|vm| vm._and(unsafe { &*o1 }, unsafe { &*o2 })) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyNumber_Check(o: *mut PyObject) -> c_int { + with_vm(|_vm| unsafe { o.as_ref() }.is_some_and(PyNumber::check)) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyNumber_Divmod(o1: *mut PyObject, o2: *mut PyObject) -> *mut PyObject { + with_vm(|vm| vm._divmod(unsafe { &*o1 }, unsafe { &*o2 })) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyNumber_Float(o: *mut PyObject) -> *mut PyObject { + with_vm(|vm| unsafe { &*o }.try_float(vm)) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyNumber_FloorDivide( + o1: *mut PyObject, + o2: *mut PyObject, +) -> *mut PyObject { + with_vm(|vm| vm._floordiv(unsafe { &*o1 }, unsafe { &*o2 })) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyNumber_InPlaceAdd( + o1: *mut PyObject, + o2: *mut PyObject, +) -> *mut PyObject { + with_vm(|vm| vm._iadd(unsafe { &*o1 }, unsafe { &*o2 })) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyNumber_InPlaceAnd( + o1: *mut PyObject, + o2: *mut PyObject, +) -> *mut PyObject { + with_vm(|vm| vm._iand(unsafe { &*o1 }, unsafe { &*o2 })) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyNumber_InPlaceFloorDivide( + o1: *mut PyObject, + o2: *mut PyObject, +) -> *mut PyObject { + with_vm(|vm| vm._ifloordiv(unsafe { &*o1 }, unsafe { &*o2 })) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyNumber_InPlaceLshift( + o1: *mut PyObject, + o2: *mut PyObject, +) -> *mut PyObject { + with_vm(|vm| vm._ilshift(unsafe { &*o1 }, unsafe { &*o2 })) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyNumber_InPlaceMatrixMultiply( + o1: *mut PyObject, + o2: *mut PyObject, +) -> *mut PyObject { + with_vm(|vm| vm._imatmul(unsafe { &*o1 }, unsafe { &*o2 })) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyNumber_InPlaceMultiply( + o1: *mut PyObject, + o2: *mut PyObject, +) -> *mut PyObject { + with_vm(|vm| vm._imul(unsafe { &*o1 }, unsafe { &*o2 })) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyNumber_InPlaceOr(o1: *mut PyObject, o2: *mut PyObject) -> *mut PyObject { + with_vm(|vm| vm._ior(unsafe { &*o1 }, unsafe { &*o2 })) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyNumber_InPlacePower( + o1: *mut PyObject, + o2: *mut PyObject, + o3: *mut PyObject, +) -> *mut PyObject { + with_vm(|vm| vm._ipow(unsafe { &*o1 }, unsafe { &*o2 }, unsafe { &*o3 })) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyNumber_InPlaceRemainder( + o1: *mut PyObject, + o2: *mut PyObject, +) -> *mut PyObject { + with_vm(|vm| vm._imod(unsafe { &*o1 }, unsafe { &*o2 })) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyNumber_InPlaceRshift( + o1: *mut PyObject, + o2: *mut PyObject, +) -> *mut PyObject { + with_vm(|vm| vm._irshift(unsafe { &*o1 }, unsafe { &*o2 })) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyNumber_InPlaceSubtract( + o1: *mut PyObject, + o2: *mut PyObject, +) -> *mut PyObject { + with_vm(|vm| vm._isub(unsafe { &*o1 }, unsafe { &*o2 })) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyNumber_InPlaceTrueDivide( + o1: *mut PyObject, + o2: *mut PyObject, +) -> *mut PyObject { + with_vm(|vm| vm._itruediv(unsafe { &*o1 }, unsafe { &*o2 })) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyNumber_InPlaceXor( + o1: *mut PyObject, + o2: *mut PyObject, +) -> *mut PyObject { + with_vm(|vm| vm._ixor(unsafe { &*o1 }, unsafe { &*o2 })) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyNumber_Invert(o: *mut PyObject) -> *mut PyObject { + with_vm(|vm| vm._invert(unsafe { &*o })) +} + #[unsafe(no_mangle)] pub unsafe extern "C" fn PyNumber_Index(obj: *mut PyObject) -> *mut PyObject { with_vm(|vm| unsafe { &*obj }.try_index(vm)) } +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyNumber_MatrixMultiply( + o1: *mut PyObject, + o2: *mut PyObject, +) -> *mut PyObject { + with_vm(|vm| vm._matmul(unsafe { &*o1 }, unsafe { &*o2 })) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyNumber_Multiply(o1: *mut PyObject, o2: *mut PyObject) -> *mut PyObject { + with_vm(|vm| vm._mul(unsafe { &*o1 }, unsafe { &*o2 })) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyNumber_Negative(o: *mut PyObject) -> *mut PyObject { + with_vm(|vm| vm._neg(unsafe { &*o })) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyNumber_Positive(o: *mut PyObject) -> *mut PyObject { + with_vm(|vm| vm._pos(unsafe { &*o })) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyNumber_Power( + o1: *mut PyObject, + o2: *mut PyObject, + o3: *mut PyObject, +) -> *mut PyObject { + with_vm(|vm| vm._pow(unsafe { &*o1 }, unsafe { &*o2 }, unsafe { &*o3 })) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyNumber_Remainder(o1: *mut PyObject, o2: *mut PyObject) -> *mut PyObject { + with_vm(|vm| vm._mod(unsafe { &*o1 }, unsafe { &*o2 })) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyNumber_TrueDivide( + o1: *mut PyObject, + o2: *mut PyObject, +) -> *mut PyObject { + with_vm(|vm| vm._truediv(unsafe { &*o1 }, unsafe { &*o2 })) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyNumber_Xor(o1: *mut PyObject, o2: *mut PyObject) -> *mut PyObject { + with_vm(|vm| vm._xor(unsafe { &*o1 }, unsafe { &*o2 })) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyNumber_Long(obj: *mut PyObject) -> *mut PyObject { + with_vm(|vm| unsafe { &*obj }.try_int(vm)) +} + #[unsafe(no_mangle)] pub unsafe extern "C" fn PyNumber_Lshift(o1: *mut PyObject, o2: *mut PyObject) -> *mut PyObject { with_vm(|vm| vm._lshift(unsafe { &*o1 }, unsafe { &*o2 })) From e4814d4893124673dd0652eef367cfe6be940dce Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Thu, 25 Jun 2026 16:25:32 +0300 Subject: [PATCH 144/339] Update ensurepip to 26.1.2 (cpython 3.14.6) (#8163) --- Lib/ensurepip/__init__.py | 2 +- ...ne-any.whl => pip-26.1.2-py3-none-any.whl} | Bin 1812777 -> 1813144 bytes 2 files changed, 1 insertion(+), 1 deletion(-) rename Lib/ensurepip/_bundled/{pip-26.1.1-py3-none-any.whl => pip-26.1.2-py3-none-any.whl} (93%) diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py index a8040457a..7d13414ff 100644 --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py @@ -10,7 +10,7 @@ from shutil import copy2 __all__ = ["version", "bootstrap"] -_PIP_VERSION = "26.1.1" +_PIP_VERSION = "26.1.2" # Directory of system wheel packages. Some Linux distribution packaging # policies recommend against bundling dependencies. For example, Fedora diff --git a/Lib/ensurepip/_bundled/pip-26.1.1-py3-none-any.whl b/Lib/ensurepip/_bundled/pip-26.1.2-py3-none-any.whl similarity index 93% rename from Lib/ensurepip/_bundled/pip-26.1.1-py3-none-any.whl rename to Lib/ensurepip/_bundled/pip-26.1.2-py3-none-any.whl index ab0307c7716212a514231bfc5149437cfb9df70a..24b5cc90ace64391f8ff6ac218837e03f980d485 100644 GIT binary patch delta 73433 zcmY(pWl&sQ6D>T<;O;KLJ-EBOy9N*LZi5Av;O<Uv4I11fxVt+94SJuKeD|xm|GIj2 zuif3J&rH=?r+mgfZQdSTSq=n=2><|K0Z@^@^c!Xz^5fCzA@t(~g&^%NUt;0|YeD}V zG_XTlKztaKAZXD4jKt5-haV1H7~6j*VX*eNAD+ig+=$5kL%S+i0L!8Q07u-3fo_<o zc=!aU4JM50Xdh9nf+`dr29hb>KLA>@AJ8A3Me8j155wI}2mS-8l7bG-^1mvB0g3U? zxT&iI1PBQM&L1&u0b{TqhFF9HBGUh^wYU=0>Zbw#mK%O0qhf-+R1FSgDbtZkPQ1l( zeqVNZfo`&l>p}Er8c_nrR*^pOPjF?kZ*(lEZG!S%*DrU0IXS5UhUJVl6m=JPdCs#4 zk%B6H>_L=3i*fIPuvfnsLP#~l16oaWUfhUQ8$w0kJa-PdGgLl-OKpsLjHpg>VwdnA zT+>04!xJkn?<Mf9P;KD3QNr$*#jIeJ85XoDVb)0B5EqInldt)~d=6d0>lS>0C=kuR z!e$%Kd<Ne*r>vr^02wo@ErS`Xq3$mfz`pp)JG<joqHGfDw(8B61w6|s&8@)zN@`MQ zSK=UZI#>3emiN;g0Nw0OGCjnuq3;G{c_fBpD`Xr;n&M!)jKo-6g`Yd4iEcVOIT(lr z6)5=c&hjt}9S!;NNRv7yxsVY>$Tu-}L~kKsBkHHVw7F}s(W^2`z53xl!YWo8b8%R5 zKd+sf`}VS0`tVzUahjrn4Iyu51es7S&Fm@s462=)O_=u@IHHS<na{}TzbG`s6X{R! z-LiQ*tfqmT;9s=*6~4Ya7*B4M<fp`nTcaJM^v&N6@%e6&zn(`dUI<1m4#&O)6Ic9H zI=){$6X(Ia@2|+3;V5x0iq-ZLouHTFqr)7k<|MPvOB@L@+|DsH??6dW?1z|kejGD) zV^|+<4GhUt*|PYdXX-+ic4EZ+JG67pGY>a3$SMYmFAZTAfP=RLNzMz3+<?VkGjiX! zqDb&OW#Li@DhF}LC;Vz}=!ZsZ4EKFM<Jc;a7?cQ{v|0=LX?$VGpk-$cf7L9{>3f14 z2}_bP>k<2wp;_6Ey@zPfTqWf34Xohpj_d~}io7rw1H&rFEd;!8TDHws`B<)?SBcHW zm3{#i;A5a~pC_7Hsq>h*{k6j4&Rx_zaqZ@hRhAKMR3$zy5p2An63_z&#HZ(IymR%N z5g<Ga%g~RzW5r)AHOna19;1JSfU?hKB$!a>e7A-@?HdLyA!hJ0x_Twen*yFge1DI= z-cdj!DSWGvF|{8t1l1H1>A1chUG7d-xvzrdGvazlP2+<gD}m&^L&pV4G{wz*_)f~- zw!LyLZ&~<XAtWzqUtqkvd&3^HCY?5oXpq~%kzMr?GEUlW7>}JbMTE;|u*kh@;&9Bd zhMhq;kBh~6stjvQH&SYLn?e526Ep7UN<t7CDFD>NhlC%$%h=$iNEat9HjMaM70<!> z>BK>HWpkwKVaf4f9H?RLe&%~+Tn17oSk9wK3(?GMH8XmzjwhH;HZFJ9DkidM%{#VL z_RpVT+*pZtio~WH%@ed-HN^w=0`fJ@CnNi%97+OA5xcLvDR@-cyfgtO%&amKdrpuj zt94vHde{Z!Gv227b^`Z%cqD~an_OU<!;MBwh{6IPgfTzMm>?Al;almB`<OKX*n?35 z_-k^~Wm{W5VxEMPw{mh&1BTLN>V=z>2dH;7|DoUPxBIrbg`zd<;K@TtItdx&S4@Ur z$0fN$pUCy+ecn<dC&5i(6^d9Jn<xD;EIpl(I$FKqoo<;#*9qTViY=F^@EdTig~tv8 za%ww>s!qNHA9T-7MPI>DI-)?iJk6_girTj*jisIX19+Iqp_2BbXOQtyN=3R^o6J^h zD5k~q*CUcA%J`sW@KN`b!~{!Au!h^D%-1Yol0oi8K4k-7zq#d=$h8U84;9Qc?J=Dh zAj7d;f;#{6+)|bK+Id|o>;#<o9RU%_F}g?A^gxD1vMrht_nPbZh|5UD9T-3oMnaJn zq{>7ZQ^a1U45yO*s3Yy8gIqWS-0v74-!jj$nitoi?g*ShL&J<_Fex2~o%?Q?j!H+5 zpNa|H;N+!9gfAY5<TvIjSj0+x7wkP7!AMvDL^EP03H>w|rE0@RjtE|np||=Oj&i>x z+-V=fKIAF|=Y*sAQ~59iFW74z?)9@}sD-;Q?Arbh`e)IM?JA_BR~w<Z@#vQXcwq^a zfX`npzZl&0Pq*F%z-h<JhT?+410>O(R1?~BrKmy`>Dz1(;ANs5S-#GmQ)cxWSIY$p zsZEzEr>jrB*)X=%7=gg}ZGKWne^Lmt=~U0v9X`us=;|%t;wL>^Bgthe#3ZE#kf>PJ zA7?0czI|>oc|eq=7Fhed?I>!ZC|w|guJ1B=^dR5%{gDTcRCo8rJRhcu9QAoa(0#0u zY5AmCtc%fVly-_J9Ut;t@yq877g75ZkzfIyWYz|1s9^%n!PN_}#xRE$bd0)UV2cb@ z^JwZ&3}*TX>%i?jXNRa63q}?>bvd{s1(Jz<dyDX>x0Nc5Rxyf~z1PJ$zo#I@Qhvvd zJA-Tb$I*ORNQ&1Lk)S0cURq?>r#LXvsAKwp#BnvniEM&K5=(L)r1VbsZ{}+8BZb-O z)yd&6xdkwft+*cG@#npsE0pxR&ibU*;vE+^wtPk|tdzy?PaE%VpeySBMWZJC0J!^S zXt0u|p(CYCsYn~X_({nAPf9o*9I+XBcZW^}eWY(KZKMlIMbb!wm7E|7y0qGejg7y| z>4%@b+a(x$sp{(=Y*!$gyR|?jZ94oxdz0K~oz62p^Ca*Bwx+UZSm}R%^!_bKefyjL z=de_s8>>U@MS!<9(&f=cIEmD`dw|_y_q>wtJIp6zwaVq5TseHR*#K~4bu#VzMA@j9 zpPp)5GmJcg;U-m}(&s(WY(>*cGEjWzykmV)^kK3J22G8(oD8%1+U?N-14~!whG^H- zuhOEpkZ0K)aMqR&HBuK>y`jT5pD&=ekzWhj-SpF_4Mh8acj&H(v7qI)3Sl)@Ib;{Y zK*qhVv=7rp2zQhW56LnP+(87<xzqa#c4Oz0qSZg`NM=B*yNqXqW3J1gF6<3q9?H+9 zkiR<d6vEcp+r2PxCJuC{nVP?(#62AI*-(t3qv>BLfQ5q>lVZFN`%Ym=U3b%Ih*!Gp zSbi_e(+XmAQ9H`csD4Tq_?f|Q1gRBNGWLM0wnwbxCW>dP)V1I=pf;&$I=(oVVmV1; z63ZD(_3pVdJIQ<B>-5}9#q|JMfZk^}vOvs8X1UUHyz16b%~w<S^8#B0=d*p)|GA_^ z!DU$*6)X~j_L!6tLD<*Kp{zR3SDP7VKLjjmHb76Fz2oFYo#s(4@tlP}fRQ-%jFEwc zl>M?X#^R%>sHC`yLPAi_+ih-nbGGUdYM>@}<}Uak7Ynz*-3lN68Pf$j&P?oEQKZk| z0Dmw6_{@&={Kg6;ccnMC6wm(m5~^@?Wy1~m7MMAiuZ7Ma(dS1DX&s4Y8m6&HJAeJG zQVB!Um6r9eU<IBt>;2a~3FaU?N{>ndvwKcV#Y2kPZvU-*n<MH{c{MeF_PEM?Vd8^E zZ-zuDo~LXrmXXOq_t6CdO<0QA`6{YZ*5c;$rID?v%R*>rlQPb}?q?Z-$^Ji{`HoiW zl;HjUR#Dei0v}eHRk}HlB9<7gEHO(he5Y=W*1p!v!_y>ul3=0PHFbrtR2nH>EpO`k znZNTSLm_cuhe)%2aqnN4qw5PE3X*|A5*xjC-^Dn&stkTp?K~NbFdWgdHJ?htM&c!a z>!$7L22H(75Y(j7*Bz~K!(@auC935I0&r{Z(R;T3&e%8pK-bvGIa#0`W^ICmg5ivj zkkNqt1uQdtPy(%q^k3%e^x!da?Y&vq7pN01W+(2oG-TbE18)|2b8Yf-lgg{aB%=j| zScv0&hv#4EM5K+g%whf;pZv*N*r%(v(;B9u(x4RCW_`!tbG^UDKf4;Q<qTA45rcQP zz9ZD^)l;?6^*vU}ky+1(1-}k@DWv2Ya<B$6yXFB&MAiUl89DsB+74%X-AsbDT5f3= z3J08`YIuinBod{ks;13(q=L8-bEiUXK3h?Y_j=IL-j&h|M*^=`9E(DO2FvLw;pdOr z-%EQZgO*gQX4+XkRh&AdBX42Tvw&eFq^AawUnwqDLN`<knVia=wd`xczaV9hQ-wnu zrmaeH2NL31O*LdqBp88ZO+?wPkY^Kpf{ZdIgn2hi9WJZ_8@}s1l<0TO*z??V5^Elf zEkkS{I6Ia{<|cMz7^fF%XnbKkeLEmdATi`5CR7;PK0U-X4Gd&isv47bPX@<S*~oT4 zG_4#F!Ts<Rd`*y?CtqZwIM{&9X}Q0WMqgSNXt7-m(E%UlblPUkI@6u4F21jwvB;$G zqjfK6V0|x`k8sAGYvbBKt9C)f6gk&4C|sYLj2uLBa-+z;_^U3)!rbp!thL$oW>2!K zOL8QXgxuP=xC=dO`n*yA`3|;Tj=kv9Lhm<8@l6g`BIrbmK;WpVbQ3=pA-B%Q9cc>g zPHvu@Pi)xwz0@>ZBq+DorH#-2f(#;kyL)ti`9<7?a}};^>HoIH!?{XOF)hPP<|qiR zQzCX@p9DpZJV^^xyhM%9jOyR<^n0W#Us%f@7wT%+F1JW#h-SuWoPv)(8G5aiy9<jo z{UB}{U__Sq&A2~1qG)ql#sZ70Z`u7fYR-YqGuFty$9iO66XRYV>>?9Zw@A-YIKV{S z!_{$LCz1vn<CwBb-jnnQzfLuc?XR1BMP@zg<OHJN7q++BA$7FPxr^YpXs%Msj$9N( zSPRX*km3Hcp{-P54*`d=nS`vy{>}5~ny2K>|76NUlW+;UhtYO6kRXm6|1>rz%u3(_ zVL@3;Lnt4kRUSEIw?fC?xcS524p`ZGvn4n)54G?N-%BL_mwhOnO6}zEo&Wu@XNrf` zJ_~oy`~gW?@WN9IEf@hJYnjv}{p`o~D!w1pgt2#kNyg}W4h1-iC7wp2Z?v;%#gMC8 zr+$JnMV_govj2yF_fm&~D!$+sADaf*Tm~NRmR5&Y^pUi^EeVyOG)es#!pk&yg1kIB z<)`u_O3}7?aRiPY1J#VL3h?IsW#Vd_t%;Omxu%z@e6DTW7%|Sak!mAf$N;V9((Nr2 zTQ@3kT;}Ctt+C*1;8hJK%`L_dc{m0Xrs@KFqOIYX(roLXI<NCx;GS{+*E6FD`3>vQ z_tC5@Y{YeJ#`bd9i0INXEX6~;X5S$%DW&TTPVb<@#6j%A64R<O9@o<jf98`hwMc%I z_q@;~BZ@ykRecMFSciJ%`+_W9XTwv3q1wlJx)htf&r0CuD(jIuvx>mcRi18U_jpGg zW&TVLq!-iBUMa~uzByw^jouYKXXfWarpDy^zjBzvM1$+A<mP9>Z>BCyt&0)yTBdU+ z{+l6^pNh@l5WTROY9uA$cHst~0>63e0<_tf2{<kt*LE%j872AGL;hAdw*^8g(;<g6 zP$`9zcF=;)Q(?2XC7)tVzqQ<}EPb{A?9fk9<4ps>=R8j&;#m;fs&ik}&DgOqXwI8- z;j{ZhHzF5hrO6XWcPK;QQ4&L!CkSyp$$ir@a)?#Fs|4qb^q>bRi^(IFU<Peo&7H{c zT-iR)fBVQ)c4u;NT`ylUU8$T&8&trXt<OxCP8|*oVPS;qQHG<k?3Im>xk2^vlATVr z7RN1ao;q*lyb(qyONNB?0oCC34OXD_lZh4o!1vgwzIQI29efkuTE86x;_b=cYfne7 zS5{0UTc1(yM)zKb)OKG?p|l*L{y}GMVCsq8?Ekg~mWJXkKpM;Qfij}Zq(d87Eod!E zo#_X2hkn`ALFCaV=PKPrnuhi0mK_aPgQqO@PHGQ@4$S7{p=!Mum+^D>Gd?}`d@v@{ zFUIYl(Cp$@#`kLoaXDQ}tb=nj!Qsl9(A|GeE*c+U{Bd$Hp5z@9p4;J3k6=BS`tgEb zZ=WQxR(pFL5Ji?5iWzHy_UU5Gp_gRiYPuMl<RScsIT+VXvQWHCy~951Vc~$e?jI)W zJ?4{NNqS9n96Fk~Xn%S2`UU0PotOm7{WA8v+j1Q@6o&IFYnrGb)uhg(O&H%q*q~WK z`gbqaJFZ_JrQJ^ScaMBA_=VlhDMq(V@tTL~rFLj*U;bT@bI$T3R}8=g`)C7QO6N70 zbNk8d0!f*j06~+yWsE0{Qsdk{X{OJ|`4-CRvuOLZOU8dc1%De>Sh+StcQT8AL$eM! zps!hyuo)QTMB3PS?CysW#b#l?h5Za`?x`+a)yx%uLaMyaQTP#2!%v!?L!F4UVX1D` zvLd%hU2|oD6y*$4E*3mrGSxZE5ij%!Y#6mlwarzU8w*5EzWvOT(kcHCyW82xGvxlq zVpb53DYfX3_+YQ$nc)Y5*HITd1*W>P!^6JBq;Lc@jH_2Y0n^tD0{a}VmNU+{cC97O z%QR}v&HW(W%RrJW>C`8VFAXLezAP=H97-!(jXaFI28Q<3$8;43f%-*r{8txrVCPYu z5$()UY2?Y419#lRd=fX(*V0ntjFwi37g^7n(ubli3+xiQ@-yIR1H;cbYnkl~onRJ^ zA^wD`mmfOBBL4T0=pLdS?Q*(i0HsXoiDIlt>1P+F8>8rYmE-73S)Y^cNrizSMEiY{ zpF*9Yo7Z<aXG)#NE*$~dUz6V9kp3Trui<Bh??1MUs|y78!J7#TO+bAZNE3a~A8cEl zo$Q}7Q~&_Pnff~jgqa#gOaRsJFx!UuaXKBash11|0GObs20}q#rG6(Sz-Tz!%l!uu zaq@)vffo9#`GKFh2?>$(KTnH06vPeWhh+;7q5hB9d-1VW=>`G-{jiDM$yljdI1q5D z_MZq~T5d2QMu8u}-8c~EAJ{FmL=Z&?A3iNwi2e`OuZ5Tu0`7w~Y@y?Zp#KN2%@2X` zK~lEZ3qj!hLx~iD==>KaD-H1t677FP;nc5kCN**ZU?3O(AWfadguqV?ASZxtfmDDn zAphtUW5EBc5D5T~<oIAPH~&}O6#0MUB|1V>A$^2AWh}j7!2keJIRAf0i;X`770gGW zN#7uf|5^Mo5O;7N8O)P7TkDVj03k|ZK)^@Our2zj|IOy()IN%a;U_cz@QD3?Cj#5z zodq%auXw3K2)~c#*D_S}f16w{h1mS(`&ABc@Gq{c7Qzeof#(<;<VNxzbxH*I4-Ydn zw*dk=m7kgbAyvHrg7%}vfCh+ij1P-p2;vj<hoy7@LH=*RZub!TA5XN!00v0(@km?z zP=S0O3~ft0KCu4Z&>cyDdjC3|qyn=4>!m5joQM)10FXERm`xlB5Uz!h9>|IRafgKj z5DoEvR;srOu<WB)|1YIbKL3s87Cv=*_kWxBUq)&*{eRUO(G$S67^?!m{k!d06PWj} zf@ou)*vGx8GnPQN4`5j<pzFVZ^jHJ;{#j+Vz{Gz$A?OHv`sd?w2FCt_8+Qj1|10YJ z`+sBmKzU0B{(Dtg{8EA8|HcZN1MK~`PZN1S!+&v~OMvJfD5+u<K)a7NR!+0zFR=gs zdzJs_YRpt676RDRZsz~iX1fCT7wZFky&Ks64>NNJsEP8CrbePhvJM9TY!Lmo82{2* z2o{02a39;cSCm=;!~+1nD*ynWQdKH|c&R+wKxFVLcf#f!eXXm(w~Y8>DJl*OgX0ta z*u=YPjCPZ+CDp#4p~*<$Oe6Qui_9rA-@De40w7786Mn3}I_Ka^^cPNB-V!Ky<#<ru z*yJaTs}9blmD5c%6eJxdNa!$7U8Se!mn?NBhU~L$YPE*%iAol#CuLUt{QB)tk5WCt z6vr8?gVoWvbzm|;Vx|d6K6N8mC=p+!gZsIno=zN>wRLd7$Sfn7T_#4dM4_@(KByuo zqFy12E@qU$2H#8*Jmy7+Q;V{C6*j8+EHIKH*S#rNy|0_Jsy}Di@T8Y><s6S?^IWMJ zF8r!KaYGiBr7_q1ri&#*b|^B5Kxw-giX#o?E`A^~mmwotG4DQ%Uw<KphtJd2lwZ=z zIb`<lt&Y#LqPP_o#vXAPd?tqmbG^H`VduR4J-e+ryxfp4JEmAaVM^us+>7ygOZqKr z#L~751qL?+g)F9_SCoCIl*$5Q%7;8ST#7!hQrRpb+da~*wC$YYz>5}s5DNjkFN+Ai zy$f7%1651WApD(QK21cy;o6?x-yf*KNi79uGebVT2E6&YxXepTSor{F@Y96KxAn1r z$eR6^ZVw@yICNnym`cLR<|-1yhZUr0=!eX-8udviJIT?b|D{1fpz_VHC45DmI9;H( zTo=&emkj!uXGn+>3m|Ctw#i|`DGxRt`Ua>Fc0&zC_Dl!11{4EPi9R`xoL?2w^l3AA zCMV@flbFR9+r*~?t3?!vkj?t=Jp;Q?kT@bKw=`PoO*ebd|7bv4lYTQznufa-;7HY8 zQ0zKDxYni0V3H~naJPrlrW}Vo<UPE~szd);>?qn%;*AZlACN#hHe-fB0t9nNPz2@Q z$(Tby=Rnl%&@o^%`8=X4RxQ9j5-Ax!Ts5iR9eGhEa)$(?IC;XZD%D%|N~5Kht_K+D zPLRSDjEf5UK<Ro;YqF@#P(s33S&Vr51&V$q9#feW>W+&cG>=<t;op~AT35pWnmsiU zYb%9P@p-U|79;zy{a6QW^@9<tZ~B<`ZJ3$z{!~XCG9kc;8QJRWNBo2u$zp!0&G?g& zw8w}V#(QybA=ytc#!eriv0J&N8j)tFNoJnhoAT<1>Z}pz2~I9&#nt&n!e9n;ZI0`r zhD(4sNJ=$H$68&k<p+)yo;J*)Tu$|lJsdhrZW<^B5~+Kg+V3H|JA>u+R!xn*k0LUR zg^)u3bl~>ROF8b^eh6St`RfXmyOU1l$)LyFDL4jOV)E96s@6<5=IiaqoNE5v7A5vg z)3)Z_o0rP6D=ZtHbNe+<Xb@voWUAYeUxXo)H!c>8jC}no_)BP8>1<(e;jTT7vdYr_ zM&Mj}tbmb-G6Fnd0up$Wt|7i#KB$W`@`=GgQxpzbHjBqPQs7GTj~9@a7e*q6(X~w? zc_u>33XwlFxLy|G`>YH5-(u|_0d<Q;B2Y((_^?;V%1d~VZIG_QP^Sf|b$tNj0@7J+ zGOm6A{CAf%kP-I)SssOvC_G#M!<mVrV^;CJH?nGNn37kD795!AECU0&5ToZhT12S_ zpzq^3B`hlZ89AJP#xc~&%sh1b?vrVLi}{tr3o4A`MS?A8F8!-8WxvvFDZ?YsS1ilF zsgt*KLL(rVVt83#leOHb{zu@Y)JY2}J$noa@LFW2TIKP8zwHb5Pw4N9&SgMsgHdOV z36*K$z11v|0BkVNciBK@qK?Po{jup|FVFjnmYavv%Z;4Qb~rGf7uf&L>A*4vY@EZ= z(H;goz_S||js6(Cbn^PN{j#GWoqJfrKjs8RI~I_R;OjpY7`fT($2Rz>rXy}-F}Y2U z#@CeaH>5M(y!Q~1peCPmvBOy{;A>@`MjyXGO@6k(K?FEDz(}mLWO=Qf_ZR$BjabGv zS&%JrmXv!<ulPn3bHZEN`8y7wVv6N_%p2F+vtfWz0$FAs9;PP)d(1ZbIZPSyb8Zd{ zBdpJvN6!v}-$E^?C)5uH$u428YvMz)K4;Aoy@MztJlt=zSYcFPe$MX)WIM1$^xRv8 zAe7b{8)t9~l3ct#F0;ieHwOH4y)S||soYz@T9kjM#TRBM(U}WV9n1JxJ_dF>&$c_2 z#DpHLKpv=-c)N`OeNW7HgCSZGRdv$8q;DBQbbn>WV+UQ;YY)jF<x*0fvbv8Di7|$V z>jipgXnche$RQ<BS4x8?moYi9lUF81)C2B!*xbM~!bZF3qC6^|YWK^1L_IhtvBVrD zPH%YwPLRLkGnW5iOUJx&YQnol5uL|n_ZYQe1fI!-4Bedwo^VBZh%}Y9q9Rd!X>5mx zglzFyH8{M`6bp@+60WaC9OXzdNIW};H{xrNQWiG$on6TTwoLZsl{Itd#8VoR8vV`N zM3x7~u$&}WP34CI#_plT#slF=1c}8($AGIh{W>0tE1k`&$2aYlWQjPQJtXP!uM4`v z-fz2U;s<E^#VyJWqYr4eOzRDhg^AlCs<m8Lp$G48VuCQ|zjy1vXoe}55jJNu-wzAa z34U93!K74r-wq;?wHLhMjyuH1oH((w6lsEaYNS;r$MXPO2qu;!1S&0zY4kI}8GfoL zM9uih(o4TB@Xy&=R$*DXa)z=56qk3;r`L-X-(?QEcu=GQd$jO;JQ4%_Vpf?43*Wfl zhu;251GRCadKHJfjnIF^VrB8gI*c{Rebpr;!|r9e=wEPZgg_NL@xQDVbQQQgMZ^K$ zn2@VE$bU8#FqxQWwnw>ai(J&Hs1st|{?ld`2pz~#@vA2^3mUv;NUdDJo(=~KZwVXl z{$jp1Y)>Li@^iXs6JmYbl1VxExCYR!7x=tvu)PrVrvj;nSO>%s0p(FWv1^ou>;(D3 zcG5lJeAS?V-i8m86Fl~#!2@+V>{m9p^OxW+-_p_^!5>*2cnPGqZRGpAai9|?NF*Ay zsrx|=YPU}rr~pvMXQ-@vMzfwa*F5d)Jxl4)b?D6G=m0qu`M3ZX7@S~fa6Zw3D?$#o zR^GGV3}W~d(pH>pk2x?fIw+5wF|n#{d`o1}anxiLn=uH@LL*&Ex|J%B@Ov)U*86E? zZ($2zN0~feMHFHRYhXOk#qZ|iPv1mHvNI!K<&4?0PAujq=@TRl72DD^@=wzO@dEL7 zf}`V$0S$ml484n;qL_BHZPQ`Qv`B85D$>LgH@HNK7>X%2nEc>ZmeenCA)=|nv&XAP z%lE5+x9zd(_mU|=Wckn|aeh%SE`IVE3ZMXli8mBs)D_A#c&5FaS>dI4Icwf>KS|0- zZ#-N3Mfp~Q;rFdh#F{C|r!<iR6R1*HP*74*=K<URH%;8IA1VP83k|JXP(AYllcI2N z;F4d4T~b7*(}KS8C*@)VeP|~jqiLVbI3fky7(7U_L?uO1=9>x!b2AVe|BZ(_VwB1@ zI1ur6`SC4~T7%%6oz2J<$Efq*VfYGBTzsc2`uiLn{2HPY2OXubW~oY$irBI=I*$W9 zfa-ah&Y5UhaW+AeLY8AHiw4mxT50++?6l!wdxQY-*U{;Z#LPs=5%z{$Wv07Ny+8c% zTYK^z(gznrX4e^Y<Jy_PFrDswtR7#MzIOOM?LcK*zb;g;y;#Z%#Aa<vp=zD#|D8ji zL&wFu44E5$pi265Gni&bH+p4gJCA5(NeGR|QwZ6gYG4GsxNB-%yUM1=AkV<{5=F%0 z!WH>lYx$kU17~)_Pl~Mz^6qDjsv(55Wc2ziJ|(+(6a^^uv3;ZkJToiKwc)0BtzR1- zVj=m?4hSrAuHzVcCDP)0nMI5chd`KYDOR=!G3d6+{0VZehUUFffp^rL5YW%2A<hzU zYVU-x=0-pkW%sa7n{wx=)j`;cPJm<My1d|<9V9>0S4Re&o5Uu@2$V&S$$l#fH=4WN zHf|?SNo$4W2=IXhBZ$y4IzG;~Sl*8h@89XDn7RIdX0-d{qq(bgFug*MDR@{`Vut+^ zN$u=EQva8PjE<TJHc!`<6WUcK0>?85TR*sdZ!Fde|5Kk*n9yAq?y6wn(hAJnU|=T$ zF77xNbA8X;7tdTGnlB}1Y{CE*obqM}<alpr*X#jjQsZYf@PoywB`m7<Hpa0r#y0+d zWzdOb>*uDT7U69U2G38V7ZBa^i_1OeyYkldlSup)%rN79d>J4|iXOGgOIJ$I=$4X( zeEQKYk3X%8LEw$@L7R7IRKVrBL<0#*lZAe`t4_5MGLL%-avBrCWtvxyM(g{+Z%iuP zKlfqa<DX*f;7PpfoebMN$Ea4Wi@2BsdAI~BfoXQvdX5%el2(*90RDx(2vy49a-l9c z1}q5&OL<arKH0Bvy2sj92e!!9D&HilY@Q-&Od{eT3SSbTf?SegS`wk1^dlRqq%{*A z6$`w<-E8iL)WbkYBmu4f@;f9QHo`_c$MaAe7RLrfa9$9b{z;Tt+YinM_rNZ7z-hR@ zeDS&*E{;QBKe{}YJm>)qqlv)vlaWg|;7GOalRUf_fhVdi{&0-PCDjRJBs7A}*8^4* zcZC*bNCeIpE?A@640bDpzs&u&j<^@~VM5%YHTk=9t@mr@vi^_T#59eNda7FHh=iZ3 zu|tq8!9?N9r55_hrndxhkGfa87EE)yYZ(_SYHC`5;q7l<*G*ODvKPD(Bp#Z2F10MU z^#<qrw*B}#S`>@gaPzwJ+9eZy3p>DUPMA5&z;Iu{=Tch48Trws&}9HPpHZ<dPM19x zlL&Puvo7r@&Dh=#Hr=UJJS20^W3f3hKOc5agY}j}q5q<aC#VmLw<t9&f|M<jTxg!S zvwS?c5KG+Ye|a7TXdqWmFCRq!Q}fm>bTsn#xrNVUL<s{6vY<Ad%{^{k9#g-()nsj- zUFY`V`^~7zrRMB9?Bf3D%<d%zhf(F;$|gl0Zm@zt0~%i-xS361YpY}&S<ZJwIT3u< zz{);{O0*ePrAFn)P+aOaM;KlHiz6P{&($_vdP5m(ZY+{>(njSwcF^xi<A2zQrhf;q zz2H8Cvx&d1-@bxnD@!WoY7lnhgGuFy=!2T9^rkOsr-;-{#ar_}A#YDE<*ycY2g7-w z<Yns0wTd*@SNMrmIzzxV%ip9}@|pgpuNKRjUWc3OjH+MpV|l&Fbs+eVM}yVIsVmzb zPp#W{sVNug%XNx<X|Vc?nASI1l0Kh&J2i5w>uML3jCSk5epxlW>|WR8NyDpW?U)-e zb%g8D{9WaGbj(id*^H(ox>y_zbNbhc#tXWGLkTkZ6E$iR4HCe3(h0lH{P#{F034_n znMOzBq8Yoye&!|Rrsd&>Ylfja{v)23R<2?R0^u)&!>Llr;JRdGw02{Dy71XT-}N(l zmyANXGla)C`cI=WArSX(c+mN2pTuYN7m86)I+m<eeN`zTH&IZ1{<O+dU~3-9$-!*g zY#o)7uo#Nx;?<z32h0w>!>MqKih>_`@nBOF@uq}vbjjL1e>rjG*DelB6b{3v;YOBY zQKjL=!E^IUnnyTRs&|~~9U5I8{T<8w5*th;ej-}>e6&x^&<b%LFRXli&W&72G@uKw zHr2Rem38DxWiM?dF>i<^r&1a$QC54R+^}gGpmWpY=3Dv=KmkXt_wY#EI15fu(L}?H zg7e{Im2o8;sJ);xMPs&WhIW{NXb#$lVfLxBW<ENR$ab(!v6g!9$(wOqDH)dyFLKSs zv$!~SmA!Kw%^eFrnLOD6=eQeHJqE+-+CjQm7`dqlQlAZMyCm-C%h^<t6z+Hs(N{w$ zX(ZbCPhdgk<lVb!n8E1o#(^8mHLaoP>1xMWtkFk39UeI?tKf;`Dh8E!ySwjfuev|s z2WjpYGI#`2C)pqYiyX*vdYl+Z;iVJ@Y^ISLMRT3-5K*^Keb4L+2$n!`f4UBGjno#W zU@S;x&suSXqiIH$kAHZy&7HE3R6M%%mILSbv2=9r^NC4z!f}R#8o;kLWQ)S*#aQ&; za$G5tdnWCTOEJW8g>sY}(Ow?^Ru5sasOnT*uVZvgRwP}-D+~1eLXbzYzbb*aJlNu| ztm*MS`;JwI?P$suz_VzhvSdy7y9R~z#F4%l7!`sL3zxWT?D*0f(eIve^u5iJkAT;7 zkNv0a7JC0CZ)z16wh6f0HJfT#SG|Lk>Kj(AOV#!?C*Sw+F}|Ys7~0?C;meriQPT0> zONLYZJi*(Rux(IHYJs~Ge^?B#@UV(lVN!nh%7;j43`<HIAHy(XcKlq_`9hX>DtT6y z8D%rUx3Ye<Zf(7P<YzUEkwJ*{+l59m5Oo!Oi7q{*>y^mdFmnrxO8-~Pv>pEkWKeNW zP!^LoT(*<JC%YF?7-DDSg2*{mCW+&!3_r*=RrEm_b2*~yV}i!)73tX#_+4B}GuLFh z&O0+7z<ABJ?i`^u{s<hFv8}Bal^wPQ5pR60l{(@PMLw>X>U45p(`I$X3b{xERF0u; zAQ9>(!XnwbXX!gI1)%YJ9HT}_q3z;yV;H9&T?mlGW=niMB;bB>)w*~9bJp-m9`4+~ zabXM%<4EU}2rYL7dS(j5zd*A0c*A!1Tn(RFdVIkA{0q#bv~G24_J_Wnds!m&GEZC! zBYGuT3cI(X3~&-&FL-fvJ-O}eisLKimsLz5@Tdu_;B^HbLieOY0IFTc`P{qnyJp+S z&qK`pOs=@?r~8KD;L3d}iC`z_nGdSVkaK?!Cd)2y=TeEKMJjOP=J@NOE@!_f+PXH% zVdn4o8QQRI{AtwFYcS-Jq~-(4oO;4ccz1*BATwU?hvyUtP+JvD)B~r8kOrRwDw>(v ze~~XOjAetlE(N$9)E)iq&8X}2ft~2SLln!Z`{GfGwTx&m21o8N)K)In`K$6Hk0ILQ zwm?QLQtRM(r^#WY$SY3#yXPyN0O&z+;W*xN{T5wdJ~r_NLH<|s@#K>JuP=v61F82= z6eZpqD||QY*ni?+Gya+d3!ch+8ML!}s;ULZ;rM~mc7_Q$QA+=sn2-$XWHcEjlTTY~ z=<{Nr4G4O>)=c>K)uvtazy7Bc+7fm$G%w&G8rYj6lbF(k(N#&j8XUz&NaFUKjT+s~ z4|SIX9P(fXof&@RFVk6lyZ)USrpXo9sS|})uIVuDZ?++l9Ymsf9`i+@@$4eG3*z?Y zSl=X=6Q+!#cKUMjY>vPY-reLe=}Ya<hUy#$*^}^^tfb|+v0Xk8LAJ{Ouj7znmuUO3 zmZg@B7F=9@U2JGnhTQ2B<^4ibBu1est<S=DZ+Z!I8?E}+YSSt16A!#!+3Or;uZsCO zC|_j4;i6Lv4J;+)FU}O39xUW3yJn>a5^gKN&WFi#e*87eR!u48zb~7%vE1U1Y^?1! z>x!gx-X8<PyDwy#E@(=4nF_%ofHBvjs5nYAY=qKYaZ^0b8gK@5r_Jh*JH5>GJMX}Q z<q>7ASE^%W>fW<;DQj7yfdGl&jqN@mS=i^%FYE0GxZRCGQ(Bny;{9j5$fInOfyK>W zObb)(Z}_ua)0QF%>)PNr)qd1yjcIslPdS~pvM;d3TrFti-XiQqZ(g5*;M)5w{IYu< z(Hpkyg%xUOcYY*g==LZ+nL^04Q_{E=mpza(__KGd3$+oP@8HV=PLA8c8}2MVXF8Ot ztCrG5R_dxE&mwh+Fd9LrcI?h?z$KV~$<ZrdhS0y3R+2Yd3gG`q|8mt`%Qe5|J5cD; z6`~y!sc2`xYB^#p=W6XlG=sa_gIZv0I%{-WaXfFk7BqK9+IDzds)N(~=9Q>OfCxgG z_TXY>j<=#**%$3}=6UHOA@1q!e*?+@WJi7Pi1Lf*DivkW-j+9&kA;~hy2RqZ_xfsK zi$96P+~)40GSVWUCN!#P;&X@7(wlHQOUg6HGmeN*x@XcU47TN>jTKj=6<*(3;k^^5 z^N%@pa>a6c{P|hG$_qOXKARr8t{-H7%Bnl)_Ys4MT)eJ10JYSSz}djRerC^Zr;x-X zTxo-!ezR5}!9`tqxkY~41B6I}RlnMtP3a+`rE5<=hFPp>HP1V7DBc}6yK$yhRd;dH z-^a~!2*jdVfbQ<Ag)_Frq-KdY)fJ<_AgP}=xrYde+4>gdw5oI(>09=**fyC4ry*Jz zm<6fC4mQ?_zG^=zWli+dgG9Xe3>{ab+MVbWHkhZ5zS1H(7qDQ`EL!-1J8Ls_`&}7T zBW8*4sBFtGG}%h-sBdL%$aGao5~!+#Q;0)s3_q0wrQb_2%Uf%`hXjrsHKPYmL9*?x zBJQj=BJq(1#j1|Hi7f~3yRB*KVG}WLe_lP?RxwOw&Li|C{Dc=_J4t7$cGvlpY$<q; zDi=BPNSIzcscI1wr_N3j9N&;9Rp5`o4^0jH61!ydGYoXa8nOW$>HQrRN{+Q(Z*yat zrDzq2ORIir<rfK%-4ojt2(wuA>^<~T%eo>FyD8J=vvjn_k1=%x*`m*^PGfW{#n9&o z4~BPY(7tNJ+G{-HE~3wx1w}ZEJZw!m%`c!%#Eo`GBAR{HUAtNn0pg*}+Jy3x_k-kd z&-Mf_Tb{O>qEQtNODy8#G_uQ$Ll4<ehHZ|Kh?UUa_6Gezfd5AiZ5jIu{QvaB#djd+ zLm^6C2ZBUCL>f{M=-WR{s~jFw@=vi$OQpQYBmw~3ojybwVGszR#TN@yL-fCl)X!`n zsgG1oHqg>PeMgNKRPawTdgKR<{1fG_gd<<CApihJ$W$i@AZDr~I{{kDtq=(GFYrkO z6!&4JMvH@dKGdIHHnxUuWB|aR0{}pqYRn5FOwHjWKm|_-*to1p{!am-`n`|Hi)qFe z!8I0Bf4C&O&=hgraHil+goBtM28RaQ4WLP%rv3H$#K8neI`3TlVX9$*o_3smd~y5` zT|mRTJm)s=YOTRR$F%yHKC**fL#I{!M!}HbTFRqD!_}+A4XxbE&|*S!etCzVZ+^)x z+f4>j0_@}SqeS-yyMbMsLgB3XzD-b8viZEZfnoCbMh?H8x<o$C%ebKKqF27L??chq zZF}|b;k}HHan~QAjrIawfo~%jxf+>sIvy7OoGZRIQ=A6&LzXS>K<)+e#QB2<^Mxcp z?Y`SYgXZRYZ>7~Nrd{*Q@yi=do4&f-L`;V{C3xA_SQlI)w{B)IFF(JF+%<u~xOuc3 z;olBH0~D)i=#XA$vqSp@+?IM9VRSxP*3g*FXo+fIU@Emv#<{Xc#$pVBkp-GtUrgKC z6cw_^Jz)A03uVvzLK$TQ|4pH>Ar^uZ{VjgHh~f9wL~ktatHQiSt@_(teaQZwMTrIX zS#T#@++RJzzK}EcxA?`){h#)ae}3v~^nP|Tq(1)kIaMQ(;RYKnqcMuAhOfO1<LR%d zdv)fz-}jP|zVZvzSL9zMZD$$hwKy(Jc_B|c{1)aK2T_&7;90BmswSZk!n8Wt2D0f( z>^3U=O#e8qP1HCNE`|AMH~I<*?Au<e>V{MyDG&_!U6hNlgXFY*!Jv7(jiG3(r8^<c z=v6^*(=`P)+<faqu?E~rG=}2Du+n|Zdc=%Jg!I^I3DJaf<qThGAL@7e`1iUG=XmT; zs7Q$Tm*>?{PZZ2?B8(8R(mc8Kb3Ltnz~bl0+m%0kBYnRJ-#xSb`!Ma2x)yXaul=P! zslMI@TrX<=*QOb8QnKErsMW6>QypdN1WIz-SYh;<;o#MKhg|JksD*M{E*KA@RGQaW z$blQ?wQ1{E6~TmVqm568Znvqk!q3{U$Zk565AIN4y18IrQX90LA0D)c_|i_L=jts( zUTTp1`HpTCvzsiSv+*-0W8-v`!XYQ+SuLg+xQBP5&!bR$e;FMmExq?dcfz)=rKN?Y zzM1kOVgfpM+|z%8>>Hfc1gk_muiDh{5F2LAqks9T;s(Is`p;DTA9bd$*2vD*O1f3* znFdEc=Lf6{kh@frDpYS^AIptB)1V`r*2~Drr!b7xNse@~W^&|bM>cXYAsR8aF{Li7 zz#+ie^s|x4xv?;6u#cgE=&rpQ&Qr3D3{ok>fFVTl(ZlH?Ge(wUVLX9J`_J->K0!eT z5#e!R19!kx_0yA$+a+>Uc%T|zNN*Hq{ZT(ymO*2@%>)k75uQ7<LNv8>eK{nFDK?*z z(HT8fCg_Tx{bB#rGiU{iG&`M`xpH3>oRP&<1815k8Q_iv;)$I5DprM+OS#6JBcD)Q zB84_u_s5=H20sbYjgUwJu_0a~ZMpAMTay{hH!w)?hE4!x-D_oVxGjWJbdvRpYczo} z4`?mx^qlg$xX921zPsX&HraUvsMUrgy2n!WbRb<p%4|ojEUUbt3+f4cm@J|+7~HId z))i?nXHrq1`XwkZ7=_FzA^Zx!J+zr=?{=l($|$F^f2q149{bXWY-Z(fPvJWEMt#@J z_e1uZ9-%*xNp4>?@7~ayzUEWGasa0Ov}pIR<%9)X>8~39x4&PZ{@fqmNQv971J4SS zix=ejC-i?PAjyg_l?$8^pO63diJt?bgS_YabU$ibFS80;9Mx}yYqE7o{e7g9IaScZ zRXe2FK6-9H#wt8Ez#`iwE3ap|iCdOG4w1JYBKQ<-pRZBn4B@-M&pM}{cA4BVDX@t< zYTtp1aJU5!i?NgVLsI@+0YYMpTkV>Q(3VL}QT%a)0ih33EhakW0H;(wR4}yx69MXI zUG|jOivTi?Exj3nvB1Kdf`%K-ip_8NPe>-FkmJ!DOS_VRrWvH8!W6*o!9(XgY|udr zD17Z@pG9&M=g@}3kOyPTjOw#~n^n-G+S^4B_SzbK^(>e?w@UI*!+J|mKz8@l3shxu zUypBVv-n|_h(c1pP{dQj4hLR4;EsW;+L-g19wc^v;PS3Xm@QeEYi!$CQW=izY^m|Z z9p<Sq)_rS;s$BB))jK0x(9>~{zMPOkq;5Q)@Hi2}K#$!0ZgFEho9;ntJKsn*`xV9T zg)-$U+o{K=9zzV3?WiXvC8l6z?;?mxn>DT4rOGurvD(UM3JBo?Qf=@b++_kt5ymdH zosrH30nLSW9TAVJfSptL?sLGzf+AFJSL?W*!VSW=Vp#G9RtF`FmD;`>>G{hDNsFSt zDXy@`hL80cwM>oI!6K6f46PBhc`b)}jq4VInKn;<@MR8tz$Tr>V$7aqrQ|k+b^ZP- zJXuWIW|r)|xPZxU=ST3jakR`FzrcjZEB5ngwe@LI{ULg;wNnbc&!#9F{adHhRVf-? z2<yg6(Rm)<Lp#vxOk94;uj3^UDN|FJ{`s_M>_Q0P@kq~y#-?@Uv#`Z+vIGwJvg2!l zgz5<sw2E<uTOs_?gJ58|r=U?^+ZQj<+vFDS0bOzas*8PxtD^(vQ7ByLu+jM)MrR3+ zXuQaDI@vDXy>&RCgN)xHdKjY(r&U;y3@qFO9(Wpe3Wgx-sRkzJe#wg%aKf_X3aWx6 zN_55pLk>Q@pjVrbwW+$|$AY4k2S&BX8F<)U@KJj^b5{(Yir{#VzCE-dRfRn;4F~4P zTY^Dr02#=Ol~gdm-GD11;4(T1okcuu@!U$53i#*vw6ku%=Uvqy!h)fJd+I+*7k<GW z$`0ZwN;&EtsxwMJ8$z=?C${gRsQ5BeHpI3H6Ql`n!g7*x!*cg^JG|rI&W<mw(e(pm z4OgC@;I}v@)w0J06F>Garo6!8S8&a0H3YZkNeQZ<(SkvZ-QGxBegK6c`G9wbLk!vi zoLa5wHQyQ#X_dVJkEp>W5JdMSt7pZJF@alrxOVHxo!z2MmmIkEeOhd(?l1a_GHTRM zH3-U2PtsGy{m8IQRh(NnM_7$c0pyl*_ST*o1?&NE;e(k$UrXnEM0AL@5<!x~fe~;c zYgD1h@n8f7(I-UaZuMGZv8M3QmiSQVX7DhG1QDL$>z563_GNjLl&uERoT@;hA+vk* z)+e7&9y6brQpy_hg2jB08RQOTFQ<j5_nhFp!bcs&TU?*g;k{Ia#k&FG<J3xD2&XVv zbHrWJAeb4lAs*uAQ9)jo>BE$bzqx+>O7~_E`3_DaSzJ!RMd#;wtqx@bb|65*GS>lb zaat`S15`Xzt(n1cXr}i0?#A%F*y=X5lFonPe9Nh4Se}ZLh|Yg1o{eA*ut<of(w5bf zwAtb*{4uo<TdDExNm-l~V5O6J`W7GGEdU_Dh`{T+IYQ&6n;GZsu^gr77#^Z=isx~K z_5^=R`Hw;|7Dn=*KyxH_S18CK$Ml5@kVBLDnY_5nV;bPfys~T?)Vm-NBP|J0Zv?}s zPG3lz+2h=3E+mx4L3<59EfHpJ3<xdSEC8lhomS|pQjn_=iUecTwO`c821b<4H|%~r zxe;0`-FSSB@&Thpp)FNeQb&kRNMJ~=p@MM{Gp>Uy+iN%}mvhyuza{phak3J=kcb81 z>Vl?{!TIYk*x2FJB{ZPL)3(*oD1Z4NI1O7XK;u$R5v`GmdEJ1@?=&gM`HWp1wVA~J z7c(3YYKS=?r&0D#%`~1Z37r4_F>UP_=@7BV@lJuw6UF&C*|S|w2;6lzxE<eEP{H0d zWTL6H9JMgxOs2E`*||Ax!enc_;g!}9e7bI_e?>*hpS!Zd+&>q@%}8@tSOJPdcBx9Y zC{|)|542dg`vYhZ$BeijnlMvo9Tue<6A678f^aL@i=w3v(jo!6>TQA5{d*-i*XS)p zmpB@+KwMB>lD82>o&r1#OPOew2v{K$VFaFI3j5G9FIlef>9!}3o$s`*Et`lqCx~!$ z93!vCxU;IEkGBTprg{D7{%Wk|0=zGW%<{D|E3#9#E@XyBS(-1HJiAcgyOzpIgE|`C zXEJGCSB*C7a=i|6LIEgaHXJ>T0=Fv%RALrQDj7a2fxA*Osc&^g;+HWb&|u=|T`Cp~ zTS3NoC9l?y`G8~X_&p(zf7tnkWptfk?dEbp3fZPhbyQ?|+qjmIw&j?Lgj=K)En-Mk zi)2H3@^@@~PC#6rU!M3YU`m=Ty<>CcL4>x;wyj71eC51eVo_SnN-9v<W+0dsn!^(} zG?qnV31Rk`X6On-@_Rf;8vIp{KuKM(uJLl9qPgVGMy5WEcxU;sW4lYvG_zQE@$1!n zQbY6OMr^Nx@6NMqbq(Na;B8i5L`Kyso*;ljonCgqY+?tIN3;<LLqRv2Mv3|h0d^iC z827he=u;y6D}m})^YG;^As`C%3BjG$5ualL6&eC$*(e(|28fg62Y42l8S&jlxDyXT zNG-Qn*aPw;OAmKr)e=_@&l&y}5bBmK>$iMrwwODoLG%!y_*@uLcSg)SN83x(Q_(k$ z6itg)fQB~@I_8Wc@H~oN?m()(zc?j^yHG{J`gTy9iE!Jxc<JKso7xP+R2lhjbxgGt zcOjDBw_V_=z*OA18q7a^EvQ~ib(wjLG>ajE;SMP^_btcdGW*v`csBemR4Ut`D0f0h z&O$h=j(aF=)Ix<-U8WUn;z@4^XKLOcSJKyK0i7O8&VcWEe~><-)NOl7I0>PmBdApv zYbsHZowXpCCJtYr=c%xlc3C}ySLWW8fHKgf*Vn9*X=ShS3Bl<OMx=AA+DU<M9H4z9 zo7yt8M`~tEWZq~*ky@JJdr(h%d20$3w#oBInbESLb7)TTMpuAnYV;XeV?XWfQbDUW z*L=;ESF@4gt~R}Tx@842OlBUReM}`KjOn$VssmhM%%GLHJ2Bd>fzyEq(Wh~r5fYl_ zEp*>!_?&6aTrhQRy9d0#Lh=Q6#FM*NGo{g|fH34yLVomneMs!|`lOnceUe&Lx>4Yz z8`55hgocTb^lHZ)8Trw7_(u8lX3YV+V58d_vskmg&n^XK<V&TgTVA<T;Vx0N&_urS z-|M477AzDY=O~BeS=`Tyc(i1Qu`)RE@yzXC1CW-QW5H{0h|$+i-?JSGit?EcM~0rS z$K7Iy;Vlag*f7(!S#PfW)tmyF6TX@&txv8}bR+(>R6BsBp(m3RxH8B&GCS$(*0-Zd z5-FAb&WMpl0ig%}frA$s(V-BCNp&v)y_|PFEUrPTRf)UMHJoXm7)a4^^@5j3E1BkA z&$=iskOvNtpU?Wb1E<{r3SL&|nnTYe9;kC_vNY!gwR^Nf6sqGk!*V%(yMPq|&_baG zpiFhs)=kQdd13l?<#h<G&>%tYQS?IFhjlxL8@0f+u#x^Mt8g(<W)|7#;PH3<^XKn% z!_d@B>69VA|I^;y1OcT}aT8l3Q#}=RWW%hiBQtnoR{a}4E8h^LoXDP!E~)mu(Qskq zQBf7U$|u>Jf*Zt}cb>m|#;RY>7qq)z9)F*S|8Oc#CvrWs?92DWOi&h567v2(T)lNz zRm~SLN_W>Gq`Nz$6{Ne7mXhv{Lzk4)L0Y;~0coT|LAo1B>CTV$?BBi5{q7$;%rmok z*36!>_N=w@5SG9rPdC(m6!mIKsp1QRjI&bNeAKxxt%{;r$fX>`Oq*AcZhYJymO~*D zZ6|3#^(IMnT-tLhulEnYGrVao9#+v--A@|r+ympk_`>4zyTv>rbu1B_x-`1{L*lqw z`h)+y!X%>n!WV&Vdj)qUMQ>Y4@rt<M!gRFxv<*hsFYHaJyO4OMP%aE{<o<4GN$t<q zhGxd{p0H~U+Uhy$az;P&jbvBaR?wYf$t^@lf^CD~tb+n3ZP0`?!B%tlT2V|Udav&Z zOl_n$Scx#`oMN?;&A;o`|8D8iUs~(kFiFep>!dq*9?E3|KM8g%-}V-9+Jli68a6!4 z);ffD#KklJt+92==l038JhS@zqEtzDv_PVi*)|>5hPhi4>!l<)_hl0fq!mH1Bia6B zN^F&AI&r*BL@DVH1Aawo-=k!17U!($v`aQGhcJ7cQ~doLHKifFGmEsr))$hRv+G4Z zA<xpkxf|mQcEAhL94SiL<r|{JhkF(BZM*P!@WAO!%>n&P>e&WUBa-6pRz8om;CEjq zGg*{N+Ic3KQ#(Ig_*>bIy#6Ru$@Xqe9-GhVLl2{wn+P%Aw^eWtL)jM?K5mm9BD^<2 z*M=v5XRz%P@+YT%Dri4YIg!Vw+&tbXX87x6|LeFz4c#-P)KI6dm;JuCuRKtOg7MZ^ z#fEmz%k(^HQ~r`A&pcE4M=fC_hJCdz@h+@$3X-PYvXw2FLcma@(0Im<0;-aR8aHm5 zePcFq)Y}`)a9j^?Y-|H_7A%~K{(M7D(YS`Xr6Nz|A}?3$<GhyJ1-2GOy26}EbyM?b zBRdy{wu4G{-0^r-pBoH}`6R(R@#iHFJ%{nw8m3zM9qH8o`?nYZhUpm(>m{dDADD%I zzF1c@5$M8=WlXnIChGadY4414$m|gx8WL>YU>Fhm>r}vivp>ecsh56+g<1I%f;X0$ zptG9@A#->Io9`8TTjra25sMtdgg3n?w1n8s^Be78#pUSHN`)F`gr;OeoR&x+>wtfr zvB4$#S!Vs$mv?X<GQ^yR6Eya=E%s?|vMK}k5KgCXtQP;=71H7E6v6x?-(B2G3s9LH zt(w#Jh)_J)2aBBQH#<ruSAL48D@^%*BeRTZpnuZ-OR+#6Olr!17)fa`j5!EjMT{Mh zRo?1#6!6t?QX*NM*nc=0j&BZAkJ#K<5iQ-PXhR%6mXfg+|A+*eGQi4gkR_k?#(xY8 zvD-JePgG!@ekG2I0&N|)+ezfY<Y)%gIG23iw4}CE9!z|%*=?0<#MN$lVdVY5?ZnOU z0n0JlUT2({B1<{ru(w{<cmM2t`>mtxC=tCBVtlUlMRVI=jK2+BT#hymyxs5aP9)W% zU`)fS5&HKT!j2m<oy%L8Ejf(u7as~mI{LK#%1>ueT$!cgP)%#SnwUejrzAfLr4oht z?qQmBlL{`A{0IA{UlxBbb$4xGo4%oKI;k|@!>@1Bg$tHjKemj(0*gF?#7H(2-kzFm z2Vc#tOGA#f@zqs`PPCLw4L64w@`33>ns2Ku<!i?hF298<^N3f8)e7Y@&eLs2-|&%G zd2KC2w3z5^BEOS1n2(qDF)d{Z%AftkBu5RO&u;-sCBq<iYa4zXwpR1a%}?Tqmo#)* z_$^Rq_&W4B!~c(&T*!V){|;oZKkq>?k@0GmVUcc~M!#P$P6nxVc0Ba+FN5I_s$D8Z zJ7e!<HV?00#EV38K~ZHQm1Lv?d|xU|aesJTkD8@@37cwb3K~B@YeFLpo53Z{5+o@% z!8>iR|2F%Y@5G`D+g8r@cP|RQs}5EBmE|zbaDAum0;Y7l?<T7xv18(blFm{ZeG4Yo zt=?`WE@jGeb~i|ojn?S7jVMtFVZ^C_A6`%qjNbWB<e5n8S5I7cg?F+uO(OG$Qw6aV ze~2jhV|O6w`3e3@=G0_*r*l!GT~2}A4zKGV*s@8(xhnY0gn`&{yF+s2>-Icbk!RhB zT@OUIfyHMc9qiQ%jFyn#xxU<fJv+WPPR?UniK55|BNa%$m!l-Nn$1KG$gz^8P`n$l z4?IzC<jOH5D5=9rDz&<m-@uY>(Zn^;@5dFd9<XYD|G6skZ_8j{@U`WoKxSDaxXsP0 z95VVI9u@rZ)>JxrNh4>XRE~j}sw>xj3)!Ci;Md()_AKkGhyhD$SNpWwX@l32W7Zt7 z9^QF!L8h36wMERY$!-2(J^Wq@UP&a-{Os){NM$s7t73j8$1LsaFOBdL@sgv@PI=3P zm6JH5M*@oQX9xYdT=bKpS=Huxx1Y(2>!!@;5;_iUb{CNANmlaTH^8FPY|p*aSI!%( z@VxxmHKD0uHXYlC&(XK=?Ulp&WKcb6oiSG@SD*ZQPhKxV?;x?eV6X}`n^IOVx*HXz z=xY`mI$>N8)yI@^3Q@h&4MUCM6|+nnGdcwYjT{vrMMC}r8NX`8XKf8`UwP|a%hhcT z+1%LRUXq(^Ex$qQ;!BMv84cnFH@&OeF)?^!<`BOVK~D5#cvV4|SBVwT3%Essd$MT1 zE<;SJRjjn@lD^3g(?0XL+mkqyxAkz{-mCoe+1Dv2-<70x)u(Zo|BXH@9-;ik!BkUS z?iD<*WnM&6)D>FacX=3}ZM+Q>Gl9x}E-Di^u-UoChrF-hiI848qOfBZ9GKf*>qy5T zIOg`HkE+dok&n~!zK!+5x%tq+W2vq>w(pE6Pp*2y%~?J5QQg(HaCpT!>pFmLU9*MW zo6{Q`|AEVeVLYzYjh4}9)~_{Lz}7g^)Ue9?!Hh$OHf$8Eur@~7;9E&lxvY-S&zU?} z0X~8yIIiyDo+M))sAKh~N0(AU;adG!tB8gH?-oIl@L8U5?A72<;rS;f^54ECdZ)At z={@S(N!Wy%>|etN2eK#YY4U7lEwWaM2^YG<(DF}v%$KP5w;#sSwaFzhf-XPM{M9ml zrh@%^6}}vxYbvBk%)9v!^oaE79gD9r+($494OgxYX^#6lF0+zx_j@YjE`x~IkLzrS zrvLB~1iimp$avl(ThgNoVBuE{IbUyvnGxi|wpP$Z>Gksl5T@8@NDnq3#%+JOLSEM9 zRH`-F8uC9G3~gM`@BZ=a59wQqRm51h=g*st6mzw!aifRy;=TymMtFsKKhNwqOKrx% zhv5&SKBwGaukXGZ-^<;F|J@tFQ}6#!hP?4$=wwZdJ0x65WBm!_^l42&>?Xtt;*~ji zxsphE_vuDr19@($2gS)2C*|i-xXeE*j;{8vKR1;P)dDzQ1=Y}KfP3CcFZ}9Rcf?b; z(SOIO_=sglt~K!2^elDpVr|pJ2OWVr865O0oFQ4nKmbk1^#|H(dY)MeW%f7MS@3>K zckeNryLtp8O=vHi9O<P@dtk0P)EVq9z5N*pML8NGK<7)Wve~odgHIJJN0R)0xz!@| zPS2GVhuHii9RH*SJ&biAMXrMlzhx8b9T{G#bIDXN75f@%NKvOU!t;pu9>M+HjRjw( zWc~oZ&0<z94lGuRjn=6}C#`1dAf>wWJ?k8!5kYK{t#Ymi%!8r4dY&CV?Z`t{<~rV% zFpsGdg%hzaKbn}wwa&z?kY1@voS8aFHX<MNJ1|ryz+KJsGnDI0Us-YRth1Ili^e@g z^Z))Xp`^TXFwID$qo0+c`{xvy4iT8E9Ivb+a4PMzt*@(`0b*^%dFOYTO+2k<!7beD z-kdicCBVN;Dch5wvQB{+<?V#?%(9!5iG-cK*$rDR-j`d@du6=3ZQlB~A3uk8di|o5 z*HBW9(mEl5-7~BuaLvUX+4Ql$8Flk>oQX=rq*cu{tv=<9yTuoZOBc}Eb}X3tF(V!( zx4Aw?rOlNsQ4fnX^&#_~PM)uAV$7`e<^G!WfZvac?zl+qK9OQSm2!ns>}7s)SIu_T zki$Mn*oGFJvYRs(&IGdhy$<0(f$(RpL!~y42PHgrz0_Qv>z?MDU`nk;?0Uk1v0Bfr zR1Lq@;NFLLt)uEztqA0ZwKDK)(Vb(=bpPiGR<w7hrVl&QhimB8@5kBSisb#c1jCHB zdWmB&Nsfqn#ypxUJYG@YQskz&LlXKPf@yW1;czQjF!*YIVrkYtxtU5l=gHSbd!o$0 zBtZYE5}}C`?WZKME=`M2T0v%Q^%s=RDys-?{(4_3P2%uNU50s8;no%$D-h+c-@pms zs_(=WOU52?rVCKF=yb3#v109lxwf)TR};7{cB9fuKK`w>xUVSuK3=!!Vdy?yW0y$B z%}-LmvZger=?HU{Hk?d&uEJQNEc)Lj!<M5LSt%G<d5i=FR&C9$@>I`ZfT~zX=M&Gr zXr^2CU;)*snZ<VtI+<2r>V>!)AqH4GPKv)%q?XRR&ou$An}n)&ra#tMncRu3`C=9c z`uMLDU_}`;Ecii-K5G~Tb@wn!%H1PGO?5-^YNyG3n|Z{f;`o%qsFYWfUoigtC9*qk zpZS|L`_X+_Yvfl5;ef`Npt$VWyob2wFWC>aqIs&?=ImAiAquiJU^zBX^p9Auq^ei~ zlP98Ug^c>TnfY>lT=AY+Z?QAOF&JToS03YO#~Gytrlw%xVP6H~?8kJJ&!IYJ+BrYT ztc6z&_Z7FpU#_bMJTzy%c|>2p2{Fu)uV$b)hBNN<onbf@Zds;|ipV_A``dUDHnPEk z17Ws$XR&hwvOKDY1SdI5eYV6)=5b_|U3sw2Qta7g<xH^NkyNQ^9Tn|nm0_A(@Ko%Q z+1*73;WLW9^Oe5#alsxS@yDhY!zhzB&mbE$YtNJWWy#&Gt=-seGmN(^5a+6~^Jl!L z(QD?zjGG}s97M1&6EU@n!bi7*@oc*D4-t~yF0F!UMN_7s7x*HeZ3!2L({x~<7h6T6 zag~@d9=>1o*jAf4k$=tex`&9iWWlR(K=s%afn-yxi8VIBvy<dw?uzJgEmp*<E5>e8 z-cB=iVbpf-ja!q_FMj;Ol^%3WHpimLRi2}1a5{ANs5VpV^##AU)jDBLBG46%0zG!( zGnMO^%5Sr*`oPx}NCofjdnt^2>%D~G^%S)8+L<(dTV?cA>zj?tUTa5Rj|b5thYp_G z{wTUPU8wspcJA1rpLGylPGobZQQE60^zbku<pk>~AiK{JQ~e7~iMyRS@f*JTtVPCq zF^(cfqhCosDsX!{CC`tR9!sqJ$8x#Tkj!D7v3Cjvbkx8G;ODc`=dGKVn?gbIR*>U4 zhvGljJgTXqbI$QP@KxU(UwiO;o-AMD*qbKDX}t&0S51%*fdOaFw?_%~!m*f5=4F~| z)ZT=@qIhQUYii9ZU3+g;-NhE}Ytq`yj*tkf5@9ozet{Uw#N^GZ30**$ujgL%m|?YQ zE_Z@W9$Ue8V$II0Sv)t`st3cf9y&isN$ryKmV{omsm;ZvTheoqw8G0#oBJl7eg|7D zx9ex=;9Y)ruS1leIkhX2!TUZEHhyFET6f_H#MK&8b~93BeQ#%4rR5P!BqqU=qojfb zd||5<Br9z5@u!6^S4u{8$`?07L!Xc(9-JRU&m6%sN4QjBazd^NI>APS;t;>@JKpZ+ z5T5;Gj@Pks@T&%l95^+`t>Ei;q3-?db4miE^Ouy5cS3W|lf>q+hbv$dW6wwZIQc<U zG3m?xHGI}1{iyPlLQ(%8C8#JdCI+H@Hpg;1WT)+X(=fS@`mt0Ox2NC^QE?xahr!ks z@HTiF$M=vmK|JaU+gxcRqp%hJ&m<`^YVlocl|w^4l&&1_Eyci_pIQ<Z@}T}nbT|B@ z_S=}2aelu1k3|0v`H>d~;RiqawD|oI`7pG+;>E4wl(%R4i7nw!kn?8bYZ&dVm#}pI z=f}UsF||TGZ>4CgsF&M6@Vn>FxuI2HNR8Zp#R`eSj#5a2Z+-7QZ>*W}6-~{SC?;5z zNKG+2dIn|V2jIsgOU{JuLgj}xOAPVS!o4i@D4pA@UT%-%VRPnZPfKfUZO-!3=vC1a zh~`T$XZj>e<TfX7THeK}z}KQbN8ReMebMH-1Z_EJII;ztbo{Op5j_Q8Sc^E0e>Qvu zUkMZu7N7A@q;!!!FPF)d5Wr6pTWrWr%jYHG9fVr2=P!3w&J_3S{_%2;TQewEMzM0s zE@h3oJam7o10j2>itBOcCT$$mHf9FJ&e)0Ay{ViuGrA&fe0tWgpIk|Lo0E6;NkzQt z)4fS8DE`}RmGwy*MB5imi2O~%^P3b(+0XR67`o|8%YU3&jW^m7+UPMdxWC80PtbcB zNZJ_;BqOm6Q;{{tjx-|w7r!)X#;f>)_MY9IZ~ort|GtrfY7I{XWM#A2!KZ<sw`ux9 z;7ft4G0x%eM8IftG(0u5;Am6TSNK+HD4bmnyc3Y+z1$DaP6oY_gSqj)+dS$U@Pg39 zZ^)-jcsVHi%qF}#H18Y2@&vC0?ecko=LRnBR3RX66F~dci4n$Wp{;MC2!g<kpd%@S zIBaNNpyo?C0ca~p58)WV4KqO?fYv#MWI7{=LI)R|5eR|$3JTt@C1zf3|6IcZ^%bam z5RjTcUI;r->6&1D5QYF{fB7LG1C(cj5MCoglf;`Rhasge$QJO>e10gdP!vKtfO`{- zpo;{(FocE-=EZwSrKf!<U%(8ZjzS=YI7^ZdG{q(&yaEhZk%I6OFqU&VLO8(ZCL4hY z$g3wSMTiDymXsk#09x(UATR+^SR@Dhsl<kXvEqYf_Cuw3-GtBuSmdD}fsz8MG{rUo zJUmqHH3EK{3ltcbcsgiKJQPEI7XcZlD4==zQl1hj_h*SG24{2_7|=^$2I~Lh20<{T z$uOJvE)aZy;tzGt2s`LdSnE@pD2W#-aQOdAiHE{=p(A30<Chw7pF32$_t*3cYCOb6 z;wJ4l!w(EYr0^GO$0SX6^0sY%w8nf-p;7Q^@-)1#`?ItAX<J^HmyTWoJhM~y?*1#B zeGQ$fP*!Ir$?zMTw#o^%Dvhst%sj@?^qZFT@|@u@Aynx~I+h)lE^Xx%Ed(y36Aqst zgqs?F32P<{!R14}q9bRQ!l`zCnXLDU4z_wlKSF(e9UJkMZfvvs3TqF@Byv|gVDw3g z4%7K`LsO@erJcWpE;2Y;%V|>7_r-AA3i;i8X%`l=kS%?>YJ7E^9}y`CjrFmf?(frl zUh`pkeWfuhTp-N<LZ(7&2oCg+5Pv*+xET7>P@-x)x(lAaE!b(dUTxnO^YyqI^%EdB z@y{%`x_`?uHN?Zth@aBVG#{<~_8ZZ(;00T(`A}0{%bo>~&*|BGL&?~fYNz{5sJuA* zp-SZGP$7%gKySIe@9CAeIkM7Ui8E9&N;?0YLfX`5B2f`q7CLKXod!zwzI@|ISdG=c zBc!Qirnq3PCdC}9(tXo?F1N0nVfz6cpP`(8<;ooMp}XDWkg>ymX{)j7s_cSW$)(3; z?)3z$X;YTW7KF0~)hl6|p4aF|!qZz_Jsm`*cVuRf+@$^00yg!*E)XB2oI!yHJon-9 zEN0@IpBTYer#!zrw~FOr8FGRa-}#pLY5FcLZJL1Z)S0`!&?|E(mBWQdW}$Y3d5q`( z4AIRrKbcMv`mLee9+8RuORyuX=p>gZbif7|DYE<9?c?Khurad{w>K==AI)Y%Qm5`u z{XWN0Yb>dXGy_k&;*uGfNae-)Om@7<yUH)ebSp2u)T{7bt3x?AI-ac|eeYvw;+;{g ze8C$qe|%0b4QDK!pyB0KX?&*IySH?oInG4wD%W1CYgV$@1-}hdlh%3Dp#B)*NGQa^ zJN12P{Cl)qx(rPQw+pj^Gon8>5vsu`y;23J3k_ksZE2mC!yz&E{igicKLLn~dW^O& zW_bYI`7WX`sLG<Z=soUkH!n_jx#@5%rgG*wxR!k?BWGH}CG3_E8CQ@~PE*{Zmfm7C zcgfP|`D7>^()s#S7950rzV<5R!?(=x8<uyc{c(~#e?dP+Fz`tbR%g6K-%WPDUyQ3) zZ}9(mR$2Y6U%!J#%Xz@}4e2zSr4~nWC4)ip0?M8euEdOJkMp{6h71L$)}j@iTxjrO z9sK%f@yKogLy+}iU>`IY%_`vaQ{I}NtNh9Xp{%Kr;E4Aka=AM^g~^^R&deP{!aG}= z8^IVCq+j*Hg*~a|?e%`IZqHEr!+KBTA^z2@Bij?IF*!N;JQYfBpNIAtf~i`pjd=Ch z<H)Ug{dZ;7O{ZJ3Zj{uZZsyqIwh0!7T<}Z^!fX91X`g0}^A@4D;Su{X?JRp!BhMY* za{STdHkbsY<iwE&g*rHmz^}ZkJgO;8d~)#&k-~46CEay~VG1`0c$Bhyk2NJV2Z(e$ z*vL>r^w)4;bV=)a+sYNL`ap-fyvbGFGd5HacN&!kv5@ydH$fvtwAgbX81i>8m|zR@ zVlVm&M%{ry#W^+ESd#Xrmv=W3j~O{Cd))2M(yYrzjcLs$7PP&cTzRCjzt6%>@_rb> z3Rfa5t!vckW1!R8f}{C{Za?}_XEf^EFI98r3Ou2%^QL~o%UtB&!8K2)SBf-E&!_r; z?x|fo2xs7oC`sNAABgmhyFm9{<`ftu<Sdv`j!JS%2?xo{IA)tbBcfk;8cAt#a#+V6 zls^SKsGSf2gSCyr&ud<oL2@ThW?k+eTFdZ?%UCj|3(Xvn=qC}}C&WU_M#5k^)~_UQ z61a54&y{HBoqr&?OrdS&@Vi>Ot<fxSGl3g_uOoL7iA3sb36Gi)s+)$fhS`HL;PCu^ za3vPM$+hB(<xiDG=r|=@!2OeMhBsETHgBDqlUT*qV2>oR_Z2anWIZIRsf$`ZxBn<( zo{7|*Z*)+I0(@{9C@dvB!}w384VD$P#!t0d9#dBQhn0-P7;W6%LBS_+k4(nELCtv- zQbT!__BzR45)3an?!$N<m=8=~WWU0Df2VK_|F{VhzvC0M-`zTDkOiaFcG*S51ec>X z|BymTTC^;>xystAwb0D^3p)h9P=9&KvN@I?(xksbwD~B28~oJN=4$Uozo^ImFWR1- zmKq}5YD-u7)!jq^`A{9%tQoS&ZPa%&=xqx3uy=eO6!2wakubs|O2nT8tRcMx@oAx( z?Zyo5MXltRP|y`&ld8iSR}lE_AKHbQPozNB-ix%hh-OMT^{0N{;M?hH)I&DL55fL( z@9X@oQh3Bts^$=!?k;<-yqcJGX74>uxs<IwtREvFi7;Z0i*HY7YEMBzGJ1N1>Pg#Z z_19|$?oI-fwZRbs2?K9uz%0HG8bbDS-}FHbn?3qoe4RfJO}>~!;}p(;HGQXvNunOE zCt10SsZ|PxLrTA3!W7?74%QMU$0pIpCFWz4IJ`vPE*FD_9|Fu-UQLmvzsY^$gE6+q z0?rCqO(iY-=I!?^Q`pw=hpOlx^Aw?VV|%Uo&|PpaLuQJQlm6q-7}&PkeE)aI4C^-< z=GxtN$<l5g=33~slW|uxx<^$P1*-T|OW^(P9P$*!+<WjBTjGS%Q6obiN9be=o$;oo z_m6h+45MZSd$|>7c?5N~`{rEyFW!q_n$azUb;vRyD49-9dTR@{b4@cDBOlK1@m`&* zSjTcg)~MY^PLp(B6@YP2Y{e((;UdM#Uk&b<u2^njY9DFP7DRsgusg?KS{epph~APd zgTdXW;Cz@Fnv9NuiJsHe9YN!~_E~ey8^_mkE(C<*7t46L^|pG+^-ylbXF)*Rea#0! zTdxIXz;hw}D#n9Y<{p0T1Bwu-y%`}!rhfZ3q(7<;_dEzEexYC%_l-Y`kuunG==Opd z#Ptl5KiO@+o-=f0V#VzF{X&ZRzMO)|3DHM$erqli)zw1zX+2v-UgL0JTiN?^Z>k<f ztSO3ZKW^Tsxkvts?@jZ_m#5bY?rx$M#Q4n|?h|-qJ=j*><vh1mv9H_KzOQ401ERzT zj)gv1*(l=O%l>)-54?63upZhBj#{^x_^v5xQpZqJLN55^{#)_Tbu@i-ZLjU9Aqlc4 zEMPWK8{#DxnNq;H@C(*vU>Wm31(8c=IUlDX*hx}c)#K}#C3*r9O_*P>3=GaYh-nd* zkPO1@-Ay;*!bxkp0xIR`+_ClH?)tZ5uVok6>$S1RObpSCm+F+)v3{MaYFJF-i#HB% zEQivBH1fJOA5>FD9jB3_)c+LEQT(7`YuzFt5G-TcH}kUF3(qWPc}c8ZC;i~o9`wP? zuk`DT*@q`YZ#{GmZ};Q%o!lqKr3AiqUWM-jaELCULzpz8bVyx}TA`TlcykAd<SiaD z&PtRs1)XIX)xqEKojx{uW6na3-fbM~=5_oDowZe#j6<r4U~a4mSyQqNc>VQ#W^9DY z@d{;6?m9;o?7f0P3Q;3<`C4S5Fajz`eHfB#l<3eGf-oYS=Cy80TL<q8y+u=1zSBEY zzwJfYa48UqhksYC@4f1Biqz%Tqmb{Pr!Slare+b0Vw1ssi88D2WvVcOkk*9Jsp-?y z{6Cw-mt)eR$Ir~+PBqD=_S2qg>9}d_JTM1<yBcOswmyinHNuO|!a{oBh&}ti5@E!a zEL0)l-h1jEc14CKHANN-!}`&lv;OK+(dse04=ErN5z21=tM;ane&OU@LWGzm15aS} zyC8F4RMQNwV@<sOR^dxIw}(q%6uItW%0d>MR`y~aw<v@?6!5xy3Z%b|TJc1i(!`y| z`#I?7R0hVIx5V{si($ZtYY-JA5`fXV$Z>|@iV)nZ_2X+djFJJOh-B|UxTjxs#2d^- z(m?WbJ{e5Dh9X)aO7$NwgAcI^>K3B7f3?U|=NKQs3nNkmW|YN0tn<B{J{+3#R)<ow zO=`LM3+g!%r?x6nwId$i^rdA6Z0~m$%TZbWW_awtJ^5_*xE;v;ftaK`zw(I+NkU9Q z3<)9ws-_PJ>&4^vIvUFENR4LNLysH9u-={E5wpEw-tcn_{LJWwL%y64__Qd2A=ZgU zuIF0}wo^k_j@?<SS2Ka!WwK_+lsWRL?{?LeqN~U(g<x}QgNnBbVJ@0))&A~^p9CPL z#^-=1Gr|_`R8ar45m!vf{Kn9k5aH%BNm*KJTazh)x!4XK8|dH-T3b>+>}-C1=57Z| zoCdg$nNaRyxxb__N4p-$b?*(|npmrOm488n&=4cy!J0$(i4mE>CGiENpmEH`)}%Hz zySOyv5oy%AcP=2yj!OJDFds}kKPobe&fCLow{YW3uWolV7PZ58-Amr5xt{VYsrS>{ z2QE38F4##}c%<^`a9x{R2!`z_lvOU*q_r@)szKb3wqR)Aw)Fc&Oc5_2h#c@;6hF^a z_&p9>D7Y=I&G$Khx4_~gk|X(*YLkB#$Ny#uzr<xC|FZtX&ZY|N9a<mkUW4`1hnX4Y zmri|qQhw8zN6XNK9tMXOhjTItGoxo)uouS2wM1%t94&#YQ|GSqedi$O^Re&YbaBz+ z^eX3rZ-rQ5Z*`UU=LZyN+uy0?Moiu2SIHbX?wI^x(kA;)5+`k9<yo5`J2m{qlH_wa zsdL$u3{&ABdDQe|YUPETA|v#2f+oRt$r{eWRjkx;=ZJxSoId>aKXMhy9aB54hh&l< zl7W3NyOMQ>kV51*8jg^|G5-(^z?zU~GhP{;e^#~^x9cY2yOD9@_?s1J<iKN)pS}<K zH=I0pgZ~5-;^%3mBkZDcIYi@6LboVV;MuB;Z=PKpRHsQk{<@OF1H}%hJ!9}_ONOBO zxOyN8XBCrjQ})x-&f}wMQR_pj=Gn6eOe=Wuwu6!)Hail_HNaHj`r|0;dQhADtodgt zcY8Km3`#V&=?V$hgoWpuKY>xx;)le>3aeQee;TiBDLrLt4A17mc~Issp7W@(x3lIW z)|%}jW+~p!ZW-<KM06L(#PXG;l1qOwU_rC0Twd+{l9OT+ZqxB=@d{-=%W~eGoa5Yp z^~<)u&B%~}tyR@^HCAxb)CD#c7k1JWn{b)ES8p#bW6yPi?`G#O{8{A-&GS_fnYFue zFwRj;Lic&L(T-Se1{n7L3bGhFf7WWafP;Z~gY^FiK`@gcA_4&cZVE(wARrJ&i|7VK zEjX)I`Z!+#4_a{l{eW+xVL_Aw;sXw>h;WF|-{YCj`8hv{U|<FnU|@(LxGac-O{rXn z6GYHZfUPW|B|z!bgwTy677PqJ2Q-9nEAx{41gC=NjRl1ZFhmT3#&sG!5V3%G0&W;$ zCJ=$Bi9v(|xPE&%p8_p|IK+OSMVEkh0Ypy7k`PaUI1P3NA_!25IUBJJi0ACqA-)Ah z*?%BjLMcO>J8{V&*$QNs5Y;Y30L-cjkrMz*A3&sq5{7gPA>Km8Y#By81x!>ujtFFH zHAzk)x&vTM(}<s-AEV)<s#?!^DZls(>7GU;huF^`*8PVbNi~c3@`uz!HH#cB10`5W zjxqoh6yi#a@*3JzO^xywsJ#f`LCFPle9ebq#|j-SF+n*1A|k1FC=x)RY&HaisvXMU zP6D;*P691T910sAh&D6|ZK*4wLxAAdK{C4GHz=%v97dCZ9403R6vE#VGprBVf)~Zg z21*m&n>sJizD)i!JS5K!g$NR*L59^dp@_u}3)PZbtIbCAMN3IYw<r!iq)QPC6~d&9 zr3$6utBhsI4h4IGfO&B`7#IjF9x*<IN)!tj;-L9b91+V83t9=XiQEs%44AFpKr9_V z;{`C5A7B{0P^<?iN!>6kRsbP95ldJE+V^t=%Lo9Y8N<@}uPY4^L=KS{!$L~aAw!0+ zAc6pt+A%EoDk#c>KXwPeqdgG&72r8bLD+jh-(U!KHQ;qV(b&#FF!8Vuy9tU~T!hU8 z`0Jkr>}vpZq!AnV7E+UNGxh-xWMgW_{)`F5XdA{x0vx7q4Ey|l<uezsl>uDzWo!!| zv=(%wT$q9e1GCQv89T;#1z|UMiP}|dVdnrSD#zH$z^v!oVUqz&+Mciz0hd+9$FXGo zj~%2*6bG=&r6`U*2~+}g9UN;wp;kkjMloogdj^gfJ+w8~iNg;V2xk<hjuzV2dyKOT z1n3HHai*xCeSW04p8%Or$#K&{pbNiphRi7RzwP8D;7A2=$;W-wG@ebG0wg=?xR(ay zzf?4p(}mO(VZV4sE-pq>Tt03SAd74n?*Hm>N>|`|0_&~49ybqYnYQ3!Lap}S0tI}z zt`qkgAk@bp-2av6+!@9-0_-C@je7&|jY~>>b^any2|6Tj8JE1tb`JM{6X3RtOApL( z<_hi@pp3&hE<X^dwB&c)-h7dl0T<FOh(`u-{`gXQbZQIt1dw;&0Jj^k*e6^(Rsi`2 zKHhhr<wArP1x(5VDP9ZE`ay|@3JBcCgvSHub;pVK186l0;yoxqE&DwTuNd$Z<0QO0 zN@$-!Jstrv)W-2KkE2vCb$8WXD)X{Jf|qe$0=gf`Fq#T~;PC-|wb+3d4d7dk;#o*Q z@qeS^*8|%{s33kZu(a4j@PU=m6f2J33dpVS20s)q$@p7*7vTF{|L<~z0VeL~Ej~7c z1`!0fT9hijC4h0FhVKaQH8aKs0jt8#9=`<e=aazaX@r-pqX8Czt3yBl2{Oh<hB!OC z>>v8>_*ei1TMzvIRr?k6#`grgwe~Z9Bw%sjbo^St<^L7nYXKP2Mfe_oHf^Q&PeA$F z_BQ->z!CvJ@qYlee?5So2Vg7>;>$8ZZNhMZe*yH7pW%;FL;Ftf2^Iiuzeowv0o;$2 z1Q^i8)Z`^cKmgb&UV#7?78=m@Nf<WYda2erLGzzp<W0kh1b5I`h74#E03m-QotKvY zQ1Ybu1gXGu*P9Xu0nGoI5gY?VS1kz80l0tG1Q4Jv(w2Y?c)igWLXZRW>4p;sqCn|= zjw9$ohl&y2c#~@TvR$k*Lby-x@gZv#goqGKuNU)%e<5%O*2F^rfwc=1&x()`AE4zA zB6NrHgq)KSPC*BU$q4`V8X<<9Fa@wUH8bHUAQ~Y%p*|qE3kTs6&{E?fYzJ(G!%s*E z^f3t#_5zkX7A1rL-Vm)whzpEnD-n_ctrlfMY`~LV0!QaS@V^kLSZw)aA6b1-h#mq< zMo0)bHX}ra82i6C`i%wQ4zRL!b}tyDUY3FqCWMNekhlr)BcT>B@rDkBod9_XC&F(i zPz#ZB?136yDm0^#LApZ-Kuy<PguTFAbbtxt0P$7A2;%`;t;Q1?1EZ2@g!gz*!-$s= z{syRGR}c;Zqf7OKxw_ENKr|vEz@`ukq9;I(bUdPa04|M`$O33RQWIeTa9DIiut0@m z8ae98e=qAS1P*fQNd$uU2a};f#F&V#p_B!giTa@!jci2DfS_(%L;=9WuPL`hu)G+d z1Rqd~P?SgnV6ORws2hL=$q>;3Ga#l#v;-WcURe;)0i#kMiSmHazn(;4fcg%>MESsB z?%7(kaOQ<R8$JvS*?)6E067SIsg5lkNwfy=p^hUe0n9QIPjm{<>`W%|11O2*5am-s zcP=@{jqe1UFD0!HUW#4=l(HkpP?|70h^RTCigNuUk^*)}&nqGV;3*Ub2Xclg|MD0Y z_zw#58WB_u1^<f(l1GG|D3Wa89p1eNc?UT`1d%jpql2^o*{X0rrGP|wgrG>kyL6bz z3R7M_c35Ki|7g^NKnyAcoUn!sWC);Q@qpNYmbf73lnClWr)b4$(=VIYJ_0aLrh*{E zCVdsqCZNBB8i<z~Dw>B2Xb;%A%|3%f010waK@&_+G6k!26vHo%q*g3QkPC>o3DN;t z1RO!#<4R5T#SyGv00s}AUK}B>2c!<AdeH+K174{0Z-8b2`{w-vRRHd!asr|Q<nTBJ z36nu>?&CGRj{Rbo0*wET;%}&k37V!bh^e4@L9TI$@1YjG#3Ke6$m0`NL5V?b35f@x zJbQ_V?NOmpvogcnyn2z16b2G>3IaiF6aFj6O-0NAg^Q*lZUmMkHose`{>$oRLWJZh z5>qtU(GoiV5-!pc`vd#Qdv4+>V7KOeN30FlCt98u1%OLYBo@Q@{~Z-y&dvA`6Ix<) z$b$hf0aPIM{m0UX7e?<8AnV4&q)nzjNizWgGseU}0rO<q5EB90&^IUIet=~_C@~y5 zlziy#-gWVp`Rsyx<w3!Ra2XP#G?l~?YXW9`OdwWggDR)qM*JOke4_3W;{%RKc|lwX zC^P&_JOi8=2DfL=C|)X^(;Go>8c9eYnW--u@C-Z&6YzE!mVzV>O7AlTi2?V2Ey%Gd zi8QoJK#k-#P!k;4ibM{m^<Bhhr}5u!Eh~5!7#@fVn1rP%#)(84knWE&i9fJd)O<;B z08cdslhguF3!-!qCjc($3yB9*&c-5=FMxTnN=U4L6_40RA^=!lyoF>LK%i(NK>@ZZ z<{lCX07IdVqySL%WSqnbV5UDq0t@`6Gdd&@2iWEykQxF)Jz|pT0aKtyOd1B5Y?Y4G z3z!0ZA=01!<0ed+0i7U7t0XBYEDvNchl~tzDoH9q@nRptZ+(fIJul_XjW}N3U%xn? zvyC%5j{pZZ2M^>;C@BH>jkcDYs)i<qySKYThGGJ%yyxomEwk%u_)?C$_0v)>D=~d+ zow`ql25vP}C~vF?cv+H3vIdpT7}onnU&6bMro<=xK_J_Y0`O)q@(!pGMLEjK@Wwh| zgoEUp>jb5le|6Kl2C>gWx?9obH@Wz?PF5nbZ0D-t$}(WjW8ER}AVD$9{!(FqHkXJd z4Qi@lO@Ptd1YN<qBbEkbYb(pQJi-*6_xtV_9N8-ge+z7cTie=+8LiZxw<gCrZsd91 zFQ6OnSAQE~;yt*a6Rcji-t-Ye*>Nbf-yOitYFAZi^dy8c5x=`|{BmCU@7&49lPIfd zA{x8;Dy!D^;3XRojBaI~`I~CUXx=5KVm}*OIWRjGO><|Dt+}d<tYKTvru-s%dw%<8 zL_~=jWXTcP-~Ep(CH_Fgo4=D^obDh@4(cTX4n=#ZjVfb5ljj#K5x$qzuYEC!4xzJg zwVODfIJPehmnZ}kSNIe6uisLZFF_6{;vE|6du#+(W{dv$g1Z(MQuhWL`q|t%-HM~q zkrxtI7Pak+P9$)CofV@8`XwS{=G?HPv!U5TR2~`99dM8DmS-irKTXgVd?)zfx%Z<2 z;)9S{CY-DiYnLUtIl_^>Xt{DT%#ANruTrDz5TJ*8COXqUB#xkzz49%NfoW?3-7YQC zT*Q4ME%KD@80?)#?hK)5SPEaA4);s_wmnSX%YSn2w0|*`mQWpYeKc`yTK9+L;E%_A zwS}JE@lB+R#*c9;5~4tRTbp{<^ueV{5Sw#fW~@PA=92F6KzI%5F-zvkZsmB}hP=V7 zcs@(}B8LkmAD%Vi&=j8;S9R3t;)G6Q!S9j+S35nzG4MvD0&CMTw#Qyv+?f4|$R-z_ zPPr}Ub>M(lLEyqD|DMBfnD%{&@y+O9K}TEr{k}!)^p;h7<42nGy3g{+pS1fsJtDIa zbuTIQ7TKKO`-z-eE>?8Y)4vh1SUvns4?2=E=bjwbDYgGo-1KptU3oIERCqw64)d46 z$CAwS?`2>wtABWtA61m&hzxxpUs5OkH434ybP7-lx~8%}C4~P?6Tyj_po}{!K%RXN zY9BPxBZIukRNmZ23TX8;SIlu&Qrq|eis;ktJynqEjboo^)!t3>n@J;de1-L#*8J0e zVIVBQJa^vq-|)oMjTQuA`6?k`wznHWdD_MO_@D(W;bv2GqSC`iYpLuIx@{+bJY=Am z?cfl#<Go_BZ;zrh5)q=Cg(o(uP|8Cs@=$!P0{cNyTr9Al<hkv8JKHRCvfy55!<Rmh zi*G^dA0{!~`WW>3n>Y@<FJEb=S~=ya5tudfiX=R;NWprMX|kW|q_5pRJ>G8-kMx`` z*GD;lVJ6<j-~GVYUBRmvW<zVv8psPPkLKzTbzE_dskq<N5A~8+#7(-)x>LjNj}LVq zjfD$M&hXo^t0=K`QAt-1g`J0WQ$jVP9!F@HB7dmPi1ZwKsC%3AcCWEll();z;K$A? zhH2WXS>?ffk8Y)AgjuG48D56pg73NXU$e&#gJYD&&5o3^**sUQm6#RNas$$`Ocg)z ziF*(?&|qS9f_nWY=NI^2Q>E<n<~ImkAP8H}klrUD(q`$fQjgMQCzo#clztMGyZLE? zt|Lg!uRuKbcCRu=YX`Lg<XMUN0YVvfAYjFAm0ZAP^|$=3;HQsE^>mLX!yn$HvLksf zFM!)#^)EF!r}-UWhisSC__q!ti}H)mXTydaT|QxNnJp$1@MfnJ$8oyg#8w$BQlcF# zC?Tz&KQKU2`6BP-gT%#u`{In2$4mdrjEp~ou;r#nJU*1<GK#Vj2sy}_f~ZbzFNTwK zHY-vhb{j;Q4VDgjt&JX}mX1D92&wa^P=ZmUDkUUK$8>Sci>TWxK;kI3m<?2CGm)nO zUO~a5<`uHmBbBn)-BqrCDPs+aW|wNHwO?{a;dz&oqANikeIj9*H*cLD#q|X$R3$e5 zy+4d$`<uz3?`fg)hkjz7nLBeyfOxj-!y+>-65)l!9)z8l(wM7D-_bKR+OeqHmJgiq zrHWRorA5|3-;;FSJ=V<DCknkS(c+=7-E$xQRc2eP>Jcuo@*{lMDfZg%>@PEa2UDk> zbdvA%L)DQ2Vikf}d&Z|#2K7<%vfX?)MI%bRVNG_iZX<qDFmyD`N%WRhV&fUfqGzSJ zAME>jnox8y<^<w&3UIY7aD^O<u6My`*HKcCcS%2e;DtYO#0LyU1snx!|LHj)@NH~> z7ux(B*&63kT};vy_sX4E_0e|Qc;G(4E4#5*7SB0A=)9v!C-O9F+!Fic<}+@O+e6xT zj>VU#c$G#^b2OVwB@%VnD{UP+QnQ)dpqS2jItkM3(IdyPz@<+Pch$-~t<<~VFX2v4 zVPG&CR_pFjNn@jOraqkk&ykF#S>d<k>R*&0?lM^;9t?Y!0$%%v!;02cZ+frcBM6%% z5#n|ukx`4f&Gx#*-__5y4;Nd(i!FF#ls$pM_l&&xv_<6-)7K@06m&$_SK8i+uA1F7 zZ=nrSASOmkSkTzO`;+}jEC^%=v!1O!s?_Yr?>K%@*uMPpI*k=kGJZIA;9EjM+_<gm zmS*gjKh^3#YCbl;$qa9XJcCBohln}s0}0HX88!Sw6IFx0kc;~K-uIN_?Imsc%>Qza zO7YnYN0_N{Ez4o=aNSjX{hz7`ZX*+uQ#5tPR<(w{D61~kt`+^Jpj5o+24jxCi7k=0 zCrGKe8U5@#sm@^C)JOf^%rLB`sO_LqI&{QemS_>ZlrMH&(v0BEe8WpZ1al$B>rnk} z_@67+JtV0pInIs!Oa}Hi8}d}IL&c-qH0?-pyHdIK8oF56q7#(o8E6>73LC9Rt%5)S zZ~GvAqC||;ve<)87KO3sf57xYa<lO2m@+iQy51Gu10><FXn~)Grhn`!@`a1>!Ybu? zZbi5a5_w%>C^XfHO@CU0FKkwzAou7}Z|7Fb%o0)Qc1AO4J$`DBNo7+1e)3@Ov*)!o zth{^G$=fQ8zJY9r9ua*Psm6x4(jM(~GzODj_%-q9FvrD5ZY~2mnMm+wowmA^?4)_6 zV_(_1{AQm%@4!mk-|$2j%)MHi7`+Oo9n)^uOp~l{sSGCi5Kp!EKQLz&Tv#<$i0d-h z8Oyn0*V4;8ovOc^udLT6!d8coK?*g~V4Fc68a?PH6=8B^-uV<&B1t^*b8lf>^t2yg z>f-VDSI3+T)+WQesG>Qrw(mw7&LtMo#%wdF!7D+T1U;T{Qz@r%De#}J!?jI43s0vK zQ_P|H3EJB0?c9)_@Kw__<s6lyPp!AvEK+C-7U5+ivOdiUI%K+BZsm?sI}OE@;!Nho z-+EV5U}VM#nB0o!iUg!Kl3)TuOl9Obs=g~P^Ea!<Qh?aQ7LHNDP5ESR&(jbfl~>Mg zF0hBU(Rc?7RU~-3y(rw@>rkj|(e(o*Best4u$nSek{Y{{<$|UR*$cguj10&hPj_-3 z?S2Pa1;0X6;Atcj$Ugsl!^4Yrw6&zQt=&s~C0(3A<lCmO^*1}8g?{I~s0G`?12xI) zZzl2TEwro|yk#djFfM|yYb{y{(}aexf#`6eOd`%gty8*va%{9yc#a{D^%C5SVdO9M z2$7%W9NQ>~CSNN0xj14BluRUx>H@9f=5e|np54-U<cr*0e}pU;HTiw;&o+0$9ebeZ ztzWNaIuVP}SP5AyW9+r~K;kW*$j!~H_FKf%IuGXyC#vaR7ch>RwP#&z=hilc<=24& z&gfgqI|W$A&S$UYndc{`P|^OuyGv)+dE%nq9rqr5*ht{5fMrqd-SwgrWc@)l>>s|g zjasG1B`o*DY>zY<@)9AhQuxgoM|h`m%-)<(YgG81TcEiXgfMKR9V~2jR3Hc8*?A=U zUNlyS%{L*ZaDtOQx%73av2ergd3NPjPs98s?=~mi9IoC&;tKm*aU+bF_WV#4^l>Q8 zqn22$i>SE6C8b0ar-~)Hc4k<{Q#9yau=1M;Cz9xC<f<x3;xzn4yt&Sv{knlxomEkI zf_NH<Qp)A!^q+QJ-!>X@TW&(L&6_EqjpBpu(2>G!)=F@$ZIHdX&-1-g664%t<d`?h zp80aoPLY`VFcRwfstv{KlXf4BQ>q_~?UA&@v(<8;KA%=k*qU@2*b^o^%1_AdGj*#M zcsH+!8k$|}Za<I=^2nrP9sj+=&L2;$O6yzHyG|}-Iod}BIWN0w3D}aE8u|u}nVTpy z%{t2vQe%ScM8Q&qV^b1sZLvuO^AnmC2^kZ;4Bhzk5%xA7b;Y4lOx|c&jfHUgS184E zzT}aKxdxmxi_*Q*EFkmrH&oHlCFl6Zq?0M-ROWp8^a%#myrubPEZ-xFGW-Kpqa0HV ziFa7$DoTZdljlNr2c%~fur_yhILbp1xq7gNIPJjvo9PU?8@)rRF-K%P`A6Hd5`ItY z>h_cgqCNz*;HQj5jemdZI=gFQ^|QX^5gz{ucQ~7C#?|Q=suuHimTZWC?5Z-*Hq+=X z!<XAd*5H-ofAEcIj$0^b120rPX}cmegkUwH>8V&7k<rJQaoIT7yBOhHnOYc%tuwF@ zC*gqorf|%sF%YTqjLr*s7WpDKNR1k0&tnpYnGlUFqEq!<mFZQ__$WQm(q^6EP`dQ` zYVVd%YG11e^`m5pb#GCrA)8`roFn+6&>s#2cv--Vr(7<i{en5RER*_F1;Js5V6}i9 zB)-*^ZU-IsDM}|DOqe<?il;BSvMMhv$2x*JRr^tWQ_zw_E;^N}L%rE}hkS0!Bbl}w z6Ffh><JDJ58GSAN#22%o`tN<%bw*<EAG`W-4_%oVtxck6L+J|p-d!i9_Q)E;))w&= zB3-Pg_c2p42&(NNXWGuZ87s?UV>A)ctL<3Q)|T&z_IR2P<1Sw+mbQFo3&(Wg-*E5; z>qmF~k~YJ!Ke665Pb+)xURX<3b4L8GN5D0A>6_v=_l+sMRvU9M`Oz|nJl|z>DudJe zO1K`67!t8&Ter{1)as)C?;-aW!}{+g>MvCz|2+NbKTOWtsrmEsTu>deZ0h8}LyjTW zUt`(7d<B)|(yY1)F@oNyj-tiZV%V~B0X!SXSP<>4@@GQZWod>|)xB<1+vyWyZ~VJg zs%e7z_Ga5+@$EvFFk#JsN{%sRdI4e>H&fOti~-3tt2e~)umfYA@u@d3B~}LIZphX0 zRd>wZ@f1^YjD(T3q`J~`Gk$4B-cNs9O;C3{A;$B>F$YoE4wg6@zmdH$$5uX%--Cy6 z0}_7W(M%+8O1Ex){1DTFYQfX&Jb$tK1{0}o`1|`zPf(HX$(IUO+%b6Zrs{+d<Tq?J zy{_1BOa_hzy591^g-pI(Zgnybf008x+tsv$Pzo;>uyqrUClaz}g~XcHar##-RQ#Ma zC&de~^E<Y%`?sV-t5>z6$IFZNrnE>+GJiKJ*E0xyOR2<1JHHzGreAzj$$o|aHi8(c zlXAZNbB%z{uTT1lwQK6ocGm(bQ^9yVJq}DY76s#%tJHFhfsI(+`@9W4+m|MX(H<(M z@5V8#bj)m(O0e9B%DR)H$Xn9AriePKzQlh<%8i!~>wHE}z`Yx0f2UgzGgA&)r@<4X zBb&r!Oho$UN`D|Zy4sr5Q`HF0Wg18t(gmNN>NebuoX%Ug3sWqQ^+TE<du-(NO*pF# zccv19dydK!CGEy)A7cWRK0MO=?T-u;#SHK}^jw2+Rjo^;7?9b>?5=WRf6de$GP^IM z^N65L6;^Fv+xmQ-09H{5&sTM$4~(k28bCo6II;T7nCoqrJ0vR^7)LQ%@WTKUfDC58 zqO?pNPo~f#lnJv|`+QKQ)#4$_`;$xxmLZ6q`Ip9bvlP=BiVObtVN{`l4n+cZ#~s|I zmoxmfDVUfo2DYQ`r^zx-v?}jH4Mtu$2ABlcaI!c36jJ^!e7EsQm4tQqj6>*?vg43k zTKPA{a?c^K{P$mtL(8Yz4@ZG~_bflaeqn0Kw0O^@92YZ;Ui9>AHcdQon}6lUt;+PK zf~qS?eUbTa%`7~Sga&Nfo(JD5=EWtWmzO5q{w<J<twFHG-t5rMJ*cBkUsBex?19TM zbZshL@{e5Bimo}~x}UOQz3)>^5}_}x%Q*1jFADUXQ&oJ3#Hx|w-H}jZrSozI<E5!F zd)lVmatK70lnc3Cenm}QaGe&;ZPfd4jTYS!p0SARZ|-^aTN#_oMDM2KA2w^UJ=$L( zeg}E0N?Qk6X=exKR4Iv^+Ml5}GgHArcmrPie?$%j&}{Q3>Gnpit~HN-nl2W{hg6Yn zryzemhvj}Yo!~wCdRU@Le1Y}y-Kof^n2i=HZi~i*TW$sWult?;Paa(<<|Q#xRr-;z z>geL&03kknsl&+fSNF+GPOp5s43jW-OQ}PZU6d-AXx+TNTGk^(mie!<^<N70#`;TS zY<zSrMxk(>j&V5@*qc7D(I053(|5z^K2xkxlP0^ts_U_0(N8LyY<!BCRR!N+P8E2~ zF$6#3qGz`VU23-GtM!uzSbQ$a7z%Hp50J`$fQr(D!22&HhIL^V143B)Uyl60E!c&> zYTGypWIlyd+V#!xe$nG<QFc2qaxVBwqY&C)pFV@vvY%1#a`AJgSIG63s9>cmj>eB_ ztFo9~o4G~)z+0Rv96db|7X<LwvC@}^hh(EO`qZBaE-~k*Iwt)cu6GRrw?14CCX6PH zE_O^;5?JQHW(81FT{@MyY(f`uu50~0X!2xhElqEkDhybkRtC-rH3SIkBJM<=rR+tQ zSZ}0Sse;D`6WQ_3PBr4T6n=&J?RNV98n^CG-O}%*^gK=*X?79gW>t7?Hy5KV>_d2N z;fgonTXO-bH$(p$WOX`~ujr&JdxwNVCyN#N4WXTyO~vj0jTGWwkIFO*;|O|_9;8j1 zlnfKs<sJWJ`>Za5*m;L8WJ{ZrS*$o=uJH~5i?Vr^V#A`0l>ZMhlC7?k#b&5*lC8b_ zi1*X&*fYxyr|FbIEf4lGxN+~L-|9j%#;?A5Ds6N?6m&>Qapp5G-d-}Jn#r&g&7}~I zDnZ<JNU6bnI#;PCtY2qs_iZ9eohbefTkjklS=X)c#<tClopfw<I#$QFZB}gCb~^6Z zw$rg~TXl2ZcieOCH}3cEUeB0w)*5?M?b^R*&8d*X-pOIM5GOgAOBE8i(;r3ma9KeN zW4bGCU!Ja`xSuuLwI4NS#(t-(R|&!)W*}4dD3gm1w@Z?fkrHSy_!@qhoV_VieB__9 zk)|&BBi$KY5LMdV)}}AlCQR-aKpD&V)p3{p4BGUM;u~b-Kr?{u7=fw`T=_^M*ZWr4 zANk|4aw_AX_)0Kq&Ze`kTOi{U<kj7*YFgrtJb&O&eUqKed%baq6g|H`*WZ5ku^=rQ zG?eDr=3?Ju?DnGS4yLYW`trZZ7ORkI)TX5k&xlcyrXW72DVwe(XD`DtjW&BfYv@>y zqtJ4x#M?wb$bJEO-SU3Mip~-c!Sm|J!df?eiiVQ$!$<ZnN912sJq8sHR512U=_&$! zplLU@t%?V<GCz;|;;u4@OK;AyJ>xz>xuSJ~e7!H+ZqQT06ilE;1^m(rJ7R5I2G!jK ztQL;vL82->K4k@mjc6;I-hmLrPr`ykt&DrS%@y0?;5vY6`hxFK%=GrLq_7iBNm*Tt z53t6m<@G~PKnjD`!qghQ&&xO9`$vtg@6!j9-sjDMo$e>2_`RUsCv<>b$NR^4GZXOa zz)i-`EJI%4g)H5rC5Q56y8Ah{<xj>GLp;6wAKAr5NM#&7ImRu33%@50>2Db01#@v! zFTu%xlT$!oe5<>C<Db#21gnFGyI;zg-0ju)x@I}(EtX^5mU=`z;><o?*M3?7;xDMf zx`yX`2mxpH7fr;mPaQrWc1(8iQ?^I2zj*oi?O#2tt^0!ZU?3|~(Lxuk6GDUur^zdW zn|!Pjxp&etqm9nDTYa;0B1x7$P%fpc$E&m?-c<nr7tgYk*UMT7xBNw_To50<6!e1$ zO*cx5QZwo*66*Ig=U;@<kM9p|dS|a&Kyg5zl!d-Rc~4bS9@4gtZO86s1X)EyL4Rv> zMux!#!zAU<U8{My8fs+lZ^B_gu7Ytsb0h9-hiIMhirnVLzL_X8qtZ6BF1uKc0uU+> zX>)*w)hm;zLiS%b3cHQ^*$^l)@e!M#wP=CXZFNvinb-wJbzvPZQ)r`s<=}1ali$Y~ zhc8Qc5xXX)Ir@tIOFAd5E4;u6sDPo>?!PhaOQ*^O#gooMKeD)dk*={s6kT8W;ufBp zzT>_JqxEC^KA|dMnY#gZqCKItE~cpu_|yTZ={XMyToS>zZ!oxg&Lkn8JpAMKBj@Bf z>pdZsa4~A5e4UXK_kNg%qHoXC{*Ne>0xJeq=EZZ8W55$xt#7Xb7LcII9Y3;>8R)Dl zt7UyTGO{KG<b6#I<DEWVvk#|3CT1E=kaa;xUS=TR@7y^vq746%4`Zf!ltw#zz#al< zJW6#5Zoc`>Lk83qmrkAU<?d&9c}SLywsUmOG0yTfa@QC`hd#Jt7YBEZ=%VcHeXME9 zw%&kjjn6zpqmk0DWSZmya)A!Fn|L>GPpy$5E)_|QZpND~x4u?SuQG8`Bq_tAZr#7; zzwVUZs+1lt<EdMn@93!KYxf7;tnVz3Z$SGnJy_C<E4|N?H(-Gg@Z-R)3pn@$49|O# z-d%4V1w#IZeK3_t>mOqCKOm-AR|_u%>>p$^v@WD$@<pu}ztG%|{~xmXmXe2$(=4Zp z_b;AG?a}*xV|;4{>fx#V8>0$&A^Z22!=<0=%T4tEkCD2ShmYR8Nea`1@=r>nJ*^<~ zuM>d$^dKPrV?g^)O7tyNF8_<eG4dffBL5@5`}y)o_r=s8zwABy{~>Sw`Yh)E`XPRY z{BL2YQL6aJ&95PN3I8yw)Y!29Te2&}M@`)d!wdfh=UIjS#|m0=M>yUK;y+1a72qY> zzqUl^3&)E7N7DZxS>IB>0%0~Iq~Q(zy8}eZ;t}#+a^P2;|4qLAKk_O(RE>Y-|6l8s z$bX6M^JSp=*NpW~G4LS7<Go+e*}jSq_%HGeqc5{lO&;FdztJTk2gH27<lJA-TKvDr z8H(|-n|lP%L;sa09OjO1e;qi@q5AL9^NR6Nnqzd)PyewCrRM$l-%V@Y`h)ib`cH|# zlv^pQubd=bIeGqDPS-Cp$W{P`%RhuNHLLaif^=SB$NYQMy5oPZrcT6snGI~wal-yx z66pTlrDmUQy!3xd|39Yu-)}q{Ph6P)1I?+Q1OEiU9mKQwr)ZKl*@5D(JzYfopHbWY zaU&KD;yD6Tn5!ZK&K~?W_IoJLMq%gU$_o5ggOfChziClVidoR7Dkb5<t!O9z-W}zi z?h)&ijE3h43V=U($RkbZ1OKU#&;2Mt8&y>mNBN!Xt<n*WthnK+m)*N67z*993jFbN z<Lvl3RUd+KwxIqeJ3+;qh(&*<OR$`}`ieWIrBNUNK3>RzgilAMtgrpS!W$idV%QEI z)U)SD4%DmB%7UX7J_k;%p2i5JX0eM1mf?Du^zrtPaiWO5QYqLN1Pq7geL1;TA#ME3 z=P!oy1gm59!3X5VIGPBW6-csRnY)6#THR~bN|wBDSAh<G)IOd*Wqcp4v<I&W1liNQ zUmzDiT7wiyKoEHRJn0|jpeUIac#y>NhxJ{4xUmwt((WT|-b}=>K6iaHOHW6hyuDuD zm2s$le*ENwjrRu?3zj~gR}X|LkDPmgkz}eW9WF5lxXo-jqG9ZJl@^RU@OyNT%A8Yi z&0C2L@ivJzW?Yw2cX##|zOMHciB(QkzOo#Ew(EXj;^^r0yZv(Li8=A1K&FA2a-&?& zeKA$*V2n<Y$WzE~HmQNn-DFiglDY=%ua2?Q(b+^YcI5j_1C(u(<vt+s`~2cnw8mQl zuJsKjdKNl`k*XHQux0GJ6?aS7ZRyX)A<awJ%i50TMDD4^67<bYtbu9Qs5zjqK@s_Y zsOa{NU9=R+OG63Ta$??zhUe<{R@%J29}gYn)#nQo2db>-95qL%F-S?oS#iQbPD0Bv zSk+gu?=ybQmH1Rb&{vP25W*OBc4fbUkbT`>hQ$0eYfWr_N0LR#Fbb7~lqJ}|Z!c$t z((6Yd(l6mIGX#j4Lxg8)yO!>LYyDFVz>eh%34a;-b7I!6X}7OK@``r6T8cXuT7|pH zm;Z}`GVAVppbjIRyQLFJe3R`knQPkfbjS+tIl6l6w9}cXy7XN9*}e)2A9v<PSR>6_ z5lRTDtm_g&eC7?>{l-Le=H^wHk1D&g`>5q!s8l6KLF^rsmbr?%4X<QM9~|Z_fYk&J z(mY}i6Hg;B93qB?p&NQAeL!HS#UyQ>-iG&RWZ!ayL*^7uAduuae1m=T9K?-Hvz6VP zSP%*b5;MQ~OQ#s)$9vA-1glm7L+RhRe`1oyGxS-q@E`Cb8o;j3*2T^dX!fuPXp{-g z9RhyfwSVW2JsVOgpNXNW*XZNx0pJH=1>OWyu~fh-@zt<71wA@UObV+?Aav?DW@*go zIG=2OOy{$Y6W3KZKm)>|5kJ1~|LmAT+({$=FHfeGK_@h_MEEl#D$Ff!^-U%~|Cj%q z39KVJ2VddML#?<|Kh!)rKOm2ebg(4QVhST9qDcVGOLv-6L~Kbfjb4$415h@#(lm5? z$vvOX2y$Il2>Np=wXF=t)_EPU%iy2WwpLs24Hj3!w6eZot4&O1SAvDG#eXjZ+jl9C zlBJYTmM}I12DOMrvD2!Q{9OfD=s=pb=djZne!<=1^ljIl+;^Ygq%8yzt`aV}MS>*7 zKj{}_^;n77IqYD&#=hsgHJ~&{i{FF|D7N;bm-Uxya5N+*eP^$IUL5+0Rq0t<^6F86 zYL&4cTT8=9BO>KD=f0FH@r0!7m^E>L?E!Uj@VQW?<NCb)o@(2WEIurLS?QcqQ?Hwy zA(}4>DstWq_(u8h6<&<aBCZ|KV%9GH8SAH|(Q10UHF^m*@fLnl9>A*(LxgHd7nUyb zr?CGk=+b&)lopq!fsa_yX<+VF*T)B^gf$f&Fm@GXZ{NwaSx6U2X&-y{YXS+5RqcS< z__4FA3kSZgPK<3R=lweD=YKwrXy=N{etO7&fD9LXIlKPj+n3SU!pWJz0$^)u$D|}K zDz7B=r*pKa@Mlvkca0h9Q>h&kJBU9-m?}vdY-HD!u!!fY$R$w@4-b!`+uyN_AhYL) z_X*~;P8+rdaUj6E+dOjR30T^FRl?`T@(xt>3}jIDLt}_cfnA#Ip`&Z?E{rkbmEsrc zG={1}8sCe#L_v7#e$`8(1W>Osr71p4-5n><-`N}dVF>tZZ8Wy$p+$xh2XCuN??N^Q z=l+Kr_8!^vjf$DkCNoM;9|B>FEhlh*LW=oWDj>`A+GiFqMXpVeG`~18mIdRN%nFhS z%Q1FUH*nhfD)E^ZW>|fx(v?F?5cL&0MgP@^<MD=?H^?^<R=O~*0Wb^O2o2AhHUO9| zGe0u64t$-L!W9#)`*Kg_fR0IkG!0t?3}BhSML)KjGN`6_$WMMI1n?pRZ2IjeE!5@y zS;8)uH>*&{Y)j%txfsi^mrkm^wSS-Gai7!WLSsYibI6joMG7gio1hN6-49+G<Cbbu z+wT(U0Nr@H!EhN50I+cd@@o&pFz`);hL3#nTN5S;FudxhmW{N=4QxGL#jft$v>lp! zNQYV?woV~qW@DgmQyb;trE*BPc%$zqI#;30ee+MWTQ`nQ_#DmB&C9ssDv@#GCfSo* z8s}$_AWM=%J`8F0hiE(uU*~OAK#Bcor;GC0B`S~V-7AbL2uM=)T#mgZ700pe;%_r& zAC#ULS31&u<yDQ`FlfQpM-tvNTi$xBqf0dRC5`AYUhOBcpF1fsL$2`e^I}@d8G^qv zzD5?l!Q@4ql4ZP7K=9I=pea}G);i=$OI+UKpsmo|PHL!#;gHewi9k~hG@B-YFjUTC zv<=1KjtP*{1qkVp;d)2}VBA1;A4n>_bsN*->eW8cxy47VWFGOloSx+rnKq@xz2j`j z^MJ6WUX!pF#A4bs77D?5WBau|e|zbRd$|jzgc;E=#+;j3$yM)Sms>4t3&Mb}@1L8S zoUCah4DwE#L&T$Z!gi6>qp~YFAl&&072gz-<N$VF2(TlN!5@sYD5iW~Hh2hrkj!gA z({CmxfqUse3Z%LDa$WzqfyX@_fUT7GAL=s;)kxz_%&C?Zg^nw1S<KQCt^%E&x=5Sl zg(ELR-Y*Mpw{xt#JE54tlaEgwLT3j@&)m*PEJlM13Rj05ZNXAQg!XlDgYoyty3Jj& zZP@&D1^8gLRcN40J@zF@)`Ofb=UK!SNWP_#&^QUJVYLQ5sgm=;w~*(%)w$P4a>y+r zpXH~|j)sAv!ZHbe=&MvHRTItG4~sZQVEVg!|7-i#l1t<dxe(lkpRaOjo3Tqt8|z(; z_M}p@sJHQ8sJkMZIoO{?o;Qvr=zUP*N<uKwTma?Uc<g;ImruN5vv-&?cM*hSZn9*B z)@+d_pGx27lqDG=L?JELrE_19WoW^6Ddy+Ueh_$bOw*p|g}SH+42VP{KJ1Juv_%Yd zPAioS48y`$VJ1T2b?J&N2N`~%#chA|X9Y1w(TzGh@t>W(G(3lR=LsFZH66uYW87^& zp#T<?o+;QE8~G5=wxc=6EVu&aE9EOsK3c^=QTS?#wL|V;Yf)m)f#<!*3xjXgY<Cx( z#s`FAdHY{yT3>fh^!1L$!;$5$lip0Q&gvyV+M`O^nUN|HuTyCniC+v8&CfFXZ6rvz z-otsI?^tb=V-nSF2MC{~?NR%8q_FO(NdbKP60s|f8HJwqLe!jzqb<|)se!yOuT3c3 z*!r)=fnXFXp|7k&7i98IJ|t<RaRk1#8ie#HpkgY4WsB&WORq?fJH)eB0`oMo1++T1 z<}e}Jve3Q>)y2Z)8k+i<mb4ECj*z?3W>*J<kojASyG&1$Jx7cFvx%WGd{Rm6!+@_| z`1f<jN*8law=z*lWwVX&{n+apz09vRN1u*@8nWdbIgrRpOps?`Xk=x#qz0gRMKA&k z2S!6G`mocF4*rapR(;)XFWuMENW{|^4_unAl~UL+UfP;%3Ro&r%3y+a;CfGWg8`Xa zOH+TbehO{Jf)7Zx7}q4YnG~I9{{S3n5dA%vQd45UYbmTpYe;t}?$V5<CM~%3zHsFV z@tr^KUcX#i)VZ#pn-i~VvtK#HGA<sV$3y?^-G{-a1_K*bR07B89(Oe=TgDRR9t-kW zFwY`MRD+gKoh>`(3=wqS^IVQj2X5U+L{{SJ630fux2J^BkRmn13sKa?od5vzcrYI@ zEf-2Xm_fF3d$r63UV8Syu*GTrh(XEEQOOBV(LS<m8Mmnj06fV9>LfS1_0yrr#ET1f z|AKEYX@xQ5d&Lg$Vr*lMem!I~>}gJnn|N4~Jnyl-JCfJL@N}Dkc5chM<Wk`zq7;Rv z<Kx;{g2j}ORa6%xNKmXfh5-megayZ(X5~JXxTGyFA@uKv6dApdC#*ck7$Htc4#LDw z*p*FGm$&2x`LJ#ee{`+2VBZofJix!WW_qYeFcP-&#CzvT-K~c-NqI^hUV-YBQ<Enu zr<67@42Z$(OE^?Up12GJU2U31tNA&ZTX}a~<?~S!4g#pp(%S~m0e}wrl;=DK@hxxI zPlnZZ<mNX+wx;FQk@4|S=r9>_6#}R4P1kDNHBR()=w-Qd0&;6{whx3zzHW*@{nBqZ zg=!jJLAU$Qj5bN`2Qw|?%;}@Lz1Qx2c@Hq>3}P+KIXDhNfBIo=CCE7sHZCC7BvYu1 zsM-zW5zS>@<LTnMya3dLwUG6PI5NI?tRY^fxSsHa-Qw4PI_Wo`tH(sm{eJcVempe? zkyS7us*`U5ipmG1<KIS=afKjtk~UmnUKkFZ$3HP?x~1@44u}e-^RF=oy#>ZupbzMR zETQB1tA-JD!hV}>DAY9<lZ-yWaBqGypzk|S`}I63e*>;N=?*w#)+ondOUW!@n2j~A zDJzWu#i$i*8;aXE>O3I*_9$>s^K54P_VsS0qO~+w_U)ABI5A-evU#cFZybx?j*N2z ze-oZ%J^ebN7#UFDL69z|BV&dZoogyIN#djm&FI{pj$`MzfT&}2*Yw-W&|DUUcQB!w zMDG>W2^}D!`xG#-(s?4%^84c?rqX26-HS(ZN!K*6I+BqGkNA*}TQ0cVwmuq=cu{lx zB>V7k4O1cMOR}dGu1lcb=nZf!(kfv<FHT`i?ThdrN{jQN-EW6|F*y^kIec#!?dT51 zA4S{T_m7SK8X1X;k<B&_lZ>#5UH?~L|Il~EM=N$~p$xEw#huZ<q<$|$Q219OR@=-T zOaUS`>5*QJmrN;^GvBPh<!3{S(%kI)z35gz;MTrCSOtmn`~6Ez&GSP3sZ%yqYQ>uJ zGc|^7$e8cQYKr3tI5Y?G)G6_IlH(vkIMU-cP2iCH2I~*Kfc8aHy2goO-n_n03qGB) z2Ilj>q)q?>n^U<*{;bY=KC^z4aasF)AASxa?DsN`;2#?dH4n2QT1nI`)Z8*}YKjrn z*vKST$9tX$>XG<h9$E<uU0$4uOxLAl){aWua-HYM6qf$mBT9X^t#e7-QNyQLgAp!a z%t{%Lt=QTPL1>&;;;2_Q6YxH5^4*0c*gUOQla2u0z>h%A$Gvi7)%F8!GA{95cdThy z-ds}o`pd*$7cje-bU@?}*&T~~8l73)zv)$E*Ul04*!%+a0b#6g5n$;*DBw)W0*6g_ zar!qgyCe@ukPf%!J@veVikAAOyz_>TzS#sACauG|xBlU7HM483F7Z=lzawf*7k<_O z0|o*ZOPS)0s<pM!)d<78=pG7jF0>P=O@g1kUIYsbw!+%G;E`}Pju6UtSDJqubX7q( zY3~<Rk#Bs1FDQyABbs-Q)sEKs>UqgZrv=wv@IlyDYD1y$JY0NSIkBbGVpm^P25}jE zf(uoYXub(<W_^E|##tZ}`^OovpzhJVl35*)xK5^fo+<T7m}mZKn{`I^{^#`IKxtrO z^;VHKjgNTd5tXM8GG!=A>#rIBwXi-=t<N#n^;8E=F#1LYIY5n<w=q1qP{6jP%}wNt zwL0F*h5?V+@6H;*Kvg-KKhV3<mQ^$Wn0e(+yKtr{4k03k<-_wF%hyf(YiHqSBf$XR z=uA<z)jh0D`NiC>(+kygzx(`V97WR0htOXFO4_mMD(?KOOb1)AJPRXy-hQ+1QybL< z@lvfcw&1?LKhDlUtHGrBL4r**bu!0DbvV_7_CdN5BWCQABxk)d6Gs~?{^?CcWA?y% zwPU6|`Xw;BsinYO^+C5~IfXV7dqxG&{#&#~a;A+B$9X{X?mmDu!qH4S1ijQottslY z-T4!0c(BC-4uGqtgYUwDqFkC?(J9G7Q&C~IL~69t<d#;J52?LcB_vHX-PKjt6?tIi zxEd|X45a0Z-k{TIr-=3n`j)0|%p5F-hZKz%wHcMAjP&GErZMsd8v^mv9J&xN&|LK% z4VcC>ZB8Ds<;ODDr+#D&n2a~Jh{kz(_8A4&>k6lB-Rv>P$Z<I)PT7+Wx*h*+%k!3$ zoXWyjrp^244?41cx^-t9uQC>d4~z*uCK~x0is}5Gg0eVbYX0+H>*4tc$7Qw)YCE>I zhw%+_Ocq7b)Xm)9Ly*7_Or#Ld#=;g#AUj?3NEQ1x7t-St8WuN^=S3&UTh9&x&8cUP zN?D(e1~g1unMaLwD&%5@f=cK>QNu3KIbxO}RjiBR67Z~?L^WCYObD9H<KTkwV+zHx zIqA-!!<S3l6XBMCn~_Ue4LSGL(P7-D8!{WH05C!PJluR$YtjQ5p6dp@gl0<UO@`Or zIac7NPza%t-2DiX4sC_s@AG&?62Bo9GnUFxoN=OhW0BNzA<RlFYQtT$G^*G1Z*m<- zy7cUa+Cm*~q%KVBp_L!xrd<<WZZ_N^{v?RfV14`Wnd*Kf2bDpBio*a^+PGEhG*!+e z?$F4`Rd3-YGKu=Nx+ek{H9tlQ?#3keoY~rw9SKu@tU&o=EVr{!$mODRIipDT1JTl< zdjAU9=KeAv-mXu=Xa0#J-EKqOhgAXk1!*_qYU@UckqPxhsN-j>JanEN-!rLb8NdWh zm-jH!MtloA9MICs+HDF5z-5?YMdgawavVfM6xP6aIp<Hh9N7Y7kP0^A<v77FtMKBy zSJMIYx1`NfoLuEz-HW(z^d6jGMQ2iS9forzy$fBLFxEuMVP+ibCzIbz<$%4uWe0KM z7gZ&b-;-d{wY%@3k@^`3>8QlW@^2!zwvRWIez0+-`#C)8$bSki_3mAE+ihl#{kDu4 z>{M)0Iu)So7FGv5iA=L6NcckjhK@EdjF?=okk}Ti9!ip#Ut_^FGqENI!SIK;hz`qr zK^UTo3ppDO-BI(t_-lK;d{)#ENR9Ru{!Y{}_cj`yZ;F@XgL;?3#t<~17Zv}jetT2m zR8m4-qUX-8phHynR0kZ`TP@4~I9q87e$*sVZJCiU?mq@NF*4c>5tFvK5J{g9+qp3n zvd4R6e5J`<pBQ*{5{gBmFMXmIW%~j0Tr#r^LV1}eE<dFbNaM(~x`{d(ePF-x0sqqZ z+jFZwhX2Stet($!sFY$SOT7G#+=QueY}nGu(WwGSp{G~L)s`HK?#R}uHy(a_&&HGK zG&;pA24oX}l3<$Z)g1k|(~nUMg#9~6df1RnoAxKB<H>=C-seG~n&&Xox!LIyx(lMv zc?w<cECLVN%3p>xZ=w)ea#dcrU#C35x?wlq-<R^YfU$I+nZUOePoidmJ84@Ba#Aez zWNRzX(6c@U9~o17Y+f*hvxlCw^9)PrT9MMQwfq4<v)|4d7Z4(_=1^)Uu!yVFlC;$; z^io-s+il?!ss_w*V}bz{?a&IZ)KbHyoaDWms84>^5UKCgMUTfT{GgoS%6y}|%bkk# zSN^JtCHT}0d{fiZ%BS2t{C7F|qdQys?&t?wt2hO4&0-YAK#Us4o<C2MmRzsFqiRlR z`Q#0N-QP%<86$1HFe0CN%^y##SE0zbakK}gWhpoPtXexeL-9dn8J#B6>UH%ryLz-a zSikS<PFP>7UO!l8a%<1_aAhF1x!AtC8Tnj;wL8f_2ArgzKSCd7_$Q*1LY5V%^>5T4 z15oP#A?|urgL8f8XSvWH7+MujfAh*;O4}3wSQ`Qy4U{+T_~!Rm$Kul|(RSj8U;n~n z*J89!g=<ID;i;hKbmnrW8TfI1w<ru8_=Xzf?8zukJ)1>^?sf8V78nvT4;?%f9l8jL zxHYKt$UIHKiU-J>(}k{5U@8mnvMa=2<M*LTOWZkA-I!&Buf{*co+RaaMy$4aor639 z#>DFJvOi3IHP{cPh{+%}u+w_RY3l&zavV{zIA21$vw!lZPtOl<og^|a+7-6vMsM7D z{>Y1dw5YZNYYlO=aw?rmFLPple1&`ChMAX1XrnwH49~ehIo8S?5hO1f#73nztQ5nh zqr7VCIo4TWXoL_CcOoF|Bx~nzBH{!EbY>jR5BV>14t_wtbz)g-ASZXg@Y_~k>uot@ z*R?sgh?PNyJW|OrvCZ`pml4u-%ft9)TqkvyqV!hbL6o{!{KC&Hhj>8o*cT;eOC1Ua zEdyuY-Y1=W_-%Jbu_N#G6y!_$<#7LTVCKgIO~$6c{4Kv>f?SiF*_xI3tqpM;a5riZ z!v<q(@%M?X&@8y%Q|0X44*wPVRxA8~UM4Uf^_QAeUB=|<C=`#1g#E8&t<1~A@4j-e zf4OD1EkaSR*!!_<vyFwFfk1~{0MzpX=MvLqd8!>Y3{ROt`Z9vIi{D!E(A@JBYsTcB zHAeD6&mi|c>8;a7Hw7J2;Cnt0pfK{n<TE->V%Hu|+E1Y39AgjT3C-;5T)b-Ym%)JM z4>=u9ti?zmn^!)xPpINneZjQRdzE&_D)W8BOs$+T6o!x!b*Rs#qPGr#^>=>GcLR?k zV>}eo%bm>Gje_y3$HRFAi|aqhPfJYo(?&_rTzE11XoTLfTJjc|T<b;<0J@&#&)8Z~ z{x~DG0A2_n5zjlbTr=OBxquH2t|w#r)3@O;iqA`Vh0x+-7z1yoHl$GLPkqKV&*da1 zF*mN~UJd|W4RO2GP2>6{$wf;nJsWQP5L*i`2x+MZFLS}#emTR?cZ}$sx?m_n_&0;& zOrv+cnX7=|RDV-j`4MO(08R|{LYE>NQmbkOft(Zeu}>KIz3lC)hPMz_v#0=f=JXzd zGz+EdoNxIJY;1<*C`Z80`V!Ki83ZN0c@t?bm+0x$b0`do9A38NQ(m-B)ia>QZ#z7% zd77k}1R@gJ%)JvB1rd#jOo={z)|i~7AdM@kvmKYwhDL;sMX`H2fZD5_)iJR-uJw-H zQMZfvC`yy|chcb`-N3`=`a%06{a)yi!d49u&?82NEN<~o=QYUvHCv#;(#9Dmn8Izs z*b61GJ8~4a*jp3Zw+N>b4G1kN3kA!9HVlTE(zS-I-Hq-KQz#!|Y`s2o3-8(ts@&fM z1gZ9$H484nS*!5HfX+JO7L%kh0Ua}fEmk}jsx9_Q&PT0a4|&NB^10H}A9vrj$f{KN zn_6??9A?tQ9w1AVVz2jD249grH({@(82Snr58DNySI#<CL|BUQ^@avpAtn{O%gL<0 zCbIdZ4q5Esq#(1B*3lr0=e6Ip3}3y1O1aY_nM~>}QU79C0<3StCXWIGQeByc9IQbW z^dZa;%H<VSeuo))US7V%-x6Ebo4Cz-^~(&OJglEXV<bCg&BGk{1#fP|DQ`D1&0YGI zj^Xu^mNYhD5c+TaJwSf7`&a^SxOiWz)IWL2T4&1b5sRs`gmXB?i&HUZH+*asS#O|a z#2j68zMk6+0=5YIu22)`@3y3Js<Y*cmWyW7R#)=c-L!Rr9NR*Z;-qG_`_=AQ*wKws z`wm&_rrEZlhTX5)cPkM!{v>qazepnP*)l#Tb@06^4oevSt@*vZ!Du^n7bsDy(<uA0 zhC6R}&o+{EIiK~t=Hz>So;`8(Bt_)3v$=7C2a!!SJm9tck6E-MyFr+WLT5)@yKMEA z&LUuBI_9S4!^+VwPLw%m3G+4rNAc;t7y%_rF&*BX1xs`>?F_Otbpz_N182qbw18<M zi!ZWZAMfVH66sGwMn|#5_ieo26m?~!3O}HOD#3MJVQ#9NE;#R3`0h<gU|@s1RK7nK zT)7w)O#$xs#@_MzCNX!8?^3ijM^0y!Arfp_ab7hfIOvivFDfbetY%Z5+{K<j&#;d% z%!K2D{8mVkH`;O2LjCQ8{b(Df(P{6YFKi=DTp<1Kw_`24Sgm4F|6ZumvG4N1QD*d5 z=kC&nZKxufS6rqqkq$JAmT%2$9c}29@)|e+EC5K-P7OjiXoz<#n-aa^gPDwpKK5C# zg`{W)9Q|6po!l?e+izOLG2uv0ILsF)qILlhFV^0Lh^tvlVyb>c_WNMO$9w(h+pUDb z-j$`ml9<tViciw`HSQf8_o!8kM`r1WaQz6dC2Fnigk8-o<Vun%*J2xkz9*hnyW>AW zS^x+%iup?FDC!=FE_~9+qhlY?oS98t8L#=J(B+mX=mAtv95EN(JhyM+z8r{|0S}+1 z{<@RQnDO)mm8;9;v>tr*qSN0p=lz5Z+|5%SVO(oh22E(Rn@m6i+YgI<F4vZH@MC__ zKbkM8KJUXAqh!LBjg}~asb~;AHS9JbdjZgl&l31!g}WQQKS*QsDvEl0<ykGu>(USo zJ~Hq^>P{7TKrNYu@>$vghuz$sA+lR@#dkEL?$8$WYAn7Z+0R~b{#;yqch!*h;971H z^&_jkL1IWrVb5tE94V(<B|UDA1nC~VYDD4`V4`5eo<*IZ;RcTvb#E1EqJczY6bC?L zV-`p1@}B9+OdBP;;kN%EF3e#dZV`B`1*w`ji<1tM$4qs<M?B`~<poC`ZhrG=*?ihC zk;dPYokYijiY0MR1{(-L>-xQp+4aMHnS%5;GdJzCkxvmJZc9w;uhC*Co|+ZYuDGX8 zPu7NAc3<X6WBt@n(C3L>g_KAZEmuH)??wED{P;rxTa^0CTj!<vHc~;CTQ^_0EbEVP zbqKw-4-)x5#q)XQ3QLYA$te%fb($VCe1j-0Y`E*v{FalTK12aNXE*MKoDZvg^Ud|2 z_1w4@Z5(Pbqz`M_F(kzPa<0_<A~dzs9dO6V0@4-7)}*vzaaW$#5Wsw2K@>m|cy22H zP#fis<d!A&uxiozBpVZ$UQkC4c@A6{r%17cwO-~&`Qq)2KMtIqxoi>*tWSb_-+_~; zF!|==dFr;Q-cH_fMzft$k)$h`oDi*X-(9$o-QLxSX9yvI^FQvOpUPby)hQ?WRs*t* z+icXy()x|!i0H-<sNcTzb-)68K$blAOhT1_%YK3#TY&fJj?Zi&D2ai>saw-AEn$sA zI`u{sB-sGT6vp`b`Ux}WY3;VmTG7uFWT5Dq%lo|<Brx{dIrreU?#hb@J-0tnTg}Tm zB|NFSB)I7C0G-a;onxYbT|%ph!2Ub{Nm#H>kiOrc)5apu?sVd}hYw&?i^_5Uk+$TD z*{V@>NVCJ86@D_Xf`JeW7);1s1Fa*@GReFoI6!9w+bUBtC4?2aXk5})Xw-3h#%_~T zt9<zvi40}e%pL{$W660I${oK<n7aL{)U|5iO@KhvP*Y;<BJKKn{d{>ny-qKtZK%<H zH~r&VZ|>=O^+0~`i59?1DS`z1r75eXSJHB?l0wI4J0I*pTWf*D8ZU|zDDwGX_F=M1 zhfeRc-6pQJ?0{C9EDnl~5;)HsGy$H3x!#_Dhe&7qIUq{%&IZKY+ZbYCdu0X5tnmVT zrzMe*bKq+A@HAnxcKhoQiWeVs^r2Mf*J~&D7pn^BG<O&NHS;hNGvkoV^FeHdgcti3 z%JjAGBp8(`EE9B_y@WQ?T;dHwN>NDPD2JexQ0g<$)u*p}%i<jvx8U0+H#+Z(r6<?z z&L0xowkRA0Fi)l!jq&iqhPINDW6~(meCikPD6_s&;YH{Jn#gz8xCs!FlaW6Z+Gc=c zBse_^nd9Qy{s1KHKw}z5sk2V8xLq)59fN;FCIMelV{@2th8@o3aOUUEad}n`HUrCg zz>oUBl`es^Nw@j>muw<)a6*1&{`@4`rQ!Z;-yYtdBhF|Cwm`m>AlXbAT8?rL+{k!x zvi3!Zc2ibx4xZSAiU1>#aT8n8x)4R9C+#yg25Y1%>j4hki6Qp#_Wpa&MOLqF78c+n zEInLaSmK-PoVZ7144-vz0B|q1`W@47^-95;@=AlwkFf70&8(B#27VOCniLkCAHLD9 z7?M6>zUq%*QebY9H41h=*~=2!&_;vlCHX9o;qj~LTm_S({aicS3ulPSwrtTwG3$wG z&fD~s_5d#<iwEZ9oZOe4>LN*ekl1CAwC-W0op09O?_nEQ>>jQN6q8$bwl@lHAyW|) zP};EWa(+bvR9J2@EQ{`k$LrE;GwE-gBd*M#h1B=B>ptA8lUTWHT3`z#N1z?kA4T?D zNoKDsJdm{f%17Zm38ka!m6_6_iqGVC-KEFVrhrbfs*AwD35Z|axdC-DCDLb{$oe+D zY&o!RkzPTI^C?ipJ?5Gr7yMq<ED*0SpCl00bEMJ|@x2F(MK_YaLKtNcF7>yThs}FE z9g_$w#-QS+TmhNvo3&eGGWH%EV|SF?J&mqtcMxoEh4!PBF!Iz_Y52-0*(Sd;(eBEv zr~z``1HPvZNw)c_vZy~r3ka}U<{35V*-}%)2m)qP0u7N@<9T7Z9?l=U-Hw29rRMan zOb<vOtLR)3;izQBZf>w^z9?l2BndR!6|kPvZv#AtrRiw4ykP^R&*W}Dwt<q1`*xb( zL=3-I-5$T$?I`JByeX3#V~JCmAq(5enE^nixU|JLGF&l)6$FJGFkprbF{2VG2}x>$ z{f{kKE)rZ#kSrDF9?kXxHjjG=l!P90K8)9_4FbdfWZg;)Juai~F(n3r?IkO7=Ae7C zGH`8AWohK=xqH0o>)57IIacswxkqmk>ALO7CKvA62!D!h!7r6C4L94N;J|d@dI2{x z?%&-2-<-1+7HmTIxL$BQ-`eWUzGtXHD8#a=NSf!tB7ZnvGPBuCL0!4D*lrbPO=6a; zs$%si-m=}ljaA=lOv+Q3H^jRrK9Pn6H(u%z*U@F|*P?1IUsuP{N?jf|oJV}h_!d(h zI4Dn7pQkOXKuDclff5l-1e)f?G6VMYOV5Ha>UP1hdd#BJzI7`PUvAK?lWNOaoffs3 zOeHl(IvbPIMB7lZb6=hRxhatQK;SZ{7JNe&IKCWu*GJt>VnX(dH(hP)pd<Qq-3p+C z<`sCe4K1e!+&${kuxNhXb8I0_GM#cZqcHx8N)unrF6iSG>rdCXOb;fA9t2EiMLyuG zbLGzl_HpX;bVr^+eS8d`?M$LjTA<8wTNT94<_>cdk<vSiT6v4anx>ddJ~$F^uShh% zLy32-1w_AYHEfEnLjh#n?y$M`Soxk$Cnwk*T%9pyhHPVUzI9~nQx0Xn7CX*M`0=mH zR@QQMKSaJ5#2VWusE@*D?*MS9>l)@lJ8+Oz!{@Ud{iVgHpGFCxYsHd)%7_3H0VZHq z%8T(b*D4&UtiTjW?Pk_Qd--;y?>(B@wDYqnSJ-sUP1_!ae3<vQE^hxj(YC#|u2?He zHlbcpWP_>vmU#!J6x=dWO-16p0f&O*_Y|g2QeTHfyr{PrmsqTodq5uBIyKb@uhXLF zP)6lTSYVvPT)UYLiG|irh#!I|xj^?bb=DZ;bZ7}A(TIRS+@w>pmhN;lpyS4pqJfiN zK>h~q<?MJ&o;}Ws&_-Wh-elKvd0y*;N>=-{0Gb`dV>bO;vI|l{BW<<U$doE1oWs6z zM00I=k-+aGLA9XGL%`V;Q?H6ndoAMC7^=Wew=U(M*-I!oCD!Hw44h=R)E`5?c%K8A zKT;2T(y1^2nPl?eFs3T>?s?xTxXVS;sfTe&K<Rpr8yETQZ~Sw@2#!k$qsRs_O)N{! zUoL=VHI~(R1VGy){|V_M2o5GvlLkROOrm3tc~?w|mcS7uHNd!qdz^DetSewG@@web z_Y;{!jqh0`eHWF<7Rj09nxG4iwa(Ml9MZ@N(xMTrq8VnvFhv56f&vL>SF*e`BP}&Q zJmyx)7U;l=Co^`b{C9f2xDt_7l%ZBW4&?HQNAz^l($H_<$Qan$V{y)Sj9uC{S$Xe0 zk&YX!aCNYqN&(~iHERZdSn|y{3xy?v>tb^x)40du-m`UPZE{1-Q$HC2lCi~u-|=SP z{341$>1#OiSkV124=O01SWn#^W$E3kNg|@iNu2giU>q31@;*u0>R2h5JN54I`Aa$@ zCcI%}pM<Z1e|}uObXzaZVXKaCVc<7yBX`&NZ?v_d)&R2ijXz$zcW3VmQ$AMaa~YF` zfO^MKy`PQCoCxM9A7kUBravRRad;-6i8?P^YlX4!%3&D23VHS0_@)(o$p9!E{Hd+# zTKc8qKW+?2q1@{cy(ujf@@NyJmmAazExgFXPfqH5!Khqb7rP;4N-J_Vc6K)P^~IaS zej?O{2m^+HHDH(N(ZveZ#K{sj6~X(H9#c7@|9NUNPhG+%^^Rypz$rJfKca+#_AEjt z;NfiwHE8W4sWfDt>Ft`=?IjF0ScpA0sn}W}64;O;inr)viR-n%*C2IfApZW%hF1*) zosbM2ZksJ*ZI0)f3iag^VU#9#Exa=yHH7EedON@vCl4CMv>LX0v!PHX6|Lvn3JOK@ zkr9?1)N}BAyNf+;x4Ihv{q&AMiPx?FXsK%WP1xnI4B~F*h!%+!XX@bu0yI-b7k)JM z^SX+p7GIZZ1Oa0$KUfackh3~B8kOsS{R-=rP}!Vw$ujA3y_}o@tY;|cg1pwtrpPmo z&oBVp{LH=p>oY9pY1nstS91VuHIjj9KI6-$k~?@*oHelF3?1UDnH8Iwlc0=VA6z1w zXq@kOqUP0)A5uXW++M6S^fT<kpYLM4RCFT+>eWI%(cyiyHvEX@h{st<*JsDiNXQ4q zP%$}}%;38_rrce&(-`>zQSfBd_P#tv1uS6b^z5cX_jeR#Fb4eHL9|mO#Z@vb0qyCm z<<Yf>00#8$sTmENW?XcV&-p09dr=AU>_7s?KQW7Wf8nPFkNPnPK(V`9Vi!9Q4jlQi zV^=X_U120q1Z7{lj~eyT?IcPih{sk(te3CpTNPIFvFH?1@lg!HI1jtzGz8E!cOL=7 z@17xN5=_^kS_w$ZEW=tHu4F&YN4VG=V!q$^$=2D|^S&`Jkn80rdW~DUQHvM|&g9A~ zSi@brz@vtSN0r-xs2y?1JrM6<@^9bZwr4NF9{jkW4Omh#m@Dic&+A^Y>F(Xi&@dl7 z==}S)D#y@L#ZBciV3xd6UBr&a^8ObfRA*l^YJ;eRfi?v79s2yO3MG9x>#RI%TQYEc z<#x1(676inx+K#yb-s&vXjJNv#rvcQ1O7u2*p=%xIxCV!b14Fuc5>X?TELbTuSjiR zBH^U0YbpY~-l^2Lj>!_E-iLP75tHQgsa|~Dh2uF2cwnhVJ{`5anxkgm{^0@maHxUJ zAkQ|eDg1R)aRu`XU>R5#t`X?<-CUu*#Fb<0yrTULIGeWR7lF#f#`63rE-61xKYgGA z==%HQiu8DpaP1|OFrEDa`q_~&I&ny3IPyrW<5hv9CV0nt{poLk^ZNI!-Xn4^ySh)c z+fuKUe42pI7VY}Iid1$^nLS5<Ih=UIB{!ck_;pL>Z&<?-TE5I~pvU_)Q#aD#k;$|f z`SRO<Jgju9^xq>M-+?QNGl|%>y$C-cyKBsTs~+%Q2p}1g*A{hKQayS-xkx$l1KSrF zMd(gQDnBmVJ^AzN#wuJ7CQk^>-vh$V)xQ-IA^_msyXLwnJ}Jl(V&mcfZ<x}3=3H?j zJdd=&W5V@U$>es$zno1l)swz@qYn6nK-=)S4xXW|!_+I=ve4M8=Fg$VBDG3P7EmI^ z8BGhR4>o17t5w6SpT8Ir-7=kbx%0;?x;J)}E5G`+3qRT835dNxR&upL3{*!GXBXUF z3PU?NO7wnFRwHz=jZ}O<qFkx%E;0?3NDW*;8ZFi_f+K$wC!cfu<$%e}%+>V0@Yc>q zyLER0Fp_Zxv;EH?w#j|QsR+1VP}tbZG9QY&2s7t}dQljdH$SXqN3*v;YEC>-SQp`> zFDal|HEMg9YBbKyMa5{KQMYsP8*k-8#5hsY2aT@J+%!#uJcl#@>@#wCBjV!9R!=1B zOrYv?PrON$#W?~uaBMRfGfx$bd=3YV2*F&Q%7=lU&K9sG`3CJf?dwtF#!g^(HKw)O z5v~zihFUfeVaeb@<G&+-R8u}}*OfP3eep^!+=00R6cH>VX{8Qq+1kn?-B+b&rZj~> zemX6vMDQ|<&>jTf*-+amFgx=;+u_f+U2|SE40BvYLonr)IeLqR%Jq&ZdEGgC*OD}! z|Lw;MZWi5=OeGBX=<(UiJL%fTcaE!jw3h~Zo?51X$a(xF$d<l7e&BgJ$~!qDi$vXK z$v@q-1wI03(L%d>SYAs$+_dgA1PxylZ$tlEVwP2?ecS`MZVj<OO4p&AjhQ2PbMbr! ze_V=wso75~9iQyHTav=0{rG9h#n`GnxUbNH20F48>qXgi2sXHp(>sj3&!f?;@DYKl zGOH#tv981=4JDBgF|sdU(E=bo+Y6j;CKz(W_4BP}l=2z+Y%ACPQv>hahgQgwC;^Vg z(&$K#s74NeM=&PVdy9~=4n{Y}S5QISR0Z>H&H(zod5(7Ry>VI5aYcA3UzZi|nkDQK z&365KBK2XL#%7ACnL|`iY75APhQ1md6kKK*O=vvRqeJJUnkh3{d3y<u(J~Npwsz6A zP{EFd=_Eti6g!LH15sWfqlkMJ-YB7V?{a(Yvq=Vou}zzq3or%aUL)G2Q8qWP2VzOm zY}RgqQ5=g1e;?#0wtov>I}&gAtt!^1+c`+m(zEYHL8VTyyHSD=#y70HXe>pDzseGj z4WF|eI_jMIAinhm7T{=Bd5ZEkmS7s~zqk+gSc&(?7rr%y1Vcyhju99&5l+qV5(ER{ z8uS1jJC#_Wbv_dtL(Oe85E`zH<r!*!WSFxTIH)>z%=p@rkC+qOxZYKtUZgi<-tI_C zm@d495ueEuzaJgAGpt%9-RP@QZd!|Fbp~<b5b9$JFewa($pauh^G5B=1U5W4UIQ*` zl}b|DvMVbwO{XXr&GE^{TpeN&Sd`1#_oo4K*w2ai?>58&dZ;aV2Qq<3O6K3{j~PTk zOF*uFJCJkV$_W^!BKJt+hWOWt3hz_(K3mZWAUU$y$;|V(%sd!YH(1W8cZ|!c^qRh~ zf{>g{;dNO?l$mJJ%6;Yq)fjyj-U4iZm;*$^`U{q%P#Vu(7A6`G^R#3(xRV5@RYCzC z%`{4kIiZ&dVb2Cu0Nj$;Eqi##bkSOJ`5>?Xg~EdH&|VJzg8OObtGa5}@=h;|pUAHs z{gAIa<e#|PZ_o?J9d5>~`CvB4Z1e)jeK14euwgymnJ?CWL_Z=aM1?(92>(FA^MPE@ zE`BfvopG#)Ujh}uiSC;1UcEAHC%b?(>|ibD)9lnlr1`~9jISm&y~vE`sX4yddC9AN za|~mhmnWi3nT_;@m!6RrsUAryeu4wrzi1GJW6C-Lh3~20??Qn-KG$vSM2rM7lgL?_ z^aBn$->2I`e<H+DqbgRAVK+``26otJu-{Js@0uEO-E<xph`2Z9ImtV|mq!EQz%Ef2 zXw=5S<2B*b-`HRp{=)uxbdzkpzoIyFdn`pljlKbwawJ;z%$~{zce%DN-BW@ym5*}K zi(uwfBIqGqC;Xh$>ez`a0W_i(!$<Y5ay;E-_l7y-M|xmPr$VRxhR-IR6iB>Usof2F z>UfapJX*B72O55Vx7nO_llKKY*Z}y#(J`y!gV~k*MN?|{(X0QW;vom;>~?s<GTaBS zgO3oenjMkdbQ7Nn0^b_ncpUdTG<@{120+0Y$nD4xqchlXw<Mo>#}%Eek}rR4HPvE; zY{~u22~IbDC0e{pEa<LqTh&V6GvRUWHE2<x3xU$4%W7%;nxyBCZFT^#ohBjnocHfu zK(0jJHM%f=DvmqGN%PB@ClL85Rc8Z1B=yShe*XRgO@gPw6$eIH&>y&uq_<oZ`kQjX z&2zLItzvaRH^gixXILQmR9`0w8tqi~lr#VO9O51HL%y;Gs9TutO%`p)nT%}hDVWa< zUpdcB7c(fNdd~1z@b&vkM2pBP+I_o7ytprKbwsxecUxj6ZAYBA&Mk~wj*FSp$GfDV zfGo!6?|$f)d{O*?b+*U+fc_#qbm~P~3^njx8?<YXV;ibSr!iHW;ArdJ$Ue2+TD<bW zbuzu@avvJ(>*akoz-xg|%jf-bhD9KP${3+3`NwLb<7KKQEl~kr#C|0Kf3}7V>zeIh zh5Dfl1QwpK*NMvOr+DB4f3>aHlD`Xjb_gB(!3%h|9n>rrd#1RzUE3@2{YQ(2d_N@z za_|#1qOL2PN7QWnS}xNwH;h@fCrtdJ1}GE#d;`^?gtZ!`p5;fr63Adra#?`~35+u- z^X-y^i%NfJz=Ad)cOwqr3LM-ahm`HdM=cC-EX+LgVxLV0R8Wkcx5Vs)uVRAKg%G%b zdN0XuxPu3tvU7{jK8Rb~kH-jmpTl2pzS>w+pbbr@M@>!B4TgwyVL0LS+z0}N#DN5U zuSldb#D{O=WSteFJZ;<zvS`XTeE!6sn}pT(E*Vjt{*MZPpFg>9XVH5MRxYn(1Kf_U zsM2-s;?MkUjQl+#5#8K24(6x&+hC|hBaDfa2YY)1WOF*Z?Wgsag?-b`a~p0?B1MkR zb-#<x&BTq>r!L~8ot)FG76y@z2&jwV#FDHC#vQQ?WEy<Jf8Hs~q$2IqmQxK<Q+uOD zAXpEj1Kj@r%wEfBmrYYaY^~7Me&@>frNnO^BZnM?N-V?Qh){ix3iij{0@0S%VCK#f z-Gqmu%Mk}{fxfMkD;waCUX@pRznOtU>7#5WBC!Qg&%@nxOm{+twoh?fxa~+os)5Rf zFNkY^<iWTHf8CI&?wot7v~*UXyD;i@kvGF75%!q?ER9uS^E0@g=j-m@zN`^4i^th5 zcVkCwd837=B+<s2z0kA3$g(5)&!^=Q-$M+68b_+yZ7=k{7KLxexK|c^zI_0_jzCx} z)0Wn5TA1$HLdAD;R_#>rN~0#mLVP+a-YWA^Z!bHEkNRzHmj;g^wGe{UG0OK0RQp~` zZ}U(9d0{HMt?fqxXr?L_k|gIOS54=yI?|v0pEcra#J0tN^jfkKb1(Jc9633wNo~02 zkz{=kc!~wAWO&_x89we&;{vVg$PTMfy+=F$HxXSBIr^#E9+*QIe9r>&BM^e@j^EMT zHot%)Ce8w6Bw@btL4xbNKpb5ZW*YMKMvF$kj3YvTR`x5L+HFASKy)ULO?vAeD6Goc zV4FDLAdWB>|Ca2lqlxBM|Feq|3Rl<y8zReM+8?53N3WzsBwdi*znu8nY1jC2aYeRl z?n8wO>Xw^!tZ4qk;9a>7mY~-(K`#mlcC0lD;8BQ;!XoPL>0a((aMZ71S=ec8$7<dK zauo%5vf3WTg>u=-1@xi<Bl`zBw`1*x(44WjV()0SPXm+DX)1wCp)b=`pf$q|1;8?E zeM8hK$TUrdu{VzTt(1@KVa@B^aLO+A0Rj1A!l=HhrjoE*Hzz-O6px+<mw9<Rz1?8E zjhB*37YCoHNZuxASy&K#x~KP4?%{3#xZnmaS4}Yq=nwZ=ZF`}hxwzr)Ml!zEB%?-b zlAUH)PITH#t2^86W<bObRR`Jko>g$RH<%w<%``?g`zE<8<kj^ldbJUdYup{Gm6}_w z5RyI_7D)?@0J>dnAR2v;tfRas<KZ~;krth{=y-UV*8kJib-?BHz45oDy?3`gX-`TU zp+$?N9ip^I+TLC*Nr~tvl_D!i$x6}^g_2RBgp!e_QIzpN_uiwQH~;(jMZV8C&w0*s zp0n=n9{aXI_MJuRd!1T8?(mDHPDe+5?TQ#bny>Ha78kzwJENOGXUf{%ss1eyRsr_k zt25i*-Kvw{RxP_-u<3DY`U`Jf!#dW-@b#pYCzf9ZQ_m-;+PqDxDXWMK*dA{u=$4jX zWStpZC$@N}tVTxesOy!UQ$M?=zq8hwX@K7~S)ZQQC<XEKieW+i`%;y?dpf9+OL8tI z7x6q<)!^rn((bRoomJD5wC~5B!tBYBb&a`>OL&j}{O~sO-ieKzvd+1*1jmW|3Z=`T zXTCc5d|;D3>Uhiid~=oY>G<F^gTbMl6{eDhwzuq`Qac~(e6VY6Y2=+dJDk4X`Cw?R z9{qbw(2q;uFR8Jw%kqkpM_!)@615Db#&*hbY#QK6D#}lH>OL0|e)o!aM{>o9@%^ff zkq;EwuBx=iz12*R;Ew(|RNeAxeyIxAi~Exaiz%PSn^w(F_O<m|<-WYeO7_^zy3y<1 zd-Siy#c4GcbR~3CQbvBIn5|0WDtz&QcBF6UP*ImS<*>>5_L&9Kp?)<%suNvbmQ~%M zI`h8RTqIwg7<X~JT558sfKL6EJ^Q6AzNRTD+B25ETeEQ}d*fHjg8Sab3e)=EaHLJQ zGBs~4&=6VkC2n#{+qK%R#)0iVxqL$YQRxcFQVcgePfah?xcOy`qU%oO2$u7_Pj6n! z5N$ZSX4}j5=KI5)))pq#1I*7C+xBlt|76ZUrJCNHTq5+OTDisgWli6c@hOAV4rLPO z_*6s#FH7GV&^F3xVU!ylt(a;bd)dNkuCar*qUAx{d*4IOZXSMldh&42$hM%Pa-7>K z+~CHeO4ctoYF1btyS0OJYh9dig-WNOPPv9IJ9v8iymZqS_G6s9tai-x2l<TxdiBF3 z!Z^pN#k{xP8OvVi|Gsj_K!0MDanyO;zM%8_ivn*dUSeOzpQoAne%N~2F>ml4=l5Hz z{pYvvKmEPy%w-nWVYjT%eTqlUzf8!8&begywt_({XG2g+y4qAo|K6+bj0|b<>$}EO z4lsmsu6tP@rf~nd*R^?(=RT-)B)1N}ZH(Q=zU2K{1*#pdiR;$^ub;GEj-3}?_%RPz zw_LA?<qp8APRB?e)IQ7iYW|s9R^}fg8poP9mYtKb%Q}|yG5XzDa@3iOvs<;>8I;Z) zKad^2qQm&*sB?g{WWC_QKBGYjL*~!Vw@toTp4+XpddnG(dWJq9vFQE-B?g6(>z3=E zHcwhHx_v_5Xq@^%sEk3MC34Kvs%~4vf!e%xhD>{!S%6JW$#kPVS8Pt9fAg^~c6@G! zjA+{iCRlexOK1FyKl+AqyWaN;DQ^~A3dl%o+u?elOkyhkjpy}rA)Vx-y&jCKg-+c8 zOxdfA^LLxC4EQ$qJYFhQ<bv6%<Ih7DdbyQ%1oDYX+w$C(TSTpnC|$=nle%U3YR>7_ zq@))g<>ES-U6nr#<XDv0Tef}-#1^@3d_CA;I5g<femrl|_sgC)r#Y3(#X2^xoKQV{ z+VO%7SJuV2x-qL(haIn1#csk@Y<app@vZ^OTTSVRXQ3j@F%N2}{58|}csI!2*mgku zisHQ5?V1w}Hw8-0h@?=bR*pTD3Ov`+)<Zcp{_Zj5O)T#aHS3p&$OG@T7_07TuV%lf z%a>RAtw{*+EG~xEey(5VvAO)>Rg=9A4`{o8#k~5h5FK!HS>umphSdjp9VT`-aj@C6 zRb>5?)O=d4Ja+pt`<=@?fulNE#*9nM+9zKm+;<rtpMI<EE~-8ho<2ccc-Hk)irWS; zzAeVOZHvd2CnOd|xMam?HT_)r!YS)Q-Tnaf=NDBz1erbC@MQV)I^9a+jy+qRO$9XA zUP!#Hqaxq`!Mv4sTl?psq1!(K#}s6m+B9tU>>sUHHhs|Yw!c}lcz$|rSJf4F2Gdm* zyb{-?CeJs1=bij`l&!Z}Uz63E%IhjRmDhgEPrSZ_op#_{{ZYHptW#H>EN%4e)lg6{ zKl0AdI`L%T&zCBy7uIKeO!Z}3ymLw8u0yOf??N}8^8>%wsyNCYq>B$c$}y~dn3?oa zZE;<PRYiO!xH|1rnPTT_c9rk2ROk!cBjOfjm(nw?CAM?jiIH};KPFokbF=R&wRQ3D zy|La80ylj5eRjm=y33}Vksm)rs`sxA+ruF*D__u<Wc6~<qm`dO%D5Dad0aN!{9^sp zzWWa|^>x$s?b-L#*L!_W*q|@>o~24{i88s$sh1Tqs_oSzj^|vd$o~2&@Kc0H&i9j_ zgw?E)!j&T@8}oQt9!7Y7Un;iZ_}ka&`i0an-QdS>-fyWddy*VKy=9N)x#Lvj%Z`sS z8uKUT$tpiJP#97Wl4Nvlp7eF!{8PG!yTdhj1<QrcibqeL8%TWl;j-|HeYfpn)K9+J z*1UT6@W{S=UdkyfnBUaFMw_Ljd!{h!LyZ3eMG>=3ZH~s){?rR!G1jVf2EPZ*DrZjl z{qmuT@T@mExK-rr;8%XZNexEU2g%<(yo3AL`OU&!rWBaym%j2ir?zf^a==!;8u#tb z_x?z*z39Ybws+^JO<D~`oaGf$qC>0euSj}{MvHTl7uof{9~~}D+jy#X{$+X2#K!ls z@wcyMH4aquhrA6^-lq}d63A^evt);aimv^_Lz7Rb4ww2n3_6O>zn<YPbiV2!7Tw#? zTjW#`Ey={8>3JvMOO%e2{v&0@R*6#-Y_h?6Y#v`k+%|QtMpp6VQWN%eJj15SYx(B! zbDp9u{~@tR5)*v(eso>1-f@d4X}hwej%hn6LGc4Ni#r#--Ee*7@UFt;wL8*xoxId& zXe%_BeXSUXvSGqh^SElJ^y-pNroK9f?O*$}xUTQ%mNw)+=eY8z=VIH;!}%jU66yN{ z1*Zlln7z7xm0wU#TE{<Tm3J(waLrY%+5o$?QqM3)Z>8kQ#4N+FhYXG|A6JTe9oX+< zzb<=a)5HC@-ee_m`j=etnEF~5E)lUTFWfa~C?Ro&Wr+A=6H9+;nU`MQdqsP_>fzok z17Ud|+(mxH1h8lsD;~4AdG;t@O19d1-n)sM;;bJQT`^RJR0Tg9N@SOB)#1&Y*V(@D zYns+9zVk!Q^4(7_TKqDDRc5>_ol=nzRlPNmkBhIIoA)j;V#!zG-Rhf+ZPci8uFszU zA?BqMQJX86B(r{;v|yoLD5-H`&bB{Ixh$SvC84&zonv>AlCk&N$Ex1nY+0Axel2qH zBt<&!cs)zYQ}3xecSM52V|P@pG`(gykMGx;$K@}Ns_ydL)xJNzovV~5Us*M*X<_bL z=^x)N^(d!^N-dKPh@DcuRa}o>s+#RK?_sl4OrFh5Qoi`!br%EQeaoa`9y|By%C{CV z-AoMi0AqQ(;@O(|wCWA6%NKp!Eti{61sKl@9coPHNGLtE1>;qmR=ae0zfMcv>w(~> z$&2(~&=zRy<DPcRzj3C^uaNoY4YzeI+B3EFhG|Fn9v*I3em66r(lk&vBl!x)ojZ)p zN+xUk?^avY{_-e|O*wbtl>s%^nf>mmMXGHMUk2Kq(smb~=*X<yaouP2ofqM^!Y?p` zJ2^+(-iowu9z6WOJ+XkRtEGKOg}cgmPLJ}0TuZC%AETZg>>7!o*mOEZ4zmfW33*;$ zR65xlz#QLj&_4a3`Z7~%p5s2<&I^u295tBfySkS{I;%1DhyT&Cj;T+%y!F(nvs!np z*QCWVytX&&)iR!t9*eHcFW)I_Q&IDlv0Kwm#^{`zp3!9N?P<ZvPhK1yUmCMbY}PhO zuQ)x{Gf&U$%Ax?il%?@)TbA>FY!&eC?}@&tpEFrKX{NfVF#T3u{^x5<CmCE9)NZjF zsmfb1RuI2>yWMx6wk(-Jk)x7Rx#RGEukm=dSzth1-#kSLoT|Ka=%nAe2&(cy_m1~X znU2{`JlA9ouPdo9@=0zS)6$kXBEuX0VAp2(9J%AMC6yWpSi(*}Yv#Kz#9VgNiong- zgJ-tP-`g$xIsB{qo2>_4MO1~)TOzr~#c(w5Nu*7Y#O>CZo9j{wUHCuJm>AybX&6!? zb%S$u_w%;AbBcPv_i4gG>Y<{p&LyrLZzK~rIuruN`h-lEwFN#6^}W<n`gkfs<LU93 zBYsKmDjxTQuQ+SVP_JikQ_ZJ)x6;{(p0_(Iq=jR>mevRvtLR>F+<Y!gYj}F*43mO$ z7`J)B&dmiM!v>2&Hzvw_sjc%rZSlJFyX-1z&H8i6cRjAKYO<`%zIWIvykYt0g)7<f z`k!@e{`up;L6)6o6|#H99|j+bINcM)s~cmSAH0c)YdB80R#Yu+NuA4{gPZe(BL^hd z)ENSoWYiU0iC(%X*75O&1Q8yGZR?l%2M-Q$G*>E7N8>Y+wUe%n`>?c`U7kuz)nA_; z_4R8U)xJJ8>yqgU2LGd{MOe%E;v7%t_1mtnl$jr=Go3T?EM}mht?z}eGh3#V!QqS2 z592Rf4B9g!VfrA}YyE~zMt$x}E10~h&bKC>IXj)w=FU<j=i_X!wO4JZ(D*F>S^JnU zrFczDrOTGHz^>)<xsL{QWon<~q}II&ksR$Q1-{>@9BRF5`BnK3c@|vzvUz<_P3PMe z9|QNQ|7_g*<Y2>PktgMY%e|gSDTR)C>XrsQ7`J>InQ=8I?O}EI_d%V_EPXba=KP|4 zNuvhyPxv%Uw~j<vZ@<%-;iwq%g4Oo$WtGTl<}EAZ_(L=F9=NV!{P}3#-i{qfC*Oqh zMw#U`FOIYtr1B`4uyM+SSQPGmlBmqmIf40=f3p+;)BT}unZwlC5))k#yzXp}cy)Y} z@qDpQ`tI&hELRyH*z2fCpABzXc!l{}`!P<*Lri67r%Hxv9>?Fmq-Qgb*j7FIQ2BGt z#*ke*YYlCZ?)P@s!jIKys@#gwmbF#WJXvBYA$j-tir71&R3SdKO9#U0X`2srd>y{; zRx7MQrR2SMF!nvEy5gg(J=e_JE``9Osp7N~9#)IxZ<e2%z9cvA$6{>|(tRq$v|0RP zn{Lq5MEOkq*)oM=Ij=vATkzj(*9{oI)28kAa#t#*9G-ieGm-Pz`ntC0=C6&p$9$+x zXV<tdig0%6tMOV*HB6ad$vWcHRl^Y2Y=6kj#3T8Wtbx*)mrITeU)SBV?*}r!DGcup zysA;yn_ZSKbgz5jOLxzQNqt}S0FH^bEz$4zC9*A2_Z6@|?Bif4EcWK?+qt;ramD%m zMH$62ky5RDQ)8byQG7F^FsHq(9~YjkUt(6k%ohLgXUy&R(1&-a8HZM%V%y-dKzp5Q z;*;RZiJ2qqCk!u@JFm!2t6ks8KA`nkU1<D4OSXGX_t&aAlMsgQpL|#sot=2g$aAM$ zpgYyH-<#R(%B}aA`=u6l9NFFe;lS0%iOuiXCkI$gRC*l^Vu{#4E%EMdEMK|2WLR)T z>w}`5@0v53FKtj>)Gi#_LKRZ<cPcX9I`eVqaw}b?(_?9ZeU!;IbH4RqUFypg{B+<P znRkAlZOn3=T49wfaaG?>c<pK*3_Yix5wtN)J7cKhvRv=NteTn}K6jhS{3cDum8rd) z?!hKrE$T%_#8lsAwq9-il~@y&|IC@efZ>pg!JaSczFD#xJAe2o^ra#!o+|dZ?N^bK zL&RZa+seLIM>l!Qbnj{X5nj<>^_j;=DskoOb*?>OwNm__;yNaG%5@6;8bAImWY5(e zs{=j@*7-hlZyZ?k>q2X1Xs683(x%SXaEFcU@jH@yKK;CW^7yS+dg@P?D2%A3v<F?w z%CEUnaaCma<*T~DhWq!oHa5ne&FG;<>(g4_EqG#aA^GWt`;}sCr<iVJTL-*LI&Ir; z*KHiPy8ILqqs9O=SST(`$kD|o=S5<krU7>PYuUW*uggZ39Vn4Ee}CDg^43U4e1Omo z)}4+$S#k{xFHXN0Fl<f@T#+c5Gh<J=u=H2CUo;E%zW(hCcPX6?qfx;AmvzPW`jx0A z3(r(UY)yYE?H<c}tls@$=+%hcp0DSPSxSesqqaR;X2JDAO(=S*=r_%~?9Idt&dhf~ zcA;VJ9{2W3rOtD!>&p>MbWW4ol~4I}ZH#Mbxn1e5&-TA9Cl$2fpIOAb8z{XCKhi*3 zb#CR*nreqnPgxi2Si{D9Whc|YZ;AYaUs-FZeV--@KR0fg&|TuCWYR#ncyQoIg-vkE zaru*DOg!slY7I-&Z%8>tUCTZd>(Rhg8CSM>#DDFtoX*|%Hom;gUD3DTqH8OB4=iTz zb^by&meZH(wHMyaE4eC?^q4C{^Vm@2iIVj-YfChe<Xj%v49~0QNm5_GYDo26Q)0Zu zvIVzQsp%}S@n2a#Iz~qr1wXHP`POmbdUY_{iKJrvtewkN>mJ9XblkV+<~FR1Xu0OZ zDy*_r?1%Jcvx2LqrYm1Br&6?1FLb-^(!1u|@Pt1vP5!pr8n!}}u?o>lGfN4d<>wBi zmh*=78|fAEPDZjvyuNWrEY|&L&9ufgDLHf2(fxOCP@PY0&B}bISn<kayoaT6^25@q zPT|bjO=tQVYKODmJam_A+T=3Qc76Nvl}=@`qGHR6mS~?lQp!YGr?&%>3@vhbv)i(q z?Z+5(!1~eg40d_d^H-DChv%t2yS+s))w9`uN^M{7rxjf8jbRVB2$etfu?p(?U0Ff> ztsj43+mi4?A?o6I@ohhQdJ+US>O1K5hHEnFGxlXDH0bG6CEoMW?#X#7-|Al{$Nz3a z&||9V_ocnztI8rhC{fFHgkB4~DP@t~#DCRyk&V=n#E>(m%KEO~NFUxf&8YLu{8xHi zNZz~q^LYio8d~%wE@57HLqu4FGk4A5WgUk<c(IHZ8H+6zNuUDZ$(;6?b46OmRK2#y zE4{z{M&FV3tWlAy-m}PgTU$=FKVePf557X<c3^ocsuJcF?fdx9xL^0Pbq914ZN(O> zOlv7jpJ&T!bT)sC?at+<V3XsYFQsYLtWFVG0kl$9e`#L2Sx?1(gp>E&hY-K!7b@zK zQY%YbF0_00f=%s~H>gb`!_V9jb>g1A+Ql*dT;ncwvvA$&p4S^i9`I*u=-lJo&}G24 z`_q!D7lOOWUY|)&&^K_cUkbCZ$BLUJVy{M9Uo}r0Pc<;RB6L;sy;L-F*PHfjQ=2)~ ztlG~AqUDs{<tz+y(~)_V9^*Tp$J6wor9^=$c(~-bSoe9Xt53r`fI4A)rP%b|)=vBO zcWF=Gdw2c%mA^h#p24GH<ayuj(X$_JiFHUdU6Xy481TL331b`oM((FFn^(=>;r1H7 z;k7!x`t|XQMMi~RCb@1!w%w{$-_Tuj>jkG&xx+ci;C;VuuRSj8nHnGFp1Eg9^*Cd2 zF@RHbU-1fY=a83vXT!Lj6_imW($c|{{+j)-x(pwLw@uWYc@rOW_v^5vc-xSXOqjvZ zrzNGHX8DhdUmq@d{Px7#p%=LyWjkcwK2q8E-TzlY;XuK=xG&2E4t^YcpFHzxzUjQh zo1YjiKH2|9R(5ND(Xn})U8k8oTMAWtPdxSsGph2Rf$x>rhSa|KILUw0b)s@5b?>E0 zo8}TrqZGN9-81b6?Nb}eKK1T6|Bm|&$4vItiTy`%l`a;lxgGncwET<Rp@ZKY*t+l9 zPj7oU^yxYG<gdx)1#xW`mfu;Eeom%XZTGjPf+;zl^6c1n<6Tcw)edjgo~mXRE7Ak= zzF4NVGsf~I-qIb{D0I<S6BskqK&u=MqQ)iEImM+t`L$i*ZcDHy?|tj0fGD%$)fuiF z6s@<}o&$IF9z;gY^RN`#_jAzXra|VNm4TR~Q2Np*Bm6FMnGD9)UGH`XQBG3Ei)Ef| zIdQwtqFv^pcY^W9O<`$nDYq(}luB-<PqCSZ4l4O{9<r>_F^W<N66IFhWh|LDY^X9p zHFsgC|46m`z5BO;UNfWPsOYh(i}$^oE*9>#*Z7hqVKUUf-B5MgN`_T>#g*faYdm&M z?Yv|dqEl~GUpRm5F#}%jO6q611Er1mO5eqQ?`5;|XS8p4MB7n%udtd|(Jtj`)YCi4 z$F}mDv4lSn+Odiwb<YFlPVZ&vx9%;DlE0_!s#JC5Zn-J-{r<$Vj?|4`tXhW~PcdEg zf0a5jvHiQ0)^DpNo<_fCfQ~4(kE%9x>f%klV1E1V>G^zG3HF}PuL;Tf?&beo)FgN^ zE7nPldOGo;bD~a0PxDjSn&%yc6}r_|Q=iV?-eMGNpt!N~x{149^X&^e?zy_8Juf)< zGw`eVZ&n9e21X$!cmpMcje_5CSM?~gcpCm|1N>+z{D|r7Q$ho#Vi<9aB=8o)7873> z%@@Ngh+kfcVT*`g#Kke<3PIo_j#&}N8F9>#_+?levnGBql)#n~ztAL*_$>*<%!OgZ z1>L|4L(HWZMqCXJzGB!aLTb4rW=C9@=s#}edP|u?c?OP2VivNv^=urHzNXM}9r&SA z#aY`aloHz68`-a^LfJhx1k~nMS?J=m_}gq0$`$yTHhDUs`M^O6(~-e7*XCY`&xIe; zw1k&e!Ycr0pAwoTD3ZeF6Q<ph!Z5~P_d&4~CYB?O5f>5yacKzNdW;tjY@{(^!qA5a zFWnDAb$$YK%RKppFtqy(pZZ)wxh3sH>)?lI?UunWk<MCx*Dhv=5GotufiJ7lHE50u zEIo3DAfKJ#1ST>VasMH(g#@M!W(F|E%peca|G;@T|7I3YEQ^VQ4jD|8sMrvWdUD{X z1gNsc1c^%ghz)eChhIg#1)V2DXU`=ek~KsY6C~VMQcxsU4(r<qzeP&lFqNQ47Skj2 z`40>B`*Bhz(eP8P@W0uogjOtt>%#z#97f(=sU`;vTDgEUle&O`4Ft$xT!a=WDfRmM zu&Bi_sOg)NSC`~3m%~H})?aJAZN_1!V6ahTXN$ufiW!ouzvNJZsRs)<Jco7N4?oi@ zO~-0&Lb4{9FtGm9WS1<8CSJjSbYY$==50=j9g)X~YbZgvJgiczC5gU~$A~*%!3>TX zuOv|&1r$>@3J`6wLk0gqb8&P{7>PbmK(3$8d-_wDl|o4uooj+VU{J&~hz8bCgrdpG zr09)g26hmphysO*lQc3&(q%<t?L8b-0wn4I7`Onp5)zP9f~2MSB*{q$RU`nSOok^I zz=N|4QlLZ$Mb=FmzE*<Z?@CBLuQG(&Pb1hy851MI$n(r`p3|@e24EMY52Fe|Q^xe< z@U9wjuAp%-Y$_KR1oTX~6-eQ%RqQIzR^ckppn{126BQH}8<H=1hrm0A`ON3W#Wuv6 zrh+WmVx-pj3MQe%VtCUkU0g_kdKFBch_jdVoy|kA3F_qLHi5+`S+weWOoXVRsnkI1 zY1qeaFQiZu==Avm@A;T6!8E>c>6sU>)49SXr7v_9sF;rmHI1ndn}L^sZ-C)S&lJK3 zD(A!AB(ne`Zb}7<7eFtRN#Lji*tP(5@8Ue;JZWfky~x~-<SPR#RbhUpU4R_+X?qB5 z8g?WAFUh9Q1a-<JE4L~pMA&}0aFdjh1WaNZ=K5k1Sg4|K3{!;$xmuB;nO2N^|0L~b z%Pr-;&_Aj0N1e`3Tfu8p%$SI388xUz#EDc>u7+O`tcLn?m(vDycW5muOcAPd^3T`K z@{_||2d*XFcNXOYb-s+OKujGaoMTSuC-9F#<KM29rBl_k1-w?rM1ec}gQ)y=E3YU+ z1`4GEh9``L*{6hN3=XJc+5}T#>ZHwS$W#Fx3ay)cN@y3sD|Iv;{Z@21>jW82!xo0& zH~W;(a)Gu6W<bUrINR0;HO+(B2mb=}pQnVT6-HW?uYm~>tXZZDBv;}|3g%z6KYZ}- z5}NvUlJ%ViCQo>kOB4E|b|;BiXrgFYzyjvqhYFP7x3*R26!c}0ta~*v;=*Wf4p%UC zm_%P{q84F|{k+c__U+(*hKLYAvZ`spqyT$3u!g@delH+V%|b>2uwM%$pF*5;vxp=; z(!wMOfe9RyIYpvM+9)NNXhT%L6qxH^Vj!@TkrM<PAvNhZsRWVgwNV{uexI{;Llb`q z%#GdldQuCg4hnM)4w(@NIDvB1ncLF)fSC@aO_;S!2bMC}MT%nGjNJc(`I{1OiV-He zEc>~!#RU3vFyg9mz^4n<ES)CRSm~nLc|eqDHH8US=)e&C^_!6$<msa7Wo(7CHB3xE zhlxqzzhpdvi{z59JTTTn+%|d;mg7X+yY(>QZfKB)!*_)d94E}g0eb(4e1tTHQ@~pv zlLuaUOr&Rt=sp)RQjrOLcmnzmUcf&4l+ea;b~C~;Mf$Kt_Z9;meM}DY>7y)jbY9!G zSlDw0VPe;t6~tpS%ygEO4QQJ(ae<!($apscsLI5Gqyq!woN^r9zJx@F4KOL9SgwVz zM$A^IMuiJ8HgIzpGM*S(8uj$5l3|~`9ZKE+{l|zB+U~!k$e62z${1H|0nZm=YJ~8U zPwvj^Va85zn;R0_f|!8GRwj9{auLcYBYEE{x5KJFhdm1adhnm8gvOBsb}YgckZxK8 z?Y*4B1QL>&RKa^FOceCq-}}c0SkMB8x!t~fFTpDcD$<x(K}$3$&AfhkA_3;3O>uLh z?9*}JZHQ?SrDYky(kgBt4b6s_00BS8VfhvW^BSQsg$OaH0Vd$v4@1n)2#xn~Mvyy) zgylfZpZ<0i!i*hnfW=}MFgFH}&xy?Be?MHD6Al<ZJ?Ca7Y!K%+BCLp84E2WoW&#sp z%u1kcF)HpE4&VF(m;Zvbj#_}+WN-K@c@U2B6^?Mh@W;XM?-JT47G_dUgfS*gs6Su~ z^(adauombuM!_|L!{1E_SQ!kNFbinRnSXm2bzb|j6efb5FxctiT@T(BPgr}{1X+8* z1gdLtLGY(PFqbKWyWJ4H8vhrb1%vTlT73{)VTzPg9DwkvZOni_npqgshcT0#kBE$< zfar(au=j|-B&|SKWtr_r;CC1^FK{zMKC+22GVg*T$P^rE=;Lrv6cRXUhURRQX0YJp zF$63FMxhGA%%3<c5RbUE%`suZ6gEkNh_5gYyoK2fzfAqlQ$my6{U7f<Kr@Hpcy*8A zzpP6`v`6Nsy2ChZnvP%@3$#Emv4Ai*fZ$LIOpXX9mUSMt_rSUwg~KNOL}mOisIWlO zk5^Eb@p3K>hyo!?6a(6pcuB{QN{chh%wV%6%7s*%=5zKx8W*@}i5$>|(}qh)TFw$o zh^YSx@f7cISpNzbf%IduW+hU?Q^CysPdshRj(=DN<H=ut?il2D4apr|f|d#8OJK>C zEeL+S1cM)@f)nIJ&c#+OFu7R5;${E%9sXTH+wd0gsxHOE2;Nsh1_58-R5Md?u9*QJ z5O35{<b<rHu(%_i5ZtsB<=W>syy7c@xtAe#E?5SgJV^nsm%*vG$1;@TH%|oYF^ART zGni}JD=wT>6qNp94Ljgc^#xUfJ~lliaaJ-%a$CV-_R5gOSXiOLJ#h4`B8l#|LX#k^ z^L@=)Fxp+9R{A#aPy<a?m>Lm?6S(Ycb-=S66|s0Z1n%ho*X5Wp!I6LiO)Ejca!j27 z?&E;kYVct>iZJmN&?jA<EFi;!MG?5KK%o+d!)`lS0AB=)C^+^9F2~`(WELQo#3Dva zQixzqIDgsfA#67jXfm9m&pstIwtawaC8kJl{e1-vY{c28gvOl#_S?X9K<G-;m(o^3 zGcRS5=xoaF!O{3E5?!^Qg%wCxBYPKEL(-0HlH_ZR!Y&3!w;Tmpc9<-<YK`#{K4`_! z-Gw+R2^ekAFd+pEV6?0vHLS70BnX?;MoZc+!RX|NokMxnVmv}quH&rwgvK6UD7&kH zlwDoV!Uj0R(TH~bgHPQURG<bo0q7S$b%;N!o`nmz*&_a@Ce%%X(2Z#@InpP_i560S zku9oSwJj`F^d4Rhc`(+>LZ(;3?E2}1tg}#qFkHZC(3vfGALl1mCBb%30qY}D!OIR7 z9&p_b`Lh+0m~x-60EfpclE4VwDnsbK9wYDz4pI~^_(Pwy__~3XJ&GxBd#JaN0K`C0 z7YjSc5JP&)Ac-mZDGSi<W|09O>``_v_`%eD0A|DOa5$jvK@2i*9@Whv0@|h6=FQzx z0+y?wx_k0$xS7IW$12p(({Y$pferZDatebYKM77?d=M2C*3?sgU&OQxb}jlUjO!tR z8@g<qfKLqxcv=r?>A{uAO!3^lc+da|c<HmT1KUtk$FS9~bc!#c-S=kW0vA>z+D)7` z8iZ)qx3Y17nLjiR2T0RSVguV8U?MVezyt`N=d;BytTKZZ-({R*u(Kryb3i^X!iD>& z9JsI;=yJgLh{*ha!=-kdxF;n4N#TbNh4?66f^F%~Fvso74ih56fbS3|D+qE#=Epih zbtkO3NXLe*<l+R?kVYhEcp$2|su?QFoU5!elA9EmaYQ3DzY~lQ4^yD&gf=YQAi(eg zG&n)yGn~*uOv>d(0Df_m1^l7k>T+KN8l6x|o4|EFUIloZF;$|@#?BBhjsxqQu?2(& z|GwFZKDu_sfnvx-h_&Hj&#5>d2!1-FVL<<}u+It@nISMT;RIp!DWU1nNY)=z9yYMr z1$oHJ1!}2GB1xGps3yuk-Z6fI3)-7-wIDXD15YCraH|V1u*(IxW*Aq{cYs7C*B~<% z`!4fWf@TE5Z4mka0c#^!{nwyGMq2|F#CDKqCHx0by9YShfzaP;&^R*^Sgpi=o<iZi z#xzGQ`$JN}^0i2<?^>u}%`UKOE%H|>4u~Y+fCzZ878z=6T=4ij3|9P7EIGQG8tf)n zRb4T0qFIz)t(c02snH7#8E{%X`;^e+l1SEQS2VTHbcJO-+DoE^X}p}^zAJKg4<s>J zo#F+rt9YfsvEwKjE3Tf9{s7zTCfov`A8dY;yfT3M1SUX4?%$V?(c7$gnb0c_uB}6Q z1)eXE(1!IJg+KJXiq{BUQSf6OCQ9h7&gj^C0s0{w?&{L>W>+I#TQ|fjCiPsx8QSX# z2MPMTPrHeDSJ(1#gKuugkV@O<A6uaEY`AwsFCcs$34C<J#0f*@Yl4w$knf_#+_{YO zL&R&c9upyW--w+#$OCiZ8mODzaYDU_ckg;kf^^)n@NLR4B6)@9+OV+?@%FAqHY7~i zmmGpN48aDW-{-nFh<G*JF<By59o%7?o*qYVvOAh9731*K41&Ad(QI!N!i>TcVCe~y zhk^$h9ZftSdPayuw|St6MLLf1nUQF{2kHg~_rK|ufxX)=Y3`V?3bAr|qMpni!}CoA zAJ6&cj_0MWxK{E2VPKhsL6j+lvP+a<PU8r9k!6>8qF%6TFzv$v*yuNs=l1Njqa^E3 zPqgdvZ2h9?A25qV!I=nsKGbO-S%25@!LiT_bq#NLc*PjdMv@MBA;+A@QK<<M{W!)a z^xr(r2XK8jC=27{&fKlDpVK7&z3+Vdz}6cTu-+Rs$P;+gU%CXpJjnY4pT%K6X#&Rn zTXFxu;h7?S&``%O0XhmKSb?z*(q!WUX*W(FTE=nyzqY{gaavI+qCN3JO*x9g1!V{h zImgcdw0)5}b2uSm61jwEk-jL6?8D*e8U)|+Mbia*`o`2+k6=MR1grW%n4^J!<v@TR z>Ucw1z5@7gj2}4Bcf5wXNJWJo@^ve&!s0%H88#qTVgqb~qAoz&0GAQ)LP1u-cSKUm zICxm{Gwgb&VLQW?n0-oUN1x&Rngmx!!7aWaNb`ku$j<WM<H`L#oJ$-WeZl|Vv@2&L zEbq%pvON8b$O?NLz1>fuw2i1Y<>KhCK@ttyg0X|HjTkRcsw+o|M;Z)O;k|Q1Rd$5r zANk17_RrDN;I)F_acJlW9KYy|eIo!IHla-&+9v2K0bv0^6A=&rF9ikI!OcymIoojB zT~UH22e|wZjQK-&jU*CT?T<28yDfKB8(b-B!0DYFopS`_{-~D`-~wl$9wLp6Y>rHv zhJ9KHrU3fERazAZ$OK|6VB8<$B?Q(ev?kMF-gAOuIlX|h4ib>n7GMKrn~|mVo1vw= zMu^tC2$r7lhnA1icv29pV>4PC>%UMxauwE~rGP@2Pgjep*@#zS3pxik*#cEuszNYq zG<m|z%)LMF%d$`?4saC!C$O_m3GLqX|9H7T=N1$Zqfif{em(FBz+`}G0472-d+PnS zzva#05dd6~!sI>sl+fzia8?7Nurpa3ShvGcJRi+Xj4IrMz&8Ms0yCU~?4UOQ`Q&2& zG`iPNkZf@1U~*61A`rsKCjY@~ATAISk;nH7{=RXOzUvK|3sQjGNlc5d<%k5Oz!FAW z73`w)7N1xm2wp7_lm;7&P@RqO9q0wi2v`a1+KQ|rb`1+02v`cVY(+WYCC>fYK`_Tr zP!*^IAsrS$5Vdx~(M3RF8Cop;ec`9%tk>{Pdfgi|1fkjLD3oP<5{v_)|K&=PV2JLD zAkna3w3n2DqfI+WG%G?-06d+K3R{$Svd0+4?<N1aoh&Pw<oApc<oss=r5yq_vS*VV z8$(c@jK<OIToUy;BKYrd@&^M-iX`;#b@)Ty1D2m8#il}#%XmVevVv12x+D~(ne{j- zTuP#up(xY}CN?fkfDu~>BUYZyWg<68)}Bx_ZazNDVZIwC%6uLQh2FbeO(d&Y7@AUB zhQYE9wvedz9YHn_ABLKFA5Jp3OOoot&>(+AW-UuKteG6tFH2_zb%JE&+J@%4xtTf@ zhvg`g%aL<gcYY>W*Z*NHv(DLc6sDPeSUE*Ht=7Wez&1>m=xvSycGd2%Tpu_9(7Qlc z66X>JKmI6GQT?#;3Cs<T66Q8SgDlP}3NmGc*oYV*rd7V%VP!k4!LIFS>2w|fOz&)k zz}QA1F~FjRM%JG=JY$F8yS74Hz&so|jM&tbbw#wXHBkS)KeVIaP|lmANdWD&LLA`5 zAKEZZ3tx}q<ahk(eLEn`=|{lwAa)0u4R8J`9(V?JURLNX`a{*_8xXIIpAaW_wF8+o zhU+o(Cuo|$I0C^o5fEM;@JD2e5I1-am+3^3&^o=XVgMda9D<t}nsm+aYAX_`4uk^p zkD@O2_uaeni#XmSAhQ!wCe->So^6J&Fj4M8)%0;$kpf>v$q*6(vB^U0#H5Q5coe+B zISn@UQ#hrg7Z}PU1f>4kKIz>F>vKMjfCT|}B+3h_kq};U62UShLOdWK5?MVEJywlx zoX>|bMITRfB7hc!2?5AI4_t^uT~K;`=e|X7q;`OHpy%%tBl(Ys3iAQ>D5T%|$<>~t z(0%N%4Ejl_og~R`9fgSzp*_;jB$5i*WT1Nbb-02Q&PuMs&qu*19grqv`=XFpBIn*> zSD{=kTuae!+r+2>-)Oi5RgFen@;dL3v=S`l39K>wl08HdXH_9OLwYnU=B^f5%#CPd zqG++JMlzHG&_4RSc2<XEWs5<@d>9|Kdkrg&pODiR6R?nEb&f#^C?E!wMO#Foc`+z4 zR^sSNGZO8GY6-i3;Ap=ciE6~66^hSu0gpjgSTQV&eyu!d4}4?MF3P@GC@Z*{l&y_L zXU@Gis<eSb$9#o30OtnOcqQ{rnZAJi>?K^7!HM1M1K&IHpXFx-UU6s>AUY1JG7ca~ zrE#cw^*DMt1V;tIcpTcdvYBb_Pk=$>0y7l7e<H(3R*O(!Heec$`l?+#)S?+plH%gg zn&-_@<`z61*1>j%J!<wTp^4H+)>l;Fd7uSqA!2N_EYQaT*5)QW%Aw~!olNqFB|(1f zU8q#aU9eQcERtlm3%Pr(THn??@LX77#a!ES0m<rfR+t4G*@d>0OK~lrbe6;ihW-@r z9VcxmBS{OWD4bb;dl(0}QYaH?b2rNjE|IK793sqMCl!sz=~Sqtn-f&hpo<}i>z`RR z*P{)Q&2Z@41=r&A{cxO{6szVE;r>TVzE-`s8BS$gVH45!$q7MH?7Dym2k=Nh{@R)V z4H?5o($NHTUR{HuYZXXTMqY&TpK@Na^ibMh|22o_UG&kgS&0<WRuqBJK>HI7G`JzS z6;#k*f{LS|aXGLrR44<6Yc?Df=<ArJiYp<{I9@?fMmG%{fQM$gQIM+chUk4AvaI#H z(f<A``x_~$&}*mR{yu$9w=*SKPybO+iz_HwLZTzPQA5TEbjysweVa=Q=XT7n6`(Q^ zTE7VXLG<iZiBLh#8XOhX(hQ59dqB&uFFbe%x~KuFqfc=Wn{XlW1-aL_miz!xw?Gn_ zPN^nA)I18+4x&V7_+2K(90Y4u4G$ma8~65Zl65}~Hf~uGa(WG}W$PXwmy8L6ktEa^ zcy0^t4u^Ti1lmU5bTOGYE16GilcB6)7AZTHDe~_+@ZP%OMJr&}JPcO}^m@b&gUUa8 zdT>2C$8bGDz^Cy4=vf)ke_05gV1N5Kcfd5RBgG0+FjnB6f;wk#3e=c3I!hv7+^oUT z2U8?EoPz4Q?#RqzBN$<!&};OA@mnTPnF>4K1x8U$V3vwJMr^CP%_B+isYr`wV|jN3 zOjW1g4}G>iNU)MG>Gq~V3(Q$@Sz*Al2jeH&>|g*>uoWzQ8g4MrM`St|&ME|)_n-{R zoBUO62h5EaoITJxbe;fd(E~nFHc+$&8GB(5EU;39B)!~&f@JLitmF_3kkdYMgTz>z zWK~J~v(8C_3fMGBH0%$WhNGMHNK{)_l>MJo#zUL~7?K=5i=a*Hdr`ig;5g;b34?10 z)`Q+v>8oe?S%CdsbfDq07pgkqNRqPlqB<D=z9D=W_L*(@b3M_%9q8<XPJ6Z&<$*C= z!S#bADw~eRNb_`ve#;@zuyo|$6E78|??S_B;2MM8!EJRU>y>n*_CBtl{T7M-Oh<vB zw(<5G05g^FzPZy0`(~V#JjeCk2W4g6;DE61rcM7RHF&Oz*c}POQX3jWZ^-vi_zum8 zs00{0g<5$SYGXP*Aqu?4MWz4S+gp-xl$i-8fhhmEk=_0YxMZN!C@lk;!pQ>)GcaW$ z9IM6zHaEjC{sn*NQwUrezsW#zHoi<Kwn_+SWMcCPvA+$b7dtKlZf3&iT8N++D_DOT z8C{Gka1zByWSSer0Vy#Y5C!u4QJP!4AENu@NDaaJk(Zl!IV$3zcg&!7=!b=VIZ(VG z4GSH(>`_G=5C?$@Vt?&0%4R{5z6wcNn}wP*2uG{ntJ=80@hoJ*bsXKhoJ7a7(5#IE zzU#u+Z$qLM2hgzSgQFwx?Py%X4O>_wKJy|51AHCDsNqSHez=RVfzbnq^b?Ypf;`25 z?+r0wpnVV(VRI0|T0RJlhcK~xnD?no=LyUg^>Ey$-|P4ih<NJ*#00?$cmPV2JdEq% z-iBy0+3;WZTP>#eFI`Cp4$H=52=$5Ww_g9*?W7-+diEpU=4@o)OI*d;0|YDsBoCqd zt9b~*rL_dC{7-J6;Z(m5NSEe&F>;AU*wlg3qP`*;(_z#E*kR~91qRTN1LJ7yH*~Ap zVU$i<2D?8=!#twoId}E)gPG(%dKeA;qe)^<*TSfVoO4qBdKr@S<6#tFXEuJyl+%IB z(e}9`^AKV+$U#0>oda!K>4+<k29gfqoM3c2vh6EJ$lY|<O3L<gcl7oX{0oUXPvZ)F zHj@er0Gd140f?RpBhf4>RJ%76{xSQSXc<md-ToJyeVaHpkU4}Jo#zOopN;*Cz9&Xp z0)!kv^mv?pBVm><2=4tMJ;zC*a5D(65mB^kE*cMvav|w;-e08pT->x=q%{|(yTPp= zyrE?Buz5i3<lj~g<Mgj*X6fW>&X#!)^}0HX&I8(4#M%A{oC7!;s3F-xo5fi`YaUvf z#ov=myaVTm9&ij*hRyruDWOHy{>6_SMSDrtD$4Bo;UE+T6Nua&X81RJoATCQ{Gmrt zJj8h9)Ng`=ZVv1b3UvG@ZqM@b0#)b-A{%a(4OdZteN+?9>=fzvtsl+uvjWM7;_Ux9 zZ$Un+-^K2~=o|9UxD@o`fh-f896W=OBul67%E&A~3#iCPi>NWZ$^(LM;@t^PTIshs zrdR;25WaZ>S((9oW(od(ChiwbwKNOES=)a3xly~8my}&!fMG;6AEyn1<#3%A3s-#f zZmASU#T1~(X@xS3hROu08?im;|BQJ#XN0`*-GUg{DD;)QXhdpTRfy`h_K;PoH*D_} zu)XP7BaLxZO?7<t_=WE9a|7rt7x<$DfBrlrG@&IDl(2v>4c&#BI-0tmrw~&iBrY{) z4K%^=))P7nt|w=o652j`3ClzYA+Y2a$^jn7FpMY1gH9*G;pL9rL?N`_?zQm5-$c=b zL)Y?I-FVb_dC!$q%qhYY2`RxOHC;0(@dD1qP3fdmeE*RGzr7`RiPv`s+4H<l3d-Q_ zW0N6#=Z;Rce#5`AFN@Ie0z)yZ&%GW0a;z#w8&F$uj*O(a9D3lUGsZ;}z3%e-#d~07 z{h{gfW()3_E2aqc!FLOYY-o8LDxOUHmm~B9Ja)uS`w6ykobA!x|H~#o9P|@L{C&{B zl&=0Vx&K#Iju4Y}w%WTI+Wi~4oL<a0|6j3JCood1tPAr@gkqL3fS1sf_Ob9^vH0u! z-2WYl66JDIWbQRU1$r=bn9(U{FaB4-iw*FsZuT&daLcO_=$4Nq|MF^_#1x1k{yw9i zFXG<mf5nPUqUmzoNvN3h%D)^hFG&c1LO9|P<!hXRY!=u4Wz*P+i4o=hJx?^It0Gg) zzhbo`qTK&YbbsO6AJ_iNc0UuoFHb+e3^)yWPuBm-8(#+v#@}xv%yAt0c_syV+zK`s zeFsTs`d2nMMjXDJ1}9>KEN>ihl{2h@6a1lH$!xk!CmVVOlO!Z$XY6mCgl*de)0Pxn z<;UqIuAaeU*zpv0%*y^(G<bOi6E^6$|F=@jjRE01Gy+2WL$#c&macYM=3vVL6C#E3 Rkl`T%<p71UTO6N;{|~mcdO-jH delta 73016 zcmY(qb9AKL6D{1`v5kps+s4E;CbrG#*v`bZZQGtqCiYBhCzDLR_m}zZy6gT|tIj^V zs?MpWSNE=`)0Z47zB`~R%RxY50ssJ507P1`KEn#BR3bV(P%}|T7;<ytxh65N9^$`+ zCJx{Q@WY^lfQI;=k<0{r_~F2XvHQ0Y4(ovX;dvtAK}7x^+g0IDuq+w?aKw{lEC9q# zi^9i8ZZct1NBe+v2&qtf7)Yj{{xQ&+RsBc)U$kYLZ1@ku!(9jdgQ}W>4$kVoG=l+Y zfya=T$ybYzX|ja)2uT4hA3*njDcBF7@lWO=c0>TcmNKmY0^$SMWDzNki1fdN##Ior zN2vgSm8QNFR7|k7s=>A_Wh7GRiH~^P{AI5<#A3E_Ed)KPMl}Dib(CJ>3tal*UouwI zP9}Np>(}3bak*)NiWQ7<6b)OSNL&^X;DuC%ID)W1n$tcbmT&%(1dwVmziBnq`EVm! zY+n^XOHVoIH;@H5uJy61u|hg2$-O)`xZ<P4hsV~uJ}clG;d<wDqs09$%bCF{-)Yh2 zgxGxiLR=|oOe_n6`7e7!HZ8aV=K!sJ;fu{@zM~ghbC%IMfXwgfo}-y;VIHppprORe zJNt?^!W3eg&fM*`pEy?WnmfG#l+>iqcZ5O4bZ#8&R;>%&PdYi<WLk*5V-W^q`NW1~ zYh;{9ni631OxHME$@aa;WOtptR18FeN))_D7x_c_?xF&Dq*)b{Jjlpm<l9(x!oMMw z6Y8g4w8R^6G0QS5gZdFw;gxI6c{r@ZOdBU>euHdQ`~ud#I4RM=hLCsPg_uz;jT|Wa z4QicRP3rfXIAcnTS<XlszbG^%66(+KyRrK?uBU^Y;a|0e6)ayLjc0dC3sU1GY|su; zo0jgz_<gs@U(W-VFSw$X$Kx)7i7MNb4j<OfAbBw#`YQ>(bEbL}$7%bDjnK>S<6(x^ za*;XYCr<<!?xq@=XQQMl4!_UeJWlDjGi;7`1WIJ7Y*<w3nYz-XpBQn>hvoe8%Eb)} z(uoD*eFmO`aXzI(lJkM0W??bdjJUS0NRoI?SvggLG9Y;3llnTEhM^IgBlO?TICion zN5unstv3SOjV}xtw8}}kCNX#HGwhz`2{F-x7{V_J?m26;-5JMmI_>bm7x3?ycW2qp zfB7&syHej#GgFI!?|lnyReF!}&6K*~rNm&RJ_$}LvcYw#vG3(B<0m&wbWVJAH9w96 zya@`D0<6ph))f4$$`pKB{{qO_1*`r#Moe&FUnC}Lrk~T1Z8q2^=Nm0j&Vt}K`1Bq! zvV7i`P=AIe!qk7_aMwM$p{W`JJitBYr@WlXAmU}h>m`qFB;`OG%JDZI{ax4|E7Aj> zw`OqUg@})mLBVN5Nx8)>N`6w2wGZdqONSr26<9tt^?HGb*)V=axw#9OyW-8+?;TJk z@Oa1cH;+!*tAC}w^8F&i+c<$n5Ypj|ZbZ=I1I2t*C)ZZ2-EMmrU%J){^@f;PvPqHq z6;#OpB$>UW)GAQ1M9&qk&FSeL@Nfa=tg*8TLar-Uh<BpUlcU&@AfLZXj;lDf#u3r| zilMFfWNcwr()O}DO?$Uoda|E9{EgIZWI}iI!2tP$g3sl1c#!oJMcq+(1YiOvUNf1E z8L6}-4;;e<@7{k_Ep%I~1`HdSxnxf4!xFWMJ3h2BNT`+Ek8-T}oK3I`N$!IC9DmOC z=+uCuB*EyZf9CO^im1LGC3>CXcW|T1r*LELNsBd3tau1GQ!KrSOG8^wXKyiYp2l5_ z2Dg!4Mo#3P4`xhfPn*RoT`I5(OUTC2XhZMTr%~Nw`aVv%D>m%;bqf}X5G?<^>rkd| zZcI{BYfTslOr|`}d=8oDJ0t?59fr<a4C4?mdcw$?WXN-lo?1_9sN2paWy#hSx##{Q zm8wgmt7p=Jnq{^vWVvta<TzGR5b8CiH<#@Rt2Mm2#8kr`n*I`d-SQ$lOjqk?=sc|a zJWN5TlX{iG&;#7)9oVOG>_vz`fOagrEaV0z+YBm@Ryr>)m>KQ;?yLhNFL9IN;KJ|V znx>3SCz~L;eUf9?b9`8E>@Pfn1PCJwe-?l;Hx$E@u{J3{FJ!w;PIzb}kcx+zw9d#F zm=am6gsWBbde4O*qrui0R*WXBAYEW1RoCQTqKz@%zsct1hydX~ryl!#HkUeqxi7`g z<&l6Q>(>^F5h=$h`RM_c!fj60`0j*8d^Qm1vx#RNw;G4O$5ic9Fbl^HeLIQqVla<5 za~6QwKBcAg5Xv#6hd=*k`D<~;r)Ns6fG87yLGM;y=LuYq>oM@Qjw}U{6%rK~OL0>| z;VB$1kC>zBw2F<HguQDrYq2iJ6F#J$1`RGPR4QPr$bDPZb^8JyfaY-f6NmSUk(*Dw zcr9Z~KZ&EIwVIWK=5ilDl`jjAmKi9VKTom9ndtLoU=w=rDM8Vr-JozcWH>uQ0!-0< zkiBr3VMluHiZ0eXdN?J9;wMe=(BprWs`I6G$==dW@B26QTz)oA*uOcw`W#~+8x+CN zzAiN87AWuu+*dJR&&{d?+Z#l@ifoW$vV>g<b38sR+md<I>bbpJ=(q_LkF=udyF6p0 zfmPuE?`)`=0*hKUw!2lx;SaH3NydTn;dLht$3m@zDpokg+Z}$tc~~|UEEG|qcf)VH zY%|f{4P<_#P*l+v(@Dc645Jko>qpLKl^V3=B=!kOqFkwgSufHbCW3eKSWkV;X<g+; z4o@t^^c<)d>PYW<-rrz$lp^W|Y&ZcJXOBpKbE~^oWRnzw-8dtDz)d;Jp}R1I6=$4n z`N*{6!8^K(SLc0B#N*MnhyJY2VvNz#b8E~tCrYwT(ABFO?j7ryB~gAnLm*}|r=@m4 zZ@t9knqGVl_I+BCpSEa;e80ZW_m@8^@ODa!7dbWCGTH>**W+z1^q>jHt(^nbYXhtD zo?cKy21~V@f`!u<#!G?ks0Q>Zm08Lui!ZIkMD{4@%H6#RpgjF?alV|<EkS59q^eyr z8Mrz6A}VFw`_v?($@bNS8XXfqrJhi~U9gf2G2A0KWtey1Q4!nE(X3|+{;?C9C>dNe z6sT25YQaAVaY}h~KmgO|t`S&zl!|%41JWB;QoSe|z&@GMx}Z<qa)RW>6)u{pSx;Th z3DtLA7b=En9n)LkO*w8vIyAFDxy*l1g8S;ro;lm@>3K`TkU7(&sB729kaw}@`SWus zC0RRoBP#&9j`q|2tmQJA*wHAv3Qu$3x=DUbmYN@xpVH1Zvl0=CXlG8Hd0;K1LfR#3 z>9}CcNeJ6Yu3yb!R9SZMXnI{N;{t)oFs41U!r$ZJGD7#W(EW!{1&0fmY9v|f{%Kqe zdefb@ogMF{VzIK!;%Bta7!QNHfd<nKSqF{aM3Nv#h$~ut4Bjw%+x+56Pa|%K%{VA! z`z{K)vQv8}l0w&f`RhU~d6cN{*Lbdou-|%{(@Y<-vvadYiG{e#{`=B3U%J{hhS*h_ zx^nJ!mPUY4?d*buYCv<qKr|5sFN5_M7wrwr{dZ-`Y;A0jNT@kfSc!cjzkxIWSI6=Y zEZuKRr{$p0N%g3SFK!}y#X>tc?BQ)zmM5=+y<7Jq!C#&Im)Y6ec(f5DyX=K_*Z7$^ zP4<k8QQ%v@_wu}wVq|G4pgz5*QX1y6Dugo{5##Ec5q<w~b>PCLjxsXi#9A9^98X<e z(e}W~=s`J>l5GLgWXnb(S9av@Yq8z$;7+;8|5~x-DU1U(-z>onLWV#PU74EK5_Lqa zLv6!o;^L|wm5{sI{+OvnPcadXtV|@2boK35wvLn_m3OdRhfL@q%KZMO+GnAtSmB?o z9?!MJX}X-&qxB-ml*pICD;<y8yjFts*N45UKYNtT4qxH3b7zO^(tGG|-16ib!I#`F z!3*#F9mAdo-k@WGoQf34H5wzz=*;fofv^2h9r|cSnvlO$hZAm$`PdIrrR&GbQl1cg zI2!FawX^0lJ<Z&kq)*mMt&M2!QqvApXAwYrpW1!^v-68tl^Mgob&I}AF<BQH46#xd z;jkiPTa-R0VF}&Ml06;|whKmUfa?TC2S{-YCkzza)WWXy(j<NqheQ8~z0G70?y)fg z86Sy22?ezSSvUo~M;o?QCIY|s89AP?z+_IFhm^9-5(`HuE|-j&iHiHNM3patPagVl z^v>E4aqqPgs~3D<c5Q3HF<p)9jA-lEL!?TfIZzEHx+R{bBI?WgY=r%cU`-R`sD#{T z`ad!oEl52jQeXCzAL}*@(faT>q~%c|W@+1Eoj|-S-*YW_GbsoDej5t0`kq}v{Rlb0 zkrn7>Hf6Z62(l#Y*plz?E!lKA@fEC|Piul0ocX<>iX}|#$vMPET~*nu|MP7|kV3fI zOn@gdb!b_MaTEk$TCeAs0Y0O{*K7Oc1!2>&z>lu^?Ds+$TPa<u_j$SpPQdYeH<6;g z%a>`j@wxHucR`<3p0eNSD{Xb}9jm5E6y9V3HC1#Zl2sVL8Oq(6Csz#)Noa!BYC5I5 zDsr%5$@fk^^KI@|gqavcT+7z=`oC=ojkXBQgJ}p|tn0>*62=}{B*AchXBr7N!yPFi zMi`#yfDPO}<mfmyx;m#3Yr#@K#8{JTVFKyxbF!!{2MQW&6J`8UYyBHIteyy=#a>UZ zw~@aJ`Z4dI70kcB4!GL2a;q05f05Yn`)iUXaA1`UgX?;q_*MP+F})<E<JdLglBr;0 zDZNp;#bKq<F_t5gix6D(b5XSWrd{nkAk0Qf&?Z`sASz#PvMf30=aGsjDogu(z%5S2 zw)z#pz(&wg(o_xAS;OChIAqg0EfcBeFH%8{UgxI4EKsSox$ATju@|WO%wq(Rra6BI z%~ovfA&EGov|QKmyj&~JgE$;&T4hR;HzhHazLq{qvN$cPY8Qd6V390`VcQ57MKAp- z<ebDrM-7!JzMzd$yRAl3dJ~Y{r^N=EaUFo<Wo1=((m&OyV&$zjYj|1pX?2}IX}cZ{ z_!nm(R6k;c@TcEc$B`?P{+N6B{(Bvq=c2m7!x}SnfuG>Faa~CUjRWFo5+7z;)f#H! ze38!_Is=Swq-22wWq3@9RHDLCY;9Y5>;sa`vg{c$45zgtx!(dByt9fq{Ce+yQl$v# zxZF9oZW8=XWbGJ;E{tQ1Za3rIVol=`5!J}QW2co1ajS~Nwh8Jg=9tSwoP1S|EVWam zmXi<~+bZ!ma&x4@`@Mo`nbao%a9K_CV3z4WEFyB8R80fB67Iikf1y=AqK=bBrG}>| zuC}IH?Ow?%b&bt%`*i>zGZZnmGLV_ky!7pF3NJ4sZYP7ThZ-9CCnXj7?AbQE=cwDb z+`S(AJIFceSjHHIF<lkcqo3YyMnBTZFue=^iXzbteEtQc7hcmtr`R?*>2LCVB{7c| zvEjRD%je!_@I&5%-cr)(ggQh@n_7VJ8QE@Qz8BXe_R|<*Xnc%_XZa9pWk^fgFQbRK zFIM#Dw`nv9^f6s&(vvHJuVV)mu5}pXb))4=Z@qA_BC=EHxHk-jhOsf|qZm;LAcV_N zV7-MAm(A90`^aXjUW`{K+@juZHy~2JIsvSuLMEy>*h_7V8I8v|=8kX-p833}er{u9 zGlJLfUK!-^tCT<JN&?2U=}a$B&#NnT%8h3Iar9mzDGj@++U2jhV)Ew;d3+5Kf6!iz z^PXe!EWPSj9{L^LMH}ol8kaDN3B<__Co0<q9jz+wqibg6(~*sR^9=bSodPa3NJ)3T z3L|wkuo5bqsV;0#0lNHrND6xL0qM>6Z-w+r5iFB-dF%G}2Z7ki^f0Io(1z?`u^QwN zl3}vkoEO~&=Ov0|v2VUioyW0IY~#rc^@X3hWHhqymsXTU;X*fqjRH6Gh#izjfBpVq z@g<0`FA|~SJptZH0zXxB8NOeZOM@(_P103~8C(+SjM&%PgzM5S#iTffP>6OBkn#=K zfh9Y8N27&=1md@Mk#{-FNPgM+l~I)TIFptf5$?2=X?OUb?D;kRQzLs_n3w%G$}c-h zJZG=tX}Fx&>DM{2<idYxF`c%q+PFIDm993q$ESobjT;85fY_2;NVEhaWFi}B+abc; zyWk=@+RK0|+8E+M;cB@irD2`Y%jqqe&Nt+gyVOT99q~Pd??@@sb(>qefBK02o(l;5 zb$UvB9CO?!jz?ks%3DNl!8~FzVi(9U9MEZ(m5?9m_?Pu1Om1!X6X~T`IA-;jZ=T*s zZ=~U+L4zmKk0-Cu;5B>Ig<~o}xAiwm4F<69zWw0+=>~qj6&H53ltY>;i(KW}CQV8B zWAPEfcl{8L{X-7-)#zKx7ITO0&|w_80wlAzZHo2<A&bs_0j%Y<i_s}4ega<FR}^Oy z`(Oj5v>G8_cs%WM!7NRTFWzEof=X2Q-Sg$+4lQXtN`|{5c-X&@Rl}jH6!Lr%ZOOo3 zk#6iZg<i*5Awnnuy5mh}2H%VetTA6-*SPavGo}7)hD<VZg3}Y0k2;z-H}n2jpJ~eT zw=SllvjfqQkdH3RxD99Zxi<uEnO5zIJRR%pw^)_zdZ*spwjhLg5-;v-do4z~pG}xj zY;&8Ltz30StGYK7zbmNEKy*k~c<+D>G=6<^b!p&IN+ig3ocYZ%D=vH@_M)Uj$l>T3 z{giUGr*tXPS8W~DoL>B1*ww8s(1GKr<MVD(8|O{2`^?=W5cGP6M0pY7rIpq^4#?$F z%H*fdPJAdcJQ%<=FZ%xJOUlEKz?`h8_)i;?BTitS(BA!1!PPvU#X~P(!z>NTJI4Q` z{x!9B`~4H*IC~-BK4dliu^Ffj17T+9pES3yxP|&5v@HZ|>!m;e04C_kBE7gxOTX&= zA;V8z{s9_6RsuwD0Kg!@|CQ|WN$?Sx8voFIu%~T80>6E5jbO&dv_b*^ohbitVWnNk z17XvIN%0Zd%AkP#kpD}d%?2K*{-FuB4PXLaKp(zd9N_s!(6(AaU@^jnPlFaX4Etdb zumRyda&DvH0n-0t(G&n;e8`t=cEZ3<|5zeKfj$3lpFaab|KaB4f$`)YsbP$KJu5;2 z0Hiqor(qJN2~pz1v?V$LYmh#Ih<*hs!l3<6TXa8${%!*U0Hk6A03^wxj2NjD{~<d= zf&MTbNWNI$J=_N+%Ph{$=6}@^pd<$b{QuQDQQ;%DS)>6E|HW6%2Hrq_fEV47nD~JJ zfG$KDS}q7PZKDE++~!gQRQ|ZBwvpohQ_y-DaQmOHrviBJub|R;pf~7)#wj?+o%lcf zln{{IpMsetLW>WbRz-u4kfz!Mr2WY6YZI{Izq9%8sOiRlB-9_4!Ud50pR6iKxbItr z3IL39{g*Rl8VlWjmy`1V>_Yv(>A`>qKd!XR7Zt?+@0vRBK#l*3aUcfi{X2tcDi8<c zM?NjN=7f}Z0D!z{a-chAT0cELY8x9ph#Bu=HN%dkXbu4YV4?kA(O7A5#30zV7)j9a z#~r76sesBq;*zU^2L8o3)CA@KiyLJO690&nHg5%T|A2kA2D$w^nm!xQuYXpl9Vq!< zCkQx!UjF%bT|jaF=q5ctM0g*2PZL1M|9b2-1@!OnX!A`2Mf^Kp=v>g?zb=}}2O0ju zF_ePPKUmU4D?#=jBn_1yYU~edy&u%|Z)?UFNE79wS~X%d;?4galr6%Kvo)&xuh>t^ zpgXvazJh27I`zc`08Hio>#Njd(5E!+T@W&OpDStmp1$7204Zhs&Xg@hLZg#!>|xqw zzrmoDx`IA08X_?vB%Q1S(po1Y=l$y@QUE0J&9wgcMVc!e9$LIq(SjofCjoMuxd;8X zB<n#hbXE-uolG1yoko_}VO*i)peaavFM=j{i$8Q21^VMo2@xjA2k{IzVCGOdr!z4y z(^NJN_J)4-Q?k4(n1uitCRj4JRtJ?~vT#}wm8D~J#K<fOn?nW(x>TXMBj&9!p`lSB znhh?RqXyqh*MG_j^LIVU`c=3r#veh&G`aq5q1xZNnCtTDri&+f*taH$2eyBzH6ujs z)n}Uoka9GBw7%#bI5Ql69d)I&TMs(~f95H9BrJ7i5L+vmJ1p3I<xhmo*UpSz_02VB z`8w^8m@h+fCn178;W+9G0S)$i_xC5t{(Jv=x4inhi<L8nLhtQ2-H@bLb)FE#6$?=e z;{7h*ZAXSeB~vfr;OWPT-JZK;G4YKPWdha>N9&?u!?}7}j)VZc#B96C0JDB1IJcKc zxvO^W9@d;RFQ-rN*~uA4|BHdatBbSy%V|34yd%ura#z<WmyO~&Lc-7fS7)e0J{+fd zvd)D~Qx9@==tCOAfc&U##Kbub1r|yR7Fw0Y1f@OsFiFo|UJ!9aj+MiNYWRW1DQELV zE@Q5^sJ=2|971?N?CRiUCZ}yFxPBi5NGalj1;KR72k7^!3Pm8JcI<dOsbY#!V0Xtv zi%=-BDJ8djj@qh_P!&#{D9Z5%ZvP3x8`-;U)Lw14G=}p|4buI*gKO>u@@Jl*Ol?Va zd=~3YX*ie~Fp8gv0aT@b+SRut$W_zasfJXH&{9_t&nHl3Gqy%|+!fCUm%@f_w+U4+ zZ1=MRH1(k*t36P@3|4610sHo8&xm?cEAa%G%?Y5Ku7JoWMt_{~;y%%m-8SQ+%2)9~ zieg#=tm;G%m^0}t#5zNENM;yx9GR8JM_gIU|M)&Nq!!(I|H-BHgX{9O4vLrW`w3As zF>iK=3|;=Cz|p3q3nkkNENX9vO5ule0Hwagc>SuuWDFa_ILUzhNRnYHMXaf|m7LTK zv!^^ZG&B^DZkAEpQE!v|Tb~ZCVMdmsT79Ll4@ImN9__qNRpSYw>gp{tCUEv)0be$V z1JZR8p+Wxky!i_e@b|#^^Kp3A?aqnCgM)`RKhQ&Yq^BzpW@SPUoah)IC`zYV&tMvc zyVJXS6sTMJCr%jDDDis{%P&eRYNx?%;O>QiGCj(>O-z2JlBRKDU_c-HYqucJi*Ikw z+r68_d^f2F-OBJ4{~Ie_7P1et)IO`p!m_v9YY{l&o$&R?vS0=QApv1qS3uMtlP8?2 zCEr5;lqe&O(`PO}aMiSwA3NMjCe2Axw;miNE{*d+Iqk!+>%<}J(GemhXY2g&fw>s9 zAr;ycF0!l~l!&6G)eS;}rjV)QKoI;qH5Td)VSYV3tQ*`>0QyhK5|eNsfrL0!qJ%>P z0F&gf9j4zYDpW+KKLisUptCZvv%@1dc~4Mmgp$|zpQe-xUgsP`lo|`#{}h}X1Z?+s z&kYO-(Eo+uUA&99I39(WaVjGv<~X$z{X~kqvoUfEUCyo)C>xPis+4#O^%TbQ=Hn|^ zG?NmLLNR_!zRgzQ+*lQODSg6?L(dVb1iBX8t5tbA5b)DKXopT%b}0v88%&yL%&II9 znXShV2VnDp6J!Hf2)mzm5A$Hkns#1q+E!<le*d|h>e^{b&RU&d#yM;w5y&+zN)}cD z^h019ed{M4{<+IcY=L75^q-v#OWprVl_Z^j?isP@n`GV>$=K;s#)dL5J-vgU&fk)> zn%<KvIemzT?^r;(*zJ-QY+0SJF(i<qF+ZEvq#Y&#uJ2V_v=i#iHGpYa53nfs4!}n| zOcbglNsT9iE#Wr#^9~oDJgVzn^d9@Z1$!lfZsy7pOb{Ph%9>sJ23RtAU(DDJs2}@^ z!yuci#c3O?RWD2a3&9P8*qMoq!BVopJohTCS0!E5+3H4$9KxDOEKX!C2ttVODuKU` zY<avMj5!esH2oQ`T7b$p)h2@3_)BTL=V;mX0ZNU8;#?@H1Dm&JNPjVmS`USj_LJZ5 zEVX>X)dPd+Q0eP08rgee-k%bP_iCP-lE6{N3lVYf57{tA6G>uu7`QoGrh6;mt<tzq zp(vkSLi%CFZr$d2v-(E|#nyQv;O7nf3Kj8S!FKv0G}Je{A^v!KaXV9}aYUS@&VTbq zoFRqdPghs5KgYgtY2LU;6Q0Lr4;Xcr2A;`<jNMlXop49DiE@^8pdwM_wR8caAlrPm z4G(t>#lvEiL>p_7Cb7O5B%d858u7PDD~lNWEv@B)+GYpy%UiK@5-E*IjlBETk>z7q z!6zZsa|J<wDGzAz=|Fg5p<D_1DbV`uijL><T2AYqiPLaLvc-Ag7jQA#HJ&Z$srMW? zdWPk<v{|uxx^1cXzLq)k7{w?I_<^ky+|2hsDBjR(1w*FqWZewg7|SavBy-*cT=|RL zq}q))-aM6Pt62BaMqh8;lw*q`fi08XV3{Zv8|deD9aQl@+R>f%1Nw<X>X*qrNA()< zVuN8+i&l9Zt5Oly_X2xo-h;W9@kFCJe}&BtGH#tPas5&ju8cRD>QpdBt>)jPc2|Un zWdNsppI45xQRMg18iHKMt`#~wj^*h?hQ*#na#ncar~oFPH--JmkquDZ*oGtpz}w?y zJY;G0cnt>@dXM2K_9LeZ8tcUAPVVc?B0c>!OJ7XI6@$5LYWL|?(x)LIp*SG>!7l=p z=4}Xt2pdN~9RnOJIB?4Q-LwKWYx>{p>YRiTn;PMY@pOQ!kx-tsGy6vA$j*?j>{bH` z>{m@11nqb*xo=gcw{j6j!P~QrU<XUBG#|XPrs?r4(oaDJ{Hj7*<7GtB^8sv2XS?Nl z#n=)UAftfg(g616KnCqJY|N@;0wkFZJ#bSJsS|D3F)54nr3vaWbMsK9-N51=yxX>P zCJ?O`_?pPr9z&X-g8Ge0vYRvYlfV(YVxnVKp(IOCGeaXftrm5H|4p(2SV=2u1K&@S zfDTewk7lPsAdk<<;c~WCXd_mKbQzSdfbz!8|06;XPRz-eEtv5#fS*csSeBzJF!#bx zABttUoo)HxN65&yrtcOmp<5)K#&&i5t(MQP#P@?0VUw-7+pDsx@crj(LSiD~bK>4r z;aBfF;fbnv!DLcCv^mr;a2V7dh=3!2q?8Indf9F)3%{mYsZH+UAGg(-4%dho_!W*b z9LyeKI1YbJvd0w|Sc`-X?OEEv01`@LM{jvn<VkWD;^9#_L|OQp{OOsuXpDIyl85wS zeDghvY)%|Z*l#j~X`<O8Q!7_^>=4e=-!}phWzwmP^-a`~VroRpz{ayO)!$jyjYuH; zxq88S&Z`pqGDx_aP}+6R<ZJ>EXo);@loak^AZ~H}SXsD)C2LHuvKrSniP<iKfC-28 zD1GVX#pYtvNYxoNYIt$NeU-aEyAQ8aJl^5EIR1kC9sCt3@`8V$?p2Y<x+}{9@ez@Q z7gp%3eA=Z?udkl-!HW*s2fOTlLfVw_!h0?J>KaZkg>BU0$;+O0rGN9O5#0wxK|+u4 zlXBjNnaU<0Nv9i5M(?QDEn!+)5kMpI4&e@`85n^s&TBe0uCnPd$TM-h#SlL&;fl`J zmnX7%;v~=dOAGb_?%Q*f4S}DfVhkSfC^?Lyd7$E+!YA6kgBP{Ag_`xQ_3INuEM(t* z00N6$8aSukAhft&)llFhkr8IwLX|B-4En9{yC6Jjq51B0;GHyQ1ocyBE^<VjyLw<M zc@dDset6oX&w23H8zTIQNrF@3zP#XFl!7?aSBHi;H;GG*6)ca5R)s2$F#2)5Yutpd zlHLis6u=LS02ZZXbb4B9vhtW7Upn{BEpw}aW>g^Y)!bJ*SXjf)5;`m|H9L6^qGszd zIetY!!`{b+RA%JDhv+QsM-UK2s1?<@F`p8+PuL9~BJLEAvCmVrI|tg3ZyRFYAs*o4 z>X@D|hUF2^<WZkthyYk|B3psTiG0v*IZ`g9#(&fv!4~UQu&6$}XvfAF19&4=F(+0X zOwGmIBD<UnUL^m$tkbWty!sb?U*4v64oSd*1;#GIlLKbwb5PmV=CSM*tfNAizt%T{ z%U^0`Q14-7cy(|5B7kmBoEZm!AL-7dN#+efyuVg-_>6k(noSR&v_}5=imRntO{^3C z?f8v+&Ih)1i=uA~9Gp2EQt`CIEt5^)IF2kWNU7;qejfLqhnm0IfoE&rm?cuj%MkG@ zkCZ9lK*D-9*BpSk_s>!}yZqfGUpY-GSa5VjL$>?p3GMAwS?T!+ZBF8gT+y$CsU)^3 z7NX1Hj2?kUPMf0+AVG!W_{nbmOn@!7Kzu-!I|z)Gy({)5`@2C)N89av2}oP|&Q$i? zaIoD9fg;tY(g?3zDZP9%9|D*K0WFe-2W_m1yVf5(|6RnP+m~B~Qkg?ro1ZhyyWX}l zg<QMdx?2=bq*W$EKM4aY4G%U-6MUUz_2VR@o^3f~QoGsoj29`OTuG{=D>`&?<`i}k zIR%SM3oY$WA{Kq=8(a<|Uh*v<I{fLjoO{v<5<zAbs3J-(bZD8~=kTjW{MyDgw8~aX zba%Pl(dACIB#8p$v&oqhg6G5jR7;IAW)M)+dZlCH0sAw>q+*cOs0qb*w>S4~USy)+ z_mAf-buq46$G`R-=<a2At7lfqO&2c61U=vsd!qyt5ek{m823LCzJh>IDc<nH_@Rz) z&mkk5wwq{AWbNPid`YpnG){19_Nl47lfe+fxfH`_G?NwYoLU~zb@AYr<M+u=vqbN- z)eDr2EzQTgFMM$gYwNTEHy&0u&Ser4UKdF0^J@C{PyvGMFM#z-NSs9`CbOpgF(h!a z=ij8ljAr=M6GJC)&iLM))3zMH<qpTLgD&@KUNsz3iCD-~x~<Zy_Z0@=B{U>Po{@N! za3233+X~z7Wy6(KvOSd~vmCgC>J4PtS*2KS(0?}AIHkV1!tbG8d?V}>gcnFRdIWS< zw0t||JS|<L?x({EFq-1HjBHgq*ir{iQlQUir<TY=&B-Mm_6>K{a}Pdo5BLps#`e{g zR=KE}FrH>=OopqnB0hXS_ZL4dG;F{3#X0SyHyhTTvK{CX^nkl)o$Q}ZNZAclBnp;; zZ4GiL2`*6F546O0p>#8d@@mY@3ri~L*SpnLhI2twiT(~iJs_||(|bV@x<LcCmqb(q zv046(P?*U@QTM!`4;AGq80f~UNG{BeBCJm!zH0qzX1!rQJQ*R0kqI|^5zg~9Z*;kW zR*k9N6pA5y_y(X>*t92ud5TF`TiSfasWo&mDdT8B$*{V7wj?iD)5pca7rKM1h{D=f z;>S(mq$d^0mVmWC;b=y1Iv)Twrj?!);|X^|LQaCPgX+OIelVe2cZ}{-EchYE3Gq`f zK{Y3m<~t||!hkPy!iqnqF)dqlkgZs?vNAV^no*nnFU6}AzG%*WVkyHYoUiNC8U@o4 z5w=`md9Gf#u<ZbbMw!yKm^wlY$wcRT9aN16>nfXMAb>qN&B%@n6Im9#=kWB?u^OIG zj*cZ>ufIR5^18nrb+4XakzIQLN@=_j5Aw+e{~A8d7A}y|g=XunCI9zJ3_@QxAbf|* zp~|HV*{lD`Z00>gVYBxl!(YDXun>l|kjApiGOg3+m_u>u$bPz_d_my1wW?bI5%FFG z_n2_w8#9@f__^7nZ0Ic5m`2%B{?fS2R03DnFy0yM_364`2op_Jr{>xnzE_cSP|{(T z2J5eZQLAn6glo4$&~5!evil0@3_0VD6d}m9cA2aVN-Uo(*KB3)zu&LeaM%Q{fJO25 zr&tXAvuZw4_l4#>KDa%OcHJHL;q4c>ShCm8bOt`34<MMa%_QK#Q<hCZCvEc^JPFf( zXw0&lEwR{5f<#U_KT{M}=$R8cFcBb$;`n;dId$s@6|SQc1*xC(yQIX!>6X|3gr#M8 zqX;m)k<J;XVCzVAj^8xcu-RI`{^5!cvQ#dmfOi8)bq=~abL}IwX@+c-EiG^aOJ^)= zQugoNiTJX9Ga1weH<*xU<1vgsi($@x(%|eH9p=AEa7EQ9PW7IXc3e6eS{?zjDAMWm z9LmEq27UL_SV_hj{b_CHwrkaL@8t`auG`i9L7<H{!McQHXE#D>kF7!YB3W;(j%f9$ zf~Z<?gsp&!*KT7I4=Hot<s$><Arjz}K(|!4qMi(x7Zc(Jt7jk+7;H}vt^Fz~2W*7p zVz`^?pF43a$p+I><#;8yG;acmlOHJN7e{STh+6K=)P23G`Ny4A%4Q!8B<YzKXN(`f z?+%8ti=JjT2#q{jl4*|l5_%YjnK9DXgFm){`3fb%`2Ct)+le-zx0Q(x;bc&-*NQ5| zJ!^5YKLK{Yx@j@wFa#(3HT+4M#S4_s@rBTW0<XBqonxn0{oPB(wZfGV_0!4~kS({? zNrsUtkUeP2%OjHK$7v=-5Ilvjzl)k=v#!I+Hdiw5J6RuA(C~G}*6Wrbh^)wzFWbaR zEhyxFadikm33;yI_j;7Cb@#o6J*hBrSIIr+q(QcWg?t;6wSfVKaJ^h;jup81qSPy? z5wBcsUBSu4v%gQd)Sv{Zu-UUjrc$COjastVU4q5BjU?Z;z}WeLtgYwDWf{F1awI=Y zBD6@4bUwM3&|bs6Kg<2?@Gc8mm5Y6t{Z<nCDi~xzw3@Hv^Zif-BlGLR#F&i$N-58c zRGpVKxEFUF#wE2hwyp1TGoEC~tb{~EG?Bql<97X7aIJUG$kpsBkB^RBO|XlBs0lK$ zDNQ(CtYnYDQCx%+?!X!RWY<ZN<+r&eL|c51I`)&LYK8aqOLM-etp2U)k#Fj!PQ$&H zL&0=a8)a)b#r|`RU0N^j^F>@J{Oe~0nsZWpVE?9M<9M}tjG?sGAi;;+LL#UBqJ%@V zp8C>Fb9jAaoBKa*{2n(@YYM$0U9w%WUWhU79Qx|pLz<W7+*>{P_$jh*1(`qeX!kyM zCCw~9@{OwW<v!k@)smhr|GM*gk`<FTYQ8&Jqcw4{^sMaQHl@4f6s&wNYID?cggf5n z1!IV$x5$Tl)j)7GxYge7cKNeLB02fu?}HY!nQXJEDz9NE)rT3MLVY(fr1v#CRE?vc z0r7+zPa$}#<$UR-W@6e$@XPI4dtH?eZ(|*Xu}AF+2jvy|2ANr1$u2Qvh<|j=iGeGk z5#GSzr%(n`)~>kVMs*pZ3dYb?T+M>fW-#-yjxq-K&+VdWYDiP__CdIz5{BO8OP=pj z;}K{*w@2)b2MFNl+Ik(!qfcK<f|il~d;f{wk6&4BYFh?e9ck72)WP(X;44ZraqPuo zJP~wPJ2XasPiL*1UANujfnMd`#fm5a#<XukZo!Vq2-@lx=U#g5F~utp>9W}kHp}1& z_0Q*3eqnwG(zGmR3LM;DZm$xVNmKLrWV15v@Eg}qb7b}ZaEz97hm^0baNzdX_;BKL zleG9pJb1sFuZ7is8;X{oheX8PHjxnJ%~Yc-pybOyi0@Zz94ssi!j-$hNo-#PrD-ba z%QYy2!4H<Ax~TtsNY5AXE`Lj1a*zgpv39z@AT2c!b;TmV;#=>Z){WT`_@Q8-a2Mxm zbS$65q)R!<Qf6OV>QkcooHKDW?}m3hSD@r5Oq9VsT9#(jljz#%aI1(qtL?g%Qy_T1 z@}zYgxV{n_!WsG%Cv(;wog5z7-XPQp98rRR2y6FM0eZVI998DTF7|CCOo$AOL67%7 zAM<ChRkwDuLTIyema1v#=d#7fMMG!l7}{WSS;z*~XZG$(tF@sQI*IGLLs-vq*H)I* z33FXcvVxOn)(bA{`qtGJMXwZZCcfkA(o(Jo?iSf8o<?_c+;80bP-Xu0_+^8?kea@I zwH_d$wh<3>vH!V@&{ZKRzf6___WEoihTZv1oxSv)`cCFnKwqUaiK<2<H8;f8kfbyy z<H3_q-bSl0#gVNu7BU}hVETzF81XVQEC*Foy29wa;B4TA&Y_wi8adr5P2mAo)i8x6 zpTO@I`KL&`Svo7Vy!IGc-&=}~iLxOo-FX+Z(o@c1NxQ7nUkpcy<=c?);Qq*dpLe7% zUmgIn_z_fEJw&8(J%xDp{W&3#c;jZjK&O-c(yI(&{s4U+7EimwW*Wa#&WTJ;bNPn8 ztEfr0o`JWuDw)P+h#u{Hx1gh@vnRZd>Q0uv)ZTz`F2-6LI#f^eOa?7?BNoz;`PFQw zt&)4vC&yr{Tb`Gw6#0S|POUn#(e;#R)1d{yWIFMsd<`#cqo{6w$<4~7#*k$SY8!m9 zF0HqBg#Ty4*rxmf`Ztqn(f@Dw^1q2l+LwI@;xraX2!u3cj{oLSgf5VXACr<&2#C;s zQzIq>h|+(von<VDRl<*5P3#cTAFwxeh?Rc>l@&gS!hf?Ee?f?ef0m301p7Y=ECvz( zVWpu-Lim16R)RXQ=-NpE01SHofHrM_9fBYYi3cAQJR@l9xjvfm-*|;;-U5ja(~Lhd zt5KyhuBKQ>!LH7n+nSIVmm(aU3^f3#%vPlF_0QIFH$b_yYh7^4)g-ZhI;SJPqppKJ zvhc`EZCPWnLSw1C+pepc=H^D-{I}{1w|B!Z@n(kR!tacqlEnw!8Jv0=meIFo>ZWb( zKPgo(!RO~SnKm`w-CB;hVina=>fl^7Q#I1uy){~WeQ)ekutE*5*#B4=9EOHnZzeY` zUUrh@ty7<eK2L(XJtf_J;FCFptGFtfE~a1YnxB8>+IMcmEjXM*I#o|mRn1&ZRnr2E zro3jFG`HUecbcuExb%+QzP=+EFjbZuND=AEfVsY;|J*)R<<`;SRJ(5vcDxmv;`Z?< z+;#v&_0OL&FekM*=oQzAJSBo%q6vIFG&GtI&i5FmrYdxQLv`zzOCsz9CiiD#`ns*- zJ=4tW3qs|MDV5zligx^F-bS~a*$?lB&7^trDP;a)XZw6zUC{}z{QC>DoJd+9Q)6q^ z1z5prdiw^C%8d0%+7O&ZzIFB6xua4-|D;>-`+r$hQRy5ovT<1BC>VNTcVWCdn|jn{ zZTcsal@3*0sJ<chm3E$Gp4a2ZF(-t)@bX!hYaB#ZkAoMjGiq9dCkR3sXq(6uF0nhQ zh_b%Mdv7Mh5OXUm#kkW~N@Cv)TGuvx0asBO98$je7Gz;>#ors8GU-_uV7pxDp-xB# zfRpFAbId`ipNcydPxG8cZo~<qv7I^*`Q)XfA-tJ%N$epSvxCaBjEM!meto@?e7Si> zIgTG=CKB+u+7o^GH4s0hb|10UYZryT(-O_z(|Y4{bHzL+OjHII{QC#48sNkE6P)&x zT+N`US-}9F!S3H|)>}S~f~;C_Ph@lmXq?sSqEPCTvOLW*>R850&1cg4p%ZYUo@0KV z5m4P!I@LueZ=9cn9%^0RiJetCaBTlm$9Gm>eEp8?a`uMJd{Q%(p*!_gi*2K1SsI7S zn#QqeU84e!4D>_p)MQZ%zh}kG0jx3zFDHsqy(r+vJ*l3{I1!LRYqV^G9o^H@BbnI3 zD5GSD{bV+JYl}@Q-)@siTlpiyM^QMpz-Q!9Zqwri+AMlOcxqCuC%c08s6x=XMb+M; zU|$obDw6L>O0Yt9hJ2?iY}XjCeAK-tE=EX6#0{Kp=`3r@ra<lM>i|8k3jU@>&{2j) z*Kg5CO|QmGocnt2?G6{)rC@NRRZGd4-H7cA^`mgR?#qz8(_pNWbp)e}8fUn>-&Rmi zdSJ&HV8`J8e)(jJa4;fJjXz{?JkZ{+c7P(4&O)yN637FUsi09XwRmACHi|Q*oP|vZ zH%1}pmAd)o=Bt3{X;i|jJQxM{r!1|)Y}Rr}g#x)qS41Fz<VjP(Qq&x}1FjO)gz91u z?7g-(cP0grO%z{T99h^ZEVjkN6(2Stl^8S2ytQG;p%K5*I<92exYV%DL3Ero1eK*o zmTONBWGc;3yUx(0wT4zjXN8eBwjLB%HidSFOqX}&w1Q&n7Y9s9E!e4iIN;9G7i+i5 zN{X?Rj_#h4hv$g|L>d`^EaLjwbF2yTMRGZ4k`A2KNa=D$EudW7vzq)}<xk#^^^0mc zEGFkC_XvOFu9E~}HP?YV$tECUJDEiPgw>1*Tv=b;*T2t}P%jV1x6;FQo1n8o<&vLr z#WVU<3P@6-%oT#wMBwv{Tnfh;J9)3Sh2exaG8Pr~c&d2?)+7hg+8bzln+j2%Cj(HY zOQh0Xq&*aDfZib<^^ubsV;uS%xp<t_-j0v_GqOMCACMaklO2J>I+bEFC0X$kW^({L zD9oCqrKoB2T4f7qXD)%^sdlLah-ZFIHb)MVzk9!D%&>wC3-;^?cKUwb2rMC3f0iHJ z-gg>k6l*|TFqPX>*9fodfu4d~BjHl)pY{qCw8rEq{gi~LP6puh+8`1zC84>gZ;U=c zzdM#74E%azwDB35Y7Wkzv=j9E=jai`H1yZ7vXhNWDSvK_T}Pc?J7aBFxSadTgcVh` z53*d(SEMImnP73*<bLzG#n1Dn3OzXXXA{_;iyrBC?JE@&R_;gR#GKE1{C^LLOn4(L z-sBmWjf^I*n;g~?S@e+ha1*m;U$t^?SD+|p(*%lV&QvK_Zk5!lFILLu33^?pY3I(^ zZ3H6vD#(X2pY#cIAx<78LU-0V8vq-1IyAzJb&6yl0>HE4^_Z+K9I#QkCS}8mzBRtp zc5Y2U7rMZ)Wvqa8U}jGa{5OBsjJC`J96C7_DQI>_1&r1Dp<Jt_%SdU9;^$O5*j2-) zMvZ!==Ez{txr6GC$OfafL%q9Ai{5nGmm55tLuv3{kFmIumsv@XRZ-KhvkGrEvzOTs z#~?0X7F_P~6gr5OmFpjx6m`RK&Z@e(Ksvmif`8$j#F*9q<7jeppR74m*&Vve!XQ=8 zKQ2Bh(Y->zpynB72lE|nDqWDqeT6`}AM5X=;_x)qUM{CZEZ+n1P8v_1HVoue;NF9} zU@2X~*DJ9!9B;Lh>N6*^1t)uhUpav`zJ1umMBpMCdP{5dEKf%Imw8A9Q4)r~L7rQb zAZTIcS(o}9ENDjx*@)OmP5A62g!KK;*cVhj1{o;BuU`Y1un#rrH(^`Q5#=Y%U(qm6 zr{p3gB<xC7I0#@8Rw*a7$jNxwZ}3<Kd-B#apsL|0ky0Kzk$S=($$yC`Q8o7h9YiQV zp5Sv^K=iT#-41_Ii3HNZzPoQ`QgndJi;p9s;1l(|GKcA>UjovALi+wqx;4-lP9pXj zf)9>wJ*YB3m@s^ELUtP|7WP?}mZ}=CN4J-HLU;CbGJ9$Z%SS$E*zy9+lQ?jGf|us< zt)44BnCNMMGW8W6yOMiRt0}n4NLok@4g3k>uHOe~#~+~3EHCmN_zQ!+5T{<VcEhg@ zg0jZJfLF?38w5l5B^!9rizP!qYNieA#gE5sP?HF77(XJdUh#u-rYV=yuMk03_BT6Z zF@=d))5M2Wx`SWi=||(R;pP-@RKf3u9NtqPZCpIr$*)GfngC+_>i-pD=72#y38sNc zCGiL1D%153IWZRQ+Lw|h{U)C5hY1GFtu8;pDqt@LQx4mGwmc<SVb$rDsQXKFl+!#F zO^L^Nv@@O?Jf8ID&i8JP);n8_D2a_=p+Hes%~%OO1Qs$N{rT5%^nQleK(ZY&0-&^n zJwfOO&%_9&AW~H<qWAf2<_88`5P0~eeYTY%0kz}Ulam20!N5sGBmyg;Z+t`*GN?0I zE%;e44%ZW*2Ei3IHD5QFJ4wy&m#yGJ+yZk+wH3Ado>FOf94&dL{D2?llKGTb5;1$$ z_peKGt=+j7iE1)y%+oQDyFeairD<G4iTM771PdxyDJ?2v3gV(s$=&%+^I$C9q)T87 zkbNUjsy}pvGtwtc`HB+2BuTidYG`>V4{RJbvTQ<tm&0Ks<AtILB79P=iSe<6o?1wI zdkt_>MaMFUK(;alg*9&%f)cGyEA>^W$knn%A!2y+9~)G6$ZYP<o-$ruQ64L}zrOEn z5f7U}I@7Po6wbRWgd}o7f}xWwVo(_$mr5z#U1e*W*wPoJ0)xS<SP>PR5&F+KFPlfk zfj%a2Y)(D3T{YcDhZN~5BdO3L@r3%Bpai;T#<-wa0rc{p*>jmmITX9peXx9R`Pk(^ zFS1$|*ZgQEjxzt1bzSvzIw`K7Pz+geLxTKe{`WYrCd@3}2&N==;Gbq8OvctmDCu8D zYv1^U1y2Jc+uahhmq41$Crr1Y#j20~!YFV06vX!AOYL$H6qI<}yp+@np2Hk{QKTf$ zvc|g5U2x?kA@bf`Ql&Y+P)*T>0gDOjM9fBXAS;z)=+2~sEJF&pjilZ$>b!JD@&Vs} zLSO*>RY@XAu_lpp!E6!~^gjgjvWtQ>nHEkLVPL+WRiB=CczAii``EE71;B*gx6UG; zb_-3fdlan?G52-8r_}Kd=QQ}xJ)n;y$sS6O)*#Nh#c_%1NZQZoO1ia|lN`@$99Nb& zT*tZHVSby@_tTj8Ij~J4XwohJ-Q&B@iPA(Iyy-y17QQf&02p^n!G!9EpKfK|jSJjL zz^QiPfiQ%3`0p*N=>|imjn%@G!WGxr=%|j)X{{Y?D|!`4_o#K%bXZ=;SabID1T1|n zK>VV=k;EJ1+-LTT?(OgKqO^T>odf!e7ufa<oZr>gRLFk#TpPs=AQFXDm~N1ql^pvg znZCfWkJA9nn!q*j)Kq2KYma*xddn{@c8%#o=&MhSyS;LzU2=g1b35m>muq{z{P2C( z8JGASy})d!HCJdRo7M-*C&09Fja3tsEw&{Mnh6#UsY=FZb>Ndhf4L#vaKHoYk34nU z?F3$W@yUmMG%p^N?ee*yl|XJA^lOoTDgjp)RwI=rUhsLq;FS`@!3@oRUD^!QORkKw zF?h8lHl#nPteOu4TYaj2GG#~|4OZ21-+<sdk4Haf^zEN7jc|k14(I1)DLq4tJt`;q z+~&2>KNK;2u};$J`Q=gDDb1&x#*KMXKYy<0Yo2egP(eCwxC_tr7E{WUaShF2+f-2< zpA^U8Bv_5`lKi*LO>f2)i=YaJu{5lN!3pid*7J%Kf%;SEfB!C%Sd+nhj-e{KUehuX zjpMSn?XfcT<~gMt&pCl@ML52E`~_9C4v-C+<Zc%jE<MEh{U##AAYTzSkgG4D?T9l< zow!RWT4bf@zkGq_Eqtl~BS4wZ*|9{Y_H9R;mkqq#FJ9i(fD4gq13insV5C8QrDQZu zV28^aw4;)62@~b1=E{gbV)AFAd}r1023Zil#~&C<`stbcC{pdDLDI9qq4Epqjom=b zXoIE|+kyrmGS`692A__c;^^Lb@fNxye(YkznE+X7*Io{cdjQKNB{+X0Xnkj0>ndjS zj{x|2qetz^w$iQb^N%+C8^%BoPykW+05#F+7g_yyO39m#-d|w4stUG5ovjf!sYc{G ziT&-*sTd;>x_LJDbswxYq(Ii*B;KUM%ehD{`~l&fknukpqM3R@oVYvt(6r&7kL(YI zMGS&wF)f!BGau<_3&obDit?xJ3F?8{KO4a7d4bM`#4c9~*&GB1{x{cO1zdAXLqMrV zgNRTL?bCkU+v=eFnzJUCVuwR}u71RJE42ey8hSD+!EuA!BeRpC{+=~?o?y{LR6Qyd z8BoJtO=dQE4DV<Vul!y#s8RGVF{4toR-3iZKaqQr3PQnacZA)d4A*#VVp1RDJ^;*R zR(T+h{JB4jFn!wLrX=<CjwV*2TrzzZ@oeoJI!M)cjZD8ED~ucx*o-Lx;1vkYABJXT zye!(eg*sm^ivMmTrpRW8>H*6j4U6pS#EWqqUCBocgu?kXleJGx&74Op?EA{#|8h36 zU#6tE)vc1GrOPk<hs@Sxj|Zj(5(a!LsGu=U-sB?Rh^gLdi3MVS5hpU2q_!`K1Zmu0 z23w}T&rNJcCh^&}jou3Ohg(qUM$65d<?~D9Baaj%guQsbEI?4A{?)r4L#Z$<^pS*e zE{3|>t2Ud7j<RN<m)tnVbvXqN-E-y7742UVb-(V0hJ#MNuIdL@4BpHx7=qh!n_^Zz zVImC*Rc@u5{<0tvlWy3_?GUeH3*z3P-T4|c!`e9-cu9bi5I@ZoCTH`2ej`q9(@jKx z+jO@x-G1E-$tN8mTIt3k)Wwqrz?D8Z3NEW3<kjEpO{xavuU8iOhmpJgws0r({{Ogo z>!>K7FJPSRhNU~Dq`MSB8l*uQq*FRwL<FRJDM{%TVd?Hvy1P-3E`fJH`+R@D_nh~S zJ?Ea8JGbV}%(M5Id!KWEo>m&K_|tbNWr$dbh>vQ;>>H|JiJt6yS=rm+;oD*a6(&M6 z*sF#htJVza^0q{;S?=*oG&a(w@Bg?SSw4c<z}f$9*MhzGh@n9i_X0n&$*QrDuV=)r zPy3w0-`%R+F$zyUn6W!Px-oh(3Ec2LNB>lX^b`HW;&Cu-&T8S5s*j=5TIYF)g~5vu zr4IeKfe5FFV8!SNT<n<7LX1*vd9EZ(n#OAZsk7s3yyKgXXR~QSQ!T9*avewU8d`j` z3i@*Qj&+El^;#TMUv16@z9EFuJBuC2oZT7K9Ql9oDvYMynMK%XRncanG9VFeE1mRQ z<P`X-b<1fpVO!LYl@!)9tQGq8;>DJ_(+#te3;L(9D{#O(vk-AG>#pOxEI-EIZ0uF) zNBXN0aTD$eoj&}l%AN$G4l}yKq41f7<MJHdbi79fkZ!)OPG;4rXDjHV(%=X?H}eBt zpedGQsVS<HQyn{5!)E-)u}dssDTLUDE)qRx`eK-t*%<@g#cq=pk_dZA8itDS(m1jl z`@hoeXt20V{{m<{7@^qd_rkcALutu(7O~ks6r%l)PGw^K=p1OuEYv)6Msjt|*s8B| zGqo|cByb#0sS!Ho1?3YaWUh6;jLZr6B9j!ghh4tMZe#qM>2TC6umK&GMEK(^g$^d1 zLZ!La`Effv@Jy3ugpp?gw;t(sVZiyNstLKjUO6~8Yd;1_yCeY-;n%Ma;cU*Fik}QT zB8w<Uy(dW5#fQ$59<<L26pdZC+&~w@qMQ{015MYNVxJHgqY@*JqUGiltLEP2Ecbgo zQWc8WreY}C$9CF-la+bcv~xQ5w*M3`MHGj*L224F7MVAL*n{2B@4TCL(xwDG$Xm+B z2~fe+?Zi2seUZ~qc*GOqC#(8I4%O#}Lr%C&Db?<#5XvoN{>^K-(9;_9`SNb-th9NY zV0&dgs=l`P%g(0!(_DnWVzi5!-C{Q-@*auzLsqAH<DO*TMf&Hwl8Bh~b14ZNlqFQX z^Z9oWf00Pvl28Sbjz2%aO-pFLLEdSfz79WvS*?F-pk}IhcU_eI^7(Z-(ArlKA=c>i z-SB0xubZ&__oQLdgVLqB!!aN2Ef-CG!Sx$M`M42SkO{*2Yu}GW;O{Q=KgWn|+WB7V z4&(g7(k(`pizT&H^L@Yk`js5d0chi}WNF4!k2Fpa(zlGrSCsd`4+T9zZ$i<{8}L*K zz#aUc5-Iv;H~UCUL^S^zgNC?V>z#B6S4~ensa4IRvsJSSy585<6h|SHG))UKki?pv z+HYczeve{pe8uago$9ZVg&{TKc=E&KcTmo}iCPkMVv-N^EmbV`)GuDr{haTS-1cOH z$1(cNeUf$5Fa4+XMSS_KJ}o#pj^Y@-@B$Z<>X%pi@l5i?b8<iz`@Sb^p~i*CP#wt` z`Qbg*_}A+nn~{%Q#eDcOwR>mMF}K)rT@CG#f^6|_W|w+cA5~0?4l1*4LjQ_7s`Hej z4n3s^`kR>8?dk?%JHq~{qM3C4^FA%+({oq-Ikzf6;Xl#VvzhYoNRj|r`p$aM@MIqx zlkB@S#9k4}yv{^Lcyo(Ec&(vTbHvdcVnZcZFHpxhB=>@(r1#k~>r3Ix(r|FAhfi7d z!{2}7bSEF|M~p<*K6PtmPnHaV7GnBx0zV+(KyY#Y?L7}A_}E<+E+F=4aN@8s>-8?O z(+hUVuM970a#g?moIZ&W^eAStJ@$O32)-?q({vSq-O92MvyypdCRWl%X5zv>td+`q zKdkzRt&vTqGFnD4wp=CV_Ky^!COv&JqsgHCN>h<l%*$*|ajN`{S^{ZV&SHsD-(fTa z*261h^q^<K{=@f(LfWUHM{k9>!>a;+DAy2b2M;Z>t4~H|irxG{yt+Z}!rMW1BLgG- z>q7S1a86WI&yFQSMWM9*fsW5>nl<v6<m1l3Ol}{WSmteP@h$n=nca`xw-{*5)s+xW zw>j?arP;d67g-;PH9i{$BIxpbw*Th&z8u-H<h*GQmtEcs|8dv(;Ieb-{UP$%(kTuS zha<m8^4`8Rk@2stvQ0+HmMxEMI_?;7Wv*I^&v$z88Xw!lMslT<_}9-`sftFz1zogv zHS7kMP8?U^#8^c|<AbE9rg`4N3!bhghONrWZ%g=!yV(x^?4r-C+PhbtCx-Th!1B+K z=sU!`&s~goZQZ9I*^FO&M89GWm#*zJ)>;kjDTp>YxpkkqAj?K*SSs063p7XoM@uBt zm%j<4-coO!t@WpHMNf;HN-SUDJYwKp=9(Wmu?@UoUwF<tojijD+Nr9*AKZ&Gl+rVp zIxeZ$fGBOJC?kCFArneFh?y2Pz%j$LRK!Hwl^`K4?8N6qmpxUD^*pPPsQ^hzt?Pah z%eah1*;J_D8@Sp@)UeaCNc}trwpEz=&X~(C=hdpONWRz=icQlfu&B}-6K{%V6;17n z&w$qHk60weI9ol;I@?}TesY+!o8c}?QH-}QBKk~=*8cm!D}uBOhcQ+*jh?A04A$Qy z{tmwl@GZ+XbWm}%l}{w&5qy+fD4SLNnOZJCH7A0o29_PqrXIejq!C$nf{%@*`9@HX zszWkFu&SlzCPXvr!9Pv<ASg?pPj^3EZY}n&etIQcfNCh&9@YLSUrpW8*SzP02v!|L z{+KUWUn#yC&(W|ACxM|3BEuK%I)Jfz6Yl+o>6Waym~KRlBC4LY<lLj}t3_wJmqFqP zEe~zm-gmZ}5EqD#(7@&D8!+vi;y=0}WUfPtW-cKVWsBqP0&fAb_0=~UhJ;n>ZDe?z z*Ucpz78YccyBlsI>@5E(@*ymtXOu~n!&zso?op5aMOBh0FNc`dJ@Q7j@eZSrVvRTT zm5=u_T1#2xvpopnjLf2t@jP#K|2l>~j#a+Ha7yD|E*wVD*XZ|g?*b?BANkgfwz)6+ zNxlBvarg&M%cJI?x!~psKfCYoO%j6xU3b;__hzmXrfghke<u%tCcQ1mxAJ@-g+vOh zCP|8#g;NhQ-T_-K^`+5=t%gxQ_e%k5ewWa$=XMc>fkO0$m)l@7Id2Y^IHL`%2Uw2# z@2BdStsr@_X7kk%a6cGi6@>C(UT39HHgGR9p+wF!Cdd&hf2bPoq7Aod9|<wg^?4ut zy`_JE{-?g|r@@_TBG8RZ6s?9X-B9W)iFRUk+Pv;*Dm?;np)WcWl7}O{zbw~vwFd?2 zphazW>RArUwX`&r;&RVC^VL2c51iH%F~uk#v#wHYcVIR1ed_`fw;Fs_D-68xNM2Yy zY6(P}G^XqFD9R6`^$EiW{rCRyhWtCz^5uDS0Vje;&wvSeobx|-{w!gIO4^Y-7%@Bl z<pJGbk(Is+M{%UUO$TQ2FT?Mleqvnrf2&_6QUCk<K~SM<wa_7(?!;LYuPQEzeT{F$ z<E<_S`~D_g(%lJo1#0PPh#5LlugsDf7m#V0mv&sfWvhLIUpLBZG%)cFimZ|)aPl1& zBJ(%N;a++uSHPvWxmm|mC_ZDYmZ#y!GIHYp+t)#z@zxQUb*<xNgq9`}`BQ5KP2h$x zc5|XNx?uPddS`3EUQaO6kKb0s^D^hZTu=BmPVJS*3Jiw9bfVsuu2wZgBQMT}Q{2EK zV7$#e{XghYcHxOD9#b?X%}k4f#QzfBhuPRa+YYMvKJ4?VH@z8mhpIWwA^F#AmUZ&m zwB!>CyHBGKuX}eTru(Cx9=A0`FB^Cwe?z$|N1RYe)>l<=lZIjU$aLaR$B%={xUCC3 zntk#6b6QVIz@J?#>?_dUX<u<9`yH&h&8ar#eyTsbOhW3Bc9uQx*5|w<^S=oBNPxi7 z-cK3loQ&@tX+?EEl^vP5mS}gb<J@NQ&AHy5)N(~J)=I19id279sep$1?z(=$rIkm4 zj!Psk+brDgwN<0qXHBaKTdT34gc;+e?T-SMeH+M%B48FCBjbJ>jSvo{Zxn2OKTp$d z-l*SfUktvp6M`C)e5(`Q3yOI?r&bT!4Bfac1GiL|=}>kBDgxVc`=`crLZ&vyU%wIF z)m;unFCYEFK|IuDNl9CkaUpo*piN?r-~TI?sm-G9%{ueTg%&PXl)HE2X&E79e8Efv zvPQo|KoVd?7Z2R7HH_9bI!*4?KH_4M*U@x7WBK4EkZimW2K#hx9Y1}P0rmX0iGsq; zC#Oa+W7{fI^~U~Z$X@B2RS^}`PqSS?mv4lZ-&m)|C{aLD&R;#cWG#h_=&wp=e?>-Z zJGR+JIdRPWI@@4`B-H&vrg2ATgME^znfgnB=+HV?<ze4qkcD!}7#;T}gh5Ee73KPI z{;G)G(Q`>~cqmJu2V=<;A+jZVi^Hx}uVRI(WcOsSMMff_`tdTCw^Nqx*VPaImLV^N zwE@S0;J--TfvW%3nXPYQhBida|6LrHCOf=BcJYyM;&YetwGH@pp`I~9ej-*TeYNml zV;<xWKKJYqCwF(xAaNW$3;W#m?PBu_892}SIAyzLCZSC&;A1jZz10;-P3zQJ{Oct~ z&c&?K^YT)c#y=a!`aZ{v3(QgZ858z;fri$+WtSSim3S){ijZ{+lMNP(uD5eD#l+G; z4WzziDZZuX<oseYV%4ce&Bg^ZnfH<>yP17W;NudM=pr63rReUBJu_N=jQIuX((-4` z!sKbg@3ft5*!GX9NlLUJi_JtV9;Y-V;E%f|=64!nH`y{)6?MH1!?a@x69~EWkB>WB zPeX<XUzA+Md$=ZdS0opZUnrHVgk$DfJ<)%RvG+%=dlmOCH|<juZ&_`kr>Ki7_F|U( zJQ%Y{=KBG!@G_oGG5xE*92tbRRcxjfJq9}wQ91inrPpgyem%>$&z4`J*_mpt$M^^~ z8s$?vjc?S1u9P0HbyPo^JkTzix+ph1_0%<=d3{X@er07sq(Wuu|8DN)%DJ7`KMZ6i z<+J!0hu$CLpzd*f5<u2svmQI69ffb5^AX$*3vHL3MkW?c@p0U|M>WEn5}p4X&f7iR zw!982_jh9Xyi6)jpv8IpiWl`y_1C5BQqG1iv@&9Tr|aQ#u{jE>LVZ$bp#)!EAOGU` zTi(6ru5?O0(e<G9`eBBJt;K&mz?U(^H*V&k#fKR~k0<9TcYj>+Zp|bD<^Cz>Bi~D~ z_lZpC^Oi?C)TB4r{-K94T{}<5hKgmY-z5E;iZP!>ni)wB+VEuU9`&_3mmx~s*O4>q zpKm<{`UReC-X!?o-wl^DT=eSG2F3Fl)@a75d)hFBvam7B`v3g%AVG+YIKO2TXoa;V zeNZfYaOLc8QI%3VhoMQ<JoO4^EWa%myt_{2hae`PLAKzxH`BOu??Q2iD@enYu#@nx z%K{clabpG-zp|uWa6K-37R6K`$ZSP=w!*2`Lm$ahTr<pj5xv&qz_71gN!VBobq)8q zQ-IKSH%flfZ4~UJ3Jg!j&wWUx_T-2wc)C|TyJ3ffT5t3r3!@pk9&xXg@AgE2?W~0e zLAN(vF&KK~gXD4h8pFq}3I`g?Lqq%z{ke#}pTWI>eet6l8Fv_dQOQ&)bglnj8KH9j z!iV==YZ8o~u7p`|wEZaXmCe=u9gh|WM1Hi#@!lMoR?1Hlo<+~BSM+|`)o2lFk8CfH zSXk9^mgUVnk~6XAGAnL**CyEs4!HWXQ$)#rjOW;bIcV3`a8BAQK{IO|r+M_`+9zDe z&AyGv(XpS4+}ikrs<1Jbx#o{I5g=b!96UwHe^1AJOX$bn<N0}^MdHqRP9^I)A-p@6 z!sDpqGHnOU6%hLynvnPU##8XhZGPtTcrb`YxGqcL`&#$wq_!ut|8A>b{{Q7Lp+<Jd z^gu%J2PfoIGWdlPvQXp_B>4RivYbTaNn`{BC0Myhc1Z0OGBJd{02vK>5QcmLq!uql zA~V2iVnUztky{wx<J)?XU4dSnL1b<!_-z*09hjH!&Vnsu5qK^#WMvy!5#ID{2U!!I ziVO*SLRN)0jXWXq0e4=WP*M0u;B5kwC_kCt5SlcK2yk)cg*-|OKD_Ox4hkWVoxE*` zasrH<HAf+VSK@^Hd5<CqN8@rw0Rf$Iz9=|A=D2p^sYyH%0zv{B<b5LwCDhj+<r{FN zhAs#N9U#gcf+7a6wElv!2_#c1N1^Bgw7w;v=mA!INI~gFhUYvt%(^%$!m0=S!+~Y| zlR(U0Q=vik(oxI-ddfK{^uUcD=Tej}0KMBX6d8b?L@mlQfSXMt$_}8Q`XCA&EnEk; zT^KJo<b8m`1!Scco}p9#+9b$4vbw=C%gLDF<w4<$A%XH#xX`dm6n|{EY+9{D8<j8| zBW8%(7Zgg!h&(LWT>udkiVdIk!#gWiPJ9G}4MA8!HpIdog$zRenhFQ}$LPd;xq<NM zgT_a#tx)|O_7U|hoyy7gG%N-7mH|$Fti<v?J*RFy(S9he;uFVXB_0+JJTCgqm{&{? zm^)=`#q5h8-i(WiCw5xag2653A@shwg@$hnWoxzGwGyfHkGxAV#RQ?g<V~+oZnA#g zT2|gn0!s{XW*CV)m4tx6)mrK0L%otC+x}m79RoO19twqpDkhh^T6eFjD0EKUQ*63d z+m*1J3onV&tr_!X7~2)Oh;37z-FD;g3;Z5AncU<uQ>y#K$ek}bW+6LXr?||VPw$Rf zN<BZ!zxd1EaM<0B@>o{BQL&y=PCz7!xAF1c%BP!)rSqv`o{4NJaFAGm?OvSOMRw4= z$;mGt+le;Ysnb4asY3&g`)6^(qMdgk-^o}cYLz2q^Y1dUKflj9=Pq#(PggZ<_ka8c zEAuhMlXYpHIDyczWD&?;I=sSH>yT>N>eo4sII<HLC_90Uxh8d>Xq}HbF&=?6WSBJb zTS29^WX>XZ8tQIX0OkjAA?<qiP2uR$sM6Tr&DTjT)uwPQoSW1qhy{>KwH}?Nw=JA4 z@g0`#qy`dQN=2)uTJ|M2bIF_bU8a`LZ6vSUXMI!`68l?Ijgt2Gdfp;BtoBGP!^wO( zWweucA<XQfx*<z?$Oii;!5{_Cl#_x>WUt*OW~0eBNV81g0PNb>qk;?vs;GxLF-}rh zFg<~72#*ELkCK}8nO*Y0dgj<V9bGavkJ8(INDay37k=L?QVTb7)y%auFx`I2B<K@a z4WZQMJ(VqP-(R99G=#>5w~2$bGR^q$yU8ER>`8|gN16Snw!$hFXw(XW7-}gbCaJ&R z__>p=N)Yyo34l}faoan83B1`ZOxO-9&!(PvPh6%L!94jn+0Y7=CnCdA*ASb8GL-Q< zRz}PrnP+)tLV8|RVOW)#T(=<6ujntFnjxI)0X2&A`J)zZ+Yt2VgNNP2CwyH#{hOxL zV1yc_56H9Y9pIK+v5yvz?Hm6{B!oD~=b}%%ASnxB?-2$II*0W%ym9o`Q|Tkzg;2{a zx6-TK26m;!^MTzVUJpHNR;G`;y>t(>&qqIbyovnfQnq<S(nlqNgqvx${airx9YLVc z+9`<|xW0kPy1?dEcBrE2M}N981xKS*8-0vJ>e*n|aw-iC;$YZ@*rPK=mT(X5<)gua zWto*Vla>Tn89NTm)VF+`x(s3(Un{5{C>$ecMNZd)Z)&THlc3WpuUBrc9PzE{r<pk7 z6hRvgos@sCv?cft+FZ{1%&%VwF%B<`mvvY)5axQ*pj*nvX5;t)m9>V3;2tyV*SyHW zMZD(c%16;zI@(0rLiI#D8_mgH?|r#PoJv;&7do54zmLasY@-9dBaore?5X%w8X$_b z{w#H3C*I-4Rn8sC!xMuNd{uiH9KA`R^*YP{L_1hvfRxQk6@(eG`5q&e1^1<;sV>X? zKM(JVQl$>_RzU(QANE<Veid%&z|M0MCj5CadNTP4>~~g0J}eh(`U8V1^KTS>lD9=q zn6`^PfFrZj5BS=i6ggLp8^+&v48D$d>cX&>6iC8El=NspYShPU>?t&_+uvhy0Dl%7 zLbVTIxcjDezg)$aWBGxV=d*9x?hm5OC80e+tGGJV0iCpbdK7GLlcGT+BRAARs(xg8 zG<m)PefiAk_+X?~Hbwdu+p0RK7N%czNZf<bc)&Ags#8<LdQN2d(}aDxao*nH?hzU3 zd|G2T9?wf{%bX=^SgCnUUyKeUTA-44lOp|+ndD!Je36*)Gdfp+oHNI-D8b3M9qs)z zR#K{vyRFAM<09WPhK6xMKT3x#H#_;NErL{3)czXT?U<J@`k#}b6$rXb!q#X}azv*{ zyBt`8ky2oE_>3|;=xzveL0Mp=XgkUDE<By^c?1F$b>fBn@2d2e{Fe$nBvD(ZP}-9{ zwr^HJlP<kfHNzWTC+wo78-r|fqx)<w-}u@@n}2IV)7R0{cVlw9QqD?6NFzi)ZQ!wo zt!SbV;;`t(dFGr{zKN{Xq_jApG3^qY$2tUSwHz(^*tM+ljZ2lRm>=rQec&QzWjRtV zB(PB(cM{-EJeWwo%1)Nl%{Q|Mvmqwj2aj+L2<!V%l^01RRGukrt9)j}7Wy$W-^f#l zeAS3du{?5`R%IDjBEgIJczNyD*&cs801ESpkO-vElH1njH%UBN4|}m0DotizI6?+a z%`-r^W62Z;$0%atlPXiS^`foEf!0NzMW2_s{^|!ao%!%@uaZw}twbRe;F08ptW(OO zAlG#Tw{wIQuNU4^1;<9xxU-STgpxnM`0;r5W+GVhwSfUhGf@e3A>gl9vq&cX{EMEg za4QB!kkkiuYGJ3v3hc+z#|nuIGgvl9^=P#mhSu*6_BMwK9J$B)0}y#N0h?Coi|J7` z1nqzL?+l`qUMmqYD{6*K3Cp7Xx>I}Mb>Geh!gIhK&7H`V4BK;FkXG+<6~NVc+v?}W zsb$J!7e6`n$2Y{})ZI<ryP4{pn(aXbM9gkz!l8@U0U9#P`Gc`!Kab#5lAMPncs`1G zCy8)XvujjiNw`u_qZm2h&N){_+OvmvDJn)h4Kw`H!`>IUZ*D}>Gl#3TxyBK*gS~tz zb4`MJJAL!-13mM;hVc?P%dRnzAhFg&*|&0JnP!xcR3l&gyATWTeA4cRsQis@+VLIY zjMc<I5z09r`q)F8f^tSQ+Tzrj2Tpu0#P6@j85aBJ@Ut>TXMOIHeJ_D_1<Jr{QPHO0 zpEc`4j=u?z&}qd`W6|?$!==0sYX^L_G@fq{a}UIBe=T-qdxf4o@aA(NwwqHikA1a4 zxWx~dVD7MBSj|zruA1~26-R=H-VUBu2p!N8SvK0XAiIm;w%$jE&kT<I+{@tnY*E+E z7W*%0uV<Zt4Kmma)#QX*jcwRFF=IC9k&e(f!+gZA6l=R!Gyfh=m7XJAEHi#D5wYpm zz+<y^7~Xnrd$(stHg+0sp}OAuQ%S`MM<#8fbogw}YIFm&8W((X6!bgKcfe3k#VBze z&*4gD{9~P%3ay4Hj!06~*UgXMFG7A&e;QAVJxnbjR{j6bH1@o5K!!y}^Px&TSgR|v zTCweRBIw^}d_*cFK%MKJQL>|G?P#}>Q=f;)xFsng2#!%H5nqs)d`#(HCnwzQJMB^V zu>lQ8A(GCjU7MKyRban%(!3RW+|z*$rSKKB%K1%k?b4A){U)&CbO}WVJpYA5F0pE| zmzFSnrR<uZAYZLk%3a>TyHDVm%VcXw_)29VnM+yOn}P6f$B3~@B%{)BN(UO&U7pUK zw<SFV_i@tq+df+#z8!qkEGr~<7D1)zLa@QWhu~d6>GUk)R<1#jaZ4mw#(A;zvxNAU zvah}>J$;Ui?VdbD;0~nA7%*+Co+FZjps$c>tuqM4wrLhZTvk71w|{Z9!uOBr7>T-u zr(WLPf+`>D!?sR1J;STipX(S2#fdv1Kar5gB!^yA;>OWBQvLqIYARz<9e7{jwvUt- zi%+iS`c#_fULrkhQX~95<MB`0T}E!ydw2ZFeWQ_*6vUqh#<mRaVp+f>W`pIL^%n2C zeo;z<+zFRX`o7EFouQr)1HYyt`TH9w+ju;@&%3iqb4>@KXIykT<m0JMOFg~i+V4o3 zo0>Pb13j8M!ENI^^}CjAWfoOIUB4n}vc{i_>JS`JJKua)=%FPdrjVIq?Br`h;Z=j` zD@eOf?ph!}`qQ9%TffE!Yk|sFNT*uGUWa&wcKnqaR@s`5XSpeh;}NH51#e!xV?t<6 zw-OF=XF4swa_{a_&nZ7{z)pV|OCO)cAtFc~Y+r7U9^u>e)1`Wfx5UDzry4n_zvQD$ zgJ<_H69*YWdX6T0WHehhwf0uR?KiUkKRdzSJ%ZQq#3yRe4^i`8;Gds-BpqT;&_-|z z+@YA?pzAap^X_%k#!~YnnBPVhzO9KMN%L29EKkVbFul@Eo}ueqx7{lqSfAYQ_EI+k z)rRi9+3g~Q5}?*>Bx1-V{aqgr?{h!-Vz{x_@suPL9ZM@G^Yn)<EZgi09+%XVP|0W3 zeh)Xpl4_L)!W8vB9k58oGf#7aX;d~Qm#*-%GHh*kEd>9`z+3kVgq!v-Wrc|jXEj;p zpyE(F(`a1>CR?=fWeGmsoQUPk)^)vNgbVhM69er6!RyOvzdIVAo*3G|GN(aq6J~UW zc%Ba{7hl|u6}t|GZ*z>^_>`q%5>`pnrQF-Cf2Ba`xIo#Rb3|Hy1<9m9Wd}o}3QEX+ z;x@Dp8K&019x1ZU51r3%jM933Bu5ZTo<_5ni0L70^rFcHNAA+6soL3|r*lR6XM2Hh zD~?a{d(2F_YpS%XMSMe(ooLYL1K9)aMw3>?+_9~q35i&Vinxz^Fd>7<meeZ;9Osa) zUX=b*Pe(Itk5>MLP0oLRZ;HUaYLJ7IYptnQVt-z1d!CThws`*P+;II~oj_)N+ilzY zZ*Ut2g5y4AzA}TaZlKXmLgIB)S;Q}|F??+h9J%U$d3F<%yTsI8_vRp%8;BPzo_kFU z`bb?lOiex>o{)WLo1s;-oYTuu{D8nHv^QM)Jb9h(UWrVjIgC;^zuFTl<GV_$JAN7^ zRD!uQHRSg#@7BshjrXhZ&-g^#XF|mqLL)4S`c*F;l-NbT&Zflo-y+HU65+Fz_7TgP zur0Z1g&<O)Qh~pttq+yILw+f@yWnz|b0Z{YM2#M3t@Cx>XG}r3_O=4m=;u1sSW}t@ zt#{jy(-+G!^fWSWl*qYGHsj-k&xQxRhBItYf34%4PNEn8=&40}H6!(_d%f7J@t<a> zptx{gY)LZGY;1zkGRX#t1V+<w->n^8cLW`u38)V}{mcQc{0XeV$L}A1h2A7xlM^7g zo8tDuwE3tuo`8l*1*Ipv+xYTOqqE@ZY1>Yw*MZI(ho`Vweay}%pdP=aK>xYlZ&?Zy zr?3wF_;L4fr&n&q!aa`om5yi6y(oIt-!r|=m>$N<@1p^s3d|n6ZmMbw|L7K6+jR~I zbsGQf)Qkstb0$8)Y_{lr7Mo#s)K>gzokr;46Y}V%Z&Fd}97{BOr=vrEA1YRFT+e&G zh##f{#U+vE^dCOCfrD_eUH^!m(9iz+e=>g@s8Kn9zvU1*R6|twA8ng~d=yDE1O!h) zNX;4SkM`qhDhwz+3+ij&f4)5@sx9!}e~Jqg35X2L^Pye>mDGMJqFMuZq8g|rcyNNz zQ~lSnuv%#f2JlL1^@>y=D48j$DiDLQ@kYf1q6I#mQ8R(DplDPifCps^>Nf!Dibd@Q zpvZXC3n13<F$wh)h&gy=qQU|}|JBKh%SLSlf-mZIsIowBQZwo$oH8V;3soA9Hrj>C z19UzPqA~$FNX#RsxA0E-QPfjFGm=SEAVCRQG>z&BpwY~sM*W8dDW5}~{|^Wcn@5HH z(4b-S=$~K1Dd5pz48Y}q%rjz$!J9~!Fm{2$d=CN`Ie;oTLKu#m@LpUCj3b~{;=L1w z3=q_k3dNvrgEKIHi3v4-i4_6JegwuE8ikL7s$xTcfRttmw($=*ZjBNSv_=V+=Q$i> z(+4-S4-VN&;e7=Rjj4ub4CfEAQ^x~}@vW=lS#$q~22l*e6NTe{3dFMjOu7fg(*xvv z@ewZoP^&!@?;jkk?K2)H4jej4z!R5%L(j(WOaQcqpLkmTH9=N>;t9k1NPpoeRl-9y z2KCRxBVa`oZD4UMDhOXNJ{dIp1AaQdi76PL8VKk~NPL~DgrSMSiZe36(IDvtu+Wfa z2tE|ReIANm1vt)HB)%IEywfVehr;>c6yra`gF_<q_}75n@HOHCpT~jbHsK!uQLxx{ z`~+OMzt*ZO9u2~nC1F82{^C<Z-WtKU>5bw~0*IWy@XvuT7{fBY8bI*<D*ijbo91`$ z7l7U$fAQ6T8AbVrPX!cMe6E$ItP6`|mdipujuBATD-qa}z<Hveuc5QEBOtg#Air7& ziBnz>U_n<%2&CXuAR#o;1b|_UqzMcu;L1St32XtK8B7Tpq~L9fnFJOra7em~KnR!= z?=gZ}CU_giDZvU5c*D9Un5KufZBP+L0UEf{5~ha0+c5G7+kv*B0>TY|M`an||Ee*T zRS<dunlk+$%mtwS7D8P3a`|t0(Li4OAjD1WA_Nv8Sr_3Cfa~}$;r}W%s*Mtw05+<e zCA<N6l`IfG2bSEzDj^FnuZZh}6F~3OCZQ1Ei`ct_bO2ZGKZIR?wx>iyoB$pjh^QWb z=E#U5P~e{zis~k42!>532_%67L=5@6Nr(w)x23{@CQ=hc0#i!IK!gbh$;m;)50E$K zBWeO5YB8dJK!}$rjHn0~ZlvBMqB}Y`)Ky1B0^rRz6WIVNyzC_U0^p5}5xtXv;|byt ze+QQOfhchiGJFLDJpQJkg2k%;!eZ5Ikc~}3atOW{F$T0#l9&fj_e_Sk1yHC)miQB3 z7GXK!_wdR6FH4gY()orMpnLp=*c!ml(;{{O_z##7lL6kp;Y?f%$Qk8DEDPZM^d=q# zsDJe%_68h_G>JGInDpFq;u;|KdLV=lMh#nn&4`dLK9~((lo4Y>{R@e?0WxJp#9n|x zv#Xo)y~GFz*@_4VbP$U|VhYHk8x<y0tBiOYC}YahPTU5ZGgB#8G9j>e$-;xY=O%>{ z#eib=5+?z3k~2u0iwL*UcI=G>9vcF}a3lf(?SDkcAw2FdqVI=^$=TqxjXov5K!mTO z^jN-{6b1x@dLKyM@&8A(^qjbi0gk8#B3T5K6QCwZ0~n3dli<LY8FWR7gak0hg$fBF zpc{r72_xKBA>8^TKs??_|Gx-5Y*T{<za>clY)WoPA_@%9wjwzJh{)TJz}EkNc-r<P z5TNakBMBF9?oo%5WCLw&VI(3LaJ=hSl1^aDXwD!h#DZ%NetsOx^&SCXgb4{2*d|m5 zfgmTOAT-ENU)ZsnR7fKH9zJxG6hsW{m$YwZqD5d%^#%h0fe{#B=Laj~3ZekLgo^_) zqy|mH2l3K?+5oBl(t?r!&fy%OQ$Xr~=O9C%ca8_N3_uNhpf<p4-ohXd&=xBK>IKT; z_VZQhnBgHHOsM_mC*)9HX^<!2eJ83QLSTl>7m18_U^Q>^5Fs_1WMmK)b<ho57<vs5 zKCl_8k_Kh9!VZPc=>K^J86+SG7V0;%0>M5J@SioG*??f_#{WTz_8=d?neZItHDh2N z>W>WJ`3NF|n0<h~x;S(JK>()8_kEkeFnj1cgM1VQkwJ^xK#73KCHz3Uz!Wln1jPWV z{rC)u1wL@La@P370V^MjMFOdXz!b8J2T1_fMG(+E5nPCGWuS3@OSY=kX)+9Zi3-Ay zL`)1Z{{cdSrdNQ9(D7l?8lyiMOW5lpAe??dgnX=kQM3603ebnUZItSy(ke`R4AlP& zM+V`5mG*)X;gIeF7Jk4beFS!vM`F@@K!AT#r0>w-gJrzMQ|DlV5m5khy$ykxE1rpT z1CVM1bqQe%<_|KMfbOX*q-%ireA!7E0R~?=NdISC8*WlJzzPd|q(Oj77)p_v0PLG& zN&i>cH%Nh$33$9)pzj+mg}r%Em4FaHU=#W$6jot*RF||4AMU@1(H_o+F!o)ra?Ny* zT3u3dXo)rHBOpPkJ!vlBAgaEkp@7YwD#%fsU@xJXNB}Da7m}brFGEO!0TFy7NO6EA z93D$r42aJcPkIU*up<U}A_`at2q~P9_h@9~P{kBd11$J4z<Z9f?F=in%m%5}gmv`g zkOl)AxMByX3T(H9xl`&f=_}wESiUAD0lt=Jkaj;M2J=N%RJd`WAQUonxEucWL_-7V z%ppaC{E47Khs2|i0h@9T8d({foGLn*5+HLL4w*0Dr}&>QIXz*U9xSIG?ubG}WMP20 z+eyj70smH{AR7i20@*|sJ1fi--UR>G6p*z@*xB{+IT<fN5$Wx&_zjGrBJ6SfKgA#d zWLQ8?UN>i88?5fNi#?nd#4QT8V~mTE4FHeoX&Pi$0K-B}G64p-$V={I2Y^)u63HY0 z!B8P&lh5G2iydT-@HWU&FIgbG>1`j`1n`EBYnyBiIMmTj$jSl2KTgS*ff-slBNK-| zm_f<$$YtSHftV1J-~UGhVnjl&38z*~LS6|N*NlvO5Z=T=PVNMs6G%D(xi-A%gn_&P zpkKmFo(e!O*~kL{XYJ%Cp9YQ^$ZK+4K!p=!atr|PPL*5={t*7(c1{B^Wh2LiSelRn z&nkW<<edPTq&ayvpbVlTIVs?7l<&#=iQx-Q`cLapC(Ox4SRv+`6qJy)WGZ4P)o1cy zV90(Pxi6r#RRXyt7hGm&8+kn^9CAG%Cx$x;^z$Wo2_Q2sBE>AQATUuWjDYvbwsaIR z@B!C!6h?giK@eR{3ORUFmL|nG2o5>hQYZp0+vrB|zsD;PcZxuuts#Jd0Pw(}V2T>x z+zCvla0R40&Y<uD_}dgwqyukaS8`+NnPEFPBOjnzJd^?r%3Vq!0jyF-D1|Vv&`^3t zerCfqodaZu#UuqCbi9S44j>!aMu7orQE|N#w17Qp`Y8$kR(g{Z|9eR4n4>@>h1=8V z-vm7}><{9C8YE7Fk`6+b4ckF3{!rio5~H9|8Uy-R;Zqs_Hg2b&3<azx&r0b7%y)+v zW%vI?kf6+fPa1?lmXZ>Y4<ac``Ih#-Jvh982&0|?wpl%g-41}ALT>hM-2B4N`JVGZ z5KE~@AcL}$xL`F`E+y~m>swBDG2{rchmF$`pXVP)4Y|H&=mv>hV}%h^;OL<Vz&>Kd zUw3HJg*`SOB0`FSxJv$07I)0X9EZM~yDNUWZbLAa<(^Hkqj!QTy>H2?{1*gtGE_ZC zytgIAb|y3GQ)RfD6POYGcr#v|n82>8JKdzDP;TyBBnKwqfT#zW%ug~GgfHvbWR8yw zhraWa{BS*Uux}#XLdE^M&hvwx2cP=rtA`{Fnfpz)Av=2>r<uk{)`HQBsifsbhqXAe zOM2rUdEfKs);zAH`4$#+F#>P*r<Sb83mPUmHWm!s8kCEr8y7vg%PNVJGM}f#IE#N` z_OTxDt11KgNDJOFQ-F%br~KTEv_))2YA1CLBu45+(5Wc1$4%T@X#W0^9|=;Wu0~7O z*lRy9%l{$&l@^*(q`xRGg{@)Z2qBy<8V<4bX2DAQHdLuJq0&*8NBS6VnpSmYK_0%> zQSEM46(HKMFpO7h5?}^tI6`!F)Gwl&psE{v7*7W?TGHCR^0(Em^y+$gAvlrw{N~R~ zA}9aNa`W%cYD~n>GtC?1TaSFqp4PdQA<?s1+lz&JRi?XyIz@-7;zCvLkz#mSJS`x8 zTbu)`7lYzo(-!Y)h_?MIVv>R|(!|?bsMOvJ7Lv_!;SYH4f8)mA@>@N9A+i2k%BBgs zqa6F1n!|o1h5f=|ea~#}pp=`=1az`exYuP_pgUWj1o<OJNe1q&pfgyH6rq6r6K<+* zj>9$+TGbV9n>Eby>zit*3X;?HZ!y`Vv|}DuPfWM(Ha8~hfEHHbDSXvX*qN>2$nL{W z(Q{d&JDhZ+%2`<V>9>GYzn+oazM;8}zOxsY`zF#xtoKLTe?x#N?(S^&syvBLFDdhK zG5?Es|7%tnE<G^C(=3fQsqsv}H`lsWTymq%gGmW93(Lv3C26M;R!GhGF@379jPkyR z3%9)-ak0-plb;bwjdZqKm6cfOtx#(daD=42_Hc0cu|BypT9M@f?RyFPMq%jkpl-vB z3~7eZ@e4s^u;6gqvB~+?1*4CJv$4CAa7;PX#h=3%Zof$|-^(w1rsSl146*u@j4n<I zt5vel<+_Fnw=K6DXfJ4$UyL=7`hHZ;Q9rd|pt!k}Ys>d{3oBlcU0G~_gxTCfx(erK zA4+Koc1Ig3F0(o@#np^MC&yQk1Lv#)wy(_J3X`;MM(<nb$);c~Y>1e6Vi6#p9h_20 zJ?vHfv2Icar?)Ged>!Lj%_~NYCdzb4;}q`VZ}&1BDBmk76AZWy&Bw@OS@rv^Pl46A zlID;O?M9inK3QWMFrdvoNtF*ojwf}Wp0Ix5lj^H$quIG5iN>O%7D}=E{vk};c!h3) zvQ=O)HojtSIy{5do7!p0oP<1UdYQ@0NJ=-#qdS@sj5COrW~GdQkEF({veI=@CT|BB zrQ>8~Pj*om6+mvSO9^<qMA#jAzY<zuN;Vp*;ubSm<u?#6>_*4RS=^^-n7}SR`n5DE z{OdJ^_Hg2kZ4L|D{NyXj9Pwzw1hnuqY|Hk8z&{z(1jC*VzYMAUk-iEz#sm$85UQ7_ z5ZEL>2P^8FN>0nuG6!x{qn2mJQnKK@%k$LJC_4|G!Iqdss~w5!_oAvJtsBxL74Xo_ z%aj*%F--j6Yh9Z=Op2WKLzpL=@0vSnC;R@Bx!)n@TGbii#HhNGEka&E+mn>v{MFXJ zDqErbmI^hB)zR!#c*v4)(#LD0jv;H7v5gNzx!}0CI$D(TGNy#TyLn9aEF;A`8Zu7@ zdzc#7sOn3E^Qahs(rstoW^OnN8Sc0=hDk*vP7TSP2%s%#=<3PQQvuxsNB9JX=eoTH z_KL1Y=yaj~!VC%gj(TpYBsyR0*3J~vS<e>Suj`4O<M&riVqQBc>Sp=<?4%aaW;{ZD zy9%~=G3@(j_92HWbEY`w)SKH|p7dM|!X?39zE5=UJ2_3wg(~_;r}j@W#wV=1oQsjv zWPBd-bx9G4emUr*xe(>p*eoH3$x1;3mqd({ct3BwWG||zBL9a;Q;AE&ST)mrw(E#b zMURNxH|TCVN4vb)<nv3sHm{wPz8~eOO&o%8ZJYH2w^F$*uQYkFKOFEA^KCeXym#?) z#R!&TmjC{3v;zIDN1_6)kZg3N?+s~}GVxN;F9*SpNJ$iRqdBSOZmG?m)(PL-R)g^} zqO9onEpsHy{VsSVKWG2>jWF)Jz2Rb&Rc?>w#*I$XFVOL}Y3}rK%fy!ZGy%n!ZoJhI zTs~vbO7FSQvwW=C`<J?d<p-M~Ykome<w~0DBCGc6>4cz^nT*$Imu$J4)m%eyui4I* zGVAEBEi>C4lSW-I{CB%Vz`Y$$7<euF$Hff|YMF-2M*PRGwJpB=Sg9I2`Q)jdHR8p3 zfGg~C_<LBzcK2h%2|5m^+eZw_U-<Y$%HU5ulb?bj-&F^sjE$oC|2QSrdT_;>TKa2O z<{MAXHvo1^uJG+{^ZV@E-gEJO2$U>^MUPuJBsYn6Bb>pY@bFe|yW_snbRubdg+FEZ zsKA3uA1jzTg(A+Lj*cpCCU&rxJm>aB`_d~r1G^%jOVt-pC;c1TTDn;<<#=TtD?PX) zyCD+wz*_!Gy>zaGhF_i5qRfgWn?Yl$_6z9|9pnq9{p^dIe^l&e*9>gz#TD5drHKNW z*$o>XA>sjnTpQ?fyy$${thJhN+BXFh4%HOWvsOsM?LNOJY)?I_sw2XEeokZP#FIP8 z8;1N@6UBNWb<nstzIhwR1{EJ8U=1I<r^D#my+B#uRQoc5?c+Ai9sRgkrF|fhe)qQt zr1BbOX<_Tkh%|!4#SHs2MAHjQklFF6K~^ZW6n#fR0{?S4$U40VzMK&Gmo(Fj%1s(u z60~PG+^qV0Wjwz~u0~OKKQ1OvjWZZ6&j>tQ>A%w93Bixw<nZ&HMpU@$=W=!jAB&>) zum}EWzvto5%a@z!K6k~y-_t>5{#D<NU9SwH^D(tFOh#~2{IbPY7`M#EpZgoMYQf8S zpQ{k{apA3ic=V6Wn8M%5qc;9?M%|=+W1RixR&DOIHRg&8MgA7_dXd+a*#R%oO$m_} z5}!YhC@v#ZS)eWysWZ83k~KV+1!uH`bMu|W#c>Spri^{}jX>h%C&x*$td&;WHN~Hu zf0>{nW+o?z+HF9pJ{Pw8MT9lC=)?!l>wMa{X$MK3tFLO37#dpQ!%NW7-<H-E;52OD zCP`s?_HO6OvBRN7BS|;m)>>Bc9o;8=gbDU166)vw(2!lvJTr`!pS$Q%Xn}vSa;lDr z4)^GOUu+CX*Y+xq&JlX}Yf5pR&+=G=!W&ZbBAt_ky`F*yg7TLb#Y5TMzS8-ysw>9w zqS20F`h!LzXocYI59Y>q_2HRO*ya-&$p*ww8^v5=rrzm(#?TV(cejWXi7hIk%P!(d zi)b2*h*}=?@tb^J&R!ScIbiVBi5PkYsyoTEp?SS|&vA*Zkx|9QBoFNreZug0;&iFE z`==ZUnLd$a$ytu4@wIm6;qQzk3T_$`Io;l>cy_SL6YLLmab)Eys)*J4CNsp)GyJev z<6U5-AYQ|gYI--`h+5Hvmsx=06FOi#Oi16suODM!Oae`74_3B%7^ec)F$CW}?eSVC zDj#gSqt<8s2(S$NYUN5e@$f3by2n~`J%FUJ6&0$j5i!)u|2L7|%2F#g%cpbv1p~hs zQRnCueeU>gOAGMO2*t2$+?*NF`N%~Ik~;W0=Y1vkk?xaZ|KQ!FoBINJ;duMK*AEOd z@OID&qwoGkVKTbmAQwKk$)Bk~rv$y2<9?Xy;gw+02Nbbqj{WMXwq;U1A?vTc>0R#* zk!-(4RqN%Rs~-u{$46k9J!HMych(R1?u!4+jG1gJ5}c=Fi8T2qSl*-@F-sz3fVV%z zWD3_DgGnD&E0*i&)(G)eqT`V{Uv4n>XyDc}jU4*7x~vwJDKWo&!3aLC2KF5v$p22$ zeUPz!p@;udBG$054t*^@Qizi~@S=9qJins4I`+7Aatn0uCaM&JYM{8EP{aiP*n}0= z)Z#%0`CZiT{aR3xWLLIyV86B!-O+O?o<Dio!iql~KxWP1Cu3F-=tEKmG}M~y-tv^A zM*qTWo9Z*1{gSJ+KZDoiVZ|+HvMD;CX?-bCV`L*QQu(?)eMPFl1fQ#%>bX|?n{$|T z-|K5M1|Jm_eAiq;*qTHRq`lW_ZVU4$!>~8l>Z989FM8bAu}-EQgJi!AnoedF#>|cv zdZ$tzB}79l+oiq!g9Y>ks=(Vbdn6kAZ`qe{ft9gJuZg?|2MMgCD)}|XcP_0+2bH2= zh{JDLH1j1WMZZ*tYi9fC{<UZ2cDJa0m#KUoW>zok4LR%gS#NR$86Qm$S1`o~#Sez% z6a#`yL~QC+I-X`pgkC&!w+rX45tjG9+d~Dx59f2ssSYA>54d60qnqDQD}CdhJ0%VD z$J9`&d;i(^gq#5uX_W)>Q*?ov4r$+*NCc*cf<RN+z0T9LI}cMXmnVswX&}!=-A;FL zN6Tcvu&y8VwS7Viqn(3|{=;epyvz(&B@F##6j-t^T6Pt}q4s!vLd{NbyC8-XO{~^I zBF?&ZvMd^Bf^^<ksl=j)DCQNG20<<;^VDqAR-t3r=I&sE666~6Qa>cAP@=1?b_sq2 zyJ3Il5u0G2@6&mGvnmm(D(EXY^Z3qO4r1$ft3(O!v?zZ&FQI!FxfFg`I{G!XGbH*l zPRl|o{t+_795KM3lm)5wkC1h_wqw&1oZ8VD%6he}QLz6oT_x|!7Rnr}J}8@16<tx< z&rQ@6p|=2z_+^&qk8hUV*esn9!HF)%E$_e-Qf&J2mZOn&%;kjCmhe@+s~LKJ-S_-S zPYUC!MgN%#2NS;4?l36jsc?Hm@7iuYFNW}qzy;rk4!5}0e7(M3biM^ulSb7N%UkjH z4qr^5wb{(O(<96ochkyAbKH6#H^lp*X^rcf20z7vpV3NJjs*GdR502v+!goOJ=s`Y z4PBnk*=^irmW1gz_&$m=PiaV(R>|m|prqW@{G3JVNrW2Un+Wmm@az3?>`3}0*P3g0 zP$uef6vx(Vuv-T0Beoo1j4d8<^lGR%qa85K@<)(0mSGj?<E?0?MGHI>I7w<BnsW`r z83^72@0s-}2L=n&anCd%&wbN-AdytSclezY`N|-MlhNr&YD7yCe7?f-*`r0J+6kx6 zt9QJCALIQVa#m-Z5A($bceypIy3mM=E$m;%q8S;RZb<1k&y9tpn)N@utaY!PEn1N; zr48IIGwwYPo~S(9I(tbl!dbig31K*O=?-M7Wk}B+N&8o}g0SQEW3GwJGY)E$N&i3L zoP$0G1LKZa*-LI1R<8cVZFQ&ibdv#^W@qSDXAHD+u4Qs|x>KGGWz}l7ORR=TRBx4M z*+2W;zgy(e4wxnN3+a%CbZb%afYp@6dJr`Yhu)xj)(D#htwiatg+1Q*bg1%VcVOzW z8Kmt!8FIY!ll^#hs6&IGJ5<EdMPOXvlG*Yq&iXJS>+Th8?y~+hZNxF_-52mDjREHF zwTJWpjG&#={Blis$C)TM!Y@>bF$WREil4lj620hmPfUh3^p-j_lC6d=%E5g%<+m$4 zH%{W>G;znfTO*kxp4qX9R1qh_ZBV*xPZ8F*DN~s@c9B8L<`0a!{ox-Zv4aAB+pHtF zYt+Wm4!qvX?5cF-5_{GbGI#h|?*T=ZKD3I;p#^+9Aj489`^&b8NT%1|-YOLKF|oSA zBn`=`iESqOj@NNVzq%`7$*W+}`?&8)`%3r~SWMjlC4-kb94q446dUz<2*jO<$u^~n zyvjBD`2HcJ41?=xMx`;mEv`5YZSP|!tzUgQ4x_Boy9{HM1eHIo&+>;;t?8RBs*F_f zs%uxqw%=@O_bWqNvBxcwsQ42LIsPP;nVgwvIoCP62Lv`Xwo#3BD7%2^7^b%)dS%M6 z+b)Nkl`vHnD{&?p{fK@Ta*zt;a+Zg!BC5%g8-7K6?zXrr^Zh50-PU#p2gkei+h+t@ zoF5l^8Xaf${GBjaq1w6&HNk9<<tlcOH472lO-{*C>H3A?52s1ndYBFsyLZlNr8%@$ zQ$$aBJ)D!HxA@aoL)=;5P!^rYuj$t9QDYnF9OK48cHQ3^jO)jXxl`xcWb<9}cCQf4 zGQYNZO!f4Wk+!?u_Y5;<hKP-;8YNPczg;3EROKpk-yhJ{^CehI6DLsEylG(dw|y{p zspgr%{B_~+!>|dt)6%qNjc!5K8NItS{VtuVf4@}n!v*H2RSUKgFoC9~F&T5%=ry0r z>o43o50HrttTgxEItk4}N4)e7U3=B|;k%X*4{uVez(hMSukh1Uz9Z5Iy{n;!wFg<h zJAVE{HFcdgi6^VCkv2Rn;Y2}zT5X)9E2!!%U+fBNoBt!|$UsEc5s%T}Ln$cI4tb5i zdtQ}Ah2LXwcJ1$-61d}|{{`L>^IsXuJOQ%e4-Wby!=gQ5T>RPsO>dyzToupH@~4UR zG`_kzTymJVXt?!}D+~>%SID#d;20aTnKFy_sw59!CB}XY+uGZ)U8arY?A=mvr{2oy zn|S>23_8yuSEw@F4!gvV<(Qk{(j}C_4ruA;Iq9KA!ggefT?gNOWlzche^+V$re(mc z{$9H4aAaOz9X!h_gCF*Ev^^s1g4_2vU{P_q$ePE048<&RezSCrms+ika)Hr+!$oK9 z<=D5@Vvwyf9A-K8CTFiBE+$+86>LYwOh8HTJv=n9Rfnlb>wF#WuG&=KBK<v!-|R{F zO4AO%i?PO7<fH{<gJp`kX`f_zR`2&!_J_|-^C4onev<Y3lbJIK?TAQ22|WzlFI_RB z>XtwJe1mvaqb<~VaMmp)X&#HLH_%0bE~k0#FZ*UJXR$q;<|Pf!2*=U`;(K|a%dd0# ztWxLg+7M-ZN_JeExcP=V6g;}dDcVg>NU%O73H7DMlX#QkO!A<P7k4SrPv7NnO;JWu z>O61N%_>NZJ|!i=ZRUmSB|D~tI#=O*GH6r{vZznV03Oi0N-^Win{zm{4=-`0eUmNJ zCcHNtuQZm!7KYywPN9FeqANo%+6P(J@@UB)6pITQ5-Xf=IBsj#Lv)JhPP6=zE-gaR z`%+Sf8@(s;l6ZwvqAgu{0-3u-xHd7G|A6%aW9s_yVyMg#!PlQp#<Z?w!lj0@_@j0O zSJ<RqT*3N3Db(Mf7mdeB-)<Kp(cS&g|0*=0vIZ6{T=M@64icO}yf__yn-gc3<Bu0( z?Y!1}V?AV?V&ISTzAXGS8WXz6Oz&dhs`9|W<E>=kXBK#Bs8wD(`2*iLFYW92mIyCv zI`T!Sk^fYB)gGP4OhXJ)Th(B$hjL&x$pIE(#2YZ`+DAqyJb4dauHV5@tTi)t_%x9h zT$0rNdN@I@^=#BEdR~OySCMxo5^oOB%s5$A7cUgZ!UEU+iN=_nOn<t#?zI2S_<z`X z$LPqqb^SXX+qTnj(y^_M)#-Gsj%}{kw%xI9qhs5)?Kk_`<DC7T@!ucTmsxjRYtA`F zRjpdTYu(rFPRK^T{7+Kh1OoCGkp0MO{)RaWgRQ4B#XNa1ri%Tig*W`D;<DxI4>XTe zs5ciwrGb8H)$TCJ7C=*7)D&CKrHe0+oM}VJ?zv@_Dq5>x7<c2N(f=q)yTj{g<>KS@ zMW^HS{za$lb!TLw?bR~$@T2Y38XUO3c4pk@c<mjrPU#zG&GNVw`*vZ&N13BlT|w`% z{b=X*^j<o2=;dEUYNZ&9A!c#MiZm*>5kx2IUiwECQ{^XZC6HB^sx-RfxW@D%CYN4P zd|%?}3WC*ryVeC}6@suQfv*u%J;ek~X|!S~KzL#L46?4ho}Ru&hnno@=9YaKwm9hj zIDqo3azc(+zC@1T$DJvG3TOGUNC}tA%z-zk&~5+5&4)!)@j{}KppdB182MQKetfGy zf0v>cWhGM12=IP+PN$<PN~u4WiIkgA_$37YD1TJMop}0ma?vq=*ZETW4w;bqo~`7A zcg9K3^|I;`@Pxspj3E|ek9Wt^+oF*w3%>zZtx%bY;rEj#60iY}6Px6><37M`RYK`B zF&E3=V(XVP8rR<-w2Z%!zfP3Ap1&pX&E_thkX&yu0`lJAL}7zhpd0Z#^}4G;X_5(x zd8&Mi??n-PgDv5NuBKh5*v4)u1u^P}S9yg}1EZR!?Q5OiF%Ue$>w!{)%Zj-q5$Uv} z@QANAt8V}t@Ri3CL6Xu#BNe_ySZoWf^98yXv@Qks5HI&FZ!n10J1-xRk+&;~%M*U` z^nW1$a1lkG(ld=7b?#B*D@g>{?)pm&W7fq<-MT`Lb38rb1vMa*vrenn>XeSi|GeC` z(4%@z)%jXe^X84eBw{qEE>H^K$xiHNQ3<eA7jOY@bT`H#q=!Q{P>g^)KWn!z>v}{% z-p}2?wqjcArbL>6uj}{q;ydxj;4B-TP2(e=nC0b>%C%5lb6WknLbkGw`c_VBjCQG8 zk8fSfGzY1Q2>R&i-Ljl;)y4b5=<u05Bsk%8tY)%v;)BW6I^yv4WmT+~TQzW*2lb5G zwX@#c69f7xYR=|*jd6BoC62T-K}!4mc(0N1L$vFe-Sg=JzVq$9ldwls82qI*33%pz zXLLAa)Op{35qNs<MA`8Y`uW2C)cJqfjB7&r{h;;vM5$t*wDP~Om&R#L+<()&By*jA zsLdylAy2Z-!NYEpkASfL@(;j4^QZmB|0%NeiIn;NAAm!iR3`TcIY(w8<o^LrNn-~8 zQIgC3#B@Z4xDCkvC?W1>_?vukYd$&<5Z?cy)Sion*ht}sYxj?7E-BUjf0Y`S{Bb`) z+`o_<aqxdeb%Jqo{yoW!^XWF=Q?mc_5cn_BgkiWSN!|rWA^&J>g#Jh4^OaA_&A*iC zQvP=|X+8hbGU=Uy+YkEB%n6mnLghdA;Nx=-ME;As{GZSA^mJVHf0vid<7xSQmJ5CE zyYPQ0@A`v>-YA`g8}aWgTgmy)iJ1yMjU&tRC?o$?k_hV)_54)&mlaR!zbK6fqaimE z38F>*yF7M3Yh?2i`)7WdcliHHIa1-LI#m(wF~UE~>MkxHS@}eY7oTSk{4eDhztG_t zwHt6x|ABl-vQ7Ux&&Kd3T%Ui>9=Y{@MkyK<TK{KFo9+J@CGNnD`uF_$kzlL-wH*G> z<@~=VWN#!S#r`*vPm1XMpZAj|$$r6sPRfe=^jK{4;zs{l3CRPzR{3+vN}tDPe)9hx zD@F|9TK==V3OHekKc6sv9_3$w&;O?edl1(S;7pzu>%MdAva-{SyW90Ql~hp_Oc5R~ zQ;MaJ|DDU4C`~;KA7D}O{m0dArm=4BX8r&KfpB-gt=lBB^wyXBl1cm*GK_)wAChRe zF>k6|5HZtBFPpd>^TK{G?ekyUKh7N;UZt5p<4hFQ^KlVXO>^qD##)4_=*leGVC$>9 zfdI*DR^-eI8kMcJXVwmwz}TI}01!T1GI_AKY74XGas)j1#Y#FuwDM_g5;$h7Q3?ke zgBmFk&SK>+Mxfw$e9yBn?TQJKCO`?M(-50O+4ghLufOR1@u#3M!Ue913O^ZLQs%G~ zVjsFW1>^bK`BgICH52SSzebK9=>EOh0;1J|L=Yo|9A5VY|27qoPj=gVC-{Z)UbwS7 z=Qr2rHG0HC!n`DJWj$V5Q5d7OM8$)(vvst0dz(U#7l#eUl*y+HN=rb+J5-%7U78S% z<n7aNI0{)UkxHW(`t;=)CP!8Nj+Fi>@0@gvOe;COMVYrP)q_ySYnAK_4~I}i9$?_P zo*LRUbn)Um?RBU_vd<c;sxAISrTaV`x2iwLpp@e-GLJ){4_tjOWsF`_ubB1Ji64+d zDriKp)6hp-+n?q4mb}i){ee+qt<STxR8v`3F(p>YdJ8^_%Q*LRBDW^v;n2Hs0%yU% z<%HBGT|<_rp^+ja^9ViREg{^m01OOhY1_g`qd8ZTCCo+<?5lgIy=!79=;gVstEf30 z$J)`Rz@#nQKubUkBgy?G&gLSvpoCj^p!727TA7PL%l3122YiV`7dcdDdY}Z_JPdLL z=@-9o%!|c{QDPA*i>OF(dfA+giC{7fKqj8RpJED;vikPPGPEk&#%lgr0Kx|Gdiy*K zmTzmd$~mqXkUe1>&St{5d*|UTGZjiu(Z*d<yBV+$c<Z^MB{doiP<UisjeAcC?qSLX z51JiW$|#QhI$qO2XQq!?^)1JHDna)~Q?{B1{vC6HdA8agkiBs3<1bC6Xfv$868WQw zH#PVaM_)(N){sFitrr063Z#4s0A=mphK(re76p~aNZbJ1k<lkISp7C?n%IzGZ)jI< zfk)|xkR^ot+IOC6=;YmsQ@)B@7e(X;fDD>imsBXhl6g&-4b^KBRa4Bv{~8=NlC8oX zk8q2~Q}=mrv?6s1jK6}5jHgDt=M*A~&`Ql5bTlYdF&RW#qSGVX1Q3M7x?Q^GvF9MD zGZ#|0gkL!K_lZl%0@oS1#>);FS{yFk4<=LhqJGXb`E~aB1$yDyk!v3WUP?v!%znox z2#I87gZ#CVlbv43hDs^KR3dm(1KtdSmpS$5wwT+j=XVs6DKME3tv}PvY78qPra=_I zS9yR(l6%4^lURg~2dEraXc)LYq#r3@fjllwf#jb^YpK9<aGwiYB?`)~SuU#ZfBCzR zWN~iAQGpc0p$r#zLFkqZuJ=F%Ek`Y-B4uRo1<X7o_ENL>duqwYR1@;(Rnz5a-#z{+ z7wT0Pihy0DgH|tSfNH?^RWjre!S5xYYDP0G_x{^!baw5g4S@1Qd1g%tkbCyRIBpiR zZ74D^dU>^Wl<Vh=L+w$K@9bWLW|_1VR$kUjCni1r8OPR&v`@}s)PN+^XcxaC?369b zb#B^ZORKe05aEw7t87ZKvf0YP4AYq$3^jS_bFOmhj4;S>65jYxci1TD0Y_fXd^RfC z05g*wb%CHU3AF!&%|SD+^iPn@&lY_1Hb4J0K#yNu#ZUVEu6x3I<NZC2tN|_JL&7rH z_L{3zgP0MD`Wo&^v&1!=?dNu>kpp)tcN#(^gG6I5p4&P22k8I3_;5!grS$p?YyWIU z34-^3zI_=CP3;}%O#!Rl){IJGBJxV2b?r+Hxqp|d+&e18I-)wb7NLkG$;z`qso<YG zpu{S@48}+43b{{o45IF`R4RrQPeO>d&vqiJMp{4a+S-PwCSJ168*o^N1};C6AV&FC zB%O9r3lDL#Ti7hx4eG#y;n(w+_aXv23`xlEwjsN#J_=s~ih;Mbr$8Lm2POok?r+Xe z;%TcoWt6#^LYyPuV0Q0!=tJfHtfYiilAv!9>K`!h_A`CG9N1s{hW(9+ZQ%{zJEDmT z&v@nSUYiptRRj-*4)x$6_6%Bl6yTr5POLsy)>=59!M2iT_Hv2J2EzK!Bm0wWvqmjh zzq0FTl5OWJ{{^}&`iBGh5oES?SccQ632{50>y#*Clr2P_3e0_Bk-84HP|2o3YWjY4 z>V!kmhL+_~TFZ4IKngK->5iBF4NDtAn>tsLEu#~Wy9oBuqi-UC{n@^<ZnNBc{bM&I z1bXx9u&@!B$SfYqZ7-eIHrw~W*l~#Fv1nc4MoZSfGhSc^eq7f%h)aTs_wRFzq>=ZE zAhEB0Wm|*PwFBWRwRIZRxoflbSm_Qko7L(PtB~&Rbhz_^7)7_>JkB*IQyZDZFk$|C zFe;s<E7XBCKQ4YD$Cq&`8P8Rc-gTx>`f`8N_;Ba_P>v3Gw)xD}<&<Q!2PeNS<o6a4 zBovPxp&Vcm%b;cjahO2}+oENC#ilynfc&eSIZ-R#52>>Xf&E=bA#LNuwU!+EZ5ubz z?_DMtFZ8-pJL{4cDhLpba$Kz~#BzDmt73D?6V)z7EJl9%izoV#wh1n0ykhU@66-CB zdQaemr((5tUJj+6*c#lt&6FglrJ(hSGZN4O!H|F}IA4lkJOYeTAKYtdzwO>zY_W?= z&pN}ZB0H6Hs?}^qDR*q@qKD`={+2TYkl&HraupOvBWZRbKFE(WAgb?D*Zur=1$?r| z(R{SH`FU|1HNpnxckZt6Uoj0|nsZJ{)f(`iUE`)Pjwh7y8XVR78FTlpZHl}ll>?5M zK#hTQ7Uy}K{u|pI@nq}j<G*g?(K^soYskm}9=cHP*zUA#_i2YA@O9I{s_r_*TYh7s zqY+Z~NzDbGe}81m#A^w*Ln7TL$R8mDpv*$q{ggOMTV?Pu(pIb*$#Ca2_Uy~sa{XoI zIsEMq(~lp3iqps{h3$mJ^-;W}x?HeWP_O)KuE7hZr9J`e?BwSkqD*9_-f87Bl-r(1 zgq31aRIAjrqFlbn(nOM@R_#)CLm8Tcbdsa7wH^)v0~6`xXv|ik!pNXx@4>M2<l6<A zdbnW6Y{|TeOdQ}P*jc2hS_P@Boop)2@FPd;3xCzL7Iz63E2x`2w~Mg_+*iK8iFn|E zFu&}564BAC-YaFloNdx!t~_)se^H($TdbI>OD^PE#2f|gC6sJkhHX^H9;8^eyzte) zZXZD-yzz=(YL0Io2#8BL0rchR?KS!ssC`%(NNTZ|pc)S4mVB+2r6_mb&LITto4UYw zG=nZe+sq4@!BL+gJCiYF1&8X~*EDA!8hx7nHhc7IixAA^TrA(D$SSZ{>)C$RQXm5j z!NC~of}4wCp@fR!6biSY2z4<%H_FlItICe-6Pv|ud3qh>=b6b!wWc+tYCR}b5{md` zT#R$QFGpwG+Xg@GhA(Y`eA(p(u!ao%F6BEol(lc0VTUddCt*c}|CWb-i}ejCgu+2N zq;8WpZrrcWKoCyBh}yT*Z-!qLoLmw1pznGdf_yS-LkM@>oN!Gv6qjdeXIv2mej_kR zh$7F)<Z9l#sNvwD`van#&oZr5!8JCL>*%t7@SS_U>cGZLPm>S+m{Td;xdIg(yl+!w zNB8e2@7FmG^O=z283?|Bv||Jm&N1r`bdAw7vknI<lqvPI$ulbOvH7>hAp@rxGhRmC z4B7U!?U1!rIrq!xhk}c!TazJpLrDGe6&~YhyFoL@U*QSV7W_M3o;oil5Q*efBZ%Y< z#N(onodnn&D#lY|DZsscLUmZ=p}|#n=?KJ|6Myj$Kt%5EPUn|i4~PK<MNoc08BOk| zDGVnVZZ`}JkD3k49ow}8F{3~RNw;=0-^$j0*sYi=*T2_R{FS(yg}mYB5TG~wJ&yyR z=u=`fX@(1tSF<(^yje(B2uBF@nS)<qWx(5d0Ey9trW53{L4tx0;Yo`z%e{pIV)?t8 z=ke&!h)ww7r&45x2%vzHb>uD*=gr_L%!s*)vqDU1dw_JWHKTiYmB*4^JTgkD6x!FH zy$I)_JgX%%kFCISSVZYL%*ZMV7oAEk!^NSKwulAJS_}Dlu6OpZ)tBOPu9Ez+<bxnc zUjc?*Mvm*#qFU+W85ZrNMpJ)g9HHaj=Gdtc%1zzk*!{n_L#05mFee_opI7`r8&2zm zZKCD|^d?=CC^H-Z6McUsCu&gyIv6Hpl8W+ATlbZNnP}QlJl95B`Q4$)5~}MvZkR|P zd<~~+kv(?I`5c&W+@pcwMhM>e{81IDpFVO6$Y><dME&K%g9kWhnf4hDLJ)}E>R2_F zP)1&QrR!Q+h_e7QF2p-$Rz8oXQp8-+ruEdm!0LV4*iVB4UfM`^Bx0qES)0-MrB#ji zvf-+-kQ^(TfUl;YEzInkkLS7Xx`T^EJ;v&-P{Stfh?bZxrZY|S--`RSySz6HCVRkE z&`8&D)nK`ZS9QUk@?!96@1OlG_u|MYU+l-u%_s2@GDm=ziuO|1PRN@1%_wbDrh?iF zY&Qh`4bsQX#b(!y*0Z8LbpXaDX@D&~dI4lIQbRqsUbLMSRti=HR>2FeU;#n6;}1Tt z)JeK$Y?{Zgs&&nYPS~44m5=i~PdG$Dma+OJKz=Gkl6D?u_NE1${0WytqLduomFXiC zR^W*`XAl^Hk+-CzpY`bZHo`q}%eP*#++hTQaq2R7x?@o^&+Ff(UHC@u5p0pQLoZm{ zP}gLp!}hGDIoWjR(9)U=3(1ro5E(O)=qZNTT<asbyHWV=-oImv_N#z&&^6kPaaHX1 zD7{U$IDSTbhDJsc%+*~^6(x?2?#hzFWvSTnI1!L{!EJ9-5r{o1-PpPHOOg3JF*5Ft z^3P7o-aH@iR_d@P=EgeJhAWPxcSK-KMIPEkA*_}FM+@%O1Z-sJhEk)W;F(wHSB?!# z*{`5Xn5H1%j?`$KhVz-<au21XF6K=r6Wyvu0e?ps-;;&6Na{xgWw$IV(o<WNHX_p+ z?;e5Nz_XUWTeJLwxlq1HSV()#^Sh$N4;L_JnVcCCyNH!w3&N$|zisQYdxMUG)_wgL z?GA$eWDRIvKQ0)1=qu0Ve7`nWvZD4twx<%qVAP$Ux?6l=w^%#tUpeyr^vt6RPcGEI z_e7oX`fvEQ4kUgr|GSHq-Q8-tNL1{%Xk8ERJL-B`JRE2+HH+CwzU-u?ZT>xRD;pU9 zP_(qmXvtU|5V80CA@Wi5o9Rr8oU09A%eyV-VMP14yygY%No?8GT4{)zuYjmgLfo<I zu~;MRBpNg#9R*=DoUHm=SJDELl6)&N*`94$^E*WZwdtKU`W5a3@6_PRBL*Aa)Q}}$ zj4`uqec{_oaG%kcj^{)6>iHD`>PUfO=8N6ljAi@?f>2xYHE_rXD<9^#C3zs0w)hSF z;RV@Q;XM*fG+9aEkd~E3`K!p8Cc|16_I=5vBkxm;z*E-z%k&r2_T7V7Fd7SqY0R$y zR}tO^25~VO_imQ7u!~7?o3W)h{yG%EC6NQOR~SCa-Sk)A-y^rO<>yZ};|?iGST62M z_x$lhW<(1Egm$rL%|0QGq4PTDBj1@`%lc$7a4}QRAQFP+qD3`!^|fcD*`rOT6tFR^ ztdaREXnlGF7{t^H)>C`hhZ;&yns~^eu%jPh9dFKZ*njbtQUnm1JZ%Sw?7<cStA_M; z5iZpn39meY+RkT8s;-x&b74EoQOkc&dPM8My9+0H`+B(&MZ=YUU|A>j<OX1E@A96` zmZE#%?!*v2PB=MPY%2%4J-RZl^8Lb43|K9hDFfr<l>JSVkD;1HrC?I0`dji+;3+al zn6FY*l6co8_krgk)2K0n^4z=`P<lPI*{b&sd#+l;de~p)lCTwdA0ZS#K;cL_KmpGe z7`lHZxPJO}n6wlo%_Edco;+VApiChW)Y^aE!^CC9v`cSQx=>d4Z1VdscinDO-#t{2 zLfe)`RD10_zrEH`KQ4^q+Nre&j+^Md6w9rixwCo;S8X?{WE~AlL)qvEfad;{)&R{B z>X!D@?$czFh_5KFY8~EdGu?DPoT}I<eSpO|95kowa&vjQT;vz>6VftiOf^zcYG&0Q zgNf?(^jy5e8YIZ+`=wzt)Wo8~h5nP6+;Yx+q0U}Gj%UHiLX(q=WFU<A7c`T~ok@k> z!?{sTM`w-a(15a=@N6#(z)CmXWo4N0)x3g<D?+9LE-SC2IP>63nQQDHNBza^My?ya zJsQ(byHT%@$7~MpGjaoEm~p1*_*CRa<^X5zccUz4c)<azi^TrgTt!SxcMdwiM!|wL zc`w>B7`=e9z(CQBl0h8<71tYl?~Ouy9xJS`wSwfC=^X<JmYreH05n4B@^?$SD$TIv zbFFz7^xcim<f&p2&3+xRp@lnfVrno=y*kl>1OxA6$9l)zSKZGH#ZA$o&AGkhkr!w! zd#PP|+mA7#Ub>2`{wOF`vk6r%<Ymun9klV@t79tzm<wZ^o(WFrB<CnQ7Sl1$4c~Er zSsiu1#+JtOl(Rh$K*vSR+S&0aj1Bdm44XF42u1<)Zy9D@&u=SIF8hjVA;niH6r3Fi z^xMTDtKc|eEvQ0HhRS_YE`!h?zQ!4Yv-fuWZWD>26pTH=UEkGuxoFk|7d5IcK3gvY zv1YcNvm0%^#y}77pat6#QCBWyYfV>=IGyKD!_#S7CVhjV0gh~{bsZf1daNOWHf|SO z(7xsQw-<raYZ%zrQ_JDa;q{$7Ws4w;WAvO=Af3yy*Q!1iad=v9A1x#9QGwMfTM<{d zuOl$VZ)3+g_aQ`>bb_@k2VB7VyJ1mcI`C^)(mvx#zHU9=+@`;U{NNn9k=*3;8k>zX z3_UKRfqJND0NQNIUrr|vT?WQ<HLP?mwbb5qb)=1rJgXiCx|H$583%H_NleBjI6DlK zC(6>v`q>pozto{t+EZ+d9ub`e{X$GpJJ-)hNsT2AJK47y)O#H23Pp*LGHD`a=WJT= zpDI_S)W!FjixW5;?%Zfw7;9BLD#j->HOGud=X{td1yJU>rj-K>bJRdb<cw2-^_4AG zksqT<nFn?r+s(vRAHcEjG;TisW8*kpY&HAJL6@J7tVU9HY#@LGTs_xS`^K{`AyY)x z=9k~CC3t*~tJNA^$<t45DGj$w5c5-?8yRNrAzKc<EVO<fhJ+|qLwNPmIyO7(F&=|N zlnv3W1IS4Z2ok0|EVl||Mx^!xi+lXP0Bj_jFuYK2@$wbF^&h#iC14U+T71#5XP|hc z%O*f5Eq9iJk&GgWzf)ys5e|*II<LOMJ=K@Ft@PZx4qx()yJX(P`c@&uYNp?hnkl>X zSxyAmC6W0#dFEeO7h=orHgac;izC|HtPVL+04eK1@9J1jy_x$H;O0aM-@bV6*?`0O z=5U~gd`6kE*=7iMuuQ`7>-vwnA9>^ubZijiE%gowP2MSyH3TjMT{>=XHrht$P+!U( zW^Q&OzP&S6JYs#EG`Zo<<KJjlxr&3*l}YcFz2I8~FYNOFdY3hW5iCv2u=$-Nn)L>; z3<Rx0QmlgpHrl>}`%UbB$9UxwApga{qmg!w`h%}-_8yjz)UD;0IVrhZ68ZPKTuo)6 zM*+f~usn}zzhhUO<r{oz1Lf7pk~!WZ@%*CiY$J=0>1TTuj@<bxcvEAOO#JB+rQM!* zCv)?}K8UPl3^|n4TIgA(R;6=Q5oB@nKL7zC-rCKwFMBP06_j6u-=kLE9nW93MBMUa znrO<<JvihGb)EMlg{RBT9Wtvt^w9cv5<%%RV_!-}4mIvxOtUxi76w_8Q912?m>j;C z9Xub*FJ&2zaxMuq8Zc0EE|bLi;kq$ru!X&2p}es4otT}$SNk4`->K0Caq(7WGy%WR z3U(Cd{+6_21!FhRoApR{n865jSFXDSzsS$<2O&CA{WL7<Ye&FAJdzCxB$TZ*-yuGD zGWiBA*F)ZG!T}xJ0Xys0B5t?CIvT}2-ss25gAi{ZDIZ>m>2f$rcBpM&tH@S6cRRT$ zRnbWM-R7GSSTFi*%PEormNR%b?*l*(&O1w@@qwN>R0U0o$*|-bT;#=#P_i|MHORyM z0uNrO`o7hORt$Axn~L49)i$sv>vA)llaVz6eY@3`RZ=R+(A~^s|I$NPEW+h50P2nd zJtLFOiFqhq9b<)jST4Ie0WI||3x0E`l6^x>Y906&+j43=0Y0F53@KVM))I(Yekcvr zraRHw5j>T({m|Vo?=GCtB8$=w(pa8iY0xxhkW;yab{za{1%xN|z2%XB59)XUrduA3 zaOVKNr!%qLgaa|+ScDHV8-@6xEDH4C=L!l)eKz8$R(=P5xMK(TtLX*dq<sI0$xF0` zH}@mzj4~5>UK}a08~ry6-YY<B4!mE_df^q^*ZkL=*YDdR1(i;-j1NnZ4^c1bYW%)x z4o6=zTE6LNsf{e3A1uiD7>$Lh&MdeB<Q}e)`Yx-wedc4AAsYR~MC<R2a<2~{o$veC zV?2(-chEvS2sGO)U^*6?ZaLNDE!E*(m^SS2a3u%1@OCJB)#uhj!!rPJ=aB%q-Mh5T zHS6CIt9(g;0E!F}eBX5t8EpJ!J6ucIpLQ9>VmJKvDS&R2gS7?I@n;kw@4&`ze=ULt zBQye@sF^T7E5!FnBYFyzr}J>ipkIq)556)UJ;R#3nsbT1>t|zyIjA3cwAK?k4*c+X z+?ys$-nLCQ4xUR?vKD~-!xy?Q_HP0`?2ZzT4ImuQ?}Xg1OmaK|&nEny*f>pyt&T=3 z;f7oL5ei`xhah^w?VY!+22RG2feji7_JSOokKOD5ZYAEb^n3fN71>x7g8UC&;(BvC z4iMq{<_-h$!tvNz^eF{S5D&0B|C(j<!!c$r!o$+dE6ePV6;xn265ahhIJ0urUu2wG z(fOtLE`p)!%QH>u8u?ldTB8s@SK7qRtv!FA<ElsLRmelA*<VV3$(me}fmzw<pRum8 z?g(0vX}7Su5SdG8i`aOmUZr;*tn+CD+6b^1!%bkp*P}2F&_zC^Mt6Ms=hPDN(xY^Z zZ%5}1S9$gDp5_4Qa{}#KBik)U-Q~h%<DE8l9XfPcR7<j+S)qusgQh`~pTG{^?(`~o zthZ+z*EnvkR?Ru+b;C;MlIn|xHwe0KnQbP;<2iwW(^iA2Y|1viTWr@rq<K7UF}qOM z$ounQqsyJOj!frC?yH6iDU$OK=Y%(EupqAF1~|tQlvcnF%+-9H+UpzKEH)!rWF-!Q ze_SQ*Lx5)~lQp$^6@{CQwy6&~ZvNEB3-<!ww_9#B^GuT@T%?T)14E0=2RUzJGs0a} z{<XFt`K*Jn{SxYjHQv$tsY=(K5~<52BP%*ajW+9pc*sSVW=iP4CC!f-`p;}Vz4$Uu zjo;L{q<;aRbH=fQ1-)|pVYLFHiiV&n*3VGz#rFz|jKOBj<NI%tPaN#pwXK)+dIfvo zW+jb$p~H~lNB%9npbx)kU~Ja*rQBN;#R4{wXVT}<34FBY_Bfuc-xl0i9X&3VxUCyo zW@pP8Rztoy>w9kYpb>D`^gC&UapO@{TS08K%@G1`<&UKzkGLdq$`^ljkJ968p^wS& zW9^sm#t{~NS7Td$p`iRW>wXE*9(4zu0cY!&vUreEIbhJ_X!*VtIO-;}F=|l>p~!<F zPC{_8rn?DNgN^mWp;Ceh#ebb*u|c!&)oI{1zzaNO$1;8UnJeQrHu|~mAO3<VAH-3W z2E<-qY4i1*(ptUtCmpuF>g?CZ-QNi(YDsrUPgBhA?SSkRO3lN|c8#DFA<1$gKPEpY zGp;>&<h}(Bw>=kWW3E<r78aS7tkz>hN(_`#ECCC*W?AOEf;8t5Hv%W6d#w5_I(03C zZ+~DUp1;e9=8G?XYEZ`*I*E^NsZ>F<bA}KAKdblooZL^)rVe6!&!6@qwCd-_EI#?> z41r$rF>|ngTyHEwF28frYVeZtX5HC2gez@CfpwL{T(5FbCqr~N`+~??5mKofA}wnj z?A*YD42|Q}S?DDqk`2@96l3Ub*i+(nJEU#W1#4kp6^+dQ5`p)3;fa6t^~!Jtvd)76 z*|qBRvAa8P*m%QV4_oZPh%{OV0jC~bq@$_9b0^@HPj|<=0)Ezvo}8G=8>C&_P}pu5 zY@-Hww3gHJ4&>AL<YJjOeA!`6P{Nz+=+{5wKXMVTZt34iVopf*v0b3kq-?9>@KN5e zpCi>-wW%c%s?V?#wa5Q-1j1Z6-ZCBnoKWWAr~^B-U*W%YJ!Ybj)|%sKA)Zf-uSIB# zusr{5li}%01i==KsFk;t41Kl0{Q+^(HV4X=rbk1rzFl@CQff**QR_L_S32V@n6NQt z-|I(jQLm^NJm`qiHBsSeMfh@0YG|`@R%gbgvRDtTKgAqG&}HxaUF0RP$h5Et&@yn& ziNAT|gna8hs&u+`#dyuYDxB5SL&5pFLcuI+&)j1OUMCj{YH#PJW@3Fw$ZaDK)<Z#5 zuvFQhGgD-_S+r3Roy)j%*K}H&Es$ji8gHXjWm?Rc5!l;;jiVZb2kuFG;uWJ~P9W!y z45v9HLdf)$0wPAsrcKaT`rcd<K!o8QgM(_XE7aiUk5tt*Iz{ygcboUvw7c-d=Y_Be z!w2)AYhL_QDYz1P{-tSU{WF|u#Bzmjp>At#mN(l6cz83W793ZgL;q9Tm4uA6%;~L4 zDI#WF<g)z3d&EY5R;D7SH@0FQ&UJ1Lie)To2WlkL-KitZd+=1okw0|?IMTGY>8)M! z>cD3SjQMWe%65v@<Wux;o&;4L8Dv9f_o4CW{rzt2x>3qK%dV+NDduP-7cqTOVHUdT zb88)d!u}(QAF+GgjhApywSE5b_D`8WrJQ&t-Cclz<PJ9m*jNATjPp=pHG4XE22!^i zq#DX4^I%w%-O@V#uFm2M0LnM?0w#1MouOKNVBF}l&m+-<m~v`vr{C#ZTm)s0rbx&x zJ5%^uF}mh9rCHDipABoN%?C^P%m%&>@=d|z&6C^ck3r)FsumV-YGR&~P-2PLg2<rv zz?(V5HHFJ8_SB6g`TE)y-eXJvGhvZwd|wKb#pM#MgIAs3ab3C!(EY;HRex@?nmtQ| zcbWEZH~1klvT>wmBe`12S~^&UGUwXjZKV8r^6M|dEo9rmufi?%<<0G(c)RkzqxEv- zPT>aaV`oj%o=TkiZ(|l_WAJ6X%yXDhI`B>AD_O8O28TV_8&#h*#Vt&uq=*lEUoU;& zC!|+%g{hx0&S-uspf#OwKkJ>QBD$e_Kbx*}PcG?ByP#F1IYV-(v#9sxF`00%18%>j z)lx;ptbEviKIF0Rb2Pct!T&(3p1dBn?znta5M1~b{+_J!C6giZ%ND!}ar}CNL2dl9 zCEhI@Gehr^X^O5u)lLU*20VsZGeTs{N6lg-6p-rKj@$|f6jY9BkG;vDrs}smx;KX~ zP(5vbaYiUAI2OIz-pPi0!n$6_nrjSU3>UEW8Ns#Gd;J;#7Y1r9c>Ul>#N@1?X!{_1 z%vu(^1cu~uIq@nH?o2R0dbk2&(O}WuP3J?rF428xI26EDbJmY+VJ4^~bP1aQ>Q=d) zWM21vkbi&%2!yH8vdXzWo`y_oS4Zt)$V8;D*s-LdP(gG_izXQ7;*7rtB6@=2)g&LV ze|@4ld-ey~XC6Puir@SRc7l#ZJ2Sjs#KFT<jl7d>7DnRA7UvN&Ez1}<^K?_}mhL5v zimEd-teBublK4DzE-ZFMNGTB3tLQ*v|5CS;)%o55YAiBW8Ia$8lcxm*w>k{6-TJ(X z4Fhi@5))Xmy-aoP;ie|{AXf+aC&KX;zB5)Tu_KWwhP|A^1_w{2X`mmn<eh;ol93NI zk0@Nut<U>wmG2D|zAVoAG)wDZQ=%<u-}*+i8v9at#D^UHgg?52;BDihta}wi)^w<h z?@P7;l}y{pgcn_Dn~t-md;?bwS1S)<_U^Bq=wjMz9E1hDLmxl?b}}bnWNx`3E-5!+ zp-K$4-0;n&oW~y*fPm38&q%9x;x<Y*<wzcrUH8@mshslI+xc)SR|xvC&MFLHsAEpr z3)F6*9yNL@hMBBz;laN7JUgXf)5M$!>Lr~4HJ4DC<)K^Qnh8brWH^eo;ORM#U$^*i z8^`mmuE?CUW*?`R(HDS;)<0TvsgSf7*fu1a)R5btMCz*z`I1=J>m3-0)=Z5WnO3@> z;);hXO>a(hY2$>Ad?5-E_->c%j(Njd3W>NLO%H5txrk)_aW7NLW~I_1ijQPBorQ-$ z)bDnQ@-sg_8L`=>v$ve!L4%z+XI;}Su*}evyk3zJFIhiS-72~LCC}SMedt@1*CRyN zRZ@HDnD;A6$|-H77xoZYE9Z`yhb?eCX2zB4<a^=_t9N$uHr<V385>)suwELju0J&f z=143W+PuGwf(PSAjQ0<Npdic#7u^m4+)y;4>MS?DJ@f1&1L*1Kd~hx+j#@(M(P|Qu zG~HX*!c6y!gL_grJ~uv{wI`x$Y(&?G@^w8;ZqS3T)S`X2`=dfLcccl)qPzobn0c+a zVe&6t0*c#?U@@HFz^)whtH2fNhpf5ayMMyUJui)Ulgi$clTO%C2<eVr7_l1A%J#+m zkTKR4mjhi$K|s(J{W9noCp-@GjO-EyY-+EM)qWZirzpsFh9H{E?T>q@JV?LiZCrV6 z01WC|$g7O3=O9TfUMl#X&7VI+^0>l-(5P|G+YMcsctkmvI>$zl`R6f3`6nJ?SooZ2 zX}JL$*}Ci+f^!85{k3J>Yfm8nu}e>_mDRa*&;ea-*3oZ=^9jf8t)m8t6(0+H(j|b# zXm+8$wOXJqIbjw`*+yfPb7MDrOr=0m4YNn_n&sBhDCuzD@CB5&cI&9f5)2uRrnh;O zOk$N*h@P$LNc-Ffdt*{!3F9s0RVD(?OLd~bB&AOq;`_N3KjCRvh8I6@$z*8oG7=MC z^$LC3EfJASzELdla*SbxTtR_RzmQI95PG7xzoa0S%M$l9-MuQ!WPZR3^pu!|@C}B@ z!P&^G3fhJgou^Ai=}l=>1#389v=#G>i`zvm%(TqLu~C<V#qIu*{UUH5>u!u5oCSmA zM`qm%le4oPpu4Z(ChP*(H`MI+xv|lmPhHAwl`?EzY_|w^zPs?Z9r<xyiEtax-}1Z6 zOoFre_anN7+<&$Hqy9@L^0kYauw|d)>$Mf!k7HoM?LcwogKh0jXVah7=E78sR=S?n zx^xq#by*xA?t8jAcH_nVwA4Ajlk<=A9_`n8#{D2ZrCV(yBaSM-eO-;rJ;zyn{o<C- zc(ETIt0cy92M<xVI{#G}0r<_&@WG$-gub{tL4y)WI8I!pcu}7AXFIIBwb~#b(qqiB z&j86~&aRY7lpj?my=#kM!=`sp9HSnW7)XL(GFD#A-1sgAdmNmp=7GNA)D&&~v~9i3 zVO-wZWSnKSRrV8LaPT&FL~4dQcTlT()?XtN&^_JV&y0+2V;~33BMOcJ+8pRoc-0O0 zC-fvUYdQUt*1(<BPPPdcS7=5j@U!(z+`V~jn@GOmi}NciR83k>TYC*xMk(Wbw)}|d zBk;B?{i^NC{kWyHpG5B<hlK%aW7rurUzL*2Uv`j1E6fPo+%-si<kDMCf^#GUIbX|~ zs7@n0^eGgvu$~>zqCCXg8Vw`73MIdfT=UD5g?7p)W|M>SB+xbG8J4V@d!m$jfX{Rd z4LT>RuiG9)o`=964j_b+_JtXh4BlRyeYDOwNT@t@;u(?7tS-N+N5|x@6Ec*5IQTj` zsmyiy{M7^!ZaO;S9O@7_IQ_juy(aU)WDE2<gP;p(u?iF`8yv24=7aV$+<wm(Lb0*t zAFJhisRRoilRfN^QBTct4|3r+?q!EV;$ezQW!I@H_I&*Y>H<f3U2$Yq$=SI|eGB%q z0*9tdrzM!5LwP``XBqaHLzhv8*^ckwW{Nk!ls^hsu`F0}EN<)sV;OF%scr(aseaV? z8$6fa=HS(&7Za9A@}MM#k6b2){6el3u=VG;2bu=DnS?#D{5$*KIFQ(2l34ysPZD6r ztaACXiESBR4M-#gV5strTbbah;@KQQ<^}^n??~k{8e5EMd^jw$1^A(N=9fV_>L06| zDL4RqxkcgHRu$G{uLZ_hHya^Cg5U>|!+_z(uTxsc*<f3gcn}sN)ulW7{VxyWHUx|0 z_8BT-LG9D@OoT)SUj<?WpwnWgHS;H`)(ZR_1V|{G1kxTwRk9@$$gygniiP9$zoYK- z8oYr=mhS!m;IJQzIJn-{ntQr@%R-`e4cGub#1OB{94l(Attvrdw?;}WXm}xk81v3% zRaX{)4QLe9HoYzdyjMI9CC*8ba+4YAjnn5RP`|Q3RY5p+C;KlP=z)p?H3!vhMy-!7 z^x&d7Fe{>Nt;HA#Ot)nVG5MwhDB%df;naeXrdF~iU0I^LZ#c1@pd4iGVj}SMQcZyU z-!2Jf;!#a~&DK9{!dTzB`b>!i76uJ486h7-Ugx+ukv7VB5HW*vC87yj2je~S#9btv zMM|EgexS+`Ys?Kkcir-E;BQ0>pm~^$G!0#B@Q67{Jo186(26-IEPtb_7X>s~bad$A z409LPb!z40j9}dSNM_|Vo|c6lc|AXa)Q)DX<i|jx2pc>&%53TFP}6qQLk1~s+OOHA zqCOwgu02MCf2-ppV&v<8;nua+3KD<vrwLHAl5M;g`HgH%74Z#9_}FRJOM@5xxP^66 z-W?aI_aRW0SDJIM0PT7^ga;q2B!fsQm2{suuQ#kI%PL*#QlU4jRHJ(+%R&V>L)v@T zaV679R>oGKqeE94A37*g9?51bcF!a7C397?tl|}fvi)f+<NYYl@;-?~fam~e2Muh? zw`-4aVi7pyO@JYKIh;p0o`$7t5V^eh2I2XW2WL^fZQLwRj3(tNulr3?)|s(${zX)& zI}E`n-ob!oioyFfku67vmYxsX2|V7xFGOi?1~rg_>5|HEW>oVD>GK-M_mRv_k#UG` zzprLGd$K|If8ncCKZ6wedJ6Tt0~4zHrNf#;pCyOu2iqn#{-Ei)XHzy0FSqVO@3-7l zVlDDZr6QRgT0GEa_qBV3_vumL(#TDQNZaGD1=H{nXpz`_RmW1NWm*Bid1*F62AaK< z(+)01FZ4Uu{oRjX;j(eZtf0#xk#UD>$q$)6s!VlRj<N9<ODn`3>UHtUYAt2DTdFsA zfeWRclq%F!A3G+t$qY{+Dkh3v!GX}k{ed#c{`2#0tSL<bt`LR4NV_yhJHKBw%kT0b z>X5ij^b8NwcAA@q{CJH4>^-N~A6SkW>k?Mdrqlh4$d>?9-=f$A|JG|$ZOn#JdOFX9 zqWZ-$LAsf@49ST6Aw!HInbb6$GUm?JkBt$o#YX9#$}dvv_1tGWH#tlX+;CSC3y2VB z6&2cWy#Ylh!|ImJ)dJp868GBrZx_4r4>e%YpzV761+V((7z<HAZ(FIos=(Semt40^ zuiBq*ebHhbtiXrs>m_67b>X1Vgap~*N#6srG?)F75#;zzqwihM%bk~yU^YuYEQ-S> zVhJUP?2pT;MMjEE>rHv62`LNMgV1~fb68e!a|pMkyqE#AgXxS|JOy_yluWV^cn+pl z%uA2LPKtL3vX}?JTcHIa%&%%A=I=KL+yEM{wlfuNP6`zlJ=LGFz#2-QSKx~*Yu(cg z$|^{Wfs;P!X0}iO{S|w&Sa}<%Q?zHMcXs&r_g^|qtIpGdajt(mt6E>5IDcW)9hXE5 z5m>qR_M5t3Ss9n@9)d<MQ?@jgP;&Bsjs8V|i2JCCswZjyHmqcp%Ns%k^3P%NMngR4 z)U(-!KBJniy5v^)lEgh5`6hV`{KzV6-elexTl|erS9dq!r^-jj5J0|>7DIJ(kX;7r z%1zfu5<WlHVBMLxU;E2=iE<M^+p)exyjqoGPlesr6l<2&^aM-SH${jw6bes7X*`}r zOl`+#iz^BPZNE@2bv~WNm4Ndb=C)>ol=_v#UY(>*hCH^4Lu4*!0&ZH)c(jeRum<-z z&6A?-%ZuDH(IfraUc2^ORn%&jO>BYcD7Pq_kfT!lOghFlY>T|jSeKq-xaHevx+v5> zX_R-yTR+&?+GXjLv$=CHt8Nc_Lr5EE+Ni*RDtAg?g0*b^<rVhHv(@LL;Y+*UM%@K3 ztD^CM3u3^ZvlPg>2du>9U+(YYzN>9>PSV(#&RVoY9MJb*54L^<Z;95EUc;F$=BK?J z`{{z4Ueb<eaWol9bT5%@Q}9~G-ex9+gG&$QAWuQ9l*}7Z?F6pJWdmcz(I)u$Ys#{A zU0lO}k5hQ`QL<Is(VzHnz3swIxhSCPy@mNBqs<xNPe=W_l9|5grD5n!O>cq>Bm~@+ zUr)rww=D`Z>hou4elKFRtLup4gwbrNOf$Xt)Se7<o9yD~aO=EC_r{#<i}dP!CaRz> zhl9ttv&N^DX~V8JZC&nk>?2@9X_MZje=IcsU(8HFovX_~w8f8QcBGz=tg^lf2_QP< z`$RTsV@Hj~L{y$%piIp}7!n$TRDKW;o?RQ_O{$&PIOH9Y>U?3#k$$wbxlGl3?MAf4 zWwd<IOlex~kh>B)FmmTM>$BXb+0)Bm6Zs}`>$~VezyN0lMduh1FSrfmh$r%KwZ4T0 zG%AXWbK_?pF&!i_&ib0Fuio#T-YUplraBsb6*q>>r9Qv%UXfpA7)jf6r-#sh=EzGw z4h}2u7mTrs*k64}0|^_qs+C9C8^GDYE*&%T&^}rHh%Q{==%1t=J1ecOmO~LIe8hv) z{*H@i*<0#Bx2T6-X%jwI$0==XgZ?fAjC<_`O#H$ZHRiWByO@pq^0#Irr3746UTj2e zeBNZX$3KYU7}<XqGDzo`A1E$01$g^z%QGe_L9BJRpP6ow+HjyC9;h7A%YOAN8Q26& z5zcS+!UxDaUP^2trM}wj&k$19jvQgqqMKEu7PqDQ&hm?Mc@6~UrVwP3P}0}}`=^S} zpuo3yo%^jD3?H&zGOQ+K&2pr*Q%vZ(A>Li7YO!S2yIQv3M7)?nn_+n9qF$)sodw%F z#O^1<vk_WPmQ+TNrTuqOHvZM4ORQ<`AmkZRgIHP#w+^!XLqzeHuHnlUEf;tomX*-e zX%XM=dVh1Bo)k}8Iz$v}q+J&P#TLvD+=0haj#CJ*C;}E|jJ>y4cojZHHqZlbqQt`R zY(*_~Cli>_SnEFLn)6dp3GQ&7PjUiQO@aa*eOX`D1+s+;%gdvg_f9mD^{%Rsp*~%| zf}rP%<oPS5@D2+4zTAx@(D<)<R9;Az_t1St)VN<~{i{$ProBw9xma+4M88TM^s=d9 z_v8minXCr)k7sivFB`qi+uI#b`dQq>3dM6H=?m`u5_A~*MDrr<(RNAqSB9q-rE(ZM z!2|^OTmkjujn{{}?$Y}jp3mQ*HCroQl7^jZ_2qSn+#vE4Xfy;aGu7qfUB|JK9JTk0 z#`5+u%aKMG|IV|@-!^4H9E)&hleEH%486Fx)mPmkMB>pzcZIce!yUu6q-33?EN)SU zfg9?j4ucURUU2r=p0|id*rhB@>TkSUeenwQU(#&YAJZCLx(^&5EXZJ?uwVZaTL<C! zq4dfe%n%bqIx}eh=H4l1P_;7c-1L8Gx|3<&pJ%-N&}V&RzZh%<s5+k;1Ty=iO4cd1 zQO&v-#u6i85@Uk`wXDdSvI+dq-1?3Q(VfQf>|-7$f}Rfmfr$B_hS<5V1M1va5#3=p z<NN}}QqnxUqg4nB_{xao^U@RC`JT&>;^jOhw5SWcGxqV;FsHn=fUT&ViaY1GdQGO; z1w7jcS++d`7Ty&A&e;?EX)+A)^^e!j3=kq3jn1)V8Hp}vhjc46eN9POdRT?k@-5?& zxf<3<z2<Jg<Y$;y9_PmaD^0^{-5fSpxj4l$84C;-{qdPe3cWqXT2~3sUfDKoWTFgj zf$WdEXSYf=++ng<COcH4LCQwH)aojB!s+x0_Zq{>7`$uXCWq1S6y$AK1Na%Y@%h2p zjLVuM&}do--bG|?kuGB@RO#-J$!#FZMd?$<qnogrF0bZCR2GQoG%Cx)Q%IGUd5BBi zD1US0ID{DCQqh#DFJ#;I;bCQMz0AAf)Rq8#9wrSM-}`2;`p|T>ViS;RFO&IoR<KUf z{qf}aVdn)Tkq1g2jKTvM)!tdfQR2l15W(ufP)Oz5pEt^WG#0g?TEhKsY`S2ii#Kw9 zZNL?^*Qvz3sy{j=Iy|whjRAKwJhOYyPWIJ57)H(!Yvseg@*|Rgbi@*A=X>(yjEc%k zCaShf0ZQ+n%n*0^)Ur#?eTgR_yNET<_r&1NX_Nq4EjKZxwj0?#FaJ^OyIxWcUQ(I! zpI{tP+h~xWu=HXaE9w!_<q)#|dSY>$2}QapUao{3UuB51rWh-s)u80^HeYNT445p3 zt;|Yp^pxa1$w_{fRUnE;9=TUOW>*VA-v&Ls*GNtrN5jjBkK~QU`wDLI5_7%<bcE-r zk4*xYu+TVEB5vTEbZf8eQkSrAZm~yPM9sI!OuI!qSzGtNIfbWNe&TJDtH+*t(s3<j zRZsC*N3HH)$wU)TzPyxqycQrswkFVpusY`RW*iKhrd(~7Jhyv`9JcY?39)(`I!h1^ zA~Oa)F+M(s2yJlt`?cVzvJ_q_jw)9XQf>j~(-nIZsV)u6*fyyww%skJj1@RAk?*=L zUM~K8Ns$gRy+1cKrZBqh{2_J-mW?xtYNmxyebOp#M}mh}dyC%4`-zasL70nbX9)Ua zL2evpGNP3Cw?W308h+sa9>HW4un|PBSr82J{dA<K4*gMXwVE1ju-LWSWgCCb1|bJb z;FpwI<}ApYz1QmVlz6>b!3v<SAzmJQufpU>r+la5x3cjKA#;jbC~a_WYBErIIlarK zjxq3g7O@>+R*@MKW`WKRz}%8pSoXwj@5#~%pOY@WVb-aBn$xJDux{f=SVMa<caDYj zi!J{uC7>NH$1ClFErr^DLCKa}kqCf<@`t9w^4d3~t8|r7PB8nQ#gC<Gb(#$coPPXb zz1jNl+z3;u<jdYFc7Ev6sWQqO<XQpZ`I9c2l9Ax@5NdusQUXrPPiI$E`n{$T{2b2} zl9O7Xi<Imam<4Wi36Y0QRc-FK!u)yOOz9&FK|y3sd4GXbo)2toWTs-`)jxpM?WSQG zc;n(61VaK2QZOw?!!xg~6vSxZG}?mDyC3tbu18zi?b&c0E}q-Wl>IKUsPaa=lJZ!p z9MYVYjGzaCSMjr*4QqoJFN=T2@*$F+zetBw?}L&F#ykViJ<y)b#xu{ex_0tsdki!; zJ{ht~uhc;iH0{VSqHcliQUaiVHja-%EHrED;V4k4K$NgQ*krODfgqGq_m%T}@mhS* ztmiQj?ZN%nV)|(Nyl}>+a(%dl52x$l0#Pn@vel5dPt9$G`3Xj-HPmx}Rz0Tg29|eO zT0Yc!I)_ipB6@CPpnf;AhUrofz>!nIE%NKU_Y@vMOOX^LeNN+kBpukf=#qaxM3g2O z_QpAtLtG@&*P{`M{g%iy8+}?+T(&liW<N&2vAVfgYW(5bp{i*xAz<kf(*DxB#HqZ0 zN^`?*1gU8tuRUHu^_bo*-E1=FC=xwem=b8K>bk(2T4UWUtT5Q<vQ3)PWWR3eLu;~* zrkrP<@~wwmMarDU6$f~*kPtwu)NVoS_-ng{`II&@^!t!pS=J`BMGjZaQagR%R3RWp z<WwuVC>iBX<fiR~_;@8$x{luw)vcK!jlk=D?+-zoftkMqSc`n~Da_>6xq)5igC6r^ z1wLng<Ho}q;Z`bUyiDI-BeV$<M_y?1c^|AoO2IgSaMQ4FDrkWu%BpAYKjXPNPrpj_ zQAz}%N)z4xE|m$3dx^^1-q_LU$$!;*+;RdO1D~|3xT4Ku<hzO-f|q=k=V$Fks|`V- z=e}-d&2LX-%<wjrz#2PGRnwnheJ6%*gtKfiNLMNBGkJRX^r5|E5*a17z0t6HEjK@G zXmgri7L8~mtBnKAIvHy<NqxCaZo(=^u6o!;t=xOHdo#^VIhRp1iuF-sV@XthN%kpy zxe=Pz{=c@a1TLqi`?sgkzIWR<R9fs>R7kY1wsuQMX`!?~EfiXmXevSrQKWu^LJBEs zi4vlcl%-9`68`7jJ9<6!zn{1Ce$V%uIdkUBnYs5qzh_?SH)Ns<MhT_fSIqrlDkDra zCDvV6*ZDcOz)dC1w!@>MfBVv$T*F9B^Rw>pk_ripFU7A7MsOM~=$0#QuhTZUHkVZc zmbs^npLN#FKBqC<{F$-z{8)ATHc>l~PMc@PhEBt40@+zLo))753kVg<hN`Itw<aXm z9aAkCDGB}Y`?Hl)o#gUaU$v*Z74KMNA2zLU^!C0SOSM<~4KjI50^^=8aA+6mytlEq z<H?wdhgqc8v}U_UK8b!K9|FYsEix`XIB0u+C1G~!P_Rv*E%zGzQhUblX`SclpB~+l zKhK$Cp^Qtt+}5s(8}#-aS|Z)~#%gAfL10J9*A?qxSwiNuZS5VE{B+ZnPp*sglY?N@ z;kwmt>i4|8FZ6JW+R~sM4MrJH<m7btKMEKP4A?hK({sD|+`mJ>cZHwrRLl6}*LwPH zlE|xSb;GSI{I`_@9E8+Lb8lT@Yz^Qa$`ia*Z=l%tI&6Q5TG`Obj>;5$*T!(k#XUQc zx9~04y?NH)jd)Gss^N_NlArbp-rD*~v1~N@R0Y?nkETwg$y#euR>fBYr+snnDwFTq zv}o3$XZHHjLJB{0%O0s&H1osH6@`tiQLVG}+NU;O6xI3N@3d2`ujWl;aOce1-x#br z&I+AmmoNDdcrJPgqvZYQHa)iBjT^F`olTun(PE#=awqFZQa~SS_LWW6khthz=+wid z-e7y<%jJ>LrR~md+ghbI#eX_onEvZ~!twce&(uFXc@d*|JNH^63!7|JeM;C+{L1eg zN1K|QV%XbX%{kwucIR=~B`?lL{o5pm+J_l^@AnNp;#tkQnQfbU#J=hP=c9`b_fF^B z^Nh9EA-(5)L(0^MGzITEBE{+8>VwbX?fZERyrN}OenlOALj=wJ-k9)a*5dz!vg|`2 zYoCz_KJroiMS<+BN>L9vw*Ag0Z}!S%q!35qjF)d2>VF<3&N<EW%AnfWHGWt1J&xC@ zIv5^c_+>3AwOEhR<#+77!>b_iIfIAidGC^M|9#c5>NDeyZ77L5fO>r0<@WCGHCVs3 zK6mblwauJeMo#kD2gf{36qM@DI}LCbXz7~RobSJwvB7cfEuvq-S}fo6<`<b&y;-xb zJPEwAR;X|8;BPbE5`W|5*eP%A7nO59B2GjlhxGC>OfA-Ks~UZi@bdV{skvu{y?7ah z{3g|3kN=MUd{T)q=F>X6>TdF^19A7(_-|av-gjGg>kn5;Br4&2x?r2Fw%KNG4>N|* z(4Ta}rya^(U7O>7+MPbVxxHi|huX?CO?R$d`1+*zBg4D89lne29K6HNs-&>#r;myH z-RoD}qU>zU8CoCz6YVZ_IF~y2{8C-T=H90NiqFWg2!ubeH~myGbu_W+q#~RNJfix3 zB(w1G7KZ!{^*IS~dygDlR`~e)yoaG(7n^i9EM0CmHtoC8!!TDjx9pDos6MaD72Z6; zgP(odd6L&X*tSD#METfe6~E`4y7^K&@~U5Y`inm_ZX5Jh4q%wyGaT5UvRbzNtc!oL z7)ypZ$1?4FPrbbsYk#<YDG%7unw$)uc`jHm-0SnH+Q#W<h2rdxsKHAg_i(&C{<+uY z@`02DIRklb=k_db%^N*)1A}hx^ITuKBRX$8<5#i2{}(j}&NZ)hY*y6hIoIFrGQ;H6 zmu~66@c4J%ePl#lN+~g7!>_*j@~0(4&8>LWy^!D0NmtD^7cAuz7D~7Ax{+@l{;un( z$0_}eN}s@oRTbN=IcLc9FIUNE*we5_&a(CU&B3VXl3@Fv&20&qf?G{wEw;#yH9V0% zQ@7%lpUfknio)333*4(R&Yds2uXE_!Y9-|(vn$U_w(c-VE&b7~aHCI~;UoWWarbwn z$MdXHQ@QS2xV07SPw30P|8tWAq4sS0{Vo11>yq6Z^Ys_kD(O1=D$H|!KFIo<C8{OF zX-MDpzcp3*i@xQ$yF7aE^YV(+-C`G3jj1-gdf4!d#k1;>#3S|-9F8%OQ6G7-OTE8Z zt?P2+A2eOCW^AY;y4!Q5w8_WHJ_d)g(=CPj?WQC1s!#5$xO`FAt7D+Evr_liyOIY6 zN;kL%UX*35EC_m7QFY{y@_~z7<yY#8&Nc{MR@D^mEZ98F<EzM#@=o3eM&54@-+f)d z=}4(J=&ow&z(eg1SMG}uCmc3-*-6P2Hm;U*2;H%={lSq3yUKT`Se#Mvci&@Eu$po5 zPEPZ4eltx0H&(glQq>;a@a_D&)9d*k@LO;muGc%>*&KYN{e`58nToa5fiqsbWnKzL z-gvQ$rZ(=cH2tP{^OQ>U-iFwyrMGx*D6Xsh+_=Z1J7K+_GVxOGo}a~=DUI>v!3~z_ z0x@U(T~`#fFN<8-TmG^jqvX<#r05eDZY)3y9)e(0RJX@|cXjxFv@FZCH+)c%%k9=y zfg^jIr>lO{&Q&wFxc$|7_sbMf(Jytw9PUqlm+H*iwOV-4EazC-QRlfj*S1)#m48Oq zyQ%Fik560h<>1^bj{G{oE}z$)W~(!n-+Z+H)|<3=KJUUZ*U>MRw#x)BeZL*~7stf! zFx@8g*wECQQRwdYs!!E=cI9W+t=$1R?_4CJ!@W3l3{;O<TRdw%BBz+Wf~$8pGe50e zdF!?7={JS-)M5-ils#)W&*{c7HU%AZ%U$1U(G+%lm8XJzN=D-n)9*EIFSWjE*Y7yh zUtIg$GuJL^x1!~<)Ejr*8xGBDQDd#OGh8I~k%e28amT)vq1jg|R2%wuhRH^*-U~PO z6`YS#+<fPuWY2}WlE0f-(*rM?ZkZ92sNWdKI_vAxU*#|Jt-beahpZCZmd3Wr`1^$q zqbK)yWE~q>e{6PqG5fS~-u5!<;!18~{r-#PT`vWd_s_W&A(3zAxn*_jl{;GTeXj+K z;MDNNHvDE<t1Grg)-(9E4a}s|Lz`GTYUh{U+ZlX)(JrsS-cA`e;imA~G^?6-ma!|@ zEV|4%O`IJsq;QM;5`X@@e#!=gq2YNSZxA^jYj#Q8miaZ^#@%V_BHOs=S6W&dvVOUH z9%)P2`}0ukvb)vn>$gAIAj9V;o|?LFpJizN{e#<+!hcmdjZR$^Ub~est4Qpiwg17K zyuSLw<?NhBOY-C*-tDM8ntG*oPp><Vc7JBpnzs@UH@y>YbcxTM+Pb`PahXef3ZH9f zO!nfi$Pb}y2U;J5v+%aq@BBDLR8!2YYX04~bz3;1Y7bZ^9ne~8v_c@?^Qog!mUBky z&sUc|iO8q5Cys>^=bA=8Wee6YMo;V9UE#dfT%ap>fuXj+uyB9awXD(*@qOiqZ`qy> zJiI7fvS#+euMxL@h?akL=WY7jo?&RQ@}|6b(clX%$2Aw{uMkRD5^TL?nPABs5s&;A zVbyaozgB))q_Od6(yjN&BbV7vu&$a>xjC%oe2)2GZj^11)uaEs8}<jqTc`fC`o>7s zDIJ-;cX(=!+|4-41IyR#Tda4c*jRLU=BY1U^``=rxLwnhYaLi`SGKroR5DBO{{F<u zP1k2jBndq-YHoX5!*60xuE^HoHC3a^oiB2e?+T|mVs#%reXk4`{#3DisOs55b|rzO z%Cb9yUmI}R33R`S@;I}^ws=p=Ym=DoR_qTMxmJfy9RJ4tsZ#9K>|MTw2hHbHAC_9n zp&yiL!r7NzxYK{1d_FukyQKTvujSp(+Y-L^bFK7lY;SwlUs>=(jipmsv7@JKYwZE2 zpVm<ZtNrdAecGg5`>;IO@5wWt*L+ugFM40IT-^1hZPCj$z51>T`-o?q+);z)p3Shk z?6YXkW1Z60&3Us>f2<{I^P8X(qm`Zo(L^DK^{{XE`RG>l4XJL$S5^!p|MWW+QuN~6 z6bDqxPslQgm!w?Jy|~8uM1=k0cQFzIcF}8>cyHYJp0}=CjWH0FQmMP^(vT<Tmqq2H z@rh5?#)r0iiA<?ox##fF0haT3M3UH7O{qThNP750!Er&cMG8^(zWQDZX$v15D4W4i zpPFN_rvF#@sx|YL2B#eDHPSg-enEEdtWq26xp%E^OrJPKF>by+d*qo=+36hdfgb0^ z+$RR7t-}M<qO^%=t(JVbRt+O1ALd>;WBK190j*EE0{i`*-7AaSExxT}%84m=OKn_# z%$_;#rO(Jfa7$QDq?egbL+4r^pQiyT=RT$$xHPIg!+Fl8Z;B&Vp1a(;)n{1zvH9Ve z*h>exZEwMSoH^&+=~;~P(UAu3ukQy2uNT|vK3cnYWB(nw0l`@!Zns?e?~jOQnp~e# zpgbq4UL<J#HbVt#mE0@&L5U*ryLO)?(t1@|nhTHXM_b<)H*R?C;4$_fnI(0hS3nwX z(}&GgY_1o4xjB~{_0}vY=v>xWIm5ed@O^t(%1qYkkzO|L9+s`|RkRsD20lwU_9r)g z^W0t<apBGxrR>AU+;vie%)Phuo$&Y_jYQYYkxDz!gBCYGmq~0s=_lV7&!)V4-a3H= zLsqg?M|1T{F6H+Knw<an-RPLEWQbhhUN4W1@TGqL>8b@B)LdbH>#6ga+<CWRJh<OB z_vhRyD_XGr+M0y^MX!R7%|6t^cv-YDRNt^k&ZFq`oNwLUS!evO-{jAzw0g9=cDL_| zj<;7|hj-n#Ei*p-<iFGJiyvAJx}BRQd-Ip<9_tzXFIg(`e;i$F=$i0Jv4wNc-6>N+ zsP*oi@9C-ER6fS}T;i8EetjWJ?B1$JpC2E7_jQh!R_XTPw+(B0g=IvSBp%G=dGw0G z%X&1=gYQ*{{*}jNXJ0?9$onZMw_>E#$ZtkW*|MuVGwR+1A9nOqI&8zXtNKf{QFryF z%^R29sCV3@S1cxV=AP;Mi_cB#LwfCHWuBfM$k=;rZ4Xbk&WM)SP-8=eOQv(n`Rj(; zSid*_7f-ATjbcq)ziQuyoASdtaat~~f5q;XW9T<!#XWqNerf0Mraqpp-JAs%-4FY6 z2JinN(|b2UNPBQW=X1~8T+{yABqC|cZKu*)P4^6*<@XCs7_DEQCMF-)z-7}RI_)ag z$HNT83!P`y>~Z*(C-HplS{d{vd0n`QP185;5%X(fNA7hTToH6BUG2u4;w4WL0$!L5 z46HTrRbrS0aa~!eEjLTY_rh?f(&LzQ%F~Y-sCP*G6dbq_=xw{uiQ6vZiDL8mu1t}T zlg&SQ`n<Y+=&B$7Wtx=tNy9pG-L=~J_bz`uC!F!D*RyU@uUwEmSNe@|jZ0nO2Fh=~ zAMfvXEuMb$%fO?XLjISMlxrQzZj@cxRqsFMkx|l7Z2W|=@@9*9l--7heg=zmzyE%2 zH`><esMWSurC&4Qq3`9iBUdh#U6T0N(Rtmc_WqNSo9$7jQ(lD4iM`W1<B7?+%C>j+ z^%Nddv0u$tv86Ywi0`%4DuYPd(v$3LGrJjnV!jLaHCXCeE0~%|=A=9hU(1>u&>E7z z++nA2Uxh>Yt^TGc#ul+L?hyMIX-c)VH;Z0&FQ`lOF^`wc{2t75ZprVwb!&L|lV1nT zi&iTNh-E?hJFe#?jj0*VJ5?5_nbamvL<k<Mae3u`$@$5Pma_(&#UFJ;qo1|MPHA2> z{nLQyANK33?{tSr$~Ly`dDVIGa^?%UM6NB@Ur9*DJMLBTv1JKsXY5RfP*Hcj{{7@1 z#h*KM!k(Fg_jVWGy;m+6Yg4fNy>q4Ar#5b$9nMn(FNUy-{EQE5EEWvE*3)g&yE|!Y z<F2a~p>eE*ob`HM*=<wJULL9zT(CLnbAH-?L*7ffx=eEh0y$M~eJVd%ad_=Bmz8|l zucJg;YQl>e+-K~ZZ#;0Qbs@t~h}T9V*30+c+!g*arxZ!cxGicKT(+VjBxSkFlqIJM z#b3;gk(;vS!jW6f4-+%}l=6jC4%Nk7tNs!HW%{+^ta<&<{6|i0cI%k8%f7}=WVu29 zH0ejz6!ctzva@TK2REE@;ufE_Qff?oWKr&=s<HB}WegUbgmX_<h0MO}_|R!5V~)64 z@{+qkhPJP~bY!FA=F}WqIYZD*p|fqf_hN;QgCfQ4VKel;UM$=Bg?O#MIGW4wd2^)Q z$*pOry|>CbFMR7~^ZHrX;v2ksy}xwv&H$ZXs$ric>I0-VZa-goWZnU>4~sasgii@s zS)Tj|-<~%0C09K$y(il<O_S}<&&JRL7Z{t@#~B=Qdf|F@f%PHZ^%wTuEZy+9UVPcM zHAHQuuIn6`-6g84g%5v$JG_oRIn}ES@)p|i=2j=4`qA%aqBl$Cl=Q$tNmd`$!Q1Jb z*?XSVn(1U&FY!$eJ>QYGXGHJfJL5xRN&^e0wHj!%T-aGP-*v$Yf#Y>udtA;FCwTKr z=Q}YRSNglPzU&YE!KU}k`1juH+j4sEPZtzzSzzL7sl-OOkBB7gdZNLn+y^ISu!T0s zO_k%TxyKt}+55}63E7G_&P^BDu|6p0RJ@adU0U`>gZP#=_M3|1Z|<4ra+B*6+enh= z<ug~yO8G*|Klo~`$gWjO7Asu6p)o8)Eiu{Yp&(;dcTU$l`A1>Tm!d`LOOguiN#30H z<8|KoY|-;ycefT_IlMY(KM$Wdx5$hqB_l$kX6b=Kg8>E+A+4TMJ?33L#<p+PC6Bnq z<Ya}A1=)2Yxwp%MZk_Y&mYHH2miO!<k8yK=Q;l#=j%H_G&xg=b6%U80Lqi*eUWbmh z%Dk9a*U!laH<yo{Te-dcSN7sVj)%Kv>8QSGZ|2h0e9Inbuj9Mpw$}pb><w@H^F<KR zT@`%u?v;(xX6oOWcVSc5*{gS+8444>?mh1~=BR0_8pC(d?S)H|QA@5AYt?!wNe<ua z1jcfHI|b9$m|uZ!cP&QZzhlR~Jdq>@s)yC<GhQ8y?aO0iFF+?h${f6GUV2l_r|0;Q zwNs6cl!y<@AHC+qSlHLUd#%c0^`aY7e3JGA{p7OTwZ36sL(3kwtD&lU!#OV94m-Lv z^^cj_;Cjc>O}!19S2li+DS38F-M&9Rn0Ig&inBTFSLb|X_EXd2ruR?SHhg+8#%fe= z(D=PCMfKLxmyh^H8Ncj(xb@dR>5I0wb;s1C^_HnIzr-0^?zi#NJx92Wd*%oEJoq~M zh->Ek@H<cY2fw-3)f+y{c&;Iq!PPS*A<|>ez;d1(@A-Y(U(P)`KTY$aZE2nHI`7N| zpVAFcrAX@0Z2RTjB|@c#vUmJ!d;jS<|JUDNm*qx2&@r!f9w}j%uVQcvCmIYcsd1e) z`Xi)$rG}>XCf$)rDXHVL5yxlK#D{DVLh)_0hGxnme&@~MqqVW+AAKWZt~*5Teeyd< zX5W<;m*un46C6jza^KE#S7N!EWgU{D`OvV#NGgESOZO`p`PRBXUTLpifSszq=(hdG zc>|}mJ-X(QaFS&@XUy5?4U9oz?kA3*-+O+uwXe~Mx4f^cntDP*sbxuId+m02SGJYb zQWuEs_?<UGMq_XJCoajA?^XSssKFBY>w44Y`LpZTM(;NoZ`zoBJz=8}=i#+|qT-=X z;)%GTilmF&^5z%wA763(IuvqY!8W}bvzns~tB%bT^eAVHD5V$QIHLAl`ueJTlNWjS zQ$i0M__g49O?;V(@tbW`i`^XFw2h2y@wk!QcvQVY=-8{@9!s@u-O~?MPMYKR_@vc2 zBSzo;_%lt3p`Xp}e7sS`UJ>4zSU()}T~6nZ*<xq?Kcgs5ib!TyjGp|jI-o;2r}WFH z$yJtl!CUedU*>a6{>CkLbo%c04Bqbs6*9gdJ!W;y%07YRZlc#*wl~|)2@ff9liFaU zk!Zd9^L~Bzyz9*~J?zzdc4mGpY57AQ!_LYk#ttVzvrJ(j&!y99Q(E=|{@;4|{!92y z((wxp8J8xgvzpOEX+od+W>7vE!i4(6MuwPA{jo=epbiE^jWUE8g-8;FDfNd7L9C$u zC?beu)E`3xR-Y}4$q}-IEhTy&i^<Y*#BvJRAV=6xe^kg3R@6C~4fa!y+*W5{X+r|? z*pR(EL9mrvMN0C7c*gUq!l=QRn5sy2OYFbPQMcjT)r;_zYs%xDVqqza)u_(sVu)p| zt`^do7>jG!=c2OVi!x2&RAe}+Z~Q8Z)vc$L-0QiKrUF49x2dlHjk7$U1lkV-P#6fP zw#)r2KAjR`VPT&~f8*O<JB6{gA7|9Q5l2-D1a<BsdPJHidIO-U-~?xok|M|=-&5v` z-wPm5Mcl4GDG2*X3ea&yf;zDsRRPG}%)y$`^;k5MlT{G?_)F(e0{Rv>L{yECM#f5* zzlKCTcxiOM5+O!;J{I9)UjyGudJ7__@Yiklw=nji7)@>eOD)Vju2c%KYJo2mRb`@{ zm!zpPlnH4CaxA<*ioRaQ$HEc@-^L368@~!;3y_yGL7mQya+JX#iy5?PlQMQlPEM=l zKD43_3Clc;!n0_qoC+aH`Tl#Qhs6+lFD(Isr#RjQ>ATzlnrgRzl?VNpLrkT-(()6r zdk%fw&jp7&Gx04^o(eIOO1?)b;FXs#t<SAWQ0F}&IaNTTOlh>tlywSnQN@GfLyC-+ z)1u?51a;ymswB}mD;gaHl=4`#F8X5ud`s=Jxf4BD6+lvDkg*yeLOJ^*r|p+G9PpbY zIgvUK1*l<XkE=l|iM#1mTGa^ZpiVSEqB<!ws;Z8=psx<-G(@8T>I8M*B}yVuvm-QG ztBwcZaWFg_g7UByqRTvf`UPls8X=EFr{T1kISmX{71HSDX}Gay5^XA?(aLFr6xAoU zQ~3f#5d3bKYRnn*9~zoQ%%)-#UXpu5A4bUul7N|XxQw<(x=Gm!h>r^<la~C7Tju1I zL|xMfNmK&ADCYXz7d*DXVc|l?6H{e7$<(1pn-^-fbV9j_&tqXxW6BQ&q%(t<L%G*c z(^B^y#^t)w#Bo_XfOKaN5-1yfDUq|lNUl4g2&%$us0u1f_BMZIMM@el+__&_d6E1y zoS;J+mYjMC6LA%cIkN+HNI?TTU=&^^^^*t6H>5B#DL@D*Y7hiU)xd*$8vY+!sSJtA zpiT`!l<GlVjzNw*^q@v!;tX4_fb6xPW@u^R8TKh?TkH?W0R$(|G6%R;ou)==;*_a4 zx=~IIzK_^y{lvI@)1aw$G;wltXo6d7%xE;(j7>;$LM3z!Gu>S31rbYxA1$WH`5`+k z!ho8osajx0%7HYaiW;>DajJK%4(qjCz+G-A9vV!l?JH^O^qII88_xs-3@;junTf-5 z%ps{j9~8-Nkyd0fP`4SeYC~4tor$w5$jm)-0V@kj6QnDo!}wJgYm})?=u-Z~Cw{dk z0!|r(5nLL-3S%$$(B?L26Vep*kE-2i2cQ+f=t3HfUxl%UeQD}_Up8UHr;Ase4s`m# z4KU5cK~I6d3Wc$H0W_aa2aisg(G1z;K$C}}tofG*{}#q-2hmiIAT|l)tAmSLgbsw} zdI&8V3Sr}(G(<Bv(e(RZQ4Pu&bBX9gT{^hL%jklc;X||;8(lm^+z}(mE1(ScO<G6- z5KYYiJt`zwS9s-PAi5n;447N_nM+eY>JrqU(1>3T+NwEDqo#U<ER`glB&u|hMi1)Y zkuL$1eO@sevM**+Ms7QBuYZv6Nq}pM+2kknICkAgS{%6jTV!H}HzBWCxFV;|0u!nA zlx0a&Q_seSrmJA{ousU{70aZbvhkxk>cmv4R<M`HeTaZ_iPu|A%sS34tl&KxuPuz( zV5j;!hA+&<ow`TDcmL3E<{Z2jjQIlE#Kw-4%-Cg+-5gxDedYj6Zb>M(iJg54Du#8E zidiKoJHm@)!+$OD%mvs?9K)t_u{Uc;SZOv5XU-?MP}W>RlIm2+w*InIh*$wcOou7! zw*Jc>nu`ZZa2}XirvHyA>v`DJVXg;(5s(NykO;GxOnor?hkw?HT@3lo$3Y!3+4pN0 zCP)C}DRcH*G9Fi=kHD6j4^8)*j-!0Yb3U%35u}K*loHLPl7;GAT$Q-SWtjD%e)JIo zf1N6f{Y7(?k@x~UG+GP5#F#fb+Paxt{(mN(d~$JI3$;FB&BXelu$3L9`m!re+OYQL zd@B!vI6Q|gk>4%+_bQCN9EZ9W5HqL|6kG`Ht>4X#1Pj<D(Ypk8(U}uVY@fHs*gI%@ zhTX*C5xE!Z9bSkFb~%`1JD!IgE+n)m`+rFL?l&=Sjy@qm!7KCuZo18mj2qZhP$c9w z1yd==@|qplnQ_RVz1{45|C@3jNR_33We>X9xsiqe)>~)*%|>^la|VPm66nEdR9*1C zzg?OSR-0dL6YJR>iocL*_yZVVm-|gMtcJ7=aW36d{PXey<dGnBpSc+NV(vi>?n%4z zJVP*coP&exg&KNeNJx`yWEuhbL<*xzjPRszCE+4N3?DNhsFUtdEeUrmp<rDkxCnPt zei6WdjvT1di9;9p{)Hn*c=u`wo`z}`(Ji8O65i>7VSjHiF7(WRpihoa$bgWg2B1ev zVI$&ejF<6UTf!bag$_$VtycM)G4O9;>;p`#G{yzjB6Oi~D@>VDScjPNt0#oE%4>qN zLeT`;`W#B5jwZP0z9d=`L8He^aLJz{J2&_XRD!p#^CQpW_<I$`-i;Zja-ktmrbbS{ z6s&OVp+)=la_}K5QyeT8QuJXjE%Hy|5I{%%ib_b4SsE>RWlAVfxx%^H_4Xd<&S6+q znKv;<57N}Ri*Z%7T?_`+XVGYHHrP&EjGH}1iazAxW{+|3qmI9#0a7GziWVs?!DYj6 z37|QrvBDC(5SvRUcnm=x%3w1}Zd?Ceg|Y4DXsTy92hXJBdqf)JzC<&UE_3iAfu-0n zxuqZ)yiJSjmf~H^LB~9^2B;IJ(3axgM&RGVSm7R$Dv5I77ZsmQvAJ75!>%(`b)rj> zeI!+r8j(L_Gs}kQW@ee;!nVQ;&@Ur28fk_%G7eYobe)Brh6`9^j(Fi8ntIO+H~#*| zdVfuL3eh!ZqMxaJ$Zi?<DGk3UKLgU8&VR;TVouFbSlE`~(igc5JW`b>0SR<&8J;uu zNHj);Mt?6O#HbRkbM{r84kWu1SY;lJuduxd)8v$=_U2UoJ<SP%)f4HN6XGZxeo^3Q z0NFO`qTA+#It2^@!0u+wi8_~aDj==pc#I5|1Fy~+tzJ&dr23Nl`1a^xSnkbNPn?kf zuIR*aLXWccj8q%hfxa#$R4G7i1ppkokp2onjj|JSwqnsE7*<2*1#IWXufo{;eTcDw zP^DP6+fCdy0z(`62}3e|6~-1Np*$<NWq7p$2YIGtm{=lE=fH$vrrM;?R9y=^Su8BT z8Oi-L8fSqMucqzyh4b7jELAYmnQM)}0h-!mflI|Z(g0fyje1%WoJif05Trbwe^NLm z0-gXIwV1dSmd&O40hV}ZlP$r@i*gzbJ<lnCq^)t-yGW5@B`vyE#mPTuURkUMhExsB z@Uy~`^z1v&>w_?HG{FP4@o15gXAMQAZ&ce185?^bRC}SaGWRs8o;E0Gjqm%_nrz0- zgCR26m{*+gJ2Vx#Pj6#mt-+(ScgIm~RAc?O@ROpvrhi0)4Ix9t>))e_nCHgq$LOdH zOogpBxNOJTfR*AF5~ZJbJS2eytt23YMx=3S6Sk1=qA1q}rl5^2zN5_@V}F_snGpmF z33D@t<=~(i8<-n8wz!=#Fu=Z13B$jXr%XW~Z1KSS02y1J5-PU?&t}^Fo!~cL<dSI` z2x-b(HulY;so{UAZYz3pW<w-@=1rWrT60J$U9&pupqU&GT35s#7v`DvfbQ8!qn`FS z8N*2QZXAuCu_r{S3UOpgIIGPf@aZnw1ef}ad63s3K5_KL9?u6s2k3BUG%pPc#qe^Y z6%KeOT5Rol(rY;jOE?GXgupGe<f9dm9B|<BNIS1GC|DM~029>Qe^0_j%cqiT2_)}` zhvfHAzP3#r<W}lL%l;w!G<T~b-k-%dLLa{xAU!7-DEVL+Zgejn-%I}V3}{z@ezw5q zGCv#3v?TeGNXJ@$huXJM2`A@tbqjftl?nVX^S@Y;d@agnPbX;5&zf%V0JKV>#U$Di zPNVHkc+!n5|NdJOTIYm`$DCV25lF}xmv=*F(A^P@);JRy)CkRaEbeIzYTF<sq2!ET zu(x3dAiG!r8C30zL-+uc*)8KKSPcDf#)GUr*30${maA&Gv4EO9eig=A?8030m4q<m zyUR*)kkbUv&vXGfw0a&MUwyBo-fG~54^%$pm89aH09x=sKz>r`83Ide;*E%Z72Z@Y zS_P(k8U;{)6F9wZJvQC%Q>i9=mW74?GW!J61;AB*Bp^?@L3!6iniz}}M1%VTVJa5j zjFMgra9K2ltybfGuz^AD<Fhd4<Plp+<Gm)!Tw@I8X0IlssW7W`nvaIT$hgBQ1N-jr zt1$LT9Om||#%cD8Y|eKt1uG(hH8}bfYoNm&@T71p)EUMayk3-DDv*B%V^<9~Xv_;v z_K9&SH_}OhY;6NmRQBz+<1@bkRl)>HFSF;j&i|t{SV#y_e39ofWOSjY1MtJluf9m~ zrIGJiT&gQmn)aQ8fF!{~WoGKk%QW@MU#gVca~Vf)eHE+`D&r9$<40U0sd`k~<(AJs zG=RYjcqqlpI(L_3$sku3TmYwQqyEc4`)}sN&CumWy6rPActib0>eK-Nh=4O#W)55F zbJXQR%%bD8bbFvWq@<wu#I}F8(*~_v2`P#i^VPcWAhi7+#zBLrGaKKKR4MeQM^Frv zx#H2h?h2!6I!KFN3<*wNTZP<!k^X~bXpRZ;AR9NV>_&>t{ia0++;9mlA<@O6DBTlU z>vY3q^#_R-8`7wbJFXT7_P=?m0P}s_u8C_!AErjQ<52O03w)bKuIBK#2}WxCDvVva zlD7J4m5?BM0JmLKB)XTH%ndbSVTqPxoiJdft~8(Uz#HA@p1tp8fX%DBCr<lKIW*PR z1Lyg(wex?BL6HenpI9*OU8kv+Jn*Lap$GJs{XUK6J`mzX{GK>)vYsHiG)Rh+k&7qJ zSx+?e-2p|&oBD~*InZ~KI+rRAcR-hY8=M9>Ob9EZVlP}@!W;u1u8f2Hc*{B=JY%vH zmq0o4!hHYR32*fRJBN-5qgQu@Wzd5YxX4tJ@XCA)kG~(_TL-ZIX$&t}hey?ogy)xF z_|Q6>0;MEe_8*4duEQ1OCkZ=NVR-0@@DyYK^^xipxrJk2f1Q?P)`EyEos=k>6cu6- zdbA$b`}aCtBIKG*zV~9DkuG;AGpZ;IcJ5T&TjusfTLGp;`1Fa~=XbF?0UNOMdpAIH z`YpmpxKmgHUE6?1KIOn6*%6qgMKJm>NaI&w?A$gqv;kLtrHwGM-Y-c&8m-!hmr8#? z*;8LpCKb`yjksf1N!YVX7(F^KB8i4K;`^D6bAx)iA=A|%)0t~m)*FhefXuuJL8@b` zcoSUrLh6d|o0z&)AB2&8jR=9#fJ@DYp3Av@LlCfjSmBs^5G{<9d|-3X>W#;B$Q!zG zMwCWXH{os=ZUS_J1dRr4!rXl%Iw(V<)thiKKeXgO{{U`BXTlbcxf5p;Xe!@kT(kN& z?Tr5c{S|{kz`W{So=#H*7m9KskIne$NZ@8@uwRE3o!E@0+f@=hJ)cI0z&4dTd|LoL zwTniLx8Sjy^HMA85;)e7%fbQ~F@6=s+8-dPQs_g5h{*ruN(pJj=08%Tf<A1)T}<8g z>%Jl<3yU4R9D+^k_*EFYv67_HPp{m3K=)xa?ZKuRY?d03#QSgmC>z5I1-PMrdOdy> z#;(0j^WXXq^3*t=N?Xqz1dX^gPpp2me4^wy%b~?v@i4933TYKGUzAQ@h@A*Jz7?n3 zIZ~!z@IToURAVU0i)?&w+5GpwPUcy~ScH^(@oJbQ!;)(XsdOIZ9<%30rX))qrTOCY zD26B3tT$1hFQJIu`r;}>K1*bqZ%b3>`{5z9@dGphqlCSvBs%W**KbnPZAUABh##dn zz^}b#*zJE04wW4bB)Nz?xg*_ega(xjZrh;u+k8dQu%D>XKf_DHQadPE3UzJ6xidz> zZow2RiAF<2g(vO)?EQhF5lT@c&~AU+=VK&XkdEQU{)7lMh?@f*7=}UlsDh9&J2^88 zb7cc?b$d6LB|#P<Tm?VOlcKW#bG-v_+@b=Yx%nqB+;mcu2UP{&z}+Eb=T2eSuYkX| zfWsT~V<30SA$OIT;#GDPb1ee#rt$G1UgJ2Zd`AQ(x*c!>b8`amz?KC<b6WKneiMj2 z{7J%%4H(u5BE+eHWGSrVtb`6KfptYDFQkVsHzEjcbF)+R$_^>9uvF}v$QAk|ideTp z`MMi~XXcp|nHvv7MR^UqQ)RN-Et<I<@2c!YtSVigVNVzl<`C4#07)8c1)G$c(=^^K ze*$%)IcDNmxG0E`xg>!qx8t5RZHGklS&o!KzycgS%Z>Q|zL%2S0isw7S|n>F#)lYM zc$9oe(IHD(q-!lU6_x(gqMij;In$z%9k?0ZU{Lr@p#)kSjF&DK66Ie*bJPE##Uy&d zlSEa}`(V6F-SkD;=M+p|Zio}}%h^sZl1hJa$UOvfn>Wz9M?>(;s3g(OO*Hx)dP<cu zoua_9Zg?1f&>fypF-1Mxho&m{it(c?0(UxaCs;Whhf;SE>QtP);!oGXr<+*rf)VEV zVX+(H97c$u&IB>u|Gjo#4TZGYm4an5`$0A)jjdafGV^RKdzm99fcAxASvDyfEWols z32`pe6pFW`-C={3<fHTHkQ&Tsu?8L)MuQIn65_&WdKj)e@@rd?=fjF>2aYrI{UvGs zrZ7T|3ebutmtGu(!0>>1=DY2;GBh<pR-AwG%c9zw66C`?1!#r&miih&tFedU1dt7f zkVeVTs8u)~YKfA!#3fM9hMOVgCo*C)XzFPVae+zgRtdhBSA%w+KqQ#&$*0Vu)pE7P z;c-wnj_MDx@eSIvNFxGgg=F5UnY+OP0@s-f*%Dov+NLKyby8(bj{sxrb7@9x1Rk7b zsjHsk=YAf*BR%H(S7IJbEt@Ys`MJAdBp7=QcNFCC*+t?k-b$j8mNa@e65nTdJ{NKA zfkDcHo-;R*W<^uGfl4hWKS={;t!Y#<ijbpF%P2svd(mh_6dr>@u9HSDVY+p|E)@1_ z<5yv9#Ri&c;VmwPo<-rb>h1fiz61)i72KIJ2ft+#&6kSCwLm8t8npEzQ8DBhO$bxT zX7RJ`bqwUB6BI6H1H%3!bsFXD6;iihC#~xqCeAf!AXpi|C}&V@&RXXcq#Y18@g?NI z86Qtq=vOto6N0Hbeig==?xOTi2m{{&B$3vdQ)%=H0}ty;%~xCN;q9`D`9xo5XVO%* z7~EOu7%-rBnnqW|5VBNfk6JklALM3Xc>zhrJVn?_Xlhmro+9O>fyV!6wCgYWgG2*) zQF<I?h(;{lnNDq9zq1YoAsTMHnJ4VNsWeqlOo9W2#o~lWj|D49BI6=n>Qf$6pr4bX zy)ezm2IOTWgb@*k=Z!`jh=!DC(b_niFkPH4SRTNnHHP<H%;U$ZN>cIok-D7INk9yJ zgkMxRd|vsBr9iS}z*J%OTLUIM>A`gk34UY}k3F!B2P-3*w1^RpcQM%{>J5{WRQRbU zF}Xr?T3=1jfcO-_YcS?VZf^}}HHlq#W1zJQj4d;zQP*8~p$->$sxSZ<eqr9k$;P{k zrXDkw;6bIku%p*VE4og!s2^-o-DOSQ?)M%-RSTAw>zg3VEz<khy9xRO0(QH>z`V^g z8nYYcL^g>&3!%|%p%RlTNEgZQjHMaE30O}f0Z`6F8eI!0<&MB@@wn|!Jq*Dm=8+Ri zp{WH4IGd|T1Jy7cNGIR_HE?fr-h6YIPlsT`&urko44OJS5gV{b1OvK9X*4_$*RbW= zURQ|0M>W2En7EL(T%)N|_YhOi-9&sx)lOPb=^q!-Z*MjB0J`NXjs6~$;F+{Stj_xR zcp>DOKjZ-Of*r$#gj1kT`Fn6Ok&i{$MmT8n;~t!-ZZ}Gw21C6#2|vumR*RFS&fbgX zmgQbB@C>8dxFsjQ+D|7LYJ9X_?OvQ5g1f(H?tt}&fNdUgFpmq-RBkxxkD8<M`@n#u zIE{8nNKWqX${9rAL0Ef=JSWzf7D-yoM_Q5>9p8uZ^&Dw2UyByOk%DxBu&sTo{|#JP z4mbGBy=I+7Q>Q24UYjI=0loP&8UWv+MrGJA?@7BB$guZdgxP?a%{Y}4T}>i{sE##~ zR%Y4JqCa4pvSRS(s(1y=m%t+vBeOY>q>7>6L6Y3aHW_!uJsGSxrPHGQ$@tSgr6hXb z5RG;u6C#xDf(}*ryWrgwxMyIF`lf1<N>?v~6wuv#lLVwtKni}$tGVI!8w6!bJbB`d zp_ihHp{P1ZK6E_=`}L5tQu&(p;7<znz-@JK+)l_%UGRe0gN%Npmx?`bNd;ZgArcTn z$*H*ZE>1bj!4B(4sQ1LY-aJfGe}95uCO<e%#dnCba$+jt-;Z~)=LbbL)j>}Gh9Bnj z=)JHM@)MPkMFIP<GGjj|_lck*`-$n)Huzu9nUxJirO<UTP_A^u%0g+dll>?zh5RL@ z6p>9DhTTZ`k^}`yAUi239+dM}cAAu_D^ixkQMHm3{iux^wmL!HvM31JA_yAu!V#&6 zgwpZ*AmenfFjqwi*-w*_Mj`3A8ty0IhiVk8fbOSbUtW-~wH{`R9Ke%p#sPp;%`ohF z02>J-;m8#jE<1p;tdWEhEiufMf!XBE5qrH01xq343~bw%gt=U$knmP1ada#L*Pu!g zzT-~85~v@HQ1Rya^g!<kRInOY<(VI5q;8?O(^2Xn+!>dHV4}z$n=lEK5<s~JvFr>f z3y8<E&V%?>FzX?JgHtgqkS4{8jQ^UmA!S4RrI210%z%z-Qrsx%5H8BOq-^Qc|H%X< z?ahWr%2+RDS{$il;y293nE;D?#&A$3t|j|O_}U)~U(3XIw+%f{KgmNCQFEJk1Cz-v zO-E3hQ(6E?A^b3PV3$<eN=R(rPpJBz<*-7sg7iNRa03xEyh|R-WEG|P&^a(hO`U3x zvAwoMx>@kh=sUs_@C)y@yGbw{>edq<(9N(Tsq}w(umx@<*?w%Kbqllb;9nt8Gk+Q- z4nt!@0q|@5<Do=0$ZrMwBli!I=KtRiN0IU+;s3}7BBW)|%WUlNM^e6$@sE5~4sLoy z4v2WN#zp)n9Yoa3I%}>wYdS1JDrzh&vmkJPufo`f>~X#X`ksS>d@$HaXbsH72e5?$ zmGP@EcBBvoGVPKy7joEvliTGm1bKhazp|O9|Ls>9N%&UrKf<JZ$~*!Ly((!md<@=a zJ-mXWMop5ad$RHM;EOA)S?c57kPp~|uVRJLYq&W|;d0p-tJknbMM5c2Vp5R3i4|TQ z!B4!yT{CMoLU1x+HBw>X8r5O$%v?NMgA}(<n+CI08#a5YOx*4!%#CRV&&MOV(DOgz zI>;pz%ZZLywPJ;)T<nPNSfe64>|~!o-YGH}xBG~>3P<tAVsLhOx+rYUTi{(P^W%<m z4m5NOK8~Z!B_lp*&ZZxQ92w%L87YD?f~f5%zUO<qw+AhQd-MpnWn&Hl6h6wL!ZEys zaN2P>!U%TVSq2lgyv?dKHQ*Rt2s2NKd616}!eJno`((9%rd~USyR`D4S)vCFvN;Sg zGgVlhq|zT7RXR=(0;MK0ECE{rX3m<Yt*5Pr3>V7~3ntzdCKiZHserZD3c>@ohT~UZ zthy<aHtT6veanyIOuk3jS9Y1qn36|GYLWj*#_fMT3AJq8ESZe&-6pE3BL6%>l~Vin z<26Q1YUe#BtDUidE%Ny1ZCLZcDXVppX*T)zQ=tJQW7YP_jBEM$=HofZkdB|sc(x1D zU?zONfpT+o#dQ5WFks#={h8f7mM~e@V-M)^uExcwtN@yb+cTLap9HTA1qv}ut`KPM zd;edW6!n6hD$eO7tprV`y(%P>C|~6r&Gy-XpMT(9X9-hC>vJZn*`B~^XIcrjcu+Hi zoLtPLwljCKTFnVUk!p>PMd4m8sLh7?zlcd~?eWQKx+n4G!S*C{V`sr+#)HM8LdY0i zN>JASeTTqoebvdyx`IX6x^@v*&$uv|k-HWi@iIRGK0<QuU!2T6vXhXaocMS12XlM; zDvaG<IZ;gw*<F#Diri1(QT00o);+FHrYTm-2vB=Qs)>I$c_!lxkh4ec`b6Eul!pEL zU#Aiv?q)Dtrc4@BZ%ousMb@ma_>-G1N>?zF<Gds2IKU6{y~^+{Cf!%330X>`ly9-x y2^is4s6ui~twq)`X{Z+y3Y12KfU<hD6$?v!;l%B>>pdooz+ys)OH_*7RsSEZky;S| From a807620fc1fc9996ba3e119cfe749b2a00f20c9a Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Thu, 25 Jun 2026 16:32:44 +0300 Subject: [PATCH 145/339] Update `test_repl.py` to 3.14.6 (#8164) * Update `test_repl.py` to 3.14.6 * mark failing tests * Mark failing test correctly --- Lib/test/test_repl.py | 392 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 387 insertions(+), 5 deletions(-) diff --git a/Lib/test/test_repl.py b/Lib/test/test_repl.py index 03bf8d8b5..211d17838 100644 --- a/Lib/test/test_repl.py +++ b/Lib/test/test_repl.py @@ -1,14 +1,35 @@ """Test the interactive interpreter.""" -import sys import os -import unittest +import select import subprocess +import sys +import unittest +from contextlib import contextmanager +from functools import partial from textwrap import dedent -from test.support import cpython_only, SuppressCrashReport +from test import support +from test.support import ( + cpython_only, + has_subprocess_support, + os_helper, + SuppressCrashReport, + SHORT_TIMEOUT, +) from test.support.script_helper import kill_python +from test.support.import_helper import import_module -def spawn_repl(*args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, **kw): +try: + import pty +except ImportError: + pty = None + + +if not has_subprocess_support: + raise unittest.SkipTest("test module requires subprocess") + + +def spawn_repl(*args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, custom=False, isolated=True, **kw): """Run the Python REPL with the given arguments. kw is extra keyword args to pass to subprocess.Popen. Returns a Popen @@ -22,7 +43,14 @@ def spawn_repl(*args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, **kw): # path may be used by Py_GetPath() to build the default module search # path. stdin_fname = os.path.join(os.path.dirname(sys.executable), "<stdin>") - cmd_line = [stdin_fname, '-E', '-i'] + cmd_line = [stdin_fname] + # Isolated mode implies -EPs and ignores PYTHON* variables. + if isolated: + cmd_line.append('-I') + # Don't re-run the built-in REPL from interactive mode + # if we're testing a custom REPL (such as the asyncio REPL). + if not custom: + cmd_line.append('-i') cmd_line.extend(args) # Set TERM=vt100, for the rationale see the comments in spawn_python() of @@ -36,10 +64,47 @@ def spawn_repl(*args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, **kw): stdout=stdout, stderr=stderr, **kw) + +spawn_asyncio_repl = partial(spawn_repl, "-m", "asyncio", custom=True) + + +@contextmanager +def temp_pythonstartup(*, source: str, histfile: str = ".pythonhist"): + """Create environment variables for a PYTHONSTARTUP script in a temporary directory.""" + with os_helper.temp_dir() as tmpdir: + filename = os.path.join(tmpdir, "pythonstartup.py") + with open(filename, "w") as f: + f.write(source) + yield { + "PYTHONSTARTUP": filename, + "PYTHON_HISTORY": os.path.join(tmpdir, histfile) + } + + +def run_on_interactive_mode(source): + """Spawn a new Python interpreter, pass the given + input source code from the stdin and return the + result back. If the interpreter exits non-zero, it + raises a ValueError.""" + + process = spawn_repl() + process.stdin.write(source) + output = kill_python(process) + + if process.returncode != 0: + raise ValueError("Process didn't exit properly.") + return output + + +@support.force_not_colorized_test_class class TestInteractiveInterpreter(unittest.TestCase): @cpython_only + # Python built with Py_TRACE_REFS fail with a fatal error in + # _PyRefchain_Trace() on memory allocation error. + @unittest.skipIf(support.Py_TRACE_REFS, 'cannot test Py_TRACE_REFS build') def test_no_memory(self): + import_module("_testcapi") # Issue #30696: Fix the interactive interpreter looping endlessly when # no memory. Check also that the fix does not break the interactive # loop when an exception is raised. @@ -92,6 +157,23 @@ class TestInteractiveInterpreter(unittest.TestCase): output = kill_python(p) self.assertEqual(p.returncode, 0) + @cpython_only + def test_lexer_buffer_realloc_with_null_start(self): + # gh-144759: NULL pointer arithmetic in the lexer when start and + # multi_line_start are NULL (uninitialized in tok_mode_stack[0]) + # and the lexer buffer is reallocated while parsing long input. + long_value = "a" * 2000 + user_input = dedent(f"""\ + x = f'{{{long_value!r}}}' + print(x) + """) + p = spawn_repl() + p.stdin.write(user_input) + output = kill_python(p) + self.assertEqual(p.returncode, 0) + self.assertIn(long_value, output) + + @unittest.expectedFailureIf(sys.platform == "android", "TODO: RUSTPYTHON; AssertionError: 101 != 0") def test_close_stdin(self): user_input = dedent(''' import os @@ -107,6 +189,306 @@ class TestInteractiveInterpreter(unittest.TestCase): self.assertEqual(process.returncode, 0) self.assertIn('before close', output) + @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: 101 != 0 + def test_interactive_traceback_reporting(self): + user_input = "1 / 0 / 3 / 4" + p = spawn_repl() + p.stdin.write(user_input) + output = kill_python(p) + self.assertEqual(p.returncode, 0) + + traceback_lines = output.splitlines()[-6:-1] + expected_lines = [ + "Traceback (most recent call last):", + " File \"<stdin>\", line 1, in <module>", + " 1 / 0 / 3 / 4", + " ~~^~~", + "ZeroDivisionError: division by zero", + ] + self.assertEqual(traceback_lines, expected_lines) + + @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: 101 != 0 + def test_interactive_traceback_reporting_multiple_input(self): + user_input1 = dedent(""" + def foo(x): + 1 / x + + """) + p = spawn_repl() + p.stdin.write(user_input1) + user_input2 = "foo(0)" + p.stdin.write(user_input2) + output = kill_python(p) + self.assertEqual(p.returncode, 0) + + traceback_lines = output.splitlines()[-8:-1] + expected_lines = [ + ' File "<stdin>", line 1, in <module>', + ' foo(0)', + ' ~~~^^^', + ' File "<stdin>", line 2, in foo', + ' 1 / x', + ' ~~^~~', + 'ZeroDivisionError: division by zero' + ] + self.assertEqual(traceback_lines, expected_lines) + + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_pythonstartup_error_reporting(self): + # errors based on https://github.com/python/cpython/issues/137576 + + def make_repl(env): + return subprocess.Popen( + [os.path.join(os.path.dirname(sys.executable), '<stdin>'), "-i"], + executable=sys.executable, + text=True, + stdin=subprocess.PIPE, + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT, + env=env, + ) + + # case 1: error in user input, but PYTHONSTARTUP is fine + with os_helper.temp_dir() as tmpdir: + script = os.path.join(tmpdir, "pythonstartup.py") + with open(script, "w") as f: + f.write("print('from pythonstartup')\n") + + env = os.environ.copy() + env['PYTHONSTARTUP'] = script + env["PYTHON_HISTORY"] = os.path.join(tmpdir, ".pythonhist") + p = make_repl(env) + p.stdin.write("1/0") + output = kill_python(p) + expected = dedent(""" + Traceback (most recent call last): + File "<stdin>", line 1, in <module> + 1/0 + ~^~ + ZeroDivisionError: division by zero + """) + self.assertIn("from pythonstartup", output) + self.assertIn(expected, output) + + # case 2: error in PYTHONSTARTUP triggered by user input + with os_helper.temp_dir() as tmpdir: + script = os.path.join(tmpdir, "pythonstartup.py") + with open(script, "w") as f: + f.write("def foo():\n 1/0\n") + + env = os.environ.copy() + env['PYTHONSTARTUP'] = script + env["PYTHON_HISTORY"] = os.path.join(tmpdir, ".pythonhist") + p = make_repl(env) + p.stdin.write('foo()') + output = kill_python(p) + expected = dedent(""" + Traceback (most recent call last): + File "<stdin>", line 1, in <module> + foo() + ~~~^^ + File "%s", line 2, in foo + 1/0 + ~^~ + ZeroDivisionError: division by zero + """) % script + self.assertIn(expected, output) + + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_runsource_show_syntax_error_location(self): + user_input = dedent("""def f(x, x): ... + """) + p = spawn_repl() + p.stdin.write(user_input) + output = kill_python(p) + expected_lines = [ + ' def f(x, x): ...', + ' ^', + "SyntaxError: duplicate argument 'x' in function definition" + ] + self.assertEqual(output.splitlines()[4:-1], expected_lines) + + @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: 101 != 0 + def test_interactive_source_is_in_linecache(self): + user_input = dedent(""" + def foo(x): + return x + 1 + + def bar(x): + return foo(x) + 2 + """) + p = spawn_repl() + p.stdin.write(user_input) + user_input2 = dedent(""" + import linecache + print(linecache._interactive_cache[linecache._make_key(foo.__code__)]) + """) + p.stdin.write(user_input2) + output = kill_python(p) + self.assertEqual(p.returncode, 0) + expected = "(30, None, [\'def foo(x):\\n\', \' return x + 1\\n\', \'\\n\'], \'<stdin>\')" + self.assertIn(expected, output, expected) + + def test_asyncio_repl_reaches_python_startup_script(self): + with os_helper.temp_dir() as tmpdir: + script = os.path.join(tmpdir, "pythonstartup.py") + with open(script, "w") as f: + f.write("print('pythonstartup done!')\n") + env = os.environ.copy() + env["PYTHON_HISTORY"] = os.path.join(tmpdir, ".asyncio_history") + env["PYTHONSTARTUP"] = script + p = spawn_asyncio_repl(isolated=False, env=env) + output = kill_python(p) + self.assertEqual(p.returncode, 0) + self.assertIn("pythonstartup done!", output) + + def test_asyncio_repl_respects_isolated_mode(self): + with os_helper.temp_dir() as tmpdir: + script = os.path.join(tmpdir, "pythonstartup.py") + with open(script, "w") as f: + f.write("print('should not print')\n") + env = os.environ.copy() + env["PYTHON_HISTORY"] = os.path.join(tmpdir, ".asyncio_history") + env["PYTHONSTARTUP"] = script + p = spawn_asyncio_repl(isolated=True, env=env) + output = kill_python(p) + self.assertEqual(p.returncode, 0) + self.assertNotIn("should not print", output) + + @unittest.skipUnless(pty, "requires pty") + def test_asyncio_repl_is_ok(self): + m, s = pty.openpty() + cmd = [sys.executable, "-I", "-m", "asyncio"] + env = os.environ.copy() + proc = subprocess.Popen( + cmd, + stdin=s, + stdout=s, + stderr=s, + text=True, + close_fds=True, + env=env, + ) + os.close(s) + os.write(m, b"await asyncio.sleep(0)\n") + os.write(m, b"exit()\n") + output = [] + while select.select([m], [], [], SHORT_TIMEOUT)[0]: + try: + data = os.read(m, 1024).decode("utf-8") + if not data: + break + except OSError: + break + output.append(data) + os.close(m) + try: + exit_code = proc.wait(timeout=SHORT_TIMEOUT) + except subprocess.TimeoutExpired: + proc.kill() + exit_code = proc.wait() + + self.assertEqual(exit_code, 0, "".join(output)) + + +@support.force_not_colorized_test_class +class TestInteractiveModeSyntaxErrors(unittest.TestCase): + + @unittest.expectedFailure # TODO: RUSTPYTHON; ValueError: Process didn't exit properly. + def test_interactive_syntax_error_correct_line(self): + output = run_on_interactive_mode(dedent("""\ + def f(): + print(0) + return yield 42 + """)) + + traceback_lines = output.splitlines()[-4:-1] + expected_lines = [ + ' return yield 42', + ' ^^^^^', + 'SyntaxError: invalid syntax' + ] + self.assertEqual(traceback_lines, expected_lines) + + +class TestAsyncioREPL(unittest.TestCase): + def test_multiple_statements_fail_early(self): + user_input = "1 / 0; print(f'afterwards: {1+1}')" + p = spawn_asyncio_repl() + p.stdin.write(user_input) + output = kill_python(p) + self.assertIn("ZeroDivisionError", output) + self.assertNotIn("afterwards: 2", output) + + def test_toplevel_contextvars_sync(self): + user_input = dedent("""\ + from contextvars import ContextVar + var = ContextVar("var", default="failed") + var.set("ok") + """) + p = spawn_asyncio_repl() + p.stdin.write(user_input) + user_input2 = dedent(""" + print(f"toplevel contextvar test: {var.get()}") + """) + p.stdin.write(user_input2) + output = kill_python(p) + self.assertEqual(p.returncode, 0) + expected = "toplevel contextvar test: ok" + self.assertIn(expected, output, expected) + + @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: 101 != 0 + def test_toplevel_contextvars_async(self): + user_input = dedent("""\ + from contextvars import ContextVar + var = ContextVar('var', default='failed') + """) + p = spawn_asyncio_repl() + p.stdin.write(user_input) + user_input2 = "async def set_var(): var.set('ok')\n" + p.stdin.write(user_input2) + user_input3 = "await set_var()\n" + p.stdin.write(user_input3) + user_input4 = "print(f'toplevel contextvar test: {var.get()}')\n" + p.stdin.write(user_input4) + output = kill_python(p) + self.assertEqual(p.returncode, 0) + expected = "toplevel contextvar test: ok" + self.assertIn(expected, output, expected) + + def test_quiet_mode(self): + p = spawn_repl("-q", "-m", "asyncio", custom=True) + output = kill_python(p) + self.assertEqual(p.returncode, 0) + self.assertEqual(output[:3], ">>>") + + @support.force_not_colorized + @support.subTests( + ("startup_code", "expected_error"), + [ + ("some invalid syntax\n", "SyntaxError: invalid syntax"), + ("1/0\n", "ZeroDivisionError: division by zero"), + ], + ) + def test_pythonstartup_failure(self, startup_code, expected_error): + startup_env = self.enterContext( + temp_pythonstartup(source=startup_code, histfile=".asyncio_history")) + + p = spawn_repl( + "-qm", "asyncio", + env=os.environ | startup_env, + isolated=False, + custom=True) + p.stdin.write("print('user code', 'executed')\n") + output = kill_python(p) + self.assertEqual(p.returncode, 0) + + tb_hint = f'File "{startup_env["PYTHONSTARTUP"]}", line 1' + self.assertIn(tb_hint, output) + self.assertIn(expected_error, output) + + self.assertIn("user code executed", output) + if __name__ == "__main__": unittest.main() From 7b715541be5c08a36526ced9dfd594065a2c8781 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Thu, 25 Jun 2026 16:32:57 +0300 Subject: [PATCH 146/339] Update `test_tempfile.py` to 3.14.6 (#8165) --- Lib/test/test_tempfile.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_tempfile.py b/Lib/test/test_tempfile.py index 0e6b9bced..42d1cf283 100644 --- a/Lib/test/test_tempfile.py +++ b/Lib/test/test_tempfile.py @@ -332,7 +332,9 @@ class TestBadTempdir: with _inside_empty_temp_dir(): probe = os.path.join(tempfile.tempdir, 'probe') if os.name == 'nt': - cmd = ['icacls', tempfile.tempdir, '/deny', 'Everyone:(W)'] + # Use security identifier *S-1-1-0 instead + # of localized "Everyone" to not depend on the locale. + cmd = ['icacls', tempfile.tempdir, '/deny', '*S-1-1-0:(W)'] stdout = None if support.verbose > 1 else subprocess.DEVNULL subprocess.run(cmd, check=True, stdout=stdout) else: @@ -355,7 +357,9 @@ class TestBadTempdir: self.make_temp() finally: if os.name == 'nt': - cmd = ['icacls', tempfile.tempdir, '/grant:r', 'Everyone:(M)'] + # Use security identifier *S-1-1-0 instead + # of localized "Everyone" to not depend on the locale. + cmd = ['icacls', tempfile.tempdir, '/grant:r', '*S-1-1-0:(M)'] subprocess.run(cmd, check=True, stdout=stdout) else: os.chmod(tempfile.tempdir, oldmode) @@ -1747,7 +1751,7 @@ class TestTemporaryDirectory(BaseTestCase): d2.cleanup() @unittest.skipIf(sys.platform == "win32", "TODO: RUSTPYTHON; flaky, sometimes pollute env on CI") - @unittest.expectedFailureIf(sys.platform in ("android", "linux"), "TODO: RUSTPYTHON; FileNotFoundError: [Errno 2] No such file or directory: '<LONG_PATH>'") + @unittest.expectedFailureIf(sys.platform in ('android', 'linux'), "TODO: RUSTPYTHON; FileNotFoundError: [Errno 2] No such file or directory: '<LONG_PATH>'") @os_helper.skip_unless_symlink def test_cleanup_with_symlink_modes(self): # cleanup() should not follow symlinks when fixing mode bits (#91133) From 7edb4fb01647e97dc94afd6e89e8621e2702caeb Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Thu, 25 Jun 2026 16:33:13 +0300 Subject: [PATCH 147/339] Update `test_ssl.py` to 3.1.46 (#8166) * Update `test_ssl.py` to 3.14.6 * Add `Lib/test/ssltests.py` * Mark failing test correctly --- Lib/test/ssltests.py | 37 +++++++ Lib/test/test_ssl.py | 254 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 269 insertions(+), 22 deletions(-) create mode 100644 Lib/test/ssltests.py diff --git a/Lib/test/ssltests.py b/Lib/test/ssltests.py new file mode 100644 index 000000000..ee03aed5c --- /dev/null +++ b/Lib/test/ssltests.py @@ -0,0 +1,37 @@ +# Convenience test module to run all of the OpenSSL-related tests in the +# standard library. + +import ssl +import sys +import subprocess + +TESTS = [ + 'test_asyncio', 'test_ensurepip.py', 'test_ftplib', 'test_hashlib', + 'test_hmac', 'test_httplib', 'test_imaplib', + 'test_poplib', 'test_ssl', 'test_smtplib', 'test_smtpnet', + 'test_urllib2_localnet', 'test_venv', 'test_xmlrpc' +] + +def run_regrtests(*extra_args): + print(ssl.OPENSSL_VERSION) + args = [ + sys.executable, + '-Werror', '-bb', # turn warnings into exceptions + '-m', 'test', + ] + if not extra_args: + args.extend([ + '-r', # randomize + '-w', # re-run failed tests with -v + '-u', 'network', # use network + '-u', 'urlfetch', # download test vectors + '-j', '0' # use multiple CPUs + ]) + else: + args.extend(extra_args) + args.extend(TESTS) + result = subprocess.call(args) + sys.exit(result) + +if __name__ == '__main__': + run_regrtests(*sys.argv[1:]) diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index 7cfbe0c97..10fb5c80b 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -1,5 +1,6 @@ # Test the support for SSL and sockets +import contextlib import sys import unittest import unittest.mock @@ -47,9 +48,20 @@ Py_DEBUG_WIN32 = support.Py_DEBUG and sys.platform == 'win32' PROTOCOLS = sorted(ssl._PROTOCOL_NAMES) HOST = socket_helper.HOST +IS_AWS_LC = "AWS-LC" in ssl.OPENSSL_VERSION IS_OPENSSL_3_0_0 = ssl.OPENSSL_VERSION_INFO >= (3, 0, 0) PY_SSL_DEFAULT_CIPHERS = sysconfig.get_config_var('PY_SSL_DEFAULT_CIPHERS') +HAS_KEYLOG = hasattr(ssl.SSLContext, 'keylog_filename') +requires_keylog = unittest.skipUnless( + HAS_KEYLOG, 'test requires OpenSSL 1.1.1 with keylog callback') +CAN_SET_KEYLOG = HAS_KEYLOG and os.name != "nt" +requires_keylog_setter = unittest.skipUnless( + CAN_SET_KEYLOG, + "cannot set 'keylog_filename' on Windows" +) + + PROTOCOL_TO_TLS_VERSION = {} for proto, ver in ( ("PROTOCOL_SSLv3", "SSLv3"), @@ -258,26 +270,67 @@ ignore_deprecation = warnings_helper.ignore_warnings( ) -def test_wrap_socket(sock, *, - cert_reqs=ssl.CERT_NONE, ca_certs=None, - ciphers=None, certfile=None, keyfile=None, - **kwargs): - if not kwargs.get("server_side"): - kwargs["server_hostname"] = SIGNED_CERTFILE_HOSTNAME - context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT) - else: +def make_test_context( + *, + server_side=False, + check_hostname=None, + cert_reqs=ssl.CERT_NONE, + ca_certs=None, certfile=None, keyfile=None, + ciphers=None, + min_version=None, max_version=None, +): + if server_side: context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER) - if cert_reqs is not None: + else: + context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT) + + if check_hostname is None: if cert_reqs == ssl.CERT_NONE: context.check_hostname = False + else: + context.check_hostname = check_hostname + + if cert_reqs is not None: context.verify_mode = cert_reqs + if ca_certs is not None: context.load_verify_locations(ca_certs) if certfile is not None or keyfile is not None: context.load_cert_chain(certfile, keyfile) + if ciphers is not None: context.set_ciphers(ciphers) - return context.wrap_socket(sock, **kwargs) + + if min_version is not None: + context.minimum_version = min_version + if max_version is not None: + context.maximum_version = max_version + + return context + + +def test_wrap_socket( + sock, + *, + server_side=False, + check_hostname=None, + cert_reqs=ssl.CERT_NONE, + ca_certs=None, certfile=None, keyfile=None, + ciphers=None, + min_version=None, max_version=None, + **kwargs, +): + context = make_test_context( + server_side=server_side, + check_hostname=check_hostname, + cert_reqs=cert_reqs, + ca_certs=ca_certs, certfile=certfile, keyfile=keyfile, + ciphers=ciphers, + min_version=min_version, max_version=max_version, + ) + if not server_side: + kwargs.setdefault("server_hostname", SIGNED_CERTFILE_HOSTNAME) + return context.wrap_socket(sock, server_side=server_side, **kwargs) USE_SAME_TEST_CONTEXT = False @@ -317,6 +370,20 @@ def testing_context(server_cert=SIGNED_CERTFILE, *, server_chain=True): return client_context, server_context, hostname +def do_ssl_object_handshake(sslobject, outgoing, max_retry=25): + """Call do_handshake() on the sslobject and return the sent data. + + If do_handshake() fails more than *max_retry* times, return None. + """ + data, attempt = None, 0 + while not data and attempt < max_retry: + with contextlib.suppress(ssl.SSLWantReadError): + sslobject.do_handshake() + data = outgoing.read() + attempt += 1 + return data + + class BasicSocketTests(unittest.TestCase): def test_constants(self): @@ -698,6 +765,7 @@ class BasicSocketTests(unittest.TestCase): support.gc_collect() self.assertIn(r, str(cm.warning.args[0])) + @unittest.expectedFailureIf(sys.platform == "android", "TODO: RUSTPYTHON; TypeError: path should be string, bytes, os.PathLike or integer, not NoneType") def test_get_default_verify_paths(self): paths = ssl.get_default_verify_paths() self.assertEqual(len(paths), 6) @@ -1035,7 +1103,6 @@ class ContextTests(unittest.TestCase): with self.assertRaises(AttributeError): ctx.hostname_checks_common_name = True - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: <TLSVersion.TLSv1_2: 771> not found in {<TLSVersion.TLSv1: 769>, <TLSVersion.TLSv1_1: 770>, <TLSVersion.SSLv3: 768>} @ignore_deprecation def test_min_max_version(self): ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER) @@ -1089,7 +1156,12 @@ class ContextTests(unittest.TestCase): ctx.maximum_version = ssl.TLSVersion.MINIMUM_SUPPORTED self.assertIn( ctx.maximum_version, - {ssl.TLSVersion.TLSv1, ssl.TLSVersion.TLSv1_1, ssl.TLSVersion.SSLv3} + { + ssl.TLSVersion.TLSv1, + ssl.TLSVersion.TLSv1_1, + ssl.TLSVersion.TLSv1_2, + ssl.TLSVersion.SSLv3, + } ) ctx.minimum_version = ssl.TLSVersion.MAXIMUM_SUPPORTED @@ -1410,6 +1482,50 @@ class ContextTests(unittest.TestCase): ctx.set_servername_callback(None) ctx.set_servername_callback(dummycallback) + @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: Expected 'mock' to not have been called. Called 1 times. + def test_sni_callback_on_dead_references(self): + # See https://github.com/python/cpython/issues/146080. + c_ctx = make_test_context() + c_inc, c_out = ssl.MemoryBIO(), ssl.MemoryBIO() + client = c_ctx.wrap_bio(c_inc, c_out, server_hostname=SIGNED_CERTFILE_HOSTNAME) + + def sni_callback(sock, servername, ctx): pass + sni_callback = unittest.mock.Mock(wraps=sni_callback) + s_ctx = make_test_context(server_side=True, certfile=SIGNED_CERTFILE) + s_ctx.set_servername_callback(sni_callback) + + s_inc, s_out = ssl.MemoryBIO(), ssl.MemoryBIO() + server = s_ctx.wrap_bio(s_inc, s_out, server_side=True) + server_impl = server._sslobj + + # Perform the handshake on the client side first. + data = do_ssl_object_handshake(client, c_out) + sni_callback.assert_not_called() + if data is None: + self.skipTest("cannot establish a handshake from the client") + s_inc.write(data) + sni_callback.assert_not_called() + # Delete the server object before it starts doing its handshake + # and ensure that we did not call the SNI callback yet. + del server + gc.collect() + # Try to continue the server's handshake by directly using + # the internal SSL object. The latter is a weak reference + # stored in the server context and has now a dead owner. + with self.assertRaises(ssl.SSLError) as cm: + server_impl.do_handshake() + # The SNI C callback raised an exception before calling our callback. + sni_callback.assert_not_called() + + # In AWS-LC, any handshake failures reports SSL_R_PARSE_TLSEXT, + # while OpenSSL uses SSL_R_CALLBACK_FAILED on SNI callback failures. + if IS_AWS_LC: + libssl_error_reason = "PARSE_TLSEXT" + else: + libssl_error_reason = "callback failed" + self.assertIn(libssl_error_reason, str(cm.exception)) + self.assertEqual(cm.exception.errno, ssl.SSL_ERROR_SSL) + @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: <SSLContext(protocol=17)> is not None def test_sni_callback_refcycle(self): # Reference cycles through the servername callback are detected @@ -1423,6 +1539,59 @@ class ContextTests(unittest.TestCase): gc.collect() self.assertIs(wr(), None) + @unittest.skipUnless(support.Py_GIL_DISABLED, + "test is only useful if the GIL is disabled") + @threading_helper.requires_working_threading() + def test_sni_callback_race(self): + # Replacing sni_callback while handshakes are in-flight must not + # crash (use-after-free on the callback in free-threaded builds). + client_ctx, server_ctx, hostname = testing_context() + + server_ctx.sni_callback = lambda *a: None + done = threading.Event() + + def do_handshakes(): + while not done.is_set(): + c_in = ssl.MemoryBIO() + c_out = ssl.MemoryBIO() + s_in = ssl.MemoryBIO() + s_out = ssl.MemoryBIO() + client = client_ctx.wrap_bio( + c_in, c_out, server_hostname=hostname) + server = server_ctx.wrap_bio(s_in, s_out, server_side=True) + for _ in range(50): + try: + client.do_handshake() + except ssl.SSLWantReadError: + pass + except ssl.SSLError: + break + if c_out.pending: + s_in.write(c_out.read()) + try: + server.do_handshake() + except ssl.SSLWantReadError: + pass + except ssl.SSLError: + break + if s_out.pending: + c_in.write(s_out.read()) + + def toggle_callback(): + while not done.is_set(): + server_ctx.sni_callback = lambda *a: None + server_ctx.sni_callback = None + + workers = max(4, (os.cpu_count() or 4) * 2) + threads = [threading.Thread(target=do_handshakes) + for _ in range(workers)] + threads.append(threading.Thread(target=toggle_callback)) + + with threading_helper.catch_threading_exception() as cm: + with threading_helper.start_threads(threads): + done.set() + self.assertIsNone(cm.exc_value) + def test_cert_store_stats(self): ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT) self.assertEqual(ctx.cert_store_stats(), @@ -1665,6 +1834,39 @@ class ContextTests(unittest.TestCase): with self.assertRaises(ValueError): ctx.num_tickets = 1 + @support.cpython_only + def test_refcycle_msg_callback(self): + # See https://github.com/python/cpython/issues/142516. + ctx = make_test_context() + def msg_callback(*args, _=ctx, **kwargs): ... + ctx._msg_callback = msg_callback + + @support.cpython_only + @requires_keylog_setter + def test_refcycle_keylog_filename(self): + # See https://github.com/python/cpython/issues/142516. + self.addCleanup(os_helper.unlink, os_helper.TESTFN) + ctx = make_test_context() + class KeylogFilename(str): ... + ctx.keylog_filename = KeylogFilename(os_helper.TESTFN) + ctx.keylog_filename._ = ctx + + @support.cpython_only + @unittest.skipUnless(ssl.HAS_PSK, 'requires TLS-PSK') + def test_refcycle_psk_client_callback(self): + # See https://github.com/python/cpython/issues/142516. + ctx = make_test_context() + def psk_client_callback(*args, _=ctx, **kwargs): ... + ctx.set_psk_client_callback(psk_client_callback) + + @support.cpython_only + @unittest.skipUnless(ssl.HAS_PSK, 'requires TLS-PSK') + def test_refcycle_psk_server_callback(self): + # See https://github.com/python/cpython/issues/142516. + ctx = make_test_context(server_side=True) + def psk_server_callback(*args, _=ctx, **kwargs): ... + ctx.set_psk_server_callback(psk_server_callback) + class SSLErrorTests(unittest.TestCase): @@ -4922,10 +5124,6 @@ class TestPostHandshakeAuth(unittest.TestCase): self.assertEqual(res, b'\x02\n') -HAS_KEYLOG = hasattr(ssl.SSLContext, 'keylog_filename') -requires_keylog = unittest.skipUnless( - HAS_KEYLOG, 'test requires OpenSSL 1.1.1 with keylog callback') - class TestSSLDebug(unittest.TestCase): def keylog_lines(self, fname=os_helper.TESTFN): @@ -5164,15 +5362,27 @@ class TestPreHandshakeClose(unittest.TestCase): return # Expect the full test setup to always work on Linux. if (isinstance(err, ConnectionResetError) or (isinstance(err, OSError) and err.errno == errno.EINVAL) or - re.search('wrong.version.number', str(getattr(err, "reason", "")), re.I)): + re.search( + # Matches the following error messages: + # '[SSL: WRONG_VERSION_NUMBER] wrong version number (_ssl.c:1123)' + # '[SSL: RECORD_LAYER_FAILURE] record layer failure (_ssl.c:1109)' + # '[SSL: HTTP_REQUEST] http request (_ssl.c:1143)' + r'wrong.version.number|record.layer.failure|http.request', + str(getattr(err, "reason", "")), + re.IGNORECASE, + ) + ): # On Windows the TCP RST leads to a ConnectionResetError # (ECONNRESET) which Linux doesn't appear to surface to userspace. # If wrap_socket() winds up on the "if connected:" path and doing - # the actual wrapping... we get an SSLError from OpenSSL. Typically - # WRONG_VERSION_NUMBER. While appropriate, neither is the scenario - # we're specifically trying to test. The way this test is written - # is known to work on Linux. We'll skip it anywhere else that it - # does not present as doing so. + # the actual wrapping... we get an SSLError from OpenSSL. This is + # typically WRONG_VERSION_NUMBER. The same happens on iOS, but + # RECORD_LAYER_FAILURE or HTTP_REQUEST is the error. + # + # While appropriate, these scenarios aren't what we're specifically + # trying to test. The way this test is written is known to work on + # Linux. We'll skip it anywhere else that it does not present as + # doing so. try: self.skipTest(f"Could not recreate conditions on {sys.platform}:" f" {err=}") From b28f29313fe1d7497ee8235614abe74ce386e99e Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Thu, 25 Jun 2026 16:33:51 +0300 Subject: [PATCH 148/339] Update some tests to 3.14.6 (#8167) * Add `test_fileutils.py` from 3.14.6 * Align patch for `test_zipimport_support.py` * Update `test_bigmem.py` to 3.14.6 * Update `test_exception_group.py` * Align patches for `test_baseexception.py` * Update `test_exceptions.py` * Update `test_dtrace.py` * Remove patch from `string_tests.py` --- Lib/test/string_tests.py | 5 +- Lib/test/test_baseexception.py | 6 +-- Lib/test/test_bigmem.py | 61 +++++++++++++++--------- Lib/test/test_dtrace.py | 35 +------------- Lib/test/test_exception_group.py | 75 +++++++++++++++++++++++++++++- Lib/test/test_exceptions.py | 25 ++++++++++ Lib/test/test_fileutils.py | 30 ++++++++++++ Lib/test/test_zipimport_support.py | 5 +- 8 files changed, 176 insertions(+), 66 deletions(-) create mode 100644 Lib/test/test_fileutils.py diff --git a/Lib/test/string_tests.py b/Lib/test/string_tests.py index 08926bf88..0c159e02f 100644 --- a/Lib/test/string_tests.py +++ b/Lib/test/string_tests.py @@ -482,11 +482,8 @@ class BaseTest: self.checkequal(' a\n b', ' \ta\n\tb', 'expandtabs', 1) self.checkraises(TypeError, 'hello', 'expandtabs', 42, 42) - # TODO: RUSTPYTHON; expandtabs overflow checks - # if sys.maxsize < (1 << 32) and struct.calcsize('P') == 4: - # # This test is only valid when sizeof(int) == sizeof(void*) == 4. - if sys.maxsize < (1 << 32) and struct.calcsize('P') == 4 and False: + if sys.maxsize < (1 << 32) and struct.calcsize('P') == 4: self.checkraises(OverflowError, '\ta\n\tb', 'expandtabs', sys.maxsize) diff --git a/Lib/test/test_baseexception.py b/Lib/test/test_baseexception.py index 5870dc7f9..0c206c4e3 100644 --- a/Lib/test/test_baseexception.py +++ b/Lib/test/test_baseexception.py @@ -79,10 +79,8 @@ class ExceptionClassTests(unittest.TestCase): # Underscore-prefixed (private) exceptions don't need to be documented exc_set = set(e for e in exc_set if not e.startswith('_')) - # RUSTPYTHON specific - exc_set.discard("JitError") - # XXX: RUSTPYTHON; IncompleteInputError will be officially introduced in Python 3.15 - exc_set.discard("IncompleteInputError") + exc_set.discard("JitError") # XXX: RUSTPYTHON specific + exc_set.discard("IncompleteInputError") # XXX: RUSTPYTHON; IncompleteInputError will be officially introduced in Python 3.15 self.assertEqual(len(exc_set), 0, "%s not accounted for" % exc_set) interface_tests = ("length", "args", "str", "repr") diff --git a/Lib/test/test_bigmem.py b/Lib/test/test_bigmem.py index 8f528812e..ea76b1282 100644 --- a/Lib/test/test_bigmem.py +++ b/Lib/test/test_bigmem.py @@ -9,7 +9,12 @@ high memory limit to regrtest, with the -M option. """ from test import support -from test.support import bigmemtest, _1G, _2G, _4G +from test.support import bigmemtest, _1G, _2G, _4G, import_helper +# _testcapi = import_helper.import_module('_testcapi') +try: # TODO: RUSTPYTHON + import _testcapi +except ImportError: + _testcapi = None import unittest import operator @@ -784,17 +789,14 @@ class BytesTest(unittest.TestCase, BaseStrTest): def test_swapcase(self, size): self._test_swapcase(size) - # TODO: RUSTPYTHON - @unittest.expectedFailure - @bigmemtest(size=_2G, memuse=2) - def test_isspace(self, size): - super().test_isspace(size) + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_isspace(self): + return super().test_isspace() + + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_istitle(self): + return super().test_istitle() - # TODO: RUSTPYTHON - @unittest.expectedFailure - @bigmemtest(size=_2G, memuse=2) - def test_istitle(self, size): - super().test_istitle(size) class BytearrayTest(unittest.TestCase, BaseStrTest): @@ -821,17 +823,13 @@ class BytearrayTest(unittest.TestCase, BaseStrTest): test_hash = None test_split_large = None - # TODO: RUSTPYTHON - @unittest.expectedFailure - @bigmemtest(size=_2G, memuse=2) - def test_isspace(self, size): - super().test_isspace(size) + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_isspace(self): + return super().test_isspace() - # TODO: RUSTPYTHON - @unittest.expectedFailure - @bigmemtest(size=_2G, memuse=2) - def test_istitle(self, size): - super().test_istitle(size) + @unittest.expectedFailure # TODO: RUSTPYTHON + def test_istitle(self): + return super().test_istitle() class TupleTest(unittest.TestCase): @@ -1280,6 +1278,27 @@ class DictTest(unittest.TestCase): d[size] = 1 +class ImmortalityTest(unittest.TestCase): + + @bigmemtest(size=_2G, memuse=pointer_size * 9/8) + def test_stickiness(self, size): + """Check that immortality is "sticky", so that + once an object is immortal it remains so.""" + if size < _2G: + # Not enough memory to cause immortality on overflow + return + o1 = o2 = o3 = o4 = o5 = o6 = o7 = o8 = object() + l = [o1] * (size-20) + self.assertFalse(_testcapi.is_immortal(o1)) + for _ in range(30): + l.append(l[0]) + self.assertTrue(_testcapi.is_immortal(o1)) + del o2, o3, o4, o5, o6, o7, o8 + self.assertTrue(_testcapi.is_immortal(o1)) + del l + self.assertTrue(_testcapi.is_immortal(o1)) + + if __name__ == '__main__': if len(sys.argv) > 1: support.set_memlimit(sys.argv[1]) diff --git a/Lib/test/test_dtrace.py b/Lib/test/test_dtrace.py index a63978fd1..ba2fa9970 100644 --- a/Lib/test/test_dtrace.py +++ b/Lib/test/test_dtrace.py @@ -8,7 +8,7 @@ import types import unittest from test import support -from test.support import findfile +from test.support import findfile, MS_WINDOWS if not support.has_subprocess_support: @@ -103,6 +103,7 @@ class SystemTapBackend(TraceBackend): COMMAND = ["stap", "-g"] +@unittest.skipIf(MS_WINDOWS, "Tests not compliant with trace on Windows.") class TraceTests: # unittest.TestCase options maxDiff = None @@ -159,43 +160,11 @@ class DTraceNormalTests(TraceTests, unittest.TestCase): backend = DTraceBackend() optimize_python = 0 - @unittest.expectedFailureIfWindows('TODO: RUSTPYTHON') - def test_function_entry_return(self): - return super().test_function_entry_return() - - @unittest.expectedFailureIfWindows('TODO: RUSTPYTHON') - def test_verify_call_opcodes(self): - return super().test_verify_call_opcodes() - - @unittest.expectedFailureIfWindows('TODO: RUSTPYTHON') - def test_gc(self): - return super().test_gc() - - @unittest.expectedFailureIfWindows('TODO: RUSTPYTHON') - def test_line(self): - return super().test_line() - class DTraceOptimizedTests(TraceTests, unittest.TestCase): backend = DTraceBackend() optimize_python = 2 - @unittest.expectedFailureIfWindows('TODO: RUSTPYTHON') - def test_function_entry_return(self): - return super().test_function_entry_return() - - @unittest.expectedFailureIfWindows('TODO: RUSTPYTHON') - def test_verify_call_opcodes(self): - return super().test_verify_call_opcodes() - - @unittest.expectedFailureIfWindows('TODO: RUSTPYTHON') - def test_gc(self): - return super().test_gc() - - @unittest.expectedFailureIfWindows('TODO: RUSTPYTHON') - def test_line(self): - return super().test_line() - class SystemTapNormalTests(TraceTests, unittest.TestCase): backend = SystemTapBackend() diff --git a/Lib/test/test_exception_group.py b/Lib/test/test_exception_group.py index 507bbc2ec..1e1c43a6b 100644 --- a/Lib/test/test_exception_group.py +++ b/Lib/test/test_exception_group.py @@ -1,4 +1,4 @@ -import collections.abc +import collections import types import unittest from test.support import skip_emscripten_stack_overflow, skip_wasi_stack_overflow, exceeds_recursion_limit @@ -194,6 +194,79 @@ class StrAndReprTests(unittest.TestCase): "MyEG('flat', [ValueError(1), TypeError(2)]), " "TypeError(2)])")) + @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: Tuples differ: ('test', (ValueError(1), TypeError(2))) != ('test', []) + def test_exceptions_mutation(self): + class MyEG(ExceptionGroup): + pass + + excs = [ValueError(1), TypeError(2)] + eg = MyEG('test', excs) + + self.assertEqual(repr(eg), "MyEG('test', [ValueError(1), TypeError(2)])") + excs.clear() + + # Ensure that clearing the exceptions sequence doesn't change the repr. + self.assertEqual(repr(eg), "MyEG('test', [ValueError(1), TypeError(2)])") + + # Ensure that the args are still as passed. + self.assertEqual(eg.args, ('test', [])) + + excs = (ValueError(1), KeyboardInterrupt(2)) + eg = BaseExceptionGroup('test', excs) + + # Ensure that immutable sequences still work fine. + self.assertEqual( + repr(eg), + "BaseExceptionGroup('test', (ValueError(1), KeyboardInterrupt(2)))" + ) + + # Test non-standard custom sequences. + excs = collections.deque([ValueError(1), TypeError(2)]) + eg = ExceptionGroup('test', excs) + + self.assertEqual( + repr(eg), + "ExceptionGroup('test', deque([ValueError(1), TypeError(2)]))" + ) + excs.clear() + + # Ensure that clearing the exceptions sequence doesn't change the repr. + self.assertEqual( + repr(eg), + "ExceptionGroup('test', deque([ValueError(1), TypeError(2)]))" + ) + + @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: TypeError not raised + def test_repr_raises(self): + class MySeq(collections.abc.Sequence): + def __init__(self, raises): + self.raises = raises + + def __len__(self): + return 1 + + def __getitem__(self, index): + if index == 0: + return ValueError(1) + raise IndexError + + def __repr__(self): + if self.raises: + raise self.raises + return None + + seq = MySeq(None) + with self.assertRaisesRegex( + TypeError, + r"__repr__ returned non-string \(type NoneType\)" + ): + ExceptionGroup("test", seq) + + seq = MySeq(ValueError) + with self.assertRaises(ValueError): + BaseExceptionGroup("test", seq) + + def create_simple_eg(): excs = [] diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py index 7e79732a3..621c9d823 100644 --- a/Lib/test/test_exceptions.py +++ b/Lib/test/test_exceptions.py @@ -2528,6 +2528,31 @@ class SyntaxErrorTests(unittest.TestCase): args = ("bad.py", 1, 2, "abcdefg", 1) self.assertRaises(TypeError, SyntaxError, "bad bad", args) + @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: 2 is not None + def test_syntax_error_memory_leak(self): + # gh-146250: memory leak with re-initialization of SyntaxError + e = SyntaxError("msg", ("file.py", 1, 2, "txt", 2, 3)) + e.__init__("new_msg", ("new_file.py", 2, 3, "new_txt", 3, 4)) + self.assertEqual(e.msg, "new_msg") + self.assertEqual(e.args, ("new_msg", ("new_file.py", 2, 3, "new_txt", 3, 4))) + self.assertEqual(e.filename, "new_file.py") + self.assertEqual(e.lineno, 2) + self.assertEqual(e.offset, 3) + self.assertEqual(e.text, "new_txt") + self.assertEqual(e.end_lineno, 3) + self.assertEqual(e.end_offset, 4) + + e = SyntaxError("msg", ("file.py", 1, 2, "txt", 2, 3)) + e.__init__("new_msg", ("new_file.py", 2, 3, "new_txt")) + self.assertEqual(e.msg, "new_msg") + self.assertEqual(e.args, ("new_msg", ("new_file.py", 2, 3, "new_txt"))) + self.assertEqual(e.filename, "new_file.py") + self.assertEqual(e.lineno, 2) + self.assertEqual(e.offset, 3) + self.assertEqual(e.text, "new_txt") + self.assertIsNone(e.end_lineno) + self.assertIsNone(e.end_offset) + class TestInvalidExceptionMatcher(unittest.TestCase): def test_except_star_invalid_exception_type(self): diff --git a/Lib/test/test_fileutils.py b/Lib/test/test_fileutils.py new file mode 100644 index 000000000..ff13498fb --- /dev/null +++ b/Lib/test/test_fileutils.py @@ -0,0 +1,30 @@ +# Run tests for functions in Python/fileutils.c. + +import os +import os.path +import unittest +from test.support import import_helper + +# Skip this test if the _testcapi module isn't available. +_testcapi = import_helper.import_module('_testinternalcapi') + + +class PathTests(unittest.TestCase): + + def test_capi_normalize_path(self): + if os.name == 'nt': + raise unittest.SkipTest('Windows has its own helper for this') + else: + from test.test_posixpath import PosixPathTest as posixdata + tests = posixdata.NORMPATH_CASES + for filename, expected in tests: + if not os.path.isabs(filename): + continue + with self.subTest(filename): + result = _testcapi.normalize_path(filename) + self.assertEqual(result, expected, + msg=f'input: {filename!r} expected output: {expected!r}') + + +if __name__ == "__main__": + unittest.main() diff --git a/Lib/test/test_zipimport_support.py b/Lib/test/test_zipimport_support.py index c9cd182d6..23bbd6c88 100644 --- a/Lib/test/test_zipimport_support.py +++ b/Lib/test/test_zipimport_support.py @@ -37,9 +37,8 @@ from test.test_doctest import (test_doctest, def _run_object_doctest(obj, module): from test.support.rustpython import DocTestChecker # TODO: RUSTPYTHON finder = doctest.DocTestFinder(verbose=verbose, recurse=False) - # TODO: RUSTPYTHON - # runner = doctest.DocTestRunner(verbose=verbose) - runner = doctest.DocTestRunner(verbose=verbose, checker=DocTestChecker()) + runner = doctest.DocTestRunner(verbose=verbose) + runner = doctest.DocTestRunner(verbose=verbose, checker=DocTestChecker()) # TODO: RUSTPYTHON # Use the object's fully qualified name if it has one # Otherwise, use the module's name try: From ab3d0504858411879c5ac105d60345895fb82832 Mon Sep 17 00:00:00 2001 From: Bas Schoenmaeckers <7943856+bschoenmaeckers@users.noreply.github.com> Date: Thu, 25 Jun 2026 15:34:14 +0200 Subject: [PATCH 149/339] Add allocator functions to c-api (#8168) --- .cspell.dict/cpython.txt | 1 + Cargo.lock | 1 + crates/capi/Cargo.toml | 1 + crates/capi/src/lib.rs | 1 + crates/capi/src/pymem.rs | 46 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 50 insertions(+) create mode 100644 crates/capi/src/pymem.rs diff --git a/.cspell.dict/cpython.txt b/.cspell.dict/cpython.txt index 84265bda6..e5b31b57f 100644 --- a/.cspell.dict/cpython.txt +++ b/.cspell.dict/cpython.txt @@ -192,6 +192,7 @@ pyerrors Pyfunc pylifecycle pymain +pymem pyrepl pystate PYTHONTRACEMALLOC diff --git a/Cargo.lock b/Cargo.lock index 743e293f1..bd10622e6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3447,6 +3447,7 @@ version = "0.5.0" dependencies = [ "bitflags 2.13.0", "itertools 0.14.0", + "libc", "num-complex", "pyo3", "rustpython-pylib", diff --git a/crates/capi/Cargo.toml b/crates/capi/Cargo.toml index 601989faa..878620ebe 100644 --- a/crates/capi/Cargo.toml +++ b/crates/capi/Cargo.toml @@ -14,6 +14,7 @@ crate-type = ["cdylib", "rlib"] [dependencies] bitflags = { workspace = true } itertools = { workspace = true } +libc = { workspace = true } num-complex = { workspace = true } rustpython-vm = { workspace = true, features = ["threading", "compiler", "importlib", "host_env"] } rustpython-stdlib = {workspace = true, features = ["threading"] } diff --git a/crates/capi/src/lib.rs b/crates/capi/src/lib.rs index fb3bc687f..638a78d63 100644 --- a/crates/capi/src/lib.rs +++ b/crates/capi/src/lib.rs @@ -26,6 +26,7 @@ pub mod object; pub mod pycapsule; pub mod pyerrors; pub mod pylifecycle; +pub mod pymem; pub mod pystate; pub mod refcount; pub mod setobject; diff --git a/crates/capi/src/pymem.rs b/crates/capi/src/pymem.rs new file mode 100644 index 000000000..6c8b66f5d --- /dev/null +++ b/crates/capi/src/pymem.rs @@ -0,0 +1,46 @@ +use core::ffi::c_void; + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyMem_Malloc(n: usize) -> *mut c_void { + unsafe { libc::malloc(if n == 0 { 1 } else { n }) } +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyMem_Calloc(nelem: usize, elsize: usize) -> *mut c_void { + unsafe { + libc::calloc( + if nelem == 0 || elsize == 0 { 1 } else { nelem }, + if nelem == 0 || elsize == 0 { 1 } else { elsize }, + ) + } +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyMem_Realloc(ptr: *mut c_void, new_size: usize) -> *mut c_void { + unsafe { libc::realloc(ptr, if new_size == 0 { 1 } else { new_size }) } +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyMem_Free(ptr: *mut c_void) { + unsafe { libc::free(ptr) } +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyMem_RawMalloc(n: usize) -> *mut c_void { + unsafe { libc::malloc(n) } +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyMem_RawCalloc(nelem: usize, elsize: usize) -> *mut c_void { + unsafe { libc::calloc(nelem, elsize) } +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyMem_RawRealloc(ptr: *mut c_void, new_size: usize) -> *mut c_void { + unsafe { libc::realloc(ptr, new_size) } +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyMem_RawFree(ptr: *mut c_void) { + unsafe { libc::free(ptr) } +} From 473ba7391ac3a9a306e0d2014fa93a81f26fabc0 Mon Sep 17 00:00:00 2001 From: Bas Schoenmaeckers <7943856+bschoenmaeckers@users.noreply.github.com> Date: Thu, 25 Jun 2026 15:35:04 +0200 Subject: [PATCH 150/339] Add more mapping functions to c-api (#8169) --- crates/capi/src/abstract_/mapping.rs | 157 +++++++++++++++++++++++++++ 1 file changed, 157 insertions(+) diff --git a/crates/capi/src/abstract_/mapping.rs b/crates/capi/src/abstract_/mapping.rs index 18b188613..143d5a977 100644 --- a/crates/capi/src/abstract_/mapping.rs +++ b/crates/capi/src/abstract_/mapping.rs @@ -1,4 +1,15 @@ use crate::{PyObject, pystate::with_vm}; +use core::ffi::{CStr, c_char, c_int}; +use rustpython_vm::AsObject; + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyMapping_Check(obj: *mut PyObject) -> c_int { + with_vm(|_vm| { + let obj = unsafe { &*obj }; + Ok(obj.mapping_unchecked().check()) + }) +} + #[unsafe(no_mangle)] pub unsafe extern "C" fn PyMapping_Size(obj: *mut PyObject) -> isize { with_vm(|vm| { @@ -7,6 +18,11 @@ pub unsafe extern "C" fn PyMapping_Size(obj: *mut PyObject) -> isize { }) } +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyMapping_Length(obj: *mut PyObject) -> isize { + unsafe { PyMapping_Size(obj) } +} + #[unsafe(no_mangle)] pub unsafe extern "C" fn PyMapping_Keys(obj: *mut PyObject) -> *mut PyObject { with_vm(|vm| { @@ -37,6 +53,147 @@ pub unsafe extern "C" fn PyMapping_Items(obj: *mut PyObject) -> *mut PyObject { }) } +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyMapping_GetItemString( + obj: *mut PyObject, + key: *const c_char, +) -> *mut PyObject { + with_vm(|vm| { + let obj = unsafe { &*obj }; + let key = unsafe { CStr::from_ptr(key) } + .to_str() + .map_err(|_| vm.new_value_error("mapping key must be valid UTF-8"))?; + obj.get_item(key, vm) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyMapping_GetOptionalItem( + obj: *mut PyObject, + key: *mut PyObject, + result: *mut *mut PyObject, +) -> c_int { + with_vm(|vm| { + unsafe { + *result = core::ptr::null_mut(); + } + let obj = unsafe { &*obj }; + let key = unsafe { &*key }; + + match obj.get_item(key, vm) { + Ok(value) => { + unsafe { + *result = value.into_raw().as_ptr(); + } + Ok(true) + } + Err(err) if err.fast_isinstance(vm.ctx.exceptions.key_error) => Ok(false), + Err(err) => Err(err), + } + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyMapping_GetOptionalItemString( + obj: *mut PyObject, + key: *const c_char, + result: *mut *mut PyObject, +) -> c_int { + with_vm(|vm| { + unsafe { + *result = core::ptr::null_mut(); + } + let obj = unsafe { &*obj }; + let key = unsafe { CStr::from_ptr(key) } + .to_str() + .map_err(|_| vm.new_value_error("mapping key must be valid UTF-8"))?; + + match obj.get_item(key, vm) { + Ok(value) => { + unsafe { + *result = value.into_raw().as_ptr(); + } + Ok(true) + } + Err(err) if err.fast_isinstance(vm.ctx.exceptions.key_error) => Ok(false), + Err(err) => Err(err), + } + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyMapping_HasKey(obj: *mut PyObject, key: *mut PyObject) -> c_int { + with_vm(|vm| { + let obj = unsafe { &*obj }; + let key = unsafe { &*key }; + obj.get_item(key, vm).is_ok() + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyMapping_HasKeyString(obj: *mut PyObject, key: *const c_char) -> c_int { + with_vm(|vm| { + let obj = unsafe { &*obj }; + if let Ok(key) = unsafe { CStr::from_ptr(key) }.to_str() { + obj.get_item(key, vm).is_ok() + } else { + false + } + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyMapping_HasKeyWithError( + obj: *mut PyObject, + key: *mut PyObject, +) -> c_int { + with_vm(|vm| { + let obj = unsafe { &*obj }; + let key = unsafe { &*key }; + + match obj.get_item(key, vm) { + Ok(_) => Ok(true), + Err(err) if err.fast_isinstance(vm.ctx.exceptions.key_error) => Ok(false), + Err(err) => Err(err), + } + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyMapping_HasKeyStringWithError( + obj: *mut PyObject, + key: *const c_char, +) -> c_int { + with_vm(|vm| { + let obj = unsafe { &*obj }; + let key = unsafe { CStr::from_ptr(key) } + .to_str() + .map_err(|_| vm.new_value_error("mapping key must be valid UTF-8"))?; + + match obj.get_item(key, vm) { + Ok(_) => Ok(true), + Err(err) if err.fast_isinstance(vm.ctx.exceptions.key_error) => Ok(false), + Err(err) => Err(err), + } + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyMapping_SetItemString( + obj: *mut PyObject, + key: *const c_char, + value: *mut PyObject, +) -> c_int { + with_vm(|vm| { + let obj = unsafe { &*obj }; + let key = unsafe { CStr::from_ptr(key) } + .to_str() + .map_err(|_| vm.new_value_error("mapping key must be valid UTF-8"))?; + let value = unsafe { &*value }.to_owned(); + obj.set_item(key, value, vm) + }) +} + #[cfg(false)] mod tests { use pyo3::prelude::*; From a1ba6a662cff93e66582de8e1e44b367c01824b7 Mon Sep 17 00:00:00 2001 From: "Jeong, YunWon" <69878+youknowone@users.noreply.github.com> Date: Fri, 26 Jun 2026 18:22:08 +0900 Subject: [PATCH 151/339] Align compiler and AST behavior with CPython (#8138) * Align compiler and AST behavior with CPython Update the compiler pipeline, AST module support, and related VM compile/eval paths toward CPython 3.14 behavior. Use upstream Ruff parser crates directly and keep RustPython-specific syntax preflight handling in the compile path. Refresh opcode metadata, snapshots, and targeted tests for the aligned bytecode and AST behavior. * fix * Fix PR 8138 CI failures * Fix match mapping wildcard scan complexity * fixes * Use Ruff runtime AST fields * Minimize residual patch diff * refactor error handling * Remove _ast conversion context wrappers * Clean up _ast conversion glue and compiler warning escalation Rename the Node conversion parameter `ctx` to `vm` throughout the _ast module. Remove the unused compile_program, compile_program_single, compile_block_expression, and compile_expression forwarders; compile_top stays as the entry point. Stash an escalated compiler SyntaxWarning so a non-SyntaxWarning category propagates unchanged instead of being rewritten to SyntaxError, matching PyErr_ExceptionMatches(SyntaxWarning) in compiler_warn. Drop the now-unused CompileWarningError::into_codegen_error. Replace the PositionalArguments two-variant enum with a struct holding a shared range and a PositionalArgumentsKind enum. Assisted-by: Claude * Represent compiler flags as a CompilerFlags bitflags Replace the loose PY_CF_*/CO_* i32 constants in compile_mode with a CompilerFlags bitflags covering the PyCF_* flags and __future__ CO_FUTURE_* bits. The Python-visible ast.PyCF_* attribute values are derived from it via bits(); parser input modes stay plain consts. builtins::compile and the compile_string flag handling test flags through CompilerFlags::contains instead of raw bit math. Assisted-by: Claude * Fix PR 8138 test regressions * Fix PR 8138 CI failures * Avoid shell interpolation in Linux deps action * Fix review findings in compiler/AST changes - frame.rs: compute the MATCH_CLASS class name lazily so a successful match no longer takes the type name lock or allocates; the __match_args__-not-a-tuple branch reuses it instead of recomputing. - _ast/constant.rs: add the missing leading space to the with_recursion label ("maximum recursion depth exceeded during compilation"). - sys.set_int_max_str_digits: restore the "maxdigits must be 0 or larger than {n}" error text. - codegen: set CO_MAXBLOCKS to 20 in both ir.rs and compile.rs. - _ast/exception.rs: extract the duplicated excepthandler node guard into ensure_excepthandler_node. - codegen: correct the validate_keywords doc comment. - Drop redundant "CPython" qualifiers from comments added in this branch. Assisted-by: Claude --- .cspell.json | 3 + .github/actions/install-linux-deps/action.yml | 39 +- Cargo.lock | 33 +- Cargo.toml | 19 +- Lib/test/test_ast/test_ast.py | 10 - Lib/test/test_audit.py | 1 - Lib/test/test_builtin.py | 3 - Lib/test/test_cmd_line_script.py | 1 - Lib/test/test_codeop.py | 1 - Lib/test/test_compile.py | 12 - Lib/test/test_exceptions.py | 1 - Lib/test/test_fstring.py | 5 - Lib/test/test_future_stmt/test_future.py | 5 - Lib/test/test_genexps.py | 2 +- Lib/test/test_global.py | 4 - Lib/test/test_grammar.py | 11 - Lib/test/test_listcomps.py | 1 - Lib/test/test_named_expressions.py | 5 - Lib/test/test_patma.py | 14 - Lib/test/test_pdb.py | 6 +- Lib/test/test_peepholer.py | 1 - Lib/test/test_pep646_syntax.py | 2 +- Lib/test/test_pydoc/test_pydoc.py | 1 - Lib/test/test_pyrepl/test_interact.py | 7 - Lib/test/test_pyrepl/test_pyrepl.py | 10 - Lib/test/test_pyrepl/test_reader.py | 1 - Lib/test/test_repl.py | 1 - Lib/test/test_symtable.py | 1 - Lib/test/test_syntax.py | 307 +- Lib/test/test_sys_setprofile.py | 1 - Lib/test/test_type_comments.py | 15 - Lib/test/test_type_params.py | 3 - Lib/test/test_unpack_ex.py | 8 +- crates/capi/src/ceval.rs | 34 +- crates/capi/src/unicodeobject.rs | 54 +- crates/codegen/src/compile.rs | 7554 +++++++++++++---- crates/codegen/src/error.rs | 60 +- crates/codegen/src/ir.rs | 438 +- crates/codegen/src/lib.rs | 86 +- crates/codegen/src/preprocess.rs | 794 +- crates/codegen/src/symboltable.rs | 3311 +++++--- crates/codegen/src/unparse.rs | 106 +- crates/compiler-core/src/bytecode.rs | 7 + .../compiler-core/src/bytecode/instruction.rs | 25 +- crates/compiler-core/src/bytecode/oparg.rs | 7 +- crates/compiler/src/lib.rs | 5205 +++++++++++- crates/stdlib/src/_opcode.rs | 4 +- ...k_attribute_and_subscript_expressions.snap | 3 +- ...n_stdlib___opcode__tests__const_no_op.snap | 3 +- ...nt_true_if_pass_keeps_line_anchor_nop.snap | 3 +- ...ython_stdlib___opcode__tests__if_ands.snap | 3 +- ...thon_stdlib___opcode__tests__if_mixed.snap | 3 +- ...python_stdlib___opcode__tests__if_ors.snap | 3 +- ...tdlib___opcode__tests__nested_bool_op.snap | 3 +- crates/vm/Cargo.toml | 1 + crates/vm/src/builtins/type.rs | 78 +- crates/vm/src/eval.rs | 2 +- crates/vm/src/exceptions.rs | 18 +- crates/vm/src/frame.rs | 92 +- crates/vm/src/import.rs | 4 +- crates/vm/src/object/core.rs | 3 + crates/vm/src/protocol/callable.rs | 6 +- crates/vm/src/stdlib/_abc.rs | 21 +- crates/vm/src/stdlib/_ast.rs | 1952 ++++- crates/vm/src/stdlib/_ast/argument.rs | 133 +- crates/vm/src/stdlib/_ast/basic.rs | 10 +- crates/vm/src/stdlib/_ast/constant.rs | 537 +- crates/vm/src/stdlib/_ast/elif_else_clause.rs | 53 +- crates/vm/src/stdlib/_ast/exception.rs | 99 +- crates/vm/src/stdlib/_ast/expression.rs | 1326 +-- crates/vm/src/stdlib/_ast/module.rs | 167 +- crates/vm/src/stdlib/_ast/node.rs | 61 +- crates/vm/src/stdlib/_ast/operator.rs | 176 +- crates/vm/src/stdlib/_ast/other.rs | 29 +- crates/vm/src/stdlib/_ast/parameter.rs | 236 +- crates/vm/src/stdlib/_ast/pattern.rs | 575 +- crates/vm/src/stdlib/_ast/pyast.rs | 104 +- crates/vm/src/stdlib/_ast/python.rs | 276 +- crates/vm/src/stdlib/_ast/repr.rs | 36 +- crates/vm/src/stdlib/_ast/statement.rs | 1795 ++-- crates/vm/src/stdlib/_ast/string.rs | 557 +- crates/vm/src/stdlib/_ast/type_ignore.rs | 33 +- crates/vm/src/stdlib/_ast/type_parameters.rs | 210 +- crates/vm/src/stdlib/_ast/validate.rs | 445 +- crates/vm/src/stdlib/_symtable.rs | 2 + crates/vm/src/stdlib/builtins.rs | 711 +- crates/vm/src/stdlib/sys.rs | 55 +- crates/vm/src/stdlib/sys/monitoring.rs | 4 +- crates/vm/src/vm/compile.rs | 967 ++- crates/vm/src/vm/compile_mode.rs | 83 + crates/vm/src/vm/interpreter.rs | 6 +- crates/vm/src/vm/mod.rs | 73 +- crates/vm/src/vm/python_run.rs | 18 +- crates/vm/src/vm/thread.rs | 1 + crates/vm/src/vm/vm_new.rs | 106 +- crates/wasm/Cargo.toml | 1 + crates/wasm/src/lib.rs | 6 +- crates/wasm/src/vm_class.rs | 71 +- examples/hello_embed.rs | 2 +- examples/mini_repl.rs | 2 +- examples/parse_folder.rs | 2 +- extra_tests/snippets/builtin_compile.py | 101 + ruff.toml | 3 + src/shell.rs | 19 +- .../generate_rs_opcode_metadata.py | 1 + 105 files changed, 22864 insertions(+), 6645 deletions(-) create mode 100644 crates/vm/src/vm/compile_mode.rs diff --git a/.cspell.json b/.cspell.json index 21199c0c5..af2f1401d 100644 --- a/.cspell.json +++ b/.cspell.json @@ -66,8 +66,11 @@ "deoptimize", "emscripten", "excs", + "flufl", "fnfe", + "fsdefault", "ifexp", + "implicits", "interps", "jitted", "jitting", diff --git a/.github/actions/install-linux-deps/action.yml b/.github/actions/install-linux-deps/action.yml index 7900060fb..46ce74d50 100644 --- a/.github/actions/install-linux-deps/action.yml +++ b/.github/actions/install-linux-deps/action.yml @@ -39,11 +39,36 @@ runs: - name: Install Linux dependencies shell: bash if: ${{ runner.os == 'Linux' }} - run: > - sudo apt-get update + env: + GCC_MULTILIB: ${{ inputs.gcc-multilib }} + MUSL_TOOLS: ${{ inputs.musl-tools }} + CLANG: ${{ inputs.clang }} + GCC_AARCH64_LINUX_GNU: ${{ inputs.gcc-aarch64-linux-gnu }} + run: | + if ! sudo apt-get update; then + echo "::warning::apt-get update failed; disabling nonessential Microsoft apt sources and retrying" + for source in /etc/apt/sources.list.d/*microsoft* /etc/apt/sources.list.d/*azure-cli*; do + if [ -e "$source" ]; then + sudo mv "$source" "$source.disabled" + fi + done + sudo apt-get update + fi - sudo apt-get install --no-install-recommends - ${{ fromJSON(inputs.gcc-multilib) && 'gcc-multilib' || '' }} - ${{ fromJSON(inputs.musl-tools) && 'musl-tools' || '' }} - ${{ fromJSON(inputs.clang) && 'clang' || '' }} - ${{ fromJSON(inputs.gcc-aarch64-linux-gnu) && 'gcc-aarch64-linux-gnu linux-libc-dev-arm64-cross libc6-dev-arm64-cross' || '' }} + packages=() + if [[ "$GCC_MULTILIB" == "true" ]]; then + packages+=(gcc-multilib) + fi + if [[ "$MUSL_TOOLS" == "true" ]]; then + packages+=(musl-tools) + fi + if [[ "$CLANG" == "true" ]]; then + packages+=(clang) + fi + if [[ "$GCC_AARCH64_LINUX_GNU" == "true" ]]; then + packages+=(gcc-aarch64-linux-gnu linux-libc-dev-arm64-cross libc6-dev-arm64-cross) + fi + + if ((${#packages[@]})); then + sudo apt-get install --no-install-recommends "${packages[@]}" + fi diff --git a/Cargo.lock b/Cargo.lock index bd10622e6..e6a4194a0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3631,9 +3631,8 @@ dependencies = [ [[package]] name = "rustpython-ruff_python_ast" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f021ff72cabf5e2cd6d8ec8813d376a8445a228dc610ab56c27bd9054cda70d4" +version = "0.15.9" +source = "git+https://github.com/RustPython/ruff.git?tag=0.15.19-rustpython#3c1ab2dd9987f190f3df94d28452ed5e65e106af" dependencies = [ "aho-corasick", "bitflags 2.13.0", @@ -3650,9 +3649,8 @@ dependencies = [ [[package]] name = "rustpython-ruff_python_parser" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01e6ee78bd9671fb5766664b2695fe1f2a92a961f4d9101646c570d8acdb1e0b" +version = "0.15.9" +source = "git+https://github.com/RustPython/ruff.git?tag=0.15.19-rustpython#3c1ab2dd9987f190f3df94d28452ed5e65e106af" dependencies = [ "bitflags 2.13.0", "bstr", @@ -3671,9 +3669,8 @@ dependencies = [ [[package]] name = "rustpython-ruff_python_trivia" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e7cfd1056f3a02ff0d2d0e4474286ca963260782f878b7b81c1dd87432e682" +version = "0.15.9" +source = "git+https://github.com/RustPython/ruff.git?tag=0.15.19-rustpython#3c1ab2dd9987f190f3df94d28452ed5e65e106af" dependencies = [ "itertools 0.14.0", "rustpython-ruff_source_file", @@ -3683,9 +3680,8 @@ dependencies = [ [[package]] name = "rustpython-ruff_source_file" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "948107aad62ddb12a11fc7bf68a49e52a0b0a3737d415a2505e54f5a9edac737" +version = "0.15.9" +source = "git+https://github.com/RustPython/ruff.git?tag=0.15.19-rustpython#3c1ab2dd9987f190f3df94d28452ed5e65e106af" dependencies = [ "memchr", "rustpython-ruff_text_size", @@ -3693,9 +3689,8 @@ dependencies = [ [[package]] name = "rustpython-ruff_text_size" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8291ee0f5a779e54ccd4e0151a0c426f8b49a123f99b5b6545db17ccdd4277aa" +version = "0.15.9" +source = "git+https://github.com/RustPython/ruff.git?tag=0.15.19-rustpython#3c1ab2dd9987f190f3df94d28452ed5e65e106af" dependencies = [ "get-size2", ] @@ -3855,6 +3850,7 @@ dependencies = [ "static_assertions", "strum", "strum_macros", + "thin-vec", "thiserror", "timsort", "wasm-bindgen", @@ -3881,6 +3877,7 @@ dependencies = [ "js-sys", "rustpython-common", "rustpython-pylib", + "rustpython-ruff_text_size", "rustpython-stdlib", "rustpython-vm", "serde-wasm-bindgen", @@ -4363,6 +4360,12 @@ version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c13547615a44dc9c452a8a534638acdf07120d4b6847c8178705da06306a3057" +[[package]] +name = "thin-vec" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0f7e269b48f0a7dd0146680fa24b50cc67fc0373f086a5b2f99bd084639b482" + [[package]] name = "thiserror" version = "2.0.18" diff --git a/Cargo.toml b/Cargo.toml index 677de28ef..4781c95e1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -183,19 +183,11 @@ rustpython-sre_engine = { path = "crates/sre_engine", version = "0.5.0" } rustpython-wtf8 = { path = "crates/wtf8", version = "0.5.0" } rustpython-doc = { path = "crates/doc", version = "0.5.0" } -# Use RustPython-packaged Ruff crates from the published fork while keeping -# existing crate names in the codebase. -ruff_python_parser = { package = "rustpython-ruff_python_parser", version = "0.15.8" } -ruff_python_ast = { package = "rustpython-ruff_python_ast", version = "0.15.8" } -ruff_text_size = { package = "rustpython-ruff_text_size", version = "0.15.8" } -ruff_source_file = { package = "rustpython-ruff_source_file", version = "0.15.8" } -# To update ruff crates, comment out the above lines and uncomment the following lines to pull directly from the Ruff repository at the specified commit hash. -# Ruff tag 0.15.8 is based on commit c2a8815842f9dc5d24ec19385eae0f1a7188b0d9 -# at the time of this capture. We use the commit hash to ensure reproducible builds. -# ruff_python_parser = { git = "https://github.com/astral-sh/ruff.git", rev = "c2a8815842f9dc5d24ec19385eae0f1a7188b0d9" } -# ruff_python_ast = { git = "https://github.com/astral-sh/ruff.git", rev = "c2a8815842f9dc5d24ec19385eae0f1a7188b0d9" } -# ruff_text_size = { git = "https://github.com/astral-sh/ruff.git", rev = "c2a8815842f9dc5d24ec19385eae0f1a7188b0d9" } -# ruff_source_file = { git = "https://github.com/astral-sh/ruff.git", rev = "c2a8815842f9dc5d24ec19385eae0f1a7188b0d9" } +# Use the RustPython Ruff fork for RustPython public `_ast` metadata. +ruff_python_parser = { package = "rustpython-ruff_python_parser", git = "https://github.com/RustPython/ruff.git", tag = "0.15.19-rustpython" } +ruff_python_ast = { package = "rustpython-ruff_python_ast", git = "https://github.com/RustPython/ruff.git", tag = "0.15.19-rustpython" } +ruff_text_size = { package = "rustpython-ruff_text_size", git = "https://github.com/RustPython/ruff.git", tag = "0.15.19-rustpython" } +ruff_source_file = { package = "rustpython-ruff_source_file", git = "https://github.com/RustPython/ruff.git", tag = "0.15.19-rustpython" } der = { version = "0.8", features = ["alloc", "oid", "pem", "zeroize"] } phf = { version = "0.13.1", default-features = false, features = ["macros"]} @@ -311,6 +303,7 @@ tcl-sys = { git = "https://github.com/arihant2math/tkinter.git", tag = "v0.2.0" textwrap = { version = "0.16.2", default-features = false } termios = "0.3.3" thiserror = "2.0" +thin-vec = "0.2.14" timsort = "0.1.2" tk-sys = { git = "https://github.com/arihant2math/tkinter.git", tag = "v0.2.0" } icu_casemap = "2" diff --git a/Lib/test/test_ast/test_ast.py b/Lib/test/test_ast/test_ast.py index 00283ca05..31fd62964 100644 --- a/Lib/test/test_ast/test_ast.py +++ b/Lib/test/test_ast/test_ast.py @@ -150,7 +150,6 @@ class AST_Tests(unittest.TestCase): self.assertRaises(TypeError, ast.parse, ast.Constant(42), optimize=optval) - @unittest.expectedFailure # TODO: RUSTPYTHON; ValueError: compile() unrecognized flags def test_optimization_levels__debug__(self): cases = [(-1, '__debug__'), (0, '__debug__'), (1, False), (2, False)] for (optval, expected) in cases: @@ -586,7 +585,6 @@ class AST_Tests(unittest.TestCase): compile(m, "<test>", "exec") self.assertIn("but got expr()", str(cm.exception)) - @unittest.expectedFailure # TODO: RUSTPYTHON; ValueError: expected str for name def test_invalid_identifier(self): m = ast.Module([ast.Expr(ast.Name(42, ast.Load()))], []) ast.fix_missing_locations(m) @@ -1365,7 +1363,6 @@ class CopyTests(unittest.TestCase): self.assertIs(repl.ctx, context) self.assertRaises(AttributeError, getattr, repl, 'extra') - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: "Name\.__replace__\ missing\ 1\ keyword\ argument:\ 'id'\." does not match "replace() does not support Name objects" def test_replace_reject_missing_field(self): # case: warn if deleted field is not replaced node = ast.parse('x').body[0].value @@ -1700,7 +1697,6 @@ Module( full="Module(body=[Import(names=[alias(name='_ast', asname='ast')]), ImportFrom(module='module', names=[alias(name='sub')], level=0)], type_ignores=[])", ) - @unittest.expectedFailure # TODO: RUSTPYTHON; ? ^^^^^^^^^ ^^^^^^^^^ def test_copy_location(self): src = ast.parse('1 + 1', mode='eval') src.body.right = ast.copy_location(ast.Constant(2), src.body.right) @@ -1737,7 +1733,6 @@ Module( "end_col_offset=0), lineno=1, col_offset=0, end_lineno=1, end_col_offset=0)])" ) - @unittest.expectedFailure # TODO: RUSTPYTHON; ? ^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ def test_increment_lineno(self): src = ast.parse('1 + 1', mode='eval') self.assertEqual(ast.increment_lineno(src, n=3), src) @@ -1959,7 +1954,6 @@ Module( (\ \ ''') - @unittest.expectedFailure # TODO: RUSTPYTHON; TypeError: required field "lineno" missing from alias def test_bad_integer(self): # issue13436: Bad error message with invalid numeric values body = [ast.ImportFrom(module='time', @@ -3259,7 +3253,6 @@ class ASTConstructorTests(unittest.TestCase): r"MyAttrs.__init__ got an unexpected keyword argument 'c'."): obj = MyAttrs(c=3) - @unittest.expectedFailure # TODO: RUSTPYTHON; DeprecationWarning not triggered def test_fields_and_types_no_default(self): class FieldsAndTypesNoDefault(ast.AST): _fields = ('a',) @@ -3273,7 +3266,6 @@ class ASTConstructorTests(unittest.TestCase): obj = FieldsAndTypesNoDefault(a=1) self.assertEqual(obj.a, 1) - @unittest.expectedFailure # TODO: RUSTPYTHON; DeprecationWarning not triggered def test_incomplete_field_types(self): class MoreFieldsThanTypes(ast.AST): _fields = ('a', 'b') @@ -3293,7 +3285,6 @@ class ASTConstructorTests(unittest.TestCase): self.assertEqual(obj.a, 1) self.assertEqual(obj.b, 2) - @unittest.expectedFailure # TODO: RUSTPYTHON; TypeError: Expected type 'str' but 'bytes' found. def test_malformed_fields_with_bytes(self): class BadFields(ast.AST): _fields = (b'\xff'*64,) @@ -3713,7 +3704,6 @@ class ASTOptimizationTests(unittest.TestCase): f"{ast.dump(optimized_tree)}", ) - @unittest.expectedFailure # TODO: RUSTPYTHON; ValueError: compile() unrecognized flags def test_folding_format(self): code = "'%s' % (a,)" diff --git a/Lib/test/test_audit.py b/Lib/test/test_audit.py index d01d36ad3..690a6e743 100644 --- a/Lib/test/test_audit.py +++ b/Lib/test/test_audit.py @@ -77,7 +77,6 @@ class AuditTest(unittest.TestCase): def test_open(self): self.do_test("test_open", os_helper.TESTFN) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_cantrace(self): self.do_test("test_cantrace") diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py index 163ebcfb5..10783cf33 100644 --- a/Lib/test/test_builtin.py +++ b/Lib/test/test_builtin.py @@ -486,7 +486,6 @@ class BuiltinTest(ComplexesAreIdenticalMixin, unittest.TestCase): msg=f"source={source} mode={mode}") - @unittest.expectedFailure # TODO: RUSTPYTHON def test_compile_top_level_await(self): """Test whether code with top level await can be compiled. @@ -627,7 +626,6 @@ class BuiltinTest(ComplexesAreIdenticalMixin, unittest.TestCase): exec(co, glob) self.assertEqual(type(glob['ticker']()), AsyncGeneratorType) - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: <_ast.Name object at 0xb40000731e3d1360> is not an instance of <class '_ast.Constant'> def test_compile_ast(self): args = ("a*__debug__", "f.py", "exec") raw = compile(*args, flags = ast.PyCF_ONLY_AST).body[0] @@ -1020,7 +1018,6 @@ class BuiltinTest(ComplexesAreIdenticalMixin, unittest.TestCase): finally: sys.stdout = savestdout - @unittest.expectedFailure # TODO: RUSTPYTHON; TypeError: Unexpected keyword argument closure def test_exec_closure(self): def function_without_closures(): return 3 * 5 diff --git a/Lib/test/test_cmd_line_script.py b/Lib/test/test_cmd_line_script.py index 8b8c452f6..16df318ae 100644 --- a/Lib/test/test_cmd_line_script.py +++ b/Lib/test/test_cmd_line_script.py @@ -645,7 +645,6 @@ class CmdLineTest(unittest.TestCase): self.assertNotIn("\f", text) self.assertIn("\n 1 + 1 = 2\n ^^^^^\n", text) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_syntaxerror_multi_line_fstring(self): script = 'foo = f"""{}\nfoo"""\n' with os_helper.temp_dir() as script_dir: diff --git a/Lib/test/test_codeop.py b/Lib/test/test_codeop.py index 129761222..2e1568d5e 100644 --- a/Lib/test/test_codeop.py +++ b/Lib/test/test_codeop.py @@ -279,7 +279,6 @@ class CodeopTests(unittest.TestCase): self.assertNotEqual(compile_command("a = 1\n", "abc").co_filename, compile("a = 1\n", "def", 'single').co_filename) - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: 0 != 2 def test_warning(self): # Test that the warning is only returned once. with warnings_helper.check_warnings( diff --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py index 4d117be1b..a6542b396 100644 --- a/Lib/test/test_compile.py +++ b/Lib/test/test_compile.py @@ -209,7 +209,6 @@ class TestSpecifics(unittest.TestCase): self.assertEqual(eval("0o777"), 511) self.assertEqual(eval("-0o0000010"), -8) - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: SyntaxError not raised def test_int_literals_too_long(self): n = 3000 source = f"a = 1\nb = 2\nc = {'3'*n}\nd = 4" @@ -283,7 +282,6 @@ class TestSpecifics(unittest.TestCase): self.assertRaises(SyntaxError, compile, stmt, 'tmp', 'single') self.assertRaises(SyntaxError, compile, stmt, 'tmp', 'exec') - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: SyntaxError not raised by compile def test_import(self): succeed = [ 'import sys', @@ -348,7 +346,6 @@ class TestSpecifics(unittest.TestCase): l = lambda: "this is the only const" self.assertEqual(l.__code__.co_consts, ("this is the only const",)) - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: SyntaxError not raised by compile def test_encoding(self): code = b'# -*- coding: badencoding -*-\npass\n' self.assertRaises(SyntaxError, compile, code, 'tmp', 'exec') @@ -465,7 +462,6 @@ class TestSpecifics(unittest.TestCase): # See gh-113054 compile('if (5 if 5 else T): 0', '<eval>', 'exec') - @unittest.expectedFailure # TODO: RUSTPYTHON def test_condition_expression_with_redundant_comparisons_compiles(self): # See gh-113054, gh-114083 exprs = [ @@ -580,7 +576,6 @@ class TestSpecifics(unittest.TestCase): compile(ast.fix_missing_locations(tree), "<file>", "exec") - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: <code object <module> at 0xb77555080 file "<assign>1", line 1> != <code object <module> at 0xb77554f00 file "<assign>3", line 1> def test_compile_ast(self): fname = __file__ if fname.lower().endswith('pyc'): @@ -696,7 +691,6 @@ class TestSpecifics(unittest.TestCase): self.compile_single("class T:\n pass") self.compile_single("c = '''\na=1\nb=2\nc=3\n'''") - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: SyntaxError not raised by compile_single def test_bad_single_statement(self): self.assertInvalidSingle('1\n2') self.assertInvalidSingle('def f(): pass') @@ -708,7 +702,6 @@ class TestSpecifics(unittest.TestCase): self.assertInvalidSingle('x = 5 # comment\nx = 6\n') self.assertInvalidSingle("c = '''\nd=1\n'''\na = 1\n\nb = 2\n") - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: b'source code cannot contain null bytes' not found in b'OSError: stream did not contain valid UTF-8\n' def test_particularly_evil_undecodable(self): # Issue 24022 src = b'0000\x00\n00000000000\n\x00\n\x9e\n' @@ -719,7 +712,6 @@ class TestSpecifics(unittest.TestCase): res = script_helper.run_python_until_end(fn)[0] self.assertIn(b"source code cannot contain null bytes", res.err) - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: b'source code cannot contain null bytes' not found in b'OSError: stream did not contain valid UTF-8\n' def test_yet_more_evil_still_undecodable(self): # Issue #25388 src = b"#\x00\n#\xfd\n" @@ -756,7 +748,6 @@ class TestSpecifics(unittest.TestCase): # check_limit("a", " if a else a") # check_limit("if a: pass", "\nelif a: pass", mode="exec") - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: "cannot contain null" does not match "invalid syntax (<dummy>, line 1)" def test_null_terminated(self): # The source code is null-terminated internally, but bytes-like # objects are accepted, which could be not terminated. @@ -1673,7 +1664,6 @@ class TestSpecifics(unittest.TestCase): self.assertRaises(NameError, ns['foo']) - @unittest.expectedFailure # TODO: RUSTPYTHON; + [3, 5, 3, 5] def test_compile_warnings(self): # Each invocation of compile() emits compiler warnings, even if they # have the same message and line number. @@ -1691,7 +1681,6 @@ class TestSpecifics(unittest.TestCase): self.assertEqual([wm.lineno for wm in caught], [3, 5] * 2) - @unittest.expectedFailure # TODO: RUSTPYTHON; + [5, 9] def test_compile_warning_in_finally(self): # Ensure that warnings inside finally blocks are # only emitted once despite the block being @@ -1742,7 +1731,6 @@ class TestSpecifics(unittest.TestCase): self.assertEqual(wm.category, SyntaxWarning) self.assertIn("\"is\" with 'int' literal", str(wm.message)) - @unittest.expectedFailure # TODO: RUSTPYTHON @support.subTests('src', [ textwrap.dedent(""" def f(): diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py index 621c9d823..7ab4c810a 100644 --- a/Lib/test/test_exceptions.py +++ b/Lib/test/test_exceptions.py @@ -231,7 +231,6 @@ class ExceptionTests(unittest.TestCase): line = line.removeprefix('\ufeff') self.assertIn(line, cm.exception.text) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_error_offset_continuation_characters(self): check = self.check check('"\\\n"(1 for c in I,\\\n\\', 2, 2) diff --git a/Lib/test/test_fstring.py b/Lib/test/test_fstring.py index f4fca1cae..e35d5118f 100644 --- a/Lib/test/test_fstring.py +++ b/Lib/test/test_fstring.py @@ -701,7 +701,6 @@ x = ( ["f'{ {{}} }'", # dict in a set ]) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_compile_time_concat(self): x = 'def' self.assertEqual('abc' f'## {x}ghi', 'abc## defghi') @@ -816,7 +815,6 @@ x = ( s = "f'{1}' 'x' 'y'" * 1024 self.assertEqual(eval(s), '1xy' * 1024) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_format_specifier_expressions(self): width = 10 precision = 4 @@ -947,7 +945,6 @@ x = ( ["f'{3)+(4}'", ]) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_newlines_before_syntax_error(self): self.assertAllRaise(SyntaxError, "f-string: expecting a valid expression after '{'", @@ -1031,7 +1028,6 @@ x = ( r"'\N{GREEK CAPITAL LETTER DELTA'", ]) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_backslashes_in_expression_part(self): self.assertEqual(f"{( 1 + @@ -1732,7 +1728,6 @@ x = ( with self.assertRaisesRegex(ValueError, error_msg): f'{1:_,}' - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: "f-string: expecting a valid expression after '{'" does not match "invalid syntax (?, line 1)" def test_syntax_error_for_starred_expressions(self): with self.assertRaisesRegex(SyntaxError, "can't use starred expression here"): compile("f'{*a}'", "?", "exec") diff --git a/Lib/test/test_future_stmt/test_future.py b/Lib/test/test_future_stmt/test_future.py index faa5f4cc6..8d2050a39 100644 --- a/Lib/test/test_future_stmt/test_future.py +++ b/Lib/test/test_future_stmt/test_future.py @@ -81,7 +81,6 @@ class FutureTest(unittest.TestCase): ): from test.test_future_stmt import test_future_multiple_features # noqa: F401 - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: 1 != 24 def test_unknown_future_flag(self): code = """ from __future__ import nested_scopes @@ -135,14 +134,12 @@ class FutureTest(unittest.TestCase): """ self.assertSyntaxError(code, offset=54) - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: 1 != 24 def test_future_import_star(self): code = """ from __future__ import * """ self.assertSyntaxError(code, message='future feature * is not defined', offset=24) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_future_import_braces(self): code = """ from __future__ import braces @@ -188,7 +185,6 @@ class FutureTest(unittest.TestCase): out = kill_python(p) self.assertNotIn(b'SyntaxError: invalid syntax', out) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_future_dotted_import(self): with self.assertRaises(ImportError): exec("from .__future__ import spam") @@ -480,7 +476,6 @@ class AnnotationsFutureTestCase(unittest.TestCase): self.assertEqual(foo.__code__.co_cellvars, ()) self.assertEqual(foo().__code__.co_freevars, ()) - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: SyntaxError not raised def test_annotations_forbidden(self): with self.assertRaises(SyntaxError): self._exec_future("test: (yield)") diff --git a/Lib/test/test_genexps.py b/Lib/test/test_genexps.py index fde12f13c..17d2d1370 100644 --- a/Lib/test/test_genexps.py +++ b/Lib/test/test_genexps.py @@ -159,7 +159,7 @@ Verify that syntax error's are raised for genexps used as lvalues ... SyntaxError: cannot assign to generator expression - >>> (y for y in (1,2)) += 10 # TODO: RUSTPYTHON # doctest: +EXPECTED_FAILURE + >>> (y for y in (1,2)) += 10 Traceback (most recent call last): ... SyntaxError: 'generator expression' is an illegal expression for augmented assignment diff --git a/Lib/test/test_global.py b/Lib/test/test_global.py index 1f55dfbe1..11d0bd54e 100644 --- a/Lib/test/test_global.py +++ b/Lib/test/test_global.py @@ -28,7 +28,6 @@ class GlobalTests(unittest.TestCase): ### Syntax error cases as covered in Python/symtable.c ###################################################### - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: 12 != 5 def test_name_param(self): prog_text = """\ def fn(name_param): @@ -36,7 +35,6 @@ def fn(name_param): """ check_syntax_error(self, prog_text, lineno=2, offset=5) - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: 12 != 5 def test_name_after_assign(self): prog_text = """\ def fn(): @@ -45,7 +43,6 @@ def fn(): """ check_syntax_error(self, prog_text, lineno=3, offset=5) - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: 12 != 5 def test_name_after_use(self): prog_text = """\ def fn(): @@ -54,7 +51,6 @@ def fn(): """ check_syntax_error(self, prog_text, lineno=3, offset=5) - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: 12 != 5 def test_name_annot(self): prog_text_3 = """\ def fn(): diff --git a/Lib/test/test_grammar.py b/Lib/test/test_grammar.py index cf90de7b1..19440b101 100644 --- a/Lib/test/test_grammar.py +++ b/Lib/test/test_grammar.py @@ -114,7 +114,6 @@ class TokenTests(unittest.TestCase): # Sanity check: no literal begins with an underscore self.assertRaises(NameError, eval, "_0") - @unittest.expectedFailure # TODO: RUSTPYTHON def test_bad_numerical_literals(self): check = self.check_syntax_error check("0b12", "invalid digit '2' in binary literal") @@ -137,7 +136,6 @@ class TokenTests(unittest.TestCase): check("1e2_", "invalid decimal literal") check("1e+", "invalid decimal literal") - @unittest.expectedFailure # TODO: RUSTPYTHON def test_end_of_numerical_literals(self): def check(test, error=False): with self.subTest(expr=test): @@ -251,7 +249,6 @@ the \'lazy\' dog.\n\ compile(s, "<test>", "exec") self.assertIn("was never closed", str(cm.exception)) - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: SyntaxError not raised @skip_wasi_stack_overflow() def test_max_level(self): # Macro defined in Parser/lexer/state.h @@ -298,7 +295,6 @@ class GrammarTests(unittest.TestCase): my_lst[one()-1]: int = 5 self.assertEqual(my_lst, [5]) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_var_annot_syntax_errors(self): # parser pass check_syntax_error(self, "def f: int") @@ -751,7 +747,6 @@ class GrammarTests(unittest.TestCase): # Check the heuristic for print & exec covers significant cases # As well as placing some limits on false positives - @unittest.expectedFailure # TODO: RUSTPYTHON def test_former_statements_refer_to_builtins(self): keywords = "print", "exec" # Cases where we want the custom error @@ -1165,7 +1160,6 @@ class GrammarTests(unittest.TestCase): """, True) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_yield(self): # Allowed as standalone statement def g(): yield 1 @@ -1205,7 +1199,6 @@ class GrammarTests(unittest.TestCase): # Check annotation refleak on SyntaxError check_syntax_error(self, "def g(a:(yield)): pass") - @unittest.expectedFailure # TODO: RUSTPYTHON def test_yield_in_comprehensions(self): # Check yield in comprehensions def g(): [x for x in [(yield 1)]] @@ -1302,7 +1295,6 @@ class GrammarTests(unittest.TestCase): else: self.fail("AssertionError not raised by 'assert False'") - @unittest.expectedFailure # TODO: RUSTPYTHON def test_assert_syntax_warnings(self): # Ensure that we warn users if they provide a non-zero length tuple as # the assertion test. @@ -1317,7 +1309,6 @@ class GrammarTests(unittest.TestCase): compile('assert x, "msg"', '<testcase>', 'exec') compile('assert False, "msg"', '<testcase>', 'exec') - @unittest.expectedFailure # TODO: RUSTPYTHON def test_assert_warning_promotes_to_syntax_error(self): # If SyntaxWarning is configured to be an error, it actually raises a # SyntaxError. @@ -1496,7 +1487,6 @@ class GrammarTests(unittest.TestCase): if 1 not in (): pass if 1 < 1 > 1 == 1 >= 1 <= 1 != 1 in 1 not in x is x is not x: pass - @unittest.expectedFailure # TODO: RUSTPYTHON def test_comparison_is_literal(self): def check(test, msg): self.check_syntax_warning(test, msg) @@ -1526,7 +1516,6 @@ class GrammarTests(unittest.TestCase): compile('True is x', '<testcase>', 'exec') compile('... is x', '<testcase>', 'exec') - @unittest.expectedFailure # TODO: RUSTPYTHON def test_warn_missed_comma(self): def check(test): self.check_syntax_warning(test, msg) diff --git a/Lib/test/test_listcomps.py b/Lib/test/test_listcomps.py index 5dbc130b4..5e09fad72 100644 --- a/Lib/test/test_listcomps.py +++ b/Lib/test/test_listcomps.py @@ -219,7 +219,6 @@ class ListComprehensionTest(unittest.TestCase): """ self._check_in_scopes(code, raises=NameError) - @unittest.expectedFailure # TODO: RUSTPYTHON; SyntaxError: compiler_make_closure: cannot find '__conditional_annotations__' in parent vars def test_references___conditional_annotations___nested(self): code = """ class i: [lambda: __conditional_annotations__ for x in y] diff --git a/Lib/test/test_named_expressions.py b/Lib/test/test_named_expressions.py index 4f92176b3..2e0643484 100644 --- a/Lib/test/test_named_expressions.py +++ b/Lib/test/test_named_expressions.py @@ -4,35 +4,30 @@ GLOBAL_VAR = None class NamedExpressionInvalidTest(unittest.TestCase): - @unittest.expectedFailure # TODO: RUSTPYTHON; wrong error message def test_named_expression_invalid_01(self): code = """x := 0""" with self.assertRaisesRegex(SyntaxError, "invalid syntax"): exec(code, {}, {}) - @unittest.expectedFailure # TODO: RUSTPYTHON; wrong error message def test_named_expression_invalid_02(self): code = """x = y := 0""" with self.assertRaisesRegex(SyntaxError, "invalid syntax"): exec(code, {}, {}) - @unittest.expectedFailure # TODO: RUSTPYTHON; wrong error message def test_named_expression_invalid_03(self): code = """y := f(x)""" with self.assertRaisesRegex(SyntaxError, "invalid syntax"): exec(code, {}, {}) - @unittest.expectedFailure # TODO: RUSTPYTHON; wrong error message def test_named_expression_invalid_04(self): code = """y0 = y1 := f(x)""" with self.assertRaisesRegex(SyntaxError, "invalid syntax"): exec(code, {}, {}) - @unittest.expectedFailure # TODO: RUSTPYTHON; wrong error message def test_named_expression_invalid_06(self): code = """((a, b) := (1, 2))""" diff --git a/Lib/test/test_patma.py b/Lib/test/test_patma.py index 8d359a646..5a06972fd 100644 --- a/Lib/test/test_patma.py +++ b/Lib/test/test_patma.py @@ -82,7 +82,6 @@ class TestInheritance(unittest.TestCase): self.assertEqual(self.check_mapping_then_sequence(S3()), "seq") self.assertEqual(self.check_mapping_then_sequence(S4()), "seq") - @unittest.expectedFailure # TODO: RUSTPYTHON def test_late_registration_mapping(self): class Parent: pass @@ -106,7 +105,6 @@ class TestInheritance(unittest.TestCase): self.assertEqual(self.check_mapping_then_sequence(ChildPost()), "map") self.assertEqual(self.check_mapping_then_sequence(GrandchildPost()), "map") - @unittest.expectedFailure # TODO: RUSTPYTHON def test_late_registration_sequence(self): class Parent: pass @@ -2246,7 +2244,6 @@ class TestPatma(unittest.TestCase): self.assertEqual(f(None), {}) self.assertEqual(f((1, 2)), {}) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_patma_210(self): def f(w): match w: @@ -2955,7 +2952,6 @@ class TestSyntaxErrors(unittest.TestCase): pass """) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_invalid_syntax_3(self): self.assert_syntax_error(""" match ...: @@ -3075,7 +3071,6 @@ class TestSyntaxErrors(unittest.TestCase): pass """) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_patterns_may_only_match_literals_and_attribute_lookups_0(self): self.assert_syntax_error(""" match ...: @@ -3083,7 +3078,6 @@ class TestSyntaxErrors(unittest.TestCase): pass """) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_patterns_may_only_match_literals_and_attribute_lookups_1(self): self.assert_syntax_error(""" match ...: @@ -3126,7 +3120,6 @@ class TestSyntaxErrors(unittest.TestCase): pass """) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_real_number_wrong_ops(self): for op in ["*", "/", "@", "**", "%", "//"]: with self.subTest(op=op): @@ -3202,7 +3195,6 @@ class TestSyntaxErrors(unittest.TestCase): pass """) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_mapping_pattern_duplicate_key_edge_case0(self): self.assert_syntax_error(""" match ...: @@ -3210,7 +3202,6 @@ class TestSyntaxErrors(unittest.TestCase): pass """) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_mapping_pattern_duplicate_key_edge_case1(self): self.assert_syntax_error(""" match ...: @@ -3225,8 +3216,6 @@ class TestSyntaxErrors(unittest.TestCase): pass """) - - @unittest.expectedFailure # TODO: RUSTPYTHON def test_mapping_pattern_duplicate_key_edge_case3(self): self.assert_syntax_error(""" match ...: @@ -3258,7 +3247,6 @@ class TestTypeErrors(unittest.TestCase): self.assertEqual(x, range(10)) self.assertIs(y, None) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_got_multiple_subpatterns_for_attribute_0(self): class Class: __match_args__ = ("a", "a") @@ -3273,7 +3261,6 @@ class TestTypeErrors(unittest.TestCase): self.assertIs(y, None) self.assertIs(z, None) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_got_multiple_subpatterns_for_attribute_1(self): class Class: __match_args__ = ("a",) @@ -3379,7 +3366,6 @@ class TestTypeErrors(unittest.TestCase): class TestValueErrors(unittest.TestCase): - @unittest.expectedFailure # TODO: RUSTPYTHON def test_mapping_pattern_checks_duplicate_key_1(self): class Keys: KEY = "a" diff --git a/Lib/test/test_pdb.py b/Lib/test/test_pdb.py index 8b2806781..97f084088 100644 --- a/Lib/test/test_pdb.py +++ b/Lib/test/test_pdb.py @@ -2165,7 +2165,7 @@ if not SKIP_CORO_TESTS: >>> def test_function(): ... asyncio.run(main(), loop_factory=asyncio.EventLoop) - >>> with PdbTestInput([ # TODO: RUSTPYTHON # doctest: +ELLIPSIS +EXPECTED_FAILURE + >>> with PdbTestInput([ # doctest: +ELLIPSIS ... 'x = await task', ... 'p x', ... 'x = await test()', @@ -2280,7 +2280,7 @@ if not SKIP_CORO_TESTS: >>> def test_function(): ... asyncio.run(main(), loop_factory=asyncio.EventLoop) - >>> with PdbTestInput([ # TODO: RUSTPYTHON # doctest: +EXPECTED_FAILURE + >>> with PdbTestInput([ ... 'p var.get()', ... 'print(await get_var())', ... 'print(await asyncio.create_task(set_var(100)))', @@ -2768,7 +2768,7 @@ def test_pdb_multiline_statement(): >>> def test_function(): ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() - >>> with PdbTestInput([ # TODO: RUSTPYTHON # doctest: +NORMALIZE_WHITESPACE +EXPECTED_FAILURE + >>> with PdbTestInput([ # doctest: +NORMALIZE_WHITESPACE ... 'def f(x):', ... ' return x * 2', ... '', diff --git a/Lib/test/test_peepholer.py b/Lib/test/test_peepholer.py index eb2515687..14657dd2e 100644 --- a/Lib/test/test_peepholer.py +++ b/Lib/test/test_peepholer.py @@ -157,7 +157,6 @@ class TestTranforms(BytecodeTestCase): self.assertNotInBytecode(code, 'UNPACK_SEQUENCE') self.check_lnotab(code) - @unittest.expectedFailure # TODO: RUSTPYTHON; LOAD_CONST count mismatch in long-tuple branch def test_constant_folding_tuples_of_constants(self): for line, elem in ( ('a = 1,2,3', (1, 2, 3)), diff --git a/Lib/test/test_pep646_syntax.py b/Lib/test/test_pep646_syntax.py index 8034bb9e9..d79196219 100644 --- a/Lib/test/test_pep646_syntax.py +++ b/Lib/test/test_pep646_syntax.py @@ -312,7 +312,7 @@ is *not* valid syntax.) >>> f4.__annotations__ {'args': StarredB, 'arg1': <class 'int'>} - >>> def f5(*args: *b = (1,)): pass # TODO: RUSTPYTHON # doctest: +EXPECTED_FAILURE + >>> def f5(*args: *b = (1,)): pass Traceback (most recent call last): ... SyntaxError: invalid syntax diff --git a/Lib/test/test_pydoc/test_pydoc.py b/Lib/test/test_pydoc/test_pydoc.py index 46f8ba60f..2a96ef4dd 100644 --- a/Lib/test/test_pydoc/test_pydoc.py +++ b/Lib/test/test_pydoc/test_pydoc.py @@ -932,7 +932,6 @@ class PydocDocTest(unittest.TestCase): synopsis = pydoc.synopsis(TESTFN, {}) self.assertEqual(synopsis, 'line 1: h\xe9') - @unittest.expectedFailure # TODO: RUSTPYTHON def test_source_synopsis(self): def check(source, expected, encoding=None): if isinstance(source, str): diff --git a/Lib/test/test_pyrepl/test_interact.py b/Lib/test/test_pyrepl/test_interact.py index e4f90db33..65b1eed5b 100644 --- a/Lib/test/test_pyrepl/test_interact.py +++ b/Lib/test/test_pyrepl/test_interact.py @@ -117,7 +117,6 @@ class TestSimpleInteract(unittest.TestCase): SyntaxError: duplicate argument 'x' in function definition""" self.assertIn(r, f.getvalue()) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_runsource_shows_syntax_error_for_failed_compilation(self): console = InteractiveColoredConsole() source = "print('Hello, world!'" @@ -133,7 +132,6 @@ SyntaxError: duplicate argument 'x' in function definition""" console.runsource(source) mock_showsyntaxerror.assert_called_once() - @unittest.expectedFailure # TODO: RUSTPYTHON def test_runsource_survives_null_bytes(self): console = InteractiveColoredConsole() source = "\x00\n" @@ -155,7 +153,6 @@ SyntaxError: duplicate argument 'x' in function definition""" self.assertFalse(result) self.assertEqual(f.getvalue(), "{'x': <class 'int'>}\n") - @unittest.expectedFailure # TODO: RUSTPYTHON def test_future_annotations(self): console = InteractiveColoredConsole() source = dedent("""\ @@ -210,7 +207,6 @@ class TestMoreLines(unittest.TestCase): console = InteractiveColoredConsole(namespace, filename="<stdin>") self.assertFalse(_more_lines(console, code)) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_multiline_single_block(self): namespace = {} code = dedent("""\ @@ -227,7 +223,6 @@ class TestMoreLines(unittest.TestCase): console = InteractiveColoredConsole(namespace, filename="<stdin>") self.assertFalse(_more_lines(console, code)) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_multiple_statements(self): namespace = {} code = dedent("""\ @@ -237,7 +232,6 @@ class TestMoreLines(unittest.TestCase): console = InteractiveColoredConsole(namespace, filename="<stdin>") self.assertTrue(_more_lines(console, code)) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_multiple_blocks(self): namespace = {} code = dedent("""\ @@ -285,7 +279,6 @@ class TestMoreLines(unittest.TestCase): class TestWarnings(unittest.TestCase): - @unittest.expectedFailure # TODO: RUSTPYTHON def test_pep_765_warning(self): """ Test that a SyntaxWarning emitted from the diff --git a/Lib/test/test_pyrepl/test_pyrepl.py b/Lib/test/test_pyrepl/test_pyrepl.py index 74735ef3c..1bf3f9715 100644 --- a/Lib/test/test_pyrepl/test_pyrepl.py +++ b/Lib/test/test_pyrepl/test_pyrepl.py @@ -466,7 +466,6 @@ class TestPyReplAutoindent(TestCase): reader = ReadlineAlikeReader(console=console, config=config) return reader - @unittest.expectedFailure # TODO: RUSTPYTHON def test_auto_indent_default(self): # fmt: off input_code = ( @@ -486,7 +485,6 @@ class TestPyReplAutoindent(TestCase): output = multiline_input(reader) self.assertEqual(output, output_code) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_auto_indent_continuation(self): # auto indenting according to previous user indentation # fmt: off @@ -514,7 +512,6 @@ class TestPyReplAutoindent(TestCase): output = multiline_input(reader) self.assertEqual(output, output_code) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_auto_indent_prev_block(self): # auto indenting according to indentation in different block # fmt: off @@ -546,7 +543,6 @@ class TestPyReplAutoindent(TestCase): output2 = multiline_input(reader) self.assertEqual(output2, output_code) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_auto_indent_multiline(self): # fmt: off events = itertools.chain( @@ -586,7 +582,6 @@ class TestPyReplAutoindent(TestCase): output = multiline_input(reader) self.assertEqual(output, output_code) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_auto_indent_with_comment(self): # fmt: off events = code_to_events( @@ -605,7 +600,6 @@ class TestPyReplAutoindent(TestCase): output = multiline_input(reader) self.assertEqual(output, output_code) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_auto_indent_with_multicomment(self): # fmt: off events = code_to_events( @@ -680,7 +674,6 @@ class TestPyReplOutput(ScreenEqualMixin, TestCase): wrapper = _ReadlineWrapper(f_in=None, f_out=None, reader=reader) self.assertIs(type(wrapper.get_line_buffer()), str) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_multiline_edit(self): events = itertools.chain( code_to_events("def f():\n...\n\n"), @@ -744,7 +737,6 @@ class TestPyReplOutput(ScreenEqualMixin, TestCase): self.assertEqual(output, "1+1") self.assert_screen_equal(reader, "1+1", clean=True) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_history_with_multiline_entries(self): code = "def foo():\nx = 1\ny = 2\nz = 3\n\ndef bar():\nreturn 42\n\n" events = list(itertools.chain( @@ -1426,7 +1418,6 @@ class TestPasteEvent(TestCase): output = multiline_input(reader) self.assertEqual(output, code) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_paste_mid_newlines_not_in_paste_mode(self): # fmt: off code = ( @@ -1448,7 +1439,6 @@ class TestPasteEvent(TestCase): output = multiline_input(reader) self.assertEqual(output, expected) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_paste_not_in_paste_mode(self): # fmt: off input_code = ( diff --git a/Lib/test/test_pyrepl/test_reader.py b/Lib/test/test_pyrepl/test_reader.py index 33ef95acc..51644ec7c 100644 --- a/Lib/test/test_pyrepl/test_reader.py +++ b/Lib/test/test_pyrepl/test_reader.py @@ -180,7 +180,6 @@ class TestReader(ScreenEqualMixin, TestCase): reader, _ = handle_all_events(events) self.assert_screen_equal(reader, "") - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: Lists differ def test_newline_within_block_trailing_whitespace(self): # fmt: off code = ( diff --git a/Lib/test/test_repl.py b/Lib/test/test_repl.py index 211d17838..c80db8323 100644 --- a/Lib/test/test_repl.py +++ b/Lib/test/test_repl.py @@ -437,7 +437,6 @@ class TestAsyncioREPL(unittest.TestCase): expected = "toplevel contextvar test: ok" self.assertIn(expected, output, expected) - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: 101 != 0 def test_toplevel_contextvars_async(self): user_input = dedent("""\ from contextvars import ContextVar diff --git a/Lib/test/test_symtable.py b/Lib/test/test_symtable.py index f36bbcaea..b55adab6b 100644 --- a/Lib/test/test_symtable.py +++ b/Lib/test/test_symtable.py @@ -198,7 +198,6 @@ class SymtableTest(unittest.TestCase): T = find_block(GenericMine, "T") U = find_block(GenericMine, "U") - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: <SymbolTableType.ANNOTATION: 'annotation'> != 'type alias' def test_type(self): self.assertEqual(self.top.get_type(), "module") self.assertEqual(self.Mine.get_type(), "class") diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py index 0934f22d4..5013eb096 100644 --- a/Lib/test/test_syntax.py +++ b/Lib/test/test_syntax.py @@ -59,15 +59,15 @@ SyntaxError: cannot assign to __debug__ Traceback (most recent call last): SyntaxError: cannot assign to __debug__ ->>> def __debug__(): pass # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> def __debug__(): pass Traceback (most recent call last): SyntaxError: cannot assign to __debug__ ->>> async def __debug__(): pass # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> async def __debug__(): pass Traceback (most recent call last): SyntaxError: cannot assign to __debug__ ->>> class __debug__: pass # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> class __debug__: pass Traceback (most recent call last): SyntaxError: cannot assign to __debug__ @@ -75,7 +75,7 @@ SyntaxError: cannot assign to __debug__ Traceback (most recent call last): SyntaxError: cannot delete __debug__ ->>> f() = 1 # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> f() = 1 Traceback (most recent call last): SyntaxError: cannot assign to function call here. Maybe you meant '==' instead of '='? @@ -83,11 +83,11 @@ SyntaxError: cannot assign to function call here. Maybe you meant '==' instead o Traceback (most recent call last): SyntaxError: assignment to yield expression not possible ->>> del f() # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> del f() Traceback (most recent call last): SyntaxError: cannot delete function call ->>> a + 1 = 2 # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> a + 1 = 2 Traceback (most recent call last): SyntaxError: cannot assign to expression here. Maybe you meant '==' instead of '='? @@ -120,7 +120,7 @@ expression inside that contain should still cause a syntax error. This test just checks a couple of cases rather than enumerating all of them. ->>> (a, "b", c) = (1, 2, 3) # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> (a, "b", c) = (1, 2, 3) Traceback (most recent call last): SyntaxError: cannot assign to literal @@ -168,15 +168,15 @@ SyntaxError: expected 'else' after 'if' expression Traceback (most recent call last): SyntaxError: expected 'else' after 'if' expression ->>> x = 1 if 1 else pass # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> x = 1 if 1 else pass Traceback (most recent call last): SyntaxError: expected expression after 'else', but statement is given ->>> x = pass if 1 else 1 # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> x = pass if 1 else 1 Traceback (most recent call last): SyntaxError: expected expression before 'if', but statement is given ->>> x = pass if 1 else pass # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> x = pass if 1 else pass Traceback (most recent call last): SyntaxError: expected expression before 'if', but statement is given @@ -200,15 +200,15 @@ SyntaxError: cannot assign to True Traceback (most recent call last): SyntaxError: assignment to yield expression not possible ->>> a, b += 1, 2 # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> a, b += 1, 2 Traceback (most recent call last): SyntaxError: 'tuple' is an illegal expression for augmented assignment ->>> (a, b) += 1, 2 # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> (a, b) += 1, 2 Traceback (most recent call last): SyntaxError: 'tuple' is an illegal expression for augmented assignment ->>> [a, b] += 1, 2 # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> [a, b] += 1, 2 Traceback (most recent call last): SyntaxError: 'list' is an illegal expression for augmented assignment @@ -243,7 +243,7 @@ SyntaxError: cannot assign to function call Traceback (most recent call last): SyntaxError: cannot assign to expression ->>> for i < (): pass # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> for i < (): pass Traceback (most recent call last): SyntaxError: invalid syntax @@ -285,11 +285,11 @@ SyntaxError: invalid syntax Comprehensions without 'in' keyword: ->>> [x for x if range(1)] # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> [x for x if range(1)] Traceback (most recent call last): SyntaxError: 'in' expected after for-loop variables ->>> tuple(x for x if range(1)) # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> tuple(x for x if range(1)) Traceback (most recent call last): SyntaxError: 'in' expected after for-loop variables @@ -301,7 +301,7 @@ SyntaxError: cannot assign to function call Traceback (most recent call last): SyntaxError: cannot assign to expression ->>> [x for a, b, (c + 1, d()) if y] # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> [x for a, b, (c + 1, d()) if y] Traceback (most recent call last): SyntaxError: 'in' expected after for-loop variables @@ -316,11 +316,11 @@ SyntaxError: cannot assign to expression Comprehensions creating tuples without parentheses should produce a specialized error message: ->>> [x,y for x,y in range(100)] # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> [x,y for x,y in range(100)] Traceback (most recent call last): SyntaxError: did you forget parentheses around the comprehension target? ->>> {x,y for x,y in range(100)} # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> {x,y for x,y in range(100)} Traceback (most recent call last): SyntaxError: did you forget parentheses around the comprehension target? @@ -385,7 +385,7 @@ SyntaxError: invalid syntax # But prefixes of soft keywords should # still raise specialized errors ->>> (mat x) # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> (mat x) Traceback (most recent call last): SyntaxError: invalid syntax. Perhaps you forgot a comma? @@ -413,7 +413,7 @@ SyntaxError: parameter without a default follows parameter with a default Traceback (most recent call last): SyntaxError: invalid syntax ->>> def f(*None): # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> def f(*None): ... pass Traceback (most recent call last): SyntaxError: invalid syntax @@ -423,7 +423,7 @@ SyntaxError: invalid syntax Traceback (most recent call last): SyntaxError: invalid syntax ->>> def foo(/,a,b=,c): +>>> def foo(/,a,b=,c): # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE ... pass Traceback (most recent call last): SyntaxError: at least one argument must precede / @@ -468,12 +468,12 @@ SyntaxError: var-positional argument cannot have default value Traceback (most recent call last): SyntaxError: var-positional argument cannot have default value ->>> def foo(a,**b=3): # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> def foo(a,**b=3): ... pass Traceback (most recent call last): SyntaxError: var-keyword argument cannot have default value ->>> def foo(a,**b: int=3): # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> def foo(a,**b: int=3): ... pass Traceback (most recent call last): SyntaxError: var-keyword argument cannot have default value @@ -523,22 +523,22 @@ SyntaxError: * argument may appear only once Traceback (most recent call last): SyntaxError: * argument may appear only once ->>> def foo(a=1,/*,b,c): # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> def foo(a=1,/*,b,c): ... pass Traceback (most recent call last): SyntaxError: expected comma between / and * ->>> def foo(a=1,d=,c): # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> def foo(a=1,d=,c): ... pass Traceback (most recent call last): SyntaxError: expected default value expression ->>> def foo(a,d=,c): # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> def foo(a,d=,c): ... pass Traceback (most recent call last): SyntaxError: expected default value expression ->>> def foo(a,d: int=,c): # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> def foo(a,d: int=,c): ... pass Traceback (most recent call last): SyntaxError: expected default value expression @@ -571,7 +571,7 @@ SyntaxError: / must be ahead of * Traceback (most recent call last): SyntaxError: / must be ahead of * ->>> lambda a=1,/*,b,c: None # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> lambda a=1,/*,b,c: None Traceback (most recent call last): SyntaxError: expected comma between / and * @@ -579,7 +579,7 @@ SyntaxError: expected comma between / and * Traceback (most recent call last): SyntaxError: var-positional argument cannot have default value ->>> lambda a,**b=3: None # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> lambda a,**b=3: None Traceback (most recent call last): SyntaxError: var-keyword argument cannot have default value @@ -619,11 +619,11 @@ SyntaxError: * argument may appear only once Traceback (most recent call last): SyntaxError: * argument may appear only once ->>> lambda a=1,d=,c: None # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> lambda a=1,d=,c: None Traceback (most recent call last): SyntaxError: expected default value expression ->>> lambda a,d=,c: None # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> lambda a,d=,c: None Traceback (most recent call last): SyntaxError: expected default value expression @@ -641,7 +641,7 @@ SyntaxError: parameter without a default follows parameter with a default ... a, # type: int ... ): ... pass -... ''', type_comments=True) # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +... ''', type_comments=True) Traceback (most recent call last): SyntaxError: bare * has associated type comment @@ -784,7 +784,7 @@ SyntaxError: invalid syntax ... 290, 291, 292, 293, 294, 295, 296, 297, 298, 299) # doctest: +ELLIPSIS (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, ..., 297, 298, 299) ->>> f(lambda x: x[0] = 3) # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> f(lambda x: x[0] = 3) Traceback (most recent call last): SyntaxError: expression cannot contain assignment, perhaps you meant "=="? @@ -796,25 +796,25 @@ SyntaxError: invalid syntax The grammar accepts any test (basically, any expression) in the keyword slot of a call site. Test a few different options. ->>> f(x()=2) # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> f(x()=2) Traceback (most recent call last): SyntaxError: expression cannot contain assignment, perhaps you meant "=="? ->>> f(a or b=1) # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> f(a or b=1) Traceback (most recent call last): SyntaxError: expression cannot contain assignment, perhaps you meant "=="? ->>> f(x.y=1) # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> f(x.y=1) Traceback (most recent call last): SyntaxError: expression cannot contain assignment, perhaps you meant "=="? ->>> f((x)=2) # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> f((x)=2) Traceback (most recent call last): SyntaxError: expression cannot contain assignment, perhaps you meant "=="? ->>> f(True=1) # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> f(True=1) Traceback (most recent call last): SyntaxError: cannot assign to True ->>> f(False=1) # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> f(False=1) Traceback (most recent call last): SyntaxError: cannot assign to False ->>> f(None=1) # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> f(None=1) Traceback (most recent call last): SyntaxError: cannot assign to None >>> f(__debug__=1) @@ -826,42 +826,42 @@ SyntaxError: cannot assign to __debug__ >>> x.__debug__: int Traceback (most recent call last): SyntaxError: cannot assign to __debug__ ->>> f(a=) # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> f(a=) Traceback (most recent call last): SyntaxError: expected argument value expression ->>> f(a, b, c=) # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> f(a, b, c=) Traceback (most recent call last): SyntaxError: expected argument value expression ->>> f(a, b, c=, d) # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> f(a, b, c=, d) Traceback (most recent call last): SyntaxError: expected argument value expression ->>> f(*args=[0]) # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> f(*args=[0]) Traceback (most recent call last): SyntaxError: cannot assign to iterable argument unpacking ->>> f(a, b, *args=[0]) # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> f(a, b, *args=[0]) Traceback (most recent call last): SyntaxError: cannot assign to iterable argument unpacking ->>> f(**kwargs={'a': 1}) # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> f(**kwargs={'a': 1}) Traceback (most recent call last): SyntaxError: cannot assign to keyword argument unpacking ->>> f(a, b, *args, **kwargs={'a': 1}) # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> f(a, b, *args, **kwargs={'a': 1}) Traceback (most recent call last): SyntaxError: cannot assign to keyword argument unpacking More set_context(): ->>> (x for x in x) += 1 # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> (x for x in x) += 1 Traceback (most recent call last): SyntaxError: 'generator expression' is an illegal expression for augmented assignment ->>> None += 1 # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> None += 1 Traceback (most recent call last): SyntaxError: 'None' is an illegal expression for augmented assignment >>> __debug__ += 1 Traceback (most recent call last): SyntaxError: cannot assign to __debug__ >>> f() += 1 # TODO: RUSTPYTHON; Raises an exception # doctest: +SKIP -Traceback (most recent call last): # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +Traceback (most recent call last): SyntaxError: 'function call' is an illegal expression for augmented assignment @@ -957,7 +957,7 @@ isn't, there should be a syntax error. elif can't come after an else. - >>> if a % 2 == 0: # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> if a % 2 == 0: ... pass ... else: ... pass @@ -1185,7 +1185,7 @@ Missing ':' before suites: Traceback (most recent call last): SyntaxError: expected ':' - >>> with (blech as something) + >>> with (blech as something) # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE ... pass Traceback (most recent call last): SyntaxError: expected ':' @@ -1195,12 +1195,12 @@ Missing ':' before suites: Traceback (most recent call last): SyntaxError: expected ':' - >>> with (blech, block as something) + >>> with (blech, block as something) # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE ... pass Traceback (most recent call last): SyntaxError: expected ':' - >>> with (blech, block as something, bluch) + >>> with (blech, block as something, bluch) # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE ... pass Traceback (most recent call last): SyntaxError: expected ':' @@ -1313,39 +1313,39 @@ Missing parens after function definition Parenthesized arguments in function definitions - >>> def f(x, (y, z), w): # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> def f(x, (y, z), w): ... pass Traceback (most recent call last): SyntaxError: Function parameters cannot be parenthesized - >>> def f((x, y, z, w)): # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> def f((x, y, z, w)): ... pass Traceback (most recent call last): SyntaxError: Function parameters cannot be parenthesized - >>> def f(x, (y, z, w)): # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> def f(x, (y, z, w)): ... pass Traceback (most recent call last): SyntaxError: Function parameters cannot be parenthesized - >>> def f((x, y, z), w): # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> def f((x, y, z), w): ... pass Traceback (most recent call last): SyntaxError: Function parameters cannot be parenthesized - >>> lambda x, (y, z), w: None # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> lambda x, (y, z), w: None Traceback (most recent call last): SyntaxError: Lambda expression parameters cannot be parenthesized - >>> lambda (x, y, z, w): None # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> lambda (x, y, z, w): None Traceback (most recent call last): SyntaxError: Lambda expression parameters cannot be parenthesized - >>> lambda x, (y, z, w): None # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> lambda x, (y, z, w): None Traceback (most recent call last): SyntaxError: Lambda expression parameters cannot be parenthesized - >>> lambda (x, y, z), w: None # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> lambda (x, y, z), w: None Traceback (most recent call last): SyntaxError: Lambda expression parameters cannot be parenthesized @@ -1361,7 +1361,7 @@ Custom error message for __debug__ as exception variable >>> try: ... pass - ... except TypeError as __debug__: # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + ... except TypeError as __debug__: ... pass Traceback (most recent call last): SyntaxError: cannot assign to __debug__ @@ -1410,28 +1410,28 @@ Custom error message for try block mixing except and except* Better error message for using `except as` with not a name: - >>> try: # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> try: ... pass ... except TypeError as obj.attr: ... pass Traceback (most recent call last): SyntaxError: cannot use except statement with attribute - >>> try: # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> try: ... pass ... except TypeError as obj[1]: ... pass Traceback (most recent call last): SyntaxError: cannot use except statement with subscript - >>> try: # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> try: ... pass ... except* TypeError as (obj, name): ... pass Traceback (most recent call last): SyntaxError: cannot use except* statement with tuple - >>> try: # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> try: ... pass ... except* TypeError as 1: ... pass @@ -1440,18 +1440,18 @@ Better error message for using `except as` with not a name: Regression tests for gh-133999: - >>> try: pass - ... except TypeError as name: raise from None # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> try: pass # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + ... except TypeError as name: raise from None Traceback (most recent call last): SyntaxError: invalid syntax - >>> try: pass - ... except* TypeError as name: raise from None # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> try: pass # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + ... except* TypeError as name: raise from None Traceback (most recent call last): SyntaxError: invalid syntax - >>> match 1: - ... case 1 | 2 as abc: raise from None # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> match 1: # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + ... case 1 | 2 as abc: raise from None Traceback (most recent call last): SyntaxError: invalid syntax @@ -1464,7 +1464,7 @@ Ensure that early = are not matched by the parser as invalid comparisons Traceback (most recent call last): SyntaxError: invalid syntax - >>> dict(x=34, (x for x in range 10), 1); x $ y + >>> dict(x=34, (x for x in range 10), 1); x $ y # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE Traceback (most recent call last): SyntaxError: invalid syntax @@ -1474,27 +1474,27 @@ Ensure that early = are not matched by the parser as invalid comparisons Incomplete dictionary literals - >>> {1:2, 3:4, 5} # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> {1:2, 3:4, 5} Traceback (most recent call last): SyntaxError: ':' expected after dictionary key - >>> {1:2, 3:4, 5:} # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> {1:2, 3:4, 5:} Traceback (most recent call last): SyntaxError: expression expected after dictionary key and ':' - >>> {1: *12+1, 23: 1} # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> {1: *12+1, 23: 1} Traceback (most recent call last): SyntaxError: cannot use a starred expression in a dictionary value - >>> {1: *12+1} # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> {1: *12+1} Traceback (most recent call last): SyntaxError: cannot use a starred expression in a dictionary value - >>> {1: 23, 1: *12+1} # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> {1: 23, 1: *12+1} Traceback (most recent call last): SyntaxError: cannot use a starred expression in a dictionary value - >>> {1:} # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> {1:} Traceback (most recent call last): SyntaxError: expression expected after dictionary key and ':' @@ -1506,7 +1506,7 @@ Incomplete dictionary literals # Ensure that the error is not raised for invalid expressions - >>> {1: 2, 3: foo(,), 4: 5} # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> {1: 2, 3: foo(,), 4: 5} Traceback (most recent call last): SyntaxError: invalid syntax @@ -1516,48 +1516,48 @@ Incomplete dictionary literals Specialized indentation errors: - >>> while condition: # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> while condition: ... pass Traceback (most recent call last): IndentationError: expected an indented block after 'while' statement on line 1 - >>> for x in range(10): # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> for x in range(10): ... pass Traceback (most recent call last): IndentationError: expected an indented block after 'for' statement on line 1 - >>> for x in range(10): # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> for x in range(10): ... pass ... else: ... pass Traceback (most recent call last): IndentationError: expected an indented block after 'else' statement on line 3 - >>> async for x in range(10): # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> async for x in range(10): ... pass Traceback (most recent call last): IndentationError: expected an indented block after 'for' statement on line 1 - >>> async for x in range(10): # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> async for x in range(10): ... pass ... else: ... pass Traceback (most recent call last): IndentationError: expected an indented block after 'else' statement on line 3 - >>> if something: # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> if something: ... pass Traceback (most recent call last): IndentationError: expected an indented block after 'if' statement on line 1 - >>> if something: # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> if something: ... pass ... elif something_else: ... pass Traceback (most recent call last): IndentationError: expected an indented block after 'elif' statement on line 3 - >>> if something: # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> if something: ... pass ... elif something_else: ... pass @@ -1566,33 +1566,33 @@ Specialized indentation errors: Traceback (most recent call last): IndentationError: expected an indented block after 'else' statement on line 5 - >>> try: # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> try: ... pass Traceback (most recent call last): IndentationError: expected an indented block after 'try' statement on line 1 - >>> try: # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> try: ... something() ... except: ... pass Traceback (most recent call last): IndentationError: expected an indented block after 'except' statement on line 3 - >>> try: # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> try: ... something() ... except A: ... pass Traceback (most recent call last): IndentationError: expected an indented block after 'except' statement on line 3 - >>> try: # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> try: ... something() ... except* A: ... pass Traceback (most recent call last): IndentationError: expected an indented block after 'except*' statement on line 3 - >>> try: # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> try: ... something() ... except A: ... pass @@ -1601,7 +1601,7 @@ Specialized indentation errors: Traceback (most recent call last): IndentationError: expected an indented block after 'finally' statement on line 5 - >>> try: # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> try: ... something() ... except* A: ... pass @@ -1610,57 +1610,57 @@ Specialized indentation errors: Traceback (most recent call last): IndentationError: expected an indented block after 'finally' statement on line 5 - >>> with A: # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> with A: ... pass Traceback (most recent call last): IndentationError: expected an indented block after 'with' statement on line 1 - >>> with A as a, B as b: # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> with A as a, B as b: ... pass Traceback (most recent call last): IndentationError: expected an indented block after 'with' statement on line 1 - >>> with (A as a, B as b): # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> with (A as a, B as b): ... pass Traceback (most recent call last): IndentationError: expected an indented block after 'with' statement on line 1 - >>> async with A: # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> async with A: ... pass Traceback (most recent call last): IndentationError: expected an indented block after 'with' statement on line 1 - >>> async with A as a, B as b: # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> async with A as a, B as b: ... pass Traceback (most recent call last): IndentationError: expected an indented block after 'with' statement on line 1 - >>> async with (A as a, B as b): # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> async with (A as a, B as b): ... pass Traceback (most recent call last): IndentationError: expected an indented block after 'with' statement on line 1 - >>> def foo(x, /, y, *, z=2): # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> def foo(x, /, y, *, z=2): ... pass Traceback (most recent call last): IndentationError: expected an indented block after function definition on line 1 - >>> def foo[T](x, /, y, *, z=2): # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> def foo[T](x, /, y, *, z=2): ... pass Traceback (most recent call last): IndentationError: expected an indented block after function definition on line 1 - >>> class Blech(A): # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> class Blech(A): ... pass Traceback (most recent call last): IndentationError: expected an indented block after class definition on line 1 - >>> class Blech[T](A): # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> class Blech[T](A): ... pass Traceback (most recent call last): IndentationError: expected an indented block after class definition on line 1 - >>> class C(__debug__=42): ... # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> class C(__debug__=42): ... Traceback (most recent call last): SyntaxError: cannot assign to __debug__ @@ -1668,23 +1668,23 @@ Specialized indentation errors: ... def __new__(*args, **kwargs): ... pass - >>> class C(metaclass=Meta, __debug__=42): # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> class C(metaclass=Meta, __debug__=42): ... pass Traceback (most recent call last): SyntaxError: cannot assign to __debug__ - >>> match something: # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> match something: ... pass Traceback (most recent call last): IndentationError: expected an indented block after 'match' statement on line 1 - >>> match something: # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> match something: ... case []: ... pass Traceback (most recent call last): IndentationError: expected an indented block after 'case' statement on line 2 - >>> match something: # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> match something: ... case []: ... ... ... case {}: @@ -1981,23 +1981,23 @@ SyntaxError: cannot assign to t-string expression here. Maybe you meant '==' ins Traceback (most recent call last): SyntaxError: cannot assign to t-string expression here. Maybe you meant '==' instead of '='? ->>> (x, y, z=3, d, e) # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> (x, y, z=3, d, e) Traceback (most recent call last): SyntaxError: invalid syntax. Maybe you meant '==' or ':=' instead of '='? ->>> [x, y, z=3, d, e] # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> [x, y, z=3, d, e] Traceback (most recent call last): SyntaxError: invalid syntax. Maybe you meant '==' or ':=' instead of '='? ->>> [z=3] # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> [z=3] Traceback (most recent call last): SyntaxError: invalid syntax. Maybe you meant '==' or ':=' instead of '='? ->>> {x, y, z=3, d, e} # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> {x, y, z=3, d, e} Traceback (most recent call last): SyntaxError: invalid syntax. Maybe you meant '==' or ':=' instead of '='? ->>> {z=3} # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> {z=3} Traceback (most recent call last): SyntaxError: invalid syntax. Maybe you meant '==' or ':=' instead of '='? @@ -2009,35 +2009,35 @@ SyntaxError: trailing comma not allowed without surrounding parentheses Traceback (most recent call last): SyntaxError: trailing comma not allowed without surrounding parentheses ->>> import a from b # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> import a from b Traceback (most recent call last): SyntaxError: Did you mean to use 'from ... import ...' instead? ->>> import a.y.z from b.y.z # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> import a.y.z from b.y.z Traceback (most recent call last): SyntaxError: Did you mean to use 'from ... import ...' instead? ->>> import a from b as bar # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> import a from b as bar Traceback (most recent call last): SyntaxError: Did you mean to use 'from ... import ...' instead? ->>> import a.y.z from b.y.z as bar # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> import a.y.z from b.y.z as bar Traceback (most recent call last): SyntaxError: Did you mean to use 'from ... import ...' instead? ->>> import a, b,c from b # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> import a, b,c from b Traceback (most recent call last): SyntaxError: Did you mean to use 'from ... import ...' instead? ->>> import a.y.z, b.y.z, c.y.z from b.y.z # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> import a.y.z, b.y.z, c.y.z from b.y.z Traceback (most recent call last): SyntaxError: Did you mean to use 'from ... import ...' instead? ->>> import a,b,c from b as bar # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> import a,b,c from b as bar Traceback (most recent call last): SyntaxError: Did you mean to use 'from ... import ...' instead? ->>> import a.y.z, b.y.z, c.y.z from b.y.z as bar # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> import a.y.z, b.y.z, c.y.z from b.y.z as bar Traceback (most recent call last): SyntaxError: Did you mean to use 'from ... import ...' instead? @@ -2061,19 +2061,19 @@ SyntaxError: cannot assign to __debug__ Traceback (most recent call last): SyntaxError: cannot assign to __debug__ ->>> import a as b.c # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> import a as b.c Traceback (most recent call last): SyntaxError: cannot use attribute as import target ->>> import a.b as (a, b) # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> import a.b as (a, b) Traceback (most recent call last): SyntaxError: cannot use tuple as import target ->>> import a, a.b as 1 # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> import a, a.b as 1 Traceback (most recent call last): SyntaxError: cannot use literal as import target ->>> import a.b as 'a', a # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> import a.b as 'a', a Traceback (most recent call last): SyntaxError: cannot use literal as import target @@ -2081,7 +2081,7 @@ SyntaxError: cannot use literal as import target Traceback (most recent call last): SyntaxError: cannot use attribute as import target ->>> from a import b as 1 # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> from a import b as 1 Traceback (most recent call last): SyntaxError: cannot use literal as import target @@ -2103,11 +2103,11 @@ SyntaxError: cannot use list as import target Traceback (most recent call last): SyntaxError: cannot use tuple as import target ->>> from a import b, с as d[e] # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> from a import b, с as d[e] Traceback (most recent call last): SyntaxError: cannot use subscript as import target ->>> from a import с as d[e], b # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE +>>> from a import с as d[e], b Traceback (most recent call last): SyntaxError: cannot use subscript as import target @@ -2239,7 +2239,7 @@ Corner-cases that used to crash: Invalid pattern matching constructs: - >>> match ...: # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> match ...: ... case 42 as _: ... ... Traceback (most recent call last): @@ -2251,13 +2251,13 @@ Corner-cases that used to crash: Traceback (most recent call last): SyntaxError: cannot use expression as pattern target - >>> match ...: # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> match ...: ... case 42 as a.b: ... ... Traceback (most recent call last): SyntaxError: cannot use attribute as pattern target - >>> match ...: # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> match ...: ... case 42 as (a, b): ... ... Traceback (most recent call last): @@ -2307,7 +2307,7 @@ A[:*b] Traceback (most recent call last): ... SyntaxError: invalid syntax - >>> A[:(*b)] # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> A[:(*b)] Traceback (most recent call last): ... SyntaxError: cannot use starred expression here @@ -2326,7 +2326,7 @@ A[*b:] Traceback (most recent call last): ... SyntaxError: invalid syntax - >>> A[(*b):] # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> A[(*b):] Traceback (most recent call last): ... SyntaxError: cannot use starred expression here @@ -2636,26 +2636,26 @@ Invalid expressions in type scopes: Traceback (most recent call last): SyntaxError: cannot assign to __debug__ - >>> class A[__debug__]: pass # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> class A[__debug__]: pass Traceback (most recent call last): SyntaxError: cannot assign to __debug__ - >>> class A[T]((x := 3)): ... # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> class A[T]((x := 3)): ... Traceback (most recent call last): ... SyntaxError: named expression cannot be used within the definition of a generic - >>> class A[T]((yield 3)): ... # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> class A[T]((yield 3)): ... Traceback (most recent call last): ... SyntaxError: yield expression cannot be used within the definition of a generic - >>> class A[T]((await 3)): ... # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> class A[T]((await 3)): ... Traceback (most recent call last): ... SyntaxError: await expression cannot be used within the definition of a generic - >>> class A[T]((yield from [])): ... # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> class A[T]((yield from [])): ... Traceback (most recent call last): ... SyntaxError: yield expression cannot be used within the definition of a generic @@ -2664,23 +2664,23 @@ Invalid expressions in type scopes: Traceback (most recent call last): SyntaxError: iterable argument unpacking follows keyword argument unpacking - >>> f(**x, *) # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> f(**x, *) Traceback (most recent call last): SyntaxError: Invalid star expression - >>> f(x, *:) # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> f(x, *:) Traceback (most recent call last): SyntaxError: Invalid star expression - >>> f(x, *) # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> f(x, *) Traceback (most recent call last): SyntaxError: Invalid star expression - >>> f(x = 5, *) # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> f(x = 5, *) Traceback (most recent call last): SyntaxError: Invalid star expression - >>> f(x = 5, *:) # TODO: RUSTPYTHON; Wrong error message # doctest: +EXPECTED_FAILURE + >>> f(x = 5, *:) Traceback (most recent call last): SyntaxError: Invalid star expression """ @@ -2702,7 +2702,6 @@ class SyntaxWarningTest(unittest.TestCase): with self.assertWarnsRegex(SyntaxWarning, errtext): compile(code, filename, mode) - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: SyntaxWarning not triggered def test_return_in_finally(self): source = textwrap.dedent(""" def f(): @@ -2737,7 +2736,6 @@ class SyntaxWarningTest(unittest.TestCase): """) self.check_warning(source, "'return' in a 'finally' block") - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: SyntaxWarning not triggered def test_break_and_continue_in_finally(self): for kw in ('break', 'continue'): @@ -2807,7 +2805,6 @@ class SyntaxErrorTestCase(unittest.TestCase): else: self.fail("compile() did not raise SyntaxError") - @unittest.expectedFailure # TODO: RUSTPYTHON def test_expression_with_assignment(self): self._check_error( "print(end1 + end2 = ' ')", @@ -2821,7 +2818,6 @@ class SyntaxErrorTestCase(unittest.TestCase): def test_assign_call(self): self._check_error("f() = 1", "assign") - @unittest.expectedFailure # TODO: RUSTPYTHON def test_assign_del(self): self._check_error("del (,)", "invalid syntax") self._check_error("del 1", "cannot delete literal") @@ -2955,13 +2951,11 @@ class SyntaxErrorTestCase(unittest.TestCase): "Generator expression must be parenthesized", lineno=1, end_lineno=1, offset=11, end_offset=53) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_except_then_except_star(self): self._check_error("try: pass\nexcept ValueError: pass\nexcept* TypeError: pass", r"cannot have both 'except' and 'except\*' on the same 'try'", lineno=3, end_lineno=3, offset=1, end_offset=8) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_except_star_then_except(self): self._check_error("try: pass\nexcept* ValueError: pass\nexcept TypeError: pass", r"cannot have both 'except' and 'except\*' on the same 'try'", @@ -3109,7 +3103,6 @@ def func2(): """ self._check_error(code, "expected ':'") - @unittest.expectedFailure # TODO: RUSTPYTHON def test_invalid_line_continuation_error_position(self): self._check_error(r"a = 3 \ 4", "unexpected character after line continuation character", @@ -3129,7 +3122,6 @@ def func2(): self._check_error("A.\u03bc\\\n", "unexpected EOF while parsing") - @unittest.expectedFailure # TODO: RUSTPYTHON def test_error_parenthesis(self): for paren in "([{": self._check_error(paren + "1 + 2", f"\\{paren}' was never closed") @@ -3155,7 +3147,6 @@ func( s = b'# coding=latin\n(aaaaaaaaaaaaaaaaa\naaaaaaaaaaa\xb5' self._check_error(s, r"'\(' was never closed") - @unittest.expectedFailure # TODO: RUSTPYTHON def test_error_string_literal(self): self._check_error("'blech", r"unterminated string literal \(.*\)$") @@ -3169,7 +3160,6 @@ func( self._check_error("'''blech", "unterminated triple-quoted string literal") self._check_error('"""blech', "unterminated triple-quoted string literal") - @unittest.expectedFailure # TODO: RUSTPYTHON def test_invisible_characters(self): self._check_error('print\x17("Hello")', "invalid non-printable character") self._check_error(b"with(0,,):\n\x01", "invalid non-printable character") @@ -3252,7 +3242,6 @@ while 1: with self.assertRaises(SyntaxError): compile(source, "<string>", "exec") - @unittest.expectedFailure # TODO: RUSTPYTHON def test_except_stmt_invalid_as_expr(self): self._check_error( textwrap.dedent( @@ -3270,7 +3259,6 @@ while 1: end_offset=22 + len("obj.attr"), ) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_match_stmt_invalid_as_expr(self): self._check_error( textwrap.dedent( @@ -3287,7 +3275,6 @@ while 1: end_offset=15 + len("obj.attr"), ) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_ifexp_else_stmt(self): msg = "expected expression after 'else', but statement is given" @@ -3308,7 +3295,6 @@ while 1: ]: self._check_error(f"x = 1 if 1 else {stmt}", msg) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_ifexp_body_stmt_else_expression(self): msg = "expected expression before 'if', but statement is given" @@ -3319,7 +3305,6 @@ while 1: ]: self._check_error(f"x = {stmt} if 1 else 1", msg) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_ifexp_body_stmt_else_stmt(self): msg = "expected expression before 'if', but statement is given" for lhs_stmt, rhs_stmt in [ diff --git a/Lib/test/test_sys_setprofile.py b/Lib/test/test_sys_setprofile.py index 813adff2a..d0d2b0c3e 100644 --- a/Lib/test/test_sys_setprofile.py +++ b/Lib/test/test_sys_setprofile.py @@ -169,7 +169,6 @@ class ProfileHookTestCase(TestCaseBase): (1, 'return', g_ident), ]) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_exception_propagation(self): def f(p): 1/0 diff --git a/Lib/test/test_type_comments.py b/Lib/test/test_type_comments.py index 0deb25f16..d827ac271 100644 --- a/Lib/test/test_type_comments.py +++ b/Lib/test/test_type_comments.py @@ -252,7 +252,6 @@ class TypeCommentTests(unittest.TestCase): def classic_parse(self, source): return ast.parse(source) - @unittest.expectedFailure # TODO: RUSTPYTHON; AttributeError: 'FunctionDef' object has no attribute 'type_comment' def test_funcdef(self): for tree in self.parse_all(funcdef): self.assertEqual(tree.body[0].type_comment, "() -> int") @@ -261,7 +260,6 @@ class TypeCommentTests(unittest.TestCase): self.assertEqual(tree.body[0].type_comment, None) self.assertEqual(tree.body[1].type_comment, None) - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: SyntaxError not raised : feature_version=(3, 4) def test_asyncdef(self): for tree in self.parse_all(asyncdef, minver=5): self.assertEqual(tree.body[0].type_comment, "() -> int") @@ -274,12 +272,10 @@ class TypeCommentTests(unittest.TestCase): with self.assertRaises(SyntaxError): self.classic_parse(asyncvar) - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: SyntaxError not raised : feature_version=(3, 4) def test_asynccomp(self): for tree in self.parse_all(asynccomp, minver=6): pass - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: SyntaxError not raised : feature_version=(3, 4) def test_matmul(self): for tree in self.parse_all(matmul, minver=5): pass @@ -288,37 +284,31 @@ class TypeCommentTests(unittest.TestCase): for tree in self.parse_all(fstring): pass - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: SyntaxError not raised : feature_version=(3, 4) def test_underscorednumber(self): for tree in self.parse_all(underscorednumber, minver=6): pass - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: SyntaxError not raised : feature_version=(3, 4) def test_redundantdef(self): for tree in self.parse_all(redundantdef, maxver=0, expected_regex="^Cannot have two type comments on def"): pass - @unittest.expectedFailure # TODO: RUSTPYTHON; AttributeError: 'FunctionDef' object has no attribute 'type_comment' def test_nonasciidef(self): for tree in self.parse_all(nonasciidef): self.assertEqual(tree.body[0].type_comment, "() -> àçčéñt") - @unittest.expectedFailure # TODO: RUSTPYTHON; AttributeError: 'For' object has no attribute 'type_comment' def test_forstmt(self): for tree in self.parse_all(forstmt): self.assertEqual(tree.body[0].type_comment, "int") tree = self.classic_parse(forstmt) self.assertEqual(tree.body[0].type_comment, None) - @unittest.expectedFailure # TODO: RUSTPYTHON; AttributeError: 'With' object has no attribute 'type_comment' def test_withstmt(self): for tree in self.parse_all(withstmt): self.assertEqual(tree.body[0].type_comment, "int") tree = self.classic_parse(withstmt) self.assertEqual(tree.body[0].type_comment, None) - @unittest.expectedFailure # TODO: RUSTPYTHON; AttributeError: 'With' object has no attribute 'type_comment' def test_parenthesized_withstmt(self): for tree in self.parse_all(parenthesized_withstmt): self.assertEqual(tree.body[0].type_comment, "int") @@ -327,14 +317,12 @@ class TypeCommentTests(unittest.TestCase): self.assertEqual(tree.body[0].type_comment, None) self.assertEqual(tree.body[1].type_comment, None) - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: None != 'int' def test_vardecl(self): for tree in self.parse_all(vardecl): self.assertEqual(tree.body[0].type_comment, "int") tree = self.classic_parse(vardecl) self.assertEqual(tree.body[0].type_comment, None) - @unittest.expectedFailure # TODO: RUSTPYTHON; + (11, ' whatever')] def test_ignores(self): for tree in self.parse_all(ignores): self.assertEqual( @@ -350,7 +338,6 @@ class TypeCommentTests(unittest.TestCase): tree = self.classic_parse(ignores) self.assertEqual(tree.type_ignores, []) - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: SyntaxError not raised : feature_version=(3, 4) def test_longargs(self): for tree in self.parse_all(longargs, minver=8): for t in tree.body: @@ -381,7 +368,6 @@ class TypeCommentTests(unittest.TestCase): self.assertIsNone(arg.type_comment, "%s(%s:%r)" % (t.name, arg.arg, arg.type_comment)) - @unittest.expectedFailure # TODO: RUSTPYTHON; Tests for inappropriately-placed type comments. def test_inappropriate_type_comments(self): """Tests for inappropriately-placed type comments. @@ -416,7 +402,6 @@ class TypeCommentTests(unittest.TestCase): _testcapi.Py_CompileStringExFlags( b"def a(f=8, #type: \x80\n\x80", "<test>", 256, flags) - @unittest.expectedFailure # TODO: RUSTPYTHON; ValueError: mode must be "exec", "eval", "ipython", or "single" def test_func_type_input(self): def parse_func_type_input(source): diff --git a/Lib/test/test_type_params.py b/Lib/test/test_type_params.py index c63ea2d29..65261fcb6 100644 --- a/Lib/test/test_type_params.py +++ b/Lib/test/test_type_params.py @@ -683,7 +683,6 @@ class TypeParamsClassScopeTest(unittest.TestCase): self.assertIs(X.foo.__type_params__[0].__bound__, float) self.assertIs(X.Alias.__value__, float) - @unittest.expectedFailure # TODO: RUSTPYTHON; + global def test_binding_uses_global(self): ns = run_code(""" x = "global" @@ -1076,7 +1075,6 @@ class TypeParamsTypeVarTest(unittest.TestCase): class TypeParamsTypeVarTupleTest(unittest.TestCase): - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: "cannot use bound with TypeVarTuple" does not match "invalid syntax (<test string>, line 1)" def test_typevartuple_01(self): code = """def func1[*A: str](): pass""" check_syntax_error(self, code, "cannot use bound with TypeVarTuple") @@ -1100,7 +1098,6 @@ class TypeParamsTypeVarTupleTest(unittest.TestCase): class TypeParamsTypeVarParamSpecTest(unittest.TestCase): - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: "cannot use bound with ParamSpec" does not match "invalid syntax (<test string>, line 1)" def test_paramspec_01(self): code = """def func1[**A: str](): pass""" check_syntax_error(self, code, "cannot use bound with ParamSpec") diff --git a/Lib/test/test_unpack_ex.py b/Lib/test/test_unpack_ex.py index 13b789f52..a5a200259 100644 --- a/Lib/test/test_unpack_ex.py +++ b/Lib/test/test_unpack_ex.py @@ -168,7 +168,7 @@ List comprehension element unpacking ... SyntaxError: iterable unpacking cannot be used in comprehension - >>> {**{} for a in [1]} # TODO: RUSTPYTHON # doctest: +EXPECTED_FAILURE + >>> {**{} for a in [1]} Traceback (most recent call last): ... SyntaxError: dict unpacking cannot be used in dict comprehension @@ -356,7 +356,7 @@ Now some general starred expressions (all fail). ... SyntaxError: can't use starred expression here - >>> (*x),y = 1, 2 # TODO: RUSTPYTHON # doctest:+ELLIPSIS +EXPECTED_FAILURE + >>> (*x),y = 1, 2 Traceback (most recent call last): ... SyntaxError: cannot use starred expression here @@ -366,12 +366,12 @@ Now some general starred expressions (all fail). ... SyntaxError: cannot use starred expression here - >>> z,(*x),y = 1, 2, 4 # TODO: RUSTPYTHON # doctest:+ELLIPSIS +EXPECTED_FAILURE + >>> z,(*x),y = 1, 2, 4 Traceback (most recent call last): ... SyntaxError: cannot use starred expression here - >>> z,(*x) = 1, 2 # TODO: RUSTPYTHON # doctest:+ELLIPSIS +EXPECTED_FAILURE + >>> z,(*x) = 1, 2 Traceback (most recent call last): ... SyntaxError: cannot use starred expression here diff --git a/crates/capi/src/ceval.rs b/crates/capi/src/ceval.rs index d28dad4d6..867c39e03 100644 --- a/crates/capi/src/ceval.rs +++ b/crates/capi/src/ceval.rs @@ -1,17 +1,13 @@ use crate::pystate::with_vm; +use crate::unicodeobject::decode_fsdefault_and_size; use core::ffi::{CStr, c_char, c_int}; use core::ptr::NonNull; use rustpython_vm::builtins::{PyCode, PyDict}; -use rustpython_vm::compiler::Mode; use rustpython_vm::function::ArgMapping; use rustpython_vm::scope::Scope; +use rustpython_vm::version; use rustpython_vm::{AsObject, PyObject, TryFromObject}; -const PY_SINGLE_INPUT: c_int = 256; -const PY_FILE_INPUT: c_int = 257; -const PY_EVAL_INPUT: c_int = 258; -const PY_FUNC_TYPE_INPUT: c_int = 345; - #[unsafe(no_mangle)] pub unsafe extern "C" fn Py_CompileString( code: *const c_char, @@ -19,27 +15,11 @@ pub unsafe extern "C" fn Py_CompileString( start: c_int, ) -> *mut PyObject { with_vm(|vm| { - let code = unsafe { CStr::from_ptr(code) }.to_str().map_err(|_| { - vm.new_system_error("Py_CompileString called with non UTF-8 code string") - })?; - let filename = unsafe { CStr::from_ptr(filename) } - .to_str() - .map_err(|_| vm.new_system_error("Py_CompileString called with non UTF-8 filename"))?; - - let mode = match start { - PY_SINGLE_INPUT => Mode::Single, - PY_FILE_INPUT => Mode::Exec, - PY_EVAL_INPUT => Mode::Eval, - PY_FUNC_TYPE_INPUT => Mode::BlockExpr, - _ => { - return Err( - vm.new_system_error("Invalid start argument passed to Py_CompileString") - ); - } - }; - - vm.compile(code, mode, filename) - .map_err(|err| vm.new_syntax_error(&err, Some(code))) + let code = unsafe { CStr::from_ptr(code) }.to_bytes(); + let filename_size = unsafe { CStr::from_ptr(filename) }.to_bytes().len(); + let filename = decode_fsdefault_and_size(vm, filename, filename_size)?; + let filename = filename.to_string_lossy(); + vm.compile_string_object_with_flags(code, &filename, start, 0, version::MINOR as c_int, -1) }) } diff --git a/crates/capi/src/unicodeobject.rs b/crates/capi/src/unicodeobject.rs index acc6e392c..33d466926 100644 --- a/crates/capi/src/unicodeobject.rs +++ b/crates/capi/src/unicodeobject.rs @@ -4,8 +4,8 @@ use core::ffi::{CStr, c_char, c_int}; use core::ptr::NonNull; use core::slice; use core::str; -use rustpython_vm::PyObjectRef; -use rustpython_vm::builtins::PyStr; +use rustpython_vm::builtins::{PyStr, PyStrRef}; +use rustpython_vm::{PyObjectRef, PyResult, VirtualMachine}; define_py_check!(fn PyUnicode_Check, types.str_type); define_py_check!(exact fn PyUnicode_CheckExact, types.str_type); @@ -113,26 +113,42 @@ pub unsafe extern "C" fn PyUnicode_DecodeFSDefaultAndSize( .try_into() .map_err(|_| vm.new_system_error("size must be non-negative"))?; - let bytes = if s.is_null() { - if size != 0 { - return Err(vm.new_system_error( - "PyUnicode_DecodeFSDefaultAndSize called with null data and non-zero size", - )); - } - &[][..] - } else { - unsafe { slice::from_raw_parts(s.cast::<u8>(), size) } - }; - - vm.state.codec_registry.decode_text( - vm.ctx.new_bytes(bytes.to_vec()).into(), - vm.fs_encoding().as_str(), - Some(vm.fs_encode_errors().to_owned()), - vm, - ) + decode_fsdefault_and_size(vm, s, size) }) } +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyUnicode_DecodeFSDefault(s: *const c_char) -> *mut PyObject { + with_vm(|vm| { + let size = unsafe { CStr::from_ptr(s) }.to_bytes().len(); + decode_fsdefault_and_size(vm, s, size) + }) +} + +pub(crate) fn decode_fsdefault_and_size( + vm: &VirtualMachine, + s: *const c_char, + size: usize, +) -> PyResult<PyStrRef> { + let bytes = if s.is_null() { + if size != 0 { + return Err(vm.new_system_error( + "PyUnicode_DecodeFSDefaultAndSize called with null data and non-zero size", + )); + } + &[][..] + } else { + unsafe { slice::from_raw_parts(s.cast::<u8>(), size) } + }; + + vm.state.codec_registry.decode_text( + vm.ctx.new_bytes(bytes.to_vec()).into(), + vm.fs_encoding().as_str(), + Some(vm.fs_encode_errors().to_owned()), + vm, + ) +} + #[unsafe(no_mangle)] pub unsafe extern "C" fn PyUnicode_EncodeFSDefault(unicode: *mut PyObject) -> *mut PyObject { with_vm(|vm| { diff --git a/crates/codegen/src/compile.rs b/crates/codegen/src/compile.rs index a178a23bd..711ac3926 100644 --- a/crates/codegen/src/compile.rs +++ b/crates/codegen/src/compile.rs @@ -10,43 +10,40 @@ #![deny(clippy::cast_possible_truncation)] use crate::{ - IndexMap, IndexSet, ToPythonName, - error::{CodegenError, CodegenErrorType, InternalError, PatternUnreachableReason}, + IndexMap, IndexSet, ToPythonName, ast_constant_value_to_constant_data, + error::{CodegenError, CodegenErrorType, InternalError}, ir::{self, Block, BlockIdx, Blocks}, preprocess, symboltable::{self, CompilerScope, Symbol, SymbolFlags, SymbolScope, SymbolTable}, unparse::UnparseExpr, }; use alloc::borrow::Cow; -use core::mem; +use core::{mem, slice}; use malachite_bigint::BigInt; use num_complex::Complex; use num_traits::{Num, ToPrimitive, Zero}; use ruff_python_ast as ast; use ruff_text_size::{Ranged, TextRange, TextSize}; - use rustpython_compiler_core::{ Mode, OneIndexed, PositionEncoding, SourceFile, SourceLocation, bytecode::{ self, AnyInstruction, AnyOpcode, Arg as OpArgMarker, BinaryOperator, BuildSliceArgCount, - CodeFlags, CodeObject, ComparisonOperator, ConstantData, ConvertValueOparg, Instruction, - IntrinsicFunction1, Invert, LoadAttr, LoadSuperAttr, MakeFunctionFlag, MakeFunctionFlags, - OpArg, OpArgType, Opcode, PseudoInstruction, PseudoOpcode, SpecialMethod, UnpackExArgs, - oparg, + CodeObject, ComparisonOperator, ConstantData, ConvertValueOparg, Instruction, + IntrinsicFunction1, Invert, LoadAttr, LoadSuperAttr, OpArg, OpArgType, PseudoInstruction, + SpecialMethod, UnpackExArgs, oparg, }, }; +use rustpython_literal::{ + complex as literal_complex, + escape::{AsciiEscape, UnicodeEscape}, + float as literal_float, +}; use rustpython_wtf8::Wtf8Buf; /// Extension trait for `ast::Expr` to add constant checking methods trait ExprExt { /// Returns true if the expression is a constant literal with no side effects. fn is_constant(&self) -> bool; - - /// Check if a slice expression has all constant elements - fn is_constant_slice(&self) -> bool; - - /// Check if we should use BINARY_SLICE/STORE_SLICE optimization - fn should_use_slice_optimization(&self) -> bool; } impl ExprExt for ast::Expr { @@ -56,30 +53,15 @@ impl ExprExt for ast::Expr { Self::NumberLiteral(_) | Self::StringLiteral(_) | Self::BytesLiteral(_) + | Self::Constant(_) | Self::NoneLiteral(_) | Self::BooleanLiteral(_) | Self::EllipsisLiteral(_) ) } - - fn is_constant_slice(&self) -> bool { - match self { - Self::Slice(s) => { - let lower_const = s.lower.as_deref().is_none_or(|e| e.is_constant()); - let upper_const = s.upper.as_deref().is_none_or(|e| e.is_constant()); - let step_const = s.step.as_deref().is_none_or(|e| e.is_constant()); - lower_const && upper_const && step_const - } - _ => false, - } - } - - fn should_use_slice_optimization(&self) -> bool { - !self.is_constant_slice() && matches!(self, Self::Slice(s) if s.step.is_none()) - } } -const MAXBLOCKS: usize = 20; +const CO_MAXBLOCKS: usize = 21; #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum FBlockType { @@ -142,6 +124,44 @@ pub struct FBlockInfo { pub(crate) type InternalResult<T> = Result<T, InternalError>; type CompileResult<T> = Result<T, CodegenError>; +pub type SyntaxWarningHandler<'a> = + dyn FnMut(SourceLocation, String) -> Result<(), CodegenError> + 'a; + +fn warn_ast_preprocess_syntax( + source_file: &SourceFile, + handler: &mut SyntaxWarningHandler<'_>, + range: TextRange, + message: String, +) -> CompileResult<()> { + let location = source_file + .to_source_code() + .source_location(range.start(), PositionEncoding::Utf8); + handler(location, message) +} + +fn checked_future_features( + ast: &ruff_python_ast::Mod, + source_file: &SourceFile, +) -> CompileResult<bytecode::CodeFlags> { + preprocess::checked_future_features(ast).map_err(|err| { + let location = source_file + .to_source_code() + .source_location(err.range.start(), PositionEncoding::Utf8); + let error = match err.kind { + preprocess::FutureFeatureErrorKind::InvalidFeature(feature) => { + CodegenErrorType::InvalidFutureFeature(feature) + } + preprocess::FutureFeatureErrorKind::InvalidBraces => { + CodegenErrorType::InvalidFutureBraces + } + }; + CodegenError { + location: Some(location), + error, + source_path: source_file.name().to_owned(), + } + }) +} #[derive(PartialEq, Eq, Clone, Copy)] enum NameUsage { @@ -150,13 +170,14 @@ enum NameUsage { Delete, } /// Main structure holding the state of compilation. -struct Compiler { +struct Compiler<'a> { code_stack: Vec<ir::CodeInfo>, symbol_table_stack: Vec<SymbolTable>, source_file: SourceFile, // current_source_location: SourceLocation, current_source_range: TextRange, done_with_future_stmts: DoneWithFuture, + future_features: bytecode::CodeFlags, future_annotations: bool, ctx: CompileContext, opts: CompileOpts, @@ -168,9 +189,9 @@ struct Compiler { /// When > 0, the compiler walks AST (consuming sub_tables) but emits no bytecode. /// Mirrors CPython's `c_do_not_emit_bytecode`. do_not_emit_bytecode: u32, - /// Disable constant tuple/list/set collection folding in contexts where - /// CPython keeps the builder form for later assignment lowering. - disable_const_collection_folding: bool, + /// Mirrors `c_disable_warning` while compiling FINALLY_END copies. + disable_warning: u32, + syntax_warning_handler: Option<&'a mut SyntaxWarningHandler<'a>>, } #[derive(Clone, Copy)] @@ -180,13 +201,36 @@ enum DoneWithFuture { Yes, } -#[derive(Clone, Copy, Debug)] +#[derive(Clone, Copy)] +enum ComprehensionSymbolSource { + Child, + Inlined, +} + +#[derive(Clone, Copy)] +struct SymbolTableCursors { + sub_table: usize, + hidden_annotation_block: usize, + inlined_comprehension_block: usize, +} + +#[derive(Clone, Debug)] pub struct CompileOpts { /// How optimized the bytecode output should be; any optimize > 0 does /// not emit assert statements pub optimize: u8, /// Include column info in bytecode (-X no_debug_ranges disables) pub debug_ranges: bool, + /// Maximum decimal integer literal digits, matching sys.int_info/default. + pub int_max_str_digits: usize, + /// Allow module-level await/async-for/async-with, matching PyCF_ALLOW_TOP_LEVEL_AWAIT. + pub allow_top_level_await: bool, + /// Future compiler flags passed explicitly to compile(), matching cf_flags merge. + pub future_features: bytecode::CodeFlags, + /// Keep single-input blocks incomplete until a terminating newline is seen. + pub dont_imply_dedent: bool, + /// Recursion limit used by compiler tree walks, matching Py_EnterRecursiveCall. + pub recursion_limit: usize, } impl Default for CompileOpts { @@ -194,6 +238,11 @@ impl Default for CompileOpts { Self { optimize: 0, debug_ranges: true, + int_max_str_digits: 4300, + allow_top_level_await: false, + future_features: bytecode::CodeFlags::empty(), + dont_imply_dedent: false, + recursion_limit: 1000, } } } @@ -258,19 +307,69 @@ fn validate_duplicate_params(params: &ast::Parameters) -> Result<(), CodegenErro /// Compile an Mod produced from ruff parser pub fn compile_top( - mut ast: ruff_python_ast::Mod, + ast: ruff_python_ast::Mod, source_file: SourceFile, mode: Mode, opts: CompileOpts, ) -> CompileResult<CodeObject> { - preprocess::preprocess_mod(&mut ast); + compile_top_with_syntax_warning_handler(ast, source_file, mode, opts, None) +} + +pub fn compile_top_with_syntax_warning_handler<'a>( + mut ast: ruff_python_ast::Mod, + source_file: SourceFile, + mode: Mode, + mut opts: CompileOpts, + mut syntax_warning_handler: Option<&'a mut SyntaxWarningHandler<'a>>, +) -> CompileResult<CodeObject> { + opts.future_features |= checked_future_features(&ast, &source_file)?; + let future_annotations = opts + .future_features + .contains(bytecode::CodeFlags::FUTURE_ANNOTATIONS); + if let Some(handler) = syntax_warning_handler.as_deref_mut() { + preprocess::warn_control_flow_in_finally(&ast, |range, message| { + warn_ast_preprocess_syntax(&source_file, handler, range, message) + })?; + } + if matches!(mode, Mode::Single) + && let ruff_python_ast::Mod::Module(module) = &mut ast + { + preprocess::preprocess_statements( + &mut module.body, + opts.optimize, + future_annotations, + false, + ); + } else { + preprocess::preprocess_mod(&mut ast, opts.optimize, future_annotations, false); + } match ast { ruff_python_ast::Mod::Module(module) => match mode { - Mode::Exec | Mode::Eval => compile_program(&module, source_file, opts), - Mode::Single => compile_program_single(&module, source_file, opts), - Mode::BlockExpr => compile_block_expression(&module, source_file, opts), + Mode::Exec | Mode::Eval => compile_program_with_syntax_warning_handler( + &module, + source_file, + opts, + syntax_warning_handler, + ), + Mode::Single => compile_program_single_with_syntax_warning_handler( + &module, + source_file, + opts, + syntax_warning_handler, + ), + Mode::BlockExpr => compile_block_expression_with_syntax_warning_handler( + &module, + source_file, + opts, + syntax_warning_handler, + ), }, - ruff_python_ast::Mod::Expression(expr) => compile_expression(&expr, source_file, opts), + ruff_python_ast::Mod::Expression(expr) => compile_expression_with_syntax_warning_handler( + &expr, + source_file, + opts, + syntax_warning_handler, + ), } } @@ -280,9 +379,54 @@ pub fn compile_program( source_file: SourceFile, opts: CompileOpts, ) -> CompileResult<CodeObject> { - let symbol_table = SymbolTable::scan_program(ast, source_file.clone()) - .map_err(|e| e.into_codegen_error(source_file.name().to_owned()))?; - let mut compiler = Compiler::new(opts, source_file, "<module>"); + compile_program_with_syntax_warning_handler(ast, source_file, opts, None) +} + +fn scan_module_symbols( + ast: &ast::ModModule, + source_file: &SourceFile, + opts: &CompileOpts, +) -> CompileResult<SymbolTable> { + SymbolTable::scan_program_with_options( + ast, + source_file.clone(), + opts.allow_top_level_await, + opts.future_features + .contains(bytecode::CodeFlags::FUTURE_ANNOTATIONS), + opts.recursion_limit, + ) + .map_err(|e| e.into_codegen_error(source_file.name().to_owned())) +} + +fn scan_expr_symbols( + ast: &ast::ModExpression, + source_file: &SourceFile, + opts: &CompileOpts, +) -> CompileResult<SymbolTable> { + SymbolTable::scan_expr_with_options( + ast, + source_file.clone(), + opts.allow_top_level_await, + opts.future_features + .contains(bytecode::CodeFlags::FUTURE_ANNOTATIONS), + opts.recursion_limit, + ) + .map_err(|e| e.into_codegen_error(source_file.name().to_owned())) +} + +fn compile_program_with_syntax_warning_handler<'a>( + ast: &ast::ModModule, + source_file: SourceFile, + opts: CompileOpts, + syntax_warning_handler: Option<&'a mut SyntaxWarningHandler<'a>>, +) -> CompileResult<CodeObject> { + let symbol_table = scan_module_symbols(ast, &source_file, &opts)?; + let mut compiler = Compiler::new_with_syntax_warning_handler( + opts, + source_file, + "<module>", + syntax_warning_handler, + ); compiler.compile_program(ast, symbol_table)?; let code = compiler.exit_scope(); trace!("Compilation completed: {code:?}"); @@ -295,9 +439,22 @@ pub fn compile_program_single( source_file: SourceFile, opts: CompileOpts, ) -> CompileResult<CodeObject> { - let symbol_table = SymbolTable::scan_program(ast, source_file.clone()) - .map_err(|e| e.into_codegen_error(source_file.name().to_owned()))?; - let mut compiler = Compiler::new(opts, source_file, "<module>"); + compile_program_single_with_syntax_warning_handler(ast, source_file, opts, None) +} + +fn compile_program_single_with_syntax_warning_handler<'a>( + ast: &ast::ModModule, + source_file: SourceFile, + opts: CompileOpts, + syntax_warning_handler: Option<&'a mut SyntaxWarningHandler<'a>>, +) -> CompileResult<CodeObject> { + let symbol_table = scan_module_symbols(ast, &source_file, &opts)?; + let mut compiler = Compiler::new_with_syntax_warning_handler( + opts, + source_file, + "<module>", + syntax_warning_handler, + ); compiler.compile_program_single(&ast.body, symbol_table)?; let code = compiler.exit_scope(); trace!("Compilation completed: {code:?}"); @@ -309,9 +466,22 @@ pub fn compile_block_expression( source_file: SourceFile, opts: CompileOpts, ) -> CompileResult<CodeObject> { - let symbol_table = SymbolTable::scan_program(ast, source_file.clone()) - .map_err(|e| e.into_codegen_error(source_file.name().to_owned()))?; - let mut compiler = Compiler::new(opts, source_file, "<module>"); + compile_block_expression_with_syntax_warning_handler(ast, source_file, opts, None) +} + +fn compile_block_expression_with_syntax_warning_handler<'a>( + ast: &ast::ModModule, + source_file: SourceFile, + opts: CompileOpts, + syntax_warning_handler: Option<&'a mut SyntaxWarningHandler<'a>>, +) -> CompileResult<CodeObject> { + let symbol_table = scan_module_symbols(ast, &source_file, &opts)?; + let mut compiler = Compiler::new_with_syntax_warning_handler( + opts, + source_file, + "<module>", + syntax_warning_handler, + ); compiler.compile_block_expr(&ast.body, symbol_table)?; let code = compiler.exit_scope(); trace!("Compilation completed: {code:?}"); @@ -323,9 +493,22 @@ pub fn compile_expression( source_file: SourceFile, opts: CompileOpts, ) -> CompileResult<CodeObject> { - let symbol_table = SymbolTable::scan_expr(ast, source_file.clone()) - .map_err(|e| e.into_codegen_error(source_file.name().to_owned()))?; - let mut compiler = Compiler::new(opts, source_file, "<module>"); + compile_expression_with_syntax_warning_handler(ast, source_file, opts, None) +} + +fn compile_expression_with_syntax_warning_handler<'a>( + ast: &ast::ModExpression, + source_file: SourceFile, + opts: CompileOpts, + syntax_warning_handler: Option<&'a mut SyntaxWarningHandler<'a>>, +) -> CompileResult<CodeObject> { + let symbol_table = scan_expr_symbols(ast, &source_file, &opts)?; + let mut compiler = Compiler::new_with_syntax_warning_handler( + opts, + source_file, + "<module>", + syntax_warning_handler, + ); compiler.compile_eval(ast, symbol_table)?; let code = compiler.exit_scope(); Ok(code) @@ -353,7 +536,7 @@ macro_rules! emit { }; } -fn eprint_location(zelf: &Compiler) { +fn eprint_location(zelf: &Compiler<'_>) { let start = zelf .source_file .to_source_code() @@ -374,7 +557,7 @@ fn eprint_location(zelf: &Compiler) { /// Better traceback for internal error #[track_caller] -fn unwrap_internal<T>(zelf: &Compiler, r: InternalResult<T>) -> T { +fn unwrap_internal<T>(zelf: &Compiler<'_>, r: InternalResult<T>) -> T { if let Err(ref r_err) = r { eprintln!("=== CODEGEN PANIC INFO ==="); eprintln!("This IS an internal error: {r_err}"); @@ -384,7 +567,7 @@ fn unwrap_internal<T>(zelf: &Compiler, r: InternalResult<T>) -> T { r.unwrap() } -fn compiler_unwrap_option<T>(zelf: &Compiler, o: Option<T>) -> T { +fn compiler_unwrap_option<T>(zelf: &Compiler<'_>, o: Option<T>) -> T { if o.is_none() { eprintln!("=== CODEGEN PANIC INFO ==="); eprintln!("This IS an internal error, an option was unwrapped during codegen"); @@ -454,10 +637,354 @@ enum CollectionType { Set, } +#[derive(Clone, Copy, Eq, PartialEq)] +enum InferredType { + Tuple, + List, + Dict, + Set, + FrozenSet, + Generator, + Function, + Template, + Str, + Bytes, + Int, + Float, + Complex, + Bool, + NoneType, + Ellipsis, + Slice, +} + +impl InferredType { + const fn name(self) -> &'static str { + match self { + Self::Tuple => "tuple", + Self::List => "list", + Self::Dict => "dict", + Self::Set => "set", + Self::FrozenSet => "frozenset", + Self::Generator => "generator", + Self::Function => "function", + Self::Template => "string.templatelib.Template", + Self::Str => "str", + Self::Bytes => "bytes", + Self::Int => "int", + Self::Float => "float", + Self::Complex => "complex", + Self::Bool => "bool", + Self::NoneType => "NoneType", + Self::Ellipsis => "ellipsis", + Self::Slice => "slice", + } + } + + const fn is_long_subclass(self) -> bool { + matches!(self, Self::Int | Self::Bool) + } +} + const STACK_USE_GUIDELINE: u32 = 30; -impl Compiler { - fn new(opts: CompileOpts, source_file: SourceFile, code_name: &str) -> Self { +impl<'warnings> Compiler<'warnings> { + fn constant_truthiness(constant: &ConstantData) -> bool { + match constant { + ConstantData::Tuple { elements } | ConstantData::Frozenset { elements } => { + !elements.is_empty() + } + ConstantData::Integer { value } => !value.is_zero(), + ConstantData::Float { value } => *value != 0.0, + ConstantData::Complex { value } => value.re != 0.0 || value.im != 0.0, + ConstantData::Boolean { value } => *value, + ConstantData::Str { value } => !value.is_empty(), + ConstantData::Bytes { value } => !value.is_empty(), + ConstantData::Code { .. } | ConstantData::Slice { .. } | ConstantData::Ellipsis => true, + ConstantData::None => false, + } + } + + fn infer_type_constant(constant: &ConstantData) -> Option<InferredType> { + match constant { + ConstantData::Tuple { .. } => Some(InferredType::Tuple), + ConstantData::Frozenset { .. } => Some(InferredType::FrozenSet), + ConstantData::Integer { .. } => Some(InferredType::Int), + ConstantData::Float { .. } => Some(InferredType::Float), + ConstantData::Complex { .. } => Some(InferredType::Complex), + ConstantData::Boolean { .. } => Some(InferredType::Bool), + ConstantData::Str { .. } => Some(InferredType::Str), + ConstantData::Bytes { .. } => Some(InferredType::Bytes), + ConstantData::None => Some(InferredType::NoneType), + ConstantData::Ellipsis => Some(InferredType::Ellipsis), + ConstantData::Slice { .. } => Some(InferredType::Slice), + ConstantData::Code { .. } => None, + } + } + + fn infer_type(&self, expr: &ast::Expr) -> Option<InferredType> { + if let Some(constant) = self.ast_constant_value(expr) { + return Self::infer_type_constant(&constant); + } + match expr { + ast::Expr::Tuple(_) => Some(InferredType::Tuple), + ast::Expr::List(_) | ast::Expr::ListComp(_) => Some(InferredType::List), + ast::Expr::Dict(_) | ast::Expr::DictComp(_) => Some(InferredType::Dict), + ast::Expr::Set(_) | ast::Expr::SetComp(_) => Some(InferredType::Set), + ast::Expr::Generator(_) => Some(InferredType::Generator), + ast::Expr::Lambda(_) => Some(InferredType::Function), + ast::Expr::TString(_) => Some(InferredType::Template), + ast::Expr::FString(_) | ast::Expr::StringLiteral(_) => Some(InferredType::Str), + ast::Expr::BytesLiteral(_) => Some(InferredType::Bytes), + ast::Expr::NumberLiteral(number) => match number.value { + ast::Number::Int(_) => Some(InferredType::Int), + ast::Number::Float(_) => Some(InferredType::Float), + ast::Number::Complex { .. } => Some(InferredType::Complex), + }, + ast::Expr::BooleanLiteral(_) => Some(InferredType::Bool), + ast::Expr::NoneLiteral(_) => Some(InferredType::NoneType), + ast::Expr::EllipsisLiteral(_) => Some(InferredType::Ellipsis), + ast::Expr::Slice(_) => Some(InferredType::Slice), + _ => None, + } + } + + fn is_constant_expr(&self, expr: &ast::Expr) -> bool { + if self.ast_constant_value(expr).is_some() { + return true; + } + matches!( + expr, + ast::Expr::StringLiteral(_) + | ast::Expr::BytesLiteral(_) + | ast::Expr::NumberLiteral(_) + | ast::Expr::BooleanLiteral(_) + | ast::Expr::NoneLiteral(_) + | ast::Expr::EllipsisLiteral(_) + ) + } + + fn is_constant_slice(&self, slice: &ast::Expr) -> bool { + match slice { + ast::Expr::Slice(s) => { + let lower_const = s.lower.is_none() + || s.lower.as_deref().is_some_and(|e| self.is_constant_expr(e)); + let upper_const = s.upper.is_none() + || s.upper.as_deref().is_some_and(|e| self.is_constant_expr(e)); + let step_const = + s.step.is_none() || s.step.as_deref().is_some_and(|e| self.is_constant_expr(e)); + lower_const && upper_const && step_const + } + _ => false, + } + } + + fn should_apply_two_element_slice_optimization(&self, slice: &ast::Expr) -> bool { + !self.is_constant_slice(slice) && matches!(slice, ast::Expr::Slice(s) if s.step.is_none()) + } + + fn check_is_arg(&self, expr: &ast::Expr) -> bool { + if let Some(constant) = self.ast_constant_value(expr) { + return matches!( + constant, + ConstantData::None | ConstantData::Boolean { .. } | ConstantData::Ellipsis + ); + } + if let ast::Expr::Tuple(tuple) = expr { + return !tuple.elts.iter().all(|expr| self.is_constant_expr(expr)); + } + if !self.is_constant_expr(expr) { + return true; + } + matches!( + expr, + ast::Expr::NoneLiteral(_) + | ast::Expr::BooleanLiteral(_) + | ast::Expr::EllipsisLiteral(_) + ) + } + + fn warn_syntax(&mut self, range: TextRange, message: String) -> CompileResult<()> { + if self.disable_warning > 0 { + return Ok(()); + } + let Some(handler) = self.syntax_warning_handler.as_deref_mut() else { + return Ok(()); + }; + let location = self + .source_file + .to_source_code() + .source_location(range.start(), PositionEncoding::Utf8); + handler(location, message) + } + + fn check_caller(&mut self, func: &ast::Expr) -> CompileResult<()> { + let warns = self.ast_constant_value(func).is_some() + || matches!( + func, + ast::Expr::StringLiteral(_) + | ast::Expr::BytesLiteral(_) + | ast::Expr::NumberLiteral(_) + | ast::Expr::BooleanLiteral(_) + | ast::Expr::NoneLiteral(_) + | ast::Expr::EllipsisLiteral(_) + | ast::Expr::Tuple(_) + | ast::Expr::List(_) + | ast::Expr::ListComp(_) + | ast::Expr::Dict(_) + | ast::Expr::DictComp(_) + | ast::Expr::Set(_) + | ast::Expr::SetComp(_) + | ast::Expr::Generator(_) + | ast::Expr::FString(_) + | ast::Expr::TString(_) + ); + if warns && let Some(inferred) = self.infer_type(func) { + self.warn_syntax( + func.range(), + format!( + "'{}' object is not callable; perhaps you missed a comma?", + inferred.name() + ), + )?; + } + Ok(()) + } + + fn check_compare( + &mut self, + range: TextRange, + left: &ast::Expr, + ops: &[ast::CmpOp], + comparators: &[ast::Expr], + ) -> CompileResult<()> { + let mut left_is_arg = self.check_is_arg(left); + let mut left_expr = left; + for (op, right_expr) in ops.iter().zip(comparators.iter()) { + let right_is_arg = self.check_is_arg(right_expr); + if matches!(op, ast::CmpOp::Is | ast::CmpOp::IsNot) && (!right_is_arg || !left_is_arg) { + let literal = if !left_is_arg { left_expr } else { right_expr }; + if let Some(inferred) = self.infer_type(literal) { + let is_op = matches!(op, ast::CmpOp::Is); + let op = if is_op { "\"is\"" } else { "\"is not\"" }; + let replacement = if is_op { "==" } else { "!=" }; + self.warn_syntax( + range, + format!( + "{op} with '{}' literal. Did you mean \"{replacement}\"?", + inferred.name() + ), + )?; + return Ok(()); + } + } + left_is_arg = right_is_arg; + left_expr = right_expr; + } + Ok(()) + } + + fn constant_warns_as_subscripter(constant: &ConstantData) -> bool { + matches!( + constant, + ConstantData::None + | ConstantData::Ellipsis + | ConstantData::Integer { .. } + | ConstantData::Float { .. } + | ConstantData::Complex { .. } + | ConstantData::Boolean { .. } + | ConstantData::Frozenset { .. } + ) + } + + fn check_subscripter(&mut self, value: &ast::Expr) -> CompileResult<()> { + let warns = self + .ast_constant_value(value) + .is_some_and(|constant| Self::constant_warns_as_subscripter(&constant)) + || matches!( + value, + ast::Expr::NoneLiteral(_) + | ast::Expr::EllipsisLiteral(_) + | ast::Expr::NumberLiteral(_) + | ast::Expr::BooleanLiteral(_) + | ast::Expr::Set(_) + | ast::Expr::SetComp(_) + | ast::Expr::Generator(_) + | ast::Expr::TString(_) + | ast::Expr::Lambda(_) + ); + if warns && let Some(inferred) = self.infer_type(value) { + self.warn_syntax( + value.range(), + format!( + "'{}' object is not subscriptable; perhaps you missed a comma?", + inferred.name() + ), + )?; + } + Ok(()) + } + + fn check_index(&mut self, value: &ast::Expr, slice: &ast::Expr) -> CompileResult<()> { + let Some(index_type) = self.infer_type(slice) else { + return Ok(()); + }; + if index_type.is_long_subclass() || index_type == InferredType::Slice { + return Ok(()); + } + + let constant_warns = self.ast_constant_value(value).is_some_and(|constant| { + matches!( + constant, + ConstantData::Str { .. } | ConstantData::Bytes { .. } | ConstantData::Tuple { .. } + ) + }); + let warns = constant_warns + || matches!( + value, + ast::Expr::StringLiteral(_) + | ast::Expr::BytesLiteral(_) + | ast::Expr::Tuple(_) + | ast::Expr::List(_) + | ast::Expr::ListComp(_) + | ast::Expr::FString(_) + ); + if warns && let Some(value_type) = self.infer_type(value) { + self.warn_syntax( + value.range(), + format!( + "{} indices must be integers or slices, not {}; perhaps you missed a comma?", + value_type.name(), + index_type.name() + ), + )?; + } + Ok(()) + } + + fn check_assert(&mut self, assert_stmt: &ast::StmtAssert) -> CompileResult<()> { + let warns = match &*assert_stmt.test { + ast::Expr::Tuple(tuple) => !tuple.elts.is_empty(), + _ => matches!( + self.ast_constant_value(&assert_stmt.test), + Some(ConstantData::Tuple { ref elements }) if !elements.is_empty() + ), + }; + if warns { + self.warn_syntax( + assert_stmt.range, + "assertion is always true, perhaps remove parentheses?".to_owned(), + )?; + } + Ok(()) + } + + fn new_with_syntax_warning_handler( + opts: CompileOpts, + source_file: SourceFile, + code_name: &str, + syntax_warning_handler: Option<&'warnings mut SyntaxWarningHandler<'warnings>>, + ) -> Self { let module_code = ir::CodeInfo { // CPython convention: top-level module / interactive / // expression code does not carry CO_NEWLOCALS or CO_OPTIMIZED. @@ -467,7 +994,7 @@ impl Compiler { // empty flags. frame.rs:725-731 then binds locals to globals // for module/REPL frames whose `scope.locals` is None - the // correct semantics for `exec(code, globals)` and module init. - flags: CodeFlags::empty(), + flags: bytecode::CodeFlags::empty(), source_path: source_file.name().to_owned(), private: None, blocks: Blocks::from([Block::default()]), @@ -492,7 +1019,7 @@ impl Compiler { }, static_attributes: None, in_inlined_comp: false, - fblock: Vec::with_capacity(MAXBLOCKS), + fblock: Vec::with_capacity(CO_MAXBLOCKS), symbol_table_index: 0, // Module is always the first symbol table nparams: 0, in_conditional_block: 0, @@ -505,6 +1032,7 @@ impl Compiler { // current_source_location: SourceLocation::default(), current_source_range: TextRange::default(), done_with_future_stmts: DoneWithFuture::No, + future_features: opts.future_features, future_annotations: false, ctx: CompileContext { in_class: false, @@ -515,25 +1043,11 @@ impl Compiler { in_annotation: false, interactive: false, do_not_emit_bytecode: 0, - disable_const_collection_folding: false, + disable_warning: 0, + syntax_warning_handler, } } - fn compile_expression_without_const_collection_folding( - &mut self, - expression: &ast::Expr, - ) -> CompileResult<()> { - let previous = self.disable_const_collection_folding; - self.disable_const_collection_folding = true; - let result = self.compile_expression(expression); - self.disable_const_collection_folding = previous; - result.map(|_| ()) - } - - fn is_unpack_assignment_target(target: &ast::Expr) -> bool { - matches!(target, ast::Expr::List(_) | ast::Expr::Tuple(_)) - } - fn compile_module_annotation_setup_sequence( &mut self, body: &[ast::Stmt], @@ -569,8 +1083,12 @@ impl Compiler { mem::replace(&mut code.instr_sequence, saved_instr_sequence); code.current_block = saved_current_block; code.instr_sequence_label_map = saved_instr_sequence_label_map; - code.annotations_instr_sequence = Some(annotations_instr_sequence); debug_assert!(saved_annotations_instr_sequence.is_none()); + if matches!(result, Ok(true)) { + code.annotations_instr_sequence = Some(annotations_instr_sequence); + } else { + code.annotations_instr_sequence = saved_annotations_instr_sequence; + } }; result.map(|_| ()) @@ -607,13 +1125,17 @@ impl Compiler { ) -> CompileResult<()> { // Save full subscript expression range (set by compile_expression before this call) let subscript_range = self.current_source_range; + if matches!(ctx, ast::ExprContext::Load) { + self.check_subscripter(value)?; + self.check_index(value, slice)?; + } // VISIT(c, expr, e->v.Subscript.value) self.compile_expression(value)?; // Handle two-element non-constant slice with BINARY_SLICE/STORE_SLICE let use_slice_opt = matches!(ctx, ast::ExprContext::Load | ast::ExprContext::Store) - && slice.should_use_slice_optimization(); + && self.should_apply_two_element_slice_optimization(slice); if use_slice_opt { match slice { ast::Expr::Slice(s) => self.compile_slice_two_parts(s)?, @@ -659,9 +1181,10 @@ impl Compiler { /// - collection_type: What type of collection to build (tuple, list, set) /// // = starunpack_helper in compile.c - fn starunpack_helper( + fn starunpack_helper_impl( &mut self, elts: &[ast::Expr], + injected_arg: Option<&str>, pushed: u32, collection_type: CollectionType, ) -> CompileResult<()> { @@ -669,46 +1192,23 @@ impl Compiler { let n = elts.len().to_u32(); let seen_star = elts.iter().any(|e| matches!(e, ast::Expr::Starred(_))); - let big = n + pushed > STACK_USE_GUIDELINE; + let injected_count = u32::from(injected_arg.is_some()); + let big = n + pushed + injected_count > STACK_USE_GUIDELINE; - // Match CPython's constant ordering by letting the late flowgraph-style - // folding passes introduce tuple-backed constants after their operands - // have first been emitted as constants. - let can_fold_const_collection = false; - if !self.disable_const_collection_folding - && !seen_star - && pushed == 0 - && can_fold_const_collection - && let Some(folded) = self.try_fold_constant_collection(elts, collection_type)? - { - match collection_type { - CollectionType::Tuple => { - self.emit_load_const(folded); - } - CollectionType::List => { - self.set_source_range(collection_range); - emit!(self, Instruction::BuildList { count: 0 }); - self.emit_load_const(folded); - self.set_source_range(collection_range); - emit!(self, Instruction::ListExtend { i: 1 }); - } - CollectionType::Set => { - self.set_source_range(collection_range); - emit!(self, Instruction::BuildSet { count: 0 }); - self.emit_load_const(folded); - self.set_source_range(collection_range); - emit!(self, Instruction::SetUpdate { i: 1 }); - } - } - return Ok(()); - } + // Constant collections are not folded here: the late flowgraph + // optimization passes introduce tuple-backed constants after their + // operands have first been emitted, matching the constant ordering. // If no stars and not too big, compile all elements and build once if !seen_star && !big { for elt in elts { self.compile_expression(elt)?; } - let total_size = n + pushed; + if let Some(injected_arg) = injected_arg { + self.set_source_range(collection_range); + self.load_name(injected_arg)?; + } + let total_size = n + injected_count + pushed; self.set_source_range(collection_range); match collection_type { CollectionType::List => { @@ -729,6 +1229,7 @@ impl Compiler { let mut i = 0u32; if big { + self.set_source_range(collection_range); match collection_type { CollectionType::List => { emit!(self, Instruction::BuildList { count: pushed }); @@ -803,22 +1304,22 @@ impl Compiler { } } - // If we never built sequence (all non-starred), build it now - if !sequence_built { + debug_assert!(sequence_built); + if let Some(injected_arg) = injected_arg { + self.set_source_range(collection_range); + self.load_name(injected_arg)?; self.set_source_range(collection_range); match collection_type { - CollectionType::List => { - emit!(self, Instruction::BuildList { count: i + pushed }); + CollectionType::List | CollectionType::Tuple => { + emit!(self, Instruction::ListAppend { i: 1 }); } CollectionType::Set => { - emit!(self, Instruction::BuildSet { count: i + pushed }); - } - CollectionType::Tuple => { - emit!(self, Instruction::BuildTuple { count: i + pushed }); + emit!(self, Instruction::SetAdd { i: 1 }); } } - } else if collection_type == CollectionType::Tuple { - // For tuples, convert the list to tuple + } + + if collection_type == CollectionType::Tuple { self.set_source_range(collection_range); emit!( self, @@ -831,6 +1332,15 @@ impl Compiler { Ok(()) } + fn starunpack_helper( + &mut self, + elts: &[ast::Expr], + pushed: u32, + collection_type: CollectionType, + ) -> CompileResult<()> { + self.starunpack_helper_impl(elts, None, pushed, collection_type) + } + fn error(&mut self, error: CodegenErrorType) -> CodegenError { self.error_ranged(error, self.current_source_range) } @@ -847,6 +1357,21 @@ impl Compiler { } } + fn error_optional_range( + &mut self, + error: CodegenErrorType, + range: Option<TextRange>, + ) -> CodegenError { + match range { + Some(range) => self.error_ranged(error, range), + None => CodegenError { + error, + location: None, + source_path: self.source_file.name().to_owned(), + }, + } + } + /// Get the SymbolTable for the current scope. fn current_symbol_table(&self) -> &SymbolTable { self.symbol_table_stack @@ -929,6 +1454,20 @@ impl Compiler { )))); } + while current_table.next_sub_table < current_table.sub_tables.len() + && current_table.sub_tables[current_table.next_sub_table].typ + == CompilerScope::Annotation + { + current_table.next_sub_table += 1; + } + if current_table.next_sub_table >= current_table.sub_tables.len() { + let name = current_table.name.clone(); + let typ = current_table.typ; + return Err(self.error(CodegenErrorType::SyntaxError(format!( + "no symbol table available in {name} (type: {typ:?})" + )))); + } + let idx = current_table.next_sub_table; current_table.next_sub_table += 1; let table = current_table.sub_tables[idx].clone(); @@ -938,28 +1477,94 @@ impl Compiler { Ok(self.current_symbol_table()) } - /// Push the annotation symbol table from the next sub_table's annotation_block - /// The annotation_block is stored in the function's scope, which is the next sub_table - /// Returns true if annotation_block exists, false otherwise - fn push_annotation_symbol_table(&mut self) -> bool { + fn push_symbol_table_matching( + &mut self, + typ: CompilerScope, + table_name: &str, + ) -> CompileResult<&SymbolTable> { let current_table = self .symbol_table_stack .last_mut() .expect("no current symbol table"); - // The annotation_block is in the next sub_table (function scope) - let next_idx = current_table.next_sub_table; - if next_idx >= current_table.sub_tables.len() { - return false; + while current_table.next_sub_table < current_table.sub_tables.len() + && current_table.sub_tables[current_table.next_sub_table].typ + == CompilerScope::Annotation + { + current_table.next_sub_table += 1; } - let next_table = &mut current_table.sub_tables[next_idx]; - if let Some(annotation_block) = next_table.annotation_block.take() { - self.symbol_table_stack.push(*annotation_block); - true - } else { - false + let start = current_table.next_sub_table; + let Some(idx) = current_table.sub_tables[start..] + .iter() + .position(|table| table.typ == typ && table.name == table_name) + .map(|idx| start + idx) + else { + let name = current_table.name.clone(); + let current_typ = current_table.typ; + return Err(self.error(CodegenErrorType::SyntaxError(format!( + "no matching symbol table {table_name} ({typ:?}) available in {name} (type: {current_typ:?})" + )))); + }; + + let table = current_table.sub_tables[idx].clone(); + current_table.next_sub_table = idx + 1; + self.symbol_table_stack.push(table); + Ok(self.current_symbol_table()) + } + + /// Push the function annotation symbol table. + /// Signature annotation blocks are stored in st_blocks keyed by the + /// arguments AST node. Without future annotations they are also children; + /// with future annotations they are hidden from children and consumed here. + fn push_annotation_symbol_table(&mut self) -> bool { + let Some(annotation_table) = ({ + let current_table = self + .symbol_table_stack + .last_mut() + .expect("no current symbol table"); + + let next_idx = current_table.next_sub_table; + if next_idx < current_table.sub_tables.len() + && current_table.sub_tables[next_idx].typ == CompilerScope::Annotation + { + let next_table = current_table.sub_tables[next_idx].clone(); + current_table.next_sub_table += 1; + Some(next_table) + } else if current_table.next_hidden_annotation_block + < current_table.hidden_annotation_blocks.len() + { + let idx = current_table.next_hidden_annotation_block; + current_table.next_hidden_annotation_block += 1; + Some(current_table.hidden_annotation_blocks[idx].clone()) + } else { + None + } + }) else { + return false; + }; + + self.symbol_table_stack.push(annotation_table); + true + } + + fn next_function_annotation_symbol_table_uses_annotations(&self) -> bool { + let current_table = self + .symbol_table_stack + .last() + .expect("no current symbol table"); + let next_idx = current_table.next_sub_table; + if next_idx < current_table.sub_tables.len() + && current_table.sub_tables[next_idx].typ == CompilerScope::Annotation + { + return current_table.sub_tables[next_idx].annotations_used; } + + let hidden_idx = current_table.next_hidden_annotation_block; + current_table + .hidden_annotation_blocks + .get(hidden_idx) + .is_some_and(|table| table.annotations_used) } /// Push the annotation symbol table for module/class level annotations @@ -979,19 +1584,9 @@ impl Compiler { } } - /// Pop the annotation symbol table and restore it to the function scope's annotation_block + /// Pop the annotation symbol table. fn pop_annotation_symbol_table(&mut self) { - let annotation_table = self.symbol_table_stack.pop().expect("compiler bug"); - let current_table = self - .symbol_table_stack - .last_mut() - .expect("no current symbol table"); - - // Restore to the next sub_table (function scope) where it came from - let next_idx = current_table.next_sub_table; - if next_idx < current_table.sub_tables.len() { - current_table.sub_tables[next_idx].annotation_block = Some(Box::new(annotation_table)); - } + self.symbol_table_stack.pop().expect("compiler bug"); } /// Pop the current symbol table off the stack @@ -1032,28 +1627,22 @@ impl Compiler { return None; } - // 5. Must be inside a function (not at module level or class body) - if !self.ctx.in_func() { - return None; - } - - // 6. "super" must be GlobalImplicit (not redefined locally or at module level) + // 5. "super" must be GlobalImplicit in the current scope. let table = self.current_symbol_table(); if let Some(symbol) = table.lookup("super") && symbol.scope != SymbolScope::GlobalImplicit { return None; } - // Also check top-level scope to detect module-level shadowing. - // Only block if super is actually *bound* at module level (not just used). + // Then check the top-level scope and reject any statically + // visible symbol for "super", not just local bindings. if let Some(top_table) = self.symbol_table_stack.first() - && let Some(sym) = top_table.lookup("super") - && sym.scope != SymbolScope::GlobalImplicit + && top_table.lookup("super").is_some() { return None; } - // 7. Check argument pattern + // 6. Check argument pattern let args = &arguments.args; // No starred expressions allowed @@ -1180,10 +1769,13 @@ impl Compiler { let source_path = self.source_file.name().to_owned(); // Lookup symbol table entry using key (_PySymtable_Lookup) - let Some(ste) = self.symbol_table_stack.get(key) else { - return Err(self.error(CodegenErrorType::SyntaxError( - "unknown symbol table entry".into(), - ))); + let ste = match self.symbol_table_stack.get(key) { + Some(v) => v, + None => { + return Err(self.error(CodegenErrorType::SyntaxError( + "unknown symbol table entry".to_owned(), + ))); + } }; // Use varnames from symbol table (already collected in definition order) @@ -1192,32 +1784,16 @@ impl Compiler { // Build cellvars using dictbytype (CELL scope or COMP_CELL flag, sorted) let mut cellvar_cache = IndexSet::default(); - // CPython ordering: parameter cells first (in parameter order), - // then non-parameter cells (alphabetically sorted) - let cell_symbols: Vec<_> = ste + let mut cell_names: Vec<_> = ste .symbols .iter() .filter(|(_, s)| { s.scope == SymbolScope::Cell || s.flags.contains(SymbolFlags::COMP_CELL) }) - .map(|(name, sym)| (name.clone(), sym.flags)) + .map(|(name, _)| name.clone()) .collect(); - let mut param_cells = Vec::new(); - let mut nonparam_cells = Vec::new(); - for (name, flags) in cell_symbols { - if flags.contains(SymbolFlags::PARAMETER) { - param_cells.push(name); - } else { - nonparam_cells.push(name); - } - } - // param_cells are already in parameter order (from varname_cache insertion order) - param_cells.sort_by_key(|n| varname_cache.get_index_of(n.as_str()).unwrap_or(usize::MAX)); - nonparam_cells.sort(); - for name in param_cells { - cellvar_cache.insert(name); - } - for name in nonparam_cells { + cell_names.sort(); + for name in cell_names { cellvar_cache.insert(name); } @@ -1254,21 +1830,16 @@ impl Compiler { .collect() }) .unwrap_or_default(); - - let mut free_names = ste + let mut free_names: Vec<_> = ste .symbols .iter() .filter(|(_, s)| { - if s.scope == SymbolScope::Free { - return true; - } - - let has_free_class = s.flags.contains(SymbolFlags::FREE_CLASS); - if scope_type == CompilerScope::Class { - has_free_class && self.has_enclosing_non_module_code_scope() - } else { - has_free_class - } + s.scope == SymbolScope::Free + || (scope_type != CompilerScope::Class + && s.flags.contains(SymbolFlags::FREE_CLASS)) + || (scope_type == CompilerScope::Class + && s.flags.contains(SymbolFlags::FREE_CLASS) + && self.has_enclosing_non_module_code_scope()) }) .filter(|(name, symbol)| { if !matches!( @@ -1280,8 +1851,7 @@ impl Compiler { !(annotation_free_names.contains(*name) && symbol.flags.is_empty()) }) .map(|(name, _)| name.clone()) - .collect::<Vec<_>>(); - + .collect(); free_names.sort(); for name in free_names { freevar_cache.insert(name); @@ -1289,31 +1859,42 @@ impl Compiler { // Initialize u_metadata fields let (mut flags, posonlyarg_count, arg_count, kwonlyarg_count) = match scope_type { - CompilerScope::Module => (CodeFlags::empty(), 0, 0, 0), - CompilerScope::Class => (CodeFlags::empty(), 0, 0, 0), + CompilerScope::Module => (bytecode::CodeFlags::empty(), 0, 0, 0), + CompilerScope::Class => (bytecode::CodeFlags::empty(), 0, 0, 0), CompilerScope::Function | CompilerScope::AsyncFunction | CompilerScope::Lambda => ( - CodeFlags::NEWLOCALS | CodeFlags::OPTIMIZED, + bytecode::CodeFlags::NEWLOCALS | bytecode::CodeFlags::OPTIMIZED, 0, // Will be set later in enter_function 0, // Will be set later in enter_function 0, // Will be set later in enter_function ), CompilerScope::Comprehension => ( - CodeFlags::NEWLOCALS | CodeFlags::OPTIMIZED, + bytecode::CodeFlags::NEWLOCALS | bytecode::CodeFlags::OPTIMIZED, 0, 1, // comprehensions take one argument (.0) 0, ), - CompilerScope::TypeParams => (CodeFlags::NEWLOCALS | CodeFlags::OPTIMIZED, 0, 0, 0), + CompilerScope::TypeParams => ( + bytecode::CodeFlags::NEWLOCALS | bytecode::CodeFlags::OPTIMIZED, + 0, + 0, + 0, + ), CompilerScope::Annotation => ( - CodeFlags::NEWLOCALS | CodeFlags::OPTIMIZED, + bytecode::CodeFlags::NEWLOCALS | bytecode::CodeFlags::OPTIMIZED, 1, // format is positional-only - 1, // annotation scope takes one argument (format) + 0, + 0, + ), + CompilerScope::TypeAlias | CompilerScope::TypeVariable => ( + bytecode::CodeFlags::NEWLOCALS | bytecode::CodeFlags::OPTIMIZED, + 1, // format is positional-only + 0, 0, ), }; if ste.is_method { - flags |= CodeFlags::METHOD; + flags |= bytecode::CodeFlags::METHOD; } // CPython sets CO_NESTED from symtable's ste_nested, not merely @@ -1327,15 +1908,15 @@ impl Compiler { | CompilerScope::Lambda | CompilerScope::Comprehension | CompilerScope::Annotation + | CompilerScope::TypeAlias + | CompilerScope::TypeVariable | CompilerScope::TypeParams ) { - flags | CodeFlags::NESTED + flags | bytecode::CodeFlags::NESTED } else { flags }; - if self.future_annotations { - flags |= CodeFlags::FUTURE_ANNOTATIONS; - } + flags |= self.future_features; // Get private name from parent scope let private = if !self.code_stack.is_empty() { @@ -1375,7 +1956,7 @@ impl Compiler { None }, in_inlined_comp: false, - fblock: Vec::with_capacity(MAXBLOCKS), + fblock: Vec::with_capacity(CO_MAXBLOCKS), symbol_table_index: key, nparams, in_conditional_block: 0, @@ -1418,7 +1999,10 @@ impl Compiler { let except_handler = None; self.cpython_cfg_builder_addop(ir::InstructionInfo { - instr: Opcode::Resume.into(), + instr: Instruction::Resume { + context: OpArgMarker::marker(), + } + .into(), arg: OpArg::new(oparg::ResumeLocation::AtFuncStart.into()), target: BlockIdx::NULL, location, @@ -1456,7 +2040,15 @@ impl Compiler { // Preserve flags computed from the symbol-table context. info.flags = flags | (info.flags - & (CodeFlags::NESTED | CodeFlags::METHOD | CodeFlags::FUTURE_ANNOTATIONS)); + & (bytecode::CodeFlags::NESTED + | bytecode::CodeFlags::METHOD + | bytecode::CodeFlags::FUTURE_DIVISION + | bytecode::CodeFlags::FUTURE_ABSOLUTE_IMPORT + | bytecode::CodeFlags::FUTURE_WITH_STATEMENT + | bytecode::CodeFlags::FUTURE_PRINT_FUNCTION + | bytecode::CodeFlags::FUTURE_UNICODE_LITERALS + | bytecode::CodeFlags::FUTURE_GENERATOR_STOP + | bytecode::CodeFlags::FUTURE_ANNOTATIONS)); info.metadata.argcount = arg_count; info.metadata.posonlyargcount = posonlyarg_count; info.metadata.kwonlyargcount = kwonlyarg_count; @@ -1466,7 +2058,7 @@ impl Compiler { // compiler_exit_scope fn exit_scope(&mut self) -> CodeObject { - let _table = self.pop_symbol_table(); + self.pop_symbol_table(); // Various scopes can have sub_tables: // - ast::TypeParams scope can have sub_tables (the function body's symbol table) // - Module scope can have sub_tables (for TypeAlias scopes, nested functions, classes) @@ -1479,17 +2071,25 @@ impl Compiler { unwrap_internal(self, stack_top.finalize_code(&self.opts)) } - /// Exit annotation scope - similar to exit_scope but restores annotation_block to parent + fn expose_annotation_format_parameter(code: &mut CodeObject) { + if let Some(first) = code.varnames.first_mut() { + *first = "format".to_owned(); + } + } + + /// Exit a function signature annotation scope. fn exit_annotation_scope(&mut self, saved_ctx: CompileContext) -> CodeObject { self.pop_annotation_symbol_table(); self.ctx = saved_ctx; let pop = self.code_stack.pop(); let stack_top = compiler_unwrap_option(self, pop); - unwrap_internal(self, stack_top.finalize_code(&self.opts)) + let mut code = unwrap_internal(self, stack_top.finalize_code(&self.opts)); + Self::expose_annotation_format_parameter(&mut code); + code } - /// Enter annotation scope using the symbol table's annotation_block. - /// Returns None if no annotation_block exists. + /// Enter a function signature annotation scope. + /// Returns None if no matching annotation symbol table exists. /// On success, returns the saved CompileContext to pass to exit_annotation_scope. fn enter_annotation_scope( &mut self, @@ -1518,12 +2118,12 @@ impl Compiler { lineno.to_u32(), )?; - // Override arg_count since enter_scope sets it to 1 but we need the varnames - // setup to be correct too + // Keep the internal ".format" name; exit_annotation_scope() + // renames it to "format" on the final code object. self.current_code_info() .metadata .varnames - .insert("format".to_owned()); + .insert(".format".to_owned()); // Emit format validation: if format > VALUE_WITH_FAKE_GLOBALS: raise NotImplementedError // VALUE_WITH_FAKE_GLOBALS = 2 (from annotationlib.Format) @@ -1586,12 +2186,15 @@ impl Compiler { fb_datum: FBlockDatum, ) -> CompileResult<()> { let fb_range = self.current_source_range; - let code = self.current_code_info(); - if code.fblock.len() >= MAXBLOCKS { + if self.current_code_info().fblock.len() >= CO_MAXBLOCKS { return Err(self.error(CodegenErrorType::SyntaxError( "too many statically nested blocks".to_owned(), ))); } + if matches!(fb_type, FBlockType::FinallyEnd) { + self.disable_warning += 1; + } + let code = self.current_code_info(); code.fblock.push(FBlockInfo { fb_type, fb_block, @@ -1608,16 +2211,49 @@ impl Compiler { expected_type: FBlockType, expected_block: ir::InstructionSequenceLabel, ) -> FBlockInfo { - let code = self.current_code_info(); - let fblock = code.fblock.pop().expect("fblock stack underflow"); + let fblock = { + let code = self.current_code_info(); + code.fblock.pop().expect("fblock stack underflow") + }; debug_assert_eq!(fblock.fb_type, expected_type); debug_assert_eq!( fblock.fb_block, expected_block, "CPython _PyCompile_PopFBlock asserts the popped fb_block label" ); + if matches!(expected_type, FBlockType::FinallyEnd) { + self.disable_warning -= 1; + } fblock } + /// `_PyCompile_PushFBlock()` call used by + /// `codegen_unwind_fblock_stack()` to restore the copied fblock after + /// recursive unwinding. + fn restore_fblock_info(&mut self, fblock: FBlockInfo) -> CompileResult<()> { + let FBlockInfo { + fb_type, + fb_block, + fb_exit, + fb_range, + fb_datum, + } = fblock; + let code = self.current_code_info(); + if code.fblock.len() >= CO_MAXBLOCKS { + return Err(self.error_ranged( + CodegenErrorType::SyntaxError("too many statically nested blocks".to_owned()), + fb_range, + )); + } + code.fblock.push(FBlockInfo { + fb_type, + fb_block, + fb_exit, + fb_range, + fb_datum, + }); + Ok(()) + } + fn set_unwind_source_range(&mut self, loc: Option<TextRange>) { if let Some(range) = loc { self.set_source_range(range); @@ -1667,10 +2303,32 @@ impl Compiler { } FBlockType::FinallyTry => { - // FinallyTry is now handled specially in unwind_fblock_stack - // to avoid infinite recursion when the finally body contains return/break/continue. - // This branch should not be reached. - unreachable!("FinallyTry should be handled by unwind_fblock_stack"); + // codegen_unwind_fblock(FINALLY_TRY) + self.set_unwind_source_range(*loc); + emit!(self, PseudoInstruction::PopBlock); + self.mark_unwind_no_location(*loc); + + if preserve_tos { + self.push_fblock_labels( + FBlockType::PopValue, + ir::InstructionSequenceLabel::NO_LABEL, + ir::InstructionSequenceLabel::NO_LABEL, + FBlockDatum::None, + )?; + } + + if let FBlockDatum::FinallyBody(ref body) = info.fb_datum { + self.compile_statements(body)?; + } + + if preserve_tos { + self.pop_fblock_label( + FBlockType::PopValue, + ir::InstructionSequenceLabel::NO_LABEL, + ); + } + + *loc = None; } FBlockType::FinallyEnd => { @@ -1802,96 +2460,40 @@ impl Compiler { preserve_tos: bool, stop_at_loop: bool, ) -> CompileResult<(Option<TextRange>, Option<FBlockInfo>)> { - // Collect the info we need, with indices for FinallyTry blocks - #[derive(Clone)] - enum UnwindInfo { - Normal(FBlockInfo), - FinallyTry { - body: Vec<ruff_python_ast::Stmt>, - fblock_idx: usize, - }, - } - let mut unwind_infos = Vec::new(); - let mut loop_fblock = None; - - { - let code = self.current_code_info(); - for i in (0..code.fblock.len()).rev() { - // Check for exception group handler (forbidden) - if matches!(code.fblock[i].fb_type, FBlockType::ExceptionGroupHandler) { - return Err(self.error(CodegenErrorType::BreakContinueReturnInExceptStar)); - } - - // Stop at loop if requested - if stop_at_loop - && matches!( - code.fblock[i].fb_type, - FBlockType::WhileLoop | FBlockType::ForLoop - ) - { - loop_fblock = Some(code.fblock[i].clone()); - break; - } - - if matches!(code.fblock[i].fb_type, FBlockType::FinallyTry) { - if let FBlockDatum::FinallyBody(ref body) = code.fblock[i].fb_datum { - unwind_infos.push(UnwindInfo::FinallyTry { - body: body.clone(), - fblock_idx: i, - }); - } - } else { - unwind_infos.push(UnwindInfo::Normal(code.fblock[i].clone())); - } - } - } - - // Process each fblock let mut unwind_loc = Some(self.current_source_range); - for info in unwind_infos { - match info { - UnwindInfo::Normal(fblock_info) => { - self.unwind_fblock(&fblock_info, preserve_tos, &mut unwind_loc)?; - } - UnwindInfo::FinallyTry { body, fblock_idx } => { - // codegen_unwind_fblock(FINALLY_TRY) - self.set_unwind_source_range(unwind_loc); - emit!(self, PseudoInstruction::PopBlock); - self.mark_unwind_no_location(unwind_loc); + let loop_fblock = + self.unwind_fblock_stack_inner(preserve_tos, stop_at_loop, &mut unwind_loc)?; + Ok((unwind_loc, loop_fblock)) + } - // Temporarily remove the FinallyTry fblock so nested return/break/continue - // in the finally body won't see it again - let code = self.current_code_info(); - let saved_fblock = code.fblock.remove(fblock_idx); - - // Push PopValue fblock if preserving tos - if preserve_tos { - self.push_fblock_labels( - FBlockType::PopValue, - ir::InstructionSequenceLabel::NO_LABEL, - ir::InstructionSequenceLabel::NO_LABEL, - FBlockDatum::None, - )?; - } - - self.compile_statements(&body)?; - unwind_loc = None; - - if preserve_tos { - self.pop_fblock_label( - FBlockType::PopValue, - ir::InstructionSequenceLabel::NO_LABEL, - ); - } - - // Restore the fblock - let code = self.current_code_info(); - code.fblock.insert(fblock_idx, saved_fblock); - } - } + fn unwind_fblock_stack_inner( + &mut self, + preserve_tos: bool, + stop_at_loop: bool, + unwind_loc: &mut Option<TextRange>, + ) -> CompileResult<Option<FBlockInfo>> { + let Some(top) = self.current_code_info().fblock.last().cloned() else { + return Ok(None); + }; + if matches!(top.fb_type, FBlockType::ExceptionGroupHandler) { + return Err(self.error_optional_range( + CodegenErrorType::BreakContinueReturnInExceptStar, + *unwind_loc, + )); + } + if stop_at_loop && matches!(top.fb_type, FBlockType::WhileLoop | FBlockType::ForLoop) { + return Ok(Some(top)); } - Ok((unwind_loc, loop_fblock)) + let copy = self + .current_code_info() + .fblock + .pop() + .expect("fblock stack underflow"); + self.unwind_fblock(&copy, preserve_tos, unwind_loc)?; + let loop_fblock = self.unwind_fblock_stack_inner(preserve_tos, stop_at_loop, unwind_loc)?; + self.restore_fblock_info(copy)?; + Ok(loop_fblock) } // could take impl Into<Cow<str>>, but everything is borrowed from ast structs; we never @@ -1949,7 +2551,12 @@ impl Compiler { // when building qualnames for the contained function/class code object. if matches!( parent_scope, - Some(CompilerScope::TypeParams | CompilerScope::Annotation) + Some( + CompilerScope::TypeParams + | CompilerScope::Annotation + | CompilerScope::TypeAlias + | CompilerScope::TypeVariable, + ) ) || parent.metadata.name.starts_with("<generic parameters of ") { if stack_size == 2 { @@ -2048,10 +2655,19 @@ impl Compiler { let size_before = self.code_stack.len(); // Set future_annotations from symbol table (detected during symbol table scan) self.future_annotations = symbol_table.future_annotations; + let future_features = self.future_features; + self.current_code_info().flags |= future_features; if self.future_annotations { + self.future_features + .insert(bytecode::CodeFlags::FUTURE_ANNOTATIONS); self.current_code_info() .flags - .insert(CodeFlags::FUTURE_ANNOTATIONS); + .insert(bytecode::CodeFlags::FUTURE_ANNOTATIONS); + } + if symbol_table.is_coroutine { + self.current_code_info() + .flags + .insert(bytecode::CodeFlags::COROUTINE); } // Module-level __conditional_annotations__ cell @@ -2068,20 +2684,20 @@ impl Compiler { self.emit_resume_for_scope(CompilerScope::Module, 1); emit!(self, PseudoInstruction::AnnotationsPlaceholder); - let (doc, statements) = split_doc_with_range(&body.body, self.opts); + let (doc, statements) = split_doc_with_range(&body.body, &self.opts); let module_start_loc = self.module_start_location(&body.body); + let annotations_used = self.current_symbol_table().annotations_used; // Handle annotation bookkeeping before the docstring assignment, as // codegen_body() does after _PyCodegen_Module() inserts the prefix set. - if Self::find_ann(statements) { + if Self::scope_needs_conditional_annotations_cell(self.current_symbol_table()) { self.set_source_range(module_start_loc); - if Self::scope_needs_conditional_annotations_cell(self.current_symbol_table()) { - emit!(self, Instruction::BuildSet { count: 0 }); - self.store_name("__conditional_annotations__")?; - } + emit!(self, Instruction::BuildSet { count: 0 }); + self.store_name("__conditional_annotations__")?; + } - if self.future_annotations { - emit!(self, Instruction::SetupAnnotations); - } + if self.future_annotations && annotations_used { + self.set_source_range(module_start_loc); + emit!(self, Instruction::SetupAnnotations); } if let Some((value, range)) = doc { @@ -2092,13 +2708,14 @@ impl Compiler { }); let doc = self.name("__doc__"); emit!(self, Instruction::StoreName { namei: doc }); + self.set_no_location(); self.set_source_range(saved_range); } // Compile all statements self.compile_statements(statements)?; - if Self::find_ann(statements) && !self.future_annotations { + if annotations_used && !self.future_annotations { self.compile_module_annotation_setup_sequence(statements, module_start_loc)?; } @@ -2119,10 +2736,19 @@ impl Compiler { self.interactive = true; // Set future_annotations from symbol table (detected during symbol table scan) self.future_annotations = symbol_table.future_annotations; + let future_features = self.future_features; + self.current_code_info().flags |= future_features; if self.future_annotations { + self.future_features + .insert(bytecode::CodeFlags::FUTURE_ANNOTATIONS); self.current_code_info() .flags - .insert(CodeFlags::FUTURE_ANNOTATIONS); + .insert(bytecode::CodeFlags::FUTURE_ANNOTATIONS); + } + if symbol_table.is_coroutine { + self.current_code_info() + .flags + .insert(bytecode::CodeFlags::COROUTINE); } self.symbol_table_stack.push(symbol_table); let module_start_loc = self.module_start_location(body); @@ -2130,65 +2756,27 @@ impl Compiler { self.emit_resume_for_scope(CompilerScope::Module, 1); emit!(self, PseudoInstruction::AnnotationsPlaceholder); + let annotations_used = self.current_symbol_table().annotations_used; // Handle annotations based on future_annotations flag - if Self::find_ann(body) { + if self.current_symbol_table().has_conditional_annotations { self.set_source_range(module_start_loc); - if self.future_annotations { - // PEP 563: Initialize __annotations__ dict - emit!(self, Instruction::SetupAnnotations); - } else { - // PEP 649: Initialize __conditional_annotations__ before the body. - // CPython generates __annotate__ after the body in codegen_body(). - if self.current_symbol_table().has_conditional_annotations { - emit!(self, Instruction::BuildSet { count: 0 }); - self.store_name("__conditional_annotations__")?; - } - } + emit!(self, Instruction::BuildSet { count: 0 }); + self.store_name("__conditional_annotations__")?; } - if let Some((last, body)) = body.split_last() { - for statement in body { - if let ast::Stmt::Expr(ast::StmtExpr { value, .. }) = &statement { - self.compile_expression(value)?; - emit!( - self, - Instruction::CallIntrinsic1 { - func: bytecode::IntrinsicFunction1::Print - } - ); + if self.future_annotations && annotations_used { + self.set_source_range(module_start_loc); + // PEP 563: Initialize __annotations__ dict + emit!(self, Instruction::SetupAnnotations); + } - emit!(self, Instruction::PopTop); - self.set_no_location(); - } else { - self.compile_statement(statement)?; - } - } + self.compile_statements(body)?; - if let ast::Stmt::Expr(ast::StmtExpr { value, .. }) = &last { - self.compile_expression(value)?; - emit!(self, Instruction::Copy { i: 1 }); - emit!( - self, - Instruction::CallIntrinsic1 { - func: bytecode::IntrinsicFunction1::Print - } - ); - - emit!(self, Instruction::PopTop); - self.set_no_location(); - } else { - self.compile_statement(last)?; - self.emit_load_const(ConstantData::None); - } - } else { - self.emit_load_const(ConstantData::None); - }; - - if Self::find_ann(body) && !self.future_annotations { + if annotations_used && !self.future_annotations { self.compile_module_annotation_setup_sequence(body, module_start_loc)?; } - self.emit_return_value(); + self.emit_return_const_no_location(ConstantData::None); Ok(()) } @@ -2197,6 +2785,13 @@ impl Compiler { body: &[ast::Stmt], symbol_table: SymbolTable, ) -> CompileResult<()> { + let future_features = self.future_features; + self.current_code_info().flags |= future_features; + if symbol_table.is_coroutine { + self.current_code_info() + .flags + .insert(bytecode::CodeFlags::COROUTINE); + } self.symbol_table_stack.push(symbol_table); self.emit_resume_for_scope(CompilerScope::Module, 1); @@ -2264,6 +2859,13 @@ impl Compiler { expression: &ast::ModExpression, symbol_table: SymbolTable, ) -> CompileResult<()> { + let future_features = self.future_features; + self.current_code_info().flags |= future_features; + if symbol_table.is_coroutine { + self.current_code_info() + .flags + .insert(bytecode::CodeFlags::COROUTINE); + } self.symbol_table_stack.push(symbol_table); self.emit_resume_for_scope(CompilerScope::Module, 1); @@ -2365,7 +2967,6 @@ impl Compiler { fn emit_no_location_exception_name_cleanup(&mut self, name: &str) -> CompileResult<()> { // CPython codegen_try_except() emits `name = None; del name` // with NO_LOCATION for `except ... as name` cleanup. - self.set_no_location(); self.emit_load_const(ConstantData::None); self.set_no_location(); self.store_name(name)?; @@ -2423,7 +3024,10 @@ impl Compiler { let current_idx = self.symbol_table_stack.len() - 1; let current_table = &self.symbol_table_stack[current_idx]; let is_typeparams = current_table.typ == CompilerScope::TypeParams; - let is_annotation = current_table.typ == CompilerScope::Annotation; + let is_annotation = matches!( + current_table.typ, + CompilerScope::Annotation | CompilerScope::TypeAlias | CompilerScope::TypeVariable + ); let can_see_class = current_table.can_see_class_scope; // First try to find in current table @@ -2462,13 +3066,11 @@ impl Compiler { let current_table = self.current_symbol_table(); if current_table.typ == CompilerScope::Class && !self.current_code_info().in_inlined_comp - && matches!( - (usage, name.as_ref()), - ( - NameUsage::Load, - "__class__" | "__classdict__" | "__conditional_annotations__" - ) | (NameUsage::Store, "__conditional_annotations__") - ) + && ((usage == NameUsage::Load + && (name == "__class__" + || name == "__classdict__" + || name == "__conditional_annotations__")) + || (name == "__conditional_annotations__" && usage == NameUsage::Store)) { Some(SymbolScope::Cell) } else { @@ -2485,7 +3087,10 @@ impl Compiler { let current_table = self.current_symbol_table(); if matches!( current_table.typ, - CompilerScope::Annotation | CompilerScope::TypeParams + CompilerScope::Annotation + | CompilerScope::TypeAlias + | CompilerScope::TypeVariable + | CompilerScope::TypeParams ) { SymbolScope::GlobalImplicit } else if matches!( @@ -2539,7 +3144,7 @@ impl Compiler { // to check classdict first before globals if class_declared_global { NameOp::Global - } else if can_see_class_scope { + } else if can_see_class_scope && usage == NameUsage::Load { NameOp::DictOrGlobals } else if is_function_like { NameOp::Global @@ -2551,7 +3156,7 @@ impl Compiler { // A global declared in the owning class body must bypass the // classdict, but an explicit global inherited from an outer // function still participates in DictOrGlobals lookup. - if can_see_class_scope && !class_declared_global { + if can_see_class_scope && !class_declared_global && usage == NameUsage::Load { NameOp::DictOrGlobals } else { NameOp::Global @@ -2635,21 +3240,10 @@ impl Compiler { NameOp::DictOrGlobals => { // PEP 649: First check classdict (from __classdict__ freevar), then globals let idx = self.get_global_name_index(&name); - match usage { - NameUsage::Load => { - // Load __classdict__ first (it's a free variable in annotation scope) - let classdict_idx = self.get_free_var_index("__classdict__"); - emit!(self, Instruction::LoadDeref { i: classdict_idx }); - emit!(self, Instruction::LoadFromDictOrGlobals { i: idx }); - } - // Store/Delete in annotation scope should use Name ops - NameUsage::Store => { - emit!(self, Instruction::StoreName { namei: idx }); - } - NameUsage::Delete => { - emit!(self, Instruction::DeleteName { namei: idx }); - } - } + debug_assert!(usage == NameUsage::Load); + let classdict_idx = self.get_free_var_index("__classdict__"); + emit!(self, Instruction::LoadDeref { i: classdict_idx }); + emit!(self, Instruction::LoadFromDictOrGlobals { i: idx }); } } @@ -2664,14 +3258,17 @@ impl Compiler { match &statement { // we do this here because `from __future__` still executes that `from` statement at runtime, // we still need to compile the ImportFrom down below - ast::Stmt::ImportFrom(ast::StmtImportFrom { module, names, .. }) - if module.as_ref().map(|id| id.as_str()) == Some("__future__") => - { + ast::Stmt::ImportFrom(ast::StmtImportFrom { + module, + names, + level, + .. + }) if *level == 0 && module.as_ref().map(|id| id.as_str()) == Some("__future__") => { self.compile_future_features(names)? } // ignore module-level doc comments ast::Stmt::Expr(ast::StmtExpr { value, .. }) - if matches!(&**value, ast::Expr::StringLiteral(..)) + if is_docstring_expr(value) && matches!(self.done_with_future_stmts, DoneWithFuture::No) => { self.done_with_future_stmts = DoneWithFuture::DoneWithDoc @@ -2716,24 +3313,14 @@ impl Compiler { names, .. }) => { - let import_star = names.iter().any(|n| &n.name == "*"); + let import_star = names.first().is_some_and(|n| &n.name == "*"); - let from_list = if import_star { - if self.ctx.in_func() { - return Err(self.error_ranged( - CodegenErrorType::FunctionImportStar, - statement.range(), - )); - } - vec![ConstantData::Str { value: "*".into() }] - } else { - names - .iter() - .map(|n| ConstantData::Str { - value: n.name.as_str().into(), - }) - .collect() - }; + let from_list = names + .iter() + .map(|n| ConstantData::Str { + value: n.name.as_str().into(), + }) + .collect(); // from .... import (*fromlist) self.emit_load_const(ConstantData::Integer { @@ -2811,13 +3398,17 @@ impl Compiler { .. }) => { self.enter_conditional_block(); - self.compile_if(test, body, elif_else_clauses, test.range())?; + self.compile_if(test, body, elif_else_clauses, statement.range())?; self.leave_conditional_block(); self.set_source_range(statement.range()); } ast::Stmt::While(ast::StmtWhile { - test, body, orelse, .. - }) => self.compile_while(test, body, orelse)?, + test, + body, + orelse, + range, + .. + }) => self.compile_while(test, body, orelse, *range)?, ast::Stmt::With(ast::StmtWith { items, body, @@ -2909,13 +3500,15 @@ impl Compiler { arguments.as_deref(), false, )?, - ast::Stmt::Assert(ast::StmtAssert { - test, msg, range, .. - }) => { + ast::Stmt::Assert(assert_stmt) => { + let ast::StmtAssert { + test, msg, range, .. + } = assert_stmt; + self.check_assert(assert_stmt)?; // if some flag, ignore all assert statements! if self.opts.optimize == 0 { let after_block = self.new_block(); - self.compile_jump_if(test, true, after_block)?; + self.compile_jump_if_inner(test, true, after_block, Some(*range))?; self.set_source_range(*range); emit!( self, @@ -2973,7 +3566,13 @@ impl Compiler { statement.range(), )); } - let folded_constant = if v.is_constant() { + let debug_constant = matches!( + &**v, + ast::Expr::Name(ast::ExprName { id, ctx, .. }) + if matches!(ctx, ast::ExprContext::Load) + && id.as_str() == "__debug__" + ); + let folded_constant = if self.is_constant_expr(v) || debug_constant { self.try_fold_constant_expr(v)? } else { None @@ -3000,18 +3599,17 @@ impl Compiler { let unwind_loc = self.unwind_fblock_stack(preserve_tos, false)?; if let Some(loc) = unwind_loc { self.set_source_range(loc); - } - match folded_constant { - Some(constant) if unwind_loc.is_none() => { - self.emit_return_const_no_location(constant); + match folded_constant { + Some(constant) => self.emit_return_const(constant), + None => { + self.emit_return_value(); + } } - Some(constant) => { - self.emit_load_const(constant); - self.emit_return_value(); - } - None => { - self.emit_return_value(); - if unwind_loc.is_none() { + } else { + match folded_constant { + Some(constant) => self.emit_return_const_no_location(constant), + None => { + self.emit_return_value(); self.set_no_location(); } } @@ -3038,11 +3636,7 @@ impl Compiler { range, .. }) => { - if targets.len() == 1 && Self::is_unpack_assignment_target(&targets[0]) { - self.compile_expression_without_const_collection_folding(value)?; - } else { - self.compile_expression(value)?; - } + self.compile_expression(value)?; for (i, target) in targets.iter().enumerate() { if i + 1 != targets.len() { @@ -3099,6 +3693,7 @@ impl Compiler { let name_string = name.id.to_string(); if let Some(type_params) = type_params { + self.set_source_range(*range); self.push_symbol_table()?; let key = self.symbol_table_stack.len() - 1; let lineno = self.get_source_line_number().get().to_u32(); @@ -3113,11 +3708,13 @@ impl Compiler { in_async_scope: false, }; + self.set_source_range(*range); self.emit_load_const(ConstantData::Str { value: name_string.clone().into(), }); self.compile_type_params(type_params)?; self.compile_typealias_value_closure(&name_string, value, *range)?; + self.set_source_range(*range); emit!(self, Instruction::BuildTuple { count: 3 }); emit!( self, @@ -3129,15 +3726,19 @@ impl Compiler { let code = self.exit_scope(); self.ctx = prev_ctx; - self.make_closure(code, MakeFunctionFlags::new())?; + self.set_source_range(*range); + self.make_closure(code, bytecode::MakeFunctionFlags::new())?; + self.set_source_range(*range); emit!(self, Instruction::PushNull); emit!(self, Instruction::Call { argc: 0 }); } else { + self.set_source_range(*range); self.emit_load_const(ConstantData::Str { value: name_string.clone().into(), }); self.emit_load_const(ConstantData::None); self.compile_typealias_value_closure(&name_string, value, *range)?; + self.set_source_range(*range); emit!(self, Instruction::BuildTuple { count: 3 }); emit!( self, @@ -3147,9 +3748,15 @@ impl Compiler { ); } + self.set_source_range(*range); self.store_name(&name_string)?; } - ast::Stmt::IpyEscapeCommand(_) => todo!(), + ast::Stmt::IpyEscapeCommand(stmt) => { + return Err(self.error_ranged( + CodegenErrorType::SyntaxError("invalid syntax".to_owned()), + stmt.range, + )); + } } Ok(()) } @@ -3195,21 +3802,10 @@ impl Compiler { } fn enter_function(&mut self, name: &str, parameters: &ast::Parameters) -> CompileResult<()> { - // TODO: partition_in_place - let mut kw_without_defaults = vec![]; - let mut kw_with_defaults = vec![]; - for kwonlyarg in &parameters.kwonlyargs { - if let Some(default) = &kwonlyarg.default { - kw_with_defaults.push((&kwonlyarg.parameter, default)); - } else { - kw_without_defaults.push(&kwonlyarg.parameter); - } - } - self.push_output( - CodeFlags::NEWLOCALS | CodeFlags::OPTIMIZED, + bytecode::CodeFlags::NEWLOCALS | bytecode::CodeFlags::OPTIMIZED, parameters.posonlyargs.len().to_u32(), - (parameters.posonlyargs.len() + parameters.args.len()).to_u32(), + parameters.args.len().to_u32(), parameters.kwonlyargs.len().to_u32(), name, )?; @@ -3218,18 +3814,17 @@ impl Compiler { .chain(&parameters.posonlyargs) .chain(&parameters.args) .map(|arg| &arg.parameter) - .chain(kw_without_defaults) - .chain(kw_with_defaults.into_iter().map(|(arg, _)| arg)); + .chain(parameters.kwonlyargs.iter().map(|arg| &arg.parameter)); for name in args_iter { self.varname(name.name.as_str()); } if let Some(name) = parameters.vararg.as_deref() { - self.current_code_info().flags |= CodeFlags::VARARGS; + self.current_code_info().flags |= bytecode::CodeFlags::VARARGS; self.varname(name.name.as_str()); } if let Some(name) = parameters.kwarg.as_deref() { - self.current_code_info().flags |= CodeFlags::VARKEYWORDS; + self.current_code_info().flags |= bytecode::CodeFlags::VARKEYWORDS; self.varname(name.name.as_str()); } @@ -3275,7 +3870,7 @@ impl Compiler { let lineno = self.get_source_line_number().get().to_u32(); // Enter scope with the type parameter name - self.enter_scope(name, CompilerScope::Annotation, key, lineno)?; + self.enter_scope(name, CompilerScope::TypeVariable, key, lineno)?; self.current_code_info() .metadata @@ -3306,13 +3901,17 @@ impl Compiler { // Return value self.set_source_range(expr_range); emit!(self, Instruction::ReturnValue); + self.emit_return_const_no_location(ConstantData::None); // Exit scope and create closure let code = self.exit_scope(); self.ctx = prev_ctx; self.set_source_range(expr_range); - self.make_closure(code, MakeFunctionFlags::from([MakeFunctionFlag::Defaults]))?; + self.make_closure( + code, + bytecode::MakeFunctionFlags::from([bytecode::MakeFunctionFlag::Defaults]), + )?; Ok(()) } @@ -3331,7 +3930,7 @@ impl Compiler { self.push_symbol_table()?; let key = self.symbol_table_stack.len() - 1; let lineno = self.get_source_line_number().get().to_u32(); - self.enter_scope(alias_name, CompilerScope::Annotation, key, lineno)?; + self.enter_scope(alias_name, CompilerScope::TypeAlias, key, lineno)?; self.current_code_info() .metadata .varnames @@ -3352,7 +3951,10 @@ impl Compiler { let code = self.exit_scope(); self.ctx = prev_ctx; self.set_source_range(alias_range); - self.make_closure(code, MakeFunctionFlags::from([MakeFunctionFlag::Defaults]))?; + self.make_closure( + code, + bytecode::MakeFunctionFlags::from([bytecode::MakeFunctionFlag::Defaults]), + )?; Ok(()) } @@ -3360,6 +3962,7 @@ impl Compiler { /// Store each type parameter so it is accessible to the current scope, and leave a tuple of /// all the type parameters on the stack. Handles default values per PEP 695. fn compile_type_params(&mut self, type_params: &ast::TypeParams) -> CompileResult<()> { + let mut seen_default = false; // First, compile each type parameter and store it for type_param in &type_params.type_params { match type_param { @@ -3395,6 +3998,7 @@ impl Compiler { } if let Some(default_expr) = default { + seen_default = true; self.compile_type_param_bound_or_default( default_expr, name.as_str(), @@ -3407,6 +4011,13 @@ impl Compiler { func: bytecode::IntrinsicFunction2::SetTypeparamDefault } ); + } else if seen_default { + return Err(self.error_ranged( + CodegenErrorType::SyntaxError(format!( + "non-default type parameter '{name}' follows default type parameter" + )), + *range, + )); } self.set_source_range(*range); @@ -3431,6 +4042,7 @@ impl Compiler { ); if let Some(default_expr) = default { + seen_default = true; self.compile_type_param_bound_or_default( default_expr, name.as_str(), @@ -3443,6 +4055,13 @@ impl Compiler { func: bytecode::IntrinsicFunction2::SetTypeparamDefault } ); + } else if seen_default { + return Err(self.error_ranged( + CodegenErrorType::SyntaxError(format!( + "non-default type parameter '{name}' follows default type parameter" + )), + *range, + )); } self.set_source_range(*range); @@ -3480,6 +4099,14 @@ impl Compiler { func: bytecode::IntrinsicFunction2::SetTypeparamDefault } ); + seen_default = true; + } else if seen_default { + return Err(self.error_ranged( + CodegenErrorType::SyntaxError(format!( + "non-default type parameter '{name}' follows default type parameter" + )), + *range, + )); } self.set_source_range(*range); @@ -3534,7 +4161,6 @@ impl Compiler { if handlers.is_empty() { self.compile_statements(body)?; - self.compile_statements(orelse)?; } else { self.compile_try_except_no_finally(body, handlers, orelse)?; } @@ -3543,7 +4169,7 @@ impl Compiler { self.set_no_location(); self.pop_fblock_label(FBlockType::FinallyTry, body_label); - let sub_table_cursor = self.symbol_table_stack.last().map(|t| t.next_sub_table); + let symbol_table_cursors = self.current_symbol_table_cursors(); self.compile_statements(finalbody)?; emit!( @@ -3552,11 +4178,7 @@ impl Compiler { ); self.set_no_location(); - if let Some(cursor) = sub_table_cursor - && let Some(current_table) = self.symbol_table_stack.last_mut() - { - current_table.next_sub_table = cursor; - } + self.set_symbol_table_cursors(symbol_table_cursors); self.use_cpython_label_block(finally_except_block); emit!( @@ -3620,7 +4242,16 @@ impl Compiler { self.pop_fblock_label(FBlockType::TryExcept, body_label); emit!(self, PseudoInstruction::PopBlock); self.set_no_location(); + + // The symtable stores child scopes in AST visit order + // (body, handlers, orelse), while codegen_try_except() emits orelse + // before the exception handlers. Keep the symbol table in symtable order + // and only move the codegen cursor while compiling orelse. + let handler_symbol_table_cursors = self.current_symbol_table_cursors(); + self.consume_skipped_nested_scopes_in_except_handlers(handlers)?; self.compile_statements(orelse)?; + let after_orelse_symbol_table_cursors = self.current_symbol_table_cursors(); + self.set_symbol_table_cursors(handler_symbol_table_cursors); emit!( self, PseudoInstruction::JumpNoInterrupt { delta: end_block } @@ -3739,13 +4370,14 @@ impl Compiler { self.use_cpython_label_block(next_handler); } + self.set_symbol_table_cursors(after_orelse_symbol_table_cursors); - emit!(self, Instruction::Reraise { depth: 0 }); - self.set_no_location(); self.pop_fblock_label( FBlockType::ExceptionHandler, ir::InstructionSequenceLabel::NO_LABEL, ); + emit!(self, Instruction::Reraise { depth: 0 }); + self.set_no_location(); self.use_cpython_label_block(cleanup_block); emit!(self, Instruction::Copy { i: 3 }); @@ -3801,7 +4433,7 @@ impl Compiler { self.set_no_location(); self.pop_fblock_label(FBlockType::FinallyTry, body_label); - let sub_table_cursor = self.symbol_table_stack.last().map(|t| t.next_sub_table); + let symbol_table_cursors = self.current_symbol_table_cursors(); self.compile_statements(finalbody)?; emit!( @@ -3810,11 +4442,7 @@ impl Compiler { ); self.set_no_location(); - if let Some(cursor) = sub_table_cursor - && let Some(current_table) = self.symbol_table_stack.last_mut() - { - current_table.next_sub_table = cursor; - } + self.set_symbol_table_cursors(symbol_table_cursors); self.use_cpython_label_block(finally_except_block); emit!( @@ -3881,9 +4509,9 @@ impl Compiler { FBlockDatum::None, )?; self.compile_statements(body)?; + self.pop_fblock_label(FBlockType::TryExcept, body_label); emit!(self, PseudoInstruction::PopBlock); self.set_no_location(); - self.pop_fblock_label(FBlockType::TryExcept, body_label); emit!( self, PseudoInstruction::JumpNoInterrupt { delta: else_block } @@ -3938,30 +4566,29 @@ impl Compiler { emit!(self, Instruction::Copy { i: 2 }); } - // Compile exception type + // Compile exception type. The public-AST validator allows a + // NULL type here, so codegen only emits CHECK_EG_MATCH when present. if let Some(exc_type) = type_ { self.compile_expression(exc_type)?; self.set_source_range(*handler_range); - } else { - return Err(self.error(CodegenErrorType::SyntaxError( - "except* must specify an exception type".to_owned(), - ))); } - // Stack: [prev_exc, orig, list, rest, type] - // ADDOP(c, loc, CHECK_EG_MATCH); - emit!(self, Instruction::CheckEgMatch); - // Stack: [prev_exc, orig, list, new_rest, match] + if type_.is_some() { + // Stack: [prev_exc, orig, list, rest, type] + // ADDOP(c, loc, CHECK_EG_MATCH); + emit!(self, Instruction::CheckEgMatch); + // Stack: [prev_exc, orig, list, new_rest, match] - // ADDOP_I(c, loc, COPY, 1); - // ADDOP_JUMP(c, loc, POP_JUMP_IF_NONE, no_match); - emit!(self, Instruction::Copy { i: 1 }); - emit!( - self, - Instruction::PopJumpIfNone { - delta: no_match_block - } - ); + // ADDOP_I(c, loc, COPY, 1); + // ADDOP_JUMP(c, loc, POP_JUMP_IF_NONE, no_match); + emit!(self, Instruction::Copy { i: 1 }); + emit!( + self, + Instruction::PopJumpIfNone { + delta: no_match_block + } + ); + } // Handler matched // Stack: [prev_exc, orig, list, new_rest, match] @@ -4001,9 +4628,9 @@ impl Compiler { self.compile_statements(body)?; // Handler body completed normally + self.pop_fblock_label(FBlockType::HandlerCleanup, cleanup_body_label); emit!(self, PseudoInstruction::PopBlock); self.set_no_location(); - self.pop_fblock_label(FBlockType::HandlerCleanup, cleanup_body_label); // Cleanup name binding if let Some(alias) = name { @@ -4179,7 +4806,7 @@ impl Compiler { parameters: &ast::Parameters, loc: TextRange, ) -> CompileResult<bytecode::MakeFunctionFlags> { - let mut funcflags = MakeFunctionFlags::new(); + let mut funcflags = bytecode::MakeFunctionFlags::new(); // Handle positional defaults let defaults: Vec<_> = core::iter::empty() @@ -4200,7 +4827,7 @@ impl Compiler { count: defaults.len().to_u32() } ); - funcflags.insert(MakeFunctionFlag::Defaults); + funcflags.insert(bytecode::MakeFunctionFlag::Defaults); } // Handle keyword-only defaults @@ -4227,7 +4854,7 @@ impl Compiler { count: kw_with_defaults.len().to_u32(), } ); - funcflags.insert(MakeFunctionFlag::KwOnlyDefaults); + funcflags.insert(bytecode::MakeFunctionFlag::KwOnlyDefaults); } Ok(funcflags) @@ -4248,7 +4875,7 @@ impl Compiler { self.enter_function(name, parameters)?; self.current_code_info() .flags - .set(CodeFlags::COROUTINE, is_async); + .set(bytecode::CodeFlags::COROUTINE, is_async); // Set up context let prev_ctx = self.ctx; @@ -4267,7 +4894,7 @@ impl Compiler { self.set_qualname(); // Handle docstring - store in co_consts[0] if present - let (doc_info, body) = split_doc_with_range(body, self.opts); + let (doc_info, body) = split_doc_with_range(body, &self.opts); let doc_str = doc_info.as_ref().map(|(doc, _)| doc); if let Some(doc) = &doc_str { // Docstring present: store in co_consts[0] and set HAS_DOCSTRING flag @@ -4277,7 +4904,7 @@ impl Compiler { .insert_full(ConstantData::Str { value: (*doc).to_string().into(), }); - self.current_code_info().flags |= CodeFlags::HAS_DOCSTRING; + self.current_code_info().flags |= bytecode::CodeFlags::HAS_DOCSTRING; } let start_label = self.use_cpython_function_start_label(); @@ -4300,19 +4927,8 @@ impl Compiler { // Compile body statements self.compile_statements(body)?; - // Emit implicit `return None` if the body doesn't end with return. - // Also ensure None is in co_consts even when not emitting return - // (matching CPython: functions without explicit constants always - // have None in co_consts). - match body.last() { - Some(ast::Stmt::Return(_)) => {} - _ => { - self.emit_return_const_no_location(ConstantData::None); - } - } - // Functions with no other constants should still have None in co_consts - if self.current_code_info().metadata.consts.is_empty() { - self.arg_constant(ConstantData::None); + if stop_iteration_block.is_some() { + self.emit_return_const_no_location(ConstantData::None); } // Close StopIteration handler and emit handler code @@ -4329,6 +4945,7 @@ impl Compiler { emit!(self, Instruction::Reraise { depth: 1u32 }); self.set_no_location(); } + self.emit_return_const_no_location(ConstantData::None); // Exit scope and create function object let code = self.exit_scope(); @@ -4347,7 +4964,7 @@ impl Compiler { /// Compile function annotations as a closure (PEP 649) /// Returns true if an __annotate__ closure was created - /// Uses symbol table's annotation_block for proper scoping. + /// Uses the matching annotation symbol table for proper scoping. fn compile_annotations_closure( &mut self, func_name: &str, @@ -4355,21 +4972,11 @@ impl Compiler { returns: Option<&ast::Expr>, func_range: TextRange, ) -> CompileResult<bool> { - let has_signature_annotations = parameters - .args - .iter() - .map(|x| &x.parameter) - .chain(parameters.posonlyargs.iter().map(|x| &x.parameter)) - .chain(parameters.vararg.as_deref()) - .chain(parameters.kwonlyargs.iter().map(|x| &x.parameter)) - .chain(parameters.kwarg.as_deref()) - .any(|param| param.annotation.is_some()) - || returns.is_some(); - if !has_signature_annotations { + if !self.next_function_annotation_symbol_table_uses_annotations() { return Ok(false); } - // Try to enter annotation scope - returns None if no annotation_block exists + // Try to enter annotation scope - returns None if no matching symbol table exists. let Some(saved_ctx) = self.enter_annotation_scope(func_name, func_range)? else { return Ok(false); }; @@ -4427,13 +5034,14 @@ impl Compiler { } ); emit!(self, Instruction::ReturnValue); + self.emit_return_const_no_location(ConstantData::None); // Exit the annotation scope and get the code object let annotate_code = self.exit_annotation_scope(saved_ctx); // Make a closure from the code object self.set_source_range(func_range); - self.make_closure(annotate_code, MakeFunctionFlags::new())?; + self.make_closure(annotate_code, bytecode::MakeFunctionFlags::new())?; Ok(true) } @@ -4442,29 +5050,73 @@ impl Compiler { /// (including nested conditional blocks). This preserves the same walk /// order as symbol-table construction so the annotation scope's /// `sub_tables` cursor stays aligned. - fn collect_annotations(body: &[ast::Stmt]) -> Vec<&ast::StmtAnnAssign> { - use ast::visitor::Visitor; - - #[derive(Default)] - struct AnnotationsVisitor<'a> { - annotations: Vec<&'a ast::StmtAnnAssign>, - } - - impl<'a> Visitor<'a> for AnnotationsVisitor<'a> { - fn visit_stmt(&mut self, stmt: &'a ast::Stmt) { + fn collect_annotations( + body: &[ast::Stmt], + parent_scope_type: CompilerScope, + ) -> Vec<(&ast::StmtAnnAssign, bool)> { + fn walk<'a>( + stmts: &'a [ast::Stmt], + out: &mut Vec<(&'a ast::StmtAnnAssign, bool)>, + in_conditional_block: bool, + module_scope: bool, + ) { + for stmt in stmts { match stmt { - ast::Stmt::AnnAssign(ann_assign) => self.annotations.push(ann_assign), - ast::Stmt::ClassDef(_) | ast::Stmt::FunctionDef(_) => {} - _ => ast::visitor::walk_stmt(self, stmt), + ast::Stmt::AnnAssign(stmt) => { + out.push((stmt, module_scope || in_conditional_block)); + } + ast::Stmt::If(ast::StmtIf { + body, + elif_else_clauses, + .. + }) => { + walk(body, out, true, module_scope); + for clause in elif_else_clauses { + walk(&clause.body, out, true, module_scope); + } + } + ast::Stmt::For(ast::StmtFor { body, orelse, .. }) + | ast::Stmt::While(ast::StmtWhile { body, orelse, .. }) => { + walk(body, out, true, module_scope); + walk(orelse, out, true, module_scope); + } + ast::Stmt::With(ast::StmtWith { body, .. }) => { + walk(body, out, true, module_scope); + } + ast::Stmt::Try(ast::StmtTry { + body, + handlers, + orelse, + finalbody, + .. + }) => { + walk(body, out, true, module_scope); + for handler in handlers { + let ast::ExceptHandler::ExceptHandler( + ast::ExceptHandlerExceptHandler { body, .. }, + ) = handler; + walk(body, out, true, module_scope); + } + walk(orelse, out, true, module_scope); + walk(finalbody, out, true, module_scope); + } + ast::Stmt::Match(ast::StmtMatch { cases, .. }) => { + for case in cases { + walk(&case.body, out, true, module_scope); + } + } + _ => {} } } } - - let mut visitor = AnnotationsVisitor::default(); - for stmt in body { - visitor.visit_stmt(stmt); - } - visitor.annotations + let mut annotations = Vec::new(); + walk( + body, + &mut annotations, + false, + parent_scope_type == CompilerScope::Module, + ); + annotations } fn compile_annotation_for_symbol_cursor_only( @@ -4482,20 +5134,21 @@ impl Compiler { loc: Option<TextRange>, ) -> CompileResult<bool> { let loc = loc.unwrap_or(self.current_source_range); - let annotations = Self::collect_annotations(body); - let has_simple_annotation = annotations + // Get parent scope type BEFORE pushing annotation symbol table. + let parent_scope_type = self.current_symbol_table().typ; + let annotations = Self::collect_annotations(body, parent_scope_type); + let simple_annotation_count = annotations .iter() - .any(|stmt| stmt.simple && matches!(stmt.target.as_ref(), ast::Expr::Name(_))); + .filter(|(stmt, _)| stmt.simple && matches!(stmt.target.as_ref(), ast::Expr::Name(_))) + .count(); - if !has_simple_annotation { + if simple_annotation_count == 0 { return Ok(false); } // Check if we have conditional annotations let has_conditional = self.current_symbol_table().has_conditional_annotations; - // Get parent scope type BEFORE pushing annotation symbol table - let parent_scope_type = self.current_symbol_table().typ; // Try to push annotation symbol table from current scope if !self.push_current_annotation_symbol_table() { return Ok(false); @@ -4520,11 +5173,12 @@ impl Compiler { lineno.to_u32(), )?; - // Add 'format' parameter to varnames + // Keep the internal ".format" name; the final code object + // exposes this parameter as "format". self.current_code_info() .metadata .varnames - .insert("format".to_owned()); + .insert(".format".to_owned()); // Emit format validation: if format > VALUE_WITH_FAKE_GLOBALS: raise NotImplementedError self.emit_format_validation(); @@ -4532,8 +5186,8 @@ impl Compiler { self.set_source_range(loc); emit!(self, Instruction::BuildMap { count: 0 }); - let mut simple_idx = 0usize; - for stmt in annotations { + let mut conditional_idx = 0usize; + for (stmt, is_conditional) in annotations { let ast::StmtAnnAssign { target, annotation, @@ -4557,16 +5211,17 @@ impl Compiler { continue; } - let not_set_block = has_conditional.then(|| self.new_block()); - let not_set_label = - (!has_conditional).then(|| self.current_code_info().new_instr_sequence_label()); + let not_set_block = (has_conditional && is_conditional).then(|| self.new_block()); + let not_set_label = (!has_conditional || !is_conditional) + .then(|| self.current_code_info().new_instr_sequence_label()); let name = simple_name.expect("missing simple annotation name"); - if has_conditional { + if let Some(not_set_block) = not_set_block { self.set_source_range(*range); self.emit_load_const(ConstantData::Integer { - value: simple_idx.into(), + value: conditional_idx.into(), }); + conditional_idx += 1; if parent_scope_type == CompilerScope::Class { let idx = self.get_free_var_index("__conditional_annotations__"); emit!(self, Instruction::LoadDeref { i: idx }); @@ -4583,7 +5238,7 @@ impl Compiler { emit!( self, Instruction::PopJumpIfFalse { - delta: not_set_block.expect("missing not_set block") + delta: not_set_block } ); } @@ -4596,7 +5251,6 @@ impl Compiler { }); self.set_source_range(loc); emit!(self, Instruction::StoreSubscr); - simple_idx += 1; if let Some(not_set_block) = not_set_block { self.use_cpython_label_block(not_set_block); @@ -4610,6 +5264,7 @@ impl Compiler { self.set_source_range(loc); emit!(self, Instruction::ReturnValue); + self.emit_return_const_no_location(ConstantData::None); // Exit annotation scope - pop symbol table, restore to parent's annotation_block, and get code let annotation_table = self.pop_symbol_table(); @@ -4622,14 +5277,15 @@ impl Compiler { self.ctx = saved_ctx; // Exit code scope let pop = self.code_stack.pop(); - let annotate_code = unwrap_internal( + let mut annotate_code = unwrap_internal( self, compiler_unwrap_option(self, pop).finalize_code(&self.opts), ); + Self::expose_annotation_format_parameter(&mut annotate_code); // Make a closure from the code object self.set_source_range(loc); - self.make_closure(annotate_code, MakeFunctionFlags::new())?; + self.make_closure(annotate_code, bytecode::MakeFunctionFlags::new())?; // Store as __annotate_func__ for classes, __annotate__ for modules let name = if parent_scope_type == CompilerScope::Class { @@ -4665,14 +5321,25 @@ impl Compiler { if is_async { "async def " } else { "def " }, ); + // The symtable visits defaults before decorators, but + // codegen_function() emits decorators first. Keep the symbol table in + // symtable order and only move the codegen cursor while compiling + // decorators. + let defaults_symbol_table_cursors = self.current_symbol_table_cursors(); + self.consume_skipped_nested_scopes_in_parameter_defaults(parameters)?; self.prepare_decorators(decorator_list)?; + let after_decorators_symbol_table_cursors = self.current_symbol_table_cursors(); + self.set_symbol_table_cursors(defaults_symbol_table_cursors); + + // The first decorator line is used for code objects created by + // this definition, but LOC(s) for the surrounding instructions. + let firstlineno_range = decorator_list + .first() + .map_or(stmt_source_range, |decorator| decorator.expression.range()); // compile defaults and return funcflags let funcflags = self.compile_default_arguments(parameters, def_source_range)?; - - // Restore the `def` line range so that enter_function → push_output → get_source_line_number() - // records the `def` keyword's line as co_firstlineno, not the last default-argument line. - self.set_source_range(def_source_range); + self.set_symbol_table_cursors(after_decorators_symbol_table_cursors); let is_generic = type_params.is_some(); let mut num_typeparam_args = 0u32; @@ -4682,20 +5349,22 @@ impl Compiler { if is_generic { // Count args to pass to type params scope - if funcflags.contains(&MakeFunctionFlag::Defaults) { + if funcflags.contains(&bytecode::MakeFunctionFlag::Defaults) { num_typeparam_args += 1; } - if funcflags.contains(&MakeFunctionFlag::KwOnlyDefaults) { + if funcflags.contains(&bytecode::MakeFunctionFlag::KwOnlyDefaults) { num_typeparam_args += 1; } if num_typeparam_args == 2 { + self.set_source_range(def_source_range); emit!(self, Instruction::Swap { i: 2 }); } // Enter type params scope let type_params_name = format!("<generic parameters of {name}>"); + self.set_source_range(firstlineno_range); self.push_output( - CodeFlags::OPTIMIZED | CodeFlags::NEWLOCALS, + bytecode::CodeFlags::OPTIMIZED | bytecode::CodeFlags::NEWLOCALS, 0, num_typeparam_args, 0, @@ -4712,13 +5381,13 @@ impl Compiler { // Add parameter names to varnames for the type params scope // These will be passed as arguments when the closure is called let current_info = self.current_code_info(); - if funcflags.contains(&MakeFunctionFlag::Defaults) { + if funcflags.contains(&bytecode::MakeFunctionFlag::Defaults) { current_info .metadata .varnames .insert(".defaults".to_owned()); } - if funcflags.contains(&MakeFunctionFlag::KwOnlyDefaults) { + if funcflags.contains(&bytecode::MakeFunctionFlag::KwOnlyDefaults) { current_info .metadata .varnames @@ -4729,6 +5398,7 @@ impl Compiler { self.compile_type_params(type_params.unwrap())?; // Load defaults/kwdefaults with LOAD_FAST + self.set_source_range(def_source_range); for i in 0..num_typeparam_args { let var_num = oparg::VarNum::from(i); emit!(self, Instruction::LoadFast { var_num }); @@ -4736,13 +5406,14 @@ impl Compiler { } // Compile annotations as closure (PEP 649) - let mut annotations_flag = MakeFunctionFlags::new(); + let mut annotations_flag = bytecode::MakeFunctionFlags::new(); if self.compile_annotations_closure(name, parameters, returns, def_source_range)? { - annotations_flag.insert(MakeFunctionFlag::Annotate); + annotations_flag.insert(bytecode::MakeFunctionFlag::Annotate); } - // Compile function body - self.set_source_range(stmt_source_range); + // Compile function body. codegen_function() uses the first + // decorator line for co_firstlineno, but LOC(s) for MAKE_FUNCTION. + self.set_source_range(firstlineno_range); let final_funcflags = funcflags | annotations_flag; self.compile_function_body( name, @@ -4757,9 +5428,11 @@ impl Compiler { if is_generic { // SWAP to get function on top // Stack: [type_params_tuple, function] -> [function, type_params_tuple] + self.set_source_range(def_source_range); emit!(self, Instruction::Swap { i: 2 }); // Call INTRINSIC_SET_FUNCTION_TYPE_PARAMS + self.set_source_range(def_source_range); emit!( self, Instruction::CallIntrinsic2 { @@ -4769,6 +5442,7 @@ impl Compiler { // Return the function object from type params scope emit!(self, Instruction::ReturnValue); + self.set_no_location(); // Set argcount for type params scope self.current_code_info().metadata.argcount = num_typeparam_args; @@ -4779,15 +5453,18 @@ impl Compiler { self.ctx = saved_ctx; // Make closure for type params code - self.make_closure(type_params_code, MakeFunctionFlags::new())?; + self.set_source_range(def_source_range); + self.make_closure(type_params_code, bytecode::MakeFunctionFlags::new())?; if num_typeparam_args > 0 { + self.set_source_range(def_source_range); emit!( self, Instruction::Swap { i: num_typeparam_args + 1 } ); + self.set_source_range(def_source_range); emit!( self, Instruction::Call { @@ -4796,8 +5473,10 @@ impl Compiler { ); } else { // Stack: [closure] + self.set_source_range(def_source_range); emit!(self, Instruction::PushNull); // Stack: [closure, NULL] + self.set_source_range(def_source_range); emit!(self, Instruction::Call { argc: 0 }); } } @@ -4818,36 +5497,31 @@ impl Compiler { /// Determines if a variable should be CELL or FREE type // = get_ref_type fn get_ref_type(&self, name: &str) -> Result<SymbolScope, CodegenErrorType> { - let table = self.current_symbol_table(); + let table = self.symbol_table_stack.last().unwrap(); // Special handling for __class__, __classdict__, and __conditional_annotations__ in class scope // This should only apply when we're actually IN a class body, // not when we're in a method nested inside a class. if table.typ == CompilerScope::Class - && matches!( - name, - "__class__" | "__classdict__" | "__conditional_annotations__" - ) + && (name == "__class__" + || name == "__classdict__" + || name == "__conditional_annotations__") { return Ok(SymbolScope::Cell); } - - let Some(symbol) = table.lookup(name) else { - return Err(CodegenErrorType::SyntaxError(format!( - "get_ref_type: cannot find symbol '{name}'" - ))); - }; - - Ok(match symbol.scope { - SymbolScope::Cell => SymbolScope::Cell, - SymbolScope::Free => SymbolScope::Free, - _ if symbol.flags.contains(SymbolFlags::FREE_CLASS) => SymbolScope::Free, - _ => { - return Err(CodegenErrorType::SyntaxError(format!( + match table.lookup(name) { + Some(symbol) => match symbol.scope { + SymbolScope::Cell => Ok(SymbolScope::Cell), + SymbolScope::Free => Ok(SymbolScope::Free), + _ if symbol.flags.contains(SymbolFlags::FREE_CLASS) => Ok(SymbolScope::Free), + _ => Err(CodegenErrorType::SyntaxError(format!( "get_ref_type: invalid scope for '{name}'" - ))); - } - }) + ))), + }, + None => Err(CodegenErrorType::SyntaxError(format!( + "get_ref_type: cannot find symbol '{name}'" + ))), + } } /// Loads closure variables if needed and creates a function object @@ -4940,57 +5614,47 @@ impl Compiler { emit!( self, Instruction::SetFunctionAttribute { - flag: MakeFunctionFlag::Closure + flag: bytecode::MakeFunctionFlag::Closure } ); } // Set annotations if present - if flags.contains(&MakeFunctionFlag::Annotations) { + if flags.contains(&bytecode::MakeFunctionFlag::Annotations) { emit!( self, Instruction::SetFunctionAttribute { - flag: MakeFunctionFlag::Annotations + flag: bytecode::MakeFunctionFlag::Annotations } ); } // Set __annotate__ closure if present (PEP 649) - if flags.contains(&MakeFunctionFlag::Annotate) { + if flags.contains(&bytecode::MakeFunctionFlag::Annotate) { emit!( self, Instruction::SetFunctionAttribute { - flag: MakeFunctionFlag::Annotate + flag: bytecode::MakeFunctionFlag::Annotate } ); } // Set kwdefaults if present - if flags.contains(&MakeFunctionFlag::KwOnlyDefaults) { + if flags.contains(&bytecode::MakeFunctionFlag::KwOnlyDefaults) { emit!( self, Instruction::SetFunctionAttribute { - flag: MakeFunctionFlag::KwOnlyDefaults + flag: bytecode::MakeFunctionFlag::KwOnlyDefaults } ); } // Set defaults if present - if flags.contains(&MakeFunctionFlag::Defaults) { + if flags.contains(&bytecode::MakeFunctionFlag::Defaults) { emit!( self, Instruction::SetFunctionAttribute { - flag: MakeFunctionFlag::Defaults - } - ); - } - - // Set type_params if present - if flags.contains(&MakeFunctionFlag::TypeParams) { - emit!( - self, - Instruction::SetFunctionAttribute { - flag: MakeFunctionFlag::TypeParams + flag: bytecode::MakeFunctionFlag::Defaults } ); } @@ -5017,55 +5681,6 @@ impl Compiler { } } - // Python/compile.c find_ann - fn find_ann(body: &[ast::Stmt]) -> bool { - for statement in body { - let res = match &statement { - ast::Stmt::AnnAssign(_) => true, - ast::Stmt::For(ast::StmtFor { body, orelse, .. }) => { - Self::find_ann(body) || Self::find_ann(orelse) - } - ast::Stmt::If(ast::StmtIf { - body, - elif_else_clauses, - .. - }) => { - Self::find_ann(body) - || elif_else_clauses.iter().any(|x| Self::find_ann(&x.body)) - } - ast::Stmt::While(ast::StmtWhile { body, orelse, .. }) => { - Self::find_ann(body) || Self::find_ann(orelse) - } - ast::Stmt::With(ast::StmtWith { body, .. }) => Self::find_ann(body), - ast::Stmt::Match(ast::StmtMatch { cases, .. }) => { - cases.iter().any(|case| Self::find_ann(&case.body)) - } - ast::Stmt::Try(ast::StmtTry { - body, - handlers, - orelse, - finalbody, - .. - }) => { - Self::find_ann(body) - || handlers.iter().any(|h| { - let ast::ExceptHandler::ExceptHandler( - ast::ExceptHandlerExceptHandler { body, .. }, - ) = h; - Self::find_ann(body) - }) - || Self::find_ann(orelse) - || Self::find_ann(finalbody) - } - _ => false, - }; - if res { - return true; - } - } - false - } - /// Compile the class body into a code object // = compiler_class_body fn compile_class_body( @@ -5077,7 +5692,7 @@ impl Compiler { ) -> CompileResult<CodeObject> { // 1. Enter class scope let key = self.symbol_table_stack.len(); - self.push_symbol_table()?; + self.push_symbol_table_matching(CompilerScope::Class, name)?; self.enter_scope(name, CompilerScope::Class, key, firstlineno)?; // Set qualname using the new method @@ -5087,7 +5702,7 @@ impl Compiler { self.code_stack.last_mut().unwrap().private = Some(name.to_owned()); // 2. Set up class namespace - let (doc_str, body) = split_doc_with_range(body, self.opts); + let (doc_str, body) = split_doc_with_range(body, &self.opts); let class_body_prefix_range = self.source_line_start_range(firstlineno); self.set_source_range(class_body_prefix_range); @@ -5123,15 +5738,14 @@ impl Compiler { } // Handle class annotation bookkeeping in CPython order. - if Self::find_ann(body) { - if Self::scope_needs_conditional_annotations_cell(self.current_symbol_table()) { - emit!(self, Instruction::BuildSet { count: 0 }); - self.store_name("__conditional_annotations__")?; - } + let annotations_used = self.current_symbol_table().annotations_used; + if Self::scope_needs_conditional_annotations_cell(self.current_symbol_table()) { + emit!(self, Instruction::BuildSet { count: 0 }); + self.store_name("__conditional_annotations__")?; + } - if self.future_annotations { - emit!(self, Instruction::SetupAnnotations); - } + if self.future_annotations && annotations_used { + emit!(self, Instruction::SetupAnnotations); } // Store __doc__ only if there's an explicit docstring. @@ -5140,13 +5754,14 @@ impl Compiler { self.set_source_range(range); self.emit_load_const(ConstantData::Str { value: doc.into() }); self.store_name("__doc__")?; + self.set_no_location(); self.set_source_range(saved_range); } // 3. Compile the class body self.compile_statements(body)?; - if Self::find_ann(body) && !self.future_annotations { + if annotations_used && !self.future_annotations { self.compile_module_annotate(body, Some(class_body_prefix_range))?; } @@ -5211,6 +5826,7 @@ impl Compiler { // Return the class namespace self.emit_return_value(); self.set_no_location(); + self.emit_return_const_no_location(ConstantData::None); // Exit scope and return the code object Ok(self.exit_scope()) @@ -5233,6 +5849,9 @@ impl Compiler { self.prepare_decorators(decorator_list)?; let is_generic = type_params.is_some(); + let firstlineno_range = decorator_list + .first() + .map_or(stmt_source_range, |decorator| decorator.expression.range()); #[expect(clippy::map_unwrap_or, reason = "Changing this will not compile")] let firstlineno = decorator_list .first() @@ -5251,8 +5870,9 @@ impl Compiler { // Step 1: If generic, enter type params scope and compile type params if is_generic { let type_params_name = format!("<generic parameters of {name}>"); + self.set_source_range(firstlineno_range); self.push_output( - CodeFlags::OPTIMIZED | CodeFlags::NEWLOCALS, + bytecode::CodeFlags::OPTIMIZED | bytecode::CodeFlags::NEWLOCALS, 0, 0, 0, @@ -5283,7 +5903,10 @@ impl Compiler { in_class: true, in_async_scope: false, }; + let pre_class_body_symbol_table_cursors = self.current_symbol_table_cursors(); let class_code = self.compile_class_body(name, body, type_params, firstlineno)?; + let post_class_body_symbol_table_cursors = self.current_symbol_table_cursors(); + self.set_symbol_table_cursors(pre_class_body_symbol_table_cursors); self.ctx = prev_ctx; self.set_source_range(class_source_range); @@ -5295,7 +5918,7 @@ impl Compiler { // Create the class body function with the .type_params closure // captured through the class code object's freevars. - self.make_closure(class_code, MakeFunctionFlags::new())?; + self.make_closure(class_code, bytecode::MakeFunctionFlags::new())?; self.emit_load_const(ConstantData::Str { value: name.into() }); // Create .generic_base after the class function and name are on the @@ -5311,134 +5934,21 @@ impl Compiler { self.set_source_range(class_source_range); self.store_name(".generic_base")?; - // Compile bases and call __build_class__ - // Check for starred bases or **kwargs - let has_starred = arguments.is_some_and(|args| { - args.args - .iter() - .any(|arg| matches!(arg, ast::Expr::Starred(_))) + let (bases, keywords) = arguments.map_or((&[][..], &[][..]), |args| { + (&args.args[..], &args.keywords[..]) }); - let has_double_star = - arguments.is_some_and(|args| args.keywords.iter().any(|kw| kw.arg.is_none())); - - if has_starred { - // Use CallFunctionEx for *bases or **kwargs - // Stack has: [__build_class__, NULL, class_func, name] - // Need to build: args tuple = (class_func, name, *bases, .generic_base) - - // Build a list starting with class_func and name (2 elements already on stack) - emit!(self, Instruction::BuildList { count: 2 }); - - // Add bases to the list - if let Some(arguments) = arguments { - for arg in &arguments.args { - if let ast::Expr::Starred(ast::ExprStarred { value, .. }) = arg { - // Starred: compile and extend - self.compile_expression(value)?; - emit!(self, Instruction::ListExtend { i: 1 }); - } else { - // Non-starred: compile and append - self.compile_expression(arg)?; - emit!(self, Instruction::ListAppend { i: 1 }); - } - } - } - - // Add .generic_base as final element - self.set_source_range(class_source_range); - self.load_name(".generic_base")?; - self.set_source_range(class_source_range); - emit!(self, Instruction::ListAppend { i: 1 }); - - // Convert list to tuple - self.set_source_range(class_source_range); - emit!( - self, - Instruction::CallIntrinsic1 { - func: IntrinsicFunction1::ListToTuple - } - ); - - self.compile_call_function_ex_keywords( - arguments.map_or(&[][..], |args| &args.keywords[..]), - class_source_range, - )?; - emit!(self, Instruction::CallFunctionEx); - } else if has_double_star { - if let Some(arguments) = arguments { - for arg in &arguments.args { - self.compile_expression(arg)?; - } - } - self.set_source_range(class_source_range); - self.load_name(".generic_base")?; - self.set_source_range(class_source_range); - emit!( - self, - Instruction::BuildTuple { - count: 3 + arguments - .map_or(0, |args| u32::try_from(args.args.len()).unwrap()) - } - ); - self.compile_call_function_ex_keywords( - &arguments.unwrap().keywords[..], - class_source_range, - )?; - emit!(self, Instruction::CallFunctionEx); - } else { - // Simple case: no starred bases, no **kwargs - // Compile bases normally - let base_count = if let Some(arguments) = arguments { - for arg in &arguments.args { - self.compile_expression(arg)?; - } - arguments.args.len() - } else { - 0 - }; - - // Load .generic_base as the last base - self.set_source_range(class_source_range); - self.load_name(".generic_base")?; - - let nargs = 2 + u32::try_from(base_count).expect("too many base classes") + 1; - - // Handle keyword arguments (no **kwargs here) - if let Some(arguments) = arguments - && !arguments.keywords.is_empty() - { - let mut kwarg_names = vec![]; - for keyword in &arguments.keywords { - let name = keyword.arg.as_ref().expect( - "keyword argument name must be set (no **kwargs in this branch)", - ); - kwarg_names.push(ConstantData::Str { - value: name.as_str().into(), - }); - self.compile_expression(&keyword.value)?; - } - self.set_source_range(class_source_range); - self.emit_load_const(ConstantData::Tuple { - elements: kwarg_names, - }); - self.set_source_range(class_source_range); - emit!( - self, - Instruction::CallKw { - argc: nargs - + u32::try_from(arguments.keywords.len()) - .expect("too many keyword arguments") - } - ); - } else { - self.set_source_range(class_source_range); - emit!(self, Instruction::Call { argc: nargs }); - } - } + self.codegen_call_helper_impl( + 2, + bases, + keywords, + class_source_range, + None, + Some(".generic_base"), + )?; // Return the created class - self.set_source_range(class_source_range); self.emit_return_value(); + self.set_no_location(); // Exit type params scope and wrap in function let type_params_code = self.exit_scope(); @@ -5446,7 +5956,7 @@ impl Compiler { // Execute the type params function self.set_source_range(class_source_range); - self.make_closure(type_params_code, MakeFunctionFlags::new())?; + self.make_closure(type_params_code, bytecode::MakeFunctionFlags::new())?; self.set_source_range(class_source_range); emit!(self, Instruction::PushNull); self.set_source_range(class_source_range); @@ -5457,7 +5967,7 @@ impl Compiler { emit!(self, Instruction::PushNull); // Create class function with closure - self.make_closure(class_code, MakeFunctionFlags::new())?; + self.make_closure(class_code, bytecode::MakeFunctionFlags::new())?; self.emit_load_const(ConstantData::Str { value: name.into() }); if let Some(arguments) = arguments { @@ -5466,6 +5976,7 @@ impl Compiler { self.set_source_range(class_source_range); emit!(self, Instruction::Call { argc: 2 }); } + self.set_symbol_table_cursors(post_class_body_symbol_table_cursors); } // Step 4: Apply decorators and store (common to both paths) @@ -5484,7 +5995,7 @@ impl Compiler { test: &ast::Expr, body: &[ast::Stmt], elif_else_clauses: &[ast::ElifElseClause], - _stmt_range: TextRange, + stmt_range: TextRange, ) -> CompileResult<()> { let end_block = self.new_block(); let next_block = if elif_else_clauses.is_empty() { @@ -5493,7 +6004,7 @@ impl Compiler { self.new_block() }; - self.compile_jump_if(test, false, next_block)?; + self.compile_jump_if_inner(test, false, next_block, Some(stmt_range))?; self.compile_statements(body)?; let Some((clause, rest)) = elif_else_clauses.split_first() else { @@ -5509,7 +6020,7 @@ impl Compiler { self.use_cpython_label_block(next_block); if let Some(test) = &clause.test { - self.compile_if(test, &clause.body, rest, test.range())?; + self.compile_if(test, &clause.body, rest, clause.range)?; } else { debug_assert!(rest.is_empty()); self.compile_statements(&clause.body)?; @@ -5523,6 +6034,7 @@ impl Compiler { test: &ast::Expr, body: &[ast::Stmt], orelse: &[ast::Stmt], + while_range: TextRange, ) -> CompileResult<()> { self.enter_conditional_block(); @@ -5538,7 +6050,7 @@ impl Compiler { end_label, FBlockDatum::None, )?; - self.compile_jump_if(test, false, anchor_block)?; + self.compile_jump_if_inner(test, false, anchor_block, Some(while_range))?; self.compile_loop_body_statements(body)?; emit!(self, PseudoInstruction::Jump { delta: loop_block }); @@ -5560,7 +6072,17 @@ impl Compiler { is_async: bool, ) -> CompileResult<()> { self.enter_conditional_block(); + let result = self.compile_with_inner(items, body, is_async); + self.leave_conditional_block(); + result + } + fn compile_with_inner( + &mut self, + items: &[ast::WithItem], + body: &[ast::Stmt], + is_async: bool, + ) -> CompileResult<()> { // Python 3.12+ style with statement: // // BEFORE_WITH # TOS: ctx_mgr -> [__exit__, __enter__ result] @@ -5606,7 +6128,9 @@ impl Compiler { emit!(self, Instruction::Copy { i: 1 }); // [cm, cm] if is_async { - if self.ctx.func != FunctionContext::AsyncFunction { + if self.ctx.func != FunctionContext::AsyncFunction + && !self.allows_top_level_await_in_current_context() + { return Err(self.error(CodegenErrorType::InvalidAsyncWith)); } // Load __aexit__ and __aenter__, then call __aenter__ @@ -5691,7 +6215,7 @@ impl Compiler { self.compile_with_body_statements(body)?; } else { self.set_source_range(items[0].context_expr.range()); - self.compile_with(items, body, is_async)?; + self.compile_with_inner(items, body, is_async)?; } // CPython pops the async-with fblock before emitting POP_BLOCK, but @@ -5715,7 +6239,6 @@ impl Compiler { } emit!(self, Instruction::PopTop); // Pop __exit__ result emit!(self, PseudoInstruction::Jump { delta: after_block }); - self.set_no_location(); // ===== Exception handler path ===== // Stack at entry: [..., exit_func, self_exit, lasti, exc] @@ -5745,7 +6268,6 @@ impl Compiler { self.use_cpython_label_block(after_block); - self.leave_conditional_block(); Ok(()) } @@ -5786,10 +6308,12 @@ impl Compiler { } // The thing iterated: - self.compile_for_iterable_expression(iter, is_async)?; + self.compile_expression(iter)?; if is_async { - if self.ctx.func != FunctionContext::AsyncFunction { + if self.ctx.func != FunctionContext::AsyncFunction + && !self.allows_top_level_await_in_current_context() + { return Err(self.error(CodegenErrorType::InvalidAsyncFor)); } self.set_source_range(iter.range()); @@ -5821,6 +6345,7 @@ impl Compiler { self.compile_store(target)?; } else { // Retrieve Iterator + self.set_source_range(iter.range()); emit!(self, Instruction::GetIter); self.use_cpython_label_block(for_block); @@ -5842,12 +6367,19 @@ impl Compiler { emit!(self, PseudoInstruction::Jump { delta: for_block }); self.set_no_location(); + if is_async { + // codegen_async_for() pops the loop fblock before the + // END_ASYNC_FOR exception block. Sync codegen_for() keeps the + // fblock through END_FOR/POP_ITER and pops below. + self.pop_fblock_label(FBlockType::ForLoop, for_label); + } + self.use_cpython_label_block(else_block); // Except block for __anext__ / end of sync for if is_async { // codegen_async_for emits END_ASYNC_FOR at the iterator location, - // then pops the for-loop fblock before the else block. + // after the for-loop fblock has already been popped. let saved_range = self.current_source_range; self.set_source_range(iter.range()); self.emit_end_async_for(end_async_for_target); @@ -5859,9 +6391,8 @@ impl Compiler { self.set_no_location(); emit!(self, Instruction::PopIter); self.set_no_location(); + self.pop_fblock_label(FBlockType::ForLoop, for_label); } - // No PopBlock here - for async, POP_BLOCK is already in for_block - self.pop_fblock_label(FBlockType::ForLoop, for_label); self.compile_statements(orelse)?; self.use_cpython_label_block(after_block); @@ -5873,39 +6404,9 @@ impl Compiler { Ok(()) } - fn compile_for_iterable_expression( - &mut self, - iter: &ast::Expr, - is_async: bool, - ) -> CompileResult<()> { - // Match CPython's iterable lowering for `for`/comprehension fronts: - // a non-starred list literal used only for iteration is emitted as a tuple. - // Skip async-for/async comprehension iteration because GET_AITER expects - // the original object semantics. - if !is_async - && let ast::Expr::List(ast::ExprList { elts, .. }) = iter - && elts.len() <= usize::try_from(STACK_USE_GUIDELINE).unwrap() - && !elts.iter().any(|e| matches!(e, ast::Expr::Starred(_))) - { - for elt in elts { - self.compile_expression(elt)?; - } - self.set_source_range(iter.range()); - emit!( - self, - Instruction::BuildList { - count: u32::try_from(elts.len()).expect("too many elements"), - } - ); - return Ok(()); - } - - self.compile_expression(iter) - } - fn compile_comprehension_iter(&mut self, generator: &ast::Comprehension) -> CompileResult<()> { let saved_range = self.current_source_range; - self.compile_for_iterable_expression(&generator.iter, generator.is_async)?; + self.compile_expression(&generator.iter)?; self.set_source_range(generator.iter.range()); if generator.is_async { emit!(self, Instruction::GetAiter); @@ -5928,24 +6429,6 @@ impl Compiler { } } - fn forbidden_name(&mut self, name: &str, ctx: NameUsage) -> CompileResult<bool> { - if ctx == NameUsage::Store && name == "__debug__" { - return Err(self.error(CodegenErrorType::Assign("__debug__"))); - // return Ok(true); - } - if ctx == NameUsage::Delete && name == "__debug__" { - return Err(self.error(CodegenErrorType::Delete("__debug__"))); - // return Ok(true); - } - Ok(false) - } - - fn compile_error_forbidden_name(&mut self, name: &str) -> CodegenError { - self.error(CodegenErrorType::SyntaxError(format!( - "cannot use forbidden name '{name}' in pattern" - ))) - } - /// Ensures that `pc.fail_pop` has at least `n + 1` entries. /// If not, new labels are generated and pushed until the required size is reached. fn ensure_fail_pop(&mut self, pc: &mut PatternContext, n: usize) { @@ -5988,7 +6471,7 @@ impl Compiler { /// Emits the necessary POP instructions for all failure targets in the pattern context, /// then resets the fail_pop vector. - fn emit_and_reset_fail_pop(&mut self, pc: &mut PatternContext) { + fn emit_and_reset_fail_pop(&mut self, pc: &mut PatternContext, loc: TextRange) { // If the fail_pop vector is empty, nothing needs to be done. if pc.fail_pop.is_empty() { debug_assert!(pc.fail_pop.is_empty()); @@ -5999,6 +6482,7 @@ impl Compiler { // CPython emit_and_reset_fail_pop() uses USE_LABEL here. self.use_cpython_label_block(label); // Emit the POP instruction. + self.set_source_range(loc); emit!(self, Instruction::PopTop); } // Finally, use the first label. @@ -6010,7 +6494,7 @@ impl Compiler { } /// Duplicate the effect of Python 3.10's ROT_* instructions using SWAPs. - fn pattern_helper_rotate(&mut self, mut count: usize) { + fn pattern_helper_rotate(&mut self, loc: TextRange, mut count: usize) { // Rotate TOS (top of stack) to position `count` down // This is done by a series of swaps // For count=1, no rotation needed (already at top) @@ -6018,6 +6502,7 @@ impl Compiler { // For count=3, swap TOS with item 2 positions down, then with item 1 position down while count > 1 { // Emit a SWAP instruction with the current count. + self.set_source_range(loc); emit!( self, Instruction::Swap { @@ -6036,32 +6521,30 @@ impl Compiler { /// to the list of captured names. fn pattern_helper_store_name( &mut self, + loc: TextRange, n: Option<&ast::Identifier>, pc: &mut PatternContext, ) -> CompileResult<()> { match n { // If no name is provided, simply pop the top of the stack. None => { + self.set_source_range(loc); emit!(self, Instruction::PopTop); Ok(()) } Some(name) => { - // Check if the name is forbidden for storing. - if self.forbidden_name(name.as_str(), NameUsage::Store)? { - return Err(self.compile_error_forbidden_name(name.as_str())); - } - // Ensure we don't store the same name twice. // TODO: maybe pc.stores should be a set? if pc.stores.contains(&name.to_string()) { - return Err( - self.error(CodegenErrorType::DuplicateStore(name.as_str().to_string())) - ); + return Err(self.error_ranged( + CodegenErrorType::DuplicateStore(name.as_str().to_string()), + loc, + )); } // Calculate how many items to rotate: let rotations = pc.on_top + pc.stores.len() + 1; - self.pattern_helper_rotate(rotations); + self.pattern_helper_rotate(loc, rotations); // Append the name to the captured stores. pc.stores.push(name.to_string()); @@ -6070,30 +6553,51 @@ impl Compiler { } } - fn pattern_unpack_helper(&mut self, elts: &[ast::Pattern]) -> CompileResult<()> { + fn pattern_wildcard_check(pattern: &ast::Pattern) -> bool { + matches!( + pattern, + ast::Pattern::MatchAs(ast::PatternMatchAs { name: None, .. }) + ) + } + + fn pattern_wildcard_star_check(pattern: &ast::Pattern) -> bool { + matches!( + pattern, + ast::Pattern::MatchStar(ast::PatternMatchStar { name: None, .. }) + ) + } + + fn pattern_unpack_helper( + &mut self, + loc: TextRange, + elts: &[ast::Pattern], + ) -> CompileResult<()> { let n = elts.len(); let mut seen_star = false; for (i, elt) in elts.iter().enumerate() { - if elt.is_match_star() { - if !seen_star { - if i >= (1 << 8) || (n - i - 1) >= ((i32::MAX as usize) >> 8) { - todo!(); - // return self.compiler_error(loc, "too many expressions in star-unpacking sequence pattern"); - } - let counts = UnpackExArgs { - before: u8::try_from(i).unwrap(), - after: u8::try_from(n - i - 1).unwrap(), - }; - emit!(self, Instruction::UnpackEx { counts }); - seen_star = true; - } else { - // TODO: Fix error msg - return Err(self.error(CodegenErrorType::MultipleStarArgs)); - // return self.compiler_error(loc, "multiple starred expressions in sequence pattern"); + if elt.is_match_star() && !seen_star { + if i >= (1 << 8) || (n - i - 1) >= ((i32::MAX as usize) >> 8) { + return Err(self.error_ranged( + CodegenErrorType::TooManyExpressionsInStarUnpackingSequencePattern, + loc, + )); } + let counts = UnpackExArgs { + before: u8::try_from(i).unwrap(), + after: u32::try_from(n - i - 1).unwrap(), + }; + self.set_source_range(loc); + emit!(self, Instruction::UnpackEx { counts }); + seen_star = true; + } else if elt.is_match_star() { + return Err(self.error_ranged( + CodegenErrorType::MultipleStarredExpressionsInSequencePattern, + loc, + )); } } if !seen_star { + self.set_source_range(loc); emit!( self, Instruction::UnpackSequence { @@ -6106,12 +6610,13 @@ impl Compiler { fn pattern_helper_sequence_unpack( &mut self, + loc: TextRange, patterns: &[ast::Pattern], _star: Option<usize>, pc: &mut PatternContext, ) -> CompileResult<()> { // Unpack the sequence into individual subjects. - self.pattern_unpack_helper(patterns)?; + self.pattern_unpack_helper(loc, patterns)?; let size = patterns.len(); // Increase the on_top counter for the newly unpacked subjects. pc.on_top += size; @@ -6126,6 +6631,7 @@ impl Compiler { fn pattern_helper_sequence_subscr( &mut self, + loc: TextRange, patterns: &[ast::Pattern], star: usize, pc: &mut PatternContext, @@ -6133,35 +6639,32 @@ impl Compiler { // Keep the subject around for extracting elements. pc.on_top += 1; for (i, pattern) in patterns.iter().enumerate() { - let is_true_wildcard = matches!( - pattern, - ast::Pattern::MatchAs(ast::PatternMatchAs { - pattern: None, - name: None, - .. - }) - ); - if is_true_wildcard { + if Self::pattern_wildcard_check(pattern) { continue; } if i == star { // This must be a starred wildcard. - // assert!(pattern.is_star_wildcard()); + debug_assert!(Self::pattern_wildcard_star_check(pattern)); continue; } // Duplicate the subject. + self.set_source_range(loc); emit!(self, Instruction::Copy { i: 1 }); if i < star { // For indices before the star, use a nonnegative index equal to i. + self.set_source_range(loc); self.emit_load_const(ConstantData::Integer { value: i.into() }); } else { // For indices after the star, compute a nonnegative index: // index = len(subject) - (size - i) + self.set_source_range(loc); emit!(self, Instruction::GetLen); + self.set_source_range(loc); self.emit_load_const(ConstantData::Integer { value: (patterns.len() - i).into(), }); // Subtract to compute the correct index. + self.set_source_range(loc); emit!( self, Instruction::BinaryOp { @@ -6170,6 +6673,7 @@ impl Compiler { ); } // Use BINARY_OP/NB_SUBSCR to extract the element. + self.set_source_range(loc); emit!( self, Instruction::BinaryOp { @@ -6181,6 +6685,7 @@ impl Compiler { } // Pop the subject off the stack. pc.on_top -= 1; + self.set_source_range(loc); emit!(self, Instruction::PopTop); Ok(()) } @@ -6209,31 +6714,31 @@ impl Compiler { // If there is no sub-pattern, then it's an irrefutable match. if p.pattern.is_none() { if !pc.allow_irrefutable { - if let Some(_name) = p.name.as_ref() { - // TODO: This error message does not match cpython exactly - // A name capture makes subsequent patterns unreachable. - return Err(self.error(CodegenErrorType::UnreachablePattern( - PatternUnreachableReason::NameCapture, - ))); + if let Some(name) = p.name.as_ref() { + return Err(self.error_ranged( + CodegenErrorType::UnreachableNameCapturePattern(name.to_string()), + p.range, + )); } // A wildcard makes remaining patterns unreachable. - return Err(self.error(CodegenErrorType::UnreachablePattern( - PatternUnreachableReason::Wildcard, - ))); + return Err( + self.error_ranged(CodegenErrorType::UnreachableWildcardPattern, p.range) + ); } // If irrefutable matches are allowed, store the name (if any). - return self.pattern_helper_store_name(p.name.as_ref(), pc); + return self.pattern_helper_store_name(p.range, p.name.as_ref(), pc); } // Otherwise, there is a sub-pattern. Duplicate the object on top of the stack. pc.on_top += 1; + self.set_source_range(p.range); emit!(self, Instruction::Copy { i: 1 }); // Compile the sub-pattern. self.compile_pattern(p.pattern.as_ref().unwrap(), pc)?; // After success, decrement the on_top counter. pc.on_top -= 1; // Store the captured name (if any). - self.pattern_helper_store_name(p.name.as_ref(), pc)?; + self.pattern_helper_store_name(p.range, p.name.as_ref(), pc)?; Ok(()) } @@ -6242,7 +6747,7 @@ impl Compiler { p: &ast::PatternMatchStar, pc: &mut PatternContext, ) -> CompileResult<()> { - self.pattern_helper_store_name(p.name.as_ref(), pc)?; + self.pattern_helper_store_name(p.range, p.name.as_ref(), pc)?; Ok(()) } @@ -6251,21 +6756,19 @@ impl Compiler { fn validate_kwd_attrs( &mut self, attrs: &[ast::Identifier], - _patterns: &[ast::Pattern], + patterns: &[ast::Pattern], ) -> CompileResult<()> { let n_attrs = attrs.len(); for i in 0..n_attrs { let attr = attrs[i].as_str(); - // Check if the attribute name is forbidden in a Store context. - if self.forbidden_name(attr, NameUsage::Store)? { - // Return an error if the name is forbidden. - return Err(self.compile_error_forbidden_name(attr)); - } // Check for duplicates: compare with every subsequent attribute. - for ident in attrs.iter().take(n_attrs).skip(i + 1) { + for (j, ident) in attrs.iter().enumerate().take(n_attrs).skip(i + 1) { let other = ident.as_str(); if attr == other { - return Err(self.error(CodegenErrorType::RepeatedAttributePattern)); + return Err(self.error_ranged( + CodegenErrorType::RepeatedAttributePattern(attr.to_owned()), + patterns[j].range(), + )); } } } @@ -6292,12 +6795,27 @@ impl Compiler { let nargs = patterns.len(); let n_attrs = kwd_attrs.len(); + let n_kwd_patterns = kwd_patterns.len(); + if n_attrs != n_kwd_patterns { + return Err(self.error_ranged( + CodegenErrorType::SyntaxError(format!( + "kwd_attrs ({n_attrs}) / kwd_patterns ({n_kwd_patterns}) length mismatch in class pattern" + )), + p.range, + )); + } // Check for too many sub-patterns. - if nargs > u32::MAX as usize || (nargs + n_attrs).saturating_sub(1) > i32::MAX as usize { - return Err(self.error(CodegenErrorType::SyntaxError( - "too many sub-patterns in class pattern".to_owned(), - ))); + if nargs > i32::MAX as usize + || nargs.saturating_add(n_attrs).saturating_sub(1) > i32::MAX as usize + { + return Err(self.error_ranged( + CodegenErrorType::SyntaxError(format!( + "too many sub-patterns in class pattern {}", + UnparseExpr::new(&match_class.cls, &self.source_file) + )), + p.range, + )); } // Validate keyword attributes if any. @@ -6344,6 +6862,7 @@ impl Compiler { // At this point the TOS is a tuple of (nargs + n_attrs) attributes (or None). pc.on_top += 1; + self.set_source_range(p.range); self.jump_to_fail_pop(pc, JumpOp::PopJumpIfFalse); // Unpack the tuple into (nargs + n_attrs) items. @@ -6354,24 +6873,19 @@ impl Compiler { count: u32::try_from(total).unwrap() } ); - pc.on_top += total; - pc.on_top -= 1; + if total == 0 { + pc.on_top -= 1; + } else { + pc.on_top += total - 1; + } // Process each sub-pattern. for subpattern in patterns.iter().chain(kwd_patterns.iter()) { - // Check if this is a true wildcard (underscore pattern without name binding) - let is_true_wildcard = match subpattern { - ast::Pattern::MatchAs(match_as) => { - // Only consider it wildcard if both pattern and name are None (i.e., "_") - match_as.pattern.is_none() && match_as.name.is_none() - } - _ => subpattern.is_wildcard(), - }; - // Decrement the on_top counter for each sub-pattern pc.on_top -= 1; - if is_true_wildcard { + if Self::pattern_wildcard_check(subpattern) { + self.set_source_range(p.range); emit!(self, Instruction::PopTop); continue; // Don't compile wildcard patterns } @@ -6395,27 +6909,36 @@ impl Compiler { // Validate pattern count matches key count if keys.len() != patterns.len() { - return Err(self.error(CodegenErrorType::SyntaxError(format!( - "keys ({}) / patterns ({}) length mismatch in mapping pattern", - keys.len(), - patterns.len() - )))); + return Err(self.error_ranged( + CodegenErrorType::SyntaxError(format!( + "keys ({}) / patterns ({}) length mismatch in mapping pattern", + keys.len(), + patterns.len() + )), + p.range, + )); } - // Validate rest pattern: '_' cannot be used as a rest target + // `case {**_}:` is rejected before codegen. RustPython's parser + // currently lets it through, so keep the compiler boundary equivalent. if let Some(rest) = star_target && rest.as_str() == "_" { - return Err(self.error(CodegenErrorType::SyntaxError("invalid syntax".to_string()))); + return Err(self.error_ranged( + CodegenErrorType::SyntaxError("invalid syntax".to_string()), + rest.range, + )); } // Step 1: Check if subject is a mapping // Stack: [subject] pc.on_top += 1; + self.set_source_range(p.range); emit!(self, Instruction::MatchMapping); // Stack: [subject, is_mapping] + self.set_source_range(p.range); self.jump_to_fail_pop(pc, JumpOp::PopJumpIfFalse); // Stack: [subject] @@ -6430,64 +6953,40 @@ impl Compiler { // Length check for patterns with keys if size > 0 { // Check if the mapping has at least 'size' keys + self.set_source_range(p.range); emit!(self, Instruction::GetLen); + self.set_source_range(p.range); self.emit_load_const(ConstantData::Integer { value: size.into() }); // Stack: [subject, len, size] + self.set_source_range(p.range); emit!( self, Instruction::CompareOp { opname: ComparisonOperator::GreaterOrEqual } ); + self.set_source_range(p.range); self.jump_to_fail_pop(pc, JumpOp::PopJumpIfFalse); // Stack: [subject] } // Check for overflow (INT_MAX < size - 1) - let size = u32::try_from(size).map_err(|_| { - self.error(CodegenErrorType::SyntaxError( - "too many sub-patterns in mapping pattern".to_string(), - )) - })?; - - // Step 2: If we have keys to match - if size > 0 { - // Validate and compile keys - let mut seen = IndexSet::default(); - for key in keys { - let is_attribute = matches!(key, ast::Expr::Attribute(_)); - let is_literal = matches!( - key, - ast::Expr::NumberLiteral(_) - | ast::Expr::StringLiteral(_) - | ast::Expr::BytesLiteral(_) - | ast::Expr::BooleanLiteral(_) - | ast::Expr::NoneLiteral(_) - ); - let key_repr = if is_literal { - UnparseExpr::new(key, &self.source_file).to_string() - } else if is_attribute { - String::new() - } else { - return Err(self.error(CodegenErrorType::SyntaxError( - "mapping pattern keys may only match literals and attribute lookups" - .to_string(), - ))); - }; - - if !key_repr.is_empty() && seen.contains(&key_repr) { - return Err(self.error(CodegenErrorType::SyntaxError(format!( - "mapping pattern checks duplicate key ({key_repr})" - )))); - } - if !key_repr.is_empty() { - seen.insert(key_repr); - } - - self.compile_match_pattern_expr(key)?; - } - self.set_source_range(p.range); + if size.saturating_sub(1) > i32::MAX as usize { + return Err(self.error_ranged( + CodegenErrorType::SyntaxError( + "too many sub-patterns in mapping pattern".to_string(), + ), + p.range, + )); } + let size = size.to_u32(); + + // Step 2: Validate and compile all keys. + let mut seen = Vec::new(); + for key in keys { + self.compile_pattern_mapping_key(&mut seen, p.range, key)?; + } + self.set_source_range(p.range); // Stack: [subject, key1, key2, ..., key_n] // Build tuple of keys (empty tuple if size==0) @@ -6500,11 +6999,14 @@ impl Compiler { pc.on_top += 2; // subject and keys_tuple are underneath // Check if match succeeded + self.set_source_range(p.range); emit!(self, Instruction::Copy { i: 1 }); // Stack: [subject, keys_tuple, values_tuple, values_tuple_copy] // Check if copy is None (consumes the copy like POP_JUMP_IF_NONE) + self.set_source_range(p.range); self.emit_load_const(ConstantData::None); + self.set_source_range(p.range); emit!( self, Instruction::IsOp { @@ -6513,14 +7015,18 @@ impl Compiler { ); // Stack: [subject, keys_tuple, values_tuple, bool] + self.set_source_range(p.range); self.jump_to_fail_pop(pc, JumpOp::PopJumpIfFalse); // Stack: [subject, keys_tuple, values_tuple] // Unpack values (the original values_tuple) emit!(self, Instruction::UnpackSequence { count: size }); // Stack after unpack: [subject, keys_tuple, ...unpacked values...] - pc.on_top += size as usize; // Unpacked size values, tuple replaced by values - pc.on_top -= 1; + if size == 0 { + pc.on_top -= 1; + } else { + pc.on_top += size as usize - 1; + } // Step 3: Process matched values for i in 0..size { @@ -6539,15 +7045,19 @@ impl Compiler { // Stack: [subject, keys_tuple] // Build rest dict exactly + self.set_source_range(p.range); emit!(self, Instruction::BuildMap { count: 0 }); // Stack: [subject, keys_tuple, {}] + self.set_source_range(p.range); emit!(self, Instruction::Swap { i: 3 }); // Stack: [{}, keys_tuple, subject] + self.set_source_range(p.range); emit!(self, Instruction::DictUpdate { i: 2 }); // Stack after DICT_UPDATE: [rest_dict, keys_tuple] // DICT_UPDATE consumes source (subject) and leaves dict in place // Unpack keys and delete from rest_dict + self.set_source_range(p.range); emit!(self, Instruction::UnpackSequence { count: size }); // Stack: [rest_dict, k1, k2, ..., kn] (if size==0, nothing pushed) @@ -6556,10 +7066,13 @@ impl Compiler { let mut remaining = size; while remaining > 0 { // Copy rest_dict which is at position (1 + remaining) from TOS + self.set_source_range(p.range); emit!(self, Instruction::Copy { i: 1 + remaining }); // Stack: [rest_dict, k1, ..., kn, rest_dict] + self.set_source_range(p.range); emit!(self, Instruction::Swap { i: 2 }); // Stack: [rest_dict, k1, ..., kn-1, rest_dict, kn] + self.set_source_range(p.range); emit!(self, Instruction::DeleteSubscr); // Stack: [rest_dict, k1, ..., kn-1] (removed kn from rest_dict) remaining -= 1; @@ -6568,22 +7081,216 @@ impl Compiler { // pattern_helper_store_name will handle the rotation correctly // Store the rest dict - self.pattern_helper_store_name(Some(rest_name), pc)?; - - // After storing all values, pc.on_top should be 0 - // The values are rotated to the bottom for later storage - pc.on_top = 0; + self.pattern_helper_store_name(p.range, Some(rest_name), pc)?; } else { // Non-rest pattern: just clean up the stack // Pop them as we're not using them + self.set_source_range(p.range); emit!(self, Instruction::PopTop); // Pop keys_tuple + self.set_source_range(p.range); emit!(self, Instruction::PopTop); // Pop subject } Ok(()) } + fn compile_pattern_mapping_key( + &mut self, + seen: &mut Vec<ConstantData>, + pattern_range: TextRange, + key: &ast::Expr, + ) -> CompileResult<()> { + let is_attribute = matches!(key, ast::Expr::Attribute(_)); + let constant = match self.try_compile_match_mapping_key_constant(key)? { + Some(constant) => Some(constant), + None if is_attribute => None, + None => { + if Self::is_unexpected_match_literal_constant(key) { + return Err(self.error_ranged( + CodegenErrorType::SyntaxError( + "unexpected constant inside of a literal pattern".to_string(), + ), + pattern_range, + )); + } + return Err(self.error_ranged( + CodegenErrorType::SyntaxError( + "mapping pattern keys may only match literals and attribute lookups" + .to_string(), + ), + pattern_range, + )); + } + }; + + if let Some(constant) = constant { + if seen + .iter() + .any(|seen| Self::match_mapping_keys_equal(seen, &constant)) + { + let key_repr = Self::match_mapping_key_repr(&constant); + return Err(self.error_ranged( + CodegenErrorType::SyntaxError(format!( + "mapping pattern checks duplicate key ({key_repr})" + )), + pattern_range, + )); + } + seen.push(constant); + } + + self.compile_match_pattern_expr(key) + } + + fn try_compile_match_mapping_key_constant( + &mut self, + key: &ast::Expr, + ) -> CompileResult<Option<ConstantData>> { + if let Some(constant) = self.try_fold_match_pattern_const_expr(key)? { + return Ok(Some(constant)); + } + self.try_compile_match_mapping_key_direct_constant(key) + } + + fn try_compile_match_value_constant( + &mut self, + value: &ast::Expr, + ) -> CompileResult<Option<ConstantData>> { + if let Some(constant) = self.try_fold_match_pattern_const_expr(value)? { + return Ok(Some(constant)); + } + self.try_compile_match_pattern_direct_literal(value) + } + + fn match_mapping_keys_equal(left: &ConstantData, right: &ConstantData) -> bool { + use ConstantData::{Bytes, Ellipsis, None, Str}; + + if Self::match_mapping_numeric_keys_equal(left, right).unwrap_or(false) { + return true; + } + + match (left, right) { + (Str { value: left }, Str { value: right }) => left == right, + (Bytes { value: left }, Bytes { value: right }) => left == right, + (None, None) | (Ellipsis, Ellipsis) => true, + _ => false, + } + } + + fn match_mapping_key_repr(key: &ConstantData) -> String { + match key { + ConstantData::Integer { value } => value.to_string(), + ConstantData::Float { value } => literal_float::to_string(*value), + ConstantData::Complex { value } => literal_complex::to_string(value.re, value.im), + ConstantData::Boolean { value } => { + if *value { + "True".to_owned() + } else { + "False".to_owned() + } + } + ConstantData::Str { value } => UnicodeEscape::new_repr(value.as_ref()) + .str_repr() + .to_string() + .unwrap_or_else(|| value.to_string()), + ConstantData::Bytes { value } => AsciiEscape::new_repr(value) + .bytes_repr() + .to_string() + .unwrap_or_else(|| format!(r#"b"{}""#, value.escape_ascii())), + ConstantData::None => "None".to_owned(), + ConstantData::Ellipsis => "...".to_owned(), + other => other.to_string(), + } + } + + fn match_mapping_numeric_keys_equal(left: &ConstantData, right: &ConstantData) -> Option<bool> { + use ConstantData::{Boolean, Complex, Float, Integer}; + + match (left, right) { + (Integer { value: left }, Integer { value: right }) => Some(left == right), + (Boolean { value: left }, Boolean { value: right }) => Some(left == right), + (Boolean { value }, Integer { value: int }) + | (Integer { value: int }, Boolean { value }) => { + Some(BigInt::from(u8::from(*value)) == *int) + } + (Float { value: left }, Float { value: right }) => Some(left == right), + (Integer { value: int }, Float { value: float }) + | (Float { value: float }, Integer { value: int }) => { + Some(Self::match_mapping_float_integer_equal(*float, int)) + } + (Boolean { value }, Float { value: float }) + | (Float { value: float }, Boolean { value }) => Some( + Self::match_mapping_float_integer_equal(*float, &BigInt::from(u8::from(*value))), + ), + (Complex { value: left }, Complex { value: right }) => { + Some(left.re == right.re && left.im == right.im) + } + (Complex { value: complex }, other) | (other, Complex { value: complex }) => Some( + complex.im == 0.0 + && Self::match_mapping_float_real_constant_equal(complex.re, other) + .unwrap_or(false), + ), + _ => Option::None, + } + } + + fn match_mapping_float_real_constant_equal(float: f64, other: &ConstantData) -> Option<bool> { + match other { + ConstantData::Integer { value } => { + Some(Self::match_mapping_float_integer_equal(float, value)) + } + ConstantData::Boolean { value } => Some(Self::match_mapping_float_integer_equal( + float, + &BigInt::from(u8::from(*value)), + )), + ConstantData::Float { value } => Some(float == *value), + _ => None, + } + } + + fn match_mapping_float_integer_equal(float: f64, int: &BigInt) -> bool { + Self::match_mapping_float_to_integer(float).is_some_and(|float_int| &float_int == int) + } + + fn match_mapping_float_to_integer(value: f64) -> Option<BigInt> { + if !value.is_finite() { + return None; + } + if value == 0.0 { + return Some(BigInt::from(0)); + } + + let bits = value.to_bits(); + let negative = (bits >> 63) != 0; + let exponent_bits = i32::try_from((bits >> 52) & 0x7ff).ok()?; + let fraction = bits & ((1_u64 << 52) - 1); + let (mantissa, exponent) = if exponent_bits == 0 { + (fraction, -1074) + } else { + ((1_u64 << 52) | fraction, exponent_bits - 1023 - 52) + }; + + let mut integer = if exponent >= 0 { + BigInt::from(mantissa) << u32::try_from(exponent).ok()? + } else { + let shift = u32::try_from(-exponent).ok()?; + if shift >= u64::BITS { + return None; + } + let mask = (1_u64 << shift) - 1; + if mantissa & mask != 0 { + return None; + } + BigInt::from(mantissa >> shift) + }; + + if negative { + integer = -integer; + } + Some(integer) + } + fn compile_pattern_or( &mut self, p: &ast::PatternMatchOr, @@ -6625,7 +7332,9 @@ impl Compiler { } else { let control_vec = control.as_ref().unwrap(); if n_stores != control_vec.len() { - return Err(self.error(CodegenErrorType::ConflictingNameBindPattern)); + return Err( + self.error_ranged(CodegenErrorType::ConflictingNameBindPattern, p.range()) + ); } else if n_stores > 0 { // Check that the names occur in the same order. for i_control in (0..n_stores).rev() { @@ -6633,7 +7342,10 @@ impl Compiler { // Find the index of `name` in the current stores. let i_stores = pc.stores.iter().position(|n| n == name).ok_or_else(|| { - self.error(CodegenErrorType::ConflictingNameBindPattern) + self.error_ranged( + CodegenErrorType::ConflictingNameBindPattern, + p.range(), + ) })?; if i_control != i_stores { // The orders differ; we must reorder. @@ -6653,7 +7365,7 @@ impl Compiler { // Also perform the same rotation on the evaluation stack. self.set_source_range(alt.range()); for _ in 0..=i_stores { - self.pattern_helper_rotate(i_control + 1); + self.pattern_helper_rotate(alt.range(), i_control + 1); } } } @@ -6663,7 +7375,7 @@ impl Compiler { self.set_source_range(alt.range()); emit!(self, PseudoInstruction::Jump { delta: end }); self.set_source_range(alt.range()); - self.emit_and_reset_fail_pop(pc); + self.emit_and_reset_fail_pop(pc, alt.range()); } // Restore the original pattern context. @@ -6688,11 +7400,14 @@ impl Compiler { for i in 0..n_stores { // Rotate the capture to its proper place. self.set_source_range(p.range()); - self.pattern_helper_rotate(n_rots); + self.pattern_helper_rotate(p.range(), n_rots); let name = &control.as_ref().unwrap()[i]; // Check for duplicate binding. if pc.stores.contains(name) { - return Err(self.error(CodegenErrorType::DuplicateStore(name.to_string()))); + return Err(self.error_ranged( + CodegenErrorType::DuplicateStore(name.to_string()), + p.range(), + )); } pc.stores.push(name.clone()); } @@ -6720,47 +7435,59 @@ impl Compiler { for (i, pattern) in patterns.iter().enumerate() { if pattern.is_match_star() { if star.is_some() { - // TODO: Fix error msg - return Err(self.error(CodegenErrorType::MultipleStarArgs)); + return Err(self.error_ranged( + CodegenErrorType::MultipleStarredNamesInSequencePattern, + p.range, + )); } // star wildcard check - star_wildcard = pattern.as_match_star().is_some_and(|m| m.name.is_none()); + star_wildcard = Self::pattern_wildcard_star_check(pattern); only_wildcard &= star_wildcard; star = Some(i); continue; } // wildcard check - only_wildcard &= pattern.as_match_as().is_some_and(|m| m.name.is_none()); + only_wildcard &= Self::pattern_wildcard_check(pattern); } // Keep the subject on top during the sequence and length checks. pc.on_top += 1; + self.set_source_range(p.range); emit!(self, Instruction::MatchSequence); + self.set_source_range(p.range); self.jump_to_fail_pop(pc, JumpOp::PopJumpIfFalse); if star.is_none() { // No star: len(subject) == size + self.set_source_range(p.range); emit!(self, Instruction::GetLen); + self.set_source_range(p.range); self.emit_load_const(ConstantData::Integer { value: size.into() }); + self.set_source_range(p.range); emit!( self, Instruction::CompareOp { opname: ComparisonOperator::Equal } ); + self.set_source_range(p.range); self.jump_to_fail_pop(pc, JumpOp::PopJumpIfFalse); } else if size > 1 { // Star exists: len(subject) >= size - 1 + self.set_source_range(p.range); emit!(self, Instruction::GetLen); + self.set_source_range(p.range); self.emit_load_const(ConstantData::Integer { value: (size - 1).into(), }); + self.set_source_range(p.range); emit!( self, Instruction::CompareOp { opname: ComparisonOperator::GreaterOrEqual } ); + self.set_source_range(p.range); self.jump_to_fail_pop(pc, JumpOp::PopJumpIfFalse); } @@ -6768,11 +7495,12 @@ impl Compiler { pc.on_top -= 1; if only_wildcard { // ast::Patterns like: [] / [_] / [_, _] / [*_] / [_, *_] / [_, _, *_] / etc. + self.set_source_range(p.range); emit!(self, Instruction::PopTop); } else if star_wildcard { - self.pattern_helper_sequence_subscr(patterns, star.unwrap(), pc)?; + self.pattern_helper_sequence_subscr(p.range, patterns, star.unwrap(), pc)?; } else { - self.pattern_helper_sequence_unpack(patterns, star, pc)?; + self.pattern_helper_sequence_unpack(p.range, patterns, star, pc)?; } Ok(()) } @@ -6785,14 +7513,37 @@ impl Compiler { // Match CPython codegen_pattern_value(): compare, then normalize to bool // before the fail jump. Late IR folding will collapse COMPARE_OP+TO_BOOL // into COMPARE_OP bool(...) when applicable. - self.compile_match_pattern_expr(&p.value)?; + if let Some(constant) = self.try_compile_match_value_constant(&p.value)? { + self.set_source_range(p.value.range()); + self.emit_load_const(constant); + } else if matches!(*p.value, ast::Expr::Attribute(_)) { + self.compile_expression(&p.value)?; + } else { + if Self::is_unexpected_match_literal_constant(&p.value) { + return Err(self.error_ranged( + CodegenErrorType::SyntaxError( + "unexpected constant inside of a literal pattern".to_string(), + ), + p.range, + )); + } + return Err(self.error_ranged( + CodegenErrorType::SyntaxError( + "patterns may only match literals and attribute lookups".to_string(), + ), + p.range, + )); + } + self.set_source_range(p.range); emit!( self, Instruction::CompareOp { opname: bytecode::ComparisonOperator::Equal } ); + self.set_source_range(p.range); emit!(self, Instruction::ToBool); + self.set_source_range(p.range); self.jump_to_fail_pop(pc, JumpOp::PopJumpIfFalse); Ok(()) } @@ -6803,14 +7554,17 @@ impl Compiler { pc: &mut PatternContext, ) { // Load the singleton constant value. + self.set_source_range(p.range); self.emit_load_const(match p.value { ast::Singleton::None => ConstantData::None, ast::Singleton::False => ConstantData::Boolean { value: false }, ast::Singleton::True => ConstantData::Boolean { value: true }, }); // Compare using the "Is" operator. + self.set_source_range(p.range); emit!(self, Instruction::IsOp { invert: Invert::No }); // Jump to the failure label if the comparison is false. + self.set_source_range(p.range); self.jump_to_fail_pop(pc, JumpOp::PopJumpIfFalse); } @@ -6858,22 +7612,13 @@ impl Compiler { cases: &[ast::MatchCase], pattern_context: &mut PatternContext, ) -> CompileResult<()> { - fn is_trailing_wildcard_default(pattern: &ast::Pattern) -> bool { - match pattern { - ast::Pattern::MatchAs(match_as) => { - match_as.pattern.is_none() && match_as.name.is_none() - } - _ => false, - } - } - self.compile_expression(subject)?; let end = self.new_block(); let num_cases = cases.len(); assert!(num_cases > 0); let has_default = - num_cases > 1 && is_trailing_wildcard_default(&cases.last().unwrap().pattern); + num_cases > 1 && Self::pattern_wildcard_check(&cases.last().unwrap().pattern); let case_count = num_cases - usize::from(has_default); for (i, m) in cases.iter().enumerate().take(case_count) { @@ -6891,8 +7636,8 @@ impl Compiler { self.compile_pattern(&m.pattern, pattern_context)?; assert_eq!(pattern_context.on_top, 0); - self.set_source_range(m.pattern.range()); for name in &pattern_context.stores { + self.set_source_range(m.pattern.range()); self.compile_name(name, NameUsage::Store)?; } @@ -6920,7 +7665,7 @@ impl Compiler { emit!(self, PseudoInstruction::Jump { delta: end }); self.set_no_location(); self.set_source_range(m.pattern.range()); - self.emit_and_reset_fail_pop(pattern_context); + self.emit_and_reset_fail_pop(pattern_context, m.pattern.range()); } if has_default { @@ -6932,7 +7677,7 @@ impl Compiler { emit!(self, Instruction::Nop); } if let Some(ref guard) = m.guard { - self.compile_jump_if(guard, false, end)?; + self.compile_jump_if_inner(guard, false, end, Some(m.pattern.range()))?; } self.compile_statements(&m.body)?; } @@ -7037,6 +7782,7 @@ impl Compiler { ) -> CompileResult<()> { // Save the full Compare expression range for COMPARE_OP positions let compare_range = self.current_source_range; + self.check_compare(compare_range, left, ops, comparators)?; let (last_op, mid_ops) = ops.split_last().unwrap(); let (last_comparator, mid_comparators) = comparators.split_last().unwrap(); @@ -7097,6 +7843,7 @@ impl Compiler { target_block: BlockIdx, ) -> CompileResult<()> { let compare_range = self.current_source_range; + self.check_compare(compare_range, left, ops, comparators)?; let (last_op, mid_ops) = ops.split_last().unwrap(); let (last_comparator, mid_comparators) = comparators.split_last().unwrap(); @@ -7134,13 +7881,13 @@ impl Compiler { self.use_cpython_label_block(cleanup); emit!(self, Instruction::PopTop); if !condition { - self.set_no_location(); emit!( self, PseudoInstruction::JumpNoInterrupt { delta: target_block } ); + self.set_no_location(); } self.use_cpython_label_block(end); @@ -7182,7 +7929,9 @@ impl Compiler { ast::Expr::Starred(ast::ExprStarred { value, .. }) => { // *args: *Ts (where Ts is a TypeVarTuple). // Do [annotation_value] = [*Ts]. + let saved_range = self.current_source_range; self.compile_expression(value)?; + self.set_source_range(saved_range); emit!(self, Instruction::UnpackSequence { count: 1 }); Ok(()) } @@ -7197,6 +7946,7 @@ impl Compiler { fn compile_check_annotation_expression(&mut self, expression: &ast::Expr) -> CompileResult<()> { self.compile_expression(expression)?; + self.set_source_range(expression.range()); emit!(self, Instruction::PopTop); Ok(()) } @@ -7269,23 +8019,24 @@ impl Compiler { } else { // PEP 649: Handle conditional annotations if self.current_symbol_table().has_conditional_annotations { - // Allocate an index for every annotation when has_conditional_annotations - // This keeps indices aligned with compile_module_annotate's enumeration - let code_info = self.current_code_info(); - let annotation_index = code_info.next_conditional_annotation_index; - code_info.next_conditional_annotation_index += 1; - - // Determine if this annotation is conditional - // Module and Class scopes both need all annotations tracked let scope_type = self.current_symbol_table().typ; let in_conditional_block = self.current_code_info().in_conditional_block > 0; let is_conditional = - matches!(scope_type, CompilerScope::Module | CompilerScope::Class) - || in_conditional_block; + matches!(scope_type, CompilerScope::Module) || in_conditional_block; - // Only add to __conditional_annotations__ set if actually conditional if is_conditional { - self.load_name("__conditional_annotations__")?; + let code_info = self.current_code_info(); + let annotation_index = code_info.next_conditional_annotation_index; + code_info.next_conditional_annotation_index += 1; + + self.set_source_range(loc); + if matches!(scope_type, CompilerScope::Class) { + let i = self.get_cell_var_index("__conditional_annotations__"); + emit!(self, Instruction::LoadDeref { i }); + } else { + let namei = self.name("__conditional_annotations__"); + emit!(self, Instruction::LoadName { namei }); + } self.emit_load_const(ConstantData::Integer { value: annotation_index.into(), }); @@ -7340,23 +8091,27 @@ impl Compiler { // Scan for star args: for (i, element) in elts.iter().enumerate() { - if let ast::Expr::Starred(_) = &element { - if seen_star { - return Err(self.error(CodegenErrorType::MultipleStarArgs)); - } - - seen_star = true; + if matches!(element, ast::Expr::Starred(_)) && !seen_star { let before = i; let after = elts.len() - i - 1; - let (before, after) = (|| Some((before.to_u8()?, after.to_u8()?)))() - .ok_or_else(|| { - self.error_ranged( - CodegenErrorType::TooManyStarUnpack, - target.range(), - ) - })?; + if before >= (1 << 8) || after >= ((i32::MAX as usize) >> 8) { + return Err(self.error_ranged( + CodegenErrorType::TooManyStarUnpack, + target.range(), + )); + } + let before = before.to_u8().ok_or_else(|| { + self.error_ranged( + CodegenErrorType::TooManyStarUnpack, + target.range(), + ) + })?; + let after = after.to_u32(); let counts = bytecode::UnpackExArgs { before, after }; emit!(self, Instruction::UnpackEx { counts }); + seen_star = true; + } else if matches!(element, ast::Expr::Starred(_)) { + return Err(self.error(CodegenErrorType::MultipleStarArgs)); } } @@ -7427,7 +8182,7 @@ impl Compiler { ctx: _, .. }) => { - let use_slice_opt = slice.should_use_slice_optimization(); + let use_slice_opt = self.should_apply_two_element_slice_optimization(slice); self.compile_expression(value)?; self.set_source_range(target_range); if use_slice_opt { @@ -7461,7 +8216,7 @@ impl Compiler { self.compile_expression(value)?; let attr_range = self.update_start_location_to_match_attr(target_range, target_range, attr); - self.set_source_range(attr_range); + self.set_source_range(target_range); emit!(self, Instruction::Copy { i: 1 }); let idx = self.name(attr); self.set_source_range(attr_range); @@ -7596,6 +8351,7 @@ impl Compiler { comparators, .. }) if ops.len() > 1 => { + self.set_source_range(expression.range()); self.compile_jump_if_compare(left, ops, comparators, condition, target_block) } _ => { @@ -7668,130 +8424,50 @@ impl Compiler { } } - fn compile_dict(&mut self, items: &[ast::DictItem], range: TextRange) -> CompileResult<()> { - let has_unpacking = items.iter().any(|item| item.key.is_none()); - - if !has_unpacking { - // Match CPython's compiler_subdict chunking strategy: - // - n≤15: BUILD_MAP n (all pairs on stack) - // - n>15: BUILD_MAP 0 + MAP_ADD chunks of 17, last chunk uses - // BUILD_MAP n (if ≤15) or BUILD_MAP 0 + MAP_ADD - const STACK_LIMIT: usize = 15; - const BIG_MAP_CHUNK: usize = 17; - - if items.len() <= STACK_LIMIT { - for item in items { - self.compile_expression(item.key.as_ref().unwrap())?; - self.compile_expression(&item.value)?; - } - self.set_source_range(range); - emit!( - self, - Instruction::BuildMap { - count: u32::try_from(items.len()).expect("too many dict items"), - } - ); - } else { - // Split: leading full chunks of BIG_MAP_CHUNK via MAP_ADD, - // remainder via BUILD_MAP n or MAP_ADD depending on size - let n = items.len(); - let remainder = n % BIG_MAP_CHUNK; - let n_big_chunks = n / BIG_MAP_CHUNK; - // If remainder fits on stack (≤15), use BUILD_MAP n for it. - // Otherwise it becomes another MAP_ADD chunk. - let (big_count, tail_count) = if remainder > 0 && remainder <= STACK_LIMIT { - (n_big_chunks, remainder) - } else { - // remainder is 0 or >15: all chunks are MAP_ADD chunks - let total_map_add = if remainder == 0 { - n_big_chunks - } else { - n_big_chunks + 1 - }; - (total_map_add, 0usize) - }; - - self.set_source_range(range); - emit!(self, Instruction::BuildMap { count: 0 }); - - let mut idx = 0; - for chunk_i in 0..big_count { - if chunk_i > 0 { - self.set_source_range(range); - emit!(self, Instruction::BuildMap { count: 0 }); - } - let chunk_size = if idx + BIG_MAP_CHUNK <= n - tail_count { - BIG_MAP_CHUNK - } else { - n - tail_count - idx - }; - for item in &items[idx..idx + chunk_size] { - self.compile_expression(item.key.as_ref().unwrap())?; - self.compile_expression(&item.value)?; - self.set_source_range(range); - emit!(self, Instruction::MapAdd { i: 1 }); - } - if chunk_i > 0 { - self.set_source_range(range); - emit!(self, Instruction::DictUpdate { i: 1 }); - } - idx += chunk_size; - } - - // Tail: remaining pairs via BUILD_MAP n + DICT_UPDATE - if tail_count > 0 { - for item in &items[idx..idx + tail_count] { - self.compile_expression(item.key.as_ref().unwrap())?; - self.compile_expression(&item.value)?; - } - self.set_source_range(range); - emit!( - self, - Instruction::BuildMap { - count: tail_count.to_u32(), - } - ); - self.set_source_range(range); - emit!(self, Instruction::DictUpdate { i: 1 }); - } - } - return Ok(()); + fn compile_subdict( + &mut self, + items: &[ast::DictItem], + begin: usize, + end: usize, + range: TextRange, + ) -> CompileResult<()> { + let n = end - begin; + let big = n * 2 > STACK_USE_GUIDELINE as usize; + if big { + self.set_source_range(range); + emit!(self, Instruction::BuildMap { count: 0 }); } + for item in &items[begin..end] { + self.compile_expression(item.key.as_ref().unwrap())?; + self.compile_expression(&item.value)?; + if big { + self.set_source_range(range); + emit!(self, Instruction::MapAdd { i: 1 }); + } + } + if !big { + self.set_source_range(range); + emit!(self, Instruction::BuildMap { count: n.to_u32() }); + } + Ok(()) + } - // Complex case with ** unpacking: preserve insertion order. - // Collect runs of regular k:v pairs and emit BUILD_MAP + DICT_UPDATE - // for each run, and DICT_UPDATE for each ** entry. + fn compile_dict(&mut self, items: &[ast::DictItem], range: TextRange) -> CompileResult<()> { + let n = items.len(); let mut have_dict = false; - let mut elements: u32 = 0; + let mut elements = 0usize; - // Flush pending regular pairs as a BUILD_MAP, merging into the - // accumulator dict via DICT_UPDATE when one already exists. - macro_rules! flush_pending { - () => { - #[allow(unused_assignments)] - if elements > 0 { - self.set_source_range(range); - emit!(self, Instruction::BuildMap { count: elements }); + for (i, item) in items.iter().enumerate() { + if item.key.is_none() { + if elements != 0 { + self.compile_subdict(items, i - elements, i, range)?; if have_dict { self.set_source_range(range); emit!(self, Instruction::DictUpdate { i: 1 }); - } else { - have_dict = true; } + have_dict = true; elements = 0; } - }; - } - - for item in items { - if let Some(key) = &item.key { - // Regular key: value pair - self.compile_expression(key)?; - self.compile_expression(&item.value)?; - elements += 1; - } else { - // ** unpacking entry - flush_pending!(); if !have_dict { self.set_source_range(range); emit!(self, Instruction::BuildMap { count: 0 }); @@ -7800,10 +8476,27 @@ impl Compiler { self.compile_expression(&item.value)?; self.set_source_range(range); emit!(self, Instruction::DictUpdate { i: 1 }); + } else if elements * 2 > STACK_USE_GUIDELINE as usize { + self.compile_subdict(items, i - elements, i + 1, range)?; + if have_dict { + self.set_source_range(range); + emit!(self, Instruction::DictUpdate { i: 1 }); + } + have_dict = true; + elements = 0; + } else { + elements += 1; } } - flush_pending!(); + if elements != 0 { + self.compile_subdict(items, n - elements, n, range)?; + if have_dict { + self.set_source_range(range); + emit!(self, Instruction::DictUpdate { i: 1 }); + } + have_dict = true; + } if !have_dict { self.set_source_range(range); emit!(self, Instruction::BuildMap { count: 0 }); @@ -7882,14 +8575,28 @@ impl Compiler { send_block } + fn ast_constant_value(&self, expr: &ast::Expr) -> Option<ConstantData> { + expr.as_constant_expr() + .map(|expr| ast_constant_value_to_constant_data(expr.value.clone())) + } + + fn single_runtime_interpolation( + expr_tstring: &ast::ExprTString, + ) -> Option<(&ast::ConstantValue, Option<&ast::Expr>)> { + let tstring = expr_tstring.as_single_part_tstring()?; + let interpolation = tstring.elements.first()?.as_interpolation()?; + Some(( + interpolation.runtime_str.as_ref()?, + interpolation.runtime_interpolation_format_spec.as_deref(), + )) + } + fn compile_expression(&mut self, expression: &ast::Expr) -> CompileResult<()> { trace!("Compiling {expression:?}"); let range = expression.range(); self.set_source_range(range); - if matches!(expression, ast::Expr::BinOp(_)) - && let Some(constant) = self.try_fold_constant_expr(expression)? - { + if let Some(constant) = self.ast_constant_value(expression) { self.emit_load_const(constant); return Ok(()); } @@ -7917,22 +8624,7 @@ impl Compiler { self.compile_subscript(value, slice, *ctx)?; } ast::Expr::UnaryOp(ast::ExprUnaryOp { op, operand, .. }) => { - if let ( - ast::UnaryOp::Not, - ast::Expr::Compare(ast::ExprCompare { - left, - ops, - comparators, - .. - }), - ) = (op, operand.as_ref()) - && ops.len() == 1 - { - self.set_source_range(range); - self.compile_compare(left, ops, comparators)?; - } else { - self.compile_expression(operand)?; - } + self.compile_expression(operand)?; // Restore full expression range before emitting the operation self.set_source_range(range); @@ -7963,6 +8655,8 @@ impl Compiler { unreachable!("can_optimize_super_call only accepts calls"); }; self.load_args_for_super(&super_type, super_func.range(), value.range())?; + let attr_access_range = + self.update_start_location_to_match_attr(range, range, attr.as_str()); self.set_source_range(range); let idx = self.name(attr.as_str()); match super_type { @@ -7973,6 +8667,8 @@ impl Compiler { self.emit_load_zero_super_attr(idx); } } + self.set_source_range(attr_access_range); + emit!(self, Instruction::Nop); } else { // Normal attribute access self.compile_expression(value)?; @@ -7993,9 +8689,9 @@ impl Compiler { }) => { self.compile_compare(left, ops, comparators)?; } - // ast::Expr::Constant(ExprConstant { value, .. }) => { - // self.emit_load_const(compile_constant(value)); - // } + ast::Expr::Constant(ast::ExprConstant { value, .. }) => { + self.emit_load_const(ast_constant_value_to_constant_data(value.clone())); + } ast::Expr::List(ast::ExprList { elts, range, .. }) => { self.set_source_range(*range); self.starunpack_helper(elts, 0, CollectionType::List)?; @@ -8077,7 +8773,9 @@ impl Compiler { ); } ast::Expr::Await(ast::ExprAwait { value, .. }) => { - if self.ctx.func != FunctionContext::AsyncFunction { + if self.ctx.func != FunctionContext::AsyncFunction + && !self.allows_top_level_await_in_current_context() + { return Err(self.error(CodegenErrorType::InvalidAwait)); } self.compile_expression(value)?; @@ -8162,12 +8860,12 @@ impl Compiler { } self.enter_function(&name, params)?; - let mut func_flags = MakeFunctionFlags::new(); + let mut func_flags = bytecode::MakeFunctionFlags::new(); if have_defaults { - func_flags.insert(MakeFunctionFlag::Defaults); + func_flags.insert(bytecode::MakeFunctionFlag::Defaults); } if have_kwdefaults { - func_flags.insert(MakeFunctionFlag::KwOnlyDefaults); + func_flags.insert(bytecode::MakeFunctionFlag::KwOnlyDefaults); } // Set qualname for lambda @@ -8181,15 +8879,20 @@ impl Compiler { }; self.compile_expression(body)?; - self.set_source_range(body.range()); - self.emit_return_value(); - // _PyCodegen_AddReturnAtEnd() appends a no-location - // return-None epilogue even after lambda's explicit - // RETURN_VALUE. It is later removed as unreachable, but - // remove_unused_consts() keeps None when it was the first - // constant in an otherwise constant-free lambda. - if self.current_code_info().metadata.consts.is_empty() { - self.arg_constant(ConstantData::None); + let is_generator = self + .current_code_info() + .flags + .contains(bytecode::CodeFlags::GENERATOR); + if is_generator { + // codegen_lambda() calls OptimizeAndAssemble with + // addNone=0, so AddReturnAtEnd appends RETURN_VALUE without + // adding None to co_consts. + emit!(self, Instruction::ReturnValue); + self.set_no_location(); + } else { + self.set_source_range(body.range()); + self.emit_return_value(); + self.emit_return_const_no_location(ConstantData::None); } let code = self.exit_scope(); @@ -8207,7 +8910,12 @@ impl Compiler { }) => { self.compile_comprehension( "<listcomp>", - Some(Opcode::BuildList.into()), + Some( + Instruction::BuildList { + count: OpArgMarker::marker(), + } + .into(), + ), generators, &|compiler, collection_add_i| { compiler.compile_comprehension_element(elt)?; @@ -8235,7 +8943,12 @@ impl Compiler { }) => { self.compile_comprehension( "<setcomp>", - Some(Opcode::BuildSet.into()), + Some( + Instruction::BuildSet { + count: OpArgMarker::marker(), + } + .into(), + ), generators, &|compiler, collection_add_i| { compiler.compile_comprehension_element(elt)?; @@ -8262,9 +8975,15 @@ impl Compiler { range, .. }) => { + let key = key.as_ref(); self.compile_comprehension( "<dictcomp>", - Some(Opcode::BuildMap.into()), + Some( + Instruction::BuildMap { + count: OpArgMarker::marker(), + } + .into(), + ), generators, &|compiler, collection_add_i| { // changed evaluation order for Py38 named expression PEP 572 @@ -8356,9 +9075,20 @@ impl Compiler { self.set_source_range(target.range()); } ast::Expr::FString(fstring) => { + if let Some(joined_str) = fstring.runtime_joined_str.as_ref() { + return self.compile_runtime_joined_str(fstring, joined_str); + } self.compile_expr_fstring(fstring)?; } ast::Expr::TString(tstring) => { + if let Some(template_str) = tstring.runtime_template_str.as_ref() { + return self.compile_runtime_template_str(tstring, template_str); + } + if let Some(interpolation) = Self::single_runtime_interpolation(tstring) + && self.compile_runtime_interpolation(tstring, interpolation)? + { + return Ok(()); + } self.compile_expr_tstring(tstring)?; } ast::Expr::StringLiteral(string) => { @@ -8393,8 +9123,11 @@ impl Compiler { ast::Expr::EllipsisLiteral(_) => { self.emit_load_const(ConstantData::Ellipsis); } - ast::Expr::IpyEscapeCommand(_) => { - panic!("unexpected ipy escape command"); + ast::Expr::IpyEscapeCommand(expr) => { + return Err(self.error_ranged( + CodegenErrorType::SyntaxError("invalid syntax".to_owned()), + expr.range, + )); } } Ok(()) @@ -8486,17 +9219,13 @@ impl Compiler { emit!(self, Instruction::BuildList { count: 0 }); } - let sub_table_cursor = self.symbol_table_stack.last().map(|t| t.next_sub_table); + let symbol_table_cursors = self.current_symbol_table_cursors(); if let Some(range) = self.cpython_implicit_call_generator_range(generator_expr) { self.compile_expression_with_generator_range(generator_expr, range)?; } else { self.compile_expression(generator_expr)?; } - if let Some(cursor) = sub_table_cursor - && let Some(current_table) = self.symbol_table_stack.last_mut() - { - current_table.next_sub_table = cursor; - } + self.set_symbol_table_cursors(symbol_table_cursors); let loop_block = self.new_block(); let cleanup = self.new_block(); @@ -8515,9 +9244,9 @@ impl Compiler { self.set_source_range(loc); emit!(self, Instruction::ToBool); emit!(self, Instruction::PopJumpIfTrue { delta: loop_block }); - self.set_source_range(loc); emit!(self, Instruction::PopIter); self.set_no_location(); + self.set_source_range(loc); self.emit_load_const(ConstantData::Boolean { value: false }); self.set_source_range(loc); emit!(self, PseudoInstruction::Jump { delta: end }); @@ -8526,9 +9255,9 @@ impl Compiler { self.set_source_range(loc); emit!(self, Instruction::ToBool); emit!(self, Instruction::PopJumpIfFalse { delta: loop_block }); - self.set_source_range(loc); emit!(self, Instruction::PopIter); self.set_no_location(); + self.set_source_range(loc); self.emit_load_const(ConstantData::Boolean { value: true }); self.set_source_range(loc); emit!(self, PseudoInstruction::Jump { delta: end }); @@ -8536,10 +9265,8 @@ impl Compiler { } self.use_cpython_label_block(cleanup); - self.set_source_range(loc); emit!(self, Instruction::EndFor); self.set_no_location(); - self.set_source_range(loc); emit!(self, Instruction::PopIter); self.set_no_location(); match kind { @@ -8568,20 +9295,100 @@ impl Compiler { Ok(()) } + fn can_use_cpython_method_call(&self, value: &ast::Expr, args: &ast::Arguments) -> bool { + let is_import = matches!(value, ast::Expr::Name(ast::ExprName { id, .. }) + if self.is_name_imported(id.as_str())); + if is_import { + return false; + } + + if args.args.len() + args.keywords.len() + usize::from(!args.keywords.is_empty()) + >= STACK_USE_GUIDELINE as usize + { + return false; + } + + !args + .args + .iter() + .any(|arg| matches!(arg, ast::Expr::Starred(_))) + && args.keywords.iter().all(|kw| kw.arg.is_some()) + } + + fn compile_method_call_arguments( + &mut self, + args: &ast::Arguments, + call_range: TextRange, + kw_names_range: TextRange, + ) -> CompileResult<()> { + let implicit_generator_range = if args.args.len() == 1 && args.keywords.is_empty() { + self.cpython_implicit_call_generator_range(&args.args[0]) + } else { + None + }; + for arg in &args.args { + if let Some(range) = implicit_generator_range { + self.compile_expression_with_generator_range(arg, range)?; + } else { + self.compile_expression(arg)?; + } + } + + if args.keywords.is_empty() { + self.set_source_range(call_range); + emit!( + self, + Instruction::Call { + argc: args.args.len().to_u32() + } + ); + return Ok(()); + } + + let mut kwarg_names = Vec::with_capacity(args.keywords.len()); + for keyword in &args.keywords { + kwarg_names.push(ConstantData::Str { + value: keyword.arg.as_ref().unwrap().as_str().into(), + }); + self.compile_expression(&keyword.value)?; + } + self.set_source_range(kw_names_range); + self.emit_load_const(ConstantData::Tuple { + elements: kwarg_names, + }); + self.set_source_range(call_range); + emit!( + self, + Instruction::CallKw { + argc: (args.args.len() + args.keywords.len()).to_u32() + } + ); + Ok(()) + } + fn compile_call(&mut self, func: &ast::Expr, args: &ast::Arguments) -> CompileResult<()> { // Save the call expression's source range so CALL instructions use the // call start line, not the last argument's line. let call_range = self.current_source_range; + self.validate_keywords(&args.keywords)?; let uses_ex_call = self.call_uses_ex_call(args); // Method call: obj → LOAD_ATTR_METHOD → [method, self_or_null] → args → CALL // Regular call: func → PUSH_NULL → args → CALL if let ast::Expr::Attribute(ast::ExprAttribute { value, attr, .. }) = &func { + if !self.can_use_cpython_method_call(value, args) { + self.check_caller(func)?; + self.compile_expression(func)?; + self.set_source_range(func.range()); + emit!(self, Instruction::PushNull); + self.codegen_call_helper(0, args, call_range, None)?; + return Ok(()); + } + // Check for super() method call optimization if let Some(super_type) = self.can_optimize_super_call(value, attr.as_str()) { // super().method() or super(cls, self).method() optimization // CALL path: [global_super, class, self] → LOAD_SUPER_METHOD → [method, self] - // CALL_FUNCTION_EX path: [global_super, class, self] → LOAD_SUPER_ATTR → [attr] let ast::Expr::Call(ast::ExprCall { func: super_func, .. }) = value.as_ref() @@ -8599,41 +9406,21 @@ impl Compiler { func.range(), attr.as_str(), ); - self.set_source_range(attr_access_range); + self.set_source_range(func.range()); let idx = self.name(attr.as_str()); - if uses_ex_call { - self.set_source_range(func.range()); - match super_type { - SuperCallType::TwoArg { .. } => { - self.emit_load_super_attr(idx); - } - SuperCallType::ZeroArg => { - self.emit_load_zero_super_attr(idx); - } + match super_type { + SuperCallType::TwoArg { .. } => { + self.emit_load_super_method(idx); } - // CPython's Attribute_kind super path emits an attr-line - // NOP after LOAD_SUPER_ATTR, even when the call later uses - // CALL_FUNCTION_EX for starred arguments. - self.set_source_range(attr_access_range); - emit!(self, Instruction::Nop); - self.set_source_range(func.range()); - emit!(self, Instruction::PushNull); - self.codegen_call_helper(0, args, call_range, None)?; - } else { - match super_type { - SuperCallType::TwoArg { .. } => { - self.emit_load_super_method(idx); - } - SuperCallType::ZeroArg => { - self.emit_load_zero_super_method(idx); - } + SuperCallType::ZeroArg => { + self.emit_load_zero_super_method(idx); } - // NOP for line tracking at .method( line - self.set_source_range(attr_access_range); - emit!(self, Instruction::Nop); - // CALL at .method( line (not the full expression line) - self.codegen_call_helper(0, args, method_call_range, Some(attr_access_range))?; } + // NOP for line tracking at .method( line + self.set_source_range(attr_access_range); + emit!(self, Instruction::Nop); + // CALL at .method( line (not the full expression line) + self.compile_method_call_arguments(args, method_call_range, attr_access_range)?; } else { self.compile_expression(value)?; let idx = self.name(attr.as_str()); @@ -8648,28 +9435,15 @@ impl Compiler { attr.as_str(), ); self.set_source_range(attr_access_range); - // Imported names and CALL_FUNCTION_EX-style calls use plain - // LOAD_ATTR + PUSH_NULL; other names use method-call mode. - // Check current scope and enclosing scopes for IMPORTED flag. - let is_import = matches!(value.as_ref(), ast::Expr::Name(ast::ExprName { id, .. }) - if self.is_name_imported(id.as_str())); - if is_import || uses_ex_call { - self.emit_load_attr(idx); - emit!(self, Instruction::PushNull); - } else { - self.emit_load_attr_method(idx); - } - if is_import || uses_ex_call { - self.codegen_call_helper(0, args, call_range, None)?; - } else { - self.codegen_call_helper(0, args, method_call_range, Some(attr_access_range))?; - } + self.emit_load_attr_method(idx); + self.compile_method_call_arguments(args, method_call_range, attr_access_range)?; } } else if let Some(kind) = (!uses_ex_call) .then(|| self.detect_builtin_generator_call(func, args)) .flatten() { let skip_normal_call = self.new_block(); + self.check_caller(func)?; self.compile_expression(func)?; self.optimize_builtin_generator_call( kind, @@ -8692,6 +9466,7 @@ impl Compiler { .then(|| self.cpython_sync_genexpr_call_name(func, args)) .flatten() .is_some(); + self.check_caller(func)?; self.compile_expression(func)?; if sync_genexpr_call_name { // CPython `maybe_optimize_function_call()` creates and uses @@ -8703,6 +9478,7 @@ impl Compiler { .use_raw_instr_sequence_label(skip_optimization); unwrap_internal(self, result); } + self.set_source_range(func.range()); emit!(self, Instruction::PushNull); self.codegen_call_helper(0, args, call_range, None)?; let result = self @@ -8724,6 +9500,24 @@ impl Compiler { has_starred || has_double_star || too_big } + /// Reject duplicate keyword-argument names in a call. + fn validate_keywords(&mut self, keywords: &[ast::Keyword]) -> CompileResult<()> { + for (i, keyword) in keywords.iter().enumerate() { + let Some(arg) = &keyword.arg else { + continue; + }; + for other in &keywords[i + 1..] { + if other.arg.as_ref() == Some(arg) { + return Err(self.error_ranged( + CodegenErrorType::SyntaxError(format!("keyword argument repeated: {arg}")), + other.range, + )); + } + } + } + Ok(()) + } + /// Compile subkwargs: emit key-value pairs for BUILD_MAP fn codegen_subkwargs( &mut self, @@ -8739,8 +9533,8 @@ impl Compiler { let big = n * 2 > STACK_USE_GUIDELINE as usize; if big { - self.set_source_range(call_range); emit!(self, Instruction::BuildMap { count: 0 }); + self.set_no_location(); } for kw in &keywords[begin..end] { @@ -8752,8 +9546,8 @@ impl Compiler { self.compile_expression(&kw.value)?; if big { - self.set_source_range(call_range); emit!(self, Instruction::MapAdd { i: 1 }); + self.set_no_location(); } } @@ -8775,15 +9569,33 @@ impl Compiler { call_range: TextRange, kw_names_range: Option<TextRange>, ) -> CompileResult<()> { - let nelts = arguments.args.len(); - let nkwelts = arguments.keywords.len(); + self.codegen_call_helper_impl( + additional_positional, + &arguments.args, + &arguments.keywords, + call_range, + kw_names_range, + None, + ) + } + + fn codegen_call_helper_impl( + &mut self, + additional_positional: u32, + args: &[ast::Expr], + keywords: &[ast::Keyword], + call_range: TextRange, + kw_names_range: Option<TextRange>, + injected_arg: Option<&str>, + ) -> CompileResult<()> { + self.validate_keywords(keywords)?; + + let nelts = args.len(); + let nkwelts = keywords.len(); // Check if we have starred args or **kwargs - let has_starred = arguments - .args - .iter() - .any(|arg| matches!(arg, ast::Expr::Starred(_))); - let has_double_star = arguments.keywords.iter().any(|k| k.arg.is_none()); + let has_starred = args.iter().any(|arg| matches!(arg, ast::Expr::Starred(_))); + let has_double_star = keywords.iter().any(|k| k.arg.is_none()); // Check if exceeds CPython's stack-use guideline. // With CALL_KW, kwargs values go on stack but keys go in a const tuple, @@ -8794,22 +9606,29 @@ impl Compiler { // Simple call path: no * or ** args let implicit_generator_range = if additional_positional == 0 && nelts == 1 && nkwelts == 0 { - self.cpython_implicit_call_generator_range(&arguments.args[0]) + self.cpython_implicit_call_generator_range(&args[0]) } else { None }; - for arg in &arguments.args { + for arg in args { if let Some(range) = implicit_generator_range { self.compile_expression_with_generator_range(arg, range)?; } else { self.compile_expression(arg)?; } } + let injected_count = if let Some(injected_arg) = injected_arg { + self.set_source_range(call_range); + self.load_name(injected_arg)?; + 1 + } else { + 0 + }; if nkwelts > 0 { // Compile keyword values and build kwnames tuple let mut kwarg_names = Vec::with_capacity(nkwelts); - for keyword in &arguments.keywords { + for keyword in keywords { kwarg_names.push(ConstantData::Str { value: keyword.arg.as_ref().unwrap().as_str().into(), }); @@ -8823,24 +9642,23 @@ impl Compiler { }); self.set_source_range(call_range); - let argc = additional_positional + nelts.to_u32() + nkwelts.to_u32(); + let argc = + additional_positional + nelts.to_u32() + injected_count + nkwelts.to_u32(); emit!(self, Instruction::CallKw { argc }); } else { self.set_source_range(call_range); - let argc = additional_positional + nelts.to_u32(); + let argc = additional_positional + nelts.to_u32() + injected_count; emit!(self, Instruction::Call { argc }); } } else { // ex_call path: has * or ** args // Compile positional arguments - if additional_positional == 0 - && nelts == 1 - && matches!(arguments.args[0], ast::Expr::Starred(_)) + if additional_positional == 0 && nelts == 1 && matches!(args[0], ast::Expr::Starred(_)) { // Single starred arg: pass value directly to CallFunctionEx. // Runtime will convert to tuple and validate with function name. - if let ast::Expr::Starred(ast::ExprStarred { value, .. }) = &arguments.args[0] { + if let ast::Expr::Starred(ast::ExprStarred { value, .. }) = &args[0] { self.compile_expression(value)?; } } else { @@ -8850,14 +9668,15 @@ impl Compiler { // LIST_EXTEND, tuple=1)`, even when the only reason for the // ex-call path is too many non-starred positional arguments. self.set_source_range(call_range); - self.starunpack_helper( - &arguments.args, + self.starunpack_helper_impl( + args, + injected_arg, additional_positional, CollectionType::Tuple, )?; } - self.compile_call_function_ex_keywords(&arguments.keywords, call_range)?; + self.compile_call_function_ex_keywords(keywords, call_range)?; self.set_source_range(call_range); emit!(self, Instruction::CallFunctionEx); @@ -9102,7 +9921,22 @@ impl Compiler { { let _ = self.push_symbol_table()?; } - let _ = self.pop_symbol_table(); + self.pop_symbol_table(); + Ok(()) + } + + fn consume_function_annotation_symbol_table_if_used(&mut self) -> CompileResult<()> { + if !self.next_function_annotation_symbol_table_uses_annotations() { + return Ok(()); + } + if !self.push_annotation_symbol_table() { + let current_table = self.current_symbol_table(); + return Err(self.error(CodegenErrorType::SyntaxError(format!( + "no annotation symbol table available in {} (type: {:?})", + current_table.name, current_table.typ + )))); + } + self.pop_annotation_symbol_table(); Ok(()) } @@ -9112,20 +9946,62 @@ impl Compiler { ) -> CompileResult<()> { use ast::visitor::Visitor; - struct SkippedScopeVisitor<'a> { - compiler: &'a mut Compiler, + struct SkippedScopeVisitor<'a, 'warnings> { + compiler: &'a mut Compiler<'warnings>, error: Option<CodegenError>, } - impl SkippedScopeVisitor<'_> { + impl SkippedScopeVisitor<'_, '_> { fn consume_scope(&mut self) { if self.error.is_none() { self.error = self.compiler.consume_next_sub_table().err(); } } + + fn consume_inlined_comprehension_scope(&mut self) -> bool { + if self.error.is_some() { + return false; + } + let Some(current_table) = self.compiler.symbol_table_stack.last_mut() else { + return false; + }; + if current_table.next_inlined_comprehension_block + < current_table.inlined_comprehension_blocks.len() + { + current_table.next_inlined_comprehension_block += 1; + true + } else { + false + } + } + + fn visit_comprehension_tail( + &mut self, + elt1: &ast::Expr, + elt2: Option<&ast::Expr>, + generators: &[ast::Comprehension], + ) { + if let Some(outermost) = generators.first() { + self.visit_expr(&outermost.target); + for if_expr in &outermost.ifs { + self.visit_expr(if_expr); + } + } + for generator in generators.iter().skip(1) { + self.visit_expr(&generator.target); + self.visit_expr(&generator.iter); + for if_expr in &generator.ifs { + self.visit_expr(if_expr); + } + } + if let Some(elt2) = elt2 { + self.visit_expr(elt2); + } + self.visit_expr(elt1); + } } - impl ast::visitor::Visitor<'_> for SkippedScopeVisitor<'_> { + impl ast::visitor::Visitor<'_> for SkippedScopeVisitor<'_, '_> { fn visit_expr(&mut self, expr: &ast::Expr) { if self.error.is_some() { return; @@ -9149,19 +10025,41 @@ impl Compiler { } self.consume_scope(); } - ast::Expr::ListComp(ast::ExprListComp { generators, .. }) - | ast::Expr::SetComp(ast::ExprSetComp { generators, .. }) - | ast::Expr::Generator(ast::ExprGenerator { generators, .. }) => { + ast::Expr::Generator(ast::ExprGenerator { generators, .. }) => { if let Some(first) = generators.first() { self.visit_expr(&first.iter); } self.consume_scope(); } - ast::Expr::DictComp(ast::ExprDictComp { generators, .. }) => { + ast::Expr::ListComp(ast::ExprListComp { + elt, generators, .. + }) + | ast::Expr::SetComp(ast::ExprSetComp { + elt, generators, .. + }) => { if let Some(first) = generators.first() { self.visit_expr(&first.iter); } - self.consume_scope(); + if self.consume_inlined_comprehension_scope() { + self.visit_comprehension_tail(elt, None, generators); + } else { + self.consume_scope(); + } + } + ast::Expr::DictComp(ast::ExprDictComp { + key, + value, + generators, + .. + }) => { + if let Some(first) = generators.first() { + self.visit_expr(&first.iter); + } + if self.consume_inlined_comprehension_scope() { + self.visit_comprehension_tail(key, Some(value), generators); + } else { + self.consume_scope(); + } } _ => ast::visitor::walk_expr(self, expr), } @@ -9180,23 +10078,313 @@ impl Compiler { } } - fn peek_next_sub_table_after_skipped_nested_scopes_in_expr( + fn consume_skipped_nested_scopes_in_parameter_defaults( + &mut self, + parameters: &ast::Parameters, + ) -> CompileResult<()> { + for default in parameters + .posonlyargs + .iter() + .chain(&parameters.args) + .chain(&parameters.kwonlyargs) + .filter_map(|arg| arg.default.as_deref()) + { + self.consume_skipped_nested_scopes_in_expr(default)?; + } + Ok(()) + } + + fn consume_skipped_nested_scopes_in_statements( + &mut self, + statements: &[ast::Stmt], + ) -> CompileResult<()> { + use ast::visitor::Visitor; + + struct SkippedStatementScopeVisitor<'a, 'warnings> { + compiler: &'a mut Compiler<'warnings>, + error: Option<CodegenError>, + } + + impl SkippedStatementScopeVisitor<'_, '_> { + fn consume_scope(&mut self) { + if self.error.is_none() { + self.error = self.compiler.consume_next_sub_table().err(); + } + } + + fn consume_function_annotation_scope_if_used(&mut self) { + if self.error.is_none() { + self.error = self + .compiler + .consume_function_annotation_symbol_table_if_used() + .err(); + } + } + + fn visit_parameter_defaults(&mut self, parameters: &ast::Parameters) { + for default in parameters + .posonlyargs + .iter() + .chain(&parameters.args) + .chain(&parameters.kwonlyargs) + .filter_map(|arg| arg.default.as_deref()) + { + self.visit_expr(default); + } + } + + fn visit_decorators(&mut self, decorators: &[ast::Decorator]) { + for decorator in decorators { + self.visit_expr(&decorator.expression); + } + } + + fn visit_arguments(&mut self, arguments: &ast::Arguments) { + for arg in &arguments.args { + self.visit_expr(arg); + } + for keyword in &arguments.keywords { + self.visit_expr(&keyword.value); + } + } + } + + impl ast::visitor::Visitor<'_> for SkippedStatementScopeVisitor<'_, '_> { + fn visit_stmt(&mut self, stmt: &ast::Stmt) { + if self.error.is_some() { + return; + } + + match stmt { + ast::Stmt::FunctionDef(ast::StmtFunctionDef { + parameters, + decorator_list, + type_params, + .. + }) => { + self.visit_parameter_defaults(parameters); + self.visit_decorators(decorator_list); + if type_params.is_some() { + self.consume_scope(); + } else { + self.consume_function_annotation_scope_if_used(); + self.consume_scope(); + } + } + ast::Stmt::ClassDef(ast::StmtClassDef { + arguments, + decorator_list, + type_params, + .. + }) => { + self.visit_decorators(decorator_list); + if type_params.is_some() { + self.consume_scope(); + } + if let Some(arguments) = arguments { + self.visit_arguments(arguments); + } + self.consume_scope(); + } + ast::Stmt::TypeAlias(ast::StmtTypeAlias { type_params, .. }) => { + if type_params.is_some() { + self.consume_scope(); + } + self.consume_scope(); + } + ast::Stmt::AnnAssign(ast::StmtAnnAssign { target, value, .. }) => { + self.visit_expr(target); + if let Some(value) = value { + self.visit_expr(value); + } + } + ast::Stmt::If(ast::StmtIf { + test, + body, + elif_else_clauses, + .. + }) => { + self.visit_expr(test); + for stmt in body { + self.visit_stmt(stmt); + } + for clause in elif_else_clauses { + if let Some(test) = &clause.test { + self.visit_expr(test); + } + for stmt in &clause.body { + self.visit_stmt(stmt); + } + } + } + ast::Stmt::Try(ast::StmtTry { + body, + handlers, + orelse, + finalbody, + .. + }) => { + for stmt in body { + self.visit_stmt(stmt); + } + for handler in handlers { + self.visit_except_handler(handler); + } + for stmt in orelse { + self.visit_stmt(stmt); + } + for stmt in finalbody { + self.visit_stmt(stmt); + } + } + _ => ast::visitor::walk_stmt(self, stmt), + } + } + + fn visit_expr(&mut self, expr: &ast::Expr) { + if self.error.is_some() { + return; + } + self.error = self + .compiler + .consume_skipped_nested_scopes_in_expr(expr) + .err(); + } + + fn visit_except_handler(&mut self, handler: &ast::ExceptHandler) { + if self.error.is_some() { + return; + } + let ast::ExceptHandler::ExceptHandler(ast::ExceptHandlerExceptHandler { + type_, + body, + .. + }) = handler; + if let Some(type_) = type_ { + self.visit_expr(type_); + } + for stmt in body { + self.visit_stmt(stmt); + } + } + } + + let mut visitor = SkippedStatementScopeVisitor { + compiler: self, + error: None, + }; + for statement in statements { + visitor.visit_stmt(statement); + } + if let Some(err) = visitor.error { + Err(err) + } else { + Ok(()) + } + } + + fn consume_skipped_nested_scopes_in_except_handlers( + &mut self, + handlers: &[ast::ExceptHandler], + ) -> CompileResult<()> { + use ast::visitor::Visitor; + + struct SkippedHandlerScopeVisitor<'a, 'warnings> { + compiler: &'a mut Compiler<'warnings>, + error: Option<CodegenError>, + } + + impl ast::visitor::Visitor<'_> for SkippedHandlerScopeVisitor<'_, '_> { + fn visit_expr(&mut self, expr: &ast::Expr) { + if self.error.is_some() { + return; + } + self.error = self + .compiler + .consume_skipped_nested_scopes_in_expr(expr) + .err(); + } + + fn visit_stmt(&mut self, stmt: &ast::Stmt) { + if self.error.is_some() { + return; + } + self.error = self + .compiler + .consume_skipped_nested_scopes_in_statements(slice::from_ref(stmt)) + .err(); + } + } + + let mut visitor = SkippedHandlerScopeVisitor { + compiler: self, + error: None, + }; + for handler in handlers { + visitor.visit_except_handler(handler); + if visitor.error.is_some() { + break; + } + } + if let Some(err) = visitor.error { + Err(err) + } else { + Ok(()) + } + } + + fn current_symbol_table_cursors(&self) -> SymbolTableCursors { + let table = self + .symbol_table_stack + .last() + .expect("no current symbol table"); + SymbolTableCursors { + sub_table: table.next_sub_table, + hidden_annotation_block: table.next_hidden_annotation_block, + inlined_comprehension_block: table.next_inlined_comprehension_block, + } + } + + fn set_symbol_table_cursors(&mut self, cursors: SymbolTableCursors) { + let table = self + .symbol_table_stack + .last_mut() + .expect("no current symbol table"); + table.next_sub_table = cursors.sub_table; + table.next_hidden_annotation_block = cursors.hidden_annotation_block; + table.next_inlined_comprehension_block = cursors.inlined_comprehension_block; + } + + fn lookup_comprehension_symbol_table_after_skipped_nested_scopes_in_expr( &mut self, expression: &ast::Expr, - ) -> CompileResult<SymbolTable> { + comprehension_type: ComprehensionType, + ) -> CompileResult<(SymbolTable, ComprehensionSymbolSource)> { let saved_cursor = self .symbol_table_stack .last() .expect("no current symbol table") .next_sub_table; + let saved_inlined_cursor = self + .symbol_table_stack + .last() + .expect("no current symbol table") + .next_inlined_comprehension_block; let result = (|| { self.consume_skipped_nested_scopes_in_expr(expression)?; let current_table = self .symbol_table_stack .last() .expect("no current symbol table"); + if comprehension_type != ComprehensionType::Generator + && let Some(table) = current_table + .inlined_comprehension_blocks + .get(current_table.next_inlined_comprehension_block) + { + return Ok((table.clone(), ComprehensionSymbolSource::Inlined)); + } if let Some(table) = current_table.sub_tables.get(current_table.next_sub_table) { - Ok(table.clone()) + Ok((table.clone(), ComprehensionSymbolSource::Child)) } else { let name = current_table.name.clone(); let typ = current_table.typ; @@ -9209,6 +10397,10 @@ impl Compiler { .last_mut() .expect("no current symbol table") .next_sub_table = saved_cursor; + self.symbol_table_stack + .last_mut() + .expect("no current symbol table") + .next_inlined_comprehension_block = saved_inlined_cursor; result } @@ -9231,7 +10423,15 @@ impl Compiler { if let Some(info) = self.code_stack.last_mut() { info.flags = flags | (info.flags - & (CodeFlags::NESTED | CodeFlags::METHOD | CodeFlags::FUTURE_ANNOTATIONS)); + & (bytecode::CodeFlags::NESTED + | bytecode::CodeFlags::METHOD + | bytecode::CodeFlags::FUTURE_DIVISION + | bytecode::CodeFlags::FUTURE_ABSOLUTE_IMPORT + | bytecode::CodeFlags::FUTURE_WITH_STATEMENT + | bytecode::CodeFlags::FUTURE_PRINT_FUNCTION + | bytecode::CodeFlags::FUTURE_UNICODE_LITERALS + | bytecode::CodeFlags::FUTURE_GENERATOR_STOP + | bytecode::CodeFlags::FUTURE_ANNOTATIONS)); info.metadata.argcount = arg_count; info.metadata.posonlyargcount = posonlyarg_count; info.metadata.kwonlyargcount = kwonlyarg_count; @@ -9254,12 +10454,16 @@ impl Compiler { ) -> CompileResult<()> { let prev_ctx = self.ctx; let has_an_async_gen = generators.iter().any(|g| g.is_async); + let is_top_level_await_context = self.opts.allow_top_level_await + && prev_ctx.func == FunctionContext::NoFunction + && !prev_ctx.in_class; // Check for async comprehension outside async function (list/set/dict only, not generator expressions) // Use in_async_scope to allow nested async comprehensions inside an async function if comprehension_type != ComprehensionType::Generator && (has_an_async_gen || element_contains_await) && !prev_ctx.in_async_scope + && !is_top_level_await_context { return Err(self.error(CodegenErrorType::InvalidAsyncComprehension)); } @@ -9270,7 +10474,7 @@ impl Compiler { let is_async_list_set_dict_comprehension = comprehension_type != ComprehensionType::Generator && (has_an_async_gen || element_contains_await) - && prev_ctx.in_async_scope; + && (prev_ctx.in_async_scope || is_top_level_await_context); let is_async_generator_comprehension = comprehension_type == ComprehensionType::Generator && (has_an_async_gen || element_contains_await); @@ -9282,8 +10486,11 @@ impl Compiler { // We must have at least one generator: assert!(!generators.is_empty()); let outermost = &generators[0]; - let comp_table = - self.peek_next_sub_table_after_skipped_nested_scopes_in_expr(&outermost.iter)?; + let (comp_table, comp_source) = self + .lookup_comprehension_symbol_table_after_skipped_nested_scopes_in_expr( + &outermost.iter, + comprehension_type, + )?; let is_inlined = self.is_inlined_comprehension_context(comprehension_type, &comp_table); @@ -9299,6 +10506,7 @@ impl Compiler { generators, compile_element, (comprehension_range, element_range, outer_backedge_range), + comp_source, ); } @@ -9315,9 +10523,9 @@ impl Compiler { in_async_scope: prev_ctx.in_async_scope || is_async, }; - let flags = CodeFlags::NEWLOCALS | CodeFlags::OPTIMIZED; + let flags = bytecode::CodeFlags::NEWLOCALS | bytecode::CodeFlags::OPTIMIZED; let flags = if is_async { - flags | CodeFlags::COROUTINE + flags | bytecode::CodeFlags::COROUTINE } else { flags }; @@ -9459,9 +10667,6 @@ impl Compiler { is_async, end_async_for_target, } => { - self.set_source_range(backedge_range); - emit!(self, PseudoInstruction::Jump { delta: loop_block }); - self.use_cpython_label_block(if_cleanup_block); self.set_source_range(backedge_range); emit!(self, PseudoInstruction::Jump { delta: loop_block }); @@ -9490,6 +10695,7 @@ impl Compiler { if return_none { self.emit_return_const_no_location(ConstantData::None); } else { + self.set_source_range(comprehension_range); self.emit_return_value(); } @@ -9506,6 +10712,7 @@ impl Compiler { emit!(self, Instruction::Reraise { depth: 1u32 }); self.set_no_location(); } + self.emit_return_const_no_location(ConstantData::None); let code = self.exit_scope(); @@ -9513,7 +10720,7 @@ impl Compiler { // Create comprehension function with closure self.set_source_range(comprehension_range); - self.make_closure(code, MakeFunctionFlags::new())?; + self.make_closure(code, bytecode::MakeFunctionFlags::new())?; // Evaluate iterated item and get its iterator. self.compile_comprehension_iter(outermost)?; @@ -9543,37 +10750,32 @@ impl Compiler { generators: &[ast::Comprehension], compile_element: &dyn Fn(&mut Self, usize) -> CompileResult<()>, ranges: (TextRange, TextRange, TextRange), + comp_source: ComprehensionSymbolSource, ) -> CompileResult<()> { let (comprehension_range, element_range, outer_backedge_range) = ranges; - fn collect_bound_names(target: &ast::Expr, out: &mut Vec<String>) { - match target { - ast::Expr::Name(ast::ExprName { id, .. }) => out.push(id.to_string()), - ast::Expr::Tuple(ast::ExprTuple { elts, .. }) - | ast::Expr::List(ast::ExprList { elts, .. }) => { - for elt in elts { - collect_bound_names(elt, out); - } - } - ast::Expr::Starred(ast::ExprStarred { value, .. }) => { - collect_bound_names(value, out); - } - _ => {} - } - } - // Compile the outermost iterator first. Its expression may reference // nested scopes (e.g. lambdas) whose sub_tables sit at the current // position in the parent's list. Those must be consumed before we // splice in the comprehension's own children. self.compile_comprehension_iter(&generators[0])?; - self.symbol_table_stack - .last_mut() - .expect("no current symbol table") - .next_sub_table += 1; + match comp_source { + ComprehensionSymbolSource::Child => { + self.symbol_table_stack + .last_mut() + .expect("no current symbol table") + .next_sub_table += 1; + } + ComprehensionSymbolSource::Inlined => { + self.symbol_table_stack + .last_mut() + .expect("no current symbol table") + .next_inlined_comprehension_block += 1; + } + } let was_in_inlined_comp = self.current_code_info().in_inlined_comp; let saved_source_range = self.current_source_range; - let in_class_block = { + let tweak_in_class_block = { let ct = self.current_symbol_table(); ct.typ == CompilerScope::Class && !was_in_inlined_comp }; @@ -9583,9 +10785,13 @@ impl Compiler { let mut changed_fast_hidden = Vec::new(); let result = (|| { - // Splice the comprehension's children (e.g. nested inlined - // comprehensions) into the parent so the compiler can find them. - if !comp_table.sub_tables.is_empty() { + // If the symbol table still carries the inlined comprehension as + // a child, splice its children here. The symtable normally + // performs this splice before codegen, and the Inlined source path + // has already done so. + if matches!(comp_source, ComprehensionSymbolSource::Child) + && !comp_table.sub_tables.is_empty() + { let current_table = self .symbol_table_stack .last_mut() @@ -9595,30 +10801,21 @@ impl Compiler { current_table.sub_tables.insert(insert_pos + i, st.clone()); } } - let mut source_order_bound_names = Vec::new(); - for generator in generators { - collect_bound_names(&generator.target, &mut source_order_bound_names); - } - let mut pushed_locals: Vec<String> = Vec::new(); - for name in source_order_bound_names - .into_iter() - .chain(comp_table.symbols.keys().cloned()) - { - if pushed_locals.iter().any(|existing| existing == &name) { - continue; + let mut fast_hidden_locals: Vec<String> = Vec::new(); + for (name, sym) in &comp_table.symbols { + if sym.flags.contains(SymbolFlags::PARAMETER) { + continue; // skip .0 } - if let Some(sym) = comp_table.symbols.get(&name) { - if sym.flags.contains(SymbolFlags::PARAMETER) { - continue; // skip .0 - } - let is_local = sym - .flags - .intersects(SymbolFlags::ASSIGNED | SymbolFlags::ITER) - && !sym.flags.contains(SymbolFlags::NONLOCAL); - if is_local { - pushed_locals.push(name); - } + let is_local = sym + .flags + .intersects(SymbolFlags::ASSIGNED | SymbolFlags::ITER) + && !sym.flags.contains(SymbolFlags::NONLOCAL); + if is_local { + pushed_locals.push(name.clone()); + } + if is_local || tweak_in_class_block { + fast_hidden_locals.push(name.clone()); } } @@ -9638,7 +10835,7 @@ impl Compiler { if (comp_scope != outer_scope && comp_scope != SymbolScope::Free && !(comp_scope == SymbolScope::Cell && outer_scope == SymbolScope::Free)) - || in_class_block + || tweak_in_class_block { temp_symbols.insert(name.clone(), outer_sym.clone()); let current_table = @@ -9648,7 +10845,7 @@ impl Compiler { } } if !self.ctx.in_func() { - for name in &pushed_locals { + for name in &fast_hidden_locals { if self .current_code_info() .metadata @@ -9953,12 +11150,28 @@ impl Compiler { // Python 3 features; we've already implemented them by default "nested_scopes" | "generators" | "division" | "absolute_import" | "with_statement" | "print_function" | "unicode_literals" | "generator_stop" => {} - "annotations" => self.future_annotations = true, - other => { + // Accept the future feature name, but do not implement + // Barry-as-BDFL parser mode. + "barry_as_FLUFL" => {} + "annotations" => { + self.future_annotations = true; + self.future_features + .insert(bytecode::CodeFlags::FUTURE_ANNOTATIONS); + self.current_code_info() + .flags + .insert(bytecode::CodeFlags::FUTURE_ANNOTATIONS); + } + "braces" => { return Err( - self.error(CodegenErrorType::InvalidFutureFeature(other.to_owned())) + self.error_ranged(CodegenErrorType::InvalidFutureBraces, feature.range) ); } + other => { + return Err(self.error_ranged( + CodegenErrorType::InvalidFutureFeature(other.to_owned()), + feature.range, + )); + } } } Ok(()) @@ -10012,22 +11225,18 @@ impl Compiler { } let instr = instr.into(); let opcode = AnyOpcode::from(instr); - debug_assert!( !instr.is_assembler(), "CPython codegen_addop_* must not emit assembler-only opcodes" ); - debug_assert!( opcode.has_arg() || instr.has_target() || u32::from(arg) == 0, "CPython _PyInstructionSequence_Addop requires either OPCODE_HAS_ARG, HAS_TARGET, or oparg == 0" ); - debug_assert!( target == BlockIdx::NULL || instr.has_target(), "CPython codegen_addop_j only accepts HAS_TARGET opcodes" ); - let range = self.current_source_range; let source = self.source_file.to_source_code(); let location = source.source_location(range.start(), PositionEncoding::Utf8); @@ -10111,7 +11320,6 @@ impl Compiler { .blocks .first_mut() .expect("code unit must have an entry block"); - debug_assert!( entry .used_instructions() @@ -10125,11 +11333,14 @@ impl Compiler { }), "scope entry must start with a function-start RESUME" ); - debug_assert!( !entry.used_instructions().iter().any(|info| matches!( - info.instr.real_opcode(), - Some(Opcode::ReturnGenerator | Opcode::MakeCell | Opcode::CopyFreeVars) + info.instr.real(), + Some( + Instruction::ReturnGenerator + | Instruction::MakeCell { .. } + | Instruction::CopyFreeVars { .. } + ) )), "CPython inserts StopIteration cleanup before CFG prefix instructions" ); @@ -10281,31 +11492,6 @@ impl Compiler { && lhs.exceptiontable == rhs.exceptiontable } - /// Try to fold a collection of constant expressions into a single ConstantData::Tuple. - /// Returns None if any element cannot be folded. - fn try_fold_constant_collection( - &mut self, - elts: &[ast::Expr], - collection_type: CollectionType, - ) -> CompileResult<Option<ConstantData>> { - let mut constants = Vec::with_capacity(elts.len()); - for elt in elts { - let Some(constant) = self.try_fold_constant_expr(elt)? else { - return Ok(None); - }; - constants.push(constant); - } - let constant = match collection_type { - CollectionType::Tuple | CollectionType::List => ConstantData::Tuple { - elements: constants, - }, - CollectionType::Set => ConstantData::Frozenset { - elements: constants, - }, - }; - Ok(Some(constant)) - } - fn constant_as_fold_int(constant: &ConstantData) -> Option<(BigInt, bool)> { match constant { ConstantData::Boolean { value } => Some((BigInt::from(u8::from(*value)), true)), @@ -10341,6 +11527,9 @@ impl Compiler { } fn try_fold_constant_expr(&mut self, expr: &ast::Expr) -> CompileResult<Option<ConstantData>> { + if let Some(constant) = self.ast_constant_value(expr) { + return Ok(Some(constant)); + } Ok(Some(match expr { ast::Expr::NumberLiteral(num) => match &num.value { ast::Number::Int(int) => ConstantData::Integer { @@ -10477,7 +11666,7 @@ impl Compiler { } (ast::UnaryOp::Not, ConstantData::Tuple { .. }) => return Ok(None), (ast::UnaryOp::Not, value) => ConstantData::Boolean { - value: !value.truthiness(), + value: !Self::constant_truthiness(&value), }, _ => return Ok(None), } @@ -10497,9 +11686,9 @@ impl Compiler { let mut selected = first; match op { ast::BoolOp::Or => { - if !selected.truthiness() { + if !Self::constant_truthiness(&selected) { for constant in iter { - let is_truthy = constant.truthiness(); + let is_truthy = Self::constant_truthiness(&constant); selected = constant; if is_truthy { break; @@ -10508,9 +11697,9 @@ impl Compiler { } } ast::BoolOp::And => { - if selected.truthiness() { + if Self::constant_truthiness(&selected) { for constant in iter { - let is_truthy = constant.truthiness(); + let is_truthy = Self::constant_truthiness(&constant); selected = constant; if !is_truthy { break; @@ -10529,6 +11718,9 @@ impl Compiler { &mut self, expr: &ast::Expr, ) -> CompileResult<Option<ConstantData>> { + if let Some(constant) = self.ast_constant_value(expr) { + return Ok(Some(constant)); + } Ok(Some(match expr { ast::Expr::NumberLiteral(num) => match &num.value { ast::Number::Int(int) => ConstantData::Integer { @@ -10552,24 +11744,76 @@ impl Compiler { })) } + fn try_compile_match_mapping_key_direct_constant( + &mut self, + expr: &ast::Expr, + ) -> CompileResult<Option<ConstantData>> { + if let Some(constant) = self.ast_constant_value(expr) { + return Ok(match constant { + ConstantData::Integer { .. } + | ConstantData::Float { .. } + | ConstantData::Bytes { .. } + | ConstantData::Complex { .. } + | ConstantData::Str { .. } + | ConstantData::Boolean { .. } + | ConstantData::None => Some(constant), + _ => None, + }); + } + if matches!( + expr, + ast::Expr::BooleanLiteral(_) | ast::Expr::NoneLiteral(_) + ) { + return self.try_compile_ast_constant(expr); + } + self.try_compile_match_pattern_direct_literal(expr) + } + + fn is_unexpected_match_literal_constant(expr: &ast::Expr) -> bool { + if let Some(constant) = expr + .as_constant_expr() + .map(|expr| ast_constant_value_to_constant_data(expr.value.clone())) + { + return matches!( + constant, + ConstantData::Boolean { .. } | ConstantData::None | ConstantData::Ellipsis + ); + } + matches!( + expr, + ast::Expr::BooleanLiteral(_) + | ast::Expr::NoneLiteral(_) + | ast::Expr::EllipsisLiteral(_) + ) + } + + fn try_compile_match_pattern_direct_literal( + &mut self, + expr: &ast::Expr, + ) -> CompileResult<Option<ConstantData>> { + if let Some(constant) = self.ast_constant_value(expr) { + return Ok(match constant { + ConstantData::Integer { .. } + | ConstantData::Float { .. } + | ConstantData::Bytes { .. } + | ConstantData::Complex { .. } + | ConstantData::Str { .. } => Some(constant), + _ => None, + }); + } + match expr { + ast::Expr::NumberLiteral(_) + | ast::Expr::StringLiteral(_) + | ast::Expr::BytesLiteral(_) => self.try_compile_ast_constant(expr), + _ => Ok(None), + } + } + fn try_negate_match_pattern_constant(constant: ConstantData) -> Option<ConstantData> { match constant { ConstantData::Integer { value } => Some(ConstantData::Integer { value: -value }), ConstantData::Float { value } => Some(ConstantData::Float { value: -value }), ConstantData::Complex { value } => Some(ConstantData::Complex { value: -value }), - ConstantData::Boolean { value } => Some(ConstantData::Integer { - value: -BigInt::from(u8::from(value)), - }), - _ => None, - } - } - - fn constant_as_match_pattern_complex(constant: &ConstantData) -> Option<Complex<f64>> { - match constant { - ConstantData::Integer { value } => Some(Complex::new(value.to_f64()?, 0.0)), - ConstantData::Float { value } => Some(Complex::new(*value, 0.0)), - ConstantData::Complex { value } => Some(*value), - ConstantData::Boolean { value } => Some(Complex::new(f64::from(u8::from(*value)), 0.0)), _ => None, } } @@ -10579,51 +11823,20 @@ impl Compiler { left: &ConstantData, right: &ConstantData, ) -> Option<ConstantData> { - if let (ConstantData::Integer { value: left }, ConstantData::Integer { value: right }) = - (left, right) - { - return match op { - ast::Operator::Add => Some(ConstantData::Integer { - value: left + right, - }), - ast::Operator::Sub => Some(ConstantData::Integer { - value: left - right, - }), - _ => None, - }; - } - - let left_is_complex = matches!(left, ConstantData::Complex { .. }); - let right_is_complex = matches!(right, ConstantData::Complex { .. }); - if left_is_complex || right_is_complex { - let left = Self::constant_as_match_pattern_complex(left)?; - let right = Self::constant_as_match_pattern_complex(right)?; - let value = match op { - ast::Operator::Add => Complex::new(left.re + right.re, left.im + right.im), - ast::Operator::Sub => { - let imag = if !left_is_complex && right_is_complex { - -right.im - } else { - left.im - right.im - }; - Complex::new(left.re - right.re, imag) - } - _ => return None, - }; - return Some(ConstantData::Complex { value }); - } - - let left = Self::constant_as_match_pattern_complex(left)?; - let right = Self::constant_as_match_pattern_complex(right)?; - match op { - ast::Operator::Add => Some(ConstantData::Float { - value: left.re + right.re, - }), - ast::Operator::Sub => Some(ConstantData::Float { - value: left.re - right.re, - }), - _ => None, - } + let left = match left { + ConstantData::Integer { value } => value.to_f64()?, + ConstantData::Float { value } => *value, + _ => return None, + }; + let ConstantData::Complex { value: right } = right else { + return None; + }; + let value = match op { + ast::Operator::Add => Complex::new(left + right.re, right.im), + ast::Operator::Sub => Complex::new(left - right.re, -right.im), + _ => return None, + }; + Some(ConstantData::Complex { value }) } fn try_fold_match_pattern_const_expr( @@ -10639,7 +11852,8 @@ impl Compiler { operand, .. }) => { - let Some(constant) = self.try_compile_ast_constant(operand)? else { + let Some(constant) = self.try_compile_match_pattern_number_constant(operand)? + else { return Ok(None); }; Self::try_negate_match_pattern_constant(constant) @@ -10647,13 +11861,10 @@ impl Compiler { ast::Expr::BinOp(ast::ExprBinOp { left, op, right, .. }) if matches!(op, ast::Operator::Add | ast::Operator::Sub) => { - let Some(left) = (match self.try_fold_match_pattern_const_expr(left)? { - Some(constant) => Some(constant), - None => self.try_compile_ast_constant(left)?, - }) else { + let Some(left) = self.try_compile_match_pattern_signed_real_constant(left)? else { return Ok(None); }; - let Some(right) = self.try_compile_ast_constant(right)? else { + let Some(right) = self.try_compile_match_pattern_imaginary_constant(right)? else { return Ok(None); }; Self::try_fold_match_pattern_binop(*op, &left, &right) @@ -10662,8 +11873,74 @@ impl Compiler { }) } + fn try_compile_match_pattern_signed_real_constant( + &mut self, + expr: &ast::Expr, + ) -> CompileResult<Option<ConstantData>> { + if let Some(constant) = self.try_compile_match_pattern_real_constant(expr)? { + return Ok(Some(constant)); + } + let ast::Expr::UnaryOp(ast::ExprUnaryOp { + op: ast::UnaryOp::USub, + operand, + .. + }) = expr + else { + return Ok(None); + }; + let Some(constant) = self.try_compile_match_pattern_real_constant(operand)? else { + return Ok(None); + }; + Ok(Self::try_negate_match_pattern_constant(constant)) + } + + fn try_compile_match_pattern_real_constant( + &mut self, + expr: &ast::Expr, + ) -> CompileResult<Option<ConstantData>> { + let Some(constant) = self.try_compile_match_pattern_number_constant(expr)? else { + return Ok(None); + }; + Ok(match constant { + ConstantData::Integer { .. } | ConstantData::Float { .. } => Some(constant), + _ => None, + }) + } + + fn try_compile_match_pattern_imaginary_constant( + &mut self, + expr: &ast::Expr, + ) -> CompileResult<Option<ConstantData>> { + let Some(constant) = self.try_compile_match_pattern_number_constant(expr)? else { + return Ok(None); + }; + Ok(match constant { + ConstantData::Complex { .. } => Some(constant), + _ => None, + }) + } + + fn try_compile_match_pattern_number_constant( + &mut self, + expr: &ast::Expr, + ) -> CompileResult<Option<ConstantData>> { + if let Some(constant) = self.ast_constant_value(expr) { + return Ok(match constant { + ConstantData::Integer { .. } + | ConstantData::Float { .. } + | ConstantData::Complex { .. } => Some(constant), + _ => None, + }); + } + match expr { + ast::Expr::NumberLiteral(_) => self.try_compile_ast_constant(expr), + _ => Ok(None), + } + } + fn compile_match_pattern_expr(&mut self, expr: &ast::Expr) -> CompileResult<()> { if let Some(constant) = self.try_fold_match_pattern_const_expr(expr)? { + self.set_source_range(expr.range()); self.emit_load_const(constant); } else { self.compile_expression(expr)?; @@ -10685,7 +11962,7 @@ impl Compiler { if [lower, upper, step] .into_iter() .flatten() - .any(|expr| !expr.is_constant()) + .any(|expr| !self.is_constant_expr(expr)) { return Ok(None); } @@ -10792,6 +12069,12 @@ impl Compiler { emit!(self, Instruction::ReturnValue) } + fn allows_top_level_await_in_current_context(&self) -> bool { + self.opts.allow_top_level_await + && self.ctx.func == FunctionContext::NoFunction + && !self.ctx.in_class + } + fn current_code_info(&mut self) -> &mut ir::CodeInfo { self.code_stack.last_mut().expect("no code on stack") } @@ -10836,17 +12119,12 @@ impl Compiler { _ => {} } } - if !found_loop { - let err_type = if is_break { - CodegenErrorType::InvalidBreak - } else { - CodegenErrorType::InvalidContinue - }; - - return Err(self.error_ranged(err_type, range)); + if is_break { + return Err(self.error_ranged(CodegenErrorType::InvalidBreak, range)); + } + return Err(self.error_ranged(CodegenErrorType::InvalidContinue, range)); } - return Ok(()); } @@ -10878,13 +12156,19 @@ impl Compiler { debug_assert!(loop_fblock.fb_block.is_jump_target_label()); loop_fblock.fb_block }; - if let Some(loc) = unwind_loc { + let jump_is_artificial = if let Some(loc) = unwind_loc { self.set_source_range(loc); + false } else { - self.set_source_range(range); + true }; - self.emit_jump_label(PseudoOpcode::Jump, target_label); - if unwind_loc.is_none() { + self.emit_jump_label( + PseudoInstruction::Jump { + delta: OpArgMarker::marker(), + }, + target_label, + ); + if jump_is_artificial { self.set_no_location(); } self.set_source_range(prev_source_range); @@ -10900,7 +12184,7 @@ impl Compiler { let code = self.current_code_info(); let cur = code.current_block; if !code.blocks[cur.idx()] - .instructions + .used_instructions() .last() .is_some_and(|instr| instr.instr.is_terminator()) { @@ -11081,7 +12365,7 @@ impl Compiler { if source.line_index(loc_range.start()) == source.line_index(attr_range.end()) { return loc_range; } - let Ok(attr_len) = u32::try_from(attr.len()) else { + let Ok(attr_len) = u32::try_from(attr.chars().count()) else { return TextRange::new(loc_range.start(), loc_range.end()); }; let attr_len = TextSize::new(attr_len); @@ -11113,10 +12397,10 @@ impl Compiler { let is_async = self.ctx.func == FunctionContext::AsyncFunction; let flags = &mut self.current_code_info().flags; if is_async { - flags.remove(CodeFlags::COROUTINE); - flags.insert(CodeFlags::ASYNC_GENERATOR); + flags.remove(bytecode::CodeFlags::COROUTINE); + flags.insert(bytecode::CodeFlags::ASYNC_GENERATOR); } else { - flags.insert(CodeFlags::GENERATOR); + flags.insert(bytecode::CodeFlags::GENERATOR); } } @@ -11184,7 +12468,7 @@ impl Compiler { let fstring_range = fstring.range; let fstring = fstring.value.as_slice(); if self.count_fstring_parts(fstring) > STACK_USE_GUIDELINE { - return self.compile_fstring_parts_joined(fstring); + return self.compile_fstring_parts_joined(fstring, fstring_range); } let mut element_count = 0; @@ -11198,7 +12482,7 @@ impl Compiler { &mut pending_literal_range, &mut pending_literal_no_location, &mut element_count, - false, + None, )?; } self.finish_fstring( @@ -11211,7 +12495,54 @@ impl Compiler { Ok(()) } - fn compile_fstring_parts_joined(&mut self, fstring: &[ast::FStringPart]) -> CompileResult<()> { + fn compile_runtime_joined_str( + &mut self, + fstring: &ast::ExprFString, + values: &[ast::Expr], + ) -> CompileResult<()> { + let range = fstring.range; + let value_count: u32 = values + .len() + .try_into() + .expect("JoinedStr value count overflowed"); + if value_count > STACK_USE_GUIDELINE { + self.set_source_range(range); + self.emit_load_const(ConstantData::Str { + value: Wtf8Buf::new(), + }); + let join_idx = self.get_global_name_index("join"); + self.emit_load_attr_method(join_idx); + emit!(self, Instruction::BuildList { count: 0 }); + for value in values { + self.compile_expression(value)?; + self.set_source_range(range); + emit!(self, Instruction::ListAppend { i: 1 }); + } + self.set_source_range(range); + emit!(self, Instruction::Call { argc: 1 }); + } else { + for value in values { + self.compile_expression(value)?; + } + if value_count > 1 { + self.set_source_range(range); + emit!(self, Instruction::BuildString { count: value_count }); + } else if value_count == 0 { + self.set_source_range(range); + self.emit_load_const(ConstantData::Str { + value: Wtf8Buf::new(), + }); + } + } + Ok(()) + } + + fn compile_fstring_parts_joined( + &mut self, + fstring: &[ast::FStringPart], + fstring_range: TextRange, + ) -> CompileResult<()> { + self.set_source_range(fstring_range); self.emit_load_const(ConstantData::Str { value: Wtf8Buf::new(), }); @@ -11230,7 +12561,7 @@ impl Compiler { &mut pending_literal_range, &mut pending_literal_no_location, &mut element_count, - true, + Some(fstring_range), )?; } self.finish_fstring_join( @@ -11238,6 +12569,7 @@ impl Compiler { pending_literal_range, pending_literal_no_location, element_count, + fstring_range, ); Ok(()) } @@ -11249,7 +12581,7 @@ impl Compiler { pending_literal_range: &mut Option<TextRange>, pending_literal_no_location: &mut bool, element_count: &mut u32, - append_to_join_list: bool, + join_append_range: Option<TextRange>, ) -> CompileResult<()> { match part { ast::FStringPart::Literal(string) => { @@ -11271,7 +12603,7 @@ impl Compiler { pending_literal, (pending_literal_range, pending_literal_no_location), element_count, - append_to_join_list, + join_append_range, ), } } @@ -11291,7 +12623,7 @@ impl Compiler { &mut pending_literal_no_location, &mut element_count, keep_empty, - false, + None, ); if element_count == 0 { @@ -11320,6 +12652,7 @@ impl Compiler { mut pending_literal_range: Option<TextRange>, mut pending_literal_no_location: bool, mut element_count: u32, + fstring_range: TextRange, ) { let keep_empty = element_count == 0; self.emit_pending_fstring_literal( @@ -11328,8 +12661,9 @@ impl Compiler { &mut pending_literal_no_location, &mut element_count, keep_empty, - true, + Some(fstring_range), ); + self.set_source_range(fstring_range); emit!(self, Instruction::Call { argc: 1 }); } @@ -11340,7 +12674,7 @@ impl Compiler { pending_literal_no_location: &mut bool, element_count: &mut u32, keep_empty: bool, - append_to_join_list: bool, + join_append_range: Option<TextRange>, ) { let Some(value) = pending_literal.take() else { return; @@ -11364,7 +12698,8 @@ impl Compiler { self.set_no_location(); } *element_count += 1; - if append_to_join_list { + if let Some(join_append_range) = join_append_range { + self.set_source_range(join_append_range); emit!(self, Instruction::ListAppend { i: 1 }); } } @@ -11439,7 +12774,8 @@ impl Compiler { fstring_range: Option<TextRange>, ) -> CompileResult<()> { if self.count_fstring_elements(flags, fstring_elements) > STACK_USE_GUIDELINE { - return self.compile_fstring_elements_joined(flags, fstring_elements); + let fstring_range = fstring_range.unwrap_or(self.current_source_range); + return self.compile_fstring_elements_joined(flags, fstring_elements, fstring_range); } let mut element_count = 0; @@ -11452,7 +12788,7 @@ impl Compiler { &mut pending_literal, (&mut pending_literal_range, &mut pending_literal_no_location), &mut element_count, - false, + None, )?; self.finish_fstring( pending_literal, @@ -11468,7 +12804,9 @@ impl Compiler { &mut self, flags: ast::FStringFlags, fstring_elements: &ast::InterpolatedStringElements, + fstring_range: TextRange, ) -> CompileResult<()> { + self.set_source_range(fstring_range); self.emit_load_const(ConstantData::Str { value: Wtf8Buf::new(), }); @@ -11486,13 +12824,14 @@ impl Compiler { &mut pending_literal, (&mut pending_literal_range, &mut pending_literal_no_location), &mut element_count, - true, + Some(fstring_range), )?; self.finish_fstring_join( pending_literal, pending_literal_range, pending_literal_no_location, element_count, + fstring_range, ); Ok(()) } @@ -11517,7 +12856,7 @@ impl Compiler { pending_literal: &mut Option<Wtf8Buf>, pending_literal_meta: (&mut Option<TextRange>, &mut bool), element_count: &mut u32, - append_to_join_list: bool, + join_append_range: Option<TextRange>, ) -> CompileResult<()> { let (pending_literal_range, pending_literal_no_location) = pending_literal_meta; for element in fstring_elements { @@ -11542,7 +12881,18 @@ impl Compiler { ast::ConversionFlag::Ascii => ConvertValueOparg::Ascii, }; - if let Some(ast::DebugText { leading, trailing }) = &fstring_expr.debug_text { + if let Some(debug_text) = &fstring_expr.debug_text { + let leading = debug_text.leading.as_str(); + let trailing = debug_text.trailing.as_str(); + self.emit_pending_fstring_literal( + pending_literal, + pending_literal_range, + pending_literal_no_location, + element_count, + false, + join_append_range, + ); + let range = fstring_expr.expression.range(); let leading = strip_fstring_debug_comments(leading); let trailing = strip_fstring_debug_comments(trailing); @@ -11562,16 +12912,9 @@ impl Compiler { ); let text: Wtf8Buf = text.into(); - if pending_literal.is_none() { - *pending_literal_range = Some(debug_text_range); - *pending_literal_no_location = false; - *pending_literal = Some(Wtf8Buf::new()); - } else { - Self::extend_pending_literal_range( - pending_literal_range, - debug_text_range, - ); - } + *pending_literal_range = Some(debug_text_range); + *pending_literal_no_location = false; + *pending_literal = Some(Wtf8Buf::new()); pending_literal.as_mut().unwrap().push_wtf8(text.as_ref()); // If debug text is present, apply repr conversion when no `format_spec` specified. @@ -11590,7 +12933,7 @@ impl Compiler { pending_literal_no_location, element_count, false, - append_to_join_list, + join_append_range, ); self.compile_expression(&fstring_expr.expression)?; @@ -11606,27 +12949,37 @@ impl Compiler { } } - match &fstring_expr.format_spec { - Some(format_spec) => { - let format_spec_range = - self.cpython_format_spec_range(format_spec.range); - self.compile_fstring_elements( - flags, - &format_spec.elements, - Some(format_spec_range), - )?; + if let Some(format_spec) = + fstring_expr.runtime_formatted_value_format_spec.as_deref() + { + self.compile_expression(format_spec)?; - self.set_source_range(formatted_value_range); - emit!(self, Instruction::FormatWithSpec); - } - None => { - self.set_source_range(formatted_value_range); - emit!(self, Instruction::FormatSimple); + self.set_source_range(formatted_value_range); + emit!(self, Instruction::FormatWithSpec); + } else { + match &fstring_expr.format_spec { + Some(format_spec) => { + let format_spec_range = + self.cpython_format_spec_range(format_spec.range); + self.compile_fstring_elements( + flags, + &format_spec.elements, + Some(format_spec_range), + )?; + + self.set_source_range(formatted_value_range); + emit!(self, Instruction::FormatWithSpec); + } + None => { + self.set_source_range(formatted_value_range); + emit!(self, Instruction::FormatSimple); + } } } *element_count += 1; - if append_to_join_list { + if let Some(join_append_range) = join_append_range { + self.set_source_range(join_append_range); emit!(self, Instruction::ListAppend { i: 1 }); } } @@ -11672,7 +13025,10 @@ impl Compiler { } } ast::InterpolatedStringElement::Interpolation(fstring_expr) => { - if let Some(ast::DebugText { leading, trailing }) = &fstring_expr.debug_text { + if let Some(debug_text) = &fstring_expr.debug_text { + let leading = debug_text.leading.as_str(); + let trailing = debug_text.trailing.as_str(); + Self::count_pending_fstring_literal(pending_literal, element_count, false); let range = fstring_expr.expression.range(); let source = self.source_file.slice(range); let text = [ @@ -11683,9 +13039,9 @@ impl Compiler { .concat(); let text: Wtf8Buf = text.into(); - pending_literal - .get_or_insert_with(Wtf8Buf::new) - .push_wtf8(text.as_ref()); + let mut debug_text = Wtf8Buf::new(); + debug_text.push_wtf8(text.as_ref()); + *pending_literal = Some(debug_text); } Self::count_pending_fstring_literal(pending_literal, element_count, false); @@ -11701,8 +13057,9 @@ impl Compiler { // strings tuple first, then evaluating interpolations left-to-right. let tstring_value = &expr_tstring.value; - let mut all_strings: Vec<Wtf8Buf> = Vec::new(); + let mut all_strings: Vec<(Wtf8Buf, TextRange)> = Vec::new(); let mut current_string = Wtf8Buf::new(); + let mut current_string_range = None; let mut interp_count: u32 = 0; for tstring in tstring_value { @@ -11710,19 +13067,26 @@ impl Compiler { tstring, &mut all_strings, &mut current_string, + &mut current_string_range, &mut interp_count, + expr_tstring.range, ); } - all_strings.push(core::mem::take(&mut current_string)); + all_strings.push(( + core::mem::take(&mut current_string), + current_string_range.unwrap_or(expr_tstring.range), + )); let string_count: u32 = all_strings .len() .try_into() .expect("t-string string count overflowed"); - for s in &all_strings { + for (s, range) in &all_strings { + self.set_source_range(*range); self.emit_load_const(ConstantData::Str { value: s.clone() }); } + self.set_source_range(expr_tstring.range); emit!( self, Instruction::BuildTuple { @@ -11734,32 +13098,168 @@ impl Compiler { self.compile_tstring_interpolations(tstring)?; } + self.set_source_range(expr_tstring.range); emit!( self, Instruction::BuildTuple { count: interp_count } ); + self.set_source_range(expr_tstring.range); emit!(self, Instruction::BuildTemplate); Ok(()) } + fn compile_runtime_template_str( + &mut self, + expr_tstring: &ast::ExprTString, + values: &[ast::Expr], + ) -> CompileResult<()> { + let mut last_was_interpolation = true; + let mut strings_len = 0; + for value in values { + if self.runtime_template_value_interpolation(value).is_some() { + if last_was_interpolation { + self.set_source_range(expr_tstring.range); + self.emit_load_const(ConstantData::Str { + value: Wtf8Buf::new(), + }); + strings_len += 1; + } + last_was_interpolation = true; + } else { + self.compile_expression(value)?; + strings_len += 1; + last_was_interpolation = false; + } + } + if last_was_interpolation { + self.set_source_range(expr_tstring.range); + self.emit_load_const(ConstantData::Str { + value: Wtf8Buf::new(), + }); + strings_len += 1; + } + self.set_source_range(expr_tstring.range); + emit!(self, Instruction::BuildTuple { count: strings_len }); + + let mut interpolations_len = 0; + for value in values { + if let Some((tstring, interpolation)) = self.runtime_template_value_interpolation(value) + { + self.compile_runtime_interpolation(tstring, interpolation)?; + interpolations_len += 1; + } + } + self.set_source_range(expr_tstring.range); + emit!( + self, + Instruction::BuildTuple { + count: interpolations_len + } + ); + self.set_source_range(expr_tstring.range); + emit!(self, Instruction::BuildTemplate); + Ok(()) + } + + fn runtime_template_value_interpolation<'a>( + &self, + value: &'a ast::Expr, + ) -> Option<( + &'a ast::ExprTString, + (&'a ast::ConstantValue, Option<&'a ast::Expr>), + )> { + let ast::Expr::TString(tstring) = value else { + return None; + }; + let interpolation = Self::single_runtime_interpolation(tstring)?; + Self::single_tstring_interpolation(tstring)?; + Some((tstring, interpolation)) + } + + fn compile_runtime_interpolation( + &mut self, + expr_tstring: &ast::ExprTString, + interpolation: (&ast::ConstantValue, Option<&ast::Expr>), + ) -> CompileResult<bool> { + let Some(interp) = Self::single_tstring_interpolation(expr_tstring) else { + return Ok(false); + }; + + self.compile_interpolation(interp, interpolation)?; + Ok(true) + } + + fn compile_interpolation( + &mut self, + interp: &ast::InterpolatedElement, + interpolation: (&ast::ConstantValue, Option<&ast::Expr>), + ) -> CompileResult<()> { + let (str, format_spec) = interpolation; + self.compile_expression(&interp.expression)?; + self.set_source_range(interp.range); + self.emit_load_const(ast_constant_value_to_constant_data(str.clone())); + + let conversion = match interp.conversion { + ast::ConversionFlag::None => 0, + ast::ConversionFlag::Str => 1, + ast::ConversionFlag::Repr => 2, + ast::ConversionFlag::Ascii => 3, + }; + + let has_format_spec = format_spec.is_some(); + if let Some(format_spec) = format_spec { + self.compile_expression(format_spec)?; + } + + let format = 2 | (conversion << 2) | u32::from(has_format_spec); + self.set_source_range(interp.range); + emit!(self, Instruction::BuildInterpolation { format }); + Ok(()) + } + + fn single_tstring_interpolation( + expr_tstring: &ast::ExprTString, + ) -> Option<&ast::InterpolatedElement> { + let [tstring] = expr_tstring.value.as_slice() else { + return None; + }; + let mut elements = tstring.elements.iter(); + let ast::InterpolatedStringElement::Interpolation(interp) = elements.next()? else { + return None; + }; + if elements.next().is_some() { + return None; + } + Some(interp) + } + fn collect_tstring_strings( &self, tstring: &ast::TString, - strings: &mut Vec<Wtf8Buf>, + strings: &mut Vec<(Wtf8Buf, TextRange)>, current_string: &mut Wtf8Buf, + current_string_range: &mut Option<TextRange>, interp_count: &mut u32, + template_range: TextRange, ) { for element in &tstring.elements { match element { ast::InterpolatedStringElement::Literal(lit) => { + if current_string_range.is_none() { + *current_string_range = Some(lit.range); + } else { + Self::extend_pending_literal_range(current_string_range, lit.range); + } current_string .push_wtf8(&self.compile_tstring_literal_value(lit, tstring.flags)); } ast::InterpolatedStringElement::Interpolation(interp) => { - if let Some(ast::DebugText { leading, trailing }) = &interp.debug_text { + if let Some(debug_text) = &interp.debug_text { + let leading = debug_text.leading.as_str(); + let trailing = debug_text.trailing.as_str(); let range = interp.expression.range(); let source = self.source_file.slice(range); let text = [ @@ -11768,9 +13268,37 @@ impl Compiler { strip_fstring_debug_comments(trailing).as_str(), ] .concat(); + let debug_text_range = TextRange::new( + range.start() + - TextSize::new( + u32::try_from(leading.len()) + .expect("debug t-string leading text too long"), + ), + range.end() + + TextSize::new( + u32::try_from(trailing.len()) + .expect("debug t-string trailing text too long"), + ), + ); + if current_string_range.is_none() { + *current_string_range = Some(debug_text_range); + } else { + Self::extend_pending_literal_range( + current_string_range, + debug_text_range, + ); + } current_string.push_str(&text); + strings.push(( + core::mem::take(current_string), + current_string_range.take().unwrap_or(template_range), + )); + } else { + strings.push(( + core::mem::take(current_string), + current_string_range.take().unwrap_or(template_range), + )); } - strings.push(core::mem::take(current_string)); *interp_count += 1; } } @@ -11783,6 +13311,15 @@ impl Compiler { continue; }; + if let Some(runtime_str) = interp.runtime_str.as_ref() { + let interpolation = ( + runtime_str, + interp.runtime_interpolation_format_spec.as_deref(), + ); + self.compile_interpolation(interp, interpolation)?; + continue; + } + self.compile_expression(&interp.expression)?; let expr_range = interp.expression.range(); @@ -11794,9 +13331,11 @@ impl Compiler { .slice(TextRange::new(after_brace, expr_range.end())) } else { self.source_file.slice(expr_range) - }; + } + .to_string(); + self.set_source_range(interp.range); self.emit_load_const(ConstantData::Str { - value: expr_source.to_string().into(), + value: expr_source.into(), }); let mut conversion: u32 = match interp.conversion { @@ -11812,16 +13351,18 @@ impl Compiler { let has_format_spec = interp.format_spec.is_some(); if let Some(format_spec) = &interp.format_spec { + let format_spec_range = self.cpython_format_spec_range(format_spec.range); self.compile_fstring_elements( ast::FStringFlags::empty(), &format_spec.elements, - Some(format_spec.range), + Some(format_spec_range), )?; } // CPython keeps bit 1 set in BUILD_INTERPOLATION's oparg and uses // bit 0 for the optional format spec. let format = 2 | (conversion << 2) | u32::from(has_format_spec); + self.set_source_range(interp.range); emit!(self, Instruction::BuildInterpolation { format }); } @@ -11922,20 +13463,24 @@ fn expandtabs(input: &str, tab_size: usize) -> String { expanded_str } -fn split_doc_with_range( - body: &[ast::Stmt], - opts: CompileOpts, -) -> (Option<(String, TextRange)>, &[ast::Stmt]) { +fn split_doc_with_range<'a>( + body: &'a [ast::Stmt], + opts: &CompileOpts, +) -> (Option<(String, TextRange)>, &'a [ast::Stmt]) { if let Some((ast::Stmt::Expr(expr), body_rest)) = body.split_first() { - let doc_comment = match &*expr.value { - ast::Expr::StringLiteral(value) => Some((&value.value, expr.value.range())), + let doc_comment: Option<(&str, TextRange)> = match &*expr.value { + ast::Expr::StringLiteral(value) => Some((value.value.to_str(), expr.value.range())), + ast::Expr::Constant(ast::ExprConstant { + value: ast::ConstantValue::Str(value), + .. + }) => Some((value.as_ref(), expr.value.range())), // f-strings are not allowed in Python doc comments. ast::Expr::FString(_) => None, _ => None, }; if let Some((doc, range)) = doc_comment { return if opts.optimize < 2 { - (Some((clean_doc(doc.to_str()), range)), body_rest) + (Some((clean_doc(doc), range)), body_rest) } else { (None, body_rest) }; @@ -11945,11 +13490,22 @@ fn split_doc_with_range( } #[cfg(test)] -fn split_doc(body: &[ast::Stmt], opts: CompileOpts) -> (Option<String>, &[ast::Stmt]) { +fn split_doc<'a>(body: &'a [ast::Stmt], opts: &CompileOpts) -> (Option<String>, &'a [ast::Stmt]) { let (doc, body) = split_doc_with_range(body, opts); (doc.map(|(doc, _)| doc), body) } +fn is_docstring_expr(expr: &ast::Expr) -> bool { + matches!( + expr, + ast::Expr::StringLiteral(_) + | ast::Expr::Constant(ast::ExprConstant { + value: ast::ConstantValue::Str(_), + .. + }) + ) +} + pub fn ruff_int_to_bigint(int: &ast::Int) -> Result<BigInt, CodegenErrorType> { if let Some(small) = int.as_u64() { Ok(BigInt::from(small)) @@ -12053,11 +13609,16 @@ mod ruff_tests { debug_text: None, conversion: ast::ConversionFlag::None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, )] .into(), flags, }), + runtime_joined_str: None, + runtime_values: None, }); assert!(!Compiler::contains_await(not_present)); @@ -12086,11 +13647,16 @@ mod ruff_tests { debug_text: None, conversion: ast::ConversionFlag::None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, )] .into(), flags, }), + runtime_joined_str: None, + runtime_values: None, }); assert!(Compiler::contains_await(present)); @@ -12135,15 +13701,23 @@ mod ruff_tests { debug_text: None, conversion: ast::ConversionFlag::None, format_spec: None, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, )] .into(), })), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }, )] .into(), flags, }), + runtime_joined_str: None, + runtime_values: None, }); assert!(Compiler::contains_await(present)); } @@ -12154,14 +13728,16 @@ mod tests { use super::*; use rustpython_compiler_core::{ SourceFileBuilder, - bytecode::{CodeUnit, OpArg}, + bytecode::{CO_FAST_ARG_KW, CO_FAST_ARG_POS, CodeUnit, OpArg}, }; fn assert_scope_exit_locations(code: &CodeObject) { for (instr, (location, _)) in code.instructions.iter().zip(code.locations.iter()) { if matches!( - instr.op.into(), - Opcode::ReturnValue | Opcode::RaiseVarargs | Opcode::Reraise + instr.op, + Instruction::ReturnValue + | Instruction::RaiseVarargs { .. } + | Instruction::Reraise { .. } ) { assert!( location.line.get() > 0, @@ -12201,7 +13777,7 @@ mod tests { compile_exec_with_options(source, opts) } - fn compile_exec_with_options(source: &str, opts: CompileOpts) -> CodeObject { + fn compile_exec_with_options(source: &str, mut opts: CompileOpts) -> CodeObject { let source_file = SourceFileBuilder::new("source_path", source).finish(); let parsed = ruff_python_parser::parse( source_file.source_text(), @@ -12209,28 +13785,858 @@ mod tests { ) .unwrap(); let mut ast = parsed.into_syntax(); - preprocess::preprocess_mod(&mut ast); + opts.future_features |= checked_future_features(&ast, &source_file).unwrap(); + let future_annotations = opts + .future_features + .contains(bytecode::CodeFlags::FUTURE_ANNOTATIONS); + preprocess::preprocess_mod(&mut ast, opts.optimize, future_annotations, false); let ast = match ast { ruff_python_ast::Mod::Module(stmts) => stmts, _ => unreachable!(), }; - let symbol_table = SymbolTable::scan_program(&ast, source_file.clone()) - .map_err(|e| e.into_codegen_error(source_file.name().to_owned())) - .unwrap(); - let mut compiler = Compiler::new(opts, source_file, "<module>"); + let symbol_table = SymbolTable::scan_program_with_options( + &ast, + source_file.clone(), + opts.allow_top_level_await, + opts.future_features + .contains(bytecode::CodeFlags::FUTURE_ANNOTATIONS), + opts.recursion_limit, + ) + .map_err(|e| e.into_codegen_error(source_file.name().to_owned())) + .unwrap(); + let mut compiler = + Compiler::new_with_syntax_warning_handler(opts, source_file, "<module>", None); compiler.compile_program(&ast, symbol_table).unwrap(); compiler.exit_scope() } + fn compile_module_instruction_infos(source: &str, mode: Mode) -> Vec<ir::InstructionInfo> { + let mut opts = CompileOpts::default(); + let source_file = SourceFileBuilder::new("source_path", source).finish(); + let parsed = ruff_python_parser::parse( + source_file.source_text(), + ruff_python_parser::Mode::Module.into(), + ) + .unwrap(); + let mut ast = parsed.into_syntax(); + opts.future_features |= checked_future_features(&ast, &source_file).unwrap(); + let future_annotations = opts + .future_features + .contains(bytecode::CodeFlags::FUTURE_ANNOTATIONS); + if matches!(mode, Mode::Single) + && let ruff_python_ast::Mod::Module(module) = &mut ast + { + preprocess::preprocess_statements( + &mut module.body, + opts.optimize, + future_annotations, + false, + ); + } else { + preprocess::preprocess_mod(&mut ast, opts.optimize, future_annotations, false); + } + let ast = match ast { + ruff_python_ast::Mod::Module(stmts) => stmts, + _ => unreachable!(), + }; + let symbol_table = SymbolTable::scan_program_with_options( + &ast, + source_file.clone(), + opts.allow_top_level_await, + opts.future_features + .contains(bytecode::CodeFlags::FUTURE_ANNOTATIONS), + opts.recursion_limit, + ) + .map_err(|e| e.into_codegen_error(source_file.name().to_owned())) + .unwrap(); + let mut compiler = + Compiler::new_with_syntax_warning_handler(opts, source_file, "<module>", None); + match mode { + Mode::Single => compiler.compile_program_single(&ast.body, symbol_table), + _ => compiler.compile_program(&ast, symbol_table), + } + .unwrap(); + + compiler + .current_code_info() + .blocks + .iter() + .flat_map(|block| block.used_instructions().iter().copied()) + .collect() + } + + fn compile_eval_ast_with_options(expr: ast::Expr, opts: CompileOpts) -> CodeObject { + let source_file = SourceFileBuilder::new("source_path", "").finish(); + let parsed = ruff_python_ast::Mod::Expression(ast::ModExpression { + node_index: ast::AtomicNodeIndex::NONE, + range: TextRange::default(), + body: Box::new(expr), + }); + compile_top(parsed, source_file, Mode::Eval, opts).unwrap() + } + + fn set_ast_constant(expr: &mut ast::Expr, constant: ConstantData) { + let constant = crate::constant_data_to_ast_constant_value(constant); + let range = expr.range(); + *expr = ast::Expr::Constant(ast::ExprConstant { + node_index: Default::default(), + range, + value: constant, + kind: None, + invalid_type: None, + }); + } + + fn compile_ast_constant_expr(mut expr: ast::Expr, constant: ConstantData) -> CodeObject { + set_ast_constant(&mut expr, constant); + compile_eval_ast_with_options(expr, CompileOpts::default()) + } + + fn first_ast_constant_warning(expr: ast::Expr) -> String { + let opts = CompileOpts::default(); + let source_file = SourceFileBuilder::new("source_path", "").finish(); + let parsed = ruff_python_ast::Mod::Expression(ast::ModExpression { + node_index: ast::AtomicNodeIndex::NONE, + range: TextRange::default(), + body: Box::new(expr), + }); + let mut warning = None; + let mut handler = |location, message: String| { + warning = Some(message.clone()); + Err(CodegenError { + location: Some(location), + error: CodegenErrorType::SyntaxError(message), + source_path: "source_path".to_owned(), + }) + }; + compile_top_with_syntax_warning_handler( + parsed, + source_file, + Mode::Eval, + opts, + Some(&mut handler), + ) + .expect_err("expected SyntaxWarning handler to stop compilation"); + warning.expect("expected warning message") + } + + fn first_exec_warning(source: &str) -> String { + let opts = CompileOpts::default(); + let source_file = SourceFileBuilder::new("source_path", source).finish(); + let parsed = ruff_python_parser::parse( + source_file.source_text(), + ruff_python_parser::Mode::Module.into(), + ) + .unwrap() + .into_syntax(); + let mut warning = None; + let mut handler = |location, message: String| { + warning = Some(message.clone()); + Err(CodegenError { + location: Some(location), + error: CodegenErrorType::SyntaxError(message), + source_path: "source_path".to_owned(), + }) + }; + compile_top_with_syntax_warning_handler( + parsed, + source_file, + Mode::Exec, + opts, + Some(&mut handler), + ) + .expect_err("expected SyntaxWarning handler to stop compilation"); + warning.expect("expected warning message") + } + + fn frozenset_call_expr() -> ast::Expr { + ast::Expr::Call(ast::ExprCall { + node_index: ast::AtomicNodeIndex::NONE, + range: TextRange::default(), + func: Box::new(ast::Expr::Name(ast::ExprName { + node_index: ast::AtomicNodeIndex::NONE, + range: TextRange::default(), + id: ast::name::Name::new_static("frozenset"), + ctx: ast::ExprContext::Load, + })), + arguments: ast::Arguments { + node_index: ast::AtomicNodeIndex::NONE, + range: TextRange::default(), + args: Box::default(), + keywords: Default::default(), + runtime_args: None, + runtime_bases: None, + }, + }) + } + + fn compile_exec_parsed_error( + source: &str, + parsed: ruff_python_parser::Parsed<ruff_python_ast::Mod>, + ) -> CodegenError { + let mut opts = CompileOpts::default(); + let source_file = SourceFileBuilder::new("source_path", source).finish(); + let mut ast = parsed.into_syntax(); + opts.future_features |= match checked_future_features(&ast, &source_file) { + Ok(features) => features, + Err(err) => return err, + }; + let future_annotations = opts + .future_features + .contains(bytecode::CodeFlags::FUTURE_ANNOTATIONS); + preprocess::preprocess_mod(&mut ast, opts.optimize, future_annotations, false); + let ast = match ast { + ruff_python_ast::Mod::Module(stmts) => stmts, + _ => unreachable!(), + }; + let symbol_table = match SymbolTable::scan_program(&ast, source_file.clone()) { + Ok(symbol_table) => symbol_table, + Err(err) => return err.into_codegen_error(source_file.name().to_owned()), + }; + let mut compiler = + Compiler::new_with_syntax_warning_handler(opts, source_file, "<module>", None); + compiler.compile_program(&ast, symbol_table).unwrap_err() + } + + fn compile_exec_error(source: &str) -> CodegenError { + let source_file = SourceFileBuilder::new("source_path", source).finish(); + let parsed = ruff_python_parser::parse( + source_file.source_text(), + ruff_python_parser::Mode::Module.into(), + ) + .unwrap(); + compile_exec_parsed_error(source, parsed) + } + + fn compile_exec_error_message(source: &str) -> String { + compile_exec_error(source).error.to_string() + } + + fn compile_exec_unchecked_error_message(source: &str) -> String { + let source_file = SourceFileBuilder::new("source_path", source).finish(); + let parsed = ruff_python_parser::parse_unchecked( + source_file.source_text(), + ruff_python_parser::Mode::Module.into(), + ); + compile_exec_parsed_error(source, parsed).error.to_string() + } + + #[test] + fn ast_constant_frozenset_compiles_as_load_const() { + let code = compile_ast_constant_expr( + frozenset_call_expr(), + ConstantData::Frozenset { + elements: vec![ConstantData::Integer { + value: BigInt::from(1u8), + }], + }, + ); + let ops: Vec<_> = code + .instructions + .iter() + .map(|unit| unit.op) + .filter(|op| !matches!(op, Instruction::Cache)) + .collect(); + + assert!( + ops.iter() + .any(|op| matches!(op, Instruction::LoadConst { .. })), + "public ast.Constant(frozenset(...)) must use CPython Constant_kind LOAD_CONST path, got {ops:?}" + ); + assert!( + !ops.iter().any(|op| matches!( + op, + Instruction::LoadName { .. } + | Instruction::Call { .. } + | Instruction::CallKw { .. } + )), + "public ast.Constant(frozenset(...)) must not compile as a frozenset() call, got {ops:?}" + ); + assert!( + code.constants.iter().any(|constant| matches!( + constant, + ConstantData::Frozenset { elements } + if matches!( + elements.as_slice(), + [ConstantData::Integer { value }] if *value == BigInt::from(1u8) + ) + )), + "missing frozenset constant in code constants" + ); + } + + #[test] + fn ast_constant_is_not_scanned_as_lowered_expression() { + let mut expr = frozenset_call_expr(); + set_ast_constant( + &mut expr, + ConstantData::Frozenset { + elements: Vec::new(), + }, + ); + let module = ast::ModExpression { + node_index: ast::AtomicNodeIndex::NONE, + range: TextRange::default(), + body: Box::new(expr), + }; + let table = SymbolTable::scan_expr_with_options( + &module, + SourceFileBuilder::new("source_path", "").finish(), + false, + false, + CompileOpts::default().recursion_limit, + ) + .unwrap(); + + assert!( + table.lookup("frozenset").is_none(), + "CPython symtable Constant_kind does not visit the lowered frozenset() expression" + ); + } + + #[test] + fn ast_constant_frozenset_call_warns_like_cpython_constant() { + let mut func = frozenset_call_expr(); + set_ast_constant( + &mut func, + ConstantData::Frozenset { + elements: Vec::new(), + }, + ); + let message = first_ast_constant_warning(ast::Expr::Call(ast::ExprCall { + node_index: ast::AtomicNodeIndex::NONE, + range: TextRange::default(), + func: Box::new(func), + arguments: ast::Arguments { + node_index: ast::AtomicNodeIndex::NONE, + range: TextRange::default(), + args: Box::default(), + keywords: Default::default(), + runtime_args: None, + runtime_bases: None, + }, + })); + assert!( + message.contains("'frozenset' object is not callable"), + "expected public ast.Constant(frozenset()) callable warning, got {message:?}" + ); + } + + #[test] + fn ast_constant_frozenset_subscript_warns_like_cpython_constant() { + let mut value = frozenset_call_expr(); + set_ast_constant( + &mut value, + ConstantData::Frozenset { + elements: Vec::new(), + }, + ); + let message = first_ast_constant_warning(ast::Expr::Subscript(ast::ExprSubscript { + node_index: ast::AtomicNodeIndex::NONE, + range: TextRange::default(), + value: Box::new(value), + slice: Box::new(ast::Expr::NumberLiteral(ast::ExprNumberLiteral { + node_index: ast::AtomicNodeIndex::NONE, + range: TextRange::default(), + value: ast::Number::Int(ast::Int::ZERO), + })), + ctx: ast::ExprContext::Load, + })); + assert!( + message.contains("'frozenset' object is not subscriptable"), + "expected public ast.Constant(frozenset()) subscript warning, got {message:?}" + ); + } + + #[test] + fn ast_constant_str_bad_index_warns_like_cpython_constant() { + let mut value = frozenset_call_expr(); + set_ast_constant( + &mut value, + ConstantData::Str { + value: "abc".into(), + }, + ); + let message = first_ast_constant_warning(ast::Expr::Subscript(ast::ExprSubscript { + node_index: ast::AtomicNodeIndex::NONE, + range: TextRange::default(), + value: Box::new(value), + slice: Box::new(ast::Expr::NumberLiteral(ast::ExprNumberLiteral { + node_index: ast::AtomicNodeIndex::NONE, + range: TextRange::default(), + value: ast::Number::Float(1.0), + })), + ctx: ast::ExprContext::Load, + })); + assert!( + message.contains("str indices must be integers or slices, not float"), + "expected public ast.Constant(str) bad-index warning, got {message:?}" + ); + } + + #[test] + fn ast_constant_frozenset_is_warns_like_cpython_constant() { + let mut left = frozenset_call_expr(); + set_ast_constant( + &mut left, + ConstantData::Frozenset { + elements: Vec::new(), + }, + ); + let message = first_ast_constant_warning(ast::Expr::Compare(ast::ExprCompare { + node_index: ast::AtomicNodeIndex::NONE, + range: TextRange::default(), + left: Box::new(left), + ops: Box::new([ast::CmpOp::Is]), + comparators: Box::new([ast::Expr::NoneLiteral(ast::ExprNoneLiteral { + node_index: ast::AtomicNodeIndex::NONE, + range: TextRange::default(), + })]), + runtime_comparators: None, + })); + assert!( + message.contains("\"is\" with 'frozenset' literal"), + "expected public ast.Constant(frozenset()) identity warning, got {message:?}" + ); + } + + #[test] + fn ast_constant_tuple_compiles_as_load_const() { + let expr = ast::Expr::Tuple(ast::ExprTuple { + node_index: ast::AtomicNodeIndex::NONE, + range: TextRange::default(), + elts: Vec::new(), + ctx: ast::ExprContext::Load, + parenthesized: true, + runtime_elts: None, + }); + let code = compile_ast_constant_expr( + expr, + ConstantData::Tuple { + elements: vec![ConstantData::Integer { + value: BigInt::from(1u8), + }], + }, + ); + let ops: Vec<_> = code + .instructions + .iter() + .map(|unit| unit.op) + .filter(|op| !matches!(op, Instruction::Cache)) + .collect(); + + assert!( + ops.iter() + .any(|op| matches!(op, Instruction::LoadConst { .. })), + "public ast.Constant(tuple(...)) must use CPython Constant_kind LOAD_CONST path, got {ops:?}" + ); + assert!( + !ops.iter() + .any(|op| matches!(op, Instruction::BuildTuple { .. })), + "public ast.Constant(tuple(...)) must not compile as a tuple display, got {ops:?}" + ); + assert!( + code.constants.iter().any(|constant| matches!( + constant, + ConstantData::Tuple { elements } + if matches!( + elements.as_slice(), + [ConstantData::Integer { value }] if *value == BigInt::from(1u8) + ) + )), + "missing tuple constant in code constants" + ); + } + + #[test] + fn ast_constant_slice_bound_uses_cpython_constant_slice_path() { + let mut lower = frozenset_call_expr(); + set_ast_constant( + &mut lower, + ConstantData::Integer { + value: BigInt::from(1u8), + }, + ); + let expr = ast::Expr::Subscript(ast::ExprSubscript { + node_index: ast::AtomicNodeIndex::NONE, + range: TextRange::default(), + value: Box::new(ast::Expr::Name(ast::ExprName { + node_index: ast::AtomicNodeIndex::NONE, + range: TextRange::default(), + id: ast::name::Name::new_static("obj"), + ctx: ast::ExprContext::Load, + })), + slice: Box::new(ast::Expr::Slice(ast::ExprSlice { + node_index: ast::AtomicNodeIndex::NONE, + range: TextRange::default(), + lower: Some(Box::new(lower)), + upper: Some(Box::new(ast::Expr::NumberLiteral(ast::ExprNumberLiteral { + node_index: ast::AtomicNodeIndex::NONE, + range: TextRange::default(), + value: ast::Number::Int(ast::Int::ZERO), + }))), + step: None, + })), + ctx: ast::ExprContext::Load, + }); + let code = compile_eval_ast_with_options(expr, CompileOpts::default()); + let ops: Vec<_> = code + .instructions + .iter() + .map(|unit| unit.op) + .filter(|op| !matches!(op, Instruction::Cache)) + .collect(); + assert!( + !ops.iter().any(|op| matches!( + op, + Instruction::BinarySlice | Instruction::BuildSlice { .. } + )), + "public ast.Constant slice bound must follow CPython Constant_kind folded slice path, got {ops:?}" + ); + assert!( + code.constants.iter().any(|constant| matches!( + constant, + ConstantData::Slice { elements } + if matches!( + elements.as_ref(), + [ + ConstantData::Integer { value }, + ConstantData::Integer { .. }, + ConstantData::None, + ] if *value == BigInt::from(1u8) + ) + )), + "missing folded slice constant for public ast.Constant bound" + ); + } + + #[test] + fn match_pattern_errors_use_cpython_sequence_messages() { + let many_names = (0..256) + .map(|i| format!("a{i}")) + .collect::<Vec<_>>() + .join(", "); + let too_many = format!( + "\ +match x: + case [{many_names}, *rest]: + pass +" + ); + assert_eq!( + compile_exec_error_message(&too_many), + "too many expressions in star-unpacking sequence pattern" + ); + + assert_eq!( + compile_exec_error_message( + "\ +match x: + case [*a, *b]: + pass +" + ), + "multiple starred names in sequence pattern" + ); + + assert_eq!( + compile_exec_unchecked_error_message( + "\ +match x: + case {**_}: + pass +" + ), + "invalid syntax" + ); + } + + #[test] + fn match_mapping_duplicate_literal_keys_use_cpython_equality() { + for (source, expected) in [ + ( + "\ +match x: + case {1: a, True: b}: + pass +", + "mapping pattern checks duplicate key (True)", + ), + ( + "\ +match x: + case {1: a, 1.0: b}: + pass +", + "mapping pattern checks duplicate key (1.0)", + ), + ( + "\ +match x: + case {0.0: a, -0.0: b}: + pass +", + "mapping pattern checks duplicate key (-0.0)", + ), + ( + "\ +match x: + case {9007199254740992: a, 9007199254740992.0: b}: + pass +", + "mapping pattern checks duplicate key (9007199254740992.0)", + ), + ( + "\ +match x: + case {-9007199254740992: a, -9007199254740992.0: b}: + pass +", + "mapping pattern checks duplicate key (-9007199254740992.0)", + ), + ( + "\ +match x: + case {1 + 0j: a, 1: b}: + pass +", + "mapping pattern checks duplicate key (1)", + ), + ( + "\ +match x: + case {1: a, 1 + 0j: b}: + pass +", + "mapping pattern checks duplicate key ((1+0j))", + ), + ( + "\ +match x: + case {0j: a, -0.0: b}: + pass +", + "mapping pattern checks duplicate key (-0.0)", + ), + ] { + assert_eq!(compile_exec_error_message(source), expected); + } + } + + #[test] + fn match_mapping_accepts_folded_literal_keys_like_cpython() { + compile_exec( + "\ +def f(x): + match x: + case {-1: a, 1 + 0j: b}: + return a, b + case {9007199254740993: a, 9007199254740992.0: b}: + return a, b + case {-9007199254740993: a, -9007199254740992.0: b}: + return a, b + case {1 + 1j: a, 1: b}: + return a, b + case _: + return None +", + ); + } + + #[test] + fn match_mapping_accepts_public_ast_constant_keys_like_cpython() { + let source = "\ +match x: + case {'a': _, b'b': _, 2: _, 1.5: _, 1j: _, True: _, None: _}: + pass +"; + let source_file = SourceFileBuilder::new("source_path", source).finish(); + let parsed = ruff_python_parser::parse( + source_file.source_text(), + ruff_python_parser::Mode::Module.into(), + ) + .unwrap(); + let mut ast = parsed.into_syntax(); + let ast::Mod::Module(module) = &mut ast else { + unreachable!(); + }; + let ast::Stmt::Match(match_stmt) = &mut module.body[0] else { + unreachable!(); + }; + let ast::Pattern::MatchMapping(mapping) = &mut match_stmt.cases[0].pattern else { + unreachable!(); + }; + + for (key, value) in mapping.keys.iter_mut().zip([ + ast::ConstantValue::Str("a".into()), + ast::ConstantValue::Bytes(vec![b'b'].into_boxed_slice()), + ast::ConstantValue::Integer("2".into()), + ast::ConstantValue::Float(1.5), + ast::ConstantValue::Complex { + real: 0.0, + imag: 1.0, + }, + ast::ConstantValue::Boolean(true), + ast::ConstantValue::None, + ]) { + let range = key.range(); + *key = ast::Expr::Constant(ast::ExprConstant { + node_index: ast::AtomicNodeIndex::NONE, + range, + value, + kind: None, + invalid_type: None, + }); + } + + compile_top(ast, source_file, Mode::Exec, CompileOpts::default()).unwrap(); + } + + #[test] + fn match_literal_binop_folding_uses_cpython_complex_shape() { + assert!( + Compiler::try_fold_match_pattern_binop( + ast::Operator::Add, + &ConstantData::Integer { + value: BigInt::from(1) + }, + &ConstantData::Integer { + value: BigInt::from(2) + }, + ) + .is_none() + ); + assert!( + Compiler::try_fold_match_pattern_binop( + ast::Operator::Add, + &ConstantData::Float { value: 1.0 }, + &ConstantData::Float { value: 2.0 }, + ) + .is_none() + ); + assert!(matches!( + Compiler::try_fold_match_pattern_binop( + ast::Operator::Add, + &ConstantData::Integer { + value: BigInt::from(1) + }, + &ConstantData::Complex { + value: Complex::new(0.0, 2.0) + }, + ), + Some(ConstantData::Complex { value }) if value == Complex::new(1.0, 2.0) + )); + assert!(matches!( + Compiler::try_fold_match_pattern_binop( + ast::Operator::Sub, + &ConstantData::Float { value: 1.5 }, + &ConstantData::Complex { + value: Complex::new(0.0, 2.0) + }, + ), + Some(ConstantData::Complex { value }) if value == Complex::new(1.5, -2.0) + )); + } + + #[test] + fn match_literal_patterns_reject_unexpected_constants_like_cpython() { + assert!(Compiler::is_unexpected_match_literal_constant( + &ast::ExprEllipsisLiteral { + range: TextRange::default(), + node_index: ast::AtomicNodeIndex::NONE, + } + .into() + )); + } + + #[test] + fn unpack_ex_allows_large_after_count_like_cpython() { + let suffix = (0..256) + .map(|i| format!("a{i}")) + .collect::<Vec<_>>() + .join(", "); + let code = compile_exec(&format!( + "\ +def assignment(values): + *rest, {suffix} = values + return a255 + +def pattern(values): + match values: + case [*rest, {suffix}]: + return a255 + case _: + return None +" + )); + + let assignment = find_code(&code, "assignment").expect("missing assignment code"); + assert_eq!( + full_opargs_for(assignment, |op| matches!(op, Instruction::UnpackEx { .. })), + vec![256 << 8] + ); + + let pattern = find_code(&code, "pattern").expect("missing pattern code"); + assert_eq!( + full_opargs_for(pattern, |op| matches!(op, Instruction::UnpackEx { .. })), + vec![256 << 8] + ); + } + + #[test] + fn match_irrefutable_pattern_errors_use_cpython_messages() { + assert_eq!( + compile_exec_error_message( + "\ +match x: + case y | 1: + pass +" + ), + "name capture 'y' makes remaining patterns unreachable" + ); + + assert_eq!( + compile_exec_error_message( + "\ +match x: + case _ | 1: + pass +" + ), + "wildcard makes remaining patterns unreachable" + ); + } + #[test] fn empty_module_implicit_return_inherits_resume_location_like_cpython() { let code = compile_exec(""); - // CPython 3.14 codegen emits the implicit LOAD_CONST/RETURN_VALUE with + // codegen emits the implicit LOAD_CONST/RETURN_VALUE with // NO_LOCATION, then flowgraph.c::propagate_line_numbers() propagates // the module RESUME location, whose line is 0. assert_eq!(code.linetable.as_ref(), &[0xf2, 0x03, 0x01, 0x01, 0x01]); } + #[test] + fn module_docstring_load_uses_doc_location_like_cpython() { + let code = compile_exec( + "\ +\"doc\" +x = 1 +", + ); + + // codegen_body() emits the docstring LOAD_CONST at the + // string expression location, then emits STORE_NAME __doc__ with + // NO_LOCATION. + assert_eq!( + code.linetable.as_ref(), + &[ + 0xf0, 0x03, 0x01, 0x01, 0x01, 0xd9, 0x00, 0x05, 0xd8, 0x04, 0x05, 0x82, 0x01, + ], + ); + } + #[test] fn redundant_nop_location_copies_full_location_like_cpython() { let code = compile_exec( @@ -12305,9 +14711,10 @@ def f(x, y, z): let symbol_table = SymbolTable::scan_program(&ast, source_file.clone()) .map_err(|e| e.into_codegen_error(source_file.name().to_owned())) .unwrap(); - let mut compiler = Compiler::new(opts, source_file, "<module>"); + let mut compiler = + Compiler::new_with_syntax_warning_handler(opts, source_file, "<module>", None); compiler.compile_program(&ast, symbol_table).unwrap(); - let _table = compiler.pop_symbol_table(); + compiler.pop_symbol_table(); let stack_top = compiler.code_stack.pop().unwrap(); stack_top.debug_late_cfg_trace().unwrap() } @@ -12351,7 +14758,8 @@ def f(x, y, z): let is_async = function.is_async; let range = function.range(); - let mut compiler = Compiler::new(opts, source_file, "<module>"); + let mut compiler = + Compiler::new_with_syntax_warning_handler(opts, source_file, "<module>", None); compiler.future_annotations = symbol_table.future_annotations; compiler.symbol_table_stack.push(symbol_table); compiler.set_source_range(range); @@ -12359,7 +14767,7 @@ def f(x, y, z): compiler .current_code_info() .flags - .set(CodeFlags::COROUTINE, is_async); + .set(bytecode::CodeFlags::COROUTINE, is_async); let prev_ctx = compiler.ctx; compiler.ctx = CompileContext { @@ -12372,7 +14780,7 @@ def f(x, y, z): in_async_scope: is_async, }; compiler.set_qualname(); - let (_doc_str, body) = split_doc(body, compiler.opts); + let (_, body) = split_doc(body, &compiler.opts); let start_label = compiler.use_cpython_function_start_label(); let is_gen = is_async || compiler.current_symbol_table().is_generator; let stop_iteration_block = if is_gen { @@ -12412,7 +14820,7 @@ def f(x, y, z): compiler.set_no_location(); } - let _table = compiler.pop_symbol_table(); + compiler.pop_symbol_table(); let stack_top = compiler.code_stack.pop().unwrap(); stack_top.debug_late_cfg_trace().unwrap() } @@ -12454,118 +14862,6 @@ def f(arch): ); } - #[test] - fn debug_trace_make_dataclass_borrow_tail() { - let trace = compile_single_function_late_cfg_trace( - r#" -def f(module, cls, decorator, init, repr, eq, order, unsafe_hash, frozen, match_args, kw_only, slots, weakref_slot): - if module is None: - try: - module = sys._getframemodulename(1) or '__main__' - except AttributeError: - try: - module = sys._getframe(1).f_globals.get('__name__', '__main__') - except (AttributeError, ValueError): - pass - if module is not None: - cls.__module__ = module - cls = decorator(cls, init=init, repr=repr, eq=eq, order=order, - unsafe_hash=unsafe_hash, frozen=frozen, - match_args=match_args, kw_only=kw_only, slots=slots, - weakref_slot=weakref_slot) - return cls -"#, - "f", - ); - for (label, dump) in trace { - if label.starts_with("after_") { - eprintln!("=== {label} ===\n{dump}"); - } - } - } - - #[test] - fn debug_trace_protected_attr_subscript_tail() { - let trace = compile_single_function_late_cfg_trace( - r#" -def f(f, oldcls, newcls): - try: - idx = f.__code__.co_freevars.index("__class__") - except ValueError: - return False - closure = f.__closure__[idx] - if closure.cell_contents is oldcls: - closure.cell_contents = newcls - return True - return False -"#, - "f", - ); - for (label, dump) in trace { - if label.starts_with("after_") { - eprintln!("=== {label} ===\n{dump}"); - } - } - } - - #[test] - fn debug_trace_dtrace_tail() { - let trace = compile_single_function_late_cfg_trace( - r#" -def f(proc, unittest): - try: - with proc: - version, stderr = proc.communicate() - if proc.returncode: - raise Exception(version, stderr) - except OSError: - raise unittest.SkipTest("x") - match = re.search("pat", version) - if match is None: - raise unittest.SkipTest(f"Unable to parse readelf version: {version}") - return int(match.group(1)), int(match.group(2)) -"#, - "f", - ); - for (label, dump) in trace { - if label == "after_optimize_load_fast" - || label.contains("deoptimize_borrow_in_protected_conditional_tail") - { - eprintln!("=== {label} ===\n{dump}"); - } - } - } - - #[test] - fn debug_trace_colorize_tail() { - let trace = compile_single_function_late_cfg_trace( - r#" -def f(sys, os, file): - if sys.platform == "win32": - try: - import nt - if not nt._supports_virtual_terminal(): - return False - except (ImportError, AttributeError): - return False - - try: - return os.isatty(file.fileno()) - except OSError: - return hasattr(file, "isatty") and file.isatty() -"#, - "f", - ); - for (label, dump) in trace { - if label == "after_optimize_load_fast" - || label == "after_deoptimize_borrow_after_protected_import" - || label == "after_borrow_deopts" - { - eprintln!("=== {label} ===\n{dump}"); - } - } - } - #[test] fn for_try_except_break_keeps_cpython_if_layout() { let code = compile_exec( @@ -14297,6 +16593,21 @@ def g(): ); } + #[test] + fn starred_arg_annotation_unpack_uses_function_location_like_cpython() { + let code = compile_exec("def f(*args: *Ts): pass\n"); + let annotate = find_code(&code, "__annotate__").expect("missing annotation code"); + + // codegen_argannotation() visits `Ts` at the annotation + // expression location, then emits UNPACK_SEQUENCE at LOC(function). + assert_eq!( + annotate.linetable.as_ref(), + &[ + 0x80, 0x00, 0xd7, 0x00, 0x17, 0xd1, 0x00, 0x17, 0x8c, 0x62, 0xd3, 0x00, 0x17 + ], + ); + } + #[test] fn module_deferred_annotations_use_start_location_like_cpython() { let code = compile_exec( @@ -14308,7 +16619,7 @@ Y: str ); let annotate = find_code(&code, "__annotate__").expect("missing __annotate__ code"); - // CPython 3.14 compile.c::start_location() passes the first module + // compile.c::start_location() passes the first module // statement location into _PyCodegen_Module(), and // codegen_process_deferred_annotations() uses that loc for annotation // scope setup, BUILD_MAP, STORE_SUBSCR, and RETURN_VALUE. @@ -14359,6 +16670,106 @@ class C: ); } + #[test] + fn multiline_super_method_load_uses_expression_start_location_like_cpython() { + let code = compile_exec( + "\ +class C: + def f(self): + return super( + ).m() +", + ); + let f = find_code(&code, "f").expect("missing f code"); + let load_super_index = f + .instructions + .iter() + .position(|unit| match unit.op { + Instruction::LoadSuperAttr { namei } => namei + .get(OpArg::new(u32::from(u8::from(unit.arg)))) + .is_load_method(), + _ => false, + }) + .expect("missing LOAD_SUPER_METHOD"); + let (load_location, _) = f.locations[load_super_index]; + + assert_eq!( + load_location.line.get(), + 3, + "CPython maybe_optimize_method_call() emits LOAD_SUPER_METHOD at LOC(meth), before updating to the attribute start" + ); + } + + #[test] + fn multiline_non_ascii_attribute_uses_cpython_unicode_length() { + let code = compile_exec( + "\ +def f(obj): + return (obj + .é) +", + ); + let f = find_code(&code, "f").expect("missing f code"); + let load_attr_position = f + .instructions + .iter() + .zip(&f.locations) + .find_map(|(unit, (location, end_location))| { + matches!(unit.op, Instruction::LoadAttr { .. }).then_some(( + location.line.get(), + location.character_offset.get(), + end_location.line.get(), + end_location.character_offset.get(), + )) + }) + .expect("missing LOAD_ATTR"); + + assert_eq!( + load_attr_position, + (3, 11, 3, 12), + "CPython update_start_location_to_match_attr() subtracts PyUnicode_GET_LENGTH(attr), not the UTF-8 byte length; Rust SourceLocation exposes the resulting columns as one-based" + ); + } + + #[test] + fn two_arg_super_attr_in_class_body_is_optimized_like_cpython() { + let code = compile_exec( + "\ +class C: + x = super(C, self).attr +", + ); + let class_code = find_code(&code, "C").expect("missing class code"); + + assert!( + class_code + .instructions + .iter() + .any(|unit| matches!(unit.op, Instruction::LoadSuperAttr { .. })), + "CPython can_optimize_super_call() does not require function scope for two-argument super()" + ); + } + + #[test] + fn module_super_symbol_blocks_zero_arg_super_optimization_like_cpython() { + let code = compile_exec( + "\ +super +class C: + def f(self): + return super().attr +", + ); + let f = find_code(&code, "f").expect("missing f code"); + + assert!( + !f.instructions + .iter() + .any(|unit| matches!(unit.op, Instruction::LoadSuperAttr { .. })), + "CPython can_optimize_super_call() rejects any top-level symbol-table entry for super" + ); + } + #[test] fn lambda_return_uses_body_location_like_cpython() { let code = compile_exec( @@ -14389,6 +16800,89 @@ def outer(): ); } + #[test] + fn explicit_return_value_locations_match_cpython_codegen_return() { + let code = compile_exec( + "\ +def dynamic(x): + return x + +def constant(): + return 1 + +def bare(): + return +", + ); + + let cases = [ + ("dynamic", vec![(2, 5, 2, 13)]), + ("constant", vec![(5, 12, 5, 13)]), + ("bare", vec![(8, 5, 8, 11)]), + ]; + for (name, expected) in cases { + let function = find_code(&code, name).expect("missing function code"); + let return_positions: Vec<_> = function + .instructions + .iter() + .zip(&function.locations) + .filter_map(|(unit, (location, end_location))| { + matches!(unit.op, Instruction::ReturnValue).then_some(( + location.line.get(), + location.character_offset.get(), + end_location.line.get(), + end_location.character_offset.get(), + )) + }) + .collect(); + + assert_eq!( + return_positions, expected, + "CPython codegen_return() emits explicit return at loc for {name}" + ); + } + } + + #[test] + fn continue_jump_keeps_statement_location_like_cpython() { + let code = compile_exec( + "\ +def continues(xs): + for x in xs: + if x: + continue + use(x) +", + ); + + { + let (name, expected_position) = ("continues", (4, 13, 4, 21)); + let function = find_code(&code, name).expect("missing function code"); + let jump_positions: Vec<_> = function + .instructions + .iter() + .zip(&function.locations) + .filter_map(|(unit, (location, end_location))| { + matches!( + unit.op, + Instruction::JumpForward { .. } | Instruction::JumpBackward { .. } + ) + .then_some(( + location.line.get(), + location.character_offset.get(), + end_location.line.get(), + end_location.character_offset.get(), + )) + }) + .collect(); + + assert!( + jump_positions.contains(&expected_position), + "CPython codegen_continue() emits final jump at statement loc for {name}, got {jump_positions:?}" + ); + } + } + #[test] fn not_compare_uses_unary_location_like_cpython() { let code = compile_exec( @@ -14466,6 +16960,73 @@ def f(c): ); } + #[test] + fn typealias_value_scope_has_single_return_like_cpython() { + let code = compile_exec("type Alias = int\n"); + let alias = find_direct_child_code(&code, "Alias").expect("missing alias code"); + let return_count = alias + .instructions + .iter() + .filter(|unit| matches!(unit.op, Instruction::ReturnValue)) + .count(); + assert_eq!( + return_count, 1, + "CPython codegen_typealias_body() emits one RETURN_VALUE and assembles with addNone=0, got instructions={:?}", + alias.instructions + ); + } + + #[test] + fn generic_typealias_wrapper_return_uses_alias_location_like_cpython() { + let code = compile_exec("type A[T] = T\n"); + let type_params = + find_code(&code, "<generic parameters of A>").expect("missing type params code"); + + // codegen_typealias() assembles the generic-parameters + // wrapper with addNone=0 after codegen_typealias_body() leaves the type + // alias object on the stack. The final RETURN_VALUE keeps LOC(type alias). + assert_eq!( + type_params.linetable.as_ref(), + &[ + 0xf8, 0x80, 0x00, 0x80, 0x0d, 0x84, 0x71, 0x87, 0x0d, 0x81, 0x0d + ], + ); + } + + #[test] + fn type_param_bound_scope_has_single_return_like_cpython() { + let code = compile_exec("type Alias[T: int] = T\n"); + let type_params = + find_code(&code, "<generic parameters of Alias>").expect("missing type params code"); + let bound = find_direct_child_code(type_params, "T").expect("missing T bound code"); + let return_count = bound + .instructions + .iter() + .filter(|unit| matches!(unit.op, Instruction::ReturnValue)) + .count(); + assert_eq!( + return_count, 1, + "CPython codegen_type_param_bound_or_default() emits one explicit RETURN_VALUE before OptimizeAndAssemble(addNone=1), got instructions={:?}", + bound.instructions + ); + } + + #[test] + fn class_body_scope_has_single_return_like_cpython() { + let code = compile_exec("class C:\n pass\n"); + let class_code = find_code(&code, "C").expect("missing class code"); + let return_count = class_code + .instructions + .iter() + .filter(|unit| matches!(unit.op, Instruction::ReturnValue)) + .count(); + assert_eq!( + return_count, 1, + "CPython codegen_class_body() emits one explicit RETURN_VALUE before OptimizeAndAssemble(addNone=1), got instructions={:?}", + class_code.instructions + ); + } + #[test] fn generic_function_annotation_scope_uses_function_location_like_cpython() { let code = compile_exec("def f[T](x: int): ...\n"); @@ -14485,6 +17046,23 @@ def f(c): ); } + #[test] + fn decorated_generic_function_type_params_use_decorator_firstlineno_like_cpython() { + let code = compile_exec( + "\ +def deco(obj): return obj +@deco +def f[T](): pass +", + ); + let type_params = + find_code(&code, "<generic parameters of f>").expect("missing type params code"); + + // codegen_function() passes firstlineno, not LOC(s).lineno, to + // the generic-parameters scope. + assert_eq!(type_params.first_line_number.unwrap().get(), 2); + } + #[test] fn generic_class_type_params_store_uses_class_location_like_cpython() { let code = compile_exec( @@ -14576,6 +17154,160 @@ def f(): ); } + #[test] + fn try_except_else_finally_child_scopes_follow_cpython_symbol_order() { + let code = compile_exec( + "\ +def f(x): + try: + pass + except Exception: + y = 1 + def h(): + return y + else: + def e(): + return x + finally: + def z(): + return x +", + ); + let f = find_code(&code, "f").expect("missing function code"); + let h = find_code(f, "h").expect("missing handler function code"); + let e = find_code(f, "e").expect("missing else function code"); + let z = find_code(f, "z").expect("missing finally function code"); + + assert_eq!( + h.freevars + .iter() + .map(|name| name.as_str()) + .collect::<Vec<_>>(), + vec!["y"], + "handler child scope should consume the handler symbol table" + ); + assert_eq!( + e.freevars + .iter() + .map(|name| name.as_str()) + .collect::<Vec<_>>(), + vec!["x"], + "else child scope should be consumed before handler scopes, matching CPython codegen_try_except()" + ); + assert_eq!( + z.freevars + .iter() + .map(|name| name.as_str()) + .collect::<Vec<_>>(), + vec!["x"], + "finally child scope should remain after body/else/handler scopes" + ); + } + + #[test] + fn try_star_child_scopes_follow_codegen_order_like_cpython() { + let code = compile_exec( + "\ +def f(x): + try: + pass + except* Exception: + y = 1 + def h(): + return y + else: + def e(): + return x +", + ); + let f = find_code(&code, "f").expect("missing function code"); + let h = find_code(f, "h").expect("missing except* handler function code"); + let e = find_code(f, "e").expect("missing else function code"); + + assert_eq!( + h.freevars + .iter() + .map(|name| name.as_str()) + .collect::<Vec<_>>(), + vec!["y"], + "except* handler child scope should consume handler symbol table before else" + ); + assert_eq!( + e.freevars + .iter() + .map(|name| name.as_str()) + .collect::<Vec<_>>(), + vec!["x"], + "except* else child scope should be consumed after handler scopes, matching CPython codegen_try_star_except()" + ); + } + + #[test] + fn function_default_and_decorator_child_scopes_follow_cpython_symbol_order() { + fn direct_child_codes<'a>(code: &'a CodeObject, name: &str) -> Vec<&'a CodeObject> { + code.constants + .iter() + .filter_map(|constant| { + if let ConstantData::Code { code } = constant + && code.obj_name == name + { + Some(code.as_ref()) + } else { + None + } + }) + .collect() + } + + let code = compile_exec( + "\ +def outer(x, deco): + @(lambda f: deco(f)) + def inner(a=(lambda: x)()): + return a +", + ); + let outer = find_code(&code, "outer").expect("missing outer function code"); + let lambdas = direct_child_codes(outer, "<lambda>"); + + assert_eq!(lambdas.len(), 2); + assert_eq!( + lambdas[0] + .freevars + .iter() + .map(|name| name.as_str()) + .collect::<Vec<_>>(), + vec!["deco"], + "decorator lambda is emitted first by codegen_function()" + ); + assert_eq!( + lambdas[1] + .freevars + .iter() + .map(|name| name.as_str()) + .collect::<Vec<_>>(), + vec!["x"], + "default lambda should still consume the default symbol table" + ); + } + + #[test] + fn decorated_generic_class_type_params_use_decorator_firstlineno_like_cpython() { + let code = compile_exec( + "\ +def deco(obj): return obj +@deco +class C[T]: pass +", + ); + let type_params = + find_code(&code, "<generic parameters of C>").expect("missing type params code"); + + // codegen_class() also enters the generic-parameters scope with + // firstlineno, which is the first decorator line when decorators exist. + assert_eq!(type_params.first_line_number.unwrap().get(), 2); + } + #[test] fn class_deferred_annotations_use_class_body_location_like_cpython() { let code = compile_exec( @@ -14649,6 +17381,45 @@ g = lambda i: {**i} ); } + #[test] + fn dict_unpacking_large_regular_run_uses_subdict_chunks_like_cpython() { + let pairs = (0..17) + .map(|i| format!("{i}: {i}")) + .collect::<Vec<_>>() + .join(", "); + let source = format!("def f(x):\n return {{{pairs}, **x}}\n"); + let code = compile_exec(&source); + let f = find_code(&code, "f").expect("missing f code"); + let first_dict_update = f + .instructions + .iter() + .position(|unit| matches!(unit.op, Instruction::DictUpdate { .. })) + .expect("missing DICT_UPDATE"); + let prefix = &f.instructions[..first_dict_update]; + let build_map_args: Vec<_> = prefix + .iter() + .filter_map(|unit| { + matches!(unit.op, Instruction::BuildMap { .. }).then_some(u8::from(unit.arg)) + }) + .collect(); + let map_adds = prefix + .iter() + .filter(|unit| matches!(unit.op, Instruction::MapAdd { .. })) + .count(); + + assert_eq!( + build_map_args, + vec![0], + "CPython codegen_dict() routes a 17-pair run before ** through codegen_subdict(), got instructions={:?}", + f.instructions + ); + assert_eq!( + map_adds, 17, + "CPython codegen_subdict() uses MAP_ADD for all 17 pairs before **, got instructions={:?}", + f.instructions + ); + } + #[test] fn class_function_like_scopes_set_method_flag_like_cpython() { let code = compile_exec_with_options( @@ -14677,13 +17448,13 @@ def f(): for code in [method, async_method, lambda, genexpr] { assert!( - code.flags.contains(CodeFlags::METHOD), + code.flags.contains(bytecode::CodeFlags::METHOD), "class-scope function-like code should carry CO_METHOD like CPython 3.14, got {:?}", code.flags ); } assert!( - !module_function.flags.contains(CodeFlags::METHOD), + !module_function.flags.contains(bytecode::CodeFlags::METHOD), "module-scope function must not carry CO_METHOD" ); } @@ -14702,15 +17473,47 @@ class C: let class_code = find_code(&code, "C").expect("missing class code"); let lambda = find_code(class_code, "<lambda>").expect("missing lambda code"); assert!( - lambda.flags.contains(CodeFlags::NESTED), + lambda.flags.contains(bytecode::CodeFlags::NESTED), "lambda under inlined class comprehension should stay nested" ); assert!( - !lambda.flags.contains(CodeFlags::METHOD), + !lambda.flags.contains(bytecode::CodeFlags::METHOD), "CPython creates this lambda while the current symtable block is the comprehension, not the class" ); } + #[test] + fn class_inlined_comprehension_pushes_only_bound_locals_like_cpython() { + let code = compile_exec( + "\ +class C: + x = 1 + items = [x for i in range(3)] +", + ); + let class_code = find_code(&code, "C").expect("missing class code"); + let cleared_names = class_code + .instructions + .iter() + .filter_map(|unit| match unit.op { + Instruction::LoadFastAndClear { var_num } => { + let idx = var_num.get(OpArg::new(u32::from(u8::from(unit.arg)))); + Some(class_code.varnames[usize::from(idx)].as_str()) + } + _ => None, + }) + .collect::<Vec<_>>(); + + assert!( + cleared_names.contains(&"i"), + "the comprehension iteration variable should be isolated, got {cleared_names:?}" + ); + assert!( + !cleared_names.contains(&"x"), + "CPython applies the class-block special case while tweaking scopes, but codegen_push_inlined_comprehension_locals() runs after u_in_inlined_comp is set and only clears DEF_LOCAL names; got {cleared_names:?}" + ); + } + #[test] fn genexpr_implicit_iterator_is_not_posonly_like_cpython() { let code = compile_exec("x = (i for i in ())"); @@ -14723,6 +17526,29 @@ class C: ); } + #[test] + fn posonly_function_argcount_metadata_matches_cpython_assemble_split() { + let code = compile_exec("def f(a, /, b):\n pass\n"); + let func = find_code(&code, "f").expect("missing function code"); + + assert_eq!( + func.arg_count, 2, + "CPython assemble.c exposes co_argcount as u_posonlyargcount + u_argcount" + ); + assert_eq!(func.posonlyarg_count, 1); + assert_eq!(func.varnames.as_ref(), &["a".to_owned(), "b".to_owned()]); + assert_eq!( + func.localspluskinds[0] & (CO_FAST_ARG_POS | CO_FAST_ARG_KW), + CO_FAST_ARG_POS, + "CPython compute_localsplus_info marks only u_posonlyargcount slots as positional-only" + ); + assert_eq!( + func.localspluskinds[1] & (CO_FAST_ARG_POS | CO_FAST_ARG_KW), + CO_FAST_ARG_POS | CO_FAST_ARG_KW, + "CPython compute_localsplus_info marks u_argcount slots after posonly as positional-or-keyword" + ); + } + #[test] fn async_generator_uses_cpython_async_generator_flag() { let code = compile_exec_with_options( @@ -14742,17 +17568,37 @@ async def ag(): let coroutine = find_code(&code, "c").expect("missing coroutine code"); let async_generator = find_code(&code, "ag").expect("missing async generator code"); - assert!(generator.flags.contains(CodeFlags::GENERATOR)); - assert!(!generator.flags.contains(CodeFlags::COROUTINE)); - assert!(!generator.flags.contains(CodeFlags::ASYNC_GENERATOR)); + assert!(generator.flags.contains(bytecode::CodeFlags::GENERATOR)); + assert!(!generator.flags.contains(bytecode::CodeFlags::COROUTINE)); + assert!( + !generator + .flags + .contains(bytecode::CodeFlags::ASYNC_GENERATOR) + ); - assert!(coroutine.flags.contains(CodeFlags::COROUTINE)); - assert!(!coroutine.flags.contains(CodeFlags::GENERATOR)); - assert!(!coroutine.flags.contains(CodeFlags::ASYNC_GENERATOR)); + assert!(coroutine.flags.contains(bytecode::CodeFlags::COROUTINE)); + assert!(!coroutine.flags.contains(bytecode::CodeFlags::GENERATOR)); + assert!( + !coroutine + .flags + .contains(bytecode::CodeFlags::ASYNC_GENERATOR) + ); - assert!(async_generator.flags.contains(CodeFlags::ASYNC_GENERATOR)); - assert!(!async_generator.flags.contains(CodeFlags::GENERATOR)); - assert!(!async_generator.flags.contains(CodeFlags::COROUTINE)); + assert!( + async_generator + .flags + .contains(bytecode::CodeFlags::ASYNC_GENERATOR) + ); + assert!( + !async_generator + .flags + .contains(bytecode::CodeFlags::GENERATOR) + ); + assert!( + !async_generator + .flags + .contains(bytecode::CodeFlags::COROUTINE) + ); } #[test] @@ -15089,6 +17935,27 @@ def f(a, b, c): .filter(|unit| !matches!(unit.op, Instruction::Cache)) } + fn full_opargs_for( + code: &CodeObject, + mut predicate: impl FnMut(Instruction) -> bool, + ) -> Vec<u32> { + let mut extended = 0u32; + let mut args = Vec::new(); + for unit in non_cache_instructions(code) { + let byte = u32::from(u8::from(unit.arg)); + if matches!(unit.op, Instruction::ExtendedArg) { + extended = (extended << 8) | byte; + continue; + } + let oparg = (extended << 8) | byte; + extended = 0; + if predicate(unit.op) { + args.push(oparg); + } + } + args + } + fn varname_index(code: &CodeObject, name: &str) -> usize { code.varnames .iter() @@ -15288,6 +18155,48 @@ def f(): ); } + #[test] + fn match_or_conflicting_bind_error_uses_or_pattern_location_like_cpython() { + let error = compile_exec_error( + "\ +def f(x): + match x: + case ( + a + | b + ): + pass +", + ); + let location = error.location.expect("missing error location"); + assert_eq!( + location.line.get(), + 4, + "CPython codegen_pattern_or() reports alternative binding mismatches at LOC(p), not LOC(alt)" + ); + } + + #[test] + fn match_or_duplicate_store_error_uses_or_pattern_location_like_cpython() { + let error = compile_exec_error( + "\ +def f(value): + match value: + case [ + x, + (x | x), + ]: + pass +", + ); + let location = error.location.expect("missing error location"); + assert_eq!( + location.line.get(), + 5, + "CPython codegen_pattern_or() reports merge-time duplicate stores at LOC(p)" + ); + } + #[test] fn match_success_jump_uses_no_location_like_cpython() { let code = compile_exec( @@ -15313,6 +18222,55 @@ def f(self): ); } + #[test] + fn match_default_simple_guard_jump_uses_guard_location_like_cpython() { + let code = compile_exec( + "\ +def f(x, y): + match x: + case 0: + return 1 + case _ if y: + return 2 + return 3 +", + ); + let f = find_code(&code, "f").expect("missing f code"); + let guard_jump_location = f + .instructions + .iter() + .enumerate() + .find_map(|(idx, unit)| { + let (Instruction::LoadFast { var_num } | Instruction::LoadFastBorrow { var_num }) = + unit.op + else { + return None; + }; + let arg = OpArg::new(u32::from(u8::from(unit.arg))); + if f.varnames[usize::from(var_num.get(arg))] != "y" { + return None; + } + f.instructions + .iter() + .zip(&f.locations) + .skip(idx + 1) + .take(8) + .find_map(|(unit, (location, _))| { + matches!(unit.op, Instruction::PopJumpIfFalse { .. }).then_some(*location) + }) + }) + .expect("missing default guard jump"); + + assert_eq!( + ( + guard_jump_location.line.get(), + guard_jump_location.character_offset.get() + ), + (5, 19), + "CPython codegen_jump_if() receives LOC(pattern), but the simple guard fallback emits TO_BOOL/jump at LOC(guard)" + ); + } + #[test] fn match_mapping_keys_scaffolding_uses_mapping_location_like_cpython() { let code = compile_exec( @@ -15339,6 +18297,57 @@ def f(self): ); } + #[test] + fn match_mapping_rest_cleanup_uses_mapping_location_like_cpython() { + let code = compile_exec( + "\ +def f(x): + match x: + case { + 0: _, + **rest, + }: + return rest +", + ); + let f = find_code(&code, "f").expect("missing f code"); + let rest_cleanup_start = f + .instructions + .iter() + .position(|unit| matches!(unit.op, Instruction::BuildMap { .. })) + .expect("missing BUILD_MAP"); + for expected in [ + "BUILD_MAP", + "DICT_UPDATE", + "DELETE_SUBSCR", + "rest cleanup COPY", + "rest cleanup SWAP", + ] { + let location = f + .instructions + .iter() + .zip(&f.locations) + .skip(rest_cleanup_start) + .find_map(|(unit, (location, _))| { + let found = matches!( + (expected, unit.op), + ("BUILD_MAP", Instruction::BuildMap { .. }) + | ("DICT_UPDATE", Instruction::DictUpdate { .. }) + | ("DELETE_SUBSCR", Instruction::DeleteSubscr) + | ("rest cleanup COPY", Instruction::Copy { .. }) + | ("rest cleanup SWAP", Instruction::Swap { .. }) + ); + found.then_some(*location) + }) + .unwrap_or_else(|| panic!("missing {expected}")); + assert_eq!( + location.line.get(), + 3, + "CPython codegen_pattern_mapping() emits {expected} with LOC(p)" + ); + } + } + #[test] fn match_class_scaffolding_uses_class_pattern_location_like_cpython() { let code = compile_exec( @@ -15362,6 +18371,40 @@ def f(x): ); } + #[test] + fn match_class_wildcard_pop_uses_class_pattern_location_like_cpython() { + let code = compile_exec( + "\ +def f(x): + match x: + case bool( + _ + ): + return True +", + ); + let f = find_code(&code, "f").expect("missing f code"); + let unpack_index = f + .instructions + .iter() + .position(|unit| matches!(unit.op, Instruction::UnpackSequence { .. })) + .expect("missing class pattern UNPACK_SEQUENCE"); + let wildcard_pop_location = f + .instructions + .iter() + .zip(&f.locations) + .skip(unpack_index + 1) + .find_map(|(unit, (location, _))| { + matches!(unit.op, Instruction::PopTop).then_some(*location) + }) + .expect("missing wildcard POP_TOP"); + assert_eq!( + wildcard_pop_location.line.get(), + 3, + "CPython codegen_pattern_class() emits wildcard POP_TOP with LOC(p)" + ); + } + #[test] fn while_try_body_layout_keeps_false_jump_to_anchor() { let code = compile_exec( @@ -16112,7 +19155,7 @@ def boolop(fields): let boolop = find_code(&code, "boolop").expect("missing boolop code"); let boolop_gen = find_code(boolop, "<genexpr>").expect("missing boolop genexpr code"); - // CPython 3.14 codegen_sync_comprehension_generator() emits the + // codegen_sync_comprehension_generator() emits the // comprehension guard jump to if_cleanup, then emits the if_cleanup // backedge with elt_loc. flowgraph.c::jump_thread() copies that target // jump location to the threaded POP_JUMP/NOT_TAKEN cleanup path. @@ -16147,7 +19190,7 @@ def f(self, node): ); let f = find_code(&code, "f").expect("missing f code"); - // CPython 3.14 codegen_try_finally() emits the exception path + // codegen_try_finally() emits the exception path // SETUP_CLEANUP/PUSH_EXC_INFO and POP_EXCEPT_AND_RERAISE with // NO_LOCATION; flowgraph line propagation then gives only the // finalbody's direct RERAISE the finalbody location. @@ -16161,6 +19204,132 @@ def f(self, node): ); } + #[test] + fn return_debug_in_finally_uses_cpython_preprocessed_constant_order() { + let code = compile_exec( + "\ +def f(close): + try: + return __debug__ + finally: + close() +", + ); + let f = find_code(&code, "f").expect("missing f code"); + let call_pos = f + .instructions + .iter() + .position(|unit| matches!(unit.op, Instruction::Call { .. })) + .expect("missing finally-body call"); + let debug_load_pos = f + .instructions + .iter() + .position(|unit| { + let Instruction::LoadConst { consti } = unit.op else { + return false; + }; + let constant = &f.constants[consti.get(OpArg::new(u32::from(u8::from(unit.arg))))]; + matches!(constant, ConstantData::Boolean { value: true }) + }) + .expect("missing __debug__ constant load"); + + assert!( + call_pos < debug_load_pos, + "CPython ast_preprocess.c folds __debug__ to Constant before codegen_return(), so the return constant is loaded after finally cleanup; ops={:?}", + f.instructions + .iter() + .map(|unit| unit.op) + .collect::<Vec<_>>() + ); + } + + #[test] + fn debug_statement_is_preprocessed_constant_like_cpython() { + for code in [ + compile_exec("__debug__\n"), + compile_exec_optimized("__debug__\n"), + ] { + let ops = non_cache_instructions(&code) + .map(|unit| unit.op) + .collect::<Vec<_>>(); + assert!( + !ops.iter().any(|op| matches!(op, Instruction::PopTop)), + "CPython ast_preprocess.c folds __debug__ to Constant before codegen_stmt_expr(), so it must not compile as LOAD_CONST/POP_TOP; ops={ops:?}" + ); + } + } + + #[test] + fn statement_expr_pop_top_uses_no_location_like_cpython() { + let infos = compile_module_instruction_infos("x + 1\n", Mode::Exec); + let pop = infos + .iter() + .find(|info| matches!(info.instr.real(), Some(Instruction::PopTop))) + .expect("missing expression-statement POP_TOP"); + + assert_eq!( + pop.lineno_override, + Some(ir::NO_LOCATION_OVERRIDE), + "CPython codegen_stmt_expr() emits artificial expression-statement POP_TOP at NO_LOCATION" + ); + } + + #[test] + fn interactive_statement_expr_pop_top_uses_no_location_like_cpython() { + let infos = compile_module_instruction_infos("x + 1\n", Mode::Single); + let print = infos + .iter() + .position(|info| { + matches!( + info.instr.real(), + Some(Instruction::CallIntrinsic1 { func }) + if func.get(info.arg) == bytecode::IntrinsicFunction1::Print + ) + }) + .expect("missing interactive PRINT intrinsic"); + let pop = infos + .get(print + 1) + .expect("missing POP_TOP after interactive PRINT"); + + assert!( + matches!(pop.instr.real(), Some(Instruction::PopTop)), + "CPython codegen_stmt_expr() emits POP_TOP immediately after INTRINSIC_PRINT; got {pop:?}" + ); + assert_eq!( + pop.lineno_override, + Some(ir::NO_LOCATION_OVERRIDE), + "CPython codegen_stmt_expr() emits interactive PRINT cleanup POP_TOP at NO_LOCATION" + ); + } + + #[test] + fn import_star_pop_top_uses_no_location_like_cpython() { + let infos = compile_module_instruction_infos("from m import *\n", Mode::Exec); + let import_star = infos + .iter() + .position(|info| { + matches!( + info.instr.real(), + Some(Instruction::CallIntrinsic1 { func }) + if func.get(info.arg) == bytecode::IntrinsicFunction1::ImportStar + ) + }) + .expect("missing IMPORT_STAR intrinsic"); + let pop = infos + .get(import_star + 1) + .expect("missing POP_TOP after IMPORT_STAR"); + + assert!( + matches!(pop.instr.real(), Some(Instruction::PopTop)), + "CPython codegen_from_import() emits POP_TOP immediately after INTRINSIC_IMPORT_STAR; got {pop:?}" + ); + assert_eq!( + pop.lineno_override, + Some(ir::NO_LOCATION_OVERRIDE), + "CPython codegen_from_import() emits import-star cleanup POP_TOP at NO_LOCATION" + ); + } + #[test] fn adjacent_no_location_entries_merge_like_cpython() { let code = compile_exec( @@ -16272,9 +19441,9 @@ def prefixed(x): "CPython represents f'{{x=}}' debug text as a literal at the expression/debug-text location" ); assert_eq!( - string_load_position(prefixed, "a x="), - (5, 14, 5, 19), - "CPython extends a pending f-string literal through the debug text range" + string_load_position(prefixed, "x="), + (5, 17, 5, 19), + "CPython keeps debug text as a separate JoinedStr Constant instead of merging it with the preceding literal" ); } @@ -17015,6 +20184,98 @@ def f(cls, args, kwargs): } } + #[test] + fn method_call_at_stack_guideline_uses_plain_load_attr_like_cpython() { + let params = (0..STACK_USE_GUIDELINE) + .map(|i| format!("a{i}")) + .collect::<Vec<_>>() + .join(", "); + let code = compile_exec(&format!( + "def f(obj, {params}):\n return obj.m({params})\n" + )); + let f = find_code(&code, "f").expect("missing function code"); + let ops: Vec<_> = f + .instructions + .iter() + .map(|unit| unit.op) + .filter(|op| !matches!(op, Instruction::Cache)) + .collect(); + + let plain_load_attr = f.instructions.iter().any(|unit| { + if let Instruction::LoadAttr { namei } = unit.op { + !namei + .get(OpArg::new(u32::from(u8::from(unit.arg)))) + .is_method() + } else { + false + } + }); + let direct_call_30 = f.instructions.iter().any(|unit| match unit.op { + Instruction::Call { argc } => { + argc.get(OpArg::new(u32::from(u8::from(unit.arg)))) == STACK_USE_GUIDELINE + } + _ => false, + }); + + assert!( + plain_load_attr && direct_call_30, + "CPython maybe_optimize_method_call rejects arg count at the guideline, got ops={ops:?}" + ); + assert!( + !ops.iter() + .any(|op| matches!(op, Instruction::CallFunctionEx)), + "exactly guideline-sized method call should stay direct after LOAD_ATTR fallback, got ops={ops:?}" + ); + } + + #[test] + fn method_call_many_keywords_stays_load_method_call_kw_like_cpython() { + let params = (0..16) + .map(|i| format!("a{i}")) + .collect::<Vec<_>>() + .join(", "); + let keywords = (0..16) + .map(|i| format!("k{i}=a{i}")) + .collect::<Vec<_>>() + .join(", "); + let code = compile_exec(&format!( + "def f(obj, {params}):\n return obj.m({keywords})\n" + )); + let f = find_code(&code, "f").expect("missing function code"); + let ops: Vec<_> = f + .instructions + .iter() + .map(|unit| unit.op) + .filter(|op| !matches!(op, Instruction::Cache)) + .collect(); + + let method_load_attr = f.instructions.iter().any(|unit| { + if let Instruction::LoadAttr { namei } = unit.op { + namei + .get(OpArg::new(u32::from(u8::from(unit.arg)))) + .is_method() + } else { + false + } + }); + let call_kw_16 = f.instructions.iter().any(|unit| match unit.op { + Instruction::CallKw { argc } => { + argc.get(OpArg::new(u32::from(u8::from(unit.arg)))) == 16 + } + _ => false, + }); + + assert!( + method_load_attr && call_kw_16, + "CPython maybe_optimize_method_call emits LOAD_METHOD/CALL_KW under its own stack threshold, got ops={ops:?}" + ); + assert!( + !ops.iter() + .any(|op| matches!(op, Instruction::CallFunctionEx)), + "method-call keyword path should not reuse codegen_call_helper_impl's lower kw threshold, got ops={ops:?}" + ); + } + #[test] fn large_plain_call_uses_direct_call_until_stack_guideline() { let code = compile_exec( @@ -17288,7 +20549,7 @@ def set_f(xs): ); assert!( !has_common_constant(list_f, bytecode::CommonConstant::BuiltinList), - "CPython 3.14.2 does not optimize list(genexpr)" + "CPython 3.14.5 does not optimize list(genexpr)" ); let set_f = find_code(&code, "set_f").expect("missing set_f code"); @@ -17301,7 +20562,7 @@ def set_f(xs): ); assert!( !has_common_constant(set_f, bytecode::CommonConstant::BuiltinSet), - "CPython 3.14.2 does not optimize set(genexpr)" + "CPython 3.14.5 does not optimize set(genexpr)" ); } @@ -17716,6 +20977,40 @@ def aug_const(x, y): ); } + #[test] + fn augassign_attribute_copy_uses_target_location_like_cpython() { + let code = compile_exec( + "\ +def f(obj, value): + obj.attr += value +", + ); + let f = find_code(&code, "f").expect("missing f code"); + let copy_position = f + .instructions + .iter() + .zip(&f.locations) + .find_map(|(unit, (location, end_location))| { + let Instruction::Copy { i } = unit.op else { + return None; + }; + let arg = OpArg::new(u32::from(u8::from(unit.arg))); + (i.get(arg) == 1).then_some(( + location.line.get(), + location.character_offset.get(), + end_location.line.get(), + end_location.character_offset.get(), + )) + }) + .expect("missing augmented attribute COPY"); + + assert_eq!( + copy_position, + (2, 5, 2, 13), + "CPython codegen_augassign() emits COPY 1 at LOC(target) before updating to attr location" + ); + } + #[test] fn loop_return_reorders_backedge_before_exit_cleanup() { let code = compile_exec( @@ -18610,6 +21905,82 @@ t = t\"Value: {value=}\" ); } + #[test] + fn tstring_ops_restore_template_and_interpolation_locations_like_cpython() { + let code = compile_exec( + "\ +def f(x): + return t\"{x}\" +", + ); + let f = find_code(&code, "f").expect("missing f code"); + let mut build_interpolation = None; + let mut build_tuple = None; + let mut build_template = None; + for (unit, (location, end_location)) in f.instructions.iter().zip(&f.locations) { + let range = ( + location.line.get(), + location.character_offset.get(), + end_location.line.get(), + end_location.character_offset.get(), + ); + match unit.op { + Instruction::BuildInterpolation { .. } => build_interpolation = Some(range), + Instruction::BuildTuple { .. } => build_tuple = Some(range), + Instruction::BuildTemplate => build_template = Some(range), + _ => {} + } + } + + assert_eq!( + build_interpolation, + Some((2, 14, 2, 17)), + "CPython codegen_interpolation() restores LOC(Interpolation) after visiting the value; this direct codegen path uses the parser's Interpolation range" + ); + assert_eq!( + build_tuple, + Some((2, 12, 2, 18)), + "CPython codegen_template_str() emits the interpolations tuple at LOC(TemplateStr); this direct codegen path uses the parser's TemplateStr range" + ); + assert_eq!( + build_template, + Some((2, 12, 2, 18)), + "CPython codegen_template_str() emits BUILD_TEMPLATE at LOC(TemplateStr); this direct codegen path uses the parser's TemplateStr range" + ); + } + + #[test] + fn regular_call_push_null_uses_callee_location_like_cpython() { + let code = compile_exec( + "\ +def f(g, x): + return ( + g + )(x) +", + ); + let f = find_code(&code, "f").expect("missing f code"); + let push_null = f + .instructions + .iter() + .zip(&f.locations) + .find_map(|(unit, (location, end_location))| { + matches!(unit.op, Instruction::PushNull).then_some(( + location.line.get(), + location.character_offset.get(), + end_location.line.get(), + end_location.character_offset.get(), + )) + }) + .expect("missing PUSH_NULL"); + + assert_eq!( + push_null, + (3, 9, 3, 10), + "CPython codegen_call() resets loc to LOC(func) before emitting PUSH_NULL; this direct codegen path uses the parser's callee range" + ); + } + #[test] fn tstring_literal_preserves_surrogate_wtf8() { let code = compile_exec("t = t\"\\ud800\""); @@ -19694,63 +23065,6 @@ def f(self): ); } - #[test] - fn debug_trace_match_sequence_star_wildcard_layout() { - let trace = compile_single_function_late_cfg_trace( - "\ -def f(w): - match w: - case [x, *_, y]: - z = 0 - return x, y, z -", - "f", - ); - for (stage, dump) in trace { - eprintln!("=== {stage} ===\n{dump}"); - } - } - - #[test] - fn debug_trace_loop_break_bool_chain_layout() { - let trace = compile_single_function_late_cfg_trace( - "\ -def f(filters, text, category, module, lineno, defaultaction): - for item in filters: - action, msg, cat, mod, ln = item - if ((msg is None or msg.match(text)) and - issubclass(category, cat) and - (mod is None or mod.match(module)) and - (ln == 0 or lineno == ln)): - break - else: - action = defaultaction - return action -", - "f", - ); - for (stage, dump) in trace { - eprintln!("=== {stage} ===\n{dump}"); - } - } - - #[test] - fn debug_trace_loop_conditional_body_layout() { - let trace = compile_single_function_late_cfg_trace( - "\ -def f(new, old): - for replace in ['__module__', '__name__', '__qualname__', '__doc__']: - if hasattr(old, replace): - setattr(new, replace, getattr(old, replace)) - return new -", - "f", - ); - for (stage, dump) in trace { - eprintln!("=== {stage} ===\n{dump}"); - } - } - #[test] fn if_false_body_blocks_following_load_fast_borrow() { let code = compile_exec( @@ -19884,58 +23198,6 @@ def f(self): ); } - #[test] - fn debug_trace_utf7_min_encode_layout() { - let trace = compile_single_function_late_cfg_trace( - "\ -def f(s, size, encodeSetO, encodeWhiteSpace): - inShift = True - base64bits = 0 - out = [] - for i, ch in enumerate(s): - if base64bits == 0: - if i + 1 < size: - ch2 = s[i + 1] - if E(ch2, encodeSetO, encodeWhiteSpace): - if B(ch2) or ch2 == '-': - out.append(b'-') - inShift = False - else: - out.append(b'-') - inShift = False - return out -", - "f", - ); - for (stage, dump) in trace { - eprintln!("=== {stage} ===\n{dump}"); - } - } - - #[test] - fn debug_trace_with_loop_break_bool_chain_layout() { - let trace = compile_single_function_late_cfg_trace( - "\ -def f(filters, text, category, module, lineno, defaultaction, _wm): - with _wm._lock: - for item in filters: - action, msg, cat, mod, ln = item - if ((msg is None or msg.match(text)) and - issubclass(category, cat) and - (mod is None or mod.match(module)) and - (ln == 0 or lineno == ln)): - break - else: - action = defaultaction - return action -", - "f", - ); - for (stage, dump) in trace { - eprintln!("=== {stage} ===\n{dump}"); - } - } - #[test] fn try_except_else_with_finally_keeps_with_handler_before_outer_except() { let code = compile_exec( @@ -20898,6 +24160,63 @@ def f(lines, close): ); } + #[test] + fn try_finally_return_inside_with_pops_unwound_fblocks_for_finalbody() { + let code = compile_exec( + "\ +def f(cm): + try: + with cm: + return 1 + finally: + return 2 +", + ); + let f = find_code(&code, "f").expect("missing f code"); + assert!( + f.instructions + .iter() + .any(|unit| matches!(unit.op, Instruction::ReturnValue)), + "return inside with/try-finally should compile without leaving an invalid CFG" + ); + } + + #[test] + fn except_star_return_after_with_unwind_uses_no_location_like_cpython() { + let err = compile_exec_error( + "\ +def f(cm): + try: + pass + except* Exception: + with cm: + return 1 +", + ); + assert!(matches!( + err.error, + CodegenErrorType::BreakContinueReturnInExceptStar + )); + assert!( + err.location.is_none(), + "CPython codegen_unwind_fblock(WITH) sets *ploc = NO_LOCATION before the except* error" + ); + } + + #[test] + fn async_generator_return_value_error_message_matches_cpython() { + assert_eq!( + compile_exec_error_message( + "\ +async def f(): + yield 1 + return 2 +" + ), + "'return' with value in async generator" + ); + } + #[test] fn try_except_finally_handler_normal_exit_keeps_nointerrupt_jump() { let code = compile_exec( @@ -23981,6 +27300,66 @@ class C: ); } + #[test] + fn optimize_two_strips_docstrings_during_preprocess() { + let code = compile_exec_with_options( + "\ +\"module doc\" + +def f(): + \"function doc\" + return 1 + +class C: + \"class doc\" + x = 1 +", + CompileOpts { + optimize: 2, + ..CompileOpts::default() + }, + ); + + assert!( + !code.instructions.iter().any(|unit| { + matches!( + unit.op, + Instruction::StoreName { namei } + if code.names + [namei.get(OpArg::new(u32::from(u8::from(unit.arg)))) as usize] + .as_str() + == "__doc__" + ) + }), + "module docstring should be stripped before codegen, got instructions={:?}", + code.instructions + ); + + let function_code = find_code(&code, "f").expect("missing function code"); + assert!( + !function_code + .flags + .contains(bytecode::CodeFlags::HAS_DOCSTRING), + "function docstring should not set HAS_DOCSTRING when optimize=2" + ); + + let class_code = find_code(&code, "C").expect("missing class code"); + assert!( + !class_code.instructions.iter().any(|unit| { + matches!( + unit.op, + Instruction::StoreName { namei } + if class_code.names + [namei.get(OpArg::new(u32::from(u8::from(unit.arg)))) as usize] + .as_str() + == "__doc__" + ) + }), + "class docstring should be stripped before codegen, got instructions={:?}", + class_code.instructions + ); + } + #[test] fn future_annotations_flag_is_inherited_like_cpython() { let code = compile_exec( @@ -23993,11 +27372,117 @@ def f(): return C ", ); - assert!(code.flags.contains(CodeFlags::FUTURE_ANNOTATIONS)); + assert!(code.flags.contains(bytecode::CodeFlags::FUTURE_ANNOTATIONS)); let f = find_code(&code, "f").expect("missing f code"); - assert!(f.flags.contains(CodeFlags::FUTURE_ANNOTATIONS)); + assert!(f.flags.contains(bytecode::CodeFlags::FUTURE_ANNOTATIONS)); let class_code = find_code(f, "C").expect("missing C code"); - assert!(class_code.flags.contains(CodeFlags::FUTURE_ANNOTATIONS)); + assert!( + class_code + .flags + .contains(bytecode::CodeFlags::FUTURE_ANNOTATIONS) + ); + } + + #[test] + fn future_flags_from_compile_options_are_merged_like_cpython() { + let opts = CompileOpts { + future_features: bytecode::CodeFlags::FUTURE_ANNOTATIONS + | bytecode::CodeFlags::FUTURE_DIVISION, + ..CompileOpts::default() + }; + let code = compile_exec_with_options( + "\ +x: int +def f(): + pass +", + opts, + ); + assert!(code.flags.contains(bytecode::CodeFlags::FUTURE_ANNOTATIONS)); + assert!(code.flags.contains(bytecode::CodeFlags::FUTURE_DIVISION)); + assert!( + code.instructions + .iter() + .any(|unit| matches!(unit.op, Instruction::SetupAnnotations)) + ); + let f = find_code(&code, "f").expect("missing f code"); + assert!(f.flags.contains(bytecode::CodeFlags::FUTURE_ANNOTATIONS)); + assert!(f.flags.contains(bytecode::CodeFlags::FUTURE_DIVISION)); + } + + #[test] + fn future_barry_as_flufl_is_accepted_but_ignored() { + let code = compile_exec( + "\ +from __future__ import barry_as_FLUFL + +def f(): + pass +", + ); + let future_flags = bytecode::CodeFlags::FUTURE_DIVISION + | bytecode::CodeFlags::FUTURE_ABSOLUTE_IMPORT + | bytecode::CodeFlags::FUTURE_WITH_STATEMENT + | bytecode::CodeFlags::FUTURE_PRINT_FUNCTION + | bytecode::CodeFlags::FUTURE_UNICODE_LITERALS + | bytecode::CodeFlags::FUTURE_GENERATOR_STOP + | bytecode::CodeFlags::FUTURE_ANNOTATIONS; + assert!((code.flags & future_flags).is_empty()); + let f = find_code(&code, "f").expect("missing f code"); + assert!((f.flags & future_flags).is_empty()); + } + + #[test] + fn relative_future_import_does_not_enable_annotations_like_cpython() { + let code = compile_exec( + "\ +from .__future__ import annotations +x: int +", + ); + assert!(!code.flags.contains(bytecode::CodeFlags::FUTURE_ANNOTATIONS)); + } + + #[test] + fn future_braces_uses_cpython_special_error() { + assert_eq!( + compile_exec_error_message("from __future__ import braces\n"), + "not a chance" + ); + } + + #[test] + fn invalid_future_feature_is_checked_before_ast_preprocess_like_cpython() { + assert_eq!( + compile_exec_error_message("from __future__ import spam, annotations\nx: (y := int)\n"), + "future feature spam is not defined" + ); + } + + #[test] + fn allow_top_level_await_marks_module_coroutine_like_cpython() { + let opts = CompileOpts { + allow_top_level_await: true, + ..CompileOpts::default() + }; + let code = compile_exec_with_options("await f()\n", opts); + assert!(code.flags.contains(bytecode::CodeFlags::COROUTINE)); + } + + #[test] + fn allow_top_level_await_accepts_module_async_for_like_cpython() { + let opts = CompileOpts { + allow_top_level_await: true, + ..CompileOpts::default() + }; + let code = compile_exec_with_options( + "\ +async for x in y: + pass +", + opts, + ); + assert!(code.flags.contains(bytecode::CodeFlags::COROUTINE)); } #[test] @@ -24016,7 +27501,7 @@ def outer(): let class_annotate = find_code(class_code, "__annotate__").expect("missing class annotation code"); assert!( - !class_annotate.flags.contains(CodeFlags::NESTED), + !class_annotate.flags.contains(bytecode::CodeFlags::NESTED), "module-level class annotation scope should not be nested" ); @@ -24025,7 +27510,7 @@ def outer(): let nested_annotate = find_code(nested_class, "__annotate__").expect("missing nested annotation code"); assert!( - nested_annotate.flags.contains(CodeFlags::NESTED), + nested_annotate.flags.contains(bytecode::CodeFlags::NESTED), "annotation scope under a nested class should be nested" ); } @@ -24040,25 +27525,25 @@ type A[T] = T ); let outer_lambda = find_code(&code, "<lambda>").expect("missing outer lambda code"); assert!( - !outer_lambda.flags.contains(CodeFlags::NESTED), + !outer_lambda.flags.contains(bytecode::CodeFlags::NESTED), "module-level lambda should not be nested" ); let inner_lambda = find_direct_child_code(outer_lambda, "<lambda>").expect("missing inner lambda code"); assert!( - inner_lambda.flags.contains(CodeFlags::NESTED), + inner_lambda.flags.contains(bytecode::CodeFlags::NESTED), "lambda inside lambda should be nested" ); let type_params = find_code(&code, "<generic parameters of A>").expect("missing type params code"); assert!( - !type_params.flags.contains(CodeFlags::NESTED), + !type_params.flags.contains(bytecode::CodeFlags::NESTED), "module-level type-parameter scope should not be nested" ); let type_alias = find_direct_child_code(type_params, "A").expect("missing type alias code"); assert!( - type_alias.flags.contains(CodeFlags::NESTED), + type_alias.flags.contains(bytecode::CodeFlags::NESTED), "type alias body inside type-parameter scope should be nested" ); } @@ -26717,6 +30202,75 @@ def f(cm, func, args, kwds): ); } + #[test] + fn with_normal_cleanup_jump_uses_context_expr_location_like_cpython() { + let source = "\ +with cm: + pass +x = 1 +"; + let mut opts = CompileOpts::default(); + let source_file = SourceFileBuilder::new("source_path", source).finish(); + let parsed = ruff_python_parser::parse( + source_file.source_text(), + ruff_python_parser::Mode::Module.into(), + ) + .unwrap(); + let mut ast = parsed.into_syntax(); + opts.future_features |= preprocess::future_features(&ast); + let future_annotations = opts + .future_features + .contains(bytecode::CodeFlags::FUTURE_ANNOTATIONS); + preprocess::preprocess_mod(&mut ast, opts.optimize, future_annotations, false); + let ast = match ast { + ruff_python_ast::Mod::Module(stmts) => stmts, + _ => unreachable!(), + }; + let symbol_table = SymbolTable::scan_program_with_options( + &ast, + source_file.clone(), + opts.allow_top_level_await, + opts.future_features + .contains(bytecode::CodeFlags::FUTURE_ANNOTATIONS), + opts.recursion_limit, + ) + .map_err(|e| e.into_codegen_error(source_file.name().to_owned())) + .unwrap(); + let mut compiler = + Compiler::new_with_syntax_warning_handler(opts, source_file, "<module>", None); + compiler.compile_program(&ast, symbol_table).unwrap(); + + let jump_positions = compiler + .current_code_info() + .blocks + .iter() + .flat_map(|block| block.used_instructions()) + .filter_map(|info| { + matches!( + info.instr, + AnyInstruction::Pseudo(PseudoInstruction::Jump { .. }) + ) + .then_some(( + ( + info.location.line.get(), + info.location.character_offset.get(), + info.end_location.line.get(), + info.end_location.character_offset.get(), + ), + info.lineno_override, + )) + }) + .collect::<Vec<_>>(); + + assert!( + jump_positions + .iter() + .any(|(position, lineno_override)| *position == (1, 6, 1, 8) + && *lineno_override != Some(ir::NO_LOCATION_OVERRIDE)), + "CPython codegen_with_inner() emits the normal-exit JUMP at LOC(context_expr), not NO_LOCATION; got {jump_positions:?}" + ); + } + #[test] fn async_with_return_value_uses_context_expr_location_like_cpython() { let code = compile_exec( @@ -27029,6 +30583,44 @@ def f(x): assert_eq!(join_attr_count, 1); } + #[test] + fn large_fstring_join_scaffolding_uses_joinedstr_location_like_cpython() { + let mut source = String::from("def f(x):\n return f\""); + for _ in 0..=STACK_USE_GUIDELINE { + source.push_str("{x}"); + } + source.push_str("\"\n"); + + let code = compile_exec(&source); + let f = find_code(&code, "f").expect("missing function code"); + let fstring_end = " return ".len() + + 3 + + 3 * usize::try_from(STACK_USE_GUIDELINE + 1).expect("guideline overflowed") + + 1; + let expected = (2, 12, 2, fstring_end); + + for (unit, (location, end_location)) in f.instructions.iter().zip(&f.locations) { + if matches!( + unit.op, + Instruction::BuildList { .. } + | Instruction::ListAppend { .. } + | Instruction::Call { .. } + ) { + assert_eq!( + ( + location.line.get(), + location.character_offset.get(), + end_location.line.get(), + end_location.character_offset.get(), + ), + expected, + "CPython codegen_joined_str() emits join scaffolding at LOC(JoinedStr); this direct codegen path uses the parser's FString range, op={:?}", + unit.op + ); + } + } + } + #[test] fn large_power_is_not_constant_folded() { let code = compile_exec("x = 2**100\n"); @@ -27529,6 +31121,65 @@ class C: assert_eq!(varnames, vec!["format"]); } + #[test] + fn future_function_signature_annotation_uses_hidden_block_like_cpython() { + let code = compile_exec( + "\ +from __future__ import annotations +def f(x: T): pass +", + ); + let annotate = find_code(&code, "__annotate__").expect("missing __annotate__ code"); + let varnames = annotate + .varnames + .iter() + .map(|name| name.as_str()) + .collect::<Vec<_>>(); + assert_eq!(varnames, vec!["format"]); + assert!( + find_code(&code, "f").is_some(), + "function body symbol-table cursor must skip the hidden AnnotationBlock" + ); + } + + #[test] + fn deferred_annotation_format_name_does_not_capture_helper_parameter() { + let code = compile_exec( + "\ +format = object() +x: format +", + ); + let annotate = find_code(&code, "__annotate__").expect("missing __annotate__ code"); + let varnames = annotate + .varnames + .iter() + .map(|name| name.as_str()) + .collect::<Vec<_>>(); + assert_eq!(varnames, vec!["format"]); + assert!( + annotate.names.iter().any(|name| name.as_str() == "format"), + "CPython keeps the helper parameter as internal .format during symbol analysis, so annotation expression `format` must remain a separate name; got names={:?}", + annotate.names + ); + + let helper_param_loads = annotate + .instructions + .iter() + .filter(|unit| match unit.op { + Instruction::LoadFast { var_num } | Instruction::LoadFastBorrow { var_num } => { + let arg = OpArg::new(u32::from(u8::from(unit.arg))); + annotate.varnames[usize::from(var_num.get(arg))].as_str() == "format" + } + _ => false, + }) + .count(); + assert_eq!( + helper_param_loads, 1, + "only the CPython format-validation prologue should load the helper parameter; annotation expression `format` must not compile as LOAD_FAST" + ); + } + #[test] fn non_simple_class_annotation_is_not_deferred_like_cpython() { let code = compile_exec( @@ -27576,6 +31227,106 @@ class C: ); } + #[test] + fn class_deferred_annotations_guard_only_conditional_entries_like_cpython() { + let code = compile_exec( + "\ +class C: + x: int + if flag: + y: str + z: float +", + ); + let class_code = find_code(&code, "C").expect("missing class code"); + let class_ops: Vec<_> = class_code + .instructions + .iter() + .map(|unit| unit.op) + .filter(|op| !matches!(op, Instruction::Cache)) + .collect(); + let class_set_adds = class_ops + .iter() + .filter(|op| matches!(op, Instruction::SetAdd { .. })) + .count(); + assert_eq!( + class_set_adds, 1, + "CPython _PyCompile_AddDeferredAnnotation() adds class annotations to __conditional_annotations__ only inside conditional blocks, got ops={class_ops:?}" + ); + assert!( + class_code.instructions.iter().any(|unit| match unit.op { + Instruction::LoadDeref { i } => { + let idx = i.get(OpArg::new(u32::from(u8::from(unit.arg)))).as_usize(); + localsplus_name(class_code, idx) == Some("__conditional_annotations__") + } + _ => false, + }), + "CPython codegen_annassign() emits LOAD_DEREF for class __conditional_annotations__, got ops={class_ops:?}" + ); + assert!( + !class_code + .instructions + .iter() + .any(|unit| matches!(unit.op, Instruction::LoadFromDictOrDeref { .. })), + "CPython codegen_annassign() bypasses codegen_nameop for class __conditional_annotations__, got ops={class_ops:?}" + ); + + let annotate = find_code(class_code, "__annotate__").expect("missing __annotate__ code"); + let annotate_ops: Vec<_> = annotate + .instructions + .iter() + .map(|unit| unit.op) + .filter(|op| !matches!(op, Instruction::Cache)) + .collect(); + let annotation_body = annotate_ops + .iter() + .position(|op| matches!(op, Instruction::BuildMap { .. })) + .map(|idx| &annotate_ops[idx..]) + .expect("missing annotation map build"); + let guarded_entries = annotation_body + .iter() + .filter(|op| matches!(op, Instruction::PopJumpIfFalse { .. })) + .count(); + assert_eq!( + guarded_entries, 1, + "CPython codegen_deferred_annotations_body() guards only conditional class annotations, got ops={annotate_ops:?}" + ); + } + + #[test] + fn future_annotations_non_simple_target_checks_target_but_not_annotation_like_cpython() { + let code = compile_exec( + "\ +from __future__ import annotations +class C: + target[item]: missing +", + ); + let class_code = find_code(&code, "C").expect("missing class code"); + let loaded_names: Vec<_> = class_code + .instructions + .iter() + .filter_map(|unit| match unit.op { + Instruction::LoadName { namei } => { + let idx = namei.get(OpArg::new(u32::from(u8::from(unit.arg)))); + Some(class_code.names[usize::try_from(idx).unwrap()].as_str()) + } + _ => None, + }) + .collect(); + + assert!( + ["target", "item"] + .iter() + .all(|name| loaded_names.contains(name)), + "CPython codegen_annassign() still checks bare complex annotation targets under future annotations, got loaded_names={loaded_names:?}" + ); + assert!( + !loaded_names.contains(&"missing"), + "CPython codegen_check_annotation() skips the annotation expression under future annotations, got loaded_names={loaded_names:?}" + ); + } + #[test] fn type_param_evaluator_uses_dot_format_varname() { let code = compile_exec( @@ -27680,7 +31431,7 @@ def func[T](a: T = 'a', *, b: T = 'b'): } #[test] - fn generic_function_type_params_varnames_include_defaults_like_cpython() { + fn generic_function_type_params_omit_defaults_without_defaults_like_cpython() { let code = compile_exec( "\ def func[T](): @@ -27696,10 +31447,31 @@ def func[T](): .iter() .map(String::as_str) .collect::<Vec<_>>(), - vec![".defaults", "T"] + vec!["T"] ); } + #[test] + fn generic_function_type_params_split_defaults_like_cpython() { + let code = compile_exec( + "\ +def with_pos[T](a: T = 1): + pass +def with_kw[U](*, a: U = 1): + pass +", + ); + let with_pos = + find_code(&code, "<generic parameters of with_pos>").expect("missing type params code"); + let with_kw = + find_code(&code, "<generic parameters of with_kw>").expect("missing type params code"); + + assert!(with_pos.varnames.iter().any(|name| name == ".defaults")); + assert!(!with_pos.varnames.iter().any(|name| name == ".kwdefaults")); + assert!(!with_kw.varnames.iter().any(|name| name == ".defaults")); + assert!(with_kw.varnames.iter().any(|name| name == ".kwdefaults")); + } + #[test] fn class_type_param_bound_prefers_classdict_over_outer_function_local() { let code = compile_exec( @@ -27925,6 +31697,39 @@ class C[T]: } } + #[test] + fn non_inlined_listcomp_return_uses_comprehension_location_like_cpython() { + let code = compile_exec( + "\ +class C[T]: + class Inner[U]( + make_base([T for _ in (1,)]) + ): + pass +", + ); + let listcomp = find_code(&code, "<listcomp>").expect("missing listcomp code"); + let return_positions: Vec<_> = listcomp + .instructions + .iter() + .zip(&listcomp.locations) + .filter_map(|(unit, (location, end_location))| { + matches!(unit.op, Instruction::ReturnValue).then_some(( + location.line.get(), + location.character_offset.get(), + end_location.line.get(), + end_location.character_offset.get(), + )) + }) + .collect(); + + assert_eq!( + return_positions, + vec![(3, 19, 3, 36)], + "CPython codegen_comprehension() emits non-gen RETURN_VALUE at LOC(e)" + ); + } + #[test] fn class_annotation_global_resolution_matches_cpython() { let class_global = compile_exec( @@ -28280,6 +32085,21 @@ def tuple_or_tuple(): ); } + #[test] + fn chained_compare_jump_if_runs_cpython_check_compare_warning() { + let message = first_exec_warning( + "\ +def f(x): + if 1 is 1 < x: + return x +", + ); + assert!( + message.contains("\"is\" with 'int' literal"), + "CPython codegen_jump_if() checks chained comparisons before conditional lowering, got {message:?}" + ); + } + #[test] fn lambda_without_body_constants_keeps_none_like_cpython() { let code = compile_exec("f = lambda x: x"); @@ -28293,6 +32113,17 @@ def tuple_or_tuple(): ); } + #[test] + fn generator_lambda_without_body_constants_omits_none_like_cpython() { + let code = compile_exec("f = lambda x: (yield x)"); + let lambda = find_code(&code, "<lambda>").expect("missing lambda code"); + + assert!( + lambda.constants.is_empty(), + "CPython codegen_lambda() assembles generator lambdas with addNone=0" + ); + } + #[test] fn call_function_ex_empty_args_tuple_is_folded_late_like_cpython() { let code = compile_exec( @@ -28425,6 +32256,39 @@ f = lambda x: x in {0} ))); } + #[test] + fn frozenset_membership_consts_deduplicate_like_cpython_constant_key() { + let code = compile_exec( + "\ +def f(x): + return x in {1, 2}, x in {2, 1}, x in {1, 1} +", + ); + let f = find_code(&code, "f").expect("missing function code"); + let frozensets: Vec<_> = f + .constants + .iter() + .filter_map(|constant| match constant { + ConstantData::Frozenset { elements } => Some(elements.as_slice()), + _ => None, + }) + .collect(); + + assert_eq!( + frozensets.len(), + 2, + "CPython folds equal frozensets to the same const key and removes duplicate set items" + ); + assert!( + frozensets.iter().any(|elements| elements.len() == 2), + "missing shared frozenset constant for {{1, 2}} and {{2, 1}}" + ); + assert!( + frozensets.iter().any(|elements| elements.len() == 1), + "missing duplicate-collapsed frozenset constant for {{1, 1}}" + ); + } + #[test] fn nonconstant_list_membership_uses_tuple() { let code = compile_exec( @@ -29210,7 +33074,7 @@ deoptmap = { } let comp = symbol_table - .sub_tables + .inlined_comprehension_blocks .first() .expect("missing comprehension symbol table"); assert!(comp.comp_inlined, "expected comprehension to be inlined"); @@ -29609,6 +33473,34 @@ values = ( ); } + #[test] + fn single_mode_returns_none_after_print_like_cpython() { + let code = compile_single("1\n"); + let ops = code + .instructions + .iter() + .filter(|unit| !matches!(unit.op, Instruction::Resume { .. })) + .collect::<Vec<_>>(); + + assert!( + !ops.iter() + .any(|unit| matches!(unit.op, Instruction::Copy { .. })), + "CPython codegen_stmt_expr() prints and pops interactive expressions; it does not preserve the final expression as the code object's return value, got ops={ops:?}" + ); + let Some(load_none) = ops.iter().rev().nth(1) else { + panic!("missing final LOAD_CONST None before RETURN_VALUE, got ops={ops:?}"); + }; + let Instruction::LoadConst { consti } = load_none.op else { + panic!("missing final LOAD_CONST None before RETURN_VALUE, got ops={ops:?}"); + }; + let constant = &code.constants[consti.get(OpArg::new(u32::from(u8::from(load_none.arg))))]; + assert!(matches!(constant, ConstantData::None)); + assert!(matches!( + ops.last().map(|unit| unit.op), + Some(Instruction::ReturnValue) + )); + } + #[test] fn folded_multiline_bytes_binop_does_not_leave_operand_nops() { let code = compile_exec( diff --git a/crates/codegen/src/error.rs b/crates/codegen/src/error.rs index fb848354e..9f11eba94 100644 --- a/crates/codegen/src/error.rs +++ b/crates/codegen/src/error.rs @@ -3,21 +3,6 @@ use core::fmt::Display; use rustpython_compiler_core::SourceLocation; use thiserror::Error; -#[derive(Clone, Copy, Debug)] -pub enum PatternUnreachableReason { - NameCapture, - Wildcard, -} - -impl Display for PatternUnreachableReason { - fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - match self { - Self::NameCapture => write!(f, "name capture"), - Self::Wildcard => write!(f, "wildcard"), - } - } -} - // pub type CodegenError = rustpython_parser_core::source_code::LocatedError<CodegenErrorType>; #[derive(Error, Debug)] @@ -70,6 +55,8 @@ pub enum CodegenErrorType { SyntaxError(String), /// Multiple `*` detected MultipleStarArgs, + MultipleStarredExpressionsInSequencePattern, + MultipleStarredNamesInSequencePattern, /// Misplaced `*` expression InvalidStarExpr, /// Break statement outside of loop. @@ -87,14 +74,17 @@ pub enum CodegenErrorType { AsyncReturnValue, InvalidFuturePlacement, InvalidFutureFeature(String), - FunctionImportStar, + InvalidFutureBraces, + RecursionError, TooManyStarUnpack, + TooManyExpressionsInStarUnpackingSequencePattern, EmptyWithItems, EmptyWithBody, ForbiddenName, DuplicateStore(String), - UnreachablePattern(PatternUnreachableReason), - RepeatedAttributePattern, + UnreachableWildcardPattern, + UnreachableNameCapturePattern(String), + RepeatedAttributePattern(String), ConflictingNameBindPattern, /// break/continue/return inside except* block BreakContinueReturnInExceptStar, @@ -112,6 +102,12 @@ impl fmt::Display for CodegenErrorType { Self::MultipleStarArgs => { write!(f, "multiple starred expressions in assignment") } + Self::MultipleStarredExpressionsInSequencePattern => { + write!(f, "multiple starred expressions in sequence pattern") + } + Self::MultipleStarredNamesInSequencePattern => { + write!(f, "multiple starred names in sequence pattern") + } Self::InvalidStarExpr => write!(f, "can't use starred expression here"), Self::InvalidBreak => write!(f, "'break' outside loop"), Self::InvalidContinue => write!(f, "'continue' not properly in loop"), @@ -128,9 +124,7 @@ impl fmt::Display for CodegenErrorType { ) } Self::AsyncYieldFrom => write!(f, "'yield from' inside async function"), - Self::AsyncReturnValue => { - write!(f, "'return' with value inside async generator") - } + Self::AsyncReturnValue => write!(f, "'return' with value in async generator"), Self::InvalidFuturePlacement => write!( f, "from __future__ imports must occur at the beginning of the file" @@ -138,12 +132,16 @@ impl fmt::Display for CodegenErrorType { Self::InvalidFutureFeature(feat) => { write!(f, "future feature {feat} is not defined") } - Self::FunctionImportStar => { - write!(f, "import * only allowed at module level") + Self::InvalidFutureBraces => write!(f, "not a chance"), + Self::RecursionError => { + write!(f, "maximum recursion depth exceeded during compilation") } Self::TooManyStarUnpack => { write!(f, "too many expressions in star-unpacking assignment") } + Self::TooManyExpressionsInStarUnpackingSequencePattern => { + write!(f, "too many expressions in star-unpacking sequence pattern") + } Self::EmptyWithItems => { write!(f, "empty items on With") } @@ -153,14 +151,18 @@ impl fmt::Display for CodegenErrorType { Self::ForbiddenName => { write!(f, "forbidden attribute name") } - Self::DuplicateStore(s) => { - write!(f, "duplicate store {s}") + Self::DuplicateStore(s) => write!(f, "multiple assignments to name '{s}' in pattern"), + Self::UnreachableWildcardPattern => { + write!(f, "wildcard makes remaining patterns unreachable") } - Self::UnreachablePattern(reason) => { - write!(f, "{reason} makes remaining patterns unreachable") + Self::UnreachableNameCapturePattern(name) => { + write!( + f, + "name capture '{name}' makes remaining patterns unreachable" + ) } - Self::RepeatedAttributePattern => { - write!(f, "attribute name repeated in class pattern") + Self::RepeatedAttributePattern(name) => { + write!(f, "attribute name repeated in class pattern: {name}") } Self::ConflictingNameBindPattern => { write!(f, "alternative patterns bind different names") diff --git a/crates/codegen/src/ir.rs b/crates/codegen/src/ir.rs index 548b57d85..b369ec37d 100644 --- a/crates/codegen/src/ir.rs +++ b/crates/codegen/src/ir.rs @@ -78,15 +78,108 @@ impl ConstantPool { } } - pub fn insert_full(&mut self, constant: ConstantData) -> (usize, bool) { - // CPython's _PyCode_ConstantKey() keeps NaN-bearing constants distinct - // because Python-level NaN keys do not compare equal. - if !Self::constant_contains_nan(&constant) - && let Some(idx) = self - .constants + fn frozenset_key_contains(elements: &[ConstantData], needle: &ConstantData) -> bool { + if Self::constant_contains_nan(needle) { + return false; + } + elements.iter().any(|element| { + !Self::constant_contains_nan(element) && Self::constant_key_eq(element, needle) + }) + } + + fn frozenset_key_eq(left: &[ConstantData], right: &[ConstantData]) -> bool { + left.iter() + .all(|element| Self::frozenset_key_contains(right, element)) + && right .iter() - .position(|existing| existing == &constant) - { + .all(|element| Self::frozenset_key_contains(left, element)) + } + + fn constant_key_eq(left: &ConstantData, right: &ConstantData) -> bool { + match (left, right) { + (ConstantData::Tuple { elements: left }, ConstantData::Tuple { elements: right }) => { + left.len() == right.len() + && left + .iter() + .zip(right.iter()) + .all(|(left, right)| Self::constant_key_eq(left, right)) + } + ( + ConstantData::Frozenset { elements: left }, + ConstantData::Frozenset { elements: right }, + ) => Self::frozenset_key_eq(left, right), + (ConstantData::Slice { elements: left }, ConstantData::Slice { elements: right }) => { + left.iter() + .zip(right.iter()) + .all(|(left, right)| Self::constant_key_eq(left, right)) + } + _ => left == right, + } + } + + fn canonicalize_constant_key(constant: ConstantData) -> crate::InternalResult<ConstantData> { + match constant { + ConstantData::Tuple { elements } => { + let mut canonical = Vec::new(); + canonical + .try_reserve_exact(elements.len()) + .map_err(|_| InternalError::MalformedControlFlowGraph)?; + for element in elements { + canonical.push(Self::canonicalize_constant_key(element)?); + } + Ok(ConstantData::Tuple { + elements: canonical, + }) + } + ConstantData::Slice { elements } => { + let [start, stop, step] = *elements; + Ok(ConstantData::Slice { + elements: Box::new([ + Self::canonicalize_constant_key(start)?, + Self::canonicalize_constant_key(stop)?, + Self::canonicalize_constant_key(step)?, + ]), + }) + } + ConstantData::Frozenset { elements } => { + let mut canonical = Vec::new(); + canonical + .try_reserve_exact(elements.len()) + .map_err(|_| InternalError::MalformedControlFlowGraph)?; + for element in elements { + let element = Self::canonicalize_constant_key(element)?; + if !Self::frozenset_key_contains(&canonical, &element) { + canonical.push(element); + } + } + Ok(ConstantData::Frozenset { + elements: canonical, + }) + } + other => Ok(other), + } + } + + fn canonicalize_constant_key_infallible(constant: ConstantData) -> ConstantData { + Self::canonicalize_constant_key(constant) + .expect("constant key canonicalization only fails on allocation error") + } + + /// Index of an already-stored constant equal to `constant`, if any. + /// _PyCode_ConstantKey() keeps NaN-bearing constants distinct because + /// Python-level NaN keys do not compare equal. + fn find_existing(&self, constant: &ConstantData) -> Option<usize> { + if Self::constant_contains_nan(constant) { + return None; + } + self.constants + .iter() + .position(|existing| Self::constant_key_eq(existing, constant)) + } + + pub fn insert_full(&mut self, constant: ConstantData) -> (usize, bool) { + let constant = Self::canonicalize_constant_key_infallible(constant); + if let Some(idx) = self.find_existing(&constant) { return (idx, false); } let idx = self.constants.len(); @@ -95,14 +188,8 @@ impl ConstantPool { } fn try_insert_full(&mut self, constant: ConstantData) -> crate::InternalResult<(usize, bool)> { - // CPython's _PyCode_ConstantKey() keeps NaN-bearing constants distinct - // because Python-level NaN keys do not compare equal. - if !Self::constant_contains_nan(&constant) - && let Some(idx) = self - .constants - .iter() - .position(|existing| existing == &constant) - { + let constant = Self::canonicalize_constant_key(constant)?; + if let Some(idx) = self.find_existing(&constant) { return Ok((idx, false)); } self.constants @@ -1485,6 +1572,7 @@ impl Blocks { | PseudoInstruction::JumpIfTrue { .. }), ) => { let opcode = pseudo.into(); + let opcode_is_false = matches!(pseudo, PseudoInstruction::JumpIfFalse { .. }); match target.instr.pseudo().map(Into::into) { Some(PseudoOpcode::Jump) if self.jump_thread(block_idx, i, &target, opcode)? => @@ -1492,22 +1580,25 @@ impl Blocks { continue; } Some(PseudoOpcode::JumpIfFalse) - if matches!( - opcode, - AnyInstruction::Pseudo(PseudoInstruction::JumpIfFalse { .. }) - ) && self.jump_thread(block_idx, i, &target, opcode)? => + if opcode_is_false + && self.jump_thread(block_idx, i, &target, opcode)? => { continue; } Some(PseudoOpcode::JumpIfTrue) - if matches!( - opcode, - AnyInstruction::Pseudo(PseudoInstruction::JumpIfTrue { .. }) - ) && self.jump_thread(block_idx, i, &target, opcode)? => + if !opcode_is_false + && self.jump_thread(block_idx, i, &target, opcode)? => { continue; } - Some(PseudoOpcode::JumpIfFalse | PseudoOpcode::JumpIfTrue) => { + Some(PseudoOpcode::JumpIfTrue) if opcode_is_false => { + let next = self[inst.target].next; + debug_assert!(next != BlockIdx::NULL); + debug_assert!(next != inst.target); + self[block_idx].instructions[i].target = next; + continue; + } + Some(PseudoOpcode::JumpIfFalse) if !opcode_is_false => { let next = self[inst.target].next; debug_assert!(next != BlockIdx::NULL); debug_assert!(next != inst.target); @@ -2335,10 +2426,10 @@ impl Blocks { Ok(()) } - /// flowgraph.c mark_cold (two-pass to match CPython). + /// flowgraph.c mark_cold (two-pass). /// /// Phase 1 (mark_warm): propagate "warm" from entry via fall-through and - /// jump targets. CPython asserts while visiting warm blocks that they are not + /// jump targets. The pass asserts while visiting warm blocks that they are not /// exception handlers. /// /// Phase 2 (mark_cold): propagate "cold" from except_handler blocks via @@ -2349,7 +2440,7 @@ impl Blocks { /// empty unreachable placeholders left by remove_unreachable; they stay in /// their original chain position (e.g. between entry and the post-try /// continuation for a nested try/except whose inner_end was emptied by - /// optimize_cfg). This matches CPython's behavior and is necessary for + /// optimize_cfg). This is necessary for /// optimize_load_fast to terminate fall-through at those placeholders. /// flowgraph.c mark_warm fn mark_warm(&mut self) -> crate::InternalResult<()> { @@ -2981,42 +3072,12 @@ impl Blocks { } } -impl From<Vec<Block>> for Blocks { - fn from(value: Vec<Block>) -> Self { - Self(value) - } -} - -impl From<Box<[Block]>> for Blocks { - fn from(value: Box<[Block]>) -> Self { - Self(value.into()) - } -} - -impl From<&[Block]> for Blocks { - fn from(value: &[Block]) -> Self { - Self(value.to_vec()) - } -} - -impl From<&mut [Block]> for Blocks { - fn from(value: &mut [Block]) -> Self { - Self(value.to_vec()) - } -} - impl<const N: usize> From<[Block; N]> for Blocks { fn from(value: [Block; N]) -> Self { Self(value.into()) } } -impl<const N: usize> From<&[Block; N]> for Blocks { - fn from(value: &[Block; N]) -> Self { - Self(value.to_vec()) - } -} - impl Deref for Blocks { type Target = [Block]; @@ -3060,7 +3121,7 @@ impl IndexMut<BlockIdx> for Blocks { } pub(crate) const START_DEPTH_UNSET: i32 = i32::MIN; -const CO_MAXBLOCKS: usize = 20; +const CO_MAXBLOCKS: usize = 21; /// flowgraph.c struct _PyCfgExceptStack #[derive(Clone, Debug)] @@ -3099,7 +3160,7 @@ impl CfgTraversalStack { #[derive(Clone, Debug)] pub(crate) struct InstructionSequenceLabelMap { block_labels: Vec<InstructionSequenceLabel>, - /// Codegen-side shadow of CPython's instruction-sequence label map. + /// Codegen-side shadow of the instruction-sequence label map. /// /// `_PyInstructionSequence_UseLabel()` can map multiple labels to the same /// instruction offset before `_PyCfg_FromInstructionSequence()` materializes @@ -3305,7 +3366,7 @@ pub struct CodeInfo { // Reference to the symbol table for this scope pub symbol_table_index: usize, - // CPython compile.c uses PyList_GET_SIZE(u->u_ste->ste_varnames) + // compile.c uses PyList_GET_SIZE(u->u_ste->ste_varnames) // when calling flowgraph.c _PyCfg_OptimizeCodeUnit(). pub nparams: usize, @@ -3488,7 +3549,7 @@ impl CodeInfo { } fn prepare_cfg_from_codegen(&mut self) -> crate::InternalResult<InstructionSequence> { - // CPython compile.c optimize_and_assemble_code_unit passes + // compile.c optimize_and_assemble_code_unit passes // u_instr_sequence directly into flowgraph.c _PyCfg_FromInstructionSequence(). self.take_recorded_instr_sequence() } @@ -3509,12 +3570,12 @@ fn optimize_code_unit( optimize_cfg(metadata, blocks, metadata.firstlineno)?; blocks.remove_unused_consts(&mut metadata.consts)?; add_checks_for_loads_of_uninitialized_variables(blocks, nlocals, nparams)?; - // CPython inserts superinstructions in _PyCfg_OptimizeCodeUnit, before + // Superinstructions are inserted in _PyCfg_OptimizeCodeUnit, before // later jump normalization / block reordering can create adjacencies // that never exist at this stage in flowgraph.c. blocks.insert_superinstructions()?; blocks.push_cold_blocks_to_end()?; - // CPython resolves line numbers again after cold-block extraction. + // Line numbers are resolved again after cold-block extraction. blocks.resolve_line_numbers(metadata.firstlineno)?; Ok(()) } @@ -3525,20 +3586,20 @@ fn optimize_cfg( firstlineno: OneIndexed, ) -> crate::InternalResult<()> { // flowgraph.c optimize_cfg - // CPython optimize_cfg() starts with check_cfg() and raises + // optimize_cfg() starts with check_cfg() and raises // SystemError if a jump or scope exit is not the last instruction in // its block. blocks.check_cfg()?; blocks.inline_small_or_no_lineno_blocks()?; - // CPython does not re-run instruction-sequence label-map/CFG conversion + // The instruction-sequence label-map/CFG conversion is not re-run // after this point. Unreferenced label blocks left by jump inlining // remain block boundaries and can preserve line-marker NOPs. blocks.remove_unreachable()?; - // CPython optimize_cfg resolves line numbers before local checks and + // optimize_cfg resolves line numbers before local checks and // superinstruction insertion, so fusion decisions see propagated // source locations. blocks.resolve_line_numbers(firstlineno)?; - // CPython optimize_cfg() runs optimize_load_const() and then + // optimize_cfg() runs optimize_load_const() and then // optimize_basic_block() after line numbers are resolved. optimize_load_const(metadata, blocks)?; let mut block_idx = BlockIdx(0); @@ -3548,7 +3609,7 @@ fn optimize_cfg( block_idx = next_block; } blocks.remove_redundant_nops_and_pairs()?; - // CPython optimize_cfg() removes newly-unreachable blocks and + // optimize_cfg() removes newly-unreachable blocks and // redundant NOP/jump chains before _PyCfg_OptimizeCodeUnit() prunes // unused constants. blocks.remove_unreachable()?; @@ -3568,7 +3629,7 @@ fn optimized_cfg_to_instruction_sequence( let max_stackdepth = blocks.calculate_stackdepth()?; debug_assert!(!is_generator(flags) || max_stackdepth != 0); let nlocalsplus = prepare_localsplus(metadata, blocks, flags)?; - // Match CPython order: pseudo ops are lowered after stackdepth and + // Pseudo ops are lowered after stackdepth and // localsplus preparation, before normalize_jumps. convert_pseudo_ops(blocks)?; blocks.normalize_jumps()?; @@ -3636,6 +3697,9 @@ impl CodeInfo { kwonlyargcount: kwonlyarg_count, firstlineno: first_line_number, } = metadata; + let code_arg_count = posonlyarg_count + .checked_add(arg_count) + .ok_or(InternalError::MalformedControlFlowGraph)?; resolve_unconditional_jumps(&mut instr_sequence)?; resolve_jump_offsets(&mut instr_sequence)?; @@ -3653,7 +3717,7 @@ impl CodeInfo { Ok(CodeObject { flags, posonlyarg_count, - arg_count, + arg_count: code_arg_count, kwonlyarg_count, source_path, first_line_number: Some(first_line_number), @@ -4109,8 +4173,13 @@ fn const_folding_safe_multiply(left: &ConstantData, right: &ConstantData) -> Opt const_folding_safe_multiply(right, left) } (ConstantData::Tuple { elements }, ConstantData::Integer { value: n }) => { + if elements.is_empty() { + return Some(ConstantData::Tuple { + elements: Vec::new(), + }); + } let n = n.to_usize()?; - if n != 0 && !elements.is_empty() { + if n != 0 { if n > MAX_COLLECTION_SIZE / elements.len() { return None; } @@ -4265,7 +4334,7 @@ fn eval_const_complex_binop( BinOp::Add => left + right, BinOp::Subtract => { let re = left.re - right.re; - // Preserve CPython's signed-zero behavior for real-zero + // Preserve signed-zero behavior for real-zero // minus zero-complex expressions such as `0 - 0j`. let im = if left.re == 0.0 && left.im == 0.0 @@ -4829,7 +4898,7 @@ fn fold_constant_intrinsic_list_to_tuple( Ok(false) } -/// Port of CPython's flowgraph.c optimize_lists_and_sets(). +/// Port of flowgraph.c optimize_lists_and_sets(). fn optimize_lists_and_sets( metadata: &mut CodeUnitMetadata, block: &mut Block, @@ -4889,8 +4958,7 @@ fn optimize_lists_and_sets( if !contains_or_iter { debug_assert!(i >= 2); - let folded_loc = block.instructions[i].location; - let end_loc = block.instructions[i].end_location; + let folded_loc = instr_location(&block.instructions[i]); nop_out(block, &operand_indices); @@ -4901,9 +4969,7 @@ fn optimize_lists_and_sets( } .into(); instr_set_op1(&mut block.instructions[i - 2], build_instr, OpArg::new(0)); - block.instructions[i - 2].location = folded_loc; - block.instructions[i - 2].end_location = end_loc; - block.instructions[i - 2].lineno_override = None; + instr_set_location(&mut block.instructions[i - 2], folded_loc); instr_set_op1( &mut block.instructions[i - 1], @@ -5152,7 +5218,7 @@ fn basicblock_optimize_load_const( block: &mut Block, ) -> crate::InternalResult<()> { let mut i = 0; - let mut effective_opcode = None; + let mut effective_opcode = Instruction::Nop.into(); let mut effective_oparg = OpArg::new(0); while i < block.instruction_used { if matches!( @@ -5166,21 +5232,19 @@ fn basicblock_optimize_load_const( let curr = block.instructions[i]; let curr_arg = curr.arg; - // Only combine if the source is a real instruction. - let Some(curr_instr) = curr.instr.real() else { - i += 1; - continue; - }; - let is_copy_of_load_const = matches!( - (effective_opcode, curr_instr), - (Some(Instruction::LoadConst { .. }), Instruction::Copy { i }) if i.get(curr_arg) == 1 + (effective_opcode, curr.instr.real()), + (AnyInstruction::Real(Instruction::LoadConst { .. }), Some(Instruction::Copy { i })) + if i.get(curr_arg) == 1 ); if !is_copy_of_load_const { - effective_opcode = Some(curr_instr); + effective_opcode = curr.instr; effective_oparg = curr_arg; } - let Some(const_instr) = effective_opcode else { + debug_assert!(!effective_opcode.is_assembler()); + let Some(const_instr @ (Instruction::LoadConst { .. } | Instruction::LoadSmallInt { .. })) = + effective_opcode.real() + else { i += 1; continue; }; @@ -5273,7 +5337,7 @@ fn basicblock_optimize_load_const( Opcode::PopJumpIfNone } .into(); - i = jump_idx; + i += 1; continue; } } @@ -6557,21 +6621,19 @@ fn get_max_label(blocks: &Blocks) -> i32 { } /// flowgraph.c make_except_stack -#[allow(clippy::unnecessary_wraps)] -fn make_except_stack() -> crate::InternalResult<CfgExceptStack> { +fn make_except_stack() -> CfgExceptStack { let handlers = [BlockIdx::NULL; CO_MAXBLOCKS + 2]; debug_assert_eq!(handlers[0], BlockIdx::NULL); - Ok(CfgExceptStack { handlers, depth: 0 }) + CfgExceptStack { handlers, depth: 0 } } /// flowgraph.c copy_except_stack -#[allow(clippy::unnecessary_wraps)] -fn copy_except_stack(stack: &CfgExceptStack) -> crate::InternalResult<CfgExceptStack> { +fn copy_except_stack(stack: &CfgExceptStack) -> CfgExceptStack { debug_assert!(stack.depth <= CO_MAXBLOCKS + 1); - Ok(CfgExceptStack { + CfgExceptStack { handlers: stack.handlers, depth: stack.depth, - }) + } } /// flowgraph.c except_stack_top @@ -6623,7 +6685,7 @@ pub(crate) fn label_exception_targets(blocks: &mut Blocks) -> crate::InternalRes todo.push(BlockIdx(0)); blocks[0].visited = true; - blocks[0].except_stack = Some(make_except_stack()?); + blocks[0].except_stack = Some(make_except_stack()); while let Some(block_idx) = todo.pop() { let bi = block_idx.idx(); @@ -6650,7 +6712,7 @@ pub(crate) fn label_exception_targets(blocks: &mut Blocks) -> crate::InternalRes if !blocks[target].visited { blocks[target].except_stack = Some(copy_except_stack( stack.as_ref().expect("active exception stack"), - )?); + )); todo.push(target); blocks[target].visited = true; } @@ -6674,7 +6736,7 @@ pub(crate) fn label_exception_targets(blocks: &mut Blocks) -> crate::InternalRes if bb_has_fallthrough(&blocks[bi]) { blocks[target].except_stack = Some(copy_except_stack( stack.as_ref().expect("active exception stack"), - )?); + )); } else { blocks[target].except_stack = stack.take(); stack_transferred = true; @@ -6852,6 +6914,58 @@ pub(crate) fn fix_cell_offsets( #[cfg(test)] mod tests { use super::*; + use rustpython_compiler_core::bytecode::Arg; + + fn int_const(value: i32) -> ConstantData { + ConstantData::Integer { + value: BigInt::from(value), + } + } + + fn nan_const() -> ConstantData { + ConstantData::Float { value: f64::NAN } + } + + #[test] + fn constant_pool_frozenset_key_ignores_order_and_duplicates_like_cpython() { + let mut pool = ConstantPool::default(); + let (first, inserted) = pool.insert_full(ConstantData::Frozenset { + elements: vec![int_const(1), int_const(2)], + }); + assert_eq!(first, 0); + assert!(inserted); + + let (second, inserted) = pool.insert_full(ConstantData::Frozenset { + elements: vec![int_const(2), int_const(1), int_const(1)], + }); + assert_eq!( + second, first, + "CPython _PyCode_ConstantKey uses frozenset item keys, not insertion order" + ); + assert!(!inserted); + assert!(matches!( + &pool.constants[first], + ConstantData::Frozenset { elements } if elements.len() == 2 + )); + } + + #[test] + fn constant_pool_frozenset_key_preserves_nan_duplicates_like_cpython() { + let mut pool = ConstantPool::default(); + let (idx, inserted) = pool.insert_full(ConstantData::Frozenset { + elements: vec![nan_const(), nan_const()], + }); + + assert_eq!(idx, 0); + assert!(inserted); + assert!(matches!( + &pool.constants[idx], + ConstantData::Frozenset { elements } + if elements.iter().filter(|constant| { + matches!(constant, ConstantData::Float { value } if value.is_nan()) + }).count() == 2 + )); + } fn test_location(line: u32) -> SourceLocation { SourceLocation { @@ -6886,6 +7000,13 @@ mod tests { instr } + fn test_true_cond_jump(target: BlockIdx, line: u32) -> InstructionInfo { + let mut instr = test_instr(Instruction::Nop, line); + instr.instr = PseudoOpcode::JumpIfTrue.into(); + instr.target = target; + instr + } + fn test_block_push(block: &mut Block, info: InstructionInfo) { let off = basicblock_next_instr(block).expect("test block instruction slot"); block.instructions[off] = info; @@ -6970,7 +7091,7 @@ mod tests { #[test] fn except_stack_tracks_cpython_depth_and_handler_slots() { - let mut stack = make_except_stack().unwrap(); + let mut stack = make_except_stack(); assert_eq!(stack.depth, 0); assert_eq!(stack.handlers.len(), CO_MAXBLOCKS + 2); assert_eq!(stack.handlers[0], BlockIdx::NULL); @@ -6994,7 +7115,7 @@ mod tests { assert!(handler.preserve_lasti); assert!(blocks[1].preserve_lasti); - let copy = copy_except_stack(&stack).unwrap(); + let copy = copy_except_stack(&stack); assert_eq!(copy.depth, stack.depth); assert_eq!(copy.handlers, stack.handlers); @@ -7399,6 +7520,52 @@ mod tests { ); } + #[test] + fn optimize_load_const_pseudo_opcode_breaks_effective_load_const() { + let mut block = Block::default(); + test_block_push( + &mut block, + test_instr( + Instruction::LoadConst { + consti: Arg::marker(), + }, + 90, + ), + ); + test_block_push(&mut block, test_true_cond_jump(BlockIdx::new(0), 90)); + let mut copy = test_instr(Instruction::Copy { i: Arg::marker() }, 90); + copy.arg = OpArg::new(1); + test_block_push(&mut block, copy); + test_block_push(&mut block, test_instr(Instruction::ToBool, 90)); + + let mut code = test_code_info(block); + let (const_idx, _) = code.metadata.consts.insert_full(ConstantData::Tuple { + elements: vec![ConstantData::Integer { + value: BigInt::from(1), + }], + }); + code.blocks[0].instructions[0].arg = OpArg::new(const_idx as u32); + + optimize_load_const(&mut code.metadata, &mut code.blocks) + .expect("optimize_load_const succeeds"); + + // `basicblock_optimize_load_const()` assigns the current + // pseudo opcode to its effective opcode slot, so the following COPY 1 + // is not treated as a copy of the earlier LOAD_CONST. + assert!(matches!( + code.blocks[0].instructions[1].instr.pseudo(), + Some(PseudoInstruction::Jump { .. }) + )); + assert!(matches!( + code.blocks[0].instructions[2].instr.real(), + Some(Instruction::Copy { .. }) + )); + assert!(matches!( + code.blocks[0].instructions[3].instr.real(), + Some(Instruction::ToBool) + )); + } + #[test] fn optimize_load_fast_records_no_input_opcode_ref_at_cpython_produced_index() { let mut block = Block::default(); @@ -7488,6 +7655,24 @@ mod tests { )); } + #[test] + fn empty_tuple_repeat_folds_negative_count_like_cpython() { + let folded = const_folding_safe_multiply( + &ConstantData::Tuple { + elements: Vec::new(), + }, + &ConstantData::Integer { + value: BigInt::from(-1), + }, + ) + .expect("CPython skips repeat-count checks for empty tuples"); + + assert!(matches!( + folded, + ConstantData::Tuple { elements } if elements.is_empty() + )); + } + #[test] fn resolve_line_numbers_duplicates_exit_blocks_like_cpython() { let exit = BlockIdx::new(2); @@ -7621,4 +7806,51 @@ mod tests { assert_eq!(threaded.target, BlockIdx::new(3)); assert_eq!(u32::from(threaded.arg), 3); } + + #[test] + fn same_direction_pseudo_conditional_jump_thread_false_keeps_target() { + let mut blocks = Blocks::from([Block::default(), Block::default(), Block::default()]); + for (i, block) in blocks.iter_mut().enumerate() { + block.cpython_label = InstructionSequenceLabel::from_index(i as i32); + } + blocks[0].next = BlockIdx::new(1); + blocks[1].next = BlockIdx::new(2); + test_block_push(&mut blocks[0], test_cond_jump(BlockIdx::new(1), 10)); + test_block_push(&mut blocks[1], test_cond_jump(BlockIdx::new(1), 20)); + test_block_push(&mut blocks[2], test_instr(Instruction::ReturnValue, 30)); + + let mut metadata = test_code_info(Block::default()).metadata; + blocks + .optimize_basic_block(&mut metadata, BlockIdx::new(0)) + .expect("valid conditional jump chain"); + + // Only rewrite JUMP_IF_FALSE -> JUMP_IF_TRUE through + // target->b_next. For same-direction jumps, a failed jump_thread() + // leaves the original target unchanged. + assert_eq!(blocks[0].instructions[0].target, BlockIdx::new(1)); + assert!(matches!( + blocks[0].instructions[0].instr.pseudo(), + Some(PseudoInstruction::JumpIfFalse { .. }) + )); + } + + #[test] + fn opposite_direction_pseudo_conditional_uses_target_fallthrough() { + let mut blocks = Blocks::from([Block::default(), Block::default(), Block::default()]); + for (i, block) in blocks.iter_mut().enumerate() { + block.cpython_label = InstructionSequenceLabel::from_index(i as i32); + } + blocks[0].next = BlockIdx::new(1); + blocks[1].next = BlockIdx::new(2); + test_block_push(&mut blocks[0], test_cond_jump(BlockIdx::new(1), 10)); + test_block_push(&mut blocks[1], test_true_cond_jump(BlockIdx::new(2), 20)); + test_block_push(&mut blocks[2], test_instr(Instruction::ReturnValue, 30)); + + let mut metadata = test_code_info(Block::default()).metadata; + blocks + .optimize_basic_block(&mut metadata, BlockIdx::new(0)) + .expect("valid conditional jump chain"); + + assert_eq!(blocks[0].instructions[0].target, BlockIdx::new(2)); + } } diff --git a/crates/codegen/src/lib.rs b/crates/codegen/src/lib.rs index b598ab7e9..a7349a576 100644 --- a/crates/codegen/src/lib.rs +++ b/crates/codegen/src/lib.rs @@ -8,13 +8,15 @@ extern crate log; extern crate alloc; +use rustpython_compiler_core::bytecode::ConstantData; + type IndexMap<K, V> = indexmap::IndexMap<K, V, rapidhash::quality::RandomState>; type IndexSet<T> = indexmap::IndexSet<T, rapidhash::quality::RandomState>; pub mod compile; pub mod error; pub mod ir; -mod preprocess; +pub mod preprocess; mod string_parser; pub mod symboltable; mod unparse; @@ -24,6 +26,73 @@ use ruff_python_ast as ast; pub(crate) use compile::InternalResult; +#[cfg(test)] +pub(crate) fn constant_data_to_ast_constant_value(value: ConstantData) -> ast::ConstantValue { + match value { + ConstantData::None => ast::ConstantValue::None, + ConstantData::Boolean { value } => ast::ConstantValue::Boolean(value), + ConstantData::Str { value } => ast::ConstantValue::Str(value.to_string().into_boxed_str()), + ConstantData::Bytes { value } => ast::ConstantValue::Bytes(value.into_boxed_slice()), + ConstantData::Integer { value } => ast::ConstantValue::Integer(value.to_string().into()), + ConstantData::Tuple { elements } => ast::ConstantValue::Tuple( + elements + .into_iter() + .map(constant_data_to_ast_constant_value) + .collect(), + ), + ConstantData::Frozenset { elements } => ast::ConstantValue::Frozenset( + elements + .into_iter() + .map(constant_data_to_ast_constant_value) + .collect(), + ), + ConstantData::Float { value } => ast::ConstantValue::Float(value), + ConstantData::Complex { value } => ast::ConstantValue::Complex { + real: value.re, + imag: value.im, + }, + ConstantData::Ellipsis => ast::ConstantValue::Ellipsis, + ConstantData::Code { .. } | ConstantData::Slice { .. } => { + unreachable!("ast.Constant values cannot contain code objects or slices") + } + } +} + +pub(crate) fn ast_constant_value_to_constant_data(value: ast::ConstantValue) -> ConstantData { + match value { + ast::ConstantValue::None => ConstantData::None, + ast::ConstantValue::Boolean(value) => ConstantData::Boolean { value }, + ast::ConstantValue::Str(value) => ConstantData::Str { + value: value.to_string().into(), + }, + ast::ConstantValue::Bytes(value) => ConstantData::Bytes { + value: value.into_vec(), + }, + ast::ConstantValue::Integer(value) => ConstantData::Integer { + value: value + .parse() + .expect("RustPython ast.Constant integer values are decimal integers"), + }, + ast::ConstantValue::Tuple(elements) => ConstantData::Tuple { + elements: elements + .into_iter() + .map(ast_constant_value_to_constant_data) + .collect(), + }, + ast::ConstantValue::Frozenset(elements) => ConstantData::Frozenset { + elements: elements + .into_iter() + .map(ast_constant_value_to_constant_data) + .collect(), + }, + ast::ConstantValue::Float(value) => ConstantData::Float { value }, + ast::ConstantValue::Complex { real, imag } => ConstantData::Complex { + value: num_complex::Complex::new(real, imag), + }, + ast::ConstantValue::Ellipsis => ConstantData::Ellipsis, + } +} + pub trait ToPythonName { /// Returns a short name for the node suitable for use in error messages. fn python_name(&self) -> &'static str; @@ -48,6 +117,19 @@ impl ToPythonName for ast::Expr { } Self::EllipsisLiteral(_) => "ellipsis", Self::NoneLiteral(_) => "None", + Self::Constant(expr) => match &expr.value { + ast::ConstantValue::None => "None", + ast::ConstantValue::Boolean(true) => "True", + ast::ConstantValue::Boolean(false) => "False", + ast::ConstantValue::Ellipsis => "ellipsis", + ast::ConstantValue::Tuple(_) => "tuple", + ast::ConstantValue::Frozenset(_) => "literal", + ast::ConstantValue::Str(_) + | ast::ConstantValue::Bytes(_) + | ast::ConstantValue::Integer(_) + | ast::ConstantValue::Float(_) + | ast::ConstantValue::Complex { .. } => "literal", + }, Self::NumberLiteral(_) | Self::BytesLiteral(_) | Self::StringLiteral(_) => "literal", Self::Tuple(_) => "tuple", Self::List { .. } => "list", @@ -65,7 +147,7 @@ impl ToPythonName for ast::Expr { Self::Lambda { .. } => "lambda", Self::If { .. } => "conditional expression", Self::Named { .. } => "named expression", - Self::IpyEscapeCommand(_) => todo!(), + Self::IpyEscapeCommand(_) => "expression", } } } diff --git a/crates/codegen/src/preprocess.rs b/crates/codegen/src/preprocess.rs index ae2e65bf3..f6ca18b67 100644 --- a/crates/codegen/src/preprocess.rs +++ b/crates/codegen/src/preprocess.rs @@ -8,29 +8,401 @@ use ruff_python_ast::{ visitor::transformer::{self, Transformer}, }; use ruff_text_size::{Ranged, TextRange}; +use rustpython_compiler_core::bytecode; const MAXDIGITS: usize = 3; const F_LJUST: u8 = 1; -pub(crate) fn preprocess_mod(module: &mut ast::Mod) { - let preprocessor = AstPreprocessor; +/// ast_preprocess.c ControlFlowInFinallyContext +#[derive(Clone, Copy)] +struct ControlFlowInFinallyContext { + in_finally: bool, + in_funcdef: bool, + in_loop: bool, +} + +/// ast_preprocess.c before_return +fn before_return<E>( + contexts: &[ControlFlowInFinallyContext], + range: TextRange, + warn: &mut impl FnMut(TextRange, String) -> Result<(), E>, +) -> Result<(), E> { + if let Some(ctx) = contexts.last() + && ctx.in_finally + && !ctx.in_funcdef + { + warn(range, "'return' in a 'finally' block".to_owned())?; + } + Ok(()) +} + +/// ast_preprocess.c before_loop_exit +fn before_loop_exit<E>( + contexts: &[ControlFlowInFinallyContext], + range: TextRange, + kw: &str, + warn: &mut impl FnMut(TextRange, String) -> Result<(), E>, +) -> Result<(), E> { + if let Some(ctx) = contexts.last() + && ctx.in_finally + && !ctx.in_loop + { + warn(range, format!("'{kw}' in a 'finally' block"))?; + } + Ok(()) +} + +fn visit_body_with_control_flow_context<E>( + body: &[ast::Stmt], + contexts: &mut Vec<ControlFlowInFinallyContext>, + warn: &mut impl FnMut(TextRange, String) -> Result<(), E>, + in_finally: bool, + in_funcdef: bool, + in_loop: bool, +) -> Result<(), E> { + contexts.push(ControlFlowInFinallyContext { + in_finally, + in_funcdef, + in_loop, + }); + visit_body_for_control_flow_in_finally(body, contexts, warn)?; + contexts.pop(); + Ok(()) +} + +fn visit_body_for_control_flow_in_finally<E>( + body: &[ast::Stmt], + contexts: &mut Vec<ControlFlowInFinallyContext>, + warn: &mut impl FnMut(TextRange, String) -> Result<(), E>, +) -> Result<(), E> { + for stmt in body { + visit_stmt_for_control_flow_in_finally(stmt, contexts, warn)?; + } + Ok(()) +} + +/// ast_preprocess.c astfold_stmt control-flow warning traversal. +fn visit_stmt_for_control_flow_in_finally<E>( + stmt: &ast::Stmt, + contexts: &mut Vec<ControlFlowInFinallyContext>, + warn: &mut impl FnMut(TextRange, String) -> Result<(), E>, +) -> Result<(), E> { + match stmt { + ast::Stmt::FunctionDef(function) => { + visit_body_with_control_flow_context( + &function.body, + contexts, + warn, + false, + true, + false, + )?; + } + ast::Stmt::ClassDef(class) => { + visit_body_for_control_flow_in_finally(&class.body, contexts, warn)?; + } + ast::Stmt::Return(return_stmt) => { + before_return(contexts, return_stmt.range, warn)?; + } + ast::Stmt::For(for_stmt) => { + visit_body_with_control_flow_context( + &for_stmt.body, + contexts, + warn, + false, + false, + true, + )?; + visit_body_for_control_flow_in_finally(&for_stmt.orelse, contexts, warn)?; + } + ast::Stmt::While(while_stmt) => { + visit_body_with_control_flow_context( + &while_stmt.body, + contexts, + warn, + false, + false, + true, + )?; + visit_body_for_control_flow_in_finally(&while_stmt.orelse, contexts, warn)?; + } + ast::Stmt::If(if_stmt) => { + visit_body_for_control_flow_in_finally(&if_stmt.body, contexts, warn)?; + for clause in &if_stmt.elif_else_clauses { + visit_body_for_control_flow_in_finally(&clause.body, contexts, warn)?; + } + } + ast::Stmt::Try(try_stmt) => { + visit_body_for_control_flow_in_finally(&try_stmt.body, contexts, warn)?; + for handler in &try_stmt.handlers { + match handler { + ast::ExceptHandler::ExceptHandler(handler) => { + visit_body_for_control_flow_in_finally(&handler.body, contexts, warn)?; + } + } + } + visit_body_for_control_flow_in_finally(&try_stmt.orelse, contexts, warn)?; + visit_body_with_control_flow_context( + &try_stmt.finalbody, + contexts, + warn, + true, + false, + false, + )?; + } + ast::Stmt::With(with_stmt) => { + visit_body_for_control_flow_in_finally(&with_stmt.body, contexts, warn)?; + } + ast::Stmt::Match(match_stmt) => { + for case in &match_stmt.cases { + visit_body_for_control_flow_in_finally(&case.body, contexts, warn)?; + } + } + ast::Stmt::Break(break_stmt) => { + before_loop_exit(contexts, break_stmt.range, "break", warn)?; + } + ast::Stmt::Continue(continue_stmt) => { + before_loop_exit(contexts, continue_stmt.range, "continue", warn)?; + } + _ => {} + } + Ok(()) +} + +/// ast_preprocess.c control_flow_in_finally_warning +pub fn warn_control_flow_in_finally<E>( + module: &ast::Mod, + mut warn: impl FnMut(TextRange, String) -> Result<(), E>, +) -> Result<(), E> { + let mut contexts = Vec::new(); match module { - ast::Mod::Module(module) => preprocessor.visit_body(&mut module.body), + ast::Mod::Module(module) => { + visit_body_for_control_flow_in_finally(&module.body, &mut contexts, &mut warn)?; + } + ast::Mod::Expression(_) => {} + } + Ok(()) +} + +pub fn has_future_annotations(module: &ast::Mod) -> bool { + future_features(module).contains(bytecode::CodeFlags::FUTURE_ANNOTATIONS) +} + +pub fn future_features(module: &ast::Mod) -> bytecode::CodeFlags { + checked_future_features(module).unwrap_or_else(|err| err.features) +} + +pub struct FutureFeatureError { + pub features: bytecode::CodeFlags, + pub range: TextRange, + pub kind: FutureFeatureErrorKind, +} + +pub enum FutureFeatureErrorKind { + InvalidFeature(String), + InvalidBraces, +} + +pub fn checked_future_features( + module: &ast::Mod, +) -> Result<bytecode::CodeFlags, FutureFeatureError> { + let ast::Mod::Module(module) = module else { + return Ok(bytecode::CodeFlags::empty()); + }; + checked_future_features_in_body(&module.body) +} + +pub fn checked_future_features_in_body( + body: &[ast::Stmt], +) -> Result<bytecode::CodeFlags, FutureFeatureError> { + let mut future_features = bytecode::CodeFlags::empty(); + let mut statements = body.iter(); + if let Some(ast::Stmt::Expr(ast::StmtExpr { value, .. })) = statements.clone().next() + && string_literal_expr_value(value).is_some() + { + statements.next(); + } + for statement in statements { + match statement { + ast::Stmt::ImportFrom(ast::StmtImportFrom { + module, + names, + level, + .. + }) if *level == 0 && module.as_ref().map(|id| id.as_str()) == Some("__future__") => { + for alias in names { + match alias.name.as_str() { + "nested_scopes" | "generators" | "division" | "absolute_import" + | "with_statement" | "print_function" | "unicode_literals" + | "generator_stop" => {} + "annotations" => { + future_features.insert(bytecode::CodeFlags::FUTURE_ANNOTATIONS); + } + // Accept the future feature name, but leave it + // as a RustPython no-op. + "barry_as_FLUFL" => {} + "braces" => { + return Err(FutureFeatureError { + features: future_features, + range: alias.range, + kind: FutureFeatureErrorKind::InvalidBraces, + }); + } + other => { + return Err(FutureFeatureError { + features: future_features, + range: alias.range, + kind: FutureFeatureErrorKind::InvalidFeature(other.to_owned()), + }); + } + } + } + } + _ => return Ok(future_features), + } + } + Ok(future_features) +} + +pub fn preprocess_statements( + body: &mut [ast::Stmt], + optimize: u8, + future_annotations: bool, + syntax_check_only: bool, +) { + let preprocessor = AstPreprocessor { + optimize, + future_annotations, + constant_folding: !syntax_check_only, + }; + for stmt in body { + preprocessor.visit_stmt(stmt); + } +} + +pub fn preprocess_mod( + module: &mut ast::Mod, + optimize: u8, + future_annotations: bool, + syntax_check_only: bool, +) { + let preprocessor = AstPreprocessor { + optimize, + future_annotations, + constant_folding: !syntax_check_only, + }; + match module { + ast::Mod::Module(module) => preprocessor.visit_astfold_body(&mut module.body), ast::Mod::Expression(expr) => preprocessor.visit_expr(&mut expr.body), } } -struct AstPreprocessor; +struct AstPreprocessor { + optimize: u8, + future_annotations: bool, + constant_folding: bool, +} -impl Transformer for AstPreprocessor { - fn visit_expr(&self, expr: &mut Expr) { - transformer::walk_expr(self, expr); - if let Some(optimized) = optimize_format(expr) { - *expr = optimized; +impl AstPreprocessor { + fn visit_astfold_body(&self, body: &mut ast::Suite) { + let mut docstring = body_starts_with_docstring(body); + if docstring && self.optimize >= 2 { + remove_docstring_from_body(body); + docstring = false; + } + + for stmt in body.iter_mut() { + self.visit_stmt(stmt); + } + + if !docstring && body_starts_with_docstring(body) { + wrap_first_docstring_as_fstring(body); } } } +impl Transformer for AstPreprocessor { + fn visit_stmt(&self, stmt: &mut ast::Stmt) { + match stmt { + ast::Stmt::FunctionDef(function) => { + if let Some(type_params) = &mut function.type_params { + self.visit_type_params(type_params); + } + self.visit_parameters(&mut function.parameters); + self.visit_astfold_body(&mut function.body); + for decorator in &mut function.decorator_list { + self.visit_decorator(decorator); + } + if let Some(returns) = &mut function.returns { + self.visit_annotation(returns); + } + } + ast::Stmt::ClassDef(class) => { + if let Some(type_params) = &mut class.type_params { + self.visit_type_params(type_params); + } + if let Some(arguments) = &mut class.arguments { + self.visit_arguments(arguments); + } + self.visit_astfold_body(&mut class.body); + for decorator in &mut class.decorator_list { + self.visit_decorator(decorator); + } + } + _ => transformer::walk_stmt(self, stmt), + } + } + + fn visit_annotation(&self, expr: &mut Expr) { + if !self.future_annotations { + transformer::walk_annotation(self, expr); + } + } + + fn visit_pattern(&self, pattern: &mut ast::Pattern) { + transformer::walk_pattern(self, pattern); + if !self.constant_folding { + return; + } + match pattern { + ast::Pattern::MatchValue(value) => fold_match_value_constant_expr(&mut value.value), + ast::Pattern::MatchMapping(mapping) => { + for key in &mut mapping.keys { + fold_match_value_constant_expr(key); + } + } + _ => {} + } + } + + fn visit_expr(&self, expr: &mut Expr) { + transformer::walk_expr(self, expr); + if self.constant_folding { + if let Some(optimized) = optimize_format(expr) { + *expr = optimized; + } else if let Some(optimized) = fold_debug_constant(expr, self.optimize) { + *expr = optimized; + } + } + } +} + +fn fold_debug_constant(expr: &Expr, optimize: u8) -> Option<Expr> { + let Expr::Name(name) = expr else { + return None; + }; + if !matches!(name.ctx, ast::ExprContext::Load) || name.id.as_str() != "__debug__" { + return None; + } + + Some(Expr::BooleanLiteral(ast::ExprBooleanLiteral { + node_index: name.node_index.clone(), + range: name.range, + value: optimize == 0, + })) +} + fn optimize_format(expr: &Expr) -> Option<Expr> { let Expr::BinOp(binop) = expr else { return None; @@ -38,9 +410,7 @@ fn optimize_format(expr: &Expr) -> Option<Expr> { if !matches!(binop.op, Operator::Mod) { return None; } - let Expr::StringLiteral(format) = binop.left.as_ref() else { - return None; - }; + let (format, _) = string_literal_expr_value(&binop.left)?; let Expr::Tuple(tuple) = binop.right.as_ref() else { return None; }; @@ -52,7 +422,7 @@ fn optimize_format(expr: &Expr) -> Option<Expr> { return None; } - let elements = parse_format(format.value.to_str(), &tuple.elts)?; + let elements = parse_format(format, &tuple.elts)?; Some(Expr::FString(ExprFString { node_index: binop.node_index.clone(), range: binop.range, @@ -62,6 +432,8 @@ fn optimize_format(expr: &Expr) -> Option<Expr> { elements: InterpolatedStringElements::from(elements), flags: FStringFlags::empty(), }), + runtime_joined_str: None, + runtime_values: None, })) } @@ -163,6 +535,9 @@ fn parse_format_arg(chars: &[char], pos: &mut usize, arg: Expr) -> Option<Interp debug_text: None, conversion, format_spec, + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec: None, }) } @@ -223,3 +598,396 @@ fn generated_literal(value: String) -> InterpolatedStringLiteralElement { value: value.into_boxed_str(), } } + +fn remove_docstring_from_body(body: &mut ast::Suite) { + if let Some(range) = take_docstring(body) { + if !body.is_empty() { + return; + } + let start = range.start(); + let pass_range = TextRange::new(start, start + ruff_text_size::TextSize::from(4)); + body.push(ast::Stmt::Pass(ast::StmtPass { + node_index: Default::default(), + range: pass_range, + })); + } +} + +fn take_docstring(body: &mut ast::Suite) -> Option<TextRange> { + let ast::Stmt::Expr(expr_stmt) = body.first()? else { + return None; + }; + if let Some((_, range)) = string_literal_expr_value(&expr_stmt.value) { + body.remove(0); + return Some(range); + } + None +} + +fn body_starts_with_docstring(body: &[ast::Stmt]) -> bool { + let Some(ast::Stmt::Expr(expr_stmt)) = body.first() else { + return false; + }; + string_literal_expr_value(&expr_stmt.value).is_some() +} + +fn wrap_first_docstring_as_fstring(body: &mut [ast::Stmt]) { + let Some(ast::Stmt::Expr(expr_stmt)) = body.first_mut() else { + return; + }; + let Some((value, range)) = string_literal_expr_value(&expr_stmt.value) else { + return; + }; + let value = value.to_string(); + *expr_stmt.value = ast::Expr::FString(ast::ExprFString { + node_index: AtomicNodeIndex::NONE, + range, + value: FStringValue::single(FString { + range, + node_index: AtomicNodeIndex::NONE, + elements: InterpolatedStringElements::from(vec![InterpolatedStringElement::Literal( + InterpolatedStringLiteralElement { + range, + node_index: AtomicNodeIndex::NONE, + value: value.into_boxed_str(), + }, + )]), + flags: FStringFlags::empty(), + }), + runtime_joined_str: None, + runtime_values: None, + }); +} + +fn string_literal_expr_value(expr: &Expr) -> Option<(&str, TextRange)> { + match expr { + Expr::StringLiteral(string) => Some((string.value.to_str(), expr.range())), + Expr::Constant(ast::ExprConstant { + value: ast::ConstantValue::Str(value), + .. + }) => Some((value.as_ref(), expr.range())), + _ => None, + } +} + +fn fold_match_value_constant_expr(expr: &mut ast::Expr) { + match expr { + ast::Expr::UnaryOp(unary) + if matches!(unary.op, ast::UnaryOp::USub) + && matches!(unary.operand.as_ref(), ast::Expr::NumberLiteral(_)) => + { + if let Some(number) = negate_match_number(&unary.operand) { + *expr = ast::Expr::NumberLiteral(ast::ExprNumberLiteral { + node_index: unary.node_index.clone(), + range: unary.range, + value: number, + }); + } + } + ast::Expr::BinOp(binop) if matches!(binop.op, ast::Operator::Add | ast::Operator::Sub) => { + fold_match_value_constant_expr(&mut binop.left); + if let Some(number) = fold_match_number_binop(&binop.left, binop.op, &binop.right) { + *expr = ast::Expr::NumberLiteral(ast::ExprNumberLiteral { + node_index: binop.node_index.clone(), + range: binop.range, + value: number, + }); + } + } + _ => {} + } +} + +fn negate_match_number(expr: &ast::Expr) -> Option<ast::Number> { + let ast::Expr::NumberLiteral(number) = expr else { + return None; + }; + Some(match &number.value { + ast::Number::Int(value) => { + if *value == ast::Int::ZERO { + ast::Number::Int(ast::Int::ZERO) + } else { + return None; + } + } + ast::Number::Float(value) => ast::Number::Float(-value), + ast::Number::Complex { real, imag } => ast::Number::Complex { + real: -real, + imag: -imag, + }, + }) +} + +fn fold_match_number_binop( + left: &ast::Expr, + op: ast::Operator, + right: &ast::Expr, +) -> Option<ast::Number> { + let ast::Expr::NumberLiteral(left) = left else { + return None; + }; + let ast::Expr::NumberLiteral(right) = right else { + return None; + }; + let right = match right.value { + ast::Number::Complex { real, imag } => (real, imag), + _ => return None, + }; + enum MatchNumberLeft { + Real(f64), + Complex { real: f64, imag: f64 }, + } + let left = match &left.value { + ast::Number::Int(value) => MatchNumberLeft::Real(value.as_i64()? as f64), + ast::Number::Float(value) => MatchNumberLeft::Real(*value), + ast::Number::Complex { real, imag } => MatchNumberLeft::Complex { + real: *real, + imag: *imag, + }, + }; + let (real, imag) = match (left, op) { + (MatchNumberLeft::Real(left), ast::Operator::Add) => (left + right.0, right.1), + (MatchNumberLeft::Real(left), ast::Operator::Sub) => (left - right.0, -right.1), + (MatchNumberLeft::Complex { real, imag }, ast::Operator::Add) => { + (real + right.0, imag + right.1) + } + (MatchNumberLeft::Complex { real, imag }, ast::Operator::Sub) => { + (real - right.0, imag - right.1) + } + _ => return None, + }; + Some(ast::Number::Complex { real, imag }) +} + +#[cfg(test)] +mod tests { + use super::*; + + fn first_match_value(source: &str) -> ast::Expr { + let parsed = ruff_python_parser::parse(source, ruff_python_parser::Mode::Module.into()) + .unwrap() + .into_syntax(); + let mut module = parsed; + let future_annotations = has_future_annotations(&module); + preprocess_mod(&mut module, 0, future_annotations, false); + let ast::Mod::Module(module) = module else { + panic!("expected module"); + }; + let [ast::Stmt::Match(match_stmt)] = &module.body[..] else { + panic!("expected a single match statement"); + }; + let ast::Pattern::MatchValue(value) = &match_stmt.cases[0].pattern else { + panic!("expected a value pattern"); + }; + *value.value.clone() + } + + fn preprocess_source(source: &str) -> ast::Mod { + let mut module = ruff_python_parser::parse(source, ruff_python_parser::Mode::Module.into()) + .unwrap() + .into_syntax(); + let future_annotations = has_future_annotations(&module); + preprocess_mod(&mut module, 0, future_annotations, false); + module + } + + fn preprocess_source_with_optimize(source: &str, optimize: u8) -> ast::Mod { + let mut module = ruff_python_parser::parse(source, ruff_python_parser::Mode::Module.into()) + .unwrap() + .into_syntax(); + let future_annotations = has_future_annotations(&module); + preprocess_mod(&mut module, optimize, future_annotations, false); + module + } + + fn preprocess_source_syntax_check_only(source: &str, optimize: u8) -> ast::Mod { + let mut module = ruff_python_parser::parse(source, ruff_python_parser::Mode::Module.into()) + .unwrap() + .into_syntax(); + let future_annotations = has_future_annotations(&module); + preprocess_mod(&mut module, optimize, future_annotations, true); + module + } + + #[test] + fn folds_match_value_negative_float_in_preprocess() { + let value = first_match_value( + "\ +match value: + case -1.5: + pass +", + ); + let ast::Expr::NumberLiteral(number) = value else { + panic!("expected folded number literal, got {value:?}"); + }; + assert!(matches!(number.value, ast::Number::Float(value) if value == -1.5)); + } + + #[test] + fn folds_match_value_complex_binop_in_preprocess() { + let value = first_match_value( + "\ +match value: + case 1 + 2j: + pass +", + ); + let ast::Expr::NumberLiteral(number) = value else { + panic!("expected folded number literal, got {value:?}"); + }; + assert!( + matches!(number.value, ast::Number::Complex { real, imag } if real == 1.0 && imag == 2.0) + ); + } + + #[test] + fn folds_match_value_complex_complex_binop_in_preprocess() { + let left = ast::Expr::NumberLiteral(ast::ExprNumberLiteral { + node_index: AtomicNodeIndex::NONE, + range: TextRange::default(), + value: ast::Number::Complex { + real: 0.0, + imag: 1.0, + }, + }); + let right = ast::Expr::NumberLiteral(ast::ExprNumberLiteral { + node_index: AtomicNodeIndex::NONE, + range: TextRange::default(), + value: ast::Number::Complex { + real: 0.0, + imag: 2.0, + }, + }); + let number = fold_match_number_binop(&left, ast::Operator::Add, &right) + .expect("CPython fold_const_match_patterns() uses PyNumber_Add"); + assert!( + matches!(number, ast::Number::Complex { real, imag } if real == 0.0 && imag == 3.0) + ); + } + + #[test] + fn folds_match_value_real_minus_zero_complex_preserves_negative_zero_in_preprocess() { + let value = first_match_value( + "\ +match value: + case 0 - 0j: + pass +", + ); + let ast::Expr::NumberLiteral(number) = value else { + panic!("expected folded number literal, got {value:?}"); + }; + assert!(matches!(number.value, ast::Number::Complex { real, imag } + if real == 0.0 && imag == 0.0 && imag.is_sign_negative())); + } + + #[test] + fn future_annotations_skip_annotation_preprocess_like_cpython() { + let module = preprocess_source( + "\ +from __future__ import annotations +def f(x: __debug__) -> __debug__: + pass +y: __debug__ +z = __debug__ +", + ); + let ast::Mod::Module(module) = module else { + panic!("expected module"); + }; + let ast::Stmt::FunctionDef(function) = &module.body[1] else { + panic!("expected function"); + }; + let annotation = function.parameters.args[0] + .parameter + .annotation + .as_deref() + .expect("missing parameter annotation"); + assert!( + matches!(annotation, ast::Expr::Name(name) if name.id.as_str() == "__debug__"), + "future annotations should skip parameter annotation folding, got {annotation:?}" + ); + let returns = function + .returns + .as_deref() + .expect("missing return annotation"); + assert!( + matches!(returns, ast::Expr::Name(name) if name.id.as_str() == "__debug__"), + "future annotations should skip return annotation folding, got {returns:?}" + ); + let ast::Stmt::AnnAssign(ann_assign) = &module.body[2] else { + panic!("expected annotated assignment"); + }; + assert!( + matches!(ann_assign.annotation.as_ref(), ast::Expr::Name(name) if name.id.as_str() == "__debug__"), + "future annotations should skip annotated assignment annotation folding, got {:?}", + ann_assign.annotation + ); + let ast::Stmt::Assign(assign) = &module.body[3] else { + panic!("expected assignment"); + }; + assert!( + matches!(assign.value.as_ref(), ast::Expr::BooleanLiteral(boolean) if boolean.value), + "non-annotation expression should still fold __debug__, got {:?}", + assign.value + ); + } + + #[test] + fn late_future_annotations_do_not_affect_preprocess_like_cpython() { + let module = preprocess_source( + "\ +x = 1 +from __future__ import annotations +y: __debug__ +", + ); + let ast::Mod::Module(module) = module else { + panic!("expected module"); + }; + let ast::Stmt::AnnAssign(ann_assign) = &module.body[2] else { + panic!("expected annotated assignment"); + }; + assert!( + matches!(ann_assign.annotation.as_ref(), ast::Expr::BooleanLiteral(boolean) if boolean.value), + "late future import should not disable annotation folding, got {:?}", + ann_assign.annotation + ); + } + + #[test] + fn optimize_two_wraps_new_docstring_after_removing_original() { + let module = preprocess_source_with_optimize("\"first\"\n\"second\"\n", 2); + let ast::Mod::Module(module) = module else { + panic!("expected module"); + }; + let [ast::Stmt::Expr(expr)] = &module.body[..] else { + panic!("expected only the second statement to remain"); + }; + assert!( + matches!(expr.value.as_ref(), ast::Expr::FString(_)), + "CPython wraps the new leading string as JoinedStr so it is not a docstring" + ); + } + + #[test] + fn syntax_check_only_disables_constant_folding_but_keeps_docstring_strip() { + let module = preprocess_source_syntax_check_only("\"doc\"\nvalue = __debug__\n", 2); + let ast::Mod::Module(module) = module else { + panic!("expected module"); + }; + assert!( + matches!(module.body[0], ast::Stmt::Assign(_)), + "optimize=2 should still strip docstrings in syntax_check_only mode" + ); + let ast::Stmt::Assign(assign) = &module.body[0] else { + panic!("expected assignment"); + }; + assert!( + matches!(assign.value.as_ref(), ast::Expr::Name(name) if name.id.as_str() == "__debug__"), + "syntax_check_only should skip __debug__ folding, got {:?}", + assign.value + ); + } +} diff --git a/crates/codegen/src/symboltable.rs b/crates/codegen/src/symboltable.rs index 27ba10eba..b021a494c 100644 --- a/crates/codegen/src/symboltable.rs +++ b/crates/codegen/src/symboltable.rs @@ -17,6 +17,9 @@ use ruff_python_ast as ast; use ruff_text_size::{Ranged, TextRange}; use rustpython_compiler_core::{PositionEncoding, SourceFile, SourceLocation}; +const DEFAULT_RECURSION_LIMIT: usize = 1000; +const RECURSION_ERROR: &str = "maximum recursion depth exceeded during compilation"; + /// Captures all symbols in the current scope, and has a list of sub-scopes in this scope. #[derive(Clone)] pub struct SymbolTable { @@ -42,6 +45,20 @@ pub struct SymbolTable { /// AST nodes. pub sub_tables: Vec<Self>, + /// Annotation scopes registered in st_blocks but not added + /// to ste_children, e.g. future-annotation function signatures. + pub hidden_annotation_blocks: Vec<Self>, + + /// Cursor pointing to the next hidden annotation block to consume. + pub next_hidden_annotation_block: usize, + + /// Inlined comprehension scopes removed from ste_children but + /// can still find through st_blocks keyed by the comprehension expression. + pub inlined_comprehension_blocks: Vec<Self>, + + /// Cursor pointing to the next inlined comprehension block to consume. + pub next_inlined_comprehension_block: usize, + /// Cursor pointing to the next sub-table to consume during compilation. pub next_sub_table: usize, @@ -63,6 +80,19 @@ pub struct SymbolTable { /// Whether this scope contains await or async comprehension machinery. pub is_coroutine: bool, + /// Whether this scope contains a return statement with a value. + pub returns_value: bool, + + /// Whether this block visited at least one annotation expression. + pub annotations_used: bool, + + /// Optional description of the current type-variable evaluator context. + pub scope_info: Option<&'static str>, + + /// Whether this annotation block is currently visiting an unevaluated + /// function-local annotation. + pub in_unevaluated_annotation: bool, + /// Whether this comprehension scope should be inlined (PEP 709) /// True for list/set/dict comprehensions in non-generator expressions pub comp_inlined: bool, @@ -73,7 +103,7 @@ pub struct SymbolTable { /// True only for deferred function/class/module annotation scopes that /// should resolve outer names as if they were siblings of the owning - /// function body, matching CPython's PEP 649 lookup rules. + /// function body, matching PEP 649 lookup rules. pub skip_enclosing_function_scope: bool, /// PEP 649: Whether this scope has conditional annotations @@ -99,6 +129,10 @@ impl SymbolTable { is_method: false, symbols: IndexMap::default(), sub_tables: vec![], + hidden_annotation_blocks: vec![], + next_hidden_annotation_block: 0, + inlined_comprehension_blocks: vec![], + next_inlined_comprehension_block: 0, next_sub_table: 0, varnames: Vec::new(), needs_class_closure: false, @@ -106,6 +140,10 @@ impl SymbolTable { can_see_class_scope: false, is_generator: false, is_coroutine: false, + returns_value: false, + annotations_used: false, + scope_info: None, + in_unevaluated_annotation: false, comp_inlined: false, annotation_block: None, skip_enclosing_function_scope: false, @@ -115,11 +153,39 @@ impl SymbolTable { } } + fn add_format_parameter(&mut self) { + let name = ".format"; + let symbol = self + .symbols + .entry(name.to_owned()) + .or_insert_with(|| Symbol::new(name)); + symbol + .flags + .insert(SymbolFlags::PARAMETER | SymbolFlags::REFERENCED); + if !self.varnames.iter().any(|varname| varname == name) { + self.varnames.push(name.to_owned()); + } + } + pub fn scan_program( program: &ast::ModModule, source_file: SourceFile, + ) -> SymbolTableResult<Self> { + Self::scan_program_with_options(program, source_file, false, false, DEFAULT_RECURSION_LIMIT) + } + + pub fn scan_program_with_options( + program: &ast::ModModule, + source_file: SourceFile, + allow_top_level_await: bool, + future_annotations: bool, + recursion_limit: usize, ) -> SymbolTableResult<Self> { let mut builder = SymbolTableBuilder::new(source_file); + builder.allow_top_level_await = allow_top_level_await; + builder.recursion_limit = recursion_limit; + builder.future_annotations = future_annotations + || SymbolTableBuilder::future_annotations_from_module_body(program.body.as_ref()); builder.scan_statements(program.body.as_ref())?; builder.finish() } @@ -127,8 +193,21 @@ impl SymbolTable { pub fn scan_expr( expr: &ast::ModExpression, source_file: SourceFile, + ) -> SymbolTableResult<Self> { + Self::scan_expr_with_options(expr, source_file, false, false, DEFAULT_RECURSION_LIMIT) + } + + pub fn scan_expr_with_options( + expr: &ast::ModExpression, + source_file: SourceFile, + allow_top_level_await: bool, + future_annotations: bool, + recursion_limit: usize, ) -> SymbolTableResult<Self> { let mut builder = SymbolTableBuilder::new(source_file); + builder.allow_top_level_await = allow_top_level_await; + builder.recursion_limit = recursion_limit; + builder.future_annotations = future_annotations; builder.scan_expression(expr.body.as_ref(), ExpressionContext::Load)?; builder.finish() } @@ -150,6 +229,8 @@ pub enum CompilerScope { TypeParams, /// PEP 649: Annotation scope for deferred evaluation Annotation, + TypeAlias, + TypeVariable, } impl fmt::Display for CompilerScope { @@ -163,11 +244,8 @@ impl fmt::Display for CompilerScope { Self::Comprehension => write!(f, "comprehension"), Self::TypeParams => write!(f, "type parameter"), Self::Annotation => write!(f, "annotation"), - // TODO missing types from the C implementation - // if self._table.type == _symtable.TYPE_TYPE_VAR_BOUND: - // return "TypeVar bound" - // if self._table.type == _symtable.TYPE_TYPE_ALIAS: - // return "type alias" + Self::TypeAlias => write!(f, "type alias"), + Self::TypeVariable => write!(f, "TypeVar bound"), } } } @@ -287,9 +365,14 @@ pub struct SymbolTableError { impl SymbolTableError { #[must_use] pub fn into_codegen_error(self, source_path: String) -> CodegenError { + let error = if self.error == RECURSION_ERROR { + CodegenErrorType::RecursionError + } else { + CodegenErrorType::SyntaxError(self.error) + }; CodegenError { location: self.location, - error: CodegenErrorType::SyntaxError(self.error), + error, source_path, } } @@ -320,7 +403,7 @@ fn analyze_symbol_table(symbol_table: &mut SymbolTable) -> SymbolTableResult { } /* Drop __class__ and __classdict__ from free variables in class scope - and set the appropriate flags. Equivalent to CPython's drop_class_free(). + and set the appropriate flags. Equivalent to drop_class_free(). See: https://github.com/python/cpython/blob/main/Python/symtable.c#L884 This function removes __class__ and __classdict__ from the @@ -339,20 +422,6 @@ fn drop_class_free(symbol_table: &mut SymbolTable, newfree: &mut IndexSet<String symbol_table.needs_classdict = true; } - // Classes with function definitions need __classdict__ for PEP 649 - // (but not when `from __future__ import annotations` is active) - if !symbol_table.needs_classdict && !symbol_table.future_annotations { - let has_functions = symbol_table.sub_tables.iter().any(|t| { - matches!( - t.typ, - CompilerScope::Function | CompilerScope::AsyncFunction - ) - }); - if has_functions { - symbol_table.needs_classdict = true; - } - } - // Check if __conditional_annotations__ is in the free variables collected from children // Remove it from free set - it's handled specially in class scope if newfree.shift_remove("__conditional_annotations__") { @@ -369,7 +438,7 @@ fn inline_comprehension( inlined_cells: &mut IndexSet<String>, parent_type: CompilerScope, ) -> IndexSet<String> { - let mut removed_class_implicit = IndexSet::default(); + let mut removed_class_implicits = IndexSet::default(); for (name, sub_symbol) in &comp.symbols { // Skip the .0 parameter if sub_symbol.flags.contains(SymbolFlags::PARAMETER) { @@ -383,15 +452,24 @@ fn inline_comprehension( inlined_cells.insert(name.clone()); } - // Handle __class__ in ClassBlock + // __class__, __classdict__ and __conditional_annotations__ are never + // allowed to be free through a class scope. let scope = if sub_symbol.scope == SymbolScope::Free && parent_type == CompilerScope::Class && matches!( name.as_str(), "__class__" | "__classdict__" | "__conditional_annotations__" ) { - comp_free.swap_remove(name); - removed_class_implicit.insert(name.clone()); + let is_free_in_child = comp.sub_tables.iter().any(|child| { + child + .symbols + .get(name) + .is_some_and(|s| s.scope == SymbolScope::Free) + }); + if !is_free_in_child { + comp_free.swap_remove(name); + } + removed_class_implicits.insert(name.clone()); SymbolScope::GlobalImplicit } else { sub_symbol.scope @@ -413,14 +491,14 @@ fn inline_comprehension( } } else { // Name doesn't exist in parent, copy the comprehension binding. - // This matches CPython's inline_comprehension(): newly introduced + // Matches inline_comprehension(): newly introduced // comprehension locals stay locals in the parent scope. let mut symbol = sub_symbol.clone(); symbol.scope = scope; parent_symbols.insert(name.clone(), symbol); } } - removed_class_implicit + removed_class_implicits } type SymbolMap = IndexMap<String, Symbol>; @@ -471,12 +549,6 @@ mod stack { pub(super) fn iter_mut(&mut self) -> impl DoubleEndedIterator<Item = &mut T> + '_ { self.as_mut().iter_mut().map(|x| &mut **x) } - // pub fn top(&self) -> Option<&T> { - // self.as_ref().last().copied() - // } - // pub fn top_mut(&mut self) -> Option<&mut T> { - // self.as_mut().last_mut().map(|x| &mut **x) - // } pub(super) fn len(&self) -> usize { self.v.len() } @@ -548,32 +620,27 @@ impl SymbolTableAnalyzer { symbol_table.typ, symbol_table.skip_enclosing_function_scope, ); + let class_scope_entry = if is_class { + class_symbols_clone.as_ref() + } else { + class_entry + }; self.tables.with_append(&mut info, |list| { let inner_scope = unsafe { &mut *(list as *mut _ as *mut Self) }; for sub_table in sub_tables.iter_mut() { - let child_class_entry = if sub_table.can_see_class_scope { - if is_class { - class_symbols_clone.as_ref() - } else { - class_entry - } - } else { - None - }; + let child_class_entry = sub_table + .can_see_class_scope + .then_some(class_scope_entry) + .flatten(); let child_free = inner_scope.analyze_symbol_table(sub_table, child_class_entry)?; child_frees.push((child_free, sub_table.comp_inlined)); } // PEP 649: Analyze annotation block if present if let Some(annotation_table) = annotation_block { - let ann_class_entry = if annotation_table.can_see_class_scope { - if is_class { - class_symbols_clone.as_ref() - } else { - class_entry - } - } else { - None - }; + let ann_class_entry = annotation_table + .can_see_class_scope + .then_some(class_scope_entry) + .flatten(); let child_free = inner_scope.analyze_symbol_table(annotation_table, ann_class_entry)?; annotation_free = Some(child_free); @@ -614,6 +681,26 @@ impl SymbolTableAnalyzer { newfree.extend(ann_free); } + let mut inlined_blocks = Vec::new(); + let mut idx = 0; + while idx < symbol_table.sub_tables.len() { + if symbol_table.sub_tables[idx].comp_inlined { + let comp = symbol_table.sub_tables.remove(idx); + let nested_inlined_blocks = comp.inlined_comprehension_blocks.clone(); + let children = comp.sub_tables.clone(); + let inserted = children.len(); + inlined_blocks.push(comp); + inlined_blocks.extend(nested_inlined_blocks); + symbol_table.sub_tables.splice(idx..idx, children); + idx += inserted; + } else { + idx += 1; + } + } + symbol_table + .inlined_comprehension_blocks + .extend(inlined_blocks); + let sub_tables = &*symbol_table.sub_tables; for symbol in symbol_table.symbols.values_mut() { @@ -633,7 +720,7 @@ impl SymbolTableAnalyzer { class_entry, )?; - // CPython analyze_cells(): once a function-like scope owns a + // analyze_cells(): once a function-like scope owns a // child-requested name as a cell, that name is no longer free in // the enclosing scope. if function_like_scope && symbol.scope == SymbolScope::Cell { @@ -646,7 +733,7 @@ impl SymbolTableAnalyzer { } } - // PEP 709 / CPython symtable.c: + // PEP 709 / symtable.c: // - only promote LOCAL -> CELL in function-like scopes, where // analyze_cells() runs. Module and class scopes keep their normal // scope and rely on DEF_COMP_CELL for comprehension-only cells. @@ -664,27 +751,19 @@ impl SymbolTableAnalyzer { drop_class_free(symbol_table, &mut newfree); } - // CPython update_symbols(..., classflag): after class implicit frees + // update_symbols(..., classflag): after class implicit frees // are dropped, a class block, or an annotation/type-params block that // can see a class scope, records existing child-free names with // DEF_FREE_CLASS. This preserves the current scope's own lookup kind // (for example GLOBAL_IMPLICIT via __classdict__) while still making // the name available as a closure cell for nested children such as // generator expressions. - if symbol_table.typ == CompilerScope::Class { + if symbol_table.typ == CompilerScope::Class || symbol_table.can_see_class_scope { for name in &newfree { if let Some(symbol) = symbol_table.symbols.get_mut(name) { symbol.flags.insert(SymbolFlags::FREE_CLASS); } } - } else if symbol_table.can_see_class_scope { - for name in &newfree { - if let Some(symbol) = symbol_table.symbols.get_mut(name) - && !symbol.is_local() - { - symbol.flags.insert(SymbolFlags::FREE_CLASS); - } - } } Ok(newfree) @@ -706,7 +785,6 @@ impl SymbolTableAnalyzer { // propagate symbol to next higher level that can hold it, // i.e., function or module. Comprehension is skipped and // Class is not allowed and detected as error. - //symbol.scope = SymbolScope::Nonlocal; self.analyze_symbol_comprehension(symbol, 0)? } else { match symbol.scope { @@ -1039,12 +1117,8 @@ impl SymbolTableAnalyzer { location: None, }); } - CompilerScope::Annotation => { - // Named expression is not allowed in annotation scope - return Err(SymbolTableError { - error: "named expression cannot be used within an annotation".to_string(), - location: None, - }); + CompilerScope::Annotation | CompilerScope::TypeAlias | CompilerScope::TypeVariable => { + self.analyze_symbol_comprehension(symbol, parent_offset + 1)?; } } Ok(()) @@ -1071,6 +1145,7 @@ struct SymbolTableBuilder { // Scope stack. tables: Vec<SymbolTable>, future_annotations: bool, + allow_top_level_await: bool, source_file: SourceFile, // Current scope's varnames being collected (temporary storage) current_varnames: Vec<String>, @@ -1078,19 +1153,16 @@ struct SymbolTableBuilder { varnames_stack: Vec<Vec<String>>, // Track if we're inside an iterable definition expression (for nested comprehensions) in_iter_def_exp: bool, - // Track if we're inside an annotation (yield/await/named expr not allowed) - in_annotation: bool, - // CPython's ste_in_unevaluated_annotation: function-local AnnAssign - // annotations are not executed and do not contribute name bindings. - in_unevaluated_annotation: bool, - // Track if we're inside a type alias (yield/await/named expr not allowed) - in_type_alias: bool, // Track if we're scanning an inner loop iteration target (not the first generator) in_comp_inner_loop_target: bool, - // Scope info for error messages (e.g., "a TypeVar bound") - scope_info: Option<&'static str>, + // yield/yield from inside comprehension scopes is rejected with a + // message that names the comprehension kind. + comprehension_yield_context: Option<&'static str>, // PEP 649: Track if we're inside a conditional block (if/for/while/etc.) in_conditional_block: bool, + // Mirrors symtable ENTER_RECURSIVE guards during compilation. + recursion_depth: usize, + recursion_limit: usize, } /// Enum to indicate in what mode an expression @@ -1112,16 +1184,16 @@ impl SymbolTableBuilder { class_name: None, tables: vec![], future_annotations: false, + allow_top_level_await: false, source_file, current_varnames: Vec::new(), varnames_stack: Vec::new(), in_iter_def_exp: false, - in_annotation: false, - in_unevaluated_annotation: false, - in_type_alias: false, in_comp_inner_loop_target: false, - scope_info: None, + comprehension_yield_context: None, in_conditional_block: false, + recursion_depth: 0, + recursion_limit: DEFAULT_RECURSION_LIMIT, }; this.enter_scope("top", CompilerScope::Module, 0); this @@ -1135,10 +1207,42 @@ impl SymbolTableBuilder { | CompilerScope::Lambda | CompilerScope::Comprehension | CompilerScope::Annotation + | CompilerScope::TypeAlias + | CompilerScope::TypeVariable | CompilerScope::TypeParams ) } + fn future_annotations_from_module_body(body: &[ast::Stmt]) -> bool { + let mut statements = body.iter(); + if let Some(ast::Stmt::Expr(ast::StmtExpr { value, .. })) = statements.clone().next() + && is_docstring_expr(value) + { + statements.next(); + } + for statement in statements { + match statement { + ast::Stmt::ImportFrom(ast::StmtImportFrom { + module, + names, + level, + .. + }) if *level == 0 + && module.as_ref().map(|id| id.as_str()) == Some("__future__") => + { + if names + .iter() + .any(|future| future.name.as_str() == "annotations") + { + return true; + } + } + _ => return false, + } + } + false + } + fn finish(mut self) -> Result<SymbolTable, SymbolTableError> { assert_eq!(self.tables.len(), 1); let mut symbol_table = self.tables.pop().unwrap(); @@ -1183,7 +1287,7 @@ impl SymbolTableBuilder { fn enter_type_param_block( &mut self, name: &str, - line_number: u32, + range: TextRange, for_class: bool, has_defaults: bool, has_kwdefaults: bool, @@ -1194,7 +1298,11 @@ impl SymbolTableBuilder { .last() .is_some_and(|t| t.typ == CompilerScope::Class); - self.enter_scope(name, CompilerScope::TypeParams, line_number); + self.enter_scope( + name, + CompilerScope::TypeParams, + self.line_index_start(range), + ); // Set properties on the newly created type param scope if let Some(table) = self.tables.last_mut() { @@ -1208,19 +1316,22 @@ impl SymbolTableBuilder { // Add __classdict__ as a USE symbol in type param scope if in class if in_class { - self.register_name("__classdict__", SymbolUsage::Used, TextRange::default())?; + self.register_name("__classdict__", SymbolUsage::Used, range)?; } - // Register .type_params as a SET symbol (it will be converted to cell variable later) - self.register_name(".type_params", SymbolUsage::Assigned, TextRange::default())?; if for_class { - self.register_name(".generic_base", SymbolUsage::Assigned, TextRange::default())?; + // It gets set when we create the type params tuple and used when + // we build up the bases. + self.register_name(".type_params", SymbolUsage::Assigned, range)?; + self.register_name(".type_params", SymbolUsage::Used, range)?; + self.register_name(".generic_base", SymbolUsage::Assigned, range)?; + self.register_name(".generic_base", SymbolUsage::Used, range)?; } if has_defaults { - self.register_name(".defaults", SymbolUsage::Parameter, TextRange::default())?; + self.register_name(".defaults", SymbolUsage::Parameter, range)?; } if has_kwdefaults { - self.register_name(".kwdefaults", SymbolUsage::Parameter, TextRange::default())?; + self.register_name(".kwdefaults", SymbolUsage::Parameter, range)?; } Ok(()) @@ -1236,9 +1347,22 @@ impl SymbolTableBuilder { self.current_varnames = self.varnames_stack.pop().unwrap_or_default(); } + /// Pop symbol table without adding it to the parent children list. + fn discard_scope(&mut self) -> SymbolTable { + let mut table = self.tables.pop().unwrap(); + table.varnames = core::mem::take(&mut self.current_varnames); + self.current_varnames = self.varnames_stack.pop().unwrap_or_default(); + table + } + /// Enter annotation scope (PEP 649) /// Creates or reuses the annotation block for the current scope - fn enter_annotation_scope(&mut self, line_number: u32) { + fn enter_annotation_scope( + &mut self, + line_number: u32, + include_classdict_with_future: bool, + include_conditional_annotations: bool, + ) { let current = self.tables.last_mut().unwrap(); let can_see_class_scope = current.typ == CompilerScope::Class || current.can_see_class_scope; @@ -1256,8 +1380,7 @@ impl SymbolTableBuilder { // Annotation scope in class can see class scope annotation_table.can_see_class_scope = can_see_class_scope; annotation_table.skip_enclosing_function_scope = true; - // Add 'format' parameter - annotation_table.varnames.push("format".to_owned()); + annotation_table.add_format_parameter(); current.annotation_block = Some(Box::new(annotation_table)); } @@ -1269,10 +1392,10 @@ impl SymbolTableBuilder { .push(core::mem::take(&mut self.current_varnames)); self.current_varnames = self.tables.last().unwrap().varnames.clone(); - if can_see_class_scope && !self.future_annotations { + if can_see_class_scope && (include_classdict_with_future || !self.future_annotations) { self.add_classdict_freevar(); // Also add __conditional_annotations__ as free var if parent has conditional annotations - if has_conditional { + if include_conditional_annotations && has_conditional { self.add_conditional_annotations_freevar(); } } @@ -1321,11 +1444,6 @@ impl SymbolTableBuilder { /// Annotation and TypeParams scopes act as async barriers (always non-async). /// Comprehension scopes are transparent (inherit parent's async context). fn is_in_async_context(&self) -> bool { - // Annotations are evaluated in a non-async scope even when - // the enclosing function is async. - if self.in_annotation { - return false; - } for table in self.tables.iter().rev() { match table.typ { CompilerScope::AsyncFunction => return true, @@ -1334,6 +1452,8 @@ impl SymbolTableBuilder { | CompilerScope::Class | CompilerScope::Module | CompilerScope::Annotation + | CompilerScope::TypeAlias + | CompilerScope::TypeVariable | CompilerScope::TypeParams => return false, // Comprehension inherits parent's async context CompilerScope::Comprehension => continue, @@ -1342,6 +1462,14 @@ impl SymbolTableBuilder { false } + fn allows_top_level_await(&self) -> bool { + self.allow_top_level_await + && self + .tables + .last() + .is_some_and(|table| table.typ == CompilerScope::Module) + } + fn line_index_start(&self, range: TextRange) -> u32 { self.source_file .to_source_code() @@ -1364,12 +1492,6 @@ impl SymbolTableBuilder { } fn scan_parameter(&mut self, parameter: &ast::Parameter) -> SymbolTableResult { - self.check_name( - parameter.name.as_str(), - ExpressionContext::Store, - parameter.name.range, - )?; - let usage = if parameter.annotation.is_some() { SymbolUsage::AnnotationParameter } else { @@ -1395,15 +1517,85 @@ impl SymbolTableBuilder { self.register_ident(&parameter.name, usage) } - fn scan_annotation(&mut self, annotation: &ast::Expr) -> SymbolTableResult { - self.scan_annotation_inner(annotation, false) - } - /// Scan an annotation from an AnnAssign statement (can be conditional) fn scan_ann_assign_annotation(&mut self, annotation: &ast::Expr) -> SymbolTableResult { self.scan_annotation_inner(annotation, true) } + fn scan_function_annotations( + &mut self, + parameters: &ast::Parameters, + returns: Option<&ast::Expr>, + line_number: u32, + ) -> SymbolTableResult { + let current = self.tables.last().unwrap(); + let can_see_class_scope = + current.typ == CompilerScope::Class || current.can_see_class_scope; + self.enter_scope("__annotate__", CompilerScope::Annotation, line_number); + self.tables.last_mut().unwrap().can_see_class_scope = can_see_class_scope; + self.tables.last_mut().unwrap().add_format_parameter(); + if can_see_class_scope { + self.register_name("__classdict__", SymbolUsage::Used, TextRange::default())?; + } + + let was_in_unevaluated_annotation = self.tables.last().unwrap().in_unevaluated_annotation; + self.tables.last_mut().unwrap().in_unevaluated_annotation = false; + + let result = (|| { + for annotation in parameters + .posonlyargs + .iter() + .chain(parameters.args.iter()) + .filter_map(|arg| arg.parameter.annotation.as_ref()) + { + self.tables.last_mut().unwrap().annotations_used = true; + self.scan_expression(annotation, ExpressionContext::Load)?; + } + if let Some(annotation) = parameters + .vararg + .as_ref() + .and_then(|arg| arg.annotation.as_ref()) + { + self.tables.last_mut().unwrap().annotations_used = true; + self.scan_expression(annotation, ExpressionContext::Load)?; + } + if let Some(annotation) = parameters + .kwarg + .as_ref() + .and_then(|arg| arg.annotation.as_ref()) + { + self.tables.last_mut().unwrap().annotations_used = true; + self.scan_expression(annotation, ExpressionContext::Load)?; + } + for annotation in parameters + .kwonlyargs + .iter() + .filter_map(|arg| arg.parameter.annotation.as_ref()) + { + self.tables.last_mut().unwrap().annotations_used = true; + self.scan_expression(annotation, ExpressionContext::Load)?; + } + if let Some(annotation) = returns { + self.tables.last_mut().unwrap().annotations_used = true; + self.scan_expression(annotation, ExpressionContext::Load)?; + } + Ok(()) + })(); + + self.tables.last_mut().unwrap().in_unevaluated_annotation = was_in_unevaluated_annotation; + if self.future_annotations { + let annotation_block = self.discard_scope(); + self.tables + .last_mut() + .unwrap() + .hidden_annotation_blocks + .push(annotation_block); + } else { + self.leave_scope(); + } + result + } + fn scan_annotation_inner( &mut self, annotation: &ast::Expr, @@ -1431,11 +1623,6 @@ impl SymbolTableBuilder { } if should_register_conditional_annotations { - self.register_name( - "__conditional_annotations__", - SymbolUsage::Assigned, - annotation.range(), - )?; self.register_name( "__conditional_annotations__", SymbolUsage::Used, @@ -1445,25 +1632,14 @@ impl SymbolTableBuilder { // Create annotation scope for deferred evaluation let line_number = self.line_index_start(annotation.range()); - self.enter_annotation_scope(line_number); - - if self.future_annotations { - // PEP 563: annotations are stringified at compile time - // Don't scan expression - symbols would fail to resolve - // Just create the annotation_block structure - self.leave_annotation_scope(); - return Ok(()); - } + self.enter_annotation_scope(line_number, false, true); // PEP 649: scan expression for symbol references // Class annotations are evaluated in class locals (not module globals) - let was_in_annotation = self.in_annotation; - let was_in_unevaluated_annotation = self.in_unevaluated_annotation; - self.in_annotation = true; - self.in_unevaluated_annotation = is_unevaluated; + let was_in_unevaluated_annotation = self.tables.last().unwrap().in_unevaluated_annotation; + self.tables.last_mut().unwrap().in_unevaluated_annotation = is_unevaluated; let result = self.scan_expression(annotation, ExpressionContext::Load); - self.in_annotation = was_in_annotation; - self.in_unevaluated_annotation = was_in_unevaluated_annotation; + self.tables.last_mut().unwrap().in_unevaluated_annotation = was_in_unevaluated_annotation; self.leave_annotation_scope(); @@ -1471,468 +1647,517 @@ impl SymbolTableBuilder { } fn scan_statement(&mut self, statement: &ast::Stmt) -> SymbolTableResult { - use ast::*; - if let Stmt::ImportFrom(StmtImportFrom { module, names, .. }) = &statement - && module.as_ref().map(|id| id.as_str()) == Some("__future__") - { - self.future_annotations = - self.future_annotations || names.iter().any(|future| &future.name == "annotations"); + if self.recursion_depth >= self.recursion_limit { + return Err(SymbolTableError { + error: RECURSION_ERROR.to_owned(), + location: None, + }); } - - match &statement { - Stmt::Global(StmtGlobal { names, .. }) => { - for name in names { - self.register_ident(name, SymbolUsage::Global)?; + self.recursion_depth += 1; + let result = (|| { + use ast::*; + match &statement { + Stmt::Global(StmtGlobal { names, .. }) => { + for name in names { + self.register_name(name.as_str(), SymbolUsage::Global, statement.range())?; + } } - } - Stmt::Nonlocal(StmtNonlocal { names, .. }) => { - for name in names { - self.register_ident(name, SymbolUsage::Nonlocal)?; + Stmt::Nonlocal(StmtNonlocal { names, .. }) => { + for name in names { + self.register_name( + name.as_str(), + SymbolUsage::Nonlocal, + statement.range(), + )?; + } } - } - Stmt::FunctionDef(StmtFunctionDef { - name, - body, - parameters, - decorator_list, - type_params, - returns, - range, - is_async, - .. - }) => { - self.scan_decorators(decorator_list, ExpressionContext::Load)?; - self.register_ident(name, SymbolUsage::Assigned)?; - - // Save the parent's annotation_block before scanning function annotations, - // so function annotations don't interfere with parent scope annotations. - // This applies to both class scope (methods) and module scope (top-level functions). - let parent_scope_typ = self.tables.last().map(|t| t.typ); - let should_save_annotation_block = matches!( - parent_scope_typ, - Some( - CompilerScope::Class - | CompilerScope::Module - | CompilerScope::Function - | CompilerScope::AsyncFunction - ) - ); - let saved_annotation_block = if should_save_annotation_block { - self.tables.last_mut().unwrap().annotation_block.take() - } else { - None - }; - - // For generic functions, scan defaults before entering type_param_block - // (defaults are evaluated in the enclosing scope, not the type param scope) - let has_type_params = type_params.is_some(); - if has_type_params { - self.scan_parameter_defaults(parameters)?; - } - - // For generic functions, enter type_param block FIRST so that - // annotation scopes are nested inside and can see type parameters. - if let Some(type_params) = type_params { - self.enter_type_param_block( - name.as_str(), - self.line_index_start(type_params.range), - false, - true, - Self::has_kwonlydefaults(parameters), - )?; - self.scan_type_params(type_params)?; - } - let has_return_annotation = if let Some(expression) = returns { - self.scan_annotation(expression)?; - true - } else { - false - }; - self.enter_scope_with_parameters( - name.as_str(), + Stmt::FunctionDef(StmtFunctionDef { + name, + body, parameters, - self.line_index_start(*range), - has_return_annotation, - if *is_async { - CompilerScope::AsyncFunction - } else { - CompilerScope::Function - }, - has_type_params, // skip_defaults: already scanned above - )?; - if *is_async { - self.tables.last_mut().unwrap().is_coroutine = true; - } - self.scan_statements(body)?; - self.leave_scope(); - if type_params.is_some() { - self.leave_scope(); - } + decorator_list, + type_params, + returns, + range, + is_async, + .. + }) => { + self.register_name(name.as_str(), SymbolUsage::Assigned, *range)?; - // Restore parent's annotation_block after processing the function - if let Some(block) = saved_annotation_block { - self.tables.last_mut().unwrap().annotation_block = Some(block); - } - } - Stmt::ClassDef(StmtClassDef { - name, - body, - arguments, - decorator_list, - type_params, - range, - node_index: _, - }) => { - // Save class_name for the entire ClassDef processing - let prev_class = self.class_name.take(); - if let Some(type_params) = type_params { - self.enter_type_param_block( + self.scan_parameter_defaults(parameters)?; + self.scan_decorators(decorator_list, ExpressionContext::Load)?; + + // For generic functions, enter type_param block FIRST so that + // annotation scopes are nested inside and can see type parameters. + if let Some(type_params) = type_params { + self.enter_type_param_block( + name.as_str(), + *range, + false, + Self::has_positional_defaults(parameters), + Self::has_kwonlydefaults(parameters), + )?; + self.scan_type_params(type_params)?; + } + self.enter_scope_with_parameters( name.as_str(), - self.line_index_start(type_params.range), - true, // for_class: enable selective mangling - false, + parameters, + self.line_index_start(*range), + returns.as_deref(), + if *is_async { + CompilerScope::AsyncFunction + } else { + CompilerScope::Function + }, + true, // skip_defaults: already scanned above false, )?; - // Set class_name for mangling in type param scope - self.class_name = Some(name.to_string()); - self.scan_type_params(type_params)?; - } - self.enter_scope( - name.as_str(), - CompilerScope::Class, - self.line_index_start(*range), - ); - // Reset in_conditional_block for new class scope - let saved_in_conditional = self.in_conditional_block; - self.in_conditional_block = false; - self.class_name = Some(name.to_string()); - self.register_name("__module__", SymbolUsage::Assigned, *range)?; - self.register_name("__qualname__", SymbolUsage::Assigned, *range)?; - self.register_name("__doc__", SymbolUsage::Assigned, *range)?; - self.register_name("__class__", SymbolUsage::Assigned, *range)?; - if type_params.is_some() { - self.register_name(".type_params", SymbolUsage::Used, *range)?; - self.register_name("__type_params__", SymbolUsage::Assigned, *range)?; - } - self.scan_statements(body)?; - self.leave_scope(); - self.in_conditional_block = saved_in_conditional; - // For non-generic classes, restore class_name before base scanning. - // Bases are evaluated in the enclosing scope, not the class scope. - // For generic classes, bases are scanned within the type_param scope - // where class_name is already correctly set. - if type_params.is_none() { - self.class_name = prev_class.clone(); - } - if let Some(arguments) = arguments { - self.scan_expressions(&arguments.args, ExpressionContext::Load)?; - for keyword in &arguments.keywords { - self.scan_expression(&keyword.value, ExpressionContext::Load)?; - } - } - if type_params.is_some() { - self.leave_scope(); - } - // Restore class_name after all ClassDef processing - self.class_name = prev_class; - self.scan_decorators(decorator_list, ExpressionContext::Load)?; - self.register_ident(name, SymbolUsage::Assigned)?; - } - Stmt::Expr(StmtExpr { value, .. }) => { - self.scan_expression(value, ExpressionContext::Load)? - } - Stmt::If(StmtIf { - test, - body, - elif_else_clauses, - .. - }) => { - self.scan_expression(test, ExpressionContext::Load)?; - // PEP 649: Track conditional block for annotations - let saved_in_conditional_block = self.in_conditional_block; - self.in_conditional_block = true; - self.scan_statements(body)?; - for elif in elif_else_clauses { - if let Some(test) = &elif.test { - self.scan_expression(test, ExpressionContext::Load)?; - } - self.scan_statements(&elif.body)?; - } - self.in_conditional_block = saved_in_conditional_block; - } - Stmt::For(StmtFor { - target, - iter, - body, - orelse, - .. - }) => { - self.scan_expression(target, ExpressionContext::Store)?; - self.scan_expression(iter, ExpressionContext::Load)?; - // PEP 649: Track conditional block for annotations - let saved_in_conditional_block = self.in_conditional_block; - self.in_conditional_block = true; - self.scan_statements(body)?; - self.scan_statements(orelse)?; - self.in_conditional_block = saved_in_conditional_block; - } - Stmt::While(StmtWhile { - test, body, orelse, .. - }) => { - self.scan_expression(test, ExpressionContext::Load)?; - // PEP 649: Track conditional block for annotations - let saved_in_conditional_block = self.in_conditional_block; - self.in_conditional_block = true; - self.scan_statements(body)?; - self.scan_statements(orelse)?; - self.in_conditional_block = saved_in_conditional_block; - } - Stmt::Break(_) | Stmt::Continue(_) | Stmt::Pass(_) => { - // No symbols here. - } - Stmt::Import(StmtImport { names, .. }) - | Stmt::ImportFrom(StmtImportFrom { names, .. }) => { - for name in names { - if let Some(alias) = &name.asname { - // `import my_module as my_alias` - self.check_name(alias.as_str(), ExpressionContext::Store, alias.range)?; - self.register_ident(alias, SymbolUsage::Imported)?; - } else if name.name.as_str() == "*" { - // Star imports are only allowed at module level - if self.tables.last().unwrap().typ != CompilerScope::Module { - return Err(SymbolTableError { - error: "'import *' only allowed at module level".to_string(), - location: Some(self.source_file.to_source_code().source_location( - name.name.range.start(), - PositionEncoding::Utf8, - )), - }); - } - // Don't register star imports as symbols - } else { - // `import module` or `from x import name` - let imported_name = name.name.split('.').next().unwrap(); - self.check_name(imported_name, ExpressionContext::Store, name.name.range)?; - self.register_name(imported_name, SymbolUsage::Imported, name.name.range)?; - } - } - } - Stmt::Return(StmtReturn { value, .. }) => { - if let Some(expression) = value { - self.scan_expression(expression, ExpressionContext::Load)?; - } - } - Stmt::Assert(StmtAssert { test, msg, .. }) => { - self.scan_expression(test, ExpressionContext::Load)?; - if let Some(expression) = msg { - self.scan_expression(expression, ExpressionContext::Load)?; - } - } - Stmt::Delete(StmtDelete { targets, .. }) => { - self.scan_expressions(targets, ExpressionContext::Delete)?; - } - Stmt::Assign(StmtAssign { targets, value, .. }) => { - self.scan_expressions(targets, ExpressionContext::Store)?; - self.scan_expression(value, ExpressionContext::Load)?; - } - Stmt::AugAssign(StmtAugAssign { target, value, .. }) => { - self.scan_expression(target, ExpressionContext::Store)?; - self.scan_expression(value, ExpressionContext::Load)?; - } - Stmt::AnnAssign(StmtAnnAssign { - target, - annotation, - value, - simple, - range, - node_index: _, - }) => { - // https://github.com/python/cpython/blob/main/Python/symtable.c#L1233 - match &**target { - Expr::Name(ast::ExprName { id, .. }) => { - let id_str = id.as_str(); - - if *simple { - self.check_name(id_str, ExpressionContext::Store, *range)?; - - self.register_name(id_str, SymbolUsage::AnnotationAssigned, *range)?; - // PEP 649: Register annotate function in module/class scope - let current_scope = self.tables.last().map(|t| t.typ); - match current_scope { - Some(CompilerScope::Module) => { - self.register_name( - "__annotate__", - SymbolUsage::Assigned, - *range, - )?; - } - Some(CompilerScope::Class) => { - self.register_name( - "__annotate_func__", - SymbolUsage::Assigned, - *range, - )?; - } - _ => {} - } - } else if value.is_some() { - self.check_name(id_str, ExpressionContext::Store, *range)?; - self.register_name(id_str, SymbolUsage::Assigned, *range)?; - } - } - _ => { - self.scan_expression(target, ExpressionContext::Store)?; - } - } - self.scan_ann_assign_annotation(annotation)?; - if let Some(value) = value { - self.scan_expression(value, ExpressionContext::Load)?; - } - } - Stmt::With(StmtWith { items, body, .. }) => { - for item in items { - self.scan_expression(&item.context_expr, ExpressionContext::Load)?; - if let Some(expression) = &item.optional_vars { - self.scan_expression(expression, ExpressionContext::Store)?; - } - } - // PEP 649: Track conditional block for annotations - let saved_in_conditional_block = self.in_conditional_block; - self.in_conditional_block = true; - self.scan_statements(body)?; - self.in_conditional_block = saved_in_conditional_block; - } - Stmt::Try(StmtTry { - body, - handlers, - orelse, - finalbody, - .. - }) => { - // PEP 649: Track conditional block for annotations - let saved_in_conditional_block = self.in_conditional_block; - self.in_conditional_block = true; - self.scan_statements(body)?; - // Preserve source-order symbol analysis so `global`/`nonlocal` - // semantics match CPython, but reorder child scope storage to - // match the codegen order for plain try/except/else. - let body_subtables_len = self.tables.last().unwrap().sub_tables.len(); - for handler in handlers { - let ExceptHandler::ExceptHandler(ast::ExceptHandlerExceptHandler { - type_, - name, - body, - .. - }) = &handler; - if let Some(expression) = type_ { - self.scan_expression(expression, ExpressionContext::Load)?; - } - if let Some(name) = name { - self.register_ident(name, SymbolUsage::Assigned)?; + if *is_async { + self.tables.last_mut().unwrap().is_coroutine = true; } self.scan_statements(body)?; - } - if finalbody.is_empty() { - let handler_subtables = self - .tables - .last_mut() - .unwrap() - .sub_tables - .split_off(body_subtables_len); - self.scan_statements(orelse)?; - self.tables - .last_mut() - .unwrap() - .sub_tables - .extend(handler_subtables); - } else { - self.scan_statements(orelse)?; - } - self.scan_statements(finalbody)?; - self.in_conditional_block = saved_in_conditional_block; - } - Stmt::Match(StmtMatch { subject, cases, .. }) => { - self.scan_expression(subject, ExpressionContext::Load)?; - // PEP 649: Track conditional block for annotations - let saved_in_conditional_block = self.in_conditional_block; - self.in_conditional_block = true; - for case in cases { - self.scan_pattern(&case.pattern)?; - if let Some(guard) = &case.guard { - self.scan_expression(guard, ExpressionContext::Load)?; + self.leave_scope(); + if type_params.is_some() { + self.leave_scope(); } - self.scan_statements(&case.body)?; } - self.in_conditional_block = saved_in_conditional_block; - } - Stmt::Raise(StmtRaise { exc, cause, .. }) => { - if let Some(expression) = exc { - self.scan_expression(expression, ExpressionContext::Load)?; + Stmt::ClassDef(StmtClassDef { + name, + body, + arguments, + decorator_list, + type_params, + range, + node_index: _, + .. + }) => { + let prev_class = self.class_name.clone(); + self.register_name(name.as_str(), SymbolUsage::Assigned, *range)?; + self.scan_decorators(decorator_list, ExpressionContext::Load)?; + + if let Some(type_params) = type_params { + self.enter_type_param_block( + name.as_str(), + *range, + true, // for_class: enable selective mangling + false, + false, + )?; + // Set class_name for mangling in type param scope + self.class_name = Some(name.to_string()); + self.scan_type_params(type_params)?; + } + + if type_params.is_none() { + self.class_name = prev_class.clone(); + } + if let Some(arguments) = arguments { + self.scan_expressions(&arguments.args, ExpressionContext::Load)?; + for keyword in &arguments.keywords { + if let Some(arg) = &keyword.arg { + self.check_name( + arg.as_str(), + ExpressionContext::Store, + keyword.range, + )?; + } + } + for keyword in &arguments.keywords { + self.scan_expression(&keyword.value, ExpressionContext::Load)?; + } + } + + self.enter_scope( + name.as_str(), + CompilerScope::Class, + self.line_index_start(*range), + ); + // Reset in_conditional_block for new class scope + let saved_in_conditional = self.in_conditional_block; + self.in_conditional_block = false; + self.class_name = Some(name.to_string()); + if type_params.is_some() { + self.register_name(".type_params", SymbolUsage::Used, *range)?; + self.register_name("__type_params__", SymbolUsage::Assigned, *range)?; + } + self.scan_statements(body)?; + self.leave_scope(); + self.in_conditional_block = saved_in_conditional; + if type_params.is_some() { + self.leave_scope(); + } + // Restore class_name after all ClassDef processing + self.class_name = prev_class; } - if let Some(expression) = cause { - self.scan_expression(expression, ExpressionContext::Load)?; + Stmt::Expr(StmtExpr { value, .. }) => { + self.scan_expression(value, ExpressionContext::Load)? } - } - Stmt::TypeAlias(StmtTypeAlias { - name, - value, - type_params, - .. - }) => { - let Some(name_expr) = name.as_name_expr() else { + Stmt::If(StmtIf { + test, + body, + elif_else_clauses, + .. + }) => { + self.scan_expression(test, ExpressionContext::Load)?; + // PEP 649: Track conditional block for annotations + let saved_in_conditional_block = self.in_conditional_block; + self.in_conditional_block = true; + self.scan_statements(body)?; + for elif in elif_else_clauses { + if let Some(test) = &elif.test { + self.scan_expression(test, ExpressionContext::Load)?; + } + self.scan_statements(&elif.body)?; + } + self.in_conditional_block = saved_in_conditional_block; + } + Stmt::For(StmtFor { + target, + iter, + body, + orelse, + is_async, + .. + }) => { + if *is_async && self.allows_top_level_await() { + self.tables.last_mut().unwrap().is_coroutine = true; + } + if *is_async && !self.tables.last().unwrap().is_coroutine { + return Err(SymbolTableError { + error: "'async for' outside async function".to_owned(), + location: Some(self.source_file.to_source_code().source_location( + statement.range().start(), + PositionEncoding::Utf8, + )), + }); + } + self.scan_expression(target, ExpressionContext::Store)?; + self.scan_expression(iter, ExpressionContext::Load)?; + // PEP 649: Track conditional block for annotations + let saved_in_conditional_block = self.in_conditional_block; + self.in_conditional_block = true; + self.scan_statements(body)?; + self.scan_statements(orelse)?; + self.in_conditional_block = saved_in_conditional_block; + } + Stmt::While(StmtWhile { + test, body, orelse, .. + }) => { + self.scan_expression(test, ExpressionContext::Load)?; + // PEP 649: Track conditional block for annotations + let saved_in_conditional_block = self.in_conditional_block; + self.in_conditional_block = true; + self.scan_statements(body)?; + self.scan_statements(orelse)?; + self.in_conditional_block = saved_in_conditional_block; + } + Stmt::Break(_) | Stmt::Continue(_) | Stmt::Pass(_) => { + // No symbols here. + } + Stmt::Import(StmtImport { names, .. }) + | Stmt::ImportFrom(StmtImportFrom { names, .. }) => { + for name in names { + if let Some(alias) = &name.asname { + // `import my_module as my_alias` + self.register_name( + alias.as_str(), + SymbolUsage::Imported, + name.name.range, + )?; + } else if name.name.as_str() == "*" { + // Star imports are only allowed at module level + if self.tables.last().unwrap().typ != CompilerScope::Module { + return Err(SymbolTableError { + error: "import * only allowed at module level".to_string(), + location: Some( + self.source_file.to_source_code().source_location( + name.name.range.start(), + PositionEncoding::Utf8, + ), + ), + }); + } + // Don't register star imports as symbols + } else { + // `import module` or `from x import name` + let imported_name = name.name.split('.').next().unwrap(); + self.check_name( + imported_name, + ExpressionContext::Store, + name.name.range, + )?; + self.register_name( + imported_name, + SymbolUsage::Imported, + name.name.range, + )?; + } + } + } + Stmt::Return(StmtReturn { value, .. }) => { + if let Some(expression) = value { + self.scan_expression(expression, ExpressionContext::Load)?; + self.tables.last_mut().unwrap().returns_value = true; + } + } + Stmt::Assert(StmtAssert { test, msg, .. }) => { + self.scan_expression(test, ExpressionContext::Load)?; + if let Some(expression) = msg { + self.scan_expression(expression, ExpressionContext::Load)?; + } + } + Stmt::Delete(StmtDelete { targets, .. }) => { + self.scan_expressions(targets, ExpressionContext::Delete)?; + } + Stmt::Assign(StmtAssign { targets, value, .. }) => { + self.scan_expressions(targets, ExpressionContext::Store)?; + self.scan_expression(value, ExpressionContext::Load)?; + } + Stmt::AugAssign(StmtAugAssign { target, value, .. }) => { + self.scan_expression(target, ExpressionContext::Store)?; + self.scan_expression(value, ExpressionContext::Load)?; + } + Stmt::AnnAssign(StmtAnnAssign { + target, + annotation, + value, + simple, + range, + node_index: _, + .. + }) => { + self.tables.last_mut().unwrap().annotations_used = true; + // https://github.com/python/cpython/blob/main/Python/symtable.c#L1233 + match &**target { + Expr::Name(ast::ExprName { + id, + range: target_range, + .. + }) => { + let id_str = id.as_str(); + + if *simple { + let existing_flags = self.tables.last().and_then(|table| { + let name = maybe_mangle_name( + self.class_name.as_deref(), + table.mangled_names.as_ref(), + id_str, + ); + table.symbols.get(name.as_ref()).map(|symbol| symbol.flags) + }); + if self + .tables + .last() + .is_some_and(|table| table.typ != CompilerScope::Module) + && let Some(flags) = existing_flags + && flags.intersects(SymbolFlags::GLOBAL | SymbolFlags::NONLOCAL) + { + let usage = if flags.contains(SymbolFlags::GLOBAL) { + "global" + } else { + "nonlocal" + }; + return Err(SymbolTableError { + error: format!( + "annotated name '{id_str}' can't be {usage}" + ), + location: Some( + self.source_file.to_source_code().source_location( + range.start(), + PositionEncoding::Utf8, + ), + ), + }); + } + + self.register_name( + id_str, + SymbolUsage::AnnotationAssigned, + *target_range, + )?; + // PEP 649: Register annotate function in module/class scope + let current_scope = self.tables.last().map(|t| t.typ); + match current_scope { + Some(CompilerScope::Module) => { + self.register_name( + "__annotate__", + SymbolUsage::Assigned, + *range, + )?; + } + Some(CompilerScope::Class) => { + self.register_name( + "__annotate_func__", + SymbolUsage::Assigned, + *range, + )?; + } + _ => {} + } + } else if value.is_some() { + self.register_name(id_str, SymbolUsage::Assigned, *target_range)?; + } + } + _ => { + self.scan_expression(target, ExpressionContext::Store)?; + } + } + self.scan_ann_assign_annotation(annotation)?; + if let Some(value) = value { + self.scan_expression(value, ExpressionContext::Load)?; + } + } + Stmt::With(StmtWith { + items, + body, + is_async, + .. + }) => { + if *is_async && self.allows_top_level_await() { + self.tables.last_mut().unwrap().is_coroutine = true; + } + if *is_async && !self.tables.last().unwrap().is_coroutine { + return Err(SymbolTableError { + error: "'async with' outside async function".to_owned(), + location: Some(self.source_file.to_source_code().source_location( + statement.range().start(), + PositionEncoding::Utf8, + )), + }); + } + // PEP 649: Track conditional block for annotations + let saved_in_conditional_block = self.in_conditional_block; + self.in_conditional_block = true; + for item in items { + self.scan_expression(&item.context_expr, ExpressionContext::Load)?; + if let Some(expression) = &item.optional_vars { + self.scan_expression(expression, ExpressionContext::Store)?; + } + } + self.scan_statements(body)?; + self.in_conditional_block = saved_in_conditional_block; + } + Stmt::Try(StmtTry { + body, + handlers, + orelse, + finalbody, + .. + }) => { + // PEP 649: Track conditional block for annotations + let saved_in_conditional_block = self.in_conditional_block; + self.in_conditional_block = true; + self.scan_statements(body)?; + for handler in handlers { + let ExceptHandler::ExceptHandler(ast::ExceptHandlerExceptHandler { + type_, + name, + body, + .. + }) = &handler; + if let Some(expression) = type_ { + self.scan_expression(expression, ExpressionContext::Load)?; + } + if let Some(name) = name { + self.register_name( + name.as_str(), + SymbolUsage::Assigned, + handler.range(), + )?; + } + self.scan_statements(body)?; + } + self.scan_statements(orelse)?; + self.scan_statements(finalbody)?; + self.in_conditional_block = saved_in_conditional_block; + } + Stmt::Match(StmtMatch { subject, cases, .. }) => { + self.scan_expression(subject, ExpressionContext::Load)?; + // PEP 649: Track conditional block for annotations + let saved_in_conditional_block = self.in_conditional_block; + self.in_conditional_block = true; + for case in cases { + self.scan_pattern(&case.pattern)?; + if let Some(guard) = &case.guard { + self.scan_expression(guard, ExpressionContext::Load)?; + } + self.scan_statements(&case.body)?; + } + self.in_conditional_block = saved_in_conditional_block; + } + Stmt::Raise(StmtRaise { exc, cause, .. }) => { + if let Some(expression) = exc { + self.scan_expression(expression, ExpressionContext::Load)?; + if let Some(expression) = cause { + self.scan_expression(expression, ExpressionContext::Load)?; + } + } + } + Stmt::TypeAlias(StmtTypeAlias { + name, + value, + type_params, + range, + .. + }) => { + let Some(name_expr) = name.as_name_expr() else { + return Err(SymbolTableError { + error: "type alias expects name".to_owned(), + location: Some( + self.source_file + .to_source_code() + .source_location(name.range().start(), PositionEncoding::Utf8), + ), + }); + }; + let alias_name = name_expr.id.to_string(); + self.scan_expression(name, ExpressionContext::Store)?; + // Check before entering any sub-scopes + let in_class = self + .tables + .last() + .is_some_and(|t| t.typ == CompilerScope::Class); + let is_generic = type_params.is_some(); + if let Some(type_params) = type_params { + self.enter_type_param_block(&alias_name, *range, false, false, false)?; + self.scan_type_params(type_params)?; + } + // Value scope for lazy evaluation + self.enter_scope( + &alias_name, + CompilerScope::TypeAlias, + self.line_index_start(*range), + ); + // Evaluator takes a format parameter + self.register_name(".format", SymbolUsage::Parameter, *range)?; + self.register_name(".format", SymbolUsage::Used, *range)?; + if in_class { + if let Some(table) = self.tables.last_mut() { + table.can_see_class_scope = true; + } + self.register_name("__classdict__", SymbolUsage::Used, value.range())?; + } + self.scan_expression(value, ExpressionContext::Load)?; + self.leave_scope(); + if is_generic { + self.leave_scope(); + } + } + Stmt::IpyEscapeCommand(stmt) => { return Err(SymbolTableError { - error: "type alias expects name".to_owned(), + error: "invalid syntax".to_owned(), location: Some( self.source_file .to_source_code() - .source_location(name.range().start(), PositionEncoding::Utf8), + .source_location(stmt.range.start(), PositionEncoding::Utf8), ), }); - }; - let alias_name = name_expr.id.to_string(); - let was_in_type_alias = self.in_type_alias; - self.in_type_alias = true; - // Check before entering any sub-scopes - let in_class = self - .tables - .last() - .is_some_and(|t| t.typ == CompilerScope::Class); - let is_generic = type_params.is_some(); - if let Some(type_params) = type_params { - self.enter_type_param_block( - &alias_name, - self.line_index_start(type_params.range), - false, - false, - false, - )?; - self.scan_type_params(type_params)?; } - // Value scope for lazy evaluation - self.enter_scope( - &alias_name, - CompilerScope::Annotation, - self.line_index_start(value.range()), - ); - // Evaluator takes a format parameter - self.register_name(".format", SymbolUsage::Parameter, TextRange::default())?; - if in_class { - if let Some(table) = self.tables.last_mut() { - table.can_see_class_scope = true; - } - self.register_name("__classdict__", SymbolUsage::Used, TextRange::default())?; - } - self.scan_expression(value, ExpressionContext::Load)?; - self.leave_scope(); - if is_generic { - self.leave_scope(); - } - self.in_type_alias = was_in_type_alias; - self.scan_expression(name, ExpressionContext::Store)?; } - Stmt::IpyEscapeCommand(_) => todo!(), - } - Ok(()) + Ok(()) + })(); + self.recursion_depth -= 1; + result } fn scan_decorators( @@ -1962,389 +2187,536 @@ impl SymbolTableBuilder { expression: &ast::Expr, context: ExpressionContext, ) -> SymbolTableResult { - use ast::*; - - // Check for expressions not allowed in certain contexts - // (type parameters, annotations, type aliases, TypeVar bounds/defaults) - if let Some(keyword) = match expression { - Expr::Yield(_) | Expr::YieldFrom(_) => Some("yield"), - Expr::Await(_) => Some("await"), - Expr::Named(_) => Some("named"), - _ => None, - } { - // Determine the context name for the error message - // scope_info takes precedence (e.g., "a TypeVar bound") - let context_name = if let Some(scope_info) = self.scope_info { - Some(scope_info) - } else if let Some(table) = self.tables.last() - && table.typ == CompilerScope::TypeParams - { - Some("a type parameter") - } else if self.in_annotation { - Some("an annotation") - } else if self.in_type_alias { - Some("a type alias") - } else { - None - }; - - if let Some(context_name) = context_name { - return Err(SymbolTableError { - error: format!("{keyword} expression cannot be used within {context_name}"), - location: Some( - self.source_file - .to_source_code() - .source_location(expression.range().start(), PositionEncoding::Utf8), - ), - }); - } + if self.recursion_depth >= self.recursion_limit { + return Err(SymbolTableError { + error: RECURSION_ERROR.to_owned(), + location: None, + }); } + self.recursion_depth += 1; + let result = (|| { + use ast::*; - match expression { - Expr::BinOp(ExprBinOp { - left, - right, - range: _, - .. - }) => { - self.scan_expression(left, context)?; - self.scan_expression(right, context)?; + if expression.is_constant_expr() { + return Ok(()); } - Expr::BoolOp(ExprBoolOp { - values, range: _, .. - }) => { - self.scan_expressions(values, context)?; - } - Expr::Compare(ExprCompare { - left, - comparators, - range: _, - .. - }) => { - self.scan_expression(left, context)?; - self.scan_expressions(comparators, context)?; - } - Expr::Subscript(ExprSubscript { - value, - slice, - range: _, - .. - }) => { - self.scan_expression(value, ExpressionContext::Load)?; - self.scan_expression(slice, ExpressionContext::Load)?; - } - Expr::Attribute(ExprAttribute { - value, attr, range, .. - }) => { - self.check_name(attr.as_str(), context, *range)?; - self.scan_expression(value, ExpressionContext::Load)?; - } - Expr::Dict(ExprDict { - items, - node_index: _, - range: _, - }) => { - for item in items { - if let Some(key) = &item.key { - self.scan_expression(key, context)?; - } - self.scan_expression(&item.value, context)?; - } - } - Expr::Await(ExprAwait { - value, - node_index: _, - range: _, - }) => { - self.scan_expression(value, context)?; - self.tables.last_mut().unwrap().is_coroutine = true; - } - Expr::Yield(ExprYield { - value, - node_index: _, - range: _, - }) => { - self.tables.last_mut().unwrap().is_generator = true; - if let Some(expression) = value { - self.scan_expression(expression, context)?; - } - } - Expr::YieldFrom(ExprYieldFrom { - value, - node_index: _, - range: _, - }) => { - self.tables.last_mut().unwrap().is_generator = true; - self.scan_expression(value, context)?; - } - Expr::UnaryOp(ExprUnaryOp { - operand, range: _, .. - }) => { - self.scan_expression(operand, context)?; - } - Expr::Starred(ExprStarred { - value, range: _, .. - }) => { - self.scan_expression(value, context)?; - } - Expr::Tuple(ExprTuple { elts, range: _, .. }) - | Expr::Set(ExprSet { elts, range: _, .. }) - | Expr::List(ExprList { elts, range: _, .. }) => { - self.scan_expressions(elts, context)?; - } - Expr::Slice(ExprSlice { - lower, - upper, - step, - node_index: _, - range: _, - }) => { - if let Some(lower) = lower { - self.scan_expression(lower, context)?; - } - if let Some(upper) = upper { - self.scan_expression(upper, context)?; - } - if let Some(step) = step { - self.scan_expression(step, context)?; - } - } - Expr::Generator(ExprGenerator { - elt, - generators, - range, - .. - }) => { - let was_in_iter_def_exp = self.in_iter_def_exp; - if context == ExpressionContext::IterDefinitionExp { - self.in_iter_def_exp = true; - } - // Generator expression - is_generator = true - self.scan_comprehension("<genexpr>", elt, None, generators, *range, true)?; - self.in_iter_def_exp = was_in_iter_def_exp; - } - Expr::ListComp(ExprListComp { - elt, - generators, - range, - node_index: _, - }) => { - let was_in_iter_def_exp = self.in_iter_def_exp; - if context == ExpressionContext::IterDefinitionExp { - self.in_iter_def_exp = true; - } - // List comprehension - is_generator = false (can be inlined) - self.scan_comprehension("<listcomp>", elt, None, generators, *range, false)?; - self.in_iter_def_exp = was_in_iter_def_exp; - } - Expr::SetComp(ExprSetComp { - elt, - generators, - range, - node_index: _, - }) => { - let was_in_iter_def_exp = self.in_iter_def_exp; - if context == ExpressionContext::IterDefinitionExp { - self.in_iter_def_exp = true; - } - // Set comprehension - is_generator = false (can be inlined) - self.scan_comprehension("<setcomp>", elt, None, generators, *range, false)?; - self.in_iter_def_exp = was_in_iter_def_exp; - } - Expr::DictComp(ExprDictComp { - key, - value, - generators, - range, - node_index: _, - }) => { - let was_in_iter_def_exp = self.in_iter_def_exp; - if context == ExpressionContext::IterDefinitionExp { - self.in_iter_def_exp = true; - } - // Dict comprehension - is_generator = false (can be inlined) - self.scan_comprehension("<dictcomp>", key, Some(value), generators, *range, false)?; - self.in_iter_def_exp = was_in_iter_def_exp; - } - Expr::Call(ExprCall { - func, - arguments, - node_index: _, - range: _, - }) => { - match context { - ExpressionContext::IterDefinitionExp => { - self.scan_expression(func, ExpressionContext::IterDefinitionExp)?; - } - _ => { - self.scan_expression(func, ExpressionContext::Load)?; - } - } - self.scan_expressions(&arguments.args, ExpressionContext::Load)?; - for keyword in &arguments.keywords { - if let Some(arg) = &keyword.arg { - self.check_name(arg.as_str(), ExpressionContext::Store, keyword.range)?; + // Check for expressions not allowed in certain contexts + // (type parameters, annotations, type aliases, TypeVar bounds/defaults) + if let Some(keyword) = match expression { + Expr::Yield(_) | Expr::YieldFrom(_) => Some("yield"), + Expr::Await(_) => Some("await"), + Expr::Named(_) => Some("named"), + _ => None, + } { + // Determine the context name for the error message from the + // current symbol table entry, matching ste_type checks. + let current_is_comprehension = self + .tables + .last() + .is_some_and(|table| table.typ == CompilerScope::Comprehension); + let context_name = if keyword == "named" && current_is_comprehension { + None + } else if let Some(table) = self.tables.last() { + match table.typ { + CompilerScope::Annotation => Some("an annotation"), + CompilerScope::TypeVariable => table.scope_info, + CompilerScope::TypeAlias => Some("a type alias"), + CompilerScope::TypeParams => Some("the definition of a generic"), + _ => None, } - self.scan_expression(&keyword.value, ExpressionContext::Load)?; - } - } - Expr::Name(ExprName { id, range, .. }) => { - let id = id.as_str(); - - self.check_name(id, context, *range)?; - - if !self.in_unevaluated_annotation { - // Determine the contextual usage of this symbol: - match context { - ExpressionContext::Delete => { - self.register_name(id, SymbolUsage::Assigned, *range)?; - self.register_name(id, SymbolUsage::Used, *range)?; - } - ExpressionContext::Load | ExpressionContext::IterDefinitionExp => { - self.register_name(id, SymbolUsage::Used, *range)?; - } - ExpressionContext::Store => { - self.register_name(id, SymbolUsage::Assigned, *range)?; - } - ExpressionContext::Iter => { - self.register_name(id, SymbolUsage::Iter, *range)?; - } - } - // Interesting stuff about the __class__ variable: - // https://docs.python.org/3/reference/datamodel.html?highlight=__class__#creating-the-class-object - if context == ExpressionContext::Load - && matches!( - self.tables.last().unwrap().typ, - CompilerScope::Function | CompilerScope::AsyncFunction - ) - && id == "super" - { - self.register_name("__class__", SymbolUsage::Used, *range)?; - } - } - } - Expr::Lambda(ExprLambda { - body, - parameters, - node_index: _, - range: _, - }) => { - if let Some(parameters) = parameters { - self.enter_scope_with_parameters( - "lambda", - parameters, - self.line_index_start(expression.range()), - false, // lambdas have no return annotation - CompilerScope::Lambda, - false, // don't skip defaults - )?; } else { - self.enter_scope( - "lambda", - CompilerScope::Lambda, - self.line_index_start(expression.range()), - ); - } - match context { - ExpressionContext::IterDefinitionExp => { - self.scan_expression(body, ExpressionContext::IterDefinitionExp)?; - } - _ => { - self.scan_expression(body, ExpressionContext::Load)?; - } - } - self.leave_scope(); - } - Expr::FString(ExprFString { value, .. }) => { - for expr in value.elements().filter_map(|x| x.as_interpolation()) { - self.scan_expression(&expr.expression, ExpressionContext::Load)?; - if let Some(format_spec) = &expr.format_spec { - for element in format_spec.elements.interpolations() { - self.scan_expression(&element.expression, ExpressionContext::Load)? - } - } - } - } - Expr::TString(tstring) => { - // Scan t-string interpolation expressions (similar to f-strings) - for expr in tstring - .value - .elements() - .filter_map(|x| x.as_interpolation()) - { - self.scan_expression(&expr.expression, ExpressionContext::Load)?; - if let Some(format_spec) = &expr.format_spec { - for element in format_spec.elements.interpolations() { - self.scan_expression(&element.expression, ExpressionContext::Load)? - } - } - } - } - // Constants - Expr::StringLiteral(_) - | Expr::BytesLiteral(_) - | Expr::NumberLiteral(_) - | Expr::BooleanLiteral(_) - | Expr::NoneLiteral(_) - | Expr::EllipsisLiteral(_) => {} - Expr::IpyEscapeCommand(_) => todo!(), - Expr::If(ExprIf { - test, - body, - orelse, - node_index: _, - range: _, - }) => { - self.scan_expression(test, ExpressionContext::Load)?; - self.scan_expression(body, ExpressionContext::Load)?; - self.scan_expression(orelse, ExpressionContext::Load)?; - } + None + }; - Expr::Named(ExprNamed { - target, - value, - range, - node_index: _, - }) => { - // named expressions are not allowed in the definition of - // comprehension iterator definitions (including nested comprehensions) - if context == ExpressionContext::IterDefinitionExp || self.in_iter_def_exp { + if let Some(context_name) = context_name { return Err(SymbolTableError { - error: "assignment expression cannot be used in a comprehension iterable expression".to_string(), - location: Some(self.source_file.to_source_code().source_location(target.range().start(), PositionEncoding::Utf8)), - }); + error: format!("{keyword} expression cannot be used within {context_name}"), + location: Some( + self.source_file.to_source_code().source_location( + expression.range().start(), + PositionEncoding::Utf8, + ), + ), + }); } + } - self.scan_expression(value, ExpressionContext::Load)?; + match expression { + Expr::BinOp(ExprBinOp { + left, + right, + range: _, + .. + }) => { + self.scan_expression(left, context)?; + self.scan_expression(right, context)?; + } + Expr::BoolOp(ExprBoolOp { + values, range: _, .. + }) => { + self.scan_expressions(values, context)?; + } + Expr::Compare(ExprCompare { + left, + comparators, + range: _, + .. + }) => { + self.scan_expression(left, context)?; + self.scan_expressions(comparators, context)?; + } + Expr::Subscript(ExprSubscript { + value, + slice, + range: _, + .. + }) => { + self.scan_expression(value, ExpressionContext::Load)?; + self.scan_expression(slice, ExpressionContext::Load)?; + } + Expr::Attribute(ExprAttribute { + value, attr, range, .. + }) => { + self.check_name(attr.as_str(), context, *range)?; + self.scan_expression(value, ExpressionContext::Load)?; + } + Expr::Dict(ExprDict { + items, + node_index: _, + range: _, + .. + }) => { + for item in items { + if let Some(key) = &item.key { + self.scan_expression(key, context)?; + } + } + for item in items { + self.scan_expression(&item.value, context)?; + } + } + Expr::Await(ExprAwait { + value, + node_index: _, + range: _, + .. + }) => { + let current_scope = self.tables.last().unwrap().typ; + if !self.allows_top_level_await() + && !Self::is_function_like_scope(current_scope) + { + return Err(SymbolTableError { + error: "'await' outside function".to_owned(), + location: Some(self.source_file.to_source_code().source_location( + expression.range().start(), + PositionEncoding::Utf8, + )), + }); + } + if current_scope != CompilerScope::AsyncFunction + && current_scope != CompilerScope::Comprehension + && !self.allows_top_level_await() + { + return Err(SymbolTableError { + error: "'await' outside async function".to_owned(), + location: Some(self.source_file.to_source_code().source_location( + expression.range().start(), + PositionEncoding::Utf8, + )), + }); + } + self.scan_expression(value, context)?; + self.tables.last_mut().unwrap().is_coroutine = true; + } + Expr::Yield(ExprYield { + value, + node_index: _, + range: _, + .. + }) => { + if let Some(expression) = value { + self.scan_expression(expression, context)?; + } + self.tables.last_mut().unwrap().is_generator = true; + if let Some(context_name) = self.comprehension_yield_context + && self + .tables + .last() + .is_some_and(|table| table.typ == CompilerScope::Comprehension) + { + return Err(SymbolTableError { + error: format!("'yield' inside {context_name}"), + location: Some(self.source_file.to_source_code().source_location( + expression.range().start(), + PositionEncoding::Utf8, + )), + }); + } + } + Expr::YieldFrom(ExprYieldFrom { + value, + node_index: _, + range: _, + .. + }) => { + self.scan_expression(value, context)?; + self.tables.last_mut().unwrap().is_generator = true; + if let Some(context_name) = self.comprehension_yield_context + && self + .tables + .last() + .is_some_and(|table| table.typ == CompilerScope::Comprehension) + { + return Err(SymbolTableError { + error: format!("'yield' inside {context_name}"), + location: Some(self.source_file.to_source_code().source_location( + expression.range().start(), + PositionEncoding::Utf8, + )), + }); + } + } + Expr::UnaryOp(ExprUnaryOp { + operand, range: _, .. + }) => { + self.scan_expression(operand, context)?; + } + Expr::Starred(ExprStarred { + value, range: _, .. + }) => { + self.scan_expression(value, context)?; + } + Expr::Tuple(ExprTuple { elts, range: _, .. }) + | Expr::Set(ExprSet { elts, range: _, .. }) + | Expr::List(ExprList { elts, range: _, .. }) => { + self.scan_expressions(elts, context)?; + } + Expr::Slice(ExprSlice { + lower, + upper, + step, + node_index: _, + range: _, + .. + }) => { + if let Some(lower) = lower { + self.scan_expression(lower, context)?; + } + if let Some(upper) = upper { + self.scan_expression(upper, context)?; + } + if let Some(step) = step { + self.scan_expression(step, context)?; + } + } + Expr::Generator(ExprGenerator { + elt, + generators, + range, + .. + }) => { + let was_in_iter_def_exp = self.in_iter_def_exp; + if context == ExpressionContext::IterDefinitionExp { + self.in_iter_def_exp = true; + } + // Generator expression - is_generator = true + self.scan_comprehension("<genexpr>", elt, None, generators, *range, true)?; + self.in_iter_def_exp = was_in_iter_def_exp; + } + Expr::ListComp(ExprListComp { + elt, + generators, + range, + node_index: _, + .. + }) => { + let was_in_iter_def_exp = self.in_iter_def_exp; + if context == ExpressionContext::IterDefinitionExp { + self.in_iter_def_exp = true; + } + // List comprehension - is_generator = false (can be inlined) + self.scan_comprehension("<listcomp>", elt, None, generators, *range, false)?; + self.in_iter_def_exp = was_in_iter_def_exp; + } + Expr::SetComp(ExprSetComp { + elt, + generators, + range, + node_index: _, + .. + }) => { + let was_in_iter_def_exp = self.in_iter_def_exp; + if context == ExpressionContext::IterDefinitionExp { + self.in_iter_def_exp = true; + } + // Set comprehension - is_generator = false (can be inlined) + self.scan_comprehension("<setcomp>", elt, None, generators, *range, false)?; + self.in_iter_def_exp = was_in_iter_def_exp; + } + Expr::DictComp(ExprDictComp { + key, + value, + generators, + range, + node_index: _, + .. + }) => { + let was_in_iter_def_exp = self.in_iter_def_exp; + if context == ExpressionContext::IterDefinitionExp { + self.in_iter_def_exp = true; + } + // Dict comprehension - is_generator = false (can be inlined) + let key = key.as_ref(); + self.scan_comprehension( + "<dictcomp>", + key, + Some(value), + generators, + *range, + false, + )?; + self.in_iter_def_exp = was_in_iter_def_exp; + } + Expr::Call(ExprCall { + func, + arguments, + node_index: _, + range: _, + .. + }) => { + match context { + ExpressionContext::IterDefinitionExp => { + self.scan_expression(func, ExpressionContext::IterDefinitionExp)?; + } + _ => { + self.scan_expression(func, ExpressionContext::Load)?; + } + } - // special handling for assigned identifier in named expressions - // that are used in comprehensions. This required to correctly - // propagate the scope of the named assigned named and not to - // propagate inner names. - if let Expr::Name(ExprName { id, .. }) = &**target { + self.scan_expressions(&arguments.args, ExpressionContext::Load)?; + for keyword in &arguments.keywords { + if let Some(arg) = &keyword.arg { + self.check_name(arg.as_str(), ExpressionContext::Store, keyword.range)?; + } + } + for keyword in &arguments.keywords { + self.scan_expression(&keyword.value, ExpressionContext::Load)?; + } + } + Expr::Name(ExprName { id, range, .. }) => { let id = id.as_str(); - self.check_name(id, ExpressionContext::Store, *range)?; - let table = self.tables.last().unwrap(); - if table.typ == CompilerScope::Comprehension { - self.extend_namedexpr_scope(id, *range)?; - self.register_name( - id, - SymbolUsage::AssignedNamedExprInComprehension, - *range, + + self.check_name(id, context, *range)?; + + if !self + .tables + .last() + .is_some_and(|table| table.in_unevaluated_annotation) + { + // Determine the contextual usage of this symbol: + match context { + ExpressionContext::Delete => { + self.register_name(id, SymbolUsage::Assigned, *range)?; + } + ExpressionContext::Load | ExpressionContext::IterDefinitionExp => { + self.register_name(id, SymbolUsage::Used, *range)?; + } + ExpressionContext::Store => { + self.register_name(id, SymbolUsage::Assigned, *range)?; + } + ExpressionContext::Iter => { + self.register_name(id, SymbolUsage::Iter, *range)?; + } + } + // Interesting stuff about the __class__ variable: + // https://docs.python.org/3/reference/datamodel.html?highlight=__class__#creating-the-class-object + if context == ExpressionContext::Load + && Self::is_function_like_scope(self.tables.last().unwrap().typ) + && id == "super" + { + self.register_name("__class__", SymbolUsage::Used, *range)?; + } + } + } + Expr::Lambda(ExprLambda { + body, + parameters, + node_index: _, + range: _, + .. + }) => { + let was_in_iter_def_exp = self.in_iter_def_exp; + if let Some(parameters) = parameters { + if was_in_iter_def_exp { + self.scan_parameter_defaults(parameters)?; + } + self.enter_scope_with_parameters( + "lambda", + parameters, + self.line_index_start(expression.range()), + None, // lambdas have no return annotation + CompilerScope::Lambda, + was_in_iter_def_exp, + false, )?; } else { - // omit one recursion. When the handling of an store changes for - // Identifiers this needs adapted - more forward safe would be - // calling scan_expression directly. - self.register_name(id, SymbolUsage::Assigned, *range)?; + self.enter_scope( + "lambda", + CompilerScope::Lambda, + self.line_index_start(expression.range()), + ); + } + self.scan_expression(body, ExpressionContext::Load)?; + self.in_iter_def_exp = was_in_iter_def_exp; + self.leave_scope(); + } + Expr::FString(fstring) => { + if let Some(joined_str) = &fstring.runtime_joined_str { + for expr in joined_str { + self.scan_expression(expr, ExpressionContext::Load)?; + } + return Ok(()); + } + for expr in fstring + .value + .elements() + .filter_map(|x| x.as_interpolation()) + { + self.scan_expression(&expr.expression, ExpressionContext::Load)?; + if let Some(format_spec) = &expr.runtime_formatted_value_format_spec { + self.scan_expression(format_spec, ExpressionContext::Load)?; + } else if let Some(format_spec) = &expr.format_spec { + for element in format_spec.elements.interpolations() { + self.scan_expression(&element.expression, ExpressionContext::Load)? + } + } + } + } + Expr::TString(tstring) => { + if let Some(template_str) = &tstring.runtime_template_str { + for expr in template_str { + self.scan_expression(expr, ExpressionContext::Load)?; + } + return Ok(()); + } + // Scan t-string interpolation expressions (similar to f-strings) + for expr in tstring + .value + .elements() + .filter_map(|x| x.as_interpolation()) + { + self.scan_expression(&expr.expression, ExpressionContext::Load)?; + if expr.runtime_str.is_some() { + if let Some(format_spec) = &expr.runtime_interpolation_format_spec { + self.scan_expression(format_spec, ExpressionContext::Load)?; + } + } else if let Some(format_spec) = &expr.format_spec { + for element in format_spec.elements.interpolations() { + self.scan_expression(&element.expression, ExpressionContext::Load)? + } + } + } + } + // Constants + Expr::StringLiteral(_) + | Expr::BytesLiteral(_) + | Expr::NumberLiteral(_) + | Expr::Constant(_) + | Expr::BooleanLiteral(_) + | Expr::NoneLiteral(_) + | Expr::EllipsisLiteral(_) => {} + Expr::IpyEscapeCommand(expr) => { + return Err(SymbolTableError { + error: "invalid syntax".to_owned(), + location: Some( + self.source_file + .to_source_code() + .source_location(expr.range.start(), PositionEncoding::Utf8), + ), + }); + } + Expr::If(ExprIf { + test, + body, + orelse, + node_index: _, + range: _, + .. + }) => { + self.scan_expression(test, ExpressionContext::Load)?; + self.scan_expression(body, ExpressionContext::Load)?; + self.scan_expression(orelse, ExpressionContext::Load)?; + } + + Expr::Named(ExprNamed { + target, + value, + range, + node_index: _, + .. + }) => { + // named expressions are not allowed in the definition of + // comprehension iterator definitions (including nested comprehensions) + if context == ExpressionContext::IterDefinitionExp || self.in_iter_def_exp { + return Err(SymbolTableError { + error: + "assignment expression cannot be used in a comprehension iterable expression" + .to_string(), + location: Some( + self.source_file + .to_source_code() + .source_location(range.start(), PositionEncoding::Utf8), + ), + }); + } + + let named_target = if let Expr::Name(ExprName { + id, + range: target_range, + .. + }) = &**target + { + let id = id.as_str(); + self.check_name(id, ExpressionContext::Store, *target_range)?; + let table = self.tables.last().unwrap(); + if table.typ == CompilerScope::Comprehension { + self.extend_namedexpr_scope(id, *target_range)?; + } + Some((id, *target_range)) + } else { + None + }; + + self.scan_expression(value, ExpressionContext::Load)?; + + // special handling for assigned identifier in named expressions + // that are used in comprehensions. This required to correctly + // propagate the scope of the named assigned named and not to + // propagate inner names. + if let Some((id, target_range)) = named_target { + let table = self.tables.last().unwrap(); + if table.typ == CompilerScope::Comprehension { + self.register_name( + id, + SymbolUsage::AssignedNamedExprInComprehension, + target_range, + )?; + } else { + // omit one recursion. When the handling of an store changes for + // Identifiers this needs adapted - more forward safe would be + // calling scan_expression directly. + self.register_name(id, SymbolUsage::Assigned, target_range)?; + } + } else { + self.scan_expression(target, ExpressionContext::Store)?; } - } else { - self.scan_expression(target, ExpressionContext::Store)?; } } - } - Ok(()) + Ok(()) + })(); + self.recursion_depth -= 1; + result } fn scan_comprehension( @@ -2356,26 +2728,15 @@ impl SymbolTableBuilder { range: TextRange, is_generator: bool, ) -> SymbolTableResult { - // Check for async comprehension outside async function - // (list/set/dict comprehensions only, not generator expressions) - let has_async_gen = generators.iter().any(|g| g.is_async); - if has_async_gen && !is_generator && !self.is_in_async_context() { - return Err(SymbolTableError { - error: "asynchronous comprehension outside of an asynchronous function".to_owned(), - location: Some( - self.source_file - .to_source_code() - .source_location(range.start(), PositionEncoding::Utf8), - ), - }); - } - assert!(!generators.is_empty()); let outermost = &generators[0]; // CPython evaluates the outermost iterator in the enclosing scope // before entering the comprehension scope. + let was_in_iter_def_exp = self.in_iter_def_exp; + self.in_iter_def_exp = true; self.scan_expression(&outermost.iter, ExpressionContext::IterDefinitionExp)?; + self.in_iter_def_exp = was_in_iter_def_exp; // Comprehensions are compiled as functions, so create a scope for them: self.enter_scope( @@ -2383,14 +2744,12 @@ impl SymbolTableBuilder { CompilerScope::Comprehension, self.line_index_start(range), ); - // Generator expressions need the is_generator flag - self.tables.last_mut().unwrap().is_generator = is_generator; - if generators.iter().any(|generator| generator.is_async) { + if outermost.is_async { self.tables.last_mut().unwrap().is_coroutine = true; } // PEP 709: Mark non-generator comprehensions for inlining. - // CPython's symtable marks all non-generator comprehensions for + // symtable marks all non-generator comprehensions for // inlining, except scopes nested under a parent that can see class // scope (for example annotation scopes inside classes). if !is_generator { @@ -2404,6 +2763,15 @@ impl SymbolTableBuilder { // Register the passed argument to the generator function as the name ".0" self.register_name(".0", SymbolUsage::Parameter, range)?; + let saved_comprehension_yield_context = self.comprehension_yield_context; + self.comprehension_yield_context = Some(match scope_name { + "<listcomp>" => "list comprehension", + "<setcomp>" => "set comprehension", + "<dictcomp>" => "dict comprehension", + "<genexpr>" => "generator expression", + _ => "comprehension", + }); + self.scan_expression(&outermost.target, ExpressionContext::Iter)?; for if_expr in &outermost.ifs { self.scan_expression(if_expr, ExpressionContext::Load)?; @@ -2413,22 +2781,47 @@ impl SymbolTableBuilder { self.in_comp_inner_loop_target = true; self.scan_expression(&generator.target, ExpressionContext::Iter)?; self.in_comp_inner_loop_target = false; + let was_in_iter_def_exp = self.in_iter_def_exp; + self.in_iter_def_exp = true; self.scan_expression(&generator.iter, ExpressionContext::IterDefinitionExp)?; + self.in_iter_def_exp = was_in_iter_def_exp; for if_expr in &generator.ifs { self.scan_expression(if_expr, ExpressionContext::Load)?; } + if generator.is_async { + self.tables.last_mut().unwrap().is_coroutine = true; + } } if let Some(elt2) = elt2 { self.scan_expression(elt2, ExpressionContext::Load)?; } self.scan_expression(elt1, ExpressionContext::Load)?; + self.tables.last_mut().unwrap().is_generator = is_generator; + self.comprehension_yield_context = saved_comprehension_yield_context; - // CPython symtable_handle_comprehension(): non-generator async + // symtable_handle_comprehension(): non-generator async // comprehensions propagate ste_coroutine to the enclosing scope after // the comprehension block is exited. let propagate_coroutine = self.tables.last().unwrap().is_coroutine && !is_generator; self.leave_scope(); + if propagate_coroutine + && self + .tables + .last() + .is_none_or(|table| table.typ != CompilerScope::Comprehension) + && !self.is_in_async_context() + && !self.allows_top_level_await() + { + return Err(SymbolTableError { + error: "asynchronous comprehension outside of an asynchronous function".to_owned(), + location: Some( + self.source_file + .to_source_code() + .source_location(range.start(), PositionEncoding::Utf8), + ), + }); + } if propagate_coroutine { self.tables.last_mut().unwrap().is_coroutine = true; } @@ -2444,142 +2837,151 @@ impl SymbolTableBuilder { scope_name: &str, scope_info: &'static str, ) -> SymbolTableResult { - // Bounds/defaults are compiled as annotation scopes in CPython. + // Bounds/defaults are compiled as annotation scopes. let in_class = self.tables.last().is_some_and(|t| t.can_see_class_scope); let line_number = self.line_index_start(expr.range()); - self.enter_scope(scope_name, CompilerScope::Annotation, line_number); + self.enter_scope(scope_name, CompilerScope::TypeVariable, line_number); // Evaluator takes a format parameter - self.register_name(".format", SymbolUsage::Parameter, TextRange::default())?; + self.register_name(".format", SymbolUsage::Parameter, expr.range())?; + self.register_name(".format", SymbolUsage::Used, expr.range())?; if in_class { if let Some(table) = self.tables.last_mut() { table.can_see_class_scope = true; } - self.register_name("__classdict__", SymbolUsage::Used, TextRange::default())?; + self.register_name("__classdict__", SymbolUsage::Used, expr.range())?; } - // Set scope_info for better error messages - let old_scope_info = self.scope_info; - self.scope_info = Some(scope_info); + self.tables.last_mut().unwrap().scope_info = Some(scope_info); // Scan the expression in this new scope let result = self.scan_expression(expr, ExpressionContext::Load); - // Restore scope_info and exit the scope - self.scope_info = old_scope_info; self.leave_scope(); result } fn scan_type_params(&mut self, type_params: &ast::TypeParams) -> SymbolTableResult { - // Check for duplicate type parameter names - let mut seen_names: IndexSet<&str> = IndexSet::default(); - // Check for non-default type parameter after default type parameter - let mut default_seen = false; + // Each type parameter is visited as: register name, scan bound, scan default. for type_param in &type_params.type_params { - let (name, range, has_default) = match type_param { - ast::TypeParam::TypeVar(tv) => (tv.name.as_str(), tv.range, tv.default.is_some()), - ast::TypeParam::ParamSpec(ps) => (ps.name.as_str(), ps.range, ps.default.is_some()), - ast::TypeParam::TypeVarTuple(tvt) => { - (tvt.name.as_str(), tvt.range, tvt.default.is_some()) - } - }; - if !seen_names.insert(name) { + if self.recursion_depth >= self.recursion_limit { return Err(SymbolTableError { - error: format!("duplicate type parameter '{name}'"), - location: Some( - self.source_file - .to_source_code() - .source_location(range.start(), PositionEncoding::Utf8), - ), + error: RECURSION_ERROR.to_owned(), + location: None, }); } - if has_default { - default_seen = true; - } else if default_seen { - return Err(SymbolTableError { - error: format!( - "non-default type parameter '{name}' follows default type parameter" - ), - location: Some( - self.source_file - .to_source_code() - .source_location(range.start(), PositionEncoding::Utf8), - ), - }); - } - } + self.recursion_depth += 1; + let result = (|| { + match type_param { + ast::TypeParam::TypeVar(ast::TypeParamTypeVar { + name, + bound, + range: type_var_range, + default, + node_index: _, + .. + }) => { + self.register_name(name.as_str(), SymbolUsage::TypeParam, *type_var_range)?; + if name.as_str() == "__classdict__" { + return Err(SymbolTableError { + error: format!( + "reserved name '{}' cannot be used for type parameter", + name.as_str() + ), + location: Some(self.source_file.to_source_code().source_location( + type_var_range.start(), + PositionEncoding::Utf8, + )), + }); + } - // Register .type_params as a type parameter (automatically becomes cell variable) - self.register_name(".type_params", SymbolUsage::TypeParam, type_params.range)?; + // Process bound in a separate scope + if let Some(binding) = bound { + let scope_info = if binding.is_tuple_expr() { + "a TypeVar constraint" + } else { + "a TypeVar bound" + }; + self.scan_type_param_bound_or_default( + binding, + name.as_str(), + scope_info, + )?; + } - // First register all type parameters - for type_param in &type_params.type_params { - match type_param { - ast::TypeParam::TypeVar(ast::TypeParamTypeVar { - name, - bound, - range: type_var_range, - default, - node_index: _, - }) => { - self.register_name(name.as_str(), SymbolUsage::TypeParam, *type_var_range)?; - - // Process bound in a separate scope - if let Some(binding) = bound { - let scope_info = if binding.is_tuple_expr() { - "a TypeVar constraint" - } else { - "a TypeVar bound" - }; - self.scan_type_param_bound_or_default(binding, name.as_str(), scope_info)?; + // Process default in a separate scope + if let Some(default_value) = default { + self.scan_type_param_bound_or_default( + default_value, + name.as_str(), + "a TypeVar default", + )?; + } } + ast::TypeParam::ParamSpec(ast::TypeParamParamSpec { + name, + range: param_spec_range, + default, + node_index: _, + .. + }) => { + self.register_name(name, SymbolUsage::TypeParam, *param_spec_range)?; + if name == "__classdict__" { + return Err(SymbolTableError { + error: format!( + "reserved name '{name}' cannot be used for type parameter" + ), + location: Some(self.source_file.to_source_code().source_location( + param_spec_range.start(), + PositionEncoding::Utf8, + )), + }); + } - // Process default in a separate scope - if let Some(default_value) = default { - self.scan_type_param_bound_or_default( - default_value, - name.as_str(), - "a TypeVar default", - )?; + // Process default in a separate scope + if let Some(default_value) = default { + self.scan_type_param_bound_or_default( + default_value, + name, + "a ParamSpec default", + )?; + } + } + ast::TypeParam::TypeVarTuple(ast::TypeParamTypeVarTuple { + name, + range: type_var_tuple_range, + default, + node_index: _, + .. + }) => { + self.register_name(name, SymbolUsage::TypeParam, *type_var_tuple_range)?; + if name == "__classdict__" { + return Err(SymbolTableError { + error: format!( + "reserved name '{name}' cannot be used for type parameter" + ), + location: Some(self.source_file.to_source_code().source_location( + type_var_tuple_range.start(), + PositionEncoding::Utf8, + )), + }); + } + + // Process default in a separate scope + if let Some(default_value) = default { + self.scan_type_param_bound_or_default( + default_value, + name, + "a TypeVarTuple default", + )?; + } } } - ast::TypeParam::ParamSpec(ast::TypeParamParamSpec { - name, - range: param_spec_range, - default, - node_index: _, - }) => { - self.register_name(name, SymbolUsage::TypeParam, *param_spec_range)?; - - // Process default in a separate scope - if let Some(default_value) = default { - self.scan_type_param_bound_or_default( - default_value, - name, - "a ParamSpec default", - )?; - } - } - ast::TypeParam::TypeVarTuple(ast::TypeParamTypeVarTuple { - name, - range: type_var_tuple_range, - default, - node_index: _, - }) => { - self.register_name(name, SymbolUsage::TypeParam, *type_var_tuple_range)?; - - // Process default in a separate scope - if let Some(default_value) = default { - self.scan_type_param_bound_or_default( - default_value, - name, - "a TypeVarTuple default", - )?; - } - } - } + Ok(()) + })(); + self.recursion_depth -= 1; + result?; } Ok(()) } @@ -2592,51 +2994,86 @@ impl SymbolTableBuilder { } fn scan_pattern(&mut self, pattern: &ast::Pattern) -> SymbolTableResult { - match pattern { - ast::Pattern::MatchValue(ast::PatternMatchValue { value, .. }) => { - self.scan_expression(value, ExpressionContext::Load)? - } - ast::Pattern::MatchSingleton(_) => {} - ast::Pattern::MatchSequence(ast::PatternMatchSequence { patterns, .. }) => { - self.scan_patterns(patterns)? - } - ast::Pattern::MatchMapping(ast::PatternMatchMapping { - keys, - patterns, - rest, - .. - }) => { - self.scan_expressions(keys, ExpressionContext::Load)?; - self.scan_patterns(patterns)?; - if let Some(rest) = rest { - self.register_ident(rest, SymbolUsage::Assigned)?; - } - } - ast::Pattern::MatchClass(ast::PatternMatchClass { cls, arguments, .. }) => { - self.scan_expression(cls, ExpressionContext::Load)?; - self.scan_patterns(&arguments.patterns)?; - for kw in &arguments.keywords { - self.scan_pattern(&kw.pattern)?; - } - } - ast::Pattern::MatchStar(ast::PatternMatchStar { name, .. }) => { - if let Some(name) = name { - self.register_ident(name, SymbolUsage::Assigned)?; - } - } - ast::Pattern::MatchAs(ast::PatternMatchAs { pattern, name, .. }) => { - if let Some(pattern) = pattern { - self.scan_pattern(pattern)?; - } - if let Some(name) = name { - self.register_ident(name, SymbolUsage::Assigned)?; - } - } - ast::Pattern::MatchOr(ast::PatternMatchOr { patterns, .. }) => { - self.scan_patterns(patterns)? - } + if self.recursion_depth >= self.recursion_limit { + return Err(SymbolTableError { + error: RECURSION_ERROR.to_owned(), + location: None, + }); } - Ok(()) + self.recursion_depth += 1; + let result = (|| { + use ast::Pattern::{ + MatchAs, MatchClass, MatchMapping, MatchOr, MatchSequence, MatchSingleton, + MatchStar, MatchValue, + }; + match pattern { + MatchValue(ast::PatternMatchValue { value, .. }) => { + self.scan_expression(value, ExpressionContext::Load)? + } + MatchSingleton(_) => {} + MatchSequence(ast::PatternMatchSequence { patterns, .. }) => { + self.scan_patterns(patterns)? + } + MatchMapping(ast::PatternMatchMapping { + keys, + patterns, + rest, + .. + }) => { + self.scan_expressions(keys, ExpressionContext::Load)?; + self.scan_patterns(patterns)?; + if let Some(rest) = rest { + if rest.as_str() == "_" { + return Err(SymbolTableError { + error: "invalid syntax".to_owned(), + location: Some( + self.source_file.to_source_code().source_location( + rest.range.start(), + PositionEncoding::Utf8, + ), + ), + }); + } + self.register_name(rest.as_str(), SymbolUsage::Assigned, pattern.range())?; + } + } + MatchClass(ast::PatternMatchClass { cls, arguments, .. }) => { + self.scan_expression(cls, ExpressionContext::Load)?; + self.scan_patterns(&arguments.patterns)?; + for kw in &arguments.keywords { + self.check_name( + kw.attr.as_str(), + ExpressionContext::Store, + kw.pattern.range(), + )?; + } + for kw in &arguments.keywords { + self.scan_pattern(&kw.pattern)?; + } + } + MatchStar(ast::PatternMatchStar { name, .. }) => { + if let Some(name) = name { + self.register_name(name.as_str(), SymbolUsage::Assigned, pattern.range())?; + } + } + MatchAs(ast::PatternMatchAs { + pattern: as_pattern, + name, + .. + }) => { + if let Some(as_pattern) = as_pattern { + self.scan_pattern(as_pattern)?; + } + if let Some(name) = name { + self.register_name(name.as_str(), SymbolUsage::Assigned, pattern.range())?; + } + } + MatchOr(ast::PatternMatchOr { patterns, .. }) => self.scan_patterns(patterns)?, + } + Ok(()) + })(); + self.recursion_depth -= 1; + result } /// Scan default parameter values (evaluated in the enclosing scope) @@ -2660,79 +3097,43 @@ impl SymbolTableBuilder { .any(|arg| arg.default.is_some()) } + fn has_positional_defaults(parameters: &ast::Parameters) -> bool { + parameters + .posonlyargs + .iter() + .chain(parameters.args.iter()) + .any(|arg| arg.default.is_some()) + } + + #[expect( + clippy::too_many_arguments, + reason = "keeps parameter/default scanning options explicit at call sites" + )] fn enter_scope_with_parameters( &mut self, name: &str, parameters: &ast::Parameters, line_number: u32, - has_return_annotation: bool, + returns: Option<&ast::Expr>, scope_type: CompilerScope, skip_defaults: bool, + skip_annotations: bool, ) -> SymbolTableResult { // Evaluate eventual default parameters (unless already scanned before type_param_block): if !skip_defaults { self.scan_parameter_defaults(parameters)?; } - // Annotations are scanned in outer scope: - for annotation in parameters - .posonlyargs - .iter() - .chain(parameters.args.iter()) - .chain(parameters.kwonlyargs.iter()) - .filter_map(|arg| arg.parameter.annotation.as_ref()) - { - self.scan_annotation(annotation)?; + let is_function_scope = matches!( + scope_type, + CompilerScope::Function | CompilerScope::AsyncFunction + ); + if is_function_scope && !skip_annotations { + self.scan_function_annotations(parameters, returns, line_number)?; } - if let Some(annotation) = parameters - .vararg - .as_ref() - .and_then(|arg| arg.annotation.as_ref()) - { - self.scan_annotation(annotation)?; - } - if let Some(annotation) = parameters - .kwarg - .as_ref() - .and_then(|arg| arg.annotation.as_ref()) - { - self.scan_annotation(annotation)?; - } - - // Check if this function has any annotations (parameter or return) - let has_param_annotations = parameters - .posonlyargs - .iter() - .chain(parameters.args.iter()) - .chain(parameters.kwonlyargs.iter()) - .any(|p| p.parameter.annotation.is_some()) - || parameters - .vararg - .as_ref() - .is_some_and(|p| p.annotation.is_some()) - || parameters - .kwarg - .as_ref() - .is_some_and(|p| p.annotation.is_some()); - - let has_any_annotations = has_param_annotations || has_return_annotation; - - // Take annotation_block if this function has any annotations. - // When in class scope, the class's annotation_block was saved before scanning - // function annotations, so the current annotation_block belongs to this function. - let annotation_block = if has_any_annotations { - self.tables.last_mut().unwrap().annotation_block.take() - } else { - None - }; self.enter_scope(name, scope_type, line_number); - // Move annotation_block to function scope only if we have one - if let Some(block) = annotation_block { - self.tables.last_mut().unwrap().annotation_block = Some(block); - } - // Fill scope with parameter names: self.scan_parameters(&parameters.posonlyargs)?; self.scan_parameters(&parameters.args)?; @@ -2781,7 +3182,7 @@ impl SymbolTableBuilder { Ok(()) } - // Mirrors CPython symtable_extend_namedexpr_scope(): assignment expressions + // Mirrors symtable_extend_namedexpr_scope(): assignment expressions // inside comprehensions bind in the nearest function/module-like scope, not // in the synthetic comprehension scope itself. fn extend_namedexpr_scope(&mut self, name: &str, range: TextRange) -> SymbolTableResult { @@ -2871,12 +3272,23 @@ impl SymbolTableBuilder { location, }); } - CompilerScope::Annotation => { + CompilerScope::TypeAlias => { return Err(SymbolTableError { - error: "named expression cannot be used within an annotation".to_string(), + error: + "assignment expression within a comprehension cannot be used in a type alias" + .to_string(), location, }); } + CompilerScope::TypeVariable => { + return Err(SymbolTableError { + error: + "assignment expression within a comprehension cannot be used in a TypeVar bound" + .to_string(), + location, + }); + } + CompilerScope::Annotation => {} CompilerScope::Comprehension => unreachable!(), } } @@ -2896,10 +3308,27 @@ impl SymbolTableBuilder { .source_location(range.start(), PositionEncoding::Utf8); let location = Some(location); - // Note: __debug__ checks are handled by check_name function, so no check needed here. + // symtable_add_def_ctx() runs check_name() for definition + // roles covered by DEF_PARAM | DEF_LOCAL | DEF_IMPORT before adding + // the symbol. Several Rust callers reach register_name() directly + // instead of going through scan_expression(Name), so keep the guard here. + if matches!( + role, + SymbolUsage::Assigned + | SymbolUsage::Imported + | SymbolUsage::AnnotationAssigned + | SymbolUsage::Parameter + | SymbolUsage::AnnotationParameter + | SymbolUsage::AssignedNamedExprInComprehension + | SymbolUsage::Iter + | SymbolUsage::TypeParam + ) { + self.check_name(name, ExpressionContext::Store, range)?; + } let scope_depth = self.tables.len(); let table = self.tables.last_mut().unwrap(); + let current_scope = table.typ; // Add type param names to mangled_names set for selective mangling if matches!(role, SymbolUsage::TypeParam) @@ -2908,6 +3337,7 @@ impl SymbolTableBuilder { set.insert(name.to_owned()); } + let original_name = name; let name = maybe_mangle_name( self.class_name.as_deref(), table.mangled_names.as_ref(), @@ -2932,7 +3362,24 @@ impl SymbolTableBuilder { }); } + if matches!( + role, + SymbolUsage::Parameter | SymbolUsage::AnnotationParameter + ) && flags.contains(SymbolFlags::PARAMETER) + { + return Err(SymbolTableError { + error: format!("duplicate argument '{original_name}' in function definition"), + location, + }); + } + // Role already set.. + if matches!(role, SymbolUsage::TypeParam) && flags.contains(SymbolFlags::TYPE_PARAM) { + return Err(SymbolTableError { + error: format!("duplicate type parameter '{name}'"), + location, + }); + } match role { SymbolUsage::Global if !symbol.is_global() => { if flags.contains(SymbolFlags::PARAMETER) { @@ -2990,6 +3437,20 @@ impl SymbolTableBuilder { }); } } + SymbolUsage::AnnotationAssigned + if current_scope != CompilerScope::Module + && flags.intersects(SymbolFlags::GLOBAL | SymbolFlags::NONLOCAL) => + { + let usage = if flags.contains(SymbolFlags::GLOBAL) { + "global" + } else { + "nonlocal" + }; + return Err(SymbolTableError { + error: format!("annotated name '{name}' can't be {usage}"), + location, + }); + } _ => { // Ok? } @@ -3045,24 +3506,9 @@ impl SymbolTableBuilder { } SymbolUsage::Assigned => { flags.insert(SymbolFlags::ASSIGNED); - // Local variables (assigned) are added to varnames if they are local scope - // and not already in varnames - if symbol.scope == SymbolScope::Local { - let name_str = symbol.name.clone(); - if !self.current_varnames.contains(&name_str) { - self.current_varnames.push(name_str); - } - } } SymbolUsage::AssignedNamedExprInComprehension => { flags.insert(SymbolFlags::ASSIGNED | SymbolFlags::ASSIGNED_IN_COMPREHENSION); - // Named expressions in comprehensions might also be locals - if symbol.scope == SymbolScope::Local { - let name_str = symbol.name.clone(); - if !self.current_varnames.contains(&name_str) { - self.current_varnames.push(name_str); - } - } } SymbolUsage::Global => { symbol.scope = SymbolScope::GlobalExplicit; @@ -3072,7 +3518,7 @@ impl SymbolTableBuilder { flags.insert(SymbolFlags::REFERENCED); } SymbolUsage::Iter => { - flags.insert(SymbolFlags::ITER); + flags.insert(SymbolFlags::ITER | SymbolFlags::COMP_ITER); } SymbolUsage::TypeParam => { flags.insert(SymbolFlags::ASSIGNED | SymbolFlags::TYPE_PARAM); @@ -3096,6 +3542,17 @@ impl SymbolTableBuilder { } } +fn is_docstring_expr(expr: &ast::Expr) -> bool { + matches!( + expr, + ast::Expr::StringLiteral(_) + | ast::Expr::Constant(ast::ExprConstant { + value: ast::ConstantValue::Str(_), + .. + }) + ) +} + pub(crate) fn mangle_name<'a>(class_name: Option<&str>, name: &'a str) -> Cow<'a, str> { let class_name = match class_name { Some(n) => n, @@ -3134,7 +3591,27 @@ pub(crate) fn maybe_mangle_name<'a>( #[cfg(test)] mod tests { - use super::mangle_name; + use super::{CompilerScope, SymbolFlags, SymbolTable, mangle_name}; + use rustpython_compiler_core::SourceFileBuilder; + + fn scan_source(source: &str) -> SymbolTable { + scan_source_result(source).unwrap() + } + + fn scan_source_result(source: &str) -> Result<SymbolTable, super::SymbolTableError> { + let source_file = SourceFileBuilder::new("source_path", source).finish(); + let parsed = ruff_python_parser::parse( + source_file.source_text(), + ruff_python_parser::Mode::Module.into(), + ) + .unwrap() + .into_syntax(); + let module = match parsed { + ruff_python_ast::Mod::Module(module) => module, + _ => unreachable!(), + }; + SymbolTable::scan_program(&module, source_file) + } #[test] fn mangle_name_leaves_private_name_in_underscore_only_class() { @@ -3148,4 +3625,470 @@ mod tests { assert_eq!(mangle_name(Some("_a"), "__a"), "_a__a"); assert_eq!(mangle_name(Some("__a"), "__a"), "_a__a"); } + + #[test] + fn duplicate_parameter_check_uses_mangled_name_like_cpython() { + let err = scan_source_result("class C:\n def f(__x, _C__x):\n pass\n") + .expect_err("expected duplicate argument after class-private mangling"); + + assert_eq!( + err.error, + "duplicate argument '_C__x' in function definition" + ); + } + + #[test] + fn super_name_marks_class_use_in_lambda_scope_like_cpython() { + let table = scan_source("def f():\n return lambda: super()\n"); + let function = table + .sub_tables + .iter() + .find(|table| table.name == "f") + .expect("missing function scope"); + let lambda = function + .sub_tables + .iter() + .find(|table| table.typ == CompilerScope::Lambda) + .expect("missing lambda scope"); + + assert!( + lambda.lookup("__class__").is_some(), + "CPython symtable Name_kind treats super as a __class__ use in any function-like scope" + ); + } + + #[test] + fn comprehension_iteration_target_sets_comp_iter_flag_like_cpython() { + let table = scan_source("result = [i for i in xs]\n"); + let comprehension = table + .inlined_comprehension_blocks + .iter() + .find(|table| table.typ == CompilerScope::Comprehension) + .expect("missing comprehension scope"); + let symbol = comprehension + .lookup("i") + .expect("missing comprehension iteration target"); + + assert!( + symbol.flags.contains(SymbolFlags::COMP_ITER), + "CPython symtable_add_def_helper sets DEF_COMP_ITER on comprehension iteration targets" + ); + } + + #[test] + fn inlined_comprehension_children_are_spliced_like_cpython() { + let table = scan_source("result = [(lambda: i) for i in xs]\n"); + + assert!( + !table + .sub_tables + .iter() + .any(|table| table.typ == CompilerScope::Comprehension), + "CPython removes inlined comprehension entries from ste_children" + ); + assert!( + table + .sub_tables + .iter() + .any(|table| table.typ == CompilerScope::Lambda), + "CPython splices children of inlined comprehensions into the parent children list" + ); + + let comprehension = table + .inlined_comprehension_blocks + .iter() + .find(|table| table.typ == CompilerScope::Comprehension) + .expect("missing inlined comprehension block"); + assert!( + comprehension.comp_inlined, + "CPython keeps the comprehension entry addressable through st_blocks with ste_comp_inlined set" + ); + } + + #[test] + fn future_annotations_annassign_still_scans_annotation_symbols_like_cpython() { + let table = scan_source("from __future__ import annotations\nx: T\n"); + let annotation_block = table + .annotation_block + .as_ref() + .expect("CPython still creates an AnnotationBlock for future annotations"); + + assert!( + annotation_block.lookup("T").is_some(), + "CPython symtable_visit_annotation still visits the annotation expression with future annotations" + ); + } + + #[test] + fn annotation_like_format_parameter_is_marked_used_like_cpython() { + let table = scan_source("def f(x: T): pass\n"); + let annotation_block = table + .sub_tables + .iter() + .find(|table| table.typ == CompilerScope::Annotation) + .expect("missing function annotation block"); + let format = annotation_block + .lookup(".format") + .expect("missing annotation .format parameter"); + assert!( + format + .flags + .contains(SymbolFlags::PARAMETER | SymbolFlags::REFERENCED), + "CPython symtable_enter_block() adds both DEF_PARAM and USE for annotation-like .format" + ); + + let table = scan_source("type A = T\n"); + let alias = table + .sub_tables + .iter() + .find(|table| table.typ == CompilerScope::TypeAlias) + .expect("missing type alias scope"); + let format = alias + .lookup(".format") + .expect("missing type alias .format parameter"); + assert!( + format + .flags + .contains(SymbolFlags::PARAMETER | SymbolFlags::REFERENCED), + "CPython TypeAliasBlock .format has DEF_PARAM | USE" + ); + + let table = scan_source("def f[T: B](): pass\n"); + let type_params = table + .sub_tables + .iter() + .find(|table| table.typ == CompilerScope::TypeParams) + .expect("missing type params scope"); + let type_variable = type_params + .sub_tables + .iter() + .find(|table| table.typ == CompilerScope::TypeVariable) + .expect("missing type variable scope"); + let format = type_variable + .lookup(".format") + .expect("missing type variable .format parameter"); + assert!( + format + .flags + .contains(SymbolFlags::PARAMETER | SymbolFlags::REFERENCED), + "CPython TypeVariableBlock .format has DEF_PARAM | USE" + ); + } + + #[test] + fn function_signature_annotation_block_is_sibling_like_cpython() { + let table = scan_source("def f(x: T): pass\n"); + assert_eq!(table.sub_tables[0].typ, CompilerScope::Annotation); + assert!(table.sub_tables[0].annotations_used); + assert_eq!(table.sub_tables[1].typ, CompilerScope::Function); + assert!( + table.sub_tables[1].annotation_block.is_none(), + "CPython stores the function signature AnnotationBlock as a child keyed by arguments, not on the function block" + ); + + let table = scan_source("def f(x): pass\n"); + assert_eq!(table.sub_tables[0].typ, CompilerScope::Annotation); + assert!(!table.sub_tables[0].annotations_used); + assert_eq!(table.sub_tables[1].typ, CompilerScope::Function); + } + + #[test] + fn future_function_signature_annotation_block_is_hidden_like_cpython() { + let table = scan_source("from __future__ import annotations\ndef f(x: T): pass\n"); + assert_eq!(table.sub_tables[0].typ, CompilerScope::Function); + assert_eq!( + table.hidden_annotation_blocks[0].typ, + CompilerScope::Annotation + ); + assert!(table.hidden_annotation_blocks[0].annotations_used); + assert!( + table.sub_tables[0].annotation_block.is_none(), + "CPython future AnnotationBlock stays in st_blocks and is not attached to the FunctionBlock" + ); + + let table = scan_source("from __future__ import annotations\ndef f(x): pass\n"); + assert_eq!(table.sub_tables[0].typ, CompilerScope::Function); + assert_eq!( + table.hidden_annotation_blocks[0].typ, + CompilerScope::Annotation + ); + assert!(!table.hidden_annotation_blocks[0].annotations_used); + } + + #[test] + fn annassign_marks_current_scope_annotations_used_like_cpython() { + let table = scan_source("x: int\n"); + assert!( + table.annotations_used, + "CPython AnnAssign_kind sets ste_annotations_used on the current scope" + ); + + let table = scan_source("class C:\n x: int\n"); + let class = table + .sub_tables + .iter() + .find(|table| table.typ == CompilerScope::Class) + .expect("missing class scope"); + assert!( + class.annotations_used, + "CPython AnnAssign_kind sets ste_annotations_used on class scopes" + ); + + let table = scan_source("def f():\n x: int\n"); + let function = table + .sub_tables + .iter() + .find(|table| table.typ == CompilerScope::Function) + .expect("missing function scope"); + assert!( + function.annotations_used, + "CPython AnnAssign_kind also marks function-local annotations" + ); + } + + #[test] + fn class_base_child_scope_precedes_class_scope_like_cpython() { + let table = scan_source("class C((lambda: Base)()):\n pass\n"); + assert_eq!(table.sub_tables[0].typ, CompilerScope::Lambda); + assert_eq!(table.sub_tables[1].typ, CompilerScope::Class); + } + + #[test] + fn try_handler_child_scope_precedes_else_scope_like_cpython() { + let table = scan_source( + "\ +def f(x): + try: + pass + except Exception: + y = 1 + def h(): + return y + else: + def e(): + return x +", + ); + let function = table + .sub_tables + .iter() + .find(|table| table.name == "f") + .expect("missing function scope"); + + let function_child_names = function + .sub_tables + .iter() + .filter(|table| table.typ == CompilerScope::Function) + .map(|table| table.name.as_str()) + .collect::<Vec<_>>(); + assert_eq!(function_child_names, vec!["h", "e"]); + } + + #[test] + fn function_default_child_scope_precedes_decorator_scope_like_cpython() { + let table = scan_source( + "\ +@(lambda decorator_arg: decorator_arg) +def f(x=(lambda: 1)()): + pass +", + ); + let lambdas = table + .sub_tables + .iter() + .filter(|table| table.typ == CompilerScope::Lambda) + .collect::<Vec<_>>(); + + assert_eq!(lambdas.len(), 2); + assert!( + lambdas[0].varnames.is_empty(), + "CPython symtable visits function defaults before decorators" + ); + assert_eq!(lambdas[1].varnames, vec!["decorator_arg"]); + } + + #[test] + fn future_annotations_still_rejects_named_expr_in_annotation_like_cpython() { + let err = + scan_source_result("from __future__ import annotations\nx: (y := int)\n").unwrap_err(); + + assert_eq!( + err.error, + "named expression cannot be used within an annotation" + ); + } + + #[test] + fn import_star_outside_module_uses_cpython_symtable_message() { + let err = scan_source_result("def f():\n from m import *\n").unwrap_err(); + + assert_eq!(err.error, "import * only allowed at module level"); + } + + #[test] + fn import_as_error_location_uses_alias_location_like_cpython() { + let source = "import module as __debug__\n"; + let err = scan_source_result(source).unwrap_err(); + + assert_eq!(err.error, "cannot assign to __debug__"); + let location = err.location.unwrap(); + assert_eq!(location.line.get(), 1); + assert_eq!( + location.character_offset.get(), + 8, + "CPython reports LOCATION(a) for import aliases, at the imported name" + ); + } + + #[test] + fn function_def_error_location_uses_statement_location_like_cpython() { + let source = "def __debug__():\n pass\n"; + let err = scan_source_result(source).unwrap_err(); + + assert_eq!(err.error, "cannot assign to __debug__"); + let location = err.location.unwrap(); + assert_eq!(location.line.get(), 1); + assert_eq!( + location.character_offset.get(), + 1, + "CPython reports LOCATION(s) for FunctionDef, at 'def'" + ); + } + + #[test] + fn global_after_assign_error_location_uses_statement_location_like_cpython() { + let source = "def f():\n x = 1\n global x\n"; + let err = scan_source_result(source).unwrap_err(); + + assert_eq!( + err.error, + "name 'x' is assigned to before global declaration" + ); + let location = err.location.unwrap(); + assert_eq!(location.line.get(), 3); + assert_eq!( + location.character_offset.get(), + 5, + "CPython reports LOCATION(s) for global directives, at 'global'" + ); + } + + #[test] + fn type_param_debug_name_is_checked_like_cpython_add_def_ctx() { + let source = "class C[__debug__]:\n pass\n"; + let err = scan_source_result(source).unwrap_err(); + + assert_eq!(err.error, "cannot assign to __debug__"); + let location = err.location.unwrap(); + assert_eq!(location.line.get(), 1); + assert_eq!( + location.character_offset.get(), + 9, + "CPython symtable_add_def_ctx checks DEF_TYPE_PARAM | DEF_LOCAL at LOCATION(tp)" + ); + } + + #[test] + fn except_handler_name_error_location_uses_handler_location_like_cpython() { + let source = "try:\n pass\nexcept Exception as __debug__:\n pass\n"; + let err = scan_source_result(source).unwrap_err(); + + assert_eq!(err.error, "cannot assign to __debug__"); + let location = err.location.unwrap(); + assert_eq!(location.line.get(), 3); + assert_eq!( + location.character_offset.get(), + 1, + "CPython reports LOCATION(eh) for except-handler names, at 'except'" + ); + } + + #[test] + fn match_star_capture_error_location_uses_pattern_location_like_cpython() { + let source = "match subject:\n case [*__debug__]:\n pass\n"; + let err = scan_source_result(source).unwrap_err(); + + assert_eq!(err.error, "cannot assign to __debug__"); + let location = err.location.unwrap(); + assert_eq!(location.line.get(), 2); + assert_eq!( + location.character_offset.get(), + 11, + "CPython reports LOCATION(p) for MatchStar, at the '*'" + ); + } + + #[test] + fn named_expr_in_lambda_inside_comprehension_iter_is_rejected_like_cpython() { + let err = scan_source_result("[x for x in (lambda: (y := 1))()]\n").unwrap_err(); + + assert_eq!( + err.error, + "assignment expression cannot be used in a comprehension iterable expression" + ); + } + + #[test] + fn yield_in_lambda_inside_comprehension_body_is_not_comprehension_yield_like_cpython() { + scan_source_result("[(lambda: (yield x)) for x in xs]\n").expect( + "CPython checks ste_comprehension on the current lambda block, not the enclosing comprehension", + ); + } + + #[test] + fn yield_in_comprehension_scans_value_before_comprehension_error_like_cpython() { + let err = scan_source_result("[(yield (x := 1)) for x in xs]\n").unwrap_err(); + + assert_eq!( + err.error, + "assignment expression cannot rebind comprehension iteration variable 'x'" + ); + } + + #[test] + fn named_expr_in_function_annotation_comprehension_is_allowed_like_cpython() { + scan_source_result("def f(x: [(y := int) for _ in xs]): pass\n").expect( + "CPython skips AnnotationBlock while extending namedexpr scope from a comprehension", + ); + } + + #[test] + fn named_expr_in_class_annotation_comprehension_uses_cpython_message() { + let err = scan_source_result("class C:\n x: [(y := int) for _ in xs]\n").unwrap_err(); + + assert_eq!( + err.error, + "assignment expression within a comprehension cannot be used in a class body" + ); + } + + #[test] + fn named_expr_in_type_alias_comprehension_uses_cpython_message() { + let err = scan_source_result("type A = [(y := int) for _ in xs]\n").unwrap_err(); + + assert_eq!( + err.error, + "assignment expression within a comprehension cannot be used in a type alias" + ); + } + + #[test] + fn named_expr_in_type_parameters_block_uses_cpython_message() { + let err = scan_source_result("class C[T]((base := object)): pass\n").unwrap_err(); + + assert_eq!( + err.error, + "named expression cannot be used within the definition of a generic" + ); + } + + #[test] + fn named_expr_in_typevar_bound_comprehension_uses_cpython_message() { + let err = scan_source_result("def f[T: [(y := int) for _ in xs]](): pass\n").unwrap_err(); + + assert_eq!( + err.error, + "assignment expression within a comprehension cannot be used in a TypeVar bound" + ); + } } diff --git a/crates/codegen/src/unparse.rs b/crates/codegen/src/unparse.rs index d7f754e2f..679560642 100644 --- a/crates/codegen/src/unparse.rs +++ b/crates/codegen/src/unparse.rs @@ -58,6 +58,63 @@ impl<'a, 'b, 'c> Unparser<'a, 'b, 'c> { self.f.write_fmt(f) } + fn unparse_float(&mut self, value: f64) -> fmt::Result { + #[allow(clippy::correctness, clippy::assertions_on_constants)] + const { + assert!(f64::MAX_10_EXP == 308) + }; + + if value.is_infinite() { + self.p("1e309") + } else { + self.p(&rustpython_literal::float::to_string(value)) + } + } + + fn unparse_complex(&mut self, real: f64, imag: f64) -> fmt::Result { + self.p(&rustpython_literal::complex::to_string(real, imag).replace("inf", "1e309")) + } + + fn unparse_constant_value(&mut self, value: &ast::ConstantValue) -> fmt::Result { + match value { + ast::ConstantValue::None => self.p("None"), + ast::ConstantValue::Boolean(value) => self.p(if *value { "True" } else { "False" }), + ast::ConstantValue::Str(value) => UnicodeEscape::new_repr(value.as_ref().into()) + .str_repr() + .fmt(self.f), + ast::ConstantValue::Bytes(value) => AsciiEscape::new_repr(value.as_ref()) + .bytes_repr() + .fmt(self.f), + ast::ConstantValue::Integer(value) => self.p(value.as_ref()), + ast::ConstantValue::Tuple(elements) => { + self.p("(")?; + let mut first = true; + for element in elements { + self.p_delim(&mut first, ", ")?; + self.unparse_constant_value(element)?; + } + self.p_if(elements.len() == 1, ",")?; + self.p(")") + } + ast::ConstantValue::Frozenset(elements) => { + if elements.is_empty() { + self.p("frozenset()") + } else { + self.p("frozenset({")?; + let mut first = true; + for element in elements { + self.p_delim(&mut first, ", ")?; + self.unparse_constant_value(element)?; + } + self.p("})") + } + } + ast::ConstantValue::Float(value) => self.unparse_float(*value), + ast::ConstantValue::Complex { real, imag } => self.unparse_complex(*real, *imag), + ast::ConstantValue::Ellipsis => self.p("..."), + } + } + fn unparse_expr(&mut self, ast: &ast::Expr, level: u8) -> fmt::Result { macro_rules! op_prec { ($op_ty:ident, $x:expr, $enu:path, $($var:ident($op:literal, $prec:ident)),*$(,)?) => { @@ -87,6 +144,7 @@ impl<'a, 'b, 'c> Unparser<'a, 'b, 'c> { values, node_index: _, range: _range, + .. }) => { let (op, prec) = op_prec!(bin, op, ast::BoolOp, And("and", AND), Or("or", OR)); group_if!(prec, { @@ -102,6 +160,7 @@ impl<'a, 'b, 'c> Unparser<'a, 'b, 'c> { value, node_index: _, range: _range, + .. }) => { group_if!(precedence::TUPLE, { self.unparse_expr(target, precedence::ATOM)?; @@ -115,6 +174,7 @@ impl<'a, 'b, 'c> Unparser<'a, 'b, 'c> { right, node_index: _, range: _range, + .. }) => { let right_associative = matches!(op, ast::Operator::Pow); let (op, prec) = op_prec!( @@ -146,6 +206,7 @@ impl<'a, 'b, 'c> Unparser<'a, 'b, 'c> { operand, node_index: _, range: _range, + .. }) => { let (op, prec) = op_prec!( un, @@ -166,6 +227,7 @@ impl<'a, 'b, 'c> Unparser<'a, 'b, 'c> { body, node_index: _, range: _range, + .. }) => { group_if!(precedence::TEST, { if let Some(parameters) = parameters { @@ -183,6 +245,7 @@ impl<'a, 'b, 'c> Unparser<'a, 'b, 'c> { orelse, node_index: _, range: _range, + .. }) => { group_if!(precedence::TEST, { self.unparse_expr(body, precedence::TEST + 1)?; @@ -196,6 +259,7 @@ impl<'a, 'b, 'c> Unparser<'a, 'b, 'c> { items, node_index: _, range: _range, + .. }) => { self.p("{")?; let mut first = true; @@ -214,6 +278,7 @@ impl<'a, 'b, 'c> Unparser<'a, 'b, 'c> { elts, node_index: _, range: _range, + .. }) => { self.p("{")?; let mut first = true; @@ -228,6 +293,7 @@ impl<'a, 'b, 'c> Unparser<'a, 'b, 'c> { generators, node_index: _, range: _range, + .. }) => { self.p("[")?; self.unparse_expr(elt, precedence::TEST)?; @@ -239,6 +305,7 @@ impl<'a, 'b, 'c> Unparser<'a, 'b, 'c> { generators, node_index: _, range: _range, + .. }) => { self.p("{")?; self.unparse_expr(elt, precedence::TEST)?; @@ -251,6 +318,7 @@ impl<'a, 'b, 'c> Unparser<'a, 'b, 'c> { generators, node_index: _, range: _range, + .. }) => { self.p("{")?; self.unparse_expr(key, precedence::TEST)?; @@ -265,6 +333,7 @@ impl<'a, 'b, 'c> Unparser<'a, 'b, 'c> { generators, node_index: _, range: _range, + .. }) => { self.p("(")?; self.unparse_expr(elt, precedence::TEST)?; @@ -275,6 +344,7 @@ impl<'a, 'b, 'c> Unparser<'a, 'b, 'c> { value, node_index: _, range: _range, + .. }) => { group_if!(precedence::AWAIT, { self.p("await ")?; @@ -285,6 +355,7 @@ impl<'a, 'b, 'c> Unparser<'a, 'b, 'c> { value, node_index: _, range: _range, + .. }) => { if let Some(value) = value { write!(self, "(yield {})", UnparseExpr::new(value, self.source))?; @@ -296,6 +367,7 @@ impl<'a, 'b, 'c> Unparser<'a, 'b, 'c> { value, node_index: _, range: _range, + .. }) => { write!( self, @@ -309,6 +381,7 @@ impl<'a, 'b, 'c> Unparser<'a, 'b, 'c> { comparators, node_index: _, range: _range, + .. }) => { group_if!(precedence::CMP, { let new_lvl = precedence::CMP + 1; @@ -326,6 +399,7 @@ impl<'a, 'b, 'c> Unparser<'a, 'b, 'c> { arguments: ast::Arguments { args, keywords, .. }, node_index: _, range: _range, + .. }) => { self.unparse_expr(func, precedence::ATOM)?; self.p("(")?; @@ -379,26 +453,13 @@ impl<'a, 'b, 'c> Unparser<'a, 'b, 'c> { .bytes_repr() .fmt(self.f)? } - ast::Expr::NumberLiteral(ast::ExprNumberLiteral { value, .. }) => { - #[allow(clippy::correctness, clippy::assertions_on_constants)] - const { - assert!(f64::MAX_10_EXP == 308) - }; - - let inf_str = "1e309"; - match value { - ast::Number::Int(int) => int.fmt(self.f)?, - &ast::Number::Float(fp) => { - if fp.is_infinite() { - self.p(inf_str)? - } else { - self.p(&rustpython_literal::float::to_string(fp))? - } - } - &ast::Number::Complex { real, imag } => self - .p(&rustpython_literal::complex::to_string(real, imag) - .replace("inf", inf_str))?, - } + ast::Expr::NumberLiteral(ast::ExprNumberLiteral { value, .. }) => match value { + ast::Number::Int(int) => int.fmt(self.f)?, + &ast::Number::Float(fp) => self.unparse_float(fp)?, + &ast::Number::Complex { real, imag } => self.unparse_complex(real, imag)?, + }, + ast::Expr::Constant(ast::ExprConstant { value, .. }) => { + self.unparse_constant_value(value)? } ast::Expr::BooleanLiteral(ast::ExprBooleanLiteral { value, .. }) => { self.p(if *value { "True" } else { "False" })? @@ -460,6 +521,7 @@ impl<'a, 'b, 'c> Unparser<'a, 'b, 'c> { step, node_index: _, range: _range, + .. }) => { if let Some(lower) = lower { self.unparse_expr(lower, precedence::TEST)?; @@ -554,7 +616,9 @@ impl<'a, 'b, 'c> Unparser<'a, 'b, 'c> { let buffered = fmt::from_fn(|f| Unparser::new(f, self.source).unparse_expr(val, precedence::TEST + 1)) .to_string(); - if let Some(ast::DebugText { leading, trailing }) = debug_text { + if let Some(debug_text) = debug_text { + let leading = debug_text.leading.as_str(); + let trailing = debug_text.trailing.as_str(); self.p(leading)?; self.p(self.source.slice(val.range()))?; self.p(trailing)?; diff --git a/crates/compiler-core/src/bytecode.rs b/crates/compiler-core/src/bytecode.rs index ee6b6e5d9..c01f2f057 100644 --- a/crates/compiler-core/src/bytecode.rs +++ b/crates/compiler-core/src/bytecode.rs @@ -468,6 +468,13 @@ bitflags! { const COROUTINE = 0x0080; const ITERABLE_COROUTINE = 0x0100; const ASYNC_GENERATOR = 0x0200; + const FUTURE_DIVISION = 0x20000; + const FUTURE_ABSOLUTE_IMPORT = 0x40000; + const FUTURE_WITH_STATEMENT = 0x80000; + const FUTURE_PRINT_FUNCTION = 0x100000; + const FUTURE_UNICODE_LITERALS = 0x200000; + const FUTURE_BARRY_AS_BDFL = 0x400000; + const FUTURE_GENERATOR_STOP = 0x800000; const FUTURE_ANNOTATIONS = 0x1000000; /// If a code object represents a function and has a docstring, /// this bit is set and the first item in co_consts is the docstring. diff --git a/crates/compiler-core/src/bytecode/instruction.rs b/crates/compiler-core/src/bytecode/instruction.rs index 69714a0fe..76871b2c9 100644 --- a/crates/compiler-core/src/bytecode/instruction.rs +++ b/crates/compiler-core/src/bytecode/instruction.rs @@ -754,9 +754,8 @@ impl Opcode { /// Stack effect when the instruction takes its branch (jump=true). /// /// CPython equivalent: `stack_effect(opcode, oparg, jump=True)`. - /// For most instructions this equals the fallthrough effect. - /// Override for instructions where branch and fallthrough differ - /// (e.g. [`Self::ForIter`]: fallthrough = +1, branch = −1). + /// Current opcode metadata has the same real-opcode stack effect + /// for jump and fallthrough stack-depth calculation. #[must_use] pub fn stack_effect_jump(&self, oparg: u32) -> i32 { self.stack_effect(oparg) @@ -1415,6 +1414,26 @@ mod tests { assert!(!AnyInstruction::from(PseudoOpcode::Jump).has_const()); } + #[test] + fn stack_effects_match_cpython_opcode_metadata() { + assert_eq!(Opcode::ForIter.stack_effect_info(0).popped(), 1); + assert_eq!(Opcode::ForIter.stack_effect_info(0).pushed(), 2); + assert_eq!(Opcode::ForIter.stack_effect(0), 1); + assert_eq!(Opcode::ForIter.stack_effect_jump(0), 1); + + assert_eq!(Opcode::EndAsyncFor.stack_effect_info(0).popped(), 2); + assert_eq!(Opcode::EndAsyncFor.stack_effect_info(0).pushed(), 0); + assert_eq!(Opcode::PopJumpIfFalse.stack_effect(0), -1); + assert_eq!(Opcode::PopJumpIfFalse.stack_effect_jump(0), -1); + + assert_eq!(PseudoOpcode::SetupFinally.stack_effect_info(0).pushed(), 1); + assert_eq!(PseudoOpcode::SetupFinally.stack_effect(0), 0); + assert_eq!(PseudoOpcode::SetupFinally.stack_effect_jump(0), 1); + assert_eq!(PseudoOpcode::SetupCleanup.stack_effect_info(0).pushed(), 2); + assert_eq!(PseudoOpcode::SetupCleanup.stack_effect(0), 0); + assert_eq!(PseudoOpcode::SetupCleanup.stack_effect_jump(0), 2); + } + #[test] fn no_fallthrough_flags_match_cpython_basicblock_nofallthrough() { assert!(Opcode::JumpForward.is_no_fallthrough()); diff --git a/crates/compiler-core/src/bytecode/oparg.rs b/crates/compiler-core/src/bytecode/oparg.rs index 03628604a..8f7060030 100644 --- a/crates/compiler-core/src/bytecode/oparg.rs +++ b/crates/compiler-core/src/bytecode/oparg.rs @@ -777,19 +777,20 @@ oparg_enum!( #[derive(Copy, Clone)] pub struct UnpackExArgs { pub before: u8, - pub after: u8, + pub after: u32, } impl From<u32> for UnpackExArgs { fn from(value: u32) -> Self { - let [before, after, ..] = value.to_le_bytes(); + let before = (value & 0xFF) as u8; + let after = value >> 8; Self { before, after } } } impl From<UnpackExArgs> for u32 { fn from(value: UnpackExArgs) -> Self { - Self::from_le_bytes([value.before, value.after, 0, 0]) + Self::from(value.before) | (value.after << 8) } } diff --git a/crates/compiler/src/lib.rs b/crates/compiler/src/lib.rs index 9c0884c75..2cebfcb8b 100644 --- a/crates/compiler/src/lib.rs +++ b/crates/compiler/src/lib.rs @@ -1,10 +1,9 @@ pub use ruff_python_ast::token::TokenKind; -use ruff_python_parser::{LexicalErrorType, ParseErrorType}; +use ruff_python_parser::ParseErrorType; use ruff_source_file::{PositionEncoding, SourceFile, SourceFileBuilder, SourceLocation}; -use ruff_text_size::TextSlice; -use thiserror::Error; - +use ruff_text_size::{Ranged, TextSize, TextSlice}; use rustpython_codegen::{compile, symboltable}; +use thiserror::Error; pub use rustpython_codegen::compile::CompileOpts; pub use rustpython_compiler_core::{Mode, bytecode::CodeObject}; @@ -52,155 +51,38 @@ pub enum CompileError { impl CompileError { #[must_use] pub fn from_ruff_parse_error(error: parser::ParseError, source_file: &SourceFile) -> Self { - let source_code = source_file.to_source_code(); - let source_text = source_file.source_text(); - - // For EOF errors (unclosed brackets), find the unclosed bracket position - // and adjust both the error location and message - let mut is_unclosed_bracket = false; - let (error_type, location, end_location) = match &error.error { - ParseErrorType::Lexical(LexicalErrorType::Eof) => { - if let Some((bracket_char, bracket_offset)) = find_unclosed_bracket(source_text) { - let bracket_text_size = ruff_text_size::TextSize::new(bracket_offset as u32); - let loc = - source_code.source_location(bracket_text_size, PositionEncoding::Utf8); - let end_loc = SourceLocation { - line: loc.line, - character_offset: loc.character_offset.saturating_add(1), - }; - let msg = format!("'{bracket_char}' was never closed"); - is_unclosed_bracket = true; - (ParseErrorType::OtherError(msg), loc, end_loc) - } else { - let loc = - source_code.source_location(error.location.start(), PositionEncoding::Utf8); - let end_loc = - source_code.source_location(error.location.end(), PositionEncoding::Utf8); - (error.error, loc, end_loc) - } - } - - ParseErrorType::Lexical(LexicalErrorType::IndentationError) => { - // For IndentationError, point the offset to the end of the line content - // instead of the beginning - let loc = - source_code.source_location(error.location.start(), PositionEncoding::Utf8); - let line_idx = loc.line.to_zero_indexed(); - let line = source_text.split('\n').nth(line_idx).unwrap_or(""); - let line_end_col = line.chars().count() + 1; // 1-indexed, past last char - let end_loc = SourceLocation { - line: loc.line, - character_offset: ruff_source_file::OneIndexed::new(line_end_col) - .unwrap_or(loc.character_offset), - }; - (error.error, end_loc, end_loc) - } - ParseErrorType::ExpectedToken { expected, found } - if matches!((expected, found), (TokenKind::Comma, TokenKind::Int)) => - { - let loc = - source_code.source_location(error.location.start(), PositionEncoding::Utf8); - let mut end_loc = - source_code.source_location(error.location.end(), PositionEncoding::Utf8); - - // If the error range ends at the start of a new line (column 1), - // adjust it to the end of the previous line - if end_loc.character_offset.get() == 1 && end_loc.line > loc.line { - let prev_line_end = error.location.end() - ruff_text_size::TextSize::from(1); - end_loc = source_code.source_location(prev_line_end, PositionEncoding::Utf8); - end_loc.character_offset = end_loc.character_offset.saturating_add(1); - } - let msg = "invalid syntax. Perhaps you forgot a comma?".into(); - (ParseErrorType::OtherError(msg), loc, end_loc) - } - - ParseErrorType::InvalidAssignmentTarget => { - let loc = - source_code.source_location(error.location.start(), PositionEncoding::Utf8); - let mut end_loc = - source_code.source_location(error.location.end(), PositionEncoding::Utf8); - - // If the error range ends at the start of a new line (column 1), - // adjust it to the end of the previous line - if end_loc.character_offset.get() == 1 && end_loc.line > loc.line { - let prev_line_end = error.location.end() - ruff_text_size::TextSize::from(1); - end_loc = source_code.source_location(prev_line_end, PositionEncoding::Utf8); - end_loc.character_offset = end_loc.character_offset.saturating_add(1); - } - - let expr_str = source_file.source_text().slice(error.location); - - let msg = parser::parse_expression(expr_str).map_or_else( - |_| match expr_str { - "yield" => "assignment to yield expression not possible".into(), - _ => format!("cannot assign to {expr_str}"), - }, - |parsed| match *parsed.syntax().body { - ast::Expr::Call(_) => "cannot assign to function call".into(), - ast::Expr::BinOp(_) => "cannot assign to expression".into(), - ast::Expr::If(_) => "cannot assign to conditional expression".into(), - ast::Expr::Generator(_) => "cannot assign to generator expression".into(), - ast::Expr::StringLiteral(_) - | ast::Expr::BytesLiteral(_) - | ast::Expr::NumberLiteral(_) => { - "cannot assign to literal here. Maybe you meant '==' instead of '='?" - .into() - } - ast::Expr::EllipsisLiteral(_) => { - "cannot assign to ellipsis here. Maybe you meant '==' instead of '='?" - .into() - } - _ => format!("cannot assign to {expr_str}"), - }, - ); - - (ParseErrorType::OtherError(msg), loc, end_loc) - } - - ParseErrorType::InvalidNamedAssignmentTarget => { - let loc = - source_code.source_location(error.location.start(), PositionEncoding::Utf8); - let mut end_loc = - source_code.source_location(error.location.end(), PositionEncoding::Utf8); - - // If the error range ends at the start of a new line (column 1), - // adjust it to the end of the previous line - if end_loc.character_offset.get() == 1 && end_loc.line > loc.line { - let prev_line_end = error.location.end() - ruff_text_size::TextSize::from(1); - end_loc = source_code.source_location(prev_line_end, PositionEncoding::Utf8); - end_loc.character_offset = end_loc.character_offset.saturating_add(1); - } - - let target = source_file.source_text().slice(error.location); - let msg = format!("cannot use assignment expressions with {target}"); - (ParseErrorType::OtherError(msg), loc, end_loc) - } - - _ => { - let loc = - source_code.source_location(error.location.start(), PositionEncoding::Utf8); - let mut end_loc = - source_code.source_location(error.location.end(), PositionEncoding::Utf8); - - // If the error range ends at the start of a new line (column 1), - // adjust it to the end of the previous line - if end_loc.character_offset.get() == 1 && end_loc.line > loc.line { - let prev_line_end = error.location.end() - ruff_text_size::TextSize::from(1); - end_loc = source_code.source_location(prev_line_end, PositionEncoding::Utf8); - end_loc.character_offset = end_loc.character_offset.saturating_add(1); - } - - (error.error, loc, end_loc) - } + let raw_location = error.location; + let diagnostic = match cpython_parse_diagnostic_override(&error, source_file) { + Some(diagnostic) => diagnostic, + None => default_parse_diagnostic(error, source_file), }; Self::Parse(ParseError { - error: error_type, - raw_location: error.location, + error: diagnostic.error, + raw_location, + location: diagnostic.location, + end_location: diagnostic.end_location, + source_path: source_file.name().to_owned(), + is_unclosed_bracket: diagnostic.is_unclosed_bracket, + }) + } + + fn from_source_error( + source_file: &SourceFile, + message: String, + start: usize, + end: usize, + ) -> Self { + let start = TextSize::new(start as u32); + let end = TextSize::new(end as u32); + let (location, end_location) = source_locations(source_file, start, end); + Self::Parse(ParseError { + error: parser::ParseErrorType::OtherError(message), + raw_location: ruff_text_size::TextRange::new(start, end), location, end_location, source_path: source_file.name().to_owned(), - is_unclosed_bracket, + is_unclosed_bracket: false, }) } @@ -241,6 +123,4940 @@ impl CompileError { } } +fn source_location(source_file: &SourceFile, offset: TextSize) -> SourceLocation { + source_file + .to_source_code() + .source_location(offset, PositionEncoding::Utf8) +} + +fn source_locations( + source_file: &SourceFile, + start: TextSize, + end: TextSize, +) -> (SourceLocation, SourceLocation) { + let source_code = source_file.to_source_code(); + ( + source_code.source_location(start, PositionEncoding::Utf8), + source_code.source_location(end, PositionEncoding::Utf8), + ) +} + +struct NormalizedParseDiagnostic { + error: parser::ParseErrorType, + location: SourceLocation, + end_location: SourceLocation, + is_unclosed_bracket: bool, +} + +impl NormalizedParseDiagnostic { + const fn new( + error: parser::ParseErrorType, + location: SourceLocation, + end_location: SourceLocation, + ) -> Self { + Self { + error, + location, + end_location, + is_unclosed_bracket: false, + } + } + + fn other(source_file: &SourceFile, message: String, start: usize, end: usize) -> Self { + let (location, end_location) = source_locations( + source_file, + TextSize::new(start as u32), + TextSize::new(end as u32), + ); + Self::new( + parser::ParseErrorType::OtherError(message), + location, + end_location, + ) + } + + const fn with_unclosed_bracket(mut self, is_unclosed_bracket: bool) -> Self { + self.is_unclosed_bracket = is_unclosed_bracket; + self + } +} + +fn cpython_parse_diagnostic_override( + error: &parser::ParseError, + source_file: &SourceFile, +) -> Option<NormalizedParseDiagnostic> { + let source_text = source_file.source_text(); + + macro_rules! source_error { + ($expr:expr) => { + if let Some((message, start, end)) = $expr { + return Some(NormalizedParseDiagnostic::other( + source_file, + message, + start, + end, + )); + } + }; + } + + if let Some((message, offset)) = invalid_number_literal_error(source_text) { + return Some(NormalizedParseDiagnostic::other( + source_file, + message, + offset, + offset, + )); + } + source_error!(invalid_legacy_statement_error(source_text)); + source_error!(non_printable_character_error(source_text)); + source_error!(invalid_interpolated_string_error(source_text)); + + if let Some((message, start, end, unclosed)) = bracket_syntax_error(source_text) { + return Some( + NormalizedParseDiagnostic::other(source_file, message, start, end) + .with_unclosed_bracket(unclosed), + ); + } + + if matches!( + &error.error, + parser::ParseErrorType::Lexical(parser::LexicalErrorType::LineContinuationError) + ) { + let loc = source_location(source_file, error.location.start() + TextSize::from(1)); + return Some(NormalizedParseDiagnostic::new( + error.error.clone(), + loc, + loc, + )); + } + + source_error!(unterminated_string_error(source_text)); + source_error!(expected_indented_block_error(error, source_text)); + + if matches!( + &error.error, + parser::ParseErrorType::Lexical(parser::LexicalErrorType::Eof) + ) { + return Some(eof_parse_diagnostic(error, source_file)); + } + + source_error!(invalid_type_param_error(source_text)); + source_error!(invalid_comprehension_error(source_text)); + source_error!(invalid_parameter_star_annotation_error(source_text)); + source_error!(invalid_parameter_list_error(source_text)); + source_error!(invalid_call_argument_error(source_text)); + + if is_missing_comma_between_literals(error) { + let (loc, end_loc) = adjusted_error_locations(source_file, error.location); + let msg = "invalid syntax. Perhaps you forgot a comma?".into(); + return Some(NormalizedParseDiagnostic::new( + parser::ParseErrorType::OtherError(msg), + loc, + end_loc, + )); + } + + source_error!(invalid_dict_error(source_text)); + source_error!(invalid_collection_assignment_error(source_text)); + source_error!(invalid_group_error(source_text)); + source_error!(invalid_def_type_params_error(source_text)); + source_error!(invalid_expression_error(source_text)); + source_error!(invalid_named_expression_error(source_text)); + source_error!(invalid_plain_assignment_error(source_text)); + source_error!(expression_assignment_error(source_text)); + source_error!(invalid_annotation_target_error(source_text)); + source_error!(invalid_assignment_target_error(source_text)); + source_error!(invalid_augassign_target_error(source_text)); + source_error!(invalid_for_target_error(source_text)); + source_error!(invalid_with_target_error(source_text)); + source_error!(invalid_delete_target_error(source_text)); + source_error!(invalid_standalone_except_error(source_text)); + source_error!(invalid_import_statement_error(source_text)); + source_error!(invalid_import_target_error(source_text)); + source_error!(invalid_except_as_target_error(source_text)); + source_error!(invalid_match_mapping_rest_wildcard_error(source_text)); + source_error!(invalid_match_as_target_error(source_text)); + source_error!(invalid_for_if_clause_error(source_text)); + source_error!(invalid_if_expression_statement_error(source_text)); + source_error!(invalid_else_elif_error(source_text)); + source_error!(mixed_except_handlers_error(source_text)); + + if matches!( + &error.error, + parser::ParseErrorType::Lexical(parser::LexicalErrorType::IndentationError) + ) { + let end_loc = source_line_end_location(source_file, error.location.start()); + return Some(NormalizedParseDiagnostic::new( + error.error.clone(), + end_loc, + end_loc, + )); + } + + if matches!( + &error.error, + parser::ParseErrorType::InvalidAssignmentTarget + ) { + return Some(invalid_assignment_target_diagnostic(error, source_file)); + } + + if matches!( + &error.error, + parser::ParseErrorType::InvalidNamedAssignmentTarget + ) { + let (loc, end_loc) = adjusted_error_locations(source_file, error.location); + let target = source_file.source_text().slice(error.location); + let msg = format!("cannot use assignment expressions with {target}"); + return Some(NormalizedParseDiagnostic::new( + parser::ParseErrorType::OtherError(msg), + loc, + end_loc, + )); + } + + None +} + +fn eof_parse_diagnostic( + error: &parser::ParseError, + source_file: &SourceFile, +) -> NormalizedParseDiagnostic { + let source_text = source_file.source_text(); + if let Some((bracket_char, bracket_offset)) = find_unclosed_bracket(source_text) { + let loc = source_location(source_file, TextSize::new(bracket_offset as u32)); + let end_loc = SourceLocation { + line: loc.line, + character_offset: loc.character_offset.saturating_add(1), + }; + let msg = format!("'{bracket_char}' was never closed"); + NormalizedParseDiagnostic::new(parser::ParseErrorType::OtherError(msg), loc, end_loc) + .with_unclosed_bracket(true) + } else { + let end_loc = source_line_end_location(source_file, error.location.start()); + NormalizedParseDiagnostic::new(error.error.clone(), end_loc, end_loc) + } +} + +fn invalid_assignment_target_diagnostic( + error: &parser::ParseError, + source_file: &SourceFile, +) -> NormalizedParseDiagnostic { + let (loc, end_loc) = adjusted_error_locations(source_file, error.location); + let expr_str = source_file.source_text().slice(error.location); + + let msg = parser::parse_expression(expr_str).map_or_else( + |_| match expr_str { + "yield" => "assignment to yield expression not possible".into(), + _ => format!("cannot assign to {expr_str}"), + }, + |parsed| match *parsed.syntax().body { + ast::Expr::Call(_) => "cannot assign to function call".into(), + ast::Expr::BinOp(_) => "cannot assign to expression".into(), + ast::Expr::If(_) => "cannot assign to conditional expression".into(), + ast::Expr::Generator(_) => "cannot assign to generator expression".into(), + ast::Expr::FString(_) => "invalid syntax".into(), + ast::Expr::StringLiteral(_) + | ast::Expr::BytesLiteral(_) + | ast::Expr::NumberLiteral(_) => { + "cannot assign to literal here. Maybe you meant '==' instead of '='?".into() + } + ast::Expr::EllipsisLiteral(_) => { + "cannot assign to ellipsis here. Maybe you meant '==' instead of '='?".into() + } + _ => format!("cannot assign to {expr_str}"), + }, + ); + + NormalizedParseDiagnostic::new(parser::ParseErrorType::OtherError(msg), loc, end_loc) +} + +fn default_parse_diagnostic( + error: parser::ParseError, + source_file: &SourceFile, +) -> NormalizedParseDiagnostic { + let (loc, end_loc) = adjusted_error_locations(source_file, error.location); + NormalizedParseDiagnostic::new(error.error, loc, end_loc) +} + +fn adjusted_error_locations( + source_file: &SourceFile, + range: ruff_text_size::TextRange, +) -> (SourceLocation, SourceLocation) { + let mut locations = source_locations(source_file, range.start(), range.end()); + if locations.1.character_offset.get() == 1 && locations.1.line > locations.0.line { + locations.1 = source_location(source_file, range.end() - TextSize::from(1)); + locations.1.character_offset = locations.1.character_offset.saturating_add(1); + } + locations +} + +fn source_line_end_location(source_file: &SourceFile, offset: TextSize) -> SourceLocation { + let loc = source_location(source_file, offset); + let line_idx = loc.line.to_zero_indexed(); + let line = source_file + .source_text() + .split('\n') + .nth(line_idx) + .unwrap_or(""); + let line_end_col = line.chars().count() + 1; + SourceLocation { + line: loc.line, + character_offset: ruff_source_file::OneIndexed::new(line_end_col) + .unwrap_or(loc.character_offset), + } +} + +fn is_missing_comma_between_literals(error: &parser::ParseError) -> bool { + matches!( + &error.error, + parser::ParseErrorType::ExpectedToken { expected, found } + if matches!((expected, found), (TokenKind::Comma, TokenKind::Int)) + ) +} + +fn is_ascii_identifier_char(byte: u8) -> bool { + byte == b'_' || byte.is_ascii_alphanumeric() +} + +fn numeric_keyword_suffix(rest: &[u8]) -> bool { + rest.starts_with(b"and") + || rest.starts_with(b"else") + || rest.starts_with(b"for") + || rest.starts_with(b"if") + || rest.starts_with(b"in") + || rest.starts_with(b"is") + || rest.starts_with(b"or") + || rest.starts_with(b"not") +} + +fn consume_decimal_digits(bytes: &[u8], mut index: usize) -> usize { + while index < bytes.len() { + match bytes[index] { + b'0'..=b'9' => index += 1, + b'_' if bytes + .get(index + 1) + .is_some_and(|byte| byte.is_ascii_digit()) => + { + index += 2; + } + _ => break, + } + } + index +} + +fn consume_radix_digits(bytes: &[u8], mut index: usize, is_digit: impl Fn(u8) -> bool) -> usize { + while index < bytes.len() { + if is_digit(bytes[index]) { + index += 1; + } else if bytes.get(index) == Some(&b'_') + && bytes.get(index + 1).is_some_and(|&byte| is_digit(byte)) + { + index += 2; + } else { + break; + } + } + index +} + +fn invalid_radix_literal_error( + bytes: &[u8], + start: usize, + kind: &'static str, + is_digit: impl Fn(u8) -> bool, +) -> Option<(String, usize)> { + let mut index = start + 2; + let mut has_digit = false; + loop { + let Some(&byte) = bytes.get(index) else { + return Some((format!("invalid {kind} literal"), start + 1)); + }; + if byte == b'_' { + let Some(&next) = bytes.get(index + 1) else { + return Some((format!("invalid {kind} literal"), index)); + }; + if is_digit(next) { + has_digit = true; + index += 2; + continue; + } + if next.is_ascii_digit() && matches!(kind, "binary" | "octal") { + return Some(( + format!("invalid digit '{}' in {kind} literal", next as char), + index + 1, + )); + } + return Some((format!("invalid {kind} literal"), index)); + } + if is_digit(byte) { + has_digit = true; + index += 1; + continue; + } + if byte.is_ascii_digit() && matches!(kind, "binary" | "octal") { + return Some(( + format!("invalid digit '{}' in {kind} literal", byte as char), + index, + )); + } + if has_digit { + return None; + } + return Some((format!("invalid {kind} literal"), start + 1)); + } +} + +fn decimal_tail_error(bytes: &[u8], mut index: usize) -> Option<usize> { + loop { + while bytes.get(index).is_some_and(|byte| byte.is_ascii_digit()) { + index += 1; + } + if bytes.get(index) != Some(&b'_') { + return None; + } + let underscore = index; + index += 1; + if !bytes.get(index).is_some_and(|byte| byte.is_ascii_digit()) { + return Some(underscore); + } + } +} + +fn decimal_tail_end(bytes: &[u8], mut index: usize) -> usize { + loop { + while bytes.get(index).is_some_and(|byte| byte.is_ascii_digit()) { + index += 1; + } + if bytes.get(index) == Some(&b'_') + && bytes + .get(index + 1) + .is_some_and(|byte| byte.is_ascii_digit()) + { + index += 2; + } else { + return index; + } + } +} + +fn invalid_decimal_literal_error(bytes: &[u8], start: usize) -> Option<(String, usize)> { + if bytes.get(start) == Some(&b'.') { + return None; + } + let message = "invalid decimal literal".to_owned(); + if let Some(offset) = decimal_tail_error(bytes, start) { + return Some((message, offset)); + } + + let mut index = decimal_tail_end(bytes, start); + if bytes.get(index) == Some(&b'.') { + if bytes.get(index + 1) == Some(&b'_') { + return Some((message, index)); + } + if let Some(offset) = decimal_tail_error(bytes, index + 1) { + return Some((message, offset)); + } + index = decimal_tail_end(bytes, index + 1); + } + if matches!(bytes.get(index), Some(b'e' | b'E')) { + let exponent = index; + index += 1; + let sign = if matches!(bytes.get(index), Some(b'+' | b'-')) { + let sign = index; + index += 1; + Some(sign) + } else { + None + }; + if !bytes.get(index).is_some_and(|byte| byte.is_ascii_digit()) { + return Some((message, sign.unwrap_or(exponent))); + } + if let Some(offset) = decimal_tail_error(bytes, index) { + return Some((message, offset)); + } + } + None +} + +fn leading_zero_decimal_literal_error(bytes: &[u8], start: usize) -> Option<(String, usize)> { + if bytes.get(start) != Some(&b'0') { + return None; + } + let mut index = start; + loop { + match bytes.get(index) { + Some(b'0') => index += 1, + Some(b'_') + if bytes + .get(index + 1) + .is_some_and(|byte| byte.is_ascii_digit()) => + { + index += 1; + } + _ => break, + } + } + if bytes.get(index).is_some_and(|byte| byte.is_ascii_digit()) { + let after_digits = decimal_tail_end(bytes, index); + if !matches!( + bytes.get(after_digits), + Some(b'.' | b'e' | b'E' | b'j' | b'J') + ) { + return Some(( + "leading zeros in decimal integer literals are not permitted; use an 0o prefix for octal integers".to_owned(), + start, + )); + } + } + None +} + +fn invalid_numeric_literal_error(bytes: &[u8], start: usize) -> Option<(String, usize)> { + if bytes.get(start) == Some(&b'0') { + match bytes.get(start + 1) { + Some(b'x' | b'X') => { + return invalid_radix_literal_error(bytes, start, "hexadecimal", |byte| { + byte.is_ascii_hexdigit() + }); + } + Some(b'o' | b'O') => { + return invalid_radix_literal_error(bytes, start, "octal", |byte| { + matches!(byte, b'0'..=b'7') + }); + } + Some(b'b' | b'B') => { + return invalid_radix_literal_error(bytes, start, "binary", |byte| { + matches!(byte, b'0' | b'1') + }); + } + _ => {} + } + if let Some(err) = leading_zero_decimal_literal_error(bytes, start) { + return Some(err); + } + } + invalid_decimal_literal_error(bytes, start) +} + +fn consume_exponent(bytes: &[u8], index: usize) -> usize { + if !matches!(bytes.get(index), Some(b'e' | b'E')) { + return index; + } + let mut cursor = index + 1; + if matches!(bytes.get(cursor), Some(b'+' | b'-')) { + cursor += 1; + } + if bytes.get(cursor).is_some_and(|byte| byte.is_ascii_digit()) { + consume_decimal_digits(bytes, cursor) + } else { + index + } +} + +fn number_literal_end(bytes: &[u8], start: usize) -> Option<(&'static str, usize)> { + if bytes.get(start) == Some(&b'.') { + if !bytes + .get(start + 1) + .is_some_and(|byte| byte.is_ascii_digit()) + { + return None; + } + let mut index = consume_decimal_digits(bytes, start + 1); + index = consume_exponent(bytes, index); + if matches!(bytes.get(index), Some(b'j' | b'J')) { + return Some(("imaginary", index + 1)); + } + return Some(("decimal", index)); + } + + if !bytes.get(start).is_some_and(|byte| byte.is_ascii_digit()) { + return None; + } + + if bytes.get(start) == Some(&b'0') { + match bytes.get(start + 1) { + Some(b'x' | b'X') => { + let end = consume_radix_digits(bytes, start + 2, |byte| byte.is_ascii_hexdigit()); + return Some(("hexadecimal", end)); + } + Some(b'o' | b'O') => { + let end = + consume_radix_digits(bytes, start + 2, |byte| matches!(byte, b'0'..=b'7')); + return Some(("octal", end)); + } + Some(b'b' | b'B') => { + let end = + consume_radix_digits(bytes, start + 2, |byte| matches!(byte, b'0' | b'1')); + return Some(("binary", end)); + } + _ => {} + } + } + + let mut index = consume_decimal_digits(bytes, start); + if bytes.get(index) == Some(&b'.') { + index = consume_decimal_digits(bytes, index + 1); + } + index = consume_exponent(bytes, index); + if matches!(bytes.get(index), Some(b'j' | b'J')) { + return Some(("imaginary", index + 1)); + } + Some(("decimal", index)) +} + +fn skip_quoted_string(bytes: &[u8], mut index: usize) -> usize { + let quote = bytes[index]; + let triple = bytes.get(index + 1) == Some(&quote) && bytes.get(index + 2) == Some(&quote); + let quote_len = if triple { 3 } else { 1 }; + index += quote_len; + while index < bytes.len() { + if bytes[index] == b'\\' { + index = (index + 2).min(bytes.len()); + } else if triple + && bytes.get(index) == Some(&quote) + && bytes.get(index + 1) == Some(&quote) + && bytes.get(index + 2) == Some(&quote) + { + return index + 3; + } else if !triple && bytes[index] == quote { + return index + 1; + } else { + index += 1; + } + } + index +} + +fn invalid_number_literal_error(source: &str) -> Option<(String, usize)> { + let bytes = source.as_bytes(); + let mut index = 0; + while index < bytes.len() { + match bytes[index] { + b'#' => { + while index < bytes.len() && bytes[index] != b'\n' { + index += 1; + } + } + b'\'' | b'"' => { + index = skip_quoted_string(bytes, index); + } + byte if byte >= 0x80 || byte == b'_' || byte.is_ascii_alphabetic() => { + index += 1; + while index < bytes.len() + && (bytes[index] >= 0x80 || is_ascii_identifier_char(bytes[index])) + { + index += 1; + } + } + b'.' | b'0'..=b'9' => { + if let Some(err) = invalid_numeric_literal_error(bytes, index) { + return Some(err); + } + let Some((kind, end)) = number_literal_end(bytes, index) else { + index += 1; + continue; + }; + if end > index { + if source[end..].starts_with('⁄') { + return Some(("invalid character '⁄' (U+2044)".to_owned(), end)); + } + if bytes + .get(end) + .is_some_and(|byte| *byte < 128 && is_ascii_identifier_char(*byte)) + && !numeric_keyword_suffix(&bytes[end..]) + { + return Some((format!("invalid {kind} literal"), end.saturating_sub(1))); + } + } + index = end.max(index + 1); + } + _ => index += 1, + } + } + None +} + +fn cpython_indented_block_clause(message: &str) -> Option<&'static str> { + let clause = message.strip_prefix("Expected an indented block after ")?; + Some(match clause { + "`if` statement" => "'if' statement", + "`elif` clause" => "'elif' statement", + "`else` clause" => "'else' statement", + "`for` statement" => "'for' statement", + "`with` statement" => "'with' statement", + "`while` statement" => "'while' statement", + "`try` statement" => "'try' statement", + "`except` clause" => "'except' statement", + "`finally` clause" => "'finally' statement", + "`match` statement" => "'match' statement", + "`case` block" => "'case' statement", + "`class` definition" => "class definition", + "function definition" => "function definition", + _ => return None, + }) +} + +fn previous_non_empty_line_number(source: &str, offset: usize) -> Option<usize> { + let bytes = source.as_bytes(); + let mut index = offset.min(bytes.len()); + while index > 0 { + let line_end = index; + while index > 0 && bytes[index - 1] != b'\n' { + index -= 1; + } + let line_start = index; + let content_start = skip_horizontal_whitespace(bytes, line_start); + let mut content_end = line_end; + while content_end > content_start + && matches!( + bytes.get(content_end - 1), + Some(b' ' | b'\t' | b'\r' | b'\x0c') + ) + { + content_end -= 1; + } + if content_start < content_end { + return Some( + source[..line_start] + .bytes() + .filter(|byte| *byte == b'\n') + .count() + + 1, + ); + } + index = line_start.saturating_sub(1); + } + None +} + +fn expected_indented_block_error( + error: &parser::ParseError, + source: &str, +) -> Option<(String, usize, usize)> { + let parser::ParseErrorType::OtherError(message) = &error.error else { + return None; + }; + let mut clause = cpython_indented_block_clause(message)?; + let start = error.location.start().to_usize(); + let end = error.location.end().to_usize(); + let line = previous_non_empty_line_number(source, start)?; + if clause == "'except' statement" + && let Some(previous_line) = previous_non_empty_line(source, start) + && matches!( + previous_line.trim_start(), + line if line.starts_with("except*") || line.starts_with("except *") + ) + { + clause = "'except*' statement"; + } + Some(( + format!("expected an indented block after {clause} on line {line}"), + start, + end, + )) +} + +fn previous_non_empty_line(source: &str, offset: usize) -> Option<&str> { + let bytes = source.as_bytes(); + let mut index = offset.min(bytes.len()); + while index > 0 { + let line_end = index; + while index > 0 && bytes[index - 1] != b'\n' { + index -= 1; + } + let line_start = index; + let mut content_start = line_start; + while content_start < line_end + && matches!(bytes[content_start], b' ' | b'\t' | b'\n' | b'\r' | b'\x0c') + { + content_start += 1; + } + let mut content_end = line_end; + while content_end > content_start + && matches!(bytes[content_end - 1], b' ' | b'\t' | b'\r' | b'\x0c') + { + content_end -= 1; + } + if content_start < content_end { + return source.get(line_start..line_end); + } + index = line_start.saturating_sub(1); + } + None +} + +fn starts_identifier(bytes: &[u8], index: usize, word: &[u8]) -> bool { + bytes.get(index..index + word.len()) == Some(word) + && index + .checked_sub(1) + .and_then(|before| bytes.get(before)) + .is_none_or(|byte| !is_ascii_identifier_char(*byte)) + && bytes + .get(index + word.len()) + .is_none_or(|byte| !is_ascii_identifier_char(*byte)) +} + +fn is_plain_assignment_operator(bytes: &[u8], index: usize) -> bool { + bytes.get(index) == Some(&b'=') + && bytes.get(index + 1) != Some(&b'=') + && !matches!( + index.checked_sub(1).and_then(|before| bytes.get(before)), + Some(b'=' | b'!' | b'<' | b'>' | b':') + ) +} + +fn is_simple_keyword_name(bytes: &[u8], mut start: usize, mut end: usize) -> bool { + while matches!( + bytes.get(start), + Some(b' ' | b'\t' | b'\n' | b'\r' | b'\x0c') + ) { + start += 1; + } + while end > start + && matches!( + bytes.get(end - 1), + Some(b' ' | b'\t' | b'\n' | b'\r' | b'\x0c') + ) + { + end -= 1; + } + let Some(&first) = bytes.get(start) else { + return false; + }; + if !(first == b'_' || first.is_ascii_alphabetic() || first >= 0x80) { + return false; + } + let mut index = start + 1; + while index < end { + if bytes[index] < 0x80 && !is_ascii_identifier_char(bytes[index]) { + return false; + } + index += 1; + } + true +} + +fn is_function_parameter_list(bytes: &[u8], paren: usize) -> bool { + let mut cursor = paren; + while cursor > 0 && matches!(bytes.get(cursor - 1), Some(b' ' | b'\t' | b'\x0c')) { + cursor -= 1; + } + if cursor > 0 && bytes.get(cursor - 1) == Some(&b']') { + let mut bracket = cursor; + let mut level = 0usize; + while bracket > 0 { + bracket -= 1; + match bytes[bracket] { + b']' => level += 1, + b'[' => { + level = level.saturating_sub(1); + if level == 0 { + cursor = bracket; + break; + } + } + _ => {} + } + } + while cursor > 0 && matches!(bytes.get(cursor - 1), Some(b' ' | b'\t' | b'\x0c')) { + cursor -= 1; + } + } + while cursor > 0 + && bytes + .get(cursor - 1) + .is_some_and(|byte| *byte >= 0x80 || is_ascii_identifier_char(*byte)) + { + cursor -= 1; + } + while cursor > 0 && matches!(bytes.get(cursor - 1), Some(b' ' | b'\t' | b'\x0c')) { + cursor -= 1; + } + cursor >= 3 + && starts_identifier(bytes, cursor - 3, b"def") + && cursor + .checked_sub(4) + .and_then(|before| bytes.get(before)) + .is_none_or(|byte| !is_ascii_identifier_char(*byte)) +} + +#[derive(Clone, Copy)] +enum ParameterListKind { + Function, + Lambda, +} + +fn matching_delimiter(bytes: &[u8], open: usize, close: u8) -> Option<usize> { + let mut index = open; + let mut level = 0usize; + while index < bytes.len() { + match bytes[index] { + b'\'' | b'"' => index = skip_quoted_string(bytes, index), + b'(' | b'[' | b'{' => { + level += 1; + index += 1; + } + byte if byte == close => { + level = level.saturating_sub(1); + if level == 0 { + return Some(index); + } + index += 1; + } + b')' | b']' | b'}' => { + level = level.saturating_sub(1); + index += 1; + } + _ => index += 1, + } + } + None +} + +fn find_lambda_parameter_end(bytes: &[u8], mut index: usize) -> Option<usize> { + let mut level = 0usize; + while index < bytes.len() { + match bytes[index] { + b'#' if level == 0 => return None, + b'\'' | b'"' => index = skip_quoted_string(bytes, index), + b'(' | b'[' | b'{' => { + level += 1; + index += 1; + } + b')' | b']' | b'}' => { + level = level.saturating_sub(1); + index += 1; + } + b':' if level == 0 => return Some(index), + _ => index += 1, + } + } + None +} + +fn top_level_byte(bytes: &[u8], mut index: usize, end: usize, needle: u8) -> Option<usize> { + let mut level = 0usize; + while index < end { + match bytes[index] { + b'\'' | b'"' => index = skip_quoted_string(bytes, index), + byte if level == 0 && byte == needle => return Some(index), + b'(' | b'[' | b'{' => { + level += 1; + index += 1; + } + b')' | b']' | b'}' => { + level = level.saturating_sub(1); + index += 1; + } + _ => index += 1, + } + } + None +} + +fn identifier_end(bytes: &[u8], mut index: usize, end: usize) -> usize { + if !bytes + .get(index) + .is_some_and(|byte| *byte >= 0x80 || *byte == b'_' || byte.is_ascii_alphabetic()) + { + return index; + } + index += 1; + while index < end + && bytes + .get(index) + .is_some_and(|byte| *byte >= 0x80 || is_ascii_identifier_char(*byte)) + { + index += 1; + } + index +} + +fn expression_slice_is_tuple(source: &str, start: usize, end: usize) -> bool { + let bytes = source.as_bytes(); + let (start, end) = trim_target_range(bytes, start, end); + if start >= end { + return false; + } + let Ok(parsed) = parser::parse(&source[start..end], parser::Mode::Expression.into()) else { + return false; + }; + matches!(parsed.into_syntax(), ast::Mod::Expression(expression) if matches!(*expression.body, ast::Expr::Tuple(_))) +} + +fn type_param_list_open(bytes: &[u8], open: usize) -> bool { + let mut cursor = open; + while cursor > 0 && matches!(bytes.get(cursor - 1), Some(b' ' | b'\t' | b'\x0c')) { + cursor -= 1; + } + while cursor > 0 + && bytes + .get(cursor - 1) + .is_some_and(|byte| *byte >= 0x80 || is_ascii_identifier_char(*byte)) + { + cursor -= 1; + } + while cursor > 0 && matches!(bytes.get(cursor - 1), Some(b' ' | b'\t' | b'\x0c')) { + cursor -= 1; + } + (cursor >= 3 && starts_identifier(bytes, cursor - 3, b"def")) + || (cursor >= 5 && starts_identifier(bytes, cursor - 5, b"class")) + || (cursor >= 4 && starts_identifier(bytes, cursor - 4, b"type")) +} + +fn invalid_type_param_item_error( + source: &str, + start: usize, + end: usize, +) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let (start, end) = trim_target_range(bytes, start, end); + if start >= end || bytes.get(start) != Some(&b'*') { + return None; + } + let is_param_spec = bytes.get(start + 1) == Some(&b'*'); + let name_start = start + if is_param_spec { 2 } else { 1 }; + let name_end = identifier_end(bytes, name_start, end); + if name_start == name_end { + return None; + } + let colon = next_non_horizontal_whitespace(bytes, name_end); + if colon >= end || bytes.get(colon) != Some(&b':') { + return None; + } + let has_constraints = expression_slice_is_tuple(source, colon + 1, end); + let message = match (is_param_spec, has_constraints) { + (false, false) => "cannot use bound with TypeVarTuple", + (false, true) => "cannot use constraints with TypeVarTuple", + (true, false) => "cannot use bound with ParamSpec", + (true, true) => "cannot use constraints with ParamSpec", + }; + Some((message.to_owned(), colon, colon + 1)) +} + +fn invalid_type_param_list_error( + source: &str, + open: usize, + close: usize, +) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let mut item_start = open + 1; + let mut index = item_start; + let mut level = 0usize; + while index <= close { + if index == close || (level == 0 && bytes.get(index) == Some(&b',')) { + if let Some(error) = invalid_type_param_item_error(source, item_start, index) { + return Some(error); + } + item_start = index + 1; + index += 1; + continue; + } + match bytes[index] { + b'\'' | b'"' => index = skip_quoted_string(bytes, index), + b'(' | b'[' | b'{' => { + level += 1; + index += 1; + } + b')' | b']' | b'}' => { + level = level.saturating_sub(1); + index += 1; + } + _ => index += 1, + } + } + None +} + +fn invalid_type_param_error(source: &str) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let mut index = 0usize; + while index < bytes.len() { + match bytes[index] { + b'#' => { + while index < bytes.len() && bytes[index] != b'\n' { + index += 1; + } + } + b'\'' | b'"' => index = skip_quoted_string(bytes, index), + b'[' if type_param_list_open(bytes, index) => { + let Some(close) = matching_delimiter(bytes, index, b']') else { + index += 1; + continue; + }; + if let Some(error) = invalid_type_param_list_error(source, index, close) { + return Some(error); + } + index = close + 1; + } + _ => index += 1, + } + } + None +} + +fn invalid_comprehension_in_slice( + bytes: &[u8], + open: usize, + close: usize, +) -> Option<(String, usize, usize)> { + let for_index = find_keyword_at_level(bytes, open + 1, close, b"for")?; + let item_start = next_non_horizontal_whitespace(bytes, open + 1); + if item_start >= for_index { + return None; + } + if bytes.get(item_start..item_start + 2) == Some(b"**") && bytes.get(open) == Some(&b'{') { + return Some(( + "dict unpacking cannot be used in dict comprehension".to_owned(), + item_start, + item_start + 2, + )); + } + if bytes.get(item_start..item_start + 2) == Some(b"**") && bytes.get(open) == Some(&b'(') { + return Some(("invalid syntax".to_owned(), for_index, for_index + 3)); + } + if bytes.get(item_start) == Some(&b'*') { + return Some(( + "iterable unpacking cannot be used in comprehension".to_owned(), + item_start, + item_start + 1, + )); + } + if !matches!(bytes.get(open), Some(b'[' | b'{')) { + return None; + } + if top_level_colon(bytes, open + 1, for_index).is_none() + && let Some(comma) = top_level_byte(bytes, open + 1, for_index, b',') + { + let (start, _) = trim_target_range(bytes, open + 1, comma); + return Some(( + "did you forget parentheses around the comprehension target?".to_owned(), + start, + comma + 1, + )); + } + None +} + +fn invalid_comprehension_error(source: &str) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let mut index = 0usize; + while index < bytes.len() { + match bytes[index] { + b'#' => { + while index < bytes.len() && bytes[index] != b'\n' { + index += 1; + } + } + b'\'' | b'"' => index = skip_quoted_string(bytes, index), + b'(' | b'[' | b'{' => { + let close_byte = match bytes[index] { + b'(' => b')', + b'[' => b']', + _ => b'}', + }; + let Some(close) = matching_delimiter(bytes, index, close_byte) else { + index += 1; + continue; + }; + if let Some(error) = invalid_comprehension_in_slice(bytes, index, close) { + return Some(error); + } + index = close + 1; + } + _ => index += 1, + } + } + None +} + +fn invalid_group_in_slice( + bytes: &[u8], + open: usize, + close: usize, +) -> Option<(String, usize, usize)> { + let (item_start, item_end) = trim_target_range(bytes, open + 1, close); + if item_start >= item_end + || top_level_byte(bytes, item_start, item_end, b',').is_some() + || top_level_colon(bytes, item_start, item_end).is_some() + || find_keyword_at_level(bytes, item_start, item_end, b"for").is_some() + { + return None; + } + if bytes.get(item_start..item_start + 2) == Some(b"**") { + return Some(( + "cannot use double starred expression here".to_owned(), + item_start, + item_start + 2, + )); + } + if bytes.get(item_start) == Some(&b'*') { + return Some(( + "cannot use starred expression here".to_owned(), + item_start, + item_start + 1, + )); + } + None +} + +fn invalid_group_error(source: &str) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let mut index = 0usize; + while index < bytes.len() { + match bytes[index] { + b'#' => { + while index < bytes.len() && bytes[index] != b'\n' { + index += 1; + } + } + b'\'' | b'"' => index = skip_quoted_string(bytes, index), + b'(' => { + let Some(close) = matching_delimiter(bytes, index, b')') else { + index += 1; + continue; + }; + if let Some(error) = invalid_group_in_slice(bytes, index, close) { + return Some(error); + } + index = close + 1; + } + _ => index += 1, + } + } + None +} + +fn invalid_parameter_star_annotation_error(source: &str) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let mut index = 0usize; + while index < bytes.len() { + match bytes[index] { + b'#' => { + while index < bytes.len() && bytes[index] != b'\n' { + index += 1; + } + } + b'\'' | b'"' => index = skip_quoted_string(bytes, index), + b'(' => { + let Some(close) = matching_delimiter(bytes, index, b')') else { + index += 1; + continue; + }; + let mut param_start = index + 1; + while param_start < close { + let param_end = + find_byte_at_level(bytes, param_start, close, b',').unwrap_or(close); + if let Some(colon) = top_level_colon(bytes, param_start, param_end) { + let value_start = next_non_horizontal_whitespace(bytes, colon + 1); + if bytes.get(value_start) == Some(&b'*') { + return Some(( + "invalid syntax".to_owned(), + value_start, + value_start + 1, + )); + } + } + param_start = param_end.saturating_add(1); + } + index = close + 1; + } + _ => index += 1, + } + } + None +} + +fn invalid_def_type_params_error(source: &str) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let mut index = 0; + while index < bytes.len() { + match bytes[index] { + b'#' => { + while index < bytes.len() && bytes[index] != b'\n' { + index += 1; + } + } + b'\'' | b'"' => index = skip_quoted_string(bytes, index), + _ if starts_identifier(bytes, index, b"def") => { + let name_start = skip_horizontal_whitespace(bytes, index + 3); + let name_end = identifier_end(bytes, name_start, bytes.len()); + let bracket = skip_horizontal_whitespace(bytes, name_end); + if bytes.get(bracket) == Some(&b'[') { + let Some(close) = matching_delimiter(bytes, bracket, b']') else { + index = bracket + 1; + continue; + }; + let after_close = skip_horizontal_whitespace(bytes, close + 1); + if bytes.get(after_close) == Some(&b'(') + && type_param_list_is_malformed(bytes, bracket + 1, close) + { + return Some(("expected '('".to_owned(), bracket, bracket + 1)); + } + } + index = name_end.max(index + 3); + } + _ => index += 1, + } + } + None +} + +fn type_param_list_is_malformed(bytes: &[u8], start: usize, end: usize) -> bool { + let mut index = start; + let mut expect_item = true; + while index < end { + index = skip_horizontal_whitespace(bytes, index); + if index >= end { + break; + } + if bytes[index] == b',' { + if expect_item { + return true; + } + expect_item = true; + index += 1; + continue; + } + if !expect_item { + return true; + } + if bytes.get(index..index + 2) == Some(b"**") { + index += 2; + } else if bytes.get(index) == Some(&b'*') { + index += 1; + } + let item_start = skip_horizontal_whitespace(bytes, index); + let item_end = identifier_end(bytes, item_start, end); + if item_end == item_start { + return true; + } + index = item_end; + if bytes.get(skip_horizontal_whitespace(bytes, index)) == Some(&b':') { + index = skip_horizontal_whitespace(bytes, index) + 1; + while index < end && bytes[index] != b',' { + index = match bytes[index] { + b'\'' | b'"' => skip_quoted_string(bytes, index), + _ => index + 1, + }; + } + } + expect_item = false; + } + false +} + +fn invalid_parameter_list_slice_error( + source: &str, + start: usize, + end: usize, + kind: ParameterListKind, +) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let mut index = start; + let mut level = 0usize; + let mut default_seen = false; + let mut keyword_only = false; + let mut slash_seen = false; + let mut var_keyword_seen = false; + while index < end { + match bytes[index] { + b'\'' | b'"' => index = skip_quoted_string(bytes, index), + _ if level == 0 + && var_keyword_seen + && bytes.get(index).is_some_and(|byte| { + *byte >= 0x80 || *byte == b'_' || byte.is_ascii_alphabetic() + }) => + { + let name_end = identifier_end(bytes, index, end); + return Some(( + "arguments cannot follow var-keyword argument".to_owned(), + index, + name_end, + )); + } + _ if level == 0 + && !keyword_only + && bytes.get(index).is_some_and(|byte| { + *byte >= 0x80 || *byte == b'_' || byte.is_ascii_alphabetic() + }) => + { + let param_end = find_byte_at_level(bytes, index, end, b',') + .or_else(|| top_level_byte(bytes, index, end, b')')) + .or_else(|| { + matches!(kind, ParameterListKind::Lambda) + .then(|| top_level_byte(bytes, index, end, b':')) + .flatten() + }) + .unwrap_or(end); + let name_end = identifier_end(bytes, index, param_end); + if top_level_byte(bytes, index, param_end, b'=').is_some() { + default_seen = true; + } else if default_seen { + return Some(( + "parameter without a default follows parameter with a default".to_owned(), + index, + name_end, + )); + } + index = name_end; + } + b'(' if level == 0 => { + let close = matching_delimiter(bytes, index, b')') + .filter(|close| *close <= end) + .unwrap_or(index + 1); + let message = match kind { + ParameterListKind::Function => "Function parameters cannot be parenthesized", + ParameterListKind::Lambda => { + "Lambda expression parameters cannot be parenthesized" + } + }; + return Some((message.to_owned(), index, close + 1)); + } + b'(' | b'[' | b'{' => { + level += 1; + index += 1; + } + b')' | b']' | b'}' => { + level = level.saturating_sub(1); + index += 1; + } + b'/' if level == 0 => { + if var_keyword_seen { + return Some(( + "arguments cannot follow var-keyword argument".to_owned(), + index, + index + 1, + )); + } + if slash_seen { + return Some(("/ may appear only once".to_owned(), index, index + 1)); + } + slash_seen = true; + let next = next_non_horizontal_whitespace(bytes, index + 1); + if bytes.get(next) == Some(&b'*') { + return Some(("expected comma between / and *".to_owned(), next, next + 1)); + } + index += 1; + } + b'*' if level == 0 => { + if var_keyword_seen { + return Some(( + "arguments cannot follow var-keyword argument".to_owned(), + index, + index + 1, + )); + } + keyword_only = true; + let stars = usize::from(bytes.get(index + 1) == Some(&b'*')) + 1; + let name_start = next_non_horizontal_whitespace(bytes, index + stars); + for keyword in [b"True".as_slice(), b"False".as_slice(), b"None".as_slice()] { + if starts_identifier(bytes, name_start, keyword) { + return Some(( + "invalid syntax".to_owned(), + name_start, + name_start + keyword.len(), + )); + } + } + let param_end = find_byte_at_level(bytes, name_start, end, b',') + .or_else(|| top_level_byte(bytes, name_start, end, b')')) + .or_else(|| { + matches!(kind, ParameterListKind::Lambda) + .then(|| top_level_byte(bytes, name_start, end, b':')) + .flatten() + }) + .unwrap_or(end); + if stars == 1 && matches!(bytes.get(name_start), Some(b')' | b',' | b':')) { + return Some(( + "named arguments must follow bare *".to_owned(), + index, + index + 1, + )); + } + if stars == 1 && top_level_byte(bytes, name_start, param_end, b'=').is_some() { + return Some(( + "var-positional argument cannot have default value".to_owned(), + index, + index + 1, + )); + } + if stars == 2 && top_level_byte(bytes, name_start, param_end, b'=').is_some() { + return Some(( + "var-keyword argument cannot have default value".to_owned(), + index, + index + 2, + )); + } + if stars == 2 { + var_keyword_seen = true; + index = param_end; + continue; + } + index += stars; + } + b'=' if level == 0 => { + let value_start = next_non_horizontal_whitespace(bytes, index + 1); + if value_start >= end || matches!(bytes.get(value_start), Some(b',' | b')' | b':')) + { + if matches!(kind, ParameterListKind::Lambda) + && matches!(bytes.get(value_start), Some(b':')) + { + return Some(("invalid syntax".to_owned(), index, index + 1)); + } + return Some(( + "expected default value expression".to_owned(), + index, + index + 1, + )); + } + index += 1; + } + _ => index += 1, + } + } + None +} + +fn invalid_parameter_list_error(source: &str) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let mut index = 0usize; + while index < bytes.len() { + match bytes[index] { + b'#' => { + while index < bytes.len() && bytes[index] != b'\n' { + index += 1; + } + } + b'\'' | b'"' => index = skip_quoted_string(bytes, index), + _ if starts_identifier(bytes, index, b"def") => { + let Some(paren) = top_level_byte(bytes, index + 3, bytes.len(), b'(') else { + index += 3; + continue; + }; + let Some(close) = matching_delimiter(bytes, paren, b')') else { + index = paren + 1; + continue; + }; + if let Some(error) = invalid_parameter_list_slice_error( + source, + paren + 1, + close, + ParameterListKind::Function, + ) { + return Some(error); + } + index = close + 1; + } + _ if starts_identifier(bytes, index, b"lambda") => { + let params_start = index + 6; + let Some(params_end) = find_lambda_parameter_end(bytes, params_start) else { + index = params_start; + continue; + }; + if let Some(error) = invalid_parameter_list_slice_error( + source, + params_start, + params_end, + ParameterListKind::Lambda, + ) { + return Some(error); + } + index = params_end + 1; + } + _ => index += 1, + } + } + None +} + +#[derive(Clone, Copy)] +struct CallArgFrame { + level: usize, + arg_start: Option<usize>, + in_call: bool, +} + +fn next_non_horizontal_whitespace(bytes: &[u8], mut index: usize) -> usize { + while matches!(bytes.get(index), Some(b' ' | b'\t' | b'\x0c')) { + index += 1; + } + index +} + +fn invalid_call_argument_assignment_error( + source: &str, + arg_start: usize, + equal: usize, +) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let start = bytes[arg_start..equal] + .iter() + .rposition(|byte| *byte == b'\n') + .map_or(arg_start, |newline| arg_start + newline + 1); + let (target_start, target_end) = trim_target_range(bytes, start, equal); + if target_start >= target_end { + return None; + } + let value_start = next_non_horizontal_whitespace(bytes, equal + 1); + if matches!(bytes.get(value_start), None | Some(b',' | b')')) { + return Some(( + "expected argument value expression".to_owned(), + target_start, + equal + 1, + )); + } + if bytes.get(target_start..target_start + 2) == Some(b"**") { + return Some(( + "cannot assign to keyword argument unpacking".to_owned(), + target_start, + value_start, + )); + } + if bytes.get(target_start) == Some(&b'*') { + return Some(( + "cannot assign to iterable argument unpacking".to_owned(), + target_start, + value_start, + )); + } + for keyword in [b"True".as_slice(), b"False".as_slice(), b"None".as_slice()] { + if bytes.get(target_start..target_end) == Some(keyword) { + let keyword = ::core::str::from_utf8(keyword).ok()?; + return Some(( + format!("cannot assign to {keyword}"), + target_start, + target_end, + )); + } + } + if is_simple_keyword_name(bytes, target_start, target_end) { + return None; + } + Some(( + "expression cannot contain assignment, perhaps you meant \"==\"?".to_owned(), + target_start, + equal, + )) +} + +fn invalid_call_star_expression_error( + bytes: &[u8], + arg_start: usize, + index: usize, +) -> Option<(String, usize, usize)> { + let start = next_non_horizontal_whitespace(bytes, arg_start); + if start != index || bytes.get(index) != Some(&b'*') { + return None; + } + let after_star = next_non_horizontal_whitespace(bytes, index + 1); + if matches!(bytes.get(after_star), None | Some(b',' | b')' | b':')) { + return Some(( + "Invalid star expression".to_owned(), + index, + (index + 1).min(bytes.len()), + )); + } + None +} + +fn invalid_call_argument_error(source: &str) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let mut index = 0usize; + let mut level = 0usize; + let mut frames: Vec<CallArgFrame> = Vec::new(); + while index < bytes.len() { + match bytes[index] { + b'#' => { + while index < bytes.len() && bytes[index] != b'\n' { + index += 1; + } + } + b'\'' | b'"' => index = skip_quoted_string(bytes, index), + _ if starts_identifier(bytes, index, b"lambda") => { + let params_start = index + 6; + if let Some(params_end) = find_lambda_parameter_end(bytes, params_start) { + index = params_end + 1; + } else { + index = params_start; + } + } + b'(' => { + level += 1; + let in_call = opening_paren_is_call(bytes, index) + || frames.last().is_some_and(|frame| frame.in_call); + frames.push(CallArgFrame { + level, + arg_start: (in_call && !is_function_parameter_list(bytes, index)) + .then_some(index + 1), + in_call, + }); + index += 1; + } + b')' => { + if matches!(frames.last(), Some(frame) if frame.level == level) { + frames.pop(); + } + level = level.saturating_sub(1); + index += 1; + } + b'[' | b'{' => { + level += 1; + index += 1; + } + b']' | b'}' => { + level = level.saturating_sub(1); + index += 1; + } + b',' => { + if let Some(frame) = frames.last_mut() + && frame.level == level + && frame.arg_start.is_some() + { + frame.arg_start = Some(index + 1); + } + index += 1; + } + b'*' => { + if let Some(CallArgFrame { + level: frame_level, + arg_start: Some(arg_start), + in_call: true, + }) = frames.last().copied() + && frame_level == level + && let Some(error) = invalid_call_star_expression_error(bytes, arg_start, index) + { + return Some(error); + } + index += 1; + } + b'=' if is_plain_assignment_operator(bytes, index) => { + if let Some(CallArgFrame { + level: frame_level, + arg_start: Some(arg_start), + in_call: true, + }) = frames.last().copied() + && frame_level == level + && let Some(error) = + invalid_call_argument_assignment_error(source, arg_start, index) + { + return Some(error); + } + index += 1; + } + _ => index += 1, + } + } + None +} + +fn top_level_colon(bytes: &[u8], mut index: usize, end: usize) -> Option<usize> { + let mut level = 0usize; + while index < end { + match bytes[index] { + b'\'' | b'"' => index = skip_quoted_string(bytes, index), + b'(' | b'[' | b'{' => { + level += 1; + index += 1; + } + b')' | b']' | b'}' => { + level = level.saturating_sub(1); + index += 1; + } + b':' if level == 0 => return Some(index), + _ => index += 1, + } + } + None +} + +fn expression_slice_is_valid(source: &str, start: usize, end: usize) -> bool { + let bytes = source.as_bytes(); + let (start, end) = trim_target_range(bytes, start, end); + start < end + && parser::parse(&source[start..end], parser::Mode::Expression.into()) + .is_ok_and(|parsed| matches!(parsed.into_syntax(), ast::Mod::Expression(_))) +} + +fn invalid_dict_entry_error( + source: &str, + item_start: usize, + item_end: usize, + colon: Option<usize>, + saw_dict_item: bool, +) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let (item_start, item_end) = trim_target_range(bytes, item_start, item_end); + if item_start >= item_end { + return None; + } + if let Some(colon) = colon { + let value_start = next_non_horizontal_whitespace(bytes, colon + 1); + if value_start >= item_end { + return Some(( + "expression expected after dictionary key and ':'".to_owned(), + colon, + colon + 1, + )); + } + if bytes.get(value_start) == Some(&b'*') { + return Some(( + "cannot use a starred expression in a dictionary value".to_owned(), + value_start, + value_start + 1, + )); + } + if !expression_slice_is_valid(source, value_start, item_end) { + return Some(("invalid syntax".to_owned(), value_start, value_start)); + } + } else if saw_dict_item { + return Some(( + "':' expected after dictionary key".to_owned(), + item_end.saturating_sub(1), + item_end, + )); + } + None +} + +fn invalid_dict_literal_error( + source: &str, + open: usize, + close: usize, +) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let mut item_start = open + 1; + let mut index = item_start; + let mut level = 0usize; + let mut saw_dict_item = false; + let mut item_colon = None; + while index <= close { + if index == close || (level == 0 && bytes.get(index) == Some(&b',')) { + if let Some(error) = + invalid_dict_entry_error(source, item_start, index, item_colon, saw_dict_item) + { + return Some(error); + } + saw_dict_item |= item_colon.is_some(); + item_start = index + 1; + item_colon = None; + index += 1; + continue; + } + match bytes[index] { + b'\'' | b'"' => index = skip_quoted_string(bytes, index), + b'(' | b'[' | b'{' => { + level += 1; + index += 1; + } + b')' | b']' | b'}' => { + level = level.saturating_sub(1); + index += 1; + } + b':' if level == 0 && item_colon.is_none() => { + item_colon = Some(index); + saw_dict_item = true; + index += 1; + } + _ => index += 1, + } + } + None +} + +fn invalid_dict_error(source: &str) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let mut index = 0usize; + while index < bytes.len() { + match bytes[index] { + b'#' => { + while index < bytes.len() && bytes[index] != b'\n' { + index += 1; + } + } + b'\'' | b'"' => index = skip_quoted_string(bytes, index), + b'{' => { + let Some(close) = matching_delimiter(bytes, index, b'}') else { + index += 1; + continue; + }; + if top_level_colon(bytes, index + 1, close).is_some() + && let Some(error) = invalid_dict_literal_error(source, index, close) + { + return Some(error); + } + index = close + 1; + } + _ => index += 1, + } + } + None +} + +fn collection_open_is_call(bytes: &[u8], open: usize) -> bool { + if bytes.get(open) != Some(&b'(') { + return false; + } + let mut cursor = open; + while cursor > 0 && matches!(bytes.get(cursor - 1), Some(b' ' | b'\t' | b'\x0c')) { + cursor -= 1; + } + matches!( + cursor.checked_sub(1).and_then(|before| bytes.get(before)), + Some(b')' | b']' | b'_' | b'a'..=b'z' | b'A'..=b'Z' | 0x80..=0xff) + ) +} + +fn invalid_collection_assignment_in_slice( + source: &str, + bytes: &[u8], + start: usize, + end: usize, +) -> Option<(String, usize, usize)> { + let mut item_start = start; + let mut index = start; + let mut level = 0usize; + while index < end { + match bytes[index] { + b'\'' | b'"' => index = skip_quoted_string(bytes, index), + b'(' | b'[' | b'{' => { + level += 1; + index += 1; + } + b')' | b']' | b'}' => { + level = level.saturating_sub(1); + index += 1; + } + b',' if level == 0 => { + item_start = index + 1; + index += 1; + } + b'=' if level == 0 && is_plain_assignment_operator(bytes, index) => { + if top_level_colon(bytes, item_start, index).is_none() { + let start = next_non_horizontal_whitespace(bytes, item_start); + let target_end = trim_end_horizontal_whitespace(bytes, start, index); + if start < target_end + && let Some((expr_name, expr_start, expr_end, _)) = + expression_name_and_range(&source[start..target_end]) + { + if matches!(expr_name, "list" | "tuple") { + return None; + } + if matches!(expr_name, "expression" | "attribute" | "subscript") { + return Some(( + format!( + "cannot assign to {expr_name} here. Maybe you meant '==' instead of '='?" + ), + start + expr_start, + start + expr_end, + )); + } + } + return Some(( + "invalid syntax. Maybe you meant '==' or ':=' instead of '='?".to_owned(), + start, + index + 1, + )); + } + index += 1; + } + _ => index += 1, + } + } + None +} + +fn invalid_collection_assignment_error(source: &str) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let mut index = 0usize; + while index < bytes.len() { + match bytes[index] { + b'#' => { + while index < bytes.len() && bytes[index] != b'\n' { + index += 1; + } + } + b'\'' | b'"' => index = skip_quoted_string(bytes, index), + b'(' | b'[' | b'{' => { + let close_byte = match bytes[index] { + b'(' => b')', + b'[' => b']', + _ => b'}', + }; + let Some(close) = matching_delimiter(bytes, index, close_byte) else { + index += 1; + continue; + }; + if !collection_open_is_call(bytes, index) + && let Some(error) = + invalid_collection_assignment_in_slice(source, bytes, index + 1, close) + { + return Some(error); + } + index = close + 1; + } + _ => index += 1, + } + } + None +} + +fn expression_assignment_error(source: &str) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let mut index = 0; + let mut paren_arg_starts: Vec<(Option<usize>, bool)> = Vec::new(); + while index < bytes.len() { + match bytes[index] { + b'#' => { + while index < bytes.len() && bytes[index] != b'\n' { + index += 1; + } + } + b'\'' | b'"' => { + index = skip_quoted_string(bytes, index); + } + _ if starts_identifier(bytes, index, b"lambda") => { + let params_start = index + 6; + if let Some(params_end) = find_lambda_parameter_end(bytes, params_start) { + index = params_end + 1; + } else { + index = params_start; + } + } + b'(' => { + let in_call_context = opening_paren_is_call(bytes, index) + || paren_arg_starts.last().is_some_and(|(_, in_call)| *in_call); + paren_arg_starts.push(( + (!is_function_parameter_list(bytes, index)).then_some(index + 1), + in_call_context, + )); + index += 1; + } + b')' => { + paren_arg_starts.pop(); + index += 1; + } + b',' => { + if let Some((start, _)) = paren_arg_starts.last_mut() + && start.is_some() + { + *start = Some(index + 1); + } + index += 1; + } + b'=' if is_plain_assignment_operator(bytes, index) => { + if let Some((Some(start), true)) = paren_arg_starts.last().copied() + && !is_simple_keyword_name(bytes, start, index) + { + let mut expr_start = start; + while matches!(bytes.get(expr_start), Some(b' ' | b'\t' | b'\x0c')) { + expr_start += 1; + } + return Some(( + "expression cannot contain assignment, perhaps you meant \"==\"?" + .to_owned(), + expr_start, + index, + )); + } + index += 1; + } + _ => index += 1, + } + } + None +} + +fn invalid_named_expression_error(source: &str) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let mut index = 0; + while index + 1 < bytes.len() { + match bytes[index] { + b'#' => { + while index < bytes.len() && bytes[index] != b'\n' { + index += 1; + } + } + b'\'' | b'"' => index = skip_quoted_string(bytes, index), + b':' if bytes.get(index + 1) == Some(&b'=') => { + let target_start = named_expression_target_start(bytes, index); + let target_end = trim_end_horizontal_whitespace(bytes, target_start, index); + if target_start < target_end + && let Some((expr_name, start, end, is_name)) = + expression_name_and_range(&source[target_start..target_end]) + && !is_name + { + return Some(( + format!("cannot use assignment expressions with {expr_name}"), + target_start + start, + target_start + end, + )); + } + index += 2; + } + _ => index += 1, + } + } + None +} + +#[derive(Clone, Copy)] +struct AssignmentContext { + start: usize, + call: bool, +} + +fn invalid_plain_assignment_error(source: &str) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let mut stack: Vec<AssignmentContext> = Vec::new(); + let mut index = 0; + while index < bytes.len() { + match bytes[index] { + b'#' => { + while index < bytes.len() && bytes[index] != b'\n' { + index += 1; + } + } + b'\'' | b'"' => index = skip_quoted_string(bytes, index), + b'(' | b'[' | b'{' => { + stack.push(AssignmentContext { + start: index + 1, + call: bytes[index] == b'(' && opening_paren_is_call(bytes, index), + }); + index += 1; + } + b')' | b']' | b'}' => { + stack.pop(); + index += 1; + } + b',' => { + if let Some(context) = stack.last_mut() + && !context.call + { + context.start = index + 1; + } + index += 1; + } + b'=' if is_plain_assignment_operator(bytes, index) => { + if let Some(context) = stack.last().copied() + && !context.call + { + let target_start = skip_horizontal_whitespace(bytes, context.start); + let target_end = trim_end_horizontal_whitespace(bytes, target_start, index); + if target_start < target_end + && let Some((expr_name, start, end, _)) = + expression_name_and_range(&source[target_start..target_end]) + && matches!(expr_name, "expression" | "attribute" | "subscript") + { + return Some(( + format!( + "cannot assign to {expr_name} here. Maybe you meant '==' instead of '='?" + ), + target_start + start, + target_start + end, + )); + } + } + index += 1; + } + _ => index += 1, + } + } + None +} + +fn opening_paren_is_call(bytes: &[u8], paren: usize) -> bool { + let mut cursor = paren; + while cursor > 0 && matches!(bytes[cursor - 1], b' ' | b'\t' | b'\x0c') { + cursor -= 1; + } + cursor > 0 + && (bytes[cursor - 1] >= 0x80 + || is_ascii_identifier_char(bytes[cursor - 1]) + || matches!(bytes[cursor - 1], b')' | b']')) +} + +fn named_expression_target_start(bytes: &[u8], walrus: usize) -> usize { + let mut index = walrus; + let mut level = 0usize; + while index > 0 { + index -= 1; + match bytes[index] { + b')' | b']' | b'}' => level += 1, + b'(' | b'[' | b'{' if level > 0 => level -= 1, + b'(' | b'[' | b'{' if level == 0 => return index + 1, + b',' | b'\n' | b';' if level == 0 => return index + 1, + _ => {} + } + } + 0 +} + +fn trim_end_horizontal_whitespace(bytes: &[u8], start: usize, mut end: usize) -> usize { + while end > start && matches!(bytes[end - 1], b' ' | b'\t' | b'\x0c') { + end -= 1; + } + end +} + +fn annotation_target_error_for_slice( + source: &str, + start: usize, + colon: usize, +) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let (target_start, target_end) = trim_target_range(bytes, start, colon); + if target_start >= target_end { + return None; + } + let target_text = &source[target_start..target_end]; + let Ok(parsed) = parser::parse(target_text, parser::Mode::Expression.into()) else { + return None; + }; + let ast::Mod::Expression(expression) = parsed.into_syntax() else { + return None; + }; + match expression.body.as_ref() { + ast::Expr::Name(_) | ast::Expr::Attribute(_) | ast::Expr::Subscript(_) => None, + ast::Expr::List(_) => Some(( + "only single target (not list) can be annotated".to_owned(), + target_start, + target_end, + )), + ast::Expr::Tuple(_) => Some(( + "only single target (not tuple) can be annotated".to_owned(), + target_start, + target_end, + )), + _ => Some(( + "illegal target for annotation".to_owned(), + target_start, + target_end, + )), + } +} + +fn invalid_annotation_line_start(bytes: &[u8], line_start: usize) -> bool { + let column = skip_horizontal_whitespace(bytes, line_start); + for keyword in [ + b"async".as_slice(), + b"case", + b"class", + b"def", + b"elif", + b"else", + b"except", + b"finally", + b"for", + b"if", + b"match", + b"try", + b"while", + b"with", + ] { + if starts_identifier(bytes, column, keyword) { + return false; + } + } + true +} + +fn invalid_annotation_target_error(source: &str) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let mut line_start = 0usize; + for line in source.split_inclusive('\n') { + let line_end = line_start + line.len(); + if invalid_annotation_line_start(bytes, line_start) + && let Some(colon) = find_byte_at_level(bytes, line_start, line_end, b':') + && bytes.get(colon + 1) != Some(&b'=') + && colon.checked_sub(1).and_then(|before| bytes.get(before)) != Some(&b':') + && let Some(error) = annotation_target_error_for_slice(source, line_start, colon) + { + return Some(error); + } + line_start = line_end; + } + None +} + +fn statement_target_end(bytes: &[u8], mut index: usize) -> usize { + let mut level = 0usize; + while index < bytes.len() { + match bytes[index] { + b'#' if level == 0 => return index, + b'\n' | b';' if level == 0 => return index, + b'\'' | b'"' => { + index = skip_quoted_string(bytes, index); + } + b'(' | b'[' | b'{' => { + level += 1; + index += 1; + } + b')' | b']' | b'}' => { + level = level.saturating_sub(1); + index += 1; + } + _ => index += 1, + } + } + index +} + +fn invalid_assignment_target(expression: &ast::Expr) -> Option<&ast::Expr> { + match expression { + ast::Expr::List(ast::ExprList { elts, .. }) + | ast::Expr::Tuple(ast::ExprTuple { elts, .. }) => { + elts.iter().find_map(invalid_assignment_target) + } + ast::Expr::Starred(ast::ExprStarred { value, .. }) => invalid_assignment_target(value), + ast::Expr::Name(_) | ast::Expr::Subscript(_) | ast::Expr::Attribute(_) => None, + _ => Some(expression), + } +} + +fn invalid_for_target(expression: &ast::Expr) -> Option<&ast::Expr> { + match expression { + ast::Expr::List(ast::ExprList { elts, .. }) + | ast::Expr::Tuple(ast::ExprTuple { elts, .. }) => elts.iter().find_map(invalid_for_target), + ast::Expr::Starred(ast::ExprStarred { value, .. }) => invalid_for_target(value), + ast::Expr::Compare(ast::ExprCompare { left, ops, .. }) => { + if matches!(ops.first(), Some(ast::CmpOp::In)) { + invalid_for_target(left) + } else { + None + } + } + ast::Expr::Name(_) | ast::Expr::Subscript(_) | ast::Expr::Attribute(_) => None, + _ => Some(expression), + } +} + +fn invalid_delete_target(expression: &ast::Expr) -> Option<&ast::Expr> { + match expression { + ast::Expr::List(ast::ExprList { elts, .. }) + | ast::Expr::Tuple(ast::ExprTuple { elts, .. }) => { + elts.iter().find_map(invalid_delete_target) + } + ast::Expr::Name(_) | ast::Expr::Subscript(_) | ast::Expr::Attribute(_) => None, + ast::Expr::Starred(_) => Some(expression), + ast::Expr::Compare(_) => Some(expression), + _ => Some(expression), + } +} + +fn delete_target_expr_name(expression: &ast::Expr) -> &'static str { + match expression { + ast::Expr::Attribute(_) => "attribute", + ast::Expr::Subscript(_) => "subscript", + ast::Expr::Starred(_) => "starred", + ast::Expr::Name(_) => "name", + ast::Expr::List(_) => "list", + ast::Expr::Tuple(_) => "tuple", + ast::Expr::Lambda(_) => "lambda", + ast::Expr::Call(_) => "function call", + ast::Expr::BoolOp(_) | ast::Expr::BinOp(_) | ast::Expr::UnaryOp(_) => "expression", + ast::Expr::Generator(_) => "generator expression", + ast::Expr::Yield(_) | ast::Expr::YieldFrom(_) => "yield expression", + ast::Expr::Await(_) => "await expression", + ast::Expr::ListComp(_) => "list comprehension", + ast::Expr::SetComp(_) => "set comprehension", + ast::Expr::DictComp(_) => "dict comprehension", + ast::Expr::Dict(_) => "dict literal", + ast::Expr::Set(_) => "set display", + ast::Expr::FString(_) => "f-string expression", + ast::Expr::TString(_) => "t-string expression", + ast::Expr::NumberLiteral(_) | ast::Expr::StringLiteral(_) | ast::Expr::BytesLiteral(_) => { + "literal" + } + ast::Expr::Constant(expr) => match &expr.value { + ast::ConstantValue::None => "None", + ast::ConstantValue::Boolean(true) => "True", + ast::ConstantValue::Boolean(false) => "False", + ast::ConstantValue::Ellipsis => "ellipsis", + ast::ConstantValue::Tuple(_) => "tuple", + ast::ConstantValue::Frozenset(_) => "literal", + ast::ConstantValue::Str(_) + | ast::ConstantValue::Bytes(_) + | ast::ConstantValue::Integer(_) + | ast::ConstantValue::Float(_) + | ast::ConstantValue::Complex { .. } => "literal", + }, + ast::Expr::BooleanLiteral(boolean) => { + if boolean.value { + "True" + } else { + "False" + } + } + ast::Expr::NoneLiteral(_) => "None", + ast::Expr::EllipsisLiteral(_) => "ellipsis", + ast::Expr::Compare(_) => "comparison", + ast::Expr::If(_) => "conditional expression", + ast::Expr::Named(_) => "named expression", + ast::Expr::Slice(_) | ast::Expr::IpyEscapeCommand(_) => "expression", + } +} + +fn parenthesized_single_starred_delete_target(bytes: &[u8], start: usize, end: usize) -> bool { + let mut cursor = start; + while matches!(bytes.get(cursor), Some(b' ' | b'\t' | b'\x0c')) { + cursor += 1; + } + if bytes.get(cursor) != Some(&b'(') { + return false; + } + cursor += 1; + while matches!(bytes.get(cursor), Some(b' ' | b'\t' | b'\x0c')) { + cursor += 1; + } + if bytes.get(cursor) != Some(&b'*') { + return false; + } + let mut level = 1usize; + cursor += 1; + while cursor < end { + match bytes[cursor] { + b'\'' | b'"' => { + cursor = skip_quoted_string(bytes, cursor); + } + b'(' | b'[' | b'{' => { + level += 1; + cursor += 1; + } + b')' => { + level = level.saturating_sub(1); + if level == 0 { + cursor += 1; + while matches!(bytes.get(cursor), Some(b' ' | b'\t' | b'\x0c')) { + cursor += 1; + } + return cursor == end; + } + cursor += 1; + } + b',' if level == 1 => return false, + b']' | b'}' => { + level = level.saturating_sub(1); + cursor += 1; + } + _ => cursor += 1, + } + } + false +} + +fn trim_target_range(bytes: &[u8], mut start: usize, mut end: usize) -> (usize, usize) { + while start < end + && matches!( + bytes.get(start), + Some(b' ' | b'\t' | b'\n' | b'\r' | b'\x0c') + ) + { + start += 1; + } + while end > start + && matches!( + bytes.get(end - 1), + Some(b' ' | b'\t' | b'\n' | b'\r' | b'\x0c') + ) + { + end -= 1; + } + (start, end) +} + +fn invalid_assignment_message(name: &'static str, top_level_bitwise: bool) -> String { + if top_level_bitwise { + format!("cannot assign to {name} here. Maybe you meant '==' instead of '='?") + } else { + format!("cannot assign to {name}") + } +} + +fn assignment_target_error_for_slice( + source: &str, + start: usize, + end: usize, +) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let (target_start, target_end) = trim_target_range(bytes, start, end); + if target_start >= target_end { + return None; + } + if starts_identifier(bytes, target_start, b"yield") { + return Some(( + "assignment to yield expression not possible".to_owned(), + target_start, + target_start + 5, + )); + } + let target_text = &source[target_start..target_end]; + let Ok(parsed) = parser::parse(target_text, parser::Mode::Expression.into()) else { + return None; + }; + let ast::Mod::Expression(expression) = parsed.into_syntax() else { + return None; + }; + let invalid_target = invalid_assignment_target(&expression.body)?; + let invalid_start = target_start + invalid_target.range().start().to_usize(); + let invalid_end = target_start + invalid_target.range().end().to_usize(); + if matches!(invalid_target, ast::Expr::FString(_)) { + return Some(("invalid syntax".to_owned(), invalid_start, invalid_end)); + } + let name = delete_target_expr_name(invalid_target); + let top_level = invalid_target.range() == expression.body.range(); + let bitwise_like = matches!( + invalid_target, + ast::Expr::Call(_) + | ast::Expr::BoolOp(_) + | ast::Expr::BinOp(_) + | ast::Expr::UnaryOp(_) + | ast::Expr::NumberLiteral(_) + | ast::Expr::StringLiteral(_) + | ast::Expr::BytesLiteral(_) + | ast::Expr::EllipsisLiteral(_) + ); + Some(( + invalid_assignment_message(name, top_level && bitwise_like), + invalid_start, + invalid_end, + )) +} + +fn star_target_error_for_slice( + source: &str, + start: usize, + end: usize, +) -> Option<(String, usize, usize)> { + invalid_target_error_for_slice(source, start, end, invalid_assignment_target) +} + +fn for_target_error_for_slice( + source: &str, + start: usize, + end: usize, +) -> Option<(String, usize, usize)> { + invalid_target_error_for_slice(source, start, end, invalid_for_target) +} + +fn invalid_target_error_for_slice( + source: &str, + start: usize, + end: usize, + invalid_target: for<'a> fn(&'a ast::Expr) -> Option<&'a ast::Expr>, +) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let (target_start, target_end) = trim_target_range(bytes, start, end); + if target_start >= target_end { + return None; + } + let target_text = &source[target_start..target_end]; + let Ok(parsed) = parser::parse(target_text, parser::Mode::Expression.into()) else { + return None; + }; + let ast::Mod::Expression(expression) = parsed.into_syntax() else { + return None; + }; + let invalid_target = invalid_target(&expression.body)?; + let name = delete_target_expr_name(invalid_target); + let invalid_start = target_start + invalid_target.range().start().to_usize(); + let invalid_end = target_start + invalid_target.range().end().to_usize(); + Some(( + format!("cannot assign to {name}"), + invalid_start, + invalid_end, + )) +} + +fn first_compare_operator_at_level(bytes: &[u8], mut index: usize, end: usize) -> Option<usize> { + let mut level = 0usize; + while index < end { + match bytes[index] { + b'\'' | b'"' => index = skip_quoted_string(bytes, index), + b'(' | b'[' | b'{' => { + level += 1; + index += 1; + } + b')' | b']' | b'}' => { + level = level.saturating_sub(1); + index += 1; + } + b'<' | b'>' if level == 0 => return Some(index), + b'=' if level == 0 && bytes.get(index + 1) == Some(&b'=') => return Some(index), + b'!' if level == 0 && bytes.get(index + 1) == Some(&b'=') => return Some(index), + _ if level == 0 && starts_identifier(bytes, index, b"is") => return Some(index), + _ if level == 0 && starts_identifier(bytes, index, b"not") => return Some(index), + _ => index += 1, + } + } + None +} + +fn non_in_compare_for_target_error( + source: &str, + start: usize, + end: usize, +) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let (target_start, target_end) = trim_target_range(bytes, start, end); + if target_start >= target_end { + return None; + } + let target_text = &source[target_start..target_end]; + let Ok(parsed) = parser::parse(target_text, parser::Mode::Expression.into()) else { + return None; + }; + let ast::Mod::Expression(expression) = parsed.into_syntax() else { + return None; + }; + let ast::Expr::Compare(ast::ExprCompare { ops, .. }) = expression.body.as_ref() else { + return None; + }; + if matches!(ops.first(), Some(ast::CmpOp::In)) { + return None; + } + let operator = first_compare_operator_at_level(bytes, target_start, target_end)?; + Some(( + "invalid syntax".to_owned(), + operator, + (operator + 1).min(target_end), + )) +} + +fn top_level_plain_assignment_offsets(bytes: &[u8]) -> Vec<usize> { + let mut offsets = Vec::new(); + let mut index = 0usize; + let mut level = 0usize; + while index < bytes.len() { + match bytes[index] { + b'#' if level == 0 => { + while index < bytes.len() && bytes[index] != b'\n' { + index += 1; + } + } + b'\'' | b'"' => index = skip_quoted_string(bytes, index), + b'(' | b'[' | b'{' => { + level += 1; + index += 1; + } + b')' | b']' | b'}' => { + level = level.saturating_sub(1); + index += 1; + } + b'=' if level == 0 && is_plain_assignment_operator(bytes, index) => { + offsets.push(index); + index += 1; + } + _ => index += 1, + } + } + offsets +} + +fn invalid_assignment_target_error(source: &str) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let offsets = top_level_plain_assignment_offsets(bytes); + if offsets.is_empty() { + return None; + } + let mut start = 0usize; + for offset in offsets { + if let Some(error) = assignment_target_error_for_slice(source, start, offset) { + return Some(error); + } + start = offset + 1; + } + None +} + +fn top_level_augassign_offset(bytes: &[u8]) -> Option<(usize, usize)> { + let mut index = 0usize; + let mut level = 0usize; + while index < bytes.len() { + match bytes[index] { + b'#' if level == 0 => { + while index < bytes.len() && bytes[index] != b'\n' { + index += 1; + } + } + b'\'' | b'"' => index = skip_quoted_string(bytes, index), + b'(' | b'[' | b'{' => { + level += 1; + index += 1; + } + b')' | b']' | b'}' => { + level = level.saturating_sub(1); + index += 1; + } + b'+' | b'-' | b'*' | b'@' | b'/' | b'%' | b'&' | b'|' | b'^' + if level == 0 && bytes.get(index + 1) == Some(&b'=') => + { + return Some((index, 2)); + } + b'<' | b'>' + if level == 0 + && bytes.get(index + 1) == Some(&bytes[index]) + && bytes.get(index + 2) == Some(&b'=') => + { + return Some((index, 3)); + } + b'*' if level == 0 + && bytes.get(index + 1) == Some(&b'*') + && bytes.get(index + 2) == Some(&b'=') => + { + return Some((index, 3)); + } + b'/' if level == 0 + && bytes.get(index + 1) == Some(&b'/') + && bytes.get(index + 2) == Some(&b'=') => + { + return Some((index, 3)); + } + _ => index += 1, + } + } + None +} + +fn invalid_augassign_target_error(source: &str) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let (operator, _) = top_level_augassign_offset(bytes)?; + let (target_start, target_end) = trim_target_range(bytes, 0, operator); + if target_start >= target_end { + return None; + } + let target_text = &source[target_start..target_end]; + let Ok(parsed) = parser::parse(target_text, parser::Mode::Expression.into()) else { + return None; + }; + let ast::Mod::Expression(expression) = parsed.into_syntax() else { + return None; + }; + let name = delete_target_expr_name(&expression.body); + Some(( + format!("'{name}' is an illegal expression for augmented assignment"), + target_start, + target_end, + )) +} + +fn find_for_target_delimiter(bytes: &[u8], mut index: usize, end: usize) -> Option<usize> { + let mut level = 0usize; + while index < end { + match bytes[index] { + b'#' if level == 0 => return None, + b'\'' | b'"' => index = skip_quoted_string(bytes, index), + b'(' | b'[' | b'{' => { + level += 1; + index += 1; + } + b')' | b']' | b'}' => { + level = level.saturating_sub(1); + index += 1; + } + _ if level == 0 && starts_identifier(bytes, index, b"in") => return Some(index), + b':' if level == 0 => return Some(index), + _ => index += 1, + } + } + None +} + +fn invalid_for_target_error(source: &str) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let mut index = 0usize; + while index < bytes.len() { + match bytes[index] { + b'#' => { + while index < bytes.len() && bytes[index] != b'\n' { + index += 1; + } + } + b'\'' | b'"' => index = skip_quoted_string(bytes, index), + _ if starts_identifier(bytes, index, b"for") => { + let target_start = skip_horizontal_whitespace(bytes, index + 3); + let line_end = source[index..] + .find('\n') + .map_or(bytes.len(), |newline| index + newline); + if let Some(target_end) = find_for_target_delimiter(bytes, target_start, line_end) { + if let Some(error) = + for_target_error_for_slice(source, target_start, target_end) + { + return Some(error); + } + if let Some(error) = + non_in_compare_for_target_error(source, target_start, target_end) + { + return Some(error); + } + } + index = target_start.max(index + 3); + } + _ => index += 1, + } + } + None +} + +fn find_with_target_delimiter(bytes: &[u8], mut index: usize, end: usize) -> Option<usize> { + let mut level = 0usize; + while index < end { + match bytes[index] { + b'#' if level == 0 => return None, + b'\'' | b'"' => index = skip_quoted_string(bytes, index), + b'(' | b'[' | b'{' => { + level += 1; + index += 1; + } + b')' if level == 0 => return Some(index), + b')' | b']' | b'}' => { + level = level.saturating_sub(1); + index += 1; + } + b',' | b':' if level == 0 => return Some(index), + _ => index += 1, + } + } + None +} + +fn invalid_with_target_error(source: &str) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let mut line_start = 0usize; + for line in source.split_inclusive('\n') { + let line_end = line_start + line.len(); + let mut column = skip_horizontal_whitespace(bytes, line_start); + if starts_identifier(bytes, column, b"async") { + column = skip_horizontal_whitespace(bytes, column + 5); + } + if !starts_identifier(bytes, column, b"with") { + line_start = line_end; + continue; + } + let mut index = column + 4; + while let Some(as_index) = find_keyword_at_level(bytes, index, line_end, b"as") { + let target_start = skip_horizontal_whitespace(bytes, as_index + 2); + if let Some(target_end) = find_with_target_delimiter(bytes, target_start, line_end) { + if let Some(error) = star_target_error_for_slice(source, target_start, target_end) { + return Some(error); + } + index = target_end.saturating_add(1); + } else { + break; + } + } + line_start = line_end; + } + None +} + +fn find_missing_in_if_keyword(bytes: &[u8], mut index: usize, end: usize) -> Option<usize> { + let mut level = 0usize; + while index < end { + match bytes[index] { + b'#' if level == 0 => return None, + b'\'' | b'"' => index = skip_quoted_string(bytes, index), + b'(' | b'[' | b'{' => { + level += 1; + index += 1; + } + b')' | b']' | b'}' if level == 0 => return None, + b')' | b']' | b'}' => { + level = level.saturating_sub(1); + index += 1; + } + _ if level == 0 && starts_identifier(bytes, index, b"in") => return None, + _ if level == 0 && starts_identifier(bytes, index, b"if") => return Some(index), + _ => index += 1, + } + } + None +} + +fn invalid_for_if_clause_error(source: &str) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let mut index = 0usize; + let mut level = 0usize; + while index < bytes.len() { + match bytes[index] { + b'#' if level == 0 => { + while index < bytes.len() && bytes[index] != b'\n' { + index += 1; + } + } + b'\'' | b'"' => index = skip_quoted_string(bytes, index), + b'(' | b'[' | b'{' => { + level += 1; + index += 1; + } + b')' | b']' | b'}' => { + level = level.saturating_sub(1); + index += 1; + } + _ if level > 0 && starts_identifier(bytes, index, b"for") => { + let target_start = skip_horizontal_whitespace(bytes, index + 3); + let line_end = source[index..] + .find('\n') + .map_or(bytes.len(), |newline| index + newline); + if let Some(if_index) = find_missing_in_if_keyword(bytes, target_start, line_end) { + return Some(( + "'in' expected after for-loop variables".to_owned(), + if_index, + (if_index + 2).min(line_end), + )); + } + index = target_start.max(index + 3); + } + _ => index += 1, + } + } + None +} + +fn invalid_delete_target_error(source: &str) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let mut index = 0; + while index < bytes.len() { + match bytes[index] { + b'#' => { + while index < bytes.len() && bytes[index] != b'\n' { + index += 1; + } + } + b'\'' | b'"' => { + index = skip_quoted_string(bytes, index); + } + b'd' if starts_identifier(bytes, index, b"del") => { + let mut target_start = index + 3; + if !matches!(bytes.get(target_start), Some(b' ' | b'\t' | b'\x0c')) { + index += 3; + continue; + } + while matches!(bytes.get(target_start), Some(b' ' | b'\t' | b'\x0c')) { + target_start += 1; + } + let mut target_end = statement_target_end(bytes, target_start); + while target_end > target_start + && matches!(bytes.get(target_end - 1), Some(b' ' | b'\t' | b'\x0c')) + { + target_end -= 1; + } + if target_start >= target_end { + index = target_end.max(index + 3); + continue; + } + if parenthesized_single_starred_delete_target(bytes, target_start, target_end) { + return Some(( + "cannot use starred expression here".to_owned(), + target_start, + target_end, + )); + } + if bytes.get(target_start) == Some(&b'*') { + return Some(( + "cannot delete starred".to_owned(), + target_start, + (target_start + 1).min(target_end), + )); + } + let target_text = &source[target_start..target_end]; + let Ok(parsed) = parser::parse(target_text, parser::Mode::Expression.into()) else { + index = target_end; + continue; + }; + let ast::Mod::Expression(expression) = parsed.into_syntax() else { + index = target_end; + continue; + }; + let Some(invalid_target) = invalid_delete_target(&expression.body) else { + index = target_end; + continue; + }; + let start = target_start + invalid_target.range().start().to_usize(); + let end = target_start + invalid_target.range().end().to_usize(); + if matches!(invalid_target, ast::Expr::FString(_)) { + return Some(("invalid syntax".to_owned(), start, end)); + } + let name = delete_target_expr_name(invalid_target); + return Some((format!("cannot delete {name}"), start, end)); + } + _ => index += 1, + } + } + None +} + +fn skip_horizontal_whitespace(bytes: &[u8], mut index: usize) -> usize { + while matches!(bytes.get(index), Some(b' ' | b'\t' | b'\x0c')) { + index += 1; + } + index +} + +fn find_keyword_at_level( + bytes: &[u8], + mut index: usize, + end: usize, + keyword: &[u8], +) -> Option<usize> { + let mut level = 0usize; + while index < end { + match bytes[index] { + b'#' if level == 0 => return None, + b'\'' | b'"' => { + index = skip_quoted_string(bytes, index); + } + b'(' | b'[' | b'{' => { + level += 1; + index += 1; + } + b')' | b']' | b'}' => { + level = level.saturating_sub(1); + index += 1; + } + _ if level == 0 && starts_identifier(bytes, index, keyword) => return Some(index), + _ => index += 1, + } + } + None +} + +fn find_byte_at_level(bytes: &[u8], mut index: usize, end: usize, needle: u8) -> Option<usize> { + let mut level = 0usize; + while index < end { + match bytes[index] { + b'#' if level == 0 => return None, + b'\'' | b'"' => { + index = skip_quoted_string(bytes, index); + } + b'(' | b'[' | b'{' => { + level += 1; + index += 1; + } + b')' | b']' | b'}' => { + level = level.saturating_sub(1); + index += 1; + } + byte if level == 0 && byte == needle => return Some(index), + _ => index += 1, + } + } + None +} + +fn expression_name_and_range(source: &str) -> Option<(&'static str, usize, usize, bool)> { + let parsed = parser::parse(source, parser::Mode::Expression.into()).ok()?; + let ast::Mod::Expression(expression) = parsed.into_syntax() else { + return None; + }; + let is_name = matches!(expression.body.as_ref(), ast::Expr::Name(_)); + Some(( + delete_target_expr_name(&expression.body), + expression.body.range().start().to_usize(), + expression.body.range().end().to_usize(), + is_name, + )) +} + +fn invalid_standalone_except_error(source: &str) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let mut line_start = 0usize; + let mut seen_try = false; + for line in source.split_inclusive('\n') { + let line_end = line_start + line.len(); + let column = skip_horizontal_whitespace(bytes, line_start); + if column >= line_end { + line_start = line_end; + continue; + } + if starts_identifier(bytes, column, b"try") { + seen_try = true; + } else if (bytes.get(column..column + 7) == Some(b"except*") + || starts_identifier(bytes, column, b"except")) + && !seen_try + { + let end = if bytes.get(column..column + 7) == Some(b"except*") { + column + 7 + } else { + column + 6 + }; + return Some(("invalid syntax".to_owned(), column, end)); + } + line_start = line_end; + } + None +} + +fn invalid_import_statement_error(source: &str) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let mut line_start = 0usize; + for line in source.split_inclusive('\n') { + let line_end = line_start + line.len(); + let column = skip_horizontal_whitespace(bytes, line_start); + if column < line_end + && starts_identifier(bytes, column, b"import") + && find_keyword_at_level(bytes, column + 6, line_end, b"from").is_some() + { + return Some(( + "Did you mean to use 'from ... import ...' instead?".to_owned(), + column, + column + 6, + )); + } + line_start = line_end; + } + None +} + +fn import_as_target_end(bytes: &[u8], mut index: usize) -> usize { + let mut level = 0usize; + while index < bytes.len() { + match bytes[index] { + b'#' if level == 0 => return index, + b'\'' | b'"' => index = skip_quoted_string(bytes, index), + b'(' | b'[' | b'{' => { + level += 1; + index += 1; + } + b')' if level == 0 => return index, + b')' | b']' | b'}' => { + level = level.saturating_sub(1); + index += 1; + } + b',' | b';' | b'\n' if level == 0 => return index, + _ => index += 1, + } + } + index +} + +fn valid_import_alias_name(bytes: &[u8], mut start: usize, end: usize) -> bool { + start = skip_horizontal_whitespace(bytes, start); + let Some(&first) = bytes.get(start) else { + return false; + }; + if !(first == b'_' || first.is_ascii_alphabetic() || first >= 0x80) { + return false; + } + let mut index = start + 1; + while index < end { + match bytes[index] { + b' ' | b'\t' | b'\x0c' => break, + byte if byte >= 0x80 || is_ascii_identifier_char(byte) => index += 1, + _ => return false, + } + } + let index = skip_horizontal_whitespace(bytes, index); + matches!( + bytes.get(index), + None | Some(b',' | b')' | b';' | b'\n' | b'\r') + ) +} + +fn import_target_error_for_slice( + source: &str, + start: usize, + end: usize, +) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let (target_start, target_end) = trim_target_range(bytes, start, end); + if target_start >= target_end || valid_import_alias_name(bytes, target_start, target_end) { + return None; + } + let parsed = parser::parse( + &source[target_start..target_end], + parser::Mode::Expression.into(), + ) + .ok()?; + let ast::Mod::Expression(expression) = parsed.into_syntax() else { + return None; + }; + let name = delete_target_expr_name(&expression.body); + let start = target_start + expression.body.range().start().to_usize(); + let end = target_start + expression.body.range().end().to_usize(); + Some((format!("cannot use {name} as import target"), start, end)) +} + +fn statement_starts_import(bytes: &[u8], line_start: usize, line_end: usize) -> bool { + let column = skip_horizontal_whitespace(bytes, line_start); + if starts_identifier(bytes, column, b"import") { + return true; + } + starts_identifier(bytes, column, b"from") + && find_keyword_at_level(bytes, column + 4, line_end, b"import").is_some() +} + +fn invalid_import_target_error(source: &str) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let mut line_start = 0usize; + let mut in_parenthesized_from_import = false; + for line in source.split_inclusive('\n') { + let line_end = line_start + line.len(); + let starts_import = statement_starts_import(bytes, line_start, line_end); + if starts_import && bytes[line_start..line_end].contains(&b'(') { + in_parenthesized_from_import = true; + } + if starts_import || in_parenthesized_from_import { + let mut index = line_start; + while index < line_end { + if starts_identifier(bytes, index, b"as") { + let target_start = skip_horizontal_whitespace(bytes, index + 2); + let target_end = import_as_target_end(bytes, target_start); + if let Some(error) = + import_target_error_for_slice(source, target_start, target_end) + { + return Some(error); + } + index = target_end.max(index + 2); + } else { + index += 1; + } + } + } + if in_parenthesized_from_import && bytes[line_start..line_end].contains(&b')') { + in_parenthesized_from_import = false; + } + line_start = line_end; + } + None +} + +fn invalid_except_as_target_error(source: &str) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let mut line_start = 0usize; + let mut seen_try = false; + for line in source.split_inclusive('\n') { + let line_end = line_start + line.len(); + let mut column = skip_horizontal_whitespace(bytes, line_start); + if column >= line_end { + line_start = line_end; + continue; + } + if starts_identifier(bytes, column, b"try") { + seen_try = true; + line_start = line_end; + continue; + } + let (keyword_len, starred) = if bytes.get(column..column + 7) == Some(b"except*") { + (7, true) + } else if starts_identifier(bytes, column, b"except") { + (6, false) + } else { + line_start = line_end; + continue; + }; + if !seen_try { + line_start = line_end; + continue; + } + column += keyword_len; + let Some(as_index) = find_keyword_at_level(bytes, column, line_end, b"as") else { + line_start = line_end; + continue; + }; + let target_start = skip_horizontal_whitespace(bytes, as_index + 2); + let Some(delimiter) = find_byte_at_level(bytes, target_start, line_end, b':') + .into_iter() + .chain(find_byte_at_level(bytes, target_start, line_end, b',')) + .min() + else { + line_start = line_end; + continue; + }; + let mut target_end = delimiter; + while target_end > target_start + && matches!(bytes.get(target_end - 1), Some(b' ' | b'\t' | b'\x0c')) + { + target_end -= 1; + } + let Some((expr_name, start, end, is_name)) = + expression_name_and_range(&source[target_start..target_end]) + else { + line_start = line_end; + continue; + }; + if !is_name { + let statement = if starred { "except*" } else { "except" }; + return Some(( + format!("cannot use {statement} statement with {expr_name}"), + target_start + start, + target_start + end, + )); + } + line_start = line_end; + } + None +} + +fn invalid_match_as_target_error(source: &str) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let quoted_ranges = quoted_string_ranges(bytes); + let mut quoted_range = 0usize; + let mut line_start = 0usize; + for line in source.split_inclusive('\n') { + let line_end = line_start + line.len(); + let mut column = skip_horizontal_whitespace(bytes, line_start); + if column >= line_end + || offset_in_ranges(&quoted_ranges, &mut quoted_range, column) + || !starts_identifier(bytes, column, b"case") + { + line_start = line_end; + continue; + } + column += 4; + let Some(as_index) = find_keyword_at_level(bytes, column, line_end, b"as") else { + line_start = line_end; + continue; + }; + let target_start = skip_horizontal_whitespace(bytes, as_index + 2); + let Some(delimiter) = find_byte_at_level(bytes, target_start, line_end, b':') + .into_iter() + .chain(find_byte_at_level(bytes, target_start, line_end, b',')) + .min() + else { + line_start = line_end; + continue; + }; + let mut target_end = delimiter; + while target_end > target_start + && matches!(bytes.get(target_end - 1), Some(b' ' | b'\t' | b'\x0c')) + { + target_end -= 1; + } + if source[target_start..target_end].trim() == "_" { + return Some(( + "cannot use '_' as a target".to_owned(), + target_start, + target_end, + )); + } + let Some((expr_name, start, end, is_name)) = + expression_name_and_range(&source[target_start..target_end]) + else { + line_start = line_end; + continue; + }; + if !is_name { + if matches!(expr_name, "expression" | "subscript") { + line_start = line_end; + continue; + } + return Some(( + format!("cannot use {expr_name} as pattern target"), + target_start + start, + target_start + end, + )); + } + line_start = line_end; + } + None +} + +fn quoted_string_ranges(bytes: &[u8]) -> Vec<(usize, usize)> { + let mut ranges = Vec::new(); + let mut index = 0usize; + while index < bytes.len() { + match bytes[index] { + b'#' => { + while index < bytes.len() && bytes[index] != b'\n' { + index += 1; + } + } + b'\'' | b'"' => { + let end = skip_quoted_string(bytes, index); + ranges.push((index, end)); + index = end; + } + _ => index += 1, + } + } + ranges +} + +fn offset_in_ranges(ranges: &[(usize, usize)], range_index: &mut usize, offset: usize) -> bool { + while ranges + .get(*range_index) + .is_some_and(|(_, end)| *end <= offset) + { + *range_index += 1; + } + ranges + .get(*range_index) + .is_some_and(|(start, end)| *start <= offset && offset < *end) +} + +fn invalid_match_mapping_rest_wildcard_error(source: &str) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let next_line_end = |line_start: usize| { + line_start + + bytes[line_start..] + .iter() + .position(|byte| *byte == b'\n') + .unwrap_or(bytes.len() - line_start) + }; + let mut index = 0usize; + let mut line_start = 0usize; + let mut line_end = next_line_end(line_start); + while index < bytes.len() { + match bytes[index] { + b'#' => { + while index < bytes.len() && bytes[index] != b'\n' { + index += 1; + } + } + b'\'' | b'"' => index = skip_quoted_string(bytes, index), + b'\n' => { + index += 1; + line_start = index; + line_end = next_line_end(line_start); + } + _ => { + let column = skip_horizontal_whitespace(bytes, line_start); + if index != column + || column >= line_end + || !starts_identifier(bytes, column, b"case") + { + index += 1; + continue; + } + let mut cursor = column + 4; + while cursor < line_end { + match bytes[cursor] { + b'#' => break, + b'\'' | b'"' => cursor = skip_quoted_string(bytes, cursor), + b'{' => { + let rest = next_non_horizontal_whitespace(bytes, cursor + 1); + if bytes.get(rest..rest + 2) == Some(b"**") { + let name_start = next_non_horizontal_whitespace(bytes, rest + 2); + let name_end = identifier_end(bytes, name_start, line_end); + if source.get(name_start..name_end) == Some("_") { + return Some(( + "invalid syntax".to_owned(), + name_start, + name_end, + )); + } + } + cursor += 1; + } + _ => cursor += 1, + } + } + index = line_end; + } + } + } + None +} + +fn invalid_if_expression_statement_error(source: &str) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let mut line_start = 0usize; + for line in source.split_inclusive('\n') { + let line_end = line_start + line.len(); + if let Some(if_index) = find_keyword_at_level(bytes, line_start, line_end, b"if") + && let Some((start, end)) = statement_before_if_expression(bytes, line_start, if_index) + && find_keyword_at_level(bytes, if_index + 2, line_end, b"else").is_some() + { + return Some(( + "expected expression before 'if', but statement is given".to_owned(), + start, + end, + )); + } + if let Some(else_index) = find_keyword_at_level(bytes, line_start, line_end, b"else") + && find_keyword_at_level(bytes, line_start, else_index, b"if").is_some() + && let Some((start, end)) = + statement_after_else_expression(bytes, else_index + 4, line_end) + { + return Some(( + "expected expression after 'else', but statement is given".to_owned(), + start, + end, + )); + } + line_start = line_end; + } + None +} + +fn statement_before_if_expression( + bytes: &[u8], + line_start: usize, + if_index: usize, +) -> Option<(usize, usize)> { + let mut start = if_index; + while start > line_start && matches!(bytes.get(start - 1), Some(b' ' | b'\t' | b'\x0c')) { + start -= 1; + } + while start > line_start + && !matches!( + bytes.get(start - 1), + Some(b'=' | b':' | b',' | b'(' | b'[' | b'{') + ) + { + start -= 1; + } + start = skip_horizontal_whitespace(bytes, start); + for keyword in [b"pass".as_slice(), b"break", b"continue"] { + if starts_identifier(bytes, start, keyword) { + return Some((start, start + keyword.len())); + } + } + None +} + +fn statement_after_else_expression( + bytes: &[u8], + else_end: usize, + line_end: usize, +) -> Option<(usize, usize)> { + let start = skip_horizontal_whitespace(bytes, else_end); + for keyword in [ + b"pass".as_slice(), + b"return", + b"raise", + b"del", + b"yield", + b"assert", + b"break", + b"continue", + b"import", + b"from", + ] { + if starts_identifier(bytes, start, keyword) { + let end = statement_target_end(bytes, start).min(line_end); + return Some((start, end.max(start + keyword.len()))); + } + } + None +} + +fn invalid_else_elif_error(source: &str) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let mut line_start = 0usize; + let mut else_indents: Vec<usize> = Vec::new(); + for line in source.split_inclusive('\n') { + let line_end = line_start + line.len(); + let column = skip_horizontal_whitespace(bytes, line_start); + let line_column = column.saturating_sub(line_start); + if column >= line_end { + line_start = line_end; + continue; + } + while else_indents + .last() + .is_some_and(|indent| line_column < *indent) + { + else_indents.pop(); + } + if starts_identifier(bytes, column, b"else") + && find_byte_at_level(bytes, column + 4, line_end, b':').is_some() + { + else_indents.push(line_column); + } else if starts_identifier(bytes, column, b"elif") && else_indents.contains(&line_column) { + return Some(( + "'elif' block follows an 'else' block".to_owned(), + column, + column + 4, + )); + } + line_start = line_end; + } + None +} + +fn mixed_except_handlers_error(source: &str) -> Option<(String, usize, usize)> { + let message = "cannot have both 'except' and 'except*' on the same 'try'".to_owned(); + let mut seen_except = false; + let mut seen_except_star = false; + let mut line_start = 0usize; + for line in source.split_inclusive('\n') { + let bytes = line.as_bytes(); + let mut column = 0usize; + while matches!(bytes.get(column), Some(b' ' | b'\t' | b'\x0c')) { + column += 1; + } + let token_start = line_start + column; + if bytes.get(column..column + 7) == Some(b"except*") { + if seen_except { + return Some((message, token_start, token_start + 7)); + } + seen_except_star = true; + } else if starts_identifier(bytes, column, b"except") { + if seen_except_star { + return Some((message, token_start, token_start + 6)); + } + seen_except = true; + } + line_start += line.len(); + } + None +} + +fn non_printable_character_error(source: &str) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let mut index = 0; + while index < bytes.len() { + match bytes[index] { + b'#' => { + while index < bytes.len() && bytes[index] != b'\n' { + index += 1; + } + } + b'\'' | b'"' => { + index = skip_quoted_string(bytes, index); + } + byte if byte.is_ascii_control() && !matches!(byte, b'\t' | b'\n' | b'\r' | b'\x0c') => { + return Some(( + format!("invalid non-printable character U+{byte:04X}"), + index, + index + 1, + )); + } + byte if byte >= 0x80 => { + let ch = source[index..].chars().next()?; + if ch.is_control() { + return Some(( + format!("invalid non-printable character U+{:04X}", ch as u32), + index, + index + ch.len_utf8(), + )); + } + index += ch.len_utf8(); + } + _ => index += 1, + } + } + None +} + +fn unterminated_string_error(source: &str) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let mut index = 0; + let mut line = 1usize; + while index < bytes.len() { + match bytes[index] { + b'#' => { + while index < bytes.len() && bytes[index] != b'\n' { + index += 1; + } + } + b'\n' => { + line += 1; + index += 1; + } + quote @ (b'\'' | b'"') => { + let start = index; + let start_line = line; + let quote_size = if bytes.get(index + 1) == Some(&quote) + && bytes.get(index + 2) == Some(&quote) + { + 3 + } else { + 1 + }; + index += quote_size; + let mut has_escaped_quote = false; + let mut closed = false; + while index < bytes.len() { + let c = bytes[index]; + if c == b'\n' { + if quote_size == 1 { + return Some(( + unterminated_string_message(line, false, has_escaped_quote), + start, + start + 1, + )); + } + line += 1; + index += 1; + } else if c == quote { + if quote_size == 3 { + if bytes.get(index + 1) == Some(&quote) + && bytes.get(index + 2) == Some(&quote) + { + index += 3; + closed = true; + break; + } + index += 1; + } else { + index += 1; + closed = true; + break; + } + } else if c == b'\\' { + if bytes.get(index + 1) == Some(&quote) { + has_escaped_quote = true; + } + index = (index + 2).min(bytes.len()); + } else { + index += 1; + } + } + if !closed { + let detected_line = if quote_size == 3 { line } else { start_line }; + return Some(( + unterminated_string_message( + detected_line, + quote_size == 3, + has_escaped_quote, + ), + start, + start + 1, + )); + } + } + _ => index += 1, + } + } + None +} + +fn invalid_interpolated_string_error(source: &str) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let mut index = 0; + while index < bytes.len() { + match bytes[index] { + b'#' => { + while index < bytes.len() && bytes[index] != b'\n' { + index += 1; + } + } + quote @ (b'\'' | b'"') => { + let Some(prefix) = interpolated_string_prefix(bytes, index) else { + index = skip_quoted_string(bytes, index); + continue; + }; + if let Some(error) = + single_quoted_format_spec_newline_error(bytes, index, quote, prefix) + { + return Some(error); + } + let Some((content_start, content_end)) = + quoted_string_content_range(bytes, index, quote) + else { + index = skip_quoted_string(bytes, index); + continue; + }; + if let Some(error) = + invalid_replacement_field_error(bytes, content_start, content_end, prefix) + { + return Some(error); + } + index = skip_quoted_string(bytes, index); + } + _ => index += 1, + } + } + None +} + +fn single_quoted_format_spec_newline_error( + bytes: &[u8], + quote_index: usize, + quote: u8, + prefix: &str, +) -> Option<(String, usize, usize)> { + if bytes.get(quote_index + 1) == Some(&quote) && bytes.get(quote_index + 2) == Some(&quote) { + return None; + } + + let (content_start, content_end) = quoted_string_content_range(bytes, quote_index, quote)?; + let mut index = content_start; + while index < content_end { + match bytes[index] { + b'{' if bytes.get(index + 1) == Some(&b'{') => index += 2, + b'}' if bytes.get(index + 1) == Some(&b'}') => index += 2, + b'{' => { + let expr_start = skip_ascii_whitespace(bytes, index + 1, content_end); + if let Some(separator) = replacement_field_separator(bytes, expr_start, content_end) + && bytes[separator] == b':' + { + let format_end = + replacement_field_closing_brace(bytes, separator + 1, content_end) + .unwrap_or(content_end); + if bytes[separator + 1..format_end].contains(&b'\n') { + return Some(( + format!( + "{prefix}: newlines are not allowed in format specifiers for single quoted {prefix}s" + ), + quote_index, + quote_index + 1, + )); + } + } + index += 1; + } + _ => index += 1, + } + } + None +} + +fn interpolated_string_prefix(bytes: &[u8], quote: usize) -> Option<&'static str> { + let prev = quote.checked_sub(1).and_then(|index| bytes.get(index))?; + let lower_prev = prev.to_ascii_lowercase(); + let (prefix_start, marker) = if matches!(lower_prev, b'f' | b't') { + if quote >= 2 && bytes[quote - 2].eq_ignore_ascii_case(&b'r') { + (quote - 2, lower_prev) + } else { + (quote - 1, lower_prev) + } + } else if lower_prev == b'r' + && quote >= 2 + && matches!(bytes[quote - 2].to_ascii_lowercase(), b'f' | b't') + { + (quote - 2, bytes[quote - 2].to_ascii_lowercase()) + } else { + return None; + }; + + if prefix_start > 0 && is_ascii_identifier_char(bytes[prefix_start - 1]) { + return None; + } + + Some(if marker == b'f' { + "f-string" + } else { + "t-string" + }) +} + +fn quoted_string_content_range( + bytes: &[u8], + quote_index: usize, + quote: u8, +) -> Option<(usize, usize)> { + let triple = + bytes.get(quote_index + 1) == Some(&quote) && bytes.get(quote_index + 2) == Some(&quote); + let quote_len = if triple { 3 } else { 1 }; + let content_start = quote_index + quote_len; + let mut index = content_start; + while index < bytes.len() { + if bytes[index] == b'\\' { + index = (index + 2).min(bytes.len()); + } else if (triple + && bytes.get(index) == Some(&quote) + && bytes.get(index + 1) == Some(&quote) + && bytes.get(index + 2) == Some(&quote)) + || (!triple && bytes[index] == quote) + { + return Some((content_start, index)); + } else { + index += 1; + } + } + None +} + +fn invalid_replacement_field_error( + bytes: &[u8], + start: usize, + end: usize, + prefix: &str, +) -> Option<(String, usize, usize)> { + let mut index = start; + while index < end { + match bytes[index] { + b'{' if bytes.get(index + 1) == Some(&b'{') => index += 2, + b'}' if bytes.get(index + 1) == Some(&b'}') => index += 2, + b'{' => { + if let Some(error) = replacement_field_error(bytes, index, end, prefix) { + return Some(error); + } + index += 1; + } + _ => index += 1, + } + } + None +} + +fn replacement_field_error( + bytes: &[u8], + open: usize, + end: usize, + prefix: &str, +) -> Option<(String, usize, usize)> { + let expr_start = skip_ascii_whitespace(bytes, open + 1, end); + if let Some(backslash) = replacement_field_line_continuation(bytes, expr_start, end) { + return Some(( + "unexpected character after line continuation character".to_owned(), + backslash + 1, + (backslash + 2).min(end), + )); + } + if let Some(quote) = unterminated_string_in_replacement_field(bytes, expr_start, end) { + return Some(( + unterminated_string_message(1, false, false), + quote, + quote + 1, + )); + } + match bytes.get(expr_start).copied() { + Some(marker @ (b'=' | b'!' | b':' | b'}')) => { + return Some(( + format!( + "{prefix}: valid expression required before '{}'", + marker as char + ), + expr_start, + expr_start + 1, + )); + } + Some(_) => {} + None => { + return Some(( + format!("{prefix}: expecting a valid expression after '{{'"), + open, + open + 1, + )); + } + } + + if starts_identifier(bytes, expr_start, b"lambda") { + return Some(( + format!("{prefix}: lambda expressions are not allowed without parentheses"), + expr_start, + expr_start + b"lambda".len(), + )); + } + + if invalid_replacement_expression_start(bytes, expr_start, end) { + return Some(( + format!("{prefix}: expecting a valid expression after '{{'"), + open, + open + 1, + )); + } + + let Some(separator) = replacement_field_separator(bytes, expr_start, end) else { + return Some((format!("{prefix}: expecting '}}'"), open, open + 1)); + }; + + if bytes[separator] == b':' + && replacement_expression_has_parse_error(bytes, expr_start, separator) + { + return Some(("invalid syntax".to_owned(), expr_start, separator)); + } + + match bytes[separator] { + b'=' => invalid_debug_expression_error(bytes, separator, end, prefix), + b'!' => invalid_conversion_error(bytes, separator, end, prefix), + b':' => invalid_format_spec_error(bytes, separator, end, prefix), + b'}' => None, + _ => unreachable!(), + } +} + +fn replacement_field_line_continuation( + bytes: &[u8], + mut index: usize, + end: usize, +) -> Option<usize> { + let mut level = 0usize; + while index < end { + match bytes[index] { + b'\'' | b'"' => index = skip_quoted_string(bytes, index), + b'\\' => return Some(index), + b'(' | b'[' | b'{' => { + level += 1; + index += 1; + } + b')' | b']' | b'}' if level > 0 => { + level -= 1; + index += 1; + } + b'=' | b'!' | b':' | b'}' if level == 0 => return None, + _ => index += 1, + } + } + None +} + +fn unterminated_string_in_replacement_field( + bytes: &[u8], + mut index: usize, + end: usize, +) -> Option<usize> { + while index < end { + match bytes[index] { + quote @ (b'\'' | b'"') => { + let string_end = skip_quoted_string(bytes, index); + if string_end >= end && !bytes[index + 1..end].contains(&quote) { + return Some(index); + } + index = string_end; + } + _ => index += 1, + } + } + None +} + +fn replacement_expression_has_parse_error(bytes: &[u8], start: usize, end: usize) -> bool { + let Ok(expression) = ::core::str::from_utf8(&bytes[start..end]) else { + return false; + }; + parser::parse_expression(expression).is_err() +} + +fn invalid_replacement_expression_start(bytes: &[u8], index: usize, end: usize) -> bool { + if index >= end { + return true; + } + + if matches!( + bytes[index], + b'.' | b',' | b'*' | b'/' | b'%' | b'&' | b'|' | b'^' | b'<' | b'>' | b'@' + ) { + return true; + } + + if matches!(bytes[index], b'+' | b'-' | b'~') { + let operand = skip_ascii_whitespace(bytes, index + 1, end); + return !bytes.get(operand).is_some_and(|byte| { + *byte >= 0x80 + || *byte == b'_' + || byte.is_ascii_alphabetic() + || byte.is_ascii_digit() + || matches!(*byte, b'\'' | b'"' | b'(' | b'[' | b'{') + }); + } + + [ + b"and".as_slice(), + b"as".as_slice(), + b"else".as_slice(), + b"for".as_slice(), + b"if".as_slice(), + b"in".as_slice(), + b"is".as_slice(), + b"or".as_slice(), + ] + .iter() + .any(|keyword| starts_identifier(bytes, index, keyword)) +} + +fn replacement_field_separator(bytes: &[u8], mut index: usize, end: usize) -> Option<usize> { + let mut level = 0usize; + while index < end { + match bytes[index] { + b'\'' | b'"' => index = skip_quoted_string(bytes, index), + b'(' | b'[' | b'{' => { + level += 1; + index += 1; + } + b')' | b']' | b'}' if level > 0 => { + level -= 1; + index += 1; + } + b'=' | b'!' | b':' | b'}' if level == 0 => return Some(index), + _ => index += 1, + } + } + None +} + +fn invalid_debug_expression_error( + bytes: &[u8], + equals: usize, + end: usize, + prefix: &str, +) -> Option<(String, usize, usize)> { + let next = equals + 1; + if next >= end || matches!(bytes[next], b'!' | b':' | b'}') { + return None; + } + Some(( + format!("{prefix}: expecting '!', or ':', or '}}'"), + next, + next.saturating_add(1).min(end), + )) +} + +fn invalid_conversion_error( + bytes: &[u8], + bang: usize, + end: usize, + prefix: &str, +) -> Option<(String, usize, usize)> { + let next = bang + 1; + if next >= end { + return Some((format!("{prefix}: expecting '}}'"), bang, bang + 1)); + } + + if bytes[next].is_ascii_whitespace() { + let following = skip_ascii_whitespace(bytes, next, end); + let message = if bytes + .get(following) + .is_some_and(|byte| byte.is_ascii_alphabetic() || *byte == b'_') + { + "conversion type must come right after the exclamation mark" + } else { + "missing conversion character" + }; + return Some((format!("{prefix}: {message}"), next, next + 1)); + } + + if matches!(bytes[next], b':' | b'}') { + return Some(( + format!("{prefix}: missing conversion character"), + next, + next + 1, + )); + } + + if !bytes[next].is_ascii_alphabetic() && bytes[next] != b'_' { + return Some(( + format!("{prefix}: invalid conversion character"), + next, + next + 1, + )); + } + + let conversion_end = identifier_end(bytes, next, end); + let conversion = &bytes[next..conversion_end]; + if !matches!(conversion, b"s" | b"r" | b"a") { + let conversion = ::core::str::from_utf8(conversion).unwrap_or(""); + return Some(( + format!( + "{prefix}: invalid conversion character '{conversion}': expected 's', 'r', or 'a'" + ), + next, + conversion_end, + )); + } + + if conversion_end >= end || matches!(bytes[conversion_end], b':' | b'}') { + return None; + } + + Some(( + format!("{prefix}: expecting ':' or '}}'"), + conversion_end, + conversion_end + 1, + )) +} + +fn invalid_format_spec_error( + bytes: &[u8], + colon: usize, + end: usize, + prefix: &str, +) -> Option<(String, usize, usize)> { + if replacement_field_closing_brace(bytes, colon + 1, end).is_some() { + return None; + } + Some(( + format!("{prefix}: expecting '}}', or format specs"), + colon, + colon + 1, + )) +} + +fn replacement_field_closing_brace(bytes: &[u8], mut index: usize, end: usize) -> Option<usize> { + let mut level = 0usize; + while index < end { + match bytes[index] { + b'\'' | b'"' => index = skip_quoted_string(bytes, index), + b'{' => { + level += 1; + index += 1; + } + b'}' if level > 0 => { + level -= 1; + index += 1; + } + b'}' => return Some(index), + _ => index += 1, + } + } + None +} + +fn skip_ascii_whitespace(bytes: &[u8], mut index: usize, end: usize) -> usize { + while index < end && matches!(bytes[index], b' ' | b'\t' | b'\r' | b'\n' | 0x0c) { + index += 1; + } + index +} + +fn string_literal_end_at(bytes: &[u8], index: usize) -> Option<usize> { + match bytes.get(index).copied()? { + b'\'' | b'"' => Some(skip_quoted_string(bytes, index)), + first if first.is_ascii_alphabetic() => { + if matches!(bytes.get(index + 1), Some(b'\'' | b'"')) { + return string_literal_prefix(bytes, index, index + 1) + .then(|| skip_quoted_string(bytes, index + 1)); + } + if matches!(bytes.get(index + 2), Some(b'\'' | b'"')) { + return string_literal_prefix(bytes, index, index + 2) + .then(|| skip_quoted_string(bytes, index + 2)); + } + None + } + _ => None, + } +} + +fn string_literal_prefix(bytes: &[u8], start: usize, quote: usize) -> bool { + let prefix = &bytes[start..quote]; + let valid = matches!( + prefix, + b"b" | b"B" + | b"r" + | b"R" + | b"u" + | b"U" + | b"f" + | b"F" + | b"t" + | b"T" + | b"br" + | b"bR" + | b"Br" + | b"BR" + | b"rb" + | b"rB" + | b"Rb" + | b"RB" + | b"fr" + | b"fR" + | b"Fr" + | b"FR" + | b"rf" + | b"rF" + | b"Rf" + | b"RF" + | b"tr" + | b"tR" + | b"Tr" + | b"TR" + | b"rt" + | b"rT" + | b"Rt" + | b"RT" + ); + valid && (start == 0 || !is_ascii_identifier_char(bytes[start - 1])) +} + +fn invalid_expression_error(source: &str) -> Option<(String, usize, usize)> { + invalid_string_expression_error(source).or_else(|| missing_comma_expression_error(source)) +} + +fn invalid_string_expression_error(source: &str) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let mut index = 0; + while index < bytes.len() { + if let Some(first_string_end) = string_literal_end_at(bytes, index) { + let expr_start = skip_ascii_whitespace(bytes, first_string_end, bytes.len()); + if expression_atom_start(bytes, expr_start) + && let Some(expr_end) = adjacent_atom_end(bytes, expr_start) + { + let next = skip_ascii_whitespace(bytes, expr_end, bytes.len()); + if string_literal_end_at(bytes, next).is_some() { + return Some(( + "invalid syntax. Is this intended to be part of the string?".to_owned(), + expr_start, + expr_end, + )); + } + } + index = first_string_end; + } else { + index += 1; + } + } + None +} + +fn missing_comma_expression_error(source: &str) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let mut stack: Vec<u8> = Vec::new(); + let mut index = 0; + while index < bytes.len() { + if bytes[index] == b'#' { + while index < bytes.len() && bytes[index] != b'\n' { + index += 1; + } + } else if let Some(string_end) = string_literal_end_at(bytes, index) { + index = string_end; + } else { + match bytes[index] { + b'(' | b'[' | b'{' => { + if bytes[index] == b'[' && opening_bracket_is_class_type_params(bytes, index) { + let Some(close) = matching_delimiter(bytes, index, b']') else { + index += 1; + continue; + }; + index = close + 1; + continue; + } + stack.push(bytes[index]); + index += 1; + } + b')' | b']' | b'}' => { + stack.pop(); + index += 1; + } + _ if !stack.is_empty() && expression_continuation_keyword(bytes, index) => { + index = identifier_end(bytes, index, bytes.len()); + } + byte if !stack.is_empty() && expression_atom_start_byte(byte) => { + let atom_end = adjacent_atom_end(bytes, index).unwrap_or(index + 1); + let next = skip_ascii_whitespace(bytes, atom_end, bytes.len()); + if next > atom_end + && expression_atom_start(bytes, next) + && !expression_continuation_keyword(bytes, next) + { + return Some(( + "invalid syntax. Perhaps you forgot a comma?".to_owned(), + index, + next + 1, + )); + } + index = atom_end; + } + _ => index += 1, + } + } + } + None +} + +fn opening_bracket_is_class_type_params(bytes: &[u8], bracket: usize) -> bool { + let mut cursor = bracket; + while cursor > 0 && matches!(bytes[cursor - 1], b' ' | b'\t' | b'\x0c') { + cursor -= 1; + } + while cursor > 0 + && bytes + .get(cursor - 1) + .is_some_and(|byte| *byte >= 0x80 || is_ascii_identifier_char(*byte)) + { + cursor -= 1; + } + while cursor > 0 && matches!(bytes[cursor - 1], b' ' | b'\t' | b'\x0c') { + cursor -= 1; + } + cursor >= 5 && starts_identifier(bytes, cursor - 5, b"class") +} + +fn expression_continuation_keyword(bytes: &[u8], index: usize) -> bool { + [ + b"and".as_slice(), + b"else".as_slice(), + b"for".as_slice(), + b"if".as_slice(), + b"in".as_slice(), + b"is".as_slice(), + b"not".as_slice(), + b"or".as_slice(), + ] + .iter() + .any(|keyword| starts_identifier(bytes, index, keyword)) +} + +fn expression_atom_start(bytes: &[u8], index: usize) -> bool { + bytes + .get(index) + .is_some_and(|byte| expression_atom_start_byte(*byte)) + || string_literal_end_at(bytes, index).is_some() +} + +fn expression_atom_start_byte(byte: u8) -> bool { + byte >= 0x80 + || byte == b'_' + || byte.is_ascii_alphabetic() + || byte.is_ascii_digit() + || matches!(byte, b'\'' | b'"' | b'(' | b'[' | b'{') +} + +fn adjacent_atom_end(bytes: &[u8], index: usize) -> Option<usize> { + if let Some(string_end) = string_literal_end_at(bytes, index) { + return Some(string_end); + } + match bytes.get(index).copied()? { + byte if byte >= 0x80 || byte == b'_' || byte.is_ascii_alphabetic() => { + Some(identifier_end(bytes, index, bytes.len())) + } + byte if byte.is_ascii_digit() => { + let mut end = index + 1; + while end < bytes.len() && (bytes[end].is_ascii_alphanumeric() || bytes[end] == b'_') { + end += 1; + } + Some(end) + } + b'(' | b'[' | b'{' => Some(index + 1), + _ => None, + } +} + +fn unterminated_string_message( + detected_line: usize, + triple: bool, + has_escaped_quote: bool, +) -> String { + if triple { + format!("unterminated triple-quoted string literal (detected at line {detected_line})") + } else if has_escaped_quote { + format!( + "unterminated string literal (detected at line {detected_line}); perhaps you escaped the end quote?" + ) + } else { + format!("unterminated string literal (detected at line {detected_line})") + } +} + +fn expected_opening_bracket(closing: char) -> char { + match closing { + ')' => '(', + ']' => '[', + '}' => '{', + _ => unreachable!(), + } +} + +fn bracket_syntax_error(source: &str) -> Option<(String, usize, usize, bool)> { + let mut stack: Vec<(char, usize, usize)> = Vec::new(); + let mut in_string = false; + let mut string_quote = '\0'; + let mut triple_quote = false; + let mut escape_next = false; + let mut is_raw_string = false; + let mut line = 1usize; + + let chars: Vec<(usize, char)> = source.char_indices().collect(); + let mut index = 0; + while index < chars.len() { + let (byte_offset, ch) = chars[index]; + + if ch == '\n' { + line += 1; + } + + if escape_next { + escape_next = false; + index += 1; + continue; + } + + if in_string { + if ch == '\\' && !is_raw_string { + escape_next = true; + } else if triple_quote { + if ch == string_quote + && index + 2 < chars.len() + && chars[index + 1].1 == string_quote + && chars[index + 2].1 == string_quote + { + in_string = false; + index += 3; + continue; + } + } else if ch == string_quote { + in_string = false; + } + index += 1; + continue; + } + + if ch == '#' { + while index < chars.len() && chars[index].1 != '\n' { + index += 1; + } + continue; + } + + if ch == '\'' || ch == '"' { + is_raw_string = false; + for look_back in 1..=2.min(index) { + let prev = chars[index - look_back].1; + if matches!(prev, 'r' | 'R') { + is_raw_string = true; + break; + } + if !matches!(prev, 'b' | 'B' | 'f' | 'F' | 'u' | 'U') { + break; + } + } + string_quote = ch; + if index + 2 < chars.len() && chars[index + 1].1 == ch && chars[index + 2].1 == ch { + triple_quote = true; + in_string = true; + index += 3; + continue; + } + triple_quote = false; + in_string = true; + index += 1; + continue; + } + + match ch { + '(' | '[' | '{' => stack.push((ch, byte_offset, line)), + ')' | ']' | '}' => { + let expected = expected_opening_bracket(ch); + let Some(&(opening, _, opening_line)) = stack.last() else { + return Some((format!("unmatched '{ch}'"), byte_offset, byte_offset, false)); + }; + if opening == expected { + stack.pop(); + } else { + let suffix = if opening_line != line { + format!(" on line {opening_line}") + } else { + String::new() + }; + return Some(( + format!( + "closing parenthesis '{ch}' does not match opening parenthesis '{opening}'{suffix}" + ), + byte_offset, + byte_offset, + false, + )); + } + } + _ => {} + } + + index += 1; + } + + stack.last().map(|(opening, byte_offset, _)| { + ( + format!("'{opening}' was never closed"), + *byte_offset, + *byte_offset, + true, + ) + }) +} + +fn is_legacy_statement_expression_start(byte: u8) -> bool { + byte >= 0x80 + || byte == b'_' + || byte.is_ascii_alphabetic() + || byte.is_ascii_digit() + || matches!(byte, b'\'' | b'"' | b'{' | b'[') +} + +fn legacy_statement_container_has_invalid_attribute(bytes: &[u8], start: usize) -> bool { + let Some(&opening) = bytes.get(start) else { + return false; + }; + if !matches!(opening, b'{' | b'[') { + return false; + } + + let mut index = start; + let mut level = 0usize; + while index < bytes.len() { + match bytes[index] { + b'#' => { + while index < bytes.len() && bytes[index] != b'\n' { + index += 1; + } + } + b'\n' | b';' if level == 0 => return false, + b'\'' | b'"' => { + index = skip_quoted_string(bytes, index); + } + b'(' | b'[' | b'{' => { + level += 1; + index += 1; + } + b')' | b']' | b'}' => { + level = level.saturating_sub(1); + index += 1; + if level == 0 { + return false; + } + } + b'.' => { + let mut cursor = index + 1; + while matches!(bytes.get(cursor), Some(b' ' | b'\t' | b'\x0c')) { + cursor += 1; + } + if matches!(bytes.get(cursor), Some(b')' | b']' | b'}')) { + return true; + } + index += 1; + } + _ => index += 1, + } + } + false +} + +fn invalid_legacy_statement_error(source: &str) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let mut index = 0; + while index < bytes.len() { + match bytes[index] { + b'#' => { + while index < bytes.len() && bytes[index] != b'\n' { + index += 1; + } + } + b'\'' | b'"' => { + index = skip_quoted_string(bytes, index); + } + b'p' | b'e' => { + let keyword = if starts_identifier(bytes, index, b"print") { + Some("print") + } else if starts_identifier(bytes, index, b"exec") { + Some("exec") + } else { + None + }; + let Some(keyword) = keyword else { + index += 1; + continue; + }; + let after_keyword = index + keyword.len(); + if !matches!(bytes.get(after_keyword), Some(b' ' | b'\t' | b'\x0c')) { + index = after_keyword; + continue; + } + let mut cursor = after_keyword; + while matches!(bytes.get(cursor), Some(b' ' | b'\t' | b'\x0c')) { + cursor += 1; + } + if legacy_statement_container_has_invalid_attribute(bytes, cursor) { + index = after_keyword; + continue; + } + if bytes.get(cursor).is_some_and(|byte| { + *byte != b'(' && is_legacy_statement_expression_start(*byte) + }) { + return Some(( + format!( + "Missing parentheses in call to '{keyword}'. Did you mean {keyword}(...)?" + ), + index, + after_keyword, + )); + } + index = after_keyword; + } + _ => index += 1, + } + } + None +} + +fn long_decimal_integer_literal_error( + source: &str, + max_str_digits: usize, +) -> Option<(String, usize, usize)> { + if max_str_digits == 0 { + return None; + } + let bytes = source.as_bytes(); + let mut index = 0; + while index < bytes.len() { + match bytes[index] { + b'#' => { + while index < bytes.len() && bytes[index] != b'\n' { + index += 1; + } + } + b'\'' | b'"' => { + index = skip_quoted_string(bytes, index); + } + byte if byte >= 0x80 || byte == b'_' || byte.is_ascii_alphabetic() => { + index += 1; + while index < bytes.len() + && (bytes[index] >= 0x80 || is_ascii_identifier_char(bytes[index])) + { + index += 1; + } + } + b'.' => { + if bytes + .get(index + 1) + .is_some_and(|byte| byte.is_ascii_digit()) + { + let (_, end) = number_literal_end(bytes, index)?; + index = end.max(index + 1); + } else { + index += 1; + } + } + b'0'..=b'9' => { + if bytes.get(index) == Some(&b'0') + && matches!( + bytes.get(index + 1), + Some(b'x' | b'X' | b'o' | b'O' | b'b' | b'B') + ) + { + let Some((_, end)) = number_literal_end(bytes, index) else { + index += 1; + continue; + }; + index = end.max(index + 1); + continue; + } + + let start = index; + let mut digits = 0usize; + while index < bytes.len() { + match bytes[index] { + b'0'..=b'9' => { + digits += 1; + index += 1; + } + b'_' if bytes + .get(index + 1) + .is_some_and(|byte| byte.is_ascii_digit()) => + { + index += 1; + } + _ => break, + } + } + if matches!(bytes.get(index), Some(b'.' | b'e' | b'E' | b'j' | b'J')) { + let Some((_, end)) = number_literal_end(bytes, start) else { + continue; + }; + index = end.max(index + 1); + continue; + } + if digits > max_str_digits { + return Some(( + format!( + "Exceeds the limit ({max_str_digits} digits) for integer string conversion: value has {digits} digits; use sys.set_int_max_str_digits() to increase the limit - Consider hexadecimal for huge integer literals to avoid decimal conversion limits." + ), + start, + start, + )); + } + } + _ => index += 1, + } + } + None +} + +fn invalid_parenthesized_import_star_error(source: &str) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let mut index = 0; + while index < bytes.len() { + match bytes[index] { + b'#' => { + while index < bytes.len() && bytes[index] != b'\n' { + index += 1; + } + } + b'\'' | b'"' => { + index = skip_quoted_string(bytes, index); + } + b'f' if starts_identifier(bytes, index, b"from") => { + let mut cursor = index + 4; + while cursor < bytes.len() && !matches!(bytes[cursor], b'\n' | b';') { + if starts_identifier(bytes, cursor, b"import") { + cursor += 6; + while matches!(bytes.get(cursor), Some(b' ' | b'\t' | b'\r')) { + cursor += 1; + } + if bytes.get(cursor) == Some(&b'(') { + cursor += 1; + while cursor < bytes.len() + && !matches!(bytes[cursor], b')' | b'\n' | b';') + { + if bytes[cursor] == b'*' { + return Some(("invalid syntax".to_owned(), cursor, cursor + 1)); + } + cursor += 1; + } + } + break; + } + cursor += 1; + } + index = cursor; + } + _ => index += 1, + } + } + None +} + +fn too_many_nested_parentheses_error(source: &str) -> Option<(String, usize, usize)> { + const MAXLEVEL: usize = 200; + + let bytes = source.as_bytes(); + let mut index = 0; + let mut level = 0usize; + while index < bytes.len() { + match bytes[index] { + b'#' => { + while index < bytes.len() && bytes[index] != b'\n' { + index += 1; + } + } + b'\'' | b'"' => { + index = skip_quoted_string(bytes, index); + } + b'(' | b'[' | b'{' => { + if level >= MAXLEVEL { + return Some(("too many nested parentheses".to_owned(), index, index + 1)); + } + level += 1; + index += 1; + } + b')' | b']' | b'}' => { + level = level.saturating_sub(1); + index += 1; + } + _ => index += 1, + } + } + None +} + +fn invalid_unparenthesized_yield_after_comma_error(source: &str) -> Option<(String, usize, usize)> { + let bytes = source.as_bytes(); + let mut index = 0; + while index < bytes.len() { + match bytes[index] { + b'#' => { + while index < bytes.len() && bytes[index] != b'\n' { + index += 1; + } + } + b'\'' | b'"' => { + index = skip_quoted_string(bytes, index); + } + b',' => { + let mut cursor = index + 1; + while matches!(bytes.get(cursor), Some(b' ' | b'\t' | b'\x0c')) { + cursor += 1; + } + if starts_identifier(bytes, cursor, b"yield") { + return Some(("invalid syntax".to_owned(), cursor, cursor + 5)); + } + index += 1; + } + _ => index += 1, + } + } + None +} + +fn post_parse_source_error(source_file: &SourceFile, opts: &CompileOpts) -> Option<CompileError> { + too_many_nested_parentheses_error(source_file.source_text()) + .or_else(|| { + long_decimal_integer_literal_error(source_file.source_text(), opts.int_max_str_digits) + }) + .or_else(|| invalid_call_argument_error(source_file.source_text())) + .or_else(|| invalid_match_mapping_rest_wildcard_error(source_file.source_text())) + .or_else(|| invalid_match_as_target_error(source_file.source_text())) + .or_else(|| invalid_unparenthesized_yield_after_comma_error(source_file.source_text())) + .or_else(|| invalid_parenthesized_import_star_error(source_file.source_text())) + .map(|(message, start, end)| { + CompileError::from_source_error(source_file, message, start, end) + }) +} + +fn is_compound_stmt(stmt: &ast::Stmt) -> bool { + matches!( + stmt, + ast::Stmt::FunctionDef(_) + | ast::Stmt::ClassDef(_) + | ast::Stmt::If(_) + | ast::Stmt::For(_) + | ast::Stmt::While(_) + | ast::Stmt::With(_) + | ast::Stmt::Try(_) + | ast::Stmt::Match(_) + ) +} + +fn single_mode_body_error(body: &[ast::Stmt], source_file: &SourceFile) -> Option<CompileError> { + let first = body.first()?; + let source_code = source_file.to_source_code(); + let first_start = source_code.source_location(first.range().start(), PositionEncoding::Utf8); + let first_end = source_code.source_location(first.range().end(), PositionEncoding::Utf8); + + if body.iter().skip(1).any(|stmt| { + source_code + .source_location(stmt.range().start(), PositionEncoding::Utf8) + .line + > first_start.line + }) { + return Some(CompileError::from_source_error( + source_file, + "multiple statements found while compiling a single statement".to_owned(), + first.range().end().to_usize(), + first.range().end().to_usize(), + )); + } + + if is_compound_stmt(first) + && first_start.line == first_end.line + && !ends_with_line_break(source_file.source_text()) + { + return Some(CompileError::from_source_error( + source_file, + "invalid syntax".to_owned(), + first.range().start().to_usize(), + first.range().start().to_usize(), + )); + } + None +} + +fn single_mode_source_error(ast: &ast::Mod, source_file: &SourceFile) -> Option<CompileError> { + let ast::Mod::Module(module) = ast else { + return None; + }; + single_mode_body_error(&module.body, source_file) +} + +fn ends_with_line_break(source: &str) -> bool { + source.ends_with('\n') || source.ends_with('\r') +} + +fn ends_with_implied_dedent(source: &str) -> bool { + let mut lexer = parser::lexer::lex(source, parser::Mode::Module); + let mut last_kind = TokenKind::EndOfFile; + loop { + let kind = lexer.next_token(); + if kind.is_eof() { + break; + } + last_kind = kind; + } + matches!(last_kind, TokenKind::Dedent) +} + +/// Detect input that only parses because Ruff's lexer closes indentation at EOF. +/// +/// `PyCF_DONT_IMPLY_DEDENT` is used by `codeop` and interactive compile +/// paths to keep an indented block incomplete until a terminating newline is seen. +#[must_use] +pub fn dont_imply_dedent_source_error(source_file: &SourceFile) -> Option<CompileError> { + let source = source_file.source_text(); + if ends_with_line_break(source) || !ends_with_implied_dedent(source) { + return None; + } + let eof = source.len(); + Some(CompileError::from_source_error( + source_file, + "incomplete input".to_owned(), + eof, + eof, + )) +} + /// Find the last unclosed opening bracket in source code. /// Returns the bracket character and its byte offset, or None if all brackets are balanced. fn find_unclosed_bracket(source: &str) -> Option<(char, usize)> { @@ -378,6 +5194,15 @@ fn _compile( source_file: SourceFile, mode: Mode, opts: CompileOpts, +) -> Result<CodeObject, CompileError> { + _compile_with_syntax_warning_handler(source_file, mode, opts, None) +} + +fn _compile_with_syntax_warning_handler<'a>( + source_file: SourceFile, + mode: Mode, + opts: CompileOpts, + syntax_warning_handler: Option<&'a mut compile::SyntaxWarningHandler<'a>>, ) -> Result<CodeObject, CompileError> { let parser_mode = match mode { Mode::Exec => parser::Mode::Module, @@ -386,10 +5211,49 @@ fn _compile( // since these are only different in terms of compilation Mode::Single | Mode::BlockExpr => parser::Mode::Module, }; - let parsed = parser::parse(source_file.source_text(), parser_mode.into()) + let parser_options = parser::ParseOptions::from(parser_mode); + let parsed = parser::parse(source_file.source_text(), parser_options) .map_err(|err| CompileError::from_ruff_parse_error(err, &source_file))?; + if opts.dont_imply_dedent + && matches!(mode, Mode::Single) + && let Some(error) = dont_imply_dedent_source_error(&source_file) + { + return Err(error); + } + if let Some(error) = post_parse_source_error(&source_file, &opts) { + return Err(error); + } let ast = parsed.into_syntax(); - compile::compile_top(ast, source_file, mode, opts).map_err(|e| e.into()) + let single_mode_error = matches!(mode, Mode::Single) + .then(|| single_mode_source_error(&ast, &source_file)) + .flatten(); + let code = compile::compile_top_with_syntax_warning_handler( + ast, + source_file, + mode, + opts, + syntax_warning_handler, + ) + .map_err(CompileError::from)?; + if let Some(error) = single_mode_error { + return Err(error); + } + Ok(code) +} + +pub fn compile_with_syntax_warning_handler<'a>( + source: &str, + mode: Mode, + source_path: &str, + opts: CompileOpts, + syntax_warning_handler: &'a mut compile::SyntaxWarningHandler<'a>, +) -> Result<CodeObject, CompileError> { + let source = source.replace("\r\n", "\n"); + #[cfg(windows)] + let source = source.as_str(); + + let source_file = SourceFileBuilder::new(source_path, source).finish(); + _compile_with_syntax_warning_handler(source_file, mode, opts, Some(syntax_warning_handler)) } pub fn compile_symtable( @@ -409,7 +5273,16 @@ pub fn _compile_symtable( Mode::Exec | Mode::Single | Mode::BlockExpr => { let ast = ruff_python_parser::parse_module(source_file.source_text()) .map_err(|e| CompileError::from_ruff_parse_error(e, &source_file))?; - symboltable::SymbolTable::scan_program(&ast.into_syntax(), source_file.clone()) + if let Some(error) = post_parse_source_error(&source_file, &CompileOpts::default()) { + return Err(error); + } + let ast = ast.into_syntax(); + if matches!(mode, Mode::Single) + && let Some(error) = single_mode_body_error(&ast.body, &source_file) + { + return Err(error); + } + symboltable::SymbolTable::scan_program(&ast, source_file.clone()) } Mode::Eval => { let ast = ruff_python_parser::parse( @@ -417,6 +5290,9 @@ pub fn _compile_symtable( parser::Mode::Expression.into(), ) .map_err(|e| CompileError::from_ruff_parse_error(e, &source_file))?; + if let Some(error) = post_parse_source_error(&source_file, &CompileOpts::default()) { + return Err(error); + } symboltable::SymbolTable::scan_expr( &ast.into_syntax().expect_expression(), source_file.clone(), @@ -437,6 +5313,21 @@ mod tests { dbg!(compiled.expect("compile error")); } + #[test] + fn dont_imply_dedent_requires_terminating_newline() { + let code = "if True:\n pass"; + + let opts = CompileOpts { + dont_imply_dedent: true, + ..CompileOpts::default() + }; + let err = compile(code, Mode::Single, "<>", opts.clone()).expect_err("compile succeeded"); + assert_eq!(err.to_string(), "incomplete input"); + + compile("if True:\n pass\n", Mode::Single, "<>", opts).expect("compile error"); + compile(code, Mode::Single, "<>", CompileOpts::default()).expect("compile error"); + } + #[test] fn compile_phello() { let code = r#" @@ -501,6 +5392,20 @@ def f(): dbg!(compiled.expect("compile error")); } + #[test] + fn compile_call_arg_lambda_default() { + let code = "signature((lambda a=10: a))"; + let compiled = compile(code, Mode::Exec, "<>", CompileOpts::default()); + dbg!(compiled.expect("compile error")); + } + + #[test] + fn compile_generic_function_parameter_default() { + let code = "def __repr__[T: str](self, default: T = '') -> str: pass"; + let compiled = compile(code, Mode::Exec, "<>", CompileOpts::default()); + dbg!(compiled.expect("compile error")); + } + #[test] fn compile_int() { let code = r#" diff --git a/crates/stdlib/src/_opcode.rs b/crates/stdlib/src/_opcode.rs index 2b2a70b55..e6fc3276c 100644 --- a/crates/stdlib/src/_opcode.rs +++ b/crates/stdlib/src/_opcode.rs @@ -205,7 +205,7 @@ mod tests { let scope = vm.new_scope_with_builtins(); let code_obj = vm .compile(source.trim(), Mode::Exec, FNAME) - .map_err(|err| vm.new_syntax_error(&err, Some(source))) + .map_err(|err| err.into_pyexception(vm, Some(source))) .unwrap(); scope.globals.set_item("code", code_obj.into(), vm).unwrap(); @@ -228,7 +228,7 @@ output = re.sub(r'(<code object \w+ at )0x[0-9a-fA-F]+', r'\g<1>0xdeadbeef', tmp let py_code_obj = vm .compile(py_source, Mode::Exec, FNAME) - .map_err(|err| vm.new_syntax_error(&err, Some(py_source))) + .map_err(|err| err.into_pyexception(vm, Some(py_source))) .unwrap(); vm.run_code_obj(py_code_obj, scope.clone()).unwrap(); diff --git a/crates/stdlib/src/snapshots/rustpython_stdlib___opcode__tests__bare_function_annotations_check_attribute_and_subscript_expressions.snap b/crates/stdlib/src/snapshots/rustpython_stdlib___opcode__tests__bare_function_annotations_check_attribute_and_subscript_expressions.snap index 3274352b9..4d78128b5 100644 --- a/crates/stdlib/src/snapshots/rustpython_stdlib___opcode__tests__bare_function_annotations_check_attribute_and_subscript_expressions.snap +++ b/crates/stdlib/src/snapshots/rustpython_stdlib___opcode__tests__bare_function_annotations_check_attribute_and_subscript_expressions.snap @@ -1,5 +1,6 @@ --- source: crates/stdlib/src/_opcode.rs +assertion_line: 318 expression: "dis(r#\"\ndef f(one: int):\n int.new_attr: int\n [list][0].new_attr: [int, str]\n my_lst = [1]\n my_lst[one]: int\n return my_lst\n\"#)" --- 0 RESUME 0 @@ -15,7 +16,7 @@ expression: "dis(r#\"\ndef f(one: int):\n int.new_attr: int\n [list][0].ne Disassembly of <code object __annotate__ at 0xdeadbeef file "<?>", line 1>: 1 RESUME 0 - LOAD_FAST_BORROW 0 (format) + LOAD_FAST_CHECK 0 (format) LOAD_SMALL_INT 2 COMPARE_OP 132 (>) POP_JUMP_IF_FALSE 3 (to L1) diff --git a/crates/stdlib/src/snapshots/rustpython_stdlib___opcode__tests__const_no_op.snap b/crates/stdlib/src/snapshots/rustpython_stdlib___opcode__tests__const_no_op.snap index 347e58767..dc97f6b79 100644 --- a/crates/stdlib/src/snapshots/rustpython_stdlib___opcode__tests__const_no_op.snap +++ b/crates/stdlib/src/snapshots/rustpython_stdlib___opcode__tests__const_no_op.snap @@ -1,6 +1,7 @@ --- source: crates/stdlib/src/_opcode.rs -expression: x = not True +assertion_line: 281 +expression: "dis(r#\"\nx = not True\n\"#)" --- 0 RESUME 0 diff --git a/crates/stdlib/src/snapshots/rustpython_stdlib___opcode__tests__constant_true_if_pass_keeps_line_anchor_nop.snap b/crates/stdlib/src/snapshots/rustpython_stdlib___opcode__tests__constant_true_if_pass_keeps_line_anchor_nop.snap index 02e247350..3de37ce20 100644 --- a/crates/stdlib/src/snapshots/rustpython_stdlib___opcode__tests__constant_true_if_pass_keeps_line_anchor_nop.snap +++ b/crates/stdlib/src/snapshots/rustpython_stdlib___opcode__tests__constant_true_if_pass_keeps_line_anchor_nop.snap @@ -1,6 +1,7 @@ --- source: crates/stdlib/src/_opcode.rs -expression: "if 1:\n pass" +assertion_line: 290 +expression: "dis(r#\"\nif 1:\n pass\n\"#)" --- 0 RESUME 0 diff --git a/crates/stdlib/src/snapshots/rustpython_stdlib___opcode__tests__if_ands.snap b/crates/stdlib/src/snapshots/rustpython_stdlib___opcode__tests__if_ands.snap index b5957dda5..5c58a2b6b 100644 --- a/crates/stdlib/src/snapshots/rustpython_stdlib___opcode__tests__if_ands.snap +++ b/crates/stdlib/src/snapshots/rustpython_stdlib___opcode__tests__if_ands.snap @@ -1,6 +1,7 @@ --- source: crates/stdlib/src/_opcode.rs -expression: "if True and False and False:\n pass" +assertion_line: 252 +expression: "dis(r#\"\nif True and False and False:\n pass\n\"#)" --- 0 RESUME 0 diff --git a/crates/stdlib/src/snapshots/rustpython_stdlib___opcode__tests__if_mixed.snap b/crates/stdlib/src/snapshots/rustpython_stdlib___opcode__tests__if_mixed.snap index f8976b8c6..6bef04ee1 100644 --- a/crates/stdlib/src/snapshots/rustpython_stdlib___opcode__tests__if_mixed.snap +++ b/crates/stdlib/src/snapshots/rustpython_stdlib___opcode__tests__if_mixed.snap @@ -1,6 +1,7 @@ --- source: crates/stdlib/src/_opcode.rs -expression: "if (True and False) or (False and True):\n pass" +assertion_line: 262 +expression: "dis(r#\"\nif (True and False) or (False and True):\n pass\n\"#)" --- 0 RESUME 0 diff --git a/crates/stdlib/src/snapshots/rustpython_stdlib___opcode__tests__if_ors.snap b/crates/stdlib/src/snapshots/rustpython_stdlib___opcode__tests__if_ors.snap index f8cc3a1f2..065d89373 100644 --- a/crates/stdlib/src/snapshots/rustpython_stdlib___opcode__tests__if_ors.snap +++ b/crates/stdlib/src/snapshots/rustpython_stdlib___opcode__tests__if_ors.snap @@ -1,6 +1,7 @@ --- source: crates/stdlib/src/_opcode.rs -expression: "if True or False or False:\n pass" +assertion_line: 242 +expression: "dis(r#\"\nif True or False or False:\n pass\n\"#)" --- 0 RESUME 0 diff --git a/crates/stdlib/src/snapshots/rustpython_stdlib___opcode__tests__nested_bool_op.snap b/crates/stdlib/src/snapshots/rustpython_stdlib___opcode__tests__nested_bool_op.snap index c0e365948..00eeb2774 100644 --- a/crates/stdlib/src/snapshots/rustpython_stdlib___opcode__tests__nested_bool_op.snap +++ b/crates/stdlib/src/snapshots/rustpython_stdlib___opcode__tests__nested_bool_op.snap @@ -1,6 +1,7 @@ --- source: crates/stdlib/src/_opcode.rs -expression: x = Test() and False or False +assertion_line: 272 +expression: "dis(r#\"\nx = Test() and False or False\n\"#)" --- 0 RESUME 0 diff --git a/crates/vm/Cargo.toml b/crates/vm/Cargo.toml index 83e41fa1f..b3479e017 100644 --- a/crates/vm/Cargo.toml +++ b/crates/vm/Cargo.toml @@ -70,6 +70,7 @@ static_assertions = { workspace = true } strum = { workspace = true } strum_macros = { workspace = true } thiserror = { workspace = true } +thin-vec = { workspace = true } memchr = { workspace = true } flamer = { workspace = true, optional = true } diff --git a/crates/vm/src/builtins/type.rs b/crates/vm/src/builtins/type.rs index 89321189b..19fca5cf4 100644 --- a/crates/vm/src/builtins/type.rs +++ b/crates/vm/src/builtins/type.rs @@ -34,7 +34,7 @@ use core::{ ops::Deref, pin::Pin, ptr::NonNull, - sync::atomic::{AtomicBool, AtomicPtr, AtomicU32, Ordering}, + sync::atomic::{AtomicBool, AtomicPtr, AtomicU32, AtomicU64, Ordering}, }; use indexmap::{IndexMap, map::Entry}; use itertools::Itertools; @@ -53,6 +53,7 @@ pub struct PyType { pub heaptype_ext: Option<Pin<Box<HeapTypeExt>>>, /// Type version tag for inline caching. 0 means unassigned/invalidated. pub tp_version_tag: AtomicU32, + pub abc_tpflags: AtomicU64, } /// Monotonic counter for type version tags. Once it reaches `u32::MAX`, @@ -590,7 +591,9 @@ impl PyType { // Check each base in order and inherit the first collection flag found for base in bases { - let base_flags = base.slots.flags & COLLECTION_FLAGS; + let base_flags = (base.slots.flags + | PyTypeFlags::from_bits_truncate(base.abc_tpflags.load(Ordering::Acquire))) + & COLLECTION_FLAGS; if !base_flags.is_empty() { slots.flags |= base_flags; return; @@ -598,6 +601,58 @@ impl PyType { } } + fn inherited_abc_tpflags(bases: &[PyRef<Self>]) -> u64 { + const COLLECTION_FLAGS: PyTypeFlags = PyTypeFlags::from_bits_truncate( + PyTypeFlags::SEQUENCE.bits() | PyTypeFlags::MAPPING.bits(), + ); + for base in bases { + let base_flags = + PyTypeFlags::from_bits_truncate(base.abc_tpflags.load(Ordering::Acquire)) + & COLLECTION_FLAGS; + if !base_flags.is_empty() { + return base_flags.bits(); + } + } + 0 + } + + pub fn has_patma_collection_flag(&self, flag: PyTypeFlags) -> bool { + debug_assert!(matches!(flag, PyTypeFlags::SEQUENCE | PyTypeFlags::MAPPING)); + const COLLECTION_FLAGS: PyTypeFlags = PyTypeFlags::from_bits_truncate( + PyTypeFlags::SEQUENCE.bits() | PyTypeFlags::MAPPING.bits(), + ); + let slot_flags = self.slots.flags & COLLECTION_FLAGS; + if !slot_flags.is_empty() { + return slot_flags.contains(flag); + } + PyTypeFlags::from_bits_truncate(self.abc_tpflags.load(Ordering::Acquire)).contains(flag) + } + + pub fn set_abc_collection_flags_recursive(&self, flags: PyTypeFlags) { + const COLLECTION_FLAGS: PyTypeFlags = PyTypeFlags::from_bits_truncate( + PyTypeFlags::SEQUENCE.bits() | PyTypeFlags::MAPPING.bits(), + ); + let flags = flags & COLLECTION_FLAGS; + if flags.is_empty() { + return; + } + let collection_bits = COLLECTION_FLAGS.bits(); + let flags_bits = flags.bits(); + let _ = self + .abc_tpflags + .fetch_update(Ordering::AcqRel, Ordering::Acquire, |old| { + Some((old & !collection_bits) | flags_bits) + }); + self.modified(); + for weak_ref in self.subclasses.read().iter() { + if let Some(subclass) = weak_ref.upgrade() + && let Some(subclass) = subclass.downcast_ref::<Self>() + { + subclass.set_abc_collection_flags_recursive(flags); + } + } + } + /// Check for __abc_tpflags__ and set the appropriate flags /// This checks in attrs and all base classes for __abc_tpflags__ fn check_abc_tpflags( @@ -626,21 +681,19 @@ impl PyType { .to_owned(), ); } - // Don't override flags already inherited from a base class. - if !slots.flags.intersects(COLLECTION_FLAGS) { - slots.flags |= masked; - } + slots.flags.remove(COLLECTION_FLAGS); + slots.flags |= masked; return Ok(()); } - // No __abc_tpflags__ on this class — inheritance already happened - // in inherit_patma_flags, so nothing more to do if those bits are set. + // No __abc_tpflags__ on this class. Inheritance already happened in + // inherit_patma_flags, using base order and including ABC markers. if slots.flags.intersects(COLLECTION_FLAGS) { return Ok(()); } - // Then check in base classes (legacy path for cases that bypass - // inherit_patma_flags). + // Then check in base classes for legacy paths that bypassed + // inherit_patma_flags. for base in bases { if let Some(abc_tpflags_obj) = base.find_name_in_mro(abc_tpflags_name) && let Some(int_obj) = abc_tpflags_obj.downcast_ref::<crate::builtins::int::PyInt>() @@ -654,6 +707,7 @@ impl PyType { .to_owned(), ); } + slots.flags.remove(COLLECTION_FLAGS); slots.flags |= masked; return Ok(()); } @@ -716,6 +770,7 @@ impl PyType { )); } + let inherited_abc_tpflags = Self::inherited_abc_tpflags(&bases); let new_type = PyRef::new_ref( Self { base: Some(base), @@ -726,6 +781,7 @@ impl PyType { slots, heaptype_ext: Some(Pin::new(Box::new(heaptype_ext))), tp_version_tag: AtomicU32::new(0), + abc_tpflags: AtomicU64::new(inherited_abc_tpflags), }, metaclass, None, @@ -775,6 +831,7 @@ impl PyType { slots.flags |= PyTypeFlags::MANAGED_WEAKREF; } + let inherited_abc_tpflags = Self::inherited_abc_tpflags(core::slice::from_ref(&base)); let bases = PyRwLock::new(vec![base.clone()]); let mro = base.mro_map_collect(|x| x.to_owned()); @@ -788,6 +845,7 @@ impl PyType { slots, heaptype_ext: None, tp_version_tag: AtomicU32::new(0), + abc_tpflags: AtomicU64::new(inherited_abc_tpflags), }, metaclass, None, diff --git a/crates/vm/src/eval.rs b/crates/vm/src/eval.rs index 5f52799d0..5a3a80468 100644 --- a/crates/vm/src/eval.rs +++ b/crates/vm/src/eval.rs @@ -6,7 +6,7 @@ pub fn eval(vm: &VirtualMachine, source: &str, scope: Scope, source_path: &str) debug!("Code object: {bytecode:?}"); vm.run_code_obj(bytecode, scope) } - Err(err) => Err(vm.new_syntax_error(&err, Some(source))), + Err(err) => Err(err.into_pyexception(vm, Some(source))), } } diff --git a/crates/vm/src/exceptions.rs b/crates/vm/src/exceptions.rs index df22f4d82..1ad86a35a 100644 --- a/crates/vm/src/exceptions.rs +++ b/crates/vm/src/exceptions.rs @@ -2480,12 +2480,18 @@ pub(super) mod types { let maybe_lineno = zelf .as_object() .get_attr("lineno", vm) - .and_then(|obj| obj.str_utf8(vm)) - .ok(); - let maybe_filename = zelf.as_object().get_attr("filename", vm).ok().map(|obj| { - obj.str(vm) - .unwrap_or_else(|_| vm.ctx.new_str("<filename str() failed>")) - }); + .ok() + .filter(|obj| !vm.is_none(obj)) + .and_then(|obj| obj.str_utf8(vm).ok()); + let maybe_filename = zelf + .as_object() + .get_attr("filename", vm) + .ok() + .filter(|obj| !vm.is_none(obj)) + .map(|obj| { + obj.str(vm) + .unwrap_or_else(|_| vm.ctx.new_str("<filename str() failed>")) + }); let msg = match zelf.as_object().get_attr("msg", vm) { Ok(obj) => obj diff --git a/crates/vm/src/frame.rs b/crates/vm/src/frame.rs index 7050d8517..85b15aaac 100644 --- a/crates/vm/src/frame.rs +++ b/crates/vm/src/frame.rs @@ -3050,9 +3050,17 @@ impl ExecutingFrame<'_> { let subject = self.pop_value(); let nargs_val = nargs.get(arg) as usize; + let Some(cls_type) = cls.downcast_ref::<PyType>() else { + return Err(vm.new_type_error("called match pattern must be a class")); + }; + // Only the error paths need the class name; compute it lazily so a + // successful match does not take the name lock or allocate. + let type_name = || cls_type.name().to_string(); + // Check if subject is an instance of cls if subject.is_instance(cls.as_ref(), vm)? { let mut extracted = vec![]; + let seen_attrs = PySet::default().into_ref(&vm.ctx); // Get __match_args__ for positional arguments if nargs > 0 if nargs_val > 0 { @@ -3066,12 +3074,7 @@ impl ExecutingFrame<'_> { Ok(tuple) => tuple, Err(match_args) => { // __match_args__ must be a tuple - // Get type names for error message - let type_name = cls - .downcast::<crate::builtins::PyType>() - .ok() - .and_then(|t| t.__name__(vm).to_str().map(str::to_owned)) - .unwrap_or_else(|| String::from("?")); + let type_name = type_name(); let match_args_type_name = match_args.class().__name__(vm); return Err(vm.new_type_error(format!( "{type_name}.__match_args__ must be a tuple (got {match_args_type_name})" @@ -3081,9 +3084,12 @@ impl ExecutingFrame<'_> { // Check if we have enough match args if match_args.len() < nargs_val { + let type_name = type_name(); + let plural = if match_args.len() == 1 { "" } else { "s" }; return Err(vm.new_type_error(format!( - "class pattern accepts at most {} positional sub-patterns ({} given)", + "{type_name}() accepts {} positional sub-pattern{} ({} given)", match_args.len(), + plural, nargs_val ))); } @@ -3094,11 +3100,20 @@ impl ExecutingFrame<'_> { let attr_name_str = match attr_name.downcast_ref::<PyStr>() { Some(s) => s, None => { - return Err(vm.new_type_error( - "__match_args__ elements must be strings", - )); + let attr_type_name = attr_name.class().name(); + return Err(vm.new_type_error(format!( + "__match_args__ elements must be strings (got {attr_type_name})" + ))); } }; + if seen_attrs.__contains__(attr_name.as_object(), vm)? { + let type_name = type_name(); + let attr_repr = attr_name.as_object().repr(vm)?; + return Err(vm.new_type_error(format!( + "{type_name}() got multiple sub-patterns for attribute {attr_repr}" + ))); + } + seen_attrs.add(attr_name.clone(), vm)?; match subject.get_attr(attr_name_str, vm) { Ok(value) => extracted.push(value), Err(e) @@ -3115,9 +3130,8 @@ impl ExecutingFrame<'_> { // No __match_args__, check if this is a type with MATCH_SELF behavior // For built-in types like bool, int, str, list, tuple, dict, etc. // they match the subject itself as the single positional argument - let is_match_self_type = cls - .downcast::<PyType>() - .is_ok_and(|t| t.slots.flags.contains(PyTypeFlags::_MATCH_SELF)); + let is_match_self_type = + cls_type.slots.flags.contains(PyTypeFlags::_MATCH_SELF); if is_match_self_type { if nargs_val == 1 { @@ -3125,16 +3139,18 @@ impl ExecutingFrame<'_> { extracted.push(subject.clone()); } else if nargs_val > 1 { // Too many positional arguments for MATCH_SELF - return Err(vm.new_type_error( - "class pattern accepts at most 1 positional sub-pattern for MATCH_SELF types", - )); + let type_name = type_name(); + return Err(vm.new_type_error(format!( + "{type_name}() accepts 1 positional sub-pattern ({nargs_val} given)" + ))); } } else { // No __match_args__ and not a MATCH_SELF type if nargs_val > 0 { - return Err(vm.new_type_error( - "class pattern defines no positional sub-patterns (__match_args__ missing)", - )); + let type_name = type_name(); + return Err(vm.new_type_error(format!( + "{type_name}() accepts 0 positional sub-patterns ({nargs_val} given)" + ))); } } } @@ -3143,6 +3159,14 @@ impl ExecutingFrame<'_> { // Extract keyword attributes for name in kwd_attrs { let name_str = name.downcast_ref::<PyStr>().unwrap(); + if seen_attrs.__contains__(name_str.as_object(), vm)? { + let type_name = type_name(); + let attr_repr = name.as_object().repr(vm)?; + return Err(vm.new_type_error(format!( + "{type_name}() got multiple sub-patterns for attribute {attr_repr}" + ))); + } + seen_attrs.add(name.clone(), vm)?; match subject.get_attr(name_str, vm) { Ok(value) => extracted.push(value), Err(e) if e.fast_isinstance(vm.ctx.exceptions.attribute_error) => { @@ -3166,10 +3190,14 @@ impl ExecutingFrame<'_> { let subject = self.nth_value(1); // stack[-2] // Check if subject is a mapping and extract values for keys - if subject.class().slots.flags.contains(PyTypeFlags::MAPPING) { + if subject + .class() + .has_patma_collection_flag(PyTypeFlags::MAPPING) + { let keys = keys_tuple.downcast_ref::<PyTuple>().unwrap(); let mut values = Vec::new(); let mut all_match = true; + let seen_keys = PySet::default().into_ref(&vm.ctx); // We use the two argument form of map.get(key, default) for two reasons: // - Atomically check for a key and get its value without error handling. @@ -3186,6 +3214,13 @@ impl ExecutingFrame<'_> { .new_base_object(vm.ctx.types.object_type.to_owned(), None); for key in keys { + if seen_keys.__contains__(key.as_object(), vm)? { + return Err(vm.new_value_error(format!( + "mapping pattern checks duplicate key ({})", + key.as_object().repr(vm)? + ))); + } + seen_keys.add(key.as_object().to_owned(), vm)?; // value = map.get(key, dummy) match get_method.call((key.as_object(), dummy.clone()), vm) { Ok(value) => { @@ -3202,6 +3237,13 @@ impl ExecutingFrame<'_> { } else { // Fallback if .get() method is not available (shouldn't happen for mappings) for key in keys { + if seen_keys.__contains__(key.as_object(), vm)? { + return Err(vm.new_value_error(format!( + "mapping pattern checks duplicate key ({})", + key.as_object().repr(vm)? + ))); + } + seen_keys.add(key.as_object().to_owned(), vm)?; match subject.get_item(key.as_object(), vm) { Ok(value) => values.push(value), Err(e) if e.fast_isinstance(vm.ctx.exceptions.key_error) => { @@ -3231,7 +3273,9 @@ impl ExecutingFrame<'_> { let subject = self.pop_value(); // Check if the type has the MAPPING flag - let is_mapping = subject.class().slots.flags.contains(PyTypeFlags::MAPPING); + let is_mapping = subject + .class() + .has_patma_collection_flag(PyTypeFlags::MAPPING); self.push_value(subject); self.push_value(vm.ctx.new_bool(is_mapping).into()); @@ -3242,7 +3286,9 @@ impl ExecutingFrame<'_> { let subject = self.pop_value(); // Check if the type has the SEQUENCE flag - let is_sequence = subject.class().slots.flags.contains(PyTypeFlags::SEQUENCE); + let is_sequence = subject + .class() + .has_patma_collection_flag(PyTypeFlags::SEQUENCE); self.push_value(subject); self.push_value(vm.ctx.new_bool(is_sequence).into()); @@ -6845,7 +6891,7 @@ impl ExecutingFrame<'_> { } } - fn execute_unpack_ex(&mut self, vm: &VirtualMachine, before: u8, after: u8) -> FrameResult { + fn execute_unpack_ex(&mut self, vm: &VirtualMachine, before: u8, after: u32) -> FrameResult { let (before, after) = (before as usize, after as usize); let value = self.pop_value(); let not_iterable = value.class().slots.iter.load().is_none() diff --git a/crates/vm/src/import.rs b/crates/vm/src/import.rs index 5c418b35d..f7cc03d99 100644 --- a/crates/vm/src/import.rs +++ b/crates/vm/src/import.rs @@ -141,7 +141,7 @@ pub fn import_file( file_path, vm.compile_opts(), ) - .map_err(|err| vm.new_syntax_error(&err, Some(content)))?; + .map_err(|err| err.into_pyexception(vm, Some(content)))?; import_code_obj(vm, module_name, code, true) } @@ -154,7 +154,7 @@ pub fn import_source(vm: &VirtualMachine, module_name: &str, content: &str) -> P "<source>", vm.compile_opts(), ) - .map_err(|err| vm.new_syntax_error(&err, Some(content)))?; + .map_err(|err| err.into_pyexception(vm, Some(content)))?; import_code_obj(vm, module_name, code, false) } diff --git a/crates/vm/src/object/core.rs b/crates/vm/src/object/core.rs index 36bc0df0c..88ca646a4 100644 --- a/crates/vm/src/object/core.rs +++ b/crates/vm/src/object/core.rs @@ -2479,6 +2479,7 @@ pub(crate) fn init_type_hierarchy() -> (PyTypeRef, PyTypeRef, PyTypeRef) { slots: PyType::make_slots(), heaptype_ext: None, tp_version_tag: core::sync::atomic::AtomicU32::new(0), + abc_tpflags: core::sync::atomic::AtomicU64::new(0), }; let object_payload = PyType { base: None, @@ -2489,6 +2490,7 @@ pub(crate) fn init_type_hierarchy() -> (PyTypeRef, PyTypeRef, PyTypeRef) { slots: object::PyBaseObject::make_slots(), heaptype_ext: None, tp_version_tag: core::sync::atomic::AtomicU32::new(0), + abc_tpflags: core::sync::atomic::AtomicU64::new(0), }; // Both type_type and object_type are instances of `type`, which has // HAS_DICT and HAS_WEAKREF, so they need both ObjExt and WeakRefList prefixes. @@ -2585,6 +2587,7 @@ pub(crate) fn init_type_hierarchy() -> (PyTypeRef, PyTypeRef, PyTypeRef) { slots: PyWeak::make_slots(), heaptype_ext: None, tp_version_tag: core::sync::atomic::AtomicU32::new(0), + abc_tpflags: core::sync::atomic::AtomicU64::new(0), }; let weakref_type = PyRef::new_ref(weakref_type, type_type.clone(), None); // Static type: untrack from GC (was tracked by new_ref because PyType has HAS_TRAVERSE) diff --git a/crates/vm/src/protocol/callable.rs b/crates/vm/src/protocol/callable.rs index c9afbd5af..70e0a54dc 100644 --- a/crates/vm/src/protocol/callable.rs +++ b/crates/vm/src/protocol/callable.rs @@ -207,7 +207,7 @@ impl VirtualMachine { event: TraceEvent, arg: Option<PyObjectRef>, ) -> PyResult<Option<PyObjectRef>> { - if self.use_tracing.get() { + if self.use_tracing.get() && !self.tracing_is_suppressed() { self._trace_event_inner(event, arg) } else { Ok(None) @@ -247,7 +247,9 @@ impl VirtualMachine { // tracing function itself. if is_trace_event && !self.is_none(&trace_func) { self.use_tracing.set(false); + self.enter_tracing(); let res = trace_func.call(args.clone(), self); + self.leave_tracing(); self.use_tracing.set(true); match res { Ok(result) => { @@ -268,7 +270,9 @@ impl VirtualMachine { if is_profile_event && !self.is_none(&profile_func) { self.use_tracing.set(false); + self.enter_tracing(); let res = profile_func.call(args, self); + self.leave_tracing(); self.use_tracing.set(true); if res.is_err() { *self.profile_func.borrow_mut() = self.ctx.none(); diff --git a/crates/vm/src/stdlib/_abc.rs b/crates/vm/src/stdlib/_abc.rs index 6cdef8612..3b09fefaa 100644 --- a/crates/vm/src/stdlib/_abc.rs +++ b/crates/vm/src/stdlib/_abc.rs @@ -9,11 +9,11 @@ pub(crate) use _abc::module_def; mod _abc { use crate::{ AsObject, PyObject, PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine, - builtins::{PyFrozenSet, PyList, PySet, PyStr, PyTupleRef, PyTypeRef, PyWeak}, + builtins::{PyFrozenSet, PyList, PySet, PyStr, PyTupleRef, PyType, PyTypeRef, PyWeak}, common::lock::PyRwLock, convert::ToPyObject, protocol::PyIterReturn, - types::Constructor, + types::{Constructor, PyTypeFlags}, }; use core::sync::atomic::{AtomicU64, Ordering}; @@ -238,6 +238,23 @@ mod _abc { // Invalidate negative cache increment_invalidation_counter(); + if let Some(cls_type) = cls.downcast_ref::<PyType>() + && let Some(subclass_type) = subclass.downcast_ref::<PyType>() + { + // _abc_register propagates Py_TPFLAGS_SEQUENCE/MAPPING + // recursively so MATCH_SEQUENCE/MATCH_MAPPING see ABC registration. + let collection_mask = PyTypeFlags::SEQUENCE | PyTypeFlags::MAPPING; + let collection_flags = (cls_type.slots.flags + | PyTypeFlags::from_bits_truncate(cls_type.abc_tpflags.load(Ordering::Acquire))) + & collection_mask; + if !subclass_type.is(vm.ctx.types.str_type) + && !subclass_type.is(vm.ctx.types.bytes_type) + && !subclass_type.is(vm.ctx.types.bytearray_type) + { + subclass_type.set_abc_collection_flags_recursive(collection_flags); + } + } + Ok(subclass) } diff --git a/crates/vm/src/stdlib/_ast.rs b/crates/vm/src/stdlib/_ast.rs index 6bbbbefe5..f6ce6af86 100644 --- a/crates/vm/src/stdlib/_ast.rs +++ b/crates/vm/src/stdlib/_ast.rs @@ -9,13 +9,12 @@ pub(crate) use python::_ast::module_def; mod pyast; use crate::builtins::{PyInt, PyStr}; -use crate::stdlib::_ast::module::{Mod, ModFunctionType, ModInteractive}; +use crate::stdlib::_ast::module::{Mod, ModFunctionType, ModInteractive, ModModule}; use crate::stdlib::_ast::node::BoxedSlice; use crate::{ - AsObject, Context, Py, PyObject, PyObjectRef, PyPayload, PyRef, PyRefExact, PyResult, - TryFromObject, VirtualMachine, - builtins::PyIntRef, - builtins::{PyDict, PyModule, PyType, PyUtf8StrRef}, + AsObject, Context, Py, PyObject, PyObjectRef, PyPayload, PyRef, PyResult, TryFromObject, + VirtualMachine, + builtins::{PyDict, PyList, PyModule, PyTuple, PyType, PyUtf8StrRef}, class::{PyClassImpl, StaticType}, compiler::{CompileError, ParseError}, convert::ToPyObject, @@ -68,36 +67,65 @@ fn singleton_node_to_object(vm: &VirtualMachine, node_type: &'static Py<PyType>) .into() } +fn is_node_instance( + vm: &VirtualMachine, + object: &PyObjectRef, + node_type: &'static Py<PyType>, +) -> PyResult<bool> { + object.is_instance(node_type.as_object(), vm) +} + +fn is_ast_instance(vm: &VirtualMachine, object: &PyObjectRef) -> PyResult<bool> { + let ast_type = NodeAst::make_static_type(); + object.is_instance(ast_type.as_object(), vm) +} + fn get_node_field(vm: &VirtualMachine, obj: &PyObject, field: &'static str, typ: &str) -> PyResult { vm.get_attribute_opt(obj.to_owned(), field)? .ok_or_else(|| vm.new_type_error(format!(r#"required field "{field}" missing from {typ}"#))) } -/// Read a required scalar field, rejecting both attribute absence and `None` value -/// with CPython-compatible error messages. Pairs with `get_node_field_opt` (which -/// returns `Option::None` for the same conditions): both filter `None`, but diverge -/// on whether to raise or return `None`. -/// -/// Errors: -/// - Attribute absent: `TypeError("required field \"X\" missing from Y")` (via `get_node_field`). -/// - Attribute present but `None`: `ValueError("field 'X' is required for Y")`, -/// matching CPython's `Python/ast.c` validator output. -/// -/// Use for required scalar fields where `None` is invalid (e.g. `comprehension.target`, -/// `keyword.value`, `match_case.pattern`). Do NOT use for fields where `None` is -/// legitimate (e.g. `Constant.value` representing the `None` literal — use plain -/// `get_node_field`); or for optional fields (use `get_node_field_opt`). +/// Read a required scalar field. The generated `obj2ast_*` converters only +/// reject a missing required attribute here; if the field exists but is `None`, +/// the nested converter handles it. fn get_node_field_required( vm: &VirtualMachine, obj: &PyObject, field: &'static str, typ: &str, ) -> PyResult { - let value = get_node_field(vm, obj, field, typ)?; + get_node_field(vm, obj, field, typ) +} + +fn get_required_identifier_field<T: Node>( + vm: &VirtualMachine, + source_file: &SourceFile, + obj: &PyObject, + field: &'static str, + typ: &str, +) -> PyResult<T> { + let value = get_node_field_required(vm, obj, field, typ)?; if vm.is_none(&value) { return Err(vm.new_value_error(format!("field '{field}' is required for {typ}"))); } - Ok(value) + Node::ast_from_object(vm, source_file, value) +} + +fn get_required_node_field<T: Node>( + vm: &VirtualMachine, + source_file: &SourceFile, + obj: &PyObject, + field: &'static str, + typ: &str, +) -> PyResult<T> { + let value = get_node_field_required(vm, obj, field, typ)?; + if vm.is_none(&value) { + return Err(vm.new_value_error(format!("field '{field}' is required for {typ}"))); + } + let recursion_context = format!(" while traversing '{typ}' node"); + vm.with_recursion(&recursion_context, || { + Node::ast_from_object(vm, source_file, value) + }) } fn get_node_field_opt( @@ -110,15 +138,187 @@ fn get_node_field_opt( .filter(|obj| !vm.is_none(obj))) } +fn get_node_list_field<T: Node>( + vm: &VirtualMachine, + source_file: &SourceFile, + obj: &PyObject, + field: &'static str, + typ: &str, +) -> PyResult<Vec<T>> { + let value = get_node_list_field_object(vm, obj, field, typ)?; + let list = value.downcast_ref::<PyList>().unwrap(); + convert_node_list_field(vm, source_file, list, field, typ) +} + +fn get_node_list_field_object( + vm: &VirtualMachine, + obj: &PyObject, + field: &'static str, + typ: &str, +) -> PyResult<PyObjectRef> { + let Some(value) = vm.get_attribute_opt(obj.to_owned(), field)? else { + return Ok(vm.ctx.new_list(Vec::new()).into()); + }; + value.downcast_ref::<PyList>().ok_or_else(|| { + vm.new_type_error(format!( + r#"{typ} field "{field}" must be a list, not a {}"#, + value.class().name() + )) + })?; + Ok(value) +} + +fn convert_node_list_field<T: Node>( + vm: &VirtualMachine, + source_file: &SourceFile, + list: &PyList, + field: &'static str, + typ: &str, +) -> PyResult<Vec<T>> { + let len = list.borrow_vec().len(); + let mut result = Vec::with_capacity(len); + let recursion_context = format!(" while traversing '{typ}' node"); + for i in 0..len { + let item = { + let items = list.borrow_vec(); + if items.len() != len { + return Err(vm.new_runtime_error(format!( + r#"{typ} field "{field}" changed size during iteration"# + ))); + } + items[i].clone() + }; + result.push(vm.with_recursion(&recursion_context, || { + Node::ast_from_object(vm, source_file, item) + })?); + if list.borrow_vec().len() != len { + return Err(vm.new_runtime_error(format!( + r#"{typ} field "{field}" changed size during iteration"# + ))); + } + } + Ok(result) +} + +fn get_node_boxed_slice_field<T: Node>( + vm: &VirtualMachine, + source_file: &SourceFile, + obj: &PyObject, + field: &'static str, + typ: &str, +) -> PyResult<Box<[T]>> { + Ok(get_node_list_field(vm, source_file, obj, field, typ)?.into_boxed_slice()) +} + +fn runtime_expr_list_from_values( + values: Vec<Option<ast::Expr>>, +) -> (Option<Vec<Option<ast::Expr>>>, Vec<ast::Expr>) { + let metadata = runtime_expr_list_metadata(&values); + (metadata, lower_runtime_expr_list(values)) +} + +fn runtime_expr_boxed_slice_from_values( + values: Vec<Option<ast::Expr>>, +) -> (Option<Vec<Option<ast::Expr>>>, Box<[ast::Expr]>) { + let (metadata, values) = runtime_expr_list_from_values(values); + (metadata, values.into_boxed_slice()) +} + +fn runtime_expr_list_metadata(values: &[Option<ast::Expr>]) -> Option<Vec<Option<ast::Expr>>> { + values.iter().any(Option::is_none).then(|| values.to_vec()) +} + +fn runtime_stmt_list_from_values( + values: Vec<Option<ast::Stmt>>, +) -> (Option<Vec<Option<ast::Stmt>>>, ast::Suite) { + let metadata = runtime_stmt_list_metadata(&values); + (metadata, lower_runtime_stmt_list(values)) +} + +fn runtime_stmt_list_metadata(values: &[Option<ast::Stmt>]) -> Option<Vec<Option<ast::Stmt>>> { + values.iter().any(Option::is_none).then(|| values.to_vec()) +} + +fn runtime_except_handler_list_metadata( + values: &[Option<ast::ExceptHandler>], +) -> Option<Vec<Option<ast::ExceptHandler>>> { + values.iter().any(Option::is_none).then(|| values.to_vec()) +} + +fn lower_runtime_stmt_list(values: Vec<Option<ast::Stmt>>) -> ast::Suite { + values + .into_iter() + .map(|value| value.unwrap_or_else(runtime_null_stmt_placeholder)) + .collect() +} + +fn lower_runtime_expr_list(values: Vec<Option<ast::Expr>>) -> Vec<ast::Expr> { + values + .into_iter() + .map(|value| value.unwrap_or_else(runtime_null_expr_placeholder)) + .collect() +} + +fn runtime_null_stmt_placeholder() -> ast::Stmt { + ast::Stmt::Pass(ast::StmtPass { + range: Default::default(), + node_index: Default::default(), + }) +} + +fn runtime_null_expr_placeholder() -> ast::Expr { + ast::Expr::NoneLiteral(ast::ExprNoneLiteral { + range: Default::default(), + node_index: Default::default(), + }) +} + fn get_int_field( vm: &VirtualMachine, obj: &PyObject, field: &'static str, typ: &str, -) -> PyResult<PyRefExact<PyInt>> { - get_node_field(vm, obj, field, typ)? - .downcast_exact(vm) - .map_err(|_| vm.new_type_error(format!(r#"field "{field}" must have integer type"#))) +) -> PyResult<i32> { + node_object_to_i32(vm, get_node_field(vm, obj, field, typ)?) +} + +pub(super) fn node_object_to_i32(vm: &VirtualMachine, obj: PyObjectRef) -> PyResult<i32> { + if obj.is(&vm.ctx.true_value) { + return Ok(1); + } + if obj.is(&vm.ctx.false_value) { + return Ok(0); + } + let int: PyRef<PyInt> = match obj.clone().try_into_value(vm) { + Ok(int) => int, + Err(_) => { + return Err(vm.new_value_error(format!("invalid integer value: {}", obj.repr(vm)?))); + } + }; + i32::try_from(int.as_bigint()) + .map_err(|_| vm.new_overflow_error("Python int too large to convert to C int")) +} + +pub(super) fn node_object_to_ast_string( + vm: &VirtualMachine, + obj: PyObjectRef, +) -> PyResult<PyObjectRef> { + let cls = obj.class(); + if cls.is(vm.ctx.types.str_type) || cls.is(vm.ctx.types.bytes_type) { + Ok(obj) + } else { + Err(vm.new_type_error("AST string must be of type str or bytes")) + } +} + +fn get_ast_string_field_opt( + vm: &VirtualMachine, + obj: &PyObject, + field: &'static str, +) -> PyResult<Option<PyObjectRef>> { + get_node_field_opt(vm, obj, field)? + .map(|obj| node_object_to_ast_string(vm, obj)) + .transpose() } struct PySourceRange { @@ -188,7 +388,17 @@ fn text_range_to_source_range(source_file: &SourceFile, text_range: TextRange) - let start_row = index.line_index(text_range.start()); let end_row = index.line_index(text_range.end()); let start_col = text_range.start() - index.line_start(start_row, source); - let end_col = text_range.end() - index.line_start(end_row, source); + let (end_row, end_col) = { + let end_col = text_range.end() - index.line_start(end_row, source); + if end_col == TextSize::new(0) && end_row > start_row { + let prev_line_end = text_range.end() - TextSize::new(1); + let row = index.line_index(prev_line_end); + let col = prev_line_end - index.line_start(row, source) + TextSize::new(1); + (row, col) + } else { + (end_row, end_col) + } + }; PySourceRange { start: PySourceLocation { @@ -206,36 +416,411 @@ fn get_opt_int_field( vm: &VirtualMachine, obj: &PyObject, field: &'static str, -) -> PyResult<Option<PyRefExact<PyInt>>> { +) -> PyResult<Option<i32>> { match get_node_field_opt(vm, obj, field)? { - Some(val) => val - .downcast_exact(vm) - .map(Some) - .map_err(|_| vm.new_type_error(format!(r#"field "{field}" must have integer type"#))), + Some(val) => node_object_to_i32(vm, val).map(Some), None => Ok(None), } } +fn get_attribute_from_field( + vm: &VirtualMachine, + obj: &PyObjectRef, + field: PyObjectRef, +) -> PyResult<Option<PyObjectRef>> { + let field = field + .downcast::<PyStr>() + .map_err(|_| vm.new_type_error("attribute name must be string"))?; + vm.get_attribute_opt(obj.clone(), &field) +} + +#[derive(Default)] +struct AstSourceExtent { + max_line: usize, + max_col: usize, +} + +impl AstSourceExtent { + fn update_location(&mut self, vm: &VirtualMachine, obj: &PyObject) -> PyResult<()> { + if let Some(lineno) = get_opt_int_field(vm, obj, "lineno")? + && lineno > 0 + { + self.max_line = self.max_line.max(lineno as usize); + } + if let Some(end_lineno) = get_opt_int_field(vm, obj, "end_lineno")? + && end_lineno > 0 + { + self.max_line = self.max_line.max(end_lineno as usize); + } + if let Some(col_offset) = get_opt_int_field(vm, obj, "col_offset")? + && col_offset > 0 + { + self.max_col = self.max_col.max(col_offset as usize); + } + if let Some(end_col_offset) = get_opt_int_field(vm, obj, "end_col_offset")? + && end_col_offset > 0 + { + self.max_col = self.max_col.max(end_col_offset as usize); + } + Ok(()) + } +} + +fn scan_ast_source_extent( + vm: &VirtualMachine, + object: &PyObjectRef, + extent: &mut AstSourceExtent, +) -> PyResult<()> { + if is_ast_instance(vm, object)? { + extent.update_location(vm, object)?; + if let Some(fields) = object.class().get_attr(vm.ctx.intern_str("_fields")) { + let fields = fields.sequence_unchecked(); + let len = fields.length(vm)?; + for i in 0..len { + let field = fields.get_item(i as isize, vm)?; + if let Some(value) = get_attribute_from_field(vm, object, field)? { + vm.with_recursion(" while scanning AST node", || { + scan_ast_source_extent(vm, &value, extent) + })?; + } + } + } + } else if let Some(list) = object.downcast_ref::<PyList>() { + let items = list.borrow_vec().to_vec(); + for item in items { + vm.with_recursion(" while scanning AST node", || { + scan_ast_source_extent(vm, &item, extent) + })?; + } + } else if let Some(tuple) = object.downcast_ref::<PyTuple>() { + for item in tuple.as_slice() { + vm.with_recursion(" while scanning AST node", || { + scan_ast_source_extent(vm, item, extent) + })?; + } + } + Ok(()) +} + +fn copy_ast_passthrough_fields( + vm: &VirtualMachine, + source: &PyObjectRef, + target: &PyObjectRef, +) -> PyResult<()> { + if !is_ast_instance(vm, source)? + || !is_ast_instance(vm, target)? + || !source.is_instance(target.class().as_object(), vm)? + { + return Ok(()); + } + + let fields: &[&str] = + if is_node_instance(vm, target, pyast::NodeStmtFunctionDef::static_type())? + || is_node_instance(vm, target, pyast::NodeStmtAsyncFunctionDef::static_type())? + || is_node_instance(vm, target, pyast::NodeStmtAssign::static_type())? + || is_node_instance(vm, target, pyast::NodeStmtFor::static_type())? + || is_node_instance(vm, target, pyast::NodeStmtAsyncFor::static_type())? + || is_node_instance(vm, target, pyast::NodeStmtWith::static_type())? + || is_node_instance(vm, target, pyast::NodeStmtAsyncWith::static_type())? + || is_node_instance(vm, target, pyast::NodeArg::static_type())? + { + &["type_comment"] + } else if is_node_instance(vm, target, pyast::NodeComprehension::static_type())? { + &["is_async"] + } else if is_node_instance(vm, target, pyast::NodeExprConstant::static_type())? { + &["kind"] + } else if is_node_instance(vm, target, pyast::NodeExprInterpolation::static_type())? { + &["str"] + } else { + &[] + }; + + for field in fields { + if let Some(value) = vm.get_attribute_opt(source.clone(), *field)? { + target.set_attr(*field, value, vm)?; + } + } + + let Some(source_fields) = source.class().get_attr(vm.ctx.intern_str("_fields")) else { + return Ok(()); + }; + let Some(target_fields) = target.class().get_attr(vm.ctx.intern_str("_fields")) else { + return Ok(()); + }; + let source_fields = source_fields.sequence_unchecked(); + let target_fields = target_fields.sequence_unchecked(); + let len = source_fields.length(vm)?; + if len != target_fields.length(vm)? { + return Ok(()); + } + + for i in 0..len { + let source_field = source_fields.get_item(i as isize, vm)?; + let target_field = target_fields.get_item(i as isize, vm)?; + if !vm.bool_eq(&source_field, &target_field)? { + return Ok(()); + } + let Some(source_value) = get_attribute_from_field(vm, source, source_field)? else { + continue; + }; + let Some(target_value) = get_attribute_from_field(vm, target, target_field)? else { + continue; + }; + copy_ast_passthrough_children(vm, &source_value, &target_value)?; + } + + Ok(()) +} + +fn get_ast_location_field( + vm: &VirtualMachine, + object: &PyObjectRef, + field: &'static str, +) -> PyResult<Option<PyObjectRef>> { + Ok(vm + .get_attribute_opt(object.clone(), field)? + .filter(|value| !vm.is_none(value))) +} + +fn ast_start_location_matches( + vm: &VirtualMachine, + source: &PyObjectRef, + target: &PyObjectRef, +) -> PyResult<bool> { + for field in ["lineno", "col_offset"] { + let Some(source_value) = get_ast_location_field(vm, source, field)? else { + return Ok(false); + }; + let Some(target_value) = get_ast_location_field(vm, target, field)? else { + return Ok(false); + }; + if !vm.bool_eq(&source_value, &target_value)? { + return Ok(false); + } + } + + for field in ["end_lineno", "end_col_offset"] { + let Some(source_value) = get_ast_location_field(vm, source, field)? else { + continue; + }; + let Some(target_value) = get_ast_location_field(vm, target, field)? else { + continue; + }; + if !vm.bool_eq(&source_value, &target_value)? { + return Ok(false); + } + } + + Ok(true) +} + +fn ast_passthrough_location_candidate_matches( + vm: &VirtualMachine, + source: &PyObjectRef, + target: &PyObjectRef, +) -> PyResult<bool> { + Ok(is_ast_instance(vm, source)? + && is_ast_instance(vm, target)? + && source.is_instance(target.class().as_object(), vm)? + && ast_start_location_matches(vm, source, target)?) +} + +fn copy_ast_passthrough_list_items_by_location( + vm: &VirtualMachine, + source_items: &[PyObjectRef], + target_items: &[PyObjectRef], +) -> PyResult<()> { + let mut used_source_items = vec![false; source_items.len()]; + for target_item in target_items { + for (index, source_item) in source_items.iter().enumerate() { + if used_source_items[index] { + continue; + } + if ast_passthrough_location_candidate_matches(vm, source_item, target_item)? { + used_source_items[index] = true; + copy_ast_passthrough_fields(vm, source_item, target_item)?; + break; + } + } + } + Ok(()) +} + +fn copy_ast_passthrough_children( + vm: &VirtualMachine, + source: &PyObjectRef, + target: &PyObjectRef, +) -> PyResult<()> { + if is_ast_instance(vm, source)? && is_ast_instance(vm, target)? { + return copy_ast_passthrough_fields(vm, source, target); + } + + if let (Some(source_list), Some(target_list)) = ( + source.downcast_ref::<PyList>(), + target.downcast_ref::<PyList>(), + ) { + let source_items = source_list.borrow_vec().to_vec(); + let target_items = target_list.borrow_vec().to_vec(); + if source_items.len() == target_items.len() { + for (source_item, target_item) in source_items.iter().zip(target_items.iter()) { + copy_ast_passthrough_children(vm, source_item, target_item)?; + } + } else { + copy_ast_passthrough_list_items_by_location(vm, &source_items, &target_items)?; + } + } else if let (Some(source_tuple), Some(target_tuple)) = ( + source.downcast_ref::<PyTuple>(), + target.downcast_ref::<PyTuple>(), + ) && source_tuple.as_slice().len() == target_tuple.as_slice().len() + { + for (source_item, target_item) in source_tuple + .as_slice() + .iter() + .zip(target_tuple.as_slice().iter()) + { + copy_ast_passthrough_children(vm, source_item, target_item)?; + } + } + + Ok(()) +} + +fn synthetic_source_from_ast_object(vm: &VirtualMachine, object: &PyObjectRef) -> PyResult<String> { + let mut extent = AstSourceExtent::default(); + scan_ast_source_extent(vm, object, &mut extent)?; + if extent.max_line == 0 { + return Ok(String::new()); + } + + let line_len = extent.max_col.saturating_add(1); + let line_width = line_len + .checked_add(1) + .ok_or_else(|| vm.new_memory_error("source location is too large"))?; + let capacity = line_width + .checked_mul(extent.max_line) + .ok_or_else(|| vm.new_memory_error("source location is too large"))?; + let mut source = String::new(); + source + .try_reserve(capacity) + .map_err(|_| vm.new_memory_error("source location is too large"))?; + + for _ in 0..extent.max_line { + source.extend(core::iter::repeat_n(' ', line_len)); + source.push('\n'); + } + Ok(source) +} + fn range_from_object( vm: &VirtualMachine, source_file: &SourceFile, object: PyObjectRef, name: &str, +) -> PyResult<TextRange> { + range_from_object_impl(vm, source_file, object, name, false) +} + +fn type_param_range_from_object( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, +) -> PyResult<TextRange> { + range_from_object_impl(vm, source_file, object, "type_param", true) +} + +fn expr_range_from_object( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, +) -> PyResult<TextRange> { + range_from_object_impl(vm, source_file, object, "expr", false) +} + +fn stmt_range_from_object( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, +) -> PyResult<TextRange> { + range_from_object_impl(vm, source_file, object, "stmt", false) +} + +fn pattern_range_from_object( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, +) -> PyResult<TextRange> { + range_from_object_impl(vm, source_file, object, "pattern", true) +} + +fn excepthandler_range_from_object( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, +) -> PyResult<TextRange> { + range_from_object_impl(vm, source_file, object, "excepthandler", false) +} + +fn excepthandler_range_from_object_unvalidated( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, +) -> PyResult<TextRange> { + let start_row = get_int_field(vm, &object, "lineno", "excepthandler")?; + let start_column = get_int_field(vm, &object, "col_offset", "excepthandler")?; + let end_row = get_opt_int_field(vm, &object, "end_lineno")?.unwrap_or(start_row); + let end_column = get_opt_int_field(vm, &object, "end_col_offset")?.unwrap_or(start_column); + + let location = PySourceRange { + start: PySourceLocation { + row: Row(if start_row > 0 { + OneIndexed::new(start_row as usize).unwrap_or(OneIndexed::MIN) + } else { + OneIndexed::MIN + }), + column: Column(TextSize::new(start_column.max(0) as u32)), + }, + end: PySourceLocation { + row: Row(if end_row > 0 { + OneIndexed::new(end_row as usize).unwrap_or(OneIndexed::MIN) + } else { + OneIndexed::MIN + }), + column: Column(TextSize::new(end_column.max(0) as u32)), + }, + }; + + Ok(source_range_to_text_range_unvalidated( + source_file, + location, + )) +} + +fn range_from_object_impl( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + name: &str, + end_required: bool, ) -> PyResult<TextRange> { let start_row = get_int_field(vm, &object, "lineno", name)?; let start_column = get_int_field(vm, &object, "col_offset", name)?; - // end_lineno and end_col_offset are optional, default to start values - let end_row = - get_opt_int_field(vm, &object, "end_lineno")?.unwrap_or_else(|| start_row.clone()); - let end_column = - get_opt_int_field(vm, &object, "end_col_offset")?.unwrap_or_else(|| start_column.clone()); + let end_row = if end_required { + get_int_field(vm, &object, "end_lineno", name)? + } else { + get_opt_int_field(vm, &object, "end_lineno")?.unwrap_or(start_row) + }; + let end_column = if end_required { + get_int_field(vm, &object, "end_col_offset", name)? + } else { + get_opt_int_field(vm, &object, "end_col_offset")?.unwrap_or(start_column) + }; // lineno=0 or negative values as a special case (no location info). // Use default values (line 1, col 0) when lineno <= 0. - let start_row_val: i32 = start_row.try_to_primitive(vm)?; - let end_row_val: i32 = end_row.try_to_primitive(vm)?; - let start_col_val: i32 = start_column.try_to_primitive(vm)?; - let end_col_val: i32 = end_column.try_to_primitive(vm)?; + let start_row_val = start_row; + let end_row_val = end_row; + let start_col_val = start_column; + let end_col_val = end_column; if start_row_val > end_row_val { return Err(vm.new_value_error(format!( @@ -299,6 +884,35 @@ fn source_range_to_text_range(source_file: &SourceFile, location: PySourceRange) TextRange::new(start, end) } +fn source_range_to_text_range_unvalidated( + source_file: &SourceFile, + location: PySourceRange, +) -> TextRange { + let index = LineIndex::from_source_text(source_file.clone().source_text()); + let source = &source_file.source_text(); + + if source.is_empty() { + return TextRange::new(TextSize::new(0), TextSize::new(0)); + } + + let start = index.offset( + location.start.to_source_location(), + source, + PositionEncoding::Utf8, + ); + let end = index.offset( + location.end.to_source_location(), + source, + PositionEncoding::Utf8, + ); + + if start <= end { + TextRange::new(start, end) + } else { + TextRange::empty(start) + } +} + fn node_add_location( dict: &Py<PyDict>, range: TextRange, @@ -324,7 +938,11 @@ fn node_add_location( .unwrap(); } -/// Return the expected AST mod type class for a compile() mode string. +/// Return the expected Python AST root type class for a compile() mode string. +/// +/// builtin compile() accepts func_type only with PyCF_ONLY_AST. +/// Source-string func_type parsing is handled separately, but Python AST +/// FunctionType still uses the mode check before obj-to-AST conversion. pub(crate) fn mode_type_and_name(mode: &str) -> Option<(PyRef<PyType>, &'static str)> { match mode { "exec" => Some((pyast::NodeModModule::make_static_type(), "Module")), @@ -338,6 +956,820 @@ pub(crate) fn mode_type_and_name(mode: &str) -> Option<(PyRef<PyType>, &'static } } +struct TypeCommentLine<'a> { + text: &'a str, + comment_start: Option<usize>, +} + +struct TypeCommentSource<'a> { + lines: Vec<TypeCommentLine<'a>>, +} + +impl<'a> TypeCommentSource<'a> { + fn new(source: &'a str, tokens: &ast::token::Tokens) -> Self { + let mut comment_offsets = Vec::new(); + for token in tokens { + if matches!(token.kind(), ast::token::TokenKind::Comment) { + comment_offsets.push(token.start().to_usize()); + } + } + + let mut comment_offsets = comment_offsets.into_iter().peekable(); + let mut line_start = 0usize; + let mut lines = Vec::new(); + for line in source.split_inclusive('\n') { + let line_end = line_start + line.len(); + let comment_start = comment_offsets.next_if(|offset| *offset < line_end); + lines.push(TypeCommentLine { + text: line, + comment_start: comment_start.map(|offset| offset - line_start), + }); + line_start = line_end; + } + + Self { lines } + } +} + +fn type_comment_position(line: &TypeCommentLine<'_>) -> Option<usize> { + let comment = line.comment_start?; + line.text[comment + 1..] + .trim_start() + .starts_with("type:") + .then_some(comment) +} + +fn type_comment_text<'a>(line: &'a TypeCommentLine<'a>) -> Option<&'a str> { + let comment = line.comment_start?; + let text = line.text.trim_end_matches(['\n', '\r']); + let mut rest = text[comment + 1..].trim_start_matches([' ', '\t']); + rest = rest.strip_prefix("type:")?; + Some(rest.trim_start_matches([' ', '\t'])) +} + +fn type_ignore_tag(comment: &str) -> Option<&str> { + let rest = comment.strip_prefix("ignore")?; + if let Some(next) = rest.as_bytes().first() + && (next.is_ascii_alphanumeric() || !next.is_ascii()) + { + return None; + } + Some(rest) +} + +fn regular_type_comment_text<'a>(line: &'a TypeCommentLine<'a>) -> Option<&'a str> { + let comment = type_comment_text(line)?; + type_ignore_tag(comment).is_none().then_some(comment) +} + +fn type_comment_parse_error( + source_file: &SourceFile, + message: &str, + start: usize, + end: usize, +) -> CompileError { + let range = TextRange::new(TextSize::new(start as u32), TextSize::new(end as u32)); + let source_range = text_range_to_source_range(source_file, range); + ParseError { + error: parser::ParseErrorType::OtherError(message.to_owned()), + raw_location: range, + location: source_range.start.to_source_location(), + end_location: source_range.end.to_source_location(), + source_path: "<unknown>".to_string(), + is_unclosed_bracket: false, + } + .into() +} + +#[cfg(feature = "codegen")] +fn future_feature_compile_error( + source_file: &SourceFile, + error: codegen::preprocess::FutureFeatureError, +) -> CompileError { + let location = source_file + .to_source_code() + .source_location(error.range.start(), PositionEncoding::Utf8); + let error = match error.kind { + codegen::preprocess::FutureFeatureErrorKind::InvalidFeature(feature) => { + codegen::error::CodegenErrorType::InvalidFutureFeature(feature) + } + codegen::preprocess::FutureFeatureErrorKind::InvalidBraces => { + codegen::error::CodegenErrorType::InvalidFutureBraces + } + }; + codegen::error::CodegenError { + location: Some(location), + error, + source_path: source_file.name().to_owned(), + } + .into() +} + +fn trimmed_line_end(line: &str) -> usize { + line.trim_end_matches(['\n', '\r']).len() +} + +fn line_end_error( + source_file: &SourceFile, + message: &str, + line_start: usize, + line: &str, +) -> CompileError { + let start = line_start + trimmed_line_end(line); + type_comment_parse_error(source_file, message, start, start + 1) +} + +fn point_error_end(source: &str, start: usize) -> usize { + match source.as_bytes().get(start) { + None => start, + Some(_) => start + 1, + } +} + +fn line_after_colon_error( + source_file: &SourceFile, + message: &str, + line_start: usize, + line: &str, +) -> Option<CompileError> { + let code = &line[..trimmed_line_end(line)]; + let colon = code.rfind(':')?; + (!code[colon + 1..].trim().is_empty()) + .then(|| line_end_error(source_file, message, line_start, line)) +} + +fn find_line_containing_offset(source: &str, offset: usize) -> Option<(usize, &str)> { + let mut line_start = 0usize; + for line in source.split_inclusive('\n') { + let line_end = line_start + line.len(); + if offset < line_end { + return Some((line_start, line)); + } + line_start = line_end; + } + (offset == source.len()).then_some((line_start, "")) +} + +fn find_next_nonempty_line_end(source: &str, offset: usize) -> Option<usize> { + let (mut line_start, line) = find_line_containing_offset(source, offset)?; + line_start += line.len(); + for line in source[line_start..].split_inclusive('\n') { + if !line.trim().is_empty() { + return Some(line_start + trimmed_line_end(line)); + } + line_start += line.len(); + } + None +} + +fn find_numeric_literal_containing_underscore(code: &str) -> Option<(usize, usize)> { + let bytes = code.as_bytes(); + for idx in 1..bytes.len().saturating_sub(1) { + if bytes[idx] == b'_' && bytes[idx - 1].is_ascii_digit() && bytes[idx + 1].is_ascii_digit() + { + let mut start = idx - 1; + while start > 0 + && (bytes[start - 1].is_ascii_alphanumeric() || bytes[start - 1] == b'_') + { + start -= 1; + } + let mut end = idx + 2; + while end < bytes.len() && (bytes[end].is_ascii_alphanumeric() || bytes[end] == b'_') { + end += 1; + } + return Some((start, end)); + } + } + None +} + +fn bracket_delta(code: &str) -> i32 { + code.chars().fold(0, |depth, ch| match ch { + '(' | '[' | '{' => depth + 1, + ')' | ']' | '}' => depth - 1, + _ => depth, + }) +} + +fn def_header_complete(code: &str, depth: i32) -> bool { + depth <= 0 && code.trim_end().ends_with(':') +} + +fn is_assignment_stmt_line(code: &str) -> bool { + let bytes = code.as_bytes(); + for (idx, byte) in bytes.iter().enumerate() { + if *byte != b'=' { + continue; + } + let prev = idx.checked_sub(1).and_then(|idx| bytes.get(idx)).copied(); + let next = bytes.get(idx + 1).copied(); + if matches!( + prev, + Some( + b'=' | b'!' + | b'<' + | b'>' + | b':' + | b'+' + | b'-' + | b'*' + | b'/' + | b'%' + | b'&' + | b'|' + | b'^' + ) + ) || matches!(next, Some(b'=')) + { + continue; + } + return true; + } + false +} + +fn line_allows_stmt_type_comment(code: &str) -> bool { + let stripped = code.trim_start(); + (stripped.starts_with("for ") || stripped.starts_with("async for ")) && stripped.ends_with(':') + || (stripped.starts_with("with ") || stripped.starts_with("async with ")) + && stripped.ends_with(':') + || is_assignment_stmt_line(code) +} + +fn invalid_type_comment_syntax_error( + source_file: &SourceFile, + type_comment_source: &TypeCommentSource<'_>, +) -> Option<CompileError> { + let mut line_start = 0usize; + let mut in_def_header = false; + let mut def_depth = 0i32; + let mut pending_func_type_comment = false; + let mut previous_def_had_type_comment = false; + for line in &type_comment_source.lines { + let line_end = line_start + line.text.len(); + let stripped = line.text.trim_start(); + let code_end = type_comment_position(line).unwrap_or(line.text.len()); + let code = line.text[..code_end].trim(); + let has_regular_type_comment = regular_type_comment_text(line).is_some(); + + if let Some(comment) = type_comment_position(line) { + if code == "*" || code == "*," || code.ends_with("*,") { + return Some(type_comment_parse_error( + source_file, + "bare * has associated type comment", + line_start + comment, + line_start + line.text.len(), + )); + } + if previous_def_had_type_comment && code.is_empty() { + return Some(type_comment_parse_error( + source_file, + "Cannot have two type comments on def", + line_start + comment, + line_start + line.text.len(), + )); + } + let allowed = !has_regular_type_comment + || in_def_header + || line_allows_stmt_type_comment(code) + || stripped.starts_with("def ") + || stripped.starts_with("async def ") + || (pending_func_type_comment && code.is_empty()); + if !allowed { + return Some(type_comment_parse_error( + source_file, + "invalid syntax", + line_start + comment, + line_start + line.text.len(), + )); + } + } + + let starts_def = stripped.starts_with("def ") || stripped.starts_with("async def "); + if starts_def && !in_def_header { + def_depth = bracket_delta(code); + let complete = def_header_complete(code, def_depth); + in_def_header = !complete; + previous_def_had_type_comment = complete && has_regular_type_comment; + pending_func_type_comment = complete && !has_regular_type_comment; + } else if in_def_header { + def_depth += bracket_delta(code); + let complete = def_header_complete(code, def_depth); + if complete { + in_def_header = false; + previous_def_had_type_comment = has_regular_type_comment; + pending_func_type_comment = !has_regular_type_comment; + } + } else if (pending_func_type_comment && code.is_empty() && has_regular_type_comment) + || (!stripped.trim().is_empty() && !starts_def && !code.is_empty()) + { + pending_func_type_comment = false; + previous_def_had_type_comment = false; + } + + line_start = line_end; + } + None +} + +fn feature_version_syntax_error( + source: &str, + source_file: &SourceFile, + target_version: ast::PythonVersion, +) -> Option<CompileError> { + let mut line_start = 0usize; + let mut async_def_error = None; + let mut pending_async_def = false; + let mut pending_block_error = None; + for line in source.split_inclusive('\n') { + let code_end = line.find('#').unwrap_or(line.len()); + let code = &line[..code_end]; + let stripped = code.trim_start(); + if pending_async_def && !stripped.trim().is_empty() { + if async_def_error.is_none() { + async_def_error = Some(line_end_error( + source_file, + "Async functions are only supported in Python 3.5 and greater", + line_start, + line, + )); + } + pending_async_def = false; + } + if let Some(message) = pending_block_error.take() { + if !stripped.trim().is_empty() { + return Some(line_end_error(source_file, message, line_start, line)); + } + pending_block_error = Some(message); + } + + if target_version.minor < 5 { + if stripped.starts_with("async def ") && async_def_error.is_none() { + let message = "Async functions are only supported in Python 3.5 and greater"; + if let Some(error) = line_after_colon_error(source_file, message, line_start, line) + { + async_def_error = Some(error); + } else { + pending_async_def = true; + } + } + if stripped.starts_with("async for ") { + let message = "Async for loops are only supported in Python 3.5 and greater"; + if let Some(error) = line_after_colon_error(source_file, message, line_start, line) + { + return Some(error); + } + pending_block_error = Some(message); + } + if stripped.starts_with("async with ") { + let message = "Async with statements are only supported in Python 3.5 and greater"; + if let Some(error) = line_after_colon_error(source_file, message, line_start, line) + { + return Some(error); + } + pending_block_error = Some(message); + } + if stripped.starts_with("await ") { + return Some(line_end_error( + source_file, + "Await expressions are only supported in Python 3.5 and greater", + line_start, + line, + )); + } + if let Some(pos) = code.find('@') + && !stripped.starts_with('@') + { + let is_augassign = code.as_bytes().get(pos + 1) == Some(&b'='); + let (start, end) = if is_augassign { + (line_start + pos, line_start + pos + 2) + } else { + let start = line_start + trimmed_line_end(line); + (start, start + 1) + }; + return Some(type_comment_parse_error( + source_file, + "The '@' operator is only supported in Python 3.5 and greater", + start, + end, + )); + } + } + + if target_version.minor < 6 { + if !stripped.starts_with("async for ") && code.contains(" async for ") { + let start = line_start + trimmed_line_end(line).saturating_sub(1); + return Some(type_comment_parse_error( + source_file, + "Async comprehensions are only supported in Python 3.6 and greater", + start, + point_error_end(source_file.source_text(), start), + )); + } + if let Some((start, end)) = find_numeric_literal_containing_underscore(code) { + return Some(type_comment_parse_error( + source_file, + "Underscores in numeric literals are only supported in Python 3.6 and greater", + line_start + start, + line_start + end, + )); + } + } + + line_start += line.len(); + } + async_def_error +} + +fn ann_assign_feature_error(stmts: &[ast::Stmt], source_file: &SourceFile) -> Option<CompileError> { + for stmt in stmts { + match stmt { + ast::Stmt::AnnAssign(ann) => { + let start = ann.range().end().to_usize(); + return Some(type_comment_parse_error( + source_file, + "Variable annotation syntax is only supported in Python 3.6 and greater", + start, + point_error_end(source_file.source_text(), start), + )); + } + ast::Stmt::FunctionDef(def) => { + if let Some(error) = ann_assign_feature_error(&def.body, source_file) { + return Some(error); + } + } + ast::Stmt::ClassDef(class_def) => { + if let Some(error) = ann_assign_feature_error(&class_def.body, source_file) { + return Some(error); + } + } + ast::Stmt::For(for_stmt) => { + if let Some(error) = ann_assign_feature_error(&for_stmt.body, source_file) + .or_else(|| ann_assign_feature_error(&for_stmt.orelse, source_file)) + { + return Some(error); + } + } + ast::Stmt::While(while_stmt) => { + if let Some(error) = ann_assign_feature_error(&while_stmt.body, source_file) + .or_else(|| ann_assign_feature_error(&while_stmt.orelse, source_file)) + { + return Some(error); + } + } + ast::Stmt::If(if_stmt) => { + if let Some(error) = ann_assign_feature_error(&if_stmt.body, source_file) { + return Some(error); + } + for clause in &if_stmt.elif_else_clauses { + if let Some(error) = ann_assign_feature_error(&clause.body, source_file) { + return Some(error); + } + } + } + ast::Stmt::With(with_stmt) => { + if let Some(error) = ann_assign_feature_error(&with_stmt.body, source_file) { + return Some(error); + } + } + ast::Stmt::Match(match_stmt) => { + for case in &match_stmt.cases { + if let Some(error) = ann_assign_feature_error(&case.body, source_file) { + return Some(error); + } + } + } + ast::Stmt::Try(try_stmt) => { + if let Some(error) = ann_assign_feature_error(&try_stmt.body, source_file) + .or_else(|| ann_assign_feature_error(&try_stmt.orelse, source_file)) + .or_else(|| ann_assign_feature_error(&try_stmt.finalbody, source_file)) + { + return Some(error); + } + for handler in &try_stmt.handlers { + let ast::ExceptHandler::ExceptHandler(handler) = handler; + if let Some(error) = ann_assign_feature_error(&handler.body, source_file) { + return Some(error); + } + } + } + _ => {} + } + } + None +} + +fn feature_version_ast_syntax_error( + top: &ast::Mod, + source_file: &SourceFile, + target_version: ast::PythonVersion, +) -> Option<CompileError> { + if target_version.minor >= 6 { + return None; + } + match top { + ast::Mod::Module(module) => ann_assign_feature_error(&module.body, source_file), + ast::Mod::Expression(_) => None, + } +} + +fn cpython_unsupported_syntax_message( + error: &parser::UnsupportedSyntaxError, +) -> Option<&'static str> { + match error.kind { + parser::UnsupportedSyntaxErrorKind::Match => { + Some("Pattern matching is only supported in Python 3.10 and greater") + } + parser::UnsupportedSyntaxErrorKind::Walrus => { + Some("Assignment expressions are only supported in Python 3.8 and greater") + } + parser::UnsupportedSyntaxErrorKind::ExceptStar => { + Some("Exception groups are only supported in Python 3.11 and greater") + } + parser::UnsupportedSyntaxErrorKind::PositionalOnlyParameter => { + Some("Positional-only parameters are only supported in Python 3.8 and greater") + } + parser::UnsupportedSyntaxErrorKind::TypeParameterList => { + Some("Type parameter lists are only supported in Python 3.12 and greater") + } + parser::UnsupportedSyntaxErrorKind::TypeAliasStatement => { + Some("Type statement is only supported in Python 3.12 and greater") + } + parser::UnsupportedSyntaxErrorKind::TypeParamDefault => { + Some("Type parameter defaults are only supported in Python 3.13 and greater") + } + parser::UnsupportedSyntaxErrorKind::TemplateStrings => { + Some("t-strings are only supported in Python 3.14 and greater") + } + parser::UnsupportedSyntaxErrorKind::UnparenthesizedExceptionTypes => Some( + "except expressions without parentheses are only supported in Python 3.14 and greater", + ), + _ => None, + } +} + +fn cpython_unsupported_syntax_error( + error: &parser::UnsupportedSyntaxError, + source: &str, + source_file: &SourceFile, +) -> Option<CompileError> { + let message = cpython_unsupported_syntax_message(error)?; + let start = match error.kind { + parser::UnsupportedSyntaxErrorKind::Match + | parser::UnsupportedSyntaxErrorKind::ExceptStar + | parser::UnsupportedSyntaxErrorKind::UnparenthesizedExceptionTypes => { + find_next_nonempty_line_end(source, error.range.start().to_usize()) + .unwrap_or_else(|| error.range.end().to_usize()) + } + parser::UnsupportedSyntaxErrorKind::Walrus + | parser::UnsupportedSyntaxErrorKind::PositionalOnlyParameter + | parser::UnsupportedSyntaxErrorKind::TypeParamDefault => error.range.end().to_usize(), + parser::UnsupportedSyntaxErrorKind::TypeAliasStatement => { + let (line_start, line) = + find_line_containing_offset(source, error.range.start().to_usize())?; + line_start + trimmed_line_end(line) + } + parser::UnsupportedSyntaxErrorKind::TypeParameterList => { + let (line_start, line) = + find_line_containing_offset(source, error.range.start().to_usize())?; + let code = &line[..trimmed_line_end(line)]; + line_start + + code + .as_bytes() + .iter() + .rposition(|byte| *byte == b']') + .unwrap_or_else(|| error.range.end().to_usize() - line_start) + } + parser::UnsupportedSyntaxErrorKind::TemplateStrings => { + let (line_start, line) = + find_line_containing_offset(source, error.range.start().to_usize())?; + line_start + trimmed_line_end(line).saturating_sub(1) + } + _ => error.range.start().to_usize(), + }; + Some(type_comment_parse_error( + source_file, + message, + start, + point_error_end(source, start), + )) +} + +fn should_report_unsupported_syntax_error(error: &parser::UnsupportedSyntaxError) -> bool { + cpython_unsupported_syntax_message(error).is_some() + || matches!( + error.kind, + parser::UnsupportedSyntaxErrorKind::LazyImportStatement + | parser::UnsupportedSyntaxErrorKind::ParenthesizedKeywordArgumentName + ) +} + +fn node_list_field( + vm: &VirtualMachine, + object: &PyObjectRef, + field: &'static str, +) -> Vec<PyObjectRef> { + vm.get_attribute_opt(object.clone(), field) + .ok() + .flatten() + .and_then(|value| { + value + .downcast_ref::<PyList>() + .map(|list| list.borrow_vec().to_vec()) + }) + .unwrap_or_default() +} + +fn node_optional_field( + vm: &VirtualMachine, + object: &PyObjectRef, + field: &'static str, +) -> Option<PyObjectRef> { + vm.get_attribute_opt(object.clone(), field) + .ok() + .flatten() + .filter(|value| !vm.is_none(value)) +} + +fn node_lineno(vm: &VirtualMachine, object: &PyObjectRef) -> Option<usize> { + node_optional_field(vm, object, "lineno")? + .try_into_value(vm) + .ok() +} + +fn source_line<'a>( + lines: &'a TypeCommentSource<'a>, + lineno: usize, +) -> Option<&'a TypeCommentLine<'a>> { + lineno.checked_sub(1).and_then(|idx| lines.lines.get(idx)) +} + +fn set_type_comment(vm: &VirtualMachine, object: &PyObjectRef, comment: Option<&str>) { + let value = comment.map_or_else(|| vm.ctx.none(), |comment| vm.ctx.new_str(comment).into()); + object + .as_object() + .dict() + .unwrap() + .set_item("type_comment", value, vm) + .unwrap(); +} + +fn same_line_type_comment<'a>( + vm: &VirtualMachine, + lines: &'a TypeCommentSource<'a>, + object: &PyObjectRef, +) -> Option<&'a str> { + let lineno = node_lineno(vm, object)?; + regular_type_comment_text(source_line(lines, lineno)?) +} + +fn function_type_comment<'a>( + vm: &VirtualMachine, + lines: &'a TypeCommentSource<'a>, + object: &PyObjectRef, +) -> Option<&'a str> { + let lineno = node_lineno(vm, object)?; + if let Some(comment) = regular_type_comment_text(source_line(lines, lineno)?) { + return Some(comment); + } + + let next_line = source_line(lines, lineno + 1)?; + let comment_pos = type_comment_position(next_line)?; + next_line.text[..comment_pos] + .trim() + .is_empty() + .then(|| regular_type_comment_text(next_line)) + .flatten() +} + +fn apply_type_comments_to_arguments( + vm: &VirtualMachine, + lines: &TypeCommentSource<'_>, + arguments: &PyObjectRef, +) { + for field in ["posonlyargs", "args", "kwonlyargs"] { + for arg in node_list_field(vm, arguments, field) { + set_type_comment(vm, &arg, same_line_type_comment(vm, lines, &arg)); + } + } + for field in ["vararg", "kwarg"] { + if let Some(arg) = node_optional_field(vm, arguments, field) { + set_type_comment(vm, &arg, same_line_type_comment(vm, lines, &arg)); + } + } +} + +fn apply_type_comments_to_node( + vm: &VirtualMachine, + lines: &TypeCommentSource<'_>, + object: &PyObjectRef, +) { + let cls = object.class(); + if cls.is(pyast::NodeStmtFunctionDef::static_type()) + || cls.is(pyast::NodeStmtAsyncFunctionDef::static_type()) + { + set_type_comment(vm, object, function_type_comment(vm, lines, object)); + if let Some(arguments) = node_optional_field(vm, object, "args") { + apply_type_comments_to_arguments(vm, lines, &arguments); + } + } else if cls.is(pyast::NodeStmtAssign::static_type()) + || cls.is(pyast::NodeStmtFor::static_type()) + || cls.is(pyast::NodeStmtAsyncFor::static_type()) + || cls.is(pyast::NodeStmtWith::static_type()) + || cls.is(pyast::NodeStmtAsyncWith::static_type()) + { + set_type_comment(vm, object, same_line_type_comment(vm, lines, object)); + } + + for field in ["body", "orelse", "finalbody"] { + for child in node_list_field(vm, object, field) { + apply_type_comments_to_node(vm, lines, &child); + } + } + for field in ["handlers", "cases"] { + for child in node_list_field(vm, object, field) { + apply_type_comments_to_node(vm, lines, &child); + } + } +} + +fn apply_type_comments_to_module( + vm: &VirtualMachine, + lines: &TypeCommentSource<'_>, + module: &PyObjectRef, +) { + for statement in node_list_field(vm, module, "body") { + apply_type_comments_to_node(vm, lines, &statement); + } +} + +#[cfg(feature = "parser")] +fn ipython_escape_command_syntax_error( + top: &ast::Mod, + source_file: &SourceFile, +) -> Option<CompileError> { + use ast::visitor::{Visitor, walk_expr, walk_stmt}; + + #[derive(Default)] + struct IpyEscapeCommandVisitor { + range: Option<TextRange>, + } + + impl Visitor<'_> for IpyEscapeCommandVisitor { + fn visit_stmt(&mut self, stmt: &ast::Stmt) { + if self.range.is_some() { + return; + } + match stmt { + ast::Stmt::IpyEscapeCommand(stmt) => { + self.range = Some(stmt.range); + } + _ => walk_stmt(self, stmt), + } + } + + fn visit_expr(&mut self, expr: &ast::Expr) { + if self.range.is_some() { + return; + } + match expr { + ast::Expr::IpyEscapeCommand(expr) => { + self.range = Some(expr.range); + } + _ => walk_expr(self, expr), + } + } + } + + let mut visitor = IpyEscapeCommandVisitor::default(); + match top { + ast::Mod::Module(module) => { + for statement in &module.body { + visitor.visit_stmt(statement); + if visitor.range.is_some() { + break; + } + } + } + ast::Mod::Expression(expression) => { + visitor.visit_expr(&expression.body); + } + } + let range = visitor.range?; + let source_range = text_range_to_source_range(source_file, range); + Some( + ParseError { + error: parser::ParseErrorType::OtherError("invalid syntax".to_owned()), + raw_location: range, + location: source_range.start.to_source_location(), + end_location: source_range.end.to_source_location(), + source_path: "<unknown>".to_owned(), + is_unclosed_bracket: false, + } + .into(), + ) +} + /// Create an empty `arguments` AST node (no parameters). fn empty_arguments_object(vm: &VirtualMachine) -> PyObjectRef { let node = NodeAst @@ -361,6 +1793,7 @@ fn empty_arguments_object(vm: &VirtualMachine) -> PyObjectRef { } #[cfg(feature = "parser")] +#[allow(clippy::too_many_arguments)] pub(crate) fn parse( vm: &VirtualMachine, source: &str, @@ -368,14 +1801,30 @@ pub(crate) fn parse( optimize: u8, target_version: Option<ast::PythonVersion>, type_comments: bool, + optimized_ast: bool, + interactive: bool, + explicit_future_annotations: bool, + dont_imply_dedent: bool, ) -> Result<PyObjectRef, CompileError> { let source_file = SourceFileBuilder::new("".to_owned(), source.to_owned()).finish(); let mut options = parser::ParseOptions::from(mode); let target_version = target_version.unwrap_or(ast::PythonVersion::PY314); + if let Some(error) = feature_version_syntax_error(source, &source_file, target_version) { + return Err(error); + } options = options.with_target_version(target_version); - let parsed = parser::parse(source, options).map_err(|parse_error| { + let parsed = parser::parse_unchecked(source, options); + let type_comment_source = + type_comments.then(|| TypeCommentSource::new(source, parsed.tokens())); + if let Some(lines) = &type_comment_source + && let Some(error) = invalid_type_comment_syntax_error(&source_file, lines) + { + return Err(error); + } + if let Err(errors) = parsed.as_result() { + let parse_error = errors[0].clone(); let range = text_range_to_source_range(&source_file, parse_error.location); - ParseError { + return Err(ParseError { error: parse_error.error, raw_location: parse_error.location, location: range.start.to_source_location(), @@ -383,9 +1832,23 @@ pub(crate) fn parse( source_path: "<unknown>".to_string(), is_unclosed_bracket: false, } - })?; + .into()); + } + if dont_imply_dedent + && interactive + && let Some(error) = rustpython_compiler::dont_imply_dedent_source_error(&source_file) + { + return Err(error); + } - if let Some(error) = parsed.unsupported_syntax_errors().first() { + if let Some(error) = parsed + .unsupported_syntax_errors() + .iter() + .find(|error| should_report_unsupported_syntax_error(error)) + { + if let Some(error) = cpython_unsupported_syntax_error(error, source, &source_file) { + return Err(error); + } let range = text_range_to_source_range(&source_file, error.range()); return Err(ParseError { error: parser::ParseErrorType::OtherError(error.to_string()), @@ -399,19 +1862,56 @@ pub(crate) fn parse( } let mut top = parsed.into_syntax(); - if optimize > 0 { - fold_match_value_constants(&mut top); + if let Some(error) = ipython_escape_command_syntax_error(&top, &source_file) { + return Err(error); } - if optimize >= 2 { - strip_docstrings(&mut top); + if let Some(error) = feature_version_ast_syntax_error(&top, &source_file, target_version) { + return Err(error); + } + #[cfg(feature = "codegen")] + { + let future_features = codegen::preprocess::checked_future_features(&top) + .map_err(|err| future_feature_compile_error(&source_file, err))?; + let future_annotations = explicit_future_annotations + || future_features.contains(crate::bytecode::CodeFlags::FUTURE_ANNOTATIONS); + if interactive && let ast::Mod::Module(module) = &mut top { + codegen::preprocess::preprocess_statements( + &mut module.body, + optimize, + future_annotations, + !optimized_ast, + ); + } else { + codegen::preprocess::preprocess_mod( + &mut top, + optimize, + future_annotations, + !optimized_ast, + ); + } + } + #[cfg(not(feature = "codegen"))] + { + if optimized_ast && optimize > 0 { + fold_match_value_constants(&mut top); + } + if optimize >= 2 { + strip_docstrings(&mut top); + } } let top = match top { - ast::Mod::Module(m) => Mod::Module(m), + ast::Mod::Module(m) => Mod::Module(ModModule { + module: m, + type_ignores: Vec::new(), + }), ast::Mod::Expression(e) => Mod::Expression(e), }; let obj = top.ast_to_object(vm, &source_file); - if type_comments && obj.class().is(pyast::NodeModModule::static_type()) { - let type_ignores = type_ignores_from_source(vm, source); + if let Some(lines) = &type_comment_source + && obj.class().is(pyast::NodeModModule::static_type()) + { + apply_type_comments_to_module(vm, lines, &obj); + let type_ignores = type_ignores_from_source(vm, lines); let dict = obj.as_object().dict().unwrap(); dict.set_item("type_ignores", vm.ctx.new_list(type_ignores).into(), vm) .unwrap(); @@ -441,8 +1941,18 @@ pub(crate) fn parse_func_type( target_version: Option<ast::PythonVersion>, ) -> Result<PyObjectRef, CompileError> { let _ = optimize; - let _ = target_version; let source = source.trim(); + let invalid_func_type = || -> CompileError { + ParseError { + error: parser::ParseErrorType::OtherError("invalid syntax".to_owned()), + raw_location: TextRange::default(), + location: SourceLocation::default(), + end_location: SourceLocation::default(), + source_path: "<unknown>".to_owned(), + is_unclosed_bracket: false, + } + .into() + }; let mut depth = 0i32; let mut split_at = None; let mut chars = source.chars().peekable(); @@ -477,7 +1987,9 @@ pub(crate) fn parse_func_type( let parse_expr = |expr_src: &str| -> Result<ast::Expr, CompileError> { let source_file = SourceFileBuilder::new("".to_owned(), expr_src.to_owned()).finish(); - let parsed = parser::parse_expression(expr_src).map_err(|parse_error| { + let options = parser::ParseOptions::from(parser::Mode::Expression) + .with_target_version(target_version.unwrap_or(ast::PythonVersion::PY314)); + let parsed = parser::parse(expr_src, options).map_err(|parse_error| { let range = text_range_to_source_range(&source_file, parse_error.location); ParseError { error: parse_error.error, @@ -488,43 +2000,92 @@ pub(crate) fn parse_func_type( is_unclosed_bracket: false, } })?; - Ok(*parsed.into_syntax().body) + let ast::Mod::Expression(expression) = parsed.into_syntax() else { + unreachable!(); + }; + Ok(*expression.body) + }; + + if !left.starts_with('(') || !left.ends_with(')') { + return Err(invalid_func_type()); + } + let inner = left[1..left.len() - 1].trim(); + let argtypes = if inner.is_empty() { + Vec::new() + } else { + if inner.ends_with(',') { + return Err(invalid_func_type()); + } + let call_source = format!("__rustpython_func_type__({inner})"); + let source_file = SourceFileBuilder::new("".to_owned(), call_source.clone()).finish(); + let options = parser::ParseOptions::from(parser::Mode::Expression) + .with_target_version(target_version.unwrap_or(ast::PythonVersion::PY314)); + let parsed = parser::parse(&call_source, options).map_err(|parse_error| { + let range = text_range_to_source_range(&source_file, parse_error.location); + ParseError { + error: parse_error.error, + raw_location: parse_error.location, + location: range.start.to_source_location(), + end_location: range.end.to_source_location(), + source_path: "<unknown>".to_string(), + is_unclosed_bracket: false, + } + })?; + let ast::Mod::Expression(expression) = parsed.into_syntax() else { + unreachable!(); + }; + let ast::Expr::Call(call) = *expression.body else { + return Err(invalid_func_type()); + }; + let mut args = Vec::new(); + let positional_len = call.arguments.args.len(); + let mut seen_star = false; + for (index, arg) in call.arguments.args.into_iter().enumerate() { + match arg { + ast::Expr::Starred(starred) => { + if seen_star || index + 1 != positional_len { + return Err(invalid_func_type()); + } + seen_star = true; + args.push(*starred.value); + } + expr => args.push(expr), + } + } + let mut seen_kw_star = false; + for keyword in call.arguments.keywords { + if keyword.arg.is_some() || seen_kw_star { + return Err(invalid_func_type()); + } + seen_kw_star = true; + args.push(keyword.value); + } + args }; - let arg_expr = parse_expr(left)?; let returns = parse_expr(right)?; - let argtypes: Vec<ast::Expr> = match arg_expr { - ast::Expr::Tuple(tup) => tup.elts, - ast::Expr::Name(_) | ast::Expr::Subscript(_) | ast::Expr::Attribute(_) => vec![arg_expr], - other => vec![other], - }; - let func_type = ModFunctionType { argtypes: argtypes.into_boxed_slice(), returns, - range: TextRange::default(), + runtime_argtypes: None, }; let source_file = SourceFileBuilder::new("".to_owned(), source.to_owned()).finish(); Ok(func_type.ast_to_object(vm, &source_file)) } -fn type_ignores_from_source(vm: &VirtualMachine, source: &str) -> Vec<PyObjectRef> { +fn type_ignores_from_source( + vm: &VirtualMachine, + lines: &TypeCommentSource<'_>, +) -> Vec<PyObjectRef> { let mut ignores = Vec::new(); - for (idx, line) in source.lines().enumerate() { - let Some(pos) = line.find('#') else { + for (idx, line) in lines.lines.iter().enumerate() { + let Some(comment) = type_comment_text(line) else { continue; }; - - let comment = &line[pos + 1..]; - let comment = comment.trim_start(); - - let Some(rest) = comment.strip_prefix("type: ignore") else { + let Some(tag) = type_ignore_tag(comment) else { continue; }; - - let tag = rest.trim_start(); - let tag = if tag.is_empty() { "" } else { tag }; let node = NodeAst .into_ref_with_type( vm, @@ -542,7 +2103,7 @@ fn type_ignores_from_source(vm: &VirtualMachine, source: &str) -> Vec<PyObjectRe ignores } -#[cfg(feature = "parser")] +#[cfg(all(feature = "parser", not(feature = "codegen")))] fn fold_match_value_constants(top: &mut ast::Mod) { match top { ast::Mod::Module(module) => fold_stmts(&mut module.body), @@ -550,7 +2111,7 @@ fn fold_match_value_constants(top: &mut ast::Mod) { } } -#[cfg(feature = "parser")] +#[cfg(all(feature = "parser", not(feature = "codegen")))] fn strip_docstrings(top: &mut ast::Mod) { match top { ast::Mod::Module(module) => strip_docstring_in_body(&mut module.body), @@ -558,8 +2119,8 @@ fn strip_docstrings(top: &mut ast::Mod) { } } -#[cfg(feature = "parser")] -fn strip_docstring_in_body(body: &mut Vec<ast::Stmt>) { +#[cfg(all(feature = "parser", not(feature = "codegen")))] +fn strip_docstring_in_body(body: &mut ast::Suite) { if let Some(range) = take_docstring(body) && body.is_empty() { @@ -580,12 +2141,19 @@ fn strip_docstring_in_body(body: &mut Vec<ast::Stmt>) { } } -#[cfg(feature = "parser")] -fn take_docstring(body: &mut Vec<ast::Stmt>) -> Option<TextRange> { +#[cfg(all(feature = "parser", not(feature = "codegen")))] +fn take_docstring(body: &mut ast::Suite) -> Option<TextRange> { let ast::Stmt::Expr(expr_stmt) = body.first()? else { return None; }; - if matches!(expr_stmt.value.as_ref(), ast::Expr::StringLiteral(_)) { + if matches!( + expr_stmt.value.as_ref(), + ast::Expr::StringLiteral(_) + | ast::Expr::Constant(ast::ExprConstant { + value: ast::ConstantValue::Str(_), + .. + }) + ) { let range = expr_stmt.range; body.remove(0); return Some(range); @@ -593,14 +2161,14 @@ fn take_docstring(body: &mut Vec<ast::Stmt>) -> Option<TextRange> { None } -#[cfg(feature = "parser")] +#[cfg(all(feature = "parser", not(feature = "codegen")))] fn fold_stmts(stmts: &mut [ast::Stmt]) { for stmt in stmts { fold_stmt(stmt); } } -#[cfg(feature = "parser")] +#[cfg(all(feature = "parser", not(feature = "codegen")))] fn fold_stmt(stmt: &mut ast::Stmt) { use ast::Stmt; match stmt { @@ -641,7 +2209,7 @@ fn fold_stmt(stmt: &mut ast::Stmt) { } } -#[cfg(feature = "parser")] +#[cfg(all(feature = "parser", not(feature = "codegen")))] fn fold_pattern(pattern: &mut ast::Pattern) { use ast::Pattern; match pattern { @@ -681,7 +2249,7 @@ fn fold_pattern(pattern: &mut ast::Pattern) { } } -#[cfg(feature = "parser")] +#[cfg(all(feature = "parser", not(feature = "codegen")))] fn fold_expr(expr: &mut ast::Expr) { use ast::Expr; if let Expr::UnaryOp(unary) = expr { @@ -735,7 +2303,7 @@ fn fold_expr(expr: &mut ast::Expr) { } } -#[cfg(feature = "parser")] +#[cfg(all(feature = "parser", not(feature = "codegen")))] fn fold_number_binop( left: &ast::Number, op: ast::Operator, @@ -761,7 +2329,7 @@ fn fold_number_binop( } } -#[cfg(feature = "parser")] +#[cfg(all(feature = "parser", not(feature = "codegen")))] fn number_to_complex(number: &ast::Number) -> Option<(f64, f64, bool)> { match number { ast::Number::Complex { real, imag } => Some((*real, *imag, true)), @@ -770,94 +2338,174 @@ fn number_to_complex(number: &ast::Number) -> Option<(f64, f64, bool)> { } } +#[cfg(feature = "codegen")] +pub(crate) fn preprocess_ast_object( + vm: &VirtualMachine, + object: PyObjectRef, + filename: &str, + optimize: u8, + optimized_ast: bool, + explicit_future_annotations: bool, +) -> PyResult<PyObjectRef> { + let original_object = object.clone(); + let text = synthetic_source_from_ast_object(vm, &object)?; + let source_file = SourceFileBuilder::new(filename.to_owned(), text).finish(); + let ast = Node::ast_from_object(vm, &source_file, object)?; + validate::validate_mod(vm, &ast)?; + let syntax_check_only = !optimized_ast; + + let ast = match ast { + Mod::Module(mut module) => { + let mut ast = ast::Mod::Module(module.module); + let future_features = + codegen::preprocess::checked_future_features(&ast).map_err(|err| { + vm.new_syntax_error(&future_feature_compile_error(&source_file, err), None) + })?; + let future_annotations = explicit_future_annotations + || future_features.contains(crate::bytecode::CodeFlags::FUTURE_ANNOTATIONS); + codegen::preprocess::preprocess_mod( + &mut ast, + optimize, + future_annotations, + syntax_check_only, + ); + let ast::Mod::Module(processed_module) = ast else { + unreachable!(); + }; + module.module = processed_module; + Mod::Module(module) + } + Mod::Interactive(mut interactive) => { + let future_features = codegen::preprocess::checked_future_features_in_body( + &interactive.body, + ) + .map_err(|err| { + vm.new_syntax_error(&future_feature_compile_error(&source_file, err), None) + })?; + let future_annotations = explicit_future_annotations + || future_features.contains(crate::bytecode::CodeFlags::FUTURE_ANNOTATIONS); + codegen::preprocess::preprocess_statements( + &mut interactive.body, + optimize, + future_annotations, + syntax_check_only, + ); + Mod::Interactive(interactive) + } + Mod::Expression(expression) => { + let mut ast = ast::Mod::Expression(expression); + codegen::preprocess::preprocess_mod( + &mut ast, + optimize, + explicit_future_annotations, + syntax_check_only, + ); + let ast::Mod::Expression(expression) = ast else { + unreachable!(); + }; + Mod::Expression(expression) + } + Mod::FunctionType(function_type) => Mod::FunctionType(function_type), + }; + let result = ast.ast_to_object(vm, &source_file); + copy_ast_passthrough_fields(vm, &original_object, &result)?; + Ok(result) +} + #[cfg(feature = "codegen")] pub(crate) fn compile( vm: &VirtualMachine, object: PyObjectRef, filename: &str, mode: crate::compiler::Mode, - optimize: Option<u8>, + mut opts: codegen::CompileOpts, ) -> PyResult { - let mut opts = vm.compile_opts(); - if let Some(optimize) = optimize { - opts.optimize = optimize; - } - - let source_file = SourceFileBuilder::new(filename.to_owned(), "".to_owned()).finish(); - let ast: Mod = Node::ast_from_object(vm, &source_file, object)?; + let text = synthetic_source_from_ast_object(vm, &object)?; + let source_file = SourceFileBuilder::new(filename.to_owned(), text.clone()).finish(); + let ast = Node::ast_from_object(vm, &source_file, object)?; validate::validate_mod(vm, &ast)?; let ast = match ast { - Mod::Module(m) => ast::Mod::Module(m), - Mod::Interactive(ModInteractive { range, body }) => ast::Mod::Module(ast::ModModule { + Mod::Module(m) => ast::Mod::Module(m.module), + Mod::Interactive(ModInteractive { range, body, .. }) => ast::Mod::Module(ast::ModModule { node_index: Default::default(), range, body, + runtime_body: None, }), Mod::Expression(e) => ast::Mod::Expression(e), - Mod::FunctionType(_) => todo!(), + Mod::FunctionType(_) => { + return Err(vm.new_runtime_error("this compiler does not handle FunctionTypes")); + } }; - // TODO: create a textual representation of the ast - let text = ""; + opts.future_features |= codegen::preprocess::future_features(&ast); let source_file = SourceFileBuilder::new(filename, text).finish(); - let code = codegen::compile::compile_top(ast, source_file, mode, opts) - .map_err(|err| vm.new_syntax_error(&err.into(), None))?; // FIXME source + #[cfg(feature = "parser")] + let code = { + let source_path = filename.to_owned(); + // A warning the filter escalates to an exception is stashed here so a + // non-SyntaxWarning category propagates unchanged, matching + // PyErr_ExceptionMatches(SyntaxWarning) in compiler_warn. + let escalated: core::cell::Cell<Option<crate::builtins::PyBaseExceptionRef>> = + core::cell::Cell::new(None); + let mut syntax_warning_handler = |location: SourceLocation, message: String| { + let fname = vm.ctx.new_str(source_path.as_str()); + let message = vm.ctx.new_str(message); + crate::warn::warn_explicit( + Some(vm.ctx.exceptions.syntax_warning.to_owned()), + message.into(), + fname, + location.line.get(), + None, + vm.ctx.none(), + None, + None, + vm, + ) + .map_err(|exception| { + let message = exception.as_object().str(vm).map_or_else( + |_| "compiler warning raised as an exception".to_owned(), + |message| message.as_wtf8().to_string(), + ); + let marker = codegen::error::CodegenError { + location: Some(location), + error: codegen::error::CodegenErrorType::SyntaxError(message), + source_path: source_path.clone(), + }; + escalated.set(Some(exception)); + marker + }) + }; + let result = codegen::compile::compile_top_with_syntax_warning_handler( + ast, + source_file, + mode, + opts, + Some(&mut syntax_warning_handler), + ); + match escalated.take() { + Some(exception) if !exception.fast_isinstance(vm.ctx.exceptions.syntax_warning) => { + return Err(exception); + } + _ => result, + } + }; + #[cfg(not(feature = "parser"))] + let code = codegen::compile::compile_top(ast, source_file, mode, opts); + let code = code.map_err(|err| vm.new_syntax_error(&err.into(), None))?; // FIXME source Ok(crate::builtins::PyCode::new_ref_from_bytecode(vm, code).into()) } -#[cfg(feature = "codegen")] +#[cfg(not(feature = "rustpython-codegen"))] pub(crate) fn validate_ast_object(vm: &VirtualMachine, object: PyObjectRef) -> PyResult<()> { let source_file = SourceFileBuilder::new("<ast>".to_owned(), "".to_owned()).finish(); - let ast: Mod = Node::ast_from_object(vm, &source_file, object)?; + let ast = Node::ast_from_object(vm, &source_file, object)?; validate::validate_mod(vm, &ast)?; Ok(()) } -// Used by builtins::compile() -pub(crate) const PY_CF_ONLY_AST: i32 = 0x0400; - // The following flags match the values from Include/cpython/compile.h -// Caveat emptor: These flags are undocumented on purpose and depending -// on their effect outside the standard library is **unsupported**. -pub(crate) const PY_CF_SOURCE_IS_UTF8: i32 = 0x0100; -pub(crate) const PY_CF_DONT_IMPLY_DEDENT: i32 = 0x200; -pub(crate) const PY_CF_IGNORE_COOKIE: i32 = 0x0800; -pub(crate) const PY_CF_ALLOW_INCOMPLETE_INPUT: i32 = 0x4000; -pub(crate) const PY_CF_OPTIMIZED_AST: i32 = 0x8000 | PY_CF_ONLY_AST; -pub(crate) const PY_CF_TYPE_COMMENTS: i32 = 0x1000; -pub(crate) const PY_CF_ALLOW_TOP_LEVEL_AWAIT: i32 = 0x2000; - -// __future__ flags - sync with Lib/__future__.py -// TODO: These flags aren't being used in rust code -// CO_FUTURE_ANNOTATIONS does make a difference in the codegen, -// so it should be used in compile(). -// see compiler/codegen/src/compile.rs -const CO_NESTED: i32 = 0x0010; -const CO_GENERATOR_ALLOWED: i32 = 0; -const CO_FUTURE_DIVISION: i32 = 0x20000; -const CO_FUTURE_ABSOLUTE_IMPORT: i32 = 0x40000; -const CO_FUTURE_WITH_STATEMENT: i32 = 0x80000; -const CO_FUTURE_PRINT_FUNCTION: i32 = 0x100000; -const CO_FUTURE_UNICODE_LITERALS: i32 = 0x200000; -const CO_FUTURE_BARRY_AS_BDFL: i32 = 0x400000; -const CO_FUTURE_GENERATOR_STOP: i32 = 0x800000; -const CO_FUTURE_ANNOTATIONS: i32 = 0x1000000; - -// Used by builtins::compile() - the summary of all flags -pub(crate) const PY_COMPILE_FLAGS_MASK: i32 = PY_CF_ONLY_AST - | PY_CF_SOURCE_IS_UTF8 - | PY_CF_DONT_IMPLY_DEDENT - | PY_CF_IGNORE_COOKIE - | PY_CF_ALLOW_TOP_LEVEL_AWAIT - | PY_CF_ALLOW_INCOMPLETE_INPUT - | PY_CF_OPTIMIZED_AST - | PY_CF_TYPE_COMMENTS - | CO_NESTED - | CO_GENERATOR_ALLOWED - | CO_FUTURE_DIVISION - | CO_FUTURE_ABSOLUTE_IMPORT - | CO_FUTURE_WITH_STATEMENT - | CO_FUTURE_PRINT_FUNCTION - | CO_FUTURE_UNICODE_LITERALS - | CO_FUTURE_BARRY_AS_BDFL - | CO_FUTURE_GENERATOR_STOP - | CO_FUTURE_ANNOTATIONS; +pub(crate) use crate::vm::compile_mode::{ + PY_CF_ALLOW_INCOMPLETE_INPUT, PY_CF_ALLOW_TOP_LEVEL_AWAIT, PY_CF_DONT_IMPLY_DEDENT, + PY_CF_IGNORE_COOKIE, PY_CF_ONLY_AST, PY_CF_OPTIMIZED_AST, PY_CF_SOURCE_IS_UTF8, + PY_CF_TYPE_COMMENTS, +}; diff --git a/crates/vm/src/stdlib/_ast/argument.rs b/crates/vm/src/stdlib/_ast/argument.rs index 626024f5b..8bd1507cd 100644 --- a/crates/vm/src/stdlib/_ast/argument.rs +++ b/crates/vm/src/stdlib/_ast/argument.rs @@ -2,14 +2,78 @@ use super::*; use rustpython_compiler_core::SourceFile; pub(super) struct PositionalArguments { - pub range: TextRange, - pub args: Box<[ast::Expr]>, + range: TextRange, + kind: PositionalArgumentsKind, +} + +enum PositionalArgumentsKind { + Args(Box<[ast::Expr]>), + RuntimeValues(Vec<Option<ast::Expr>>), +} + +impl PositionalArguments { + pub(super) fn ast_from_field( + vm: &VirtualMachine, + source_file: &SourceFile, + object: &PyObject, + field: &'static str, + typ: &str, + ) -> PyResult<Self> { + let values: Vec<Option<ast::Expr>> = + get_node_list_field(vm, source_file, object, field, typ)?; + Ok(Self::from_values(TextRange::default(), values)) + } + + fn from_args(range: TextRange, args: Box<[ast::Expr]>) -> Self { + Self { + range, + kind: PositionalArgumentsKind::Args(args), + } + } + + fn from_runtime_values(range: TextRange, values: Vec<Option<ast::Expr>>) -> Self { + Self { + range, + kind: PositionalArgumentsKind::RuntimeValues(values), + } + } + + fn from_values(range: TextRange, values: Vec<Option<ast::Expr>>) -> Self { + if values.iter().any(Option::is_none) { + Self::from_runtime_values(range, values) + } else { + Self::from_args( + range, + values + .into_iter() + .flatten() + .collect::<Vec<_>>() + .into_boxed_slice(), + ) + } + } + + fn range(&self) -> TextRange { + self.range + } + + fn into_args_and_runtime_values(self) -> (Box<[ast::Expr]>, Option<Vec<Option<ast::Expr>>>) { + match self.kind { + PositionalArgumentsKind::Args(args) => (args, None), + PositionalArgumentsKind::RuntimeValues(values) => ( + lower_runtime_expr_list(values.clone()).into_boxed_slice(), + Some(values), + ), + } + } } impl Node for PositionalArguments { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { - let Self { args, range: _ } = self; - BoxedSlice(args).ast_to_object(vm, source_file) + match self.kind { + PositionalArgumentsKind::Args(args) => BoxedSlice(args).ast_to_object(vm, source_file), + PositionalArgumentsKind::RuntimeValues(values) => values.ast_to_object(vm, source_file), + } } fn ast_from_object( @@ -18,10 +82,7 @@ impl Node for PositionalArguments { object: PyObjectRef, ) -> PyResult<Self> { let args: BoxedSlice<_> = Node::ast_from_object(vm, source_file, object)?; - Ok(Self { - args: args.0, - range: TextRange::default(), // TODO - }) + Ok(Self::from_args(TextRange::default(), args.0)) } } @@ -30,6 +91,21 @@ pub(super) struct KeywordArguments { pub keywords: Box<[ast::Keyword]>, } +impl KeywordArguments { + pub(super) fn ast_from_field( + vm: &VirtualMachine, + source_file: &SourceFile, + object: &PyObject, + field: &'static str, + typ: &str, + ) -> PyResult<Self> { + Ok(Self { + keywords: get_node_boxed_slice_field(vm, source_file, object, field, typ)?, + range: TextRange::default(), + }) + } +} + impl Node for KeywordArguments { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { keywords, range: _ } = self; @@ -45,7 +121,7 @@ impl Node for KeywordArguments { let keywords: BoxedSlice<_> = Node::ast_from_object(vm, source_file, object)?; Ok(Self { keywords: keywords.0, - range: TextRange::default(), // TODO + range: TextRange::default(), }) } } @@ -54,13 +130,16 @@ pub(super) fn merge_function_call_arguments( pos_args: PositionalArguments, key_args: KeywordArguments, ) -> ast::Arguments { - let range = pos_args.range.cover(key_args.range); + let range = pos_args.range().cover(key_args.range); + let (args, runtime_args) = pos_args.into_args_and_runtime_values(); ast::Arguments { node_index: Default::default(), range, - args: pos_args.args, + args, keywords: key_args.keywords, + runtime_args, + runtime_bases: None, } } @@ -68,10 +147,12 @@ pub(super) fn split_function_call_arguments( args: ast::Arguments, ) -> (PositionalArguments, KeywordArguments) { let ast::Arguments { - node_index: _, range: _, args, keywords, + runtime_args, + runtime_bases: _, + .. } = args; let positional_arguments_range = args @@ -80,10 +161,10 @@ pub(super) fn split_function_call_arguments( .reduce(|acc, next| acc.cover(next)) .unwrap_or_default(); // debug_assert!(range.contains_range(positional_arguments_range)); - let positional_arguments = PositionalArguments { - range: positional_arguments_range, - args, - }; + let positional_arguments = runtime_args.map_or_else( + || PositionalArguments::from_args(positional_arguments_range, args), + |values| PositionalArguments::from_runtime_values(positional_arguments_range, values), + ); let keyword_arguments_range = keywords .iter() @@ -107,10 +188,12 @@ pub(super) fn split_class_def_args( Some(args) => *args, }; let ast::Arguments { - node_index: _, range: _, args, keywords, + runtime_args: _, + runtime_bases, + .. } = args; let positional_arguments_range = args @@ -119,10 +202,10 @@ pub(super) fn split_class_def_args( .reduce(|acc, next| acc.cover(next)) .unwrap_or_default(); // debug_assert!(range.contains_range(positional_arguments_range)); - let positional_arguments = PositionalArguments { - range: positional_arguments_range, - args, - }; + let positional_arguments = runtime_bases.map_or_else( + || PositionalArguments::from_args(positional_arguments_range, args), + |values| PositionalArguments::from_runtime_values(positional_arguments_range, values), + ); let keyword_arguments_range = keywords .iter() @@ -146,10 +229,10 @@ pub(super) fn merge_class_def_args( return None; } - let args = if let Some(positional_arguments) = positional_arguments { - positional_arguments.args + let (args, runtime_bases) = if let Some(positional_arguments) = positional_arguments { + positional_arguments.into_args_and_runtime_values() } else { - vec![].into_boxed_slice() + (vec![].into_boxed_slice(), None) }; let keywords = if let Some(keyword_arguments) = keyword_arguments { keyword_arguments.keywords @@ -162,5 +245,7 @@ pub(super) fn merge_class_def_args( range: Default::default(), // TODO args, keywords, + runtime_args: None, + runtime_bases, })) } diff --git a/crates/vm/src/stdlib/_ast/basic.rs b/crates/vm/src/stdlib/_ast/basic.rs index 28e4a6803..c25dd3c55 100644 --- a/crates/vm/src/stdlib/_ast/basic.rs +++ b/crates/vm/src/stdlib/_ast/basic.rs @@ -1,4 +1,5 @@ use super::*; +use crate::builtins::PyIntRef; use rustpython_codegen::compile::ruff_int_to_bigint; use rustpython_compiler_core::SourceFile; @@ -13,7 +14,11 @@ impl Node for ast::Identifier { _source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - let py_str = PyUtf8StrRef::try_from_object(vm, object)?; + if !object.class().is(vm.ctx.types.str_type) { + return Err(vm.new_type_error("AST identifier must be of type str")); + } + let py_str = PyUtf8StrRef::try_from_object(vm, object) + .map_err(|_| vm.new_type_error("AST identifier must be of type str"))?; Ok(Self::new(py_str.as_str(), TextRange::default())) } } @@ -28,7 +33,6 @@ impl Node for ast::Int { _source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - // FIXME: performance let value: PyIntRef = object.try_into_value(vm)?; let value = value.as_bigint().to_string(); Ok(value.parse().unwrap()) @@ -45,6 +49,6 @@ impl Node for bool { _source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - i32::try_from_object(vm, object).map(|i| i != 0) + node_object_to_i32(vm, object).map(|i| i != 0) } } diff --git a/crates/vm/src/stdlib/_ast/constant.rs b/crates/vm/src/stdlib/_ast/constant.rs index b1a8a0156..6debbf5c0 100644 --- a/crates/vm/src/stdlib/_ast/constant.rs +++ b/crates/vm/src/stdlib/_ast/constant.rs @@ -1,12 +1,15 @@ use super::*; use crate::builtins::{PyComplex, PyFrozenSet, PyTuple}; use ast::str_prefix::StringLiteralPrefix; -use rustpython_compiler_core::SourceFile; +use rustpython_codegen::compile::ruff_int_to_bigint; +use rustpython_compiler_core::{SourceFile, bytecode::ConstantData}; #[derive(Debug)] pub(super) struct Constant { pub(super) range: TextRange, pub(super) value: ConstantLiteral, + kind: Option<Box<str>>, + invalid_type: Option<String>, } impl Constant { @@ -19,6 +22,8 @@ impl Constant { Self { range, value: ConstantLiteral::Str { value, prefix }, + kind: None, + invalid_type: None, } } @@ -26,6 +31,8 @@ impl Constant { Self { range, value: ConstantLiteral::Int(value), + kind: None, + invalid_type: None, } } @@ -33,6 +40,8 @@ impl Constant { Self { range, value: ConstantLiteral::Float(value), + kind: None, + invalid_type: None, } } @@ -40,6 +49,8 @@ impl Constant { Self { range, value: ConstantLiteral::Complex { real, imag }, + kind: None, + invalid_type: None, } } @@ -47,6 +58,8 @@ impl Constant { Self { range, value: ConstantLiteral::Bytes(value), + kind: None, + invalid_type: None, } } @@ -54,6 +67,8 @@ impl Constant { Self { range, value: ConstantLiteral::Bool(value), + kind: None, + invalid_type: None, } } @@ -61,6 +76,8 @@ impl Constant { Self { range, value: ConstantLiteral::None, + kind: None, + invalid_type: None, } } @@ -68,15 +85,29 @@ impl Constant { Self { range, value: ConstantLiteral::Ellipsis, + kind: None, + invalid_type: None, } } pub(crate) fn into_expr(self) -> ast::Expr { - constant_to_ruff_expr(self) + let Self { + range, + value, + kind, + invalid_type, + } = self; + ast::Expr::Constant(ast::ExprConstant { + node_index: Default::default(), + range, + value: constant_data_to_ast_constant_value(constant_literal_to_constant_data(&value)), + kind: kind.or_else(|| constant_literal_kind(&value)), + invalid_type: invalid_type.map(String::into_boxed_str), + }) } } -#[derive(Debug)] +#[derive(Debug, Clone)] pub(crate) enum ConstantLiteral { None, Bool(bool), @@ -96,20 +127,361 @@ pub(crate) enum ConstantLiteral { Ellipsis, } +pub(super) fn invalid_constant_type(expr: &ast::Expr) -> Option<Box<str>> { + match expr { + ast::Expr::Constant(expr) => expr.invalid_type.clone(), + _ => None, + } +} + +pub(super) fn runtime_string_from_pyobject( + vm: &VirtualMachine, + object: PyObjectRef, +) -> (Option<Box<str>>, Option<Vec<u8>>) { + runtime_string_from_object(vm, object) +} + +pub(super) fn runtime_string_object( + vm: &VirtualMachine, + value: Option<Box<str>>, + bytes: Option<Vec<u8>>, +) -> Option<PyObjectRef> { + runtime_string_to_object(vm, value, bytes) +} + +pub(super) fn expr_constant_to_object( + vm: &VirtualMachine, + source_file: &SourceFile, + expr: ast::ExprConstant, +) -> PyObjectRef { + let ast::ExprConstant { + node_index: _, + range, + value, + kind, + invalid_type: _, + } = expr; + let constant = ast_constant_value_to_constant_data(value); + let node = NodeAst + .into_ref_with_type(vm, pyast::NodeExprConstant::static_type().to_owned()) + .unwrap(); + let dict = node.as_object().dict().unwrap(); + dict.set_item("value", constant_data_to_object(vm, constant), vm) + .unwrap(); + let kind = kind.map_or_else(|| vm.ctx.none(), |kind| vm.ctx.new_str(kind).into()); + dict.set_item("kind", kind, vm).unwrap(); + node_add_location(&dict, range, vm, source_file); + node.into() +} + +pub(super) fn runtime_interpolation_object( + vm: &VirtualMachine, + str: Option<ast::ConstantValue>, + format_spec: Option<Box<ast::Expr>>, +) -> Option<(PyObjectRef, Option<Box<ast::Expr>>)> { + let str = str?; + Some(( + constant_data_to_object(vm, ast_constant_value_to_constant_data(str)), + format_spec, + )) +} + +pub(super) fn runtime_stmt_type_comment_object( + vm: &VirtualMachine, + value: Option<Box<str>>, + bytes: Option<Vec<u8>>, +) -> Option<PyObjectRef> { + runtime_string_object(vm, value, bytes) +} + +fn constant_literal_to_constant_data(value: &ConstantLiteral) -> ConstantData { + match value { + ConstantLiteral::None => ConstantData::None, + ConstantLiteral::Bool(value) => ConstantData::Boolean { value: *value }, + ConstantLiteral::Str { value, .. } => ConstantData::Str { + value: value.as_ref().into(), + }, + ConstantLiteral::Bytes(value) => ConstantData::Bytes { + value: value.to_vec(), + }, + ConstantLiteral::Int(value) => ConstantData::Integer { + value: ruff_int_to_bigint(value).unwrap(), + }, + ConstantLiteral::Tuple(value) => ConstantData::Tuple { + elements: value + .iter() + .map(constant_literal_to_constant_data) + .collect(), + }, + ConstantLiteral::FrozenSet(value) => ConstantData::Frozenset { + elements: value + .iter() + .map(constant_literal_to_constant_data) + .collect(), + }, + ConstantLiteral::Float(value) => ConstantData::Float { value: *value }, + ConstantLiteral::Complex { real, imag } => ConstantData::Complex { + value: num_complex::Complex::new(*real, *imag), + }, + ConstantLiteral::Ellipsis => ConstantData::Ellipsis, + } +} + +fn constant_literal_kind(value: &ConstantLiteral) -> Option<Box<str>> { + match value { + ConstantLiteral::Str { + prefix: StringLiteralPrefix::Unicode, + .. + } => Some("u".into()), + _ => None, + } +} + +pub(super) fn constant_data_to_ast_constant_value(value: ConstantData) -> ast::ConstantValue { + match value { + ConstantData::None => ast::ConstantValue::None, + ConstantData::Boolean { value } => ast::ConstantValue::Boolean(value), + ConstantData::Str { value } => ast::ConstantValue::Str(value.to_string().into_boxed_str()), + ConstantData::Bytes { value } => ast::ConstantValue::Bytes(value.into_boxed_slice()), + ConstantData::Integer { value } => ast::ConstantValue::Integer(value.to_string().into()), + ConstantData::Tuple { elements } => ast::ConstantValue::Tuple( + elements + .into_iter() + .map(constant_data_to_ast_constant_value) + .collect(), + ), + ConstantData::Frozenset { elements } => ast::ConstantValue::Frozenset( + elements + .into_iter() + .map(constant_data_to_ast_constant_value) + .collect(), + ), + ConstantData::Float { value } => ast::ConstantValue::Float(value), + ConstantData::Complex { value } => ast::ConstantValue::Complex { + real: value.re, + imag: value.im, + }, + ConstantData::Ellipsis => ast::ConstantValue::Ellipsis, + ConstantData::Code { .. } | ConstantData::Slice { .. } => { + unreachable!("ast.Constant values cannot contain code objects or slices") + } + } +} + +pub(super) fn ast_constant_value_to_constant_data(value: ast::ConstantValue) -> ConstantData { + match value { + ast::ConstantValue::None => ConstantData::None, + ast::ConstantValue::Boolean(value) => ConstantData::Boolean { value }, + ast::ConstantValue::Str(value) => ConstantData::Str { + value: value.to_string().into(), + }, + ast::ConstantValue::Bytes(value) => ConstantData::Bytes { + value: value.into_vec(), + }, + ast::ConstantValue::Integer(value) => ConstantData::Integer { + value: value + .parse() + .expect("RustPython ast.Constant integer values are decimal integers"), + }, + ast::ConstantValue::Tuple(elements) => ConstantData::Tuple { + elements: elements + .into_iter() + .map(ast_constant_value_to_constant_data) + .collect(), + }, + ast::ConstantValue::Frozenset(elements) => ConstantData::Frozenset { + elements: elements + .into_iter() + .map(ast_constant_value_to_constant_data) + .collect(), + }, + ast::ConstantValue::Float(value) => ConstantData::Float { value }, + ast::ConstantValue::Complex { real, imag } => ConstantData::Complex { + value: num_complex::Complex::new(real, imag), + }, + ast::ConstantValue::Ellipsis => ConstantData::Ellipsis, + } +} + +pub(super) fn constant_object_to_constant_data( + vm: &VirtualMachine, + source_file: &SourceFile, + value_object: PyObjectRef, +) -> PyResult<ConstantData> { + let value = ConstantLiteral::ast_from_object(vm, source_file, value_object)?; + Ok(constant_literal_to_constant_data(&value)) +} + +fn runtime_string_from_object( + vm: &VirtualMachine, + object: PyObjectRef, +) -> (Option<Box<str>>, Option<Vec<u8>>) { + if object.class().is(vm.ctx.types.str_type) { + ( + Some( + object + .try_to_value::<String>(vm) + .expect("AST string field was validated as str") + .into_boxed_str(), + ), + None, + ) + } else { + ( + None, + Some( + object + .try_to_value::<Vec<u8>>(vm) + .expect("AST string field was validated as bytes"), + ), + ) + } +} + +fn runtime_string_to_object( + vm: &VirtualMachine, + value: Option<Box<str>>, + bytes: Option<Vec<u8>>, +) -> Option<PyObjectRef> { + if let Some(bytes) = bytes { + Some(vm.ctx.new_bytes(bytes).into()) + } else { + value.map(|value| vm.ctx.new_str(value).into()) + } +} + +fn first_invalid_constant_type(vm: &VirtualMachine, value_object: PyObjectRef) -> PyResult<String> { + let cls = value_object.class(); + let class_name = cls.name().to_owned(); + if cls.is(vm.ctx.types.tuple_type) { + vm.with_recursion(" during compilation", || { + let tuple = value_object.clone().downcast::<PyTuple>().map_err(|obj| { + vm.new_type_error(format!( + "Expected type {}, not {}", + PyTuple::static_type().name(), + obj.class().name() + )) + })?; + for item in tuple.iter() { + if let Some(invalid_type) = first_invalid_constant_type_opt(vm, item.clone())? { + return Ok(invalid_type); + } + } + Ok(class_name) + }) + } else if cls.is(vm.ctx.types.frozenset_type) { + vm.with_recursion(" during compilation", || { + let set = value_object.clone().downcast::<PyFrozenSet>().unwrap(); + for item in set.elements() { + if let Some(invalid_type) = first_invalid_constant_type_opt(vm, item)? { + return Ok(invalid_type); + } + } + Ok(class_name) + }) + } else { + Ok(class_name) + } +} + +fn first_invalid_constant_type_opt( + vm: &VirtualMachine, + value_object: PyObjectRef, +) -> PyResult<Option<String>> { + let cls = value_object.class(); + if cls.is(vm.ctx.types.none_type) + || cls.is(vm.ctx.types.bool_type) + || cls.is(vm.ctx.types.str_type) + || cls.is(vm.ctx.types.bytes_type) + || cls.is(vm.ctx.types.int_type) + || cls.is(vm.ctx.types.float_type) + || cls.is(vm.ctx.types.complex_type) + || cls.is(vm.ctx.types.ellipsis_type) + { + return Ok(None); + } + if cls.is(vm.ctx.types.tuple_type) || cls.is(vm.ctx.types.frozenset_type) { + return first_invalid_constant_type(vm, value_object).map(Some); + } + Ok(Some(cls.name().to_owned())) +} + +fn constant_data_to_object(vm: &VirtualMachine, constant: ConstantData) -> PyObjectRef { + match constant { + ConstantData::None => vm.ctx.none(), + ConstantData::Boolean { value } => vm.ctx.new_bool(value).to_pyobject(vm), + ConstantData::Str { value } => vm.ctx.new_str(value.to_string()).to_pyobject(vm), + ConstantData::Bytes { value } => vm.ctx.new_bytes(value).to_pyobject(vm), + ConstantData::Integer { value } => vm.ctx.new_int(value).into(), + ConstantData::Tuple { elements } => { + let value = elements + .into_iter() + .map(|c| constant_data_to_object(vm, c)) + .collect(); + vm.ctx.new_tuple(value).to_pyobject(vm) + } + ConstantData::Frozenset { elements } => PyFrozenSet::from_iter( + vm, + elements.into_iter().map(|c| constant_data_to_object(vm, c)), + ) + .unwrap() + .into_pyobject(vm), + ConstantData::Float { value } => vm.ctx.new_float(value).into_pyobject(vm), + ConstantData::Complex { value } => vm.ctx.new_complex(value).into_pyobject(vm), + ConstantData::Ellipsis => vm.ctx.ellipsis.clone().into(), + ConstantData::Code { .. } | ConstantData::Slice { .. } => { + unreachable!("ast.Constant values cannot contain code objects or slices") + } + } +} + // constructor +pub(super) fn constant_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<Constant> { + let value_object = get_node_field(vm, &object, "value", "Constant")?; + let (value, invalid_type) = + match ConstantLiteral::ast_from_object(vm, source_file, value_object.clone()) { + Ok(value) => (value, None), + Err(_) => ( + ConstantLiteral::None, + Some(first_invalid_constant_type(vm, value_object)?), + ), + }; + let kind = get_node_field_opt(vm, &object, "kind")? + .map(|object| { + if !object.class().is(vm.ctx.types.str_type) { + return Err(vm.new_type_error("AST string must be of type str")); + } + Ok(object.try_to_value::<String>(vm)?.into_boxed_str()) + }) + .transpose()?; + + Ok(Constant { + range, + value, + kind, + invalid_type, + }) +} + impl Node for Constant { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { - let Self { range, value } = self; + let Self { + range, + value, + kind, + invalid_type: _, + } = self; let node = NodeAst .into_ref_with_type(vm, pyast::NodeExprConstant::static_type().to_owned()) .unwrap(); - let kind = match &value { - ConstantLiteral::Str { - prefix: StringLiteralPrefix::Unicode, - .. - } => vm.ctx.new_str("u").into(), - _ => vm.ctx.none(), - }; + let kind = kind + .or_else(|| constant_literal_kind(&value)) + .map_or_else(|| vm.ctx.none(), |kind| vm.ctx.new_str(kind).into()); let value = value.ast_to_object(vm, source_file); let dict = node.as_object().dict().unwrap(); dict.set_item("value", value, vm).unwrap(); @@ -123,16 +495,8 @@ impl Node for Constant { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - let value_object = get_node_field(vm, &object, "value", "Constant")?; - let value = Node::ast_from_object(vm, source_file, value_object)?; - - Ok(Self { - value, - // kind: get_node_field_opt(_vm, &_object, "kind")? - // .map(|obj| Node::ast_from_object(_vm, obj)) - // .transpose()?, - range: range_from_object(vm, source_file, object, "Constant")?, - }) + let range = range_from_object(vm, source_file, object.clone(), "Constant")?; + constant_from_object_with_range(vm, source_file, object, range) } } @@ -201,8 +565,12 @@ impl Node for ConstantLiteral { })?; let tuple = tuple .into_iter() - .cloned() - .map(|object| Node::ast_from_object(vm, source_file, object)) + .map(|object| { + let object = object.clone(); + vm.with_recursion(" during compilation", || { + Node::ast_from_object(vm, source_file, object) + }) + }) .collect::<PyResult<_>>()?; Self::Tuple(tuple) } else if cls.is(vm.ctx.types.frozenset_type) { @@ -210,7 +578,11 @@ impl Node for ConstantLiteral { let elements = set .elements() .into_iter() - .map(|object| Node::ast_from_object(vm, source_file, object)) + .map(|object| { + vm.with_recursion(" during compilation", || { + Node::ast_from_object(vm, source_file, object) + }) + }) .collect::<PyResult<_>>()?; Self::FrozenSet(elements) } else if cls.is(vm.ctx.types.float_type) { @@ -244,117 +616,6 @@ impl Node for ConstantLiteral { } } -fn constant_to_ruff_expr(value: Constant) -> ast::Expr { - let Constant { value, range } = value; - match value { - ConstantLiteral::None => ast::Expr::NoneLiteral(ast::ExprNoneLiteral { - node_index: Default::default(), - range, - }), - ConstantLiteral::Bool(value) => ast::Expr::BooleanLiteral(ast::ExprBooleanLiteral { - node_index: Default::default(), - range, - value, - }), - ConstantLiteral::Str { value, prefix } => { - ast::Expr::StringLiteral(ast::ExprStringLiteral { - node_index: Default::default(), - range, - value: ast::StringLiteralValue::single(ast::StringLiteral { - node_index: Default::default(), - range, - value, - flags: ast::StringLiteralFlags::empty().with_prefix(prefix), - }), - }) - } - ConstantLiteral::Bytes(value) => { - ast::Expr::BytesLiteral(ast::ExprBytesLiteral { - node_index: Default::default(), - range, - value: ast::BytesLiteralValue::single(ast::BytesLiteral { - node_index: Default::default(), - range, - value, - flags: ast::BytesLiteralFlags::empty(), // TODO - }), - }) - } - ConstantLiteral::Int(value) => ast::Expr::NumberLiteral(ast::ExprNumberLiteral { - node_index: Default::default(), - range, - value: ast::Number::Int(value), - }), - ConstantLiteral::Tuple(value) => ast::Expr::Tuple(ast::ExprTuple { - node_index: Default::default(), - range, - elts: value - .into_iter() - .map(|value| { - constant_to_ruff_expr(Constant { - range: TextRange::default(), - value, - }) - }) - .collect(), - ctx: ast::ExprContext::Load, - // TODO: Does this matter? - parenthesized: true, - }), - ConstantLiteral::FrozenSet(value) => { - let args = if value.is_empty() { - Vec::new() - } else { - vec![ast::Expr::Set(ast::ExprSet { - node_index: Default::default(), - range: TextRange::default(), - elts: value - .into_iter() - .map(|value| { - constant_to_ruff_expr(Constant { - range: TextRange::default(), - value, - }) - }) - .collect(), - })] - }; - ast::Expr::Call(ast::ExprCall { - node_index: Default::default(), - range, - func: Box::new(ast::Expr::Name(ast::ExprName { - node_index: Default::default(), - range: TextRange::default(), - id: ast::name::Name::new_static("frozenset"), - ctx: ast::ExprContext::Load, - })), - arguments: ast::Arguments { - node_index: Default::default(), - range, - args: args.into(), - keywords: Box::default(), - }, - }) - } - ConstantLiteral::Float(value) => ast::Expr::NumberLiteral(ast::ExprNumberLiteral { - node_index: Default::default(), - range, - value: ast::Number::Float(value), - }), - ConstantLiteral::Complex { real, imag } => { - ast::Expr::NumberLiteral(ast::ExprNumberLiteral { - node_index: Default::default(), - range, - value: ast::Number::Complex { real, imag }, - }) - } - ConstantLiteral::Ellipsis => ast::Expr::EllipsisLiteral(ast::ExprEllipsisLiteral { - node_index: Default::default(), - range, - }), - } -} - pub(super) fn number_literal_to_object( vm: &VirtualMachine, source_file: &SourceFile, @@ -364,6 +625,7 @@ pub(super) fn number_literal_to_object( node_index: _, range, value, + .. } = constant; let c = match value { ast::Number::Int(n) => Constant::new_int(n, range), @@ -382,6 +644,7 @@ pub(super) fn string_literal_to_object( node_index: _, range, value, + .. } = constant; let prefix = value .iter() @@ -400,6 +663,7 @@ pub(super) fn bytes_literal_to_object( node_index: _, range, value, + .. } = constant; let bytes = value.as_slice().iter().flat_map(|b| b.value.iter()); let c = Constant::new_bytes(bytes.copied().collect(), range); @@ -415,6 +679,7 @@ pub(super) fn boolean_literal_to_object( node_index: _, range, value, + .. } = constant; let c = Constant::new_bool(value, range); c.ast_to_object(vm, source_file) @@ -428,6 +693,7 @@ pub(super) fn none_literal_to_object( let ast::ExprNoneLiteral { node_index: _, range, + .. } = constant; let c = Constant::new_none(range); c.ast_to_object(vm, source_file) @@ -441,6 +707,7 @@ pub(super) fn ellipsis_literal_to_object( let ast::ExprEllipsisLiteral { node_index: _, range, + .. } = constant; let c = Constant::new_ellipsis(range); c.ast_to_object(vm, source_file) diff --git a/crates/vm/src/stdlib/_ast/elif_else_clause.rs b/crates/vm/src/stdlib/_ast/elif_else_clause.rs index 0afdbc02a..2097c349c 100644 --- a/crates/vm/src/stdlib/_ast/elif_else_clause.rs +++ b/crates/vm/src/stdlib/_ast/elif_else_clause.rs @@ -12,10 +12,15 @@ pub(super) fn ast_to_object( range, test, body, + runtime_body, + runtime_orelse, } = clause; let Some(test) = test else { assert!(rest.len() == 0); - return body.ast_to_object(vm, source_file); + return runtime_body.map_or_else( + || body.ast_to_object(vm, source_file), + |values| values.ast_to_object(vm, source_file), + ); }; let node = NodeAst .into_ref_with_type(vm, pyast::NodeStmtIf::static_type().to_owned()) @@ -24,10 +29,15 @@ pub(super) fn ast_to_object( dict.set_item("test", test.ast_to_object(vm, source_file), vm) .unwrap(); - dict.set_item("body", body.ast_to_object(vm, source_file), vm) - .unwrap(); + let body = runtime_body.map_or_else( + || body.ast_to_object(vm, source_file), + |values| values.ast_to_object(vm, source_file), + ); + dict.set_item("body", body, vm).unwrap(); - let orelse = if let Some(next) = rest.next() { + let orelse = if let Some(values) = runtime_orelse { + values.ast_to_object(vm, source_file) + } else if let Some(next) = rest.next() { if next.test.is_some() { let next = ast::ElifElseClause { range: TextRange::new(next.range.start(), range.end()), @@ -37,7 +47,10 @@ pub(super) fn ast_to_object( .new_list(vec![ast_to_object(next, rest, vm, source_file)]) .into() } else { - next.body.ast_to_object(vm, source_file) + next.runtime_body.map_or_else( + || next.body.ast_to_object(vm, source_file), + |values| values.ast_to_object(vm, source_file), + ) } } else { vm.ctx.new_list(vec![]).into() @@ -48,40 +61,45 @@ pub(super) fn ast_to_object( node.into() } -pub(super) fn ast_from_object( +pub(super) fn ast_from_object_with_range( vm: &VirtualMachine, source_file: &SourceFile, object: PyObjectRef, + range: TextRange, ) -> PyResult<ast::StmtIf> { - let test = Node::ast_from_object(vm, source_file, get_node_field(vm, &object, "test", "If")?)?; - let body = Node::ast_from_object(vm, source_file, get_node_field(vm, &object, "body", "If")?)?; - let orelse: Vec<ast::Stmt> = Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "orelse", "If")?, - )?; - let range = range_from_object(vm, source_file, object, "If")?; + let test = get_required_node_field(vm, source_file, &object, "test", "If")?; + let body: Vec<Option<ast::Stmt>> = get_node_list_field(vm, source_file, &object, "body", "If")?; + let orelse: Vec<Option<ast::Stmt>> = + get_node_list_field(vm, source_file, &object, "orelse", "If")?; + let runtime_body = runtime_stmt_list_metadata(&body); + let runtime_orelse = runtime_stmt_list_metadata(&orelse); + let body = lower_runtime_stmt_list(body); + let orelse = lower_runtime_stmt_list(orelse); let elif_else_clauses = if orelse.is_empty() { vec![] } else if let [ast::Stmt::If(_)] = &*orelse { let Some(ast::Stmt::If(ast::StmtIf { - node_index: _, + node_index, range, test, body, mut elif_else_clauses, + runtime_body, })) = orelse.into_iter().next() else { unreachable!() }; + debug_assert!(runtime_orelse.is_none()); elif_else_clauses.insert( 0, ast::ElifElseClause { - node_index: Default::default(), + node_index, range, test: Some(*test), body, + runtime_body, + runtime_orelse: None, }, ); elif_else_clauses @@ -91,6 +109,8 @@ pub(super) fn ast_from_object( range, test: None, body: orelse, + runtime_body: runtime_orelse, + runtime_orelse: None, }] }; @@ -100,5 +120,6 @@ pub(super) fn ast_from_object( body, elif_else_clauses, range, + runtime_body, }) } diff --git a/crates/vm/src/stdlib/_ast/exception.rs b/crates/vm/src/stdlib/_ast/exception.rs index 2daabecc8..b79e52d05 100644 --- a/crates/vm/src/stdlib/_ast/exception.rs +++ b/crates/vm/src/stdlib/_ast/exception.rs @@ -1,6 +1,22 @@ use super::*; use rustpython_compiler_core::SourceFile; +fn ensure_excepthandler_node(vm: &VirtualMachine, object: &PyObjectRef) -> PyResult<()> { + if vm.is_none(object) + || !is_node_instance( + vm, + object, + pyast::NodeExceptHandlerExceptHandler::static_type(), + )? + { + return Err(vm.new_type_error(format!( + "expected some sort of excepthandler, but got {}", + object.repr(vm)? + ))); + } + Ok(()) +} + // sum impl Node for ast::ExceptHandler { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { @@ -13,25 +29,53 @@ impl Node for ast::ExceptHandler { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - let cls = object.class(); - Ok( - if cls.is(pyast::NodeExceptHandlerExceptHandler::static_type()) { - Self::ExceptHandler(ast::ExceptHandlerExceptHandler::ast_from_object( - vm, - source_file, - object, - )?) - } else { - return Err(vm.new_type_error(format!( - "expected some sort of excepthandler, but got {}", - object.repr(vm)? - ))); - }, - ) + ensure_excepthandler_node(vm, &object)?; + let range = excepthandler_range_from_object(vm, source_file, object.clone())?; + Ok(Self::ExceptHandler(except_handler_from_object_with_range( + vm, + source_file, + object, + range, + )?)) } } // constructor +fn except_handler_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::ExceptHandlerExceptHandler> { + let body: Vec<Option<ast::Stmt>> = + get_node_list_field(vm, source_file, &object, "body", "ExceptHandler")?; + let (runtime_body, body) = runtime_stmt_list_from_values(body); + Ok(ast::ExceptHandlerExceptHandler { + node_index: Default::default(), + type_: get_node_field_opt(vm, &object, "type")? + .map(|obj| Node::ast_from_object(vm, source_file, obj)) + .transpose()?, + name: get_node_field_opt(vm, &object, "name")? + .map(|obj| Node::ast_from_object(vm, source_file, obj)) + .transpose()?, + body, + range, + runtime_body, + }) +} + +pub(super) fn except_handler_from_object_unvalidated_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, +) -> PyResult<ast::ExceptHandler> { + ensure_excepthandler_node(vm, &object)?; + let range = excepthandler_range_from_object_unvalidated(vm, source_file, object.clone())?; + Ok(ast::ExceptHandler::ExceptHandler( + except_handler_from_object_with_range(vm, source_file, object, range)?, + )) +} + impl Node for ast::ExceptHandlerExceptHandler { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { @@ -40,6 +84,7 @@ impl Node for ast::ExceptHandlerExceptHandler { name, body, range, + runtime_body, } = self; let node = NodeAst .into_ref_with_type( @@ -52,8 +97,11 @@ impl Node for ast::ExceptHandlerExceptHandler { .unwrap(); dict.set_item("name", name.ast_to_object(vm, source_file), vm) .unwrap(); - dict.set_item("body", body.ast_to_object(vm, source_file), vm) - .unwrap(); + let body = runtime_body.map_or_else( + || body.ast_to_object(vm, source_file), + |values| values.ast_to_object(vm, source_file), + ); + dict.set_item("body", body, vm).unwrap(); node_add_location(&dict, range, vm, source_file); node.into() } @@ -63,20 +111,7 @@ impl Node for ast::ExceptHandlerExceptHandler { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - type_: get_node_field_opt(vm, &object, "type")? - .map(|obj| Node::ast_from_object(vm, source_file, obj)) - .transpose()?, - name: get_node_field_opt(vm, &object, "name")? - .map(|obj| Node::ast_from_object(vm, source_file, obj)) - .transpose()?, - body: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "body", "ExceptHandler")?, - )?, - range: range_from_object(vm, source_file, object, "ExceptHandler")?, - }) + let range = range_from_object(vm, source_file, object.clone(), "ExceptHandler")?; + except_handler_from_object_with_range(vm, source_file, object, range) } } diff --git a/crates/vm/src/stdlib/_ast/expression.rs b/crates/vm/src/stdlib/_ast/expression.rs index 2b32a33f3..39f42652c 100644 --- a/crates/vm/src/stdlib/_ast/expression.rs +++ b/crates/vm/src/stdlib/_ast/expression.rs @@ -1,8 +1,7 @@ use super::*; -use crate::stdlib::_ast::{ - argument::{merge_function_call_arguments, split_function_call_arguments}, - constant::Constant, - string::JoinedStr, +use crate::stdlib::_ast::argument::{ + KeywordArguments, PositionalArguments, merge_function_call_arguments, + split_function_call_arguments, }; use rustpython_compiler_core::SourceFile; @@ -27,6 +26,7 @@ impl Node for ast::Expr { Self::YieldFrom(cons) => cons.ast_to_object(vm, source_file), Self::Compare(cons) => cons.ast_to_object(vm, source_file), Self::Call(cons) => cons.ast_to_object(vm, source_file), + Self::Constant(cons) => constant::expr_constant_to_object(vm, source_file, cons), Self::Attribute(cons) => cons.ast_to_object(vm, source_file), Self::Subscript(cons) => cons.ast_to_object(vm, source_file), Self::Starred(cons) => cons.ast_to_object(vm, source_file), @@ -47,7 +47,7 @@ impl Node for ast::Expr { } Self::Named(cons) => cons.ast_to_object(vm, source_file), Self::IpyEscapeCommand(_) => { - unimplemented!("IPython escape command is not allowed in Python AST") + unreachable!("IPython escape command is not part of Python AST") } } } @@ -57,94 +57,307 @@ impl Node for ast::Expr { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - let cls = object.class(); - Ok(if cls.is(pyast::NodeExprBoolOp::static_type()) { - Self::BoolOp(ast::ExprBoolOp::ast_from_object(vm, source_file, object)?) - } else if cls.is(pyast::NodeExprNamedExpr::static_type()) { - Self::Named(ast::ExprNamed::ast_from_object(vm, source_file, object)?) - } else if cls.is(pyast::NodeExprBinOp::static_type()) { - Self::BinOp(ast::ExprBinOp::ast_from_object(vm, source_file, object)?) - } else if cls.is(pyast::NodeExprUnaryOp::static_type()) { - Self::UnaryOp(ast::ExprUnaryOp::ast_from_object(vm, source_file, object)?) - } else if cls.is(pyast::NodeExprLambda::static_type()) { - Self::Lambda(ast::ExprLambda::ast_from_object(vm, source_file, object)?) - } else if cls.is(pyast::NodeExprIfExp::static_type()) { - Self::If(ast::ExprIf::ast_from_object(vm, source_file, object)?) - } else if cls.is(pyast::NodeExprDict::static_type()) { - Self::Dict(ast::ExprDict::ast_from_object(vm, source_file, object)?) - } else if cls.is(pyast::NodeExprSet::static_type()) { - Self::Set(ast::ExprSet::ast_from_object(vm, source_file, object)?) - } else if cls.is(pyast::NodeExprListComp::static_type()) { - Self::ListComp(ast::ExprListComp::ast_from_object(vm, source_file, object)?) - } else if cls.is(pyast::NodeExprSetComp::static_type()) { - Self::SetComp(ast::ExprSetComp::ast_from_object(vm, source_file, object)?) - } else if cls.is(pyast::NodeExprDictComp::static_type()) { - Self::DictComp(ast::ExprDictComp::ast_from_object(vm, source_file, object)?) - } else if cls.is(pyast::NodeExprGeneratorExp::static_type()) { - Self::Generator(ast::ExprGenerator::ast_from_object( - vm, - source_file, - object, - )?) - } else if cls.is(pyast::NodeExprAwait::static_type()) { - Self::Await(ast::ExprAwait::ast_from_object(vm, source_file, object)?) - } else if cls.is(pyast::NodeExprYield::static_type()) { - Self::Yield(ast::ExprYield::ast_from_object(vm, source_file, object)?) - } else if cls.is(pyast::NodeExprYieldFrom::static_type()) { - Self::YieldFrom(ast::ExprYieldFrom::ast_from_object( - vm, - source_file, - object, - )?) - } else if cls.is(pyast::NodeExprCompare::static_type()) { - Self::Compare(ast::ExprCompare::ast_from_object(vm, source_file, object)?) - } else if cls.is(pyast::NodeExprCall::static_type()) { - Self::Call(ast::ExprCall::ast_from_object(vm, source_file, object)?) - } else if cls.is(pyast::NodeExprAttribute::static_type()) { - Self::Attribute(ast::ExprAttribute::ast_from_object( - vm, - source_file, - object, - )?) - } else if cls.is(pyast::NodeExprSubscript::static_type()) { - Self::Subscript(ast::ExprSubscript::ast_from_object( - vm, - source_file, - object, - )?) - } else if cls.is(pyast::NodeExprStarred::static_type()) { - Self::Starred(ast::ExprStarred::ast_from_object(vm, source_file, object)?) - } else if cls.is(pyast::NodeExprName::static_type()) { - Self::Name(ast::ExprName::ast_from_object(vm, source_file, object)?) - } else if cls.is(pyast::NodeExprList::static_type()) { - Self::List(ast::ExprList::ast_from_object(vm, source_file, object)?) - } else if cls.is(pyast::NodeExprTuple::static_type()) { - Self::Tuple(ast::ExprTuple::ast_from_object(vm, source_file, object)?) - } else if cls.is(pyast::NodeExprSlice::static_type()) { - Self::Slice(ast::ExprSlice::ast_from_object(vm, source_file, object)?) - } else if cls.is(pyast::NodeExprConstant::static_type()) { - Constant::ast_from_object(vm, source_file, object)?.into_expr() - } else if cls.is(pyast::NodeExprJoinedStr::static_type()) { - JoinedStr::ast_from_object(vm, source_file, object)?.into_expr() - } else if cls.is(pyast::NodeExprTemplateStr::static_type()) { - let template = string::TemplateStr::ast_from_object(vm, source_file, object)?; - return string::template_str_to_expr(vm, template); - } else if cls.is(pyast::NodeExprInterpolation::static_type()) { - let interpolation = - string::TStringInterpolation::ast_from_object(vm, source_file, object)?; - return string::interpolation_to_expr(vm, interpolation); - } else if vm.is_none(&object) { - return Err(vm.new_value_error("None disallowed in expression list")); + if vm.is_none(&object) { + return Err(vm.new_type_error(format!( + "expected some sort of expr, but got {}", + object.repr(vm)? + ))); + } + enum ExprKind { + BoolOp, + Named, + BinOp, + UnaryOp, + Lambda, + If, + Dict, + Set, + ListComp, + SetComp, + DictComp, + Generator, + Await, + Yield, + YieldFrom, + Compare, + Call, + FormattedValue, + Interpolation, + JoinedStr, + TemplateStr, + Constant, + Attribute, + Subscript, + Starred, + Name, + List, + Tuple, + Slice, + } + let kind = if is_node_instance(vm, &object, pyast::NodeExprBoolOp::static_type())? { + ExprKind::BoolOp + } else if is_node_instance(vm, &object, pyast::NodeExprNamedExpr::static_type())? { + ExprKind::Named + } else if is_node_instance(vm, &object, pyast::NodeExprBinOp::static_type())? { + ExprKind::BinOp + } else if is_node_instance(vm, &object, pyast::NodeExprUnaryOp::static_type())? { + ExprKind::UnaryOp + } else if is_node_instance(vm, &object, pyast::NodeExprLambda::static_type())? { + ExprKind::Lambda + } else if is_node_instance(vm, &object, pyast::NodeExprIfExp::static_type())? { + ExprKind::If + } else if is_node_instance(vm, &object, pyast::NodeExprDict::static_type())? { + ExprKind::Dict + } else if is_node_instance(vm, &object, pyast::NodeExprSet::static_type())? { + ExprKind::Set + } else if is_node_instance(vm, &object, pyast::NodeExprListComp::static_type())? { + ExprKind::ListComp + } else if is_node_instance(vm, &object, pyast::NodeExprSetComp::static_type())? { + ExprKind::SetComp + } else if is_node_instance(vm, &object, pyast::NodeExprDictComp::static_type())? { + ExprKind::DictComp + } else if is_node_instance(vm, &object, pyast::NodeExprGeneratorExp::static_type())? { + ExprKind::Generator + } else if is_node_instance(vm, &object, pyast::NodeExprAwait::static_type())? { + ExprKind::Await + } else if is_node_instance(vm, &object, pyast::NodeExprYield::static_type())? { + ExprKind::Yield + } else if is_node_instance(vm, &object, pyast::NodeExprYieldFrom::static_type())? { + ExprKind::YieldFrom + } else if is_node_instance(vm, &object, pyast::NodeExprCompare::static_type())? { + ExprKind::Compare + } else if is_node_instance(vm, &object, pyast::NodeExprCall::static_type())? { + ExprKind::Call + } else if is_node_instance(vm, &object, pyast::NodeExprFormattedValue::static_type())? { + ExprKind::FormattedValue + } else if is_node_instance(vm, &object, pyast::NodeExprInterpolation::static_type())? { + ExprKind::Interpolation + } else if is_node_instance(vm, &object, pyast::NodeExprJoinedStr::static_type())? { + ExprKind::JoinedStr + } else if is_node_instance(vm, &object, pyast::NodeExprTemplateStr::static_type())? { + ExprKind::TemplateStr + } else if is_node_instance(vm, &object, pyast::NodeExprConstant::static_type())? { + ExprKind::Constant + } else if is_node_instance(vm, &object, pyast::NodeExprAttribute::static_type())? { + ExprKind::Attribute + } else if is_node_instance(vm, &object, pyast::NodeExprSubscript::static_type())? { + ExprKind::Subscript + } else if is_node_instance(vm, &object, pyast::NodeExprStarred::static_type())? { + ExprKind::Starred + } else if is_node_instance(vm, &object, pyast::NodeExprName::static_type())? { + ExprKind::Name + } else if is_node_instance(vm, &object, pyast::NodeExprList::static_type())? { + ExprKind::List + } else if is_node_instance(vm, &object, pyast::NodeExprTuple::static_type())? { + ExprKind::Tuple + } else if is_node_instance(vm, &object, pyast::NodeExprSlice::static_type())? { + ExprKind::Slice } else { return Err(vm.new_type_error(format!( "expected some sort of expr, but got {}", object.repr(vm)? ))); + }; + let range = expr_range_from_object(vm, source_file, object.clone())?; + Ok(match kind { + ExprKind::BoolOp => Self::BoolOp(expr_bool_op_from_object_with_range( + vm, + source_file, + object, + range, + )?), + ExprKind::Named => Self::Named(expr_named_from_object_with_range( + vm, + source_file, + object, + range, + )?), + ExprKind::BinOp => Self::BinOp(expr_bin_op_from_object_with_range( + vm, + source_file, + object, + range, + )?), + ExprKind::UnaryOp => Self::UnaryOp(expr_unary_op_from_object_with_range( + vm, + source_file, + object, + range, + )?), + ExprKind::Lambda => Self::Lambda(expr_lambda_from_object_with_range( + vm, + source_file, + object, + range, + )?), + ExprKind::If => Self::If(expr_if_from_object_with_range( + vm, + source_file, + object, + range, + )?), + ExprKind::Dict => Self::Dict(expr_dict_from_object_with_range( + vm, + source_file, + object, + range, + )?), + ExprKind::Set => Self::Set(expr_set_from_object_with_range( + vm, + source_file, + object, + range, + )?), + ExprKind::ListComp => Self::ListComp(expr_list_comp_from_object_with_range( + vm, + source_file, + object, + range, + )?), + ExprKind::SetComp => Self::SetComp(expr_set_comp_from_object_with_range( + vm, + source_file, + object, + range, + )?), + ExprKind::DictComp => Self::DictComp(expr_dict_comp_from_object_with_range( + vm, + source_file, + object, + range, + )?), + ExprKind::Generator => Self::Generator(expr_generator_from_object_with_range( + vm, + source_file, + object, + range, + )?), + ExprKind::Await => Self::Await(expr_await_from_object_with_range( + vm, + source_file, + object, + range, + )?), + ExprKind::Yield => Self::Yield(expr_yield_from_object_with_range( + vm, + source_file, + object, + range, + )?), + ExprKind::YieldFrom => Self::YieldFrom(expr_yield_from_from_object_with_range( + vm, + source_file, + object, + range, + )?), + ExprKind::Compare => Self::Compare(expr_compare_from_object_with_range( + vm, + source_file, + object, + range, + )?), + ExprKind::Call => Self::Call(expr_call_from_object_with_range( + vm, + source_file, + object, + range, + )?), + ExprKind::FormattedValue => { + let formatted = + string::formatted_value_from_object_with_range(vm, source_file, object, range)?; + string::formatted_value_to_expr(true, formatted) + } + ExprKind::Interpolation => { + let interpolation = string::tstring_interpolation_from_object_with_range( + vm, + source_file, + object, + range, + )?; + string::interpolation_to_expr(vm, source_file, interpolation)? + } + ExprKind::JoinedStr => { + string::joined_str_from_object_with_range(vm, source_file, object, range)? + .into_expr(true) + } + ExprKind::TemplateStr => { + let template = + string::template_str_from_object_with_range(vm, source_file, object, range)?; + string::template_str_to_expr(vm, source_file, template)? + } + ExprKind::Constant => { + constant::constant_from_object_with_range(vm, source_file, object, range)? + .into_expr() + } + ExprKind::Attribute => Self::Attribute(expr_attribute_from_object_with_range( + vm, + source_file, + object, + range, + )?), + ExprKind::Subscript => Self::Subscript(expr_subscript_from_object_with_range( + vm, + source_file, + object, + range, + )?), + ExprKind::Starred => Self::Starred(expr_starred_from_object_with_range( + vm, + source_file, + object, + range, + )?), + ExprKind::Name => Self::Name(expr_name_from_object_with_range( + vm, + source_file, + object, + range, + )?), + ExprKind::List => Self::List(expr_list_from_object_with_range( + vm, + source_file, + object, + range, + )?), + ExprKind::Tuple => Self::Tuple(expr_tuple_from_object_with_range( + vm, + source_file, + object, + range, + )?), + ExprKind::Slice => Self::Slice(expr_slice_from_object_with_range( + vm, + source_file, + object, + range, + )?), }) } } // constructor +fn expr_bool_op_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::ExprBoolOp> { + let values: Vec<Option<ast::Expr>> = + get_node_list_field(vm, source_file, &object, "values", "BoolOp")?; + let (runtime_values, values) = runtime_expr_list_from_values(values); + Ok(ast::ExprBoolOp { + node_index: Default::default(), + op: Node::ast_from_object( + vm, + source_file, + get_node_field_required(vm, &object, "op", "BoolOp")?, + )?, + values, + range, + runtime_values, + }) +} + impl Node for ast::ExprBoolOp { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { @@ -152,6 +365,7 @@ impl Node for ast::ExprBoolOp { op, values, range, + runtime_values, } = self; let node = NodeAst .into_ref_with_type(vm, pyast::NodeExprBoolOp::static_type().to_owned()) @@ -159,8 +373,11 @@ impl Node for ast::ExprBoolOp { let dict = node.as_object().dict().unwrap(); dict.set_item("op", op.ast_to_object(vm, source_file), vm) .unwrap(); - dict.set_item("values", values.ast_to_object(vm, source_file), vm) - .unwrap(); + let values = runtime_values.map_or_else( + || values.ast_to_object(vm, source_file), + |values| values.ast_to_object(vm, source_file), + ); + dict.set_item("values", values, vm).unwrap(); node_add_location(&dict, range, vm, source_file); node.into() } @@ -170,24 +387,26 @@ impl Node for ast::ExprBoolOp { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - op: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "op", "BoolOp")?, - )?, - values: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "values", "BoolOp")?, - )?, - range: range_from_object(vm, source_file, object, "BoolOp")?, - }) + let range = range_from_object(vm, source_file, object.clone(), "BoolOp")?; + expr_bool_op_from_object_with_range(vm, source_file, object, range) } } // constructor +fn expr_named_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::ExprNamed> { + Ok(ast::ExprNamed { + node_index: Default::default(), + target: get_required_node_field(vm, source_file, &object, "target", "NamedExpr")?, + value: get_required_node_field(vm, source_file, &object, "value", "NamedExpr")?, + range, + }) +} + impl Node for ast::ExprNamed { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { @@ -213,24 +432,31 @@ impl Node for ast::ExprNamed { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - target: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "target", "NamedExpr")?, - )?, - value: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "value", "NamedExpr")?, - )?, - range: range_from_object(vm, source_file, object, "NamedExpr")?, - }) + let range = range_from_object(vm, source_file, object.clone(), "NamedExpr")?; + expr_named_from_object_with_range(vm, source_file, object, range) } } // constructor +fn expr_bin_op_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::ExprBinOp> { + Ok(ast::ExprBinOp { + node_index: Default::default(), + left: get_required_node_field(vm, source_file, &object, "left", "BinOp")?, + op: Node::ast_from_object( + vm, + source_file, + get_node_field_required(vm, &object, "op", "BinOp")?, + )?, + right: get_required_node_field(vm, source_file, &object, "right", "BinOp")?, + range, + }) +} + impl Node for ast::ExprBinOp { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { @@ -259,29 +485,30 @@ impl Node for ast::ExprBinOp { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - left: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "left", "BinOp")?, - )?, - op: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "op", "BinOp")?, - )?, - right: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "right", "BinOp")?, - )?, - range: range_from_object(vm, source_file, object, "BinOp")?, - }) + let range = range_from_object(vm, source_file, object.clone(), "BinOp")?; + expr_bin_op_from_object_with_range(vm, source_file, object, range) } } // constructor +fn expr_unary_op_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::ExprUnaryOp> { + Ok(ast::ExprUnaryOp { + node_index: Default::default(), + op: Node::ast_from_object( + vm, + source_file, + get_node_field_required(vm, &object, "op", "UnaryOp")?, + )?, + operand: get_required_node_field(vm, source_file, &object, "operand", "UnaryOp")?, + range, + }) +} + impl Node for ast::ExprUnaryOp { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { @@ -306,24 +533,30 @@ impl Node for ast::ExprUnaryOp { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - op: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "op", "UnaryOp")?, - )?, - operand: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "operand", "UnaryOp")?, - )?, - range: range_from_object(vm, source_file, object, "UnaryOp")?, - }) + let range = range_from_object(vm, source_file, object.clone(), "UnaryOp")?; + expr_unary_op_from_object_with_range(vm, source_file, object, range) } } // constructor +fn expr_lambda_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::ExprLambda> { + Ok(ast::ExprLambda { + node_index: Default::default(), + parameters: Node::ast_from_object( + vm, + source_file, + get_node_field_required(vm, &object, "args", "Lambda")?, + )?, + body: get_required_node_field(vm, source_file, &object, "body", "Lambda")?, + range, + }) +} + impl Node for ast::ExprLambda { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { @@ -336,7 +569,6 @@ impl Node for ast::ExprLambda { .into_ref_with_type(vm, pyast::NodeExprLambda::static_type().to_owned()) .unwrap(); let dict = node.as_object().dict().unwrap(); - // Lambda with no parameters should have an empty arguments object, not None let args = match parameters { Some(params) => params.ast_to_object(vm, source_file), None => empty_arguments_object(vm), @@ -353,24 +585,27 @@ impl Node for ast::ExprLambda { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - parameters: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "args", "Lambda")?, - )?, - body: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "body", "Lambda")?, - )?, - range: range_from_object(vm, source_file, object, "Lambda")?, - }) + let range = range_from_object(vm, source_file, object.clone(), "Lambda")?; + expr_lambda_from_object_with_range(vm, source_file, object, range) } } // constructor +fn expr_if_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::ExprIf> { + Ok(ast::ExprIf { + node_index: Default::default(), + test: get_required_node_field(vm, source_file, &object, "test", "IfExp")?, + body: get_required_node_field(vm, source_file, &object, "body", "IfExp")?, + orelse: get_required_node_field(vm, source_file, &object, "orelse", "IfExp")?, + range, + }) +} + impl Node for ast::ExprIf { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { @@ -399,35 +634,46 @@ impl Node for ast::ExprIf { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - test: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "test", "IfExp")?, - )?, - body: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "body", "IfExp")?, - )?, - orelse: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "orelse", "IfExp")?, - )?, - range: range_from_object(vm, source_file, object, "IfExp")?, - }) + let range = range_from_object(vm, source_file, object.clone(), "IfExp")?; + expr_if_from_object_with_range(vm, source_file, object, range) } } // constructor +fn expr_dict_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::ExprDict> { + let keys: Vec<Option<ast::Expr>> = + get_node_list_field(vm, source_file, &object, "keys", "Dict")?; + let values: Vec<Option<ast::Expr>> = + get_node_list_field(vm, source_file, &object, "values", "Dict")?; + if keys.len() != values.len() { + return Err(vm.new_value_error("Dict doesn't have the same number of keys as values")); + } + let runtime_values = runtime_expr_list_metadata(&values); + let items = keys + .into_iter() + .zip(lower_runtime_expr_list(values)) + .map(|(key, value)| ast::DictItem { key, value }) + .collect(); + Ok(ast::ExprDict { + node_index: Default::default(), + items, + range, + runtime_values, + }) +} + impl Node for ast::ExprDict { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { node_index: _, items, range, + runtime_values, } = self; let (keys, values) = items @@ -443,8 +689,11 @@ impl Node for ast::ExprDict { let dict = node.as_object().dict().unwrap(); dict.set_item("keys", keys.ast_to_object(vm, source_file), vm) .unwrap(); - dict.set_item("values", values.ast_to_object(vm, source_file), vm) - .unwrap(); + let values = runtime_values.map_or_else( + || values.ast_to_object(vm, source_file), + |values| values.ast_to_object(vm, source_file), + ); + dict.set_item("values", values, vm).unwrap(); node_add_location(&dict, range, vm, source_file); node.into() } @@ -454,46 +703,46 @@ impl Node for ast::ExprDict { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - let keys: Vec<Option<ast::Expr>> = Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "keys", "Dict")?, - )?; - let values: Vec<_> = Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "values", "Dict")?, - )?; - if keys.len() != values.len() { - return Err(vm.new_value_error("Dict doesn't have the same number of keys as values")); - } - let items = keys - .into_iter() - .zip(values) - .map(|(key, value)| ast::DictItem { key, value }) - .collect(); - Ok(Self { - node_index: Default::default(), - items, - range: range_from_object(vm, source_file, object, "Dict")?, - }) + let range = range_from_object(vm, source_file, object.clone(), "Dict")?; + expr_dict_from_object_with_range(vm, source_file, object, range) } } // constructor +fn expr_set_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::ExprSet> { + let elts: Vec<Option<ast::Expr>> = + get_node_list_field(vm, source_file, &object, "elts", "Set")?; + let (runtime_elts, elts) = runtime_expr_list_from_values(elts); + Ok(ast::ExprSet { + node_index: Default::default(), + elts, + range, + runtime_elts, + }) +} + impl Node for ast::ExprSet { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { node_index: _, elts, range, + runtime_elts, } = self; let node = NodeAst .into_ref_with_type(vm, pyast::NodeExprSet::static_type().to_owned()) .unwrap(); let dict = node.as_object().dict().unwrap(); - dict.set_item("elts", elts.ast_to_object(vm, source_file), vm) - .unwrap(); + let elts = runtime_elts.map_or_else( + || elts.ast_to_object(vm, source_file), + |values| values.ast_to_object(vm, source_file), + ); + dict.set_item("elts", elts, vm).unwrap(); node_add_location(&dict, range, vm, source_file); node.into() } @@ -502,19 +751,26 @@ impl Node for ast::ExprSet { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - elts: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "elts", "Set")?, - )?, - range: range_from_object(vm, source_file, object, "Set")?, - }) + let range = range_from_object(vm, source_file, object.clone(), "Set")?; + expr_set_from_object_with_range(vm, source_file, object, range) } } // constructor +fn expr_list_comp_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::ExprListComp> { + Ok(ast::ExprListComp { + node_index: Default::default(), + elt: get_required_node_field(vm, source_file, &object, "elt", "ListComp")?, + generators: get_node_list_field(vm, source_file, &object, "generators", "ListComp")?, + range, + }) +} + impl Node for ast::ExprListComp { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { @@ -540,24 +796,26 @@ impl Node for ast::ExprListComp { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - elt: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "elt", "ListComp")?, - )?, - generators: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "generators", "ListComp")?, - )?, - range: range_from_object(vm, source_file, object, "ListComp")?, - }) + let range = range_from_object(vm, source_file, object.clone(), "ListComp")?; + expr_list_comp_from_object_with_range(vm, source_file, object, range) } } // constructor +fn expr_set_comp_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::ExprSetComp> { + Ok(ast::ExprSetComp { + node_index: Default::default(), + elt: get_required_node_field(vm, source_file, &object, "elt", "SetComp")?, + generators: get_node_list_field(vm, source_file, &object, "generators", "SetComp")?, + range, + }) +} + impl Node for ast::ExprSetComp { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { @@ -583,24 +841,27 @@ impl Node for ast::ExprSetComp { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - elt: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "elt", "SetComp")?, - )?, - generators: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "generators", "SetComp")?, - )?, - range: range_from_object(vm, source_file, object, "SetComp")?, - }) + let range = range_from_object(vm, source_file, object.clone(), "SetComp")?; + expr_set_comp_from_object_with_range(vm, source_file, object, range) } } // constructor +fn expr_dict_comp_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::ExprDictComp> { + Ok(ast::ExprDictComp { + node_index: Default::default(), + key: get_required_node_field(vm, source_file, &object, "key", "DictComp")?, + value: get_required_node_field(vm, source_file, &object, "value", "DictComp")?, + generators: get_node_list_field(vm, source_file, &object, "generators", "DictComp")?, + range, + }) +} + impl Node for ast::ExprDictComp { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { @@ -629,29 +890,27 @@ impl Node for ast::ExprDictComp { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - key: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "key", "DictComp")?, - )?, - value: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "value", "DictComp")?, - )?, - generators: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "generators", "DictComp")?, - )?, - range: range_from_object(vm, source_file, object, "DictComp")?, - }) + let range = range_from_object(vm, source_file, object.clone(), "DictComp")?; + expr_dict_comp_from_object_with_range(vm, source_file, object, range) } } // constructor +fn expr_generator_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::ExprGenerator> { + Ok(ast::ExprGenerator { + node_index: Default::default(), + elt: get_required_node_field(vm, source_file, &object, "elt", "GeneratorExp")?, + generators: get_node_list_field(vm, source_file, &object, "generators", "GeneratorExp")?, + range, + parenthesized: true, + }) +} + impl Node for ast::ExprGenerator { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { @@ -688,26 +947,25 @@ impl Node for ast::ExprGenerator { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - elt: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "elt", "GeneratorExp")?, - )?, - generators: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "generators", "GeneratorExp")?, - )?, - range: range_from_object(vm, source_file, object, "GeneratorExp")?, - // TODO: Is this correct? - parenthesized: true, - }) + let range = range_from_object(vm, source_file, object.clone(), "GeneratorExp")?; + expr_generator_from_object_with_range(vm, source_file, object, range) } } // constructor +fn expr_await_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::ExprAwait> { + Ok(ast::ExprAwait { + node_index: Default::default(), + value: get_required_node_field(vm, source_file, &object, "value", "Await")?, + range, + }) +} + impl Node for ast::ExprAwait { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { @@ -729,19 +987,27 @@ impl Node for ast::ExprAwait { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - value: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "value", "Await")?, - )?, - range: range_from_object(vm, source_file, object, "Await")?, - }) + let range = range_from_object(vm, source_file, object.clone(), "Await")?; + expr_await_from_object_with_range(vm, source_file, object, range) } } // constructor +fn expr_yield_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::ExprYield> { + Ok(ast::ExprYield { + node_index: Default::default(), + value: get_node_field_opt(vm, &object, "value")? + .map(|obj| Node::ast_from_object(vm, source_file, obj)) + .transpose()?, + range, + }) +} + impl Node for ast::ExprYield { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { @@ -764,17 +1030,25 @@ impl Node for ast::ExprYield { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - value: get_node_field_opt(vm, &object, "value")? - .map(|obj| Node::ast_from_object(vm, source_file, obj)) - .transpose()?, - range: range_from_object(vm, source_file, object, "Yield")?, - }) + let range = range_from_object(vm, source_file, object.clone(), "Yield")?; + expr_yield_from_object_with_range(vm, source_file, object, range) } } // constructor +fn expr_yield_from_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::ExprYieldFrom> { + Ok(ast::ExprYieldFrom { + node_index: Default::default(), + value: get_required_node_field(vm, source_file, &object, "value", "YieldFrom")?, + range, + }) +} + impl Node for ast::ExprYieldFrom { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { @@ -797,19 +1071,31 @@ impl Node for ast::ExprYieldFrom { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - value: Node::ast_from_object( - vm, - source_file, - get_node_field_required(vm, &object, "value", "YieldFrom")?, - )?, - range: range_from_object(vm, source_file, object, "YieldFrom")?, - }) + let range = range_from_object(vm, source_file, object.clone(), "YieldFrom")?; + expr_yield_from_from_object_with_range(vm, source_file, object, range) } } // constructor +fn expr_compare_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::ExprCompare> { + let comparators: Vec<Option<ast::Expr>> = + get_node_list_field(vm, source_file, &object, "comparators", "Compare")?; + let (runtime_comparators, comparators) = runtime_expr_boxed_slice_from_values(comparators); + Ok(ast::ExprCompare { + node_index: Default::default(), + left: get_required_node_field(vm, source_file, &object, "left", "Compare")?, + ops: get_node_boxed_slice_field(vm, source_file, &object, "ops", "Compare")?, + comparators, + range, + runtime_comparators, + }) +} + impl Node for ast::ExprCompare { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { @@ -818,6 +1104,7 @@ impl Node for ast::ExprCompare { ops, comparators, range, + runtime_comparators, } = self; let node = NodeAst .into_ref_with_type(vm, pyast::NodeExprCompare::static_type().to_owned()) @@ -827,12 +1114,11 @@ impl Node for ast::ExprCompare { .unwrap(); dict.set_item("ops", BoxedSlice(ops).ast_to_object(vm, source_file), vm) .unwrap(); - dict.set_item( - "comparators", - BoxedSlice(comparators).ast_to_object(vm, source_file), - vm, - ) - .unwrap(); + let comparators = runtime_comparators.map_or_else( + || BoxedSlice(comparators).ast_to_object(vm, source_file), + |values| values.ast_to_object(vm, source_file), + ); + dict.set_item("comparators", comparators, vm).unwrap(); node_add_location(&dict, range, vm, source_file); node.into() } @@ -842,35 +1128,29 @@ impl Node for ast::ExprCompare { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - left: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "left", "Compare")?, - )?, - ops: { - let ops: BoxedSlice<_> = Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "ops", "Compare")?, - )?; - ops.0 - }, - comparators: { - let comparators: BoxedSlice<_> = Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "comparators", "Compare")?, - )?; - comparators.0 - }, - range: range_from_object(vm, source_file, object, "Compare")?, - }) + let range = range_from_object(vm, source_file, object.clone(), "Compare")?; + expr_compare_from_object_with_range(vm, source_file, object, range) } } // constructor +fn expr_call_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::ExprCall> { + Ok(ast::ExprCall { + node_index: Default::default(), + func: get_required_node_field(vm, source_file, &object, "func", "Call")?, + arguments: merge_function_call_arguments( + PositionalArguments::ast_from_field(vm, source_file, &object, "args", "Call")?, + KeywordArguments::ast_from_field(vm, source_file, &object, "keywords", "Call")?, + ), + range, + }) +} + impl Node for ast::ExprCall { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { @@ -907,31 +1187,31 @@ impl Node for ast::ExprCall { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - func: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "func", "Call")?, - )?, - arguments: merge_function_call_arguments( - Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "args", "Call")?, - )?, - Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "keywords", "Call")?, - )?, - ), - range: range_from_object(vm, source_file, object, "Call")?, - }) + let range = range_from_object(vm, source_file, object.clone(), "Call")?; + expr_call_from_object_with_range(vm, source_file, object, range) } } // constructor +fn expr_attribute_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::ExprAttribute> { + Ok(ast::ExprAttribute { + node_index: Default::default(), + value: get_required_node_field(vm, source_file, &object, "value", "Attribute")?, + attr: get_required_identifier_field(vm, source_file, &object, "attr", "Attribute")?, + ctx: Node::ast_from_object( + vm, + source_file, + get_node_field_required(vm, &object, "ctx", "Attribute")?, + )?, + range, + }) +} + impl Node for ast::ExprAttribute { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { @@ -960,29 +1240,31 @@ impl Node for ast::ExprAttribute { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - value: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "value", "Attribute")?, - )?, - attr: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "attr", "Attribute")?, - )?, - ctx: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "ctx", "Attribute")?, - )?, - range: range_from_object(vm, source_file, object, "Attribute")?, - }) + let range = range_from_object(vm, source_file, object.clone(), "Attribute")?; + expr_attribute_from_object_with_range(vm, source_file, object, range) } } // constructor +fn expr_subscript_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::ExprSubscript> { + Ok(ast::ExprSubscript { + node_index: Default::default(), + value: get_required_node_field(vm, source_file, &object, "value", "Subscript")?, + slice: get_required_node_field(vm, source_file, &object, "slice", "Subscript")?, + ctx: Node::ast_from_object( + vm, + source_file, + get_node_field_required(vm, &object, "ctx", "Subscript")?, + )?, + range, + }) +} + impl Node for ast::ExprSubscript { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { @@ -1010,29 +1292,30 @@ impl Node for ast::ExprSubscript { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - value: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "value", "Subscript")?, - )?, - slice: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "slice", "Subscript")?, - )?, - ctx: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "ctx", "Subscript")?, - )?, - range: range_from_object(vm, source_file, object, "Subscript")?, - }) + let range = range_from_object(vm, source_file, object.clone(), "Subscript")?; + expr_subscript_from_object_with_range(vm, source_file, object, range) } } // constructor +fn expr_starred_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::ExprStarred> { + Ok(ast::ExprStarred { + node_index: Default::default(), + value: get_required_node_field(vm, source_file, &object, "value", "Starred")?, + ctx: Node::ast_from_object( + vm, + source_file, + get_node_field_required(vm, &object, "ctx", "Starred")?, + )?, + range, + }) +} + impl Node for ast::ExprStarred { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { @@ -1057,24 +1340,30 @@ impl Node for ast::ExprStarred { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - value: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "value", "Starred")?, - )?, - ctx: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "ctx", "Starred")?, - )?, - range: range_from_object(vm, source_file, object, "Starred")?, - }) + let range = range_from_object(vm, source_file, object.clone(), "Starred")?; + expr_starred_from_object_with_range(vm, source_file, object, range) } } // constructor +fn expr_name_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::ExprName> { + Ok(ast::ExprName { + node_index: Default::default(), + id: get_required_identifier_field(vm, source_file, &object, "id", "Name")?, + ctx: Node::ast_from_object( + vm, + source_file, + get_node_field_required(vm, &object, "ctx", "Name")?, + )?, + range, + }) +} + impl Node for ast::ExprName { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { @@ -1099,20 +1388,34 @@ impl Node for ast::ExprName { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - id: Node::ast_from_object(vm, source_file, get_node_field(vm, &object, "id", "Name")?)?, - ctx: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "ctx", "Name")?, - )?, - range: range_from_object(vm, source_file, object, "Name")?, - }) + let range = range_from_object(vm, source_file, object.clone(), "Name")?; + expr_name_from_object_with_range(vm, source_file, object, range) } } // constructor +fn expr_list_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::ExprList> { + let elts: Vec<Option<ast::Expr>> = + get_node_list_field(vm, source_file, &object, "elts", "List")?; + let (runtime_elts, elts) = runtime_expr_list_from_values(elts); + Ok(ast::ExprList { + node_index: Default::default(), + elts, + ctx: Node::ast_from_object( + vm, + source_file, + get_node_field_required(vm, &object, "ctx", "List")?, + )?, + range, + runtime_elts, + }) +} + impl Node for ast::ExprList { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { @@ -1120,13 +1423,17 @@ impl Node for ast::ExprList { elts, ctx, range, + runtime_elts, } = self; let node = NodeAst .into_ref_with_type(vm, pyast::NodeExprList::static_type().to_owned()) .unwrap(); let dict = node.as_object().dict().unwrap(); - dict.set_item("elts", elts.ast_to_object(vm, source_file), vm) - .unwrap(); + let elts = runtime_elts.map_or_else( + || elts.ast_to_object(vm, source_file), + |values| values.ast_to_object(vm, source_file), + ); + dict.set_item("elts", elts, vm).unwrap(); dict.set_item("ctx", ctx.ast_to_object(vm, source_file), vm) .unwrap(); node_add_location(&dict, range, vm, source_file); @@ -1138,24 +1445,35 @@ impl Node for ast::ExprList { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - elts: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "elts", "List")?, - )?, - ctx: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "ctx", "List")?, - )?, - range: range_from_object(vm, source_file, object, "List")?, - }) + let range = range_from_object(vm, source_file, object.clone(), "List")?; + expr_list_from_object_with_range(vm, source_file, object, range) } } // constructor +fn expr_tuple_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::ExprTuple> { + let elts: Vec<Option<ast::Expr>> = + get_node_list_field(vm, source_file, &object, "elts", "Tuple")?; + let (runtime_elts, elts) = runtime_expr_list_from_values(elts); + Ok(ast::ExprTuple { + node_index: Default::default(), + elts, + ctx: Node::ast_from_object( + vm, + source_file, + get_node_field_required(vm, &object, "ctx", "Tuple")?, + )?, + range, + parenthesized: true, + runtime_elts, + }) +} + impl Node for ast::ExprTuple { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { @@ -1164,13 +1482,17 @@ impl Node for ast::ExprTuple { ctx, range: _range, parenthesized: _, + runtime_elts, } = self; let node = NodeAst .into_ref_with_type(vm, pyast::NodeExprTuple::static_type().to_owned()) .unwrap(); let dict = node.as_object().dict().unwrap(); - dict.set_item("elts", elts.ast_to_object(vm, source_file), vm) - .unwrap(); + let elts = runtime_elts.map_or_else( + || elts.ast_to_object(vm, source_file), + |values| values.ast_to_object(vm, source_file), + ); + dict.set_item("elts", elts, vm).unwrap(); dict.set_item("ctx", ctx.ast_to_object(vm, source_file), vm) .unwrap(); node_add_location(&dict, _range, vm, source_file); @@ -1182,25 +1504,33 @@ impl Node for ast::ExprTuple { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - elts: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "elts", "Tuple")?, - )?, - ctx: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "ctx", "Tuple")?, - )?, - range: range_from_object(vm, source_file, object, "Tuple")?, - parenthesized: true, // TODO: is this correct? - }) + let range = range_from_object(vm, source_file, object.clone(), "Tuple")?; + expr_tuple_from_object_with_range(vm, source_file, object, range) } } // constructor +fn expr_slice_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::ExprSlice> { + Ok(ast::ExprSlice { + node_index: Default::default(), + lower: get_node_field_opt(vm, &object, "lower")? + .map(|obj| Node::ast_from_object(vm, source_file, obj)) + .transpose()?, + upper: get_node_field_opt(vm, &object, "upper")? + .map(|obj| Node::ast_from_object(vm, source_file, obj)) + .transpose()?, + step: get_node_field_opt(vm, &object, "step")? + .map(|obj| Node::ast_from_object(vm, source_file, obj)) + .transpose()?, + range, + }) +} + impl Node for ast::ExprSlice { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { @@ -1229,19 +1559,8 @@ impl Node for ast::ExprSlice { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - lower: get_node_field_opt(vm, &object, "lower")? - .map(|obj| Node::ast_from_object(vm, source_file, obj)) - .transpose()?, - upper: get_node_field_opt(vm, &object, "upper")? - .map(|obj| Node::ast_from_object(vm, source_file, obj)) - .transpose()?, - step: get_node_field_opt(vm, &object, "step")? - .map(|obj| Node::ast_from_object(vm, source_file, obj)) - .transpose()?, - range: range_from_object(vm, source_file, object, "Slice")?, - }) + let range = range_from_object(vm, source_file, object.clone(), "Slice")?; + expr_slice_from_object_with_range(vm, source_file, object, range) } } @@ -1253,7 +1572,7 @@ impl Node for ast::ExprContext { Self::Store => pyast::NodeExprContextStore::static_type(), Self::Del => pyast::NodeExprContextDel::static_type(), Self::Invalid => { - unimplemented!("Invalid expression context is not allowed in Python AST") + unreachable!() } }; singleton_node_to_object(vm, node_type) @@ -1264,19 +1583,20 @@ impl Node for ast::ExprContext { _source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - let cls = object.class(); - Ok(if cls.is(pyast::NodeExprContextLoad::static_type()) { - Self::Load - } else if cls.is(pyast::NodeExprContextStore::static_type()) { - Self::Store - } else if cls.is(pyast::NodeExprContextDel::static_type()) { - Self::Del - } else { - return Err(vm.new_type_error(format!( - "expected some sort of expr_context, but got {}", - object.repr(vm)? - ))); - }) + Ok( + if is_node_instance(vm, &object, pyast::NodeExprContextLoad::static_type())? { + Self::Load + } else if is_node_instance(vm, &object, pyast::NodeExprContextStore::static_type())? { + Self::Store + } else if is_node_instance(vm, &object, pyast::NodeExprContextDel::static_type())? { + Self::Del + } else { + return Err(vm.new_type_error(format!( + "expected some sort of expr_context, but got {}", + object.repr(vm)? + ))); + }, + ) } } @@ -1290,6 +1610,8 @@ impl Node for ast::Comprehension { ifs, is_async, range: _range, + runtime_ifs, + runtime_is_async, } = self; let node = NodeAst .into_ref_with_type(vm, pyast::NodeComprehension::static_type().to_owned()) @@ -1299,10 +1621,16 @@ impl Node for ast::Comprehension { .unwrap(); dict.set_item("iter", iter.ast_to_object(vm, source_file), vm) .unwrap(); - dict.set_item("ifs", ifs.ast_to_object(vm, source_file), vm) - .unwrap(); - dict.set_item("is_async", is_async.ast_to_object(vm, source_file), vm) - .unwrap(); + let ifs = runtime_ifs.map_or_else( + || ifs.ast_to_object(vm, source_file), + |values| values.ast_to_object(vm, source_file), + ); + dict.set_item("ifs", ifs, vm).unwrap(); + let is_async = runtime_is_async.map_or_else( + || is_async.ast_to_object(vm, source_file), + |value| vm.ctx.new_int(value).into(), + ); + dict.set_item("is_async", is_async, vm).unwrap(); node.into() } @@ -1311,29 +1639,23 @@ impl Node for ast::Comprehension { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { + let ifs: Vec<Option<ast::Expr>> = + get_node_list_field(vm, source_file, &object, "ifs", "comprehension")?; + let is_async = node_object_to_i32( + vm, + get_node_field(vm, &object, "is_async", "comprehension")?, + )?; + let runtime_ifs = runtime_expr_list_metadata(&ifs); + let runtime_is_async = (is_async != 0 && is_async != 1).then_some(is_async); Ok(Self { node_index: Default::default(), - target: Node::ast_from_object( - vm, - source_file, - get_node_field_required(vm, &object, "target", "comprehension")?, - )?, - iter: Node::ast_from_object( - vm, - source_file, - get_node_field_required(vm, &object, "iter", "comprehension")?, - )?, - ifs: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "ifs", "comprehension")?, - )?, - is_async: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "is_async", "comprehension")?, - )?, + target: get_required_node_field(vm, source_file, &object, "target", "comprehension")?, + iter: get_required_node_field(vm, source_file, &object, "iter", "comprehension")?, + ifs: lower_runtime_expr_list(ifs), + is_async: is_async != 0, range: Default::default(), + runtime_ifs, + runtime_is_async, }) } } diff --git a/crates/vm/src/stdlib/_ast/module.rs b/crates/vm/src/stdlib/_ast/module.rs index b4c2468d3..37a6bc628 100644 --- a/crates/vm/src/stdlib/_ast/module.rs +++ b/crates/vm/src/stdlib/_ast/module.rs @@ -18,7 +18,7 @@ use rustpython_compiler_core::SourceFile; /// - `FunctionType`: A function signature with argument and return type /// annotations, representing the type hints of a function (e.g., `def add(x: int, y: int) -> int`). pub(super) enum Mod { - Module(ast::ModModule), + Module(ModModule), Interactive(ModInteractive), Expression(ast::ModExpression), FunctionType(ModFunctionType), @@ -40,53 +40,66 @@ impl Node for Mod { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - let cls = object.class(); - Ok(if cls.is(pyast::NodeModModule::static_type()) { - Self::Module(ast::ModModule::ast_from_object(vm, source_file, object)?) - } else if cls.is(pyast::NodeModInteractive::static_type()) { - Self::Interactive(ModInteractive::ast_from_object(vm, source_file, object)?) - } else if cls.is(pyast::NodeModExpression::static_type()) { - Self::Expression(ast::ModExpression::ast_from_object( - vm, - source_file, - object, - )?) - } else if cls.is(pyast::NodeModFunctionType::static_type()) { - Self::FunctionType(ModFunctionType::ast_from_object(vm, source_file, object)?) - } else { - return Err(vm.new_type_error(format!( - "expected some sort of mod, but got {}", - object.repr(vm)? - ))); - }) + Ok( + if object.is_instance(pyast::NodeModModule::static_type().as_object(), vm)? { + Self::Module(ModModule::ast_from_object(vm, source_file, object)?) + } else if object + .is_instance(pyast::NodeModInteractive::static_type().as_object(), vm)? + { + Self::Interactive(ModInteractive::ast_from_object(vm, source_file, object)?) + } else if object.is_instance(pyast::NodeModExpression::static_type().as_object(), vm)? { + Self::Expression(ast::ModExpression::ast_from_object( + vm, + source_file, + object, + )?) + } else if object + .is_instance(pyast::NodeModFunctionType::static_type().as_object(), vm)? + { + Self::FunctionType(ModFunctionType::ast_from_object(vm, source_file, object)?) + } else { + return Err(vm.new_type_error(format!( + "expected some sort of mod, but got {}", + object.repr(vm)? + ))); + }, + ) } } +pub(super) struct ModModule { + pub(crate) module: ast::ModModule, + pub(crate) type_ignores: Vec<TypeIgnore>, +} + // constructor -impl Node for ast::ModModule { +impl Node for ModModule { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { + module, + type_ignores, + } = self; + let ast::ModModule { node_index: _, body, - // type_ignores, - range, - } = self; + range: _, + runtime_body, + } = module; let node = NodeAst .into_ref_with_type(vm, pyast::NodeModModule::static_type().to_owned()) .unwrap(); let dict = node.as_object().dict().unwrap(); - dict.set_item("body", body.ast_to_object(vm, source_file), vm) - .unwrap(); - // TODO: Improve ruff API - // ruff ignores type_ignore comments currently. - let type_ignores: Vec<TypeIgnore> = vec![]; + let body = runtime_body.map_or_else( + || body.ast_to_object(vm, source_file), + |values| values.ast_to_object(vm, source_file), + ); + dict.set_item("body", body, vm).unwrap(); dict.set_item( "type_ignores", type_ignores.ast_to_object(vm, source_file), vm, ) .unwrap(); - let _ = range; node.into() } @@ -95,38 +108,45 @@ impl Node for ast::ModModule { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { + let body: Vec<Option<ast::Stmt>> = + get_node_list_field(vm, source_file, &object, "body", "Module")?; + let (runtime_body, body) = runtime_stmt_list_from_values(body); + let type_ignores = get_node_list_field(vm, source_file, &object, "type_ignores", "Module")?; Ok(Self { - node_index: Default::default(), - body: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "body", "Module")?, - )?, - // type_ignores: Node::ast_from_object( - // _vm, - // get_node_field(_vm, &_object, "type_ignores", "Module")?, - // )?, - range: Default::default(), + module: ast::ModModule { + node_index: Default::default(), + body, + range: Default::default(), + runtime_body, + }, + type_ignores, }) } } pub(super) struct ModInteractive { pub(crate) range: TextRange, - pub(crate) body: Vec<ast::Stmt>, + pub(crate) body: ast::Suite, + pub(crate) runtime_body: Option<Vec<Option<ast::Stmt>>>, } // constructor impl Node for ModInteractive { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { - let Self { body, range } = self; + let Self { + body, + range: _, + runtime_body, + } = self; let node = NodeAst .into_ref_with_type(vm, pyast::NodeModInteractive::static_type().to_owned()) .unwrap(); let dict = node.as_object().dict().unwrap(); - dict.set_item("body", body.ast_to_object(vm, source_file), vm) - .unwrap(); - let _ = range; + let body = runtime_body.map_or_else( + || body.ast_to_object(vm, source_file), + |values| values.ast_to_object(vm, source_file), + ); + dict.set_item("body", body, vm).unwrap(); node.into() } @@ -135,13 +155,13 @@ impl Node for ModInteractive { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { + let body: Vec<Option<ast::Stmt>> = + get_node_list_field(vm, source_file, &object, "body", "Interactive")?; + let (runtime_body, body) = runtime_stmt_list_from_values(body); Ok(Self { - body: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "body", "Interactive")?, - )?, + body, range: Default::default(), + runtime_body, }) } } @@ -152,7 +172,7 @@ impl Node for ast::ModExpression { let Self { node_index: _, body, - range, + range: _, } = self; let node = NodeAst .into_ref_with_type(vm, pyast::NodeModExpression::static_type().to_owned()) @@ -160,7 +180,6 @@ impl Node for ast::ModExpression { let dict = node.as_object().dict().unwrap(); dict.set_item("body", body.ast_to_object(vm, source_file), vm) .unwrap(); - let _ = range; node.into() } @@ -171,11 +190,7 @@ impl Node for ast::ModExpression { ) -> PyResult<Self> { Ok(Self { node_index: Default::default(), - body: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "body", "Expression")?, - )?, + body: get_required_node_field(vm, source_file, &object, "body", "Expression")?, range: Default::default(), }) } @@ -184,7 +199,7 @@ impl Node for ast::ModExpression { pub(super) struct ModFunctionType { pub(crate) argtypes: Box<[ast::Expr]>, pub(crate) returns: ast::Expr, - pub(crate) range: TextRange, + pub(crate) runtime_argtypes: Option<Vec<Option<ast::Expr>>>, } // constructor @@ -193,21 +208,19 @@ impl Node for ModFunctionType { let Self { argtypes, returns, - range, + runtime_argtypes, } = self; let node = NodeAst .into_ref_with_type(vm, pyast::NodeModFunctionType::static_type().to_owned()) .unwrap(); let dict = node.as_object().dict().unwrap(); - dict.set_item( - "argtypes", - BoxedSlice(argtypes).ast_to_object(vm, source_file), - vm, - ) - .unwrap(); + let argtypes = runtime_argtypes.map_or_else( + || BoxedSlice(argtypes).ast_to_object(vm, source_file), + |values| values.ast_to_object(vm, source_file), + ); + dict.set_item("argtypes", argtypes, vm).unwrap(); dict.set_item("returns", returns.ast_to_object(vm, source_file), vm) .unwrap(); - let _ = range; node.into() } @@ -216,21 +229,13 @@ impl Node for ModFunctionType { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { + let argtypes: Vec<Option<ast::Expr>> = + get_node_list_field(vm, source_file, &object, "argtypes", "FunctionType")?; + let (runtime_argtypes, argtypes) = runtime_expr_list_from_values(argtypes); Ok(Self { - argtypes: { - let argtypes: BoxedSlice<_> = Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "argtypes", "FunctionType")?, - )?; - argtypes.0 - }, - returns: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "returns", "FunctionType")?, - )?, - range: Default::default(), + argtypes: argtypes.into_boxed_slice(), + returns: get_required_node_field(vm, source_file, &object, "returns", "FunctionType")?, + runtime_argtypes, }) } } diff --git a/crates/vm/src/stdlib/_ast/node.rs b/crates/vm/src/stdlib/_ast/node.rs index 4ee3893b6..7737ae076 100644 --- a/crates/vm/src/stdlib/_ast/node.rs +++ b/crates/vm/src/stdlib/_ast/node.rs @@ -1,5 +1,6 @@ -use crate::{PyObjectRef, PyResult, VirtualMachine}; +use crate::{PyObjectRef, PyResult, VirtualMachine, builtins::PyList}; use rustpython_compiler_core::SourceFile; +use thin_vec::ThinVec; pub(crate) trait Node: Sized { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef; @@ -31,14 +32,52 @@ impl<T: Node> Node for Vec<T> { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - // Recursion guard for each element: prevents stack overflow when a - // sequence element transitively references the sequence itself - // (e.g. `l = ast.List(...); l.elts = [l]`). See issue #4862. - vm.extract_elements_with(&object, |obj| { - vm.with_recursion("while traversing AST node", || { - Node::ast_from_object(vm, source_file, obj) - }) - }) + let list = object.downcast_ref::<PyList>().ok_or_else(|| { + vm.new_type_error(format!( + "AST list field must be a list, not a {}", + object.class().name() + )) + })?; + let len = list.borrow_vec().len(); + let mut result = Self::with_capacity(len); + for i in 0..len { + let item = { + let items = list.borrow_vec(); + if items.len() != len { + return Err( + vm.new_runtime_error("AST list field changed size during iteration") + ); + } + items[i].clone() + }; + result.push(vm.with_recursion("while traversing AST node", || { + Node::ast_from_object(vm, source_file, item) + })?); + if list.borrow_vec().len() != len { + return Err(vm.new_runtime_error("AST list field changed size during iteration")); + } + } + Ok(result) + } +} + +impl<T: Node> Node for ThinVec<T> { + fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { + vm.ctx + .new_list( + self.into_iter() + .map(|node| node.ast_to_object(vm, source_file)) + .collect(), + ) + .into() + } + + fn ast_from_object( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + ) -> PyResult<Self> { + Vec::<T>::ast_from_object(vm, source_file, object).map(Into::into) } } @@ -52,10 +91,6 @@ impl<T: Node> Node for Box<T> { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - // Recursion guard: every descent through a Box<AstNode> increments the - // VM's recursion depth so cyclic or pathologically deep ASTs raise - // RecursionError instead of overflowing the native stack. - // See issue #4862. vm.with_recursion("while traversing AST node", || { T::ast_from_object(vm, source_file, object).map(Self::new) }) diff --git a/crates/vm/src/stdlib/_ast/operator.rs b/crates/vm/src/stdlib/_ast/operator.rs index 09e63b5d6..e05e490bb 100644 --- a/crates/vm/src/stdlib/_ast/operator.rs +++ b/crates/vm/src/stdlib/_ast/operator.rs @@ -16,17 +16,18 @@ impl Node for ast::BoolOp { _source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - let cls = object.class(); - Ok(if cls.is(pyast::NodeBoolOpAnd::static_type()) { - Self::And - } else if cls.is(pyast::NodeBoolOpOr::static_type()) { - Self::Or - } else { - return Err(vm.new_type_error(format!( - "expected some sort of boolop, but got {}", - object.repr(vm)? - ))); - }) + Ok( + if is_node_instance(vm, &object, pyast::NodeBoolOpAnd::static_type())? { + Self::And + } else if is_node_instance(vm, &object, pyast::NodeBoolOpOr::static_type())? { + Self::Or + } else { + return Err(vm.new_type_error(format!( + "expected some sort of boolop, but got {}", + object.repr(vm)? + ))); + }, + ) } } @@ -56,39 +57,40 @@ impl Node for ast::Operator { _source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - let cls = object.class(); - Ok(if cls.is(pyast::NodeOperatorAdd::static_type()) { - Self::Add - } else if cls.is(pyast::NodeOperatorSub::static_type()) { - Self::Sub - } else if cls.is(pyast::NodeOperatorMult::static_type()) { - Self::Mult - } else if cls.is(pyast::NodeOperatorMatMult::static_type()) { - Self::MatMult - } else if cls.is(pyast::NodeOperatorDiv::static_type()) { - Self::Div - } else if cls.is(pyast::NodeOperatorMod::static_type()) { - Self::Mod - } else if cls.is(pyast::NodeOperatorPow::static_type()) { - Self::Pow - } else if cls.is(pyast::NodeOperatorLShift::static_type()) { - Self::LShift - } else if cls.is(pyast::NodeOperatorRShift::static_type()) { - Self::RShift - } else if cls.is(pyast::NodeOperatorBitOr::static_type()) { - Self::BitOr - } else if cls.is(pyast::NodeOperatorBitXor::static_type()) { - Self::BitXor - } else if cls.is(pyast::NodeOperatorBitAnd::static_type()) { - Self::BitAnd - } else if cls.is(pyast::NodeOperatorFloorDiv::static_type()) { - Self::FloorDiv - } else { - return Err(vm.new_type_error(format!( - "expected some sort of operator, but got {}", - object.repr(vm)? - ))); - }) + Ok( + if is_node_instance(vm, &object, pyast::NodeOperatorAdd::static_type())? { + Self::Add + } else if is_node_instance(vm, &object, pyast::NodeOperatorSub::static_type())? { + Self::Sub + } else if is_node_instance(vm, &object, pyast::NodeOperatorMult::static_type())? { + Self::Mult + } else if is_node_instance(vm, &object, pyast::NodeOperatorMatMult::static_type())? { + Self::MatMult + } else if is_node_instance(vm, &object, pyast::NodeOperatorDiv::static_type())? { + Self::Div + } else if is_node_instance(vm, &object, pyast::NodeOperatorMod::static_type())? { + Self::Mod + } else if is_node_instance(vm, &object, pyast::NodeOperatorPow::static_type())? { + Self::Pow + } else if is_node_instance(vm, &object, pyast::NodeOperatorLShift::static_type())? { + Self::LShift + } else if is_node_instance(vm, &object, pyast::NodeOperatorRShift::static_type())? { + Self::RShift + } else if is_node_instance(vm, &object, pyast::NodeOperatorBitOr::static_type())? { + Self::BitOr + } else if is_node_instance(vm, &object, pyast::NodeOperatorBitXor::static_type())? { + Self::BitXor + } else if is_node_instance(vm, &object, pyast::NodeOperatorBitAnd::static_type())? { + Self::BitAnd + } else if is_node_instance(vm, &object, pyast::NodeOperatorFloorDiv::static_type())? { + Self::FloorDiv + } else { + return Err(vm.new_type_error(format!( + "expected some sort of operator, but got {}", + object.repr(vm)? + ))); + }, + ) } } @@ -109,21 +111,22 @@ impl Node for ast::UnaryOp { _source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - let cls = object.class(); - Ok(if cls.is(pyast::NodeUnaryOpInvert::static_type()) { - Self::Invert - } else if cls.is(pyast::NodeUnaryOpNot::static_type()) { - Self::Not - } else if cls.is(pyast::NodeUnaryOpUAdd::static_type()) { - Self::UAdd - } else if cls.is(pyast::NodeUnaryOpUSub::static_type()) { - Self::USub - } else { - return Err(vm.new_type_error(format!( - "expected some sort of unaryop, but got {}", - object.repr(vm)? - ))); - }) + Ok( + if is_node_instance(vm, &object, pyast::NodeUnaryOpInvert::static_type())? { + Self::Invert + } else if is_node_instance(vm, &object, pyast::NodeUnaryOpNot::static_type())? { + Self::Not + } else if is_node_instance(vm, &object, pyast::NodeUnaryOpUAdd::static_type())? { + Self::UAdd + } else if is_node_instance(vm, &object, pyast::NodeUnaryOpUSub::static_type())? { + Self::USub + } else { + return Err(vm.new_type_error(format!( + "expected some sort of unaryop, but got {}", + object.repr(vm)? + ))); + }, + ) } } @@ -150,32 +153,33 @@ impl Node for ast::CmpOp { _source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - let cls = object.class(); - Ok(if cls.is(pyast::NodeCmpOpEq::static_type()) { - Self::Eq - } else if cls.is(pyast::NodeCmpOpNotEq::static_type()) { - Self::NotEq - } else if cls.is(pyast::NodeCmpOpLt::static_type()) { - Self::Lt - } else if cls.is(pyast::NodeCmpOpLtE::static_type()) { - Self::LtE - } else if cls.is(pyast::NodeCmpOpGt::static_type()) { - Self::Gt - } else if cls.is(pyast::NodeCmpOpGtE::static_type()) { - Self::GtE - } else if cls.is(pyast::NodeCmpOpIs::static_type()) { - Self::Is - } else if cls.is(pyast::NodeCmpOpIsNot::static_type()) { - Self::IsNot - } else if cls.is(pyast::NodeCmpOpIn::static_type()) { - Self::In - } else if cls.is(pyast::NodeCmpOpNotIn::static_type()) { - Self::NotIn - } else { - return Err(vm.new_type_error(format!( - "expected some sort of cmpop, but got {}", - object.repr(vm)? - ))); - }) + Ok( + if is_node_instance(vm, &object, pyast::NodeCmpOpEq::static_type())? { + Self::Eq + } else if is_node_instance(vm, &object, pyast::NodeCmpOpNotEq::static_type())? { + Self::NotEq + } else if is_node_instance(vm, &object, pyast::NodeCmpOpLt::static_type())? { + Self::Lt + } else if is_node_instance(vm, &object, pyast::NodeCmpOpLtE::static_type())? { + Self::LtE + } else if is_node_instance(vm, &object, pyast::NodeCmpOpGt::static_type())? { + Self::Gt + } else if is_node_instance(vm, &object, pyast::NodeCmpOpGtE::static_type())? { + Self::GtE + } else if is_node_instance(vm, &object, pyast::NodeCmpOpIs::static_type())? { + Self::Is + } else if is_node_instance(vm, &object, pyast::NodeCmpOpIsNot::static_type())? { + Self::IsNot + } else if is_node_instance(vm, &object, pyast::NodeCmpOpIn::static_type())? { + Self::In + } else if is_node_instance(vm, &object, pyast::NodeCmpOpNotIn::static_type())? { + Self::NotIn + } else { + return Err(vm.new_type_error(format!( + "expected some sort of cmpop, but got {}", + object.repr(vm)? + ))); + }, + ) } } diff --git a/crates/vm/src/stdlib/_ast/other.rs b/crates/vm/src/stdlib/_ast/other.rs index 5009c588c..837c7d120 100644 --- a/crates/vm/src/stdlib/_ast/other.rs +++ b/crates/vm/src/stdlib/_ast/other.rs @@ -11,14 +11,12 @@ impl Node for ast::ConversionFlag { _source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - // Python's AST uses ASCII codes: 's', 'r', 'a', -1=None - // Note: 255 is -1i8 as u8 (ruff's ConversionFlag::None) - match i32::try_from_object(vm, object)? { - -1 | 255 => Ok(Self::None), + match node_object_to_i32(vm, object)? { + -1 => Ok(Self::None), x if x == b's' as i32 => Ok(Self::Str), x if x == b'r' as i32 => Ok(Self::Repr), x if x == b'a' as i32 => Ok(Self::Ascii), - _ => Err(vm.new_value_error("invalid conversion flag")), + x => Err(vm.new_system_error(format!("Unrecognized conversion character {x}"))), } } } @@ -34,10 +32,13 @@ impl Node for ast::name::Name { _source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - match object.downcast::<PyStr>() { - Ok(name) => Ok(Self::new(name)), - Err(_) => Err(vm.new_value_error("expected str for name")), + if !object.class().is(vm.ctx.types.str_type) { + return Err(vm.new_type_error("AST identifier must be of type str")); } + object + .downcast::<PyStr>() + .map(Self::new) + .map_err(|_| vm.new_type_error("AST identifier must be of type str")) } } @@ -89,11 +90,7 @@ impl Node for ast::Alias { ) -> PyResult<Self> { Ok(Self { node_index: Default::default(), - name: Node::ast_from_object( - vm, - source_file, - get_node_field_required(vm, &object, "name", "alias")?, - )?, + name: get_required_identifier_field(vm, source_file, &object, "name", "alias")?, asname: get_node_field_opt(vm, &object, "asname")? .map(|obj| Node::ast_from_object(vm, source_file, obj)) .transpose()?, @@ -137,10 +134,12 @@ impl Node for ast::WithItem { ) -> PyResult<Self> { Ok(Self { node_index: Default::default(), - context_expr: Node::ast_from_object( + context_expr: get_required_node_field( vm, source_file, - get_node_field_required(vm, &object, "context_expr", "withitem")?, + &object, + "context_expr", + "withitem", )?, optional_vars: get_node_field_opt(vm, &object, "optional_vars")? .map(|obj| Node::ast_from_object(vm, source_file, obj)) diff --git a/crates/vm/src/stdlib/_ast/parameter.rs b/crates/vm/src/stdlib/_ast/parameter.rs index b0c807a29..477ceeb62 100644 --- a/crates/vm/src/stdlib/_ast/parameter.rs +++ b/crates/vm/src/stdlib/_ast/parameter.rs @@ -11,10 +11,12 @@ impl Node for ast::Parameters { vararg, kwonlyargs, kwarg, - range, + range: _, + runtime_defaults, } = self; - let (posonlyargs, args, defaults) = + let (posonlyargs, args, mut defaults) = extract_positional_parameter_defaults(posonlyargs, args); + defaults.runtime_defaults = runtime_defaults; let (kwonlyargs, kw_defaults) = extract_keyword_parameter_defaults(kwonlyargs); let node = NodeAst .into_ref_with_type(vm, pyast::NodeArguments::static_type().to_owned()) @@ -40,9 +42,12 @@ impl Node for ast::Parameters { .unwrap(); dict.set_item("kwarg", kwarg.ast_to_object(vm, source_file), vm) .unwrap(); - dict.set_item("defaults", defaults.ast_to_object(vm, source_file), vm) - .unwrap(); - let _ = range; + let runtime_defaults = defaults.runtime_defaults.take(); + let defaults = runtime_defaults.map_or_else( + || defaults.ast_to_object(vm, source_file), + |values| values.ast_to_object(vm, source_file), + ); + dict.set_item("defaults", defaults, vm).unwrap(); node.into() } @@ -51,33 +56,44 @@ impl Node for ast::Parameters { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - let kwonlyargs = Node::ast_from_object( + let posonlyargs = PositionalParameters::ast_from_field( vm, source_file, - get_node_field(vm, &object, "kwonlyargs", "arguments")?, + &object, + "posonlyargs", + "arguments", )?; - let kw_defaults = Node::ast_from_object( + let args = + PositionalParameters::ast_from_field(vm, source_file, &object, "args", "arguments")?; + let vararg = get_node_field_opt(vm, &object, "vararg")? + .map(|obj| Node::ast_from_object(vm, source_file, obj)) + .transpose()?; + let kwonlyargs = + KeywordParameters::ast_from_field(vm, source_file, &object, "kwonlyargs", "arguments")?; + let kw_defaults = ParameterDefaults::ast_from_field( vm, source_file, - get_node_field(vm, &object, "kw_defaults", "arguments")?, + &object, + "kw_defaults", + "arguments", + )?; + let kwarg = get_node_field_opt(vm, &object, "kwarg")? + .map(|obj| Node::ast_from_object(vm, source_file, obj)) + .transpose()?; + let defaults = ParameterDefaults::ast_from_field_preserve_none( + vm, + source_file, + &object, + "defaults", + "arguments", )?; - let kwonlyargs = merge_keyword_parameter_defaults(vm, kwonlyargs, kw_defaults)?; - let posonlyargs = Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "posonlyargs", "arguments")?, - )?; - let args = Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "args", "arguments")?, - )?; - let defaults = Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "defaults", "arguments")?, - )?; + let ParameterDefaults { + runtime_defaults, + defaults, + _range: _, + } = defaults; + let kwonlyargs = merge_keyword_parameter_defaults(vm, kwonlyargs, kw_defaults)?; let (posonlyargs, args) = merge_positional_parameter_defaults(vm, posonlyargs, args, defaults)?; @@ -85,14 +101,11 @@ impl Node for ast::Parameters { node_index: Default::default(), posonlyargs, args, - vararg: get_node_field_opt(vm, &object, "vararg")? - .map(|obj| Node::ast_from_object(vm, source_file, obj)) - .transpose()?, + vararg, kwonlyargs, - kwarg: get_node_field_opt(vm, &object, "kwarg")? - .map(|obj| Node::ast_from_object(vm, source_file, obj)) - .transpose()?, + kwarg, range: Default::default(), + runtime_defaults, }) } @@ -103,62 +116,68 @@ impl Node for ast::Parameters { // product impl Node for ast::Parameter { - fn ast_to_object(self, _vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { + fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { node_index: _, name, annotation, // type_comment, range, + runtime_type_comment, + runtime_type_comment_bytes, } = self; // ruff covers the ** in range but python expects it to start at the ident let range = TextRange::new(name.start(), range.end()); let node = NodeAst - .into_ref_with_type(_vm, pyast::NodeArg::static_type().to_owned()) + .into_ref_with_type(vm, pyast::NodeArg::static_type().to_owned()) .unwrap(); let dict = node.as_object().dict().unwrap(); - dict.set_item("arg", name.ast_to_object(_vm, source_file), _vm) + dict.set_item("arg", name.ast_to_object(vm, source_file), vm) .unwrap(); - dict.set_item( - "annotation", - annotation.ast_to_object(_vm, source_file), - _vm, + dict.set_item("annotation", annotation.ast_to_object(vm, source_file), vm) + .unwrap(); + let type_comment = super::constant::runtime_string_object( + vm, + runtime_type_comment, + runtime_type_comment_bytes, ) - .unwrap(); - // Ruff AST doesn't track type_comment, so always set to None - dict.set_item("type_comment", _vm.ctx.none(), _vm).unwrap(); - node_add_location(&dict, range, _vm, source_file); + .unwrap_or_else(|| vm.ctx.none()); + dict.set_item("type_comment", type_comment, vm).unwrap(); + node_add_location(&dict, range, vm, source_file); node.into() } fn ast_from_object( - _vm: &VirtualMachine, + vm: &VirtualMachine, source_file: &SourceFile, _object: PyObjectRef, ) -> PyResult<Self> { + let name = get_required_identifier_field(vm, source_file, &_object, "arg", "arg")?; + let annotation = get_node_field_opt(vm, &_object, "annotation")? + .map(|obj| Node::ast_from_object(vm, source_file, obj)) + .transpose()?; + let type_comment = get_ast_string_field_opt(vm, &_object, "type_comment")?; + let (runtime_type_comment, runtime_type_comment_bytes) = type_comment + .map_or((None, None), |type_comment| { + super::constant::runtime_string_from_pyobject(vm, type_comment) + }); + let range = range_from_object(vm, source_file, _object, "arg")?; Ok(Self { node_index: Default::default(), - name: Node::ast_from_object( - _vm, - source_file, - get_node_field_required(_vm, &_object, "arg", "arg")?, - )?, - annotation: get_node_field_opt(_vm, &_object, "annotation")? - .map(|obj| Node::ast_from_object(_vm, source_file, obj)) - .transpose()?, - // type_comment: get_node_field_opt(_vm, &_object, "type_comment")? - // .map(|obj| Node::ast_from_object(_vm, obj)) - // .transpose()?, - range: range_from_object(_vm, source_file, _object, "arg")?, + name, + annotation, + range, + runtime_type_comment, + runtime_type_comment_bytes, }) } } // product impl Node for ast::Keyword { - fn ast_to_object(self, _vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { + fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { node_index: _, arg, @@ -166,32 +185,28 @@ impl Node for ast::Keyword { range: _range, } = self; let node = NodeAst - .into_ref_with_type(_vm, pyast::NodeKeyword::static_type().to_owned()) + .into_ref_with_type(vm, pyast::NodeKeyword::static_type().to_owned()) .unwrap(); let dict = node.as_object().dict().unwrap(); - dict.set_item("arg", arg.ast_to_object(_vm, source_file), _vm) + dict.set_item("arg", arg.ast_to_object(vm, source_file), vm) .unwrap(); - dict.set_item("value", value.ast_to_object(_vm, source_file), _vm) + dict.set_item("value", value.ast_to_object(vm, source_file), vm) .unwrap(); - node_add_location(&dict, _range, _vm, source_file); + node_add_location(&dict, _range, vm, source_file); node.into() } fn ast_from_object( - _vm: &VirtualMachine, + vm: &VirtualMachine, source_file: &SourceFile, _object: PyObjectRef, ) -> PyResult<Self> { Ok(Self { node_index: Default::default(), - arg: get_node_field_opt(_vm, &_object, "arg")? - .map(|obj| Node::ast_from_object(_vm, source_file, obj)) + arg: get_node_field_opt(vm, &_object, "arg")? + .map(|obj| Node::ast_from_object(vm, source_file, obj)) .transpose()?, - value: Node::ast_from_object( - _vm, - source_file, - get_node_field_required(_vm, &_object, "value", "keyword")?, - )?, - range: range_from_object(_vm, source_file, _object, "keyword")?, + value: get_required_node_field(vm, source_file, &_object, "value", "keyword")?, + range: range_from_object(vm, source_file, _object, "keyword")?, }) } } @@ -201,6 +216,21 @@ struct PositionalParameters { pub args: Box<[ast::Parameter]>, } +impl PositionalParameters { + fn ast_from_field( + vm: &VirtualMachine, + source_file: &SourceFile, + object: &PyObject, + field: &'static str, + typ: &str, + ) -> PyResult<Self> { + Ok(Self { + args: get_node_boxed_slice_field(vm, source_file, object, field, typ)?, + _range: TextRange::default(), + }) + } +} + impl Node for PositionalParameters { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { BoxedSlice(self.args).ast_to_object(vm, source_file) @@ -214,7 +244,7 @@ impl Node for PositionalParameters { let args: BoxedSlice<_> = Node::ast_from_object(vm, source_file, object)?; Ok(Self { args: args.0, - _range: TextRange::default(), // TODO + _range: TextRange::default(), }) } } @@ -224,6 +254,21 @@ struct KeywordParameters { pub keywords: Box<[ast::Parameter]>, } +impl KeywordParameters { + fn ast_from_field( + vm: &VirtualMachine, + source_file: &SourceFile, + object: &PyObject, + field: &'static str, + typ: &str, + ) -> PyResult<Self> { + Ok(Self { + keywords: get_node_boxed_slice_field(vm, source_file, object, field, typ)?, + _range: TextRange::default(), + }) + } +} + impl Node for KeywordParameters { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { BoxedSlice(self.keywords).ast_to_object(vm, source_file) @@ -237,16 +282,55 @@ impl Node for KeywordParameters { let keywords: BoxedSlice<_> = Node::ast_from_object(vm, source_file, object)?; Ok(Self { keywords: keywords.0, - _range: TextRange::default(), // TODO + _range: TextRange::default(), }) } } struct ParameterDefaults { pub _range: TextRange, // TODO: Use this + runtime_defaults: Option<Vec<Option<ast::Expr>>>, defaults: Box<[Option<Box<ast::Expr>>]>, } +impl ParameterDefaults { + fn ast_from_field( + vm: &VirtualMachine, + source_file: &SourceFile, + object: &PyObject, + field: &'static str, + typ: &str, + ) -> PyResult<Self> { + Ok(Self { + defaults: get_node_boxed_slice_field(vm, source_file, object, field, typ)?, + runtime_defaults: None, + _range: TextRange::default(), + }) + } + + fn ast_from_field_preserve_none( + vm: &VirtualMachine, + source_file: &SourceFile, + object: &PyObject, + field: &'static str, + typ: &str, + ) -> PyResult<Self> { + let defaults: Vec<Option<Box<ast::Expr>>> = + get_node_list_field(vm, source_file, object, field, typ)?; + let runtime_defaults = defaults.iter().any(Option::is_none).then(|| { + defaults + .iter() + .map(|default| default.as_deref().cloned()) + .collect() + }); + Ok(Self { + defaults: defaults.into_boxed_slice(), + runtime_defaults, + _range: TextRange::default(), + }) + } +} + impl Node for ParameterDefaults { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { BoxedSlice(self.defaults).ast_to_object(vm, source_file) @@ -260,7 +344,8 @@ impl Node for ParameterDefaults { let defaults: BoxedSlice<_> = Node::ast_from_object(vm, source_file, object)?; Ok(Self { defaults: defaults.0, - _range: TextRange::default(), // TODO + runtime_defaults: None, + _range: TextRange::default(), }) } } @@ -287,6 +372,7 @@ fn extract_positional_parameter_defaults( .map(|item| item.range()) .reduce(|acc, next| acc.cover(next)) .unwrap_or_default(), + runtime_defaults: None, defaults: defaults.into_boxed_slice(), }; @@ -325,14 +411,13 @@ fn merge_positional_parameter_defaults( vm: &VirtualMachine, posonlyargs: PositionalParameters, args: PositionalParameters, - defaults: ParameterDefaults, + defaults: Box<[Option<Box<ast::Expr>>]>, ) -> PyResult<( Vec<ast::ParameterWithDefault>, Vec<ast::ParameterWithDefault>, )> { let posonlyargs = posonlyargs.args; let args = args.args; - let defaults = defaults.defaults; let mut posonlyargs: Vec<_> = <Box<[_]> as IntoIterator>::into_iter(posonlyargs) .map(|parameter| ast::ParameterWithDefault { @@ -383,6 +468,7 @@ fn extract_keyword_parameter_defaults( .map(|item| item.range()) .reduce(|acc, next| acc.cover(next)) .unwrap_or_default(), + runtime_defaults: None, defaults: defaults.into_boxed_slice(), }; @@ -422,5 +508,5 @@ fn merge_keyword_parameter_defaults( default, range: Default::default(), }) - .collect()) + .collect::<Vec<_>>()) } diff --git a/crates/vm/src/stdlib/_ast/pattern.rs b/crates/vm/src/stdlib/_ast/pattern.rs index a383c25a6..387fb5900 100644 --- a/crates/vm/src/stdlib/_ast/pattern.rs +++ b/crates/vm/src/stdlib/_ast/pattern.rs @@ -10,6 +10,7 @@ impl Node for ast::MatchCase { guard, body, range: _, + runtime_body, } = self; let node = NodeAst .into_ref_with_type(vm, pyast::NodeMatchCase::static_type().to_owned()) @@ -19,8 +20,11 @@ impl Node for ast::MatchCase { .unwrap(); dict.set_item("guard", guard.ast_to_object(vm, source_file), vm) .unwrap(); - dict.set_item("body", body.ast_to_object(vm, source_file), vm) - .unwrap(); + let body = runtime_body.map_or_else( + || body.ast_to_object(vm, source_file), + |values| values.ast_to_object(vm, source_file), + ); + dict.set_item("body", body, vm).unwrap(); node.into() } @@ -29,22 +33,18 @@ impl Node for ast::MatchCase { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { + let body: Vec<Option<ast::Stmt>> = + get_node_list_field(vm, source_file, &object, "body", "match_case")?; + let (runtime_body, body) = runtime_stmt_list_from_values(body); Ok(Self { node_index: Default::default(), - pattern: Node::ast_from_object( - vm, - source_file, - get_node_field_required(vm, &object, "pattern", "match_case")?, - )?, + pattern: get_required_node_field(vm, source_file, &object, "pattern", "match_case")?, guard: get_node_field_opt(vm, &object, "guard")? .map(|obj| Node::ast_from_object(vm, source_file, obj)) .transpose()?, - body: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "body", "match_case")?, - )?, + body, range: Default::default(), + runtime_body, }) } } @@ -68,64 +68,152 @@ impl Node for ast::Pattern { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - let cls = object.class(); - Ok(if cls.is(pyast::NodePatternMatchValue::static_type()) { - Self::MatchValue(ast::PatternMatchValue::ast_from_object( - vm, - source_file, - object, - )?) - } else if cls.is(pyast::NodePatternMatchSingleton::static_type()) { - Self::MatchSingleton(ast::PatternMatchSingleton::ast_from_object( - vm, - source_file, - object, - )?) - } else if cls.is(pyast::NodePatternMatchSequence::static_type()) { - Self::MatchSequence(ast::PatternMatchSequence::ast_from_object( - vm, - source_file, - object, - )?) - } else if cls.is(pyast::NodePatternMatchMapping::static_type()) { - Self::MatchMapping(ast::PatternMatchMapping::ast_from_object( - vm, - source_file, - object, - )?) - } else if cls.is(pyast::NodePatternMatchClass::static_type()) { - Self::MatchClass(ast::PatternMatchClass::ast_from_object( - vm, - source_file, - object, - )?) - } else if cls.is(pyast::NodePatternMatchStar::static_type()) { - Self::MatchStar(ast::PatternMatchStar::ast_from_object( - vm, - source_file, - object, - )?) - } else if cls.is(pyast::NodePatternMatchAs::static_type()) { - Self::MatchAs(ast::PatternMatchAs::ast_from_object( - vm, - source_file, - object, - )?) - } else if cls.is(pyast::NodePatternMatchOr::static_type()) { - Self::MatchOr(ast::PatternMatchOr::ast_from_object( - vm, - source_file, - object, - )?) + if vm.is_none(&object) { + return Err(vm.new_type_error(format!( + "expected some sort of pattern, but got {}", + object.repr(vm)? + ))); + } + enum PatternKind { + Value, + Singleton, + Sequence, + Mapping, + Class, + Star, + As, + Or, + } + let kind = if is_node_instance(vm, &object, pyast::NodePatternMatchValue::static_type())? { + PatternKind::Value + } else if is_node_instance(vm, &object, pyast::NodePatternMatchSingleton::static_type())? { + PatternKind::Singleton + } else if is_node_instance(vm, &object, pyast::NodePatternMatchSequence::static_type())? { + PatternKind::Sequence + } else if is_node_instance(vm, &object, pyast::NodePatternMatchMapping::static_type())? { + PatternKind::Mapping + } else if is_node_instance(vm, &object, pyast::NodePatternMatchClass::static_type())? { + PatternKind::Class + } else if is_node_instance(vm, &object, pyast::NodePatternMatchStar::static_type())? { + PatternKind::Star + } else if is_node_instance(vm, &object, pyast::NodePatternMatchAs::static_type())? { + PatternKind::As + } else if is_node_instance(vm, &object, pyast::NodePatternMatchOr::static_type())? { + PatternKind::Or } else { return Err(vm.new_type_error(format!( "expected some sort of pattern, but got {}", object.repr(vm)? ))); + }; + let range = pattern_range_from_object(vm, source_file, object.clone())?; + Ok(match kind { + PatternKind::Value => Self::MatchValue(pattern_match_value_from_object_with_range( + vm, + source_file, + object, + range, + )?), + PatternKind::Singleton => Self::MatchSingleton( + pattern_match_singleton_from_object_with_range(vm, source_file, object, range)?, + ), + PatternKind::Sequence => Self::MatchSequence( + pattern_match_sequence_from_object_with_range(vm, source_file, object, range)?, + ), + PatternKind::Mapping => Self::MatchMapping( + pattern_match_mapping_from_object_with_range(vm, source_file, object, range)?, + ), + PatternKind::Class => Self::MatchClass(pattern_match_class_from_object_with_range( + vm, + source_file, + object, + range, + )?), + PatternKind::Star => Self::MatchStar(pattern_match_star_from_object_with_range( + vm, + source_file, + object, + range, + )?), + PatternKind::As => Self::MatchAs(pattern_match_as_from_object_with_range( + vm, + source_file, + object, + range, + )?), + PatternKind::Or => Self::MatchOr(pattern_match_or_from_object_with_range( + vm, + source_file, + object, + range, + )?), }) } } + +fn null_pattern_placeholder(range: TextRange) -> ast::Pattern { + ast::Pattern::MatchAs(ast::PatternMatchAs { + node_index: Default::default(), + range, + pattern: None, + name: None, + }) +} + +fn lower_nullable_patterns(values: &[Option<ast::Pattern>], range: TextRange) -> Vec<ast::Pattern> { + values + .iter() + .cloned() + .map(|value| value.unwrap_or_else(|| null_pattern_placeholder(range))) + .collect() +} + +fn null_expr_placeholder(range: TextRange) -> ast::Expr { + ast::Expr::NoneLiteral(ast::ExprNoneLiteral { + node_index: Default::default(), + range, + }) +} + +fn lower_nullable_exprs(values: &[Option<ast::Expr>], range: TextRange) -> Vec<ast::Expr> { + values + .iter() + .cloned() + .map(|value| value.unwrap_or_else(|| null_expr_placeholder(range))) + .collect() +} + +type RuntimePatternList = Option<Vec<Option<ast::Pattern>>>; +type PatternListField = (RuntimePatternList, Vec<ast::Pattern>); + +fn pattern_list_from_field( + vm: &VirtualMachine, + source_file: &SourceFile, + object: &PyObject, + field: &'static str, + typ: &str, + range: TextRange, +) -> PyResult<PatternListField> { + let values: Vec<Option<ast::Pattern>> = + get_node_list_field(vm, source_file, object, field, typ)?; + let runtime_patterns = values.iter().any(Option::is_none).then(|| values.clone()); + Ok((runtime_patterns, lower_nullable_patterns(&values, range))) +} + // constructor +fn pattern_match_value_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::PatternMatchValue> { + Ok(ast::PatternMatchValue { + node_index: Default::default(), + value: get_required_node_field(vm, source_file, &object, "value", "MatchValue")?, + range, + }) +} + impl Node for ast::PatternMatchValue { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { @@ -148,19 +236,29 @@ impl Node for ast::PatternMatchValue { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - value: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "value", "MatchValue")?, - )?, - range: range_from_object(vm, source_file, object, "MatchValue")?, - }) + let range = range_from_object(vm, source_file, object.clone(), "MatchValue")?; + pattern_match_value_from_object_with_range(vm, source_file, object, range) } } // constructor +fn pattern_match_singleton_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::PatternMatchSingleton> { + Ok(ast::PatternMatchSingleton { + node_index: Default::default(), + value: Node::ast_from_object( + vm, + source_file, + get_node_field(vm, &object, "value", "MatchSingleton")?, + )?, + range, + }) +} + impl Node for ast::PatternMatchSingleton { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { @@ -186,15 +284,8 @@ impl Node for ast::PatternMatchSingleton { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - value: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "value", "MatchSingleton")?, - )?, - range: range_from_object(vm, source_file, object, "MatchSingleton")?, - }) + let range = range_from_object(vm, source_file, object.clone(), "MatchSingleton")?; + pattern_match_singleton_from_object_with_range(vm, source_file, object, range) } } @@ -219,21 +310,35 @@ impl Node for ast::Singleton { } else if object.is(&vm.ctx.false_value) { Ok(Self::False) } else { - Err(vm.new_value_error(format!( - "Expected None, True, or False, got {:?}", - object.class().name() - ))) + Err(vm.new_value_error("MatchSingleton can only contain True, False and None")) } } } // constructor +fn pattern_match_sequence_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::PatternMatchSequence> { + let (runtime_patterns, patterns) = + pattern_list_from_field(vm, source_file, &object, "patterns", "MatchSequence", range)?; + Ok(ast::PatternMatchSequence { + node_index: Default::default(), + patterns: patterns.to_vec(), + range, + runtime_patterns, + }) +} + impl Node for ast::PatternMatchSequence { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { node_index: _, patterns, range, + runtime_patterns, } = self; let node = NodeAst .into_ref_with_type( @@ -242,8 +347,11 @@ impl Node for ast::PatternMatchSequence { ) .unwrap(); let dict = node.as_object().dict().unwrap(); - dict.set_item("patterns", patterns.ast_to_object(vm, source_file), vm) - .unwrap(); + let patterns = runtime_patterns.map_or_else( + || patterns.ast_to_object(vm, source_file), + |values| values.ast_to_object(vm, source_file), + ); + dict.set_item("patterns", patterns, vm).unwrap(); node_add_location(&dict, range, vm, source_file); node.into() } @@ -253,19 +361,40 @@ impl Node for ast::PatternMatchSequence { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - patterns: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "patterns", "MatchSequence")?, - )?, - range: range_from_object(vm, source_file, object, "MatchSequence")?, - }) + let range = range_from_object(vm, source_file, object.clone(), "MatchSequence")?; + pattern_match_sequence_from_object_with_range(vm, source_file, object, range) } } // constructor +fn pattern_match_mapping_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::PatternMatchMapping> { + let keys: Vec<Option<ast::Expr>> = + get_node_list_field(vm, source_file, &object, "keys", "MatchMapping")?; + let patterns: Vec<Option<ast::Pattern>> = + get_node_list_field(vm, source_file, &object, "patterns", "MatchMapping")?; + let runtime_keys = keys.iter().any(Option::is_none).then(|| keys.clone()); + let runtime_patterns = patterns + .iter() + .any(Option::is_none) + .then(|| patterns.clone()); + Ok(ast::PatternMatchMapping { + node_index: Default::default(), + keys: lower_nullable_exprs(&keys, range), + patterns: lower_nullable_patterns(&patterns, range), + rest: get_node_field_opt(vm, &object, "rest")? + .map(|obj| Node::ast_from_object(vm, source_file, obj)) + .transpose()?, + range, + runtime_keys, + runtime_patterns, + }) +} + impl Node for ast::PatternMatchMapping { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { @@ -274,15 +403,23 @@ impl Node for ast::PatternMatchMapping { patterns, rest, range, + runtime_keys, + runtime_patterns, } = self; let node = NodeAst .into_ref_with_type(vm, pyast::NodePatternMatchMapping::static_type().to_owned()) .unwrap(); let dict = node.as_object().dict().unwrap(); - dict.set_item("keys", keys.ast_to_object(vm, source_file), vm) - .unwrap(); - dict.set_item("patterns", patterns.ast_to_object(vm, source_file), vm) - .unwrap(); + let keys = runtime_keys.map_or_else( + || keys.ast_to_object(vm, source_file), + |values| values.ast_to_object(vm, source_file), + ); + dict.set_item("keys", keys, vm).unwrap(); + let patterns = runtime_patterns.map_or_else( + || patterns.ast_to_object(vm, source_file), + |values| values.ast_to_object(vm, source_file), + ); + dict.set_item("patterns", patterns, vm).unwrap(); dict.set_item("rest", rest.ast_to_object(vm, source_file), vm) .unwrap(); node_add_location(&dict, range, vm, source_file); @@ -294,27 +431,57 @@ impl Node for ast::PatternMatchMapping { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - keys: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "keys", "MatchMapping")?, - )?, - patterns: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "patterns", "MatchMapping")?, - )?, - rest: get_node_field_opt(vm, &object, "rest")? - .map(|obj| Node::ast_from_object(vm, source_file, obj)) - .transpose()?, - range: range_from_object(vm, source_file, object, "MatchMapping")?, - }) + let range = range_from_object(vm, source_file, object.clone(), "MatchMapping")?; + pattern_match_mapping_from_object_with_range(vm, source_file, object, range) } } // constructor +fn pattern_match_class_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::PatternMatchClass> { + let cls = get_required_node_field(vm, source_file, &object, "cls", "MatchClass")?; + let patterns: Vec<Option<ast::Pattern>> = + get_node_list_field(vm, source_file, &object, "patterns", "MatchClass")?; + let kwd_attrs = PatternMatchClassKeywordAttributes::ast_from_field( + vm, + source_file, + &object, + "kwd_attrs", + "MatchClass", + )?; + let kwd_patterns: Vec<Option<ast::Pattern>> = + get_node_list_field(vm, source_file, &object, "kwd_patterns", "MatchClass")?; + let has_runtime_shape = kwd_attrs.0.len() != kwd_patterns.len() + || patterns.iter().any(Option::is_none) + || kwd_patterns.iter().any(Option::is_none); + let runtime_patterns = has_runtime_shape.then(|| patterns.clone()); + let runtime_kwd_attrs = has_runtime_shape.then(|| kwd_attrs.0.clone()); + let runtime_kwd_patterns = has_runtime_shape.then(|| kwd_patterns.clone()); + let patterns = PatternMatchClassPatterns(lower_nullable_patterns(&patterns, range)); + let kwd_patterns = + PatternMatchClassKeywordPatterns(lower_nullable_patterns(&kwd_patterns, range)); + let (patterns, keywords) = merge_pattern_match_class(patterns, kwd_attrs, kwd_patterns); + + Ok(ast::PatternMatchClass { + node_index: Default::default(), + cls, + range, + arguments: ast::PatternArguments { + node_index: Default::default(), + range: Default::default(), + patterns, + keywords, + }, + runtime_patterns, + runtime_kwd_attrs, + runtime_kwd_patterns, + }) +} + impl Node for ast::PatternMatchClass { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { @@ -322,24 +489,36 @@ impl Node for ast::PatternMatchClass { cls, arguments, range, + runtime_patterns, + runtime_kwd_attrs, + runtime_kwd_patterns, } = self; - let (patterns, kwd_attrs, kwd_patterns) = split_pattern_match_class(arguments); let node = NodeAst .into_ref_with_type(vm, pyast::NodePatternMatchClass::static_type().to_owned()) .unwrap(); let dict = node.as_object().dict().unwrap(); dict.set_item("cls", cls.ast_to_object(vm, source_file), vm) .unwrap(); - dict.set_item("patterns", patterns.ast_to_object(vm, source_file), vm) - .unwrap(); - dict.set_item("kwd_attrs", kwd_attrs.ast_to_object(vm, source_file), vm) - .unwrap(); - dict.set_item( - "kwd_patterns", - kwd_patterns.ast_to_object(vm, source_file), - vm, - ) - .unwrap(); + let (patterns, kwd_attrs, kwd_patterns) = + if let (Some(patterns), Some(kwd_attrs), Some(kwd_patterns)) = + (runtime_patterns, runtime_kwd_attrs, runtime_kwd_patterns) + { + ( + patterns.ast_to_object(vm, source_file), + kwd_attrs.ast_to_object(vm, source_file), + kwd_patterns.ast_to_object(vm, source_file), + ) + } else { + let (patterns, kwd_attrs, kwd_patterns) = split_pattern_match_class(arguments); + ( + patterns.ast_to_object(vm, source_file), + kwd_attrs.ast_to_object(vm, source_file), + kwd_patterns.ast_to_object(vm, source_file), + ) + }; + dict.set_item("patterns", patterns, vm).unwrap(); + dict.set_item("kwd_attrs", kwd_attrs, vm).unwrap(); + dict.set_item("kwd_patterns", kwd_patterns, vm).unwrap(); node_add_location(&dict, range, vm, source_file); node.into() } @@ -349,41 +528,8 @@ impl Node for ast::PatternMatchClass { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - let patterns = Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "patterns", "MatchClass")?, - )?; - let kwd_attrs: PatternMatchClassKeywordAttributes = Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "kwd_attrs", "MatchClass")?, - )?; - let kwd_patterns: PatternMatchClassKeywordPatterns = Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "kwd_patterns", "MatchClass")?, - )?; - if kwd_attrs.0.len() != kwd_patterns.0.len() { - return Err(vm.new_value_error("MatchClass has mismatched kwd_attrs and kwd_patterns")); - } - let (patterns, keywords) = merge_pattern_match_class(patterns, kwd_attrs, kwd_patterns); - - Ok(Self { - node_index: Default::default(), - cls: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "cls", "MatchClass")?, - )?, - range: range_from_object(vm, source_file, object, "MatchClass")?, - arguments: ast::PatternArguments { - node_index: Default::default(), - range: Default::default(), - patterns, - keywords, - }, - }) + let range = range_from_object(vm, source_file, object.clone(), "MatchClass")?; + pattern_match_class_from_object_with_range(vm, source_file, object, range) } } @@ -405,6 +551,24 @@ impl Node for PatternMatchClassPatterns { struct PatternMatchClassKeywordAttributes(Vec<ast::Identifier>); +impl PatternMatchClassKeywordAttributes { + fn ast_from_field( + vm: &VirtualMachine, + source_file: &SourceFile, + object: &PyObject, + field: &'static str, + typ: &str, + ) -> PyResult<Self> { + Ok(Self(get_node_list_field( + vm, + source_file, + object, + field, + typ, + )?)) + } +} + impl Node for PatternMatchClassKeywordAttributes { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { self.0.ast_to_object(vm, source_file) @@ -435,6 +599,21 @@ impl Node for PatternMatchClassKeywordPatterns { } } // constructor +fn pattern_match_star_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::PatternMatchStar> { + Ok(ast::PatternMatchStar { + node_index: Default::default(), + name: get_node_field_opt(vm, &object, "name")? + .map(|obj| Node::ast_from_object(vm, source_file, obj)) + .transpose()?, + range, + }) +} + impl Node for ast::PatternMatchStar { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { @@ -457,17 +636,30 @@ impl Node for ast::PatternMatchStar { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - name: get_node_field_opt(vm, &object, "name")? - .map(|obj| Node::ast_from_object(vm, source_file, obj)) - .transpose()?, - range: range_from_object(vm, source_file, object, "MatchStar")?, - }) + let range = range_from_object(vm, source_file, object.clone(), "MatchStar")?; + pattern_match_star_from_object_with_range(vm, source_file, object, range) } } // constructor +fn pattern_match_as_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::PatternMatchAs> { + Ok(ast::PatternMatchAs { + node_index: Default::default(), + pattern: get_node_field_opt(vm, &object, "pattern")? + .map(|obj| Node::ast_from_object(vm, source_file, obj)) + .transpose()?, + name: get_node_field_opt(vm, &object, "name")? + .map(|obj| Node::ast_from_object(vm, source_file, obj)) + .transpose()?, + range, + }) +} + impl Node for ast::PatternMatchAs { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { @@ -493,33 +685,45 @@ impl Node for ast::PatternMatchAs { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - pattern: get_node_field_opt(vm, &object, "pattern")? - .map(|obj| Node::ast_from_object(vm, source_file, obj)) - .transpose()?, - name: get_node_field_opt(vm, &object, "name")? - .map(|obj| Node::ast_from_object(vm, source_file, obj)) - .transpose()?, - range: range_from_object(vm, source_file, object, "MatchAs")?, - }) + let range = range_from_object(vm, source_file, object.clone(), "MatchAs")?; + pattern_match_as_from_object_with_range(vm, source_file, object, range) } } // constructor +fn pattern_match_or_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::PatternMatchOr> { + let (runtime_patterns, patterns) = + pattern_list_from_field(vm, source_file, &object, "patterns", "MatchOr", range)?; + Ok(ast::PatternMatchOr { + node_index: Default::default(), + patterns: patterns.to_vec(), + range, + runtime_patterns, + }) +} + impl Node for ast::PatternMatchOr { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { node_index: _, patterns, range, + runtime_patterns, } = self; let node = NodeAst .into_ref_with_type(vm, pyast::NodePatternMatchOr::static_type().to_owned()) .unwrap(); let dict = node.as_object().dict().unwrap(); - dict.set_item("patterns", patterns.ast_to_object(vm, source_file), vm) - .unwrap(); + let patterns = runtime_patterns.map_or_else( + || patterns.ast_to_object(vm, source_file), + |values| values.ast_to_object(vm, source_file), + ); + dict.set_item("patterns", patterns, vm).unwrap(); node_add_location(&dict, range, vm, source_file); node.into() } @@ -528,15 +732,8 @@ impl Node for ast::PatternMatchOr { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - patterns: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "patterns", "MatchOr")?, - )?, - range: range_from_object(vm, source_file, object, "MatchOr")?, - }) + let range = range_from_object(vm, source_file, object.clone(), "MatchOr")?; + pattern_match_or_from_object_with_range(vm, source_file, object, range) } } diff --git a/crates/vm/src/stdlib/_ast/pyast.rs b/crates/vm/src/stdlib/_ast/pyast.rs index 7eae6f009..eb97eec80 100644 --- a/crates/vm/src/stdlib/_ast/pyast.rs +++ b/crates/vm/src/stdlib/_ast/pyast.rs @@ -3,7 +3,6 @@ use crate::builtins::{PyGenericAlias, PyTuple, PyTupleRef, PyTypeRef, make_union use crate::common::ascii; use crate::convert::ToPyObject; use crate::function::FuncArgs; -use crate::types::Initializer; macro_rules! impl_node { ( @@ -61,6 +60,12 @@ macro_rules! impl_node { macro_rules! impl_base_node { // Base node without fields/attributes (e.g. NodeMod, NodeExpr) ($name:ident) => { + impl_base_node!($name, attributes: []); + }; + ($name:ident, attributes: [$($attr:expr),* $(,)?]) => { + impl_base_node!($name, attributes: [$($attr),*], optional_end_location: false); + }; + ($name:ident, attributes: [$($attr:expr),* $(,)?], optional_end_location: $optional_end_location:expr) => { #[pyclass(flags(HAS_DICT, BASETYPE))] impl $name { #[pymethod] @@ -83,9 +88,24 @@ macro_rules! impl_base_node { (*flags).remove(crate::types::PyTypeFlags::IMMUTABLETYPE); } class.set_attr( - identifier!(ctx, _attributes), + identifier!(ctx, _fields), ctx.empty_tuple.clone().into(), ); + class.set_str_attr("__match_args__", ctx.empty_tuple.clone(), ctx); + class.set_attr( + identifier!(ctx, _attributes), + ctx.new_tuple(vec![ + $( + ctx.new_str(ascii!($attr)).into() + ),* + ]) + .into(), + ); + if $optional_end_location { + let none = ctx.none(); + class.set_str_attr("end_lineno", none.clone(), ctx); + class.set_str_attr("end_col_offset", none, ctx); + } } } }; @@ -179,7 +199,11 @@ impl_node!( #[repr(transparent)] pub(crate) struct NodeStmt(NodeAst); -impl_base_node!(NodeStmt); +impl_base_node!( + NodeStmt, + attributes: ["lineno", "col_offset", "end_lineno", "end_col_offset"], + optional_end_location: true +); impl_node!( #[pyclass(module = "_ast", name = "FunctionType", base = NodeMod)] @@ -378,7 +402,11 @@ impl_node!( #[repr(transparent)] pub(crate) struct NodeExpr(NodeAst); -impl_base_node!(NodeExpr); +impl_base_node!( + NodeExpr, + attributes: ["lineno", "col_offset", "end_lineno", "end_col_offset"], + optional_end_location: true +); impl_node!( #[pyclass(module = "_ast", name = "Continue", base = NodeStmt)] @@ -533,12 +561,11 @@ impl_node!( attributes: ["lineno", "col_offset", "end_lineno", "end_col_offset"], ); -// NodeExprConstant needs custom Initializer to default kind to None #[pyclass(module = "_ast", name = "Constant", base = NodeExpr)] #[repr(transparent)] pub(crate) struct NodeExprConstant(NodeExpr); -#[pyclass(flags(HAS_DICT, BASETYPE), with(Initializer))] +#[pyclass(flags(HAS_DICT, BASETYPE))] impl NodeExprConstant { #[extend_class] fn extend_class_with_fields(ctx: &Context, class: &'static Py<PyType>) { @@ -580,24 +607,6 @@ impl NodeExprConstant { } } -impl Initializer for NodeExprConstant { - type Args = FuncArgs; - - fn slot_init(zelf: PyObjectRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult<()> { - <NodeAst as Initializer>::slot_init(zelf.clone(), args, vm)?; - // kind defaults to None if not provided - let dict = zelf.as_object().dict().unwrap(); - if !dict.contains_key("kind", vm) { - dict.set_item("kind", vm.ctx.none(), vm)?; - } - Ok(()) - } - - fn init(_zelf: PyRef<Self>, _args: Self::Args, _vm: &VirtualMachine) -> PyResult<()> { - unreachable!("slot_init is defined") - } -} - impl_node!( #[pyclass(module = "_ast", name = "Attribute", base = NodeExpr)] pub(crate) struct NodeExprAttribute, @@ -841,7 +850,11 @@ impl_node!( #[repr(transparent)] pub(crate) struct NodeExceptHandler(NodeAst); -impl_base_node!(NodeExceptHandler); +impl_base_node!( + NodeExceptHandler, + attributes: ["lineno", "col_offset", "end_lineno", "end_col_offset"], + optional_end_location: true +); impl_node!( #[pyclass(module = "_ast", name = "comprehension", base = NodeAst)] @@ -893,7 +906,10 @@ impl_node!( #[repr(transparent)] pub(crate) struct NodePattern(NodeAst); -impl_base_node!(NodePattern); +impl_base_node!( + NodePattern, + attributes: ["lineno", "col_offset", "end_lineno", "end_col_offset"] +); impl_node!( #[pyclass(module = "_ast", name = "match_case", base = NodeAst)] @@ -967,7 +983,10 @@ impl_node!( #[repr(transparent)] pub(crate) struct NodeTypeParam(NodeAst); -impl_base_node!(NodeTypeParam); +impl_base_node!( + NodeTypeParam, + attributes: ["lineno", "col_offset", "end_lineno", "end_col_offset"] +); impl_node!( #[pyclass(module = "_ast", name = "TypeIgnore", base = NodeTypeIgnore)] @@ -1681,7 +1700,6 @@ fn populate_field_types(vm: &VirtualMachine, module: &Py<PyModule>) { let field_types_attr = vm.ctx.intern_str("_field_types"); let annotations_attr = vm.ctx.intern_str("__annotations__"); - let empty_dict: PyObjectRef = vm.ctx.new_dict().into(); for &(class_name, fields) in FIELD_TYPES { if fields.is_empty() { @@ -1752,36 +1770,6 @@ fn populate_field_types(vm: &VirtualMachine, module: &Py<PyModule>) { type_obj.set_attr(annotations_attr, field_types); } } - - // Base AST classes (e.g., expr, stmt) should still expose __annotations__. - const BASE_AST_TYPES: &[&str] = &[ - "mod", - "stmt", - "expr", - "expr_context", - "boolop", - "operator", - "unaryop", - "cmpop", - "excepthandler", - "pattern", - "type_ignore", - "type_param", - ]; - for &class_name in BASE_AST_TYPES { - let class = module - .get_attr(class_name, vm) - .unwrap_or_else(|_| panic!("AST class '{class_name}' not found in module")); - let Some(type_obj) = class.downcast_ref::<PyType>() else { - continue; - }; - if type_obj.get_attr(field_types_attr).is_none() { - type_obj.set_attr(field_types_attr, empty_dict.clone()); - } - if type_obj.get_attr(annotations_attr).is_none() { - type_obj.set_attr(annotations_attr, empty_dict.clone()); - } - } } fn populate_singletons(vm: &VirtualMachine, module: &Py<PyModule>) { diff --git a/crates/vm/src/stdlib/_ast/python.rs b/crates/vm/src/stdlib/_ast/python.rs index ee5588acb..e7697e4cf 100644 --- a/crates/vm/src/stdlib/_ast/python.rs +++ b/crates/vm/src/stdlib/_ast/python.rs @@ -7,13 +7,10 @@ use super::{ #[pymodule] pub(crate) mod _ast { use crate::{ - AsObject, Context, Py, PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine, - builtins::{ - PyDictRef, PyStr, PyStrRef, PyTupleRef, PyType, PyTypeRef, PyUtf8Str, PyUtf8StrRef, - }, + AsObject, Context, Py, PyObject, PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine, + builtins::{PyDictRef, PySet, PyStr, PyTupleRef, PyType, PyTypeRef, PyUtf8Str}, class::{PyClassImpl, StaticType}, - common::wtf8::Wtf8, - function::{FuncArgs, KwArgs, PyMethodDef, PyMethodFlags}, + function::{ArgIterable, FuncArgs, KwArgs, PyMethodDef, PyMethodFlags}, stdlib::_ast::repr, types::{Constructor, Initializer}, warn, @@ -117,10 +114,12 @@ pub(crate) mod _ast { let fields = cls.get_attr(vm.ctx.intern_str("_fields")); if let Some(fields) = fields { - let fields: Vec<PyStrRef> = fields.try_to_value(vm)?; + let fields = fields.sequence_unchecked(); + let numfields = fields.length(vm)?; let mut positional: Vec<PyObjectRef> = Vec::new(); - for field in fields { - if dict.get_item_opt::<Wtf8>(field.as_wtf8(), vm)?.is_some() { + for i in 0..numfields { + let field = fields.get_item(i as isize, vm)?; + if dict.get_item_opt(&*field, vm)?.is_some() { positional.push(vm.ctx.none()); } else { break; @@ -136,6 +135,85 @@ pub(crate) mod _ast { .new_tuple(vec![type_obj, vm.ctx.new_tuple(vec![]).into(), dict.into()])) } + fn ast_replace_update_payload( + payload: &PyDictRef, + keys: Option<&PyObjectRef>, + dict: &PyDictRef, + vm: &VirtualMachine, + ) -> PyResult<()> { + let Some(keys) = keys else { + return Ok(()); + }; + let keys = keys.sequence_unchecked(); + let num_keys = keys.length(vm)?; + for i in 0..num_keys { + let key = keys.get_item(i as isize, vm)?; + if let Some(value) = dict.get_item_opt(&*key, vm)? { + payload.set_item(&*key, value, vm)?; + } + } + Ok(()) + } + + fn ast_replace_set_update( + expecting: &PyRef<PySet>, + iterable: Option<&PyObjectRef>, + vm: &VirtualMachine, + ) -> PyResult<()> { + let Some(iterable) = iterable else { + return Ok(()); + }; + let iterable = iterable.clone().try_into_value::<ArgIterable>(vm)?; + for item in iterable.iter(vm)? { + expecting.add(item?, vm)?; + } + Ok(()) + } + + fn ast_replace_set_discard( + expecting: &PyRef<PySet>, + key: &PyObject, + vm: &VirtualMachine, + ) -> PyResult<bool> { + let contained = expecting + .as_object() + .sequence_unchecked() + .contains(key, vm)?; + if contained { + vm.call_method(expecting.as_object(), "discard", (key.to_owned(),))?; + } + Ok(contained) + } + + fn ast_replace_set_difference_update( + expecting: &PyRef<PySet>, + iterable: Option<&PyObjectRef>, + vm: &VirtualMachine, + ) -> PyResult<()> { + let Some(iterable) = iterable else { + return Ok(()); + }; + let iterable = iterable.clone().try_into_value::<ArgIterable>(vm)?; + for item in iterable.iter(vm)? { + let item = item?; + ast_replace_set_discard(expecting, &item, vm)?; + } + Ok(()) + } + + fn ast_set_attr( + obj: &PyObject, + name: &PyObject, + value: impl Into<PyObjectRef>, + vm: &VirtualMachine, + ) -> PyResult<()> { + let name = name + .to_owned() + .downcast::<PyStr>() + .map_err(|_| vm.new_type_error("attribute name must be string"))?; + obj.set_attr(&name, value, vm) + } + pub(crate) fn ast_replace(zelf: PyObjectRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult { if !args.args.is_empty() { return Err(vm.new_type_error("__replace__() takes no positional arguments")); @@ -146,22 +224,13 @@ pub(crate) mod _ast { let attributes = cls.get_attr(vm.ctx.intern_str("_attributes")); let dict = zelf.as_object().dict(); - let mut expecting: std::collections::HashSet<String> = std::collections::HashSet::new(); - if let Some(fields) = fields.clone() { - let fields: Vec<PyUtf8StrRef> = fields.try_to_value(vm)?; - for field in fields { - expecting.insert(field.as_str().to_owned()); - } - } - if let Some(attributes) = attributes.clone() { - let attributes: Vec<PyUtf8StrRef> = attributes.try_to_value(vm)?; - for attr in attributes { - expecting.insert(attr.as_str().to_owned()); - } - } + let expecting = PySet::default().into_ref(&vm.ctx); + ast_replace_set_update(&expecting, fields.as_ref(), vm)?; + ast_replace_set_update(&expecting, attributes.as_ref(), vm)?; for (key, _value) in &args.kwargs { - if !expecting.remove(key) { + let key_obj: PyObjectRef = vm.ctx.new_str(key.as_str()).into(); + if !ast_replace_set_discard(&expecting, &key_obj, vm)? { return Err(vm.new_type_error(format!( "{}.__replace__ got an unexpected keyword argument '{}'.", cls.name(), @@ -172,16 +241,9 @@ pub(crate) mod _ast { if let Some(dict) = dict.as_ref() { for (key, _value) in dict.items_vec() { - if let Ok(key) = key.downcast::<PyUtf8Str>() { - expecting.remove(key.as_str()); - } - } - if let Some(attributes) = attributes.clone() { - let attributes: Vec<PyUtf8StrRef> = attributes.try_to_value(vm)?; - for attr in attributes { - expecting.remove(attr.as_str()); - } + ast_replace_set_discard(&expecting, &key, vm)?; } + ast_replace_set_difference_update(&expecting, attributes.as_ref(), vm)?; } // Discard optional fields (T | None). @@ -189,20 +251,18 @@ pub(crate) mod _ast { && let Ok(field_types) = field_types.downcast::<crate::builtins::PyDict>() { for (key, value) in field_types.items_vec() { - let Ok(key) = key.downcast::<PyUtf8Str>() else { - continue; - }; if value.fast_isinstance(vm.ctx.types.union_type) { - expecting.remove(key.as_str()); + ast_replace_set_discard(&expecting, &key, vm)?; } } } - if !expecting.is_empty() { - let mut names: Vec<String> = expecting - .into_iter() - .map(|name| format!("{name:?}")) - .collect(); + let remaining = expecting.elements(); + if !remaining.is_empty() { + let mut names = Vec::with_capacity(remaining.len()); + for name in &remaining { + names.push(name.repr(vm)?.to_string()); + } names.sort(); let missing = names.join(", "); let count = names.len(); @@ -217,22 +277,8 @@ pub(crate) mod _ast { let payload = vm.ctx.new_dict(); if let Some(dict) = dict { - if let Some(fields) = fields { - let fields: Vec<PyStrRef> = fields.try_to_value(vm)?; - for field in fields { - if let Some(value) = dict.get_item_opt::<Wtf8>(field.as_wtf8(), vm)? { - payload.set_item(field.as_object(), value, vm)?; - } - } - } - if let Some(attributes) = attributes { - let attributes: Vec<PyStrRef> = attributes.try_to_value(vm)?; - for attr in attributes { - if let Some(value) = dict.get_item_opt::<Wtf8>(attr.as_wtf8(), vm)? { - payload.set_item(attr.as_object(), value, vm)?; - } - } - } + ast_replace_update_payload(&payload, fields.as_ref(), &dict, vm)?; + ast_replace_update_payload(&payload, attributes.as_ref(), &dict, vm)?; } for (key, value) in args.kwargs { payload.set_item(vm.ctx.intern_str(key), value, vm)?; @@ -327,7 +373,7 @@ pub(crate) mod _ast { } fn py_new(_cls: &Py<PyType>, _args: Self::Args, _vm: &VirtualMachine) -> PyResult<Self> { - unimplemented!("use slot_new") + unreachable!("NodeAst construction is handled by slot_new") } } @@ -350,52 +396,55 @@ pub(crate) mod _ast { zelf.class().name() )) })?; - let fields: Vec<PyUtf8StrRef> = fields.try_to_value(vm)?; + let fields_seq = fields.sequence_unchecked(); + let numfields = fields_seq.length(vm)?; + let remaining_fields = PySet::default().into_ref(&vm.ctx); + ast_replace_set_update(&remaining_fields, Some(&fields), vm)?; let n_args = args.args.len(); - if n_args > fields.len() { + if n_args > numfields { return Err(vm.new_type_error(format!( "{} constructor takes at most {} positional argument{}", zelf.class().name(), - fields.len(), - if fields.len() == 1 { "" } else { "s" }, + numfields, + if numfields == 1 { "" } else { "s" }, ))); } - // Track which fields were set - let mut set_fields = std::collections::HashSet::new(); - let mut attributes: Option<Vec<PyStrRef>> = None; + let mut attributes: Option<PyObjectRef> = None; - for (name, arg) in fields.iter().zip(args.args) { - zelf.set_attr(name, arg, vm)?; - set_fields.insert(name.as_str().to_owned()); + for (i, arg) in args.args.into_iter().enumerate() { + let name = fields_seq.get_item(i as isize, vm)?; + ast_set_attr(&zelf, &name, arg, vm)?; + ast_replace_set_discard(&remaining_fields, &name, vm)?; } for (key, value) in args.kwargs { - if let Some(pos) = fields.iter().position(|f| f.as_bytes() == key.as_bytes()) - && pos < n_args - { - return Err(vm.new_type_error(format!( - "{} got multiple values for argument '{}'", - zelf.class().name(), - key - ))); - } - - if fields - .iter() - .all(|field| field.as_bytes() != key.as_bytes()) - { - let attrs = if let Some(attrs) = &attributes { - attrs + let key_obj: PyObjectRef = vm.ctx.new_str(key.as_str()).into(); + let contains = fields_seq.contains(&key_obj, vm)?; + if contains { + if !ast_replace_set_discard(&remaining_fields, &key_obj, vm)? { + return Err(vm.new_type_error(format!( + "{} got multiple values for argument '{}'", + zelf.class().name(), + key + ))); + } + } else { + let attrs = if let Some(attributes) = &attributes { + attributes } else { let attrs = zelf .class() .get_attr(vm.ctx.intern_str("_attributes")) - .and_then(|attr| attr.try_to_value::<Vec<PyStrRef>>(vm).ok()) - .unwrap_or_default(); + .ok_or_else(|| { + vm.new_attribute_error(format!( + "type object '{}' has no attribute '_attributes'", + zelf.class().name() + )) + })?; attributes = Some(attrs); attributes.as_ref().unwrap() }; - if attrs.iter().all(|attr| attr.as_bytes() != key.as_bytes()) { + if !attrs.sequence_unchecked().contains(&key_obj, vm)? { let message = vm.ctx.new_str(format!( "{}.__init__ got an unexpected keyword argument '{}'. \ Support for arbitrary keyword arguments is deprecated and will be removed in Python 3.15.", @@ -412,7 +461,6 @@ Support for arbitrary keyword arguments is deprecated and will be removed in Pyt } } - set_fields.insert(key.clone()); zelf.set_attr(vm.ctx.intern_str(key), value, vm)?; } @@ -425,17 +473,14 @@ Support for arbitrary keyword arguments is deprecated and will be removed in Pyt let expr_ctx_type: PyObjectRef = super::super::pyast::NodeExprContext::make_static_type().into(); - for field in &fields { - if set_fields.contains(field.as_str()) { - continue; - } - if let Some(ftype) = ft_dict.get_item_opt::<Wtf8>(field.as_wtf8(), vm)? { + for field in remaining_fields.elements() { + if let Some(ftype) = ft_dict.get_item_opt(&*field, vm)? { if ftype.fast_isinstance(vm.ctx.types.union_type) { // Optional field (T | None) — no default } else if ftype.fast_isinstance(vm.ctx.types.generic_alias_type) { // List field (list[T]) — default to [] let empty_list: PyObjectRef = vm.ctx.new_list(vec![]).into(); - zelf.set_attr(vm.ctx.intern_str(field.as_wtf8()), empty_list, vm)?; + ast_set_attr(&zelf, &field, empty_list, vm)?; } else if ftype.is(&expr_ctx_type) { // expr_context — default to Load() let load_type = @@ -445,13 +490,15 @@ Support for arbitrary keyword arguments is deprecated and will be removed in Pyt .unwrap_or_else(|| { vm.ctx.new_base_object(load_type, Some(vm.ctx.new_dict())) }); - zelf.set_attr(vm.ctx.intern_str(field.as_wtf8()), load_instance, vm)?; + ast_set_attr(&zelf, &field, load_instance, vm)?; } else { // Required field missing: emit DeprecationWarning. + let field_repr = field.repr(vm)?; let message = vm.ctx.new_str(format!( - "{}.__init__ missing 1 required positional argument: '{}'", + "{}.__init__ missing 1 required positional argument: {}. \ +This will become an error in Python 3.15.", zelf.class().name(), - field.as_wtf8() + field_repr )); warn::warn( message.into(), @@ -461,6 +508,21 @@ Support for arbitrary keyword arguments is deprecated and will be removed in Pyt vm, )?; } + } else { + let field_repr = field.repr(vm)?; + let message = vm.ctx.new_str(format!( + "Field {} is missing from {}._field_types. \ +This will become an error in Python 3.15.", + field_repr, + zelf.class().name() + )); + warn::warn( + message.into(), + Some(vm.ctx.exceptions.deprecation_warning.to_owned()), + 1, + None, + vm, + )?; } } } @@ -510,9 +572,29 @@ Support for arbitrary keyword arguments is deprecated and will be removed in Pyt .map_err(|_| vm.new_type_error("AST is not a type"))?; let ctx = &vm.ctx; let empty_tuple = ctx.empty_tuple.clone(); + let set_empty_annotations = |typ: &Py<PyType>| { + typ.set_str_attr("__annotations__", ctx.new_dict(), ctx); + }; + set_empty_annotations(&ast_type); ast_type.set_str_attr("_fields", empty_tuple.clone(), ctx); ast_type.set_str_attr("_attributes", empty_tuple.clone(), ctx); ast_type.set_str_attr("__match_args__", empty_tuple, ctx); + for typ in [ + super::super::pyast::NodeMod::static_type(), + super::super::pyast::NodeStmt::static_type(), + super::super::pyast::NodeExpr::static_type(), + super::super::pyast::NodeExprContext::static_type(), + super::super::pyast::NodeBoolOp::static_type(), + super::super::pyast::NodeOperator::static_type(), + super::super::pyast::NodeUnaryOp::static_type(), + super::super::pyast::NodeCmpOp::static_type(), + super::super::pyast::NodeExceptHandler::static_type(), + super::super::pyast::NodePattern::static_type(), + super::super::pyast::NodeTypeIgnore::static_type(), + super::super::pyast::NodeTypeParam::static_type(), + ] { + set_empty_annotations(typ); + } const AST_REDUCE: PyMethodDef = PyMethodDef::new_const( "__reduce__", diff --git a/crates/vm/src/stdlib/_ast/repr.rs b/crates/vm/src/stdlib/_ast/repr.rs index 2897447fb..57f00c095 100644 --- a/crates/vm/src/stdlib/_ast/repr.rs +++ b/crates/vm/src/stdlib/_ast/repr.rs @@ -1,7 +1,8 @@ use crate::{ AsObject, PyObjectRef, PyResult, VirtualMachine, - builtins::{PyList, PyTuple}, + builtins::{PyList, PyStr, PyTuple}, class::PyClassImpl, + recursion::ReprGuard, stdlib::_ast::NodeAst, }; use rustpython_common::wtf8::Wtf8Buf; @@ -33,9 +34,7 @@ fn repr_ast_list(vm: &VirtualMachine, items: Vec<PyObjectRef>, depth: usize) -> rendered.push_wtf8(&parts[0]); } if items.len() > 2 { - if !parts[0].is_empty() { - rendered.push_wtf8(", ...".as_ref()); - } + rendered.push_wtf8(", ...".as_ref()); if parts.len() > 1 { rendered.push_wtf8(", ".as_ref()); rendered.push_wtf8(&parts[1]); @@ -75,9 +74,7 @@ fn repr_ast_tuple(vm: &VirtualMachine, items: Vec<PyObjectRef>, depth: usize) -> rendered.push_wtf8(&parts[0]); } if items.len() > 2 { - if !parts[0].is_empty() { - rendered.push_wtf8(", ...".as_ref()); - } + rendered.push_wtf8(", ...".as_ref()); if parts.len() > 1 { rendered.push_wtf8(", ".as_ref()); rendered.push_wtf8(&parts[1]); @@ -86,9 +83,6 @@ fn repr_ast_tuple(vm: &VirtualMachine, items: Vec<PyObjectRef>, depth: usize) -> rendered.push_wtf8(", ".as_ref()); rendered.push_wtf8(&parts[1]); } - if items.len() == 1 { - rendered.push_wtf8(",".as_ref()); - } rendered.push_wtf8(")".as_ref()); Ok(rendered) } @@ -104,18 +98,24 @@ pub(crate) fn repr_ast_node( s.push_wtf8("(...)".as_ref()); return Ok(s); } + let Some(_guard) = ReprGuard::enter(vm, obj.as_object()) else { + let mut s = Wtf8Buf::from(&*cls.name()); + s.push_wtf8("(...)".as_ref()); + return Ok(s); + }; - let fields = cls.get_attr(vm.ctx.intern_str("_fields")); - let fields = match fields { - Some(fields) => fields.try_to_value::<Vec<crate::builtins::PyStrRef>>(vm)?, + let fields = match cls.get_attr(vm.ctx.intern_str("_fields")) { + Some(fields) => fields, None => { let mut s = Wtf8Buf::from(&*cls.name()); s.push_wtf8("(...)".as_ref()); return Ok(s); } }; + let fields = fields.sequence_unchecked(); + let numfields = fields.length(vm)?; - if fields.is_empty() { + if numfields == 0 { let mut s = Wtf8Buf::from(&*cls.name()); s.push_wtf8("()".as_ref()); return Ok(s); @@ -124,8 +124,12 @@ pub(crate) fn repr_ast_node( let mut rendered = Wtf8Buf::from(&*cls.name()); rendered.push_wtf8("(".as_ref()); - for (idx, field) in fields.iter().enumerate() { - let value = obj.get_attr(field, vm)?; + for idx in 0..numfields { + let field = fields.get_item(idx as isize, vm)?; + let field = field + .downcast::<PyStr>() + .map_err(|_| vm.new_type_error("attribute name must be string"))?; + let value = obj.get_attr(&field, vm)?; let value_repr = if value.fast_isinstance(vm.ctx.types.list_type) { let list = value .downcast::<PyList>() diff --git a/crates/vm/src/stdlib/_ast/statement.rs b/crates/vm/src/stdlib/_ast/statement.rs index 43d1162a4..ad3306fce 100644 --- a/crates/vm/src/stdlib/_ast/statement.rs +++ b/crates/vm/src/stdlib/_ast/statement.rs @@ -1,7 +1,67 @@ use super::*; -use crate::stdlib::_ast::argument::{merge_class_def_args, split_class_def_args}; +use crate::stdlib::_ast::argument::{ + KeywordArguments, PositionalArguments, merge_class_def_args, split_class_def_args, +}; +use crate::stdlib::_ast::exception::except_handler_from_object_unvalidated_range; +use crate::stdlib::_ast::type_parameters::type_params_from_field; use rustpython_compiler_core::SourceFile; +fn runtime_decorator_expr_list(values: &[Option<ast::Decorator>]) -> Vec<Option<ast::Expr>> { + values + .iter() + .map(|value| value.as_ref().map(|decorator| decorator.expression.clone())) + .collect() +} + +fn lower_runtime_decorator_list(values: Vec<Option<ast::Decorator>>) -> Vec<ast::Decorator> { + values + .into_iter() + .map(|value| { + value.unwrap_or_else(|| ast::Decorator { + range: Default::default(), + node_index: Default::default(), + expression: runtime_null_expr_placeholder(), + }) + }) + .collect() +} + +fn definition_range_from_name( + source_file: &SourceFile, + name_start: TextSize, + end: TextSize, + keyword: &str, +) -> TextRange { + let source_code = source_file.to_source_code(); + let line = source_code.line_index(name_start); + let line_start = source_code.line_start(line); + let keyword_start = source_code + .slice(TextRange::new(line_start, name_start)) + .rfind(keyword) + .map_or(line_start, |offset| { + line_start + TextSize::new(offset as u32) + }); + TextRange::new(keyword_start, end) +} + +fn runtime_stmt_type_comment( + vm: &VirtualMachine, + type_comment: Option<PyObjectRef>, +) -> (Option<Box<str>>, Option<Vec<u8>>) { + type_comment.map_or((None, None), |type_comment| { + super::constant::runtime_string_from_pyobject(vm, type_comment) + }) +} + +fn runtime_stmt_type_comment_object( + vm: &VirtualMachine, + value: Option<Box<str>>, + bytes: Option<Vec<u8>>, +) -> PyObjectRef { + super::constant::runtime_stmt_type_comment_object(vm, value, bytes) + .unwrap_or_else(|| vm.ctx.none()) +} + // sum impl Node for ast::Stmt { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { @@ -31,110 +91,292 @@ impl Node for ast::Stmt { Self::Break(cons) => cons.ast_to_object(vm, source_file), Self::Continue(cons) => cons.ast_to_object(vm, source_file), Self::IpyEscapeCommand(_) => { - unimplemented!("IPython escape command is not allowed in Python AST") + unreachable!("IPython escape command is not part of Python AST") } } } - #[expect(clippy::if_same_then_else, reason = "Looks better here")] fn ast_from_object( vm: &VirtualMachine, source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - let cls = object.class(); - Ok(if cls.is(pyast::NodeStmtFunctionDef::static_type()) { - Self::FunctionDef(ast::StmtFunctionDef::ast_from_object( - vm, - source_file, - object, - )?) - } else if cls.is(pyast::NodeStmtAsyncFunctionDef::static_type()) { - Self::FunctionDef(ast::StmtFunctionDef::ast_from_object( - vm, - source_file, - object, - )?) - } else if cls.is(pyast::NodeStmtClassDef::static_type()) { - Self::ClassDef(ast::StmtClassDef::ast_from_object(vm, source_file, object)?) - } else if cls.is(pyast::NodeStmtReturn::static_type()) { - Self::Return(ast::StmtReturn::ast_from_object(vm, source_file, object)?) - } else if cls.is(pyast::NodeStmtDelete::static_type()) { - Self::Delete(ast::StmtDelete::ast_from_object(vm, source_file, object)?) - } else if cls.is(pyast::NodeStmtAssign::static_type()) { - Self::Assign(ast::StmtAssign::ast_from_object(vm, source_file, object)?) - } else if cls.is(pyast::NodeStmtTypeAlias::static_type()) { - Self::TypeAlias(ast::StmtTypeAlias::ast_from_object( - vm, - source_file, - object, - )?) - } else if cls.is(pyast::NodeStmtAugAssign::static_type()) { - Self::AugAssign(ast::StmtAugAssign::ast_from_object( - vm, - source_file, - object, - )?) - } else if cls.is(pyast::NodeStmtAnnAssign::static_type()) { - Self::AnnAssign(ast::StmtAnnAssign::ast_from_object( - vm, - source_file, - object, - )?) - } else if cls.is(pyast::NodeStmtFor::static_type()) { - Self::For(ast::StmtFor::ast_from_object(vm, source_file, object)?) - } else if cls.is(pyast::NodeStmtAsyncFor::static_type()) { - Self::For(ast::StmtFor::ast_from_object(vm, source_file, object)?) - } else if cls.is(pyast::NodeStmtWhile::static_type()) { - Self::While(ast::StmtWhile::ast_from_object(vm, source_file, object)?) - } else if cls.is(pyast::NodeStmtIf::static_type()) { - Self::If(ast::StmtIf::ast_from_object(vm, source_file, object)?) - } else if cls.is(pyast::NodeStmtWith::static_type()) { - Self::With(ast::StmtWith::ast_from_object(vm, source_file, object)?) - } else if cls.is(pyast::NodeStmtAsyncWith::static_type()) { - Self::With(ast::StmtWith::ast_from_object(vm, source_file, object)?) - } else if cls.is(pyast::NodeStmtMatch::static_type()) { - Self::Match(ast::StmtMatch::ast_from_object(vm, source_file, object)?) - } else if cls.is(pyast::NodeStmtRaise::static_type()) { - Self::Raise(ast::StmtRaise::ast_from_object(vm, source_file, object)?) - } else if cls.is(pyast::NodeStmtTry::static_type()) { - Self::Try(ast::StmtTry::ast_from_object(vm, source_file, object)?) - } else if cls.is(pyast::NodeStmtTryStar::static_type()) { - Self::Try(ast::StmtTry::ast_from_object(vm, source_file, object)?) - } else if cls.is(pyast::NodeStmtAssert::static_type()) { - Self::Assert(ast::StmtAssert::ast_from_object(vm, source_file, object)?) - } else if cls.is(pyast::NodeStmtImport::static_type()) { - Self::Import(ast::StmtImport::ast_from_object(vm, source_file, object)?) - } else if cls.is(pyast::NodeStmtImportFrom::static_type()) { - Self::ImportFrom(ast::StmtImportFrom::ast_from_object( - vm, - source_file, - object, - )?) - } else if cls.is(pyast::NodeStmtGlobal::static_type()) { - Self::Global(ast::StmtGlobal::ast_from_object(vm, source_file, object)?) - } else if cls.is(pyast::NodeStmtNonlocal::static_type()) { - Self::Nonlocal(ast::StmtNonlocal::ast_from_object(vm, source_file, object)?) - } else if cls.is(pyast::NodeStmtExpr::static_type()) { - Self::Expr(ast::StmtExpr::ast_from_object(vm, source_file, object)?) - } else if cls.is(pyast::NodeStmtPass::static_type()) { - Self::Pass(ast::StmtPass::ast_from_object(vm, source_file, object)?) - } else if cls.is(pyast::NodeStmtBreak::static_type()) { - Self::Break(ast::StmtBreak::ast_from_object(vm, source_file, object)?) - } else if cls.is(pyast::NodeStmtContinue::static_type()) { - Self::Continue(ast::StmtContinue::ast_from_object(vm, source_file, object)?) - } else if vm.is_none(&object) { + if vm.is_none(&object) { return Err(vm.new_value_error("None disallowed in statement list")); + } + enum StmtKind { + FunctionDef { is_async: bool }, + ClassDef, + Return, + Delete, + Assign, + TypeAlias, + AugAssign, + AnnAssign, + For { is_async: bool }, + While, + If, + With { is_async: bool }, + Match, + Raise, + Try { is_star: bool }, + Assert, + Import, + ImportFrom, + Global, + Nonlocal, + Expr, + Pass, + Break, + Continue, + } + let kind = if is_node_instance(vm, &object, pyast::NodeStmtFunctionDef::static_type())? { + StmtKind::FunctionDef { is_async: false } + } else if is_node_instance(vm, &object, pyast::NodeStmtAsyncFunctionDef::static_type())? { + StmtKind::FunctionDef { is_async: true } + } else if is_node_instance(vm, &object, pyast::NodeStmtClassDef::static_type())? { + StmtKind::ClassDef + } else if is_node_instance(vm, &object, pyast::NodeStmtReturn::static_type())? { + StmtKind::Return + } else if is_node_instance(vm, &object, pyast::NodeStmtDelete::static_type())? { + StmtKind::Delete + } else if is_node_instance(vm, &object, pyast::NodeStmtAssign::static_type())? { + StmtKind::Assign + } else if is_node_instance(vm, &object, pyast::NodeStmtTypeAlias::static_type())? { + StmtKind::TypeAlias + } else if is_node_instance(vm, &object, pyast::NodeStmtAugAssign::static_type())? { + StmtKind::AugAssign + } else if is_node_instance(vm, &object, pyast::NodeStmtAnnAssign::static_type())? { + StmtKind::AnnAssign + } else if is_node_instance(vm, &object, pyast::NodeStmtFor::static_type())? { + StmtKind::For { is_async: false } + } else if is_node_instance(vm, &object, pyast::NodeStmtAsyncFor::static_type())? { + StmtKind::For { is_async: true } + } else if is_node_instance(vm, &object, pyast::NodeStmtWhile::static_type())? { + StmtKind::While + } else if is_node_instance(vm, &object, pyast::NodeStmtIf::static_type())? { + StmtKind::If + } else if is_node_instance(vm, &object, pyast::NodeStmtWith::static_type())? { + StmtKind::With { is_async: false } + } else if is_node_instance(vm, &object, pyast::NodeStmtAsyncWith::static_type())? { + StmtKind::With { is_async: true } + } else if is_node_instance(vm, &object, pyast::NodeStmtMatch::static_type())? { + StmtKind::Match + } else if is_node_instance(vm, &object, pyast::NodeStmtRaise::static_type())? { + StmtKind::Raise + } else if is_node_instance(vm, &object, pyast::NodeStmtTry::static_type())? { + StmtKind::Try { is_star: false } + } else if is_node_instance(vm, &object, pyast::NodeStmtTryStar::static_type())? { + StmtKind::Try { is_star: true } + } else if is_node_instance(vm, &object, pyast::NodeStmtAssert::static_type())? { + StmtKind::Assert + } else if is_node_instance(vm, &object, pyast::NodeStmtImport::static_type())? { + StmtKind::Import + } else if is_node_instance(vm, &object, pyast::NodeStmtImportFrom::static_type())? { + StmtKind::ImportFrom + } else if is_node_instance(vm, &object, pyast::NodeStmtGlobal::static_type())? { + StmtKind::Global + } else if is_node_instance(vm, &object, pyast::NodeStmtNonlocal::static_type())? { + StmtKind::Nonlocal + } else if is_node_instance(vm, &object, pyast::NodeStmtExpr::static_type())? { + StmtKind::Expr + } else if is_node_instance(vm, &object, pyast::NodeStmtPass::static_type())? { + StmtKind::Pass + } else if is_node_instance(vm, &object, pyast::NodeStmtBreak::static_type())? { + StmtKind::Break + } else if is_node_instance(vm, &object, pyast::NodeStmtContinue::static_type())? { + StmtKind::Continue } else { return Err(vm.new_type_error(format!( "expected some sort of stmt, but got {}", object.repr(vm)? ))); + }; + let range = stmt_range_from_object(vm, source_file, object.clone())?; + Ok(match kind { + StmtKind::FunctionDef { is_async } => Self::FunctionDef( + stmt_function_def_from_object_with_range(vm, source_file, object, range, is_async)?, + ), + StmtKind::ClassDef => Self::ClassDef(stmt_class_def_from_object_with_range( + vm, + source_file, + object, + range, + )?), + StmtKind::Return => Self::Return(stmt_return_from_object_with_range( + vm, + source_file, + object, + range, + )?), + StmtKind::Delete => Self::Delete(stmt_delete_from_object_with_range( + vm, + source_file, + object, + range, + )?), + StmtKind::Assign => Self::Assign(stmt_assign_from_object_with_range( + vm, + source_file, + object, + range, + )?), + StmtKind::TypeAlias => Self::TypeAlias(stmt_type_alias_from_object_with_range( + vm, + source_file, + object, + range, + )?), + StmtKind::AugAssign => Self::AugAssign(stmt_aug_assign_from_object_with_range( + vm, + source_file, + object, + range, + )?), + StmtKind::AnnAssign => Self::AnnAssign(stmt_ann_assign_from_object_with_range( + vm, + source_file, + object, + range, + )?), + StmtKind::For { is_async } => Self::For(stmt_for_from_object_with_range( + vm, + source_file, + object, + range, + is_async, + )?), + StmtKind::While => Self::While(stmt_while_from_object_with_range( + vm, + source_file, + object, + range, + )?), + StmtKind::If => Self::If(elif_else_clause::ast_from_object_with_range( + vm, + source_file, + object, + range, + )?), + StmtKind::With { is_async } => Self::With(stmt_with_from_object_with_range( + vm, + source_file, + object, + range, + is_async, + )?), + StmtKind::Match => Self::Match(stmt_match_from_object_with_range( + vm, + source_file, + object, + range, + )?), + StmtKind::Raise => Self::Raise(stmt_raise_from_object_with_range( + vm, + source_file, + object, + range, + )?), + StmtKind::Try { is_star } => Self::Try(stmt_try_from_object_with_range( + vm, + source_file, + object, + range, + is_star, + )?), + StmtKind::Assert => Self::Assert(stmt_assert_from_object_with_range( + vm, + source_file, + object, + range, + )?), + StmtKind::Import => Self::Import(stmt_import_from_object_with_range( + vm, + source_file, + object, + range, + )?), + StmtKind::ImportFrom => Self::ImportFrom(stmt_import_from_from_object_with_range( + vm, + source_file, + object, + range, + )?), + StmtKind::Global => Self::Global(stmt_global_from_object_with_range( + vm, + source_file, + object, + range, + )?), + StmtKind::Nonlocal => Self::Nonlocal(stmt_nonlocal_from_object_with_range( + vm, + source_file, + object, + range, + )?), + StmtKind::Expr => Self::Expr(stmt_expr_from_object_with_range( + vm, + source_file, + object, + range, + )?), + StmtKind::Pass => Self::Pass(stmt_pass_from_object_with_range(range)), + StmtKind::Break => Self::Break(stmt_break_from_object_with_range(range)), + StmtKind::Continue => Self::Continue(stmt_continue_from_object_with_range(range)), }) } } // constructor +fn stmt_function_def_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, + is_async: bool, +) -> PyResult<ast::StmtFunctionDef> { + let typ = if is_async { + "AsyncFunctionDef" + } else { + "FunctionDef" + }; + let name = get_required_identifier_field(vm, source_file, &object, "name", typ)?; + let parameters = Node::ast_from_object( + vm, + source_file, + get_node_field_required(vm, &object, "args", typ)?, + )?; + let body: Vec<Option<ast::Stmt>> = get_node_list_field(vm, source_file, &object, "body", typ)?; + let decorator_list: Vec<Option<ast::Decorator>> = + get_node_list_field(vm, source_file, &object, "decorator_list", typ)?; + let runtime_decorator_exprs = runtime_decorator_expr_list(&decorator_list); + let runtime_body = runtime_stmt_list_metadata(&body); + let runtime_decorator_list = runtime_expr_list_metadata(&runtime_decorator_exprs); + let body = lower_runtime_stmt_list(body); + let decorator_list = lower_runtime_decorator_list(decorator_list); + let returns = get_node_field_opt(vm, &object, "returns")? + .map(|obj| Node::ast_from_object(vm, source_file, obj)) + .transpose()?; + let (runtime_type_comment, runtime_type_comment_bytes) = + runtime_stmt_type_comment(vm, get_ast_string_field_opt(vm, &object, "type_comment")?); + let type_params = type_params_from_field(vm, source_file, &object, "type_params", typ)?; + Ok(ast::StmtFunctionDef { + node_index: Default::default(), + name, + parameters, + body, + decorator_list, + returns, + type_params, + range, + is_async, + runtime_decorator_list, + runtime_type_comment, + runtime_type_comment_bytes, + runtime_body, + }) +} + impl Node for ast::StmtFunctionDef { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { @@ -144,14 +386,20 @@ impl Node for ast::StmtFunctionDef { body, decorator_list, returns, - // type_comment, type_params, is_async, - range: _range, + range, + runtime_decorator_list, + runtime_type_comment, + runtime_type_comment_bytes, + runtime_body, } = self; - let source_code = source_file.to_source_code(); - let def_line = source_code.line_index(name.range.start()); - let range = TextRange::new(source_code.line_start(def_line), _range.end()); + let range = definition_range_from_name( + source_file, + name.range.start(), + range.end(), + if is_async { "async" } else { "def" }, + ); let cls = if !is_async { pyast::NodeStmtFunctionDef::static_type().to_owned() @@ -165,18 +413,28 @@ impl Node for ast::StmtFunctionDef { .unwrap(); dict.set_item("args", parameters.ast_to_object(vm, source_file), vm) .unwrap(); - dict.set_item("body", body.ast_to_object(vm, source_file), vm) - .unwrap(); + let body = runtime_body.map_or_else( + || body.ast_to_object(vm, source_file), + |values| values.ast_to_object(vm, source_file), + ); + dict.set_item("body", body, vm).unwrap(); dict.set_item( "decorator_list", - decorator_list.ast_to_object(vm, source_file), + runtime_decorator_list.map_or_else( + || decorator_list.ast_to_object(vm, source_file), + |values| values.ast_to_object(vm, source_file), + ), vm, ) .unwrap(); dict.set_item("returns", returns.ast_to_object(vm, source_file), vm) .unwrap(); - // Ruff AST doesn't track type_comment, so always set to None - dict.set_item("type_comment", vm.ctx.none(), vm).unwrap(); + dict.set_item( + "type_comment", + runtime_stmt_type_comment_object(vm, runtime_type_comment, runtime_type_comment_bytes), + vm, + ) + .unwrap(); dict.set_item( "type_params", type_params.map_or_else( @@ -191,57 +449,58 @@ impl Node for ast::StmtFunctionDef { } fn ast_from_object( - _vm: &VirtualMachine, + vm: &VirtualMachine, source_file: &SourceFile, _object: PyObjectRef, ) -> PyResult<Self> { - let _cls = _object.class(); - let is_async = _cls.is(pyast::NodeStmtAsyncFunctionDef::static_type()); - let range = range_from_object(_vm, source_file, _object.clone(), "FunctionDef")?; - Ok(Self { - node_index: Default::default(), - name: Node::ast_from_object( - _vm, - source_file, - get_node_field(_vm, &_object, "name", "FunctionDef")?, - )?, - parameters: Node::ast_from_object( - _vm, - source_file, - get_node_field(_vm, &_object, "args", "FunctionDef")?, - )?, - body: Node::ast_from_object( - _vm, - source_file, - get_node_field(_vm, &_object, "body", "FunctionDef")?, - )?, - decorator_list: Node::ast_from_object( - _vm, - source_file, - get_node_field(_vm, &_object, "decorator_list", "FunctionDef")?, - )?, - returns: get_node_field_opt(_vm, &_object, "returns")? - .map(|obj| Node::ast_from_object(_vm, source_file, obj)) - .transpose()?, - // TODO: Ruff ignores type_comment during parsing - // type_comment: get_node_field_opt(_vm, &_object, "type_comment")? - // .map(|obj| Node::ast_from_object(_vm, obj)) - // .transpose()?, - type_params: Node::ast_from_object( - _vm, - source_file, - get_node_field_opt(_vm, &_object, "type_params")? - .unwrap_or_else(|| _vm.ctx.new_list(Vec::new()).into()), - )?, - range, - is_async, - }) + let is_async = + is_node_instance(vm, &_object, pyast::NodeStmtAsyncFunctionDef::static_type())?; + let typ = if is_async { + "AsyncFunctionDef" + } else { + "FunctionDef" + }; + let range = range_from_object(vm, source_file, _object.clone(), typ)?; + stmt_function_def_from_object_with_range(vm, source_file, _object, range, is_async) } } // constructor +fn stmt_class_def_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::StmtClassDef> { + let name = get_required_identifier_field(vm, source_file, &object, "name", "ClassDef")?; + let bases = PositionalArguments::ast_from_field(vm, source_file, &object, "bases", "ClassDef")?; + let keywords = + KeywordArguments::ast_from_field(vm, source_file, &object, "keywords", "ClassDef")?; + let body: Vec<Option<ast::Stmt>> = + get_node_list_field(vm, source_file, &object, "body", "ClassDef")?; + let decorator_list: Vec<Option<ast::Decorator>> = + get_node_list_field(vm, source_file, &object, "decorator_list", "ClassDef")?; + let runtime_decorator_exprs = runtime_decorator_expr_list(&decorator_list); + let runtime_body = runtime_stmt_list_metadata(&body); + let runtime_decorator_list = runtime_expr_list_metadata(&runtime_decorator_exprs); + let body = lower_runtime_stmt_list(body); + let decorator_list = lower_runtime_decorator_list(decorator_list); + let type_params = type_params_from_field(vm, source_file, &object, "type_params", "ClassDef")?; + Ok(ast::StmtClassDef { + node_index: Default::default(), + name, + arguments: merge_class_def_args(Some(bases), Some(keywords)), + body, + decorator_list, + type_params, + range, + runtime_decorator_list, + runtime_body, + }) +} + impl Node for ast::StmtClassDef { - fn ast_to_object(self, _vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { + fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { node_index: _, name, @@ -249,184 +508,213 @@ impl Node for ast::StmtClassDef { body, decorator_list, type_params, - range: _range, + range, + runtime_decorator_list, + runtime_body, } = self; let (bases, keywords) = split_class_def_args(arguments); - let source_code = source_file.to_source_code(); - let class_line = source_code.line_index(name.range.start()); - let range = TextRange::new(source_code.line_start(class_line), _range.end()); + let range = + definition_range_from_name(source_file, name.range.start(), range.end(), "class"); let node = NodeAst - .into_ref_with_type(_vm, pyast::NodeStmtClassDef::static_type().to_owned()) + .into_ref_with_type(vm, pyast::NodeStmtClassDef::static_type().to_owned()) .unwrap(); let dict = node.as_object().dict().unwrap(); - dict.set_item("name", name.ast_to_object(_vm, source_file), _vm) + dict.set_item("name", name.ast_to_object(vm, source_file), vm) .unwrap(); dict.set_item( "bases", bases.map_or_else( - || _vm.ctx.new_list(vec![]).into(), - |b| b.ast_to_object(_vm, source_file), + || vm.ctx.new_list(vec![]).into(), + |b| b.ast_to_object(vm, source_file), ), - _vm, + vm, ) .unwrap(); dict.set_item( "keywords", keywords.map_or_else( - || _vm.ctx.new_list(vec![]).into(), - |k| k.ast_to_object(_vm, source_file), + || vm.ctx.new_list(vec![]).into(), + |k| k.ast_to_object(vm, source_file), ), - _vm, + vm, ) .unwrap(); - dict.set_item("body", body.ast_to_object(_vm, source_file), _vm) - .unwrap(); + let body = runtime_body.map_or_else( + || body.ast_to_object(vm, source_file), + |values| values.ast_to_object(vm, source_file), + ); + dict.set_item("body", body, vm).unwrap(); dict.set_item( "decorator_list", - decorator_list.ast_to_object(_vm, source_file), - _vm, + runtime_decorator_list.map_or_else( + || decorator_list.ast_to_object(vm, source_file), + |values| values.ast_to_object(vm, source_file), + ), + vm, ) .unwrap(); dict.set_item( "type_params", type_params.map_or_else( - || _vm.ctx.new_list(vec![]).into(), - |tp| tp.ast_to_object(_vm, source_file), + || vm.ctx.new_list(vec![]).into(), + |tp| tp.ast_to_object(vm, source_file), ), - _vm, + vm, ) .unwrap(); - node_add_location(&dict, range, _vm, source_file); + node_add_location(&dict, range, vm, source_file); node.into() } fn ast_from_object( - _vm: &VirtualMachine, + vm: &VirtualMachine, source_file: &SourceFile, _object: PyObjectRef, ) -> PyResult<Self> { - let bases = Node::ast_from_object( - _vm, - source_file, - get_node_field(_vm, &_object, "bases", "ClassDef")?, - )?; - let keywords = Node::ast_from_object( - _vm, - source_file, - get_node_field(_vm, &_object, "keywords", "ClassDef")?, - )?; - Ok(Self { - node_index: Default::default(), - name: Node::ast_from_object( - _vm, - source_file, - get_node_field(_vm, &_object, "name", "ClassDef")?, - )?, - arguments: merge_class_def_args(bases, keywords), - body: Node::ast_from_object( - _vm, - source_file, - get_node_field(_vm, &_object, "body", "ClassDef")?, - )?, - decorator_list: Node::ast_from_object( - _vm, - source_file, - get_node_field(_vm, &_object, "decorator_list", "ClassDef")?, - )?, - type_params: Node::ast_from_object( - _vm, - source_file, - get_node_field_opt(_vm, &_object, "type_params")? - .unwrap_or_else(|| _vm.ctx.new_list(Vec::new()).into()), - )?, - range: range_from_object(_vm, source_file, _object, "ClassDef")?, - }) + let range = range_from_object(vm, source_file, _object.clone(), "ClassDef")?; + stmt_class_def_from_object_with_range(vm, source_file, _object, range) } } // constructor +fn stmt_return_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::StmtReturn> { + Ok(ast::StmtReturn { + node_index: Default::default(), + value: get_node_field_opt(vm, &object, "value")? + .map(|obj| Node::ast_from_object(vm, source_file, obj)) + .transpose()?, + range, + }) +} + impl Node for ast::StmtReturn { - fn ast_to_object(self, _vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { + fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { node_index: _, value, range: _range, } = self; let node = NodeAst - .into_ref_with_type(_vm, pyast::NodeStmtReturn::static_type().to_owned()) + .into_ref_with_type(vm, pyast::NodeStmtReturn::static_type().to_owned()) .unwrap(); let dict = node.as_object().dict().unwrap(); - dict.set_item("value", value.ast_to_object(_vm, source_file), _vm) + dict.set_item("value", value.ast_to_object(vm, source_file), vm) .unwrap(); - node_add_location(&dict, _range, _vm, source_file); + node_add_location(&dict, _range, vm, source_file); node.into() } fn ast_from_object( - _vm: &VirtualMachine, + vm: &VirtualMachine, source_file: &SourceFile, _object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - value: get_node_field_opt(_vm, &_object, "value")? - .map(|obj| Node::ast_from_object(_vm, source_file, obj)) - .transpose()?, - range: range_from_object(_vm, source_file, _object, "Return")?, - }) + let range = range_from_object(vm, source_file, _object.clone(), "Return")?; + stmt_return_from_object_with_range(vm, source_file, _object, range) } } // constructor +fn stmt_delete_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::StmtDelete> { + let targets: Vec<Option<ast::Expr>> = + get_node_list_field(vm, source_file, &object, "targets", "Delete")?; + let (runtime_targets, targets) = runtime_expr_list_from_values(targets); + Ok(ast::StmtDelete { + node_index: Default::default(), + targets, + range, + runtime_targets, + }) +} + impl Node for ast::StmtDelete { - fn ast_to_object(self, _vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { + fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { node_index: _, targets, range: _range, + runtime_targets, } = self; let node = NodeAst - .into_ref_with_type(_vm, pyast::NodeStmtDelete::static_type().to_owned()) + .into_ref_with_type(vm, pyast::NodeStmtDelete::static_type().to_owned()) .unwrap(); let dict = node.as_object().dict().unwrap(); - dict.set_item("targets", targets.ast_to_object(_vm, source_file), _vm) - .unwrap(); - node_add_location(&dict, _range, _vm, source_file); + let targets = runtime_targets.map_or_else( + || targets.ast_to_object(vm, source_file), + |values| values.ast_to_object(vm, source_file), + ); + dict.set_item("targets", targets, vm).unwrap(); + node_add_location(&dict, _range, vm, source_file); node.into() } fn ast_from_object( - _vm: &VirtualMachine, + vm: &VirtualMachine, source_file: &SourceFile, _object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - targets: Node::ast_from_object( - _vm, - source_file, - get_node_field(_vm, &_object, "targets", "Delete")?, - )?, - range: range_from_object(_vm, source_file, _object, "Delete")?, - }) + let range = range_from_object(vm, source_file, _object.clone(), "Delete")?; + stmt_delete_from_object_with_range(vm, source_file, _object, range) } } // constructor +fn stmt_assign_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::StmtAssign> { + let targets: Vec<Option<ast::Expr>> = + get_node_list_field(vm, source_file, &object, "targets", "Assign")?; + let (runtime_targets, targets) = runtime_expr_list_from_values(targets); + let value = get_required_node_field(vm, source_file, &object, "value", "Assign")?; + let (runtime_type_comment, runtime_type_comment_bytes) = + runtime_stmt_type_comment(vm, get_ast_string_field_opt(vm, &object, "type_comment")?); + Ok(ast::StmtAssign { + node_index: Default::default(), + targets, + value, + range, + runtime_targets, + runtime_type_comment, + runtime_type_comment_bytes, + }) +} + impl Node for ast::StmtAssign { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { node_index: _, targets, value, - // type_comment, range, + runtime_targets, + runtime_type_comment, + runtime_type_comment_bytes, } = self; let node = NodeAst .into_ref_with_type(vm, pyast::NodeStmtAssign::static_type().to_owned()) .unwrap(); let dict = node.as_object().dict().unwrap(); - dict.set_item("targets", targets.ast_to_object(vm, source_file), vm) - .unwrap(); + let targets = runtime_targets.map_or_else( + || targets.ast_to_object(vm, source_file), + |values| values.ast_to_object(vm, source_file), + ); + dict.set_item("targets", targets, vm).unwrap(); dict.set_item("value", value.ast_to_object(vm, source_file), vm) .unwrap(); - // TODO - dict.set_item("type_comment", vm.ctx.none(), vm).unwrap(); + dict.set_item( + "type_comment", + runtime_stmt_type_comment_object(vm, runtime_type_comment, runtime_type_comment_bytes), + vm, + ) + .unwrap(); node_add_location(&dict, range, vm, source_file); node.into() } @@ -435,29 +723,29 @@ impl Node for ast::StmtAssign { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - targets: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "targets", "Assign")?, - )?, - value: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "value", "Assign")?, - )?, - // type_comment: get_node_field_opt(_vm, &_object, "type_comment")? - // .map(|obj| Node::ast_from_object(_vm, obj)) - // .transpose()?, - range: range_from_object(vm, source_file, object, "Assign")?, - }) + let range = range_from_object(vm, source_file, object.clone(), "Assign")?; + stmt_assign_from_object_with_range(vm, source_file, object, range) } } // constructor +fn stmt_type_alias_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::StmtTypeAlias> { + Ok(ast::StmtTypeAlias { + node_index: Default::default(), + name: get_required_node_field(vm, source_file, &object, "name", "TypeAlias")?, + type_params: type_params_from_field(vm, source_file, &object, "type_params", "TypeAlias")?, + value: get_required_node_field(vm, source_file, &object, "value", "TypeAlias")?, + range, + }) +} + impl Node for ast::StmtTypeAlias { - fn ast_to_object(self, _vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { + fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { node_index: _, name, @@ -466,56 +754,58 @@ impl Node for ast::StmtTypeAlias { range: _range, } = self; let node = NodeAst - .into_ref_with_type(_vm, pyast::NodeStmtTypeAlias::static_type().to_owned()) + .into_ref_with_type(vm, pyast::NodeStmtTypeAlias::static_type().to_owned()) .unwrap(); let dict = node.as_object().dict().unwrap(); - dict.set_item("name", name.ast_to_object(_vm, source_file), _vm) + dict.set_item("name", name.ast_to_object(vm, source_file), vm) .unwrap(); dict.set_item( "type_params", type_params.map_or_else( - || _vm.ctx.new_list(Vec::new()).into(), - |tp| tp.ast_to_object(_vm, source_file), + || vm.ctx.new_list(Vec::new()).into(), + |tp| tp.ast_to_object(vm, source_file), ), - _vm, + vm, ) .unwrap(); - dict.set_item("value", value.ast_to_object(_vm, source_file), _vm) + dict.set_item("value", value.ast_to_object(vm, source_file), vm) .unwrap(); - node_add_location(&dict, _range, _vm, source_file); + node_add_location(&dict, _range, vm, source_file); node.into() } fn ast_from_object( - _vm: &VirtualMachine, + vm: &VirtualMachine, source_file: &SourceFile, _object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - name: Node::ast_from_object( - _vm, - source_file, - get_node_field(_vm, &_object, "name", "TypeAlias")?, - )?, - type_params: Node::ast_from_object( - _vm, - source_file, - get_node_field_opt(_vm, &_object, "type_params")?.unwrap_or_else(|| _vm.ctx.none()), - )?, - value: Node::ast_from_object( - _vm, - source_file, - get_node_field(_vm, &_object, "value", "TypeAlias")?, - )?, - range: range_from_object(_vm, source_file, _object, "TypeAlias")?, - }) + let range = range_from_object(vm, source_file, _object.clone(), "TypeAlias")?; + stmt_type_alias_from_object_with_range(vm, source_file, _object, range) } } // constructor +fn stmt_aug_assign_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::StmtAugAssign> { + Ok(ast::StmtAugAssign { + node_index: Default::default(), + target: get_required_node_field(vm, source_file, &object, "target", "AugAssign")?, + op: Node::ast_from_object( + vm, + source_file, + get_node_field_required(vm, &object, "op", "AugAssign")?, + )?, + value: get_required_node_field(vm, source_file, &object, "value", "AugAssign")?, + range, + }) +} + impl Node for ast::StmtAugAssign { - fn ast_to_object(self, _vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { + fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { node_index: _, target, @@ -524,48 +814,56 @@ impl Node for ast::StmtAugAssign { range: _range, } = self; let node = NodeAst - .into_ref_with_type(_vm, pyast::NodeStmtAugAssign::static_type().to_owned()) + .into_ref_with_type(vm, pyast::NodeStmtAugAssign::static_type().to_owned()) .unwrap(); let dict = node.as_object().dict().unwrap(); - dict.set_item("target", target.ast_to_object(_vm, source_file), _vm) + dict.set_item("target", target.ast_to_object(vm, source_file), vm) .unwrap(); - dict.set_item("op", op.ast_to_object(_vm, source_file), _vm) + dict.set_item("op", op.ast_to_object(vm, source_file), vm) .unwrap(); - dict.set_item("value", value.ast_to_object(_vm, source_file), _vm) + dict.set_item("value", value.ast_to_object(vm, source_file), vm) .unwrap(); - node_add_location(&dict, _range, _vm, source_file); + node_add_location(&dict, _range, vm, source_file); node.into() } fn ast_from_object( - _vm: &VirtualMachine, + vm: &VirtualMachine, source_file: &SourceFile, _object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - target: Node::ast_from_object( - _vm, - source_file, - get_node_field(_vm, &_object, "target", "AugAssign")?, - )?, - op: Node::ast_from_object( - _vm, - source_file, - get_node_field(_vm, &_object, "op", "AugAssign")?, - )?, - value: Node::ast_from_object( - _vm, - source_file, - get_node_field(_vm, &_object, "value", "AugAssign")?, - )?, - range: range_from_object(_vm, source_file, _object, "AugAssign")?, - }) + let range = range_from_object(vm, source_file, _object.clone(), "AugAssign")?; + stmt_aug_assign_from_object_with_range(vm, source_file, _object, range) } } // constructor +fn stmt_ann_assign_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::StmtAnnAssign> { + let simple = node_object_to_i32(vm, get_node_field(vm, &object, "simple", "AnnAssign")?)?; + let runtime_simple = if simple != 0 && simple != 1 { + Some(simple) + } else { + None + }; + Ok(ast::StmtAnnAssign { + node_index: Default::default(), + target: get_required_node_field(vm, source_file, &object, "target", "AnnAssign")?, + annotation: get_required_node_field(vm, source_file, &object, "annotation", "AnnAssign")?, + value: get_node_field_opt(vm, &object, "value")? + .map(|obj| Node::ast_from_object(vm, source_file, obj)) + .transpose()?, + simple: simple != 0, + range, + runtime_simple, + }) +} + impl Node for ast::StmtAnnAssign { - fn ast_to_object(self, _vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { + fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { node_index: _, target, @@ -573,59 +871,73 @@ impl Node for ast::StmtAnnAssign { value, simple, range: _range, + runtime_simple, } = self; let node = NodeAst - .into_ref_with_type(_vm, pyast::NodeStmtAnnAssign::static_type().to_owned()) + .into_ref_with_type(vm, pyast::NodeStmtAnnAssign::static_type().to_owned()) .unwrap(); let dict = node.as_object().dict().unwrap(); - dict.set_item("target", target.ast_to_object(_vm, source_file), _vm) + dict.set_item("target", target.ast_to_object(vm, source_file), vm) .unwrap(); - dict.set_item( - "annotation", - annotation.ast_to_object(_vm, source_file), - _vm, - ) - .unwrap(); - dict.set_item("value", value.ast_to_object(_vm, source_file), _vm) + dict.set_item("annotation", annotation.ast_to_object(vm, source_file), vm) .unwrap(); - dict.set_item("simple", simple.ast_to_object(_vm, source_file), _vm) + dict.set_item("value", value.ast_to_object(vm, source_file), vm) .unwrap(); - node_add_location(&dict, _range, _vm, source_file); + let simple = runtime_simple.map_or_else( + || simple.ast_to_object(vm, source_file), + |simple| vm.ctx.new_int(simple).into(), + ); + dict.set_item("simple", simple, vm).unwrap(); + node_add_location(&dict, _range, vm, source_file); node.into() } fn ast_from_object( - _vm: &VirtualMachine, + vm: &VirtualMachine, source_file: &SourceFile, _object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - target: Node::ast_from_object( - _vm, - source_file, - get_node_field(_vm, &_object, "target", "AnnAssign")?, - )?, - annotation: Node::ast_from_object( - _vm, - source_file, - get_node_field(_vm, &_object, "annotation", "AnnAssign")?, - )?, - value: get_node_field_opt(_vm, &_object, "value")? - .map(|obj| Node::ast_from_object(_vm, source_file, obj)) - .transpose()?, - simple: Node::ast_from_object( - _vm, - source_file, - get_node_field(_vm, &_object, "simple", "AnnAssign")?, - )?, - range: range_from_object(_vm, source_file, _object, "AnnAssign")?, - }) + let range = range_from_object(vm, source_file, _object.clone(), "AnnAssign")?; + stmt_ann_assign_from_object_with_range(vm, source_file, _object, range) } } // constructor +fn stmt_for_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, + is_async: bool, +) -> PyResult<ast::StmtFor> { + let typ = if is_async { "AsyncFor" } else { "For" }; + let target = get_required_node_field(vm, source_file, &object, "target", typ)?; + let iter = get_required_node_field(vm, source_file, &object, "iter", typ)?; + let body: Vec<Option<ast::Stmt>> = get_node_list_field(vm, source_file, &object, "body", typ)?; + let orelse: Vec<Option<ast::Stmt>> = + get_node_list_field(vm, source_file, &object, "orelse", typ)?; + let runtime_body = runtime_stmt_list_metadata(&body); + let runtime_orelse = runtime_stmt_list_metadata(&orelse); + let body = lower_runtime_stmt_list(body); + let orelse = lower_runtime_stmt_list(orelse); + let (runtime_type_comment, runtime_type_comment_bytes) = + runtime_stmt_type_comment(vm, get_ast_string_field_opt(vm, &object, "type_comment")?); + Ok(ast::StmtFor { + node_index: Default::default(), + target, + iter, + body, + orelse, + range, + is_async, + runtime_type_comment, + runtime_type_comment_bytes, + runtime_body, + runtime_orelse, + }) +} + impl Node for ast::StmtFor { - fn ast_to_object(self, _vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { + fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { node_index: _, is_async, @@ -633,8 +945,11 @@ impl Node for ast::StmtFor { iter, body, orelse, - // type_comment, range: _range, + runtime_type_comment, + runtime_type_comment_bytes, + runtime_body, + runtime_orelse, } = self; let cls = if !is_async { @@ -643,133 +958,134 @@ impl Node for ast::StmtFor { pyast::NodeStmtAsyncFor::static_type().to_owned() }; - let node = NodeAst.into_ref_with_type(_vm, cls).unwrap(); + let node = NodeAst.into_ref_with_type(vm, cls).unwrap(); let dict = node.as_object().dict().unwrap(); - dict.set_item("target", target.ast_to_object(_vm, source_file), _vm) + dict.set_item("target", target.ast_to_object(vm, source_file), vm) .unwrap(); - dict.set_item("iter", iter.ast_to_object(_vm, source_file), _vm) + dict.set_item("iter", iter.ast_to_object(vm, source_file), vm) .unwrap(); - dict.set_item("body", body.ast_to_object(_vm, source_file), _vm) - .unwrap(); - dict.set_item("orelse", orelse.ast_to_object(_vm, source_file), _vm) - .unwrap(); - // Ruff AST doesn't track type_comment, so always set to None - dict.set_item("type_comment", _vm.ctx.none(), _vm).unwrap(); - node_add_location(&dict, _range, _vm, source_file); + let body = runtime_body.map_or_else( + || body.ast_to_object(vm, source_file), + |values| values.ast_to_object(vm, source_file), + ); + dict.set_item("body", body, vm).unwrap(); + let orelse = runtime_orelse.map_or_else( + || orelse.ast_to_object(vm, source_file), + |values| values.ast_to_object(vm, source_file), + ); + dict.set_item("orelse", orelse, vm).unwrap(); + dict.set_item( + "type_comment", + runtime_stmt_type_comment_object(vm, runtime_type_comment, runtime_type_comment_bytes), + vm, + ) + .unwrap(); + node_add_location(&dict, _range, vm, source_file); node.into() } fn ast_from_object( - _vm: &VirtualMachine, + vm: &VirtualMachine, source_file: &SourceFile, _object: PyObjectRef, ) -> PyResult<Self> { - let _cls = _object.class(); debug_assert!( - _cls.is(pyast::NodeStmtFor::static_type()) - || _cls.is(pyast::NodeStmtAsyncFor::static_type()) + is_node_instance(vm, &_object, pyast::NodeStmtFor::static_type())? + || is_node_instance(vm, &_object, pyast::NodeStmtAsyncFor::static_type())? ); - let is_async = _cls.is(pyast::NodeStmtAsyncFor::static_type()); - Ok(Self { - node_index: Default::default(), - target: Node::ast_from_object( - _vm, - source_file, - get_node_field(_vm, &_object, "target", "For")?, - )?, - iter: Node::ast_from_object( - _vm, - source_file, - get_node_field(_vm, &_object, "iter", "For")?, - )?, - body: Node::ast_from_object( - _vm, - source_file, - get_node_field(_vm, &_object, "body", "For")?, - )?, - orelse: Node::ast_from_object( - _vm, - source_file, - get_node_field(_vm, &_object, "orelse", "For")?, - )?, - // type_comment: get_node_field_opt(_vm, &_object, "type_comment")? - // .map(|obj| Node::ast_from_object(_vm, obj)) - // .transpose()?, - range: range_from_object(_vm, source_file, _object, "For")?, - is_async, - }) + let is_async = is_node_instance(vm, &_object, pyast::NodeStmtAsyncFor::static_type())?; + let typ = if is_async { "AsyncFor" } else { "For" }; + let range = range_from_object(vm, source_file, _object.clone(), typ)?; + stmt_for_from_object_with_range(vm, source_file, _object, range, is_async) } } // constructor +fn stmt_while_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::StmtWhile> { + let body: Vec<Option<ast::Stmt>> = + get_node_list_field(vm, source_file, &object, "body", "While")?; + let orelse: Vec<Option<ast::Stmt>> = + get_node_list_field(vm, source_file, &object, "orelse", "While")?; + let runtime_body = runtime_stmt_list_metadata(&body); + let runtime_orelse = runtime_stmt_list_metadata(&orelse); + Ok(ast::StmtWhile { + node_index: Default::default(), + test: get_required_node_field(vm, source_file, &object, "test", "While")?, + body: lower_runtime_stmt_list(body), + orelse: lower_runtime_stmt_list(orelse), + range, + runtime_body, + runtime_orelse, + }) +} + impl Node for ast::StmtWhile { - fn ast_to_object(self, _vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { + fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { node_index: _, test, body, orelse, range: _range, + runtime_body, + runtime_orelse, } = self; let node = NodeAst - .into_ref_with_type(_vm, pyast::NodeStmtWhile::static_type().to_owned()) + .into_ref_with_type(vm, pyast::NodeStmtWhile::static_type().to_owned()) .unwrap(); let dict = node.as_object().dict().unwrap(); - dict.set_item("test", test.ast_to_object(_vm, source_file), _vm) + dict.set_item("test", test.ast_to_object(vm, source_file), vm) .unwrap(); - dict.set_item("body", body.ast_to_object(_vm, source_file), _vm) - .unwrap(); - dict.set_item("orelse", orelse.ast_to_object(_vm, source_file), _vm) - .unwrap(); - node_add_location(&dict, _range, _vm, source_file); + let body = runtime_body.map_or_else( + || body.ast_to_object(vm, source_file), + |values| values.ast_to_object(vm, source_file), + ); + dict.set_item("body", body, vm).unwrap(); + let orelse = runtime_orelse.map_or_else( + || orelse.ast_to_object(vm, source_file), + |values| values.ast_to_object(vm, source_file), + ); + dict.set_item("orelse", orelse, vm).unwrap(); + node_add_location(&dict, _range, vm, source_file); node.into() } fn ast_from_object( - _vm: &VirtualMachine, + vm: &VirtualMachine, source_file: &SourceFile, _object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - test: Node::ast_from_object( - _vm, - source_file, - get_node_field(_vm, &_object, "test", "While")?, - )?, - body: Node::ast_from_object( - _vm, - source_file, - get_node_field(_vm, &_object, "body", "While")?, - )?, - orelse: Node::ast_from_object( - _vm, - source_file, - get_node_field(_vm, &_object, "orelse", "While")?, - )?, - range: range_from_object(_vm, source_file, _object, "While")?, - }) + let range = range_from_object(vm, source_file, _object.clone(), "While")?; + stmt_while_from_object_with_range(vm, source_file, _object, range) } } // constructor impl Node for ast::StmtIf { - fn ast_to_object(self, _vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { + fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { - node_index: _, + node_index, test, body, range, elif_else_clauses, + runtime_body, } = self; elif_else_clause::ast_to_object( ast::ElifElseClause { - node_index: Default::default(), + node_index, range, test: Some(*test), body, + runtime_body, + runtime_orelse: None, }, elif_else_clauses.into_iter(), - _vm, + vm, source_file, ) } @@ -778,19 +1094,47 @@ impl Node for ast::StmtIf { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - elif_else_clause::ast_from_object(vm, source_file, object) + let range = range_from_object(vm, source_file, object.clone(), "If")?; + elif_else_clause::ast_from_object_with_range(vm, source_file, object, range) } } // constructor +fn stmt_with_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, + is_async: bool, +) -> PyResult<ast::StmtWith> { + let typ = if is_async { "AsyncWith" } else { "With" }; + let items = get_node_list_field(vm, source_file, &object, "items", typ)?; + let body: Vec<Option<ast::Stmt>> = get_node_list_field(vm, source_file, &object, "body", typ)?; + let (runtime_body, body) = runtime_stmt_list_from_values(body); + let (runtime_type_comment, runtime_type_comment_bytes) = + runtime_stmt_type_comment(vm, get_ast_string_field_opt(vm, &object, "type_comment")?); + Ok(ast::StmtWith { + node_index: Default::default(), + items, + body, + range, + is_async, + runtime_type_comment, + runtime_type_comment_bytes, + runtime_body, + }) +} + impl Node for ast::StmtWith { - fn ast_to_object(self, _vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { + fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { node_index: _, is_async, items, body, - // type_comment, range: _range, + runtime_type_comment, + runtime_type_comment_bytes, + runtime_body, } = self; let cls = if !is_async { @@ -799,51 +1143,56 @@ impl Node for ast::StmtWith { pyast::NodeStmtAsyncWith::static_type().to_owned() }; - let node = NodeAst.into_ref_with_type(_vm, cls).unwrap(); + let node = NodeAst.into_ref_with_type(vm, cls).unwrap(); let dict = node.as_object().dict().unwrap(); - dict.set_item("items", items.ast_to_object(_vm, source_file), _vm) + dict.set_item("items", items.ast_to_object(vm, source_file), vm) .unwrap(); - dict.set_item("body", body.ast_to_object(_vm, source_file), _vm) - .unwrap(); - // Ruff AST doesn't track type_comment, so always set to None - dict.set_item("type_comment", _vm.ctx.none(), _vm).unwrap(); - node_add_location(&dict, _range, _vm, source_file); + let body = runtime_body.map_or_else( + || body.ast_to_object(vm, source_file), + |values| values.ast_to_object(vm, source_file), + ); + dict.set_item("body", body, vm).unwrap(); + dict.set_item( + "type_comment", + runtime_stmt_type_comment_object(vm, runtime_type_comment, runtime_type_comment_bytes), + vm, + ) + .unwrap(); + node_add_location(&dict, _range, vm, source_file); node.into() } fn ast_from_object( - _vm: &VirtualMachine, + vm: &VirtualMachine, source_file: &SourceFile, _object: PyObjectRef, ) -> PyResult<Self> { - let _cls = _object.class(); debug_assert!( - _cls.is(pyast::NodeStmtWith::static_type()) - || _cls.is(pyast::NodeStmtAsyncWith::static_type()) + is_node_instance(vm, &_object, pyast::NodeStmtWith::static_type())? + || is_node_instance(vm, &_object, pyast::NodeStmtAsyncWith::static_type())? ); - let is_async = _cls.is(pyast::NodeStmtAsyncWith::static_type()); - Ok(Self { - node_index: Default::default(), - items: Node::ast_from_object( - _vm, - source_file, - get_node_field(_vm, &_object, "items", "With")?, - )?, - body: Node::ast_from_object( - _vm, - source_file, - get_node_field(_vm, &_object, "body", "With")?, - )?, - // type_comment: get_node_field_opt(_vm, &_object, "type_comment")? - // .map(|obj| Node::ast_from_object(_vm, obj)) - // .transpose()?, - range: range_from_object(_vm, source_file, _object, "With")?, - is_async, - }) + let is_async = is_node_instance(vm, &_object, pyast::NodeStmtAsyncWith::static_type())?; + let typ = if is_async { "AsyncWith" } else { "With" }; + let range = range_from_object(vm, source_file, _object.clone(), typ)?; + stmt_with_from_object_with_range(vm, source_file, _object, range, is_async) } } // constructor +fn stmt_match_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::StmtMatch> { + Ok(ast::StmtMatch { + node_index: Default::default(), + subject: get_required_node_field(vm, source_file, &object, "subject", "Match")?, + cases: get_node_list_field(vm, source_file, &object, "cases", "Match")?, + range, + }) +} + impl Node for ast::StmtMatch { - fn ast_to_object(self, _vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { + fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { node_index: _, subject, @@ -851,40 +1200,46 @@ impl Node for ast::StmtMatch { range: _range, } = self; let node = NodeAst - .into_ref_with_type(_vm, pyast::NodeStmtMatch::static_type().to_owned()) + .into_ref_with_type(vm, pyast::NodeStmtMatch::static_type().to_owned()) .unwrap(); let dict = node.as_object().dict().unwrap(); - dict.set_item("subject", subject.ast_to_object(_vm, source_file), _vm) + dict.set_item("subject", subject.ast_to_object(vm, source_file), vm) .unwrap(); - dict.set_item("cases", cases.ast_to_object(_vm, source_file), _vm) + dict.set_item("cases", cases.ast_to_object(vm, source_file), vm) .unwrap(); - node_add_location(&dict, _range, _vm, source_file); + node_add_location(&dict, _range, vm, source_file); node.into() } fn ast_from_object( - _vm: &VirtualMachine, + vm: &VirtualMachine, source_file: &SourceFile, _object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - subject: Node::ast_from_object( - _vm, - source_file, - get_node_field(_vm, &_object, "subject", "Match")?, - )?, - cases: Node::ast_from_object( - _vm, - source_file, - get_node_field(_vm, &_object, "cases", "Match")?, - )?, - range: range_from_object(_vm, source_file, _object, "Match")?, - }) + let range = range_from_object(vm, source_file, _object.clone(), "Match")?; + stmt_match_from_object_with_range(vm, source_file, _object, range) } } // constructor +fn stmt_raise_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::StmtRaise> { + Ok(ast::StmtRaise { + node_index: Default::default(), + exc: get_node_field_opt(vm, &object, "exc")? + .map(|obj| Node::ast_from_object(vm, source_file, obj)) + .transpose()?, + cause: get_node_field_opt(vm, &object, "cause")? + .map(|obj| Node::ast_from_object(vm, source_file, obj)) + .transpose()?, + range, + }) +} + impl Node for ast::StmtRaise { - fn ast_to_object(self, _vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { + fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { node_index: _, exc, @@ -892,36 +1247,118 @@ impl Node for ast::StmtRaise { range: _range, } = self; let node = NodeAst - .into_ref_with_type(_vm, pyast::NodeStmtRaise::static_type().to_owned()) + .into_ref_with_type(vm, pyast::NodeStmtRaise::static_type().to_owned()) .unwrap(); let dict = node.as_object().dict().unwrap(); - dict.set_item("exc", exc.ast_to_object(_vm, source_file), _vm) + dict.set_item("exc", exc.ast_to_object(vm, source_file), vm) .unwrap(); - dict.set_item("cause", cause.ast_to_object(_vm, source_file), _vm) + dict.set_item("cause", cause.ast_to_object(vm, source_file), vm) .unwrap(); - node_add_location(&dict, _range, _vm, source_file); + node_add_location(&dict, _range, vm, source_file); node.into() } fn ast_from_object( - _vm: &VirtualMachine, + vm: &VirtualMachine, source_file: &SourceFile, _object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - exc: get_node_field_opt(_vm, &_object, "exc")? - .map(|obj| Node::ast_from_object(_vm, source_file, obj)) - .transpose()?, - cause: get_node_field_opt(_vm, &_object, "cause")? - .map(|obj| Node::ast_from_object(_vm, source_file, obj)) - .transpose()?, - range: range_from_object(_vm, source_file, _object, "Raise")?, - }) + let range = range_from_object(vm, source_file, _object.clone(), "Raise")?; + stmt_raise_from_object_with_range(vm, source_file, _object, range) } } // constructor +fn stmt_try_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, + is_star: bool, +) -> PyResult<ast::StmtTry> { + let typ = if is_star { "TryStar" } else { "Try" }; + let body: Vec<Option<ast::Stmt>> = get_node_list_field(vm, source_file, &object, "body", typ)?; + let orelse: Vec<Option<ast::Stmt>> = + get_node_list_field(vm, source_file, &object, "orelse", typ)?; + let finalbody: Vec<Option<ast::Stmt>> = + get_node_list_field(vm, source_file, &object, "finalbody", typ)?; + let (runtime_handler_values, handlers) = + except_handler_list_from_field(vm, source_file, &object, typ, is_star, range)?; + let runtime_body = runtime_stmt_list_metadata(&body); + let runtime_orelse = runtime_stmt_list_metadata(&orelse); + let runtime_finalbody = runtime_stmt_list_metadata(&finalbody); + let runtime_handlers = runtime_except_handler_list_metadata(&runtime_handler_values); + Ok(ast::StmtTry { + node_index: Default::default(), + body: lower_runtime_stmt_list(body), + handlers, + orelse: lower_runtime_stmt_list(orelse), + finalbody: lower_runtime_stmt_list(finalbody), + range, + is_star, + runtime_body, + runtime_handlers, + runtime_orelse, + runtime_finalbody, + }) +} + +fn except_handler_list_from_field( + vm: &VirtualMachine, + source_file: &SourceFile, + object: &PyObject, + typ: &str, + is_try_star: bool, + range: TextRange, +) -> PyResult<(Vec<Option<ast::ExceptHandler>>, Vec<ast::ExceptHandler>)> { + let value = get_node_list_field_object(vm, object, "handlers", typ)?; + let list = value.downcast_ref::<PyList>().unwrap(); + let len = list.borrow_vec().len(); + let mut result = Vec::with_capacity(len); + let mut runtime_values = Vec::with_capacity(len); + let recursion_context = format!(" while traversing '{typ}' node"); + for i in 0..len { + let item = { + let items = list.borrow_vec(); + if items.len() != len { + return Err(vm.new_runtime_error(format!( + r#"{typ} field "handlers" changed size during iteration"# + ))); + } + items[i].clone() + }; + let runtime_handler = if vm.is_none(&item) { + None + } else { + Some(vm.with_recursion(&recursion_context, || { + if is_try_star { + except_handler_from_object_unvalidated_range(vm, source_file, item) + } else { + Node::ast_from_object(vm, source_file, item) + } + })?) + }; + let handler = runtime_handler.clone().unwrap_or_else(|| { + ast::ExceptHandler::ExceptHandler(ast::ExceptHandlerExceptHandler { + node_index: Default::default(), + range, + type_: None, + name: None, + body: Vec::new(), + runtime_body: None, + }) + }); + runtime_values.push(runtime_handler); + result.push(handler); + if list.borrow_vec().len() != len { + return Err(vm.new_runtime_error(format!( + r#"{typ} field "handlers" changed size during iteration"# + ))); + } + } + Ok((runtime_values, result)) +} + impl Node for ast::StmtTry { - fn ast_to_object(self, _vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { + fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { node_index: _, body, @@ -930,9 +1367,12 @@ impl Node for ast::StmtTry { finalbody, range: _range, is_star, + runtime_body, + runtime_handlers, + runtime_orelse, + runtime_finalbody, } = self; - // let cls = gen::NodeStmtTry::static_type().to_owned(); let cls = if is_star { pyast::NodeStmtTryStar::static_type() } else { @@ -940,62 +1380,66 @@ impl Node for ast::StmtTry { } .to_owned(); - let node = NodeAst.into_ref_with_type(_vm, cls).unwrap(); + let node = NodeAst.into_ref_with_type(vm, cls).unwrap(); let dict = node.as_object().dict().unwrap(); - dict.set_item("body", body.ast_to_object(_vm, source_file), _vm) - .unwrap(); - dict.set_item("handlers", handlers.ast_to_object(_vm, source_file), _vm) - .unwrap(); - dict.set_item("orelse", orelse.ast_to_object(_vm, source_file), _vm) - .unwrap(); - dict.set_item("finalbody", finalbody.ast_to_object(_vm, source_file), _vm) - .unwrap(); - node_add_location(&dict, _range, _vm, source_file); + let body = runtime_body.map_or_else( + || body.ast_to_object(vm, source_file), + |values| values.ast_to_object(vm, source_file), + ); + dict.set_item("body", body, vm).unwrap(); + let handlers = runtime_handlers.map_or_else( + || handlers.ast_to_object(vm, source_file), + |values| values.ast_to_object(vm, source_file), + ); + dict.set_item("handlers", handlers, vm).unwrap(); + let orelse = runtime_orelse.map_or_else( + || orelse.ast_to_object(vm, source_file), + |values| values.ast_to_object(vm, source_file), + ); + dict.set_item("orelse", orelse, vm).unwrap(); + let finalbody = runtime_finalbody.map_or_else( + || finalbody.ast_to_object(vm, source_file), + |values| values.ast_to_object(vm, source_file), + ); + dict.set_item("finalbody", finalbody, vm).unwrap(); + node_add_location(&dict, _range, vm, source_file); node.into() } fn ast_from_object( - _vm: &VirtualMachine, + vm: &VirtualMachine, source_file: &SourceFile, _object: PyObjectRef, ) -> PyResult<Self> { - let _cls = _object.class(); - let is_star = _cls.is(pyast::NodeStmtTryStar::static_type()); - let _cls = _object.class(); + let is_star = is_node_instance(vm, &_object, pyast::NodeStmtTryStar::static_type())?; debug_assert!( - _cls.is(pyast::NodeStmtTry::static_type()) - || _cls.is(pyast::NodeStmtTryStar::static_type()) + is_node_instance(vm, &_object, pyast::NodeStmtTry::static_type())? + || is_node_instance(vm, &_object, pyast::NodeStmtTryStar::static_type())? ); - - Ok(Self { - node_index: Default::default(), - body: Node::ast_from_object( - _vm, - source_file, - get_node_field(_vm, &_object, "body", "Try")?, - )?, - handlers: Node::ast_from_object( - _vm, - source_file, - get_node_field(_vm, &_object, "handlers", "Try")?, - )?, - orelse: Node::ast_from_object( - _vm, - source_file, - get_node_field(_vm, &_object, "orelse", "Try")?, - )?, - finalbody: Node::ast_from_object( - _vm, - source_file, - get_node_field(_vm, &_object, "finalbody", "Try")?, - )?, - range: range_from_object(_vm, source_file, _object, "Try")?, - is_star, - }) + let typ = if is_star { "TryStar" } else { "Try" }; + let range = range_from_object(vm, source_file, _object.clone(), typ)?; + stmt_try_from_object_with_range(vm, source_file, _object, range, is_star) } } + // constructor +fn stmt_assert_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::StmtAssert> { + Ok(ast::StmtAssert { + node_index: Default::default(), + test: get_required_node_field(vm, source_file, &object, "test", "Assert")?, + msg: get_node_field_opt(vm, &object, "msg")? + .map(|obj| Node::ast_from_object(vm, source_file, obj)) + .transpose()?, + range, + }) +} + impl Node for ast::StmtAssert { - fn ast_to_object(self, _vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { + fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { node_index: _, test, @@ -1003,38 +1447,42 @@ impl Node for ast::StmtAssert { range: _range, } = self; let node = NodeAst - .into_ref_with_type(_vm, pyast::NodeStmtAssert::static_type().to_owned()) + .into_ref_with_type(vm, pyast::NodeStmtAssert::static_type().to_owned()) .unwrap(); let dict = node.as_object().dict().unwrap(); - dict.set_item("test", test.ast_to_object(_vm, source_file), _vm) + dict.set_item("test", test.ast_to_object(vm, source_file), vm) .unwrap(); - dict.set_item("msg", msg.ast_to_object(_vm, source_file), _vm) + dict.set_item("msg", msg.ast_to_object(vm, source_file), vm) .unwrap(); - node_add_location(&dict, _range, _vm, source_file); + node_add_location(&dict, _range, vm, source_file); node.into() } fn ast_from_object( - _vm: &VirtualMachine, + vm: &VirtualMachine, source_file: &SourceFile, _object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - test: Node::ast_from_object( - _vm, - source_file, - get_node_field(_vm, &_object, "test", "Assert")?, - )?, - msg: get_node_field_opt(_vm, &_object, "msg")? - .map(|obj| Node::ast_from_object(_vm, source_file, obj)) - .transpose()?, - range: range_from_object(_vm, source_file, _object, "Assert")?, - }) + let range = range_from_object(vm, source_file, _object.clone(), "Assert")?; + stmt_assert_from_object_with_range(vm, source_file, _object, range) } } // constructor +fn stmt_import_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::StmtImport> { + Ok(ast::StmtImport { + node_index: Default::default(), + names: get_node_list_field(vm, source_file, &object, "names", "Import")?, + range, + is_lazy: false, + }) +} + impl Node for ast::StmtImport { - fn ast_to_object(self, _vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { + fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { node_index: _, names, @@ -1042,33 +1490,62 @@ impl Node for ast::StmtImport { is_lazy: _, } = self; let node = NodeAst - .into_ref_with_type(_vm, pyast::NodeStmtImport::static_type().to_owned()) + .into_ref_with_type(vm, pyast::NodeStmtImport::static_type().to_owned()) .unwrap(); let dict = node.as_object().dict().unwrap(); - dict.set_item("names", names.ast_to_object(_vm, source_file), _vm) + dict.set_item("names", names.ast_to_object(vm, source_file), vm) .unwrap(); - node_add_location(&dict, _range, _vm, source_file); + node_add_location(&dict, _range, vm, source_file); node.into() } fn ast_from_object( - _vm: &VirtualMachine, + vm: &VirtualMachine, source_file: &SourceFile, _object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - names: Node::ast_from_object( - _vm, - source_file, - get_node_field(_vm, &_object, "names", "Import")?, - )?, - range: range_from_object(_vm, source_file, _object, "Import")?, - is_lazy: false, // Placeholder - }) + let range = range_from_object(vm, source_file, _object.clone(), "Import")?; + stmt_import_from_object_with_range(vm, source_file, _object, range) } } // constructor +fn stmt_import_from_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::StmtImportFrom> { + let (level, raw_level) = import_from_level_from_field(vm, &object)?; + let runtime_level = raw_level.filter(|level| *level < 0); + Ok(ast::StmtImportFrom { + node_index: Default::default(), + module: get_node_field_opt(vm, &object, "module")? + .map(|obj| Node::ast_from_object(vm, source_file, obj)) + .transpose()?, + names: get_node_list_field(vm, source_file, &object, "names", "ImportFrom")?, + level, + range, + is_lazy: false, + runtime_level, + }) +} + +fn import_from_level_from_field( + vm: &VirtualMachine, + object: &PyObjectRef, +) -> PyResult<(u32, Option<i32>)> { + let Some(value) = get_node_field_opt(vm, object, "level")? else { + return Ok((0, None)); + }; + let level = vm.with_recursion(" while traversing 'ImportFrom' node", || { + node_object_to_i32(vm, value) + })?; + if level < 0 { + return Ok((0, Some(level))); + } + Ok((level as u32, None)) +} + impl Node for ast::StmtImportFrom { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { @@ -1078,6 +1555,7 @@ impl Node for ast::StmtImportFrom { level, range, is_lazy: _, + runtime_level, } = self; let node = NodeAst .into_ref_with_type(vm, pyast::NodeStmtImportFrom::static_type().to_owned()) @@ -1087,8 +1565,11 @@ impl Node for ast::StmtImportFrom { .unwrap(); dict.set_item("names", names.ast_to_object(vm, source_file), vm) .unwrap(); - dict.set_item("level", vm.ctx.new_int(level).to_pyobject(vm), vm) - .unwrap(); + let level = runtime_level.map_or_else( + || vm.ctx.new_int(level).to_pyobject(vm), + |level| vm.ctx.new_int(level).to_pyobject(vm), + ); + dict.set_item("level", level, vm).unwrap(); node_add_location(&dict, range, vm, source_file); node.into() } @@ -1098,141 +1579,143 @@ impl Node for ast::StmtImportFrom { source_file: &SourceFile, _object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - module: get_node_field_opt(vm, &_object, "module")? - .map(|obj| Node::ast_from_object(vm, source_file, obj)) - .transpose()?, - names: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &_object, "names", "ImportFrom")?, - )?, - level: get_node_field_opt(vm, &_object, "level")? - .map(|obj| -> PyResult<u32> { - let int: PyRef<PyInt> = obj.try_into_value(vm)?; - let value: i64 = int.try_to_primitive(vm)?; - if value < 0 { - return Err(vm.new_value_error("Negative ImportFrom level")); - } - u32::try_from(value) - .map_err(|_| vm.new_overflow_error("ImportFrom level out of range")) - }) - .transpose()? - .unwrap_or(0), - range: range_from_object(vm, source_file, _object, "ImportFrom")?, - is_lazy: false, // Placeholder - }) + let range = range_from_object(vm, source_file, _object.clone(), "ImportFrom")?; + stmt_import_from_from_object_with_range(vm, source_file, _object, range) } } // constructor +fn stmt_global_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::StmtGlobal> { + Ok(ast::StmtGlobal { + node_index: Default::default(), + names: get_node_list_field(vm, source_file, &object, "names", "Global")?, + range, + }) +} + impl Node for ast::StmtGlobal { - fn ast_to_object(self, _vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { + fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { node_index: _, names, range: _range, } = self; let node = NodeAst - .into_ref_with_type(_vm, pyast::NodeStmtGlobal::static_type().to_owned()) + .into_ref_with_type(vm, pyast::NodeStmtGlobal::static_type().to_owned()) .unwrap(); let dict = node.as_object().dict().unwrap(); - dict.set_item("names", names.ast_to_object(_vm, source_file), _vm) + dict.set_item("names", names.ast_to_object(vm, source_file), vm) .unwrap(); - node_add_location(&dict, _range, _vm, source_file); + node_add_location(&dict, _range, vm, source_file); node.into() } fn ast_from_object( - _vm: &VirtualMachine, + vm: &VirtualMachine, source_file: &SourceFile, _object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - names: Node::ast_from_object( - _vm, - source_file, - get_node_field(_vm, &_object, "names", "Global")?, - )?, - range: range_from_object(_vm, source_file, _object, "Global")?, - }) + let range = range_from_object(vm, source_file, _object.clone(), "Global")?; + stmt_global_from_object_with_range(vm, source_file, _object, range) } } // constructor +fn stmt_nonlocal_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::StmtNonlocal> { + Ok(ast::StmtNonlocal { + node_index: Default::default(), + names: get_node_list_field(vm, source_file, &object, "names", "Nonlocal")?, + range, + }) +} + impl Node for ast::StmtNonlocal { - fn ast_to_object(self, _vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { + fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { node_index: _, names, range: _range, } = self; let node = NodeAst - .into_ref_with_type(_vm, pyast::NodeStmtNonlocal::static_type().to_owned()) + .into_ref_with_type(vm, pyast::NodeStmtNonlocal::static_type().to_owned()) .unwrap(); let dict = node.as_object().dict().unwrap(); - dict.set_item("names", names.ast_to_object(_vm, source_file), _vm) + dict.set_item("names", names.ast_to_object(vm, source_file), vm) .unwrap(); - node_add_location(&dict, _range, _vm, source_file); + node_add_location(&dict, _range, vm, source_file); node.into() } fn ast_from_object( - _vm: &VirtualMachine, + vm: &VirtualMachine, source_file: &SourceFile, _object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - names: Node::ast_from_object( - _vm, - source_file, - get_node_field(_vm, &_object, "names", "Nonlocal")?, - )?, - range: range_from_object(_vm, source_file, _object, "Nonlocal")?, - }) + let range = range_from_object(vm, source_file, _object.clone(), "Nonlocal")?; + stmt_nonlocal_from_object_with_range(vm, source_file, _object, range) } } // constructor +fn stmt_expr_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::StmtExpr> { + Ok(ast::StmtExpr { + node_index: Default::default(), + value: get_required_node_field(vm, source_file, &object, "value", "Expr")?, + range, + }) +} + impl Node for ast::StmtExpr { - fn ast_to_object(self, _vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { + fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { node_index: _, value, range: _range, } = self; let node = NodeAst - .into_ref_with_type(_vm, pyast::NodeStmtExpr::static_type().to_owned()) + .into_ref_with_type(vm, pyast::NodeStmtExpr::static_type().to_owned()) .unwrap(); let dict = node.as_object().dict().unwrap(); - dict.set_item("value", value.ast_to_object(_vm, source_file), _vm) + dict.set_item("value", value.ast_to_object(vm, source_file), vm) .unwrap(); - node_add_location(&dict, _range, _vm, source_file); + node_add_location(&dict, _range, vm, source_file); node.into() } fn ast_from_object( - _vm: &VirtualMachine, + vm: &VirtualMachine, source_file: &SourceFile, _object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - value: Node::ast_from_object( - _vm, - source_file, - get_node_field(_vm, &_object, "value", "Expr")?, - )?, - range: range_from_object(_vm, source_file, _object, "Expr")?, - }) + let range = range_from_object(vm, source_file, _object.clone(), "Expr")?; + stmt_expr_from_object_with_range(vm, source_file, _object, range) } } // constructor +fn stmt_pass_from_object_with_range(range: TextRange) -> ast::StmtPass { + ast::StmtPass { + node_index: Default::default(), + range, + } +} + impl Node for ast::StmtPass { - fn ast_to_object(self, _vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { + fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { node_index: _, range: _range, } = self; let node = NodeAst - .into_ref_with_type(_vm, pyast::NodeStmtPass::static_type().to_owned()) + .into_ref_with_type(vm, pyast::NodeStmtPass::static_type().to_owned()) .unwrap(); let dict = node.as_object().dict().unwrap(); let location = super::text_range_to_source_range(source_file, _range); @@ -1250,76 +1733,84 @@ impl Node for ast::StmtPass { location.end.column.get() }; - dict.set_item("lineno", _vm.ctx.new_int(start_row).into(), _vm) + dict.set_item("lineno", vm.ctx.new_int(start_row).into(), vm) .unwrap(); - dict.set_item("col_offset", _vm.ctx.new_int(start_col).into(), _vm) + dict.set_item("col_offset", vm.ctx.new_int(start_col).into(), vm) .unwrap(); - dict.set_item("end_lineno", _vm.ctx.new_int(end_row).into(), _vm) + dict.set_item("end_lineno", vm.ctx.new_int(end_row).into(), vm) .unwrap(); - dict.set_item("end_col_offset", _vm.ctx.new_int(end_col).into(), _vm) + dict.set_item("end_col_offset", vm.ctx.new_int(end_col).into(), vm) .unwrap(); node.into() } fn ast_from_object( - _vm: &VirtualMachine, + vm: &VirtualMachine, source_file: &SourceFile, _object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - range: range_from_object(_vm, source_file, _object, "Pass")?, - }) + let range = range_from_object(vm, source_file, _object, "Pass")?; + Ok(stmt_pass_from_object_with_range(range)) } } // constructor +fn stmt_break_from_object_with_range(range: TextRange) -> ast::StmtBreak { + ast::StmtBreak { + node_index: Default::default(), + range, + } +} + impl Node for ast::StmtBreak { - fn ast_to_object(self, _vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { + fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { node_index: _, range: _range, } = self; let node = NodeAst - .into_ref_with_type(_vm, pyast::NodeStmtBreak::static_type().to_owned()) + .into_ref_with_type(vm, pyast::NodeStmtBreak::static_type().to_owned()) .unwrap(); let dict = node.as_object().dict().unwrap(); - node_add_location(&dict, _range, _vm, source_file); + node_add_location(&dict, _range, vm, source_file); node.into() } fn ast_from_object( - _vm: &VirtualMachine, + vm: &VirtualMachine, source_file: &SourceFile, _object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - range: range_from_object(_vm, source_file, _object, "Break")?, - }) + let range = range_from_object(vm, source_file, _object, "Break")?; + Ok(stmt_break_from_object_with_range(range)) } } // constructor +fn stmt_continue_from_object_with_range(range: TextRange) -> ast::StmtContinue { + ast::StmtContinue { + node_index: Default::default(), + range, + } +} + impl Node for ast::StmtContinue { - fn ast_to_object(self, _vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { + fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { node_index: _, range: _range, } = self; let node = NodeAst - .into_ref_with_type(_vm, pyast::NodeStmtContinue::static_type().to_owned()) + .into_ref_with_type(vm, pyast::NodeStmtContinue::static_type().to_owned()) .unwrap(); let dict = node.as_object().dict().unwrap(); - node_add_location(&dict, _range, _vm, source_file); + node_add_location(&dict, _range, vm, source_file); node.into() } fn ast_from_object( - _vm: &VirtualMachine, + vm: &VirtualMachine, source_file: &SourceFile, _object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - range: range_from_object(_vm, source_file, _object, "Continue")?, - }) + let range = range_from_object(vm, source_file, _object, "Continue")?; + Ok(stmt_continue_from_object_with_range(range)) } } diff --git a/crates/vm/src/stdlib/_ast/string.rs b/crates/vm/src/stdlib/_ast/string.rs index 24cae4766..7a3bb8799 100644 --- a/crates/vm/src/stdlib/_ast/string.rs +++ b/crates/vm/src/stdlib/_ast/string.rs @@ -19,6 +19,7 @@ fn ruff_fstring_element_into_iter( } fn ruff_fstring_element_to_joined_str_part( + vm: &VirtualMachine, element: ast::InterpolatedStringElement, ) -> JoinedStrPart { match element { @@ -38,12 +39,21 @@ fn ruff_fstring_element_to_joined_str_part( conversion, format_spec, node_index: _, - }) => JoinedStrPart::FormattedValue(FormattedValue { - value: expression, - conversion, - format_spec: ruff_format_spec_to_joined_str(format_spec), - range, - }), + runtime_str: _, + runtime_interpolation_format_spec: _, + runtime_formatted_value_format_spec, + }) => { + let runtime_format_spec = runtime_formatted_value_format_spec.or_else(|| { + ruff_format_spec_to_joined_str(vm, format_spec) + .map(|joined_str| Box::new(joined_str.into_expr(false))) + }); + JoinedStrPart::FormattedValue(FormattedValue { + value: expression, + conversion, + format_spec: runtime_format_spec, + range, + }) + } } } @@ -235,6 +245,7 @@ fn warn_invalid_escape_sequences_in_format_spec( } fn ruff_format_spec_to_joined_str( + vm: &VirtualMachine, format_spec: Option<Box<ast::InterpolatedStringFormatSpec>>, ) -> Option<Box<JoinedStr>> { match format_spec { @@ -254,10 +265,14 @@ fn ruff_format_spec_to_joined_str( range }; let values: Vec<_> = ruff_fstring_element_into_iter(elements) - .map(ruff_fstring_element_to_joined_str_part) + .map(|element| ruff_fstring_element_to_joined_str_part(vm, element)) .collect(); let values = normalize_joined_str_parts(values).into_boxed_slice(); - Some(Box::new(JoinedStr { range, values })) + Some(Box::new(JoinedStr { + range, + values, + runtime_values: None, + })) } } } @@ -290,40 +305,98 @@ fn ruff_fstring_element_to_ruff_fstring_part( } } -fn joined_str_to_ruff_format_spec( - joined_str: Option<Box<JoinedStr>>, +fn format_spec_expr_to_ruff_format_spec( + format_spec: Option<Box<ast::Expr>>, ) -> Option<Box<ast::InterpolatedStringFormatSpec>> { - match joined_str { - None => None, - Some(joined_str) => { - let JoinedStr { range, values } = *joined_str; - let elements: Vec<_> = Box::into_iter(values) - .map(joined_str_part_to_ruff_fstring_element) - .collect(); - let format_spec = ast::InterpolatedStringFormatSpec { - node_index: Default::default(), + let format_spec = format_spec?; + let ast::Expr::FString(mut fstring) = *format_spec else { + return None; + }; + let ast::ExprFString { + range, + ref mut value, + node_index: _, + runtime_joined_str: _, + runtime_values: _, + } = fstring; + let default_part = ast::FStringPart::FString(ast::FString { + node_index: Default::default(), + range: Default::default(), + elements: Default::default(), + flags: ast::FStringFlags::empty(), + }); + let mut elements = Vec::new(); + for i in 0..value.as_slice().len() { + let part = core::mem::replace(value.iter_mut().nth(i).unwrap(), default_part.clone()); + match part { + ast::FStringPart::Literal(ast::StringLiteral { range, - elements: elements.into(), - }; - Some(Box::new(format_spec)) + value, + node_index: _, + flags: _, + }) => elements.push(ast::InterpolatedStringElement::Literal( + ast::InterpolatedStringLiteralElement { + node_index: Default::default(), + range, + value, + }, + )), + ast::FStringPart::FString(ast::FString { + elements: fstring_elements, + .. + }) => { + elements.extend(ruff_fstring_element_into_iter(fstring_elements)); + } } } + Some(Box::new(ast::InterpolatedStringFormatSpec { + node_index: Default::default(), + range, + elements: elements.into(), + })) } #[derive(Debug)] pub(super) struct JoinedStr { pub(super) range: TextRange, pub(super) values: Box<[JoinedStrPart]>, + pub(super) runtime_values: Option<Vec<Option<ast::Expr>>>, } impl JoinedStr { - pub(super) fn into_expr(self) -> ast::Expr { - let Self { range, values } = self; + pub(super) fn into_expr(self, from_ast_object: bool) -> ast::Expr { + let Self { + range, + values, + runtime_values: mut raw_runtime_values, + } = self; + let values = if values.iter().any(joined_str_part_requires_runtime_values) { + if raw_runtime_values.is_none() { + raw_runtime_values = Some( + values + .into_vec() + .into_iter() + .map(|part| joined_str_part_to_expr(from_ast_object, part)) + .map(Some) + .collect(), + ); + } + Vec::new().into_boxed_slice() + } else { + values + }; + let (runtime_joined_str, runtime_values) = + raw_runtime_values.take().map_or((None, None), |values| { + if values.iter().any(Option::is_none) { + (None, Some(values)) + } else { + (Some(values.into_iter().flatten().collect()), None) + } + }); ast::Expr::FString(ast::ExprFString { node_index: Default::default(), - range: Default::default(), + range, value: match values.len() { - // ruff represents an empty fstring like this: 0 => ast::FStringValue::single(ast::FString { node_index: Default::default(), range, @@ -332,7 +405,8 @@ impl JoinedStr { }), 1 => ast::FStringValue::single( Box::<[_]>::into_iter(values) - .map(joined_str_part_to_ruff_fstring_element) + .map(|part| joined_str_part_to_ruff_fstring_element(from_ast_object, part)) + .map(Option::unwrap) .map(|element| ast::FString { node_index: Default::default(), range, @@ -344,54 +418,108 @@ impl JoinedStr { ), _ => ast::FStringValue::concatenated( Box::<[_]>::into_iter(values) - .map(joined_str_part_to_ruff_fstring_element) + .map(|part| joined_str_part_to_ruff_fstring_element(from_ast_object, part)) + .map(Option::unwrap) .map(ruff_fstring_element_to_ruff_fstring_part) .collect(), ), }, + runtime_joined_str, + runtime_values, }) } } -fn joined_str_part_to_ruff_fstring_element(part: JoinedStrPart) -> ast::InterpolatedStringElement { +fn joined_str_part_requires_runtime_values(part: &JoinedStrPart) -> bool { + matches!( + part, + JoinedStrPart::Constant(Constant { + value, + .. + }) if !matches!(value, ConstantLiteral::Str { .. }) + ) +} + +fn joined_str_part_to_expr(from_ast_object: bool, part: JoinedStrPart) -> ast::Expr { + match part { + JoinedStrPart::FormattedValue(value) => formatted_value_to_expr(from_ast_object, value), + JoinedStrPart::Constant(value) => value.into_expr(), + } +} + +fn joined_str_part_to_ruff_fstring_element( + from_ast_object: bool, + part: JoinedStrPart, +) -> Option<ast::InterpolatedStringElement> { match part { JoinedStrPart::FormattedValue(value) => { - ast::InterpolatedStringElement::Interpolation(ast::InterpolatedElement { - node_index: Default::default(), - range: value.range, - expression: value.value.clone(), - debug_text: None, // TODO: What is this? - conversion: value.conversion, - format_spec: joined_str_to_ruff_format_spec(value.format_spec), - }) + let format_spec = value.format_spec.clone(); + let runtime_formatted_value_format_spec = (from_ast_object && format_spec.is_some()) + .then_some(format_spec.clone()) + .flatten(); + Some(ast::InterpolatedStringElement::Interpolation( + ast::InterpolatedElement { + node_index: Default::default(), + range: value.range, + expression: value.value.clone(), + debug_text: None, + conversion: value.conversion, + format_spec: format_spec_expr_to_ruff_format_spec(format_spec), + runtime_str: None, + runtime_interpolation_format_spec: None, + runtime_formatted_value_format_spec, + }, + )) } JoinedStrPart::Constant(value) => { - ast::InterpolatedStringElement::Literal(ast::InterpolatedStringLiteralElement { - node_index: Default::default(), - range: value.range, - value: match value.value { - ConstantLiteral::Str { value, .. } => value, - _ => todo!(), + let Constant { range, value, .. } = value; + let ConstantLiteral::Str { value, .. } = value else { + return None; + }; + Some(ast::InterpolatedStringElement::Literal( + ast::InterpolatedStringLiteralElement { + node_index: Default::default(), + range, + value, }, - }) + )) } } } // constructor +pub(super) fn joined_str_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<JoinedStr> { + let values: Vec<Option<ast::Expr>> = + get_node_list_field(vm, source_file, &object, "values", "JoinedStr")?; + Ok(JoinedStr { + values: Vec::new().into_boxed_slice(), + runtime_values: Some(values), + range, + }) +} + impl Node for JoinedStr { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { - let Self { values, range } = self; + let Self { + values, + runtime_values, + range, + } = self; let node = NodeAst .into_ref_with_type(vm, pyast::NodeExprJoinedStr::static_type().to_owned()) .unwrap(); let dict = node.as_object().dict().unwrap(); - dict.set_item( - "values", - BoxedSlice(values).ast_to_object(vm, source_file), - vm, - ) - .unwrap(); + let values = if let Some(runtime_values) = runtime_values { + BoxedSlice(runtime_values.into_boxed_slice()).ast_to_object(vm, source_file) + } else { + BoxedSlice(values).ast_to_object(vm, source_file) + }; + dict.set_item("values", values, vm).unwrap(); node_add_location(&dict, range, vm, source_file); node.into() } @@ -400,15 +528,8 @@ impl Node for JoinedStr { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - let values: BoxedSlice<_> = Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "values", "JoinedStr")?, - )?; - Ok(Self { - values: values.0, - range: range_from_object(vm, source_file, object, "JoinedStr")?, - }) + let range = range_from_object(vm, source_file, object.clone(), "JoinedStr")?; + joined_str_from_object_with_range(vm, source_file, object, range) } } @@ -431,8 +552,7 @@ impl Node for JoinedStrPart { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - let cls = object.class(); - if cls.is(pyast::NodeExprFormattedValue::static_type()) { + if is_node_instance(vm, &object, pyast::NodeExprFormattedValue::static_type())? { Ok(Self::FormattedValue(Node::ast_from_object( vm, source_file, @@ -452,11 +572,31 @@ impl Node for JoinedStrPart { pub(super) struct FormattedValue { value: Box<ast::Expr>, conversion: ast::ConversionFlag, - format_spec: Option<Box<JoinedStr>>, + format_spec: Option<Box<ast::Expr>>, range: TextRange, } // constructor +pub(super) fn formatted_value_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<FormattedValue> { + Ok(FormattedValue { + value: get_required_node_field(vm, source_file, &object, "value", "FormattedValue")?, + conversion: Node::ast_from_object( + vm, + source_file, + get_node_field(vm, &object, "conversion", "FormattedValue")?, + )?, + format_spec: get_node_field_opt(vm, &object, "format_spec")? + .map(|obj| Node::ast_from_object(vm, source_file, obj)) + .transpose()?, + range, + }) +} + impl Node for FormattedValue { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { @@ -487,25 +627,24 @@ impl Node for FormattedValue { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - value: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "value", "FormattedValue")?, - )?, - conversion: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "conversion", "FormattedValue")?, - )?, - format_spec: get_node_field_opt(vm, &object, "format_spec")? - .map(|obj| Node::ast_from_object(vm, source_file, obj)) - .transpose()?, - range: range_from_object(vm, source_file, object, "FormattedValue")?, - }) + let range = range_from_object(vm, source_file, object.clone(), "FormattedValue")?; + formatted_value_from_object_with_range(vm, source_file, object, range) } } +pub(super) fn formatted_value_to_expr( + from_ast_object: bool, + formatted: FormattedValue, +) -> ast::Expr { + let range = formatted.range; + JoinedStr { + range, + values: vec![JoinedStrPart::FormattedValue(formatted)].into_boxed_slice(), + runtime_values: None, + } + .into_expr(from_ast_object) +} + pub(super) fn fstring_to_object( vm: &VirtualMachine, source_file: &SourceFile, @@ -515,7 +654,27 @@ pub(super) fn fstring_to_object( range, mut value, node_index: _, + runtime_joined_str, + runtime_values, } = expression; + if let Some(joined_str) = runtime_joined_str { + return JoinedStr { + range, + values: Vec::new().into_boxed_slice(), + runtime_values: Some(joined_str.into_iter().map(Some).collect()), + } + .ast_to_object(vm, source_file); + } + + if let Some(values) = runtime_values { + return JoinedStr { + range, + values: Vec::new().into_boxed_slice(), + runtime_values: Some(values), + } + .ast_to_object(vm, source_file); + } + let default_part = ast::FStringPart::FString(ast::FString { node_index: Default::default(), range: Default::default(), @@ -545,7 +704,7 @@ pub(super) fn fstring_to_object( node_index: _, }) => { for element in ruff_fstring_element_into_iter(elements) { - values.push(ruff_fstring_element_to_joined_str_part(element)); + values.push(ruff_fstring_element_to_joined_str_part(vm, element)); } } } @@ -555,12 +714,13 @@ pub(super) fn fstring_to_object( if let JoinedStrPart::FormattedValue(value) = part && let Some(format_spec) = &value.format_spec { - warn_invalid_escape_sequences_in_format_spec(vm, source_file, format_spec.range); + warn_invalid_escape_sequences_in_format_spec(vm, source_file, format_spec.range()); } } let c = JoinedStr { range, values: values.into_boxed_slice(), + runtime_values: None, }; c.ast_to_object(vm, source_file) } @@ -568,8 +728,9 @@ pub(super) fn fstring_to_object( // ===== TString (Template String) Support ===== fn ruff_tstring_element_to_template_str_part( - element: ast::InterpolatedStringElement, + vm: &VirtualMachine, source_file: &SourceFile, + element: ast::InterpolatedStringElement, ) -> TemplateStrPart { match element { ast::InterpolatedStringElement::Literal(ast::InterpolatedStringLiteralElement { @@ -588,6 +749,9 @@ fn ruff_tstring_element_to_template_str_part( conversion, format_spec, node_index: _, + runtime_str, + runtime_interpolation_format_spec, + runtime_formatted_value_format_spec: _, }) => { let expr_range = extend_expr_range_with_wrapping_parens(source_file, range, expression.range()) @@ -604,11 +768,23 @@ fn ruff_tstring_element_to_template_str_part( } else { tstring_interpolation_expr_str(source_file, range, expr_range) }; + let runtime_interpolation = super::constant::runtime_interpolation_object( + vm, + runtime_str, + runtime_interpolation_format_spec, + ); TemplateStrPart::Interpolation(TStringInterpolation { value: expression, - str: expr_str, + str: runtime_interpolation + .as_ref() + .map_or_else(|| vm.ctx.new_str(expr_str).into(), |(str, _)| str.clone()), conversion, - format_spec: ruff_format_spec_to_joined_str(format_spec), + format_spec: runtime_interpolation + .and_then(|(_, format_spec)| format_spec) + .or_else(|| { + ruff_format_spec_to_joined_str(vm, format_spec) + .map(|joined_str| Box::new(joined_str.into_expr(false))) + }), range, }) } @@ -695,34 +871,51 @@ fn strip_interpolation_expr(expr_source: &str) -> String { pub(super) struct TemplateStr { pub(super) range: TextRange, pub(super) values: Box<[TemplateStrPart]>, + pub(super) runtime_values: Option<Vec<Option<ast::Expr>>>, } pub(super) fn template_str_to_expr( vm: &VirtualMachine, + source_file: &SourceFile, template: TemplateStr, ) -> PyResult<ast::Expr> { - let TemplateStr { range, values } = template; - let elements = template_parts_to_elements(vm, values)?; + let TemplateStr { + range, + values, + runtime_values: raw_runtime_values, + } = template; + let elements = template_parts_to_elements(vm, source_file, values)?; let tstring = ast::TString { range, node_index: Default::default(), elements, flags: ast::TStringFlags::empty(), }; + let (runtime_template_str, runtime_values) = + raw_runtime_values.map_or((None, None), |values| { + if values.iter().any(Option::is_none) { + (None, Some(values)) + } else { + (Some(values.into_iter().flatten().collect()), None) + } + }); Ok(ast::Expr::TString(ast::ExprTString { node_index: Default::default(), range, value: ast::TStringValue::single(tstring), + runtime_template_str, + runtime_values, })) } pub(super) fn interpolation_to_expr( vm: &VirtualMachine, + source_file: &SourceFile, interpolation: TStringInterpolation, ) -> PyResult<ast::Expr> { + let range = interpolation.range; let part = TemplateStrPart::Interpolation(interpolation); - let elements = template_parts_to_elements(vm, vec![part].into_boxed_slice())?; - let range = TextRange::default(); + let elements = template_parts_to_elements(vm, source_file, vec![part].into_boxed_slice())?; let tstring = ast::TString { range, node_index: Default::default(), @@ -733,22 +926,26 @@ pub(super) fn interpolation_to_expr( node_index: Default::default(), range, value: ast::TStringValue::single(tstring), + runtime_template_str: None, + runtime_values: None, })) } fn template_parts_to_elements( vm: &VirtualMachine, + source_file: &SourceFile, values: Box<[TemplateStrPart]>, ) -> PyResult<ast::InterpolatedStringElements> { let mut elements = Vec::with_capacity(values.len()); for value in values.into_vec() { - elements.push(template_part_to_element(vm, value)?); + elements.push(template_part_to_element(vm, source_file, value)?); } Ok(ast::InterpolatedStringElements::from(elements)) } fn template_part_to_element( vm: &VirtualMachine, + source_file: &SourceFile, part: TemplateStrPart, ) -> PyResult<ast::InterpolatedStringElement> { match part { @@ -767,12 +964,18 @@ fn template_part_to_element( TemplateStrPart::Interpolation(interpolation) => { let TStringInterpolation { value, + str, conversion, format_spec, range, - .. } = interpolation; - let format_spec = joined_str_to_ruff_format_spec(format_spec); + let str_constant = + super::constant::constant_object_to_constant_data(vm, source_file, str)?; + let runtime_str = Some(super::constant::constant_data_to_ast_constant_value( + str_constant, + )); + let runtime_interpolation_format_spec = format_spec.clone(); + let format_spec = format_spec_expr_to_ruff_format_spec(format_spec); Ok(ast::InterpolatedStringElement::Interpolation( ast::InterpolatedElement { range, @@ -781,6 +984,9 @@ fn template_part_to_element( debug_text: None, conversion, format_spec, + runtime_str, + runtime_interpolation_format_spec, + runtime_formatted_value_format_spec: None, }, )) } @@ -788,19 +994,38 @@ fn template_part_to_element( } // constructor +pub(super) fn template_str_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<TemplateStr> { + let values: Vec<Option<ast::Expr>> = + get_node_list_field(vm, source_file, &object, "values", "TemplateStr")?; + Ok(TemplateStr { + values: Vec::new().into_boxed_slice(), + runtime_values: Some(values), + range, + }) +} + impl Node for TemplateStr { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { - let Self { values, range } = self; + let Self { + values, + runtime_values, + range, + } = self; let node = NodeAst .into_ref_with_type(vm, pyast::NodeExprTemplateStr::static_type().to_owned()) .unwrap(); let dict = node.as_object().dict().unwrap(); - dict.set_item( - "values", - BoxedSlice(values).ast_to_object(vm, source_file), - vm, - ) - .unwrap(); + let values = if let Some(runtime_values) = runtime_values { + BoxedSlice(runtime_values.into_boxed_slice()).ast_to_object(vm, source_file) + } else { + BoxedSlice(values).ast_to_object(vm, source_file) + }; + dict.set_item("values", values, vm).unwrap(); node_add_location(&dict, range, vm, source_file); node.into() } @@ -809,15 +1034,8 @@ impl Node for TemplateStr { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - let values: BoxedSlice<_> = Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "values", "TemplateStr")?, - )?; - Ok(Self { - values: values.0, - range: range_from_object(vm, source_file, object, "TemplateStr")?, - }) + let range = range_from_object(vm, source_file, object.clone(), "TemplateStr")?; + template_str_from_object_with_range(vm, source_file, object, range) } } @@ -840,8 +1058,7 @@ impl Node for TemplateStrPart { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - let cls = object.class(); - if cls.is(pyast::NodeExprInterpolation::static_type()) { + if is_node_instance(vm, &object, pyast::NodeExprInterpolation::static_type())? { Ok(Self::Interpolation(Node::ast_from_object( vm, source_file, @@ -860,13 +1077,38 @@ impl Node for TemplateStrPart { #[derive(Debug)] pub(super) struct TStringInterpolation { value: Box<ast::Expr>, - str: String, + str: PyObjectRef, conversion: ast::ConversionFlag, - format_spec: Option<Box<JoinedStr>>, + format_spec: Option<Box<ast::Expr>>, range: TextRange, } // constructor +pub(super) fn tstring_interpolation_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<TStringInterpolation> { + let value = get_required_node_field(vm, source_file, &object, "value", "Interpolation")?; + let str = get_node_field(vm, &object, "str", "Interpolation")?; + let conversion = Node::ast_from_object( + vm, + source_file, + get_node_field(vm, &object, "conversion", "Interpolation")?, + )?; + let format_spec: Option<Box<ast::Expr>> = get_node_field_opt(vm, &object, "format_spec")? + .map(|obj| Node::ast_from_object(vm, source_file, obj)) + .transpose()?; + Ok(TStringInterpolation { + value, + str, + conversion, + format_spec, + range, + }) +} + impl Node for TStringInterpolation { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { @@ -882,8 +1124,7 @@ impl Node for TStringInterpolation { let dict = node.as_object().dict().unwrap(); dict.set_item("value", value.ast_to_object(vm, source_file), vm) .unwrap(); - dict.set_item("str", vm.ctx.new_str(str).into(), vm) - .unwrap(); + dict.set_item("str", str, vm).unwrap(); dict.set_item("conversion", conversion.ast_to_object(vm, source_file), vm) .unwrap(); dict.set_item( @@ -900,25 +1141,8 @@ impl Node for TStringInterpolation { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - let str_obj = get_node_field(vm, &object, "str", "Interpolation")?; - let str_val: String = str_obj.try_into_value(vm)?; - Ok(Self { - value: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "value", "Interpolation")?, - )?, - str: str_val, - conversion: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "conversion", "Interpolation")?, - )?, - format_spec: get_node_field_opt(vm, &object, "format_spec")? - .map(|obj| Node::ast_from_object(vm, source_file, obj)) - .transpose()?, - range: range_from_object(vm, source_file, object, "Interpolation")?, - }) + let range = range_from_object(vm, source_file, object.clone(), "Interpolation")?; + tstring_interpolation_from_object_with_range(vm, source_file, object, range) } } @@ -931,7 +1155,42 @@ pub(super) fn tstring_to_object( range, mut value, node_index: _, + runtime_template_str, + runtime_values, } = expression; + if let Some(template_str) = runtime_template_str { + return TemplateStr { + range, + values: Vec::new().into_boxed_slice(), + runtime_values: Some(template_str.into_iter().map(Some).collect()), + } + .ast_to_object(vm, source_file); + } + + if let Some(values) = runtime_values { + return TemplateStr { + range, + values: Vec::new().into_boxed_slice(), + runtime_values: Some(values), + } + .ast_to_object(vm, source_file); + } + + if let [tstring] = value.as_slice() + && let Some(ast::InterpolatedStringElement::Interpolation(interp)) = + tstring.elements.iter().next() + && tstring.elements.get(1).is_none() + && let Some((str, format_spec)) = super::constant::runtime_interpolation_object( + vm, + interp.runtime_str.clone(), + interp.runtime_interpolation_format_spec.clone(), + ) + && let Some(interpolation) = + standalone_tstring_interpolation_to_object(vm, source_file, &value, str, format_spec) + { + return interpolation; + } + let default_tstring = ast::TString { node_index: Default::default(), range: Default::default(), @@ -943,8 +1202,9 @@ pub(super) fn tstring_to_object( let tstring = core::mem::replace(value.iter_mut().nth(i).unwrap(), default_tstring.clone()); for element in ruff_fstring_element_into_iter(tstring.elements) { values.push(ruff_tstring_element_to_template_str_part( - element, + vm, source_file, + element, )); } } @@ -952,6 +1212,37 @@ pub(super) fn tstring_to_object( let c = TemplateStr { range, values: values.into_boxed_slice(), + runtime_values: None, }; c.ast_to_object(vm, source_file) } + +fn standalone_tstring_interpolation_to_object( + vm: &VirtualMachine, + source_file: &SourceFile, + value: &ast::TStringValue, + str: PyObjectRef, + format_spec: Option<Box<ast::Expr>>, +) -> Option<PyObjectRef> { + let [tstring] = value.as_slice() else { + return None; + }; + let mut elements = tstring.elements.iter(); + let ast::InterpolatedStringElement::Interpolation(interp) = elements.next()? else { + return None; + }; + if elements.next().is_some() { + return None; + } + let interpolation = TStringInterpolation { + value: interp.expression.clone(), + str, + conversion: interp.conversion, + format_spec: format_spec.or_else(|| { + ruff_format_spec_to_joined_str(vm, interp.format_spec.clone()) + .map(|joined_str| Box::new(joined_str.into_expr(false))) + }), + range: interp.range, + }; + Some(interpolation.ast_to_object(vm, source_file)) +} diff --git a/crates/vm/src/stdlib/_ast/type_ignore.rs b/crates/vm/src/stdlib/_ast/type_ignore.rs index 6e90ba9b8..d51e54f1c 100644 --- a/crates/vm/src/stdlib/_ast/type_ignore.rs +++ b/crates/vm/src/stdlib/_ast/type_ignore.rs @@ -2,6 +2,7 @@ use super::*; use rustpython_compiler_core::SourceFile; pub(super) enum TypeIgnore { + None, TypeIgnore(TypeIgnoreTypeIgnore), } @@ -9,6 +10,7 @@ pub(super) enum TypeIgnore { impl Node for TypeIgnore { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { match self { + Self::None => vm.ctx.none(), Self::TypeIgnore(cons) => cons.ast_to_object(vm, source_file), } } @@ -17,8 +19,9 @@ impl Node for TypeIgnore { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - let cls = object.class(); - Ok(if cls.is(pyast::NodeTypeIgnoreTypeIgnore::static_type()) { + Ok(if vm.is_none(&object) { + Self::None + } else if is_node_instance(vm, &object, pyast::NodeTypeIgnoreTypeIgnore::static_type())? { Self::TypeIgnore(TypeIgnoreTypeIgnore::ast_from_object( vm, source_file, @@ -34,15 +37,14 @@ impl Node for TypeIgnore { } pub(super) struct TypeIgnoreTypeIgnore { - range: TextRange, - lineno: PyRefExact<PyInt>, - tag: PyRefExact<PyStr>, + lineno: i32, + tag: PyObjectRef, } // constructor impl Node for TypeIgnoreTypeIgnore { - fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { - let Self { lineno, tag, range } = self; + fn ast_to_object(self, vm: &VirtualMachine, _source_file: &SourceFile) -> PyObjectRef { + let Self { lineno, tag } = self; let node = NodeAst .into_ref_with_type( vm, @@ -50,25 +52,20 @@ impl Node for TypeIgnoreTypeIgnore { ) .unwrap(); let dict = node.as_object().dict().unwrap(); - dict.set_item("lineno", lineno.to_pyobject(vm), vm).unwrap(); - dict.set_item("tag", tag.to_pyobject(vm), vm).unwrap(); - node_add_location(&dict, range, vm, source_file); + dict.set_item("lineno", vm.ctx.new_int(lineno).into(), vm) + .unwrap(); + dict.set_item("tag", tag, vm).unwrap(); node.into() } fn ast_from_object( vm: &VirtualMachine, - source_file: &SourceFile, + _source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { Ok(Self { - lineno: get_node_field(vm, &object, "lineno", "TypeIgnore")? - .downcast_exact(vm) - .unwrap(), - tag: get_node_field(vm, &object, "tag", "TypeIgnore")? - .downcast_exact(vm) - .unwrap(), - range: range_from_object(vm, source_file, object, "TypeIgnore")?, + lineno: get_int_field(vm, &object, "lineno", "TypeIgnore")?, + tag: node_object_to_ast_string(vm, get_node_field(vm, &object, "tag", "TypeIgnore")?)?, }) } } diff --git a/crates/vm/src/stdlib/_ast/type_parameters.rs b/crates/vm/src/stdlib/_ast/type_parameters.rs index 0424ffbd7..8f2296ea7 100644 --- a/crates/vm/src/stdlib/_ast/type_parameters.rs +++ b/crates/vm/src/stdlib/_ast/type_parameters.rs @@ -3,7 +3,10 @@ use rustpython_compiler_core::SourceFile; impl Node for ast::TypeParams { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { - self.type_params.ast_to_object(vm, source_file) + self.runtime_type_params.map_or_else( + || self.type_params.ast_to_object(vm, source_file), + |values| values.ast_to_object(vm, source_file), + ) } fn ast_from_object( @@ -11,22 +14,51 @@ impl Node for ast::TypeParams { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - let type_params: Vec<ast::TypeParam> = Node::ast_from_object(vm, source_file, object)?; - let range = Option::zip(type_params.first(), type_params.last()) - .map(|(first, last)| first.range().cover(last.range())) - .unwrap_or_default(); - Ok(Self { - node_index: Default::default(), - type_params, - range, - }) + Ok(type_params_from_values( + vm, + Node::ast_from_object(vm, source_file, object)?, + )) } fn is_none(&self) -> bool { - self.type_params.is_empty() + self.type_params.is_empty() && self.runtime_type_params.is_none() } } +pub(super) fn type_params_from_field( + vm: &VirtualMachine, + source_file: &SourceFile, + object: &PyObject, + field: &'static str, + typ: &str, +) -> PyResult<Option<Box<ast::TypeParams>>> { + let type_params: Vec<Option<ast::TypeParam>> = + get_node_list_field(vm, source_file, object, field, typ)?; + let type_params = type_params_from_values(vm, type_params); + Ok((!type_params.is_none()).then_some(Box::new(type_params))) +} + +fn type_params_from_values( + _vm: &VirtualMachine, + values: Vec<Option<ast::TypeParam>>, +) -> ast::TypeParams { + let runtime_type_params = values.iter().any(Option::is_none).then(|| values.clone()); + let type_params = lower_nullable_type_params(&values); + let range = Option::zip(type_params.first(), type_params.last()) + .map(|(first, last)| first.range().cover(last.range())) + .unwrap_or_default(); + ast::TypeParams { + node_index: Default::default(), + type_params, + range, + runtime_type_params, + } +} + +fn lower_nullable_type_params(values: &[Option<ast::TypeParam>]) -> Vec<ast::TypeParam> { + values.iter().filter_map(Clone::clone).collect() +} + // sum impl Node for ast::TypeParam { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { @@ -42,35 +74,70 @@ impl Node for ast::TypeParam { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - let cls = object.class(); - Ok(if cls.is(pyast::NodeTypeParamTypeVar::static_type()) { - Self::TypeVar(ast::TypeParamTypeVar::ast_from_object( - vm, - source_file, - object, - )?) - } else if cls.is(pyast::NodeTypeParamParamSpec::static_type()) { - Self::ParamSpec(ast::TypeParamParamSpec::ast_from_object( - vm, - source_file, - object, - )?) - } else if cls.is(pyast::NodeTypeParamTypeVarTuple::static_type()) { - Self::TypeVarTuple(ast::TypeParamTypeVarTuple::ast_from_object( - vm, - source_file, - object, - )?) + if vm.is_none(&object) { + return Err(vm.new_type_error(format!( + "expected some sort of type_param, but got {}", + object.repr(vm)? + ))); + } + enum TypeParamKind { + TypeVar, + ParamSpec, + TypeVarTuple, + } + let kind = if is_node_instance(vm, &object, pyast::NodeTypeParamTypeVar::static_type())? { + TypeParamKind::TypeVar + } else if is_node_instance(vm, &object, pyast::NodeTypeParamParamSpec::static_type())? { + TypeParamKind::ParamSpec + } else if is_node_instance(vm, &object, pyast::NodeTypeParamTypeVarTuple::static_type())? { + TypeParamKind::TypeVarTuple } else { return Err(vm.new_type_error(format!( "expected some sort of type_param, but got {}", object.repr(vm)? ))); + }; + let range = type_param_range_from_object(vm, source_file, object.clone())?; + Ok(match kind { + TypeParamKind::TypeVar => Self::TypeVar(type_var_from_object_with_range( + vm, + source_file, + object, + range, + )?), + TypeParamKind::ParamSpec => Self::ParamSpec(param_spec_from_object_with_range( + vm, + source_file, + object, + range, + )?), + TypeParamKind::TypeVarTuple => Self::TypeVarTuple( + type_var_tuple_from_object_with_range(vm, source_file, object, range)?, + ), }) } } // constructor +fn type_var_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::TypeParamTypeVar> { + Ok(ast::TypeParamTypeVar { + node_index: Default::default(), + name: get_required_identifier_field(vm, source_file, &object, "name", "TypeVar")?, + bound: get_node_field_opt(vm, &object, "bound")? + .map(|obj| Node::ast_from_object(vm, source_file, obj)) + .transpose()?, + default: get_node_field_opt(vm, &object, "default_value")? + .map(|obj| Node::ast_from_object(vm, source_file, obj)) + .transpose()?, + range, + }) +} + impl Node for ast::TypeParamTypeVar { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { @@ -99,27 +166,28 @@ impl Node for ast::TypeParamTypeVar { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - name: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "name", "TypeVar")?, - )?, - bound: get_node_field_opt(vm, &object, "bound")? - .map(|obj| Node::ast_from_object(vm, source_file, obj)) - .transpose()?, - default: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "default_value", "TypeVar")?, - )?, - range: range_from_object(vm, source_file, object, "TypeVar")?, - }) + let range = type_param_range_from_object(vm, source_file, object.clone())?; + type_var_from_object_with_range(vm, source_file, object, range) } } // constructor +fn param_spec_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::TypeParamParamSpec> { + Ok(ast::TypeParamParamSpec { + node_index: Default::default(), + name: get_required_identifier_field(vm, source_file, &object, "name", "ParamSpec")?, + default: get_node_field_opt(vm, &object, "default_value")? + .map(|obj| Node::ast_from_object(vm, source_file, obj)) + .transpose()?, + range, + }) +} + impl Node for ast::TypeParamParamSpec { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { @@ -145,24 +213,28 @@ impl Node for ast::TypeParamParamSpec { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - name: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "name", "ParamSpec")?, - )?, - default: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "default_value", "ParamSpec")?, - )?, - range: range_from_object(vm, source_file, object, "ParamSpec")?, - }) + let range = type_param_range_from_object(vm, source_file, object.clone())?; + param_spec_from_object_with_range(vm, source_file, object, range) } } // constructor +fn type_var_tuple_from_object_with_range( + vm: &VirtualMachine, + source_file: &SourceFile, + object: PyObjectRef, + range: TextRange, +) -> PyResult<ast::TypeParamTypeVarTuple> { + Ok(ast::TypeParamTypeVarTuple { + node_index: Default::default(), + name: get_required_identifier_field(vm, source_file, &object, "name", "TypeVarTuple")?, + default: get_node_field_opt(vm, &object, "default_value")? + .map(|obj| Node::ast_from_object(vm, source_file, obj)) + .transpose()?, + range, + }) +} + impl Node for ast::TypeParamTypeVarTuple { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { let Self { @@ -191,19 +263,7 @@ impl Node for ast::TypeParamTypeVarTuple { source_file: &SourceFile, object: PyObjectRef, ) -> PyResult<Self> { - Ok(Self { - node_index: Default::default(), - name: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "name", "TypeVarTuple")?, - )?, - default: Node::ast_from_object( - vm, - source_file, - get_node_field(vm, &object, "default_value", "TypeVarTuple")?, - )?, - range: range_from_object(vm, source_file, object, "TypeVarTuple")?, - }) + let range = type_param_range_from_object(vm, source_file, object.clone())?; + type_var_tuple_from_object_with_range(vm, source_file, object, range) } } diff --git a/crates/vm/src/stdlib/_ast/validate.rs b/crates/vm/src/stdlib/_ast/validate.rs index cad37d386..081197d6b 100644 --- a/crates/vm/src/stdlib/_ast/validate.rs +++ b/crates/vm/src/stdlib/_ast/validate.rs @@ -1,8 +1,10 @@ // spell-checker: ignore assignlist ifexp use super::module::Mod; -use crate::{PyResult, VirtualMachine}; +use crate::{PyResult, VirtualMachine, compiler::CompileError}; use ruff_python_ast as ast; +use rustpython_codegen::error::{CodegenError, CodegenErrorType}; +use rustpython_compiler_core::bytecode::ConstantData; fn expr_context_name(ctx: ast::ExprContext) -> &'static str { match ctx { @@ -13,6 +15,17 @@ fn expr_context_name(ctx: ast::ExprContext) -> &'static str { } } +fn invalid_syntax_error(vm: &VirtualMachine) -> crate::builtins::PyBaseExceptionRef { + vm.new_syntax_error( + &CompileError::Codegen(CodegenError { + location: None, + error: CodegenErrorType::SyntaxError("invalid syntax".to_owned()), + source_path: "<unknown>".to_owned(), + }), + None, + ) +} + fn validate_name(vm: &VirtualMachine, name: &ast::name::Name) -> PyResult<()> { match name.as_str() { "None" | "True" | "False" => Err(vm.new_value_error(format!( @@ -30,6 +43,7 @@ fn validate_comprehension(vm: &VirtualMachine, gens: &[ast::Comprehension]) -> P for comp in gens { validate_expr(vm, &comp.target, ast::ExprContext::Store)?; validate_expr(vm, &comp.iter, ast::ExprContext::Load)?; + validate_runtime_expr_list_slots(vm, comp.runtime_ifs.as_ref(), ast::ExprContext::Load)?; validate_exprs(vm, &comp.ifs, ast::ExprContext::Load, false)?; } Ok(()) @@ -42,30 +56,49 @@ fn validate_keywords(vm: &VirtualMachine, keywords: &[ast::Keyword]) -> PyResult Ok(()) } +fn validate_parameter_annotation(vm: &VirtualMachine, parameter: &ast::Parameter) -> PyResult<()> { + if let Some(annotation) = &parameter.annotation { + validate_expr(vm, annotation, ast::ExprContext::Load)?; + } + Ok(()) +} + fn validate_parameters(vm: &VirtualMachine, params: &ast::Parameters) -> PyResult<()> { - for param in params - .posonlyargs - .iter() - .chain(&params.args) - .chain(&params.kwonlyargs) - { - if let Some(annotation) = &param.parameter.annotation { - validate_expr(vm, annotation, ast::ExprContext::Load)?; - } - if let Some(default) = &param.default { - validate_expr(vm, default, ast::ExprContext::Load)?; - } + for param in params.posonlyargs.iter().chain(&params.args) { + validate_parameter_annotation(vm, &param.parameter)?; } if let Some(vararg) = &params.vararg && let Some(annotation) = &vararg.annotation { validate_expr(vm, annotation, ast::ExprContext::Load)?; } + for param in &params.kwonlyargs { + validate_parameter_annotation(vm, &param.parameter)?; + } if let Some(kwarg) = &params.kwarg && let Some(annotation) = &kwarg.annotation { validate_expr(vm, annotation, ast::ExprContext::Load)?; } + if let Some(defaults) = params.runtime_defaults.as_ref() { + for default in defaults { + let Some(default) = default else { + return Err(vm.new_value_error("None disallowed in expression list")); + }; + validate_expr(vm, default, ast::ExprContext::Load)?; + } + } else { + for param in params.posonlyargs.iter().chain(&params.args) { + if let Some(default) = &param.default { + validate_expr(vm, default, ast::ExprContext::Load)?; + } + } + } + for param in &params.kwonlyargs { + if let Some(default) = &param.default { + validate_expr(vm, default, ast::ExprContext::Load)?; + } + } Ok(()) } @@ -99,8 +132,14 @@ fn validate_assignlist( validate_exprs(vm, targets, ctx, false) } -fn validate_body(vm: &VirtualMachine, body: &[ast::Stmt], owner: &'static str) -> PyResult<()> { +fn validate_body( + vm: &VirtualMachine, + body: &[ast::Stmt], + metadata: Option<&Vec<Option<ast::Stmt>>>, + owner: &'static str, +) -> PyResult<()> { validate_nonempty_seq(vm, body.len(), "body", owner)?; + validate_runtime_stmt_list_slots(vm, metadata)?; validate_stmts(vm, body) } @@ -111,34 +150,83 @@ fn validate_interpolated_elements<'a>( for element in elements { if let ast::InterpolatedStringElementRef::Interpolation(interpolation) = element { validate_expr(vm, &interpolation.expression, ast::ExprContext::Load)?; - if let Some(format_spec) = &interpolation.format_spec { - for spec_element in &format_spec.elements { - if let ast::InterpolatedStringElement::Interpolation(spec_interp) = spec_element - { - validate_expr(vm, &spec_interp.expression, ast::ExprContext::Load)?; - } - } + if let Some(format_spec) = interpolation.runtime_formatted_value_format_spec.as_deref() + { + validate_expr(vm, format_spec, ast::ExprContext::Load)?; + } else if let Some(format_spec) = + interpolation.runtime_interpolation_format_spec.as_deref() + { + validate_expr(vm, format_spec, ast::ExprContext::Load)?; + } else if let Some(format_spec) = &interpolation.format_spec { + validate_interpolated_elements( + vm, + format_spec + .elements + .iter() + .map(ast::InterpolatedStringElementRef::from), + )?; } } } Ok(()) } +fn ensure_literal_number(expr: &ast::Expr, allow_real: bool, allow_imaginary: bool) -> bool { + let ast::Expr::NumberLiteral(number) = expr else { + return false; + }; + match number.value { + ast::Number::Int(_) | ast::Number::Float(_) => allow_real, + ast::Number::Complex { .. } => allow_imaginary, + } +} + +fn ensure_literal_negative(expr: &ast::Expr, allow_real: bool, allow_imaginary: bool) -> bool { + let ast::Expr::UnaryOp(unary) = expr else { + return false; + }; + if unary.op != ast::UnaryOp::USub { + return false; + } + ensure_literal_number(&unary.operand, allow_real, allow_imaginary) +} + +fn ensure_literal_complex(expr: &ast::Expr) -> bool { + let ast::Expr::BinOp(bin) = expr else { + return false; + }; + if !matches!(bin.op, ast::Operator::Add | ast::Operator::Sub) { + return false; + } + let real_left = ensure_literal_number(&bin.left, true, false) + || ensure_literal_negative(&bin.left, true, false); + real_left && ensure_literal_number(&bin.right, false, true) +} + +fn ast_constant_value(expr: &ast::Expr) -> Option<ConstantData> { + expr.as_constant_expr() + .map(|expr| super::constant::ast_constant_value_to_constant_data(expr.value.clone())) +} + fn validate_pattern_match_value(vm: &VirtualMachine, expr: &ast::Expr) -> PyResult<()> { validate_expr(vm, expr, ast::ExprContext::Load)?; + if let Some(constant) = ast_constant_value(expr) { + return match &constant { + ConstantData::Integer { .. } + | ConstantData::Float { .. } + | ConstantData::Bytes { .. } + | ConstantData::Complex { .. } + | ConstantData::Str { .. } => Ok(()), + _ => Err(vm.new_value_error("unexpected constant inside of a literal pattern")), + }; + } match expr { ast::Expr::NumberLiteral(_) | ast::Expr::StringLiteral(_) | ast::Expr::BytesLiteral(_) => { Ok(()) } ast::Expr::Attribute(_) => Ok(()), - ast::Expr::UnaryOp(op) => match &*op.operand { - ast::Expr::NumberLiteral(_) => Ok(()), - _ => Err(vm.new_value_error("patterns may only match literals and attribute lookups")), - }, - ast::Expr::BinOp(bin) => match (&*bin.left, &*bin.right) { - (ast::Expr::NumberLiteral(_), ast::Expr::NumberLiteral(_)) => Ok(()), - _ => Err(vm.new_value_error("patterns may only match literals and attribute lookups")), - }, + ast::Expr::UnaryOp(_) if ensure_literal_negative(expr, true, true) => Ok(()), + ast::Expr::BinOp(_) if ensure_literal_complex(expr) => Ok(()), ast::Expr::FString(_) | ast::Expr::TString(_) => Ok(()), ast::Expr::BooleanLiteral(_) | ast::Expr::NoneLiteral(_) @@ -162,7 +250,10 @@ fn validate_pattern(vm: &VirtualMachine, pattern: &ast::Pattern, star_ok: bool) ast::Pattern::MatchSingleton(singleton) => match singleton.value { ast::Singleton::None | ast::Singleton::True | ast::Singleton::False => Ok(()), }, - ast::Pattern::MatchSequence(seq) => validate_patterns(vm, &seq.patterns, true), + ast::Pattern::MatchSequence(seq) => { + validate_runtime_pattern_list_slots(vm, seq.runtime_patterns.as_ref())?; + validate_patterns(vm, &seq.patterns, true) + } ast::Pattern::MatchMapping(mapping) => { if mapping.keys.len() != mapping.patterns.len() { return Err(vm.new_value_error( @@ -172,15 +263,34 @@ fn validate_pattern(vm: &VirtualMachine, pattern: &ast::Pattern, star_ok: bool) if let Some(rest) = &mapping.rest { validate_capture(vm, rest)?; } + validate_runtime_expr_option_list_slots(vm, mapping.runtime_keys.as_ref())?; for key in &mapping.keys { - if let ast::Expr::BooleanLiteral(_) | ast::Expr::NoneLiteral(_) = key { + if matches!( + key, + ast::Expr::BooleanLiteral(_) + | ast::Expr::NoneLiteral(_) + | ast::Expr::Constant(ast::ExprConstant { + value: ast::ConstantValue::Boolean(_) | ast::ConstantValue::None, + .. + }) + ) { continue; } validate_pattern_match_value(vm, key)?; } + validate_runtime_pattern_list_slots(vm, mapping.runtime_patterns.as_ref())?; validate_patterns(vm, &mapping.patterns, false) } ast::Pattern::MatchClass(match_class) => { + if let (Some(kwd_attrs), Some(kwd_patterns)) = ( + match_class.runtime_kwd_attrs.as_ref(), + match_class.runtime_kwd_patterns.as_ref(), + ) && kwd_attrs.len() != kwd_patterns.len() + { + return Err(vm.new_value_error( + "MatchClass doesn't have the same number of keyword attributes as patterns", + )); + } validate_expr(vm, &match_class.cls, ast::ExprContext::Load)?; let mut cls = match_class.cls.as_ref(); loop { @@ -199,7 +309,13 @@ fn validate_pattern(vm: &VirtualMachine, pattern: &ast::Pattern, star_ok: bool) for keyword in &match_class.arguments.keywords { validate_name(vm, keyword.attr.id())?; } + if let Some(patterns) = &match_class.runtime_patterns { + validate_runtime_nullable_patterns(vm, patterns)?; + } validate_patterns(vm, &match_class.arguments.patterns, false)?; + if let Some(kwd_patterns) = &match_class.runtime_kwd_patterns { + validate_runtime_nullable_patterns(vm, kwd_patterns)?; + } for keyword in &match_class.arguments.keywords { validate_pattern(vm, &keyword.pattern, false)?; } @@ -234,11 +350,80 @@ fn validate_pattern(vm: &VirtualMachine, pattern: &ast::Pattern, star_ok: bool) if match_or.patterns.len() < 2 { return Err(vm.new_value_error("MatchOr requires at least 2 patterns")); } + validate_runtime_pattern_list_slots(vm, match_or.runtime_patterns.as_ref())?; validate_patterns(vm, &match_or.patterns, false) } } } +fn validate_runtime_pattern_list_slots( + vm: &VirtualMachine, + values: Option<&Vec<Option<ast::Pattern>>>, +) -> PyResult<()> { + if values.is_some_and(|values| values.iter().any(Option::is_none)) { + return Err(vm.new_value_error("unexpected pattern")); + } + Ok(()) +} + +fn validate_runtime_expr_option_list_slots( + vm: &VirtualMachine, + values: Option<&Vec<Option<ast::Expr>>>, +) -> PyResult<()> { + if values.is_some_and(|values| values.iter().any(Option::is_none)) { + return Err(vm.new_value_error("None disallowed in expression list")); + } + Ok(()) +} + +fn validate_runtime_expr_list_slots( + vm: &VirtualMachine, + values: Option<&Vec<Option<ast::Expr>>>, + ctx: ast::ExprContext, +) -> PyResult<()> { + if let Some(values) = values { + for value in values { + let Some(value) = value else { + return Err(vm.new_value_error("None disallowed in expression list")); + }; + validate_expr(vm, value, ctx)?; + } + } + Ok(()) +} + +fn validate_runtime_stmt_list_slots( + vm: &VirtualMachine, + values: Option<&Vec<Option<ast::Stmt>>>, +) -> PyResult<()> { + if let Some(values) = values + && values.iter().any(Option::is_none) + { + return Err(vm.new_value_error("None disallowed in statement list")); + } + Ok(()) +} + +fn validate_runtime_except_handler_list_slots( + vm: &VirtualMachine, + values: Option<&Vec<Option<ast::ExceptHandler>>>, +) -> PyResult<()> { + if values.is_some_and(|values| values.iter().any(Option::is_none)) { + return Err(vm.new_value_error("unexpected excepthandler")); + } + Ok(()) +} + +fn validate_runtime_nullable_patterns( + vm: &VirtualMachine, + patterns: &[Option<ast::Pattern>], +) -> PyResult<()> { + if patterns.iter().any(Option::is_none) { + return Err(vm.new_value_error("unexpected pattern")); + } + Ok(()) +} + fn validate_patterns( vm: &VirtualMachine, patterns: &[ast::Pattern], @@ -282,6 +467,12 @@ fn validate_type_params( type_params: Option<&ast::TypeParams>, ) -> PyResult<()> { if let Some(type_params) = type_params { + if let Some(values) = type_params.runtime_type_params.as_ref() { + for tp in values.iter().flatten() { + validate_typeparam(vm, tp)?; + } + return Ok(()); + } for tp in &type_params.type_params { validate_typeparam(vm, tp)?; } @@ -337,6 +528,11 @@ fn validate_expr(vm: &VirtualMachine, expr: &ast::Expr, ctx: ast::ExprContext) - if op.values.len() < 2 { return Err(vm.new_value_error("BoolOp with less than 2 values")); } + validate_runtime_expr_list_slots( + vm, + op.runtime_values.as_ref(), + ast::ExprContext::Load, + )?; validate_exprs(vm, &op.values, ast::ExprContext::Load, false) } ast::Expr::Named(named) => { @@ -362,6 +558,11 @@ fn validate_expr(vm: &VirtualMachine, expr: &ast::Expr, ctx: ast::ExprContext) - validate_expr(vm, &ifexp.orelse, ast::ExprContext::Load) } ast::Expr::Dict(dict) => { + validate_runtime_expr_list_slots( + vm, + dict.runtime_values.as_ref(), + ast::ExprContext::Load, + )?; for item in &dict.items { if let Some(key) = &item.key { validate_expr(vm, key, ast::ExprContext::Load)?; @@ -370,7 +571,14 @@ fn validate_expr(vm: &VirtualMachine, expr: &ast::Expr, ctx: ast::ExprContext) - } Ok(()) } - ast::Expr::Set(set) => validate_exprs(vm, &set.elts, ast::ExprContext::Load, false), + ast::Expr::Set(set) => { + validate_runtime_expr_list_slots( + vm, + set.runtime_elts.as_ref(), + ast::ExprContext::Load, + )?; + validate_exprs(vm, &set.elts, ast::ExprContext::Load, false) + } ast::Expr::ListComp(list) => { validate_comprehension(vm, &list.generators)?; validate_expr(vm, &list.elt, ast::ExprContext::Load) @@ -409,34 +617,73 @@ fn validate_expr(vm: &VirtualMachine, expr: &ast::Expr, ctx: ast::ExprContext) - "Compare has a different number of comparators and operands", )); } + validate_runtime_expr_list_slots( + vm, + compare.runtime_comparators.as_ref(), + ast::ExprContext::Load, + )?; validate_exprs(vm, &compare.comparators, ast::ExprContext::Load, false)?; validate_expr(vm, &compare.left, ast::ExprContext::Load) } ast::Expr::Call(call) => { validate_expr(vm, &call.func, ast::ExprContext::Load)?; + validate_runtime_expr_list_slots( + vm, + call.arguments.runtime_args.as_ref(), + ast::ExprContext::Load, + )?; validate_exprs(vm, &call.arguments.args, ast::ExprContext::Load, false)?; validate_keywords(vm, &call.arguments.keywords) } - ast::Expr::FString(fstring) => validate_interpolated_elements( - vm, - fstring - .value - .elements() - .map(ast::InterpolatedStringElementRef::from), - ), - ast::Expr::TString(tstring) => validate_interpolated_elements( - vm, - tstring - .value - .elements() - .map(ast::InterpolatedStringElementRef::from), - ), + ast::Expr::FString(fstring) => { + validate_runtime_expr_list_slots( + vm, + fstring.runtime_values.as_ref(), + ast::ExprContext::Load, + )?; + if let Some(joined_str) = fstring.runtime_joined_str.as_ref() { + validate_exprs(vm, joined_str, ast::ExprContext::Load, false) + } else { + validate_interpolated_elements( + vm, + fstring + .value + .elements() + .map(ast::InterpolatedStringElementRef::from), + ) + } + } + ast::Expr::TString(tstring) => { + validate_runtime_expr_list_slots( + vm, + tstring.runtime_values.as_ref(), + ast::ExprContext::Load, + )?; + if let Some(template_str) = tstring.runtime_template_str.as_ref() { + validate_exprs(vm, template_str, ast::ExprContext::Load, false) + } else { + validate_interpolated_elements( + vm, + tstring + .value + .elements() + .map(ast::InterpolatedStringElementRef::from), + ) + } + } ast::Expr::StringLiteral(_) | ast::Expr::BytesLiteral(_) | ast::Expr::NumberLiteral(_) + | ast::Expr::Constant(_) | ast::Expr::BooleanLiteral(_) | ast::Expr::NoneLiteral(_) - | ast::Expr::EllipsisLiteral(_) => Ok(()), + | ast::Expr::EllipsisLiteral(_) => { + if let Some(invalid_type) = super::constant::invalid_constant_type(expr) { + Err(vm.new_type_error(format!("got an invalid type in Constant: {invalid_type}"))) + } else { + Ok(()) + } + } ast::Expr::Attribute(attr) => validate_expr(vm, &attr.value, ast::ExprContext::Load), ast::Expr::Subscript(sub) => { validate_expr(vm, &sub.slice, ast::ExprContext::Load)?; @@ -444,8 +691,14 @@ fn validate_expr(vm: &VirtualMachine, expr: &ast::Expr, ctx: ast::ExprContext) - } ast::Expr::Starred(star) => validate_expr(vm, &star.value, ctx), ast::Expr::Name(_) => Ok(()), - ast::Expr::List(list) => validate_exprs(vm, &list.elts, ctx, false), - ast::Expr::Tuple(tuple) => validate_exprs(vm, &tuple.elts, ctx, false), + ast::Expr::List(list) => { + validate_runtime_expr_list_slots(vm, list.runtime_elts.as_ref(), ctx)?; + validate_exprs(vm, &list.elts, ctx, false) + } + ast::Expr::Tuple(tuple) => { + validate_runtime_expr_list_slots(vm, tuple.runtime_elts.as_ref(), ctx)?; + validate_exprs(vm, &tuple.elts, ctx, false) + } ast::Expr::Slice(slice) => { if let Some(lower) = &slice.lower { validate_expr(vm, lower, ast::ExprContext::Load)?; @@ -458,7 +711,7 @@ fn validate_expr(vm: &VirtualMachine, expr: &ast::Expr, ctx: ast::ExprContext) - } Ok(()) } - ast::Expr::IpyEscapeCommand(_) => Ok(()), + ast::Expr::IpyEscapeCommand(_) => Err(invalid_syntax_error(vm)), } } @@ -477,9 +730,14 @@ fn validate_stmt(vm: &VirtualMachine, stmt: &ast::Stmt) -> PyResult<()> { } else { "FunctionDef" }; - validate_body(vm, &func.body, owner)?; + validate_body(vm, &func.body, func.runtime_body.as_ref(), owner)?; validate_type_params(vm, func.type_params.as_deref())?; validate_parameters(vm, &func.parameters)?; + validate_runtime_expr_list_slots( + vm, + func.runtime_decorator_list.as_ref(), + ast::ExprContext::Load, + )?; validate_decorators(vm, &func.decorator_list)?; if let Some(returns) = &func.returns { validate_expr(vm, returns, ast::ExprContext::Load)?; @@ -487,12 +745,27 @@ fn validate_stmt(vm: &VirtualMachine, stmt: &ast::Stmt) -> PyResult<()> { Ok(()) } ast::Stmt::ClassDef(class_def) => { - validate_body(vm, &class_def.body, "ClassDef")?; + validate_body( + vm, + &class_def.body, + class_def.runtime_body.as_ref(), + "ClassDef", + )?; validate_type_params(vm, class_def.type_params.as_deref())?; if let Some(arguments) = &class_def.arguments { + validate_runtime_expr_list_slots( + vm, + arguments.runtime_bases.as_ref(), + ast::ExprContext::Load, + )?; validate_exprs(vm, &arguments.args, ast::ExprContext::Load, false)?; validate_keywords(vm, &arguments.keywords)?; } + validate_runtime_expr_list_slots( + vm, + class_def.runtime_decorator_list.as_ref(), + ast::ExprContext::Load, + )?; validate_decorators(vm, &class_def.decorator_list) } ast::Stmt::Return(ret) => { @@ -501,8 +774,20 @@ fn validate_stmt(vm: &VirtualMachine, stmt: &ast::Stmt) -> PyResult<()> { } Ok(()) } - ast::Stmt::Delete(del) => validate_assignlist(vm, &del.targets, ast::ExprContext::Del), + ast::Stmt::Delete(del) => { + validate_runtime_expr_list_slots( + vm, + del.runtime_targets.as_ref(), + ast::ExprContext::Del, + )?; + validate_assignlist(vm, &del.targets, ast::ExprContext::Del) + } ast::Stmt::Assign(assign) => { + validate_runtime_expr_list_slots( + vm, + assign.runtime_targets.as_ref(), + ast::ExprContext::Store, + )?; validate_assignlist(vm, &assign.targets, ast::ExprContext::Store)?; validate_expr(vm, &assign.value, ast::ExprContext::Load) } @@ -532,22 +817,30 @@ fn validate_stmt(vm: &VirtualMachine, stmt: &ast::Stmt) -> PyResult<()> { let owner = if for_stmt.is_async { "AsyncFor" } else { "For" }; validate_expr(vm, &for_stmt.target, ast::ExprContext::Store)?; validate_expr(vm, &for_stmt.iter, ast::ExprContext::Load)?; - validate_body(vm, &for_stmt.body, owner)?; + validate_body(vm, &for_stmt.body, for_stmt.runtime_body.as_ref(), owner)?; + validate_runtime_stmt_list_slots(vm, for_stmt.runtime_orelse.as_ref())?; validate_stmts(vm, &for_stmt.orelse) } ast::Stmt::While(while_stmt) => { validate_expr(vm, &while_stmt.test, ast::ExprContext::Load)?; - validate_body(vm, &while_stmt.body, "While")?; + validate_body( + vm, + &while_stmt.body, + while_stmt.runtime_body.as_ref(), + "While", + )?; + validate_runtime_stmt_list_slots(vm, while_stmt.runtime_orelse.as_ref())?; validate_stmts(vm, &while_stmt.orelse) } ast::Stmt::If(if_stmt) => { validate_expr(vm, &if_stmt.test, ast::ExprContext::Load)?; - validate_body(vm, &if_stmt.body, "If")?; + validate_body(vm, &if_stmt.body, if_stmt.runtime_body.as_ref(), "If")?; for clause in &if_stmt.elif_else_clauses { if let Some(test) = &clause.test { validate_expr(vm, test, ast::ExprContext::Load)?; } - validate_body(vm, &clause.body, "If")?; + validate_body(vm, &clause.body, clause.runtime_body.as_ref(), "If")?; + validate_runtime_stmt_list_slots(vm, clause.runtime_orelse.as_ref())?; } Ok(()) } @@ -564,7 +857,7 @@ fn validate_stmt(vm: &VirtualMachine, stmt: &ast::Stmt) -> PyResult<()> { validate_expr(vm, optional_vars, ast::ExprContext::Store)?; } } - validate_body(vm, &with_stmt.body, owner) + validate_body(vm, &with_stmt.body, with_stmt.runtime_body.as_ref(), owner) } ast::Stmt::Match(match_stmt) => { validate_expr(vm, &match_stmt.subject, ast::ExprContext::Load)?; @@ -574,7 +867,7 @@ fn validate_stmt(vm: &VirtualMachine, stmt: &ast::Stmt) -> PyResult<()> { if let Some(guard) = &case.guard { validate_expr(vm, guard, ast::ExprContext::Load)?; } - validate_body(vm, &case.body, "match_case")?; + validate_body(vm, &case.body, case.runtime_body.as_ref(), "match_case")?; } Ok(()) } @@ -591,7 +884,7 @@ fn validate_stmt(vm: &VirtualMachine, stmt: &ast::Stmt) -> PyResult<()> { } ast::Stmt::Try(try_stmt) => { let owner = if try_stmt.is_star { "TryStar" } else { "Try" }; - validate_body(vm, &try_stmt.body, owner)?; + validate_body(vm, &try_stmt.body, try_stmt.runtime_body.as_ref(), owner)?; if try_stmt.handlers.is_empty() && try_stmt.finalbody.is_empty() { return Err(vm.new_value_error(format!( "{owner} has neither except handlers nor finalbody" @@ -602,14 +895,22 @@ fn validate_stmt(vm: &VirtualMachine, stmt: &ast::Stmt) -> PyResult<()> { vm.new_value_error(format!("{owner} has orelse but no except handlers")) ); } + validate_runtime_except_handler_list_slots(vm, try_stmt.runtime_handlers.as_ref())?; for handler in &try_stmt.handlers { let ast::ExceptHandler::ExceptHandler(handler) = handler; if let Some(type_expr) = &handler.type_ { validate_expr(vm, type_expr, ast::ExprContext::Load)?; } - validate_body(vm, &handler.body, "ExceptHandler")?; + validate_body( + vm, + &handler.body, + handler.runtime_body.as_ref(), + "ExceptHandler", + )?; } + validate_runtime_stmt_list_slots(vm, try_stmt.runtime_finalbody.as_ref())?; validate_stmts(vm, &try_stmt.finalbody)?; + validate_runtime_stmt_list_slots(vm, try_stmt.runtime_orelse.as_ref())?; validate_stmts(vm, &try_stmt.orelse) } ast::Stmt::Assert(assert_stmt) => { @@ -624,6 +925,11 @@ fn validate_stmt(vm: &VirtualMachine, stmt: &ast::Stmt) -> PyResult<()> { Ok(()) } ast::Stmt::ImportFrom(import) => { + if let Some(level) = import.runtime_level + && level < 0 + { + return Err(vm.new_value_error("Negative ImportFrom level")); + } validate_nonempty_seq(vm, import.names.len(), "names", "ImportFrom")?; Ok(()) } @@ -636,10 +942,8 @@ fn validate_stmt(vm: &VirtualMachine, stmt: &ast::Stmt) -> PyResult<()> { Ok(()) } ast::Stmt::Expr(expr) => validate_expr(vm, &expr.value, ast::ExprContext::Load), - ast::Stmt::Pass(_) - | ast::Stmt::Break(_) - | ast::Stmt::Continue(_) - | ast::Stmt::IpyEscapeCommand(_) => Ok(()), + ast::Stmt::Pass(_) | ast::Stmt::Break(_) | ast::Stmt::Continue(_) => Ok(()), + ast::Stmt::IpyEscapeCommand(_) => Err(invalid_syntax_error(vm)), } } @@ -652,10 +956,17 @@ fn validate_stmts(vm: &VirtualMachine, stmts: &[ast::Stmt]) -> PyResult<()> { pub(super) fn validate_mod(vm: &VirtualMachine, module: &Mod) -> PyResult<()> { match module { - Mod::Module(module) => validate_stmts(vm, &module.body), - Mod::Interactive(module) => validate_stmts(vm, &module.body), + Mod::Module(module) => { + validate_runtime_stmt_list_slots(vm, module.module.runtime_body.as_ref())?; + validate_stmts(vm, &module.module.body) + } + Mod::Interactive(module) => { + validate_runtime_stmt_list_slots(vm, module.runtime_body.as_ref())?; + validate_stmts(vm, &module.body) + } Mod::Expression(expr) => validate_expr(vm, &expr.body, ast::ExprContext::Load), Mod::FunctionType(func_type) => { + validate_runtime_expr_option_list_slots(vm, func_type.runtime_argtypes.as_ref())?; validate_exprs(vm, &func_type.argtypes, ast::ExprContext::Load, false)?; validate_expr(vm, &func_type.returns, ast::ExprContext::Load) } diff --git a/crates/vm/src/stdlib/_symtable.rs b/crates/vm/src/stdlib/_symtable.rs index 4c6ec75f5..adcddeacc 100644 --- a/crates/vm/src/stdlib/_symtable.rs +++ b/crates/vm/src/stdlib/_symtable.rs @@ -153,7 +153,9 @@ mod _symtable { CompilerScope::Class => TYPE_CLASS, CompilerScope::Module => TYPE_MODULE, CompilerScope::Annotation => TYPE_ANNOTATION, + CompilerScope::TypeAlias => TYPE_TYPE_ALIAS, CompilerScope::TypeParams => TYPE_TYPE_PARAMETERS, + CompilerScope::TypeVariable => TYPE_TYPE_VARIABLE, } } diff --git a/crates/vm/src/stdlib/builtins.rs b/crates/vm/src/stdlib/builtins.rs index d0ed32b22..8ea849ab0 100644 --- a/crates/vm/src/stdlib/builtins.rs +++ b/crates/vm/src/stdlib/builtins.rs @@ -13,11 +13,12 @@ mod builtins { PyByteArray, PyBytes, PyDictRef, PyStr, PyStrRef, PyTuple, PyTupleRef, PyType, PyUtf8StrRef, enumerate::PyReverseSequenceIterator, - function::{PyCellRef, PyFunction}, + function::{PyCell, PyCellRef, PyFunction}, int::PyIntRef, iter::PyCallableIterator, list::{PyList, SortOptions}, }, + bytecode, common::hash::PyHash, function::{ ArgBytesLike, ArgCallable, ArgIndex, ArgIntoBool, ArgIterable, ArgMapping, @@ -29,9 +30,13 @@ mod builtins { readline::{Readline, ReadlineResult}, stdlib::sys, types::PyComparisonOp, + vm::compile_mode::{ + CompilerFlags, PY_EVAL_INPUT, PY_FILE_INPUT, PY_FUNC_TYPE_INPUT, PY_SINGLE_INPUT, + compile_future_feature_mask, compile_future_features_from_flags, + }, }; use itertools::Itertools; - use num_traits::{Signed, ToPrimitive, Zero}; + use num_traits::{Signed, ToPrimitive}; use rustpython_common::wtf8::CodePoint; #[cfg(not(feature = "rustpython-compiler"))] @@ -103,8 +108,8 @@ mod builtins { filename: PyObjectRef, mode: PyUtf8StrRef, // CPython parity: flags / optimize accept any object with __index__, - // not just exact int. Matches the behavior of `int(x)` arg conversion - // used by Python/Python-ast.c::compile. + // not just exact int. Matches the argument conversion used by + // builtin_compile_impl. #[pyarg(any, optional)] flags: OptionalArg<ArgPrimitiveIndex<i32>>, // CPython parity: dont_inherit goes through PyObject_IsTrue, so @@ -114,174 +119,67 @@ mod builtins { dont_inherit: OptionalArg<ArgIntoBool>, #[pyarg(any, optional)] optimize: OptionalArg<ArgPrimitiveIndex<i32>>, - #[pyarg(any, optional)] + #[pyarg(named, optional)] _feature_version: OptionalArg<i32>, } - /// Detect PEP 263 encoding cookie from source bytes. - /// Checks first two lines for `# coding[:=] <encoding>` pattern. - /// Returns the encoding name if found, or None for default (UTF-8). - #[cfg(feature = "parser")] - fn detect_source_encoding(source: &[u8]) -> Option<String> { - fn find_encoding_in_line(line: &[u8]) -> Option<String> { - // PEP 263: '#' must be preceded only by whitespace/formfeed - let hash_pos = line.iter().position(|&b| b == b'#')?; - if !line[..hash_pos] - .iter() - .all(|&b| matches!(b, b' ' | b'\t' | b'\x0c' | b'\r')) - { - return None; - } - let after_hash = &line[hash_pos..]; - - // Find "coding" after the # - let coding_pos = after_hash.windows(6).position(|w| w == b"coding")?; - let after_coding = &after_hash[coding_pos + 6..]; - - // Next char must be ':' or '=' - let rest = if matches!(after_coding.first(), Some(b':' | b'=')) { - &after_coding[1..] - } else { - return None; - }; - - // Skip whitespace - let rest = rest - .iter() - .copied() - .skip_while(|&b| matches!(b, b' ' | b'\t')) - .collect::<Vec<_>>(); - - // Read encoding name: [-\w.]+ - let name = rest - .iter() - .take_while(|&&b| b.is_ascii_alphanumeric() || matches!(b, b'-' | b'_' | b'.')) - .map(|&b| b as char) - .collect::<String>(); - - if name.is_empty() { - None - } else { - Some(normalize_source_encoding(&name)) - } + fn merge_compile_future_features( + flags: i32, + dont_inherit: bool, + vm: &VirtualMachine, + ) -> bytecode::CodeFlags { + let mut future_features = compile_future_features_from_flags(flags); + if !dont_inherit && let Some(frame) = vm.current_frame() { + future_features |= bytecode::CodeFlags::from_bits_truncate( + frame.code.flags.bits() & compile_future_feature_mask().bits(), + ); } - - // Split into lines (first two only) - let mut lines = source.splitn(3, |&b| b == b'\n'); - - if let Some(first) = lines.next() { - // Strip BOM if present - let first = first.strip_prefix(b"\xef\xbb\xbf").unwrap_or(first); - if let Some(enc) = find_encoding_in_line(first) { - return Some(enc); - } - // Only check second line if first line is blank or a comment - let trimmed = first - .iter() - .find(|&&b| !matches!(b, b' ' | b'\t' | b'\x0c' | b'\r')) - .copied(); - - if trimmed.is_some_and(|b| b != b'#') { - return None; - } - } - - lines.next().and_then(find_encoding_in_line) + future_features } - /// Match CPython's Parser/tokenizer/helpers.c:get_normal_name(). - #[cfg(feature = "parser")] - fn normalize_source_encoding(name: &str) -> String { - let mut normalized = String::with_capacity(name.len().min(12)); - for ch in name.chars().take(12) { - if ch == '_' { - normalized.push('-'); - } else { - normalized.push(ch.to_ascii_lowercase()); - } - } + fn audit_compile_source(vm: &VirtualMachine, source: &[u8], filename: &str) -> PyResult<()> { + vm.sys_module.get_attr("audit", vm)?.call( + ( + vm.ctx.new_str("compile"), + vm.ctx.new_bytes(source.to_vec()), + vm.ctx.new_str(filename), + ), + vm, + )?; + Ok(()) + } - if normalized == "utf-8" || normalized.starts_with("utf-8-") { - "utf-8".to_owned() - } else if normalized == "latin-1" - || normalized == "iso-8859-1" - || normalized == "iso-latin-1" - || normalized.starts_with("latin-1-") - || normalized.starts_with("iso-8859-1-") - || normalized.starts_with("iso-latin-1-") + fn trim_eval_source_bytes(mut source: &[u8]) -> &[u8] { + while let Some((&first, rest)) = source.split_first() + && matches!(first, b' ' | b'\t') { - "iso-8859-1".to_owned() - } else { - name.to_owned() + source = rest; } + source } - /// Decode source bytes to a string, handling PEP 263 encoding declarations - /// and BOM. Raises SyntaxError for invalid UTF-8 without an encoding - /// declaration. - #[cfg(feature = "parser")] - fn is_utf8_encoding(name: &str) -> bool { - name == "utf-8" - } - - #[cfg(feature = "parser")] - fn decode_source_bytes(source: &[u8], filename: &str, vm: &VirtualMachine) -> PyResult<String> { - let has_bom = source.starts_with(b"\xef\xbb\xbf"); - let encoding = detect_source_encoding(source); - - let is_utf8 = encoding.as_deref().is_none_or(is_utf8_encoding); - - // Validate BOM + encoding combination - if has_bom && !is_utf8 { - let enc = encoding.as_deref().unwrap_or("utf-8"); - return Err(vm.new_exception_msg( - vm.ctx.exceptions.syntax_error.to_owned(), - format!("encoding problem: {enc} with BOM").into(), - )); + fn decode_eval_exec_source_bytes( + vm: &VirtualMachine, + source: &[u8], + filename: &str, + ) -> PyResult<String> { + #[cfg(feature = "parser")] + { + vm.decode_source_bytes(source, filename, false) } - - if is_utf8 { - let src = if has_bom { &source[3..] } else { source }; - match core::str::from_utf8(src) { - Ok(s) => Ok(s.to_owned()), - Err(e) => { - let bad_byte = src[e.valid_up_to()]; - let line = src[..e.valid_up_to()] - .iter() - .filter(|&&b| b == b'\n') - .count() - + 1; - Err(vm.new_exception_msg( - vm.ctx.exceptions.syntax_error.to_owned(), - format!( - "Non-UTF-8 code starting with '\\x{bad_byte:02x}' \ - on line {line}, but no encoding declared; \ - see https://peps.python.org/pep-0263/ for details \ - ({filename}, line {line})" - ) - .into(), - )) - } - } - } else { - // Use codec registry for non-UTF-8 encodings - let enc = encoding.as_deref().unwrap(); - let bytes_obj = vm.ctx.new_bytes(source.to_vec()); - let decoded = vm - .state - .codec_registry - .decode_text(bytes_obj.into(), enc, None, vm) - .map_err(|exc| { - if exc.fast_isinstance(vm.ctx.exceptions.lookup_error) { - vm.new_exception_msg( - vm.ctx.exceptions.syntax_error.to_owned(), - format!("unknown encoding for '{filename}': {enc}").into(), - ) - } else { - exc - } - })?; - Ok(decoded.to_string_lossy().into_owned()) + #[cfg(not(feature = "parser"))] + { + _ = filename; + core::str::from_utf8(source) + .map(str::to_owned) + .map_err(|err| { + let msg = format!( + "(unicode error) 'utf-8' codec can't decode byte 0x{:x?} in position {}: invalid start byte", + source[err.valid_up_to()], + err.valid_up_to() + ); + vm.new_exception_msg(vm.ctx.exceptions.syntax_error.to_owned(), msg.into()) + }) } } @@ -303,30 +201,60 @@ mod builtins { use crate::{class::PyClassImpl, stdlib::_ast}; - let feature_version = feature_version_from_arg(args._feature_version, vm)?; + let feature_version = args._feature_version.into_option().unwrap_or(-1); let mode_str = args.mode.as_str(); + let flags: i32 = args.flags.map_or(0, |v| v.value); + let cf = CompilerFlags::from_bits_retain(flags); + + if (flags & !CompilerFlags::ALLOWED_FLAGS.bits()) != 0 { + return Err(vm.new_value_error("compile(): unrecognised flags")); + } let optimize: i32 = args.optimize.map_or(-1, |v| v.value); let optimize: u8 = match optimize { - -1 => vm.state.config.settings.optimize, + -1 => vm.state.config.settings.optimize.min(2), 0..=2 => optimize as u8, _ => return Err(vm.new_value_error("compile(): invalid optimize value")), }; + let dont_inherit = args.dont_inherit.map_or(false, ArgIntoBool::into_bool); + let is_ast_only = cf.contains(CompilerFlags::ONLY_AST); + let future_features = merge_compile_future_features(flags, dont_inherit, vm); - if args - .source - .fast_isinstance(&_ast::NodeAst::make_static_type()) - { - let flags: i32 = args.flags.map_or(0, |v| v.value); - let is_ast_only = !(flags & _ast::PY_CF_ONLY_AST).is_zero(); - - // func_type mode requires PyCF_ONLY_AST - if mode_str == "func_type" && !is_ast_only { + let start = if mode_str == "exec" { + PY_FILE_INPUT + } else if mode_str == "eval" { + PY_EVAL_INPUT + } else if mode_str == "single" { + PY_SINGLE_INPUT + } else if mode_str == "func_type" { + if !is_ast_only { return Err(vm.new_value_error( "compile() mode 'func_type' requires flag PyCF_ONLY_AST", )); } + PY_FUNC_TYPE_INPUT + } else { + let msg = if is_ast_only { + "compile() mode must be 'exec', 'eval', 'single' or 'func_type'" + } else { + "compile() mode must be 'exec', 'eval' or 'single'" + }; + return Err(vm.new_value_error(msg)); + }; + + let ast_type = _ast::NodeAst::make_static_type().as_object().to_owned(); + if args.source.is_instance(&ast_type, vm)? { + let explicit_future_annotations = + future_features.contains(bytecode::CodeFlags::FUTURE_ANNOTATIONS); + vm.sys_module.get_attr("audit", vm)?.call( + ( + vm.ctx.new_str("compile"), + args.source.clone(), + vm.ctx.none(), + ), + vm, + )?; // compile(ast_node, ..., PyCF_ONLY_AST) returns the AST after validation if is_ast_only { @@ -336,15 +264,29 @@ mod builtins { "compile() mode must be 'exec', 'eval', 'single' or 'func_type'", ) })?; - if !args.source.fast_isinstance(&expected_type) { + if !args.source.is_instance(expected_type.as_object(), vm)? { return Err(vm.new_type_error(format!( "expected {} node, got {}", expected_name, args.source.class().name() ))); } - _ast::validate_ast_object(vm, args.source.clone())?; - return Ok(args.source); + #[cfg(not(feature = "rustpython-codegen"))] + { + _ast::validate_ast_object(vm, args.source.clone())?; + return Ok(args.source); + } + #[cfg(feature = "rustpython-codegen")] + { + return _ast::preprocess_ast_object( + vm, + args.source, + &filename.to_string_lossy(), + optimize, + cf.contains(CompilerFlags::OPTIMIZED_AST), + explicit_future_annotations, + ); + } } #[cfg(not(feature = "rustpython-codegen"))] @@ -353,133 +295,104 @@ mod builtins { } #[cfg(feature = "rustpython-codegen")] { + let (expected_type, expected_name) = _ast::mode_type_and_name(mode_str) + .ok_or_else(|| { + vm.new_value_error("compile() mode must be 'exec', 'eval' or 'single'") + })?; + if !args.source.is_instance(expected_type.as_object(), vm)? { + return Err(vm.new_type_error(format!( + "expected {} node, got {}", + expected_name, + args.source.class().name() + ))); + } let mode = mode_str .parse::<crate::compiler::Mode>() .map_err(|err| vm.new_value_error(err.to_string()))?; - return _ast::compile( - vm, - args.source, - &filename.to_string_lossy(), - mode, - Some(optimize), - ); + let mut opts = vm.compile_opts(); + opts.optimize = optimize; + opts.allow_top_level_await = cf.contains(CompilerFlags::ALLOW_TOP_LEVEL_AWAIT); + opts.future_features = future_features; + return _ast::compile(vm, args.source, &filename.to_string_lossy(), mode, opts); } } #[cfg(not(feature = "parser"))] - return Err(vm.new_type_error( - "can't compile() source code when the `parser` feature of rustpython is disabled", - )); - + { + Err(vm.new_type_error( + "can't compile() source code when the `parser` feature of rustpython is disabled", + )) + } #[cfg(feature = "parser")] { - use crate::convert::ToPyException; - - use ruff_python_parser as parser; - let source = ArgStrOrBytesLike::try_from_object(vm, args.source)?; - let source = source.borrow_bytes(); - let source = decode_source_bytes(&source, &filename.to_string_lossy(), vm)?; - let source = source.as_str(); - - let flags: i32 = args.flags.map_or(0, |v| v.value); - - if !(flags & !_ast::PY_COMPILE_FLAGS_MASK).is_zero() { - return Err(vm.new_value_error("compile(): unrecognised flags")); - } - - let allow_incomplete = !(flags & _ast::PY_CF_ALLOW_INCOMPLETE_INPUT).is_zero(); - let type_comments = !(flags & _ast::PY_CF_TYPE_COMMENTS).is_zero(); - - let optimize_level = optimize; - - if (flags & _ast::PY_CF_ONLY_AST).is_zero() { - #[cfg(not(feature = "compiler"))] - { - Err(vm.new_value_error(CODEGEN_NOT_SUPPORTED)) - } - #[cfg(feature = "compiler")] - { - if let Some(feature_version) = feature_version { - let mode = mode_str - .parse::<parser::Mode>() - .map_err(|err| vm.new_value_error(err.to_string()))?; - let _ = _ast::parse( - vm, - source, - mode, - optimize_level, - Some(feature_version), - type_comments, - ) - .map_err(|e| (e, Some(source), allow_incomplete).to_pyexception(vm))?; - } - - let mode = mode_str - .parse::<crate::compiler::Mode>() - .map_err(|err| vm.new_value_error(err.to_string()))?; - - let mut opts = vm.compile_opts(); - opts.optimize = optimize; - - let code = vm - .compile_with_opts(source, mode, &filename.to_string_lossy(), opts) - .map_err(|err| { - (err, Some(source), allow_incomplete).to_pyexception(vm) - })?; - Ok(code.into()) - } - } else { - if mode_str == "func_type" { - return _ast::parse_func_type(vm, source, optimize_level, feature_version) - .map_err(|e| (e, Some(source), allow_incomplete).to_pyexception(vm)); - } - - let mode = mode_str - .parse::<parser::Mode>() - .map_err(|err| vm.new_value_error(err.to_string()))?; - let parsed = _ast::parse( - vm, + let mut compile_flags = flags | future_features.bits() as i32; + #[cfg(feature = "rustpython-compiler")] + let compile_source = |source: &[u8], compile_flags: i32| { + vm.compile_string_object_with_flags( source, - mode, - optimize_level, + &filename.to_string_lossy(), + start, + compile_flags, feature_version, - type_comments, + optimize as i32, ) - .map_err(|e| (e, Some(source), allow_incomplete).to_pyexception(vm))?; - - if mode_str == "single" { - return _ast::wrap_interactive(vm, parsed); + }; + match &source { + ArgStrOrBytesLike::Str(source) => { + if source.as_bytes().contains(&0) { + return Err(vm.new_exception_msg( + vm.ctx.exceptions.syntax_error.to_owned(), + "source code string cannot contain null bytes".into(), + )); + } + audit_compile_source( + vm, + source.as_bytes(), + filename.to_string_lossy().as_ref(), + )?; + compile_flags |= CompilerFlags::IGNORE_COOKIE.bits(); + #[cfg(feature = "rustpython-compiler")] + { + compile_source(source.as_bytes(), compile_flags) + } + #[cfg(not(feature = "rustpython-compiler"))] + { + Err(vm.new_value_error(CODEGEN_NOT_SUPPORTED)) + } + } + ArgStrOrBytesLike::Buf(source) => { + let source_bytes = source.borrow_buf(); + let source_bytes: &[u8] = &source_bytes; + if source_bytes.contains(&0) { + return Err(vm.new_exception_msg( + vm.ctx.exceptions.syntax_error.to_owned(), + "source code string cannot contain null bytes".into(), + )); + } + audit_compile_source( + vm, + source_bytes, + filename.to_string_lossy().as_ref(), + )?; + #[cfg(feature = "rustpython-compiler")] + { + compile_source(source_bytes, compile_flags) + } + #[cfg(not(feature = "rustpython-compiler"))] + { + Err(vm.new_value_error(CODEGEN_NOT_SUPPORTED)) + } } - - Ok(parsed) } } } } - #[cfg(feature = "ast")] - fn feature_version_from_arg( - feature_version: OptionalArg<i32>, - vm: &VirtualMachine, - ) -> PyResult<Option<ruff_python_ast::PythonVersion>> { - let Some(minor) = feature_version.into_option() else { - return Ok(None); - }; - - if minor < 0 { - return Ok(None); - } - - u8::try_from(minor) - .map(|v| Some(ruff_python_ast::PythonVersion { major: 3, minor: v })) - .map_err(|_| vm.new_value_error("compile() _feature_version out of range")) - } - #[pyfunction] fn delattr(obj: PyObjectRef, attr: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> { - let attr = attr.try_to_ref::<PyStr>(vm).map_err(|_| { + let attr = attr.try_to_ref::<PyStr>(vm).map_err(|_e| { vm.new_type_error(format!( "attribute name must be string, not '{}'", attr.class().name() @@ -507,42 +420,39 @@ mod builtins { } impl ScopeArgs { - fn validate_globals_dict( - globals: &PyObject, - vm: &VirtualMachine, - func_name: &'static str, - ) -> PyResult<()> { - if globals.fast_isinstance(vm.ctx.types.dict_type) { - return Ok(()); - } - - let msg = match func_name { - "eval" => { - let is_mapping = globals.mapping_unchecked().check(); - if is_mapping { - "globals must be a real dict; try eval(expr, {}, mapping)".into() - } else { - "globals must be a dict".into() - } - } - "exec" => format!( - "exec() globals must be a dict, not {}", - globals.class().name() - ), - _ => "globals must be a dict".into(), - }; - - Err(vm.new_type_error(msg)) - } - fn make_scope( self, vm: &VirtualMachine, func_name: &'static str, ) -> PyResult<crate::scope::Scope> { + fn validate_globals_dict( + globals: &PyObject, + vm: &VirtualMachine, + func_name: &'static str, + ) -> PyResult<()> { + if !globals.fast_isinstance(vm.ctx.types.dict_type) { + return Err(match func_name { + "eval" => { + let is_mapping = globals.mapping_unchecked().check(); + vm.new_type_error(if is_mapping { + "globals must be a real dict; try eval(expr, {}, mapping)" + } else { + "globals must be a dict" + }) + } + "exec" => vm.new_type_error(format!( + "exec() globals must be a dict, not {}", + globals.class().name() + )), + _ => vm.new_type_error("globals must be a dict"), + }); + } + Ok(()) + } + let (globals, locals) = match self.globals { Some(globals) => { - Self::validate_globals_dict(&globals, vm, func_name)?; + validate_globals_dict(&globals, vm, func_name)?; let globals = PyDictRef::try_from_object(vm, globals)?; if !globals.contains_key(identifier!(vm, __builtins__), vm) { @@ -570,6 +480,61 @@ mod builtins { } } + #[derive(FromArgs)] + struct ExecArgs { + #[pyarg(positional)] + source: Either<ArgStrOrBytesLike, PyRef<crate::builtins::PyCode>>, + #[pyarg(any, default)] + globals: Option<PyObjectRef>, + #[pyarg(any, default)] + locals: Option<ArgMapping>, + #[pyarg(named, optional)] + closure: OptionalOption<PyObjectRef>, + } + + fn exec_closure( + code_obj: &PyRef<crate::builtins::PyCode>, + closure: Option<PyObjectRef>, + vm: &VirtualMachine, + ) -> PyResult<Option<PyRef<PyTuple<PyCellRef>>>> { + let num_free = code_obj.freevars.len(); + let Some(closure) = closure else { + if num_free == 0 { + return Ok(None); + } + return Err(vm.new_type_error(format!( + "code object requires a closure of exactly length {num_free}" + ))); + }; + + if num_free == 0 { + return Err(vm.new_type_error("cannot use a closure with this code object")); + } + + let closure_tuple = closure + .downcast_exact::<PyTuple>(vm) + .map_err(|_| { + vm.new_type_error(format!( + "code object requires a closure of exactly length {num_free}" + )) + })? + .into_pyref(); + if closure_tuple.len() != num_free { + return Err(vm.new_type_error(format!( + "code object requires a closure of exactly length {num_free}" + ))); + } + + closure_tuple + .try_into_typed::<PyCell>(vm) + .map(Some) + .map_err(|_| { + vm.new_type_error(format!( + "code object requires a closure of exactly length {num_free}" + )) + }) + } + #[pyfunction] fn eval( source: Either<ArgStrOrBytesLike, PyRef<crate::builtins::PyCode>>, @@ -581,38 +546,93 @@ mod builtins { // source as string let code = match source { Either::A(either) => { - let source: &[u8] = &either.borrow_bytes(); - if source.contains(&0) { - return Err(vm.new_exception_msg( - vm.ctx.exceptions.syntax_error.to_owned(), - "source code string cannot contain null bytes".into(), - )); - } - - let source = core::str::from_utf8(source).map_err(|err| { - let msg = format!( - "(unicode error) 'utf-8' codec can't decode byte 0x{:x?} in position {}: invalid start byte", - source[err.valid_up_to()], - err.valid_up_to() - ); - - vm.new_exception_msg(vm.ctx.exceptions.syntax_error.to_owned(), msg.into()) - })?; - Ok(Either::A(vm.ctx.new_utf8_str(source.trim_start()))) + let source = match &either { + ArgStrOrBytesLike::Str(source) => { + if source.as_bytes().contains(&0) { + return Err(vm.new_exception_msg( + vm.ctx.exceptions.syntax_error.to_owned(), + "source code string cannot contain null bytes".into(), + )); + } + let source = source.expect_str().trim_start_matches([' ', '\t']); + audit_compile_source(vm, source.as_bytes(), "<string>")?; + source.to_owned() + } + ArgStrOrBytesLike::Buf(source) => { + let source: &[u8] = &source.borrow_buf(); + if source.contains(&0) { + return Err(vm.new_exception_msg( + vm.ctx.exceptions.syntax_error.to_owned(), + "source code string cannot contain null bytes".into(), + )); + } + let source = trim_eval_source_bytes(source); + audit_compile_source(vm, source, "<string>")?; + decode_eval_exec_source_bytes(vm, source, "eval")? + } + }; + Ok(Either::A(vm.ctx.new_utf8_str(source))) } Either::B(code) => Ok(Either::B(code)), }?; - run_code(vm, code, scope, crate::compiler::Mode::Eval, "eval") + run_code(vm, code, scope, crate::compiler::Mode::Eval, "eval", None) } #[pyfunction] - fn exec( - source: Either<PyUtf8StrRef, PyRef<crate::builtins::PyCode>>, - scope: ScopeArgs, - vm: &VirtualMachine, - ) -> PyResult { - let scope = scope.make_scope(vm, "exec")?; - run_code(vm, source, scope, crate::compiler::Mode::Exec, "exec") + fn exec(args: ExecArgs, vm: &VirtualMachine) -> PyResult { + let ExecArgs { + source, + globals, + locals, + closure, + } = args; + let scope = ScopeArgs { globals, locals }.make_scope(vm, "exec")?; + let closure = closure.flatten(); + let (source, closure) = match source { + Either::A(either) => { + if closure.is_some() { + return Err( + vm.new_type_error("closure can only be used when source is a code object") + ); + } + let source = match &either { + ArgStrOrBytesLike::Str(source) => { + if source.as_bytes().contains(&0) { + return Err(vm.new_exception_msg( + vm.ctx.exceptions.syntax_error.to_owned(), + "source code string cannot contain null bytes".into(), + )); + } + audit_compile_source(vm, source.as_bytes(), "<string>")?; + source.expect_str().to_owned() + } + ArgStrOrBytesLike::Buf(source) => { + let source: &[u8] = &source.borrow_buf(); + if source.contains(&0) { + return Err(vm.new_exception_msg( + vm.ctx.exceptions.syntax_error.to_owned(), + "source code string cannot contain null bytes".into(), + )); + } + audit_compile_source(vm, source, "<string>")?; + decode_eval_exec_source_bytes(vm, source, "exec")? + } + }; + (Either::A(vm.ctx.new_utf8_str(source)), None) + } + Either::B(code) => { + let closure = exec_closure(&code, closure, vm)?; + (Either::B(code), closure) + } + }; + run_code( + vm, + source, + scope, + crate::compiler::Mode::Exec, + "exec", + closure, + ) } fn run_code( @@ -621,28 +641,39 @@ mod builtins { scope: crate::scope::Scope, #[allow(unused_variables)] mode: crate::compiler::Mode, func: &str, + closure: Option<PyRef<PyTuple<PyCellRef>>>, ) -> PyResult { // Determine code object: let code_obj = match source { #[cfg(feature = "rustpython-compiler")] Either::A(string) => { let source = string.as_str(); - vm.compile(source, mode, "<string>") - .map_err(|err| vm.new_syntax_error(&err, Some(source)))? + let mut opts = vm.compile_opts(); + if let Some(frame) = vm.current_frame() { + opts.future_features = bytecode::CodeFlags::from_bits_truncate( + frame.code.flags.bits() & compile_future_feature_mask().bits(), + ); + } + vm.compile_with_opts(source, mode, "<string>", opts) + .map_err(|err| err.into_pyexception(vm, Some(source)))? } #[cfg(not(feature = "rustpython-compiler"))] Either::A(_) => return Err(vm.new_type_error(CODEGEN_NOT_SUPPORTED)), Either::B(code_obj) => code_obj, }; - if !code_obj.freevars.is_empty() { + vm.sys_module + .get_attr("audit", vm)? + .call((vm.ctx.new_str("exec"), code_obj.clone()), vm)?; + + if closure.is_none() && !code_obj.freevars.is_empty() { return Err(vm.new_type_error(format!( "code object passed to {func}() may not contain free variables" ))); } // Run the code: - vm.run_code_obj(code_obj, scope) + vm.run_code_obj_with_closure(code_obj, scope, closure) } #[pyfunction] @@ -1002,8 +1033,8 @@ mod builtins { modulus, } = args; let modulus = modulus - .as_ref() - .map_or_else(|| vm.ctx.none.as_object(), |m| m); + .as_deref() + .unwrap_or_else(|| vm.ctx.none.as_object()); vm._pow(&x, &y, modulus) } diff --git a/crates/vm/src/stdlib/sys.rs b/crates/vm/src/stdlib/sys.rs index 58324a3c0..b8fe578f2 100644 --- a/crates/vm/src/stdlib/sys.rs +++ b/crates/vm/src/stdlib/sys.rs @@ -751,7 +751,7 @@ pub mod sys { .read_to_string(&mut source) .map_err(|e| vm.new_os_error(format!("Error reading from stdin: {e}")))?; vm.compile(&source, crate::compiler::Mode::Single, "<stdin>") - .map_err(|e| vm.new_os_error(format!("Error running stdin: {e}")))?; + .map_err(|e| e.into_pyexception(vm, Some(&source)))?; Ok(()) } @@ -1228,7 +1228,7 @@ pub mod sys { vm.state.int_max_str_digits.store(maxdigits); Ok(()) } else { - let error = format!("maxdigits must be 0 or larger than {threshold:?}"); + let error = format!("maxdigits must be 0 or larger than {threshold}"); Err(vm.new_value_error(error)) } } @@ -1744,12 +1744,54 @@ pub mod sys { } for hook in hooks { - hook.call((event.clone(), args.clone()), vm)?; + call_audit_hook(&hook, event.clone().into(), args, vm)?; } Ok(()) } + fn audit_hook_can_trace(hook: &PyObjectRef, vm: &VirtualMachine) -> PyResult<bool> { + match hook.get_attr("__cantrace__", vm) { + Ok(can_trace) => can_trace.try_to_bool(vm), + Err(exc) + if exc + .class() + .fast_issubclass(vm.ctx.exceptions.attribute_error) => + { + Ok(false) + } + Err(exc) => Err(exc), + } + } + + fn call_audit_hook( + hook: &PyObjectRef, + event: PyObjectRef, + args: &PyObjectRef, + vm: &VirtualMachine, + ) -> PyResult<()> { + // Tracing is suppressed while dispatching Python audit hooks, + // except for hooks that explicitly opt in with __cantrace__. + vm.enter_tracing(); + let can_trace = audit_hook_can_trace(hook, vm); + let result = match can_trace { + Ok(can_trace) => { + if can_trace { + vm.leave_tracing(); + } + let result = hook.call((event, args.clone()), vm).map(|_| ()); + if can_trace { + vm.enter_tracing(); + } + result + } + Err(exc) => Err(exc), + }; + + vm.leave_tracing(); + result + } + #[pyfunction] fn audit(event: PyStrRef, args: PosArgs, vm: &VirtualMachine) -> PyResult<()> { if vm.audit_hooks.borrow().is_empty() { @@ -1773,10 +1815,13 @@ pub mod sys { let event: PyObjectRef = vm.ctx.new_str("sys.addaudithook").into(); for existing_hook in hooks { - let Err(exc) = existing_hook.call((event.clone(), args.clone()), vm) else { + let Err(exc) = call_audit_hook(&existing_hook, event.clone(), &args, vm) else { continue; }; - if exc.class().fast_issubclass(vm.ctx.exceptions.runtime_error) { + if exc + .class() + .fast_issubclass(vm.ctx.exceptions.exception_type) + { return Ok(()); } return Err(exc); diff --git a/crates/vm/src/stdlib/sys/monitoring.rs b/crates/vm/src/stdlib/sys/monitoring.rs index 6e6169250..accf20016 100644 --- a/crates/vm/src/stdlib/sys/monitoring.rs +++ b/crates/vm/src/stdlib/sys/monitoring.rs @@ -747,7 +747,7 @@ fn fire( cb_extra: &[PyObjectRef], ) -> PyResult<()> { // Prevent recursive event firing - if FIRING.with(|f| f.get()) { + if vm.tracing_is_suppressed() || FIRING.with(|f| f.get()) { return Ok(()); } @@ -795,6 +795,7 @@ fn fire( let args = FuncArgs::from(args_vec); FIRING.with(|f| f.set(true)); + vm.enter_tracing(); let result = (|| { for (tool, cb) in callbacks { let result = cb.call(args.clone(), vm)?; @@ -817,6 +818,7 @@ fn fire( } Ok(()) })(); + vm.leave_tracing(); FIRING.with(|f| f.set(false)); result } diff --git a/crates/vm/src/vm/compile.rs b/crates/vm/src/vm/compile.rs index 2dbdb17ff..2beaf24f0 100644 --- a/crates/vm/src/vm/compile.rs +++ b/crates/vm/src/vm/compile.rs @@ -2,19 +2,382 @@ //! //! For code execution functions, see python_run.rs +use core::fmt; + use crate::{ - PyRef, VirtualMachine, - builtins::PyCode, + AsObject, PyObjectRef, PyRef, PyResult, VirtualMachine, + builtins::{PyBaseExceptionRef, PyCode}, compiler::{self, CompileError, CompileOpts}, + vm::compile_mode::{ + CompilerFlags, PY_EVAL_INPUT, PY_FILE_INPUT, PY_FUNC_TYPE_INPUT, PY_SINGLE_INPUT, + compile_future_features_from_flags, + }, }; +#[derive(Debug)] +pub enum VmCompileError { + Compile(CompileError), + Warning(CompileWarningError), +} + +#[derive(Debug)] +pub struct CompileWarningError { + exception: PyBaseExceptionRef, + filename: String, + lineno: usize, + offset: usize, +} + +impl From<CompileError> for VmCompileError { + fn from(err: CompileError) -> Self { + Self::Compile(err) + } +} + +impl fmt::Display for VmCompileError { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + match self { + Self::Compile(err) => err.fmt(f), + Self::Warning(_) => f.write_str("compiler warning raised as an exception"), + } + } +} + +impl VmCompileError { + pub fn into_pyexception(self, vm: &VirtualMachine, source: Option<&str>) -> PyBaseExceptionRef { + self.into_pyexception_maybe_incomplete(vm, source, false) + } + + pub fn into_pyexception_maybe_incomplete( + self, + vm: &VirtualMachine, + source: Option<&str>, + allow_incomplete: bool, + ) -> PyBaseExceptionRef { + match self { + Self::Compile(err) => { + vm.new_syntax_error_maybe_incomplete(&err, source, allow_incomplete) + } + Self::Warning(err) => err.into_pyexception(vm, source), + } + } +} + +impl CompileWarningError { + fn into_pyexception(self, vm: &VirtualMachine, source: Option<&str>) -> PyBaseExceptionRef { + if !self + .exception + .fast_isinstance(vm.ctx.exceptions.syntax_warning) + { + return self.exception; + } + let Ok(message) = self.exception.as_object().str(vm) else { + return self.exception; + }; + let syntax_error = vm.new_exception_msg( + vm.ctx.exceptions.syntax_error.to_owned(), + message.as_wtf8().to_owned(), + ); + syntax_error + .as_object() + .set_attr("lineno", vm.ctx.new_int(self.lineno), vm) + .unwrap(); + syntax_error + .as_object() + .set_attr("offset", vm.ctx.new_int(self.offset), vm) + .unwrap(); + syntax_error + .as_object() + .set_attr("filename", vm.ctx.new_str(self.filename), vm) + .unwrap(); + let text = source + .and_then(|source| source.split('\n').nth(self.lineno.saturating_sub(1))) + .map_or_else( + || vm.ctx.none(), + |line| { + vm.ctx + .new_str(format!("{}\n", line.trim_end_matches('\r'))) + .into() + }, + ); + syntax_error.as_object().set_attr("text", text, vm).unwrap(); + syntax_error + } +} + impl VirtualMachine { + #[cfg(feature = "parser")] + fn detect_source_encoding(source: &[u8]) -> Option<String> { + fn find_encoding_in_line(line: &[u8]) -> Option<String> { + let hash_pos = line.iter().position(|&b| b == b'#')?; + if !line[..hash_pos] + .iter() + .all(|&b| b == b' ' || b == b'\t' || b == b'\x0c' || b == b'\r') + { + return None; + } + let after_hash = &line[hash_pos..]; + let coding_pos = after_hash.windows(6).position(|w| w == b"coding")?; + let after_coding = &after_hash[coding_pos + 6..]; + let rest = if after_coding.first() == Some(&b':') || after_coding.first() == Some(&b'=') + { + &after_coding[1..] + } else { + return None; + }; + let name: String = rest + .iter() + .copied() + .skip_while(|&b| b == b' ' || b == b'\t') + .take_while(|&b| b.is_ascii_alphanumeric() || b == b'-' || b == b'_' || b == b'.') + .map(|b| b as char) + .collect(); + (!name.is_empty()).then(|| VirtualMachine::normalize_source_encoding(&name)) + } + + let mut lines = source.splitn(3, |&b| b == b'\n'); + if let Some(first) = lines.next() { + let first = first.strip_prefix(b"\xef\xbb\xbf").unwrap_or(first); + if let Some(enc) = find_encoding_in_line(first) { + return Some(enc); + } + let trimmed = first + .iter() + .skip_while(|&&b| b == b' ' || b == b'\t' || b == b'\x0c' || b == b'\r') + .copied() + .collect::<Vec<_>>(); + if !trimmed.is_empty() && trimmed[0] != b'#' { + return None; + } + } + lines.next().and_then(find_encoding_in_line) + } + + #[cfg(feature = "parser")] + fn normalize_source_encoding(name: &str) -> String { + let mut normalized = String::with_capacity(name.len().min(12)); + for ch in name.chars().take(12) { + if ch == '_' { + normalized.push('-'); + } else { + normalized.push(ch.to_ascii_lowercase()); + } + } + + if normalized == "utf-8" || normalized.starts_with("utf-8-") { + "utf-8".to_owned() + } else if normalized == "latin-1" + || normalized == "iso-8859-1" + || normalized == "iso-latin-1" + || normalized.starts_with("latin-1-") + || normalized.starts_with("iso-8859-1-") + || normalized.starts_with("iso-latin-1-") + { + "iso-8859-1".to_owned() + } else { + name.to_owned() + } + } + + #[cfg(feature = "parser")] + fn is_utf8_encoding(name: &str) -> bool { + name == "utf-8" + } + + #[cfg(feature = "parser")] + pub(crate) fn decode_source_bytes( + &self, + source: &[u8], + filename: &str, + ignore_cookie: bool, + ) -> PyResult<String> { + let has_bom = source.starts_with(b"\xef\xbb\xbf"); + let encoding = if ignore_cookie { + None + } else { + Self::detect_source_encoding(source) + }; + let is_utf8 = encoding.as_deref().is_none_or(Self::is_utf8_encoding); + if has_bom && !is_utf8 { + let enc = encoding.as_deref().unwrap_or("utf-8"); + return Err(self.new_exception_msg( + self.ctx.exceptions.syntax_error.to_owned(), + format!("encoding problem: {enc} with BOM").into(), + )); + } + + if is_utf8 { + let src = if has_bom { &source[3..] } else { source }; + match core::str::from_utf8(src) { + Ok(s) => Ok(s.to_owned()), + Err(e) => { + let bad_byte = src[e.valid_up_to()]; + let line = src[..e.valid_up_to()] + .iter() + .filter(|&&b| b == b'\n') + .count() + + 1; + Err(self.new_exception_msg( + self.ctx.exceptions.syntax_error.to_owned(), + format!( + "Non-UTF-8 code starting with '\\x{bad_byte:02x}' \ + on line {line}, but no encoding declared; \ + see https://peps.python.org/pep-0263/ for details \ + ({filename}, line {line})" + ) + .into(), + )) + } + } + } else { + let encoding = encoding.as_deref().unwrap(); + let bytes = self.ctx.new_bytes(source.to_vec()); + let decoded = self + .state + .codec_registry + .decode_text(bytes.into(), encoding, None, self) + .map_err(|exc| { + if exc.fast_isinstance(self.ctx.exceptions.lookup_error) { + self.new_exception_msg( + self.ctx.exceptions.syntax_error.to_owned(), + format!("unknown encoding for '{filename}': {encoding}").into(), + ) + } else { + exc + } + })?; + Ok(decoded.to_string_lossy().into_owned()) + } + } + + #[cfg(feature = "parser")] + pub fn compile_string_object_with_flags( + &self, + source: &[u8], + filename: &str, + start: i32, + flags: i32, + feature_version: i32, + optimize: i32, + ) -> PyResult<PyObjectRef> { + use crate::convert::ToPyException; + use crate::stdlib::_ast; + + let cf = CompilerFlags::from_bits_retain(flags); + let source = + self.decode_source_bytes(source, filename, cf.contains(CompilerFlags::IGNORE_COOKIE))?; + let source = source.as_str(); + let optimize = match optimize { + -1 => self.state.config.settings.optimize.min(2), + 0..=2 => optimize as u8, + _ => return Err(self.new_value_error("compile(): invalid optimize value")), + }; + let allow_incomplete = cf.contains(CompilerFlags::ALLOW_INCOMPLETE_INPUT); + let type_comments = cf.contains(CompilerFlags::TYPE_COMMENTS); + let dont_imply_dedent = cf.contains(CompilerFlags::DONT_IMPLY_DEDENT); + let is_ast_only = cf.contains(CompilerFlags::ONLY_AST); + let optimized_ast = cf.contains(CompilerFlags::OPTIMIZED_AST); + let future_features = compile_future_features_from_flags(flags); + let explicit_future_annotations = + future_features.contains(crate::bytecode::CodeFlags::FUTURE_ANNOTATIONS); + let target_version = if is_ast_only { + Some(ruff_python_ast::PythonVersion { + major: 3, + minor: u8::try_from(feature_version).unwrap_or(crate::version::MINOR as u8), + }) + } else { + None + }; + + if is_ast_only { + if start == PY_FUNC_TYPE_INPUT { + return _ast::parse_func_type(self, source, optimize, target_version) + .map_err(|e| (e, Some(source), allow_incomplete).to_pyexception(self)); + } + let (parser_mode, interactive) = match start { + PY_SINGLE_INPUT => (ruff_python_parser::Mode::Module, true), + PY_FILE_INPUT => (ruff_python_parser::Mode::Module, false), + PY_EVAL_INPUT => (ruff_python_parser::Mode::Expression, false), + _ => { + return Err( + self.new_system_error("Invalid start argument passed to Py_CompileString") + ); + } + }; + let parsed = _ast::parse( + self, + source, + parser_mode, + optimize, + target_version, + type_comments, + optimized_ast, + interactive, + explicit_future_annotations, + dont_imply_dedent, + ) + .map_err(|e| (e, Some(source), allow_incomplete).to_pyexception(self))?; + if start == PY_SINGLE_INPUT { + return _ast::wrap_interactive(self, parsed); + } + return Ok(parsed); + } + + if type_comments { + let parser_mode = match start { + PY_SINGLE_INPUT | PY_FILE_INPUT => ruff_python_parser::Mode::Module, + PY_EVAL_INPUT => ruff_python_parser::Mode::Expression, + _ => { + return Err( + self.new_system_error("Invalid start argument passed to Py_CompileString") + ); + } + }; + _ast::parse( + self, + source, + parser_mode, + optimize, + None, + type_comments, + false, + start == PY_SINGLE_INPUT, + explicit_future_annotations, + dont_imply_dedent, + ) + .map_err(|e| (e, Some(source), allow_incomplete).to_pyexception(self))?; + } + + let mode = match start { + PY_SINGLE_INPUT => compiler::Mode::Single, + PY_FILE_INPUT => compiler::Mode::Exec, + PY_EVAL_INPUT => compiler::Mode::Eval, + PY_FUNC_TYPE_INPUT => compiler::Mode::BlockExpr, + _ => { + return Err( + self.new_system_error("Invalid start argument passed to Py_CompileString") + ); + } + }; + let mut opts = self.compile_opts(); + opts.optimize = optimize; + opts.allow_top_level_await = cf.contains(CompilerFlags::ALLOW_TOP_LEVEL_AWAIT); + opts.future_features = future_features; + opts.dont_imply_dedent = dont_imply_dedent; + let code = self + .compile_with_opts(source, mode, filename, opts) + .map_err(|err| { + err.into_pyexception_maybe_incomplete(self, Some(source), allow_incomplete) + })?; + Ok(code.into()) + } + pub fn compile( &self, source: &str, mode: compiler::Mode, - source_path: &str, - ) -> Result<PyRef<PyCode>, CompileError> { + source_path: impl Into<String>, + ) -> Result<PyRef<PyCode>, VmCompileError> { self.compile_with_opts(source, mode, source_path, self.compile_opts()) } @@ -22,18 +385,55 @@ impl VirtualMachine { &self, source: &str, mode: compiler::Mode, - source_path: &str, + source_path: impl Into<String>, opts: CompileOpts, - ) -> Result<PyRef<PyCode>, CompileError> { - let code = compiler::compile(source, mode, source_path, opts) - .map(|code| PyCode::new_ref_from_bytecode(self, code)); - + ) -> Result<PyRef<PyCode>, VmCompileError> { + let source_path = source_path.into(); #[cfg(feature = "parser")] - if code.is_ok() { - self.emit_string_escape_warnings(source, source_path); + { + self.emit_tokenizer_syntax_warnings(source, &source_path) + .map_err(VmCompileError::Warning)?; + self.emit_string_escape_warnings(source, &source_path) + .map_err(VmCompileError::Warning)?; } - - code + #[cfg(feature = "parser")] + let code = { + // A warning the filter escalates to an exception is stashed here so + // its precise category survives; codegen only sees an abort marker. + let escalated: core::cell::Cell<Option<CompileWarningError>> = + core::cell::Cell::new(None); + let mut syntax_warning_handler = |location, message| { + escape_warnings::warn_syntax_at_location(&source_path, location, message, self) + .map_err(|warning| { + escalated.set(Some(warning)); + // Recovered below via `escalated`, so this is never surfaced. + compiler::codegen::error::CodegenError { + location: Some(location), + error: compiler::codegen::error::CodegenErrorType::SyntaxError( + String::new(), + ), + source_path: source_path.clone(), + } + }) + }; + let result = compiler::compile_with_syntax_warning_handler( + source, + mode, + &source_path, + opts, + &mut syntax_warning_handler, + ); + match escalated.take() { + Some(warning) => return Err(VmCompileError::Warning(warning)), + None => result, + } + }; + #[cfg(not(feature = "parser"))] + let code = compiler::compile(source, mode, &source_path, opts); + let code = code + .map(|code| PyCode::new_ref_from_bytecode(self, code)) + .map_err(VmCompileError::Compile)?; + Ok(code) } } @@ -59,6 +459,30 @@ mod escape_warnings { + 1 } + fn line_offset_at(source: &str, offset: usize) -> (usize, usize) { + let offset = offset.min(source.len()); + let prefix = &source[..offset]; + let lineno = prefix.bytes().filter(|&b| b == b'\n').count() + 1; + let line_start = prefix.rfind('\n').map_or(0, |index| index + 1); + let column = source[line_start..offset].chars().count() + 1; + (lineno, column) + } + + fn compile_warning_error( + exception: PyBaseExceptionRef, + source: &str, + filename: &str, + offset: usize, + ) -> CompileWarningError { + let (lineno, offset) = line_offset_at(source, offset); + CompileWarningError { + exception, + filename: filename.to_owned(), + lineno, + offset, + } + } + /// Get content bounds (start, end byte offsets) of a quoted string literal, /// excluding prefix characters and quote delimiters. fn content_bounds(source: &str, range: TextRange) -> Option<(usize, usize)> { @@ -180,7 +604,7 @@ mod escape_warnings { offset: usize, filename: &str, vm: &VirtualMachine, - ) { + ) -> Result<(), CompileWarningError> { let lineno = line_number_at(source, offset); let message = vm.ctx.new_str(format!( "\"\\{ch}\" is an invalid escape sequence. \ @@ -188,7 +612,7 @@ mod escape_warnings { Did you mean \"\\\\{ch}\"? A raw string is also an option." )); let fname = vm.ctx.new_str(filename); - let _ = warn::warn_explicit( + warn::warn_explicit( Some(vm.ctx.exceptions.syntax_warning.to_owned()), message.into(), fname, @@ -198,23 +622,273 @@ mod escape_warnings { None, None, vm, - ); + ) + .map_err(|err| compile_warning_error(err, source, filename, offset)) + } + + fn warn_syntax_at_offset( + source: &str, + filename: &str, + offset: usize, + message: String, + vm: &VirtualMachine, + ) -> Result<(), CompileWarningError> { + let lineno = line_number_at(source, offset); + let fname = vm.ctx.new_str(filename); + let message = vm.ctx.new_str(message); + warn::warn_explicit( + Some(vm.ctx.exceptions.syntax_warning.to_owned()), + message.into(), + fname, + lineno, + None, + vm.ctx.none(), + None, + None, + vm, + ) + .map_err(|err| compile_warning_error(err, source, filename, offset)) + } + + pub(super) fn warn_syntax_at_location( + filename: &str, + location: compiler::core::SourceLocation, + message: String, + vm: &VirtualMachine, + ) -> Result<(), CompileWarningError> { + let fname = vm.ctx.new_str(filename); + let message = vm.ctx.new_str(message); + warn::warn_explicit( + Some(vm.ctx.exceptions.syntax_warning.to_owned()), + message.into(), + fname, + location.line.get(), + None, + vm.ctx.none(), + None, + None, + vm, + ) + .map_err(|exception| CompileWarningError { + exception, + filename: filename.to_owned(), + lineno: location.line.get(), + offset: location.character_offset.get(), + }) + } + + fn is_ascii_identifier_char(byte: u8) -> bool { + byte == b'_' || byte.is_ascii_alphanumeric() + } + + fn numeric_keyword_suffix(rest: &[u8]) -> bool { + rest.starts_with(b"and") + || rest.starts_with(b"else") + || rest.starts_with(b"for") + || rest.starts_with(b"if") + || rest.starts_with(b"in") + || rest.starts_with(b"is") + || rest.starts_with(b"or") + || rest.starts_with(b"not") + } + + fn consume_decimal_digits(bytes: &[u8], mut index: usize) -> usize { + while index < bytes.len() { + match bytes[index] { + b'0'..=b'9' => index += 1, + b'_' if bytes + .get(index + 1) + .is_some_and(|byte| byte.is_ascii_digit()) => + { + index += 2; + } + _ => break, + } + } + index + } + + fn consume_radix_digits( + bytes: &[u8], + mut index: usize, + is_digit: impl Fn(u8) -> bool, + ) -> usize { + while index < bytes.len() { + if is_digit(bytes[index]) { + index += 1; + } else if bytes.get(index) == Some(&b'_') + && bytes.get(index + 1).is_some_and(|&byte| is_digit(byte)) + { + index += 2; + } else { + break; + } + } + index + } + + fn number_literal_end(bytes: &[u8], start: usize) -> Option<(&'static str, usize)> { + if bytes.get(start) == Some(&b'.') { + if !bytes + .get(start + 1) + .is_some_and(|byte| byte.is_ascii_digit()) + { + return None; + } + let mut index = consume_decimal_digits(bytes, start + 1); + index = consume_exponent(bytes, index); + if matches!(bytes.get(index), Some(b'j' | b'J')) { + return Some(("imaginary", index + 1)); + } + return Some(("decimal", index)); + } + + if !bytes.get(start).is_some_and(|byte| byte.is_ascii_digit()) { + return None; + } + + if bytes.get(start) == Some(&b'0') { + match bytes.get(start + 1) { + Some(b'x' | b'X') => { + let end = + consume_radix_digits(bytes, start + 2, |byte| byte.is_ascii_hexdigit()); + return Some(("hexadecimal", end)); + } + Some(b'o' | b'O') => { + let end = + consume_radix_digits(bytes, start + 2, |byte| matches!(byte, b'0'..=b'7')); + return Some(("octal", end)); + } + Some(b'b' | b'B') => { + let end = + consume_radix_digits(bytes, start + 2, |byte| matches!(byte, b'0' | b'1')); + return Some(("binary", end)); + } + _ => {} + } + } + + let mut index = consume_decimal_digits(bytes, start); + if bytes.get(index) == Some(&b'.') { + index = consume_decimal_digits(bytes, index + 1); + } + index = consume_exponent(bytes, index); + if matches!(bytes.get(index), Some(b'j' | b'J')) { + return Some(("imaginary", index + 1)); + } + Some(("decimal", index)) + } + + fn consume_exponent(bytes: &[u8], index: usize) -> usize { + if !matches!(bytes.get(index), Some(b'e' | b'E')) { + return index; + } + let mut cursor = index + 1; + if matches!(bytes.get(cursor), Some(b'+' | b'-')) { + cursor += 1; + } + if bytes.get(cursor).is_some_and(|byte| byte.is_ascii_digit()) { + consume_decimal_digits(bytes, cursor) + } else { + index + } + } + + fn skip_quoted_string(bytes: &[u8], mut index: usize) -> usize { + let quote = bytes[index]; + let triple = bytes.get(index + 1) == Some(&quote) && bytes.get(index + 2) == Some(&quote); + let quote_len = if triple { 3 } else { 1 }; + index += quote_len; + while index < bytes.len() { + if bytes[index] == b'\\' { + index = (index + 2).min(bytes.len()); + } else if triple + && bytes.get(index) == Some(&quote) + && bytes.get(index + 1) == Some(&quote) + && bytes.get(index + 2) == Some(&quote) + { + return index + 3; + } else if !triple && bytes[index] == quote { + return index + 1; + } else { + index += 1; + } + } + index + } + + fn emit_numeric_literal_warnings( + source: &str, + filename: &str, + vm: &VirtualMachine, + ) -> Result<(), CompileWarningError> { + let bytes = source.as_bytes(); + let mut index = 0; + while index < bytes.len() { + match bytes[index] { + b'#' => { + while index < bytes.len() && bytes[index] != b'\n' { + index += 1; + } + } + b'\'' | b'"' => { + index = skip_quoted_string(bytes, index); + } + byte if byte >= 0x80 || byte == b'_' || byte.is_ascii_alphabetic() => { + index += 1; + while index < bytes.len() + && (bytes[index] >= 0x80 || is_ascii_identifier_char(bytes[index])) + { + index += 1; + } + } + b'.' | b'0'..=b'9' => { + let Some((kind, end)) = number_literal_end(bytes, index) else { + index += 1; + continue; + }; + if end > index && numeric_keyword_suffix(&bytes[end..]) { + warn_syntax_at_offset( + source, + filename, + index, + format!("invalid {kind} literal"), + vm, + )?; + } + index = end.max(index + 1); + } + _ => index += 1, + } + } + Ok(()) } struct EscapeWarningVisitor<'a> { source: &'a str, filename: &'a str, vm: &'a VirtualMachine, + error: Option<CompileWarningError>, } impl<'a> EscapeWarningVisitor<'a> { + fn record_warning(&mut self, result: Result<(), CompileWarningError>) { + if self.error.is_none() + && let Err(err) = result + { + self.error = Some(err); + } + } + /// Check a quoted string/bytes literal for invalid escapes. /// The range must include the prefix and quote delimiters. - fn check_quoted_literal(&self, range: TextRange, is_bytes: bool) { + fn check_quoted_literal(&mut self, range: TextRange, is_bytes: bool) { if let Some((start, end)) = content_bounds(self.source, range) && let Some((ch, offset)) = first_invalid_escape(self.source, start, end, is_bytes) { - warn_invalid_escape_sequence(self.source, ch, offset, self.filename, self.vm); + let result = + warn_invalid_escape_sequence(self.source, ch, offset, self.filename, self.vm); + self.record_warning(result); } } @@ -224,14 +898,16 @@ mod escape_warnings { /// Also handles `\{` / `\}` at the literal–interpolation boundary, /// equivalent to `_PyTokenizer_warn_invalid_escape_sequence` handling /// `FSTRING_MIDDLE` / `FSTRING_END` tokens. - fn check_fstring_literal(&self, range: TextRange) { + fn check_fstring_literal(&mut self, range: TextRange) { let start = range.start().to_usize(); let end = range.end().to_usize(); if start >= end || end > self.source.len() { return; } if let Some((ch, offset)) = first_invalid_escape(self.source, start, end, false) { - warn_invalid_escape_sequence(self.source, ch, offset, self.filename, self.vm); + let result = + warn_invalid_escape_sequence(self.source, ch, offset, self.filename, self.vm); + self.record_warning(result); return; } // In CPython, _PyTokenizer_warn_invalid_escape_sequence handles @@ -249,13 +925,14 @@ mod escape_warnings { && let Some(&after) = self.source.as_bytes().get(end) && (after == b'{' || after == b'}') { - warn_invalid_escape_sequence( + let result = warn_invalid_escape_sequence( self.source, after as char, end - 1, self.filename, self.vm, ); + self.record_warning(result); } } @@ -263,6 +940,9 @@ mod escape_warnings { /// interpolation expressions and format specs. fn visit_fstring_elements(&mut self, elements: &'a ast::InterpolatedStringElements) { for element in elements { + if self.error.is_some() { + return; + } match element { ast::InterpolatedStringElement::Literal(lit) => { self.check_fstring_literal(lit.range); @@ -280,6 +960,9 @@ mod escape_warnings { impl<'a> Visitor<'a> for EscapeWarningVisitor<'a> { fn visit_expr(&mut self, expr: &'a ast::Expr) { + if self.error.is_some() { + return; + } match expr { // Regular string literals — decode_unicode_with_escapes path ast::Expr::StringLiteral(string) => { @@ -334,21 +1017,36 @@ mod escape_warnings { } impl VirtualMachine { + /// Emit tokenizer-level SyntaxWarnings raised before + /// code generation. + pub(super) fn emit_tokenizer_syntax_warnings( + &self, + source: &str, + filename: &str, + ) -> Result<(), CompileWarningError> { + emit_numeric_literal_warnings(source, filename, self) + } + /// Walk all string literals in `source` and emit `SyntaxWarning` for /// each that contains an invalid escape sequence. - pub(super) fn emit_string_escape_warnings(&self, source: &str, filename: &str) { + pub(super) fn emit_string_escape_warnings( + &self, + source: &str, + filename: &str, + ) -> Result<(), CompileWarningError> { let Ok(parsed) = ruff_python_parser::parse(source, ruff_python_parser::Mode::Module.into()) else { - return; + return Ok(()); }; let ast = parsed.into_syntax(); let mut visitor = EscapeWarningVisitor { source, filename, vm: self, + error: None, }; - match ast { + match &ast { ast::Mod::Module(module) => { for stmt in &module.body { visitor.visit_stmt(stmt); @@ -358,6 +1056,227 @@ mod escape_warnings { visitor.visit_expr(&expr.body); } } + visitor.error.map_or(Ok(()), Err) + } + } + + #[cfg(test)] + mod tests { + use super::*; + use crate::{Interpreter, builtins::PyTuple}; + + fn install_syntax_warning_error_filter(vm: &VirtualMachine) { + let error_filter = PyTuple::new_ref( + vec![ + vm.ctx.new_str("error").into(), + vm.ctx.none(), + vm.ctx.exceptions.syntax_warning.as_object().to_owned(), + vm.ctx.none(), + vm.ctx.new_int(0).into(), + ], + &vm.ctx, + ); + vm.state + .warnings + .filters + .borrow_vec_mut() + .insert(0, error_filter.into()); + vm.state.warnings.filters_mutated(); + } + + fn first_compiler_warning(source: &str) -> String { + Interpreter::without_stdlib(Default::default()).enter(|vm| { + install_syntax_warning_error_filter(vm); + let err = vm + .compile(source, compiler::Mode::Exec, "<test>") + .expect_err("expected compiler SyntaxWarning"); + let exception = err.into_pyexception(vm, Some(source)); + exception + .as_object() + .str(vm) + .expect("warning message should stringify") + .as_wtf8() + .to_string() + }) + } + + fn compile_error_message(source: &str) -> String { + Interpreter::without_stdlib(Default::default()).enter(|vm| { + install_syntax_warning_error_filter(vm); + let err = match vm.compile(source, compiler::Mode::Exec, "<test>") { + Ok(_) => panic!("expected compile error"), + Err(err) => err, + }; + err.into_pyexception(vm, Some(source)) + .as_object() + .str(vm) + .expect("compile error should stringify") + .as_wtf8() + .to_string() + }) + } + + #[test] + fn codegen_caller_warning_precedes_later_return_error() { + let message = compile_error_message("(1)()\nreturn\n"); + assert!( + message.contains("'int' object is not callable"), + "expected caller SyntaxWarning first, got {message:?}" + ); + } + + #[test] + fn symboltable_error_still_precedes_codegen_caller_warning() { + let message = compile_error_message("(1)()\ndef f():\n from x import *\n"); + assert!( + message.contains("import * only allowed at module level"), + "expected symboltable error first, got {message:?}" + ); + } + + #[test] + fn codegen_compare_warning_precedes_later_return_error() { + let message = compile_error_message("1 is 1\nreturn\n"); + assert!( + message.contains("\"is\" with 'int' literal"), + "expected compare SyntaxWarning first, got {message:?}" + ); + } + + #[test] + fn codegen_assert_warning_precedes_later_return_error() { + let message = compile_error_message("assert (1,)\nreturn\n"); + assert!( + message.contains("assertion is always true"), + "expected assert SyntaxWarning first, got {message:?}" + ); + } + + #[test] + fn codegen_subscript_warning_precedes_later_return_error() { + let message = compile_error_message("(1)[None]\nreturn\n"); + assert!( + message.contains("'int' object is not subscriptable"), + "expected subscript SyntaxWarning first, got {message:?}" + ); + } + + #[test] + fn codegen_index_warning_precedes_later_return_error() { + let message = compile_error_message("'x'[None]\nreturn\n"); + assert!( + message.contains("str indices must be integers or slices, not NoneType"), + "expected index SyntaxWarning first, got {message:?}" + ); + } + + #[test] + fn string_escape_warning_precedes_later_return_error() { + let message = compile_error_message("\"\\z\"\nreturn\n"); + assert!( + message.contains("\"\\z\" is an invalid escape sequence"), + "expected invalid escape SyntaxWarning first, got {message:?}" + ); + } + + #[test] + fn string_escape_warning_precedes_later_symboltable_error() { + let message = compile_error_message("\"\\z\"\ndef f():\n from x import *\n"); + assert!( + message.contains("\"\\z\" is an invalid escape sequence"), + "expected invalid escape SyntaxWarning first, got {message:?}" + ); + } + + #[test] + fn ast_preprocess_finally_warning_precedes_later_return_error() { + let message = compile_error_message("try:\n pass\nfinally:\n return\nreturn\n"); + assert!( + message.contains("'return' in a 'finally' block"), + "expected finally SyntaxWarning first, got {message:?}" + ); + } + + #[test] + fn ast_preprocess_finally_warning_precedes_symboltable_error() { + let message = compile_error_message( + "def f():\n from x import *\ntry:\n pass\nfinally:\n return\n", + ); + assert!( + message.contains("'return' in a 'finally' block"), + "expected finally SyntaxWarning first, got {message:?}" + ); + } + + #[test] + fn compiler_warning_visits_function_decorators_before_defaults_and_body() { + let message = first_compiler_warning( + r#" +@(b"decorator")() +def f(x=(1)()): + assert (1,) +"#, + ); + assert!( + message.contains("'bytes' object is not callable"), + "expected decorator warning first, got {message:?}" + ); + } + + #[test] + fn compiler_warning_visits_function_defaults_before_annotations() { + let message = first_compiler_warning( + r#" +def f(x: (1)() = ("default")()): + pass +"#, + ); + assert!( + message.contains("'str' object is not callable"), + "expected default warning before annotation warning, got {message:?}" + ); + } + + #[test] + fn compiler_warning_visits_class_decorators_before_body_and_bases() { + let message = first_compiler_warning( + r#" +@(b"decorator")() +class C((1)()): + assert (1,) +"#, + ); + assert!( + message.contains("'bytes' object is not callable"), + "expected class decorator warning first, got {message:?}" + ); + } + + #[test] + fn compiler_warning_visits_class_body_before_bases() { + let message = first_compiler_warning( + r#" +class C((1)()): + assert (1,) +"#, + ); + assert!( + message.contains("assertion is always true"), + "expected class body warning before base warning, got {message:?}" + ); + } + + #[test] + fn compiler_warning_visits_type_alias_type_params_before_value() { + let message = first_compiler_warning( + r#" +type Alias[T: (1)()] = ("value")() +"#, + ); + assert!( + message.contains("'int' object is not callable"), + "expected type parameter warning before alias value warning, got {message:?}" + ); } } } diff --git a/crates/vm/src/vm/compile_mode.rs b/crates/vm/src/vm/compile_mode.rs new file mode 100644 index 000000000..9885ba2e1 --- /dev/null +++ b/crates/vm/src/vm/compile_mode.rs @@ -0,0 +1,83 @@ +use crate::bytecode; + +pub(crate) const PY_SINGLE_INPUT: i32 = 256; +pub(crate) const PY_FILE_INPUT: i32 = 257; +pub(crate) const PY_EVAL_INPUT: i32 = 258; +pub(crate) const PY_FUNC_TYPE_INPUT: i32 = 345; + +bitflags::bitflags! { + /// `PyCF_*` compiler flags together with the `__future__` `CO_FUTURE_*` + /// bits, mirroring `PyCompilerFlags.cf_flags`. + /// + /// Caveat emptor: these flags are undocumented on purpose and depending on + /// their effect outside the standard library is **unsupported**. + #[derive(Copy, Clone, Debug, PartialEq, Eq)] + pub(crate) struct CompilerFlags: i32 { + const SOURCE_IS_UTF8 = 0x0100; + const DONT_IMPLY_DEDENT = 0x0200; + const ONLY_AST = 0x0400; + const IGNORE_COOKIE = 0x0800; + const TYPE_COMMENTS = 0x1000; + const ALLOW_TOP_LEVEL_AWAIT = 0x2000; + const ALLOW_INCOMPLETE_INPUT = 0x4000; + const OPTIMIZED_AST = 0x8000 | Self::ONLY_AST.bits(); + + // __future__ flags - sync with Lib/__future__.py and Include/cpython/compile.h. + const NESTED = 0x0010; + const FUTURE_DIVISION = 0x20000; + const FUTURE_ABSOLUTE_IMPORT = 0x40000; + const FUTURE_WITH_STATEMENT = 0x80000; + const FUTURE_PRINT_FUNCTION = 0x100000; + const FUTURE_UNICODE_LITERALS = 0x200000; + const FUTURE_BARRY_AS_BDFL = 0x400000; + const FUTURE_GENERATOR_STOP = 0x800000; + const FUTURE_ANNOTATIONS = 0x1000000; + } +} + +impl CompilerFlags { + const FUTURE_MASK: Self = Self::FUTURE_DIVISION + .union(Self::FUTURE_ABSOLUTE_IMPORT) + .union(Self::FUTURE_WITH_STATEMENT) + .union(Self::FUTURE_PRINT_FUNCTION) + .union(Self::FUTURE_UNICODE_LITERALS) + .union(Self::FUTURE_BARRY_AS_BDFL) + .union(Self::FUTURE_GENERATOR_STOP) + .union(Self::FUTURE_ANNOTATIONS); + const MASK_OBSOLETE: Self = Self::NESTED; + const COMPILE_MASK: Self = Self::ONLY_AST + .union(Self::ALLOW_TOP_LEVEL_AWAIT) + .union(Self::TYPE_COMMENTS) + .union(Self::DONT_IMPLY_DEDENT) + .union(Self::ALLOW_INCOMPLETE_INPUT) + .union(Self::OPTIMIZED_AST); + pub(crate) const ALLOWED_FLAGS: Self = Self::FUTURE_MASK + .union(Self::MASK_OBSOLETE) + .union(Self::COMPILE_MASK); +} + +// Python-visible `ast.PyCF_*` attribute values. The flags cross the +// `compile()` boundary as a plain `int`, so the exposed surface stays `i32`. +pub(crate) const PY_CF_SOURCE_IS_UTF8: i32 = CompilerFlags::SOURCE_IS_UTF8.bits(); +pub(crate) const PY_CF_DONT_IMPLY_DEDENT: i32 = CompilerFlags::DONT_IMPLY_DEDENT.bits(); +pub(crate) const PY_CF_ONLY_AST: i32 = CompilerFlags::ONLY_AST.bits(); +pub(crate) const PY_CF_IGNORE_COOKIE: i32 = CompilerFlags::IGNORE_COOKIE.bits(); +pub(crate) const PY_CF_TYPE_COMMENTS: i32 = CompilerFlags::TYPE_COMMENTS.bits(); +pub(crate) const PY_CF_ALLOW_TOP_LEVEL_AWAIT: i32 = CompilerFlags::ALLOW_TOP_LEVEL_AWAIT.bits(); +pub(crate) const PY_CF_ALLOW_INCOMPLETE_INPUT: i32 = CompilerFlags::ALLOW_INCOMPLETE_INPUT.bits(); +pub(crate) const PY_CF_OPTIMIZED_AST: i32 = CompilerFlags::OPTIMIZED_AST.bits(); + +pub(crate) fn compile_future_feature_mask() -> bytecode::CodeFlags { + // RustPython accepts barry_as_FLUFL but leaves its parser mode disabled. + bytecode::CodeFlags::FUTURE_DIVISION + | bytecode::CodeFlags::FUTURE_ABSOLUTE_IMPORT + | bytecode::CodeFlags::FUTURE_WITH_STATEMENT + | bytecode::CodeFlags::FUTURE_PRINT_FUNCTION + | bytecode::CodeFlags::FUTURE_UNICODE_LITERALS + | bytecode::CodeFlags::FUTURE_GENERATOR_STOP + | bytecode::CodeFlags::FUTURE_ANNOTATIONS +} + +pub(crate) fn compile_future_features_from_flags(flags: i32) -> bytecode::CodeFlags { + bytecode::CodeFlags::from_bits_truncate(flags as u32 & compile_future_feature_mask().bits()) +} diff --git a/crates/vm/src/vm/interpreter.rs b/crates/vm/src/vm/interpreter.rs index 79e3e190a..56c9606f7 100644 --- a/crates/vm/src/vm/interpreter.rs +++ b/crates/vm/src/vm/interpreter.rs @@ -300,8 +300,10 @@ impl Default for InterpreterBuilder { /// let scope = vm.new_scope_with_builtins(); /// let source = r#"print("Hello World!")"#; /// let code_obj = vm.compile( -/// source, Mode::Exec, "<embedded>" -/// ).map_err(|err| vm.new_syntax_error(&err, Some(source))).unwrap(); +/// source, +/// Mode::Exec, +/// "<embedded>", +/// ).map_err(|err| err.into_pyexception(vm, Some(source))).unwrap(); /// vm.run_code_obj(code_obj, scope).unwrap(); /// }); /// ``` diff --git a/crates/vm/src/vm/mod.rs b/crates/vm/src/vm/mod.rs index eb6546c02..32a2906fa 100644 --- a/crates/vm/src/vm/mod.rs +++ b/crates/vm/src/vm/mod.rs @@ -5,6 +5,9 @@ #[cfg(feature = "rustpython-compiler")] mod compile; +pub(crate) mod compile_mode; +#[cfg(feature = "rustpython-compiler")] +pub use compile::VmCompileError; mod context; mod interpreter; mod method; @@ -82,6 +85,7 @@ pub struct VirtualMachine { pub profile_func: RefCell<PyObjectRef>, pub trace_func: RefCell<PyObjectRef>, pub use_tracing: Cell<bool>, + tracing_depth: Cell<usize>, pub recursion_limit: Cell<usize>, pub(crate) signal_handlers: OnceCell<SignalHandlers>, pub(crate) signal_rx: Option<signal::UserSignalReceiver>, @@ -739,6 +743,7 @@ impl VirtualMachine { profile_func, trace_func, use_tracing: Cell::new(false), + tracing_depth: Cell::new(0), recursion_limit: Cell::new(if cfg!(debug_assertions) { 256 } else { 1000 }), signal_handlers, signal_rx: None, @@ -1095,30 +1100,22 @@ impl VirtualMachine { } pub fn run_code_obj(&self, code: PyRef<PyCode>, scope: Scope) -> PyResult { - use crate::builtins::{PyFunction, PyModule}; + self.run_code_obj_with_closure(code, scope, None) + } - // Create a function object for module code, similar to CPython's PyEval_EvalCode - let func = PyFunction::new(code.clone(), scope.globals.clone(), self)?; - let func_obj = func.into_ref(&self.ctx).into(); + pub(crate) fn run_code_obj_with_closure( + &self, + code: PyRef<PyCode>, + scope: Scope, + closure: Option<PyRef<crate::builtins::PyTuple<crate::builtins::function::PyCellRef>>>, + ) -> PyResult { + use crate::builtins::PyFunction; - // Extract builtins from globals["__builtins__"], like PyEval_EvalCode - let builtins = match scope - .globals - .get_item_opt(identifier!(self, __builtins__), self)? - { - Some(b) => { - if let Some(module) = b.downcast_ref::<PyModule>() { - module.dict().into() - } else { - b - } - } - None => self.builtins.dict().into(), - }; - - let frame = - Frame::new(code, scope, builtins, &[], Some(func_obj), false, self).into_ref(&self.ctx); - self.run_frame(frame) + // Create a function object for module code, similar to PyEval_EvalCode + let mut func = PyFunction::new(code, scope.globals.clone(), self)?; + func.closure = closure; + let func = func.into_ref(&self.ctx); + func.invoke_with_locals(FuncArgs::default(), scope.locals, self) } #[cold] @@ -1434,9 +1431,11 @@ impl VirtualMachine { } /// Stack margin bytes (like _PyOS_STACK_MARGIN_BYTES). - /// 2048 * sizeof(void*) = 16KB for 64-bit. + /// The margin is doubled for debug/sanitized builds because frame + /// evaluation consumes more native stack in those configurations. #[cfg_attr(any(miri, target_env = "musl"), allow(dead_code))] - const STACK_MARGIN_BYTES: usize = 2048 * core::mem::size_of::<usize>(); + const STACK_MARGIN_BYTES: usize = + (if cfg!(debug_assertions) { 4096 } else { 2048 }) * core::mem::size_of::<usize>(); /// Get the stack boundaries using platform-specific APIs. /// Returns (base, top) where base is the lowest address and top is the highest. @@ -1709,11 +1708,33 @@ impl VirtualMachine { #[cfg(feature = "rustpython-codegen")] pub fn compile_opts(&self) -> crate::compiler::CompileOpts { crate::compiler::CompileOpts { - optimize: self.state.config.settings.optimize, + optimize: self.state.config.settings.optimize.min(2), debug_ranges: self.state.config.settings.code_debug_ranges, + int_max_str_digits: self.state.int_max_str_digits.load(), + allow_top_level_await: false, + future_features: crate::bytecode::CodeFlags::empty(), + dont_imply_dedent: false, + recursion_limit: self.recursion_limit.get(), } } + #[inline] + pub(crate) fn enter_tracing(&self) { + self.tracing_depth.set(self.tracing_depth.get() + 1); + } + + #[inline] + pub(crate) fn leave_tracing(&self) { + let depth = self.tracing_depth.get(); + debug_assert!(depth > 0); + self.tracing_depth.set(depth.saturating_sub(1)); + } + + #[inline] + pub(crate) fn tracing_is_suppressed(&self) -> bool { + self.tracing_depth.get() != 0 + } + // To be called right before raising the recursion depth. fn check_recursive_call(&self, _where: &str) -> PyResult<()> { if self.recursion_depth.get() >= self.recursion_limit.get() { @@ -2286,7 +2307,7 @@ mod tests { let source = "from dir_module.dir_module_inner import value2"; let code_obj = vm .compile(source, vm::compiler::Mode::Exec, "<embedded>") - .map_err(|err| vm.new_syntax_error(&err, Some(source))) + .map_err(|err| err.into_pyexception(vm, Some(source))) .unwrap(); if let Err(e) = vm.run_code_obj(code_obj, scope) { diff --git a/crates/vm/src/vm/python_run.rs b/crates/vm/src/vm/python_run.rs index c21b437b5..91d5885e7 100644 --- a/crates/vm/src/vm/python_run.rs +++ b/crates/vm/src/vm/python_run.rs @@ -22,7 +22,7 @@ impl VirtualMachine { pub fn run_string(&self, scope: Scope, source: &str, source_path: &str) -> PyResult { let code_obj = self .compile(source, compiler::Mode::Exec, source_path) - .map_err(|err| self.new_syntax_error(&err, Some(source)))?; + .map_err(|err| err.into_pyexception(self, Some(source)))?; // linecache._register_code(code, source, filename) let _ = self.register_code_in_linecache(&code_obj, source); self.run_code_obj(code_obj, scope) @@ -47,7 +47,7 @@ impl VirtualMachine { pub fn run_block_expr(&self, scope: Scope, source: &str) -> PyResult { let code_obj = self .compile(source, compiler::Mode::BlockExpr, "<embedded>") - .map_err(|err| self.new_syntax_error(&err, Some(source)))?; + .map_err(|err| err.into_pyexception(self, Some(source)))?; self.run_code_obj(code_obj, scope) } } @@ -105,11 +105,19 @@ mod file_run { if path != "<stdin>" { set_main_loader(module_dict, path, "SourceFileLoader", self)?; } - match crate::host_env::fs::read_to_string(path) { - Ok(source) => { + match crate::host_env::fs::read(path) { + Ok(source_bytes) => { + if source_bytes.contains(&0) { + return Err(self.new_exception_msg( + self.ctx.exceptions.syntax_error.to_owned(), + "source code cannot contain null bytes".into(), + )); + } + let source = String::from_utf8(source_bytes) + .map_err(|err| self.new_os_error(err.to_string()))?; let code_obj = self .compile(&source, compiler::Mode::Exec, path) - .map_err(|err| self.new_syntax_error(&err, Some(&source)))?; + .map_err(|err| err.into_pyexception(self, Some(&source)))?; self.run_code_obj(code_obj, scope)?; } Err(err) => { diff --git a/crates/vm/src/vm/thread.rs b/crates/vm/src/vm/thread.rs index 26d8db9d7..5e73cc5f6 100644 --- a/crates/vm/src/vm/thread.rs +++ b/crates/vm/src/vm/thread.rs @@ -719,6 +719,7 @@ impl VirtualMachine { profile_func: RefCell::new(global_profile.unwrap_or_else(|| self.ctx.none())), trace_func: RefCell::new(global_trace.unwrap_or_else(|| self.ctx.none())), use_tracing: Cell::new(use_tracing), + tracing_depth: Cell::new(0), recursion_limit: self.recursion_limit.clone(), signal_handlers: core::cell::OnceCell::new(), signal_rx: None, diff --git a/crates/vm/src/vm/vm_new.rs b/crates/vm/src/vm/vm_new.rs index 4db965855..2c053bdf8 100644 --- a/crates/vm/src/vm/vm_new.rs +++ b/crates/vm/src/vm/vm_new.rs @@ -54,15 +54,6 @@ impl SyntaxErrorInfo { Self { msg, narrow_caret } } - fn with_msg(&mut self, msg: &str) { - self.msg = msg.into(); - } - - #[cfg(feature = "parser")] - const fn with_narrow_caret(&mut self, narrow_caret: bool) { - self.narrow_caret = narrow_caret; - } - #[cfg(feature = "parser")] #[must_use] const fn handle_expected_token(expected: TokenKind, found: TokenKind) -> &'static str { @@ -114,7 +105,7 @@ impl SyntaxErrorInfo { } ParseErrorType::InvalidStarredExpressionUsage => { - self.with_narrow_caret(true); + self.narrow_caret = true; "invalid syntax".into() } @@ -134,7 +125,7 @@ impl SyntaxErrorInfo { ParseErrorType::EmptyTypeParams => "Type parameter list cannot be empty".into(), ParseErrorType::InvalidStarPatternUsage => { - self.with_narrow_caret(true); + self.narrow_caret = true; "cannot use starred expression here".into() } @@ -179,12 +170,22 @@ impl SyntaxErrorInfo { | ParseErrorType::SimpleAndCompoundStatementOnSameLine | ParseErrorType::ExpectedExpression => "invalid syntax".into(), + ParseErrorType::OtherError(s) if s.starts_with("Expected an identifier") => { + "invalid syntax".into() + } + ParseErrorType::OtherError(s) - if s.starts_with("Expected an identifier, but found a keyword") => + if s.eq_ignore_ascii_case( + "Expected a type parameter or the end of the type parameter list", + ) => { "invalid syntax".into() } + ParseErrorType::OtherError(s) if s.eq_ignore_ascii_case("Expected a statement") => { + "invalid syntax".into() + } + ParseErrorType::OtherError(s) if s.eq_ignore_ascii_case( "bytes literal cannot be mixed with non-bytes literals", @@ -262,7 +263,7 @@ impl SyntaxErrorInfo { _ => return, }; - self.with_msg(&msg); + self.msg = msg; } } @@ -576,6 +577,16 @@ impl VirtualMachine { source: Option<&str>, allow_incomplete: bool, ) -> PyBaseExceptionRef { + if matches!( + error, + crate::compiler::CompileError::Codegen(crate::compiler::codegen::error::CodegenError { + error: crate::compiler::codegen::error::CodegenErrorType::RecursionError, + .. + }) + ) { + return self.new_recursion_error(error.to_string()); + } + let incomplete_or_syntax = |allow| -> &'static Py<crate::builtins::PyType> { if allow { self.ctx.exceptions.incomplete_input_error @@ -687,7 +698,9 @@ impl VirtualMachine { raw_location, .. }) => { - if s.starts_with("Expected an indented block after") { + if s.starts_with("Expected an indented block after") + || s.starts_with("expected an indented block after") + { if allow_incomplete { // Check that all chars in the error are whitespace, if so, the source is // incomplete. Otherwise, we've found code that might violates @@ -717,6 +730,12 @@ impl VirtualMachine { } else { self.ctx.exceptions.indentation_error } + } else if allow_incomplete + && source.is_some_and(|source| { + raw_location.end().to_usize() >= source.len() && !source.ends_with('\n') + }) + { + self.ctx.exceptions.incomplete_input_error } else { self.ctx.exceptions.syntax_error } @@ -738,7 +757,29 @@ impl VirtualMachine { let statement = source.and_then(|src| get_statement(src, error.location())); let mut msg = error.to_string(); - if let Some(msg) = msg.get_mut(..1) { + if !msg.starts_with("Exceeds the limit ") + && !msg.starts_with("Did you mean ") + && !msg.starts_with("Invalid star expression") + && !msg.starts_with("Function parameters cannot be parenthesized") + && !msg.starts_with("Lambda expression parameters cannot be parenthesized") + && !msg.starts_with("Cannot have two type comments on def") + && !msg.starts_with("Variable annotation syntax is") + && !msg.starts_with("The '@' operator is") + && !msg.starts_with("Async functions are") + && !msg.starts_with("Async comprehensions are") + && !msg.starts_with("Async for loops are") + && !msg.starts_with("Async with statements are") + && !msg.starts_with("Exception groups are") + && !msg.starts_with("Positional-only parameters are") + && !msg.starts_with("Pattern matching is") + && !msg.starts_with("Type statement is") + && !msg.starts_with("Type parameter lists are") + && !msg.starts_with("Type parameter defaults are") + && !msg.starts_with("Assignment expressions are") + && !msg.starts_with("Await expressions are") + && !msg.starts_with("Underscores in numeric literals are") + && let Some(msg) = msg.get_mut(..1) + { msg.make_ascii_lowercase(); } @@ -753,17 +794,26 @@ impl VirtualMachine { }; if syntax_error_type.is(self.ctx.exceptions.tab_error) { - syntax_error_info.with_msg("inconsistent use of tabs and spaces in indentation"); + syntax_error_info.msg = "inconsistent use of tabs and spaces in indentation".to_owned(); + } + if syntax_error_type.is(self.ctx.exceptions.incomplete_input_error) { + syntax_error_info.msg = "incomplete input".to_owned(); } let SyntaxErrorInfo { msg, narrow_caret } = syntax_error_info; + let check_version_suite_error = msg.starts_with("Async functions are") + || msg.starts_with("Async for loops are") + || msg.starts_with("Async with statements are") + || msg.starts_with("Exception groups are") + || msg.starts_with("except expressions without parentheses are") + || msg.starts_with("Pattern matching is"); + let line_end_binary_operator_error = msg.starts_with("The '@' operator is"); let syntax_error = self.new_exception_msg(syntax_error_type, msg.into()); - let (lineno, offset) = error.python_location(); - let lineno = self.ctx.new_int(lineno); - let offset = self.ctx.new_int(offset); - + let (lineno_raw, offset_raw) = error.python_location(); + let lineno = self.ctx.new_int(lineno_raw); + let offset = self.ctx.new_int(offset_raw); set_attrs!( syntax_error.as_object(), self, unwrap, "lineno" => lineno, @@ -772,15 +822,23 @@ impl VirtualMachine { // Set end_lineno and end_offset if available if let Some((end_lineno, end_offset)) = error.python_end_location() { - let (end_lineno, end_offset) = if narrow_caret { + let (end_lineno, end_offset) = if check_version_suite_error + && statement + .as_deref() + .and_then(|line| line.chars().next()) + .is_some_and(|ch| ch.is_ascii_whitespace()) + { + (end_lineno, -1) + } else if line_end_binary_operator_error && end_offset == offset_raw { + (end_lineno, (end_offset + 1) as isize) + } else if narrow_caret { let (l, o) = error.python_location(); - (l, o + 1) + (l, (o + 1) as isize) } else { - (end_lineno, end_offset) + (end_lineno, end_offset as isize) }; let end_lineno = self.ctx.new_int(end_lineno); let end_offset = self.ctx.new_int(end_offset); - set_attrs!( syntax_error.as_object(), self, unwrap, "end_lineno" => end_lineno, diff --git a/crates/wasm/Cargo.toml b/crates/wasm/Cargo.toml index 4150beaa8..5a5e8d77f 100644 --- a/crates/wasm/Cargo.toml +++ b/crates/wasm/Cargo.toml @@ -20,6 +20,7 @@ no-start-func = [] rustpython-common = { workspace = true } rustpython-pylib = { workspace = true, optional = true } rustpython-stdlib = { workspace = true, default-features = false, optional = true } +ruff_text_size = { workspace = true } # make sure no threading! otherwise wasm build will fail rustpython-vm = { workspace = true, features = ["compiler", "encodings", "serde", "wasmbind"] } diff --git a/crates/wasm/src/lib.rs b/crates/wasm/src/lib.rs index 99668df28..ae4e52f21 100644 --- a/crates/wasm/src/lib.rs +++ b/crates/wasm/src/lib.rs @@ -70,7 +70,11 @@ pub mod eval { if let Some(js_vars) = js_vars { vm.add_to_scope("js_vars".into(), js_vars.into())?; } - vm.run(source, mode, None) + if matches!(mode, Mode::Single) { + vm.exec_single(source, None) + } else { + vm.run(source, mode, None) + } } /// Evaluate Python code diff --git a/crates/wasm/src/vm_class.rs b/crates/wasm/src/vm_class.rs index 08cb49ecf..cd0af10f6 100644 --- a/crates/wasm/src/vm_class.rs +++ b/crates/wasm/src/vm_class.rs @@ -6,9 +6,14 @@ use crate::{ use alloc::rc::{Rc, Weak}; use core::cell::RefCell; use js_sys::{Object, TypeError}; +use ruff_text_size::Ranged; use rustpython_vm::{ - Interpreter, PyObjectRef, PyRef, PyResult, Settings, VirtualMachine, builtins::PyWeak, - compiler::Mode, function::ArgMapping, scope::Scope, + Interpreter, PyObjectRef, PyRef, PyResult, Settings, VirtualMachine, + builtins::PyWeak, + compiler::{self, Mode}, + function::ArgMapping, + scope::Scope, + vm::VmCompileError, }; use std::collections::HashMap; use wasm_bindgen::prelude::*; @@ -21,6 +26,25 @@ pub(crate) struct StoredVirtualMachine { held_objects: RefCell<Vec<PyObjectRef>>, } +fn compile_err_to_js(vm: &VirtualMachine, err: VmCompileError) -> JsValue { + match err { + VmCompileError::Compile(err) => convert::syntax_err(err).into(), + err => convert::py_err_to_js_err(vm, &err.into_pyexception(vm, None)), + } +} + +fn statement_chunks(source: &str) -> Option<Vec<&str>> { + let module = compiler::parser::parse_module(source).ok()?.into_syntax(); + module + .body + .iter() + .map(|stmt| { + let range = stmt.range(); + source.get(range.start().to_usize()..range.end().to_usize()) + }) + .collect() +} + #[pymodule] mod _window { use super::{js_module, wasm_builtins}; @@ -263,8 +287,8 @@ impl WASMVirtualMachine { ) -> Result<(), JsValue> { self.with_vm(|vm, _| { let code = vm - .compile(source, Mode::Exec, &name) - .map_err(convert::syntax_err)?; + .compile(source, Mode::Exec, name.as_str()) + .map_err(|err| compile_err_to_js(vm, err))?; let attrs = vm.ctx.new_dict(); attrs .set_item("__name__", vm.new_pyobj(name.as_str()), vm) @@ -327,13 +351,46 @@ impl WASMVirtualMachine { ) -> Result<JsValue, JsValue> { self.with_vm(|vm, StoredVirtualMachine { scope, .. }| { let source_path = source_path.unwrap_or_else(|| "<wasm>".to_owned()); - let code = vm.compile(source, mode, &source_path); - let code = code.map_err(convert::syntax_err)?; + let code = vm.compile(source, mode, source_path.as_str()); + let code = code.map_err(|err| compile_err_to_js(vm, err))?; let result = vm.run_code_obj(code, scope.clone()); convert::pyresult_to_js_result(vm, result) })? } + pub(crate) fn run_single( + &self, + source: &str, + source_path: Option<String>, + ) -> Result<JsValue, JsValue> { + self.with_vm(|vm, StoredVirtualMachine { scope, .. }| { + let source_path = source_path.unwrap_or_else(|| "<wasm>".to_owned()); + let Some(chunks) = statement_chunks(source) else { + let code = vm.compile(source, Mode::Single, source_path.as_str()); + let code = code.map_err(|err| compile_err_to_js(vm, err))?; + let result = vm.run_code_obj(code, scope.clone()); + return convert::pyresult_to_js_result(vm, result); + }; + + if chunks.is_empty() { + return Ok(convert::py_to_js(vm, vm.ctx.none())); + } + + let displayhook = vm + .sys_module + .get_attr("displayhook", vm) + .map_err(|_| TypeError::new("lost sys.displayhook"))?; + let mut result = vm.ctx.none(); + for chunk in chunks { + let code = vm.compile(chunk, Mode::BlockExpr, source_path.as_str()); + let code = code.map_err(|err| compile_err_to_js(vm, err))?; + result = vm.run_code_obj(code, scope.clone()).into_js(vm)?; + displayhook.call((result.clone(),), vm).into_js(vm)?; + } + Ok(convert::py_to_js(vm, result)) + })? + } + pub fn exec(&self, source: &str, source_path: Option<String>) -> Result<JsValue, JsValue> { self.run(source, Mode::Exec, source_path) } @@ -348,6 +405,6 @@ impl WASMVirtualMachine { source: &str, source_path: Option<String>, ) -> Result<JsValue, JsValue> { - self.run(source, Mode::Single, source_path) + self.run_single(source, source_path) } } diff --git a/examples/hello_embed.rs b/examples/hello_embed.rs index 9e1cdb829..ae56ed21b 100644 --- a/examples/hello_embed.rs +++ b/examples/hello_embed.rs @@ -6,7 +6,7 @@ fn main() -> vm::PyResult<()> { let source = r#"print("Hello World!")"#; let code_obj = vm .compile(source, vm::compiler::Mode::Exec, "<embedded>") - .map_err(|err| vm.new_syntax_error(&err, Some(source)))?; + .map_err(|err| err.into_pyexception(vm, Some(source)))?; vm.run_code_obj(code_obj, scope)?; diff --git a/examples/mini_repl.rs b/examples/mini_repl.rs index 40d111732..edbd6e149 100644 --- a/examples/mini_repl.rs +++ b/examples/mini_repl.rs @@ -66,7 +66,7 @@ def fib(n): // (note that this is only the case when compiler::Mode::Single is passed to vm.compile) match vm .compile(&input, vm::compiler::Mode::Single, "<embedded>") - .map_err(|err| vm.new_syntax_error(&err, Some(&input))) + .map_err(|err| err.into_pyexception(vm, Some(&input))) .and_then(|code_obj| vm.run_code_obj(code_obj, scope.clone())) { Ok(output) => { diff --git a/examples/parse_folder.rs b/examples/parse_folder.rs index 440bcdb9b..7ece0c740 100644 --- a/examples/parse_folder.rs +++ b/examples/parse_folder.rs @@ -131,4 +131,4 @@ struct ParsedFile { result: ParseResult, } -type ParseResult = Result<Vec<ast::Stmt>, String>; +type ParseResult = Result<ast::Suite, String>; diff --git a/extra_tests/snippets/builtin_compile.py b/extra_tests/snippets/builtin_compile.py index 15095c0ee..49295bf26 100644 --- a/extra_tests/snippets/builtin_compile.py +++ b/extra_tests/snippets/builtin_compile.py @@ -1,3 +1,8 @@ +import __future__ + +import ast +import sys + from testutils import assert_raises # compile() basic mode acceptance @@ -43,4 +48,100 @@ def _check_flags_error(flags): _check_flags_error(99999) +_check_flags_error(0x100) +_check_flags_error(0x800) _check_flags_error(0x10000) + + +ns = {} +exec( + "from __future__ import annotations\n" + "inherited = compile('x: __debug__\\n', '<test>', 'exec')\n" + "not_inherited = compile('x: __debug__\\n', '<test>', 'exec', dont_inherit=True)\n", + ns, +) +assert ns["inherited"].co_flags & 0x1000000 +assert not (ns["not_inherited"].co_flags & 0x1000000) + +barry_flag = __future__.barry_as_FLUFL.compiler_flag +barry_code = compile("x = 1", "<test>", "exec", flags=barry_flag) +compile("from __future__ import barry_as_FLUFL\nx = 1\n", "<test>", "exec") +if sys.implementation.name == "rustpython": + assert not (barry_code.co_flags & barry_flag) + +n = ast.parse('x = "# type: int"\n', type_comments=True) +assert n.body[0].type_comment is None +n = ast.parse("x = '# type: int'\n", type_comments=True) +assert n.body[0].type_comment is None +n = ast.parse('x = "abc" # type: str\n', type_comments=True) +assert n.body[0].type_comment == "str" +n = ast.parse("x = 1 # type: ignore[excuse]\n", type_comments=True) +assert [(ti.lineno, ti.tag) for ti in n.type_ignores] == [(1, "[excuse]")] + + +compile("() -> int", "<test>", "func_type", flags=ast.PyCF_ONLY_AST) +func_type_tree = compile( + '("a,b", str) -> int', "<test>", "func_type", flags=ast.PyCF_ONLY_AST +) +assert len(func_type_tree.argtypes) == 2 +assert func_type_tree.argtypes[0].value == "a,b" +func_type_tree = compile( + "(int, *str, **Any) -> float", + "<test>", + "func_type", + flags=ast.PyCF_ONLY_AST, +) +assert [arg.id for arg in func_type_tree.argtypes] == ["int", "str", "Any"] +assert_raises( + SyntaxError, + compile, + "int -> str", + "<test>", + "func_type", + flags=ast.PyCF_ONLY_AST, +) +assert_raises( + SyntaxError, + compile, + "(x=1) -> str", + "<test>", + "func_type", + flags=ast.PyCF_ONLY_AST, +) +assert_raises( + SyntaxError, + compile, + "(int,) -> str", + "<test>", + "func_type", + flags=ast.PyCF_ONLY_AST, +) +PY_CF_DONT_IMPLY_DEDENT = 0x0200 +PY_CF_ALLOW_INCOMPLETE_INPUT = 0x4000 +compile(b"# coding: latin-1\nx = '\xe9'\n", "<test>", "exec") +compile("if 1:\n pass", "<test>", "single") +assert_raises( + SyntaxError, + compile, + "if 1:\n pass", + "<test>", + "single", + flags=PY_CF_DONT_IMPLY_DEDENT, +) +compile( + "if 1:\n pass\n", + "<test>", + "single", + flags=PY_CF_DONT_IMPLY_DEDENT | PY_CF_ALLOW_INCOMPLETE_INPUT, +) +try: + compile( + "if 1:\n pass", + "<test>", + "single", + flags=PY_CF_DONT_IMPLY_DEDENT | PY_CF_ALLOW_INCOMPLETE_INPUT, + ) +except _IncompleteInputError as exc: + assert exc.args[0] == "incomplete input", repr(exc) +else: + raise AssertionError("expected _IncompleteInputError") diff --git a/ruff.toml b/ruff.toml index 2ed67851f..7cfaafdb0 100644 --- a/ruff.toml +++ b/ruff.toml @@ -13,3 +13,6 @@ select = [ "F7", "F82", ] + +[lint.isort] +known-first-party = ["cpython", "opcodes", "utils"] diff --git a/src/shell.rs b/src/shell.rs index bc7ccec5c..7fb9336af 100644 --- a/src/shell.rs +++ b/src/shell.rs @@ -10,6 +10,7 @@ use rustpython_vm::{ compiler::{self}, readline::{Readline, ReadlineResult}, scope::Scope, + vm::VmCompileError, }; enum ShellExecResult { @@ -45,25 +46,25 @@ fn shell_exec( ShellExecResult::Ok } } - Err(CompileError::Parse(ParseError { + Err(VmCompileError::Compile(CompileError::Parse(ParseError { error: ParseErrorType::Lexical(LexicalErrorType::Eof), .. - })) => ShellExecResult::ContinueLine, - Err(CompileError::Parse(ParseError { + }))) => ShellExecResult::ContinueLine, + Err(VmCompileError::Compile(CompileError::Parse(ParseError { error: ParseErrorType::Lexical(LexicalErrorType::FStringError( InterpolatedStringErrorType::UnterminatedTripleQuotedString, )), .. - })) => ShellExecResult::ContinueLine, + }))) => ShellExecResult::ContinueLine, Err(err) => { // Check if the error is from an unclosed triple quoted string (which should always // continue) - if let CompileError::Parse(ParseError { + if let VmCompileError::Compile(CompileError::Parse(ParseError { error: ParseErrorType::Lexical(LexicalErrorType::UnclosedStringError), raw_location, .. - }) = err + })) = &err { let loc = raw_location.start().to_usize(); let mut iter = source.chars(); @@ -80,8 +81,8 @@ fn shell_exec( // since indentations errors on columns other than 0 should be ignored. // if its an unrecognized token for dedent, set to false - let bad_error = match err { - CompileError::Parse(ref p) => { + let bad_error = match &err { + VmCompileError::Compile(CompileError::Parse(p)) => { match &p.error { ParseErrorType::Lexical(LexicalErrorType::IndentationError) => { continuing_block @@ -97,7 +98,7 @@ fn shell_exec( // If we are handling an error on an empty line or an error worthy of throwing if empty_line_given || bad_error { - ShellExecResult::PyErr(vm.new_syntax_error(&err, Some(source))) + ShellExecResult::PyErr(err.into_pyexception(vm, Some(source))) } else { ShellExecResult::ContinueBlock } diff --git a/tools/opcode_metadata/generate_rs_opcode_metadata.py b/tools/opcode_metadata/generate_rs_opcode_metadata.py index df2476c5e..fd13e0266 100644 --- a/tools/opcode_metadata/generate_rs_opcode_metadata.py +++ b/tools/opcode_metadata/generate_rs_opcode_metadata.py @@ -11,6 +11,7 @@ import sys import typing import tomllib + from cpython import Analysis, get_analysis, get_stack_effect from opcodes import OpcodeInfo from utils import DEFAULT_INPUT, ROOT, get_conf, to_pascal_case From 8cb96ebcbb81377beecfa040cdb54e3e1afbc304 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Fri, 26 Jun 2026 12:23:54 +0300 Subject: [PATCH 152/339] Update `test_subprocess.py` to 3.14.6 (#8171) --- Lib/test/test_subprocess.py | 66 ++++++++++++++++++++++++++++++------- 1 file changed, 55 insertions(+), 11 deletions(-) diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py index 2ba98616e..f237508fb 100644 --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -22,6 +22,7 @@ import selectors import sysconfig import select import shutil +import socket import threading import gc import textwrap @@ -1044,19 +1045,49 @@ class ProcessTestCase(BaseTestCase): # On Windows, stdin writing must also honor the timeout rather than # blocking indefinitely when the pipe buffer fills. - # Input larger than typical pipe buffer (4-64KB on Windows) - input_data = b"x" * (128 * 1024) + input_data = b"x" * (128 * 1024) # > typical pipe buffer + + # Cross-platform wake mechanism: the slow reader connects to a + # loopback TCP socket and blocks in select() on it (capped at 9s + # as a safety net we don't expect to hit). After phase 1 raises + # TimeoutExpired, the parent sends a byte to release the child so + # it drains stdin. A socket (rather than a raw pipe) is required + # because Windows select() only supports sockets, not arbitrary + # file descriptors. + server = socket.create_server(('127.0.0.1', 0), backlog=1) + server.settimeout(10) # bound the accept() if the child fails to start + port = server.getsockname()[1] + # The child sends one byte (low byte of its PID) first so the parent + # can detect the rare case of an unrelated process on the same host + # connecting to our ephemeral port before our child does. A single + # byte gives 1/256 collision odds, which is plenty for flake-prevention. + slow_reader = ( + "import os, socket, sys, select; " + f"s = socket.create_connection(('127.0.0.1', {port}), timeout=9); " + "s.sendall(bytes([os.getpid() & 0xff])); " + "select.select([s], [], [], 9); " + "sys.stdout.buffer.write(sys.stdin.buffer.read())" + ) p = subprocess.Popen( - [sys.executable, "-c", - "import sys, time; " - "time.sleep(30); " # Don't read stdin for a long time - "sys.stdout.buffer.write(sys.stdin.buffer.read())"], + [sys.executable, "-c", slow_reader], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + conn = None try: + conn, _ = server.accept() + server.close() + server = None + + conn.settimeout(5) + peer_byte = conn.recv(1) + conn.settimeout(None) + self.assertEqual(peer_byte, bytes([p.pid & 0xff]), + f"loopback handshake byte {peer_byte!r} != " + f"low byte of child PID {p.pid} ({p.pid & 0xff:#x})") + timeout = 0.2 start = time.monotonic() try: @@ -1065,7 +1096,7 @@ class ProcessTestCase(BaseTestCase): elapsed = time.monotonic() - start self.fail( f"TimeoutExpired not raised. communicate() completed in " - f"{elapsed:.2f}s, but subprocess sleeps for 30s. " + f"{elapsed:.2f}s, but slow reader stalls for up to 9s. " "Stdin writing blocked without enforcing timeout.") except subprocess.TimeoutExpired: elapsed = time.monotonic() - start @@ -1073,11 +1104,16 @@ class ProcessTestCase(BaseTestCase): # Timeout should occur close to the specified timeout value, # not after waiting for the subprocess to finish sleeping. # Allow generous margin for slow CI, but must be well under - # the subprocess sleep time. + # the slow-reader's stall cap. self.assertLess(elapsed, 5.0, f"TimeoutExpired raised after {elapsed:.2f}s; expected ~{timeout}s. " "Stdin writing blocked without checking timeout.") + # Release the slow reader so it stops blocking and drains stdin. + conn.sendall(b'go') + conn.close() + conn = None + # After timeout, continue communication. The remaining input # should be sent and we should receive all data back. stdout, stderr = p.communicate() @@ -1087,6 +1123,10 @@ class ProcessTestCase(BaseTestCase): f"Expected {len(input_data)} bytes output but got {len(stdout)}") self.assertEqual(stdout, input_data) finally: + if conn is not None: + conn.close() + if server is not None: + server.close() p.kill() p.wait() @@ -3693,13 +3733,17 @@ class Win32ProcessTestCase(BaseTestCase): self.assertEqual(startupinfo.wShowWindow, subprocess.SW_HIDE) self.assertEqual(startupinfo.lpAttributeList, {"handle_list": []}) + # CREATE_NEW_CONSOLE creates a "popup" window. + @support.requires_resource('gui') def test_creationflags(self): # creationflags argument CREATE_NEW_CONSOLE = 16 sys.stderr.write(" a DOS box should flash briefly ...\n") - subprocess.call(sys.executable + - ' -c "import time; time.sleep(0.25)"', - creationflags=CREATE_NEW_CONSOLE) + rc = subprocess.call(sys.executable + + ' -c "import time; time.sleep(0.25)"', + creationflags=CREATE_NEW_CONSOLE) + support.skip_on_low_desktop_heap_memory_subprocess(rc) + self.assertEqual(rc, 0) def test_invalid_args(self): # invalid arguments should raise ValueError From 9c027d4f672a29a69099807f910514ccc638d653 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Fri, 26 Jun 2026 12:24:20 +0300 Subject: [PATCH 153/339] Update `test/signalinterproctester.py` to 3.14.6 (#8173) * Update `test/signalinterproctester.py` to 3.14.6 * Add `signalinterproctester.py` as a test dependency of `test_signal.py` --- Lib/test/signalinterproctester.py | 22 +++++++++++++++------- scripts/update_lib/deps.py | 6 ++++++ 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/Lib/test/signalinterproctester.py b/Lib/test/signalinterproctester.py index 168b5da0f..073c078f4 100644 --- a/Lib/test/signalinterproctester.py +++ b/Lib/test/signalinterproctester.py @@ -1,9 +1,11 @@ +import gc import os import signal import subprocess import sys import time import unittest +from test import support class SIGUSR1Exception(Exception): @@ -27,16 +29,15 @@ class InterProcessSignalTests(unittest.TestCase): # (if set) child.wait() - timeout = 10.0 - deadline = time.monotonic() + timeout - - while time.monotonic() < deadline: + start_time = time.monotonic() + for _ in support.busy_retry(support.SHORT_TIMEOUT, error=False): if self.got_signals[signame]: return signal.pause() - - self.fail('signal %s not received after %s seconds' - % (signame, timeout)) + else: + dt = time.monotonic() - start_time + self.fail('signal %s not received after %.1f seconds' + % (signame, dt)) def subprocess_send_signal(self, pid, signame): code = 'import os, signal; os.kill(%s, signal.%s)' % (pid, signame) @@ -59,6 +60,13 @@ class InterProcessSignalTests(unittest.TestCase): self.assertEqual(self.got_signals, {'SIGHUP': 1, 'SIGUSR1': 0, 'SIGALRM': 0}) + # gh-110033: Make sure that the subprocess.Popen is deleted before + # the next test which raises an exception. Otherwise, the exception + # may be raised when Popen.__del__() is executed and so be logged + # as "Exception ignored in: <function Popen.__del__ at ...>". + child = None + gc.collect() + with self.assertRaises(SIGUSR1Exception): with self.subprocess_send_signal(pid, "SIGUSR1") as child: self.wait_signal(child, 'SIGUSR1') diff --git a/scripts/update_lib/deps.py b/scripts/update_lib/deps.py index 72374aa6b..da49490c7 100644 --- a/scripts/update_lib/deps.py +++ b/scripts/update_lib/deps.py @@ -724,6 +724,12 @@ DEPENDENCIES = { "curses_tests.py", ], }, + "signal": { + "test": [ + "signalinterproctester.py", + "test_signal.py", + ] + }, } From 4421ac89a19929b463057b5448127da1dbf37775 Mon Sep 17 00:00:00 2001 From: Bas Schoenmaeckers <7943856+bschoenmaeckers@users.noreply.github.com> Date: Fri, 26 Jun 2026 13:42:01 +0200 Subject: [PATCH 154/339] Add more object c-api's (#8170) --- crates/capi/src/object.rs | 276 +++++++++++++++++++++++++++++++++----- crates/capi/src/util.rs | 8 ++ 2 files changed, 254 insertions(+), 30 deletions(-) diff --git a/crates/capi/src/object.rs b/crates/capi/src/object.rs index 5e601d381..d92e9977f 100644 --- a/crates/capi/src/object.rs +++ b/crates/capi/src/object.rs @@ -5,7 +5,8 @@ use core::ptr::NonNull; use rustpython_vm::builtins::{PyStr, PyType, object_generic_set_dict, object_get_dict}; use rustpython_vm::bytecode::ComparisonOperator; use rustpython_vm::function::PySetterValue; -use rustpython_vm::{AsObject, Py, PyPayload}; +use rustpython_vm::types::{PyComparisonOp, hash_not_implemented}; +use rustpython_vm::{AsObject, Py, PyPayload, PyResult, VirtualMachine}; pub type PyTypeObject = Py<PyType>; @@ -100,25 +101,27 @@ pub unsafe extern "C" fn PyType_GetFullyQualifiedName(ptr: *const PyTypeObject) }) } +#[inline] +fn get_constant(vm: &VirtualMachine, constant_id: c_uint) -> PyResult<&PyObject> { + let ctx = &vm.ctx; + match constant_id { + 0 => Ok(ctx.none.as_object()), + 1 => Ok(ctx.false_value.as_object()), + 2 => Ok(ctx.true_value.as_object()), + 3 => Ok(ctx.ellipsis.as_object()), + 4 => Ok(ctx.not_implemented.as_object()), + _ => Err(vm.new_system_error("Invalid constant ID passed to Py_GetConstantBorrowed")), + } +} + #[unsafe(no_mangle)] pub extern "C" fn Py_GetConstantBorrowed(constant_id: c_uint) -> *mut PyObject { - with_vm(|vm| { - let ctx = &vm.ctx; - let constant = match constant_id { - 0 => ctx.none.as_object(), - 1 => ctx.false_value.as_object(), - 2 => ctx.true_value.as_object(), - 3 => ctx.ellipsis.as_object(), - 4 => ctx.not_implemented.as_object(), - _ => { - return Err( - vm.new_system_error("Invalid constant ID passed to Py_GetConstantBorrowed") - ); - } - } - .as_raw(); - Ok(constant) - }) + with_vm(|vm| get_constant(vm, constant_id).map(PyObject::as_raw)) +} + +#[unsafe(no_mangle)] +pub extern "C" fn Py_GetConstant(constant_id: c_uint) -> *mut PyObject { + with_vm(|vm| get_constant(vm, constant_id).map(ToOwned::to_owned)) } #[unsafe(no_mangle)] @@ -143,12 +146,22 @@ pub unsafe extern "C" fn PyObject_GetAttrString( let name = unsafe { CStr::from_ptr(attr_name) .to_str() - .expect("attribute name must be valid UTF-8") + .map_err(|_| vm.new_value_error("attribute name must be valid UTF-8"))? }; obj.get_attr(name, vm) }) } +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyObject_ASCII(obj: *mut PyObject) -> *mut PyObject { + with_vm(|vm| unsafe { &*obj }.ascii(vm)) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyObject_Bytes(obj: *mut PyObject) -> *mut PyObject { + with_vm(|vm| unsafe { &*obj }.to_owned().bytes(vm)) +} + #[unsafe(no_mangle)] pub unsafe extern "C" fn PyObject_GetOptionalAttr( obj: *mut PyObject, @@ -172,6 +185,31 @@ pub unsafe extern "C" fn PyObject_GetOptionalAttr( }) } +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyObject_GetOptionalAttrString( + obj: *mut PyObject, + attr_name: *const c_char, + result: *mut *mut PyObject, +) -> c_int { + with_vm(|vm| { + unsafe { + *result = core::ptr::null_mut(); + } + let obj = unsafe { &*obj }; + let name = unsafe { CStr::from_ptr(attr_name) } + .to_str() + .map_err(|_| vm.new_value_error("attribute name must be valid UTF-8"))?; + if let Some(attr) = vm.get_attribute_opt(obj.to_owned(), name)? { + unsafe { + *result = attr.into_raw().as_ptr(); + } + Ok(true) + } else { + Ok(false) + } + }) +} + #[unsafe(no_mangle)] pub unsafe extern "C" fn PyObject_SetAttrString( obj: *mut PyObject, @@ -182,7 +220,7 @@ pub unsafe extern "C" fn PyObject_SetAttrString( let obj = unsafe { &*obj }; let name = unsafe { CStr::from_ptr(attr_name) } .to_str() - .expect("attribute name must be valid UTF-8"); + .map_err(|_| vm.new_value_error("attribute name must be valid UTF-8"))?; let value = unsafe { &*value }.to_owned(); obj.set_attr(name, value, vm) }) @@ -202,6 +240,46 @@ pub unsafe extern "C" fn PyObject_SetAttr( }) } +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyObject_DelAttr(obj: *mut PyObject, name: *mut PyObject) -> c_int { + with_vm(|vm| { + let obj = unsafe { &*obj }; + let name = unsafe { &*name }.try_downcast_ref::<PyStr>(vm)?; + obj.del_attr(name, vm) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyObject_DelAttrString( + obj: *mut PyObject, + attr_name: *const c_char, +) -> c_int { + with_vm(|vm| { + let obj = unsafe { &*obj }; + let name = unsafe { CStr::from_ptr(attr_name) } + .to_str() + .map_err(|_| vm.new_value_error("attribute name must be valid UTF-8"))?; + obj.del_attr(name, vm) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyObject_GenericSetAttr( + obj: *mut PyObject, + name: *mut PyObject, + value: *mut PyObject, +) -> c_int { + with_vm(|vm| { + let obj = unsafe { &*obj }; + let name = unsafe { &*name }.try_downcast_ref::<PyStr>(vm)?; + let value = match NonNull::new(value) { + Some(value) => PySetterValue::Assign(unsafe { value.as_ref() }.to_owned()), + None => PySetterValue::Delete, + }; + obj.generic_setattr(name, value, vm) + }) +} + #[unsafe(no_mangle)] pub unsafe extern "C" fn PyObject_HasAttrWithError( obj: *mut PyObject, @@ -214,6 +292,63 @@ pub unsafe extern "C" fn PyObject_HasAttrWithError( }) } +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyObject_HasAttr(obj: *mut PyObject, attr_name: *mut PyObject) -> c_int { + with_vm(|vm| { + let obj = unsafe { &*obj }; + let name = match unsafe { &*attr_name }.try_downcast_ref::<PyStr>(vm) { + Ok(name) => name, + Err(err) => { + vm.run_unraisable(err, None, obj.to_owned()); + return false; + } + }; + + match obj.has_attr(name, vm) { + Ok(has_attr) => has_attr, + Err(err) => { + vm.run_unraisable(err, None, obj.to_owned()); + false + } + } + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyObject_HasAttrString( + obj: *mut PyObject, + attr_name: *const c_char, +) -> c_int { + with_vm(|vm| { + let obj = unsafe { &*obj }; + let Ok(name) = unsafe { CStr::from_ptr(attr_name) }.to_str() else { + return false; + }; + + match obj.has_attr(name, vm) { + Ok(has_attr) => has_attr, + Err(err) => { + vm.run_unraisable(err, None, obj.to_owned()); + false + } + } + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyObject_HasAttrStringWithError( + obj: *mut PyObject, + attr_name: *const c_char, +) -> c_int { + with_vm(|vm| { + let obj = unsafe { &*obj }; + let name = unsafe { CStr::from_ptr(attr_name) } + .to_str() + .map_err(|_| vm.new_value_error("attribute name must be valid UTF-8"))?; + obj.has_attr(name, vm) + }) +} + #[unsafe(no_mangle)] pub unsafe extern "C" fn PyObject_GenericGetAttr( obj: *mut PyObject, @@ -248,6 +383,20 @@ pub extern "C" fn PyObject_Str(obj: *mut PyObject) -> *mut PyObject { }) } +#[inline] +fn parse_richcompare_op(vm: &VirtualMachine, op: c_int) -> PyResult<PyComparisonOp> { + match op { + 0 => Ok(ComparisonOperator::Less), + 1 => Ok(ComparisonOperator::LessOrEqual), + 2 => Ok(ComparisonOperator::Equal), + 3 => Ok(ComparisonOperator::NotEqual), + 4 => Ok(ComparisonOperator::Greater), + 5 => Ok(ComparisonOperator::GreaterOrEqual), + _ => Err(vm.new_system_error("invalid comparison operator")), + } + .map(Into::into) +} + #[unsafe(no_mangle)] pub unsafe extern "C" fn PyObject_RichCompare( left: *mut PyObject, @@ -255,19 +404,23 @@ pub unsafe extern "C" fn PyObject_RichCompare( op: c_int, ) -> *mut PyObject { with_vm(|vm| { - let op = match op { - 0 => ComparisonOperator::Less, - 1 => ComparisonOperator::LessOrEqual, - 2 => ComparisonOperator::Equal, - 3 => ComparisonOperator::NotEqual, - 4 => ComparisonOperator::Greater, - 5 => ComparisonOperator::GreaterOrEqual, - _ => return Err(vm.new_system_error("invalid comparison operator")), - }; let left = unsafe { &*left }; let right = unsafe { &*right }; left.to_owned() - .rich_compare(right.to_owned(), op.into(), vm) + .rich_compare(right.to_owned(), parse_richcompare_op(vm, op)?, vm) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyObject_RichCompareBool( + left: *mut PyObject, + right: *mut PyObject, + op: c_int, +) -> c_int { + with_vm(|vm| { + let left = unsafe { &*left }; + let right = unsafe { &*right }; + left.rich_compare_bool(right, parse_richcompare_op(vm, op)?, vm) }) } @@ -298,6 +451,69 @@ pub unsafe extern "C" fn PyObject_IsTrue(obj: *mut PyObject) -> c_int { }) } +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyObject_Not(obj: *mut PyObject) -> c_int { + with_vm(|vm| { + let obj = unsafe { &*obj }; + obj.to_owned().not(vm) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyObject_Hash(obj: *mut PyObject) -> isize { + with_vm(|vm| { + let obj = unsafe { &*obj }; + obj.hash(vm).map(|hash| hash as isize) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyObject_HashNotImplemented(obj: *mut PyObject) -> isize { + with_vm(|vm| { + let obj = unsafe { &*obj }; + hash_not_implemented(obj, vm).map(|hash| hash as isize) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyObject_SelfIter(obj: *mut PyObject) -> *mut PyObject { + with_vm(|_vm| unsafe { (&*obj).to_owned() }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn Py_Is(x: *mut PyObject, y: *mut PyObject) -> c_int { + (x == y) as c_int +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn Py_IsNone(x: *mut PyObject) -> c_int { + with_vm(|vm| vm.is_none(unsafe { &*x })) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn Py_ReprEnter(obj: *mut PyObject) -> c_int { + with_vm(|vm| { + let obj = unsafe { &*obj }; + let id = obj.get_id(); + let mut guards = vm.repr_guards.borrow_mut(); + if guards.contains(&id) { + true + } else { + guards.insert(id); + false + } + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn Py_ReprLeave(obj: *mut PyObject) { + with_vm(|vm| { + vm.repr_guards + .borrow_mut() + .remove(&unsafe { &*obj }.get_id()); + }) +} + #[unsafe(no_mangle)] pub unsafe extern "C" fn PyObject_GenericGetDict( obj: *mut PyObject, diff --git a/crates/capi/src/util.rs b/crates/capi/src/util.rs index 24d6d3d40..4061a8f37 100644 --- a/crates/capi/src/util.rs +++ b/crates/capi/src/util.rs @@ -101,6 +101,14 @@ impl FfiResult<isize> for usize { } } +impl FfiResult for isize { + const ERR_VALUE: Self = -1; + + fn into_output(self, _vm: &VirtualMachine) -> Self { + self + } +} + impl FfiResult for c_long { const ERR_VALUE: Self = -1; From 8e598a68ea60a07bbf12570e4466f82f9216892a Mon Sep 17 00:00:00 2001 From: "Jeong, YunWon" <69878+youknowone@users.noreply.github.com> Date: Fri, 26 Jun 2026 22:14:08 +0900 Subject: [PATCH 155/339] Clean up compiler parity leftovers (#8174) --- crates/codegen/src/error.rs | 4 - crates/codegen/src/symboltable.rs | 295 +++++++++--------------------- crates/vm/src/stdlib/_ast.rs | 3 +- 3 files changed, 93 insertions(+), 209 deletions(-) diff --git a/crates/codegen/src/error.rs b/crates/codegen/src/error.rs index 9f11eba94..668ceb605 100644 --- a/crates/codegen/src/error.rs +++ b/crates/codegen/src/error.rs @@ -88,7 +88,6 @@ pub enum CodegenErrorType { ConflictingNameBindPattern, /// break/continue/return inside except* block BreakContinueReturnInExceptStar, - NotImplementedYet, // RustPython marker for unimplemented features } impl core::error::Error for CodegenErrorType {} @@ -173,9 +172,6 @@ impl fmt::Display for CodegenErrorType { "'break', 'continue' and 'return' cannot appear in an except* block" ) } - Self::NotImplementedYet => { - write!(f, "RustPython does not implement this feature yet") - } } } } diff --git a/crates/codegen/src/symboltable.rs b/crates/codegen/src/symboltable.rs index b021a494c..a78b49a6e 100644 --- a/crates/codegen/src/symboltable.rs +++ b/crates/codegen/src/symboltable.rs @@ -325,6 +325,7 @@ pub struct Symbol { pub name: String, pub scope: SymbolScope, pub flags: SymbolFlags, + pub location: Option<SourceLocation>, } impl Symbol { @@ -334,6 +335,7 @@ impl Symbol { // table, scope: SymbolScope::Unknown, flags: SymbolFlags::empty(), + location: None, } } @@ -777,117 +779,98 @@ impl SymbolTableAnalyzer { sub_tables: &[SymbolTable], class_entry: Option<&SymbolMap>, ) -> SymbolTableResult { - if symbol - .flags - .contains(SymbolFlags::ASSIGNED_IN_COMPREHENSION) - && st_typ == CompilerScope::Comprehension - { - // propagate symbol to next higher level that can hold it, - // i.e., function or module. Comprehension is skipped and - // Class is not allowed and detected as error. - self.analyze_symbol_comprehension(symbol, 0)? - } else { - match symbol.scope { - SymbolScope::Free => { - if !self.tables.as_ref().is_empty() { - let scope_depth = self.tables.as_ref().len(); - // check if the name is already defined in any outer scope - if scope_depth < 2 - || self.found_in_outer_scope( - &symbol.name, - st_typ, - skip_enclosing_function_scope, - ) != Some(SymbolScope::Free) - { - return Err(SymbolTableError { - error: format!("no binding for nonlocal '{}' found", symbol.name), - // TODO: accurate location info, somehow - location: None, - }); - } - // Check if the nonlocal binding refers to a type parameter - if symbol.flags.contains(SymbolFlags::NONLOCAL) { - for (symbols, _typ, _skip) in self.tables.iter().rev() { - if let Some(sym) = symbols.get(&symbol.name) { - if sym.flags.contains(SymbolFlags::TYPE_PARAM) { - return Err(SymbolTableError { - error: format!( - "nonlocal binding not allowed for type parameter '{}'", - symbol.name - ), - location: None, - }); - } - if sym.is_bound() { - break; - } + match symbol.scope { + SymbolScope::Free => { + if !self.tables.as_ref().is_empty() { + let scope_depth = self.tables.as_ref().len(); + // check if the name is already defined in any outer scope + if scope_depth < 2 + || self.found_in_outer_scope( + &symbol.name, + st_typ, + skip_enclosing_function_scope, + ) != Some(SymbolScope::Free) + { + return Err(SymbolTableError { + error: format!("no binding for nonlocal '{}' found", symbol.name), + location: symbol.location, + }); + } + // Check if the nonlocal binding refers to a type parameter + if symbol.flags.contains(SymbolFlags::NONLOCAL) { + for (symbols, _typ, _skip) in self.tables.iter().rev() { + if let Some(sym) = symbols.get(&symbol.name) { + if sym.flags.contains(SymbolFlags::TYPE_PARAM) { + return Err(SymbolTableError { + error: format!( + "nonlocal binding not allowed for type parameter '{}'", + symbol.name + ), + location: symbol.location, + }); + } + if sym.is_bound() { + break; } } } - } else { - return Err(SymbolTableError { - error: format!( - "nonlocal {} defined at place without an enclosing scope", - symbol.name - ), - // TODO: accurate location info, somehow - location: None, - }); } + } else { + return Err(SymbolTableError { + error: format!( + "nonlocal {} defined at place without an enclosing scope", + symbol.name + ), + location: symbol.location, + }); } - SymbolScope::GlobalExplicit | SymbolScope::GlobalImplicit => { - // TODO: add more checks for globals? - } - SymbolScope::Local | SymbolScope::Cell => { - // all is well - } - SymbolScope::Unknown => { - // Try hard to figure out what the scope of this symbol is. - let scope = if symbol.is_bound() { - if symbol.flags.contains(SymbolFlags::COMP_CELL) - && matches!(st_typ, CompilerScope::Module | CompilerScope::Class) - { - // CPython keeps comprehension-only cells in - // module/class scopes as normal local/name - // bindings and uses DEF_COMP_CELL to allocate the - // synthetic cell slot. The spliced comp child - // should not force the outer name itself to CELL. - SymbolScope::Local - } else { - self.found_in_inner_scope(sub_tables, &symbol.name, st_typ) - .unwrap_or(SymbolScope::Local) - } - } else if let Some(scope) = class_entry - .and_then(|class_symbols| class_symbols.get(&symbol.name)) - .and_then(|class_sym| { - if class_sym.flags.contains(SymbolFlags::GLOBAL) { - Some(SymbolScope::GlobalExplicit) - } else if class_sym.is_bound() && class_sym.scope != SymbolScope::Free { - // If name is bound in enclosing class, use GlobalImplicit - // so it can be accessed via __classdict__ - Some(SymbolScope::GlobalImplicit) - } else { - None - } - }) + } + SymbolScope::GlobalExplicit | SymbolScope::GlobalImplicit => {} + SymbolScope::Local | SymbolScope::Cell => {} + SymbolScope::Unknown => { + // Try hard to figure out what the scope of this symbol is. + let scope = if symbol.is_bound() { + if symbol.flags.contains(SymbolFlags::COMP_CELL) + && matches!(st_typ, CompilerScope::Module | CompilerScope::Class) { - scope - } else if let Some(scope) = self.found_in_outer_scope( - &symbol.name, - st_typ, - skip_enclosing_function_scope, - ) { - // If found in enclosing scope (function/TypeParams), use that - scope - } else if self.tables.is_empty() { - // Don't make assumptions when we don't know. - SymbolScope::Unknown + // CPython keeps comprehension-only cells in + // module/class scopes as normal local/name + // bindings and uses DEF_COMP_CELL to allocate the + // synthetic cell slot. The spliced comp child + // should not force the outer name itself to CELL. + SymbolScope::Local } else { - // If there are scopes above we assume global. - SymbolScope::GlobalImplicit - }; - symbol.scope = scope; - } + self.found_in_inner_scope(sub_tables, &symbol.name, st_typ) + .unwrap_or(SymbolScope::Local) + } + } else if let Some(scope) = class_entry + .and_then(|class_symbols| class_symbols.get(&symbol.name)) + .and_then(|class_sym| { + if class_sym.flags.contains(SymbolFlags::GLOBAL) { + Some(SymbolScope::GlobalExplicit) + } else if class_sym.is_bound() && class_sym.scope != SymbolScope::Free { + // If name is bound in enclosing class, use GlobalImplicit + // so it can be accessed via __classdict__ + Some(SymbolScope::GlobalImplicit) + } else { + None + } + }) + { + scope + } else if let Some(scope) = + self.found_in_outer_scope(&symbol.name, st_typ, skip_enclosing_function_scope) + { + // If found in enclosing scope (function/TypeParams), use that + scope + } else if self.tables.is_empty() { + // Don't make assumptions when we don't know. + SymbolScope::Unknown + } else { + // If there are scopes above we assume global. + SymbolScope::GlobalImplicit + }; + symbol.scope = scope; } } Ok(()) @@ -1023,106 +1006,6 @@ impl SymbolTableAnalyzer { } }) } - - // Implements the symbol analysis and scope extension for names - // assigned by a named expression in a comprehension. See: - // https://github.com/python/cpython/blob/7b78e7f9fd77bb3280ee39fb74b86772a7d46a70/Python/symtable.c#L1435 - fn analyze_symbol_comprehension( - &mut self, - symbol: &mut Symbol, - parent_offset: usize, - ) -> SymbolTableResult { - // when this is called, we expect to be in the direct parent scope of the scope that contains 'symbol' - let last = self.tables.iter_mut().rev().nth(parent_offset).unwrap(); - let symbols = &mut last.0; - let table_type = last.1; - - // it is not allowed to use an iterator variable as assignee in a named expression - if symbol.flags.contains(SymbolFlags::ITER) { - return Err(SymbolTableError { - error: format!( - "assignment expression cannot rebind comprehension iteration variable {}", - symbol.name - ), - // TODO: accurate location info, somehow - location: None, - }); - } - - match table_type { - CompilerScope::Module => { - symbol.scope = SymbolScope::GlobalImplicit; - } - CompilerScope::Class => { - // named expressions are forbidden in comprehensions on class scope - return Err(SymbolTableError { - error: "assignment expression within a comprehension cannot be used in a class body".to_string(), - // TODO: accurate location info, somehow - location: None, - }); - } - CompilerScope::Function | CompilerScope::AsyncFunction | CompilerScope::Lambda => { - if let Some(parent_symbol) = symbols.get_mut(&symbol.name) { - if let SymbolScope::Unknown = parent_symbol.scope { - // this information is new, as the assignment is done in inner scope - parent_symbol.flags.insert(SymbolFlags::ASSIGNED); - } - - symbol.scope = if parent_symbol.is_global() { - parent_symbol.scope - } else { - SymbolScope::Free - }; - } else { - let mut cloned_sym = symbol.clone(); - cloned_sym.scope = SymbolScope::Cell; - last.0.insert(cloned_sym.name.to_owned(), cloned_sym); - } - } - CompilerScope::Comprehension => { - // TODO check for conflicts - requires more context information about variables - match symbols.get_mut(&symbol.name) { - Some(parent_symbol) => { - // check if assignee is an iterator in top scope - if parent_symbol.flags.contains(SymbolFlags::ITER) { - return Err(SymbolTableError { - error: format!( - "assignment expression cannot rebind comprehension iteration variable {}", - symbol.name - ), - location: None, - }); - } - - // we synthesize the assignment to the symbol from inner scope - parent_symbol.flags.insert(SymbolFlags::ASSIGNED); // more checks are required - } - None => { - // extend the scope of the inner symbol - // as we are in a nested comprehension, we expect that the symbol is needed - // outside, too, and set it therefore to non-local scope. I.e., we expect to - // find a definition on a higher level - let mut cloned_sym = symbol.clone(); - cloned_sym.scope = SymbolScope::Free; - last.0.insert(cloned_sym.name.to_owned(), cloned_sym); - } - } - - self.analyze_symbol_comprehension(symbol, parent_offset + 1)?; - } - CompilerScope::TypeParams => { - // Named expression in comprehension cannot be used in type params - return Err(SymbolTableError { - error: "assignment expression within a comprehension cannot be used within the definition of a generic".to_string(), - location: None, - }); - } - CompilerScope::Annotation | CompilerScope::TypeAlias | CompilerScope::TypeVariable => { - self.analyze_symbol_comprehension(symbol, parent_offset + 1)?; - } - } - Ok(()) - } } #[derive(Clone, Copy, Debug)] @@ -3475,6 +3358,10 @@ impl SymbolTableBuilder { table.symbols.entry(name.into_owned()).or_insert(symbol) }; + if matches!(role, SymbolUsage::Global | SymbolUsage::Nonlocal) { + symbol.location = location; + } + // Set proper scope and flags on symbol: let flags = &mut symbol.flags; match role { diff --git a/crates/vm/src/stdlib/_ast.rs b/crates/vm/src/stdlib/_ast.rs index f6ce6af86..a04def225 100644 --- a/crates/vm/src/stdlib/_ast.rs +++ b/crates/vm/src/stdlib/_ast.rs @@ -2438,6 +2438,7 @@ pub(crate) fn compile( } }; opts.future_features |= codegen::preprocess::future_features(&ast); + let source = text.clone(); let source_file = SourceFileBuilder::new(filename, text).finish(); #[cfg(feature = "parser")] let code = { @@ -2491,7 +2492,7 @@ pub(crate) fn compile( }; #[cfg(not(feature = "parser"))] let code = codegen::compile::compile_top(ast, source_file, mode, opts); - let code = code.map_err(|err| vm.new_syntax_error(&err.into(), None))?; // FIXME source + let code = code.map_err(|err| vm.new_syntax_error(&err.into(), Some(source.as_str())))?; Ok(crate::builtins::PyCode::new_ref_from_bytecode(vm, code).into()) } From dd9a477c87d9bf5d1f2eb1bb392f8c94e9b0d0b6 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Tue, 30 Jun 2026 17:28:23 +0300 Subject: [PATCH 156/339] Fix all clippy suggestions in `ir.rs` (#8162) * Fix all clippy suggestions in `ir.rs` * remove some `idx()` calls --- crates/codegen/src/ir.rs | 211 +++++++++++++++++---------------------- 1 file changed, 94 insertions(+), 117 deletions(-) diff --git a/crates/codegen/src/ir.rs b/crates/codegen/src/ir.rs index b369ec37d..e24909f9c 100644 --- a/crates/codegen/src/ir.rs +++ b/crates/codegen/src/ir.rs @@ -706,7 +706,6 @@ fn instruction_sequence_set_annotations_code( } /// instruction_sequence.c _PyInstructionSequence_UseLabel -#[allow(clippy::needless_range_loop)] fn instruction_sequence_use_label( seq: &mut InstructionSequence, label: InstructionSequenceLabel, @@ -740,9 +739,8 @@ fn instruction_sequence_use_label( if label_map.len() < seq.label_map_allocation { label_map.resize(seq.label_map_allocation, INSTRUCTION_SEQUENCE_UNSET_LABEL); } - for i in old_size..seq.label_map_allocation { - label_map[i] = INSTRUCTION_SEQUENCE_UNSET_LABEL; - } + + label_map[old_size..seq.label_map_allocation].fill(INSTRUCTION_SEQUENCE_UNSET_LABEL); label_map[label.idx()] = seq.instr_used as i32; Ok(()) } @@ -770,7 +768,6 @@ fn instruction_sequence_last_info_mut( } /// instruction_sequence.c _PyInstructionSequence_InsertInstruction -#[allow(clippy::needless_range_loop)] fn instruction_sequence_insert_instruction( seq: &mut InstructionSequence, pos: usize, @@ -781,27 +778,28 @@ fn instruction_sequence_insert_instruction( for i in (pos..last_idx).rev() { seq.instrs[i + 1] = seq.instrs[i]; } + seq.instrs[pos].info = info; if let Some(label_map) = &mut seq.label_map { let pos = pos as i32; - for lbl in 0..seq.label_map_allocation { - if label_map[lbl] >= pos { - label_map[lbl] += 1; + + for lbl in label_map.iter_mut().take(seq.label_map_allocation) { + if *lbl >= pos { + *lbl += 1; } } } + Ok(()) } /// instruction_sequence.c _PyInstructionSequence_ApplyLabelMap -#[allow(clippy::needless_range_loop, clippy::unnecessary_wraps)] -fn instruction_sequence_apply_label_map( - instrs: &mut InstructionSequence, -) -> crate::InternalResult<()> { +fn instruction_sequence_apply_label_map(instrs: &mut InstructionSequence) { { let Some(label_map) = instrs.label_map.as_ref() else { - return Ok(()); + return; }; + for i in 0..instrs.instr_used { let entry = &mut instrs.instrs[i]; if entry.info.instr.has_target() { @@ -819,9 +817,9 @@ fn instruction_sequence_apply_label_map( } } } + instrs.label_map = None; instrs.label_map_allocation = 0; - Ok(()) } /// assemble.c instr_size @@ -870,10 +868,7 @@ const fn is_pseudo_target(pseudo: PseudoOpcode, target: Opcode) -> bool { } } /// assemble.c resolve_unconditional_jumps -#[allow(clippy::unnecessary_wraps)] -fn resolve_unconditional_jumps( - instr_sequence: &mut InstructionSequence, -) -> crate::InternalResult<()> { +fn resolve_unconditional_jumps(instr_sequence: &mut InstructionSequence) { for i in 0..instr_sequence.instr_used { let instr = &mut instr_sequence.instrs[i].info; let is_forward = (u32::from(instr.arg) as i32) > i as i32; @@ -910,12 +905,10 @@ fn resolve_unconditional_jumps( } } } - Ok(()) } /// assemble.c resolve_jump_offsets -#[allow(clippy::needless_range_loop, clippy::unnecessary_wraps)] -fn resolve_jump_offsets(instr_sequence: &mut InstructionSequence) -> crate::InternalResult<()> { +fn resolve_jump_offsets(instr_sequence: &mut InstructionSequence) { // The offset (in code units) of END_SEND from SEND in the yield-from sequence. const END_SEND_OFFSET: i32 = 5; for i in 0..instr_sequence.instr_used { @@ -976,8 +969,6 @@ fn resolve_jump_offsets(instr_sequence: &mut InstructionSequence) -> crate::Inte break; } } - - Ok(()) } struct AssembledCode { @@ -1082,7 +1073,6 @@ fn assemble_emit_instr( } /// assemble.c assemble_location_info -#[allow(clippy::needless_range_loop)] fn assemble_location_info( instr_sequence: &mut InstructionSequence, first_line: i32, @@ -1798,7 +1788,7 @@ impl Blocks { block_idx = self[block_idx].next; } - instruction_sequence_apply_label_map(instr_sequence)?; + instruction_sequence_apply_label_map(instr_sequence); Ok(()) } @@ -2094,7 +2084,7 @@ impl Blocks { } /// flowgraph.c remove_redundant_nops_and_pairs - fn remove_redundant_nops_and_pairs(&mut self) -> crate::InternalResult<()> { + fn remove_redundant_nops_and_pairs(&mut self) { let mut done = false; while !done { @@ -2103,7 +2093,7 @@ impl Blocks { let mut block_idx = BlockIdx::new(0); while block_idx != BlockIdx::NULL { - self.basicblock_remove_redundant_nops(block_idx)?; + self.basicblock_remove_redundant_nops(block_idx); if is_label(self[block_idx].cpython_label) { instr = None; } @@ -2150,7 +2140,6 @@ impl Blocks { block_idx = block.next; } } - Ok(()) } /// flowgraph.c calculate_stackdepth @@ -2244,7 +2233,6 @@ impl Blocks { } /// flowgraph.c remove_unused_consts - #[allow(clippy::needless_range_loop)] fn remove_unused_consts(&mut self, consts: &mut ConstantPool) -> crate::InternalResult<()> { let nconsts = consts.len(); if nconsts == 0 { @@ -2256,9 +2244,9 @@ impl Blocks { .try_reserve_exact(nconsts) .map_err(|_| InternalError::MalformedControlFlowGraph)?; index_map.resize(nconsts, 0isize); - for i in 1..nconsts { - index_map[i] = -1; - } + + index_map[1..nconsts].fill(-1); + // The first constant may be docstring; keep it always. index_map[0] = 0; @@ -2294,8 +2282,8 @@ impl Blocks { // Move all used consts to the beginning of the consts list. debug_assert!(n_used_consts < nconsts); - for i in 0..n_used_consts { - let old_index = index_map[i] as usize; + for (i, item) in index_map.iter().enumerate().take(n_used_consts) { + let old_index = *item as usize; debug_assert!(i <= old_index && old_index < nconsts); if i != old_index { let value = consts.constants[old_index].clone(); @@ -2312,20 +2300,18 @@ impl Blocks { .try_reserve_exact(nconsts) .map_err(|_| InternalError::MalformedControlFlowGraph)?; reverse_index_map.resize(nconsts, 0isize); - for i in 0..nconsts { - reverse_index_map[i] = -1; - } - for i in 0..n_used_consts { - let old_index = index_map[i]; - debug_assert!(old_index != -1); - let old_index = old_index as usize; + + reverse_index_map[..nconsts].fill(-1); + for (i, old_index) in index_map.iter().enumerate().take(n_used_consts) { + debug_assert!(*old_index != -1); + let old_index = *old_index as usize; debug_assert_eq!(reverse_index_map[old_index], -1); reverse_index_map[old_index] = i as isize; } block_idx = BlockIdx(0); while block_idx != BlockIdx::NULL { - let next_block = self[block_idx.idx()].next; + let next_block = self[block_idx].next; let block = &mut self[block_idx]; for i in 0..block.instruction_used { let instr = &mut block.instructions[i]; @@ -2342,7 +2328,7 @@ impl Blocks { } /// flowgraph.c insert_superinstructions - fn insert_superinstructions(&mut self) -> crate::InternalResult<usize> { + fn insert_superinstructions(&mut self) -> usize { let mut block_idx = BlockIdx(0); while block_idx != BlockIdx::NULL { let next_block = self[block_idx].next; @@ -2389,18 +2375,17 @@ impl Blocks { block_idx = next_block; } - let res = self.remove_redundant_nops()?; + let res = self.remove_redundant_nops(); #[cfg(debug_assertions)] assert!(self.no_redundant_nops()); - Ok(res) + res } /// Mark exception handler target blocks. /// flowgraph.c mark_except_handlers - #[allow(clippy::unnecessary_wraps)] - pub(crate) fn mark_except_handlers(&mut self) -> crate::InternalResult<()> { + pub(crate) fn mark_except_handlers(&mut self) { #[cfg(debug_assertions)] { let mut block_idx = BlockIdx(0); @@ -2423,7 +2408,6 @@ impl Blocks { } block_idx = next; } - Ok(()) } /// flowgraph.c mark_cold (two-pass). @@ -2900,11 +2884,7 @@ impl Blocks { } /// flowgraph.c basicblock_remove_redundant_nops - #[allow(clippy::unnecessary_wraps)] - fn basicblock_remove_redundant_nops( - &mut self, - block_idx: BlockIdx, - ) -> crate::InternalResult<usize> { + fn basicblock_remove_redundant_nops(&mut self, block_idx: BlockIdx) -> usize { let mut dest = 0; let mut prev_lineno = -1i32; let instr_count = self[block_idx].instruction_used; @@ -2967,27 +2947,26 @@ impl Blocks { debug_assert!(dest <= instr_count); let num_removed = instr_count - dest; self[block_idx].instruction_used = dest; - Ok(num_removed) + num_removed } /// flowgraph.c remove_redundant_nops - #[allow(clippy::unnecessary_wraps)] - fn remove_redundant_nops(&mut self) -> crate::InternalResult<usize> { + fn remove_redundant_nops(&mut self) -> usize { let mut changes = 0; let mut current = BlockIdx(0); while current != BlockIdx::NULL { let next = self[current].next; - let change = self.basicblock_remove_redundant_nops(current)?; + let change = self.basicblock_remove_redundant_nops(current); changes += change; current = next; } - Ok(changes) + changes } /// flowgraph.c no_redundant_nops #[cfg(debug_assertions)] fn no_redundant_nops(&mut self) -> bool { - matches!(self.remove_redundant_nops(), Ok(0)) + self.remove_redundant_nops() == 0 } /// flowgraph.c remove_redundant_jumps @@ -3050,7 +3029,7 @@ impl Blocks { loop { // Convergence is guaranteed because the number of redundant jumps and // nops only decreases. - let removed_nops = self.remove_redundant_nops()?; + let removed_nops = self.remove_redundant_nops(); let removed_jumps = self.remove_redundant_jumps()?; if removed_nops + removed_jumps == 0 { break; @@ -3415,11 +3394,11 @@ impl CodeInfo { &mut self, info: InstructionInfo, ) -> crate::InternalResult<()> { - basicblock_addop(&mut self.blocks[self.current_block.idx()], info) + basicblock_addop(&mut self.blocks[self.current_block], info) } pub(crate) fn last_current_block_instr_mut(&mut self) -> Option<&mut InstructionInfo> { - basicblock_last_instr_mut(&mut self.blocks[self.current_block.idx()]) + basicblock_last_instr_mut(&mut self.blocks[self.current_block]) } pub(crate) fn set_last_instr_sequence_lineno_override(&mut self, lineno_override: i32) { @@ -3457,7 +3436,7 @@ impl CodeInfo { &mut self.instr_sequence, block, )?; - self.blocks[block.idx()].cpython_label = label; + self.blocks[block].cpython_label = label; Ok(()) } @@ -3535,20 +3514,21 @@ impl CodeInfo { instruction_sequence_label_map_push_unlabeled_block(&mut self.instr_sequence_label_map) } - fn take_recorded_instr_sequence(&mut self) -> crate::InternalResult<InstructionSequence> { + fn take_recorded_instr_sequence(&mut self) -> InstructionSequence { let mut instr_sequence = core::mem::replace(&mut self.instr_sequence, instruction_sequence_new()); if let Some(mut annotations_instr_sequence) = self.annotations_instr_sequence.take() { - instruction_sequence_apply_label_map(&mut annotations_instr_sequence)?; + instruction_sequence_apply_label_map(&mut annotations_instr_sequence); instruction_sequence_set_annotations_code( &mut instr_sequence, Some(Box::new(annotations_instr_sequence)), ); } - Ok(instr_sequence) + + instr_sequence } - fn prepare_cfg_from_codegen(&mut self) -> crate::InternalResult<InstructionSequence> { + fn prepare_cfg_from_codegen(&mut self) -> InstructionSequence { // compile.c optimize_and_assemble_code_unit passes // u_instr_sequence directly into flowgraph.c _PyCfg_FromInstructionSequence(). self.take_recorded_instr_sequence() @@ -3565,7 +3545,7 @@ fn optimize_code_unit( // Phase 1: _PyCfg_OptimizeCodeUnit (flowgraph.c) *blocks = cfg_from_instruction_sequence(instr_sequence)?; translate_jump_labels_to_targets(blocks)?; - blocks.mark_except_handlers()?; + blocks.mark_except_handlers(); label_exception_targets(blocks)?; optimize_cfg(metadata, blocks, metadata.firstlineno)?; blocks.remove_unused_consts(&mut metadata.consts)?; @@ -3573,7 +3553,7 @@ fn optimize_code_unit( // Superinstructions are inserted in _PyCfg_OptimizeCodeUnit, before // later jump normalization / block reordering can create adjacencies // that never exist at this stage in flowgraph.c. - blocks.insert_superinstructions()?; + blocks.insert_superinstructions(); blocks.push_cold_blocks_to_end()?; // Line numbers are resolved again after cold-block extraction. blocks.resolve_line_numbers(metadata.firstlineno)?; @@ -3608,7 +3588,7 @@ fn optimize_cfg( blocks.optimize_basic_block(metadata, block_idx)?; block_idx = next_block; } - blocks.remove_redundant_nops_and_pairs()?; + blocks.remove_redundant_nops_and_pairs(); // optimize_cfg() removes newly-unreachable blocks and // redundant NOP/jump chains before _PyCfg_OptimizeCodeUnit() prunes // unused constants. @@ -3648,7 +3628,7 @@ impl CodeInfo { mut self, opts: &crate::compile::CompileOpts, ) -> crate::InternalResult<CodeObject> { - let instr_sequence = self.prepare_cfg_from_codegen()?; + let instr_sequence = self.prepare_cfg_from_codegen(); let nlocals = self.metadata.varnames.len(); let nparams = self.nparams; optimize_code_unit( @@ -3701,8 +3681,8 @@ impl CodeInfo { .checked_add(arg_count) .ok_or(InternalError::MalformedControlFlowGraph)?; - resolve_unconditional_jumps(&mut instr_sequence)?; - resolve_jump_offsets(&mut instr_sequence)?; + resolve_unconditional_jumps(&mut instr_sequence); + resolve_jump_offsets(&mut instr_sequence); let assembled = assemble_emit( &mut instr_sequence, first_line_number.get() as i32, @@ -5371,7 +5351,7 @@ fn optimize_load_const( ) -> crate::InternalResult<()> { let mut block_idx = BlockIdx(0); while block_idx != BlockIdx::NULL { - let next_block = blocks[block_idx.idx()].next; + let next_block = blocks[block_idx].next; let block = &mut blocks[block_idx]; basicblock_optimize_load_const(metadata, block)?; block_idx = next_block; @@ -5386,7 +5366,7 @@ impl CodeInfo { let mut block_idx = BlockIdx(0); while block_idx != BlockIdx::NULL { use core::fmt::Write; - let block = &self.blocks[block_idx.idx()]; + let block = &self.blocks[block_idx]; let block_return = if basicblock_returns(block) { " return" } else { @@ -5441,14 +5421,14 @@ impl CodeInfo { let mut trace = Vec::new(); trace.push(("initial".to_owned(), self.debug_block_dump())); - let instr_sequence = self.prepare_cfg_from_codegen()?; + let instr_sequence = self.prepare_cfg_from_codegen(); self.blocks = cfg_from_instruction_sequence(instr_sequence)?; trace.push(( "after_cfg_from_instruction_sequence".to_owned(), self.debug_block_dump(), )); translate_jump_labels_to_targets(&mut self.blocks)?; - self.blocks.mark_except_handlers()?; + self.blocks.mark_except_handlers(); label_exception_targets(&mut self.blocks)?; self.blocks.check_cfg()?; self.blocks.inline_small_or_no_lineno_blocks()?; @@ -5475,7 +5455,7 @@ impl CodeInfo { "after_optimize_basic_block".to_owned(), self.debug_block_dump(), )); - self.blocks.remove_redundant_nops_and_pairs()?; + self.blocks.remove_redundant_nops_and_pairs(); self.blocks.remove_unreachable()?; self.blocks.remove_redundant_nops_and_jumps()?; @@ -5491,7 +5471,7 @@ impl CodeInfo { let nlocals = self.metadata.varnames.len(); let nparams = self.nparams; add_checks_for_loads_of_uninitialized_variables(&mut self.blocks, nlocals, nparams)?; - self.blocks.insert_superinstructions()?; + self.blocks.insert_superinstructions(); self.blocks.push_cold_blocks_to_end()?; trace.push(( "after_push_cold_before_chain_reorder".to_owned(), @@ -5711,8 +5691,7 @@ fn stackdepth_push( target: BlockIdx, depth: i32, ) -> crate::InternalResult<()> { - let idx = target.idx(); - let block_depth = &mut blocks[idx].start_depth; + let block_depth = &mut blocks[target].start_depth; if !(*block_depth < 0 || *block_depth == depth) { return Err(InternalError::InconsistentStackDepth); } @@ -5731,7 +5710,6 @@ struct StackEffects { } /// flowgraph.c get_stack_effects -#[allow(clippy::unnecessary_wraps)] fn get_stack_effects( instr: AnyInstruction, oparg: OpArg, @@ -6089,8 +6067,8 @@ struct CfgBuilder { /// flowgraph.c cfg_builder_new_block fn cfg_builder_new_block(g: &mut CfgBuilder) -> crate::InternalResult<BlockIdx> { let block = g.blocks.blocks_new_block()?; - g.blocks[block.idx()].allocation_next = g.block_list; - g.blocks[block.idx()].cpython_label = InstructionSequenceLabel::NO_LABEL; + g.blocks[block].allocation_next = g.block_list; + g.blocks[block].cpython_label = InstructionSequenceLabel::NO_LABEL; g.block_list = block; Ok(block) } @@ -6098,7 +6076,7 @@ fn cfg_builder_new_block(g: &mut CfgBuilder) -> crate::InternalResult<BlockIdx> /// flowgraph.c cfg_builder_use_next_block fn cfg_builder_use_next_block(g: &mut CfgBuilder, block: BlockIdx) -> BlockIdx { debug_assert!(block != BlockIdx::NULL); - g.blocks[g.current.idx()].next = block; + g.blocks[g.current].next = block; g.current = block; block } @@ -6128,7 +6106,7 @@ fn cfg_builder_new() -> crate::InternalResult<CfgBuilder> { /// flowgraph.c cfg_builder_current_block_is_terminated fn cfg_builder_current_block_is_terminated(g: &mut CfgBuilder) -> bool { - let block = &mut g.blocks[g.current.idx()]; + let block = &mut g.blocks[g.current]; let last = basicblock_last_instr(block).copied(); if last.is_some_and(|last| last.instr.is_terminator()) { return true; @@ -6147,7 +6125,7 @@ fn cfg_builder_current_block_is_terminated(g: &mut CfgBuilder) -> bool { fn cfg_builder_maybe_start_new_block(g: &mut CfgBuilder) -> crate::InternalResult<()> { if cfg_builder_current_block_is_terminated(g) { let block = cfg_builder_new_block(g)?; - g.blocks[block.idx()].cpython_label = g.current_label; + g.blocks[block].cpython_label = g.current_label; g.current_label = InstructionSequenceLabel::NO_LABEL; cfg_builder_use_next_block(g, block); } @@ -6172,11 +6150,11 @@ fn cfg_builder_addop(g: &mut CfgBuilder, info: InstructionInfo) -> crate::Intern /// flowgraph.c cfg_builder_check fn cfg_builder_check(g: &CfgBuilder) -> bool { debug_assert!(g.entry != BlockIdx::NULL); - debug_assert!(g.blocks[g.entry.idx()].instruction_used != 0); + debug_assert!(g.blocks[g.entry].instruction_used != 0); let mut block = g.block_list; while block != BlockIdx::NULL { debug_assert!(block.idx() < g.blocks.len()); - let block_ref = &g.blocks[block.idx()]; + let block_ref = &g.blocks[block]; let has_instr_array = block_ref.instruction_allocation > 0; if has_instr_array { debug_assert!(block_ref.instruction_allocation > 0); @@ -6204,7 +6182,7 @@ fn cfg_builder_check_size(g: &CfgBuilder) -> crate::InternalResult<()> { while block != BlockIdx::NULL { debug_assert!(block.idx() < g.blocks.len()); nblocks += 1; - block = g.blocks[block.idx()].allocation_next; + block = g.blocks[block].allocation_next; } debug_assert_eq!(nblocks, g.blocks.len()); if nblocks > usize::MAX / core::mem::size_of::<usize>() { @@ -6259,7 +6237,7 @@ fn translate_jump_labels_to_targets(blocks: &mut Blocks) -> crate::InternalResul fn cfg_from_instruction_sequence( mut instr_sequence: InstructionSequence, ) -> crate::InternalResult<Blocks> { - instruction_sequence_apply_label_map(&mut instr_sequence)?; + instruction_sequence_apply_label_map(&mut instr_sequence); let mut builder = cfg_builder_new()?; for i in 0..instr_sequence.instr_used { @@ -6344,13 +6322,12 @@ fn maybe_push( ) { debug_assert!(block != BlockIdx::NULL); - let idx = block.idx(); - let both = blocks[idx].unsafe_locals_mask | unsafe_mask; - if blocks[idx].unsafe_locals_mask != both { - blocks[idx].unsafe_locals_mask = both; - if !blocks[idx].visited { + let both = blocks[block].unsafe_locals_mask | unsafe_mask; + if blocks[block].unsafe_locals_mask != both { + blocks[block].unsafe_locals_mask = both; + if !blocks[block].visited { worklist.push(block); - blocks[idx].visited = true; + blocks[block].visited = true; } } } @@ -6437,8 +6414,8 @@ fn fast_scan_many_locals(blocks: &mut Blocks, nlocals: usize) -> crate::Internal let mut current = BlockIdx(0); while current != BlockIdx::NULL { blocknum += 1; - for i in 0..blocks[current.idx()].instruction_used { - let info = &mut blocks[current.idx()].instructions[i]; + for i in 0..blocks[current].instruction_used { + let info = &mut blocks[current].instructions[i]; debug_assert!(!matches!(info.instr.real(), Some(Instruction::ExtendedArg))); let arg = u32::from(info.arg) as usize; if arg < LOCAL_UNSAFE_MASK_BITS { @@ -6467,7 +6444,7 @@ fn fast_scan_many_locals(blocks: &mut Blocks, nlocals: usize) -> crate::Internal _ => {} } } - current = blocks[current.idx()].next; + current = blocks[current].next; } Ok(()) } @@ -6497,11 +6474,11 @@ fn add_checks_for_loads_of_uninitialized_variables( let mut current = BlockIdx(0); while current != BlockIdx::NULL { scan_block_for_locals(blocks, current, &mut worklist); - current = blocks[current.idx()].next; + current = blocks[current].next; } while let Some(block_idx) = worklist.pop() { - blocks[block_idx.idx()].visited = false; + blocks[block_idx].visited = false; scan_block_for_locals(blocks, block_idx, &mut worklist); } Ok(()) @@ -6613,9 +6590,9 @@ fn get_max_label(blocks: &Blocks) -> i32 { let mut lbl = -1; let mut current = BlockIdx(0); while current != BlockIdx::NULL { - let cpython_label = blocks[current.idx()].cpython_label; + let cpython_label = blocks[current].cpython_label; lbl = lbl.max(cpython_label.0); - current = blocks[current.idx()].next; + current = blocks[current].next; } lbl } @@ -6794,8 +6771,8 @@ pub(crate) fn label_exception_targets(blocks: &mut Blocks) -> crate::InternalRes pub(crate) fn convert_pseudo_ops(blocks: &mut Blocks) -> crate::InternalResult<()> { let mut block_idx = BlockIdx(0); while block_idx != BlockIdx::NULL { - let next = blocks[block_idx.idx()].next; - let block = &mut blocks[block_idx.idx()]; + let next = blocks[block_idx].next; + let block = &mut blocks[block_idx]; for i in 0..block.instruction_used { let info = &mut block.instructions[i]; if is_block_push(info) { @@ -6828,7 +6805,6 @@ pub(crate) fn convert_pseudo_ops(blocks: &mut Blocks) -> crate::InternalResult<( } /// flowgraph.c build_cellfixedoffsets -#[allow(clippy::needless_range_loop)] pub(crate) fn build_cellfixedoffsets( metadata: &CodeUnitMetadata, ) -> crate::InternalResult<Vec<i32>> { @@ -6839,24 +6815,25 @@ pub(crate) fn build_cellfixedoffsets( let mut fixed = Vec::new(); vec_try_reserve_exact(&mut fixed, noffsets)?; fixed.resize(noffsets, 0); - for i in 0..noffsets { - fixed[i] = (nlocals + i) as i32; + + for (i, item) in fixed.iter_mut().enumerate().take(noffsets) { + *item = (nlocals + i) as i32; } - for oldindex in 0..ncellvars { + + for (oldindex, cell) in fixed.iter_mut().enumerate().take(ncellvars) { let varname = metadata .cellvars .get_index(oldindex) .expect("cellvar index is in range"); if let Some(varindex) = metadata.varnames.get_index_of(varname) { let argoffset = varindex as i32; - fixed[oldindex] = argoffset; + *cell = argoffset; } } Ok(fixed) } /// flowgraph.c fix_cell_offsets -#[allow(clippy::needless_range_loop)] pub(crate) fn fix_cell_offsets( metadata: &CodeUnitMetadata, blocks: &mut Blocks, @@ -6869,9 +6846,9 @@ pub(crate) fn fix_cell_offsets( debug_assert_eq!(cellfixedoffsets.len(), noffsets); let mut numdropped = 0usize; - for i in 0..noffsets { - if cellfixedoffsets[i] == (i + nlocals) as i32 { - cellfixedoffsets[i] -= numdropped as i32; + for (i, cell) in cellfixedoffsets.iter_mut().enumerate().take(noffsets) { + if *cell == (i + nlocals) as i32 { + *cell -= numdropped as i32; } else { numdropped += 1; } @@ -6879,8 +6856,8 @@ pub(crate) fn fix_cell_offsets( let mut block_idx = BlockIdx(0); while block_idx != BlockIdx::NULL { - let next = blocks[block_idx.idx()].next; - let block = &mut blocks[block_idx.idx()]; + let next = blocks[block_idx].next; + let block = &mut blocks[block_idx]; for i in 0..block.instruction_used { let inst = &mut block.instructions[i]; debug_assert!( From d1792fd2ce1a0c74dbebaba02f463c55b88d71af Mon Sep 17 00:00:00 2001 From: Bas Schoenmaeckers <7943856+bschoenmaeckers@users.noreply.github.com> Date: Tue, 30 Jun 2026 16:31:15 +0200 Subject: [PATCH 157/339] Add more int functions to the c-api (#8159) * Add more int functions to the c-api * Simplify as_mask logic * Add `PyLong_FromNativeBytes` & `PyLong_FromUnsignedNativeBytes` --- .cspell.dict/cpython.txt | 1 + Cargo.lock | 1 + crates/capi/Cargo.toml | 1 + crates/capi/src/longobject.rs | 328 +++++++++++++++++++++++++++++++++- crates/capi/src/util.rs | 75 +++++++- crates/vm/src/builtins/int.rs | 30 ++-- 6 files changed, 417 insertions(+), 19 deletions(-) diff --git a/.cspell.dict/cpython.txt b/.cspell.dict/cpython.txt index e5b31b57f..11440e30f 100644 --- a/.cspell.dict/cpython.txt +++ b/.cspell.dict/cpython.txt @@ -4,6 +4,7 @@ argdefs argtypes asdl asname +ASNATIVEBYTES atopen atext attro diff --git a/Cargo.lock b/Cargo.lock index e6a4194a0..740ce5f09 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3448,6 +3448,7 @@ dependencies = [ "bitflags 2.13.0", "itertools 0.14.0", "libc", + "malachite-bigint", "num-complex", "pyo3", "rustpython-pylib", diff --git a/crates/capi/Cargo.toml b/crates/capi/Cargo.toml index 878620ebe..e408d7ab0 100644 --- a/crates/capi/Cargo.toml +++ b/crates/capi/Cargo.toml @@ -15,6 +15,7 @@ crate-type = ["cdylib", "rlib"] bitflags = { workspace = true } itertools = { workspace = true } libc = { workspace = true } +malachite-bigint = { workspace = true } num-complex = { workspace = true } rustpython-vm = { workspace = true, features = ["threading", "compiler", "importlib", "host_env"] } rustpython-stdlib = {workspace = true, features = ["threading"] } diff --git a/crates/capi/src/longobject.rs b/crates/capi/src/longobject.rs index 8c9fe5e1a..0668f8df6 100644 --- a/crates/capi/src/longobject.rs +++ b/crates/capi/src/longobject.rs @@ -1,9 +1,13 @@ use crate::PyObject; use crate::object::define_py_check; use crate::pystate::with_vm; -use core::ffi::{c_long, c_longlong, c_ulong, c_ulonglong}; -use rustpython_vm::PyResult; -use rustpython_vm::builtins::PyInt; +use bitflags::bitflags; +use core::ffi::{CStr, c_char, c_double, c_int, c_long, c_longlong, c_ulong, c_ulonglong, c_void}; +use malachite_bigint::{BigInt, Sign}; +use rustpython_vm::builtins::{PyInt, try_bigint_to_f64, try_f64_to_bigint}; +use rustpython_vm::common::int::bytes_to_int; +use rustpython_vm::protocol::handle_bytes_to_int_err; +use rustpython_vm::{AsObject, PyResult, VirtualMachine}; define_py_check!(fn PyLong_Check, types.int_type); define_py_check!(exact fn PyLong_CheckExact, types.int_type); @@ -38,6 +42,150 @@ pub extern "C" fn PyLong_FromUnsignedLongLong(value: c_ulonglong) -> *mut PyObje with_vm(|vm| vm.ctx.new_int(value)) } +#[unsafe(no_mangle)] +pub extern "C" fn PyLong_FromDouble(value: c_double) -> *mut PyObject { + with_vm(|vm| Ok(vm.ctx.new_bigint(&try_f64_to_bigint(value, vm)?))) +} + +#[unsafe(no_mangle)] +pub extern "C" fn PyLong_FromInt32(value: i32) -> *mut PyObject { + with_vm(|vm| vm.ctx.new_int(value)) +} + +#[unsafe(no_mangle)] +pub extern "C" fn PyLong_FromInt64(value: i64) -> *mut PyObject { + with_vm(|vm| vm.ctx.new_int(value)) +} + +#[unsafe(no_mangle)] +pub extern "C" fn PyLong_FromUInt32(value: u32) -> *mut PyObject { + with_vm(|vm| vm.ctx.new_int(value)) +} + +#[unsafe(no_mangle)] +pub extern "C" fn PyLong_FromUInt64(value: u64) -> *mut PyObject { + with_vm(|vm| vm.ctx.new_int(value)) +} + +bitflags! { + #[derive(Clone, Copy)] + struct AsNativeBytesFlags: c_int { + const BIG_ENDIAN = 0; + const LITTLE_ENDIAN = 1; + const NATIVE_ENDIAN = 3; + const UNSIGNED_BUFFER = 4; + const REJECT_NEGATIVE = 8; + const ALLOW_INDEX = 16; + } +} + +impl AsNativeBytesFlags { + #[inline] + fn is_little_endian(self) -> bool { + if self.contains(Self::NATIVE_ENDIAN) { + cfg!(target_endian = "little") + } else { + self.contains(Self::LITTLE_ENDIAN) + } + } + + fn from_bits_or_default(vm: &VirtualMachine, raw_flags: c_int) -> PyResult<Self> { + const PY_ASNATIVEBYTES_DEFAULTS: c_int = -1; + if raw_flags == PY_ASNATIVEBYTES_DEFAULTS { + return Ok(Self::default()); + }; + + let flags = Self::from_bits(raw_flags) + .ok_or_else(|| vm.new_value_error("Invalid NativeBytes flags"))?; + if flags.contains(Self::LITTLE_ENDIAN) & flags.contains(Self::NATIVE_ENDIAN) { + Err(vm.new_value_error("Cannot specify both LITTLE_ENDIAN and NATIVE_ENDIAN")) + } else { + Ok(flags) + } + } +} + +impl Default for AsNativeBytesFlags { + fn default() -> Self { + Self::NATIVE_ENDIAN | Self::UNSIGNED_BUFFER + } +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyLong_FromNativeBytes( + buffer: *const c_void, + n_bytes: usize, + flags: c_int, +) -> *mut PyObject { + with_vm(|vm| { + let flags = AsNativeBytesFlags::from_bits_or_default(vm, flags)?; + let little_endian = flags.is_little_endian(); + let bytes = unsafe { core::slice::from_raw_parts(buffer.cast::<u8>(), n_bytes) }; + + let value = if flags.contains(AsNativeBytesFlags::UNSIGNED_BUFFER) { + if little_endian { + BigInt::from_bytes_le(Sign::Plus, bytes) + } else { + BigInt::from_bytes_be(Sign::Plus, bytes) + } + } else if little_endian { + BigInt::from_signed_bytes_le(bytes) + } else { + BigInt::from_signed_bytes_be(bytes) + }; + + Ok(vm.ctx.new_bigint(&value)) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyLong_FromUnsignedNativeBytes( + buffer: *const c_void, + n_bytes: usize, + flags: c_int, +) -> *mut PyObject { + with_vm(|vm| { + let flags = AsNativeBytesFlags::from_bits_or_default(vm, flags)?; + let bytes = unsafe { core::slice::from_raw_parts(buffer.cast::<u8>(), n_bytes) }; + + let value = if flags.is_little_endian() { + BigInt::from_bytes_le(Sign::Plus, bytes) + } else { + BigInt::from_bytes_be(Sign::Plus, bytes) + }; + + Ok(vm.ctx.new_bigint(&value)) + }) +} + +#[unsafe(no_mangle)] +pub extern "C" fn PyLong_FromVoidPtr(ptr: *mut c_void) -> *mut PyObject { + with_vm(|vm| vm.ctx.new_int(ptr as usize)) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyLong_FromString( + str: *const c_char, + pend: *mut *mut c_char, + base: c_int, +) -> *mut PyObject { + with_vm(|vm| { + let bytes = unsafe { CStr::from_ptr(str) }.to_bytes(); + let parsed = bytes_to_int(bytes, base as u32, vm.state.int_max_str_digits.load()) + .map(|value| vm.ctx.new_bigint(&value)); + + if let Some(pend) = unsafe { pend.as_mut() } { + let end_offset = if parsed.is_ok() { bytes.len() } else { 0 }; + unsafe { *pend = bytes.as_ptr().add(end_offset).cast_mut().cast() }; + } + + parsed.map_err(|err| { + let obj = vm.ctx.new_bytes(bytes.to_vec()); + handle_bytes_to_int_err(err, obj.as_object(), vm) + }) + }) +} + #[unsafe(no_mangle)] pub unsafe extern "C" fn PyLong_AsLong(obj: *mut PyObject) -> c_long { with_vm::<PyResult<c_long>, _>(|vm| { @@ -50,12 +198,173 @@ pub unsafe extern "C" fn PyLong_AsLong(obj: *mut PyObject) -> c_long { }) } +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyLong_AsDouble(obj: *mut PyObject) -> c_double { + with_vm::<PyResult<c_double>, _>(|vm| { + let int = unsafe { &*obj }.try_downcast_ref::<PyInt>(vm)?; + try_bigint_to_f64(int.as_bigint(), vm) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyLong_AsInt(obj: *mut PyObject) -> c_int { + with_vm::<PyResult<c_int>, _>(|vm| { + unsafe { &*obj } + .to_owned() + .try_index(vm)? + .as_bigint() + .try_into() + .map_err(|_| vm.new_overflow_error("Python int too large to convert to C int")) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyLong_AsInt32(obj: *mut PyObject, out: *mut i32) -> c_int { + with_vm(|vm| { + let value: i32 = unsafe { &*obj } + .to_owned() + .try_index(vm)? + .as_bigint() + .try_into() + .map_err(|_| vm.new_overflow_error("Python int too large to convert to int32_t"))?; + unsafe { *out = value }; + Ok(()) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyLong_AsInt64(obj: *mut PyObject, out: *mut i64) -> c_int { + with_vm(|vm| { + let value: i64 = unsafe { &*obj } + .to_owned() + .try_index(vm)? + .as_bigint() + .try_into() + .map_err(|_| vm.new_overflow_error("Python int too large to convert to int64_t"))?; + unsafe { *out = value }; + Ok(()) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyLong_AsLongLong(obj: *mut PyObject) -> c_longlong { + with_vm::<PyResult<c_longlong>, _>(|vm| { + unsafe { &*obj } + .to_owned() + .try_index(vm)? + .as_bigint() + .try_into() + .map_err(|_| vm.new_overflow_error("Python int too large to convert to C long long")) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyLong_AsSize_t(obj: *mut PyObject) -> usize { + with_vm::<PyResult<usize>, _>(|vm| { + let value: usize = unsafe { &*obj } + .try_downcast_ref::<PyInt>(vm)? + .as_bigint() + .try_into() + .map_err(|_| vm.new_overflow_error("Python int too large to convert to C size_t"))?; + Ok(value) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyLong_AsSsize_t(obj: *mut PyObject) -> isize { + with_vm::<PyResult<isize>, _>(|vm| { + unsafe { &*obj } + .try_downcast_ref::<PyInt>(vm)? + .as_bigint() + .try_into() + .map_err(|_| vm.new_overflow_error("Python int too large to convert to C ssize_t")) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyLong_AsUInt32(obj: *mut PyObject, out: *mut u32) -> c_int { + with_vm(|vm| { + let value: u32 = unsafe { &*obj } + .to_owned() + .try_index(vm)? + .as_bigint() + .try_into() + .map_err(|_| vm.new_overflow_error("Python int too large to convert to uint32_t"))?; + unsafe { *out = value }; + Ok(()) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyLong_AsUInt64(obj: *mut PyObject, out: *mut u64) -> c_int { + with_vm(|vm| { + let value: u64 = unsafe { &*obj } + .to_owned() + .try_index(vm)? + .as_bigint() + .try_into() + .map_err(|_| vm.new_overflow_error("Python int too large to convert to uint64_t"))?; + unsafe { *out = value }; + Ok(()) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyLong_AsUnsignedLong(obj: *mut PyObject) -> c_ulong { + with_vm::<PyResult<c_ulong>, _>(|vm| { + unsafe { &*obj } + .try_downcast_ref::<PyInt>(vm)? + .as_bigint() + .try_into() + .map_err(|_| { + vm.new_overflow_error("Python int too large to convert to C unsigned long") + }) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyLong_AsUnsignedLongMask(obj: *mut PyObject) -> c_ulong { + with_vm::<PyResult<c_ulong>, _>(|vm| { + let int = unsafe { &*obj }.to_owned().try_index(vm)?; + if const { c_ulong::BITS == 32 } { + Ok(c_ulong::from(int.as_u32_mask())) + } else { + Ok(int.as_u64_mask() as c_ulong) + } + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyLong_AsUnsignedLongLongMask(obj: *mut PyObject) -> c_ulonglong { + with_vm::<PyResult<c_ulonglong>, _>(|vm| { + let int = unsafe { &*obj }.to_owned().try_index(vm)?; + Ok(int.as_u64_mask()) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyLong_AsVoidPtr(obj: *mut PyObject) -> *mut c_void { + with_vm(|vm| { + let value = unsafe { &*obj }.try_downcast_ref::<PyInt>(vm)?; + + let unsigned: Result<usize, _> = value.as_bigint().try_into(); + if let Ok(v) = unsigned { + return Ok(v as *mut c_void); + } + let signed: Result<isize, _> = value.as_bigint().try_into(); + if let Ok(v) = signed { + return Ok((v as usize) as *mut c_void); + } + + Err(vm.new_overflow_error("int too large to convert to pointer")) + }) +} + #[unsafe(no_mangle)] pub unsafe extern "C" fn PyLong_AsUnsignedLongLong(obj: *mut PyObject) -> c_ulonglong { with_vm::<PyResult<c_ulonglong>, _>(|vm| { unsafe { &*obj } - .to_owned() - .try_downcast::<PyInt>(vm)? + .try_downcast_ref::<PyInt>(vm)? .as_bigint() .try_into() .map_err(|_| { @@ -86,4 +395,13 @@ mod tests { assert_eq!(number.extract::<u64>().unwrap(), 123); }) } + + #[test] + fn py_int_u128() { + Python::attach(|py| { + let value = 1u128 << 100; + let number = PyInt::new(py, value); + assert_eq!(number.extract::<u128>().unwrap(), value); + }) + } } diff --git a/crates/capi/src/util.rs b/crates/capi/src/util.rs index 4061a8f37..ccb8ee254 100644 --- a/crates/capi/src/util.rs +++ b/crates/capi/src/util.rs @@ -1,6 +1,6 @@ use crate::PyObject; use core::convert::Infallible; -use core::ffi::{c_char, c_double, c_int, c_long, c_ulonglong, c_void}; +use core::ffi::{c_char, c_double, c_int, c_long, c_ulong, c_void}; use rustpython_vm::{PyObjectRef, PyRef, PyResult, VirtualMachine}; pub(crate) trait FfiResult<Output = Self> { @@ -109,6 +109,23 @@ impl FfiResult for isize { } } +#[cfg(not(windows))] +impl FfiResult for c_int { + const ERR_VALUE: Self = -1; + + fn into_output(self, _vm: &VirtualMachine) -> Self { + self + } +} + +impl FfiResult for usize { + const ERR_VALUE: Self = Self::MAX; + + fn into_output(self, _vm: &VirtualMachine) -> Self { + self + } +} + impl FfiResult for c_long { const ERR_VALUE: Self = -1; @@ -117,7 +134,25 @@ impl FfiResult for c_long { } } -impl FfiResult for c_ulonglong { +impl FfiResult for c_ulong { + const ERR_VALUE: Self = Self::MAX; + + fn into_output(self, _vm: &VirtualMachine) -> Self { + self + } +} + +#[cfg(windows)] +impl FfiResult for core::ffi::c_longlong { + const ERR_VALUE: Self = -1; + + fn into_output(self, _vm: &VirtualMachine) -> Self { + self + } +} + +#[cfg(windows)] +impl FfiResult for core::ffi::c_ulonglong { const ERR_VALUE: Self = Self::MAX; fn into_output(self, _vm: &VirtualMachine) -> Self { @@ -167,3 +202,39 @@ where ) } } + +#[cfg(test)] +mod tests { + use super::*; + use core::any::type_name; + use core::ffi::{c_longlong, c_ulonglong}; + use core::fmt::Debug; + + #[test] + fn ffi_result_err_value() { + fn assert_error_value<T, Output>(value: Output) + where + T: FfiResult<Output> + 'static, + Output: PartialEq + Debug, + { + assert_eq!(value, T::ERR_VALUE, "{}", type_name::<T>(),); + } + + assert_error_value::<(), _>(()); + assert_error_value::<(), c_int>(-1); + + assert_error_value::<isize, _>(-1); + assert_error_value::<usize, _>(usize::MAX); + assert_error_value::<usize, isize>(-1); + assert_error_value::<c_int, _>(-1); // i32 + assert_error_value::<c_long, _>(-1); //Windows i32, unix i64 + assert_error_value::<c_ulong, _>(c_ulong::MAX); // Windows u32, unix u64 + assert_error_value::<c_longlong, _>(-1); // i64 + assert_error_value::<c_ulonglong, _>(c_ulonglong::MAX); // u64 + assert_error_value::<c_double, _>(-1.0); + assert_error_value::<bool, _>(-1); + + assert_error_value::<PyResult<c_int>, _>(-1); + assert_error_value::<PyResult<usize>, _>(usize::MAX); + } +} diff --git a/crates/vm/src/builtins/int.rs b/crates/vm/src/builtins/int.rs index 198c2765c..b92461497 100644 --- a/crates/vm/src/builtins/int.rs +++ b/crates/vm/src/builtins/int.rs @@ -319,18 +319,24 @@ impl PyInt { #[must_use] pub fn as_u32_mask(&self) -> u32 { let v = self.as_bigint(); - v.to_u32() - .or_else(|| v.to_i32().map(|i| i as u32)) - .unwrap_or_else(|| { - let mut out = 0u32; - for digit in v.iter_u32_digits() { - out = out.wrapping_shl(32) | digit; - } - match v.sign() { - Sign::Minus => out * -1i32 as u32, - _ => out, - } - }) + let out = v.iter_u32_digits().next().unwrap_or(0); + match v.sign() { + Sign::Minus => out.wrapping_neg(), + _ => out, + } + } + + // _PyLong_AsUnsignedLongLongMask + #[must_use] + pub fn as_u64_mask(&self) -> u64 { + let v = self.as_bigint(); + let mut digits = v.iter_u32_digits(); + let out = + u64::from(digits.next().unwrap_or(0)) | (u64::from(digits.next().unwrap_or(0)) << 32); + match v.sign() { + Sign::Minus => out.wrapping_neg(), + _ => out, + } } pub fn try_to_primitive<'a, I>(&'a self, vm: &VirtualMachine) -> PyResult<I> From a588a645721f068918860107e3ce35e5b76178cc Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Tue, 30 Jun 2026 17:32:30 +0300 Subject: [PATCH 158/339] Uncomment codegen crashing tests (#8175) * Update `test_patma.py` to 3.14.6 * Update `test_listcomps.py` * Align patches of `test_super.py` * Align `test_grammar.py` * Align patches for `test_pep646_syntax.py` --- Lib/test/test_grammar.py | 3 +-- Lib/test/test_listcomps.py | 4 +--- Lib/test/test_patma.py | 26 +++++++++++++++++--------- Lib/test/test_pep646_syntax.py | 3 +-- Lib/test/test_super.py | 4 ++-- 5 files changed, 22 insertions(+), 18 deletions(-) diff --git a/Lib/test/test_grammar.py b/Lib/test/test_grammar.py index 19440b101..cfb24a5c4 100644 --- a/Lib/test/test_grammar.py +++ b/Lib/test/test_grammar.py @@ -1723,8 +1723,7 @@ class GrammarTests(unittest.TestCase): class H: pass @d := class_decorator class I: pass - # TODO: RUSTPYTHON; SyntaxError: the symbol 'class_decorator' must be present in the symbol table - # @lambda c: class_decorator(c) + @lambda c: class_decorator(c) class J: pass @[..., class_decorator, ...][1] class K: pass diff --git a/Lib/test/test_listcomps.py b/Lib/test/test_listcomps.py index 5e09fad72..e76169c69 100644 --- a/Lib/test/test_listcomps.py +++ b/Lib/test/test_listcomps.py @@ -206,11 +206,9 @@ class ListComprehensionTest(unittest.TestCase): """ self._check_in_scopes(code, raises=NameError) - @unittest.expectedFailure # TODO: RUSTPYTHON; SyntaxError: compiler_make_closure: cannot find '__classdict__' in parent vars def test_references___classdict___nested(self): class _C: - # res = [(lambda: __classdict__)() for _ in [1]] # TODO: RUSTPYTHON - pass # TODO: RUSTPYTHON + res = [(lambda: __classdict__)() for _ in [1]] self.assertIn("res", _C.res[0]) def test_references___conditional_annotations__(self): diff --git a/Lib/test/test_patma.py b/Lib/test/test_patma.py index 5a06972fd..5d0857b05 100644 --- a/Lib/test/test_patma.py +++ b/Lib/test/test_patma.py @@ -6,6 +6,7 @@ import enum import inspect import sys import unittest +from test import support @dataclasses.dataclass @@ -2563,15 +2564,14 @@ class TestPatma(unittest.TestCase): self.assertEqual(y, 0) self.assertEqual(z, {0: 1}) - # TODO: RUSTPYTHON - # def test_patma_241(self): - # x = [[{0: 0}]] - # match x: - # case list([({-0-0j: int(real=0+0j, imag=0-0j) | (1) as z},)]): - # y = 0 - # self.assertEqual(x, [[{0: 0}]]) - # self.assertEqual(y, 0) - # self.assertEqual(z, 0) + def test_patma_241(self): + x = [[{0: 0}]] + match x: + case list([({-0-0j: int(real=0+0j, imag=0-0j) | (1) as z},)]): + y = 0 + self.assertEqual(x, [[{0: 0}]]) + self.assertEqual(y, 0) + self.assertEqual(z, 0) def test_patma_242(self): x = range(3) @@ -3016,6 +3016,13 @@ class TestSyntaxErrors(unittest.TestCase): pass """) + def test_multiple_assignments_to_name_in_pattern_6(self): + self.assert_syntax_error(""" + match ...: + case a as a + 1: # NAME and expression with no () + pass + """) + def test_multiple_starred_names_in_sequence_pattern_0(self): self.assert_syntax_error(""" match ...: @@ -3492,6 +3499,7 @@ class TestTracing(unittest.TestCase): self.assertListEqual(self._trace(f, 1), [1, 2, 3]) self.assertListEqual(self._trace(f, 0), [1, 2, 5, 6]) + @support.skip_wasi_stack_overflow() def test_parser_deeply_nested_patterns(self): # Deeply nested patterns can cause exponential backtracking when parsing. # See gh-93671 for more information. diff --git a/Lib/test/test_pep646_syntax.py b/Lib/test/test_pep646_syntax.py index d79196219..aac089b19 100644 --- a/Lib/test/test_pep646_syntax.py +++ b/Lib/test/test_pep646_syntax.py @@ -321,8 +321,7 @@ is *not* valid syntax.) __test__ = {'doctests' : doctests} def load_tests(loader, tests, pattern): - from test.support.rustpython import DocTestChecker # TODO: RUSTPYTHON - tests.addTest(doctest.DocTestSuite(checker=DocTestChecker())) # TODO: RUSTPYTHON + tests.addTest(doctest.DocTestSuite()) return tests diff --git a/Lib/test/test_super.py b/Lib/test/test_super.py index b53e38c77..4d338bbbc 100644 --- a/Lib/test/test_super.py +++ b/Lib/test/test_super.py @@ -112,7 +112,7 @@ class TestSuper(unittest.TestCase): __class__""", globals(), {}) self.assertIs(type(e.exception), NameError) # Not UnboundLocalError class X: - # global __class__ # TODO: RUSTPYTHON; SyntaxError: name '__class__' is assigned to before global declaration + global __class__ __class__ = 42 def f(): __class__ @@ -120,7 +120,7 @@ class TestSuper(unittest.TestCase): del globals()["__class__"] self.assertNotIn("__class__", X.__dict__) class X: - # nonlocal __class__ # TODO: RUSTPYTHON; SyntaxError: name '__class__' is assigned to before nonlocal declaration + nonlocal __class__ __class__ = 42 def f(): __class__ From e7800603cf72cd4f4e8369364dafc9816cb0a57e Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Tue, 30 Jun 2026 17:34:08 +0300 Subject: [PATCH 159/339] clippy `iter_over_hash_type` (#8182) --- Cargo.toml | 1 + crates/derive-impl/src/pyclass.rs | 12 ++++++++++++ crates/stdlib/src/faulthandler.rs | 5 +++++ crates/vm/src/builtins/frame.rs | 4 ++++ crates/vm/src/gc_state.rs | 14 ++++++++++++++ crates/vm/src/vm/mod.rs | 25 +++++++++++++++++++++++++ 6 files changed, 61 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index 4781c95e1..756d9ec13 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -350,6 +350,7 @@ similar_names = "allow" # restriction lints alloc_instead_of_core = "warn" cfg_not_test = "warn" +iter_over_hash_type = "warn" redundant_test_prefix = "warn" std_instead_of_alloc = "warn" std_instead_of_core = "warn" diff --git a/crates/derive-impl/src/pyclass.rs b/crates/derive-impl/src/pyclass.rs index d5bae7eeb..aed2c5d8c 100644 --- a/crates/derive-impl/src/pyclass.rs +++ b/crates/derive-impl/src/pyclass.rs @@ -1433,6 +1433,11 @@ impl GetSetNursery { fn validate(&mut self) -> Result<()> { let mut errors = Vec::new(); + + #[expect( + clippy::iter_over_hash_type, + reason = "Iteration order doesn't matter here" + )] for ((name, _cfgs), (getter, setter)) in &self.map { if getter.is_none() { errors.push(err_span!( @@ -1442,6 +1447,7 @@ impl GetSetNursery { )); }; } + errors.into_result()?; self.validated = true; Ok(()) @@ -1525,6 +1531,11 @@ impl MemberNursery { fn validate(&mut self) -> Result<()> { let mut errors = Vec::new(); + + #[expect( + clippy::iter_over_hash_type, + reason = "Iteration order doesn't matter here" + )] for (name, entry) in &self.map { if entry.getter.is_none() { errors.push(err_span!( @@ -1534,6 +1545,7 @@ impl MemberNursery { )); }; } + errors.into_result()?; self.validated = true; Ok(()) diff --git a/crates/stdlib/src/faulthandler.rs b/crates/stdlib/src/faulthandler.rs index b3af501d8..e890cecfa 100644 --- a/crates/stdlib/src/faulthandler.rs +++ b/crates/stdlib/src/faulthandler.rs @@ -304,10 +304,15 @@ mod decl { let registry = vm.state.thread_frames.lock(); // First dump non-current threads, then current thread last + #[expect( + clippy::iter_over_hash_type, + reason = "Iteration order doesn't matter here" + )] for (&tid, slot) in registry.iter() { if tid == current_tid { continue; } + let frames_guard = slot.frames.lock(); dump_traceback_thread_frames(fd, tid, false, &frames_guard); puts(fd, "\n"); diff --git a/crates/vm/src/builtins/frame.rs b/crates/vm/src/builtins/frame.rs index 0cb16b235..ab45f6867 100644 --- a/crates/vm/src/builtins/frame.rs +++ b/crates/vm/src/builtins/frame.rs @@ -738,6 +738,10 @@ impl Py<Frame> { #[cfg(feature = "threading")] { let registry = vm.state.thread_frames.lock(); + #[expect( + clippy::iter_over_hash_type, + reason = "Iteration order doesn't matter here" + )] for slot in registry.values() { let frames = slot.frames.lock(); // SAFETY: the owning thread can't pop while we hold the Mutex, diff --git a/crates/vm/src/gc_state.rs b/crates/vm/src/gc_state.rs index 93596a9da..e20cbcb8e 100644 --- a/crates/vm/src/gc_state.rs +++ b/crates/vm/src/gc_state.rs @@ -455,6 +455,11 @@ impl GcState { // Step 2: Build gc_refs map (copy reference counts) let mut gc_refs: std::collections::HashMap<GcPtr, usize> = std::collections::HashMap::new(); + + #[expect( + clippy::iter_over_hash_type, + reason = "Iteration order doesn't matter here" + )] for &ptr in &collecting { let obj = unsafe { ptr.0.as_ref() }; gc_refs.insert(ptr, obj.strong_count()); @@ -468,6 +473,11 @@ impl GcState { // results, causing live objects to be incorrectly collected. let mut referents_map: std::collections::HashMap<GcPtr, Vec<NonNull<PyObject>>> = std::collections::HashMap::new(); + + #[expect( + clippy::iter_over_hash_type, + reason = "Iteration order doesn't matter here" + )] for &ptr in &collecting { let obj = unsafe { ptr.0.as_ref() }; if obj.strong_count() == 0 { @@ -489,6 +499,10 @@ impl GcState { let mut reachable: HashSet<GcPtr> = HashSet::new(); let mut worklist: Vec<GcPtr> = Vec::new(); + #[expect( + clippy::iter_over_hash_type, + reason = "Iteration order doesn't matter here" + )] for (&ptr, &refs) in &gc_refs { if refs > 0 { reachable.insert(ptr); diff --git a/crates/vm/src/vm/mod.rs b/crates/vm/src/vm/mod.rs index 32a2906fa..5766c5b8a 100644 --- a/crates/vm/src/vm/mod.rs +++ b/crates/vm/src/vm/mod.rs @@ -273,10 +273,16 @@ impl StopTheWorldState { let registry = vm.state.thread_frames.lock(); let mut attached_seen = 0u64; let mut forced_parks = 0u64; + + #[expect( + clippy::iter_over_hash_type, + reason = "Iteration order doesn't matter here" + )] for (&id, slot) in registry.iter() { if id == requester { continue; } + let state = slot.state.load(Ordering::Relaxed); if state == THREAD_DETACHED { // CAS DETACHED → SUSPENDED (park without thread cooperation) @@ -412,10 +418,16 @@ impl StopTheWorldState { // thread-slot initialization. self.requested.store(false, Ordering::Release); self.world_stopped.store(false, Ordering::Release); + + #[expect( + clippy::iter_over_hash_type, + reason = "Iteration order doesn't matter here" + )] for (&id, slot) in registry.iter() { if id == requester { continue; } + slot.stop_requested.store(false, Ordering::Release); let state = slot.state.load(Ordering::Relaxed); debug_assert!( @@ -427,6 +439,7 @@ impl StopTheWorldState { slot.thread.unpark(); } } + drop(registry); self.thread_countdown.store(0, Ordering::Release); self.requester.store(0, Ordering::Relaxed); @@ -506,10 +519,16 @@ impl StopTheWorldState { use thread::THREAD_SUSPENDED; let requester = self.requester.load(Ordering::Relaxed); let registry = vm.state.thread_frames.lock(); + + #[expect( + clippy::iter_over_hash_type, + reason = "Iteration order doesn't matter here" + )] for (&id, slot) in registry.iter() { if id == requester { continue; } + let state = slot.state.load(Ordering::Relaxed); debug_assert!( state == THREAD_SUSPENDED, @@ -523,10 +542,16 @@ impl StopTheWorldState { use thread::THREAD_SUSPENDED; let requester = self.requester.load(Ordering::Relaxed); let registry = vm.state.thread_frames.lock(); + + #[expect( + clippy::iter_over_hash_type, + reason = "Iteration order doesn't matter here" + )] for (&id, slot) in registry.iter() { if id == requester { continue; } + let state = slot.state.load(Ordering::Relaxed); debug_assert!( state != THREAD_SUSPENDED, From e39c791e06765c8b075feb0e3f0e9df5ffa981d4 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Tue, 30 Jun 2026 17:39:13 +0300 Subject: [PATCH 160/339] `FutureFeature` enum (#8185) --- crates/codegen/src/compile.rs | 125 ++++++++++++++++++++++++++----- crates/codegen/src/preprocess.rs | 50 ++++++++----- 2 files changed, 140 insertions(+), 35 deletions(-) diff --git a/crates/codegen/src/compile.rs b/crates/codegen/src/compile.rs index 711ac3926..39500f1ad 100644 --- a/crates/codegen/src/compile.rs +++ b/crates/codegen/src/compile.rs @@ -201,6 +201,90 @@ enum DoneWithFuture { Yes, } +/// A Python `__future__` feature flag imported via `from __future__ import <feature>`. +/// +/// # See Also +/// +/// - [Python documentation on `__future__`](https://docs.python.org/3.14/library/__future__.html) +#[derive(Clone, Copy, Debug, Eq, PartialEq)] +pub enum FutureFeature { + /// ```py + /// from __future__ import absolute_import + /// ``` + AbsoluteImport, + + /// ```py + /// from __future__ import annotations + /// ``` + Annotations, + + /// ```py + /// from __future__ import barry_as_FLUFL + /// ``` + BarryAsFLUFL, + + /// ```py + /// from __future__ import braces + /// ``` + Braces, + + /// ```py + /// from __future__ import division + /// ``` + Division, + + /// ```py + /// from __future__ import generator_stop + /// ``` + GeneratorStop, + + /// ```py + /// from __future__ import generators + /// ``` + Generators, + + /// ```py + /// from __future__ import nested_scopes + /// ``` + NestedScopes, + + /// ```py + /// from __future__ import print_function + /// ``` + PrintFunction, + + /// ```py + /// from __future__ import unicode_literals + /// ``` + UnicodeLiterals, + + /// ```py + /// from __future__ import with_statement + /// ``` + WithStatement, +} + +impl TryFrom<&str> for FutureFeature { + type Error = String; + + fn try_from(name: &str) -> Result<Self, Self::Error> { + Ok(match name { + "absolute_import" => Self::AbsoluteImport, + "annotations" => Self::Annotations, + "barry_as_FLUFL" => Self::BarryAsFLUFL, + "braces" => Self::Braces, + "division" => Self::Division, + "generator_stop" => Self::GeneratorStop, + "generators" => Self::Generators, + "nested_scopes" => Self::NestedScopes, + "print_function" => Self::PrintFunction, + "unicode_literals" => Self::UnicodeLiterals, + "with_statement" => Self::WithStatement, + _ => return Err(name.into()), + }) + } +} + #[derive(Clone, Copy)] enum ComprehensionSymbolSource { Child, @@ -11144,16 +11228,21 @@ impl<'warnings> Compiler<'warnings> { if let DoneWithFuture::Yes = self.done_with_future_stmts { return Err(self.error(CodegenErrorType::InvalidFuturePlacement)); } + self.done_with_future_stmts = DoneWithFuture::DoneWithDoc; + for feature in features { - match feature.name.as_str() { - // Python 3 features; we've already implemented them by default - "nested_scopes" | "generators" | "division" | "absolute_import" - | "with_statement" | "print_function" | "unicode_literals" | "generator_stop" => {} - // Accept the future feature name, but do not implement - // Barry-as-BDFL parser mode. - "barry_as_FLUFL" => {} - "annotations" => { + let future_feature = feature.name.as_str().try_into().map_err(|name| { + self.error_ranged(CodegenErrorType::InvalidFutureFeature(name), feature.range) + })?; + + match future_feature { + FutureFeature::Braces => { + return Err( + self.error_ranged(CodegenErrorType::InvalidFutureBraces, feature.range) + ); + } + FutureFeature::Annotations => { self.future_annotations = true; self.future_features .insert(bytecode::CodeFlags::FUTURE_ANNOTATIONS); @@ -11161,16 +11250,18 @@ impl<'warnings> Compiler<'warnings> { .flags .insert(bytecode::CodeFlags::FUTURE_ANNOTATIONS); } - "braces" => { - return Err( - self.error_ranged(CodegenErrorType::InvalidFutureBraces, feature.range) - ); + FutureFeature::BarryAsFLUFL => { + // We do not support Barry-as-BDFL parser mode yet. This is a nop for now. } - other => { - return Err(self.error_ranged( - CodegenErrorType::InvalidFutureFeature(other.to_owned()), - feature.range, - )); + FutureFeature::AbsoluteImport + | FutureFeature::Division + | FutureFeature::GeneratorStop + | FutureFeature::Generators + | FutureFeature::NestedScopes + | FutureFeature::PrintFunction + | FutureFeature::UnicodeLiterals + | FutureFeature::WithStatement => { + // Python 3 features. They are already implemented by default. } } } diff --git a/crates/codegen/src/preprocess.rs b/crates/codegen/src/preprocess.rs index f6ca18b67..084b72c87 100644 --- a/crates/codegen/src/preprocess.rs +++ b/crates/codegen/src/preprocess.rs @@ -8,6 +8,8 @@ use ruff_python_ast::{ visitor::transformer::{self, Transformer}, }; use ruff_text_size::{Ranged, TextRange}; + +use crate::compile::FutureFeature; use rustpython_compiler_core::bytecode; const MAXDIGITS: usize = 3; @@ -232,29 +234,40 @@ pub fn checked_future_features_in_body( .. }) if *level == 0 && module.as_ref().map(|id| id.as_str()) == Some("__future__") => { for alias in names { - match alias.name.as_str() { - "nested_scopes" | "generators" | "division" | "absolute_import" - | "with_statement" | "print_function" | "unicode_literals" - | "generator_stop" => {} - "annotations" => { - future_features.insert(bytecode::CodeFlags::FUTURE_ANNOTATIONS); - } - // Accept the future feature name, but leave it - // as a RustPython no-op. - "barry_as_FLUFL" => {} - "braces" => { + let future_feature = + alias + .name + .as_str() + .try_into() + .map_err(|name| FutureFeatureError { + features: future_features, + range: alias.range, + kind: FutureFeatureErrorKind::InvalidFeature(name), + })?; + + match future_feature { + FutureFeature::Braces => { return Err(FutureFeatureError { features: future_features, range: alias.range, kind: FutureFeatureErrorKind::InvalidBraces, }); } - other => { - return Err(FutureFeatureError { - features: future_features, - range: alias.range, - kind: FutureFeatureErrorKind::InvalidFeature(other.to_owned()), - }); + FutureFeature::Annotations => { + future_features.insert(bytecode::CodeFlags::FUTURE_ANNOTATIONS) + } + FutureFeature::BarryAsFLUFL => { + // We do not support Barry-as-BDFL parser mode yet. This is a nop for now. + } + FutureFeature::AbsoluteImport + | FutureFeature::Division + | FutureFeature::GeneratorStop + | FutureFeature::Generators + | FutureFeature::NestedScopes + | FutureFeature::PrintFunction + | FutureFeature::UnicodeLiterals + | FutureFeature::WithStatement => { + // Python 3 features. They are already implemented by default. } } } @@ -298,6 +311,7 @@ pub fn preprocess_mod( } } +#[derive(Clone, Copy, Debug, Eq, PartialEq)] struct AstPreprocessor { optimize: u8, future_annotations: bool, @@ -305,7 +319,7 @@ struct AstPreprocessor { } impl AstPreprocessor { - fn visit_astfold_body(&self, body: &mut ast::Suite) { + fn visit_astfold_body(self, body: &mut ast::Suite) { let mut docstring = body_starts_with_docstring(body); if docstring && self.optimize >= 2 { remove_docstring_from_body(body); From 85ba1df3b1000618cac7651bdeb7b315da53a663 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Tue, 30 Jun 2026 17:40:29 +0300 Subject: [PATCH 161/339] Add more clippy rules (#8183) * clippy `assigning_clones` * string_lit_as_bytes * tuple_array_conversions * while_float * manual_assert * Revert "string_lit_as_bytes" This reverts commit f40f7564407c1378e0118a621eff782666536fc2. --- Cargo.toml | 4 ++++ crates/codegen/src/compile.rs | 2 +- crates/codegen/src/symboltable.rs | 3 ++- crates/common/src/float_ops.rs | 4 ++-- crates/common/src/hash.rs | 19 ++++++++++--------- crates/jit/src/instructions.rs | 5 +++++ crates/vm/src/function/builtin.rs | 7 ++++--- crates/vm/src/getpath.rs | 6 +++--- crates/vm/src/stdlib/os.rs | 7 +++---- crates/vm/src/types/slot.rs | 9 ++++----- crates/vm/src/vm/mod.rs | 4 +--- crates/vm/src/vm/vm_new.rs | 8 ++++---- 12 files changed, 43 insertions(+), 35 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 756d9ec13..89a07e1bd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -371,14 +371,17 @@ search_is_some = "warn" significant_drop_in_scrutinee = "warn" single_option_map = "warn" trait_duplication_in_bounds = "warn" +tuple_array_conversions = "warn" type_repetition_in_bounds = "warn" unnecessary_struct_initialization = "warn" unused_peekable = "warn" unused_rounding = "warn" use_self = "warn" useless_let_if_seq = "warn" +while_float = "warn" # pedantic lints to enforce gradually +assigning_clones = "warn" bool_to_int_with_if = "warn" checked_conversions = "warn" cloned_instead_of_copied = "warn" @@ -404,6 +407,7 @@ iter_filter_is_ok = "warn" iter_filter_is_some = "warn" large_futures = "warn" large_types_passed_by_value = "warn" +manual_assert = "warn" manual_instant_elapsed = "warn" manual_is_variant_and = "warn" map_unwrap_or = "warn" diff --git a/crates/codegen/src/compile.rs b/crates/codegen/src/compile.rs index 39500f1ad..6664ec34c 100644 --- a/crates/codegen/src/compile.rs +++ b/crates/codegen/src/compile.rs @@ -2157,7 +2157,7 @@ impl<'warnings> Compiler<'warnings> { fn expose_annotation_format_parameter(code: &mut CodeObject) { if let Some(first) = code.varnames.first_mut() { - *first = "format".to_owned(); + *first = String::from("format"); } } diff --git a/crates/codegen/src/symboltable.rs b/crates/codegen/src/symboltable.rs index a78b49a6e..a72b839f4 100644 --- a/crates/codegen/src/symboltable.rs +++ b/crates/codegen/src/symboltable.rs @@ -1632,8 +1632,9 @@ impl SymbolTableBuilder { } if type_params.is_none() { - self.class_name = prev_class.clone(); + self.class_name.clone_from(&prev_class); } + if let Some(arguments) = arguments { self.scan_expressions(&arguments.args, ExpressionContext::Load)?; for keyword in &arguments.keywords { diff --git a/crates/common/src/float_ops.rs b/crates/common/src/float_ops.rs index fed080dce..f64396153 100644 --- a/crates/common/src/float_ops.rs +++ b/crates/common/src/float_ops.rs @@ -4,8 +4,8 @@ use num_traits::{Signed, ToPrimitive}; #[must_use] pub const fn decompose_float(value: f64) -> (f64, i32) { - if 0.0 == value { - (0.0, 0i32) + if value == 0.0 { + (0.0, 0) } else { let bits = value.to_bits(); let exponent: i32 = ((bits >> 52) & 0x7ff) as i32 - 1022; diff --git a/crates/common/src/hash.rs b/crates/common/src/hash.rs index 5b16c89e7..91fd5e1cb 100644 --- a/crates/common/src/hash.rs +++ b/crates/common/src/hash.rs @@ -49,9 +49,7 @@ impl HashSecret { let k1 = u64::from_le_bytes(right.try_into().unwrap()); Self { k0, k1 } } -} -impl HashSecret { pub fn hash_value<T: Hash + ?Sized>(&self, data: &T) -> PyHash { fix_sentinel(mod_int(self.hash_one(data) as _)) } @@ -94,7 +92,7 @@ pub const fn hash_pointer(value: usize) -> PyHash { #[inline] #[must_use] -pub fn hash_float(value: f64) -> Option<PyHash> { +pub const fn hash_float(value: f64) -> Option<PyHash> { // cpython _Py_HashDouble if !value.is_finite() { return if value.is_infinite() { @@ -111,6 +109,8 @@ pub fn hash_float(value: f64) -> Option<PyHash> { let mut m = frexp.0; let mut e = frexp.1; let mut x: PyUHash = 0; + + #[expect(clippy::while_float, reason = "keep this loop like CPython does it")] while m != 0.0 { x = ((x << 28) & MODULUS) | (x >> (BITS - 28)); m *= 268_435_456.0; // 2**28 @@ -137,13 +137,14 @@ pub fn hash_float(value: f64) -> Option<PyHash> { #[must_use] pub fn hash_bigint(value: &BigInt) -> PyHash { - let ret = match value.to_i64() { - Some(i) => mod_int(i), - None => (value % MODULUS).to_i64().unwrap_or_else(|| unsafe { - // SAFETY: MODULUS < i64::MAX, so value % MODULUS is guaranteed to be in the range of i64 - core::hint::unreachable_unchecked() - }), + let ret = if let Some(v) = value.to_i64() { + mod_int(v) + } else { + // SAFETY: + // MODULUS < i64::MAX, so value % MODULUS is guaranteed to be in the range of i64 + unsafe { (value % MODULUS).to_i64().unwrap_unchecked() } }; + fix_sentinel(ret) } diff --git a/crates/jit/src/instructions.rs b/crates/jit/src/instructions.rs index 6aff9f093..9b4656da5 100644 --- a/crates/jit/src/instructions.rs +++ b/crates/jit/src/instructions.rs @@ -666,6 +666,11 @@ impl<'a, 'b> FunctionCompiler<'a, 'b> { | Instruction::LoadFastBorrowLoadFastBorrow { var_nums } => { let oparg = var_nums.get(arg); let (idx1, idx2) = oparg.indexes(); + + #[expect( + clippy::tuple_array_conversions, + reason = "Seems like a false positive" + )] for idx in [idx1, idx2] { let local = self.variables[idx] .as_ref() diff --git a/crates/vm/src/function/builtin.rs b/crates/vm/src/function/builtin.rs index 47cb8dfcb..a2753bdf1 100644 --- a/crates/vm/src/function/builtin.rs +++ b/crates/vm/src/function/builtin.rs @@ -57,9 +57,10 @@ const fn zst_ref_out_of_thin_air<T: 'static>(x: T) -> &'static T { // operation. if T isn't zero-sized, we don't have to worry about it because we'll fail to compile. core::mem::forget(x); const { - if core::mem::size_of::<T>() != 0 { - panic!("can't use a non-zero-sized type here") - } + assert!( + core::mem::size_of::<T>() == 0, + "can't use a non-zero-sized type here" + ); // SAFETY: we just confirmed that T is zero-sized, so we can // pull a value of it out of thin air. unsafe { core::ptr::NonNull::<T>::dangling().as_ref() } diff --git a/crates/vm/src/getpath.rs b/crates/vm/src/getpath.rs index 38aa122db..634547201 100644 --- a/crates/vm/src/getpath.rs +++ b/crates/vm/src/getpath.rs @@ -121,7 +121,7 @@ pub fn init_path_config(settings: &Settings) -> Paths { // - sys.executable should be the launcher path (where user invoked Python) // - sys._base_executable should be the real Python executable let exe_dir = if let Ok(launcher) = crate::host_env::os::var("__PYVENV_LAUNCHER__") { - paths.executable = launcher.clone(); + paths.executable.clone_from(&launcher); paths.base_executable = real_executable; PathBuf::from(&launcher).parent().map(PathBuf::from) } else { @@ -152,7 +152,7 @@ pub fn init_path_config(settings: &Settings) -> Paths { paths.base_prefix = calculated_prefix; } else { // Not in venv: prefix == base_prefix - paths.prefix = calculated_prefix.clone(); + paths.prefix.clone_from(&calculated_prefix); paths.base_prefix = calculated_prefix; } @@ -163,7 +163,7 @@ pub fn init_path_config(settings: &Settings) -> Paths { } else { calculate_exec_prefix(search_dir.as_ref(), paths.prefix.as_ref()) }; - paths.base_exec_prefix = paths.base_prefix.clone(); + paths.base_exec_prefix.clone_from(&paths.base_prefix); // Step 7: Calculate base_executable (if not already set by __PYVENV_LAUNCHER__) if paths.base_executable.is_empty() { diff --git a/crates/vm/src/stdlib/os.rs b/crates/vm/src/stdlib/os.rs index 4a1cbe2ae..3c216168f 100644 --- a/crates/vm/src/stdlib/os.rs +++ b/crates/vm/src/stdlib/os.rs @@ -1795,9 +1795,9 @@ pub(super) mod _os { #[cfg(all(unix, not(any(target_os = "redox", target_os = "android"))))] #[pyfunction] fn getloadavg(vm: &VirtualMachine) -> PyResult<(f64, f64, f64)> { - let loadavg = crate::host_env::time::getloadavg() - .map_err(|_| vm.new_os_error("Load averages are unobtainable"))?; - Ok((loadavg[0], loadavg[1], loadavg[2])) + crate::host_env::time::getloadavg() + .map(Into::into) + .map_err(|_| vm.new_os_error("Load averages are unobtainable")) } #[cfg(unix)] @@ -1918,7 +1918,6 @@ pub(super) mod _os { } } - /// Perform a statvfs system call on the given path. #[cfg(all(unix, not(target_os = "redox")))] #[pyfunction] #[pyfunction(name = "fstatvfs")] diff --git a/crates/vm/src/types/slot.rs b/crates/vm/src/types/slot.rs index 4197e1554..83d9706cb 100644 --- a/crates/vm/src/types/slot.rs +++ b/crates/vm/src/types/slot.rs @@ -1667,11 +1667,10 @@ pub trait Initializer: PyPayload { .matches(&class_name_for_debug as &str) .count() == 2; - if double_appearance { - panic!( - "This type `{class_name_for_debug}` doesn't seem to support `init`. Override `slot_init` instead: {msg}" - ); - } + assert!( + !double_appearance, + "This type `{class_name_for_debug}` doesn't seem to support `init`. Override `slot_init` instead: {msg}" + ) } } return Err(err); diff --git a/crates/vm/src/vm/mod.rs b/crates/vm/src/vm/mod.rs index 5766c5b8a..8ad8a0d0b 100644 --- a/crates/vm/src/vm/mod.rs +++ b/crates/vm/src/vm/mod.rs @@ -908,9 +908,7 @@ impl VirtualMachine { fn initialize(&mut self) { flame_guard!("init VirtualMachine"); - if self.initialized { - panic!("Double Initialize Error"); - } + assert!(!self.initialized, "Double Initialize Error"); // Initialize main thread ident before any threading operations #[cfg(feature = "threading")] diff --git a/crates/vm/src/vm/vm_new.rs b/crates/vm/src/vm/vm_new.rs index 2c053bdf8..c71cf8425 100644 --- a/crates/vm/src/vm/vm_new.rs +++ b/crates/vm/src/vm/vm_new.rs @@ -794,10 +794,10 @@ impl VirtualMachine { }; if syntax_error_type.is(self.ctx.exceptions.tab_error) { - syntax_error_info.msg = "inconsistent use of tabs and spaces in indentation".to_owned(); - } - if syntax_error_type.is(self.ctx.exceptions.incomplete_input_error) { - syntax_error_info.msg = "incomplete input".to_owned(); + syntax_error_info.msg = + String::from("inconsistent use of tabs and spaces in indentation"); + } else if syntax_error_type.is(self.ctx.exceptions.incomplete_input_error) { + syntax_error_info.msg = String::from("incomplete input"); } let SyntaxErrorInfo { msg, narrow_caret } = syntax_error_info; From 07c4701dbb17f5fc03d000e5241d09def4eaa893 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Jun 2026 23:41:02 +0900 Subject: [PATCH 162/339] Bump zizmorcore/zizmor-action from 0.5.6 to 0.5.7 (#8189) Bumps [zizmorcore/zizmor-action](https://github.com/zizmorcore/zizmor-action) from 0.5.6 to 0.5.7. - [Release notes](https://github.com/zizmorcore/zizmor-action/releases) - [Commits](https://github.com/zizmorcore/zizmor-action/compare/5f14fd08f7cf1cb1609c1e344975f152c7ee938d...192e21d79ab29983730a13d1382995c2307fbcaa) --- updated-dependencies: - dependency-name: zizmorcore/zizmor-action dependency-version: 0.5.7 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 72599d287..c2cb15353 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -533,7 +533,7 @@ jobs: uses: reviewdog/action-actionlint@6fb7acc99f4a1008869fa8a0f09cfca740837d9d # v1.72.0 - name: zizmor - uses: zizmorcore/zizmor-action@5f14fd08f7cf1cb1609c1e344975f152c7ee938d # v0.5.6 + uses: zizmorcore/zizmor-action@192e21d79ab29983730a13d1382995c2307fbcaa # v0.5.7 - name: restore prek cache uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5 From 7e75d415c9bf38259ccd9476406c2faf9cdff655 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Jun 2026 23:41:13 +0900 Subject: [PATCH 163/339] Bump libffi from 5.1.0 to 5.1.1 in the libffi group across 1 directory (#8190) Bumps the libffi group with 1 update in the / directory: [libffi](https://github.com/libffi-rs/libffi-rs). Updates `libffi` from 5.1.0 to 5.1.1 - [Commits](https://github.com/libffi-rs/libffi-rs/compare/libffi-v5.1.0...libffi-v5.1.1) --- updated-dependencies: - dependency-name: libffi dependency-version: 5.1.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: libffi ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 740ce5f09..0065f7787 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2080,9 +2080,9 @@ dependencies = [ [[package]] name = "libffi" -version = "5.1.0" +version = "5.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0498fe5655f857803e156523e644dcdcdc3b3c7edda42ea2afdae2e09b2db87b" +checksum = "ed185dbb87539a100c1b36c219e16e71572c6d4d4fed3ded898140f755adeaaf" dependencies = [ "libc", "libffi-sys", @@ -2090,9 +2090,9 @@ dependencies = [ [[package]] name = "libffi-sys" -version = "4.1.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d4f1d4ce15091955144350b75db16a96d4a63728500122706fb4d29a26afbb" +checksum = "25831b230b6a90bdea9f28339c1d00d59773a1c492e8ca09b1ad80e56394c261" dependencies = [ "cc", ] @@ -4340,7 +4340,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ "fastrand", - "getrandom 0.3.4", + "getrandom 0.4.3", "once_cell", "rustix", "windows-sys 0.52.0", From 174afd163910b97877d0880e07e3b9e31931dfee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Jun 2026 23:41:25 +0900 Subject: [PATCH 164/339] Bump phf from 0.13.1 to 0.14.0 in the phf group across 1 directory (#8191) Bumps the phf group with 1 update in the / directory: [phf](https://github.com/rust-phf/rust-phf). Updates `phf` from 0.13.1 to 0.14.0 - [Release notes](https://github.com/rust-phf/rust-phf/releases) - [Changelog](https://github.com/rust-phf/rust-phf/blob/main/RELEASE_PROCESS.md) - [Commits](https://github.com/rust-phf/rust-phf/compare/v0.13.1...v0.14.0) --- updated-dependencies: - dependency-name: phf dependency-version: 0.14.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: phf ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 48 ++++++++++++++++++++++++------------------------ Cargo.toml | 2 +- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0065f7787..322a13572 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -100,7 +100,7 @@ version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -111,7 +111,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -1145,7 +1145,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -1237,7 +1237,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -1946,7 +1946,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "160f2eade097f30263b548aae5deb12ad349c909baa710fa24b92c9090b2e006" dependencies = [ "scopeguard", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -2659,12 +2659,12 @@ dependencies = [ [[package]] name = "phf" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf" +checksum = "010378780309880b08997fae13be7834dba947d36393bd372f2b1556deb2a2f6" dependencies = [ "phf_macros", - "phf_shared 0.13.1", + "phf_shared 0.14.0", "serde", ] @@ -2690,22 +2690,22 @@ dependencies = [ [[package]] name = "phf_generator" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737" +checksum = "aeb62e0959d5a1bebc965f4d15d9e2b7cea002b6b0f5ba8cde6cc26738467100" dependencies = [ "fastrand", - "phf_shared 0.13.1", + "phf_shared 0.14.0", ] [[package]] name = "phf_macros" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "812f032b54b1e759ccd5f8b6677695d5268c588701effba24601f6932f8269ef" +checksum = "5fa8d0ca26d424d27630da600c6624696e7dec8bf7b3b492b383c5dc49e5e085" dependencies = [ - "phf_generator 0.13.1", - "phf_shared 0.13.1", + "phf_generator 0.14.0", + "phf_shared 0.14.0", "proc-macro2", "quote", "syn", @@ -2722,9 +2722,9 @@ dependencies = [ [[package]] name = "phf_shared" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266" +checksum = "c6fd9027e2d9319be6349febd1db4e8d02aa544921200c9b777720ac34a3aa89" dependencies = [ "siphasher", ] @@ -3319,7 +3319,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -3395,7 +3395,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -3565,7 +3565,7 @@ dependencies = [ name = "rustpython-doc" version = "0.5.0" dependencies = [ - "phf 0.13.1", + "phf 0.14.0", ] [[package]] @@ -3756,7 +3756,7 @@ dependencies = [ "paste", "pbkdf2", "pem-rfc7468 1.0.0", - "phf 0.13.1", + "phf 0.14.0", "pkcs8", "pymath", "rand 0.10.1", @@ -4199,7 +4199,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52d1cfed4120b4d927bf7c0f86d2087a4a7d6027c906d9f9d525a80573b9be51" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -4343,7 +4343,7 @@ dependencies = [ "getrandom 0.4.3", "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -4846,7 +4846,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 89a07e1bd..3b4cd480b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -190,7 +190,7 @@ ruff_text_size = { package = "rustpython-ruff_text_size", git = "https://github. ruff_source_file = { package = "rustpython-ruff_source_file", git = "https://github.com/RustPython/ruff.git", tag = "0.15.19-rustpython" } der = { version = "0.8", features = ["alloc", "oid", "pem", "zeroize"] } -phf = { version = "0.13.1", default-features = false, features = ["macros"]} +phf = { version = "0.14.0", default-features = false, features = ["macros"]} adler32 = "1.2.0" approx = "0.5.1" ascii = "1.1" From 2d8a60b240b69c8e0cf4a104dc5806dfe9a294cb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Jun 2026 23:41:35 +0900 Subject: [PATCH 165/339] Bump rustyline in the unix group across 1 directory (#8192) Bumps the unix group with 1 update in the / directory: [rustyline](https://github.com/kkawakam/rustyline). Updates `rustyline` from 18.0.0 to 18.0.1 - [Release notes](https://github.com/kkawakam/rustyline/releases) - [Changelog](https://github.com/kkawakam/rustyline/blob/master/History.md) - [Commits](https://github.com/kkawakam/rustyline/compare/v18.0.0...v18.0.1) --- updated-dependencies: - dependency-name: rustyline dependency-version: 18.0.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: unix ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 322a13572..cb4ccbaff 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3896,9 +3896,9 @@ checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "rustyline" -version = "18.0.0" +version = "18.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a990b25f351b25139ddc7f21ee3f6f56f86d6846b74ac8fad3a719a287cd4a0" +checksum = "53f6a737db68eb1a8ccff86b584b2fc13eca6a7bb6f78ebc7c529547e3ab9684" dependencies = [ "bitflags 2.13.0", "cfg-if", From 6712156e0079dcfe18f3d6f27e44a9f80b2f5b73 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Jun 2026 23:41:44 +0900 Subject: [PATCH 166/339] Bump libz-rs-sys from 0.6.3 to 0.6.4 (#8193) Bumps [libz-rs-sys](https://github.com/trifectatechfoundation/zlib-rs) from 0.6.3 to 0.6.4. - [Release notes](https://github.com/trifectatechfoundation/zlib-rs/releases) - [Changelog](https://github.com/trifectatechfoundation/zlib-rs/blob/main/docs/release.md) - [Commits](https://github.com/trifectatechfoundation/zlib-rs/compare/v0.6.3...v0.6.4) --- updated-dependencies: - dependency-name: libz-rs-sys dependency-version: 0.6.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cb4ccbaff..90f5c318b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2145,9 +2145,9 @@ dependencies = [ [[package]] name = "libz-rs-sys" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1116a951fd9d5110720bb2ae66f72ce5d7b10bd8aa8744924677157089ce13f" +checksum = "3deaad727e11899800b9a177af14682bfa5d5d96fa525a6c9bd13e650c019f40" dependencies = [ "zlib-rs", ] @@ -5292,9 +5292,9 @@ dependencies = [ [[package]] name = "zlib-rs" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be3d40e40a133f9c916ee3f9f4fa2d9d63435b5fbe1bfc6d9dae0aa0ada1513" +checksum = "977347db8caa080403f6b6b7c1cda9479a8e869316f7e13a59b19076a40f94e3" [[package]] name = "zmij" From f4de973ebdfba040da5c3c75ae562aab58249319 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Jun 2026 23:41:56 +0900 Subject: [PATCH 167/339] Bump github/gh-aw/actions/setup from 0.79.9 to 0.80.9 (#8194) Bumps [github/gh-aw/actions/setup](https://github.com/github/gh-aw) from 0.79.9 to 0.80.9. - [Release notes](https://github.com/github/gh-aw/releases) - [Changelog](https://github.com/github/gh-aw/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/gh-aw/compare/54ad1f83a833db4de127cf278b00438e19a103a0...a3624368c4e7d877586ff2784b61de73405e2cdd) --- updated-dependencies: - dependency-name: github/gh-aw/actions/setup dependency-version: 0.80.9 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/upgrade-pylib.lock.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/upgrade-pylib.lock.yml b/.github/workflows/upgrade-pylib.lock.yml index 17361719a..bdddf025d 100644 --- a/.github/workflows/upgrade-pylib.lock.yml +++ b/.github/workflows/upgrade-pylib.lock.yml @@ -58,7 +58,7 @@ jobs: comment_repo: "" steps: - name: Setup Scripts - uses: github/gh-aw/actions/setup@54ad1f83a833db4de127cf278b00438e19a103a0 # v0.79.9 + uses: github/gh-aw/actions/setup@a3624368c4e7d877586ff2784b61de73405e2cdd # v0.80.9 with: destination: /opt/gh-aw/actions - name: Check workflow file timestamps @@ -99,7 +99,7 @@ jobs: secret_verification_result: ${{ steps.validate-secret.outputs.verification_result }} steps: - name: Setup Scripts - uses: github/gh-aw/actions/setup@54ad1f83a833db4de127cf278b00438e19a103a0 # v0.79.9 + uses: github/gh-aw/actions/setup@a3624368c4e7d877586ff2784b61de73405e2cdd # v0.80.9 with: destination: /opt/gh-aw/actions - name: Checkout repository @@ -806,7 +806,7 @@ jobs: total_count: ${{ steps.missing_tool.outputs.total_count }} steps: - name: Setup Scripts - uses: github/gh-aw/actions/setup@54ad1f83a833db4de127cf278b00438e19a103a0 # v0.79.9 + uses: github/gh-aw/actions/setup@a3624368c4e7d877586ff2784b61de73405e2cdd # v0.80.9 with: destination: /opt/gh-aw/actions - name: Download agent output artifact @@ -927,7 +927,7 @@ jobs: success: ${{ steps.parse_results.outputs.success }} steps: - name: Setup Scripts - uses: github/gh-aw/actions/setup@54ad1f83a833db4de127cf278b00438e19a103a0 # v0.79.9 + uses: github/gh-aw/actions/setup@a3624368c4e7d877586ff2784b61de73405e2cdd # v0.80.9 with: destination: /opt/gh-aw/actions - name: Download agent artifacts @@ -1039,7 +1039,7 @@ jobs: process_safe_outputs_temporary_id_map: ${{ steps.process_safe_outputs.outputs.temporary_id_map }} steps: - name: Setup Scripts - uses: github/gh-aw/actions/setup@54ad1f83a833db4de127cf278b00438e19a103a0 # v0.79.9 + uses: github/gh-aw/actions/setup@a3624368c4e7d877586ff2784b61de73405e2cdd # v0.80.9 with: destination: /opt/gh-aw/actions - name: Download agent output artifact From 0b8bd2a355115bb9c74aa8e3f753ae57d89984ff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Jun 2026 23:42:06 +0900 Subject: [PATCH 168/339] Bump reviewdog/action-suggester from 1.24.0 to 1.24.3 (#8195) Bumps [reviewdog/action-suggester](https://github.com/reviewdog/action-suggester) from 1.24.0 to 1.24.3. - [Release notes](https://github.com/reviewdog/action-suggester/releases) - [Commits](https://github.com/reviewdog/action-suggester/compare/aa38384ceb608d00f84b4690cacc83a5aba307ff...2558ba17e65a9039e73764a73009fc05fef28a46) --- updated-dependencies: - dependency-name: reviewdog/action-suggester dependency-version: 1.24.3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c2cb15353..373c7c519 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -584,7 +584,7 @@ jobs: - name: reviewdog if: ${{ !cancelled() }} - uses: reviewdog/action-suggester@aa38384ceb608d00f84b4690cacc83a5aba307ff # v1.24.0 + uses: reviewdog/action-suggester@2558ba17e65a9039e73764a73009fc05fef28a46 # v1.24.3 with: level: warning fail_level: error From c988994448d94ea51247bd93cdb1c83bd752a4dc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Jun 2026 23:42:18 +0900 Subject: [PATCH 169/339] Bump cargo-bins/cargo-binstall from 1.20.0 to 1.20.1 (#8196) Bumps [cargo-bins/cargo-binstall](https://github.com/cargo-bins/cargo-binstall) from 1.20.0 to 1.20.1. - [Release notes](https://github.com/cargo-bins/cargo-binstall/releases) - [Changelog](https://github.com/cargo-bins/cargo-binstall/blob/main/release-plz.toml) - [Commits](https://github.com/cargo-bins/cargo-binstall/compare/30b5ca8b54e1dcffd9548bc87ede1531310fdc67...732870f031d2fb36309d0deaf36abcc704a7be65) --- updated-dependencies: - dependency-name: cargo-bins/cargo-binstall dependency-version: 1.20.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 373c7c519..2a8dfec73 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -502,7 +502,7 @@ jobs: - uses: dtolnay/rust-toolchain@stable - - uses: cargo-bins/cargo-binstall@30b5ca8b54e1dcffd9548bc87ede1531310fdc67 # v1.20.0 + - uses: cargo-bins/cargo-binstall@732870f031d2fb36309d0deaf36abcc704a7be65 # v1.20.1 - name: cargo shear run: | From bf0124b10e64c82f7b8a876dbf24102cdf31af09 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Jun 2026 23:48:21 +0900 Subject: [PATCH 170/339] Bump actions/checkout from 6.0.3 to 7.0.0 (#8197) Bumps [actions/checkout](https://github.com/actions/checkout) from 6.0.3 to 7.0.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/df4cb1c069e1874edd31b4311f1884172cec0e10...9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: 7.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 24 +++++++++++------------ .github/workflows/cron-ci.yaml | 8 ++++---- .github/workflows/lib-deps-check.yaml | 4 ++-- .github/workflows/release.yml | 6 +++--- .github/workflows/update-caches.yml | 2 +- .github/workflows/update-doc-db.yml | 4 ++-- .github/workflows/update-libs-status.yaml | 4 ++-- .github/workflows/upgrade-pylib.lock.yml | 4 ++-- 8 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2a8dfec73..9f76984be 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -43,7 +43,7 @@ jobs: # Flag that is raised when any rust code is changed. rust_code: ${{ steps.check_rust_code.outputs.changed }} steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: fetch-depth: 0 persist-credentials: false @@ -87,7 +87,7 @@ jobs: os: [macos-latest, ubuntu-latest, windows-2025] fail-fast: false steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: persist-credentials: false @@ -203,7 +203,7 @@ jobs: target: x86_64-apple-darwin fail-fast: false steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: persist-credentials: false @@ -314,7 +314,7 @@ jobs: timeout: 50 fail-fast: false steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: persist-credentials: false @@ -458,7 +458,7 @@ jobs: - ubuntu-latest - windows-latest steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: persist-credentials: false @@ -496,7 +496,7 @@ jobs: needs.determine_changes.outputs.rust_code == 'true' || github.ref == 'refs/heads/main' steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: persist-credentials: false @@ -519,7 +519,7 @@ jobs: pull-requests: write security-events: write # for zizmor steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: persist-credentials: false @@ -559,7 +559,7 @@ jobs: echo "version=${version}" >> "$GITHUB_OUTPUT" - name: Clone CPython - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: repository: python/cpython path: cpython @@ -597,7 +597,7 @@ jobs: env: NIGHTLY_CHANNEL: nightly steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: persist-credentials: false @@ -632,7 +632,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: persist-credentials: false @@ -747,7 +747,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: persist-credentials: false @@ -799,7 +799,7 @@ jobs: name: cargo doc runs-on: ubuntu-latest steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: persist-credentials: false diff --git a/.github/workflows/cron-ci.yaml b/.github/workflows/cron-ci.yaml index 4e5ed04ea..a3b91fde4 100644 --- a/.github/workflows/cron-ci.yaml +++ b/.github/workflows/cron-ci.yaml @@ -27,7 +27,7 @@ jobs: env: INSTA_WORKSPACE_ROOT: ${{ github.workspace }} steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: persist-credentials: false @@ -67,7 +67,7 @@ jobs: # Disable this scheduled job when running on a fork. if: ${{ github.repository == 'RustPython/RustPython' || github.event_name != 'schedule' }} steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: persist-credentials: true @@ -105,7 +105,7 @@ jobs: # Disable this scheduled job when running on a fork. if: ${{ github.repository == 'RustPython/RustPython' || github.event_name != 'schedule' }} steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: persist-credentials: true @@ -168,7 +168,7 @@ jobs: # Disable this scheduled job when running on a fork. if: ${{ github.repository == 'RustPython/RustPython' || github.event_name != 'schedule' }} steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: persist-credentials: true diff --git a/.github/workflows/lib-deps-check.yaml b/.github/workflows/lib-deps-check.yaml index e74dd561b..eb4561daa 100644 --- a/.github/workflows/lib-deps-check.yaml +++ b/.github/workflows/lib-deps-check.yaml @@ -18,7 +18,7 @@ jobs: timeout-minutes: 10 steps: - name: Checkout base branch - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: # Use base branch for scripts (security: don't run PR code with elevated permissions) ref: ${{ github.event.pull_request.base.ref }} @@ -41,7 +41,7 @@ jobs: echo "version=${version}" >> "$GITHUB_OUTPUT" - name: Checkout CPython - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: repository: python/cpython path: cpython diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 21a0068cb..cd66ae845 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -52,7 +52,7 @@ jobs: # target: aarch64-pc-windows-msvc fail-fast: false steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: persist-credentials: false @@ -91,7 +91,7 @@ jobs: permissions: contents: read steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: persist-credentials: false @@ -156,7 +156,7 @@ jobs: permissions: contents: write # for creating a release steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: persist-credentials: false diff --git a/.github/workflows/update-caches.yml b/.github/workflows/update-caches.yml index 5e99abac6..3a48418a5 100644 --- a/.github/workflows/update-caches.yml +++ b/.github/workflows/update-caches.yml @@ -39,7 +39,7 @@ jobs: target: "" steps: - name: Checkout RustPython main branch - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: repository: RustPython/RustPython ref: main diff --git a/.github/workflows/update-doc-db.yml b/.github/workflows/update-doc-db.yml index a543f428c..c7dad17d2 100644 --- a/.github/workflows/update-doc-db.yml +++ b/.github/workflows/update-doc-db.yml @@ -30,7 +30,7 @@ jobs: - windows-latest - macos-latest steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: persist-credentials: false sparse-checkout: | @@ -58,7 +58,7 @@ jobs: contents: write pull-requests: write steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: persist-credentials: true ref: ${{ inputs.base-ref }} diff --git a/.github/workflows/update-libs-status.yaml b/.github/workflows/update-libs-status.yaml index 837586913..846818e12 100644 --- a/.github/workflows/update-libs-status.yaml +++ b/.github/workflows/update-libs-status.yaml @@ -21,7 +21,7 @@ jobs: if: ${{ github.repository == 'RustPython/RustPython' }} steps: - name: Clone RustPython - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: path: rustpython persist-credentials: false @@ -37,7 +37,7 @@ jobs: echo "version=${version}" >> "$GITHUB_OUTPUT" - name: Clone CPython - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: repository: python/cpython path: cpython diff --git a/.github/workflows/upgrade-pylib.lock.yml b/.github/workflows/upgrade-pylib.lock.yml index bdddf025d..318657d52 100644 --- a/.github/workflows/upgrade-pylib.lock.yml +++ b/.github/workflows/upgrade-pylib.lock.yml @@ -103,7 +103,7 @@ jobs: with: destination: /opt/gh-aw/actions - name: Checkout repository - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: persist-credentials: false - name: Setup Python @@ -1061,7 +1061,7 @@ jobs: path: /tmp/gh-aw/ - name: Checkout repository if: ((!cancelled()) && (needs.agent.result != 'skipped')) && (contains(needs.agent.outputs.output_types, 'create_pull_request')) - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: token: ${{ github.token }} persist-credentials: false From 8003fe04dc51ecd870ea91c7141dafc09d562382 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Jun 2026 23:48:39 +0900 Subject: [PATCH 171/339] Bump https://github.com/astral-sh/ruff-pre-commit (#8198) Bumps [https://github.com/astral-sh/ruff-pre-commit](https://github.com/astral-sh/ruff-pre-commit) from v0.15.17 to 0.15.18. - [Release notes](https://github.com/astral-sh/ruff-pre-commit/releases) - [Commits](https://github.com/astral-sh/ruff-pre-commit/compare/v0.15.17...v0.15.18) --- updated-dependencies: - dependency-name: https://github.com/astral-sh/ruff-pre-commit dependency-version: 0.15.18 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 07edb8a05..3c743dc6c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -10,7 +10,7 @@ repos: priority: 0 - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.15.17 + rev: v0.15.18 hooks: - id: ruff-format priority: 0 From 61ad3081066eebe16700bd4f9bd83ad53b8e2e7e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Jun 2026 23:48:55 +0900 Subject: [PATCH 172/339] Bump https://github.com/streetsidesoftware/cspell-cli (#8199) Bumps [https://github.com/streetsidesoftware/cspell-cli](https://github.com/streetsidesoftware/cspell-cli) from v10.0.0 to 10.0.1. - [Release notes](https://github.com/streetsidesoftware/cspell-cli/releases) - [Changelog](https://github.com/streetsidesoftware/cspell-cli/blob/main/CHANGELOG.md) - [Commits](https://github.com/streetsidesoftware/cspell-cli/compare/v10.0.0...v10.0.1) --- updated-dependencies: - dependency-name: https://github.com/streetsidesoftware/cspell-cli dependency-version: 10.0.1 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3c743dc6c..52245bb33 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -63,7 +63,7 @@ repos: - manual - repo: https://github.com/streetsidesoftware/cspell-cli - rev: v10.0.0 + rev: v10.0.1 hooks: - id: cspell types: [rust] From d93dd2a781e55e7d0c94140851f3fa57fcb1a52c Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Tue, 30 Jun 2026 17:49:27 +0300 Subject: [PATCH 173/339] Update `test_sqlite3` to 3.14.6 (#8172) --- Lib/test/test_sqlite3/__init__.py | 11 +- Lib/test/test_sqlite3/test_backup.py | 2 +- Lib/test/test_sqlite3/test_dbapi.py | 57 +++++--- Lib/test/test_sqlite3/test_dump.py | 14 +- Lib/test/test_sqlite3/test_factory.py | 25 ++-- Lib/test/test_sqlite3/test_hooks.py | 152 ++++++++++++++++++-- Lib/test/test_sqlite3/test_regression.py | 10 +- Lib/test/test_sqlite3/test_transactions.py | 14 +- Lib/test/test_sqlite3/test_userfunctions.py | 48 +++---- 9 files changed, 250 insertions(+), 83 deletions(-) diff --git a/Lib/test/test_sqlite3/__init__.py b/Lib/test/test_sqlite3/__init__.py index 78a1e2078..145f3b800 100644 --- a/Lib/test/test_sqlite3/__init__.py +++ b/Lib/test/test_sqlite3/__init__.py @@ -6,9 +6,14 @@ import_helper.import_module('_sqlite3') import os import sqlite3 +# make sure only print once +_printed_version = False + # Implement the unittest "load tests" protocol. -def load_tests(*args): - if verbose: +def load_tests(loader, tests, pattern): + global _printed_version + if verbose and not _printed_version: print(f"test_sqlite3: testing with SQLite version {sqlite3.sqlite_version}") + _printed_version = True pkg_dir = os.path.dirname(__file__) - return load_package_tests(pkg_dir, *args) + return load_package_tests(pkg_dir, loader, tests, pattern) diff --git a/Lib/test/test_sqlite3/test_backup.py b/Lib/test/test_sqlite3/test_backup.py index 9d31978b1..bc24831a0 100644 --- a/Lib/test/test_sqlite3/test_backup.py +++ b/Lib/test/test_sqlite3/test_backup.py @@ -103,7 +103,7 @@ class BackupTests(unittest.TestCase): self.assertEqual(len(journal), 1) self.assertEqual(journal[0], 0) - @unittest.expectedFailure # TODO: RUSTPYTHON + @unittest.expectedFailure # TODO: RUSTPYTHON def test_non_callable_progress(self): with self.assertRaises(TypeError) as cm: with memory_database() as bck: diff --git a/Lib/test/test_sqlite3/test_dbapi.py b/Lib/test/test_sqlite3/test_dbapi.py index 2174e14e7..68faf0a2a 100644 --- a/Lib/test/test_sqlite3/test_dbapi.py +++ b/Lib/test/test_sqlite3/test_dbapi.py @@ -364,7 +364,7 @@ class ConnectionTests(unittest.TestCase): with self.cx: pass - @unittest.expectedFailure # TODO: RUSTPYTHON + @unittest.expectedFailure # TODO: RUSTPYTHON def test_exceptions(self): # Optional DB-API extension. self.assertEqual(self.cx.Warning, sqlite.Warning) @@ -401,7 +401,7 @@ class ConnectionTests(unittest.TestCase): with self.assertRaises(AttributeError): self.cx.in_transaction = True - @unittest.expectedFailure # TODO: RUSTPYTHON + @unittest.expectedFailure # TODO: RUSTPYTHON def test_connection_exceptions(self): exceptions = [ "DataError", @@ -527,7 +527,7 @@ class ConnectionTests(unittest.TestCase): cx.executemany, "insert into t values(?)", ((v,) for v in range(3))) - @unittest.expectedFailure # TODO: RUSTPYTHON SQLITE_DBCONFIG constants not implemented + @unittest.expectedFailure # TODO: RUSTPYTHON; SQLITE_DBCONFIG constants not implemented def test_connection_config(self): op = sqlite.SQLITE_DBCONFIG_ENABLE_FKEY with memory_database() as cx: @@ -552,7 +552,7 @@ class ConnectionTests(unittest.TestCase): with self.assertRaisesRegex(sqlite.IntegrityError, "constraint"): cx.execute("insert into u values(0)") - @unittest.expectedFailure # TODO: RUSTPYTHON deprecation warning not emitted for positional args + @unittest.expectedFailure # TODO: RUSTPYTHON; deprecation warning not emitted for positional args def test_connect_positional_arguments(self): regex = ( r"Passing more than 1 positional argument to sqlite3.connect\(\)" @@ -566,14 +566,14 @@ class ConnectionTests(unittest.TestCase): cx.close() self.assertEqual(cm.filename, __file__) - @unittest.expectedFailure # TODO: RUSTPYTHON ResourceWarning not emitted + @unittest.expectedFailure # TODO: RUSTPYTHON; ResourceWarning not emitted def test_connection_resource_warning(self): with self.assertWarns(ResourceWarning): cx = sqlite.connect(":memory:") del cx gc_collect() - @unittest.expectedFailure # TODO: RUSTPYTHON Connection signature inspection not working + @unittest.expectedFailure # TODO: RUSTPYTHON; Connection signature inspection not working def test_connection_signature(self): from inspect import signature sig = signature(self.cx) @@ -584,7 +584,7 @@ class UninitialisedConnectionTests(unittest.TestCase): def setUp(self): self.cx = sqlite.Connection.__new__(sqlite.Connection) - @unittest.skip('TODO: RUSTPYTHON') + @unittest.skip("TODO: RUSTPYTHON") def test_uninit_operations(self): funcs = ( lambda: self.cx.isolation_level, @@ -726,7 +726,7 @@ class OpenTests(unittest.TestCase): self.assertTrue(os.path.exists(path)) cx.execute(self._sql) - @unittest.expectedFailure # TODO: RUSTPYTHON + @unittest.expectedFailure # TODO: RUSTPYTHON def test_factory_database_arg(self): def factory(database, *args, **kwargs): nonlocal database_arg @@ -875,7 +875,7 @@ class CursorTests(unittest.TestCase): with self.assertRaises(ZeroDivisionError): self.cu.execute("select name from test where name=?", L()) - @unittest.expectedFailure # TODO: RUSTPYTHON mixed named and positional parameters not validated + @unittest.expectedFailure # TODO: RUSTPYTHON; mixed named and positional parameters not validated def test_execute_named_param_and_sequence(self): dataset = ( ("select :a", (1,)), @@ -1396,6 +1396,11 @@ class BlobTests(unittest.TestCase): def test_blob_get_empty_slice(self): self.assertEqual(self.blob[5:5], b"") + def test_blob_get_empty_slice_oob_indices(self): + self.cx.execute("insert into test(b) values (?)", (b"abc",)) + with self.cx.blobopen("test", "b", 2) as blob: + self.assertEqual(blob[5:-5], b"") + def test_blob_get_slice_negative_index(self): self.assertEqual(self.blob[5:-5], self.data[5:-5]) @@ -1412,6 +1417,18 @@ class BlobTests(unittest.TestCase): self.blob[0:0] = b"" self.assertEqual(self.blob[:], self.data) + def test_blob_set_empty_slice_wrong_type(self): + with self.assertRaises(TypeError): + self.blob[5:5] = None + + def test_blob_set_empty_slice_wrong_size(self): + with self.assertRaisesRegex(IndexError, "wrong size"): + self.blob[5:5] = b"123" + + def test_blob_set_empty_slice_correct(self): + self.blob[5:5] = b"" + self.assertEqual(self.blob[:], self.data) + def test_blob_set_slice_with_skip(self): self.blob[0:10:2] = b"12345" actual = self.cx.execute("select b from test").fetchone()[0] @@ -1603,7 +1620,7 @@ class ThreadTests(unittest.TestCase): with self.subTest(fn=fn): self._run_test(fn) - @unittest.expectedFailure # TODO: RUSTPYTHON + @unittest.expectedFailure # TODO: RUSTPYTHON def test_check_cursor_thread(self): fns = [ lambda: self.cur.execute("insert into test(name) values('a')"), @@ -1758,29 +1775,29 @@ class ClosedConTests(unittest.TestCase): self.cur = self.con.cursor() self.con.close() - @unittest.expectedFailure # TODO: RUSTPYTHON error message differs for closed connection + @unittest.expectedFailure # TODO: RUSTPYTHON; error message differs for closed connection def test_closed_con_cursor(self): self.check(self.con.cursor) - @unittest.expectedFailure # TODO: RUSTPYTHON error message differs for closed connection + @unittest.expectedFailure # TODO: RUSTPYTHON; error message differs for closed connection def test_closed_con_commit(self): self.check(self.con.commit) - @unittest.expectedFailure # TODO: RUSTPYTHON error message differs for closed connection + @unittest.expectedFailure # TODO: RUSTPYTHON; error message differs for closed connection def test_closed_con_rollback(self): self.check(self.con.rollback) - @unittest.expectedFailure # TODO: RUSTPYTHON error message differs for closed connection + @unittest.expectedFailure # TODO: RUSTPYTHON; error message differs for closed connection def test_closed_cur_execute(self): self.check(self.cur.execute, "select 4") - @unittest.expectedFailure # TODO: RUSTPYTHON error message differs for closed connection + @unittest.expectedFailure # TODO: RUSTPYTHON; error message differs for closed connection def test_closed_create_function(self): def f(x): return 17 self.check(self.con.create_function, "foo", 1, f) - @unittest.expectedFailure # TODO: RUSTPYTHON error message differs for closed connection + @unittest.expectedFailure # TODO: RUSTPYTHON; error message differs for closed connection def test_closed_create_aggregate(self): class Agg: def __init__(self): @@ -1791,19 +1808,19 @@ class ClosedConTests(unittest.TestCase): return 17 self.check(self.con.create_aggregate, "foo", 1, Agg) - @unittest.expectedFailure # TODO: RUSTPYTHON error message differs for closed connection + @unittest.expectedFailure # TODO: RUSTPYTHON; error message differs for closed connection def test_closed_set_authorizer(self): def authorizer(*args): return sqlite.DENY self.check(self.con.set_authorizer, authorizer) - @unittest.expectedFailure # TODO: RUSTPYTHON error message differs for closed connection + @unittest.expectedFailure # TODO: RUSTPYTHON; error message differs for closed connection def test_closed_set_progress_callback(self): def progress(): pass self.check(self.con.set_progress_handler, progress, 100) - @unittest.expectedFailure # TODO: RUSTPYTHON error message differs for closed connection + @unittest.expectedFailure # TODO: RUSTPYTHON; error message differs for closed connection def test_closed_call(self): self.check(self.con) @@ -2037,7 +2054,7 @@ class RowTests(unittest.TestCase): self.assertNotEqual(r1, r3) - @unittest.expectedFailure # TODO: RUSTPYTHON Row with no description fails + @unittest.expectedFailure # TODO: RUSTPYTHON; Row with no description fails def test_row_no_description(self): cu = self.cx.cursor() self.assertIsNone(cu.description) diff --git a/Lib/test/test_sqlite3/test_dump.py b/Lib/test/test_sqlite3/test_dump.py index 74aacc05c..9ba71a49c 100644 --- a/Lib/test/test_sqlite3/test_dump.py +++ b/Lib/test/test_sqlite3/test_dump.py @@ -9,7 +9,7 @@ from .util import requires_virtual_table class DumpTests(MemoryDatabaseMixin, unittest.TestCase): - @unittest.expectedFailure # TODO: RUSTPYTHON + @unittest.expectedFailure # TODO: RUSTPYTHON def test_table_dump(self): expected_sqls = [ "PRAGMA foreign_keys=OFF;", @@ -57,7 +57,7 @@ class DumpTests(MemoryDatabaseMixin, unittest.TestCase): [self.assertEqual(expected_sqls[i], actual_sqls[i]) for i in range(len(expected_sqls))] - @unittest.expectedFailure # TODO: RUSTPYTHON iterdump filter parameter not implemented + @unittest.expectedFailure # TODO: RUSTPYTHON; iterdump filter parameter not implemented def test_table_dump_filter(self): all_table_sqls = [ """CREATE TABLE "some_table_2" ("id_1" INTEGER);""", @@ -128,7 +128,7 @@ class DumpTests(MemoryDatabaseMixin, unittest.TestCase): ["BEGIN TRANSACTION;", *all_table_sqls, *all_views_sqls, "COMMIT;"], ) - @unittest.expectedFailure # TODO: RUSTPYTHON _iterdump not implemented + @unittest.expectedFailure # TODO: RUSTPYTHON; _iterdump not implemented def test_dump_autoincrement(self): expected = [ 'CREATE TABLE "t1" (id integer primary key autoincrement);', @@ -149,7 +149,7 @@ class DumpTests(MemoryDatabaseMixin, unittest.TestCase): actual = [stmt for stmt in self.cx.iterdump()] self.assertEqual(expected, actual) - @unittest.expectedFailure # TODO: RUSTPYTHON _iterdump not implemented + @unittest.expectedFailure # TODO: RUSTPYTHON; _iterdump not implemented def test_dump_autoincrement_create_new_db(self): self.cu.execute("BEGIN TRANSACTION") self.cu.execute("CREATE TABLE t1 (id integer primary key autoincrement)") @@ -175,7 +175,7 @@ class DumpTests(MemoryDatabaseMixin, unittest.TestCase): rows = res.fetchall() self.assertEqual(rows[0][0], seq) - @unittest.expectedFailure # TODO: RUSTPYTHON _iterdump not implemented + @unittest.expectedFailure # TODO: RUSTPYTHON; _iterdump not implemented def test_unorderable_row(self): # iterdump() should be able to cope with unorderable row types (issue #15545) class UnorderableRow: @@ -197,7 +197,7 @@ class DumpTests(MemoryDatabaseMixin, unittest.TestCase): got = list(self.cx.iterdump()) self.assertEqual(expected, got) - @unittest.expectedFailure # TODO: RUSTPYTHON _iterdump not implemented + @unittest.expectedFailure # TODO: RUSTPYTHON; _iterdump not implemented def test_dump_custom_row_factory(self): # gh-118221: iterdump should be able to cope with custom row factories. def dict_factory(cu, row): @@ -213,7 +213,7 @@ class DumpTests(MemoryDatabaseMixin, unittest.TestCase): self.assertEqual(expected, actual) self.assertEqual(self.cx.row_factory, dict_factory) - @unittest.expectedFailure # TODO: RUSTPYTHON _iterdump not implemented + @unittest.expectedFailure # TODO: RUSTPYTHON; _iterdump not implemented @requires_virtual_table("fts4") def test_dump_virtual_tables(self): # gh-64662 diff --git a/Lib/test/test_sqlite3/test_factory.py b/Lib/test/test_sqlite3/test_factory.py index 2816bd912..4345df7ae 100644 --- a/Lib/test/test_sqlite3/test_factory.py +++ b/Lib/test/test_sqlite3/test_factory.py @@ -40,7 +40,7 @@ class MyCursor(sqlite.Cursor): self.row_factory = dict_factory class ConnectionFactoryTests(unittest.TestCase): - @unittest.expectedFailure # TODO: RUSTPYTHON + @unittest.expectedFailure # TODO: RUSTPYTHON def test_connection_factories(self): class DefectFactory(sqlite.Connection): def __init__(self, *args, **kwargs): @@ -56,7 +56,7 @@ class ConnectionFactoryTests(unittest.TestCase): with memory_database(factory=DefectFactory) as con: self.assertIsInstance(con, DefectFactory) - @unittest.expectedFailure # TODO: RUSTPYTHON + @unittest.expectedFailure # TODO: RUSTPYTHON def test_connection_factory_relayed_call(self): # gh-95132: keyword args must not be passed as positional args class Factory(sqlite.Connection): @@ -68,7 +68,7 @@ class ConnectionFactoryTests(unittest.TestCase): self.assertIsNone(con.isolation_level) self.assertIsInstance(con, Factory) - @unittest.expectedFailure # TODO: RUSTPYTHON + @unittest.expectedFailure # TODO: RUSTPYTHON def test_connection_factory_as_positional_arg(self): class Factory(sqlite.Connection): def __init__(self, *args, **kwargs): @@ -90,9 +90,6 @@ class ConnectionFactoryTests(unittest.TestCase): class CursorFactoryTests(MemoryDatabaseMixin, unittest.TestCase): - def tearDown(self): - self.con.close() - def test_is_instance(self): cur = self.con.cursor() self.assertIsInstance(cur, sqlite.Cursor) @@ -131,7 +128,7 @@ class RowFactoryTests(MemoryDatabaseMixin, unittest.TestCase): row = self.con.execute("select 1, 2").fetchone() self.assertIsInstance(row, list) - @unittest.expectedFailure # TODO: RUSTPYTHON + @unittest.expectedFailure # TODO: RUSTPYTHON def test_sqlite_row_index(self): row = self.con.execute("select 1 as a_1, 2 as b").fetchone() self.assertIsInstance(row, sqlite.Row) @@ -162,7 +159,19 @@ class RowFactoryTests(MemoryDatabaseMixin, unittest.TestCase): with self.assertRaises(IndexError): row[complex()] # index must be int or string - @unittest.expectedFailure # TODO: RUSTPYTHON + @unittest.expectedFailure # TODO: RUSTPYTHON; TypeError: can't delete attribute + def test_delete_connection_row_factory(self): + # gh-149738: deleting row_factory should raise an exception + with self.assertRaises(AttributeError): + del self.con.row_factory + + @unittest.expectedFailure # TODO: RUSTPYTHON; TypeError: can't delete attribute + def test_delete_connection_text_factory(self): + # gh-149738: deleting text_factory should raise an exception + with self.assertRaises(AttributeError): + del self.con.text_factory + + @unittest.expectedFailure # TODO: RUSTPYTHON def test_sqlite_row_index_unicode(self): row = self.con.execute("select 1 as \xff").fetchone() self.assertEqual(row["\xff"], 1) diff --git a/Lib/test/test_sqlite3/test_hooks.py b/Lib/test/test_sqlite3/test_hooks.py index c47cfab18..e5b946bba 100644 --- a/Lib/test/test_sqlite3/test_hooks.py +++ b/Lib/test/test_sqlite3/test_hooks.py @@ -24,11 +24,15 @@ import contextlib import sqlite3 as sqlite import unittest +from test.support import import_helper from test.support.os_helper import TESTFN, unlink from .util import memory_database, cx_limit, with_tracebacks from .util import MemoryDatabaseMixin +# TODO(picnixz): increase test coverage for other callbacks +# such as 'func', 'step', 'finalize', and 'collation'. + class CollationTests(MemoryDatabaseMixin, unittest.TestCase): @@ -116,6 +120,21 @@ class CollationTests(MemoryDatabaseMixin, unittest.TestCase): self.assertEqual(result[0][0], 'b') self.assertEqual(result[1][0], 'a') + def test_collation_register_when_busy(self): + # See https://github.com/python/cpython/issues/146090. + con = self.con + con.create_collation("mycoll", lambda x, y: (x > y) - (x < y)) + con.execute("CREATE TABLE t(x TEXT)") + con.execute("INSERT INTO t VALUES (?)", ("a",)) + con.execute("INSERT INTO t VALUES (?)", ("b",)) + con.commit() + + cursor = self.con.execute("SELECT x FROM t ORDER BY x COLLATE mycoll") + next(cursor) + # Replace the collation while the statement is active -> SQLITE_BUSY. + with self.assertRaises(sqlite.OperationalError) as cm: + self.con.create_collation("mycoll", lambda a, b: 0) + def test_deregister_collation(self): """ Register a collation, then deregister it. Make sure an error is raised if we try @@ -129,8 +148,56 @@ class CollationTests(MemoryDatabaseMixin, unittest.TestCase): self.assertEqual(str(cm.exception), 'no such collation sequence: mycoll') +class AuthorizerTests(MemoryDatabaseMixin, unittest.TestCase): + + def assert_not_authorized(self, func, /, *args, **kwargs): + with self.assertRaisesRegex(sqlite.DatabaseError, "not authorized"): + func(*args, **kwargs) + + # When a handler has an invalid signature, the exception raised is + # the same that would be raised if the handler "negatively" replied. + + def test_authorizer_invalid_signature(self): + self.cx.execute("create table if not exists test(a number)") + self.cx.set_authorizer(lambda: None) + self.assert_not_authorized(self.cx.execute, "select * from test") + + # Tests for checking that callback context mutations do not crash. + # Regression tests for https://github.com/python/cpython/issues/142830. + + @unittest.expectedFailure # TODO: RUSTPYTHON; AttributeError: 'NoneType' object has no attribute 'exc_type' + @with_tracebacks(ZeroDivisionError, regex="hello world") + def test_authorizer_concurrent_mutation_in_call(self): + self.cx.execute("create table if not exists test(a number)") + + def handler(*a, **kw): + self.cx.set_authorizer(None) + raise ZeroDivisionError("hello world") + + self.cx.set_authorizer(handler) + self.assert_not_authorized(self.cx.execute, "select * from test") + + @with_tracebacks(OverflowError) + def test_authorizer_concurrent_mutation_with_overflown_value(self): + _testcapi = import_helper.import_module("_testcapi") + self.cx.execute("create table if not exists test(a number)") + + def handler(*a, **kw): + self.cx.set_authorizer(None) + # We expect 'int' at the C level, so this one will raise + # when converting via PyLong_Int(). + return _testcapi.INT_MAX + 1 + + self.cx.set_authorizer(handler) + self.assert_not_authorized(self.cx.execute, "select * from test") + + class ProgressTests(MemoryDatabaseMixin, unittest.TestCase): + def assert_interrupted(self, func, /, *args, **kwargs): + with self.assertRaisesRegex(sqlite.OperationalError, "interrupted"): + func(*args, **kwargs) + def test_progress_handler_used(self): """ Test that the progress handler is invoked once it is set. @@ -196,7 +263,7 @@ class ProgressTests(MemoryDatabaseMixin, unittest.TestCase): con.execute("select 1 union select 2 union select 3").fetchall() self.assertEqual(action, 0, "progress handler was not cleared") - @unittest.expectedFailure # TODO: RUSTPYTHON + @unittest.expectedFailure # TODO: RUSTPYTHON @with_tracebacks(ZeroDivisionError, msg_regex="bad_progress") def test_error_in_progress_handler(self): def bad_progress(): @@ -207,7 +274,7 @@ class ProgressTests(MemoryDatabaseMixin, unittest.TestCase): create table foo(a, b) """) - @unittest.expectedFailure # TODO: RUSTPYTHON unraisable exception handling not implemented + @unittest.expectedFailure # TODO: RUSTPYTHON; unraisable exception handling not implemented @with_tracebacks(ZeroDivisionError, msg_regex="bad_progress") def test_error_in_progress_handler_result(self): class BadBool: @@ -221,8 +288,8 @@ class ProgressTests(MemoryDatabaseMixin, unittest.TestCase): create table foo(a, b) """) - @unittest.expectedFailure # TODO: RUSTPYTHON keyword-only arguments not supported for set_progress_handler - def test_progress_handler_keyword_args(self): + @unittest.expectedFailure # TODO: RUSTPYTHON; keyword-only arguments not supported for set_progress_handler + def test_set_progress_handler_keyword_args(self): regex = ( r"Passing keyword argument 'progress_handler' to " r"_sqlite3.Connection.set_progress_handler\(\) is deprecated. " @@ -234,6 +301,44 @@ class ProgressTests(MemoryDatabaseMixin, unittest.TestCase): self.con.set_progress_handler(progress_handler=lambda: None, n=1) self.assertEqual(cm.filename, __file__) + # When a handler has an invalid signature, the exception raised is + # the same that would be raised if the handler "negatively" replied. + + def test_progress_handler_invalid_signature(self): + self.cx.execute("create table if not exists test(a number)") + self.cx.set_progress_handler(lambda x: None, 1) + self.assert_interrupted(self.cx.execute, "select * from test") + + # Tests for checking that callback context mutations do not crash. + # Regression tests for https://github.com/python/cpython/issues/142830. + + @unittest.skip("TODO: RUSTPYTHON; Timeout after 10 minutes") + @with_tracebacks(ZeroDivisionError, regex="hello world") + def test_progress_handler_concurrent_mutation_in_call(self): + self.cx.execute("create table if not exists test(a number)") + + def handler(*a, **kw): + self.cx.set_progress_handler(None, 1) + raise ZeroDivisionError("hello world") + + self.cx.set_progress_handler(handler, 1) + self.assert_interrupted(self.cx.execute, "select * from test") + + def test_progress_handler_concurrent_mutation_in_conversion(self): + self.cx.execute("create table if not exists test(a number)") + + class Handler: + def __bool__(_): + # clear the progress handler + self.cx.set_progress_handler(None, 1) + raise ValueError # force PyObject_True() to fail + + self.cx.set_progress_handler(Handler.__init__, 1) + self.assert_interrupted(self.cx.execute, "select * from test") + + # Running with tracebacks makes the second execution of this + # function raise another exception because of a database change. + class TraceCallbackTests(MemoryDatabaseMixin, unittest.TestCase): @@ -325,7 +430,7 @@ class TraceCallbackTests(MemoryDatabaseMixin, unittest.TestCase): cx.execute("create table t(t)") cx.executemany("insert into t values(?)", ((v,) for v in range(3))) - @unittest.expectedFailure # TODO: RUSTPYTHON unraisable exception handling not implemented + @unittest.expectedFailure # TODO: RUSTPYTHON; unraisable exception handling not implemented @with_tracebacks( sqlite.DataError, regex="Expanded SQL string exceeds the maximum string length" @@ -350,15 +455,15 @@ class TraceCallbackTests(MemoryDatabaseMixin, unittest.TestCase): with self.check_stmt_trace(cx, [expanded_query]): cx.execute(unexpanded_query, (ok_param,)) - @unittest.expectedFailure # TODO: RUSTPYTHON unraisable exception handling not implemented + @unittest.expectedFailure # TODO: RUSTPYTHON; unraisable exception handling not implemented @with_tracebacks(ZeroDivisionError, regex="division by zero") def test_trace_bad_handler(self): with memory_database() as cx: cx.set_trace_callback(lambda stmt: 5/0) cx.execute("select 1") - @unittest.expectedFailure # TODO: RUSTPYTHON keyword-only arguments not supported for set_trace_callback - def test_trace_keyword_args(self): + @unittest.expectedFailure # TODO: RUSTPYTHON; keyword-only arguments not supported for set_trace_callback + def test_set_trace_callback_keyword_args(self): regex = ( r"Passing keyword argument 'trace_callback' to " r"_sqlite3.Connection.set_trace_callback\(\) is deprecated. " @@ -370,6 +475,37 @@ class TraceCallbackTests(MemoryDatabaseMixin, unittest.TestCase): self.con.set_trace_callback(trace_callback=lambda: None) self.assertEqual(cm.filename, __file__) + # When a handler has an invalid signature, the exception raised is + # the same that would be raised if the handler "negatively" replied, + # but for the trace handler, exceptions are never re-raised (only + # printed when needed). + + @unittest.expectedFailure # TODO: RUSTPYTHON; AttributeError: 'NoneType' object has no attribute 'exc_type' + @with_tracebacks( + TypeError, + regex=r".*<lambda>\(\) missing 6 required positional arguments", + ) + def test_trace_handler_invalid_signature(self): + self.cx.execute("create table if not exists test(a number)") + self.cx.set_trace_callback(lambda x, y, z, t, a, b, c: None) + self.cx.execute("select * from test") + + # Tests for checking that callback context mutations do not crash. + # Regression tests for https://github.com/python/cpython/issues/142830. + + @unittest.skip("TODO: RUSTPYTHON; Timeout after 10 minutes") + @with_tracebacks(ZeroDivisionError, regex="hello world") + def test_trace_callback_concurrent_mutation_in_call(self): + self.cx.execute("create table if not exists test(a number)") + + def handler(statement): + # clear the progress handler + self.cx.set_trace_callback(None) + raise ZeroDivisionError("hello world") + + self.cx.set_trace_callback(handler) + self.cx.execute("select * from test") + if __name__ == "__main__": unittest.main() diff --git a/Lib/test/test_sqlite3/test_regression.py b/Lib/test/test_sqlite3/test_regression.py index 0ebd6d5e9..2f59cf9ba 100644 --- a/Lib/test/test_sqlite3/test_regression.py +++ b/Lib/test/test_sqlite3/test_regression.py @@ -258,7 +258,7 @@ class RegressionTests(MemoryDatabaseMixin, unittest.TestCase): # Lone surrogate cannot be encoded to the default encoding (utf8) "\uDC80", collation_cb) - @unittest.skip('TODO: RUSTPYTHON; recursive cursor use causes lock contention') + @unittest.skip("TODO: RUSTPYTHON; recursive cursor use causes lock contention") def test_recursive_cursor_use(self): """ http://bugs.python.org/issue10811 @@ -305,7 +305,7 @@ class RegressionTests(MemoryDatabaseMixin, unittest.TestCase): datetime.datetime(2012, 4, 4, 15, 6, 0, 123456), ]) - @unittest.expectedFailure # TODO: RUSTPYTHON; error message mismatch + @unittest.expectedFailure # TODO: RUSTPYTHON; error message mismatch def test_invalid_isolation_level_type(self): # isolation level is a string, not an integer regex = "isolation_level must be str or None" @@ -396,7 +396,7 @@ class RegressionTests(MemoryDatabaseMixin, unittest.TestCase): with self.assertRaises(AttributeError): del self.con.isolation_level - @unittest.expectedFailure # TODO: RUSTPYTHON + @unittest.expectedFailure # TODO: RUSTPYTHON def test_bpo37347(self): class Printer: def log(self, *args): @@ -440,7 +440,7 @@ class RegressionTests(MemoryDatabaseMixin, unittest.TestCase): con.execute("drop table t") con.commit() - @unittest.skip('TODO: RUSTPYTHON; recursive cursor use causes lock contention') + @unittest.skip("TODO: RUSTPYTHON; recursive cursor use causes lock contention") def test_table_lock_cursor_non_readonly_select(self): with memory_database() as con: con.execute("create table t(t)") @@ -469,7 +469,7 @@ class RegressionTests(MemoryDatabaseMixin, unittest.TestCase): self.assertEqual(steps, values) -@unittest.skip('TODO: RUSTPYTHON; recursive cursor use causes lock contention') +@unittest.skip("TODO: RUSTPYTHON; recursive cursor use causes lock contention") class RecursiveUseOfCursors(unittest.TestCase): # GH-80254: sqlite3 should not segfault for recursive use of cursors. msg = "Recursive use of cursors not allowed" diff --git a/Lib/test/test_sqlite3/test_transactions.py b/Lib/test/test_sqlite3/test_transactions.py index 3b57b7f6a..db58938b9 100644 --- a/Lib/test/test_sqlite3/test_transactions.py +++ b/Lib/test/test_sqlite3/test_transactions.py @@ -387,7 +387,7 @@ class AutocommitAttribute(unittest.TestCase): cx.autocommit = mode self.assertEqual(cx.autocommit, mode) - @unittest.expectedFailure # TODO: RUSTPYTHON autocommit validation error messages differ + @unittest.expectedFailure # TODO: RUSTPYTHON; autocommit validation error messages differ def test_autocommit_setget_invalid(self): msg = "autocommit must be True, False, or.*LEGACY" for mode in "a", 12, (), None: @@ -395,7 +395,7 @@ class AutocommitAttribute(unittest.TestCase): with self.assertRaisesRegex(ValueError, msg): sqlite.connect(":memory:", autocommit=mode) - @unittest.expectedFailure # TODO: RUSTPYTHON autocommit behavior differs + @unittest.expectedFailure # TODO: RUSTPYTHON; autocommit behavior differs def test_autocommit_disabled(self): expected = [ "SELECT 1", @@ -411,7 +411,7 @@ class AutocommitAttribute(unittest.TestCase): cx.commit() cx.rollback() - @unittest.expectedFailure # TODO: RUSTPYTHON autocommit behavior differs + @unittest.expectedFailure # TODO: RUSTPYTHON; autocommit behavior differs def test_autocommit_disabled_implicit_rollback(self): expected = ["ROLLBACK"] with memory_database(autocommit=False) as cx: @@ -438,7 +438,7 @@ class AutocommitAttribute(unittest.TestCase): meth() # expect this to pass silently self.assertFalse(cx.in_transaction) - @unittest.expectedFailure # TODO: RUSTPYTHON autocommit behavior differs + @unittest.expectedFailure # TODO: RUSTPYTHON; autocommit behavior differs def test_autocommit_disabled_then_enabled(self): expected = ["COMMIT"] with memory_database(autocommit=False) as cx: @@ -472,7 +472,7 @@ class AutocommitAttribute(unittest.TestCase): self.assertFalse(cx.in_transaction) self.assertFalse(cx.in_transaction) - @unittest.expectedFailure # TODO: RUSTPYTHON autocommit behavior differs + @unittest.expectedFailure # TODO: RUSTPYTHON; autocommit behavior differs def test_autocommit_disabled_ctx_mgr(self): expected = ["COMMIT", "BEGIN"] with memory_database(autocommit=False) as cx: @@ -492,7 +492,7 @@ class AutocommitAttribute(unittest.TestCase): self.assertTrue(cx.in_transaction) self.assertFalse(cx.in_transaction) - @unittest.expectedFailure # TODO: RUSTPYTHON autocommit behavior differs + @unittest.expectedFailure # TODO: RUSTPYTHON; autocommit behavior differs def test_autocommit_enabled_executescript(self): expected = ["BEGIN", "SELECT 1"] with memory_database(autocommit=True) as cx: @@ -502,7 +502,7 @@ class AutocommitAttribute(unittest.TestCase): cx.executescript("SELECT 1") self.assertTrue(cx.in_transaction) - @unittest.expectedFailure # TODO: RUSTPYTHON autocommit behavior differs + @unittest.expectedFailure # TODO: RUSTPYTHON; autocommit behavior differs def test_autocommit_disabled_executescript(self): expected = ["SELECT 1"] with memory_database(autocommit=False) as cx: diff --git a/Lib/test/test_sqlite3/test_userfunctions.py b/Lib/test/test_sqlite3/test_userfunctions.py index 3fdde4a26..e7cecb852 100644 --- a/Lib/test/test_sqlite3/test_userfunctions.py +++ b/Lib/test/test_sqlite3/test_userfunctions.py @@ -170,7 +170,7 @@ class FunctionTests(unittest.TestCase): def tearDown(self): self.con.close() - @unittest.expectedFailure # TODO: RUSTPYTHON error message differs for invalid num args + @unittest.expectedFailure # TODO: RUSTPYTHON; error message differs for invalid num args def test_func_error_on_create(self): with self.assertRaisesRegex(sqlite.ProgrammingError, "not -100"): self.con.create_function("bla", -100, lambda x: 2*x) @@ -255,7 +255,7 @@ class FunctionTests(unittest.TestCase): cur.execute("select returnnan()") self.assertIsNone(cur.fetchone()[0]) - @unittest.expectedFailure # TODO: RUSTPYTHON unraisable exception handling not implemented + @unittest.expectedFailure # TODO: RUSTPYTHON; unraisable exception handling not implemented @with_tracebacks(ZeroDivisionError, msg_regex="func_raiseexception") def test_func_exception(self): cur = self.con.cursor() @@ -264,7 +264,7 @@ class FunctionTests(unittest.TestCase): cur.fetchone() self.assertEqual(str(cm.exception), 'user-defined function raised exception') - @unittest.expectedFailure # TODO: RUSTPYTHON unraisable exception handling not implemented + @unittest.expectedFailure # TODO: RUSTPYTHON; unraisable exception handling not implemented @with_tracebacks(MemoryError, msg_regex="func_memoryerror") def test_func_memory_error(self): cur = self.con.cursor() @@ -272,7 +272,7 @@ class FunctionTests(unittest.TestCase): cur.execute("select memoryerror()") cur.fetchone() - @unittest.expectedFailure # TODO: RUSTPYTHON unraisable exception handling not implemented + @unittest.expectedFailure # TODO: RUSTPYTHON; unraisable exception handling not implemented @with_tracebacks(OverflowError, msg_regex="func_overflowerror") def test_func_overflow_error(self): cur = self.con.cursor() @@ -306,7 +306,7 @@ class FunctionTests(unittest.TestCase): self.con.execute, "select spam(?)", (memoryview(b"blob")[::2],)) - @unittest.expectedFailure # TODO: RUSTPYTHON unraisable exception handling not implemented + @unittest.expectedFailure # TODO: RUSTPYTHON; unraisable exception handling not implemented @with_tracebacks(BufferError, regex="buffer.*contiguous") def test_return_non_contiguous_blob(self): with self.assertRaises(sqlite.OperationalError): @@ -385,7 +385,7 @@ class FunctionTests(unittest.TestCase): del x,y gc_collect() - @unittest.expectedFailure # TODO: RUSTPYTHON unraisable exception handling not implemented + @unittest.expectedFailure # TODO: RUSTPYTHON; unraisable exception handling not implemented @with_tracebacks(OverflowError) def test_func_return_too_large_int(self): cur = self.con.cursor() @@ -395,7 +395,7 @@ class FunctionTests(unittest.TestCase): with self.assertRaisesRegex(sqlite.DataError, msg): cur.execute("select largeint()") - @unittest.expectedFailure # TODO: RUSTPYTHON unraisable exception handling not implemented + @unittest.expectedFailure # TODO: RUSTPYTHON; unraisable exception handling not implemented @with_tracebacks(UnicodeEncodeError, "surrogates not allowed") def test_func_return_text_with_surrogates(self): cur = self.con.cursor() @@ -428,7 +428,7 @@ class FunctionTests(unittest.TestCase): self.assertRaisesRegex(sqlite.OperationalError, msg, self.con.execute, "select badreturn()") - @unittest.expectedFailure # TODO: RUSTPYTHON deprecation warning not emitted for keyword args + @unittest.expectedFailure # TODO: RUSTPYTHON; deprecation warning not emitted for keyword args def test_func_keyword_args(self): regex = ( r"Passing keyword arguments 'name', 'narg' and 'func' to " @@ -514,12 +514,12 @@ class WindowFunctionTests(unittest.TestCase): self.cur.execute(self.query % "sumint") self.assertEqual(self.cur.fetchall(), self.expected) - @unittest.expectedFailure # TODO: RUSTPYTHON error message differs for invalid num args + @unittest.expectedFailure # TODO: RUSTPYTHON; error message differs for invalid num args def test_win_error_on_create(self): with self.assertRaisesRegex(sqlite.ProgrammingError, "not -100"): self.con.create_window_function("shouldfail", -100, WindowSumInt) - @unittest.expectedFailure # TODO: RUSTPYTHON unraisable exception handling not implemented + @unittest.expectedFailure # TODO: RUSTPYTHON; unraisable exception handling not implemented @with_tracebacks(BadWindow) def test_win_exception_in_method(self): for meth in "__init__", "step", "value", "inverse": @@ -532,7 +532,7 @@ class WindowFunctionTests(unittest.TestCase): self.cur.execute(self.query % name) self.cur.fetchall() - @unittest.expectedFailure # TODO: RUSTPYTHON unraisable exception handling not implemented + @unittest.expectedFailure # TODO: RUSTPYTHON; unraisable exception handling not implemented @with_tracebacks(BadWindow) def test_win_exception_in_finalize(self): # Note: SQLite does not (as of version 3.38.0) propagate finalize @@ -544,7 +544,7 @@ class WindowFunctionTests(unittest.TestCase): self.cur.execute(self.query % name) self.cur.fetchall() - @unittest.expectedFailure # TODO: RUSTPYTHON unraisable exception handling not implemented + @unittest.expectedFailure # TODO: RUSTPYTHON; unraisable exception handling not implemented @with_tracebacks(AttributeError) def test_win_missing_method(self): class MissingValue: @@ -576,7 +576,7 @@ class WindowFunctionTests(unittest.TestCase): self.cur.execute(self.query % name) self.cur.fetchall() - @unittest.expectedFailure # TODO: RUSTPYTHON unraisable exception handling not implemented + @unittest.expectedFailure # TODO: RUSTPYTHON; unraisable exception handling not implemented @with_tracebacks(AttributeError) def test_win_missing_finalize(self): # Note: SQLite does not (as of version 3.38.0) propagate finalize @@ -649,12 +649,12 @@ class AggregateTests(unittest.TestCase): def tearDown(self): self.con.close() - @unittest.expectedFailure # TODO: RUSTPYTHON error message differs for invalid num args + @unittest.expectedFailure # TODO: RUSTPYTHON; error message differs for invalid num args def test_aggr_error_on_create(self): with self.assertRaisesRegex(sqlite.ProgrammingError, "not -100"): self.con.create_function("bla", -100, AggrSum) - @unittest.expectedFailure # TODO: RUSTPYTHON unraisable exception handling not implemented + @unittest.expectedFailure # TODO: RUSTPYTHON; unraisable exception handling not implemented @with_tracebacks(AttributeError, msg_regex="AggrNoStep") def test_aggr_no_step(self): cur = self.con.cursor() @@ -670,7 +670,7 @@ class AggregateTests(unittest.TestCase): cur.execute("select nofinalize(t) from test") val = cur.fetchone()[0] - @unittest.expectedFailure # TODO: RUSTPYTHON unraisable exception handling not implemented + @unittest.expectedFailure # TODO: RUSTPYTHON; unraisable exception handling not implemented @with_tracebacks(ZeroDivisionError, msg_regex="AggrExceptionInInit") def test_aggr_exception_in_init(self): cur = self.con.cursor() @@ -679,7 +679,7 @@ class AggregateTests(unittest.TestCase): val = cur.fetchone()[0] self.assertEqual(str(cm.exception), "user-defined aggregate's '__init__' method raised error") - @unittest.expectedFailure # TODO: RUSTPYTHON unraisable exception handling not implemented + @unittest.expectedFailure # TODO: RUSTPYTHON; unraisable exception handling not implemented @with_tracebacks(ZeroDivisionError, msg_regex="AggrExceptionInStep") def test_aggr_exception_in_step(self): cur = self.con.cursor() @@ -688,7 +688,7 @@ class AggregateTests(unittest.TestCase): val = cur.fetchone()[0] self.assertEqual(str(cm.exception), "user-defined aggregate's 'step' method raised error") - @unittest.expectedFailure # TODO: RUSTPYTHON unraisable exception handling not implemented + @unittest.expectedFailure # TODO: RUSTPYTHON; unraisable exception handling not implemented @with_tracebacks(ZeroDivisionError, msg_regex="AggrExceptionInFinalize") def test_aggr_exception_in_finalize(self): cur = self.con.cursor() @@ -754,7 +754,7 @@ class AggregateTests(unittest.TestCase): val = cur.fetchone()[0] self.assertEqual(val, txt) - @unittest.expectedFailure # TODO: RUSTPYTHON keyword-only arguments not supported for create_aggregate + @unittest.expectedFailure # TODO: RUSTPYTHON; keyword-only arguments not supported for create_aggregate def test_agg_keyword_args(self): regex = ( r"Passing keyword arguments 'name', 'n_arg' and 'aggregate_class' to " @@ -803,13 +803,13 @@ class AuthorizerTests(unittest.TestCase): def tearDown(self): self.con.close() - @unittest.expectedFailure # TODO: RUSTPYTHON error message differs + @unittest.expectedFailure # TODO: RUSTPYTHON; error message differs def test_table_access(self): with self.assertRaises(sqlite.DatabaseError) as cm: self.con.execute("select * from t2") self.assertIn('prohibited', str(cm.exception)) - @unittest.expectedFailure # TODO: RUSTPYTHON error message differs + @unittest.expectedFailure # TODO: RUSTPYTHON; error message differs def test_column_access(self): with self.assertRaises(sqlite.DatabaseError) as cm: self.con.execute("select c2 from t1") @@ -820,7 +820,7 @@ class AuthorizerTests(unittest.TestCase): self.con.execute("select * from t2") self.con.execute("select c2 from t1") - @unittest.expectedFailure # TODO: RUSTPYTHON keyword-only arguments not supported for set_authorizer + @unittest.expectedFailure # TODO: RUSTPYTHON; keyword-only arguments not supported for set_authorizer def test_authorizer_keyword_args(self): regex = ( r"Passing keyword argument 'authorizer_callback' to " @@ -843,12 +843,12 @@ class AuthorizerRaiseExceptionTests(AuthorizerTests): raise ValueError return sqlite.SQLITE_OK - @unittest.expectedFailure # TODO: RUSTPYTHON unraisable exception handling not implemented + @unittest.expectedFailure # TODO: RUSTPYTHON; unraisable exception handling not implemented @with_tracebacks(ValueError, msg_regex="authorizer_cb") def test_table_access(self): super().test_table_access() - @unittest.expectedFailure # TODO: RUSTPYTHON unraisable exception handling not implemented + @unittest.expectedFailure # TODO: RUSTPYTHON; unraisable exception handling not implemented @with_tracebacks(ValueError, msg_regex="authorizer_cb") def test_column_access(self): super().test_table_access() From 29e9f4ae4340e47af9ae094ac2a525cf0db6527e Mon Sep 17 00:00:00 2001 From: Joshua Megnauth <48846352+joshuamegnauth54@users.noreply.github.com> Date: Thu, 2 Jul 2026 03:30:38 -0400 Subject: [PATCH 174/339] unicodedata: No alloc is_normalized (#8206) `icu4x` supports checking if a string is normalized without allocation. --- crates/stdlib/src/unicodedata.rs | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/crates/stdlib/src/unicodedata.rs b/crates/stdlib/src/unicodedata.rs index b373b083e..0d6e7b972 100644 --- a/crates/stdlib/src/unicodedata.rs +++ b/crates/stdlib/src/unicodedata.rs @@ -339,30 +339,20 @@ mod unicodedata { #[pymethod] fn is_normalized(&self, form: super::NormalizeForm, unistr: PyStrRef) -> bool { - let text = unistr.as_wtf8(); - let normalized: Wtf8Buf = match form { + match form { NormalizeForm::Nfc => { - let normalizer = ComposingNormalizerBorrowed::new_nfc(); - text.map_utf8(|s| normalizer.normalize_iter(s.chars())) - .collect() + ComposingNormalizerBorrowed::new_nfc().is_normalized_utf8(unistr.as_bytes()) } NormalizeForm::Nfkc => { - let normalizer = ComposingNormalizerBorrowed::new_nfkc(); - text.map_utf8(|s| normalizer.normalize_iter(s.chars())) - .collect() + ComposingNormalizerBorrowed::new_nfkc().is_normalized_utf8(unistr.as_bytes()) } NormalizeForm::Nfd => { - let normalizer = DecomposingNormalizerBorrowed::new_nfd(); - text.map_utf8(|s| normalizer.normalize_iter(s.chars())) - .collect() + DecomposingNormalizerBorrowed::new_nfd().is_normalized_utf8(unistr.as_bytes()) } NormalizeForm::Nfkd => { - let normalizer = DecomposingNormalizerBorrowed::new_nfkd(); - text.map_utf8(|s| normalizer.normalize_iter(s.chars())) - .collect() + DecomposingNormalizerBorrowed::new_nfkd().is_normalized_utf8(unistr.as_bytes()) } - }; - text == &*normalized + } } #[pymethod] From 7aaf2db14d450debea922a4d91a26ec958a11282 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Thu, 2 Jul 2026 10:31:34 +0300 Subject: [PATCH 175/339] Move free standing `ir::Block` functions to methods (#8205) --- crates/codegen/src/ir.rs | 998 +++++++++++++++++++-------------------- 1 file changed, 499 insertions(+), 499 deletions(-) diff --git a/crates/codegen/src/ir.rs b/crates/codegen/src/ir.rs index e24909f9c..28554aa84 100644 --- a/crates/codegen/src/ir.rs +++ b/crates/codegen/src/ir.rs @@ -440,103 +440,6 @@ fn c_array_ensure_capacity<T>( } } -/// flowgraph.c basicblock_next_instr -fn basicblock_next_instr(block: &mut Block) -> crate::InternalResult<usize> { - let off = block.instruction_used; - let new_allocation = c_array_ensure_capacity::<InstructionInfo>( - block.instruction_allocation, - off + 1, - DEFAULT_BLOCK_SIZE, - )?; - if new_allocation > block.instruction_allocation { - if new_allocation > block.instructions.len() { - block - .instructions - .try_reserve_exact(new_allocation - block.instructions.len()) - .map_err(|_| InternalError::MalformedControlFlowGraph)?; - block - .instructions - .resize_with(new_allocation, empty_instruction_info); - } - block.instruction_allocation = new_allocation; - } - debug_assert!(block.instruction_allocation > off); - block.instruction_used += 1; - Ok(off) -} - -/// flowgraph.c basicblock_last_instr -fn basicblock_last_instr(block: &Block) -> Option<&InstructionInfo> { - debug_assert!(block.instruction_allocation >= block.instruction_used); - if block.instruction_used > 0 { - debug_assert!(!block.instructions.is_empty()); - Some(&block.instructions[block.instruction_used - 1]) - } else { - None - } -} - -/// flowgraph.c basicblock_last_instr -fn basicblock_last_instr_mut(block: &mut Block) -> Option<&mut InstructionInfo> { - debug_assert!(block.instruction_allocation >= block.instruction_used); - if block.instruction_used > 0 { - debug_assert!(!block.instructions.is_empty()); - Some(&mut block.instructions[block.instruction_used - 1]) - } else { - None - } -} - -/// flowgraph.c basicblock_addop -fn basicblock_addop(block: &mut Block, mut info: InstructionInfo) -> crate::InternalResult<()> { - let opcode = AnyOpcode::from(info.instr); - debug_assert!(is_within_opcode_range(opcode)); - debug_assert!(!info.instr.is_assembler()); - debug_assert!( - info.instr.has_arg() || info.instr.has_target() || u32::from(info.arg) == 0, - "CPython basicblock_addop requires OPCODE_HAS_ARG, HAS_TARGET, or oparg == 0" - ); - debug_assert!( - u32::from(info.arg) < (1 << 30), - "CPython basicblock_addop requires 0 <= oparg < (1 << 30)" - ); - let off = basicblock_next_instr(block)?; - let except_handler = block.instructions[off].except_handler; - info.target = BlockIdx::NULL; - info.except_handler = except_handler; - block.instructions[off] = info; - Ok(()) -} - -/// flowgraph.c basicblock_insert_instruction -fn basicblock_insert_instruction( - block: &mut Block, - pos: usize, - info: InstructionInfo, -) -> crate::InternalResult<()> { - let old_len = block.instruction_used; - debug_assert!(pos <= old_len); - basicblock_next_instr(block)?; - for i in (pos + 1..=old_len).rev() { - block.instructions[i] = block.instructions[i - 1]; - } - block.instructions[pos] = info; - Ok(()) -} - -/// flowgraph.c direct `b_iused = 0` -fn basicblock_clear(block: &mut Block) { - block.instruction_used = 0; -} - -/// CPython direct `b_instr[0]` access. Some passes set `b_iused = 0` -/// without clearing the backing array, so an empty basic block can still have -/// a first raw instruction slot. -fn basicblock_raw_first_instr_mut(block: &mut Block) -> &mut InstructionInfo { - debug_assert!(block.instruction_allocation > 0); - &mut block.instructions[0] -} - #[derive(Clone, Copy, Debug, Eq, PartialEq)] pub(crate) struct InstructionSequenceLabel(i32); @@ -1309,6 +1212,384 @@ impl Block { pub(crate) const fn is_empty(&self) -> bool { self.instruction_used == 0 } + + /// flowgraph.c basicblock_next_instr + fn basicblock_next_instr(&mut self) -> crate::InternalResult<usize> { + let off = self.instruction_used; + let new_allocation = c_array_ensure_capacity::<InstructionInfo>( + self.instruction_allocation, + off + 1, + DEFAULT_BLOCK_SIZE, + )?; + if new_allocation > self.instruction_allocation { + if new_allocation > self.instructions.len() { + self.instructions + .try_reserve_exact(new_allocation - self.instructions.len()) + .map_err(|_| InternalError::MalformedControlFlowGraph)?; + self.instructions + .resize_with(new_allocation, empty_instruction_info); + } + self.instruction_allocation = new_allocation; + } + debug_assert!(self.instruction_allocation > off); + self.instruction_used += 1; + Ok(off) + } + + /// flowgraph.c basicblock_last_instr + fn basicblock_last_instr(&self) -> Option<&InstructionInfo> { + debug_assert!(self.instruction_allocation >= self.instruction_used); + if self.instruction_used > 0 { + debug_assert!(!self.instructions.is_empty()); + Some(&self.instructions[self.instruction_used - 1]) + } else { + None + } + } + + /// flowgraph.c basicblock_last_instr + fn basicblock_last_instr_mut(&mut self) -> Option<&mut InstructionInfo> { + debug_assert!(self.instruction_allocation >= self.instruction_used); + if self.instruction_used > 0 { + debug_assert!(!self.instructions.is_empty()); + Some(&mut self.instructions[self.instruction_used - 1]) + } else { + None + } + } + + /// flowgraph.c basicblock_addop + fn basicblock_addop(&mut self, mut info: InstructionInfo) -> crate::InternalResult<()> { + let opcode = AnyOpcode::from(info.instr); + debug_assert!(is_within_opcode_range(opcode)); + debug_assert!(!info.instr.is_assembler()); + debug_assert!( + info.instr.has_arg() || info.instr.has_target() || u32::from(info.arg) == 0, + "CPython basicblock_addop requires OPCODE_HAS_ARG, HAS_TARGET, or oparg == 0" + ); + debug_assert!( + u32::from(info.arg) < (1 << 30), + "CPython basicblock_addop requires 0 <= oparg < (1 << 30)" + ); + let off = self.basicblock_next_instr()?; + let except_handler = self.instructions[off].except_handler; + info.target = BlockIdx::NULL; + info.except_handler = except_handler; + self.instructions[off] = info; + Ok(()) + } + + /// flowgraph.c basicblock_insert_instruction + fn basicblock_insert_instruction( + &mut self, + pos: usize, + info: InstructionInfo, + ) -> crate::InternalResult<()> { + let old_len = self.instruction_used; + debug_assert!(pos <= old_len); + self.basicblock_next_instr()?; + for i in (pos + 1..=old_len).rev() { + self.instructions[i] = self.instructions[i - 1]; + } + self.instructions[pos] = info; + Ok(()) + } + + /// flowgraph.c direct `b_iused = 0` + fn basicblock_clear(&mut self) { + self.instruction_used = 0; + } + + /// CPython direct `b_instr[0]` access. Some passes set `b_iused = 0` + /// without clearing the backing array, so an empty basic block can still have + /// a first raw instruction slot. + fn basicblock_raw_first_instr_mut(&mut self) -> &mut InstructionInfo { + debug_assert!(self.instruction_allocation > 0); + &mut self.instructions[0] + } + + /// flowgraph.c BB_NO_FALLTHROUGH + fn bb_no_fallthrough(&self) -> bool { + self.basicblock_nofallthrough() + } + + /// flowgraph.c BB_HAS_FALLTHROUGH + fn bb_has_fallthrough(&self) -> bool { + !self.bb_no_fallthrough() + } + + /// flowgraph.c basicblock_returns + #[cfg(test)] + fn basicblock_returns(&self) -> bool { + let last = self.basicblock_last_instr(); + if let Some(last) = last { + matches!(last.instr.real(), Some(Instruction::ReturnValue)) + } else { + false + } + } + + /// flowgraph.c basicblock_exits_scope + fn basicblock_exits_scope(&self) -> bool { + let last = self.basicblock_last_instr(); + last.is_some_and(|last| last.instr.is_scope_exit()) + } + + /// flowgraph.c is_exit_or_eval_check_without_lineno + fn is_exit_or_eval_check_without_lineno(&self) -> bool { + if self.basicblock_exits_scope() || self.basicblock_has_eval_break() { + self.basicblock_has_no_lineno() + } else { + false + } + } + + /// flowgraph.c basicblock_has_eval_break + fn basicblock_has_eval_break(&self) -> bool { + let mut i = 0; + while i < self.instruction_used { + if self.instructions[i].instr.has_eval_break() { + return true; + } + i += 1; + } + false + } + + /// flowgraph.c basicblock_has_no_lineno + fn basicblock_has_no_lineno(&self) -> bool { + let mut i = 0; + while i < self.instruction_used { + if instruction_lineno(&self.instructions[i]) >= 0 { + return false; + } + i += 1; + } + true + } + + /// flowgraph.c basicblock_nofallthrough + fn basicblock_nofallthrough(&self) -> bool { + let last = self.basicblock_last_instr(); + last.is_some_and(|last| last.instr.is_scope_exit() || last.instr.is_unconditional_jump()) + } + + /// flowgraph.c nop_out + fn nop_out(&mut self, instrs: &[usize]) { + for &i in instrs { + nop_out_no_location(&mut self.instructions[i]); + } + } + + /// flowgraph.c get_const_loading_instrs + fn get_const_loading_instrs( + &self, + mut start: usize, + size: usize, + ) -> crate::InternalResult<Option<Vec<usize>>> { + let mut indices = Vec::new(); + indices + .try_reserve_exact(size) + .map_err(|_| InternalError::MalformedControlFlowGraph)?; + loop { + if start >= self.instruction_used { + return Ok(None); + } + let instr = &self.instructions[start]; + if !matches!(instr.instr.real(), Some(Instruction::Nop)) { + if !loads_const(instr) { + return Ok(None); + } + indices.push(start); + if indices.len() == size { + break; + } + } + let Some(prev) = start.checked_sub(1) else { + return Ok(None); + }; + start = prev; + } + indices.reverse(); + Ok(Some(indices)) + } + + /// flowgraph.c next_swappable_instruction + fn next_swappable_instruction(&self, mut i: usize, lineno: i32) -> Option<usize> { + loop { + i += 1; + if i >= self.instruction_used { + return None; + } + + let info = &self.instructions[i]; + let info_lineno = instruction_lineno(info); + + if lineno >= 0 && info_lineno != lineno { + return None; + } + + if matches!(info.instr, AnyInstruction::Real(Instruction::Nop)) { + continue; + } + + if is_swappable(info.instr) { + return Some(i); + } + + return None; + } + } + + /// flowgraph.c swaptimize + fn swaptimize(&mut self, ix: &mut usize) -> crate::InternalResult<()> { + debug_assert!(matches!( + self.instructions[*ix].instr.real_opcode(), + Some(Opcode::Swap) + )); + let mut depth = u32::from(self.instructions[*ix].arg) as usize; + let mut len = 1usize; + let mut more = false; + let limit = self.instruction_used - *ix; + while len < limit { + match self.instructions[*ix + len].instr.real_opcode() { + Some(Opcode::Swap) => { + depth = depth.max(u32::from(self.instructions[*ix + len].arg) as usize); + more = true; + len += 1; + } + Some(Opcode::Nop) => { + len += 1; + } + _ => break, + } + } + + if !more { + return Ok(()); + } + + let mut stack = Vec::new(); + stack + .try_reserve_exact(depth) + .map_err(|_| InternalError::MalformedControlFlowGraph)?; + stack.resize(depth, 0); + let mut i = 0; + while i < depth { + stack[i] = i as i32; + i += 1; + } + + i = 0; + while i < len { + let info = &self.instructions[*ix + i]; + if matches!(info.instr.real_opcode(), Some(Opcode::Swap)) { + let oparg = u32::from(info.arg) as usize; + stack.swap(0, oparg - 1); + } + i += 1; + } + + let mut current = len as isize - 1; + for i in 0..depth { + if stack[i] == VISITED || stack[i] == i as i32 { + continue; + } + let mut j = i; + loop { + if j != 0 { + debug_assert!(current >= 0); + let out = &mut self.instructions[*ix + current as usize]; + out.instr = Opcode::Swap.into(); + out.arg = OpArg::new((j + 1) as u32); + current -= 1; + } + if stack[j] == VISITED { + debug_assert_eq!(j, i); + break; + } + let next_j = stack[j] as usize; + stack[j] = VISITED; + j = next_j; + } + } + + while current >= 0 { + set_to_nop(&mut self.instructions[*ix + current as usize]); + current -= 1; + } + *ix += len - 1; + Ok(()) + } + + /// flowgraph.c apply_static_swaps + fn apply_static_swaps(&mut self, mut i: isize) { + while i >= 0 { + let idx = i as usize; + debug_assert!(idx < self.instruction_used); + let swap_arg = match self.instructions[idx].instr.real_opcode() { + Some(Opcode::Swap) => u32::from(self.instructions[idx].arg), + Some(Opcode::Nop | Opcode::PopTop | Opcode::StoreFast) => { + i -= 1; + continue; + } + _ if matches!( + self.instructions[idx].instr.pseudo_opcode(), + Some(PseudoOpcode::StoreFastMaybeNull) + ) => + { + i -= 1; + continue; + } + _ => return, + }; + + let Some(j) = self.next_swappable_instruction(idx, -1) else { + return; + }; + let lineno = instruction_lineno(&self.instructions[j]); + let mut k = j; + for _ in 1..swap_arg { + let Some(next) = self.next_swappable_instruction(k, lineno) else { + return; + }; + k = next; + } + + let store_j = stores_to(&self.instructions[j]); + let store_k = stores_to(&self.instructions[k]); + if store_j >= 0 || store_k >= 0 { + if store_j == store_k { + return; + } + let mut idx = j + 1; + while idx < k { + let store_idx = stores_to(&self.instructions[idx]); + if store_idx >= 0 && (store_idx == store_j || store_idx == store_k) { + return; + } + idx += 1; + } + } + + set_to_nop(&mut self.instructions[idx]); + self.instructions.swap(j, k); + i -= 1; + } + } + + /// flowgraph.c optimize_basic_block swap pass + fn apply_static_swaps_block(&mut self) -> crate::InternalResult<()> { + let mut i = 0; + while i < self.instruction_used { + if matches!(self.instructions[i].instr.real_opcode(), Some(Opcode::Swap)) { + self.swaptimize(&mut i)?; + self.apply_static_swaps(i as isize); + } + i += 1; + } + Ok(()) + } } #[derive(Clone, Debug, Default)] @@ -1347,7 +1628,7 @@ impl Blocks { while let Some(current) = stack.pop() { let idx = current.idx(); let next = self[idx].next; - if next != BlockIdx::NULL && bb_has_fallthrough(&self[idx]) { + if next != BlockIdx::NULL && self[idx].bb_has_fallthrough() { if !self[next].visited { debug_assert_eq!(self[next].predecessors, 0); stack.push(next); @@ -1377,7 +1658,7 @@ impl Blocks { let next = self[block_idx].next; if self[block_idx].predecessors == 0 { let block = &mut self[block_idx]; - basicblock_clear(block); + block.basicblock_clear(); block.except_handler = false; } block_idx = next; @@ -1396,7 +1677,7 @@ impl Blocks { let from_len = self[from].instruction_used; for i in 0..from_len { let info = self[from].instructions[i]; - let off = basicblock_next_instr(&mut self[to])?; + let off = self[to].basicblock_next_instr()?; self[to].instructions[off] = info; } @@ -1405,7 +1686,7 @@ impl Blocks { /// flowgraph.c copy_basicblock fn copy_basicblock(&mut self, block_idx: BlockIdx) -> crate::InternalResult<BlockIdx> { - debug_assert!(bb_no_fallthrough(&self[block_idx])); + debug_assert!(self[block_idx].bb_no_fallthrough()); let result = self.blocks_new_block()?; self.basicblock_append_block_instructions(result, block_idx)?; @@ -1418,7 +1699,7 @@ impl Blocks { let entryblock = BlockIdx(0); let mut b = entryblock; while b != BlockIdx::NULL { - let Some(last) = basicblock_last_instr(&self[b]).copied() else { + let Some(last) = self[b].basicblock_last_instr().copied() else { b = self[b].next; continue; }; @@ -1430,7 +1711,7 @@ impl Blocks { debug_assert!(target != BlockIdx::NULL); - if is_exit_or_eval_check_without_lineno(&self[target]) + if self[target].is_exit_or_eval_check_without_lineno() && self[target].predecessors > 1 { let new_target = self.copy_basicblock(target)?; @@ -1438,7 +1719,7 @@ impl Blocks { &mut self[new_target].instructions[0], instr_location(&last), ); - let last_mut = basicblock_last_instr_mut(&mut self[b]).unwrap(); + let last_mut = self[b].basicblock_last_instr_mut().unwrap(); last_mut.target = new_target; self[target].predecessors -= 1; self[new_target].predecessors = 1; @@ -1454,12 +1735,14 @@ impl Blocks { b = entryblock; while b != BlockIdx::NULL { let next = self[b].next; - if bb_has_fallthrough(&self[b]) + if self[b].bb_has_fallthrough() && next != BlockIdx::NULL && self[b].instruction_used != 0 - && is_exit_or_eval_check_without_lineno(&self[next]) + && self[next].is_exit_or_eval_check_without_lineno() { - let last = *basicblock_last_instr(&self[b]).expect("block has instructions"); + let last = *self[b] + .basicblock_last_instr() + .expect("block has instructions"); instr_set_location(&mut self[next].instructions[0], instr_location(&last)); } b = self[b].next; @@ -1734,7 +2017,7 @@ impl Blocks { i += 1; } - apply_static_swaps_block(&mut self[block_idx])?; + self[block_idx].apply_static_swaps_block()?; Ok(()) } @@ -1997,13 +2280,13 @@ impl Blocks { } let fallthrough = self[block_idx].next; - let term = basicblock_last_instr(&self[block_idx]).copied(); + let term = self[block_idx].basicblock_last_instr().copied(); if let Some(term) = term && fallthrough != BlockIdx::NULL && !term.instr.is_unconditional_jump() && !term.instr.is_scope_exit() { - debug_assert!(bb_has_fallthrough(&self[block_idx])); + debug_assert!(self[block_idx].bb_has_fallthrough()); load_fast_push_block(&mut worklist, self, fallthrough, refs.size); } @@ -2043,7 +2326,7 @@ impl Blocks { fn propagate_line_numbers(&mut self) { let mut current = BlockIdx(0); while current != BlockIdx::NULL { - let Some(last) = basicblock_last_instr(&self[current]).copied() else { + let Some(last) = self[current].basicblock_last_instr().copied() else { current = self[current].next; continue; }; @@ -2058,7 +2341,7 @@ impl Blocks { } let next = self[current].next; - if bb_has_fallthrough(&self[current]) { + if self[current].bb_has_fallthrough() { debug_assert!(next != BlockIdx::NULL); if next != BlockIdx::NULL && self[next].predecessors == 1 @@ -2073,7 +2356,7 @@ impl Blocks { let target = last.target; debug_assert!(target != BlockIdx::NULL); if self[target].predecessors == 1 { - let instr = basicblock_raw_first_instr_mut(&mut self[target]); + let instr = self[target].basicblock_raw_first_instr_mut(); if instruction_is_no_location(instr) { instr_set_location(instr, prev_location); } @@ -2134,7 +2417,7 @@ impl Blocks { }); let block = &self[block_idx]; - if instr_is_jump || !bb_has_fallthrough(block) { + if instr_is_jump || !block.bb_has_fallthrough() { instr = None; } block_idx = block.next; @@ -2183,7 +2466,7 @@ impl Blocks { } if next != BlockIdx::NULL { - debug_assert!(bb_has_fallthrough(&self[block_idx])); + debug_assert!(self[block_idx].bb_has_fallthrough()); stackdepth_push(&mut stack, self, next, depth)?; } } @@ -2436,7 +2719,7 @@ impl Blocks { self[block_idx].warm = true; let next = self[block_idx].next; - if next != BlockIdx::NULL && bb_has_fallthrough(&self[block_idx]) && !self[next].visited + if next != BlockIdx::NULL && self[block_idx].bb_has_fallthrough() && !self[next].visited { stack.push(next); self[next].visited = true; @@ -2486,7 +2769,7 @@ impl Blocks { self[block_idx].cold = true; let next = self[block_idx].next; if next != BlockIdx::NULL - && bb_has_fallthrough(&self[block_idx]) + && self[block_idx].bb_has_fallthrough() && !self[next].warm && !self[next].visited { @@ -2525,7 +2808,7 @@ impl Blocks { while block_idx != BlockIdx::NULL { let next = self[block_idx].next; if self[block_idx].cold - && bb_has_fallthrough(&self[block_idx]) + && self[block_idx].bb_has_fallthrough() && next != BlockIdx::NULL && self[next].warm { @@ -2536,24 +2819,22 @@ impl Blocks { } let jump_label = self[next].cpython_label; debug_assert!(is_label(jump_label)); - basicblock_addop( - &mut self[explicit_jump], - InstructionInfo { - instr: PseudoOpcode::JumpNoInterrupt.into(), - arg: instruction_sequence_label_oparg(jump_label), - target: BlockIdx::NULL, - location: SourceLocation::default(), - end_location: SourceLocation::default(), - except_handler: None, - lineno_override: Some(NO_LOCATION_OVERRIDE), - }, - )?; + self[explicit_jump].basicblock_addop(InstructionInfo { + instr: PseudoOpcode::JumpNoInterrupt.into(), + arg: instruction_sequence_label_oparg(jump_label), + target: BlockIdx::NULL, + location: SourceLocation::default(), + end_location: SourceLocation::default(), + except_handler: None, + lineno_override: Some(NO_LOCATION_OVERRIDE), + })?; self[explicit_jump].cold = true; self[explicit_jump].next = next; self[explicit_jump].predecessors = 1; self[block_idx].next = explicit_jump; let target = self[explicit_jump].next; - let last = basicblock_last_instr_mut(&mut self[explicit_jump]) + let last = self[explicit_jump] + .basicblock_last_instr_mut() .expect("missing explicit jump"); last.target = target; } @@ -2653,7 +2934,7 @@ impl Blocks { target: BlockIdx, loc_source: &InstructionInfo, ) -> crate::InternalResult<()> { - let last = basicblock_last_instr(&self[block_idx]); + let last = self[block_idx].basicblock_last_instr(); if last.is_some_and(is_jump) { return Err(InternalError::MalformedControlFlowGraph); } @@ -2662,19 +2943,16 @@ impl Blocks { debug_assert!(is_label(label)); let arg = instruction_sequence_label_oparg(label); let block = &mut self[block_idx]; - basicblock_addop( - block, - InstructionInfo { - instr, - arg, - target: BlockIdx::NULL, - location: loc_source.location, - end_location: loc_source.end_location, - except_handler: None, - lineno_override: loc_source.lineno_override, - }, - )?; - let last = basicblock_last_instr_mut(block).expect("missing jump"); + block.basicblock_addop(InstructionInfo { + instr, + arg, + target: BlockIdx::NULL, + location: loc_source.location, + end_location: loc_source.end_location, + except_handler: None, + lineno_override: loc_source.lineno_override, + })?; + let last = block.basicblock_last_instr_mut().expect("missing jump"); debug_assert!(match (last.instr, instr) { (AnyInstruction::Real(last), AnyInstruction::Real(opcode)) => last.as_opcode() == opcode.as_opcode(), @@ -2722,7 +3000,7 @@ impl Blocks { except_handler, lineno_override, }; - basicblock_insert_instruction(block, i, copy)?; + block.basicblock_insert_instruction(i, copy)?; i += 1; let to_bool = InstructionInfo { @@ -2734,7 +3012,7 @@ impl Blocks { except_handler, lineno_override, }; - basicblock_insert_instruction(block, i, to_bool)?; + block.basicblock_insert_instruction(i, to_bool)?; i += 1; } i += 1; @@ -2746,7 +3024,7 @@ impl Blocks { /// flowgraph.c normalize_jumps_in_block fn normalize_jumps_in_block(&mut self, block_idx: BlockIdx) -> crate::InternalResult<()> { - let Some(last_ins) = basicblock_last_instr(&self[block_idx]).copied() else { + let Some(last_ins) = self[block_idx].basicblock_last_instr().copied() else { return Ok(()); }; if !is_conditional_jump_opcode(last_ins.instr) { @@ -2768,7 +3046,8 @@ impl Blocks { except_handler: None, lineno_override: last_ins.lineno_override, }; - basicblock_addop(&mut self[block_idx], not_taken)?; + + self[block_idx].basicblock_addop(not_taken)?; return Ok(()); } @@ -2787,18 +3066,16 @@ impl Blocks { let target = last_ins.target; let backwards_jump_idx = self.blocks_new_block()?; - basicblock_addop( - &mut self[backwards_jump_idx], - InstructionInfo { - instr: Opcode::NotTaken.into(), - arg: OpArg::new(0), - target: BlockIdx::NULL, - location: loc, - end_location: end_loc, - except_handler: None, - lineno_override: last_ins.lineno_override, - }, - )?; + + self[backwards_jump_idx].basicblock_addop(InstructionInfo { + instr: Opcode::NotTaken.into(), + arg: OpArg::new(0), + target: BlockIdx::NULL, + location: loc, + end_location: end_loc, + except_handler: None, + lineno_override: last_ins.lineno_override, + })?; self.basicblock_add_jump( backwards_jump_idx, PseudoOpcode::Jump.into(), @@ -2810,7 +3087,7 @@ impl Blocks { let old_next = self[block_idx].next; debug_assert!(old_next != BlockIdx::NULL); - let last_mut = basicblock_last_instr_mut(&mut self[block_idx]).unwrap(); + let last_mut = self[block_idx].basicblock_last_instr_mut().unwrap(); last_mut.instr = reversed_opcode; last_mut.target = old_next; @@ -2825,7 +3102,7 @@ impl Blocks { &mut self, block_idx: BlockIdx, ) -> crate::InternalResult<bool> { - let Some(last) = basicblock_last_instr(&self[block_idx]).copied() else { + let Some(last) = self[block_idx].basicblock_last_instr().copied() else { return Ok(false); }; @@ -2836,18 +3113,19 @@ impl Blocks { let target = last.target; debug_assert!(target != BlockIdx::NULL); let small_exit_block = - basicblock_exits_scope(&self[target]) && self[target].instruction_used <= MAX_COPY_SIZE; + self[target].basicblock_exits_scope() && self[target].instruction_used <= MAX_COPY_SIZE; let no_lineno_no_fallthrough = - basicblock_has_no_lineno(&self[target]) && !bb_has_fallthrough(&self[target]); + self[target].basicblock_has_no_lineno() && !self[target].bb_has_fallthrough(); if small_exit_block || no_lineno_no_fallthrough { debug_assert!(is_jump(&last)); let removed_jump_opcode = last.instr; - let last = basicblock_last_instr_mut(&mut self[block_idx]) + let last = self[block_idx] + .basicblock_last_instr_mut() .expect("non-empty block has last instruction"); set_to_nop(last); self.basicblock_append_block_instructions(block_idx, target)?; if no_lineno_no_fallthrough { - let last = basicblock_last_instr_mut(&mut self[block_idx]).unwrap(); + let last = self[block_idx].basicblock_last_instr_mut().unwrap(); if last.instr.is_unconditional_jump() && matches!( removed_jump_opcode.into(), @@ -2974,7 +3252,7 @@ impl Blocks { let mut changes = 0; let mut current = BlockIdx(0); while current != BlockIdx::NULL { - let Some(last) = basicblock_last_instr(&self[current]).copied() else { + let Some(last) = self[current].basicblock_last_instr().copied() else { current = self[current].next; continue; }; @@ -2988,7 +3266,7 @@ impl Blocks { let next = next_nonempty_block(self, self[current].next); if jump_target == next { changes += 1; - let last = basicblock_last_instr_mut(&mut self[current]).unwrap(); + let last = self[current].basicblock_last_instr_mut().unwrap(); set_to_nop(last); } } @@ -3003,7 +3281,7 @@ impl Blocks { let mut current = BlockIdx(0); while current != BlockIdx::NULL { let block = &self[current]; - if let Some(last) = basicblock_last_instr(block) + if let Some(last) = block.basicblock_last_instr() && last.instr.is_unconditional_jump() { let next = next_nonempty_block(self, block.next); @@ -3394,11 +3672,11 @@ impl CodeInfo { &mut self, info: InstructionInfo, ) -> crate::InternalResult<()> { - basicblock_addop(&mut self.blocks[self.current_block], info) + self.blocks[self.current_block].basicblock_addop(info) } pub(crate) fn last_current_block_instr_mut(&mut self) -> Option<&mut InstructionInfo> { - basicblock_last_instr_mut(&mut self.blocks[self.current_block]) + self.blocks[self.current_block].basicblock_last_instr_mut() } pub(crate) fn set_last_instr_sequence_lineno_override(&mut self, lineno_override: i32) { @@ -3743,8 +4021,7 @@ fn insert_prefix_instructions( line: firstlineno, character_offset: OneIndexed::MIN, }; - basicblock_insert_instruction( - entry, + entry.basicblock_insert_instruction( 0, InstructionInfo { instr: Instruction::ReturnGenerator.into(), @@ -3756,8 +4033,7 @@ fn insert_prefix_instructions( lineno_override: Some(LINE_ONLY_LOCATION_OVERRIDE), }, )?; - basicblock_insert_instruction( - entry, + entry.basicblock_insert_instruction( 1, InstructionInfo { instr: Instruction::PopTop.into(), @@ -3787,8 +4063,7 @@ fn insert_prefix_instructions( if oldindex == -1 { continue; } - basicblock_insert_instruction( - entry, + entry.basicblock_insert_instruction( ncellsused, InstructionInfo { instr: Opcode::MakeCell.into(), @@ -3805,8 +4080,7 @@ fn insert_prefix_instructions( } if nfreevars > 0 { - basicblock_insert_instruction( - entry, + entry.basicblock_insert_instruction( 0, InstructionInfo { instr: Opcode::CopyFreeVars.into(), @@ -3967,7 +4241,7 @@ fn fold_const_unaryop( _ => return Ok(false), }; let Some(operand_index) = (if let Some(start) = i.checked_sub(1) { - get_const_loading_instrs(block, start, 1)? + block.get_const_loading_instrs(start, 1)? } else { None }) @@ -3981,51 +4255,11 @@ fn fold_const_unaryop( let Some(folded_const) = eval_const_unaryop(&operand, op, intrinsic) else { return Ok(false); }; - nop_out(block, &[operand_index]); + block.nop_out(&[operand_index]); instr_make_load_const(metadata, &mut block.instructions[i], folded_const)?; Ok(true) } -/// flowgraph.c get_const_loading_instrs -fn get_const_loading_instrs( - block: &Block, - mut start: usize, - size: usize, -) -> crate::InternalResult<Option<Vec<usize>>> { - let mut indices = Vec::new(); - indices - .try_reserve_exact(size) - .map_err(|_| InternalError::MalformedControlFlowGraph)?; - loop { - if start >= block.instruction_used { - return Ok(None); - } - let instr = &block.instructions[start]; - if !matches!(instr.instr.real(), Some(Instruction::Nop)) { - if !loads_const(instr) { - return Ok(None); - } - indices.push(start); - if indices.len() == size { - break; - } - } - let Some(prev) = start.checked_sub(1) else { - return Ok(None); - }; - start = prev; - } - indices.reverse(); - Ok(Some(indices)) -} - -/// flowgraph.c nop_out -fn nop_out(block: &mut Block, instrs: &[usize]) { - for &i in instrs { - nop_out_no_location(&mut block.instructions[i]); - } -} - /// flowgraph.c fold_const_binop fn fold_const_binop( metadata: &mut CodeUnitMetadata, @@ -4039,7 +4273,7 @@ fn fold_const_binop( }; let Some(operand_indices) = (if let Some(start) = i.checked_sub(1) { - get_const_loading_instrs(block, start, 2)? + block.get_const_loading_instrs(start, 2)? } else { None }) else { @@ -4061,7 +4295,7 @@ fn fold_const_binop( return Ok(false); }; - nop_out(block, &operand_indices); + block.nop_out(&operand_indices); instr_make_load_const(metadata, &mut block.instructions[i], result_const)?; Ok(true) } @@ -4778,7 +5012,7 @@ fn fold_tuple_of_constants( let Some(operand_indices) = (if tuple_size == 0 { Some(Vec::new()) } else if let Some(start) = i.checked_sub(1) { - get_const_loading_instrs(block, start, tuple_size)? + block.get_const_loading_instrs(start, tuple_size)? } else { None }) else { @@ -4796,7 +5030,7 @@ fn fold_tuple_of_constants( elements.push(element); } - nop_out(block, &operand_indices); + block.nop_out(&operand_indices); instr_make_load_const( metadata, &mut block.instructions[i], @@ -4906,7 +5140,7 @@ fn optimize_lists_and_sets( let Some(operand_indices) = (if seq_size == 0 { Some(Vec::new()) } else if let Some(start) = i.checked_sub(1) { - get_const_loading_instrs(block, start, seq_size)? + block.get_const_loading_instrs(start, seq_size)? } else { None }) else { @@ -4940,7 +5174,7 @@ fn optimize_lists_and_sets( debug_assert!(i >= 2); let folded_loc = instr_location(&block.instructions[i]); - nop_out(block, &operand_indices); + block.nop_out(&operand_indices); let build_instr = if is_list { Opcode::BuildList @@ -4970,7 +5204,7 @@ fn optimize_lists_and_sets( return Ok(true); } - nop_out(block, &operand_indices); + block.nop_out(&operand_indices); instr_set_op1( &mut block.instructions[i], @@ -5001,186 +5235,6 @@ fn stores_to(info: &InstructionInfo) -> i32 { } } -/// flowgraph.c next_swappable_instruction -fn next_swappable_instruction(block: &Block, mut i: usize, lineno: i32) -> Option<usize> { - loop { - i += 1; - if i >= block.instruction_used { - return None; - } - - let info = &block.instructions[i]; - let info_lineno = instruction_lineno(info); - - if lineno >= 0 && info_lineno != lineno { - return None; - } - - if matches!(info.instr, AnyInstruction::Real(Instruction::Nop)) { - continue; - } - - if is_swappable(info.instr) { - return Some(i); - } - - return None; - } -} - -/// flowgraph.c swaptimize -fn swaptimize(block: &mut Block, ix: &mut usize) -> crate::InternalResult<()> { - debug_assert!(matches!( - block.instructions[*ix].instr.real_opcode(), - Some(Opcode::Swap) - )); - let mut depth = u32::from(block.instructions[*ix].arg) as usize; - let mut len = 1usize; - let mut more = false; - let limit = block.instruction_used - *ix; - while len < limit { - match block.instructions[*ix + len].instr.real_opcode() { - Some(Opcode::Swap) => { - depth = depth.max(u32::from(block.instructions[*ix + len].arg) as usize); - more = true; - len += 1; - } - Some(Opcode::Nop) => { - len += 1; - } - _ => break, - } - } - - if !more { - return Ok(()); - } - - let mut stack = Vec::new(); - stack - .try_reserve_exact(depth) - .map_err(|_| InternalError::MalformedControlFlowGraph)?; - stack.resize(depth, 0); - let mut i = 0; - while i < depth { - stack[i] = i as i32; - i += 1; - } - - i = 0; - while i < len { - let info = &block.instructions[*ix + i]; - if matches!(info.instr.real_opcode(), Some(Opcode::Swap)) { - let oparg = u32::from(info.arg) as usize; - stack.swap(0, oparg - 1); - } - i += 1; - } - - let mut current = len as isize - 1; - for i in 0..depth { - if stack[i] == VISITED || stack[i] == i as i32 { - continue; - } - let mut j = i; - loop { - if j != 0 { - debug_assert!(current >= 0); - let out = &mut block.instructions[*ix + current as usize]; - out.instr = Opcode::Swap.into(); - out.arg = OpArg::new((j + 1) as u32); - current -= 1; - } - if stack[j] == VISITED { - debug_assert_eq!(j, i); - break; - } - let next_j = stack[j] as usize; - stack[j] = VISITED; - j = next_j; - } - } - - while current >= 0 { - set_to_nop(&mut block.instructions[*ix + current as usize]); - current -= 1; - } - *ix += len - 1; - Ok(()) -} - -/// flowgraph.c apply_static_swaps -fn apply_static_swaps(block: &mut Block, mut i: isize) { - while i >= 0 { - let idx = i as usize; - debug_assert!(idx < block.instruction_used); - let swap_arg = match block.instructions[idx].instr.real_opcode() { - Some(Opcode::Swap) => u32::from(block.instructions[idx].arg), - Some(Opcode::Nop | Opcode::PopTop | Opcode::StoreFast) => { - i -= 1; - continue; - } - _ if matches!( - block.instructions[idx].instr.pseudo_opcode(), - Some(PseudoOpcode::StoreFastMaybeNull) - ) => - { - i -= 1; - continue; - } - _ => return, - }; - - let Some(j) = next_swappable_instruction(block, idx, -1) else { - return; - }; - let lineno = instruction_lineno(&block.instructions[j]); - let mut k = j; - for _ in 1..swap_arg { - let Some(next) = next_swappable_instruction(block, k, lineno) else { - return; - }; - k = next; - } - - let store_j = stores_to(&block.instructions[j]); - let store_k = stores_to(&block.instructions[k]); - if store_j >= 0 || store_k >= 0 { - if store_j == store_k { - return; - } - let mut idx = j + 1; - while idx < k { - let store_idx = stores_to(&block.instructions[idx]); - if store_idx >= 0 && (store_idx == store_j || store_idx == store_k) { - return; - } - idx += 1; - } - } - - set_to_nop(&mut block.instructions[idx]); - block.instructions.swap(j, k); - i -= 1; - } -} - -/// flowgraph.c optimize_basic_block swap pass -fn apply_static_swaps_block(block: &mut Block) -> crate::InternalResult<()> { - let mut i = 0; - while i < block.instruction_used { - if matches!( - block.instructions[i].instr.real_opcode(), - Some(Opcode::Swap) - ) { - swaptimize(block, &mut i)?; - apply_static_swaps(block, i as isize); - } - i += 1; - } - Ok(()) -} - /// flowgraph.c maybe_instr_make_load_smallint fn maybe_instr_make_load_smallint(instr: &mut InstructionInfo, constant: &ConstantData) -> bool { if let ConstantData::Integer { value } = constant @@ -5367,7 +5421,7 @@ impl CodeInfo { while block_idx != BlockIdx::NULL { use core::fmt::Write; let block = &self.blocks[block_idx]; - let block_return = if basicblock_returns(block) { + let block_return = if block.basicblock_returns() { " return" } else { "" @@ -6107,7 +6161,7 @@ fn cfg_builder_new() -> crate::InternalResult<CfgBuilder> { /// flowgraph.c cfg_builder_current_block_is_terminated fn cfg_builder_current_block_is_terminated(g: &mut CfgBuilder) -> bool { let block = &mut g.blocks[g.current]; - let last = basicblock_last_instr(block).copied(); + let last = block.basicblock_last_instr().copied(); if last.is_some_and(|last| last.instr.is_terminator()) { return true; } @@ -6144,7 +6198,7 @@ fn cfg_builder_use_label( /// flowgraph.c _PyCfgBuilder_Addop fn cfg_builder_addop(g: &mut CfgBuilder, info: InstructionInfo) -> crate::InternalResult<()> { cfg_builder_maybe_start_new_block(g)?; - basicblock_addop(&mut g.blocks[g.current], info) + g.blocks[g.current].basicblock_addop(info) } /// flowgraph.c cfg_builder_check @@ -6388,11 +6442,11 @@ fn scan_block_for_locals( } let next = blocks[idx].next; - if next != BlockIdx::NULL && bb_has_fallthrough(&blocks[idx]) { + if next != BlockIdx::NULL && blocks[idx].bb_has_fallthrough() { maybe_push(blocks, worklist, next, unsafe_mask); } - let last = basicblock_last_instr(&blocks[idx]).copied(); + let last = blocks[idx].basicblock_last_instr().copied(); if let Some(last) = last && is_jump(&last) { @@ -6503,22 +6557,6 @@ fn instruction_is_no_location(instr: &InstructionInfo) -> bool { instruction_lineno(instr) == NO_LOCATION_OVERRIDE } -/// flowgraph.c basicblock_nofallthrough -fn basicblock_nofallthrough(block: &Block) -> bool { - let last = basicblock_last_instr(block); - last.is_some_and(|last| last.instr.is_scope_exit() || last.instr.is_unconditional_jump()) -} - -/// flowgraph.c BB_NO_FALLTHROUGH -fn bb_no_fallthrough(block: &Block) -> bool { - basicblock_nofallthrough(block) -} - -/// flowgraph.c BB_HAS_FALLTHROUGH -fn bb_has_fallthrough(block: &Block) -> bool { - !bb_no_fallthrough(block) -} - /// flowgraph.c add_checks_for_loads_of_uninitialized_variables uses uint64_t masks. const LOCAL_UNSAFE_MASK_BITS: usize = 64; @@ -6535,56 +6573,6 @@ fn is_block_push(instr: &InstructionInfo) -> bool { instr.instr.is_block_push() } -/// flowgraph.c basicblock_returns -#[cfg(test)] -fn basicblock_returns(block: &Block) -> bool { - let last = basicblock_last_instr(block); - if let Some(last) = last { - matches!(last.instr.real(), Some(Instruction::ReturnValue)) - } else { - false - } -} - -/// flowgraph.c basicblock_exits_scope -fn basicblock_exits_scope(block: &Block) -> bool { - let last = basicblock_last_instr(block); - last.is_some_and(|last| last.instr.is_scope_exit()) -} - -/// flowgraph.c is_exit_or_eval_check_without_lineno -fn is_exit_or_eval_check_without_lineno(block: &Block) -> bool { - if basicblock_exits_scope(block) || basicblock_has_eval_break(block) { - basicblock_has_no_lineno(block) - } else { - false - } -} - -/// flowgraph.c basicblock_has_eval_break -fn basicblock_has_eval_break(block: &Block) -> bool { - let mut i = 0; - while i < block.instruction_used { - if block.instructions[i].instr.has_eval_break() { - return true; - } - i += 1; - } - false -} - -/// flowgraph.c basicblock_has_no_lineno -fn basicblock_has_no_lineno(block: &Block) -> bool { - let mut i = 0; - while i < block.instruction_used { - if instruction_lineno(&block.instructions[i]) >= 0 { - return false; - } - i += 1; - } - true -} - /// flowgraph.c get_max_label fn get_max_label(blocks: &Blocks) -> i32 { let mut lbl = -1; @@ -6710,7 +6698,7 @@ pub(crate) fn label_exception_targets(blocks: &mut Blocks) -> crate::InternalRes // to the jump target. debug_assert!(target != BlockIdx::NULL); if !blocks[target].visited { - if bb_has_fallthrough(&blocks[bi]) { + if blocks[bi].bb_has_fallthrough() { blocks[target].except_stack = Some(copy_except_stack( stack.as_ref().expect("active exception stack"), )); @@ -6745,7 +6733,7 @@ pub(crate) fn label_exception_targets(blocks: &mut Blocks) -> crate::InternalRes } let next = blocks[bi].next; - if !stack_transferred && bb_has_fallthrough(&blocks[bi]) { + if !stack_transferred && blocks[bi].bb_has_fallthrough() { debug_assert!(next != BlockIdx::NULL); if next != BlockIdx::NULL && !blocks[next].visited { blocks[next].except_stack = stack.take(); @@ -6985,7 +6973,9 @@ mod tests { } fn test_block_push(block: &mut Block, info: InstructionInfo) { - let off = basicblock_next_instr(block).expect("test block instruction slot"); + let off = block + .basicblock_next_instr() + .expect("test block instruction slot"); block.instructions[off] = info; } @@ -7235,9 +7225,10 @@ mod tests { let mut stale = test_instr(Instruction::Nop, 11); stale.except_handler = Some(handler); test_block_push(&mut block, stale); - basicblock_clear(&mut block); + block.basicblock_clear(); - basicblock_addop(&mut block, test_instr(Instruction::PopTop, 12)) + block + .basicblock_addop(test_instr(Instruction::PopTop, 12)) .expect("basicblock_addop succeeds"); // CPython `basicblock_addop()` writes opcode/oparg/target/location into @@ -7251,14 +7242,16 @@ mod tests { fn basicblock_next_instr_tracks_cpython_c_array_allocation() { let mut block = Block::default(); for i in 0..15 { - basicblock_addop(&mut block, test_instr(Instruction::PopTop, 10 + i)) + block + .basicblock_addop(test_instr(Instruction::PopTop, 10 + i)) .expect("basicblock_addop succeeds"); } assert_eq!(block.instruction_allocation, DEFAULT_BLOCK_SIZE); // CPython calls `_Py_CArray_EnsureCapacity(b_iused + 1)`, so the 16th // instruction expands a 16-slot array to 32 before returning offset 15. - basicblock_addop(&mut block, test_instr(Instruction::PopTop, 25)) + block + .basicblock_addop(test_instr(Instruction::PopTop, 25)) .expect("basicblock_addop succeeds"); assert_eq!(block.instruction_allocation, DEFAULT_BLOCK_SIZE * 2); } @@ -7276,7 +7269,8 @@ mod tests { test_block_push(&mut block, stale); block.instruction_used = 1; - basicblock_insert_instruction(&mut block, 0, test_instr(Instruction::PopTop, 23)) + block + .basicblock_insert_instruction(0, test_instr(Instruction::PopTop, 23)) .expect("basicblock_insert_instruction succeeds"); // CPython `basicblock_insert_instruction()` also obtains a slot with @@ -7297,8 +7291,9 @@ mod tests { stale.except_handler = Some(handler); test_block_push(&mut block, stale); - basicblock_clear(&mut block); - basicblock_addop(&mut block, test_instr(Instruction::Nop, 32)) + block.basicblock_clear(); + block + .basicblock_addop(test_instr(Instruction::Nop, 32)) .expect("basicblock_addop succeeds"); // CPython `remove_unreachable()` sets `b_iused = 0` without clearing the @@ -7320,9 +7315,10 @@ mod tests { test_block_push(&mut block, stale); } - basicblock_clear(&mut block); + block.basicblock_clear(); for i in 0..3 { - basicblock_addop(&mut block, test_instr(Instruction::PopTop, 38 + i)) + block + .basicblock_addop(test_instr(Instruction::PopTop, 38 + i)) .expect("basicblock_addop succeeds"); } @@ -7352,7 +7348,7 @@ mod tests { let mut stale = test_instr(Instruction::Nop, 41); stale.except_handler = Some(handler); test_block_push(&mut blocks[0], stale); - basicblock_clear(&mut blocks[0]); + blocks[0].basicblock_clear(); test_block_push(&mut blocks[1], test_instr(Instruction::PopTop, 42)); blocks @@ -7408,7 +7404,9 @@ mod tests { test_block_push(&mut block, info); } - apply_static_swaps_block(&mut block).expect("apply_static_swaps_block succeeds"); + block + .apply_static_swaps_block() + .expect("apply_static_swaps_block succeeds"); // CPython `next_swappable_instruction()` compares `i_loc.lineno` // directly, so a following NO_LOCATION swaperand does not match the @@ -7437,7 +7435,9 @@ mod tests { test_block_push(&mut block, info); } - apply_static_swaps_block(&mut block).expect("apply_static_swaps_block succeeds"); + block + .apply_static_swaps_block() + .expect("apply_static_swaps_block succeeds"); // Conversely, when the first swaperand has NO_LOCATION, CPython passes // `-1` as the line filter and does not enforce a boundary. @@ -7720,7 +7720,7 @@ mod tests { test_block_push(&mut blocks[0], test_cond_jump(BlockIdx::new(1), 10)); test_block_push(&mut blocks[1], test_instr(Instruction::Nop, 20)); blocks[1].instructions[0].lineno_override = Some(NO_LOCATION_OVERRIDE); - basicblock_clear(&mut blocks[1]); + blocks[1].basicblock_clear(); test_block_push(&mut blocks[2], test_instr(Instruction::ReturnValue, 30)); blocks @@ -7743,10 +7743,10 @@ mod tests { // CPython `basicblock_has_no_lineno()` treats every negative lineno as // no line number, including `NEXT_LOCATION` (`lineno == -2`). - assert!(basicblock_has_no_lineno(&block)); + assert!(block.basicblock_has_no_lineno()); test_block_push(&mut block, test_instr(Instruction::PopTop, 11)); - assert!(!basicblock_has_no_lineno(&block)); + assert!(!block.basicblock_has_no_lineno()); } #[test] @@ -7775,7 +7775,7 @@ mod tests { // CPython `optimize_basic_block()` continues after `jump_thread()`, so // the appended jump is immediately checked against the next jump target. - let threaded = basicblock_last_instr(&blocks[0]).expect("threaded jump"); + let threaded = blocks[0].basicblock_last_instr().expect("threaded jump"); assert!(matches!( threaded.instr.pseudo(), Some(PseudoInstruction::Jump { .. }) From 16869e1ce8b438024d40c36d89f50e2b56d0eab9 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Thu, 2 Jul 2026 10:32:33 +0300 Subject: [PATCH 176/339] Update some tests to `3.14.6` (#8204) * Apply skip at the correct place * Update `test_msvcrt.yp` to 3.14.6 * Add `test_external_inspection.py` --- Lib/test/test_external_inspection.py | 1304 ++++++++++++++++++++++++++ Lib/test/test_mmap.py | 5 +- Lib/test/test_msvcrt.py | 9 +- 3 files changed, 1312 insertions(+), 6 deletions(-) create mode 100644 Lib/test/test_external_inspection.py diff --git a/Lib/test/test_external_inspection.py b/Lib/test/test_external_inspection.py new file mode 100644 index 000000000..08779bdb0 --- /dev/null +++ b/Lib/test/test_external_inspection.py @@ -0,0 +1,1304 @@ +import unittest +import os +import textwrap +import importlib +import sys +import socket +import threading +import time +from asyncio import staggered, taskgroups, base_events, tasks +from unittest.mock import ANY +from test.support import ( + os_helper, + SHORT_TIMEOUT, + busy_retry, + requires_gil_enabled, +) +from test.support.import_helper import import_module +from test.support.script_helper import make_script +from test.support.socket_helper import find_unused_port + +import subprocess + +PROCESS_VM_READV_SUPPORTED = False + +try: + from _remote_debugging import PROCESS_VM_READV_SUPPORTED + from _remote_debugging import RemoteUnwinder + from _remote_debugging import FrameInfo, CoroInfo, TaskInfo +except ImportError: + raise unittest.SkipTest( + "Test only runs when _remote_debugging is available" + ) + + +def _make_test_script(script_dir, script_basename, source): + to_return = make_script(script_dir, script_basename, source) + importlib.invalidate_caches() + return to_return + + +skip_if_not_supported = unittest.skipIf( + ( + sys.platform != "darwin" + and sys.platform != "linux" + and sys.platform != "win32" + ), + "Test only runs on Linux, Windows and MacOS", +) + + +def get_stack_trace(pid): + unwinder = RemoteUnwinder(pid, all_threads=True, debug=True) + return unwinder.get_stack_trace() + + +def get_async_stack_trace(pid): + unwinder = RemoteUnwinder(pid, debug=True) + return unwinder.get_async_stack_trace() + + +def get_all_awaited_by(pid): + unwinder = RemoteUnwinder(pid, debug=True) + return unwinder.get_all_awaited_by() + + +class TestGetStackTrace(unittest.TestCase): + maxDiff = None + + @skip_if_not_supported + @unittest.skipIf( + sys.platform == "linux" and not PROCESS_VM_READV_SUPPORTED, + "Test only runs on Linux with process_vm_readv support", + ) + def test_remote_stack_trace(self): + # Spawn a process with some realistic Python code + port = find_unused_port() + script = textwrap.dedent( + f"""\ + import time, sys, socket, threading + # Connect to the test process + sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + sock.connect(('localhost', {port})) + + def bar(): + for x in range(100): + if x == 50: + baz() + + def baz(): + foo() + + def foo(): + sock.sendall(b"ready:thread\\n"); time.sleep(10_000) # same line number + + t = threading.Thread(target=bar) + t.start() + sock.sendall(b"ready:main\\n"); t.join() # same line number + """ + ) + stack_trace = None + with os_helper.temp_dir() as work_dir: + script_dir = os.path.join(work_dir, "script_pkg") + os.mkdir(script_dir) + + # Create a socket server to communicate with the target process + server_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + server_socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) + server_socket.bind(("localhost", port)) + server_socket.settimeout(SHORT_TIMEOUT) + server_socket.listen(1) + + script_name = _make_test_script(script_dir, "script", script) + client_socket = None + try: + p = subprocess.Popen([sys.executable, script_name]) + client_socket, _ = server_socket.accept() + server_socket.close() + response = b"" + while ( + b"ready:main" not in response + or b"ready:thread" not in response + ): + response += client_socket.recv(1024) + stack_trace = get_stack_trace(p.pid) + except PermissionError: + self.skipTest( + "Insufficient permissions to read the stack trace" + ) + finally: + if client_socket is not None: + client_socket.close() + p.kill() + p.terminate() + p.wait(timeout=SHORT_TIMEOUT) + + thread_expected_stack_trace = [ + FrameInfo([script_name, 15, "foo"]), + FrameInfo([script_name, 12, "baz"]), + FrameInfo([script_name, 9, "bar"]), + FrameInfo([threading.__file__, ANY, "Thread.run"]), + ] + # Is possible that there are more threads, so we check that the + # expected stack traces are in the result (looking at you Windows!) + self.assertIn((ANY, thread_expected_stack_trace), stack_trace) + + # Check that the main thread stack trace is in the result + frame = FrameInfo([script_name, 19, "<module>"]) + for _, stack in stack_trace: + if frame in stack: + break + else: + self.fail("Main thread stack trace not found in result") + + @skip_if_not_supported + @unittest.skipIf( + sys.platform == "linux" and not PROCESS_VM_READV_SUPPORTED, + "Test only runs on Linux with process_vm_readv support", + ) + def test_self_trace_after_ctypes_import(self): + """Test that RemoteUnwinder works on the same process after _ctypes import. + + When _ctypes is imported, it may call dlopen on the libpython shared + library, creating a duplicate mapping in the process address space. + The remote debugging code must skip these uninitialized duplicate + mappings and find the real PyRuntime. See gh-144563. + """ + + # Skip the test if the _ctypes module is missing. + import_module("_ctypes") + + # Run the test in a subprocess to avoid side effects + script = textwrap.dedent("""\ + import os + import _remote_debugging + + # Should work before _ctypes import + unwinder = _remote_debugging.RemoteUnwinder(os.getpid()) + + import _ctypes + + # Should still work after _ctypes import (gh-144563) + unwinder = _remote_debugging.RemoteUnwinder(os.getpid()) + """) + + result = subprocess.run( + [sys.executable, "-c", script], + capture_output=True, + text=True, + timeout=SHORT_TIMEOUT, + ) + self.assertEqual( + result.returncode, 0, + f"stdout: {result.stdout}\nstderr: {result.stderr}" + ) + + @skip_if_not_supported + @unittest.skipIf( + sys.platform == "linux" and not PROCESS_VM_READV_SUPPORTED, + "Test only runs on Linux with process_vm_readv support", + ) + def test_async_remote_stack_trace(self): + # Spawn a process with some realistic Python code + port = find_unused_port() + script = textwrap.dedent( + f"""\ + import asyncio + import time + import sys + import socket + # Connect to the test process + sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + sock.connect(('localhost', {port})) + + def c5(): + sock.sendall(b"ready"); time.sleep(10_000) # same line number + + async def c4(): + await asyncio.sleep(0) + c5() + + async def c3(): + await c4() + + async def c2(): + await c3() + + async def c1(task): + await task + + async def main(): + async with asyncio.TaskGroup() as tg: + task = tg.create_task(c2(), name="c2_root") + tg.create_task(c1(task), name="sub_main_1") + tg.create_task(c1(task), name="sub_main_2") + + def new_eager_loop(): + loop = asyncio.new_event_loop() + eager_task_factory = asyncio.create_eager_task_factory( + asyncio.Task) + loop.set_task_factory(eager_task_factory) + return loop + + asyncio.run(main(), loop_factory={{TASK_FACTORY}}) + """ + ) + stack_trace = None + for task_factory_variant in "asyncio.new_event_loop", "new_eager_loop": + with ( + self.subTest(task_factory_variant=task_factory_variant), + os_helper.temp_dir() as work_dir, + ): + script_dir = os.path.join(work_dir, "script_pkg") + os.mkdir(script_dir) + server_socket = socket.socket( + socket.AF_INET, socket.SOCK_STREAM + ) + server_socket.setsockopt( + socket.SOL_SOCKET, socket.SO_REUSEADDR, 1 + ) + server_socket.bind(("localhost", port)) + server_socket.settimeout(SHORT_TIMEOUT) + server_socket.listen(1) + script_name = _make_test_script( + script_dir, + "script", + script.format(TASK_FACTORY=task_factory_variant), + ) + client_socket = None + try: + p = subprocess.Popen([sys.executable, script_name]) + client_socket, _ = server_socket.accept() + server_socket.close() + response = client_socket.recv(1024) + self.assertEqual(response, b"ready") + stack_trace = get_async_stack_trace(p.pid) + except PermissionError: + self.skipTest( + "Insufficient permissions to read the stack trace" + ) + finally: + if client_socket is not None: + client_socket.close() + p.kill() + p.terminate() + p.wait(timeout=SHORT_TIMEOUT) + + # First check all the tasks are present + tasks_names = [ + task.task_name for task in stack_trace[0].awaited_by + ] + for task_name in ["c2_root", "sub_main_1", "sub_main_2"]: + self.assertIn(task_name, tasks_names) + + # Now ensure that the awaited_by_relationships are correct + id_to_task = { + task.task_id: task for task in stack_trace[0].awaited_by + } + task_name_to_awaited_by = { + task.task_name: set( + id_to_task[awaited.task_name].task_name + for awaited in task.awaited_by + ) + for task in stack_trace[0].awaited_by + } + self.assertEqual( + task_name_to_awaited_by, + { + "c2_root": {"Task-1", "sub_main_1", "sub_main_2"}, + "Task-1": set(), + "sub_main_1": {"Task-1"}, + "sub_main_2": {"Task-1"}, + }, + ) + + # Now ensure that the coroutine stacks are correct + coroutine_stacks = { + task.task_name: sorted( + tuple(tuple(frame) for frame in coro.call_stack) + for coro in task.coroutine_stack + ) + for task in stack_trace[0].awaited_by + } + self.assertEqual( + coroutine_stacks, + { + "Task-1": [ + ( + tuple( + [ + taskgroups.__file__, + ANY, + "TaskGroup._aexit", + ] + ), + tuple( + [ + taskgroups.__file__, + ANY, + "TaskGroup.__aexit__", + ] + ), + tuple([script_name, 26, "main"]), + ) + ], + "c2_root": [ + ( + tuple([script_name, 10, "c5"]), + tuple([script_name, 14, "c4"]), + tuple([script_name, 17, "c3"]), + tuple([script_name, 20, "c2"]), + ) + ], + "sub_main_1": [(tuple([script_name, 23, "c1"]),)], + "sub_main_2": [(tuple([script_name, 23, "c1"]),)], + }, + ) + + # Now ensure the coroutine stacks for the awaited_by relationships are correct. + awaited_by_coroutine_stacks = { + task.task_name: sorted( + ( + id_to_task[coro.task_name].task_name, + tuple(tuple(frame) for frame in coro.call_stack), + ) + for coro in task.awaited_by + ) + for task in stack_trace[0].awaited_by + } + self.assertEqual( + awaited_by_coroutine_stacks, + { + "Task-1": [], + "c2_root": [ + ( + "Task-1", + ( + tuple( + [ + taskgroups.__file__, + ANY, + "TaskGroup._aexit", + ] + ), + tuple( + [ + taskgroups.__file__, + ANY, + "TaskGroup.__aexit__", + ] + ), + tuple([script_name, 26, "main"]), + ), + ), + ("sub_main_1", (tuple([script_name, 23, "c1"]),)), + ("sub_main_2", (tuple([script_name, 23, "c1"]),)), + ], + "sub_main_1": [ + ( + "Task-1", + ( + tuple( + [ + taskgroups.__file__, + ANY, + "TaskGroup._aexit", + ] + ), + tuple( + [ + taskgroups.__file__, + ANY, + "TaskGroup.__aexit__", + ] + ), + tuple([script_name, 26, "main"]), + ), + ) + ], + "sub_main_2": [ + ( + "Task-1", + ( + tuple( + [ + taskgroups.__file__, + ANY, + "TaskGroup._aexit", + ] + ), + tuple( + [ + taskgroups.__file__, + ANY, + "TaskGroup.__aexit__", + ] + ), + tuple([script_name, 26, "main"]), + ), + ) + ], + }, + ) + + @skip_if_not_supported + @unittest.skipIf( + sys.platform == "linux" and not PROCESS_VM_READV_SUPPORTED, + "Test only runs on Linux with process_vm_readv support", + ) + def test_asyncgen_remote_stack_trace(self): + # Spawn a process with some realistic Python code + port = find_unused_port() + script = textwrap.dedent( + f"""\ + import asyncio + import time + import sys + import socket + # Connect to the test process + sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + sock.connect(('localhost', {port})) + + async def gen_nested_call(): + sock.sendall(b"ready"); time.sleep(10_000) # same line number + + async def gen(): + for num in range(2): + yield num + if num == 1: + await gen_nested_call() + + async def main(): + async for el in gen(): + pass + + asyncio.run(main()) + """ + ) + stack_trace = None + with os_helper.temp_dir() as work_dir: + script_dir = os.path.join(work_dir, "script_pkg") + os.mkdir(script_dir) + # Create a socket server to communicate with the target process + server_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + server_socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) + server_socket.bind(("localhost", port)) + server_socket.settimeout(SHORT_TIMEOUT) + server_socket.listen(1) + script_name = _make_test_script(script_dir, "script", script) + client_socket = None + try: + p = subprocess.Popen([sys.executable, script_name]) + client_socket, _ = server_socket.accept() + server_socket.close() + response = client_socket.recv(1024) + self.assertEqual(response, b"ready") + stack_trace = get_async_stack_trace(p.pid) + except PermissionError: + self.skipTest( + "Insufficient permissions to read the stack trace" + ) + finally: + if client_socket is not None: + client_socket.close() + p.kill() + p.terminate() + p.wait(timeout=SHORT_TIMEOUT) + + # For this simple asyncgen test, we only expect one task with the full coroutine stack + self.assertEqual(len(stack_trace[0].awaited_by), 1) + task = stack_trace[0].awaited_by[0] + self.assertEqual(task.task_name, "Task-1") + + # Check the coroutine stack - based on actual output, only shows main + coroutine_stack = sorted( + tuple(tuple(frame) for frame in coro.call_stack) + for coro in task.coroutine_stack + ) + self.assertEqual( + coroutine_stack, + [ + ( + tuple([script_name, 10, "gen_nested_call"]), + tuple([script_name, 16, "gen"]), + tuple([script_name, 19, "main"]), + ) + ], + ) + + # No awaited_by relationships expected for this simple case + self.assertEqual(task.awaited_by, []) + + @skip_if_not_supported + @unittest.skipIf( + sys.platform == "linux" and not PROCESS_VM_READV_SUPPORTED, + "Test only runs on Linux with process_vm_readv support", + ) + def test_async_gather_remote_stack_trace(self): + # Spawn a process with some realistic Python code + port = find_unused_port() + script = textwrap.dedent( + f"""\ + import asyncio + import time + import sys + import socket + # Connect to the test process + sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + sock.connect(('localhost', {port})) + + async def deep(): + await asyncio.sleep(0) + sock.sendall(b"ready"); time.sleep(10_000) # same line number + + async def c1(): + await asyncio.sleep(0) + await deep() + + async def c2(): + await asyncio.sleep(0) + + async def main(): + await asyncio.gather(c1(), c2()) + + asyncio.run(main()) + """ + ) + stack_trace = None + with os_helper.temp_dir() as work_dir: + script_dir = os.path.join(work_dir, "script_pkg") + os.mkdir(script_dir) + # Create a socket server to communicate with the target process + server_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + server_socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) + server_socket.bind(("localhost", port)) + server_socket.settimeout(SHORT_TIMEOUT) + server_socket.listen(1) + script_name = _make_test_script(script_dir, "script", script) + client_socket = None + try: + p = subprocess.Popen([sys.executable, script_name]) + client_socket, _ = server_socket.accept() + server_socket.close() + response = client_socket.recv(1024) + self.assertEqual(response, b"ready") + stack_trace = get_async_stack_trace(p.pid) + except PermissionError: + self.skipTest( + "Insufficient permissions to read the stack trace" + ) + finally: + if client_socket is not None: + client_socket.close() + p.kill() + p.terminate() + p.wait(timeout=SHORT_TIMEOUT) + + # First check all the tasks are present + tasks_names = [ + task.task_name for task in stack_trace[0].awaited_by + ] + for task_name in ["Task-1", "Task-2"]: + self.assertIn(task_name, tasks_names) + + # Now ensure that the awaited_by_relationships are correct + id_to_task = { + task.task_id: task for task in stack_trace[0].awaited_by + } + task_name_to_awaited_by = { + task.task_name: set( + id_to_task[awaited.task_name].task_name + for awaited in task.awaited_by + ) + for task in stack_trace[0].awaited_by + } + self.assertEqual( + task_name_to_awaited_by, + { + "Task-1": set(), + "Task-2": {"Task-1"}, + }, + ) + + # Now ensure that the coroutine stacks are correct + coroutine_stacks = { + task.task_name: sorted( + tuple(tuple(frame) for frame in coro.call_stack) + for coro in task.coroutine_stack + ) + for task in stack_trace[0].awaited_by + } + self.assertEqual( + coroutine_stacks, + { + "Task-1": [(tuple([script_name, 21, "main"]),)], + "Task-2": [ + ( + tuple([script_name, 11, "deep"]), + tuple([script_name, 15, "c1"]), + ) + ], + }, + ) + + # Now ensure the coroutine stacks for the awaited_by relationships are correct. + awaited_by_coroutine_stacks = { + task.task_name: sorted( + ( + id_to_task[coro.task_name].task_name, + tuple(tuple(frame) for frame in coro.call_stack), + ) + for coro in task.awaited_by + ) + for task in stack_trace[0].awaited_by + } + self.assertEqual( + awaited_by_coroutine_stacks, + { + "Task-1": [], + "Task-2": [ + ("Task-1", (tuple([script_name, 21, "main"]),)) + ], + }, + ) + + @skip_if_not_supported + @unittest.skipIf( + sys.platform == "linux" and not PROCESS_VM_READV_SUPPORTED, + "Test only runs on Linux with process_vm_readv support", + ) + def test_async_staggered_race_remote_stack_trace(self): + # Spawn a process with some realistic Python code + port = find_unused_port() + script = textwrap.dedent( + f"""\ + import asyncio.staggered + import time + import sys + import socket + # Connect to the test process + sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + sock.connect(('localhost', {port})) + + async def deep(): + await asyncio.sleep(0) + sock.sendall(b"ready"); time.sleep(10_000) # same line number + + async def c1(): + await asyncio.sleep(0) + await deep() + + async def c2(): + await asyncio.sleep(10_000) + + async def main(): + await asyncio.staggered.staggered_race( + [c1, c2], + delay=None, + ) + + asyncio.run(main()) + """ + ) + stack_trace = None + with os_helper.temp_dir() as work_dir: + script_dir = os.path.join(work_dir, "script_pkg") + os.mkdir(script_dir) + # Create a socket server to communicate with the target process + server_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + server_socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) + server_socket.bind(("localhost", port)) + server_socket.settimeout(SHORT_TIMEOUT) + server_socket.listen(1) + script_name = _make_test_script(script_dir, "script", script) + client_socket = None + try: + p = subprocess.Popen([sys.executable, script_name]) + client_socket, _ = server_socket.accept() + server_socket.close() + response = client_socket.recv(1024) + self.assertEqual(response, b"ready") + stack_trace = get_async_stack_trace(p.pid) + except PermissionError: + self.skipTest( + "Insufficient permissions to read the stack trace" + ) + finally: + if client_socket is not None: + client_socket.close() + p.kill() + p.terminate() + p.wait(timeout=SHORT_TIMEOUT) + + # First check all the tasks are present + tasks_names = [ + task.task_name for task in stack_trace[0].awaited_by + ] + for task_name in ["Task-1", "Task-2"]: + self.assertIn(task_name, tasks_names) + + # Now ensure that the awaited_by_relationships are correct + id_to_task = { + task.task_id: task for task in stack_trace[0].awaited_by + } + task_name_to_awaited_by = { + task.task_name: set( + id_to_task[awaited.task_name].task_name + for awaited in task.awaited_by + ) + for task in stack_trace[0].awaited_by + } + self.assertEqual( + task_name_to_awaited_by, + { + "Task-1": set(), + "Task-2": {"Task-1"}, + }, + ) + + # Now ensure that the coroutine stacks are correct + coroutine_stacks = { + task.task_name: sorted( + tuple(tuple(frame) for frame in coro.call_stack) + for coro in task.coroutine_stack + ) + for task in stack_trace[0].awaited_by + } + self.assertEqual( + coroutine_stacks, + { + "Task-1": [ + ( + tuple([staggered.__file__, ANY, "staggered_race"]), + tuple([script_name, 21, "main"]), + ) + ], + "Task-2": [ + ( + tuple([script_name, 11, "deep"]), + tuple([script_name, 15, "c1"]), + tuple( + [ + staggered.__file__, + ANY, + "staggered_race.<locals>.run_one_coro", + ] + ), + ) + ], + }, + ) + + # Now ensure the coroutine stacks for the awaited_by relationships are correct. + awaited_by_coroutine_stacks = { + task.task_name: sorted( + ( + id_to_task[coro.task_name].task_name, + tuple(tuple(frame) for frame in coro.call_stack), + ) + for coro in task.awaited_by + ) + for task in stack_trace[0].awaited_by + } + self.assertEqual( + awaited_by_coroutine_stacks, + { + "Task-1": [], + "Task-2": [ + ( + "Task-1", + ( + tuple( + [staggered.__file__, ANY, "staggered_race"] + ), + tuple([script_name, 21, "main"]), + ), + ) + ], + }, + ) + + @skip_if_not_supported + @unittest.skipIf( + sys.platform == "linux" and not PROCESS_VM_READV_SUPPORTED, + "Test only runs on Linux with process_vm_readv support", + ) + def test_async_global_awaited_by(self): + port = find_unused_port() + script = textwrap.dedent( + f"""\ + import asyncio + import os + import random + import sys + import socket + from string import ascii_lowercase, digits + from test.support import socket_helper, SHORT_TIMEOUT + + HOST = '127.0.0.1' + PORT = socket_helper.find_unused_port() + connections = 0 + + # Connect to the test process + sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + sock.connect(('localhost', {port})) + + class EchoServerProtocol(asyncio.Protocol): + def connection_made(self, transport): + global connections + connections += 1 + self.transport = transport + + def data_received(self, data): + self.transport.write(data) + self.transport.close() + + async def echo_client(message): + reader, writer = await asyncio.open_connection(HOST, PORT) + writer.write(message.encode()) + await writer.drain() + + data = await reader.read(100) + assert message == data.decode() + writer.close() + await writer.wait_closed() + # Signal we are ready to sleep + sock.sendall(b"ready") + await asyncio.sleep(SHORT_TIMEOUT) + + async def echo_client_spam(server): + async with asyncio.TaskGroup() as tg: + while connections < 1000: + msg = list(ascii_lowercase + digits) + random.shuffle(msg) + tg.create_task(echo_client("".join(msg))) + await asyncio.sleep(0) + # at least a 1000 tasks created. Each task will signal + # when is ready to avoid the race caused by the fact that + # tasks are waited on tg.__exit__ and we cannot signal when + # that happens otherwise + # at this point all client tasks completed without assertion errors + # let's wrap up the test + server.close() + await server.wait_closed() + + async def main(): + loop = asyncio.get_running_loop() + server = await loop.create_server(EchoServerProtocol, HOST, PORT) + async with server: + async with asyncio.TaskGroup() as tg: + tg.create_task(server.serve_forever(), name="server task") + tg.create_task(echo_client_spam(server), name="echo client spam") + + asyncio.run(main()) + """ + ) + stack_trace = None + with os_helper.temp_dir() as work_dir: + script_dir = os.path.join(work_dir, "script_pkg") + os.mkdir(script_dir) + # Create a socket server to communicate with the target process + server_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + server_socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) + server_socket.bind(("localhost", port)) + server_socket.settimeout(SHORT_TIMEOUT) + server_socket.listen(1) + script_name = _make_test_script(script_dir, "script", script) + client_socket = None + try: + p = subprocess.Popen([sys.executable, script_name]) + client_socket, _ = server_socket.accept() + server_socket.close() + for _ in range(1000): + expected_response = b"ready" + response = client_socket.recv(len(expected_response)) + self.assertEqual(response, expected_response) + for _ in busy_retry(SHORT_TIMEOUT): + try: + all_awaited_by = get_all_awaited_by(p.pid) + except RuntimeError as re: + # This call reads a linked list in another process with + # no synchronization. That occasionally leads to invalid + # reads. Here we avoid making the test flaky. + msg = str(re) + if msg.startswith("Task list appears corrupted"): + continue + elif msg.startswith( + "Invalid linked list structure reading remote memory" + ): + continue + elif msg.startswith("Unknown error reading memory"): + continue + elif msg.startswith("Unhandled frame owner"): + continue + raise # Unrecognized exception, safest not to ignore it + else: + break + # expected: a list of two elements: 1 thread, 1 interp + self.assertEqual(len(all_awaited_by), 2) + # expected: a tuple with the thread ID and the awaited_by list + self.assertEqual(len(all_awaited_by[0]), 2) + # expected: no tasks in the fallback per-interp task list + self.assertEqual(all_awaited_by[1], (0, [])) + entries = all_awaited_by[0][1] + # expected: at least 1000 pending tasks + self.assertGreaterEqual(len(entries), 1000) + # the first three tasks stem from the code structure + main_stack = [ + FrameInfo([taskgroups.__file__, ANY, "TaskGroup._aexit"]), + FrameInfo( + [taskgroups.__file__, ANY, "TaskGroup.__aexit__"] + ), + FrameInfo([script_name, 60, "main"]), + ] + self.assertIn( + TaskInfo( + [ANY, "Task-1", [CoroInfo([main_stack, ANY])], []] + ), + entries, + ) + self.assertIn( + TaskInfo( + [ + ANY, + "server task", + [ + CoroInfo( + [ + [ + FrameInfo( + [ + base_events.__file__, + ANY, + "Server.serve_forever", + ] + ) + ], + ANY, + ] + ) + ], + [ + CoroInfo( + [ + [ + FrameInfo( + [ + taskgroups.__file__, + ANY, + "TaskGroup._aexit", + ] + ), + FrameInfo( + [ + taskgroups.__file__, + ANY, + "TaskGroup.__aexit__", + ] + ), + FrameInfo( + [script_name, ANY, "main"] + ), + ], + ANY, + ] + ) + ], + ] + ), + entries, + ) + self.assertIn( + TaskInfo( + [ + ANY, + "Task-4", + [ + CoroInfo( + [ + [ + FrameInfo( + [tasks.__file__, ANY, "sleep"] + ), + FrameInfo( + [ + script_name, + 38, + "echo_client", + ] + ), + ], + ANY, + ] + ) + ], + [ + CoroInfo( + [ + [ + FrameInfo( + [ + taskgroups.__file__, + ANY, + "TaskGroup._aexit", + ] + ), + FrameInfo( + [ + taskgroups.__file__, + ANY, + "TaskGroup.__aexit__", + ] + ), + FrameInfo( + [ + script_name, + 41, + "echo_client_spam", + ] + ), + ], + ANY, + ] + ) + ], + ] + ), + entries, + ) + + expected_awaited_by = [ + CoroInfo( + [ + [ + FrameInfo( + [ + taskgroups.__file__, + ANY, + "TaskGroup._aexit", + ] + ), + FrameInfo( + [ + taskgroups.__file__, + ANY, + "TaskGroup.__aexit__", + ] + ), + FrameInfo( + [script_name, 41, "echo_client_spam"] + ), + ], + ANY, + ] + ) + ] + tasks_with_awaited = [ + task + for task in entries + if task.awaited_by == expected_awaited_by + ] + self.assertGreaterEqual(len(tasks_with_awaited), 1000) + + # the final task will have some random number, but it should for + # sure be one of the echo client spam horde (In windows this is not true + # for some reason) + if sys.platform != "win32": + self.assertEqual( + tasks_with_awaited[-1].awaited_by, + entries[-1].awaited_by, + ) + except PermissionError: + self.skipTest( + "Insufficient permissions to read the stack trace" + ) + finally: + if client_socket is not None: + client_socket.close() + p.kill() + p.terminate() + p.wait(timeout=SHORT_TIMEOUT) + + @skip_if_not_supported + @unittest.skipIf( + sys.platform == "linux" and not PROCESS_VM_READV_SUPPORTED, + "Test only runs on Linux with process_vm_readv support", + ) + def test_self_trace(self): + stack_trace = get_stack_trace(os.getpid()) + # Is possible that there are more threads, so we check that the + # expected stack traces are in the result (looking at you Windows!) + this_tread_stack = None + for thread_id, stack in stack_trace: + if thread_id == threading.get_native_id(): + this_tread_stack = stack + break + self.assertIsNotNone(this_tread_stack) + self.assertEqual( + stack[:2], + [ + FrameInfo( + [ + __file__, + get_stack_trace.__code__.co_firstlineno + 2, + "get_stack_trace", + ] + ), + FrameInfo( + [ + __file__, + self.test_self_trace.__code__.co_firstlineno + 6, + "TestGetStackTrace.test_self_trace", + ] + ), + ], + ) + + @skip_if_not_supported + @unittest.skipIf( + sys.platform == "linux" and not PROCESS_VM_READV_SUPPORTED, + "Test only runs on Linux with process_vm_readv support", + ) + @requires_gil_enabled("Free threaded builds don't have an 'active thread'") + def test_only_active_thread(self): + # Test that only_active_thread parameter works correctly + port = find_unused_port() + script = textwrap.dedent( + f"""\ + import time, sys, socket, threading + + # Connect to the test process + sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + sock.connect(('localhost', {port})) + + def worker_thread(name, barrier, ready_event): + barrier.wait() # Synchronize thread start + ready_event.wait() # Wait for main thread signal + # Sleep to keep thread alive + time.sleep(10_000) + + def main_work(): + # Do busy work to hold the GIL + sock.sendall(b"working\\n") + count = 0 + while count < 100000000: + count += 1 + if count % 10000000 == 0: + pass # Keep main thread busy + sock.sendall(b"done\\n") + + # Create synchronization primitives + num_threads = 3 + barrier = threading.Barrier(num_threads + 1) # +1 for main thread + ready_event = threading.Event() + + # Start worker threads + threads = [] + for i in range(num_threads): + t = threading.Thread(target=worker_thread, args=(f"Worker-{{i}}", barrier, ready_event)) + t.start() + threads.append(t) + + # Wait for all threads to be ready + barrier.wait() + + # Signal ready to parent process + sock.sendall(b"ready\\n") + + # Signal threads to start waiting + ready_event.set() + + # Now do busy work to hold the GIL + main_work() + """ + ) + + with os_helper.temp_dir() as work_dir: + script_dir = os.path.join(work_dir, "script_pkg") + os.mkdir(script_dir) + + # Create a socket server to communicate with the target process + server_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + server_socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) + server_socket.bind(("localhost", port)) + server_socket.settimeout(SHORT_TIMEOUT) + server_socket.listen(1) + + script_name = _make_test_script(script_dir, "script", script) + client_socket = None + try: + p = subprocess.Popen([sys.executable, script_name]) + client_socket, _ = server_socket.accept() + server_socket.close() + + # Wait for ready signal + response = b"" + while b"ready" not in response: + response += client_socket.recv(1024) + + # Wait for the main thread to start its busy work + while b"working" not in response: + response += client_socket.recv(1024) + + # Get stack trace with all threads + unwinder_all = RemoteUnwinder(p.pid, all_threads=True) + for _ in range(10): + # Wait for the main thread to start its busy work + all_traces = unwinder_all.get_stack_trace() + found = False + for thread_id, stack in all_traces: + if not stack: + continue + current_frame = stack[0] + if ( + current_frame.funcname == "main_work" + and current_frame.lineno > 15 + ): + found = True + + if found: + break + # Give a bit of time to take the next sample + time.sleep(0.1) + else: + self.fail( + "Main thread did not start its busy work on time" + ) + + # Get stack trace with only GIL holder + unwinder_gil = RemoteUnwinder(p.pid, only_active_thread=True) + gil_traces = unwinder_gil.get_stack_trace() + + except PermissionError: + self.skipTest( + "Insufficient permissions to read the stack trace" + ) + finally: + if client_socket is not None: + client_socket.close() + p.kill() + p.terminate() + p.wait(timeout=SHORT_TIMEOUT) + + # Verify we got multiple threads in all_traces + self.assertGreater( + len(all_traces), 1, "Should have multiple threads" + ) + + # Verify we got exactly one thread in gil_traces + self.assertEqual( + len(gil_traces), 1, "Should have exactly one GIL holder" + ) + + # The GIL holder should be in the all_traces list + gil_thread_id = gil_traces[0][0] + all_thread_ids = [trace[0] for trace in all_traces] + self.assertIn( + gil_thread_id, + all_thread_ids, + "GIL holder should be among all threads", + ) + + +if __name__ == "__main__": + unittest.main() diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py index 6b67c9e50..a1c46706f 100644 --- a/Lib/test/test_mmap.py +++ b/Lib/test/test_mmap.py @@ -33,13 +33,10 @@ if is_emscripten: raise unittest.SkipTest("incompatible with Emscripten's mmap emulation.") +@unittest.skipIf(os.name == "nt", "TODO: RUSTPYTHON; Errors on setUp") class MmapTests(unittest.TestCase): def setUp(self): - # TODO: RUSTPYTHON; Remove this once windows doesn't get errored on setup:/ - if os.name == "nt": - raise unittest.SkipTest("TODO: RUSTPYTHON; Error during class setUp") - if os.path.exists(TESTFN): os.unlink(TESTFN) diff --git a/Lib/test/test_msvcrt.py b/Lib/test/test_msvcrt.py index 1c6905bd1..fef86ce32 100644 --- a/Lib/test/test_msvcrt.py +++ b/Lib/test/test_msvcrt.py @@ -4,6 +4,7 @@ import sys import unittest from textwrap import dedent +from test import support from test.support import os_helper, requires_resource from test.support.os_helper import TESTFN, TESTFN_ASCII @@ -67,8 +68,12 @@ class TestConsoleIO(unittest.TestCase): # Run test in a separated process to avoid stdin conflicts. # See: gh-110147 cmd = [sys.executable, '-c', code] - subprocess.run(cmd, check=True, capture_output=True, - creationflags=subprocess.CREATE_NEW_CONSOLE) + try: + subprocess.run(cmd, check=True, capture_output=True, + creationflags=subprocess.CREATE_NEW_CONSOLE) + except subprocess.CalledProcessError as exc: + support.skip_on_low_desktop_heap_memory_subprocess(exc.returncode) + raise def test_kbhit(self): code = dedent(''' From 6a3d4e888407c0bbc903e5e084d5c47391a5a9cc Mon Sep 17 00:00:00 2001 From: Joshua Megnauth <48846352+joshuamegnauth54@users.noreply.github.com> Date: Thu, 2 Jul 2026 03:38:33 -0400 Subject: [PATCH 177/339] Bump unicode_names2 and rustls-graviola (#8203) --- Cargo.lock | 197 ++++------------------------------------------------- Cargo.toml | 7 +- 2 files changed, 16 insertions(+), 188 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 90f5c318b..eb0f64095 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -704,17 +704,6 @@ version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" -[[package]] -name = "core-models" -version = "0.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "657f625ff361906f779745d08375ae3cc9fef87a35fba5f22874cf773010daf4" -dependencies = [ - "hax-lib", - "pastey", - "rand 0.9.4", -] - [[package]] name = "cpubits" version = "0.1.1" @@ -1483,9 +1472,9 @@ checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" [[package]] name = "graviola" -version = "0.3.4" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4387e0458389da24c6fe732531e65595c7c4a32b027f98f4789e512e28224465" +checksum = "e8596c4fa98466aae2fcf4c72a665bc0e021c0aaab1e47d82044d3dc3e309a76" dependencies = [ "cfg-if", "getrandom 0.3.4", @@ -1520,43 +1509,6 @@ dependencies = [ "foldhash", ] -[[package]] -name = "hax-lib" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "543f93241d32b3f00569201bfce9d7a93c92c6421b23c77864ac929dc947b9fc" -dependencies = [ - "hax-lib-macros", - "num-bigint", - "num-traits", -] - -[[package]] -name = "hax-lib-macros" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8755751e760b11021765bb04cb4a6c4e24742688d9f3aa14c2079638f537b0f" -dependencies = [ - "hax-lib-macros-types", - "proc-macro-error2", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "hax-lib-macros-types" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f177c9ae8ea456e2f71ff3c1ea47bf4464f772a05133fcbba56cd5ba169035a2" -dependencies = [ - "proc-macro2", - "quote", - "serde", - "serde_json", - "uuid", -] - [[package]] name = "heck" version = "0.5.0" @@ -2014,70 +1966,6 @@ version = "0.2.186" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" -[[package]] -name = "libcrux-intrinsics" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1b5db005ff8001e026b73a6842ee81bbef8ec5ff0e1915a67ae65fd2a9fafa5" -dependencies = [ - "core-models", - "hax-lib", -] - -[[package]] -name = "libcrux-ml-kem" -version = "0.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a14ab3e477de9df6ee1273a114018ff62c4996ca9220070c4e5cb1743f94a67d" -dependencies = [ - "hax-lib", - "libcrux-intrinsics", - "libcrux-platform", - "libcrux-secrets", - "libcrux-sha3", - "libcrux-traits", -] - -[[package]] -name = "libcrux-platform" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d9e21d7ed31a92ac539bd69a8c970b183ee883872d2d19ce27036e24cb8ecc4" -dependencies = [ - "libc", -] - -[[package]] -name = "libcrux-secrets" -version = "0.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce650f3041b44ba40d4263852347d007cd2cd9d1cc856a6f6c8b2e10c3fd40b" -dependencies = [ - "hax-lib", -] - -[[package]] -name = "libcrux-sha3" -version = "0.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1ae0b7d0e1cc4793a609fd0ff2ca3b3a3fabae523770c619a3d4bc86417b0d7" -dependencies = [ - "hax-lib", - "libcrux-intrinsics", - "libcrux-platform", - "libcrux-traits", -] - -[[package]] -name = "libcrux-traits" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "812e4fa89f3f5e34b47f928b22b1b78395a0d4ec23b1f583db635f128159d65f" -dependencies = [ - "libcrux-secrets", - "rand 0.9.4", -] - [[package]] name = "libffi" version = "5.1.1" @@ -2614,12 +2502,6 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" -[[package]] -name = "pastey" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ee67f1008b1ba2321834326597b8e186293b049a023cdef258527550b9935b4" - [[package]] name = "pbkdf2" version = "0.13.0" @@ -2859,28 +2741,6 @@ dependencies = [ "syn", ] -[[package]] -name = "proc-macro-error-attr2" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "proc-macro-error2" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" -dependencies = [ - "proc-macro-error-attr2", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "proc-macro-utils" version = "0.10.0" @@ -3051,20 +2911,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a" dependencies = [ "libc", - "rand_chacha 0.3.1", + "rand_chacha", "rand_core 0.6.4", ] -[[package]] -name = "rand" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea" -dependencies = [ - "rand_chacha 0.9.0", - "rand_core 0.9.5", -] - [[package]] name = "rand" version = "0.10.1" @@ -3086,16 +2936,6 @@ dependencies = [ "rand_core 0.6.4", ] -[[package]] -name = "rand_chacha" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" -dependencies = [ - "ppv-lite86", - "rand_core 0.9.5", -] - [[package]] name = "rand_core" version = "0.6.4" @@ -3105,15 +2945,6 @@ dependencies = [ "getrandom 0.2.17", ] -[[package]] -name = "rand_core" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c" -dependencies = [ - "getrandom 0.3.4", -] - [[package]] name = "rand_core" version = "0.10.1" @@ -3338,12 +3169,11 @@ dependencies = [ [[package]] name = "rustls-graviola" -version = "0.3.4" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "323c712e50c59ceb2ba9ad4d79dcfd3e0046a082d61efa87fcdf8f59af04473c" +checksum = "bf5d0a370be690f7f1aa4e1b912fde3f5f9a5c53285062fd2d6ac1a52ab3e883" dependencies = [ "graviola", - "libcrux-ml-kem", "rustls", ] @@ -3476,7 +3306,7 @@ dependencies = [ "rustpython-ruff_text_size", "rustpython-wtf8", "thiserror", - "unicode_names2 2.0.0", + "unicode_names2 3.1.0", ] [[package]] @@ -3499,7 +3329,7 @@ dependencies = [ "rustpython-literal", "rustpython-wtf8", "siphasher", - "unicode_names2 2.0.0", + "unicode_names2 3.1.0", ] [[package]] @@ -3782,7 +3612,7 @@ dependencies = [ "system-configuration", "tcl-sys", "tk-sys", - "unicode_names2 2.0.0", + "unicode_names2 3.1.0", "uuid", "webpki-roots", "widestring", @@ -4591,12 +4421,12 @@ dependencies = [ [[package]] name = "unicode_names2" -version = "2.0.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d189085656ca1203291e965444e7f6a2723fbdd1dd9f34f8482e79bafd8338a0" +checksum = "82c3e18d850bb6ebd57735e5654f0af65e572b05c2397e7b2b1a7c6a792cc29c" dependencies = [ "phf 0.11.3", - "unicode_names2_generator 2.0.0", + "unicode_names2_generator 3.1.0", ] [[package]] @@ -4613,9 +4443,9 @@ dependencies = [ [[package]] name = "unicode_names2_generator" -version = "2.0.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1262662dc96937c71115228ce2e1d30f41db71a7a45d3459e98783ef94052214" +checksum = "849744a58c479122ff24910d7ca57f312b62613ef0412dc327776ae6b235d16a" dependencies = [ "phf_codegen", "rand 0.8.6", @@ -4652,7 +4482,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "144d6b123cef80b301b8f72a9e2ca4370ddec21950d0a103dd22c437006d2db7" dependencies = [ "atomic", - "getrandom 0.4.3", "js-sys", "wasm-bindgen", ] diff --git a/Cargo.toml b/Cargo.toml index 3b4cd480b..a661dfbd6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,7 +49,6 @@ env_logger = "0.11" flamescope = { version = "0.1.2", optional = true } rustls = { workspace = true, optional = true } -rustls-graviola = { workspace = true, optional = true } [target.'cfg(windows)'.dependencies] libc = { workspace = true } @@ -60,6 +59,7 @@ rustyline = { workspace = true } [dev-dependencies] criterion = { workspace = true } pyo3 = { workspace = true, features = ["auto-initialize"] } +rustls-graviola = { workspace = true } rustpython-stdlib = { workspace = true } ruff_python_parser = { workspace = true } @@ -79,7 +79,6 @@ path = "src/main.rs" name = "custom_tls_providers" path = "examples/custom_tls_providers.rs" required-features = [ - "rustls-graviola", "rustls/ring", "rustpython-pylib/freeze-stdlib", "rustpython-stdlib/ssl-rustls", @@ -278,7 +277,7 @@ rapidhash = "4.4.1" result-like = "0.5.0" rustix = { version = "1.1", features = ["event", "fs", "param", "system"] } rustls = { version = "0.23.39", default-features = false } -rustls-graviola = "0.3" +rustls-graviola = "0.4" rustls-native-certs = "0.8" rustls-pemfile = "2.2" rustls-platform-verifier = "0.7" @@ -311,7 +310,7 @@ icu_locale = "2" icu_properties = "2" icu_normalizer = "2" uuid = "1.23.2" -unicode_names2 = "2.0.0" +unicode_names2 = "3" widestring = "1.2.0" windows-sys = "0.61.2" wasm-bindgen = "0.2.106" From b39bec40633cc5364c0fcf56cfbeb1ce4cb7e0c8 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Thu, 2 Jul 2026 10:41:31 +0300 Subject: [PATCH 178/339] Align symtable flag names with CPython (#8184) * ASSIGNED -> DEF_LOCAL * GLOBAL -> DEF_GLOBAL * REFERENCED -> USE * PARAMETER -> DEF_PARAM * expose symbol flags directly as a pyattr * FREE_CLASS -> DEF_FREE_CLASS * IMPORTED -> DEF_IMPORT * ANNOTATED -> DEF_ANNOT * DEF_COMP_ITER DEF_COMP_CELL DEF_TYPE_PARAM * DEF_NONLOCAL DEF_BOUND * Align flag values * unmark passing tests --- Lib/test/test_symtable.py | 3 - crates/codegen/src/compile.rs | 24 ++--- crates/codegen/src/symboltable.rs | 154 +++++++++++++++++------------- crates/vm/src/stdlib/_symtable.rs | 39 ++++---- 4 files changed, 115 insertions(+), 105 deletions(-) diff --git a/Lib/test/test_symtable.py b/Lib/test/test_symtable.py index b55adab6b..8cd1da1e9 100644 --- a/Lib/test/test_symtable.py +++ b/Lib/test/test_symtable.py @@ -269,7 +269,6 @@ class SymtableTest(unittest.TestCase): self.assertTrue(self.top.lookup("some_non_assigned_global_var").is_global()) self.assertTrue(self.top.lookup("some_assigned_global_var").is_global()) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_nonlocal(self): self.assertFalse(self.spam.lookup("some_var").is_nonlocal()) self.assertTrue(self.other_internal.lookup("some_var").is_nonlocal()) @@ -288,7 +287,6 @@ class SymtableTest(unittest.TestCase): def test_free(self): self.assertTrue(self.internal.lookup("x").is_free()) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_referenced(self): self.assertTrue(self.internal.lookup("x").is_referenced()) self.assertTrue(self.spam.lookup("internal").is_referenced()) @@ -358,7 +356,6 @@ class SymtableTest(unittest.TestCase): ' x: int', 'test', 'exec') - @unittest.expectedFailure # TODO: RUSTPYTHON def test_imported(self): self.assertTrue(self.top.lookup("sys").is_imported()) diff --git a/crates/codegen/src/compile.rs b/crates/codegen/src/compile.rs index 6664ec34c..0663375d3 100644 --- a/crates/codegen/src/compile.rs +++ b/crates/codegen/src/compile.rs @@ -1473,7 +1473,7 @@ impl<'warnings> Compiler<'warnings> { self.symbol_table_stack .first() .and_then(|table| table.symbols.get(name)) - .is_some_and(|sym| sym.flags.contains(SymbolFlags::IMPORTED)) + .is_some_and(|sym| sym.flags.contains(SymbolFlags::DEF_IMPORT)) } /// Get the cell-relative index of a free variable. @@ -1751,10 +1751,10 @@ impl<'warnings> Compiler<'warnings> { } // Check if __class__ is available as a cell/free variable - // The scope must be Free (from enclosing class) or have FREE_CLASS flag + // The scope must be Free (from enclosing class) or have DEF_FREE_CLASS flag if let Some(symbol) = table.lookup("__class__") { if symbol.scope != SymbolScope::Free - && !symbol.flags.contains(SymbolFlags::FREE_CLASS) + && !symbol.flags.contains(SymbolFlags::DEF_FREE_CLASS) { return None; } @@ -1872,7 +1872,7 @@ impl<'warnings> Compiler<'warnings> { .symbols .iter() .filter(|(_, s)| { - s.scope == SymbolScope::Cell || s.flags.contains(SymbolFlags::COMP_CELL) + s.scope == SymbolScope::Cell || s.flags.contains(SymbolFlags::DEF_COMP_CELL) }) .map(|(name, _)| name.clone()) .collect(); @@ -1920,9 +1920,9 @@ impl<'warnings> Compiler<'warnings> { .filter(|(_, s)| { s.scope == SymbolScope::Free || (scope_type != CompilerScope::Class - && s.flags.contains(SymbolFlags::FREE_CLASS)) + && s.flags.contains(SymbolFlags::DEF_FREE_CLASS)) || (scope_type == CompilerScope::Class - && s.flags.contains(SymbolFlags::FREE_CLASS) + && s.flags.contains(SymbolFlags::DEF_FREE_CLASS) && self.has_enclosing_non_module_code_scope()) }) .filter(|(name, symbol)| { @@ -3132,7 +3132,7 @@ impl<'warnings> Compiler<'warnings> { .rev() .find(|table| table.typ == CompilerScope::Class) .and_then(|table| table.lookup(name.as_ref())) - .is_some_and(|symbol| symbol.flags.contains(SymbolFlags::GLOBAL)); + .is_some_and(|symbol| symbol.flags.contains(SymbolFlags::DEF_GLOBAL)); ( symbol.map(|s| s.scope), @@ -5597,7 +5597,7 @@ impl<'warnings> Compiler<'warnings> { Some(symbol) => match symbol.scope { SymbolScope::Cell => Ok(SymbolScope::Cell), SymbolScope::Free => Ok(SymbolScope::Free), - _ if symbol.flags.contains(SymbolFlags::FREE_CLASS) => Ok(SymbolScope::Free), + _ if symbol.flags.contains(SymbolFlags::DEF_FREE_CLASS) => Ok(SymbolScope::Free), _ => Err(CodegenErrorType::SyntaxError(format!( "get_ref_type: invalid scope for '{name}'" ))), @@ -10888,13 +10888,13 @@ impl<'warnings> Compiler<'warnings> { let mut pushed_locals: Vec<String> = Vec::new(); let mut fast_hidden_locals: Vec<String> = Vec::new(); for (name, sym) in &comp_table.symbols { - if sym.flags.contains(SymbolFlags::PARAMETER) { + if sym.flags.contains(SymbolFlags::DEF_PARAM) { continue; // skip .0 } let is_local = sym .flags - .intersects(SymbolFlags::ASSIGNED | SymbolFlags::ITER) - && !sym.flags.contains(SymbolFlags::NONLOCAL); + .intersects(SymbolFlags::DEF_LOCAL | SymbolFlags::ITER) + && !sym.flags.contains(SymbolFlags::DEF_NONLOCAL); if is_local { pushed_locals.push(name.clone()); } @@ -10908,7 +10908,7 @@ impl<'warnings> Compiler<'warnings> { // module/class scopes, also enable temporary fast locals for // comprehension-bound names only. for (name, comp_sym) in &comp_table.symbols { - if comp_sym.flags.contains(SymbolFlags::PARAMETER) { + if comp_sym.flags.contains(SymbolFlags::DEF_PARAM) { continue; // skip .0 } let comp_scope = comp_sym.scope; diff --git a/crates/codegen/src/symboltable.rs b/crates/codegen/src/symboltable.rs index a72b839f4..b1aadbe2c 100644 --- a/crates/codegen/src/symboltable.rs +++ b/crates/codegen/src/symboltable.rs @@ -161,7 +161,7 @@ impl SymbolTable { .or_insert_with(|| Symbol::new(name)); symbol .flags - .insert(SymbolFlags::PARAMETER | SymbolFlags::REFERENCED); + .insert(SymbolFlags::DEF_PARAM | SymbolFlags::USE); if !self.varnames.iter().any(|varname| varname == name) { self.varnames.push(name.to_owned()); } @@ -289,18 +289,11 @@ impl From<SymbolScope> for i32 { bitflags! { #[derive(Copy, Clone, Debug, PartialEq, Eq)] pub struct SymbolFlags: u16 { - const REFERENCED = 0x001; // USE - const ASSIGNED = 0x002; // DEF_LOCAL - const PARAMETER = 0x004; // DEF_PARAM - const ANNOTATED = 0x008; // DEF_ANNOT - const IMPORTED = 0x010; // DEF_IMPORT - const NONLOCAL = 0x020; // DEF_NONLOCAL - // indicates if the symbol gets a value assigned by a named expression in a comprehension - // this is required to correct the scope in the analysis. - const ASSIGNED_IN_COMPREHENSION = 0x040; - // indicates that the symbol is used a bound iterator variable. We distinguish this case - // from normal assignment to detect disallowed re-assignment to iterator variables. - const ITER = 0x080; + const DEF_GLOBAL = 1; + const DEF_LOCAL = 2; + const DEF_PARAM = 2 << 1; + const DEF_NONLOCAL = 2 << 2; + const USE = 2 << 3; /// indicates that the symbol is a free variable in a class method from the scope that the /// class is defined in, e.g.: /// ```python @@ -309,12 +302,29 @@ bitflags! { /// def method(self): /// return x // is_free_class /// ``` - const FREE_CLASS = 0x100; // DEF_FREE_CLASS - const GLOBAL = 0x200; // DEF_GLOBAL - const COMP_ITER = 0x400; // DEF_COMP_ITER - const COMP_CELL = 0x800; // DEF_COMP_CELL - const TYPE_PARAM = 0x1000; // DEF_TYPE_PARAM - const BOUND = Self::ASSIGNED.bits() | Self::PARAMETER.bits() | Self::IMPORTED.bits() | Self::ITER.bits() | Self::TYPE_PARAM.bits(); + const DEF_FREE_CLASS = 2 << 5; + const DEF_IMPORT = 2 << 6; + const DEF_ANNOT = 2 << 7; + const DEF_COMP_ITER = 2 << 8; + const DEF_TYPE_PARAM = 2 << 9; + const DEF_COMP_CELL = 2 << 10; + const DEF_BOUND = ( + Self::DEF_LOCAL.bits() + | Self::DEF_PARAM.bits() + | Self::DEF_IMPORT.bits() + | Self::ITER.bits() + | Self::DEF_TYPE_PARAM.bits() + ); + + + // TODO: Remove these, RustPython specific + + // indicates if the symbol gets a value assigned by a named expression in a comprehension + // this is required to correct the scope in the analysis. + const ASSIGNED_IN_COMPREHENSION = 2 << 11; + // indicates that the symbol is used a bound iterator variable. We distinguish this case + // from normal assignment to detect disallowed re-assignment to iterator variables. + const ITER = 2 << 12; } } @@ -354,7 +364,7 @@ impl Symbol { #[must_use] pub const fn is_bound(&self) -> bool { - self.flags.intersects(SymbolFlags::BOUND) + self.flags.intersects(SymbolFlags::DEF_BOUND) } } @@ -443,13 +453,13 @@ fn inline_comprehension( let mut removed_class_implicits = IndexSet::default(); for (name, sub_symbol) in &comp.symbols { // Skip the .0 parameter - if sub_symbol.flags.contains(SymbolFlags::PARAMETER) { + if sub_symbol.flags.contains(SymbolFlags::DEF_PARAM) { continue; } // Track inlined cells if sub_symbol.scope == SymbolScope::Cell - || sub_symbol.flags.contains(SymbolFlags::COMP_CELL) + || sub_symbol.flags.contains(SymbolFlags::DEF_COMP_CELL) { inlined_cells.insert(name.clone()); } @@ -707,7 +717,7 @@ impl SymbolTableAnalyzer { for symbol in symbol_table.symbols.values_mut() { if inlined_cells.contains(&symbol.name) { - symbol.flags.insert(SymbolFlags::COMP_CELL); + symbol.flags.insert(SymbolFlags::DEF_COMP_CELL); } } @@ -730,7 +740,9 @@ impl SymbolTableAnalyzer { } // Collect free variables from this scope - if symbol.scope == SymbolScope::Free || symbol.flags.contains(SymbolFlags::FREE_CLASS) { + if symbol.scope == SymbolScope::Free + || symbol.flags.contains(SymbolFlags::DEF_FREE_CLASS) + { newfree.insert(symbol.name.clone()); } } @@ -763,7 +775,7 @@ impl SymbolTableAnalyzer { if symbol_table.typ == CompilerScope::Class || symbol_table.can_see_class_scope { for name in &newfree { if let Some(symbol) = symbol_table.symbols.get_mut(name) { - symbol.flags.insert(SymbolFlags::FREE_CLASS); + symbol.flags.insert(SymbolFlags::DEF_FREE_CLASS); } } } @@ -797,10 +809,10 @@ impl SymbolTableAnalyzer { }); } // Check if the nonlocal binding refers to a type parameter - if symbol.flags.contains(SymbolFlags::NONLOCAL) { + if symbol.flags.contains(SymbolFlags::DEF_NONLOCAL) { for (symbols, _typ, _skip) in self.tables.iter().rev() { if let Some(sym) = symbols.get(&symbol.name) { - if sym.flags.contains(SymbolFlags::TYPE_PARAM) { + if sym.flags.contains(SymbolFlags::DEF_TYPE_PARAM) { return Err(SymbolTableError { error: format!( "nonlocal binding not allowed for type parameter '{}'", @@ -830,7 +842,7 @@ impl SymbolTableAnalyzer { SymbolScope::Unknown => { // Try hard to figure out what the scope of this symbol is. let scope = if symbol.is_bound() { - if symbol.flags.contains(SymbolFlags::COMP_CELL) + if symbol.flags.contains(SymbolFlags::DEF_COMP_CELL) && matches!(st_typ, CompilerScope::Module | CompilerScope::Class) { // CPython keeps comprehension-only cells in @@ -846,7 +858,7 @@ impl SymbolTableAnalyzer { } else if let Some(scope) = class_entry .and_then(|class_symbols| class_symbols.get(&symbol.name)) .and_then(|class_sym| { - if class_sym.flags.contains(SymbolFlags::GLOBAL) { + if class_sym.flags.contains(SymbolFlags::DEF_GLOBAL) { Some(SymbolScope::GlobalExplicit) } else if class_sym.is_bound() && class_sym.scope != SymbolScope::Free { // If name is bound in enclosing class, use GlobalImplicit @@ -947,10 +959,10 @@ impl SymbolTableAnalyzer { for (table, typ, _skip) in self.tables.iter_mut().rev().take(decl_depth) { if let CompilerScope::Class = typ { if let Some(free_class) = table.get_mut(name) { - free_class.flags.insert(SymbolFlags::FREE_CLASS) + free_class.flags.insert(SymbolFlags::DEF_FREE_CLASS) } else { let mut symbol = Symbol::new(name); - symbol.flags.insert(SymbolFlags::FREE_CLASS); + symbol.flags.insert(SymbolFlags::DEF_FREE_CLASS); symbol.scope = SymbolScope::Free; table.insert(name.to_owned(), symbol); } @@ -989,7 +1001,7 @@ impl SymbolTableAnalyzer { } let sym = st.symbols.get(name)?; if sym.scope == SymbolScope::Free - || (sym.flags.contains(SymbolFlags::FREE_CLASS) + || (sym.flags.contains(SymbolFlags::DEF_FREE_CLASS) && !matches!(st_typ, CompilerScope::Module)) { if st_typ == CompilerScope::Class && name != "__class__" { @@ -1307,7 +1319,7 @@ impl SymbolTableBuilder { symbol.scope = SymbolScope::Free; symbol .flags - .insert(SymbolFlags::REFERENCED | SymbolFlags::FREE_CLASS); + .insert(SymbolFlags::USE | SymbolFlags::DEF_FREE_CLASS); } fn add_conditional_annotations_freevar(&mut self) { @@ -1320,7 +1332,7 @@ impl SymbolTableBuilder { symbol.scope = SymbolScope::Free; symbol .flags - .insert(SymbolFlags::REFERENCED | SymbolFlags::FREE_CLASS); + .insert(SymbolFlags::USE | SymbolFlags::DEF_FREE_CLASS); } /// Walk up the scope chain to determine if we're inside an async function. @@ -1834,9 +1846,11 @@ impl SymbolTableBuilder { .last() .is_some_and(|table| table.typ != CompilerScope::Module) && let Some(flags) = existing_flags - && flags.intersects(SymbolFlags::GLOBAL | SymbolFlags::NONLOCAL) + && flags.intersects( + SymbolFlags::DEF_GLOBAL | SymbolFlags::DEF_NONLOCAL, + ) { - let usage = if flags.contains(SymbolFlags::GLOBAL) { + let usage = if flags.contains(SymbolFlags::DEF_GLOBAL) { "global" } else { "nonlocal" @@ -3106,17 +3120,17 @@ impl SymbolTableBuilder { let parent_is_global = self.tables[table_idx] .symbols .get(mangled.as_str()) - .is_some_and(|symbol| symbol.flags.contains(SymbolFlags::GLOBAL)); + .is_some_and(|symbol| symbol.flags.contains(SymbolFlags::DEF_GLOBAL)); let current = self.tables.last_mut().unwrap(); let current_symbol = current .symbols .entry(mangled.clone()) .or_insert_with(|| Symbol::new(mangled.as_str())); if parent_is_global { - current_symbol.flags.insert(SymbolFlags::GLOBAL); + current_symbol.flags.insert(SymbolFlags::DEF_GLOBAL); current_symbol.scope = SymbolScope::GlobalExplicit; } else { - current_symbol.flags.insert(SymbolFlags::NONLOCAL); + current_symbol.flags.insert(SymbolFlags::DEF_NONLOCAL); current_symbol.scope = SymbolScope::Free; } @@ -3124,7 +3138,7 @@ impl SymbolTableBuilder { .symbols .entry(mangled.clone()) .or_insert_with(|| Symbol::new(mangled.as_str())); - symbol.flags.insert(SymbolFlags::ASSIGNED); + symbol.flags.insert(SymbolFlags::DEF_LOCAL); return Ok(()); } CompilerScope::Module => { @@ -3133,14 +3147,14 @@ impl SymbolTableBuilder { .symbols .entry(mangled.clone()) .or_insert_with(|| Symbol::new(mangled.as_str())); - current_symbol.flags.insert(SymbolFlags::GLOBAL); + current_symbol.flags.insert(SymbolFlags::DEF_GLOBAL); current_symbol.scope = SymbolScope::GlobalExplicit; let symbol = self.tables[table_idx] .symbols .entry(mangled.clone()) .or_insert_with(|| Symbol::new(mangled.as_str())); - symbol.flags.insert(SymbolFlags::GLOBAL); + symbol.flags.insert(SymbolFlags::DEF_GLOBAL); symbol.scope = SymbolScope::GlobalExplicit; return Ok(()); } @@ -3249,7 +3263,7 @@ impl SymbolTableBuilder { if matches!( role, SymbolUsage::Parameter | SymbolUsage::AnnotationParameter - ) && flags.contains(SymbolFlags::PARAMETER) + ) && flags.contains(SymbolFlags::DEF_PARAM) { return Err(SymbolTableError { error: format!("duplicate argument '{original_name}' in function definition"), @@ -3258,7 +3272,8 @@ impl SymbolTableBuilder { } // Role already set.. - if matches!(role, SymbolUsage::TypeParam) && flags.contains(SymbolFlags::TYPE_PARAM) { + if matches!(role, SymbolUsage::TypeParam) && flags.contains(SymbolFlags::DEF_TYPE_PARAM) + { return Err(SymbolTableError { error: format!("duplicate type parameter '{name}'"), location, @@ -3266,25 +3281,25 @@ impl SymbolTableBuilder { } match role { SymbolUsage::Global if !symbol.is_global() => { - if flags.contains(SymbolFlags::PARAMETER) { + if flags.contains(SymbolFlags::DEF_PARAM) { return Err(SymbolTableError { error: format!("name '{name}' is parameter and global"), location, }); } - if flags.contains(SymbolFlags::REFERENCED) { + if flags.contains(SymbolFlags::USE) { return Err(SymbolTableError { error: format!("name '{name}' is used prior to global declaration"), location, }); } - if flags.contains(SymbolFlags::ANNOTATED) { + if flags.contains(SymbolFlags::DEF_ANNOT) { return Err(SymbolTableError { error: format!("annotated name '{name}' can't be global"), location, }); } - if flags.contains(SymbolFlags::ASSIGNED) { + if flags.contains(SymbolFlags::DEF_LOCAL) { return Err(SymbolTableError { error: format!( "name '{name}' is assigned to before global declaration" @@ -3294,25 +3309,25 @@ impl SymbolTableBuilder { } } SymbolUsage::Nonlocal => { - if flags.contains(SymbolFlags::PARAMETER) { + if flags.contains(SymbolFlags::DEF_PARAM) { return Err(SymbolTableError { error: format!("name '{name}' is parameter and nonlocal"), location, }); } - if flags.contains(SymbolFlags::REFERENCED) { + if flags.contains(SymbolFlags::USE) { return Err(SymbolTableError { error: format!("name '{name}' is used prior to nonlocal declaration"), location, }); } - if flags.contains(SymbolFlags::ANNOTATED) { + if flags.contains(SymbolFlags::DEF_ANNOT) { return Err(SymbolTableError { error: format!("annotated name '{name}' can't be nonlocal"), location, }); } - if flags.contains(SymbolFlags::ASSIGNED) { + if flags.contains(SymbolFlags::DEF_LOCAL) { return Err(SymbolTableError { error: format!( "name '{name}' is assigned to before nonlocal declaration" @@ -3323,9 +3338,10 @@ impl SymbolTableBuilder { } SymbolUsage::AnnotationAssigned if current_scope != CompilerScope::Module - && flags.intersects(SymbolFlags::GLOBAL | SymbolFlags::NONLOCAL) => + && flags + .intersects(SymbolFlags::DEF_GLOBAL | SymbolFlags::DEF_NONLOCAL) => { - let usage = if flags.contains(SymbolFlags::GLOBAL) { + let usage = if flags.contains(SymbolFlags::DEF_GLOBAL) { "global" } else { "nonlocal" @@ -3368,13 +3384,13 @@ impl SymbolTableBuilder { match role { SymbolUsage::Nonlocal => { symbol.scope = SymbolScope::Free; - flags.insert(SymbolFlags::NONLOCAL); + flags.insert(SymbolFlags::DEF_NONLOCAL); } SymbolUsage::Imported => { - flags.insert(SymbolFlags::ASSIGNED | SymbolFlags::IMPORTED); + flags.insert(SymbolFlags::DEF_LOCAL | SymbolFlags::DEF_IMPORT); } SymbolUsage::Parameter => { - flags.insert(SymbolFlags::PARAMETER); + flags.insert(SymbolFlags::DEF_PARAM); // Parameters are always added to varnames first let name_str = symbol.name.clone(); if !self.current_varnames.contains(&name_str) { @@ -3382,7 +3398,7 @@ impl SymbolTableBuilder { } } SymbolUsage::AnnotationParameter => { - flags.insert(SymbolFlags::PARAMETER | SymbolFlags::ANNOTATED); + flags.insert(SymbolFlags::DEF_PARAM | SymbolFlags::DEF_ANNOT); // Annotated parameters are also added to varnames let name_str = symbol.name.clone(); if !self.current_varnames.contains(&name_str) { @@ -3390,26 +3406,26 @@ impl SymbolTableBuilder { } } SymbolUsage::AnnotationAssigned => { - flags.insert(SymbolFlags::ASSIGNED | SymbolFlags::ANNOTATED); + flags.insert(SymbolFlags::DEF_LOCAL | SymbolFlags::DEF_ANNOT); } SymbolUsage::Assigned => { - flags.insert(SymbolFlags::ASSIGNED); + flags.insert(SymbolFlags::DEF_LOCAL); } SymbolUsage::AssignedNamedExprInComprehension => { - flags.insert(SymbolFlags::ASSIGNED | SymbolFlags::ASSIGNED_IN_COMPREHENSION); + flags.insert(SymbolFlags::DEF_LOCAL | SymbolFlags::ASSIGNED_IN_COMPREHENSION); } SymbolUsage::Global => { symbol.scope = SymbolScope::GlobalExplicit; - flags.insert(SymbolFlags::GLOBAL); + flags.insert(SymbolFlags::DEF_GLOBAL); } SymbolUsage::Used => { - flags.insert(SymbolFlags::REFERENCED); + flags.insert(SymbolFlags::USE); } SymbolUsage::Iter => { - flags.insert(SymbolFlags::ITER | SymbolFlags::COMP_ITER); + flags.insert(SymbolFlags::ITER | SymbolFlags::DEF_COMP_ITER); } SymbolUsage::TypeParam => { - flags.insert(SymbolFlags::ASSIGNED | SymbolFlags::TYPE_PARAM); + flags.insert(SymbolFlags::DEF_LOCAL | SymbolFlags::DEF_TYPE_PARAM); } } @@ -3558,7 +3574,7 @@ mod tests { .expect("missing comprehension iteration target"); assert!( - symbol.flags.contains(SymbolFlags::COMP_ITER), + symbol.flags.contains(SymbolFlags::DEF_COMP_ITER), "CPython symtable_add_def_helper sets DEF_COMP_ITER on comprehension iteration targets" ); } @@ -3621,7 +3637,7 @@ mod tests { assert!( format .flags - .contains(SymbolFlags::PARAMETER | SymbolFlags::REFERENCED), + .contains(SymbolFlags::DEF_PARAM | SymbolFlags::USE), "CPython symtable_enter_block() adds both DEF_PARAM and USE for annotation-like .format" ); @@ -3637,7 +3653,7 @@ mod tests { assert!( format .flags - .contains(SymbolFlags::PARAMETER | SymbolFlags::REFERENCED), + .contains(SymbolFlags::DEF_PARAM | SymbolFlags::USE), "CPython TypeAliasBlock .format has DEF_PARAM | USE" ); @@ -3658,7 +3674,7 @@ mod tests { assert!( format .flags - .contains(SymbolFlags::PARAMETER | SymbolFlags::REFERENCED), + .contains(SymbolFlags::DEF_PARAM | SymbolFlags::USE), "CPython TypeVariableBlock .format has DEF_PARAM | USE" ); } diff --git a/crates/vm/src/stdlib/_symtable.rs b/crates/vm/src/stdlib/_symtable.rs index adcddeacc..38d63208d 100644 --- a/crates/vm/src/stdlib/_symtable.rs +++ b/crates/vm/src/stdlib/_symtable.rs @@ -20,43 +20,40 @@ mod _symtable { // https://github.com/python/cpython/blob/6cb20a219a860eaf687b2d968b41c480c7461909/Include/internal/pycore_symtable.h#L156 #[pyattr] - pub(super) const DEF_GLOBAL: i32 = 1; + pub(super) const DEF_GLOBAL: i32 = SymbolFlags::DEF_GLOBAL.bits() as i32; #[pyattr] - pub(super) const DEF_LOCAL: i32 = 2; + pub(super) const DEF_LOCAL: i32 = SymbolFlags::DEF_LOCAL.bits() as i32; #[pyattr] - pub(super) const DEF_PARAM: i32 = 2 << 1; + pub(super) const DEF_PARAM: i32 = SymbolFlags::DEF_PARAM.bits() as i32; #[pyattr] - pub(super) const DEF_NONLOCAL: i32 = 2 << 2; + pub(super) const DEF_NONLOCAL: i32 = SymbolFlags::DEF_NONLOCAL.bits() as i32; #[pyattr] - pub(super) const USE: i32 = 2 << 3; + pub(super) const USE: i32 = SymbolFlags::USE.bits() as i32; #[pyattr] - pub(super) const DEF_FREE: i32 = 2 << 4; + pub(super) const DEF_FREE_CLASS: i32 = SymbolFlags::DEF_FREE_CLASS.bits() as i32; #[pyattr] - pub(super) const DEF_FREE_CLASS: i32 = 2 << 5; + pub(super) const DEF_IMPORT: i32 = SymbolFlags::DEF_IMPORT.bits() as i32; #[pyattr] - pub(super) const DEF_IMPORT: i32 = 2 << 6; + pub(super) const DEF_ANNOT: i32 = SymbolFlags::DEF_ANNOT.bits() as i32; #[pyattr] - pub(super) const DEF_ANNOT: i32 = 2 << 7; + pub(super) const DEF_COMP_ITER: i32 = SymbolFlags::DEF_COMP_ITER.bits() as i32; #[pyattr] - pub(super) const DEF_COMP_ITER: i32 = 2 << 8; + pub(super) const DEF_TYPE_PARAM: i32 = SymbolFlags::DEF_TYPE_PARAM.bits() as i32; #[pyattr] - pub(super) const DEF_TYPE_PARAM: i32 = 2 << 9; + pub(super) const DEF_COMP_CELL: i32 = SymbolFlags::DEF_COMP_CELL.bits() as i32; #[pyattr] - pub(super) const DEF_COMP_CELL: i32 = 2 << 10; - - #[pyattr] - pub(super) const DEF_BOUND: i32 = DEF_LOCAL | DEF_PARAM | DEF_IMPORT; + pub(super) const DEF_BOUND: i32 = SymbolFlags::DEF_BOUND.bits() as i32; #[pyattr] pub(super) const SCOPE_MASK: i32 = DEF_GLOBAL | DEF_LOCAL | DEF_PARAM | DEF_NONLOCAL; @@ -263,7 +260,7 @@ mod _symtable { #[pymethod] const fn is_imported(&self) -> bool { - self.symbol.flags.contains(SymbolFlags::IMPORTED) + self.symbol.flags.contains(SymbolFlags::DEF_IMPORT) } #[pymethod] @@ -274,22 +271,22 @@ mod _symtable { #[pymethod] const fn is_nonlocal(&self) -> bool { - self.symbol.flags.contains(SymbolFlags::NONLOCAL) + self.symbol.flags.contains(SymbolFlags::DEF_NONLOCAL) } #[pymethod] const fn is_referenced(&self) -> bool { - self.symbol.flags.contains(SymbolFlags::REFERENCED) + self.symbol.flags.contains(SymbolFlags::USE) } #[pymethod] const fn is_assigned(&self) -> bool { - self.symbol.flags.contains(SymbolFlags::ASSIGNED) + self.symbol.flags.contains(SymbolFlags::DEF_LOCAL) } #[pymethod] const fn is_parameter(&self) -> bool { - self.symbol.flags.contains(SymbolFlags::PARAMETER) + self.symbol.flags.contains(SymbolFlags::DEF_PARAM) } #[pymethod] @@ -304,7 +301,7 @@ mod _symtable { #[pymethod] const fn is_annotated(&self) -> bool { - self.symbol.flags.contains(SymbolFlags::ANNOTATED) + self.symbol.flags.contains(SymbolFlags::DEF_ANNOT) } #[pymethod] From 4caf959e58975959b48f065d11939e4a0355728e Mon Sep 17 00:00:00 2001 From: Bas Schoenmaeckers <7943856+bschoenmaeckers@users.noreply.github.com> Date: Sat, 4 Jul 2026 18:13:45 +0200 Subject: [PATCH 179/339] Use PyO3 main & enable c-api tests (#8000) Enable `abi3t` support in PyO3 Add left over c-api functions Fix PyLong_AsUnsignedLongLongMask Update pyo3 to `0.29` Add `PyInt::as_u64_mask` Fix `PyInt::as_u32_mask` --- .cspell.dict/cpython.txt | 1 + .github/workflows/ci.yaml | 1 + .github/workflows/update-caches.yml | 1 + crates/capi/Cargo.toml | 2 +- crates/capi/pyo3-rustpython.config | 6 +- crates/capi/src/abstract_.rs | 37 +++++++++ crates/capi/src/abstract_/iter.rs | 2 +- crates/capi/src/abstract_/mapping.rs | 2 +- crates/capi/src/abstract_/number.rs | 2 +- crates/capi/src/abstract_/sequence.rs | 2 +- crates/capi/src/bytearrayobject.rs | 2 +- crates/capi/src/bytesobject.rs | 9 +- crates/capi/src/ceval.rs | 6 +- crates/capi/src/complexobject.rs | 4 +- crates/capi/src/critical_section.rs | 31 +++++++ crates/capi/src/descrobject.rs | 4 +- crates/capi/src/dictobject.rs | 45 +++++++++- crates/capi/src/floatobject.rs | 4 +- crates/capi/src/genericaliasobject.rs | 15 ++++ crates/capi/src/import.rs | 60 +++++++++++++- crates/capi/src/lib.rs | 3 + crates/capi/src/listobject.rs | 2 +- crates/capi/src/longobject.rs | 9 +- crates/capi/src/methodobject.rs | 8 +- crates/capi/src/object.rs | 2 +- crates/capi/src/osmodule.rs | 12 +++ crates/capi/src/pycapsule.rs | 4 +- crates/capi/src/pyerrors.rs | 101 ++++++++++++++++++++++- crates/capi/src/pylifecycle.rs | 33 +++++++- crates/capi/src/pystate.rs | 26 +++++- crates/capi/src/refcount.rs | 31 ++++++- crates/capi/src/setobject.rs | 2 +- crates/capi/src/sliceobject.rs | 2 +- crates/capi/src/tupleobject.rs | 8 +- crates/capi/src/unicodeobject.rs | 2 +- crates/capi/src/warnings.rs | 2 +- crates/capi/src/weakrefobject.rs | 2 +- crates/vm/src/stdlib/_ctypes/function.rs | 23 ++++++ 38 files changed, 449 insertions(+), 59 deletions(-) create mode 100644 crates/capi/src/critical_section.rs create mode 100644 crates/capi/src/genericaliasobject.rs create mode 100644 crates/capi/src/osmodule.rs diff --git a/.cspell.dict/cpython.txt b/.cspell.dict/cpython.txt index 11440e30f..47ec7dd60 100644 --- a/.cspell.dict/cpython.txt +++ b/.cspell.dict/cpython.txt @@ -170,6 +170,7 @@ nvars opname opnames orelse +osmodule outparam outparm paramfunc diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 9f76984be..7ac163e83 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -343,6 +343,7 @@ jobs: with: openssl: true + # Keep features in sync with update-caches.yml CARGO_ARGS. - name: build rustpython run: cargo build --release --verbose --features=threading,jit ${{ env.CARGO_ARGS }} diff --git a/.github/workflows/update-caches.yml b/.github/workflows/update-caches.yml index 3a48418a5..fd3dddb7a 100644 --- a/.github/workflows/update-caches.yml +++ b/.github/workflows/update-caches.yml @@ -19,6 +19,7 @@ env: CARGO_PROFILE_TEST_DEBUG: 0 CARGO_PROFILE_DEV_DEBUG: 0 CARGO_PROFILE_RELEASE_DEBUG: 0 + # Keep feature list in sync with CI's release build in .github/workflows/ci.yaml. CARGO_ARGS: --workspace --no-default-features --features stdlib,importlib,stdio,encodings,sqlite,ssl-rustls-aws-lc,host_env,threading,jit --exclude rustpython_wasm --exclude rustpython-compiler-source --exclude rustpython-venvlauncher jobs: diff --git a/crates/capi/Cargo.toml b/crates/capi/Cargo.toml index e408d7ab0..671c8d164 100644 --- a/crates/capi/Cargo.toml +++ b/crates/capi/Cargo.toml @@ -22,7 +22,7 @@ rustpython-stdlib = {workspace = true, features = ["threading"] } rustpython-pylib = { workspace = true } [dev-dependencies] -pyo3 = { workspace = true, features = ["auto-initialize", "abi3"] } +pyo3 = { workspace = true, features = ["auto-initialize", "abi3t"] } [lints] workspace = true diff --git a/crates/capi/pyo3-rustpython.config b/crates/capi/pyo3-rustpython.config index fe59e46e8..601b56440 100644 --- a/crates/capi/pyo3-rustpython.config +++ b/crates/capi/pyo3-rustpython.config @@ -1,5 +1,5 @@ -implementation=CPython -version=3.14 +implementation=RustPython +version=3.15 shared=true -abi3=true +target_abi=RustPython-abi3t-3.15 suppress_build_script_link_lines=true diff --git a/crates/capi/src/abstract_.rs b/crates/capi/src/abstract_.rs index d01e31e96..cd390135b 100644 --- a/crates/capi/src/abstract_.rs +++ b/crates/capi/src/abstract_.rs @@ -178,3 +178,40 @@ pub unsafe extern "C" fn PyObject_Size(obj: *mut PyObject) -> isize { obj.length(vm) }) } + +#[cfg(test)] +mod tests { + use pyo3::prelude::*; + use pyo3::types::{PyDict, PyString}; + + #[test] + fn call_method1() { + Python::attach(|py| { + let string = PyString::new(py, "Hello, World!"); + assert!( + string + .call_method1("endswith", ("!",)) + .unwrap() + .is_truthy() + .unwrap() + ); + }) + } + + #[test] + fn object_set_get_del_item() { + Python::attach(|py| { + let obj = PyDict::new(py).into_any(); + obj.set_item("key", "value").unwrap(); + assert_eq!( + obj.get_item("key") + .unwrap() + .cast_into::<PyString>() + .unwrap(), + "value" + ); + obj.del_item("key").unwrap(); + assert!(obj.get_item("key").is_err()); + }) + } +} diff --git a/crates/capi/src/abstract_/iter.rs b/crates/capi/src/abstract_/iter.rs index 1ba5bd04d..fbd1440e0 100644 --- a/crates/capi/src/abstract_/iter.rs +++ b/crates/capi/src/abstract_/iter.rs @@ -89,7 +89,7 @@ pub unsafe extern "C" fn PyIter_Send( }) } -#[cfg(false)] +#[cfg(test)] mod tests { use pyo3::prelude::*; use pyo3::types::{PyAnyMethods, PyIterator, PyList, PySendResult}; diff --git a/crates/capi/src/abstract_/mapping.rs b/crates/capi/src/abstract_/mapping.rs index 143d5a977..6fec18bff 100644 --- a/crates/capi/src/abstract_/mapping.rs +++ b/crates/capi/src/abstract_/mapping.rs @@ -194,7 +194,7 @@ pub unsafe extern "C" fn PyMapping_SetItemString( }) } -#[cfg(false)] +#[cfg(test)] mod tests { use pyo3::prelude::*; use pyo3::types::{PyDict, PyMapping, PyMappingMethods, PyTuple}; diff --git a/crates/capi/src/abstract_/number.rs b/crates/capi/src/abstract_/number.rs index b1dc627d8..ffc78ea4e 100644 --- a/crates/capi/src/abstract_/number.rs +++ b/crates/capi/src/abstract_/number.rs @@ -232,7 +232,7 @@ pub unsafe extern "C" fn PyNumber_Subtract(o1: *mut PyObject, o2: *mut PyObject) with_vm(|vm| vm._sub(unsafe { &*o1 }, unsafe { &*o2 })) } -#[cfg(false)] +#[cfg(test)] mod tests { use pyo3::prelude::*; diff --git a/crates/capi/src/abstract_/sequence.rs b/crates/capi/src/abstract_/sequence.rs index f6022b93e..d011dfdb8 100644 --- a/crates/capi/src/abstract_/sequence.rs +++ b/crates/capi/src/abstract_/sequence.rs @@ -177,7 +177,7 @@ pub unsafe extern "C" fn PySequence_In(obj: *mut PyObject, value: *mut PyObject) unsafe { PySequence_Contains(obj, value) } } -#[cfg(false)] +#[cfg(test)] mod tests { use pyo3::prelude::*; use pyo3::types::{PyAnyMethods, PyDict, PyList, PySequence, PySequenceMethods, PyTuple}; diff --git a/crates/capi/src/bytearrayobject.rs b/crates/capi/src/bytearrayobject.rs index 2bc56895b..cc9db5dd5 100644 --- a/crates/capi/src/bytearrayobject.rs +++ b/crates/capi/src/bytearrayobject.rs @@ -71,7 +71,7 @@ pub unsafe extern "C" fn PyByteArray_Resize(bytearray: *mut PyObject, len: isize }) } -#[cfg(false)] +#[cfg(test)] mod tests { use pyo3::prelude::*; use pyo3::types::{PyByteArray, PyBytes}; diff --git a/crates/capi/src/bytesobject.rs b/crates/capi/src/bytesobject.rs index 1fe535efb..f4db16af6 100644 --- a/crates/capi/src/bytesobject.rs +++ b/crates/capi/src/bytesobject.rs @@ -1,6 +1,5 @@ -use crate::PyObject; use crate::object::define_py_check; -use crate::pystate::with_vm; +use crate::{PyObject, pystate::with_vm}; use core::ffi::c_char; use rustpython_vm::builtins::PyBytes; @@ -46,13 +45,13 @@ pub unsafe extern "C" fn PyBytes_AsString(bytes: *mut PyObject) -> *mut c_char { }) } -#[cfg(false)] +#[cfg(test)] mod tests { use pyo3::prelude::*; use pyo3::types::PyBytes; #[test] - fn test_bytes() { + fn bytes() { Python::attach(|py| { let bytes = PyBytes::new(py, b"Hello, World!"); assert_eq!(bytes.as_bytes(), b"Hello, World!"); @@ -60,7 +59,7 @@ mod tests { } #[test] - fn test_bytes_uninit() { + fn bytes_uninit() { Python::attach(|py| { let bytes = PyBytes::new_with(py, 13, |data| { data.copy_from_slice(b"Hello, World!"); diff --git a/crates/capi/src/ceval.rs b/crates/capi/src/ceval.rs index 867c39e03..d137cb17d 100644 --- a/crates/capi/src/ceval.rs +++ b/crates/capi/src/ceval.rs @@ -52,13 +52,13 @@ pub extern "C" fn PyEval_GetBuiltins() -> *mut PyObject { }) } -#[cfg(false)] +#[cfg(test)] mod tests { use pyo3::exceptions::PyException; use pyo3::prelude::*; #[test] - fn test_code_eval() { + fn code_eval() { Python::attach(|py| { let result = py.eval(c"1 + 1", None, None).unwrap(); assert_eq!(result.extract::<u32>().unwrap(), 2); @@ -66,7 +66,7 @@ mod tests { } #[test] - fn test_code_run_exception() { + fn code_run_exception() { Python::attach(|py| { let err = py.run(c"raise Exception()", None, None).unwrap_err(); assert!(err.is_instance_of::<PyException>(py)); diff --git a/crates/capi/src/complexobject.rs b/crates/capi/src/complexobject.rs index a6b2bb731..79f1804d1 100644 --- a/crates/capi/src/complexobject.rs +++ b/crates/capi/src/complexobject.rs @@ -36,13 +36,13 @@ pub unsafe extern "C" fn PyComplex_ImagAsDouble(obj: *mut PyObject) -> c_double with_vm(|vm| try_to_complex(vm, unsafe { &*obj }).map(|complex| complex.im)) } -#[cfg(false)] +#[cfg(test)] mod tests { use pyo3::prelude::*; use pyo3::types::PyComplex; #[test] - fn test_py_int() { + fn py_int() { Python::attach(|py| { let number = PyComplex::from_doubles(py, 1.0, 2.0); assert_eq!(number.real(), 1.0); diff --git a/crates/capi/src/critical_section.rs b/crates/capi/src/critical_section.rs new file mode 100644 index 000000000..f50f2b616 --- /dev/null +++ b/crates/capi/src/critical_section.rs @@ -0,0 +1,31 @@ +use crate::PyObject; + +#[repr(C)] +pub struct PyCriticalSection; + +#[repr(C)] +pub struct PyCriticalSection2; + +#[unsafe(no_mangle)] +pub extern "C" fn PyCriticalSection_Begin(c: *mut PyCriticalSection, op: *mut PyObject) { + let _ = (c, op); +} + +#[unsafe(no_mangle)] +pub extern "C" fn PyCriticalSection_End(c: *mut PyCriticalSection) { + let _ = c; +} + +#[unsafe(no_mangle)] +pub extern "C" fn PyCriticalSection2_Begin( + c: *mut PyCriticalSection2, + a: *mut PyObject, + b: *mut PyObject, +) { + let _ = (c, a, b); +} + +#[unsafe(no_mangle)] +pub extern "C" fn PyCriticalSection2_End(c: *mut PyCriticalSection2) { + let _ = c; +} diff --git a/crates/capi/src/descrobject.rs b/crates/capi/src/descrobject.rs index 5232634fa..b0d24667d 100644 --- a/crates/capi/src/descrobject.rs +++ b/crates/capi/src/descrobject.rs @@ -11,7 +11,7 @@ pub unsafe extern "C" fn PyDictProxy_New(mapping: *mut PyObject) -> *mut PyObjec }) } -#[cfg(false)] +#[cfg(test)] mod tests { use pyo3::prelude::*; use pyo3::types::{PyDict, PyInt, PyMappingProxy}; @@ -23,7 +23,7 @@ mod tests { dict.set_item("x", 7).unwrap(); let mapping = dict.as_mapping(); - let proxy = PyMappingProxy::new(py, &mapping); + let proxy = PyMappingProxy::new(py, mapping); let value = proxy.get_item("x").unwrap().cast_into::<PyInt>().unwrap(); assert_eq!(value, 7); }) diff --git a/crates/capi/src/dictobject.rs b/crates/capi/src/dictobject.rs index ebc4a827f..e326ba87e 100644 --- a/crates/capi/src/dictobject.rs +++ b/crates/capi/src/dictobject.rs @@ -57,6 +57,43 @@ pub unsafe extern "C" fn PyDict_GetItemRef( }) } +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyDict_SetDefaultRef( + dict: *mut PyObject, + key: *mut PyObject, + default_value: *mut PyObject, + result: *mut *mut PyObject, +) -> c_int { + with_vm(|vm| { + let result = NonNull::new(result); + if let Some(result) = result { + unsafe { + result.write(core::ptr::null_mut()); + } + } + let dict = unsafe { &*dict }.try_downcast_ref::<PyDict>(vm)?; + let key = unsafe { &*key }; + + if let Some(value) = dict.inner_getitem_opt(key, vm)? { + if let Some(result) = result { + unsafe { + result.write(value.into_raw().as_ptr()); + } + } + Ok(true) + } else { + let value = unsafe { &*default_value }.to_owned(); + dict.inner_setitem(key, value.clone(), vm)?; + if let Some(result) = result { + unsafe { + result.write(value.into_raw().as_ptr()); + } + } + Ok(false) + } + }) +} + #[unsafe(no_mangle)] pub unsafe extern "C" fn PyDict_Size(dict: *mut PyObject) -> isize { with_vm(|vm| { @@ -187,13 +224,13 @@ pub unsafe extern "C" fn PyDict_Next( }) } -#[cfg(false)] +#[cfg(test)] mod tests { use pyo3::prelude::*; use pyo3::types::{IntoPyDict, PyDict, PyDictMethods, PyInt, PyList}; #[test] - fn test_create_empty_dict() { + fn create_empty_dict() { Python::attach(|py| { let dict = PyDict::new(py); assert!(dict.is_instance_of::<PyDict>()); @@ -201,7 +238,7 @@ mod tests { } #[test] - fn test_create_dict_with_items() { + fn create_dict_with_items() { Python::attach(|py| { let dict = [(1, 2), (3, 4)].into_py_dict(py)?; let value = dict.get_item(1)?.unwrap().cast_into::<PyInt>()?; @@ -214,7 +251,7 @@ mod tests { } #[test] - fn test_dict_iter() { + fn dict_iter() { Python::attach(|py| { let dict = [(1, 2), (3, 4)].into_py_dict(py).unwrap(); let values = dict diff --git a/crates/capi/src/floatobject.rs b/crates/capi/src/floatobject.rs index 831ca32af..ead09c219 100644 --- a/crates/capi/src/floatobject.rs +++ b/crates/capi/src/floatobject.rs @@ -57,14 +57,14 @@ pub unsafe extern "C" fn PyFloat_FromString(obj: *mut PyObject) -> *mut PyObject }) } -#[cfg(false)] +#[cfg(test)] mod tests { use core::f64::consts::PI; use pyo3::prelude::*; use pyo3::types::PyFloat; #[test] - fn test_py_float() { + fn py_float() { Python::attach(|py| { let pi = PyFloat::new(py, PI); assert!(pi.is_instance_of::<PyFloat>()); diff --git a/crates/capi/src/genericaliasobject.rs b/crates/capi/src/genericaliasobject.rs new file mode 100644 index 000000000..bcd313086 --- /dev/null +++ b/crates/capi/src/genericaliasobject.rs @@ -0,0 +1,15 @@ +use crate::{PyObject, pystate::with_vm}; +use rustpython_vm::PyPayload; +use rustpython_vm::builtins::PyGenericAlias; + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn Py_GenericAlias( + origin: *mut PyObject, + args: *mut PyObject, +) -> *mut PyObject { + with_vm(|vm| { + let origin = unsafe { &*origin }.to_owned(); + let args = unsafe { &*args }.to_owned(); + PyGenericAlias::from_args(origin, args, vm).into_pyobject(vm) + }) +} diff --git a/crates/capi/src/import.rs b/crates/capi/src/import.rs index 3550baa14..c6d5ce85e 100644 --- a/crates/capi/src/import.rs +++ b/crates/capi/src/import.rs @@ -1,5 +1,7 @@ use crate::{PyObject, pystate::with_vm}; -use rustpython_vm::builtins::PyStr; +use core::ffi::{CStr, c_char}; +use rustpython_vm::builtins::{PyCode, PyDict, PyModule, PyStr}; +use rustpython_vm::import::import_code_obj; #[unsafe(no_mangle)] pub unsafe extern "C" fn PyImport_Import(name: *mut PyObject) -> *mut PyObject { @@ -9,12 +11,64 @@ pub unsafe extern "C" fn PyImport_Import(name: *mut PyObject) -> *mut PyObject { }) } -#[cfg(false)] +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyImport_AddModuleRef(name: *const c_char) -> *mut PyObject { + with_vm(|vm| { + let name = unsafe { CStr::from_ptr(name) } + .to_str() + .map_err(|_| vm.new_system_error("PyImport_AddModuleRef called with non utf8 name"))?; + + let sys_modules = vm + .sys_module + .get_attr(rustpython_vm::identifier!(vm, modules), vm)?; + + sys_modules + .try_downcast_ref::<PyDict>(vm)? + .get_item_opt(name, vm)? + .map_or_else( + || { + let module = vm.new_module(name, vm.ctx.new_dict(), None); + sys_modules.set_item(name, module.clone().into(), vm)?; + Ok(module) + }, + |module| { + let module = module.try_downcast_ref::<PyModule>(vm)?; + Ok(module.to_owned()) + }, + ) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyImport_ExecCodeModuleEx( + name: *const c_char, + co: *mut PyObject, + pathname: *const c_char, +) -> *mut PyObject { + with_vm(|vm| { + let name = unsafe { CStr::from_ptr(name) }.to_str().map_err(|_| { + vm.new_system_error("PyImport_ExecCodeModuleEx called with non utf8 name") + })?; + let code = unsafe { &*co }.try_downcast_ref::<PyCode>(vm)?; + let module = import_code_obj(vm, name, code.to_owned(), false)?; + + if !pathname.is_null() { + let pathname = unsafe { CStr::from_ptr(pathname) }.to_str().map_err(|_| { + vm.new_system_error("PyImport_ExecCodeModuleEx called with non utf8 pathname") + })?; + module.set_attr("__file__", vm.ctx.new_str(pathname), vm)?; + } + + Ok(module) + }) +} + +#[cfg(test)] mod tests { use pyo3::prelude::*; #[test] - fn test_import() { + fn import() { Python::attach(|py| { let _module = py.import("sys").unwrap(); }) diff --git a/crates/capi/src/lib.rs b/crates/capi/src/lib.rs index 638a78d63..eba7de278 100644 --- a/crates/capi/src/lib.rs +++ b/crates/capi/src/lib.rs @@ -14,15 +14,18 @@ pub mod bytearrayobject; pub mod bytesobject; pub mod ceval; pub mod complexobject; +pub mod critical_section; pub mod descrobject; pub mod dictobject; pub mod floatobject; +pub mod genericaliasobject; pub mod import; pub mod listobject; pub mod longobject; pub mod methodobject; pub mod moduleobject; pub mod object; +pub mod osmodule; pub mod pycapsule; pub mod pyerrors; pub mod pylifecycle; diff --git a/crates/capi/src/listobject.rs b/crates/capi/src/listobject.rs index 796720f99..03069b049 100644 --- a/crates/capi/src/listobject.rs +++ b/crates/capi/src/listobject.rs @@ -165,7 +165,7 @@ pub unsafe extern "C" fn PyList_Sort(list: *mut PyObject) -> c_int { }) } -#[cfg(false)] +#[cfg(test)] mod tests { use pyo3::exceptions::PyIndexError; use pyo3::prelude::*; diff --git a/crates/capi/src/longobject.rs b/crates/capi/src/longobject.rs index 0668f8df6..d88523a7d 100644 --- a/crates/capi/src/longobject.rs +++ b/crates/capi/src/longobject.rs @@ -1,6 +1,5 @@ -use crate::PyObject; use crate::object::define_py_check; -use crate::pystate::with_vm; +use crate::{PyObject, pystate::with_vm}; use bitflags::bitflags; use core::ffi::{CStr, c_char, c_double, c_int, c_long, c_longlong, c_ulong, c_ulonglong, c_void}; use malachite_bigint::{BigInt, Sign}; @@ -373,13 +372,13 @@ pub unsafe extern "C" fn PyLong_AsUnsignedLongLong(obj: *mut PyObject) -> c_ulon }) } -#[cfg(false)] +#[cfg(test)] mod tests { use pyo3::prelude::*; use pyo3::types::PyInt; #[test] - fn test_py_int_u32() { + fn py_int_u32() { Python::attach(|py| { let number = PyInt::new(py, 123); assert!(number.is_instance_of::<PyInt>()); @@ -388,7 +387,7 @@ mod tests { } #[test] - fn test_py_int_u64() { + fn py_int_u64() { Python::attach(|py| { let number = PyInt::new(py, 123u64); assert!(number.is_instance_of::<PyInt>()); diff --git a/crates/capi/src/methodobject.rs b/crates/capi/src/methodobject.rs index c0a6611a0..b234ba76a 100644 --- a/crates/capi/src/methodobject.rs +++ b/crates/capi/src/methodobject.rs @@ -306,7 +306,7 @@ pub unsafe extern "C" fn PyCFunction_NewEx( unsafe { PyCMethod_New(ml, slf, module, core::ptr::null_mut()) } } -#[cfg(false)] +#[cfg(test)] mod tests { use pyo3::exceptions::PyException; use pyo3::ffi::{PyLong_FromLong, PyObject}; @@ -314,7 +314,7 @@ mod tests { use pyo3::types::{PyCFunction, PyInt, PyString}; #[test] - fn test_closure_function() { + fn closure_function() { Python::attach(|py| { let f = PyCFunction::new_closure(py, None, None, |_args, _kwargs| "Hello from Rust!") .unwrap(); @@ -327,7 +327,7 @@ mod tests { } #[test] - fn test_function_no_args() { + fn function_no_args() { Python::attach(|py| { unsafe extern "C" fn c_fn(_self: *mut PyObject, _args: *mut PyObject) -> *mut PyObject { assert!(_self.is_null()); @@ -352,7 +352,7 @@ mod tests { } #[test] - fn test_closure_function_error() { + fn closure_function_error() { Python::attach(|py| { let f = PyCFunction::new_closure(py, None, None, |_args, _kwargs| { Err::<(), _>(PyException::new_err("Something went wrong")) diff --git a/crates/capi/src/object.rs b/crates/capi/src/object.rs index d92e9977f..9a5d2682e 100644 --- a/crates/capi/src/object.rs +++ b/crates/capi/src/object.rs @@ -541,7 +541,7 @@ pub unsafe extern "C" fn PyObject_GenericSetDict( }) } -#[cfg(false)] +#[cfg(test)] mod tests { use pyo3::class::basic::CompareOp; use pyo3::prelude::*; diff --git a/crates/capi/src/osmodule.rs b/crates/capi/src/osmodule.rs new file mode 100644 index 000000000..132935ee8 --- /dev/null +++ b/crates/capi/src/osmodule.rs @@ -0,0 +1,12 @@ +use crate::{PyObject, pystate::with_vm}; +use rustpython_vm::convert::ToPyObject; +use rustpython_vm::function::FsPath; + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyOS_FSPath(path: *mut PyObject) -> *mut PyObject { + with_vm(|vm| { + let path = unsafe { &*path }.to_owned(); + let fspath = FsPath::try_from_path_like(path, false, vm)?; + Ok(fspath.to_pyobject(vm)) + }) +} diff --git a/crates/capi/src/pycapsule.rs b/crates/capi/src/pycapsule.rs index 7a5d599c8..a1b5effd8 100644 --- a/crates/capi/src/pycapsule.rs +++ b/crates/capi/src/pycapsule.rs @@ -142,13 +142,13 @@ fn checked_capsule<'a>( Ok(capsule) } -#[cfg(false)] +#[cfg(test)] mod tests { use pyo3::prelude::*; use pyo3::types::PyCapsule; #[test] - fn test_capsule_new() { + fn capsule_new() { Python::attach(|py| { let value = String::from("Some data"); let capsule = PyCapsule::new_with_value(py, value, c"my_capsule").unwrap(); diff --git a/crates/capi/src/pyerrors.rs b/crates/capi/src/pyerrors.rs index b767b7c40..d7efd1a0d 100644 --- a/crates/capi/src/pyerrors.rs +++ b/crates/capi/src/pyerrors.rs @@ -3,6 +3,7 @@ use crate::{PyObject, pystate::with_vm}; use core::convert::Infallible; use core::ffi::{CStr, c_char, c_int}; use core::ptr::NonNull; +use core::slice; use rustpython_vm::builtins::{PyBaseException, PyTuple, PyType}; use rustpython_vm::convert::IntoObject; use rustpython_vm::exceptions::ExceptionZoo; @@ -299,9 +300,90 @@ pub unsafe extern "C" fn PyException_GetContext(exc: *mut PyObject) -> *mut PyOb }) } +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyException_SetCause(exc: *mut PyObject, cause: *mut PyObject) { + with_vm(|vm| { + let exc = unsafe { &*exc }.try_downcast_ref::<PyBaseException>(vm)?; + let cause = NonNull::new(cause) + .map(|obj| unsafe { PyObjectRef::from_raw(obj).downcast_unchecked() }); + exc.set___cause__(cause); + Ok(()) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyException_SetContext(exc: *mut PyObject, context: *mut PyObject) { + with_vm(|vm| { + let exc = unsafe { &*exc }.try_downcast_ref::<PyBaseException>(vm)?; + let context = NonNull::new(context) + .map(|obj| unsafe { PyObjectRef::from_raw(obj).downcast_unchecked() }); + exc.set___context__(context); + Ok(()) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyUnicodeDecodeError_Create( + encoding: *const c_char, + object: *const c_char, + length: isize, + start: isize, + end: isize, + reason: *const c_char, +) -> *mut PyObject { + with_vm(|vm| { + let encoding = unsafe { CStr::from_ptr(encoding) } + .to_str() + .map_err(|_| vm.new_system_error("encoding must be valid UTF-8"))?; + let reason = unsafe { CStr::from_ptr(reason) } + .to_str() + .map_err(|_| vm.new_system_error("reason must be valid UTF-8"))?; + let length: usize = length + .try_into() + .map_err(|_| vm.new_system_error("length must be non-negative"))?; + let start: usize = start + .try_into() + .map_err(|_| vm.new_system_error("start must be non-negative"))?; + let end: usize = end + .try_into() + .map_err(|_| vm.new_system_error("end must be non-negative"))?; + + let bytes = if object.is_null() { + if length != 0 { + return Err(vm.new_system_error( + "PyUnicodeDecodeError_Create called with null object and non-zero length", + )); + } + Vec::new() + } else { + unsafe { slice::from_raw_parts(object.cast::<u8>(), length) }.to_vec() + }; + + let exc = vm.new_unicode_decode_error_real( + vm.ctx.new_str(encoding), + vm.ctx.new_bytes(bytes), + start, + end, + vm.ctx.new_str(reason), + ); + Ok(exc) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyException_SetTraceback(exc: *mut PyObject, tb: *mut PyObject) -> c_int { + with_vm(|vm| { + let exc = unsafe { &*exc }.try_downcast_ref::<PyBaseException>(vm)?; + let traceback = unsafe { tb.as_ref() }.map(|obj| obj.to_owned()); + exc.set___traceback__(vm.unwrap_or_none(traceback), vm) + }) +} + #[cfg(test)] mod tests { - use pyo3::exceptions::PyTypeError; + use pyo3::PyTypeInfo; + use pyo3::create_exception; + use pyo3::exceptions::{PyException, PyTypeError}; use pyo3::prelude::*; #[test] @@ -309,7 +391,7 @@ mod tests { Python::attach(|py| { PyTypeError::new_err(py.None()).restore(py); assert!(PyErr::occurred(py)); - assert!(unsafe { !pyo3::ffi::PyErr_GetRaisedException().is_null() }); + assert!(PyErr::take(py).is_some()); assert!(!PyErr::occurred(py)); }) } @@ -321,4 +403,19 @@ mod tests { assert!(err.is_instance_of::<PyTypeError>(py)); }) } + + #[test] + fn new_exception_type() { + create_exception!(my_module, MyError, PyException, "Some description."); + + Python::attach(|py| { + let exc = MyError::new_err("This is a new exception"); + assert!(exc.is_instance_of::<MyError>(py)); + let exc_type = MyError::type_object(py); + assert_eq!( + exc_type.fully_qualified_name().unwrap(), + "my_module.MyError" + ); + }) + } } diff --git a/crates/capi/src/pylifecycle.rs b/crates/capi/src/pylifecycle.rs index df964d117..de673b33f 100644 --- a/crates/capi/src/pylifecycle.rs +++ b/crates/capi/src/pylifecycle.rs @@ -1,11 +1,13 @@ use crate::get_main_interpreter; use crate::pyerrors::init_exception_statics; use crate::pystate::ensure_thread_has_vm_attached; -use core::ffi::c_int; +use alloc::ffi::CString; +use core::ffi::{c_char, c_int, c_ulong}; use rustpython_vm::common::rc::PyRc; +use rustpython_vm::version::{MAJOR, MICRO, MINOR, VERSION_HEX}; use rustpython_vm::vm::thread::ThreadedVirtualMachine; use rustpython_vm::{Context, Interpreter}; -use std::sync::Mutex; +use std::sync::{LazyLock, Mutex}; pub(crate) static MAIN_INTERP: Mutex<Option<Interpreter>> = Mutex::new(None); @@ -17,6 +19,9 @@ pub(crate) fn request_vm_from_interpreter() -> ThreadedVirtualMachine { .enter(|vm| vm.new_thread()) } +#[unsafe(no_mangle)] +pub static Py_Version: c_ulong = VERSION_HEX as c_ulong; + #[unsafe(no_mangle)] pub extern "C" fn Py_IsInitialized() -> c_int { get_main_interpreter().is_some() as c_int @@ -65,3 +70,27 @@ pub extern "C" fn Py_FinalizeEx() -> c_int { pub extern "C" fn Py_IsFinalizing() -> c_int { 0 } + +#[unsafe(no_mangle)] +pub extern "C" fn Py_GetVersion() -> *const c_char { + static VERSION: LazyLock<CString> = LazyLock::new(|| { + CString::new(format!("{MAJOR}.{MINOR}.{MICRO}")) + .expect("version string must not contain interior NULs") + }); + VERSION.as_ptr() +} + +#[cfg(test)] +mod tests { + use pyo3::prelude::*; + + #[test] + fn get_version() { + Python::attach(|py| { + let version = py.version_info(); + assert!(version >= (3, 14)); + }); + + assert!(unsafe { pyo3::ffi::Py_Version } >= 0x030d0000); + } +} diff --git a/crates/capi/src/pystate.rs b/crates/capi/src/pystate.rs index f3d12f04a..1a2f66de9 100644 --- a/crates/capi/src/pystate.rs +++ b/crates/capi/src/pystate.rs @@ -1,11 +1,12 @@ +use crate::get_main_interpreter; use crate::pylifecycle::request_vm_from_interpreter; use crate::util::FfiResult; use core::ffi::c_int; use core::ptr; -use rustpython_vm::VirtualMachine; use rustpython_vm::vm::thread::{ CurrentVmAttachState, attach_current_thread, release_current_thread, with_current_vm, }; +use rustpython_vm::{Interpreter, VirtualMachine}; pub(crate) fn with_vm<R: FfiResult<O>, O>(f: impl FnOnce(&VirtualMachine) -> R) -> O { with_current_vm(|vm| f(vm).into_output(vm)) @@ -16,9 +17,11 @@ type PyGILState_STATE = c_int; const PYGILSTATE_LOCKED: PyGILState_STATE = 0; const PYGILSTATE_UNLOCKED: PyGILState_STATE = 1; +pub type PyInterpreterState = Interpreter; + #[repr(C)] pub struct PyThreadState { - _interp: *mut core::ffi::c_void, + pub interp: *mut PyInterpreterState, } /// Make sure this thread has a running vm attached. This only creates a new vm if we don't already @@ -50,6 +53,25 @@ pub extern "C" fn PyEval_SaveThread() -> *mut PyThreadState { #[unsafe(no_mangle)] pub extern "C" fn PyEval_RestoreThread(_state: *mut PyThreadState) {} +#[unsafe(no_mangle)] +pub extern "C" fn PyInterpreterState_Get() -> *mut PyInterpreterState { + get_main_interpreter() + .as_ref() + .map(|interp| interp as *const PyInterpreterState) + .expect("PyInterpreterState_Get called but no main interpreter was found") + .cast_mut() +} + +#[unsafe(no_mangle)] +pub extern "C" fn PyInterpreterState_GetID(interp: *mut PyInterpreterState) -> i64 { + with_vm(|vm| { + if interp.is_null() { + return Err(vm.new_system_error("PyInterpreterState_GetID called with null interp")); + } + Ok(interp as usize as i64) + }) +} + #[cfg(test)] mod tests { use crate::get_main_interpreter; diff --git a/crates/capi/src/refcount.rs b/crates/capi/src/refcount.rs index 917dfeec2..849b130e2 100644 --- a/crates/capi/src/refcount.rs +++ b/crates/capi/src/refcount.rs @@ -1,4 +1,4 @@ -use crate::PyObject; +use crate::{PyObject, pystate::with_vm}; use core::ptr::NonNull; use rustpython_vm::PyObjectRef; @@ -13,3 +13,32 @@ pub unsafe extern "C" fn _Py_IncRef(op: *mut PyObject) { // Don't drop the owned value, as we just want to increment the refcount. core::mem::forget(unsafe { (*op).to_owned() }); } + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn Py_NewRef(op: *mut PyObject) -> *mut PyObject { + with_vm(|_vm| unsafe { (*op).to_owned() }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn Py_REFCNT(op: *mut PyObject) -> isize { + with_vm(|_vm| unsafe { &*op }.strong_count()) +} + +#[cfg(test)] +mod tests { + use pyo3::prelude::*; + use pyo3::types::PyInt; + use pyo3::{PyTypeInfo, ffi}; + + #[test] + fn refcount() { + Python::attach(|py| unsafe { + let obj = PyInt::type_object(py); + let ref_count = ffi::Py_REFCNT(obj.as_ptr()); + let obj_clone = obj.clone(); + assert_eq!(ffi::Py_REFCNT(obj.as_ptr()), ref_count + 1); + drop(obj_clone); + assert_eq!(ffi::Py_REFCNT(obj.as_ptr()), ref_count); + }); + } +} diff --git a/crates/capi/src/setobject.rs b/crates/capi/src/setobject.rs index cc479371b..1036bb147 100644 --- a/crates/capi/src/setobject.rs +++ b/crates/capi/src/setobject.rs @@ -116,7 +116,7 @@ pub unsafe extern "C" fn PySet_Size(anyset: *mut PyObject) -> isize { }) } -#[cfg(false)] +#[cfg(test)] mod tests { use pyo3::prelude::*; use pyo3::types::{PyFrozenSet, PyInt, PySet}; diff --git a/crates/capi/src/sliceobject.rs b/crates/capi/src/sliceobject.rs index 2a625fab5..fb5881815 100644 --- a/crates/capi/src/sliceobject.rs +++ b/crates/capi/src/sliceobject.rs @@ -72,7 +72,7 @@ pub unsafe extern "C" fn PySlice_AdjustIndices( slice_len as isize } -#[cfg(false)] +#[cfg(test)] mod tests { use pyo3::prelude::*; use pyo3::types::{PySlice, PySliceMethods}; diff --git a/crates/capi/src/tupleobject.rs b/crates/capi/src/tupleobject.rs index 985141f6d..60c4b81b3 100644 --- a/crates/capi/src/tupleobject.rs +++ b/crates/capi/src/tupleobject.rs @@ -90,13 +90,13 @@ pub unsafe extern "C" fn PyTuple_GetSlice( }) } -#[cfg(false)] +#[cfg(test)] mod tests { use pyo3::prelude::*; use pyo3::types::PyTuple; #[test] - fn test_empty_tuple() { + fn empty_tuple() { Python::attach(|py| { let tuple = PyTuple::empty(py); assert_eq!(tuple.len(), 0); @@ -104,7 +104,7 @@ mod tests { } #[test] - fn test_tuple_into_python() { + fn tuple_into_python() { Python::attach(|py| { let tuple = (1, 2, 3).into_pyobject(py).unwrap(); assert_eq!(tuple.len(), 3); @@ -112,7 +112,7 @@ mod tests { } #[test] - fn test_tuple_get_slice() { + fn tuple_get_slice() { Python::attach(|py| { let tuple = (1, 2, 3).into_pyobject(py).unwrap(); let slice = tuple.get_slice(1, 2); diff --git a/crates/capi/src/unicodeobject.rs b/crates/capi/src/unicodeobject.rs index 33d466926..787e31ea5 100644 --- a/crates/capi/src/unicodeobject.rs +++ b/crates/capi/src/unicodeobject.rs @@ -241,7 +241,7 @@ pub unsafe extern "C" fn PyUnicode_EqualToUTF8AndSize( }) } -#[cfg(false)] +#[cfg(test)] mod tests { use std::ffi::{OsStr, OsString}; diff --git a/crates/capi/src/warnings.rs b/crates/capi/src/warnings.rs index 22ffd6ab9..4966cd60d 100644 --- a/crates/capi/src/warnings.rs +++ b/crates/capi/src/warnings.rs @@ -92,7 +92,7 @@ pub unsafe extern "C" fn PyErr_WarnExplicit( }) } -#[cfg(false)] +#[cfg(test)] mod tests { use pyo3::exceptions::{PyRuntimeWarning, PyUserWarning}; use pyo3::prelude::*; diff --git a/crates/capi/src/weakrefobject.rs b/crates/capi/src/weakrefobject.rs index 706de84b5..de095e5e5 100644 --- a/crates/capi/src/weakrefobject.rs +++ b/crates/capi/src/weakrefobject.rs @@ -65,7 +65,7 @@ pub unsafe extern "C" fn PyWeakref_NewRef( }) } -#[cfg(false)] +#[cfg(test)] mod tests { use pyo3::prelude::*; use pyo3::types::PyAnyMethods; diff --git a/crates/vm/src/stdlib/_ctypes/function.rs b/crates/vm/src/stdlib/_ctypes/function.rs index 25cbcdcd9..2cf3eda13 100644 --- a/crates/vm/src/stdlib/_ctypes/function.rs +++ b/crates/vm/src/stdlib/_ctypes/function.rs @@ -19,6 +19,7 @@ use crate::{ use alloc::borrow::Cow; use core::ffi::c_void; use core::fmt::Debug; +use core::ptr::NonNull; use num_traits::{Signed, ToPrimitive}; use rustpython_common::lock::PyRwLock; #[cfg(windows)] @@ -1432,6 +1433,28 @@ fn convert_raw_result( let info = stg_info.unwrap(); + // py_object: interpret return value as PyObject* and materialize it. + if let Ok(type_attr) = restype_type + .as_object() + .get_attr(vm.ctx.intern_str("_type_"), vm) + && let Some(type_str) = type_attr.downcast_ref::<PyStr>() + && type_str.to_str() == Some("O") + { + let ptr = match raw_result { + RawResult::Pointer(p) => *p, + RawResult::Value(v) => *v as usize, + RawResult::Void => 0, + }; + let ptr = NonNull::new(ptr as *mut PyObject).or_else(|| { + vm.set_exception(Some(vm.new_value_error("PyObject is NULL"))); + None + })?; + unsafe { + let obj = PyObjectRef::from_raw(ptr); + return Some(obj); + } + } + // 5. Simple type with getfunc → use bytes_to_pyobject (info->getfunc) // is_simple_instance returns TRUE for c_int, c_void_p, etc. if super::base::is_simple_instance(&restype_type) { From f32e96ce905257c8e8d88e10bed8b9d2d2949e7b Mon Sep 17 00:00:00 2001 From: Joshua Megnauth <48846352+joshuamegnauth54@users.noreply.github.com> Date: Sat, 4 Jul 2026 12:15:23 -0400 Subject: [PATCH 180/339] host_env: os.mkdir for Windows, Redox (#8128) Python supports `mkdir` on Windows. I deferred to calling Rust's implementation for now. However, like `rename`, Python's implementation supports additional features that are currently unsupported on RustPython. I added a note for future reference. Redox supports `mkdirat` which significantly cleans up the implementation. --- crates/host_env/Cargo.toml | 2 ++ crates/host_env/src/crt_fd.rs | 22 +++++++------- crates/host_env/src/lib.rs | 3 ++ crates/host_env/src/posix.rs | 28 +++++++----------- crates/host_env/src/posix_wasi.rs | 20 ++++++------- crates/host_env/src/posix_windows.rs | 22 ++++++++++++++ crates/vm/src/stdlib/os.rs | 44 +++++++++++++--------------- 7 files changed, 79 insertions(+), 62 deletions(-) create mode 100644 crates/host_env/src/posix_windows.rs diff --git a/crates/host_env/Cargo.toml b/crates/host_env/Cargo.toml index 718e3f41a..91a56ea91 100644 --- a/crates/host_env/Cargo.toml +++ b/crates/host_env/Cargo.toml @@ -20,6 +20,8 @@ paste = { workspace = true } [target.'cfg(unix)'.dependencies] nix = { workspace = true } + +[target.'cfg(any(unix, target_os = "macos", target_os = "redox", target_os = "wasi"))'.dependencies] rustix = { workspace = true } [target.'cfg(any(not(target_arch = "wasm32"), target_os = "wasi"))'.dependencies] diff --git a/crates/host_env/src/crt_fd.rs b/crates/host_env/src/crt_fd.rs index ee21934be..b681081be 100644 --- a/crates/host_env/src/crt_fd.rs +++ b/crates/host_env/src/crt_fd.rs @@ -5,7 +5,7 @@ use alloc::fmt; use core::cmp; use std::{ffi, io}; -#[cfg(unix)] +#[cfg(any(unix, target_os = "wasi"))] use std::os::fd::AsFd; #[cfg(not(windows))] use std::os::fd::{AsRawFd, BorrowedFd, FromRawFd, IntoRawFd, OwnedFd, RawFd}; @@ -209,42 +209,42 @@ impl Owned { } } -#[cfg(unix)] +#[cfg(any(unix, target_os = "wasi"))] impl From<Owned> for OwnedFd { fn from(fd: Owned) -> Self { fd.inner } } -#[cfg(unix)] +#[cfg(any(unix, target_os = "wasi"))] impl From<OwnedFd> for Owned { fn from(fd: OwnedFd) -> Self { Self { inner: fd } } } -#[cfg(unix)] +#[cfg(any(unix, target_os = "wasi"))] impl AsFd for Owned { fn as_fd(&self) -> BorrowedFd<'_> { self.inner.as_fd() } } -#[cfg(unix)] +#[cfg(any(unix, target_os = "wasi"))] impl AsRawFd for Owned { fn as_raw_fd(&self) -> RawFd { self.as_raw() } } -#[cfg(unix)] +#[cfg(any(unix, target_os = "wasi"))] impl FromRawFd for Owned { unsafe fn from_raw_fd(fd: RawFd) -> Self { unsafe { Self::from_raw(fd) } } } -#[cfg(unix)] +#[cfg(any(unix, target_os = "wasi"))] impl IntoRawFd for Owned { fn into_raw_fd(self) -> RawFd { self.into_raw() @@ -287,28 +287,28 @@ impl Borrowed<'_> { } } -#[cfg(unix)] +#[cfg(any(unix, target_os = "wasi"))] impl<'fd> From<Borrowed<'fd>> for BorrowedFd<'fd> { fn from(fd: Borrowed<'fd>) -> Self { fd.inner } } -#[cfg(unix)] +#[cfg(any(unix, target_os = "wasi"))] impl<'fd> From<BorrowedFd<'fd>> for Borrowed<'fd> { fn from(fd: BorrowedFd<'fd>) -> Self { Self { inner: fd } } } -#[cfg(unix)] +#[cfg(any(unix, target_os = "wasi"))] impl AsFd for Borrowed<'_> { fn as_fd(&self) -> BorrowedFd<'_> { self.inner.as_fd() } } -#[cfg(unix)] +#[cfg(any(unix, target_os = "wasi"))] impl AsRawFd for Borrowed<'_> { fn as_raw_fd(&self) -> RawFd { self.as_raw() diff --git a/crates/host_env/src/lib.rs b/crates/host_env/src/lib.rs index 99f67b2b4..15f816ea8 100644 --- a/crates/host_env/src/lib.rs +++ b/crates/host_env/src/lib.rs @@ -52,6 +52,9 @@ pub mod posix; #[cfg(target_os = "wasi")] #[path = "posix_wasi.rs"] pub mod posix; +#[cfg(windows)] +#[path = "posix_windows.rs"] +pub mod posix; #[cfg(unix)] pub mod pwd; #[cfg(unix)] diff --git a/crates/host_env/src/posix.rs b/crates/host_env/src/posix.rs index f10e99ac9..1239d3526 100644 --- a/crates/host_env/src/posix.rs +++ b/crates/host_env/src/posix.rs @@ -10,6 +10,8 @@ use std::os::fd::FromRawFd; use std::os::fd::{AsFd, AsRawFd, BorrowedFd, IntoRawFd, OwnedFd}; use std::path::Path; +use crate::crt_fd; + pub struct UnameInfo { pub sysname: String, pub nodename: String, @@ -174,24 +176,14 @@ pub fn fcopyfile(in_fd: i32, out_fd: i32, flags: u32) -> std::io::Result<()> { } } -#[cfg(not(windows))] -pub fn make_dir(path: &CStr, mode: u32) -> std::io::Result<()> { - let ret = unsafe { libc::mkdir(path.as_ptr(), mode as _) }; - if ret < 0 { - Err(std::io::Error::last_os_error()) - } else { - Ok(()) - } -} - -#[cfg(all(not(windows), not(target_os = "redox")))] -pub fn make_dir_at(dir_fd: i32, path: &CStr, mode: u32) -> std::io::Result<()> { - let ret = unsafe { libc::mkdirat(dir_fd, path.as_ptr(), mode as _) }; - if ret < 0 { - Err(std::io::Error::last_os_error()) - } else { - Ok(()) - } +#[cfg(any(unix, target_os = "wasi"))] +pub fn make_dir( + dir_fd: Option<crt_fd::Borrowed<'_>>, + path: &impl AsRef<Path>, + mode: libc::mode_t, +) -> std::io::Result<()> { + let dir_fd = dir_fd.as_ref().map_or(rustix::fs::CWD, AsFd::as_fd); + rustix::fs::mkdirat(dir_fd, path.as_ref(), mode.into()).map_err(Into::into) } #[cfg(unix)] diff --git a/crates/host_env/src/posix_wasi.rs b/crates/host_env/src/posix_wasi.rs index d4eff8c68..f1883fccd 100644 --- a/crates/host_env/src/posix_wasi.rs +++ b/crates/host_env/src/posix_wasi.rs @@ -1,17 +1,17 @@ use alloc::ffi::CString; use core::{ffi::CStr, time::Duration}; -use std::{ffi::OsStr, io}; +use rustix::fd::AsFd; +use std::{ffi::OsStr, io, path::Path}; -use crate::os::CheckLibcResult; +use crate::{crt_fd, os::CheckLibcResult}; -pub fn make_dir(path: &CStr, mode: u32) -> io::Result<()> { - unsafe { libc::mkdir(path.as_ptr(), mode as _) }.check_libc_neg()?; - Ok(()) -} - -pub fn make_dir_at(dir_fd: i32, path: &CStr, mode: u32) -> io::Result<()> { - unsafe { libc::mkdirat(dir_fd, path.as_ptr(), mode as _) }.check_libc_neg()?; - Ok(()) +pub fn make_dir( + dir_fd: Option<crt_fd::Borrowed<'_>>, + path: &impl AsRef<Path>, + mode: libc::mode_t, +) -> std::io::Result<()> { + let dir_fd = dir_fd.as_ref().map_or(rustix::fs::CWD, AsFd::as_fd); + rustix::fs::mkdirat(dir_fd, path.as_ref(), mode.into()).map_err(Into::into) } pub fn remove_dir_at(dir_fd: i32, path: &CStr) -> io::Result<()> { diff --git a/crates/host_env/src/posix_windows.rs b/crates/host_env/src/posix_windows.rs new file mode 100644 index 000000000..ac9e2cfa8 --- /dev/null +++ b/crates/host_env/src/posix_windows.rs @@ -0,0 +1,22 @@ +//! POSIX-compatible API for Windows. +//! +//! Python wraps POSIX syscalls such as `mkdir` and `open`. Windows doesn't directly implement +//! these syscalls, but they can be emulated with a mix of the Windows API and the Rust standard +//! library, the latter of which calls the former. + +use std::{fs, io, path::Path}; + +use crate::crt_fd; + +#[expect(non_camel_case_types)] +pub type mode_t = u32; + +pub fn make_dir( + dir_fd: Option<crt_fd::Borrowed<'_>>, + path: &impl AsRef<Path>, + _mode: mode_t, +) -> io::Result<()> { + debug_assert!(dir_fd.is_none()); + // TODO: On Windows, Python has an override if the mode is 0o700 + fs::create_dir(path) +} diff --git a/crates/vm/src/stdlib/os.rs b/crates/vm/src/stdlib/os.rs index 3c216168f..94dd19f79 100644 --- a/crates/vm/src/stdlib/os.rs +++ b/crates/vm/src/stdlib/os.rs @@ -10,6 +10,12 @@ use crate::{ }; use std::{io, path::Path}; +#[cfg(not(windows))] +use libc::mode_t; + +#[cfg(windows)] +use crate::host_env::posix::mode_t; + pub(crate) fn fs_metadata<P: AsRef<Path>>( path: P, follow_symlink: bool, @@ -29,7 +35,7 @@ pub struct TargetIsDirectory { } cfg_select! { - all(any(unix, target_os = "wasi"), not(target_os = "redox")) => { + any(unix, target_os = "wasi") => { use libc::AT_FDCWD; } _ => { @@ -154,7 +160,7 @@ impl ToPyObject for crt_fd::Borrowed<'_> { #[pymodule(sub)] pub(super) mod _os { - use super::{DirFd, FollowSymlinks, SupportFunc}; + use super::{DirFd, FollowSymlinks, SupportFunc, mode_t}; use crate::host_env::fileutils::StatStruct; #[cfg(any(unix, windows))] use crate::utils::ToCString; @@ -184,7 +190,7 @@ pub(super) mod _os { use std::{fs, io, path::PathBuf, time::SystemTime}; const OPEN_DIR_FD: bool = cfg!(not(any(windows, target_os = "redox"))); - pub(crate) const MKDIR_DIR_FD: bool = cfg!(not(any(windows, target_os = "redox"))); + pub(crate) const MKDIR_DIR_FD: bool = cfg!(any(unix, target_os = "wasi")); const STAT_DIR_FD: bool = cfg!(not(any(windows, target_os = "redox"))); const UTIME_DIR_FD: bool = cfg!(not(any(windows, target_os = "redox"))); pub(crate) const SYMLINK_DIR_FD: bool = cfg!(not(any(windows, target_os = "redox"))); @@ -338,32 +344,24 @@ pub(super) mod _os { } } - #[cfg(not(windows))] #[pyfunction] fn mkdir( path: OsPath, - mode: OptionalArg<i32>, - dir_fd: DirFd<'_, { MKDIR_DIR_FD as usize }>, + mode: OptionalArg<mode_t>, + #[cfg_attr(not(any(unix, target_os = "wasi")), expect(unused_variables))] dir_fd: DirFd< + '_, + { MKDIR_DIR_FD as usize }, + >, vm: &VirtualMachine, ) -> PyResult<()> { let mode = mode.unwrap_or(0o777); - let c_path = path.clone().into_cstring(vm)?; - #[cfg(not(target_os = "redox"))] - if let Some(fd) = dir_fd.raw_opt() { - return if let Err(err) = - crate::host_env::posix::make_dir_at(fd, c_path.as_c_str(), mode as u32) - { - Err(OSErrorBuilder::with_filename(&err, path, vm)) - } else { - Ok(()) - }; - } - #[cfg(target_os = "redox")] - let [] = dir_fd.0; - if let Err(err) = crate::host_env::posix::make_dir(c_path.as_c_str(), mode as u32) { - return Err(OSErrorBuilder::with_filename(&err, path, vm)); - } - Ok(()) + #[cfg(any(unix, target_os = "wasi"))] + let dir_fd = dir_fd.get_opt(); + #[cfg(not(any(unix, target_os = "wasi")))] + let dir_fd = None; + + crate::host_env::posix::make_dir(dir_fd, &path.path, mode) + .map_err(|err| OSErrorBuilder::with_filename(&err, path, vm)) } #[pyfunction] From 8bdc1cc5fdae5579e5a990f91ce0fde16660efca Mon Sep 17 00:00:00 2001 From: Kwak Byoung Min <67214970+doma17@users.noreply.github.com> Date: Sun, 5 Jul 2026 01:17:46 +0900 Subject: [PATCH 181/339] Fix csv.writer QUOTE_NONE with quotechar=None (#8201) * Prevent csv QUOTE_NONE writer panics without quotechar Handle csv.writer rows with QUOTE_NONE through a RustPython-owned unquoted writer path so quotechar=None no longer reaches the unfinished csv_core configuration branch. Escape delimiter, newline, quotechar, and escapechar bytes according to the active dialect, and preserve CPython's single-empty-field error behavior. Constraint: Match CPython csv.writer behavior without changing Lib/ copied stdlib files. Rejected: Relying on csv_core QuoteStyle::Never | it does not model CPython QUOTE_NONE escaping with quotechar=None. Confidence: high Scope-risk: narrow Directive: Keep QUOTE_NONE writer behavior separate unless csv_core gains matching CPython semantics. Tested: prek run --all-files; cargo test --workspace --exclude rustpython_wasm --exclude rustpython-venvlauncher; cargo build --release --features sqlite; pytest -v in extra_tests Assisted-by: Codex:gpt-5.5 * Keep csv parity tests aligned with QUOTE_NONE support Remove the stale RustPython expected-failure marker for the CPython escaped-field writer test that now passes, and cover CR/LF escaping in the snippet regression requested during review. Constraint: RustPython test policy allows removing expectedFailure markers only when the upstream test passes. Rejected: Refactoring writer row boilerplate in this follow-up | review marked it as a heavy-lift nitpick and it would broaden the CI fix. Confidence: high Scope-risk: narrow Tested: cargo run --release --features sqlite -- -m test test_csv; cargo run -- extra_tests/snippets/stdlib_csv.py; PATH=/tmp/pyshim:$PATH prek run --all-files; git diff --check; cargo test --workspace --exclude rustpython_wasm --exclude rustpython-venvlauncher; pytest -v in extra_tests Assisted-by: Codex:gpt-5.5 * Keep csv quote-style dispatch coherent Review feedback pointed out that adjacent branches selected behavior from the same quoting discriminator. Use one match so future quote-style additions are routed in a single place. Constraint: RustPython review requested merging adjacent quote-style checks. Confidence: high Scope-risk: narrow Tested: cargo fmt --check Tested: target/release/rustpython extra_tests/snippets/stdlib_csv.py Tested: target/release/rustpython -m test test_csv Tested: PATH=/tmp/pyshim:$PATH prek run --all-files Tested: RUST_TEST_THREADS=1 cargo test --workspace --exclude rustpython_wasm --exclude rustpython-venvlauncher -- --test-threads=1 Tested: cargo clippy --workspace --exclude rustpython_wasm --exclude rustpython-venvlauncher --all-targets Assisted-by: Codex:gpt-5.5 --- Lib/test/test_csv.py | 1 - crates/stdlib/src/csv.rs | 92 ++++++++++++++++++++++++++---- extra_tests/snippets/stdlib_csv.py | 62 ++++++++++++++++++++ 3 files changed, 143 insertions(+), 12 deletions(-) diff --git a/Lib/test/test_csv.py b/Lib/test/test_csv.py index 0e1f020d3..494cce50a 100644 --- a/Lib/test/test_csv.py +++ b/Lib/test/test_csv.py @@ -854,7 +854,6 @@ class EscapedExcel(csv.excel): class TestEscapedExcel(TestCsvBase): dialect = EscapedExcel() - @unittest.expectedFailure # TODO: RUSTPYTHON def test_escape_fieldsep(self): self.writerAssertEqual([['abc,def']], 'abc\\,def\r\n') diff --git a/crates/stdlib/src/csv.rs b/crates/stdlib/src/csv.rs index bd80cf7ec..aaffab182 100644 --- a/crates/stdlib/src/csv.rs +++ b/crates/stdlib/src/csv.rs @@ -910,12 +910,8 @@ mod _csv { writer = writer.delimiter(t); } - if let Some(t) = self.quotechar { - if let Some(u) = t { - writer = writer.quote(u); - } else { - todo!() - } + if let Some(Some(t)) = self.quotechar { + writer = writer.quote(t); } if let Some(t) = self.doublequote { @@ -1148,6 +1144,24 @@ mod _csv { Ok(()) } + fn write_unquoted_field( + output: &mut Vec<u8>, + data: &[u8], + dialect: PyDialect, + vm: &VirtualMachine, + ) -> PyResult<()> { + for &byte in data { + if field_needs_escape(byte, dialect) { + let escapechar = dialect + .escapechar + .ok_or_else(|| new_csv_error(vm, "need to escape, but no escapechar set"))?; + output.push(escapechar); + } + output.push(byte); + } + Ok(()) + } + fn field_needs_quotes(data: &[u8], dialect: PyDialect) -> bool { data.iter().any(|&byte| { byte == dialect.delimiter @@ -1157,6 +1171,14 @@ mod _csv { }) } + fn field_needs_escape(byte: u8, dialect: PyDialect) -> bool { + byte == dialect.delimiter + || dialect.quotechar == Some(byte) + || dialect.escapechar == Some(byte) + || matches!(byte, b'\r' | b'\n') + || matches!(dialect.lineterminator, Terminator::Any(t) if byte == t) + } + fn write_lineterminator(output: &mut Vec<u8>, terminator: Terminator) { match terminator { Terminator::CRLF => output.extend_from_slice(b"\r\n"), @@ -1222,13 +1244,61 @@ mod _csv { self.write.call((s,), vm) } + fn writerow_quote_none(&self, row: PyObjectRef, vm: &VirtualMachine) -> PyResult { + let _state = self.state.lock(); + + let row: ArgIterable = ArgIterable::try_from_object(vm, row.clone()).map_err(|_e| { + new_csv_error( + vm, + format!("'{}' object is not iterable", row.class().name()), + ) + })?; + + let fields = row.iter(vm)?.collect::<PyResult<Vec<_>>>()?; + let single_field = fields.len() == 1; + let mut output = Vec::new(); + + for (index, field) in fields.into_iter().enumerate() { + if index > 0 { + output.push(self.dialect.delimiter); + } + + let stringified; + let data: &[u8] = match_class!(match field { + ref s @ PyStr => s.as_bytes(), + crate::builtins::PyNone => b"", + ref obj => { + stringified = obj.str(vm)?; + stringified.as_bytes() + } + }); + + if single_field && data.is_empty() { + return Err(new_csv_error( + vm, + "single empty field record must be quoted", + )); + } + + write_unquoted_field(&mut output, data, self.dialect, vm)?; + } + + write_lineterminator(&mut output, self.dialect.lineterminator); + + let s = core::str::from_utf8(&output) + .map_err(|_| vm.new_unicode_decode_error("csv not utf8"))?; + + self.write.call((s,), vm) + } + #[pymethod] fn writerow(&self, row: PyObjectRef, vm: &VirtualMachine) -> PyResult { - if matches!( - self.dialect.quoting, - QuoteStyle::Strings | QuoteStyle::Notnull - ) { - return self.writerow_quoted_strings(row, vm); + match self.dialect.quoting { + QuoteStyle::None => return self.writerow_quote_none(row, vm), + QuoteStyle::Strings | QuoteStyle::Notnull => { + return self.writerow_quoted_strings(row, vm); + } + _ => {} } let mut state = self.state.lock(); diff --git a/extra_tests/snippets/stdlib_csv.py b/extra_tests/snippets/stdlib_csv.py index aa7b41223..b9c741cbb 100644 --- a/extra_tests/snippets/stdlib_csv.py +++ b/extra_tests/snippets/stdlib_csv.py @@ -72,3 +72,65 @@ def test_quote_strings_and_notnull_writer(): test_quote_strings_and_notnull_writer() + + +def test_quote_none_writer_without_quotechar(): + no_quotechar_buf = io.StringIO() + csv.writer( + no_quotechar_buf, + quoting=csv.QUOTE_NONE, + quotechar=None, + escapechar="\\", + ).writerow(["a,b", 'x"y']) + assert no_quotechar_buf.getvalue() == 'a\\,b,x"y\r\n' + + default_quotechar_buf = io.StringIO() + csv.writer( + default_quotechar_buf, + quoting=csv.QUOTE_NONE, + escapechar="\\", + ).writerow(["a,b", 'x"y']) + assert default_quotechar_buf.getvalue() == 'a\\,b,x\\"y\r\n' + + escapechar_buf = io.StringIO() + csv.writer( + escapechar_buf, + quoting=csv.QUOTE_NONE, + quotechar=None, + escapechar="\\", + ).writerow(["a\\b"]) + assert escapechar_buf.getvalue() == "a\\\\b\r\n" + + linebreak_buf = io.StringIO() + csv.writer( + linebreak_buf, + quoting=csv.QUOTE_NONE, + quotechar=None, + escapechar="\\", + ).writerow(["a\rb", "c\nd"]) + assert linebreak_buf.getvalue() == "a\\\rb,c\\\nd\r\n" + + with assert_raises(csv.Error): + csv.writer(io.StringIO(), quoting=csv.QUOTE_NONE, quotechar=None).writerow( + ["a,b"] + ) + + with assert_raises(csv.Error): + csv.writer( + io.StringIO(), + quoting=csv.QUOTE_NONE, + quotechar=None, + escapechar="\\", + ).writerow([None]) + + two_empty_buf = io.StringIO() + csv.writer( + two_empty_buf, + quoting=csv.QUOTE_NONE, + quotechar=None, + escapechar="\\", + ).writerow([None, ""]) + assert two_empty_buf.getvalue() == ",\r\n" + + +test_quote_none_writer_without_quotechar() From e570946c4aeb994e091d5229a561dfd21b43db4b Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Sat, 4 Jul 2026 19:18:37 +0300 Subject: [PATCH 182/339] Move some free standing functions to `ir::InstructionInfo` methods (#8209) * Move some free standing functions to methods * align tests * mark loads_const as const fn * coderabbit suggestion --- crates/codegen/src/ir.rs | 689 +++++++++++++++++++-------------------- 1 file changed, 330 insertions(+), 359 deletions(-) diff --git a/crates/codegen/src/ir.rs b/crates/codegen/src/ir.rs index 28554aa84..12fba37f6 100644 --- a/crates/codegen/src/ir.rs +++ b/crates/codegen/src/ir.rs @@ -320,6 +320,192 @@ pub struct InstructionInfo { pub lineno_override: Option<i32>, } +impl InstructionInfo { + /// flowgraph.c INSTR_SET_OP0 + fn instr_set_op0(&mut self, instr: AnyInstruction) { + debug_assert!(!AnyOpcode::from(instr).has_arg()); + self.instr = instr; + self.arg = OpArg::new(0); + } + + /// flowgraph.c INSTR_SET_OP1 + fn instr_set_op1(&mut self, instr: AnyInstruction, arg: OpArg) { + debug_assert!(AnyOpcode::from(instr).has_arg()); + self.instr = instr; + self.arg = arg; + } + + /// flowgraph.c INSTR_SET_LOC + fn instr_set_loc( + &mut self, + location: SourceLocation, + end_location: SourceLocation, + lineno_override: Option<i32>, + ) { + self.location = location; + self.end_location = end_location; + self.lineno_override = lineno_override; + } + + fn instr_location(&self) -> InstructionLocation { + InstructionLocation { + location: self.location, + end_location: self.end_location, + lineno_override: self.lineno_override, + } + } + + fn instr_set_location(&mut self, loc: InstructionLocation) { + self.instr_set_loc(loc.location, loc.end_location, loc.lineno_override); + } + + fn set_to_nop(&mut self) { + self.instr_set_op0(Instruction::Nop.into()); + } + + fn nop_out_no_location(&mut self) { + self.set_to_nop(); + self.instr_set_loc( + SourceLocation::default(), + SourceLocation::default(), + Some(NO_LOCATION_OVERRIDE), + ); + } + + #[must_use] + fn empty() -> Self { + Self { + instr: Instruction::Nop.into(), + arg: OpArg::new(0), + target: BlockIdx::NULL, + location: SourceLocation::default(), + end_location: SourceLocation::default(), + except_handler: None, + lineno_override: None, + } + } + + /// instruction_sequence.c _PyInstructionSequence_Addop asserts. + fn instruction_sequence_debug_check_addop(&self) { + let opcode = AnyOpcode::from(self.instr); + debug_assert!(is_within_opcode_range(opcode)); + debug_assert!( + opcode.has_arg() || self.instr.has_target() || u32::from(self.arg) == 0, + "CPython _PyInstructionSequence_Addop requires either OPCODE_HAS_ARG, HAS_TARGET, or oparg == 0" + ); + debug_assert!( + u32::from(self.arg) < (1 << 30), + "CPython _PyInstructionSequence_Addop requires 0 <= oparg < (1 << 30)" + ); + } + + /// assemble.c instr_size + fn instr_size(&self) -> usize { + let opcode = self.instr.expect_real(); + let oparg = u32::from(self.arg) as i32; + debug_assert!( + self.instr.has_arg() || oparg == 0, + "CPython assemble.c instr_size requires OPCODE_HAS_ARG or oparg == 0" + ); + let extended_args = + (0xFF_FFFF < oparg) as usize + (0xFF_FF < oparg) as usize + (0xFF < oparg) as usize; + let caches = opcode.cache_entries(); + extended_args + 1 + caches + } + + fn instruction_linetable_location(&self) -> LineTableLocation { + match self.lineno_override { + Some(NO_LOCATION_OVERRIDE) => LineTableLocation { + line: NO_LOCATION_OVERRIDE, + end_line: NO_LOCATION_OVERRIDE, + col: NO_LOCATION_OVERRIDE, + end_col: NO_LOCATION_OVERRIDE, + }, + Some(LINE_ONLY_LOCATION_OVERRIDE) => LineTableLocation { + line: self.location.line.get() as i32, + end_line: self.end_location.line.get() as i32, + col: -1, + end_col: -1, + }, + Some(NEXT_LOCATION_OVERRIDE) => next_linetable_location(), + Some(lineno) => LineTableLocation { + line: lineno, + end_line: self.end_location.line.get() as i32, + col: self.location.character_offset.to_zero_indexed() as i32, + end_col: self.end_location.character_offset.to_zero_indexed() as i32, + }, + None => LineTableLocation { + line: self.location.line.get() as i32, + end_line: self.end_location.line.get() as i32, + col: self.location.character_offset.to_zero_indexed() as i32, + end_col: self.end_location.character_offset.to_zero_indexed() as i32, + }, + } + } + + /// flowgraph.c loads_const + const fn loads_const(&self) -> bool { + self.instr.has_const() || matches!(self.instr.real_opcode(), Some(Opcode::LoadSmallInt)) + } + + /// flowgraph.c STORES_TO + fn stores_to(&self) -> i32 { + match self.instr.into() { + AnyOpcode::Real(Opcode::StoreFast) + | AnyOpcode::Pseudo(PseudoOpcode::StoreFastMaybeNull) => u32::from(self.arg) as i32, + _ => -1, + } + } + + /// flowgraph.c maybe_instr_make_load_smallint + fn maybe_instr_make_load_smallint(&mut self, constant: &ConstantData) -> bool { + if let ConstantData::Integer { value } = constant + && let Some(small) = value.to_i32().filter(|v| (0..=255).contains(v)) + { + self.instr_set_op1(Opcode::LoadSmallInt.into(), OpArg::new(small as u32)); + return true; + } + false + } + + /// flowgraph.c make_super_instruction + fn make_super_instruction(inst1: &mut Self, inst2: &mut Self, super_op: AnyInstruction) { + let line1 = inst1.instruction_lineno(); + let line2 = inst2.instruction_lineno(); + if line1 >= 0 && line2 >= 0 && line1 != line2 { + return; + } + let arg1 = u32::from(inst1.arg); + let arg2 = u32::from(inst2.arg); + if arg1 >= 16 || arg2 >= 16 { + return; + } + inst1.instr_set_op1(super_op, OpArg::new((arg1 << 4) | arg2)); + inst2.set_to_nop(); + } + + fn instruction_lineno(&self) -> i32 { + match self.lineno_override { + Some(LINE_ONLY_LOCATION_OVERRIDE) | None => self.location.line.get() as i32, + Some(lineno) => lineno, + } + } + + fn instruction_is_no_location(&self) -> bool { + self.instruction_lineno() == NO_LOCATION_OVERRIDE + } + + /// flowgraph.c is_jump + fn is_jump(&self) -> bool { + self.instr.has_jump() + } + + /// flowgraph.c is_block_push + fn is_block_push(&self) -> bool { + self.instr.is_block_push() + } +} + /// Exception handler information for an instruction. #[derive(Clone, Copy, Debug, PartialEq, Eq)] pub struct ExceptHandlerInfo { @@ -329,44 +515,6 @@ pub struct ExceptHandlerInfo { pub preserve_lasti: bool, } -/// flowgraph.c INSTR_SET_OP0 -fn instr_set_op0(info: &mut InstructionInfo, instr: AnyInstruction) { - debug_assert!(!AnyOpcode::from(instr).has_arg()); - info.instr = instr; - info.arg = OpArg::new(0); -} - -/// flowgraph.c INSTR_SET_OP1 -fn instr_set_op1(info: &mut InstructionInfo, instr: AnyInstruction, arg: OpArg) { - debug_assert!(AnyOpcode::from(instr).has_arg()); - info.instr = instr; - info.arg = arg; -} - -/// flowgraph.c INSTR_SET_LOC -fn instr_set_loc( - info: &mut InstructionInfo, - location: SourceLocation, - end_location: SourceLocation, - lineno_override: Option<i32>, -) { - info.location = location; - info.end_location = end_location; - info.lineno_override = lineno_override; -} - -fn instr_location(info: &InstructionInfo) -> InstructionLocation { - InstructionLocation { - location: info.location, - end_location: info.end_location, - lineno_override: info.lineno_override, - } -} - -fn instr_set_location(info: &mut InstructionInfo, loc: InstructionLocation) { - instr_set_loc(info, loc.location, loc.end_location, loc.lineno_override); -} - fn no_instruction_location() -> InstructionLocation { InstructionLocation { location: SourceLocation::default(), @@ -375,32 +523,6 @@ fn no_instruction_location() -> InstructionLocation { } } -fn set_to_nop(info: &mut InstructionInfo) { - instr_set_op0(info, Instruction::Nop.into()); -} - -fn nop_out_no_location(info: &mut InstructionInfo) { - set_to_nop(info); - instr_set_loc( - info, - SourceLocation::default(), - SourceLocation::default(), - Some(NO_LOCATION_OVERRIDE), - ); -} - -fn empty_instruction_info() -> InstructionInfo { - InstructionInfo { - instr: Instruction::Nop.into(), - arg: OpArg::new(0), - target: BlockIdx::NULL, - location: SourceLocation::default(), - end_location: SourceLocation::default(), - except_handler: None, - lineno_override: None, - } -} - /// codegen.c _Py_CArray_EnsureCapacity fn c_array_ensure_capacity<T>( allocated_entries: usize, @@ -585,20 +707,6 @@ fn instruction_sequence_new_label(seq: &mut InstructionSequence) -> InstructionS InstructionSequenceLabel(seq.next_free_label) } -/// instruction_sequence.c _PyInstructionSequence_Addop asserts. -fn instruction_sequence_debug_check_addop(info: &InstructionInfo) { - let opcode = AnyOpcode::from(info.instr); - debug_assert!(is_within_opcode_range(opcode)); - debug_assert!( - opcode.has_arg() || info.instr.has_target() || u32::from(info.arg) == 0, - "CPython _PyInstructionSequence_Addop requires either OPCODE_HAS_ARG, HAS_TARGET, or oparg == 0" - ); - debug_assert!( - u32::from(info.arg) < (1 << 30), - "CPython _PyInstructionSequence_Addop requires 0 <= oparg < (1 << 30)" - ); -} - /// instruction_sequence.c _PyInstructionSequence_SetAnnotationsCode fn instruction_sequence_set_annotations_code( seq: &mut InstructionSequence, @@ -653,7 +761,7 @@ fn instruction_sequence_addop( seq: &mut InstructionSequence, info: InstructionInfo, ) -> crate::InternalResult<&mut InstructionSequenceEntry> { - instruction_sequence_debug_check_addop(&info); + info.instruction_sequence_debug_check_addop(); let idx = instruction_sequence_next_inst(seq)?; let entry = &mut seq.instrs[idx]; entry.info = info; @@ -725,20 +833,6 @@ fn instruction_sequence_apply_label_map(instrs: &mut InstructionSequence) { instrs.label_map_allocation = 0; } -/// assemble.c instr_size -fn instr_size(instr: &InstructionInfo) -> usize { - let opcode = instr.instr.expect_real(); - let oparg = u32::from(instr.arg) as i32; - debug_assert!( - instr.instr.has_arg() || oparg == 0, - "CPython assemble.c instr_size requires OPCODE_HAS_ARG or oparg == 0" - ); - let extended_args = - (0xFF_FFFF < oparg) as usize + (0xFF_FF < oparg) as usize + (0xFF < oparg) as usize; - let caches = opcode.cache_entries(); - extended_args + 1 + caches -} - /// pycore_opcode_metadata.h is_pseudo_target const fn is_pseudo_target(pseudo: PseudoOpcode, target: Opcode) -> bool { match pseudo { @@ -821,22 +915,24 @@ fn resolve_jump_offsets(instr_sequence: &mut InstructionSequence) { instr.i_target = u32::from(instr.info.arg) as i32; } } + let mut extended_arg_recompile; loop { let mut totsize = 0i32; for i in 0..instr_sequence.instr_used { let instr = &mut instr_sequence.instrs[i]; instr.i_offset = totsize; - let isize = instr_size(&instr.info); - totsize += isize as i32; + let instr_size = instr.info.instr_size(); + totsize += instr_size as i32; } + extended_arg_recompile = false; let mut offset = 0i32; for i in 0..instr_sequence.instr_used { - let isize = instr_size(&instr_sequence.instrs[i].info); + let i_size = instr_sequence.instrs[i].info.instr_size(); // Jump offsets are computed relative to the instruction pointer // after fetching the jump instruction. - offset += isize as i32; + offset += i_size as i32; let opcode = instr_sequence.instrs[i].info.instr.expect_real(); if opcode.has_jump() { @@ -862,7 +958,7 @@ fn resolve_jump_offsets(instr_sequence: &mut InstructionSequence) { oparg -= offset; } info.arg = OpArg::new(oparg as u32); - if instr_size(info) != isize { + if info.instr_size() != i_size { extended_arg_recompile = true; } } @@ -890,36 +986,6 @@ fn same_location(a: LineTableLocation, b: LineTableLocation) -> bool { a.line == b.line && a.end_line == b.end_line && a.col == b.col && a.end_col == b.end_col } -fn instruction_linetable_location(info: &InstructionInfo) -> LineTableLocation { - match info.lineno_override { - Some(NO_LOCATION_OVERRIDE) => LineTableLocation { - line: NO_LOCATION_OVERRIDE, - end_line: NO_LOCATION_OVERRIDE, - col: NO_LOCATION_OVERRIDE, - end_col: NO_LOCATION_OVERRIDE, - }, - Some(LINE_ONLY_LOCATION_OVERRIDE) => LineTableLocation { - line: info.location.line.get() as i32, - end_line: info.end_location.line.get() as i32, - col: -1, - end_col: -1, - }, - Some(NEXT_LOCATION_OVERRIDE) => next_linetable_location(), - Some(lineno) => LineTableLocation { - line: lineno, - end_line: info.end_location.line.get() as i32, - col: info.location.character_offset.to_zero_indexed() as i32, - end_col: info.end_location.character_offset.to_zero_indexed() as i32, - }, - None => LineTableLocation { - line: info.location.line.get() as i32, - end_line: info.end_location.line.get() as i32, - col: info.location.character_offset.to_zero_indexed() as i32, - end_col: info.end_location.character_offset.to_zero_indexed() as i32, - }, - } -} - /// assemble.c write_instr fn write_instr(instructions: &mut Vec<CodeUnit>, info: &InstructionInfo, ilen: usize) { let opcode = info.instr.expect_real(); @@ -963,7 +1029,7 @@ fn assemble_emit_instr( instructions: &mut Vec<CodeUnit>, info: &mut InstructionInfo, ) -> crate::InternalResult<()> { - let size = instr_size(info); + let size = info.instr_size(); let required = instructions .len() .checked_add(size) @@ -982,7 +1048,9 @@ fn assemble_location_info( debug_ranges: bool, ) -> crate::InternalResult<Box<[u8]>> { for i in (0..instr_sequence.instr_used).rev() { - let loc = instruction_linetable_location(&instr_sequence.instrs[i].info); + let loc = instr_sequence.instrs[i] + .info + .instruction_linetable_location(); if same_location(loc, next_linetable_location()) { if instr_sequence.instrs[i] .info @@ -994,8 +1062,7 @@ fn assemble_location_info( } else { debug_assert!(i < instr_sequence.instr_used - 1); let next = instr_sequence.instrs[i + 1].info; - instr_set_loc( - &mut instr_sequence.instrs[i].info, + instr_sequence.instrs[i].info.instr_set_loc( next.location, next.end_location, next.lineno_override, @@ -1011,13 +1078,13 @@ fn assemble_location_info( let mut size = 0; for i in 0..instr_sequence.instr_used { let entry = &instr_sequence.instrs[i]; - let instr_loc = instruction_linetable_location(&entry.info); + let instr_loc = entry.info.instruction_linetable_location(); if !same_location(loc, instr_loc) { assemble_emit_location(&mut linetable, loc, size, &mut prev_line, debug_ranges)?; loc = instr_loc; size = 0; } - size += instr_size(&entry.info); + size += entry.info.instr_size(); } assemble_emit_location(&mut linetable, loc, size, &mut prev_line, debug_ranges)?; Ok(linetable.into_boxed_slice()) @@ -1227,7 +1294,7 @@ impl Block { .try_reserve_exact(new_allocation - self.instructions.len()) .map_err(|_| InternalError::MalformedControlFlowGraph)?; self.instructions - .resize_with(new_allocation, empty_instruction_info); + .resize_with(new_allocation, InstructionInfo::empty); } self.instruction_allocation = new_allocation; } @@ -1360,7 +1427,7 @@ impl Block { fn basicblock_has_no_lineno(&self) -> bool { let mut i = 0; while i < self.instruction_used { - if instruction_lineno(&self.instructions[i]) >= 0 { + if self.instructions[i].instruction_lineno() >= 0 { return false; } i += 1; @@ -1377,7 +1444,7 @@ impl Block { /// flowgraph.c nop_out fn nop_out(&mut self, instrs: &[usize]) { for &i in instrs { - nop_out_no_location(&mut self.instructions[i]); + self.instructions[i].nop_out_no_location(); } } @@ -1395,21 +1462,26 @@ impl Block { if start >= self.instruction_used { return Ok(None); } + let instr = &self.instructions[start]; if !matches!(instr.instr.real(), Some(Instruction::Nop)) { - if !loads_const(instr) { + if !instr.loads_const() { return Ok(None); } + indices.push(start); if indices.len() == size { break; } } + let Some(prev) = start.checked_sub(1) else { return Ok(None); }; + start = prev; } + indices.reverse(); Ok(Some(indices)) } @@ -1423,7 +1495,7 @@ impl Block { } let info = &self.instructions[i]; - let info_lineno = instruction_lineno(info); + let info_lineno = info.instruction_lineno(); if lineno >= 0 && info_lineno != lineno { return None; @@ -1515,7 +1587,7 @@ impl Block { } while current >= 0 { - set_to_nop(&mut self.instructions[*ix + current as usize]); + self.instructions[*ix + current as usize].set_to_nop(); current -= 1; } *ix += len - 1; @@ -1547,7 +1619,7 @@ impl Block { let Some(j) = self.next_swappable_instruction(idx, -1) else { return; }; - let lineno = instruction_lineno(&self.instructions[j]); + let lineno = self.instructions[j].instruction_lineno(); let mut k = j; for _ in 1..swap_arg { let Some(next) = self.next_swappable_instruction(k, lineno) else { @@ -1556,15 +1628,15 @@ impl Block { k = next; } - let store_j = stores_to(&self.instructions[j]); - let store_k = stores_to(&self.instructions[k]); + let store_j = self.instructions[j].stores_to(); + let store_k = self.instructions[k].stores_to(); if store_j >= 0 || store_k >= 0 { if store_j == store_k { return; } let mut idx = j + 1; while idx < k { - let store_idx = stores_to(&self.instructions[idx]); + let store_idx = self.instructions[idx].stores_to(); if store_idx >= 0 && (store_idx == store_j || store_idx == store_k) { return; } @@ -1572,7 +1644,7 @@ impl Block { } } - set_to_nop(&mut self.instructions[idx]); + self.instructions[idx].set_to_nop(); self.instructions.swap(j, k); i -= 1; } @@ -1640,7 +1712,7 @@ impl Blocks { let instr_count = self[idx].instruction_used; for i in 0..instr_count { let instr = self[idx].instructions[i]; - if is_jump(&instr) || is_block_push(&instr) { + if instr.is_jump() || instr.is_block_push() { let target = instr.target; debug_assert!(target != BlockIdx::NULL); let target_idx = target.idx(); @@ -1704,7 +1776,7 @@ impl Blocks { continue; }; - if is_jump(&last) { + if last.is_jump() { debug_assert!(last.target != BlockIdx::NULL); let target = next_nonempty_block(self, last.target); @@ -1715,10 +1787,7 @@ impl Blocks { && self[target].predecessors > 1 { let new_target = self.copy_basicblock(target)?; - instr_set_location( - &mut self[new_target].instructions[0], - instr_location(&last), - ); + self[new_target].instructions[0].instr_set_location(last.instr_location()); let last_mut = self[b].basicblock_last_instr_mut().unwrap(); last_mut.target = new_target; self[target].predecessors -= 1; @@ -1743,7 +1812,7 @@ impl Blocks { let last = *self[b] .basicblock_last_instr() .expect("block has instructions"); - instr_set_location(&mut self[next].instructions[0], instr_location(&last)); + self[next].instructions[0].instr_set_location(last.instr_location()); } b = self[b].next; } @@ -1772,7 +1841,7 @@ impl Blocks { except_handler: None, lineno_override: None, }; - instr_set_op0(&mut nop, Instruction::Nop.into()); + nop.instr_set_op0(Instruction::Nop.into()); let mut i = 0; while i < self[block_idx].instruction_used { let inst = self[block_idx].instructions[i]; @@ -1800,13 +1869,13 @@ impl Blocks { { match oparg { 1 => { - set_to_nop(&mut self[block_idx].instructions[i]); - set_to_nop(&mut self[block_idx].instructions[i + 1]); + self[block_idx].instructions[i].set_to_nop(); + self[block_idx].instructions[i + 1].set_to_nop(); i += 1; continue; } 2 | 3 => { - set_to_nop(&mut self[block_idx].instructions[i]); + self[block_idx].instructions[i].set_to_nop(); self[block_idx].instructions[i + 1].instr = Opcode::Swap.into(); i += 1; continue; @@ -1907,32 +1976,28 @@ impl Blocks { if matches!(nextop, Some(Instruction::StoreFast { .. })) && u32::from(inst.arg) == u32::from(self[block_idx].instructions[i + 1].arg) - && instruction_lineno(&self[block_idx].instructions[i]) - == instruction_lineno(&self[block_idx].instructions[i + 1]) => + && self[block_idx].instructions[i].instruction_lineno() + == self[block_idx].instructions[i + 1].instruction_lineno() => { self[block_idx].instructions[i].instr = Instruction::PopTop.into(); self[block_idx].instructions[i].arg = OpArg::NULL; } AnyInstruction::Real(Instruction::Swap { .. }) if u32::from(inst.arg) == 1 => { - set_to_nop(&mut self[block_idx].instructions[i]); + self[block_idx].instructions[i].set_to_nop(); } AnyInstruction::Real(Instruction::LoadGlobal { .. }) if matches!(nextop, Some(Instruction::PushNull)) && (u32::from(inst.arg) & 1) == 0 => { - instr_set_op1( - &mut self[block_idx].instructions[i], - inst.instr, - OpArg::new(u32::from(inst.arg) | 1), - ); - set_to_nop(&mut self[block_idx].instructions[i + 1]); + self[block_idx].instructions[i] + .instr_set_op1(inst.instr, OpArg::new(u32::from(inst.arg) | 1)); + self[block_idx].instructions[i + 1].set_to_nop(); } AnyInstruction::Real(Instruction::CompareOp { .. }) if matches!(nextop, Some(Instruction::ToBool)) => { - set_to_nop(&mut self[block_idx].instructions[i]); - instr_set_op1( - &mut self[block_idx].instructions[i + 1], + self[block_idx].instructions[i].set_to_nop(); + self[block_idx].instructions[i + 1].instr_set_op1( inst.instr, OpArg::new(u32::from(inst.arg) | oparg::COMPARE_OP_BOOL_MASK), ); @@ -1942,46 +2007,39 @@ impl Blocks { AnyInstruction::Real(Instruction::ContainsOp { .. } | Instruction::IsOp { .. }) if matches!(nextop, Some(Instruction::ToBool)) => { - set_to_nop(&mut self[block_idx].instructions[i]); - instr_set_op1( - &mut self[block_idx].instructions[i + 1], - inst.instr, - inst.arg, - ); + self[block_idx].instructions[i].set_to_nop(); + self[block_idx].instructions[i + 1].instr_set_op1(inst.instr, inst.arg); i += 1; continue; } AnyInstruction::Real(Instruction::ContainsOp { .. } | Instruction::IsOp { .. }) if matches!(nextop, Some(Instruction::UnaryNot)) => { - set_to_nop(&mut self[block_idx].instructions[i]); + self[block_idx].instructions[i].set_to_nop(); let inverted = u32::from(inst.arg) ^ 1; debug_assert!(inverted == 0 || inverted == 1); - instr_set_op1( - &mut self[block_idx].instructions[i + 1], - inst.instr, - OpArg::new(inverted), - ); + self[block_idx].instructions[i + 1] + .instr_set_op1(inst.instr, OpArg::new(inverted)); i += 1; continue; } AnyInstruction::Real(Instruction::ToBool) if matches!(nextop, Some(Instruction::ToBool)) => { - set_to_nop(&mut self[block_idx].instructions[i]); + self[block_idx].instructions[i].set_to_nop(); i += 1; continue; } AnyInstruction::Real(Instruction::UnaryNot) => { if matches!(nextop, Some(Instruction::ToBool)) { - set_to_nop(&mut self[block_idx].instructions[i]); - instr_set_op0(&mut self[block_idx].instructions[i + 1], inst.instr); + self[block_idx].instructions[i].set_to_nop(); + self[block_idx].instructions[i + 1].instr_set_op0(inst.instr); i += 1; continue; } if matches!(nextop, Some(Instruction::UnaryNot)) { - set_to_nop(&mut self[block_idx].instructions[i]); - set_to_nop(&mut self[block_idx].instructions[i + 1]); + self[block_idx].instructions[i].set_to_nop(); + self[block_idx].instructions[i + 1].set_to_nop(); i += 1; continue; } @@ -1994,7 +2052,7 @@ impl Blocks { match func.get(inst.arg) { IntrinsicFunction1::ListToTuple => { if matches!(nextop, Some(Instruction::GetIter)) { - set_to_nop(&mut self[block_idx].instructions[i]); + self[block_idx].instructions[i].set_to_nop(); } else { fold_constant_intrinsic_list_to_tuple( metadata, @@ -2267,7 +2325,7 @@ impl Blocks { let target_depth = refs.size - num_popped + num_pushed; load_fast_push_block(&mut worklist, self, target, target_depth); } - if !is_block_push(&info) { + if !info.is_block_push() { for _ in 0..num_popped { let _ = ref_stack_pop(&mut refs); } @@ -2333,10 +2391,10 @@ impl Blocks { let mut prev_location = no_instruction_location(); for i in 0..self[current].instruction_used { - if instruction_is_no_location(&self[current].instructions[i]) { - instr_set_location(&mut self[current].instructions[i], prev_location); + if self[current].instructions[i].instruction_is_no_location() { + self[current].instructions[i].instr_set_location(prev_location); } else { - prev_location = instr_location(&self[current].instructions[i]); + prev_location = self[current].instructions[i].instr_location(); } } @@ -2346,19 +2404,19 @@ impl Blocks { if next != BlockIdx::NULL && self[next].predecessors == 1 && self[next].instruction_used != 0 - && instruction_is_no_location(&self[next].instructions[0]) + && self[next].instructions[0].instruction_is_no_location() { - instr_set_location(&mut self[next].instructions[0], prev_location); + self[next].instructions[0].instr_set_location(prev_location); } } - if is_jump(&last) { + if last.is_jump() { let target = last.target; debug_assert!(target != BlockIdx::NULL); if self[target].predecessors == 1 { let instr = self[target].basicblock_raw_first_instr_mut(); - if instruction_is_no_location(instr) { - instr_set_location(instr, prev_location); + if instr.instruction_is_no_location() { + instr.instr_set_location(prev_location); } } } @@ -2406,14 +2464,14 @@ impl Blocks { if is_redundant_pair { let (prev_block, prev_instr_idx) = prev_instr.expect("redundant pair has previous"); - set_to_nop(&mut self[prev_block].instructions[prev_instr_idx]); - set_to_nop(&mut self[block_idx].instructions[instr_idx]); + self[prev_block].instructions[prev_instr_idx].set_to_nop(); + self[block_idx].instructions[instr_idx].set_to_nop(); done = false; } } let instr_is_jump = instr.is_some_and(|(instr_block, instr_idx)| { - is_jump(&self[instr_block].instructions[instr_idx]) + self[instr_block].instructions[instr_idx].is_jump() }); let block = &self[block_idx]; @@ -2621,37 +2679,30 @@ impl Blocks { .then(|| block.instructions[i + 1].instr.real_opcode()) .flatten(); - match (block.instructions[i].instr.real_opcode(), nextop) { - (Some(Opcode::LoadFast), _) => { - if matches!(nextop, Some(Opcode::LoadFast)) { - let (inst1, rest) = block.instructions[i..].split_at_mut(1); - make_super_instruction( - &mut inst1[0], - &mut rest[0], - Opcode::LoadFastLoadFast.into(), - ); - } + let super_op = match (block.instructions[i].instr.real_opcode(), nextop) { + (Some(Opcode::LoadFast), Some(Opcode::LoadFast)) => { + Some(Opcode::LoadFastLoadFast) } (Some(Opcode::StoreFast), Some(Opcode::LoadFast)) => { - let (inst1, rest) = block.instructions[i..].split_at_mut(1); - make_super_instruction( - &mut inst1[0], - &mut rest[0], - Opcode::StoreFastLoadFast.into(), - ); + Some(Opcode::StoreFastLoadFast) } (Some(Opcode::StoreFast), Some(Opcode::StoreFast)) => { - let (inst1, rest) = block.instructions[i..].split_at_mut(1); - make_super_instruction( - &mut inst1[0], - &mut rest[0], - Opcode::StoreFastStoreFast.into(), - ); + Some(Opcode::StoreFastStoreFast) } - (_, _) => {} + (_, _) => None, + }; + + if let Some(super_op) = super_op { + let (inst1, rest) = block.instructions[i..].split_at_mut(1); + + InstructionInfo::make_super_instruction( + &mut inst1[0], + &mut rest[0], + super_op.into(), + ); } } @@ -2684,7 +2735,7 @@ impl Blocks { let instr_count = self[block_idx].instruction_used; for i in 0..instr_count { let instr = self[block_idx].instructions[i]; - if is_block_push(&instr) { + if instr.is_block_push() { debug_assert!(instr.target != BlockIdx::NULL); self[instr.target].except_handler = true; } @@ -2728,7 +2779,7 @@ impl Blocks { let instr_count = self[block_idx].instruction_used; for i in 0..instr_count { let instr = self[block_idx].instructions[i]; - if is_jump(&instr) { + if instr.is_jump() { let target = instr.target; debug_assert!(target != BlockIdx::NULL); if !self[target].visited { @@ -2780,7 +2831,7 @@ impl Blocks { let instr_count = self[block_idx].instruction_used; for i in 0..instr_count { let instr = self[block_idx].instructions[i]; - if is_jump(&instr) { + if instr.is_jump() { debug_assert_eq!(i, instr_count - 1); let target = instr.target; debug_assert!(target != BlockIdx::NULL); @@ -2914,15 +2965,17 @@ impl Blocks { target: &InstructionInfo, opcode: AnyInstruction, ) -> crate::InternalResult<bool> { - debug_assert!(is_jump(&self[block_idx].instructions[instr_idx])); - debug_assert!(is_jump(target)); + debug_assert!(self[block_idx].instructions[instr_idx].is_jump()); + debug_assert!(target.is_jump()); debug_assert_eq!(instr_idx + 1, self[block_idx].instruction_used); debug_assert!(target.target != BlockIdx::NULL); + if self[block_idx].instructions[instr_idx].target != target.target { - set_to_nop(&mut self[block_idx].instructions[instr_idx]); + self[block_idx].instructions[instr_idx].set_to_nop(); self.basicblock_add_jump(block_idx, opcode, target.target, target)?; return Ok(true); } + Ok(false) } @@ -2935,7 +2988,7 @@ impl Blocks { loc_source: &InstructionInfo, ) -> crate::InternalResult<()> { let last = self[block_idx].basicblock_last_instr(); - if last.is_some_and(is_jump) { + if last.is_some_and(|l| l.is_jump()) { return Err(InternalError::MalformedControlFlowGraph); } debug_assert!(target != BlockIdx::NULL); @@ -3117,12 +3170,12 @@ impl Blocks { let no_lineno_no_fallthrough = self[target].basicblock_has_no_lineno() && !self[target].bb_has_fallthrough(); if small_exit_block || no_lineno_no_fallthrough { - debug_assert!(is_jump(&last)); + debug_assert!(last.is_jump()); let removed_jump_opcode = last.instr; let last = self[block_idx] .basicblock_last_instr_mut() .expect("non-empty block has last instruction"); - set_to_nop(last); + last.set_to_nop(); self.basicblock_append_block_instructions(block_idx, target)?; if no_lineno_no_fallthrough { let last = self[block_idx].basicblock_last_instr_mut().unwrap(); @@ -3169,7 +3222,7 @@ impl Blocks { for src in 0..instr_count { let instr = self[block_idx].instructions[src]; - let lineno = instruction_lineno(&instr); + let lineno = instr.instruction_lineno(); if matches!(instr.instr.real(), Some(Instruction::Nop)) { if lineno < 0 { @@ -3179,13 +3232,12 @@ impl Blocks { continue; } if src < instr_count - 1 { - let next_lineno = instruction_lineno(&self[block_idx].instructions[src + 1]); + let next_lineno = self[block_idx].instructions[src + 1].instruction_lineno(); if next_lineno == lineno { continue; } if next_lineno < 0 { - instr_set_loc( - &mut self[block_idx].instructions[src + 1], + self[block_idx].instructions[src + 1].instr_set_loc( instr.location, instr.end_location, instr.lineno_override, @@ -3200,12 +3252,12 @@ impl Blocks { while next_i < self[next].instruction_used { let instr = self[next].instructions[next_i]; if matches!(instr.instr.real(), Some(Instruction::Nop)) - && instruction_lineno(&instr) < 0 + && instr.instruction_lineno() < 0 { next_i += 1; continue; } - next_loc = instruction_linetable_location(&instr); + next_loc = instr.instruction_linetable_location(); break; } if lineno == next_loc.line { @@ -3267,7 +3319,7 @@ impl Blocks { if jump_target == next { changes += 1; let last = self[current].basicblock_last_instr_mut().unwrap(); - set_to_nop(last); + last.set_to_nop(); } } current = self[current].next; @@ -3288,10 +3340,11 @@ impl Blocks { let jump_target = next_nonempty_block(self, last.target); if jump_target == next { assert!(next != BlockIdx::NULL); - if instruction_lineno(last) == instruction_lineno(&self[next].instructions[0]) { + if last.instruction_lineno() == self[next].instructions[0].instruction_lineno() + { assert_ne!( - instruction_lineno(last), - instruction_lineno(&self[next].instructions[0]), + last.instruction_lineno(), + self[next].instructions[0].instruction_lineno(), "redundant jump has same line as fallthrough target" ); return false; @@ -4206,16 +4259,12 @@ fn instr_make_load_const( instr: &mut InstructionInfo, constant: ConstantData, ) -> crate::InternalResult<()> { - if maybe_instr_make_load_smallint(instr, &constant) { + if instr.maybe_instr_make_load_smallint(&constant) { return Ok(()); } let const_idx = add_const(metadata, constant)?; - instr_set_op1( - instr, - Opcode::LoadConst.into(), - OpArg::new(const_idx as u32), - ); + instr.instr_set_op1(Opcode::LoadConst.into(), OpArg::new(const_idx as u32)); Ok(()) } @@ -4300,11 +4349,6 @@ fn fold_const_binop( Ok(true) } -/// flowgraph.c loads_const -fn loads_const(info: &InstructionInfo) -> bool { - info.instr.has_const() || matches!(info.instr.real_opcode(), Some(Opcode::LoadSmallInt)) -} - /// flowgraph.c get_const_value fn get_const_value(metadata: &CodeUnitMetadata, info: &InstructionInfo) -> Option<ConstantData> { match info.instr.real_opcode() { @@ -5076,13 +5120,13 @@ fn fold_constant_intrinsic_list_to_tuple( if matches!(block.instructions[idx].instr.real(), Some(Instruction::Nop)) { continue; } - if loads_const(&block.instructions[idx]) { + if block.instructions[idx].loads_const() { let Some(value) = get_const_value(metadata, &block.instructions[idx]) else { return Ok(false); }; elements.push(value); } - nop_out_no_location(&mut block.instructions[idx]); + block.instructions[idx].nop_out_no_location(); } debug_assert_eq!(elements.len(), consts_found); elements.reverse(); @@ -5101,7 +5145,7 @@ fn fold_constant_intrinsic_list_to_tuple( return Ok(false); } } else { - if !loads_const(instr) { + if !instr.loads_const() { return Ok(false); } consts_found += 1; @@ -5146,7 +5190,7 @@ fn optimize_lists_and_sets( }) else { if contains_or_iter && is_list { let arg = block.instructions[i].arg; - instr_set_op1(&mut block.instructions[i], Opcode::BuildTuple.into(), arg); + block.instructions[i].instr_set_op1(Opcode::BuildTuple.into(), arg); return Ok(true); } return Ok(false); @@ -5172,7 +5216,7 @@ fn optimize_lists_and_sets( if !contains_or_iter { debug_assert!(i >= 2); - let folded_loc = instr_location(&block.instructions[i]); + let folded_loc = block.instructions[i].instr_location(); block.nop_out(&operand_indices); @@ -5182,35 +5226,24 @@ fn optimize_lists_and_sets( Opcode::BuildSet } .into(); - instr_set_op1(&mut block.instructions[i - 2], build_instr, OpArg::new(0)); - instr_set_location(&mut block.instructions[i - 2], folded_loc); + block.instructions[i - 2].instr_set_op1(build_instr, OpArg::new(0)); + block.instructions[i - 2].instr_set_location(folded_loc); - instr_set_op1( - &mut block.instructions[i - 1], - Opcode::LoadConst.into(), - OpArg::new(const_idx as u32), - ); + block.instructions[i - 1] + .instr_set_op1(Opcode::LoadConst.into(), OpArg::new(const_idx as u32)); let extend_instr = if is_list { Opcode::ListExtend } else { Opcode::SetUpdate }; - instr_set_op1( - &mut block.instructions[i], - extend_instr.into(), - OpArg::new(1), - ); + block.instructions[i].instr_set_op1(extend_instr.into(), OpArg::new(1)); return Ok(true); } block.nop_out(&operand_indices); - instr_set_op1( - &mut block.instructions[i], - Opcode::LoadConst.into(), - OpArg::new(const_idx as u32), - ); + block.instructions[i].instr_set_op1(Opcode::LoadConst.into(), OpArg::new(const_idx as u32)); Ok(true) } @@ -5226,26 +5259,6 @@ fn is_swappable(instr: AnyInstruction) -> bool { ) } -/// flowgraph.c STORES_TO -fn stores_to(info: &InstructionInfo) -> i32 { - match info.instr.into() { - AnyOpcode::Real(Opcode::StoreFast) - | AnyOpcode::Pseudo(PseudoOpcode::StoreFastMaybeNull) => u32::from(info.arg) as i32, - _ => -1, - } -} - -/// flowgraph.c maybe_instr_make_load_smallint -fn maybe_instr_make_load_smallint(instr: &mut InstructionInfo, constant: &ConstantData) -> bool { - if let ConstantData::Integer { value } = constant - && let Some(small) = value.to_i32().filter(|v| (0..=255).contains(v)) - { - instr_set_op1(instr, Opcode::LoadSmallInt.into(), OpArg::new(small as u32)); - return true; - } - false -} - /// flowgraph.c basicblock_optimize_load_const fn basicblock_optimize_load_const( metadata: &mut CodeUnitMetadata, @@ -5260,7 +5273,7 @@ fn basicblock_optimize_load_const( Some(Instruction::LoadConst { .. }) ) && let Some(constant) = get_const_value(metadata, &block.instructions[i]) { - maybe_instr_make_load_smallint(&mut block.instructions[i], &constant); + block.instructions[i].maybe_instr_make_load_smallint(&constant); } let curr = block.instructions[i]; @@ -5302,12 +5315,12 @@ fn basicblock_optimize_load_const( }; if let Some((jump_if_true, pops_condition)) = const_jump { if pops_condition { - set_to_nop(&mut block.instructions[i]); + block.instructions[i].set_to_nop(); } if is_true == jump_if_true { block.instructions[i + 1].instr = PseudoOpcode::Jump.into(); } else { - set_to_nop(&mut block.instructions[i + 1]); + block.instructions[i + 1].set_to_nop(); } i += 1; continue; @@ -5335,7 +5348,7 @@ fn basicblock_optimize_load_const( block.instructions[jump_idx].instr.real(), Some(Instruction::ToBool) ) { - set_to_nop(&mut block.instructions[jump_idx]); + block.instructions[jump_idx].set_to_nop(); jump_idx += 1; if jump_idx >= block.instruction_used { i += 1; @@ -5363,8 +5376,8 @@ fn basicblock_optimize_load_const( } }; - set_to_nop(&mut block.instructions[i]); - set_to_nop(&mut block.instructions[i + 1]); + block.instructions[i].set_to_nop(); + block.instructions[i + 1].set_to_nop(); block.instructions[jump_idx].instr = if invert { Opcode::PopJumpIfNotNone } else { @@ -5383,12 +5396,10 @@ fn basicblock_optimize_load_const( && let Some(value) = load_const_truthiness(const_instr, const_arg, metadata) { let const_idx = add_const(metadata, ConstantData::Boolean { value })?; - set_to_nop(&mut block.instructions[i]); - instr_set_op1( - &mut block.instructions[i + 1], - Opcode::LoadConst.into(), - OpArg::new(const_idx as u32), - ); + block.instructions[i].set_to_nop(); + + block.instructions[i + 1] + .instr_set_op1(Opcode::LoadConst.into(), OpArg::new(const_idx as u32)); i += 1; continue; } @@ -5445,8 +5456,9 @@ impl CodeInfo { }, block_return, ); + for info in &block.instructions[..block.instruction_used] { - let lineno = instruction_lineno(info); + let lineno = info.instruction_lineno(); let _ = writeln!( out, " [disp={}:{} raw={}:{}-{}:{} override={:?}] {:?} arg={} target={}", @@ -5607,26 +5619,6 @@ impl InstrDisplayContext for CodeInfo { const NOT_LOCAL: isize = -1; const DUMMY_INSTR: isize = -1; -/// flowgraph.c make_super_instruction -fn make_super_instruction( - inst1: &mut InstructionInfo, - inst2: &mut InstructionInfo, - super_op: AnyInstruction, -) { - let line1 = instruction_lineno(inst1); - let line2 = instruction_lineno(inst2); - if line1 >= 0 && line2 >= 0 && line1 != line2 { - return; - } - let arg1 = u32::from(inst1.arg); - let arg2 = u32::from(inst2.arg); - if arg1 >= 16 || arg2 >= 16 { - return; - } - instr_set_op1(inst1, super_op, OpArg::new((arg1 << 4) | arg2)); - set_to_nop(inst2); -} - /// flowgraph.c LoadFastInstrFlag #[derive(Clone, Copy, Eq, PartialEq)] #[repr(u8)] @@ -6085,7 +6077,7 @@ fn assemble_exception_table( start = ioffset; handler = instr.except_handler; } - ioffset += instr_size(&instr.info) as i32; + ioffset += instr.info.instr_size() as i32; } if handler.h_label >= 0 { @@ -6448,7 +6440,7 @@ fn scan_block_for_locals( let last = blocks[idx].basicblock_last_instr().copied(); if let Some(last) = last - && is_jump(&last) + && last.is_jump() { let target = last.target; debug_assert!(target != BlockIdx::NULL); @@ -6546,33 +6538,12 @@ fn next_nonempty_block(blocks: &Blocks, mut idx: BlockIdx) -> BlockIdx { idx } -fn instruction_lineno(instr: &InstructionInfo) -> i32 { - match instr.lineno_override { - Some(LINE_ONLY_LOCATION_OVERRIDE) | None => instr.location.line.get() as i32, - Some(lineno) => lineno, - } -} - -fn instruction_is_no_location(instr: &InstructionInfo) -> bool { - instruction_lineno(instr) == NO_LOCATION_OVERRIDE -} - /// flowgraph.c add_checks_for_loads_of_uninitialized_variables uses uint64_t masks. const LOCAL_UNSAFE_MASK_BITS: usize = 64; /// flowgraph.c MAX_COPY_SIZE const MAX_COPY_SIZE: usize = 4; -/// flowgraph.c is_jump -fn is_jump(instr: &InstructionInfo) -> bool { - instr.instr.has_jump() -} - -/// flowgraph.c is_block_push -fn is_block_push(instr: &InstructionInfo) -> bool { - instr.instr.is_block_push() -} - /// flowgraph.c get_max_label fn get_max_label(blocks: &Blocks) -> i32 { let mut lbl = -1; @@ -6620,7 +6591,7 @@ fn push_except_block( setup: InstructionInfo, blocks: &mut Blocks, ) -> Option<ExceptHandlerInfo> { - debug_assert!(is_block_push(&setup)); + debug_assert!(setup.is_block_push()); let instr = setup.instr; let target = setup.target; debug_assert!(target != BlockIdx::NULL); @@ -6672,7 +6643,7 @@ pub(crate) fn label_exception_targets(blocks: &mut Blocks) -> crate::InternalRes let target = info.target; let arg = info.arg; - if is_block_push(&info) { + if info.is_block_push() { debug_assert!(target != BlockIdx::NULL); if !blocks[target].visited { blocks[target].except_stack = Some(copy_except_stack( @@ -6688,8 +6659,8 @@ pub(crate) fn label_exception_targets(blocks: &mut Blocks) -> crate::InternalRes ); } else if instr.is_pop_block() { handler = pop_except_block(stack.as_mut().expect("active exception stack"), blocks); - set_to_nop(&mut blocks[bi].instructions[i]); - } else if is_jump(&blocks[bi].instructions[i]) { + blocks[bi].instructions[i].set_to_nop(); + } else if blocks[bi].instructions[i].is_jump() { blocks[bi].instructions[i].except_handler = handler; debug_assert_eq!(i, instr_count - 1); @@ -6763,8 +6734,8 @@ pub(crate) fn convert_pseudo_ops(blocks: &mut Blocks) -> crate::InternalResult<( let block = &mut blocks[block_idx]; for i in 0..block.instruction_used { let info = &mut block.instructions[i]; - if is_block_push(info) { - set_to_nop(info); + if info.is_block_push() { + info.set_to_nop(); } else if matches!( info.instr.pseudo(), Some(PseudoInstruction::LoadClosure { .. }) @@ -7365,7 +7336,7 @@ mod tests { #[test] fn instr_set_op0_nop_preserves_cpython_stale_target() { let mut info = test_jump(BlockIdx::new(1), 50); - set_to_nop(&mut info); + info.set_to_nop(); assert_eq!(info.target, BlockIdx::new(1)); @@ -7679,9 +7650,9 @@ mod tests { blocks[duplicate].cpython_label, InstructionSequenceLabel::from_index(3) ); - assert_eq!(instruction_lineno(&blocks[duplicate].instructions[0]), 10); + assert_eq!(blocks[duplicate].instructions[0].instruction_lineno(), 10); assert_eq!(blocks[1].instructions[0].target, exit); - assert_eq!(instruction_lineno(&blocks[exit].instructions[0]), 20); + assert_eq!(blocks[exit].instructions[0].instruction_lineno(), 20); } #[test] @@ -7732,7 +7703,7 @@ mod tests { // for jump targets without checking `b_iused`. If // `remove_redundant_nops()` emptied the target, that writes the stale // backing slot rather than an active instruction. - assert_eq!(instruction_lineno(&blocks[1].instructions[0]), 10); + assert_eq!(blocks[1].instructions[0].instruction_lineno(), 10); } #[test] From c8936f5a6d85d38ff8df97fa6d82ad141768688a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jul 2026 14:12:11 +0900 Subject: [PATCH 183/339] Bump cmov from 0.5.3 to 0.5.4 (#8210) Bumps [cmov](https://github.com/RustCrypto/utils) from 0.5.3 to 0.5.4. - [Commits](https://github.com/RustCrypto/utils/compare/cmov-v0.5.3...cmov-v0.5.4) --- updated-dependencies: - dependency-name: cmov dependency-version: 0.5.4 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index eb0f64095..8300eef59 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -599,9 +599,9 @@ dependencies = [ [[package]] name = "cmov" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f88a43d011fc4a6876cb7344703e297c71dda42494fee094d5f7c76bf13f746" +checksum = "0c9ea0ac24bc397ab3c98583a3c9ba74fa56b09a4449bbe172b9b1ddb016027a" [[package]] name = "collection_literals" From 80e384e851f4836139c9a36ef5f882ae0ae58312 Mon Sep 17 00:00:00 2001 From: Bas Schoenmaeckers <7943856+bschoenmaeckers@users.noreply.github.com> Date: Mon, 6 Jul 2026 07:12:52 +0200 Subject: [PATCH 184/339] Add more abstract functions to c-api (#8202) --- crates/capi/src/abstract_.rs | 89 +++++++++++++++++++++++++++++++++++- 1 file changed, 88 insertions(+), 1 deletion(-) diff --git a/crates/capi/src/abstract_.rs b/crates/capi/src/abstract_.rs index cd390135b..36d949a30 100644 --- a/crates/capi/src/abstract_.rs +++ b/crates/capi/src/abstract_.rs @@ -1,6 +1,6 @@ use crate::{PyObject, pystate::with_vm}; use alloc::slice; -use core::ffi::c_int; +use core::ffi::{CStr, c_char, c_int}; pub use iter::*; pub use mapping::*; pub use number::*; @@ -57,6 +57,21 @@ pub unsafe extern "C" fn PyObject_CallNoArgs(callable: *mut PyObject) -> *mut Py with_vm(|vm| unsafe { &*callable }.call((), vm)) } +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyObject_CallObject( + callable: *mut PyObject, + args: *mut PyObject, +) -> *mut PyObject { + with_vm(|vm| { + let callable = unsafe { &*callable }; + if let Some(args) = unsafe { args.as_ref() } { + callable.call(tuple_to_args(args.try_downcast_ref::<PyTuple>(vm)?), vm) + } else { + callable.call((), vm) + } + }) +} + #[unsafe(no_mangle)] pub unsafe extern "C" fn PyObject_Vectorcall( callable: *mut PyObject, @@ -121,6 +136,42 @@ pub unsafe extern "C" fn PyObject_VectorcallMethod( }) } +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyVectorcall_Call( + callable: *mut PyObject, + tuple: *mut PyObject, + kwargs: *mut PyObject, +) -> *mut PyObject { + with_vm(|vm| { + let callable = unsafe { &*callable }; + let tuple = unsafe { &*tuple }.try_downcast_ref::<PyTuple>(vm)?; + + let mut args = tuple.iter().cloned().collect::<Vec<_>>(); + let num_positional_args = args.len(); + + let mut kwnames = Vec::new(); + if let Some(kwargs) = unsafe { kwargs.as_ref() } { + let kwargs = kwargs.try_downcast_ref::<PyDict>(vm)?; + for (key, value) in kwargs.items_vec() { + let key = key + .downcast_ref::<PyStr>() + .map(ToOwned::to_owned) + .ok_or_else(|| vm.new_type_error("keywords must be strings"))?; + kwnames.push(key.into()); + args.push(value); + } + } + + let kwnames = if kwnames.is_empty() { + None + } else { + Some(kwnames.as_slice()) + }; + + callable.vectorcall(args, num_positional_args, kwnames, vm) + }) +} + #[unsafe(no_mangle)] pub unsafe extern "C" fn PyObject_GetItem(obj: *mut PyObject, key: *mut PyObject) -> *mut PyObject { with_vm(|vm| { @@ -153,6 +204,32 @@ pub unsafe extern "C" fn PyObject_DelItem(obj: *mut PyObject, key: *mut PyObject }) } +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyObject_DelItemString(obj: *mut PyObject, key: *const c_char) -> c_int { + with_vm(|vm| { + let obj = unsafe { &*obj }; + let key = unsafe { CStr::from_ptr(key) } + .to_str() + .map_err(|_| vm.new_value_error("mapping key must be valid UTF-8"))?; + obj.del_item(key, vm) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyObject_Format( + obj: *mut PyObject, + format_spec: *mut PyObject, +) -> *mut PyObject { + with_vm(|vm| { + let obj = unsafe { &*obj }; + let spec = unsafe { format_spec.as_ref() } + .map(|spec| spec.try_downcast_ref::<PyStr>(vm)) + .transpose()? + .unwrap_or_else(|| vm.ctx.empty_str); + vm.format(obj, spec.to_owned()) + }) +} + #[unsafe(no_mangle)] pub unsafe extern "C" fn PyObject_IsSubclass(derived: *mut PyObject, cls: *mut PyObject) -> c_int { with_vm(|vm| { @@ -179,6 +256,16 @@ pub unsafe extern "C" fn PyObject_Size(obj: *mut PyObject) -> isize { }) } +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyObject_Length(obj: *mut PyObject) -> isize { + unsafe { PyObject_Size(obj) } +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyObject_Type(obj: *mut PyObject) -> *mut PyObject { + with_vm(|_vm| unsafe { &*obj }.obj_type()) +} + #[cfg(test)] mod tests { use pyo3::prelude::*; From c6907f3228ca198e9db0716624e2ec3e4c6c0631 Mon Sep 17 00:00:00 2001 From: "Jeong, YunWon" <69878+youknowone@users.noreply.github.com> Date: Mon, 6 Jul 2026 23:05:56 +0900 Subject: [PATCH 185/339] Move tuple/frozenset hash algorithms into common::hash (#8213) * Move tuple/frozenset hash algorithms into common::hash Move the pure tuplehash fold (xxHash-based) into `hash::hash_tuple`, taking a fallible iterator of element hashes, and the frozenset XOR-fold into a `hash::FrozenSetHash` streaming accumulator. `builtins::tuple` and `builtins::set` keep only the element-hash loop and delegate the arithmetic. Assisted-by: Claude * common/hash: rename acc_pyhash to acc_py_hash Drop the now-unused `// cspell:ignore pyhash` from tuple.rs left behind by the tuple hash move; the only remaining occurrence was the acc_pyhash local. Renaming it lets cspell pass without an ignore. Assisted-by: Claude --- crates/common/src/hash.rs | 98 +++++++++++++++++++++++++++++++++ crates/vm/src/builtins/set.rs | 30 +++------- crates/vm/src/builtins/tuple.rs | 51 +---------------- 3 files changed, 108 insertions(+), 71 deletions(-) diff --git a/crates/common/src/hash.rs b/crates/common/src/hash.rs index 91fd5e1cb..56e6e0006 100644 --- a/crates/common/src/hash.rs +++ b/crates/common/src/hash.rs @@ -198,3 +198,101 @@ pub fn keyed_hash(key: u64, buf: &[u8]) -> u64 { buf.hash(&mut hasher); hasher.finish() } + +/// tuplehash: fold the element hashes of a tuple (xxHash-based). +/// +/// The caller supplies each element's hash lazily; a hash computation may fail, +/// in which case the error short-circuits the fold. +pub fn hash_tuple<E>( + element_hashes: impl IntoIterator<Item = Result<PyHash, E>>, +) -> Result<PyHash, E> { + const PRIME1: PyUHash = cfg_select! { + target_pointer_width = "64" => 11400714785074694791, + target_pointer_width = "32" => 2654435761, + _ => unreachable!(), + }; + + const PRIME2: PyUHash = cfg_select! { + target_pointer_width = "64" => 14029467366897019727, + target_pointer_width = "32" => 2246822519, + _ => unreachable!(), + }; + + const PRIME5: PyUHash = cfg_select! { + target_pointer_width = "64" => 2870177450012600261, + target_pointer_width = "32" => 374761393, + _ => unreachable!(), + }; + + const ROTATE: u32 = cfg_select! { + target_pointer_width = "64" => 31, + target_pointer_width = "32" => 13, + _ => unreachable!(), + }; + + let mut acc = PRIME5; + let mut len: PyUHash = 0; + + for element_hash in element_hashes { + let lane = element_hash? as PyUHash; + acc = acc.wrapping_add(lane.wrapping_mul(PRIME2)); + acc = acc.rotate_left(ROTATE); + acc = acc.wrapping_mul(PRIME1); + len += 1; + } + + acc = acc.wrapping_add(len ^ (PRIME5 ^ 3527539)); + + let acc_py_hash = acc as PyHash; + if acc_py_hash == -1 { + return Ok(1546275796); + } + + Ok(acc_py_hash) +} + +/// frozenset_hash: order-independent XOR-fold of a frozenset's element hashes. +/// +/// The entry hashes are fed in one at a time via [`FrozenSetHash::add`], so the +/// caller keeps ownership of the iteration (which may hold a lock and compute +/// each element hash fallibly). The fold is commutative, so element order does +/// not affect the result. +pub struct FrozenSetHash { + hash: u64, +} + +impl FrozenSetHash { + #[must_use] + pub fn new(len: usize) -> Self { + // Factor in the number of active entries + Self { + hash: (len as u64 + 1).wrapping_mul(1927868237), + } + } + + pub fn add(&mut self, element_hash: PyHash) { + // Work to increase the bit dispersion for closely spaced hash values. + // This is important because some use cases have many combinations of a + // small number of elements with nearby hashes so that many distinct + // combinations collapse to only a handful of distinct hash values. + const fn shuffle_bits(h: u64) -> u64 { + ((h ^ 89869747) ^ (h.wrapping_shl(16))).wrapping_mul(3644798167) + } + // Xor-in shuffled bits from every entry's hash field because xor is + // commutative and a frozenset hash should be independent of order. + self.hash ^= shuffle_bits(element_hash as u64); + } + + #[must_use] + pub fn finish(self) -> PyHash { + let mut hash = self.hash; + // Disperse patterns arising in nested frozen-sets + hash ^= (hash >> 11) ^ (hash >> 25); + hash = hash.wrapping_mul(69069).wrapping_add(907133923); + // -1 is reserved as an error code + if hash == u64::MAX { + hash = 590923713; + } + hash as PyHash + } +} diff --git a/crates/vm/src/builtins/set.rs b/crates/vm/src/builtins/set.rs index 8b38223fc..44dc9a221 100644 --- a/crates/vm/src/builtins/set.rs +++ b/crates/vm/src/builtins/set.rs @@ -442,28 +442,14 @@ impl PySetInner { } fn hash(&self, vm: &VirtualMachine) -> PyResult<PyHash> { - // Work to increase the bit dispersion for closely spaced hash values. - // This is important because some use cases have many combinations of a - // small number of elements with nearby hashes so that many distinct - // combinations collapse to only a handful of distinct hash values. - const fn _shuffle_bits(h: u64) -> u64 { - ((h ^ 89869747) ^ (h.wrapping_shl(16))).wrapping_mul(3644798167) - } - // Factor in the number of active entries - let mut hash: u64 = (self.len() as u64 + 1).wrapping_mul(1927868237); - // Xor-in shuffled bits from every entry's hash field because xor is - // commutative and a frozenset hash should be independent of order. - hash = self.content.try_fold_keys(hash, |h, element| { - Ok(h ^ _shuffle_bits(element.hash(vm)? as u64)) - })?; - // Disperse patterns arising in nested frozen-sets - hash ^= (hash >> 11) ^ (hash >> 25); - hash = hash.wrapping_mul(69069).wrapping_add(907133923); - // -1 is reserved as an error code - if hash == u64::MAX { - hash = 590923713; - } - Ok(hash as PyHash) + let hasher = self.content.try_fold_keys( + hash::FrozenSetHash::new(self.len()), + |mut hasher, element| { + hasher.add(element.hash(vm)?); + Ok(hasher) + }, + )?; + Ok(hasher.finish()) } // Run operation, on failure, if item is a set/set subclass, convert it diff --git a/crates/vm/src/builtins/tuple.rs b/crates/vm/src/builtins/tuple.rs index 4606509fd..7ed815ce2 100644 --- a/crates/vm/src/builtins/tuple.rs +++ b/crates/vm/src/builtins/tuple.rs @@ -1,14 +1,8 @@ -// cspell:ignore pyhash - use super::{ PositionIterInternal, PyGenericAlias, PyStrRef, PyType, PyTypeRef, iter::builtins_iter, }; use crate::common::lock::LazyLock; -use crate::common::{ - hash::{PyHash, PyUHash}, - lock::PyMutex, - wtf8::wtf8_concat, -}; +use crate::common::{hash, hash::PyHash, lock::PyMutex, wtf8::wtf8_concat}; use crate::object::{Traverse, TraverseFn}; use crate::{ AsObject, Context, Py, PyObject, PyObjectRef, PyPayload, PyRef, PyResult, TryFromObject, @@ -727,46 +721,5 @@ pub(crate) fn init(context: &'static Context) { } pub(super) fn tuple_hash(elements: &[PyObjectRef], vm: &VirtualMachine) -> PyResult<PyHash> { - const PRIME1: PyUHash = cfg_select! { - target_pointer_width = "64" => 11400714785074694791, - target_pointer_width = "32" => 2654435761, - _ => unreachable!(), - }; - - const PRIME2: PyUHash = cfg_select! { - target_pointer_width = "64" => 14029467366897019727, - target_pointer_width = "32" => 2246822519, - _ => unreachable!(), - }; - - const PRIME5: PyUHash = cfg_select! { - target_pointer_width = "64" => 2870177450012600261, - target_pointer_width = "32" => 374761393, - _ => unreachable!(), - }; - - const ROTATE: u32 = cfg_select! { - target_pointer_width = "64" => 31, - target_pointer_width = "32" => 13, - _ => unreachable!(), - }; - - let mut acc = PRIME5; - let len = elements.len() as PyUHash; - - for val in elements { - let lane = val.hash(vm)? as PyUHash; - acc = acc.wrapping_add(lane.wrapping_mul(PRIME2)); - acc = acc.rotate_left(ROTATE); - acc = acc.wrapping_mul(PRIME1); - } - - acc = acc.wrapping_add(len ^ (PRIME5 ^ 3527539)); - - let acc_pyhash = acc as PyHash; - if acc_pyhash == -1 { - return Ok(1546275796); - } - - Ok(acc_pyhash) + hash::hash_tuple(elements.iter().map(|val| val.hash(vm))) } From 0664e38e5b61ab4170cab552d7789669fb10c3a0 Mon Sep 17 00:00:00 2001 From: Shahar Naveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Mon, 6 Jul 2026 17:52:33 +0300 Subject: [PATCH 186/339] Set python args to be like CPython in CI (#8181) * Set python args to be like CPython in CI (ish) * Use `--slow-ci` * `--dont-add-python-opts` * unmark passing test --- .github/workflows/ci.yaml | 13 ++++++++++--- Lib/test/test_future_stmt/test_future.py | 1 - 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7ac163e83..3bcd44a5f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -34,6 +34,7 @@ env: CARGO_PROFILE_RELEASE_DEBUG: 0 CARGO_TERM_COLOR: always CI: true + FORCE_COLOR: 1 jobs: determine_changes: @@ -294,6 +295,8 @@ jobs: - os: macos-latest extra_test_args: - '-u all' + - '--timeout 600' + - '--dont-add-python-opts' env_polluting_tests: - test_set skips: [] @@ -301,6 +304,8 @@ jobs: - os: ubuntu-latest extra_test_args: - '-u all' + - '--timeout 600' + - '--dont-add-python-opts' env_polluting_tests: - test_set skips: [] @@ -308,6 +313,8 @@ jobs: - os: windows-2025 extra_test_args: - '-u all' + - '--timeout 600' + - '--dont-add-python-opts' env_polluting_tests: - test_set skips: [] @@ -360,7 +367,7 @@ jobs: - name: Run CPython tests run: | - target/release/rustpython -m test -j ${{ steps.cores.outputs.cores }} ${{ join(matrix.extra_test_args, ' ') }} --slowest --fail-env-changed --timeout 600 -v -x ${{ env.FLAKY_MP_TESTS }} ${{ join(matrix.skips, ' ') }} + target/release/rustpython -u -m test --slow-ci -j ${{ steps.cores.outputs.cores }} ${{ join(matrix.extra_test_args, ' ') }} -x ${{ env.FLAKY_MP_TESTS }} ${{ join(matrix.skips, ' ') }} timeout-minutes: ${{ matrix.timeout }} env: RUSTPYTHON_SKIP_ENV_POLLUTERS: true @@ -371,7 +378,7 @@ jobs: echo "::group::Attempt ${attempt}" set +e - target/release/rustpython -m test -j 1 ${{ join(matrix.extra_test_args, ' ') }} --slowest --fail-env-changed --timeout 600 -v ${{ env.FLAKY_MP_TESTS }} + target/release/rustpython -u -m test --slow-ci -j 1 ${{ join(matrix.extra_test_args, ' ') }} ${{ env.FLAKY_MP_TESTS }} status=$? set -e @@ -396,7 +403,7 @@ jobs: for thing in "${target_array[@]}"; do for i in $(seq 1 10); do set +e - target/release/rustpython -m test -j 1 --slowest --fail-env-changed --timeout 600 -v "${thing}" + target/release/rustpython -u -m test --slow-ci -u all -j 1 --timeout 600 --dont-add-python-opts "${thing}" exit_code=$? set -e if [ "${exit_code}" -eq 3 ]; then diff --git a/Lib/test/test_future_stmt/test_future.py b/Lib/test/test_future_stmt/test_future.py index 8d2050a39..02690919c 100644 --- a/Lib/test/test_future_stmt/test_future.py +++ b/Lib/test/test_future_stmt/test_future.py @@ -177,7 +177,6 @@ class FutureTest(unittest.TestCase): exec("from __future__ import unicode_literals; x = ''", {}, scope) self.assertIsInstance(scope["x"], str) - @unittest.expectedFailure # TODO: RUSTPYTHON; barry_as_FLUFL (<> operator) not supported def test_syntactical_future_repl(self): p = spawn_python('-i') p.stdin.write(b"from __future__ import barry_as_FLUFL\n") From 4477758e4aa6324ce9554240e8dde42c82ac35e5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jul 2026 23:56:47 +0900 Subject: [PATCH 187/339] Bump j178/prek-action from 2.0.4 to 2.0.5 (#8217) Bumps [j178/prek-action](https://github.com/j178/prek-action) from 2.0.4 to 2.0.5. - [Release notes](https://github.com/j178/prek-action/releases) - [Commits](https://github.com/j178/prek-action/compare/bdca6f102f98e2b4c7029491a53dfd366469e33d...e98a699c41eb69ab013a45817a0406469a748f8d) --- updated-dependencies: - dependency-name: j178/prek-action dependency-version: 2.0.5 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3bcd44a5f..7dbe28dbf 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -551,7 +551,7 @@ jobs: - name: install prek id: prek - uses: j178/prek-action@bdca6f102f98e2b4c7029491a53dfd366469e33d # v2.0.4 + uses: j178/prek-action@e98a699c41eb69ab013a45817a0406469a748f8d # v2.0.5 with: cache: false show-verbose-logs: false From 1e0f95ab3c7323856106c28e8bad038a722b4418 Mon Sep 17 00:00:00 2001 From: Bas Schoenmaeckers <7943856+bschoenmaeckers@users.noreply.github.com> Date: Mon, 6 Jul 2026 17:03:43 +0200 Subject: [PATCH 188/339] Add pyframe functions to c-api (#8215) --- .cspell.dict/cpython.txt | 1 + crates/capi/src/lib.rs | 1 + crates/capi/src/pyframe.rs | 19 +++++++++++++++++++ 3 files changed, 21 insertions(+) create mode 100644 crates/capi/src/pyframe.rs diff --git a/.cspell.dict/cpython.txt b/.cspell.dict/cpython.txt index 47ec7dd60..64a2e7479 100644 --- a/.cspell.dict/cpython.txt +++ b/.cspell.dict/cpython.txt @@ -191,6 +191,7 @@ pycore pyinner pydecimal pyerrors +pyframe Pyfunc pylifecycle pymain diff --git a/crates/capi/src/lib.rs b/crates/capi/src/lib.rs index eba7de278..156326489 100644 --- a/crates/capi/src/lib.rs +++ b/crates/capi/src/lib.rs @@ -28,6 +28,7 @@ pub mod object; pub mod osmodule; pub mod pycapsule; pub mod pyerrors; +pub mod pyframe; pub mod pylifecycle; pub mod pymem; pub mod pystate; diff --git a/crates/capi/src/pyframe.rs b/crates/capi/src/pyframe.rs new file mode 100644 index 000000000..d8e9d124b --- /dev/null +++ b/crates/capi/src/pyframe.rs @@ -0,0 +1,19 @@ +use crate::PyObject; +use crate::pystate::with_vm; +use rustpython_vm::frame::Frame; + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyFrame_GetCode(frame: *mut PyObject) -> *mut PyObject { + with_vm(|vm| { + let frame = unsafe { &*frame }.try_downcast_ref::<Frame>(vm)?; + Ok(frame.f_code()) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyFrame_GetLineNumber(frame: *mut PyObject) -> core::ffi::c_int { + with_vm(|vm| { + let frame = unsafe { &*frame }.try_downcast_ref::<Frame>(vm)?; + Ok(frame.f_lineno() as core::ffi::c_int) + }) +} From e0f692c18177fb45061e6f777d8bd68b14d1fe6f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Jul 2026 00:04:23 +0900 Subject: [PATCH 189/339] Bump https://github.com/rbubley/mirrors-prettier from v3.8.4 to 3.9.1 (#8218) Bumps [https://github.com/rbubley/mirrors-prettier](https://github.com/rbubley/mirrors-prettier) from v3.8.4 to 3.9.1. - [Commits](https://github.com/rbubley/mirrors-prettier/compare/v3.8.4...v3.9.1) --- updated-dependencies: - dependency-name: https://github.com/rbubley/mirrors-prettier dependency-version: 3.9.1 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 52245bb33..f3c9a882c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -77,7 +77,7 @@ repos: priority: 0 - repo: https://github.com/rbubley/mirrors-prettier - rev: v3.8.4 + rev: v3.9.1 hooks: - id: prettier files: '^wasm/.*$' From 14d4ece9f7d2bcd093929e84f3d983f5eeb099ca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Jul 2026 00:04:32 +0900 Subject: [PATCH 190/339] Bump https://github.com/astral-sh/ruff-pre-commit (#8219) Bumps [https://github.com/astral-sh/ruff-pre-commit](https://github.com/astral-sh/ruff-pre-commit) from v0.15.18 to 0.15.20. - [Release notes](https://github.com/astral-sh/ruff-pre-commit/releases) - [Commits](https://github.com/astral-sh/ruff-pre-commit/compare/v0.15.18...v0.15.20) --- updated-dependencies: - dependency-name: https://github.com/astral-sh/ruff-pre-commit dependency-version: 0.15.20 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f3c9a882c..a3cfaac09 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -10,7 +10,7 @@ repos: priority: 0 - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.15.18 + rev: v0.15.20 hooks: - id: ruff-format priority: 0 From abed0aab5a4c53a550f90a0a9731494f768507e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Jul 2026 00:04:41 +0900 Subject: [PATCH 191/339] Bump github/gh-aw/actions/setup from 0.80.9 to 0.81.6 (#8220) Bumps [github/gh-aw/actions/setup](https://github.com/github/gh-aw) from 0.80.9 to 0.81.6. - [Release notes](https://github.com/github/gh-aw/releases) - [Changelog](https://github.com/github/gh-aw/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/gh-aw/compare/a3624368c4e7d877586ff2784b61de73405e2cdd...eed4304d8740f0593f2797276cb8299d228ffd9b) --- updated-dependencies: - dependency-name: github/gh-aw/actions/setup dependency-version: 0.81.6 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/upgrade-pylib.lock.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/upgrade-pylib.lock.yml b/.github/workflows/upgrade-pylib.lock.yml index 318657d52..f9176f869 100644 --- a/.github/workflows/upgrade-pylib.lock.yml +++ b/.github/workflows/upgrade-pylib.lock.yml @@ -58,7 +58,7 @@ jobs: comment_repo: "" steps: - name: Setup Scripts - uses: github/gh-aw/actions/setup@a3624368c4e7d877586ff2784b61de73405e2cdd # v0.80.9 + uses: github/gh-aw/actions/setup@eed4304d8740f0593f2797276cb8299d228ffd9b # v0.81.6 with: destination: /opt/gh-aw/actions - name: Check workflow file timestamps @@ -99,7 +99,7 @@ jobs: secret_verification_result: ${{ steps.validate-secret.outputs.verification_result }} steps: - name: Setup Scripts - uses: github/gh-aw/actions/setup@a3624368c4e7d877586ff2784b61de73405e2cdd # v0.80.9 + uses: github/gh-aw/actions/setup@eed4304d8740f0593f2797276cb8299d228ffd9b # v0.81.6 with: destination: /opt/gh-aw/actions - name: Checkout repository @@ -806,7 +806,7 @@ jobs: total_count: ${{ steps.missing_tool.outputs.total_count }} steps: - name: Setup Scripts - uses: github/gh-aw/actions/setup@a3624368c4e7d877586ff2784b61de73405e2cdd # v0.80.9 + uses: github/gh-aw/actions/setup@eed4304d8740f0593f2797276cb8299d228ffd9b # v0.81.6 with: destination: /opt/gh-aw/actions - name: Download agent output artifact @@ -927,7 +927,7 @@ jobs: success: ${{ steps.parse_results.outputs.success }} steps: - name: Setup Scripts - uses: github/gh-aw/actions/setup@a3624368c4e7d877586ff2784b61de73405e2cdd # v0.80.9 + uses: github/gh-aw/actions/setup@eed4304d8740f0593f2797276cb8299d228ffd9b # v0.81.6 with: destination: /opt/gh-aw/actions - name: Download agent artifacts @@ -1039,7 +1039,7 @@ jobs: process_safe_outputs_temporary_id_map: ${{ steps.process_safe_outputs.outputs.temporary_id_map }} steps: - name: Setup Scripts - uses: github/gh-aw/actions/setup@a3624368c4e7d877586ff2784b61de73405e2cdd # v0.80.9 + uses: github/gh-aw/actions/setup@eed4304d8740f0593f2797276cb8299d228ffd9b # v0.81.6 with: destination: /opt/gh-aw/actions - name: Download agent output artifact From 538bb4f7b0dc62b6d26d12ba7ba6697fbc589ec6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Jul 2026 00:05:26 +0900 Subject: [PATCH 192/339] Bump taiki-e/install-action from 2.81.11 to 2.82.6 (#8222) Bumps [taiki-e/install-action](https://github.com/taiki-e/install-action) from 2.81.11 to 2.82.6. - [Release notes](https://github.com/taiki-e/install-action/releases) - [Changelog](https://github.com/taiki-e/install-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/taiki-e/install-action/compare/15449e3094499af05d8d964a1c884208e4b8b595...9bcaee1dcae34154180f412e2fa69355a7cda9f6) --- updated-dependencies: - dependency-name: taiki-e/install-action dependency-version: 2.82.6 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/cron-ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cron-ci.yaml b/.github/workflows/cron-ci.yaml index a3b91fde4..ec86ec95a 100644 --- a/.github/workflows/cron-ci.yaml +++ b/.github/workflows/cron-ci.yaml @@ -33,7 +33,7 @@ jobs: - uses: dtolnay/rust-toolchain@stable - - uses: taiki-e/install-action@15449e3094499af05d8d964a1c884208e4b8b595 # v2.81.11 + - uses: taiki-e/install-action@9bcaee1dcae34154180f412e2fa69355a7cda9f6 # v2.82.6 with: tool: cargo-llvm-cov From ac678656fcb374684e489b35876db0ba39d9ca64 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Jul 2026 00:06:08 +0900 Subject: [PATCH 193/339] Bump itertools from 0.14.0 to 0.15.0 (#8226) Bumps [itertools](https://github.com/rust-itertools/itertools) from 0.14.0 to 0.15.0. - [Changelog](https://github.com/rust-itertools/itertools/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-itertools/itertools/compare/v0.14.0...v0.15.0) --- updated-dependencies: - dependency-name: itertools dependency-version: 0.15.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 25 +++++++++++++++++-------- Cargo.toml | 2 +- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8300eef59..bab008f86 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1790,6 +1790,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b4baf93f58d4425749ca49a51c50ebab072c5df6994d08fed93541c331481dc" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.18" @@ -3276,7 +3285,7 @@ name = "rustpython-capi" version = "0.5.0" dependencies = [ "bitflags 2.13.0", - "itertools 0.14.0", + "itertools 0.15.0", "libc", "malachite-bigint", "num-complex", @@ -3292,7 +3301,7 @@ version = "0.5.0" dependencies = [ "bitflags 2.13.0", "indexmap", - "itertools 0.14.0", + "itertools 0.15.0", "log", "malachite-bigint", "memchr", @@ -3316,7 +3325,7 @@ dependencies = [ "ascii", "bitflags 2.13.0", "getrandom 0.4.3", - "itertools 0.14.0", + "itertools 0.15.0", "libc", "lock_api", "malachite-base", @@ -3351,7 +3360,7 @@ version = "0.5.0" dependencies = [ "bitflags 2.13.0", "bitflagset", - "itertools 0.14.0", + "itertools 0.15.0", "lz4_flex", "malachite-bigint", "num-complex", @@ -3381,7 +3390,7 @@ dependencies = [ name = "rustpython-derive-impl" version = "0.5.0" dependencies = [ - "itertools 0.14.0", + "itertools 0.15.0", "proc-macro2", "quote", "rustpython-compiler-core", @@ -3566,7 +3575,7 @@ dependencies = [ "icu_properties", "indexmap", "insta", - "itertools 0.14.0", + "itertools 0.15.0", "libc", "libsqlite3-sys", "libz-rs-sys", @@ -3648,7 +3657,7 @@ dependencies = [ "icu_properties", "indexmap", "is-macro", - "itertools 0.14.0", + "itertools 0.15.0", "libc", "log", "malachite-bigint", @@ -3696,7 +3705,7 @@ version = "0.5.0" dependencies = [ "ascii", "bstr", - "itertools 0.14.0", + "itertools 0.15.0", "memchr", ] diff --git a/Cargo.toml b/Cargo.toml index a661dfbd6..fb023e03e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -227,7 +227,7 @@ hexf-parse = "0.2.1" hmac = "0.13" indexmap = { version = "2.14.0", features = ["std"] } insta = "1.47" -itertools = "0.14.0" +itertools = "0.15.0" is-macro = "0.3.7" js-sys = "0.3" junction = "2.0.0" From 838180f2b5ab0547c260b5575fe7873300028b74 Mon Sep 17 00:00:00 2001 From: "Jeong, YunWon" <69878+youknowone@users.noreply.github.com> Date: Tue, 7 Jul 2026 00:29:31 +0900 Subject: [PATCH 194/339] Re-export mmap libc constants through host_env (#8214) * Re-export mmap libc constants through host_env Move direct libc MADV_*, MAP_*, PROT_*, EOVERFLOW references in stdlib::mmap to host_env::mmap re-exports. Replace libc::c_int with core::ffi::c_int. * host_env/mmap: gate EOVERFLOW re-export on cfg(windows) Its only consumer is the cfg(windows) named-mapping overflow check in stdlib::mmap; the re-export was gated cfg(unix), so it was configured out on Windows and the reference failed to resolve. Assisted-by: Claude --- crates/host_env/src/mmap.rs | 57 +++++++++++++++++++++++++++++++++++++ crates/stdlib/src/mmap.rs | 38 ++++++++++++++----------- 2 files changed, 78 insertions(+), 17 deletions(-) diff --git a/crates/host_env/src/mmap.rs b/crates/host_env/src/mmap.rs index 62dc50f1c..ce5575061 100644 --- a/crates/host_env/src/mmap.rs +++ b/crates/host_env/src/mmap.rs @@ -5,6 +5,63 @@ use std::io; +#[cfg(unix)] +pub use libc::{ + MADV_DONTNEED, MADV_NORMAL, MADV_RANDOM, MADV_SEQUENTIAL, MADV_WILLNEED, MAP_ANON, + MAP_ANONYMOUS, MAP_PRIVATE, MAP_SHARED, PROT_EXEC, PROT_READ, PROT_WRITE, +}; + +#[cfg(target_os = "macos")] +pub use libc::{MADV_FREE_REUSABLE, MADV_FREE_REUSE}; + +#[cfg(any( + target_os = "android", + target_os = "dragonfly", + target_os = "fuchsia", + target_os = "freebsd", + target_os = "linux", + target_os = "netbsd", + target_os = "openbsd", + target_vendor = "apple" +))] +pub use libc::MADV_FREE; + +#[cfg(target_os = "linux")] +pub use libc::{ + MADV_DODUMP, MADV_DOFORK, MADV_DONTDUMP, MADV_DONTFORK, MADV_HUGEPAGE, MADV_HWPOISON, + MADV_MERGEABLE, MADV_NOHUGEPAGE, MADV_REMOVE, MADV_UNMERGEABLE, +}; + +#[cfg(any( + target_os = "android", + all( + target_os = "linux", + any( + target_arch = "aarch64", + target_arch = "arm", + target_arch = "powerpc", + target_arch = "powerpc64", + target_arch = "s390x", + target_arch = "x86", + target_arch = "x86_64", + target_arch = "sparc64" + ) + ) +))] +pub use libc::MADV_SOFT_OFFLINE; + +#[cfg(all(target_os = "linux", target_arch = "x86_64", target_env = "gnu"))] +pub use libc::{MAP_DENYWRITE, MAP_EXECUTABLE, MAP_POPULATE}; + +#[cfg(any(target_os = "linux", target_os = "openbsd", target_os = "netbsd"))] +pub use libc::MAP_STACK; + +#[cfg(target_os = "freebsd")] +pub use libc::{MADV_AUTOSYNC, MADV_CORE, MADV_NOCORE, MADV_NOSYNC, MADV_PROTECT}; + +#[cfg(windows)] +pub use libc::EOVERFLOW; + #[cfg(windows)] use crate::windows::{CheckWin32Bool, HandleToOwned}; #[cfg(unix)] diff --git a/crates/stdlib/src/mmap.rs b/crates/stdlib/src/mmap.rs index 2332ee0e1..dac24b053 100644 --- a/crates/stdlib/src/mmap.rs +++ b/crates/stdlib/src/mmap.rs @@ -60,14 +60,14 @@ mod mmap { #[cfg(unix)] #[pyattr] - use libc::{ + use host_mmap::{ MADV_DONTNEED, MADV_NORMAL, MADV_RANDOM, MADV_SEQUENTIAL, MADV_WILLNEED, MAP_ANON, MAP_ANONYMOUS, MAP_PRIVATE, MAP_SHARED, PROT_EXEC, PROT_READ, PROT_WRITE, }; #[cfg(target_os = "macos")] #[pyattr] - use libc::{MADV_FREE_REUSABLE, MADV_FREE_REUSE}; + use host_mmap::{MADV_FREE_REUSABLE, MADV_FREE_REUSE}; #[cfg(any( target_os = "android", @@ -80,11 +80,11 @@ mod mmap { target_vendor = "apple" ))] #[pyattr] - use libc::MADV_FREE; + use host_mmap::MADV_FREE; #[cfg(target_os = "linux")] #[pyattr] - use libc::{ + use host_mmap::{ MADV_DODUMP, MADV_DOFORK, MADV_DONTDUMP, MADV_DONTFORK, MADV_HUGEPAGE, MADV_HWPOISON, MADV_MERGEABLE, MADV_NOHUGEPAGE, MADV_REMOVE, MADV_UNMERGEABLE, }; @@ -106,21 +106,21 @@ mod mmap { ) ))] #[pyattr] - use libc::MADV_SOFT_OFFLINE; + use host_mmap::MADV_SOFT_OFFLINE; #[cfg(all(target_os = "linux", target_arch = "x86_64", target_env = "gnu"))] #[pyattr] - use libc::{MAP_DENYWRITE, MAP_EXECUTABLE, MAP_POPULATE}; + use host_mmap::{MAP_DENYWRITE, MAP_EXECUTABLE, MAP_POPULATE}; // MAP_STACK is available on Linux, OpenBSD, and NetBSD #[cfg(any(target_os = "linux", target_os = "openbsd", target_os = "netbsd"))] #[pyattr] - use libc::MAP_STACK; + use host_mmap::MAP_STACK; // FreeBSD-specific MADV constants #[cfg(target_os = "freebsd")] #[pyattr] - use libc::{MADV_AUTOSYNC, MADV_CORE, MADV_NOCORE, MADV_NOSYNC, MADV_PROTECT}; + use host_mmap::{MADV_AUTOSYNC, MADV_CORE, MADV_NOCORE, MADV_NOSYNC, MADV_PROTECT}; #[pyattr] const ACCESS_DEFAULT: u32 = AccessMode::Default as u32; @@ -212,10 +212,10 @@ mod mmap { fileno: i32, #[pyarg(any)] length: isize, - #[pyarg(any, default = libc::MAP_SHARED)] - flags: libc::c_int, - #[pyarg(any, default = libc::PROT_WRITE | libc::PROT_READ)] - prot: libc::c_int, + #[pyarg(any, default = host_mmap::MAP_SHARED)] + flags: core::ffi::c_int, + #[pyarg(any, default = host_mmap::PROT_WRITE | host_mmap::PROT_READ)] + prot: core::ffi::c_int, #[pyarg(any, default = AccessMode::Default)] access: AccessMode, #[pyarg(any, default = 0)] @@ -294,7 +294,7 @@ mod mmap { #[derive(FromArgs)] pub(super) struct AdviseOptions { #[pyarg(positional)] - option: libc::c_int, + option: core::ffi::c_int, #[pyarg(positional, default)] start: Option<PyIntRef>, #[pyarg(positional, default)] @@ -303,7 +303,11 @@ mod mmap { #[cfg(all(unix, not(target_os = "redox")))] impl AdviseOptions { - fn values(self, len: usize, vm: &VirtualMachine) -> PyResult<(libc::c_int, usize, usize)> { + fn values( + self, + len: usize, + vm: &VirtualMachine, + ) -> PyResult<(core::ffi::c_int, usize, usize)> { let start = self .start .map(|s| { @@ -342,7 +346,7 @@ mod mmap { #[cfg(unix)] fn py_new(_cls: &Py<PyType>, args: Self::Args, vm: &VirtualMachine) -> PyResult<Self> { - use libc::{MAP_PRIVATE, MAP_SHARED, PROT_READ, PROT_WRITE}; + use host_mmap::{MAP_PRIVATE, MAP_SHARED, PROT_READ, PROT_WRITE}; let mut map_size = args.validate_new_args(vm)?; let MmapNewArgs { @@ -552,7 +556,7 @@ mod mmap { map_size, ) .map_err(|err| { - if err.raw_os_error() == Some(libc::EOVERFLOW) { + if err.raw_os_error() == Some(host_mmap::EOVERFLOW) { vm.new_overflow_error("mmap offset plus size would overflow") } else { err.to_pyexception(vm) @@ -1074,7 +1078,7 @@ mod mmap { fn seek( &self, dist: isize, - whence: OptionalArg<libc::c_int>, + whence: OptionalArg<core::ffi::c_int>, vm: &VirtualMachine, ) -> PyResult<()> { let how = whence.unwrap_or(0); From 924fe2aca94359ed3c2e94c716943ed17c23d5ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Jul 2026 01:22:03 +0900 Subject: [PATCH 195/339] Bump actions/cache/restore from 5.0.5 to 6.1.0 (#8223) Bumps [actions/cache/restore](https://github.com/actions/cache) from 5.0.5 to 6.1.0. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/27d5ce7f107fe9357f9df03efb73ab90386fccae...55cc8345863c7cc4c66a329aec7e433d2d1c52a9) --- updated-dependencies: - dependency-name: actions/cache/restore dependency-version: 6.1.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7dbe28dbf..e42882bd8 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -95,7 +95,7 @@ jobs: - uses: dtolnay/rust-toolchain@stable - name: Restore cache - uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5 + uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 with: path: | ~/.cargo/bin/ @@ -218,7 +218,7 @@ jobs: gcc-aarch64-linux-gnu: ${{ matrix.dependencies.gcc-aarch64-linux-gnu || false }} - name: Restore cache - uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5 + uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 with: path: | ~/.cargo/bin/ @@ -328,7 +328,7 @@ jobs: - uses: dtolnay/rust-toolchain@stable - name: Restore cache - uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5 + uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 with: path: | ~/.cargo/bin/ @@ -475,7 +475,7 @@ jobs: components: clippy - name: Restore cache - uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5 + uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 with: path: | ~/.cargo/bin/ @@ -544,7 +544,7 @@ jobs: uses: zizmorcore/zizmor-action@192e21d79ab29983730a13d1382995c2307fbcaa # v0.5.7 - name: restore prek cache - uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5 + uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 with: key: prek-${{ hashFiles('.pre-commit-config.yaml') }} path: ~/.cache/prek @@ -615,7 +615,7 @@ jobs: components: miri - name: Restore cache - uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5 + uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 with: path: | ~/.cargo/bin/ @@ -649,7 +649,7 @@ jobs: components: clippy - name: Restore cache - uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5 + uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 with: path: | ~/.cargo/bin/ @@ -689,7 +689,7 @@ jobs: run: echo "dir=$(npm config get cache)" >> "$GITHUB_OUTPUT" - name: Restore npm cache - uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5 + uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 # don't restore on main or release if: github.ref != 'refs/heads/main' && github.ref != 'refs/heads/release' with: @@ -764,7 +764,7 @@ jobs: target: wasm32-wasip1 - name: Restore cache - uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5 + uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 with: path: | ~/.cargo/bin/ @@ -814,7 +814,7 @@ jobs: - uses: dtolnay/rust-toolchain@stable - name: Restore cache - uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5 + uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 with: path: | ~/.cargo/bin/ From 55c012cffd1d1cfca25adbcad51540291b2b06b2 Mon Sep 17 00:00:00 2001 From: "Jeong, YunWon" <69878+youknowone@users.noreply.github.com> Date: Tue, 7 Jul 2026 09:19:25 +0900 Subject: [PATCH 196/339] unicode crate (#8211) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Extract unicodedata core into rustpython-unicode crate Move the vm-free Unicode character database access — the generated UCD 3.2.0 / latest tables, their build-time generation, and the icu4x/unicode_names2 lookups for category/bidirectional/combining/east_asian_width/mirrored/decomposition/ normalize/is_normalized/digit/decimal/numeric/name/lookup — into a new leaf crate over char/CodePoint/&Wtf8. stdlib/unicodedata.rs keeps the UCD pyclass binding: it extracts the code point, boxes results, and maps errors. The unicode data files, build.rs table generation, and the icu_properties/icu_normalizer/unicode_names2 dependencies move out of stdlib. Assisted-by: Claude * Route str predicates, casefold, and printable through rustpython-unicode Add classify/case/identifier modules to the shared crate over char/&str/&Wtf8: isalpha/isalnum/isdecimal/isdigit/isnumeric/isspace/isprintable classification, XID identifier predicates, and full-mapping casefold. vm/builtins/str.rs and literal/char.rs now call these instead of icu_properties/icu_casemap directly. String-level iteration with final-sigma handling (lower/upper/title/capitalize, islower/isupper) stays in the runtime. Assisted-by: Claude * Route sre_engine char classes through rustpython-unicode Add the regex module with the SRE character-class and case predicates (is_word/is_space/is_digit, is_uni_* Unicode variants, ascii/locale/unicode case folding). sre_engine/string.rs now forwards to it, keeping its public API and behavior identical — including the ASCII-only is_uni_digit and the hardcoded is_uni_space table. Assisted-by: Claude * Route \N{} name lookups through rustpython-unicode codegen/string_parser.rs (\N{...} escapes) and common/encodings.rs (the namereplace error handler) now resolve character names via rustpython-unicode instead of depending on unicode_names2 directly, leaving the crate as the sole owner of the name database. Assisted-by: Claude * Add differential Unicode sweep and shared-crate snippet test tests/differential.rs sweeps the full 0..0x110000 range and compares each str classification predicate against a committed CPython 3.14 reference dataset (tests/data/cpython3.14_predicates.txt, produced by generate_reference.py). Code points that differ only because the Rust std / icu4x build ships a later Unicode release than CPython 3.14's 16.0.0 are recorded in tests/data/version_skew_cpython3.14.txt, regenerable via RUSTPYTHON_UNICODE_REGEN_SKEW=1; the regen refuses to record any cpython=true/crate=false divergence, so only newly-assigned code points are allowed. Any other divergence fails. Both data files use a run-length `predicate start:end,...` encoding. extra_tests/snippets/stdlib_unicode_shared.py exercises the routed surface end to end (str predicates, casefold, identifiers, unicodedata, normalize, \N{}, and re character classes) and passes identically on CPython 3.14 and RustPython. Assisted-by: Claude * Match regex \d to Unicode decimal digits is_uni_digit previously matched only ASCII 0-9, so re's \d in Unicode mode missed decimal digits like ٥ and ५. SRE_UNI_IS_DIGIT matches Py_UNICODE_ISDECIMAL (category Nd), so route it through classify::is_decimal. Unmasks test_bug_6561 in test_re and extends the shared-crate snippet with the Nd/Nl/No cases. Assisted-by: Claude * Replace shallow Unicode wrappers with re-exports Address review feedback on the extraction. Functions that only forwarded to the shared crate become `use ... as` re-exports rather than hand-written wrappers: - literal: is_printable is dropped; escape.rs calls rustpython_unicode::classify::is_repr_printable directly. - unicode::identifier::is_continue re-exports is_xid_continue. - unicode::data::lookup_character re-exports unicode_names2::character. - Drop the unused repr(u8) on DecompositionType. The SRE character-class and case predicates move back into sre_engine::string (their pre-extraction home) instead of living in a unicode::regex module that only sre_engine and the vm _sre binding used; is_uni_digit/is_uni_alnum still delegate to rustpython_unicode::classify. engine.rs and _sre consume them from sre_engine::string again. The unicode crate's tests move from a single root tests module in lib.rs into per-module test submodules (case, classify, data, identifier, normalize). Assisted-by: Claude * no-std * Address review feedback: test module, dead variant, WTF-8 normalization - differential.rs: move the sweep tests into a `mod tests` block and drop the file-level allow of clippy::tests_outside_test_module and std_instead_of_alloc; the test uses alloc collections instead. - data.rs: remove the never-constructed DecompositionType::Canonical variant and its allow(unused); compatibility decomposition never produces it and canonical decomposition is handled through icu4x. - normalize.rs: is_normalized now takes &Wtf8 and checks each UTF-8 run, skipping lone surrogates, matching normalize's run-wise behavior. - unicodedata.rs: pass as_wtf8() to is_normalized. Assisted-by: Claude --- Cargo.lock | 25 +- Cargo.toml | 11 +- Lib/test/test_pkgutil.py | 1 - Lib/test/test_re.py | 1 - crates/codegen/Cargo.toml | 2 +- crates/codegen/src/string_parser.rs | 2 +- crates/common/Cargo.toml | 2 +- crates/common/src/encodings.rs | 2 +- crates/literal/Cargo.toml | 2 +- crates/literal/src/char.rs | 26 - crates/literal/src/escape.rs | 4 +- crates/literal/src/lib.rs | 1 - crates/sre_engine/Cargo.toml | 2 +- crates/sre_engine/src/string.rs | 42 +- crates/stdlib/Cargo.toml | 11 +- crates/stdlib/build.rs | 616 +----------------- crates/stdlib/src/unicodedata.rs | 393 ++--------- crates/unicode/Cargo.toml | 24 + crates/unicode/build.rs | 612 +++++++++++++++++ crates/unicode/src/case.rs | 69 ++ crates/unicode/src/classify.rs | 116 ++++ crates/unicode/src/data.rs | 373 +++++++++++ crates/unicode/src/identifier.rs | 37 ++ crates/unicode/src/lib.rs | 19 + crates/unicode/src/normalize.rs | 111 ++++ .../tests/data/cpython3.14_predicates.txt | 9 + .../tests/data/version_skew_cpython3.14.txt | 11 + crates/unicode/tests/differential.rs | 235 +++++++ crates/unicode/tests/generate_reference.py | 74 +++ crates/{stdlib => unicode}/unicode/README.md | 0 .../unicode/latest/DerivedNumericValues.txt | 0 .../latest/NormalizationCorrections.txt | 0 .../unicode/latest/UnicodeData.txt | 0 .../unicode/ucd32/DerivedBidiClass-3.2.0.txt | 0 .../ucd32/DerivedBinaryProperties-3.2.0.txt | 0 .../ucd32/DerivedCombiningClass-3.2.0.txt | 0 .../ucd32/DerivedEastAsianWidth-3.2.0.txt | 0 .../ucd32/DerivedGeneralCategory-3.2.0.txt | 0 .../ucd32/DerivedNumericType-3.2.0.txt | 0 .../ucd32/DerivedNumericValues-3.2.0.txt | 0 crates/vm/Cargo.toml | 1 + crates/vm/src/builtins/str.rs | 77 +-- crates/wtf8/Cargo.toml | 4 +- crates/wtf8/src/lib.rs | 2 +- extra_tests/snippets/stdlib_unicode_shared.py | 93 +++ 45 files changed, 1910 insertions(+), 1100 deletions(-) delete mode 100644 crates/literal/src/char.rs create mode 100644 crates/unicode/Cargo.toml create mode 100644 crates/unicode/build.rs create mode 100644 crates/unicode/src/case.rs create mode 100644 crates/unicode/src/classify.rs create mode 100644 crates/unicode/src/data.rs create mode 100644 crates/unicode/src/identifier.rs create mode 100644 crates/unicode/src/lib.rs create mode 100644 crates/unicode/src/normalize.rs create mode 100644 crates/unicode/tests/data/cpython3.14_predicates.txt create mode 100644 crates/unicode/tests/data/version_skew_cpython3.14.txt create mode 100644 crates/unicode/tests/differential.rs create mode 100644 crates/unicode/tests/generate_reference.py rename crates/{stdlib => unicode}/unicode/README.md (100%) rename crates/{stdlib => unicode}/unicode/latest/DerivedNumericValues.txt (100%) rename crates/{stdlib => unicode}/unicode/latest/NormalizationCorrections.txt (100%) rename crates/{stdlib => unicode}/unicode/latest/UnicodeData.txt (100%) rename crates/{stdlib => unicode}/unicode/ucd32/DerivedBidiClass-3.2.0.txt (100%) rename crates/{stdlib => unicode}/unicode/ucd32/DerivedBinaryProperties-3.2.0.txt (100%) rename crates/{stdlib => unicode}/unicode/ucd32/DerivedCombiningClass-3.2.0.txt (100%) rename crates/{stdlib => unicode}/unicode/ucd32/DerivedEastAsianWidth-3.2.0.txt (100%) rename crates/{stdlib => unicode}/unicode/ucd32/DerivedGeneralCategory-3.2.0.txt (100%) rename crates/{stdlib => unicode}/unicode/ucd32/DerivedNumericType-3.2.0.txt (100%) rename crates/{stdlib => unicode}/unicode/ucd32/DerivedNumericValues-3.2.0.txt (100%) create mode 100644 extra_tests/snippets/stdlib_unicode_shared.py diff --git a/Cargo.lock b/Cargo.lock index bab008f86..310869455 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3313,9 +3313,9 @@ dependencies = [ "rustpython-ruff_python_ast", "rustpython-ruff_python_parser", "rustpython-ruff_text_size", + "rustpython-unicode", "rustpython-wtf8", "thiserror", - "unicode_names2 3.1.0", ] [[package]] @@ -3336,9 +3336,9 @@ dependencies = [ "parking_lot", "radium", "rustpython-literal", + "rustpython-unicode", "rustpython-wtf8", "siphasher", - "unicode_names2 3.1.0", ] [[package]] @@ -3452,11 +3452,11 @@ name = "rustpython-literal" version = "0.5.0" dependencies = [ "hexf-parse", - "icu_properties", "is-macro", "lexical-parse-float", "num-traits", "rand 0.10.1", + "rustpython-unicode", "rustpython-wtf8", ] @@ -3541,9 +3541,9 @@ version = "0.5.0" dependencies = [ "bitflags 2.13.0", "criterion", - "icu_properties", "num_enum", "optional", + "rustpython-unicode", "rustpython-wtf8", ] @@ -3571,8 +3571,6 @@ dependencies = [ "gethostname", "hex", "hmac", - "icu_normalizer", - "icu_properties", "indexmap", "insta", "itertools 0.15.0", @@ -3612,6 +3610,7 @@ dependencies = [ "rustpython-ruff_python_parser", "rustpython-ruff_source_file", "rustpython-ruff_text_size", + "rustpython-unicode", "rustpython-vm", "sha1 0.11.0", "sha2", @@ -3621,7 +3620,6 @@ dependencies = [ "system-configuration", "tcl-sys", "tk-sys", - "unicode_names2 3.1.0", "uuid", "webpki-roots", "widestring", @@ -3632,6 +3630,18 @@ dependencies = [ "xz-sys", ] +[[package]] +name = "rustpython-unicode" +version = "0.5.0" +dependencies = [ + "icu_casemap", + "icu_normalizer", + "icu_properties", + "rustpython-wtf8", + "unicode_names2 3.1.0", + "writeable", +] + [[package]] name = "rustpython-venvlauncher" version = "0.5.0" @@ -3684,6 +3694,7 @@ dependencies = [ "rustpython-ruff_python_parser", "rustpython-ruff_text_size", "rustpython-sre_engine", + "rustpython-unicode", "rustyline", "scopeguard", "serde_core", diff --git a/Cargo.toml b/Cargo.toml index fb023e03e..d8081f501 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -179,6 +179,7 @@ rustpython-vm = { path = "crates/vm", default-features = false, version = "0.5.0 rustpython-pylib = { path = "crates/pylib", version = "0.5.0" } rustpython-stdlib = { path = "crates/stdlib", default-features = false, version = "0.5.0" } rustpython-sre_engine = { path = "crates/sre_engine", version = "0.5.0" } +rustpython-unicode = { path = "crates/unicode", version = "0.5.0" } rustpython-wtf8 = { path = "crates/wtf8", version = "0.5.0" } rustpython-doc = { path = "crates/doc", version = "0.5.0" } @@ -192,12 +193,12 @@ der = { version = "0.8", features = ["alloc", "oid", "pem", "zeroize"] } phf = { version = "0.14.0", default-features = false, features = ["macros"]} adler32 = "1.2.0" approx = "0.5.1" -ascii = "1.1" +ascii = { version = "1.1", default-features = false } base64 = "0.22" blake2 = "0.11.0-rc.6" bitflags = "2.11.0" bitflagset = "0.0.3" -bstr = "1" +bstr = { version = "1", default-features = false, features = ["unicode"] } bzip2 = "0.6" chrono = { version = "0.4.44", default-features = false, features = ["clock", "std"] } console_error_panic_hook = "0.1" @@ -227,7 +228,7 @@ hexf-parse = "0.2.1" hmac = "0.13" indexmap = { version = "2.14.0", features = ["std"] } insta = "1.47" -itertools = "0.15.0" +itertools = { version = "0.15.0", default-features = false, features = ["use_alloc"] } is-macro = "0.3.7" js-sys = "0.3" junction = "2.0.0" @@ -248,7 +249,7 @@ malachite-bigint = "0.9.1" malachite-q = "0.9.1" malachite-base = "0.9.1" md-5 = "0.11" -memchr = "2.8.1" +memchr = { version = "2.8.1", default-features = false, features = ["alloc"] } memmap2 = "0.9.10" mt19937 = "3.3" num-complex = "0.4.6" @@ -310,7 +311,7 @@ icu_locale = "2" icu_properties = "2" icu_normalizer = "2" uuid = "1.23.2" -unicode_names2 = "3" +unicode_names2 = { version = "3", default-features = false, features = ["no_std"] } widestring = "1.2.0" windows-sys = "0.61.2" wasm-bindgen = "0.2.106" diff --git a/Lib/test/test_pkgutil.py b/Lib/test/test_pkgutil.py index f54444095..d4faaaeca 100644 --- a/Lib/test/test_pkgutil.py +++ b/Lib/test/test_pkgutil.py @@ -231,7 +231,6 @@ class PkgutilTests(unittest.TestCase): with self.assertRaises((TypeError, ValueError)): list(pkgutil.walk_packages(bytes_input)) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_name_resolution(self): import logging import logging.handlers diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py index 8ac6daecc..1d396e4f3 100644 --- a/Lib/test/test_re.py +++ b/Lib/test/test_re.py @@ -1734,7 +1734,6 @@ class ReTests(unittest.TestCase): self.assertEqual(next(iter).span(), (4, 4)) self.assertRaises(StopIteration, next, iter) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_bug_6561(self): # '\d' should match characters in Unicode category 'Nd' # (Number, Decimal Digit), but not those in 'Nl' (Number, diff --git a/crates/codegen/Cargo.toml b/crates/codegen/Cargo.toml index 031f3b965..c43bf1bcb 100644 --- a/crates/codegen/Cargo.toml +++ b/crates/codegen/Cargo.toml @@ -15,6 +15,7 @@ std = ["thiserror/std", "itertools/use_std"] [dependencies] rustpython-compiler-core = { workspace = true } rustpython-literal = {workspace = true } +rustpython-unicode = { workspace = true } rustpython-wtf8 = { workspace = true } ruff_python_ast = { workspace = true } ruff_text_size = { workspace = true } @@ -29,7 +30,6 @@ thiserror = { workspace = true } malachite-bigint = { workspace = true } memchr = { workspace = true } rapidhash = { workspace = true } -unicode_names2 = { workspace = true } [dev-dependencies] ruff_python_parser = { workspace = true } diff --git a/crates/codegen/src/string_parser.rs b/crates/codegen/src/string_parser.rs index 0b5bcfffc..622488a21 100644 --- a/crates/codegen/src/string_parser.rs +++ b/crates/codegen/src/string_parser.rs @@ -114,7 +114,7 @@ impl StringParser { let name_and_ending = self.skip_bytes(close_idx + 1); let name = &name_and_ending[..name_and_ending.len() - 1]; - unicode_names2::character(name).ok_or_else(|| unreachable!()) + rustpython_unicode::lookup_character(name).ok_or_else(|| unreachable!()) } /// Parse an escaped character, returning the new character. diff --git a/crates/common/Cargo.toml b/crates/common/Cargo.toml index 725be665f..4498e74ca 100644 --- a/crates/common/Cargo.toml +++ b/crates/common/Cargo.toml @@ -16,6 +16,7 @@ wasm_js = ["getrandom/wasm_js"] [dependencies] rustpython-literal = { workspace = true } +rustpython-unicode = { workspace = true } rustpython-wtf8 = { workspace = true } ascii = { workspace = true } @@ -28,7 +29,6 @@ malachite-q = { workspace = true } malachite-base = { workspace = true } num-traits = { workspace = true } parking_lot = { workspace = true, optional = true } -unicode_names2 = { workspace = true } radium = { workspace = true } lock_api = { workspace = true } diff --git a/crates/common/src/encodings.rs b/crates/common/src/encodings.rs index 913f0521e..b9ce02b88 100644 --- a/crates/common/src/encodings.rs +++ b/crates/common/src/encodings.rs @@ -414,7 +414,7 @@ pub mod errors { let mut out = String::with_capacity(num_chars * 4); for c in err_str.code_points() { let c_u32 = c.to_u32(); - if let Some(c_name) = c.to_char().and_then(unicode_names2::name) { + if let Some(c_name) = c.to_char().and_then(rustpython_unicode::character_name) { write!(out, "\\N{{{c_name}}}").unwrap(); } else if c_u32 >= 0x10000 { write!(out, "\\U{c_u32:08x}").unwrap(); diff --git a/crates/literal/Cargo.toml b/crates/literal/Cargo.toml index b9795a771..60350f793 100644 --- a/crates/literal/Cargo.toml +++ b/crates/literal/Cargo.toml @@ -9,13 +9,13 @@ license = { workspace = true } rust-version = { workspace = true } [dependencies] +rustpython-unicode = { workspace = true } rustpython-wtf8 = { workspace = true } hexf-parse = { workspace = true } is-macro.workspace = true lexical-parse-float = { workspace = true, features = ["format"] } num-traits = { workspace = true } -icu_properties = { workspace = true } [dev-dependencies] rand = { workspace = true } diff --git a/crates/literal/src/char.rs b/crates/literal/src/char.rs deleted file mode 100644 index 5b446cc1a..000000000 --- a/crates/literal/src/char.rs +++ /dev/null @@ -1,26 +0,0 @@ -use icu_properties::props::{EnumeratedProperty, GeneralCategory}; - -/// According to python following categories aren't printable: -/// * Cc (Other, Control) -/// * Cf (Other, Format) -/// * Cs (Other, Surrogate) -/// * Co (Other, Private Use) -/// * Cn (Other, Not Assigned) -/// * Zl Separator, Line ('\u2028', LINE SEPARATOR) -/// * Zp Separator, Paragraph ('\u2029', PARAGRAPH SEPARATOR) -/// * Zs (Separator, Space) other than ASCII space('\x20'). -pub fn is_printable(c: char) -> bool { - let cat = GeneralCategory::for_char(c); - - !matches!( - cat, - GeneralCategory::SpaceSeparator - | GeneralCategory::LineSeparator - | GeneralCategory::ParagraphSeparator - | GeneralCategory::Control - | GeneralCategory::Format - | GeneralCategory::Surrogate - | GeneralCategory::PrivateUse - | GeneralCategory::Unassigned - ) -} diff --git a/crates/literal/src/escape.rs b/crates/literal/src/escape.rs index 1099c0a02..50dce8b26 100644 --- a/crates/literal/src/escape.rs +++ b/crates/literal/src/escape.rs @@ -204,7 +204,7 @@ impl UnicodeEscape<'_> { '\\' | '\t' | '\r' | '\n' => 2, ch if ch < ' ' || ch as u32 == 0x7f => 4, // \xHH ch if ch.is_ascii() => 1, - ch if crate::char::is_printable(ch) => { + ch if rustpython_unicode::classify::is_repr_printable(ch) => { // max = std::cmp::max(ch, max); ch.len_utf8() } @@ -238,7 +238,7 @@ impl UnicodeEscape<'_> { ch if ch.is_ascii() => { write!(formatter, "\\x{:02x}", ch as u8) } - ch if crate::char::is_printable(ch) => formatter.write_char(ch), + ch if rustpython_unicode::classify::is_repr_printable(ch) => formatter.write_char(ch), '\0'..='\u{ff}' => { write!(formatter, "\\x{:02x}", ch as u32) } diff --git a/crates/literal/src/lib.rs b/crates/literal/src/lib.rs index a863dd877..6d5209001 100644 --- a/crates/literal/src/lib.rs +++ b/crates/literal/src/lib.rs @@ -2,7 +2,6 @@ extern crate alloc; -pub mod char; pub mod complex; pub mod escape; pub mod float; diff --git a/crates/sre_engine/Cargo.toml b/crates/sre_engine/Cargo.toml index 8400a34b5..03b3f6098 100644 --- a/crates/sre_engine/Cargo.toml +++ b/crates/sre_engine/Cargo.toml @@ -15,11 +15,11 @@ name = "benches" harness = false [dependencies] +rustpython-unicode = { workspace = true } rustpython-wtf8 = { workspace = true } num_enum = { workspace = true } bitflags = { workspace = true } optional = { workspace = true } -icu_properties = { workspace = true } [dev-dependencies] criterion = { workspace = true } diff --git a/crates/sre_engine/src/string.rs b/crates/sre_engine/src/string.rs index 6c8b9a567..6468c6d0c 100644 --- a/crates/sre_engine/src/string.rs +++ b/crates/sre_engine/src/string.rs @@ -1,4 +1,3 @@ -use icu_properties::props::{EnumeratedProperty, GeneralCategory, GeneralCategoryGroup}; use rustpython_wtf8::Wtf8; #[derive(Debug, Clone, Copy)] @@ -333,55 +332,75 @@ const fn utf8_is_cont_byte(byte: u8) -> bool { /// Mask of the value bits of a continuation byte. const CONT_MASK: u8 = 0b0011_1111; +// Character-class and case predicates for the SRE engine. +// +// Every predicate takes a raw `u32` code point (SRE decodes strings into `u32`s, +// including lone surrogates) and returns whether it belongs to the class. +// ASCII-mode predicates only ever consider byte values; Unicode-mode predicates +// consult the shared property tables in `rustpython_unicode::classify`. + +const UNDERSCORE: u32 = '_' as u32; + const fn is_py_ascii_whitespace(b: u8) -> bool { matches!(b, b'\t' | b'\n' | b'\x0C' | b'\r' | b' ' | b'\x0B') } #[inline] pub(crate) fn is_word(ch: u32) -> bool { - ch == '_' as u32 || u8::try_from(ch).is_ok_and(|x| x.is_ascii_alphanumeric()) + ch == UNDERSCORE || u8::try_from(ch).is_ok_and(|x| x.is_ascii_alphanumeric()) } + #[inline] pub(crate) fn is_space(ch: u32) -> bool { u8::try_from(ch).is_ok_and(is_py_ascii_whitespace) } + #[inline] pub(crate) fn is_digit(ch: u32) -> bool { u8::try_from(ch).is_ok_and(|x| x.is_ascii_digit()) } + #[inline] pub(crate) fn is_loc_alnum(ch: u32) -> bool { // FIXME: Ignore the locales u8::try_from(ch).is_ok_and(|x| x.is_ascii_alphanumeric()) } + #[inline] pub(crate) fn is_loc_word(ch: u32) -> bool { - ch == '_' as u32 || is_loc_alnum(ch) + ch == UNDERSCORE || is_loc_alnum(ch) } + #[inline] pub(crate) const fn is_linebreak(ch: u32) -> bool { ch == '\n' as u32 } + #[inline] #[must_use] pub fn lower_ascii(ch: u32) -> u32 { u8::try_from(ch).map_or(ch, |x| x.to_ascii_lowercase() as u32) } + #[inline] pub(crate) fn lower_locate(ch: u32) -> u32 { // FIXME: Ignore the locales lower_ascii(ch) } + #[inline] pub(crate) fn upper_locate(ch: u32) -> u32 { // FIXME: Ignore the locales u8::try_from(ch).map_or(ch, |x| x.to_ascii_uppercase() as u32) } + #[inline] pub(crate) fn is_uni_digit(ch: u32) -> bool { - // TODO: check with cpython - char::try_from(ch).is_ok_and(|x| x.is_ascii_digit()) + // SRE_UNI_IS_DIGIT matches Unicode decimal digits (Py_UNICODE_ISDECIMAL), + // not just ASCII 0-9. + char::try_from(ch).is_ok_and(rustpython_unicode::classify::is_decimal) } + #[inline] pub(crate) fn is_uni_space(ch: u32) -> bool { // TODO: check with cpython @@ -419,6 +438,7 @@ pub(crate) fn is_uni_space(ch: u32) -> bool { | 0x3000 ) } + #[inline] pub(crate) const fn is_uni_linebreak(ch: u32) -> bool { matches!( @@ -426,25 +446,25 @@ pub(crate) const fn is_uni_linebreak(ch: u32) -> bool { 0x000A | 0x000B | 0x000C | 0x000D | 0x001C | 0x001D | 0x001E | 0x0085 | 0x2028 | 0x2029 ) } + #[inline] pub(crate) fn is_uni_alnum(ch: u32) -> bool { // TODO: check with cpython - char::try_from(ch).is_ok_and(|c| { - GeneralCategoryGroup::Letter - .union(GeneralCategoryGroup::Number) - .contains(GeneralCategory::for_char(c)) - }) + char::try_from(ch).is_ok_and(rustpython_unicode::classify::is_alnum) } + #[inline] pub(crate) fn is_uni_word(ch: u32) -> bool { - ch == '_' as u32 || is_uni_alnum(ch) + ch == UNDERSCORE || is_uni_alnum(ch) } + #[inline] #[must_use] pub fn lower_unicode(ch: u32) -> u32 { // TODO: check with cpython char::try_from(ch).map_or(ch, |x| x.to_lowercase().next().unwrap() as u32) } + #[inline] #[must_use] pub fn upper_unicode(ch: u32) -> u32 { diff --git a/crates/stdlib/Cargo.toml b/crates/stdlib/Cargo.toml index a24811c4a..1ba6148e8 100644 --- a/crates/stdlib/Cargo.toml +++ b/crates/stdlib/Cargo.toml @@ -32,6 +32,7 @@ rustpython-derive = { workspace = true } rustpython-vm = { workspace = true, default-features = false, features = ["compiler"]} rustpython-common = { workspace = true } rustpython-host_env = { workspace = true } +rustpython-unicode = { workspace = true } ruff_python_parser = { workspace = true } ruff_python_ast = { workspace = true } @@ -76,12 +77,6 @@ hmac = { workspace = true } pbkdf2 = { workspace = true, features = ["hmac"] } constant_time_eq = { workspace = true } -## unicode stuff -unicode_names2 = { workspace = true } -# update version all at the same time -icu_properties = { workspace = true } -icu_normalizer = { workspace = true } - # compression adler32 = { workspace = true } crc32fast = { workspace = true } @@ -141,9 +136,5 @@ system-configuration = { workspace = true } insta = { workspace = true } rustpython-pylib = { workspace = true, features = [ "freeze-stdlib" ] } -[build-dependencies] -icu_normalizer = { workspace = true } -icu_properties = { workspace = true } - [lints] workspace = true diff --git a/crates/stdlib/build.rs b/crates/stdlib/build.rs index 4cf7b21d4..95c34c4fb 100644 --- a/crates/stdlib/build.rs +++ b/crates/stdlib/build.rs @@ -1,606 +1,4 @@ -#![allow( - clippy::disallowed_methods, - reason = "build scripts cannot use rustpython-host_env" -)] - -// spell-checker:ignore decomp DECOMP ossl osslconf - -extern crate alloc; - -use core::num::NonZeroUsize; - -use alloc::collections::{BTreeMap, BTreeSet}; - -use std::{ - env, - fs::{self, File}, - io::{self, BufRead, BufReader, BufWriter, Write}, - path::{Path, PathBuf}, - thread, -}; - -use icu_properties::props::{EnumeratedProperty, GeneralCategory, NumericType}; - -fn generate_unicode_3_2() { - let path = PathBuf::from(env::var("OUT_DIR").unwrap()) - .join("generated") - .join("unicode_3_2.rs"); - fs::create_dir_all(path.parent().unwrap()).unwrap(); - let mut writer = BufWriter::new(File::create(&path).unwrap()); - - let base = Path::new(env!("CARGO_MANIFEST_DIR")) - .join("unicode") - .join("ucd32"); - - write_derived( - &base, - "DerivedGeneralCategory-3.2.0.txt", - "GENERAL_CATEGORY", - "(u32, u32, GeneralCategory)", - NonZeroUsize::new(1).unwrap(), - &mut writer, - |start, end, id, _| { - let id = parse_general(id); - if id != GeneralCategory::Unassigned { - Some((start, end, id)) - } else { - None - } - }, - |writer, mut values| { - values.sort_unstable_by_key(|(start, _, _)| *start); - write!(writer, "[").unwrap(); - for (start, end, id) in values { - write!(writer, "({start}, {end}, GeneralCategory::{id:?}),").unwrap(); - } - write!(writer, "];").unwrap(); - }, - ); - - write_derived( - &base, - "DerivedEastAsianWidth-3.2.0.txt", - "EAST_ASIAN_WIDTH", - "(u32, u32, EastAsianWidth)", - NonZeroUsize::new(1).unwrap(), - &mut writer, - |start, end, id, _| { - let id = parse_eaw(id); - if id != "EastAsianWidth::Neutral" { - Some((start, end, id)) - } else { - None - } - }, - |writer, mut values| { - values.sort_unstable_by_key(|(start, _, _)| *start); - write!(writer, "[").unwrap(); - for (start, end, id) in values { - write!(writer, "({start}, {end}, {id}),").unwrap(); - } - write!(writer, "];").unwrap(); - }, - ); - - write_derived( - &base, - "DerivedBidiClass-3.2.0.txt", - "BIDI_CLASS", - "(u32, u32, BidiClass)", - NonZeroUsize::new(1).unwrap(), - &mut writer, - |start, end, id, _| { - let id = parse_bidi(id); - if id != "BidiClass::LeftToRight" { - Some((start, end, id)) - } else { - None - } - }, - |writer, mut values| { - values.sort_unstable_by_key(|(start, _, _)| *start); - write!(writer, "[").unwrap(); - for (start, end, id) in values { - write!(writer, "({start}, {end}, {id}),").unwrap(); - } - write!(writer, "];").unwrap(); - }, - ); - - write_derived( - &base, - "DerivedBinaryProperties-3.2.0.txt", - "BIDI_MIRRORED", - "(u32, u32)", - NonZeroUsize::new(1).unwrap(), - &mut writer, - |start, end, id, _| { - assert_eq!( - "Bidi_Mirrored", - id.trim(), - "DerivedBinaryProperties-3.2.0 only has Bidi_Mirrored" - ); - Some((start, end)) - }, - |writer, mut values| { - values.sort_unstable_by_key(|(start, _)| *start); - writeln!(writer, "{values:?};").unwrap(); - }, - ); - - write_derived( - &base, - "DerivedCombiningClass-3.2.0.txt", - "COMBINING_CLASS", - "(u32, u32, CanonicalCombiningClass)", - NonZeroUsize::new(1).unwrap(), - &mut writer, - |start, end, id, _| { - let id: u8 = id.parse().unwrap(); - if id == 0 { - return None; - } - Some((start, end, id)) - }, - |writer, mut values| { - values.sort_unstable_by_key(|(start, _, _)| *start); - write!(writer, "[").unwrap(); - for (start, end, id) in values { - write!( - writer, - "({start}, {end}, CanonicalCombiningClass::from_icu4c_value({id}))," - ) - .unwrap(); - } - writeln!(writer, "];").unwrap(); - }, - ); -} - -fn generate_numeric_type() { - let path = PathBuf::from(env::var("OUT_DIR").unwrap()) - .join("generated") - .join("unicode_num_type.rs"); - fs::create_dir_all(path.parent().unwrap()).unwrap(); - let mut writer = BufWriter::new(File::create(&path).unwrap()); - - let base = Path::new(env!("CARGO_MANIFEST_DIR")) - .join("unicode") - .join("ucd32"); - - write_derived( - &base, - "DerivedNumericType-3.2.0.txt", - "NUMERIC_TYPE_DIFF", - "(u32, u32, NumericType)", - NonZeroUsize::new(1).unwrap(), - &mut writer, - |start, end, id, _| { - let id = parse_numeric_type_str(id); - let differs = (start..=end).any(|c| match char::from_u32(c) { - Some(c) => { - let modern = parse_numeric_type_val(NumericType::for_char(c)); - modern != id - } - None => true, - }); - - if differs { - Some((start, end, id)) - } else { - None - } - }, - |writer, mut values| { - values.sort_unstable_by_key(|(start, _, _)| *start); - write!(writer, "[").unwrap(); - for (start, end, id) in values { - write!(writer, "({start}, {end}, {id}),").unwrap(); - } - writeln!(writer, "];").unwrap(); - }, - ); -} - -fn generate_numeric_value() { - let path = PathBuf::from(env::var("OUT_DIR").unwrap()) - .join("generated") - .join("unicode_numeric_value.rs"); - fs::create_dir_all(path.parent().unwrap()).unwrap(); - let mut writer = BufWriter::new(File::create(&path).unwrap()); - - // Ideally, this would store the diffs between the two tables. However, we need 3.2.0 - // membership as well as different chars. The final tables are both smaller than storing the - // full 3.2.0 value table. - let ucd32 = Path::new(env!("CARGO_MANIFEST_DIR")) - .join("unicode") - .join("ucd32"); - let mut ucd32_diffs = BTreeMap::new(); - let mut ucd32_member = BTreeSet::new(); - let numeric_32 = - BufReader::new(File::open(ucd32.join("DerivedNumericValues-3.2.0.txt")).unwrap()); - parse_unicode_3_2( - numeric_32, - NonZeroUsize::new(1).unwrap(), - &mut io::empty(), - |start, end, value, _| { - let value: f64 = value - .parse() - .expect("Unicode data contains valid properties"); - ucd32_diffs.insert((start, end), value); - ucd32_member.insert((start, end)); - Option::<()>::None - }, - |_writer, _values| {}, - ); - - let ucd_latest = Path::new(env!("CARGO_MANIFEST_DIR")) - .join("unicode") - .join("latest"); - - write_derived( - &ucd_latest, - "DerivedNumericValues.txt", - "NUMERIC_VALUES", - "(u32, u32, f64)", - NonZeroUsize::new(1).unwrap(), - &mut writer, - |start, end, value, _| { - let value: f64 = value - .parse() - .expect("Unicode data contains valid properties"); - - if ucd32_diffs - .get(&(start, end)) - .is_some_and(|old_v| *old_v == value) - { - ucd32_diffs.remove(&(start, end)); - } - - Some((start, end, value)) - }, - |writer, mut values| { - values.sort_unstable_by_key(|(ch, _, _)| *ch); - writeln!(writer, "{values:?};").unwrap(); - }, - ); - - // TODO: More flexible parser - writeln!( - writer, - "static NUMERIC_VALUES_DIFF: &[(u32, u32, f64)] = &[" - ) - .unwrap(); - for ((start, end), value) in ucd32_diffs { - write!(writer, "({start}, {end}, {value:?}),").unwrap(); - } - writeln!(writer, "];").unwrap(); - - // Compress membership table - let mut iter = ucd32_member.iter(); - let &(mut start_prev, mut end_prev) = iter.next().unwrap(); - let mut membership = Vec::new(); - - for &(start, end) in iter { - if start <= end_prev + 1 { - end_prev = end_prev.max(end); - } else { - membership.push((start_prev, end_prev)); - start_prev = start; - end_prev = end; - } - } - membership.push((start_prev, end_prev)); - membership.sort_unstable_by_key(|&(start, _)| start); - - writeln!(writer, "static NUMERIC_VAL_EXISTS_32: &[(u32, u32)] = &").unwrap(); - write!(writer, "{membership:?};").unwrap(); -} - -fn generate_unicode_latest() { - let path = PathBuf::from(env::var("OUT_DIR").unwrap()) - .join("generated") - .join("unicode_latest.rs"); - fs::create_dir_all(path.parent().unwrap()).unwrap(); - let mut writer = BufWriter::new(File::create(&path).unwrap()); - - let base = Path::new(env!("CARGO_MANIFEST_DIR")) - .join("unicode") - .join("latest"); - - // NOTE: - // This ONLY parses compatibility decomposition because Python exposes the tags. The tags are - // the "<square>", "<circle>", et cetera bits before the decomposition. Thus, we can save space - // by using icu4x's CanonicalDecomposer for non-compatibility decomposition. - let mut decomp_ranges = Vec::new(); - write_derived( - &base, - "UnicodeData.txt", - "DECOMP_COMPAT", - "(u32, DecompositionType, usize)", - NonZeroUsize::new(5).unwrap(), - &mut writer, - |start, _end, value, _| { - // We're building a sparse array. Most characters don't decompose, so we don't - // need to literally store a row for each char. - if value.is_empty() { - return None; - } - - let (dtype, decomp) = value.split_once('>').map(|(dtype, decomp)| { - let dtype = dtype.strip_prefix('<').unwrap_or_else(|| { - panic!("Compatibility decomp; expected <tag>\n\tgot: {value}") - }); - ( - parse_decomp_type(dtype), - decomp - .split_whitespace() - .map(|s| u32::from_str_radix(s, 16).unwrap()), - ) - })?; - - decomp_ranges.extend(decomp); - let end = decomp_ranges.len(); - - Some((start, dtype, end)) - }, - |writer, values| { - // UnicodeData.txt should already be sorted - write!(writer, "[").unwrap(); - for (start, dtype, end) in values { - write!(writer, "({start}, DecompositionType::{dtype:?}, {end}),").unwrap(); - } - writeln!(writer, "];").unwrap(); - }, - ); - - writeln!(writer, "static DECOMP_RANGE: &[u32] = &{decomp_ranges:?};").unwrap(); - - // Normalization corrections is super small - only a handful chars at the time of writing. - write_derived( - &base, - "NormalizationCorrections.txt", - "DECOMP_UPDATES", - "(u32, u32)", - NonZeroUsize::new(1).unwrap(), - &mut writer, - |start, _end, value, line| { - let original = u32::from_str_radix(value.trim(), 16).unwrap_or_else(|e| { - panic!("field 2 of decomp corrections should be a char in hex: {value} {e}") - }); - let version = line - .rsplit(';') - .next() - .unwrap_or_else(|| { - panic!("field 4 of decomp corrections should be a UCD version: {line}") - }) - .split_once('#') - .unwrap() - .0 - .trim(); - - // `version` = when the char was updated. Therefore, we use the incorrect chars past - // 3.2.0 but skip the chars fixed in 3.2.0 because they'll already be right. - if version != "3.2.0" { - Some((start, original)) - } else { - None - } - }, - |writer, mut values| { - values.sort_unstable_by_key(|(c, _)| *c); - write!(writer, "{values:?};").unwrap(); - }, - ); -} - -#[expect(clippy::too_many_arguments)] -fn write_derived<W, P, FW, T>( - base: &Path, - file_name: &str, - static_name: &str, - array_type: &str, - field: NonZeroUsize, - writer: &mut W, - parse: P, - write_vec: FW, -) where - W: Write, - P: FnMut(u32, u32, &str, &str) -> Option<T>, - FW: FnMut(&mut W, Vec<T>), -{ - let path = base.join(file_name); - let reader = BufReader::new(File::open(path).unwrap()); - writeln!(writer, "static {static_name}: &[{array_type}] = &").unwrap(); - parse_unicode_3_2(reader, field, writer, parse, write_vec); -} - -/// Parse Unicode 3.2.0 property files. -fn parse_unicode_3_2<W, P, FW, T>( - reader: impl BufRead, - field: NonZeroUsize, - writer: &mut W, - mut parse: P, - mut write_vec: FW, -) where - W: Write, - P: FnMut(u32, u32, &str, &str) -> Option<T>, - FW: FnMut(&mut W, Vec<T>), -{ - let mut parsed = Vec::new(); - - for line in reader.lines().map(Result::unwrap) { - let line = line.trim(); - if line.is_empty() || line.starts_with('#') { - continue; - } - - let mut fields = line.split(';'); - let range = fields.next().expect("Unicode data is missing a char range"); - let id = fields - .nth(field.get().saturating_sub(1)) - .expect("Unicode data is missing a property"); - let (start, end) = match range.split_once("..") { - Some((left, right)) => { - let start = u32::from_str_radix(left.trim(), 16).unwrap(); - let end = u32::from_str_radix(right.trim(), 16).unwrap(); - (start, end) - } - None => { - let start = u32::from_str_radix(range.trim(), 16).unwrap(); - (start, start) - } - }; - - let id = id.split_once('#').map_or(id, |(left, _)| left).trim(); - if let Some(val) = parse(start, end, id, line) { - parsed.push(val); - } - } - write_vec(writer, parsed); -} - -fn parse_general(id: &str) -> GeneralCategory { - match id.trim() { - "Cn" => GeneralCategory::Unassigned, - "Lu" => GeneralCategory::UppercaseLetter, - "Ll" => GeneralCategory::LowercaseLetter, - "Lt" => GeneralCategory::TitlecaseLetter, - "Lm" => GeneralCategory::ModifierLetter, - "Lo" => GeneralCategory::OtherLetter, - "Mn" => GeneralCategory::NonspacingMark, - "Mc" => GeneralCategory::SpacingMark, - "Me" => GeneralCategory::EnclosingMark, - "Nd" => GeneralCategory::DecimalNumber, - "Nl" => GeneralCategory::LetterNumber, - "No" => GeneralCategory::OtherNumber, - "Zs" => GeneralCategory::SpaceSeparator, - "Zl" => GeneralCategory::LineSeparator, - "Zp" => GeneralCategory::ParagraphSeparator, - "Cc" => GeneralCategory::Control, - "Cf" => GeneralCategory::Format, - "Co" => GeneralCategory::PrivateUse, - "Cs" => GeneralCategory::Surrogate, - "Pd" => GeneralCategory::DashPunctuation, - "Ps" => GeneralCategory::OpenPunctuation, - "Pe" => GeneralCategory::ClosePunctuation, - "Pc" => GeneralCategory::ConnectorPunctuation, - "Pi" => GeneralCategory::InitialPunctuation, - "Pf" => GeneralCategory::FinalPunctuation, - "Po" => GeneralCategory::OtherPunctuation, - "Sm" => GeneralCategory::MathSymbol, - "Sc" => GeneralCategory::CurrencySymbol, - "Sk" => GeneralCategory::ModifierSymbol, - "So" => GeneralCategory::OtherSymbol, - invalid => unreachable!("Unicode data contains valid properties: {invalid}"), - } -} - -fn parse_eaw(id: &str) -> &'static str { - match id.trim() { - "N" => "EastAsianWidth::Neutral", - "A" => "EastAsianWidth::Ambiguous", - "H" => "EastAsianWidth::Halfwidth", - "F" => "EastAsianWidth::Fullwidth", - "Na" => "EastAsianWidth::Narrow", - "W" => "EastAsianWidth::Wide", - invalid => unreachable!("Unicode data contains valid properties: {invalid}"), - } -} - -fn parse_bidi(id: &str) -> &'static str { - match id.trim() { - "L" => "BidiClass::LeftToRight", - "R" => "BidiClass::RightToLeft", - "EN" => "BidiClass::EuropeanNumber", - "ES" => "BidiClass::EuropeanSeparator", - "ET" => "BidiClass::EuropeanTerminator", - "AN" => "BidiClass::ArabicNumber", - "CS" => "BidiClass::CommonSeparator", - "B" => "BidiClass::ParagraphSeparator", - "S" => "BidiClass::SegmentSeparator", - "WS" => "BidiClass::WhiteSpace", - "ON" => "BidiClass::OtherNeutral", - "LRE" => "BidiClass::LeftToRightEmbedding", - "LRO" => "BidiClass::LeftToRightOverride", - "AL" => "BidiClass::ArabicLetter", - "RLE" => "BidiClass::RightToLeftEmbedding", - "RLO" => "BidiClass::RightToLeftOverride", - "PDF" => "BidiClass::PopDirectionalFormat", - "NSM" => "BidiClass::NonspacingMark", - "BN" => "BidiClass::BoundaryNeutral", - "FSI" => "BidiClass::FirstStrongIsolate", - "LRI" => "BidiClass::LeftToRightIsolate", - "RLI" => "BidiClass::RightToLeftIsolate", - "PDI" => "BidiClass::PopDirectionalIsolate", - invalid => unreachable!("Unicode data contains valid properties: {invalid}"), - } -} - -fn parse_numeric_type_val(val: NumericType) -> &'static str { - match val { - NumericType::None => "none", - NumericType::Decimal => "decimal", - NumericType::Digit => "digit", - NumericType::Numeric => "numeric", - _ => unreachable!("Unicode data contains valid properties"), - } -} - -fn parse_numeric_type_str(id: &str) -> &'static str { - match id { - "none" => "NumericType::None", - "decimal" => "NumericType::Decimal", - "digit" => "NumericType::Digit", - "numeric" => "NumericType::Numeric", - invalid => unreachable!("Unicode data contains valid properties: {invalid}"), - } -} - -#[derive(Debug, Default)] -enum DecompositionType { - #[default] - Canonical, - Compat, - Circle, - Final, - Font, - Fraction, - Initial, - Isolated, - Medial, - Narrow, - Nobreak, - Small, - Square, - Sub, - Super, - Vertical, - Wide, -} - -fn parse_decomp_type(id: &str) -> DecompositionType { - match id { - "canonical" => DecompositionType::Canonical, - "compat" => DecompositionType::Compat, - "circle" => DecompositionType::Circle, - "final" => DecompositionType::Final, - "font" => DecompositionType::Font, - "fraction" => DecompositionType::Fraction, - "initial" => DecompositionType::Initial, - "isolated" => DecompositionType::Isolated, - "medial" => DecompositionType::Medial, - "narrow" => DecompositionType::Narrow, - "noBreak" => DecompositionType::Nobreak, - "small" => DecompositionType::Small, - "square" => DecompositionType::Square, - "sub" => DecompositionType::Sub, - "super" => DecompositionType::Super, - "vertical" => DecompositionType::Vertical, - "wide" => DecompositionType::Wide, - invalid => unreachable!("Unicode data contains valid properties: {invalid}"), - } -} +// spell-checker:ignore ossl osslconf fn main() { println!(r#"cargo::rustc-check-cfg=cfg(osslconf, values("OPENSSL_NO_COMP"))"#); @@ -655,16 +53,4 @@ fn main() { println!("cargo::rustc-cfg=openssl_vendored") } } - - println!("cargo:rerun-if-changed=unicode/ucd32"); - println!("cargo:rerun-if-changed=unicode/latest"); - - let t_32 = thread::spawn(generate_unicode_3_2); - let t_numeric_type = thread::spawn(generate_numeric_type); - let t_numeric_value = thread::spawn(generate_numeric_value); - let t_latest = thread::spawn(generate_unicode_latest); - t_32.join().unwrap(); - t_numeric_type.join().unwrap(); - t_numeric_value.join().unwrap(); - t_latest.join().unwrap(); } diff --git a/crates/stdlib/src/unicodedata.rs b/crates/stdlib/src/unicodedata.rs index 0d6e7b972..134332bc9 100644 --- a/crates/stdlib/src/unicodedata.rs +++ b/crates/stdlib/src/unicodedata.rs @@ -2,130 +2,26 @@ See also: https://docs.python.org/3/library/unicodedata.html */ -// spell-checker:ignore codep decomp DECOMP nfkc unistr unidata - -use core::{cmp::Ordering, hint::cold_path}; +// spell-checker:ignore nfkc unistr unidata pub(crate) use unicodedata::module_def; -use icu_properties::props::{ - BidiClass, CanonicalCombiningClass, EastAsianWidth, GeneralCategory, NumericType, -}; +use rustpython_unicode::{self as unicode_core, NormalizeForm}; use crate::vm::{ PyObject, PyResult, VirtualMachine, builtins::PyStr, convert::TryFromBorrowedObject, }; -include!(concat!(env!("OUT_DIR"), "/generated/unicode_3_2.rs")); -include!(concat!(env!("OUT_DIR"), "/generated/unicode_latest.rs")); -include!(concat!(env!("OUT_DIR"), "/generated/unicode_num_type.rs")); -include!(concat!( - env!("OUT_DIR"), - "/generated/unicode_numeric_value.rs" -)); +struct NormalizeFormArg(NormalizeForm); -#[derive(Clone, Copy)] -#[repr(u8)] -enum DecompositionType { - #[allow(unused)] - Canonical, - Compat, - Circle, - Final, - Font, - Fraction, - Initial, - Isolated, - Medial, - Narrow, - Nobreak, - Small, - Square, - Sub, - Super, - Vertical, - Wide, -} - -impl DecompositionType { - const fn type_tag(self) -> &'static str { - match self { - Self::Canonical => "canonical", - Self::Compat => "compat", - Self::Circle => "circle", - Self::Final => "final", - Self::Font => "font", - Self::Fraction => "fraction", - Self::Initial => "initial", - Self::Isolated => "isolated", - Self::Medial => "medial", - Self::Narrow => "narrow", - Self::Nobreak => "noBreak", - Self::Small => "small", - Self::Square => "square", - Self::Sub => "sub", - Self::Super => "super", - Self::Vertical => "vertical", - Self::Wide => "wide", - } - } -} - -#[derive(Clone, Copy, Eq, PartialEq)] -enum NormalizeForm { - Nfc, - Nfkc, - Nfd, - Nfkd, -} - -fn lookup_property<T: Copy>(table: &[(u32, u32, T)], ch: char) -> Option<T> { - let ch = ch as u32; - table - .binary_search_by(|&(start, end, _)| { - if ch > end { - Ordering::Less - } else if ch < start { - Ordering::Greater - } else { - Ordering::Equal - } - }) - .ok() - .map(|i| table[i].2) -} - -fn lookup_numeric_val(ch: char, modern: bool) -> Option<f64> { - if modern { - lookup_property(NUMERIC_VALUES, ch) - } else { - cold_path(); - lookup_property(NUMERIC_VALUES_DIFF, ch).or_else(|| { - NUMERIC_VAL_EXISTS_32 - .binary_search_by(|&(start, end)| { - let ch = ch as u32; - if ch > end { - Ordering::Less - } else if ch < start { - Ordering::Greater - } else { - Ordering::Equal - } - }) - .ok() - .and_then(|_| lookup_property(NUMERIC_VALUES, ch)) - }) - } -} - -impl<'a> TryFromBorrowedObject<'a> for NormalizeForm { +impl<'a> TryFromBorrowedObject<'a> for NormalizeFormArg { fn try_from_borrowed_object(vm: &VirtualMachine, obj: &'a PyObject) -> PyResult<Self> { obj.try_value_with( |form: &PyStr| match form.as_bytes() { - b"NFC" => Ok(Self::Nfc), - b"NFKC" => Ok(Self::Nfkc), - b"NFD" => Ok(Self::Nfd), - b"NFKD" => Ok(Self::Nfkd), + b"NFC" => Ok(Self(NormalizeForm::Nfc)), + b"NFKC" => Ok(Self(NormalizeForm::Nfkc)), + b"NFD" => Ok(Self(NormalizeForm::Nfd)), + b"NFKD" => Ok(Self(NormalizeForm::Nfkd)), _ => Err(vm.new_value_error("invalid normalization form")), }, vm, @@ -135,27 +31,12 @@ impl<'a> TryFromBorrowedObject<'a> for NormalizeForm { #[pymodule] mod unicodedata { - use core::{cmp::Ordering, fmt::Write, hint::cold_path}; - - use super::{ - BIDI_CLASS, BIDI_MIRRORED, COMBINING_CLASS, DECOMP_COMPAT, DECOMP_RANGE, DECOMP_UPDATES, - EAST_ASIAN_WIDTH, GENERAL_CATEGORY, NUMERIC_TYPE_DIFF, NormalizeForm, lookup_numeric_val, - lookup_property, - }; + use super::{NormalizeFormArg, unicode_core}; use crate::vm::{ Py, PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine, builtins::{PyModule, PyStrRef}, function::OptionalArg, }; - - use icu_normalizer::{ - ComposingNormalizerBorrowed, DecomposingNormalizerBorrowed, - properties::{CanonicalDecomposition, Decomposed}, - }; - use icu_properties::props::{ - BidiClass, BidiMirrored, BinaryProperty, CanonicalCombiningClass, EastAsianWidth, - EnumeratedProperty, GeneralCategory, NamedEnumeratedProperty, NumericType, - }; use itertools::Itertools; use rustpython_common::wtf8::{CodePoint, Wtf8Buf}; @@ -190,12 +71,14 @@ mod unicodedata { #[pyclass(name = "UCD")] #[derive(Debug, PyPayload)] pub(super) struct Ucd { - modern: bool, + inner: unicode_core::Ucd, } impl Ucd { pub(super) const fn new(modern: bool) -> Self { - Self { modern } + Self { + inner: unicode_core::Ucd::new(modern), + } } fn extract_char(&self, character: PyStrRef, vm: &VirtualMachine) -> PyResult<CodePoint> { @@ -211,26 +94,14 @@ mod unicodedata { impl Ucd { #[pymethod] fn category(&self, character: PyStrRef, vm: &VirtualMachine) -> PyResult<&'static str> { - self.extract_char(character, vm).map(|c| { - let Some(c) = c.to_char() else { - return GeneralCategory::Surrogate.short_name(); - }; - if self.modern { - Some(GeneralCategory::for_char(c)) - } else { - cold_path(); - lookup_property(GENERAL_CATEGORY, c) - } - .unwrap_or(GeneralCategory::Unassigned) - .short_name() - }) + self.extract_char(character, vm) + .map(|c| self.inner.category(c)) } - // TODO: Names needs to account for Unicode 3.2.0 and 16.0.0 #[pymethod] fn lookup(&self, name: PyStrRef, vm: &VirtualMachine) -> PyResult<String> { if let Some(name_str) = name.to_str() - && let Some(character) = unicode_names2::character(name_str) + && let Some(character) = unicode_core::lookup_character(name_str) { return Ok(character.to_string()); } @@ -241,7 +112,6 @@ mod unicodedata { )) } - // TODO: Names needs to account for Unicode 3.2.0 and 16.0.0 #[pymethod] fn name( &self, @@ -252,9 +122,9 @@ mod unicodedata { if let Some(name) = self .extract_char(character, vm)? .to_char() - .and_then(unicode_names2::name) + .and_then(unicode_core::character_name) { - return Ok(vm.ctx.new_str(name.to_string()).into()); + return Ok(vm.ctx.new_str(name).into()); } default.ok_or_else(|| vm.new_value_error("no such name")) } @@ -265,19 +135,8 @@ mod unicodedata { character: PyStrRef, vm: &VirtualMachine, ) -> PyResult<&'static str> { - self.extract_char(character, vm).map(|c| { - c.to_char() - .and_then(|c| { - if self.modern { - Some(BidiClass::for_char(c)) - } else { - cold_path(); - lookup_property(BIDI_CLASS, c) - } - }) - .unwrap_or(BidiClass::LeftToRight) - .short_name() - }) + self.extract_char(character, vm) + .map(|c| self.inner.bidirectional(c)) } #[pymethod] @@ -286,180 +145,36 @@ mod unicodedata { character: PyStrRef, vm: &VirtualMachine, ) -> PyResult<&'static str> { - self.extract_char(character, vm).map(|c| { - c.to_char() - .and_then(|c| { - if self.modern { - Some(EastAsianWidth::for_char(c)) - } else { - cold_path(); - // CPython overrides characters in the PUA for 3.2.0. - // Basic Multilingual Plane: - // https://en.wikipedia.org/wiki/Plane_(Unicode)#Basic_Multilingual_Plane - // https://en.wikipedia.org/wiki/Private_Use_Areas - // https://www.unicode.org/reports/tr11/tr11-10.html - // https://www.unicode.org/reports/tr11/ - // - // Currently, this implementation is incomplete because I can't figure - // out what CPython is doing. - lookup_property(EAST_ASIAN_WIDTH, c) - } - }) - .unwrap_or(EastAsianWidth::Neutral) - .short_name() - }) + self.extract_char(character, vm) + .map(|c| self.inner.east_asian_width(c)) } #[pymethod] - fn normalize(&self, form: super::NormalizeForm, unistr: PyStrRef) -> Wtf8Buf { - let text = unistr.as_wtf8(); - match form { - NormalizeForm::Nfc => { - let normalizer = ComposingNormalizerBorrowed::new_nfc(); - text.map_utf8(|s| normalizer.normalize_iter(s.chars())) - .collect() - } - NormalizeForm::Nfkc => { - let normalizer = ComposingNormalizerBorrowed::new_nfkc(); - text.map_utf8(|s| normalizer.normalize_iter(s.chars())) - .collect() - } - NormalizeForm::Nfd => { - let normalizer = DecomposingNormalizerBorrowed::new_nfd(); - text.map_utf8(|s| normalizer.normalize_iter(s.chars())) - .collect() - } - NormalizeForm::Nfkd => { - let normalizer = DecomposingNormalizerBorrowed::new_nfkd(); - text.map_utf8(|s| normalizer.normalize_iter(s.chars())) - .collect() - } - } + fn normalize(&self, form: NormalizeFormArg, unistr: PyStrRef) -> Wtf8Buf { + unicode_core::normalize(form.0, unistr.as_wtf8()) } #[pymethod] - fn is_normalized(&self, form: super::NormalizeForm, unistr: PyStrRef) -> bool { - match form { - NormalizeForm::Nfc => { - ComposingNormalizerBorrowed::new_nfc().is_normalized_utf8(unistr.as_bytes()) - } - NormalizeForm::Nfkc => { - ComposingNormalizerBorrowed::new_nfkc().is_normalized_utf8(unistr.as_bytes()) - } - NormalizeForm::Nfd => { - DecomposingNormalizerBorrowed::new_nfd().is_normalized_utf8(unistr.as_bytes()) - } - NormalizeForm::Nfkd => { - DecomposingNormalizerBorrowed::new_nfkd().is_normalized_utf8(unistr.as_bytes()) - } - } + fn is_normalized(&self, form: NormalizeFormArg, unistr: PyStrRef) -> bool { + unicode_core::is_normalized(form.0, unistr.as_wtf8()) } #[pymethod] fn mirrored(&self, character: PyStrRef, vm: &VirtualMachine) -> PyResult<i32> { - self.extract_char(character, vm).map(|c| { - c.to_char().map_or(0, |c| { - (if self.modern { - BidiMirrored::for_char(c) - } else { - cold_path(); - let c = c as u32; - BIDI_MIRRORED - .binary_search_by(|&(start, end)| { - if c > end { - Ordering::Less - } else if c < start { - Ordering::Greater - } else { - Ordering::Equal - } - }) - .is_ok() - }) as i32 - }) - }) + self.extract_char(character, vm) + .map(|c| self.inner.mirrored(c)) } #[pymethod] fn combining(&self, character: PyStrRef, vm: &VirtualMachine) -> PyResult<u8> { - self.extract_char(character, vm).map(|c| { - c.to_char() - .and_then(|c| { - if self.modern { - Some(CanonicalCombiningClass::for_char(c)) - } else { - cold_path(); - lookup_property(COMBINING_CLASS, c) - } - }) - .unwrap_or(CanonicalCombiningClass::NotReordered) - .to_icu4c_value() - }) + self.extract_char(character, vm) + .map(|c| self.inner.combining(c)) } #[pymethod] fn decomposition(&self, character: PyStrRef, vm: &VirtualMachine) -> PyResult<String> { - let Some(ch) = self.extract_char(character, vm).map(CodePoint::to_char)? else { - return Ok(String::new()); - }; - - // Decomposition is remarkable stable according to the normalization file, - // so the updates slice is very small - only about four char pairs. Linearly searching - // it is very fast. The file lists the original, incorrect decomp and the fixed char. - // For 3.2.0, we use the original decomp for compatibility while ignoring the update. - // - // Finally, we don't have to do anything for the latest UCD as it's already updated. - if self.modern - && let Some((_, original)) = DECOMP_UPDATES - .iter() - .find(|&&(codep, _original)| codep == ch as u32) - { - Ok(format!("{original:04X}")) - } else if let Ok(i) = - DECOMP_COMPAT.binary_search_by_key(&(ch as u32), |&(codep, _, _)| codep) - { - // Compatibility decomposition - // `icu4x` doesn't expose a non-recursive, compatibility decomposer so we - // have to do it manually for now. - let tag = DECOMP_COMPAT[i].1.type_tag(); - let end = DECOMP_COMPAT[i].2; - let start = i - .checked_sub(1) - .map(|i| DECOMP_COMPAT[i].2) - .unwrap_or_default(); - - let decomp = &DECOMP_RANGE[start..end]; - let cap = decomp.len() * 10 + decomp.len() + tag.len() + 1; - let mut out = String::with_capacity(cap); - - write!(out, "<{tag}>").unwrap(); - for ch in decomp { - write!(out, " {ch:04X}").unwrap(); - } - - Ok(out) - } else { - // Canonical decomposition - let decomposed = CanonicalDecomposition::new().decompose(ch); - match decomposed { - Decomposed::Default => Ok(String::new()), - Decomposed::Singleton(ch) => Ok(format!("{:04X}", ch as u32)), - Decomposed::Expansion(l, r) => Ok(format!("{:04X} {:04X}", l as u32, r as u32)), - } - } - } - - fn numeric_type_matches(&self, ch: CodePoint, expected: &[NumericType]) -> Option<char> { - let ch = ch.to_char()?; - - let actual = if self.modern { - NumericType::for_char(ch) - } else { - cold_path(); - lookup_property(NUMERIC_TYPE_DIFF, ch).unwrap_or_else(|| NumericType::for_char(ch)) - }; - - expected.contains(&actual).then_some(ch) + self.extract_char(character, vm) + .map(|c| self.inner.decomposition(c)) } #[pymethod] @@ -470,12 +185,9 @@ mod unicodedata { vm: &VirtualMachine, ) -> PyResult<Option<PyObjectRef>> { let ch = self.extract_char(character, vm)?; - let expected = [NumericType::Decimal, NumericType::Digit]; - self.numeric_type_matches(ch, &expected) - .and_then(|ch| { - let value = lookup_numeric_val(ch, true)?; - (value.trunc() == value).then(|| vm.ctx.new_int(value as u64).into()) - }) + self.inner + .digit(ch) + .map(|value| vm.ctx.new_int(value).into()) .or_else(|| default.present()) .map(Option::Some) .ok_or_else(|| vm.new_value_error("not a digit")) @@ -489,12 +201,9 @@ mod unicodedata { vm: &VirtualMachine, ) -> PyResult<Option<PyObjectRef>> { let ch = self.extract_char(character, vm)?; - let expected = [NumericType::Decimal]; - self.numeric_type_matches(ch, &expected) - .and_then(|ch| { - let value = lookup_numeric_val(ch, self.modern)?; - (value.trunc() == value).then(|| vm.ctx.new_int(value as u64).into()) - }) + self.inner + .decimal(ch) + .map(|value| vm.ctx.new_int(value).into()) .or_else(|| default.present()) .map(Option::Some) .ok_or_else(|| vm.new_value_error("not a decimal")) @@ -508,11 +217,9 @@ mod unicodedata { vm: &VirtualMachine, ) -> PyResult<Option<PyObjectRef>> { let ch = self.extract_char(character, vm)?; - let expected = &NumericType::ALL_VALUES[1..]; - self.numeric_type_matches(ch, expected) - .and_then(|ch| { - lookup_numeric_val(ch, self.modern).map(|value| vm.ctx.new_float(value).into()) - }) + self.inner + .numeric(ch) + .map(|value| vm.ctx.new_float(value).into()) .or_else(|| default.present()) .map(Option::Some) .ok_or_else(|| vm.new_value_error("not a numeric character")) @@ -520,16 +227,7 @@ mod unicodedata { #[pygetset] fn unidata_version(&self) -> String { - if self.modern { - format!( - "{}.{}.{}", - char::UNICODE_VERSION.0, - char::UNICODE_VERSION.1, - char::UNICODE_VERSION.2 - ) - } else { - "3.2.0".into() - } + self.inner.unidata_version() } } @@ -540,11 +238,6 @@ mod unicodedata { #[pyattr] fn unidata_version(_vm: &VirtualMachine) -> String { - format!( - "{}.{}.{}", - char::UNICODE_VERSION.0, - char::UNICODE_VERSION.1, - char::UNICODE_VERSION.2 - ) + unicode_core::unicode_version() } } diff --git a/crates/unicode/Cargo.toml b/crates/unicode/Cargo.toml new file mode 100644 index 000000000..678305ee0 --- /dev/null +++ b/crates/unicode/Cargo.toml @@ -0,0 +1,24 @@ +[package] +name = "rustpython-unicode" +description = "Runtime-independent CPython-compatible Unicode semantics and data for RustPython and related Python tooling." +edition = { workspace = true } +version = { workspace = true } +authors = { workspace = true } +repository = { workspace = true } +license = { workspace = true } +rust-version = { workspace = true } + +[dependencies] +rustpython-wtf8 = { workspace = true } + +icu_casemap = { workspace = true } +icu_properties = { workspace = true } +icu_normalizer = { workspace = true } +unicode_names2 = { workspace = true } +writeable = { workspace = true } + +[build-dependencies] +icu_properties = { workspace = true } + +[lints] +workspace = true diff --git a/crates/unicode/build.rs b/crates/unicode/build.rs new file mode 100644 index 000000000..3a82df85e --- /dev/null +++ b/crates/unicode/build.rs @@ -0,0 +1,612 @@ +// spell-checker:ignore decomp DECOMP + +extern crate alloc; + +use core::num::NonZeroUsize; + +use alloc::collections::{BTreeMap, BTreeSet}; + +use std::{ + env, + fs::{self, File}, + io::{self, BufRead, BufReader, BufWriter, Write}, + path::{Path, PathBuf}, + thread, +}; + +use icu_properties::props::{EnumeratedProperty, GeneralCategory, NumericType}; + +fn generate_unicode_3_2() { + let path = PathBuf::from(env::var("OUT_DIR").unwrap()) + .join("generated") + .join("unicode_3_2.rs"); + fs::create_dir_all(path.parent().unwrap()).unwrap(); + let mut writer = BufWriter::new(File::create(&path).unwrap()); + + let base = Path::new(env!("CARGO_MANIFEST_DIR")) + .join("unicode") + .join("ucd32"); + + write_derived( + &base, + "DerivedGeneralCategory-3.2.0.txt", + "GENERAL_CATEGORY", + "(u32, u32, GeneralCategory)", + NonZeroUsize::new(1).unwrap(), + &mut writer, + |start, end, id, _| { + let id = parse_general(id); + if id != GeneralCategory::Unassigned { + Some((start, end, id)) + } else { + None + } + }, + |writer, mut values| { + values.sort_unstable_by_key(|(start, _, _)| *start); + write!(writer, "[").unwrap(); + for (start, end, id) in values { + write!(writer, "({start}, {end}, GeneralCategory::{id:?}),").unwrap(); + } + write!(writer, "];").unwrap(); + }, + ); + + write_derived( + &base, + "DerivedEastAsianWidth-3.2.0.txt", + "EAST_ASIAN_WIDTH", + "(u32, u32, EastAsianWidth)", + NonZeroUsize::new(1).unwrap(), + &mut writer, + |start, end, id, _| { + let id = parse_eaw(id); + if id != "EastAsianWidth::Neutral" { + Some((start, end, id)) + } else { + None + } + }, + |writer, mut values| { + values.sort_unstable_by_key(|(start, _, _)| *start); + write!(writer, "[").unwrap(); + for (start, end, id) in values { + write!(writer, "({start}, {end}, {id}),").unwrap(); + } + write!(writer, "];").unwrap(); + }, + ); + + write_derived( + &base, + "DerivedBidiClass-3.2.0.txt", + "BIDI_CLASS", + "(u32, u32, BidiClass)", + NonZeroUsize::new(1).unwrap(), + &mut writer, + |start, end, id, _| { + let id = parse_bidi(id); + if id != "BidiClass::LeftToRight" { + Some((start, end, id)) + } else { + None + } + }, + |writer, mut values| { + values.sort_unstable_by_key(|(start, _, _)| *start); + write!(writer, "[").unwrap(); + for (start, end, id) in values { + write!(writer, "({start}, {end}, {id}),").unwrap(); + } + write!(writer, "];").unwrap(); + }, + ); + + write_derived( + &base, + "DerivedBinaryProperties-3.2.0.txt", + "BIDI_MIRRORED", + "(u32, u32)", + NonZeroUsize::new(1).unwrap(), + &mut writer, + |start, end, id, _| { + assert_eq!( + "Bidi_Mirrored", + id.trim(), + "DerivedBinaryProperties-3.2.0 only has Bidi_Mirrored" + ); + Some((start, end)) + }, + |writer, mut values| { + values.sort_unstable_by_key(|(start, _)| *start); + writeln!(writer, "{values:?};").unwrap(); + }, + ); + + write_derived( + &base, + "DerivedCombiningClass-3.2.0.txt", + "COMBINING_CLASS", + "(u32, u32, CanonicalCombiningClass)", + NonZeroUsize::new(1).unwrap(), + &mut writer, + |start, end, id, _| { + let id: u8 = id.parse().unwrap(); + if id == 0 { + return None; + } + Some((start, end, id)) + }, + |writer, mut values| { + values.sort_unstable_by_key(|(start, _, _)| *start); + write!(writer, "[").unwrap(); + for (start, end, id) in values { + write!( + writer, + "({start}, {end}, CanonicalCombiningClass::from_icu4c_value({id}))," + ) + .unwrap(); + } + writeln!(writer, "];").unwrap(); + }, + ); +} + +fn generate_numeric_type() { + let path = PathBuf::from(env::var("OUT_DIR").unwrap()) + .join("generated") + .join("unicode_num_type.rs"); + fs::create_dir_all(path.parent().unwrap()).unwrap(); + let mut writer = BufWriter::new(File::create(&path).unwrap()); + + let base = Path::new(env!("CARGO_MANIFEST_DIR")) + .join("unicode") + .join("ucd32"); + + write_derived( + &base, + "DerivedNumericType-3.2.0.txt", + "NUMERIC_TYPE_DIFF", + "(u32, u32, NumericType)", + NonZeroUsize::new(1).unwrap(), + &mut writer, + |start, end, id, _| { + let id = parse_numeric_type_str(id); + let differs = (start..=end).any(|c| match char::from_u32(c) { + Some(c) => { + let modern = parse_numeric_type_val(NumericType::for_char(c)); + modern != id + } + None => true, + }); + + if differs { + Some((start, end, id)) + } else { + None + } + }, + |writer, mut values| { + values.sort_unstable_by_key(|(start, _, _)| *start); + write!(writer, "[").unwrap(); + for (start, end, id) in values { + write!(writer, "({start}, {end}, {id}),").unwrap(); + } + writeln!(writer, "];").unwrap(); + }, + ); +} + +fn generate_numeric_value() { + let path = PathBuf::from(env::var("OUT_DIR").unwrap()) + .join("generated") + .join("unicode_numeric_value.rs"); + fs::create_dir_all(path.parent().unwrap()).unwrap(); + let mut writer = BufWriter::new(File::create(&path).unwrap()); + + // Ideally, this would store the diffs between the two tables. However, we need 3.2.0 + // membership as well as different chars. The final tables are both smaller than storing the + // full 3.2.0 value table. + let ucd32 = Path::new(env!("CARGO_MANIFEST_DIR")) + .join("unicode") + .join("ucd32"); + let mut ucd32_diffs = BTreeMap::new(); + let mut ucd32_member = BTreeSet::new(); + let numeric_32 = + BufReader::new(File::open(ucd32.join("DerivedNumericValues-3.2.0.txt")).unwrap()); + parse_unicode_3_2( + numeric_32, + NonZeroUsize::new(1).unwrap(), + &mut io::empty(), + |start, end, value, _| { + let value: f64 = value + .parse() + .expect("Unicode data contains valid properties"); + ucd32_diffs.insert((start, end), value); + ucd32_member.insert((start, end)); + Option::<()>::None + }, + |_writer, _values| {}, + ); + + let ucd_latest = Path::new(env!("CARGO_MANIFEST_DIR")) + .join("unicode") + .join("latest"); + + write_derived( + &ucd_latest, + "DerivedNumericValues.txt", + "NUMERIC_VALUES", + "(u32, u32, f64)", + NonZeroUsize::new(1).unwrap(), + &mut writer, + |start, end, value, _| { + let value: f64 = value + .parse() + .expect("Unicode data contains valid properties"); + + if ucd32_diffs + .get(&(start, end)) + .is_some_and(|old_v| *old_v == value) + { + ucd32_diffs.remove(&(start, end)); + } + + Some((start, end, value)) + }, + |writer, mut values| { + values.sort_unstable_by_key(|(ch, _, _)| *ch); + writeln!(writer, "{values:?};").unwrap(); + }, + ); + + // TODO: More flexible parser + writeln!( + writer, + "static NUMERIC_VALUES_DIFF: &[(u32, u32, f64)] = &[" + ) + .unwrap(); + for ((start, end), value) in ucd32_diffs { + write!(writer, "({start}, {end}, {value:?}),").unwrap(); + } + writeln!(writer, "];").unwrap(); + + // Compress membership table + let mut iter = ucd32_member.iter(); + let &(mut start_prev, mut end_prev) = iter.next().unwrap(); + let mut membership = Vec::new(); + + for &(start, end) in iter { + if start <= end_prev + 1 { + end_prev = end_prev.max(end); + } else { + membership.push((start_prev, end_prev)); + start_prev = start; + end_prev = end; + } + } + membership.push((start_prev, end_prev)); + membership.sort_unstable_by_key(|&(start, _)| start); + + writeln!(writer, "static NUMERIC_VAL_EXISTS_32: &[(u32, u32)] = &").unwrap(); + write!(writer, "{membership:?};").unwrap(); +} + +fn generate_unicode_latest() { + let path = PathBuf::from(env::var("OUT_DIR").unwrap()) + .join("generated") + .join("unicode_latest.rs"); + fs::create_dir_all(path.parent().unwrap()).unwrap(); + let mut writer = BufWriter::new(File::create(&path).unwrap()); + + let base = Path::new(env!("CARGO_MANIFEST_DIR")) + .join("unicode") + .join("latest"); + + // NOTE: + // This ONLY parses compatibility decomposition because Python exposes the tags. The tags are + // the "<square>", "<circle>", et cetera bits before the decomposition. Thus, we can save space + // by using icu4x's CanonicalDecomposer for non-compatibility decomposition. + let mut decomp_ranges = Vec::new(); + write_derived( + &base, + "UnicodeData.txt", + "DECOMP_COMPAT", + "(u32, DecompositionType, usize)", + NonZeroUsize::new(5).unwrap(), + &mut writer, + |start, _end, value, _| { + // We're building a sparse array. Most characters don't decompose, so we don't + // need to literally store a row for each char. + if value.is_empty() { + return None; + } + + let (dtype, decomp) = value.split_once('>').map(|(dtype, decomp)| { + let dtype = dtype.strip_prefix('<').unwrap_or_else(|| { + panic!("Compatibility decomp; expected <tag>\n\tgot: {value}") + }); + ( + parse_decomp_type(dtype), + decomp + .split_whitespace() + .map(|s| u32::from_str_radix(s, 16).unwrap()), + ) + })?; + + decomp_ranges.extend(decomp); + let end = decomp_ranges.len(); + + Some((start, dtype, end)) + }, + |writer, values| { + // UnicodeData.txt should already be sorted + write!(writer, "[").unwrap(); + for (start, dtype, end) in values { + write!(writer, "({start}, DecompositionType::{dtype:?}, {end}),").unwrap(); + } + writeln!(writer, "];").unwrap(); + }, + ); + + writeln!(writer, "static DECOMP_RANGE: &[u32] = &{decomp_ranges:?};").unwrap(); + + // Normalization corrections is super small - only a handful chars at the time of writing. + write_derived( + &base, + "NormalizationCorrections.txt", + "DECOMP_UPDATES", + "(u32, u32)", + NonZeroUsize::new(1).unwrap(), + &mut writer, + |start, _end, value, line| { + let original = u32::from_str_radix(value.trim(), 16).unwrap_or_else(|e| { + panic!("field 2 of decomp corrections should be a char in hex: {value} {e}") + }); + let version = line + .rsplit(';') + .next() + .unwrap_or_else(|| { + panic!("field 4 of decomp corrections should be a UCD version: {line}") + }) + .split_once('#') + .unwrap() + .0 + .trim(); + + // `version` = when the char was updated. Therefore, we use the incorrect chars past + // 3.2.0 but skip the chars fixed in 3.2.0 because they'll already be right. + if version != "3.2.0" { + Some((start, original)) + } else { + None + } + }, + |writer, mut values| { + values.sort_unstable_by_key(|(c, _)| *c); + write!(writer, "{values:?};").unwrap(); + }, + ); +} + +#[expect(clippy::too_many_arguments)] +fn write_derived<W, P, FW, T>( + base: &Path, + file_name: &str, + static_name: &str, + array_type: &str, + field: NonZeroUsize, + writer: &mut W, + parse: P, + write_vec: FW, +) where + W: Write, + P: FnMut(u32, u32, &str, &str) -> Option<T>, + FW: FnMut(&mut W, Vec<T>), +{ + let path = base.join(file_name); + let reader = BufReader::new(File::open(path).unwrap()); + writeln!(writer, "static {static_name}: &[{array_type}] = &").unwrap(); + parse_unicode_3_2(reader, field, writer, parse, write_vec); +} + +/// Parse Unicode 3.2.0 property files. +fn parse_unicode_3_2<W, P, FW, T>( + reader: impl BufRead, + field: NonZeroUsize, + writer: &mut W, + mut parse: P, + mut write_vec: FW, +) where + W: Write, + P: FnMut(u32, u32, &str, &str) -> Option<T>, + FW: FnMut(&mut W, Vec<T>), +{ + let mut parsed = Vec::new(); + + for line in reader.lines().map(Result::unwrap) { + let line = line.trim(); + if line.is_empty() || line.starts_with('#') { + continue; + } + + let mut fields = line.split(';'); + let range = fields.next().expect("Unicode data is missing a char range"); + let id = fields + .nth(field.get().saturating_sub(1)) + .expect("Unicode data is missing a property"); + let (start, end) = match range.split_once("..") { + Some((left, right)) => { + let start = u32::from_str_radix(left.trim(), 16).unwrap(); + let end = u32::from_str_radix(right.trim(), 16).unwrap(); + (start, end) + } + None => { + let start = u32::from_str_radix(range.trim(), 16).unwrap(); + (start, start) + } + }; + + let id = id.split_once('#').map_or(id, |(left, _)| left).trim(); + if let Some(val) = parse(start, end, id, line) { + parsed.push(val); + } + } + write_vec(writer, parsed); +} + +fn parse_general(id: &str) -> GeneralCategory { + match id.trim() { + "Cn" => GeneralCategory::Unassigned, + "Lu" => GeneralCategory::UppercaseLetter, + "Ll" => GeneralCategory::LowercaseLetter, + "Lt" => GeneralCategory::TitlecaseLetter, + "Lm" => GeneralCategory::ModifierLetter, + "Lo" => GeneralCategory::OtherLetter, + "Mn" => GeneralCategory::NonspacingMark, + "Mc" => GeneralCategory::SpacingMark, + "Me" => GeneralCategory::EnclosingMark, + "Nd" => GeneralCategory::DecimalNumber, + "Nl" => GeneralCategory::LetterNumber, + "No" => GeneralCategory::OtherNumber, + "Zs" => GeneralCategory::SpaceSeparator, + "Zl" => GeneralCategory::LineSeparator, + "Zp" => GeneralCategory::ParagraphSeparator, + "Cc" => GeneralCategory::Control, + "Cf" => GeneralCategory::Format, + "Co" => GeneralCategory::PrivateUse, + "Cs" => GeneralCategory::Surrogate, + "Pd" => GeneralCategory::DashPunctuation, + "Ps" => GeneralCategory::OpenPunctuation, + "Pe" => GeneralCategory::ClosePunctuation, + "Pc" => GeneralCategory::ConnectorPunctuation, + "Pi" => GeneralCategory::InitialPunctuation, + "Pf" => GeneralCategory::FinalPunctuation, + "Po" => GeneralCategory::OtherPunctuation, + "Sm" => GeneralCategory::MathSymbol, + "Sc" => GeneralCategory::CurrencySymbol, + "Sk" => GeneralCategory::ModifierSymbol, + "So" => GeneralCategory::OtherSymbol, + invalid => unreachable!("Unicode data contains valid properties: {invalid}"), + } +} + +fn parse_eaw(id: &str) -> &'static str { + match id.trim() { + "N" => "EastAsianWidth::Neutral", + "A" => "EastAsianWidth::Ambiguous", + "H" => "EastAsianWidth::Halfwidth", + "F" => "EastAsianWidth::Fullwidth", + "Na" => "EastAsianWidth::Narrow", + "W" => "EastAsianWidth::Wide", + invalid => unreachable!("Unicode data contains valid properties: {invalid}"), + } +} + +fn parse_bidi(id: &str) -> &'static str { + match id.trim() { + "L" => "BidiClass::LeftToRight", + "R" => "BidiClass::RightToLeft", + "EN" => "BidiClass::EuropeanNumber", + "ES" => "BidiClass::EuropeanSeparator", + "ET" => "BidiClass::EuropeanTerminator", + "AN" => "BidiClass::ArabicNumber", + "CS" => "BidiClass::CommonSeparator", + "B" => "BidiClass::ParagraphSeparator", + "S" => "BidiClass::SegmentSeparator", + "WS" => "BidiClass::WhiteSpace", + "ON" => "BidiClass::OtherNeutral", + "LRE" => "BidiClass::LeftToRightEmbedding", + "LRO" => "BidiClass::LeftToRightOverride", + "AL" => "BidiClass::ArabicLetter", + "RLE" => "BidiClass::RightToLeftEmbedding", + "RLO" => "BidiClass::RightToLeftOverride", + "PDF" => "BidiClass::PopDirectionalFormat", + "NSM" => "BidiClass::NonspacingMark", + "BN" => "BidiClass::BoundaryNeutral", + "FSI" => "BidiClass::FirstStrongIsolate", + "LRI" => "BidiClass::LeftToRightIsolate", + "RLI" => "BidiClass::RightToLeftIsolate", + "PDI" => "BidiClass::PopDirectionalIsolate", + invalid => unreachable!("Unicode data contains valid properties: {invalid}"), + } +} + +fn parse_numeric_type_val(val: NumericType) -> &'static str { + match val { + NumericType::None => "none", + NumericType::Decimal => "decimal", + NumericType::Digit => "digit", + NumericType::Numeric => "numeric", + _ => unreachable!("Unicode data contains valid properties"), + } +} + +fn parse_numeric_type_str(id: &str) -> &'static str { + match id { + "none" => "NumericType::None", + "decimal" => "NumericType::Decimal", + "digit" => "NumericType::Digit", + "numeric" => "NumericType::Numeric", + invalid => unreachable!("Unicode data contains valid properties: {invalid}"), + } +} + +#[derive(Debug, Default)] +enum DecompositionType { + #[default] + Canonical, + Compat, + Circle, + Final, + Font, + Fraction, + Initial, + Isolated, + Medial, + Narrow, + Nobreak, + Small, + Square, + Sub, + Super, + Vertical, + Wide, +} + +fn parse_decomp_type(id: &str) -> DecompositionType { + match id { + "canonical" => DecompositionType::Canonical, + "compat" => DecompositionType::Compat, + "circle" => DecompositionType::Circle, + "final" => DecompositionType::Final, + "font" => DecompositionType::Font, + "fraction" => DecompositionType::Fraction, + "initial" => DecompositionType::Initial, + "isolated" => DecompositionType::Isolated, + "medial" => DecompositionType::Medial, + "narrow" => DecompositionType::Narrow, + "noBreak" => DecompositionType::Nobreak, + "small" => DecompositionType::Small, + "square" => DecompositionType::Square, + "sub" => DecompositionType::Sub, + "super" => DecompositionType::Super, + "vertical" => DecompositionType::Vertical, + "wide" => DecompositionType::Wide, + invalid => unreachable!("Unicode data contains valid properties: {invalid}"), + } +} + +fn main() { + println!("cargo:rerun-if-changed=unicode/ucd32"); + println!("cargo:rerun-if-changed=unicode/latest"); + + let t_32 = thread::spawn(generate_unicode_3_2); + let t_numeric_type = thread::spawn(generate_numeric_type); + let t_numeric_value = thread::spawn(generate_numeric_value); + let t_latest = thread::spawn(generate_unicode_latest); + t_32.join().unwrap(); + t_numeric_type.join().unwrap(); + t_numeric_value.join().unwrap(); + t_latest.join().unwrap(); +} diff --git a/crates/unicode/src/case.rs b/crates/unicode/src/case.rs new file mode 100644 index 000000000..872d0b29a --- /dev/null +++ b/crates/unicode/src/case.rs @@ -0,0 +1,69 @@ +//! Case folding for Python `str.casefold`. +//! +//! Lower, upper, and title casing of `str` objects stay with the runtime +//! because they iterate the string with special final-sigma handling. Case +//! folding has no such context dependence, so it lives here and is shared with +//! other runtimes. + +use alloc::{ + string::{String, ToString}, + vec::Vec, +}; + +use icu_casemap::CaseMapper; +use rustpython_wtf8::{Wtf8, Wtf8Buf, Wtf8Chunk}; +use writeable::Writeable; + +/// Full Unicode case fold of `text` (`str.casefold`). +#[must_use] +pub fn casefold_str(text: &str) -> String { + CaseMapper::new().fold_string(text).to_string() +} + +/// Full Unicode case fold of `text`, passing lone surrogates through unchanged. +#[must_use] +pub fn casefold_wtf8(text: &Wtf8) -> Wtf8Buf { + let mut out = Vec::with_capacity(text.len()); + let mapper = CaseMapper::new(); + for chunk in text.chunks() { + match chunk { + Wtf8Chunk::Utf8(s) => { + mapper + .fold(s) + .write_to(&mut FmtWriter(&mut out)) + .expect("writing to an in-memory buffer cannot fail"); + } + Wtf8Chunk::Surrogate(c) => { + let mut buf = Wtf8Buf::new(); + buf.push(c); + out.extend_from_slice(buf.as_bytes()); + } + } + } + // SAFETY: + // * CaseMapper only produces valid UTF-8. + // * Surrogates are appended as valid WTF-8 (encoded via Wtf8Buf::push). + unsafe { Wtf8Buf::from_bytes_unchecked(out) } +} + +/// Adapter so `icu`'s `Writeable` output can be appended to a byte buffer. +struct FmtWriter<'a>(&'a mut Vec<u8>); + +impl core::fmt::Write for FmtWriter<'_> { + fn write_str(&mut self, s: &str) -> core::fmt::Result { + self.0.extend_from_slice(s.as_bytes()); + Ok(()) + } +} + +#[cfg(test)] +mod tests { + use super::casefold_str; + + #[test] + fn casefold_full_mappings() { + // ß case-folds to "ss" + assert_eq!(casefold_str("ß"), "ss"); + assert_eq!(casefold_str("Σ"), "σ"); + } +} diff --git a/crates/unicode/src/classify.rs b/crates/unicode/src/classify.rs new file mode 100644 index 000000000..7a333763a --- /dev/null +++ b/crates/unicode/src/classify.rs @@ -0,0 +1,116 @@ +//! Character classification predicates for Python `str` methods. +//! +//! Each predicate operates on a single Unicode scalar. Callers iterating over +//! WTF-8 text apply these per code point, treating lone surrogates as failing +//! every predicate. + +use icu_properties::props::{ + BidiClass, EnumeratedProperty, GeneralCategory, GeneralCategoryGroup, NumericType, +}; + +/// `str.isalpha` for a single character: any `Letter` general category. +#[must_use] +pub fn is_alpha(c: char) -> bool { + GeneralCategoryGroup::Letter.contains(GeneralCategory::for_char(c)) +} + +/// `str.isalnum` for a single character: any `Letter` or `Number` category. +#[must_use] +pub fn is_alnum(c: char) -> bool { + GeneralCategoryGroup::Letter + .union(GeneralCategoryGroup::Number) + .contains(GeneralCategory::for_char(c)) +} + +/// `str.isdecimal` for a single character: `Decimal_Number` general category. +#[must_use] +pub fn is_decimal(c: char) -> bool { + matches!(GeneralCategory::for_char(c), GeneralCategory::DecimalNumber) +} + +/// `str.isdigit` for a single character: `Numeric_Type` of `Digit` or `Decimal`. +#[must_use] +pub fn is_digit(c: char) -> bool { + matches!( + NumericType::for_char(c), + NumericType::Digit | NumericType::Decimal + ) +} + +/// `str.isnumeric` for a single character: any numeric `Numeric_Type`. +#[must_use] +pub fn is_numeric(c: char) -> bool { + matches!( + NumericType::for_char(c), + NumericType::Decimal | NumericType::Digit | NumericType::Numeric + ) +} + +/// `str.isspace` for a single character: `Space_Separator`, or a bidi +/// whitespace / paragraph / segment separator. +#[must_use] +pub fn is_space(c: char) -> bool { + matches!( + GeneralCategory::for_char(c), + GeneralCategory::SpaceSeparator + ) || matches!( + BidiClass::for_char(c), + BidiClass::WhiteSpace | BidiClass::ParagraphSeparator | BidiClass::SegmentSeparator + ) +} + +/// `str.isprintable` for a single character: ASCII space is printable, as are +/// all characters that survive [`is_repr_printable`]. +#[must_use] +pub fn is_printable(c: char) -> bool { + c == '\u{0020}' || is_repr_printable(c) +} + +/// Repr/escape printable semantics. +/// +/// The following categories are not printable: +/// * Cc (Other, Control) +/// * Cf (Other, Format) +/// * Cs (Other, Surrogate) +/// * Co (Other, Private Use) +/// * Cn (Other, Not Assigned) +/// * Zl (Separator, Line) +/// * Zp (Separator, Paragraph) +/// * Zs (Separator, Space), including ASCII space +#[must_use] +pub fn is_repr_printable(c: char) -> bool { + !matches!( + GeneralCategory::for_char(c), + GeneralCategory::SpaceSeparator + | GeneralCategory::LineSeparator + | GeneralCategory::ParagraphSeparator + | GeneralCategory::Control + | GeneralCategory::Format + | GeneralCategory::Surrogate + | GeneralCategory::PrivateUse + | GeneralCategory::Unassigned + ) +} + +#[cfg(test)] +mod tests { + use super::{is_decimal, is_digit, is_numeric}; + + #[test] + fn numeric_type_chain_holds() { + // isdecimal ⊂ isdigit ⊂ isnumeric + for c in ('\0'..='\u{2FFFF}').filter_map(|c| char::from_u32(c as u32)) { + if is_decimal(c) { + assert!(is_digit(c), "{c:?} decimal but not digit"); + } + if is_digit(c) { + assert!(is_numeric(c), "{c:?} digit but not numeric"); + } + } + assert!(is_decimal('5')); + assert!(!is_decimal('²')); + assert!(is_digit('²')); + assert!(!is_digit('⅓')); + assert!(is_numeric('⅓')); + } +} diff --git a/crates/unicode/src/data.rs b/crates/unicode/src/data.rs new file mode 100644 index 000000000..83d81612b --- /dev/null +++ b/crates/unicode/src/data.rs @@ -0,0 +1,373 @@ +//! Access to the Unicode character database (`unicodedata`). +//! +//! Owns the generated Unicode 3.2.0 / latest tables and the +//! `icu4x`/`unicode_names2` lookups behind them. + +// spell-checker:ignore codep decomp DECOMP unidata + +use core::{cmp::Ordering, fmt::Write, hint::cold_path}; + +use alloc::{ + format, + string::{String, ToString}, +}; + +use icu_normalizer::properties::{CanonicalDecomposition, Decomposed}; +use icu_properties::props::{ + BidiClass, BidiMirrored, BinaryProperty, CanonicalCombiningClass, EastAsianWidth, + EnumeratedProperty, GeneralCategory, NamedEnumeratedProperty, NumericType, +}; +use rustpython_wtf8::CodePoint; + +include!(concat!(env!("OUT_DIR"), "/generated/unicode_3_2.rs")); +include!(concat!(env!("OUT_DIR"), "/generated/unicode_latest.rs")); +include!(concat!(env!("OUT_DIR"), "/generated/unicode_num_type.rs")); +include!(concat!( + env!("OUT_DIR"), + "/generated/unicode_numeric_value.rs" +)); + +#[derive(Clone, Copy)] +enum DecompositionType { + Compat, + Circle, + Final, + Font, + Fraction, + Initial, + Isolated, + Medial, + Narrow, + Nobreak, + Small, + Square, + Sub, + Super, + Vertical, + Wide, +} + +impl DecompositionType { + const fn type_tag(self) -> &'static str { + match self { + Self::Compat => "compat", + Self::Circle => "circle", + Self::Final => "final", + Self::Font => "font", + Self::Fraction => "fraction", + Self::Initial => "initial", + Self::Isolated => "isolated", + Self::Medial => "medial", + Self::Narrow => "narrow", + Self::Nobreak => "noBreak", + Self::Small => "small", + Self::Square => "square", + Self::Sub => "sub", + Self::Super => "super", + Self::Vertical => "vertical", + Self::Wide => "wide", + } + } +} + +fn lookup_property<T: Copy>(table: &[(u32, u32, T)], ch: char) -> Option<T> { + let ch = ch as u32; + table + .binary_search_by(|&(start, end, _)| { + if ch > end { + Ordering::Less + } else if ch < start { + Ordering::Greater + } else { + Ordering::Equal + } + }) + .ok() + .map(|i| table[i].2) +} + +fn lookup_numeric_val(ch: char, modern: bool) -> Option<f64> { + if modern { + lookup_property(NUMERIC_VALUES, ch) + } else { + cold_path(); + lookup_property(NUMERIC_VALUES_DIFF, ch).or_else(|| { + NUMERIC_VAL_EXISTS_32 + .binary_search_by(|&(start, end)| { + let ch = ch as u32; + if ch > end { + Ordering::Less + } else if ch < start { + Ordering::Greater + } else { + Ordering::Equal + } + }) + .ok() + .and_then(|_| lookup_property(NUMERIC_VALUES, ch)) + }) + } +} + +/// The version string of the latest Unicode database bundled with the standard +/// library (`unicodedata.unidata_version`). +#[must_use] +pub fn unicode_version() -> String { + format!( + "{}.{}.{}", + char::UNICODE_VERSION.0, + char::UNICODE_VERSION.1, + char::UNICODE_VERSION.2 + ) +} + +/// Look up a character by its Unicode name (`unicodedata.lookup`). +pub use unicode_names2::character as lookup_character; + +/// The Unicode name of `ch` (`unicodedata.name`), if any. +#[must_use] +pub fn character_name(ch: char) -> Option<String> { + unicode_names2::name(ch).map(|name| name.to_string()) +} + +/// A view over the Unicode character database at a fixed version. +/// +/// `modern` selects the latest bundled UCD; otherwise the Unicode 3.2.0 tables +/// used by `unicodedata.ucd_3_2_0` are consulted. +#[derive(Debug, Clone, Copy)] +pub struct Ucd { + modern: bool, +} + +impl Ucd { + #[must_use] + pub const fn new(modern: bool) -> Self { + Self { modern } + } + + #[must_use] + pub fn category(&self, c: CodePoint) -> &'static str { + let Some(c) = c.to_char() else { + return GeneralCategory::Surrogate.short_name(); + }; + if self.modern { + Some(GeneralCategory::for_char(c)) + } else { + cold_path(); + lookup_property(GENERAL_CATEGORY, c) + } + .unwrap_or(GeneralCategory::Unassigned) + .short_name() + } + + #[must_use] + pub fn bidirectional(&self, c: CodePoint) -> &'static str { + c.to_char() + .and_then(|c| { + if self.modern { + Some(BidiClass::for_char(c)) + } else { + cold_path(); + lookup_property(BIDI_CLASS, c) + } + }) + .unwrap_or(BidiClass::LeftToRight) + .short_name() + } + + #[must_use] + pub fn east_asian_width(&self, c: CodePoint) -> &'static str { + c.to_char() + .and_then(|c| { + if self.modern { + Some(EastAsianWidth::for_char(c)) + } else { + cold_path(); + // CPython overrides characters in the PUA for 3.2.0. + // Basic Multilingual Plane: + // https://en.wikipedia.org/wiki/Plane_(Unicode)#Basic_Multilingual_Plane + // https://en.wikipedia.org/wiki/Private_Use_Areas + // https://www.unicode.org/reports/tr11/tr11-10.html + // https://www.unicode.org/reports/tr11/ + // + // Currently, this implementation is incomplete because I can't figure + // out what CPython is doing. + lookup_property(EAST_ASIAN_WIDTH, c) + } + }) + .unwrap_or(EastAsianWidth::Neutral) + .short_name() + } + + #[must_use] + pub fn mirrored(&self, c: CodePoint) -> i32 { + c.to_char().map_or(0, |c| { + (if self.modern { + BidiMirrored::for_char(c) + } else { + cold_path(); + let c = c as u32; + BIDI_MIRRORED + .binary_search_by(|&(start, end)| { + if c > end { + Ordering::Less + } else if c < start { + Ordering::Greater + } else { + Ordering::Equal + } + }) + .is_ok() + }) as i32 + }) + } + + #[must_use] + pub fn combining(&self, c: CodePoint) -> u8 { + c.to_char() + .and_then(|c| { + if self.modern { + Some(CanonicalCombiningClass::for_char(c)) + } else { + cold_path(); + lookup_property(COMBINING_CLASS, c) + } + }) + .unwrap_or(CanonicalCombiningClass::NotReordered) + .to_icu4c_value() + } + + #[must_use] + pub fn decomposition(&self, c: CodePoint) -> String { + let Some(ch) = c.to_char() else { + return String::new(); + }; + + // Decomposition is remarkable stable according to the normalization file, + // so the updates slice is very small - only about four char pairs. Linearly searching + // it is very fast. The file lists the original, incorrect decomp and the fixed char. + // For 3.2.0, we use the original decomp for compatibility while ignoring the update. + // + // Finally, we don't have to do anything for the latest UCD as it's already updated. + if self.modern + && let Some((_, original)) = DECOMP_UPDATES + .iter() + .find(|&&(codep, _original)| codep == ch as u32) + { + format!("{original:04X}") + } else if let Ok(i) = + DECOMP_COMPAT.binary_search_by_key(&(ch as u32), |&(codep, _, _)| codep) + { + // Compatibility decomposition + // `icu4x` doesn't expose a non-recursive, compatibility decomposer so we + // have to do it manually for now. + let tag = DECOMP_COMPAT[i].1.type_tag(); + let end = DECOMP_COMPAT[i].2; + let start = i + .checked_sub(1) + .map(|i| DECOMP_COMPAT[i].2) + .unwrap_or_default(); + + let decomp = &DECOMP_RANGE[start..end]; + let cap = decomp.len() * 10 + decomp.len() + tag.len() + 1; + let mut out = String::with_capacity(cap); + + write!(out, "<{tag}>").unwrap(); + for ch in decomp { + write!(out, " {ch:04X}").unwrap(); + } + + out + } else { + // Canonical decomposition + let decomposed = CanonicalDecomposition::new().decompose(ch); + match decomposed { + Decomposed::Default => String::new(), + Decomposed::Singleton(ch) => format!("{:04X}", ch as u32), + Decomposed::Expansion(l, r) => format!("{:04X} {:04X}", l as u32, r as u32), + } + } + } + + fn numeric_type_matches(self, ch: CodePoint, expected: &[NumericType]) -> Option<char> { + let ch = ch.to_char()?; + + let actual = if self.modern { + NumericType::for_char(ch) + } else { + cold_path(); + lookup_property(NUMERIC_TYPE_DIFF, ch).unwrap_or_else(|| NumericType::for_char(ch)) + }; + + expected.contains(&actual).then_some(ch) + } + + /// The integer digit value of `c` (`unicodedata.digit`), if it has one. + #[must_use] + pub fn digit(&self, c: CodePoint) -> Option<u64> { + let expected = [NumericType::Decimal, NumericType::Digit]; + self.numeric_type_matches(c, &expected).and_then(|ch| { + let value = lookup_numeric_val(ch, true)?; + let int = value as u64; + (int as f64 == value).then_some(int) + }) + } + + /// The integer decimal value of `c` (`unicodedata.decimal`), if it has one. + #[must_use] + pub fn decimal(&self, c: CodePoint) -> Option<u64> { + let expected = [NumericType::Decimal]; + self.numeric_type_matches(c, &expected).and_then(|ch| { + let value = lookup_numeric_val(ch, self.modern)?; + let int = value as u64; + (int as f64 == value).then_some(int) + }) + } + + /// The numeric value of `c` (`unicodedata.numeric`), if it has one. + #[must_use] + pub fn numeric(&self, c: CodePoint) -> Option<f64> { + let expected = &NumericType::ALL_VALUES[1..]; + self.numeric_type_matches(c, expected) + .and_then(|ch| lookup_numeric_val(ch, self.modern)) + } + + #[must_use] + pub fn unidata_version(&self) -> String { + if self.modern { + unicode_version() + } else { + "3.2.0".into() + } + } +} + +#[cfg(test)] +mod tests { + use rustpython_wtf8::CodePoint; + + use super::{Ucd, character_name, lookup_character}; + + fn cp(ch: char) -> CodePoint { + CodePoint::from(ch) + } + + #[test] + fn data_queries_match_unicodedata_behavior() { + let ucd = Ucd::new(true); + assert_eq!(ucd.category(cp('A')), "Lu"); + assert_eq!(ucd.category(CodePoint::from_u32(0xD800).unwrap()), "Cs"); + assert_eq!(lookup_character("SNOWMAN"), Some('☃')); + assert_eq!(character_name('☃').as_deref(), Some("SNOWMAN")); + assert_eq!(ucd.decimal(cp('५')), Some(5)); + assert_eq!(ucd.digit(cp('²')), Some(2)); + let third = ucd.numeric(cp('⅓')).unwrap(); + assert!((third - 1.0 / 3.0).abs() < 1e-6, "got {third}"); + } + + #[test] + fn ucd_3_2_0_view_differs_from_modern() { + let legacy = Ucd::new(false); + assert_eq!(legacy.unidata_version(), "3.2.0"); + } +} diff --git a/crates/unicode/src/identifier.rs b/crates/unicode/src/identifier.rs new file mode 100644 index 000000000..413c722fe --- /dev/null +++ b/crates/unicode/src/identifier.rs @@ -0,0 +1,37 @@ +//! Python identifier predicates (`str.isidentifier`). + +use icu_properties::props::{BinaryProperty, XidContinue, XidStart}; + +/// Whether `c` has the `XID_Start` property. +#[must_use] +pub fn is_xid_start(c: char) -> bool { + XidStart::for_char(c) +} + +/// Whether `c` has the `XID_Continue` property. +#[must_use] +pub fn is_xid_continue(c: char) -> bool { + XidContinue::for_char(c) +} + +/// Whether `c` may start a Python identifier: `_` or `XID_Start`. +#[must_use] +pub fn is_start(c: char) -> bool { + c == '_' || is_xid_start(c) +} + +/// Whether `c` may continue a Python identifier: `XID_Continue`. +pub use is_xid_continue as is_continue; + +#[cfg(test)] +mod tests { + use super::{is_continue, is_start}; + + #[test] + fn identifier_predicates() { + assert!(is_start('_')); + assert!(is_start('가')); + assert!(!is_start('1')); + assert!(is_continue('1')); + } +} diff --git a/crates/unicode/src/lib.rs b/crates/unicode/src/lib.rs new file mode 100644 index 000000000..a3f3eceb1 --- /dev/null +++ b/crates/unicode/src/lib.rs @@ -0,0 +1,19 @@ +//! Runtime-independent CPython-compatible Unicode semantics and data. +//! +//! Every entry point operates on plain `char`/`u32`/`CodePoint`/`&Wtf8` values +//! so it can be shared by any Python runtime; argument extraction and Python +//! exception mapping stay with the caller. There is no global mutable state and +//! results depend only on inputs. + +#![no_std] + +extern crate alloc; + +pub mod case; +pub mod classify; +pub mod data; +pub mod identifier; +pub mod normalize; + +pub use data::{Ucd, character_name, lookup_character, unicode_version}; +pub use normalize::{NormalizeForm, is_normalized, normalize}; diff --git a/crates/unicode/src/normalize.rs b/crates/unicode/src/normalize.rs new file mode 100644 index 000000000..e2f80d024 --- /dev/null +++ b/crates/unicode/src/normalize.rs @@ -0,0 +1,111 @@ +//! Unicode normalization (`unicodedata.normalize` / `is_normalized`). + +// spell-checker:ignore nfkc + +use core::str::FromStr; + +use icu_normalizer::{ComposingNormalizerBorrowed, DecomposingNormalizerBorrowed}; +use rustpython_wtf8::{Wtf8, Wtf8Buf, Wtf8Chunk}; + +/// One of the four Unicode normalization forms. +#[derive(Debug, Clone, Copy, Eq, PartialEq)] +pub enum NormalizeForm { + Nfc, + Nfkc, + Nfd, + Nfkd, +} + +impl FromStr for NormalizeForm { + type Err = (); + + fn from_str(s: &str) -> Result<Self, Self::Err> { + match s { + "NFC" => Ok(Self::Nfc), + "NFKC" => Ok(Self::Nfkc), + "NFD" => Ok(Self::Nfd), + "NFKD" => Ok(Self::Nfkd), + _ => Err(()), + } + } +} + +/// Normalize `text` to `form` (`unicodedata.normalize`). +/// +/// Lone surrogates are passed through unchanged; only the valid UTF-8 runs are +/// normalized. +#[must_use] +pub fn normalize(form: NormalizeForm, text: &Wtf8) -> Wtf8Buf { + match form { + NormalizeForm::Nfc => { + let normalizer = ComposingNormalizerBorrowed::new_nfc(); + text.map_utf8(|s| normalizer.normalize_iter(s.chars())) + .collect() + } + NormalizeForm::Nfkc => { + let normalizer = ComposingNormalizerBorrowed::new_nfkc(); + text.map_utf8(|s| normalizer.normalize_iter(s.chars())) + .collect() + } + NormalizeForm::Nfd => { + let normalizer = DecomposingNormalizerBorrowed::new_nfd(); + text.map_utf8(|s| normalizer.normalize_iter(s.chars())) + .collect() + } + NormalizeForm::Nfkd => { + let normalizer = DecomposingNormalizerBorrowed::new_nfkd(); + text.map_utf8(|s| normalizer.normalize_iter(s.chars())) + .collect() + } + } +} + +/// Whether `text` is already in `form` (`unicodedata.is_normalized`). +/// +/// Lone surrogates split the text into valid UTF-8 runs; each run is checked +/// independently, matching the run-wise normalization performed by [`normalize`]. +#[must_use] +pub fn is_normalized(form: NormalizeForm, text: &Wtf8) -> bool { + let check: fn(&str) -> bool = match form { + NormalizeForm::Nfc => |s| ComposingNormalizerBorrowed::new_nfc().is_normalized(s), + NormalizeForm::Nfkc => |s| ComposingNormalizerBorrowed::new_nfkc().is_normalized(s), + NormalizeForm::Nfd => |s| DecomposingNormalizerBorrowed::new_nfd().is_normalized(s), + NormalizeForm::Nfkd => |s| DecomposingNormalizerBorrowed::new_nfkd().is_normalized(s), + }; + text.chunks().all(|chunk| match chunk { + Wtf8Chunk::Utf8(s) => check(s), + Wtf8Chunk::Surrogate(_) => true, + }) +} + +#[cfg(test)] +mod tests { + use rustpython_wtf8::{CodePoint, Wtf8Buf}; + + use super::{NormalizeForm, is_normalized, normalize}; + + #[test] + fn normalization_round_trips() { + let composed = Wtf8Buf::from("é"); + let decomposed = normalize(NormalizeForm::Nfd, &composed); + assert_eq!(normalize(NormalizeForm::Nfc, &decomposed), composed); + assert!(is_normalized( + NormalizeForm::Nfc, + Wtf8Buf::from("é").as_ref() + )); + assert!(!is_normalized( + NormalizeForm::Nfd, + Wtf8Buf::from("é").as_ref() + )); + } + + #[test] + fn is_normalized_skips_lone_surrogates() { + // A lone surrogate splits the text into UTF-8 runs; each run is checked + // independently, so a surrogate next to normalized text stays normalized. + let mut buf = Wtf8Buf::from("é"); + buf.push(CodePoint::from_u32(0xD800).unwrap()); + assert!(is_normalized(NormalizeForm::Nfc, &buf)); + assert!(!is_normalized(NormalizeForm::Nfd, &buf)); + } +} diff --git a/crates/unicode/tests/data/cpython3.14_predicates.txt b/crates/unicode/tests/data/cpython3.14_predicates.txt new file mode 100644 index 000000000..9339f4e47 --- /dev/null +++ b/crates/unicode/tests/data/cpython3.14_predicates.txt @@ -0,0 +1,9 @@ +# unidata_version 16.0.0 +isalpha 41:5A,61:7A,AA:AA,B5:B5,BA:BA,C0:D6,D8:F6,F8:2C1,2C6:2D1,2E0:2E4,2EC:2EC,2EE:2EE,370:374,376:377,37A:37D,37F:37F,386:386,388:38A,38C:38C,38E:3A1,3A3:3F5,3F7:481,48A:52F,531:556,559:559,560:588,5D0:5EA,5EF:5F2,620:64A,66E:66F,671:6D3,6D5:6D5,6E5:6E6,6EE:6EF,6FA:6FC,6FF:6FF,710:710,712:72F,74D:7A5,7B1:7B1,7CA:7EA,7F4:7F5,7FA:7FA,800:815,81A:81A,824:824,828:828,840:858,860:86A,870:887,889:88E,8A0:8C9,904:939,93D:93D,950:950,958:961,971:980,985:98C,98F:990,993:9A8,9AA:9B0,9B2:9B2,9B6:9B9,9BD:9BD,9CE:9CE,9DC:9DD,9DF:9E1,9F0:9F1,9FC:9FC,A05:A0A,A0F:A10,A13:A28,A2A:A30,A32:A33,A35:A36,A38:A39,A59:A5C,A5E:A5E,A72:A74,A85:A8D,A8F:A91,A93:AA8,AAA:AB0,AB2:AB3,AB5:AB9,ABD:ABD,AD0:AD0,AE0:AE1,AF9:AF9,B05:B0C,B0F:B10,B13:B28,B2A:B30,B32:B33,B35:B39,B3D:B3D,B5C:B5D,B5F:B61,B71:B71,B83:B83,B85:B8A,B8E:B90,B92:B95,B99:B9A,B9C:B9C,B9E:B9F,BA3:BA4,BA8:BAA,BAE:BB9,BD0:BD0,C05:C0C,C0E:C10,C12:C28,C2A:C39,C3D:C3D,C58:C5A,C5D:C5D,C60:C61,C80:C80,C85:C8C,C8E:C90,C92:CA8,CAA:CB3,CB5:CB9,CBD:CBD,CDD:CDE,CE0:CE1,CF1:CF2,D04:D0C,D0E:D10,D12:D3A,D3D:D3D,D4E:D4E,D54:D56,D5F:D61,D7A:D7F,D85:D96,D9A:DB1,DB3:DBB,DBD:DBD,DC0:DC6,E01:E30,E32:E33,E40:E46,E81:E82,E84:E84,E86:E8A,E8C:EA3,EA5:EA5,EA7:EB0,EB2:EB3,EBD:EBD,EC0:EC4,EC6:EC6,EDC:EDF,F00:F00,F40:F47,F49:F6C,F88:F8C,1000:102A,103F:103F,1050:1055,105A:105D,1061:1061,1065:1066,106E:1070,1075:1081,108E:108E,10A0:10C5,10C7:10C7,10CD:10CD,10D0:10FA,10FC:1248,124A:124D,1250:1256,1258:1258,125A:125D,1260:1288,128A:128D,1290:12B0,12B2:12B5,12B8:12BE,12C0:12C0,12C2:12C5,12C8:12D6,12D8:1310,1312:1315,1318:135A,1380:138F,13A0:13F5,13F8:13FD,1401:166C,166F:167F,1681:169A,16A0:16EA,16F1:16F8,1700:1711,171F:1731,1740:1751,1760:176C,176E:1770,1780:17B3,17D7:17D7,17DC:17DC,1820:1878,1880:1884,1887:18A8,18AA:18AA,18B0:18F5,1900:191E,1950:196D,1970:1974,1980:19AB,19B0:19C9,1A00:1A16,1A20:1A54,1AA7:1AA7,1B05:1B33,1B45:1B4C,1B83:1BA0,1BAE:1BAF,1BBA:1BE5,1C00:1C23,1C4D:1C4F,1C5A:1C7D,1C80:1C8A,1C90:1CBA,1CBD:1CBF,1CE9:1CEC,1CEE:1CF3,1CF5:1CF6,1CFA:1CFA,1D00:1DBF,1E00:1F15,1F18:1F1D,1F20:1F45,1F48:1F4D,1F50:1F57,1F59:1F59,1F5B:1F5B,1F5D:1F5D,1F5F:1F7D,1F80:1FB4,1FB6:1FBC,1FBE:1FBE,1FC2:1FC4,1FC6:1FCC,1FD0:1FD3,1FD6:1FDB,1FE0:1FEC,1FF2:1FF4,1FF6:1FFC,2071:2071,207F:207F,2090:209C,2102:2102,2107:2107,210A:2113,2115:2115,2119:211D,2124:2124,2126:2126,2128:2128,212A:212D,212F:2139,213C:213F,2145:2149,214E:214E,2183:2184,2C00:2CE4,2CEB:2CEE,2CF2:2CF3,2D00:2D25,2D27:2D27,2D2D:2D2D,2D30:2D67,2D6F:2D6F,2D80:2D96,2DA0:2DA6,2DA8:2DAE,2DB0:2DB6,2DB8:2DBE,2DC0:2DC6,2DC8:2DCE,2DD0:2DD6,2DD8:2DDE,2E2F:2E2F,3005:3006,3031:3035,303B:303C,3041:3096,309D:309F,30A1:30FA,30FC:30FF,3105:312F,3131:318E,31A0:31BF,31F0:31FF,3400:4DBF,4E00:A48C,A4D0:A4FD,A500:A60C,A610:A61F,A62A:A62B,A640:A66E,A67F:A69D,A6A0:A6E5,A717:A71F,A722:A788,A78B:A7CD,A7D0:A7D1,A7D3:A7D3,A7D5:A7DC,A7F2:A801,A803:A805,A807:A80A,A80C:A822,A840:A873,A882:A8B3,A8F2:A8F7,A8FB:A8FB,A8FD:A8FE,A90A:A925,A930:A946,A960:A97C,A984:A9B2,A9CF:A9CF,A9E0:A9E4,A9E6:A9EF,A9FA:A9FE,AA00:AA28,AA40:AA42,AA44:AA4B,AA60:AA76,AA7A:AA7A,AA7E:AAAF,AAB1:AAB1,AAB5:AAB6,AAB9:AABD,AAC0:AAC0,AAC2:AAC2,AADB:AADD,AAE0:AAEA,AAF2:AAF4,AB01:AB06,AB09:AB0E,AB11:AB16,AB20:AB26,AB28:AB2E,AB30:AB5A,AB5C:AB69,AB70:ABE2,AC00:D7A3,D7B0:D7C6,D7CB:D7FB,F900:FA6D,FA70:FAD9,FB00:FB06,FB13:FB17,FB1D:FB1D,FB1F:FB28,FB2A:FB36,FB38:FB3C,FB3E:FB3E,FB40:FB41,FB43:FB44,FB46:FBB1,FBD3:FD3D,FD50:FD8F,FD92:FDC7,FDF0:FDFB,FE70:FE74,FE76:FEFC,FF21:FF3A,FF41:FF5A,FF66:FFBE,FFC2:FFC7,FFCA:FFCF,FFD2:FFD7,FFDA:FFDC,10000:1000B,1000D:10026,10028:1003A,1003C:1003D,1003F:1004D,10050:1005D,10080:100FA,10280:1029C,102A0:102D0,10300:1031F,1032D:10340,10342:10349,10350:10375,10380:1039D,103A0:103C3,103C8:103CF,10400:1049D,104B0:104D3,104D8:104FB,10500:10527,10530:10563,10570:1057A,1057C:1058A,1058C:10592,10594:10595,10597:105A1,105A3:105B1,105B3:105B9,105BB:105BC,105C0:105F3,10600:10736,10740:10755,10760:10767,10780:10785,10787:107B0,107B2:107BA,10800:10805,10808:10808,1080A:10835,10837:10838,1083C:1083C,1083F:10855,10860:10876,10880:1089E,108E0:108F2,108F4:108F5,10900:10915,10920:10939,10980:109B7,109BE:109BF,10A00:10A00,10A10:10A13,10A15:10A17,10A19:10A35,10A60:10A7C,10A80:10A9C,10AC0:10AC7,10AC9:10AE4,10B00:10B35,10B40:10B55,10B60:10B72,10B80:10B91,10C00:10C48,10C80:10CB2,10CC0:10CF2,10D00:10D23,10D4A:10D65,10D6F:10D85,10E80:10EA9,10EB0:10EB1,10EC2:10EC4,10F00:10F1C,10F27:10F27,10F30:10F45,10F70:10F81,10FB0:10FC4,10FE0:10FF6,11003:11037,11071:11072,11075:11075,11083:110AF,110D0:110E8,11103:11126,11144:11144,11147:11147,11150:11172,11176:11176,11183:111B2,111C1:111C4,111DA:111DA,111DC:111DC,11200:11211,11213:1122B,1123F:11240,11280:11286,11288:11288,1128A:1128D,1128F:1129D,1129F:112A8,112B0:112DE,11305:1130C,1130F:11310,11313:11328,1132A:11330,11332:11333,11335:11339,1133D:1133D,11350:11350,1135D:11361,11380:11389,1138B:1138B,1138E:1138E,11390:113B5,113B7:113B7,113D1:113D1,113D3:113D3,11400:11434,11447:1144A,1145F:11461,11480:114AF,114C4:114C5,114C7:114C7,11580:115AE,115D8:115DB,11600:1162F,11644:11644,11680:116AA,116B8:116B8,11700:1171A,11740:11746,11800:1182B,118A0:118DF,118FF:11906,11909:11909,1190C:11913,11915:11916,11918:1192F,1193F:1193F,11941:11941,119A0:119A7,119AA:119D0,119E1:119E1,119E3:119E3,11A00:11A00,11A0B:11A32,11A3A:11A3A,11A50:11A50,11A5C:11A89,11A9D:11A9D,11AB0:11AF8,11BC0:11BE0,11C00:11C08,11C0A:11C2E,11C40:11C40,11C72:11C8F,11D00:11D06,11D08:11D09,11D0B:11D30,11D46:11D46,11D60:11D65,11D67:11D68,11D6A:11D89,11D98:11D98,11EE0:11EF2,11F02:11F02,11F04:11F10,11F12:11F33,11FB0:11FB0,12000:12399,12480:12543,12F90:12FF0,13000:1342F,13441:13446,13460:143FA,14400:14646,16100:1611D,16800:16A38,16A40:16A5E,16A70:16ABE,16AD0:16AED,16B00:16B2F,16B40:16B43,16B63:16B77,16B7D:16B8F,16D40:16D6C,16E40:16E7F,16F00:16F4A,16F50:16F50,16F93:16F9F,16FE0:16FE1,16FE3:16FE3,17000:187F7,18800:18CD5,18CFF:18D08,1AFF0:1AFF3,1AFF5:1AFFB,1AFFD:1AFFE,1B000:1B122,1B132:1B132,1B150:1B152,1B155:1B155,1B164:1B167,1B170:1B2FB,1BC00:1BC6A,1BC70:1BC7C,1BC80:1BC88,1BC90:1BC99,1D400:1D454,1D456:1D49C,1D49E:1D49F,1D4A2:1D4A2,1D4A5:1D4A6,1D4A9:1D4AC,1D4AE:1D4B9,1D4BB:1D4BB,1D4BD:1D4C3,1D4C5:1D505,1D507:1D50A,1D50D:1D514,1D516:1D51C,1D51E:1D539,1D53B:1D53E,1D540:1D544,1D546:1D546,1D54A:1D550,1D552:1D6A5,1D6A8:1D6C0,1D6C2:1D6DA,1D6DC:1D6FA,1D6FC:1D714,1D716:1D734,1D736:1D74E,1D750:1D76E,1D770:1D788,1D78A:1D7A8,1D7AA:1D7C2,1D7C4:1D7CB,1DF00:1DF1E,1DF25:1DF2A,1E030:1E06D,1E100:1E12C,1E137:1E13D,1E14E:1E14E,1E290:1E2AD,1E2C0:1E2EB,1E4D0:1E4EB,1E5D0:1E5ED,1E5F0:1E5F0,1E7E0:1E7E6,1E7E8:1E7EB,1E7ED:1E7EE,1E7F0:1E7FE,1E800:1E8C4,1E900:1E943,1E94B:1E94B,1EE00:1EE03,1EE05:1EE1F,1EE21:1EE22,1EE24:1EE24,1EE27:1EE27,1EE29:1EE32,1EE34:1EE37,1EE39:1EE39,1EE3B:1EE3B,1EE42:1EE42,1EE47:1EE47,1EE49:1EE49,1EE4B:1EE4B,1EE4D:1EE4F,1EE51:1EE52,1EE54:1EE54,1EE57:1EE57,1EE59:1EE59,1EE5B:1EE5B,1EE5D:1EE5D,1EE5F:1EE5F,1EE61:1EE62,1EE64:1EE64,1EE67:1EE6A,1EE6C:1EE72,1EE74:1EE77,1EE79:1EE7C,1EE7E:1EE7E,1EE80:1EE89,1EE8B:1EE9B,1EEA1:1EEA3,1EEA5:1EEA9,1EEAB:1EEBB,20000:2A6DF,2A700:2B739,2B740:2B81D,2B820:2CEA1,2CEB0:2EBE0,2EBF0:2EE5D,2F800:2FA1D,30000:3134A,31350:323AF +isalnum 30:39,41:5A,61:7A,AA:AA,B2:B3,B5:B5,B9:BA,BC:BE,C0:D6,D8:F6,F8:2C1,2C6:2D1,2E0:2E4,2EC:2EC,2EE:2EE,370:374,376:377,37A:37D,37F:37F,386:386,388:38A,38C:38C,38E:3A1,3A3:3F5,3F7:481,48A:52F,531:556,559:559,560:588,5D0:5EA,5EF:5F2,620:64A,660:669,66E:66F,671:6D3,6D5:6D5,6E5:6E6,6EE:6FC,6FF:6FF,710:710,712:72F,74D:7A5,7B1:7B1,7C0:7EA,7F4:7F5,7FA:7FA,800:815,81A:81A,824:824,828:828,840:858,860:86A,870:887,889:88E,8A0:8C9,904:939,93D:93D,950:950,958:961,966:96F,971:980,985:98C,98F:990,993:9A8,9AA:9B0,9B2:9B2,9B6:9B9,9BD:9BD,9CE:9CE,9DC:9DD,9DF:9E1,9E6:9F1,9F4:9F9,9FC:9FC,A05:A0A,A0F:A10,A13:A28,A2A:A30,A32:A33,A35:A36,A38:A39,A59:A5C,A5E:A5E,A66:A6F,A72:A74,A85:A8D,A8F:A91,A93:AA8,AAA:AB0,AB2:AB3,AB5:AB9,ABD:ABD,AD0:AD0,AE0:AE1,AE6:AEF,AF9:AF9,B05:B0C,B0F:B10,B13:B28,B2A:B30,B32:B33,B35:B39,B3D:B3D,B5C:B5D,B5F:B61,B66:B6F,B71:B77,B83:B83,B85:B8A,B8E:B90,B92:B95,B99:B9A,B9C:B9C,B9E:B9F,BA3:BA4,BA8:BAA,BAE:BB9,BD0:BD0,BE6:BF2,C05:C0C,C0E:C10,C12:C28,C2A:C39,C3D:C3D,C58:C5A,C5D:C5D,C60:C61,C66:C6F,C78:C7E,C80:C80,C85:C8C,C8E:C90,C92:CA8,CAA:CB3,CB5:CB9,CBD:CBD,CDD:CDE,CE0:CE1,CE6:CEF,CF1:CF2,D04:D0C,D0E:D10,D12:D3A,D3D:D3D,D4E:D4E,D54:D56,D58:D61,D66:D78,D7A:D7F,D85:D96,D9A:DB1,DB3:DBB,DBD:DBD,DC0:DC6,DE6:DEF,E01:E30,E32:E33,E40:E46,E50:E59,E81:E82,E84:E84,E86:E8A,E8C:EA3,EA5:EA5,EA7:EB0,EB2:EB3,EBD:EBD,EC0:EC4,EC6:EC6,ED0:ED9,EDC:EDF,F00:F00,F20:F33,F40:F47,F49:F6C,F88:F8C,1000:102A,103F:1049,1050:1055,105A:105D,1061:1061,1065:1066,106E:1070,1075:1081,108E:108E,1090:1099,10A0:10C5,10C7:10C7,10CD:10CD,10D0:10FA,10FC:1248,124A:124D,1250:1256,1258:1258,125A:125D,1260:1288,128A:128D,1290:12B0,12B2:12B5,12B8:12BE,12C0:12C0,12C2:12C5,12C8:12D6,12D8:1310,1312:1315,1318:135A,1369:137C,1380:138F,13A0:13F5,13F8:13FD,1401:166C,166F:167F,1681:169A,16A0:16EA,16EE:16F8,1700:1711,171F:1731,1740:1751,1760:176C,176E:1770,1780:17B3,17D7:17D7,17DC:17DC,17E0:17E9,17F0:17F9,1810:1819,1820:1878,1880:1884,1887:18A8,18AA:18AA,18B0:18F5,1900:191E,1946:196D,1970:1974,1980:19AB,19B0:19C9,19D0:19DA,1A00:1A16,1A20:1A54,1A80:1A89,1A90:1A99,1AA7:1AA7,1B05:1B33,1B45:1B4C,1B50:1B59,1B83:1BA0,1BAE:1BE5,1C00:1C23,1C40:1C49,1C4D:1C7D,1C80:1C8A,1C90:1CBA,1CBD:1CBF,1CE9:1CEC,1CEE:1CF3,1CF5:1CF6,1CFA:1CFA,1D00:1DBF,1E00:1F15,1F18:1F1D,1F20:1F45,1F48:1F4D,1F50:1F57,1F59:1F59,1F5B:1F5B,1F5D:1F5D,1F5F:1F7D,1F80:1FB4,1FB6:1FBC,1FBE:1FBE,1FC2:1FC4,1FC6:1FCC,1FD0:1FD3,1FD6:1FDB,1FE0:1FEC,1FF2:1FF4,1FF6:1FFC,2070:2071,2074:2079,207F:2089,2090:209C,2102:2102,2107:2107,210A:2113,2115:2115,2119:211D,2124:2124,2126:2126,2128:2128,212A:212D,212F:2139,213C:213F,2145:2149,214E:214E,2150:2189,2460:249B,24EA:24FF,2776:2793,2C00:2CE4,2CEB:2CEE,2CF2:2CF3,2CFD:2CFD,2D00:2D25,2D27:2D27,2D2D:2D2D,2D30:2D67,2D6F:2D6F,2D80:2D96,2DA0:2DA6,2DA8:2DAE,2DB0:2DB6,2DB8:2DBE,2DC0:2DC6,2DC8:2DCE,2DD0:2DD6,2DD8:2DDE,2E2F:2E2F,3005:3007,3021:3029,3031:3035,3038:303C,3041:3096,309D:309F,30A1:30FA,30FC:30FF,3105:312F,3131:318E,3192:3195,31A0:31BF,31F0:31FF,3220:3229,3248:324F,3251:325F,3280:3289,32B1:32BF,3400:4DBF,4E00:A48C,A4D0:A4FD,A500:A60C,A610:A62B,A640:A66E,A67F:A69D,A6A0:A6EF,A717:A71F,A722:A788,A78B:A7CD,A7D0:A7D1,A7D3:A7D3,A7D5:A7DC,A7F2:A801,A803:A805,A807:A80A,A80C:A822,A830:A835,A840:A873,A882:A8B3,A8D0:A8D9,A8F2:A8F7,A8FB:A8FB,A8FD:A8FE,A900:A925,A930:A946,A960:A97C,A984:A9B2,A9CF:A9D9,A9E0:A9E4,A9E6:A9FE,AA00:AA28,AA40:AA42,AA44:AA4B,AA50:AA59,AA60:AA76,AA7A:AA7A,AA7E:AAAF,AAB1:AAB1,AAB5:AAB6,AAB9:AABD,AAC0:AAC0,AAC2:AAC2,AADB:AADD,AAE0:AAEA,AAF2:AAF4,AB01:AB06,AB09:AB0E,AB11:AB16,AB20:AB26,AB28:AB2E,AB30:AB5A,AB5C:AB69,AB70:ABE2,ABF0:ABF9,AC00:D7A3,D7B0:D7C6,D7CB:D7FB,F900:FA6D,FA70:FAD9,FB00:FB06,FB13:FB17,FB1D:FB1D,FB1F:FB28,FB2A:FB36,FB38:FB3C,FB3E:FB3E,FB40:FB41,FB43:FB44,FB46:FBB1,FBD3:FD3D,FD50:FD8F,FD92:FDC7,FDF0:FDFB,FE70:FE74,FE76:FEFC,FF10:FF19,FF21:FF3A,FF41:FF5A,FF66:FFBE,FFC2:FFC7,FFCA:FFCF,FFD2:FFD7,FFDA:FFDC,10000:1000B,1000D:10026,10028:1003A,1003C:1003D,1003F:1004D,10050:1005D,10080:100FA,10107:10133,10140:10178,1018A:1018B,10280:1029C,102A0:102D0,102E1:102FB,10300:10323,1032D:1034A,10350:10375,10380:1039D,103A0:103C3,103C8:103CF,103D1:103D5,10400:1049D,104A0:104A9,104B0:104D3,104D8:104FB,10500:10527,10530:10563,10570:1057A,1057C:1058A,1058C:10592,10594:10595,10597:105A1,105A3:105B1,105B3:105B9,105BB:105BC,105C0:105F3,10600:10736,10740:10755,10760:10767,10780:10785,10787:107B0,107B2:107BA,10800:10805,10808:10808,1080A:10835,10837:10838,1083C:1083C,1083F:10855,10858:10876,10879:1089E,108A7:108AF,108E0:108F2,108F4:108F5,108FB:1091B,10920:10939,10980:109B7,109BC:109CF,109D2:10A00,10A10:10A13,10A15:10A17,10A19:10A35,10A40:10A48,10A60:10A7E,10A80:10A9F,10AC0:10AC7,10AC9:10AE4,10AEB:10AEF,10B00:10B35,10B40:10B55,10B58:10B72,10B78:10B91,10BA9:10BAF,10C00:10C48,10C80:10CB2,10CC0:10CF2,10CFA:10D23,10D30:10D39,10D40:10D65,10D6F:10D85,10E60:10E7E,10E80:10EA9,10EB0:10EB1,10EC2:10EC4,10F00:10F27,10F30:10F45,10F51:10F54,10F70:10F81,10FB0:10FCB,10FE0:10FF6,11003:11037,11052:1106F,11071:11072,11075:11075,11083:110AF,110D0:110E8,110F0:110F9,11103:11126,11136:1113F,11144:11144,11147:11147,11150:11172,11176:11176,11183:111B2,111C1:111C4,111D0:111DA,111DC:111DC,111E1:111F4,11200:11211,11213:1122B,1123F:11240,11280:11286,11288:11288,1128A:1128D,1128F:1129D,1129F:112A8,112B0:112DE,112F0:112F9,11305:1130C,1130F:11310,11313:11328,1132A:11330,11332:11333,11335:11339,1133D:1133D,11350:11350,1135D:11361,11380:11389,1138B:1138B,1138E:1138E,11390:113B5,113B7:113B7,113D1:113D1,113D3:113D3,11400:11434,11447:1144A,11450:11459,1145F:11461,11480:114AF,114C4:114C5,114C7:114C7,114D0:114D9,11580:115AE,115D8:115DB,11600:1162F,11644:11644,11650:11659,11680:116AA,116B8:116B8,116C0:116C9,116D0:116E3,11700:1171A,11730:1173B,11740:11746,11800:1182B,118A0:118F2,118FF:11906,11909:11909,1190C:11913,11915:11916,11918:1192F,1193F:1193F,11941:11941,11950:11959,119A0:119A7,119AA:119D0,119E1:119E1,119E3:119E3,11A00:11A00,11A0B:11A32,11A3A:11A3A,11A50:11A50,11A5C:11A89,11A9D:11A9D,11AB0:11AF8,11BC0:11BE0,11BF0:11BF9,11C00:11C08,11C0A:11C2E,11C40:11C40,11C50:11C6C,11C72:11C8F,11D00:11D06,11D08:11D09,11D0B:11D30,11D46:11D46,11D50:11D59,11D60:11D65,11D67:11D68,11D6A:11D89,11D98:11D98,11DA0:11DA9,11EE0:11EF2,11F02:11F02,11F04:11F10,11F12:11F33,11F50:11F59,11FB0:11FB0,11FC0:11FD4,12000:12399,12400:1246E,12480:12543,12F90:12FF0,13000:1342F,13441:13446,13460:143FA,14400:14646,16100:1611D,16130:16139,16800:16A38,16A40:16A5E,16A60:16A69,16A70:16ABE,16AC0:16AC9,16AD0:16AED,16B00:16B2F,16B40:16B43,16B50:16B59,16B5B:16B61,16B63:16B77,16B7D:16B8F,16D40:16D6C,16D70:16D79,16E40:16E96,16F00:16F4A,16F50:16F50,16F93:16F9F,16FE0:16FE1,16FE3:16FE3,17000:187F7,18800:18CD5,18CFF:18D08,1AFF0:1AFF3,1AFF5:1AFFB,1AFFD:1AFFE,1B000:1B122,1B132:1B132,1B150:1B152,1B155:1B155,1B164:1B167,1B170:1B2FB,1BC00:1BC6A,1BC70:1BC7C,1BC80:1BC88,1BC90:1BC99,1CCF0:1CCF9,1D2C0:1D2D3,1D2E0:1D2F3,1D360:1D378,1D400:1D454,1D456:1D49C,1D49E:1D49F,1D4A2:1D4A2,1D4A5:1D4A6,1D4A9:1D4AC,1D4AE:1D4B9,1D4BB:1D4BB,1D4BD:1D4C3,1D4C5:1D505,1D507:1D50A,1D50D:1D514,1D516:1D51C,1D51E:1D539,1D53B:1D53E,1D540:1D544,1D546:1D546,1D54A:1D550,1D552:1D6A5,1D6A8:1D6C0,1D6C2:1D6DA,1D6DC:1D6FA,1D6FC:1D714,1D716:1D734,1D736:1D74E,1D750:1D76E,1D770:1D788,1D78A:1D7A8,1D7AA:1D7C2,1D7C4:1D7CB,1D7CE:1D7FF,1DF00:1DF1E,1DF25:1DF2A,1E030:1E06D,1E100:1E12C,1E137:1E13D,1E140:1E149,1E14E:1E14E,1E290:1E2AD,1E2C0:1E2EB,1E2F0:1E2F9,1E4D0:1E4EB,1E4F0:1E4F9,1E5D0:1E5ED,1E5F0:1E5FA,1E7E0:1E7E6,1E7E8:1E7EB,1E7ED:1E7EE,1E7F0:1E7FE,1E800:1E8C4,1E8C7:1E8CF,1E900:1E943,1E94B:1E94B,1E950:1E959,1EC71:1ECAB,1ECAD:1ECAF,1ECB1:1ECB4,1ED01:1ED2D,1ED2F:1ED3D,1EE00:1EE03,1EE05:1EE1F,1EE21:1EE22,1EE24:1EE24,1EE27:1EE27,1EE29:1EE32,1EE34:1EE37,1EE39:1EE39,1EE3B:1EE3B,1EE42:1EE42,1EE47:1EE47,1EE49:1EE49,1EE4B:1EE4B,1EE4D:1EE4F,1EE51:1EE52,1EE54:1EE54,1EE57:1EE57,1EE59:1EE59,1EE5B:1EE5B,1EE5D:1EE5D,1EE5F:1EE5F,1EE61:1EE62,1EE64:1EE64,1EE67:1EE6A,1EE6C:1EE72,1EE74:1EE77,1EE79:1EE7C,1EE7E:1EE7E,1EE80:1EE89,1EE8B:1EE9B,1EEA1:1EEA3,1EEA5:1EEA9,1EEAB:1EEBB,1F100:1F10C,1FBF0:1FBF9,20000:2A6DF,2A700:2B739,2B740:2B81D,2B820:2CEA1,2CEB0:2EBE0,2EBF0:2EE5D,2F800:2FA1D,30000:3134A,31350:323AF +isdecimal 30:39,660:669,6F0:6F9,7C0:7C9,966:96F,9E6:9EF,A66:A6F,AE6:AEF,B66:B6F,BE6:BEF,C66:C6F,CE6:CEF,D66:D6F,DE6:DEF,E50:E59,ED0:ED9,F20:F29,1040:1049,1090:1099,17E0:17E9,1810:1819,1946:194F,19D0:19D9,1A80:1A89,1A90:1A99,1B50:1B59,1BB0:1BB9,1C40:1C49,1C50:1C59,A620:A629,A8D0:A8D9,A900:A909,A9D0:A9D9,A9F0:A9F9,AA50:AA59,ABF0:ABF9,FF10:FF19,104A0:104A9,10D30:10D39,10D40:10D49,11066:1106F,110F0:110F9,11136:1113F,111D0:111D9,112F0:112F9,11450:11459,114D0:114D9,11650:11659,116C0:116C9,116D0:116E3,11730:11739,118E0:118E9,11950:11959,11BF0:11BF9,11C50:11C59,11D50:11D59,11DA0:11DA9,11F50:11F59,16130:16139,16A60:16A69,16AC0:16AC9,16B50:16B59,16D70:16D79,1CCF0:1CCF9,1D7CE:1D7FF,1E140:1E149,1E2F0:1E2F9,1E4F0:1E4F9,1E5F1:1E5FA,1E950:1E959,1FBF0:1FBF9 +isdigit 30:39,B2:B3,B9:B9,660:669,6F0:6F9,7C0:7C9,966:96F,9E6:9EF,A66:A6F,AE6:AEF,B66:B6F,BE6:BEF,C66:C6F,CE6:CEF,D66:D6F,DE6:DEF,E50:E59,ED0:ED9,F20:F29,1040:1049,1090:1099,1369:1371,17E0:17E9,1810:1819,1946:194F,19D0:19DA,1A80:1A89,1A90:1A99,1B50:1B59,1BB0:1BB9,1C40:1C49,1C50:1C59,2070:2070,2074:2079,2080:2089,2460:2468,2474:247C,2488:2490,24EA:24EA,24F5:24FD,24FF:24FF,2776:277E,2780:2788,278A:2792,A620:A629,A8D0:A8D9,A900:A909,A9D0:A9D9,A9F0:A9F9,AA50:AA59,ABF0:ABF9,FF10:FF19,104A0:104A9,10A40:10A43,10D30:10D39,10D40:10D49,10E60:10E68,11052:1105A,11066:1106F,110F0:110F9,11136:1113F,111D0:111D9,112F0:112F9,11450:11459,114D0:114D9,11650:11659,116C0:116C9,116D0:116E3,11730:11739,118E0:118E9,11950:11959,11BF0:11BF9,11C50:11C59,11D50:11D59,11DA0:11DA9,11F50:11F59,16130:16139,16A60:16A69,16AC0:16AC9,16B50:16B59,16D70:16D79,1CCF0:1CCF9,1D7CE:1D7FF,1E140:1E149,1E2F0:1E2F9,1E4F0:1E4F9,1E5F1:1E5FA,1E950:1E959,1F100:1F10A,1FBF0:1FBF9 +isnumeric 30:39,B2:B3,B9:B9,BC:BE,660:669,6F0:6F9,7C0:7C9,966:96F,9E6:9EF,9F4:9F9,A66:A6F,AE6:AEF,B66:B6F,B72:B77,BE6:BF2,C66:C6F,C78:C7E,CE6:CEF,D58:D5E,D66:D78,DE6:DEF,E50:E59,ED0:ED9,F20:F33,1040:1049,1090:1099,1369:137C,16EE:16F0,17E0:17E9,17F0:17F9,1810:1819,1946:194F,19D0:19DA,1A80:1A89,1A90:1A99,1B50:1B59,1BB0:1BB9,1C40:1C49,1C50:1C59,2070:2070,2074:2079,2080:2089,2150:2182,2185:2189,2460:249B,24EA:24FF,2776:2793,2CFD:2CFD,3007:3007,3021:3029,3038:303A,3192:3195,3220:3229,3248:324F,3251:325F,3280:3289,32B1:32BF,3405:3405,3483:3483,382A:382A,3B4D:3B4D,4E00:4E00,4E03:4E03,4E07:4E07,4E09:4E09,4E24:4E24,4E5D:4E5D,4E8C:4E8C,4E94:4E94,4E96:4E96,4EAC:4EAC,4EBF:4EC0,4EDF:4EDF,4EE8:4EE8,4F0D:4F0D,4F70:4F70,4FE9:4FE9,5006:5006,5104:5104,5146:5146,5169:5169,516B:516B,516D:516D,5341:5341,5343:5345,534C:534C,53C1:53C4,56DB:56DB,58F1:58F1,58F9:58F9,5E7A:5E7A,5EFE:5EFF,5F0C:5F0E,5F10:5F10,62D0:62D0,62FE:62FE,634C:634C,67D2:67D2,6D1E:6D1E,6F06:6F06,7396:7396,767E:767E,7695:7695,79ED:79ED,8086:8086,842C:842C,8CAE:8CAE,8CB3:8CB3,8D30:8D30,920E:920E,94A9:94A9,9621:9621,9646:9646,964C:964C,9678:9678,96F6:96F6,A620:A629,A6E6:A6EF,A830:A835,A8D0:A8D9,A900:A909,A9D0:A9D9,A9F0:A9F9,AA50:AA59,ABF0:ABF9,F96B:F96B,F973:F973,F978:F978,F9B2:F9B2,F9D1:F9D1,F9D3:F9D3,F9FD:F9FD,FF10:FF19,10107:10133,10140:10178,1018A:1018B,102E1:102FB,10320:10323,10341:10341,1034A:1034A,103D1:103D5,104A0:104A9,10858:1085F,10879:1087F,108A7:108AF,108FB:108FF,10916:1091B,109BC:109BD,109C0:109CF,109D2:109FF,10A40:10A48,10A7D:10A7E,10A9D:10A9F,10AEB:10AEF,10B58:10B5F,10B78:10B7F,10BA9:10BAF,10CFA:10CFF,10D30:10D39,10D40:10D49,10E60:10E7E,10F1D:10F26,10F51:10F54,10FC5:10FCB,11052:1106F,110F0:110F9,11136:1113F,111D0:111D9,111E1:111F4,112F0:112F9,11450:11459,114D0:114D9,11650:11659,116C0:116C9,116D0:116E3,11730:1173B,118E0:118F2,11950:11959,11BF0:11BF9,11C50:11C6C,11D50:11D59,11DA0:11DA9,11F50:11F59,11FC0:11FD4,12400:1246E,16130:16139,16A60:16A69,16AC0:16AC9,16B50:16B59,16B5B:16B61,16D70:16D79,16E80:16E96,1CCF0:1CCF9,1D2C0:1D2D3,1D2E0:1D2F3,1D360:1D378,1D7CE:1D7FF,1E140:1E149,1E2F0:1E2F9,1E4F0:1E4F9,1E5F1:1E5FA,1E8C7:1E8CF,1E950:1E959,1EC71:1ECAB,1ECAD:1ECAF,1ECB1:1ECB4,1ED01:1ED2D,1ED2F:1ED3D,1F100:1F10C,1FBF0:1FBF9,20001:20001,20064:20064,200E2:200E2,20121:20121,2092A:2092A,20983:20983,2098C:2098C,2099C:2099C,20AEA:20AEA,20AFD:20AFD,20B19:20B19,22390:22390,22998:22998,23B1B:23B1B,2626D:2626D,2F890:2F890 +isspace 9:D,1C:20,85:85,A0:A0,1680:1680,2000:200A,2028:2029,202F:202F,205F:205F,3000:3000 +isprintable 20:7E,A1:AC,AE:377,37A:37F,384:38A,38C:38C,38E:3A1,3A3:52F,531:556,559:58A,58D:58F,591:5C7,5D0:5EA,5EF:5F4,606:61B,61D:6DC,6DE:70D,710:74A,74D:7B1,7C0:7FA,7FD:82D,830:83E,840:85B,85E:85E,860:86A,870:88E,897:8E1,8E3:983,985:98C,98F:990,993:9A8,9AA:9B0,9B2:9B2,9B6:9B9,9BC:9C4,9C7:9C8,9CB:9CE,9D7:9D7,9DC:9DD,9DF:9E3,9E6:9FE,A01:A03,A05:A0A,A0F:A10,A13:A28,A2A:A30,A32:A33,A35:A36,A38:A39,A3C:A3C,A3E:A42,A47:A48,A4B:A4D,A51:A51,A59:A5C,A5E:A5E,A66:A76,A81:A83,A85:A8D,A8F:A91,A93:AA8,AAA:AB0,AB2:AB3,AB5:AB9,ABC:AC5,AC7:AC9,ACB:ACD,AD0:AD0,AE0:AE3,AE6:AF1,AF9:AFF,B01:B03,B05:B0C,B0F:B10,B13:B28,B2A:B30,B32:B33,B35:B39,B3C:B44,B47:B48,B4B:B4D,B55:B57,B5C:B5D,B5F:B63,B66:B77,B82:B83,B85:B8A,B8E:B90,B92:B95,B99:B9A,B9C:B9C,B9E:B9F,BA3:BA4,BA8:BAA,BAE:BB9,BBE:BC2,BC6:BC8,BCA:BCD,BD0:BD0,BD7:BD7,BE6:BFA,C00:C0C,C0E:C10,C12:C28,C2A:C39,C3C:C44,C46:C48,C4A:C4D,C55:C56,C58:C5A,C5D:C5D,C60:C63,C66:C6F,C77:C8C,C8E:C90,C92:CA8,CAA:CB3,CB5:CB9,CBC:CC4,CC6:CC8,CCA:CCD,CD5:CD6,CDD:CDE,CE0:CE3,CE6:CEF,CF1:CF3,D00:D0C,D0E:D10,D12:D44,D46:D48,D4A:D4F,D54:D63,D66:D7F,D81:D83,D85:D96,D9A:DB1,DB3:DBB,DBD:DBD,DC0:DC6,DCA:DCA,DCF:DD4,DD6:DD6,DD8:DDF,DE6:DEF,DF2:DF4,E01:E3A,E3F:E5B,E81:E82,E84:E84,E86:E8A,E8C:EA3,EA5:EA5,EA7:EBD,EC0:EC4,EC6:EC6,EC8:ECE,ED0:ED9,EDC:EDF,F00:F47,F49:F6C,F71:F97,F99:FBC,FBE:FCC,FCE:FDA,1000:10C5,10C7:10C7,10CD:10CD,10D0:1248,124A:124D,1250:1256,1258:1258,125A:125D,1260:1288,128A:128D,1290:12B0,12B2:12B5,12B8:12BE,12C0:12C0,12C2:12C5,12C8:12D6,12D8:1310,1312:1315,1318:135A,135D:137C,1380:1399,13A0:13F5,13F8:13FD,1400:167F,1681:169C,16A0:16F8,1700:1715,171F:1736,1740:1753,1760:176C,176E:1770,1772:1773,1780:17DD,17E0:17E9,17F0:17F9,1800:180D,180F:1819,1820:1878,1880:18AA,18B0:18F5,1900:191E,1920:192B,1930:193B,1940:1940,1944:196D,1970:1974,1980:19AB,19B0:19C9,19D0:19DA,19DE:1A1B,1A1E:1A5E,1A60:1A7C,1A7F:1A89,1A90:1A99,1AA0:1AAD,1AB0:1ACE,1B00:1B4C,1B4E:1BF3,1BFC:1C37,1C3B:1C49,1C4D:1C8A,1C90:1CBA,1CBD:1CC7,1CD0:1CFA,1D00:1F15,1F18:1F1D,1F20:1F45,1F48:1F4D,1F50:1F57,1F59:1F59,1F5B:1F5B,1F5D:1F5D,1F5F:1F7D,1F80:1FB4,1FB6:1FC4,1FC6:1FD3,1FD6:1FDB,1FDD:1FEF,1FF2:1FF4,1FF6:1FFE,2010:2027,2030:205E,2070:2071,2074:208E,2090:209C,20A0:20C0,20D0:20F0,2100:218B,2190:2429,2440:244A,2460:2B73,2B76:2B95,2B97:2CF3,2CF9:2D25,2D27:2D27,2D2D:2D2D,2D30:2D67,2D6F:2D70,2D7F:2D96,2DA0:2DA6,2DA8:2DAE,2DB0:2DB6,2DB8:2DBE,2DC0:2DC6,2DC8:2DCE,2DD0:2DD6,2DD8:2DDE,2DE0:2E5D,2E80:2E99,2E9B:2EF3,2F00:2FD5,2FF0:2FFF,3001:303F,3041:3096,3099:30FF,3105:312F,3131:318E,3190:31E5,31EF:321E,3220:A48C,A490:A4C6,A4D0:A62B,A640:A6F7,A700:A7CD,A7D0:A7D1,A7D3:A7D3,A7D5:A7DC,A7F2:A82C,A830:A839,A840:A877,A880:A8C5,A8CE:A8D9,A8E0:A953,A95F:A97C,A980:A9CD,A9CF:A9D9,A9DE:A9FE,AA00:AA36,AA40:AA4D,AA50:AA59,AA5C:AAC2,AADB:AAF6,AB01:AB06,AB09:AB0E,AB11:AB16,AB20:AB26,AB28:AB2E,AB30:AB6B,AB70:ABED,ABF0:ABF9,AC00:D7A3,D7B0:D7C6,D7CB:D7FB,F900:FA6D,FA70:FAD9,FB00:FB06,FB13:FB17,FB1D:FB36,FB38:FB3C,FB3E:FB3E,FB40:FB41,FB43:FB44,FB46:FBC2,FBD3:FD8F,FD92:FDC7,FDCF:FDCF,FDF0:FE19,FE20:FE52,FE54:FE66,FE68:FE6B,FE70:FE74,FE76:FEFC,FF01:FFBE,FFC2:FFC7,FFCA:FFCF,FFD2:FFD7,FFDA:FFDC,FFE0:FFE6,FFE8:FFEE,FFFC:FFFD,10000:1000B,1000D:10026,10028:1003A,1003C:1003D,1003F:1004D,10050:1005D,10080:100FA,10100:10102,10107:10133,10137:1018E,10190:1019C,101A0:101A0,101D0:101FD,10280:1029C,102A0:102D0,102E0:102FB,10300:10323,1032D:1034A,10350:1037A,10380:1039D,1039F:103C3,103C8:103D5,10400:1049D,104A0:104A9,104B0:104D3,104D8:104FB,10500:10527,10530:10563,1056F:1057A,1057C:1058A,1058C:10592,10594:10595,10597:105A1,105A3:105B1,105B3:105B9,105BB:105BC,105C0:105F3,10600:10736,10740:10755,10760:10767,10780:10785,10787:107B0,107B2:107BA,10800:10805,10808:10808,1080A:10835,10837:10838,1083C:1083C,1083F:10855,10857:1089E,108A7:108AF,108E0:108F2,108F4:108F5,108FB:1091B,1091F:10939,1093F:1093F,10980:109B7,109BC:109CF,109D2:10A03,10A05:10A06,10A0C:10A13,10A15:10A17,10A19:10A35,10A38:10A3A,10A3F:10A48,10A50:10A58,10A60:10A9F,10AC0:10AE6,10AEB:10AF6,10B00:10B35,10B39:10B55,10B58:10B72,10B78:10B91,10B99:10B9C,10BA9:10BAF,10C00:10C48,10C80:10CB2,10CC0:10CF2,10CFA:10D27,10D30:10D39,10D40:10D65,10D69:10D85,10D8E:10D8F,10E60:10E7E,10E80:10EA9,10EAB:10EAD,10EB0:10EB1,10EC2:10EC4,10EFC:10F27,10F30:10F59,10F70:10F89,10FB0:10FCB,10FE0:10FF6,11000:1104D,11052:11075,1107F:110BC,110BE:110C2,110D0:110E8,110F0:110F9,11100:11134,11136:11147,11150:11176,11180:111DF,111E1:111F4,11200:11211,11213:11241,11280:11286,11288:11288,1128A:1128D,1128F:1129D,1129F:112A9,112B0:112EA,112F0:112F9,11300:11303,11305:1130C,1130F:11310,11313:11328,1132A:11330,11332:11333,11335:11339,1133B:11344,11347:11348,1134B:1134D,11350:11350,11357:11357,1135D:11363,11366:1136C,11370:11374,11380:11389,1138B:1138B,1138E:1138E,11390:113B5,113B7:113C0,113C2:113C2,113C5:113C5,113C7:113CA,113CC:113D5,113D7:113D8,113E1:113E2,11400:1145B,1145D:11461,11480:114C7,114D0:114D9,11580:115B5,115B8:115DD,11600:11644,11650:11659,11660:1166C,11680:116B9,116C0:116C9,116D0:116E3,11700:1171A,1171D:1172B,11730:11746,11800:1183B,118A0:118F2,118FF:11906,11909:11909,1190C:11913,11915:11916,11918:11935,11937:11938,1193B:11946,11950:11959,119A0:119A7,119AA:119D7,119DA:119E4,11A00:11A47,11A50:11AA2,11AB0:11AF8,11B00:11B09,11BC0:11BE1,11BF0:11BF9,11C00:11C08,11C0A:11C36,11C38:11C45,11C50:11C6C,11C70:11C8F,11C92:11CA7,11CA9:11CB6,11D00:11D06,11D08:11D09,11D0B:11D36,11D3A:11D3A,11D3C:11D3D,11D3F:11D47,11D50:11D59,11D60:11D65,11D67:11D68,11D6A:11D8E,11D90:11D91,11D93:11D98,11DA0:11DA9,11EE0:11EF8,11F00:11F10,11F12:11F3A,11F3E:11F5A,11FB0:11FB0,11FC0:11FF1,11FFF:12399,12400:1246E,12470:12474,12480:12543,12F90:12FF2,13000:1342F,13440:13455,13460:143FA,14400:14646,16100:16139,16800:16A38,16A40:16A5E,16A60:16A69,16A6E:16ABE,16AC0:16AC9,16AD0:16AED,16AF0:16AF5,16B00:16B45,16B50:16B59,16B5B:16B61,16B63:16B77,16B7D:16B8F,16D40:16D79,16E40:16E9A,16F00:16F4A,16F4F:16F87,16F8F:16F9F,16FE0:16FE4,16FF0:16FF1,17000:187F7,18800:18CD5,18CFF:18D08,1AFF0:1AFF3,1AFF5:1AFFB,1AFFD:1AFFE,1B000:1B122,1B132:1B132,1B150:1B152,1B155:1B155,1B164:1B167,1B170:1B2FB,1BC00:1BC6A,1BC70:1BC7C,1BC80:1BC88,1BC90:1BC99,1BC9C:1BC9F,1CC00:1CCF9,1CD00:1CEB3,1CF00:1CF2D,1CF30:1CF46,1CF50:1CFC3,1D000:1D0F5,1D100:1D126,1D129:1D172,1D17B:1D1EA,1D200:1D245,1D2C0:1D2D3,1D2E0:1D2F3,1D300:1D356,1D360:1D378,1D400:1D454,1D456:1D49C,1D49E:1D49F,1D4A2:1D4A2,1D4A5:1D4A6,1D4A9:1D4AC,1D4AE:1D4B9,1D4BB:1D4BB,1D4BD:1D4C3,1D4C5:1D505,1D507:1D50A,1D50D:1D514,1D516:1D51C,1D51E:1D539,1D53B:1D53E,1D540:1D544,1D546:1D546,1D54A:1D550,1D552:1D6A5,1D6A8:1D7CB,1D7CE:1DA8B,1DA9B:1DA9F,1DAA1:1DAAF,1DF00:1DF1E,1DF25:1DF2A,1E000:1E006,1E008:1E018,1E01B:1E021,1E023:1E024,1E026:1E02A,1E030:1E06D,1E08F:1E08F,1E100:1E12C,1E130:1E13D,1E140:1E149,1E14E:1E14F,1E290:1E2AE,1E2C0:1E2F9,1E2FF:1E2FF,1E4D0:1E4F9,1E5D0:1E5FA,1E5FF:1E5FF,1E7E0:1E7E6,1E7E8:1E7EB,1E7ED:1E7EE,1E7F0:1E7FE,1E800:1E8C4,1E8C7:1E8D6,1E900:1E94B,1E950:1E959,1E95E:1E95F,1EC71:1ECB4,1ED01:1ED3D,1EE00:1EE03,1EE05:1EE1F,1EE21:1EE22,1EE24:1EE24,1EE27:1EE27,1EE29:1EE32,1EE34:1EE37,1EE39:1EE39,1EE3B:1EE3B,1EE42:1EE42,1EE47:1EE47,1EE49:1EE49,1EE4B:1EE4B,1EE4D:1EE4F,1EE51:1EE52,1EE54:1EE54,1EE57:1EE57,1EE59:1EE59,1EE5B:1EE5B,1EE5D:1EE5D,1EE5F:1EE5F,1EE61:1EE62,1EE64:1EE64,1EE67:1EE6A,1EE6C:1EE72,1EE74:1EE77,1EE79:1EE7C,1EE7E:1EE7E,1EE80:1EE89,1EE8B:1EE9B,1EEA1:1EEA3,1EEA5:1EEA9,1EEAB:1EEBB,1EEF0:1EEF1,1F000:1F02B,1F030:1F093,1F0A0:1F0AE,1F0B1:1F0BF,1F0C1:1F0CF,1F0D1:1F0F5,1F100:1F1AD,1F1E6:1F202,1F210:1F23B,1F240:1F248,1F250:1F251,1F260:1F265,1F300:1F6D7,1F6DC:1F6EC,1F6F0:1F6FC,1F700:1F776,1F77B:1F7D9,1F7E0:1F7EB,1F7F0:1F7F0,1F800:1F80B,1F810:1F847,1F850:1F859,1F860:1F887,1F890:1F8AD,1F8B0:1F8BB,1F8C0:1F8C1,1F900:1FA53,1FA60:1FA6D,1FA70:1FA7C,1FA80:1FA89,1FA8F:1FAC6,1FACE:1FADC,1FADF:1FAE9,1FAF0:1FAF8,1FB00:1FB92,1FB94:1FBF9,20000:2A6DF,2A700:2B739,2B740:2B81D,2B820:2CEA1,2CEB0:2EBE0,2EBF0:2EE5D,2F800:2FA1D,30000:3134A,31350:323AF,E0100:E01EF +isidentifier 41:5A,5F:5F,61:7A,AA:AA,B5:B5,BA:BA,C0:D6,D8:F6,F8:2C1,2C6:2D1,2E0:2E4,2EC:2EC,2EE:2EE,370:374,376:377,37B:37D,37F:37F,386:386,388:38A,38C:38C,38E:3A1,3A3:3F5,3F7:481,48A:52F,531:556,559:559,560:588,5D0:5EA,5EF:5F2,620:64A,66E:66F,671:6D3,6D5:6D5,6E5:6E6,6EE:6EF,6FA:6FC,6FF:6FF,710:710,712:72F,74D:7A5,7B1:7B1,7CA:7EA,7F4:7F5,7FA:7FA,800:815,81A:81A,824:824,828:828,840:858,860:86A,870:887,889:88E,8A0:8C9,904:939,93D:93D,950:950,958:961,971:980,985:98C,98F:990,993:9A8,9AA:9B0,9B2:9B2,9B6:9B9,9BD:9BD,9CE:9CE,9DC:9DD,9DF:9E1,9F0:9F1,9FC:9FC,A05:A0A,A0F:A10,A13:A28,A2A:A30,A32:A33,A35:A36,A38:A39,A59:A5C,A5E:A5E,A72:A74,A85:A8D,A8F:A91,A93:AA8,AAA:AB0,AB2:AB3,AB5:AB9,ABD:ABD,AD0:AD0,AE0:AE1,AF9:AF9,B05:B0C,B0F:B10,B13:B28,B2A:B30,B32:B33,B35:B39,B3D:B3D,B5C:B5D,B5F:B61,B71:B71,B83:B83,B85:B8A,B8E:B90,B92:B95,B99:B9A,B9C:B9C,B9E:B9F,BA3:BA4,BA8:BAA,BAE:BB9,BD0:BD0,C05:C0C,C0E:C10,C12:C28,C2A:C39,C3D:C3D,C58:C5A,C5D:C5D,C60:C61,C80:C80,C85:C8C,C8E:C90,C92:CA8,CAA:CB3,CB5:CB9,CBD:CBD,CDD:CDE,CE0:CE1,CF1:CF2,D04:D0C,D0E:D10,D12:D3A,D3D:D3D,D4E:D4E,D54:D56,D5F:D61,D7A:D7F,D85:D96,D9A:DB1,DB3:DBB,DBD:DBD,DC0:DC6,E01:E30,E32:E32,E40:E46,E81:E82,E84:E84,E86:E8A,E8C:EA3,EA5:EA5,EA7:EB0,EB2:EB2,EBD:EBD,EC0:EC4,EC6:EC6,EDC:EDF,F00:F00,F40:F47,F49:F6C,F88:F8C,1000:102A,103F:103F,1050:1055,105A:105D,1061:1061,1065:1066,106E:1070,1075:1081,108E:108E,10A0:10C5,10C7:10C7,10CD:10CD,10D0:10FA,10FC:1248,124A:124D,1250:1256,1258:1258,125A:125D,1260:1288,128A:128D,1290:12B0,12B2:12B5,12B8:12BE,12C0:12C0,12C2:12C5,12C8:12D6,12D8:1310,1312:1315,1318:135A,1380:138F,13A0:13F5,13F8:13FD,1401:166C,166F:167F,1681:169A,16A0:16EA,16EE:16F8,1700:1711,171F:1731,1740:1751,1760:176C,176E:1770,1780:17B3,17D7:17D7,17DC:17DC,1820:1878,1880:18A8,18AA:18AA,18B0:18F5,1900:191E,1950:196D,1970:1974,1980:19AB,19B0:19C9,1A00:1A16,1A20:1A54,1AA7:1AA7,1B05:1B33,1B45:1B4C,1B83:1BA0,1BAE:1BAF,1BBA:1BE5,1C00:1C23,1C4D:1C4F,1C5A:1C7D,1C80:1C8A,1C90:1CBA,1CBD:1CBF,1CE9:1CEC,1CEE:1CF3,1CF5:1CF6,1CFA:1CFA,1D00:1DBF,1E00:1F15,1F18:1F1D,1F20:1F45,1F48:1F4D,1F50:1F57,1F59:1F59,1F5B:1F5B,1F5D:1F5D,1F5F:1F7D,1F80:1FB4,1FB6:1FBC,1FBE:1FBE,1FC2:1FC4,1FC6:1FCC,1FD0:1FD3,1FD6:1FDB,1FE0:1FEC,1FF2:1FF4,1FF6:1FFC,2071:2071,207F:207F,2090:209C,2102:2102,2107:2107,210A:2113,2115:2115,2118:211D,2124:2124,2126:2126,2128:2128,212A:2139,213C:213F,2145:2149,214E:214E,2160:2188,2C00:2CE4,2CEB:2CEE,2CF2:2CF3,2D00:2D25,2D27:2D27,2D2D:2D2D,2D30:2D67,2D6F:2D6F,2D80:2D96,2DA0:2DA6,2DA8:2DAE,2DB0:2DB6,2DB8:2DBE,2DC0:2DC6,2DC8:2DCE,2DD0:2DD6,2DD8:2DDE,3005:3007,3021:3029,3031:3035,3038:303C,3041:3096,309D:309F,30A1:30FA,30FC:30FF,3105:312F,3131:318E,31A0:31BF,31F0:31FF,3400:4DBF,4E00:A48C,A4D0:A4FD,A500:A60C,A610:A61F,A62A:A62B,A640:A66E,A67F:A69D,A6A0:A6EF,A717:A71F,A722:A788,A78B:A7CD,A7D0:A7D1,A7D3:A7D3,A7D5:A7DC,A7F2:A801,A803:A805,A807:A80A,A80C:A822,A840:A873,A882:A8B3,A8F2:A8F7,A8FB:A8FB,A8FD:A8FE,A90A:A925,A930:A946,A960:A97C,A984:A9B2,A9CF:A9CF,A9E0:A9E4,A9E6:A9EF,A9FA:A9FE,AA00:AA28,AA40:AA42,AA44:AA4B,AA60:AA76,AA7A:AA7A,AA7E:AAAF,AAB1:AAB1,AAB5:AAB6,AAB9:AABD,AAC0:AAC0,AAC2:AAC2,AADB:AADD,AAE0:AAEA,AAF2:AAF4,AB01:AB06,AB09:AB0E,AB11:AB16,AB20:AB26,AB28:AB2E,AB30:AB5A,AB5C:AB69,AB70:ABE2,AC00:D7A3,D7B0:D7C6,D7CB:D7FB,F900:FA6D,FA70:FAD9,FB00:FB06,FB13:FB17,FB1D:FB1D,FB1F:FB28,FB2A:FB36,FB38:FB3C,FB3E:FB3E,FB40:FB41,FB43:FB44,FB46:FBB1,FBD3:FC5D,FC64:FD3D,FD50:FD8F,FD92:FDC7,FDF0:FDF9,FE71:FE71,FE73:FE73,FE77:FE77,FE79:FE79,FE7B:FE7B,FE7D:FE7D,FE7F:FEFC,FF21:FF3A,FF41:FF5A,FF66:FF9D,FFA0:FFBE,FFC2:FFC7,FFCA:FFCF,FFD2:FFD7,FFDA:FFDC,10000:1000B,1000D:10026,10028:1003A,1003C:1003D,1003F:1004D,10050:1005D,10080:100FA,10140:10174,10280:1029C,102A0:102D0,10300:1031F,1032D:1034A,10350:10375,10380:1039D,103A0:103C3,103C8:103CF,103D1:103D5,10400:1049D,104B0:104D3,104D8:104FB,10500:10527,10530:10563,10570:1057A,1057C:1058A,1058C:10592,10594:10595,10597:105A1,105A3:105B1,105B3:105B9,105BB:105BC,105C0:105F3,10600:10736,10740:10755,10760:10767,10780:10785,10787:107B0,107B2:107BA,10800:10805,10808:10808,1080A:10835,10837:10838,1083C:1083C,1083F:10855,10860:10876,10880:1089E,108E0:108F2,108F4:108F5,10900:10915,10920:10939,10980:109B7,109BE:109BF,10A00:10A00,10A10:10A13,10A15:10A17,10A19:10A35,10A60:10A7C,10A80:10A9C,10AC0:10AC7,10AC9:10AE4,10B00:10B35,10B40:10B55,10B60:10B72,10B80:10B91,10C00:10C48,10C80:10CB2,10CC0:10CF2,10D00:10D23,10D4A:10D65,10D6F:10D85,10E80:10EA9,10EB0:10EB1,10EC2:10EC4,10F00:10F1C,10F27:10F27,10F30:10F45,10F70:10F81,10FB0:10FC4,10FE0:10FF6,11003:11037,11071:11072,11075:11075,11083:110AF,110D0:110E8,11103:11126,11144:11144,11147:11147,11150:11172,11176:11176,11183:111B2,111C1:111C4,111DA:111DA,111DC:111DC,11200:11211,11213:1122B,1123F:11240,11280:11286,11288:11288,1128A:1128D,1128F:1129D,1129F:112A8,112B0:112DE,11305:1130C,1130F:11310,11313:11328,1132A:11330,11332:11333,11335:11339,1133D:1133D,11350:11350,1135D:11361,11380:11389,1138B:1138B,1138E:1138E,11390:113B5,113B7:113B7,113D1:113D1,113D3:113D3,11400:11434,11447:1144A,1145F:11461,11480:114AF,114C4:114C5,114C7:114C7,11580:115AE,115D8:115DB,11600:1162F,11644:11644,11680:116AA,116B8:116B8,11700:1171A,11740:11746,11800:1182B,118A0:118DF,118FF:11906,11909:11909,1190C:11913,11915:11916,11918:1192F,1193F:1193F,11941:11941,119A0:119A7,119AA:119D0,119E1:119E1,119E3:119E3,11A00:11A00,11A0B:11A32,11A3A:11A3A,11A50:11A50,11A5C:11A89,11A9D:11A9D,11AB0:11AF8,11BC0:11BE0,11C00:11C08,11C0A:11C2E,11C40:11C40,11C72:11C8F,11D00:11D06,11D08:11D09,11D0B:11D30,11D46:11D46,11D60:11D65,11D67:11D68,11D6A:11D89,11D98:11D98,11EE0:11EF2,11F02:11F02,11F04:11F10,11F12:11F33,11FB0:11FB0,12000:12399,12400:1246E,12480:12543,12F90:12FF0,13000:1342F,13441:13446,13460:143FA,14400:14646,16100:1611D,16800:16A38,16A40:16A5E,16A70:16ABE,16AD0:16AED,16B00:16B2F,16B40:16B43,16B63:16B77,16B7D:16B8F,16D40:16D6C,16E40:16E7F,16F00:16F4A,16F50:16F50,16F93:16F9F,16FE0:16FE1,16FE3:16FE3,17000:187F7,18800:18CD5,18CFF:18D08,1AFF0:1AFF3,1AFF5:1AFFB,1AFFD:1AFFE,1B000:1B122,1B132:1B132,1B150:1B152,1B155:1B155,1B164:1B167,1B170:1B2FB,1BC00:1BC6A,1BC70:1BC7C,1BC80:1BC88,1BC90:1BC99,1D400:1D454,1D456:1D49C,1D49E:1D49F,1D4A2:1D4A2,1D4A5:1D4A6,1D4A9:1D4AC,1D4AE:1D4B9,1D4BB:1D4BB,1D4BD:1D4C3,1D4C5:1D505,1D507:1D50A,1D50D:1D514,1D516:1D51C,1D51E:1D539,1D53B:1D53E,1D540:1D544,1D546:1D546,1D54A:1D550,1D552:1D6A5,1D6A8:1D6C0,1D6C2:1D6DA,1D6DC:1D6FA,1D6FC:1D714,1D716:1D734,1D736:1D74E,1D750:1D76E,1D770:1D788,1D78A:1D7A8,1D7AA:1D7C2,1D7C4:1D7CB,1DF00:1DF1E,1DF25:1DF2A,1E030:1E06D,1E100:1E12C,1E137:1E13D,1E14E:1E14E,1E290:1E2AD,1E2C0:1E2EB,1E4D0:1E4EB,1E5D0:1E5ED,1E5F0:1E5F0,1E7E0:1E7E6,1E7E8:1E7EB,1E7ED:1E7EE,1E7F0:1E7FE,1E800:1E8C4,1E900:1E943,1E94B:1E94B,1EE00:1EE03,1EE05:1EE1F,1EE21:1EE22,1EE24:1EE24,1EE27:1EE27,1EE29:1EE32,1EE34:1EE37,1EE39:1EE39,1EE3B:1EE3B,1EE42:1EE42,1EE47:1EE47,1EE49:1EE49,1EE4B:1EE4B,1EE4D:1EE4F,1EE51:1EE52,1EE54:1EE54,1EE57:1EE57,1EE59:1EE59,1EE5B:1EE5B,1EE5D:1EE5D,1EE5F:1EE5F,1EE61:1EE62,1EE64:1EE64,1EE67:1EE6A,1EE6C:1EE72,1EE74:1EE77,1EE79:1EE7C,1EE7E:1EE7E,1EE80:1EE89,1EE8B:1EE9B,1EEA1:1EEA3,1EEA5:1EEA9,1EEAB:1EEBB,20000:2A6DF,2A700:2B739,2B740:2B81D,2B820:2CEA1,2CEB0:2EBE0,2EBF0:2EE5D,2F800:2FA1D,30000:3134A,31350:323AF diff --git a/crates/unicode/tests/data/version_skew_cpython3.14.txt b/crates/unicode/tests/data/version_skew_cpython3.14.txt new file mode 100644 index 000000000..acdb26089 --- /dev/null +++ b/crates/unicode/tests/data/version_skew_cpython3.14.txt @@ -0,0 +1,11 @@ +# Code points whose classification differs between CPython 3.14 (Unicode 16.0.0) +# and the Rust std / icu4x build used here (a later Unicode release assigns them). +# Regenerate with RUSTPYTHON_UNICODE_REGEN_SKEW=1. +# Format: `predicate start:end,...` with inclusive hex ranges. +isalnum 88F:88F,C5C:C5C,CDC:CDC,A7CE:A7CF,A7D2:A7D2,A7D4:A7D4,A7F1:A7F1,10940:10959,10EC5:10EC7,11DB0:11DDB,11DE0:11DE9,16EA0:16EB8,16EBB:16ED3,16FF2:16FF6,187F8:187FF,18D09:18D1E,18D80:18DF2,1E6C0:1E6DE,1E6E0:1E6E2,1E6E4:1E6E5,1E6E7:1E6ED,1E6F0:1E6F4,1E6FE:1E6FF,2B73A:2B73F,2CEA2:2CEAD,323B0:33479 +isalpha 88F:88F,C5C:C5C,CDC:CDC,A7CE:A7CF,A7D2:A7D2,A7D4:A7D4,A7F1:A7F1,10940:10959,10EC5:10EC7,11DB0:11DDB,16EA0:16EB8,16EBB:16ED3,16FF2:16FF3,187F8:187FF,18D09:18D1E,18D80:18DF2,1E6C0:1E6DE,1E6E0:1E6E2,1E6E4:1E6E5,1E6E7:1E6ED,1E6F0:1E6F4,1E6FE:1E6FF,2B73A:2B73F,2CEA2:2CEAD,323B0:33479 +isdecimal 11DE0:11DE9 +isdigit 11DE0:11DE9 +isidentifier 88F:88F,C5C:C5C,CDC:CDC,A7CE:A7CF,A7D2:A7D2,A7D4:A7D4,A7F1:A7F1,10940:10959,10EC5:10EC7,11DB0:11DDB,16EA0:16EB8,16EBB:16ED3,16FF2:16FF6,187F8:187FF,18D09:18D1E,18D80:18DF2,1E6C0:1E6DE,1E6E0:1E6E2,1E6E4:1E6E5,1E6E7:1E6ED,1E6F0:1E6F4,1E6FE:1E6FF,2B73A:2B73F,2CEA2:2CEAD,323B0:33479 +isnumeric 11DE0:11DE9,12038:12039,12079:12079,12226:12226,1222B:1222B,1230B:1230B,1230D:1230D,12399:12399,16FF4:16FF6 +isprintable 88F:88F,C5C:C5C,CDC:CDC,1ACF:1ADD,1AE0:1AEB,20C1:20C1,2B96:2B96,A7CE:A7CF,A7D2:A7D2,A7D4:A7D4,A7F1:A7F1,FBC3:FBD2,FD90:FD91,FDC8:FDCE,10940:10959,10EC5:10EC7,10ED0:10ED8,10EFA:10EFB,11B60:11B67,11DB0:11DDB,11DE0:11DE9,16EA0:16EB8,16EBB:16ED3,16FF2:16FF6,187F8:187FF,18D09:18D1E,18D80:18DF2,1CCFA:1CCFC,1CEBA:1CED0,1CEE0:1CEF0,1E6C0:1E6DE,1E6E0:1E6F5,1E6FE:1E6FF,1F6D8:1F6D8,1F777:1F77A,1F8D0:1F8D8,1FA54:1FA57,1FA8A:1FA8A,1FA8E:1FA8E,1FAC8:1FAC8,1FACD:1FACD,1FAEA:1FAEA,1FAEF:1FAEF,1FBFA:1FBFA,2B73A:2B73F,2CEA2:2CEAD,323B0:33479 diff --git a/crates/unicode/tests/differential.rs b/crates/unicode/tests/differential.rs new file mode 100644 index 000000000..fef3451fd --- /dev/null +++ b/crates/unicode/tests/differential.rs @@ -0,0 +1,235 @@ +//! Differential sweep of the classification predicates over the full scalar +//! range `0..0x110000` against a committed CPython reference dataset. +//! +//! CPython 3.14 ships Unicode 16.0.0 while the Rust standard library / icu4x +//! build used here may be a later release. Code points whose classification +//! changed between those Unicode versions are expected to differ; those are +//! recorded in `data/version_skew_cpython3.14.txt` as an explicit allow-list. +//! Any divergence outside that list fails the test — a real regression, not a +//! version bump. +//! +//! Both data files use the same run-length format: one `predicate` line per +//! str method, followed by comma-separated hex `start:end` inclusive ranges. + +#[cfg(test)] +mod tests { + extern crate alloc; + + use alloc::collections::{BTreeMap, BTreeSet}; + + use rustpython_unicode::classify; + + const MAX: u32 = 0x110000; + const REFERENCE: &str = include_str!("data/cpython3.14_predicates.txt"); + const VERSION_SKEW: &str = include_str!("data/version_skew_cpython3.14.txt"); + + fn crate_predicate(name: &str, cp: u32) -> bool { + let Some(c) = char::from_u32(cp) else { + // Lone surrogates are not scalars; every str predicate is false. + return false; + }; + match name { + "isalpha" => classify::is_alpha(c), + "isalnum" => classify::is_alnum(c), + "isdecimal" => classify::is_decimal(c), + "isdigit" => classify::is_digit(c), + "isnumeric" => classify::is_numeric(c), + "isspace" => classify::is_space(c), + "isprintable" => classify::is_printable(c), + "isidentifier" => { + // str.isidentifier is a whole-string predicate; for a single char it + // is "may start an identifier". + classify_is_identifier_char(c) + } + other => panic!("unknown predicate {other}"), + } + } + + fn classify_is_identifier_char(c: char) -> bool { + rustpython_unicode::identifier::is_start(c) + } + + /// Parse a `name -> sorted set of code points` map from a run-length file. + /// + /// Each non-comment line is `predicate start:end,start:end,...` with inclusive + /// hex ranges; a predicate with no members is a bare `predicate`. + fn parse_ranges(text: &str) -> BTreeMap<String, BTreeSet<u32>> { + let mut map = BTreeMap::new(); + for line in text.lines() { + let line = line.trim(); + if line.is_empty() || line.starts_with('#') { + continue; + } + let (name, packed) = match line.split_once(' ') { + Some((name, packed)) => (name, packed.trim()), + None => (line, ""), + }; + let mut set = BTreeSet::new(); + if !packed.is_empty() { + for run in packed.split(',') { + let (s, e) = run.split_once(':').expect("run is start:end"); + let start = u32::from_str_radix(s, 16).unwrap(); + let end = u32::from_str_radix(e, 16).unwrap(); + for cp in start..=end { + set.insert(cp); + } + } + } + map.insert(name.to_string(), set); + } + map + } + + /// Collapse a sorted code-point set into inclusive `start:end` runs. + fn encode_ranges(set: &BTreeSet<u32>) -> String { + let mut runs = Vec::new(); + let mut iter = set.iter().copied(); + if let Some(first) = iter.next() { + let (mut start, mut end) = (first, first); + for cp in iter { + if cp == end + 1 { + end = cp; + } else { + runs.push((start, end)); + start = cp; + end = cp; + } + } + runs.push((start, end)); + } + runs.iter() + .map(|(s, e)| format!("{s:X}:{e:X}")) + .collect::<Vec<_>>() + .join(",") + } + + /// Recompute the full divergence set. Every entry is a `(predicate, code + /// point)` where the crate and the CPython reference disagree. + fn all_divergences(reference: &BTreeMap<String, BTreeSet<u32>>) -> Vec<(String, u32, bool)> { + let mut out = Vec::new(); + for (name, truth) in reference { + for cp in 0..MAX { + let expected = truth.contains(&cp); + let actual = crate_predicate(name, cp); + if expected != actual { + out.push((name.clone(), cp, expected)); + } + } + } + out + } + + /// Regenerate `data/version_skew_cpython3.14.txt` from the current toolchain. + /// + /// Run with `RUSTPYTHON_UNICODE_REGEN_SKEW=1 cargo test -p rustpython-unicode + /// --test differential` after bumping the Rust/icu toolchain. All divergences + /// must be one-directional (crate=true, cpython=false) — newly-assigned code + /// points from a later Unicode release. A `cpython=true, crate=false` entry + /// means a code point lost a property, which is a real regression, so this + /// refuses to record it. + #[test] + fn regen_version_skew() { + if std::env::var_os("RUSTPYTHON_UNICODE_REGEN_SKEW").is_none() { + return; + } + let reference = parse_ranges(REFERENCE); + let divergences = all_divergences(&reference); + + let regressions: Vec<_> = divergences + .iter() + .filter(|(_, _, expected)| *expected) + .collect(); + assert!( + regressions.is_empty(), + "refusing to record {} cpython=true/crate=false divergence(s) — these are \ + regressions, not version skew: {:?}", + regressions.len(), + &regressions[..regressions.len().min(20)] + ); + + let mut by_predicate: BTreeMap<String, BTreeSet<u32>> = BTreeMap::new(); + for (name, cp, _) in &divergences { + by_predicate.entry(name.clone()).or_default().insert(*cp); + } + + let mut body = String::from( + "# Code points whose classification differs between CPython 3.14 (Unicode 16.0.0)\n\ + # and the Rust std / icu4x build used here (a later Unicode release assigns them).\n\ + # Regenerate with RUSTPYTHON_UNICODE_REGEN_SKEW=1.\n\ + # Format: `predicate start:end,...` with inclusive hex ranges.\n", + ); + for (name, set) in &by_predicate { + body.push_str(&format!("{name} {}\n", encode_ranges(set))); + } + let path = concat!( + env!("CARGO_MANIFEST_DIR"), + "/tests/data/version_skew_cpython3.14.txt" + ); + std::fs::write(path, body).unwrap(); + eprintln!( + "wrote {} skew code points across {} predicates to {path}", + divergences.len(), + by_predicate.len() + ); + } + + #[test] + fn predicates_match_cpython_except_documented_version_skew() { + let reference = parse_ranges(REFERENCE); + let skew = parse_ranges(VERSION_SKEW); + + let allowed = |name: &str, cp: u32| skew.get(name).is_some_and(|set| set.contains(&cp)); + + let mut unexpected: Vec<(String, u32, bool, bool)> = Vec::new(); + + for (name, truth) in &reference { + for cp in 0..MAX { + let expected = truth.contains(&cp); + let actual = crate_predicate(name, cp); + if expected != actual && !allowed(name, cp) { + unexpected.push((name.clone(), cp, expected, actual)); + } + } + } + + // Also flag stale allow-list entries: code points that no longer diverge. + let mut stale: Vec<(String, u32)> = Vec::new(); + for (name, set) in &skew { + let Some(truth) = reference.get(name) else { + continue; + }; + for &cp in set { + let expected = truth.contains(&cp); + let actual = crate_predicate(name, cp); + if expected == actual { + stale.push((name.clone(), cp)); + } + } + } + + if !unexpected.is_empty() || !stale.is_empty() { + let mut msg = String::new(); + if !unexpected.is_empty() { + msg.push_str(&format!( + "{} undocumented divergence(s) from CPython:\n", + unexpected.len() + )); + for (name, cp, expected, actual) in unexpected.iter().take(50) { + msg.push_str(&format!( + " {name} U+{cp:04X}: cpython={expected} crate={actual}\n" + )); + } + } + if !stale.is_empty() { + msg.push_str(&format!( + "{} stale version_skew_cpython3.14.txt entries that now agree:\n", + stale.len() + )); + for (name, cp) in stale.iter().take(50) { + msg.push_str(&format!(" {name} U+{cp:04X}\n")); + } + } + panic!("{msg}"); + } + } +} diff --git a/crates/unicode/tests/generate_reference.py b/crates/unicode/tests/generate_reference.py new file mode 100644 index 000000000..c7b21e66f --- /dev/null +++ b/crates/unicode/tests/generate_reference.py @@ -0,0 +1,74 @@ +#!/usr/bin/env python3.14 +"""Generate the CPython reference dataset for the differential Unicode sweep. + +Run with a CPython interpreter whose ``unicodedata.unidata_version`` matches the +Unicode release this crate targets (16.0.0 for CPython 3.14). The output is a +compact run-length encoding of every predicate's true-set over the full scalar +range, consumed by ``tests/differential.rs``. + +Usage: + python3.14 crates/unicode/tests/generate_reference.py + +Writes ``tests/data/cpython3.14_predicates.txt``. Commit the result. +""" + +from __future__ import annotations + +import pathlib +import sys +import unicodedata + +MAX = 0x110000 + +# str predicates: name -> single-char method. +STR_PREDICATES = { + "isalpha": str.isalpha, + "isalnum": str.isalnum, + "isdecimal": str.isdecimal, + "isdigit": str.isdigit, + "isnumeric": str.isnumeric, + "isspace": str.isspace, + "isprintable": str.isprintable, + "isidentifier": str.isidentifier, +} + + +def encode_ranges(is_true) -> list[tuple[int, int]]: + """Collapse the true-set of ``is_true`` into inclusive ``[start, end]`` runs.""" + ranges: list[tuple[int, int]] = [] + start: int | None = None + for cp in range(MAX): + if is_true(cp): + if start is None: + start = cp + elif start is not None: + ranges.append((start, cp - 1)) + start = None + if start is not None: + ranges.append((start, MAX - 1)) + return ranges + + +def main() -> int: + if unicodedata.unidata_version != "16.0.0": + sys.stderr.write( + f"warning: unidata_version is {unicodedata.unidata_version}, " + "expected 16.0.0 (CPython 3.14); regenerating anyway\n" + ) + + out = pathlib.Path(__file__).parent / "data" / "cpython3.14_predicates.txt" + out.parent.mkdir(parents=True, exist_ok=True) + + lines = [f"# unidata_version {unicodedata.unidata_version}"] + for name, method in STR_PREDICATES.items(): + ranges = encode_ranges(lambda cp, m=method: m(chr(cp))) + packed = ",".join(f"{s:X}:{e:X}" for s, e in ranges) + lines.append(f"{name} {packed}") + + out.write_text("\n".join(lines) + "\n") + print(f"wrote {out} ({out.stat().st_size} bytes)") + return 0 + + +if __name__ == "__main__": + raise SystemExit(main()) diff --git a/crates/stdlib/unicode/README.md b/crates/unicode/unicode/README.md similarity index 100% rename from crates/stdlib/unicode/README.md rename to crates/unicode/unicode/README.md diff --git a/crates/stdlib/unicode/latest/DerivedNumericValues.txt b/crates/unicode/unicode/latest/DerivedNumericValues.txt similarity index 100% rename from crates/stdlib/unicode/latest/DerivedNumericValues.txt rename to crates/unicode/unicode/latest/DerivedNumericValues.txt diff --git a/crates/stdlib/unicode/latest/NormalizationCorrections.txt b/crates/unicode/unicode/latest/NormalizationCorrections.txt similarity index 100% rename from crates/stdlib/unicode/latest/NormalizationCorrections.txt rename to crates/unicode/unicode/latest/NormalizationCorrections.txt diff --git a/crates/stdlib/unicode/latest/UnicodeData.txt b/crates/unicode/unicode/latest/UnicodeData.txt similarity index 100% rename from crates/stdlib/unicode/latest/UnicodeData.txt rename to crates/unicode/unicode/latest/UnicodeData.txt diff --git a/crates/stdlib/unicode/ucd32/DerivedBidiClass-3.2.0.txt b/crates/unicode/unicode/ucd32/DerivedBidiClass-3.2.0.txt similarity index 100% rename from crates/stdlib/unicode/ucd32/DerivedBidiClass-3.2.0.txt rename to crates/unicode/unicode/ucd32/DerivedBidiClass-3.2.0.txt diff --git a/crates/stdlib/unicode/ucd32/DerivedBinaryProperties-3.2.0.txt b/crates/unicode/unicode/ucd32/DerivedBinaryProperties-3.2.0.txt similarity index 100% rename from crates/stdlib/unicode/ucd32/DerivedBinaryProperties-3.2.0.txt rename to crates/unicode/unicode/ucd32/DerivedBinaryProperties-3.2.0.txt diff --git a/crates/stdlib/unicode/ucd32/DerivedCombiningClass-3.2.0.txt b/crates/unicode/unicode/ucd32/DerivedCombiningClass-3.2.0.txt similarity index 100% rename from crates/stdlib/unicode/ucd32/DerivedCombiningClass-3.2.0.txt rename to crates/unicode/unicode/ucd32/DerivedCombiningClass-3.2.0.txt diff --git a/crates/stdlib/unicode/ucd32/DerivedEastAsianWidth-3.2.0.txt b/crates/unicode/unicode/ucd32/DerivedEastAsianWidth-3.2.0.txt similarity index 100% rename from crates/stdlib/unicode/ucd32/DerivedEastAsianWidth-3.2.0.txt rename to crates/unicode/unicode/ucd32/DerivedEastAsianWidth-3.2.0.txt diff --git a/crates/stdlib/unicode/ucd32/DerivedGeneralCategory-3.2.0.txt b/crates/unicode/unicode/ucd32/DerivedGeneralCategory-3.2.0.txt similarity index 100% rename from crates/stdlib/unicode/ucd32/DerivedGeneralCategory-3.2.0.txt rename to crates/unicode/unicode/ucd32/DerivedGeneralCategory-3.2.0.txt diff --git a/crates/stdlib/unicode/ucd32/DerivedNumericType-3.2.0.txt b/crates/unicode/unicode/ucd32/DerivedNumericType-3.2.0.txt similarity index 100% rename from crates/stdlib/unicode/ucd32/DerivedNumericType-3.2.0.txt rename to crates/unicode/unicode/ucd32/DerivedNumericType-3.2.0.txt diff --git a/crates/stdlib/unicode/ucd32/DerivedNumericValues-3.2.0.txt b/crates/unicode/unicode/ucd32/DerivedNumericValues-3.2.0.txt similarity index 100% rename from crates/stdlib/unicode/ucd32/DerivedNumericValues-3.2.0.txt rename to crates/unicode/unicode/ucd32/DerivedNumericValues-3.2.0.txt diff --git a/crates/vm/Cargo.toml b/crates/vm/Cargo.toml index b3479e017..f4e59e6ac 100644 --- a/crates/vm/Cargo.toml +++ b/crates/vm/Cargo.toml @@ -42,6 +42,7 @@ ruff_text_size = { workspace = true, optional = true } rustpython-compiler-core = { workspace = true } rustpython-literal = { workspace = true } rustpython-sre_engine = { workspace = true } +rustpython-unicode = { workspace = true } ascii = { workspace = true } bitflags = { workspace = true } diff --git a/crates/vm/src/builtins/str.rs b/crates/vm/src/builtins/str.rs index 69109c943..a72a27267 100644 --- a/crates/vm/src/builtins/str.rs +++ b/crates/vm/src/builtins/str.rs @@ -48,12 +48,13 @@ use rustpython_common::{ wtf8::{CodePoint, Wtf8, Wtf8Buf, Wtf8Concat}, }; -use icu_casemap::{CaseMapper, TitlecaseMapper}; +use icu_casemap::TitlecaseMapper; use icu_locale::LanguageIdentifier; use icu_properties::props::{ - BidiClass, BinaryProperty, CaseIgnorable, Cased, EnumeratedProperty, GeneralCategory, - GeneralCategoryGroup, Lowercase, NumericType, Uppercase, XidContinue, XidStart, + BinaryProperty, CaseIgnorable, Cased, EnumeratedProperty, GeneralCategory, + GeneralCategoryGroup, Lowercase, Uppercase, }; +use rustpython_unicode as unicode; use writeable::Writeable; impl<'a> TryFromBorrowedObject<'a> for String { @@ -752,22 +753,8 @@ impl PyStr { fn casefold(&self) -> Self { match self.as_str_kind() { PyKindStr::Ascii(s) => s.to_ascii_lowercase().into(), - PyKindStr::Utf8(s) => CaseMapper::new().fold_string(s).to_string().into(), - PyKindStr::Wtf8(w) => { - let mut out = VecFmtWriter(Vec::with_capacity(w.len())); - let mapper = CaseMapper::new(); - for chunk in w.as_bytes().utf8_chunks() { - mapper - .fold(chunk.valid()) - .write_to(&mut out) - .expect("Writing to an in-memory buffer cannot fail."); - out.0.extend(chunk.invalid()); - } - // SAFETY: - // * CaseMapper only produces valid UTF-8 - // * Surrogates are appended as-is - unsafe { Wtf8Buf::from_bytes_unchecked(out.0) }.into() - } + PyKindStr::Utf8(s) => unicode::case::casefold_str(s).into(), + PyKindStr::Wtf8(w) => unicode::case::casefold_wtf8(w).into(), } } @@ -1011,41 +998,22 @@ impl PyStr { #[pymethod] fn isalnum(&self) -> bool { - !self.data.is_empty() - && self.char_all(|c| { - GeneralCategoryGroup::Letter - .union(GeneralCategoryGroup::Number) - .contains(GeneralCategory::for_char(c)) - }) + !self.data.is_empty() && self.char_all(unicode::classify::is_alnum) } #[pymethod] fn isnumeric(&self) -> bool { - !self.data.is_empty() - && self.char_all(|c| { - [ - NumericType::Decimal, - NumericType::Digit, - NumericType::Numeric, - ] - .contains(&NumericType::for_char(c)) - }) + !self.data.is_empty() && self.char_all(unicode::classify::is_numeric) } #[pymethod] fn isdigit(&self) -> bool { - !self.data.is_empty() - && self.char_all(|c| { - [NumericType::Digit, NumericType::Decimal].contains(&NumericType::for_char(c)) - }) + !self.data.is_empty() && self.char_all(unicode::classify::is_digit) } #[pymethod] fn isdecimal(&self) -> bool { - !self.data.is_empty() - && self.char_all(|c| { - matches!(GeneralCategory::for_char(c), GeneralCategory::DecimalNumber) - }) + !self.data.is_empty() && self.char_all(unicode::classify::is_decimal) } fn __mod__(&self, values: PyObjectRef, vm: &VirtualMachine) -> PyResult<Wtf8Buf> { @@ -1143,9 +1111,7 @@ impl PyStr { #[pymethod] fn isalpha(&self) -> bool { - !self.data.is_empty() - && self - .char_all(|c| GeneralCategoryGroup::Letter.contains(GeneralCategory::for_char(c))) + !self.data.is_empty() && self.char_all(unicode::classify::is_alpha) } #[pymethod] @@ -1175,23 +1141,12 @@ impl PyStr { #[pymethod] fn isprintable(&self) -> bool { - self.char_all(|c| c == '\u{0020}' || rustpython_literal::char::is_printable(c)) + self.char_all(unicode::classify::is_printable) } #[pymethod] fn isspace(&self) -> bool { - !self.data.is_empty() - && self.char_all(|c| { - matches!( - GeneralCategory::for_char(c), - GeneralCategory::SpaceSeparator - ) || matches!( - BidiClass::for_char(c), - BidiClass::WhiteSpace - | BidiClass::ParagraphSeparator - | BidiClass::SegmentSeparator - ) - }) + !self.data.is_empty() && self.char_all(unicode::classify::is_space) } // Return true if all cased characters in the string are lowercase and there is at least one cased character, false otherwise. @@ -1452,12 +1407,10 @@ impl PyStr { let Some(s) = self.to_str() else { return false }; let mut chars = s.chars(); - let is_identifier_start = chars - .next() - .is_some_and(|c| c == '_' || XidStart::for_char(c)); + let is_identifier_start = chars.next().is_some_and(unicode::identifier::is_start); // a string is not an identifier if it has whitespace or starts with a number - is_identifier_start && chars.all(XidContinue::for_char) + is_identifier_start && chars.all(unicode::identifier::is_continue) } // https://docs.python.org/3/library/stdtypes.html#str.translate diff --git a/crates/wtf8/Cargo.toml b/crates/wtf8/Cargo.toml index 110b54ad0..20bf82489 100644 --- a/crates/wtf8/Cargo.toml +++ b/crates/wtf8/Cargo.toml @@ -9,7 +9,7 @@ repository.workspace = true license.workspace = true [dependencies] -ascii = { workspace = true } -bstr = { workspace = true } +ascii = { workspace = true, features = ["alloc"] } +bstr = { workspace = true, features = ["alloc"] } itertools = { workspace = true } memchr = { workspace = true } diff --git a/crates/wtf8/src/lib.rs b/crates/wtf8/src/lib.rs index 772a28799..b31ed1cf0 100644 --- a/crates/wtf8/src/lib.rs +++ b/crates/wtf8/src/lib.rs @@ -31,7 +31,7 @@ //! to match CPython's behavior. //! //! [WTF-8]: https://simonsapin.github.io/wtf-8 -//! [`OsStr`]: std::ffi::OsStr +//! [`OsStr`]: https://doc.rust-lang.org/std/ffi/struct.OsStr.html #![no_std] #![allow(clippy::precedence, clippy::match_overlapping_arm)] diff --git a/extra_tests/snippets/stdlib_unicode_shared.py b/extra_tests/snippets/stdlib_unicode_shared.py new file mode 100644 index 000000000..ff8bc0533 --- /dev/null +++ b/extra_tests/snippets/stdlib_unicode_shared.py @@ -0,0 +1,93 @@ +# Exercises the Unicode semantics routed through the shared rustpython-unicode +# crate: str predicates, casefold, identifier rules, unicodedata queries, +# normalization, \N{} escapes, and re character classes. + +import re +import unicodedata + +# --- str classification predicates --------------------------------------- + +# Numeric_Type chain: isdecimal ⊂ isdigit ⊂ isnumeric +assert "5".isdecimal() and "5".isdigit() and "5".isnumeric() +assert not "²".isdecimal() # SUPERSCRIPT TWO: digit but not decimal +assert "²".isdigit() and "²".isnumeric() +assert not "⅓".isdigit() # VULGAR FRACTION ONE THIRD: numeric only +assert "⅓".isnumeric() + +assert "abc".isalpha() +assert "abc123".isalnum() +assert not "abc123".isalpha() +assert "あ".isalpha() # HIRAGANA LETTER A + +assert " \t\n".isspace() +assert "　".isspace() # IDEOGRAPHIC SPACE +assert "hello world".isprintable() +assert not "\x00".isprintable() +assert " ".isprintable() # ASCII space is printable + +# identifier rules (XID_Start / XID_Continue, plus leading underscore) +assert "_var".isidentifier() +assert "유니코드".isidentifier() # Hangul identifier +assert not "1abc".isidentifier() +assert not "a b".isidentifier() + +# --- case mapping / casefold --------------------------------------------- + +assert "ABC".lower() == "abc" +assert "abc".upper() == "ABC" +# casefold uses full mappings, unlike lower() +assert "ß".casefold() == "ss" # LATIN SMALL LETTER SHARP S +assert "Σ".casefold() == "σ" # GREEK CAPITAL SIGMA -> small sigma +assert "Straße".casefold() == "strasse" + +# lone-surrogate safety: casefold must not panic on surrogates +surrogate = "\ud800" +assert surrogate.casefold() == surrogate + +# --- unicodedata ---------------------------------------------------------- + +assert unicodedata.category("A") == "Lu" +assert unicodedata.category("1") == "Nd" +assert unicodedata.bidirectional("A") == "L" +assert unicodedata.decimal("٥") == 5 # ARABIC-INDIC DIGIT FIVE +assert unicodedata.digit("²") == 2 +assert abs(unicodedata.numeric("⅓") - (1 / 3)) < 1e-6 +assert unicodedata.name("☃") == "SNOWMAN" +assert unicodedata.lookup("SNOWMAN") == "☃" +assert unicodedata.combining("́") == 230 # COMBINING ACUTE ACCENT +assert unicodedata.mirrored("(") == 1 +assert unicodedata.east_asian_width("あ") == "W" + +# ucd_3_2_0 legacy view (used by stringprep) +assert unicodedata.ucd_3_2_0.unidata_version == "3.2.0" + +# --- normalization -------------------------------------------------------- + +composed = "é" # é +decomposed = "é" +assert unicodedata.normalize("NFC", decomposed) == composed +assert unicodedata.normalize("NFD", composed) == decomposed +assert unicodedata.is_normalized("NFC", composed) +assert not unicodedata.is_normalized("NFD", composed) + +# --- \N{} escapes (compiler) --------------------------------------------- + +assert "\N{SNOWMAN}" == "☃" +assert "\N{GREEK SMALL LETTER ALPHA}" == "α" + +# --- re character classes ------------------------------------------------- + +assert re.fullmatch(r"\w+", "abc_123") is not None +assert re.fullmatch(r"\w+", "유니코드") is not None # \w is Unicode-aware +assert re.fullmatch(r"\d+", "123") is not None +# \d matches Unicode decimal digits (category Nd), not just ASCII +assert re.fullmatch(r"\d", "٥") is not None # ARABIC-INDIC DIGIT FIVE +assert re.fullmatch(r"\d", "५") is not None # DEVANAGARI DIGIT FIVE +assert re.fullmatch(r"\d", "²") is None # SUPERSCRIPT TWO (No), not decimal +assert re.fullmatch(r"\s+", " \t\n") is not None +# ASCII flag restricts \w to ASCII +assert re.fullmatch(r"\w+", "유", re.ASCII) is None +# case-insensitive matching routes through the shared case helpers +assert re.fullmatch(r"straße", "STRAßE", re.IGNORECASE) is not None + +print("stdlib_unicode_shared: OK") From 58ae87c00aac2cab7d544871f9586ec527a03447 Mon Sep 17 00:00:00 2001 From: "Jeong, YunWon" <69878+youknowone@users.noreply.github.com> Date: Tue, 7 Jul 2026 15:29:52 +0900 Subject: [PATCH 197/339] Fix decompose_float subnormals, float format grouping/empty type; add HashSecret::from_keys (#8232) * common: fix decompose_float for subnormal inputs Subnormals carry a biased exponent of 0 and no implicit leading mantissa bit, so the bit-twiddling frexp misread them: hash(5e-324) returned 8404992 instead of CPython's 16777216. Scale subnormals into the normal range by 2**54 (exact) before decomposing and fold the shift back into the returned exponent. Adds a frexp-contract unit test over normals, subnormals, and boundary values. Assisted-by: Claude * common: add HashSecret::from_keys HashSecret's fields are private and the only constructor derives k0/k1 from a u32 seed, so an embedder cannot reproduce a fixed keying (e.g. a deterministic PYTHONHASHSEED=0-style run). Add a const constructor taking explicit SipHash keys; the seeded path is unchanged. Assisted-by: Claude * common: fix float format grouping and empty presentation type Thousands grouping split the magnitude only on '.', so exponent and percent tails received separators (format(1e20, ',e') gave '1e+,20'-class corruption). Group only the leading integer digits for interval-3 output; hex/octal/binary keep whole-magnitude grouping. Empty presentation type: with a precision, clamp it to at least 1 and restore a trailing '.0' on integer-looking results (Py_DTSF_ADD_DOT_0); without one, alternate form now inserts the forced decimal point before an exponent instead of appending it. Verified byte-identical to CPython 3.14 over a hash/format differential battery; test_format, test_float, test_fstring, test_hash pass. Assisted-by: Claude * common: satisfy rustfmt and clippy in new hash/float tests - float_ops: use core::f64::consts::PI in the frexp-contract battery (clippy::approx_constant) - hash: rewrite the keyed_hash test via BuildHasher::hash_one (clippy::manual_hash_one) - rustfmt the new float_ops/hash/format test modules Assisted-by: Claude * common: add DTSF to format.rs spell-checker ignores Assisted-by: Claude --- crates/common/src/float_ops.rs | 136 +++++++++++++++++++++++-- crates/common/src/format.rs | 180 +++++++++++++++++++++++++++++---- crates/common/src/hash.rs | 39 +++++++ 3 files changed, 330 insertions(+), 25 deletions(-) diff --git a/crates/common/src/float_ops.rs b/crates/common/src/float_ops.rs index f64396153..ca1c716a9 100644 --- a/crates/common/src/float_ops.rs +++ b/crates/common/src/float_ops.rs @@ -5,13 +5,21 @@ use num_traits::{Signed, ToPrimitive}; #[must_use] pub const fn decompose_float(value: f64) -> (f64, i32) { if value == 0.0 { - (0.0, 0) - } else { - let bits = value.to_bits(); - let exponent: i32 = ((bits >> 52) & 0x7ff) as i32 - 1022; - let mantissa_bits = bits & (0x000f_ffff_ffff_ffff) | (1022 << 52); - (f64::from_bits(mantissa_bits), exponent) + return (0.0, 0); } + let bits = value.to_bits(); + // Subnormals carry a biased exponent of 0 and no implicit leading mantissa + // bit, so the normal decomposition below would misread them. Scale them up + // into the normal range first (exact, since it is a power-of-two shift) and + // fold the scale back into the returned exponent. + let (bits, exponent_adjust) = if (bits >> 52) & 0x7ff == 0 { + ((value * (1u64 << 54) as f64).to_bits(), -54) + } else { + (bits, 0) + }; + let exponent: i32 = ((bits >> 52) & 0x7ff) as i32 - 1022 + exponent_adjust; + let mantissa_bits = bits & (0x000f_ffff_ffff_ffff) | (1022 << 52); + (f64::from_bits(mantissa_bits), exponent) } /// Equate an integer to a float. @@ -270,3 +278,119 @@ pub fn round_float_digits(x: f64, ndigits: i32) -> Option<f64> { } Some(result) } + +#[cfg(test)] +mod tests { + use super::*; + use crate::hash::hash_float; + + /// Exact `2**e` for `e` in `[-1074, 1023]`, built from bits so extreme + /// exponents don't overflow through an intermediate `2**|e|`. + fn pow2(e: i32) -> f64 { + if e >= -1022 { + f64::from_bits(((e + 1023) as u64) << 52) + } else { + f64::from_bits(1u64 << (e + 1074)) + } + } + + /// `decompose_float` is a frexp returning the *magnitude* mantissa: for a + /// nonzero `value`, `m` lies in `[0.5, 1)` and `m * 2**e == value.abs()`, + /// including for subnormals which have no implicit leading mantissa bit. + /// (Its sole caller reintroduces the sign via `value.signum()`.) + #[test] + fn decompose_float_frexp_contract() { + let mut values = alloc::vec![ + 0.0, + f64::from_bits(1), // smallest subnormal + f64::from_bits(2), + f64::from_bits(0x000f_ffff_ffff_ffff), // largest subnormal + f64::MIN_POSITIVE, // DBL_MIN, smallest normal + f64::from_bits(f64::MIN_POSITIVE.to_bits() - 1), // predecessor + 1.0, + 1.5, + 0.1, + core::f64::consts::PI, + ]; + for e in -1074..=1023 { + values.push(pow2(e)); + values.push(-pow2(e)); + } + for &v in &values { + let (m, e) = decompose_float(v); + if v == 0.0 { + assert_eq!((m, e), (0.0, 0)); + continue; + } + assert!( + (0.5..1.0).contains(&m), + "mantissa {m} out of [0.5, 1) for value {v:e}" + ); + // Reconstruct: m * 2**e must round-trip to the magnitude. Fold one + // power of two into the mantissa so `e` stays within `pow2`'s range + // (frexp yields e up to 1024 for 2**1023). + let reconstructed = (m * 2.0) * pow2(e - 1); + assert_eq!( + reconstructed.to_bits(), + v.abs().to_bits(), + "reconstruction failed for {v:e}: m={m}, e={e}" + ); + } + } + + /// Subnormal frexp regression: hash of the smallest positive subnormal. + #[test] + fn hash_float_smallest_subnormal() { + // hash(5e-324) == 16777216 (CPython 3.14 ground truth). The pre-fix + // bit-twiddling frexp returned 8404992 here. + assert_eq!(hash_float(f64::from_bits(1)), Some(16777216)); + } + + /// Differential float-hash table captured from CPython 3.14.5, spanning + /// subnormal boundaries, powers of two across the whole exponent range, and + /// a spread of normals. + #[test] + fn hash_float_matches_cpython() { + const HASH_CASES: &[(u64, i64)] = &[ + (0x0000000000000001, 16777216), // smallest subnormal 5e-324 + (0x0000000000000002, 33554432), // subnormal + (0x00000000deadbeef, 62678480394911744), // subnormal midrange + (0x0008000000000000, 16384), // subnormal high bit + (0x000fffffffffffff, 2305843009196949503), // largest subnormal + (0x0010000000000000, 32768), // DBL_MIN smallest normal + (0x8000000000000001, -16777216), // negative smallest subnormal + (0x0020000000000000, 65536), // 2**-1021 + (0x0170000000000000, 137438953472), // 2**-1000 + (0x39b0000000000000, 4194304), // 2**-100 + (0x3f50000000000000, 2251799813685248), // 2**-10 + (0x3fe0000000000000, 1152921504606846976), // 2**-1 + (0x3ff0000000000000, 1), // 2**0 + (0x4000000000000000, 2), // 2**1 + (0x4090000000000000, 1024), // 2**10 + (0x4630000000000000, 549755813888), // 2**100 + (0x7e70000000000000, 16777216), // 2**1000 + (0x7fe0000000000000, 140737488355328), // 2**1023 + (0xffe0000000000000, -140737488355328), // -2**1023 + (0x3ff8000000000000, 1152921504606846977), // 1.5 + (0x400921fb54442d18, 326490430436040707), // 3.141592653589793 + (0x7e37e43c8800759c, 1224995262755759164), // 1e+300 + (0x01a56e1fc2f8f359, 482449582752280463), // 1e-300 + (0x40c81cd6c8b43958, 1563361560246628409), // 12345.678 + (0x3fb999999999999a, 230584300921369408), // 0.1 + (0x4005666666666666, 1556444031219243010), // 2.675 + (0x4132d68700000000, 1234567), // 1234567.0 + (0x44dfe154f457ea13, 1428027733287631914), // 6.022e+23 + (0x3c07a42f549647fb, 851769299698974080), // 1.602e-19 + (0xbff0000000000000, -2), // -1.0 + (0xbfb999999999999a, -230584300921369408), // -0.1 + ]; + for &(bits, expected) in HASH_CASES { + let v = f64::from_bits(bits); + assert_eq!( + hash_float(v), + Some(expected), + "hash mismatch for {v:e} (bits {bits:#018x})" + ); + } + } +} diff --git a/crates/common/src/format.rs b/crates/common/src/format.rs index 5510dce41..1f43335b7 100644 --- a/crates/common/src/format.rs +++ b/crates/common/src/format.rs @@ -1,4 +1,4 @@ -// spell-checker:ignore ddfe +// spell-checker:ignore ddfe DTSF use core::ops::Deref; use core::{cmp, str::FromStr}; use itertools::{Itertools, PeekingNext}; @@ -380,15 +380,31 @@ impl FormatSpec { sep: char, disp_digit_cnt: i32, ) -> String { - // Don't add separators to the floating decimal point of numbers - let mut parts = magnitude_str.splitn(2, '.'); - let magnitude_int_str = parts.next().unwrap().to_string(); + // Group only the leading integer digits; the trailing remainder must + // never receive separators. For decimal and float output (interval 3) + // that remainder is the decimal point and fraction, an exponent + // (`e+NN`), or a trailing percent sign. Hex/octal/binary output + // (interval 4) has no such tail and its `a`-`f`/`e`/`E` are digits, so + // the whole magnitude is groupable. + let int_len = if inter == 4 { + magnitude_str.len() + } else { + magnitude_str + .bytes() + .position(|b| !b.is_ascii_digit()) + .unwrap_or(magnitude_str.len()) + }; + // No leading integer digits (e.g. "inf"/"nan") means nothing to group; + // leave any width padding to the fill/align step. + if int_len == 0 { + return magnitude_str; + } + let magnitude_int_str = magnitude_str[..int_len].to_string(); + let remainder = &magnitude_str[int_len..]; let dec_digit_cnt = magnitude_str.len() as i32 - magnitude_int_str.len() as i32; let int_digit_cnt = disp_digit_cnt - dec_digit_cnt; let mut result = Self::separate_integer(magnitude_int_str, inter, sep, int_digit_cnt); - if let Some(part) = parts.next() { - result.push_str(&format!(".{part}")) - } + result.push_str(remainder); result } @@ -786,14 +802,40 @@ impl FormatSpec { magnitude if magnitude.is_nan() => Ok("nan".to_owned()), magnitude if magnitude.is_infinite() => Ok("inf".to_owned()), _ => match self.precision { - Some(precision) => Ok(float::format_general( - precision, - magnitude, - Case::Lower, - self.alternate_form, - true, - )), - None => Ok(float::to_string(magnitude)), + Some(precision) => { + // Empty presentation type with a precision behaves like + // `g` but repr-like: precision is clamped to at least 1, + // and an integer-looking result keeps a trailing `.0` + // (Py_DTSF_ADD_DOT_0). + let precision = if precision == 0 { 1 } else { precision }; + let s = float::format_general( + precision, + magnitude, + Case::Lower, + self.alternate_form, + true, + ); + Ok(if s.bytes().any(|b| matches!(b, b'.' | b'e' | b'E')) { + s + } else { + format!("{s}.0") + }) + } + None => { + let s = float::to_string(magnitude); + // Alternate form forces a decimal point into the + // repr-like output. Only exponent-form values lack one + // (`1e+16` -> `1.e+16`); fixed-form repr already carries + // a `.`. + Ok(if self.alternate_form && !s.contains('.') { + match s.find(['e', 'E']) { + Some(pos) => format!("{}.{}", &s[..pos], &s[pos..]), + None => format!("{s}."), + } + } else { + s + }) + } }, }, }; @@ -857,10 +899,11 @@ impl FormatSpec { Err(FormatSpecError::UnknownFormatCode('N', "int")) } Some(FormatType::String) => Err(FormatSpecError::UnknownFormatCode('s', "int")), - Some(FormatType::Character) => match (self.sign, self.alternate_form) { - (Some(_), _) => Err(FormatSpecError::NotAllowed("Sign")), - (_, true) => Err(FormatSpecError::NotAllowed("Alternate form (#)")), - (_, _) => match num.to_u32() { + Some(FormatType::Character) => match (self.precision, self.sign, self.alternate_form) { + (Some(_), _, _) => Err(FormatSpecError::PrecisionNotAllowed), + (_, Some(_), _) => Err(FormatSpecError::NotAllowed("Sign")), + (_, _, true) => Err(FormatSpecError::NotAllowed("Alternate form (#)")), + (_, _, _) => match num.to_u32() { Some(n) if n <= 0x10ffff => Ok(core::char::from_u32(n).unwrap().to_string()), Some(_) | None => Err(FormatSpecError::CodeNotInRange), }, @@ -1664,6 +1707,105 @@ mod tests { assert_eq!(result, "000001,234"); } + fn fmt_float(spec: &str, value: f64) -> String { + FormatSpec::parse(spec) + .unwrap() + .format_float(value) + .unwrap() + } + + #[test] + fn format_float_grouping_never_touches_exponent() { + // Grouping must group only the mantissa's integer digits, never the + // exponent digits (was "1e,+20") or a trailing percent sign. + assert_eq!(fmt_float(",g", 1e20), "1e+20"); + assert_eq!(fmt_float("_g", 1e-10), "1e-10"); + assert_eq!(fmt_float(",e", 1e20), "1.000000e+20"); + assert_eq!(fmt_float(",", 1e16), "1e+16"); + assert_eq!(fmt_float(",.0%", 1.0), "100%"); + assert_eq!(fmt_float(",.2%", 12345.0), "1,234,500.00%"); + // Fixed-form grouping still groups the integer part. + assert_eq!(fmt_float(",", 1234567.0), "1,234,567.0"); + } + + #[test] + fn format_float_grouping_inf_nan() { + // No integer digits to group; width padding is left to fill/align, so + // separators never land inside "inf"/"nan". + assert_eq!(fmt_float(",", f64::INFINITY), "inf"); + assert_eq!(fmt_float("06,", f64::INFINITY), "000inf"); + assert_eq!(fmt_float("06,", f64::NAN), "000nan"); + assert_eq!(fmt_float("06,%", f64::INFINITY), "00inf%"); + } + + #[test] + fn format_float_empty_type_with_precision() { + // Empty presentation type with a precision is repr-like: precision is + // clamped to at least 1 and integer-looking output keeps a `.0`. + assert_eq!(fmt_float(".2", 1.0), "1.0"); + assert_eq!(fmt_float(".6", 100.0), "100.0"); + assert_eq!(fmt_float(".17", 1234567.0), "1234567.0"); + assert_eq!(fmt_float(".0", 0.5), "0.5"); + assert_eq!(fmt_float(".0", 0.0001), "0.0001"); + assert_eq!(fmt_float(".2", 0.0), "0.0"); + assert_eq!(fmt_float(".0", 0.0), "0e+00"); + assert_eq!(fmt_float(".2", 100.0), "1e+02"); + } + + #[test] + fn format_float_alternate_form_forces_point() { + // Alternate form injects a decimal point into exponent-form repr. + assert_eq!(fmt_float("#", 1e16), "1.e+16"); + assert_eq!(fmt_float("#", 1e-5), "1.e-05"); + // Fixed-form repr already has a point, so it is unchanged. + assert_eq!(fmt_float("#", 100.0), "100.0"); + assert_eq!(fmt_float("#", 1.5), "1.5"); + } + + #[test] + fn format_int_hex_grouping_preserved() { + // Underscore grouping of hex/octal groups every 4 digits, including the + // `a`-`f` letters. + assert_eq!( + FormatSpec::parse("_x") + .unwrap() + .format_int(&BigInt::from(1000000)) + .unwrap(), + "f_4240" + ); + assert_eq!( + FormatSpec::parse("_X") + .unwrap() + .format_int(&BigInt::from(0xABCDEFu32)) + .unwrap(), + "AB_CDEF" + ); + } + + #[test] + fn format_int_character_rejects_precision() { + // 'c' rejects precision, and precision is checked before sign/alt form. + assert_eq!( + FormatSpec::parse(".2c") + .unwrap() + .format_int(&BigInt::from(65)), + Err(FormatSpecError::PrecisionNotAllowed) + ); + assert_eq!( + FormatSpec::parse("+.2c") + .unwrap() + .format_int(&BigInt::from(65)), + Err(FormatSpecError::PrecisionNotAllowed) + ); + // Without precision, 'c' still renders the code point. + assert_eq!( + FormatSpec::parse("c") + .unwrap() + .format_int(&BigInt::from(65)), + Ok("A".to_owned()) + ); + } + #[test] fn format_parse() { let expected = Ok(FormatString { diff --git a/crates/common/src/hash.rs b/crates/common/src/hash.rs index 56e6e0006..1c58abc20 100644 --- a/crates/common/src/hash.rs +++ b/crates/common/src/hash.rs @@ -50,6 +50,14 @@ impl HashSecret { Self { k0, k1 } } + /// Build a secret from explicit SipHash keys, bypassing seed derivation. + /// Lets an embedder reproduce a fixed keying (e.g. a deterministic run) that + /// [`new`](Self::new) cannot express through its `u32` seed. + #[must_use] + pub const fn from_keys(k0: u64, k1: u64) -> Self { + Self { k0, k1 } + } + pub fn hash_value<T: Hash + ?Sized>(&self, data: &T) -> PyHash { fix_sentinel(mod_int(self.hash_one(data) as _)) } @@ -296,3 +304,34 @@ impl FrozenSetHash { hash as PyHash } } + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn from_keys_is_stable_and_seed_independent() { + const K0: u64 = 0x0706_0504_0302_0100; + const K1: u64 = 0x0f0e_0d0c_0b0a_0908; + const LOCKED_DIGEST: PyHash = -1862661396243998188; + + // Two secrets built from the same explicit keys hash identically, and + // the digest does not depend on the seed-derivation path. + let a = HashSecret::from_keys(K0, K1); + let b = HashSecret::from_keys(K0, K1); + assert_eq!(a.hash_str("hello"), b.hash_str("hello")); + assert_eq!( + a.hash_bytes(b"a fixed message"), + b.hash_bytes(b"a fixed message") + ); + + // Explicit keys drive the SipHasher-2-4 directly. `keyed_hash` pins + // k1 = 0, so a secret built with the same k0 and k1 = 0 must reproduce + // its raw digest. + let zero_k1 = HashSecret::from_keys(K0, 0); + assert_eq!(keyed_hash(K0, b"payload"), zero_k1.hash_one(b"payload")); + + // Locked digest so an accidental keying change is caught. + assert_eq!(a.hash_str("determinism"), LOCKED_DIGEST); + } +} From 37b64a691d134a9067ae8037e17f846fb51a4692 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Jul 2026 15:30:13 +0900 Subject: [PATCH 198/339] Bump libz-rs-sys from 0.6.4 to 0.6.5 (#8227) Bumps [libz-rs-sys](https://github.com/trifectatechfoundation/zlib-rs) from 0.6.4 to 0.6.5. - [Release notes](https://github.com/trifectatechfoundation/zlib-rs/releases) - [Changelog](https://github.com/trifectatechfoundation/zlib-rs/blob/main/docs/release.md) - [Commits](https://github.com/trifectatechfoundation/zlib-rs/compare/v0.6.4...v0.6.5) --- updated-dependencies: - dependency-name: libz-rs-sys dependency-version: 0.6.5 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 310869455..6a37af43c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2042,9 +2042,9 @@ dependencies = [ [[package]] name = "libz-rs-sys" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3deaad727e11899800b9a177af14682bfa5d5d96fa525a6c9bd13e650c019f40" +checksum = "5c12cd6e7e66c601f22d849241e2257b38b4685a34b41401f4aefdd9c431c1c6" dependencies = [ "zlib-rs", ] @@ -5141,9 +5141,9 @@ dependencies = [ [[package]] name = "zlib-rs" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "977347db8caa080403f6b6b7c1cda9479a8e869316f7e13a59b19076a40f94e3" +checksum = "5431d5661c32445236631278f27946e444ddafe4684cac70b185272d4f9c52d5" [[package]] name = "zmij" From ef41482e66b33f339051206479223050afeb9535 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Jul 2026 15:33:17 +0900 Subject: [PATCH 199/339] Bump rand from 0.10.1 to 0.10.2 in the random group across 1 directory (#8224) Bumps the random group with 1 update in the / directory: [rand](https://github.com/rust-random/rand). Updates `rand` from 0.10.1 to 0.10.2 - [Release notes](https://github.com/rust-random/rand/releases) - [Changelog](https://github.com/rust-random/rand/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-random/rand/compare/0.10.1...0.10.2) --- updated-dependencies: - dependency-name: rand dependency-version: 0.10.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: random ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6a37af43c..17f4ddb81 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2926,9 +2926,9 @@ dependencies = [ [[package]] name = "rand" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207" +checksum = "c7f5fa3a058cd35567ef9bfa5e75732bee0f9e4c55fa90477bef2dfcdbc4be80" dependencies = [ "chacha20", "getrandom 0.4.3", @@ -3455,7 +3455,7 @@ dependencies = [ "is-macro", "lexical-parse-float", "num-traits", - "rand 0.10.1", + "rand 0.10.2", "rustpython-unicode", "rustpython-wtf8", ] @@ -3596,7 +3596,7 @@ dependencies = [ "phf 0.14.0", "pkcs8", "pymath", - "rand 0.10.1", + "rand 0.10.2", "rapidhash", "rustls", "rustls-native-certs", @@ -4190,7 +4190,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ "fastrand", - "getrandom 0.4.3", + "getrandom 0.3.4", "once_cell", "rustix", "windows-sys 0.61.2", From aeb0f5e00e19afbe54d4aecad56752d4f7d74a8a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Jul 2026 15:33:27 +0900 Subject: [PATCH 200/339] Bump actions/cache/save from 5.0.5 to 6.1.0 (#8221) Bumps [actions/cache/save](https://github.com/actions/cache) from 5.0.5 to 6.1.0. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/27d5ce7f107fe9357f9df03efb73ab90386fccae...55cc8345863c7cc4c66a329aec7e433d2d1c52a9) --- updated-dependencies: - dependency-name: actions/cache/save dependency-version: 6.1.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 4 ++-- .github/workflows/update-caches.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e42882bd8..a02977691 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -581,7 +581,7 @@ jobs: - name: save prek cache if: ${{ github.ref == 'refs/heads/main' }} # only save on main - uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5 + uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 with: key: prek-${{ hashFiles('.pre-commit-config.yaml') }} path: ~/.cache/prek @@ -744,7 +744,7 @@ jobs: - name: Save npm cache # Save only on main or release if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/release' - uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5 + uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 with: path: ${{ steps.npm-cache-dir.outputs.dir }} key: node-${{ runner.os }}-wasm-demo-${{ hashFiles('wasm/demo/package-lock.json') }} diff --git a/.github/workflows/update-caches.yml b/.github/workflows/update-caches.yml index fd3dddb7a..de94f3f50 100644 --- a/.github/workflows/update-caches.yml +++ b/.github/workflows/update-caches.yml @@ -67,7 +67,7 @@ jobs: run: cargo build --profile release ${{ env.CARGO_ARGS }} - name: Save cache - uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5 + uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 with: path: | ~/.cargo/bin/ From fafd9c75df4883b45ab275a7b03415d52fb74361 Mon Sep 17 00:00:00 2001 From: "Jeong, YunWon" <69878+youknowone@users.noreply.github.com> Date: Tue, 7 Jul 2026 18:14:45 +0900 Subject: [PATCH 201/339] more hostenv isolation (#7932) * Move which crate dependency from vm to host_env Add host_env::fs::which wrapper and update getpath.rs call site. * Move readline module from vm to host_env Move crates/vm/src/readline.rs to crates/host_env/src/readline.rs and re-export it from rustpython_vm::readline. Move rustyline dependency from vm to host_env. Drop the host_env feature gates on history I/O inside the moved module. * Move gethostname and mac_address dependencies from stdlib to host_env Add host_env::socket::hostname and host_env::socket::mac_address wrappers. Update _socket.gethostname and _uuid.get_node_id call sites. * Re-export libc constants and types through host_env Move direct libc constant and type references in stdlib (faulthandler, fcntl, multiprocessing, posixshmem, select, syslog) to use host_env re-exports. Replace libc::c_int and libc::c_uint in stdlib with core::ffi equivalents. * Re-export mmap libc constants through host_env Move direct libc MADV_*, MAP_*, PROT_*, EOVERFLOW references in stdlib::mmap to host_env::mmap re-exports. Replace libc::c_int with core::ffi::c_int. * Re-export locale and termios libc constants through host_env Move direct libc LC_*, ABDAY_*, ABMON_*, TIOC*, FIO* and related constants in stdlib::locale and stdlib::termios to host_env re-exports. Replace libc::c_char in stdlib::locale and stdlib::openssl::cert with core::ffi::c_char. * Replace libc c-types and FILE wrappers in openssl with host_env Replace libc::c_int, c_long, c_uchar, c_uint, c_ulong, c_void, c_char in stdlib::openssl with core::ffi equivalents. Replace libc::ENOENT with host_env::errno::errors::ENOENT. Add host_env::fileutils::{CFile, fclose} and route the load_dh_params fclose call and PEM_read_DHparams FILE pointer type through them. * Fix Windows build: expose EOVERFLOW, SIGSEGV, SIGFPE on Windows host_mmap::EOVERFLOW and host_faulthandler::{SIGSEGV, SIGFPE} re-exports were gated to cfg(unix) but stdlib uses them from Windows and platform-agnostic code paths. * Re-export remaining libc types and constants through host_env Move direct libc references in stdlib (resource, posixsubprocess, grp, socket) to host_env re-exports. Replace libc::c_long, libc::c_longlong, libc::c_char in stdlib::socket with core::ffi equivalents. Add resource::{RLIMIT_*, RUSAGE_*, c_long, rlim_t, rlimit, timeval}, posix::{c_char, pid_t}, grp::gid_t, and socket::{AF_*, SOCK_STREAM, sa_family_t, socklen_t, sockaddr_*} re-exports. * Move socket2 and dns-lookup dependencies from stdlib to host_env Re-export socket2 as host_env::socket::raw and dns-lookup as host_env::socket::dns. Update _socket call sites to route through host_env aliases. * Move system-configuration dependency from stdlib to host_env Re-export the macOS system-configuration crate as host_env::system_configuration and update _scproxy call sites. * Restrict CAN/ALG sockaddr structs to target_os linux libc on Android (bionic) does not define sockaddr_can, so importing it for target_os = "android" fails to compile. Keep AF_ALG/AF_CAN for both linux and android, and gate sockaddr_alg/sockaddr_can to linux only. Assisted-by: Claude --- Cargo.lock | 503 ++++++++++++++---------- crates/host_env/Cargo.toml | 13 + crates/host_env/src/faulthandler.rs | 4 + crates/host_env/src/fcntl.rs | 26 ++ crates/host_env/src/fileutils.rs | 14 +- crates/host_env/src/fs.rs | 10 +- crates/host_env/src/grp.rs | 2 + crates/host_env/src/lib.rs | 5 + crates/host_env/src/locale.rs | 17 + crates/host_env/src/mmap.rs | 1 - crates/host_env/src/multiprocessing.rs | 2 +- crates/host_env/src/posix.rs | 2 + crates/{vm => host_env}/src/readline.rs | 30 +- crates/host_env/src/resource.rs | 34 ++ crates/host_env/src/select.rs | 10 + crates/host_env/src/shm.rs | 2 + crates/host_env/src/socket.rs | 37 ++ crates/host_env/src/syslog.rs | 10 + crates/host_env/src/termios.rs | 50 +++ crates/stdlib/Cargo.toml | 7 - crates/stdlib/src/faulthandler.rs | 15 +- crates/stdlib/src/fcntl.rs | 18 +- crates/stdlib/src/grp.rs | 2 +- crates/stdlib/src/locale.rs | 12 +- crates/stdlib/src/multiprocessing.rs | 6 +- crates/stdlib/src/openssl.rs | 268 +++++++------ crates/stdlib/src/openssl/cert.rs | 2 +- crates/stdlib/src/posixshmem.rs | 8 +- crates/stdlib/src/posixsubprocess.rs | 12 +- crates/stdlib/src/resource.rs | 63 +-- crates/stdlib/src/scproxy.rs | 4 +- crates/stdlib/src/select.rs | 15 +- crates/stdlib/src/socket.rs | 90 +++-- crates/stdlib/src/syslog.rs | 4 +- crates/stdlib/src/termios.rs | 86 ++-- crates/stdlib/src/uuid.rs | 9 +- crates/vm/Cargo.toml | 2 - crates/vm/src/getpath.rs | 2 +- crates/vm/src/lib.rs | 2 +- 39 files changed, 858 insertions(+), 541 deletions(-) rename crates/{vm => host_env}/src/readline.rs (86%) diff --git a/Cargo.lock b/Cargo.lock index 17f4ddb81..5eb95bea2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -15,16 +15,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" [[package]] -name = "aes" -version = "0.9.0" +name = "aead" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66bd29a732b644c0431c6140f370d097879203d79b80c94a6747ba0872adaef8" +checksum = "1973cfbc1a2daf9cf550e74e1f088c28e7f7d8c1e1418fb6c9dc5184b7e84c99" +dependencies = [ + "crypto-common 0.2.2", + "inout", +] + +[[package]] +name = "aes" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1fc76eaeac4c9164506c466d4ffdd8ec9d0c5bf57ee97177c4d8eceb3a0e138" dependencies = [ "cipher", "cpubits", "cpufeatures 0.3.0", ] +[[package]] +name = "aes-gcm" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdf011db2e21ce0d575593d749db5554b47fed37aff429e4dc50bc91ac93a028" +dependencies = [ + "aead", + "aes", + "cipher", + "ctr", + "ghash", + "subtle", +] + [[package]] name = "aho-corasick" version = "1.1.4" @@ -116,9 +140,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.102" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" +checksum = "2a4385e2e34eb35d6b3efe798b9eb88096925d87726c0798709bf56d9ed84af3" [[package]] name = "approx" @@ -131,9 +155,9 @@ dependencies = [ [[package]] name = "ar_archive_writer" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb93bbb63b9c227414f6eb3a0adfddca591a8ce1e9b60661bb08969b87e340b" +checksum = "4087686b4b0a3427190bae57a1d9a478dbb2d40c5dc1bd6e2b6d797913bdd348" dependencies = [ "object", ] @@ -152,9 +176,9 @@ checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16" [[package]] name = "asn1-rs" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56624a96882bb8c26d61312ae18cb45868e5a9992ea73c58e45c3101e56a1e60" +checksum = "b7f43a50ac4fdca5df8e885c21b835997f0a1cdee65494a6847694a98652d9d8" dependencies = [ "asn1-rs-derive", "asn1-rs-impl", @@ -230,29 +254,30 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" +checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53" [[package]] name = "aws-lc-fips-sys" -version = "0.13.14" +version = "0.13.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3d619165468401dec3caa3366ebffbcb83f2f31883e5b3932f8e2dec2ddc568" +checksum = "6c0e6249c249b8916c98ebae7bc06216c8dcab3002f32872b4abe642d17063b1" dependencies = [ "bindgen 0.72.1", "cc", "cmake", "dunce", "fs_extra", + "pkg-config", "regex", ] [[package]] name = "aws-lc-rs" -version = "1.16.3" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ec6fb3fe69024a75fa7e1bfb48aa6cf59706a101658ea01bfd33b2b248a038f" +checksum = "4342d8937fc7e5dd9b1c60292261c0670c882a2cd1719cfc11b1af41731e32ad" dependencies = [ "aws-lc-fips-sys", "aws-lc-sys", @@ -261,14 +286,15 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.40.0" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f50037ee5e1e41e7b8f9d161680a725bd1626cb6f8c7e901f91f942850852fe7" +checksum = "6d9ceb1da931507a12f4fccea479dccd00da1943e1b4ae72d8e502d707361444" dependencies = [ "cc", "cmake", "dunce", "fs_extra", + "pkg-config", ] [[package]] @@ -299,7 +325,7 @@ dependencies = [ "quote", "regex", "rustc-hash", - "shlex", + "shlex 1.3.0", "syn", ] @@ -319,7 +345,7 @@ dependencies = [ "quote", "regex", "rustc-hash", - "shlex", + "shlex 1.3.0", "syn", ] @@ -367,9 +393,9 @@ dependencies = [ [[package]] name = "block-buffer" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdd35008169921d80bc60d3d0ab416eecb028c4cd653352907921d95084790be" +checksum = "d2f6c7dbe95a6ed67ad9f18e57daf93a2f034c524b99fd2b76d18fdfeb6660aa" dependencies = [ "hybrid-array", ] @@ -385,20 +411,20 @@ dependencies = [ [[package]] name = "bstr" -version = "1.12.1" +version = "1.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab" +checksum = "5cee35f73844aa3014bb606320a6c1f010249dbdf43342fe54b5a4f6a8ed4b79" dependencies = [ "memchr", "regex-automata", - "serde", + "serde_core", ] [[package]] name = "bumpalo" -version = "3.20.2" +version = "3.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb" +checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649" dependencies = [ "allocator-api2", ] @@ -411,9 +437,9 @@ checksum = "c8efb64bd706a16a1bdde310ae86b351e4d21550d98d056f22f8a7f7a2183fec" [[package]] name = "bytes" -version = "1.11.1" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33" +checksum = "8ae3f5d315924270530207e2a68396c3cc547f6dca3fbdca317cfb1a51edb593" [[package]] name = "bzip2" @@ -450,14 +476,14 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.61" +version = "1.2.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16d90359e986641506914ba71350897565610e87ce0ad9e6f28569db3dd5c6d" +checksum = "f5d6cac793997bd970000024b2934968efe83b382de4fdcf4fcb46b6ee4ad996" dependencies = [ "find-msvc-tools", "jobserver", "libc", - "shlex", + "shlex 2.0.1", ] [[package]] @@ -483,9 +509,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chacha20" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601" +checksum = "d524456ba66e72eb8b115ff89e01e497f8e6d11d78b70b1aa13c0fbd97540a81" dependencies = [ "cfg-if", "cpufeatures 0.3.0", @@ -538,7 +564,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8cf2a2c93cd704877c0858356ed03480ff301ee950b43f1cbe4573b088bfa6c" dependencies = [ - "block-buffer 0.12.0", + "block-buffer 0.12.1", "crypto-common 0.2.2", "inout", ] @@ -627,9 +653,9 @@ dependencies = [ [[package]] name = "compact_str" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb1325a1cece981e8a296ab8f0f9b63ae357bd0784a9faaf548cc7b480707a" +checksum = "9dfdd1c2274d9aa354115b09dc9a901d6c5576818cdf70d14cae2bdb47df00ab" dependencies = [ "castaway", "cfg-if", @@ -641,9 +667,9 @@ dependencies = [ [[package]] name = "console" -version = "0.16.3" +version = "0.16.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d64e8af5551369d19cf50138de61f1c42074ab970f74e99be916646777f8fc87" +checksum = "4fe5f465a4f6fee88fad41b85d990f84c835335e85b5d9e6e63e0d06d28cba7c" dependencies = [ "encode_unicode", "libc", @@ -730,9 +756,9 @@ dependencies = [ [[package]] name = "cranelift" -version = "0.132.1" +version = "0.132.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5c702984722ad27d12c532df8467890f922bf5b1932286906dd2bb6779982c" +checksum = "69c8702ad42c0aac8d585f1c3ffe8039bcd996898615c8948a1943e0c9661232" dependencies = [ "cranelift-codegen", "cranelift-frontend", @@ -741,27 +767,27 @@ dependencies = [ [[package]] name = "cranelift-assembler-x64" -version = "0.132.1" +version = "0.132.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c4ebb31662e2051dcc49b7342d222405a99e951720756cc4b93315972abd67" +checksum = "3d521bdbc6098937af83ef4ab6d5c07398126bc71878f7ef4ea9499977978ef5" dependencies = [ "cranelift-assembler-x64-meta", ] [[package]] name = "cranelift-assembler-x64-meta" -version = "0.132.1" +version = "0.132.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "106dfc2ec96ec1c3a8a250602e936712e00a381df032f7a8ad175c8f768c03bb" +checksum = "3dde0b83164d4a497860af4236271178bc640512b067101e0853e4f74eaa4df5" dependencies = [ "cranelift-srcgen", ] [[package]] name = "cranelift-bforest" -version = "0.132.1" +version = "0.132.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5694aa8a2eb2571a15b3feee38d16ccaf2712200e7b5c9ae0479069bdfb46949" +checksum = "0111d110b72b4efad69a372e29e21628652fd0bcab66967e5c8350ab679affd5" dependencies = [ "cranelift-entity", "wasmtime-internal-core", @@ -769,18 +795,18 @@ dependencies = [ [[package]] name = "cranelift-bitset" -version = "0.132.1" +version = "0.132.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ab349d30a5fad9699440ee7ccb435374e8a8735dcca26696a4245bcefcc47e" +checksum = "cf01ecc92fc5499789d79c3b817299d5a8ddd828d31dcf0f9cc3cc66f38dbb36" dependencies = [ "wasmtime-internal-core", ] [[package]] name = "cranelift-codegen" -version = "0.132.1" +version = "0.132.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e95970bdb51d145c828a114a1084cb8b63e65569a51600ad398cb49fa78b062" +checksum = "6cd2563bead0090c3879a7ff7327f7550c9d59bb5d05ecc8cd7886977aa3125a" dependencies = [ "bumpalo", "cranelift-assembler-x64", @@ -792,7 +818,7 @@ dependencies = [ "cranelift-entity", "cranelift-isle", "gimli", - "hashbrown 0.17.0", + "hashbrown 0.17.1", "libm", "log", "regalloc2", @@ -805,9 +831,9 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.132.1" +version = "0.132.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e8414b8ecc81f89f8a3f2c5cbc785b9ed690200cd6f9d780e96a92f88879704" +checksum = "9640d250d26f9381a73dc7f9862b27928d4809119aec73be0e556612e67b6a99" dependencies = [ "cranelift-assembler-x64-meta", "cranelift-codegen-shared", @@ -817,24 +843,24 @@ dependencies = [ [[package]] name = "cranelift-codegen-shared" -version = "0.132.1" +version = "0.132.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "631c4e5db42e6a0f9e7a68f18f7faba3692862114870c7c598aee7e0e5677e59" +checksum = "a07f156b90efc94371ddb3536f76e4ab671ad2e093bfa5511e10198cadbb0c47" [[package]] name = "cranelift-control" -version = "0.132.1" +version = "0.132.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09c6e92c825abfbb739a4beaa5db3988f98a96a68d6ea656f562098efc142976" +checksum = "d75a76fd9dd37dcbc3d2d2e00abe3281a7e88adc035fba3b8114cc69981576ec" dependencies = [ "arbitrary", ] [[package]] name = "cranelift-entity" -version = "0.132.1" +version = "0.132.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55e57cd185782abada9ab2606bfe88d0abc0d42d83a7d432dcf69991e17fe76e" +checksum = "2eea22522144ba08c7e7ef94bfc25d474ef016c2771974b8ab1986734ac85965" dependencies = [ "cranelift-bitset", "wasmtime-internal-core", @@ -842,9 +868,9 @@ dependencies = [ [[package]] name = "cranelift-frontend" -version = "0.132.1" +version = "0.132.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0f17e48d15e29552e2f264d302c31a661a830196d879bbdaf4d7b2bf2f7011" +checksum = "efa2826c80dff1d93b19b3cfbcaf9fae44c78d739a98d146dd5bd89c51e14367" dependencies = [ "cranelift-codegen", "log", @@ -854,15 +880,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.132.1" +version = "0.132.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "407b80b46934c9dce9a6581f0e80d079b7a69e11372fb03d7dce4c7ba3fee4e3" +checksum = "e238a69b95c5415456f22189494a12db94f313bb72b6ec9cc88ddf2f1056e28e" [[package]] name = "cranelift-jit" -version = "0.132.1" +version = "0.132.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea72887b62db0e7c387f8c0b7af600772fd9190c6f7205fd2182b0ce10159c80" +checksum = "a7def01f2b14f97421558d1db33e396b97b97ab2ed40dedc8165ba00d13088e6" dependencies = [ "anyhow", "cranelift-codegen", @@ -881,9 +907,9 @@ dependencies = [ [[package]] name = "cranelift-module" -version = "0.132.1" +version = "0.132.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bd3b5369ba0f409b9b218e2356a71285c6e2815e187329a59db09228fd927c4" +checksum = "985df7eceefc91cb75bf7f51b32b7f1739d0fc0e25ddf023b1de407cb3c93d77" dependencies = [ "anyhow", "cranelift-codegen", @@ -892,9 +918,9 @@ dependencies = [ [[package]] name = "cranelift-native" -version = "0.132.1" +version = "0.132.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a40e056e421d9a6c757983f2184f765ae1c28a51555d3877e98afc97ce5705b" +checksum = "eceb0ebd8d6aef6bb287e8d532a164b0db1c0062961211e9c22a91f67521c098" dependencies = [ "cranelift-codegen", "libc", @@ -903,9 +929,9 @@ dependencies = [ [[package]] name = "cranelift-srcgen" -version = "0.132.1" +version = "0.132.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cdbadda21e49798825a1ec795dab30bcb03235891f662b5ccf23fa45b39682f" +checksum = "004643f39a7bec553de5263d650db30e5b9caec1d5cbe065fd732b7ec9ae40d0" [[package]] name = "crc32fast" @@ -953,9 +979,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" +checksum = "5181e0de7b61eb03a81e347d6dd8797bae9da5146707b51077e2d71a54ec0ceb" dependencies = [ "crossbeam-epoch", "crossbeam-utils", @@ -963,18 +989,18 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.18" +version = "0.9.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +checksum = "2d6914041f254d6e9176c01941b21115dcfb7089e55135a35411081bd106ef3f" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.21" +version = "0.8.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" +checksum = "61803da095bee82a81bb1a452ecc25d3b2f1416d1897eb86430c6159ef717c17" [[package]] name = "crunchy" @@ -1010,6 +1036,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "ctr" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baaca1c4b237092596f64d571e9db6ce4109c4ef9742e27590f1709594461f21" +dependencies = [ + "cipher", +] + [[package]] name = "ctutils" version = "0.4.2" @@ -1025,6 +1060,37 @@ version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4ae5f15dda3c708c0ade84bfee31ccab44a3da4f88015ed22f63732abe300c8" +[[package]] +name = "defmt" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2953bfe4f93bbd20cc71198842756f77d161884c99ebbabc41d80231ded88d1" +dependencies = [ + "bitflags 1.3.2", + "defmt-macros", +] + +[[package]] +name = "defmt-macros" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bad9c72e7ca2137e0dc3813245a0d282fd6daad32fd800af018306a9169b5fe8" +dependencies = [ + "defmt-parser", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "defmt-parser" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10d60334b3b2e7c9d91ef8150abfb6fa4c1c39ebbcf4a81c2e346aad939fee3e" +dependencies = [ + "thiserror", +] + [[package]] name = "der" version = "0.7.10" @@ -1079,9 +1145,6 @@ name = "deranged" version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c" -dependencies = [ - "powerfmt", -] [[package]] name = "derive-where" @@ -1110,7 +1173,7 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2" dependencies = [ - "block-buffer 0.12.0", + "block-buffer 0.12.1", "const-oid 0.10.2", "crypto-common 0.2.2", "ctutils", @@ -1139,9 +1202,9 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +checksum = "1ac70aa55017e108007fbaf5aa0f54b021c98f92ff8af59d42eda9da96e3dd4f" dependencies = [ "proc-macro2", "quote", @@ -1174,9 +1237,9 @@ checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" [[package]] name = "either" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" +checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e" [[package]] name = "encode_unicode" @@ -1192,9 +1255,9 @@ checksum = "869b0adbda23651a9c5c0c3d270aac9fcb52e8622a8f2b17e57802d7791962f2" [[package]] name = "env_filter" -version = "1.0.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32e90c2accc4b07a8456ea0debdc2e7587bdd890680d71173a15d4ae604f6eef" +checksum = "900d271a03799a1ee8d1ca9b19893b48ca674a9284fefcfb85f05e74ed314217" dependencies = [ "log", "regex", @@ -1202,9 +1265,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.10" +version = "0.11.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0621c04f2196ac3f488dd583365b9c09be011a4ab8b9f37248ffcc8f6198b56a" +checksum = "de671bd27a75a797dc9ae289ba1e77276e75e2026408aab65185384e2d5cd3f6" dependencies = [ "anstream", "anstyle", @@ -1452,6 +1515,15 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "ghash" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eecf2d5dc9b66b732b97707a0210906b1d30523eb773193ab777c0c84b3e8d5" +dependencies = [ + "polyval", +] + [[package]] name = "gimli" version = "0.33.0" @@ -1502,9 +1574,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.17.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51" +checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" dependencies = [ "foldhash", ] @@ -1553,9 +1625,9 @@ dependencies = [ [[package]] name = "hybrid-array" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9155a582abd142abc056962c29e3ce5ff2ad5469f4246b537ed42c5deba857da" +checksum = "818356c5132c1fede50f837ca96afbe78ff42413047f4abb886217845e1b6c8c" dependencies = [ "typenum", ] @@ -1723,7 +1795,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9" dependencies = [ "equivalent", - "hashbrown 0.17.0", + "hashbrown 0.17.1", ] [[package]] @@ -1807,10 +1879,11 @@ checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" [[package]] name = "jiff" -version = "0.2.24" +version = "0.2.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f00b5dbd620d61dfdcb6007c9c1f6054ebd75319f163d886a9055cec1155073d" +checksum = "ccfe6121cbe750cf81efa362d85c0bde7ea298ec43092d3a193baca59cdbd634" dependencies = [ + "defmt", "jiff-static", "log", "portable-atomic", @@ -1820,9 +1893,9 @@ dependencies = [ [[package]] name = "jiff-static" -version = "0.2.24" +version = "0.2.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e000de030ff8022ea1da3f466fbb0f3a809f5e51ed31f6dd931c35181ad8e6d7" +checksum = "e165e897f662d428f3cd3828a919dbe067c2d42bb1031eede74ef9d27ecdedd2" dependencies = [ "proc-macro2", "quote", @@ -1880,23 +1953,22 @@ dependencies = [ [[package]] name = "jobserver" -version = "0.1.34" +version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" +checksum = "1c00acbd29eabad4a2392fa0e921c874934dbbf4194312ad20f04a0ed67a3cb3" dependencies = [ - "getrandom 0.3.4", + "getrandom 0.4.3", "libc", ] [[package]] name = "js-sys" -version = "0.3.97" +version = "0.3.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1840c94c045fbcf8ba2812c95db44499f7c64910a912551aaaa541decebcacf" +checksum = "53b44bfcdb3f8d5837a46dae1ca9660a837176eee74a28b229bc626816589102" dependencies = [ "cfg-if", "futures-util", - "once_cell", "wasm-bindgen", ] @@ -1965,9 +2037,9 @@ checksum = "803ec87c9cfb29b9d2633f20cba1f488db3fd53f2158b1024cbefb47ba05d413" [[package]] name = "libbz2-rs-sys" -version = "0.2.3" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3a6a8c165077efc8f3a971534c50ea6a1a18b329ef4a66e897a7e3a1494565f" +checksum = "34b357333733e8260735ba5894eb928c02ecc69c78715f01a8019e7fa7f2db4c" [[package]] name = "libc" @@ -2022,9 +2094,9 @@ checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" [[package]] name = "libredox" -version = "0.1.16" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e02f3bb43d335493c96bf3fd3a321600bf6bd07ed34bc64118e9293bdffea46c" +checksum = "c943259e342f1e06ff2da7a83eabdfe7f92ce10262688dbf1895ff0b3e6e4652" dependencies = [ "libc", ] @@ -2072,9 +2144,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.32" +version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953f07c43838f8e6f9758cab68bf5bed85465e7587ebe0b823f1bcd81978ad3a" +checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad" [[package]] name = "lz4_flex" @@ -2203,9 +2275,9 @@ dependencies = [ [[package]] name = "memmap2" -version = "0.9.10" +version = "0.9.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "714098028fe011992e1c3962653c96b2d578c4b4bce9036e15ff220319b1e0e3" +checksum = "d1219ed1b7f229ee7104d281dd01d6802fe28bb6e95d292942c4daacdeb798c0" dependencies = [ "libc", ] @@ -2291,9 +2363,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.6" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +checksum = "c89e69e7e0f03bea5ef08013795c25018e101932225a656383bd384495ecc367" dependencies = [ "num-integer", "num-traits", @@ -2310,9 +2382,9 @@ dependencies = [ [[package]] name = "num-conv" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6673768db2d862beb9b39a78fdcb1a69439615d5794a1be50caa9bc92c81967" +checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441" [[package]] name = "num-integer" @@ -2432,9 +2504,9 @@ checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" [[package]] name = "openssl-src" -version = "300.6.0+3.6.2" +version = "300.6.1+3.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8e8cbfd3a4a8c8f089147fd7aaa33cf8c7450c4d09f8f80698a0cf093abeff4" +checksum = "46eb8fb9fb3b61ce1c0f8a026c4c1a0714d3a9e138e7fbde78753ce2babc3846" dependencies = [ "cc", ] @@ -2496,7 +2568,7 @@ dependencies = [ [[package]] name = "parking_lot_core" version = "0.9.12" -source = "git+https://github.com/youknowone/parking_lot?branch=rustpython#4392edbe879acc9c0dd94eda53d2205d3ab912c9" +source = "git+https://github.com/youknowone/parking_lot?branch=rustpython#f4ee53a7b803354a8f0a6de2f28e93fc141240bf" dependencies = [ "cfg-if", "libc", @@ -2628,11 +2700,12 @@ checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" [[package]] name = "pkcs5" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279a91971a1d8eb1260a30938eae3be9cb67b472dffecb222fbbbe2fd2dc1453" +checksum = "63d440a804ec8d6fafbb6b84471e013286658d373248927692ab3366686220ca" dependencies = [ "aes", + "aes-gcm", "cbc", "der 0.8.0", "pbkdf2", @@ -2699,6 +2772,17 @@ dependencies = [ "syn", ] +[[package]] +name = "polyval" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dfc63250416fea14f5749b90725916a6c903f599d51cb635aa7a52bfd03eede" +dependencies = [ + "cpubits", + "cpufeatures 0.3.0", + "universal-hash", +] + [[package]] name = "portable-atomic" version = "1.13.1" @@ -2853,9 +2937,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.45" +version = "1.0.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924" +checksum = "dfbc457d0c7a0759a614551b11a6409e5951f6c7537be1f1b7682b9ae9230368" dependencies = [ "proc-macro2", ] @@ -2962,9 +3046,9 @@ checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69" [[package]] name = "rapidhash" -version = "4.4.1" +version = "4.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e48930979c155e2f33aa36ab3119b5ee81332beb6482199a8ecd6029b80b59" +checksum = "5da7e78a036ce858e8d55b7e7dc8ba3a88b78350fd2155d3591bbd966b58589e" dependencies = [ "rustversion", ] @@ -3043,7 +3127,7 @@ checksum = "de2c52737737f8609e94f975dee22854a2d5c125772d4b1cf292120f4d45c186" dependencies = [ "allocator-api2", "bumpalo", - "hashbrown 0.17.0", + "hashbrown 0.17.1", "log", "rustc-hash", "smallvec", @@ -3051,9 +3135,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.12.3" +version = "1.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276" +checksum = "f1292b7759ae1cb9ec195452d1390a074f0cd8541ab7a5a8c31cd6db45d4a6ba" dependencies = [ "aho-corasick", "memchr", @@ -3074,9 +3158,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" +checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4" [[package]] name = "region" @@ -3127,9 +3211,9 @@ dependencies = [ [[package]] name = "rustc-hash" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe" +checksum = "6b1e7f9a428571be2dc5bc0505c13fb6bf936822b894ec87abf8a08a4e51742d" [[package]] name = "rustc_version" @@ -3164,9 +3248,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.40" +version = "0.23.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef86cd5876211988985292b91c96a8f2d298df24e75989a43a3c73f2d4d8168b" +checksum = "6b92b125634d9b795e7beca796cc790df15a7fb38323bf3196fda83292d06b1f" dependencies = [ "aws-lc-rs", "once_cell", @@ -3209,9 +3293,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.14.1" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a7197ae7eb376e574fe940d068c30fe0462554a3ddbe4eca7838e049c937a9" +checksum = "764899a24af3980067ee14bc143654f297b22eaebfe3c7b6b211920a5a59b046" dependencies = [ "zeroize", ] @@ -3412,12 +3496,15 @@ name = "rustpython-host_env" version = "0.5.0" dependencies = [ "bitflags 2.13.0", + "dns-lookup", + "gethostname", "getrandom 0.4.3", "junction", "libc", "libffi", "libloading 0.9.0", - "memmap2 0.9.10", + "mac_address", + "memmap2 0.9.11", "nix 0.31.3", "num-traits", "num_cpus", @@ -3425,8 +3512,12 @@ dependencies = [ "paste", "rustix", "rustpython-wtf8", + "rustyline", "schannel", + "socket2", + "system-configuration", "termios", + "which", "widestring", "windows-sys 0.61.2", ] @@ -3563,12 +3654,10 @@ dependencies = [ "csv-core", "der 0.8.0", "digest 0.11.3", - "dns-lookup", "dyn-clone", "flame", "flate2", "foreign-types-shared", - "gethostname", "hex", "hmac", "indexmap", @@ -3577,7 +3666,6 @@ dependencies = [ "libc", "libsqlite3-sys", "libz-rs-sys", - "mac_address", "malachite-bigint", "md-5", "memchr", @@ -3616,8 +3704,6 @@ dependencies = [ "sha2", "sha3", "shake", - "socket2", - "system-configuration", "tcl-sys", "tk-sys", "uuid", @@ -3695,7 +3781,6 @@ dependencies = [ "rustpython-ruff_text_size", "rustpython-sre_engine", "rustpython-unicode", - "rustyline", "scopeguard", "serde_core", "static_assertions", @@ -3705,7 +3790,6 @@ dependencies = [ "thiserror", "timsort", "wasm-bindgen", - "which", "widestring", "writeable", ] @@ -3740,9 +3824,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" +checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f" [[package]] name = "rustyline" @@ -3898,9 +3982,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.149" +version = "1.0.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" +checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9" dependencies = [ "itoa", "memchr", @@ -3987,6 +4071,12 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" +[[package]] +name = "shlex" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba" + [[package]] name = "signature" version = "2.2.0" @@ -4038,9 +4128,9 @@ checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" [[package]] name = "smallvec" -version = "1.15.1" +version = "1.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" +checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90" [[package]] name = "socket2" @@ -4116,9 +4206,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.117" +version = "2.0.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99" +checksum = "1b9ae57f904213ebb649ce6895b8a66c66f0203b9319718f69a5612a065b1422" dependencies = [ "proc-macro2", "quote", @@ -4250,12 +4340,11 @@ dependencies = [ [[package]] name = "time" -version = "0.3.47" +version = "0.3.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c" +checksum = "18dfaaeddcb932337b5e7866ee7d0ce9b76d2fd092997146f187ec09b4558a50" dependencies = [ "deranged", - "itoa", "num-conv", "powerfmt", "serde_core", @@ -4265,15 +4354,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca" +checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109" [[package]] name = "time-macros" -version = "0.2.27" +version = "0.2.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215" +checksum = "c431b87111666e491a90baa837f914fb45cd5dc3c268591b0220ff5057f2085f" dependencies = [ "num-conv", "time-core", @@ -4398,9 +4487,9 @@ checksum = "9ea3136b675547379c4bd395ca6b938e5ad3c3d20fad76e7fe85f9e0d011419c" [[package]] name = "typenum" -version = "1.20.0" +version = "1.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ce102ab67701b8526c123c1bab5cbe42d7040ccfd0f64af1a385808d2f43de" +checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20" [[package]] name = "unicode-ident" @@ -4419,9 +4508,9 @@ dependencies = [ [[package]] name = "unicode-segmentation" -version = "1.13.2" +version = "1.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9629274872b2bfaf8d66f5f15725007f635594914870f65218920345aa11aa8c" +checksum = "c6f5d3c3b1bf09027a88a6bc961fc00497d651009560b5463668dc81b0fa87a8" [[package]] name = "unicode-width" @@ -4471,6 +4560,16 @@ dependencies = [ "rand 0.8.6", ] +[[package]] +name = "universal-hash" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4987bdc12753382e0bec4a65c50738ffaabc998b9cdd1f952fb5f39b0048a96" +dependencies = [ + "crypto-common 0.2.2", + "ctutils", +] + [[package]] name = "untrusted" version = "0.9.0" @@ -4497,9 +4596,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.23.3" +version = "1.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "144d6b123cef80b301b8f72a9e2ca4370ddec21950d0a103dd22c437006d2db7" +checksum = "bf80a72845275afea99e7f2b434723d3bc7e38470fcd1c7ed39a599c73319a53" dependencies = [ "atomic", "js-sys", @@ -4536,18 +4635,18 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasip2" -version = "1.0.3+wasi-0.2.9" +version = "1.0.4+wasi-0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6" +checksum = "b67efb37e106e55ce722a510d6b5f9c17f083e5fc79afc2badeb12cc313d9487" dependencies = [ "wit-bindgen", ] [[package]] name = "wasm-bindgen" -version = "0.2.120" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df52b6d9b87e0c74c9edfa1eb2d9bf85e5d63515474513aa50fa181b3c4f5db1" +checksum = "4b067c0c11094aef6b7a801c1e34a26affafdf3d051dba08456b868789aaf9a4" dependencies = [ "cfg-if", "once_cell", @@ -4558,9 +4657,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.70" +version = "0.4.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af934872acec734c2d80e6617bbb5ff4f12b052dd8e6332b0817bce889516084" +checksum = "c62df1340f32221cb9c54d6a27b030e3dba64361d4a95bed55f9aacb44da291d" dependencies = [ "js-sys", "wasm-bindgen", @@ -4568,9 +4667,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.120" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b1041f495fb322e64aca85f5756b2172e35cd459376e67f2a6c9dffcedb103" +checksum = "167ce5e579f6bcf889c4f7175a8a5a585de84e8ff93976ce393efa5f2837aab1" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4578,9 +4677,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.120" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dcd0ff20416988a18ac686d4d4d0f6aae9ebf08a389ff5d29012b05af2a1b41" +checksum = "f3997c7839262f4ef12cf90b818d6340c18e80f263f1a94bf157d0ec4420380e" dependencies = [ "bumpalo", "proc-macro2", @@ -4591,28 +4690,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.120" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49757b3c82ebf16c57d69365a142940b384176c24df52a087fb748e2085359ea" +checksum = "dc1b4cb0cc549fcf58d7dfc081778139b3d283a081644e833e84682ad71cea24" dependencies = [ "unicode-ident", ] [[package]] name = "wasmtime-internal-core" -version = "45.0.1" +version = "45.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "110bf85122cd451d3b9ff67f8911d428ec9b729208abe950a0333c3244660e88" +checksum = "3073c03f97f871fe6400e68621c863b93ba79296f8e570285231952d23fcc804" dependencies = [ - "hashbrown 0.17.0", + "hashbrown 0.17.1", "libm", ] [[package]] name = "wasmtime-internal-jit-icache-coherence" -version = "45.0.1" +version = "45.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa6818a4864719772680694f4e4649a8600bb5efcf71111ebaf7419b266463e8" +checksum = "37dee05e8c35759826f6b926cd949c51f771b6a58619d8e60c63c3f3d3e5e59b" dependencies = [ "cfg-if", "libc", @@ -4622,9 +4721,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.97" +version = "0.3.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eadbac71025cd7b0834f20d1fe8472e8495821b4e9801eb0a60bd1f19827602" +checksum = "8622dcb61c0bcc9fffa6938bed81210af2da9a7e4a1a834b2e37a59b6dfb6141" dependencies = [ "js-sys", "wasm-bindgen", @@ -4632,9 +4731,9 @@ dependencies = [ [[package]] name = "webpki-root-certs" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31141ce3fc3e300ae89b78c0dd67f9708061d1d2eda54b8209346fd6be9a92c" +checksum = "0d46a5a140e6f7afeccd8eae97eff335163939eac8b929834875168b29b3d267" dependencies = [ "rustls-pki-types", ] @@ -4659,9 +4758,9 @@ dependencies = [ [[package]] name = "wide" -version = "1.3.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9479f84a757f819cfab37295955906479181395de83add28f74975fde083141" +checksum = "dfdfe6a32973f2d1b268b8895845a8a96cac2f0191e72c27cc929036060dbf89" dependencies = [ "bytemuck", "safe_arch", @@ -4921,9 +5020,9 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" [[package]] name = "winnow" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ee1708bef14716a11bae175f579062d4554d95be2c6829f518df847b7b3fdd0" +checksum = "0592e1c9d151f854e6fd382574c3a0855250e1d9b2f99d9281c6e6391af352f1" [[package]] name = "winresource" @@ -5022,9 +5121,9 @@ dependencies = [ [[package]] name = "yoke" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca" +checksum = "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5" dependencies = [ "stable_deref_trait", "yoke-derive", @@ -5045,18 +5144,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.48" +version = "0.8.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9" +checksum = "75726053136156d419e285b9b7eddaaea9e3fea6ce32eed44a89901f0bd98de1" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.48" +version = "0.8.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4" +checksum = "4714fd92cf900833d49538023a9b3915155210801d1c1169eba513b2addefd71" dependencies = [ "proc-macro2", "quote", @@ -5065,9 +5164,9 @@ dependencies = [ [[package]] name = "zerofrom" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69faa1f2a1ea75661980b013019ed6687ed0e83d069bc1114e2cc74c6c04c4df" +checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272" dependencies = [ "zerofrom-derive", ] @@ -5086,18 +5185,18 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.8.2" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" +checksum = "e13c156562582aa81c60cb29407084cdb54c4164760106ab78e6c5b0858cf64e" dependencies = [ "zeroize_derive", ] [[package]] name = "zeroize_derive" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85a5b4158499876c763cb03bc4e49185d3cccbabb15b33c627f7884f43db852e" +checksum = "3c50655cbb0fe3fc43170059e702f1ce5e19b84cec58dc87b037a09935c2f328" dependencies = [ "proc-macro2", "quote", diff --git a/crates/host_env/Cargo.toml b/crates/host_env/Cargo.toml index 91a56ea91..3beda890b 100644 --- a/crates/host_env/Cargo.toml +++ b/crates/host_env/Cargo.toml @@ -27,6 +27,16 @@ rustix = { workspace = true } [target.'cfg(any(not(target_arch = "wasm32"), target_os = "wasi"))'.dependencies] num_cpus = "1.17.0" +[target.'cfg(not(any(target_os = "ios", target_os = "android", target_os = "windows", target_arch = "wasm32", target_os = "redox")))'.dependencies] +mac_address = { workspace = true } + +[target.'cfg(not(target_arch = "wasm32"))'.dependencies] +dns-lookup = { workspace = true } +gethostname = { workspace = true } +rustyline = { workspace = true } +socket2 = { workspace = true, features = ["all"] } +which = { workspace = true } + [target.'cfg(all(unix, not(target_os = "ios"), not(target_os = "redox")))'.dependencies] termios = { workspace = true } @@ -37,6 +47,9 @@ libloading = "0.9" [target.'cfg(all(any(target_os = "linux", target_os = "macos", target_os = "windows", target_os = "android"), not(any(target_env = "musl", target_env = "sgx"))))'.dependencies] libffi = { workspace = true, features = ["system"] } +[target.'cfg(target_os = "macos")'.dependencies] +system-configuration = { workspace = true } + [target.'cfg(windows)'.dependencies] junction = { workspace = true } schannel = { workspace = true } diff --git a/crates/host_env/src/faulthandler.rs b/crates/host_env/src/faulthandler.rs index 3afbdebb4..5b1935916 100644 --- a/crates/host_env/src/faulthandler.rs +++ b/crates/host_env/src/faulthandler.rs @@ -12,6 +12,10 @@ use alloc::vec::Vec; #[cfg(unix)] use parking_lot::Mutex; + +#[cfg(unix)] +pub use libc::{SA_NODEFER, c_int}; +pub use libc::{SIGFPE, SIGSEGV}; #[cfg(windows)] use windows_sys::Win32::System::{ Diagnostics::Debug::{ diff --git a/crates/host_env/src/fcntl.rs b/crates/host_env/src/fcntl.rs index 2467a8727..6fb974ba5 100644 --- a/crates/host_env/src/fcntl.rs +++ b/crates/host_env/src/fcntl.rs @@ -5,6 +5,32 @@ use std::os::fd::BorrowedFd; use crate::os::CheckLibcResult; +pub use libc::{F_GETFD, F_GETFL, F_SETFD, F_SETFL, FD_CLOEXEC}; + +#[cfg(not(target_os = "wasi"))] +pub use libc::{F_DUPFD, F_DUPFD_CLOEXEC, F_GETLK, F_SETLK, F_SETLKW}; + +#[cfg(not(any(target_os = "wasi", target_os = "redox")))] +pub use libc::{F_GETOWN, F_RDLCK, F_SETOWN, F_UNLCK, F_WRLCK, LOCK_EX, LOCK_NB, LOCK_SH, LOCK_UN}; + +#[cfg(target_vendor = "apple")] +pub use libc::{F_FULLFSYNC, F_NOCACHE}; + +#[cfg(target_os = "freebsd")] +pub use libc::{F_DUP2FD, F_DUP2FD_CLOEXEC}; + +#[cfg(any(target_os = "android", target_os = "linux"))] +pub use libc::{F_OFD_GETLK, F_OFD_SETLK, F_OFD_SETLKW}; + +#[cfg(any(target_os = "android", target_os = "fuchsia", target_os = "linux"))] +pub use libc::{ + F_ADD_SEALS, F_GET_SEALS, F_GETLEASE, F_GETPIPE_SZ, F_NOTIFY, F_SEAL_GROW, F_SEAL_SEAL, + F_SEAL_SHRINK, F_SEAL_WRITE, F_SETLEASE, F_SETPIPE_SZ, +}; + +#[cfg(any(target_os = "dragonfly", target_os = "netbsd", target_vendor = "apple"))] +pub use libc::F_GETPATH; + pub fn normalize_ioctl_request(request: i64) -> libc::c_ulong { (request as u32) as libc::c_ulong } diff --git a/crates/host_env/src/fileutils.rs b/crates/host_env/src/fileutils.rs index c9e366e3d..5cfe3f1d7 100644 --- a/crates/host_env/src/fileutils.rs +++ b/crates/host_env/src/fileutils.rs @@ -442,10 +442,22 @@ pub mod windows { } } +/// C `FILE *` handle as returned by [`fopen`] and consumed by [`fclose`]. +pub type CFile = libc::FILE; + +/// Close a file opened with [`fopen`]. +/// +/// # Safety +/// `fp` must be a non-null pointer returned by [`fopen`] and must not have been +/// closed already. +pub unsafe fn fclose(fp: *mut CFile) -> core::ffi::c_int { + unsafe { libc::fclose(fp) } +} + // _Py_fopen_obj in cpython (Python/fileutils.c:1757-1835) // Open a file using std::fs::File and convert to FILE* // Automatically handles path encoding and EINTR retries -pub fn fopen(path: &std::path::Path, mode: &str) -> std::io::Result<*mut libc::FILE> { +pub fn fopen(path: &std::path::Path, mode: &str) -> std::io::Result<*mut CFile> { use alloc::ffi::CString; use std::fs::File; diff --git a/crates/host_env/src/fs.rs b/crates/host_env/src/fs.rs index 911bd4575..01040e73e 100644 --- a/crates/host_env/src/fs.rs +++ b/crates/host_env/src/fs.rs @@ -1,7 +1,7 @@ use std::{ fs::{self, File, Metadata, ReadDir}, io, - path::Path, + path::{Path, PathBuf}, }; pub fn open(path: impl AsRef<Path>) -> io::Result<File> { @@ -44,10 +44,16 @@ pub fn open_write(path: impl AsRef<Path>) -> io::Result<File> { fs::OpenOptions::new().write(true).open(path) } -pub fn canonicalize(path: impl AsRef<Path>) -> io::Result<std::path::PathBuf> { +pub fn canonicalize(path: impl AsRef<Path>) -> io::Result<PathBuf> { fs::canonicalize(path) } +/// Resolve `binary_name` to an absolute path by searching `PATH` (and `PATHEXT` on Windows). +#[cfg(not(target_arch = "wasm32"))] +pub fn which<T: AsRef<std::ffi::OsStr>>(binary_name: T) -> Option<PathBuf> { + ::which::which(binary_name).ok() +} + #[cfg(windows)] pub fn open_write_with_custom_flags(path: impl AsRef<Path>, flags: u32) -> io::Result<File> { use std::os::windows::fs::OpenOptionsExt; diff --git a/crates/host_env/src/grp.rs b/crates/host_env/src/grp.rs index 131369ce9..54afe8aa5 100644 --- a/crates/host_env/src/grp.rs +++ b/crates/host_env/src/grp.rs @@ -1,5 +1,7 @@ use std::io; +pub use libc::gid_t; + pub struct Group { pub name: String, pub passwd: String, diff --git a/crates/host_env/src/lib.rs b/crates/host_env/src/lib.rs index 15f816ea8..4d123e7e0 100644 --- a/crates/host_env/src/lib.rs +++ b/crates/host_env/src/lib.rs @@ -30,6 +30,7 @@ pub mod fileutils; pub mod fs; #[cfg(any(unix, windows))] pub mod locale; +pub mod readline; #[cfg(windows)] pub mod windows; @@ -67,6 +68,10 @@ pub mod time; #[cfg(windows)] pub mod cert_store; +#[cfg(target_os = "macos")] +pub mod system_configuration { + pub use ::system_configuration::*; +} #[cfg(any(unix, windows))] pub mod faulthandler; #[cfg(any(unix, windows))] diff --git a/crates/host_env/src/locale.rs b/crates/host_env/src/locale.rs index 52fa79044..636351508 100644 --- a/crates/host_env/src/locale.rs +++ b/crates/host_env/src/locale.rs @@ -1,6 +1,23 @@ use alloc::vec::Vec; use core::{ffi::CStr, ptr}; +pub use libc::{LC_ALL, LC_COLLATE, LC_CTYPE, LC_MONETARY, LC_NUMERIC, LC_TIME}; + +#[cfg(all(unix, not(any(target_os = "ios", target_os = "redox"))))] +pub use libc::LC_MESSAGES; + +#[cfg(all( + unix, + not(any(target_os = "ios", target_os = "android", target_os = "redox")) +))] +pub use libc::{ + ABDAY_1, ABDAY_2, ABDAY_3, ABDAY_4, ABDAY_5, ABDAY_6, ABDAY_7, ABMON_1, ABMON_2, ABMON_3, + ABMON_4, ABMON_5, ABMON_6, ABMON_7, ABMON_8, ABMON_9, ABMON_10, ABMON_11, ABMON_12, ALT_DIGITS, + AM_STR, CODESET, CRNCYSTR, D_FMT, D_T_FMT, DAY_1, DAY_2, DAY_3, DAY_4, DAY_5, DAY_6, DAY_7, + ERA, ERA_D_FMT, ERA_D_T_FMT, ERA_T_FMT, MON_1, MON_2, MON_3, MON_4, MON_5, MON_6, MON_7, MON_8, + MON_9, MON_10, MON_11, MON_12, NOEXPR, PM_STR, RADIXCHAR, T_FMT, T_FMT_AMPM, THOUSEP, YESEXPR, +}; + #[cfg(windows)] #[repr(C)] struct RawLconv { diff --git a/crates/host_env/src/mmap.rs b/crates/host_env/src/mmap.rs index ce5575061..c1071a716 100644 --- a/crates/host_env/src/mmap.rs +++ b/crates/host_env/src/mmap.rs @@ -59,7 +59,6 @@ pub use libc::MAP_STACK; #[cfg(target_os = "freebsd")] pub use libc::{MADV_AUTOSYNC, MADV_CORE, MADV_NOCORE, MADV_NOSYNC, MADV_PROTECT}; -#[cfg(windows)] pub use libc::EOVERFLOW; #[cfg(windows)] diff --git a/crates/host_env/src/multiprocessing.rs b/crates/host_env/src/multiprocessing.rs index 4e79b2573..0030245db 100644 --- a/crates/host_env/src/multiprocessing.rs +++ b/crates/host_env/src/multiprocessing.rs @@ -13,7 +13,7 @@ use alloc::ffi::CString; use std::io; #[cfg(unix)] -use libc::sem_t; +pub use libc::{sem_t, timespec}; #[cfg(unix)] use nix::errno::Errno; diff --git a/crates/host_env/src/posix.rs b/crates/host_env/src/posix.rs index 1239d3526..f15dc576d 100644 --- a/crates/host_env/src/posix.rs +++ b/crates/host_env/src/posix.rs @@ -12,6 +12,8 @@ use std::path::Path; use crate::crt_fd; +pub use libc::{c_char, pid_t}; + pub struct UnameInfo { pub sysname: String, pub nodename: String, diff --git a/crates/vm/src/readline.rs b/crates/host_env/src/readline.rs similarity index 86% rename from crates/vm/src/readline.rs rename to crates/host_env/src/readline.rs index 53475358c..1015ec093 100644 --- a/crates/vm/src/readline.rs +++ b/crates/host_env/src/readline.rs @@ -106,34 +106,18 @@ pub mod rustyline_readline { } pub fn load_history(&mut self, path: &Path) -> OtherResult<()> { - #[cfg(not(feature = "host_env"))] - { - let _ = path; - Err(io::Error::other("history requires the `host_env` feature").into()) - } - #[cfg(feature = "host_env")] - { - self.repl.load_history(path)?; - Ok(()) - } + self.repl.load_history(path)?; + Ok(()) } pub fn save_history(&mut self, path: &Path) -> OtherResult<()> { - #[cfg(not(feature = "host_env"))] + if !path.exists() + && let Some(parent) = path.parent() { - let _ = path; - Err(io::Error::other("history requires the `host_env` feature").into()) - } - #[cfg(feature = "host_env")] - { - if !path.exists() - && let Some(parent) = path.parent() - { - crate::host_env::fs::create_dir_all(parent)?; - } - self.repl.save_history(path)?; - Ok(()) + crate::fs::create_dir_all(parent)?; } + self.repl.save_history(path)?; + Ok(()) } pub fn add_history_entry(&mut self, entry: &str) -> OtherResult<()> { diff --git a/crates/host_env/src/resource.rs b/crates/host_env/src/resource.rs index 587428fe9..a0ba79b1b 100644 --- a/crates/host_env/src/resource.rs +++ b/crates/host_env/src/resource.rs @@ -2,6 +2,40 @@ use std::io; use crate::os::CheckLibcResult; +pub use libc::{ + RLIM_INFINITY, RLIMIT_AS, RLIMIT_CORE, RLIMIT_CPU, RLIMIT_DATA, RLIMIT_FSIZE, RLIMIT_MEMLOCK, + RLIMIT_NOFILE, RLIMIT_NPROC, RLIMIT_RSS, RLIMIT_STACK, c_long, rlim_t, rlimit, timeval, +}; + +#[cfg(target_os = "android")] +pub use libc::RLIM_NLIMITS; + +#[cfg(any(target_os = "linux", target_os = "android", target_os = "emscripten"))] +pub use libc::{RLIMIT_MSGQUEUE, RLIMIT_NICE, RLIMIT_RTPRIO, RLIMIT_SIGPENDING}; + +#[cfg(target_os = "linux")] +pub use libc::RLIMIT_RTTIME; + +#[cfg(any( + target_os = "freebsd", + target_os = "netbsd", + target_os = "solaris", + target_os = "illumos" +))] +pub use libc::RLIMIT_SBSIZE; + +#[cfg(any(target_os = "freebsd", target_os = "solaris", target_os = "illumos"))] +pub use libc::{RLIMIT_NPTS, RLIMIT_SWAP}; + +#[cfg(any(target_os = "solaris", target_os = "illumos"))] +pub use libc::RLIMIT_VMEM; + +#[cfg(any(target_os = "linux", target_os = "emscripten", target_os = "freebsd"))] +pub use libc::RUSAGE_THREAD; + +#[cfg(not(any(target_os = "windows", target_os = "redox")))] +pub use libc::{RUSAGE_CHILDREN, RUSAGE_SELF}; + #[derive(Debug, Clone, Copy)] pub struct RUsage { pub ru_utime: libc::timeval, diff --git a/crates/host_env/src/select.rs b/crates/host_env/src/select.rs index 385a6a110..3191f8d97 100644 --- a/crates/host_env/src/select.rs +++ b/crates/host_env/src/select.rs @@ -1,6 +1,16 @@ use core::mem::MaybeUninit; use std::io; +#[cfg(unix)] +pub use libc::{EINTR, FD_SETSIZE, POLLERR, POLLHUP, POLLIN, POLLNVAL, POLLOUT, POLLPRI}; + +#[cfg(any(target_os = "linux", target_os = "android", target_os = "redox"))] +pub use libc::{ + EPOLL_CLOEXEC, EPOLLERR, EPOLLET, EPOLLEXCLUSIVE, EPOLLHUP, EPOLLIN, EPOLLMSG, EPOLLONESHOT, + EPOLLOUT, EPOLLPRI, EPOLLRDBAND, EPOLLRDHUP, EPOLLRDNORM, EPOLLWAKEUP, EPOLLWRBAND, + EPOLLWRNORM, +}; + #[cfg(unix)] pub mod platform { pub use libc::pollfd; diff --git a/crates/host_env/src/shm.rs b/crates/host_env/src/shm.rs index 78e7d3921..b50e460b7 100644 --- a/crates/host_env/src/shm.rs +++ b/crates/host_env/src/shm.rs @@ -3,6 +3,8 @@ use std::io; use crate::os::CheckLibcResult; +pub use libc::mode_t; + pub fn shm_open(name: &CStr, flags: libc::c_int, mode: libc::c_uint) -> io::Result<libc::c_int> { #[cfg(target_os = "freebsd")] let mode = mode.try_into().unwrap(); diff --git a/crates/host_env/src/socket.rs b/crates/host_env/src/socket.rs index c409132a7..af4af2717 100644 --- a/crates/host_env/src/socket.rs +++ b/crates/host_env/src/socket.rs @@ -7,6 +7,43 @@ use std::os::fd::AsRawFd; #[cfg(unix)] use std::{io, os::fd::BorrowedFd}; +/// Returns the system's hostname. +#[cfg(not(target_arch = "wasm32"))] +pub fn hostname() -> std::ffi::OsString { + gethostname::gethostname() +} + +#[cfg(not(target_arch = "wasm32"))] +pub use ::dns_lookup as dns; +#[cfg(not(target_arch = "wasm32"))] +pub use ::socket2 as raw; + +/// Returns the first non-loopback MAC address as 6 bytes, or `None` when no +/// MAC address is available or the lookup fails. +#[cfg(not(any( + target_os = "ios", + target_os = "android", + target_os = "windows", + target_arch = "wasm32", + target_os = "redox" +)))] +pub fn mac_address() -> Option<[u8; 6]> { + mac_address::get_mac_address() + .ok() + .flatten() + .map(|m| m.bytes()) +} + +#[cfg(unix)] +pub use libc::{AF_UNIX, SOCK_STREAM, sa_family_t, sockaddr_storage, socklen_t}; + +#[cfg(any(target_os = "linux", target_os = "android"))] +pub use libc::{AF_ALG, AF_CAN}; + +// bionic (Android) does not define the CAN/ALG sockaddr structs. +#[cfg(target_os = "linux")] +pub use libc::{sockaddr_alg, sockaddr_can}; + #[cfg(all(unix, not(target_os = "redox")))] pub fn sethostname(hostname: &str) -> io::Result<()> { nix::unistd::sethostname(hostname).map_err(io::Error::from) diff --git a/crates/host_env/src/syslog.rs b/crates/host_env/src/syslog.rs index 8820b8f1c..2ba383773 100644 --- a/crates/host_env/src/syslog.rs +++ b/crates/host_env/src/syslog.rs @@ -3,6 +3,16 @@ use core::ffi::CStr; use parking_lot::RwLock; use std::{os::raw::c_char, sync::OnceLock}; +pub use libc::{ + LOG_ALERT, LOG_AUTH, LOG_CONS, LOG_CRIT, LOG_DAEMON, LOG_DEBUG, LOG_EMERG, LOG_ERR, LOG_INFO, + LOG_KERN, LOG_LOCAL0, LOG_LOCAL1, LOG_LOCAL2, LOG_LOCAL3, LOG_LOCAL4, LOG_LOCAL5, LOG_LOCAL6, + LOG_LOCAL7, LOG_LPR, LOG_MAIL, LOG_NDELAY, LOG_NEWS, LOG_NOTICE, LOG_NOWAIT, LOG_ODELAY, + LOG_PID, LOG_SYSLOG, LOG_USER, LOG_UUCP, LOG_WARNING, +}; + +#[cfg(not(target_os = "redox"))] +pub use libc::{LOG_AUTHPRIV, LOG_CRON, LOG_PERROR}; + #[derive(Debug)] enum GlobalIdent { Explicit(Box<CStr>), diff --git a/crates/host_env/src/termios.rs b/crates/host_env/src/termios.rs index 074d03a45..0a96078be 100644 --- a/crates/host_env/src/termios.rs +++ b/crates/host_env/src/termios.rs @@ -1,5 +1,55 @@ pub type Termios = ::termios::Termios; +#[cfg(any(target_os = "illumos", target_os = "solaris"))] +pub use libc::{CSTART, CSTOP, CSWTCH}; + +#[cfg(any( + target_os = "dragonfly", + target_os = "freebsd", + target_os = "macos", + target_os = "netbsd", + target_os = "openbsd" +))] +pub use libc::{FIOASYNC, TIOCGETD, TIOCSETD}; + +pub use libc::{FIOCLEX, FIONBIO, TIOCGWINSZ, TIOCSWINSZ}; + +#[cfg(any( + target_os = "android", + target_os = "dragonfly", + target_os = "freebsd", + target_os = "linux", + target_os = "macos", + target_os = "netbsd", + target_os = "openbsd" +))] +pub use libc::{ + FIONCLEX, FIONREAD, TIOCEXCL, TIOCM_CAR, TIOCM_CD, TIOCM_CTS, TIOCM_DSR, TIOCM_DTR, TIOCM_LE, + TIOCM_RI, TIOCM_RNG, TIOCM_RTS, TIOCM_SR, TIOCM_ST, TIOCMBIC, TIOCMBIS, TIOCMGET, TIOCMSET, + TIOCNXCL, TIOCSCTTY, +}; + +#[cfg(any(target_os = "android", target_os = "linux"))] +pub use libc::{ + IBSHIFT, TCFLSH, TCGETA, TCGETS, TCSBRK, TCSETA, TCSETAF, TCSETAW, TCSETS, TCSETSF, TCSETSW, + TCXONC, TIOCGSERIAL, TIOCGSOFTCAR, TIOCINQ, TIOCLINUX, TIOCSSOFTCAR, XTABS, +}; + +#[cfg(any( + target_os = "android", + target_os = "dragonfly", + target_os = "freebsd", + target_os = "linux", + target_os = "macos" +))] +pub use libc::{TIOCCONS, TIOCGPGRP, TIOCOUTQ, TIOCSPGRP, TIOCSTI}; + +#[cfg(any(target_os = "dragonfly", target_os = "freebsd", target_os = "macos"))] +pub use libc::{ + TIOCNOTTY, TIOCPKT, TIOCPKT_DATA, TIOCPKT_DOSTOP, TIOCPKT_FLUSHREAD, TIOCPKT_FLUSHWRITE, + TIOCPKT_NOSTOP, TIOCPKT_START, TIOCPKT_STOP, +}; + #[cfg(any( target_os = "android", target_os = "freebsd", diff --git a/crates/stdlib/Cargo.toml b/crates/stdlib/Cargo.toml index 1ba6148e8..1e0718695 100644 --- a/crates/stdlib/Cargo.toml +++ b/crates/stdlib/Cargo.toml @@ -92,14 +92,10 @@ chrono.workspace = true # uuid [target.'cfg(not(any(target_os = "ios", target_os = "android", target_os = "windows", target_arch = "wasm32", target_os = "redox")))'.dependencies] -mac_address = { workspace = true } uuid = { workspace = true, features = ["v1"] } # mmap + socket dependencies [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -gethostname = { workspace = true } -socket2 = { workspace = true, features = ["all"] } -dns-lookup = { workspace = true } # OpenSSL dependencies (optional, for ssl-openssl feature) openssl = { workspace = true, optional = true } @@ -129,9 +125,6 @@ xz-sys = { workspace = true } paste = { workspace = true } widestring = { workspace = true } -[target.'cfg(target_os = "macos")'.dependencies] -system-configuration = { workspace = true } - [dev-dependencies] insta = { workspace = true } rustpython-pylib = { workspace = true, features = [ "freeze-stdlib" ] } diff --git a/crates/stdlib/src/faulthandler.rs b/crates/stdlib/src/faulthandler.rs index e890cecfa..3717c18b7 100644 --- a/crates/stdlib/src/faulthandler.rs +++ b/crates/stdlib/src/faulthandler.rs @@ -373,7 +373,7 @@ mod decl { // faulthandler_fatal_error #[cfg(unix)] - extern "C" fn faulthandler_fatal_error(signum: libc::c_int) { + extern "C" fn faulthandler_fatal_error(signum: core::ffi::c_int) { let save_errno = get_errno(); if !FATAL_ERROR.enabled.load(Ordering::Relaxed) { @@ -410,7 +410,7 @@ mod decl { // faulthandler_fatal_error for Windows #[cfg(windows)] - extern "C" fn faulthandler_fatal_error(signum: libc::c_int) { + extern "C" fn faulthandler_fatal_error(signum: core::ffi::c_int) { let save_errno = get_errno(); if !FATAL_ERROR.enabled.load(Ordering::Relaxed) { @@ -479,7 +479,7 @@ mod decl { // Disable SIGSEGV handler for access violations to avoid double output if host_faulthandler::is_access_violation(code) { - host_faulthandler::disable_fatal_signal(libc::SIGSEGV); + host_faulthandler::disable_fatal_signal(host_faulthandler::SIGSEGV); } let all_threads = FATAL_ERROR.all_threads.load(Ordering::Relaxed); @@ -495,7 +495,10 @@ mod decl { return true; } - if !host_faulthandler::enable_fatal_handlers(faulthandler_fatal_error, libc::SA_NODEFER) { + if !host_faulthandler::enable_fatal_handlers( + faulthandler_fatal_error, + host_faulthandler::SA_NODEFER, + ) { return false; } @@ -769,7 +772,7 @@ mod decl { } #[cfg(unix)] - extern "C" fn faulthandler_user_signal(signum: libc::c_int) { + extern "C" fn faulthandler_user_signal(signum: core::ffi::c_int) { let save_errno = get_errno(); let user = match host_faulthandler::get_user_signal(signum as usize) { @@ -900,7 +903,7 @@ mod decl { #[cfg(not(target_arch = "wasm32"))] { suppress_crash_report(); - host_faulthandler::raise_signal(libc::SIGFPE); + host_faulthandler::raise_signal(host_faulthandler::SIGFPE); } } diff --git a/crates/stdlib/src/fcntl.rs b/crates/stdlib/src/fcntl.rs index 5081c9e9c..8e24f2b6e 100644 --- a/crates/stdlib/src/fcntl.rs +++ b/crates/stdlib/src/fcntl.rs @@ -25,38 +25,40 @@ mod fcntl { // I_LINK, I_UNLINK, I_PLINK, I_PUNLINK #[pyattr] - use libc::{F_GETFD, F_GETFL, F_SETFD, F_SETFL, FD_CLOEXEC}; + use host_fcntl::{F_GETFD, F_GETFL, F_SETFD, F_SETFL, FD_CLOEXEC}; #[cfg(not(target_os = "wasi"))] #[pyattr] - use libc::{F_DUPFD, F_DUPFD_CLOEXEC, F_GETLK, F_SETLK, F_SETLKW}; + use host_fcntl::{F_DUPFD, F_DUPFD_CLOEXEC, F_GETLK, F_SETLK, F_SETLKW}; #[cfg(not(any(target_os = "wasi", target_os = "redox")))] #[pyattr] - use libc::{F_GETOWN, F_RDLCK, F_SETOWN, F_UNLCK, F_WRLCK, LOCK_EX, LOCK_NB, LOCK_SH, LOCK_UN}; + use host_fcntl::{ + F_GETOWN, F_RDLCK, F_SETOWN, F_UNLCK, F_WRLCK, LOCK_EX, LOCK_NB, LOCK_SH, LOCK_UN, + }; #[cfg(target_vendor = "apple")] #[pyattr] - use libc::{F_FULLFSYNC, F_NOCACHE}; + use host_fcntl::{F_FULLFSYNC, F_NOCACHE}; #[cfg(target_os = "freebsd")] #[pyattr] - use libc::{F_DUP2FD, F_DUP2FD_CLOEXEC}; + use host_fcntl::{F_DUP2FD, F_DUP2FD_CLOEXEC}; #[cfg(any(target_os = "android", target_os = "linux"))] #[pyattr] - use libc::{F_OFD_GETLK, F_OFD_SETLK, F_OFD_SETLKW}; + use host_fcntl::{F_OFD_GETLK, F_OFD_SETLK, F_OFD_SETLKW}; #[cfg(any(target_os = "android", target_os = "fuchsia", target_os = "linux"))] #[pyattr] - use libc::{ + use host_fcntl::{ F_ADD_SEALS, F_GET_SEALS, F_GETLEASE, F_GETPIPE_SZ, F_NOTIFY, F_SEAL_GROW, F_SEAL_SEAL, F_SEAL_SHRINK, F_SEAL_WRITE, F_SETLEASE, F_SETPIPE_SZ, }; #[cfg(any(target_os = "dragonfly", target_os = "netbsd", target_vendor = "apple"))] #[pyattr] - use libc::F_GETPATH; + use host_fcntl::F_GETPATH; #[pyfunction] fn fcntl( diff --git a/crates/stdlib/src/grp.rs b/crates/stdlib/src/grp.rs index 34e9929d2..c2a231bef 100644 --- a/crates/stdlib/src/grp.rs +++ b/crates/stdlib/src/grp.rs @@ -43,7 +43,7 @@ mod grp { #[pyfunction] fn getgrgid(gid: PyIntRef, vm: &VirtualMachine) -> PyResult<GroupData> { let gr_gid = gid.as_bigint(); - let gid = libc::gid_t::try_from(gr_gid).ok(); + let gid = host_grp::gid_t::try_from(gr_gid).ok(); let group = gid .map(host_grp::getgrgid) .transpose() diff --git a/crates/stdlib/src/locale.rs b/crates/stdlib/src/locale.rs index 74e9053fb..2f929e8b5 100644 --- a/crates/stdlib/src/locale.rs +++ b/crates/stdlib/src/locale.rs @@ -18,7 +18,7 @@ mod _locale { not(any(target_os = "ios", target_os = "android", target_os = "redox")) ))] #[pyattr] - use libc::{ + use rustpython_host_env::locale::{ ABDAY_1, ABDAY_2, ABDAY_3, ABDAY_4, ABDAY_5, ABDAY_6, ABDAY_7, ABMON_1, ABMON_2, ABMON_3, ABMON_4, ABMON_5, ABMON_6, ABMON_7, ABMON_8, ABMON_9, ABMON_10, ABMON_11, ABMON_12, ALT_DIGITS, AM_STR, CODESET, CRNCYSTR, D_FMT, D_T_FMT, DAY_1, DAY_2, DAY_3, DAY_4, DAY_5, @@ -29,17 +29,19 @@ mod _locale { #[cfg(all(unix, not(any(target_os = "ios", target_os = "redox"))))] #[pyattr] - use libc::LC_MESSAGES; + use rustpython_host_env::locale::LC_MESSAGES; #[pyattr] - use libc::{LC_ALL, LC_COLLATE, LC_CTYPE, LC_MONETARY, LC_NUMERIC, LC_TIME}; + use rustpython_host_env::locale::{ + LC_ALL, LC_COLLATE, LC_CTYPE, LC_MONETARY, LC_NUMERIC, LC_TIME, + }; #[pyattr(name = "CHAR_MAX")] fn char_max(vm: &VirtualMachine) -> PyIntRef { - vm.ctx.new_int(libc::c_char::MAX) + vm.ctx.new_int(core::ffi::c_char::MAX) } - fn copy_grouping(group: &[libc::c_char], vm: &VirtualMachine) -> PyListRef { + fn copy_grouping(group: &[core::ffi::c_char], vm: &VirtualMachine) -> PyListRef { let mut group_vec: Vec<PyObjectRef> = Vec::new(); for &value in group { let val = vm.ctx.new_int(value); diff --git a/crates/stdlib/src/multiprocessing.rs b/crates/stdlib/src/multiprocessing.rs index 78debdc78..1eee2ec04 100644 --- a/crates/stdlib/src/multiprocessing.rs +++ b/crates/stdlib/src/multiprocessing.rs @@ -333,7 +333,7 @@ mod _multiprocessing { } #[pyfunction] - fn send(socket: usize, buf: ArgBytesLike, vm: &VirtualMachine) -> PyResult<libc::c_int> { + fn send(socket: usize, buf: ArgBytesLike, vm: &VirtualMachine) -> PyResult<core::ffi::c_int> { buf.with_ref(|b| { host_multiprocessing::send_socket(socket as host_multiprocessing::RawSocket, b) }) @@ -355,7 +355,7 @@ mod _multiprocessing { }; use core::sync::atomic::{AtomicI32, AtomicU64, Ordering}; #[cfg(target_vendor = "apple")] - use libc::sem_t; + use rustpython_host_env::multiprocessing::sem_t; use rustpython_host_env::multiprocessing::{ self as host_multiprocessing, SemError, TryAcquireStatus, WaitStatus, }; @@ -373,7 +373,7 @@ mod _multiprocessing { #[cfg(target_vendor = "apple")] fn sem_timedwait_polled( sem: *mut sem_t, - deadline: &libc::timespec, + deadline: &host_multiprocessing::timespec, vm: &VirtualMachine, ) -> Result<(), SemWaitError> { let mut delay: u64 = 0; diff --git a/crates/stdlib/src/openssl.rs b/crates/stdlib/src/openssl.rs index 76309d3c2..3397fff8e 100644 --- a/crates/stdlib/src/openssl.rs +++ b/crates/stdlib/src/openssl.rs @@ -154,63 +154,63 @@ mod _ssl { // SSL Alert Descriptions (RFC 5246 and extensions) // Hybrid approach: use openssl_sys constants where available, hardcode others #[pyattr] - const ALERT_DESCRIPTION_CLOSE_NOTIFY: libc::c_int = 0; + const ALERT_DESCRIPTION_CLOSE_NOTIFY: core::ffi::c_int = 0; #[pyattr] - const ALERT_DESCRIPTION_UNEXPECTED_MESSAGE: libc::c_int = 10; + const ALERT_DESCRIPTION_UNEXPECTED_MESSAGE: core::ffi::c_int = 10; #[pyattr] - const ALERT_DESCRIPTION_BAD_RECORD_MAC: libc::c_int = 20; + const ALERT_DESCRIPTION_BAD_RECORD_MAC: core::ffi::c_int = 20; #[pyattr] - const ALERT_DESCRIPTION_RECORD_OVERFLOW: libc::c_int = 22; + const ALERT_DESCRIPTION_RECORD_OVERFLOW: core::ffi::c_int = 22; #[pyattr] - const ALERT_DESCRIPTION_DECOMPRESSION_FAILURE: libc::c_int = 30; + const ALERT_DESCRIPTION_DECOMPRESSION_FAILURE: core::ffi::c_int = 30; #[pyattr] - const ALERT_DESCRIPTION_HANDSHAKE_FAILURE: libc::c_int = 40; + const ALERT_DESCRIPTION_HANDSHAKE_FAILURE: core::ffi::c_int = 40; #[pyattr] - const ALERT_DESCRIPTION_BAD_CERTIFICATE: libc::c_int = 42; + const ALERT_DESCRIPTION_BAD_CERTIFICATE: core::ffi::c_int = 42; #[pyattr] - const ALERT_DESCRIPTION_UNSUPPORTED_CERTIFICATE: libc::c_int = 43; + const ALERT_DESCRIPTION_UNSUPPORTED_CERTIFICATE: core::ffi::c_int = 43; #[pyattr] - const ALERT_DESCRIPTION_CERTIFICATE_REVOKED: libc::c_int = 44; + const ALERT_DESCRIPTION_CERTIFICATE_REVOKED: core::ffi::c_int = 44; #[pyattr] - const ALERT_DESCRIPTION_CERTIFICATE_EXPIRED: libc::c_int = 45; + const ALERT_DESCRIPTION_CERTIFICATE_EXPIRED: core::ffi::c_int = 45; #[pyattr] - const ALERT_DESCRIPTION_CERTIFICATE_UNKNOWN: libc::c_int = 46; + const ALERT_DESCRIPTION_CERTIFICATE_UNKNOWN: core::ffi::c_int = 46; #[pyattr] - const ALERT_DESCRIPTION_ILLEGAL_PARAMETER: libc::c_int = SSL_AD_ILLEGAL_PARAMETER; + const ALERT_DESCRIPTION_ILLEGAL_PARAMETER: core::ffi::c_int = SSL_AD_ILLEGAL_PARAMETER; #[pyattr] - const ALERT_DESCRIPTION_UNKNOWN_CA: libc::c_int = 48; + const ALERT_DESCRIPTION_UNKNOWN_CA: core::ffi::c_int = 48; #[pyattr] - const ALERT_DESCRIPTION_ACCESS_DENIED: libc::c_int = 49; + const ALERT_DESCRIPTION_ACCESS_DENIED: core::ffi::c_int = 49; #[pyattr] - const ALERT_DESCRIPTION_DECODE_ERROR: libc::c_int = SSL_AD_DECODE_ERROR; + const ALERT_DESCRIPTION_DECODE_ERROR: core::ffi::c_int = SSL_AD_DECODE_ERROR; #[pyattr] - const ALERT_DESCRIPTION_DECRYPT_ERROR: libc::c_int = 51; + const ALERT_DESCRIPTION_DECRYPT_ERROR: core::ffi::c_int = 51; #[pyattr] - const ALERT_DESCRIPTION_PROTOCOL_VERSION: libc::c_int = 70; + const ALERT_DESCRIPTION_PROTOCOL_VERSION: core::ffi::c_int = 70; #[pyattr] - const ALERT_DESCRIPTION_INSUFFICIENT_SECURITY: libc::c_int = 71; + const ALERT_DESCRIPTION_INSUFFICIENT_SECURITY: core::ffi::c_int = 71; #[pyattr] - const ALERT_DESCRIPTION_INTERNAL_ERROR: libc::c_int = 80; + const ALERT_DESCRIPTION_INTERNAL_ERROR: core::ffi::c_int = 80; #[pyattr] - const ALERT_DESCRIPTION_USER_CANCELLED: libc::c_int = 90; + const ALERT_DESCRIPTION_USER_CANCELLED: core::ffi::c_int = 90; #[pyattr] - const ALERT_DESCRIPTION_NO_RENEGOTIATION: libc::c_int = 100; + const ALERT_DESCRIPTION_NO_RENEGOTIATION: core::ffi::c_int = 100; #[pyattr] - const ALERT_DESCRIPTION_UNSUPPORTED_EXTENSION: libc::c_int = 110; + const ALERT_DESCRIPTION_UNSUPPORTED_EXTENSION: core::ffi::c_int = 110; #[pyattr] - const ALERT_DESCRIPTION_CERTIFICATE_UNOBTAINABLE: libc::c_int = 111; + const ALERT_DESCRIPTION_CERTIFICATE_UNOBTAINABLE: core::ffi::c_int = 111; #[pyattr] - const ALERT_DESCRIPTION_UNRECOGNIZED_NAME: libc::c_int = SSL_AD_UNRECOGNIZED_NAME; + const ALERT_DESCRIPTION_UNRECOGNIZED_NAME: core::ffi::c_int = SSL_AD_UNRECOGNIZED_NAME; #[pyattr] - const ALERT_DESCRIPTION_BAD_CERTIFICATE_STATUS_RESPONSE: libc::c_int = 113; + const ALERT_DESCRIPTION_BAD_CERTIFICATE_STATUS_RESPONSE: core::ffi::c_int = 113; #[pyattr] - const ALERT_DESCRIPTION_BAD_CERTIFICATE_HASH_VALUE: libc::c_int = 114; + const ALERT_DESCRIPTION_BAD_CERTIFICATE_HASH_VALUE: core::ffi::c_int = 114; #[pyattr] - const ALERT_DESCRIPTION_UNKNOWN_PSK_IDENTITY: libc::c_int = 115; + const ALERT_DESCRIPTION_UNKNOWN_PSK_IDENTITY: core::ffi::c_int = 115; // CRL verification constants #[pyattr] - const VERIFY_CRL_CHECK_CHAIN: libc::c_ulong = + const VERIFY_CRL_CHECK_CHAIN: core::ffi::c_ulong = sys::X509_V_FLAG_CRL_CHECK | sys::X509_V_FLAG_CRL_CHECK_ALL; // taken from CPython, should probably be kept up to date with their version if it ever changes @@ -248,7 +248,8 @@ mod _ssl { #[pyattr] const PROTO_MAXIMUM_SUPPORTED: i32 = ProtoVersion::MaxSupported as i32; #[pyattr] - const OP_ALL: libc::c_ulong = (sys::SSL_OP_ALL & !sys::SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS) as _; + const OP_ALL: core::ffi::c_ulong = + (sys::SSL_OP_ALL & !sys::SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS) as _; #[pyattr] const HAS_TLS_UNIQUE: bool = true; #[pyattr] @@ -298,7 +299,7 @@ mod _ssl { // SSL_VERIFY constants for post-handshake authentication #[cfg(ossl111)] - const SSL_VERIFY_POST_HANDSHAKE: libc::c_int = 0x20; + const SSL_VERIFY_POST_HANDSHAKE: core::ffi::c_int = 0x20; // the openssl version from the API headers @@ -393,7 +394,7 @@ mod _ssl { unsafe { ptr2obj(sys::OBJ_nid2obj(nid.as_raw())) } } - type PyNid = (libc::c_int, String, String, Option<String>); + type PyNid = (core::ffi::c_int, String, String, Option<String>); fn obj2py(obj: &Asn1ObjectRef, vm: &VirtualMachine) -> PyResult<PyNid> { let nid = obj.nid(); let short_name = nid @@ -428,7 +429,7 @@ mod _ssl { } #[pyfunction] - fn nid2obj(nid: libc::c_int, vm: &VirtualMachine) -> PyResult<PyNid> { + fn nid2obj(nid: core::ffi::c_int, vm: &VirtualMachine) -> PyResult<PyNid> { _nid2obj(Nid::from_raw(nid)) .as_deref() .ok_or_else(|| vm.new_value_error(format!("unknown NID {nid}"))) @@ -508,7 +509,7 @@ mod _ssl { #[pyfunction(name = "RAND_add")] fn rand_add(string: ArgStrOrBytesLike, entropy: f64) { let f = |b: &[u8]| { - for buf in b.chunks(libc::c_int::MAX as usize) { + for buf in b.chunks(core::ffi::c_int::MAX as usize) { unsafe { sys::RAND_add(buf.as_ptr() as *const _, buf.len() as _, entropy) } } }; @@ -573,9 +574,9 @@ mod _ssl { } // Get or create an ex_data index for SNI callback data - fn get_sni_ex_data_index() -> libc::c_int { + fn get_sni_ex_data_index() -> core::ffi::c_int { use rustpython_common::lock::LazyLock; - static SNI_EX_DATA_IDX: LazyLock<libc::c_int> = LazyLock::new(|| unsafe { + static SNI_EX_DATA_IDX: LazyLock<core::ffi::c_int> = LazyLock::new(|| unsafe { sys::SSL_get_ex_new_index( 0, core::ptr::null_mut(), @@ -591,12 +592,12 @@ mod _ssl { // NOTE: We don't free the data here because it's managed manually in do_handshake // to avoid use-after-free when the SSL object is dropped after timeout unsafe extern "C" fn sni_callback_data_free( - _parent: *mut libc::c_void, - _ptr: *mut libc::c_void, + _parent: *mut core::ffi::c_void, + _ptr: *mut core::ffi::c_void, _ad: *mut sys::CRYPTO_EX_DATA, - _idx: libc::c_int, - _argl: libc::c_long, - _argp: *mut libc::c_void, + _idx: core::ffi::c_int, + _argl: core::ffi::c_long, + _argp: *mut core::ffi::c_void, ) { // Intentionally empty - data is freed in cleanup_sni_ex_data() } @@ -617,9 +618,9 @@ mod _ssl { } // Get or create an ex_data index for msg_callback data - fn get_msg_callback_ex_data_index() -> libc::c_int { + fn get_msg_callback_ex_data_index() -> core::ffi::c_int { use rustpython_common::lock::LazyLock; - static MSG_CB_EX_DATA_IDX: LazyLock<libc::c_int> = LazyLock::new(|| unsafe { + static MSG_CB_EX_DATA_IDX: LazyLock<core::ffi::c_int> = LazyLock::new(|| unsafe { sys::SSL_get_ex_new_index( 0, core::ptr::null_mut(), @@ -633,12 +634,12 @@ mod _ssl { // Free function for msg_callback data - called by OpenSSL when SSL is freed unsafe extern "C" fn msg_callback_data_free( - _parent: *mut libc::c_void, - ptr: *mut libc::c_void, + _parent: *mut core::ffi::c_void, + ptr: *mut core::ffi::c_void, _ad: *mut sys::CRYPTO_EX_DATA, - _idx: libc::c_int, - _argl: libc::c_long, - _argp: *mut libc::c_void, + _idx: core::ffi::c_int, + _argl: core::ffi::c_long, + _argp: *mut core::ffi::c_void, ) { if !ptr.is_null() { unsafe { @@ -652,13 +653,13 @@ mod _ssl { // SNI callback function called by OpenSSL unsafe extern "C" fn _servername_callback( ssl_ptr: *mut sys::SSL, - al: *mut libc::c_int, - arg: *mut libc::c_void, - ) -> libc::c_int { - const SSL_TLSEXT_ERR_OK: libc::c_int = 0; - const SSL_TLSEXT_ERR_ALERT_FATAL: libc::c_int = 2; - const SSL_AD_INTERNAL_ERROR: libc::c_int = 80; - const TLSEXT_NAMETYPE_host_name: libc::c_int = 0; + al: *mut core::ffi::c_int, + arg: *mut core::ffi::c_void, + ) -> core::ffi::c_int { + const SSL_TLSEXT_ERR_OK: core::ffi::c_int = 0; + const SSL_TLSEXT_ERR_ALERT_FATAL: core::ffi::c_int = 2; + const SSL_AD_INTERNAL_ERROR: core::ffi::c_int = 80; + const TLSEXT_NAMETYPE_host_name: core::ffi::c_int = 0; if arg.is_null() { return SSL_TLSEXT_ERR_OK; @@ -766,13 +767,13 @@ mod _ssl { // Called during SSL operations to report protocol messages. // debughelpers.c:_PySSL_msg_callback unsafe extern "C" fn _msg_callback( - write_p: libc::c_int, - mut version: libc::c_int, - content_type: libc::c_int, - buf: *const libc::c_void, + write_p: core::ffi::c_int, + mut version: core::ffi::c_int, + content_type: core::ffi::c_int, + buf: *const core::ffi::c_void, len: usize, ssl_ptr: *mut sys::SSL, - _arg: *mut libc::c_void, + _arg: *mut core::ffi::c_void, ) { if ssl_ptr.is_null() { return; @@ -1122,7 +1123,7 @@ mod _ssl { } #[pygetset] - fn options(&self) -> libc::c_ulong { + fn options(&self) -> core::ffi::c_ulong { self.ctx.read().options().bits() as _ } #[pygetset(setter)] @@ -1130,10 +1131,10 @@ mod _ssl { if new_opts < 0 { return Err(vm.new_value_error("invalid options value")); } - let new_opts = new_opts as libc::c_ulong; + let new_opts = new_opts as core::ffi::c_ulong; let mut ctx = self.builder(); // Get current options - let current = ctx.options().bits() as libc::c_ulong; + let current = ctx.options().bits() as core::ffi::c_ulong; // Calculate options to clear and set let clear = current & !new_opts; @@ -1190,7 +1191,7 @@ mod _ssl { Ok(()) } #[pygetset] - fn verify_flags(&self) -> libc::c_ulong { + fn verify_flags(&self) -> core::ffi::c_ulong { unsafe { let ctx_ptr = self.ctx().as_ptr(); let param = sys::SSL_CTX_get0_param(ctx_ptr); @@ -1198,7 +1199,11 @@ mod _ssl { } } #[pygetset(setter)] - fn set_verify_flags(&self, new_flags: libc::c_ulong, vm: &VirtualMachine) -> PyResult<()> { + fn set_verify_flags( + &self, + new_flags: core::ffi::c_ulong, + vm: &VirtualMachine, + ) -> PyResult<()> { unsafe { let ctx_ptr = self.ctx().as_ptr(); let param = sys::SSL_CTX_get0_param(ctx_ptr); @@ -1359,10 +1364,10 @@ mod _ssl { { let mut ctx = self.builder(); let server = protos.with_ref(|pbuf| { - if pbuf.len() > libc::c_uint::MAX as usize { + if pbuf.len() > core::ffi::c_uint::MAX as usize { return Err(vm.new_overflow_error(format!( "protocols longer than {} bytes", - libc::c_uint::MAX + core::ffi::c_uint::MAX ))); } ctx.set_alpn_protos(pbuf) @@ -1523,7 +1528,7 @@ mod _ssl { return Err(vm .new_os_subtype_error( vm.ctx.exceptions.file_not_found_error.to_owned(), - Some(libc::ENOENT), + Some(rustpython_host_env::errno::errors::ENOENT), format!("No such file or directory: '{}'", path.display()), ) .upcast()); @@ -1534,7 +1539,7 @@ mod _ssl { return Err(vm .new_os_subtype_error( vm.ctx.exceptions.file_not_found_error.to_owned(), - Some(libc::ENOENT), + Some(rustpython_host_env::errno::errors::ENOENT), format!("No such file or directory: '{}'", path.display()), ) .upcast()); @@ -1667,7 +1672,7 @@ mod _ssl { std::io::ErrorKind::NotFound => vm .new_os_subtype_error( vm.ctx.exceptions.file_not_found_error.to_owned(), - Some(libc::ENOENT), + Some(rustpython_host_env::errno::errors::ENOENT), e.to_string(), ) .upcast(), @@ -1684,7 +1689,7 @@ mod _ssl { ) }; unsafe { - libc::fclose(fp); + rustpython_host_env::fileutils::fclose(fp); } if dh.is_null() { @@ -1842,7 +1847,7 @@ mod _ssl { return Err(vm .new_os_subtype_error( vm.ctx.exceptions.file_not_found_error.to_owned(), - Some(libc::ENOENT), + Some(rustpython_host_env::errno::errors::ENOENT), format!("No such file or directory: '{}'", cert_path.display()), ) .upcast()); @@ -1853,7 +1858,7 @@ mod _ssl { return Err(vm .new_os_subtype_error( vm.ctx.exceptions.file_not_found_error.to_owned(), - Some(libc::ENOENT), + Some(rustpython_host_env::errno::errors::ENOENT), format!("No such file or directory: '{}'", kp.display()), ) .upcast()); @@ -2013,7 +2018,7 @@ mod _ssl { let ret = SSL_set_session_id_context( ssl.as_ptr(), SID_CTX.as_ptr(), - SID_CTX.len() as libc::c_uint, + SID_CTX.len() as core::ffi::c_uint, ); if ret == 0 { return Err(convert_openssl_error(vm, ErrorStack::get())); @@ -2061,7 +2066,7 @@ mod _ssl { // Server socket: add SSL_VERIFY_POST_HANDSHAKE flag // Only in combination with SSL_VERIFY_PEER let mode = sys::SSL_get_verify_mode(ssl.as_ptr()); - if (mode & sys::SSL_VERIFY_PEER as libc::c_int) != 0 { + if (mode & sys::SSL_VERIFY_PEER as core::ffi::c_int) != 0 { sys::SSL_set_verify( ssl.as_ptr(), mode | SSL_VERIFY_POST_HANDSHAKE, @@ -2553,7 +2558,7 @@ mod _ssl { unsafe { let ssl_ctx = sys::SSL_get_SSL_CTX(stream.ssl().as_ptr()); let verify_mode = sys::SSL_CTX_get_verify_mode(ssl_ctx); - if (verify_mode & sys::SSL_VERIFY_PEER as libc::c_int) == 0 { + if (verify_mode & sys::SSL_VERIFY_PEER as core::ffi::c_int) == 0 { // Return empty dict when SSL_VERIFY_PEER is not set Ok(Some(vm.ctx.new_dict().into())) } else { @@ -2723,8 +2728,8 @@ mod _ssl { // Use thread-local SSL pointer during handshake to avoid deadlock let ssl_ptr = get_ssl_ptr_for_context_change(&self.connection); unsafe { - let mut out: *const libc::c_uchar = core::ptr::null(); - let mut outlen: libc::c_uint = 0; + let mut out: *const core::ffi::c_uchar = core::ptr::null(); + let mut outlen: core::ffi::c_uint = 0; sys::SSL_get0_alpn_selected(ssl_ptr, &mut out, &mut outlen); @@ -3308,8 +3313,8 @@ mod _ssl { return Ok(PyComparisonValue::NotImplemented); } let mut eq = unsafe { - let mut self_len: libc::c_uint = 0; - let mut other_len: libc::c_uint = 0; + let mut self_len: core::ffi::c_uint = 0; + let mut other_len: core::ffi::c_uint = 0; let self_id = sys::SSL_SESSION_get_id(zelf.session, &mut self_len); let other_id = sys::SSL_SESSION_get_id(other.session, &mut other_len); @@ -3359,7 +3364,7 @@ mod _ssl { unsafe extern "C" { // X509_check_ca returns 1 for CA certificates, 0 otherwise - fn X509_check_ca(x: *const sys::X509) -> libc::c_int; + fn X509_check_ca(x: *const sys::X509) -> core::ffi::c_int; } unsafe extern "C" { @@ -3373,13 +3378,13 @@ mod _ssl { #[cfg(ossl111)] unsafe extern "C" { - fn SSL_verify_client_post_handshake(ssl: *const sys::SSL) -> libc::c_int; - fn SSL_set_post_handshake_auth(ssl: *mut sys::SSL, val: libc::c_int); + fn SSL_verify_client_post_handshake(ssl: *const sys::SSL) -> core::ffi::c_int; + fn SSL_set_post_handshake_auth(ssl: *mut sys::SSL, val: core::ffi::c_int); } #[cfg(ossl110)] unsafe extern "C" { - fn SSL_CTX_get_security_level(ctx: *const sys::SSL_CTX) -> libc::c_int; + fn SSL_CTX_get_security_level(ctx: *const sys::SSL_CTX) -> core::ffi::c_int; } unsafe extern "C" { @@ -3390,13 +3395,13 @@ mod _ssl { #[allow(non_camel_case_types)] type SSL_CTX_msg_callback = Option< unsafe extern "C" fn( - write_p: libc::c_int, - version: libc::c_int, - content_type: libc::c_int, - buf: *const libc::c_void, + write_p: core::ffi::c_int, + version: core::ffi::c_int, + content_type: core::ffi::c_int, + buf: *const core::ffi::c_void, len: usize, ssl: *mut sys::SSL, - arg: *mut libc::c_void, + arg: *mut core::ffi::c_void, ), >; @@ -3406,40 +3411,42 @@ mod _ssl { #[cfg(ossl110)] unsafe extern "C" { - fn SSL_SESSION_has_ticket(session: *const sys::SSL_SESSION) -> libc::c_int; - fn SSL_SESSION_get_ticket_lifetime_hint(session: *const sys::SSL_SESSION) -> libc::c_ulong; + fn SSL_SESSION_has_ticket(session: *const sys::SSL_SESSION) -> core::ffi::c_int; + fn SSL_SESSION_get_ticket_lifetime_hint( + session: *const sys::SSL_SESSION, + ) -> core::ffi::c_ulong; } // X509 object types - const X509_LU_X509: libc::c_int = 1; - const X509_LU_CRL: libc::c_int = 2; + const X509_LU_X509: core::ffi::c_int = 1; + const X509_LU_CRL: core::ffi::c_int = 2; unsafe extern "C" { - fn X509_OBJECT_get_type(obj: *const sys::X509_OBJECT) -> libc::c_int; + fn X509_OBJECT_get_type(obj: *const sys::X509_OBJECT) -> core::ffi::c_int; fn SSL_set_session_id_context( ssl: *mut sys::SSL, - sid_ctx: *const libc::c_uchar, - sid_ctx_len: libc::c_uint, - ) -> libc::c_int; + sid_ctx: *const core::ffi::c_uchar, + sid_ctx_len: core::ffi::c_uint, + ) -> core::ffi::c_int; fn SSL_get1_session(ssl: *const sys::SSL) -> *mut sys::SSL_SESSION; } // SSL session statistics constants (used with SSL_CTX_ctrl) - const SSL_CTRL_SESS_NUMBER: libc::c_int = 20; - const SSL_CTRL_SESS_CONNECT: libc::c_int = 21; - const SSL_CTRL_SESS_CONNECT_GOOD: libc::c_int = 22; - const SSL_CTRL_SESS_CONNECT_RENEGOTIATE: libc::c_int = 23; - const SSL_CTRL_SESS_ACCEPT: libc::c_int = 24; - const SSL_CTRL_SESS_ACCEPT_GOOD: libc::c_int = 25; - const SSL_CTRL_SESS_ACCEPT_RENEGOTIATE: libc::c_int = 26; - const SSL_CTRL_SESS_HIT: libc::c_int = 27; - const SSL_CTRL_SESS_MISSES: libc::c_int = 29; - const SSL_CTRL_SESS_TIMEOUTS: libc::c_int = 30; - const SSL_CTRL_SESS_CACHE_FULL: libc::c_int = 31; + const SSL_CTRL_SESS_NUMBER: core::ffi::c_int = 20; + const SSL_CTRL_SESS_CONNECT: core::ffi::c_int = 21; + const SSL_CTRL_SESS_CONNECT_GOOD: core::ffi::c_int = 22; + const SSL_CTRL_SESS_CONNECT_RENEGOTIATE: core::ffi::c_int = 23; + const SSL_CTRL_SESS_ACCEPT: core::ffi::c_int = 24; + const SSL_CTRL_SESS_ACCEPT_GOOD: core::ffi::c_int = 25; + const SSL_CTRL_SESS_ACCEPT_RENEGOTIATE: core::ffi::c_int = 26; + const SSL_CTRL_SESS_HIT: core::ffi::c_int = 27; + const SSL_CTRL_SESS_MISSES: core::ffi::c_int = 29; + const SSL_CTRL_SESS_TIMEOUTS: core::ffi::c_int = 30; + const SSL_CTRL_SESS_CACHE_FULL: core::ffi::c_int = 31; // SSL session statistics functions (implemented as macros in OpenSSL) #[allow(non_snake_case)] - unsafe fn SSL_CTX_sess_number(ctx: *const sys::SSL_CTX) -> libc::c_long { + unsafe fn SSL_CTX_sess_number(ctx: *const sys::SSL_CTX) -> core::ffi::c_long { unsafe { sys::SSL_CTX_ctrl( ctx as *mut _, @@ -3451,7 +3458,7 @@ mod _ssl { } #[allow(non_snake_case)] - unsafe fn SSL_CTX_sess_connect(ctx: *const sys::SSL_CTX) -> libc::c_long { + unsafe fn SSL_CTX_sess_connect(ctx: *const sys::SSL_CTX) -> core::ffi::c_long { unsafe { sys::SSL_CTX_ctrl( ctx as *mut _, @@ -3463,7 +3470,7 @@ mod _ssl { } #[allow(non_snake_case)] - unsafe fn SSL_CTX_sess_connect_good(ctx: *const sys::SSL_CTX) -> libc::c_long { + unsafe fn SSL_CTX_sess_connect_good(ctx: *const sys::SSL_CTX) -> core::ffi::c_long { unsafe { sys::SSL_CTX_ctrl( ctx as *mut _, @@ -3475,7 +3482,7 @@ mod _ssl { } #[allow(non_snake_case)] - unsafe fn SSL_CTX_sess_connect_renegotiate(ctx: *const sys::SSL_CTX) -> libc::c_long { + unsafe fn SSL_CTX_sess_connect_renegotiate(ctx: *const sys::SSL_CTX) -> core::ffi::c_long { unsafe { sys::SSL_CTX_ctrl( ctx as *mut _, @@ -3487,7 +3494,7 @@ mod _ssl { } #[allow(non_snake_case)] - unsafe fn SSL_CTX_sess_accept(ctx: *const sys::SSL_CTX) -> libc::c_long { + unsafe fn SSL_CTX_sess_accept(ctx: *const sys::SSL_CTX) -> core::ffi::c_long { unsafe { sys::SSL_CTX_ctrl( ctx as *mut _, @@ -3499,7 +3506,7 @@ mod _ssl { } #[allow(non_snake_case)] - unsafe fn SSL_CTX_sess_accept_good(ctx: *const sys::SSL_CTX) -> libc::c_long { + unsafe fn SSL_CTX_sess_accept_good(ctx: *const sys::SSL_CTX) -> core::ffi::c_long { unsafe { sys::SSL_CTX_ctrl( ctx as *mut _, @@ -3511,7 +3518,7 @@ mod _ssl { } #[allow(non_snake_case)] - unsafe fn SSL_CTX_sess_accept_renegotiate(ctx: *const sys::SSL_CTX) -> libc::c_long { + unsafe fn SSL_CTX_sess_accept_renegotiate(ctx: *const sys::SSL_CTX) -> core::ffi::c_long { unsafe { sys::SSL_CTX_ctrl( ctx as *mut _, @@ -3523,12 +3530,12 @@ mod _ssl { } #[allow(non_snake_case)] - unsafe fn SSL_CTX_sess_hits(ctx: *const sys::SSL_CTX) -> libc::c_long { + unsafe fn SSL_CTX_sess_hits(ctx: *const sys::SSL_CTX) -> core::ffi::c_long { unsafe { sys::SSL_CTX_ctrl(ctx as *mut _, SSL_CTRL_SESS_HIT, 0, core::ptr::null_mut()) } } #[allow(non_snake_case)] - unsafe fn SSL_CTX_sess_misses(ctx: *const sys::SSL_CTX) -> libc::c_long { + unsafe fn SSL_CTX_sess_misses(ctx: *const sys::SSL_CTX) -> core::ffi::c_long { unsafe { sys::SSL_CTX_ctrl( ctx as *mut _, @@ -3540,7 +3547,7 @@ mod _ssl { } #[allow(non_snake_case)] - unsafe fn SSL_CTX_sess_timeouts(ctx: *const sys::SSL_CTX) -> libc::c_long { + unsafe fn SSL_CTX_sess_timeouts(ctx: *const sys::SSL_CTX) -> core::ffi::c_long { unsafe { sys::SSL_CTX_ctrl( ctx as *mut _, @@ -3552,7 +3559,7 @@ mod _ssl { } #[allow(non_snake_case)] - unsafe fn SSL_CTX_sess_cache_full(ctx: *const sys::SSL_CTX) -> libc::c_long { + unsafe fn SSL_CTX_sess_cache_full(ctx: *const sys::SSL_CTX) -> core::ffi::c_long { unsafe { sys::SSL_CTX_ctrl( ctx as *mut _, @@ -3566,17 +3573,17 @@ mod _ssl { // DH parameters functions unsafe extern "C" { fn PEM_read_DHparams( - fp: *mut libc::FILE, + fp: *mut rustpython_host_env::fileutils::CFile, x: *mut *mut sys::DH, - cb: *mut libc::c_void, - u: *mut libc::c_void, + cb: *mut core::ffi::c_void, + u: *mut core::ffi::c_void, ) -> *mut sys::DH; } // OpenSSL BIO helper functions // These are typically macros in OpenSSL, implemented via BIO_ctrl - const BIO_CTRL_PENDING: libc::c_int = 10; - const BIO_CTRL_SET_EOF: libc::c_int = 2; + const BIO_CTRL_PENDING: core::ffi::c_int = 10; + const BIO_CTRL_SET_EOF: core::ffi::c_int = 2; #[allow(non_snake_case)] unsafe fn BIO_ctrl_pending(bio: *mut sys::BIO) -> usize { @@ -3584,14 +3591,17 @@ mod _ssl { } #[allow(non_snake_case)] - unsafe fn BIO_set_mem_eof_return(bio: *mut sys::BIO, eof: libc::c_int) -> libc::c_int { + unsafe fn BIO_set_mem_eof_return( + bio: *mut sys::BIO, + eof: core::ffi::c_int, + ) -> core::ffi::c_int { unsafe { sys::BIO_ctrl( bio, BIO_CTRL_SET_EOF, - eof as libc::c_long, + eof as core::ffi::c_long, core::ptr::null_mut(), - ) as libc::c_int + ) as core::ffi::c_int } } @@ -3721,7 +3731,7 @@ mod _ssl { #[pygetset] fn id(&self, vm: &VirtualMachine) -> PyBytesRef { unsafe { - let mut len: libc::c_uint = 0; + let mut len: core::ffi::c_uint = 0; let id_ptr = sys::SSL_SESSION_get_id(self.session, &mut len); let id_slice = core::slice::from_raw_parts(id_ptr, len as usize); vm.ctx.new_bytes(id_slice.to_vec()) @@ -3976,7 +3986,7 @@ mod _ssl { let mut buf = vec![0u8; 256]; let result = sys::SSL_CIPHER_description( cipher, - buf.as_mut_ptr() as *mut libc::c_char, + buf.as_mut_ptr() as *mut core::ffi::c_char, buf.len() as i32, ); if result.is_null() { @@ -4142,7 +4152,7 @@ mod windows { mod bio { //! based off rust-openssl's private `bio` module - use libc::c_int; + use core::ffi::c_int; use openssl::error::ErrorStack; use openssl_sys as sys; use std::marker::PhantomData; diff --git a/crates/stdlib/src/openssl/cert.rs b/crates/stdlib/src/openssl/cert.rs index e18e7feb9..7704e51f0 100644 --- a/crates/stdlib/src/openssl/cert.rs +++ b/crates/stdlib/src/openssl/cert.rs @@ -39,7 +39,7 @@ pub(crate) mod ssl_cert { let buflen = buflen as usize; let mut buf = Vec::<u8>::with_capacity(buflen + 1); let ret = sys::OBJ_obj2txt( - buf.as_mut_ptr() as *mut libc::c_char, + buf.as_mut_ptr() as *mut core::ffi::c_char, buf.capacity() as _, ptr, no_name, diff --git a/crates/stdlib/src/posixshmem.rs b/crates/stdlib/src/posixshmem.rs index 91fdf4aaf..6bc1c0065 100644 --- a/crates/stdlib/src/posixshmem.rs +++ b/crates/stdlib/src/posixshmem.rs @@ -16,15 +16,15 @@ mod _posixshmem { #[pyarg(any)] name: PyUtf8StrRef, #[pyarg(any)] - flags: libc::c_int, + flags: core::ffi::c_int, #[pyarg(any, default = 0o600)] - mode: libc::mode_t, + mode: shm::mode_t, } #[pyfunction] - fn shm_open(args: ShmOpenArgs, vm: &VirtualMachine) -> PyResult<libc::c_int> { + fn shm_open(args: ShmOpenArgs, vm: &VirtualMachine) -> PyResult<core::ffi::c_int> { let name = CString::new(args.name.as_str()).map_err(|e| e.into_pyexception(vm))?; - let mode: libc::c_uint = args.mode as _; + let mode: core::ffi::c_uint = args.mode as _; shm::shm_open(name.as_c_str(), args.flags, mode).map_err(|e| e.into_pyexception(vm)) } diff --git a/crates/stdlib/src/posixsubprocess.rs b/crates/stdlib/src/posixsubprocess.rs index 0371d12e3..080c06468 100644 --- a/crates/stdlib/src/posixsubprocess.rs +++ b/crates/stdlib/src/posixsubprocess.rs @@ -26,7 +26,7 @@ mod _posixsubprocess { use crate::vm::{PyResult, VirtualMachine, convert::IntoPyException}; #[pyfunction] - fn fork_exec(args: ForkExecArgs<'_>, vm: &VirtualMachine) -> PyResult<libc::pid_t> { + fn fork_exec(args: ForkExecArgs<'_>, vm: &VirtualMachine) -> PyResult<host_posix::pid_t> { // Check for interpreter shutdown when preexec_fn is used if args.preexec_fn.is_some() && vm @@ -85,7 +85,7 @@ impl AsRef<CStr> for CStrPathLike { #[derive(Default)] struct CharPtrVec<'a> { - vec: Vec<*const libc::c_char>, + vec: Vec<*const host_posix::c_char>, marker: PhantomData<Vec<&'a CStr>>, } @@ -107,7 +107,7 @@ impl<'a> Deref for CharPtrVec<'a> { type Target = CharPtrSlice<'a>; fn deref(&self) -> &Self::Target { unsafe { - &*(self.vec.as_slice() as *const [*const libc::c_char] as *const CharPtrSlice<'a>) + &*(self.vec.as_slice() as *const [*const host_posix::c_char] as *const CharPtrSlice<'a>) } } } @@ -115,11 +115,11 @@ impl<'a> Deref for CharPtrVec<'a> { #[repr(transparent)] struct CharPtrSlice<'a> { marker: PhantomData<[&'a CStr]>, - slice: [*const libc::c_char], + slice: [*const host_posix::c_char], } impl CharPtrSlice<'_> { - const fn as_ptr(&self) -> *const *const libc::c_char { + const fn as_ptr(&self) -> *const *const host_posix::c_char { self.slice.as_ptr() } } @@ -254,7 +254,7 @@ gen_args! { errpipe_write: Fd, restore_signals: bool, call_setsid: bool, - pgid_to_set: libc::pid_t, + pgid_to_set: host_posix::pid_t, gid: Option<RawGid>, groups_list: Option<PyListRef>, uid: Option<RawUid>, diff --git a/crates/stdlib/src/resource.rs b/crates/stdlib/src/resource.rs index bac708435..cf7fe23d8 100644 --- a/crates/stdlib/src/resource.rs +++ b/crates/stdlib/src/resource.rs @@ -16,7 +16,7 @@ mod resource { #[cfg_attr(target_os = "android", expect(deprecated))] const RLIM_NLIMITS: i32 = cfg_select! { target_os = "android" => { - libc::RLIM_NLIMITS + host_resource::RLIM_NLIMITS } _ => { // This constant isn't abi-stable across os versions, so we just @@ -28,18 +28,18 @@ mod resource { // TODO: RLIMIT_OFILE, #[pyattr] - use libc::{ + use host_resource::{ RLIM_INFINITY, RLIMIT_AS, RLIMIT_CORE, RLIMIT_CPU, RLIMIT_DATA, RLIMIT_FSIZE, RLIMIT_MEMLOCK, RLIMIT_NOFILE, RLIMIT_NPROC, RLIMIT_RSS, RLIMIT_STACK, }; #[cfg(any(target_os = "linux", target_os = "android", target_os = "emscripten"))] #[pyattr] - use libc::{RLIMIT_MSGQUEUE, RLIMIT_NICE, RLIMIT_RTPRIO, RLIMIT_SIGPENDING}; + use host_resource::{RLIMIT_MSGQUEUE, RLIMIT_NICE, RLIMIT_RTPRIO, RLIMIT_SIGPENDING}; // TODO: I think this is supposed to be defined for all linux_like? #[cfg(target_os = "linux")] #[pyattr] - use libc::RLIMIT_RTTIME; + use host_resource::RLIMIT_RTTIME; #[cfg(any( target_os = "freebsd", @@ -48,41 +48,41 @@ mod resource { target_os = "illumos" ))] #[pyattr] - use libc::RLIMIT_SBSIZE; + use host_resource::RLIMIT_SBSIZE; #[cfg(any(target_os = "freebsd", target_os = "solaris", target_os = "illumos"))] #[pyattr] - use libc::{RLIMIT_NPTS, RLIMIT_SWAP}; + use host_resource::{RLIMIT_NPTS, RLIMIT_SWAP}; #[cfg(any(target_os = "solaris", target_os = "illumos"))] #[pyattr] - use libc::RLIMIT_VMEM; + use host_resource::RLIMIT_VMEM; #[cfg(any(target_os = "linux", target_os = "emscripten", target_os = "freebsd"))] #[pyattr] - use libc::RUSAGE_THREAD; + use host_resource::RUSAGE_THREAD; #[cfg(not(any(target_os = "windows", target_os = "redox")))] #[pyattr] - use libc::{RUSAGE_CHILDREN, RUSAGE_SELF}; + use host_resource::{RUSAGE_CHILDREN, RUSAGE_SELF}; #[pystruct_sequence_data] struct RUsageData { ru_utime: f64, ru_stime: f64, - ru_maxrss: libc::c_long, - ru_ixrss: libc::c_long, - ru_idrss: libc::c_long, - ru_isrss: libc::c_long, - ru_minflt: libc::c_long, - ru_majflt: libc::c_long, - ru_nswap: libc::c_long, - ru_inblock: libc::c_long, - ru_oublock: libc::c_long, - ru_msgsnd: libc::c_long, - ru_msgrcv: libc::c_long, - ru_nsignals: libc::c_long, - ru_nvcsw: libc::c_long, - ru_nivcsw: libc::c_long, + ru_maxrss: host_resource::c_long, + ru_ixrss: host_resource::c_long, + ru_idrss: host_resource::c_long, + ru_isrss: host_resource::c_long, + ru_minflt: host_resource::c_long, + ru_majflt: host_resource::c_long, + ru_nswap: host_resource::c_long, + ru_inblock: host_resource::c_long, + ru_oublock: host_resource::c_long, + ru_msgsnd: host_resource::c_long, + ru_msgrcv: host_resource::c_long, + ru_nsignals: host_resource::c_long, + ru_nvcsw: host_resource::c_long, + ru_nivcsw: host_resource::c_long, } #[pyattr] @@ -94,7 +94,8 @@ mod resource { impl From<host_resource::RUsage> for RUsageData { fn from(rusage: host_resource::RUsage) -> Self { - let tv = |tv: libc::timeval| tv.tv_sec as f64 + (tv.tv_usec as f64 / 1_000_000.0); + let tv = + |tv: host_resource::timeval| tv.tv_sec as f64 + (tv.tv_usec as f64 / 1_000_000.0); Self { ru_utime: tv(rusage.ru_utime), ru_stime: tv(rusage.ru_stime), @@ -128,13 +129,13 @@ mod resource { }) } - struct Limits(libc::rlimit); + struct Limits(host_resource::rlimit); impl<'a> TryFromBorrowedObject<'a> for Limits { fn try_from_borrowed_object(vm: &VirtualMachine, obj: &'a PyObject) -> PyResult<Self> { - let seq: Vec<libc::rlim_t> = obj.try_to_value(vm)?; + let seq: Vec<host_resource::rlim_t> = obj.try_to_value(vm)?; match *seq { - [cur, max] => Ok(Self(libc::rlimit { + [cur, max] => Ok(Self(host_resource::rlimit { rlim_cur: cur & RLIM_INFINITY, rlim_max: max & RLIM_INFINITY, })), @@ -149,14 +150,14 @@ mod resource { } } - fn py2rlim(obj: PyIntRef, vm: &VirtualMachine) -> PyResult<libc::rlim_t> { + fn py2rlim(obj: PyIntRef, vm: &VirtualMachine) -> PyResult<host_resource::rlim_t> { let value = obj.try_to_primitive::<isize>(vm)?; if value.is_negative() { return Err(vm.new_value_error("Cannot convert negative int")); } - libc::rlim_t::try_from(value) + host_resource::rlim_t::try_from(value) .map_err(|_| vm.new_overflow_error("Python int too large to convert to C rlim_t")) } @@ -164,7 +165,7 @@ mod resource { fn getrlimit(resource: PyIntRef, vm: &VirtualMachine) -> PyResult<Limits> { let resource = py2rlim(resource, vm)?; - if resource >= RLIM_NLIMITS as libc::rlim_t { + if resource >= RLIM_NLIMITS as host_resource::rlim_t { return Err(vm.new_value_error("invalid resource specified")); } @@ -176,7 +177,7 @@ mod resource { fn setrlimit(resource: PyIntRef, limits: Limits, vm: &VirtualMachine) -> PyResult<()> { let resource = py2rlim(resource, vm)?; - if resource >= RLIM_NLIMITS as libc::rlim_t { + if resource >= RLIM_NLIMITS as host_resource::rlim_t { return Err(vm.new_value_error("invalid resource specified")); } diff --git a/crates/stdlib/src/scproxy.rs b/crates/stdlib/src/scproxy.rs index 09e7cdc60..f31432cbb 100644 --- a/crates/stdlib/src/scproxy.rs +++ b/crates/stdlib/src/scproxy.rs @@ -9,14 +9,14 @@ mod _scproxy { builtins::{PyDict, PyDictRef, PyStr}, convert::ToPyObject, }; - use system_configuration::core_foundation::{ + use rustpython_host_env::system_configuration::core_foundation::{ array::CFArray, base::{CFType, FromVoid, TCFType}, dictionary::CFDictionary, number::CFNumber, string::{CFString, CFStringRef}, }; - use system_configuration::sys::{ + use rustpython_host_env::system_configuration::sys::{ dynamic_store_copy_specific::SCDynamicStoreCopyProxies, schema_definitions::*, }; diff --git a/crates/stdlib/src/select.rs b/crates/stdlib/src/select.rs index f8125ea37..c1f10f3ec 100644 --- a/crates/stdlib/src/select.rs +++ b/crates/stdlib/src/select.rs @@ -170,7 +170,7 @@ mod decl { #[cfg(unix)] #[pyattr] - use libc::{POLLERR, POLLHUP, POLLIN, POLLNVAL, POLLOUT, POLLPRI}; + use host_select::{POLLERR, POLLHUP, POLLIN, POLLNVAL, POLLOUT, POLLPRI}; #[cfg(unix)] pub(super) mod poll { @@ -261,7 +261,8 @@ mod decl { } } - const DEFAULT_EVENTS: i16 = libc::POLLIN | libc::POLLPRI | libc::POLLOUT; + const DEFAULT_EVENTS: i16 = + host_select::POLLIN | host_select::POLLPRI | host_select::POLLOUT; #[pyclass] impl PyPoll { @@ -315,7 +316,7 @@ mod decl { loop { match vm.allow_threads(|| host_select::poll_fds(&mut fds, poll_timeout)) { Ok(_) => break, - Err(err) if err.raw_os_error() == Some(libc::EINTR) => { + Err(err) if err.raw_os_error() == Some(host_select::EINTR) => { vm.check_signals()? } Err(err) => return Err(err.into_pyexception(vm)), @@ -346,14 +347,14 @@ mod decl { #[cfg(any(target_os = "linux", target_os = "android", target_os = "redox"))] #[pyattr] - use libc::{ + use host_select::{ EPOLL_CLOEXEC, EPOLLERR, EPOLLEXCLUSIVE, EPOLLHUP, EPOLLIN, EPOLLMSG, EPOLLONESHOT, EPOLLOUT, EPOLLPRI, EPOLLRDBAND, EPOLLRDHUP, EPOLLRDNORM, EPOLLWAKEUP, EPOLLWRBAND, EPOLLWRNORM, }; #[cfg(any(target_os = "linux", target_os = "android", target_os = "redox"))] #[pyattr] - const EPOLLET: u32 = libc::EPOLLET as u32; + const EPOLLET: u32 = host_select::EPOLLET as u32; #[cfg(any(target_os = "linux", target_os = "android", target_os = "redox"))] pub(super) mod epoll { @@ -392,7 +393,7 @@ mod decl { if let ..=-2 | 0 = args.sizehint { return Err(vm.new_value_error("negative sizehint")); } - if !matches!(args.flags, 0 | libc::EPOLL_CLOEXEC) { + if !matches!(args.flags, 0 | host_select::EPOLL_CLOEXEC) { return Err(vm.new_os_error("invalid flags")); } Self::new().map_err(|e| e.into_pyexception(vm)) @@ -497,7 +498,7 @@ mod decl { "maxevents must be greater than 0, got {maxevents}" ))); } - -1 => libc::FD_SETSIZE - 1, + -1 => host_select::FD_SETSIZE - 1, _ => maxevents as usize, }; diff --git a/crates/stdlib/src/socket.rs b/crates/stdlib/src/socket.rs index e3ce52b94..e7ee6c907 100644 --- a/crates/stdlib/src/socket.rs +++ b/crates/stdlib/src/socket.rs @@ -45,8 +45,8 @@ mod _socket { time::Duration, }; use crossbeam_utils::atomic::AtomicCell; + use host_socket::raw::Socket; use num_traits::ToPrimitive; - use socket2::Socket; use std::{ ffi, io::{self, Read, Write}, @@ -885,9 +885,9 @@ mod _socket { fn get_raw_sock(obj: PyObjectRef, vm: &VirtualMachine) -> PyResult<RawSocket> { #[cfg(unix)] - type CastFrom = libc::c_long; + type CastFrom = core::ffi::c_long; #[cfg(windows)] - type CastFrom = libc::c_longlong; + type CastFrom = core::ffi::c_longlong; // should really just be to_index() but test_socket tests the error messages explicitly if obj.fast_isinstance(vm.ctx.types.float_type) { @@ -1109,7 +1109,7 @@ mod _socket { addr: PyObjectRef, caller: &str, vm: &VirtualMachine, - ) -> Result<socket2::SockAddr, IoOrPyException> { + ) -> Result<host_socket::raw::SockAddr, IoOrPyException> { let family = self.family.load(); match family { #[cfg(unix)] @@ -1122,7 +1122,7 @@ mod _socket { ArgStrOrBytesLike::Buf(_) => ffi::OsStr::from_bytes(bytes).into(), ArgStrOrBytesLike::Str(s) => vm.fsencode(s)?, }; - socket2::SockAddr::unix(path) + host_socket::raw::SockAddr::unix(path) .map_err(|_| vm.new_os_error("AF_UNIX path too long").into()) } c::AF_INET => { @@ -1214,19 +1214,18 @@ mod _socket { }; // Create sockaddr_can - let mut storage: libc::sockaddr_storage = unsafe { core::mem::zeroed() }; - let can_addr = - &mut storage as *mut libc::sockaddr_storage as *mut libc::sockaddr_can; + let mut storage: c::sockaddr_storage = unsafe { core::mem::zeroed() }; + let can_addr = &mut storage as *mut c::sockaddr_storage as *mut c::sockaddr_can; unsafe { - (*can_addr).can_family = libc::AF_CAN as libc::sa_family_t; + (*can_addr).can_family = c::AF_CAN as c::sa_family_t; (*can_addr).can_ifindex = ifindex; } - let storage: socket2::SockAddrStorage = + let storage: host_socket::raw::SockAddrStorage = unsafe { core::mem::transmute(storage) }; Ok(unsafe { - socket2::SockAddr::new( + host_socket::raw::SockAddr::new( storage, - core::mem::size_of::<libc::sockaddr_can>() as libc::socklen_t, + core::mem::size_of::<c::sockaddr_can>() as c::socklen_t, ) }) } @@ -1273,11 +1272,10 @@ mod _socket { } // Create sockaddr_alg - let mut storage: libc::sockaddr_storage = unsafe { core::mem::zeroed() }; - let alg_addr = - &mut storage as *mut libc::sockaddr_storage as *mut libc::sockaddr_alg; + let mut storage: c::sockaddr_storage = unsafe { core::mem::zeroed() }; + let alg_addr = &mut storage as *mut c::sockaddr_storage as *mut c::sockaddr_alg; unsafe { - (*alg_addr).salg_family = libc::AF_ALG as libc::sa_family_t; + (*alg_addr).salg_family = c::AF_ALG as c::sa_family_t; // Copy type string for (i, b) in type_str.bytes().enumerate() { (*alg_addr).salg_type[i] = b; @@ -1287,12 +1285,12 @@ mod _socket { (*alg_addr).salg_name[i] = b; } } - let storage: socket2::SockAddrStorage = + let storage: host_socket::raw::SockAddrStorage = unsafe { core::mem::transmute(storage) }; Ok(unsafe { - socket2::SockAddr::new( + host_socket::raw::SockAddr::new( storage, - core::mem::size_of::<libc::sockaddr_alg>() as libc::socklen_t, + core::mem::size_of::<c::sockaddr_alg>() as c::socklen_t, ) }) } @@ -1773,7 +1771,7 @@ mod _socket { vm: &VirtualMachine, ) -> PyResult<usize> { let flags = flags.unwrap_or(0); - let mut msg = socket2::MsgHdr::new(); + let mut msg = host_socket::raw::MsgHdr::new(); let sockaddr; if let Some(addr) = addr.flatten() { @@ -1896,9 +1894,9 @@ mod _socket { // Build address tuple let address = if let Some(address) = msg.address { - let storage: socket2::SockAddrStorage = + let storage: host_socket::raw::SockAddrStorage = unsafe { core::mem::transmute(address.storage) }; - let addr = unsafe { socket2::SockAddr::new(storage, address.len as _) }; + let addr = unsafe { host_socket::raw::SockAddr::new(storage, address.len as _) }; get_addr_tuple(&addr, vm) } else { vm.ctx.none() @@ -2260,7 +2258,7 @@ mod _socket { } } - fn get_addr_tuple(addr: &socket2::SockAddr, vm: &VirtualMachine) -> PyObjectRef { + fn get_addr_tuple(addr: &host_socket::raw::SockAddr, vm: &VirtualMachine) -> PyObjectRef { if let Some(addr) = addr.as_socket() { return get_ip_addr_tuple(&addr, vm); } @@ -2280,9 +2278,9 @@ mod _socket { #[cfg(target_os = "linux")] { let family = addr.family(); - if family == libc::AF_CAN as libc::sa_family_t { + if family == c::AF_CAN as c::sa_family_t { // AF_CAN address: (interface_name,) or (interface_name, can_id) - let can_addr = unsafe { &*(addr.as_ptr() as *const libc::sockaddr_can) }; + let can_addr = unsafe { &*(addr.as_ptr() as *const c::sockaddr_can) }; let ifindex = can_addr.can_ifindex; let ifname = if ifindex == 0 { String::new() @@ -2291,9 +2289,9 @@ mod _socket { }; return vm.ctx.new_tuple(vec![vm.ctx.new_str(ifname).into()]).into(); } - if family == libc::AF_ALG as libc::sa_family_t { + if family == c::AF_ALG as c::sa_family_t { // AF_ALG address: (type, name) - let alg_addr = unsafe { &*(addr.as_ptr() as *const libc::sockaddr_alg) }; + let alg_addr = unsafe { &*(addr.as_ptr() as *const c::sockaddr_alg) }; let type_bytes = &alg_addr.salg_type; let name_bytes = &alg_addr.salg_name; let type_nul = memchr::memchr(b'\0', type_bytes).unwrap_or(type_bytes.len()); @@ -2319,7 +2317,7 @@ mod _socket { audit.call((vm.ctx.new_str("socket.gethostname"),), vm)?; } - gethostname::gethostname() + rustpython_host_env::socket::hostname() .into_string() .map(|hostname| vm.ctx.new_str(hostname)) .map_err(|err| vm.new_os_error(err.into_string().unwrap())) @@ -2348,7 +2346,7 @@ mod _socket { Ok(vm.ctx.new_str(Ipv4Addr::from(*packed_ip).to_string())) } - fn cstr_opt_as_ptr(x: &OptionalArg<ffi::CString>) -> *const libc::c_char { + fn cstr_opt_as_ptr(x: &OptionalArg<ffi::CString>) -> *const core::ffi::c_char { x.as_ref().map_or_else(core::ptr::null, |s| s.as_ptr()) } @@ -2593,7 +2591,7 @@ mod _socket { opts: GAIOptions, vm: &VirtualMachine, ) -> Result<Vec<PyObjectRef>, IoOrPyException> { - let hints = dns_lookup::AddrInfoHints { + let hints = host_socket::dns::AddrInfoHints { socktype: opts.ty, protocol: opts.proto, address: opts.family, @@ -2646,7 +2644,7 @@ mod _socket { }; let port = port_encoded.as_deref(); - let addrs = dns_lookup::getaddrinfo(host, port, Some(hints)) + let addrs = host_socket::dns::getaddrinfo(host, port, Some(hints)) .map_err(|err| convert_socket_error(vm, err, SocketError::GaiError))?; let list = addrs @@ -2672,7 +2670,7 @@ mod _socket { vm: &VirtualMachine, ) -> Result<(String, PyListRef, PyListRef), IoOrPyException> { let addr = get_addr(vm, addr, c::AF_UNSPEC)?; - let (hostname, _) = dns_lookup::getnameinfo(&addr, 0) + let (hostname, _) = host_socket::dns::getnameinfo(&addr, 0) .map_err(|e| convert_socket_error(vm, e, SocketError::HError))?; Ok(( hostname, @@ -2697,7 +2695,7 @@ mod _socket { vm: &VirtualMachine, ) -> Result<(String, PyListRef, PyListRef), IoOrPyException> { let addr = get_addr(vm, name, c::AF_INET)?; - let (hostname, _) = dns_lookup::getnameinfo(&addr, 0) + let (hostname, _) = host_socket::dns::getnameinfo(&addr, 0) .map_err(|e| convert_socket_error(vm, e, SocketError::HError))?; Ok(( hostname, @@ -2772,7 +2770,7 @@ mod _socket { } } let (addr, flowinfo, scopeid) = Address::from_tuple_ipv6(&address, vm)?; - let hints = dns_lookup::AddrInfoHints { + let hints = host_socket::dns::AddrInfoHints { address: c::AF_UNSPEC, socktype: c::SOCK_DGRAM, flags: c::AI_NUMERICHOST, @@ -2780,7 +2778,7 @@ mod _socket { }; let service = addr.port.to_string(); let host_str = addr.host.as_str(); - let mut res = dns_lookup::getaddrinfo(Some(host_str), Some(&service), Some(hints)) + let mut res = host_socket::dns::getaddrinfo(Some(host_str), Some(&service), Some(hints)) .map_err(|e| convert_socket_error(vm, e, SocketError::GaiError))? .filter_map(Result::ok); let mut ainfo = res.next().unwrap(); @@ -2800,7 +2798,7 @@ mod _socket { addr.set_scope_id(scopeid); } } - dns_lookup::getnameinfo(&ainfo.sockaddr, flags) + host_socket::dns::getnameinfo(&ainfo.sockaddr, flags) .map_err(|e| convert_socket_error(vm, e, SocketError::GaiError)) } @@ -2811,8 +2809,8 @@ mod _socket { socket_kind: OptionalArg<i32>, proto: OptionalArg<i32>, ) -> Result<(PySocket, PySocket), IoOrPyException> { - let family = family.unwrap_or(libc::AF_UNIX); - let socket_kind = socket_kind.unwrap_or(libc::SOCK_STREAM); + let family = family.unwrap_or(c::AF_UNIX); + let socket_kind = socket_kind.unwrap_or(c::SOCK_STREAM); let proto = proto.unwrap_or(0); let (a, b) = Socket::pair(family.into(), socket_kind.into(), Some(proto.into()))?; let py_a = PySocket::default(); @@ -2839,7 +2837,7 @@ mod _socket { { let name = name.to_cstring(vm)?; // in case 'if_nametoindex' does not set errno - rustpython_host_env::os::set_errno(libc::ENODEV); + rustpython_host_env::os::set_errno(c::ENODEV); let ret = unsafe { c::if_nametoindex(name.as_ptr() as _) }; if ret == 0 { Err(vm.new_last_errno_error()) @@ -2860,7 +2858,7 @@ mod _socket { { let mut buf = [0; c::IF_NAMESIZE + 1]; // in case 'if_indextoname' does not set errno - rustpython_host_env::os::set_errno(libc::ENXIO); + rustpython_host_env::os::set_errno(c::ENXIO); let ret = unsafe { c::if_indextoname(index, buf.as_mut_ptr()) }; if ret.is_null() { Err(vm.new_last_errno_error()) @@ -2912,13 +2910,13 @@ mod _socket { ) -> Result<SocketAddr, IoOrPyException> { let name = pyname.as_str(); if name.is_empty() { - let hints = dns_lookup::AddrInfoHints { + let hints = host_socket::dns::AddrInfoHints { address: af, socktype: c::SOCK_DGRAM, flags: c::AI_PASSIVE, protocol: 0, }; - let mut res = dns_lookup::getaddrinfo(None, Some("0"), Some(hints)) + let mut res = host_socket::dns::getaddrinfo(None, Some("0"), Some(hints)) .map_err(|e| convert_socket_error(vm, e, SocketError::GaiError))?; let ainfo = res.next().unwrap()?; if res.next().is_some() { @@ -2951,7 +2949,7 @@ mod _socket { { return Ok(SocketAddr::V6(net::SocketAddrV6::new(addr, 0, 0, 0))); } - let hints = dns_lookup::AddrInfoHints { + let hints = host_socket::dns::AddrInfoHints { address: af, ..Default::default() }; @@ -2961,7 +2959,7 @@ mod _socket { .encode_text(pyname.into_wtf8(), "idna", None, vm)?; let name = core::str::from_utf8(name.as_bytes()) .map_err(|_| vm.new_runtime_error("idna output is not utf8"))?; - let mut res = dns_lookup::getaddrinfo(Some(name), None, Some(hints)) + let mut res = host_socket::dns::getaddrinfo(Some(name), None, Some(hints)) .map_err(|e| convert_socket_error(vm, e, SocketError::GaiError))?; Ok(res.next().unwrap().map(|ainfo| ainfo.sockaddr)?) } @@ -3027,10 +3025,10 @@ mod _socket { fn convert_socket_error( vm: &VirtualMachine, - err: dns_lookup::LookupError, + err: host_socket::dns::LookupError, err_kind: SocketError, ) -> IoOrPyException { - if let dns_lookup::LookupErrorKind::System = err.kind() { + if let host_socket::dns::LookupErrorKind::System = err.kind() { return io::Error::from(err).into(); } let strerr = { diff --git a/crates/stdlib/src/syslog.rs b/crates/stdlib/src/syslog.rs index 52424972a..910175ec6 100644 --- a/crates/stdlib/src/syslog.rs +++ b/crates/stdlib/src/syslog.rs @@ -13,7 +13,7 @@ mod syslog { use rustpython_host_env::syslog as host_syslog; #[pyattr] - use libc::{ + use host_syslog::{ LOG_ALERT, LOG_AUTH, LOG_CONS, LOG_CRIT, LOG_DAEMON, LOG_DEBUG, LOG_EMERG, LOG_ERR, LOG_INFO, LOG_KERN, LOG_LOCAL0, LOG_LOCAL1, LOG_LOCAL2, LOG_LOCAL3, LOG_LOCAL4, LOG_LOCAL5, LOG_LOCAL6, LOG_LOCAL7, LOG_LPR, LOG_MAIL, LOG_NDELAY, LOG_NEWS, LOG_NOTICE, LOG_NOWAIT, @@ -22,7 +22,7 @@ mod syslog { #[cfg(not(target_os = "redox"))] #[pyattr] - use libc::{LOG_AUTHPRIV, LOG_CRON, LOG_PERROR}; + use host_syslog::{LOG_AUTHPRIV, LOG_CRON, LOG_PERROR}; fn get_argv(vm: &VirtualMachine) -> Option<PyStrRef> { if let Some(argv) = vm.state.config.settings.argv.first() diff --git a/crates/stdlib/src/termios.rs b/crates/stdlib/src/termios.rs index 7a2c24724..2207276f8 100644 --- a/crates/stdlib/src/termios.rs +++ b/crates/stdlib/src/termios.rs @@ -99,6 +99,41 @@ mod termios { ))] #[pyattr] use host_termios::{CBAUD, CIBAUD, IUCLC, OLCUC, XCASE}; + #[cfg(any(target_os = "illumos", target_os = "solaris"))] + #[pyattr] + use host_termios::{CSTART, CSTOP, CSWTCH}; + #[cfg(any( + target_os = "dragonfly", + target_os = "freebsd", + target_os = "macos", + target_os = "netbsd", + target_os = "openbsd" + ))] + #[pyattr] + use host_termios::{FIOASYNC, TIOCGETD, TIOCSETD}; + #[pyattr] + use host_termios::{FIOCLEX, FIONBIO, TIOCGWINSZ, TIOCSWINSZ}; + #[cfg(any( + target_os = "android", + target_os = "dragonfly", + target_os = "freebsd", + target_os = "linux", + target_os = "macos", + target_os = "netbsd", + target_os = "openbsd" + ))] + #[pyattr] + use host_termios::{ + FIONCLEX, FIONREAD, TIOCEXCL, TIOCM_CAR, TIOCM_CD, TIOCM_CTS, TIOCM_DSR, TIOCM_DTR, + TIOCM_LE, TIOCM_RI, TIOCM_RNG, TIOCM_RTS, TIOCM_SR, TIOCM_ST, TIOCMBIC, TIOCMBIS, TIOCMGET, + TIOCMSET, TIOCNXCL, TIOCSCTTY, + }; + #[cfg(any(target_os = "android", target_os = "linux"))] + #[pyattr] + use host_termios::{ + IBSHIFT, TCFLSH, TCGETA, TCGETS, TCSBRK, TCSETA, TCSETAF, TCSETAW, TCSETS, TCSETSF, + TCSETSW, TCXONC, TIOCGSERIAL, TIOCGSOFTCAR, TIOCINQ, TIOCLINUX, TIOCSSOFTCAR, XTABS, + }; #[cfg(any( target_os = "android", target_os = "freebsd", @@ -109,47 +144,6 @@ mod termios { ))] #[pyattr] use host_termios::{TAB0, TABDLY}; - #[cfg(any(target_os = "android", target_os = "linux"))] - #[pyattr] - use host_termios::{VSWTC, VSWTC as VSWTCH}; - #[cfg(any(target_os = "illumos", target_os = "solaris"))] - #[pyattr] - use host_termios::{VSWTCH, VSWTCH as VSWTC}; - #[cfg(any(target_os = "illumos", target_os = "solaris"))] - #[pyattr] - use libc::{CSTART, CSTOP, CSWTCH}; - #[cfg(any( - target_os = "dragonfly", - target_os = "freebsd", - target_os = "macos", - target_os = "netbsd", - target_os = "openbsd" - ))] - #[pyattr] - use libc::{FIOASYNC, TIOCGETD, TIOCSETD}; - #[pyattr] - use libc::{FIOCLEX, FIONBIO, TIOCGWINSZ, TIOCSWINSZ}; - #[cfg(any( - target_os = "android", - target_os = "dragonfly", - target_os = "freebsd", - target_os = "linux", - target_os = "macos", - target_os = "netbsd", - target_os = "openbsd" - ))] - #[pyattr] - use libc::{ - FIONCLEX, FIONREAD, TIOCEXCL, TIOCM_CAR, TIOCM_CD, TIOCM_CTS, TIOCM_DSR, TIOCM_DTR, - TIOCM_LE, TIOCM_RI, TIOCM_RNG, TIOCM_RTS, TIOCM_SR, TIOCM_ST, TIOCMBIC, TIOCMBIS, TIOCMGET, - TIOCMSET, TIOCNXCL, TIOCSCTTY, - }; - #[cfg(any(target_os = "android", target_os = "linux"))] - #[pyattr] - use libc::{ - IBSHIFT, TCFLSH, TCGETA, TCGETS, TCSBRK, TCSETA, TCSETAF, TCSETAW, TCSETS, TCSETSF, - TCSETSW, TCXONC, TIOCGSERIAL, TIOCGSOFTCAR, TIOCINQ, TIOCLINUX, TIOCSSOFTCAR, XTABS, - }; #[cfg(any( target_os = "android", target_os = "dragonfly", @@ -158,13 +152,19 @@ mod termios { target_os = "macos" ))] #[pyattr] - use libc::{TIOCCONS, TIOCGPGRP, TIOCOUTQ, TIOCSPGRP, TIOCSTI}; + use host_termios::{TIOCCONS, TIOCGPGRP, TIOCOUTQ, TIOCSPGRP, TIOCSTI}; #[cfg(any(target_os = "dragonfly", target_os = "freebsd", target_os = "macos"))] #[pyattr] - use libc::{ + use host_termios::{ TIOCNOTTY, TIOCPKT, TIOCPKT_DATA, TIOCPKT_DOSTOP, TIOCPKT_FLUSHREAD, TIOCPKT_FLUSHWRITE, TIOCPKT_NOSTOP, TIOCPKT_START, TIOCPKT_STOP, }; + #[cfg(any(target_os = "android", target_os = "linux"))] + #[pyattr] + use host_termios::{VSWTC, VSWTC as VSWTCH}; + #[cfg(any(target_os = "illumos", target_os = "solaris"))] + #[pyattr] + use host_termios::{VSWTCH, VSWTCH as VSWTC}; #[pyfunction] fn tcgetattr(fd: PyObjectRef, vm: &VirtualMachine) -> PyResult<Vec<PyObjectRef>> { diff --git a/crates/stdlib/src/uuid.rs b/crates/stdlib/src/uuid.rs index 441216836..10dc95417 100644 --- a/crates/stdlib/src/uuid.rs +++ b/crates/stdlib/src/uuid.rs @@ -3,16 +3,13 @@ pub(crate) use _uuid::module_def; #[pymodule] mod _uuid { use crate::{builtins::PyNone, vm::VirtualMachine}; - use mac_address::get_mac_address; use std::sync::OnceLock; use uuid::{ContextV1, Uuid, timestamp::Timestamp}; fn get_node_id() -> [u8; 6] { - match get_mac_address() { - Ok(Some(_ma)) => get_mac_address().unwrap().unwrap().bytes(), - // os_random is expensive, but this is only ever called once - _ => rustpython_common::rand::os_random::<6>(), - } + // os_random is expensive, but this is only ever called once + rustpython_host_env::socket::mac_address() + .unwrap_or_else(rustpython_common::rand::os_random::<6>) } #[pyfunction] diff --git a/crates/vm/Cargo.toml b/crates/vm/Cargo.toml index f4e59e6ac..0b2feed50 100644 --- a/crates/vm/Cargo.toml +++ b/crates/vm/Cargo.toml @@ -91,8 +91,6 @@ writeable = { workspace = true } exitcode = { workspace = true } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -rustyline = { workspace = true } -which = { workspace = true } widestring = { workspace = true } [target.'cfg(all(target_arch = "wasm32", target_os = "unknown"))'.dependencies] diff --git a/crates/vm/src/getpath.rs b/crates/vm/src/getpath.rs index 634547201..437db3783 100644 --- a/crates/vm/src/getpath.rs +++ b/crates/vm/src/getpath.rs @@ -359,7 +359,7 @@ fn get_executable_path() -> Option<PathBuf> { #[cfg(not(target_arch = "wasm32"))] { let exec_arg = env::args_os().next()?; - which::which(exec_arg).ok() + crate::host_env::fs::which(exec_arg) } #[cfg(target_arch = "wasm32")] { diff --git a/crates/vm/src/lib.rs b/crates/vm/src/lib.rs index cca5b4345..c353f8dfc 100644 --- a/crates/vm/src/lib.rs +++ b/crates/vm/src/lib.rs @@ -86,7 +86,7 @@ pub mod py_io; pub mod py_serde; pub mod gc_state; -pub mod readline; +pub use rustpython_host_env::readline; pub mod recursion; pub mod scope; pub mod sequence; From 10591a4ca3f114492e8c8074f8c07f2e0f349a22 Mon Sep 17 00:00:00 2001 From: Bas Schoenmaeckers <7943856+bschoenmaeckers@users.noreply.github.com> Date: Tue, 7 Jul 2026 18:26:16 +0200 Subject: [PATCH 202/339] Move type c-api functions (#8233) --- crates/capi/src/object.rs | 92 ++----------------------------- crates/capi/src/object/pytype.rs | 95 ++++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+), 86 deletions(-) create mode 100644 crates/capi/src/object/pytype.rs diff --git a/crates/capi/src/object.rs b/crates/capi/src/object.rs index 9a5d2682e..27417a6ad 100644 --- a/crates/capi/src/object.rs +++ b/crates/capi/src/object.rs @@ -1,14 +1,15 @@ use crate::PyObject; use crate::pystate::with_vm; -use core::ffi::{CStr, c_char, c_int, c_uint, c_ulong, c_void}; +use core::ffi::{CStr, c_char, c_int, c_uint, c_void}; use core::ptr::NonNull; -use rustpython_vm::builtins::{PyStr, PyType, object_generic_set_dict, object_get_dict}; +pub use pytype::*; +use rustpython_vm::builtins::{PyStr, object_generic_set_dict, object_get_dict}; use rustpython_vm::bytecode::ComparisonOperator; use rustpython_vm::function::PySetterValue; use rustpython_vm::types::{PyComparisonOp, hash_not_implemented}; -use rustpython_vm::{AsObject, Py, PyPayload, PyResult, VirtualMachine}; +use rustpython_vm::{AsObject, PyPayload, PyResult, VirtualMachine}; -pub type PyTypeObject = Py<PyType>; +mod pytype; macro_rules! define_py_check { (fn $name:ident, $($ctx_path:ident).+) => { @@ -37,69 +38,6 @@ macro_rules! define_py_check { } pub(crate) use define_py_check; -define_py_check!(fn PyType_Check, types.type_type); -define_py_check!(exact fn PyType_CheckExact, types.type_type); - -#[unsafe(no_mangle)] -pub unsafe extern "C" fn Py_TYPE(op: *mut PyObject) -> *const PyTypeObject { - unsafe { (*op).class() } -} - -#[unsafe(no_mangle)] -pub unsafe extern "C" fn Py_IS_TYPE(op: *mut PyObject, ty: *mut PyTypeObject) -> c_int { - with_vm(|_vm| { - let obj = unsafe { &*op }; - let ty = unsafe { &*ty }; - obj.class().is(ty) - }) -} - -#[unsafe(no_mangle)] -pub unsafe extern "C" fn PyType_GetFlags(ptr: *const PyTypeObject) -> c_ulong { - let ty = unsafe { &*ptr }; - ty.slots.flags.bits() as u32 as c_ulong -} - -#[unsafe(no_mangle)] -pub unsafe extern "C" fn PyType_IsSubtype(a: *const PyTypeObject, b: *const PyTypeObject) -> c_int { - with_vm(move |_vm| { - let a = unsafe { &*a }; - let b = unsafe { &*b }; - Ok(a.is_subtype(b)) - }) -} - -#[unsafe(no_mangle)] -pub unsafe extern "C" fn PyType_GetName(ptr: *const PyTypeObject) -> *mut PyObject { - with_vm(|vm| unsafe { &*ptr }.__name__(vm)) -} - -#[unsafe(no_mangle)] -pub unsafe extern "C" fn PyType_GetQualName(ptr: *const PyTypeObject) -> *mut PyObject { - with_vm(|vm| unsafe { &*ptr }.__qualname__(vm)) -} - -#[unsafe(no_mangle)] -pub unsafe extern "C" fn PyType_GetModuleName(ptr: *const PyTypeObject) -> *mut PyObject { - with_vm(|vm| unsafe { &*ptr }.__module__(vm)) -} - -#[unsafe(no_mangle)] -pub unsafe extern "C" fn PyType_GetFullyQualifiedName(ptr: *const PyTypeObject) -> *mut PyObject { - with_vm(|vm| { - let ty = unsafe { &*ptr }; - let qualname = ty.__qualname__(vm).try_downcast::<PyStr>(vm)?; - let module = ty.__module__(vm); - - if let Some(module) = module.downcast_ref::<PyStr>() - && module.as_wtf8() != "builtins" - { - Ok(vm.ctx.new_str(format!("{module}.{qualname}"))) - } else { - Ok(qualname) - } - }) -} #[inline] fn get_constant(vm: &VirtualMachine, constant_id: c_uint) -> PyResult<&PyObject> { @@ -545,7 +483,7 @@ pub unsafe extern "C" fn PyObject_GenericSetDict( mod tests { use pyo3::class::basic::CompareOp; use pyo3::prelude::*; - use pyo3::types::{PyBool, PyDict, PyInt, PyString, PyTypeMethods}; + use pyo3::types::{PyBool, PyDict, PyInt}; #[test] fn is_truthy() { @@ -569,14 +507,6 @@ mod tests { }) } - #[test] - fn type_name() { - Python::attach(|py| { - let string = PyString::new(py, "Hello, World!"); - assert_eq!(string.get_type().name().unwrap().to_str().unwrap(), "str"); - }) - } - #[test] fn repr() { Python::attach(|py| { @@ -654,16 +584,6 @@ mod tests { }) } - #[test] - fn type_get_module_name() { - Python::attach(|py| { - assert_eq!( - py.get_type::<PyInt>().module().unwrap().to_str().unwrap(), - "builtins" - ); - }) - } - #[test] fn generic_get_dict() { Python::attach(|py| { diff --git a/crates/capi/src/object/pytype.rs b/crates/capi/src/object/pytype.rs new file mode 100644 index 000000000..daad7b313 --- /dev/null +++ b/crates/capi/src/object/pytype.rs @@ -0,0 +1,95 @@ +use crate::object::define_py_check; +use crate::pystate::with_vm; +use core::ffi::{c_int, c_ulong}; +use rustpython_vm::builtins::{PyStr, PyType}; +use rustpython_vm::{AsObject, Py, PyObject}; + +pub type PyTypeObject = Py<PyType>; + +define_py_check!(fn PyType_Check, types.type_type); +define_py_check!(exact fn PyType_CheckExact, types.type_type); + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn Py_TYPE(op: *mut PyObject) -> *const PyTypeObject { + unsafe { (*op).class() } +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn Py_IS_TYPE(op: *mut PyObject, ty: *mut PyTypeObject) -> c_int { + with_vm(|_vm| { + let obj = unsafe { &*op }; + let ty = unsafe { &*ty }; + obj.class().is(ty) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyType_GetFlags(ptr: *const PyTypeObject) -> c_ulong { + let ty = unsafe { &*ptr }; + ty.slots.flags.bits() as u32 as c_ulong +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyType_IsSubtype(a: *const PyTypeObject, b: *const PyTypeObject) -> c_int { + with_vm(move |_vm| { + let a = unsafe { &*a }; + let b = unsafe { &*b }; + Ok(a.is_subtype(b)) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyType_GetName(ptr: *const PyTypeObject) -> *mut PyObject { + with_vm(|vm| unsafe { &*ptr }.__name__(vm)) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyType_GetQualName(ptr: *const PyTypeObject) -> *mut PyObject { + with_vm(|vm| unsafe { &*ptr }.__qualname__(vm)) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyType_GetModuleName(ptr: *const PyTypeObject) -> *mut PyObject { + with_vm(|vm| unsafe { &*ptr }.__module__(vm)) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyType_GetFullyQualifiedName(ptr: *const PyTypeObject) -> *mut PyObject { + with_vm(|vm| { + let ty = unsafe { &*ptr }; + let qualname = ty.__qualname__(vm).try_downcast::<PyStr>(vm)?; + let module = ty.__module__(vm); + + if let Some(module) = module.downcast_ref::<PyStr>() + && module.as_wtf8() != "builtins" + { + Ok(vm.ctx.new_str(format!("{module}.{qualname}"))) + } else { + Ok(qualname) + } + }) +} + +#[cfg(test)] +mod tests { + use pyo3::prelude::*; + use pyo3::types::{PyInt, PyString, PyTypeMethods}; + + #[test] + fn type_name() { + Python::attach(|py| { + let string = PyString::new(py, "Hello, World!"); + assert_eq!(string.get_type().name().unwrap().to_str().unwrap(), "str"); + }) + } + + #[test] + fn type_get_module_name() { + Python::attach(|py| { + assert_eq!( + py.get_type::<PyInt>().module().unwrap().to_str().unwrap(), + "builtins" + ); + }) + } +} From d77b80daed100286feaf50330b102ed29d44d320 Mon Sep 17 00:00:00 2001 From: "Jeong, YunWon" <69878+youknowone@users.noreply.github.com> Date: Wed, 8 Jul 2026 10:03:29 +0900 Subject: [PATCH 203/339] Implement round-half-even float.fromhex in common float_ops (#8234) * Add round-half-even hex float parser to common float_ops Add float_ops::from_hex returning Result<f64, HexFloatError>, which parses the coefficient and exponent, rounds round-half-even over the full exponent range, and detects overflow. Route float.fromhex through it: raise OverflowError for values too large to represent and ValueError for invalid input. Remove the expectedFailure on test_from_hex. Assisted-by: Claude * Address review: Option-returning byte helpers, const fns, drop test_ prefix Assisted-by: Claude * Whitelist fdigits and inity in cspell Assisted-by: Claude * Home is_py_ascii_whitespace in rustpython-wtf8; share with common and sre_engine Assisted-by: Claude * Use shared wtf8 is_py_ascii_whitespace in bytes_inner Remove the private copy of is_py_ascii_whitespace in bytes_inner.rs and import the shared rustpython_common::wtf8::is_py_ascii_whitespace. Assisted-by: Claude --- .cspell.json | 2 + Lib/test/test_float.py | 1 - crates/common/src/float_ops.rs | 408 ++++++++++++++++++++++++++++++++ crates/sre_engine/src/string.rs | 6 +- crates/vm/src/builtins/float.rs | 12 +- crates/vm/src/bytes_inner.rs | 5 +- crates/wtf8/src/lib.rs | 7 + 7 files changed, 429 insertions(+), 12 deletions(-) diff --git a/.cspell.json b/.cspell.json index af2f1401d..f173874d4 100644 --- a/.cspell.json +++ b/.cspell.json @@ -66,11 +66,13 @@ "deoptimize", "emscripten", "excs", + "fdigits", "flufl", "fnfe", "fsdefault", "ifexp", "implicits", + "inity", "interps", "jitted", "jitting", diff --git a/Lib/test/test_float.py b/Lib/test/test_float.py index 0938c89cb..a514111c1 100644 --- a/Lib/test/test_float.py +++ b/Lib/test/test_float.py @@ -1262,7 +1262,6 @@ class HexFloatTestCase(FloatsAreIdenticalMixin, unittest.TestCase): self.identical(got, expected) - @unittest.expectedFailure # TODO: RUSTPYTHON; ValueError: invalid hexadecimal floating-point string def test_from_hex(self): MIN = self.MIN MAX = self.MAX diff --git a/crates/common/src/float_ops.rs b/crates/common/src/float_ops.rs index ca1c716a9..4f117e80c 100644 --- a/crates/common/src/float_ops.rs +++ b/crates/common/src/float_ops.rs @@ -279,6 +279,414 @@ pub fn round_float_digits(x: f64, ndigits: i32) -> Option<f64> { Some(result) } +/// Error from [`from_hex`], mapping to the exception the caller should raise. +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +pub enum HexFloatError { + /// ValueError "invalid hexadecimal floating-point string" + Invalid, + /// ValueError "hexadecimal string too long to convert" + TooLong, + /// OverflowError "hexadecimal value too large to represent as a float" + Overflow, +} + +const DBL_MANT_DIG: i64 = 53; +const DBL_MIN_EXP: i64 = -1021; +const DBL_MAX_EXP: i64 = 1024; + +/// Read byte at `i`, returning `None` past the end so that digit/sign/space +/// scans stop at the string boundary. +#[inline] +fn byte_at(bytes: &[u8], i: usize) -> Option<u8> { + bytes.get(i).copied() +} + +/// '0'-'9' -> 0..9, 'a'-'f'/'A'-'F' -> 10..15, else `None`. +#[inline] +const fn hex_from_char(c: u8) -> Option<u8> { + match c { + b'0'..=b'9' => Some(c - b'0'), + b'a'..=b'f' => Some(c - b'a' + 10), + b'A'..=b'F' => Some(c - b'A' + 10), + _ => None, + } +} + +/// Peek at byte `i` and decode it as a hex digit, or `None` if it is out of +/// range or not a hex digit. +#[inline] +fn hex_digit_at(bytes: &[u8], i: usize) -> Option<u8> { + byte_at(bytes, i).and_then(hex_from_char) +} + +/// `t` must be an ASCII-lowercase literal. Returns true if every byte of `t` +/// matched case-insensitively starting at `s`. +fn case_insensitive_match(bytes: &[u8], s: usize, t: &[u8]) -> bool { + let mut si = s; + let mut ti = 0; + while ti < t.len() && byte_at(bytes, si).is_some_and(|b| b.to_ascii_lowercase() == t[ti]) { + si += 1; + ti += 1; + } + ti == t.len() +} + +/// Returns `Some((value, endptr))` when the text at `p` parses as inf/nan, +/// otherwise `None`. +fn parse_inf_or_nan(bytes: &[u8], p: usize) -> Option<(f64, usize)> { + let mut s = p; + let mut negate = false; + if byte_at(bytes, s) == Some(b'-') { + negate = true; + s += 1; + } else if byte_at(bytes, s) == Some(b'+') { + s += 1; + } + if case_insensitive_match(bytes, s, b"inf") { + s += 3; + if case_insensitive_match(bytes, s, b"inity") { + s += 5; + } + let value = if negate { + f64::NEG_INFINITY + } else { + f64::INFINITY + }; + Some((value, s)) + } else if case_insensitive_match(bytes, s, b"nan") { + s += 3; + let value = if negate { + f64::from_bits(0xfff8_0000_0000_0000) + } else { + f64::from_bits(0x7ff8_0000_0000_0000) + }; + Some((value, s)) + } else { + None + } +} + +/// Correctly-rounded scalbn. Every call site scales an already-representable +/// value, so the result is exact. +const fn ldexp(x: f64, mut n: i32) -> f64 { + let x1p1023 = f64::from_bits(0x7fe0000000000000); + let x1p53 = f64::from_bits(0x4340000000000000); + let x1p_1022 = f64::from_bits(0x0010000000000000); + let mut y = x; + if n > 1023 { + y *= x1p1023; + n -= 1023; + if n > 1023 { + y *= x1p1023; + n -= 1023; + if n > 1023 { + n = 1023; + } + } + } else if n < -1022 { + y *= x1p_1022 * x1p53; + n += 1022 - 53; + if n < -1022 { + y *= x1p_1022 * x1p53; + n += 1022 - 53; + if n < -1022 { + n = -1022; + } + } + } + y * f64::from_bits(((0x3ff + n) as u64) << 52) +} + +/// Parse the already-validated `[+-]?[0-9]+` slice `bytes[start..end]` as base-10 +/// signed, saturating to i64::MIN/MAX on overflow like strtol. +fn strtol_saturating(bytes: &[u8], start: usize, end: usize) -> i64 { + let mut i = start; + let mut neg = false; + if i < end && (bytes[i] == b'+' || bytes[i] == b'-') { + neg = bytes[i] == b'-'; + i += 1; + } + let mut val: i64 = 0; + let mut overflowed = false; + while i < end { + let d = (bytes[i] - b'0') as i64; + match val.checked_mul(10).and_then(|v| v.checked_add(d)) { + Some(v) => val = v, + None => { + overflowed = true; + break; + } + } + i += 1; + } + if overflowed { + if neg { i64::MIN } else { i64::MAX } + } else if neg { + -val + } else { + val + } +} + +/// Parse a hexadecimal floating-point string (the `float.fromhex` grammar). +/// +/// The raw string is consumed as-is: leading and trailing whitespace are handled +/// internally using the ASCII space set, so callers must not trim first. +pub fn from_hex(s: &str) -> Result<f64, HexFloatError> { + let bytes = s.as_bytes(); + let s_end = bytes.len(); + + let mut negate = false; + let mut idx = 0usize; + let mut x; + + // leading whitespace + while byte_at(bytes, idx).is_some_and(rustpython_wtf8::is_py_ascii_whitespace) { + idx += 1; + } + + // infinities and nans + if let Some((value, end)) = parse_inf_or_nan(bytes, idx) { + idx = end; + return finish_hex(bytes, s_end, idx, negate, value); + } + + // optional sign + if byte_at(bytes, idx) == Some(b'-') { + idx += 1; + negate = true; + } else if byte_at(bytes, idx) == Some(b'+') { + idx += 1; + } + + // [0x] + let s_store = idx; + if byte_at(bytes, idx) == Some(b'0') { + idx += 1; + if matches!(byte_at(bytes, idx), Some(b'x' | b'X')) { + idx += 1; + } else { + idx = s_store; + } + } + + // coefficient: <integer> [. <fraction>] + let coeff_start = idx; + while hex_digit_at(bytes, idx).is_some() { + idx += 1; + } + let s_store = idx; + let coeff_end = if byte_at(bytes, idx) == Some(b'.') { + idx += 1; + while hex_digit_at(bytes, idx).is_some() { + idx += 1; + } + idx - 1 + } else { + idx + }; + + // ndigits = total # of hex digits; fdigits = # after point + let ndigits_total = (coeff_end - coeff_start) as i64; + let fdigits = (coeff_end - s_store) as i64; + if ndigits_total == 0 { + return Err(HexFloatError::Invalid); + } + let insane_bound = core::cmp::min( + DBL_MIN_EXP - DBL_MANT_DIG - i64::MIN / 2, + i64::MAX / 2 + 1 - DBL_MAX_EXP, + ) / 4; + if ndigits_total > insane_bound { + return Err(HexFloatError::TooLong); + } + + // [p <exponent>] + let exp = if matches!(byte_at(bytes, idx), Some(b'p' | b'P')) { + idx += 1; + let exp_start = idx; + if matches!(byte_at(bytes, idx), Some(b'-' | b'+')) { + idx += 1; + } + if !matches!(byte_at(bytes, idx), Some(b'0'..=b'9')) { + return Err(HexFloatError::Invalid); + } + idx += 1; + while matches!(byte_at(bytes, idx), Some(b'0'..=b'9')) { + idx += 1; + } + strtol_saturating(bytes, exp_start, idx) + } else { + 0 + }; + + // HEX_DIGIT(j): jth hex digit counting from the least significant. + let hex_digit = |j: i64| -> i32 { + let byte_idx = if j < fdigits { + coeff_end as i64 - j + } else { + coeff_end as i64 - 1 - j + }; + hex_digit_at(bytes, byte_idx as usize).expect("hex digit within coefficient") as i32 + }; + + // Discard leading zeros, and catch extreme overflow and underflow. + let mut ndigits = ndigits_total; + while ndigits > 0 && hex_digit(ndigits - 1) == 0 { + ndigits -= 1; + } + if ndigits == 0 || exp < i64::MIN / 2 { + x = 0.0; + return finish_hex(bytes, s_end, idx, negate, x); + } + if exp > i64::MAX / 2 { + return Err(HexFloatError::Overflow); + } + + // Adjust exponent for fractional part. + let exp = exp - 4 * fdigits; + + // top_exp = 1 more than exponent of most significant bit of coefficient. + let mut top_exp = exp + 4 * (ndigits - 1); + let mut digit = hex_digit(ndigits - 1); + while digit != 0 { + top_exp += 1; + digit /= 2; + } + + // catch almost all nonextreme cases of overflow and underflow here + if top_exp < DBL_MIN_EXP - DBL_MANT_DIG { + x = 0.0; + return finish_hex(bytes, s_end, idx, negate, x); + } + if top_exp > DBL_MAX_EXP { + return Err(HexFloatError::Overflow); + } + + // lsb = exponent of least significant bit of the rounded value. + let lsb = core::cmp::max(top_exp, DBL_MIN_EXP) - DBL_MANT_DIG; + + x = 0.0; + if exp >= lsb { + // no rounding required + let mut i = ndigits - 1; + while i >= 0 { + x = 16.0 * x + hex_digit(i) as f64; + i -= 1; + } + x = ldexp(x, exp as i32); + return finish_hex(bytes, s_end, idx, negate, x); + } + + // rounding required. key_digit is the index of the hex digit + // containing the first bit to be rounded away. + let half_eps: i32 = 1 << ((lsb - exp - 1) % 4) as i32; + let key_digit = (lsb - exp - 1) / 4; + let mut i = ndigits - 1; + while i > key_digit { + x = 16.0 * x + hex_digit(i) as f64; + i -= 1; + } + let digit = hex_digit(key_digit); + x = 16.0 * x + (digit & (16 - 2 * half_eps)) as f64; + + // round-half-even + if (digit & half_eps) != 0 { + let round_up = if (digit & (3 * half_eps - 1)) != 0 + || (half_eps == 8 && key_digit + 1 < ndigits && (hex_digit(key_digit + 1) & 1) != 0) + { + true + } else { + let mut r = false; + let mut i = key_digit - 1; + while i >= 0 { + if hex_digit(i) != 0 { + r = true; + break; + } + i -= 1; + } + r + }; + if round_up { + x += (2 * half_eps) as f64; + if top_exp == DBL_MAX_EXP && x == ldexp((2 * half_eps) as f64, DBL_MANT_DIG as i32) { + // overflow corner case + return Err(HexFloatError::Overflow); + } + } + } + x = ldexp(x, (exp + 4 * key_digit) as i32); + + finish_hex(bytes, s_end, idx, negate, x) +} + +/// Skip trailing whitespace, require the whole string was consumed, and apply +/// the sign. +fn finish_hex( + bytes: &[u8], + s_end: usize, + mut idx: usize, + negate: bool, + x: f64, +) -> Result<f64, HexFloatError> { + while byte_at(bytes, idx).is_some_and(rustpython_wtf8::is_py_ascii_whitespace) { + idx += 1; + } + if idx != s_end { + return Err(HexFloatError::Invalid); + } + Ok(if negate { -x } else { x }) +} + +#[cfg(test)] +mod from_hex_tests { + use super::{HexFloatError, from_hex}; + + fn bits(s: &str) -> u64 { + from_hex(s).unwrap().to_bits() + } + + #[test] + fn from_hex_exact_bits() { + assert_eq!(bits("0x1p-1074"), 0x0000000000000001); + assert_eq!(bits("0x1.fffffffffffffp+1023"), 0x7fefffffffffffff); + // round-half-even ties + assert_eq!(bits("0x1.00000000000008p0"), 0x3ff0000000000000); + assert_eq!(bits("0x1.00000000000018p0"), 0x3ff0000000000002); + assert_eq!(bits("-0x1p0"), 0xbff0000000000000); + assert_eq!(bits("0x0p0"), 0x0000000000000000); + assert_eq!(bits("-0x0p0"), 0x8000000000000000); + } + + #[test] + fn from_hex_inf_nan() { + assert_eq!(bits("inf"), 0x7ff0000000000000); + assert_eq!(bits("-inf"), 0xfff0000000000000); + assert_eq!(bits("Infinity"), 0x7ff0000000000000); + + let n = from_hex("nan").unwrap(); + assert!(n.is_nan()); + assert_eq!(n.to_bits(), 0x7ff8000000000000); + let neg = from_hex("-nan").unwrap(); + assert!(neg.is_nan()); + assert_eq!(neg.to_bits(), 0xfff8000000000000); + } + + #[test] + fn from_hex_whitespace() { + assert_eq!(bits(" 0x1p0 "), 0x3ff0000000000000); + assert_eq!(bits("\t0x1p0\n"), 0x3ff0000000000000); + } + + #[test] + fn from_hex_errors() { + assert_eq!(from_hex("0x1p1024"), Err(HexFloatError::Overflow)); + assert_eq!(from_hex("0x1z"), Err(HexFloatError::Invalid)); + assert_eq!(from_hex(""), Err(HexFloatError::Invalid)); + assert_eq!(from_hex("0x1 p0"), Err(HexFloatError::Invalid)); + } +} + #[cfg(test)] mod tests { use super::*; diff --git a/crates/sre_engine/src/string.rs b/crates/sre_engine/src/string.rs index 6468c6d0c..5deeab67e 100644 --- a/crates/sre_engine/src/string.rs +++ b/crates/sre_engine/src/string.rs @@ -341,10 +341,6 @@ const CONT_MASK: u8 = 0b0011_1111; const UNDERSCORE: u32 = '_' as u32; -const fn is_py_ascii_whitespace(b: u8) -> bool { - matches!(b, b'\t' | b'\n' | b'\x0C' | b'\r' | b' ' | b'\x0B') -} - #[inline] pub(crate) fn is_word(ch: u32) -> bool { ch == UNDERSCORE || u8::try_from(ch).is_ok_and(|x| x.is_ascii_alphanumeric()) @@ -352,7 +348,7 @@ pub(crate) fn is_word(ch: u32) -> bool { #[inline] pub(crate) fn is_space(ch: u32) -> bool { - u8::try_from(ch).is_ok_and(is_py_ascii_whitespace) + u8::try_from(ch).is_ok_and(rustpython_wtf8::is_py_ascii_whitespace) } #[inline] diff --git a/crates/vm/src/builtins/float.rs b/crates/vm/src/builtins/float.rs index 36846640e..1c861b14f 100644 --- a/crates/vm/src/builtins/float.rs +++ b/crates/vm/src/builtins/float.rs @@ -399,8 +399,16 @@ impl PyFloat { #[pyclassmethod] fn fromhex(cls: PyTypeRef, string: PyUtf8StrRef, vm: &VirtualMachine) -> PyResult { - let result = crate::literal::float::from_hex(string.as_str().trim()) - .ok_or_else(|| vm.new_value_error("invalid hexadecimal floating-point string"))?; + use float_ops::HexFloatError; + let result = float_ops::from_hex(string.as_str()).map_err(|e| match e { + HexFloatError::Overflow => { + vm.new_overflow_error("hexadecimal value too large to represent as a float") + } + HexFloatError::TooLong => vm.new_value_error("hexadecimal string too long to convert"), + HexFloatError::Invalid => { + vm.new_value_error("invalid hexadecimal floating-point string") + } + })?; PyType::call(&cls, vec![vm.ctx.new_float(result).into()].into(), vm) } diff --git a/crates/vm/src/bytes_inner.rs b/crates/vm/src/bytes_inner.rs index 08518deb1..9cfe4d760 100644 --- a/crates/vm/src/bytes_inner.rs +++ b/crates/vm/src/bytes_inner.rs @@ -9,6 +9,7 @@ use crate::{ byte::bytes_from_object, cformat::cformat_bytes, common::hash, + common::wtf8::is_py_ascii_whitespace, function::{ArgIterable, Either, OptionalArg, OptionalOption, PyComparisonValue}, literal::escape::Escape, protocol::PyBuffer, @@ -1207,10 +1208,6 @@ pub(crate) fn bytes_to_hex( } } -pub(crate) const fn is_py_ascii_whitespace(b: u8) -> bool { - matches!(b, b'\t' | b'\n' | b'\x0C' | b'\r' | b' ' | b'\x0B') -} - /// ASCII-only title casing. /// /// This is purposely naive as is CPython's implementation. diff --git a/crates/wtf8/src/lib.rs b/crates/wtf8/src/lib.rs index b31ed1cf0..2167b6b04 100644 --- a/crates/wtf8/src/lib.rs +++ b/crates/wtf8/src/lib.rs @@ -1347,6 +1347,13 @@ pub fn slice_error_fail(s: &Wtf8, begin: usize, end: usize) -> ! { panic!("index {begin} and/or {end} in `{s:?}` do not lie on character boundary"); } +/// True for the ASCII bytes Python treats as whitespace in numeric parsing +/// (`\t \n \x0b \x0c \r` and space). +#[must_use] +pub const fn is_py_ascii_whitespace(b: u8) -> bool { + matches!(b, b'\t' | b'\n' | b'\x0b' | b'\x0c' | b'\r' | b' ') +} + /// Iterator for the code points of a WTF-8 string. /// /// Created with the method `.code_points()`. From f26d01303281823bfd074d154c1fb51bb073302d Mon Sep 17 00:00:00 2001 From: "Jeong, YunWon" <69878+youknowone@users.noreply.github.com> Date: Wed, 8 Jul 2026 12:42:10 +0900 Subject: [PATCH 204/339] ctypes: unify the foreign-call path on a single host_env `call()` API (#8235) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * host_env: add unified high-level `call` foreign-call API Add a libffi-hiding foreign-call entry point that takes ctypes type codes and recursive layouts plus raw buffers instead of libffi `Type`/`Arg`, to become the single call path for the VM `_ctypes` (a later change) and other consumers. Also bring in the `callproc_simple` helper so this host_env copy stays byte-identical to the pyre-dev copy during the migration. - `CTypeLayout` (Simple/Pointer/Struct/Union/Array/Opaque) with `size()` and an internal libffi-type lowering built on `ffi_type_for_layout`. - `CallArg` (Typed/Int/Double/Pointer/Aggregate), `CallRet` (Void/Code/Pointer/Aggregate), `CallOptions` (use_errno/use_last_error), `CallValue` (Void/Scalar/Pointer/Aggregate), and `CallError`. - `call(addr, &[CallArg], CallRet, CallOptions) -> Result<CallValue, CallError>`, built on the existing `Cif`/`ffi_*` primitives: the errno / last-error swap wraps only the raw call, and by-value aggregate arguments and returns go through `Cif::call_return_into`. - 16 ABI unit tests over local `extern "C"` functions: scalar parity, by-value struct / nested / array-in-struct / {f32,f32} / large-struct arguments, small / odd / large struct returns, union size, the errno window, and the null-pointer / unknown-code / short-buffer errors. `callproc` and `callproc_simple` are left in place; both are removed once the migration onto `call` completes. Assisted-by: Claude * _ctypes: route the VM call path through host_env call() Replace the VM's direct libffi `Type`/`Arg` marshalling with the unified host_env `call` entry point. Behavior is preserved on the tested paths: structs and unions still pass by pointer and struct returns still use the register-size approximation (passing/returning aggregates by value is a later change). - base.rs: `FfiArgValue` → `CArgValue` (Typed{code,bytes}/Int/Double/Pointer) with `as_call_arg()`; the paramfunc producers emit `CArgValue`, snapshotting buffer bytes at conversion time so no lock is held across the call. - _ctypes.rs: `CArgObject` carries `value: CArgValue` plus a `keep` slot for the from_param z/Z/P null-terminated-copy keepalive that no longer rides in the value; `PyCArg` repr reconstructs the scalar for identical output; byref updated. - simple.rs: `to_ffi_value` → `to_carg_value`; from_param emits `CArgValue` and its keepalive. - function.rs: `Argument{value, keep}`; `ArgumentType` yields a `CArgValue` (with the "unsupported argument type" check moved up front); `CallInfo`'s return fields collapse to `RetSpec` (Void/Pointer/Code) reproducing the exact return type and result dispatch; `ctypes_callproc` builds `CallArg`/`CallRet`/ `CallOptions` and invokes `host_env::ctypes::call`; the errno/last-error swap moves into `CallOptions` (the `with_swapped_*` wrappers are removed); `convert_raw_result` consumes `CallValue`. - extra_tests/snippets/stdlib_ctypes_calls.py: libc calls over the live FFI path (abs/strlen/sqrt, c_char_p/c_void_p returns, a use_errno round-trip); output matches CPython. Two intentional deltas: a NULL function pointer now raises ValueError instead of a debug assertion, and a c_char passed positionally without argtypes now zero-extends via its type code rather than sign-extends via the old tag path, which also makes it agree with the with-argtypes path. The old host_env `callproc`/`ffi_*` and `StgInfo`'s libffi field types remain for now; they are removed when by-value aggregates land. Assisted-by: Claude * _ctypes: pass and return structs and unions by value Flip aggregate arguments and returns from the pointer / register-size approximation to true by-value passing through the host_env `call` entry point, and carry the driving layouts as host_env `CTypeLayout`. - base.rs: `StgInfo.ffi_field_types: Vec<FfiType>` becomes `field_layouts: Vec<CTypeLayout>`, still built incrementally from the base class so struct inheritance is reflected. `StgInfo::to_ffi_type()` is replaced by a `type_layout(ty, &stg, vm)` helper that reads a type's own layout (aggregates from `field_layouts`, arrays recurse into the element type, simple types from their `_type_` code); it takes the already-borrowed `StgInfo` so it never re-locks the type. `CArgValue` gains an `Aggregate { layout, bytes }` variant lowering to `CallArg::Aggregate`, and `struct_union_paramfunc` snapshots the instance bytes into it (tag 'V'). - structure.rs / union.rs: collect each field's `type_layout` into `field_layouts` and store it on the finalized `StgInfo`. - function.rs: `convert_object` passes a struct/union argument by value (snapshot bytes + argtype layout); a `byref()` result is still a pointer. `RetSpec` gains `Aggregate(CTypeLayout)`; `compute_ret_spec` returns it for a struct/union restype; `ctypes_callproc` lowers it to `CallRet::Aggregate`. `convert_raw_result` now drops the restype `StgInfo` read guard before constructing the result instance: instance construction write-locks the type's `StgInfo` to finalize it, which otherwise self-deadlocks against the held read guard (latent since the register-size return path, unreachable until a struct was actually returned by value). - _ctypes.rs: a 'V' cparam now reprs as `<cparam 'V' at 0x..>` (the object-address default), matching PyCArg_repr; the aggregate `CArgValue` routes through that arm. - extra_tests/snippets/stdlib_ctypes_byvalue.py: div/imaxdiv struct returns (8- and 16-byte), inet_ntoa struct and union arguments, with and without argtypes; output matches CPython. Also sorts the imports in the sibling stdlib_ctypes_calls.py snippet (ruff isort). `_pack_` / `_swappedbytes_` layouts stay approximate — `CTypeLayout` carries no explicit field offsets, as the previous libffi field-type path did not either. host_env is untouched, so both `ctypes.rs` copies stay byte-identical. test_ctypes is unchanged at run=322 skipped=58. Assisted-by: Claude * host_env: remove the pre-`call` foreign-call scaffolding With the VM `_ctypes` and pyre both routed through `call`, delete the foreign-call paths and libffi-type builders that no longer have a consumer: - `callproc` (the low-level libffi `Vec<Type>` / `&[Arg]` entry) and its `CallResult` return type plus `call_result_bytes`. - `callproc_simple` and its `SimpleArg` / `SimpleRestype` / `SimpleCallError` types (the pointer-only slice added for pyre's first cut), and the `lookup_function_symbol_addr_str` helper, along with their tests. - `ffi_type_for_layout` + `CTypeParamKind`, `ffi_type_from_format`, `ffi_type_from_tag`, and `ffi_type_for_return_size` — the aggregate/simple libffi-type builders the old marshalling used. `call` and `CTypeLayout` build their own libffi types from `ffi_type_from_code` and the small `ffi_{pointer,byte_struct,repeat,void,i32,f64}_type` helpers, which stay. `simple_type_chars` stays (still used by pyre's simple-type validation). The `call` doc no longer references `callproc_simple`. A stale comment in the VM's result decoder that named `call_result_bytes` is reworded. host_env drops from 4051 to 3535 lines; the `call` ABI unit tests remain (24 tests). test_ctypes is unchanged at run=322 skipped=58. Assisted-by: Claude * host_env: read `call` scalar returns as a full register, use `add_i32` `call` read `Code` returns through `low::ffi_arg`. The `libffi_sys` binding types `ffi_arg` as `c_ulong`, which is 4 bytes under LLP64 (Windows x64), so `low::call` truncated 8-byte returns (`q`/`Q`/`d`) to the low 4 bytes. `calls_f64_scalar` and `passes_large_struct_by_value` failed on windows-2025. Read a full register (`u64`) instead; `decode_type_code` still slices the leading bytes each type code needs. No change on LP64, where `ffi_arg` is already 8 bytes. Add `typed_two_scalar_args`, which calls the previously-unused `add_i32` ABI helper (two-argument scalar path); the helper tripped `-D warnings` dead-code on clippy. Assisted-by: Claude * _ctypes: skip the by-value snippet on Windows `stdlib_ctypes_byvalue.py` reaches libc through `CDLL(None)` and calls `div`/`imaxdiv`/`inet_ntoa`, none of which resolve that way on Windows, so the snippet aborted on windows-2025. Guard it like `stdlib_ctypes_calls.py`: print "OK" and exit before touching `CDLL`. The by-value path is covered on Windows by test_ctypes. Assisted-by: Claude * _ctypes: keep the converted argument alive for by-value aggregates The by-value struct/union argument path snapshotted the instance bytes and returned `None` for the keep-alive slot, dropping the `from_param` result before the foreign call. When the snapshot embeds pointers into buffers owned by that object's keep-alive set, the call could read freed memory. Return the converted instance as the keep-alive owner. Assisted-by: Claude * host_env: avoid indexing an empty by-value aggregate buffer in `call` A zero-sized `Structure`/`Union` argument reaches the aggregate lowering with `layout.size() == 0` and an empty buffer, which passed the `buffer.len() < expected` check and then panicked on `&buffer[0]`. Use `buffer.first().unwrap_or(&0u8)`; libffi reads nothing for a zero-size type. Assisted-by: Claude --- crates/host_env/src/ctypes.rs | 1271 ++++++++++++++--- crates/vm/src/stdlib/_ctypes.rs | 91 +- crates/vm/src/stdlib/_ctypes/base.rs | 187 ++- crates/vm/src/stdlib/_ctypes/function.rs | 530 +++---- crates/vm/src/stdlib/_ctypes/simple.rs | 41 +- crates/vm/src/stdlib/_ctypes/structure.rs | 14 +- crates/vm/src/stdlib/_ctypes/union.rs | 14 +- extra_tests/snippets/stdlib_ctypes_byvalue.py | 106 ++ extra_tests/snippets/stdlib_ctypes_calls.py | 64 + 9 files changed, 1694 insertions(+), 624 deletions(-) create mode 100644 extra_tests/snippets/stdlib_ctypes_byvalue.py create mode 100644 extra_tests/snippets/stdlib_ctypes_calls.py diff --git a/crates/host_env/src/ctypes.rs b/crates/host_env/src/ctypes.rs index 9bfd41c28..2dfc8cbe2 100644 --- a/crates/host_env/src/ctypes.rs +++ b/crates/host_env/src/ctypes.rs @@ -24,7 +24,7 @@ use libffi::middle::Type; ))] use libffi::{ low, - middle::{Arg, Cif, Closure, CodePtr}, + middle::{Arg, Cif, Closure, CodePtr, Ret}, }; #[cfg(any(unix, windows))] use libloading::Library; @@ -652,21 +652,6 @@ pub enum FfiValue { Pointer(usize), } -#[cfg(all( - any( - target_os = "linux", - target_os = "macos", - target_os = "windows", - target_os = "android" - ), - not(any(target_env = "musl", target_env = "sgx")) -))] -pub enum CallResult { - Void, - Pointer(usize), - Value(low::ffi_arg), -} - #[cfg(all( any( target_os = "linux", @@ -1537,78 +1522,6 @@ pub fn ffi_type_from_code(ty: &str) -> Option<Type> { } } -#[cfg(all( - any( - target_os = "linux", - target_os = "macos", - target_os = "windows", - target_os = "android" - ), - not(any(target_env = "musl", target_env = "sgx")) -))] -pub fn ffi_type_from_tag(tag: u8) -> Type { - match tag { - b'c' | b'b' => Type::i8(), - b'B' | b'?' => Type::u8(), - b'h' | b'v' => Type::i16(), - b'H' => Type::u16(), - b'i' => Type::i32(), - b'I' => Type::u32(), - b'l' => { - if core::mem::size_of::<c_long>() == 8 { - Type::i64() - } else { - Type::i32() - } - } - b'L' => { - if core::mem::size_of::<c_ulong>() == 8 { - Type::u64() - } else { - Type::u32() - } - } - b'q' => Type::i64(), - b'Q' => Type::u64(), - b'f' => Type::f32(), - b'd' | b'g' => Type::f64(), - b'u' => { - if core::mem::size_of::<WChar>() == 2 { - Type::u16() - } else { - Type::u32() - } - } - _ => Type::pointer(), - } -} - -#[cfg(all( - any( - target_os = "linux", - target_os = "macos", - target_os = "windows", - target_os = "android" - ), - not(any(target_env = "musl", target_env = "sgx")) -))] -pub fn ffi_type_from_format(fmt: &str) -> Type { - match fmt.trim_start_matches(['<', '>', '!', '@', '=']) { - "b" => Type::i8(), - "B" => Type::u8(), - "h" => Type::i16(), - "H" => Type::u16(), - "i" | "l" => Type::i32(), - "I" | "L" => Type::u32(), - "q" => Type::i64(), - "Q" => Type::u64(), - "f" => Type::f32(), - "d" => Type::f64(), - "P" | "z" | "Z" | "O" => Type::pointer(), - _ => Type::u8(), - } -} - #[cfg(all( any( target_os = "linux", @@ -1687,119 +1600,6 @@ pub fn ffi_void_type() -> Type { Type::void() } -#[cfg(all( - any( - target_os = "linux", - target_os = "macos", - target_os = "windows", - target_os = "android" - ), - not(any(target_env = "musl", target_env = "sgx")) -))] -pub fn ffi_type_for_return_size(size: usize) -> Type { - if size <= 4 { - Type::i32() - } else if size <= 8 { - Type::i64() - } else { - Type::pointer() - } -} - -#[cfg(all( - any( - target_os = "linux", - target_os = "macos", - target_os = "windows", - target_os = "android" - ), - not(any(target_env = "musl", target_env = "sgx")) -))] -#[derive(Debug, Clone, Copy, PartialEq, Eq)] -pub enum CTypeParamKind { - Structure, - Union, - Array, - Pointer, - Simple, -} - -#[cfg(all( - any( - target_os = "linux", - target_os = "macos", - target_os = "windows", - target_os = "android" - ), - not(any(target_env = "musl", target_env = "sgx")) -))] -pub fn ffi_type_for_layout( - kind: CTypeParamKind, - ffi_field_types: &[Type], - size: usize, - length: usize, - format: Option<&str>, -) -> Type { - const MAX_FFI_STRUCT_SIZE: usize = 1024 * 1024; - - match kind { - CTypeParamKind::Structure | CTypeParamKind::Union => { - if !ffi_field_types.is_empty() { - Type::structure(ffi_field_types.iter().cloned()) - } else if size <= MAX_FFI_STRUCT_SIZE { - ffi_byte_struct(size) - } else { - ffi_pointer_type() - } - } - CTypeParamKind::Array => { - if size > MAX_FFI_STRUCT_SIZE || length > MAX_FFI_STRUCT_SIZE { - ffi_pointer_type() - } else if let Some(fmt) = format { - ffi_repeat_type(ffi_type_from_format(fmt), length) - } else { - ffi_byte_struct(size) - } - } - CTypeParamKind::Pointer => ffi_pointer_type(), - CTypeParamKind::Simple => { - if let Some(fmt) = format { - ffi_type_from_format(fmt) - } else { - Type::u8() - } - } - } -} - -#[cfg(all( - any( - target_os = "linux", - target_os = "macos", - target_os = "windows", - target_os = "android" - ), - not(any(target_env = "musl", target_env = "sgx")) -))] -pub fn callproc( - code_ptr: CodePtr, - ffi_arg_types: Vec<Type>, - ffi_return_type: Type, - ffi_args: &[Arg<'_>], - restype_is_none: bool, - is_pointer_return: bool, -) -> CallResult { - let cif = Cif::new(ffi_arg_types, ffi_return_type); - if restype_is_none { - unsafe { cif.call::<()>(code_ptr, ffi_args) }; - CallResult::Void - } else if is_pointer_return { - CallResult::Pointer(unsafe { cif.call::<usize>(code_ptr, ffi_args) }) - } else { - CallResult::Value(unsafe { cif.call::<low::ffi_arg>(code_ptr, ffi_args) }) - } -} - #[cfg(all( any( target_os = "linux", @@ -2052,6 +1852,32 @@ impl<U: 'static> Drop for CallbackThunk<U> { } } +/// Type codes whose value is a pointer (drives pointer-return decoding and +/// TYPEFLAG_ISPOINTER). +pub fn simple_type_is_pointer(code: &str) -> bool { + matches!(code, "z" | "Z" | "P" | "s" | "X" | "O") +} + +/// All valid ctypes simple type codes on this platform. +// +// TODO: the vm's `SIMPLE_TYPE_CHARS` const (crates/vm/src/stdlib/_ctypes/simple.rs) +// should adopt this as the single source of truth. +pub fn simple_type_chars() -> &'static str { + #[cfg(windows)] + { + // spell-checker: disable-next-line + "cbBhHiIlLdfuzZqQPXOv?g" + } + #[cfg(not(windows))] + { + // spell-checker: disable-next-line + "cbBhHiIlLdfuzZqQPOv?g" + } +} + +/// Recursive layout of a ctypes type: memory shape independent of any object +/// model, used to lower by-value aggregate arguments and aggregate returns for +/// [`call`]. #[cfg(all( any( target_os = "linux", @@ -2061,18 +1887,354 @@ impl<U: 'static> Drop for CallbackThunk<U> { ), not(any(target_env = "musl", target_env = "sgx")) ))] -pub fn call_result_bytes(raw_result: &CallResult) -> Option<(Vec<u8>, usize)> { - match raw_result { - CallResult::Void => None, - CallResult::Pointer(ptr) => { - let bytes = ptr.to_ne_bytes(); - Some((bytes.to_vec(), core::mem::size_of::<usize>())) - } - CallResult::Value(val) => { - let bytes = val.to_ne_bytes(); - Some((bytes.to_vec(), core::mem::size_of_val(val))) +#[derive(Debug, Clone, PartialEq, Eq)] +pub enum CTypeLayout { + /// Simple type identified by its ctypes code ('i', 'd', 'P', 'u', ...). + Simple(char), + /// Any pointer-kind field (`POINTER(T)`, `c_void_p`/`z`/`Z`, function pointer). + Pointer, + /// Struct with per-field layouts in declaration order; `size` is the total + /// size including trailing padding. + Struct { fields: Vec<Self>, size: usize }, + /// Union, lowered to a size-matched byte struct (libffi has no union kind, so + /// register classification of float-only unions is approximate). + Union { fields: Vec<Self>, size: usize }, + /// Fixed-length array; only meaningful nested inside an aggregate. + Array { + element: Box<Self>, + length: usize, + size: usize, + }, + /// No field information available: a size-matched byte struct fallback. + Opaque { size: usize }, +} + +#[cfg(all( + any( + target_os = "linux", + target_os = "macos", + target_os = "windows", + target_os = "android" + ), + not(any(target_env = "musl", target_env = "sgx")) +))] +impl CTypeLayout { + /// Total size in bytes. + pub fn size(&self) -> usize { + match self { + Self::Simple(code) => { + let mut buf = [0u8; 4]; + simple_type_size(code.encode_utf8(&mut buf)).unwrap_or(0) + } + Self::Pointer => POINTER_SIZE, + Self::Struct { size, .. } + | Self::Union { size, .. } + | Self::Array { size, .. } + | Self::Opaque { size } => *size, } } + + /// Lower to a libffi type. `Err` if a simple code is unrecognized. + fn to_ffi_type(&self) -> Result<Type, CallError> { + match self { + Self::Simple(code) => { + let mut buf = [0u8; 4]; + let code = code.encode_utf8(&mut buf); + ffi_type_from_code(code).ok_or_else(|| CallError::UnknownTypeCode(code.to_string())) + } + Self::Pointer => Ok(ffi_pointer_type()), + Self::Struct { fields, .. } => { + let mut ffi_fields = Vec::with_capacity(fields.len()); + for field in fields { + ffi_fields.push(field.to_ffi_type()?); + } + Ok(Type::structure(ffi_fields)) + } + Self::Array { + element, length, .. + } => Ok(ffi_repeat_type(element.to_ffi_type()?, *length)), + Self::Union { size, .. } | Self::Opaque { size } => Ok(ffi_byte_struct(*size)), + } + } +} + +/// One argument of a foreign call. Buffers are borrowed and must outlive the +/// call; keeping their owners alive is the caller's responsibility. +#[cfg(all( + any( + target_os = "linux", + target_os = "macos", + target_os = "windows", + target_os = "android" + ), + not(any(target_env = "musl", target_env = "sgx")) +))] +#[derive(Debug, Clone, Copy)] +pub enum CallArg<'a> { + /// A value typed by a ctypes simple type code, as its raw native-endian + /// buffer (at least `simple_type_size(code)` bytes relevant). + Typed { code: &'a str, buffer: &'a [u8] }, + /// Untyped Python int (ConvParam default: C int). + Int(i32), + /// Untyped Python float (ConvParam default: C double). + Double(f64), + /// Address-valued argument (pointer decay, byref, bytes/str copies, NULL = 0). + Pointer(usize), + /// By-value aggregate: layout plus its raw bytes (`buffer.len() >= layout.size()`). + Aggregate { + layout: &'a CTypeLayout, + buffer: &'a [u8], + }, +} + +/// Return-type selector for [`call`]. +#[cfg(all( + any( + target_os = "linux", + target_os = "macos", + target_os = "windows", + target_os = "android" + ), + not(any(target_env = "musl", target_env = "sgx")) +))] +#[derive(Debug, Clone, Copy)] +pub enum CallRet<'a> { + /// restype is None: the call returns void. + Void, + /// A ctypes simple type code. Pointer-kind codes (`simple_type_is_pointer`) + /// yield [`CallValue::Pointer`]; everything else [`CallValue::Scalar`]. + Code(&'a str), + /// A pointer-typed return without a driving code (`POINTER(T)`, function + /// pointer). + Pointer, + /// A by-value aggregate return. + Aggregate(&'a CTypeLayout), +} + +/// Per-call error-swapping options. +#[cfg(all( + any( + target_os = "linux", + target_os = "macos", + target_os = "windows", + target_os = "android" + ), + not(any(target_env = "musl", target_env = "sgx")) +))] +#[derive(Debug, Clone, Copy, Default)] +pub struct CallOptions { + /// Swap the ctypes-local errno around the raw call (unix; ignored on windows). + pub use_errno: bool, + /// Swap the ctypes-local last error around the raw call (windows; ignored + /// elsewhere). + pub use_last_error: bool, +} + +/// Result of a foreign call. +#[cfg(all( + any( + target_os = "linux", + target_os = "macos", + target_os = "windows", + target_os = "android" + ), + not(any(target_env = "musl", target_env = "sgx")) +))] +#[derive(Debug)] +pub enum CallValue { + /// Void return. + Void, + /// Raw return-register image, native endian (register-sized: 8 bytes on + /// 64-bit). Decode with [`decode_type_code`]. + Scalar(Vec<u8>), + /// Pointer-valued return. + Pointer(usize), + /// Exactly `layout.size()` bytes of a returned aggregate. + Aggregate(Vec<u8>), +} + +/// Errors from [`call`]. +#[cfg(all( + any( + target_os = "linux", + target_os = "macos", + target_os = "windows", + target_os = "android" + ), + not(any(target_env = "musl", target_env = "sgx")) +))] +#[derive(Debug, Clone, PartialEq, Eq)] +pub enum CallError { + NullFunctionPointer, + UnknownTypeCode(String), + /// An aggregate argument's buffer was shorter than its layout size. + BufferTooSmall { + expected: usize, + got: usize, + }, +} + +/// Perform a foreign call: handles scalar, pointer, and by-value aggregate +/// arguments, and void / scalar / pointer / aggregate returns. +#[cfg(all( + any( + target_os = "linux", + target_os = "macos", + target_os = "windows", + target_os = "android" + ), + not(any(target_env = "musl", target_env = "sgx")) +))] +pub fn call( + addr: usize, + args: &[CallArg<'_>], + ret: CallRet<'_>, + options: CallOptions, +) -> Result<CallValue, CallError> { + enum Lowered<'a> { + Scalar(FfiValue), + Aggregate(&'a [u8]), + } + + let code_ptr = code_ptr_from_addr(addr).ok_or(CallError::NullFunctionPointer)?; + + // Pass 1: argument types + owned scalar values / borrowed aggregate buffers. + let mut ffi_arg_types: Vec<Type> = Vec::with_capacity(args.len()); + let mut lowered: Vec<Lowered<'_>> = Vec::with_capacity(args.len()); + for arg in args { + match arg { + CallArg::Typed { code, buffer } => { + let ty = ffi_type_from_code(code) + .ok_or_else(|| CallError::UnknownTypeCode((*code).to_string()))?; + ffi_arg_types.push(ty); + lowered.push(Lowered::Scalar(ffi_value_from_type_code(code, buffer))); + } + CallArg::Int(value) => { + ffi_arg_types.push(ffi_i32_type()); + lowered.push(Lowered::Scalar(FfiValue::I32(*value))); + } + CallArg::Double(value) => { + ffi_arg_types.push(ffi_f64_type()); + lowered.push(Lowered::Scalar(FfiValue::F64(*value))); + } + CallArg::Pointer(value) => { + ffi_arg_types.push(ffi_pointer_type()); + lowered.push(Lowered::Scalar(FfiValue::Pointer(*value))); + } + CallArg::Aggregate { layout, buffer } => { + let expected = layout.size(); + if buffer.len() < expected { + return Err(CallError::BufferTooSmall { + expected, + got: buffer.len(), + }); + } + ffi_arg_types.push(layout.to_ffi_type()?); + lowered.push(Lowered::Aggregate(buffer)); + } + } + } + + let ffi_return_type = match ret { + CallRet::Void => ffi_void_type(), + CallRet::Code(code) => { + ffi_type_from_code(code).ok_or_else(|| CallError::UnknownTypeCode(code.to_string()))? + } + CallRet::Pointer => ffi_pointer_type(), + CallRet::Aggregate(layout) => layout.to_ffi_type()?, + }; + + // Pass 2: borrow the completed `lowered` as libffi Args. No reallocation can + // now invalidate the scalar borrows; aggregate Args point at caller buffers. + let ffi_args: Vec<Arg<'_>> = lowered + .iter() + .map(|arg| match arg { + Lowered::Scalar(value) => ffi_arg_from_value(value), + // `.first()` avoids indexing an empty buffer (a zero-sized by-value + // aggregate); libffi reads nothing for a zero-size type. + Lowered::Aggregate(buffer) => Arg::new(buffer.first().unwrap_or(&0u8)), + }) + .collect(); + + let cif = Cif::new(ffi_arg_types, ffi_return_type); + + // Allocate the aggregate return buffer outside the error-swap window so no + // allocation runs between the raw call and the errno/last-error capture. + // libffi requires this buffer be at least `ffi_arg`-sized and suitably + // aligned; a `u64` slice guarantees both. + let mut aggregate_buffer: Vec<u64> = match ret { + CallRet::Aggregate(layout) => vec![0u64; core::cmp::max(layout.size(), 8).div_ceil(8)], + _ => Vec::new(), + }; + + enum RawResult { + Void, + Pointer(usize), + Scalar(u64), + Aggregate, + } + + let mut invoke = || -> RawResult { + match ret { + CallRet::Void => { + unsafe { cif.call::<()>(code_ptr, &ffi_args) }; + RawResult::Void + } + CallRet::Code(code) if simple_type_is_pointer(code) => { + RawResult::Pointer(unsafe { cif.call::<usize>(code_ptr, &ffi_args) }) + } + CallRet::Code(_) => { + // Capture a full register (`u64`), not `low::ffi_arg`: the + // `libffi_sys` binding types `ffi_arg` as `c_ulong`, which is + // 4 bytes under LLP64 (Windows x64) and would truncate 8-byte + // returns (`q`/`Q`/`d`). `decode_type_code` reads the leading + // bytes the type code needs. + RawResult::Scalar(unsafe { cif.call::<u64>(code_ptr, &ffi_args) }) + } + CallRet::Pointer => { + RawResult::Pointer(unsafe { cif.call::<usize>(code_ptr, &ffi_args) }) + } + CallRet::Aggregate(_) => { + unsafe { + cif.call_return_into(code_ptr, &ffi_args, Ret::new(&mut aggregate_buffer[..])); + } + RawResult::Aggregate + } + } + }; + + #[cfg(not(windows))] + let raw = if options.use_errno { + with_swapped_errno(invoke) + } else { + invoke() + }; + + #[cfg(windows)] + let raw = if options.use_last_error { + with_swapped_last_error(invoke) + } else { + invoke() + }; + + let result = match raw { + RawResult::Void => CallValue::Void, + RawResult::Pointer(ptr) => CallValue::Pointer(ptr), + RawResult::Scalar(value) => CallValue::Scalar(value.to_ne_bytes().to_vec()), + RawResult::Aggregate => { + let size = match ret { + CallRet::Aggregate(layout) => layout.size(), + _ => 0, + }; + let bytes: Vec<u8> = aggregate_buffer + .iter() + .flat_map(|word| word.to_ne_bytes()) + .collect(); + CallValue::Aggregate(bytes[..size].to_vec()) + } + }; + + Ok(result) } /// # Safety @@ -2718,3 +2880,690 @@ pub fn dlsym_checked(_handle: usize, symbol_name: &CStr) -> Result<*mut c_void, symbol_name.to_string_lossy() )) } + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn simple_type_is_pointer_classifies_codes() { + assert!(simple_type_is_pointer("z")); + assert!(simple_type_is_pointer("Z")); + assert!(simple_type_is_pointer("P")); + assert!(simple_type_is_pointer("O")); + assert!(!simple_type_is_pointer("i")); + assert!(!simple_type_is_pointer("d")); + assert!(!simple_type_is_pointer("")); + } + + #[test] + fn simple_type_chars_contains_expected_codes() { + let chars = simple_type_chars(); + assert!(chars.contains('i')); + assert!(chars.contains('d')); + assert!(chars.contains('P')); + // junk / non-code characters are excluded + assert!(!chars.contains('@')); + assert!(!chars.contains(' ')); + assert!(!chars.contains('1')); + } + + #[cfg(all( + any( + target_os = "linux", + target_os = "macos", + target_os = "windows", + target_os = "android" + ), + not(any(target_env = "musl", target_env = "sgx")) + ))] + mod call_tests { + use super::*; + + extern "C" fn abs_i32(x: i32) -> i32 { + x.abs() + } + + extern "C" fn add_i32(a: i32, b: i32) -> i32 { + a + b + } + + extern "C" fn sqrt_f64(x: f64) -> f64 { + x.sqrt() + } + + extern "C" fn noop() {} + + #[repr(C)] + struct PairI32 { + a: i32, + b: i32, + } + extern "C" fn sum_pair(p: PairI32) -> i32 { + p.a + p.b + } + extern "C" fn ret_pair() -> PairI32 { + PairI32 { a: 10, b: 20 } + } + + #[repr(C)] + struct PairF32 { + x: f32, + y: f32, + } + extern "C" fn sum_pair_f32(p: PairF32) -> f32 { + p.x + p.y + } + + #[repr(C)] + struct Inner { + a: i32, + b: i32, + } + #[repr(C)] + struct Outer { + inner: Inner, + c: i32, + } + extern "C" fn sum_outer(o: Outer) -> i32 { + o.inner.a + o.inner.b + o.c + } + + #[repr(C)] + struct ArrStruct { + arr: [i32; 3], + tag: i32, + } + extern "C" fn sum_arr_struct(s: ArrStruct) -> i32 { + s.arr[0] + s.arr[1] + s.arr[2] + s.tag + } + + #[repr(C)] + struct Big { + a: i64, + b: i64, + c: i64, + } + extern "C" fn sum_big(v: Big) -> i64 { + v.a + v.b + v.c + } + extern "C" fn ret_big() -> Big { + Big { a: 1, b: 2, c: 3 } + } + + #[allow(dead_code)] + #[repr(C)] + struct S3 { + a: u8, + b: u8, + c: u8, + } + extern "C" fn ret_s3() -> S3 { + S3 { a: 1, b: 2, c: 3 } + } + + #[allow(dead_code)] + #[repr(C)] + struct S5 { + a: u8, + b: u8, + c: u8, + d: u8, + e: u8, + } + extern "C" fn ret_s5() -> S5 { + S5 { + a: 1, + b: 2, + c: 3, + d: 4, + e: 5, + } + } + + #[allow(dead_code)] + #[repr(C)] + struct S12 { + a: i32, + b: i32, + c: i32, + } + extern "C" fn ret_s12() -> S12 { + S12 { + a: 100, + b: 200, + c: 300, + } + } + + fn addr_of(f: extern "C" fn() -> ()) -> usize { + f as *const () as usize + } + + fn scalar_bytes(value: &CallValue) -> &[u8] { + match value { + CallValue::Scalar(bytes) => bytes, + other => panic!("expected Scalar, got {other:?}"), + } + } + + fn aggregate_bytes(value: &CallValue) -> &[u8] { + match value { + CallValue::Aggregate(bytes) => bytes, + other => panic!("expected Aggregate, got {other:?}"), + } + } + + fn i32_bytes(values: &[i32]) -> Vec<u8> { + values.iter().flat_map(|v| v.to_ne_bytes()).collect() + } + + // --- scalar parity ----------------------------------------------------- + + #[test] + fn calls_f64_scalar() { + let addr = sqrt_f64 as *const () as usize; + let result = call( + addr, + &[CallArg::Double(2.0)], + CallRet::Code("d"), + CallOptions::default(), + ) + .unwrap(); + match decode_type_code("d", scalar_bytes(&result)) { + DecodedValue::Float(v) => { + assert!((v - core::f64::consts::SQRT_2).abs() < 1e-12) + } + _ => panic!("expected Float return"), + } + } + + #[test] + fn typed_scalar_arg_from_buffer() { + let addr = abs_i32 as *const () as usize; + let buffer = (-5i32).to_ne_bytes(); + let result = call( + addr, + &[CallArg::Typed { + code: "i", + buffer: &buffer, + }], + CallRet::Code("i"), + CallOptions::default(), + ) + .unwrap(); + assert!(matches!( + decode_type_code("i", scalar_bytes(&result)), + DecodedValue::Signed(5) + )); + } + + #[test] + fn typed_two_scalar_args() { + let addr = add_i32 as *const () as usize; + let a = 2i32.to_ne_bytes(); + let b = 3i32.to_ne_bytes(); + let result = call( + addr, + &[ + CallArg::Typed { + code: "i", + buffer: &a, + }, + CallArg::Typed { + code: "i", + buffer: &b, + }, + ], + CallRet::Code("i"), + CallOptions::default(), + ) + .unwrap(); + assert!(matches!( + decode_type_code("i", scalar_bytes(&result)), + DecodedValue::Signed(5) + )); + } + + #[test] + fn void_return_is_void() { + let result = call(addr_of(noop), &[], CallRet::Void, CallOptions::default()).unwrap(); + assert!(matches!(result, CallValue::Void)); + } + + #[test] + fn every_simple_code_is_accepted() { + for code in simple_type_chars().chars() { + let code = code.to_string(); + assert!( + ffi_type_from_code(&code).is_some(), + "code {code:?} not accepted by call's arg/return lowering" + ); + } + } + + #[test] + fn scalar_lowering_helpers_agree_where_carrier_matches() { + // For codes whose ffi carrier type matches their ctypes signedness the + // two lowering helpers agree. + let buffer = 0x1122_3344_5566_7788u64.to_ne_bytes(); + for code in ["b", "B", "h", "H", "i", "I", "q", "Q", "d", "f"] { + let by_code = ffi_value_from_type_code(code, &buffer); + let by_type = + ffi_value_from_type(&buffer, ffi_type_from_code(code).unwrap()).unwrap(); + assert_eq!( + format!("{by_code:?}"), + format!("{by_type:?}"), + "code {code}" + ); + } + } + + #[test] + fn scalar_lowering_helpers_diverge_for_signed_char() { + // `ffi_value_from_type` classifies purely by libffi Type identity, while + // `ffi_value_from_type_code` carries ctypes signedness: for 'c' (u8 + // carrier, signed value) the two intentionally differ. `call` uses only + // the code-based helper. + let buffer = [200u8]; + assert!(matches!( + ffi_value_from_type_code("c", &buffer), + FfiValue::I8(-56) + )); + assert!(matches!( + ffi_value_from_type(&buffer, ffi_type_from_code("c").unwrap()), + Some(FfiValue::U8(200)) + )); + } + + // --- by-value aggregate arguments ------------------------------------- + + #[test] + fn passes_struct_by_value() { + let addr = sum_pair as *const () as usize; + let layout = CTypeLayout::Struct { + fields: vec![CTypeLayout::Simple('i'), CTypeLayout::Simple('i')], + size: core::mem::size_of::<PairI32>(), + }; + let buffer = i32_bytes(&[3, 4]); + let result = call( + addr, + &[CallArg::Aggregate { + layout: &layout, + buffer: &buffer, + }], + CallRet::Code("i"), + CallOptions::default(), + ) + .unwrap(); + assert!(matches!( + decode_type_code("i", scalar_bytes(&result)), + DecodedValue::Signed(7) + )); + } + + #[test] + fn passes_nested_struct_by_value() { + let addr = sum_outer as *const () as usize; + let inner = CTypeLayout::Struct { + fields: vec![CTypeLayout::Simple('i'), CTypeLayout::Simple('i')], + size: core::mem::size_of::<Inner>(), + }; + let layout = CTypeLayout::Struct { + fields: vec![inner, CTypeLayout::Simple('i')], + size: core::mem::size_of::<Outer>(), + }; + let buffer = i32_bytes(&[5, 6, 7]); + let result = call( + addr, + &[CallArg::Aggregate { + layout: &layout, + buffer: &buffer, + }], + CallRet::Code("i"), + CallOptions::default(), + ) + .unwrap(); + assert!(matches!( + decode_type_code("i", scalar_bytes(&result)), + DecodedValue::Signed(18) + )); + } + + #[test] + fn passes_array_in_struct_by_value() { + let addr = sum_arr_struct as *const () as usize; + let layout = CTypeLayout::Struct { + fields: vec![ + CTypeLayout::Array { + element: Box::new(CTypeLayout::Simple('i')), + length: 3, + size: 12, + }, + CTypeLayout::Simple('i'), + ], + size: core::mem::size_of::<ArrStruct>(), + }; + let buffer = i32_bytes(&[1, 2, 3, 4]); + let result = call( + addr, + &[CallArg::Aggregate { + layout: &layout, + buffer: &buffer, + }], + CallRet::Code("i"), + CallOptions::default(), + ) + .unwrap(); + assert!(matches!( + decode_type_code("i", scalar_bytes(&result)), + DecodedValue::Signed(10) + )); + } + + #[test] + fn passes_float_pair_struct_by_value() { + let addr = sum_pair_f32 as *const () as usize; + let layout = CTypeLayout::Struct { + fields: vec![CTypeLayout::Simple('f'), CTypeLayout::Simple('f')], + size: core::mem::size_of::<PairF32>(), + }; + let mut buffer = Vec::new(); + buffer.extend_from_slice(&1.5f32.to_ne_bytes()); + buffer.extend_from_slice(&2.25f32.to_ne_bytes()); + let result = call( + addr, + &[CallArg::Aggregate { + layout: &layout, + buffer: &buffer, + }], + CallRet::Code("f"), + CallOptions::default(), + ) + .unwrap(); + match decode_type_code("f", scalar_bytes(&result)) { + DecodedValue::Float(v) => assert!((v - 3.75).abs() < 1e-6), + _ => panic!("expected Float return"), + } + } + + #[test] + fn passes_large_struct_by_value() { + let addr = sum_big as *const () as usize; + let layout = CTypeLayout::Struct { + fields: vec![ + CTypeLayout::Simple('q'), + CTypeLayout::Simple('q'), + CTypeLayout::Simple('q'), + ], + size: core::mem::size_of::<Big>(), + }; + let mut buffer = Vec::new(); + for v in [11i64, 22, 33] { + buffer.extend_from_slice(&v.to_ne_bytes()); + } + let result = call( + addr, + &[CallArg::Aggregate { + layout: &layout, + buffer: &buffer, + }], + CallRet::Code("q"), + CallOptions::default(), + ) + .unwrap(); + assert!(matches!( + decode_type_code("q", scalar_bytes(&result)), + DecodedValue::Signed(66) + )); + } + + // --- by-value aggregate returns --------------------------------------- + + #[test] + fn returns_small_struct_by_value() { + let layout = CTypeLayout::Struct { + fields: vec![CTypeLayout::Simple('i'), CTypeLayout::Simple('i')], + size: core::mem::size_of::<PairI32>(), + }; + let result = call( + ret_pair as *const () as usize, + &[], + CallRet::Aggregate(&layout), + CallOptions::default(), + ) + .unwrap(); + assert_eq!(aggregate_bytes(&result), i32_bytes(&[10, 20]).as_slice()); + } + + #[test] + fn returns_odd_size_structs_by_value() { + let s3 = CTypeLayout::Struct { + fields: vec![ + CTypeLayout::Simple('B'), + CTypeLayout::Simple('B'), + CTypeLayout::Simple('B'), + ], + size: 3, + }; + let result = call( + ret_s3 as *const () as usize, + &[], + CallRet::Aggregate(&s3), + CallOptions::default(), + ) + .unwrap(); + assert_eq!(aggregate_bytes(&result), &[1u8, 2, 3]); + + let s5 = CTypeLayout::Struct { + fields: vec![CTypeLayout::Simple('B'); 5], + size: 5, + }; + let result = call( + ret_s5 as *const () as usize, + &[], + CallRet::Aggregate(&s5), + CallOptions::default(), + ) + .unwrap(); + assert_eq!(aggregate_bytes(&result), &[1u8, 2, 3, 4, 5]); + + let s12 = CTypeLayout::Struct { + fields: vec![CTypeLayout::Simple('i'); 3], + size: 12, + }; + let result = call( + ret_s12 as *const () as usize, + &[], + CallRet::Aggregate(&s12), + CallOptions::default(), + ) + .unwrap(); + assert_eq!( + aggregate_bytes(&result), + i32_bytes(&[100, 200, 300]).as_slice() + ); + } + + #[test] + fn returns_large_struct_by_value() { + let layout = CTypeLayout::Struct { + fields: vec![CTypeLayout::Simple('q'); 3], + size: core::mem::size_of::<Big>(), + }; + let result = call( + ret_big as *const () as usize, + &[], + CallRet::Aggregate(&layout), + CallOptions::default(), + ) + .unwrap(); + let mut expected = Vec::new(); + for v in [1i64, 2, 3] { + expected.extend_from_slice(&v.to_ne_bytes()); + } + assert_eq!(aggregate_bytes(&result), expected.as_slice()); + } + + // --- pointers, layout, unions, errors --------------------------------- + + #[test] + fn pointer_return_round_trips_address() { + extern "C" fn echo_ptr(p: usize) -> usize { + p + } + let addr = echo_ptr as *const () as usize; + let sentinel = 0xDEAD_BEEFusize; + let result = call( + addr, + &[CallArg::Pointer(sentinel)], + CallRet::Code("P"), + CallOptions::default(), + ) + .unwrap(); + assert!(matches!(result, CallValue::Pointer(p) if p == sentinel)); + let result = call( + addr, + &[CallArg::Pointer(sentinel)], + CallRet::Pointer, + CallOptions::default(), + ) + .unwrap(); + assert!(matches!(result, CallValue::Pointer(p) if p == sentinel)); + } + + #[test] + fn layout_size_matches_repr_c() { + assert_eq!(CTypeLayout::Simple('i').size(), core::mem::size_of::<i32>()); + assert_eq!(CTypeLayout::Pointer.size(), core::mem::size_of::<usize>()); + assert_eq!( + CTypeLayout::Struct { + fields: vec![CTypeLayout::Simple('i'), CTypeLayout::Simple('i')], + size: 8, + } + .size(), + 8 + ); + assert_eq!(CTypeLayout::Opaque { size: 5 }.size(), 5); + assert_eq!( + CTypeLayout::Array { + element: Box::new(CTypeLayout::Simple('i')), + length: 3, + size: 12, + } + .size(), + 12 + ); + } + + #[test] + fn union_layout_reports_size_and_lowers() { + let layout = CTypeLayout::Union { + fields: vec![CTypeLayout::Simple('i'), CTypeLayout::Simple('d')], + size: 8, + }; + assert_eq!(layout.size(), 8); + assert!(layout.to_ffi_type().is_ok()); + } + + #[test] + fn null_addr_is_error() { + let result = call(0, &[], CallRet::Void, CallOptions::default()); + assert_eq!(result.err(), Some(CallError::NullFunctionPointer)); + } + + #[test] + fn unknown_arg_code_is_error() { + let addr = noop as *const () as usize; + let result = call( + addr, + &[CallArg::Typed { + code: "@", + buffer: &[], + }], + CallRet::Void, + CallOptions::default(), + ); + assert_eq!( + result.err(), + Some(CallError::UnknownTypeCode("@".to_string())) + ); + } + + #[test] + fn unknown_return_code_is_error() { + let addr = noop as *const () as usize; + let result = call(addr, &[], CallRet::Code("@"), CallOptions::default()); + assert_eq!( + result.err(), + Some(CallError::UnknownTypeCode("@".to_string())) + ); + } + + #[test] + fn short_aggregate_buffer_is_error() { + let addr = sum_pair as *const () as usize; + let layout = CTypeLayout::Struct { + fields: vec![CTypeLayout::Simple('i'), CTypeLayout::Simple('i')], + size: 8, + }; + let buffer = [0u8; 4]; + let result = call( + addr, + &[CallArg::Aggregate { + layout: &layout, + buffer: &buffer, + }], + CallRet::Code("i"), + CallOptions::default(), + ); + assert_eq!( + result.err(), + Some(CallError::BufferTooSmall { + expected: 8, + got: 4, + }) + ); + } + + // EINVAL: a valid errno value on all unix targets, so it round-trips + // through crate::os::set_errno/get_errno. + #[cfg(not(windows))] + const ERRNO_MARKER: i32 = 22; + + #[cfg(not(windows))] + extern "C" fn write_errno_marker() -> i32 { + crate::os::set_errno(ERRNO_MARKER); + 7 + } + + #[cfg(not(windows))] + #[test] + fn errno_swap_window_captures_and_restores() { + // Distinguish the real platform errno from the ctypes-local one. + crate::os::set_errno(11); + super::super::CTYPES_LOCAL_ERRNO.with(|e| e.set(99)); + let result = call( + write_errno_marker as *const () as usize, + &[], + CallRet::Code("i"), + CallOptions { + use_errno: true, + use_last_error: false, + }, + ) + .unwrap(); + assert!(matches!( + decode_type_code("i", scalar_bytes(&result)), + DecodedValue::Signed(7) + )); + // The function's errno write landed in the ctypes-local slot... + assert_eq!( + super::super::CTYPES_LOCAL_ERRNO.with(|e| e.get()), + ERRNO_MARKER + ); + // ...and the real errno was restored to its pre-call value. + assert_eq!(crate::os::get_errno(), 11); + } + } +} diff --git a/crates/vm/src/stdlib/_ctypes.rs b/crates/vm/src/stdlib/_ctypes.rs index 6370bc42b..adf047ec7 100644 --- a/crates/vm/src/stdlib/_ctypes.rs +++ b/crates/vm/src/stdlib/_ctypes.rs @@ -16,7 +16,7 @@ use crate::{ }; pub(super) use array::PyCArray; -pub(super) use base::{FfiArgValue, PyCData, PyCField, StgInfo, StgInfoFlags}; +pub(super) use base::{CArgValue, PyCData, PyCField, StgInfo, StgInfoFlags}; pub(super) use pointer::PyCPointer; pub(super) use simple::{PyCSimple, PyCSimpleType}; pub(super) use structure::PyCStructure; @@ -107,10 +107,13 @@ pub(crate) mod _ctypes { pub(crate) struct CArgObject { /// Type tag ('P', 'V', 'i', 'd', etc.) pub tag: u8, - /// The actual FFI value (mirrors union value) - pub value: super::FfiArgValue, + /// The actual foreign-call value (mirrors union value) + pub value: super::CArgValue, /// Reference to original object (for memory safety) pub obj: PyObjectRef, + /// Owner keeping a `Pointer` value's target memory alive (e.g. a + /// null-terminated buffer copy created by `from_param`), if any. + pub keep: Option<PyObjectRef>, /// Size for struct/union ('V' tag) #[allow(dead_code)] pub size: usize, @@ -126,72 +129,68 @@ pub(crate) mod _ctypes { impl Representable for CArgObject { // PyCArg_repr - use tag and value fields directly fn repr_str(zelf: &Py<Self>, _vm: &VirtualMachine) -> PyResult<String> { - use super::base::FfiArgValue; + use rustpython_host_env::ctypes::{FfiValue, ffi_value_from_type_code}; let tag_char = zelf.tag as char; + // Reconstruct the scalar the value lowers to, so the formatting + // matches the value passed to the foreign call exactly. + let ffi_val = match &zelf.value { + super::CArgValue::Typed { code, bytes } => { + let mut buf = [0u8; 4]; + ffi_value_from_type_code(code.encode_utf8(&mut buf), bytes) + } + super::CArgValue::Int(v) => FfiValue::I32(*v), + super::CArgValue::Double(v) => FfiValue::F64(*v), + super::CArgValue::Pointer(v) => FfiValue::Pointer(*v), + // 'V' aggregates format via the object-address default arm below. + super::CArgValue::Aggregate { .. } => FfiValue::Pointer(0), + }; + // Format value based on tag match zelf.tag { b'b' | b'h' | b'i' | b'l' | b'q' => { // Signed integers - let n = match zelf.value { - FfiArgValue::Scalar(rustpython_host_env::ctypes::FfiValue::I8(v)) => { - v as i64 - } - FfiArgValue::Scalar(rustpython_host_env::ctypes::FfiValue::I16(v)) => { - v as i64 - } - FfiArgValue::Scalar(rustpython_host_env::ctypes::FfiValue::I32(v)) => { - v as i64 - } - FfiArgValue::Scalar(rustpython_host_env::ctypes::FfiValue::I64(v)) => v, + let n = match ffi_val { + FfiValue::I8(v) => v as i64, + FfiValue::I16(v) => v as i64, + FfiValue::I32(v) => v as i64, + FfiValue::I64(v) => v, _ => 0, }; Ok(format!("<cparam '{tag_char}' ({n})>")) } b'B' | b'H' | b'I' | b'L' | b'Q' => { // Unsigned integers - let n = match zelf.value { - FfiArgValue::Scalar(rustpython_host_env::ctypes::FfiValue::U8(v)) => { - v as u64 - } - FfiArgValue::Scalar(rustpython_host_env::ctypes::FfiValue::U16(v)) => { - v as u64 - } - FfiArgValue::Scalar(rustpython_host_env::ctypes::FfiValue::U32(v)) => { - v as u64 - } - FfiArgValue::Scalar(rustpython_host_env::ctypes::FfiValue::U64(v)) => v, + let n = match ffi_val { + FfiValue::U8(v) => v as u64, + FfiValue::U16(v) => v as u64, + FfiValue::U32(v) => v as u64, + FfiValue::U64(v) => v, _ => 0, }; Ok(format!("<cparam '{tag_char}' ({n})>")) } b'f' => { - let v = match zelf.value { - FfiArgValue::Scalar(rustpython_host_env::ctypes::FfiValue::F32(v)) => { - v as f64 - } + let v = match ffi_val { + FfiValue::F32(v) => v as f64, _ => 0.0, }; Ok(format!("<cparam '{tag_char}' ({v})>")) } b'd' | b'g' => { - let v = match zelf.value { - FfiArgValue::Scalar(rustpython_host_env::ctypes::FfiValue::F64(v)) => v, - FfiArgValue::Scalar(rustpython_host_env::ctypes::FfiValue::F32(v)) => { - v as f64 - } + let v = match ffi_val { + FfiValue::F64(v) => v, + FfiValue::F32(v) => v as f64, _ => 0.0, }; Ok(format!("<cparam '{tag_char}' ({v})>")) } b'c' => { // c_char - single byte - let byte = match zelf.value { - FfiArgValue::Scalar(rustpython_host_env::ctypes::FfiValue::I8(v)) => { - v as u8 - } - FfiArgValue::Scalar(rustpython_host_env::ctypes::FfiValue::U8(v)) => v, + let byte = match ffi_val { + FfiValue::I8(v) => v as u8, + FfiValue::U8(v) => v, _ => 0, }; if is_literal_char(byte) { @@ -200,11 +199,10 @@ pub(crate) mod _ctypes { Ok(format!("<cparam '{tag_char}' ('\\x{byte:02x}')>")) } } - b'z' | b'Z' | b'P' | b'V' => { + b'z' | b'Z' | b'P' => { // Pointer types - let ptr = match zelf.value { - FfiArgValue::Scalar(rustpython_host_env::ctypes::FfiValue::Pointer(v)) => v, - FfiArgValue::OwnedPointer(v, _) => v, + let ptr = match ffi_val { + FfiValue::Pointer(v) => v, _ => 0, }; if ptr == 0 { @@ -600,7 +598,7 @@ pub(crate) mod _ctypes { offset: OptionalArg<isize>, vm: &VirtualMachine, ) -> PyResult { - use super::FfiArgValue; + use super::CArgValue; // Check if obj is a ctypes instance if !obj.fast_isinstance(PyCData::static_type()) @@ -628,8 +626,9 @@ pub(crate) mod _ctypes { // Create CArgObject to hold the reference Ok(CArgObject { tag: b'P', - value: FfiArgValue::pointer(ptr_val), + value: CArgValue::pointer(ptr_val), obj, + keep: None, size: 0, offset: offset_val, } diff --git a/crates/vm/src/stdlib/_ctypes/base.rs b/crates/vm/src/stdlib/_ctypes/base.rs index 62856c4ce..1cc84750c 100644 --- a/crates/vm/src/stdlib/_ctypes/base.rs +++ b/crates/vm/src/stdlib/_ctypes/base.rs @@ -18,8 +18,8 @@ use num_traits::{Signed, ToPrimitive}; use rustpython_common::lock::PyRwLock; use rustpython_common::wtf8::Wtf8; use rustpython_host_env::ctypes::{ - CTypeParamKind, FfiArg, FfiType, FfiValue, char_array_assignment_bytes, char_array_field_value, - ffi_arg_from_value, ffi_type_for_layout, wchar_array_field_value, write_cow_bytes_at_offset, + CTypeLayout, char_array_assignment_bytes, char_array_field_value, wchar_array_field_value, + write_cow_bytes_at_offset, }; // StgInfo - Storage information for ctypes types @@ -99,8 +99,9 @@ pub struct StgInfo { // Byte order (for _swappedbytes_) pub big_endian: bool, // true if big endian, false if little endian - // FFI field types for structure/union passing (inherited from base class) - pub ffi_field_types: Vec<FfiType>, + // Call layouts of the struct/union fields, in declaration order (inherited + // from base class). Drives by-value aggregate passing. + pub field_layouts: Vec<CTypeLayout>, // Cached pointer type (non-inheritable via descriptor) pub pointer_type: Option<PyObjectRef>, @@ -127,7 +128,7 @@ impl core::fmt::Debug for StgInfo { .field("shape", &self.shape) .field("paramfunc", &self.paramfunc) .field("big_endian", &self.big_endian) - .field("ffi_field_types", &self.ffi_field_types.len()) + .field("field_layouts", &self.field_layouts.len()) .finish() } } @@ -147,7 +148,7 @@ impl Default for StgInfo { shape: Vec::new(), paramfunc: ParamFunc::None, big_endian: cfg!(target_endian = "big"), // native endian by default - ffi_field_types: Vec::new(), + field_layouts: Vec::new(), pointer_type: None, } } @@ -168,7 +169,7 @@ impl StgInfo { shape: Vec::new(), paramfunc: ParamFunc::None, big_endian: cfg!(target_endian = "big"), // native endian by default - ffi_field_types: Vec::new(), + field_layouts: Vec::new(), pointer_type: None, } } @@ -220,30 +221,11 @@ impl StgInfo { shape, paramfunc: ParamFunc::Array, big_endian: cfg!(target_endian = "big"), // native endian by default - ffi_field_types: Vec::new(), + field_layouts: Vec::new(), pointer_type: None, } } - /// Get libffi type for this StgInfo - /// Note: For very large types, returns pointer type to avoid overflow - pub fn to_ffi_type(&self) -> FfiType { - let kind = match self.paramfunc { - ParamFunc::Structure => CTypeParamKind::Structure, - ParamFunc::Union => CTypeParamKind::Union, - ParamFunc::Array => CTypeParamKind::Array, - ParamFunc::Pointer => CTypeParamKind::Pointer, - _ => CTypeParamKind::Simple, - }; - ffi_type_for_layout( - kind, - &self.ffi_field_types, - self.size, - self.length, - self.format.as_deref(), - ) - } - /// Check if this type is finalized (cannot set _fields_ again) pub fn is_final(&self) -> bool { self.flags.contains(StgInfoFlags::DICTFLAG_FINAL) @@ -255,6 +237,44 @@ impl StgInfo { } } +/// Build the host_env call layout for a ctypes type from its already-borrowed +/// `StgInfo`. Aggregate layouts come straight from the type's `field_layouts` +/// (built incrementally from the base class, so struct inheritance is +/// reflected); array elements recurse into the element type; simple types read +/// their `_type_` code. The caller passes the borrowed `stg` so this never +/// re-locks `ty`'s own type data. +pub(super) fn type_layout(ty: &Py<PyType>, stg: &StgInfo, vm: &VirtualMachine) -> CTypeLayout { + match stg.paramfunc { + ParamFunc::Structure => CTypeLayout::Struct { + fields: stg.field_layouts.clone(), + size: stg.size, + }, + ParamFunc::Union => CTypeLayout::Union { + fields: stg.field_layouts.clone(), + size: stg.size, + }, + ParamFunc::Array => { + let element = stg + .element_type + .as_ref() + .and_then(|et| et.stg_info_opt().map(|et_stg| type_layout(et, &et_stg, vm))) + .unwrap_or(CTypeLayout::Opaque { + size: stg.element_size, + }); + CTypeLayout::Array { + element: Box::new(element), + length: stg.length, + size: stg.size, + } + } + ParamFunc::Pointer => CTypeLayout::Pointer, + ParamFunc::Simple | ParamFunc::None => ty + .type_code(vm) + .and_then(|code| code.chars().next()) + .map_or(CTypeLayout::Opaque { size: stg.size }, CTypeLayout::Simple), + } +} + /// __pointer_type__ getter for ctypes metaclasses. /// Reads from StgInfo.pointer_type (non-inheritable). pub(super) fn pointer_type_get(zelf: &Py<PyType>, vm: &VirtualMachine) -> PyResult { @@ -1828,12 +1848,12 @@ fn simple_paramfunc(obj: &PyObject, vm: &VirtualMachine) -> PyResult<CArgObject> // Read value from buffer: memcpy(&parg->value, self->b_ptr, self->b_size) let buffer = simple.0.buffer.read(); - let ffi_value = buffer_to_ffi_value(&type_code, &buffer); Ok(CArgObject { tag, - value: ffi_value, + value: CArgValue::typed(tag as char, &buffer), obj: obj.to_owned(), + keep: None, size: 0, offset: 0, }) @@ -1853,8 +1873,9 @@ fn array_paramfunc(obj: &PyObject, vm: &VirtualMachine) -> PyResult<CArgObject> Ok(CArgObject { tag: b'P', - value: FfiArgValue::pointer(ptr_val), + value: CArgValue::pointer(ptr_val), obj: obj.to_owned(), + keep: None, size: 0, offset: 0, }) @@ -1873,8 +1894,9 @@ fn pointer_paramfunc(obj: &PyObject, vm: &VirtualMachine) -> PyResult<CArgObject Ok(CArgObject { tag: b'P', - value: FfiArgValue::pointer(ptr_val), + value: CArgValue::pointer(ptr_val), obj: obj.to_owned(), + keep: None, size: 0, offset: 0, }) @@ -1882,64 +1904,95 @@ fn pointer_paramfunc(obj: &PyObject, vm: &VirtualMachine) -> PyResult<CArgObject /// StructUnionType_paramfunc (for both Structure and Union) fn struct_union_paramfunc(obj: &PyObject, stg_info: &StgInfo, _vm: &VirtualMachine) -> CArgObject { - // Get buffer pointer - // For large structs (> sizeof(void*)), we'd need to allocate and copy. - // For now, just point to buffer directly and keep obj reference for memory safety. - let buffer = if let Some(cdata) = obj.downcast_ref::<PyCData>() { - cdata.buffer.read() + // Snapshot the instance bytes and pass the aggregate by value. The layout + // is built here from the already-borrowed `stg_info` to avoid re-locking. + let (bytes, size) = if let Some(cdata) = obj.downcast_ref::<PyCData>() { + let buffer = cdata.buffer.read(); + (buffer.to_vec(), buffer.len()) } else { - return CArgObject { - tag: b'V', - value: FfiArgValue::pointer(0), - obj: obj.to_owned(), - size: stg_info.size, - offset: 0, - }; + (Vec::new(), stg_info.size) }; - let ptr_val = buffer.as_ptr() as usize; - let size = buffer.len(); + let layout = if matches!(stg_info.paramfunc, ParamFunc::Union) { + CTypeLayout::Union { + fields: stg_info.field_layouts.clone(), + size: stg_info.size, + } + } else { + CTypeLayout::Struct { + fields: stg_info.field_layouts.clone(), + size: stg_info.size, + } + }; CArgObject { tag: b'V', - value: FfiArgValue::pointer(ptr_val), + value: CArgValue::aggregate(layout, bytes), obj: obj.to_owned(), + keep: None, size, offset: 0, } } -// FfiArgValue - Owned FFI argument value +// CArgValue - Owned foreign-call argument value -/// Owned FFI argument value. Keeps the value alive for the duration of the FFI call. +/// A foreign-call argument in a form the unified `call` entry point accepts: a +/// simple-typed scalar (its ctypes code plus a native-endian bytes snapshot), +/// an untyped int/float, or an address. Any object whose memory an address +/// refers to is kept alive by the enclosing `Argument`/`CArgObject`, not here. #[derive(Debug, Clone)] -pub enum FfiArgValue { - Scalar(FfiValue), - /// Pointer with owned data. The PyObjectRef keeps the pointed data alive. - OwnedPointer(usize, #[allow(dead_code)] PyObjectRef), +pub enum CArgValue { + /// A value typed by its ctypes simple-type code, snapshotted as its bytes. + Typed { code: char, bytes: Vec<u8> }, + /// Untyped Python int (ConvParam default: C int). + Int(i32), + /// Untyped Python float (ConvParam default: C double). + Double(f64), + /// Address-valued argument (pointer decay, byref, buffer copies, NULL = 0). + Pointer(usize), + /// By-value aggregate: its call layout plus a snapshot of its bytes. + Aggregate { layout: CTypeLayout, bytes: Vec<u8> }, } -impl FfiArgValue { +impl CArgValue { pub fn pointer(value: usize) -> Self { - Self::Scalar(FfiValue::Pointer(value)) + Self::Pointer(value) } - /// Create an Arg reference to this owned value - pub fn as_arg(&self) -> FfiArg<'_> { - match self { - Self::Scalar(value) => ffi_arg_from_value(value), - Self::OwnedPointer(v, _) => rustpython_host_env::ctypes::ffi_arg( - rustpython_host_env::ctypes::FfiArgRef::Pointer(v), - ), + /// Snapshot a simple-typed value from its code and buffer bytes. + pub(super) fn typed(code: char, buffer: &[u8]) -> Self { + Self::Typed { + code, + bytes: buffer.to_vec(), } } -} -/// Convert buffer bytes to FfiArgValue based on type code -pub(super) fn buffer_to_ffi_value(type_code: &str, buffer: &[u8]) -> FfiArgValue { - FfiArgValue::Scalar(rustpython_host_env::ctypes::ffi_value_from_type_code( - type_code, buffer, - )) + /// Snapshot an aggregate value from its call layout and buffer bytes. + pub(super) fn aggregate(layout: CTypeLayout, bytes: Vec<u8>) -> Self { + Self::Aggregate { layout, bytes } + } + + /// Lower to a [`CallArg`], borrowing `code_buf` for the code's `&str`. + pub(super) fn as_call_arg<'a>( + &'a self, + code_buf: &'a mut [u8; 4], + ) -> rustpython_host_env::ctypes::CallArg<'a> { + use rustpython_host_env::ctypes::CallArg; + match self { + Self::Typed { code, bytes } => CallArg::Typed { + code: code.encode_utf8(code_buf), + buffer: bytes, + }, + Self::Int(value) => CallArg::Int(*value), + Self::Double(value) => CallArg::Double(*value), + Self::Pointer(value) => CallArg::Pointer(*value), + Self::Aggregate { layout, bytes } => CallArg::Aggregate { + layout, + buffer: bytes, + }, + } + } } /// Convert bytes to appropriate Python object based on ctypes type diff --git a/crates/vm/src/stdlib/_ctypes/function.rs b/crates/vm/src/stdlib/_ctypes/function.rs index 2cf3eda13..86b4ff59b 100644 --- a/crates/vm/src/stdlib/_ctypes/function.rs +++ b/crates/vm/src/stdlib/_ctypes/function.rs @@ -3,13 +3,13 @@ use super::{ _ctypes::CArgObject, - PyCArray, PyCData, PyCPointer, PyCStructure, StgInfo, - base::{CDATA_BUFFER_METHODS, FfiArgValue, ParamFunc, StgInfoFlags}, + PyCArray, PyCData, PyCPointer, PyCStructure, PyCUnion, StgInfo, + base::{CArgValue, CDATA_BUFFER_METHODS, ParamFunc, StgInfoFlags}, simple::PyCSimple, }; use crate::{ AsObject, Py, PyObject, PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine, - builtins::{PyBytes, PyDict, PyNone, PyStr, PyTuple, PyType, PyTypeRef}, + builtins::{PyBytes, PyDict, PyStr, PyTuple, PyType, PyTypeRef}, class::StaticType, function::FuncArgs, protocol::{BufferDescriptor, PyBuffer, PyNumberMethods}, @@ -25,11 +25,10 @@ use rustpython_common::lock::PyRwLock; #[cfg(windows)] use rustpython_host_env::ctypes::ComMethodError; use rustpython_host_env::ctypes::{ - CallResult as RawResult, FfiCif, FfiCodePtr, FfiType, FfiValue, RawMemoryView, - RawMemoryViewError, StringAtError, ffi_f64_type, ffi_i32_type, ffi_pointer_type, - ffi_type_for_return_size, ffi_type_from_code, ffi_type_from_tag, ffi_void_type, - has_pointer_width, null_code_ptr, offset_address, pointer_bytes, pointer_format, pointer_size, - write_pointer_to_buffer_at, write_prefix_limited, + CTypeLayout, CallError, CallOptions, CallRet, CallValue, FfiCif, FfiCodePtr, FfiType, + RawMemoryView, RawMemoryViewError, StringAtError, call, ffi_pointer_type, ffi_type_from_code, + ffi_void_type, has_pointer_width, offset_address, pointer_bytes, pointer_format, pointer_size, + simple_type_is_pointer, write_pointer_to_buffer_at, write_prefix_limited, }; // Internal function addresses for special ctypes functions @@ -42,7 +41,7 @@ pub(super) const INTERNAL_MEMORYVIEW_AT_ADDR: usize = 4; /// Convert any object to a pointer value for c_void_p arguments /// Follows ConvParam logic for pointer types -fn convert_to_pointer(value: &PyObject, vm: &VirtualMachine) -> PyResult<FfiArgValue> { +fn convert_to_pointer(value: &PyObject, vm: &VirtualMachine) -> PyResult<CArgValue> { // 0. CArgObject (from byref()) -> buffer address + offset if let Some(carg) = value.downcast_ref::<CArgObject>() { // Get buffer address from the underlying object @@ -55,29 +54,29 @@ fn convert_to_pointer(value: &PyObject, vm: &VirtualMachine) -> PyResult<FfiArgV ))); }; let addr = (base_addr as isize + carg.offset) as usize; - return Ok(FfiArgValue::pointer(addr)); + return Ok(CArgValue::pointer(addr)); } // 1. None -> NULL if value.is(&vm.ctx.none) { - return Ok(FfiArgValue::pointer(0)); + return Ok(CArgValue::pointer(0)); } // 2. PyCArray -> buffer address (PyCArrayType_paramfunc) if let Some(array) = value.downcast_ref::<PyCArray>() { let addr = array.0.buffer.read().as_ptr() as usize; - return Ok(FfiArgValue::pointer(addr)); + return Ok(CArgValue::pointer(addr)); } // 3. PyCPointer -> stored pointer value if let Some(ptr) = value.downcast_ref::<PyCPointer>() { - return Ok(FfiArgValue::pointer(ptr.get_ptr_value())); + return Ok(CArgValue::pointer(ptr.get_ptr_value())); } // 4. PyCStructure -> buffer address if let Some(struct_obj) = value.downcast_ref::<PyCStructure>() { let addr = struct_obj.0.buffer.read().as_ptr() as usize; - return Ok(FfiArgValue::pointer(addr)); + return Ok(CArgValue::pointer(addr)); } // 5. PyCSimple (c_void_p, c_char_p, etc.) -> value from buffer @@ -85,14 +84,14 @@ fn convert_to_pointer(value: &PyObject, vm: &VirtualMachine) -> PyResult<FfiArgV let buffer = simple.0.buffer.read(); if has_pointer_width(&buffer) { let addr = rustpython_host_env::ctypes::read_pointer_from_buffer(&buffer); - return Ok(FfiArgValue::pointer(addr)); + return Ok(CArgValue::pointer(addr)); } } // 6. bytes -> buffer address (PyBytes_AsString) if let Some(bytes) = value.downcast_ref::<crate::builtins::PyBytes>() { let addr = bytes.as_bytes().as_ptr() as usize; - return Ok(FfiArgValue::pointer(addr)); + return Ok(CArgValue::pointer(addr)); } // 7. Integer -> direct value (PyLong_AsVoidPtr behavior) @@ -101,10 +100,10 @@ fn convert_to_pointer(value: &PyObject, vm: &VirtualMachine) -> PyResult<FfiArgV // Negative values: use signed conversion (allows -1 as 0xFFFF...) if bigint.is_negative() { if let Some(signed_val) = bigint.to_isize() { - return Ok(FfiArgValue::pointer(signed_val as usize)); + return Ok(CArgValue::pointer(signed_val as usize)); } } else if let Some(unsigned_val) = bigint.to_usize() { - return Ok(FfiArgValue::pointer(unsigned_val)); + return Ok(CArgValue::pointer(unsigned_val)); } // Value out of range - raise OverflowError return Err(vm.new_overflow_error("int too large to convert to pointer")); @@ -122,14 +121,12 @@ fn convert_to_pointer(value: &PyObject, vm: &VirtualMachine) -> PyResult<FfiArgV } /// ConvParam-like conversion for when argtypes is None -/// Returns an Argument with FFI type, value, and optional keep object +/// Returns an Argument with value and optional keep object fn conv_param(value: &PyObject, vm: &VirtualMachine) -> PyResult<Argument> { - // 1. CArgObject (from byref() or paramfunc) -> use stored type and value + // 1. CArgObject (from byref() or paramfunc) -> use stored value if let Some(carg) = value.downcast_ref::<CArgObject>() { - let ffi_type = ffi_type_from_tag(carg.tag); return Ok(Argument { - ffi_type, - keep: None, + keep: carg.keep.clone(), value: carg.value.clone(), }); } @@ -137,18 +134,15 @@ fn conv_param(value: &PyObject, vm: &VirtualMachine) -> PyResult<Argument> { // 2. None -> NULL pointer if value.is(&vm.ctx.none) { return Ok(Argument { - ffi_type: ffi_pointer_type(), keep: None, - value: FfiArgValue::pointer(0), + value: CArgValue::pointer(0), }); } // 3. ctypes objects -> use paramfunc if let Ok(carg) = super::base::call_paramfunc(value, vm) { - let ffi_type = ffi_type_from_tag(carg.tag); return Ok(Argument { - ffi_type, - keep: None, + keep: carg.keep, value: carg.value, }); } @@ -159,9 +153,8 @@ fn conv_param(value: &PyObject, vm: &VirtualMachine) -> PyResult<Argument> { let keep = vm.ctx.new_bytes(wide_bytes); let addr = keep.as_bytes().as_ptr() as usize; return Ok(Argument { - ffi_type: ffi_pointer_type(), keep: Some(keep.into()), - value: FfiArgValue::pointer(addr), + value: CArgValue::pointer(addr), }); } @@ -172,9 +165,8 @@ fn conv_param(value: &PyObject, vm: &VirtualMachine) -> PyResult<Argument> { let keep = vm.ctx.new_bytes(buffer); let addr = keep.as_bytes().as_ptr() as usize; return Ok(Argument { - ffi_type: ffi_pointer_type(), keep: Some(keep.into()), - value: FfiArgValue::pointer(addr), + value: CArgValue::pointer(addr), }); } @@ -182,18 +174,16 @@ fn conv_param(value: &PyObject, vm: &VirtualMachine) -> PyResult<Argument> { if let Ok(int_val) = value.try_int(vm) { let val = int_val.as_bigint().to_i32().unwrap_or(0); return Ok(Argument { - ffi_type: ffi_i32_type(), keep: None, - value: FfiArgValue::Scalar(FfiValue::I32(val)), + value: CArgValue::Int(val), }); } // 11. Python float -> f64 if let Ok(float_val) = value.try_float(vm) { return Ok(Argument { - ffi_type: ffi_f64_type(), keep: None, - value: FfiArgValue::Scalar(FfiValue::F64(float_val.to_f64())), + value: CArgValue::Double(float_val.to_f64()), }); } @@ -209,47 +199,47 @@ fn conv_param(value: &PyObject, vm: &VirtualMachine) -> PyResult<Argument> { } trait ArgumentType { - fn to_ffi_type(&self, vm: &VirtualMachine) -> PyResult<FfiType>; - fn convert_object(&self, value: PyObjectRef, vm: &VirtualMachine) -> PyResult<FfiArgValue>; + /// Convert an argument for this type into a foreign-call value plus an + /// optional owner keeping any referenced memory alive. + fn convert_object( + &self, + value: PyObjectRef, + vm: &VirtualMachine, + ) -> PyResult<(CArgValue, Option<PyObjectRef>)>; } impl ArgumentType for PyTypeRef { - fn to_ffi_type(&self, vm: &VirtualMachine) -> PyResult<FfiType> { - use super::pointer::PyCPointer; - use super::structure::PyCStructure; + fn convert_object( + &self, + value: PyObjectRef, + vm: &VirtualMachine, + ) -> PyResult<(CArgValue, Option<PyObjectRef>)> { + // Validate the argument type up front (mirrors the pre-conversion + // check): pointer-like ctypes types are always acceptable; a simple + // type must carry a known _type_ code; anything else is unsupported. + let type_code = if self.fast_issubclass(CArgObject::static_type()) + || self.fast_issubclass(PyCPointer::static_type()) + || self.fast_issubclass(PyCStructure::static_type()) + || self.fast_issubclass(PyCUnion::static_type()) + { + None + } else { + // Use get_attr to traverse MRO (for subclasses like MyInt(c_int)) + let typ = self + .as_object() + .get_attr(vm.ctx.intern_str("_type_"), vm) + .ok() + .ok_or_else(|| vm.new_type_error("Unsupported argument type"))?; + let typ = typ + .downcast_ref::<PyStr>() + .ok_or_else(|| vm.new_type_error("Unsupported argument type"))? + .to_string(); + if ffi_type_from_code(&typ).is_none() { + return Err(vm.new_type_error(format!("Unsupported argument type: {typ}"))); + } + Some(typ) + }; - // CArgObject (from byref()) should be treated as pointer - if self.fast_issubclass(CArgObject::static_type()) { - return Ok(ffi_pointer_type()); - } - - // Pointer types (POINTER(T)) are always pointer FFI type - // Check if type is a subclass of _Pointer (PyCPointer) - if self.fast_issubclass(PyCPointer::static_type()) { - return Ok(ffi_pointer_type()); - } - - // Structure types are passed as pointers - if self.fast_issubclass(PyCStructure::static_type()) { - return Ok(ffi_pointer_type()); - } - - // Use get_attr to traverse MRO (for subclasses like MyInt(c_int)) - let typ = self - .as_object() - .get_attr(vm.ctx.intern_str("_type_"), vm) - .ok() - .ok_or_else(|| vm.new_type_error("Unsupported argument type"))?; - let typ = typ - .downcast_ref::<PyStr>() - .ok_or_else(|| vm.new_type_error("Unsupported argument type"))?; - let typ = typ.to_string(); - let typ = typ.as_str(); - ffi_type_from_code(typ) - .ok_or_else(|| vm.new_type_error(format!("Unsupported argument type: {typ}"))) - } - - fn convert_object(&self, value: PyObjectRef, vm: &VirtualMachine) -> PyResult<FfiArgValue> { // Call from_param first to convert the value // converter = PyTuple_GET_ITEM(argtypes, i); // v = PyObject_CallOneArg(converter, arg); @@ -259,88 +249,62 @@ impl ArgumentType for PyTypeRef { let converted = from_param.call((value,), vm)?; // Then pass the converted value to ConvParam logic - // CArgObject (from from_param) -> use stored value directly + // CArgObject (from from_param) -> use stored value and keepalive directly if let Some(carg) = converted.downcast_ref::<CArgObject>() { - return Ok(carg.value.clone()); + return Ok((carg.value.clone(), carg.keep.clone())); } // None -> NULL pointer if vm.is_none(&converted) { - return Ok(FfiArgValue::pointer(0)); + return Ok((CArgValue::pointer(0), None)); } // For pointer types (POINTER(T)), we need to pass the pointer VALUE stored in buffer if self.fast_issubclass(PyCPointer::static_type()) { if let Some(pointer) = converted.downcast_ref::<PyCPointer>() { - return Ok(FfiArgValue::pointer(pointer.get_ptr_value())); + return Ok((CArgValue::pointer(pointer.get_ptr_value()), None)); } - return convert_to_pointer(&converted, vm); + return Ok((convert_to_pointer(&converted, vm)?, None)); } - // For structure types, convert to pointer to structure - if self.fast_issubclass(PyCStructure::static_type()) { - return convert_to_pointer(&converted, vm); + // For structure/union types, pass the aggregate by value: snapshot the + // instance bytes and build its call layout from the argtype. A byref() + // result is a CArgObject and was already handled above (stays a pointer). + if self.fast_issubclass(PyCStructure::static_type()) + || self.fast_issubclass(PyCUnion::static_type()) + { + if let Some(cdata) = converted.downcast_ref::<PyCData>() { + let bytes = cdata.buffer.read().to_vec(); + let layout = self.stg_info_opt().map_or_else( + || CTypeLayout::Opaque { size: bytes.len() }, + |stg| super::base::type_layout(self, &stg, vm), + ); + // Keep the converted instance alive through the call: the + // snapshot may embed pointers into buffers its keep-alive set + // owns, which must outlive the foreign call. + return Ok((CArgValue::aggregate(layout, bytes), Some(converted.clone()))); + } + return Ok((convert_to_pointer(&converted, vm)?, None)); } - // Get the type code for this argument type - let type_code = self - .as_object() - .get_attr(vm.ctx.intern_str("_type_"), vm) - .ok() - .and_then(|t| t.downcast_ref::<PyStr>().map(|s| s.to_string())); - // For pointer types (c_void_p, c_char_p, c_wchar_p), handle as pointer if matches!(type_code.as_deref(), Some("P" | "z" | "Z")) { - return convert_to_pointer(&converted, vm); + return Ok((convert_to_pointer(&converted, vm)?, None)); } // PyCSimple (already a ctypes instance from from_param) if let Ok(simple) = converted.downcast::<PyCSimple>() { - let typ = ArgumentType::to_ffi_type(self, vm)?; - let ffi_value = simple - .to_ffi_value(typ, vm) + let code = type_code + .as_deref() + .and_then(|s| s.chars().next()) .ok_or_else(|| vm.new_type_error("Unsupported argument type"))?; - return Ok(ffi_value); + return Ok((simple.to_carg_value(code), None)); } Err(vm.new_type_error("Unsupported argument type")) } } -trait ReturnType { - fn to_ffi_type(&self, vm: &VirtualMachine) -> Option<FfiType>; -} - -impl ReturnType for PyTypeRef { - fn to_ffi_type(&self, vm: &VirtualMachine) -> Option<FfiType> { - // Try to get _type_ attribute first (for ctypes types like c_void_p) - if let Ok(type_attr) = self.as_object().get_attr(vm.ctx.intern_str("_type_"), vm) - && let Some(s) = type_attr.downcast_ref::<PyStr>() - && let Some(ffi_type) = s.to_str().and_then(ffi_type_from_code) - { - return Some(ffi_type); - } - - // Check for Structure/Array types (have StgInfo but no _type_) - // _ctypes_get_ffi_type: returns appropriately sized type for struct returns - if let Some(stg_info) = self.stg_info_opt() { - let size = stg_info.size; - // Small structs can be returned in registers - // Match can_return_struct_as_int/can_return_struct_as_sint64 - return Some(ffi_type_for_return_size(size)); - } - - // Fallback to class name - ffi_type_from_code(self.name().to_string().as_str()) - } -} - -impl ReturnType for PyNone { - fn to_ffi_type(&self, _vm: &VirtualMachine) -> Option<FfiType> { - ffi_type_from_code("void") - } -} - // PyCFuncPtrType - Metaclass for function pointer types // PyCFuncPtrType_init @@ -676,12 +640,6 @@ impl PyCFuncPtr { rustpython_host_env::ctypes::read_pointer_from_buffer(&buffer) } - /// Get CodePtr from buffer for FFI calls - fn get_code_ptr(&self) -> Option<FfiCodePtr> { - let addr = self.get_func_ptr(); - rustpython_host_env::ctypes::code_ptr_from_addr(addr) - } - /// Create buffer with function pointer address fn make_ptr_buffer(addr: usize) -> Vec<u8> { pointer_bytes(addr) @@ -961,13 +919,86 @@ fn handle_internal_func(addr: usize, args: &FuncArgs, vm: &VirtualMachine) -> Op None } +/// How the foreign call's return value is retrieved (mirrors `CallRet`). +enum RetSpec { + /// restype is None: void return. + Void, + /// Pointer-valued return (a `TYPEFLAG_ISPOINTER` restype, or an oversized + /// by-value struct approximated as a pointer-sized register). + Pointer, + /// A scalar retrieved as the given ctypes simple-type code. + Code(char), + /// A by-value aggregate (struct/union) return with the given call layout. + Aggregate(CTypeLayout), +} + /// Call information extracted from PyCFuncPtr (argtypes, restype, etc.) struct CallInfo { explicit_arg_types: Option<Vec<PyTypeRef>>, restype_obj: Option<PyObjectRef>, + ret: RetSpec, +} + +/// Determine how to retrieve the return value from restype, reproducing the +/// prior `ffi_return_type` + `is_pointer_return` dispatch. +fn compute_ret_spec( restype_is_none: bool, - ffi_return_type: FfiType, - is_pointer_return: bool, + restype_obj: Option<&PyObjectRef>, + vm: &VirtualMachine, +) -> RetSpec { + if restype_is_none { + return RetSpec::Void; + } + let Some(restype_type) = restype_obj.and_then(|t| t.clone().downcast::<PyType>().ok()) else { + return RetSpec::Code('i'); + }; + + // Pointer return via TYPEFLAG_ISPOINTER (c_void_p, c_char_p, c_wchar_p, POINTER(T)) + if restype_type + .stg_info_opt() + .is_some_and(|info| info.flags.contains(StgInfoFlags::TYPEFLAG_ISPOINTER)) + { + return RetSpec::Pointer; + } + + // Simple type via its _type_ code (traversing MRO) + if let Ok(type_attr) = restype_type + .as_object() + .get_attr(vm.ctx.intern_str("_type_"), vm) + && let Some(s) = type_attr.downcast_ref::<PyStr>() + && let Some(code) = s.to_str() + && ffi_type_from_code(code).is_some() + { + return if simple_type_is_pointer(code) { + RetSpec::Pointer + } else { + RetSpec::Code(code.chars().next().unwrap_or('i')) + }; + } + + // Structure/Union (StgInfo, no _type_): returned by value as an aggregate. + // The layout is built from the held guard to avoid re-locking the type. + if let Some(stg_info) = restype_type.stg_info_opt() { + return match stg_info.paramfunc { + ParamFunc::Structure | ParamFunc::Union => { + RetSpec::Aggregate(super::base::type_layout(&restype_type, &stg_info, vm)) + } + // Any other aggregate-ish StgInfo without a code: size-approximated + // register return, as before. + _ => { + let size = stg_info.size; + if size <= 4 { + RetSpec::Code('i') + } else if size <= 8 { + RetSpec::Code('q') + } else { + RetSpec::Pointer + } + } + }; + } + + RetSpec::Code('i') } /// Extract call information (argtypes, restype) from PyCFuncPtr @@ -1012,33 +1043,12 @@ fn extract_call_info(zelf: &Py<PyCFuncPtr>, vm: &VirtualMachine) -> PyResult<Cal // Check if restype is explicitly None (return void) let restype_is_none = restype_obj.as_ref().is_some_and(|t| vm.is_none(t)); - let ffi_return_type = if restype_is_none { - ffi_void_type() - } else { - restype_obj - .as_ref() - .and_then(|t| t.clone().downcast::<PyType>().ok()) - .and_then(|t| ReturnType::to_ffi_type(&t, vm)) - .unwrap_or_else(ffi_i32_type) - }; - - // Check if return type is a pointer type via TYPEFLAG_ISPOINTER - // This handles c_void_p, c_char_p, c_wchar_p, and POINTER(T) types - let is_pointer_return = restype_obj - .as_ref() - .and_then(|t| t.clone().downcast::<PyType>().ok()) - .and_then(|t| { - t.stg_info_opt() - .map(|info| info.flags.contains(StgInfoFlags::TYPEFLAG_ISPOINTER)) - }) - .unwrap_or(false); + let ret = compute_ret_spec(restype_is_none, restype_obj.as_ref(), vm); Ok(CallInfo { explicit_arg_types, restype_obj, - restype_is_none, - ffi_return_type, - is_pointer_return, + ret, }) } @@ -1135,8 +1145,7 @@ fn resolve_com_method( /// Single argument for FFI call // struct argument struct Argument { - ffi_type: FfiType, - value: FfiArgValue, + value: CArgValue, #[allow(dead_code)] keep: Option<PyObjectRef>, // Object to keep alive during call } @@ -1198,13 +1207,8 @@ fn build_callargs_simple( let arg_type = arg_types .get(n) .ok_or_else(|| vm.new_type_error("argument amount mismatch"))?; - let ffi_type = ArgumentType::to_ffi_type(arg_type, vm)?; - let value = arg_type.convert_object(arg.clone(), vm)?; - Ok(Argument { - ffi_type, - keep: None, - value, - }) + let (value, keep) = arg_type.convert_object(arg.clone(), vm)?; + Ok(Argument { value, keep }) }) .collect::<PyResult<Vec<_>>>()?; Ok((arguments, Vec::new())) @@ -1241,17 +1245,14 @@ fn build_callargs_with_paramflags( let is_out = (*direction & 2) != 0; // OUT flag let is_in = (*direction & 1) != 0 || *direction == 0; // IN flag or default - let ffi_type = ArgumentType::to_ffi_type(arg_type, vm)?; - if is_out && !is_in { // Pure OUT parameter: create buffer, don't consume caller arg let buffer = create_out_buffer(arg_type, vm)?; let addr = get_buffer_addr(&buffer) .ok_or_else(|| vm.new_type_error("Cannot create OUT buffer for this type"))?; arguments.push(Argument { - ffi_type, keep: None, - value: FfiArgValue::pointer(addr), + value: CArgValue::pointer(addr), }); out_buffers.push((param_idx, buffer)); } else { @@ -1269,12 +1270,8 @@ fn build_callargs_with_paramflags( // IN|OUT: track for return out_buffers.push((param_idx, arg.clone())); } - let value = arg_type.convert_object(arg, vm)?; - arguments.push(Argument { - ffi_type, - keep: None, - value, - }); + let (value, keep) = arg_type.convert_object(arg, vm)?; + arguments.push(Argument { value, keep }); } } @@ -1307,13 +1304,8 @@ fn build_callargs( let arg_type = arg_types .get(n) .ok_or_else(|| vm.new_type_error("argument amount mismatch"))?; - let ffi_type = ArgumentType::to_ffi_type(arg_type, vm)?; - let value = arg_type.convert_object(arg.clone(), vm)?; - arguments.push(Argument { - ffi_type, - keep: None, - value, - }); + let (value, keep) = arg_type.convert_object(arg.clone(), vm)?; + arguments.push(Argument { value, keep }); } Ok((arguments, Vec::new())) } else { @@ -1322,22 +1314,31 @@ fn build_callargs( } } -/// Execute FFI call +/// Execute the foreign call through the unified `call` entry point. fn ctypes_callproc( - code_ptr: FfiCodePtr, + addr: usize, arguments: &[Argument], - call_info: &CallInfo, -) -> RawResult { - let ffi_arg_types: Vec<FfiType> = arguments.iter().map(|a| a.ffi_type.clone()).collect(); - let ffi_args: Vec<_> = arguments.iter().map(|a| a.value.as_arg()).collect(); - rustpython_host_env::ctypes::callproc( - code_ptr, - ffi_arg_types, - call_info.ffi_return_type.clone(), - &ffi_args, - call_info.restype_is_none, - call_info.is_pointer_return, - ) + ret: &RetSpec, + options: CallOptions, +) -> Result<CallValue, CallError> { + // Encode each simple-type code into its own buffer so the `&str` borrowed + // by `CallArg::Typed` outlives the call. + let mut code_bufs = vec![[0u8; 4]; arguments.len()]; + let call_args: Vec<_> = arguments + .iter() + .zip(code_bufs.iter_mut()) + .map(|(arg, code_buf)| arg.value.as_call_arg(code_buf)) + .collect(); + + let mut ret_code_buf = [0u8; 4]; + let call_ret = match ret { + RetSpec::Void => CallRet::Void, + RetSpec::Pointer => CallRet::Pointer, + RetSpec::Code(code) => CallRet::Code(code.encode_utf8(&mut ret_code_buf)), + RetSpec::Aggregate(layout) => CallRet::Aggregate(layout), + }; + + call(addr, &call_args, call_ret, options) } /// Check and handle HRESULT errors (Windows) @@ -1375,26 +1376,38 @@ fn check_hresult(hresult: i32, zelf: &Py<PyCFuncPtr>, vm: &VirtualMachine) -> Py } } -/// Convert raw FFI result to Python object +/// Convert the foreign-call result to a Python object // = GetResult fn convert_raw_result( - raw_result: &mut RawResult, + result: &CallValue, call_info: &CallInfo, vm: &VirtualMachine, ) -> Option<PyObjectRef> { - // Get result as bytes for type conversion - let (result_bytes, result_size) = rustpython_host_env::ctypes::call_result_bytes(raw_result)?; + // Result register image as bytes + size (None for void): pointer/scalar + // returns are pointer/register sized. + let (result_bytes, result_size) = match result { + CallValue::Void => return None, + CallValue::Pointer(ptr) => (ptr.to_ne_bytes().to_vec(), size_of::<usize>()), + CallValue::Scalar(bytes) | CallValue::Aggregate(bytes) => (bytes.clone(), bytes.len()), + }; + + // Integer view of the return register, for the fallback branches below. + let result_word: usize = match result { + CallValue::Pointer(ptr) => *ptr, + CallValue::Scalar(bytes) | CallValue::Aggregate(bytes) => { + let mut word = [0u8; size_of::<usize>()]; + let n = bytes.len().min(word.len()); + word[..n].copy_from_slice(&bytes[..n]); + usize::from_ne_bytes(word) + } + CallValue::Void => 0, + }; // 1. No restype → return as int let restype = match &call_info.restype_obj { None => { // Default: return as int - let val = match raw_result { - RawResult::Pointer(p) => *p as isize, - RawResult::Value(v) => *v as isize, - RawResult::Void => return None, - }; - return Some(vm.ctx.new_int(val).into()); + return Some(vm.ctx.new_int(result_word as isize).into()); } Some(r) => r, }; @@ -1409,12 +1422,7 @@ fn convert_raw_result( Ok(t) => t, Err(_) => { // Not a type, call it with int result - let val = match raw_result { - RawResult::Pointer(p) => *p as isize, - RawResult::Value(v) => *v as isize, - RawResult::Void => return None, - }; - return restype.call((val,), vm).ok(); + return restype.call((result_word as isize,), vm).ok(); } }; @@ -1423,15 +1431,19 @@ fn convert_raw_result( // No StgInfo → call restype with int if stg_info.is_none() { - let val = match raw_result { - RawResult::Pointer(p) => *p as isize, - RawResult::Value(v) => *v as isize, - RawResult::Void => return None, - }; - return restype_type.as_object().call((val,), vm).ok(); + return restype_type + .as_object() + .call((result_word as isize,), vm) + .ok(); } let info = stg_info.unwrap(); + // Extract what's needed and release the read guard before constructing any + // instance below: instance construction write-locks the type's StgInfo (to + // finalize it), which would self-deadlock against a held read guard. + let is_pointer_type = info.flags.contains(StgInfoFlags::TYPEFLAG_ISPOINTER); + let has_proto = info.proto.is_some(); + drop(info); // py_object: interpret return value as PyObject* and materialize it. if let Ok(type_attr) = restype_type @@ -1440,12 +1452,7 @@ fn convert_raw_result( && let Some(type_str) = type_attr.downcast_ref::<PyStr>() && type_str.to_str() == Some("O") { - let ptr = match raw_result { - RawResult::Pointer(p) => *p, - RawResult::Value(v) => *v as usize, - RawResult::Void => 0, - }; - let ptr = NonNull::new(ptr as *mut PyObject).or_else(|| { + let ptr = NonNull::new(result_word as *mut PyObject).or_else(|| { vm.set_exception(Some(vm.new_value_error("PyObject is NULL"))); None })?; @@ -1469,9 +1476,9 @@ fn convert_raw_result( // This handles POINTER(T), Structure, Array, etc. // Special handling for POINTER(T) types - set pointer value directly - if info.flags.contains(StgInfoFlags::TYPEFLAG_ISPOINTER) - && info.proto.is_some() - && let RawResult::Pointer(ptr) = raw_result + if is_pointer_type + && has_proto + && let CallValue::Pointer(ptr) = result && let Ok(instance) = restype_type.as_object().call((), vm) { if let Some(pointer) = instance.downcast_ref::<PyCPointer>() { @@ -1516,7 +1523,7 @@ fn extract_out_values( /// Build final result (main function) fn build_result( - mut raw_result: RawResult, + call_result: CallValue, call_info: &CallInfo, out_buffers: OutBuffers, zelf: &Py<PyCFuncPtr>, @@ -1525,19 +1532,22 @@ fn build_result( ) -> PyResult { // Check HRESULT on Windows #[cfg(windows)] - if let RawResult::Value(val) = raw_result { + if let CallValue::Scalar(bytes) = &call_result { let is_hresult = call_info .restype_obj .as_ref() .and_then(|t| t.clone().downcast::<PyType>().ok()) .is_some_and(|t| t.name().to_string() == "HRESULT"); if is_hresult { - check_hresult(val as i32, zelf, vm)?; + let mut word = [0u8; size_of::<usize>()]; + let n = bytes.len().min(word.len()); + word[..n].copy_from_slice(&bytes[..n]); + check_hresult(usize::from_ne_bytes(word) as i32, zelf, vm)?; } } - // Convert raw result to Python object - let mut result = convert_raw_result(&mut raw_result, call_info, vm); + // Convert the foreign-call result to a Python object + let mut result = convert_raw_result(&call_result, call_info, vm); // Apply errcheck if set if let Some(errcheck) = zelf.errcheck.read().as_ref() { @@ -1583,44 +1593,34 @@ impl Callable for PyCFuncPtr { let (arguments, out_buffers) = build_callargs(&args, &call_info, paramflags.as_ref(), is_com_method, vm)?; - // 6. Get code pointer - let code_ptr = match func_ptr.or_else(|| zelf.get_code_ptr()) { - Some(cp) => cp, - None => { - debug_assert!(false, "NULL function pointer"); - // In release mode, this will crash - null_code_ptr() - } + // 6. Function address (usize); the unified `call` rejects a NULL address. + let addr = match func_ptr { + Some(cp) => cp.0 as usize, + None => zelf.get_func_ptr(), }; - // 7. Get flags to check for use_last_error/use_errno + // 7. Errno / last-error swap options from flags let flags = Self::_flags_(zelf, vm); - - // 8. Call the function (with use_last_error/use_errno handling) - #[cfg(not(windows))] - let raw_result = { - if flags & super::base::StgInfoFlags::FUNCFLAG_USE_ERRNO.bits() != 0 { - rustpython_host_env::ctypes::with_swapped_errno(|| { - ctypes_callproc(code_ptr, &arguments, &call_info) - }) - } else { - ctypes_callproc(code_ptr, &arguments, &call_info) - } + let options = CallOptions { + use_errno: flags & super::base::StgInfoFlags::FUNCFLAG_USE_ERRNO.bits() != 0, + use_last_error: flags & super::base::StgInfoFlags::FUNCFLAG_USE_LASTERROR.bits() != 0, }; - #[cfg(windows)] - let raw_result = { - if flags & super::base::StgInfoFlags::FUNCFLAG_USE_LASTERROR.bits() != 0 { - rustpython_host_env::ctypes::with_swapped_last_error(|| { - ctypes_callproc(code_ptr, &arguments, &call_info) - }) - } else { - ctypes_callproc(code_ptr, &arguments, &call_info) - } - }; + // 8. Call the function through the unified entry point. + let call_result = ctypes_callproc(addr, &arguments, &call_info.ret, options).map_err( + |err| match err { + CallError::NullFunctionPointer => vm.new_value_error("NULL function pointer"), + CallError::UnknownTypeCode(code) => { + vm.new_type_error(format!("Unsupported argument type: {code}")) + } + CallError::BufferTooSmall { expected, got } => vm.new_value_error(format!( + "argument buffer too small: expected {expected}, got {got}" + )), + }, + )?; // 9. Build result - build_result(raw_result, &call_info, out_buffers, zelf, &args, vm) + build_result(call_result, &call_info, out_buffers, zelf, &args, vm) } } diff --git a/crates/vm/src/stdlib/_ctypes/simple.rs b/crates/vm/src/stdlib/_ctypes/simple.rs index 122c23cc2..c947e5601 100644 --- a/crates/vm/src/stdlib/_ctypes/simple.rs +++ b/crates/vm/src/stdlib/_ctypes/simple.rs @@ -1,8 +1,7 @@ use super::_ctypes::CArgObject; use super::array::PyCArray; use super::base::{ - CDATA_BUFFER_METHODS, FfiArgValue, PyCData, StgInfo, StgInfoFlags, buffer_to_ffi_value, - bytes_to_pyobject, + CArgValue, CDATA_BUFFER_METHODS, PyCData, StgInfo, StgInfoFlags, bytes_to_pyobject, }; use super::function::PyCFuncPtr; use super::pointer::PyCPointer; @@ -263,11 +262,11 @@ impl PyCSimpleType { let simple_obj: PyObjectRef = simple.into_ref_with_type(vm, cls.clone())?.into(); // from_param returns CArgObject, not the simple type itself let tag = type_str.as_bytes().first().copied().unwrap_or(b'?'); - let ffi_value = buffer_to_ffi_value(type_str, &buffer_bytes); Ok(CArgObject { tag, - value: ffi_value, + value: CArgValue::typed(tag as char, &buffer_bytes), obj: simple_obj, + keep: None, size: 0, offset: 0, } @@ -319,8 +318,9 @@ impl PyCSimpleType { let (kept_alive, ptr) = super::base::ensure_z_null_terminated(bytes, vm); return Ok(CArgObject { tag: b'z', - value: FfiArgValue::OwnedPointer(ptr, kept_alive), + value: CArgValue::pointer(ptr), obj: value.clone(), + keep: Some(kept_alive), size: 0, offset: 0, } @@ -344,8 +344,9 @@ impl PyCSimpleType { let (holder, ptr) = super::base::str_to_wchar_bytes(s.as_wtf8(), vm); return Ok(CArgObject { tag: b'Z', - value: FfiArgValue::OwnedPointer(ptr, holder), + value: CArgValue::pointer(ptr), obj: value.clone(), + keep: Some(holder), size: 0, offset: 0, } @@ -373,8 +374,9 @@ impl PyCSimpleType { let (kept_alive, ptr) = super::base::ensure_z_null_terminated(bytes, vm); return Ok(CArgObject { tag: b'z', - value: FfiArgValue::OwnedPointer(ptr, kept_alive), + value: CArgValue::pointer(ptr), obj: value.clone(), + keep: Some(kept_alive), size: 0, offset: 0, } @@ -385,8 +387,9 @@ impl PyCSimpleType { let (holder, ptr) = super::base::str_to_wchar_bytes(s.as_wtf8(), vm); return Ok(CArgObject { tag: b'Z', - value: FfiArgValue::OwnedPointer(ptr, holder), + value: CArgValue::pointer(ptr), obj: value.clone(), + keep: Some(holder), size: 0, offset: 0, } @@ -412,8 +415,9 @@ impl PyCSimpleType { }; return Ok(CArgObject { tag: b'P', - value: FfiArgValue::pointer(ptr_val), + value: CArgValue::pointer(ptr_val), obj: value.clone(), + keep: None, size: 0, offset: 0, } @@ -429,8 +433,9 @@ impl PyCSimpleType { }; return Ok(CArgObject { tag: b'Z', - value: FfiArgValue::pointer(ptr_val), + value: CArgValue::pointer(ptr_val), obj: value.clone(), + keep: None, size: 0, offset: 0, } @@ -442,8 +447,9 @@ impl PyCSimpleType { Some("O") => { return Ok(CArgObject { tag: b'O', - value: FfiArgValue::pointer(value.get_id()), + value: CArgValue::pointer(value.get_id()), obj: value, + keep: None, size: 0, offset: 0, } @@ -1255,17 +1261,10 @@ impl PyCSimple { } impl PyCSimple { - /// Extract the value from this ctypes object as an owned FfiArgValue. - /// The value must be kept alive until after the FFI call completes. - pub(crate) fn to_ffi_value( - &self, - ty: rustpython_host_env::ctypes::FfiType, - _vm: &VirtualMachine, - ) -> Option<FfiArgValue> { + /// Snapshot this object's buffer as a simple-typed foreign-call value. + pub(crate) fn to_carg_value(&self, code: char) -> CArgValue { let buffer = self.0.buffer.read(); - Some(FfiArgValue::Scalar( - rustpython_host_env::ctypes::ffi_value_from_type(&buffer, ty)?, - )) + CArgValue::typed(code, &buffer) } } diff --git a/crates/vm/src/stdlib/_ctypes/structure.rs b/crates/vm/src/stdlib/_ctypes/structure.rs index 96321cd7d..39bb8a574 100644 --- a/crates/vm/src/stdlib/_ctypes/structure.rs +++ b/crates/vm/src/stdlib/_ctypes/structure.rs @@ -269,14 +269,14 @@ impl PyCStructType { // Determine byte order for format string let big_endian = super::base::is_big_endian(is_swapped); - // Initialize offset, alignment, type flags, and ffi_field_types from base class + // Initialize offset, alignment, type flags, and field_layouts from base class let ( mut offset, mut max_align, mut has_pointer, mut has_union, mut has_bitfield, - mut ffi_field_types, + mut field_layouts, ) = { let bases = cls.bases.read(); if let Some(base) = bases.first() @@ -288,7 +288,7 @@ impl PyCStructType { baseinfo.flags.contains(StgInfoFlags::TYPEFLAG_HASPOINTER), baseinfo.flags.contains(StgInfoFlags::TYPEFLAG_HASUNION), baseinfo.flags.contains(StgInfoFlags::TYPEFLAG_HASBITFIELD), - baseinfo.ffi_field_types.clone(), + baseinfo.field_layouts.clone(), ) } else { (0, forced_alignment, false, false, false, Vec::new()) @@ -366,8 +366,8 @@ impl PyCStructType { if field_stg.flags.contains(StgInfoFlags::TYPEFLAG_HASBITFIELD) { has_bitfield = true; } - // Collect FFI type for this field - ffi_field_types.push(field_stg.to_ffi_type()); + // Collect the call layout for this field + field_layouts.push(super::base::type_layout(type_obj, &field_stg, vm)); } // Mark field type as finalized (using type as field finalizes it) @@ -552,8 +552,8 @@ impl PyCStructType { stg_info.paramfunc = super::base::ParamFunc::Structure; // Set byte order: swap if _swappedbytes_ is defined stg_info.big_endian = super::base::is_big_endian(is_swapped); - // Store FFI field types for structure passing - stg_info.ffi_field_types = ffi_field_types; + // Store field call layouts for by-value structure passing + stg_info.field_layouts = field_layouts; super::base::set_or_init_stginfo(cls, stg_info); // Process _anonymous_ fields diff --git a/crates/vm/src/stdlib/_ctypes/union.rs b/crates/vm/src/stdlib/_ctypes/union.rs index e0b4900cb..8d37178d5 100644 --- a/crates/vm/src/stdlib/_ctypes/union.rs +++ b/crates/vm/src/stdlib/_ctypes/union.rs @@ -184,9 +184,9 @@ impl PyCUnionType { let forced_alignment = super::base::get_usize_attr(cls.as_object(), "_align_", 1, vm)?.max(1); - // Initialize size, alignment, type flags, and ffi_field_types from base class + // Initialize size, alignment, type flags, and field_layouts from base class // Note: Union fields always start at offset 0, but we inherit base size/align - let (mut max_size, mut max_align, mut has_pointer, mut has_bitfield, mut ffi_field_types) = { + let (mut max_size, mut max_align, mut has_pointer, mut has_bitfield, mut field_layouts) = { let bases = cls.bases.read(); if let Some(base) = bases.first() && let Some(baseinfo) = base.stg_info_opt() @@ -196,7 +196,7 @@ impl PyCUnionType { core::cmp::max(baseinfo.align, forced_alignment), baseinfo.flags.contains(StgInfoFlags::TYPEFLAG_HASPOINTER), baseinfo.flags.contains(StgInfoFlags::TYPEFLAG_HASBITFIELD), - baseinfo.ffi_field_types.clone(), + baseinfo.field_layouts.clone(), ) } else { (0, forced_alignment, false, false, Vec::new()) @@ -256,8 +256,8 @@ impl PyCUnionType { if field_stg.flags.contains(StgInfoFlags::TYPEFLAG_HASBITFIELD) { has_bitfield = true; } - // Collect FFI type for this field - ffi_field_types.push(field_stg.to_ffi_type()); + // Collect the call layout for this field + field_layouts.push(super::base::type_layout(type_obj, &field_stg, vm)); } // Mark field type as finalized (using type as field finalizes it) @@ -345,8 +345,8 @@ impl PyCUnionType { stg_info.paramfunc = super::base::ParamFunc::Union; // Set byte order: swap if _swappedbytes_ is defined stg_info.big_endian = super::base::is_big_endian(is_swapped); - // Store FFI field types for union passing - stg_info.ffi_field_types = ffi_field_types; + // Store field call layouts for by-value union passing + stg_info.field_layouts = field_layouts; super::base::set_or_init_stginfo(cls, stg_info); // Process _anonymous_ fields diff --git a/extra_tests/snippets/stdlib_ctypes_byvalue.py b/extra_tests/snippets/stdlib_ctypes_byvalue.py new file mode 100644 index 000000000..73d4b3345 --- /dev/null +++ b/extra_tests/snippets/stdlib_ctypes_byvalue.py @@ -0,0 +1,106 @@ +# ctypes by-value aggregate arguments and returns over the live FFI path. +# +# Exercises passing structs/unions BY VALUE to foreign functions and returning +# structs BY VALUE through the unified host_env `call` entry point: +# - div(7, 3) / div(-7, 3): return div_t{quot, rem} by value (8-byte int +# struct, register-returned on SysV/AArch64), +# - imaxdiv(7, 3): return imaxdiv_t{quot, rem} by value (16-byte two-long +# struct, two-register return on SysV), +# - inet_ntoa(struct in_addr): take a 4-byte struct by value, with argtypes, +# without argtypes (direct-instance paramfunc path), and via a Union. +# +# Runs on little-endian linux/macOS; skipped on Windows (see below). Prints +# "OK"; a failed assertion aborts with a non-zero status. + +import ctypes +import sys +from ctypes import ( + CDLL, + Structure, + Union, + c_char, + c_char_p, + c_int, + c_int64, + c_uint32, + sizeof, +) + +if sys.platform == "win32": + # The C library is not reachable as CDLL(None) on Windows; by-value + # aggregate calls are covered there by test_ctypes. Keep output identical. + print("OK") + sys.exit(0) + + +libc = CDLL(None) + + +# 1. struct RETURN by value: div(7, 3) -> div_t{quot=2, rem=1} +class div_t(Structure): + _fields_ = [("quot", c_int), ("rem", c_int)] + + +assert sizeof(div_t) == 8, sizeof(div_t) +libc.div.argtypes = [c_int, c_int] +libc.div.restype = div_t + +r = libc.div(7, 3) +assert isinstance(r, div_t) +assert (r.quot, r.rem) == (2, 1), (r.quot, r.rem) + +# C division truncates toward zero. +r = libc.div(-7, 3) +assert (r.quot, r.rem) == (-2, -1), (r.quot, r.rem) + +# struct RETURN by value with NO argtypes on the arguments (ints via ConvParam) +libc.div.argtypes = None +r = libc.div(17, 5) +assert (r.quot, r.rem) == (3, 2), (r.quot, r.rem) + + +# 2. larger struct RETURN by value: imaxdiv(7, 3) -> imaxdiv_t{quot=2, rem=1} +class imaxdiv_t(Structure): + _fields_ = [("quot", c_int64), ("rem", c_int64)] + + +assert sizeof(imaxdiv_t) == 16, sizeof(imaxdiv_t) +libc.imaxdiv.argtypes = [c_int64, c_int64] +libc.imaxdiv.restype = imaxdiv_t + +r = libc.imaxdiv(7, 3) +assert (r.quot, r.rem) == (2, 1), (r.quot, r.rem) +r = libc.imaxdiv(-9, 4) +assert (r.quot, r.rem) == (-2, -1), (r.quot, r.rem) + + +# 3. struct ARGUMENT by value: inet_ntoa(struct in_addr) -> b"1.2.3.4" +class in_addr(Structure): + _fields_ = [("s_addr", c_uint32)] + + +assert sizeof(in_addr) == 4, sizeof(in_addr) +# `s_addr` holds the four address bytes in memory (network) order; a host-endian +# int whose bytes are [1, 2, 3, 4] yields the dotted string "1.2.3.4". +addr_value = int.from_bytes(bytes([1, 2, 3, 4]), sys.byteorder) + +libc.inet_ntoa.argtypes = [in_addr] +libc.inet_ntoa.restype = c_char_p +assert libc.inet_ntoa(in_addr(addr_value)) == b"1.2.3.4" + +# struct ARGUMENT by value with NO argtypes (direct-instance paramfunc path) +libc.inet_ntoa.argtypes = None +assert libc.inet_ntoa(in_addr(addr_value)) == b"1.2.3.4" + + +# 4. union ARGUMENT by value: a union laid out like in_addr, passed by value. +class in_addr_u(Union): + _fields_ = [("s_addr", c_uint32), ("bytes", c_char * 4)] + + +assert sizeof(in_addr_u) == 4, sizeof(in_addr_u) +libc.inet_ntoa.argtypes = [in_addr_u] +libc.inet_ntoa.restype = c_char_p +assert libc.inet_ntoa(in_addr_u(addr_value)) == b"1.2.3.4" + +print("OK") diff --git a/extra_tests/snippets/stdlib_ctypes_calls.py b/extra_tests/snippets/stdlib_ctypes_calls.py new file mode 100644 index 000000000..1de299314 --- /dev/null +++ b/extra_tests/snippets/stdlib_ctypes_calls.py @@ -0,0 +1,64 @@ +# Exercises the migrated _ctypes foreign-call path (routed through the unified +# host_env `call` entry point): scalar int/double arguments and returns, +# pointer (c_char_p / c_void_p) returns, and a use_errno round-trip. +# +# Prints "OK" and exits 0; any failed assertion aborts. Output is identical +# under CPython and RustPython on the same platform. +import ctypes +import errno +import sys +from ctypes import ( + CDLL, + c_char_p, + c_double, + c_int, + c_long, + c_size_t, + c_void_p, + get_errno, + set_errno, +) + +if sys.platform == "win32": + # The C library is not reachable as CDLL(None) on Windows; the migrated + # path is covered there by test_ctypes. Keep output identical regardless. + print("OK") + sys.exit(0) + +libc = CDLL(None, use_errno=True) + +# 1. scalar int argument + int return: abs(-5) == 5 +libc.abs.argtypes = [c_int] +libc.abs.restype = c_int +assert libc.abs(-5) == 5, libc.abs(-5) + +# 2. pointer argument (bytes -> char*) + size_t return: strlen(b"hello") == 5 +libc.strlen.argtypes = [c_char_p] +libc.strlen.restype = c_size_t +assert libc.strlen(b"hello") == 5, libc.strlen(b"hello") + +# 3. double argument + double return: sqrt(2.0) +libc.sqrt.argtypes = [c_double] +libc.sqrt.restype = c_double +root = libc.sqrt(2.0) +assert abs(root - 2.0**0.5) < 1e-12, root + +# 4. c_char_p return: strchr(b"abcdef", 'c') -> b"cdef" +libc.strchr.argtypes = [c_char_p, c_int] +libc.strchr.restype = c_char_p +assert libc.strchr(b"abcdef", ord("c")) == b"cdef", libc.strchr(b"abcdef", ord("c")) + +# 5. c_void_p return: the same call yields a non-null integer address +libc.strchr.restype = c_void_p +addr = libc.strchr(b"abcdef", ord("c")) +assert isinstance(addr, int) and addr != 0, addr + +# 6. use_errno round-trip: strtol overflow sets errno == ERANGE, captured into +# the ctypes-private errno by the call's errno swap. +libc.strtol.argtypes = [c_char_p, c_void_p, c_int] +libc.strtol.restype = c_long +set_errno(0) +libc.strtol(b"9" * 40, None, 10) +assert get_errno() == errno.ERANGE, (get_errno(), errno.ERANGE) + +print("OK") From 210ccc889c158b07908bf0e66b01363741163835 Mon Sep 17 00:00:00 2001 From: "Jeong, YunWon" <69878+youknowone@users.noreply.github.com> Date: Wed, 8 Jul 2026 15:21:41 +0900 Subject: [PATCH 205/339] Thread-safe type operations: type lock, QSBR type-cache reclamation, GC stop-the-world, and interpreter optimizations (#7416) * type lock * Drop old PyObjectRef outside type lock to prevent deadlock Dropping values inside with_type_lock can trigger weakref callbacks, which may access attributes (LOAD_ATTR specialization) and re-acquire the non-reentrant type mutex, causing deadlock. Return old values from lock closures so they drop after lock release. * Align type lock behavior with CPython * Add PUBLISHED flag bit to RefCount state word Assisted-by: Claude * Add QSBR module for deferred memory reclamation Assisted-by: Claude * Defer memory free of cache-published objects via QSBR Assisted-by: Claude * Wire QSBR checkpoints into thread lifecycle and eval breaker Assisted-by: Claude * Publish type-cache values to QSBR and bypass cache without a VM Mark cached type-method values as QSBR-published before storing their pointer in TYPE_CACHE, so racing readers never try-incref freed memory. Debug-assert that the current thread is ATTACHED whenever a lock-free cache read happens. Delete find_name_in_mro_without_vm and its unsound direct SeqLock read outside any VM/thread registration; find_name_in_mro now falls back to the locked, uncached MRO walk when no VM is current. This also removes assign_version_tag()'s last caller, so its unlocked fallback is deleted along with it (version_for_specialization keeps the locked path). VirtualMachine::initialize() runs Python bytecode (e.g. importing codecs/encodings) before any enter_vm scope exists, which left the bootstrap thread not ATTACHED for cache reads during startup. Add thread::VmBootstrapGuard, an RAII counterpart to enter_vm usable across statements that need &mut VirtualMachine, and wrap initialize() with it. Assisted-by: Claude * Use try-incref reads and QSBR-backed swaps in specialization cache Assisted-by: Claude * Reset QSBR thread registry after fork in the child Add Qsbr::reset_after_fork, which clears the registered thread slots before draining the retire queue. Call it in py_os_after_fork_child, right after type_cache_after_fork() and before _thread::after_fork_child() re-registers the surviving thread. Dead parent threads' Arc<QsbrSlot> handles live on in the child's copied memory with no destructor ever running, so without this the registry keeps them 'online' forever and future grace periods never complete. Assisted-by: Claude * Add threaded stress test for type cache mutation races Assisted-by: Claude * Restrict qsbr internals to pub(crate) and fix clippy lints Downgrade pub items in the private qsbr::threading module (QsbrSlot, Qsbr, QSBR, and its methods) to pub(crate), since they were never reachable outside the crate. Downgrade ThreadSlot::qsbr accordingly to avoid a private-interfaces warning. Import Arc/Weak from alloc instead of std to match clippy::std_instead_of_alloc. Rewrite the process() comment: goals are not strictly ordered by push order since advance() and the queue push aren't atomic together, so concurrent free_delayed calls can interleave; the drained prefix stays sound because each item individually passed poll, with reordering only affecting reclamation latency. Assisted-by: Claude * Gate per-instruction QSBR check behind a global pending flag eval_breaker_tripped() and check_signals() called thread::qsbr_break_requested() on every bytecode instruction, which does a thread-local lookup, RefCell borrow, and atomic load even when no QSBR retirement is pending. This caused a measured 10-18% slowdown on tight interpreter loops. Add Qsbr::pending, a global AtomicBool set under the queue lock while free_delayed() holds a retired allocation, and cleared under the same lock by process()/drain_all() once the queue empties. The hot path now checks Qsbr::break_pending() (a single relaxed static load) before touching thread-local state, and only pays the TLS cost while a retirement is actually in flight. Assisted-by: Claude * Merge signal and QSBR eval-breaker flags into one atomic word Replace the separate ANY_TRIGGERED AtomicBool and QSBR pending AtomicBool checks in the per-instruction eval-breaker path with a single AtomicU8 (EVAL_BREAKER) holding a bit per source. The global QSBR instance mirrors its pending state into the QSBR bit under the same queue-lock critical sections that already toggle pending, while local QSBR instances used by unit tests are left untouched. eval_breaker_tripped() and check_signals() now read/act on the merged word (eval_breaker_pending(), qsbr_bit_set()) instead of issuing two separate atomic loads per instruction. set_triggered() switches from store to fetch_or so a signal handler never clobbers the QSBR bit. Removed the now-unreferenced is_triggered() helper; break_pending() is kept for unit tests only and marked allow(dead_code) outside test builds. Assisted-by: Claude * Skip freelist reuse for published objects in default_dealloc Freelist-eligible payloads (tuple, int, list, dict, float, ...) were routed to T::freelist_push before ever reaching PyInner::dealloc, so a published object (e.g. a tuple cached as a type attribute) bypassed the is_published -> free_delayed QSBR hook entirely. That let PyRef::new_ref reuse the slot and rewrite the refcount word with a non-atomic core::ptr::write racing a reader's atomic try-incref, and let FreeList::drop call alloc::dealloc directly while a reader could still be mid-read. Gate the freelist branch in default_dealloc on RefCount::is_published(), checked before any teardown. A published object now always falls through to PyInner::dealloc, whose existing hook defers the memory free via QSBR. Document the non-unix (e.g. Windows) reclamation-latency limitation in the QSBR design doc's Lifecycle integration section (previously only noted in a code comment in vm/thread.rs). Extend the type-cache stress test so the mutator also churns a freelist-eligible published tuple class attribute (C.shape), read by readers each inner loop and deleted on the same cadence as C.m, to exercise the fixed bypass. Assisted-by: Claude * Use itoa for PyInt::to_str_radix_10 i64 fast path Format small integers with itoa::Buffer instead of i64::to_string() in PyInt::to_str_radix_10(), which backs both str(int)/repr(int) for exact int and PyObject::str()'s exact-int fast path. Adds the itoa crate as a workspace dependency. Assisted-by: Claude * Make object attribute dunders wrapper descriptors Remove the __getattribute__, __setattr__ and __delattr__ #[pymethod]s from PyBaseObject so add_operators installs PyWrapper slot wrappers for them from the #[pyslot] functions instead of method descriptors. lookup_slot_in_mro now classifies these entries as NativeSlot, so heap types without Python-level overrides keep the native getattro/setattro slot functions, which lets LOAD_ATTR/STORE_ATTR specialization apply to instances of Python-defined classes. Since __setattr__ and __delattr__ share the setattro slot, resolve both names together in update_one_slot: overriding only one of them no longer lets the other name's native resolution overwrite the dispatching wrapper. Assisted-by: Claude * Resolve TpSetattro pair on attribute deletion, not just addition update_one_slot's TpSetattro branch only ran the combined __setattr__/__delattr__ resolution (added in the previous commit) when ADD was true. On deletion (e.g. del C.__setattr__), it fell back to inherit_from_mro, which copies the base class's slot and discards the class's own remaining Python-level override of the other name. lookup_slot_in_mro reads the current attribute dicts, so the same resolution is correct for both addition and deletion; the ADD-only guard is removed and the logic now always runs. Assisted-by: Claude * Generate Opcode::cache_entries/deopt as table lookups generate_rs_opcode_metadata.py now emits a 256-entry const array for each function instead of a chained match over opcode names. Opcode::deopt() indexes an [Option<Opcode>; 256] table built from the existing specialization-to-base mapping, and Opcode::cache_entries() indexes a [u8; 256] table that bakes in the same deopt/to_base composition deoptimize() previously performed before its own match. Regenerated opcode_metadata.rs from the updated script; PseudoOpcode's bodies are unchanged since it has no cache/deopt entries to table. Added an exhaustive test in instruction.rs that checks every valid u8 opcode against a frozen copy of the old chained-match bodies. Assisted-by: Claude * Make Opcode/Instruction numeric conversions O(1) Opcode::as_numeric, Opcode::as_instruction and Instruction::as_opcode were each a per-variant match over ~230 arms in the define_opcodes! macro. Opcode now carries the same explicit $op_id discriminants and #[repr($typ)] as Instruction, which makes the conversions sound as: - Opcode::as_numeric: a plain `self as $typ` identity cast. - Opcode::as_instruction / Instruction::as_opcode: a mem::transmute, relying on both enums sharing one-$typ-wide layout (Instruction's payload fields are all the zero-sized Arg<T> marker, checked by a new per-instantiation size_of assertion). try_from_numeric is left as a match: $op_id values have gaps (specialized/instrumented opcode ranges), so a range check can't replace it. Adds #[inline] to the rewritten conversions plus deoptimize, and to the small generated wrapper/table-lookup functions from the previous opcode-metadata change (as_u8/as_u16, cache_entries, deopt, to_base) via generate_rs_opcode_metadata.py, then regenerates opcode_metadata.rs. Extends the instruction.rs equivalence-test pattern with two exhaustive tests (u8 and u16 instantiations) checking the new identity-cast/transmute conversions against the untouched try_from_numeric/TryFrom paths. Assisted-by: Claude * Pop CallIsinstance arguments directly instead of collecting into Vecs The specialized handler built two heap-allocated Vecs per call (pop_multiple().collect() plus a with_capacity(2) buffer) before invoking is_instance. Pop the class and instance straight off the stack for the effective two-argument case, removing the per-call allocations. Assisted-by: Claude * Inherit tp_new instead of always installing new_wrapper update_one_slot's TpNew branch stored new_wrapper for every ADD, so all heap types had slots.new == new_wrapper and the CallAllocAndEnterInit specialization never fired. Now __new__ is resolved through the MRO dicts: an own or Python-level definition installs new_wrapper, while a builtin __new__ entry (or none) inherits slots.new from the solid base. The now-reachable CallAllocAndEnterInit path gains the missing guards: the specializer requires co_argcount == oparg + 1 (via can_specialize_call) and rejects generator-like __init__, and the handler re-checks the argcount against the class-level init cache. Without the argcount check, __init__ defaults broke re._parser (UnboundLocalError in SubPattern.__init__). Remove the now-unused is_simple_for_call_specialization. Assisted-by: Claude * Skip locals dict allocation for the init-cleanup shim frame Mark the shim code object NEWLOCALS and create the shim frame with no locals mapping so FrameLocals::lazy() is used. The shim only executes ExitInitCheck/ReturnValue and never touches locals, so this removes one dict allocation per specialized instantiation. Assisted-by: Claude * Guard CALL_ALLOC_AND_ENTER_INIT with cached function version The init specialization cache stored only the type version, so swapping __init__.__code__ (which zeroes func_version) did not deopt the warmed call site and stale code assumptions (argcount shape, no varargs/kwonly, not a generator) were applied to the new code object. Store get_version_for_current_state() in the specialization cache when caching __init__ and re-check func_version() in the handler before using the cached function, deopting to the generic call path on mismatch, the same way the getitem specialization cache does. Assisted-by: Claude * Apply rustfmt and ruff-format fixes to files from earlier commits Assisted-by: Claude * Add frame object freelist Frame.iframe becomes FrameUnsafeCell<Option<InterpreterFrame>> so a dead frame can be left as an empty husk. Traverse::clear extracts all owned child references (including localsplus values via LocalsPlus::clear_into) and empties the cell. Dead frame allocations are cached in a thread-local FreeList<Frame> (up to 200 entries) and reused by PyRef::new_ref. clear_generator returns early when the frame was already cleared by cycle collection; generator drops can run after tp_clear of their frame. gc: skip tp_clear for objects saved to gc.garbage by DEBUG_SAVEALL, since they remain reachable from Python. Assisted-by: Claude * Drop frame children directly in tp_clear instead of extracting Pushing the frame's ~10 child references into the clear buffer grew a Vec on every frame deallocation. Take the interpreter frame out of the cell and drop it in place; LocalsPlus::clear_into is removed. Assisted-by: Claude * Untrack objects before tp_clear and guard cross-thread f_locals The cycle collector called tp_clear on unreachable objects while they were still linked into the GC generation lists, so another thread could obtain a strong reference to an already-cleared object (e.g. a frame husk with iframe == None) via gc.get_objects() and access the cleared payload. Untrack the dead set before the clear phase, mirroring the untrack-then-clear ordering of the refcount dealloc path. Objects that gained an external reference before untracking are found by comparing each object's strong count against the references coming from within the dead set; such late-resurrected objects and everything reachable from them are re-tracked and skipped, letting a later collection retry once the external references are released. Also reject f_locals access for a frame currently executing on another thread. Reading fastlocals of such a frame races with the executing thread overwriting the slots (torn reads of dropped values). Access from the executing thread itself (locals(), trace callbacks) is still allowed via the current-frame chain check. Assisted-by: Claude * Skip localsplus heap copy for uniquely referenced dying frames release_datastack_frame now checks the frame's strong count after untracking it from the GC generation lists. When the caller holds the only reference, localsplus values are dropped in place and the data stack storage is released without the heap copy; escaped frames (traceback, sys._getframe, trace callbacks) keep the copy path. The three inline materialize+pop call sites in function.rs are routed through release_datastack_frame. Assisted-by: Claude * Stage exact-args call arguments in stack slot buffers CallPyExactArgs, CallBoundMethodExactArgs and CallAllocAndEnterInit no longer collect popped arguments into a per-call Vec (plus a second Vec for self-prepending). Arguments are popped into a fixed-size Option<PyObjectRef> slot buffer (CallArgBuffer, 8 inline slots, heap fallback for larger arities) and moved into fastlocals via the new invoke_exact_args_slots / a take() iterator. - prepare_exact_args_frame now accepts an ExactSizeIterator of args - specialization_run_init_cleanup_shim takes the slot buffer and fills slot 0 with new_obj, dropping one redundant clone - LoadAttrGetattributeOverridden, LoadAttrProperty and BinaryOpSubscrGetitem pass inline slot arrays instead of vec![] Assisted-by: Claude * Reduce allocations in generic call paths - FuncArgs::prepend_arg: use reserve instead of reserve_exact so exact-capacity vectors do not realloc on every prepend. - IntoFuncArgs::into_method_args: build the final args vec once with capacity len + 1 instead of prepending into a full vector. - PyType::call: skip cloning FuncArgs when no init slot can run after slot_new (no init slot, not `type`, and slot_new is not new_wrapper). Assisted-by: Claude * Skip redundant exc_info restore on frame exit with_frame_impl saves the current exc_info slot value and restores it when the frame exits. When the slot still holds the same value, the restore rewrites the slot and recomputes the thread-exception mirror for no effect. Add restore_exception, which compares the slot against the saved value by pointer identity and skips the store when they match. The saved value is a strong reference held for the whole frame scope, so the pointed-to object cannot be freed and its address reused while the frame runs, making the pointer comparison free of ABA. Assisted-by: Claude * Apply rustfmt to gc_state.rs Assisted-by: Claude * Avoid empty FuncArgs clone in PyType::call Cloning args for the init call clones the kwargs map even when args is empty, which shows up in no-argument instantiation profiles. Prepare the init-call args before slot_new: a default FuncArgs when args is empty (indistinguishable from a clone of empty args), the existing clone otherwise. The empty check also keeps the init-slot load of the clone-elision path off the no-argument call path. Assisted-by: Claude * Push freelist husks only after tp_clear and child drops default_dealloc pushed the object onto the thread-local freelist before running clear_fn. Payloads that drop children inside clear (Frame) can run __del__ there, and a reentrant allocation could pop the husk and overwrite its payload while clear_fn still held a &mut borrow of it. Tuples had the same window through the extracted-edges drop, which ran after the push. Reorder default_dealloc to clear, drop the extracted children, and only then attempt the freelist push, so the husk becomes reusable only when no borrows into the payload remain. The tuple freelist bucketed husks by element count, which required reading the payload during push; after this reordering the elements are already cleared. PyInner<PyTuple> is a fixed-size allocation (the elements box is dropped and replaced on reuse), so replace the per-size buckets with the shared single-list FreeList. Remove the now-unused pyinner_layout helper. Assisted-by: Claude * Resolve __set__ and __delete__ together for the descr_set slot The descr_set slot serves both __set__ and __delete__, but the TpDescrSet accessor resolved only the single modified name and fell back to MRO inheritance on delete. Deleting one of the pair could disable the surviving operation: after `del D.__set__`, an instance delete stopped calling the remaining __delete__. Resolve both names together like the TpSetattro accessor does: any Python-level definition selects the dispatching wrapper, matching native functions are stored directly, a single native function with the other name absent is stored directly, and the slot is inherited from the MRO only when neither name resolves. Assisted-by: Claude * Update type base on __bases__ assignment set_bases replaced bases and mro but never updated the stored base, so __base__ kept reporting the old value after reassignment and slot resolution (tp_new inheritance, set_new/set_alloc during init_slots) read the stale solid base. Change the base field to PyAtomicRef<Option<PyType>> so it can be swapped under the type lock while remaining lock-free for readers, and recompute it in set_bases with the same best_base validation type creation uses (BASETYPE flag, instance layout conflict among bases). The swapped-out base is parked in the frame's temporary refs; other references released inside the critical section are dropped after the lock is released. Also in set_bases: - remove this class from the old bases' subclass lists (pruning dead entries), so repeated assignment no longer accumulates duplicates - roll back bases, base, and all updated mros when the recursive mro update fails, instead of leaving the type half-reparented - fix the misformatted empty-tuple error message Remove the expectedFailure marker from test_unsubclassable_types, which now passes. Assisted-by: Claude * Fix rollback order, dead weakrefs, and lock-held drops in set_bases - Restore recorded mros in reverse on rollback so a class visited multiple times through diamond inheritance ends with its original mro instead of an intermediate one. - Skip dead weakrefs in the subclass list during the recursive mro update instead of panicking on upgrade. - Retire the replaced mros on the success path instead of dropping them while the type lock is held. Assisted-by: Claude * Reify number sub-slot wrapper once in update_one_slot The update_sub_slot! macro expanded the Python-method wrapper closure at both the own and inherited store sites. Each expansion is a distinct fn item, so a base and a non-overriding subclass stored wrappers with distinct addresses in unmerged debug builds. binary_op1 compares slot fn addresses to detect whether a subclass overrides the operator, so the inherited slot was misread as an override and C() // E() dispatched to __rfloordiv__ instead of __floordiv__. Bind the wrapper store in a single closure and call it from both branches so the fn item is reified once and the slot value stays identical across a base and its subclasses. Document the conservative-on-mismatch nature of the new_wrapper address guard in call_wrapped. Assisted-by: Claude * Restrict type_cache_after_fork visibility and guard type-cache reads type_cache_after_fork is only called from within the crate, so mark it pub(crate) to resolve the unreachable-pub warning. Add debug_assert_current_thread_attached at the has_name_in_mro lock-free type-cache read site, matching lookup_ref_and_version_interned, and gate the function on debug_assertions so it is not compiled unused in release builds where the call sites are elided. Assisted-by: Claude * Guard BinaryOpSubscrGetitem with the cached type version The specialized BINARY_OP_SUBSCR_GETITEM handler used the cached __getitem__ after checking only the function version, unlike the sibling specialized handlers which revalidate the type version tag first. Store the type version in the inline cache at specialization time and revalidate owner.class().tp_version_tag against it before using the cached function, deopting to the generic subscript path on mismatch. Assisted-by: Claude * Call __abstractmethods__ __len__ once in object.__new__ The abstract-method check invoked the user-visible __len__ twice: once via length_opt for the count and again while materializing the method names. Derive the count from the materialized list instead, so __len__ runs once. Assisted-by: Claude * Use i64 fast paths for specialized int add/sub/mul Rewrite execute_binary_op_int to box results through new_int via i64 checked arithmetic instead of raw BigInt ops with new_bigint. Add an int_mul helper and a shared int_fast_op that computes the i64 result and falls back to the BigInt operation on to_i64 or checked-op failure. Wire int_mul into both the specialized BinaryOpMultiplyInt handler and the generic execute_bin_op Multiply/InplaceMultiply path, gated on exact int operands so subclasses keep dispatching through _mul/_imul. Assisted-by: Claude * Use i64 fast paths for exact int floordiv and remainder Add floordiv_i64/mod_i64 computing i64 floor-division and divisor-signed remainder, guarding zero divisor and i64::MIN overflow by returning None. Wire them through int_floordiv/int_mod (shared int_div_fast_op boxes via new_int) into the generic execute_bin_op FloorDivide/Remainder and their Inplace variants, gated on exact int operands so subclasses and zero divisors fall through to the existing _floordiv/_mod/_ifloordiv/_imod slow path. Assisted-by: Claude * Skip trashcan and untrack for non-GC-tracked objects in dealloc default_dealloc read is_gc_tracked() only to decide untracking, and entered the trashcan recursion guard unconditionally. Non-GC objects (int, float, str, ...) own no child references that recurse during deallocation, so they need neither the trashcan nor untracking. Read is_gc_tracked() once and gate both trashcan begin/end and untrack on it, removing three thread-local accesses per non-GC object deallocation. Assisted-by: Claude * Merge trashcan depth and defer queue into one thread-local struct trashcan::end accessed two separate thread-locals (DEALLOC_DEPTH and DEALLOC_QUEUE) at the outermost deallocation. Combine both into a single `Trashcan` thread-local holding Cell-based depth and queue fields, so begin and end each reach their state through one thread-local access. The queue is set back before each deferred dealloc call so reentrant begin/end during draining never holds an outstanding borrow. Assisted-by: Claude * Check object layout compatibility on __bases__ and __class__ assignment Add a shared compatible_for_assignment helper that walks each type to the base that fixes its instance layout and rejects the assignment when the old and new layouts differ (basicsize, itemsize, member count, __dict__, __weakref__, and __slots__ names). Wire it into set_bases, which previously performed no layout check, and replace the inline check in __class__ assignment, which compared the two types directly and over-rejected a subclass that adds no layout. Enable test_descr.test_builtin_bases, which the new set_bases check passes. Assisted-by: Claude * Stop the world around GC pointer-reading phases The cycle collector reads each tracked object's interpreter state during reference subtraction, the reachability walk and the strong-reference snapshot, including the localsplus of frames other threads are executing. Those slots are written without synchronization, so the reads are a data race under threading. collect_inner now stops the world before taking the generation read locks and restarts it after the strong-reference snapshot, before the finalizer/weakref/tp_clear phases. A debug assertion checks that no frame on any thread's call stack was classified unreachable. Automatic collections from maybe_collect are deferred to the next bytecode safepoint via a new eval-breaker GC bit instead of running synchronously: a synchronous collection can hold an internal lock (e.g. the lazy frame locals cell) that another thread is blocked on with no way to reach a safepoint, deadlocking the stop. Hardens the stop-the-world machinery for these frequent, concurrent GC stops: attach_thread now honors a pending stop after re-attaching so a thread doing rapid allow_threads calls cannot run past the requester; stop_the_world completion is level-triggered on all-threads-suspended rather than an edge-triggered countdown; and the thread-start started/ready handshakes detach while waiting so the waiter is parkable. Updates the Frame and PyRwLock/PyMutex traversal SAFETY comments to state the actual invariant. Assisted-by: Claude * Add threaded GC vs executing-frame stress snippet Workers churn frame state (recursion, generators, frame cycles) while a collector loops gc.collect() and an introspector walks live frame objects. Exercises the stop-the-world barrier around GC traversal. Assisted-by: Claude * Serialize fork and GC stop-the-world requesters fork() (posix before/after-fork) and the cycle collector both drive the single StopTheWorldState. With no mutual exclusion their requester word and suspension countdown could interleave and be clobbered, so the completion check never converged and a requester waited on itself forever (reproducible parent-side hang when forking with GC enabled). Add one exclusion held for the whole stop->start span of either requester: stop_the_world acquires it before any stop bookkeeping and start_the_world/reset_after_fork release it. The acquire is park-friendly (poll try-lock and honor a pending suspend between tries) so a requester blocked behind an active stop can still be force-parked instead of deadlocking the active requester. The acquirer holds no other lock while spinning. Also correct the PyRwLock traverse SAFETY note: a failed try_read may mean a force-parked thread holds the write lock; skipping is safe because under-traversal only over-approximates liveness. Document the residual gc.collect()-under-a-non-generation-lock exposure at the collect_inner barrier. Assisted-by: Claude * Add fork under concurrent GC stop-the-world snippet Worker threads allocate cyclic garbage with GC enabled while the main thread forks repeatedly and each child collects. Exercises the fork/GC stop-the-world exclusion; the allocation rate is throttled so a collection stays cheap in unoptimized builds. Assisted-by: Claude * Detach while acquiring the import lock The global import lock is held across bytecode by the importlib bootstrap, so its holder can be parked at a safepoint mid-hold. Acquiring it while attached let another thread block attached on the lock, so a stop-the-world requester could wait forever for that attached thread to suspend while the holder stayed parked. Wrap IMP_LOCK acquisition in allow_threads in both _imp.acquire_lock and the pre-fork acquire_imp_lock_for_fork so the wait honors stop-the-world requests. Correct the acquire_exclusion comment: a spinning requester may hold IMP_LOCK (fork) or the collecting mutex (GC); safety relies on those never being acquired attached-blocking by another thread. Assisted-by: Claude * Add concurrent-import vs GC deadlock snippet Two threads re-import modules (contending the import lock) while a third storms the cycle collector and a fourth allocates cyclic garbage. Regressed as a hang before the import lock acquisition was made park-friendly. Assisted-by: Claude * Create call frames untracked and track generators explicitly Add PyPayload::NEW_REF_UNTRACKED (default false, true for Frame) so PyRef::new_ref skips auto-tracking ordinary call frames in the GC. Generator/coroutine/async-generator frames are tracked explicitly in invoke_with_locals before their generator back-reference is installed. run_frame debug-asserts that a datastack frame is untracked on entry. Assisted-by: Claude * Track escaped call frames lazily at datastack release Rewrite release_datastack_frame around the invariant that a datastack frame is never GC-tracked while it runs: strong_count() == 1 means the frame never escaped, so drop localsplus in place without touching the GC; strong_count() > 1 means it escaped, so materialize localsplus onto the heap and then track the frame. This removes the untrack and the untrack-recheck dance from the common non-escaping path. Assisted-by: Claude * Guard the tracked-frame localsplus invariant Document at Frame::traverse that references to a frame are always recorded as graph edges, so the collector reads a frame's localsplus only when the frame is itself a tracked candidate. Add debug assertions at both frame track sites (escaped datastack frames and generator frames) that a frame is heap-backed before it is tracked, so a collector never reads data-stack-resident, still-mutating storage. Assisted-by: Claude * Reword frame/dealloc invariant comments and drop needless borrow - frame.rs: replace the task codename in the tracked-frame localsplus invariant comment with a description of the collector-vs-executing-frame behavior. - object.rs: remove needless borrow on current_cls in the __class__ assignment compatibility check. - core.rs: rewrite the default_dealloc trashcan/untrack-skip comment to state the actual invariant, which now covers untracked non-escaped frames releasing at interpreter depth with bounded recursion. Assisted-by: Claude * Move type SetAttr slot rewrite inside the type lock and tighten cache reads Run update_slot inside the same with_type_lock transaction as modified_inner and the attributes dict mutation, so the version invalidation, dict change, and slot-table rewrite are published together. Load init_version and getitem_version with Acquire in the specialization cache readers to pair with the Release stores in the writers. Assisted-by: Claude * Capture the type version before reading mutable slots in specializers specialize_load_attr, specialize_store_attr, specialize_to_bool, and the CallAllocAndEnterInit path of specialize_call read the version tag with version_for_specialization before inspecting getattro, setattro, the bool/len slots, and tp_new/tp_alloc, so a concurrent install of the corresponding dunder invalidates the version the specialization is cached against. In the BinaryOpSubscr __getitem__ path, check the HEAPTYPE and eval-frame gates before lookup_ref_and_version_interned, which takes the global type lock and may allocate a version tag. Assisted-by: Claude * Use _get_method_dict for the test_type check in the test runner Replace the direct __func__.__dict__ access with the _get_method_dict helper so plain functions without __func__ do not raise AttributeError. Assisted-by: Claude * Fix lint hooks: cspell dictionary entries, spelling fix, formatting Add qsbr to the rustpython dictionary and reborrows/reparenting to the top-level word list. Rename oldto/newto locals to old_to/new_to. Fix Stabilise -> Stabilize typo in a frame.rs comment. Apply cargo fmt to object.rs, type.rs, and frame.rs, and ruff format/check fixes to two extra_tests snippet files. Assisted-by: Claude * Rebuild all slots for type and descendants on __bases__ reassignment Add PyType::update_all_slots, which invalidates version tags and iterates the full SLOT_DEFS name table calling update_slot::<true> for each distinct name. Unlike init_slots, which is additive and driven only by dunder names present in the current MRO, this resets a slot whose method left the MRO instead of leaving a stale dispatcher pointer. Call it from set_bases in place of the previous modified_inner + init_slots pair, so reassigning __bases__ rebuilds slots for the type and every descendant. Add extra_tests/snippets/type_bases_slot_rebuild.py covering removed-method resets on zelf and deep descendants, the wrong-target switch, __getattr__, the added-method mirror, and a swap-away-and-back round trip. Assisted-by: Claude * Derive the thread-local frame stack from the frame chain Remove the per-VM `frames` Vec. current_frame, sys._getframe, sys._getframemodulename, frame.f_back, sys.monitoring re-instrumentation, gc.get_referrers, faulthandler stack dumps and the post-fork slot rebuild now walk the signal-safe CURRENT_FRAME/`previous` chain instead. Add `Py::from_payload_ptr` to recover a frame object from a chain pointer. The cross-thread `ThreadSlot::frames` registry (sys._current_frames, cross-thread f_back, GC stop-the-world assertion) is unchanged. Assisted-by: Claude * Inherit sub-slot fallback into the field being resolved update_one_slot's number/sequence/mapping fallback inherited via the accessor's default field. Left and right binary ops (add/right_add) share one accessor but occupy distinct fields, so resolving an absent right op or deleting it reset the left op's field, dropping a still-defined __add__ dispatcher. Inherit the exact field under resolution instead. Assisted-by: Claude * Gate type_cache_after_fork to its fork caller and use Self in downcast type_cache_after_fork is only called from the unix fork path, so gate it with all(feature = "host_env", unix) to match the caller and avoid a dead-code error on non-unix targets. Replace the explicit PyType with Self in the modified_inner downcast. Assisted-by: Claude * Unmark test_attr and test_method_call_error in test_monitoring Both TestLoadSuperAttr tests now pass; remove their expectedFailure markers. Assisted-by: Claude * Run tp_new specialization __init__ without a trampoline frame CallAllocAndEnterInit ran __init__ inside a synthetic init-cleanup shim frame whose code carried the __init__ name. Since the thread frame stack is derived from the frame chain, that shim frame was visible to sys._getframe, f_back walks, traceback construction and inspect.stack / inspect.trace. Its code object has empty co_positions, so a stack walk that reached it raised StopIteration inside inspect._get_code_position, cascading into unrelated failures (test_inspect trace/stack/frame, asyncio source traceback). Call __init__ directly via run_frame, enforce the __init__() should return None contract inline, and drop the shim: the init-cleanup code object, its builder, with_frame_untraced, monitoring_disabled_for_code, and the extra-frame datastack/recursion budget. Removing the second frame per construction also cuts the specialization's per-call cost. Assisted-by: Claude * Replace per-call thread-frame mutex with an atomic top-of-stack (unix) On unix threading builds, publish each thread's top Python frame in a single relaxed AtomicPtr store from set_current_frame instead of pushing onto a parking_lot::Mutex<Vec<FramePtr>> per call. Cross-thread readers (sys._current_frames, cross-thread f_back, faulthandler.dump_traceback, the GC unreachable debug-assert) run under stop-the-world and walk the published top frame down the Frame::previous chain; the owning thread is then parked at a safepoint, so the pointer and the frames it reaches are quiescent and alive. The faulthandler watchdog is a plain OS thread that cannot stop-the-world, so it walks the chain lock-free and best-effort. Non-unix threading builds have no stop-the-world and keep the existing mutex-guarded frame stack unchanged. Assisted-by: Claude * Skip exc_info save/restore for callees that never touch the slot with_frame saves and restores the shared exc_info slot around every Python call to contain frames that leave it unbalanced. Cache a has_exc_handling bit on PyCode at creation, set when the bytecode contains any opcode that calls vm.set_exception (PushExcInfo, PopExcept, CheckEgMatch, EndAsyncFor, InstrumentedEndAsyncFor). A callee whose code has none of these cannot mutate the slot, so the save and restore are skipped for it. Generators go through resume_gen_frame and are unaffected. Assisted-by: Claude * Return a write-through FrameLocalsProxy from frame.f_locals Optimized (function) frames now expose `f_locals` as a `FrameLocalsProxy` implementing PEP 667 semantics instead of a cached snapshot dict: - reads go live through the fast-local slots; each access mints a fresh proxy; keys that do not name a fast local are stored in a per-frame `f_extra_locals` side dict and folded into `locals()`. - writes to a fast-local key store into the slot (or its cell) in place; deleting a fast local raises ValueError; extra keys delete normally. - full mapping protocol: keys/values/items (lists), get/pop/setdefault, update (dict or FrameLocalsProxy only), __or__/__ior__/__ror__ (dict result), copy (plain dict), __reduce__ blocks pickling/copy, repr with recursion guard, mapping-pattern and Mapping ABC support. Class/module/exec frames keep returning their namespace mapping directly. Cross-thread access to a frame running on another thread still raises RuntimeError. A closed generator now keeps its frame locals when a durable frame reference escaped (f_locals proxy, sys._getframe, f_back), matching take_ownership; the escape is tracked with a per-frame flag. The snapshot-then-fold locals_to_fast/locals_dirty write-back is retired since proxy writes reach the slots directly. Assisted-by: Claude * Retain the caller frame so f_back resolves after it returns When a frame escapes its execution (referenced through a traceback, `sys._getframe`, `f_locals`, ...), capture a strong reference to its caller at release time. `f_back` consults it once the caller has left the live frame chain, so the Python-visible frame chain survives return. The retained reference is a GC-traversed edge and is cleared by `frame.clear()`, so ancestor chains stay collectable. Assisted-by: Claude * Fix debug-build native stack overflow on deep recursion Make check_c_stack_overflow one-sided (trip whenever the stack pointer is below the soft limit) so a single native frame larger than the margin cannot step past the danger band undetected. Raise the debug STACK_MARGIN_BYTES from 4096 to 16384 words so the margin exceeds a single debug interpreter frame, leaving headroom to raise RecursionError. Release margin unchanged. Clamp the soft-limit margin to half the stack so small explicit thread stacks do not get a soft limit above their stack top. Assisted-by: Claude * Allocate exception instance __dict__ lazily Exception construction went through into_ref_with_type, which eagerly allocated an empty instance dict for every HAS_DICT type. Add into_ref_with_type_lazy_dict, which builds the instance with an unallocated dict slot, and route the four exception construction sites (PyBaseException, PyOSError, OSErrorBuilder, PyBaseExceptionGroup) through it. The dict now materializes on first attribute write or __dict__ access via the existing get_or_insert path. add_note and PyImportError::slot_init now obtain the dict through object_get_dict so they materialize it instead of assuming it exists. A freshly constructed exception no longer reports an empty dict in gc.get_referents, matching the reference interpreter. Assisted-by: Claude * Allocate exception __dict__ lazily in vm.new_exception Route vm.new_exception() through into_ref_with_type_lazy_dict so internally raised exceptions (new_type_error, new_value_error, etc.) start without an instance dict, matching the slot_new path. The dict is materialized on the first attribute write or __dict__ access. Assisted-by: Claude * Validate FrameLocalsProxy.update() arguments Reject keyword arguments and require exactly one positional argument, raising TypeError with the "takes no keyword arguments" and "takes exactly one argument (N given)" messages. Assisted-by: Claude * Address review nits in frame and faulthandler - Drop stale vm.frames reference from the release_datastack_frame uniqueness argument. - Assert has_exc_handling when unwinding an Except-typed stack slot, documenting the invariant that guards the shared exc_info write. - Truncate the specialized __init__ return-type name to 200 chars, matching the unspecialized wrapper. - Reword two comments to describe behavior without prose references to CPython. Assisted-by: Claude * Use scopeguard for start_the_world in faulthandler dump_all_threads Wrap the unix stop-the-world registry walk in a scope with scopeguard::defer! so start_the_world runs on panic, matching the f_back and get_all_current_frames sites. Add scopeguard to the stdlib dependencies. Also correct the restore_exception doc comment to name with_frame after the rename. Assisted-by: Claude * Gitignore docs/superpowers Assisted-by: Claude * Rename type_bases_slot_rebuild.py to builtin_type_bases.py Match the builtin_* naming convention of extra_tests/snippets. Assisted-by: Claude * Apply rustfmt, ruff, and cspell lint fixes Reformat with rustfmt, fix import spacing in builtin_type_bases.py with ruff, and add "pointee" to the cspell word list. Assisted-by: Claude * Gate unix-only QSBR methods to their call sites `online`, `drain_all`, and `reset_after_fork` are called only from unix code (thread attach/detach, post-fork reset), and `offline` from unix code plus a unit test. Gate them with matching cfg so `-D dead_code` does not fire on non-unix targets. Assisted-by: Claude * Visit the function closure tuple as a GC edge PyFunction::traverse visited the cells inside the closure tuple instead of the tuple object itself, so the tuple's reference from the function was never subtracted during cycle collection. A closure tuple that reached back to its function (or, through a frame retained by f_back, to a Thread) was stranded as a false GC root and never collected, leaking the whole cycle. Visit the tuple itself, matching clear(). Assisted-by: Claude * Apply formatting hook fix to builtin_type_bases.py Assisted-by: Claude * Unmark asyncgen finalization-by-gc tests in test_base_events test_asyncgen_finalization_by_gc and test_asyncgen_finalization_by_gc_in_other_thread now pass; GC finalizes the async generators. Assisted-by: Claude * Unmark test_sni_callback_refcycle in test_ssl The servername-callback reference cycle is now collected by GC. Assisted-by: Claude * Widen GC stop-the-world gates from unix-only to all threading builds Change `cfg(all(unix, feature = "threading"))` to `cfg(feature = "threading")` on the stop-the-world machinery so it also compiles and runs on non-unix threading builds: - StopTheWorldState, its stats, stw_trace, and the stop_the_world field - ThreadSlot state/stop_requested/thread fields and their initializers - wait_while_suspended/attach_thread/detach_thread/suspend_if_needed/do_suspend, allow_threads, stop_requested_for_current_thread, and the enter_vm / VmBootstrapGuard / attach_current_thread / release_current_thread / cleanup attach-state wiring - eval_breaker_tripped, check_signals, run_scheduled_gc, signal GC_BIT / schedule_gc / take_gc_scheduled, and the frame.rs safepoint call - CollectStopTheWorld and its use in collect_inner - QSBR::online/offline, now called from attach/detach on all threading builds - debug_assert_current_thread_attached and its type-cache call sites maybe_collect defers auto-collection to the bytecode safepoint on every threading build instead of only unix; non-threading builds keep the inline collect. stw_trace writes to std stderr on non-unix. top_frame publishing (CURRENT_TOP_FRAME_SLOT, set_current_frame), the frame-walk debug assert in collect_inner, and the fork reinit helpers remain unix-only; non-unix keeps ThreadSlot::frames for introspection. Assisted-by: Claude * Detach current thread around blocking _winapi/_overlapped waits Wrap the blocking Windows wait calls in `vm.allow_threads` so the calling thread transitions ATTACHED -> DETACHED for the duration of the wait: - _winapi: WaitForSingleObject, WaitForMultipleObjects, BatchedWaitForMultipleObjects, ConnectNamedPipe, ReadFile, Overlapped.GetOverlappedResult - _overlapped: Overlapped.getresult These previously blocked while ATTACHED, so a stop-the-world requester could never suspend the thread and spun in its wait loop indefinitely. * Format WaitForMultipleObjects allow_threads closure * Treat concurrent sni_callback removal as no-op in invoke_sni_callback * Assert capi refcount on a fresh mortal list instead of the int type object The refcount test asserted exact incref/decref deltas on PyInt's shared type object. That object's reference count is perturbed by the other capi tests running in parallel, and is immortal under some interpreter configurations, so the deltas were not reliably +1/-1. Assert them on a freshly created, uniquely owned list whose reference count is private to the test and mortal. Assisted-by: Claude * Traverse and GC-track PyOSError instances The `#[pyexception]` struct macro now forwards a `traverse` option to the generated `#[pyclass]`, and `ExceptionItemMeta` accepts the `traverse` key. `PyOSError` is marked `traverse = "manual"`, so `HAS_TRAVERSE` is true and OSError-family instances are tracked at creation and traversed by the collector. `PyOSError::traverse` now visits the underlying `PyBaseException` (traceback, cause, context, args) instead of `PyException::try_traverse`, which was a no-op because `PyException` has `HAS_TRAVERSE = false`. * Unmark test_blockingioerror in test_io The BlockingIOError reference cycle is now collected by GC. Assisted-by: Claude --- .cspell.dict/rustpython.txt | 1 + .cspell.json | 3 + .gitignore | 3 +- Cargo.lock | 2 + Cargo.toml | 1 + Lib/test/test_asyncio/test_base_events.py | 2 - Lib/test/test_descr.py | 2 - Lib/test/test_frame.py | 10 - Lib/test/test_generators.py | 1 - Lib/test/test_inspect/test_inspect.py | 1 - Lib/test/test_io.py | 1 - Lib/test/test_monitoring.py | 2 - Lib/test/test_pdb.py | 2 +- Lib/test/test_ssl.py | 1 - Lib/test/test_traceback.py | 1 - crates/capi/src/refcount.rs | 10 +- crates/common/src/refcount.rs | 42 +- .../compiler-core/src/bytecode/instruction.rs | 271 ++- .../src/bytecode/opcode_metadata.rs | 379 +++-- crates/derive-impl/src/pyclass.rs | 9 +- crates/derive-impl/src/util.rs | 11 +- crates/stdlib/Cargo.toml | 1 + crates/stdlib/src/faulthandler.rs | 111 +- crates/stdlib/src/overlapped.rs | 5 +- crates/stdlib/src/ssl.rs | 14 +- crates/vm/Cargo.toml | 1 + crates/vm/src/builtins/code.rs | 19 + crates/vm/src/builtins/frame.rs | 86 +- crates/vm/src/builtins/frame_locals_proxy.rs | 326 ++++ crates/vm/src/builtins/function.rs | 149 +- crates/vm/src/builtins/int.rs | 2 +- crates/vm/src/builtins/mod.rs | 2 + crates/vm/src/builtins/object.rs | 103 +- crates/vm/src/builtins/tuple.rs | 63 +- crates/vm/src/builtins/type.rs | 955 +++++++---- crates/vm/src/coroutine.rs | 28 +- crates/vm/src/exception_group.rs | 2 +- crates/vm/src/exceptions.rs | 25 +- crates/vm/src/frame.rs | 1462 ++++++++++++----- crates/vm/src/function/argument.rs | 10 +- crates/vm/src/gc_state.rs | 227 ++- crates/vm/src/object/core.rs | 161 +- crates/vm/src/object/ext.rs | 29 + crates/vm/src/object/mod.rs | 1 + crates/vm/src/object/payload.rs | 50 +- crates/vm/src/object/qsbr.rs | 333 ++++ crates/vm/src/object/traverse.rs | 24 +- crates/vm/src/signal.rs | 61 +- crates/vm/src/stdlib/_imp.rs | 19 +- crates/vm/src/stdlib/_thread.rs | 97 +- crates/vm/src/stdlib/_winapi.rs | 34 +- crates/vm/src/stdlib/gc.rs | 14 +- crates/vm/src/stdlib/posix.rs | 14 +- crates/vm/src/stdlib/sys.rs | 28 +- crates/vm/src/stdlib/sys/monitoring.rs | 6 +- crates/vm/src/types/slot.rs | 146 +- crates/vm/src/types/slot_defs.rs | 2 +- crates/vm/src/types/zoo.rs | 11 +- crates/vm/src/vm/context.rs | 49 - crates/vm/src/vm/interpreter.rs | 21 +- crates/vm/src/vm/mod.rs | 285 +++- crates/vm/src/vm/thread.rs | 244 ++- crates/vm/src/vm/vm_new.rs | 10 +- extra_tests/custom_text_test_runner.py | 8 +- extra_tests/snippets/builtin_type_bases.py | 293 ++++ .../snippets/stdlib_threading_gc_fork.py | 62 + .../stdlib_threading_gc_frame_race.py | 101 ++ .../snippets/stdlib_threading_gc_import.py | 58 + .../snippets/stdlib_threading_type_cache.py | 69 + .../generate_rs_opcode_metadata.py | 85 +- 70 files changed, 5148 insertions(+), 1513 deletions(-) create mode 100644 crates/vm/src/builtins/frame_locals_proxy.rs create mode 100644 crates/vm/src/object/qsbr.rs create mode 100644 extra_tests/snippets/builtin_type_bases.py create mode 100644 extra_tests/snippets/stdlib_threading_gc_fork.py create mode 100644 extra_tests/snippets/stdlib_threading_gc_frame_race.py create mode 100644 extra_tests/snippets/stdlib_threading_gc_import.py create mode 100644 extra_tests/snippets/stdlib_threading_type_cache.py diff --git a/.cspell.dict/rustpython.txt b/.cspell.dict/rustpython.txt index 8cd083580..07099bbb1 100644 --- a/.cspell.dict/rustpython.txt +++ b/.cspell.dict/rustpython.txt @@ -27,6 +27,7 @@ pystr pystruct pystructseq pytype +qsbr rustix struc zelf diff --git a/.cspell.json b/.cspell.json index f173874d4..ab3d229cf 100644 --- a/.cspell.json +++ b/.cspell.json @@ -81,8 +81,11 @@ "mcache", "oparg", "opargs", + "pointee", "pyc", "reborrow", + "reborrows", + "reparenting", "reraises", "reraising", "significand", diff --git a/.gitignore b/.gitignore index b5887be53..09e1b97b9 100644 --- a/.gitignore +++ b/.gitignore @@ -27,4 +27,5 @@ Lib/site-packages/* Lib/test/data/* !Lib/test/data/README cpython/ -.claude/scheduled_tasks.lock \ No newline at end of file +.claude/scheduled_tasks.lock +docs/superpowers/ \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index 5eb95bea2..73afeda8a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3700,6 +3700,7 @@ dependencies = [ "rustpython-ruff_text_size", "rustpython-unicode", "rustpython-vm", + "scopeguard", "sha1 0.11.0", "sha2", "sha3", @@ -3754,6 +3755,7 @@ dependencies = [ "indexmap", "is-macro", "itertools 0.15.0", + "itoa", "libc", "log", "malachite-bigint", diff --git a/Cargo.toml b/Cargo.toml index d8081f501..540324a4a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -229,6 +229,7 @@ hmac = "0.13" indexmap = { version = "2.14.0", features = ["std"] } insta = "1.47" itertools = { version = "0.15.0", default-features = false, features = ["use_alloc"] } +itoa = "1" is-macro = "0.3.7" js-sys = "0.3" junction = "2.0.0" diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py index 92895bbb4..1b727f3b1 100644 --- a/Lib/test/test_asyncio/test_base_events.py +++ b/Lib/test/test_asyncio/test_base_events.py @@ -1019,7 +1019,6 @@ class BaseEventLoopTests(test_utils.TestCase): asyncio.create_task(iter_one()) return status - @unittest.expectedFailure # TODO: RUSTPYTHON; - GC doesn't finalize async generators def test_asyncgen_finalization_by_gc(self): # Async generators should be finalized when garbage collected. self.loop._process_events = mock.Mock() @@ -1035,7 +1034,6 @@ class BaseEventLoopTests(test_utils.TestCase): test_utils.run_briefly(self.loop) self.assertTrue(status['finalized']) - @unittest.expectedFailure # TODO: RUSTPYTHON; - GC doesn't finalize async generators def test_asyncgen_finalization_by_gc_in_other_thread(self): # Python issue 34769: If garbage collector runs in another # thread, async generators will not finalize in debug diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py index 92bf7998d..0b19496ec 100644 --- a/Lib/test/test_descr.py +++ b/Lib/test/test_descr.py @@ -4154,7 +4154,6 @@ class ClassPropertiesAndMethods(unittest.TestCase): else: self.fail("shouldn't be able to create inheritance cycles") - @unittest.expectedFailure # TODO: RUSTPYTHON def test_builtin_bases(self): # Make sure all the builtin types can have their base queried without # segfaulting. See issue #5787. @@ -4199,7 +4198,6 @@ class ClassPropertiesAndMethods(unittest.TestCase): else: self.fail("best_base calculation found wanting") - @unittest.expectedFailure # TODO: RUSTPYTHON def test_unsubclassable_types(self): with self.assertRaises(TypeError): class X(type(None)): diff --git a/Lib/test/test_frame.py b/Lib/test/test_frame.py index ae02e2a59..53d42a595 100644 --- a/Lib/test/test_frame.py +++ b/Lib/test/test_frame.py @@ -315,7 +315,6 @@ class ReprTest(unittest.TestCase): % (file_repr, offset + 5)) class TestFrameLocals(unittest.TestCase): - @unittest.expectedFailure # TODO: RUSTPYTHON def test_scope(self): class A: x = 1 @@ -333,7 +332,6 @@ class TestFrameLocals(unittest.TestCase): self.assertEqual(locals()['y'], 2) f() - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: 1 != 2 def test_closure(self): x = 1 y = 2 @@ -356,7 +354,6 @@ class TestFrameLocals(unittest.TestCase): lst = [locals() for k in [0]] self.assertEqual(lst[0]['k'], 0) - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: 3 != 4 def test_as_dict(self): x = 1 y = 2 @@ -414,7 +411,6 @@ class TestFrameLocals(unittest.TestCase): d[1] = 2 self.assertEqual(d[1], 2) - @unittest.expectedFailure # TODO: RUSTPYTHON; UnboundLocalError: local variable 'b' referenced before assignment def test_write_with_hidden(self): def f(): f_locals = [sys._getframe().f_locals for b in [0]][0] @@ -426,7 +422,6 @@ class TestFrameLocals(unittest.TestCase): c = 0 f() - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: <object object at 0xb4000072b6930480> != 'a.b.c' def test_local_objects(self): o = object() k = '.'.join(['a', 'b', 'c']) @@ -457,7 +452,6 @@ class TestFrameLocals(unittest.TestCase): frame = sys._getframe() self.assertEqual(repr(frame.f_locals), repr(dict(frame.f_locals))) - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: ValueError not raised def test_delete(self): x = 1 d = sys._getframe().f_locals @@ -501,7 +495,6 @@ class TestFrameLocals(unittest.TestCase): proxy = sys._getframe().f_locals support.check_sizeof(self, proxy, support.calcobjsize("P")) - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: TypeError not raised def test_unsupport(self): x = 1 d = sys._getframe().f_locals @@ -536,7 +529,6 @@ class TestFrameLocals(unittest.TestCase): return StringSubclass('x'), ImpostorX(), 'x' - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: dict_keys(['obj', 'x']) != ['obj', 'x', 'proxy'] def test_proxy_key_stringlikes_overwrite(self): def f(obj): x = 1 @@ -559,7 +551,6 @@ class TestFrameLocals(unittest.TestCase): self.assertEqual(keys_snapshot, expected_keys) self.assertEqual(proxy_snapshot, expected_dict) - @unittest.expectedFailure # TODO: RUSTPYTHON; UnboundLocalError: local variable 'b' referenced before assignment def test_proxy_key_stringlikes_ftrst_write(self): def f(obj): proxy = sys._getframe().f_locals @@ -587,7 +578,6 @@ class TestFrameLocals(unittest.TestCase): with self.assertRaises(TypeError): proxy[obj] = 0 - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: 'dict' != 'FrameLocalsProxy' def test_constructor(self): FrameLocalsProxy = type([sys._getframe().f_locals for x in range(1)][0]) diff --git a/Lib/test/test_generators.py b/Lib/test/test_generators.py index 8ede6e22f..b3826f422 100644 --- a/Lib/test/test_generators.py +++ b/Lib/test/test_generators.py @@ -762,7 +762,6 @@ class GeneratorDeallocTest(unittest.TestCase): self.assertIn('a', frame_locals) self.assertEqual(frame_locals['a'], 42) - @unittest.expectedFailure # TODO: RUSTPYTHON; frame locals don't survive generator deallocation def test_frame_locals_outlive_generator(self): frame_locals1 = None diff --git a/Lib/test/test_inspect/test_inspect.py b/Lib/test/test_inspect/test_inspect.py index a14551afa..37b3f2b1e 100644 --- a/Lib/test/test_inspect/test_inspect.py +++ b/Lib/test/test_inspect/test_inspect.py @@ -588,7 +588,6 @@ class TestInterpreterStack(IsTestBase): self.assertEqual(inspect.formatargvalues(args, varargs, varkw, locals), '(x=11, y=14)') - @unittest.expectedFailure # TODO: RUSTPYTHON; AttributeError: 'NoneType' object has no attribute 'f_code' def test_previous_frame(self): args, varargs, varkw, locals = inspect.getargvalues(mod.fr.f_back) self.assertEqual(args, ['a', 'b', 'c', 'd', 'e', 'f']) diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py index c51b547f3..99ab6c7ba 100644 --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -4473,7 +4473,6 @@ class MiscIOTest(unittest.TestCase): self.assertRaises(ValueError, f.writelines, []) self.assertRaises(ValueError, next, f) - @unittest.expectedFailure # TODO: RUSTPYTHON; cyclic gc def test_blockingioerror(self): # Various BlockingIOError issues class C(str): diff --git a/Lib/test/test_monitoring.py b/Lib/test/test_monitoring.py index 1f72b552c..30eee65dc 100644 --- a/Lib/test/test_monitoring.py +++ b/Lib/test/test_monitoring.py @@ -1984,7 +1984,6 @@ class TestLoadSuperAttr(CheckEvents): ] return d["f"], expected - @unittest.expectedFailure # TODO: RUSTPYTHON; line number differences in multi-line super() calls def test_method_call_error(self): nonopt_func, nonopt_expected = self._super_method_call_error(optimized=False) opt_func, opt_expected = self._super_method_call_error(optimized=True) @@ -2022,7 +2021,6 @@ class TestLoadSuperAttr(CheckEvents): ] return d["f"], expected - @unittest.expectedFailure # TODO: RUSTPYTHON; line number differences in multi-line super() calls def test_attr(self): nonopt_func, nonopt_expected = self._super_attr(optimized=False) opt_func, opt_expected = self._super_attr(optimized=True) diff --git a/Lib/test/test_pdb.py b/Lib/test/test_pdb.py index 97f084088..cd1e88f54 100644 --- a/Lib/test/test_pdb.py +++ b/Lib/test/test_pdb.py @@ -3122,7 +3122,7 @@ def test_pdb_issue_gh_101673(): ... a = 1 ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() - >>> with PdbTestInput([ # TODO: RUSTPYTHON # doctest: +NORMALIZE_WHITESPACE +EXPECTED_FAILURE + >>> with PdbTestInput([ # doctest: +NORMALIZE_WHITESPACE ... '!a = 2', ... 'll', ... 'p a', diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index 10fb5c80b..4808da82f 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -1526,7 +1526,6 @@ class ContextTests(unittest.TestCase): self.assertIn(libssl_error_reason, str(cm.exception)) self.assertEqual(cm.exception.errno, ssl.SSL_ERROR_SSL) - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: <SSLContext(protocol=17)> is not None def test_sni_callback_refcycle(self): # Reference cycles through the servername callback are detected # and cleared. diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py index 0f66bdcb3..27a8d784d 100644 --- a/Lib/test/test_traceback.py +++ b/Lib/test/test_traceback.py @@ -3141,7 +3141,6 @@ class LimitTests(unittest.TestCase): def last_returns_frame5(self): return self.last_returns_frame4() - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: 1 not greater than 5 def test_extract_stack(self): frame = self.last_returns_frame5() def extract(**kwargs): diff --git a/crates/capi/src/refcount.rs b/crates/capi/src/refcount.rs index 849b130e2..48c7132b0 100644 --- a/crates/capi/src/refcount.rs +++ b/crates/capi/src/refcount.rs @@ -26,14 +26,18 @@ pub unsafe extern "C" fn Py_REFCNT(op: *mut PyObject) -> isize { #[cfg(test)] mod tests { + use pyo3::ffi; use pyo3::prelude::*; - use pyo3::types::PyInt; - use pyo3::{PyTypeInfo, ffi}; + use pyo3::types::PyList; #[test] fn refcount() { Python::attach(|py| unsafe { - let obj = PyInt::type_object(py); + // A freshly created, non-empty list is uniquely owned here: its + // reference count is private to this test (so parallel tests cannot + // perturb it) and it is mortal (not interned), so incref then decref + // must move the count by exactly one and back. + let obj = PyList::new(py, [1, 2, 3]).unwrap(); let ref_count = ffi::Py_REFCNT(obj.as_ptr()); let obj_clone = obj.clone(); assert_eq!(ffi::Py_REFCNT(obj.as_ptr()), ref_count + 1); diff --git a/crates/common/src/refcount.rs b/crates/common/src/refcount.rs index c589ead40..4d52e1382 100644 --- a/crates/common/src/refcount.rs +++ b/crates/common/src/refcount.rs @@ -1,10 +1,14 @@ use crate::atomic::{Ordering, PyAtomic, Radium}; // State layout (usize): -// [1 bit: destructed] [1 bit: reserved] [1 bit: leaked] [N bits: weak_count] [M bits: strong_count] +// [1 bit: destructed] [1 bit: published] [1 bit: leaked] [N bits: weak_count] [M bits: strong_count] // 64-bit: N=30, M=31. 32-bit: N=14, M=15. const FLAG_BITS: u32 = 3; const DESTRUCTED: usize = 1 << (usize::BITS - 1); +/// Object was published to a lock-free cache; memory reclamation is +/// deferred through QSBR so concurrent try-incref readers never touch +/// freed memory. Sticky once set. +const PUBLISHED: usize = 1 << (usize::BITS - 2); const LEAKED: usize = 1 << (usize::BITS - 3); const TOTAL_COUNT_WIDTH: u32 = usize::BITS - FLAG_BITS; const WEAK_WIDTH: u32 = TOTAL_COUNT_WIDTH / 2; @@ -72,8 +76,8 @@ impl State { /// Reference count using state layout with LEAKED support. /// /// State layout (usize): -/// 64-bit: [1 bit: destructed] [1 bit: reserved] [1 bit: leaked] [30 bits: weak_count] [31 bits: strong_count] -/// 32-bit: [1 bit: destructed] [1 bit: reserved] [1 bit: leaked] [14 bits: weak_count] [15 bits: strong_count] +/// 64-bit: [1 bit: destructed] [1 bit: published] [1 bit: leaked] [30 bits: weak_count] [31 bits: strong_count] +/// 32-bit: [1 bit: destructed] [1 bit: published] [1 bit: leaked] [14 bits: weak_count] [15 bits: strong_count] pub struct RefCount { state: PyAtomic<usize>, } @@ -187,6 +191,17 @@ impl RefCount { pub fn is_leaked(&self) -> bool { State::from_raw(self.state.load(Ordering::Acquire)).leaked() } + + /// Mark the object as published to a lock-free cache (sticky). + #[inline] + pub fn mark_published(&self) { + self.state.fetch_or(PUBLISHED, Ordering::Release); + } + + #[inline] + pub fn is_published(&self) -> bool { + (self.state.load(Ordering::Acquire) & PUBLISHED) != 0 + } } // Deferred Drop Infrastructure @@ -279,3 +294,24 @@ pub fn flush_deferred_drops() { } }); } + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn published_bit_survives_refcount_traffic() { + let rc = RefCount::new(); // strong = 1 + assert!(!rc.is_published()); + rc.mark_published(); + assert!(rc.is_published()); + rc.inc(); // strong = 2 + assert!(rc.is_published()); + assert!(!rc.dec()); // strong = 1 + assert!(rc.is_published()); + assert!(rc.safe_inc()); // strong = 2 + assert!(!rc.dec()); // strong = 1 + assert!(rc.dec()); // strong = 0 -> true + assert!(rc.is_published()); + } +} diff --git a/crates/compiler-core/src/bytecode/instruction.rs b/crates/compiler-core/src/bytecode/instruction.rs index 76871b2c9..63e292225 100644 --- a/crates/compiler-core/src/bytecode/instruction.rs +++ b/crates/compiler-core/src/bytecode/instruction.rs @@ -18,23 +18,29 @@ macro_rules! define_opcodes { } ) => { #[derive(Clone, Copy, Debug, Eq, PartialEq)] + #[repr($typ)] $opcode_vis enum $opcode_name { - $($op_name),* + $($op_name = $op_id),* } impl $opcode_name { #[doc = concat!("Converts this opcode to [`", stringify!($instr_name), "`].")] #[must_use] + #[inline] $opcode_vis const fn as_instruction(&self) -> $instr_name { - match self { - $( - Self::$op_name => $instr_name::$op_name $({ $arg_name: Arg::marker() })?, - )* - } + // SAFETY: `$opcode_name` and `$instr_name` are both `#[repr($typ)]` + // enums sharing identical explicit discriminants, and every + // `$instr_name` payload field is the zero-sized `Arg<T>` marker + // (see the `size_of` assertion near its definition), so both + // enums have the same one-`$typ`-wide representation: just the + // discriminant. Converting a live `$opcode_name` value therefore + // yields the `$instr_name` variant with the matching discriminant. + unsafe { core::mem::transmute(*self) } } /// Map a specialized or instrumented opcode back to its adaptive (base) variant. #[must_use] + #[inline] $opcode_vis const fn deoptimize(self) -> Self { match self.deopt() { Some(v) => v, @@ -49,6 +55,9 @@ macro_rules! define_opcodes { } // NOTE: Keep private. Will be exposed under `try_from_u8/try_from_u16`. + // Kept as a match rather than a range check + transmute: `$op_id` + // values are not contiguous (specialized/instrumented opcodes leave + // gaps), so validity can't be expressed as a simple bound. pub(super) const fn try_from_numeric(value: $typ) -> Result<Self, $crate::marshal::MarshalError> { match value { $($op_id => Ok(Self::$op_name),)* @@ -58,10 +67,11 @@ macro_rules! define_opcodes { // NOTE: Keep private. Will be exposed under `as_u8/as_u16`. #[must_use] + #[inline] pub(super) const fn as_numeric(self) -> $typ { - match self { - $(Self::$op_name => $op_id,)* - } + // `$opcode_name` is `#[repr($typ)]` with an explicit `$op_id` + // discriminant on every variant, so this is a plain identity cast. + self as $typ } } @@ -95,15 +105,24 @@ macro_rules! define_opcodes { ),* } + // Every `$instr_name` payload field is the zero-sized `Arg<T>` marker, so + // (combined with the `#[repr($typ)]` above) each variant's representation + // is exactly its `$typ` discriminant with no padding. `as_opcode` and + // `$opcode_name::as_instruction` rely on this to convert via + // `mem::transmute` instead of a per-variant match. + const _: () = assert!(core::mem::size_of::<$instr_name>() == core::mem::size_of::<$typ>()); + impl $instr_name { #[doc = concat!("Get the corresponding [`", stringify!($opcode_name), "`].")] #[must_use] + #[inline] $instr_vis const fn as_opcode(&self) -> $opcode_name { - match self { - $( - Self::$op_name $({ $arg_name: _ })? => $opcode_name::$op_name, - )* - } + // SAFETY: symmetric to `$opcode_name::as_instruction` above: + // `*self`'s representation is exactly its `$typ` discriminant + // (checked by the `size_of` assertion above this impl), and that + // discriminant is always a valid `$opcode_name` discriminant + // because both enums share the same explicit `$op_id` list. + unsafe { core::mem::transmute(*self) } } #[must_use] @@ -1450,4 +1469,228 @@ mod tests { assert!(AnyInstruction::from(PseudoOpcode::Jump).is_no_fallthrough()); } + + /// Snapshot of the chained `match` implementations that `Opcode::deopt` + /// and `Opcode::cache_entries` used before they were rewritten as table + /// lookups. Exists only to pin the observable behavior of the table + /// lookups against the logic they replaced. + mod reference { + use super::Opcode; + + pub(super) const fn deopt(op: Opcode) -> Option<Opcode> { + Some(match op { + Opcode::ResumeCheck => Opcode::Resume, + Opcode::LoadConstMortal | Opcode::LoadConstImmortal => Opcode::LoadConst, + Opcode::ToBoolAlwaysTrue + | Opcode::ToBoolBool + | Opcode::ToBoolInt + | Opcode::ToBoolList + | Opcode::ToBoolNone + | Opcode::ToBoolStr => Opcode::ToBool, + Opcode::BinaryOpMultiplyInt + | Opcode::BinaryOpAddInt + | Opcode::BinaryOpSubtractInt + | Opcode::BinaryOpMultiplyFloat + | Opcode::BinaryOpAddFloat + | Opcode::BinaryOpSubtractFloat + | Opcode::BinaryOpAddUnicode + | Opcode::BinaryOpSubscrListInt + | Opcode::BinaryOpSubscrListSlice + | Opcode::BinaryOpSubscrTupleInt + | Opcode::BinaryOpSubscrStrInt + | Opcode::BinaryOpSubscrDict + | Opcode::BinaryOpSubscrGetitem + | Opcode::BinaryOpExtend + | Opcode::BinaryOpInplaceAddUnicode => Opcode::BinaryOp, + Opcode::StoreSubscrDict | Opcode::StoreSubscrListInt => Opcode::StoreSubscr, + Opcode::SendGen => Opcode::Send, + Opcode::UnpackSequenceTwoTuple + | Opcode::UnpackSequenceTuple + | Opcode::UnpackSequenceList => Opcode::UnpackSequence, + Opcode::StoreAttrInstanceValue + | Opcode::StoreAttrSlot + | Opcode::StoreAttrWithHint => Opcode::StoreAttr, + Opcode::LoadGlobalModule | Opcode::LoadGlobalBuiltin => Opcode::LoadGlobal, + Opcode::LoadSuperAttrAttr | Opcode::LoadSuperAttrMethod => Opcode::LoadSuperAttr, + Opcode::LoadAttrInstanceValue + | Opcode::LoadAttrModule + | Opcode::LoadAttrWithHint + | Opcode::LoadAttrSlot + | Opcode::LoadAttrClass + | Opcode::LoadAttrClassWithMetaclassCheck + | Opcode::LoadAttrProperty + | Opcode::LoadAttrGetattributeOverridden + | Opcode::LoadAttrMethodWithValues + | Opcode::LoadAttrMethodNoDict + | Opcode::LoadAttrMethodLazyDict + | Opcode::LoadAttrNondescriptorWithValues + | Opcode::LoadAttrNondescriptorNoDict => Opcode::LoadAttr, + Opcode::CompareOpFloat | Opcode::CompareOpInt | Opcode::CompareOpStr => { + Opcode::CompareOp + } + Opcode::ContainsOpSet | Opcode::ContainsOpDict => Opcode::ContainsOp, + Opcode::JumpBackwardNoJit | Opcode::JumpBackwardJit => Opcode::JumpBackward, + Opcode::ForIterList + | Opcode::ForIterTuple + | Opcode::ForIterRange + | Opcode::ForIterGen => Opcode::ForIter, + Opcode::CallBoundMethodExactArgs + | Opcode::CallPyExactArgs + | Opcode::CallType1 + | Opcode::CallStr1 + | Opcode::CallTuple1 + | Opcode::CallBuiltinClass + | Opcode::CallBuiltinO + | Opcode::CallBuiltinFast + | Opcode::CallBuiltinFastWithKeywords + | Opcode::CallLen + | Opcode::CallIsinstance + | Opcode::CallListAppend + | Opcode::CallMethodDescriptorO + | Opcode::CallMethodDescriptorFastWithKeywords + | Opcode::CallMethodDescriptorNoargs + | Opcode::CallMethodDescriptorFast + | Opcode::CallAllocAndEnterInit + | Opcode::CallPyGeneral + | Opcode::CallBoundMethodGeneral + | Opcode::CallNonPyGeneral => Opcode::Call, + Opcode::CallKwBoundMethod | Opcode::CallKwPy | Opcode::CallKwNonPy => { + Opcode::CallKw + } + _ => return None, + }) + } + + pub(super) const fn deoptimize(op: Opcode) -> Opcode { + match deopt(op) { + Some(v) => v, + None => match op.to_base() { + Some(v) => v, + None => op, + }, + } + } + + pub(super) const fn cache_entries(op: Opcode) -> usize { + match deoptimize(op) { + Opcode::StoreSubscr => 1, + Opcode::ToBool => 3, + Opcode::BinaryOp => 5, + Opcode::Call => 3, + Opcode::CallKw => 3, + Opcode::CompareOp => 1, + Opcode::ContainsOp => 1, + Opcode::ForIter => 1, + Opcode::JumpBackward => 1, + Opcode::LoadAttr => 9, + Opcode::LoadGlobal => 4, + Opcode::LoadSuperAttr => 1, + Opcode::PopJumpIfFalse => 1, + Opcode::PopJumpIfNone => 1, + Opcode::PopJumpIfNotNone => 1, + Opcode::PopJumpIfTrue => 1, + Opcode::Send => 1, + Opcode::StoreAttr => 4, + Opcode::UnpackSequence => 1, + _ => 0, + } + } + } + + #[test] + fn cache_entries_and_deopt_tables_match_reference_impl() { + let mut checked = 0; + for byte in 0u8..=255 { + let Ok(op) = Opcode::try_from_u8(byte) else { + continue; + }; + + assert_eq!( + op.deopt(), + reference::deopt(op), + "deopt() mismatch for {op:?}" + ); + assert_eq!( + op.cache_entries(), + reference::cache_entries(op), + "cache_entries() mismatch for {op:?}" + ); + checked += 1; + } + + // Sanity check that the loop actually exercised opcodes rather than + // silently skipping all of them. + assert!(checked > 200); + } + + /// `Opcode::as_numeric`, `Opcode::as_instruction` and + /// `Instruction::as_opcode` used to be per-variant matches; they are now + /// an identity cast and two `mem::transmute`s respectively. `byte` (an + /// input independent of any of those three functions) together with the + /// untouched `try_from_u8`/`TryFrom<u8>` conversions serve as the + /// reference: every opcode reachable from a byte must convert back to + /// that exact byte and round-trip through `Instruction`. + #[test] + fn opcode_instruction_numeric_conversions_match_try_from_numeric() { + let mut checked = 0; + for byte in 0u8..=255 { + let Ok(op) = Opcode::try_from_u8(byte) else { + continue; + }; + + assert_eq!(op.as_numeric(), byte, "as_numeric() mismatch for {op:?}"); + + let instr = op.as_instruction(); + assert_eq!( + instr.as_opcode(), + op, + "as_instruction()/as_opcode() round trip mismatch for {op:?}" + ); + + let instr_via_try_from = Instruction::try_from(byte).unwrap(); + assert_eq!( + instr_via_try_from.as_opcode(), + op, + "Instruction::try_from({byte}) mismatch" + ); + + checked += 1; + } + + assert!(checked > 200); + } + + /// Same as [`opcode_instruction_numeric_conversions_match_try_from_numeric`] + /// but for the `u16`-discriminant pseudo-opcode instantiation of + /// `define_opcodes!`. + #[test] + fn pseudo_opcode_instruction_numeric_conversions_match_try_from_numeric() { + let mut checked = 0; + for value in 0u16..=u16::MAX { + let Ok(op) = PseudoOpcode::try_from_u16(value) else { + continue; + }; + + assert_eq!(op.as_numeric(), value, "as_numeric() mismatch for {op:?}"); + + let instr = op.as_instruction(); + assert_eq!( + instr.as_opcode(), + op, + "as_instruction()/as_opcode() round trip mismatch for {op:?}" + ); + + let instr_via_try_from = PseudoInstruction::try_from(value).unwrap(); + assert_eq!( + instr_via_try_from.as_opcode(), + op, + "PseudoInstruction::try_from({value}) mismatch" + ); + + checked += 1; + } + + // All 11 `PseudoInstruction` variants should have been exercised. + assert_eq!(checked, 11); + } } diff --git a/crates/compiler-core/src/bytecode/opcode_metadata.rs b/crates/compiler-core/src/bytecode/opcode_metadata.rs index 64c8d3c53..16db49bea 100644 --- a/crates/compiler-core/src/bytecode/opcode_metadata.rs +++ b/crates/compiler-core/src/bytecode/opcode_metadata.rs @@ -6,114 +6,292 @@ use crate::{bytecode::instruction::StackEffect, marshal::MarshalError}; impl super::Opcode { /// Returns [`Self`] as [`u8`]. #[must_use] + #[inline] pub const fn as_u8(self) -> u8 { self.as_numeric() } #[must_use] + #[inline] pub const fn cache_entries(self) -> usize { - match self.deoptimize() { - Self::StoreSubscr => 1, - Self::ToBool => 3, - Self::BinaryOp => 5, - Self::Call => 3, - Self::CallKw => 3, - Self::CompareOp => 1, - Self::ContainsOp => 1, - Self::ForIter => 1, - Self::JumpBackward => 1, - Self::LoadAttr => 9, - Self::LoadGlobal => 4, - Self::LoadSuperAttr => 1, - Self::PopJumpIfFalse => 1, - Self::PopJumpIfNone => 1, - Self::PopJumpIfNotNone => 1, - Self::PopJumpIfTrue => 1, - Self::Send => 1, - Self::StoreAttr => 4, - Self::UnpackSequence => 1, - _ => 0, - } + const CACHE_ENTRIES: [u8; 256] = [ + 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 3, 1, 1, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 4, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 4, 0, 0, 0, 0, 0, + 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 4, 4, 1, 1, 0, 1, 4, 4, 4, 1, 1, + 3, 3, 3, 3, 3, 3, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 3, 3, 0, 1, 0, 0, + ]; + + CACHE_ENTRIES[self.as_numeric() as usize] as usize } #[must_use] + #[inline] pub const fn deopt(self) -> Option<Self> { - Some(match self { - Self::ResumeCheck => Self::Resume, - Self::LoadConstMortal | Self::LoadConstImmortal => Self::LoadConst, - Self::ToBoolAlwaysTrue - | Self::ToBoolBool - | Self::ToBoolInt - | Self::ToBoolList - | Self::ToBoolNone - | Self::ToBoolStr => Self::ToBool, - Self::BinaryOpMultiplyInt - | Self::BinaryOpAddInt - | Self::BinaryOpSubtractInt - | Self::BinaryOpMultiplyFloat - | Self::BinaryOpAddFloat - | Self::BinaryOpSubtractFloat - | Self::BinaryOpAddUnicode - | Self::BinaryOpSubscrListInt - | Self::BinaryOpSubscrListSlice - | Self::BinaryOpSubscrTupleInt - | Self::BinaryOpSubscrStrInt - | Self::BinaryOpSubscrDict - | Self::BinaryOpSubscrGetitem - | Self::BinaryOpExtend - | Self::BinaryOpInplaceAddUnicode => Self::BinaryOp, - Self::StoreSubscrDict | Self::StoreSubscrListInt => Self::StoreSubscr, - Self::SendGen => Self::Send, - Self::UnpackSequenceTwoTuple | Self::UnpackSequenceTuple | Self::UnpackSequenceList => { - Self::UnpackSequence - } - Self::StoreAttrInstanceValue | Self::StoreAttrSlot | Self::StoreAttrWithHint => { - Self::StoreAttr - } - Self::LoadGlobalModule | Self::LoadGlobalBuiltin => Self::LoadGlobal, - Self::LoadSuperAttrAttr | Self::LoadSuperAttrMethod => Self::LoadSuperAttr, - Self::LoadAttrInstanceValue - | Self::LoadAttrModule - | Self::LoadAttrWithHint - | Self::LoadAttrSlot - | Self::LoadAttrClass - | Self::LoadAttrClassWithMetaclassCheck - | Self::LoadAttrProperty - | Self::LoadAttrGetattributeOverridden - | Self::LoadAttrMethodWithValues - | Self::LoadAttrMethodNoDict - | Self::LoadAttrMethodLazyDict - | Self::LoadAttrNondescriptorWithValues - | Self::LoadAttrNondescriptorNoDict => Self::LoadAttr, - Self::CompareOpFloat | Self::CompareOpInt | Self::CompareOpStr => Self::CompareOp, - Self::ContainsOpSet | Self::ContainsOpDict => Self::ContainsOp, - Self::JumpBackwardNoJit | Self::JumpBackwardJit => Self::JumpBackward, - Self::ForIterList | Self::ForIterTuple | Self::ForIterRange | Self::ForIterGen => { - Self::ForIter - } - Self::CallBoundMethodExactArgs - | Self::CallPyExactArgs - | Self::CallType1 - | Self::CallStr1 - | Self::CallTuple1 - | Self::CallBuiltinClass - | Self::CallBuiltinO - | Self::CallBuiltinFast - | Self::CallBuiltinFastWithKeywords - | Self::CallLen - | Self::CallIsinstance - | Self::CallListAppend - | Self::CallMethodDescriptorO - | Self::CallMethodDescriptorFastWithKeywords - | Self::CallMethodDescriptorNoargs - | Self::CallMethodDescriptorFast - | Self::CallAllocAndEnterInit - | Self::CallPyGeneral - | Self::CallBoundMethodGeneral - | Self::CallNonPyGeneral => Self::Call, - Self::CallKwBoundMethod | Self::CallKwPy | Self::CallKwNonPy => Self::CallKw, - _ => return None, - }) + const DEOPT: [Option<super::Opcode>; 256] = [ + None, + None, + None, + Some(super::Opcode::BinaryOp), + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + Some(super::Opcode::BinaryOp), + Some(super::Opcode::BinaryOp), + Some(super::Opcode::BinaryOp), + Some(super::Opcode::BinaryOp), + Some(super::Opcode::BinaryOp), + Some(super::Opcode::BinaryOp), + Some(super::Opcode::BinaryOp), + Some(super::Opcode::BinaryOp), + Some(super::Opcode::BinaryOp), + Some(super::Opcode::BinaryOp), + Some(super::Opcode::BinaryOp), + Some(super::Opcode::BinaryOp), + Some(super::Opcode::BinaryOp), + Some(super::Opcode::BinaryOp), + Some(super::Opcode::Call), + Some(super::Opcode::Call), + Some(super::Opcode::Call), + Some(super::Opcode::Call), + Some(super::Opcode::Call), + Some(super::Opcode::Call), + Some(super::Opcode::Call), + Some(super::Opcode::Call), + Some(super::Opcode::CallKw), + Some(super::Opcode::CallKw), + Some(super::Opcode::CallKw), + Some(super::Opcode::Call), + Some(super::Opcode::Call), + Some(super::Opcode::Call), + Some(super::Opcode::Call), + Some(super::Opcode::Call), + Some(super::Opcode::Call), + Some(super::Opcode::Call), + Some(super::Opcode::Call), + Some(super::Opcode::Call), + Some(super::Opcode::Call), + Some(super::Opcode::Call), + Some(super::Opcode::Call), + Some(super::Opcode::CompareOp), + Some(super::Opcode::CompareOp), + Some(super::Opcode::CompareOp), + Some(super::Opcode::ContainsOp), + Some(super::Opcode::ContainsOp), + Some(super::Opcode::ForIter), + Some(super::Opcode::ForIter), + Some(super::Opcode::ForIter), + Some(super::Opcode::ForIter), + Some(super::Opcode::JumpBackward), + Some(super::Opcode::JumpBackward), + Some(super::Opcode::LoadAttr), + Some(super::Opcode::LoadAttr), + Some(super::Opcode::LoadAttr), + Some(super::Opcode::LoadAttr), + Some(super::Opcode::LoadAttr), + Some(super::Opcode::LoadAttr), + Some(super::Opcode::LoadAttr), + Some(super::Opcode::LoadAttr), + Some(super::Opcode::LoadAttr), + Some(super::Opcode::LoadAttr), + Some(super::Opcode::LoadAttr), + Some(super::Opcode::LoadAttr), + Some(super::Opcode::LoadAttr), + Some(super::Opcode::LoadConst), + Some(super::Opcode::LoadConst), + Some(super::Opcode::LoadGlobal), + Some(super::Opcode::LoadGlobal), + Some(super::Opcode::LoadSuperAttr), + Some(super::Opcode::LoadSuperAttr), + Some(super::Opcode::Resume), + Some(super::Opcode::Send), + Some(super::Opcode::StoreAttr), + Some(super::Opcode::StoreAttr), + Some(super::Opcode::StoreAttr), + Some(super::Opcode::StoreSubscr), + Some(super::Opcode::StoreSubscr), + Some(super::Opcode::ToBool), + Some(super::Opcode::ToBool), + Some(super::Opcode::ToBool), + Some(super::Opcode::ToBool), + Some(super::Opcode::ToBool), + Some(super::Opcode::ToBool), + Some(super::Opcode::UnpackSequence), + Some(super::Opcode::UnpackSequence), + Some(super::Opcode::UnpackSequence), + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + None, + ]; + + DEOPT[self.as_numeric() as usize] } /// Does this opcode have 'HAS_ARG_FLAG' set. @@ -664,6 +842,7 @@ impl super::Opcode { } #[must_use] + #[inline] pub const fn to_base(self) -> Option<Self> { Some(match self { Self::InstrumentedCall => Self::Call, @@ -723,16 +902,19 @@ impl super::Opcode { impl super::PseudoOpcode { /// Returns [`Self`] as [`u16`]. #[must_use] + #[inline] pub const fn as_u16(self) -> u16 { self.as_numeric() } #[must_use] + #[inline] pub const fn cache_entries(self) -> usize { 0 } #[must_use] + #[inline] pub const fn deopt(self) -> Option<Self> { None } @@ -818,6 +1000,7 @@ impl super::PseudoOpcode { } #[must_use] + #[inline] pub const fn to_base(self) -> Option<Self> { None } diff --git a/crates/derive-impl/src/pyclass.rs b/crates/derive-impl/src/pyclass.rs index aed2c5d8c..809d3164b 100644 --- a/crates/derive-impl/src/pyclass.rs +++ b/crates/derive-impl/src/pyclass.rs @@ -796,8 +796,15 @@ pub(crate) fn impl_pyexception(attr: PunctuatedNestedMeta, item: &Item) -> Resul quote! {} }; + // Forward a `traverse` option to the generated `#[pyclass]` so exception + // payloads with a manual `Traverse` impl are GC-tracked and traversed. + let traverse_attr = match class_meta.inner()._optional_str("traverse").ok().flatten() { + Some(value) => quote! { , traverse = #value }, + None => quote! {}, + }; + let ret = quote! { - #[pyclass(module = false, name = #class_name, base = #base_class_name)] + #[pyclass(module = false, name = #class_name, base = #base_class_name #traverse_attr)] #item #impl_pyclass }; diff --git a/crates/derive-impl/src/util.rs b/crates/derive-impl/src/util.rs index 60b2296ce..a07084446 100644 --- a/crates/derive-impl/src/util.rs +++ b/crates/derive-impl/src/util.rs @@ -465,8 +465,15 @@ impl ClassItemMeta { pub(crate) struct ExceptionItemMeta(ClassItemMeta); impl ItemMeta for ExceptionItemMeta { - const ALLOWED_NAMES: &'static [&'static str] = - &["module", "name", "base", "unhashable", "ctx", "impl"]; + const ALLOWED_NAMES: &'static [&'static str] = &[ + "module", + "name", + "base", + "unhashable", + "ctx", + "impl", + "traverse", + ]; fn from_inner(inner: ItemMetaInner) -> Self { Self(ClassItemMeta(inner)) diff --git a/crates/stdlib/Cargo.toml b/crates/stdlib/Cargo.toml index 1e0718695..d32e7ce8b 100644 --- a/crates/stdlib/Cargo.toml +++ b/crates/stdlib/Cargo.toml @@ -53,6 +53,7 @@ num_enum = { workspace = true } parking_lot = { workspace = true } phf = { workspace = true, default-features = true, features = ["macros"] } rapidhash = { workspace = true } +scopeguard = { workspace = true } memchr = { workspace = true } base64 = { workspace = true } diff --git a/crates/stdlib/src/faulthandler.rs b/crates/stdlib/src/faulthandler.rs index 3717c18b7..900d66b76 100644 --- a/crates/stdlib/src/faulthandler.rs +++ b/crates/stdlib/src/faulthandler.rs @@ -241,7 +241,7 @@ mod decl { /// Dump traceback for a thread given its frame stack (for cross-thread dumping). /// # Safety /// Each `FramePtr` must point to a live frame (caller holds the Mutex). - #[cfg(all(any(unix, windows), feature = "threading"))] + #[cfg(all(windows, feature = "threading"))] fn dump_traceback_thread_frames( fd: i32, thread_id: u64, @@ -260,6 +260,35 @@ mod decl { } } + /// Dump a thread's traceback by walking its published top frame down the + /// `previous` chain (most recent first). Signal-safe: only atomic pointer + /// loads, no locks. Callers guarantee frame liveness — under stop-the-world + /// for `faulthandler.dump_traceback`, or best-effort for the watchdog (like + /// `_Py_DumpTracebackThreads`, which walks lock-free while other threads + /// may still run). + #[cfg(all(unix, feature = "threading"))] + fn dump_traceback_thread_chain(fd: i32, thread_id: u64, is_current: bool, top: *const Frame) { + const MAX_FRAME_DEPTH: usize = 100; + write_thread_id(fd, thread_id, is_current); + + if top.is_null() { + puts(fd, " <no Python frame>\n"); + return; + } + let mut frame_ptr = top; + let mut depth = 0; + while !frame_ptr.is_null() && depth < MAX_FRAME_DEPTH { + // SAFETY: the frame is alive per the caller's liveness guarantee. + let frame = unsafe { &*frame_ptr }; + dump_frame_from_raw(fd, frame); + frame_ptr = frame.previous_frame(); + depth += 1; + } + if depth >= MAX_FRAME_DEPTH && !frame_ptr.is_null() { + puts(fd, " ...\n"); + } + } + #[derive(FromArgs)] struct DumpTracebackArgs { #[pyarg(any, default)] @@ -278,11 +307,9 @@ mod decl { dump_all_threads(fd, vm); } else { puts(fd, "Stack (most recent call first):\n"); - let frames = vm.frames.borrow(); - for fp in frames.iter().rev() { - // SAFETY: the frame is alive while it's in the Vec - dump_frame_from_ref(fd, unsafe { fp.as_ref() }); - } + crate::vm::frame::for_each_current_frame(|frame| { + dump_frame_from_ref(fd, frame); + }); } } @@ -298,7 +325,43 @@ mod decl { #[cfg(any(unix, windows))] fn dump_all_threads(fd: i32, vm: &VirtualMachine) { // Get all threads' frame stacks from the shared registry - #[cfg(feature = "threading")] + // unix: stop-the-world so every other thread is parked at a safepoint + // and its frame chain is quiescent and alive while we walk it (matches + // faulthandler.dump_traceback running with the GIL held). + #[cfg(all(unix, feature = "threading"))] + { + use core::sync::atomic::Ordering; + let current_tid = rustpython_vm::stdlib::_thread::get_ident(); + { + vm.state.stop_the_world.stop_the_world(vm); + scopeguard::defer! { vm.state.stop_the_world.start_the_world(vm); } + let registry = vm.state.thread_frames.lock(); + #[expect( + clippy::iter_over_hash_type, + reason = "Iteration order doesn't matter here" + )] + for (&tid, slot) in registry.iter() { + if tid == current_tid { + continue; + } + let top = slot.top_frame.load(Ordering::Relaxed) as *const Frame; + dump_traceback_thread_chain(fd, tid, false, top); + puts(fd, "\n"); + } + } + + // Now dump current thread from its live frame chain. + write_thread_id(fd, current_tid, true); + if crate::vm::vm::thread::get_current_frame().is_null() { + puts(fd, " <no Python frame>\n"); + } else { + crate::vm::frame::for_each_current_frame(|frame| { + dump_frame_from_ref(fd, frame); + }); + } + } + + #[cfg(all(not(unix), feature = "threading"))] { let current_tid = rustpython_vm::stdlib::_thread::get_ident(); let registry = vm.state.thread_frames.lock(); @@ -318,25 +381,24 @@ mod decl { puts(fd, "\n"); } - // Now dump current thread (use vm.frames for most up-to-date data) + // Now dump current thread from its live frame chain. write_thread_id(fd, current_tid, true); - let frames = vm.frames.borrow(); - if frames.is_empty() { + if crate::vm::vm::thread::get_current_frame().is_null() { puts(fd, " <no Python frame>\n"); } else { - for fp in frames.iter().rev() { - dump_frame_from_ref(fd, unsafe { fp.as_ref() }); - } + crate::vm::frame::for_each_current_frame(|frame| { + dump_frame_from_ref(fd, frame); + }); } } #[cfg(not(feature = "threading"))] { + let _ = vm; write_thread_id(fd, current_thread_id(), true); - let frames = vm.frames.borrow(); - for fp in frames.iter().rev() { - dump_frame_from_ref(fd, unsafe { fp.as_ref() }); - } + crate::vm::frame::for_each_current_frame(|frame| { + dump_frame_from_ref(fd, frame); + }); } } @@ -657,7 +719,20 @@ mod decl { // Use thread frame slots when threading is enabled (includes all threads). // Fall back to live frame walking for non-threaded builds. cfg_select! { - feature = "threading" => { + all(unix, feature = "threading") => { + // The watchdog is a plain OS thread, not attached to + // the VM, so it cannot stop-the-world. Walk each + // published top frame lock-free and best-effort, like + // the faulthandler watchdog thread. + for (tid, slot) in &thread_frame_slots { + let top = slot + .top_frame + .load(core::sync::atomic::Ordering::Relaxed) + as *const Frame; + dump_traceback_thread_chain(fd, *tid, false, top); + } + } + all(not(unix), feature = "threading") => { for (tid, slot) in &thread_frame_slots { let frames = slot.frames.lock(); dump_traceback_thread_frames(fd, *tid, false, &frames); diff --git a/crates/stdlib/src/overlapped.rs b/crates/stdlib/src/overlapped.rs index 4ce3d3ba8..8610fadb3 100644 --- a/crates/stdlib/src/overlapped.rs +++ b/crates/stdlib/src/overlapped.rs @@ -309,8 +309,9 @@ mod _overlapped { return Err(vm.new_value_error("operation failed to start")); } - let result = - host_overlapped::get_overlapped_result(inner.handle, &inner.overlapped, wait); + let result = vm.allow_threads(|| { + host_overlapped::get_overlapped_result(inner.handle, &inner.overlapped, wait) + }); let transferred = result.transferred; let err = result.error; inner.error = err; diff --git a/crates/stdlib/src/ssl.rs b/crates/stdlib/src/ssl.rs index edcdf18fa..81d69b8c6 100644 --- a/crates/stdlib/src/ssl.rs +++ b/crates/stdlib/src/ssl.rs @@ -2709,13 +2709,13 @@ mod _ssl { sni_name: Option<&str>, vm: &VirtualMachine, ) -> PyResult<()> { - let callback = self - .context - .read() - .sni_callback - .read() - .clone() - .ok_or_else(|| vm.new_value_error("SNI callback not set"))?; + // The callback may have been cleared (sni_callback = None) between the + // handshake deciding to invoke it and this point. A concurrent removal + // is not an error: there is simply nothing to run. + let callback = self.context.read().sni_callback.read().clone(); + let Some(callback) = callback else { + return Ok(()); + }; let ssl_sock = self.owner.read().clone().unwrap_or_else(|| vm.ctx.none()); let server_name_py: PyObjectRef = match sni_name { diff --git a/crates/vm/Cargo.toml b/crates/vm/Cargo.toml index 0b2feed50..24006c8b3 100644 --- a/crates/vm/Cargo.toml +++ b/crates/vm/Cargo.toml @@ -54,6 +54,7 @@ flame = { workspace = true, optional = true } hex = { workspace = true } indexmap = { workspace = true } itertools = { workspace = true } +itoa = { workspace = true } is-macro = { workspace = true } libc = { workspace = true } log = { workspace = true } diff --git a/crates/vm/src/builtins/code.rs b/crates/vm/src/builtins/code.rs index e30813bf8..b1132a55a 100644 --- a/crates/vm/src/builtins/code.rs +++ b/crates/vm/src/builtins/code.rs @@ -471,6 +471,11 @@ pub struct PyCode { pub monitoring_data: PyMutex<Option<CoMonitoringData>>, /// Whether adaptive counters have been initialized (lazy quickening). pub quickened: core::sync::atomic::AtomicBool, + /// Whether the bytecode contains any instruction that mutates the current + /// exc_info slot (`vm.set_exception`). When false, a normal frame call for + /// this code cannot leave the slot unbalanced, so `with_frame` skips the + /// exc_info save/restore. Computed once by scanning the instruction stream. + pub has_exc_handling: bool, } impl Deref for PyCode { @@ -483,12 +488,26 @@ impl Deref for PyCode { impl PyCode { pub fn new(code: CodeObject) -> Self { let sp = code.source_path as *const PyStrInterned as *mut PyStrInterned; + // The only opcodes that call `vm.set_exception` (mutating the shared + // exc_info slot); instrumented variants only replace these base opcodes + // in place, so scanning the freshly-built stream is a sound predicate. + let has_exc_handling = code.instructions.iter().any(|u| { + matches!( + u.op, + Instruction::PushExcInfo + | Instruction::PopExcept + | Instruction::CheckEgMatch + | Instruction::EndAsyncFor + | Instruction::InstrumentedEndAsyncFor + ) + }); Self { code, source_path: AtomicPtr::new(sp), instrumentation_version: AtomicU64::new(0), monitoring_data: PyMutex::new(None), quickened: core::sync::atomic::AtomicBool::new(false), + has_exc_handling, } } diff --git a/crates/vm/src/builtins/frame.rs b/crates/vm/src/builtins/frame.rs index ab45f6867..710d23b7c 100644 --- a/crates/vm/src/builtins/frame.rs +++ b/crates/vm/src/builtins/frame.rs @@ -4,7 +4,7 @@ use super::{PyCode, PyDictRef, PyIntRef, PyStrRef}; use crate::{ - Context, Py, PyObjectRef, PyRef, PyResult, VirtualMachine, + Context, Py, PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine, class::PyClassImpl, frame::{Frame, FrameOwner, FrameRef}, function::PySetterValue, @@ -454,14 +454,6 @@ impl Frame { self.builtins.clone() } - #[pygetset] - fn f_locals(&self, vm: &VirtualMachine) -> PyResult { - let result = self.f_locals_mapping(vm).map(Into::into); - self.locals_dirty - .store(true, core::sync::atomic::Ordering::Release); - result - } - #[pygetset] pub fn f_code(&self) -> PyRef<PyCode> { self.code.clone() @@ -704,10 +696,27 @@ impl Py<Frame> { // Clear temporary refs self.temporary_refs.lock().clear(); self.f_locals_hidden_overlay.lock().take(); + self.f_extra_locals.lock().take(); + self.retained_back.lock().take(); Ok(()) } + #[pygetset] + fn f_locals(&self, vm: &VirtualMachine) -> PyResult { + // Optimized (function) frames expose a live write-through + // FrameLocalsProxy; class/module/exec frames expose their namespace + // mapping directly. + if self.code.flags.contains(bytecode::CodeFlags::OPTIMIZED) { + self.check_locals_access(vm)?; + self.mark_escaped(); + let proxy = crate::builtins::FrameLocalsProxy::new(self.to_owned()); + Ok(proxy.into_ref(&vm.ctx).into()) + } else { + self.f_locals_mapping(vm).map(Into::into) + } + } + #[pygetset] fn f_generator(&self) -> Option<PyObjectRef> { self.generator.to_owned() @@ -715,27 +724,59 @@ impl Py<Frame> { #[pygetset] pub fn f_back(&self, vm: &VirtualMachine) -> Option<PyRef<Frame>> { + #[cfg(not(feature = "threading"))] + let _ = vm; let previous = self.previous_frame(); if previous.is_null() { return None; } - if let Some(frame) = vm - .frames - .borrow() - .iter() - .find(|fp| { - // SAFETY: the caller keeps the FrameRef alive while it's in the Vec - let py: &Self = unsafe { fp.as_ref() }; - let ptr: *const Frame = &**py; - core::ptr::eq(ptr, previous) - }) - .map(|fp| unsafe { fp.as_ref() }.to_owned()) - { + // Look for the caller on the current thread's signal-safe frame chain. + // Finding it there proves it is still live on this thread. + if let Some(frame) = crate::frame::find_owned_chain_frame(previous) { + frame.mark_escaped(); return Some(frame); } - #[cfg(feature = "threading")] + // The caller already returned and left the live chain, but this frame + // escaped and retained a strong reference to it at release time. + let retained = self.retained_back.lock().clone(); + if let Some(frame) = retained { + frame.mark_escaped(); + return Some(frame); + } + + // The caller lives on another thread. unix: park every thread under + // stop-the-world so their frame chains are quiescent and alive, then + // walk each published top frame down its `previous` chain looking for + // the caller. Request stop-the-world before the registry lock. + #[cfg(all(unix, feature = "threading"))] + { + use core::sync::atomic::Ordering; + vm.state.stop_the_world.stop_the_world(vm); + scopeguard::defer! { vm.state.stop_the_world.start_the_world(vm); } + let registry = vm.state.thread_frames.lock(); + #[expect( + clippy::iter_over_hash_type, + reason = "Iteration order doesn't matter here" + )] + for slot in registry.values() { + let mut cur = slot.top_frame.load(Ordering::Relaxed) as *const Frame; + while !cur.is_null() { + if core::ptr::eq(cur, previous) { + // SAFETY: world stopped -> this frame is alive on its + // owning thread's parked call stack. + let f = unsafe { &*Self::from_payload_ptr(cur) }; + f.mark_escaped(); + return Some(f.to_owned()); + } + // SAFETY: chain frames on a parked thread are alive. + cur = unsafe { (*cur).previous_frame() }; + } + } + } + + #[cfg(all(not(unix), feature = "threading"))] { let registry = vm.state.thread_frames.lock(); #[expect( @@ -751,6 +792,7 @@ impl Py<Frame> { let ptr: *const Frame = &**f; core::ptr::eq(ptr, previous).then(|| f.to_owned()) }) { + frame.mark_escaped(); return Some(frame); } } diff --git a/crates/vm/src/builtins/frame_locals_proxy.rs b/crates/vm/src/builtins/frame_locals_proxy.rs new file mode 100644 index 000000000..fbbc7f5d9 --- /dev/null +++ b/crates/vm/src/builtins/frame_locals_proxy.rs @@ -0,0 +1,326 @@ +//! The `FrameLocalsProxy` type returned by `frame.f_locals` for optimized +//! (function) frames. Implements PEP 667 write-through semantics on top of the +//! frame's fast-local slots and an extra-locals side dict. + +use super::{PyDict, PyDictRef, PyType}; +use crate::{ + AsObject, Context, Py, PyObject, PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine, + atomic_func, + class::PyClassImpl, + frame::FrameRef, + function::{FuncArgs, OptionalArg, PyArithmeticValue, PyComparisonValue}, + object::{Traverse, TraverseFn}, + protocol::{PyMappingMethods, PyNumberMethods, PySequenceMethods}, + recursion::ReprGuard, + types::{ + AsMapping, AsNumber, AsSequence, Comparable, Constructor, Iterable, PyComparisonOp, + Representable, + }, +}; +use rustpython_common::lock::LazyLock; +use rustpython_common::wtf8::Wtf8Buf; + +#[pyclass(module = false, name = "FrameLocalsProxy", traverse = "manual")] +#[derive(Debug)] +pub struct FrameLocalsProxy { + frame: FrameRef, +} + +unsafe impl Traverse for FrameLocalsProxy { + fn traverse(&self, tracer_fn: &mut TraverseFn<'_>) { + self.frame.traverse(tracer_fn); + } +} + +impl PyPayload for FrameLocalsProxy { + #[inline] + fn class(ctx: &Context) -> &'static Py<PyType> { + ctx.types.frame_locals_proxy_type + } +} + +impl FrameLocalsProxy { + pub(crate) fn new(frame: FrameRef) -> Self { + Self { frame } + } + + fn snapshot(&self, vm: &VirtualMachine) -> PyResult<PyDictRef> { + self.frame.framelocalsproxy_snapshot(vm) + } + + fn keys_vec(&self, vm: &VirtualMachine) -> PyResult<Vec<PyObjectRef>> { + Ok(self.snapshot(vm)?.into_iter().map(|(k, _)| k).collect()) + } +} + +impl Constructor for FrameLocalsProxy { + type Args = FuncArgs; + + fn py_new(_cls: &Py<PyType>, args: Self::Args, vm: &VirtualMachine) -> PyResult<Self> { + if !args.kwargs.is_empty() { + return Err(vm.new_type_error("FrameLocalsProxy() takes no keyword arguments")); + } + let mut args = args.args; + if args.len() != 1 { + return Err(vm.new_type_error(format!( + "FrameLocalsProxy expected 1 argument, got {}", + args.len() + ))); + } + let frame: FrameRef = args + .pop() + .unwrap() + .downcast() + .map_err(|_| vm.new_type_error("FrameLocalsProxy expected a frame"))?; + Ok(Self::new(frame)) + } +} + +#[pyclass(with( + Constructor, + AsMapping, + AsSequence, + AsNumber, + Iterable, + Comparable, + Representable +))] +impl FrameLocalsProxy { + fn __getitem__(&self, key: PyObjectRef, vm: &VirtualMachine) -> PyResult { + self.frame.framelocalsproxy_getitem(key, vm) + } + + fn __setitem__( + &self, + key: PyObjectRef, + value: PyObjectRef, + vm: &VirtualMachine, + ) -> PyResult<()> { + self.frame.framelocalsproxy_setitem(key, value, vm) + } + + fn __delitem__(&self, key: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> { + self.frame.framelocalsproxy_delitem(key, vm) + } + + fn __contains__(&self, key: PyObjectRef, vm: &VirtualMachine) -> PyResult<bool> { + self.frame.framelocalsproxy_contains(key, vm) + } + + fn __len__(&self, vm: &VirtualMachine) -> PyResult<usize> { + Ok(self.snapshot(vm)?.__len__()) + } + + #[pymethod] + fn keys(&self, vm: &VirtualMachine) -> PyResult<PyObjectRef> { + Ok(vm.ctx.new_list(self.keys_vec(vm)?).into()) + } + + #[pymethod] + fn values(&self, vm: &VirtualMachine) -> PyResult<PyObjectRef> { + let values = self.snapshot(vm)?.into_iter().map(|(_, v)| v).collect(); + Ok(vm.ctx.new_list(values).into()) + } + + #[pymethod] + fn items(&self, vm: &VirtualMachine) -> PyResult<PyObjectRef> { + let items = self + .snapshot(vm)? + .into_iter() + .map(|(k, v)| vm.ctx.new_tuple(vec![k, v]).into()) + .collect(); + Ok(vm.ctx.new_list(items).into()) + } + + #[pymethod] + fn get(&self, key: PyObjectRef, default: OptionalArg, vm: &VirtualMachine) -> PyResult { + match self.frame.framelocalsproxy_getitem(key, vm) { + Ok(value) => Ok(value), + Err(e) if e.fast_isinstance(vm.ctx.exceptions.key_error) => { + Ok(default.unwrap_or_none(vm)) + } + Err(e) => Err(e), + } + } + + #[pymethod] + fn pop(&self, key: PyObjectRef, default: OptionalArg, vm: &VirtualMachine) -> PyResult { + self.frame + .framelocalsproxy_pop(key, default.into_option(), vm) + } + + #[pymethod] + fn setdefault(&self, key: PyObjectRef, default: OptionalArg, vm: &VirtualMachine) -> PyResult { + self.frame + .framelocalsproxy_setdefault(key, default.unwrap_or_none(vm), vm) + } + + #[pymethod] + fn copy(&self, vm: &VirtualMachine) -> PyResult<PyObjectRef> { + Ok(self.snapshot(vm)?.into()) + } + + #[pymethod] + fn update(&self, args: FuncArgs, vm: &VirtualMachine) -> PyResult<()> { + if !args.kwargs.is_empty() { + return Err(vm.new_type_error("FrameLocalsProxy.update() takes no keyword arguments")); + } + if args.args.len() != 1 { + return Err(vm.new_type_error(format!( + "FrameLocalsProxy.update() takes exactly one argument ({} given)", + args.args.len() + ))); + } + self.update_from(&args.args[0], vm) + } + + fn update_from(&self, other: &PyObject, vm: &VirtualMachine) -> PyResult<()> { + let items: Vec<(PyObjectRef, PyObjectRef)> = + if let Some(dict) = other.downcast_ref::<PyDict>() { + dict.into_iter().collect() + } else if let Some(proxy) = other.downcast_ref::<Self>() { + proxy.snapshot(vm)?.into_iter().collect() + } else { + return Err( + vm.new_type_error("update() argument must be dict or another FrameLocalsProxy") + ); + }; + for (key, value) in items { + self.frame.framelocalsproxy_setitem(key, value, vm)?; + } + Ok(()) + } + + #[pymethod] + fn __reversed__(&self, vm: &VirtualMachine) -> PyResult<PyObjectRef> { + let mut keys = self.keys_vec(vm)?; + keys.reverse(); + Ok(vm.ctx.new_list(keys).into()) + } + + fn __ior__(zelf: PyRef<Self>, other: PyObjectRef, vm: &VirtualMachine) -> PyResult { + zelf.update_from(&other, vm)?; + Ok(zelf.into()) + } + + fn __or__(&self, other: PyObjectRef, vm: &VirtualMachine) -> PyResult { + let base = self.snapshot(vm)?; + vm._or(base.as_object(), &other) + } + + fn __ror__(&self, other: PyObjectRef, vm: &VirtualMachine) -> PyResult { + let base = self.snapshot(vm)?; + vm._or(&other, base.as_object()) + } + + #[pymethod] + fn __reduce__(&self, vm: &VirtualMachine) -> PyResult { + Err(vm.new_type_error("cannot pickle 'FrameLocalsProxy' object")) + } + + #[pymethod] + fn __reduce_ex__(&self, _protocol: OptionalArg, vm: &VirtualMachine) -> PyResult { + Err(vm.new_type_error("cannot pickle 'FrameLocalsProxy' object")) + } +} + +impl AsMapping for FrameLocalsProxy { + fn as_mapping() -> &'static PyMappingMethods { + static AS_MAPPING: LazyLock<PyMappingMethods> = LazyLock::new(|| PyMappingMethods { + length: atomic_func!( + |mapping, vm| FrameLocalsProxy::mapping_downcast(mapping).__len__(vm) + ), + subscript: atomic_func!(|mapping, needle, vm| { + FrameLocalsProxy::mapping_downcast(mapping).__getitem__(needle.to_owned(), vm) + }), + ass_subscript: atomic_func!(|mapping, needle, value, vm| { + let zelf = FrameLocalsProxy::mapping_downcast(mapping); + match value { + Some(value) => zelf.__setitem__(needle.to_owned(), value, vm), + None => zelf.__delitem__(needle.to_owned(), vm), + } + }), + }); + &AS_MAPPING + } +} + +impl AsSequence for FrameLocalsProxy { + fn as_sequence() -> &'static PySequenceMethods { + static AS_SEQUENCE: LazyLock<PySequenceMethods> = LazyLock::new(|| PySequenceMethods { + contains: atomic_func!(|seq, target, vm| { + FrameLocalsProxy::sequence_downcast(seq).__contains__(target.to_owned(), vm) + }), + ..PySequenceMethods::NOT_IMPLEMENTED + }); + &AS_SEQUENCE + } +} + +impl AsNumber for FrameLocalsProxy { + fn as_number() -> &'static PyNumberMethods { + static AS_NUMBER: PyNumberMethods = PyNumberMethods { + or: Some(|a, b, vm| { + if let Some(proxy) = a.downcast_ref::<FrameLocalsProxy>() { + proxy.__or__(b.to_owned(), vm) + } else if let Some(proxy) = b.downcast_ref::<FrameLocalsProxy>() { + proxy.__ror__(a.to_owned(), vm) + } else { + Ok(vm.ctx.not_implemented()) + } + }), + inplace_or: Some(|a, b, vm| { + let proxy = a + .to_owned() + .downcast::<FrameLocalsProxy>() + .map_err(|_| vm.new_type_error("expected FrameLocalsProxy"))?; + FrameLocalsProxy::__ior__(proxy, b.to_owned(), vm) + }), + ..PyNumberMethods::NOT_IMPLEMENTED + }; + &AS_NUMBER + } +} + +impl Iterable for FrameLocalsProxy { + fn iter(zelf: PyRef<Self>, vm: &VirtualMachine) -> PyResult { + let keys = vm.ctx.new_list(zelf.keys_vec(vm)?); + keys.as_object().to_owned().get_iter(vm).map(Into::into) + } +} + +impl Comparable for FrameLocalsProxy { + fn cmp( + zelf: &Py<Self>, + other: &PyObject, + op: PyComparisonOp, + vm: &VirtualMachine, + ) -> PyResult<PyComparisonValue> { + op.eq_only(|| { + let self_dict: PyObjectRef = zelf.snapshot(vm)?.into(); + let other_obj = match other.downcast_ref::<Self>() { + Some(proxy) => proxy.snapshot(vm)?.into(), + None => other.to_owned(), + }; + let res = self_dict.rich_compare(other_obj, PyComparisonOp::Eq, vm)?; + PyArithmeticValue::from_object(vm, res) + .map(|o| o.try_to_bool(vm)) + .transpose() + }) + } +} + +impl Representable for FrameLocalsProxy { + fn repr_wtf8(zelf: &Py<Self>, vm: &VirtualMachine) -> PyResult<Wtf8Buf> { + if let Some(_guard) = ReprGuard::enter(vm, zelf.as_object()) { + let dict = zelf.snapshot(vm)?; + Ok(dict.as_object().repr(vm)?.as_wtf8().to_owned()) + } else { + Ok(Wtf8Buf::from("{...}")) + } + } +} + +pub(crate) fn init(context: &'static Context) { + FrameLocalsProxy::extend_class(context, context.types.frame_locals_proxy_type); +} diff --git a/crates/vm/src/builtins/function.rs b/crates/vm/src/builtins/function.rs index 4125ef4c4..47fda2994 100644 --- a/crates/vm/src/builtins/function.rs +++ b/crates/vm/src/builtins/function.rs @@ -95,7 +95,12 @@ unsafe impl Traverse for PyFunction { fn traverse(&self, tracer_fn: &mut TraverseFn<'_>) { self.globals.traverse(tracer_fn); if let Some(closure) = self.closure.as_ref() { - closure.as_untyped().traverse(tracer_fn); + // Visit the closure tuple itself as an edge, not its cells: the + // tuple is a tracked object that can join a reference cycle, and + // `clear` releases the whole tuple. Visiting only the cells would + // leave the tuple's reference unaccounted, stranding it as a false + // GC root. + tracer_fn(closure.as_untyped().as_object()); } self.defaults_and_kwdefaults.traverse(tracer_fn); // Traverse additional fields that may contain references @@ -580,30 +585,40 @@ impl Py<PyFunction> { .into_ref(&vm.ctx); self.fill_locals_from_args(&frame, func_args, vm)?; - if is_async_gen { - let obj = PyAsyncGen::new(frame.clone(), self.__name__(), self.__qualname__()) - .into_pyobject(vm); - frame.set_generator(&obj); - Ok(obj) - } else if is_gen { - let obj = PyGenerator::new(frame.clone(), self.__name__(), self.__qualname__()) - .into_pyobject(vm); - frame.set_generator(&obj); - Ok(obj) - } else if is_coro { - let obj = PyCoroutine::new(frame.clone(), self.__name__(), self.__qualname__()) - .into_pyobject(vm); - frame.set_generator(&obj); - Ok(obj) - } else { + if use_datastack { let result = vm.run_frame(frame.clone()); // Release data stack memory after frame execution completes. - unsafe { - if let Some(base) = frame.materialize_localsplus() { - vm.datastack_pop(base); - } - } + crate::frame::release_datastack_frame(&frame, vm); result + } else { + let obj = if is_async_gen { + PyAsyncGen::new(frame.clone(), self.__name__(), self.__qualname__()) + .into_pyobject(vm) + } else if is_gen { + PyGenerator::new(frame.clone(), self.__name__(), self.__qualname__()) + .into_pyobject(vm) + } else { + PyCoroutine::new(frame.clone(), self.__name__(), self.__qualname__()) + .into_pyobject(vm) + }; + // Generator/coroutine frames outlive this call and can join a + // reference cycle through their owning generator, so they must + // participate in the GC. They were created untracked + // (NEW_REF_UNTRACKED); track them now, before the back-reference + // is installed. Their localsplus is heap-backed by construction + // (use_datastack == false), so a collector never reads data-stack + // storage when it traverses them. + debug_assert!( + !frame.localsplus_is_datastack_backed(), + "generator frame is data-stack-backed" + ); + // SAFETY: the frame is alive (held by `frame`) and untracked. + unsafe { + crate::gc_state::gc_state() + .track_object(core::ptr::NonNull::from(frame.as_object())); + } + frame.set_generator(&obj); + Ok(obj) } } @@ -634,16 +649,6 @@ impl Py<PyFunction> { new_v } - /// function_kind(SIMPLE_FUNCTION) equivalent for CALL specialization. - /// Returns true if: CO_OPTIMIZED, no VARARGS, no VARKEYWORDS, no kwonly args. - pub(crate) fn is_simple_for_call_specialization(&self) -> bool { - let code: &Py<PyCode> = &self.code; - let flags = code.flags; - flags.contains(bytecode::CodeFlags::OPTIMIZED) - && !flags.intersects(bytecode::CodeFlags::VARARGS | bytecode::CodeFlags::VARKEYWORDS) - && code.kwonlyarg_count == 0 - } - /// Check if this function is eligible for exact-args call specialization. /// Returns true if: CO_OPTIMIZED, no VARARGS, no VARKEYWORDS, no kwonly args, /// and effective_nargs matches co_argcount. @@ -656,6 +661,16 @@ impl Py<PyFunction> { && code.arg_count == effective_nargs } + /// True if the code object is a generator, coroutine or async generator. + #[inline] + pub(crate) fn is_generator_like(&self) -> bool { + self.code.flags.intersects( + bytecode::CodeFlags::GENERATOR + | bytecode::CodeFlags::COROUTINE + | bytecode::CodeFlags::ASYNC_GENERATOR, + ) + } + /// Runtime guard for CALL_*_EXACT_ARGS specialization: check only argcount. /// Other invariants are guaranteed by function versioning and specialization-time checks. #[inline] @@ -672,7 +687,7 @@ impl Py<PyFunction> { pub(crate) fn prepare_exact_args_frame( &self, - mut args: Vec<PyObjectRef>, + args: impl ExactSizeIterator<Item = PyObjectRef>, vm: &VirtualMachine, ) -> FrameRef { let code: PyRef<PyCode> = (*self.code).to_owned(); @@ -710,7 +725,7 @@ impl Py<PyFunction> { { let fastlocals = unsafe { frame.fastlocals_mut() }; - for (slot, arg) in fastlocals.iter_mut().zip(args.drain(..)) { + for (slot, arg) in fastlocals.iter_mut().zip(args) { *slot = Some(arg); } } @@ -718,41 +733,55 @@ impl Py<PyFunction> { frame } + fn invoke_prepared_exact_args( + &self, + args: impl ExactSizeIterator<Item = PyObjectRef>, + vm: &VirtualMachine, + ) -> PyResult { + let frame = self.prepare_exact_args_frame(args, vm); + + let result = vm.run_frame(frame.clone()); + crate::frame::release_datastack_frame(&frame, vm); + result + } + /// Fast path for calling a simple function with exact positional args. /// Skips FuncArgs allocation, prepend_arg, and fill_locals_from_args. /// Only valid when: CO_OPTIMIZED, no VARARGS, no VARKEYWORDS, no kwonlyargs, /// and nargs == co_argcount. pub fn invoke_exact_args(&self, args: Vec<PyObjectRef>, vm: &VirtualMachine) -> PyResult { - let code: PyRef<PyCode> = (*self.code).to_owned(); - - debug_assert_eq!(args.len(), code.arg_count as usize); - debug_assert!(code.flags.contains(bytecode::CodeFlags::OPTIMIZED)); - debug_assert!( - !code - .flags - .intersects(bytecode::CodeFlags::VARARGS | bytecode::CodeFlags::VARKEYWORDS) - ); - debug_assert_eq!(code.kwonlyarg_count, 0); + debug_assert_eq!(args.len(), self.code.arg_count as usize); // Generator/coroutine code objects are SIMPLE_FUNCTION in call // specialization classification, but their call path must still // go through invoke() to produce generator/coroutine objects. - if code.flags.intersects( - bytecode::CodeFlags::GENERATOR - | bytecode::CodeFlags::COROUTINE - | bytecode::CodeFlags::ASYNC_GENERATOR, - ) { + if self.is_generator_like() { return self.invoke(FuncArgs::from(args), vm); } - let frame = self.prepare_exact_args_frame(args, vm); + self.invoke_prepared_exact_args(args.into_iter(), vm) + } - let result = vm.run_frame(frame.clone()); - unsafe { - if let Some(base) = frame.materialize_localsplus() { - vm.datastack_pop(base); - } + /// Like `invoke_exact_args`, but moves the args out of caller-provided + /// slots (all filled with `Some`), so callers can stage them in a + /// fixed-size stack buffer instead of allocating a Vec per call. + pub(crate) fn invoke_exact_args_slots( + &self, + args: &mut [Option<PyObjectRef>], + vm: &VirtualMachine, + ) -> PyResult { + debug_assert_eq!(args.len(), self.code.arg_count as usize); + + let taken = args + .iter_mut() + .map(|slot| slot.take().expect("arg slot must be filled")); + // Generator/coroutine code objects are SIMPLE_FUNCTION in call + // specialization classification, but their call path must still + // go through invoke() to produce generator/coroutine objects. + if self.is_generator_like() { + let args: Vec<PyObjectRef> = taken.collect(); + return self.invoke(FuncArgs::from(args), vm); } - result + self.invoke_prepared_exact_args(taken, vm) } } @@ -1476,14 +1505,10 @@ pub(crate) fn vectorcall_function( // FAST PATH: simple positional-only call, exact arg count. // Move owned args directly into fastlocals — no clone needed. args.truncate(nargs); - let frame = zelf.prepare_exact_args_frame(args, vm); + let frame = zelf.prepare_exact_args_frame(args.into_iter(), vm); let result = vm.run_frame(frame.clone()); - unsafe { - if let Some(base) = frame.materialize_localsplus() { - vm.datastack_pop(base); - } - } + crate::frame::release_datastack_frame(&frame, vm); return result; } diff --git a/crates/vm/src/builtins/int.rs b/crates/vm/src/builtins/int.rs index b92461497..c5aa607d0 100644 --- a/crates/vm/src/builtins/int.rs +++ b/crates/vm/src/builtins/int.rs @@ -310,7 +310,7 @@ impl PyInt { #[must_use] pub fn to_str_radix_10(&self) -> String { match self.value.to_i64() { - Some(i) => i.to_string(), + Some(i) => itoa::Buffer::new().format(i).to_owned(), None => self.value.to_string(), } } diff --git a/crates/vm/src/builtins/mod.rs b/crates/vm/src/builtins/mod.rs index eba5af366..ffc01b00f 100644 --- a/crates/vm/src/builtins/mod.rs +++ b/crates/vm/src/builtins/mod.rs @@ -28,6 +28,8 @@ pub use filter::PyFilter; pub(crate) mod float; pub use float::PyFloat; pub(crate) mod frame; +pub(crate) mod frame_locals_proxy; +pub use frame_locals_proxy::FrameLocalsProxy; pub(crate) mod function; pub use function::{PyBoundMethod, PyFunction}; pub(crate) mod generator; diff --git a/crates/vm/src/builtins/object.rs b/crates/vm/src/builtins/object.rs index 147e215a0..633eaf48a 100644 --- a/crates/vm/src/builtins/object.rs +++ b/crates/vm/src/builtins/object.rs @@ -65,34 +65,24 @@ impl Constructor for PyBaseObject { } // Ensure that all abstract methods are implemented before instantiating instance. - if let Some(abs_methods) = cls.get_attr(identifier!(vm, __abstractmethods__)) - && let Some(unimplemented_abstract_method_count) = abs_methods.length_opt(vm) - { + if let Some(abs_methods) = cls.get_attr(identifier!(vm, __abstractmethods__)) { let methods: Vec<PyUtf8StrRef> = abs_methods.try_to_value(vm)?; - let methods: String = Itertools::intersperse( - methods.iter().map(|name| name.as_str().to_owned()), - "', '".to_owned(), - ) - .collect(); - - let unimplemented_abstract_method_count = unimplemented_abstract_method_count?; - let name = cls.name().to_string(); - - match unimplemented_abstract_method_count { - 0 => {} - 1 => { - return Err(vm.new_type_error(format!( - "class {name} without an implementation for abstract method '{methods}'" - ))); - } - 2.. => { - return Err(vm.new_type_error(format!( - "class {name} without an implementation for abstract methods '{methods}'" - ))); - } - // TODO: remove `allow` when redox build doesn't complain about it - #[allow(unreachable_patterns)] - _ => unreachable!(), + let unimplemented_abstract_method_count = methods.len(); + if unimplemented_abstract_method_count > 0 { + let methods: String = Itertools::intersperse( + methods.iter().map(|name| name.as_str().to_owned()), + "', '".to_owned(), + ) + .collect(); + let name = cls.name().to_string(); + let noun = if unimplemented_abstract_method_count == 1 { + "method" + } else { + "methods" + }; + return Err(vm.new_type_error(format!( + "class {name} without an implementation for abstract {noun} '{methods}'" + ))); } } @@ -346,23 +336,7 @@ impl PyBaseObject { Ok(res) } - /// Implement setattr(self, name, value). - #[pymethod] - fn __setattr__( - obj: PyObjectRef, - name: PyStrRef, - value: PyObjectRef, - vm: &VirtualMachine, - ) -> PyResult<()> { - obj.generic_setattr(&name, PySetterValue::Assign(value), vm) - } - - /// Implement delattr(self, name). - #[pymethod] - fn __delattr__(obj: PyObjectRef, name: PyStrRef, vm: &VirtualMachine) -> PyResult<()> { - obj.generic_setattr(&name, PySetterValue::Delete, vm) - } - + // __setattr__ and __delattr__ are added as slot wrappers by add_operators. #[pyslot] pub(crate) fn slot_setattro( obj: &PyObject, @@ -461,39 +435,7 @@ impl PyBaseObject { && !cls.slots.flags.has_feature(PyTypeFlags::IMMUTABLETYPE); // FIXME(#1979) cls instances might have a payload if both_mutable || both_module { - let has_dict = - |typ: &Py<PyType>| typ.slots.flags.has_feature(PyTypeFlags::HAS_DICT); - let has_weakref = - |typ: &Py<PyType>| typ.slots.flags.has_feature(PyTypeFlags::HAS_WEAKREF); - // Compare slots tuples - let slots_equal = match ( - current_cls - .heaptype_ext - .as_ref() - .and_then(|e| e.slots.as_ref()), - cls.heaptype_ext.as_ref().and_then(|e| e.slots.as_ref()), - ) { - (Some(a), Some(b)) => { - a.len() == b.len() - && a.iter() - .zip(b.iter()) - .all(|(x, y)| x.as_wtf8() == y.as_wtf8()) - } - (None, None) => true, - _ => false, - }; - if current_cls.slots.basicsize != cls.slots.basicsize - || !slots_equal - || has_dict(current_cls) != has_dict(&cls) - || has_weakref(current_cls) != has_weakref(&cls) - || current_cls.slots.member_count != cls.slots.member_count - { - return Err(vm.new_type_error(format!( - "__class__ assignment: '{}' object layout differs from '{}'", - cls.name(), - current_cls.name() - ))); - } + super::type_::compatible_for_assignment(current_cls, &cls, "__class__", vm)?; instance.set_class(cls, vm); Ok(()) } else { @@ -513,17 +455,14 @@ impl PyBaseObject { } /// Return getattr(self, name). + /// + /// __getattribute__ is added as a slot wrapper by add_operators. #[pyslot] pub(crate) fn getattro(obj: &PyObject, name: &Py<PyStr>, vm: &VirtualMachine) -> PyResult { vm_trace!("object.__getattribute__({:?}, {:?})", obj, name); obj.as_object().generic_getattr(name, vm) } - #[pymethod] - fn __getattribute__(obj: PyObjectRef, name: PyStrRef, vm: &VirtualMachine) -> PyResult { - Self::getattro(&obj, &name, vm) - } - #[pymethod] fn __reduce__(obj: PyObjectRef, vm: &VirtualMachine) -> PyResult { common_reduce(obj, 0, vm) diff --git a/crates/vm/src/builtins/tuple.rs b/crates/vm/src/builtins/tuple.rs index 7ed815ce2..d48639b2c 100644 --- a/crates/vm/src/builtins/tuple.rs +++ b/crates/vm/src/builtins/tuple.rs @@ -51,46 +51,14 @@ unsafe impl Traverse for PyTuple { } } -// spell-checker:ignore MAXSAVESIZE -/// Per-size freelist storage for tuples, matching tuples[PyTuple_MAXSAVESIZE]. -/// Each bucket caches tuples of a specific element count (index = len - 1). -struct TupleFreeList { - buckets: [Vec<NonNull<PyObject>>; Self::MAX_SAVE_SIZE], -} - -impl TupleFreeList { - /// Largest tuple size to cache on the freelist (sizes 1..=20). - const MAX_SAVE_SIZE: usize = 20; - const fn new() -> Self { - Self { - buckets: [const { Vec::new() }; Self::MAX_SAVE_SIZE], - } - } -} - -impl Default for TupleFreeList { - fn default() -> Self { - Self::new() - } -} - -impl Drop for TupleFreeList { - fn drop(&mut self) { - // Same safety pattern as FreeList<T>::drop — free raw allocation - // without running payload destructors to avoid TLS-after-destruction panics. - let layout = crate::object::pyinner_layout::<PyTuple>(); - for bucket in &mut self.buckets { - for ptr in bucket.drain(..) { - unsafe { - alloc::alloc::dealloc(ptr.as_ptr() as *mut u8, layout); - } - } - } - } -} - thread_local! { - static TUPLE_FREELIST: Cell<TupleFreeList> = const { Cell::new(TupleFreeList::new()) }; + // A single freelist for all tuple sizes: `PyInner<PyTuple>` is a + // fixed-size allocation (elements are a separate boxed slice that is + // dropped and replaced on reuse), so husks are interchangeable. + // freelist_push must not read the payload — it runs after tp_clear, + // which has already emptied `elements`. + static TUPLE_FREELIST: Cell<crate::object::FreeList<PyTuple>> = + const { Cell::new(crate::object::FreeList::new()) }; } impl PyPayload for PyTuple { @@ -104,16 +72,11 @@ impl PyPayload for PyTuple { #[inline] unsafe fn freelist_push(obj: *mut PyObject) -> bool { - let len = unsafe { &*(obj as *const crate::Py<Self>) }.elements.len(); - if len == 0 || len > TupleFreeList::MAX_SAVE_SIZE { - return false; - } TUPLE_FREELIST .try_with(|fl| { let mut list = fl.take(); - let bucket = &mut list.buckets[len - 1]; - let stored = if bucket.len() < Self::MAX_FREELIST { - bucket.push(unsafe { NonNull::new_unchecked(obj) }); + let stored = if list.len() < Self::MAX_FREELIST { + list.push(obj); true } else { false @@ -125,15 +88,11 @@ impl PyPayload for PyTuple { } #[inline] - unsafe fn freelist_pop(payload: &Self) -> Option<NonNull<PyObject>> { - let len = payload.elements.len(); - if len == 0 || len > TupleFreeList::MAX_SAVE_SIZE { - return None; - } + unsafe fn freelist_pop(_payload: &Self) -> Option<NonNull<PyObject>> { TUPLE_FREELIST .try_with(|fl| { let mut list = fl.take(); - let result = list.buckets[len - 1].pop(); + let result = list.pop().map(|p| unsafe { NonNull::new_unchecked(p) }); fl.set(list); result }) diff --git a/crates/vm/src/builtins/type.rs b/crates/vm/src/builtins/type.rs index 19fca5cf4..1c98e6861 100644 --- a/crates/vm/src/builtins/type.rs +++ b/crates/vm/src/builtins/type.rs @@ -18,7 +18,7 @@ use crate::{ common::{ ascii, borrow::BorrowedValue, - lock::{PyMutex, PyRwLock, PyRwLockReadGuard}, + lock::{PyRwLock, PyRwLockReadGuard}, }, function::{FuncArgs, KwArgs, OptionalArg, PyMethodDef, PySetterValue}, object::{Traverse, TraverseFn}, @@ -44,7 +44,8 @@ use std::collections::HashSet; #[pyclass(module = false, name = "type", traverse = "manual")] pub struct PyType { - pub base: Option<PyTypeRef>, + /// tp_base. Written under the type lock (see `set_bases`); read lock-free. + pub base: PyAtomicRef<Option<Self>>, pub bases: PyRwLock<Vec<PyTypeRef>>, pub mro: PyRwLock<Vec<PyTypeRef>>, pub subclasses: PyRwLock<Vec<PyRef<PyWeak>>>, @@ -57,7 +58,7 @@ pub struct PyType { } /// Monotonic counter for type version tags. Once it reaches `u32::MAX`, -/// `assign_version_tag()` returns 0 permanently, disabling new inline-cache +/// version assignment returns 0 permanently, disabling new inline-cache /// entries but not invalidating correctness (cache misses fall back to the /// generic path). static NEXT_TYPE_VERSION: AtomicU32 = AtomicU32::new(1); @@ -217,9 +218,30 @@ pub(crate) fn type_cache_clear() { TYPE_CACHE_CLEARING.store(false, Ordering::Release); } +/// Repair type-cache SeqLock state in the post-fork child. +/// +/// If fork happens while a writer holds an entry SeqLock, the child inherits +/// the odd sequence value with no surviving writer to release it. Clear only +/// those in-progress entries, matching `_PyTypes_AfterFork()`. +#[cfg(all(feature = "host_env", unix))] +pub(crate) unsafe fn type_cache_after_fork() { + for entry in TYPE_CACHE.iter() { + let seq = entry.sequence.load(Ordering::Relaxed); + if (seq & 1) == 0 { + continue; + } + entry.value.store(core::ptr::null_mut(), Ordering::Relaxed); + entry.name.store(core::ptr::null_mut(), Ordering::Relaxed); + entry.version.store(0, Ordering::Relaxed); + entry.sequence.store(0, Ordering::Relaxed); + } +} + unsafe impl crate::object::Traverse for PyType { fn traverse(&self, tracer_fn: &mut crate::object::TraverseFn<'_>) { - self.base.traverse(tracer_fn); + if let Some(base) = self.base.deref() { + tracer_fn(base.as_object()); + } self.bases.traverse(tracer_fn); self.mro.traverse(tracer_fn); self.subclasses.traverse(tracer_fn); @@ -235,7 +257,8 @@ unsafe impl crate::object::Traverse for PyType { /// type_clear: break reference cycles in type objects fn clear(&mut self, out: &mut Vec<crate::PyObjectRef>) { - if let Some(base) = self.base.take() { + // SAFETY: tp_clear runs with exclusive access to the type object. + if let Some(base) = unsafe { self.base.swap(None) } { out.push(base.into()); } if let Some(mut guard) = self.bases.try_write() { @@ -275,65 +298,53 @@ pub struct HeapTypeExt { pub struct TypeSpecializationCache { pub init: PyAtomicRef<Option<PyFunction>>, + pub init_version: AtomicU32, pub getitem: PyAtomicRef<Option<PyFunction>>, pub getitem_version: AtomicU32, - // Serialize cache writes/invalidation similar to CPython's BEGIN_TYPE_LOCK. - write_lock: PyMutex<()>, - retired: PyRwLock<Vec<PyObjectRef>>, } impl TypeSpecializationCache { fn new() -> Self { Self { init: PyAtomicRef::from(None::<PyRef<PyFunction>>), + init_version: AtomicU32::new(0), getitem: PyAtomicRef::from(None::<PyRef<PyFunction>>), getitem_version: AtomicU32::new(0), - write_lock: PyMutex::new(()), - retired: PyRwLock::new(Vec::new()), } } #[inline] - fn retire_old_function(&self, old: Option<PyRef<PyFunction>>) { - if let Some(old) = old { - self.retired.write().push(old.into()); + fn swap_init(&self, new_init: Option<PyRef<PyFunction>>) { + if let Some(new) = &new_init { + new.as_object().mark_cache_published(); } - } - - #[inline] - fn swap_init(&self, new_init: Option<PyRef<PyFunction>>, vm: Option<&VirtualMachine>) { - if let Some(vm) = vm { - // Keep replaced refs alive for the currently executing frame, matching - // CPython-style "old pointer remains valid during ongoing execution" - // without accumulating global retired refs. - self.init.swap_to_temporary_refs(new_init, vm); - return; - } - // SAFETY: old value is moved to `retired`, so it stays alive while - // concurrent readers may still hold borrowed references. + // SAFETY: reclamation of published objects is deferred via QSBR; + // racing try_to_owned readers never touch freed memory. let old = unsafe { self.init.swap(new_init) }; - self.retire_old_function(old); + if let Some(old) = old { + // Dropping may run arbitrary Python; defer past the type lock. + rustpython_common::refcount::try_defer_drop(move || drop(old)); + } } #[inline] - fn swap_getitem(&self, new_getitem: Option<PyRef<PyFunction>>, vm: Option<&VirtualMachine>) { - if let Some(vm) = vm { - self.getitem.swap_to_temporary_refs(new_getitem, vm); - return; + fn swap_getitem(&self, new_getitem: Option<PyRef<PyFunction>>) { + if let Some(new) = &new_getitem { + new.as_object().mark_cache_published(); } - // SAFETY: old value is moved to `retired`, so it stays alive while - // concurrent readers may still hold borrowed references. + // SAFETY: as in swap_init. let old = unsafe { self.getitem.swap(new_getitem) }; - self.retire_old_function(old); + if let Some(old) = old { + rustpython_common::refcount::try_defer_drop(move || drop(old)); + } } #[inline] fn invalidate_for_type_modified(&self) { - let _guard = self.write_lock.lock(); - // _spec_cache contract: type modification invalidates all cached - // specialization functions. - self.swap_init(None, None); - self.swap_getitem(None, None); + self.swap_init(None); + self.init_version.store(0, Ordering::Release); + self.swap_getitem(None); + self.getitem_version.store(0, Ordering::Release); } fn traverse(&self, tracer_fn: &mut TraverseFn<'_>) { @@ -343,25 +354,19 @@ impl TypeSpecializationCache { if let Some(getitem) = self.getitem.deref() { tracer_fn(getitem.as_object()); } - self.retired - .read() - .iter() - .map(|obj| obj.traverse(tracer_fn)) - .count(); } fn clear_into(&self, out: &mut Vec<PyObjectRef>) { - let _guard = self.write_lock.lock(); let old_init = unsafe { self.init.swap(None) }; if let Some(old_init) = old_init { out.push(old_init.into()); } + self.init_version.store(0, Ordering::Release); let old_getitem = unsafe { self.getitem.swap(None) }; if let Some(old_getitem) = old_getitem { out.push(old_getitem.into()); } self.getitem_version.store(0, Ordering::Release); - out.extend(self.retired.write().drain(..)); } } @@ -460,9 +465,19 @@ fn is_subtype_with_mro(a_mro: &[PyTypeRef], a: &Py<PyType>, b: &Py<PyType>) -> b } impl PyType { + #[inline] + fn with_type_lock<R>(vm: &VirtualMachine, f: impl FnOnce() -> R) -> R { + // Drops deferred via try_defer_drop inside the critical section run + // after the guard is released, outside the lock. + rustpython_common::refcount::with_deferred_drops(|| { + let _guard = vm.state.type_mutex.lock(); + f() + }) + } + /// Assign a fresh version tag. Returns 0 if the version counter has been /// exhausted, in which case no new cache entries can be created. - pub fn assign_version_tag(&self) -> u32 { + fn assign_version_tag_inner(&self) -> u32 { let v = self.tp_version_tag.load(Ordering::Acquire); if v != 0 { return v; @@ -470,7 +485,7 @@ impl PyType { // Assign versions to all direct bases first (MRO invariant). for base in self.bases.read().iter() { - if base.assign_version_tag() == 0 { + if base.assign_version_tag_inner() == 0 { return 0; } } @@ -490,29 +505,54 @@ impl PyType { } } - /// Invalidate this type's version tag and cascade to all subclasses. - pub fn modified(&self) { - if let Some(ext) = self.heaptype_ext.as_ref() { - ext.specialization_cache.invalidate_for_type_modified(); + pub(crate) fn version_for_specialization(&self, vm: &VirtualMachine) -> u32 { + let version = self.tp_version_tag.load(Ordering::Acquire); + if version != 0 { + return version; } - // If already invalidated, all subclasses must also be invalidated - // (guaranteed by the MRO invariant in assign_version_tag). + Self::with_type_lock(vm, || { + let version = self.tp_version_tag.load(Ordering::Acquire); + if version == 0 { + self.assign_version_tag_inner() + } else { + version + } + }) + } + + /// Invalidate this type's version tag and cascade to all subclasses. + fn modified_inner(&self) { let old_version = self.tp_version_tag.load(Ordering::Acquire); if old_version == 0 { return; } + let subclasses = self.subclasses.read(); + for weak_ref in subclasses.iter() { + if let Some(sub) = weak_ref.upgrade() { + sub.downcast_ref::<Self>().unwrap().modified_inner(); + } + } self.tp_version_tag.store(0, Ordering::SeqCst); // Nullify borrowed pointers in cache entries for this version // so they don't dangle after the dict is modified. type_cache_clear_version(old_version); - let subclasses = self.subclasses.read(); - for weak_ref in subclasses.iter() { - if let Some(sub) = weak_ref.upgrade() { - sub.downcast_ref::<Self>().unwrap().modified(); - } + if let Some(ext) = self.heaptype_ext.as_ref() { + ext.specialization_cache.invalidate_for_type_modified(); } } + pub fn modified(&self) { + if self.tp_version_tag.load(Ordering::Acquire) == 0 { + return; + } + if let Some(()) = crate::vm::thread::try_with_current_vm(|vm| { + Self::with_type_lock(vm, || self.modified_inner()); + }) { + return; + } + self.modified_inner(); + } + pub fn new_simple_heap( name: &str, base: &Py<Self>, @@ -773,7 +813,7 @@ impl PyType { let inherited_abc_tpflags = Self::inherited_abc_tpflags(&bases); let new_type = PyRef::new_ref( Self { - base: Some(base), + base: Some(base).into(), bases: PyRwLock::new(bases), mro: PyRwLock::new(mro), subclasses: PyRwLock::default(), @@ -837,7 +877,7 @@ impl PyType { let new_type = PyRef::new_ref( Self { - base: Some(base), + base: Some(base).into(), bases, mro: PyRwLock::new(mro), subclasses: PyRwLock::default(), @@ -864,8 +904,8 @@ impl PyType { // Note: inherit_slots is called in PyClassImpl::init_class after // slots are fully initialized by make_slots() - Self::set_new(&new_type.slots, new_type.base.as_ref()); - Self::set_alloc(&new_type.slots, new_type.base.as_ref()); + Self::set_new(&new_type.slots, new_type.base.deref()); + Self::set_alloc(&new_type.slots, new_type.base.deref()); let weakref_type = super::PyWeak::static_type(); for base in new_type.bases.read().iter() { @@ -911,11 +951,31 @@ impl PyType { self.update_slot::<true>(attr_name, ctx); } - Self::set_new(&self.slots, self.base.as_ref()); - Self::set_alloc(&self.slots, self.base.as_ref()); + Self::set_new(&self.slots, self.base.deref()); + Self::set_alloc(&self.slots, self.base.deref()); } - fn set_new(slots: &PyTypeSlots, base: Option<&PyTypeRef>) { + /// Recompute every slot for this type and all its descendants. update_all_slots + /// + /// Unlike `init_slots`, which is additive and driven only by the dunder names + /// present in the current MRO, this iterates the full `SLOT_DEFS` name table so + /// a slot whose method left the MRO is reset instead of left stale. Must be + /// called under the type lock after MROs have been recomputed. + pub(crate) fn update_all_slots(&self, ctx: &Context) { + // Invalidate version tags first; cascades to subclasses. + self.modified_inner(); + // Distinct names only; update_slot fans out to every SLOT_DEFS entry + // sharing the name and recurses into subclasses on its own. + let mut seen = std::collections::HashSet::new(); + for def in SLOT_DEFS { + if seen.insert(def.name) { + let name = ctx.intern_str(def.name); + self.update_slot::<true>(name, ctx); + } + } + } + + fn set_new(slots: &PyTypeSlots, base: Option<&Py<Self>>) { if slots.flags.contains(PyTypeFlags::DISALLOW_INSTANTIATION) { slots.new.store(None) } else if slots.new.load().is_none() { @@ -923,7 +983,7 @@ impl PyType { } } - fn set_alloc(slots: &PyTypeSlots, base: Option<&PyTypeRef>) { + fn set_alloc(slots: &PyTypeSlots, base: Option<&Py<Self>>) { if slots.alloc.load().is_none() { slots .alloc @@ -974,6 +1034,85 @@ impl PyType { self.find_name_in_mro(attr_name) } + /// `_PyType_LookupRefAndVersion` equivalent for interned names. + /// Returns the observed lookup result and the type version used for the lookup. + /// + /// Uses a lock-free SeqLock-style pattern: + /// Read: load sequence/version/name → load value + try_to_owned → + /// validate value pointer + sequence + /// Write: sequence(begin) → version=0 → swap value/name → version=assigned → sequence(end) + pub(crate) fn lookup_ref_and_version_interned( + &self, + name: &'static PyStrInterned, + vm: &VirtualMachine, + ) -> (Option<PyObjectRef>, u32) { + #[cfg(all(feature = "threading", debug_assertions))] + crate::vm::thread::debug_assert_current_thread_attached(); + + let version = self.tp_version_tag.load(Ordering::Acquire); + if version != 0 { + let idx = type_cache_hash(version, name); + let entry = &TYPE_CACHE[idx]; + let name_ptr = name as *const _ as *mut _; + loop { + let seq1 = entry.begin_read(); + let entry_version = entry.version.load(Ordering::Acquire); + let type_version = self.tp_version_tag.load(Ordering::Acquire); + if entry_version != type_version + || !core::ptr::eq(entry.name.load(Ordering::Relaxed), name_ptr) + { + break; + } + let ptr = entry.value.load(Ordering::Acquire); + if ptr.is_null() { + if entry.end_read(seq1) { + return (None, entry_version); + } + continue; + } + if let Some(cloned) = unsafe { PyObject::try_to_owned_from_ptr(ptr) } { + let same_ptr = core::ptr::eq(entry.value.load(Ordering::Relaxed), ptr); + if same_ptr && entry.end_read(seq1) { + return (Some(cloned), entry_version); + } + drop(cloned); + continue; + } + break; + } + } + + Self::with_type_lock(vm, || { + let assigned = if self.tp_version_tag.load(Ordering::Acquire) == 0 { + self.assign_version_tag_inner() + } else { + self.tp_version_tag.load(Ordering::Acquire) + }; + let result = self.find_name_in_mro_uncached(name); + if assigned != 0 + && !TYPE_CACHE_CLEARING.load(Ordering::Acquire) + && self.tp_version_tag.load(Ordering::Acquire) == assigned + { + let idx = type_cache_hash(assigned, name); + let entry = &TYPE_CACHE[idx]; + let name_ptr = name as *const _ as *mut _; + entry.begin_write(); + entry.version.store(0, Ordering::Release); + let new_ptr = result.as_ref().map_or(core::ptr::null_mut(), |found| { + // Defer memory reclamation of cached values via QSBR so + // racing readers never try-incref freed memory. + found.mark_cache_published(); + &**found as *const PyObject as *mut _ + }); + entry.value.store(new_ptr, Ordering::Relaxed); + entry.name.store(name_ptr, Ordering::Relaxed); + entry.version.store(assigned, Ordering::Release); + entry.end_write(); + } + (result, assigned) + }) + } + /// Cache __init__ for CALL_ALLOC_AND_ENTER_INIT specialization. /// The cache is valid only when guarded by the type version check. pub(crate) fn cache_init_for_specialization( @@ -988,22 +1127,27 @@ impl PyType { if tp_version == 0 { return false; } - if self.tp_version_tag.load(Ordering::Acquire) != tp_version { - return false; - } - let _guard = ext.specialization_cache.write_lock.lock(); - if self.tp_version_tag.load(Ordering::Acquire) != tp_version { - return false; - } - ext.specialization_cache.swap_init(Some(init), Some(vm)); - true + Self::with_type_lock(vm, || { + if self.tp_version_tag.load(Ordering::Acquire) != tp_version { + return false; + } + let func_version = init.get_version_for_current_state(); + if func_version == 0 { + return false; + } + ext.specialization_cache.swap_init(Some(init)); + ext.specialization_cache + .init_version + .store(func_version, Ordering::Release); + true + }) } /// Read cached __init__ for CALL_ALLOC_AND_ENTER_INIT specialization. pub(crate) fn get_cached_init_for_specialization( &self, tp_version: u32, - ) -> Option<PyRef<PyFunction>> { + ) -> Option<(PyRef<PyFunction>, u32)> { let ext = self.heaptype_ext.as_ref()?; if tp_version == 0 { return None; @@ -1011,9 +1155,19 @@ impl PyType { if self.tp_version_tag.load(Ordering::Acquire) != tp_version { return None; } - ext.specialization_cache + // Check order: pointer (Acquire) then function version. + let init = ext + .specialization_cache .init - .to_owned_ordering(Ordering::Acquire) + .try_to_owned(Ordering::Acquire)?; + let cached_version = ext + .specialization_cache + .init_version + .load(Ordering::Acquire); + if cached_version == 0 { + return None; + } + Some((init, cached_version)) } /// Cache __getitem__ for BINARY_OP_SUBSCR_GETITEM specialization. @@ -1030,34 +1184,34 @@ impl PyType { if tp_version == 0 { return false; } - let _guard = ext.specialization_cache.write_lock.lock(); - if self.tp_version_tag.load(Ordering::Acquire) != tp_version { - return false; - } - let func_version = getitem.get_version_for_current_state(); - if func_version == 0 { - return false; - } - ext.specialization_cache - .swap_getitem(Some(getitem), Some(vm)); - ext.specialization_cache - .getitem_version - .store(func_version, Ordering::Relaxed); - true + Self::with_type_lock(vm, || { + if self.tp_version_tag.load(Ordering::Acquire) != tp_version { + return false; + } + let func_version = getitem.get_version_for_current_state(); + if func_version == 0 { + return false; + } + ext.specialization_cache.swap_getitem(Some(getitem)); + ext.specialization_cache + .getitem_version + .store(func_version, Ordering::Release); + true + }) } /// Read cached __getitem__ for BINARY_OP_SUBSCR_GETITEM specialization. pub(crate) fn get_cached_getitem_for_specialization(&self) -> Option<(PyRef<PyFunction>, u32)> { let ext = self.heaptype_ext.as_ref()?; - // Match CPython check order: pointer (Acquire) then function version. + // Check order: pointer (Acquire) then function version. let getitem = ext .specialization_cache .getitem - .to_owned_ordering(Ordering::Acquire)?; + .try_to_owned(Ordering::Acquire)?; let cached_version = ext .specialization_cache .getitem_version - .load(Ordering::Relaxed); + .load(Ordering::Acquire); if cached_version == 0 { return None; } @@ -1070,82 +1224,14 @@ impl PyType { /// find_name_in_mro with method cache (MCACHE). /// Looks in tp_dict of types in MRO, bypasses descriptors. - /// - /// Uses a lock-free SeqLock-style pattern: - /// Read: load sequence/version/name → load value + try_to_owned → - /// validate value pointer + sequence - /// Write: sequence(begin) → version=0 → swap value/name → version=assigned → sequence(end) fn find_name_in_mro(&self, name: &'static PyStrInterned) -> Option<PyObjectRef> { - let version = self.tp_version_tag.load(Ordering::Acquire); - if version != 0 { - let idx = type_cache_hash(version, name); - let entry = &TYPE_CACHE[idx]; - let name_ptr = name as *const _ as *mut _; - loop { - let seq1 = entry.begin_read(); - let v1 = entry.version.load(Ordering::Acquire); - let type_version = self.tp_version_tag.load(Ordering::Acquire); - if v1 != type_version - || !core::ptr::eq(entry.name.load(Ordering::Relaxed), name_ptr) - { - break; - } - let ptr = entry.value.load(Ordering::Acquire); - if ptr.is_null() { - if entry.end_read(seq1) { - break; - } - continue; - } - // _Py_TryIncrefCompare-style validation: - // safe_inc via raw pointer, then ensure source is unchanged. - if let Some(cloned) = unsafe { PyObject::try_to_owned_from_ptr(ptr) } { - let same_ptr = core::ptr::eq(entry.value.load(Ordering::Relaxed), ptr); - if same_ptr && entry.end_read(seq1) { - return Some(cloned); - } - drop(cloned); - continue; - } - break; - } - } - - // Assign version BEFORE the MRO walk so that any concurrent - // modified() call during the walk invalidates this version. - let assigned = if version == 0 { - self.assign_version_tag() - } else { - version - }; - - // MRO walk - let result = self.find_name_in_mro_uncached(name); - - // Only cache positive results. Negative results are not cached to - // avoid stale entries from transient MRO walk failures during - // concurrent type modifications. - if let Some(ref found) = result - && assigned != 0 - && !TYPE_CACHE_CLEARING.load(Ordering::Acquire) - && self.tp_version_tag.load(Ordering::Acquire) == assigned - { - let idx = type_cache_hash(assigned, name); - let entry = &TYPE_CACHE[idx]; - let name_ptr = name as *const _ as *mut _; - entry.begin_write(); - // Invalidate first to prevent readers from seeing partial state - entry.version.store(0, Ordering::Release); - // Store borrowed pointer (no refcount increment). - let new_ptr = &**found as *const PyObject as *mut PyObject; - entry.value.store(new_ptr, Ordering::Relaxed); - entry.name.store(name_ptr, Ordering::Relaxed); - // Activate entry — Release ensures value/name writes are visible - entry.version.store(assigned, Ordering::Release); - entry.end_write(); - } - - result + crate::vm::thread::try_with_current_vm(|vm| { + self.lookup_ref_and_version_interned(name, vm).0 + }) + // No current VM: this thread is not registered for QSBR, so the + // lock-free cache read protocol is not sound here. Walk the MRO + // under the attributes locks instead (the dicts hold strong refs). + .unwrap_or_else(|| self.find_name_in_mro_uncached(name)) } /// Raw MRO walk without cache. @@ -1161,7 +1247,7 @@ impl PyType { /// _PyType_LookupRef: look up a name through the MRO without setting an exception. pub fn lookup_ref(&self, name: &Py<PyStr>, vm: &VirtualMachine) -> Option<PyObjectRef> { let interned_name = vm.ctx.interned_str(name)?; - self.find_name_in_mro(interned_name) + self.lookup_ref_and_version_interned(interned_name, vm).0 } pub fn get_super_attr(&self, attr_name: &'static PyStrInterned) -> Option<PyObjectRef> { @@ -1178,6 +1264,9 @@ impl PyType { /// Check if attribute exists in MRO, using method cache for fast check. /// Unlike find_name_in_mro, avoids cloning the value on cache hit. fn has_name_in_mro(&self, name: &'static PyStrInterned) -> bool { + #[cfg(all(feature = "threading", debug_assertions))] + crate::vm::thread::debug_assert_current_thread_attached(); + let version = self.tp_version_tag.load(Ordering::Acquire); if version != 0 { let idx = type_cache_hash(version, name); @@ -1350,7 +1439,7 @@ impl Py<PyType> { } pub fn iter_base_chain(&self) -> impl Iterator<Item = &Self> { - core::iter::successors(Some(self), |cls| cls.base.as_deref()) + core::iter::successors(Some(self), |cls| cls.base.deref()) } pub fn extend_methods(&'static self, method_defs: &'static [PyMethodDef], ctx: &Context) { @@ -1397,58 +1486,144 @@ impl PyType { } if bases.is_empty() { return Err(vm.new_type_error(format!( - "can only assign non-empty tuple to %s.__bases__, not {}", + "can only assign non-empty tuple to {}.__bases__, not ()", zelf.name() ))); } // TODO: check for mro cycles - // TODO: Remove this class from all subclass lists - // for base in self.bases.read().iter() { - // let subclasses = base.subclasses.write(); - // // TODO: how to uniquely identify the subclasses to remove? - // } + // Compute the new solid base before committing anything. This also + // validates the new bases (BASETYPE flag, no instance layout + // conflict), the same checks type creation performs. + let new_base = best_base(&bases, vm)?.to_owned(); - *zelf.bases.write() = bases; - // Recursively update the mros of this class and all subclasses - fn update_mro_recursively(cls: &PyType, vm: &VirtualMachine) -> PyResult<()> { - let mut mro = - PyType::resolve_mro(&cls.bases.read()).map_err(|msg| vm.new_type_error(msg))?; - // Preserve self (mro[0]) when updating MRO - mro.insert(0, cls.mro.read()[0].to_owned()); - *cls.mro.write() = mro; - for subclass in cls.subclasses.write().iter() { - let subclass = subclass.upgrade().unwrap(); - let subclass: &Py<PyType> = subclass.downcast_ref().unwrap(); - update_mro_recursively(subclass, vm)?; + // Reject reparenting onto a base whose instances have an incompatible + // object layout. + let old_base = zelf.base.deref().unwrap_or(vm.ctx.types.object_type); + compatible_for_assignment(old_base, &new_base, "__bases__", vm)?; + + // References released inside the critical section are collected here + // and dropped after the lock: dropping them inside can run arbitrary + // code that re-acquires the non-reentrant type mutex. + let mut retired: Vec<PyObjectRef> = Vec::new(); + + // A base swapped out of `zelf.base` may still be observed by + // concurrent lock-free readers; keep it alive in the frame's + // temporary refs so they never see a dangling pointer. + let keep_alive = |type_ref: PyTypeRef, retired: &mut Vec<PyObjectRef>| { + if let Some(frame) = vm.current_frame() { + frame.temporary_refs.lock().push(type_ref.into()); + } else { + retired.push(type_ref.into()); } + }; + + // Register this type as a subclass of the given bases + let register_subclasses = |bases: &[PyTypeRef]| { + let weakref_type = super::PyWeak::static_type(); + for base in bases { + base.subclasses.write().push( + zelf.as_object() + .downgrade_with_weakref_typ_opt(None, weakref_type.to_owned()) + .unwrap(), + ); + } + }; + + let result = Self::with_type_lock(vm, || { + // Remove this class from the old bases' subclass lists, pruning + // dead entries along the way. Upgraded refs are retired so the + // last strong reference is never dropped under the lock. + for base in zelf.bases.read().iter() { + let mut subclasses = base.subclasses.write(); + let mut kept = Vec::with_capacity(subclasses.len()); + for weak in subclasses.drain(..) { + match weak.upgrade() { + Some(obj) if obj.is(zelf.as_object()) => { + retired.push(obj); + retired.push(weak.into()); + } + Some(obj) => { + retired.push(obj); + kept.push(weak); + } + None => retired.push(weak.into()), + } + } + *subclasses = kept; + } + + let old_bases = core::mem::replace(&mut *zelf.bases.write(), bases); + let old_base = unsafe { zelf.base.swap(Some(new_base)) }; + + // Recursively update the mros of this class and all subclasses, + // recording the previous mros so a failure can be rolled back. + fn update_mro_recursively( + cls: &Py<PyType>, + undo: &mut Vec<(PyTypeRef, Vec<PyTypeRef>)>, + vm: &VirtualMachine, + ) -> PyResult<()> { + let mut mro = + PyType::resolve_mro(&cls.bases.read()).map_err(|msg| vm.new_type_error(msg))?; + // Preserve self (mro[0]) when updating MRO + mro.insert(0, cls.mro.read()[0].to_owned()); + let old_mro = core::mem::replace(&mut *cls.mro.write(), mro); + undo.push((cls.to_owned(), old_mro)); + for subclass in cls.subclasses.read().iter() { + // Dead entries are pruned elsewhere; skip them here. + let Some(subclass) = subclass.upgrade() else { + continue; + }; + let subclass: &Py<PyType> = subclass.downcast_ref().unwrap(); + update_mro_recursively(subclass, undo, vm)?; + } + Ok(()) + } + let mut undo = Vec::new(); + if let Err(err) = update_mro_recursively(zelf, &mut undo, vm) { + // Roll back to the previous state. A class reachable through + // multiple bases is recorded once per visit, so restore in + // reverse to end with the first-recorded (original) mro. + for (cls, old_mro) in undo.into_iter().rev() { + let failed_mro = core::mem::replace(&mut *cls.mro.write(), old_mro); + retired.extend(failed_mro.into_iter().map(Into::into)); + retired.push(cls.into()); + } + let failed_bases = core::mem::replace(&mut *zelf.bases.write(), old_bases); + if let Some(failed_base) = unsafe { zelf.base.swap(old_base) } { + keep_alive(failed_base, &mut retired); + } + register_subclasses(&zelf.bases.read()); + retired.extend(failed_bases.into_iter().map(Into::into)); + zelf.modified_inner(); + return Err(err); + } + // Retire the replaced mros as well; dropping them here would + // release them while the lock is held. + for (cls, old_mro) in undo { + retired.extend(old_mro.into_iter().map(Into::into)); + retired.push(cls.into()); + } + retired.extend(old_bases.into_iter().map(Into::into)); + if let Some(old_base) = old_base { + keep_alive(old_base, &mut retired); + } + + // Invalidate inline caches and rebuild every slot for this type and + // all descendants so slots whose methods left the MRO are reset. + zelf.update_all_slots(&vm.ctx); + + register_subclasses(&zelf.bases.read()); Ok(()) - } - update_mro_recursively(zelf, vm)?; - - // Invalidate inline caches - zelf.modified(); - - // TODO: do any old slots need to be cleaned up first? - zelf.init_slots(&vm.ctx); - - // Register this type as a subclass of its new bases - let weakref_type = super::PyWeak::static_type(); - for base in zelf.bases.read().iter() { - base.subclasses.write().push( - zelf.as_object() - .downgrade_with_weakref_typ_opt(None, weakref_type.to_owned()) - .unwrap(), - ); - } - - Ok(()) + }); + drop(retired); + result } #[pygetset] fn __base__(&self) -> Option<PyTypeRef> { - self.base.clone() + self.base.to_owned() } #[pygetset] @@ -1533,20 +1708,31 @@ impl PyType { ))); } - let mut attrs = self.attributes.write(); - // First try __annotate__, in case that's been set explicitly - if let Some(annotate) = attrs.get(identifier!(vm, __annotate__)).cloned() { + let annotate_key = identifier!(vm, __annotate__); + let annotate_func_key = identifier!(vm, __annotate_func__); + let attrs = self.attributes.read(); + if let Some(annotate) = attrs.get(annotate_key).cloned() { return Ok(annotate); } - // Then try __annotate_func__ - if let Some(annotate) = attrs.get(identifier!(vm, __annotate_func__)).cloned() { - // TODO: Apply descriptor tp_descr_get if needed + if let Some(annotate) = attrs.get(annotate_func_key).cloned() { return Ok(annotate); } - // Set __annotate_func__ = None and return None + drop(attrs); + let none = vm.ctx.none(); - attrs.insert(identifier!(vm, __annotate_func__), none.clone()); - Ok(none) + let (result, _prev) = Self::with_type_lock(vm, || { + let mut attrs = self.attributes.write(); + if let Some(annotate) = attrs.get(annotate_key).cloned() { + return (annotate, None); + } + if let Some(annotate) = attrs.get(annotate_func_key).cloned() { + return (annotate, None); + } + self.modified_inner(); + let prev = attrs.insert(annotate_func_key, none.clone()); + (none, prev) + }); + Ok(result) } #[pygetset(setter)] @@ -1569,20 +1755,28 @@ impl PyType { return Err(vm.new_type_error("__annotate__ must be callable or None")); } - let mut attrs = self.attributes.write(); - // Clear cached annotations only when setting to a new callable - if !vm.is_none(&value) { - attrs.swap_remove(identifier!(vm, __annotations_cache__)); - } - attrs.insert(identifier!(vm, __annotate_func__), value); + let _prev_values = Self::with_type_lock(vm, || { + self.modified_inner(); + let mut attrs = self.attributes.write(); + // Clear cached annotations only when setting to a new callable + let removed = if !vm.is_none(&value) { + attrs.swap_remove(identifier!(vm, __annotations_cache__)) + } else { + None + }; + let prev = attrs.insert(identifier!(vm, __annotate_func__), value); + (removed, prev) + }); Ok(()) } #[pygetset] fn __annotations__(&self, vm: &VirtualMachine) -> PyResult<PyObjectRef> { + let annotations_key = identifier!(vm, __annotations__); + let annotations_cache_key = identifier!(vm, __annotations_cache__); let attrs = self.attributes.read(); - if let Some(annotations) = attrs.get(identifier!(vm, __annotations__)).cloned() { + if let Some(annotations) = attrs.get(annotations_key).cloned() { // Ignore the __annotations__ descriptor stored on type itself. if !annotations.class().is(vm.ctx.types.getset_type) { if vm.is_none(&annotations) @@ -1597,8 +1791,7 @@ impl PyType { ))); } } - // Then try __annotations_cache__ - if let Some(annotations) = attrs.get(identifier!(vm, __annotations_cache__)).cloned() { + if let Some(annotations) = attrs.get(annotations_cache_key).cloned() { if vm.is_none(&annotations) || annotations.class().is(vm.ctx.types.dict_type) || self.slots.flags.has_feature(PyTypeFlags::HEAPTYPE) @@ -1635,11 +1828,21 @@ impl PyType { vm.ctx.new_dict().into() }; - // Cache the result in __annotations_cache__ - self.attributes - .write() - .insert(identifier!(vm, __annotations_cache__), annotations.clone()); - Ok(annotations) + let (result, _prev) = Self::with_type_lock(vm, || { + let mut attrs = self.attributes.write(); + if let Some(existing) = attrs.get(annotations_key).cloned() + && !existing.class().is(vm.ctx.types.getset_type) + { + return (existing, None); + } + if let Some(existing) = attrs.get(annotations_cache_key).cloned() { + return (existing, None); + } + self.modified_inner(); + let prev = attrs.insert(annotations_cache_key, annotations.clone()); + (annotations, prev) + }); + Ok(result) } #[pygetset(setter)] @@ -1655,43 +1858,43 @@ impl PyType { ))); } - let mut attrs = self.attributes.write(); - let has_annotations = attrs.contains_key(identifier!(vm, __annotations__)); + let _prev_values = Self::with_type_lock(vm, || { + self.modified_inner(); + let mut attrs = self.attributes.write(); + let has_annotations = attrs.contains_key(identifier!(vm, __annotations__)); - match value { - crate::function::PySetterValue::Assign(value) => { - // SET path: store the value (including None) - let key = if has_annotations { - identifier!(vm, __annotations__) - } else { - identifier!(vm, __annotations_cache__) - }; - attrs.insert(key, value); - if has_annotations { - attrs.swap_remove(identifier!(vm, __annotations_cache__)); + let mut prev = Vec::new(); + match value { + crate::function::PySetterValue::Assign(value) => { + let key = if has_annotations { + identifier!(vm, __annotations__) + } else { + identifier!(vm, __annotations_cache__) + }; + prev.extend(attrs.insert(key, value)); + if has_annotations { + prev.extend(attrs.swap_remove(identifier!(vm, __annotations_cache__))); + } + } + crate::function::PySetterValue::Delete => { + let removed = if has_annotations { + attrs.swap_remove(identifier!(vm, __annotations__)) + } else { + attrs.swap_remove(identifier!(vm, __annotations_cache__)) + }; + if removed.is_none() { + return Err(vm.new_attribute_error("__annotations__")); + } + prev.extend(removed); + if has_annotations { + prev.extend(attrs.swap_remove(identifier!(vm, __annotations_cache__))); + } } } - crate::function::PySetterValue::Delete => { - // DELETE path: remove the key - let removed = if has_annotations { - attrs - .swap_remove(identifier!(vm, __annotations__)) - .is_some() - } else { - attrs - .swap_remove(identifier!(vm, __annotations_cache__)) - .is_some() - }; - if !removed { - return Err(vm.new_attribute_error("__annotations__")); - } - if has_annotations { - attrs.swap_remove(identifier!(vm, __annotations_cache__)); - } - } - } - attrs.swap_remove(identifier!(vm, __annotate_func__)); - attrs.swap_remove(identifier!(vm, __annotate__)); + prev.extend(attrs.swap_remove(identifier!(vm, __annotate_func__))); + prev.extend(attrs.swap_remove(identifier!(vm, __annotate__))); + Ok(prev) + })?; Ok(()) } @@ -1724,9 +1927,13 @@ impl PyType { #[pygetset(setter)] fn set___module__(&self, value: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> { self.check_set_special_type_attr(identifier!(vm, __module__), vm)?; - let mut attributes = self.attributes.write(); - attributes.swap_remove(identifier!(vm, __firstlineno__)); - attributes.insert(identifier!(vm, __module__), value); + let _prev_values = Self::with_type_lock(vm, || { + self.modified_inner(); + let mut attributes = self.attributes.write(); + let removed = attributes.swap_remove(identifier!(vm, __firstlineno__)); + let prev = attributes.insert(identifier!(vm, __module__), value); + (removed, prev) + }); Ok(()) } @@ -1848,24 +2055,26 @@ impl PyType { value: PySetterValue<PyTupleRef>, vm: &VirtualMachine, ) -> PyResult<()> { + let key = identifier!(vm, __type_params__); match value { - PySetterValue::Assign(ref val) => { - let key = identifier!(vm, __type_params__); + PySetterValue::Assign(val) => { self.check_set_special_type_attr(key, vm)?; - self.modified(); - self.attributes.write().insert(key, val.clone().into()); + let _prev_value = Self::with_type_lock(vm, || { + self.modified_inner(); + self.attributes.write().insert(key, val.into()) + }); } PySetterValue::Delete => { - // For delete, we still need to check if the type is immutable if self.slots.flags.has_feature(PyTypeFlags::IMMUTABLETYPE) { return Err(vm.new_type_error(format!( "cannot delete '__type_params__' attribute of immutable type '{}'", self.slot_name() ))); } - let key = identifier!(vm, __type_params__); - self.modified(); - self.attributes.write().shift_remove(&key); + let _prev_value = Self::with_type_lock(vm, || { + self.modified_inner(); + self.attributes.write().shift_remove(&key) + }); } } Ok(()) @@ -2487,10 +2696,12 @@ impl Py<PyType> { // Check if we can set this special type attribute self.check_set_special_type_attr(identifier!(vm, __doc__), vm)?; - // Set the __doc__ in the type's dict - self.attributes - .write() - .insert(identifier!(vm, __doc__), value); + let _prev_value = PyType::with_type_lock(vm, || { + self.modified_inner(); + self.attributes + .write() + .insert(identifier!(vm, __doc__), value) + }); Ok(()) } @@ -2552,31 +2763,40 @@ impl SetAttr for PyType { } let assign = value.is_assign(); - // Invalidate inline caches before modifying attributes. - // This ensures other threads see the version invalidation before - // any attribute changes, preventing use-after-free of cached descriptors. - zelf.modified(); + // Drop old value OUTSIDE the type lock to avoid deadlock: + // dropping may trigger weakref callbacks → method calls → + // LOAD_ATTR specialization → version_for_specialization → type lock. + let _prev_value = Self::with_type_lock(vm, || { + // Invalidate inline caches before modifying attributes. + // This ensures other threads see the version invalidation before + // any attribute changes, preventing use-after-free of cached descriptors. + zelf.modified_inner(); - if let PySetterValue::Assign(value) = value { - zelf.attributes.write().insert(attr_name, value); - } else { - let prev_value = zelf.attributes.write().shift_remove(attr_name); // TODO: swap_remove applicable? - if prev_value.is_none() { - return Err(vm.new_attribute_error(format!( - "type object '{}' has no attribute '{}'", - zelf.name(), - attr_name, - ))); - } - } - - if attr_name.as_wtf8().starts_with("__") && attr_name.as_wtf8().ends_with("__") { - if assign { - zelf.update_slot::<true>(attr_name, &vm.ctx); + let prev_value = if let PySetterValue::Assign(value) = value { + zelf.attributes.write().insert(attr_name, value) } else { - zelf.update_slot::<false>(attr_name, &vm.ctx); + let prev_value = zelf.attributes.write().shift_remove(attr_name); // TODO: swap_remove applicable? + if prev_value.is_none() { + return Err(vm.new_attribute_error(format!( + "type object '{}' has no attribute '{}'", + zelf.name(), + attr_name, + ))); + } + prev_value + }; + + // Keep the slot-table rewrite inside the same transaction as the + // dict mutation and version invalidation. + if attr_name.as_wtf8().starts_with("__") && attr_name.as_wtf8().ends_with("__") { + if assign { + zelf.update_slot::<true>(attr_name, &vm.ctx); + } else { + zelf.update_slot::<false>(attr_name, &vm.ctx); + } } - } + Ok(prev_value) + })?; Ok(()) } } @@ -2596,18 +2816,43 @@ impl Callable for PyType { } } - let obj = if let Some(slot_new) = zelf.slots.new.load() { - slot_new(zelf.to_owned(), args.clone(), vm)? - } else { + let Some(slot_new) = zelf.slots.new.load() else { return Err(vm.new_type_error(format!("cannot create '{}' instances", zelf.slots.name))); }; + // Both the new and init slots consume args, so the init call gets a + // separate copy prepared before slot_new runs. + let init_args = if args.is_empty() { + // Even cloning empty args costs a kwargs map clone; a default + // FuncArgs is indistinguishable from such a clone. + FuncArgs::default() + } else { + // Skip the clone when no init call can follow: the class has no + // init slot, is not `type` itself, and its new slot is a native + // function. new_wrapper is excluded because a Python `__new__` + // can install an `__init__` on the class or return an instance + // of another class while it runs. + // The address comparison is against the single new_wrapper fn item, + // so a mismatch is conservative: if it ever compared unequal for the + // wrapper it would only take the slower cloning path, never the fast + // path incorrectly. + if zelf.slots.init.load().is_none() + && !zelf.is(vm.ctx.types.type_type) + && slot_new as usize != crate::types::new_wrapper as crate::types::NewFunc as usize + { + return slot_new(zelf.to_owned(), args, vm); + } + args.clone() + }; + + let obj = slot_new(zelf.to_owned(), args, vm)?; + if !obj.class().fast_issubclass(zelf) { return Ok(obj); } if let Some(init_method) = obj.class().slots.init.load() { - init_method(obj.clone(), args, vm)?; + init_method(obj.clone(), init_args, vm)?; } Ok(obj) } @@ -2820,8 +3065,8 @@ pub(crate) fn call_slot_new( // that's not a heap type is this type. let mut staticbase = subtype.clone(); while staticbase.slots.flags.has_feature(PyTypeFlags::HEAPTYPE) { - if let Some(base) = staticbase.base.as_ref() { - staticbase = base.clone(); + if let Some(base) = staticbase.base.to_owned() { + staticbase = base; } else { break; } @@ -2953,7 +3198,7 @@ fn shape_differs(t1: &Py<PyType>, t2: &Py<PyType>) -> bool { } fn solid_base<'a>(typ: &'a Py<PyType>, vm: &VirtualMachine) -> &'a Py<PyType> { - let base = if let Some(base) = &typ.base { + let base = if let Some(base) = typ.base.deref() { solid_base(base, vm) } else { vm.ctx.types.object_type @@ -2997,6 +3242,90 @@ fn best_base<'a>(bases: &'a [PyTypeRef], vm: &VirtualMachine) -> PyResult<&'a Py Ok(base.unwrap()) } +fn type_has_dict(typ: &Py<PyType>) -> bool { + typ.slots.flags.has_feature(PyTypeFlags::HAS_DICT) +} + +fn type_has_weakref(typ: &Py<PyType>) -> bool { + typ.slots.flags.has_feature(PyTypeFlags::HAS_WEAKREF) +} + +/// Returns true if `child` adds no instance layout of its own beyond its base, +/// so the base can stand in for it when comparing object layouts. +fn compatible_with_base(child: &Py<PyType>) -> bool { + let Some(parent) = child.base.deref() else { + return false; + }; + child.slots.basicsize == parent.slots.basicsize + && child.slots.itemsize == parent.slots.itemsize + && child.slots.member_count == parent.slots.member_count + && type_has_dict(child) == type_has_dict(parent) + && type_has_weakref(child) == type_has_weakref(parent) +} + +/// Walk up to the most derived base that actually fixes the instance layout. +fn layout_solid_base(mut typ: &Py<PyType>) -> &Py<PyType> { + while compatible_with_base(typ) { + typ = typ.base.deref().unwrap(); + } + typ +} + +/// Returns true if `a` and `b`, which share the same base, added the same +/// instance layout (`__dict__`, `__weakref__`, and `__slots__`). +fn same_slots_added(a: &Py<PyType>, b: &Py<PyType>) -> bool { + if a.slots.basicsize != b.slots.basicsize + || a.slots.itemsize != b.slots.itemsize + || a.slots.member_count != b.slots.member_count + || type_has_dict(a) != type_has_dict(b) + || type_has_weakref(a) != type_has_weakref(b) + { + return false; + } + match ( + a.heaptype_ext.as_ref().and_then(|e| e.slots.as_ref()), + b.heaptype_ext.as_ref().and_then(|e| e.slots.as_ref()), + ) { + (Some(x), Some(y)) => { + x.len() == y.len() + && x.iter() + .zip(y.iter()) + .all(|(p, q)| p.as_wtf8() == q.as_wtf8()) + } + (None, None) => true, + _ => false, + } +} + +/// Validates that instances of `old_to` and `new_to` share an interchangeable +/// object layout, the check `__class__` and `__bases__` assignment perform. +/// +/// `attr` names the attribute being assigned for the error message; the +/// message reports `new_to` first and `old_to` second. +pub(crate) fn compatible_for_assignment( + old_to: &Py<PyType>, + new_to: &Py<PyType>, + attr: &str, + vm: &VirtualMachine, +) -> PyResult<()> { + let newbase = layout_solid_base(new_to); + let oldbase = layout_solid_base(old_to); + let bases_equal = match (newbase.base.deref(), oldbase.base.deref()) { + (Some(x), Some(y)) => x.is(y), + (None, None) => true, + _ => false, + }; + let compatible = newbase.is(oldbase) || (bases_equal && same_slots_added(newbase, oldbase)); + if compatible { + return Ok(()); + } + Err(vm.new_type_error(format!( + "{attr} assignment: '{}' object layout differs from '{}'", + new_to.name(), + old_to.name() + ))) +} + /// Apply Python name mangling for private attributes. /// `__x` becomes `_ClassName__x` if inside a class. fn mangle_name(class_name: &str, name: &str) -> String { diff --git a/crates/vm/src/coroutine.rs b/crates/vm/src/coroutine.rs index 34d280acd..844887f85 100644 --- a/crates/vm/src/coroutine.rs +++ b/crates/vm/src/coroutine.rs @@ -73,6 +73,20 @@ impl Coro { } } + /// Free the finished frame's locals and stack, unless a frame object has + /// escaped (e.g. through an `f_locals` proxy or `sys._getframe`). An + /// escaped frame husk owns its heap-resident locals and must keep them + /// readable after the generator closes. + fn clear_frame_locals_on_close(&self) { + // Keep locals alive if a durable frame reference escaped (e.g. through + // an `f_locals` proxy or `sys._getframe`): that reference now owns the + // heap-resident locals and must keep them readable after close, + // matching `take_ownership`. + if !self.frame.has_escaped() { + self.frame.clear_locals_and_stack(); + } + } + fn maybe_close(&self, res: &PyResult<ExecutionResult>, entered_frame: bool) { if !entered_frame { return; @@ -87,7 +101,7 @@ impl Coro { ); // Completed generators/coroutines should not keep their locals // alive while the wrapper object itself remains referenced. - self.frame.clear_locals_and_stack(); + self.clear_frame_locals_on_close(); } Ok(ExecutionResult::Yield(_)) => {} } @@ -169,10 +183,7 @@ impl Coro { } else { None }; - let (result, entered_frame) = self.run_with_context(jen, vm, |f| { - self.frame.locals_to_fast(vm)?; - f.resume(value, vm) - }); + let (result, entered_frame) = self.run_with_context(jen, vm, |f| f.resume(value, vm)); self.finalize_send_result(result, entered_frame, jen, vm) } @@ -198,10 +209,7 @@ impl Coro { } else { None }; - let (result, entered_frame) = self.run_with_context(jen, vm, |f| { - self.frame.locals_to_fast(vm)?; - f.resume(value, vm) - }); + let (result, entered_frame) = self.run_with_context(jen, vm, |f| f.resume(value, vm)); self.finalize_send_result(result, entered_frame, jen, vm) } @@ -259,7 +267,7 @@ impl Coro { self.closed.store(true); // Release frame locals and stack to free references held by the // closed generator, matching gen_send_ex2 with close_on_completion. - self.frame.clear_locals_and_stack(); + self.clear_frame_locals_on_close(); match result { Ok(ExecutionResult::Yield(_)) => { Err(vm.new_runtime_error(format!("{} ignored GeneratorExit", gen_name(jen, vm)))) diff --git a/crates/vm/src/exception_group.rs b/crates/vm/src/exception_group.rs index 198273a69..a2c76378a 100644 --- a/crates/vm/src/exception_group.rs +++ b/crates/vm/src/exception_group.rs @@ -334,7 +334,7 @@ pub(super) mod types { let exceptions_tuple = vm.ctx.new_tuple(exceptions); let init_args = vec![message, exceptions_tuple.into()]; PyBaseException::new(init_args, vm) - .into_ref_with_type(vm, actual_cls) + .into_ref_with_type_lazy_dict(vm, actual_cls) .map(Into::into) } diff --git a/crates/vm/src/exceptions.rs b/crates/vm/src/exceptions.rs index 1ad86a35a..845b01c38 100644 --- a/crates/vm/src/exceptions.rs +++ b/crates/vm/src/exceptions.rs @@ -690,10 +690,8 @@ impl PyRef<PyBaseException> { #[pymethod] fn add_note(self, note: PyStrRef, vm: &VirtualMachine) -> PyResult<()> { - let dict = self - .as_object() - .dict() - .ok_or_else(|| vm.new_attribute_error("Exception object has no __dict__"))?; + let dict = crate::builtins::object::object_get_dict(self.as_object().to_owned(), vm) + .map_err(|_| vm.new_attribute_error("Exception object has no __dict__"))?; let notes = if let Ok(notes) = dict.get_item("__notes__", vm) { notes @@ -747,7 +745,7 @@ impl Constructor for PyBaseException { return Err(vm.new_type_error("BaseException() takes no keyword arguments")); } Self::new(args.args, vm) - .into_ref_with_type(vm, cls) + .into_ref_with_type_lazy_dict(vm, cls) .map(Into::into) } @@ -1364,7 +1362,7 @@ impl OSErrorBuilder { let payload = PyOSError::py_new(&exc_type, args.clone().into(), vm) .expect("new_os_error usage error"); let os_error = payload - .into_ref_with_type(vm, exc_type) + .into_ref_with_type_lazy_dict(vm, exc_type) .expect("new_os_error usage error"); PyOSError::slot_init(os_error.as_object().to_owned(), args.into(), vm) .expect("new_os_error usage error"); @@ -1585,7 +1583,7 @@ impl ToPyException for rustpython_host_env::multiprocessing::SemError { pub(super) mod types { use crate::common::lock::PyRwLock; - use crate::object::{MaybeTraverse, Traverse, TraverseFn}; + use crate::object::{Traverse, TraverseFn}; #[cfg_attr(target_arch = "wasm32", allow(unused_imports))] use crate::{ AsObject, Py, PyAtomicRef, PyObject, PyObjectRef, PyPayload, PyRef, PyResult, @@ -1805,7 +1803,7 @@ pub(super) mod types { ))); } - let dict = zelf.dict().unwrap(); + let dict = crate::builtins::object::object_get_dict(zelf.clone(), vm)?; dict.set_item("name", vm.unwrap_or_none(name), vm)?; dict.set_item("path", vm.unwrap_or_none(path), vm)?; dict.set_item("name_from", vm.unwrap_or_none(name_from), vm)?; @@ -1902,7 +1900,7 @@ pub(super) mod types { #[repr(transparent)] pub struct PyUnboundLocalError(PyNameError); - #[pyexception(name, base = PyException, ctx = "os_error")] + #[pyexception(name, base = PyException, ctx = "os_error", traverse = "manual")] #[repr(C)] pub struct PyOSError { base: PyException, @@ -1932,7 +1930,10 @@ pub(super) mod types { unsafe impl Traverse for PyOSError { fn traverse(&self, tracer_fn: &mut TraverseFn<'_>) { - self.base.try_traverse(tracer_fn); + // `self.base` is a `PyException` newtype whose `MaybeTraverse` is a + // no-op; reach the underlying `PyBaseException` so its traceback, + // cause, context and args are visited by the collector. + self.base.0.traverse(tracer_fn); if let Some(obj) = self.errno.deref() { tracer_fn(obj); } @@ -2013,7 +2014,9 @@ pub(super) mod types { } } let payload = Self::py_new(&cls, args, vm)?; - payload.into_ref_with_type(vm, cls).map(Into::into) + payload + .into_ref_with_type_lazy_dict(vm, cls) + .map(Into::into) } } diff --git a/crates/vm/src/frame.rs b/crates/vm/src/frame.rs index 85b15aaac..40499efb1 100644 --- a/crates/vm/src/frame.rs +++ b/crates/vm/src/frame.rs @@ -12,10 +12,7 @@ use crate::{ builtin_func::PyNativeFunction, descriptor::{MemberGetter, PyMemberDescriptor, PyMethodDescriptor}, frame::stack_analysis, - function::{ - PyBoundMethod, PyCell, PyCellRef, PyFunction, datastack_frame_size_bytes_for_code, - vectorcall_function, - }, + function::{PyBoundMethod, PyCell, PyCellRef, PyFunction, vectorcall_function}, list::PyListIterator, range::PyRangeIterator, tuple::{PyTuple, PyTupleIterator, PyTupleRef}, @@ -39,6 +36,7 @@ use crate::{ use alloc::fmt; use bstr::ByteSlice; use core::cell::UnsafeCell; +use core::ptr::NonNull; use core::sync::atomic; use core::sync::atomic::AtomicPtr; use core::sync::atomic::Ordering::{Acquire, Relaxed}; @@ -54,6 +52,71 @@ use rustpython_compiler_core::SourceLocation; pub type FrameRef = PyRef<Frame>; +/// Recover an owned reference to a live chain frame, or `None` for null. +/// +/// # Safety +/// A non-null `frame` must reference a frame that is live on the current +/// thread's execution chain, so the object outlives this call. +unsafe fn owned_chain_frame(frame: *const Frame) -> Option<FrameRef> { + if frame.is_null() { + return None; + } + // SAFETY: caller guarantees the frame is live; from_payload_ptr recovers + // the enclosing object from the payload address. + let py = unsafe { &*Py::<Frame>::from_payload_ptr(frame) }; + Some(py.to_owned()) +} + +/// The current thread's topmost frame object, if any. +#[must_use] +pub fn current_thread_frame() -> Option<FrameRef> { + // SAFETY: the chain top executes on this thread, hence is alive. + unsafe { owned_chain_frame(crate::vm::thread::get_current_frame()) } +} + +/// The frame `offset` positions below the current thread's top frame (offset 0 +/// is the top), or `None` if the stack is not that deep. +#[must_use] +pub fn frame_at_offset(offset: usize) -> Option<FrameRef> { + let mut cur = crate::vm::thread::get_current_frame(); + for _ in 0..offset { + if cur.is_null() { + return None; + } + // SAFETY: chain frames are alive on the current thread's stack. + cur = unsafe { (*cur).previous_frame() }; + } + // SAFETY: same as above. + unsafe { owned_chain_frame(cur) } +} + +/// If `target` is a frame on the current thread's chain, return an owned +/// reference to it; otherwise `None`. Presence on the chain proves liveness. +#[must_use] +pub fn find_owned_chain_frame(target: *const Frame) -> Option<FrameRef> { + let mut cur = crate::vm::thread::get_current_frame(); + while !cur.is_null() { + if core::ptr::eq(cur, target) { + // SAFETY: a frame on the current thread's chain is alive. + return unsafe { owned_chain_frame(cur) }; + } + // SAFETY: chain frames are alive on the current thread's stack. + cur = unsafe { (*cur).previous_frame() }; + } + None +} + +/// Invoke `f` for each frame on the current thread's chain, from the topmost +/// frame down to the bottom. +pub fn for_each_current_frame(mut f: impl FnMut(&Py<Frame>)) { + let mut cur = crate::vm::thread::get_current_frame(); + while !cur.is_null() { + // SAFETY: chain frames are alive on the current thread's stack. + f(unsafe { &*Py::<Frame>::from_payload_ptr(cur) }); + cur = unsafe { (*cur).previous_frame() }; + } +} + /// The reason why we might be unwinding a block. /// This could be return of function, exception being /// raised, a break or continue being hit, etc.. @@ -111,6 +174,12 @@ impl<T> FrameUnsafeCell<T> { unsafe fn get(&self) -> *mut T { self.0.get() } + + /// Safe exclusive access through `&mut self`. + #[inline(always)] + fn get_mut(&mut self) -> &mut T { + self.0.get_mut() + } } // SAFETY: Frame execution is single-threaded. See FrameUnsafeCell doc. @@ -175,8 +244,9 @@ impl LocalsPlus { /// Create a new LocalsPlus backed by the thread data stack. /// All slots are zero-initialized. /// - /// The caller must call `materialize_localsplus()` when the frame finishes - /// to migrate data to the heap, then `datastack_pop()` to free the memory. + /// When the frame finishes, the caller must migrate data to the heap with + /// `materialize_localsplus()` (or drop it in place with + /// `release_localsplus()`), then `datastack_pop()` to free the memory. fn new_on_datastack(nlocalsplus: usize, stacksize: usize, vm: &VirtualMachine) -> Self { let capacity = nlocalsplus .checked_add(stacksize) @@ -211,6 +281,29 @@ impl LocalsPlus { } } + /// Drop all contained values and detach the data stack backing without + /// copying to the heap, leaving an empty heap-backed husk. + /// Returns the data stack base pointer for `DataStack::pop()`. + /// Returns `None` if already heap-backed. + /// + /// Only valid when the values can never be observed again (the enclosing + /// frame is uniquely referenced): the locals are gone afterwards. + fn release_datastack(&mut self) -> Option<*mut u8> { + let LocalsPlusData::DataStack { ptr, .. } = &self.data else { + return None; + }; + let base = *ptr as *mut u8; + // Drop values while the backing store is still valid. Value drops may + // run `__del__`, which can push nested data stack frames above `base`; + // those are popped before the caller pops `base` (LIFO preserved). + self.drop_values(); + self.data = LocalsPlusData::Heap(Box::default()); + // Keep the accessors consistent with the empty backing store. + // stack_top is already 0 after drop_values(). + self.nlocalsplus = 0; + Some(base) + } + /// Drop all contained values without freeing the backing storage. fn drop_values(&mut self) { self.stack_clear(); @@ -251,6 +344,12 @@ impl LocalsPlus { } } + /// Whether the backing storage still lives on the thread data stack (a + /// running call frame that has not been materialized onto the heap). + fn is_datastack_backed(&self) -> bool { + matches!(self.data, LocalsPlusData::DataStack { .. }) + } + /// Stack capacity (max stack depth). #[inline(always)] fn stack_capacity(&self) -> usize { @@ -605,11 +704,20 @@ pub struct InterpreterFrame { /// Used by `frame.clear()` to reject clearing an executing frame, /// even when called from a different thread. pub(crate) owner: atomic::AtomicI8, - /// Set when f_locals is accessed. Cleared after locals_to_fast() sync. - pub(crate) locals_dirty: atomic::AtomicBool, /// Persistent overlay for `frame.f_locals` when hidden locals need a /// snapshot separate from the backing locals mapping. pub(crate) f_locals_hidden_overlay: PyMutex<Option<PyDictRef>>, + /// Side storage for `f_locals` proxy keys that do not name a fast local. + /// Lazily created on first non-fast-key write. Mirrors `f_extra_locals`. + pub(crate) f_extra_locals: PyMutex<Option<PyDictRef>>, + /// Set once a durable Python-level reference to this frame is handed out + /// (`f_locals` proxy, `sys._getframe`, `f_back`). A closed generator keeps + /// its locals alive while this is set, mirroring `frame_obj` ownership. + pub(crate) escaped: atomic::AtomicBool, + /// Strong reference to the caller frame, captured when this frame escapes + /// its execution so `f_back` still resolves after the caller returns and + /// leaves the live frame chain. + pub(crate) retained_back: PyMutex<Option<FrameRef>>, /// Number of stack entries to pop after set_f_lineno returns to the /// execution loop. set_f_lineno cannot pop directly because the /// execution loop holds the state mutex. @@ -624,7 +732,55 @@ pub struct InterpreterFrame { /// Analogous to CPython's `PyFrameObject`. #[pyclass(module = false, name = "frame", traverse = "manual")] pub struct Frame { - pub(crate) iframe: FrameUnsafeCell<InterpreterFrame>, + /// Always `Some` while the frame is reachable from Python. Emptied only + /// by `Traverse::clear` during deallocation, leaving a trivially-droppable + /// husk that the freelist can cache. + pub(crate) iframe: FrameUnsafeCell<Option<InterpreterFrame>>, +} + +impl Frame { + /// Shared access to the embedded interpreter frame. + /// + /// # Safety + /// Caller must ensure no concurrent mutable access (see `FrameUnsafeCell`) + /// and that the frame has not been cleared (i.e. it is still reachable + /// from Python; `Traverse::clear` only runs during deallocation). + #[inline(always)] + unsafe fn iframe_ref(&self) -> &InterpreterFrame { + let opt = unsafe { &*self.iframe.get() }; + #[cfg(debug_assertions)] + if opt.is_none() { + cleared_frame_access(); + } + // SAFETY: iframe is always Some while the frame is reachable (see above). + unsafe { opt.as_ref().unwrap_unchecked() } + } + + /// Exclusive access to the embedded interpreter frame. + /// + /// # Safety + /// Caller must ensure exclusive access (see `FrameUnsafeCell`) and that + /// the frame has not been cleared. + #[inline(always)] + #[allow(clippy::mut_from_ref)] + unsafe fn iframe_mut(&self) -> &mut InterpreterFrame { + let opt = unsafe { &mut *self.iframe.get() }; + #[cfg(debug_assertions)] + if opt.is_none() { + cleared_frame_access(); + } + // SAFETY: iframe is always Some while the frame is reachable (see above). + unsafe { opt.as_mut().unwrap_unchecked() } + } +} + +/// Out-of-line panic for the debug-only cleared-frame check, keeping the +/// inlined accessors' stack frames minimal. +#[cfg(debug_assertions)] +#[cold] +#[inline(never)] +fn cleared_frame_access() -> ! { + panic!("frame accessed after clear"); } impl core::ops::Deref for Frame { @@ -638,21 +794,88 @@ impl core::ops::Deref for Frame { /// are only mutated during single-threaded execution via `with_exec`. #[inline(always)] fn deref(&self) -> &InterpreterFrame { - unsafe { &*self.iframe.get() } + unsafe { self.iframe_ref() } } } +thread_local! { + /// Free list of dead frame objects for reuse. Entries are cleared husks + /// (`iframe == None`) whose child references were already released. + /// PyInner<Frame> is fixed-size (localsplus storage is out-of-line), + /// so a single bucket suffices. + static FRAME_FREELIST: core::cell::Cell<crate::object::FreeList<Frame>> = + const { core::cell::Cell::new(crate::object::FreeList::new()) }; +} + impl PyPayload for Frame { + const MAX_FREELIST: usize = 200; + const HAS_FREELIST: bool = true; + // Ordinary call frames are created untracked and only enter the GC when + // they escape (see `release_datastack_frame`); generator/coroutine frames + // are tracked explicitly at creation in `invoke_with_locals`. + const NEW_REF_UNTRACKED: bool = true; + #[inline] fn class(ctx: &Context) -> &'static Py<PyType> { ctx.types.frame_type } + + #[inline] + unsafe fn freelist_push(obj: *mut PyObject) -> bool { + FRAME_FREELIST + .try_with(|fl| { + let mut list = fl.take(); + let stored = if list.len() < Self::MAX_FREELIST { + list.push(obj); + true + } else { + false + }; + fl.set(list); + stored + }) + .unwrap_or(false) + } + + #[inline] + unsafe fn freelist_pop(_payload: &Self) -> Option<NonNull<PyObject>> { + FRAME_FREELIST + .try_with(|fl| { + let mut list = fl.take(); + let result = list.pop().map(|p| unsafe { NonNull::new_unchecked(p) }); + fl.set(list); + result + }) + .ok() + .flatten() + } } unsafe impl Traverse for Frame { fn traverse(&self, tracer_fn: &mut TraverseFn<'_>) { - // SAFETY: GC traversal does not run concurrently with frame execution. - let iframe = unsafe { &*self.iframe.get() }; + // SAFETY: this traversal reads the frame's live interpreter state + // (`localsplus`), which the owning thread mutates without + // synchronization while executing bytecode. It is only sound when no + // other thread is executing this frame: in threading builds the + // collector stops the world around the traversal phases, and in + // single-threaded builds there is no other thread. A cleared frame + // (iframe == None) has no children to visit. + // + // Invariant (load-bearing for the untracked-frame optimization): every + // reference *to* a frame is recorded as a graph edge by + // `PyRef<Frame>::traverse` — no other type's `traverse` recurses into a + // frame's payload. So the collector reads a frame's `localsplus` only + // when the frame is itself a tracked candidate. Tracked datastack + // frames are tracked only at `release_datastack_frame`, after they stop + // executing and their localsplus is materialized onto the heap; tracked + // generator frames are heap-backed by construction and their execution + // is stopped-the-world. Hence a running, data-stack-resident frame is + // never traversed by a concurrent collector. If a future change makes + // some type's `traverse` recurse into a frame payload, this invariant + // (and the debug asserts at the track sites) breaks. + let Some(iframe) = (unsafe { &*self.iframe.get() }) else { + return; + }; iframe.code.traverse(tracer_fn); iframe.func_obj.traverse(tracer_fn); iframe.localsplus.traverse(tracer_fn); @@ -662,6 +885,19 @@ unsafe impl Traverse for Frame { iframe.trace.traverse(tracer_fn); iframe.temporary_refs.traverse(tracer_fn); iframe.f_locals_hidden_overlay.traverse(tracer_fn); + iframe.f_extra_locals.traverse(tracer_fn); + iframe.retained_back.traverse(tracer_fn); + } + + fn clear(&mut self, _out: &mut Vec<PyObjectRef>) { + // Drop the interpreter frame in place instead of extracting children + // into `_out`: pushing ~10 refs per frame would grow the buffer, a + // heap allocation on the hot dealloc path. Direct drops release the + // same references under the same recursion protection (trashcan in + // dealloc, deferred-drop context in cycle collection) as the payload + // drop did before the freelist existed. The payload is left as a + // trivially-droppable husk for the freelist. + drop(self.iframe.get_mut().take()); } } @@ -741,13 +977,15 @@ impl Frame { generator: PyAtomicBorrow::new(), previous: AtomicPtr::new(core::ptr::null_mut()), owner: atomic::AtomicI8::new(FrameOwner::FrameObject as i8), - locals_dirty: atomic::AtomicBool::new(false), f_locals_hidden_overlay: PyMutex::new(None), + f_extra_locals: PyMutex::new(None), + escaped: atomic::AtomicBool::new(false), + retained_back: PyMutex::new(None), pending_stack_pops: Default::default(), pending_unwind_from_stack: Default::default(), }; Self { - iframe: FrameUnsafeCell::new(iframe), + iframe: FrameUnsafeCell::new(Some(iframe)), } } @@ -758,7 +996,7 @@ impl Frame { /// or called from the same thread during trace callback). #[inline(always)] pub unsafe fn fastlocals(&self) -> &[Option<PyObjectRef>] { - unsafe { (*self.iframe.get()).localsplus.fastlocals() } + unsafe { self.iframe_ref().localsplus.fastlocals() } } /// Access fastlocals mutably. @@ -768,7 +1006,7 @@ impl Frame { #[inline(always)] #[allow(clippy::mut_from_ref)] pub unsafe fn fastlocals_mut(&self) -> &mut [Option<PyObjectRef>] { - unsafe { (*self.iframe.get()).localsplus.fastlocals_mut() } + unsafe { self.iframe_mut().localsplus.fastlocals_mut() } } /// Migrate data-stack-backed storage to the heap, preserving all values, @@ -779,7 +1017,29 @@ impl Frame { /// Caller must ensure the frame is not executing and the returned /// pointer is passed to `VirtualMachine::datastack_pop()`. pub(crate) unsafe fn materialize_localsplus(&self) -> Option<*mut u8> { - unsafe { (*self.iframe.get()).localsplus.materialize_to_heap() } + unsafe { self.iframe_mut().localsplus.materialize_to_heap() } + } + + /// Drop all localsplus values in place and detach the data stack backing + /// without the heap copy. Returns the data stack base pointer for + /// `VirtualMachine::datastack_pop()`, or `None` if heap-backed. + /// + /// # Safety + /// Caller must ensure the frame is not executing, that no other reference + /// to the frame exists or can be created (localsplus is unobservable + /// afterwards), and that the returned pointer is passed to + /// `VirtualMachine::datastack_pop()`. + pub(crate) unsafe fn release_localsplus(&self) -> Option<*mut u8> { + unsafe { self.iframe_mut().localsplus.release_datastack() } + } + + /// Whether this frame's localsplus is still data-stack-backed. A frame + /// must have heap-backed localsplus before it is GC-tracked so that a + /// concurrent collector never reads data-stack-resident, still-mutating + /// storage. Used only in debug assertions at the track sites. + pub(crate) fn localsplus_is_datastack_backed(&self) -> bool { + // SAFETY: called at a track site where the frame is not executing. + unsafe { self.iframe_ref().localsplus.is_datastack_backed() } } /// Clear evaluation stack and state-owned cell/free references. @@ -788,7 +1048,7 @@ impl Frame { // SAFETY: Called when frame is not executing (generator closed). // Cell refs in fastlocals[nlocals..] are cleared by clear_locals_and_stack(). unsafe { - (*self.iframe.get()).localsplus.stack_clear(); + self.iframe_mut().localsplus.stack_clear(); } } @@ -797,17 +1057,18 @@ impl Frame { pub(crate) fn clear_locals_and_stack(&self) { self.clear_stack_and_cells(); // SAFETY: Frame is not executing (generator closed). - let fastlocals = unsafe { (*self.iframe.get()).localsplus.fastlocals_mut() }; + let fastlocals = unsafe { self.iframe_mut().localsplus.fastlocals_mut() }; for slot in fastlocals.iter_mut() { *slot = None; } self.f_locals_hidden_overlay.lock().take(); + self.f_extra_locals.lock().take(); } /// Get cell contents by localsplus index. pub(crate) fn get_cell_contents(&self, localsplus_idx: usize) -> Option<PyObjectRef> { // SAFETY: Frame not executing; no concurrent mutation. - let fastlocals = unsafe { (*self.iframe.get()).localsplus.fastlocals() }; + let fastlocals = unsafe { self.iframe_ref().localsplus.fastlocals() }; fastlocals .get(localsplus_idx) .and_then(|slot| slot.as_ref()) @@ -825,8 +1086,17 @@ impl Frame { /// Clear the generator back-reference. Called when the generator is finalized. pub fn clear_generator(&self) { - self.generator.clear(); - self.owner + // The generator's drop may run after this frame was already cleared + // by cycle collection (both were garbage and the frame was cleared + // first); nothing to unlink then. + // SAFETY: shared access; the finalizing generator owns the frame, + // which is not executing. + let Some(iframe) = (unsafe { &*self.iframe.get() }) else { + return; + }; + iframe.generator.clear(); + iframe + .owner .store(FrameOwner::FrameObject as i8, atomic::Ordering::Release); } @@ -839,6 +1109,16 @@ impl Frame { self.previous.load(atomic::Ordering::Relaxed) } + /// Record that a durable Python-level reference to this frame escaped. + pub(crate) fn mark_escaped(&self) { + self.escaped.store(true, atomic::Ordering::Release); + } + + /// Whether a durable reference to this frame has escaped. + pub(crate) fn has_escaped(&self) -> bool { + self.escaped.load(atomic::Ordering::Acquire) + } + pub fn lasti(&self) -> u32 { self.lasti.load(Relaxed) } @@ -863,41 +1143,10 @@ impl Frame { self.pending_unwind_from_stack.store(val, Relaxed); } - /// Sync locals dict back to fastlocals. Called before generator/coroutine resume - /// to apply any modifications made via f_locals. - pub fn locals_to_fast(&self, vm: &VirtualMachine) -> PyResult<()> { - if !self.locals_dirty.load(atomic::Ordering::Acquire) { - return Ok(()); - } - let code = &**self.code; - let overlay_locals = self - .has_active_hidden_locals() - .then(|| self.f_locals_hidden_overlay.lock().clone()) - .flatten() - .map(ArgMapping::from_dict_exact); - let locals_map = overlay_locals - .as_ref() - .map_or_else(|| self.locals.mapping(vm), ArgMapping::mapping); - // SAFETY: Called before generator resume; no concurrent access. - let fastlocals = unsafe { (*self.iframe.get()).localsplus.fastlocals_mut() }; - for (i, &varname) in code.varnames.iter().enumerate() { - if i >= fastlocals.len() { - break; - } - match locals_map.subscript(varname, vm) { - Ok(value) => fastlocals[i] = Some(value), - Err(e) if e.fast_isinstance(vm.ctx.exceptions.key_error) => {} - Err(e) => return Err(e), - } - } - self.locals_dirty.store(false, atomic::Ordering::Release); - Ok(()) - } - fn has_active_hidden_locals(&self) -> bool { use rustpython_compiler_core::bytecode::{CO_FAST_CELL, CO_FAST_FREE, CO_FAST_HIDDEN}; let code = &**self.code; - let fastlocals = unsafe { (*self.iframe.get()).localsplus.fastlocals() }; + let fastlocals = unsafe { self.iframe_ref().localsplus.fastlocals() }; let is_optimized = code.flags.contains(bytecode::CodeFlags::OPTIMIZED); !is_optimized && code.localspluskinds.iter().enumerate().any(|(i, &kind)| { @@ -929,7 +1178,7 @@ impl Frame { // SAFETY: Either the frame is not executing (caller checked owner), // or we're in a trace callback on the same thread that's executing. let code = &**self.code; - let fastlocals = unsafe { (*self.iframe.get()).localsplus.fastlocals() }; + let fastlocals = unsafe { self.iframe_ref().localsplus.fastlocals() }; // Iterate through all localsplus slots using localspluskinds let nlocalsplus = code.localspluskinds.len(); @@ -1023,13 +1272,38 @@ impl Frame { Ok(()) } + /// Reject locals access for a frame that is executing on another thread. + /// + /// A thread-owned frame mutates `localsplus` without synchronization, so + /// reading fastlocals from a different thread would be a data race (the + /// executing thread overwrites slots and drops the old values while the + /// reader clones them). Access from the executing thread itself (locals() + /// builtin, trace callbacks) is fine: the frame sits on the current + /// thread's frame chain and is at a bytecode boundary. + pub(crate) fn check_locals_access(&self, vm: &VirtualMachine) -> PyResult<()> { + let owner = FrameOwner::from_i8(self.owner.load(atomic::Ordering::Acquire)); + if owner != FrameOwner::Thread { + return Ok(()); + } + let mut cur = crate::vm::thread::get_current_frame(); + while !cur.is_null() { + if core::ptr::eq(cur, self) { + return Ok(()); + } + cur = unsafe { (*cur).previous_frame() }; + } + Err(vm.new_runtime_error( + "cannot access frame locals while the frame is executing in another thread", + )) + } + pub fn f_locals_mapping(&self, vm: &VirtualMachine) -> PyResult<ArgMapping> { + self.check_locals_access(vm)?; if !self.has_active_hidden_locals() { self.f_locals_hidden_overlay.lock().take(); return self.locals(vm); } - let needs_refresh = !self.locals_dirty.load(atomic::Ordering::Acquire); let overlay_dict = { let mut overlay = self.f_locals_hidden_overlay.lock(); match overlay.as_ref() { @@ -1041,25 +1315,240 @@ impl Frame { } } }; - if needs_refresh { - PyDict::clear(&overlay_dict); - let overlay = ArgMapping::from_dict_exact(overlay_dict.clone()); - self.sync_visible_locals_to_mapping(overlay.mapping(), vm)?; - } + PyDict::clear(&overlay_dict); + let overlay = ArgMapping::from_dict_exact(overlay_dict.clone()); + self.sync_visible_locals_to_mapping(overlay.mapping(), vm)?; Ok(ArgMapping::from_dict_exact(overlay_dict)) } pub fn locals(&self, vm: &VirtualMachine) -> PyResult<ArgMapping> { - if self.has_active_hidden_locals() { + let mapping = if self.has_active_hidden_locals() { // Match CPython's locals() behavior for frames with PEP 709 hidden // locals: return a fresh snapshot instead of the backing mapping. let overlay = ArgMapping::from_dict_exact(vm.ctx.new_dict()); self.sync_visible_locals_to_mapping(overlay.mapping(), vm)?; - Ok(overlay) + overlay } else { self.sync_visible_locals_to_mapping(self.locals.mapping(vm), vm)?; - Ok(self.locals.clone_mapping(vm)) + self.locals.clone_mapping(vm) + }; + self.fold_extra_locals(&mapping, vm)?; + Ok(mapping) + } + + /// Copy the frame's extra-locals side storage (proxy keys that are not + /// fast locals) into `mapping`. No-op when nothing was ever stored. + fn fold_extra_locals(&self, mapping: &ArgMapping, vm: &VirtualMachine) -> PyResult<()> { + let extra = self.f_extra_locals.lock().clone(); + if let Some(extra) = extra { + for (key, value) in &extra { + mapping.mapping().ass_subscript(&key, Some(value), vm)?; + } } + Ok(()) + } + + /// Read a fast-local slot's visible value, dereferencing cells. `None` if + /// the slot is empty or its cell holds no value. + fn framelocalsproxy_getval(&self, i: usize) -> Option<PyObjectRef> { + use rustpython_compiler_core::bytecode::{CO_FAST_CELL, CO_FAST_FREE}; + // SAFETY: callers first pass through `check_locals_access`, so the + // frame is not executing on another thread. + let fastlocals = unsafe { self.iframe_ref().localsplus.fastlocals() }; + let obj = fastlocals.get(i)?.as_ref()?; + let kind = self.code.localspluskinds.get(i).copied().unwrap_or(0); + if kind & (CO_FAST_CELL | CO_FAST_FREE) != 0 { + if let Some(cell) = obj.downcast_ref::<PyCell>() { + cell.get() + } else { + Some(obj.clone()) + } + } else { + Some(obj.clone()) + } + } + + /// Write `value` into fast-local slot `i`, routing through the cell when + /// the slot holds one so closures keep sharing the same cell. + fn framelocalsproxy_setval(&self, i: usize, value: PyObjectRef) { + use rustpython_compiler_core::bytecode::{CO_FAST_CELL, CO_FAST_FREE}; + let kind = self.code.localspluskinds.get(i).copied().unwrap_or(0); + // SAFETY: callers first pass through `check_locals_access`. + let fastlocals = unsafe { self.iframe_mut().localsplus.fastlocals_mut() }; + if kind & (CO_FAST_CELL | CO_FAST_FREE) != 0 + && let Some(obj) = fastlocals[i].as_ref() + && let Some(cell) = obj.downcast_ref::<PyCell>() + { + cell.set(Some(value)); + return; + } + fastlocals[i] = Some(value); + } + + /// Resolve `key` to a fast-local slot index, or `None` if it names no fast + /// local. `read` selects read semantics (only bound slots match) versus + /// write semantics (hidden slots are skipped, unbound slots still match). + /// Raises `TypeError` for an unhashable key. + fn framelocalsproxy_getkeyindex( + &self, + key: &PyObject, + read: bool, + vm: &VirtualMachine, + ) -> PyResult<Option<usize>> { + use rustpython_compiler_core::bytecode::CO_FAST_HIDDEN; + // The proxy hashes the key first; an unhashable key raises TypeError. + key.hash(vm)?; + for (i, &kind) in self.code.localspluskinds.iter().enumerate() { + let name = localsplus_name(&self.code, i); + if !name + .as_object() + .rich_compare_bool(key, PyComparisonOp::Eq, vm)? + { + continue; + } + if read { + if self.framelocalsproxy_getval(i).is_some() { + return Ok(Some(i)); + } + } else if kind & CO_FAST_HIDDEN == 0 { + return Ok(Some(i)); + } + } + Ok(None) + } + + /// Build a fresh ordered snapshot dict of the proxy's visible contents: + /// bound fast locals in localsplus order followed by extra locals. + pub(crate) fn framelocalsproxy_snapshot(&self, vm: &VirtualMachine) -> PyResult<PyDictRef> { + self.check_locals_access(vm)?; + let dict = vm.ctx.new_dict(); + let mapping = ArgMapping::from_dict_exact(dict.clone()); + self.sync_visible_locals_to_mapping(mapping.mapping(), vm)?; + self.fold_extra_locals(&mapping, vm)?; + Ok(dict) + } + + /// `proxy[key]`: read a fast local live, else fall back to extra locals. + pub(crate) fn framelocalsproxy_getitem( + &self, + key: PyObjectRef, + vm: &VirtualMachine, + ) -> PyResult { + self.check_locals_access(vm)?; + if let Some(i) = self.framelocalsproxy_getkeyindex(&key, true, vm)? + && let Some(value) = self.framelocalsproxy_getval(i) + { + return Ok(value); + } + let extra = self.f_extra_locals.lock().clone(); + if let Some(extra) = extra + && let Some(value) = extra.get_item_opt(&*key, vm)? + { + return Ok(value); + } + Err(vm.new_key_error(key)) + } + + /// `key in proxy`. + pub(crate) fn framelocalsproxy_contains( + &self, + key: PyObjectRef, + vm: &VirtualMachine, + ) -> PyResult<bool> { + self.check_locals_access(vm)?; + if self.framelocalsproxy_getkeyindex(&key, true, vm)?.is_some() { + return Ok(true); + } + let extra = self.f_extra_locals.lock().clone(); + if let Some(extra) = extra { + return Ok(extra.get_item_opt(&*key, vm)?.is_some()); + } + Ok(false) + } + + /// `proxy[key] = value`: fast-key writes the slot in place, other keys go + /// to the extra-locals side dict. + pub(crate) fn framelocalsproxy_setitem( + &self, + key: PyObjectRef, + value: PyObjectRef, + vm: &VirtualMachine, + ) -> PyResult<()> { + self.check_locals_access(vm)?; + if let Some(i) = self.framelocalsproxy_getkeyindex(&key, false, vm)? { + self.framelocalsproxy_setval(i, value); + return Ok(()); + } + let extra = self.extra_locals_get_or_create(vm); + extra.set_item(&*key, value, vm) + } + + /// `del proxy[key]`: deleting a fast local raises ValueError; extra keys are + /// removed (KeyError if absent). + pub(crate) fn framelocalsproxy_delitem( + &self, + key: PyObjectRef, + vm: &VirtualMachine, + ) -> PyResult<()> { + self.check_locals_access(vm)?; + if self + .framelocalsproxy_getkeyindex(&key, false, vm)? + .is_some() + { + return Err(vm.new_value_error("cannot remove local variables from FrameLocalsProxy")); + } + let extra = self.f_extra_locals.lock().clone(); + if let Some(extra) = extra + && extra.get_item_opt(&*key, vm)?.is_some() + { + return extra.del_item(&*key, vm); + } + Err(vm.new_key_error(key)) + } + + /// `proxy.pop(key[, default])`. + pub(crate) fn framelocalsproxy_pop( + &self, + key: PyObjectRef, + default: Option<PyObjectRef>, + vm: &VirtualMachine, + ) -> PyResult { + self.check_locals_access(vm)?; + if self + .framelocalsproxy_getkeyindex(&key, false, vm)? + .is_some() + { + return Err(vm.new_value_error("cannot remove local variables from FrameLocalsProxy")); + } + let extra = self.f_extra_locals.lock().clone(); + if let Some(extra) = extra + && let Some(value) = extra.pop_item(&*key, vm)? + { + return Ok(value); + } + default.ok_or_else(|| vm.new_key_error(key)) + } + + /// `proxy.setdefault(key, default)`. + pub(crate) fn framelocalsproxy_setdefault( + &self, + key: PyObjectRef, + default: PyObjectRef, + vm: &VirtualMachine, + ) -> PyResult { + match self.framelocalsproxy_getitem(key.clone(), vm) { + Ok(value) => Ok(value), + Err(e) if e.fast_isinstance(vm.ctx.exceptions.key_error) => { + self.framelocalsproxy_setitem(key, default.clone(), vm)?; + Ok(default) + } + Err(e) => Err(e), + } + } + + fn extra_locals_get_or_create(&self, vm: &VirtualMachine) -> PyDictRef { + let mut extra = self.f_extra_locals.lock(); + extra.get_or_insert_with(|| vm.ctx.new_dict()).clone() } } @@ -1069,7 +1558,7 @@ impl Py<Frame> { // SAFETY: Frame execution is single-threaded. Only one thread at a time // executes a given frame (enforced by the owner field and generator // running flag). Same safety argument as FastLocals (UnsafeCell). - let iframe = unsafe { &mut *self.iframe.get() }; + let iframe = unsafe { self.iframe_mut() }; let exec = ExecutingFrame { code: &iframe.code, localsplus: &mut iframe.localsplus, @@ -1129,7 +1618,7 @@ impl Py<Frame> { return None; } // SAFETY: Frame is not executing, so UnsafeCell access is safe. - let iframe = unsafe { &mut *self.iframe.get() }; + let iframe = unsafe { self.iframe_mut() }; let exec = ExecutingFrame { code: &iframe.code, localsplus: &mut iframe.localsplus, @@ -1220,12 +1709,117 @@ fn specialization_nonnegative_compact_index(i: &PyInt, vm: &VirtualMachine) -> O } } -fn release_datastack_frame(frame: &Py<Frame>, vm: &VirtualMachine) { +/// Get the variable name for a localsplus index of `code`. +fn localsplus_name(code: &PyCode, idx: usize) -> &'static PyStrInterned { + use rustpython_compiler_core::bytecode::{CO_FAST_CELL, CO_FAST_FREE, CO_FAST_LOCAL}; + let nlocals = code.varnames.len(); + let kind = code.localspluskinds.get(idx).copied().unwrap_or(0); + if kind & CO_FAST_LOCAL != 0 { + // Merged cell or regular local: name is in varnames + code.varnames[idx] + } else if kind & CO_FAST_FREE != 0 { + // Free var: slots are at the end of localsplus + let nlocalsplus = code.localspluskinds.len(); + let nfrees = code.freevars.len(); + let free_start = nlocalsplus - nfrees; + code.freevars[idx - free_start] + } else if kind & CO_FAST_CELL != 0 { + // Non-merged cell: count how many non-merged cell slots are before + // this index to find the corresponding cellvars entry. + // Non-merged cellvars appear in their original order (skipping merged ones). + let nonmerged_pos = code.localspluskinds[nlocals..idx] + .iter() + .filter(|&&k| k == CO_FAST_CELL) + .count(); + // Skip merged cellvars to find the right one + let mut cv_idx = 0; + let mut nonmerged_count = 0; + for (i, name) in code.cellvars.iter().enumerate() { + let is_merged = code.varnames.contains(name); + if !is_merged { + if nonmerged_count == nonmerged_pos { + cv_idx = i; + break; + } + nonmerged_count += 1; + } + } + code.cellvars[cv_idx] + } else { + code.varnames[idx] + } +} + +/// Free a finished call frame's data stack storage. +/// +/// When the caller holds the only reference to the frame, the locals and +/// stack values are dropped in place and the storage is released without a +/// heap copy. Otherwise (the frame escaped through a traceback, +/// `sys._getframe`, a trace callback, ...) the values are copied to the heap +/// first so they stay readable through the escaped reference. +pub(crate) fn release_datastack_frame(frame: &Py<Frame>, vm: &VirtualMachine) { + let frame_obj = frame.as_object(); + // Uniqueness argument: at this point the frame is already out of + // the thread-frames registry and the current-frame chain + // (both unlinked inside `with_frame` before it returned), and the + // frame type has no weakref support. A datastack frame is created + // untracked and stays untracked while it runs, so it is in no GC + // generation list and no collector can observe or incref it. Hence no + // thread can mint a new reference without already holding one, and every + // escape (traceback, `sys._getframe`, `f_back`, a stored trace-hook arg) + // is a heap reference created on this thread while the frame ran. + // Therefore `strong_count() == 1` here means nothing escaped, and + // `strong_count() > 1` means the frame escaped. + debug_assert!( + !frame_obj.is_gc_tracked(), + "datastack frame is GC-tracked at release" + ); + if frame_obj.strong_count() == 1 { + // A reference minted and already released by another thread (through a + // heap escape carried across threads) ends in a release-decref; the + // fence orders that thread's memory before our drops below. + atomic::fence(Acquire); + // SAFETY: unique owner and no way to mint a new reference, so + // localsplus can never be observed again. The base pointer came + // from this thread's data stack. + unsafe { + if let Some(base) = frame.release_localsplus() { + vm.datastack_pop(base); + } + } + return; + } + // Escaped. Stabilize localsplus on the heap FIRST, then join the GC. This + // order guarantees a concurrent (stop-the-world) collector only ever sees a + // tracked frame whose localsplus is heap-resident and no longer mutating: + // the frame has stopped executing before it becomes a candidate, so its + // outgoing edges are stable while a collector traverses them. + // SAFETY: the frame finished executing; the base pointer came from this + // thread's data stack. unsafe { if let Some(base) = frame.materialize_localsplus() { vm.datastack_pop(base); } } + // Retain a strong reference to the caller so `f_back` keeps resolving once + // the caller returns and leaves the live frame chain. The caller is still + // executing here (this frame is unwinding back into it), so its payload + // pointer is live. + // SAFETY: `previous` points at the live caller on this thread's stack. + *frame.retained_back.lock() = unsafe { owned_chain_frame(frame.previous_frame()) }; + // Invariant: a tracked frame must always have heap-backed localsplus + // (proven here for escaped datastack frames and by construction for + // generator frames, which are born heap-backed). A stop-the-world + // collector reads a frame's localsplus only when the frame is a tracked + // candidate, so this keeps it from ever reading data-stack-resident, + // still-mutating storage of an executing frame. + debug_assert!( + !frame.localsplus_is_datastack_backed(), + "escaped frame tracked before its localsplus was materialized" + ); + // SAFETY: the frame is alive (held by `frame` and the escaped reference) + // and untracked. + unsafe { crate::gc_state::gc_state().track_object(NonNull::from(frame_obj)) }; } type BinaryOpExtendGuard = fn(&PyObject, &PyObject, &VirtualMachine) -> bool; @@ -1239,6 +1833,34 @@ struct BinaryOpExtendSpecializationDescr { const BINARY_OP_EXTEND_EXTERNAL_CACHE_OFFSET: usize = 1; +/// Max total args (including self) staged in a fixed-size stack buffer by the +/// exact-args call fast paths; larger arities fall back to a heap buffer. +const MAX_INLINE_CALL_ARGS: usize = 8; + +/// Staging buffer for exact-args call fast paths: fixed-size inline storage +/// for small arities, avoiding a per-call Vec allocation. +enum CallArgBuffer { + Inline(usize, [Option<PyObjectRef>; MAX_INLINE_CALL_ARGS]), + Heap(Vec<Option<PyObjectRef>>), +} + +impl CallArgBuffer { + fn new(total_nargs: usize) -> Self { + if total_nargs <= MAX_INLINE_CALL_ARGS { + Self::Inline(total_nargs, [const { None }; MAX_INLINE_CALL_ARGS]) + } else { + Self::Heap(vec![None; total_nargs]) + } + } + + fn slots(&mut self) -> &mut [Option<PyObjectRef>] { + match self { + Self::Inline(len, buf) => &mut buf[..*len], + Self::Heap(buf) => buf, + } + } +} + #[inline] fn compactlongs_guard(lhs: &PyObject, rhs: &PyObject, vm: &VirtualMachine) -> bool { compact_int_from_obj(lhs, vm).is_some() && compact_int_from_obj(rhs, vm).is_some() @@ -1396,55 +2018,34 @@ impl fmt::Debug for ExecutingFrame<'_> { } impl ExecutingFrame<'_> { - #[inline] - fn monitoring_disabled_for_code(&self, vm: &VirtualMachine) -> bool { - self.code.is(&vm.ctx.init_cleanup_code) - } - - fn specialization_new_init_cleanup_frame(&self, vm: &VirtualMachine) -> FrameRef { - Frame::new( - vm.ctx.init_cleanup_code.clone(), - Scope::new( - Some(ArgMapping::from_dict_exact(vm.ctx.new_dict())), - self.globals.clone(), - ), - self.builtins.clone(), - &[], - None, - true, - vm, - ) - .into_ref(&vm.ctx) - } - - fn specialization_run_init_cleanup_shim( + /// Run `__init__` for the tp_new specialization. `args` holds the + /// `__init__` args with slot 0 left empty; it is filled with `new_obj` + /// here. Enforces the `__init__() should return None` contract and + /// returns the constructed object. + fn specialization_run_init( &self, new_obj: PyObjectRef, init_func: &Py<PyFunction>, - pos_args: Vec<PyObjectRef>, + args: &mut [Option<PyObjectRef>], vm: &VirtualMachine, ) -> PyResult<PyObjectRef> { - let shim = self.specialization_new_init_cleanup_frame(vm); - let shim_result = vm.with_frame_untraced(shim.clone(), |shim| { - shim.with_exec(vm, |mut exec| exec.push_value(new_obj.clone())); + args[0] = Some(new_obj.clone()); + let taken = args + .iter_mut() + .map(|slot| slot.take().expect("arg slot must be filled")); - let mut all_args = Vec::with_capacity(pos_args.len() + 1); - all_args.push(new_obj.clone()); - all_args.extend(pos_args); + let init_frame = init_func.prepare_exact_args_frame(taken, vm); + let init_result = vm.run_frame(init_frame.clone()); + release_datastack_frame(&init_frame, vm); + let init_result = init_result?; - let init_frame = init_func.prepare_exact_args_frame(all_args, vm); - let init_result = vm.run_frame(init_frame.clone()); - release_datastack_frame(&init_frame, vm); - let init_result = init_result?; - - shim.with_exec(vm, |mut exec| exec.push_value(init_result)); - match shim.run(vm)? { - ExecutionResult::Return(value) => Ok(value), - ExecutionResult::Yield(_) => unreachable!("_Py_InitCleanup shim cannot yield"), - } - }); - release_datastack_frame(&shim, vm); - shim_result + if !vm.is_none(&init_result) { + return Err(vm.new_type_error(format!( + "__init__() should return None, not '{:.200}'", + init_result.class().name() + ))); + } + Ok(new_obj) } #[inline(always)] @@ -1483,6 +2084,15 @@ impl ExecutingFrame<'_> { if stack_analysis::top_of_stack(cur_stack) == stack_analysis::Kind::Except as i64 && let Some(exc_obj) = val { + // An Except-typed stack slot is only produced by bytecode that + // also carries one of the opcodes scanned by + // `PyCode::has_exc_handling`; otherwise the save/restore that + // brackets this frame's exc_info is elided and this write would + // corrupt the shared exc_info slot. + debug_assert!( + self.code.has_exc_handling, + "unwinding an Except slot in a frame without exc-handling opcodes" + ); if vm.is_none(&exc_obj) { vm.set_exception(None); } else { @@ -1585,39 +2195,44 @@ impl ExecutingFrame<'_> { } } - if vm.eval_breaker_tripped() - && let Err(exception) = vm.check_signals() - { - #[cold] - fn handle_signal_exception( - frame: &mut ExecutingFrame<'_>, - exception: PyBaseExceptionRef, - idx: usize, - vm: &VirtualMachine, - ) -> FrameResult { - if let Some((loc, _end_loc)) = frame.code.locations.get(idx) { - let next = exception.__traceback__(); - let new_traceback = PyTraceback::new( - next, - frame.object.to_owned(), - idx as u32 * 2, - loc.line, - ); - exception.set_traceback_typed(Some(new_traceback.into_ref(&vm.ctx))); + if vm.eval_breaker_tripped() { + if let Err(exception) = vm.check_signals() { + #[cold] + fn handle_signal_exception( + frame: &mut ExecutingFrame<'_>, + exception: PyBaseExceptionRef, + idx: usize, + vm: &VirtualMachine, + ) -> FrameResult { + if let Some((loc, _end_loc)) = frame.code.locations.get(idx) { + let next = exception.__traceback__(); + let new_traceback = PyTraceback::new( + next, + frame.object.to_owned(), + idx as u32 * 2, + loc.line, + ); + exception.set_traceback_typed(Some(new_traceback.into_ref(&vm.ctx))); + } + vm.contextualize_exception(&exception); + frame.unwind_blocks(vm, UnwindReason::Raising { exception }) } - vm.contextualize_exception(&exception); - frame.unwind_blocks(vm, UnwindReason::Raising { exception }) + match handle_signal_exception(self, exception, idx, vm) { + Ok(None) => {} + Ok(Some(value)) => { + break Ok(value); + } + Err(exception) => { + break Err(exception); + } + } + continue; } - match handle_signal_exception(self, exception, idx, vm) { - Ok(None) => {} - Ok(Some(value)) => { - break Ok(value); - } - Err(exception) => { - break Err(exception); - } - } - continue; + // Run a scheduled automatic collection here — a safepoint with + // no interpreter locks held — instead of synchronously inside + // the allocation that tripped the threshold. + #[cfg(feature = "threading")] + vm.run_scheduled_gc(); } let lasti_before = self.lasti(); let result = self.execute_instruction(op, arg, &mut do_extend_arg, vm); @@ -2045,43 +2660,7 @@ impl ExecutingFrame<'_> { /// Get the variable name for a localsplus index. fn localsplus_name(&self, idx: usize) -> &'static PyStrInterned { - use rustpython_compiler_core::bytecode::{CO_FAST_CELL, CO_FAST_FREE, CO_FAST_LOCAL}; - let nlocals = self.code.varnames.len(); - let kind = self.code.localspluskinds.get(idx).copied().unwrap_or(0); - if kind & CO_FAST_LOCAL != 0 { - // Merged cell or regular local: name is in varnames - self.code.varnames[idx] - } else if kind & CO_FAST_FREE != 0 { - // Free var: slots are at the end of localsplus - let nlocalsplus = self.code.localspluskinds.len(); - let nfrees = self.code.freevars.len(); - let free_start = nlocalsplus - nfrees; - self.code.freevars[idx - free_start] - } else if kind & CO_FAST_CELL != 0 { - // Non-merged cell: count how many non-merged cell slots are before - // this index to find the corresponding cellvars entry. - // Non-merged cellvars appear in their original order (skipping merged ones). - let nonmerged_pos = self.code.localspluskinds[nlocals..idx] - .iter() - .filter(|&&k| k == CO_FAST_CELL) - .count(); - // Skip merged cellvars to find the right one - let mut cv_idx = 0; - let mut nonmerged_count = 0; - for (i, name) in self.code.cellvars.iter().enumerate() { - let is_merged = self.code.varnames.contains(name); - if !is_merged { - if nonmerged_count == nonmerged_pos { - cv_idx = i; - break; - } - nonmerged_count += 1; - } - } - self.code.cellvars[cv_idx] - } else { - self.code.varnames[idx] - } + localsplus_name(self.code, idx) } /// Execute a single instruction. @@ -3369,17 +3948,6 @@ impl ExecutingFrame<'_> { self.code.instructions.quicken(); atomic::fence(atomic::Ordering::Release); } - if self.monitoring_disabled_for_code(vm) { - let global_ver = vm - .state - .instrumentation_version - .load(atomic::Ordering::Acquire); - monitoring::instrument_code(self.code, 0); - self.code - .instrumentation_version - .store(global_ver, atomic::Ordering::Release); - return Ok(None); - } // Check if bytecode needs re-instrumentation let global_ver = vm .state @@ -3752,7 +4320,7 @@ impl ExecutingFrame<'_> { let should_be_none = self.pop_value(); if !vm.is_none(&should_be_none) { return Err(vm.new_type_error(format!( - "__init__() should return None, not '{}'", + "__init__() should return None, not '{:.200}'", should_be_none.class().name() ))); } @@ -4090,7 +4658,8 @@ impl ExecutingFrame<'_> { debug_assert!(func.has_exact_argcount(2)); let owner = self.pop_value(); let attr_name = self.code.names[oparg.name_idx() as usize].to_owned().into(); - let result = func.invoke_exact_args(vec![owner, attr_name], vm)?; + let result = + func.invoke_exact_args_slots(&mut [Some(owner), Some(attr_name)], vm)?; self.push_value(result); return Ok(None); } @@ -4137,7 +4706,7 @@ impl ExecutingFrame<'_> { && self.specialization_has_datastack_space_for_func(vm, func) { let owner = self.pop_value(); - let result = func.invoke_exact_args(vec![owner], vm)?; + let result = func.invoke_exact_args_slots(&mut [Some(owner)], vm)?; self.push_value(result); return Ok(None); } @@ -4234,13 +4803,13 @@ impl ExecutingFrame<'_> { } // Specialized BINARY_OP opcodes Instruction::BinaryOpAddInt => { - self.execute_binary_op_int(vm, |a, b| a + b, bytecode::BinaryOperator::Add) + self.execute_binary_op_int(vm, Self::int_add, bytecode::BinaryOperator::Add) } Instruction::BinaryOpSubtractInt => { - self.execute_binary_op_int(vm, |a, b| a - b, bytecode::BinaryOperator::Subtract) + self.execute_binary_op_int(vm, Self::int_sub, bytecode::BinaryOperator::Subtract) } Instruction::BinaryOpMultiplyInt => { - self.execute_binary_op_int(vm, |a, b| a * b, bytecode::BinaryOperator::Multiply) + self.execute_binary_op_int(vm, Self::int_mul, bytecode::BinaryOperator::Multiply) } Instruction::BinaryOpAddFloat => { self.execute_binary_op_float(vm, |a, b| a + b, bytecode::BinaryOperator::Add) @@ -4268,8 +4837,12 @@ impl ExecutingFrame<'_> { } } Instruction::BinaryOpSubscrGetitem => { + let cache_base = self.lasti() as usize; + let type_version = self.code.instructions.read_cache_u32(cache_base + 1); let owner = self.nth_value(1); if !self.specialization_eval_frame_active(vm) + && type_version != 0 + && owner.class().tp_version_tag.load(Acquire) == type_version && let Some((func, func_version)) = owner.class().get_cached_getitem_for_specialization() && func.func_version() == func_version @@ -4278,7 +4851,7 @@ impl ExecutingFrame<'_> { debug_assert!(func.has_exact_argcount(2)); let sub = self.pop_value(); let owner = self.pop_value(); - let result = func.invoke_exact_args(vec![owner, sub], vm)?; + let result = func.invoke_exact_args_slots(&mut [Some(owner), Some(sub)], vm)?; self.push_value(result); return Ok(None); } @@ -4425,19 +4998,24 @@ impl ExecutingFrame<'_> { if self.specialization_call_recursion_guard(vm) { return self.execute_call_vectorcall(nargs, vm); } - let pos_args: Vec<PyObjectRef> = self.pop_multiple(nargs as usize).collect(); + // Stage args without a per-call Vec: [self?, arg1, ..., argN] + let base = usize::from(self_or_null_is_some); + let mut arg_buf = CallArgBuffer::new(nargs as usize + base); + let args = arg_buf.slots(); + for (slot, arg) in args[base..] + .iter_mut() + .zip(self.pop_multiple(nargs as usize)) + { + *slot = Some(arg); + } let self_or_null = self.pop_value_opt(); + debug_assert_eq!(self_or_null.is_some(), self_or_null_is_some); + if self_or_null.is_some() { + args[0] = self_or_null; + } let callable = self.pop_value(); let func = callable.downcast_ref_if_exact::<PyFunction>(vm).unwrap(); - let args = if let Some(self_val) = self_or_null { - let mut all_args = Vec::with_capacity(pos_args.len() + 1); - all_args.push(self_val); - all_args.extend(pos_args); - all_args - } else { - pos_args - }; - let result = func.invoke_exact_args(args, vm)?; + let result = func.invoke_exact_args_slots(args, vm)?; self.push_value(result); Ok(None) } else { @@ -4477,14 +5055,19 @@ impl ExecutingFrame<'_> { if self.specialization_call_recursion_guard(vm) { return self.execute_call_vectorcall(nargs, vm); } - let pos_args: Vec<PyObjectRef> = - self.pop_multiple(nargs as usize).collect(); + // Stage args without a per-call Vec: + // [bound_self, arg1, ..., argN] + let mut arg_buf = CallArgBuffer::new(nargs as usize + 1); + let args = arg_buf.slots(); + for (slot, arg) in + args[1..].iter_mut().zip(self.pop_multiple(nargs as usize)) + { + *slot = Some(arg); + } self.pop_value_opt(); // null (self_or_null) self.pop_value(); // callable (bound method) - let mut all_args = Vec::with_capacity(pos_args.len() + 1); - all_args.push(bound_self); - all_args.extend(pos_args); - let result = func.invoke_exact_args(all_args, vm)?; + args[0] = Some(bound_self); + let result = func.invoke_exact_args_slots(args, vm)?; self.push_value(result); return Ok(None); } @@ -4532,16 +5115,18 @@ impl ExecutingFrame<'_> { .as_ref() .is_some_and(|isinstance_callable| callable.is(isinstance_callable)) { - let nargs_usize = nargs as usize; - let pos_args: Vec<PyObjectRef> = self.pop_multiple(nargs_usize).collect(); - let self_or_null = self.pop_value_opt(); + // Stack: [callable, self_or_null, args...]; effective_nargs == 2, + // so the instance is either the first positional arg or self_or_null. + let cls = self.pop_value(); + let inst = if nargs == 2 { + let inst = self.pop_value(); + self.pop_value_opt(); // null + inst + } else { + self.pop_value() // self_or_null holds the instance + }; self.pop_value(); // callable - let mut all_args = Vec::with_capacity(2); - if let Some(self_val) = self_or_null { - all_args.push(self_val); - } - all_args.extend(pos_args); - let result = all_args[0].is_instance(&all_args[1], vm)?; + let result = inst.is_instance(&cls, vm)?; self.push_value(vm.ctx.new_bool(result).into()); return Ok(None); } @@ -4980,38 +5565,36 @@ impl ExecutingFrame<'_> { && cached_version != 0 && let Some(cls) = callable.downcast_ref::<PyType>() && cls.tp_version_tag.load(Acquire) == cached_version - && let Some(init_func) = cls.get_cached_init_for_specialization(cached_version) + && let Some((init_func, init_func_version)) = + cls.get_cached_init_for_specialization(cached_version) + && init_func.func_version() == init_func_version + && init_func.has_exact_argcount(nargs + 1) && let Some(cls_alloc) = cls.slots.alloc.load() { - // Match CPython's `code->co_framesize + _Py_InitCleanup.co_framesize` - // shape, using RustPython's datastack-backed frame size - // equivalent for the extra shim frame. - let init_cleanup_stack_bytes = - datastack_frame_size_bytes_for_code(&vm.ctx.init_cleanup_code) - .expect("_Py_InitCleanup shim is not a generator/coroutine"); - if !self.specialization_has_datastack_space_for_func_with_extra( - vm, - &init_func, - init_cleanup_stack_bytes, - ) { + // The specialization runs `__init__` directly with no + // interpreter-visible trampoline frame. Deopt when the + // datastack or recursion budget for the `__init__` frame is + // unavailable. + if !self.specialization_has_datastack_space_for_func(vm, &init_func) { return self.execute_call_vectorcall(nargs, vm); } - // CPython creates `_Py_InitCleanup` + `__init__` frames here. - // Keep the guard conservative and deopt when the effective - // recursion budget for those two frames is not available. - if self.specialization_call_recursion_guard_with_extra_frames(vm, 1) { + if self.specialization_call_recursion_guard(vm) { return self.execute_call_vectorcall(nargs, vm); } // Allocate object directly (tp_new == object.__new__, tp_alloc == generic). let cls_ref = cls.to_owned(); let new_obj = cls_alloc(cls_ref, 0, vm)?; - // Build args: [new_obj, arg1, ..., argN] - let pos_args: Vec<PyObjectRef> = self.pop_multiple(nargs as usize).collect(); + // Stage args as [new_obj, arg1, ..., argN]; slot 0 is + // filled by the init runner. + let mut arg_buf = CallArgBuffer::new(nargs as usize + 1); + let args = arg_buf.slots(); + for (slot, arg) in args[1..].iter_mut().zip(self.pop_multiple(nargs as usize)) { + *slot = Some(arg); + } let _null = self.pop_value_opt(); // self_or_null (None) let _callable = self.pop_value(); // callable (type) - let result = self - .specialization_run_init_cleanup_shim(new_obj, &init_func, pos_args, vm)?; + let result = self.specialization_run_init(new_obj, &init_func, args, vm)?; self.push_value(result); return Ok(None); } @@ -5798,18 +6381,6 @@ impl ExecutingFrame<'_> { instruction.is_instrumented(), "execute_instrumented called with non-instrumented opcode {instruction:?}" ); - if self.monitoring_disabled_for_code(vm) { - let global_ver = vm - .state - .instrumentation_version - .load(atomic::Ordering::Acquire); - monitoring::instrument_code(self.code, 0); - self.code - .instrumentation_version - .store(global_ver, atomic::Ordering::Release); - self.update_lasti(|i| *i -= 1); - return Ok(None); - } self.monitoring_mask = vm.state.monitoring_events.load(); match instruction { Instruction::InstrumentedResume => { @@ -7095,15 +7666,15 @@ impl ExecutingFrame<'_> { let b_ref = &self.pop_value(); let a_ref = &self.pop_value(); let value = match op { - // BINARY_OP_ADD_INT / BINARY_OP_SUBTRACT_INT fast paths: - // bypass binary_op1 dispatch for exact int types, use i64 arithmetic - // when possible to avoid BigInt heap allocation. + // Exact-int fast paths for +, -, *, //, %: bypass binary_op1 + // dispatch and use i64 arithmetic when possible to avoid BigInt + // heap allocation, falling back to the slow path otherwise. bytecode::BinaryOperator::Add | bytecode::BinaryOperator::InplaceAdd => { if let (Some(a), Some(b)) = ( a_ref.downcast_ref_if_exact::<PyInt>(vm), b_ref.downcast_ref_if_exact::<PyInt>(vm), ) { - Ok(self.int_add(a.as_bigint(), b.as_bigint(), vm)) + Ok(Self::int_add(a.as_bigint(), b.as_bigint(), vm)) } else if matches!(op, bytecode::BinaryOperator::Add) { vm._add(a_ref, b_ref) } else { @@ -7115,32 +7686,65 @@ impl ExecutingFrame<'_> { a_ref.downcast_ref_if_exact::<PyInt>(vm), b_ref.downcast_ref_if_exact::<PyInt>(vm), ) { - Ok(self.int_sub(a.as_bigint(), b.as_bigint(), vm)) + Ok(Self::int_sub(a.as_bigint(), b.as_bigint(), vm)) } else if matches!(op, bytecode::BinaryOperator::Subtract) { vm._sub(a_ref, b_ref) } else { vm._isub(a_ref, b_ref) } } - bytecode::BinaryOperator::Multiply => vm._mul(a_ref, b_ref), + bytecode::BinaryOperator::Multiply | bytecode::BinaryOperator::InplaceMultiply => { + if let (Some(a), Some(b)) = ( + a_ref.downcast_ref_if_exact::<PyInt>(vm), + b_ref.downcast_ref_if_exact::<PyInt>(vm), + ) { + Ok(Self::int_mul(a.as_bigint(), b.as_bigint(), vm)) + } else if matches!(op, bytecode::BinaryOperator::Multiply) { + vm._mul(a_ref, b_ref) + } else { + vm._imul(a_ref, b_ref) + } + } bytecode::BinaryOperator::MatrixMultiply => vm._matmul(a_ref, b_ref), bytecode::BinaryOperator::Power => vm._pow(a_ref, b_ref, vm.ctx.none.as_object()), bytecode::BinaryOperator::TrueDivide => vm._truediv(a_ref, b_ref), - bytecode::BinaryOperator::FloorDivide => vm._floordiv(a_ref, b_ref), - bytecode::BinaryOperator::Remainder => vm._mod(a_ref, b_ref), + bytecode::BinaryOperator::FloorDivide + | bytecode::BinaryOperator::InplaceFloorDivide => { + if let (Some(a), Some(b)) = ( + a_ref.downcast_ref_if_exact::<PyInt>(vm), + b_ref.downcast_ref_if_exact::<PyInt>(vm), + ) && let Some(result) = Self::int_floordiv(a.as_bigint(), b.as_bigint(), vm) + { + Ok(result) + } else if matches!(op, bytecode::BinaryOperator::FloorDivide) { + vm._floordiv(a_ref, b_ref) + } else { + vm._ifloordiv(a_ref, b_ref) + } + } + bytecode::BinaryOperator::Remainder | bytecode::BinaryOperator::InplaceRemainder => { + if let (Some(a), Some(b)) = ( + a_ref.downcast_ref_if_exact::<PyInt>(vm), + b_ref.downcast_ref_if_exact::<PyInt>(vm), + ) && let Some(result) = Self::int_mod(a.as_bigint(), b.as_bigint(), vm) + { + Ok(result) + } else if matches!(op, bytecode::BinaryOperator::Remainder) { + vm._mod(a_ref, b_ref) + } else { + vm._imod(a_ref, b_ref) + } + } bytecode::BinaryOperator::Lshift => vm._lshift(a_ref, b_ref), bytecode::BinaryOperator::Rshift => vm._rshift(a_ref, b_ref), bytecode::BinaryOperator::Xor => vm._xor(a_ref, b_ref), bytecode::BinaryOperator::Or => vm._or(a_ref, b_ref), bytecode::BinaryOperator::And => vm._and(a_ref, b_ref), - bytecode::BinaryOperator::InplaceMultiply => vm._imul(a_ref, b_ref), bytecode::BinaryOperator::InplaceMatrixMultiply => vm._imatmul(a_ref, b_ref), bytecode::BinaryOperator::InplacePower => { vm._ipow(a_ref, b_ref, vm.ctx.none.as_object()) } bytecode::BinaryOperator::InplaceTrueDivide => vm._itruediv(a_ref, b_ref), - bytecode::BinaryOperator::InplaceFloorDivide => vm._ifloordiv(a_ref, b_ref), - bytecode::BinaryOperator::InplaceRemainder => vm._imod(a_ref, b_ref), bytecode::BinaryOperator::InplaceLshift => vm._ilshift(a_ref, b_ref), bytecode::BinaryOperator::InplaceRshift => vm._irshift(a_ref, b_ref), bytecode::BinaryOperator::InplaceXor => vm._ixor(a_ref, b_ref), @@ -7153,28 +7757,107 @@ impl ExecutingFrame<'_> { Ok(None) } - /// Int addition with i64 fast path to avoid BigInt heap allocation. + /// Int binary op with an i64 fast path to avoid BigInt heap allocation. + /// `checked` computes the i64 result; on `None` (either operand does not + /// fit i64, or the op overflows i64) it falls through to `fallback` on the + /// full BigInt values. Result boxing always goes through `new_int` so the + /// small-int cache is consulted identically. #[inline] - fn int_add(&self, a: &BigInt, b: &BigInt, vm: &VirtualMachine) -> PyObjectRef { + fn int_fast_op( + a: &BigInt, + b: &BigInt, + vm: &VirtualMachine, + checked: fn(i64, i64) -> Option<i64>, + fallback: impl FnOnce(&BigInt, &BigInt) -> BigInt, + ) -> PyObjectRef { use num_traits::ToPrimitive; if let (Some(av), Some(bv)) = (a.to_i64(), b.to_i64()) - && let Some(result) = av.checked_add(bv) + && let Some(result) = checked(av, bv) { return vm.ctx.new_int(result).into(); } - vm.ctx.new_int(a + b).into() + vm.ctx.new_int(fallback(a, b)).into() + } + + /// Int addition with i64 fast path to avoid BigInt heap allocation. + #[inline] + fn int_add(a: &BigInt, b: &BigInt, vm: &VirtualMachine) -> PyObjectRef { + Self::int_fast_op(a, b, vm, i64::checked_add, |a, b| a + b) } /// Int subtraction with i64 fast path to avoid BigInt heap allocation. #[inline] - fn int_sub(&self, a: &BigInt, b: &BigInt, vm: &VirtualMachine) -> PyObjectRef { + fn int_sub(a: &BigInt, b: &BigInt, vm: &VirtualMachine) -> PyObjectRef { + Self::int_fast_op(a, b, vm, i64::checked_sub, |a, b| a - b) + } + + /// Int multiplication with i64 fast path to avoid BigInt heap allocation. + #[inline] + fn int_mul(a: &BigInt, b: &BigInt, vm: &VirtualMachine) -> PyObjectRef { + Self::int_fast_op(a, b, vm, i64::checked_mul, |a, b| a * b) + } + + /// Int divide/remainder i64 fast path. Returns `None` to signal the caller + /// to fall through to the slow path when either operand does not fit i64 + /// or `compute` reports a case it cannot handle (zero divisor or i64 + /// overflow). Result boxing goes through `new_int` so the small-int cache + /// is consulted identically. + #[inline] + fn int_div_fast_op( + a: &BigInt, + b: &BigInt, + vm: &VirtualMachine, + compute: fn(i64, i64) -> Option<i64>, + ) -> Option<PyObjectRef> { use num_traits::ToPrimitive; - if let (Some(av), Some(bv)) = (a.to_i64(), b.to_i64()) - && let Some(result) = av.checked_sub(bv) - { - return vm.ctx.new_int(result).into(); + let (av, bv) = (a.to_i64()?, b.to_i64()?); + compute(av, bv).map(|r| vm.ctx.new_int(r).into()) + } + + /// Floor division of two i64 values with floor (toward negative infinity) + /// semantics. `None` when `b == 0` or the quotient overflows i64 + /// (`i64::MIN / -1`). + #[inline] + fn floordiv_i64(a: i64, b: i64) -> Option<i64> { + if b == 0 { + return None; } - vm.ctx.new_int(a - b).into() + let q = a.checked_div(b)?; + let r = a % b; + Some(if r != 0 && (r < 0) != (b < 0) { + q - 1 + } else { + q + }) + } + + /// Remainder of two i64 values, taking the sign of the divisor. `None` + /// when `b == 0` or the operation overflows i64 (`i64::MIN % -1`). + #[inline] + fn mod_i64(a: i64, b: i64) -> Option<i64> { + if b == 0 { + return None; + } + let r = a.checked_rem(b)?; + Some(if r != 0 && (r < 0) != (b < 0) { + r + b + } else { + r + }) + } + + /// Int floor division with i64 fast path. `None` falls through to the + /// slow path (bigint operands, zero divisor, or i64 overflow). + #[inline] + fn int_floordiv(a: &BigInt, b: &BigInt, vm: &VirtualMachine) -> Option<PyObjectRef> { + Self::int_div_fast_op(a, b, vm, Self::floordiv_i64) + } + + /// Int remainder with i64 fast path. `None` falls through to the slow + /// path (bigint operands, zero divisor, or i64 overflow). + #[inline] + fn int_mod(a: &BigInt, b: &BigInt, vm: &VirtualMachine) -> Option<PyObjectRef> { + Self::int_div_fast_op(a, b, vm, Self::mod_i64) } #[cold] @@ -7523,6 +8206,22 @@ impl ExecutingFrame<'_> { return; } + // Capture the version before inspecting getattro and the MRO so a + // concurrently installed __getattribute__/__getattr__ invalidates the + // version this specialization is cached against. + let type_version = cls.version_for_specialization(_vm); + if type_version == 0 { + unsafe { + self.code.instructions.write_adaptive_counter( + cache_base, + bytecode::adaptive_counter_backoff( + self.code.instructions.read_adaptive_counter(cache_base), + ), + ); + } + return; + } + // Only specialize if getattro is the default (PyBaseObject::getattro) let is_default_getattro = cls .slots @@ -7530,15 +8229,11 @@ impl ExecutingFrame<'_> { .load() .is_some_and(|f| f as usize == PyBaseObject::getattro as *const () as usize); if !is_default_getattro { - let mut type_version = cls.tp_version_tag.load(Acquire); - if type_version == 0 { - type_version = cls.assign_version_tag(); - } - if type_version != 0 - && !oparg.is_method() + let getattribute = cls.get_attr(identifier!(_vm, __getattribute__)); + if !oparg.is_method() && !self.specialization_eval_frame_active(_vm) && cls.get_attr(identifier!(_vm, __getattr__)).is_none() - && let Some(getattribute) = cls.get_attr(identifier!(_vm, __getattribute__)) + && let Some(getattribute) = getattribute && let Some(func) = getattribute.downcast_ref_if_exact::<PyFunction>(_vm) && func.can_specialize_call(2) { @@ -7570,24 +8265,6 @@ impl ExecutingFrame<'_> { return; } - // Get or assign type version - let mut type_version = cls.tp_version_tag.load(Acquire); - if type_version == 0 { - type_version = cls.assign_version_tag(); - } - if type_version == 0 { - // Version counter overflow — backoff to avoid re-attempting every execution - unsafe { - self.code.instructions.write_adaptive_counter( - cache_base, - bytecode::adaptive_counter_backoff( - self.code.instructions.read_adaptive_counter(cache_base), - ), - ); - } - return; - } - let attr_name = self.code.names[oparg.name_idx() as usize]; // Match CPython: only specialize module attribute loads when the @@ -7620,7 +8297,6 @@ impl ExecutingFrame<'_> { return; } - // Look up attr in class via MRO let cls_attr = cls.get_attr(attr_name); let class_has_dict = cls.slots.flags.has_feature(PyTypeFlags::HAS_DICT); @@ -7792,29 +8468,11 @@ impl ExecutingFrame<'_> { ) { let obj = self.top_value(); let owner_type = obj.downcast_ref::<PyType>().unwrap(); - - // Get or assign type version for the type object itself - let mut type_version = owner_type.tp_version_tag.load(Acquire); - if type_version == 0 { - type_version = owner_type.assign_version_tag(); - } - if type_version == 0 { - unsafe { - self.code.instructions.write_adaptive_counter( - cache_base, - bytecode::adaptive_counter_backoff( - self.code.instructions.read_adaptive_counter(cache_base), - ), - ); - } - return; - } - let attr_name = self.code.names[oparg.name_idx() as usize]; // Check metaclass: ensure no data descriptor on metaclass for this name let mcl = obj.class(); - let mcl_attr = mcl.get_attr(attr_name); + let (mcl_attr, mut metaclass_version) = mcl.lookup_ref_and_version_interned(attr_name, _vm); if let Some(ref attr) = mcl_attr { let attr_class = attr.class(); if attr_class.slots.descr_set.load().is_some() { @@ -7830,12 +8488,7 @@ impl ExecutingFrame<'_> { return; } } - let mut metaclass_version = 0; if !mcl.slots.flags.has_feature(PyTypeFlags::IMMUTABLETYPE) { - metaclass_version = mcl.tp_version_tag.load(Acquire); - if metaclass_version == 0 { - metaclass_version = mcl.assign_version_tag(); - } if metaclass_version == 0 { unsafe { self.code.instructions.write_adaptive_counter( @@ -7847,10 +8500,22 @@ impl ExecutingFrame<'_> { } return; } + } else { + metaclass_version = 0; } - // Look up attr in the type's own MRO - let cls_attr = owner_type.get_attr(attr_name); + let (cls_attr, type_version) = owner_type.lookup_ref_and_version_interned(attr_name, _vm); + if type_version == 0 { + unsafe { + self.code.instructions.write_adaptive_counter( + cache_base, + bytecode::adaptive_counter_backoff( + self.code.instructions.read_adaptive_counter(cache_base), + ), + ); + } + return; + } if let Some(ref descr) = cls_attr { let descr_class = descr.class(); let has_descr_get = descr_class.slots.descr_get.load().is_some(); @@ -8022,26 +8687,31 @@ impl ExecutingFrame<'_> { Some(Instruction::BinaryOpSubscrListSlice) } else { let cls = a.class(); + // Check the cheap gates before the __getitem__ lookup, which + // takes the global type lock and may allocate a version tag. if cls.slots.flags.has_feature(PyTypeFlags::HEAPTYPE) && !self.specialization_eval_frame_active(vm) - && let Some(_getitem) = cls.get_attr(identifier!(vm, __getitem__)) - && let Some(func) = _getitem.downcast_ref_if_exact::<PyFunction>(vm) - && func.can_specialize_call(2) { - let mut type_version = cls.tp_version_tag.load(Acquire); - if type_version == 0 { - type_version = cls.assign_version_tag(); - } - if type_version != 0 { - if cls.cache_getitem_for_specialization( + let (getitem, type_version) = + cls.lookup_ref_and_version_interned(identifier!(vm, __getitem__), vm); + if type_version != 0 + && let Some(getitem) = getitem + && let Some(func) = getitem.downcast_ref_if_exact::<PyFunction>(vm) + && func.can_specialize_call(2) + && cls.cache_getitem_for_specialization( func.to_owned(), type_version, vm, - ) { - Some(Instruction::BinaryOpSubscrGetitem) - } else { - None + ) + { + // Record the type version so the specialized handler + // can revalidate before using the cached __getitem__. + unsafe { + self.code + .instructions + .write_cache_u32(cache_base + 1, type_version); } + Some(Instruction::BinaryOpSubscrGetitem) } else { None } @@ -8211,7 +8881,7 @@ impl ExecutingFrame<'_> { fn execute_binary_op_int( &mut self, vm: &VirtualMachine, - op: impl FnOnce(&BigInt, &BigInt) -> BigInt, + op: impl FnOnce(&BigInt, &BigInt, &VirtualMachine) -> PyObjectRef, deopt_op: bytecode::BinaryOperator, ) -> FrameResult { let b = self.top_value(); @@ -8220,10 +8890,10 @@ impl ExecutingFrame<'_> { a.downcast_ref_if_exact::<PyInt>(vm), b.downcast_ref_if_exact::<PyInt>(vm), ) { - let result = op(a_int.as_bigint(), b_int.as_bigint()); + let result = op(a_int.as_bigint(), b_int.as_bigint(), vm); self.pop_value(); self.pop_value(); - self.push_value(vm.ctx.new_bigint(&result).into()); + self.push_value(result); Ok(None) } else { self.execute_bin_op(vm, deopt_op) @@ -8561,6 +9231,10 @@ impl ExecutingFrame<'_> { // CallAllocAndEnterInit: heap type with default __new__ if !self_or_null_is_some && cls.slots.flags.has_feature(PyTypeFlags::HEAPTYPE) { + // Capture the version before inspecting tp_new/tp_alloc so a + // concurrently installed __new__ invalidates the version this + // specialization is cached against. + let type_version = cls.version_for_specialization(vm); let object_new = vm.ctx.types.object_type.slots.new.load(); let cls_new = cls.slots.new.load(); let object_alloc = vm.ctx.types.object_type.slots.alloc.load(); @@ -8570,12 +9244,7 @@ impl ExecutingFrame<'_> { && cls_new_fn as usize == obj_new_fn as usize && cls_alloc_fn as usize == obj_alloc_fn as usize { - let init = cls.get_attr(identifier!(vm, __init__)); - let mut version = cls.tp_version_tag.load(Acquire); - if version == 0 { - version = cls.assign_version_tag(); - } - if version == 0 { + if type_version == 0 { unsafe { self.code.instructions.write_adaptive_counter( cache_base, @@ -8586,15 +9255,17 @@ impl ExecutingFrame<'_> { } return; } + let init = cls.get_attr(identifier!(vm, __init__)); if let Some(init) = init && let Some(init_func) = init.downcast_ref_if_exact::<PyFunction>(vm) - && init_func.is_simple_for_call_specialization() - && cls.cache_init_for_specialization(init_func.to_owned(), version, vm) + && init_func.can_specialize_call(nargs + 1) + && !init_func.is_generator_like() + && cls.cache_init_for_specialization(init_func.to_owned(), type_version, vm) { unsafe { self.code .instructions - .write_cache_u32(cache_base + 1, version); + .write_cache_u32(cache_base + 1, type_version); } self.specialize_at( instr_idx, @@ -8888,34 +9559,35 @@ impl ExecutingFrame<'_> { Some(Instruction::ToBoolList) } else if cls.is(PyStr::class(&vm.ctx)) { Some(Instruction::ToBoolStr) - } else if cls.slots.flags.has_feature(PyTypeFlags::HEAPTYPE) - && cls.slots.as_number.boolean.load().is_none() - && cls.slots.as_mapping.length.load().is_none() - && cls.slots.as_sequence.length.load().is_none() - { - // Cache type version for ToBoolAlwaysTrue guard - let mut type_version = cls.tp_version_tag.load(Acquire); - if type_version == 0 { - type_version = cls.assign_version_tag(); - } - if type_version != 0 { - unsafe { - self.code - .instructions - .write_cache_u32(cache_base + 1, type_version); - } - self.specialize_at(instr_idx, cache_base, Instruction::ToBoolAlwaysTrue); - } else { - unsafe { - self.code.instructions.write_adaptive_counter( - cache_base, - bytecode::adaptive_counter_backoff( - self.code.instructions.read_adaptive_counter(cache_base), - ), - ); + } else if cls.slots.flags.has_feature(PyTypeFlags::HEAPTYPE) { + // Capture the version before inspecting the bool/len slots so a + // concurrently installed __bool__/__len__ invalidates the version + // the ToBoolAlwaysTrue guard is cached against. + let type_version = cls.version_for_specialization(vm); + let has_bool_or_len = cls.slots.as_number.boolean.load().is_some() + || cls.slots.as_mapping.length.load().is_some() + || cls.slots.as_sequence.length.load().is_some(); + if !has_bool_or_len { + if type_version != 0 { + unsafe { + self.code + .instructions + .write_cache_u32(cache_base + 1, type_version); + } + self.specialize_at(instr_idx, cache_base, Instruction::ToBoolAlwaysTrue); + } else { + unsafe { + self.code.instructions.write_adaptive_counter( + cache_base, + bytecode::adaptive_counter_backoff( + self.code.instructions.read_adaptive_counter(cache_base), + ), + ); + } } + return; } - return; + None } else { None }; @@ -9213,6 +9885,22 @@ impl ExecutingFrame<'_> { let owner = self.top_value(); let cls = owner.class(); + // Capture the version before inspecting the setattro slot so a + // concurrently installed __setattr__ invalidates the version this + // specialization is cached against. + let type_version = cls.version_for_specialization(vm); + if type_version == 0 { + unsafe { + self.code.instructions.write_adaptive_counter( + cache_base, + bytecode::adaptive_counter_backoff( + self.code.instructions.read_adaptive_counter(cache_base), + ), + ); + } + return; + } + // Only specialize if setattr is the default (generic_setattr) let is_default_setattr = cls .slots @@ -9231,24 +9919,6 @@ impl ExecutingFrame<'_> { return; } - // Get or assign type version - let mut type_version = cls.tp_version_tag.load(Acquire); - if type_version == 0 { - type_version = cls.assign_version_tag(); - } - if type_version == 0 { - unsafe { - self.code.instructions.write_adaptive_counter( - cache_base, - bytecode::adaptive_counter_backoff( - self.code.instructions.read_adaptive_counter(cache_base), - ), - ); - } - return; - } - - // Check for data descriptor let attr_name = self.code.names[attr_idx as usize]; let cls_attr = cls.get_attr(attr_name); let has_data_descr = cls_attr.as_ref().is_some_and(|descr| { @@ -9670,7 +10340,9 @@ impl fmt::Debug for Frame { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { // SAFETY: Debug is best-effort; concurrent mutation is unlikely // and would only affect debug output. - let iframe = unsafe { &*self.iframe.get() }; + let Some(iframe) = (unsafe { &*self.iframe.get() }) else { + return f.write_str("Frame Object { cleared }"); + }; let stack_str = iframe .localsplus diff --git a/crates/vm/src/function/argument.rs b/crates/vm/src/function/argument.rs index c37475ba4..88ef5581b 100644 --- a/crates/vm/src/function/argument.rs +++ b/crates/vm/src/function/argument.rs @@ -12,7 +12,11 @@ pub trait IntoFuncArgs: Sized { fn into_args(self, vm: &VirtualMachine) -> FuncArgs; fn into_method_args(self, obj: PyObjectRef, vm: &VirtualMachine) -> FuncArgs { let mut args = self.into_args(vm); - args.prepend_arg(obj); + // Build the final vec once instead of prepending (realloc + memmove). + let mut with_obj = Vec::with_capacity(args.args.len() + 1); + with_obj.push(obj); + with_obj.append(&mut args.args); + args.args = with_obj; args } } @@ -202,7 +206,9 @@ impl FuncArgs { } pub fn prepend_arg(&mut self, item: PyObjectRef) { - self.args.reserve_exact(1); + // reserve (not reserve_exact): incoming vectors are usually built with + // exact capacity, so exact growth would realloc on every prepend. + self.args.reserve(1); self.args.insert(0, item) } diff --git a/crates/vm/src/gc_state.rs b/crates/vm/src/gc_state.rs index e20cbcb8e..ebae58f96 100644 --- a/crates/vm/src/gc_state.rs +++ b/crates/vm/src/gc_state.rs @@ -136,6 +136,61 @@ impl GcGeneration { #[derive(Clone, Copy, PartialEq, Eq, Hash)] struct GcPtr(NonNull<PyObject>); +/// RAII barrier that parks every other thread for the pointer-reading phases +/// of a collection and lets them run again before finalizers execute. +/// +/// Reference subtraction, the reachability walk and the strong-reference +/// snapshot dereference the interpreter state of every tracked object, +/// including the `localsplus` of frames that other threads are actively +/// executing. Those writes carry no synchronization, so the reads are only +/// well-defined while all other threads are parked at a safepoint. Restarting +/// happens explicitly once the snapshot has pinned every object; `Drop` is a +/// backstop that also restarts on the early-return paths. +#[cfg(feature = "threading")] +struct CollectStopTheWorld { + vm: *const crate::VirtualMachine, + stopped: bool, +} + +#[cfg(feature = "threading")] +impl CollectStopTheWorld { + /// Request stop-the-world when the current thread has an attached VM. + /// Falls back to no barrier when no VM is attached (the tracked-object + /// reads then run without other threads only if the caller guarantees it). + fn new() -> Self { + let vm = crate::vm::thread::try_with_current_vm(|vm| { + vm.state.stop_the_world.stop_the_world(vm); + vm as *const crate::VirtualMachine + }); + match vm { + Some(vm) => Self { vm, stopped: true }, + None => Self { + vm: core::ptr::null(), + stopped: false, + }, + } + } + + /// Restart the world. Idempotent. + fn restart(&mut self) { + if self.stopped { + // SAFETY: the current thread stays attached to this VM for the + // whole collection — the VM is never popped from the thread's VM + // stack while collecting — so the pointer is valid here. + let vm = unsafe { &*self.vm }; + vm.state.stop_the_world.start_the_world(vm); + self.stopped = false; + } + } +} + +#[cfg(feature = "threading")] +impl Drop for CollectStopTheWorld { + fn drop(&mut self) { + self.restart(); + } +} + /// Global GC state pub struct GcState { /// 3 generations (0 = youngest, 2 = oldest) @@ -366,8 +421,23 @@ impl GcState { let count0 = self.generations[0].count.load(Ordering::SeqCst) as u32; let threshold0 = self.generations[0].threshold(); if threshold0 > 0 && count0 >= threshold0 { - self.collect(0); - return true; + #[cfg(feature = "threading")] + { + // Defer to the next bytecode safepoint. Collecting here would + // stop the world while this thread may hold an internal lock + // (e.g. a lazily-initialized frame locals cell) that another + // thread is blocked on with no way to reach a safepoint — + // a deadlock. At a safepoint no such lock is held. + crate::signal::schedule_gc(); + return false; + } + // Without threading there is no safepoint to defer to and no other + // thread whose frames could be read mid-mutation, so collect inline. + #[cfg(not(feature = "threading"))] + { + self.collect(0); + return true; + } } false @@ -409,6 +479,32 @@ impl GcState { // might prevent cycle collection (_PyType_ClearCache). crate::builtins::type_::type_cache_clear(); + // Backstop for QSBR reclamation (threads may have missed requests). + #[cfg(feature = "threading")] + crate::object::qsbr::QSBR.process(); + + // Stop the world before reading any tracked object's interpreter + // state. Requested *before* the generation read locks are taken: a + // thread parking at a safepoint may still hold a generation write lock + // (track/untrack/promote) and must be able to release it to reach the + // safepoint. It could not do so if this thread already held a read + // lock it was waiting behind — hence the ordering. + // + // Auto-collection is deferred to a bytecode safepoint (see + // `maybe_collect`), where no internal lock is held, so it never stops + // the world under a lock. Explicit `gc.collect()` runs synchronously + // here; a re-entrant call from a finalizer during an in-progress + // collection is turned into a no-op by the `collecting` try_lock above. + // The one residual is an explicit `gc.collect()` reached from a + // finalizer/`__del__` that runs inline while a non-generation internal + // lock is still held (e.g. a container write lock during element + // replacement) with another thread blocked on that same lock: stopping + // the world then waits for a thread that cannot reach a safepoint. + // Closing it fully would require making those locks stop-the-world + // aware; the exclusion above only serializes the fork/GC requesters. + #[cfg(feature = "threading")] + let mut stw = CollectStopTheWorld::new(); + // Step 1: Gather objects from generations 0..=generation // Hold read locks for the entire scan to prevent concurrent modifications. let gen_locks: Vec<_> = (0..=generation) @@ -532,6 +628,40 @@ impl GcState { // Step 5: Find unreachable objects let unreachable: Vec<GcPtr> = collecting.difference(&reachable).copied().collect(); + // With the world stopped, every frame on any thread's call stack is a + // live root that is externally referenced and must have been + // classified reachable. A running frame appearing in `unreachable` + // would mean the reachability analysis observed its interpreter state + // as garbage — the exact hazard the barrier exists to prevent. + #[cfg(all(unix, feature = "threading", debug_assertions))] + if stw.stopped { + let unreachable_set: HashSet<GcPtr> = unreachable.iter().copied().collect(); + crate::vm::thread::try_with_current_vm(|vm| { + let registry = vm.state.thread_frames.lock(); + #[expect( + clippy::iter_over_hash_type, + reason = "assertion over every registered thread slot" + )] + for slot in registry.values() { + let mut cur = slot.top_frame.load(core::sync::atomic::Ordering::Relaxed) + as *const crate::frame::Frame; + while !cur.is_null() { + // SAFETY: frames on a thread's active call stack are + // alive, and the world is stopped so none can be popped. + let obj = + unsafe { &*crate::Py::<crate::frame::Frame>::from_payload_ptr(cur) } + .as_object(); + let ptr = GcPtr(NonNull::from(obj)); + debug_assert!( + !unreachable_set.contains(&ptr), + "running frame {obj:p} classified unreachable during GC" + ); + cur = unsafe { (*cur).previous_frame() }; + } + } + }); + } + if debug.contains(GcDebugFlags::STATS) { eprintln!( "gc: {} reachable, {} unreachable", @@ -565,6 +695,14 @@ impl GcState { }) .collect(); + // The pointer-reading phases are done: strong references now pin every + // survivor and unreachable object, so the remaining phases can run with + // the world restarted. Finalizers and tp_clear must not run under + // stop-the-world — they execute arbitrary Python — and they only touch + // dead/husk objects, never a running frame. + #[cfg(feature = "threading")] + stw.restart(); + if unreachable.is_empty() { drop(gen_locks); self.promote_survivors(generation, &survivor_refs); @@ -727,11 +865,88 @@ impl GcState { if !truly_dead.is_empty() { // Break cycles by clearing references (tp_clear) // Use deferred drop context to prevent stack overflow. - rustpython_common::refcount::with_deferred_drops(|| { + // With DEBUG_SAVEALL the objects stay reachable through + // gc.garbage, so they must not be cleared (delete_garbage + // skips tp_clear for saved objects). + let save_all = debug.contains(GcDebugFlags::SAVEALL); + + // Untrack dead objects BEFORE clearing them, mirroring the + // untrack-then-clear ordering of the refcount dealloc path. + // A cleared object (e.g. a frame husk with iframe == None) must + // never be observable through the generation lists, or another + // thread could obtain a strong reference via gc.get_objects() + // and access the cleared payload. + let mut late_resurrected: HashSet<GcPtr> = HashSet::new(); + if !save_all { + let mut expected_counts: std::collections::HashMap<GcPtr, usize> = + std::collections::HashMap::new(); for obj_ref in &truly_dead { - if obj_ref.gc_has_clear() { - let edges = unsafe { obj_ref.gc_clear() }; - drop(edges); + let obj = obj_ref.as_ref(); + if obj.is_gc_tracked() { + unsafe { self.untrack_object(NonNull::from(obj)) }; + } + // One strong reference held by the `truly_dead` vec itself. + expected_counts.insert(GcPtr(NonNull::from(obj)), 1); + } + // With the objects out of the generation lists, no new external + // reference can appear. Count the references coming from within + // the dead set; any surplus in strong_count means another thread + // grabbed a reference before untracking (late resurrection) and + // the object must not be cleared. + let mut referents: std::collections::HashMap<GcPtr, Vec<NonNull<PyObject>>> = + std::collections::HashMap::new(); + for obj_ref in &truly_dead { + let referent_ptrs = unsafe { obj_ref.gc_get_referent_ptrs() }; + for child_ptr in &referent_ptrs { + if let Some(n) = expected_counts.get_mut(&GcPtr(*child_ptr)) { + *n += 1; + } + } + referents.insert(GcPtr(NonNull::from(obj_ref.as_ref())), referent_ptrs); + } + let mut worklist: Vec<GcPtr> = Vec::new(); + for obj_ref in &truly_dead { + let ptr = GcPtr(NonNull::from(obj_ref.as_ref())); + if obj_ref.strong_count() > expected_counts[&ptr] + && late_resurrected.insert(ptr) + { + worklist.push(ptr); + } + } + // A holder of a late-resurrected object can reach its referents, + // so everything reachable from it must stay intact as well. + while let Some(ptr) = worklist.pop() { + let Some(referent_ptrs) = referents.get(&ptr) else { + continue; + }; + for child_ptr in referent_ptrs { + let child = GcPtr(*child_ptr); + if expected_counts.contains_key(&child) && late_resurrected.insert(child) { + worklist.push(child); + } + } + } + // Re-track late-resurrected objects so a future collection can + // retry once the external references are released. + #[expect( + clippy::iter_over_hash_type, + reason = "Iteration order doesn't matter here" + )] + for &ptr in &late_resurrected { + unsafe { self.track_object(ptr.0) }; + } + } + rustpython_common::refcount::with_deferred_drops(|| { + if !save_all { + for obj_ref in &truly_dead { + let obj = obj_ref.as_ref(); + if late_resurrected.contains(&GcPtr(NonNull::from(obj))) { + continue; + } + if obj.gc_has_clear() { + let edges = unsafe { obj.gc_clear() }; + drop(edges); + } } } drop(truly_dead); diff --git a/crates/vm/src/object/core.rs b/crates/vm/src/object/core.rs index 88ca646a4..f643be7e1 100644 --- a/crates/vm/src/object/core.rs +++ b/crates/vm/src/object/core.rs @@ -95,9 +95,23 @@ mod trashcan { type DeallocFn = unsafe fn(*mut super::PyObject); type DeallocQueue = Vec<(*mut super::PyObject, DeallocFn)>; + /// Per-thread trashcan state. Depth and deferral queue live in one + /// thread-local so a single access reaches both fields (one `_tlv_get_addr` + /// on platforms where thread-local access is a function call). Both fields + /// are `Cell`-based so reentrant deallocation (nested `begin`/`end` triggered + /// by draining deferred objects) never holds an outstanding borrow. + struct Trashcan { + depth: Cell<usize>, + queue: Cell<DeallocQueue>, + } + thread_local! { - static DEALLOC_DEPTH: Cell<usize> = const { Cell::new(0) }; - static DEALLOC_QUEUE: Cell<DeallocQueue> = const { Cell::new(Vec::new()) }; + static TRASHCAN: Trashcan = const { + Trashcan { + depth: Cell::new(0), + queue: Cell::new(Vec::new()), + } + }; } /// Try to begin deallocation. Returns true if we should proceed, @@ -107,18 +121,16 @@ mod trashcan { obj: *mut super::PyObject, dealloc: unsafe fn(*mut super::PyObject), ) -> bool { - DEALLOC_DEPTH.with(|d| { - let depth = d.get(); + TRASHCAN.with(|t| { + let depth = t.depth.get(); if depth >= TRASHCAN_LIMIT { // Depth exceeded: defer this deallocation - DEALLOC_QUEUE.with(|q| { - let mut queue = q.take(); - queue.push((obj, dealloc)); - q.set(queue); - }); + let mut queue = t.queue.take(); + queue.push((obj, dealloc)); + t.queue.set(queue); false } else { - d.set(depth + 1); + t.depth.set(depth + 1); true } }) @@ -127,29 +139,30 @@ mod trashcan { /// End deallocation and process any deferred objects if at outermost level. #[inline] pub(super) unsafe fn end() { - let depth = DEALLOC_DEPTH.with(|d| { - let depth = d.get(); + TRASHCAN.with(|t| { + let depth = t.depth.get(); debug_assert!(depth > 0, "trashcan::end called without matching begin"); let depth = depth - 1; - d.set(depth); - depth - }); - if depth == 0 { - // Process deferred deallocations iteratively + t.depth.set(depth); + if depth != 0 { + return; + } + // Process deferred deallocations iteratively. The queue is set back + // before each `dealloc` call so a reentrant `begin` can push freely. loop { - let next = DEALLOC_QUEUE.with(|q| { - let mut queue = q.take(); + let next = { + let mut queue = t.queue.take(); let item = queue.pop(); - q.set(queue); + t.queue.set(queue); item - }); + }; if let Some((obj, dealloc)) = next { unsafe { dealloc(obj) }; } else { break; } } - } + }) } } @@ -161,8 +174,17 @@ pub(super) unsafe fn default_dealloc<T: PyPayload>(obj: *mut PyObject) { return; // resurrected by __del__ } + // Only tracked objects take the trashcan recursion guard and untrack path. + // Untracked objects either own no children (int, float, str, ...) or, like + // non-escaped frames, are released at interpreter depth with at most one + // unguarded link before their tracked children (dicts, functions, code) + // re-enter guarded deallocation, so recursion stays bounded. A frame stored + // in an object graph is forced to escape, becoming tracked and guarded here. + // Read once and reuse for both gates below. + let tracked = obj_ref.is_gc_tracked(); + // Trashcan: limit recursive deallocation depth to prevent stack overflow - if !unsafe { trashcan::begin(obj, default_dealloc::<T>) } { + if tracked && !unsafe { trashcan::begin(obj, default_dealloc::<T>) } { return; // deferred to queue } @@ -171,7 +193,7 @@ pub(super) unsafe fn default_dealloc<T: PyPayload>(obj: *mut PyObject) { // Untrack from GC BEFORE deallocation. // Must happen before memory is freed because intrusive list removal // reads the object's gc_pointers (prev/next). - if obj_ref.is_gc_tracked() { + if tracked { let ptr = unsafe { NonNull::new_unchecked(obj) }; unsafe { crate::gc_state::gc_state().untrack_object(ptr); @@ -188,36 +210,49 @@ pub(super) unsafe fn default_dealloc<T: PyPayload>(obj: *mut PyObject) { ); } - // Try to store in freelist for reuse BEFORE tp_clear, so that - // size-based freelists (e.g. PyTuple) can read the payload directly. + // Extract child references to break circular refs (tp_clear), then drop + // them. Some payloads (e.g. Frame) drop children in place inside clear_fn + // instead of extracting them, so user code (`__del__`) may run here. + let mut edges = Vec::new(); + if let Some(clear_fn) = vtable.clear { + unsafe { clear_fn(obj, &mut edges) }; + } + // Drop extracted child references - may trigger recursive destruction. + drop(edges); + + // Try to store in freelist for reuse. This must happen AFTER clear_fn and + // after the extracted-children drop: both can run user code (`__del__`) + // that allocates, and `PyRef::new_ref` pops from the same thread-local + // freelist. If the husk were already in the freelist, a reentrant + // allocation could pop it and write a fresh payload into it while clear_fn + // still holds a `&mut` borrow of that payload (aliasing UB). Pushing only + // once no borrows into the payload can be live closes that window. // Only exact base types (not heaptype or structseq subtypes) go into the freelist. + // Published objects (e.g. a tuple stored as a type attribute) must skip the + // freelist: `PyRef::new_ref` would reuse the slot and overwrite the refcount + // word with a non-atomic write, racing a reader's atomic try-incref. Route + // them through `PyInner::dealloc` instead, whose QSBR hook defers the actual + // memory free until readers can no longer observe it. let typ = obj_ref.class(); let pushed = if T::HAS_FREELIST && typ.heaptype_ext.is_none() && core::ptr::eq(typ, T::class(crate::vm::Context::genesis())) + && !obj_ref.0.ref_count.is_published() { unsafe { T::freelist_push(obj) } } else { false }; - // Extract child references to break circular refs (tp_clear). - // This runs regardless of freelist push — the object's children must be released. - let mut edges = Vec::new(); - if let Some(clear_fn) = vtable.clear { - unsafe { clear_fn(obj, &mut edges) }; - } - if !pushed { // Deallocate the object memory (handles ObjExt prefix if present) unsafe { PyInner::dealloc(obj as *mut PyInner<T>) }; } - // Drop child references - may trigger recursive destruction. - drop(edges); - // Trashcan: decrement depth and process deferred objects at outermost level - unsafe { trashcan::end() }; + if tracked { + unsafe { trashcan::end() }; + } } pub(super) unsafe fn debug_obj<T: PyPayload + core::fmt::Debug>( x: &PyObject, @@ -1005,6 +1040,9 @@ impl<T: PyPayload> PyInner<T> { let has_ext = flags.has_feature(crate::types::PyTypeFlags::HAS_DICT) || member_count > 0; let has_weakref = flags.has_feature(crate::types::PyTypeFlags::HAS_WEAKREF); + // Objects published to lock-free caches keep their memory mapped + // until a QSBR grace period passes; destructors still run now. + let published = (*ptr).ref_count.is_published(); if has_ext || has_weakref { // Reconstruct the same layout used in new() @@ -1037,7 +1075,15 @@ impl<T: PyPayload> PyInner<T> { } // WeakRefList has no Drop (just raw pointers), no drop_in_place needed - alloc::alloc::dealloc(alloc_ptr, combined); + if published { + crate::object::qsbr::free_delayed(alloc_ptr, combined); + } else { + alloc::alloc::dealloc(alloc_ptr, combined); + } + } else if published { + let layout = core::alloc::Layout::new::<Self>(); + core::ptr::drop_in_place(ptr); + crate::object::qsbr::free_delayed(ptr as *mut u8, layout); } else { drop(Box::from_raw(ptr)); } @@ -1141,11 +1187,6 @@ impl<T: PyPayload + core::fmt::Debug> PyInner<T> { } } -/// Returns the allocation layout for `PyInner<T>`, for use in freelist Drop impls. -pub(crate) const fn pyinner_layout<T: PyPayload>() -> core::alloc::Layout { - core::alloc::Layout::new::<PyInner<T>>() -} - /// Thread-local freelist storage for reusing object allocations. /// /// Wraps a `Vec<*mut PyObject>`. On thread teardown, `Drop` frees raw @@ -1287,6 +1328,13 @@ impl PyObject { None } } + + /// Mark this object as published to a lock-free cache. Its memory + /// reclamation is deferred through QSBR (see `object::qsbr`) so that + /// concurrent try-incref readers never touch freed memory. + pub(crate) fn mark_cache_published(&self) { + self.0.ref_count.mark_published(); + } } impl PyObjectRef { @@ -2085,6 +2133,19 @@ impl<T: PyPayload> Py<T> { pub fn payload(&self) -> &T { &self.0.payload } + + /// Recover the object pointer from a pointer to its `payload` field. + /// + /// # Safety + /// `payload` must point to the `payload` of a live `Py<T>` (e.g. a `&T` + /// obtained by dereferencing a `Py<T>`), and the object must outlive the + /// returned pointer's use. + #[inline] + pub(crate) unsafe fn from_payload_ptr(payload: *const T) -> *const Self { + let offset = core::mem::offset_of!(PyInner<T>, payload); + // `Py<T>` is a newtype over `PyInner<T>`, so their addresses coincide. + unsafe { (payload as *const u8).sub(offset) as *const Self } + } } impl<T> ToOwned for Py<T> { @@ -2275,7 +2336,11 @@ impl<T: PyPayload + crate::object::MaybeTraverse + core::fmt::Debug> PyRef<T> { // - HAS_TRAVERSE is true (Rust payload implements Traverse), OR // - has instance dict (user-defined class instances), OR // - heap type (all heap type instances are GC-tracked, like Py_TPFLAGS_HAVE_GC) - if <T as crate::object::MaybeTraverse>::HAS_TRAVERSE || has_dict || is_heaptype { + // unless the payload opts out via NEW_REF_UNTRACKED (e.g. call frames, + // which are tracked lazily only on escape). + if (<T as crate::object::MaybeTraverse>::HAS_TRAVERSE || has_dict || is_heaptype) + && !T::NEW_REF_UNTRACKED + { let gc = crate::gc_state::gc_state(); unsafe { gc.track_object(ptr.cast()); @@ -2471,7 +2536,7 @@ pub(crate) fn init_type_hierarchy() -> (PyTypeRef, PyTypeRef, PyTypeRef) { static_assertions::assert_eq_align!(MaybeUninit<PyInner<PyType>>, PyInner<PyType>); let type_payload = PyType { - base: None, + base: None.into(), bases: PyRwLock::default(), mro: PyRwLock::default(), subclasses: PyRwLock::default(), @@ -2482,7 +2547,7 @@ pub(crate) fn init_type_hierarchy() -> (PyTypeRef, PyTypeRef, PyTypeRef) { abc_tpflags: core::sync::atomic::AtomicU64::new(0), }; let object_payload = PyType { - base: None, + base: None.into(), bases: PyRwLock::default(), mro: PyRwLock::default(), subclasses: PyRwLock::default(), @@ -2567,7 +2632,7 @@ pub(crate) fn init_type_hierarchy() -> (PyTypeRef, PyTypeRef, PyTypeRef) { (*object_type_ptr).payload.mro = PyRwLock::new(vec![object_type.clone()]); (*type_type_ptr).payload.bases = PyRwLock::new(vec![object_type.clone()]); - (*type_type_ptr).payload.base = Some(object_type.clone()); + (*type_type_ptr).payload.base = Some(object_type.clone()).into(); let type_type = PyTypeRef::from_raw(type_type_ptr.cast()); // type's mro is [type, object] @@ -2579,7 +2644,7 @@ pub(crate) fn init_type_hierarchy() -> (PyTypeRef, PyTypeRef, PyTypeRef) { }; let weakref_type = PyType { - base: Some(object_type.clone()), + base: Some(object_type.clone()).into(), bases: PyRwLock::new(vec![object_type.clone()]), mro: PyRwLock::new(vec![object_type.clone()]), subclasses: PyRwLock::default(), diff --git a/crates/vm/src/object/ext.rs b/crates/vm/src/object/ext.rs index d400de29c..e576ac2c1 100644 --- a/crates/vm/src/object/ext.rs +++ b/crates/vm/src/object/ext.rs @@ -365,6 +365,35 @@ impl<T: PyPayload> PyAtomicRef<Option<T>> { self.deref_ordering(ordering).map(|x| x.to_owned()) } + /// Try-incref read of the current value. + /// + /// Unlike [`Self::to_owned`], this never increfs a destructed object: + /// it uses a conditional incref and revalidates that the slot still + /// holds the same pointer. Returns `None` when the slot is empty. + /// + /// Soundness relies on published-object memory being reclaimed only + /// after a QSBR grace period (see `object::qsbr`), so the refcount + /// word of a concurrently swapped-out value stays readable. + pub fn try_to_owned(&self, ordering: Ordering) -> Option<PyRef<T>> { + loop { + let ptr = self.inner.load(ordering); + if ptr.is_null() { + return None; + } + if let Some(obj) = unsafe { PyObject::try_to_owned_from_ptr(ptr.cast::<PyObject>()) } { + if core::ptr::eq(self.inner.load(Ordering::Acquire), ptr) { + // SAFETY: the slot only ever stores `PyRef<T>` values. + return Some(unsafe { obj.downcast_unchecked::<T>() }); + } + drop(obj); + } + // Slot changed or the value was torn down mid-read; a failed + // incref with an unchanged slot is impossible (the slot's own + // strong ref keeps the value alive), so this loop progresses. + core::hint::spin_loop(); + } + } + /// # Safety /// The caller is responsible to keep the returned PyRef alive /// until no more reference can be used via PyAtomicRef::deref() diff --git a/crates/vm/src/object/mod.rs b/crates/vm/src/object/mod.rs index 56db97aef..b06957e1b 100644 --- a/crates/vm/src/object/mod.rs +++ b/crates/vm/src/object/mod.rs @@ -1,6 +1,7 @@ mod core; mod ext; mod payload; +pub(crate) mod qsbr; mod traverse; mod traverse_object; diff --git a/crates/vm/src/object/payload.rs b/crates/vm/src/object/payload.rs index 349b239f7..36262607a 100644 --- a/crates/vm/src/object/payload.rs +++ b/crates/vm/src/object/payload.rs @@ -48,6 +48,13 @@ pub trait PyPayload: MaybeTraverse + PyThreadingConstraint + Sized + 'static { fn class(ctx: &Context) -> &'static Py<PyType>; + /// Whether `PyRef::new_ref` skips auto-tracking this type in the GC even + /// when it would otherwise qualify (has traverse, dict, or heap type). + /// Such objects are created untracked and must be tracked explicitly if + /// and when they can become part of a reference cycle. Used by `Frame`, + /// which is created untracked and tracked lazily only on escape. + const NEW_REF_UNTRACKED: bool = false; + /// Whether this type has a freelist. Types with freelists require /// immediate (non-deferred) GC untracking during dealloc to prevent /// race conditions when the object is reused. @@ -58,11 +65,13 @@ pub trait PyPayload: MaybeTraverse + PyThreadingConstraint + Sized + 'static { /// Try to push a dead object onto this type's freelist for reuse. /// Returns true if the object was stored (caller must NOT free the memory). - /// Called before tp_clear, so the payload is still intact. + /// Called after tp_clear, so the payload is a cleared husk; implementations + /// must not rely on its pre-clear contents. /// /// # Safety - /// `obj` must be a valid pointer to a `PyInner<Self>` with refcount 0. - /// The payload is still initialized and can be read for bucket selection. + /// `obj` must be a valid pointer to a `PyInner<Self>` with refcount 0 + /// whose tp_clear has already run, with no outstanding borrows into the + /// payload (`PyRef::new_ref` may pop and reuse the husk immediately). #[inline] unsafe fn freelist_push(_obj: *mut PyObject) -> bool { false @@ -124,6 +133,34 @@ pub trait PyPayload: MaybeTraverse + PyThreadingConstraint + Sized + 'static { #[inline] fn into_ref_with_type(self, vm: &VirtualMachine, cls: PyTypeRef) -> PyResult<PyRef<Self>> + where + Self: core::fmt::Debug, + { + self.into_ref_with_type_and_dict(vm, cls, true) + } + + /// Like `into_ref_with_type`, but leaves the instance `__dict__` unallocated + /// until the first attribute write or `__dict__` access. Only valid for types + /// whose attribute protocol materializes the dict lazily via `get_or_insert`. + #[inline] + fn into_ref_with_type_lazy_dict( + self, + vm: &VirtualMachine, + cls: PyTypeRef, + ) -> PyResult<PyRef<Self>> + where + Self: core::fmt::Debug, + { + self.into_ref_with_type_and_dict(vm, cls, false) + } + + #[inline] + fn into_ref_with_type_and_dict( + self, + vm: &VirtualMachine, + cls: PyTypeRef, + eager_dict: bool, + ) -> PyResult<PyRef<Self>> where Self: core::fmt::Debug, { @@ -145,7 +182,12 @@ pub trait PyPayload: MaybeTraverse + PyThreadingConstraint + Sized + 'static { } return Err(_into_ref_size_error(vm, &cls, exact_class)); } - Ok(self._into_ref(cls, &vm.ctx)) + let dict = if eager_dict && cls.slots.flags.has_feature(PyTypeFlags::HAS_DICT) { + Some(vm.ctx.new_dict()) + } else { + None + }; + Ok(PyRef::new_ref(self, cls, dict)) } else { #[cold] #[inline(never)] diff --git a/crates/vm/src/object/qsbr.rs b/crates/vm/src/object/qsbr.rs new file mode 100644 index 000000000..576cadaea --- /dev/null +++ b/crates/vm/src/object/qsbr.rs @@ -0,0 +1,333 @@ +//! Quiescent-state-based reclamation (QSBR) for lock-free caches. +//! +//! Objects published to lock-free caches (type method cache, type +//! specialization caches) are read via borrowed pointers plus try-incref. +//! Their memory must stay mapped until every thread that could hold such a +//! borrowed pointer has passed a quiescent state. Destructors run at the +//! normal drop point; only the final deallocation is deferred. +//! +//! Mirrors _Py_qsbr (Python/qsbr.c): a global write sequence advances on +//! each retirement; each thread records the last sequence it observed at a +//! quiescent point (eval-breaker checkpoint, attach/detach). A retired +//! allocation is freed once every online thread's sequence passes its goal. + +use core::alloc::Layout; + +/// Sequence value of an offline (detached) thread. +#[cfg(feature = "threading")] +const QSBR_OFFLINE: u64 = 0; +/// Initial write sequence value. +#[cfg(feature = "threading")] +const QSBR_INITIAL: u64 = 1; +/// Write sequence increment. +#[cfg(feature = "threading")] +const QSBR_INCR: u64 = 2; + +#[cfg(feature = "threading")] +pub(crate) use threading::*; + +#[cfg(feature = "threading")] +mod threading { + use super::*; + use alloc::sync::{Arc, Weak}; + use core::sync::atomic::{AtomicBool, AtomicU64, Ordering}; + use std::sync::Mutex; + + /// Per-thread QSBR state, owned by the thread's `ThreadSlot`. + pub(crate) struct QsbrSlot { + /// Last write sequence observed at a quiescent point; + /// `QSBR_OFFLINE` while the thread is detached. + seq: AtomicU64, + /// Set when this thread should pass a checkpoint (eval-breaker bit). + pub(crate) requested: AtomicBool, + } + + struct Retired { + ptr: *mut u8, + layout: Layout, + goal: u64, + } + // SAFETY: `ptr` is an exclusively owned dead allocation; only the + // processing thread touches it. + unsafe impl Send for Retired {} + + pub(crate) struct Qsbr { + /// Global write sequence (_Py_qsbr wr_seq). + wr_seq: AtomicU64, + /// Cached minimum observed read sequence (rd_seq). + rd_seq: AtomicU64, + threads: Mutex<Vec<Weak<QsbrSlot>>>, + queue: Mutex<Vec<Retired>>, + /// Set while the retire queue is non-empty; gates the per-instruction + /// eval-breaker check so the hot path pays only one relaxed static + /// load when nothing is pending. + pending: AtomicBool, + } + + pub(crate) static QSBR: Qsbr = Qsbr::new(); + + impl Qsbr { + const fn new() -> Self { + Self { + wr_seq: AtomicU64::new(QSBR_INITIAL), + rd_seq: AtomicU64::new(QSBR_INITIAL), + threads: Mutex::new(Vec::new()), + queue: Mutex::new(Vec::new()), + pending: AtomicBool::new(false), + } + } + + /// Whether retired allocations are pending. The hot path now reads + /// the mirrored bit in the eval-breaker word instead; this stays + /// only for unit tests that exercise local, non-global instances. + #[inline] + #[cfg_attr(not(test), allow(dead_code))] + pub(crate) fn break_pending(&self) -> bool { + self.pending.load(Ordering::Relaxed) + } + + /// Mirror `pending` into the global eval-breaker word — only for + /// the global QSBR instance, so unit-test instances never touch + /// process-global state. + fn update_breaker_bit(&self, on: bool) { + if core::ptr::eq(self, &QSBR) { + if on { + crate::signal::set_qsbr_bit(); + } else { + crate::signal::clear_qsbr_bit(); + } + } + } + + /// Register the calling thread. The returned slot is stored in the + /// thread's `ThreadSlot`; dropping it unregisters the thread. + pub(crate) fn register(&self) -> Arc<QsbrSlot> { + let slot = Arc::new(QsbrSlot { + seq: AtomicU64::new(self.wr_seq.load(Ordering::Acquire)), + requested: AtomicBool::new(false), + }); + self.threads.lock().unwrap().push(Arc::downgrade(&slot)); + slot + } + + /// Advance the write sequence; returns the goal a retirement must + /// wait for (_Py_qsbr_advance). + fn advance(&self) -> u64 { + self.wr_seq.fetch_add(QSBR_INCR, Ordering::AcqRel) + QSBR_INCR + } + + /// Record that the calling thread is at a quiescent point: it holds + /// no borrowed cache pointers (_Py_qsbr_quiescent_state). + pub(crate) fn quiescent_state(&self, slot: &QsbrSlot) { + slot.seq + .store(self.wr_seq.load(Ordering::Acquire), Ordering::Release); + } + + /// Mark a thread offline (detached); it no longer delays grace + /// periods (_Py_qsbr_detach). The thread must not perform lock-free + /// cache reads while offline. + pub(crate) fn offline(&self, slot: &QsbrSlot) { + slot.seq.store(QSBR_OFFLINE, Ordering::Release); + } + + /// Mark a thread online again (_Py_qsbr_attach). + pub(crate) fn online(&self, slot: &QsbrSlot) { + self.quiescent_state(slot); + } + + /// Whether every online thread has passed `goal` (_Py_qsbr_poll). + fn poll(&self, goal: u64) -> bool { + if self.rd_seq.load(Ordering::Acquire) >= goal { + return true; + } + self.poll_scan() >= goal + } + + /// Recompute the minimum sequence over all live online threads, + /// pruning dead ones. + fn poll_scan(&self) -> u64 { + let mut min_seq = self.wr_seq.load(Ordering::Acquire); + let mut threads = self.threads.lock().unwrap(); + threads.retain(|weak| match weak.upgrade() { + Some(slot) => { + let seq = slot.seq.load(Ordering::Acquire); + if seq != QSBR_OFFLINE { + min_seq = min_seq.min(seq); + } + true + } + None => false, + }); + drop(threads); + self.rd_seq.fetch_max(min_seq, Ordering::AcqRel); + min_seq + } + + /// Defer deallocation of a dead object's memory until a grace + /// period passes (_PyMem_FreeDelayed). + /// + /// # Safety + /// `ptr`/`layout` must describe an allocation whose contents have + /// been dropped and which nothing accesses afterwards except the + /// racing try-incref reads this mechanism protects against. + pub(crate) unsafe fn free_delayed(&self, ptr: *mut u8, layout: Layout) { + let goal = self.advance(); + { + let mut queue = self.queue.lock().unwrap(); + queue.push(Retired { ptr, layout, goal }); + // Set while still holding the queue lock, so this pairs with + // `process` clearing the flag under the same lock and no + // push can be left behind with the flag cleared. + self.pending.store(true, Ordering::Release); + self.update_breaker_bit(true); + } + // Ask every registered thread to pass a checkpoint. + for weak in self.threads.lock().unwrap().iter() { + if let Some(slot) = weak.upgrade() { + slot.requested.store(true, Ordering::Release); + } + } + } + + /// Free retired allocations whose grace period has passed + /// (_PyMem_ProcessDelayed). + pub(crate) fn process(&self) { + let Ok(mut queue) = self.queue.try_lock() else { + // Another thread is already processing. + return; + }; + // Goals are usually increasing in push order, but concurrent + // `free_delayed` calls can interleave their `advance()` and + // queue push, so a smaller goal can occasionally land behind a + // larger one. Free the longest prefix whose grace period has + // passed; each drained item individually passed `poll`, so this + // is sound regardless of ordering. A goal stuck behind an + // out-of-order neighbor just waits for the next checkpoint or + // GC pass, not a correctness issue. + let safe_prefix = queue + .iter() + .position(|item| !self.poll(item.goal)) + .unwrap_or(queue.len()); + for item in queue.drain(..safe_prefix) { + // SAFETY: grace period passed; no reader can hold `ptr`. + unsafe { alloc::alloc::dealloc(item.ptr, item.layout) }; + } + if queue.is_empty() { + self.pending.store(false, Ordering::Release); + self.update_breaker_bit(false); + } + } + + /// Free all retired allocations immediately. + /// + /// # Safety + /// Only sound when no other thread can be mid-read: the post-fork + /// child, or teardown after all threads exited. + #[cfg(unix)] + pub(crate) unsafe fn drain_all(&self) { + let mut queue = self.queue.lock().unwrap(); + for item in queue.drain(..) { + // SAFETY: guaranteed single-threaded by the caller. + unsafe { alloc::alloc::dealloc(item.ptr, item.layout) }; + } + self.pending.store(false, Ordering::Release); + self.update_breaker_bit(false); + } + + /// Reset after fork: drop all registered thread entries (dead + /// parent threads' slots would otherwise stay online forever and + /// stall every future grace period) and free all retired + /// allocations. + /// + /// # Safety + /// Only sound in the single-threaded post-fork child, before the + /// surviving thread re-registers. + #[cfg(unix)] + pub(crate) unsafe fn reset_after_fork(&self) { + self.threads.lock().unwrap().clear(); + // SAFETY: single-threaded child, no concurrent reader exists. + unsafe { self.drain_all() }; + } + + #[cfg(test)] + fn pending(&self) -> usize { + self.queue.lock().unwrap().len() + } + } + + #[cfg(test)] + mod tests { + use super::*; + + #[test] + fn poll_requires_all_online_threads() { + let q = Qsbr::new(); + let a = q.register(); + let b = q.register(); + let goal = q.advance(); + assert!(!q.poll(goal)); + q.quiescent_state(&a); + assert!(!q.poll(goal)); + q.quiescent_state(&b); + assert!(q.poll(goal)); + } + + #[test] + fn offline_thread_does_not_delay_grace() { + let q = Qsbr::new(); + let a = q.register(); + let b = q.register(); + let goal = q.advance(); + q.quiescent_state(&a); + q.offline(&b); + assert!(q.poll(goal)); + } + + #[test] + fn dead_thread_is_pruned() { + let q = Qsbr::new(); + let a = q.register(); + let b = q.register(); + drop(b); + let goal = q.advance(); + q.quiescent_state(&a); + assert!(q.poll(goal)); + } + + #[test] + fn process_frees_only_after_grace() { + let q = Qsbr::new(); + let a = q.register(); + let layout = Layout::new::<u64>(); + let ptr = unsafe { alloc::alloc::alloc(layout) }; + unsafe { q.free_delayed(ptr, layout) }; + assert!(a.requested.load(Ordering::Acquire)); + assert!(q.break_pending()); + q.process(); + assert_eq!(q.pending(), 1); // grace period not passed yet + assert!(q.break_pending()); + q.quiescent_state(&a); + q.process(); + assert_eq!(q.pending(), 0); + assert!(!q.break_pending()); + } + } +} + +/// Defer (threading) or immediately perform (non-threading) deallocation +/// of a dead published object's memory. +/// +/// # Safety +/// Same contract as [`Qsbr::free_delayed`]. +#[inline] +pub(crate) unsafe fn free_delayed(ptr: *mut u8, layout: Layout) { + #[cfg(feature = "threading")] + unsafe { + QSBR.free_delayed(ptr, layout) + }; + #[cfg(not(feature = "threading"))] + // No concurrent readers can exist without threads. + unsafe { + alloc::alloc::dealloc(ptr, layout) + }; +} diff --git a/crates/vm/src/object/traverse.rs b/crates/vm/src/object/traverse.rs index 9a5ae324b..d0a20d2af 100644 --- a/crates/vm/src/object/traverse.rs +++ b/crates/vm/src/object/traverse.rs @@ -111,19 +111,25 @@ where unsafe impl<T: Traverse> Traverse for PyRwLock<T> { #[inline] fn traverse(&self, traverse_fn: &mut TraverseFn<'_>) { - // if can't get a lock, this means something else is holding the lock, - // but since gc stopped the world, during gc the lock is always held - // so it is safe to ignore those in gc + // A failed try_read means a writer holds the lock. Traversal runs with + // the world stopped, but a thread force-parked while DETACHED (CAS'd + // straight to SUSPENDED from native code) may still hold the write lock + // it was in the middle of taking. Skipping such an object is safe: the + // collector then does not see its outgoing edges, which only + // under-traverses and thus over-approximates liveness (a conservative + // keep-alive), never freeing a reachable object. In single-threaded + // builds a failure only reflects the current thread's own re-entrant + // read, likewise safely skipped. if let Some(inner) = self.try_read_recursive() { inner.traverse(traverse_fn) } } } -/// Safety: We can't hold lock during traverse it's child because it may cause deadlock. -/// TODO(discord9): check if this is thread-safe to do -/// (Outside of gc phase, only incref/decref will call trace, -/// and refcnt is atomic, so it should be fine?) +/// Safety: the lock is not held across visiting children to avoid a re-entrant +/// deadlock. In threading builds traversal runs under stop-the-world so no +/// other thread mutates the guarded value while we read it; in single-threaded +/// builds there is no other writer. unsafe impl<T: Traverse> Traverse for PyMutex<T> { #[inline] fn traverse(&self, traverse_fn: &mut TraverseFn<'_>) { @@ -135,7 +141,9 @@ unsafe impl<T: Traverse> Traverse for PyMutex<T> { } chs.iter() .map(|ch| { - // Safety: during gc, this should be fine, because nothing should write during gc's tracing? + // Safety: the world is stopped (threading builds) or the + // interpreter is single-threaded, so `ch` is not concurrently + // freed while we hand it to the tracer. let ch = unsafe { ch.as_ref() }; traverse_fn(ch); }) diff --git a/crates/vm/src/signal.rs b/crates/vm/src/signal.rs index eea42f4a8..16a097ea6 100644 --- a/crates/vm/src/signal.rs +++ b/crates/vm/src/signal.rs @@ -2,7 +2,7 @@ use core::{ cell::{Cell, RefCell}, fmt, ops::{Deref, DerefMut, Index, IndexMut, Range}, - sync::atomic::{AtomicBool, Ordering}, + sync::atomic::{AtomicBool, AtomicU8, Ordering}, }; use std::sync::mpsc; @@ -13,7 +13,21 @@ use crate::{PyObjectRef, PyResult, TryFromBorrowedObject, TryFromObject, Virtual pub(crate) const NSIG: usize = 64; -static ANY_TRIGGERED: AtomicBool = AtomicBool::new(false); +/// Eval-breaker word: bit flags checked once per bytecode instruction. +/// Signal handlers and QSBR set bits with fetch_or (async-signal-safe, +/// lock-free); consumers clear only their own bit with fetch_and. +static EVAL_BREAKER: AtomicU8 = AtomicU8::new(0); + +/// A signal handler recorded a pending signal. +const SIGNAL_BIT: u8 = 1 << 0; +/// QSBR has retired allocations pending reclamation. +#[cfg(feature = "threading")] +const QSBR_BIT: u8 = 1 << 1; +/// An automatic collection was scheduled by `maybe_collect` and must run at +/// the next bytecode safepoint rather than synchronously inside the +/// allocation that tripped the threshold. +#[cfg(feature = "threading")] +const GC_BIT: u8 = 1 << 2; #[expect( clippy::declare_interior_mutable_const, @@ -49,12 +63,12 @@ pub fn check_signals(vm: &VirtualMachine) -> PyResult<()> { // Read-only check first: avoids cache-line invalidation on every // instruction when no signal is pending (the common case). - if !ANY_TRIGGERED.load(Ordering::Relaxed) { + if EVAL_BREAKER.load(Ordering::Relaxed) & SIGNAL_BIT == 0 { return Ok(()); } // Atomic RMW only when a signal is actually pending. - if !ANY_TRIGGERED.swap(false, Ordering::Acquire) { + if EVAL_BREAKER.fetch_and(!SIGNAL_BIT, Ordering::Acquire) & SIGNAL_BIT == 0 { return Ok(()); } @@ -101,20 +115,49 @@ fn trigger_signals(vm: &VirtualMachine) -> PyResult<()> { } pub(crate) fn set_triggered() { - ANY_TRIGGERED.store(true, Ordering::Release); + // fetch_or (not store) so a signal handler never clobbers the QSBR bit; + // this compiles to a lock-free RMW, safe to call from a signal handler. + EVAL_BREAKER.fetch_or(SIGNAL_BIT, Ordering::Release); } +/// Any eval-breaker bit pending? One relaxed load; checked per instruction. #[inline(always)] -#[cfg(not(target_arch = "wasm32"))] -pub(crate) fn is_triggered() -> bool { - ANY_TRIGGERED.load(Ordering::Relaxed) +pub(crate) fn eval_breaker_pending() -> bool { + EVAL_BREAKER.load(Ordering::Relaxed) != 0 +} + +#[cfg(feature = "threading")] +pub(crate) fn set_qsbr_bit() { + EVAL_BREAKER.fetch_or(QSBR_BIT, Ordering::Release); +} + +#[cfg(feature = "threading")] +pub(crate) fn clear_qsbr_bit() { + EVAL_BREAKER.fetch_and(!QSBR_BIT, Ordering::Release); +} + +#[cfg(feature = "threading")] +pub(crate) fn qsbr_bit_set() -> bool { + EVAL_BREAKER.load(Ordering::Relaxed) & QSBR_BIT != 0 +} + +/// Schedule an automatic collection to run at the next bytecode safepoint. +#[cfg(feature = "threading")] +pub(crate) fn schedule_gc() { + EVAL_BREAKER.fetch_or(GC_BIT, Ordering::Release); +} + +/// Clear the scheduled-GC bit, returning whether it had been set. +#[cfg(feature = "threading")] +pub(crate) fn take_gc_scheduled() -> bool { + EVAL_BREAKER.fetch_and(!GC_BIT, Ordering::Acquire) & GC_BIT != 0 } /// Reset all signal trigger state after fork in child process. /// Stale triggers from the parent must not fire in the child. #[cfg(all(unix, feature = "host_env"))] pub(crate) fn clear_after_fork() { - ANY_TRIGGERED.store(false, Ordering::Release); + EVAL_BREAKER.fetch_and(!SIGNAL_BIT, Ordering::Release); for trigger in &TRIGGERS { trigger.store(false, Ordering::Relaxed); } diff --git a/crates/vm/src/stdlib/_imp.rs b/crates/vm/src/stdlib/_imp.rs index 7021895c9..322eaedd7 100644 --- a/crates/vm/src/stdlib/_imp.rs +++ b/crates/vm/src/stdlib/_imp.rs @@ -15,8 +15,14 @@ mod lock { static IMP_LOCK: RawRMutex = RawRMutex::INIT; #[pyfunction] - fn acquire_lock(_vm: &VirtualMachine) { - acquire_lock_for_fork() + fn acquire_lock(vm: &VirtualMachine) { + // Detach while blocking on IMP_LOCK. The import lock is held across + // bytecode by the importlib bootstrap, so its holder can be parked at a + // safepoint mid-hold. Blocking here while attached would keep this + // thread from honoring a stop-the-world request, so a requester could + // wait for this thread while this thread waits for the parked holder. + // Detaching makes the wait park-friendly. + vm.allow_threads(acquire_lock_for_fork); } #[pyfunction] @@ -76,9 +82,14 @@ mod lock { } /// Re-export for fork safety code in posix.rs +/// +/// Runs pre-fork on a normal attached VM thread. Detach while blocking so the +/// wait honors a concurrent stop-the-world request instead of pinning this +/// thread attached on IMP_LOCK; re-attach completes before `stop_the_world`, so +/// the fork requester protocol is unaffected. #[cfg(all(unix, feature = "threading", feature = "host_env"))] -pub(crate) fn acquire_imp_lock_for_fork() { - lock::acquire_lock_for_fork(); +pub(crate) fn acquire_imp_lock_for_fork(vm: &VirtualMachine) { + vm.allow_threads(lock::acquire_lock_for_fork); } #[cfg(all(unix, feature = "threading", feature = "host_env"))] diff --git a/crates/vm/src/stdlib/_thread.rs b/crates/vm/src/stdlib/_thread.rs index f3e6bec89..99f9b1787 100644 --- a/crates/vm/src/stdlib/_thread.rs +++ b/crates/vm/src/stdlib/_thread.rs @@ -1053,18 +1053,46 @@ pub(crate) mod _thread { /// Get all threads' current (top) frames. Used by sys._current_frames(). pub(crate) fn get_all_current_frames(vm: &VirtualMachine) -> Vec<(u64, FrameRef)> { - let registry = vm.state.thread_frames.lock(); - registry - .iter() - .filter_map(|(id, slot)| { - let frames = slot.frames.lock(); - // SAFETY: the owning thread can't pop while we hold the Mutex, - // so the FramePtr is valid for the duration of the lock. - frames - .last() - .map(|fp| (*id, unsafe { fp.as_ref() }.to_owned())) - }) - .collect() + // unix: read each thread's published top frame under stop-the-world so + // the owning thread is parked at a safepoint and cannot pop or free the + // frame while we take a strong reference. Request stop-the-world before + // the registry lock to avoid deadlocking a thread parking mid-registry. + #[cfg(unix)] + { + use core::sync::atomic::Ordering; + vm.state.stop_the_world.stop_the_world(vm); + scopeguard::defer! { vm.state.stop_the_world.start_the_world(vm); } + let registry = vm.state.thread_frames.lock(); + registry + .iter() + .filter_map(|(id, slot)| { + let top = slot.top_frame.load(Ordering::Relaxed); + core::ptr::NonNull::new(top).map(|p| { + // SAFETY: world stopped -> the owning thread is parked + // and cannot pop or free this frame; it is alive on + // that thread's call stack. + let py = + unsafe { &*Py::<crate::frame::Frame>::from_payload_ptr(p.as_ptr()) }; + (*id, py.to_owned()) + }) + }) + .collect() + } + #[cfg(not(unix))] + { + let registry = vm.state.thread_frames.lock(); + registry + .iter() + .filter_map(|(id, slot)| { + let frames = slot.frames.lock(); + // SAFETY: the owning thread can't pop while we hold the Mutex, + // so the FramePtr is valid for the duration of the lock. + frames + .last() + .map(|fp| (*id, unsafe { fp.as_ref() }.to_owned())) + }) + .collect() + } } /// Called after fork() in child process to mark all other threads as done. @@ -1659,17 +1687,22 @@ pub(crate) mod _thread { started_cvar.notify_all(); } // Don't execute the target function until parent marks the - // handle as running. + // handle as running. Detach while blocked so a concurrent + // stop-the-world (e.g. a GC on another thread) can park this + // thread instead of stalling waiting for it to reach a + // safepoint it will not reach until released. { let (ready_lock, ready_cvar) = &*handle_ready_event_clone; - let mut ready = ready_lock.lock().unwrap(); - while !*ready { - // Short timeout so we stay responsive to STW requests. - let (guard, _) = ready_cvar - .wait_timeout(ready, core::time::Duration::from_millis(1)) - .unwrap(); - ready = guard; - } + vm.allow_threads(|| { + let mut ready = ready_lock.lock().unwrap(); + while !*ready { + // Short timeout so we stay responsive to STW requests. + let (guard, _) = ready_cvar + .wait_timeout(ready, core::time::Duration::from_millis(1)) + .unwrap(); + ready = guard; + } + }); } // Ensure cleanup happens even if the function panics @@ -1750,16 +1783,22 @@ pub(crate) mod _thread { vm.new_runtime_error("can't start new thread") })?; - // Wait until the new thread has reported its ident. + // Wait until the new thread has reported its ident. Detach while + // waiting so a concurrent stop-the-world (e.g. a GC on another thread) + // can park this thread instead of stalling on it: the child may park + // itself at startup while the world is stopped and cannot report until + // released, so the waiter must be parkable too. { let (started_lock, started_cvar) = &*started_event; - let mut started = started_lock.lock().unwrap(); - while !*started { - let (guard, _) = started_cvar - .wait_timeout(started, core::time::Duration::from_millis(1)) - .unwrap(); - started = guard; - } + vm.allow_threads(|| { + let mut started = started_lock.lock().unwrap(); + while !*started { + let (guard, _) = started_cvar + .wait_timeout(started, core::time::Duration::from_millis(1)) + .unwrap(); + started = guard; + } + }); } // Mark the handle running in the parent thread (like CPython's diff --git a/crates/vm/src/stdlib/_winapi.rs b/crates/vm/src/stdlib/_winapi.rs index f6faf6a8a..e1b86f2ef 100644 --- a/crates/vm/src/stdlib/_winapi.rs +++ b/crates/vm/src/stdlib/_winapi.rs @@ -357,7 +357,8 @@ mod _winapi { } else { ms as u32 }; - host_winapi::wait_for_single_object(h.0, ms).map_err(|e| e.to_pyexception(vm)) + vm.allow_threads(|| host_winapi::wait_for_single_object(h.0, ms)) + .map_err(|e| e.to_pyexception(vm)) } #[pyfunction] @@ -381,8 +382,10 @@ mod _winapi { return Err(vm.new_value_error("WaitForMultipleObjects supports at most 64 handles")); } - host_winapi::wait_for_multiple_objects(&handles, wait_all, milliseconds) - .map_err(|e| e.to_pyexception(vm)) + vm.allow_threads(|| { + host_winapi::wait_for_multiple_objects(&handles, wait_all, milliseconds) + }) + .map_err(|e| e.to_pyexception(vm)) } #[pyfunction] @@ -566,8 +569,7 @@ mod _winapi { #[pymethod] fn GetOverlappedResult(&self, wait: bool, vm: &VirtualMachine) -> PyResult<(u32, u32)> { let mut inner = self.inner.lock(); - inner - .get_result(wait) + vm.allow_threads(|| inner.get_result(wait)) .map(|result| (result.transferred, result.error)) .map_err(|e| e.to_pyexception(vm)) } @@ -634,7 +636,8 @@ mod _winapi { } Ok(ov.into_pyobject(vm)) } else { - host_winapi::connect_named_pipe(handle.0).map_err(|e| e.to_pyexception(vm))?; + vm.allow_threads(|| host_winapi::connect_named_pipe(handle.0)) + .map_err(|e| e.to_pyexception(vm))?; Ok(vm.ctx.none()) } } @@ -802,7 +805,9 @@ mod _winapi { return Ok(result.into()); } - let result = host_winapi::read_file(handle.0, size).map_err(|e| e.to_pyexception(vm))?; + let result = vm + .allow_threads(|| host_winapi::read_file(handle.0, size)) + .map_err(|e| e.to_pyexception(vm))?; Ok(vm .ctx .new_tuple(vec![ @@ -926,12 +931,15 @@ mod _winapi { #[cfg(not(feature = "threading"))] let sigint_event: Option<host_winapi::Handle> = None; - match host_winapi::batched_wait_for_multiple_objects( - &handles, - wait_all, - milliseconds, - sigint_event, - ) { + let batched_result = vm.allow_threads(|| { + host_winapi::batched_wait_for_multiple_objects( + &handles, + wait_all, + milliseconds, + sigint_event, + ) + }); + match batched_result { Ok(host_winapi::BatchedWaitResult::All) => Ok(vm.ctx.none()), Ok(host_winapi::BatchedWaitResult::Indices(indices)) => Ok(vm .ctx diff --git a/crates/vm/src/stdlib/gc.rs b/crates/vm/src/stdlib/gc.rs index 00eea1b39..b0007b4c8 100644 --- a/crates/vm/src/stdlib/gc.rs +++ b/crates/vm/src/stdlib/gc.rs @@ -199,15 +199,11 @@ mod gc { // PyObjects, so they never appear in get_referrers results. Since // RustPython materializes every frame as a PyObject, we must exclude // them manually to match the expected behavior. - let stack_frames: HashSet<usize> = vm - .frames - .borrow() - .iter() - .map(|fp| { - let frame: &crate::PyObject = unsafe { fp.as_ref() }.as_ref(); - frame as *const crate::PyObject as usize - }) - .collect(); + let mut stack_frames: HashSet<usize> = HashSet::new(); + crate::frame::for_each_current_frame(|frame| { + let obj: &crate::PyObject = frame.as_ref(); + stack_frames.insert(obj as *const crate::PyObject as usize); + }); let mut result = Vec::new(); diff --git a/crates/vm/src/stdlib/posix.rs b/crates/vm/src/stdlib/posix.rs index 21576e8da..80245aed0 100644 --- a/crates/vm/src/stdlib/posix.rs +++ b/crates/vm/src/stdlib/posix.rs @@ -623,7 +623,7 @@ pub mod module { run_at_forkers(before_forkers, true, vm); #[cfg(feature = "threading")] - crate::stdlib::_imp::acquire_imp_lock_for_fork(); + crate::stdlib::_imp::acquire_imp_lock_for_fork(vm); #[cfg(feature = "threading")] vm.state.stop_the_world.stop_the_world(vm); @@ -655,6 +655,17 @@ pub mod module { #[cfg(feature = "threading")] crate::object::reset_weakref_locks_after_fork(); + // Repair any type-cache entries left mid-update at fork time. + unsafe { crate::builtins::type_::type_cache_after_fork() }; + + // Reset QSBR: dead parent threads' slots would stall reclamation + // forever, and retired memory can be freed immediately in the + // single-threaded child. + #[cfg(feature = "threading")] + unsafe { + crate::object::qsbr::QSBR.reset_after_fork() + }; + // Phase 3: Clean up thread state. Locks are now reinit'd so we can // acquire them normally instead of using try_lock(). #[cfg(feature = "threading")] @@ -694,6 +705,7 @@ pub mod module { reinit_mutex_after_fork(&vm.state.atexit_funcs); reinit_mutex_after_fork(&vm.state.global_trace_func); reinit_mutex_after_fork(&vm.state.global_profile_func); + reinit_mutex_after_fork(&vm.state.type_mutex); reinit_mutex_after_fork(&vm.state.monitoring); // PyGlobalState parking_lot::Mutex locks diff --git a/crates/vm/src/stdlib/sys.rs b/crates/vm/src/stdlib/sys.rs index b8fe578f2..4e31075da 100644 --- a/crates/vm/src/stdlib/sys.rs +++ b/crates/vm/src/stdlib/sys.rs @@ -43,7 +43,7 @@ pub mod sys { hash::{PyHash, PyUHash}, }, convert::ToPyObject, - frame::{Frame, FrameRef}, + frame::FrameRef, function::{FuncArgs, KwArgs, OptionalArg, PosArgs}, stdlib::{_warnings::warn, builtins}, types::PyStructSequence, @@ -968,17 +968,9 @@ pub mod sys { #[pyfunction] fn _getframe(offset: OptionalArg<usize>, vm: &VirtualMachine) -> PyResult<FrameRef> { let offset = offset.into_option().unwrap_or(0); - let frame_ref = { - let frames = vm.frames.borrow(); - if offset >= frames.len() { - return Err(vm.new_value_error("call stack is not deep enough")); - } - - let idx = frames.len() - offset - 1; - // SAFETY: the FrameRef is alive on the call stack while it's in the Vec - let py: &crate::Py<Frame> = unsafe { frames[idx].as_ref() }; - py.to_owned() - }; + let frame_ref = crate::frame::frame_at_offset(offset) + .ok_or_else(|| vm.new_value_error("call stack is not deep enough"))?; + frame_ref.mark_escaped(); if let Ok(audit) = vm.sys_module.get_attr("audit", vm) { audit.call((vm.ctx.new_str("sys._getframe"), frame_ref.to_owned()), vm)?; @@ -998,15 +990,9 @@ pub mod sys { } // Get the frame at the specified depth - let func_obj = { - let frames = vm.frames.borrow(); - if depth >= frames.len() { - return Ok(vm.ctx.none()); - } - let idx = frames.len() - depth - 1; - // SAFETY: the FrameRef is alive on the call stack while it's in the Vec - let frame: &crate::Py<Frame> = unsafe { frames[idx].as_ref() }; - frame.func_obj.clone() + let func_obj = match crate::frame::frame_at_offset(depth) { + Some(frame) => frame.func_obj.clone(), + None => return Ok(vm.ctx.none()), }; // If the frame has a function object, return its __module__ attribute diff --git a/crates/vm/src/stdlib/sys/monitoring.rs b/crates/vm/src/stdlib/sys/monitoring.rs index accf20016..56a68cea6 100644 --- a/crates/vm/src/stdlib/sys/monitoring.rs +++ b/crates/vm/src/stdlib/sys/monitoring.rs @@ -528,9 +528,7 @@ fn update_events_mask(vm: &VirtualMachine, state: &MonitoringState) { // Each code object gets only the events that apply to it (global + its // own local events), preventing e.g. INSTRUCTION from being applied to // unrelated code objects. - for fp in vm.frames.borrow().iter() { - // SAFETY: frames in the Vec are alive while their FrameRef is on the call stack. - let frame = unsafe { fp.as_ref() }; + crate::frame::for_each_current_frame(|frame| { let code = &frame.code; let code_ver = code.instrumentation_version.load(Ordering::Acquire); if code_ver != new_ver { @@ -539,7 +537,7 @@ fn update_events_mask(vm: &VirtualMachine, state: &MonitoringState) { code.instrumentation_version .store(new_ver, Ordering::Release); } - } + }); } fn use_tool_id(tool_id: i32, name: &str, vm: &VirtualMachine) -> PyResult<()> { diff --git a/crates/vm/src/types/slot.rs b/crates/vm/src/types/slot.rs index 83d9706cb..a5d7a41d3 100644 --- a/crates/vm/src/types/slot.rs +++ b/crates/vm/src/types/slot.rs @@ -739,6 +739,18 @@ impl PyType { // Helper macro for number/sequence/mapping sub-slots macro_rules! update_sub_slot { ($group:ident, $slot:ident, $wrapper:expr, $variant:ident) => {{ + // Fall back to the value inherited for this exact field. Left and + // right binary ops (e.g. add / right_add) share one accessor but + // occupy distinct fields, so the fallback must target this field + // rather than the accessor's default field, otherwise resolving + // an absent right op would overwrite the left op's dispatcher. + let inherit_this_field = || { + let mro = self.mro.read(); + let inherited = mro[1..] + .iter() + .find_map(|cls| cls.slots.$group.$slot.load()); + self.slots.$group.$slot.store(inherited); + }; if ADD { // Check if this type defines any method that maps to this slot. // Some slots like SqAssItem/MpAssSubscript are shared by multiple @@ -760,8 +772,15 @@ impl PyType { } result }; + // Reify the wrapper at a single site so the own and inherited + // branches store the same fn item. binary_op1 compares slot + // fn addresses to decide whether a subclass overrides the op; + // duplicating the wrapper closure across branches yields + // distinct addresses in unmerged debug builds and breaks that + // comparison for an inherited slot. + let store_wrapper = || self.slots.$group.$slot.store(Some($wrapper)); if has_own { - self.slots.$group.$slot.store(Some($wrapper)); + store_wrapper(); } else { match self.lookup_slot_in_mro(name, ctx, |sf| { if let SlotFunc::$variant(f) = sf { @@ -774,15 +793,15 @@ impl PyType { self.slots.$group.$slot.store(Some(func)); } SlotLookupResult::PythonMethod => { - self.slots.$group.$slot.store(Some($wrapper)); + store_wrapper(); } SlotLookupResult::NotFound => { - accessor.inherit_from_mro(self); + inherit_this_field(); } } } } else { - accessor.inherit_from_mro(self); + inherit_this_field(); } }}; } @@ -843,12 +862,31 @@ impl PyType { } } SlotAccessor::TpNew => { - // __new__ is not wrapped via PyWrapper - if ADD { + // __new__ is a staticmethod, not a PyWrapper descriptor, so + // lookup_slot_in_mro cannot classify it. Resolve __new__ + // through the MRO dicts instead: a Python-level definition + // needs the dynamic new_wrapper, while a native type's + // builtin __new__ entry (or no entry at all) means the slot + // is inherited from the solid base, matching update_one_slot's + // tp_new special case over the tp_base-inherited value. + let needs_wrapper = if ADD && self.attributes.read().contains_key(name) { + true + } else { + // mro[0] is self, so skip it + self.mro.read()[1..] + .iter() + .find(|cls| cls.attributes.read().contains_key(name)) + .is_some_and(|cls| { + cls.slots.new.load().map(|f| f as usize) + == Some(new_wrapper as NewFunc as usize) + }) + }; + if needs_wrapper { self.slots.new.store(Some(new_wrapper)); self.slots.vectorcall.store(None); } else { - accessor.inherit_from_mro(self); + let inherited = self.base.deref().and_then(|base| base.slots.new.load()); + self.slots.new.store(inherited); } } SlotAccessor::TpDel => update_main_slot!(del, del_wrapper, Del), @@ -897,46 +935,72 @@ impl PyType { } } SlotAccessor::TpSetattro => { - // __setattr__ and __delattr__ share the same slot - if ADD { - match self.lookup_slot_in_mro(name, ctx, |sf| match sf { - SlotFunc::SetAttro(f) | SlotFunc::DelAttro(f) => Some(*f), - _ => None, - }) { - SlotLookupResult::NativeSlot(func) => { - self.slots.setattro.store(Some(func)); - } - SlotLookupResult::PythonMethod => { - self.slots.setattro.store(Some(setattro_wrapper)); - } - SlotLookupResult::NotFound => { - accessor.inherit_from_mro(self); - } + // __setattr__ and __delattr__ share the same slot, so both + // names must be resolved together: a Python-level override of + // either one forces the dispatching wrapper, and the native + // slot is only usable when every resolved name agrees on it. + // This resolution reads the current attribute dicts, so it + // applies the same whether a name was just added or removed. + let extract = |sf: &SlotFunc| match sf { + SlotFunc::SetAttro(f) | SlotFunc::DelAttro(f) => Some(*f), + _ => None, + }; + let setattr = self.lookup_slot_in_mro(identifier!(ctx, __setattr__), ctx, extract); + let delattr = self.lookup_slot_in_mro(identifier!(ctx, __delattr__), ctx, extract); + use SlotLookupResult::{NativeSlot, NotFound, PythonMethod}; + match (setattr, delattr) { + (PythonMethod, _) | (_, PythonMethod) => { + self.slots.setattro.store(Some(setattro_wrapper)); + } + (NativeSlot(set), NativeSlot(del)) => { + let func = if set as usize == del as usize { + set + } else { + setattro_wrapper + }; + self.slots.setattro.store(Some(func)); + } + (NativeSlot(func), NotFound) | (NotFound, NativeSlot(func)) => { + self.slots.setattro.store(Some(func)); + } + (NotFound, NotFound) => { + accessor.inherit_from_mro(self); } - } else { - accessor.inherit_from_mro(self); } } SlotAccessor::TpDescrGet => update_main_slot!(descr_get, descr_get_wrapper, DescrGet), SlotAccessor::TpDescrSet => { - // __set__ and __delete__ share the same slot - if ADD { - match self.lookup_slot_in_mro(name, ctx, |sf| match sf { - SlotFunc::DescrSet(f) | SlotFunc::DescrDel(f) => Some(*f), - _ => None, - }) { - SlotLookupResult::NativeSlot(func) => { - self.slots.descr_set.store(Some(func)); - } - SlotLookupResult::PythonMethod => { - self.slots.descr_set.store(Some(descr_set_wrapper)); - } - SlotLookupResult::NotFound => { - accessor.inherit_from_mro(self); - } + // __set__ and __delete__ share the same slot, so both names + // must be resolved together: a Python-level definition of + // either one forces the dispatching wrapper, and the native + // slot is only usable when every resolved name agrees on it. + // This resolution reads the current attribute dicts, so it + // applies the same whether a name was just added or removed. + let extract = |sf: &SlotFunc| match sf { + SlotFunc::DescrSet(f) | SlotFunc::DescrDel(f) => Some(*f), + _ => None, + }; + let set = self.lookup_slot_in_mro(identifier!(ctx, __set__), ctx, extract); + let delete = self.lookup_slot_in_mro(identifier!(ctx, __delete__), ctx, extract); + use SlotLookupResult::{NativeSlot, NotFound, PythonMethod}; + match (set, delete) { + (PythonMethod, _) | (_, PythonMethod) => { + self.slots.descr_set.store(Some(descr_set_wrapper)); + } + (NativeSlot(set), NativeSlot(delete)) => { + let func = if set as usize == delete as usize { + set + } else { + descr_set_wrapper + }; + self.slots.descr_set.store(Some(func)); + } + (NativeSlot(func), NotFound) | (NotFound, NativeSlot(func)) => { + self.slots.descr_set.store(Some(func)); + } + (NotFound, NotFound) => { + accessor.inherit_from_mro(self); } - } else { - accessor.inherit_from_mro(self); } } diff --git a/crates/vm/src/types/slot_defs.rs b/crates/vm/src/types/slot_defs.rs index 8637f8112..34d62147e 100644 --- a/crates/vm/src/types/slot_defs.rs +++ b/crates/vm/src/types/slot_defs.rs @@ -608,7 +608,7 @@ impl SlotAccessor { if typ.slots.init.load().is_none() && let Some(base_val) = base.slots.init.load() { - let slot_defined = base.base.as_ref().is_none_or(|bb| { + let slot_defined = base.base.deref().is_none_or(|bb| { bb.slots.init.load().map(|v| v as usize) != Some(base_val as usize) }); if slot_defined { diff --git a/crates/vm/src/types/zoo.rs b/crates/vm/src/types/zoo.rs index 13d439345..64807fc09 100644 --- a/crates/vm/src/types/zoo.rs +++ b/crates/vm/src/types/zoo.rs @@ -2,10 +2,10 @@ use crate::{ Py, builtins::{ asyncgenerator, bool_, builtin_func, bytearray, bytes, capsule, classmethod, code, complex, - coroutine, descriptor, dict, enumerate, filter, float, frame, function, generator, - genericalias, getset, int, interpolation, iter, list, map, mappingproxy, memory, module, - namespace, object, property, pystr, range, set, singletons, slice, staticmethod, super_, - template, traceback, tuple, + coroutine, descriptor, dict, enumerate, filter, float, frame, frame_locals_proxy, function, + generator, genericalias, getset, int, interpolation, iter, list, map, mappingproxy, memory, + module, namespace, object, property, pystr, range, set, singletons, slice, staticmethod, + super_, template, traceback, tuple, type_::{self, PyType}, union_, weakproxy, weakref, zip, }, @@ -39,6 +39,7 @@ pub struct TypeZoo { pub filter_type: &'static Py<PyType>, pub float_type: &'static Py<PyType>, pub frame_type: &'static Py<PyType>, + pub frame_locals_proxy_type: &'static Py<PyType>, pub frozenset_type: &'static Py<PyType>, pub generator_type: &'static Py<PyType>, pub int_type: &'static Py<PyType>, @@ -178,6 +179,7 @@ impl TypeZoo { dict_reverseitemiterator_type: dict::PyDictReverseItemIterator::init_builtin_type(), ellipsis_type: slice::PyEllipsis::init_builtin_type(), frame_type: crate::frame::Frame::init_builtin_type(), + frame_locals_proxy_type: frame_locals_proxy::FrameLocalsProxy::init_builtin_type(), function_type: function::PyFunction::init_builtin_type(), generator_type: generator::PyGenerator::init_builtin_type(), getset_type: getset::PyGetSet::init_builtin_type(), @@ -253,6 +255,7 @@ impl TypeZoo { bool_::init(context); code::init(context); frame::init(context); + frame_locals_proxy::init(context); weakref::init(context); weakproxy::init(context); singletons::init(context); diff --git a/crates/vm/src/vm/context.rs b/crates/vm/src/vm/context.rs index 226d5f1a1..9a5456635 100644 --- a/crates/vm/src/vm/context.rs +++ b/crates/vm/src/vm/context.rs @@ -14,7 +14,6 @@ use crate::{ object, pystr, type_::PyAttributes, }, - bytecode::{self, CodeFlags, CodeUnit, Instruction, Opcode}, class::StaticType, common::rc::PyRc, exceptions, @@ -31,7 +30,6 @@ use malachite_bigint::BigInt; use num_complex::Complex64; use num_traits::ToPrimitive; use rustpython_common::lock::PyRwLock; -use rustpython_compiler_core::{OneIndexed, SourceLocation}; #[derive(Debug)] pub struct Context { @@ -52,7 +50,6 @@ pub struct Context { pub int_cache_pool: Vec<PyIntRef>, pub(crate) latin1_char_cache: Vec<PyRef<PyStr>>, pub(crate) ascii_char_cache: Vec<PyRef<PyStr>>, - pub(crate) init_cleanup_code: PyRef<PyCode>, // there should only be exact objects of str in here, no non-str objects and no subclasses pub(crate) string_pool: StringPool, pub(crate) slot_new_wrapper: PyMethodDef, @@ -362,8 +359,6 @@ impl Context { PyMethodFlags::METHOD, None, ); - let init_cleanup_code = Self::new_init_cleanup_code(&types, &names); - let empty_str = unsafe { string_pool.intern("", types.str_type.to_owned()) }; let empty_bytes = create_object(PyBytes::from(Vec::new()), types.bytes_type); @@ -389,7 +384,6 @@ impl Context { int_cache_pool, latin1_char_cache, ascii_char_cache, - init_cleanup_code, string_pool, slot_new_wrapper, names, @@ -399,49 +393,6 @@ impl Context { } } - fn new_init_cleanup_code(types: &TypeZoo, names: &ConstName) -> PyRef<PyCode> { - let loc = SourceLocation { - line: OneIndexed::MIN, - character_offset: OneIndexed::from_zero_indexed(0), - }; - let instructions = [ - CodeUnit { - op: Instruction::ExitInitCheck, - arg: 0.into(), - }, - CodeUnit { - op: Instruction::ReturnValue, - arg: 0.into(), - }, - CodeUnit { - op: Opcode::Resume.into(), - arg: 0.into(), - }, - ]; - let code = bytecode::CodeObject { - instructions: instructions.into(), - locations: vec![(loc, loc); instructions.len()].into_boxed_slice(), - flags: CodeFlags::OPTIMIZED, - posonlyarg_count: 0, - arg_count: 0, - kwonlyarg_count: 0, - source_path: names.__init__, - first_line_number: None, - max_stackdepth: 2, - obj_name: names.__init__, - qualname: names.__init__, - constants: core::iter::empty().collect(), - names: Vec::new().into_boxed_slice(), - varnames: Vec::new().into_boxed_slice(), - cellvars: Vec::new().into_boxed_slice(), - freevars: Vec::new().into_boxed_slice(), - localspluskinds: Vec::new().into_boxed_slice(), - linetable: Vec::new().into_boxed_slice(), - exceptiontable: Vec::new().into_boxed_slice(), - }; - PyRef::new_ref(PyCode::new(code), types.code_type.to_owned(), None) - } - pub fn intern_str<S: InternableString>(&self, s: S) -> &'static PyStrInterned { unsafe { self.string_pool.intern(s, self.types.str_type.to_owned()) } } diff --git a/crates/vm/src/vm/interpreter.rs b/crates/vm/src/vm/interpreter.rs index 56c9606f7..f456e8587 100644 --- a/crates/vm/src/vm/interpreter.rs +++ b/crates/vm/src/vm/interpreter.rs @@ -1,4 +1,4 @@ -#[cfg(all(unix, feature = "threading"))] +#[cfg(feature = "threading")] use super::StopTheWorldState; use super::{Context, PyConfig, PyGlobalState, VirtualMachine, setting::Settings, thread}; use crate::{ @@ -122,6 +122,7 @@ where switch_interval: AtomicCell::new(0.005), global_trace_func: PyMutex::default(), global_profile_func: PyMutex::default(), + type_mutex: PyMutex::default(), #[cfg(feature = "threading")] main_thread_ident: AtomicCell::new(0), #[cfg(feature = "threading")] @@ -133,7 +134,7 @@ where monitoring: PyMutex::default(), monitoring_events: AtomicCell::new(0), instrumentation_version: AtomicU64::new(0), - #[cfg(all(unix, feature = "threading"))] + #[cfg(feature = "threading")] stop_the_world: StopTheWorldState::new(), }); @@ -149,7 +150,12 @@ where // Call custom init function (can mutate vm.state) init(&mut vm); + // `initialize()` runs Python bytecode directly (e.g. importing `codecs` + // and `encodings`) before any `enter_vm` scope exists, so attach this + // thread for the duration so type cache reads see it as ATTACHED. + let vm_guard = thread::VmBootstrapGuard::new(&vm); vm.initialize(); + drop(vm_guard); // Clone global_state for Interpreter after all initialization is done let global_state = vm.state.clone(); @@ -461,11 +467,18 @@ impl Interpreter { } // Match CPython: if exit_code is 0 and stdout flush failed, exit 120 - if exit_code == 0 && flush_status < 0 { + let exit_code = if exit_code == 0 && flush_status < 0 { EXITCODE_FLUSH_FAILURE } else { exit_code - } + }; + + // Daemon threads may still exist, so use the safe `process()`, + // not `drain_all()`. + #[cfg(feature = "threading")] + crate::object::qsbr::QSBR.process(); + + exit_code }) } } diff --git a/crates/vm/src/vm/mod.rs b/crates/vm/src/vm/mod.rs index 8ad8a0d0b..852e57cc0 100644 --- a/crates/vm/src/vm/mod.rs +++ b/crates/vm/src/vm/mod.rs @@ -44,11 +44,12 @@ use crate::{ warn::WarningsState, }; use alloc::{borrow::Cow, collections::BTreeMap}; -#[cfg(all(unix, feature = "threading"))] +#[cfg(all(not(unix), feature = "threading"))] +use core::ptr::NonNull; +#[cfg(feature = "threading")] use core::sync::atomic::AtomicI64; use core::{ cell::{Cell, OnceCell, RefCell}, - ptr::NonNull, sync::atomic::{AtomicBool, AtomicU64, Ordering}, }; use crossbeam_utils::atomic::AtomicCell; @@ -74,7 +75,6 @@ pub struct VirtualMachine { pub builtins: PyRef<PyModule>, pub sys_module: PyRef<PyModule>, pub ctx: PyRc<Context>, - pub frames: RefCell<Vec<FramePtr>>, /// Thread-local data stack for bump-allocating frame-local data /// (localsplus arrays for non-generator frames). datastack: core::cell::UnsafeCell<crate::datastack::DataStack>, @@ -108,11 +108,15 @@ pub struct VirtualMachine { pub(crate) audit_hooks: RefCell<Vec<PyObjectRef>>, } -/// Non-owning frame pointer for the frames stack. +/// Non-owning frame pointer for the non-unix threading frames stack. /// The pointed-to frame is kept alive by the caller of with_frame/resume_gen_frame. +/// Unix threading builds publish the top frame through `ThreadSlot::top_frame` +/// and walk the rest via `Frame::previous`, so they do not use this type. +#[cfg(all(not(unix), feature = "threading"))] #[derive(Copy, Clone)] pub struct FramePtr(NonNull<Py<Frame>>); +#[cfg(all(not(unix), feature = "threading"))] impl FramePtr { /// # Safety /// The pointed-to frame must still be alive. @@ -122,8 +126,10 @@ impl FramePtr { } } -// SAFETY: FramePtr is only stored in the VM's frames Vec while the corresponding -// FrameRef is alive on the call stack. The Vec is always empty when the VM moves between threads. +// SAFETY: FramePtr is only stored in a thread's shared frame stack +// (`ThreadSlot::frames`) while the corresponding FrameRef is alive on that +// thread's call stack; readers dereference it under the slot mutex. +#[cfg(all(not(unix), feature = "threading"))] unsafe impl Send for FramePtr {} #[derive(Debug)] @@ -143,7 +149,7 @@ impl Default for ExceptionStack { /// Stop-the-world state for fork safety. Before `fork()`, the requester /// stops all other Python threads so they are not holding internal locks. -#[cfg(all(unix, feature = "threading"))] +#[cfg(feature = "threading")] pub struct StopTheWorldState { /// Fast-path flag checked in the bytecode loop (like `_PY_EVAL_PLEASE_STOP_BIT`) pub(crate) requested: AtomicBool, @@ -151,6 +157,11 @@ pub struct StopTheWorldState { world_stopped: AtomicBool, /// Ident of the thread that requested the stop (like `stw->requester`) requester: AtomicU64, + /// Single exclusion held for the whole stop→start span. Fork and GC are + /// both stop-the-world requesters driving this shared state; only one may + /// hold it at a time. Acquired before any stop bookkeeping (see + /// `acquire_exclusion`) and released by `start_the_world`/`reset_after_fork`. + exclusion: AtomicBool, /// Signaled by suspending threads when their state transitions to SUSPENDED notify_mutex: std::sync::Mutex<()>, notify_cv: std::sync::Condvar, @@ -178,7 +189,7 @@ pub struct StopTheWorldState { stats_suspend_wait_yields: AtomicU64, } -#[cfg(all(unix, feature = "threading"))] +#[cfg(feature = "threading")] #[derive(Debug, Clone, Copy)] pub struct StopTheWorldStats { pub stop_calls: u64, @@ -194,14 +205,14 @@ pub struct StopTheWorldStats { pub world_stopped: bool, } -#[cfg(all(unix, feature = "threading"))] +#[cfg(feature = "threading")] impl Default for StopTheWorldState { fn default() -> Self { Self::new() } } -#[cfg(all(unix, feature = "threading"))] +#[cfg(feature = "threading")] impl StopTheWorldState { #[must_use] pub const fn new() -> Self { @@ -209,6 +220,7 @@ impl StopTheWorldState { requested: AtomicBool::new(false), world_stopped: AtomicBool::new(false), requester: AtomicU64::new(0), + exclusion: AtomicBool::new(false), notify_mutex: std::sync::Mutex::new(()), notify_cv: std::sync::Condvar::new(), thread_countdown: AtomicI64::new(0), @@ -336,20 +348,76 @@ impl StopTheWorldState { forced_parks != 0 && self.thread_countdown.load(Ordering::Acquire) == 0 } + /// Acquire the single stop-the-world exclusion in a park-friendly way. + /// + /// Fork and GC both request stop-the-world through the same shared state; + /// without this exclusion their `requester`/`requested`/countdown words + /// could be clobbered by an interleaving requester, so the completion + /// check could never converge and a requester would wait on itself forever. + /// + /// The acquire must be park-friendly. While another requester's stop is in + /// progress it sets this thread's stop bit and waits for it to suspend; + /// blocking on a plain lock here would keep this thread from ever reaching + /// that safepoint, so the active requester would wait for this thread while + /// this thread waits for the lock — a deadlock swap. Instead we poll and + /// honor the suspend request between tries. Suspending here is safe as long + /// as any lock a spinning requester still holds is never acquired + /// attached-blocking by another thread. The fork requester holds IMP_LOCK, + /// but its acquisition detaches (`allow_threads`), so no attached thread + /// blocks on it; the GC requester holds only the `collecting` mutex, which + /// is only ever `try_lock`'d. The active requester therefore force-parks + /// this thread, finishes its whole stop→start span, releases the exclusion, + /// and only then does this thread resume and acquire it. + fn acquire_exclusion(&self) { + if self + .exclusion + .compare_exchange(false, true, Ordering::AcqRel, Ordering::Relaxed) + .is_ok() + { + return; + } + loop { + crate::vm::thread::suspend_if_needed(self); + std::thread::yield_now(); + if self + .exclusion + .compare_exchange(false, true, Ordering::AcqRel, Ordering::Relaxed) + .is_ok() + { + return; + } + } + } + + /// Release the stop-the-world exclusion taken by `acquire_exclusion`. + fn release_exclusion(&self) { + self.exclusion.store(false, Ordering::Release); + } + /// Stop all non-requester threads (`stop_the_world`). /// /// 1. Sets `requested`, marking the requester thread. /// 2. CAS detached threads to SUSPENDED. /// 3. Waits (polling with 1 ms condvar timeout) for attached threads /// to self-suspend in `check_signals`. + /// + /// Takes the shared exclusion first so at most one requester (fork or GC) + /// drives the stop→start span at a time; it is released by + /// `start_the_world`/`reset_after_fork`. pub fn stop_the_world(&self, vm: &VirtualMachine) { + self.acquire_exclusion(); let start = std::time::Instant::now(); let requester_ident = crate::stdlib::_thread::get_ident(); self.requester.store(requester_ident, Ordering::Relaxed); self.stats_stop_calls.fetch_add(1, Ordering::Relaxed); let initial_countdown = self.init_thread_countdown(vm); stw_trace(format_args!("stop begin requester={requester_ident}")); - if initial_countdown == 0 { + // Park detached threads and set stop bits, then confirm every other + // thread is SUSPENDED. The completion condition is level-triggered + // (`all_non_requester_suspended`) so an already-suspended thread that + // was counted but will not notify again cannot stall the stop. + self.park_detached_threads(vm); + if initial_countdown == 0 || self.all_non_requester_suspended(vm) { self.world_stopped.store(true, Ordering::Release); #[cfg(debug_assertions)] self.debug_assert_all_non_requester_suspended(vm); @@ -361,7 +429,8 @@ impl StopTheWorldState { let mut polls = 0u64; loop { - if self.park_detached_threads(vm) { + self.park_detached_threads(vm); + if self.all_non_requester_suspended(vm) { break; } polls = polls.saturating_add(1); @@ -369,8 +438,7 @@ impl StopTheWorldState { // Re-check under the wait mutex first to avoid a lost-wake race: // a thread may have suspended and notified right before we enter wait. let guard = self.notify_mutex.lock().unwrap(); - if self.thread_countdown.load(Ordering::Acquire) == 0 || self.park_detached_threads(vm) - { + if self.all_non_requester_suspended(vm) { drop(guard); break; } @@ -445,6 +513,9 @@ impl StopTheWorldState { self.requester.store(0, Ordering::Relaxed); #[cfg(debug_assertions)] self.debug_assert_all_non_requester_detached(vm); + // Release the exclusion last, ending the stop→start span so the next + // requester (fork or GC) can proceed. + self.release_exclusion(); stw_trace(format_args!("start end requester={requester}")); } @@ -454,6 +525,9 @@ impl StopTheWorldState { self.world_stopped.store(false, Ordering::Relaxed); self.requester.store(0, Ordering::Relaxed); self.thread_countdown.store(0, Ordering::Relaxed); + // The surviving child thread inherited the exclusion taken by the + // pre-fork `stop_the_world`; release it (no start_the_world runs here). + self.release_exclusion(); stw_trace(format_args!("reset-after-fork")); } @@ -514,6 +588,33 @@ impl StopTheWorldState { } } + /// Whether every non-requester registered thread is currently SUSPENDED. + /// + /// Level-triggered stop-the-world completion check. Relying on this rather + /// than solely on the edge-triggered `thread_countdown` avoids a + /// lost-decrement race under rapid back-to-back stops: a thread that is + /// already SUSPENDED when a new stop counts it neither notifies nor is + /// force-parked again, so an edge-based countdown could never reach zero. + fn all_non_requester_suspended(&self, vm: &VirtualMachine) -> bool { + use thread::THREAD_SUSPENDED; + let requester = self.requester.load(Ordering::Relaxed); + let registry = vm.state.thread_frames.lock(); + + #[expect( + clippy::iter_over_hash_type, + reason = "Iteration order doesn't matter here" + )] + for (&id, slot) in registry.iter() { + if id == requester { + continue; + } + if slot.state.load(Ordering::Acquire) != THREAD_SUSPENDED { + return false; + } + } + true + } + #[cfg(debug_assertions)] fn debug_assert_all_non_requester_suspended(&self, vm: &VirtualMachine) { use thread::THREAD_SUSPENDED; @@ -561,13 +662,13 @@ impl StopTheWorldState { } } -#[cfg(all(unix, feature = "threading"))] +#[cfg(feature = "threading")] pub(super) fn stw_trace_enabled() -> bool { static ENABLED: std::sync::OnceLock<bool> = std::sync::OnceLock::new(); *ENABLED.get_or_init(|| crate::host_env::os::var_os("RUSTPYTHON_STW_TRACE").is_some()) } -#[cfg(all(unix, feature = "threading"))] +#[cfg(feature = "threading")] pub(super) fn stw_trace(msg: core::fmt::Arguments<'_>) { if stw_trace_enabled() { use core::fmt::Write as _; @@ -603,7 +704,13 @@ pub(super) fn stw_trace(msg: core::fmt::Arguments<'_>) { crate::stdlib::_thread::get_ident(), msg ); + #[cfg(unix)] crate::host_env::io::write_stderr_raw(&out.buf[..out.len]); + #[cfg(not(unix))] + { + use std::io::Write as _; + let _ = std::io::stderr().write_all(&out.buf[..out.len]); + } } } @@ -637,6 +744,8 @@ pub struct PyGlobalState { pub global_trace_func: PyMutex<Option<PyObjectRef>>, /// Global profile function for all threads (set by sys._setprofileallthreads) pub global_profile_func: PyMutex<Option<PyObjectRef>>, + /// Global type mutation/versioning mutex for CPython-style FT type operations. + pub type_mutex: PyMutex<()>, /// Main thread identifier (pthread_self on Unix) #[cfg(feature = "threading")] pub main_thread_ident: AtomicCell<u64>, @@ -657,7 +766,7 @@ pub struct PyGlobalState { /// local version against this to decide whether re-instrumentation is needed. pub instrumentation_version: AtomicU64, /// Stop-the-world state for pre-fork thread suspension - #[cfg(all(unix, feature = "threading"))] + #[cfg(feature = "threading")] pub stop_the_world: StopTheWorldState, } @@ -759,7 +868,6 @@ impl VirtualMachine { builtins, sys_module, ctx, - frames: RefCell::new(vec![]), datastack: core::cell::UnsafeCell::new(crate::datastack::DataStack::new()), wasm_id: None, exceptions: RefCell::default(), @@ -1219,6 +1327,15 @@ impl VirtualMachine { #[inline(always)] pub fn run_frame(&self, frame: FrameRef) -> PyResult { + // Only ordinary (datastack) call frames reach `run_frame`; generator + // and coroutine frames are resumed through `resume_gen_frame`. A + // datastack frame is created untracked and is tracked lazily only when + // it escapes, which happens no earlier than `release_datastack_frame` + // after this call returns. So it must be untracked on entry. + debug_assert!( + !frame.as_object().is_gc_tracked(), + "datastack frame is GC-tracked before execution" + ); match self.with_frame(frame, |f| f.run(self))? { ExecutionResult::Return(value) => Ok(value), _ => panic!("Got unexpected result from function"), @@ -1458,7 +1575,7 @@ impl VirtualMachine { /// evaluation consumes more native stack in those configurations. #[cfg_attr(any(miri, target_env = "musl"), allow(dead_code))] const STACK_MARGIN_BYTES: usize = - (if cfg!(debug_assertions) { 4096 } else { 2048 }) * core::mem::size_of::<usize>(); + (if cfg!(debug_assertions) { 16384 } else { 2048 }) * core::mem::size_of::<usize>(); /// Get the stack boundaries using platform-specific APIs. /// Returns (base, top) where base is the lowest address and top is the highest. @@ -1519,11 +1636,16 @@ impl VirtualMachine { } /// Calculate the C stack soft limit based on actual stack boundaries. - /// soft_limit = base + 2 * margin (for downward-growing stacks) + /// soft_limit = base + 2 * margin (for downward-growing stacks). + /// The margin is clamped to half the stack so threads created with a stack + /// smaller than 2 * (2 * margin) still get usable headroom instead of a + /// soft limit above their stack top (which would trip on entry). #[cfg(all(not(miri), not(target_env = "musl")))] fn calculate_c_stack_soft_limit() -> usize { - let (base, _top) = Self::get_stack_bounds(); - base + Self::STACK_MARGIN_BYTES * 2 + let (base, top) = Self::get_stack_bounds(); + let stack_size = top.saturating_sub(base); + let margin = (Self::STACK_MARGIN_BYTES * 2).min(stack_size / 2); + base + margin } /// Musl currently reports stack bounds in a way that trips the VM's @@ -1535,15 +1657,14 @@ impl VirtualMachine { } /// Check if we're near the C stack limit (like _Py_MakeRecCheck). - /// Returns true only when stack pointer is in the "danger zone" between - /// soft_limit and hard_limit (soft_limit - 2*margin). + /// One-sided: any stack pointer below the soft limit is in danger, since a + /// single native frame can exceed the margin and step past it. #[cfg(all(not(miri), not(target_env = "musl")))] #[inline(always)] fn check_c_stack_overflow(&self) -> bool { let current_sp = psm::stack_pointer() as usize; let soft_limit = self.c_stack_soft_limit.get(); current_sp < soft_limit - && current_sp >= soft_limit.saturating_sub(Self::STACK_MARGIN_BYTES * 2) } /// Miri does not support the native stack probe, and musl currently trips @@ -1574,34 +1695,19 @@ impl VirtualMachine { &self, frame: FrameRef, f: F, - ) -> PyResult<R> { - self.with_frame_impl(frame, true, f) - } - - pub(crate) fn with_frame_untraced<R, F: FnOnce(FrameRef) -> PyResult<R>>( - &self, - frame: FrameRef, - f: F, - ) -> PyResult<R> { - self.with_frame_impl(frame, false, f) - } - - fn with_frame_impl<R, F: FnOnce(FrameRef) -> PyResult<R>>( - &self, - frame: FrameRef, - traced: bool, - f: F, ) -> PyResult<R> { self.with_recursion("", || { // SAFETY: `frame` (FrameRef) stays alive for the entire closure scope, // keeping the FramePtr valid. We pass a clone to `f` so that `f` // consuming its FrameRef doesn't invalidate our pointer. - let fp = FramePtr(NonNull::from(&*frame)); - self.frames.borrow_mut().push(fp); - // Update the shared frame stack for sys._current_frames() and faulthandler - #[cfg(feature = "threading")] - crate::vm::thread::push_thread_frame(fp); - // Link frame into the signal-safe frame chain (previous pointer) + // Publish the frame for sys._current_frames() and faulthandler. + // On unix, set_current_frame below publishes the top frame into the + // thread slot; only non-unix builds maintain the mutex-guarded Vec. + #[cfg(all(not(unix), feature = "threading"))] + crate::vm::thread::push_thread_frame(FramePtr(NonNull::from(&*frame))); + // Link frame into the signal-safe frame chain (previous pointer). + // This chain is the single source for the current thread's frame + // stack (current_frame, sys._getframe, f_back, monitoring). let old_frame = crate::vm::thread::set_current_frame((&**frame) as *const Frame); frame.previous.store( old_frame as *mut Frame, @@ -1613,27 +1719,31 @@ impl VirtualMachine { // exc_info pollution from frames with unbalanced // PUSH_EXC_INFO/POP_EXCEPT (e.g., exception escaping an except block // whose cleanup entry is missing from the exception table). - let saved_exc = self.current_exception(); + // A callee whose bytecode never mutates the slot cannot pollute it, + // so the save/restore is skipped for it. + let save_exc = frame.code.has_exc_handling; + let saved_exc = if save_exc { + self.current_exception() + } else { + None + }; let old_owner = frame.owner.swap( crate::frame::FrameOwner::Thread as i8, core::sync::atomic::Ordering::AcqRel, ); - // Ensure cleanup on panic: restore owner, exc_info, frame chain, and frames Vec. + // Ensure cleanup on panic: restore owner, exc_info, and frame chain. scopeguard::defer! { frame.owner.store(old_owner, core::sync::atomic::Ordering::Release); - self.set_exception(saved_exc); + if save_exc { + self.restore_exception(saved_exc); + } crate::vm::thread::set_current_frame(old_frame); - self.frames.borrow_mut().pop(); - #[cfg(feature = "threading")] + #[cfg(all(not(unix), feature = "threading"))] crate::vm::thread::pop_thread_frame(); } - if traced { - self.dispatch_traced_frame(&frame, |frame| f(frame.to_owned())) - } else { - f(frame.to_owned()) - } + self.dispatch_traced_frame(&frame, |frame| f(frame.to_owned())) }) } @@ -1653,10 +1763,8 @@ impl VirtualMachine { self.recursion_depth.update(|d| d + 1); // SAFETY: frame (&FrameRef) stays alive for the duration, so NonNull is valid until pop. - let fp = FramePtr(NonNull::from(&**frame)); - self.frames.borrow_mut().push(fp); - #[cfg(feature = "threading")] - crate::vm::thread::push_thread_frame(fp); + #[cfg(all(not(unix), feature = "threading"))] + crate::vm::thread::push_thread_frame(FramePtr(NonNull::from(&**frame))); let old_frame = crate::vm::thread::set_current_frame((&***frame) as *const Frame); frame.previous.store( old_frame as *mut Frame, @@ -1677,8 +1785,7 @@ impl VirtualMachine { frame.owner.store(old_owner, core::sync::atomic::Ordering::Release); self.pop_exception(); crate::vm::thread::set_current_frame(old_frame); - self.frames.borrow_mut().pop(); - #[cfg(feature = "threading")] + #[cfg(all(not(unix), feature = "threading"))] crate::vm::thread::pop_thread_frame(); self.recursion_depth.update(|d| d - 1); @@ -1768,10 +1875,7 @@ impl VirtualMachine { } pub fn current_frame(&self) -> Option<FrameRef> { - self.frames.borrow().last().map(|fp| { - // SAFETY: the caller keeps the FrameRef alive while it's in the Vec - unsafe { fp.as_ref() }.to_owned() - }) + crate::frame::current_thread_frame() } pub fn current_locals(&self) -> PyResult<ArgMapping> { @@ -2034,13 +2138,15 @@ impl VirtualMachine { return true; } - #[cfg(all(unix, feature = "threading"))] + #[cfg(feature = "threading")] if thread::stop_requested_for_current_thread() { return true; } + // Signal and QSBR bits share one word: a single relaxed load per + // instruction covers both. #[cfg(not(target_arch = "wasm32"))] - if crate::signal::is_triggered() { + if crate::signal::eval_breaker_pending() { return true; } @@ -2059,15 +2165,33 @@ impl VirtualMachine { } // Suspend this thread if stop-the-world is in progress - #[cfg(all(unix, feature = "threading"))] + #[cfg(feature = "threading")] thread::suspend_if_needed(&self.state.stop_the_world); + // Pass a QSBR checkpoint if requested (deferred memory reclamation). + #[cfg(feature = "threading")] + if crate::signal::qsbr_bit_set() && thread::qsbr_break_requested() { + thread::qsbr_checkpoint(); + } + #[cfg(not(target_arch = "wasm32"))] crate::signal::check_signals(self)?; Ok(()) } + /// Run an automatic collection scheduled by `maybe_collect`, if any. + /// + /// Called only from the bytecode-loop safepoint, where no interpreter + /// locks are held, so the stop-the-world it performs cannot deadlock + /// against a thread blocked on a lock this thread would otherwise hold. + #[cfg(feature = "threading")] + pub(crate) fn run_scheduled_gc(&self) { + if crate::signal::take_gc_scheduled() { + crate::gc_state::gc_state().collect(0); + } + } + /// Push a new exc_info slot (for generator/coroutine resume). pub(crate) fn push_exception(&self, exc: Option<PyBaseExceptionRef>) { self.exceptions.borrow_mut().stack.push(exc); @@ -2112,6 +2236,25 @@ impl VirtualMachine { thread::update_thread_exception(self.topmost_exception()); } + /// Restore an exc_info slot value saved by `with_frame`, skipping the + /// store when the slot is unchanged. `saved` is a strong reference taken + /// at save time, so the object it points to cannot have been freed and + /// its address reused while the frame ran; pointer identity therefore + /// proves the slot still holds the same value and both the store and the + /// thread-exception mirror update would be no-ops. + pub(crate) fn restore_exception(&self, saved: Option<PyBaseExceptionRef>) { + let excs = self.exceptions.borrow(); + let unchanged = match (excs.stack.last(), &saved) { + (Some(Some(current)), Some(saved)) => current.is(saved), + (Some(None), None) => true, + _ => false, + }; + drop(excs); + if !unchanged { + self.set_exception(saved); + } + } + pub fn take_raised_exception(&self) -> Option<PyBaseExceptionRef> { let mut excs = self.exceptions.borrow_mut(); if let Some(top) = excs.stack.last_mut() { diff --git a/crates/vm/src/vm/thread.rs b/crates/vm/src/vm/thread.rs index 5e73cc5f6..5009cb695 100644 --- a/crates/vm/src/vm/thread.rs +++ b/crates/vm/src/vm/thread.rs @@ -1,4 +1,4 @@ -#[cfg(feature = "threading")] +#[cfg(all(not(unix), feature = "threading"))] use super::FramePtr; #[cfg(feature = "threading")] use crate::builtins::PyBaseExceptionRef; @@ -19,30 +19,40 @@ use std::thread_local; // DETACHED: not executing Python bytecode (in native code, or idle) // ATTACHED: actively executing Python bytecode // SUSPENDED: parked by a stop-the-world request -#[cfg(all(unix, feature = "threading"))] +#[cfg(feature = "threading")] pub const THREAD_DETACHED: i32 = 0; -#[cfg(all(unix, feature = "threading"))] +#[cfg(feature = "threading")] pub const THREAD_ATTACHED: i32 = 1; -#[cfg(all(unix, feature = "threading"))] +#[cfg(feature = "threading")] pub const THREAD_SUSPENDED: i32 = 2; /// Per-thread shared state for sys._current_frames() and sys._current_exceptions(). /// The exception field uses atomic operations for lock-free cross-thread reads. #[cfg(feature = "threading")] pub struct ThreadSlot { + /// Top of the owning thread's Python call stack, published for + /// cross-thread readers (`sys._current_frames`, cross-thread `f_back`). + /// The rest of the stack is reachable via each frame's `previous` pointer. + /// Written lock-free on the hot push/pop path with relaxed ordering; every + /// cross-thread read runs under stop-the-world, which parks the owning + /// thread at a safepoint and supplies the happens-before edge, so the + /// pointer and the frames it reaches are quiescent and alive at read time. + #[cfg(unix)] + pub top_frame: AtomicPtr<Frame>, /// Raw frame pointers, valid while the owning thread's call stack is active. /// Readers must hold the Mutex and convert to FrameRef inside the lock. + /// Used on non-unix threading builds, which have no stop-the-world. + #[cfg(not(unix))] pub frames: parking_lot::Mutex<Vec<FramePtr>>, pub exception: crate::PyAtomicRef<Option<crate::exceptions::types::PyBaseException>>, /// Thread state for stop-the-world: DETACHED / ATTACHED / SUSPENDED - #[cfg(unix)] pub state: core::sync::atomic::AtomicI32, /// Per-thread stop request bit (eval breaker equivalent). - #[cfg(unix)] pub stop_requested: core::sync::atomic::AtomicBool, /// Handle for waking this thread from park in stop-the-world paths. - #[cfg(unix)] pub thread: std::thread::Thread, + /// QSBR state for deferred memory reclamation. + pub(crate) qsbr: Arc<crate::object::qsbr::QsbrSlot>, } #[cfg(feature = "threading")] @@ -79,6 +89,15 @@ thread_local! { pub(crate) static CURRENT_FRAME: AtomicPtr<Frame> = const { AtomicPtr::new(core::ptr::null_mut()) }; + /// Cached pointer to this thread's `ThreadSlot::top_frame`, so the hot + /// push/pop path can publish the top frame with a single relaxed store and + /// no `CURRENT_THREAD_SLOT` RefCell borrow. Null until the slot is + /// initialized; the `Arc<ThreadSlot>` in `CURRENT_THREAD_SLOT` keeps the + /// pointee alive until `cleanup_current_thread_frames` clears this. + #[cfg(all(unix, feature = "threading"))] + static CURRENT_TOP_FRAME_SLOT: Cell<*const AtomicPtr<Frame>> = + const { Cell::new(core::ptr::null()) }; + } #[must_use] @@ -109,23 +128,32 @@ fn set_current_vm<R>(vm: &VirtualMachine, f: impl FnOnce() -> R) -> R { }) } +pub fn try_with_current_vm<R>(f: impl FnOnce(&VirtualMachine) -> R) -> Option<R> { + VM_STACK.with(|vms| { + let vm = vms.borrow().last().copied()?; + // SAFETY: entries in VM_STACK either borrow a VM for the dynamic + // scope of a set_current_vm()/enter_vm() call or point at GILSTATE_VM. + Some(f(unsafe { vm.as_ref() })) + }) +} + pub fn enter_vm<R>(vm: &VirtualMachine, f: impl FnOnce() -> R) -> R { // Outermost enter_vm: transition DETACHED → ATTACHED - #[cfg(all(unix, feature = "threading"))] + #[cfg(feature = "threading")] let was_outermost = !current_vm_is_set(); // Initialize thread slot for this thread if not already done #[cfg(feature = "threading")] init_thread_slot_if_needed(vm); - #[cfg(all(unix, feature = "threading"))] + #[cfg(feature = "threading")] if was_outermost { attach_thread(vm); } scopeguard::defer! { // Outermost exit: transition ATTACHED → DETACHED - #[cfg(all(unix, feature = "threading"))] + #[cfg(feature = "threading")] if was_outermost { detach_thread(); } @@ -134,6 +162,61 @@ pub fn enter_vm<R>(vm: &VirtualMachine, f: impl FnOnce() -> R) -> R { set_current_vm(vm, f) } +/// RAII counterpart to `enter_vm`, for code that runs Python bytecode across +/// several statements interspersed with `&mut VirtualMachine` calls +/// (`VirtualMachine::initialize`), where a single closure-based `enter_vm` +/// scope cannot be expressed because the borrow checker won't let a closure +/// hold `&mut VirtualMachine` at the same time `enter_vm` reborrows it as +/// `&VirtualMachine`. Construction only needs a transient `&VirtualMachine` +/// borrow, so it can be dropped before subsequent `&mut` use. +/// +/// Without this, code that runs Python bytecode before any `enter_vm` scope +/// exists would leave the thread not ATTACHED, making lock-free type cache +/// reads unsound. +#[must_use] +pub(crate) struct VmBootstrapGuard { + #[cfg(feature = "threading")] + was_outermost: bool, +} + +impl VmBootstrapGuard { + pub(crate) fn new(vm: &VirtualMachine) -> Self { + // Outermost: transition DETACHED → ATTACHED + #[cfg(feature = "threading")] + let was_outermost = !current_vm_is_set(); + + // Initialize thread slot for this thread if not already done + #[cfg(feature = "threading")] + init_thread_slot_if_needed(vm); + + #[cfg(feature = "threading")] + if was_outermost { + attach_thread(vm); + } + + VM_STACK.with(|vms| vms.borrow_mut().push(vm.into())); + + Self { + #[cfg(feature = "threading")] + was_outermost, + } + } +} + +impl Drop for VmBootstrapGuard { + fn drop(&mut self) { + VM_STACK.with(|vms| { + vms.borrow_mut().pop(); + }); + + // Outermost exit: transition ATTACHED → DETACHED + #[cfg(feature = "threading")] + if self.was_outermost { + detach_thread(); + } + } +} + #[cfg(feature = "threading")] #[derive(Clone, Copy, Debug, Eq, PartialEq)] pub enum CurrentVmAttachState { @@ -161,7 +244,6 @@ pub fn attach_current_thread( init_thread_slot_if_needed(vm); - #[cfg(unix)] attach_thread(vm); VM_STACK.with(|vms| { @@ -188,7 +270,6 @@ pub fn release_current_thread(state: CurrentVmAttachState) { .expect("release_current_thread() called without an attached VM"); }); - #[cfg(unix)] detach_thread(); } @@ -201,9 +282,11 @@ fn init_thread_slot_if_needed(vm: &VirtualMachine) { let thread_id = crate::stdlib::_thread::get_ident(); let mut registry = vm.state.thread_frames.lock(); let new_slot = Arc::new(ThreadSlot { + #[cfg(unix)] + top_frame: AtomicPtr::new(core::ptr::null_mut()), + #[cfg(not(unix))] frames: parking_lot::Mutex::new(Vec::new()), exception: crate::PyAtomicRef::from(None::<PyBaseExceptionRef>), - #[cfg(unix)] state: core::sync::atomic::AtomicI32::new( if vm.state.stop_the_world.requested.load(Ordering::Acquire) { // Match init_threadstate(): new thread-state starts @@ -213,13 +296,14 @@ fn init_thread_slot_if_needed(vm: &VirtualMachine) { THREAD_DETACHED }, ), - #[cfg(unix)] stop_requested: core::sync::atomic::AtomicBool::new(false), - #[cfg(unix)] thread: std::thread::current(), + qsbr: crate::object::qsbr::QSBR.register(), }); registry.insert(thread_id, new_slot.clone()); drop(registry); + #[cfg(all(unix, feature = "threading"))] + CURRENT_TOP_FRAME_SLOT.with(|c| c.set(&new_slot.top_frame)); *slot.borrow_mut() = Some(new_slot); } }); @@ -227,7 +311,7 @@ fn init_thread_slot_if_needed(vm: &VirtualMachine) { /// Transition DETACHED → ATTACHED. Blocks if the thread was SUSPENDED by /// a stop-the-world request (like `_PyThreadState_Attach` + `tstate_wait_attach`). -#[cfg(all(unix, feature = "threading"))] +#[cfg(feature = "threading")] fn wait_while_suspended(slot: &ThreadSlot) -> u64 { let mut wait_yields = 0u64; while slot.state.load(Ordering::Acquire) == THREAD_SUSPENDED { @@ -237,7 +321,7 @@ fn wait_while_suspended(slot: &ThreadSlot) -> u64 { wait_yields } -#[cfg(all(unix, feature = "threading"))] +#[cfg(feature = "threading")] fn attach_thread(vm: &VirtualMachine) { CURRENT_THREAD_SLOT.with(|slot| { if let Some(s) = slot.borrow().as_ref() { @@ -250,6 +334,7 @@ fn attach_thread(vm: &VirtualMachine) { Ordering::Relaxed, ) { Ok(_) => { + crate::object::qsbr::QSBR.online(&s.qsbr); super::stw_trace(format_args!("attach DETACHED->ATTACHED")); break; } @@ -268,10 +353,18 @@ fn attach_thread(vm: &VirtualMachine) { } } }); + // A stop-the-world may have been requested while this thread was detached. + // Honoring it here (rather than only at the next bytecode safepoint) keeps + // a thread doing rapid allow_threads calls from re-attaching and running + // past the requester forever, which would stall stop-the-world. Done + // outside the CURRENT_THREAD_SLOT borrow above because suspend re-borrows + // it. Safe against a concurrent start_the_world: suspend_if_needed only + // parks while the request is still live and self-recovers otherwise. + suspend_if_needed(&vm.state.stop_the_world); } /// Transition ATTACHED → DETACHED (like `_PyThreadState_Detach`). -#[cfg(all(unix, feature = "threading"))] +#[cfg(feature = "threading")] fn detach_thread() { CURRENT_THREAD_SLOT.with(|slot| { if let Some(s) = slot.borrow().as_ref() { @@ -281,7 +374,9 @@ fn detach_thread() { Ordering::AcqRel, Ordering::Acquire, ) { - Ok(_) => {} + Ok(_) => { + crate::object::qsbr::QSBR.offline(&s.qsbr); + } Err(THREAD_DETACHED) => { debug_assert!(false, "detach called while already DETACHED"); return; @@ -301,7 +396,7 @@ fn detach_thread() { /// to park this thread during blocking operations. /// /// `Py_BEGIN_ALLOW_THREADS` / `Py_END_ALLOW_THREADS` equivalent. -#[cfg(all(unix, feature = "threading"))] +#[cfg(feature = "threading")] pub fn allow_threads<R>(vm: &VirtualMachine, f: impl FnOnce() -> R) -> R { // Preserve save/restore semantics: // only detach if this call observed ATTACHED at entry, and always restore @@ -322,8 +417,8 @@ pub fn allow_threads<R>(vm: &VirtualMachine, f: impl FnOnce() -> R) -> R { result } -/// No-op on non-unix or non-threading builds. -#[cfg(not(all(unix, feature = "threading")))] +/// No-op on non-threading builds. +#[cfg(not(feature = "threading"))] pub fn allow_threads<R>(_vm: &VirtualMachine, f: impl FnOnce() -> R) -> R { f() } @@ -331,7 +426,7 @@ pub fn allow_threads<R>(_vm: &VirtualMachine, f: impl FnOnce() -> R) -> R { /// Called from check_signals when stop-the-world is requested. /// Transitions ATTACHED → SUSPENDED and waits until released /// (like `_PyThreadState_Suspend` + `_PyThreadState_Attach`). -#[cfg(all(unix, feature = "threading"))] +#[cfg(feature = "threading")] pub fn suspend_if_needed(stw: &super::StopTheWorldState) { let should_suspend = CURRENT_THREAD_SLOT.with(|slot| { slot.borrow() @@ -354,7 +449,7 @@ pub fn suspend_if_needed(stw: &super::StopTheWorldState) { do_suspend(stw); } -#[cfg(all(unix, feature = "threading"))] +#[cfg(feature = "threading")] #[cold] fn do_suspend(stw: &super::StopTheWorldState) { CURRENT_THREAD_SLOT.with(|slot| { @@ -431,7 +526,7 @@ fn do_suspend(stw: &super::StopTheWorldState) { }); } -#[cfg(all(unix, feature = "threading"))] +#[cfg(feature = "threading")] #[inline] #[must_use] pub fn stop_requested_for_current_thread() -> bool { @@ -442,9 +537,55 @@ pub fn stop_requested_for_current_thread() -> bool { }) } +/// Whether the QSBR subsystem asked this thread to pass a checkpoint. +/// A missed or racing read of this flag is harmless: the pending +/// retirement is still processed at the next checkpoint or by the GC +/// backstop. +#[cfg(feature = "threading")] +pub(crate) fn qsbr_break_requested() -> bool { + CURRENT_THREAD_SLOT.with(|slot| { + slot.borrow() + .as_ref() + .is_some_and(|s| s.qsbr.requested.load(Ordering::Relaxed)) + }) +} + +/// Pass a QSBR checkpoint: the calling thread holds no borrowed cache +/// pointers here (instruction boundary), so mark it quiescent and try to +/// free retired allocations. +#[cfg(feature = "threading")] +pub(crate) fn qsbr_checkpoint() { + use crate::object::qsbr::QSBR; + CURRENT_THREAD_SLOT.with(|slot| { + if let Some(s) = slot.borrow().as_ref() { + s.qsbr.requested.store(false, Ordering::Relaxed); + QSBR.quiescent_state(&s.qsbr); + } + }); + QSBR.process(); +} + +/// Debug check: lock-free type-cache reads are only sound on threads that +/// are registered with QSBR and currently ATTACHED. +#[cfg(all(feature = "threading", debug_assertions))] +pub(crate) fn debug_assert_current_thread_attached() { + CURRENT_THREAD_SLOT.with(|slot| { + if let Some(s) = slot.borrow().as_ref() { + debug_assert_eq!( + s.state.load(Ordering::Relaxed), + THREAD_ATTACHED, + "type cache read while thread not ATTACHED" + ); + } + }); +} + /// Push a frame pointer onto the current thread's shared frame stack. /// The pointed-to frame must remain alive until the matching pop. -#[cfg(feature = "threading")] +/// +/// Only used on non-unix threading builds; unix builds publish the top frame +/// through `set_current_frame` writing `ThreadSlot::top_frame`. +#[cfg(all(not(unix), feature = "threading"))] pub fn push_thread_frame(fp: FramePtr) { CURRENT_THREAD_SLOT.with(|slot| { if let Some(s) = slot.borrow().as_ref() { @@ -460,7 +601,7 @@ pub fn push_thread_frame(fp: FramePtr) { /// Pop a frame from the current thread's shared frame stack. /// Called when a frame is exited. -#[cfg(feature = "threading")] +#[cfg(all(not(unix), feature = "threading"))] pub fn pop_thread_frame() { CURRENT_THREAD_SLOT.with(|slot| { if let Some(s) = slot.borrow().as_ref() { @@ -477,6 +618,17 @@ pub fn pop_thread_frame() { /// Set the current thread's top frame pointer for signal-safe traceback walking. /// Returns the previous frame pointer so it can be restored on pop. pub fn set_current_frame(frame: *const Frame) -> *const Frame { + // Publish the top frame for cross-thread readers. The relaxed store is + // ordered by stop-the-world at read time (see `ThreadSlot::top_frame`). + #[cfg(all(unix, feature = "threading"))] + { + let slot_top = CURRENT_TOP_FRAME_SLOT.with(Cell::get); + if !slot_top.is_null() { + // SAFETY: points to this thread's `ThreadSlot::top_frame`, kept + // alive by the Arc in `CURRENT_THREAD_SLOT` for the thread's life. + unsafe { (*slot_top).store(frame as *mut Frame, Ordering::Relaxed) }; + } + } CURRENT_FRAME.with(|c| c.swap(frame as *mut Frame, Ordering::Relaxed) as *const Frame) } @@ -519,7 +671,7 @@ pub fn cleanup_current_thread_frames(vm: &VirtualMachine) { // A dying thread should not remain logically ATTACHED while its // thread-state slot is being removed. - #[cfg(all(unix, feature = "threading"))] + #[cfg(feature = "threading")] if let Some(slot) = &current_slot { let _ = slot.state.compare_exchange( THREAD_ATTACHED, @@ -541,7 +693,7 @@ pub fn cleanup_current_thread_frames(vm: &VirtualMachine) { None }; - #[cfg(all(unix, feature = "threading"))] + #[cfg(feature = "threading")] if let Some(slot) = &_removed && vm.state.stop_the_world.requested.load(Ordering::Acquire) && thread_id != vm.state.stop_the_world.requester_ident() @@ -551,6 +703,10 @@ pub fn cleanup_current_thread_frames(vm: &VirtualMachine) { // Unblock requester countdown progress. vm.state.stop_the_world.notify_thread_gone(); } + // Clear the cached top-frame pointer before dropping the slot Arc so no + // later `set_current_frame` dereferences freed slot memory. + #[cfg(all(unix, feature = "threading"))] + CURRENT_TOP_FRAME_SLOT.with(|c| c.set(core::ptr::null())); CURRENT_THREAD_SLOT.with(|s| { *s.borrow_mut() = None; }); @@ -558,24 +714,43 @@ pub fn cleanup_current_thread_frames(vm: &VirtualMachine) { /// Reinitialize thread slot after fork. Called in child process. /// Creates a fresh slot and registers it for the current thread, -/// preserving the current thread's frames from `vm.frames`. +/// preserving the current thread's frames from the signal-safe frame chain. /// /// Precondition: `reinit_locks_after_fork()` has already reset all /// VmState locks to unlocked. #[cfg(feature = "threading")] pub fn reinit_frame_slot_after_fork(vm: &VirtualMachine) { let current_ident = crate::stdlib::_thread::get_ident(); - let current_frames: Vec<FramePtr> = vm.frames.borrow().clone(); + // On non-unix, rebuild the shared frame stack (bottom-to-top) from the + // current thread's frame chain, which walks top-to-bottom via `previous`. + #[cfg(not(unix))] + let current_frames: Vec<FramePtr> = { + let mut current_frames = Vec::new(); + let mut cur = get_current_frame(); + while !cur.is_null() { + // SAFETY: the forking thread's chain frames are alive. + let py = unsafe { crate::Py::<Frame>::from_payload_ptr(cur) }; + current_frames.push(FramePtr(unsafe { NonNull::new_unchecked(py as *mut _) })); + cur = unsafe { (*cur).previous_frame() }; + } + current_frames.reverse(); + current_frames + }; let new_slot = Arc::new(ThreadSlot { + // The surviving child thread keeps executing its current frame chain, + // whose top is the signal-safe `get_current_frame()`. + #[cfg(unix)] + top_frame: AtomicPtr::new(get_current_frame() as *mut Frame), + #[cfg(not(unix))] frames: parking_lot::Mutex::new(current_frames), exception: crate::PyAtomicRef::from(vm.topmost_exception()), - #[cfg(unix)] state: core::sync::atomic::AtomicI32::new(THREAD_ATTACHED), - #[cfg(unix)] stop_requested: core::sync::atomic::AtomicBool::new(false), - #[cfg(unix)] thread: std::thread::current(), + qsbr: crate::object::qsbr::QSBR.register(), }); + #[cfg(all(unix, feature = "threading"))] + CURRENT_TOP_FRAME_SLOT.with(|c| c.set(&new_slot.top_frame)); // Lock is safe: reinit_locks_after_fork() already reset it to unlocked. let mut registry = vm.state.thread_frames.lock(); @@ -710,7 +885,6 @@ impl VirtualMachine { builtins: self.builtins.clone(), sys_module: self.sys_module.clone(), ctx: self.ctx.clone(), - frames: RefCell::new(vec![]), datastack: core::cell::UnsafeCell::new(crate::datastack::DataStack::new()), wasm_id: self.wasm_id.clone(), exceptions: RefCell::default(), diff --git a/crates/vm/src/vm/vm_new.rs b/crates/vm/src/vm/vm_new.rs index c71cf8425..ae728aaba 100644 --- a/crates/vm/src/vm/vm_new.rs +++ b/crates/vm/src/vm/vm_new.rs @@ -10,7 +10,7 @@ use rustpython_compiler_core::SourceLocation; use rustpython_compiler::{CompileError, ParseError}; use crate::{ - AsObject, Py, PyObject, PyObjectRef, PyRef, PyResult, + AsObject, Py, PyObject, PyObjectRef, PyPayload, PyRef, PyResult, builtins::{ PyBaseException, PyBaseExceptionRef, PyBytesRef, PyDictRef, PyModule, PyOSError, PyStrRef, PyType, PyTypeRef, @@ -348,11 +348,9 @@ impl VirtualMachine { exc_type.name() ); - PyRef::new_ref( - PyBaseException::new(args, self), - exc_type, - Some(self.ctx.new_dict()), - ) + PyBaseException::new(args, self) + .into_ref_with_type_lazy_dict(self, exc_type) + .expect("vm.new_exception() called with an invalid exception type") } pub fn new_os_error(&self, msg: impl ToPyObject) -> PyRef<PyBaseException> { diff --git a/extra_tests/custom_text_test_runner.py b/extra_tests/custom_text_test_runner.py index 3457bdfd0..865265750 100644 --- a/extra_tests/custom_text_test_runner.py +++ b/extra_tests/custom_text_test_runner.py @@ -389,11 +389,9 @@ class CustomTextTestResult(result.TestResult): } self.start_time = time.time() if self.test_types: - if "test_type" in getattr( - test, test._testMethodName - ).__func__.__dict__ and set([s.lower() for s in self.test_types]) == set( - [s.lower() for s in _get_method_dict(test)["test_type"]] - ): + if "test_type" in _get_method_dict(test) and set( + [s.lower() for s in self.test_types] + ) == set([s.lower() for s in _get_method_dict(test)["test_type"]]): pass else: _get_method_dict(test)["__unittest_skip_why__"] = ( diff --git a/extra_tests/snippets/builtin_type_bases.py b/extra_tests/snippets/builtin_type_bases.py new file mode 100644 index 000000000..1d413e48e --- /dev/null +++ b/extra_tests/snippets/builtin_type_bases.py @@ -0,0 +1,293 @@ +from testutils import assert_raises + +# Reassigning __bases__ must rebuild slot dispatchers for the type and all its +# descendants: a slot whose method left the new MRO must be reset, not left stale. + + +# --- zelf itself loses __add__ (nb_add) --- +class OldAdd: + def __add__(self, other): + return "OLD" + + +class Bare: + pass + + +class C(OldAdd): + pass + + +c = C() +assert c + 1 == "OLD" +C.__bases__ = (Bare,) +with assert_raises(TypeError): + c + 1 + + +# --- 3-level descendant loses __iter__ (tp_iter) --- +class Itr: + def __iter__(self): + return iter([1, 2, 3]) + + +class New: + pass + + +class C2(Itr): + pass + + +class D2(C2): + pass + + +class E2(D2): + pass + + +e = E2() +assert list(e) == [1, 2, 3] +C2.__bases__ = (New,) +with assert_raises(TypeError): + list(e) + + +# --- descendant loses __len__ (sq_length), sibling slot untouched --- +class Sized: + def __len__(self): + return 7 + + +class C3(Sized): + pass + + +class D3(C3): + pass + + +d3 = D3() +assert len(d3) == 7 +C3.__bases__ = (Bare,) +with assert_raises(TypeError): + len(d3) + + +# --- descendant loses __getitem__ (mp_subscript) --- +class Subscriptable: + def __getitem__(self, key): + return key * 2 + + +class C4(Subscriptable): + pass + + +class D4(C4): + pass + + +d4 = D4() +assert d4[3] == 6 +C4.__bases__ = (Bare,) +with assert_raises(TypeError): + d4[3] + + +# --- descendant loses __call__ (tp_call) --- +class Callable: + def __call__(self): + return "called" + + +class C5(Callable): + pass + + +class D5(C5): + pass + + +d5 = D5() +assert d5() == "called" +C5.__bases__ = (Bare,) +with assert_raises(TypeError): + d5() + + +# --- guard: stale-wrong-target, name present in both bases must switch --- +class OldTarget: + def __add__(self, other): + return "OLD.__add__" + + +class NewTarget: + def __add__(self, other): + return "NEW.__add__" + + +class C6(OldTarget): + pass + + +class D6(C6): + pass + + +d6 = D6() +assert d6 + 1 == "OLD.__add__" +C6.__bases__ = (NewTarget,) +assert d6 + 1 == "NEW.__add__" + + +# --- guard: __getattr__ resolves at call time, stays correct --- +class OldGetattr: + def __getattr__(self, name): + return "OLD:" + name + + +class C7(OldGetattr): + pass + + +class D7(C7): + pass + + +d7 = D7() +assert d7.missing == "OLD:missing" +C7.__bases__ = (Bare,) +with assert_raises(AttributeError): + d7.missing + + +# --- mirror: new base ADDS a dunder the old chain lacked --- +class Adder: + def __add__(self, other): + return "ADDED" + + +class C8(Bare): + pass + + +class D8(C8): + pass + + +d8 = D8() +with assert_raises(TypeError): + d8 + 1 +C8.__bases__ = (Adder,) +assert d8 + 1 == "ADDED" + + +# --- round trip: swap away then back restores the slot --- +class C9(OldAdd): + pass + + +class D9(C9): + pass + + +d9 = D9() +assert d9 + 1 == "OLD" +C9.__bases__ = (Bare,) +with assert_raises(TypeError): + d9 + 1 +C9.__bases__ = (OldAdd,) +assert d9 + 1 == "OLD" + + +# --- left-only __add__ defined on the type itself survives a base swap --- +# __add__ and __radd__ share one accessor but occupy distinct fields; resolving +# the absent __radd__ must not overwrite the __add__ dispatcher. +class Mixin: + pass + + +class Other: + pass + + +class C10(Mixin): + def __add__(self, o): + return "C10" + + +c10 = C10() +assert c10 + 1 == "C10" +C10.__bases__ = (Other,) +assert c10 + 1 == "C10" + + +# --- right-only __radd__ survives a base swap --- +class C11(Mixin): + def __radd__(self, o): + return "C11" + + +c11 = C11() +assert 1 + c11 == "C11" +C11.__bases__ = (Other,) +assert 1 + c11 == "C11" + + +# --- subclass/grandchild shadowing __add__ keeps it when an ancestor swaps bases --- +class AddBase: + def __add__(self, o): + return "AddBase" + + +class Ancestor(AddBase): + pass + + +class Shadow(Ancestor): + def __add__(self, o): + return "Shadow" + + +class GrandShadow(Shadow): + pass + + +sh = Shadow() +gsh = GrandShadow() +assert sh + 1 == "Shadow" +assert gsh + 1 == "Shadow" +Ancestor.__bases__ = (Mixin,) +assert sh + 1 == "Shadow" +assert gsh + 1 == "Shadow" + + +# --- another Nb* pair: left-only __sub__ survives a base swap --- +class C12(Mixin): + def __sub__(self, o): + return "C12" + + +c12 = C12() +assert c12 - 1 == "C12" +C12.__bases__ = (Other,) +assert c12 - 1 == "C12" + + +# --- setattr/delattr-driven right-op updates keep the left op intact --- +class C13: + def __add__(self, o): + return "C13.add" + + +c13 = C13() +assert c13 + 1 == "C13.add" +C13.__radd__ = lambda self, o: "C13.radd" +assert c13 + 1 == "C13.add" +assert 1 + c13 == "C13.radd" +del C13.__radd__ +assert c13 + 1 == "C13.add" +with assert_raises(TypeError): + 1 + c13 diff --git a/extra_tests/snippets/stdlib_threading_gc_fork.py b/extra_tests/snippets/stdlib_threading_gc_fork.py new file mode 100644 index 000000000..cd00cf009 --- /dev/null +++ b/extra_tests/snippets/stdlib_threading_gc_fork.py @@ -0,0 +1,62 @@ +"""Fork while other threads drive concurrent GC stop-the-world. + +fork() and the cycle collector both stop the world through the same shared +state. Without a single exclusion around each stop->start span, an interleaving +of the fork requester and a GC requester clobbers that state (requester word, +suspension countdown) so the completion check never converges and a requester +waits on itself forever. + +Worker threads allocate cyclic garbage with GC enabled while the main thread +forks repeatedly; each child collects and exits. A regression shows up as a +hang in the parent (never finishing the fork loop). The allocation rate is kept +light so the collection stays cheap even in unoptimized builds. +""" + +import gc +import os +import threading +import time + +if not hasattr(os, "fork"): + print("skipped (no fork)") + raise SystemExit(0) + +gc.enable() +stop = threading.Event() + + +def churn(): + while not stop.is_set(): + a = {} + b = {"a": a} + a["b"] = b # cycle collectable only by the cycle collector + lst = [a, b] + lst.append(lst) + del a, b, lst + # Throttle so the collector keeps the heap small; the point is to + # interleave fork with concurrent collections, not to grow the heap. + time.sleep(0.001) + + +workers = [threading.Thread(target=churn) for _ in range(4)] +for w in workers: + w.start() + +# Let the workers get going before forking. +time.sleep(0.05) + +N = 25 +for _ in range(N): + pid = os.fork() + if pid == 0: + # Child: run its own stop-the-world collection, then exit. + gc.collect() + os._exit(0) + _, status = os.waitpid(pid, 0) + assert status == 0, status + +stop.set() +for w in workers: + w.join() + +print("ok") diff --git a/extra_tests/snippets/stdlib_threading_gc_frame_race.py b/extra_tests/snippets/stdlib_threading_gc_frame_race.py new file mode 100644 index 000000000..37cdbbf12 --- /dev/null +++ b/extra_tests/snippets/stdlib_threading_gc_frame_race.py @@ -0,0 +1,101 @@ +"""Stress GC traversal against concurrently executing frames. + +The cycle collector reads each tracked object's interpreter state, including +the data stack and fast locals of frames that other threads are actively +executing. Those slots are written without synchronization by the running +thread, so the collector must only read them while the world is stopped. + +Workers churn frame state hard: deep recursion (many nested frames), heavy +local rebind / stack traffic, and generators repeatedly resumed. Meanwhile a +collector thread loops gc.collect() and an introspector walks live frame +objects via gc.get_objects(). A regression (torn read of a running frame) +shows up as a crash, a use-after-free, or a hang. +""" + +import gc +import sys +import threading +import time + +DURATION = 1.5 + + +def deep(n): + # Deep recursion + local rebind churns fast locals and the data stack. + a = n + b = [n, n + 1] + c = {"k": a} + if n <= 0: + return a + len(b) + len(c) + a = a - 1 + b.append(a) + return deep(n - 1) + a + + +def gen_worker(): + def counter(limit): + acc = 0 + i = 0 + while i < limit: + box = {"i": i} + box["self"] = box # a cycle held by the running generator frame + acc += i + yield acc + i += 1 + + g = counter(200) + total = 0 + for v in g: + total += v + return total + + +def make_frame_cycles(n): + for _ in range(n): + + def inner(): + fr = sys._getframe() + box = {"fr": fr} + box["self"] = box + return None + + inner() + + +def worker(stop): + # deep() nesting is kept modest so the recursion also fits the smaller + # worker-thread stack of unoptimized (debug) builds; the generators and + # frame cycles supply the rest of the frame churn. + while not stop.is_set(): + deep(12) + gen_worker() + make_frame_cycles(20) + + +def collector(stop): + while not stop.is_set(): + gc.collect() + + +def introspector(stop): + while not stop.is_set(): + for o in gc.get_objects(): + if type(o).__name__ == "frame": + try: + _ = o.f_lineno + _ = o.f_code.co_name + except Exception: + pass + + +stop = threading.Event() +threads = [threading.Thread(target=worker, args=(stop,)) for _ in range(4)] +threads.append(threading.Thread(target=collector, args=(stop,))) +threads.append(threading.Thread(target=introspector, args=(stop,))) +for t in threads: + t.start() +time.sleep(DURATION) +stop.set() +for t in threads: + t.join() +print("ok") diff --git a/extra_tests/snippets/stdlib_threading_gc_import.py b/extra_tests/snippets/stdlib_threading_gc_import.py new file mode 100644 index 000000000..340184093 --- /dev/null +++ b/extra_tests/snippets/stdlib_threading_gc_import.py @@ -0,0 +1,58 @@ +"""Concurrent imports plus GC stop-the-world must not deadlock (no fork). + +The global import lock is held across bytecode by the importlib bootstrap, so +its holder can be parked at a safepoint mid-hold. If another thread blocks on +that lock while attached, a GC stop-the-world requester waits forever for that +attached thread to suspend while the lock holder stays parked -- a three-party +deadlock. Acquiring the import lock must therefore detach so the wait honors a +stop-the-world request. + +Two threads repeatedly re-import modules (contending the import lock) while a +third storms the cycle collector and a fourth allocates cyclic garbage. A +regression shows up as a hang (the importer threads never finishing). +""" + +import gc +import importlib +import sys +import threading + +gc.enable() +stop = threading.Event() + +# Modules cheap to import and safe to drop/re-import repeatedly. +MODS = ("colorsys", "stringprep") +ITERS = 2000 + + +def importer(mod): + for _ in range(ITERS): + if stop.is_set(): + break + sys.modules.pop(mod, None) + importlib.import_module(mod) + + +def collector(): + while not stop.is_set(): + gc.collect() + + +def allocator(): + while not stop.is_set(): + y = [{"i": i} for i in range(50)] + y[0]["self"] = y # cycle collectable only by the cycle collector + + +importers = [threading.Thread(target=importer, args=(m,)) for m in MODS] +helpers = [threading.Thread(target=collector), threading.Thread(target=allocator)] + +for t in importers + helpers: + t.start() +for t in importers: + t.join() +stop.set() +for t in helpers: + t.join() + +print("ok") diff --git a/extra_tests/snippets/stdlib_threading_type_cache.py b/extra_tests/snippets/stdlib_threading_type_cache.py new file mode 100644 index 000000000..92368e8b8 --- /dev/null +++ b/extra_tests/snippets/stdlib_threading_type_cache.py @@ -0,0 +1,69 @@ +"""Stress the lock-free type method cache against concurrent type mutation. + +Readers hammer method lookups while a mutator continuously replaces and +deletes the method, dropping the old function objects. Guards against +use-after-free in the cache read protocol (QSBR deferred reclamation). + +Also churns a freelist-eligible published value (a tuple class attribute): +tuples normally go back through the freelist on dealloc, but once one is +published to the type cache it must instead go through the QSBR-deferred +reclamation path, so this exercises that bypass. +""" + +import threading +import time + + +class C: + def m(self): + return -1 + + +DURATION = 1.5 + + +def reader(stop): + obj = C() + while not stop.is_set(): + for _ in range(1000): + try: + obj.m() + except AttributeError: + pass + try: + obj.shape + except AttributeError: + pass + + +def mutator(stop): + i = 0 + while not stop.is_set(): + + def m(self, _i=i): + return _i + + C.m = m + C.shape = (i, i + 1) + i += 1 + if i % 97 == 0: + try: + del C.m + except AttributeError: + pass + try: + del C.shape + except AttributeError: + pass + + +stop = threading.Event() +threads = [threading.Thread(target=reader, args=(stop,)) for _ in range(4)] +threads.append(threading.Thread(target=mutator, args=(stop,))) +for t in threads: + t.start() +time.sleep(DURATION) +stop.set() +for t in threads: + t.join() +print("ok") diff --git a/tools/opcode_metadata/generate_rs_opcode_metadata.py b/tools/opcode_metadata/generate_rs_opcode_metadata.py index fd13e0266..97482f337 100644 --- a/tools/opcode_metadata/generate_rs_opcode_metadata.py +++ b/tools/opcode_metadata/generate_rs_opcode_metadata.py @@ -28,6 +28,7 @@ class OpcodeGen: return f""" /// Returns [`Self`] as [`{self.size}`]. #[must_use] + #[inline] pub const fn as_{self.size}(self) -> {self.size} {{ self.as_numeric() }} @@ -113,6 +114,7 @@ class OpcodeGen: return f""" #[must_use] + #[inline] pub const fn to_base(self) -> Option<Self> {{ {inner} }} @@ -146,25 +148,30 @@ class OpcodeGen: @property def fn_deopt(self) -> str: - arms = "" - for target, specialized in self.info.deopts.items(): - ops = "|".join(f"Self::{op}" for op in specialized) - arms += f"{ops} => Self::{target},\n" + specialized_to_base = self.specialized_to_base - arms = arms.strip() - - if not arms: + if not specialized_to_base: inner = "None" else: + table_type = f"super::{self.info.enum_name}" + entries = ",\n".join( + f"Some({table_type}::{specialized_to_base[name]})" + if name in specialized_to_base + else "None" + for name in self.rust_names_by_id + ) + inner = f""" - Some(match self {{ - {arms} - _ => return None, - }}) + const DEOPT: [Option<{table_type}>; {self.table_size}] = [ + {entries} + ]; + + DEOPT[self.as_numeric() as usize] """ return f""" #[must_use] + #[inline] pub const fn deopt(self) -> Option<Self> {{ {inner} }} @@ -172,7 +179,7 @@ class OpcodeGen: @property def fn_cache_entries(self) -> str: - arms = "" + entries_by_base: dict[str, int] = {} for opcode in self: name = opcode.rust_name if opcode.is_instrumented: @@ -186,21 +193,25 @@ class OpcodeGen: continue if size > 1: - arms += f"Self::{name} => {size - 1},\n" + entries_by_base[name] = size - 1 - arms = arms.strip() - if not arms: + if not entries_by_base: inner = "0" else: + entries = ", ".join( + str(entries_by_base.get(self.resolve_deoptimized(name), 0)) + for name in self.rust_names_by_id + ) + inner = f""" - match self.deoptimize() {{ - {arms} - _ => 0, - }} + const CACHE_ENTRIES: [u8; {self.table_size}] = [{entries}]; + + CACHE_ENTRIES[self.as_numeric() as usize] as usize """ return f""" #[must_use] + #[inline] pub const fn cache_entries(self) -> usize {{ {inner} }} @@ -323,6 +334,42 @@ class OpcodeGen: return res + @property + def specialized_to_base(self) -> dict[str, str]: + """Maps a specialized opcode's name to its family's base opcode name.""" + res = {} + for target, specialized in self.info.deopts.items(): + for name in specialized: + res[name] = target + + return res + + @property + def instrumented_to_base(self) -> dict[str, str]: + """Maps an instrumented opcode's name to its base opcode name.""" + return {iname: name for name, iname in self.instrumented_mapping.items()} + + def resolve_deoptimized(self, name: str) -> str: + """ + Mirrors `deoptimize`: resolves a specialized opcode to its family's + base, an instrumented opcode to its base, or returns the name + unchanged. + """ + if name in self.specialized_to_base: + return self.specialized_to_base[name] + + return self.instrumented_to_base.get(name, name) + + @property + def table_size(self) -> int: + return {"u8": 256, "u16": 65536}[self.size] + + @property + def rust_names_by_id(self) -> list[str | None]: + """The opcode name at each numeric id, `None` where no opcode is assigned.""" + names_by_id = {opcode.id: opcode.rust_name for opcode in self} + return [names_by_id.get(i) for i in range(self.table_size)] + @property def size(self) -> str: return self.info.size From 797d931f7a018e2fc9f4da6a2ca521fe59019946 Mon Sep 17 00:00:00 2001 From: "Jeong, YunWon" <69878+youknowone@users.noreply.github.com> Date: Wed, 8 Jul 2026 19:18:44 +0900 Subject: [PATCH 206/339] Complete rustpython-unicode isolation: case mapping, casing predicates, sre parity (#8237) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Move str casing into rustpython-unicode::case and drop icu from vm Add code-point simple mappings (simple_lowercase/uppercase/titlecase/fold), casing predicates (is_lowercase/is_uppercase/is_titlecase/is_cased/ is_case_ignorable), and the string-level capitalize/title/swapcase/casefold helpers to crates/unicode/src/case.rs, moving the titlecase segmentation and final-sigma logic out of vm/builtins/str.rs verbatim. str.rs and anystr.rs now call through the crate; the is_cased kernel takes plain fn(char)->bool predicates instead of icu BinaryProperty generics. Remove icu_casemap/icu_locale/icu_properties/writeable from crates/vm and the now-unused VecFmtWriter helper. crates/unicode is the only workspace member with a direct icu dependency. str.lower/upper keep using Wtf8::to_lowercase/ to_uppercase. Assisted-by: Claude * Route sre is_uni_space through unicode::classify::is_space SRE_UNI_IS_SPACE is Py_UNICODE_ISSPACE. Replace the hand-rolled BMP code-point list with classify::is_space, which is differential-tested against CPython. A full-range sweep confirms the two agree on every code point. Assisted-by: Claude * Use simple case mappings and the Cased property for sre IGNORECASE lower_unicode/upper_unicode took the first char of the full case mapping, so code points with a full mapping but no simple one were miscased (e.g. upper_unicode('ß') returned 'S'). Route them through case::simple_lowercase/ simple_uppercase, matching Py_UNICODE_TOLOWER/TOUPPER. _sre.unicode_iscased derived casedness from those mappings, which only held while the full mapping was used; with simple mappings a cased code point that maps to itself (e.g. the ſt/st ligatures, U+FB05/06) read as uncased and lost its _casefix equivalence. Query the Cased property directly via case::is_cased. Assisted-by: Claude * Sweep casing predicates and simple lowercase mapping against CPython Extend the differential harness to cover is_lowercase/is_uppercase/is_titlecase/ is_cased over the full scalar range, sourced from str.islower/isupper, the Lt category, and _sre.unicode_iscased. Add a parallel sweep of the simple lowercase mapping (Py_UNICODE_TOLOWER via _sre.unicode_tolower) with its own version-skew allow-list; CPython exposes no simple-uppercase oracle, so toupper stays on the SRE unit tests. Record the U+0295 Ll->Lo recategorization (Unicode 16.0.0 -> 17.0.0) as a known reverse-direction divergence so the skew regenerator still rejects genuine regressions. Assisted-by: Claude --- Cargo.lock | 5 +- crates/sre_engine/src/string.rs | 44 +-- crates/unicode/Cargo.toml | 1 + crates/unicode/src/case.rs | 332 +++++++++++++++++- .../tests/data/cpython3.14_mappings.txt | 2 + .../tests/data/cpython3.14_predicates.txt | 4 + .../tests/data/version_skew_cpython3.14.txt | 3 + .../version_skew_mappings_cpython3.14.txt | 5 + crates/unicode/tests/differential.rs | 201 ++++++++++- crates/unicode/tests/generate_reference.py | 48 ++- crates/vm/Cargo.toml | 6 - crates/vm/src/anystr.rs | 16 +- crates/vm/src/builtins/str.rs | 192 +--------- crates/vm/src/stdlib/_sre.rs | 5 +- crates/vm/src/utils.rs | 15 - 15 files changed, 594 insertions(+), 285 deletions(-) create mode 100644 crates/unicode/tests/data/cpython3.14_mappings.txt create mode 100644 crates/unicode/tests/data/version_skew_mappings_cpython3.14.txt diff --git a/Cargo.lock b/Cargo.lock index 73afeda8a..3a0392b18 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3722,6 +3722,7 @@ name = "rustpython-unicode" version = "0.5.0" dependencies = [ "icu_casemap", + "icu_locale", "icu_normalizer", "icu_properties", "rustpython-wtf8", @@ -3749,9 +3750,6 @@ dependencies = [ "glob", "half", "hex", - "icu_casemap", - "icu_locale", - "icu_properties", "indexmap", "is-macro", "itertools 0.15.0", @@ -3793,7 +3791,6 @@ dependencies = [ "timsort", "wasm-bindgen", "widestring", - "writeable", ] [[package]] diff --git a/crates/sre_engine/src/string.rs b/crates/sre_engine/src/string.rs index 5deeab67e..ca7303a2a 100644 --- a/crates/sre_engine/src/string.rs +++ b/crates/sre_engine/src/string.rs @@ -399,40 +399,8 @@ pub(crate) fn is_uni_digit(ch: u32) -> bool { #[inline] pub(crate) fn is_uni_space(ch: u32) -> bool { - // TODO: check with cpython - is_space(ch) - || matches!( - ch, - 0x0009 - | 0x000A - | 0x000B - | 0x000C - | 0x000D - | 0x001C - | 0x001D - | 0x001E - | 0x001F - | 0x0020 - | 0x0085 - | 0x00A0 - | 0x1680 - | 0x2000 - | 0x2001 - | 0x2002 - | 0x2003 - | 0x2004 - | 0x2005 - | 0x2006 - | 0x2007 - | 0x2008 - | 0x2009 - | 0x200A - | 0x2028 - | 0x2029 - | 0x202F - | 0x205F - | 0x3000 - ) + // SRE_UNI_IS_SPACE is Py_UNICODE_ISSPACE. + char::try_from(ch).is_ok_and(rustpython_unicode::classify::is_space) } #[inline] @@ -457,13 +425,13 @@ pub(crate) fn is_uni_word(ch: u32) -> bool { #[inline] #[must_use] pub fn lower_unicode(ch: u32) -> u32 { - // TODO: check with cpython - char::try_from(ch).map_or(ch, |x| x.to_lowercase().next().unwrap() as u32) + // SRE_UNI_LOWER is Py_UNICODE_TOLOWER, the simple one-to-one mapping. + char::try_from(ch).map_or(ch, |x| rustpython_unicode::case::simple_lowercase(x) as u32) } #[inline] #[must_use] pub fn upper_unicode(ch: u32) -> u32 { - // TODO: check with cpython - char::try_from(ch).map_or(ch, |x| x.to_uppercase().next().unwrap() as u32) + // SRE_UNI_UPPER is Py_UNICODE_TOUPPER, the simple one-to-one mapping. + char::try_from(ch).map_or(ch, |x| rustpython_unicode::case::simple_uppercase(x) as u32) } diff --git a/crates/unicode/Cargo.toml b/crates/unicode/Cargo.toml index 678305ee0..52ab05f4d 100644 --- a/crates/unicode/Cargo.toml +++ b/crates/unicode/Cargo.toml @@ -12,6 +12,7 @@ rust-version = { workspace = true } rustpython-wtf8 = { workspace = true } icu_casemap = { workspace = true } +icu_locale = { workspace = true } icu_properties = { workspace = true } icu_normalizer = { workspace = true } unicode_names2 = { workspace = true } diff --git a/crates/unicode/src/case.rs b/crates/unicode/src/case.rs index 872d0b29a..0d7413339 100644 --- a/crates/unicode/src/case.rs +++ b/crates/unicode/src/case.rs @@ -1,19 +1,92 @@ -//! Case folding for Python `str.casefold`. +//! Case mapping, case folding, and casing predicates for Python string casing. //! -//! Lower, upper, and title casing of `str` objects stay with the runtime -//! because they iterate the string with special final-sigma handling. Case -//! folding has no such context dependence, so it lives here and is shared with -//! other runtimes. +//! Code-point mappings (`simple_*`) return a single `char` and back the SRE +//! engine's `IGNORECASE` handling. String-level helpers (`capitalize`, `title`, +//! `swapcase`, `casefold`) implement the full, context-sensitive mappings used +//! by `str` methods and pass lone surrogates through unchanged. The casing +//! predicates expose the derived properties that `str.islower`/`isupper`/ +//! `istitle` need. +//! +//! Plain `str.lower`/`str.upper` have no such context beyond the final-sigma +//! rule that `str::to_lowercase` already applies, so they stay on +//! `rustpython_wtf8::Wtf8::to_lowercase`/`to_uppercase` rather than being +//! duplicated here. + +// spell-checker:ignore ΟΔΟΣ Οδος use alloc::{ string::{String, ToString}, vec::Vec, }; -use icu_casemap::CaseMapper; -use rustpython_wtf8::{Wtf8, Wtf8Buf, Wtf8Chunk}; +use icu_casemap::{CaseMapper, TitlecaseMapper}; +use icu_locale::LanguageIdentifier; +use icu_properties::props::{ + BinaryProperty, CaseIgnorable, Cased, EnumeratedProperty, GeneralCategory, Lowercase, Uppercase, +}; +use rustpython_wtf8::{CodePoint, Wtf8, Wtf8Buf, Wtf8Chunk}; use writeable::Writeable; +// Code-point mappings + +/// Simple (one-to-one) lowercase mapping of `c` (`Py_UNICODE_TOLOWER`). +#[must_use] +pub fn simple_lowercase(c: char) -> char { + CaseMapper::new().simple_lowercase(c) +} + +/// Simple (one-to-one) uppercase mapping of `c` (`Py_UNICODE_TOUPPER`). +#[must_use] +pub fn simple_uppercase(c: char) -> char { + CaseMapper::new().simple_uppercase(c) +} + +/// Simple (one-to-one) titlecase mapping of `c` (`Py_UNICODE_TOTITLE`). +#[must_use] +pub fn simple_titlecase(c: char) -> char { + CaseMapper::new().simple_titlecase(c) +} + +/// Simple (one-to-one) case fold of `c`. +#[must_use] +pub fn simple_fold(c: char) -> char { + CaseMapper::new().simple_fold(c) +} + +// Casing predicates + +/// Whether `c` has the `Lowercase` property. +#[must_use] +pub fn is_lowercase(c: char) -> bool { + Lowercase::for_char(c) +} + +/// Whether `c` has the `Uppercase` property. +#[must_use] +pub fn is_uppercase(c: char) -> bool { + Uppercase::for_char(c) +} + +/// Whether `c` is a titlecase letter (general category `Lt`). +#[must_use] +pub fn is_titlecase(c: char) -> bool { + GeneralCategory::for_char(c) == GeneralCategory::TitlecaseLetter +} + +/// Whether `c` has the `Cased` property. +#[must_use] +pub fn is_cased(c: char) -> bool { + Cased::for_char(c) +} + +/// Whether `c` has the `Case_Ignorable` property. +#[must_use] +pub fn is_case_ignorable(c: char) -> bool { + CaseIgnorable::for_char(c) +} + +// String-level mappings + /// Full Unicode case fold of `text` (`str.casefold`). #[must_use] pub fn casefold_str(text: &str) -> String { @@ -23,29 +96,204 @@ pub fn casefold_str(text: &str) -> String { /// Full Unicode case fold of `text`, passing lone surrogates through unchanged. #[must_use] pub fn casefold_wtf8(text: &Wtf8) -> Wtf8Buf { + map_wtf8(text, |s, out| { + CaseMapper::new() + .fold(s) + .write_to(out) + .expect("writing to an in-memory buffer cannot fail"); + }) +} + +/// Capitalize `text` (`str.capitalize`): titlecase the first cased character, +/// lowercase the rest, with final-sigma context. +#[must_use] +pub fn capitalize_str(text: &str) -> String { let mut out = Vec::with_capacity(text.len()); - let mapper = CaseMapper::new(); + capitalize_utf8(text, &mut FmtWriter(&mut out)); + // SAFETY: capitalize_utf8 only appends valid UTF-8. + unsafe { String::from_utf8_unchecked(out) } +} + +/// Capitalize `text`, passing lone surrogates through unchanged. +/// +/// Only the first character of the whole string is titlecased; every later +/// character (including the first of a run that follows a lone surrogate) is +/// lowercased. +#[must_use] +pub fn capitalize_wtf8(text: &Wtf8) -> Wtf8Buf { + let mut out = Vec::with_capacity(text.len()); + let mut first = true; for chunk in text.chunks() { match chunk { Wtf8Chunk::Utf8(s) => { - mapper - .fold(s) - .write_to(&mut FmtWriter(&mut out)) - .expect("writing to an in-memory buffer cannot fail"); + let mut writer = FmtWriter(&mut out); + if first { + capitalize_utf8(s, &mut writer); + first = false; + } else { + for (i, ch) in s.char_indices() { + lowercase_or_sigma(ch, s, i, &mut writer); + } + } } Wtf8Chunk::Surrogate(c) => { - let mut buf = Wtf8Buf::new(); - buf.push(c); - out.extend_from_slice(buf.as_bytes()); + first = false; + push_surrogate(&mut out, c); } } } // SAFETY: - // * CaseMapper only produces valid UTF-8. + // * capitalize_utf8 / lowercase_or_sigma only append valid UTF-8. // * Surrogates are appended as valid WTF-8 (encoded via Wtf8Buf::push). unsafe { Wtf8Buf::from_bytes_unchecked(out) } } +/// Title case `text` (`str.title`). +#[must_use] +pub fn title_str(text: &str) -> String { + let mut out = Vec::with_capacity(text.len()); + titlecase_string(text, &mut FmtWriter(&mut out)); + // SAFETY: titlecase_string only appends valid UTF-8. + unsafe { String::from_utf8_unchecked(out) } +} + +/// Title case `text`, passing lone surrogates through unchanged. +#[must_use] +pub fn title_wtf8(text: &Wtf8) -> Wtf8Buf { + map_wtf8(text, titlecase_string) +} + +/// Swap the case of every character in `text` (`str.swapcase`). +#[must_use] +pub fn swapcase_str(text: &str) -> String { + let mut out = Vec::with_capacity(text.len()); + swapcase_utf8(text, &mut FmtWriter(&mut out)); + // SAFETY: swapcase_utf8 only appends valid UTF-8. + unsafe { String::from_utf8_unchecked(out) } +} + +/// Swap the case of every character in `text`, passing lone surrogates through. +#[must_use] +pub fn swapcase_wtf8(text: &Wtf8) -> Wtf8Buf { + map_wtf8(text, swapcase_utf8) +} + +// Internal helpers + +/// Run `f` over each valid UTF-8 run of `text`, appending the mapped output and +/// carrying lone surrogates through unchanged. +fn map_wtf8(text: &Wtf8, f: impl Fn(&str, &mut FmtWriter<'_>)) -> Wtf8Buf { + let mut out = Vec::with_capacity(text.len()); + for chunk in text.chunks() { + match chunk { + Wtf8Chunk::Utf8(s) => f(s, &mut FmtWriter(&mut out)), + Wtf8Chunk::Surrogate(c) => push_surrogate(&mut out, c), + } + } + // SAFETY: + // * `f` only appends valid UTF-8. + // * Surrogates are appended as valid WTF-8 (encoded via Wtf8Buf::push). + unsafe { Wtf8Buf::from_bytes_unchecked(out) } +} + +/// Append a lone surrogate to `out` as valid WTF-8 bytes. +fn push_surrogate(out: &mut Vec<u8>, c: CodePoint) { + let mut buf = Wtf8Buf::new(); + buf.push(c); + out.extend_from_slice(buf.as_bytes()); +} + +fn capitalize_utf8(s: &str, out: &mut FmtWriter<'_>) { + let mut chars = s.char_indices(); + if let Some((first_pos, first_ch)) = chars.next() { + let first = &s[..first_pos + first_ch.len_utf8()]; + titlecase_segment(first, out); + } + for (i, ch) in chars { + lowercase_or_sigma(ch, s, i, out); + } +} + +/// Title case a string following CPython conventions. +/// +/// The first character of each run of cased characters is title cased and the +/// rest are lowercased; a new run starts after any non-cased character (digits, +/// whitespace, punctuation, etc.). +/// "123abc" -> "123Abc" +/// "123abc456def" -> "123Abc456Def" +/// "123 abc" -> "123 Abc" +fn titlecase_string(s: &str, out: &mut FmtWriter<'_>) { + let mut previous_is_cased = false; + for (i, ch) in s.char_indices() { + if previous_is_cased { + lowercase_or_sigma(ch, s, i, out); + } else { + titlecase_segment(&s[i..i + ch.len_utf8()], out); + } + + previous_is_cased = is_cased(ch); + } +} + +fn titlecase_segment(s: &str, out: &mut FmtWriter<'_>) { + TitlecaseMapper::new() + .titlecase_segment(s, &LanguageIdentifier::UNKNOWN, Default::default()) + .write_to(out) + .expect("writing to an in-memory buffer cannot fail"); +} + +fn lowercase_or_sigma(ch: char, s: &str, i: usize, out: &mut FmtWriter<'_>) { + let sigma = 'Σ'; + if ch == sigma { + push_char(handle_capital_sigma(s, i), out); + } else { + for ch in ch.to_lowercase() { + push_char(ch, out); + } + } +} + +// Handle context-sensitive sigma. +// +// Sigma is handled as a special case. This is more efficient than using icu4x +// to scan the entire string with CaseMapper because CaseMapper would allocate +// to produce a new string. +fn handle_capital_sigma(s: &str, i: usize) -> char { + let (left, rest) = s.split_at(i); + let right = &rest['Σ'.len_utf8()..]; + + // Check if any chars before or after sigma are cased. + let before = left + .chars() + .rev() + .find(|&ch| !is_case_ignorable(ch)) + .is_some_and(is_cased); + let after = right + .chars() + .find(|&ch| !is_case_ignorable(ch)) + .is_some_and(is_cased); + if before && !after { 'ς' } else { 'σ' } +} + +fn swapcase_utf8(s: &str, out: &mut FmtWriter<'_>) { + for (i, ch) in s.char_indices() { + if ch.is_uppercase() { + lowercase_or_sigma(ch, s, i, out); + } else if ch.is_lowercase() { + for ch in ch.to_uppercase() { + push_char(ch, out); + } + } else { + push_char(ch, out); + } + } +} + +fn push_char(ch: char, out: &mut FmtWriter<'_>) { + let mut buf = [0u8; 4]; + out.0.extend_from_slice(ch.encode_utf8(&mut buf).as_bytes()); +} + /// Adapter so `icu`'s `Writeable` output can be appended to a byte buffer. struct FmtWriter<'a>(&'a mut Vec<u8>); @@ -58,7 +306,12 @@ impl core::fmt::Write for FmtWriter<'_> { #[cfg(test)] mod tests { - use super::casefold_str; + use rustpython_wtf8::{CodePoint, Wtf8Buf}; + + use super::{ + capitalize_str, casefold_str, is_case_ignorable, is_cased, is_lowercase, is_titlecase, + is_uppercase, simple_lowercase, simple_uppercase, swapcase_str, title_str, title_wtf8, + }; #[test] fn casefold_full_mappings() { @@ -66,4 +319,49 @@ mod tests { assert_eq!(casefold_str("ß"), "ss"); assert_eq!(casefold_str("Σ"), "σ"); } + + #[test] + fn simple_mappings_are_one_to_one() { + // ß has no simple uppercase mapping, so it stays unchanged (unlike the + // full mapping "SS"). + assert_eq!(simple_uppercase('ß'), 'ß'); + assert_eq!(simple_uppercase('a'), 'A'); + assert_eq!(simple_lowercase('A'), 'a'); + // Dž (U+01C5) simple-titlecases to itself but upper/lowercases away. + assert_eq!(simple_uppercase('Dž'), 'DŽ'); + assert_eq!(simple_lowercase('Dž'), 'dž'); + } + + #[test] + fn casing_predicates() { + assert!(is_lowercase('a')); + assert!(!is_lowercase('A')); + assert!(is_uppercase('A')); + assert!(is_titlecase('Dž')); + assert!(!is_titlecase('D')); + assert!(is_cased('a') && is_cased('A')); + assert!(!is_cased('1')); + assert!(is_case_ignorable('\'')); + assert!(!is_case_ignorable('a')); + } + + #[test] + fn capitalize_final_sigma() { + // Final sigma at end of a cased run becomes ς. + assert_eq!(capitalize_str("ΟΔΟΣ"), "Οδος"); + assert_eq!(title_str("hello world"), "Hello World"); + assert_eq!(swapcase_str("Hello"), "hELLO"); + } + + #[test] + fn wtf8_passes_surrogates_through() { + let mut buf = Wtf8Buf::from("ab cd"); + buf.push(CodePoint::from_u32(0xD800).unwrap()); + let titled = title_wtf8(&buf); + assert!(titled.code_points().any(|c| c.to_u32() == 0xD800)); + assert_eq!( + titled.code_points().next().and_then(|c| c.to_char()), + Some('A') + ); + } } diff --git a/crates/unicode/tests/data/cpython3.14_mappings.txt b/crates/unicode/tests/data/cpython3.14_mappings.txt new file mode 100644 index 000000000..f686c5fd1 --- /dev/null +++ b/crates/unicode/tests/data/cpython3.14_mappings.txt @@ -0,0 +1,2 @@ +# unidata_version 16.0.0 +tolower 41:61,42:62,43:63,44:64,45:65,46:66,47:67,48:68,49:69,4A:6A,4B:6B,4C:6C,4D:6D,4E:6E,4F:6F,50:70,51:71,52:72,53:73,54:74,55:75,56:76,57:77,58:78,59:79,5A:7A,C0:E0,C1:E1,C2:E2,C3:E3,C4:E4,C5:E5,C6:E6,C7:E7,C8:E8,C9:E9,CA:EA,CB:EB,CC:EC,CD:ED,CE:EE,CF:EF,D0:F0,D1:F1,D2:F2,D3:F3,D4:F4,D5:F5,D6:F6,D8:F8,D9:F9,DA:FA,DB:FB,DC:FC,DD:FD,DE:FE,100:101,102:103,104:105,106:107,108:109,10A:10B,10C:10D,10E:10F,110:111,112:113,114:115,116:117,118:119,11A:11B,11C:11D,11E:11F,120:121,122:123,124:125,126:127,128:129,12A:12B,12C:12D,12E:12F,130:69,132:133,134:135,136:137,139:13A,13B:13C,13D:13E,13F:140,141:142,143:144,145:146,147:148,14A:14B,14C:14D,14E:14F,150:151,152:153,154:155,156:157,158:159,15A:15B,15C:15D,15E:15F,160:161,162:163,164:165,166:167,168:169,16A:16B,16C:16D,16E:16F,170:171,172:173,174:175,176:177,178:FF,179:17A,17B:17C,17D:17E,181:253,182:183,184:185,186:254,187:188,189:256,18A:257,18B:18C,18E:1DD,18F:259,190:25B,191:192,193:260,194:263,196:269,197:268,198:199,19C:26F,19D:272,19F:275,1A0:1A1,1A2:1A3,1A4:1A5,1A6:280,1A7:1A8,1A9:283,1AC:1AD,1AE:288,1AF:1B0,1B1:28A,1B2:28B,1B3:1B4,1B5:1B6,1B7:292,1B8:1B9,1BC:1BD,1C4:1C6,1C5:1C6,1C7:1C9,1C8:1C9,1CA:1CC,1CB:1CC,1CD:1CE,1CF:1D0,1D1:1D2,1D3:1D4,1D5:1D6,1D7:1D8,1D9:1DA,1DB:1DC,1DE:1DF,1E0:1E1,1E2:1E3,1E4:1E5,1E6:1E7,1E8:1E9,1EA:1EB,1EC:1ED,1EE:1EF,1F1:1F3,1F2:1F3,1F4:1F5,1F6:195,1F7:1BF,1F8:1F9,1FA:1FB,1FC:1FD,1FE:1FF,200:201,202:203,204:205,206:207,208:209,20A:20B,20C:20D,20E:20F,210:211,212:213,214:215,216:217,218:219,21A:21B,21C:21D,21E:21F,220:19E,222:223,224:225,226:227,228:229,22A:22B,22C:22D,22E:22F,230:231,232:233,23A:2C65,23B:23C,23D:19A,23E:2C66,241:242,243:180,244:289,245:28C,246:247,248:249,24A:24B,24C:24D,24E:24F,370:371,372:373,376:377,37F:3F3,386:3AC,388:3AD,389:3AE,38A:3AF,38C:3CC,38E:3CD,38F:3CE,391:3B1,392:3B2,393:3B3,394:3B4,395:3B5,396:3B6,397:3B7,398:3B8,399:3B9,39A:3BA,39B:3BB,39C:3BC,39D:3BD,39E:3BE,39F:3BF,3A0:3C0,3A1:3C1,3A3:3C3,3A4:3C4,3A5:3C5,3A6:3C6,3A7:3C7,3A8:3C8,3A9:3C9,3AA:3CA,3AB:3CB,3CF:3D7,3D8:3D9,3DA:3DB,3DC:3DD,3DE:3DF,3E0:3E1,3E2:3E3,3E4:3E5,3E6:3E7,3E8:3E9,3EA:3EB,3EC:3ED,3EE:3EF,3F4:3B8,3F7:3F8,3F9:3F2,3FA:3FB,3FD:37B,3FE:37C,3FF:37D,400:450,401:451,402:452,403:453,404:454,405:455,406:456,407:457,408:458,409:459,40A:45A,40B:45B,40C:45C,40D:45D,40E:45E,40F:45F,410:430,411:431,412:432,413:433,414:434,415:435,416:436,417:437,418:438,419:439,41A:43A,41B:43B,41C:43C,41D:43D,41E:43E,41F:43F,420:440,421:441,422:442,423:443,424:444,425:445,426:446,427:447,428:448,429:449,42A:44A,42B:44B,42C:44C,42D:44D,42E:44E,42F:44F,460:461,462:463,464:465,466:467,468:469,46A:46B,46C:46D,46E:46F,470:471,472:473,474:475,476:477,478:479,47A:47B,47C:47D,47E:47F,480:481,48A:48B,48C:48D,48E:48F,490:491,492:493,494:495,496:497,498:499,49A:49B,49C:49D,49E:49F,4A0:4A1,4A2:4A3,4A4:4A5,4A6:4A7,4A8:4A9,4AA:4AB,4AC:4AD,4AE:4AF,4B0:4B1,4B2:4B3,4B4:4B5,4B6:4B7,4B8:4B9,4BA:4BB,4BC:4BD,4BE:4BF,4C0:4CF,4C1:4C2,4C3:4C4,4C5:4C6,4C7:4C8,4C9:4CA,4CB:4CC,4CD:4CE,4D0:4D1,4D2:4D3,4D4:4D5,4D6:4D7,4D8:4D9,4DA:4DB,4DC:4DD,4DE:4DF,4E0:4E1,4E2:4E3,4E4:4E5,4E6:4E7,4E8:4E9,4EA:4EB,4EC:4ED,4EE:4EF,4F0:4F1,4F2:4F3,4F4:4F5,4F6:4F7,4F8:4F9,4FA:4FB,4FC:4FD,4FE:4FF,500:501,502:503,504:505,506:507,508:509,50A:50B,50C:50D,50E:50F,510:511,512:513,514:515,516:517,518:519,51A:51B,51C:51D,51E:51F,520:521,522:523,524:525,526:527,528:529,52A:52B,52C:52D,52E:52F,531:561,532:562,533:563,534:564,535:565,536:566,537:567,538:568,539:569,53A:56A,53B:56B,53C:56C,53D:56D,53E:56E,53F:56F,540:570,541:571,542:572,543:573,544:574,545:575,546:576,547:577,548:578,549:579,54A:57A,54B:57B,54C:57C,54D:57D,54E:57E,54F:57F,550:580,551:581,552:582,553:583,554:584,555:585,556:586,10A0:2D00,10A1:2D01,10A2:2D02,10A3:2D03,10A4:2D04,10A5:2D05,10A6:2D06,10A7:2D07,10A8:2D08,10A9:2D09,10AA:2D0A,10AB:2D0B,10AC:2D0C,10AD:2D0D,10AE:2D0E,10AF:2D0F,10B0:2D10,10B1:2D11,10B2:2D12,10B3:2D13,10B4:2D14,10B5:2D15,10B6:2D16,10B7:2D17,10B8:2D18,10B9:2D19,10BA:2D1A,10BB:2D1B,10BC:2D1C,10BD:2D1D,10BE:2D1E,10BF:2D1F,10C0:2D20,10C1:2D21,10C2:2D22,10C3:2D23,10C4:2D24,10C5:2D25,10C7:2D27,10CD:2D2D,13A0:AB70,13A1:AB71,13A2:AB72,13A3:AB73,13A4:AB74,13A5:AB75,13A6:AB76,13A7:AB77,13A8:AB78,13A9:AB79,13AA:AB7A,13AB:AB7B,13AC:AB7C,13AD:AB7D,13AE:AB7E,13AF:AB7F,13B0:AB80,13B1:AB81,13B2:AB82,13B3:AB83,13B4:AB84,13B5:AB85,13B6:AB86,13B7:AB87,13B8:AB88,13B9:AB89,13BA:AB8A,13BB:AB8B,13BC:AB8C,13BD:AB8D,13BE:AB8E,13BF:AB8F,13C0:AB90,13C1:AB91,13C2:AB92,13C3:AB93,13C4:AB94,13C5:AB95,13C6:AB96,13C7:AB97,13C8:AB98,13C9:AB99,13CA:AB9A,13CB:AB9B,13CC:AB9C,13CD:AB9D,13CE:AB9E,13CF:AB9F,13D0:ABA0,13D1:ABA1,13D2:ABA2,13D3:ABA3,13D4:ABA4,13D5:ABA5,13D6:ABA6,13D7:ABA7,13D8:ABA8,13D9:ABA9,13DA:ABAA,13DB:ABAB,13DC:ABAC,13DD:ABAD,13DE:ABAE,13DF:ABAF,13E0:ABB0,13E1:ABB1,13E2:ABB2,13E3:ABB3,13E4:ABB4,13E5:ABB5,13E6:ABB6,13E7:ABB7,13E8:ABB8,13E9:ABB9,13EA:ABBA,13EB:ABBB,13EC:ABBC,13ED:ABBD,13EE:ABBE,13EF:ABBF,13F0:13F8,13F1:13F9,13F2:13FA,13F3:13FB,13F4:13FC,13F5:13FD,1C89:1C8A,1C90:10D0,1C91:10D1,1C92:10D2,1C93:10D3,1C94:10D4,1C95:10D5,1C96:10D6,1C97:10D7,1C98:10D8,1C99:10D9,1C9A:10DA,1C9B:10DB,1C9C:10DC,1C9D:10DD,1C9E:10DE,1C9F:10DF,1CA0:10E0,1CA1:10E1,1CA2:10E2,1CA3:10E3,1CA4:10E4,1CA5:10E5,1CA6:10E6,1CA7:10E7,1CA8:10E8,1CA9:10E9,1CAA:10EA,1CAB:10EB,1CAC:10EC,1CAD:10ED,1CAE:10EE,1CAF:10EF,1CB0:10F0,1CB1:10F1,1CB2:10F2,1CB3:10F3,1CB4:10F4,1CB5:10F5,1CB6:10F6,1CB7:10F7,1CB8:10F8,1CB9:10F9,1CBA:10FA,1CBD:10FD,1CBE:10FE,1CBF:10FF,1E00:1E01,1E02:1E03,1E04:1E05,1E06:1E07,1E08:1E09,1E0A:1E0B,1E0C:1E0D,1E0E:1E0F,1E10:1E11,1E12:1E13,1E14:1E15,1E16:1E17,1E18:1E19,1E1A:1E1B,1E1C:1E1D,1E1E:1E1F,1E20:1E21,1E22:1E23,1E24:1E25,1E26:1E27,1E28:1E29,1E2A:1E2B,1E2C:1E2D,1E2E:1E2F,1E30:1E31,1E32:1E33,1E34:1E35,1E36:1E37,1E38:1E39,1E3A:1E3B,1E3C:1E3D,1E3E:1E3F,1E40:1E41,1E42:1E43,1E44:1E45,1E46:1E47,1E48:1E49,1E4A:1E4B,1E4C:1E4D,1E4E:1E4F,1E50:1E51,1E52:1E53,1E54:1E55,1E56:1E57,1E58:1E59,1E5A:1E5B,1E5C:1E5D,1E5E:1E5F,1E60:1E61,1E62:1E63,1E64:1E65,1E66:1E67,1E68:1E69,1E6A:1E6B,1E6C:1E6D,1E6E:1E6F,1E70:1E71,1E72:1E73,1E74:1E75,1E76:1E77,1E78:1E79,1E7A:1E7B,1E7C:1E7D,1E7E:1E7F,1E80:1E81,1E82:1E83,1E84:1E85,1E86:1E87,1E88:1E89,1E8A:1E8B,1E8C:1E8D,1E8E:1E8F,1E90:1E91,1E92:1E93,1E94:1E95,1E9E:DF,1EA0:1EA1,1EA2:1EA3,1EA4:1EA5,1EA6:1EA7,1EA8:1EA9,1EAA:1EAB,1EAC:1EAD,1EAE:1EAF,1EB0:1EB1,1EB2:1EB3,1EB4:1EB5,1EB6:1EB7,1EB8:1EB9,1EBA:1EBB,1EBC:1EBD,1EBE:1EBF,1EC0:1EC1,1EC2:1EC3,1EC4:1EC5,1EC6:1EC7,1EC8:1EC9,1ECA:1ECB,1ECC:1ECD,1ECE:1ECF,1ED0:1ED1,1ED2:1ED3,1ED4:1ED5,1ED6:1ED7,1ED8:1ED9,1EDA:1EDB,1EDC:1EDD,1EDE:1EDF,1EE0:1EE1,1EE2:1EE3,1EE4:1EE5,1EE6:1EE7,1EE8:1EE9,1EEA:1EEB,1EEC:1EED,1EEE:1EEF,1EF0:1EF1,1EF2:1EF3,1EF4:1EF5,1EF6:1EF7,1EF8:1EF9,1EFA:1EFB,1EFC:1EFD,1EFE:1EFF,1F08:1F00,1F09:1F01,1F0A:1F02,1F0B:1F03,1F0C:1F04,1F0D:1F05,1F0E:1F06,1F0F:1F07,1F18:1F10,1F19:1F11,1F1A:1F12,1F1B:1F13,1F1C:1F14,1F1D:1F15,1F28:1F20,1F29:1F21,1F2A:1F22,1F2B:1F23,1F2C:1F24,1F2D:1F25,1F2E:1F26,1F2F:1F27,1F38:1F30,1F39:1F31,1F3A:1F32,1F3B:1F33,1F3C:1F34,1F3D:1F35,1F3E:1F36,1F3F:1F37,1F48:1F40,1F49:1F41,1F4A:1F42,1F4B:1F43,1F4C:1F44,1F4D:1F45,1F59:1F51,1F5B:1F53,1F5D:1F55,1F5F:1F57,1F68:1F60,1F69:1F61,1F6A:1F62,1F6B:1F63,1F6C:1F64,1F6D:1F65,1F6E:1F66,1F6F:1F67,1F88:1F80,1F89:1F81,1F8A:1F82,1F8B:1F83,1F8C:1F84,1F8D:1F85,1F8E:1F86,1F8F:1F87,1F98:1F90,1F99:1F91,1F9A:1F92,1F9B:1F93,1F9C:1F94,1F9D:1F95,1F9E:1F96,1F9F:1F97,1FA8:1FA0,1FA9:1FA1,1FAA:1FA2,1FAB:1FA3,1FAC:1FA4,1FAD:1FA5,1FAE:1FA6,1FAF:1FA7,1FB8:1FB0,1FB9:1FB1,1FBA:1F70,1FBB:1F71,1FBC:1FB3,1FC8:1F72,1FC9:1F73,1FCA:1F74,1FCB:1F75,1FCC:1FC3,1FD8:1FD0,1FD9:1FD1,1FDA:1F76,1FDB:1F77,1FE8:1FE0,1FE9:1FE1,1FEA:1F7A,1FEB:1F7B,1FEC:1FE5,1FF8:1F78,1FF9:1F79,1FFA:1F7C,1FFB:1F7D,1FFC:1FF3,2126:3C9,212A:6B,212B:E5,2132:214E,2160:2170,2161:2171,2162:2172,2163:2173,2164:2174,2165:2175,2166:2176,2167:2177,2168:2178,2169:2179,216A:217A,216B:217B,216C:217C,216D:217D,216E:217E,216F:217F,2183:2184,24B6:24D0,24B7:24D1,24B8:24D2,24B9:24D3,24BA:24D4,24BB:24D5,24BC:24D6,24BD:24D7,24BE:24D8,24BF:24D9,24C0:24DA,24C1:24DB,24C2:24DC,24C3:24DD,24C4:24DE,24C5:24DF,24C6:24E0,24C7:24E1,24C8:24E2,24C9:24E3,24CA:24E4,24CB:24E5,24CC:24E6,24CD:24E7,24CE:24E8,24CF:24E9,2C00:2C30,2C01:2C31,2C02:2C32,2C03:2C33,2C04:2C34,2C05:2C35,2C06:2C36,2C07:2C37,2C08:2C38,2C09:2C39,2C0A:2C3A,2C0B:2C3B,2C0C:2C3C,2C0D:2C3D,2C0E:2C3E,2C0F:2C3F,2C10:2C40,2C11:2C41,2C12:2C42,2C13:2C43,2C14:2C44,2C15:2C45,2C16:2C46,2C17:2C47,2C18:2C48,2C19:2C49,2C1A:2C4A,2C1B:2C4B,2C1C:2C4C,2C1D:2C4D,2C1E:2C4E,2C1F:2C4F,2C20:2C50,2C21:2C51,2C22:2C52,2C23:2C53,2C24:2C54,2C25:2C55,2C26:2C56,2C27:2C57,2C28:2C58,2C29:2C59,2C2A:2C5A,2C2B:2C5B,2C2C:2C5C,2C2D:2C5D,2C2E:2C5E,2C2F:2C5F,2C60:2C61,2C62:26B,2C63:1D7D,2C64:27D,2C67:2C68,2C69:2C6A,2C6B:2C6C,2C6D:251,2C6E:271,2C6F:250,2C70:252,2C72:2C73,2C75:2C76,2C7E:23F,2C7F:240,2C80:2C81,2C82:2C83,2C84:2C85,2C86:2C87,2C88:2C89,2C8A:2C8B,2C8C:2C8D,2C8E:2C8F,2C90:2C91,2C92:2C93,2C94:2C95,2C96:2C97,2C98:2C99,2C9A:2C9B,2C9C:2C9D,2C9E:2C9F,2CA0:2CA1,2CA2:2CA3,2CA4:2CA5,2CA6:2CA7,2CA8:2CA9,2CAA:2CAB,2CAC:2CAD,2CAE:2CAF,2CB0:2CB1,2CB2:2CB3,2CB4:2CB5,2CB6:2CB7,2CB8:2CB9,2CBA:2CBB,2CBC:2CBD,2CBE:2CBF,2CC0:2CC1,2CC2:2CC3,2CC4:2CC5,2CC6:2CC7,2CC8:2CC9,2CCA:2CCB,2CCC:2CCD,2CCE:2CCF,2CD0:2CD1,2CD2:2CD3,2CD4:2CD5,2CD6:2CD7,2CD8:2CD9,2CDA:2CDB,2CDC:2CDD,2CDE:2CDF,2CE0:2CE1,2CE2:2CE3,2CEB:2CEC,2CED:2CEE,2CF2:2CF3,A640:A641,A642:A643,A644:A645,A646:A647,A648:A649,A64A:A64B,A64C:A64D,A64E:A64F,A650:A651,A652:A653,A654:A655,A656:A657,A658:A659,A65A:A65B,A65C:A65D,A65E:A65F,A660:A661,A662:A663,A664:A665,A666:A667,A668:A669,A66A:A66B,A66C:A66D,A680:A681,A682:A683,A684:A685,A686:A687,A688:A689,A68A:A68B,A68C:A68D,A68E:A68F,A690:A691,A692:A693,A694:A695,A696:A697,A698:A699,A69A:A69B,A722:A723,A724:A725,A726:A727,A728:A729,A72A:A72B,A72C:A72D,A72E:A72F,A732:A733,A734:A735,A736:A737,A738:A739,A73A:A73B,A73C:A73D,A73E:A73F,A740:A741,A742:A743,A744:A745,A746:A747,A748:A749,A74A:A74B,A74C:A74D,A74E:A74F,A750:A751,A752:A753,A754:A755,A756:A757,A758:A759,A75A:A75B,A75C:A75D,A75E:A75F,A760:A761,A762:A763,A764:A765,A766:A767,A768:A769,A76A:A76B,A76C:A76D,A76E:A76F,A779:A77A,A77B:A77C,A77D:1D79,A77E:A77F,A780:A781,A782:A783,A784:A785,A786:A787,A78B:A78C,A78D:265,A790:A791,A792:A793,A796:A797,A798:A799,A79A:A79B,A79C:A79D,A79E:A79F,A7A0:A7A1,A7A2:A7A3,A7A4:A7A5,A7A6:A7A7,A7A8:A7A9,A7AA:266,A7AB:25C,A7AC:261,A7AD:26C,A7AE:26A,A7B0:29E,A7B1:287,A7B2:29D,A7B3:AB53,A7B4:A7B5,A7B6:A7B7,A7B8:A7B9,A7BA:A7BB,A7BC:A7BD,A7BE:A7BF,A7C0:A7C1,A7C2:A7C3,A7C4:A794,A7C5:282,A7C6:1D8E,A7C7:A7C8,A7C9:A7CA,A7CB:264,A7CC:A7CD,A7D0:A7D1,A7D6:A7D7,A7D8:A7D9,A7DA:A7DB,A7DC:19B,A7F5:A7F6,FF21:FF41,FF22:FF42,FF23:FF43,FF24:FF44,FF25:FF45,FF26:FF46,FF27:FF47,FF28:FF48,FF29:FF49,FF2A:FF4A,FF2B:FF4B,FF2C:FF4C,FF2D:FF4D,FF2E:FF4E,FF2F:FF4F,FF30:FF50,FF31:FF51,FF32:FF52,FF33:FF53,FF34:FF54,FF35:FF55,FF36:FF56,FF37:FF57,FF38:FF58,FF39:FF59,FF3A:FF5A,10400:10428,10401:10429,10402:1042A,10403:1042B,10404:1042C,10405:1042D,10406:1042E,10407:1042F,10408:10430,10409:10431,1040A:10432,1040B:10433,1040C:10434,1040D:10435,1040E:10436,1040F:10437,10410:10438,10411:10439,10412:1043A,10413:1043B,10414:1043C,10415:1043D,10416:1043E,10417:1043F,10418:10440,10419:10441,1041A:10442,1041B:10443,1041C:10444,1041D:10445,1041E:10446,1041F:10447,10420:10448,10421:10449,10422:1044A,10423:1044B,10424:1044C,10425:1044D,10426:1044E,10427:1044F,104B0:104D8,104B1:104D9,104B2:104DA,104B3:104DB,104B4:104DC,104B5:104DD,104B6:104DE,104B7:104DF,104B8:104E0,104B9:104E1,104BA:104E2,104BB:104E3,104BC:104E4,104BD:104E5,104BE:104E6,104BF:104E7,104C0:104E8,104C1:104E9,104C2:104EA,104C3:104EB,104C4:104EC,104C5:104ED,104C6:104EE,104C7:104EF,104C8:104F0,104C9:104F1,104CA:104F2,104CB:104F3,104CC:104F4,104CD:104F5,104CE:104F6,104CF:104F7,104D0:104F8,104D1:104F9,104D2:104FA,104D3:104FB,10570:10597,10571:10598,10572:10599,10573:1059A,10574:1059B,10575:1059C,10576:1059D,10577:1059E,10578:1059F,10579:105A0,1057A:105A1,1057C:105A3,1057D:105A4,1057E:105A5,1057F:105A6,10580:105A7,10581:105A8,10582:105A9,10583:105AA,10584:105AB,10585:105AC,10586:105AD,10587:105AE,10588:105AF,10589:105B0,1058A:105B1,1058C:105B3,1058D:105B4,1058E:105B5,1058F:105B6,10590:105B7,10591:105B8,10592:105B9,10594:105BB,10595:105BC,10C80:10CC0,10C81:10CC1,10C82:10CC2,10C83:10CC3,10C84:10CC4,10C85:10CC5,10C86:10CC6,10C87:10CC7,10C88:10CC8,10C89:10CC9,10C8A:10CCA,10C8B:10CCB,10C8C:10CCC,10C8D:10CCD,10C8E:10CCE,10C8F:10CCF,10C90:10CD0,10C91:10CD1,10C92:10CD2,10C93:10CD3,10C94:10CD4,10C95:10CD5,10C96:10CD6,10C97:10CD7,10C98:10CD8,10C99:10CD9,10C9A:10CDA,10C9B:10CDB,10C9C:10CDC,10C9D:10CDD,10C9E:10CDE,10C9F:10CDF,10CA0:10CE0,10CA1:10CE1,10CA2:10CE2,10CA3:10CE3,10CA4:10CE4,10CA5:10CE5,10CA6:10CE6,10CA7:10CE7,10CA8:10CE8,10CA9:10CE9,10CAA:10CEA,10CAB:10CEB,10CAC:10CEC,10CAD:10CED,10CAE:10CEE,10CAF:10CEF,10CB0:10CF0,10CB1:10CF1,10CB2:10CF2,10D50:10D70,10D51:10D71,10D52:10D72,10D53:10D73,10D54:10D74,10D55:10D75,10D56:10D76,10D57:10D77,10D58:10D78,10D59:10D79,10D5A:10D7A,10D5B:10D7B,10D5C:10D7C,10D5D:10D7D,10D5E:10D7E,10D5F:10D7F,10D60:10D80,10D61:10D81,10D62:10D82,10D63:10D83,10D64:10D84,10D65:10D85,118A0:118C0,118A1:118C1,118A2:118C2,118A3:118C3,118A4:118C4,118A5:118C5,118A6:118C6,118A7:118C7,118A8:118C8,118A9:118C9,118AA:118CA,118AB:118CB,118AC:118CC,118AD:118CD,118AE:118CE,118AF:118CF,118B0:118D0,118B1:118D1,118B2:118D2,118B3:118D3,118B4:118D4,118B5:118D5,118B6:118D6,118B7:118D7,118B8:118D8,118B9:118D9,118BA:118DA,118BB:118DB,118BC:118DC,118BD:118DD,118BE:118DE,118BF:118DF,16E40:16E60,16E41:16E61,16E42:16E62,16E43:16E63,16E44:16E64,16E45:16E65,16E46:16E66,16E47:16E67,16E48:16E68,16E49:16E69,16E4A:16E6A,16E4B:16E6B,16E4C:16E6C,16E4D:16E6D,16E4E:16E6E,16E4F:16E6F,16E50:16E70,16E51:16E71,16E52:16E72,16E53:16E73,16E54:16E74,16E55:16E75,16E56:16E76,16E57:16E77,16E58:16E78,16E59:16E79,16E5A:16E7A,16E5B:16E7B,16E5C:16E7C,16E5D:16E7D,16E5E:16E7E,16E5F:16E7F,1E900:1E922,1E901:1E923,1E902:1E924,1E903:1E925,1E904:1E926,1E905:1E927,1E906:1E928,1E907:1E929,1E908:1E92A,1E909:1E92B,1E90A:1E92C,1E90B:1E92D,1E90C:1E92E,1E90D:1E92F,1E90E:1E930,1E90F:1E931,1E910:1E932,1E911:1E933,1E912:1E934,1E913:1E935,1E914:1E936,1E915:1E937,1E916:1E938,1E917:1E939,1E918:1E93A,1E919:1E93B,1E91A:1E93C,1E91B:1E93D,1E91C:1E93E,1E91D:1E93F,1E91E:1E940,1E91F:1E941,1E920:1E942,1E921:1E943 diff --git a/crates/unicode/tests/data/cpython3.14_predicates.txt b/crates/unicode/tests/data/cpython3.14_predicates.txt index 9339f4e47..22f9d8d61 100644 --- a/crates/unicode/tests/data/cpython3.14_predicates.txt +++ b/crates/unicode/tests/data/cpython3.14_predicates.txt @@ -7,3 +7,7 @@ isnumeric 30:39,B2:B3,B9:B9,BC:BE,660:669,6F0:6F9,7C0:7C9,966:96F,9E6:9EF,9F4:9F isspace 9:D,1C:20,85:85,A0:A0,1680:1680,2000:200A,2028:2029,202F:202F,205F:205F,3000:3000 isprintable 20:7E,A1:AC,AE:377,37A:37F,384:38A,38C:38C,38E:3A1,3A3:52F,531:556,559:58A,58D:58F,591:5C7,5D0:5EA,5EF:5F4,606:61B,61D:6DC,6DE:70D,710:74A,74D:7B1,7C0:7FA,7FD:82D,830:83E,840:85B,85E:85E,860:86A,870:88E,897:8E1,8E3:983,985:98C,98F:990,993:9A8,9AA:9B0,9B2:9B2,9B6:9B9,9BC:9C4,9C7:9C8,9CB:9CE,9D7:9D7,9DC:9DD,9DF:9E3,9E6:9FE,A01:A03,A05:A0A,A0F:A10,A13:A28,A2A:A30,A32:A33,A35:A36,A38:A39,A3C:A3C,A3E:A42,A47:A48,A4B:A4D,A51:A51,A59:A5C,A5E:A5E,A66:A76,A81:A83,A85:A8D,A8F:A91,A93:AA8,AAA:AB0,AB2:AB3,AB5:AB9,ABC:AC5,AC7:AC9,ACB:ACD,AD0:AD0,AE0:AE3,AE6:AF1,AF9:AFF,B01:B03,B05:B0C,B0F:B10,B13:B28,B2A:B30,B32:B33,B35:B39,B3C:B44,B47:B48,B4B:B4D,B55:B57,B5C:B5D,B5F:B63,B66:B77,B82:B83,B85:B8A,B8E:B90,B92:B95,B99:B9A,B9C:B9C,B9E:B9F,BA3:BA4,BA8:BAA,BAE:BB9,BBE:BC2,BC6:BC8,BCA:BCD,BD0:BD0,BD7:BD7,BE6:BFA,C00:C0C,C0E:C10,C12:C28,C2A:C39,C3C:C44,C46:C48,C4A:C4D,C55:C56,C58:C5A,C5D:C5D,C60:C63,C66:C6F,C77:C8C,C8E:C90,C92:CA8,CAA:CB3,CB5:CB9,CBC:CC4,CC6:CC8,CCA:CCD,CD5:CD6,CDD:CDE,CE0:CE3,CE6:CEF,CF1:CF3,D00:D0C,D0E:D10,D12:D44,D46:D48,D4A:D4F,D54:D63,D66:D7F,D81:D83,D85:D96,D9A:DB1,DB3:DBB,DBD:DBD,DC0:DC6,DCA:DCA,DCF:DD4,DD6:DD6,DD8:DDF,DE6:DEF,DF2:DF4,E01:E3A,E3F:E5B,E81:E82,E84:E84,E86:E8A,E8C:EA3,EA5:EA5,EA7:EBD,EC0:EC4,EC6:EC6,EC8:ECE,ED0:ED9,EDC:EDF,F00:F47,F49:F6C,F71:F97,F99:FBC,FBE:FCC,FCE:FDA,1000:10C5,10C7:10C7,10CD:10CD,10D0:1248,124A:124D,1250:1256,1258:1258,125A:125D,1260:1288,128A:128D,1290:12B0,12B2:12B5,12B8:12BE,12C0:12C0,12C2:12C5,12C8:12D6,12D8:1310,1312:1315,1318:135A,135D:137C,1380:1399,13A0:13F5,13F8:13FD,1400:167F,1681:169C,16A0:16F8,1700:1715,171F:1736,1740:1753,1760:176C,176E:1770,1772:1773,1780:17DD,17E0:17E9,17F0:17F9,1800:180D,180F:1819,1820:1878,1880:18AA,18B0:18F5,1900:191E,1920:192B,1930:193B,1940:1940,1944:196D,1970:1974,1980:19AB,19B0:19C9,19D0:19DA,19DE:1A1B,1A1E:1A5E,1A60:1A7C,1A7F:1A89,1A90:1A99,1AA0:1AAD,1AB0:1ACE,1B00:1B4C,1B4E:1BF3,1BFC:1C37,1C3B:1C49,1C4D:1C8A,1C90:1CBA,1CBD:1CC7,1CD0:1CFA,1D00:1F15,1F18:1F1D,1F20:1F45,1F48:1F4D,1F50:1F57,1F59:1F59,1F5B:1F5B,1F5D:1F5D,1F5F:1F7D,1F80:1FB4,1FB6:1FC4,1FC6:1FD3,1FD6:1FDB,1FDD:1FEF,1FF2:1FF4,1FF6:1FFE,2010:2027,2030:205E,2070:2071,2074:208E,2090:209C,20A0:20C0,20D0:20F0,2100:218B,2190:2429,2440:244A,2460:2B73,2B76:2B95,2B97:2CF3,2CF9:2D25,2D27:2D27,2D2D:2D2D,2D30:2D67,2D6F:2D70,2D7F:2D96,2DA0:2DA6,2DA8:2DAE,2DB0:2DB6,2DB8:2DBE,2DC0:2DC6,2DC8:2DCE,2DD0:2DD6,2DD8:2DDE,2DE0:2E5D,2E80:2E99,2E9B:2EF3,2F00:2FD5,2FF0:2FFF,3001:303F,3041:3096,3099:30FF,3105:312F,3131:318E,3190:31E5,31EF:321E,3220:A48C,A490:A4C6,A4D0:A62B,A640:A6F7,A700:A7CD,A7D0:A7D1,A7D3:A7D3,A7D5:A7DC,A7F2:A82C,A830:A839,A840:A877,A880:A8C5,A8CE:A8D9,A8E0:A953,A95F:A97C,A980:A9CD,A9CF:A9D9,A9DE:A9FE,AA00:AA36,AA40:AA4D,AA50:AA59,AA5C:AAC2,AADB:AAF6,AB01:AB06,AB09:AB0E,AB11:AB16,AB20:AB26,AB28:AB2E,AB30:AB6B,AB70:ABED,ABF0:ABF9,AC00:D7A3,D7B0:D7C6,D7CB:D7FB,F900:FA6D,FA70:FAD9,FB00:FB06,FB13:FB17,FB1D:FB36,FB38:FB3C,FB3E:FB3E,FB40:FB41,FB43:FB44,FB46:FBC2,FBD3:FD8F,FD92:FDC7,FDCF:FDCF,FDF0:FE19,FE20:FE52,FE54:FE66,FE68:FE6B,FE70:FE74,FE76:FEFC,FF01:FFBE,FFC2:FFC7,FFCA:FFCF,FFD2:FFD7,FFDA:FFDC,FFE0:FFE6,FFE8:FFEE,FFFC:FFFD,10000:1000B,1000D:10026,10028:1003A,1003C:1003D,1003F:1004D,10050:1005D,10080:100FA,10100:10102,10107:10133,10137:1018E,10190:1019C,101A0:101A0,101D0:101FD,10280:1029C,102A0:102D0,102E0:102FB,10300:10323,1032D:1034A,10350:1037A,10380:1039D,1039F:103C3,103C8:103D5,10400:1049D,104A0:104A9,104B0:104D3,104D8:104FB,10500:10527,10530:10563,1056F:1057A,1057C:1058A,1058C:10592,10594:10595,10597:105A1,105A3:105B1,105B3:105B9,105BB:105BC,105C0:105F3,10600:10736,10740:10755,10760:10767,10780:10785,10787:107B0,107B2:107BA,10800:10805,10808:10808,1080A:10835,10837:10838,1083C:1083C,1083F:10855,10857:1089E,108A7:108AF,108E0:108F2,108F4:108F5,108FB:1091B,1091F:10939,1093F:1093F,10980:109B7,109BC:109CF,109D2:10A03,10A05:10A06,10A0C:10A13,10A15:10A17,10A19:10A35,10A38:10A3A,10A3F:10A48,10A50:10A58,10A60:10A9F,10AC0:10AE6,10AEB:10AF6,10B00:10B35,10B39:10B55,10B58:10B72,10B78:10B91,10B99:10B9C,10BA9:10BAF,10C00:10C48,10C80:10CB2,10CC0:10CF2,10CFA:10D27,10D30:10D39,10D40:10D65,10D69:10D85,10D8E:10D8F,10E60:10E7E,10E80:10EA9,10EAB:10EAD,10EB0:10EB1,10EC2:10EC4,10EFC:10F27,10F30:10F59,10F70:10F89,10FB0:10FCB,10FE0:10FF6,11000:1104D,11052:11075,1107F:110BC,110BE:110C2,110D0:110E8,110F0:110F9,11100:11134,11136:11147,11150:11176,11180:111DF,111E1:111F4,11200:11211,11213:11241,11280:11286,11288:11288,1128A:1128D,1128F:1129D,1129F:112A9,112B0:112EA,112F0:112F9,11300:11303,11305:1130C,1130F:11310,11313:11328,1132A:11330,11332:11333,11335:11339,1133B:11344,11347:11348,1134B:1134D,11350:11350,11357:11357,1135D:11363,11366:1136C,11370:11374,11380:11389,1138B:1138B,1138E:1138E,11390:113B5,113B7:113C0,113C2:113C2,113C5:113C5,113C7:113CA,113CC:113D5,113D7:113D8,113E1:113E2,11400:1145B,1145D:11461,11480:114C7,114D0:114D9,11580:115B5,115B8:115DD,11600:11644,11650:11659,11660:1166C,11680:116B9,116C0:116C9,116D0:116E3,11700:1171A,1171D:1172B,11730:11746,11800:1183B,118A0:118F2,118FF:11906,11909:11909,1190C:11913,11915:11916,11918:11935,11937:11938,1193B:11946,11950:11959,119A0:119A7,119AA:119D7,119DA:119E4,11A00:11A47,11A50:11AA2,11AB0:11AF8,11B00:11B09,11BC0:11BE1,11BF0:11BF9,11C00:11C08,11C0A:11C36,11C38:11C45,11C50:11C6C,11C70:11C8F,11C92:11CA7,11CA9:11CB6,11D00:11D06,11D08:11D09,11D0B:11D36,11D3A:11D3A,11D3C:11D3D,11D3F:11D47,11D50:11D59,11D60:11D65,11D67:11D68,11D6A:11D8E,11D90:11D91,11D93:11D98,11DA0:11DA9,11EE0:11EF8,11F00:11F10,11F12:11F3A,11F3E:11F5A,11FB0:11FB0,11FC0:11FF1,11FFF:12399,12400:1246E,12470:12474,12480:12543,12F90:12FF2,13000:1342F,13440:13455,13460:143FA,14400:14646,16100:16139,16800:16A38,16A40:16A5E,16A60:16A69,16A6E:16ABE,16AC0:16AC9,16AD0:16AED,16AF0:16AF5,16B00:16B45,16B50:16B59,16B5B:16B61,16B63:16B77,16B7D:16B8F,16D40:16D79,16E40:16E9A,16F00:16F4A,16F4F:16F87,16F8F:16F9F,16FE0:16FE4,16FF0:16FF1,17000:187F7,18800:18CD5,18CFF:18D08,1AFF0:1AFF3,1AFF5:1AFFB,1AFFD:1AFFE,1B000:1B122,1B132:1B132,1B150:1B152,1B155:1B155,1B164:1B167,1B170:1B2FB,1BC00:1BC6A,1BC70:1BC7C,1BC80:1BC88,1BC90:1BC99,1BC9C:1BC9F,1CC00:1CCF9,1CD00:1CEB3,1CF00:1CF2D,1CF30:1CF46,1CF50:1CFC3,1D000:1D0F5,1D100:1D126,1D129:1D172,1D17B:1D1EA,1D200:1D245,1D2C0:1D2D3,1D2E0:1D2F3,1D300:1D356,1D360:1D378,1D400:1D454,1D456:1D49C,1D49E:1D49F,1D4A2:1D4A2,1D4A5:1D4A6,1D4A9:1D4AC,1D4AE:1D4B9,1D4BB:1D4BB,1D4BD:1D4C3,1D4C5:1D505,1D507:1D50A,1D50D:1D514,1D516:1D51C,1D51E:1D539,1D53B:1D53E,1D540:1D544,1D546:1D546,1D54A:1D550,1D552:1D6A5,1D6A8:1D7CB,1D7CE:1DA8B,1DA9B:1DA9F,1DAA1:1DAAF,1DF00:1DF1E,1DF25:1DF2A,1E000:1E006,1E008:1E018,1E01B:1E021,1E023:1E024,1E026:1E02A,1E030:1E06D,1E08F:1E08F,1E100:1E12C,1E130:1E13D,1E140:1E149,1E14E:1E14F,1E290:1E2AE,1E2C0:1E2F9,1E2FF:1E2FF,1E4D0:1E4F9,1E5D0:1E5FA,1E5FF:1E5FF,1E7E0:1E7E6,1E7E8:1E7EB,1E7ED:1E7EE,1E7F0:1E7FE,1E800:1E8C4,1E8C7:1E8D6,1E900:1E94B,1E950:1E959,1E95E:1E95F,1EC71:1ECB4,1ED01:1ED3D,1EE00:1EE03,1EE05:1EE1F,1EE21:1EE22,1EE24:1EE24,1EE27:1EE27,1EE29:1EE32,1EE34:1EE37,1EE39:1EE39,1EE3B:1EE3B,1EE42:1EE42,1EE47:1EE47,1EE49:1EE49,1EE4B:1EE4B,1EE4D:1EE4F,1EE51:1EE52,1EE54:1EE54,1EE57:1EE57,1EE59:1EE59,1EE5B:1EE5B,1EE5D:1EE5D,1EE5F:1EE5F,1EE61:1EE62,1EE64:1EE64,1EE67:1EE6A,1EE6C:1EE72,1EE74:1EE77,1EE79:1EE7C,1EE7E:1EE7E,1EE80:1EE89,1EE8B:1EE9B,1EEA1:1EEA3,1EEA5:1EEA9,1EEAB:1EEBB,1EEF0:1EEF1,1F000:1F02B,1F030:1F093,1F0A0:1F0AE,1F0B1:1F0BF,1F0C1:1F0CF,1F0D1:1F0F5,1F100:1F1AD,1F1E6:1F202,1F210:1F23B,1F240:1F248,1F250:1F251,1F260:1F265,1F300:1F6D7,1F6DC:1F6EC,1F6F0:1F6FC,1F700:1F776,1F77B:1F7D9,1F7E0:1F7EB,1F7F0:1F7F0,1F800:1F80B,1F810:1F847,1F850:1F859,1F860:1F887,1F890:1F8AD,1F8B0:1F8BB,1F8C0:1F8C1,1F900:1FA53,1FA60:1FA6D,1FA70:1FA7C,1FA80:1FA89,1FA8F:1FAC6,1FACE:1FADC,1FADF:1FAE9,1FAF0:1FAF8,1FB00:1FB92,1FB94:1FBF9,20000:2A6DF,2A700:2B739,2B740:2B81D,2B820:2CEA1,2CEB0:2EBE0,2EBF0:2EE5D,2F800:2FA1D,30000:3134A,31350:323AF,E0100:E01EF isidentifier 41:5A,5F:5F,61:7A,AA:AA,B5:B5,BA:BA,C0:D6,D8:F6,F8:2C1,2C6:2D1,2E0:2E4,2EC:2EC,2EE:2EE,370:374,376:377,37B:37D,37F:37F,386:386,388:38A,38C:38C,38E:3A1,3A3:3F5,3F7:481,48A:52F,531:556,559:559,560:588,5D0:5EA,5EF:5F2,620:64A,66E:66F,671:6D3,6D5:6D5,6E5:6E6,6EE:6EF,6FA:6FC,6FF:6FF,710:710,712:72F,74D:7A5,7B1:7B1,7CA:7EA,7F4:7F5,7FA:7FA,800:815,81A:81A,824:824,828:828,840:858,860:86A,870:887,889:88E,8A0:8C9,904:939,93D:93D,950:950,958:961,971:980,985:98C,98F:990,993:9A8,9AA:9B0,9B2:9B2,9B6:9B9,9BD:9BD,9CE:9CE,9DC:9DD,9DF:9E1,9F0:9F1,9FC:9FC,A05:A0A,A0F:A10,A13:A28,A2A:A30,A32:A33,A35:A36,A38:A39,A59:A5C,A5E:A5E,A72:A74,A85:A8D,A8F:A91,A93:AA8,AAA:AB0,AB2:AB3,AB5:AB9,ABD:ABD,AD0:AD0,AE0:AE1,AF9:AF9,B05:B0C,B0F:B10,B13:B28,B2A:B30,B32:B33,B35:B39,B3D:B3D,B5C:B5D,B5F:B61,B71:B71,B83:B83,B85:B8A,B8E:B90,B92:B95,B99:B9A,B9C:B9C,B9E:B9F,BA3:BA4,BA8:BAA,BAE:BB9,BD0:BD0,C05:C0C,C0E:C10,C12:C28,C2A:C39,C3D:C3D,C58:C5A,C5D:C5D,C60:C61,C80:C80,C85:C8C,C8E:C90,C92:CA8,CAA:CB3,CB5:CB9,CBD:CBD,CDD:CDE,CE0:CE1,CF1:CF2,D04:D0C,D0E:D10,D12:D3A,D3D:D3D,D4E:D4E,D54:D56,D5F:D61,D7A:D7F,D85:D96,D9A:DB1,DB3:DBB,DBD:DBD,DC0:DC6,E01:E30,E32:E32,E40:E46,E81:E82,E84:E84,E86:E8A,E8C:EA3,EA5:EA5,EA7:EB0,EB2:EB2,EBD:EBD,EC0:EC4,EC6:EC6,EDC:EDF,F00:F00,F40:F47,F49:F6C,F88:F8C,1000:102A,103F:103F,1050:1055,105A:105D,1061:1061,1065:1066,106E:1070,1075:1081,108E:108E,10A0:10C5,10C7:10C7,10CD:10CD,10D0:10FA,10FC:1248,124A:124D,1250:1256,1258:1258,125A:125D,1260:1288,128A:128D,1290:12B0,12B2:12B5,12B8:12BE,12C0:12C0,12C2:12C5,12C8:12D6,12D8:1310,1312:1315,1318:135A,1380:138F,13A0:13F5,13F8:13FD,1401:166C,166F:167F,1681:169A,16A0:16EA,16EE:16F8,1700:1711,171F:1731,1740:1751,1760:176C,176E:1770,1780:17B3,17D7:17D7,17DC:17DC,1820:1878,1880:18A8,18AA:18AA,18B0:18F5,1900:191E,1950:196D,1970:1974,1980:19AB,19B0:19C9,1A00:1A16,1A20:1A54,1AA7:1AA7,1B05:1B33,1B45:1B4C,1B83:1BA0,1BAE:1BAF,1BBA:1BE5,1C00:1C23,1C4D:1C4F,1C5A:1C7D,1C80:1C8A,1C90:1CBA,1CBD:1CBF,1CE9:1CEC,1CEE:1CF3,1CF5:1CF6,1CFA:1CFA,1D00:1DBF,1E00:1F15,1F18:1F1D,1F20:1F45,1F48:1F4D,1F50:1F57,1F59:1F59,1F5B:1F5B,1F5D:1F5D,1F5F:1F7D,1F80:1FB4,1FB6:1FBC,1FBE:1FBE,1FC2:1FC4,1FC6:1FCC,1FD0:1FD3,1FD6:1FDB,1FE0:1FEC,1FF2:1FF4,1FF6:1FFC,2071:2071,207F:207F,2090:209C,2102:2102,2107:2107,210A:2113,2115:2115,2118:211D,2124:2124,2126:2126,2128:2128,212A:2139,213C:213F,2145:2149,214E:214E,2160:2188,2C00:2CE4,2CEB:2CEE,2CF2:2CF3,2D00:2D25,2D27:2D27,2D2D:2D2D,2D30:2D67,2D6F:2D6F,2D80:2D96,2DA0:2DA6,2DA8:2DAE,2DB0:2DB6,2DB8:2DBE,2DC0:2DC6,2DC8:2DCE,2DD0:2DD6,2DD8:2DDE,3005:3007,3021:3029,3031:3035,3038:303C,3041:3096,309D:309F,30A1:30FA,30FC:30FF,3105:312F,3131:318E,31A0:31BF,31F0:31FF,3400:4DBF,4E00:A48C,A4D0:A4FD,A500:A60C,A610:A61F,A62A:A62B,A640:A66E,A67F:A69D,A6A0:A6EF,A717:A71F,A722:A788,A78B:A7CD,A7D0:A7D1,A7D3:A7D3,A7D5:A7DC,A7F2:A801,A803:A805,A807:A80A,A80C:A822,A840:A873,A882:A8B3,A8F2:A8F7,A8FB:A8FB,A8FD:A8FE,A90A:A925,A930:A946,A960:A97C,A984:A9B2,A9CF:A9CF,A9E0:A9E4,A9E6:A9EF,A9FA:A9FE,AA00:AA28,AA40:AA42,AA44:AA4B,AA60:AA76,AA7A:AA7A,AA7E:AAAF,AAB1:AAB1,AAB5:AAB6,AAB9:AABD,AAC0:AAC0,AAC2:AAC2,AADB:AADD,AAE0:AAEA,AAF2:AAF4,AB01:AB06,AB09:AB0E,AB11:AB16,AB20:AB26,AB28:AB2E,AB30:AB5A,AB5C:AB69,AB70:ABE2,AC00:D7A3,D7B0:D7C6,D7CB:D7FB,F900:FA6D,FA70:FAD9,FB00:FB06,FB13:FB17,FB1D:FB1D,FB1F:FB28,FB2A:FB36,FB38:FB3C,FB3E:FB3E,FB40:FB41,FB43:FB44,FB46:FBB1,FBD3:FC5D,FC64:FD3D,FD50:FD8F,FD92:FDC7,FDF0:FDF9,FE71:FE71,FE73:FE73,FE77:FE77,FE79:FE79,FE7B:FE7B,FE7D:FE7D,FE7F:FEFC,FF21:FF3A,FF41:FF5A,FF66:FF9D,FFA0:FFBE,FFC2:FFC7,FFCA:FFCF,FFD2:FFD7,FFDA:FFDC,10000:1000B,1000D:10026,10028:1003A,1003C:1003D,1003F:1004D,10050:1005D,10080:100FA,10140:10174,10280:1029C,102A0:102D0,10300:1031F,1032D:1034A,10350:10375,10380:1039D,103A0:103C3,103C8:103CF,103D1:103D5,10400:1049D,104B0:104D3,104D8:104FB,10500:10527,10530:10563,10570:1057A,1057C:1058A,1058C:10592,10594:10595,10597:105A1,105A3:105B1,105B3:105B9,105BB:105BC,105C0:105F3,10600:10736,10740:10755,10760:10767,10780:10785,10787:107B0,107B2:107BA,10800:10805,10808:10808,1080A:10835,10837:10838,1083C:1083C,1083F:10855,10860:10876,10880:1089E,108E0:108F2,108F4:108F5,10900:10915,10920:10939,10980:109B7,109BE:109BF,10A00:10A00,10A10:10A13,10A15:10A17,10A19:10A35,10A60:10A7C,10A80:10A9C,10AC0:10AC7,10AC9:10AE4,10B00:10B35,10B40:10B55,10B60:10B72,10B80:10B91,10C00:10C48,10C80:10CB2,10CC0:10CF2,10D00:10D23,10D4A:10D65,10D6F:10D85,10E80:10EA9,10EB0:10EB1,10EC2:10EC4,10F00:10F1C,10F27:10F27,10F30:10F45,10F70:10F81,10FB0:10FC4,10FE0:10FF6,11003:11037,11071:11072,11075:11075,11083:110AF,110D0:110E8,11103:11126,11144:11144,11147:11147,11150:11172,11176:11176,11183:111B2,111C1:111C4,111DA:111DA,111DC:111DC,11200:11211,11213:1122B,1123F:11240,11280:11286,11288:11288,1128A:1128D,1128F:1129D,1129F:112A8,112B0:112DE,11305:1130C,1130F:11310,11313:11328,1132A:11330,11332:11333,11335:11339,1133D:1133D,11350:11350,1135D:11361,11380:11389,1138B:1138B,1138E:1138E,11390:113B5,113B7:113B7,113D1:113D1,113D3:113D3,11400:11434,11447:1144A,1145F:11461,11480:114AF,114C4:114C5,114C7:114C7,11580:115AE,115D8:115DB,11600:1162F,11644:11644,11680:116AA,116B8:116B8,11700:1171A,11740:11746,11800:1182B,118A0:118DF,118FF:11906,11909:11909,1190C:11913,11915:11916,11918:1192F,1193F:1193F,11941:11941,119A0:119A7,119AA:119D0,119E1:119E1,119E3:119E3,11A00:11A00,11A0B:11A32,11A3A:11A3A,11A50:11A50,11A5C:11A89,11A9D:11A9D,11AB0:11AF8,11BC0:11BE0,11C00:11C08,11C0A:11C2E,11C40:11C40,11C72:11C8F,11D00:11D06,11D08:11D09,11D0B:11D30,11D46:11D46,11D60:11D65,11D67:11D68,11D6A:11D89,11D98:11D98,11EE0:11EF2,11F02:11F02,11F04:11F10,11F12:11F33,11FB0:11FB0,12000:12399,12400:1246E,12480:12543,12F90:12FF0,13000:1342F,13441:13446,13460:143FA,14400:14646,16100:1611D,16800:16A38,16A40:16A5E,16A70:16ABE,16AD0:16AED,16B00:16B2F,16B40:16B43,16B63:16B77,16B7D:16B8F,16D40:16D6C,16E40:16E7F,16F00:16F4A,16F50:16F50,16F93:16F9F,16FE0:16FE1,16FE3:16FE3,17000:187F7,18800:18CD5,18CFF:18D08,1AFF0:1AFF3,1AFF5:1AFFB,1AFFD:1AFFE,1B000:1B122,1B132:1B132,1B150:1B152,1B155:1B155,1B164:1B167,1B170:1B2FB,1BC00:1BC6A,1BC70:1BC7C,1BC80:1BC88,1BC90:1BC99,1D400:1D454,1D456:1D49C,1D49E:1D49F,1D4A2:1D4A2,1D4A5:1D4A6,1D4A9:1D4AC,1D4AE:1D4B9,1D4BB:1D4BB,1D4BD:1D4C3,1D4C5:1D505,1D507:1D50A,1D50D:1D514,1D516:1D51C,1D51E:1D539,1D53B:1D53E,1D540:1D544,1D546:1D546,1D54A:1D550,1D552:1D6A5,1D6A8:1D6C0,1D6C2:1D6DA,1D6DC:1D6FA,1D6FC:1D714,1D716:1D734,1D736:1D74E,1D750:1D76E,1D770:1D788,1D78A:1D7A8,1D7AA:1D7C2,1D7C4:1D7CB,1DF00:1DF1E,1DF25:1DF2A,1E030:1E06D,1E100:1E12C,1E137:1E13D,1E14E:1E14E,1E290:1E2AD,1E2C0:1E2EB,1E4D0:1E4EB,1E5D0:1E5ED,1E5F0:1E5F0,1E7E0:1E7E6,1E7E8:1E7EB,1E7ED:1E7EE,1E7F0:1E7FE,1E800:1E8C4,1E900:1E943,1E94B:1E94B,1EE00:1EE03,1EE05:1EE1F,1EE21:1EE22,1EE24:1EE24,1EE27:1EE27,1EE29:1EE32,1EE34:1EE37,1EE39:1EE39,1EE3B:1EE3B,1EE42:1EE42,1EE47:1EE47,1EE49:1EE49,1EE4B:1EE4B,1EE4D:1EE4F,1EE51:1EE52,1EE54:1EE54,1EE57:1EE57,1EE59:1EE59,1EE5B:1EE5B,1EE5D:1EE5D,1EE5F:1EE5F,1EE61:1EE62,1EE64:1EE64,1EE67:1EE6A,1EE6C:1EE72,1EE74:1EE77,1EE79:1EE7C,1EE7E:1EE7E,1EE80:1EE89,1EE8B:1EE9B,1EEA1:1EEA3,1EEA5:1EEA9,1EEAB:1EEBB,20000:2A6DF,2A700:2B739,2B740:2B81D,2B820:2CEA1,2CEB0:2EBE0,2EBF0:2EE5D,2F800:2FA1D,30000:3134A,31350:323AF +is_lowercase 61:7A,AA:AA,B5:B5,BA:BA,DF:F6,F8:FF,101:101,103:103,105:105,107:107,109:109,10B:10B,10D:10D,10F:10F,111:111,113:113,115:115,117:117,119:119,11B:11B,11D:11D,11F:11F,121:121,123:123,125:125,127:127,129:129,12B:12B,12D:12D,12F:12F,131:131,133:133,135:135,137:138,13A:13A,13C:13C,13E:13E,140:140,142:142,144:144,146:146,148:149,14B:14B,14D:14D,14F:14F,151:151,153:153,155:155,157:157,159:159,15B:15B,15D:15D,15F:15F,161:161,163:163,165:165,167:167,169:169,16B:16B,16D:16D,16F:16F,171:171,173:173,175:175,177:177,17A:17A,17C:17C,17E:180,183:183,185:185,188:188,18C:18D,192:192,195:195,199:19B,19E:19E,1A1:1A1,1A3:1A3,1A5:1A5,1A8:1A8,1AA:1AB,1AD:1AD,1B0:1B0,1B4:1B4,1B6:1B6,1B9:1BA,1BD:1BF,1C6:1C6,1C9:1C9,1CC:1CC,1CE:1CE,1D0:1D0,1D2:1D2,1D4:1D4,1D6:1D6,1D8:1D8,1DA:1DA,1DC:1DD,1DF:1DF,1E1:1E1,1E3:1E3,1E5:1E5,1E7:1E7,1E9:1E9,1EB:1EB,1ED:1ED,1EF:1F0,1F3:1F3,1F5:1F5,1F9:1F9,1FB:1FB,1FD:1FD,1FF:1FF,201:201,203:203,205:205,207:207,209:209,20B:20B,20D:20D,20F:20F,211:211,213:213,215:215,217:217,219:219,21B:21B,21D:21D,21F:21F,221:221,223:223,225:225,227:227,229:229,22B:22B,22D:22D,22F:22F,231:231,233:239,23C:23C,23F:240,242:242,247:247,249:249,24B:24B,24D:24D,24F:293,295:2B8,2C0:2C1,2E0:2E4,345:345,371:371,373:373,377:377,37A:37D,390:390,3AC:3CE,3D0:3D1,3D5:3D7,3D9:3D9,3DB:3DB,3DD:3DD,3DF:3DF,3E1:3E1,3E3:3E3,3E5:3E5,3E7:3E7,3E9:3E9,3EB:3EB,3ED:3ED,3EF:3F3,3F5:3F5,3F8:3F8,3FB:3FC,430:45F,461:461,463:463,465:465,467:467,469:469,46B:46B,46D:46D,46F:46F,471:471,473:473,475:475,477:477,479:479,47B:47B,47D:47D,47F:47F,481:481,48B:48B,48D:48D,48F:48F,491:491,493:493,495:495,497:497,499:499,49B:49B,49D:49D,49F:49F,4A1:4A1,4A3:4A3,4A5:4A5,4A7:4A7,4A9:4A9,4AB:4AB,4AD:4AD,4AF:4AF,4B1:4B1,4B3:4B3,4B5:4B5,4B7:4B7,4B9:4B9,4BB:4BB,4BD:4BD,4BF:4BF,4C2:4C2,4C4:4C4,4C6:4C6,4C8:4C8,4CA:4CA,4CC:4CC,4CE:4CF,4D1:4D1,4D3:4D3,4D5:4D5,4D7:4D7,4D9:4D9,4DB:4DB,4DD:4DD,4DF:4DF,4E1:4E1,4E3:4E3,4E5:4E5,4E7:4E7,4E9:4E9,4EB:4EB,4ED:4ED,4EF:4EF,4F1:4F1,4F3:4F3,4F5:4F5,4F7:4F7,4F9:4F9,4FB:4FB,4FD:4FD,4FF:4FF,501:501,503:503,505:505,507:507,509:509,50B:50B,50D:50D,50F:50F,511:511,513:513,515:515,517:517,519:519,51B:51B,51D:51D,51F:51F,521:521,523:523,525:525,527:527,529:529,52B:52B,52D:52D,52F:52F,560:588,10D0:10FA,10FC:10FF,13F8:13FD,1C80:1C88,1C8A:1C8A,1D00:1DBF,1E01:1E01,1E03:1E03,1E05:1E05,1E07:1E07,1E09:1E09,1E0B:1E0B,1E0D:1E0D,1E0F:1E0F,1E11:1E11,1E13:1E13,1E15:1E15,1E17:1E17,1E19:1E19,1E1B:1E1B,1E1D:1E1D,1E1F:1E1F,1E21:1E21,1E23:1E23,1E25:1E25,1E27:1E27,1E29:1E29,1E2B:1E2B,1E2D:1E2D,1E2F:1E2F,1E31:1E31,1E33:1E33,1E35:1E35,1E37:1E37,1E39:1E39,1E3B:1E3B,1E3D:1E3D,1E3F:1E3F,1E41:1E41,1E43:1E43,1E45:1E45,1E47:1E47,1E49:1E49,1E4B:1E4B,1E4D:1E4D,1E4F:1E4F,1E51:1E51,1E53:1E53,1E55:1E55,1E57:1E57,1E59:1E59,1E5B:1E5B,1E5D:1E5D,1E5F:1E5F,1E61:1E61,1E63:1E63,1E65:1E65,1E67:1E67,1E69:1E69,1E6B:1E6B,1E6D:1E6D,1E6F:1E6F,1E71:1E71,1E73:1E73,1E75:1E75,1E77:1E77,1E79:1E79,1E7B:1E7B,1E7D:1E7D,1E7F:1E7F,1E81:1E81,1E83:1E83,1E85:1E85,1E87:1E87,1E89:1E89,1E8B:1E8B,1E8D:1E8D,1E8F:1E8F,1E91:1E91,1E93:1E93,1E95:1E9D,1E9F:1E9F,1EA1:1EA1,1EA3:1EA3,1EA5:1EA5,1EA7:1EA7,1EA9:1EA9,1EAB:1EAB,1EAD:1EAD,1EAF:1EAF,1EB1:1EB1,1EB3:1EB3,1EB5:1EB5,1EB7:1EB7,1EB9:1EB9,1EBB:1EBB,1EBD:1EBD,1EBF:1EBF,1EC1:1EC1,1EC3:1EC3,1EC5:1EC5,1EC7:1EC7,1EC9:1EC9,1ECB:1ECB,1ECD:1ECD,1ECF:1ECF,1ED1:1ED1,1ED3:1ED3,1ED5:1ED5,1ED7:1ED7,1ED9:1ED9,1EDB:1EDB,1EDD:1EDD,1EDF:1EDF,1EE1:1EE1,1EE3:1EE3,1EE5:1EE5,1EE7:1EE7,1EE9:1EE9,1EEB:1EEB,1EED:1EED,1EEF:1EEF,1EF1:1EF1,1EF3:1EF3,1EF5:1EF5,1EF7:1EF7,1EF9:1EF9,1EFB:1EFB,1EFD:1EFD,1EFF:1F07,1F10:1F15,1F20:1F27,1F30:1F37,1F40:1F45,1F50:1F57,1F60:1F67,1F70:1F7D,1F80:1F87,1F90:1F97,1FA0:1FA7,1FB0:1FB4,1FB6:1FB7,1FBE:1FBE,1FC2:1FC4,1FC6:1FC7,1FD0:1FD3,1FD6:1FD7,1FE0:1FE7,1FF2:1FF4,1FF6:1FF7,2071:2071,207F:207F,2090:209C,210A:210A,210E:210F,2113:2113,212F:212F,2134:2134,2139:2139,213C:213D,2146:2149,214E:214E,2170:217F,2184:2184,24D0:24E9,2C30:2C5F,2C61:2C61,2C65:2C66,2C68:2C68,2C6A:2C6A,2C6C:2C6C,2C71:2C71,2C73:2C74,2C76:2C7D,2C81:2C81,2C83:2C83,2C85:2C85,2C87:2C87,2C89:2C89,2C8B:2C8B,2C8D:2C8D,2C8F:2C8F,2C91:2C91,2C93:2C93,2C95:2C95,2C97:2C97,2C99:2C99,2C9B:2C9B,2C9D:2C9D,2C9F:2C9F,2CA1:2CA1,2CA3:2CA3,2CA5:2CA5,2CA7:2CA7,2CA9:2CA9,2CAB:2CAB,2CAD:2CAD,2CAF:2CAF,2CB1:2CB1,2CB3:2CB3,2CB5:2CB5,2CB7:2CB7,2CB9:2CB9,2CBB:2CBB,2CBD:2CBD,2CBF:2CBF,2CC1:2CC1,2CC3:2CC3,2CC5:2CC5,2CC7:2CC7,2CC9:2CC9,2CCB:2CCB,2CCD:2CCD,2CCF:2CCF,2CD1:2CD1,2CD3:2CD3,2CD5:2CD5,2CD7:2CD7,2CD9:2CD9,2CDB:2CDB,2CDD:2CDD,2CDF:2CDF,2CE1:2CE1,2CE3:2CE4,2CEC:2CEC,2CEE:2CEE,2CF3:2CF3,2D00:2D25,2D27:2D27,2D2D:2D2D,A641:A641,A643:A643,A645:A645,A647:A647,A649:A649,A64B:A64B,A64D:A64D,A64F:A64F,A651:A651,A653:A653,A655:A655,A657:A657,A659:A659,A65B:A65B,A65D:A65D,A65F:A65F,A661:A661,A663:A663,A665:A665,A667:A667,A669:A669,A66B:A66B,A66D:A66D,A681:A681,A683:A683,A685:A685,A687:A687,A689:A689,A68B:A68B,A68D:A68D,A68F:A68F,A691:A691,A693:A693,A695:A695,A697:A697,A699:A699,A69B:A69D,A723:A723,A725:A725,A727:A727,A729:A729,A72B:A72B,A72D:A72D,A72F:A731,A733:A733,A735:A735,A737:A737,A739:A739,A73B:A73B,A73D:A73D,A73F:A73F,A741:A741,A743:A743,A745:A745,A747:A747,A749:A749,A74B:A74B,A74D:A74D,A74F:A74F,A751:A751,A753:A753,A755:A755,A757:A757,A759:A759,A75B:A75B,A75D:A75D,A75F:A75F,A761:A761,A763:A763,A765:A765,A767:A767,A769:A769,A76B:A76B,A76D:A76D,A76F:A778,A77A:A77A,A77C:A77C,A77F:A77F,A781:A781,A783:A783,A785:A785,A787:A787,A78C:A78C,A78E:A78E,A791:A791,A793:A795,A797:A797,A799:A799,A79B:A79B,A79D:A79D,A79F:A79F,A7A1:A7A1,A7A3:A7A3,A7A5:A7A5,A7A7:A7A7,A7A9:A7A9,A7AF:A7AF,A7B5:A7B5,A7B7:A7B7,A7B9:A7B9,A7BB:A7BB,A7BD:A7BD,A7BF:A7BF,A7C1:A7C1,A7C3:A7C3,A7C8:A7C8,A7CA:A7CA,A7CD:A7CD,A7D1:A7D1,A7D3:A7D3,A7D5:A7D5,A7D7:A7D7,A7D9:A7D9,A7DB:A7DB,A7F2:A7F4,A7F6:A7F6,A7F8:A7FA,AB30:AB5A,AB5C:AB69,AB70:ABBF,FB00:FB06,FB13:FB17,FF41:FF5A,10428:1044F,104D8:104FB,10597:105A1,105A3:105B1,105B3:105B9,105BB:105BC,10780:10780,10783:10785,10787:107B0,107B2:107BA,10CC0:10CF2,10D70:10D85,118C0:118DF,16E60:16E7F,1D41A:1D433,1D44E:1D454,1D456:1D467,1D482:1D49B,1D4B6:1D4B9,1D4BB:1D4BB,1D4BD:1D4C3,1D4C5:1D4CF,1D4EA:1D503,1D51E:1D537,1D552:1D56B,1D586:1D59F,1D5BA:1D5D3,1D5EE:1D607,1D622:1D63B,1D656:1D66F,1D68A:1D6A5,1D6C2:1D6DA,1D6DC:1D6E1,1D6FC:1D714,1D716:1D71B,1D736:1D74E,1D750:1D755,1D770:1D788,1D78A:1D78F,1D7AA:1D7C2,1D7C4:1D7C9,1D7CB:1D7CB,1DF00:1DF09,1DF0B:1DF1E,1DF25:1DF2A,1E030:1E06D,1E922:1E943 +is_uppercase 41:5A,C0:D6,D8:DE,100:100,102:102,104:104,106:106,108:108,10A:10A,10C:10C,10E:10E,110:110,112:112,114:114,116:116,118:118,11A:11A,11C:11C,11E:11E,120:120,122:122,124:124,126:126,128:128,12A:12A,12C:12C,12E:12E,130:130,132:132,134:134,136:136,139:139,13B:13B,13D:13D,13F:13F,141:141,143:143,145:145,147:147,14A:14A,14C:14C,14E:14E,150:150,152:152,154:154,156:156,158:158,15A:15A,15C:15C,15E:15E,160:160,162:162,164:164,166:166,168:168,16A:16A,16C:16C,16E:16E,170:170,172:172,174:174,176:176,178:179,17B:17B,17D:17D,181:182,184:184,186:187,189:18B,18E:191,193:194,196:198,19C:19D,19F:1A0,1A2:1A2,1A4:1A4,1A6:1A7,1A9:1A9,1AC:1AC,1AE:1AF,1B1:1B3,1B5:1B5,1B7:1B8,1BC:1BC,1C4:1C4,1C7:1C7,1CA:1CA,1CD:1CD,1CF:1CF,1D1:1D1,1D3:1D3,1D5:1D5,1D7:1D7,1D9:1D9,1DB:1DB,1DE:1DE,1E0:1E0,1E2:1E2,1E4:1E4,1E6:1E6,1E8:1E8,1EA:1EA,1EC:1EC,1EE:1EE,1F1:1F1,1F4:1F4,1F6:1F8,1FA:1FA,1FC:1FC,1FE:1FE,200:200,202:202,204:204,206:206,208:208,20A:20A,20C:20C,20E:20E,210:210,212:212,214:214,216:216,218:218,21A:21A,21C:21C,21E:21E,220:220,222:222,224:224,226:226,228:228,22A:22A,22C:22C,22E:22E,230:230,232:232,23A:23B,23D:23E,241:241,243:246,248:248,24A:24A,24C:24C,24E:24E,370:370,372:372,376:376,37F:37F,386:386,388:38A,38C:38C,38E:38F,391:3A1,3A3:3AB,3CF:3CF,3D2:3D4,3D8:3D8,3DA:3DA,3DC:3DC,3DE:3DE,3E0:3E0,3E2:3E2,3E4:3E4,3E6:3E6,3E8:3E8,3EA:3EA,3EC:3EC,3EE:3EE,3F4:3F4,3F7:3F7,3F9:3FA,3FD:42F,460:460,462:462,464:464,466:466,468:468,46A:46A,46C:46C,46E:46E,470:470,472:472,474:474,476:476,478:478,47A:47A,47C:47C,47E:47E,480:480,48A:48A,48C:48C,48E:48E,490:490,492:492,494:494,496:496,498:498,49A:49A,49C:49C,49E:49E,4A0:4A0,4A2:4A2,4A4:4A4,4A6:4A6,4A8:4A8,4AA:4AA,4AC:4AC,4AE:4AE,4B0:4B0,4B2:4B2,4B4:4B4,4B6:4B6,4B8:4B8,4BA:4BA,4BC:4BC,4BE:4BE,4C0:4C1,4C3:4C3,4C5:4C5,4C7:4C7,4C9:4C9,4CB:4CB,4CD:4CD,4D0:4D0,4D2:4D2,4D4:4D4,4D6:4D6,4D8:4D8,4DA:4DA,4DC:4DC,4DE:4DE,4E0:4E0,4E2:4E2,4E4:4E4,4E6:4E6,4E8:4E8,4EA:4EA,4EC:4EC,4EE:4EE,4F0:4F0,4F2:4F2,4F4:4F4,4F6:4F6,4F8:4F8,4FA:4FA,4FC:4FC,4FE:4FE,500:500,502:502,504:504,506:506,508:508,50A:50A,50C:50C,50E:50E,510:510,512:512,514:514,516:516,518:518,51A:51A,51C:51C,51E:51E,520:520,522:522,524:524,526:526,528:528,52A:52A,52C:52C,52E:52E,531:556,10A0:10C5,10C7:10C7,10CD:10CD,13A0:13F5,1C89:1C89,1C90:1CBA,1CBD:1CBF,1E00:1E00,1E02:1E02,1E04:1E04,1E06:1E06,1E08:1E08,1E0A:1E0A,1E0C:1E0C,1E0E:1E0E,1E10:1E10,1E12:1E12,1E14:1E14,1E16:1E16,1E18:1E18,1E1A:1E1A,1E1C:1E1C,1E1E:1E1E,1E20:1E20,1E22:1E22,1E24:1E24,1E26:1E26,1E28:1E28,1E2A:1E2A,1E2C:1E2C,1E2E:1E2E,1E30:1E30,1E32:1E32,1E34:1E34,1E36:1E36,1E38:1E38,1E3A:1E3A,1E3C:1E3C,1E3E:1E3E,1E40:1E40,1E42:1E42,1E44:1E44,1E46:1E46,1E48:1E48,1E4A:1E4A,1E4C:1E4C,1E4E:1E4E,1E50:1E50,1E52:1E52,1E54:1E54,1E56:1E56,1E58:1E58,1E5A:1E5A,1E5C:1E5C,1E5E:1E5E,1E60:1E60,1E62:1E62,1E64:1E64,1E66:1E66,1E68:1E68,1E6A:1E6A,1E6C:1E6C,1E6E:1E6E,1E70:1E70,1E72:1E72,1E74:1E74,1E76:1E76,1E78:1E78,1E7A:1E7A,1E7C:1E7C,1E7E:1E7E,1E80:1E80,1E82:1E82,1E84:1E84,1E86:1E86,1E88:1E88,1E8A:1E8A,1E8C:1E8C,1E8E:1E8E,1E90:1E90,1E92:1E92,1E94:1E94,1E9E:1E9E,1EA0:1EA0,1EA2:1EA2,1EA4:1EA4,1EA6:1EA6,1EA8:1EA8,1EAA:1EAA,1EAC:1EAC,1EAE:1EAE,1EB0:1EB0,1EB2:1EB2,1EB4:1EB4,1EB6:1EB6,1EB8:1EB8,1EBA:1EBA,1EBC:1EBC,1EBE:1EBE,1EC0:1EC0,1EC2:1EC2,1EC4:1EC4,1EC6:1EC6,1EC8:1EC8,1ECA:1ECA,1ECC:1ECC,1ECE:1ECE,1ED0:1ED0,1ED2:1ED2,1ED4:1ED4,1ED6:1ED6,1ED8:1ED8,1EDA:1EDA,1EDC:1EDC,1EDE:1EDE,1EE0:1EE0,1EE2:1EE2,1EE4:1EE4,1EE6:1EE6,1EE8:1EE8,1EEA:1EEA,1EEC:1EEC,1EEE:1EEE,1EF0:1EF0,1EF2:1EF2,1EF4:1EF4,1EF6:1EF6,1EF8:1EF8,1EFA:1EFA,1EFC:1EFC,1EFE:1EFE,1F08:1F0F,1F18:1F1D,1F28:1F2F,1F38:1F3F,1F48:1F4D,1F59:1F59,1F5B:1F5B,1F5D:1F5D,1F5F:1F5F,1F68:1F6F,1FB8:1FBB,1FC8:1FCB,1FD8:1FDB,1FE8:1FEC,1FF8:1FFB,2102:2102,2107:2107,210B:210D,2110:2112,2115:2115,2119:211D,2124:2124,2126:2126,2128:2128,212A:212D,2130:2133,213E:213F,2145:2145,2160:216F,2183:2183,24B6:24CF,2C00:2C2F,2C60:2C60,2C62:2C64,2C67:2C67,2C69:2C69,2C6B:2C6B,2C6D:2C70,2C72:2C72,2C75:2C75,2C7E:2C80,2C82:2C82,2C84:2C84,2C86:2C86,2C88:2C88,2C8A:2C8A,2C8C:2C8C,2C8E:2C8E,2C90:2C90,2C92:2C92,2C94:2C94,2C96:2C96,2C98:2C98,2C9A:2C9A,2C9C:2C9C,2C9E:2C9E,2CA0:2CA0,2CA2:2CA2,2CA4:2CA4,2CA6:2CA6,2CA8:2CA8,2CAA:2CAA,2CAC:2CAC,2CAE:2CAE,2CB0:2CB0,2CB2:2CB2,2CB4:2CB4,2CB6:2CB6,2CB8:2CB8,2CBA:2CBA,2CBC:2CBC,2CBE:2CBE,2CC0:2CC0,2CC2:2CC2,2CC4:2CC4,2CC6:2CC6,2CC8:2CC8,2CCA:2CCA,2CCC:2CCC,2CCE:2CCE,2CD0:2CD0,2CD2:2CD2,2CD4:2CD4,2CD6:2CD6,2CD8:2CD8,2CDA:2CDA,2CDC:2CDC,2CDE:2CDE,2CE0:2CE0,2CE2:2CE2,2CEB:2CEB,2CED:2CED,2CF2:2CF2,A640:A640,A642:A642,A644:A644,A646:A646,A648:A648,A64A:A64A,A64C:A64C,A64E:A64E,A650:A650,A652:A652,A654:A654,A656:A656,A658:A658,A65A:A65A,A65C:A65C,A65E:A65E,A660:A660,A662:A662,A664:A664,A666:A666,A668:A668,A66A:A66A,A66C:A66C,A680:A680,A682:A682,A684:A684,A686:A686,A688:A688,A68A:A68A,A68C:A68C,A68E:A68E,A690:A690,A692:A692,A694:A694,A696:A696,A698:A698,A69A:A69A,A722:A722,A724:A724,A726:A726,A728:A728,A72A:A72A,A72C:A72C,A72E:A72E,A732:A732,A734:A734,A736:A736,A738:A738,A73A:A73A,A73C:A73C,A73E:A73E,A740:A740,A742:A742,A744:A744,A746:A746,A748:A748,A74A:A74A,A74C:A74C,A74E:A74E,A750:A750,A752:A752,A754:A754,A756:A756,A758:A758,A75A:A75A,A75C:A75C,A75E:A75E,A760:A760,A762:A762,A764:A764,A766:A766,A768:A768,A76A:A76A,A76C:A76C,A76E:A76E,A779:A779,A77B:A77B,A77D:A77E,A780:A780,A782:A782,A784:A784,A786:A786,A78B:A78B,A78D:A78D,A790:A790,A792:A792,A796:A796,A798:A798,A79A:A79A,A79C:A79C,A79E:A79E,A7A0:A7A0,A7A2:A7A2,A7A4:A7A4,A7A6:A7A6,A7A8:A7A8,A7AA:A7AE,A7B0:A7B4,A7B6:A7B6,A7B8:A7B8,A7BA:A7BA,A7BC:A7BC,A7BE:A7BE,A7C0:A7C0,A7C2:A7C2,A7C4:A7C7,A7C9:A7C9,A7CB:A7CC,A7D0:A7D0,A7D6:A7D6,A7D8:A7D8,A7DA:A7DA,A7DC:A7DC,A7F5:A7F5,FF21:FF3A,10400:10427,104B0:104D3,10570:1057A,1057C:1058A,1058C:10592,10594:10595,10C80:10CB2,10D50:10D65,118A0:118BF,16E40:16E5F,1D400:1D419,1D434:1D44D,1D468:1D481,1D49C:1D49C,1D49E:1D49F,1D4A2:1D4A2,1D4A5:1D4A6,1D4A9:1D4AC,1D4AE:1D4B5,1D4D0:1D4E9,1D504:1D505,1D507:1D50A,1D50D:1D514,1D516:1D51C,1D538:1D539,1D53B:1D53E,1D540:1D544,1D546:1D546,1D54A:1D550,1D56C:1D585,1D5A0:1D5B9,1D5D4:1D5ED,1D608:1D621,1D63C:1D655,1D670:1D689,1D6A8:1D6C0,1D6E2:1D6FA,1D71C:1D734,1D756:1D76E,1D790:1D7A8,1D7CA:1D7CA,1E900:1E921,1F130:1F149,1F150:1F169,1F170:1F189 +is_titlecase 1C5:1C5,1C8:1C8,1CB:1CB,1F2:1F2,1F88:1F8F,1F98:1F9F,1FA8:1FAF,1FBC:1FBC,1FCC:1FCC,1FFC:1FFC +is_cased 41:5A,61:7A,B5:B5,C0:D6,D8:F6,F8:137,139:18C,18E:1A9,1AC:1B9,1BC:1BD,1BF:1BF,1C4:220,222:233,23A:254,256:257,259:259,25B:25C,260:261,263:266,268:26C,26F:26F,271:272,275:275,27D:27D,280:280,282:283,287:28C,292:292,29D:29E,345:345,370:373,376:377,37B:37D,37F:37F,386:386,388:38A,38C:38C,38E:3A1,3A3:3D1,3D5:3F5,3F7:3FB,3FD:481,48A:52F,531:556,561:587,10A0:10C5,10C7:10C7,10CD:10CD,10D0:10FA,10FD:10FF,13A0:13F5,13F8:13FD,1C80:1C8A,1C90:1CBA,1CBD:1CBF,1D79:1D79,1D7D:1D7D,1D8E:1D8E,1E00:1E9B,1E9E:1E9E,1EA0:1F15,1F18:1F1D,1F20:1F45,1F48:1F4D,1F50:1F57,1F59:1F59,1F5B:1F5B,1F5D:1F5D,1F5F:1F7D,1F80:1FB4,1FB6:1FBC,1FBE:1FBE,1FC2:1FC4,1FC6:1FCC,1FD0:1FD3,1FD6:1FDB,1FE0:1FEC,1FF2:1FF4,1FF6:1FFC,2126:2126,212A:212B,2132:2132,214E:214E,2160:217F,2183:2184,24B6:24E9,2C00:2C70,2C72:2C73,2C75:2C76,2C7E:2CE3,2CEB:2CEE,2CF2:2CF3,2D00:2D25,2D27:2D27,2D2D:2D2D,A640:A66D,A680:A69B,A722:A72F,A732:A76F,A779:A787,A78B:A78D,A790:A794,A796:A7AE,A7B0:A7CD,A7D0:A7D1,A7D6:A7DC,A7F5:A7F6,AB53:AB53,AB70:ABBF,FB00:FB06,FB13:FB17,FF21:FF3A,FF41:FF5A,10400:1044F,104B0:104D3,104D8:104FB,10570:1057A,1057C:1058A,1058C:10592,10594:10595,10597:105A1,105A3:105B1,105B3:105B9,105BB:105BC,10C80:10CB2,10CC0:10CF2,10D50:10D65,10D70:10D85,118A0:118DF,16E40:16E7F,1E900:1E943 diff --git a/crates/unicode/tests/data/version_skew_cpython3.14.txt b/crates/unicode/tests/data/version_skew_cpython3.14.txt index acdb26089..e135c422f 100644 --- a/crates/unicode/tests/data/version_skew_cpython3.14.txt +++ b/crates/unicode/tests/data/version_skew_cpython3.14.txt @@ -2,6 +2,9 @@ # and the Rust std / icu4x build used here (a later Unicode release assigns them). # Regenerate with RUSTPYTHON_UNICODE_REGEN_SKEW=1. # Format: `predicate start:end,...` with inclusive hex ranges. +is_cased AA:AA,BA:BA,138:138,18D:18D,1AA:1AB,1BA:1BA,1BE:1BE,221:221,234:239,255:255,258:258,25A:25A,25D:25F,262:262,267:267,26D:26E,270:270,273:274,276:27C,27E:27F,281:281,284:286,28D:291,293:293,296:29C,29F:2B8,2C0:2C1,2E0:2E4,37A:37A,3D2:3D4,3FC:3FC,560:560,588:588,10FC:10FC,1D00:1D78,1D7A:1D7C,1D7E:1D8D,1D8F:1DBF,1E9C:1E9D,1E9F:1E9F,2071:2071,207F:207F,2090:209C,2102:2102,2107:2107,210A:2113,2115:2115,2119:211D,2124:2124,2128:2128,212C:212D,212F:2131,2133:2134,2139:2139,213C:213F,2145:2149,2C71:2C71,2C74:2C74,2C77:2C7D,2CE4:2CE4,A69C:A69D,A730:A731,A770:A778,A78E:A78E,A795:A795,A7AF:A7AF,A7CE:A7CF,A7D2:A7D5,A7F1:A7F4,A7F8:A7FA,AB30:AB52,AB54:AB5A,AB5C:AB69,10780:10780,10783:10785,10787:107B0,107B2:107BA,16EA0:16EB8,16EBB:16ED3,1D400:1D454,1D456:1D49C,1D49E:1D49F,1D4A2:1D4A2,1D4A5:1D4A6,1D4A9:1D4AC,1D4AE:1D4B9,1D4BB:1D4BB,1D4BD:1D4C3,1D4C5:1D505,1D507:1D50A,1D50D:1D514,1D516:1D51C,1D51E:1D539,1D53B:1D53E,1D540:1D544,1D546:1D546,1D54A:1D550,1D552:1D6A5,1D6A8:1D6C0,1D6C2:1D6DA,1D6DC:1D6FA,1D6FC:1D714,1D716:1D734,1D736:1D74E,1D750:1D76E,1D770:1D788,1D78A:1D7A8,1D7AA:1D7C2,1D7C4:1D7CB,1DF00:1DF09,1DF0B:1DF1E,1DF25:1DF2A,1E030:1E06D,1F130:1F149,1F150:1F169,1F170:1F189 +is_lowercase 295:295,A7CF:A7CF,A7F1:A7F1,16EBB:16ED3 +is_uppercase A7CE:A7CE,A7D2:A7D2,A7D4:A7D4,16EA0:16EB8 isalnum 88F:88F,C5C:C5C,CDC:CDC,A7CE:A7CF,A7D2:A7D2,A7D4:A7D4,A7F1:A7F1,10940:10959,10EC5:10EC7,11DB0:11DDB,11DE0:11DE9,16EA0:16EB8,16EBB:16ED3,16FF2:16FF6,187F8:187FF,18D09:18D1E,18D80:18DF2,1E6C0:1E6DE,1E6E0:1E6E2,1E6E4:1E6E5,1E6E7:1E6ED,1E6F0:1E6F4,1E6FE:1E6FF,2B73A:2B73F,2CEA2:2CEAD,323B0:33479 isalpha 88F:88F,C5C:C5C,CDC:CDC,A7CE:A7CF,A7D2:A7D2,A7D4:A7D4,A7F1:A7F1,10940:10959,10EC5:10EC7,11DB0:11DDB,16EA0:16EB8,16EBB:16ED3,16FF2:16FF3,187F8:187FF,18D09:18D1E,18D80:18DF2,1E6C0:1E6DE,1E6E0:1E6E2,1E6E4:1E6E5,1E6E7:1E6ED,1E6F0:1E6F4,1E6FE:1E6FF,2B73A:2B73F,2CEA2:2CEAD,323B0:33479 isdecimal 11DE0:11DE9 diff --git a/crates/unicode/tests/data/version_skew_mappings_cpython3.14.txt b/crates/unicode/tests/data/version_skew_mappings_cpython3.14.txt new file mode 100644 index 000000000..8992b1898 --- /dev/null +++ b/crates/unicode/tests/data/version_skew_mappings_cpython3.14.txt @@ -0,0 +1,5 @@ +# Code points whose simple case mapping differs between CPython 3.14 +# (Unicode 16.0.0) and the icu4x build used here (a later Unicode release +# assigns the pair). Regenerate with RUSTPYTHON_UNICODE_REGEN_SKEW=1. +# Format: `mapping start:end,...` with inclusive hex ranges. +tolower A7CE:A7CE,A7D2:A7D2,A7D4:A7D4,16EA0:16EB8 diff --git a/crates/unicode/tests/differential.rs b/crates/unicode/tests/differential.rs index fef3451fd..1bed13e7f 100644 --- a/crates/unicode/tests/differential.rs +++ b/crates/unicode/tests/differential.rs @@ -11,17 +11,21 @@ //! Both data files use the same run-length format: one `predicate` line per //! str method, followed by comma-separated hex `start:end` inclusive ranges. +// spell-checker:ignore recategorized recategorizations + #[cfg(test)] mod tests { extern crate alloc; use alloc::collections::{BTreeMap, BTreeSet}; - use rustpython_unicode::classify; + use rustpython_unicode::{case, classify}; const MAX: u32 = 0x110000; const REFERENCE: &str = include_str!("data/cpython3.14_predicates.txt"); const VERSION_SKEW: &str = include_str!("data/version_skew_cpython3.14.txt"); + const MAPPINGS: &str = include_str!("data/cpython3.14_mappings.txt"); + const MAPPING_SKEW: &str = include_str!("data/version_skew_mappings_cpython3.14.txt"); fn crate_predicate(name: &str, cp: u32) -> bool { let Some(c) = char::from_u32(cp) else { @@ -41,10 +45,25 @@ mod tests { // is "may start an identifier". classify_is_identifier_char(c) } + "is_lowercase" => case::is_lowercase(c), + "is_uppercase" => case::is_uppercase(c), + "is_titlecase" => case::is_titlecase(c), + "is_cased" => case::is_cased(c), other => panic!("unknown predicate {other}"), } } + /// The crate's simple case mapping for `name` at `cp`, as a code point. + fn crate_mapping(name: &str, cp: u32) -> u32 { + let Some(c) = char::from_u32(cp) else { + return cp; + }; + match name { + "tolower" => case::simple_lowercase(c) as u32, + other => panic!("unknown mapping {other}"), + } + } + fn classify_is_identifier_char(c: char) -> bool { rustpython_unicode::identifier::is_start(c) } @@ -80,6 +99,36 @@ mod tests { map } + /// Parse a `name -> {code point -> mapped code point}` table. + /// + /// Each non-comment line is `name cp:mapped,cp:mapped,...` listing only the + /// code points whose mapping differs from identity. + fn parse_mappings(text: &str) -> BTreeMap<String, BTreeMap<u32, u32>> { + let mut map = BTreeMap::new(); + for line in text.lines() { + let line = line.trim(); + if line.is_empty() || line.starts_with('#') { + continue; + } + let (name, packed) = match line.split_once(' ') { + Some((name, packed)) => (name, packed.trim()), + None => (line, ""), + }; + let mut table = BTreeMap::new(); + if !packed.is_empty() { + for pair in packed.split(',') { + let (cp, mapped) = pair.split_once(':').expect("pair is cp:mapped"); + table.insert( + u32::from_str_radix(cp, 16).unwrap(), + u32::from_str_radix(mapped, 16).unwrap(), + ); + } + } + map.insert(name.to_string(), table); + } + map + } + /// Collapse a sorted code-point set into inclusive `start:end` runs. fn encode_ranges(set: &BTreeSet<u32>) -> String { let mut runs = Vec::new(); @@ -119,14 +168,23 @@ mod tests { out } + /// Documented `cpython=true/crate=false` divergences: a code point that had a + /// property in Unicode 16.0.0 but lost it in the release icu4x ships, because + /// the code point was recategorized (not a regression in this crate). + /// + /// * U+0295 LATIN LETTER PHARYNGEAL VOICED FRICATIVE was general category `Ll` + /// in Unicode 16.0.0 and `Lo` from 17.0.0, so it is no longer `Lowercase`. + const KNOWN_RECATEGORIZATIONS: &[(&str, u32)] = &[("is_lowercase", 0x0295)]; + /// Regenerate `data/version_skew_cpython3.14.txt` from the current toolchain. /// /// Run with `RUSTPYTHON_UNICODE_REGEN_SKEW=1 cargo test -p rustpython-unicode - /// --test differential` after bumping the Rust/icu toolchain. All divergences - /// must be one-directional (crate=true, cpython=false) — newly-assigned code + /// --test differential` after bumping the Rust/icu toolchain. Divergences are + /// normally one-directional (crate=true, cpython=false) — newly-assigned code /// points from a later Unicode release. A `cpython=true, crate=false` entry - /// means a code point lost a property, which is a real regression, so this - /// refuses to record it. + /// means a code point lost a property; that is a real regression unless it is + /// an explicit entry in `KNOWN_RECATEGORIZATIONS`, so this refuses to record + /// any other reverse-direction divergence. #[test] fn regen_version_skew() { if std::env::var_os("RUSTPYTHON_UNICODE_REGEN_SKEW").is_none() { @@ -137,7 +195,9 @@ mod tests { let regressions: Vec<_> = divergences .iter() - .filter(|(_, _, expected)| *expected) + .filter(|(name, cp, expected)| { + *expected && !KNOWN_RECATEGORIZATIONS.contains(&(name.as_str(), *cp)) + }) .collect(); assert!( regressions.is_empty(), @@ -232,4 +292,133 @@ mod tests { panic!("{msg}"); } } + + /// All `(mapping, code point)` where the crate and CPython map differently. + fn all_mapping_divergences( + reference: &BTreeMap<String, BTreeMap<u32, u32>>, + ) -> Vec<(String, u32)> { + let mut out = Vec::new(); + for (name, table) in reference { + for cp in 0..MAX { + let expected = table.get(&cp).copied().unwrap_or(cp); + if crate_mapping(name, cp) != expected { + out.push((name.clone(), cp)); + } + } + } + out + } + + /// Regenerate `data/version_skew_mappings_cpython3.14.txt` from the current + /// toolchain (`RUSTPYTHON_UNICODE_REGEN_SKEW=1`). + /// + /// Divergences are normally the crate gaining a mapping a later Unicode + /// release assigns. A code point that CPython maps but the crate leaves + /// unmapped is a regression, not version skew, so this refuses to record it. + #[test] + fn regen_mapping_version_skew() { + if std::env::var_os("RUSTPYTHON_UNICODE_REGEN_SKEW").is_none() { + return; + } + let reference = parse_mappings(MAPPINGS); + let divergences = all_mapping_divergences(&reference); + + let regressions: Vec<_> = divergences + .iter() + .filter(|(name, cp)| { + let expected = reference.get(name).and_then(|t| t.get(cp)).copied(); + expected.is_some_and(|e| e != *cp) && crate_mapping(name, *cp) == *cp + }) + .collect(); + assert!( + regressions.is_empty(), + "refusing to record {} cpython-maps/crate-unmapped divergence(s) — these are \ + regressions, not version skew: {:?}", + regressions.len(), + &regressions[..regressions.len().min(20)] + ); + + let mut by_mapping: BTreeMap<String, BTreeSet<u32>> = BTreeMap::new(); + for (name, cp) in &divergences { + by_mapping.entry(name.clone()).or_default().insert(*cp); + } + + let mut body = String::from( + "# Code points whose simple case mapping differs between CPython 3.14\n\ + # (Unicode 16.0.0) and the icu4x build used here (a later Unicode release\n\ + # assigns the pair). Regenerate with RUSTPYTHON_UNICODE_REGEN_SKEW=1.\n\ + # Format: `mapping start:end,...` with inclusive hex ranges.\n", + ); + for (name, set) in &by_mapping { + body.push_str(&format!("{name} {}\n", encode_ranges(set))); + } + let path = concat!( + env!("CARGO_MANIFEST_DIR"), + "/tests/data/version_skew_mappings_cpython3.14.txt" + ); + std::fs::write(path, body).unwrap(); + eprintln!( + "wrote {} skew code points across {} mappings to {path}", + divergences.len(), + by_mapping.len() + ); + } + + #[test] + fn simple_mappings_match_cpython_except_documented_version_skew() { + let reference = parse_mappings(MAPPINGS); + let skew = parse_ranges(MAPPING_SKEW); + + let allowed = |name: &str, cp: u32| skew.get(name).is_some_and(|set| set.contains(&cp)); + + let mut unexpected: Vec<(String, u32, u32, u32)> = Vec::new(); + for (name, table) in &reference { + for cp in 0..MAX { + let expected = table.get(&cp).copied().unwrap_or(cp); + let actual = crate_mapping(name, cp); + if expected != actual && !allowed(name, cp) { + unexpected.push((name.clone(), cp, expected, actual)); + } + } + } + + let mut stale: Vec<(String, u32)> = Vec::new(); + for (name, set) in &skew { + for &cp in set { + let expected = reference + .get(name) + .and_then(|t| t.get(&cp)) + .copied() + .unwrap_or(cp); + if crate_mapping(name, cp) == expected { + stale.push((name.clone(), cp)); + } + } + } + + if !unexpected.is_empty() || !stale.is_empty() { + let mut msg = String::new(); + if !unexpected.is_empty() { + msg.push_str(&format!( + "{} undocumented mapping divergence(s) from CPython:\n", + unexpected.len() + )); + for (name, cp, expected, actual) in unexpected.iter().take(50) { + msg.push_str(&format!( + " {name} U+{cp:04X}: cpython=U+{expected:04X} crate=U+{actual:04X}\n" + )); + } + } + if !stale.is_empty() { + msg.push_str(&format!( + "{} stale version_skew_mappings_cpython3.14.txt entries that now agree:\n", + stale.len() + )); + for (name, cp) in stale.iter().take(50) { + msg.push_str(&format!(" {name} U+{cp:04X}\n")); + } + } + panic!("{msg}"); + } + } } diff --git a/crates/unicode/tests/generate_reference.py b/crates/unicode/tests/generate_reference.py index c7b21e66f..6a78230de 100644 --- a/crates/unicode/tests/generate_reference.py +++ b/crates/unicode/tests/generate_reference.py @@ -14,6 +14,7 @@ Writes ``tests/data/cpython3.14_predicates.txt``. Commit the result. from __future__ import annotations +import _sre import pathlib import sys import unicodedata @@ -32,6 +33,29 @@ STR_PREDICATES = { "isidentifier": str.isidentifier, } +# Casing predicates, keyed by the crate function each one exercises. Each is +# sourced from the exact property that function computes: +# * is_lowercase / is_uppercase mirror Py_UNICODE_ISLOWER / ISUPPER, which for a +# single character are str.islower() / str.isupper(). +# * is_titlecase is the Lt general category (NOT str.istitle(), which also +# reports plain uppercase letters as titlecased). +# * is_cased is the Cased property (Py_UNICODE_ISCASED), via _sre. +CASE_PREDICATES = { + "is_lowercase": lambda c: c.islower(), + "is_uppercase": lambda c: c.isupper(), + "is_titlecase": lambda c: unicodedata.category(c) == "Lt", + "is_cased": lambda c: _sre.unicode_iscased(ord(c)), +} + +# Simple one-to-one lowercase mapping (Py_UNICODE_TOLOWER via _sre). This is the +# mapping the regex IGNORECASE path depends on. Emitted as `cp:mapping,...` for +# code points that map to something other than themselves. CPython exposes no +# Python-level simple-uppercase oracle (_sre has unicode_tolower only), so +# toupper is left to the SRE unit tests. +CASE_MAPPINGS = { + "tolower": _sre.unicode_tolower, +} + def encode_ranges(is_true) -> list[tuple[int, int]]: """Collapse the true-set of ``is_true`` into inclusive ``[start, end]`` runs.""" @@ -56,17 +80,33 @@ def main() -> int: "expected 16.0.0 (CPython 3.14); regenerating anyway\n" ) - out = pathlib.Path(__file__).parent / "data" / "cpython3.14_predicates.txt" - out.parent.mkdir(parents=True, exist_ok=True) + data = pathlib.Path(__file__).parent / "data" + data.mkdir(parents=True, exist_ok=True) lines = [f"# unidata_version {unicodedata.unidata_version}"] for name, method in STR_PREDICATES.items(): ranges = encode_ranges(lambda cp, m=method: m(chr(cp))) packed = ",".join(f"{s:X}:{e:X}" for s, e in ranges) lines.append(f"{name} {packed}") + for name, method in CASE_PREDICATES.items(): + ranges = encode_ranges(lambda cp, m=method: m(chr(cp))) + packed = ",".join(f"{s:X}:{e:X}" for s, e in ranges) + lines.append(f"{name} {packed}") - out.write_text("\n".join(lines) + "\n") - print(f"wrote {out} ({out.stat().st_size} bytes)") + predicates = data / "cpython3.14_predicates.txt" + predicates.write_text("\n".join(lines) + "\n") + print(f"wrote {predicates} ({predicates.stat().st_size} bytes)") + + mapping_lines = [f"# unidata_version {unicodedata.unidata_version}"] + for name, method in CASE_MAPPINGS.items(): + pairs = [ + f"{cp:X}:{mapped:X}" for cp in range(MAX) if (mapped := method(cp)) != cp + ] + mapping_lines.append(f"{name} {','.join(pairs)}") + + mappings = data / "cpython3.14_mappings.txt" + mappings.write_text("\n".join(mapping_lines) + "\n") + print(f"wrote {mappings} ({mappings.stat().st_size} bytes)") return 0 diff --git a/crates/vm/Cargo.toml b/crates/vm/Cargo.toml index 24006c8b3..ca92b9dfd 100644 --- a/crates/vm/Cargo.toml +++ b/crates/vm/Cargo.toml @@ -82,12 +82,6 @@ optional = { workspace = true } result-like = { workspace = true } timsort = { workspace = true } -## unicode stuff -icu_casemap = { workspace = true } -icu_locale = { workspace = true } -icu_properties = { workspace = true } -writeable = { workspace = true } - [target.'cfg(unix)'.dependencies] exitcode = { workspace = true } diff --git a/crates/vm/src/anystr.rs b/crates/vm/src/anystr.rs index 3aa40eaf3..69ba52526 100644 --- a/crates/vm/src/anystr.rs +++ b/crates/vm/src/anystr.rs @@ -1,9 +1,7 @@ use core::ops::Range; -use icu_properties::props::{ - BinaryProperty, EnumeratedProperty, GeneralCategory, GeneralCategoryGroup, -}; use num_traits::{cast::ToPrimitive, sign::Signed}; +use rustpython_unicode::case; use crate::{ Py, PyObject, PyObjectRef, PyResult, TryFromObject, VirtualMachine, @@ -448,24 +446,18 @@ pub(crate) trait AnyStr { // Unified form of CPython functions: // unicode_isupper_impl // unicode_islower_impl - fn is_cased<VALID, INVALID>(&self) -> bool - where - VALID: BinaryProperty, - INVALID: BinaryProperty, - { + fn is_cased(&self, valid: fn(char) -> bool, invalid: fn(char) -> bool) -> bool { let mut all_cased = false; for c in self .as_bytes() .utf8_chunks() .flat_map(|c| c.valid().chars()) { - if INVALID::for_char(c) - || GeneralCategoryGroup::TitlecaseLetter.contains(GeneralCategory::for_char(c)) - { + if invalid(c) || case::is_titlecase(c) { return false; } - if !all_cased && VALID::for_char(c) { + if !all_cased && valid(c) { all_cased = true; } } diff --git a/crates/vm/src/builtins/str.rs b/crates/vm/src/builtins/str.rs index a72a27267..b1a119f5e 100644 --- a/crates/vm/src/builtins/str.rs +++ b/crates/vm/src/builtins/str.rs @@ -30,7 +30,6 @@ use crate::{ AsMapping, AsNumber, AsSequence, Comparable, Constructor, Hashable, IterNext, Iterable, PyComparisonOp, Representable, SelfIter, }, - utils::VecFmtWriter, }; use alloc::{borrow::Cow, fmt}; use ascii::{AsciiChar, AsciiStr, AsciiString}; @@ -48,14 +47,7 @@ use rustpython_common::{ wtf8::{CodePoint, Wtf8, Wtf8Buf, Wtf8Concat}, }; -use icu_casemap::TitlecaseMapper; -use icu_locale::LanguageIdentifier; -use icu_properties::props::{ - BinaryProperty, CaseIgnorable, Cased, EnumeratedProperty, GeneralCategory, - GeneralCategoryGroup, Lowercase, Uppercase, -}; -use rustpython_unicode as unicode; -use writeable::Writeable; +use rustpython_unicode::{self as unicode, case}; impl<'a> TryFromBorrowedObject<'a> for String { fn try_from_borrowed_object(vm: &VirtualMachine, obj: &'a PyObject) -> PyResult<Self> { @@ -778,40 +770,8 @@ impl PyStr { } s.into() } - PyKindStr::Utf8(s) => { - let mut chars = s.char_indices(); - let mut out = VecFmtWriter(Vec::with_capacity(s.len())); - titlecase_first(s, &mut chars, &mut out); - for (i, ch) in chars { - lowercase_or_sigma(ch, s, i, &mut out); - } - unsafe { Wtf8Buf::from_bytes_unchecked(out.0) } - } - PyKindStr::Wtf8(s) => { - let mut out = VecFmtWriter(Vec::with_capacity(s.len())); - let mut chunks = s.as_bytes().utf8_chunks(); - - if let Some(first) = chunks.next() { - let s = first.valid(); - let mut chars = s.char_indices(); - titlecase_first(s, &mut chars, &mut out); - for (i, ch) in chars { - lowercase_or_sigma(ch, s, i, &mut out); - } - out.0.extend(first.invalid()); - } - // This loop is only hit if the WTF-8 buffer contains invalid Unicode. Otherwise, - // everything is handled above without chunking. - for chunk in chunks { - let s = chunk.valid(); - for (i, ch) in s.char_indices() { - lowercase_or_sigma(ch, s, i, &mut out); - } - out.0.extend(chunk.invalid()); - } - - unsafe { Wtf8Buf::from_bytes_unchecked(out.0) } - } + PyKindStr::Utf8(s) => case::capitalize_str(s).into(), + PyKindStr::Wtf8(s) => case::capitalize_wtf8(s), } } @@ -1062,23 +1022,8 @@ impl PyStr { PyKindStr::Ascii(_) => unsafe { Wtf8Buf::from_bytes_unchecked(title_ascii(self.as_bytes())) }, - PyKindStr::Utf8(s) => { - let mut out = VecFmtWriter(Vec::with_capacity(s.len())); - titlecase_string(s, &mut out); - // SAFETY: `s` is valid UTF-8 and titlecase_string only works on Unicode. - unsafe { Wtf8Buf::from_bytes_unchecked(out.0) } - } - PyKindStr::Wtf8(s) => { - let mut out = VecFmtWriter(Vec::with_capacity(s.len())); - for chunk in s.as_bytes().utf8_chunks() { - titlecase_string(chunk.valid(), &mut out); - out.0.extend(chunk.invalid()); - } - // SAFETY: - // * `s` is valid WTF-8; surrogate bytes were appended without processing. - // * TitlecaseMapper produces valid UTF-8. - unsafe { Wtf8Buf::from_bytes_unchecked(out.0) } - } + PyKindStr::Utf8(s) => case::title_str(s).into(), + PyKindStr::Wtf8(s) => case::title_wtf8(s), } } @@ -1089,23 +1034,8 @@ impl PyStr { // SAFETY: ASCII is valid Unicode and swapcase_ascii does not produce non-ASCII. Wtf8Buf::from_bytes_unchecked(swapcase_ascii(s.as_bytes())) }, - PyKindStr::Utf8(s) => { - let mut out = VecFmtWriter(Vec::with_capacity(s.len())); - swapcase_utf8(s, &mut out); - // SAFETY: `s` is valid UTF-8 and swapcase_utf8 only works on Unicode. - unsafe { Wtf8Buf::from_bytes_unchecked(out.0) } - } - PyKindStr::Wtf8(s) => { - let mut out = VecFmtWriter(Vec::with_capacity(s.len())); - for chunk in s.as_bytes().utf8_chunks() { - swapcase_utf8(chunk.valid(), &mut out); - out.0.extend(chunk.invalid()); - } - // SAFETY: - // * `s` is valid WTF-8; surrogate bytes were appended without processing. - // * swapcase_utf8 produces valid UTF-8. - unsafe { Wtf8Buf::from_bytes_unchecked(out.0) } - } + PyKindStr::Utf8(s) => case::swapcase_str(s).into(), + PyKindStr::Wtf8(s) => case::swapcase_wtf8(s), } } @@ -1307,9 +1237,7 @@ impl PyStr { let mut cased = false; let mut previous_is_cased = false; for c in self.as_wtf8().code_points().map(CodePoint::to_char_lossy) { - if c.is_uppercase() - || GeneralCategoryGroup::TitlecaseLetter.contains(GeneralCategory::for_char(c)) - { + if c.is_uppercase() || case::is_titlecase(c) { if previous_is_cased { return false; } @@ -1546,102 +1474,6 @@ impl PyStr { } } -/// Title case first char if it is cased or write as is. -/// -/// This matches CPython's behavior: -/// "123abc" -> "123abc" -/// "abc" -> "Abc" -fn titlecase_first(s: &str, chars: &mut core::str::CharIndices<'_>, out: &mut VecFmtWriter) { - if let Some((first_pos, first_ch)) = chars.next() { - let first = &s[..first_pos + first_ch.len_utf8()]; - let tm = TitlecaseMapper::new(); - tm.titlecase_segment(first, &LanguageIdentifier::UNKNOWN, Default::default()) - .write_to(out) - .expect("Writing to an in-memory buffer cannot fail."); - } -} - -/// Title case a string following CPython conventions. -/// -/// CPython title cases each char in a segment. A "segment" is split by case ignorable characters -/// rather than whitespace. -/// "123abc" -> "123Abc" -/// "123abc456def" -> "123Abc456Def" -/// "123 abc" -> "123 Abc" -fn titlecase_string(s: &str, out: &mut VecFmtWriter) { - let mut previous_is_cased = false; - let mapper = TitlecaseMapper::new(); - for (i, ch) in s.char_indices() { - if previous_is_cased { - lowercase_or_sigma(ch, s, i, out); - } else { - let s = &s[i..i + ch.len_utf8()]; - mapper - .titlecase_segment(s, &LanguageIdentifier::UNKNOWN, Default::default()) - .write_to(out) - .expect("Writing to an in-memory buffer cannot fail."); - } - - previous_is_cased = Cased::for_char(ch); - } -} - -fn lowercase_or_sigma(ch: char, s: &str, i: usize, out: &mut VecFmtWriter) { - let sigma = 'Σ'; - if ch == sigma { - let sigma_cased = handle_capital_sigma(s, i); - let mut buf = [0u8; 4]; - let s = sigma_cased.encode_utf8(&mut buf); - out.0.extend(s.as_bytes()); - } else { - for ch in ch.to_lowercase() { - let mut buf = [0u8; 4]; - let s = ch.encode_utf8(&mut buf); - out.0.extend(s.as_bytes()); - } - } -} - -// Handle context-sensitive sigma. -// -// CPython handles sigma as a special case. This is more efficient than using icu4x to scan the -// entire string with CaseMapper because CaseMapper would allocate to produce a new string. The -// icu4x crates are robust but CPython's capitalize() is NOT so we can skip the extra allocs. -fn handle_capital_sigma(s: &str, i: usize) -> char { - let (left, rest) = s.split_at(i); - let right = &rest['Σ'.len_utf8()..]; - - // Check if any chars before or after sigma are cased. - let before = left - .chars() - .rev() - .find(|&ch| !CaseIgnorable::for_char(ch)) - .is_some_and(Cased::for_char); - let after = right - .chars() - .find(|&ch| !CaseIgnorable::for_char(ch)) - .is_some_and(Cased::for_char); - if before && !after { 'ς' } else { 'σ' } -} - -fn swapcase_utf8(s: &str, out: &mut VecFmtWriter) { - for (i, ch) in s.char_indices() { - if ch.is_uppercase() { - lowercase_or_sigma(ch, s, i, out); - } else if ch.is_lowercase() { - for ch in ch.to_uppercase() { - let mut buf = [0u8; 4]; - let s = ch.encode_utf8(&mut buf); - out.0.extend(s.as_bytes()); - } - } else { - let mut buf = [0u8; 4]; - let s = ch.encode_utf8(&mut buf); - out.0.extend(s.as_bytes()); - } - } -} - impl PyRef<PyStr> { #[must_use] pub fn is_empty(&self) -> bool { @@ -2454,11 +2286,11 @@ impl AnyStr for str { } fn py_islower(&self) -> bool { - self.is_cased::<Lowercase, Uppercase>() + self.is_cased(case::is_lowercase, case::is_uppercase) } fn py_isupper(&self) -> bool { - self.is_cased::<Uppercase, Lowercase>() + self.is_cased(case::is_uppercase, case::is_lowercase) } } @@ -2574,11 +2406,11 @@ impl AnyStr for Wtf8 { } fn py_islower(&self) -> bool { - self.is_cased::<Lowercase, Uppercase>() + self.is_cased(case::is_lowercase, case::is_uppercase) } fn py_isupper(&self) -> bool { - self.is_cased::<Uppercase, Lowercase>() + self.is_cased(case::is_uppercase, case::is_lowercase) } } diff --git a/crates/vm/src/stdlib/_sre.rs b/crates/vm/src/stdlib/_sre.rs index 1f62b48b1..f7bc10e66 100644 --- a/crates/vm/src/stdlib/_sre.rs +++ b/crates/vm/src/stdlib/_sre.rs @@ -23,7 +23,7 @@ mod _sre { use num_traits::ToPrimitive; use rustpython_sre_engine::{ Request, SearchIter, SreFlag, State, StrDrive, - string::{lower_ascii, lower_unicode, upper_unicode}, + string::{lower_ascii, lower_unicode}, }; #[pyattr] @@ -41,8 +41,7 @@ mod _sre { #[pyfunction] fn unicode_iscased(ch: i32) -> bool { - let ch = ch as u32; - ch != lower_unicode(ch) || ch != upper_unicode(ch) + char::from_u32(ch as u32).is_some_and(rustpython_unicode::case::is_cased) } #[pyfunction] diff --git a/crates/vm/src/utils.rs b/crates/vm/src/utils.rs index 51e27123f..b5117ddd8 100644 --- a/crates/vm/src/utils.rs +++ b/crates/vm/src/utils.rs @@ -1,5 +1,3 @@ -use core::fmt; - use rustpython_common::wtf8::{Wtf8, Wtf8Buf}; use crate::{ @@ -74,16 +72,3 @@ where Ok(repr) } - -/// Wrapper around a bytes vector that implements [`fmt::Write`]. -/// -/// # Safety -/// Don't assume the contents of the internal vector are valid UTF-8/WTF-8. -pub(crate) struct VecFmtWriter(pub Vec<u8>); - -impl fmt::Write for VecFmtWriter { - fn write_str(&mut self, s: &str) -> fmt::Result { - self.0.extend(s.bytes()); - Ok(()) - } -} From c03e266c9b8105c49c736286611a588d2da5ef59 Mon Sep 17 00:00:00 2001 From: "Jeong, YunWon" <69878+youknowone@users.noreply.github.com> Date: Thu, 9 Jul 2026 01:38:30 +0900 Subject: [PATCH 207/339] Titlecase the first-of-word code point without leading adjustment (#8241) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit case::{title,capitalize}_wtf8 pass a single first-of-word code point to TitlecaseMapper::titlecase_segment. Under the default Auto leading adjustment the mapper looks for a Letter/Number/Symbol/Private_Use head and skips anything else, dropping the titlecase mapping of cased marks such as U+0345 (COMBINING GREEK YPOGEGRAMMENI) -> U+0399: 'ͅ'.title() returned 'ͅ' instead of 'Ι'. Use LeadingAdjustment::None so the given code point is titlecased directly, matching CPython str.title and str.capitalize. Assisted-by: Claude --- crates/unicode/src/case.rs | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/crates/unicode/src/case.rs b/crates/unicode/src/case.rs index 0d7413339..c563db093 100644 --- a/crates/unicode/src/case.rs +++ b/crates/unicode/src/case.rs @@ -19,6 +19,7 @@ use alloc::{ vec::Vec, }; +use icu_casemap::options::{LeadingAdjustment, TitlecaseOptions}; use icu_casemap::{CaseMapper, TitlecaseMapper}; use icu_locale::LanguageIdentifier; use icu_properties::props::{ @@ -236,8 +237,16 @@ fn titlecase_string(s: &str, out: &mut FmtWriter<'_>) { } fn titlecase_segment(s: &str, out: &mut FmtWriter<'_>) { + // Callers pass a single first-of-word code point, which Python titlecases + // unconditionally (applying its titlecase mapping). The default `Auto` + // leading adjustment looks for a head in Letter/Number/Symbol/Private_Use + // and skips anything else, dropping the titlecase mapping of cased marks + // such as U+0345 (`ͅ`, general category Mn) -> U+0399 (`Ι`). `None` + // titlecases the code point as given. + let mut options = TitlecaseOptions::default(); + options.leading_adjustment = Some(LeadingAdjustment::None); TitlecaseMapper::new() - .titlecase_segment(s, &LanguageIdentifier::UNKNOWN, Default::default()) + .titlecase_segment(s, &LanguageIdentifier::UNKNOWN, options) .write_to(out) .expect("writing to an in-memory buffer cannot fail"); } @@ -353,6 +362,23 @@ mod tests { assert_eq!(swapcase_str("Hello"), "hELLO"); } + #[test] + fn titlecase_first_of_word_takes_titlecase_mapping() { + // A leading cased combining mark still takes its titlecase mapping: + // U+0345 (ͅ, general category Mn) titlecases to U+0399 (Ι), even though + // it is not a Letter/Number/Symbol head. + assert_eq!(title_str("\u{0345}"), "\u{0399}"); + assert_eq!(capitalize_str("\u{0345}"), "\u{0399}"); + assert_eq!(title_str("\u{0345}a"), "\u{0399}a"); + // Full (one-to-many) titlecase mappings still apply to the first + // character of each word. + // cspell:ignore finnish NNISH dzungla Dzungla ßhello Sshello + assert_eq!(capitalize_str("finnish"), "Finnish"); + assert_eq!(title_str("fiNNISH"), "Finnish"); + assert_eq!(capitalize_str("dzungla"), "Dzungla"); + assert_eq!(capitalize_str("ßhello"), "Sshello"); + } + #[test] fn wtf8_passes_surrogates_through() { let mut buf = Wtf8Buf::from("ab cd"); From 3a4b4a8c659f2cec0ecbc7dfdaa44f9c5e8708ae Mon Sep 17 00:00:00 2001 From: Bas Schoenmaeckers <7943856+bschoenmaeckers@users.noreply.github.com> Date: Thu, 9 Jul 2026 07:07:28 +0200 Subject: [PATCH 208/339] Add more build-info functions to c-api (#8216) * Add more build-info functions to c-api * Use CStr for COMPILER/COPYRIGHT/PLATFORM --- crates/capi/src/pylifecycle.rs | 26 +++++++++++++++++++++++++- crates/vm/src/builtins/str.rs | 8 ++++++++ crates/vm/src/stdlib/sys.rs | 22 ++++++++++++---------- 3 files changed, 45 insertions(+), 11 deletions(-) diff --git a/crates/capi/src/pylifecycle.rs b/crates/capi/src/pylifecycle.rs index de673b33f..534c97956 100644 --- a/crates/capi/src/pylifecycle.rs +++ b/crates/capi/src/pylifecycle.rs @@ -4,7 +4,8 @@ use crate::pystate::ensure_thread_has_vm_attached; use alloc::ffi::CString; use core::ffi::{c_char, c_int, c_ulong}; use rustpython_vm::common::rc::PyRc; -use rustpython_vm::version::{MAJOR, MICRO, MINOR, VERSION_HEX}; +use rustpython_vm::stdlib::sys; +use rustpython_vm::version::{MAJOR, MICRO, MINOR, RUSTPYTHON_BUILD_INFO, VERSION_HEX}; use rustpython_vm::vm::thread::ThreadedVirtualMachine; use rustpython_vm::{Context, Interpreter}; use std::sync::{LazyLock, Mutex}; @@ -80,6 +81,29 @@ pub extern "C" fn Py_GetVersion() -> *const c_char { VERSION.as_ptr() } +#[unsafe(no_mangle)] +pub extern "C" fn Py_GetBuildInfo() -> *const c_char { + static BUILD_INFO: LazyLock<CString> = LazyLock::new(|| { + CString::new(RUSTPYTHON_BUILD_INFO).expect("build info must not contain interior NULs") + }); + BUILD_INFO.as_ptr() +} + +#[unsafe(no_mangle)] +pub extern "C" fn Py_GetCompiler() -> *const c_char { + c"[RUST]".as_ptr() +} + +#[unsafe(no_mangle)] +pub extern "C" fn Py_GetCopyright() -> *const c_char { + sys::COPYRIGHT.as_ptr() +} + +#[unsafe(no_mangle)] +pub extern "C" fn Py_GetPlatform() -> *const c_char { + sys::PLATFORM.as_ptr() +} + #[cfg(test)] mod tests { use pyo3::prelude::*; diff --git a/crates/vm/src/builtins/str.rs b/crates/vm/src/builtins/str.rs index b1a119f5e..bd5cd39dd 100644 --- a/crates/vm/src/builtins/str.rs +++ b/crates/vm/src/builtins/str.rs @@ -34,6 +34,7 @@ use crate::{ use alloc::{borrow::Cow, fmt}; use ascii::{AsciiChar, AsciiStr, AsciiString}; use bstr::ByteSlice; +use core::ffi::CStr; use core::{char, mem, ops::Range}; use itertools::Itertools; use num_traits::ToPrimitive; @@ -1700,6 +1701,13 @@ impl ToPyObject for &String { } } +impl ToPyObject for &CStr { + fn to_pyobject(self, vm: &VirtualMachine) -> PyObjectRef { + let s = self.to_str().expect("ToPyObject expects utf-8 CStr"); + vm.ctx.new_str(s).into() + } +} + impl ToPyObject for &Wtf8 { fn to_pyobject(self, vm: &VirtualMachine) -> PyObjectRef { vm.ctx.new_str(self).into() diff --git a/crates/vm/src/stdlib/sys.rs b/crates/vm/src/stdlib/sys.rs index 4e31075da..31e102036 100644 --- a/crates/vm/src/stdlib/sys.rs +++ b/crates/vm/src/stdlib/sys.rs @@ -4,6 +4,7 @@ use crate::{Py, PyPayload, PyResult, VirtualMachine, builtins::PyModule, convert #[cfg(all(not(feature = "host_env"), feature = "stdio"))] pub(crate) use sys::SandboxStdio; +pub use sys::{COPYRIGHT, PLATFORM}; pub(crate) use sys::{DOC, MAXSIZE, RUST_MULTIARCH, UnraisableHookArgsData, module_def, multiarch}; #[pymodule(name = "_jit")] @@ -50,6 +51,7 @@ pub mod sys { version, vm::{Settings, VirtualMachine}, }; + use core::ffi::CStr; use core::sync::atomic::Ordering; use num_traits::ToPrimitive; use std::{ @@ -222,7 +224,7 @@ pub mod sys { #[pyattr(name = "api_version")] const API_VERSION: u32 = 0x0; // what C api? #[pyattr(name = "copyright")] - const COPYRIGHT: &str = "Copyright (c) 2019 RustPython Team"; + pub const COPYRIGHT: &CStr = c"Copyright (c) 2019 RustPython Team"; #[pyattr(name = "float_repr_style")] const FLOAT_REPR_STYLE: &str = "short"; #[pyattr(name = "_framework")] @@ -235,14 +237,14 @@ pub mod sys { const MAXUNICODE: u32 = core::char::MAX as u32; #[pyattr(name = "platform")] - pub const PLATFORM: &str = cfg_select! { - target_os = "linux" => "linux", - target_os = "android" => "android", - target_os = "macos" => "darwin", - target_os = "ios" => "ios", - windows => "win32", - target_os = "wasi" => "wasi", - _ => "unknown" + pub const PLATFORM: &CStr = cfg_select! { + target_os = "linux" => c"linux", + target_os = "android" => c"android", + target_os = "macos" => c"darwin", + target_os = "ios" => c"ios", + windows => c"win32", + target_os = "wasi" => c"wasi", + _ => c"unknown" }; #[pyattr(name = "ps1")] @@ -1897,7 +1899,7 @@ pub(crate) fn sysconfigdata_name() -> String { format!( "_sysconfigdata_{}_{}_{}", sys::ABIFLAGS, - sys::PLATFORM, + sys::PLATFORM.to_string_lossy(), sys::multiarch() ) } From 61d91d6fb41d89dec773daa0ba6d071e8e220325 Mon Sep 17 00:00:00 2001 From: Bas Schoenmaeckers <7943856+bschoenmaeckers@users.noreply.github.com> Date: Thu, 9 Jul 2026 07:08:23 +0200 Subject: [PATCH 209/339] Add garbage collection c-api (#8239) --- crates/capi/src/lib.rs | 1 + crates/capi/src/objimpl.rs | 82 ++++++++++++++++++++++++++++++++++++ crates/vm/src/object/core.rs | 2 +- 3 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 crates/capi/src/objimpl.rs diff --git a/crates/capi/src/lib.rs b/crates/capi/src/lib.rs index 156326489..bf985c3ba 100644 --- a/crates/capi/src/lib.rs +++ b/crates/capi/src/lib.rs @@ -25,6 +25,7 @@ pub mod longobject; pub mod methodobject; pub mod moduleobject; pub mod object; +pub mod objimpl; pub mod osmodule; pub mod pycapsule; pub mod pyerrors; diff --git a/crates/capi/src/objimpl.rs b/crates/capi/src/objimpl.rs new file mode 100644 index 000000000..99b0be7cc --- /dev/null +++ b/crates/capi/src/objimpl.rs @@ -0,0 +1,82 @@ +use crate::PyObject; +use crate::pymem::{PyMem_Calloc, PyMem_Free, PyMem_Malloc, PyMem_Realloc}; +use crate::pystate::with_vm; +use core::ffi::{c_int, c_void}; +use rustpython_vm::gc_state; + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyObject_GC_Track(op: *mut PyObject) { + with_vm(|_vm| { + let obj = unsafe { &*op }; + if !obj.is_gc_tracked() { + unsafe { gc_state::gc_state().track_object(obj.into()) }; + } + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyObject_GC_UnTrack(op: *mut PyObject) { + with_vm(|_vm| { + let obj = unsafe { &*op }; + if obj.is_gc_tracked() { + unsafe { gc_state::gc_state().untrack_object(obj.into()) }; + } + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyObject_GC_IsTracked(op: *mut PyObject) -> c_int { + with_vm(|_vm| unsafe { (&*op).is_gc_tracked() }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyObject_GC_IsFinalized(op: *mut PyObject) -> c_int { + with_vm(|_vm| unsafe { (&*op).gc_finalized() }) +} + +#[unsafe(no_mangle)] +pub extern "C" fn PyGC_Collect() -> isize { + let result = gc_state::gc_state().collect(2); + (result.collected + result.uncollectable) as isize +} + +#[unsafe(no_mangle)] +pub extern "C" fn PyGC_Enable() -> c_int { + let gc = gc_state::gc_state(); + let was_enabled = gc.is_enabled(); + gc.enable(); + was_enabled.into() +} + +#[unsafe(no_mangle)] +pub extern "C" fn PyGC_Disable() -> c_int { + let gc = gc_state::gc_state(); + let was_enabled = gc.is_enabled(); + gc.disable(); + was_enabled.into() +} + +#[unsafe(no_mangle)] +pub extern "C" fn PyGC_IsEnabled() -> c_int { + gc_state::gc_state().is_enabled().into() +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyObject_Malloc(size: usize) -> *mut c_void { + unsafe { PyMem_Malloc(size) } +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyObject_Calloc(nelem: usize, elsize: usize) -> *mut c_void { + unsafe { PyMem_Calloc(nelem, elsize) } +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyObject_Realloc(ptr: *mut c_void, new_size: usize) -> *mut c_void { + unsafe { PyMem_Realloc(ptr, new_size) } +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyObject_Free(ptr: *mut c_void) { + unsafe { PyMem_Free(ptr) } +} diff --git a/crates/vm/src/object/core.rs b/crates/vm/src/object/core.rs index f643be7e1..2eb1b17cb 100644 --- a/crates/vm/src/object/core.rs +++ b/crates/vm/src/object/core.rs @@ -1654,7 +1654,7 @@ impl PyObject { /// Check if the object has been finalized (__del__ already called). /// _PyGC_FINALIZED in Py_GIL_DISABLED mode. #[inline] - pub(crate) fn gc_finalized(&self) -> bool { + pub fn gc_finalized(&self) -> bool { GcBits::from_bits_retain(self.0.gc_bits.load(Ordering::Relaxed)).contains(GcBits::FINALIZED) } From 5ca7d17f6039f9686050adb45b16f6a677040dfa Mon Sep 17 00:00:00 2001 From: Bas Schoenmaeckers <7943856+bschoenmaeckers@users.noreply.github.com> Date: Thu, 9 Jul 2026 07:12:10 +0200 Subject: [PATCH 210/339] Add memoryview support to c-api (#8240) --- crates/capi/src/lib.rs | 1 + crates/capi/src/memoryobject.rs | 37 +++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 crates/capi/src/memoryobject.rs diff --git a/crates/capi/src/lib.rs b/crates/capi/src/lib.rs index bf985c3ba..424074a12 100644 --- a/crates/capi/src/lib.rs +++ b/crates/capi/src/lib.rs @@ -22,6 +22,7 @@ pub mod genericaliasobject; pub mod import; pub mod listobject; pub mod longobject; +pub mod memoryobject; pub mod methodobject; pub mod moduleobject; pub mod object; diff --git a/crates/capi/src/memoryobject.rs b/crates/capi/src/memoryobject.rs new file mode 100644 index 000000000..11019524e --- /dev/null +++ b/crates/capi/src/memoryobject.rs @@ -0,0 +1,37 @@ +use crate::object::define_py_check; +use crate::{PyObject, pystate::with_vm}; +use rustpython_vm::PyPayload; +use rustpython_vm::builtins::PyMemoryView; + +define_py_check!(fn PyMemoryView_Check, types.memoryview_type); + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyMemoryView_FromObject(obj: *mut PyObject) -> *mut PyObject { + with_vm(|vm| { + let obj = unsafe { &*obj }; + Ok(PyMemoryView::from_object(obj, vm)?.into_ref(&vm.ctx)) + }) +} + +#[cfg(test)] +mod tests { + use pyo3::prelude::*; + use pyo3::types::{PyBytes, PyMemoryView}; + + #[test] + fn memoryview_from_bytes() { + Python::attach(|py| { + let bytes = PyBytes::new(py, b"hello"); + let view = PyMemoryView::from(&bytes).unwrap(); + + assert!(view.is_instance_of::<PyMemoryView>()); + + let copied = view + .call_method1("tobytes", ()) + .unwrap() + .cast_into::<PyBytes>() + .unwrap(); + assert_eq!(copied.as_bytes(), b"hello"); + }) + } +} From b6ade8bde621cd75b1d274b934c3d7ae5abdccc7 Mon Sep 17 00:00:00 2001 From: Bas Schoenmaeckers <7943856+bschoenmaeckers@users.noreply.github.com> Date: Thu, 9 Jul 2026 07:14:56 +0200 Subject: [PATCH 211/339] Add more eval functions to c-api (#8244) --- crates/capi/src/ceval.rs | 89 +++++++++++++++++++++++++++++++++++++- crates/capi/src/pyframe.rs | 22 +++++----- crates/capi/src/util.rs | 23 +++++++++- 3 files changed, 121 insertions(+), 13 deletions(-) diff --git a/crates/capi/src/ceval.rs b/crates/capi/src/ceval.rs index d137cb17d..366cb0071 100644 --- a/crates/capi/src/ceval.rs +++ b/crates/capi/src/ceval.rs @@ -1,3 +1,4 @@ +use crate::pyframe::PyFrameObject; use crate::pystate::with_vm; use crate::unicodeobject::decode_fsdefault_and_size; use core::ffi::{CStr, c_char, c_int}; @@ -5,8 +6,8 @@ use core::ptr::NonNull; use rustpython_vm::builtins::{PyCode, PyDict}; use rustpython_vm::function::ArgMapping; use rustpython_vm::scope::Scope; -use rustpython_vm::version; use rustpython_vm::{AsObject, PyObject, TryFromObject}; +use rustpython_vm::{PyObjectRef, version}; #[unsafe(no_mangle)] pub unsafe extern "C" fn Py_CompileString( @@ -42,6 +43,16 @@ pub unsafe extern "C" fn PyEval_EvalCode( }) } +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyEval_EvalFrame(f: *mut PyFrameObject) -> *mut PyObject { + unsafe { PyEval_EvalFrameEx(f, 0) } +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyEval_EvalFrameEx(f: *mut PyFrameObject, _exc: c_int) -> *mut PyObject { + with_vm(|vm| vm.run_frame(unsafe { &*f }.to_owned())) +} + #[unsafe(no_mangle)] pub extern "C" fn PyEval_GetBuiltins() -> *mut PyObject { with_vm(|vm| { @@ -52,6 +63,82 @@ pub extern "C" fn PyEval_GetBuiltins() -> *mut PyObject { }) } +#[unsafe(no_mangle)] +pub extern "C" fn PyEval_GetFrame() -> *mut PyFrameObject { + with_vm(|vm| -> *mut PyObject { + vm.current_frame() + .map(|frame| frame.as_object().as_raw().cast_mut()) + .unwrap_or_default() + }) + .cast() +} + +#[unsafe(no_mangle)] +pub extern "C" fn PyEval_GetFrameBuiltins() -> *mut PyObject { + with_vm(|vm| { + vm.current_frame().map_or_else( + || vm.builtins.as_object().to_owned(), + |frame| frame.builtins.as_object().to_owned(), + ) + }) +} + +#[unsafe(no_mangle)] +pub extern "C" fn PyEval_GetFrameGlobals() -> *mut PyObject { + with_vm(|vm| { + vm.current_frame() + .map(|frame| frame.globals.as_object().to_owned().into_raw().as_ptr()) + .unwrap_or_default() + }) +} + +#[unsafe(no_mangle)] +pub extern "C" fn PyEval_GetFrameLocals() -> *mut PyObject { + with_vm(|vm| { + let Some(frame) = vm.current_frame() else { + return Ok(core::ptr::null_mut()); + }; + let locals: PyObjectRef = frame.locals(vm)?.into(); + Ok(locals.into_raw().as_ptr()) + }) +} + +#[unsafe(no_mangle)] +pub extern "C" fn PyEval_GetGlobals() -> *mut PyObject { + with_vm(|vm| { + vm.current_frame() + .map(|frame| frame.globals.as_object().as_raw()) + .unwrap_or_default() + }) +} + +#[unsafe(no_mangle)] +pub extern "C" fn PyEval_GetLocals() -> *mut PyObject { + with_vm(|vm| { + let Some(frame) = vm.current_frame() else { + return Ok(core::ptr::null_mut()); + }; + let _ = frame.locals(vm)?; + Ok(frame.locals.as_object(vm).as_raw().cast_mut()) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyEval_GetFuncDesc(func: *mut PyObject) -> *const c_char { + with_vm(|vm| { + let func = unsafe { &*func }; + let cls = func.class(); + if cls.is(vm.ctx.types.bound_method_type) + || cls.is(vm.ctx.types.function_type) + || cls.is(vm.ctx.types.builtin_function_or_method_type) + { + c"()" + } else { + c" object" + } + }) +} + #[cfg(test)] mod tests { use pyo3::exceptions::PyException; diff --git a/crates/capi/src/pyframe.rs b/crates/capi/src/pyframe.rs index d8e9d124b..5c9ad3717 100644 --- a/crates/capi/src/pyframe.rs +++ b/crates/capi/src/pyframe.rs @@ -1,19 +1,21 @@ -use crate::PyObject; use crate::pystate::with_vm; +use core::ffi::c_int; +use rustpython_vm::Py; +use rustpython_vm::builtins::PyCode; use rustpython_vm::frame::Frame; +pub type PyFrameObject = Py<Frame>; +pub type PyCodeObject = Py<PyCode>; + #[unsafe(no_mangle)] -pub unsafe extern "C" fn PyFrame_GetCode(frame: *mut PyObject) -> *mut PyObject { - with_vm(|vm| { - let frame = unsafe { &*frame }.try_downcast_ref::<Frame>(vm)?; - Ok(frame.f_code()) - }) +pub unsafe extern "C" fn PyFrame_GetCode(frame: *mut PyFrameObject) -> *mut PyCodeObject { + with_vm(|_vm| Ok(unsafe { &*frame }.f_code())) } #[unsafe(no_mangle)] -pub unsafe extern "C" fn PyFrame_GetLineNumber(frame: *mut PyObject) -> core::ffi::c_int { - with_vm(|vm| { - let frame = unsafe { &*frame }.try_downcast_ref::<Frame>(vm)?; - Ok(frame.f_lineno() as core::ffi::c_int) +pub unsafe extern "C" fn PyFrame_GetLineNumber(frame: *mut PyFrameObject) -> c_int { + with_vm(|_vm| { + let lineno = unsafe { &*frame }.f_lineno(); + Ok(lineno.try_into().unwrap_or(c_int::MAX)) }) } diff --git a/crates/capi/src/util.rs b/crates/capi/src/util.rs index ccb8ee254..6bbda7654 100644 --- a/crates/capi/src/util.rs +++ b/crates/capi/src/util.rs @@ -1,7 +1,7 @@ use crate::PyObject; use core::convert::Infallible; -use core::ffi::{c_char, c_double, c_int, c_long, c_ulong, c_void}; -use rustpython_vm::{PyObjectRef, PyRef, PyResult, VirtualMachine}; +use core::ffi::{CStr, c_char, c_double, c_int, c_long, c_ulong, c_void}; +use rustpython_vm::{Py, PyObjectRef, PyRef, PyResult, VirtualMachine}; pub(crate) trait FfiResult<Output = Self> { const ERR_VALUE: Output; @@ -36,6 +36,17 @@ where } } +impl<T> FfiResult<*mut Py<T>> for PyRef<T> +where + Self: Into<PyObjectRef>, +{ + const ERR_VALUE: *mut Py<T> = core::ptr::null_mut(); + + fn into_output(self, _vm: &VirtualMachine) -> *mut Py<T> { + self.into().into_raw().as_ptr().cast() + } +} + impl FfiResult<*mut PyObject> for PyObjectRef { const ERR_VALUE: *mut PyObject = core::ptr::null_mut(); @@ -92,6 +103,14 @@ impl FfiResult for *const c_char { } } +impl FfiResult<*const c_char> for &CStr { + const ERR_VALUE: *const c_char = core::ptr::null_mut(); + + fn into_output(self, _vm: &VirtualMachine) -> *const c_char { + self.as_ptr() + } +} + impl FfiResult<isize> for usize { const ERR_VALUE: isize = -1; From 123dc4b9a0c60e95888a6119b32d069a43b4ddb7 Mon Sep 17 00:00:00 2001 From: Kwak Byoung Min <67214970+doma17@users.noreply.github.com> Date: Thu, 9 Jul 2026 20:24:16 +0900 Subject: [PATCH 212/339] Support xml.sax pyexpat setup APIs (#8238) * Let xml.sax initialize pyexpat-backed parsers RustPython already exposes an Expat-like XML parser, but xml.sax expects a few setup APIs before parsing. Add compatible parser setup methods and constants without pretending to implement full Expat external entity behavior. Constraint: Lib/test changes only remove expectedFailure markers for tests that now pass; test bodies and assertions are unchanged. Rejected: Implementing full Expat parameter entity parsing | xml-rs does not expose that configuration and the immediate failure is the missing setup API. Confidence: high Scope-risk: narrow Directive: Keep SetParamEntityParsing as a compatibility shim unless the backend grows real Expat-style entity parsing support. Tested: PATH=/tmp/pyshim:$PATH prek run --all-files Tested: cargo run --quiet -- extra_tests/snippets/stdlib_xml.py Tested: cargo run --release -- -m test test_sax Tested: cargo run --release -- -m test test_pyexpat Tested: cargo test --workspace --exclude rustpython-capi --exclude rustpython_wasm --exclude rustpython-compiler-source --exclude rustpython-venvlauncher --features threading --no-default-features --features stdlib,importlib,stdio,encodings,sqlite,ssl-rustls-aws-lc,host_env && (cd crates/capi && cargo test) Tested: PYO3_CONFIG_FILE=$PWD/crates/capi/pyo3-rustpython.config cargo test --workspace --exclude rustpython_wasm --exclude rustpython-venvlauncher Tested: cargo build --release --features sqlite && cd extra_tests && /tmp/rustpython-extra-tests-venv/bin/python -m pytest -v Tested: cargo clippy --workspace --exclude rustpython-capi --exclude rustpython_wasm --exclude rustpython-compiler-source --exclude rustpython-venvlauncher --features threading --no-default-features --features stdlib,importlib,stdio,encodings,sqlite,ssl-rustls-aws-lc,host_env Assisted-by: Codex:gpt-5.5 * Keep XML follow-up tests aligned with passing behavior The pyexpat setup API compatibility fix also makes pulldom's basic parse smoke test pass, so keep RustPython expected-failure markers aligned with current behavior and apply the ruff import-spacing fix. Constraint: Test body and assertions remain unchanged. Confidence: high Scope-risk: narrow Tested: cargo run --release -- -m test test_pulldom -v Tested: cargo run --release -- -m test test_sax Tested: cargo run --release -- -m test test_pyexpat Tested: cargo run --quiet -- extra_tests/snippets/stdlib_xml.py Tested: PATH=/tmp/pyshim:/Users/kbm/.codex/tmp/arg0/codex-arg0ejsdGi:/Users/kbm/.omx-runs/run-20260703105454-4fab/.omx/runtime/bin:/Users/kbm/.nvm/versions/node/v24.15.0/bin:/Users/kbm/Library/Java/JavaVirtualMachines/temurin-21.0.9/Contents/Home/bin:/Users/kbm/.antigravity/antigravity/bin:/opt/homebrew/opt/mysql-client/bin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/System/Cryptexes/App/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/local/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/appleinternal/bin:/Library/Apple/usr/bin:/var/folders/vq/1mhmtsbs2kj_03tsx74kd1mm0000gn/T//cmux-cli-shims/93BA47BD-630C-4ED3-8573-0FE6ABFAE824:/Applications/cmux.app/Contents/Resources/bin:/Users/kbm/.nvm/versions/node/v24.15.0/bin:/Users/kbm/Library/Java/JavaVirtualMachines/temurin-21.0.9/Contents/Home/bin:/Users/kbm/.antigravity/antigravity/bin:/opt/homebrew/opt/mysql-client/bin:/var/folders/vq/1mhmtsbs2kj_03tsx74kd1mm0000gn/T/cmux-cli-shims/93BA47BD-630C-4ED3-8573-0FE6ABFAE824:/Applications/Visual Studio Code.app/Contents/Resources/app/bin:/Applications/Visual Studio Code.app/Contents/Resources/app/bin:/Applications/Visual Studio Code.app/Contents/Resources/app/bin prek run --all-files Tested: cargo build --release --features sqlite && cd extra_tests && /tmp/rustpython-extra-tests-venv/bin/python -m pytest -v Tested: PYO3_CONFIG_FILE=/Users/kbm/IdeaProjects/RustPython/crates/capi/pyo3-rustpython.config cargo test --workspace --exclude rustpython_wasm --exclude rustpython-venvlauncher Tested: cargo clippy --workspace --exclude rustpython-capi --exclude rustpython_wasm --exclude rustpython-compiler-source --exclude rustpython-venvlauncher --features threading --no-default-features --features stdlib,importlib,stdio,encodings,sqlite,ssl-rustls-aws-lc,host_env Assisted-by: Codex:gpt-5.5 --- Lib/test/test_pulldom.py | 1 - Lib/test/test_sax.py | 8 ----- crates/stdlib/src/pyexpat.rs | 35 +++++++++++++++++++++- extra_tests/snippets/stdlib_xml.py | 47 ++++++++++++++++++++++++++++++ 4 files changed, 81 insertions(+), 10 deletions(-) create mode 100644 extra_tests/snippets/stdlib_xml.py diff --git a/Lib/test/test_pulldom.py b/Lib/test/test_pulldom.py index f91fa1f8a..435b52d33 100644 --- a/Lib/test/test_pulldom.py +++ b/Lib/test/test_pulldom.py @@ -24,7 +24,6 @@ SMALL_SAMPLE = """<?xml version="1.0"?> class PullDOMTestCase(unittest.TestCase): - @unittest.expectedFailure # TODO: RUSTPYTHON; FileNotFoundError: [Errno 2] No such file or directory (os error 2): 'xmltestdata/test.xml' -> 'None' def test_parse(self): """Minimal test of DOMEventStream.parse()""" diff --git a/Lib/test/test_sax.py b/Lib/test/test_sax.py index faaf4dd95..e9e6b604d 100644 --- a/Lib/test/test_sax.py +++ b/Lib/test/test_sax.py @@ -190,7 +190,6 @@ class ParseTest(unittest.TestCase): with self.assertRaises(SAXException): self.check_parse(f) - @unittest.expectedFailure # TODO: RUSTPYTHON; AttributeError: 'xmlparser' object has no attribute 'SetParamEntityParsing' def test_parse_path_object(self): make_xml_file(self.data, 'utf-8', None) self.check_parse(FakePath(TESTFN)) @@ -1018,7 +1017,6 @@ class ExpatReaderTest(XmlTestBase): resolver.entities, [(None, 'unsupported://non-existing')] ) - @unittest.expectedFailure # TODO: RUSTPYTHON; AttributeError: 'xmlparser' object has no attribute 'SetParamEntityParsing' def test_expat_external_dtd_default(self): parser = create_parser() resolver = self.TestEntityRecorder() @@ -1084,7 +1082,6 @@ class ExpatReaderTest(XmlTestBase): def startElementNS(self, name, qname, attrs): self._attrs = attrs - @unittest.expectedFailure # TODO: RUSTPYTHON; AttributeError: 'xmlparser' object has no attribute 'SetParamEntityParsing' def test_expat_attrs_empty(self): parser = create_parser() gather = self.AttrGatherer() @@ -1095,7 +1092,6 @@ class ExpatReaderTest(XmlTestBase): self.verify_empty_attrs(gather._attrs) - @unittest.expectedFailure # TODO: RUSTPYTHON; AttributeError: 'xmlparser' object has no attribute 'SetParamEntityParsing' def test_expat_attrs_wattr(self): parser = create_parser() gather = self.AttrGatherer() @@ -1106,7 +1102,6 @@ class ExpatReaderTest(XmlTestBase): self.verify_attrs_wattr(gather._attrs) - @unittest.expectedFailure # TODO: RUSTPYTHON; AttributeError: 'xmlparser' object has no attribute 'SetParamEntityParsing' def test_expat_nsattrs_empty(self): parser = create_parser(1) gather = self.AttrGatherer() @@ -1300,7 +1295,6 @@ class ExpatReaderTest(XmlTestBase): # ===== Locator support - @unittest.expectedFailure # TODO: RUSTPYTHON; AttributeError: 'xmlparser' object has no attribute 'SetParamEntityParsing' def test_expat_locator_noinfo(self): result = BytesIO() xmlgen = XMLGenerator(result) @@ -1315,7 +1309,6 @@ class ExpatReaderTest(XmlTestBase): self.assertEqual(parser.getPublicId(), None) self.assertEqual(parser.getLineNumber(), 1) - @unittest.expectedFailure # TODO: RUSTPYTHON; AttributeError: 'xmlparser' object has no attribute 'SetParamEntityParsing' def test_expat_locator_withinfo(self): result = BytesIO() xmlgen = XMLGenerator(result) @@ -1326,7 +1319,6 @@ class ExpatReaderTest(XmlTestBase): self.assertEqual(parser.getSystemId(), TEST_XMLFILE) self.assertEqual(parser.getPublicId(), None) - @unittest.expectedFailure # TODO: RUSTPYTHON; AttributeError: 'xmlparser' object has no attribute 'SetParamEntityParsing' @requires_nonascii_filenames def test_expat_locator_withinfo_nonascii(self): fname = os_helper.TESTFN_UNICODE diff --git a/crates/stdlib/src/pyexpat.rs b/crates/stdlib/src/pyexpat.rs index 8323a4ea1..fab4e7b5e 100644 --- a/crates/stdlib/src/pyexpat.rs +++ b/crates/stdlib/src/pyexpat.rs @@ -43,7 +43,7 @@ mod _pyexpat { Context, Py, PyObjectRef, PyPayload, PyRef, PyResult, TryFromObject, VirtualMachine, builtins::{PyBytesRef, PyException, PyModule, PyStr, PyStrRef, PyType, PyUtf8StrRef}, extend_module, - function::{ArgBytesLike, Either, IntoFuncArgs, OptionalArg}, + function::{ArgBytesLike, ArgPrimitiveIndex, Either, IntoFuncArgs, OptionalArg}, types::Constructor, }; use rustpython_common::lock::PyRwLock; @@ -70,6 +70,13 @@ mod _pyexpat { #[pyattr(name = "version_info")] pub(super) const VERSION_INFO: (u32, u32, u32) = (2, 7, 1); + #[pyattr] + const XML_PARAM_ENTITY_PARSING_NEVER: i32 = 0; + #[pyattr] + const XML_PARAM_ENTITY_PARSING_UNLESS_STANDALONE: i32 = 1; + #[pyattr] + const XML_PARAM_ENTITY_PARSING_ALWAYS: i32 = 2; + #[pyattr] #[pyattr(name = "XMLParserType")] #[pyclass(name = "xmlparser", module = false, traverse)] @@ -77,6 +84,8 @@ mod _pyexpat { pub(super) struct PyExpatLikeXmlParser { #[pytraverse(skip)] namespace_separator: Option<String>, + #[pytraverse(skip)] + base: PyRwLock<Option<String>>, start_element: MutableObject, end_element: MutableObject, character_data: MutableObject, @@ -128,6 +137,7 @@ mod _pyexpat { let intern_dict = intern.unwrap_or_else(|| vm.ctx.new_dict().into()); Self { namespace_separator, + base: PyRwLock::new(None), start_element: MutableObject::new(vm.ctx.none()), end_element: MutableObject::new(vm.ctx.none()), character_data: MutableObject::new(vm.ctx.none()), @@ -297,6 +307,29 @@ mod _pyexpat { .whitespace_to_characters(true) } + #[pymethod(name = "SetParamEntityParsing")] + fn set_param_entity_parsing(&self, _flag: ArgPrimitiveIndex<i32>) -> i32 { + // Compatibility shim: xml.sax requires this setup API, but xml-rs + // does not expose Expat parameter entity parsing configuration. + 1 + } + + #[pymethod(name = "SetBase")] + fn set_base(&self, base: PyStrRef) { + // Store-only compatibility state for xml.sax locator APIs. The + // xml-rs backend still does not perform Expat-style base URI + // resolution for external entities. + *self.base.write() = Some(AsRef::<str>::as_ref(&base).to_owned()); + } + + #[pymethod(name = "GetBase")] + fn get_base(&self, vm: &VirtualMachine) -> PyObjectRef { + self.base.read().as_ref().map_or_else( + || vm.ctx.none(), + |base| vm.ctx.new_str(base.as_str()).into(), + ) + } + /// Construct element name with namespace if separator is set fn make_name(&self, name: &xml::name::OwnedName) -> String { match (&self.namespace_separator, &name.namespace) { diff --git a/extra_tests/snippets/stdlib_xml.py b/extra_tests/snippets/stdlib_xml.py new file mode 100644 index 000000000..268cdf45a --- /dev/null +++ b/extra_tests/snippets/stdlib_xml.py @@ -0,0 +1,47 @@ +import xml.sax +from xml.parsers import expat + +from testutils import assert_raises + +assert expat.XML_PARAM_ENTITY_PARSING_NEVER == 0 +assert expat.XML_PARAM_ENTITY_PARSING_UNLESS_STANDALONE == 1 +assert expat.XML_PARAM_ENTITY_PARSING_ALWAYS == 2 + +parser = expat.ParserCreate() +for value in (0, 1, 2, 3, -1, True): + assert parser.SetParamEntityParsing(value) == 1 + +for value in ("x", None): + with assert_raises(TypeError): + parser.SetParamEntityParsing(value) + +with assert_raises(OverflowError): + parser.SetParamEntityParsing(2**100) + +assert parser.GetBase() is None +assert parser.SetBase("example.xml") is None +assert parser.GetBase() == "example.xml" +for value in (b"example.xml", None, 123): + with assert_raises(TypeError): + parser.SetBase(value) + + +class Handler(xml.sax.handler.ContentHandler): + def __init__(self): + self.events = [] + + def startElement(self, name, attrs): + self.events.append(("start", name)) + + def endElement(self, name): + self.events.append(("end", name)) + + +handler = Handler() +xml.sax.parseString("<main><child /></main>", handler) +assert handler.events == [ + ("start", "main"), + ("start", "child"), + ("end", "child"), + ("end", "main"), +] From c93d63a759e262f0fc370cc0980a7cfc4e9dc5db Mon Sep 17 00:00:00 2001 From: "Jeong, YunWon" <69878+youknowone@users.noreply.github.com> Date: Thu, 9 Jul 2026 20:24:49 +0900 Subject: [PATCH 213/339] literal: reject internal whitespace in complex::parse_str (#8242) parse_str split the token then parsed each part with float::parse_str, which tolerates surrounding whitespace, so "1 +2j" parsed as (1+2j). Reject whitespace inside the token after stripping optional parentheses. Add unit tests and complex() snippet tests. Assisted-by: Claude --- crates/literal/src/complex.rs | 44 +++++++++++++++++++++++++ extra_tests/snippets/builtin_complex.py | 9 +++++ 2 files changed, 53 insertions(+) diff --git a/crates/literal/src/complex.rs b/crates/literal/src/complex.rs index bbfc88cb3..20d694f8e 100644 --- a/crates/literal/src/complex.rs +++ b/crates/literal/src/complex.rs @@ -70,6 +70,14 @@ pub fn parse_str(s: &str) -> Option<(f64, f64)> { Some(s) => s.strip_suffix(')')?.trim(), }; + // Whitespace is only allowed around the whole string and the optional + // parentheses, never inside the numeric token. Reject it here so that + // `float::parse_str` (which tolerates surrounding whitespace on a part) + // does not let e.g. "1 +2j" through. + if s.contains(char::is_whitespace) { + return None; + } + let value = match s.strip_suffix(|c| c == 'j' || c == 'J') { None => (float::parse_str(s)?, 0.0), Some(mut s) => { @@ -96,3 +104,39 @@ pub fn parse_str(s: &str) -> Option<(f64, f64)> { }; Some(value) } + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn parse_rejects_internal_whitespace() { + // Whitespace inside the numeric token is invalid, even where a bare + // `float::parse_str` on a fragment would tolerate it. + for s in [ + "1 +2j", "1 2j", "1 +2 j", "+ 1j", "1.5 j", "(1 +2j)", "2 -3j", + ] { + assert_eq!(parse_str(s), None, "{s:?} must not parse"); + } + } + + #[test] + fn parse_allows_surrounding_and_paren_whitespace() { + for s in [" 1+2j ", " (1+2j) ", "( 1+2j )"] { + assert_eq!(parse_str(s), Some((1.0, 2.0)), "{s:?}"); + } + } + + #[test] + fn parse_basic() { + assert_eq!(parse_str("1"), Some((1.0, 0.0))); + assert_eq!(parse_str("1j"), Some((0.0, 1.0))); + assert_eq!(parse_str("j"), Some((0.0, 1.0))); + assert_eq!(parse_str("-j"), Some((0.0, -1.0))); + assert_eq!(parse_str("1+2j"), Some((1.0, 2.0))); + assert_eq!(parse_str("1e5j"), Some((0.0, 1e5))); + assert_eq!(parse_str("1_000"), Some((1000.0, 0.0))); + assert_eq!(parse_str(""), None); + assert_eq!(parse_str("abc"), None); + } +} diff --git a/extra_tests/snippets/builtin_complex.py b/extra_tests/snippets/builtin_complex.py index 136f26ef0..55ab38c88 100644 --- a/extra_tests/snippets/builtin_complex.py +++ b/extra_tests/snippets/builtin_complex.py @@ -168,6 +168,15 @@ assert complex("-2j") == -2j assert_raises(TypeError, lambda: complex("5+2j", 1)) assert_raises(ValueError, lambda: complex("abc")) +# whitespace is allowed around the string and the optional parentheses, +# but not inside the numeric token +assert complex(" 1+2j ") == 1 + 2j +assert complex("(1+2j)") == 1 + 2j +assert complex(" ( 1+2j ) ") == 1 + 2j +assert_raises(ValueError, lambda: complex("1 +2j")) +assert_raises(ValueError, lambda: complex("1+ 2j")) +assert_raises(ValueError, lambda: complex("1 + 2j")) + assert complex("1+10j") == 1 + 10j assert complex(10) == 10 + 0j assert complex(10.0) == 10 + 0j From 8e30b94eef20176dc52bbf07d481b31af7a4c165 Mon Sep 17 00:00:00 2001 From: "Jeong, YunWon" <69878+youknowone@users.noreply.github.com> Date: Thu, 9 Jul 2026 21:42:08 +0900 Subject: [PATCH 214/339] literal: round-half-even tie for normal-range float/complex repr (#8243) to_string's normal-magnitude branch and complex::component_to_string returned Rust's shortest formatting directly, which can pick the odd-digit neighbour of a rounding tie where repr() picks the even one (e.g. bits 0x42e26687db6b9b04 formats as 161852602146008.13 vs repr's ...08.12). Route both through prefer_cpython_tie_repr, generalized to fixed-notation strings. Add unit tests and float/complex repr snippet tests. Assisted-by: Claude --- crates/literal/src/complex.rs | 4 +-- crates/literal/src/float.rs | 39 ++++++++++++++++++------- extra_tests/snippets/builtin_complex.py | 7 +++++ extra_tests/snippets/builtin_float.py | 12 ++++++++ 4 files changed, 49 insertions(+), 13 deletions(-) diff --git a/crates/literal/src/complex.rs b/crates/literal/src/complex.rs index 20d694f8e..bc193f0f2 100644 --- a/crates/literal/src/complex.rs +++ b/crates/literal/src/complex.rs @@ -19,9 +19,9 @@ fn component_to_string(value: f64) -> String { if exponent < 16 && exponent > -5 { // Normal magnitude — Rust's default Display emits "1" for 1.0, // "1.5" for 1.5, "1000000000000000" for 1e15, etc. - value.to_string() + float::prefer_cpython_tie_repr(value.to_string(), value) } else { - alloc::format!("{significand}e{exponent:+#03}") + float::prefer_cpython_tie_repr(alloc::format!("{significand}e{exponent:+#03}"), value) } } else { // nan / inf / -inf — `format!("{x:e}")` produces e.g. "NaN" with no diff --git a/crates/literal/src/float.rs b/crates/literal/src/float.rs index 56a2b5429..2db4fd084 100644 --- a/crates/literal/src/float.rs +++ b/crates/literal/src/float.rs @@ -209,11 +209,13 @@ pub fn format_general( } } -fn prefer_cpython_tie_repr(s: String, value: f64) -> String { - let Some(exponent_pos) = s.find('e') else { - return s; - }; - let Some(digit_pos) = s[..exponent_pos].bytes().rposition(|b| b.is_ascii_digit()) else { +pub(crate) fn prefer_cpython_tie_repr(s: String, value: f64) -> String { + // Rust's shortest float formatter can land on the odd-digit neighbour of a + // rounding tie where round-half-to-even (what `repr` uses) picks the even + // one. When the last significant digit is odd and its even neighbour still + // round-trips and is no further from the value, prefer the even neighbour. + let boundary = s.find('e').unwrap_or(s.len()); + let Some(digit_pos) = s[..boundary].bytes().rposition(|b| b.is_ascii_digit()) else { return s; }; @@ -258,11 +260,11 @@ fn checked_pow_u128(base: u128, exp: u32) -> Option<u128> { } fn parse_decimal_rational(s: &str) -> Option<(u128, u32)> { - let exponent_pos = s.find('e')?; - let exponent = s[exponent_pos + 1..].parse::<i32>().ok()?; - let significand = s[..exponent_pos] - .strip_prefix('-') - .unwrap_or(&s[..exponent_pos]); + let (mantissa, exponent) = match s.find('e') { + Some(pos) => (&s[..pos], s[pos + 1..].parse::<i32>().ok()?), + None => (s, 0), + }; + let significand = mantissa.strip_prefix('-').unwrap_or(mantissa); let dot_pos = significand.find('.'); let frac_digits = dot_pos .map(|pos| significand.len().saturating_sub(pos + 1)) @@ -325,7 +327,7 @@ pub fn to_string(value: f64) -> String { if is_integer(value) { format!("{value:.1?}") } else { - value.to_string() + prefer_cpython_tie_repr(value.to_string(), value) } } else { prefer_cpython_tie_repr(format!("{significand}e{exponent:+#03}"), value) @@ -351,6 +353,21 @@ mod tests { "6.1005353927612305e-05" ); } + + #[test] + fn repr_normal_range_uses_cpython_tie_digit() { + // Rust's shortest formatter yields "161852602146008.13" for this + // value; round-half-to-even (what `repr` uses) picks "…08.12". + assert_eq!( + to_string(f64::from_bits(0x42e26687db6b9b04)), + "161852602146008.12" + ); + // Non-tie values are left untouched. + assert_eq!(to_string(1.5), "1.5"); + assert_eq!(to_string(0.1), "0.1"); + assert_eq!(to_string(12.34), "12.34"); + assert_eq!(to_string(100.0), "100.0"); + } } pub fn from_hex(s: &str) -> Option<f64> { diff --git a/extra_tests/snippets/builtin_complex.py b/extra_tests/snippets/builtin_complex.py index 55ab38c88..ae84cac53 100644 --- a/extra_tests/snippets/builtin_complex.py +++ b/extra_tests/snippets/builtin_complex.py @@ -277,3 +277,10 @@ assert repr(float("inf") + 1j) == "(inf+1j)" assert repr(float("-inf") + 1j) == "(-inf+1j)" assert repr(complex(1, float("nan"))) == "(1+nanj)" assert repr(complex(1, float("inf"))) == "(1+infj)" + +# Round-half-to-even ties: Rust's shortest formatter can land on the +# odd-digit neighbour where repr()'s tie-breaking picks the even one. +assert repr(161852602146008.12 + 1j) == "(161852602146008.12+1j)" +assert repr(-788830060729777.2 + 2j) == "(-788830060729777.2+2j)" +assert repr(complex(0.0, 1959276370239205.2)) == "1959276370239205.2j" +assert repr(complex(-1818262230632059.2, 0.0)) == "(-1818262230632059.2+0j)" diff --git a/extra_tests/snippets/builtin_float.py b/extra_tests/snippets/builtin_float.py index f0fcae5d1..1417c5ae1 100644 --- a/extra_tests/snippets/builtin_float.py +++ b/extra_tests/snippets/builtin_float.py @@ -549,3 +549,15 @@ _check_msg( lambda: INF.__int__(), OverflowError, "cannot convert float infinity to integer" ) _check_msg(lambda: NAN.__floor__(), ValueError, "cannot convert float NaN to integer") + +# repr round-half-to-even ties: Rust's shortest formatter can land on the +# odd-digit neighbour where repr()'s tie-breaking picks the even one. +assert repr(161852602146008.12) == "161852602146008.12" +assert repr(-788830060729777.2) == "-788830060729777.2" +assert repr(1959276370239205.2) == "1959276370239205.2" +assert repr(-1818262230632059.2) == "-1818262230632059.2" +assert str(161852602146008.12) == "161852602146008.12" +# non-tie values are unaffected +assert repr(1.5) == "1.5" +assert repr(0.1) == "0.1" +assert repr(100.0) == "100.0" From 4c62b14d8f1ffc60a2fb4961da46df3187b809f6 Mon Sep 17 00:00:00 2001 From: Joshua Megnauth <48846352+joshuamegnauth54@users.noreply.github.com> Date: Thu, 9 Jul 2026 20:58:32 -0400 Subject: [PATCH 215/339] host_env: os.replace for Windows (#8212) `rename` and `replace` are the same for Unixes but different for Windows in Python. POSIX's `rename` atomically replaces its target; there is no `replace` in POSIX. `renameat2` with `RENAME_NOREPLACE` atomically checks if a file exists and renames if it doesn't, but Python's `rename` and `replace` predate `renameat2`. For Windows, `rename` acts like the `RENAME_NOREPLACE` flag while `replace` functions like `rename`. I implemented both using the Windows API. Both implementations follow CPython's code by using `MoveFileExW`. There are modern Windows APIs that may be worth using in the future. Rust's standard library prefers the modern APIs but falls back to `MoveFileExW` for deprecated Windows versions. --- crates/host_env/src/lib.rs | 2 + crates/host_env/src/os.rs | 37 -------- crates/host_env/src/posix.rs | 12 +-- crates/host_env/src/posix_unix_like.rs | 47 ++++++++++ crates/host_env/src/posix_wasi.rs | 11 +-- crates/host_env/src/posix_windows.rs | 85 +++++++++++++++++- crates/vm/src/stdlib/os.rs | 120 ++++++++++++++++++------- 7 files changed, 221 insertions(+), 93 deletions(-) create mode 100644 crates/host_env/src/posix_unix_like.rs diff --git a/crates/host_env/src/lib.rs b/crates/host_env/src/lib.rs index 4d123e7e0..975ca21b6 100644 --- a/crates/host_env/src/lib.rs +++ b/crates/host_env/src/lib.rs @@ -56,6 +56,8 @@ pub mod posix; #[cfg(windows)] #[path = "posix_windows.rs"] pub mod posix; +#[cfg(any(unix, target_os = "wasi"))] +pub mod posix_unix_like; #[cfg(unix)] pub mod pwd; #[cfg(unix)] diff --git a/crates/host_env/src/os.rs b/crates/host_env/src/os.rs index bd2a5acb9..7d11d7bbe 100644 --- a/crates/host_env/src/os.rs +++ b/crates/host_env/src/os.rs @@ -9,8 +9,6 @@ use core::ffi::CStr; use core::str::Utf8Error; #[cfg(windows)] use core::time::Duration; -#[cfg(unix)] -use rustix::fd::AsFd; use std::{ env, ffi::{OsStr, OsString}, @@ -267,41 +265,6 @@ pub fn copy_file_range( rustix::fs::copy_file_range(src, offset_src, dst, offset_dst, count) } -#[cfg(not(unix))] -pub fn rename( - from: impl AsRef<std::path::Path>, - from_fd: Option<crt_fd::Borrowed<'_>>, - to: impl AsRef<std::path::Path>, - to_fd: Option<crt_fd::Borrowed<'_>>, -) -> io::Result<()> { - if from_fd.is_none() && to_fd.is_none() { - // TODO: Rust's implementation always overwrites the file so ensure consistency between - // operating systems. We need to use windows-sys directly to distinguish between - // os.rename and os.replace. - std::fs::rename(from, to) - } else { - core::hint::cold_path(); - Err(io::Error::new( - io::ErrorKind::Unsupported, - "renameat is not available on this platform", - )) - } -} - -#[cfg(unix)] -pub fn rename( - from: impl AsRef<std::path::Path>, - from_fd: Option<crt_fd::Borrowed<'_>>, - to: impl AsRef<std::path::Path>, - to_fd: Option<crt_fd::Borrowed<'_>>, -) -> io::Result<()> { - let from = from.as_ref(); - let from_fd = from_fd.as_ref().map_or(rustix::fs::CWD, AsFd::as_fd); - let to = to.as_ref(); - let to_fd = to_fd.as_ref().map_or(rustix::fs::CWD, AsFd::as_fd); - rustix::fs::renameat(from_fd, from, to_fd, to).map_err(Into::into) -} - #[cfg(windows)] pub fn seek_fd( fd: crt_fd::Borrowed<'_>, diff --git a/crates/host_env/src/posix.rs b/crates/host_env/src/posix.rs index f15dc576d..60b55ef42 100644 --- a/crates/host_env/src/posix.rs +++ b/crates/host_env/src/posix.rs @@ -10,7 +10,7 @@ use std::os::fd::FromRawFd; use std::os::fd::{AsFd, AsRawFd, BorrowedFd, IntoRawFd, OwnedFd}; use std::path::Path; -use crate::crt_fd; +pub use super::posix_unix_like::*; pub use libc::{c_char, pid_t}; @@ -178,16 +178,6 @@ pub fn fcopyfile(in_fd: i32, out_fd: i32, flags: u32) -> std::io::Result<()> { } } -#[cfg(any(unix, target_os = "wasi"))] -pub fn make_dir( - dir_fd: Option<crt_fd::Borrowed<'_>>, - path: &impl AsRef<Path>, - mode: libc::mode_t, -) -> std::io::Result<()> { - let dir_fd = dir_fd.as_ref().map_or(rustix::fs::CWD, AsFd::as_fd); - rustix::fs::mkdirat(dir_fd, path.as_ref(), mode.into()).map_err(Into::into) -} - #[cfg(unix)] pub fn link_paths(src: &CStr, dst: &CStr, follow_symlinks: bool) -> std::io::Result<()> { let flags = if follow_symlinks { diff --git a/crates/host_env/src/posix_unix_like.rs b/crates/host_env/src/posix_unix_like.rs new file mode 100644 index 000000000..9bb29c41c --- /dev/null +++ b/crates/host_env/src/posix_unix_like.rs @@ -0,0 +1,47 @@ +//! Common POSIX implementations across Unix-likes. + +use std::{io, path::Path}; + +use rustix::{fd::AsFd, fs}; + +pub use rustix::fs::RawMode; + +use crate::crt_fd; + +/// https://pubs.opengroup.org/onlinepubs/9799919799/functions/mkdir.html +pub fn make_dir( + dir_fd: Option<crt_fd::Borrowed<'_>>, + path: impl AsRef<Path>, + mode: fs::RawMode, +) -> io::Result<()> { + let dir_fd = dir_fd.as_ref().map_or(fs::CWD, AsFd::as_fd); + fs::mkdirat(dir_fd, path.as_ref(), mode.into()).map_err(Into::into) +} + +/// https://pubs.opengroup.org/onlinepubs/9799919799/functions/rename.html +pub fn rename( + from: impl AsRef<Path>, + from_fd: Option<crt_fd::Borrowed<'_>>, + to: impl AsRef<Path>, + to_fd: Option<crt_fd::Borrowed<'_>>, +) -> io::Result<()> { + let from = from.as_ref(); + let from_fd = from_fd.as_ref().map_or(fs::CWD, AsFd::as_fd); + let to = to.as_ref(); + let to_fd = to_fd.as_ref().map_or(fs::CWD, AsFd::as_fd); + fs::renameat(from_fd, from, to_fd, to).map_err(Into::into) +} + +/// https://docs.python.org/3/library/os.html#os.replace +/// +/// Atomically replace `to` with `from`. +/// POSIX's rename already atomically replaces targets, so this function just forwards to [`rename`]. +#[inline] +pub fn replace( + from: impl AsRef<Path>, + from_fd: Option<crt_fd::Borrowed<'_>>, + to: impl AsRef<Path>, + to_fd: Option<crt_fd::Borrowed<'_>>, +) -> io::Result<()> { + rename(from, from_fd, to, to_fd) +} diff --git a/crates/host_env/src/posix_wasi.rs b/crates/host_env/src/posix_wasi.rs index f1883fccd..23c3be2fb 100644 --- a/crates/host_env/src/posix_wasi.rs +++ b/crates/host_env/src/posix_wasi.rs @@ -3,16 +3,9 @@ use core::{ffi::CStr, time::Duration}; use rustix::fd::AsFd; use std::{ffi::OsStr, io, path::Path}; -use crate::{crt_fd, os::CheckLibcResult}; +pub use super::posix_unix_like::*; -pub fn make_dir( - dir_fd: Option<crt_fd::Borrowed<'_>>, - path: &impl AsRef<Path>, - mode: libc::mode_t, -) -> std::io::Result<()> { - let dir_fd = dir_fd.as_ref().map_or(rustix::fs::CWD, AsFd::as_fd); - rustix::fs::mkdirat(dir_fd, path.as_ref(), mode.into()).map_err(Into::into) -} +use crate::{crt_fd, os::CheckLibcResult}; pub fn remove_dir_at(dir_fd: i32, path: &CStr) -> io::Result<()> { unsafe { libc::unlinkat(dir_fd, path.as_ptr(), libc::AT_REMOVEDIR) }.check_libc_neg()?; diff --git a/crates/host_env/src/posix_windows.rs b/crates/host_env/src/posix_windows.rs index ac9e2cfa8..e78bd8f74 100644 --- a/crates/host_env/src/posix_windows.rs +++ b/crates/host_env/src/posix_windows.rs @@ -4,19 +4,96 @@ //! these syscalls, but they can be emulated with a mix of the Windows API and the Rust standard //! library, the latter of which calls the former. +use core::hint::cold_path; use std::{fs, io, path::Path}; +use widestring::WideCString; +use windows_sys::Win32::{ + Foundation::FALSE, + Storage::FileSystem::{MOVE_FILE_FLAGS, MOVEFILE_REPLACE_EXISTING, MoveFileExW}, +}; + use crate::crt_fd; -#[expect(non_camel_case_types)] -pub type mode_t = u32; +pub type RawMode = u32; pub fn make_dir( dir_fd: Option<crt_fd::Borrowed<'_>>, - path: &impl AsRef<Path>, - _mode: mode_t, + path: impl AsRef<Path>, + _mode: RawMode, ) -> io::Result<()> { debug_assert!(dir_fd.is_none()); // TODO: On Windows, Python has an override if the mode is 0o700 fs::create_dir(path) } + +/// https://pubs.opengroup.org/onlinepubs/9799919799/functions/rename.html +#[inline] +pub fn rename( + from: impl AsRef<Path>, + #[cfg_attr(not(debug_assertions), expect(unused_variables))] from_fd: Option< + crt_fd::Borrowed<'_>, + >, + to: impl AsRef<Path>, + #[cfg_attr(not(debug_assertions), expect(unused_variables))] to_fd: Option< + crt_fd::Borrowed<'_>, + >, +) -> io::Result<()> { + debug_assert!(from_fd.is_none()); + debug_assert!(to_fd.is_none()); + + rename_impl(from, to, 0) +} + +/// https://docs.python.org/3/library/os.html#os.replace +/// +/// Atomically replace `to` with `from`. +#[inline] +pub fn replace( + from: impl AsRef<Path>, + #[cfg_attr(not(debug_assertions), expect(unused_variables))] from_fd: Option< + crt_fd::Borrowed<'_>, + >, + to: impl AsRef<Path>, + #[cfg_attr(not(debug_assertions), expect(unused_variables))] to_fd: Option< + crt_fd::Borrowed<'_>, + >, +) -> io::Result<()> { + debug_assert!(from_fd.is_none()); + debug_assert!(to_fd.is_none()); + + rename_impl(from, to, MOVEFILE_REPLACE_EXISTING) +} + +fn rename_impl( + from: impl AsRef<Path>, + to: impl AsRef<Path>, + flags: MOVE_FILE_FLAGS, +) -> io::Result<()> { + let from = WideCString::from_os_str(from.as_ref()) + .map_err(io::Error::other)? + .into_vec_with_nul(); + let to = WideCString::from_os_str(to.as_ref()) + .map_err(io::Error::other)? + .into_vec_with_nul(); + + // SAFETY: + // * from and to are NUL terminated wide strings + let success = unsafe { + // Rust's [`std::fs::rename`] is more complicated than CPython's. Rust attempts to use modern APIs + // where available, such as `FileRenameInfoEx`, which better map to POSIX. CPython simply + // calls MoveFileExW so we'll do that for parity. However, it may be better to use the new + // APIs and fall back if possible, especially if they're faster. + // + // Unlike POSIX's rename, MoveFileExW does not automatically move between volumes. + // This is expected behavior in CPython. + MoveFileExW(from.as_ptr(), to.as_ptr(), flags) + }; + + if success != FALSE { + Ok(()) + } else { + cold_path(); + Err(io::Error::last_os_error()) + } +} diff --git a/crates/vm/src/stdlib/os.rs b/crates/vm/src/stdlib/os.rs index 94dd19f79..e6aea44c3 100644 --- a/crates/vm/src/stdlib/os.rs +++ b/crates/vm/src/stdlib/os.rs @@ -6,16 +6,11 @@ use crate::{ builtins::{PyModule, PySet}, convert::{IntoPyException, ToPyException, ToPyObject}, function::{ArgumentError, FromArgs, FuncArgs}, - host_env::crt_fd, + host_env::{crt_fd, posix::RawMode}, }; +use core::marker::PhantomData; use std::{io, path::Path}; -#[cfg(not(windows))] -use libc::mode_t; - -#[cfg(windows)] -use crate::host_env::posix::mode_t; - pub(crate) fn fs_metadata<P: AsRef<Path>>( path: P, follow_symlink: bool, @@ -45,19 +40,44 @@ cfg_select! { const DEFAULT_DIR_FD: crt_fd::Borrowed<'static> = unsafe { crt_fd::Borrowed::borrow_raw(AT_FDCWD) }; -// XXX: AVAILABLE should be a bool, but we can't yet have it as a bool and just cast it to usize -#[derive(Copy, Clone, PartialEq, Eq)] -pub struct DirFd<'fd, const AVAILABLE: usize>(pub(crate) [crt_fd::Borrowed<'fd>; AVAILABLE]); +pub trait DirFdKeyword: Clone + Copy + Eq + PartialEq { + const NAME: &'static str; +} -impl<const AVAILABLE: usize> Default for DirFd<'_, AVAILABLE> { +#[derive(Clone, Copy, Eq, PartialEq)] +pub struct DefaultDirFd; +impl DirFdKeyword for DefaultDirFd { + const NAME: &'static str = "dir_fd"; +} + +#[derive(Clone, Copy, Eq, PartialEq)] +pub struct SrcDirFd; +impl DirFdKeyword for SrcDirFd { + const NAME: &'static str = "src_dir_fd"; +} + +#[derive(Clone, Copy, Eq, PartialEq)] +pub struct DstDirFd; +impl DirFdKeyword for DstDirFd { + const NAME: &'static str = "dst_dir_fd"; +} + +// XXX: AVAILABLE should be a bool, but we can't yet have it as a bool and just cast it to usize +#[derive(Clone, Copy, Eq, PartialEq)] +pub struct DirFd<'fd, const AVAILABLE: usize, KW: DirFdKeyword = DefaultDirFd>( + pub(crate) [crt_fd::Borrowed<'fd>; AVAILABLE], + PhantomData<KW>, +); + +impl<const AVAILABLE: usize, KW: DirFdKeyword> Default for DirFd<'_, AVAILABLE, KW> { fn default() -> Self { - Self([DEFAULT_DIR_FD; AVAILABLE]) + Self([DEFAULT_DIR_FD; AVAILABLE], PhantomData) } } // not used on all platforms #[allow(unused)] -impl<'fd> DirFd<'fd, 1> { +impl<'fd, KW: DirFdKeyword> DirFd<'fd, 1, KW> { #[inline(always)] pub(crate) fn get_opt(self) -> Option<crt_fd::Borrowed<'fd>> { let [fd] = self.0; @@ -76,9 +96,9 @@ impl<'fd> DirFd<'fd, 1> { } } -impl<const AVAILABLE: usize> FromArgs for DirFd<'_, AVAILABLE> { +impl<const AVAILABLE: usize, KW: DirFdKeyword> FromArgs for DirFd<'_, AVAILABLE, KW> { fn from_args(vm: &VirtualMachine, args: &mut FuncArgs) -> Result<Self, ArgumentError> { - let fd = match args.take_keyword("dir_fd") { + let fd = match args.take_keyword(KW::NAME) { Some(o) if vm.is_none(&o) => Ok(DEFAULT_DIR_FD), None => Ok(DEFAULT_DIR_FD), Some(o) => { @@ -99,7 +119,7 @@ impl<const AVAILABLE: usize> FromArgs for DirFd<'_, AVAILABLE> { .into()); } let fd = fd.map_err(|e| e.to_pyexception(vm))?; - Ok(Self([fd; AVAILABLE])) + Ok(Self([fd; AVAILABLE], PhantomData)) } } @@ -160,7 +180,7 @@ impl ToPyObject for crt_fd::Borrowed<'_> { #[pymodule(sub)] pub(super) mod _os { - use super::{DirFd, FollowSymlinks, SupportFunc, mode_t}; + use super::{DirFd, DstDirFd, FollowSymlinks, RawMode, SrcDirFd, SupportFunc}; use crate::host_env::fileutils::StatStruct; #[cfg(any(unix, windows))] use crate::utils::ToCString; @@ -180,6 +200,8 @@ pub(super) mod _os { types::{Destructor, IterNext, Iterable, PyStructSequence, Representable, SelfIter}, vm::VirtualMachine, }; + #[cfg(not(windows))] + use core::marker::PhantomData; use core::time::Duration; use crossbeam_utils::atomic::AtomicCell; use rustpython_common::wtf8::Wtf8Buf; @@ -195,7 +217,7 @@ pub(super) mod _os { const UTIME_DIR_FD: bool = cfg!(not(any(windows, target_os = "redox"))); pub(crate) const SYMLINK_DIR_FD: bool = cfg!(not(any(windows, target_os = "redox"))); pub(crate) const UNLINK_DIR_FD: bool = cfg!(not(any(windows, target_os = "redox"))); - const RENAME_DIR_FD: bool = cfg!(unix); + const RENAME_DIR_FD: bool = cfg!(any(unix, target_os = "wasi")); const RMDIR_DIR_FD: bool = cfg!(not(any(windows, target_os = "redox"))); const SCANDIR_FD: bool = cfg!(all(unix, not(target_os = "redox"))); @@ -347,7 +369,7 @@ pub(super) mod _os { #[pyfunction] fn mkdir( path: OsPath, - mode: OptionalArg<mode_t>, + mode: OptionalArg<RawMode>, #[cfg_attr(not(any(unix, target_os = "wasi")), expect(unused_variables))] dir_fd: DirFd< '_, { MKDIR_DIR_FD as usize }, @@ -625,7 +647,7 @@ pub(super) mod _os { // Safety: the fd came from os.open() and is borrowed for // the lifetime of this DirEntry reference. let borrowed = unsafe { crt_fd::Borrowed::borrow_raw(raw_fd) }; - return DirFd([borrowed; STAT_DIR_FD as usize]); + return DirFd([borrowed; STAT_DIR_FD as usize], PhantomData); } DirFd::default() } @@ -1382,14 +1404,15 @@ pub(super) mod _os { src: PyObjectRef, #[pyarg(positional)] dst: PyObjectRef, - #[pyarg(any, default)] - src_dir_fd: OptionalArg<crt_fd::Borrowed<'fd>>, - #[pyarg(any, default)] - dst_dir_fd: OptionalArg<crt_fd::Borrowed<'fd>>, + #[pyarg(flatten)] + #[cfg_attr(not(any(unix, target_os = "wasi")), expect(dead_code))] + src_dir_fd: DirFd<'fd, { RENAME_DIR_FD as usize }, SrcDirFd>, + #[pyarg(flatten)] + #[cfg_attr(not(any(unix, target_os = "wasi")), expect(dead_code))] + dst_dir_fd: DirFd<'fd, { RENAME_DIR_FD as usize }, DstDirFd>, } #[pyfunction] - #[pyfunction(name = "replace")] fn rename(args: RenameArgs<'_>, vm: &VirtualMachine) -> PyResult<()> { let src = PathConverter::new() .function("rename") @@ -1400,13 +1423,46 @@ pub(super) mod _os { .argument("dst") .try_path(args.dst, vm)?; - crate::host_env::os::rename( - &src, - args.src_dir_fd.into_option(), - &dst, - args.dst_dir_fd.into_option(), - ) - .map_err(|err| { + #[cfg(any(unix, target_os = "wasi"))] + let src_dir_fd = args.src_dir_fd.get_opt(); + #[cfg(not(any(unix, target_os = "wasi")))] + let src_dir_fd = None; + + #[cfg(any(unix, target_os = "wasi"))] + let dst_dir_fd = args.dst_dir_fd.get_opt(); + #[cfg(not(any(unix, target_os = "wasi")))] + let dst_dir_fd = None; + + crate::host_env::posix::rename(&src, src_dir_fd, &dst, dst_dir_fd).map_err(|err| { + let builder = err.to_os_error_builder(vm); + let builder = builder.filename(src.filename(vm)); + let builder = builder.filename2(dst.filename(vm)); + builder.build(vm).upcast() + }) + } + + #[pyfunction] + fn replace(args: RenameArgs<'_>, vm: &VirtualMachine) -> PyResult<()> { + let src = PathConverter::new() + .function("replace") + .argument("src") + .try_path(args.src, vm)?; + let dst = PathConverter::new() + .function("replace") + .argument("dst") + .try_path(args.dst, vm)?; + + #[cfg(any(unix, target_os = "wasi"))] + let src_dir_fd = args.src_dir_fd.get_opt(); + #[cfg(not(any(unix, target_os = "wasi")))] + let src_dir_fd = None; + + #[cfg(any(unix, target_os = "wasi"))] + let dst_dir_fd = args.dst_dir_fd.get_opt(); + #[cfg(not(any(unix, target_os = "wasi")))] + let dst_dir_fd = None; + + crate::host_env::posix::replace(&src, src_dir_fd, &dst, dst_dir_fd).map_err(|err| { let builder = err.to_os_error_builder(vm); let builder = builder.filename(src.filename(vm)); let builder = builder.filename2(dst.filename(vm)); From b1cfa575c4ef20bd40cc5769df4c543f3cf3455a Mon Sep 17 00:00:00 2001 From: Bas Schoenmaeckers <7943856+bschoenmaeckers@users.noreply.github.com> Date: Sun, 12 Jul 2026 14:35:00 +0200 Subject: [PATCH 216/339] Fix clippy warning (#8249) * Fix clippy warning * Fix clippy warnings surfaced by newer clippy - exceptions.rs: {b:#02x} -> {b:#04x} (unused_format_specs); output unchanged for decode-error bytes (always >= 0x80) - binascii.rs: [b'\r', b'\n'] -> b"\r\n" (byte_str_slice) - host_env, _io.rs, ssl.rs, pyexpat.rs: expect std_instead_of_core where the suggested core::io items (ErrorKind, Cursor) are unstable (core_io); use expect so the suppression is flagged for removal once core::io stabilizes. build_posix_spawn_attrs co-gates the expect with the cfg block so it is not left unfulfilled on platforms compiling it out. Assisted-by: Claude * Fix more --------- Co-authored-by: Jeong YunWon <jeong@youknowone.org> --- crates/codegen/src/compile.rs | 22 +---- crates/codegen/src/symboltable.rs | 100 ++++------------------- crates/derive-impl/src/util.rs | 2 +- crates/host_env/src/fileutils.rs | 4 + crates/host_env/src/posix.rs | 8 ++ crates/stdlib/src/binascii.rs | 2 +- crates/stdlib/src/pyexpat.rs | 3 + crates/stdlib/src/ssl.rs | 3 + crates/vm/src/builtins/builtin_func.rs | 4 +- crates/vm/src/builtins/descriptor.rs | 4 +- crates/vm/src/builtins/memory.rs | 2 +- crates/vm/src/builtins/super.rs | 2 +- crates/vm/src/builtins/type.rs | 10 +-- crates/vm/src/exceptions.rs | 2 +- crates/vm/src/frame.rs | 17 ++-- crates/vm/src/object/core.rs | 2 +- crates/vm/src/object/payload.rs | 2 +- crates/vm/src/stdlib/_ast/argument.rs | 1 - crates/vm/src/stdlib/_ctypes/function.rs | 2 +- crates/vm/src/stdlib/_io.rs | 6 +- crates/vm/src/stdlib/_signal.rs | 4 + crates/vm/src/stdlib/_sysconfigdata.rs | 2 +- crates/vm/src/vm/vm_ops.rs | 2 +- src/lib.rs | 2 +- 24 files changed, 73 insertions(+), 135 deletions(-) diff --git a/crates/codegen/src/compile.rs b/crates/codegen/src/compile.rs index 0663375d3..ba2d41f12 100644 --- a/crates/codegen/src/compile.rs +++ b/crates/codegen/src/compile.rs @@ -1752,15 +1752,13 @@ impl<'warnings> Compiler<'warnings> { // Check if __class__ is available as a cell/free variable // The scope must be Free (from enclosing class) or have DEF_FREE_CLASS flag - if let Some(symbol) = table.lookup("__class__") { + { + let symbol = table.lookup("__class__")?; if symbol.scope != SymbolScope::Free && !symbol.flags.contains(SymbolFlags::DEF_FREE_CLASS) { return None; } - } else { - // __class__ not in symbol table, optimization not possible - return None; } Some(SuperCallType::ZeroArg) @@ -8260,12 +8258,7 @@ impl<'warnings> Compiler<'warnings> { self.compile_name(id, NameUsage::Load)?; AugAssignKind::Name { id } } - ast::Expr::Subscript(ast::ExprSubscript { - value, - slice, - ctx: _, - .. - }) => { + ast::Expr::Subscript(ast::ExprSubscript { value, slice, .. }) => { let use_slice_opt = self.should_apply_two_element_slice_optimization(slice); self.compile_expression(value)?; self.set_source_range(target_range); @@ -9225,14 +9218,7 @@ impl<'warnings> Compiler<'warnings> { let ast::Expr::Name(ast::ExprName { id, .. }) = func else { return None; }; - let [ - ast::Expr::Generator(ast::ExprGenerator { - elt: _, - generators: _, - .. - }), - ] = &args.args[..] - else { + let [ast::Expr::Generator(ast::ExprGenerator { .. })] = &args.args[..] else { return None; }; if !args.keywords.is_empty() || { diff --git a/crates/codegen/src/symboltable.rs b/crates/codegen/src/symboltable.rs index b1aadbe2c..bafd065ef 100644 --- a/crates/codegen/src/symboltable.rs +++ b/crates/codegen/src/symboltable.rs @@ -1623,7 +1623,6 @@ impl SymbolTableBuilder { decorator_list, type_params, range, - node_index: _, .. }) => { let prev_class = self.class_name.clone(); @@ -1819,7 +1818,6 @@ impl SymbolTableBuilder { value, simple, range, - node_index: _, .. }) => { self.tables.last_mut().unwrap().annotations_used = true; @@ -2141,35 +2139,20 @@ impl SymbolTableBuilder { } match expression { - Expr::BinOp(ExprBinOp { - left, - right, - range: _, - .. - }) => { + Expr::BinOp(ExprBinOp { left, right, .. }) => { self.scan_expression(left, context)?; self.scan_expression(right, context)?; } - Expr::BoolOp(ExprBoolOp { - values, range: _, .. - }) => { + Expr::BoolOp(ExprBoolOp { values, .. }) => { self.scan_expressions(values, context)?; } Expr::Compare(ExprCompare { - left, - comparators, - range: _, - .. + left, comparators, .. }) => { self.scan_expression(left, context)?; self.scan_expressions(comparators, context)?; } - Expr::Subscript(ExprSubscript { - value, - slice, - range: _, - .. - }) => { + Expr::Subscript(ExprSubscript { value, slice, .. }) => { self.scan_expression(value, ExpressionContext::Load)?; self.scan_expression(slice, ExpressionContext::Load)?; } @@ -2179,12 +2162,7 @@ impl SymbolTableBuilder { self.check_name(attr.as_str(), context, *range)?; self.scan_expression(value, ExpressionContext::Load)?; } - Expr::Dict(ExprDict { - items, - node_index: _, - range: _, - .. - }) => { + Expr::Dict(ExprDict { items, .. }) => { for item in items { if let Some(key) = &item.key { self.scan_expression(key, context)?; @@ -2194,12 +2172,7 @@ impl SymbolTableBuilder { self.scan_expression(&item.value, context)?; } } - Expr::Await(ExprAwait { - value, - node_index: _, - range: _, - .. - }) => { + Expr::Await(ExprAwait { value, .. }) => { let current_scope = self.tables.last().unwrap().typ; if !self.allows_top_level_await() && !Self::is_function_like_scope(current_scope) @@ -2227,12 +2200,7 @@ impl SymbolTableBuilder { self.scan_expression(value, context)?; self.tables.last_mut().unwrap().is_coroutine = true; } - Expr::Yield(ExprYield { - value, - node_index: _, - range: _, - .. - }) => { + Expr::Yield(ExprYield { value, .. }) => { if let Some(expression) = value { self.scan_expression(expression, context)?; } @@ -2252,12 +2220,7 @@ impl SymbolTableBuilder { }); } } - Expr::YieldFrom(ExprYieldFrom { - value, - node_index: _, - range: _, - .. - }) => { + Expr::YieldFrom(ExprYieldFrom { value, .. }) => { self.scan_expression(value, context)?; self.tables.last_mut().unwrap().is_generator = true; if let Some(context_name) = self.comprehension_yield_context @@ -2275,28 +2238,19 @@ impl SymbolTableBuilder { }); } } - Expr::UnaryOp(ExprUnaryOp { - operand, range: _, .. - }) => { + Expr::UnaryOp(ExprUnaryOp { operand, .. }) => { self.scan_expression(operand, context)?; } - Expr::Starred(ExprStarred { - value, range: _, .. - }) => { + Expr::Starred(ExprStarred { value, .. }) => { self.scan_expression(value, context)?; } - Expr::Tuple(ExprTuple { elts, range: _, .. }) - | Expr::Set(ExprSet { elts, range: _, .. }) - | Expr::List(ExprList { elts, range: _, .. }) => { + Expr::Tuple(ExprTuple { elts, .. }) + | Expr::Set(ExprSet { elts, .. }) + | Expr::List(ExprList { elts, .. }) => { self.scan_expressions(elts, context)?; } Expr::Slice(ExprSlice { - lower, - upper, - step, - node_index: _, - range: _, - .. + lower, upper, step, .. }) => { if let Some(lower) = lower { self.scan_expression(lower, context)?; @@ -2326,7 +2280,6 @@ impl SymbolTableBuilder { elt, generators, range, - node_index: _, .. }) => { let was_in_iter_def_exp = self.in_iter_def_exp; @@ -2341,7 +2294,6 @@ impl SymbolTableBuilder { elt, generators, range, - node_index: _, .. }) => { let was_in_iter_def_exp = self.in_iter_def_exp; @@ -2357,7 +2309,6 @@ impl SymbolTableBuilder { value, generators, range, - node_index: _, .. }) => { let was_in_iter_def_exp = self.in_iter_def_exp; @@ -2377,11 +2328,7 @@ impl SymbolTableBuilder { self.in_iter_def_exp = was_in_iter_def_exp; } Expr::Call(ExprCall { - func, - arguments, - node_index: _, - range: _, - .. + func, arguments, .. }) => { match context { ExpressionContext::IterDefinitionExp => { @@ -2438,11 +2385,7 @@ impl SymbolTableBuilder { } } Expr::Lambda(ExprLambda { - body, - parameters, - node_index: _, - range: _, - .. + body, parameters, .. }) => { let was_in_iter_def_exp = self.in_iter_def_exp; if let Some(parameters) = parameters { @@ -2535,12 +2478,7 @@ impl SymbolTableBuilder { }); } Expr::If(ExprIf { - test, - body, - orelse, - node_index: _, - range: _, - .. + test, body, orelse, .. }) => { self.scan_expression(test, ExpressionContext::Load)?; self.scan_expression(body, ExpressionContext::Load)?; @@ -2551,7 +2489,6 @@ impl SymbolTableBuilder { target, value, range, - node_index: _, .. }) => { // named expressions are not allowed in the definition of @@ -2777,7 +2714,6 @@ impl SymbolTableBuilder { bound, range: type_var_range, default, - node_index: _, .. }) => { self.register_name(name.as_str(), SymbolUsage::TypeParam, *type_var_range)?; @@ -2821,7 +2757,6 @@ impl SymbolTableBuilder { name, range: param_spec_range, default, - node_index: _, .. }) => { self.register_name(name, SymbolUsage::TypeParam, *param_spec_range)?; @@ -2850,7 +2785,6 @@ impl SymbolTableBuilder { name, range: type_var_tuple_range, default, - node_index: _, .. }) => { self.register_name(name, SymbolUsage::TypeParam, *type_var_tuple_range)?; diff --git a/crates/derive-impl/src/util.rs b/crates/derive-impl/src/util.rs index a07084446..1ee878c13 100644 --- a/crates/derive-impl/src/util.rs +++ b/crates/derive-impl/src/util.rs @@ -63,7 +63,7 @@ impl ItemNursery { if !inserted { return Err(syn::Error::new( item.attr_name.span(), - format!("Duplicated #[py*] attribute found for {:?}", &item.py_names), + format!("Duplicated #[py*] attribute found for {:?}", item.py_names), )); } } diff --git a/crates/host_env/src/fileutils.rs b/crates/host_env/src/fileutils.rs index 5cfe3f1d7..d88951516 100644 --- a/crates/host_env/src/fileutils.rs +++ b/crates/host_env/src/fileutils.rs @@ -457,6 +457,10 @@ pub unsafe fn fclose(fp: *mut CFile) -> core::ffi::c_int { // _Py_fopen_obj in cpython (Python/fileutils.c:1757-1835) // Open a file using std::fs::File and convert to FILE* // Automatically handles path encoding and EINTR retries +#[expect( + clippy::std_instead_of_core, + reason = "false positive: core::io::ErrorKind is unstable (core_io)" +)] pub fn fopen(path: &std::path::Path, mode: &str) -> std::io::Result<*mut CFile> { use alloc::ffi::CString; use std::fs::File; diff --git a/crates/host_env/src/posix.rs b/crates/host_env/src/posix.rs index 60b55ef42..150df505c 100644 --- a/crates/host_env/src/posix.rs +++ b/crates/host_env/src/posix.rs @@ -305,6 +305,10 @@ pub fn fchown(fd: BorrowedFd<'_>, uid: Option<u32>, gid: Option<u32>) -> std::io } #[cfg(not(windows))] +#[expect( + clippy::std_instead_of_core, + reason = "false positive: core::io::ErrorKind is unstable (core_io)" +)] pub fn stat_path( path: &OsStr, dir_fd: Option<i32>, @@ -1431,6 +1435,10 @@ fn build_posix_spawn_attrs( target_os = "illumos", target_os = "hurd", )))] + #[expect( + clippy::std_instead_of_core, + reason = "false positive: core::io::ErrorKind is unstable (core_io); expect is co-gated with the usage so it is not left unfulfilled on platforms where this block is compiled out" + )] { return Err(std::io::Error::new( std::io::ErrorKind::Unsupported, diff --git a/crates/stdlib/src/binascii.rs b/crates/stdlib/src/binascii.rs index ac9452358..579a5081c 100644 --- a/crates/stdlib/src/binascii.rs +++ b/crates/stdlib/src/binascii.rs @@ -392,7 +392,7 @@ mod decl { // there are a few uuencodes out there that use // '`' as zero instead of space. if !(b' '..=(b' ' + 64)).contains(&c) { - if [b'\r', b'\n'].contains(&c) { + if b"\r\n".contains(&c) { return Ok(0); } return Err(super::new_binascii_error("Illegal char", vm)); diff --git a/crates/stdlib/src/pyexpat.rs b/crates/stdlib/src/pyexpat.rs index fab4e7b5e..143d820d6 100644 --- a/crates/stdlib/src/pyexpat.rs +++ b/crates/stdlib/src/pyexpat.rs @@ -1,5 +1,8 @@ //! Pyexpat builtin module +// false positive: core::io::Cursor is unstable (core_io), unusable on stable +#![expect(clippy::std_instead_of_core)] + // spell-checker: ignore libexpat pub(crate) use _pyexpat::module_def; diff --git a/crates/stdlib/src/ssl.rs b/crates/stdlib/src/ssl.rs index 81d69b8c6..7b7e2127f 100644 --- a/crates/stdlib/src/ssl.rs +++ b/crates/stdlib/src/ssl.rs @@ -13,6 +13,9 @@ //! //! Warning: This library contains AI-generated code and comments. Do not trust any code or comment without verification. Please have a qualified expert review the code and remove this notice after review. +// false positive: core::io::{Cursor, ErrorKind} are unstable (core_io), unusable on stable +#![expect(clippy::std_instead_of_core)] + // OID (Object Identifier) management module mod oid; diff --git a/crates/vm/src/builtins/builtin_func.rs b/crates/vm/src/builtins/builtin_func.rs index d3195aa0e..eabe8d4ea 100644 --- a/crates/vm/src/builtins/builtin_func.rs +++ b/crates/vm/src/builtins/builtin_func.rs @@ -157,7 +157,7 @@ impl PyNativeFunction { // m_self is an instance: use Py_TYPE(m_self).__qualname__ bound.class().name().to_string() }; - vm.ctx.new_str(format!("{}.{}", prefix, &zelf.value.name)) + vm.ctx.new_str(format!("{}.{}", prefix, zelf.value.name)) } else { vm.ctx.intern_str(zelf.value.name).to_owned() }; @@ -220,7 +220,7 @@ impl fmt::Debug for PyNativeMethod { f, "builtin method of {:?} with {:?}", &*self.class.name(), - &self.func + self.func ) } } diff --git a/crates/vm/src/builtins/descriptor.rs b/crates/vm/src/builtins/descriptor.rs index 350adf6d7..537c2e39c 100644 --- a/crates/vm/src/builtins/descriptor.rs +++ b/crates/vm/src/builtins/descriptor.rs @@ -127,7 +127,7 @@ impl PyMethodDescriptor { #[pygetset] fn __qualname__(&self) -> String { - format!("{}.{}", self.common.typ.name(), &self.common.name) + format!("{}.{}", self.common.typ.name(), self.common.name) } #[pygetset] @@ -164,7 +164,7 @@ impl Representable for PyMethodDescriptor { fn repr_str(zelf: &Py<Self>, _vm: &VirtualMachine) -> PyResult<String> { Ok(format!( "<method '{}' of '{}' objects>", - &zelf.method.name, + zelf.method.name, zelf.common.typ.name() )) } diff --git a/crates/vm/src/builtins/memory.rs b/crates/vm/src/builtins/memory.rs index ec6228965..f40350982 100644 --- a/crates/vm/src/builtins/memory.rs +++ b/crates/vm/src/builtins/memory.rs @@ -198,7 +198,7 @@ impl PyMemoryView { let data = self.format_spec.pack(vec![value], vm).map_err(|_| { vm.new_type_error(format!( "memoryview: invalid type for format '{}'", - &self.desc.format + self.desc.format )) })?; bytes[pos..pos + self.desc.itemsize].copy_from_slice(&data); diff --git a/crates/vm/src/builtins/super.rs b/crates/vm/src/builtins/super.rs index c44b61d71..620363966 100644 --- a/crates/vm/src/builtins/super.rs +++ b/crates/vm/src/builtins/super.rs @@ -237,7 +237,7 @@ impl Representable for PySuper { let obj = zelf.inner.read().obj.clone(); let repr = match obj { Some((_, ref ty)) => { - format!("<super: <class '{}'>, <{} object>>", &type_name, ty.name()) + format!("<super: <class '{}'>, <{} object>>", type_name, ty.name()) } None => format!("<super: <class '{type_name}'>, NULL>"), }; diff --git a/crates/vm/src/builtins/type.rs b/crates/vm/src/builtins/type.rs index 1c98e6861..3d9228b80 100644 --- a/crates/vm/src/builtins/type.rs +++ b/crates/vm/src/builtins/type.rs @@ -431,7 +431,7 @@ impl core::fmt::Display for PyType { impl core::fmt::Debug for PyType { fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { - write!(f, "[PyType {}]", &self.name()) + write!(f, "[PyType {}]", self.name()) } } @@ -1906,13 +1906,7 @@ impl PyType { .get(identifier!(vm, __module__)) .cloned() // We need to exclude this method from going into recursion: - .and_then(|found| { - if found.fast_isinstance(vm.ctx.types.getset_type) { - None - } else { - Some(found) - } - }) + .filter(|found| !found.fast_isinstance(vm.ctx.types.getset_type)) .unwrap_or_else(|| { // For non-heap types, extract module from tp_name (e.g. "typing.TypeAliasType" -> "typing") let slot_name = self.slot_name(); diff --git a/crates/vm/src/exceptions.rs b/crates/vm/src/exceptions.rs index 845b01c38..f7e1b79aa 100644 --- a/crates/vm/src/exceptions.rs +++ b/crates/vm/src/exceptions.rs @@ -2652,7 +2652,7 @@ pub(super) mod types { Ok(vm.ctx.new_str(if start < object.len() && end <= object.len() && end == start + 1 { let b = object.borrow_buf()[start]; format!( - "'{encoding}' codec can't decode byte {b:#02x} in position {start}: {reason}" + "'{encoding}' codec can't decode byte {b:#04x} in position {start}: {reason}" ) } else { format!( diff --git a/crates/vm/src/frame.rs b/crates/vm/src/frame.rs index 40499efb1..ae7f2c061 100644 --- a/crates/vm/src/frame.rs +++ b/crates/vm/src/frame.rs @@ -3801,16 +3801,15 @@ impl ExecutingFrame<'_> { } seen_keys.add(key.as_object().to_owned(), vm)?; // value = map.get(key, dummy) - match get_method.call((key.as_object(), dummy.clone()), vm) { - Ok(value) => { - // if value == dummy: key not in map! - if value.is(&dummy) { - all_match = false; - break; - } - values.push(value); + { + let value = + get_method.call((key.as_object(), dummy.clone()), vm)?; + // if value == dummy: key not in map! + if value.is(&dummy) { + all_match = false; + break; } - Err(e) => return Err(e), + values.push(value); } } } else { diff --git a/crates/vm/src/object/core.rs b/crates/vm/src/object/core.rs index 2eb1b17cb..9fa236b87 100644 --- a/crates/vm/src/object/core.rs +++ b/crates/vm/src/object/core.rs @@ -454,7 +454,7 @@ impl<T> PyInner<T> { impl<T: fmt::Debug> fmt::Debug for PyInner<T> { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - write!(f, "[PyObject {:?}]", &self.payload) + write!(f, "[PyObject {:?}]", self.payload) } } diff --git a/crates/vm/src/object/payload.rs b/crates/vm/src/object/payload.rs index 36262607a..b6590239e 100644 --- a/crates/vm/src/object/payload.rs +++ b/crates/vm/src/object/payload.rs @@ -198,7 +198,7 @@ pub trait PyPayload: MaybeTraverse + PyThreadingConstraint + Sized + 'static { ) -> PyBaseExceptionRef { vm.new_type_error(format!( "'{}' is not a subtype of '{}'", - &cls.name(), + cls.name(), exact_class.name() )) } diff --git a/crates/vm/src/stdlib/_ast/argument.rs b/crates/vm/src/stdlib/_ast/argument.rs index 8bd1507cd..5019c4366 100644 --- a/crates/vm/src/stdlib/_ast/argument.rs +++ b/crates/vm/src/stdlib/_ast/argument.rs @@ -151,7 +151,6 @@ pub(super) fn split_function_call_arguments( args, keywords, runtime_args, - runtime_bases: _, .. } = args; diff --git a/crates/vm/src/stdlib/_ctypes/function.rs b/crates/vm/src/stdlib/_ctypes/function.rs index 86b4ff59b..ebda71719 100644 --- a/crates/vm/src/stdlib/_ctypes/function.rs +++ b/crates/vm/src/stdlib/_ctypes/function.rs @@ -771,7 +771,7 @@ impl Constructor for PyCFuncPtr { .as_bigint() .clone(), }; - let terminated = format!("{}\0", &name); + let terminated = format!("{name}\0"); let ptr_val = match rustpython_host_env::ctypes::lookup_function_symbol_addr( handle .to_usize() diff --git a/crates/vm/src/stdlib/_io.rs b/crates/vm/src/stdlib/_io.rs index 580add647..6707a254c 100644 --- a/crates/vm/src/stdlib/_io.rs +++ b/crates/vm/src/stdlib/_io.rs @@ -112,6 +112,10 @@ impl std::os::fd::AsRawFd for Fildes { } #[pymodule] +#[expect( + clippy::std_instead_of_core, + reason = "false positive: core::io items (Cursor, etc.) are unstable (core_io)" +)] mod _io { use super::*; use crate::{ @@ -3290,7 +3294,7 @@ mod _io { use crate::types::PyComparisonOp; if cookie.rich_compare_bool(vm.ctx.new_int(0).as_ref(), PyComparisonOp::Lt, vm)? { return Err( - vm.new_value_error(format!("negative seek position {}", &cookie.repr(vm)?)) + vm.new_value_error(format!("negative seek position {}", cookie.repr(vm)?)) ); } drop(textio); diff --git a/crates/vm/src/stdlib/_signal.rs b/crates/vm/src/stdlib/_signal.rs index 71063d895..d5083962b 100644 --- a/crates/vm/src/stdlib/_signal.rs +++ b/crates/vm/src/stdlib/_signal.rs @@ -335,6 +335,10 @@ pub(crate) mod _signal { } #[cfg(windows)] + #[expect( + clippy::std_instead_of_core, + reason = "false positive: core::io::ErrorKind is unstable (core_io)" + )] let is_socket = if fd != INVALID_WAKEUP { host_signal::wakeup_fd_is_socket(fd).map_err(|err| { if err.kind() == std::io::ErrorKind::InvalidInput { diff --git a/crates/vm/src/stdlib/_sysconfigdata.rs b/crates/vm/src/stdlib/_sysconfigdata.rs index a9871ec95..5a00a56ae 100644 --- a/crates/vm/src/stdlib/_sysconfigdata.rs +++ b/crates/vm/src/stdlib/_sysconfigdata.rs @@ -19,7 +19,7 @@ mod _sysconfigdata { let paths = &vm.state.config.paths; build_time_vars.set_item("prefix", paths.prefix.clone().to_pyobject(vm), vm)?; build_time_vars.set_item("exec_prefix", paths.exec_prefix.clone().to_pyobject(vm), vm)?; - let bindir = format!("{}/bin", &paths.exec_prefix); + let bindir = format!("{}/bin", paths.exec_prefix); build_time_vars.set_item("BINDIR", bindir.to_pyobject(vm), vm)?; module.set_attr("build_time_vars", build_time_vars, vm)?; diff --git a/crates/vm/src/vm/vm_ops.rs b/crates/vm/src/vm/vm_ops.rs index d25e7119d..8cb00d4a1 100644 --- a/crates/vm/src/vm/vm_ops.rs +++ b/crates/vm/src/vm/vm_ops.rs @@ -568,7 +568,7 @@ impl VirtualMachine { formatted.downcast().map_err(|result| { self.new_type_error(format!( "__format__ must return a str, not {}", - &result.class().name() + result.class().name() )) }) } diff --git a/src/lib.rs b/src/lib.rs index 9a5cede9b..dfede27fe 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -303,7 +303,7 @@ fn run_rustpython(vm: &VirtualMachine, run_mode: RunMode) -> PyResult<()> { RunMode::InstallPip(installer) => install_pip(installer, scope.clone(), vm), RunMode::Script(script_path) => { // pymain_run_file_obj - debug!("Running script {}", &script_path); + debug!("Running script {}", script_path); run_file(vm, scope.clone(), &script_path) } RunMode::Repl => Ok(()), From af0fa212ccdfe6ee077a3ea004e68e1a653cb173 Mon Sep 17 00:00:00 2001 From: YujinBae <qodbwls70@naver.com> Date: Mon, 13 Jul 2026 14:10:23 +0900 Subject: [PATCH 217/339] _sre: fix Match.expand to use _compile_template (#8229) (#8256) Match.expand delegated to re._expand, which CPython removed in 3.12 during the template-expansion refactor. With the 3.14 stdlib that helper no longer exists, so expand raised AttributeError. Route expand through the compiled-template path (Template::compile -> re._compile_template) and share the template-filling logic with Pattern.sub via a Match::expand_template helper. Each caller still compiles the template once, so sub keeps its no-recompile-per-match fast path. Remove the expectedFailure marker on test_re.test_expand. Assisted-by: Claude Code:claude-opus-4-8 --- Lib/test/test_re.py | 1 - crates/vm/src/stdlib/_sre.rs | 47 ++++++++++++++++++++++++++---------- 2 files changed, 34 insertions(+), 14 deletions(-) diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py index 1d396e4f3..eef630754 100644 --- a/Lib/test/test_re.py +++ b/Lib/test/test_re.py @@ -726,7 +726,6 @@ class ReTests(unittest.TestCase): 'first second').groupdict(), {'first':'first', 'second':'second'}) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_expand(self): self.assertEqual(re.match("(?P<first>first) (?P<second>second)", "first second") diff --git a/crates/vm/src/stdlib/_sre.rs b/crates/vm/src/stdlib/_sre.rs index f7bc10e66..c90ff4d4f 100644 --- a/crates/vm/src/stdlib/_sre.rs +++ b/crates/vm/src/stdlib/_sre.rs @@ -471,15 +471,7 @@ mod _sre { } FilterType::Template(template) => { let m = Match::new(&mut iter.state, zelf.clone(), string.clone()); - // template.expand(m)? - // let mut list = vec![template.literal.clone()]; - sub_list.push(template.literal.clone()); - for (index, literal) in template.items.iter().cloned() { - if let Some(item) = m.get_slice(index, s, vm) { - sub_list.push(item); - } - sub_list.push(literal); - } + m.expand_template(template, s, &mut sub_list, vm); } }; @@ -702,10 +694,19 @@ mod _sre { } #[pymethod] - fn expand(zelf: PyRef<Self>, template: PyStrRef, vm: &VirtualMachine) -> PyResult { - let re = vm.import("re", 0)?; - let func = re.get_attr("_expand", vm)?; - func.call((zelf.pattern.clone(), zelf, template), vm) + fn expand(zelf: PyRef<Self>, template: PyObjectRef, vm: &VirtualMachine) -> PyResult { + let template = Template::compile(zelf.pattern.clone(), template, vm)?; + with_sre_str!(zelf.pattern, &zelf.string, vm, |s| { + let mut list: Vec<PyObjectRef> = Vec::new(); + zelf.expand_template(&template, s, &mut list, vm); + + let join_type: PyObjectRef = if zelf.pattern.isbytes { + vm.ctx.new_bytes(vec![]).into() + } else { + vm.ctx.new_str(ascii!("")).into() + }; + vm.call_method(&join_type, "join", (PyList::from(list).into_pyobject(vm),)) + }) } #[pymethod] @@ -820,6 +821,26 @@ mod _sre { Some(str_drive.slice(start as usize, end as usize, vm)) } + /// Expand an already-compiled template against this match, appending the + /// resulting literal/group segments to `list`. Shared by `expand` and + /// `Pattern.sub` so the template-filling logic lives in one place; the + /// caller is responsible for compiling the template (once) beforehand. + fn expand_template<S: SreStr>( + &self, + template: &Template, + str_drive: S, + list: &mut Vec<PyObjectRef>, + vm: &VirtualMachine, + ) { + list.push(template.literal.clone()); + for (index, literal) in template.items.iter().cloned() { + if let Some(item) = self.get_slice(index, str_drive, vm) { + list.push(item); + } + list.push(literal); + } + } + #[pyclassmethod] fn __class_getitem__( cls: PyTypeRef, From 9297e158f302d253bf76c94ff7824dd390dad858 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EA=B4=91=ED=9A=A8?= <87641474+widehyo1@users.noreply.github.com> Date: Mon, 13 Jul 2026 14:11:41 +0900 Subject: [PATCH 218/339] csv: fix csv escape fieldsep (#8260) * csv: apply dialect escapechar when reading ReaderBuilder only received escapechar when it was passed directly as a keyword argument. A dialect object's or registered dialect's escapechar was visible through reader.dialect but not used by csv_core. Pass escapechar through for named, object, and default dialect paths. This makes escaped delimiters inside quoted fields follow the configured dialect, for example '"abc\,def"' reads as 'abc,def'. Unmark TestQuotedEscapedExcel.test_read_escape_fieldsep. Assisted-by: Codex * csv: handle escaped delimiters with QUOTE_NONE csv_core applies escapechar while reading quoted fields, but its unquoted field state treats an escaped delimiter as a delimiter. Consequently, QUOTE_NONE with escapechar split 'abc\,def' into 'abc\' and 'def'. Add a small QUOTE_NONE record parser for dialects with escapechar. It keeps the byte following an escape character as field data, so escaped delimiters do not end a field while ordinary delimiters and record terminators retain their usual meaning. Unmark TestEscapedExcel.test_read_escape_fieldsep. Assisted-by: Codex * csv: respect skipinitialspace with QUOTE_NONE The QUOTE_NONE parser returned before the normal reader's whitespace preprocessing, so it ignored skipinitialspace when escapechar was set. Track whether parsing has just followed a delimiter and skip only ordinary spaces in that position. Escaped spaces remain field data. Add a stdlib_csv snippet regression test for QUOTE_NONE with escapechar and skipinitialspace. Assisted-by: Codex:gpt-5.6-terra * csv: deduplicate reader dialect configuration to_reader configured ReaderBuilder separately for named, object, and default dialects even though the configuration was identical. Resolve the PyDialect once, then apply delimiter, double_quote, escapechar, and quotechar in one place. Preserve the existing unregistered-name fallback and required excel dialect lookup behavior. Assisted-by: Codex:gpt-5.6-terra --- Lib/test/test_csv.py | 2 - crates/stdlib/src/csv.rs | 123 ++++++++++++++++++++--------- extra_tests/snippets/stdlib_csv.py | 13 +++ 3 files changed, 99 insertions(+), 39 deletions(-) diff --git a/Lib/test/test_csv.py b/Lib/test/test_csv.py index 494cce50a..6e00f8eb1 100644 --- a/Lib/test/test_csv.py +++ b/Lib/test/test_csv.py @@ -857,7 +857,6 @@ class TestEscapedExcel(TestCsvBase): def test_escape_fieldsep(self): self.writerAssertEqual([['abc,def']], 'abc\\,def\r\n') - @unittest.expectedFailure # TODO: RUSTPYTHON def test_read_escape_fieldsep(self): self.readerAssertEqual('abc\\,def\r\n', [['abc,def']]) @@ -881,7 +880,6 @@ class TestQuotedEscapedExcel(TestCsvBase): def test_write_escape_fieldsep(self): self.writerAssertEqual([['abc,def']], '"abc,def"\r\n') - @unittest.expectedFailure # TODO: RUSTPYTHON def test_read_escape_fieldsep(self): self.readerAssertEqual('"abc\\,def"\r\n', [['abc,def']]) diff --git a/crates/stdlib/src/csv.rs b/crates/stdlib/src/csv.rs index aaffab182..48ad68d43 100644 --- a/crates/stdlib/src/csv.rs +++ b/crates/stdlib/src/csv.rs @@ -797,45 +797,27 @@ mod _csv { } fn to_reader(&self) -> csv_core::Reader { + let dialect = match &self.dialect { + DialectItem::Str(name) => GLOBAL_HASHMAP.lock().get(name).copied(), + DialectItem::Obj(obj) => Some(*obj), + DialectItem::None => { + let g = GLOBAL_HASHMAP.lock(); + Some(*g.get("excel").unwrap()) + } + }; + let mut builder = csv_core::ReaderBuilder::new(); - let mut reader = match &self.dialect { - DialectItem::Str(name) => { - let g = GLOBAL_HASHMAP.lock(); - if let Some(dialect) = g.get(name) { - let mut builder = builder - .delimiter(dialect.delimiter) - .double_quote(dialect.doublequote); - if let Some(t) = dialect.quotechar { - builder = builder.quote(t); - } - builder - // RustPython todo - // todo! Perfecting the remaining attributes. - } else { - &mut builder - } - } - DialectItem::Obj(obj) => { - let mut builder = builder - .delimiter(obj.delimiter) - .double_quote(obj.doublequote); - if let Some(t) = obj.quotechar { - builder = builder.quote(t); - } - builder - } - _ => { - let name = "excel"; - let g = GLOBAL_HASHMAP.lock(); - let dialect = g.get(name).unwrap(); - let mut builder = builder - .delimiter(dialect.delimiter) - .double_quote(dialect.doublequote); - if let Some(quotechar) = dialect.quotechar { - builder = builder.quote(quotechar); - } - builder + let mut reader = if let Some(dialect) = dialect { + let mut builder = builder + .delimiter(dialect.delimiter) + .double_quote(dialect.doublequote) + .escape(dialect.escapechar); + if let Some(quotechar) = dialect.quotechar { + builder = builder.quote(quotechar); } + builder + } else { + &mut builder }; if let Some(t) = self.delimiter { @@ -972,6 +954,67 @@ mod _csv { impl SelfIter for Reader {} + fn read_quote_none_record( + input: &[u8], + dialect: PyDialect, + field_limit: isize, + vm: &VirtualMachine, + ) -> PyResult<Vec<PyObjectRef>> { + let mut fields = vec![Vec::new()]; + let mut escaped = false; + let mut after_delimiter = false; + + for (index, &byte) in input.iter().enumerate() { + if escaped { + fields.last_mut().unwrap().push(byte); + escaped = false; + after_delimiter = false; + } else if dialect.skipinitialspace && after_delimiter && byte == b' ' { + continue; + } else if dialect.escapechar == Some(byte) { + escaped = true; + } else if byte == dialect.delimiter { + fields.push(Vec::new()); + after_delimiter = true; + } else if matches!(byte, b'\r' | b'\n') { + if !input[index..] + .iter() + .all(|&byte| matches!(byte, b'\r' | b'\n')) + { + return Err(new_csv_error( + vm, + concat!( + "new-line character seen in unquoted field", + " - do you need to open the file in universal-newline mode?" + ), + )); + } + break; + } else { + fields.last_mut().unwrap().push(byte); + after_delimiter = false; + } + } + + // CPython treats an escape character at the end of an iterator item + // as escaping the implicit newline at the end of that item. + if escaped { + fields.last_mut().unwrap().push(b'\n'); + } + + fields + .into_iter() + .map(|field| { + if field.len() > field_limit as usize { + return Err(new_csv_error(vm, "filed too long to read")); + } + let field = core::str::from_utf8(&field) + .map_err(|_| vm.new_unicode_decode_error("csv not utf8"))?; + Ok(vm.ctx.new_str(field).into()) + }) + .collect() + } + impl IterNext for Reader { fn next(zelf: &Py<Self>, vm: &VirtualMachine) -> PyResult<PyIterReturn> { let string = raise_if_stop!(zelf.iter.next(vm)?); @@ -1003,6 +1046,12 @@ mod _csv { let mut output_ends_offset = 0; let field_limit = GLOBAL_FIELD_LIMIT.lock().to_owned(); + if zelf.dialect.quoting == QuoteStyle::None && zelf.dialect.escapechar.is_some() { + let out = read_quote_none_record(input, zelf.dialect, field_limit, vm)?; + *line_num += 1; + return Ok(PyIterReturn::Return(vm.ctx.new_list(out).into())); + } + #[inline] fn trim_spaces(input: &[u8]) -> &[u8] { let trimmed_start = input.iter().position(|&x| x != b' ').unwrap_or(input.len()); diff --git a/extra_tests/snippets/stdlib_csv.py b/extra_tests/snippets/stdlib_csv.py index b9c741cbb..dc2186d17 100644 --- a/extra_tests/snippets/stdlib_csv.py +++ b/extra_tests/snippets/stdlib_csv.py @@ -134,3 +134,16 @@ def test_quote_none_writer_without_quotechar(): test_quote_none_writer_without_quotechar() + + +def test_quote_none_reader_skipinitialspace_escapechar(): + reader = csv.reader( + ["a, b,\\ c,d"], + quoting=csv.QUOTE_NONE, + escapechar="\\", + skipinitialspace=True, + ) + assert list(reader) == [["a", "b", " c", "d"]] + + +test_quote_none_reader_skipinitialspace_escapechar() From 755a2b7d26af91c5f20e75e44c4f8c54e3733042 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=95=EC=A7=80=EC=9B=85?= <jacejung.dev@gmail.com> Date: Mon, 13 Jul 2026 14:12:59 +0900 Subject: [PATCH 219/339] itertools: fix count() repr to show float step 1.0 (#8261) Assisted-by: Claude Code:claude-opus-4-8 --- Lib/test/test_itertools.py | 1 - crates/vm/src/stdlib/itertools.rs | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_itertools.py b/Lib/test/test_itertools.py index e7c764815..e865c9bf0 100644 --- a/Lib/test/test_itertools.py +++ b/Lib/test/test_itertools.py @@ -538,7 +538,6 @@ class TestBasicOps(unittest.TestCase): #check proper internal error handling for large "step' sizes count(1, maxsize+5); sys.exc_info() - @unittest.expectedFailure # TODO: RUSTPYTHON; 'count(10.5)' != 'count(10.5, 1.0)' def test_count_with_step(self): self.assertEqual(lzip('abc',count(2,3)), [('a', 2), ('b', 5), ('c', 8)]) self.assertEqual(lzip('abc',count(start=2,step=3)), diff --git a/crates/vm/src/stdlib/itertools.rs b/crates/vm/src/stdlib/itertools.rs index 8a78c698e..041620298 100644 --- a/crates/vm/src/stdlib/itertools.rs +++ b/crates/vm/src/stdlib/itertools.rs @@ -225,7 +225,9 @@ mod decl { let step = &zelf.step; let mut result = Wtf8Buf::from("count("); result.push_wtf8(cur_repr.as_wtf8()); - if !vm.bool_eq(step, vm.ctx.new_int(1).as_object())? { + let step_is_int_one = step.fast_isinstance(vm.ctx.types.int_type) + && vm.bool_eq(step, vm.ctx.new_int(1).as_object())?; + if !step_is_int_one { result.push_str(", "); result.push_wtf8(step.repr(vm)?.as_wtf8()); } From 3c5a8a6ecd557e79cb68314c53586568361f1b4e Mon Sep 17 00:00:00 2001 From: sijun-yang <yangsijun5528@gmail.com> Date: Mon, 13 Jul 2026 14:13:48 +0900 Subject: [PATCH 220/339] Add shared JetBrains IDE settings (#8262) Assisted-by: Codex:gpt-5 --- .gitignore | 4 +++- .idea/icon.svg | 3 +++ .idea/vcs.xml | 13 +++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 .idea/icon.svg create mode 100644 .idea/vcs.xml diff --git a/.gitignore b/.gitignore index 09e1b97b9..92fc399bf 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,9 @@ __pycache__/ .repl_history.txt .vscode/ wasm-pack.log -.idea/ +.idea/* +!.idea/icon.svg +!.idea/vcs.xml .envrc flame-graph.html diff --git a/.idea/icon.svg b/.idea/icon.svg new file mode 100644 index 000000000..84e5f593a --- /dev/null +++ b/.idea/icon.svg @@ -0,0 +1,3 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" viewBox="0 0 512 512"> + <image href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAAAXNSR0IArs4c6QAAAJ5lWElmTU0AKgAAAAgABAEaAAUAAAABAAAAPgEbAAUAAAABAAAARgEoAAMAAAABAAIAAIdpAAQAAAABAAAATgAAAAAAAAEsAAAAAQAAASwAAAABAASShgAHAAAAGQAAAISgAQADAAAAAQABAACgAgAEAAAAAQAAAICgAwAEAAAAAQAAAIAAAAAAQVNDSUkAAABDcmVhdGVkIHdpdGggR0lNUADcIp6GAAAACXBIWXMAAC4jAAAuIwF4pT92AAABaWlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNi4wLjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4bWxuczpleGlmPSJodHRwOi8vbnMuYWRvYmUuY29tL2V4aWYvMS4wLyI+CiAgICAgICAgIDxleGlmOlVzZXJDb21tZW50PkNyZWF0ZWQgd2l0aCBHSU1QPC9leGlmOlVzZXJDb21tZW50PgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4KLa3NoAAAHSZJREFUeAHtXQtgVMXVPnPv3VcSQhDkJaAIiDZAAmilgBosAiLa2haK9rf8WgsERdu/Pn7tX01/sb9FW62Wd/vbap9Sq/IIlFZFAa0PIIBR8VF5+EAeEkIem929d/qdu9llEzZmc+/d7G6yA5O9j5m5M+ecOXPmzJkzRNmQhUAWAlkIZCHQSSEgOmm7U9rso1+lggJJ/WuDdCivnA6ksjJKKj/e2b4tiYT/MprfRaetAYMqNIW2+y+nFbVXUN9UwSLLAdoJ8nI6nRJsoEUuopk6vhkyiFRAX8MDf4Ce9dbQFLGRQu1UnehntOhV9sI2BD4oIW+ffDpdSBomJZ2JAs+UgnwkSfP7aahXoXMbgH0X+K5HBeKZEoL0Fuhgm+2PWywgywEsAo6zoVergQYqFAZdYAi6CIgejscD3ArliGaQNcD/g+j1eF6Py3/i9QbdoBd9ObRdrKR6G9WwlTXLAdoIvs8mUtcuHjoPCJ/kr6cSdOYRLpU8XAwQStypG/AbG5gWmCAURLyqBetfj/F/uVhNVbHpUnHNdcuGBCBQN5XO11T6Nlj7FCDzTGbjkV6NHm0GHtM5MqI58Hs9HDlJHWKuhnccQSSHcb9DVWgd0q11r6bdeBwpCq/aJzRWtX0+lolfOT6Jerq8tECRNAtId7PwxkhlTDHw0JNNpHPvD0o6gkfv48UuyAEV+N2DLu8Hgo8j2VFS6Tq3oNs5LwiJgHwUAFmggTZCCLwkFUJglgCAg5ZCzVQqdqv0OBA/LADezpyde7cLkVk6BLoQft4GLp/Fqw26QhU5q+gTPGMcxw310+hacInvgyjOQFn8b2dQp5ty19LWuBmS/BB1zYZ4EKi+jMb6FFqJHt6XpXUGFEvuIIQ6IP+1kKRyvPu7qxpS/EbyxyujpWcfYLbQy0c9fD6i9+rp0JB11NBS2mQ/zxJAHAjXAfmQ5J8Gok9lgY57PLq0BNt+HGzgAU857YqTLSMfZQmgGdqglRvphlAG9tyHke8JC3tHoaG50bea/tAsecbfZgkgBoVyIg3QffQcxuhBPOazpI+uv08EaIbYQK/EJO0wl51GDzB4/sOerg0er6KFfEFD8SqKSzN0luHCgSfylYcfLuslqgfVobsrGO+hxat9yXXmnXNPv/1A8cD9Qzil1BSMDkZ3SPk9pCHdoBMzoCCWEY/hd3fF0tI94afp/zcKgPSvauI1LJy3KE9TPUMUPTSKDFEsFTkUPbkPSsgHCiF6CTeugWJTtotI7KJA6rmRG/5akJRgtaLValKPdBSGF197BFMITwVigzRYUKjCn81CqCt1I7R+59LSg7FJ0u26WQvSrXqJ12fY9Q/1Ut3eEiHFNCDmi0DCQEXjpRZhSm8E5DA/D/+PRfOJb7DipnmIKHWaPDfTxUnMiUAUiqLxZ8AT9D0GGf+9Y/HcP/NtOoaMJgBm610M93iSytWS5GShaKcJIEAaOpAOhLO2pd0DCAB0J3WMI1wXKRtIhq6rWDIvLQXIjCSA0bOXDQBTngncXoVYrKhhgJtIb3eEx3wQCDeCATq063nqNng0efJPDQ8TUj+iG7IEw8EbManT4jIytqVFZVqrxIj5K/opujFfJzFLUbVejHDuaUYo0FrWdnnPvUkaIao98D516X8OBIUwN1I0d3dFBm7F61ntUpE2fCQjOAALdS6plQpFfA9svi8jPeW9vUUgQ7vLiDeFjcYhSCggDONTkMfoHUtLP2oxa/wXp+PxeYjPIh6Nn8T6U57ppnUYNW/p19zCtRnj6kJUtC/39vRFPoMSqG8uf+AexNtLy8k/KwbY5mwC9zwDjY0QXKOBucYOxJWIY6JPHbxI2yFg1LxFgzFb+wnAOR3QSxs2bxX2PDP4dPv6W5D/q4hsAzgU0YsYK6kyRw4ibkbMQ7wacSPizxCZAzge0pIARs5dMtMQ6v2KovaT5vjOU7gMDxgWGqoOTW1sBVsA7UVkG4HYYZiJgYniuzHP2WqYl5mTEmI/npQPtKXQ0bMf6KGrXe4VimICgKdzmRhQf57+oW/HdG5wsZr9b13/3uoHt6BNxxFZQRSPsllBdQbiWMRZiCWIHO5CvMe8cvBP2hDAiNnLzlc1sVSoWrERYi4YAzwHG9weRfmrDpLmzSXNBy7ORACCIMP4JCe3Z/FLD3ytrZrBYtSZOcdziP90uv5MbSkPI+cs/YZwq38SQhkodUZ+JgdJe/7xGzB2hfJ6n8nSP9YVXMB/aO3rD3/7MQst4yFgE+KHFvK2miXlMkDx3CXfEqr6K3R4L8+hMz8IGjDhGoJaGoLrifYohngyHduWUgIoLl02HdOjFZD0gfx4w2E6gqz1OnnyuvFk0GT/UALxDGZDUNXXt56z/VOkTAYowvxeESpYosztSMg3UQj2r6gq2D8Tgb460KD+Z+Wvr/+s/dHb+hdTwgFGli6+AmPkb1G9dkI+tHO8rCdUU0sXDyxs/cPWvrGBrYHYzPtzA4S8qGKKBb6w+veoocsXsDK5XNHpH0B+2go2rTXvc9tu5eXI0uUXEeztAKmCZE/zoDYG4lmJFIRth2Qh6l189yNw52NSyKghJ/BM02u3zehOdQPY7Bs4hDZG+Nd4C3+/z93zoNcInNDOSaEiL1uD1xlSBpB0P6jkoNSlrphlai4p9bcyxSikXQlgVOniEYbQyoGU08zlUisU1FoeYM+UusNTye1o4NNSKP9wi8DuVxfd2KJCRU6i66CQ/XV0Zs6QkdDIVdMNYhPtbO2zmfq+3QigcPYvBrg133pg55ykTPUiiNeDVdCtPQNu/NtQz25bKstmJLRUyMwbNvv3+VS6jTdw8miAzZy82aMKQ/lPPAFaDLvA2kxFdEv1bhcCGHHLY7lqbd0qobkvdn7pNmqAcQzat0dVnZZtXT7n7ZYa3NpzEME9MPr7n8YtXaYMwMahIIQK7A76JRQnz2BPH2/r6hChXQiguHTJYkXzlDqNfNMuj+dbUv7ZUGjBjkWzK53ACpw4zMa2rfsx0OebW7hRKIjC3BUEYXE/bjfAKHQ9Nohu9X5MH4qt5gJOq5+uv5wGQNXRHXsDQ9Ua7Tl1lakSbjVfMhMknQCK5yyah56/KDzVayZm22iZOb/Wg/8Shrht+9LZjitZApfTGIwqCzFNuoBXJHhrNwdzcyeIgWd4eFaN4WYvSPAVpF2PrWGv5jxjEkg4cePf6ql0lkeje8FBvowdRV2QVoKTvA+ucmfOGnqqSeJ2vkkqAYy8YemXpFQ24CN50amSzQZCXYzRmhdbjD8aqrht5yPfZek+KeHdS8nT30WzgLjvA/FnM7ACQHzEeJRnljxN5MjPgNwj+NmB2xdgAvASCOIz1aD/AMKvwh7D3nALYy4NcGWZoyCPH0QwzbcmOUu9iQAFdU1OKPzOr05xu/XnSVVHOCXxmyyfZDUULLdWLJmzPDk1P7nUI5dSfp5G0/DmGsTxQB6v1UeQHiUIJgTmEEC4yTEgR+helVTmHixT8LuIlTEuSWByCQcTP/KsoQVcXioCOFxyguYOlYH1j3Bq3GfkQ8g7igF/5o4lczYkp9bxS+2+DqyezG1hf/CDnUOrMwGzjLFQLgzH8yFAskkQrEMwezkemggGc4jIEHwPDvEOhgvmEm4QSbUrRHtRzna8SlngejkeoOmbSIqrHGwa5rpors0QFvZktdCD39y27Ia00amzi5iGWhoE2pyAVjJRfBFNPcMDhSM3mZsOpJu9n7kDBMeXsBX8BznrnF/WtQpixwmg+HuPFlCDf5NQXcOcYP2syUOoEdK4etviuautNrQ98kkMFfUqFYLNjwHyR+Kbg0AKAyHw9eEhgFXLIIgaAP2X9XX0QP6zybP0SbS9zhPA3CX3Ki7PnY6wfgh7sLBt0EP6tTuXzf1joo1Kp3SY+l2E3v934N7FsgDLACwAQvh7B15F5qVSAGQ4md3LKYDBsOML6LE3Gk4YdWCQBPIxihg/yFTkM1yxpfwF9PpZ4AiHvJC4GPk8NLg0OgvywPlOwd5qOU4KgQLKmLtU1ZUfNuS0WqVwPraiBRf5PyyqLLJXUupz56ymP/qvoNdg4vhNIH80uEA32LruPJJDD6a6do4RAAS/C2H79vWwPZ+9ZoWVPIEnCnp/ere9ktInt3cVvYfa3Js+NQrXxBkCKCtT5AFxG8y4NWnYW/oOr+QFtvsCWunGsrITNlXpBjmH6yN3jj8TG9YnotjRGCN4KzsvV78PbQM8EAU2iXO3sgm548ERIbBo3rJJilDKsb4Pgdd6YImf5/qYMF1csXh2hfWSMienfH10V/L67mAXclApnmpKZZARzMDYYUsVhV7DasPdYsSWdY1vHPuxLwROf0KFKuw2qGhtIT/cYJaQ6EedBvmVJb3J53uSfOJ2tP9UU4vkB8IZ6Rz5moOqnAfV0V/lrrHzww+c+2ubAEb2ODxeUZQSuFuxVavGPfUbCnp9ssxWQRmSGT0/h2TwURgdfJnqgWhWFMQL/DisXvTCK+XP5Rvjr4qXzOoz2wQgSbkBZt3o/S00IIGa8QKP1PVjqi5u6TTjvs8zF8ifQvW81phAYAJRTPc0C+WuC/snkCOhJLYIYETp4qFYmZtqt/djNxAssfSHYcjRYfzvfR705buX5sN30ewWe31LmaE9Iq/oR6o+s6UkbX1uiwDgCGkGBP9cU7PR1i83pmfRAVPH90Ie10MWi8i8bP7joyD0DTEXCtpaexYLDJoqZZkt3EU+a7kQuGnJgfA33e46v7m+T/TTygfT024+AihHfwUVwgkhxj0LpfJQAD+G9HZ5Nwu5T8pimQCkRxkNW/tCjN0nFZroA5P164GdRk11Rur5E23nSenghTS8XnjSm9YfhImmK4W0gtYTt57CMgEYujENShvkt0LGJyoGff99Ox+/tcNZ255oYZwrOJiM8zTBR4A39iaQ7sC0G1+0RABg/7zOf4kd9s+9H8vFFV3rPCm1iUsQ6s4nc0QFZ79alggAhvaDUP+z7ezsQc8HIYulG39zLas8syFFELBEAIomi0jVcBqWNfbPgp8eCh5ACY5b86YIjhn7WWsEYMjCRundUsOZ/YODrNv6szkdZoOFJUCkQSZLBABjyAF26m4OHQr9xU4Z2bzOQMDacrDAqpUN9o+p4+FQyL/VmSZkS7EDAWscALtbeEeWpcBG84IOyn59sezbSQNM3dKl5W0nABh/oPLW57FMACRqv1BpnrGYLnBo73pY47zRWoL9uvigOvuh7QSAb5o4tPNtWH2sLHwzbXqBnaZYyiuMAqsMlNknQpA8rgZL326WyRIBNCuj7bdmG+5ue76OkkOKHpYJwGSgOGu4qpa9jdoOqSEA29XO3ALAvPmwSAjRFtvABACnFdS9S43FEppkyxJAE3C0w82HX/ICgT2jO0rb+kneWSLosBi40RENapYA2ooAu+lrXb1RRC/rBIDcknD2gDMhSwDOwDHxUvTQQFj/5kWdUSWeM5wyPI2GtzNnQmoIwBz/fuxMCzKuFPEFWPharzV7opBit/UCmua0RABW5Zfop220P1pGxl6IUbYEwCB86uryHaea33YCKCuDn0SybgMeViG7Suiitn/bqVanqBz5QQk8SMvz2mwMGqkvs38DB1Nqrj2RR3Z/rSCBtcDYpmSrG+c0HNt+wvum3VZkSv6a4DCY4Ay1ZAzKbWQvEyT2U/3xI0412QoBsCbwuGVtYJgD5NX4vXw0SmcLk+AlAtZUFpvNe6+EeAf7BO1twIz5vCUCwEpglVUOwOwDQ0h3lzCnQzFV6diXUpaw/v9yy9M/Bg8zAEM6umfSEgHAHoBPsbAWWBWmubxwoHWetQIyNNeboTFg4eeyaxDLgX3UCcXRZXRLBABb0r2sjbAcQMnIPcVy/kzMKI15mP41niptoQE8/uvyIFze8zmCjgVLBABl9m5Db2k3Y+t1My2C4B5l8Pzf4Tj3jh/kjvHnY4fvleaOX6vNZSeDODRKFG60zn3jfNsSAWgiuBvHYRyxaheI1WBURfTPD9UPiVOnDvVIyukqKcb/wkskrwHYC5JW2Svg5NyWCOC1xfM+BQ53wPX7ySUm8gSZcaSKCwcunJ1I8oxO88ZHV2Eb2CRbvZ8XgAJGNRnqc07DwhIBoPfCpN94jm37LQfeEi6MfvHyHyyhvNrLaVTDZXROvPeZ8kzuuJD1/vfZrq8LcDZweEXRi3tsl9WsAIsEwPWhTXwUS7Py2nqb0zwD/OqNL+hCFaqkV8FgXoXX7mXsZr15unS/xxZwD6nGEviFO82y4ifSSNb/K/JRkIFdeEdKjP5at03DggTm9AfhHaSXtS1ipmXESadoQkeQj32zbuw6hHNg+OBVaTacjxSDCFbgvjfmwqyKrsIoUoPpaDV+9xlu2t/lKfMo1mjDUn7hP34HXL9Mjrp5sVoh7v0B+TYp7vVWi/i8fDZ4uBTFc5f9DXP6S9p+BIzpBFLHbGAi/ABubF7BY5PpFJ+HvgHkXod3o1BJV8QLd2xa7hjwnsLGkYcQP8CIVInh8hUsl2z0ruEDolIT4MtnEoS+1SBYHBposw58bk2DvEUUbv6ZzZLiZrc8BLAcALXkM1bkALiUgTJRfyc33x1XqdH1b/SZS9LvYPe6EDg+wFTKbnLY83Zs5Gd4p2CK3AseOMfAF+930GGWgxC2Nkyj9YFp9N2aqeAa7RjktnF94Q92MaJ95DPV+4190B88lqwmWB8CUCNDGispGLhZaNqQtjiGZqM4wxBLtiz8Dp+iHQ2yjJT612k+2P9X4CBrKHpzX64gJA12QqDCLXvcwAbS7JU7cvgo8nUBQUzGZyZjmPio4QpaEQzRsrxyGxrMuF9u+lC+Pa4LevxvMO4Pss36uWhW/hj0czFkE3O4pATuXLZC8ZylU4WmYJuX8CWyW1hxmUepPlWjBq5675Gbmpg2w9u2x6/S37wuuigi7gCpfiB3AXD8smJQT6YE9HDIiNQXCO6PdGegEUPxuB+QnsMzJvbbzwTBgTsRH/IHR837oLpa6tdoSbenYVTpcJBvng+dhmsRucQltqZ8kXqxU+GAUUF67nhRtCFp/hNsEwDX1zwAWlEXgbV3NR1GYfBuHtgXEEcZCq6qV4LXvd3CGX4HJlFuVw/NRMVGY5D5OKTT2tx1n3+oAvz2+xoa6DSkLwJBXIavXwIu0o8bF/awdoIQcP8WetXdnrW0snkdrdzL57HI0zN4PVj+XaC2Po4gnyuuCR2+Qq8URZuT6iLfEQJgwI0oXTEGJ2f+GDOVi+A5xBMGJhMCxHZ4SQYv24ejXpb6vKc89PKDMxyxaQ9/4+S/1ZdTD49BE6BqmIsGXsyclP0ucuCOxZcYNu73+OgOsdLaDiXQuKA3x04AVd8BZE00jTysa8fNukX/sOBXb/yehm25Btzu5N4UTWj/wjECMKsCr6FF3Y+MxtTwAoB5iJTCByHxY8MwtocU48XKxTc4qsdurfl8okfAT9MAwVshS4wDysyzfLjRONWDBcoV3hqaJzYmbuFkCnkeeTEQPwvEfrHp7ClCXa1VKJH3PO3T5V7S1QvE8Bf3J5LFThpnCcBOTZKYV5aQFsijb6I33Y2hYQjPJCJEUB+iq3LW0p8+7/PyrTFnQA07GVOXaRBAzgfSTzXT8wkQTvZPrpQqAiDHb4hhyWX9kfZ2CgKINPb4ldTTHaLF6GRf507LR7jgmNhXvWtpHAARtXOUH8ONa1XO2Ri7xoJSJgLJF2DsOMUsh6VLp1h9pGKRX2b9fuMeMWzLXZFHyf7tVATAwIR2yNN/Mu2AXDAU5/qR4lF0Y2DXr3rmF31ItcFz0cMvRLJz0bUHR823WOPNWqdkhjDynyNP/lQxZF2T2VEyP9vhCECWQwd/elURKVoRkHY62HbT9QYVCK88MkXxh4bpuW5S811EBZ5a8qou9HK3OTZEenmScR5FLM9VDegopHYB1vvfiz5vh4sORQBy17gZcKf8PQBzdBSZzYHILeZJCSPXjPgT+9s8fbLvwYUw7hvQ918thm/5c7I/17x8W5rA5oWl6l5WFkK71HUhpmM3AZisZjwx70tVpRL5LhMjpFLMURekAvlcRaa/jA7ovJgpF9xHPvVmsHycyw3k82Q/E3hbeKFnBRVe8uNUISHjCYB2jbsSbP9mU9ODzn/oSJAe/dPHVFvXONdLFWRb+66PFRHGk3RIu0mIMlBtakJGE4DJ+gX9Fwwuw5630ZpPDwfo/586SMdrQQC8MJBugasUlvj/AluHa8UEZ/b5W21mOkGIidGHmPDCh6wcWwxe/zLYPfbcNYIALTIwZVMY+SzcpVNgLR+vbOrGQ+Tu+sP2nO61BIZ04gBfQyW3IU6KU1kWVtmE/CzEEY1x+K7dtZMhRJ1APl4w0tMO+dzNfAC1ATVEgzFTFL50Szogn8GVTrMA3vPOBPkk4q8RWRnChyL0QTwDsQdiE+OO8k1HafiIOFsL0qnns0CqGwGM98txNMoCUfSKY949AA/bIZ0IgM8L+gXiI4g3x7TsM1yz7SC/fwaRHUxynzIG9PGORI+fguv0C8zuIZRiVvIyyPqHonDL8+lXyfSaLJ0NAL2ByCuGP0Tchshc4AhiNWIQsUmQleMuhaBX3kQ3z2u/zEdsGyw3+VRiN0yW5nozWJABgtWNR2C2+jsx9uWkLn8nVrn4qdKJA+xFFWcgvo64L351mz8NbCfd/TGUP31NIkCvW/33w/TWv+rotuv7MxKSHxjpptkRLhrA6oPGi3jyK5KutWLYRkdcuSWzEelEANxL/tqWxorC1w6AC/wVve7GyPl7LAC6mAskM0SQblqayAasI+6AEqocq4erROHL25P5aafLTjKknK7uyeWZhygK/XkQwSDT/ot7I7fKySGAy+NpZaRsP3o60U585ynsUlhLhX3eEGIlFA+ZF7hpGR9kxfjxsMB/AubTfRyxxo1FOMsTfnMteC+u0LvZfkhspmDdLic9daQKCR2CABh4OH59NDRrvyAXm36hWWy0YcoA8eaEzZrNt9zD2eyckwdMA/MPUc5O3G3Gsy2Uo70B75yOWxOj/JSGZpBIaV1sf9y05DnqvRIIuxLseTh+WXeABf9mIWxoGZT1Rp6oD3pkbYiM4w262i9vGXYUvAoqeBP7Xt7HeM5T0A4dOhQBxGLK3KQRVAswET/5bAOpwKZXCQZ++srTWkAfFYKRoBGQx4LraXA+Uac6x6jDEkAsMcS7Pl5Cw9y59Ao4fg5vHIER0LswEy+CmXjaztnjtcPuMxZxOl1gc3EceX2/S6UcWBBgMREgELS+syGfEZ9OeoCTCLHuUuzuUelS9NABkOdWelZh6mUz8P5DHFd1K/YFTGHLYJ7KY7dQHXYgrbBZdEZmT+shoH4aPeb10DVssA0T/FoI9vd/qNN9Q9aZKuKEAV51GXXLVagQk7mp6OkTIByOYWGfoxddoC5EC3LX0I8SLrADJUxrDgBRbSH2/PWB/f5E6GBywbLL+itUU/cVegJmlE2IFzM/N3aM9kZvPgUzui7A0WCk6AUsD8G7oRjj+/PuYp7Rs44ognx/kJbtyaF7OhBO29SUJkBsU852TIx9/tcCmXfik4PBBfyoNONQAWIZj7D8Nmf+PJL7THPA2FYhRayVN7/ibWEcsCnkaY+gb8GVA3wfd84QC6q0ggCP1TVb6Rys74RkCLo4lUYCbysQe8Rd4wGimRpMiohpCTcwqsXFDYYSHVxgLTaO/tZdTavasi8wptgOc5m2Q0D9a6bHj+ewi1cCWQaGA/YJ4OYpG4dYRJtUHGc+YzqOYJxLOggvq+8izwsgoHK4j4GyJxsYAmlLAOi1h8Duj0NIix6xxnv96w16FqyfmYDGRGAiH3Z2+K3CfT1+q/FyL3wFwJEl3MsI2usO0icCbme4wdnQFAIm/Jo+Sp+7umn0RYzpt6Mn94XdbxAm/4/71nTO6Vr6YCUFNUHPTmtCTQFIsp/MQiALgSwEshDIQsAuBP4NvFPUGKLmPL0AAAAASUVORK5CYII=" width="512" height="512" /> +</svg> diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 000000000..9bb3f97be --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="IssueNavigationConfiguration"> + <option name="links"> + <list> + <IssueNavigationLink> + <option name="issueRegexp" value="#(\d+)" /> + <option name="linkRegexp" value="https://github.com/RustPython/RustPython/pull/$1" /> + </IssueNavigationLink> + </list> + </option> + </component> +</project> From 8e2872538b4499d99f5a06e0d029dd36f6e1adec Mon Sep 17 00:00:00 2001 From: "Jeong, YunWon" <69878+youknowone@users.noreply.github.com> Date: Mon, 13 Jul 2026 18:31:25 +0900 Subject: [PATCH 221/339] Preserve Windows CRT errno and avoid bare-drive prefix fallback (#8255) getpath: on Windows, default_prefix falls back to the executable directory instead of a bare "C:" when landmark search fails. host_env: errno_io_error carries the raw CRT errno as an io::Error payload (CrtErrno) instead of translating it to a Win32 error code and back. The round-trip collapsed every errno outside the errno_to_winerror table to EINVAL and attached a spurious winerror to the OSError. posix_errno recovers the exact errno from the payload; ftruncate reuses the same path. fstat now reports ERROR_INVALID_HANDLE for an invalid fd. --- crates/host_env/src/crt_fd.rs | 5 ++-- crates/host_env/src/fileutils.rs | 14 ++++++---- crates/host_env/src/os.rs | 46 +++++++++++++++++++++++++++++--- crates/vm/src/getpath.rs | 39 ++++++++++++++++++--------- 4 files changed, 80 insertions(+), 24 deletions(-) diff --git a/crates/host_env/src/crt_fd.rs b/crates/host_env/src/crt_fd.rs index b681081be..f06c5aad9 100644 --- a/crates/host_env/src/crt_fd.rs +++ b/crates/host_env/src/crt_fd.rs @@ -355,9 +355,8 @@ pub fn ftruncate(fd: Borrowed<'_>, len: Offset) -> io::Result<()> { cfg_select! { windows => { if ret != 0 { - // _chsize_s returns errno directly, convert to Windows error code - let winerror = crate::os::errno_to_winerror(ret); - return Err(io::Error::from_raw_os_error(winerror)); + // _chsize_s returns errno directly; preserve it exactly. + return Err(crate::os::io_error_from_errno(ret)); } } _ => cvt(ret)?, diff --git a/crates/host_env/src/fileutils.rs b/crates/host_env/src/fileutils.rs index d88951516..1713370a9 100644 --- a/crates/host_env/src/fileutils.rs +++ b/crates/host_env/src/fileutils.rs @@ -94,11 +94,15 @@ pub mod windows { // _Py_fstat_noraise in cpython pub fn fstat(fd: crt_fd::Borrowed<'_>) -> std::io::Result<StatStruct> { - let h = crt_fd::as_handle(fd); - if h.is_err() { - unsafe { SetLastError(ERROR_INVALID_HANDLE) }; - } - let h = h?; + let h = match crt_fd::as_handle(fd) { + Ok(h) => h, + Err(_) => { + // An invalid fd is reported as a Win32 handle error so the + // OSError carries winerror = ERROR_INVALID_HANDLE. + unsafe { SetLastError(ERROR_INVALID_HANDLE) }; + return Err(std::io::Error::last_os_error()); + } + }; let h = h.as_raw_handle(); // reset stat? diff --git a/crates/host_env/src/os.rs b/crates/host_env/src/os.rs index 7d11d7bbe..e5868871e 100644 --- a/crates/host_env/src/os.rs +++ b/crates/host_env/src/os.rs @@ -340,11 +340,53 @@ impl ErrorExt for io::Error { } #[cfg(windows)] fn posix_errno(&self) -> i32 { + // A C runtime error carries its exact errno as the payload; report it + // directly instead of round-tripping through a Win32 error code. + if let Some(crt) = self.get_ref().and_then(|e| e.downcast_ref::<CrtErrno>()) { + return crt.0; + } let winerror = self.raw_os_error().unwrap_or(0); winerror_to_errno(winerror) } } +/// Wraps a raw C runtime `errno` inside an [`io::Error`]. +/// +/// CRT functions (`open`, `read`, `dup`, ...) report failures through `errno`, +/// not `GetLastError`. Translating that `errno` into a Win32 error code is +/// lossy — any value missing from [`errno_to_winerror`] collapses to `EINVAL` — +/// and also attaches a spurious `winerror` to the resulting `OSError`. Carrying +/// the `errno` as the error payload lets [`ErrorExt::posix_errno`] recover it +/// exactly while leaving `raw_os_error()` empty, so no `winerror` is reported. +#[cfg(windows)] +#[derive(Debug)] +struct CrtErrno(i32); + +#[cfg(windows)] +impl core::fmt::Display for CrtErrno { + fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { + match crate::errno::strerror_string(self.0) { + Some(msg) => f.write_str(&msg), + None => write!(f, "os error {}", self.0), + } + } +} + +#[cfg(windows)] +impl core::error::Error for CrtErrno {} + +/// Build an [`io::Error`] that preserves a raw C runtime `errno`. +/// +/// The [`io::ErrorKind`] is derived from the closest Win32 mapping so callers +/// matching on `kind()` keep working, while the exact `errno` is preserved for +/// [`ErrorExt::posix_errno`]. +#[cfg(windows)] +#[must_use] +pub fn io_error_from_errno(errno: i32) -> io::Error { + let kind = io::Error::from_raw_os_error(errno_to_winerror(errno)).kind(); + io::Error::new(kind, CrtErrno(errno)) +} + #[cfg(all(not(windows), not(target_arch = "wasm32")))] impl ErrorExt for rustix::io::Errno { fn posix_errno(&self) -> i32 { @@ -357,9 +399,7 @@ impl ErrorExt for rustix::io::Errno { #[cfg(windows)] #[must_use] pub fn errno_io_error() -> io::Error { - let errno: i32 = get_errno(); - let winerror = errno_to_winerror(errno); - io::Error::from_raw_os_error(winerror) + io_error_from_errno(get_errno()) } #[cfg(not(windows))] diff --git a/crates/vm/src/getpath.rs b/crates/vm/src/getpath.rs index 437db3783..bd90a3d27 100644 --- a/crates/vm/src/getpath.rs +++ b/crates/vm/src/getpath.rs @@ -180,17 +180,30 @@ pub fn init_path_config(settings: &Settings) -> Paths { paths } -/// Get default prefix value -fn default_prefix() -> String { - std::option_env!("RUSTPYTHON_PREFIX") - .map(String::from) - .unwrap_or_else(|| { - if cfg!(windows) { - "C:".to_owned() - } else { - "/usr/local".to_owned() - } - }) +/// Get default prefix value used when landmark search fails. +/// +/// A compile-time `RUSTPYTHON_PREFIX` always wins. Otherwise POSIX uses the +/// conventional install prefix, while Windows has no meaningful compile-time +/// prefix and falls back to the executable's directory (ref: getpath.py). +/// +/// A bare drive root must never be returned on Windows: pip walks up from +/// `<prefix>/Lib/site-packages` and would otherwise probe the drive root for +/// writability, which fails for standard users (see issue #8246). +fn default_prefix(exe_dir: Option<&PathBuf>) -> String { + if let Some(prefix) = std::option_env!("RUSTPYTHON_PREFIX") { + return prefix.to_owned(); + } + + if cfg!(windows) { + if let Some(dir) = exe_dir { + return dir.to_string_lossy().into_owned(); + } + // Executable directory is unknown; use a valid absolute root as a last + // resort rather than a drive-relative bare "C:". + "C:\\".to_owned() + } else { + "/usr/local".to_owned() + } } /// Detect virtual environment by looking for pyvenv.cfg @@ -262,7 +275,7 @@ fn calculate_prefix(exe_dir: Option<&PathBuf>, build_prefix: Option<&PathBuf>) - } // 4. Fallback to default - default_prefix() + default_prefix(exe_dir) } /// Calculate exec_prefix @@ -410,7 +423,7 @@ mod tests { #[test] fn default_prefix_basic() { - let prefix = default_prefix(); + let prefix = default_prefix(None); assert!(!prefix.is_empty()); } } From fe7993572cc9971d17da2f030dea39eda5f1ff65 Mon Sep 17 00:00:00 2001 From: Kwak Byoung Min <67214970+doma17@users.noreply.github.com> Date: Mon, 13 Jul 2026 18:40:18 +0900 Subject: [PATCH 222/339] Forward pyexpat lexical events (#8264) * Restore pyexpat lexical callback compatibility Forward processing instructions, comments, and CDATA boundaries already emitted by xml-rs so registered Python handlers observe CPython-compatible events. Constraint: Reuse existing xml-rs events without changing the dependency Confidence: high Scope-risk: narrow Tested: prek; test_pyexpat; test_sax; 402 extra tests; workspace tests; clippy Assisted-by: Codex:gpt-5.6-sol * Recognize XML compatibility restored by lexical events Remove stale expected-failure markers for CPython XML tests now satisfied by pyexpat lexical-event forwarding, and simplify parser event error propagation. Constraint: CPython test edits are limited to removing stale expectedFailure markers Confidence: high Scope-risk: narrow Directive: Keep parser event dispatch aligned with pyexpat handler behavior Tested: user-verified full suite; prek run --all-files; cargo run --release -- -m test test_pyexpat test_xml_etree test_xml_etree_c test_minidom test_sax Assisted-by: Codex:gpt-5.6-sol --- Lib/test/test_minidom.py | 5 ----- Lib/test/test_pyexpat.py | 1 - Lib/test/test_xml_etree.py | 2 -- crates/stdlib/src/pyexpat.rs | 29 ++++++++++++++++++++++------- extra_tests/snippets/stdlib_xml.py | 21 +++++++++++++++++++++ 5 files changed, 43 insertions(+), 15 deletions(-) diff --git a/Lib/test/test_minidom.py b/Lib/test/test_minidom.py index 26fd36635..5a5404d10 100644 --- a/Lib/test/test_minidom.py +++ b/Lib/test/test_minidom.py @@ -659,7 +659,6 @@ class MinidomTest(unittest.TestCase): self.assertIsNone(pi.localName) self.assertEqual(pi.namespaceURI, xml.dom.EMPTY_NAMESPACE) - @unittest.expectedFailure # TODO: RUSTPYTHON def testProcessingInstructionRepr(self): dom = parseString('<e><?mypi \t\n data \t\n ?></e>') pi = dom.documentElement.firstChild @@ -957,11 +956,9 @@ class MinidomTest(unittest.TestCase): self.confirm(clone.target == pi.target and clone.data == pi.data) - @unittest.expectedFailure # TODO: RUSTPYTHON def testClonePIShallow(self): self.check_clone_pi(0, "testClonePIShallow") - @unittest.expectedFailure # TODO: RUSTPYTHON def testClonePIDeep(self): self.check_clone_pi(1, "testClonePIDeep") @@ -1219,7 +1216,6 @@ class MinidomTest(unittest.TestCase): self.assertIsNone(node.childNodes[-1].nextSibling, "Final child's .nextSibling should be None") - @unittest.expectedFailure # TODO: RUSTPYTHON def testSiblings(self): doc = parseString("<doc><?pi?>text?<elm/></doc>") root = doc.documentElement @@ -1792,7 +1788,6 @@ class MinidomTest(unittest.TestCase): '<?xml version="1.0" ?>\n' '<curriculum status="public" company="example"/>\n') - @unittest.expectedFailure # TODO: RUSTPYTHON def test_toprettyxml_with_cdata(self): xml_str = '<?xml version="1.0" ?><root><node><![CDATA[</data>]]></node></root>' doc = parseString(xml_str) diff --git a/Lib/test/test_pyexpat.py b/Lib/test/test_pyexpat.py index 682abc520..e7046b79f 100644 --- a/Lib/test/test_pyexpat.py +++ b/Lib/test/test_pyexpat.py @@ -560,7 +560,6 @@ class BufferTextTest(unittest.TestCase): ["<a>", "1", "<b>", "</b>", "2", "<c>", "</c>", "345", "</a>"], "buffered text not properly split") - @unittest.expectedFailure # TODO: RUSTPYTHON def test7(self): self.setHandlers(["CommentHandler", "EndElementHandler", "StartElementHandler"]) diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py index 6a75126f2..18a845fe2 100644 --- a/Lib/test/test_xml_etree.py +++ b/Lib/test/test_xml_etree.py @@ -1800,7 +1800,6 @@ class XMLPullParserTest(unittest.TestCase): self._feed(parser, "<!-- text here -->\n") self.assert_events(parser, [('comment', (ET.Comment, ' text here '))]) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_events_pi(self): parser = ET.XMLPullParser(events=('start', 'pi', 'end')) self._feed(parser, "<?pitarget?>\n") @@ -3821,7 +3820,6 @@ class TreeBuilderTest(unittest.TestCase): a = parser.close() self.assertEqual(a.text, "texttail") - @unittest.expectedFailure # TODO: RUSTPYTHON def test_late_tail_mix_pi_comments(self): # Issue #37399: The tail of an ignored comment could overwrite the text before it. # Test appending tails to comments/pis. diff --git a/crates/stdlib/src/pyexpat.rs b/crates/stdlib/src/pyexpat.rs index 143d820d6..f690abade 100644 --- a/crates/stdlib/src/pyexpat.rs +++ b/crates/stdlib/src/pyexpat.rs @@ -305,8 +305,9 @@ mod _pyexpat { fn create_config(&self) -> xml::ParserConfig { xml::ParserConfig::new() - .cdata_to_characters(true) + .cdata_to_characters(false) .coalesce_characters(false) + .ignore_comments(false) .whitespace_to_characters(true) } @@ -350,10 +351,10 @@ mod _pyexpat { T: std::io::Read, { for e in parser { - match e { - Ok(XmlEvent::StartElement { + match e? { + XmlEvent::StartElement { name, attributes, .. - }) => { + } => { let dict = vm.ctx.new_dict(); for attribute in attributes { let attr_name = self.make_name(&attribute.name); @@ -368,15 +369,29 @@ mod _pyexpat { let name_str = PyStr::from(self.make_name(&name)).into_ref(&vm.ctx); invoke_handler(vm, &self.start_element, (name_str, dict)); } - Ok(XmlEvent::EndElement { name, .. }) => { + XmlEvent::EndElement { name, .. } => { let name_str = PyStr::from(self.make_name(&name)).into_ref(&vm.ctx); invoke_handler(vm, &self.end_element, (name_str,)); } - Ok(XmlEvent::Characters(chars)) => { + XmlEvent::Characters(chars) => { let str = PyStr::from(chars).into_ref(&vm.ctx); invoke_handler(vm, &self.character_data, (str,)); } - Err(e) => return Err(e), + XmlEvent::ProcessingInstruction { name, data } => { + let name = PyStr::from(name).into_ref(&vm.ctx); + let data = PyStr::from(data.unwrap_or_default()).into_ref(&vm.ctx); + invoke_handler(vm, &self.processing_instruction, (name, data)); + } + XmlEvent::Comment(comment) => { + let comment = PyStr::from(comment).into_ref(&vm.ctx); + invoke_handler(vm, &self.comment, (comment,)); + } + XmlEvent::CData(chars) => { + invoke_handler(vm, &self.start_cdata_section, ()); + let str = PyStr::from(chars).into_ref(&vm.ctx); + invoke_handler(vm, &self.character_data, (str,)); + invoke_handler(vm, &self.end_cdata_section, ()); + } _ => {} } } diff --git a/extra_tests/snippets/stdlib_xml.py b/extra_tests/snippets/stdlib_xml.py index 268cdf45a..34f1a726e 100644 --- a/extra_tests/snippets/stdlib_xml.py +++ b/extra_tests/snippets/stdlib_xml.py @@ -45,3 +45,24 @@ assert handler.events == [ ("end", "child"), ("end", "main"), ] + +events = [] +parser = expat.ParserCreate() +parser.ProcessingInstructionHandler = lambda target, data: events.append( + ("processing-instruction", target, data) +) +parser.CommentHandler = lambda data: events.append(("comment", data)) +parser.StartCdataSectionHandler = lambda: events.append(("start-cdata",)) +parser.CharacterDataHandler = lambda data: events.append(("characters", data)) +parser.EndCdataSectionHandler = lambda: events.append(("end-cdata",)) +parser.Parse( + "<?target data?><?empty?><root><!--comment--><![CDATA[text]]></root>", True +) +assert events == [ + ("processing-instruction", "target", "data"), + ("processing-instruction", "empty", ""), + ("comment", "comment"), + ("start-cdata",), + ("characters", "text"), + ("end-cdata",), +] From 8376a03366d8309345c2fd898a097283c57a062b Mon Sep 17 00:00:00 2001 From: Jeaeun Kim <109906379+kyokuping@users.noreply.github.com> Date: Wed, 15 Jul 2026 23:16:42 +0900 Subject: [PATCH 223/339] Match CPython unsigned socket conversion errors (#8257) Assisted-by: Codex:gpt-5.4 --- Lib/test/test_lzma.py | 1 - Lib/test/test_memoryio.py | 8 -------- Lib/test/test_resource.py | 1 - Lib/test/test_socket.py | 2 -- crates/stdlib/src/array.rs | 2 +- crates/stdlib/src/socket.rs | 8 +++++--- crates/vm/src/builtins/int.rs | 16 ++++++++++------ crates/vm/src/stdlib/os.rs | 3 ++- 8 files changed, 18 insertions(+), 23 deletions(-) diff --git a/Lib/test/test_lzma.py b/Lib/test/test_lzma.py index eebe6370f..fff261d89 100644 --- a/Lib/test/test_lzma.py +++ b/Lib/test/test_lzma.py @@ -656,7 +656,6 @@ class FileTestCase(unittest.TestCase): with self.assertRaises(ValueError): LZMAFile(BytesIO(COMPRESSED_XZ), check=lzma.CHECK_UNKNOWN) - @unittest.expectedFailure # TODO: RUSTPYTHON; OverflowError: Python int too large to convert to Rust u32 def test_init_bad_preset(self): with self.assertRaises(TypeError): LZMAFile(BytesIO(), "w", preset=4.39) diff --git a/Lib/test/test_memoryio.py b/Lib/test/test_memoryio.py index 0ae486005..f0c21e4ae 100644 --- a/Lib/test/test_memoryio.py +++ b/Lib/test/test_memoryio.py @@ -934,10 +934,6 @@ class CBytesIOTest(PyBytesIOTest): def test_write(self): return super().test_write() - @unittest.expectedFailure # TODO: RUSTPYTHON; OverflowError: Python int too large to convert to Rust u64 - def test_seek(self): - return super().test_seek() - class CStringIOTest(PyStringIOTest): ioclass = io.StringIO UnsupportedOperation = io.UnsupportedOperation @@ -1030,10 +1026,6 @@ class CStringIOTest(PyStringIOTest): def test_newlines_property(self): return super().test_newlines_property() - @unittest.expectedFailure # TODO: RUSTPYTHON; OverflowError: Python int too large to convert to Rust u64 - def test_seek(self): - return super().test_seek() - @unittest.expectedFailure # TODO: RUSTPYTHON; d def test_newline_cr(self): return super().test_newline_cr() diff --git a/Lib/test/test_resource.py b/Lib/test/test_resource.py index e2226e1a6..6c7145caa 100644 --- a/Lib/test/test_resource.py +++ b/Lib/test/test_resource.py @@ -151,7 +151,6 @@ class ResourceTest(unittest.TestCase): resource.setrlimit(resource.RLIMIT_FSIZE, (2**64-5, max)) self.assertIn(resource.getrlimit(resource.RLIMIT_FSIZE), expected(2**64-5)) - @unittest.expectedFailure # TODO: RUSTPYTHON; OverflowError: Python int too large to convert to Rust u64 @unittest.skipIf(sys.platform == "vxworks", "setting RLIMIT_FSIZE is not supported on VxWorks") @unittest.skipUnless(hasattr(resource, 'RLIMIT_FSIZE'), 'requires resource.RLIMIT_FSIZE') diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index ccc06ceba..ddeb868db 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -1181,7 +1181,6 @@ class GeneralModuleTests(unittest.TestCase): self.assertIsInstance(_name, str) self.assertEqual(name, _name) - @unittest.expectedFailure # TODO: RUSTPYTHON; OverflowError: Python int too large to convert to Rust u32 @unittest.skipUnless(hasattr(socket, 'if_indextoname'), 'socket.if_indextoname() not available.') @support.skip_android_selinux('if_indextoname') @@ -1249,7 +1248,6 @@ class GeneralModuleTests(unittest.TestCase): self.assertEqual(swapped & mask, mask) self.assertRaises(OverflowError, func, 1<<34) - @unittest.expectedFailure # TODO: RUSTPYTHON; OverflowError: Python int too large to convert to Rust u16 def testNtoHErrors(self): s_good_values = [0, 1, 2, 0xffff] l_good_values = s_good_values + [0xffffffff] diff --git a/crates/stdlib/src/array.rs b/crates/stdlib/src/array.rs index e9b389949..19f6c48f2 100644 --- a/crates/stdlib/src/array.rs +++ b/crates/stdlib/src/array.rs @@ -498,7 +498,7 @@ pub mod array { ($($t:ty,)*) => {$( impl ArrayElement for $t { fn try_into_from_object(vm: &VirtualMachine, obj: PyObjectRef) -> PyResult<Self> { - obj.try_index(vm)?.try_to_primitive(vm) + obj.try_index(vm)?.try_to_primitive_raw(vm) } fn byteswap(self) -> Self { <$t>::swap_bytes(self) diff --git a/crates/stdlib/src/socket.rs b/crates/stdlib/src/socket.rs index e7ee6c907..9cb197ab9 100644 --- a/crates/stdlib/src/socket.rs +++ b/crates/stdlib/src/socket.rs @@ -2230,7 +2230,7 @@ mod _socket { let addr = Self::from_tuple(tuple, vm)?; let flowinfo = tuple .get(2) - .map(|obj| u32::try_from_borrowed_object(vm, obj)) + .map(|obj| obj.clone().try_index(vm)?.try_to_primitive_raw(vm)) .transpose()? .unwrap_or(0); let scopeid = tuple @@ -3141,14 +3141,16 @@ mod _socket { #[cfg(all(unix, not(target_os = "redox")))] #[pyfunction(name = "CMSG_LEN")] - fn cmsg_len(length: usize, vm: &VirtualMachine) -> PyResult<usize> { + fn cmsg_len(length: PyObjectRef, vm: &VirtualMachine) -> PyResult<usize> { + let length = length.try_index(vm)?.try_to_primitive_raw(vm)?; host_socket::checked_cmsg_len(length) .ok_or_else(|| vm.new_overflow_error("CMSG_LEN() argument out of range")) } #[cfg(all(unix, not(target_os = "redox")))] #[pyfunction(name = "CMSG_SPACE")] - fn cmsg_space(length: usize, vm: &VirtualMachine) -> PyResult<usize> { + fn cmsg_space(length: PyObjectRef, vm: &VirtualMachine) -> PyResult<usize> { + let length = length.try_index(vm)?.try_to_primitive_raw(vm)?; host_socket::checked_cmsg_space(length) .ok_or_else(|| vm.new_overflow_error("CMSG_SPACE() argument out of range")) } diff --git a/crates/vm/src/builtins/int.rs b/crates/vm/src/builtins/int.rs index c5aa607d0..278a9cecb 100644 --- a/crates/vm/src/builtins/int.rs +++ b/crates/vm/src/builtins/int.rs @@ -343,13 +343,17 @@ impl PyInt { where I: PrimInt + TryFrom<&'a BigInt>, { - // TODO: Python 3.14+: ValueError for negative int to unsigned type - // See stdlib_socket.py socket.htonl(-1) - // - // if I::min_value() == I::zero() && self.as_bigint().sign() == Sign::Minus { - // return Err(vm.new_value_error("Cannot convert negative int".to_owned())); - // } + if I::min_value() == I::zero() && self.as_bigint().sign() == Sign::Minus { + return Err(vm.new_value_error("can't convert negative number to unsigned")); + } + self.try_to_primitive_raw(vm) + } + + pub fn try_to_primitive_raw<'a, I>(&'a self, vm: &VirtualMachine) -> PyResult<I> + where + I: PrimInt + TryFrom<&'a BigInt>, + { I::try_from(self.as_bigint()).map_err(|_| { vm.new_overflow_error(format!( "Python int too large to convert to Rust {}", diff --git a/crates/vm/src/stdlib/os.rs b/crates/vm/src/stdlib/os.rs index e6aea44c3..5772cc46f 100644 --- a/crates/vm/src/stdlib/os.rs +++ b/crates/vm/src/stdlib/os.rs @@ -1870,7 +1870,8 @@ pub(super) mod _os { #[cfg(windows)] #[pyfunction] - fn waitstatus_to_exitcode(status: u64, vm: &VirtualMachine) -> PyResult<u32> { + fn waitstatus_to_exitcode(status: PyObjectRef, vm: &VirtualMachine) -> PyResult<u32> { + let status = status.try_index(vm)?.try_to_primitive_raw::<u64>(vm)?; let exitcode = status >> 8; // ExitProcess() accepts an UINT type: // reject exit code which doesn't fit in an UINT From 76ca1ff106201c5c385a6465e2bf94f59692245e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B0=95=ED=9A=A8=EC=A2=85?= <phj2784@naver.com> Date: Wed, 15 Jul 2026 23:18:03 +0900 Subject: [PATCH 224/339] Add 'w' (Py_UCS4) typecode support to array (#8266) * Support array 'w' (Py_UCS4) typecode Python 3.13 added the 'w' typecode holding fixed 4-byte unicode code points, unlike 'u' which is platform-dependent wchar_t. Add a Ucs4Char element type and route it through the existing unicode-array paths: constructor from str, fromunicode()/tounicode(), __reduce_ex__, repr, byteswap, and the machine-format code (Utf32). Also register 'w' as a struct format char in vm::buffer. Remove the now-passing expectedFailure markers for 'w' tests in test_array.py. Assisted-by: Claude * Reject non-native byte order for the 'w' format char FormatType::parse accepted 'w' after '<', '>', '!', or '=', but the non-native branch of FormatType::info has no Ucs4Char arm and hits unreachable!(), so struct.calcsize('>w') panicked the interpreter. Add Ucs4Char to the existing native-only filter in FormatCode::parse (alongside SSizeT/SizeT/VoidP) so those formats fail with the regular "bad char in struct format" error instead. Native 'w' and memoryview(array('w', ...)) are unaffected. Assisted-by: Claude * Unmark 'w'-typecode tests in test_re and test_csv test_re's test_empty_array and test_csv's test_char_write construct array('w', ...) and were marked expectedFailure while the typecode was unsupported. Now that 'w' works they pass, and regrtest counts the unexpected successes as failures in CI. Remove the two markers, which restores both tests to their CPython v3.14.6 form; test_re, test_csv, and test_array all pass. Assisted-by: Claude --- Lib/test/test_array.py | 198 ------------------------------------- Lib/test/test_csv.py | 1 - Lib/test/test_re.py | 1 - crates/stdlib/src/array.rs | 79 ++++++++++++--- crates/vm/src/buffer.rs | 9 +- 5 files changed, 70 insertions(+), 218 deletions(-) diff --git a/Lib/test/test_array.py b/Lib/test/test_array.py index d300337b9..13df61348 100644 --- a/Lib/test/test_array.py +++ b/Lib/test/test_array.py @@ -189,7 +189,6 @@ class ArrayReconstructorTest(unittest.TestCase): self.assertEqual(a, b, msg="{0!r} != {1!r}; testcase={2!r}".format(a, b, testcase)) - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' def test_unicode(self): teststr = "Bonne Journ\xe9e \U0002030a\U00020347" testcases = ( @@ -1180,7 +1179,6 @@ class BaseTest: basesize = support.calcvobjsize('Pn2Pi') support.check_sizeof(self, a, basesize) - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' def test_initialize_with_unicode(self): if self.typecode not in ('u', 'w'): with self.assertRaises(TypeError) as cm: @@ -1267,207 +1265,11 @@ class UnicodeTest(StringTest, unittest.TestCase): self.assertEqual(len(a), 0) self.assertEqual(a.typecode, 'u') - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_add(self): - return super().test_add() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_extend(self): - return super().test_extend() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_iadd(self): - return super().test_iadd() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_setiadd(self): - return super().test_setiadd() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_setslice(self): - return super().test_setslice() - class UCS4Test(UnicodeTest): typecode = 'w' minitemsize = 4 - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_buffer(self): - return super().test_buffer() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_buffer_info(self): - return super().test_buffer_info() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_byteswap(self): - return super().test_byteswap() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_clear(self): - return super().test_clear() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_cmp(self): - return super().test_cmp() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_constructor(self): - return super().test_constructor() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_constructor_with_iterable_argument(self): - return super().test_constructor_with_iterable_argument() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_copy(self): - return super().test_copy() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_count(self): - return super().test_count() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_coveritertraverse(self): - return super().test_coveritertraverse() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_deepcopy(self): - return super().test_deepcopy() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_delitem(self): - return super().test_delitem() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_exhausted_iterator(self): - return super().test_exhausted_iterator() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_exhausted_reverse_iterator(self): - return super().test_exhausted_reverse_iterator() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_extended_getslice(self): - return super().test_extended_getslice() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_extended_set_del_slice(self): - return super().test_extended_set_del_slice() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_filewrite(self): - return super().test_filewrite() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_fromarray(self): - return super().test_fromarray() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_fromfile_ioerror(self): - return super().test_fromfile_ioerror() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_getitem(self): - return super().test_getitem() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_getslice(self): - return super().test_getslice() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_imul(self): - return super().test_imul() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_index(self): - return super().test_index() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_insert(self): - return super().test_insert() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_issue17223(self): - return super().test_issue17223() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_iterator_pickle(self): - return super().test_iterator_pickle() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_len(self): - return super().test_len() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_mul(self): - return super().test_mul() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_pickle(self): - return super().test_pickle() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_pickle_for_empty_array(self): - return super().test_pickle_for_empty_array() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_pop(self): - return super().test_pop() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_reduce_ex(self): - return super().test_reduce_ex() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_remove(self): - return super().test_remove() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_repr(self): - return super().test_repr() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_reverse(self): - return super().test_reverse() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_reverse_iterator(self): - return super().test_reverse_iterator() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_reverse_iterator_picking(self): - return super().test_reverse_iterator_picking() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_setitem(self): - return super().test_setitem() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_str(self): - return super().test_str() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_tofrombytes(self): - return super().test_tofrombytes() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_tofromfile(self): - return super().test_tofromfile() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_tofromlist(self): - return super().test_tofromlist() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_unicode(self): - return super().test_unicode() - - @unittest.expectedFailure # TODO: RUSTPYTHON; Add support for 'w' - def test_weakref(self): - return super().test_weakref() - class NumberTest(BaseTest): diff --git a/Lib/test/test_csv.py b/Lib/test/test_csv.py index 6e00f8eb1..86f1cf9bc 100644 --- a/Lib/test/test_csv.py +++ b/Lib/test/test_csv.py @@ -1137,7 +1137,6 @@ class TestArrayWrites(unittest.TestCase): fileobj.seek(0) self.assertEqual(fileobj.read(), expected) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_char_write(self): import array, string a = array.array('w', string.ascii_letters) diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py index eef630754..1c52eb0dc 100644 --- a/Lib/test/test_re.py +++ b/Lib/test/test_re.py @@ -1754,7 +1754,6 @@ class ReTests(unittest.TestCase): for x in not_decimal_digits: self.assertIsNone(re.match(r'^\d$', x)) - @unittest.expectedFailure # TODO: RUSTPYTHON; a = array.array(typecode)\n ValueError: bad typecode (must be b, B, u, h, H, i, I, l, L, q, Q, f or d) @warnings_helper.ignore_warnings(category=DeprecationWarning) # gh-80480 array('u') def test_empty_array(self): # SF buf 1647541 diff --git a/crates/stdlib/src/array.rs b/crates/stdlib/src/array.rs index 19f6c48f2..f2a16d723 100644 --- a/crates/stdlib/src/array.rs +++ b/crates/stdlib/src/array.rs @@ -60,7 +60,7 @@ pub mod array { match c { $($c => Ok(ArrayContentType::$n(Vec::new())),)* _ => Err( - "bad typecode (must be b, B, u, h, H, i, I, l, L, q, Q, f or d)".into() + "bad typecode (must be b, B, u, w, h, H, i, I, l, L, q, Q, f or d)".into() ), } } @@ -473,6 +473,7 @@ pub mod array { (SignedByte, i8, 'b', "b"), (UnsignedByte, u8, 'B', "B"), (PyUnicode, WideChar, 'u', "u"), + (PyUcs4, Ucs4Char, 'w', "w"), (SignedShort, raw::c_short, 'h', "h"), (UnsignedShort, raw::c_ushort, 'H', "H"), (SignedInt, raw::c_int, 'i', "i"), @@ -488,6 +489,11 @@ pub mod array { #[derive(Copy, Clone, Ord, PartialOrd, Eq, PartialEq, Debug)] pub struct WideChar(wchar_t); + /// Element type for the 'w' typecode: always a 4-byte unicode code point + /// (Py_UCS4), unlike 'u' which is platform-dependent `wchar_t`. + #[derive(Copy, Clone, Ord, PartialOrd, Eq, PartialEq, Debug)] + pub struct Ucs4Char(u32); + trait ArrayElement: Sized { fn try_into_from_object(vm: &VirtualMachine, obj: PyObjectRef) -> PyResult<Self>; fn byteswap(self) -> Self; @@ -574,6 +580,47 @@ pub mod array { } } + impl ArrayElement for Ucs4Char { + fn try_into_from_object(vm: &VirtualMachine, obj: PyObjectRef) -> PyResult<Self> { + let s = obj.downcast::<PyStr>().map_err(|obj| { + vm.new_type_error(format!( + "array item must be a unicode character, not {}", + obj.class().name() + )) + })?; + s.as_wtf8() + .code_points() + .exactly_one() + .map(|ch| Self(ch.to_u32())) + .map_err(|e| { + vm.new_type_error(format!( + "array item must be a unicode character, not a string of length {}", + e.count() + )) + }) + } + fn byteswap(self) -> Self { + Self(self.0.swap_bytes()) + } + fn to_object(self, _vm: &VirtualMachine) -> PyObjectRef { + unreachable!() + } + } + + impl ToPyResult for Ucs4Char { + fn to_pyresult(self, vm: &VirtualMachine) -> PyResult { + Ok(u32_to_char(self.0) + .map_err(|msg| vm.new_value_error(msg))? + .to_pyobject(vm)) + } + } + + impl fmt::Display for Ucs4Char { + fn fmt(&self, _f: &mut fmt::Formatter<'_>) -> fmt::Result { + unreachable!("`repr(array('w'))` calls `PyStr::repr`") + } + } + fn u32_to_char(ch: u32) -> Result<CodePoint, String> { CodePoint::from_u32(ch) .ok_or_else(|| format!("character U+{ch:4x} is not in range [U+0000; U+10ffff]")) @@ -663,7 +710,7 @@ pub mod array { let value = init.read().typecode(); match (spec, value) { (spec, ch) if spec == ch => array.frombytes(&init.get_bytes()), - (spec, 'u') => { + (spec, 'u' | 'w') if !matches!(spec, 'u' | 'w') => { return Err(vm.new_type_error(format!( "cannot use a unicode array to initialize an array with typecode '{spec}'" ))) @@ -675,7 +722,7 @@ pub mod array { } } } else if let Some(wtf8) = init.downcast_ref::<PyStr>() { - if spec == 'u' { + if matches!(spec, 'u' | 'w') { let bytes = Self::_unicode_to_wchar_bytes(wtf8.as_wtf8(), array.itemsize()); array.frombytes_move(bytes); } else { @@ -824,10 +871,10 @@ pub mod array { obj.class().name() )) })?; - if zelf.read().typecode() != 'u' { - return Err( - vm.new_value_error("fromunicode() may only be called on unicode type arrays") - ); + if !matches!(zelf.read().typecode(), 'u' | 'w') { + return Err(vm.new_value_error( + "fromunicode() may only be called on unicode type arrays ('u' or 'w')", + )); } let mut w = zelf.try_resizable(vm)?; let bytes = Self::_unicode_to_wchar_bytes(wtf8, w.itemsize()); @@ -838,10 +885,10 @@ pub mod array { #[pymethod] fn tounicode(&self, vm: &VirtualMachine) -> PyResult<Wtf8Buf> { let array = self.array.read(); - if array.typecode() != 'u' { - return Err( - vm.new_value_error("tounicode() may only be called on unicode type arrays") - ); + if !matches!(array.typecode(), 'u' | 'w') { + return Err(vm.new_value_error( + "tounicode() may only be called on unicode type arrays ('u' or 'w')", + )); } let bytes = array.get_bytes(); Self::_wchar_bytes_to_string(bytes, self.itemsize(), vm) @@ -1152,7 +1199,7 @@ pub mod array { let array = zelf.read(); let cls = zelf.class().to_owned(); let typecode = vm.ctx.new_str(array.typecode_str()); - let values = if array.typecode() == 'u' { + let values = if matches!(array.typecode(), 'u' | 'w') { let s = Self::_wchar_bytes_to_string(array.get_bytes(), array.itemsize(), vm)?; s.code_points().map(|x| x.to_pyobject(vm)).collect() } else { @@ -1266,13 +1313,14 @@ pub mod array { fn repr_str(zelf: &Py<Self>, vm: &VirtualMachine) -> PyResult<String> { let class = zelf.class(); let class_name = class.name(); - if zelf.read().typecode() == 'u' { + let typecode = zelf.read().typecode(); + if matches!(typecode, 'u' | 'w') { if zelf.__len__() == 0 { - return Ok(format!("{class_name}('u')")); + return Ok(format!("{class_name}('{typecode}')")); } let to_unicode = zelf.tounicode(vm)?; let escape = crate::vm::literal::escape::UnicodeEscape::new_repr(&to_unicode); - return Ok(format!("{}('u', {})", class_name, escape.str_repr())); + return Ok(format!("{class_name}('{typecode}', {})", escape.str_repr())); } zelf.read().repr(&class_name, vm) } @@ -1524,6 +1572,7 @@ pub mod array { _ => None, }; } + 'w' => return Some(Self::Utf32 { big_endian }), 'f' => { // Copied from CPython const Y: f32 = 16711938.0; diff --git a/crates/vm/src/buffer.rs b/crates/vm/src/buffer.rs index a174e2fd6..84c0ac17f 100644 --- a/crates/vm/src/buffer.rs +++ b/crates/vm/src/buffer.rs @@ -85,6 +85,7 @@ pub(crate) enum FormatType { UByte = b'B', Char = b'c', WideChar = b'u', + Ucs4Char = b'w', Str = b's', Pascal = b'p', Short = b'h', @@ -189,6 +190,7 @@ impl FormatType { unpack: Some(unpack_char), }, Self::WideChar => native_info!(wchar_t), + Self::Ucs4Char => native_info!(u32), Self::Short => native_info!(raw::c_short), Self::UShort => native_info!(raw::c_ushort), Self::Int => native_info!(raw::c_int), @@ -344,9 +346,10 @@ impl FormatCode { let code = FormatType::try_from(c) .ok() .filter(|c| match c { - FormatType::SSizeT | FormatType::SizeT | FormatType::VoidP => { - endianness == Endianness::Native - } + FormatType::SSizeT + | FormatType::SizeT + | FormatType::VoidP + | FormatType::Ucs4Char => endianness == Endianness::Native, _ => true, }) .ok_or_else(|| "bad char in struct format".to_owned())?; From 7f81b2491c2e9ae388ce2ee0e4b4329d539b42b4 Mon Sep 17 00:00:00 2001 From: Bas Schoenmaeckers <7943856+bschoenmaeckers@users.noreply.github.com> Date: Wed, 15 Jul 2026 16:19:41 +0200 Subject: [PATCH 225/339] Add more dict functions to c-api (#8269) * Add more dict functions to c-api * Review --- crates/capi/src/dictobject.rs | 112 +++++++++++++++++++++++++++++++++- 1 file changed, 111 insertions(+), 1 deletion(-) diff --git a/crates/capi/src/dictobject.rs b/crates/capi/src/dictobject.rs index e326ba87e..6cea9ea34 100644 --- a/crates/capi/src/dictobject.rs +++ b/crates/capi/src/dictobject.rs @@ -1,7 +1,7 @@ use crate::PyObject; use crate::object::define_py_check; use crate::pystate::with_vm; -use core::ffi::c_int; +use core::ffi::{CStr, c_char, c_int}; use core::ptr::NonNull; use rustpython_vm::AsObject; use rustpython_vm::PyPayload; @@ -18,6 +18,15 @@ pub extern "C" fn PyDict_New() -> *mut PyObject { with_vm(|vm| vm.ctx.new_dict()) } +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyDict_Clear(dict: *mut PyObject) { + with_vm(|vm| { + let dict = unsafe { &*dict }.try_downcast_ref::<PyDict>(vm)?; + dict.clear(); + Ok(()) + }) +} + #[unsafe(no_mangle)] pub unsafe extern "C" fn PyDict_SetItem( dict: *mut PyObject, @@ -32,6 +41,96 @@ pub unsafe extern "C" fn PyDict_SetItem( }) } +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyDict_SetItemString( + dict: *mut PyObject, + key: *const c_char, + val: *mut PyObject, +) -> c_int { + with_vm(|vm| { + let dict = unsafe { &*dict }.try_downcast_ref::<PyDict>(vm)?; + let key = unsafe { CStr::from_ptr(key) } + .to_str() + .map_err(|_| vm.new_value_error("dictionary key must be valid UTF-8"))?; + let value = unsafe { &*val }.to_owned(); + dict.inner_setitem(key, value, vm) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyDict_GetItem(dict: *mut PyObject, key: *mut PyObject) -> *mut PyObject { + with_vm(|vm| { + let dict = unsafe { &*dict }.try_downcast_ref::<PyDict>(vm)?; + let key = unsafe { &*key }; + + match dict.inner_getitem_opt(key, vm) { + Ok(Some(value)) => Ok(value.as_object().as_raw().cast_mut()), + Ok(None) | Err(_) => Ok(core::ptr::null_mut()), + } + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyDict_GetItemWithError( + dict: *mut PyObject, + key: *mut PyObject, +) -> *mut PyObject { + with_vm(|vm| { + let dict = unsafe { &*dict }.try_downcast_ref::<PyDict>(vm)?; + let key = unsafe { &*key }; + + if let Some(value) = dict.inner_getitem_opt(key, vm)? { + Ok(value.as_object().as_raw().cast_mut()) + } else { + Ok(core::ptr::null_mut()) + } + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyDict_GetItemString( + dict: *mut PyObject, + key: *const c_char, +) -> *mut PyObject { + with_vm(|vm| { + let dict = unsafe { &*dict }.try_downcast_ref::<PyDict>(vm)?; + let key = unsafe { CStr::from_ptr(key) } + .to_str() + .map_err(|_| vm.new_unicode_decode_error("dictionary key must be valid UTF-8"))?; + + match dict.inner_getitem_opt(key, vm)? { + Some(value) => Ok(value.as_object().as_raw().cast_mut()), + None => Ok(core::ptr::null_mut()), + } + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyDict_GetItemStringRef( + dict: *mut PyObject, + key: *const c_char, + result: *mut *mut PyObject, +) -> c_int { + with_vm(|vm| { + unsafe { + *result = core::ptr::null_mut(); + } + let dict = unsafe { &*dict }.try_downcast_ref::<PyDict>(vm)?; + let key = unsafe { CStr::from_ptr(key) } + .to_str() + .map_err(|_| vm.new_value_error("dictionary key must be valid UTF-8"))?; + + if let Some(value) = dict.inner_getitem_opt(key, vm)? { + unsafe { + *result = value.into_raw().as_ptr(); + } + Ok(true) + } else { + Ok(false) + } + }) +} + #[unsafe(no_mangle)] pub unsafe extern "C" fn PyDict_GetItemRef( dict: *mut PyObject, @@ -128,6 +227,17 @@ pub unsafe extern "C" fn PyDict_DelItem(dict: *mut PyObject, key: *mut PyObject) }) } +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyDict_DelItemString(dict: *mut PyObject, key: *const c_char) -> c_int { + with_vm(|vm| { + let dict = unsafe { &*dict }.try_downcast_ref::<PyDict>(vm)?; + let key = unsafe { CStr::from_ptr(key) } + .to_str() + .map_err(|_| vm.new_value_error("dictionary key must be valid UTF-8"))?; + dict.del_item(key, vm) + }) +} + #[unsafe(no_mangle)] pub unsafe extern "C" fn PyDict_Items(dict: *mut PyObject) -> *mut PyObject { with_vm(|vm| { From 57b630a6c7596ad258f375fc67bb0a548ff9ee21 Mon Sep 17 00:00:00 2001 From: Bas Schoenmaeckers <7943856+bschoenmaeckers@users.noreply.github.com> Date: Wed, 15 Jul 2026 16:24:26 +0200 Subject: [PATCH 226/339] Add str compare functions to c-api (#8268) --- .cspell.dict/cpython.txt | 3 +++ crates/capi/src/lib.rs | 1 + crates/capi/src/pystrcmp.rs | 28 ++++++++++++++++++++++++++++ 3 files changed, 32 insertions(+) create mode 100644 crates/capi/src/pystrcmp.rs diff --git a/.cspell.dict/cpython.txt b/.cspell.dict/cpython.txt index 64a2e7479..da85c3128 100644 --- a/.cspell.dict/cpython.txt +++ b/.cspell.dict/cpython.txt @@ -140,6 +140,8 @@ metavars miscompiles mult multibytecodec +mystricmp +mystrnicmp nameobj nameop nargsf @@ -198,6 +200,7 @@ pymain pymem pyrepl pystate +pystrcmp PYTHONTRACEMALLOC PYTHONUTF8 pythonw diff --git a/crates/capi/src/lib.rs b/crates/capi/src/lib.rs index 424074a12..08bb09bf3 100644 --- a/crates/capi/src/lib.rs +++ b/crates/capi/src/lib.rs @@ -34,6 +34,7 @@ pub mod pyframe; pub mod pylifecycle; pub mod pymem; pub mod pystate; +pub mod pystrcmp; pub mod refcount; pub mod setobject; pub mod sliceobject; diff --git a/crates/capi/src/pystrcmp.rs b/crates/capi/src/pystrcmp.rs new file mode 100644 index 000000000..8055f97cd --- /dev/null +++ b/crates/capi/src/pystrcmp.rs @@ -0,0 +1,28 @@ +use core::ffi::c_char; + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyOS_mystricmp(str1: *const c_char, str2: *const c_char) -> i32 { + unsafe { PyOS_mystrnicmp(str1, str2, isize::MAX) } +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyOS_mystrnicmp( + str1: *const c_char, + str2: *const c_char, + size: isize, +) -> i32 { + let Ok(limit) = usize::try_from(size) else { + return 0; + }; + let mut index = 0usize; + while index < limit { + let left = unsafe { *str1.add(index) } as u8; + let right = unsafe { *str2.add(index) } as u8; + let diff = left.to_ascii_lowercase() as i32 - right.to_ascii_lowercase() as i32; + if diff != 0 || left == 0 || right == 0 { + return diff; + } + index += 1; + } + 0 +} From f72026b98ad08e864d0a4e56a2432872c223b7f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Jul 2026 23:27:56 +0900 Subject: [PATCH 227/339] Bump actions/cache from 5.0.5 to 6.1.0 (#8273) --- updated-dependencies: - dependency-name: actions/cache dependency-version: 6.1.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/upgrade-pylib.lock.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/upgrade-pylib.lock.yml b/.github/workflows/upgrade-pylib.lock.yml index f9176f869..e5eefd6b9 100644 --- a/.github/workflows/upgrade-pylib.lock.yml +++ b/.github/workflows/upgrade-pylib.lock.yml @@ -114,7 +114,7 @@ jobs: run: bash /opt/gh-aw/actions/create_gh_aw_tmp_dir.sh # Cache configuration from frontmatter processed below - name: Cache (cpython-lib-${{ env.PYTHON_VERSION }}) - uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5 + uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 with: key: cpython-lib-${{ env.PYTHON_VERSION }} path: cpython From fc981ad9f09bd3a4f114b94fa7c5ba65fc9c5b60 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Jul 2026 23:28:09 +0900 Subject: [PATCH 228/339] Bump taiki-e/install-action from 2.82.6 to 2.82.9 (#8274) Bumps [taiki-e/install-action](https://github.com/taiki-e/install-action) from 2.82.6 to 2.82.9. - [Release notes](https://github.com/taiki-e/install-action/releases) - [Changelog](https://github.com/taiki-e/install-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/taiki-e/install-action/compare/9bcaee1dcae34154180f412e2fa69355a7cda9f6...4684b8405694ae9dd42c9f39ba901a70ae83f4a3) --- updated-dependencies: - dependency-name: taiki-e/install-action dependency-version: 2.82.9 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/cron-ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cron-ci.yaml b/.github/workflows/cron-ci.yaml index ec86ec95a..aba818b4f 100644 --- a/.github/workflows/cron-ci.yaml +++ b/.github/workflows/cron-ci.yaml @@ -33,7 +33,7 @@ jobs: - uses: dtolnay/rust-toolchain@stable - - uses: taiki-e/install-action@9bcaee1dcae34154180f412e2fa69355a7cda9f6 # v2.82.6 + - uses: taiki-e/install-action@4684b8405694ae9dd42c9f39ba901a70ae83f4a3 # v2.82.9 with: tool: cargo-llvm-cov From 4ee46b3c0463c61ccd4e1bd8c57aa136d3898487 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Jul 2026 23:28:18 +0900 Subject: [PATCH 229/339] Bump actions/setup-python from 6.2.0 to 6.3.0 (#8275) --- updated-dependencies: - dependency-name: actions/setup-python dependency-version: 6.3.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 6 +++--- .github/workflows/cron-ci.yaml | 6 +++--- .github/workflows/lib-deps-check.yaml | 2 +- .github/workflows/update-doc-db.yml | 2 +- .github/workflows/upgrade-pylib.lock.yml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a02977691..1125c178b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -343,7 +343,7 @@ jobs: # Windows runners randomly crashes, https://github.com/actions/cache/issues/1754 continue-on-error: true - - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0 + - uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0 - name: Install macOS dependencies uses: ./.github/actions/install-macos-deps @@ -531,7 +531,7 @@ jobs: with: persist-credentials: false - - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0 + - uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0 - uses: dtolnay/rust-toolchain@stable with: @@ -674,7 +674,7 @@ jobs: mkdir geckodriver tar -xzf geckodriver-v0.36.0-linux64.tar.gz -C geckodriver - - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0 + - uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0 - run: python -m pip install -r requirements.txt working-directory: ./wasm/tests diff --git a/.github/workflows/cron-ci.yaml b/.github/workflows/cron-ci.yaml index aba818b4f..2839cf375 100644 --- a/.github/workflows/cron-ci.yaml +++ b/.github/workflows/cron-ci.yaml @@ -37,7 +37,7 @@ jobs: with: tool: cargo-llvm-cov - - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0 + - uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0 - run: sudo apt-get update && sudo apt-get -y install lcov @@ -111,7 +111,7 @@ jobs: - uses: dtolnay/rust-toolchain@stable - - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0 + - uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0 - name: build rustpython run: cargo build --release --verbose @@ -174,7 +174,7 @@ jobs: - uses: dtolnay/rust-toolchain@stable - - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0 + - uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0 - run: cargo install cargo-criterion diff --git a/.github/workflows/lib-deps-check.yaml b/.github/workflows/lib-deps-check.yaml index eb4561daa..efdae480d 100644 --- a/.github/workflows/lib-deps-check.yaml +++ b/.github/workflows/lib-deps-check.yaml @@ -98,7 +98,7 @@ jobs: - name: Setup Python if: steps.changed-files.outputs.modules != '' - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0 + uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0 - name: Run deps check if: steps.changed-files.outputs.modules != '' diff --git a/.github/workflows/update-doc-db.yml b/.github/workflows/update-doc-db.yml index c7dad17d2..0d9c37a32 100644 --- a/.github/workflows/update-doc-db.yml +++ b/.github/workflows/update-doc-db.yml @@ -36,7 +36,7 @@ jobs: sparse-checkout: | crates/doc - - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0 + - uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0 with: python-version: ${{ inputs.python-version }} diff --git a/.github/workflows/upgrade-pylib.lock.yml b/.github/workflows/upgrade-pylib.lock.yml index e5eefd6b9..9790f37c5 100644 --- a/.github/workflows/upgrade-pylib.lock.yml +++ b/.github/workflows/upgrade-pylib.lock.yml @@ -107,7 +107,7 @@ jobs: with: persist-credentials: false - name: Setup Python - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0 + uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0 with: python-version: '3.14' - name: Create gh-aw temp directory From c8c1d353190f517b9a9f86ab4bf29ef22c701be6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Jul 2026 23:28:25 +0900 Subject: [PATCH 230/339] Bump marocchino/sticky-pull-request-comment from 3.0.4 to 3.0.5 (#8276) Bumps [marocchino/sticky-pull-request-comment](https://github.com/marocchino/sticky-pull-request-comment) from 3.0.4 to 3.0.5. - [Release notes](https://github.com/marocchino/sticky-pull-request-comment/releases) - [Commits](https://github.com/marocchino/sticky-pull-request-comment/compare/0ea0beb66eb9baf113663a64ec522f60e49231c0...5770ad5eb8f42dd2c4f34da00c94c5381e49af88) --- updated-dependencies: - dependency-name: marocchino/sticky-pull-request-comment dependency-version: 3.0.5 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/lib-deps-check.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lib-deps-check.yaml b/.github/workflows/lib-deps-check.yaml index efdae480d..7461fa6a2 100644 --- a/.github/workflows/lib-deps-check.yaml +++ b/.github/workflows/lib-deps-check.yaml @@ -114,7 +114,7 @@ jobs: - name: Post comment if: steps.deps-check.outputs.deps_output != '' - uses: marocchino/sticky-pull-request-comment@0ea0beb66eb9baf113663a64ec522f60e49231c0 # v3.0.4 + uses: marocchino/sticky-pull-request-comment@5770ad5eb8f42dd2c4f34da00c94c5381e49af88 # v3.0.5 with: header: lib-deps-check number: ${{ github.event.pull_request.number }} @@ -131,7 +131,7 @@ jobs: - name: Remove comment if no Lib changes if: steps.changed-files.outputs.modules == '' - uses: marocchino/sticky-pull-request-comment@0ea0beb66eb9baf113663a64ec522f60e49231c0 # v3.0.4 + uses: marocchino/sticky-pull-request-comment@5770ad5eb8f42dd2c4f34da00c94c5381e49af88 # v3.0.5 with: header: lib-deps-check number: ${{ github.event.pull_request.number }} From 06361d73bcd6b0951aafd8fe8a8552d947b3a9b7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Jul 2026 23:28:31 +0900 Subject: [PATCH 231/339] Bump https://github.com/rbubley/mirrors-prettier from v3.9.1 to 3.9.4 (#8277) Bumps [https://github.com/rbubley/mirrors-prettier](https://github.com/rbubley/mirrors-prettier) from v3.9.1 to 3.9.4. - [Commits](https://github.com/rbubley/mirrors-prettier/compare/v3.9.1...v3.9.4) --- updated-dependencies: - dependency-name: https://github.com/rbubley/mirrors-prettier dependency-version: 3.9.4 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a3cfaac09..bc8046ab0 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -77,7 +77,7 @@ repos: priority: 0 - repo: https://github.com/rbubley/mirrors-prettier - rev: v3.9.1 + rev: v3.9.4 hooks: - id: prettier files: '^wasm/.*$' From 816fb70bc8a4799e9c9c2e35897d276506cc0441 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Jul 2026 23:28:37 +0900 Subject: [PATCH 232/339] Bump memchr from 2.8.2 to 2.8.3 (#8278) Bumps [memchr](https://github.com/BurntSushi/memchr) from 2.8.2 to 2.8.3. - [Commits](https://github.com/BurntSushi/memchr/compare/2.8.2...2.8.3) --- updated-dependencies: - dependency-name: memchr dependency-version: 2.8.3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3a0392b18..9be0f5cdf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2260,9 +2260,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.8.2" +version = "2.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88904434abc2901f197fe8cc55f0445e7ded921dba5911dad2e2b39b48e663c4" +checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98" [[package]] name = "memmap2" From 29b11a70d32411bee8e7362826aa0a160e7af205 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Jul 2026 23:28:45 +0900 Subject: [PATCH 233/339] Bump der from 0.8.0 to 0.8.1 (#8279) Bumps [der](https://github.com/RustCrypto/formats) from 0.8.0 to 0.8.1. - [Commits](https://github.com/RustCrypto/formats/compare/der/v0.8.0...der/v0.8.1) --- updated-dependencies: - dependency-name: der dependency-version: 0.8.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9be0f5cdf..81012908b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1106,9 +1106,9 @@ dependencies = [ [[package]] name = "der" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71fd89660b2dc699704064e59e9dba0147b903e85319429e131620d022be411b" +checksum = "a69dedd701da44b0536442edf09c81a64b0ab97a7a4a5e3d1971f00027cbc63d" dependencies = [ "const-oid 0.10.2", "pem-rfc7468 1.0.0", @@ -2707,7 +2707,7 @@ dependencies = [ "aes", "aes-gcm", "cbc", - "der 0.8.0", + "der 0.8.1", "pbkdf2", "rand_core 0.10.1", "scrypt", @@ -2721,7 +2721,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "451913da69c775a56034ea8d9003d27ee8948e12443eae7c038ba100a4f21cb7" dependencies = [ - "der 0.8.0", + "der 0.8.1", "pkcs5", "rand_core 0.10.1", "spki 0.8.0", @@ -3652,7 +3652,7 @@ dependencies = [ "crc32fast", "crossbeam-utils", "csv-core", - "der 0.8.0", + "der 0.8.1", "digest 0.11.3", "dyn-clone", "flame", @@ -4158,7 +4158,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d9efca8738c78ee9484207732f728b1ef517bbb1833d6fc0879ca898a522f6f" dependencies = [ "base64ct", - "der 0.8.0", + "der 0.8.1", ] [[package]] From f03618e9525bee5a147292c076f96f82738841d9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Jul 2026 23:28:52 +0900 Subject: [PATCH 234/339] Bump libz-rs-sys from 0.6.5 to 0.6.6 (#8280) Bumps [libz-rs-sys](https://github.com/trifectatechfoundation/zlib-rs) from 0.6.5 to 0.6.6. - [Release notes](https://github.com/trifectatechfoundation/zlib-rs/releases) - [Changelog](https://github.com/trifectatechfoundation/zlib-rs/blob/main/docs/release.md) - [Commits](https://github.com/trifectatechfoundation/zlib-rs/compare/v0.6.5...v0.6.6) --- updated-dependencies: - dependency-name: libz-rs-sys dependency-version: 0.6.6 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 81012908b..491c5851c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2114,9 +2114,9 @@ dependencies = [ [[package]] name = "libz-rs-sys" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c12cd6e7e66c601f22d849241e2257b38b4685a34b41401f4aefdd9c431c1c6" +checksum = "50474818739ccab820cd57bca432d6b02d090b47f9e85501d963cd05851f82eb" dependencies = [ "zlib-rs", ] @@ -5239,9 +5239,9 @@ dependencies = [ [[package]] name = "zlib-rs" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5431d5661c32445236631278f27946e444ddafe4684cac70b185272d4f9c52d5" +checksum = "b142a20ec14a91d5bc708c1dc21b080c550113d8aa77afa29635673a65dd02c5" [[package]] name = "zmij" From a777208f088e1ff52691993940c073ea75fbdae3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=95=EC=A7=80=EC=9B=85?= <jacejung.dev@gmail.com> Date: Wed, 15 Jul 2026 23:36:43 +0900 Subject: [PATCH 235/339] module: honor module-level __dir__ (PEP 562) (#8271) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * module: honor module-level __dir__ (PEP 562) dir(module) ignored a module-level __dir__ function and returned the raw __dict__ keys. Look up __dir__ in the module dict and, when present, call it and return its result — matching CPython's module___dir___impl. The existing expectedFailure markers on test_module_dir/test_module_dir_errors are removed since both now pass. Fixes #8231 Assisted-by: Claude Code:claude-opus-4-8 * test: unmark zoneinfo test_dir_contains_all (PEP 562 __dir__) Honoring a module-level __dir__ makes dir(zoneinfo) contain everything in __all__, so test_dir_contains_all now passes. Remove its stale expectedFailure marker to avoid an unexpected-success CI failure. Assisted-by: Claude Code:claude-opus-4-8 * test: unmark test_support.test_check__all__ (PEP 562 __dir__) check__all__ iterates dir(module); honoring a module-level __dir__ fixes dir(unittest), so test_check__all__ now passes. Remove its stale expectedFailure marker to avoid an unexpected-success CI failure. Assisted-by: Claude Code:claude-opus-4-8 --- Lib/test/test_module/__init__.py | 2 -- Lib/test/test_support.py | 1 - Lib/test/test_zoneinfo/test_zoneinfo.py | 1 - crates/vm/src/builtins/module.rs | 4 ++++ 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Lib/test/test_module/__init__.py b/Lib/test/test_module/__init__.py index d4ed61648..22132b01c 100644 --- a/Lib/test/test_module/__init__.py +++ b/Lib/test/test_module/__init__.py @@ -151,13 +151,11 @@ a = A(destroyed)""" if 'test.test_module.bad_getattr2' in sys.modules: del sys.modules['test.test_module.bad_getattr2'] - @unittest.expectedFailure # TODO: RUSTPYTHON def test_module_dir(self): import test.test_module.good_getattr as gga self.assertEqual(dir(gga), ['a', 'b', 'c']) del sys.modules['test.test_module.good_getattr'] - @unittest.expectedFailure # TODO: RUSTPYTHON def test_module_dir_errors(self): import test.test_module.bad_getattr as bga from test.test_module import bad_getattr2 diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py index 6b3aa466d..19ea6fafc 100644 --- a/Lib/test/test_support.py +++ b/Lib/test/test_support.py @@ -458,7 +458,6 @@ class TestSupport(unittest.TestCase): self.OtherClass, self.RefClass, ignore=ignore) self.assertEqual(set(), missing_items) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_check__all__(self): extra = {'tempdir'} not_exported = {'template'} diff --git a/Lib/test/test_zoneinfo/test_zoneinfo.py b/Lib/test/test_zoneinfo/test_zoneinfo.py index e9516c0b1..638b4c52a 100644 --- a/Lib/test/test_zoneinfo/test_zoneinfo.py +++ b/Lib/test/test_zoneinfo/test_zoneinfo.py @@ -1970,7 +1970,6 @@ class TestModule(ZoneInfoTestBase): with self.assertRaises(AttributeError): self.module.NOATTRIBUTE - @unittest.expectedFailure # TODO: RUSTPYTHON; dir(self.module) should at least contain everything in __all__. def test_dir_contains_all(self): """dir(self.module) should at least contain everything in __all__.""" module_all_set = set(self.module.__all__) diff --git a/crates/vm/src/builtins/module.rs b/crates/vm/src/builtins/module.rs index e62967558..8fa5259f7 100644 --- a/crates/vm/src/builtins/module.rs +++ b/crates/vm/src/builtins/module.rs @@ -303,6 +303,10 @@ impl PyModule { let dict = dict_attr .downcast::<PyDict>() .map_err(|_| vm.new_type_error("<module>.__dict__ is not a dictionary"))?; + // PEP 562: honor a module-level __dir__ if one is defined + if let Some(dir_func) = dict.get_item_opt(identifier!(vm, __dir__), vm)? { + return dir_func.call((), vm)?.try_to_value(vm); + } let attrs = dict.into_iter().map(|(k, _v)| k).collect(); Ok(attrs) } From 9e9d55ad18983738588ee80ede56019ff7c5e213 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EB=8F=99=EC=95=88?= <ioprt123@gmail.com> Date: Wed, 15 Jul 2026 23:39:59 +0900 Subject: [PATCH 236/339] Make SystemExit.code a writable attribute set at init (#8282) * Make SystemExit.code a writable attribute set at init * Read exit status from SystemExit.code in handle_exit_exception * Store SystemExit.code in a struct field instead of the instance dict * Create SystemExit through the full constructor path --- crates/vm/src/exceptions.rs | 94 +++++++++++++++++++++++--------- crates/vm/src/stdlib/_thread.rs | 2 +- crates/vm/src/stdlib/builtins.rs | 2 +- crates/vm/src/vm/mod.rs | 45 ++++++++------- 4 files changed, 91 insertions(+), 52 deletions(-) diff --git a/crates/vm/src/exceptions.rs b/crates/vm/src/exceptions.rs index f7e1b79aa..1db10274e 100644 --- a/crates/vm/src/exceptions.rs +++ b/crates/vm/src/exceptions.rs @@ -959,9 +959,7 @@ impl ExceptionZoo { "exceptions" => ctx.new_readonly_getset("exceptions", excs.base_exception_group, make_arg_getter(1)), }); - extend_exception!(PySystemExit, ctx, excs.system_exit, { - "code" => ctx.new_readonly_getset("code", excs.system_exit, system_exit_code), - }); + extend_exception!(PySystemExit, ctx, excs.system_exit); extend_exception!(PyKeyboardInterrupt, ctx, excs.keyboard_interrupt); extend_exception!(PyGeneratorExit, ctx, excs.generator_exit); @@ -1100,19 +1098,6 @@ fn syntax_error_set_msg(exc: PyBaseExceptionRef, value: PySetterValue, vm: &Virt *args = PyTuple::new_ref(new_args, &vm.ctx); } -fn system_exit_code(exc: PyBaseExceptionRef) -> Option<PyObjectRef> { - // SystemExit.code based on args length: - // - size == 0: code is None - // - size == 1: code is args[0] - // - size > 1: code is args (the whole tuple) - let args = exc.args.read(); - Some(match args.len() { - 0 => return None, - 1 => args.first().unwrap().clone(), - _ => args.as_object().to_owned(), - }) -} - #[cfg(feature = "serde")] pub struct SerializeException<'vm, 's> { vm: &'vm VirtualMachine, @@ -1593,7 +1578,7 @@ pub(super) mod types { tuple::IntoPyTuple, }, convert::ToPyResult, - function::{ArgBytesLike, FuncArgs, KwArgs}, + function::{ArgBytesLike, FuncArgs, KwArgs, PySetterValue}, set_attrs, types::{Constructor, Initializer}, }; @@ -1624,22 +1609,65 @@ pub(super) mod types { pub(super) args: PyRwLock<PyTupleRef>, } - #[pyexception(name, base = PyBaseException, ctx = "system_exit")] - #[derive(Debug)] - #[repr(transparent)] - pub struct PySystemExit(PyBaseException); + #[pyexception(name, base = PyBaseException, ctx = "system_exit", traverse = "manual")] + #[repr(C)] + pub struct PySystemExit { + base: PyBaseException, + code: PyAtomicRef<Option<PyObject>>, + } - // SystemExit_init: has its own __init__ that sets the code attribute - #[pyexception(with(Initializer))] - impl PySystemExit {} + impl crate::class::PySubclass for PySystemExit { + type Base = PyBaseException; + fn as_base(&self) -> &Self::Base { + &self.base + } + } + + unsafe impl Traverse for PySystemExit { + fn traverse(&self, tracer_fn: &mut TraverseFn<'_>) { + self.base.traverse(tracer_fn); + if let Some(obj) = self.code.deref() { + tracer_fn(obj); + } + } + } + + impl core::fmt::Debug for PySystemExit { + fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { + f.debug_struct("PySystemExit").finish_non_exhaustive() + } + } + + #[pyexception(with(Constructor, Initializer))] + impl PySystemExit { + #[pygetset] + fn code(&self) -> Option<PyObjectRef> { + self.code.to_owned() + } + + #[pygetset(setter)] + fn set_code(&self, value: PySetterValue, vm: &VirtualMachine) { + let code = match value { + PySetterValue::Assign(v) => Some(v), + PySetterValue::Delete => None, + }; + self.code.swap_to_temporary_refs(code, vm); + } + } impl Initializer for PySystemExit { type Args = FuncArgs; fn slot_init(zelf: PyObjectRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult<()> { // Call BaseException_init first (handles args) - PyBaseException::slot_init(zelf, args, vm) - // Note: code is computed dynamically via system_exit_code getter - // so we don't need to set it here explicitly + let code = match args.args.len() { + 0 => vm.ctx.none(), + 1 => args.args[0].clone(), + _ => vm.ctx.new_tuple(args.args.clone()).into(), + }; + PyBaseException::slot_init(zelf.clone(), args, vm)?; + let exc: &Py<Self> = zelf.downcast_ref::<Self>().unwrap(); + exc.code.swap_to_temporary_refs(Some(code), vm); + Ok(()) } fn init(_zelf: PyRef<Self>, _args: Self::Args, _vm: &VirtualMachine) -> PyResult<()> { @@ -1647,6 +1675,18 @@ pub(super) mod types { } } + impl Constructor for PySystemExit { + type Args = FuncArgs; + + fn py_new(_cls: &Py<PyType>, args: FuncArgs, vm: &VirtualMachine) -> PyResult<Self> { + let base_exception = PyBaseException::new(args.args, vm); + Ok(Self { + base: base_exception, + code: None.into(), + }) + } + } + #[pyexception(name, base = PyBaseException, ctx = "generator_exit", impl)] #[derive(Debug)] #[repr(transparent)] diff --git a/crates/vm/src/stdlib/_thread.rs b/crates/vm/src/stdlib/_thread.rs index 99f9b1787..9caa15dbf 100644 --- a/crates/vm/src/stdlib/_thread.rs +++ b/crates/vm/src/stdlib/_thread.rs @@ -623,7 +623,7 @@ pub(crate) mod _thread { #[pyfunction] fn exit(vm: &VirtualMachine) -> PyResult { - Err(vm.new_exception_empty(vm.ctx.exceptions.system_exit.to_owned())) + Err(vm.invoke_exception(vm.ctx.exceptions.system_exit.to_owned(), vec![])?) } thread_local!(static SENTINELS: RefCell<Vec<PyRef<Lock>>> = const { RefCell::new(Vec::new()) }); diff --git a/crates/vm/src/stdlib/builtins.rs b/crates/vm/src/stdlib/builtins.rs index 8ea849ab0..27f30158b 100644 --- a/crates/vm/src/stdlib/builtins.rs +++ b/crates/vm/src/stdlib/builtins.rs @@ -1041,7 +1041,7 @@ mod builtins { #[pyfunction] pub(super) fn exit(exit_code_arg: OptionalArg<PyObjectRef>, vm: &VirtualMachine) -> PyResult { let code = exit_code_arg.unwrap_or_else(|| vm.ctx.new_int(0).into()); - Err(vm.new_exception(vm.ctx.exceptions.system_exit.to_owned(), vec![code])) + Err(vm.invoke_exception(vm.ctx.exceptions.system_exit.to_owned(), vec![code])?) } #[derive(Debug, Default, FromArgs)] diff --git a/crates/vm/src/vm/mod.rs b/crates/vm/src/vm/mod.rs index 852e57cc0..0f2e6a463 100644 --- a/crates/vm/src/vm/mod.rs +++ b/crates/vm/src/vm/mod.rs @@ -2161,7 +2161,7 @@ impl VirtualMachine { if self.state.finalizing.load(Ordering::Acquire) && !self.is_main_thread() { // once finalization starts, // non-main Python threads should stop running bytecode. - return Err(self.new_exception(self.ctx.exceptions.system_exit.to_owned(), vec![])); + return Err(self.invoke_exception(self.ctx.exceptions.system_exit.to_owned(), vec![])?); } // Suspend this thread if stop-the-world is in progress @@ -2303,29 +2303,28 @@ impl VirtualMachine { pub fn handle_exit_exception(&self, exc: PyBaseExceptionRef) -> u32 { if exc.fast_isinstance(self.ctx.exceptions.system_exit) { - let args = exc.args(); - let msg = match args.as_slice() { - [] => return 0, - [arg] => match_class!(match arg { - ref i @ PyInt => { - use num_traits::cast::ToPrimitive; - // Try u32 first, then i32 (for negative values), else -1 for overflow - let code = i - .as_bigint() - .to_u32() - .or_else(|| i.as_bigint().to_i32().map(|v| v as u32)) - .unwrap_or(-1i32 as u32); - return code; + let code = exc + .as_object() + .get_attr("code", self) + .unwrap_or_else(|_| exc.as_object().to_owned()); + let msg = match_class!(match code { + ref i @ PyInt => { + use num_traits::cast::ToPrimitive; + // Try u32 first, then i32 (for negative values), else -1 for overflow + let code = i + .as_bigint() + .to_u32() + .or_else(|| i.as_bigint().to_i32().map(|v| v as u32)) + .unwrap_or(-1i32 as u32); + return code; + } + code => { + if self.is_none(&code) { + return 0; } - arg => { - if self.is_none(arg) { - return 0; - } - arg.str(self).ok() - } - }), - _ => args.as_object().repr(self).ok(), - }; + code.str(self).ok() + } + }); if let Some(msg) = msg { // Write using Python's write() to use stderr's error handler (backslashreplace) if let Ok(stderr) = stdlib::sys::get_stderr(self) { From ac28fff085e365af7e0e4917d1ebd7fa5336071d Mon Sep 17 00:00:00 2001 From: Bas Schoenmaeckers <7943856+bschoenmaeckers@users.noreply.github.com> Date: Wed, 15 Jul 2026 16:41:18 +0200 Subject: [PATCH 237/339] Add descriptor support to c-api (#8283) * Add descriptor support to c-api * Review * Extract getset builder * Extract memberdef builder --- crates/capi/src/descrobject.rs | 249 ++++++++++++++++++++++++++++++++- crates/vm/src/builtins/mod.rs | 4 + 2 files changed, 251 insertions(+), 2 deletions(-) diff --git a/crates/capi/src/descrobject.rs b/crates/capi/src/descrobject.rs index b0d24667d..ecc0b53f8 100644 --- a/crates/capi/src/descrobject.rs +++ b/crates/capi/src/descrobject.rs @@ -1,7 +1,201 @@ use crate::PyObject; +use crate::methodobject::{PyMethodDef, build_method_def}; +use crate::object::PyTypeObject; use crate::pystate::with_vm; -use rustpython_vm::PyPayload; -use rustpython_vm::builtins::PyMappingProxy; +use core::ffi::{CStr, c_char, c_int, c_void}; +use core::ptr::NonNull; +use rustpython_vm::builtins::{ + DescriptorMemberDef, MemberGetter, MemberKind, MemberSetter, PyDescriptorOwned, PyGetSet, + PyMappingProxy, PyMemberDescriptor, PyType, +}; +use rustpython_vm::common::lock::PyRwLock; +use rustpython_vm::function::PySetterValue; +use rustpython_vm::{Py, PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine}; + +#[repr(C)] +pub struct PyGetSetDef { + pub name: *const c_char, + pub get: + Option<unsafe extern "C" fn(slf: *mut PyObject, closure: *mut c_void) -> *mut PyObject>, + pub set: Option< + unsafe extern "C" fn( + slf: *mut PyObject, + value: *mut PyObject, + closure: *mut c_void, + ) -> c_int, + >, + pub doc: *const c_char, + pub closure: *mut c_void, +} + +impl PyGetSetDef { + pub(crate) fn build( + &self, + ty: &'static Py<PyType>, + vm: &VirtualMachine, + ) -> PyResult<PyRef<PyGetSet>> { + let name = unsafe { CStr::from_ptr(self.name) } + .to_str() + .map_err(|_| vm.new_system_error("PyGetSetDef name was not valid UTF-8"))?; + let closure = self.closure as usize; + + let descriptor = match (self.get, self.set) { + (Some(get), Some(set)) => vm.ctx.new_static_getset( + name, + ty, + move |obj: PyObjectRef, vm: &VirtualMachine| -> PyResult<PyObjectRef> { + unsafe { + let closure = closure as *mut c_void; + let ret_ptr = get(obj.as_raw().cast_mut(), closure); + let ret_ptr = NonNull::new(ret_ptr).ok_or_else(|| { + vm.take_raised_exception().unwrap_or_else(|| { + vm.new_system_error( + "Native function returned NULL, but there was no exception set", + ) + }) + })?; + Ok(PyObjectRef::from_raw(ret_ptr)) + } + }, + move |obj: PyObjectRef, value: PySetterValue, vm: &VirtualMachine| unsafe { + let closure = closure as *mut c_void; + let value = value.unwrap_or_none(vm); + let result = set(obj.as_raw().cast_mut(), value.as_raw().cast_mut(), closure); + if result == 0 { + Ok(()) + } else { + Err(vm.take_raised_exception().unwrap_or_else(|| { + vm.new_system_error( + "C setter returned error but did not set an exception", + ) + })) + } + }, + ), + (Some(get), None) => vm.ctx.new_readonly_getset( + name, + ty, + move |obj: PyObjectRef, vm: &VirtualMachine| -> PyResult<PyObjectRef> { + unsafe { + let closure = closure as *mut c_void; + let ret_ptr = get(obj.as_raw().cast_mut(), closure); + let ret_ptr = NonNull::new(ret_ptr).ok_or_else(|| { + vm.take_raised_exception().unwrap_or_else(|| { + vm.new_system_error( + "Native function returned NULL, but there was no exception set", + ) + }) + })?; + Ok(PyObjectRef::from_raw(ret_ptr)) + } + }, + ), + (None, Some(set)) => vm.ctx.new_static_getset( + name, + ty, + move |_obj: PyObjectRef, vm: &VirtualMachine| -> PyResult<PyObjectRef> { + Err(vm.new_attribute_error("unreadable attribute")) + }, + move |obj: PyObjectRef, value: PySetterValue, vm: &VirtualMachine| unsafe { + let closure = closure as *mut c_void; + let value = value.unwrap_or_none(vm); + let result = set(obj.as_raw().cast_mut(), value.as_raw().cast_mut(), closure); + if result == 0 { + Ok(()) + } else { + Err(vm.take_raised_exception().unwrap_or_else(|| { + vm.new_system_error( + "C setter returned error but did not set an exception", + ) + })) + } + }, + ), + (None, None) => vm.ctx.new_readonly_getset( + name, + ty, + move |_obj: PyObjectRef, vm: &VirtualMachine| -> PyResult<PyObjectRef> { + Err(vm.new_attribute_error("unreadable attribute")) + }, + ), + }; + + Ok(descriptor) + } +} + +#[repr(C)] +pub struct PyMemberDef { + pub name: *const c_char, + pub type_code: c_int, + pub offset: isize, + pub flags: c_int, + pub doc: *const c_char, +} + +impl PyMemberDef { + const PY_READONLY: c_int = 1; + const PY_RELATIVE_OFFSET: c_int = 8; + + pub(crate) fn build( + &self, + ty: &Py<PyType>, + vm: &VirtualMachine, + ) -> PyResult<PyRef<PyMemberDescriptor>> { + let name = unsafe { CStr::from_ptr(self.name) } + .to_str() + .map_err(|_| vm.new_system_error("PyMemberDef name was not valid UTF-8"))?; + let kind = match self.type_code { + 6 => MemberKind::Object, + 16 => MemberKind::ObjectEx, + 14 => MemberKind::Bool, + _ => { + return Err(vm.new_system_error(format!( + "PyDescr_NewMember does not support member type code {}", + self.type_code + ))); + } + }; + if self.offset < 0 { + return Err(vm.new_system_error("PyDescr_NewMember does not support negative offsets")); + } + if self.flags & Self::PY_RELATIVE_OFFSET != 0 { + return Err( + vm.new_system_error("PyDescr_NewMember does not support Py_RELATIVE_OFFSET") + ); + } + + let doc = NonNull::new(self.doc.cast_mut()) + .map(|doc| { + unsafe { CStr::from_ptr(doc.as_ptr()) } + .to_str() + .map(|s| s.to_owned()) + .map_err(|_| vm.new_system_error("PyMemberDef doc was not valid UTF-8")) + }) + .transpose()?; + + let descriptor = PyMemberDescriptor { + common: PyDescriptorOwned { + typ: ty.to_owned(), + name: vm.ctx.intern_str(name), + qualname: PyRwLock::new(None), + }, + member: DescriptorMemberDef { + name: name.to_owned(), + kind, + getter: MemberGetter::Offset(self.offset as usize), + setter: if self.flags & Self::PY_READONLY != 0 { + MemberSetter::Setter(None) + } else { + MemberSetter::Offset(self.offset as usize) + }, + doc, + }, + }; + + Ok(descriptor.into_ref(&vm.ctx)) + } +} #[unsafe(no_mangle)] pub unsafe extern "C" fn PyDictProxy_New(mapping: *mut PyObject) -> *mut PyObject { @@ -11,6 +205,57 @@ pub unsafe extern "C" fn PyDictProxy_New(mapping: *mut PyObject) -> *mut PyObjec }) } +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyDescr_NewMethod( + typ: *mut PyTypeObject, + method: *mut PyMethodDef, +) -> *mut PyObject { + with_vm(|vm| { + let method = build_method_def(vm, unsafe { &*method }, true)?; + Ok(method.build_method(unsafe { &*typ }, vm)) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyDescr_NewClassMethod( + typ: *mut PyTypeObject, + method: *mut PyMethodDef, +) -> *mut PyObject { + with_vm(|vm| { + let method = build_method_def(vm, unsafe { &*method }, true)?; + Ok(method.build_method(unsafe { &*typ }, vm)) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyDescr_NewGetSet( + typ: *mut PyTypeObject, + getset: *mut PyGetSetDef, +) -> *mut PyObject { + with_vm(|vm| unsafe { &*getset }.build(unsafe { &*typ }, vm)) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyDescr_NewMember( + typ: *mut PyTypeObject, + member: *mut PyMemberDef, +) -> *mut PyObject { + with_vm(|vm| Ok(unsafe { &*member }.build(unsafe { &*typ }, vm))) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyWrapper_New(descr: *mut PyObject, obj: *mut PyObject) -> *mut PyObject { + with_vm(|vm| { + let descr = unsafe { &*descr }; + let obj = unsafe { &*obj }; + vm.call_special_method( + descr, + vm.ctx.names.__get__, + (obj.to_owned(), obj.class().to_owned()), + ) + }) +} + #[cfg(test)] mod tests { use pyo3::prelude::*; diff --git a/crates/vm/src/builtins/mod.rs b/crates/vm/src/builtins/mod.rs index ffc01b00f..f08a2b467 100644 --- a/crates/vm/src/builtins/mod.rs +++ b/crates/vm/src/builtins/mod.rs @@ -99,6 +99,10 @@ pub use zip::PyZip; pub(crate) mod union_; pub use union_::{PyUnion, make_union}; pub(crate) mod descriptor; +pub use descriptor::{ + MemberGetter, MemberKind, MemberSetter, PyDescriptorOwned, PyMemberDef as DescriptorMemberDef, + PyMemberDescriptor, +}; pub use float::float_from_string as parse_float_from_string; pub use float::try_to_bigint as try_f64_to_bigint; From 96fde50f75515f414a2d86bdfa93ed7408eddd7f Mon Sep 17 00:00:00 2001 From: Bas Schoenmaeckers <7943856+bschoenmaeckers@users.noreply.github.com> Date: Wed, 15 Jul 2026 16:41:36 +0200 Subject: [PATCH 238/339] Add AsyncIterator support to c-api (#8285) --- crates/capi/src/abstract_/iter.rs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/crates/capi/src/abstract_/iter.rs b/crates/capi/src/abstract_/iter.rs index fbd1440e0..a0827f625 100644 --- a/crates/capi/src/abstract_/iter.rs +++ b/crates/capi/src/abstract_/iter.rs @@ -9,6 +9,15 @@ pub unsafe extern "C" fn PyIter_Check(obj: *mut PyObject) -> c_int { with_vm(|_vm| Ok(PyIter::check(unsafe { &*obj }))) } +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyAIter_Check(obj: *mut PyObject) -> c_int { + with_vm(|vm| { + Ok(unsafe { &*obj } + .class() + .has_attr(rustpython_vm::identifier!(vm, __anext__))) + }) +} + #[unsafe(no_mangle)] pub unsafe extern "C" fn PyObject_GetIter(obj: *mut PyObject) -> *mut PyObject { with_vm(|vm| { @@ -17,6 +26,11 @@ pub unsafe extern "C" fn PyObject_GetIter(obj: *mut PyObject) -> *mut PyObject { }) } +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyObject_GetAIter(obj: *mut PyObject) -> *mut PyObject { + with_vm(|vm| unsafe { &*obj }.get_aiter(vm)) +} + #[unsafe(no_mangle)] pub unsafe extern "C" fn PyIter_NextItem(iter: *mut PyObject, item: *mut *mut PyObject) -> c_int { with_vm(|vm| { From 9af12c3f6dc0258fe0b045647cbae73bc71ffd8e Mon Sep 17 00:00:00 2001 From: SeungJe Jeong <88067455+seungje0612@users.noreply.github.com> Date: Wed, 15 Jul 2026 23:43:29 +0900 Subject: [PATCH 239/339] Fix overflow handling for inplace sequence repetition (#8270) --- Lib/test/test_list.py | 1 - crates/vm/src/sequence.rs | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_list.py b/Lib/test/test_list.py index e320a2008..40cec2261 100644 --- a/Lib/test/test_list.py +++ b/Lib/test/test_list.py @@ -106,7 +106,6 @@ class ListTest(list_tests.CommonTest): x[:] = x self.assertEqual(x, []) - @unittest.skip("TODO: RUSTPYTHON; crash") def test_list_resize_overflow(self): # gh-97616: test new_allocated * sizeof(PyObject*) overflow # check in list_resize() diff --git a/crates/vm/src/sequence.rs b/crates/vm/src/sequence.rs index 0bc12fd26..0bc35181b 100644 --- a/crates/vm/src/sequence.rs +++ b/crates/vm/src/sequence.rs @@ -122,6 +122,12 @@ where fn imul(&mut self, vm: &VirtualMachine, n: isize) -> PyResult<()> { let n = vm.check_repeat_or_overflow_error(self.as_ref().len(), n)?; + + if n > 1 && core::mem::size_of_val(self.as_ref()) >= MAX_MEMORY_SIZE / n { + // TODO: make a global static NoMemory shared exc object and return its reference. + return Err(vm.new_memory_error("")); + } + if n == 0 { self.as_vec_mut().clear(); } else if n != 1 { From c3ca1b360c791d030bbcaf180fad9ffb34cf62c7 Mon Sep 17 00:00:00 2001 From: Jeaeun Kim <109906379+kyokuping@users.noreply.github.com> Date: Wed, 15 Jul 2026 23:45:51 +0900 Subject: [PATCH 240/339] Improve unhashable set element errors (#8286) Assisted-by: Codex:gpt-5.6 --- Lib/test/test_set.py | 1 - crates/vm/src/builtins/set.rs | 34 ++++++++++++++++++++++++++++++---- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/Lib/test/test_set.py b/Lib/test/test_set.py index d88f2c598..a0b50df8f 100644 --- a/Lib/test/test_set.py +++ b/Lib/test/test_set.py @@ -657,7 +657,6 @@ class TestSet(TestJointOps, unittest.TestCase): self.assertRaises(KeyError, myset.remove, set(range(1))) self.assertRaises(KeyError, myset.remove, set(range(3))) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_unhashable_element(self): myset = {'a'} elem = [1, 2, 3] diff --git a/crates/vm/src/builtins/set.rs b/crates/vm/src/builtins/set.rs index 44dc9a221..a8f3e83c8 100644 --- a/crates/vm/src/builtins/set.rs +++ b/crates/vm/src/builtins/set.rs @@ -223,7 +223,9 @@ impl PySetInner { } fn contains(&self, needle: &PyObject, vm: &VirtualMachine) -> PyResult<bool> { - self.retry_op_with_frozenset(needle, vm, |needle, vm| self.content.contains(vm, needle)) + let result = self + .retry_op_with_frozenset(needle, vm, |needle, vm| self.content.contains(vm, needle)); + Self::wrap_unhashable_error(result, needle, vm) } fn compare(&self, other: &Self, op: PyComparisonOp, vm: &VirtualMachine) -> PyResult<bool> { @@ -327,15 +329,20 @@ impl PySetInner { } fn add(&self, item: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> { - self.content.insert(vm, &*item, ()) + let result = self.content.insert(vm, &*item, ()); + Self::wrap_unhashable_error(result, &item, vm) } fn remove(&self, item: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> { - self.retry_op_with_frozenset(&item, vm, |item, vm| self.content.delete(vm, item)) + let result = + self.retry_op_with_frozenset(&item, vm, |item, vm| self.content.delete(vm, item)); + Self::wrap_unhashable_error(result, &item, vm) } fn discard(&self, item: &PyObject, vm: &VirtualMachine) -> PyResult<bool> { - self.retry_op_with_frozenset(item, vm, |item, vm| self.content.delete_if_exists(vm, item)) + let result = self + .retry_op_with_frozenset(item, vm, |item, vm| self.content.delete_if_exists(vm, item)); + Self::wrap_unhashable_error(result, item, vm) } fn clear(&self) { @@ -488,6 +495,25 @@ impl PySetInner { }) }) } + + fn wrap_unhashable_error<T>( + result: PyResult<T>, + item: &PyObject, + vm: &VirtualMachine, + ) -> PyResult<T> { + match result { + Err(cause) if cause.fast_isinstance(vm.ctx.exceptions.type_error) => { + let message = cause.as_object().str(vm)?; + let err = vm.new_type_error(format!( + "cannot use '{}' as a set element ({message})", + item.class().name() + )); + err.set___cause__(Some(cause)); + Err(err) + } + result => result, + } + } } fn extract_set(obj: &PyObject) -> Option<&PySetInner> { From 9d9fc27082bf3f869bdab1a7c2f92f6e17a25fed Mon Sep 17 00:00:00 2001 From: Sumi Jeong <125195487+sigmaith@users.noreply.github.com> Date: Thu, 16 Jul 2026 17:39:48 +0900 Subject: [PATCH 241/339] `_queue`: check for pending signals during blocking `get()` (#8252) * _queue: check for pending signals during blocking get() Semaphore::acquire() waited on the condvar in a single uninterrupted call, so a Python-level signal handler never ran until the wait itself returned. check_signals() is only invoked from the bytecode dispatch loop, and this native wait never passed through it -- CPython chunks its equivalent blocking wait for the same reason. Cap each wait at a short interval and call check_signals() between chunks, only giving up once the caller's real deadline has actually elapsed. The mutex guard must be dropped before check_signals() runs: a signal handler that calls back into the same queue on the same thread would otherwise try to relock a mutex it's still holding and deadlock against itself. Add a regression snippet that arms a SIGALRM well before a helper thread unblocks the queue, and asserts the handler ran near the alarm instead of only once get() returned. Refs #8250 Assisted-by: Claude * _queue: correct SIGNAL_CHECK_INTERVAL doc comment The old comment claimed this mirrors CPython's PyThread_acquire_lock_timed, but CPython doesn't chunk its wait either -- it makes one sem_timedwait call and relies on the OS reporting EINTR. parking_lot's Condvar has no equivalent signal to surface, so polling is a workaround for that gap, not a mirror of CPython's approach. Assisted-by: Claude * Apply suggestions from code review Co-authored-by: Jeong, YunWon <69878+youknowone@users.noreply.github.com> * _queue: fix comment indentation (cargo fmt) Assisted-by: Claude --------- Co-authored-by: Jeong, YunWon <69878+youknowone@users.noreply.github.com> --- crates/stdlib/src/_queue.rs | 74 +++++++++++++++------ extra_tests/snippets/stdlib_queue_signal.py | 52 +++++++++++++++ 2 files changed, 104 insertions(+), 22 deletions(-) create mode 100644 extra_tests/snippets/stdlib_queue_signal.py diff --git a/crates/stdlib/src/_queue.rs b/crates/stdlib/src/_queue.rs index 65456bd35..6b150e4c6 100644 --- a/crates/stdlib/src/_queue.rs +++ b/crates/stdlib/src/_queue.rs @@ -31,6 +31,17 @@ mod _queue { const INITIAL_RING_BUF_CAPACITY: usize = 8; + /// `parking_lot`'s `Condvar` doesn't expose a mid-wait signal to us (unlike + /// CPython's raw `sem_timedwait`, which reports `EINTR`), so we poll instead. + // FIXME: interim stopgap. The signal already interrupts the wait with EINTR + // (SA_RESTART cleared via `siginterrupt`), but `parking_lot::Condvar` swallows + // it and re-parks, forcing this poll. Replace with a shared interruptible + // timed-wait that surfaces EINTR (`poll`/wakeup-fd, portable incl. macOS; or + // `sem_timedwait` where available) -- `_thread` lock and `Thread.join` share + // this defect. Then this constant and the chunking loop go away. + #[cfg(feature = "threading")] + const SIGNAL_CHECK_INTERVAL: Duration = Duration::from_millis(50); + #[pyattr] #[pyclass(module = "_queue", name = "Empty", base = PyException)] #[repr(transparent)] @@ -72,31 +83,50 @@ mod _queue { self.cond.notify_one(); } - /// Returns `true` if the semaphore was acquired, `false` on timeout. - #[must_use] - fn acquire(&self, block: bool, deadline: Option<Instant>, vm: &VirtualMachine) -> bool { - let mut count = self.mutex.lock(); + /// `Ok(true)` if acquired, `Ok(false)` on timeout, `Err` if a signal + /// handler raised (e.g. `KeyboardInterrupt`) while we were waiting. + fn acquire( + &self, + block: bool, + deadline: Option<Instant>, + vm: &VirtualMachine, + ) -> PyResult<bool> { loop { - if *count > 0 { - *count -= 1; - return true; - } + // Guard must be dropped before check_signals() below, since a + // signal handler may call back into this same queue. + { + let mut count = self.mutex.lock(); - if !block { - return false; - } - - match deadline { - Some(dl) => { - let result = vm.allow_threads(|| self.cond.wait_until(&mut count, dl)); - if result.timed_out() && *count == 0 { - return false; - } + if *count > 0 { + *count -= 1; + return Ok(true); } - None => { - vm.allow_threads(|| self.cond.wait(&mut count)); + + if !block { + return Ok(false); + } + + let now = Instant::now(); + let chunk_deadline = deadline.map_or_else( + || now + SIGNAL_CHECK_INTERVAL, + |dl| dl.min(now + SIGNAL_CHECK_INTERVAL), + ); + + vm.allow_threads(|| self.cond.wait_until(&mut count, chunk_deadline)); + + if *count > 0 { + *count -= 1; + return Ok(true); + } + + if let Some(dl) = deadline + && Instant::now() >= dl + { + return Ok(false); } } + + vm.check_signals()?; } } } @@ -227,7 +257,7 @@ mod _queue { #[cfg(feature = "threading")] { - if !self.sem.acquire(block, deadline, vm) { + if !self.sem.acquire(block, deadline, vm)? { return Err(empty_error(vm)); } } @@ -239,7 +269,7 @@ mod _queue { fn get_nowait(&self, vm: &VirtualMachine) -> PyResult<PyObjectRef> { #[cfg(feature = "threading")] { - if !self.sem.acquire(false, None, vm) { + if !self.sem.acquire(false, None, vm)? { return Err(empty_error(vm)); } } diff --git a/extra_tests/snippets/stdlib_queue_signal.py b/extra_tests/snippets/stdlib_queue_signal.py new file mode 100644 index 000000000..fce6bcbb1 --- /dev/null +++ b/extra_tests/snippets/stdlib_queue_signal.py @@ -0,0 +1,52 @@ +"""A blocking queue.SimpleQueue.get() must stay responsive to signals. + +SimpleQueue.get() waits on a Condvar. A single uninterrupted wait blocks +Python-level signal handlers (including the default KeyboardInterrupt) until +the wait itself returns, since signals are only delivered at bytecode +safepoints. A regression shows up as the handler firing only once get() +unblocks, instead of promptly when the signal actually arrives. +""" + +import queue +import signal +import sys +import threading +import time + +if sys.platform.startswith("win"): + print("skipped (no SIGALRM)") + raise SystemExit(0) + +q = queue.SimpleQueue() +start = time.time() +handled_at = [] + + +def handler(signum, frame): + handled_at.append(time.time() - start) + + +signal.signal(signal.SIGALRM, handler) +signal.setitimer(signal.ITIMER_REAL, 0.3) + + +def unblock_later(): + time.sleep(1.5) + q.put("unblock") + + +threading.Thread(target=unblock_later, daemon=True).start() + +item = q.get() # blocks until unblock_later() wakes us up +elapsed = time.time() - start + +assert item == "unblock", item +assert handled_at, "signal handler never ran" +# The handler should fire around t=0.3s, when the timer was started, not t=1.5s +# (when get() finally unblocked). +assert handled_at[0] < elapsed - 0.5, ( + f"signal handled at {handled_at[0]:.2f}s but get() only returned at " + f"{elapsed:.2f}s -- signal was not processed while blocked" +) + +print("ok") From 452f2b0e5b69f634879dd2c02f7dbdc9cc866634 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A1=B0=EC=A7=84=EB=AA=85?= <britzegs@gmail.com> Date: Thu, 16 Jul 2026 17:42:02 +0900 Subject: [PATCH 242/339] csv: apply dialect quoting and lineterminator in writer (#8254) * csv: map QUOTE_MINIMAL to Necessary quote style QuoteStyle::Minimal was mapped to csv_core's Always, which quoted every field even under QUOTE_MINIMAL. Map it to Necessary so only fields that require quoting are quoted. Unmarks Test_Csv.test_write_quoting. Assisted-by: Claude Code:claude-opus-4-8 * csv: apply dialect quoting and lineterminator in writer csv.writer ignored the quoting and lineterminator from a dialect (whether passed by name or object), always using the defaults. Resolve both from the dialect via get_quoting()/get_lineterminator(), mirroring get_delimiter(), so an explicit keyword argument still overrides the dialect. Unmarks TestDialectUnix.test_simple_writer. Assisted-by: Claude Code:claude-opus-4-8 --- Lib/test/test_csv.py | 2 -- crates/stdlib/src/csv.rs | 50 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 45 insertions(+), 7 deletions(-) diff --git a/Lib/test/test_csv.py b/Lib/test/test_csv.py index 86f1cf9bc..13b68cc22 100644 --- a/Lib/test/test_csv.py +++ b/Lib/test/test_csv.py @@ -213,7 +213,6 @@ class Test_Csv(unittest.TestCase): self._write_test([bigstring,bigstring], '%s,%s' % \ (bigstring, bigstring)) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_write_quoting(self): self._write_test(['a',1,'p,q'], 'a,1,"p,q"') self._write_error_test(csv.Error, ['a',1,'p,q'], @@ -863,7 +862,6 @@ class TestEscapedExcel(TestCsvBase): class TestDialectUnix(TestCsvBase): dialect = 'unix' - @unittest.expectedFailure # TODO: RUSTPYTHON def test_simple_writer(self): self.writerAssertEqual([[1, 'abc def', 'abc']], '"1","abc def","abc"\n') diff --git a/crates/stdlib/src/csv.rs b/crates/stdlib/src/csv.rs index 48ad68d43..3fbafab8d 100644 --- a/crates/stdlib/src/csv.rs +++ b/crates/stdlib/src/csv.rs @@ -462,7 +462,7 @@ mod _csv { impl From<QuoteStyle> for csv_core::QuoteStyle { fn from(val: QuoteStyle) -> Self { match val { - QuoteStyle::Minimal => Self::Always, + QuoteStyle::Minimal => Self::Necessary, QuoteStyle::All => Self::Always, QuoteStyle::Nonnumeric => Self::NonNumeric, QuoteStyle::None => Self::Never, @@ -796,6 +796,48 @@ mod _csv { delimiter } + fn get_lineterminator(&self) -> csv_core::Terminator { + let mut lineterminator = match &self.dialect { + DialectItem::Str(name) => { + let g = GLOBAL_HASHMAP.lock(); + if let Some(dialect) = g.get(name) { + dialect.lineterminator + } else { + Terminator::CRLF + } + } + DialectItem::Obj(obj) => obj.lineterminator, + _ => Terminator::CRLF, + }; + + if let Some(attr) = self.lineterminator { + lineterminator = attr + } + + lineterminator + } + + fn get_quoting(&self) -> QuoteStyle { + let mut quoting = match &self.dialect { + DialectItem::Str(name) => { + let g = GLOBAL_HASHMAP.lock(); + if let Some(dialect) = g.get(name) { + dialect.quoting + } else { + QuoteStyle::Minimal + } + } + DialectItem::Obj(obj) => obj.quoting, + _ => QuoteStyle::Minimal, + }; + + if let Some(attr) = self.quoting { + quoting = attr + } + + quoting + } + fn to_reader(&self) -> csv_core::Reader { let dialect = match &self.dialect { DialectItem::Str(name) => GLOBAL_HASHMAP.lock().get(name).copied(), @@ -900,15 +942,13 @@ mod _csv { writer = writer.double_quote(t); } - writer = writer.terminator(self.lineterminator.unwrap_or(Terminator::CRLF)); + writer = writer.terminator(self.get_lineterminator()); if let Some(e) = self.escapechar { writer = writer.escape(e); } - if let Some(e) = self.quoting { - writer = writer.quote_style(e.into()); - } + writer = writer.quote_style(self.get_quoting().into()); writer.build() } From ad839494716dd34d119233225822d2af2327595b Mon Sep 17 00:00:00 2001 From: Lee Dogeon <dev.moreal@gmail.com> Date: Fri, 17 Jul 2026 00:18:26 +0900 Subject: [PATCH 243/339] Remove trailing whitespace from sequence TODO (#8291) Apply the maintainer review suggestion from RustPython/RustPython#8270. Codex inspected the review context, made the one-line whitespace-only edit, and ran validation. Assisted-by: Codex:gpt-5 --- crates/vm/src/sequence.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/vm/src/sequence.rs b/crates/vm/src/sequence.rs index 0bc35181b..4e6ed97f2 100644 --- a/crates/vm/src/sequence.rs +++ b/crates/vm/src/sequence.rs @@ -124,7 +124,7 @@ where let n = vm.check_repeat_or_overflow_error(self.as_ref().len(), n)?; if n > 1 && core::mem::size_of_val(self.as_ref()) >= MAX_MEMORY_SIZE / n { - // TODO: make a global static NoMemory shared exc object and return its reference. + // TODO: make a global static NoMemory shared exc object and return its reference. return Err(vm.new_memory_error("")); } From c5efd71f2aeb2dac99bf6f5d1c68486601992253 Mon Sep 17 00:00:00 2001 From: Bas Schoenmaeckers <7943856+bschoenmaeckers@users.noreply.github.com> Date: Thu, 16 Jul 2026 17:19:31 +0200 Subject: [PATCH 244/339] Add codecs support to c-api (#8267) * Add codecs support to c-apo * Reduce code duplication --- crates/capi/src/abstract_.rs | 7 +- crates/capi/src/abstract_/mapping.rs | 21 +-- crates/capi/src/codecs.rs | 210 +++++++++++++++++++++++++++ crates/capi/src/descrobject.rs | 20 +-- crates/capi/src/dictobject.rs | 19 +-- crates/capi/src/import.rs | 16 +- crates/capi/src/lib.rs | 1 + crates/capi/src/methodobject.rs | 15 +- crates/capi/src/object.rs | 27 +--- crates/capi/src/pycapsule.rs | 5 +- crates/capi/src/pyerrors.rs | 27 ++-- crates/capi/src/unicodeobject.rs | 37 +---- crates/capi/src/util.rs | 30 ++++ crates/capi/src/warnings.rs | 21 +-- 14 files changed, 304 insertions(+), 152 deletions(-) create mode 100644 crates/capi/src/codecs.rs diff --git a/crates/capi/src/abstract_.rs b/crates/capi/src/abstract_.rs index 36d949a30..08b4e5400 100644 --- a/crates/capi/src/abstract_.rs +++ b/crates/capi/src/abstract_.rs @@ -1,6 +1,7 @@ +use crate::util::CStrExt; use crate::{PyObject, pystate::with_vm}; use alloc::slice; -use core::ffi::{CStr, c_char, c_int}; +use core::ffi::{c_char, c_int}; pub use iter::*; pub use mapping::*; pub use number::*; @@ -208,9 +209,7 @@ pub unsafe extern "C" fn PyObject_DelItem(obj: *mut PyObject, key: *mut PyObject pub unsafe extern "C" fn PyObject_DelItemString(obj: *mut PyObject, key: *const c_char) -> c_int { with_vm(|vm| { let obj = unsafe { &*obj }; - let key = unsafe { CStr::from_ptr(key) } - .to_str() - .map_err(|_| vm.new_value_error("mapping key must be valid UTF-8"))?; + let key = unsafe { key.try_as_str(vm) }?; obj.del_item(key, vm) }) } diff --git a/crates/capi/src/abstract_/mapping.rs b/crates/capi/src/abstract_/mapping.rs index 6fec18bff..840a9aed6 100644 --- a/crates/capi/src/abstract_/mapping.rs +++ b/crates/capi/src/abstract_/mapping.rs @@ -1,5 +1,6 @@ +use crate::util::CStrExt; use crate::{PyObject, pystate::with_vm}; -use core::ffi::{CStr, c_char, c_int}; +use core::ffi::{c_char, c_int}; use rustpython_vm::AsObject; #[unsafe(no_mangle)] @@ -60,9 +61,7 @@ pub unsafe extern "C" fn PyMapping_GetItemString( ) -> *mut PyObject { with_vm(|vm| { let obj = unsafe { &*obj }; - let key = unsafe { CStr::from_ptr(key) } - .to_str() - .map_err(|_| vm.new_value_error("mapping key must be valid UTF-8"))?; + let key = unsafe { key.try_as_str(vm) }?; obj.get_item(key, vm) }) } @@ -104,9 +103,7 @@ pub unsafe extern "C" fn PyMapping_GetOptionalItemString( *result = core::ptr::null_mut(); } let obj = unsafe { &*obj }; - let key = unsafe { CStr::from_ptr(key) } - .to_str() - .map_err(|_| vm.new_value_error("mapping key must be valid UTF-8"))?; + let key = unsafe { key.try_as_str(vm) }?; match obj.get_item(key, vm) { Ok(value) => { @@ -134,7 +131,7 @@ pub unsafe extern "C" fn PyMapping_HasKey(obj: *mut PyObject, key: *mut PyObject pub unsafe extern "C" fn PyMapping_HasKeyString(obj: *mut PyObject, key: *const c_char) -> c_int { with_vm(|vm| { let obj = unsafe { &*obj }; - if let Ok(key) = unsafe { CStr::from_ptr(key) }.to_str() { + if let Ok(key) = unsafe { key.try_as_str(vm) } { obj.get_item(key, vm).is_ok() } else { false @@ -166,9 +163,7 @@ pub unsafe extern "C" fn PyMapping_HasKeyStringWithError( ) -> c_int { with_vm(|vm| { let obj = unsafe { &*obj }; - let key = unsafe { CStr::from_ptr(key) } - .to_str() - .map_err(|_| vm.new_value_error("mapping key must be valid UTF-8"))?; + let key = unsafe { key.try_as_str(vm) }?; match obj.get_item(key, vm) { Ok(_) => Ok(true), @@ -186,9 +181,7 @@ pub unsafe extern "C" fn PyMapping_SetItemString( ) -> c_int { with_vm(|vm| { let obj = unsafe { &*obj }; - let key = unsafe { CStr::from_ptr(key) } - .to_str() - .map_err(|_| vm.new_value_error("mapping key must be valid UTF-8"))?; + let key = unsafe { key.try_as_str(vm) }?; let value = unsafe { &*value }.to_owned(); obj.set_item(key, value, vm) }) diff --git a/crates/capi/src/codecs.rs b/crates/capi/src/codecs.rs new file mode 100644 index 000000000..8433bf3ba --- /dev/null +++ b/crates/capi/src/codecs.rs @@ -0,0 +1,210 @@ +use crate::util::CStrExt; +use crate::{PyObject, pystate::with_vm}; +use core::ffi::{c_char, c_int}; +use rustpython_vm::{AsObject, VirtualMachine}; + +fn call_codec_error_handler( + vm: &VirtualMachine, + handler_name: &str, + exc: *mut PyObject, +) -> rustpython_vm::PyResult { + vm.state + .codec_registry + .lookup_error(handler_name, vm)? + .call((unsafe { &*exc }.to_owned(),), vm) +} + +fn codec_stream( + vm: &VirtualMachine, + encoding: *const c_char, + stream: *mut PyObject, + errors: *const c_char, + method: &str, +) -> rustpython_vm::PyResult { + let encoding = unsafe { encoding.try_as_str_opt(vm) }?.unwrap_or("utf-8"); + let errors = unsafe { errors.try_as_str_opt(vm) }?.map(|errors| vm.ctx.new_str(errors)); + let stream = unsafe { &*stream }.to_owned(); + let codec = vm.state.codec_registry.lookup(encoding, vm)?; + let args = match errors { + Some(errors) => vec![stream, errors.into()], + None => vec![stream], + }; + vm.call_method(codec.as_tuple().as_object(), method, args) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyCodec_Register(search_function: *mut PyObject) -> c_int { + with_vm(|vm| { + let search_function = unsafe { &*search_function }.to_owned(); + vm.state.codec_registry.register(search_function, vm) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyCodec_Unregister(search_function: *mut PyObject) -> c_int { + with_vm(|vm| { + let search_function = unsafe { &*search_function }.to_owned(); + vm.state.codec_registry.unregister(search_function); + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyCodec_KnownEncoding(encoding: *const c_char) -> c_int { + with_vm(|vm| { + let encoding = unsafe { encoding.try_as_str(vm) }?; + match vm.state.codec_registry.lookup(encoding, vm) { + Ok(_) => Ok(true), + Err(err) if err.fast_isinstance(vm.ctx.exceptions.lookup_error) => Ok(false), + Err(err) => Err(err), + } + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyCodec_Encode( + object: *mut PyObject, + encoding: *const c_char, + errors: *const c_char, +) -> *mut PyObject { + with_vm(|vm| { + let object = unsafe { &*object }.to_owned(); + let encoding = unsafe { encoding.try_as_str_opt(vm) }?.unwrap_or("utf-8"); + let errors = + unsafe { errors.try_as_str_opt(vm) }?.map(|errors| vm.ctx.new_utf8_str(errors)); + vm.state.codec_registry.encode(object, encoding, errors, vm) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyCodec_Decode( + object: *mut PyObject, + encoding: *const c_char, + errors: *const c_char, +) -> *mut PyObject { + with_vm(|vm| { + let object = unsafe { &*object }.to_owned(); + let encoding = unsafe { encoding.try_as_str_opt(vm) }?.unwrap_or("utf-8"); + let errors = + unsafe { errors.try_as_str_opt(vm) }?.map(|errors| vm.ctx.new_utf8_str(errors)); + vm.state.codec_registry.decode(object, encoding, errors, vm) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyCodec_Encoder(encoding: *const c_char) -> *mut PyObject { + with_vm(|vm| { + let encoding = unsafe { encoding.try_as_str(vm) }?; + vm.state + .codec_registry + .lookup(encoding, vm) + .map(|codec| codec.get_encode_func().to_owned()) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyCodec_Decoder(encoding: *const c_char) -> *mut PyObject { + with_vm(|vm| { + let encoding = unsafe { encoding.try_as_str(vm) }?; + vm.state + .codec_registry + .lookup(encoding, vm) + .map(|codec| codec.get_decode_func().to_owned()) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyCodec_IncrementalEncoder( + encoding: *const c_char, + errors: *const c_char, +) -> *mut PyObject { + with_vm(|vm| { + let encoding = unsafe { encoding.try_as_str(vm) }?; + let errors = unsafe { errors.try_as_str_opt(vm) }?.map(|s| vm.ctx.new_str(s)); + let codec = vm.state.codec_registry.lookup(encoding, vm)?; + codec.get_incremental_encoder(errors, vm) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyCodec_IncrementalDecoder( + encoding: *const c_char, + errors: *const c_char, +) -> *mut PyObject { + with_vm(|vm| { + let encoding = unsafe { encoding.try_as_str(vm) }?; + let errors = unsafe { errors.try_as_str_opt(vm) }?.map(|s| vm.ctx.new_str(s)); + let codec = vm.state.codec_registry.lookup(encoding, vm)?; + codec.get_incremental_decoder(errors, vm) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyCodec_StreamReader( + encoding: *const c_char, + stream: *mut PyObject, + errors: *const c_char, +) -> *mut PyObject { + with_vm(|vm| codec_stream(vm, encoding, stream, errors, "streamreader")) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyCodec_StreamWriter( + encoding: *const c_char, + stream: *mut PyObject, + errors: *const c_char, +) -> *mut PyObject { + with_vm(|vm| codec_stream(vm, encoding, stream, errors, "streamwriter")) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyCodec_RegisterError(name: *const c_char, error: *mut PyObject) -> c_int { + with_vm(|vm| { + let name = unsafe { name.try_as_str(vm) }?; + let error = unsafe { &*error }.to_owned(); + if !error.is_callable() { + return Err(vm.new_type_error("handler must be callable")); + } + vm.state + .codec_registry + .register_error(name.to_owned(), error); + Ok(()) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyCodec_LookupError(name: *const c_char) -> *mut PyObject { + with_vm(|vm| { + let name = unsafe { name.try_as_str(vm) }?; + vm.state.codec_registry.lookup_error(name, vm) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyCodec_StrictErrors(exc: *mut PyObject) -> *mut PyObject { + with_vm(|vm| call_codec_error_handler(vm, "strict", exc)) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyCodec_IgnoreErrors(exc: *mut PyObject) -> *mut PyObject { + with_vm(|vm| call_codec_error_handler(vm, "ignore", exc)) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyCodec_ReplaceErrors(exc: *mut PyObject) -> *mut PyObject { + with_vm(|vm| call_codec_error_handler(vm, "replace", exc)) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyCodec_XMLCharRefReplaceErrors(exc: *mut PyObject) -> *mut PyObject { + with_vm(|vm| call_codec_error_handler(vm, "xmlcharrefreplace", exc)) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyCodec_BackslashReplaceErrors(exc: *mut PyObject) -> *mut PyObject { + with_vm(|vm| call_codec_error_handler(vm, "backslashreplace", exc)) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyCodec_NameReplaceErrors(exc: *mut PyObject) -> *mut PyObject { + with_vm(|vm| call_codec_error_handler(vm, "namereplace", exc)) +} diff --git a/crates/capi/src/descrobject.rs b/crates/capi/src/descrobject.rs index ecc0b53f8..863f286e1 100644 --- a/crates/capi/src/descrobject.rs +++ b/crates/capi/src/descrobject.rs @@ -2,7 +2,8 @@ use crate::PyObject; use crate::methodobject::{PyMethodDef, build_method_def}; use crate::object::PyTypeObject; use crate::pystate::with_vm; -use core::ffi::{CStr, c_char, c_int, c_void}; +use crate::util::CStrExt; +use core::ffi::{c_char, c_int, c_void}; use core::ptr::NonNull; use rustpython_vm::builtins::{ DescriptorMemberDef, MemberGetter, MemberKind, MemberSetter, PyDescriptorOwned, PyGetSet, @@ -34,9 +35,7 @@ impl PyGetSetDef { ty: &'static Py<PyType>, vm: &VirtualMachine, ) -> PyResult<PyRef<PyGetSet>> { - let name = unsafe { CStr::from_ptr(self.name) } - .to_str() - .map_err(|_| vm.new_system_error("PyGetSetDef name was not valid UTF-8"))?; + let name = unsafe { self.name.try_as_str(vm) }?; let closure = self.closure as usize; let descriptor = match (self.get, self.set) { @@ -142,9 +141,7 @@ impl PyMemberDef { ty: &Py<PyType>, vm: &VirtualMachine, ) -> PyResult<PyRef<PyMemberDescriptor>> { - let name = unsafe { CStr::from_ptr(self.name) } - .to_str() - .map_err(|_| vm.new_system_error("PyMemberDef name was not valid UTF-8"))?; + let name = unsafe { self.name.try_as_str(vm) }?; let kind = match self.type_code { 6 => MemberKind::Object, 16 => MemberKind::ObjectEx, @@ -165,14 +162,7 @@ impl PyMemberDef { ); } - let doc = NonNull::new(self.doc.cast_mut()) - .map(|doc| { - unsafe { CStr::from_ptr(doc.as_ptr()) } - .to_str() - .map(|s| s.to_owned()) - .map_err(|_| vm.new_system_error("PyMemberDef doc was not valid UTF-8")) - }) - .transpose()?; + let doc = unsafe { self.doc.try_as_str_opt(vm) }?.map(str::to_owned); let descriptor = PyMemberDescriptor { common: PyDescriptorOwned { diff --git a/crates/capi/src/dictobject.rs b/crates/capi/src/dictobject.rs index 6cea9ea34..ed29c6934 100644 --- a/crates/capi/src/dictobject.rs +++ b/crates/capi/src/dictobject.rs @@ -1,7 +1,8 @@ use crate::PyObject; use crate::object::define_py_check; use crate::pystate::with_vm; -use core::ffi::{CStr, c_char, c_int}; +use crate::util::CStrExt; +use core::ffi::{c_char, c_int}; use core::ptr::NonNull; use rustpython_vm::AsObject; use rustpython_vm::PyPayload; @@ -49,9 +50,7 @@ pub unsafe extern "C" fn PyDict_SetItemString( ) -> c_int { with_vm(|vm| { let dict = unsafe { &*dict }.try_downcast_ref::<PyDict>(vm)?; - let key = unsafe { CStr::from_ptr(key) } - .to_str() - .map_err(|_| vm.new_value_error("dictionary key must be valid UTF-8"))?; + let key = unsafe { key.try_as_str(vm) }?; let value = unsafe { &*val }.to_owned(); dict.inner_setitem(key, value, vm) }) @@ -94,9 +93,7 @@ pub unsafe extern "C" fn PyDict_GetItemString( ) -> *mut PyObject { with_vm(|vm| { let dict = unsafe { &*dict }.try_downcast_ref::<PyDict>(vm)?; - let key = unsafe { CStr::from_ptr(key) } - .to_str() - .map_err(|_| vm.new_unicode_decode_error("dictionary key must be valid UTF-8"))?; + let key = unsafe { key.try_as_str(vm) }?; match dict.inner_getitem_opt(key, vm)? { Some(value) => Ok(value.as_object().as_raw().cast_mut()), @@ -116,9 +113,7 @@ pub unsafe extern "C" fn PyDict_GetItemStringRef( *result = core::ptr::null_mut(); } let dict = unsafe { &*dict }.try_downcast_ref::<PyDict>(vm)?; - let key = unsafe { CStr::from_ptr(key) } - .to_str() - .map_err(|_| vm.new_value_error("dictionary key must be valid UTF-8"))?; + let key = unsafe { key.try_as_str(vm) }?; if let Some(value) = dict.inner_getitem_opt(key, vm)? { unsafe { @@ -231,9 +226,7 @@ pub unsafe extern "C" fn PyDict_DelItem(dict: *mut PyObject, key: *mut PyObject) pub unsafe extern "C" fn PyDict_DelItemString(dict: *mut PyObject, key: *const c_char) -> c_int { with_vm(|vm| { let dict = unsafe { &*dict }.try_downcast_ref::<PyDict>(vm)?; - let key = unsafe { CStr::from_ptr(key) } - .to_str() - .map_err(|_| vm.new_value_error("dictionary key must be valid UTF-8"))?; + let key = unsafe { key.try_as_str(vm) }?; dict.del_item(key, vm) }) } diff --git a/crates/capi/src/import.rs b/crates/capi/src/import.rs index c6d5ce85e..3a8dae651 100644 --- a/crates/capi/src/import.rs +++ b/crates/capi/src/import.rs @@ -1,5 +1,6 @@ +use crate::util::CStrExt; use crate::{PyObject, pystate::with_vm}; -use core::ffi::{CStr, c_char}; +use core::ffi::c_char; use rustpython_vm::builtins::{PyCode, PyDict, PyModule, PyStr}; use rustpython_vm::import::import_code_obj; @@ -14,9 +15,7 @@ pub unsafe extern "C" fn PyImport_Import(name: *mut PyObject) -> *mut PyObject { #[unsafe(no_mangle)] pub unsafe extern "C" fn PyImport_AddModuleRef(name: *const c_char) -> *mut PyObject { with_vm(|vm| { - let name = unsafe { CStr::from_ptr(name) } - .to_str() - .map_err(|_| vm.new_system_error("PyImport_AddModuleRef called with non utf8 name"))?; + let name = unsafe { name.try_as_str(vm) }?; let sys_modules = vm .sys_module @@ -46,16 +45,11 @@ pub unsafe extern "C" fn PyImport_ExecCodeModuleEx( pathname: *const c_char, ) -> *mut PyObject { with_vm(|vm| { - let name = unsafe { CStr::from_ptr(name) }.to_str().map_err(|_| { - vm.new_system_error("PyImport_ExecCodeModuleEx called with non utf8 name") - })?; + let name = unsafe { name.try_as_str(vm) }?; let code = unsafe { &*co }.try_downcast_ref::<PyCode>(vm)?; let module = import_code_obj(vm, name, code.to_owned(), false)?; - if !pathname.is_null() { - let pathname = unsafe { CStr::from_ptr(pathname) }.to_str().map_err(|_| { - vm.new_system_error("PyImport_ExecCodeModuleEx called with non utf8 pathname") - })?; + if let Some(pathname) = unsafe { pathname.try_as_str_opt(vm) }? { module.set_attr("__file__", vm.ctx.new_str(pathname), vm)?; } diff --git a/crates/capi/src/lib.rs b/crates/capi/src/lib.rs index 08bb09bf3..374fd3301 100644 --- a/crates/capi/src/lib.rs +++ b/crates/capi/src/lib.rs @@ -13,6 +13,7 @@ pub mod boolobject; pub mod bytearrayobject; pub mod bytesobject; pub mod ceval; +pub mod codecs; pub mod complexobject; pub mod critical_section; pub mod descrobject; diff --git a/crates/capi/src/methodobject.rs b/crates/capi/src/methodobject.rs index b234ba76a..cc3676ef5 100644 --- a/crates/capi/src/methodobject.rs +++ b/crates/capi/src/methodobject.rs @@ -2,7 +2,8 @@ use crate::PyObject; use crate::object::PyTypeObject; use crate::object::define_py_check; use crate::pystate::with_vm; -use core::ffi::{CStr, c_char, c_int}; +use crate::util::CStrExt; +use core::ffi::{c_char, c_int}; use core::ptr::NonNull; use rustpython_vm::function::{FuncArgs, HeapMethodDef, PosArgs, PyMethodFlags}; use rustpython_vm::{AsObject, PyObjectRef, PyRef, PyResult, VirtualMachine}; @@ -46,17 +47,9 @@ pub(crate) fn build_method_def( ml: &PyMethodDef, has_self: bool, ) -> PyResult<PyRef<HeapMethodDef>> { - let name = unsafe { CStr::from_ptr(ml.ml_name) } - .to_str() - .map_err(|_| vm.new_system_error("Method name was not valid UTF-8"))?; + let name = unsafe { ml.ml_name.try_as_str(vm) }?; - let doc = NonNull::new(ml.ml_doc.cast_mut()) - .map(|doc| { - unsafe { CStr::from_ptr(doc.as_ptr()) } - .to_str() - .map_err(|_| vm.new_system_error("Method doc was not valid UTF-8")) - }) - .transpose()?; + let doc = unsafe { ml.ml_doc.try_as_str_opt(vm) }?; let flags = PyMethodFlags::from_bits(ml.ml_flags as u32) .ok_or_else(|| vm.new_system_error("PyMethodDef contains unknown flags"))?; diff --git a/crates/capi/src/object.rs b/crates/capi/src/object.rs index 27417a6ad..eabfbef23 100644 --- a/crates/capi/src/object.rs +++ b/crates/capi/src/object.rs @@ -1,6 +1,7 @@ use crate::PyObject; use crate::pystate::with_vm; -use core::ffi::{CStr, c_char, c_int, c_uint, c_void}; +use crate::util::CStrExt; +use core::ffi::{c_char, c_int, c_uint, c_void}; use core::ptr::NonNull; pub use pytype::*; use rustpython_vm::builtins::{PyStr, object_generic_set_dict, object_get_dict}; @@ -81,11 +82,7 @@ pub unsafe extern "C" fn PyObject_GetAttrString( ) -> *mut PyObject { with_vm(|vm| { let obj = unsafe { &*obj }; - let name = unsafe { - CStr::from_ptr(attr_name) - .to_str() - .map_err(|_| vm.new_value_error("attribute name must be valid UTF-8"))? - }; + let name = unsafe { attr_name.try_as_str(vm) }?; obj.get_attr(name, vm) }) } @@ -134,9 +131,7 @@ pub unsafe extern "C" fn PyObject_GetOptionalAttrString( *result = core::ptr::null_mut(); } let obj = unsafe { &*obj }; - let name = unsafe { CStr::from_ptr(attr_name) } - .to_str() - .map_err(|_| vm.new_value_error("attribute name must be valid UTF-8"))?; + let name = unsafe { attr_name.try_as_str(vm) }?; if let Some(attr) = vm.get_attribute_opt(obj.to_owned(), name)? { unsafe { *result = attr.into_raw().as_ptr(); @@ -156,9 +151,7 @@ pub unsafe extern "C" fn PyObject_SetAttrString( ) -> c_int { with_vm(|vm| { let obj = unsafe { &*obj }; - let name = unsafe { CStr::from_ptr(attr_name) } - .to_str() - .map_err(|_| vm.new_value_error("attribute name must be valid UTF-8"))?; + let name = unsafe { attr_name.try_as_str(vm) }?; let value = unsafe { &*value }.to_owned(); obj.set_attr(name, value, vm) }) @@ -194,9 +187,7 @@ pub unsafe extern "C" fn PyObject_DelAttrString( ) -> c_int { with_vm(|vm| { let obj = unsafe { &*obj }; - let name = unsafe { CStr::from_ptr(attr_name) } - .to_str() - .map_err(|_| vm.new_value_error("attribute name must be valid UTF-8"))?; + let name = unsafe { attr_name.try_as_str(vm) }?; obj.del_attr(name, vm) }) } @@ -259,7 +250,7 @@ pub unsafe extern "C" fn PyObject_HasAttrString( ) -> c_int { with_vm(|vm| { let obj = unsafe { &*obj }; - let Ok(name) = unsafe { CStr::from_ptr(attr_name) }.to_str() else { + let Ok(name) = (unsafe { attr_name.try_as_str(vm) }) else { return false; }; @@ -280,9 +271,7 @@ pub unsafe extern "C" fn PyObject_HasAttrStringWithError( ) -> c_int { with_vm(|vm| { let obj = unsafe { &*obj }; - let name = unsafe { CStr::from_ptr(attr_name) } - .to_str() - .map_err(|_| vm.new_value_error("attribute name must be valid UTF-8"))?; + let name = unsafe { attr_name.try_as_str(vm) }?; obj.has_attr(name, vm) }) } diff --git a/crates/capi/src/pycapsule.rs b/crates/capi/src/pycapsule.rs index a1b5effd8..b36dea3d9 100644 --- a/crates/capi/src/pycapsule.rs +++ b/crates/capi/src/pycapsule.rs @@ -1,5 +1,6 @@ use crate::PyObject; use crate::pystate::with_vm; +use crate::util::CStrExt; use core::ffi::{CStr, c_char, c_int, c_void}; use core::ptr::NonNull; use rustpython_vm::builtins::PyCapsule; @@ -93,9 +94,7 @@ pub unsafe extern "C" fn PyCapsule_IsValid(capsule: *mut PyObject, name: *const #[unsafe(no_mangle)] pub unsafe extern "C" fn PyCapsule_Import(name: *const c_char, _no_block: c_int) -> *mut c_void { with_vm(|vm| { - let capsule_name = unsafe { CStr::from_ptr(name) } - .to_str() - .map_err(|_| vm.new_system_error("capsule name is not valid UTF-8"))?; + let capsule_name = unsafe { name.try_as_str(vm) }?; let (module_name, attrs_path) = capsule_name.split_once('.').ok_or_else(|| { vm.new_import_error( "capsule name is missing attribute path", diff --git a/crates/capi/src/pyerrors.rs b/crates/capi/src/pyerrors.rs index d7efd1a0d..55428ee76 100644 --- a/crates/capi/src/pyerrors.rs +++ b/crates/capi/src/pyerrors.rs @@ -1,7 +1,8 @@ use crate::object::define_py_check; +use crate::util::CStrExt; use crate::{PyObject, pystate::with_vm}; use core::convert::Infallible; -use core::ffi::{CStr, c_char, c_int}; +use core::ffi::{c_char, c_int}; use core::ptr::NonNull; use core::slice; use rustpython_vm::builtins::{PyBaseException, PyTuple, PyType}; @@ -144,10 +145,7 @@ pub unsafe extern "C" fn PyErr_SetObject(exception: *mut PyObject, value: *mut P pub unsafe extern "C" fn PyErr_SetString(exception: *mut PyObject, message: *const c_char) { with_vm::<PyResult<Infallible>, _>(|vm| { let exc_type = unsafe { &*exception }.try_downcast_ref::<PyType>(vm)?; - - let Ok(message) = unsafe { CStr::from_ptr(message) }.to_str() else { - return Err(vm.new_type_error("Exception message is not valid UTF-8")); - }; + let message = unsafe { message.try_as_str(vm) }?; let exc = vm.invoke_exception( exc_type.to_owned(), @@ -210,13 +208,10 @@ pub unsafe extern "C" fn PyErr_NewException( dict: *mut PyObject, ) -> *mut PyObject { with_vm(|vm| { - let (module, name) = unsafe { - CStr::from_ptr(name) - .to_str() - .expect("Exception name is not valid UTF-8") - .rsplit_once('.') - .expect("Exception name must be of the form 'module.ExceptionName'") - }; + let (module, name) = unsafe { name.try_as_str(vm) } + .expect("Exception name is not valid UTF-8") + .rsplit_once('.') + .expect("Exception name must be of the form 'module.ExceptionName'"); let bases = unsafe { base.as_ref() }.map(|bases| { if let Some(ty) = bases.downcast_ref::<PyType>() { @@ -332,12 +327,8 @@ pub unsafe extern "C" fn PyUnicodeDecodeError_Create( reason: *const c_char, ) -> *mut PyObject { with_vm(|vm| { - let encoding = unsafe { CStr::from_ptr(encoding) } - .to_str() - .map_err(|_| vm.new_system_error("encoding must be valid UTF-8"))?; - let reason = unsafe { CStr::from_ptr(reason) } - .to_str() - .map_err(|_| vm.new_system_error("reason must be valid UTF-8"))?; + let encoding = unsafe { encoding.try_as_str(vm) }?; + let reason = unsafe { reason.try_as_str(vm) }?; let length: usize = length .try_into() .map_err(|_| vm.new_system_error("length must be non-negative"))?; diff --git a/crates/capi/src/unicodeobject.rs b/crates/capi/src/unicodeobject.rs index 787e31ea5..1a5e43c0e 100644 --- a/crates/capi/src/unicodeobject.rs +++ b/crates/capi/src/unicodeobject.rs @@ -1,4 +1,5 @@ use crate::object::define_py_check; +use crate::util::CStrExt; use crate::{PyObject, pystate::with_vm}; use core::ffi::{CStr, c_char, c_int}; use core::ptr::NonNull; @@ -70,21 +71,9 @@ pub unsafe extern "C" fn PyUnicode_AsEncodedString( let unicode = unsafe { &*unicode } .try_downcast_ref::<PyStr>(vm)? .to_owned(); - let encoding = if encoding.is_null() { - "utf-8" - } else { - unsafe { CStr::from_ptr(encoding) } - .to_str() - .expect("encoding must be valid UTF-8") - }; - let errors = if errors.is_null() { - None - } else { - let errors = unsafe { CStr::from_ptr(errors) } - .to_str() - .expect("errors must be valid UTF-8"); - Some(vm.ctx.new_utf8_str(errors)) - }; + let encoding = unsafe { encoding.try_as_str_opt(vm) }?.unwrap_or("utf-8"); + let errors = + unsafe { errors.try_as_str_opt(vm) }?.map(|errors| vm.ctx.new_utf8_str(errors)); vm.state .codec_registry .encode_text(unicode, encoding, errors, vm) @@ -177,21 +166,9 @@ pub unsafe extern "C" fn PyUnicode_FromEncodedObject( return Err(vm.new_type_error("decoding str is not supported")); } - let encoding = if encoding.is_null() { - "utf-8" - } else { - unsafe { CStr::from_ptr(encoding) } - .to_str() - .map_err(|_| vm.new_system_error("encoding must be valid UTF-8"))? - }; - let errors = if errors.is_null() { - None - } else { - let errors = unsafe { CStr::from_ptr(errors) } - .to_str() - .map_err(|_| vm.new_system_error("errors must be valid UTF-8"))?; - Some(vm.ctx.new_utf8_str(errors)) - }; + let encoding = unsafe { encoding.try_as_str_opt(vm) }?.unwrap_or("utf-8"); + let errors = + unsafe { errors.try_as_str_opt(vm) }?.map(|errors| vm.ctx.new_utf8_str(errors)); obj.try_bytes_like(vm, |b| { vm.state.codec_registry.decode_text( diff --git a/crates/capi/src/util.rs b/crates/capi/src/util.rs index 6bbda7654..32ff77567 100644 --- a/crates/capi/src/util.rs +++ b/crates/capi/src/util.rs @@ -1,6 +1,7 @@ use crate::PyObject; use core::convert::Infallible; use core::ffi::{CStr, c_char, c_double, c_int, c_long, c_ulong, c_void}; +use core::ptr::NonNull; use rustpython_vm::{Py, PyObjectRef, PyRef, PyResult, VirtualMachine}; pub(crate) trait FfiResult<Output = Self> { @@ -222,6 +223,35 @@ where } } +pub(crate) trait CStrExt<'a> { + unsafe fn try_as_str(self, vm: &VirtualMachine) -> PyResult<&'a str>; + unsafe fn try_as_str_opt(self, vm: &VirtualMachine) -> PyResult<Option<&'a str>>; +} + +impl<'a> CStrExt<'a> for *mut c_char { + unsafe fn try_as_str(self, vm: &VirtualMachine) -> PyResult<&'a str> { + unsafe { self.try_as_str_opt(vm) }? + .ok_or_else(|| vm.new_system_error("argument must not be null")) + } + + unsafe fn try_as_str_opt(self, vm: &VirtualMachine) -> PyResult<Option<&'a str>> { + NonNull::new(self) + .map(|ptr| unsafe { CStr::from_ptr(ptr.as_ptr()) }.to_str()) + .transpose() + .map_err(|_| vm.new_system_error("argument must be valid UTF-8")) + } +} + +impl<'a> CStrExt<'a> for *const c_char { + unsafe fn try_as_str(self, vm: &VirtualMachine) -> PyResult<&'a str> { + unsafe { self.cast_mut().try_as_str(vm) } + } + + unsafe fn try_as_str_opt(self, vm: &VirtualMachine) -> PyResult<Option<&'a str>> { + unsafe { self.cast_mut().try_as_str_opt(vm) } + } +} + #[cfg(test)] mod tests { use super::*; diff --git a/crates/capi/src/warnings.rs b/crates/capi/src/warnings.rs index 4966cd60d..f9ed82b9f 100644 --- a/crates/capi/src/warnings.rs +++ b/crates/capi/src/warnings.rs @@ -1,5 +1,6 @@ +use crate::util::CStrExt; use crate::{PyObject, pystate::with_vm}; -use core::ffi::{CStr, c_char, c_int}; +use core::ffi::{c_char, c_int}; use rustpython_vm::builtins::{PyType, PyTypeRef}; use rustpython_vm::warn::{warn, warn_explicit}; use rustpython_vm::{AsObject, PyResult}; @@ -32,9 +33,7 @@ pub unsafe extern "C" fn PyErr_WarnEx( stack_level: isize, ) -> c_int { with_vm(|vm| { - let message = unsafe { CStr::from_ptr(message) } - .to_str() - .map_err(|_| vm.new_system_error("warning message is not valid UTF-8"))?; + let message = unsafe { message.try_as_str(vm) }?; let category = resolve_warning_category(vm, category)?; @@ -58,17 +57,11 @@ pub unsafe extern "C" fn PyErr_WarnExplicit( registry: *mut PyObject, ) -> c_int { with_vm(|vm| { - let message = unsafe { CStr::from_ptr(message) } - .to_str() - .map_err(|_| vm.new_system_error("warning message is not valid UTF-8"))?; - let filename = unsafe { CStr::from_ptr(filename) } - .to_str() - .map_err(|_| vm.new_system_error("filename is not valid UTF-8"))?; + let message = unsafe { message.try_as_str(vm) }?; + let filename = unsafe { filename.try_as_str(vm) }?; - let module = unsafe { module.as_ref().map(|ptr| CStr::from_ptr(ptr).to_str()) } - .transpose() - .map_err(|_| vm.new_system_error("module is not valid UTF-8"))? - .map(|module| vm.ctx.new_str(module).into()); + let module = + unsafe { module.try_as_str_opt(vm) }?.map(|module| vm.ctx.new_str(module).into()); let category = resolve_warning_category(vm, category)?; From 8c2efa5c80568c8d27c00ac024f332291ce03b18 Mon Sep 17 00:00:00 2001 From: Jeaeun Kim <109906379+kyokuping@users.noreply.github.com> Date: Fri, 17 Jul 2026 11:33:12 +0900 Subject: [PATCH 245/339] Fix frozenset subclass keyword arguments (#8287) Assisted-by: Codex:gpt-5.6 --- Lib/test/test_set.py | 1 - crates/vm/src/builtins/set.rs | 47 ++++++++++++++++++++++++++--------- 2 files changed, 35 insertions(+), 13 deletions(-) diff --git a/Lib/test/test_set.py b/Lib/test/test_set.py index a0b50df8f..4d062b42d 100644 --- a/Lib/test/test_set.py +++ b/Lib/test/test_set.py @@ -828,7 +828,6 @@ class TestFrozenSetSubclass(TestFrozenSet): thetype = FrozenSetSubclass basetype = frozenset - @unittest.expectedFailure # TODO: RUSTPYTHON def test_keywords_in_subclass(self): class subclass(frozenset): pass diff --git a/crates/vm/src/builtins/set.rs b/crates/vm/src/builtins/set.rs index a8f3e83c8..1481bc1b3 100644 --- a/crates/vm/src/builtins/set.rs +++ b/crates/vm/src/builtins/set.rs @@ -958,31 +958,54 @@ impl Constructor for PyFrozenSet { type Args = Vec<PyObjectRef>; fn slot_new(cls: PyTypeRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult { - let iterable: OptionalArg<PyObjectRef> = args.bind(vm)?; + let is_exact_frozenset = cls.is(vm.ctx.types.frozenset_type); + let is_frozenset_init = { + let cls_init = cls.slots.init.load().map(|init| init as usize); + let frozenset_init = vm + .ctx + .types + .frozenset_type + .slots + .init + .load() + .map(|init| init as usize); + cls_init == frozenset_init + }; // Optimizations for exact frozenset type - if cls.is(vm.ctx.types.frozenset_type) { + let iterable_opt = if is_exact_frozenset || is_frozenset_init { + let iterable: OptionalArg<PyObjectRef> = args.bind(vm)?; + // Return exact frozenset as-is - if let OptionalArg::Present(ref input) = iterable - && let Ok(fs) = input.clone().downcast_exact::<Self>(vm) + if is_exact_frozenset + && let OptionalArg::Present(input) = &iterable + && input.class().is(vm.ctx.types.frozenset_type) { - return Ok(fs.into_pyref().into()); + return Ok(input.clone()); } - // Return empty frozenset singleton - if iterable.is_missing() { - return Ok(vm.ctx.empty_frozenset.clone().into()); + iterable.into_option() + } else { + match &args.args[..] { + [] => None, + [iterable] => Some(iterable.clone()), + slice => { + return Err(vm.new_type_error(format!( + "frozenset expected at most 1 argument, got {}", + slice.len() + ))); + } } - } + }; - let elements: Vec<PyObjectRef> = if let OptionalArg::Present(iterable) = iterable { + let elements = if let Some(iterable) = iterable_opt { iterable.try_to_value(vm)? } else { vec![] }; - // Return empty frozenset singleton for exact frozenset types (when iterable was empty) - if elements.is_empty() && cls.is(vm.ctx.types.frozenset_type) { + // Return empty frozenset singleton + if is_exact_frozenset && elements.is_empty() { return Ok(vm.ctx.empty_frozenset.clone().into()); } From f18151bc9081c527b7d9e9f9dfdb20e2d769229d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Jul 2026 11:33:30 +0900 Subject: [PATCH 246/339] Bump ws from 8.18.1 to 8.21.1 in /wasm/demo (#8288) Bumps [ws](https://github.com/websockets/ws) from 8.18.1 to 8.21.1. - [Release notes](https://github.com/websockets/ws/releases) - [Commits](https://github.com/websockets/ws/compare/8.18.1...8.21.1) --- updated-dependencies: - dependency-name: ws dependency-version: 8.21.1 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- wasm/demo/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wasm/demo/package-lock.json b/wasm/demo/package-lock.json index 33be8e601..5f5324b5e 100644 --- a/wasm/demo/package-lock.json +++ b/wasm/demo/package-lock.json @@ -5911,9 +5911,9 @@ } }, "node_modules/ws": { - "version": "8.18.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.1.tgz", - "integrity": "sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w==", + "version": "8.21.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.21.1.tgz", + "integrity": "sha512-+0NTnW77fFN/DjQi6k/Sq/Yvk4Sgajw7urW8V+asjXnRgDs9gyGkdb7EzgfhA4goXsRIZKE28fzIXBHEzhuiWw==", "dev": true, "license": "MIT", "engines": { From ce68869d764245ad3a2bf1a595e2f578717effcd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Jul 2026 11:33:37 +0900 Subject: [PATCH 247/339] Bump websocket-driver from 0.7.4 to 0.7.5 in /wasm/demo (#8289) Bumps [websocket-driver](https://github.com/faye/websocket-driver-node) from 0.7.4 to 0.7.5. - [Changelog](https://github.com/faye/websocket-driver-node/blob/main/CHANGELOG.md) - [Commits](https://github.com/faye/websocket-driver-node/compare/0.7.4...0.7.5) --- updated-dependencies: - dependency-name: websocket-driver dependency-version: 0.7.5 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- wasm/demo/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wasm/demo/package-lock.json b/wasm/demo/package-lock.json index 5f5324b5e..d26170de8 100644 --- a/wasm/demo/package-lock.json +++ b/wasm/demo/package-lock.json @@ -5787,9 +5787,9 @@ } }, "node_modules/websocket-driver": { - "version": "0.7.4", - "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz", - "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==", + "version": "0.7.5", + "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.5.tgz", + "integrity": "sha512-ZL2+3c7kMBdIRCMz6l8jQMHyGVxj+UL+xVk74Ombiciboca8rHa15L86B19E5oh1pL9Ii/uj54gtsIrZGMo6zA==", "dev": true, "license": "Apache-2.0", "dependencies": { From 8ddb805724e885af92fbfd59c1ea690e8d69dffc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Jul 2026 11:33:43 +0900 Subject: [PATCH 248/339] Bump uuid from 1.23.4 to 1.23.5 (#8293) Bumps [uuid](https://github.com/uuid-rs/uuid) from 1.23.4 to 1.23.5. - [Release notes](https://github.com/uuid-rs/uuid/releases) - [Commits](https://github.com/uuid-rs/uuid/compare/v1.23.4...v1.23.5) --- updated-dependencies: - dependency-name: uuid dependency-version: 1.23.5 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 491c5851c..a0284da1d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4595,9 +4595,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.23.4" +version = "1.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf80a72845275afea99e7f2b434723d3bc7e38470fcd1c7ed39a599c73319a53" +checksum = "bf3923a6f5c4c6382e0b653c4117f48d631ea17f38ed86e2a828e6f7412f5239" dependencies = [ "atomic", "js-sys", From d1994e8f3500dc9dbcfc7f5637947c50ab2b387b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Jul 2026 11:33:49 +0900 Subject: [PATCH 249/339] Bump rustls from 0.23.41 to 0.23.42 (#8294) Bumps [rustls](https://github.com/rustls/rustls) from 0.23.41 to 0.23.42. - [Release notes](https://github.com/rustls/rustls/releases) - [Changelog](https://github.com/rustls/rustls/blob/main/CHANGELOG.md) - [Commits](https://github.com/rustls/rustls/compare/v/0.23.41...v/0.23.42) --- updated-dependencies: - dependency-name: rustls dependency-version: 0.23.42 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a0284da1d..ea84f11c3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3248,9 +3248,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.41" +version = "0.23.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b92b125634d9b795e7beca796cc790df15a7fb38323bf3196fda83292d06b1f" +checksum = "3c54fcab019b409d04215d3a17cb438fd7fbf192ee61461f20f4fe18704bc138" dependencies = [ "aws-lc-rs", "once_cell", From 80a7b89495672a003f28be39ce13781851f737e2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Jul 2026 11:33:55 +0900 Subject: [PATCH 250/339] Bump x509-cert from 0.2.5 to 0.3.0 (#8295) Bumps [x509-cert](https://github.com/RustCrypto/formats) from 0.2.5 to 0.3.0. - [Commits](https://github.com/RustCrypto/formats/compare/x509-cert/v0.2.5...x509-cert/v0.3.0) --- updated-dependencies: - dependency-name: x509-cert dependency-version: 0.3.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 187 +++++++++++++---------------------------------------- Cargo.toml | 2 +- 2 files changed, 47 insertions(+), 142 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ea84f11c3..51e915502 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -20,7 +20,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1973cfbc1a2daf9cf550e74e1f088c28e7f7d8c1e1418fb6c9dc5184b7e84c99" dependencies = [ - "crypto-common 0.2.2", + "crypto-common", "inout", ] @@ -32,7 +32,7 @@ checksum = "f1fc76eaeac4c9164506c466d4ffdd8ec9d0c5bf57ee97177c4d8eceb3a0e138" dependencies = [ "cipher", "cpubits", - "cpufeatures 0.3.0", + "cpufeatures", ] [[package]] @@ -379,16 +379,7 @@ version = "0.11.0-rc.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "061f1a09225e328e1ffbb378d2d49923c0ca5fee19fb5ac1cc9c1e9d52b93690" dependencies = [ - "digest 0.11.3", -] - -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", + "digest", ] [[package]] @@ -514,7 +505,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d524456ba66e72eb8b115ff89e01e497f8e6d11d78b70b1aa13c0fbd97540a81" dependencies = [ "cfg-if", - "cpufeatures 0.3.0", + "cpufeatures", "rand_core 0.10.1", ] @@ -564,8 +555,8 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8cf2a2c93cd704877c0858356ed03480ff301ee950b43f1cbe4573b088bfa6c" dependencies = [ - "block-buffer 0.12.1", - "crypto-common 0.2.2", + "block-buffer", + "crypto-common", "inout", ] @@ -686,12 +677,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "const-oid" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" - [[package]] name = "const-oid" version = "0.10.2" @@ -736,15 +721,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "15b85f9c39137c3a891689859392b1bd49812121d0d61c9caf00d46ed5ce06ae" -[[package]] -name = "cpufeatures" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" -dependencies = [ - "libc", -] - [[package]] name = "cpufeatures" version = "0.3.0" @@ -1008,16 +984,6 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" -[[package]] -name = "crypto-common" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" -dependencies = [ - "generic-array", - "typenum", -] - [[package]] name = "crypto-common" version = "0.2.2" @@ -1091,27 +1057,16 @@ dependencies = [ "thiserror", ] -[[package]] -name = "der" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" -dependencies = [ - "const-oid 0.9.6", - "der_derive", - "flagset", - "pem-rfc7468 0.7.0", - "zeroize", -] - [[package]] name = "der" version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a69dedd701da44b0536442edf09c81a64b0ab97a7a4a5e3d1971f00027cbc63d" dependencies = [ - "const-oid 0.10.2", - "pem-rfc7468 1.0.0", + "const-oid", + "der_derive", + "flagset", + "pem-rfc7468", "zeroize", ] @@ -1131,9 +1086,9 @@ dependencies = [ [[package]] name = "der_derive" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8034092389675178f570469e6c3b0465d3d30b4505c294a6550db47f3c17ad18" +checksum = "59600e2c2d636fde9b65e99cc6445ac770c63d3628195ff39932b8d6d7409903" dependencies = [ "proc-macro2", "quote", @@ -1157,25 +1112,15 @@ dependencies = [ "syn", ] -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer 0.10.4", - "crypto-common 0.1.7", -] - [[package]] name = "digest" version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2" dependencies = [ - "block-buffer 0.12.1", - "const-oid 0.10.2", - "crypto-common 0.2.2", + "block-buffer", + "const-oid", + "crypto-common", "ctutils", ] @@ -1425,16 +1370,6 @@ dependencies = [ "slab", ] -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - [[package]] name = "get-size-derive2" version = "0.7.4" @@ -1611,7 +1546,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6303bc9732ae41b04cb554b844a762b4115a61bfaa81e3e83050991eeb56863f" dependencies = [ - "digest 0.11.3", + "digest", ] [[package]] @@ -1989,7 +1924,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e24a010dd405bd7ed803e5253182815b41bf2e6a80cc3bfc066658e03a198aa" dependencies = [ "cfg-if", - "cpufeatures 0.3.0", + "cpufeatures", ] [[package]] @@ -2255,7 +2190,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69b6441f590336821bb897fb28fc622898ccceb1d6cea3fde5ea86b090c4de98" dependencies = [ "cfg-if", - "digest 0.11.3", + "digest", ] [[package]] @@ -2589,19 +2524,10 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "112d82ceb8c5bf524d9af484d4e4970c9fd5a0cc15ba14ad93dccd28873b0629" dependencies = [ - "digest 0.11.3", + "digest", "hmac", ] -[[package]] -name = "pem-rfc7468" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" -dependencies = [ - "base64ct", -] - [[package]] name = "pem-rfc7468" version = "1.0.0" @@ -2707,12 +2633,12 @@ dependencies = [ "aes", "aes-gcm", "cbc", - "der 0.8.1", + "der", "pbkdf2", "rand_core 0.10.1", "scrypt", "sha2", - "spki 0.8.0", + "spki", ] [[package]] @@ -2721,10 +2647,10 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "451913da69c775a56034ea8d9003d27ee8948e12443eae7c038ba100a4f21cb7" dependencies = [ - "der 0.8.1", + "der", "pkcs5", "rand_core 0.10.1", - "spki 0.8.0", + "spki", ] [[package]] @@ -2779,7 +2705,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7dfc63250416fea14f5749b90725916a6c903f599d51cb635aa7a52bfd03eede" dependencies = [ "cpubits", - "cpufeatures 0.3.0", + "cpufeatures", "universal-hash", ] @@ -3652,8 +3578,8 @@ dependencies = [ "crc32fast", "crossbeam-utils", "csv-core", - "der 0.8.1", - "digest 0.11.3", + "der", + "digest", "dyn-clone", "flame", "flate2", @@ -3680,7 +3606,7 @@ dependencies = [ "parking_lot", "paste", "pbkdf2", - "pem-rfc7468 1.0.0", + "pem-rfc7468", "phf 0.14.0", "pkcs8", "pymath", @@ -3701,7 +3627,7 @@ dependencies = [ "rustpython-unicode", "rustpython-vm", "scopeguard", - "sha1 0.11.0", + "sha1", "sha2", "sha3", "shake", @@ -4001,17 +3927,6 @@ dependencies = [ "serde_core", ] -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures 0.2.17", - "digest 0.10.7", -] - [[package]] name = "sha1" version = "0.11.0" @@ -4019,8 +3934,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aacc4cc499359472b4abe1bf11d0b12e688af9a805fa5e3016f9a386dc2d0214" dependencies = [ "cfg-if", - "cpufeatures 0.3.0", - "digest 0.11.3", + "cpufeatures", + "digest", ] [[package]] @@ -4030,8 +3945,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4" dependencies = [ "cfg-if", - "cpufeatures 0.3.0", - "digest 0.11.3", + "cpufeatures", + "digest", ] [[package]] @@ -4040,7 +3955,7 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc9bad02c26382724b2d2692c6f179285e4b54eeecd7968f52a50059c3c11759" dependencies = [ - "digest 0.11.3", + "digest", "keccak", "sponge-cursor", ] @@ -4051,7 +3966,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09057cb2149ad4cbd2da1e26b351f9a4c354219421229c69c3063e6f61947c4a" dependencies = [ - "digest 0.11.3", + "digest", "keccak", "sponge-cursor", ] @@ -4078,11 +3993,11 @@ checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba" [[package]] name = "signature" -version = "2.2.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +checksum = "28d567dcbaf0049cb8ac2608a76cd95ff9e4412e1899d389ee400918ca7537f5" dependencies = [ - "rand_core 0.6.4", + "rand_core 0.10.1", ] [[package]] @@ -4141,16 +4056,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "spki" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" -dependencies = [ - "base64ct", - "der 0.7.10", -] - [[package]] name = "spki" version = "0.8.0" @@ -4158,7 +4063,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d9efca8738c78ee9484207732f728b1ef517bbb1833d6fc0879ca898a522f6f" dependencies = [ "base64ct", - "der 0.8.1", + "der", ] [[package]] @@ -4279,7 +4184,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ "fastrand", - "getrandom 0.3.4", + "getrandom 0.4.3", "once_cell", "rustix", "windows-sys 0.61.2", @@ -4565,7 +4470,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4987bdc12753382e0bec4a65c50738ffaabc998b9cdd1f952fb5f39b0048a96" dependencies = [ - "crypto-common 0.2.2", + "crypto-common", "ctutils", ] @@ -5053,15 +4958,15 @@ checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4" [[package]] name = "x509-cert" -version = "0.2.5" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1301e935010a701ae5f8655edc0ad17c44bad3ac5ce8c39185f75453b720ae94" +checksum = "105ef4642d9cb137ef83d623d0e4bf08b8adf69e9918ca904a174adb6d3d038b" dependencies = [ - "const-oid 0.9.6", - "der 0.7.10", - "sha1 0.10.6", + "const-oid", + "der", + "sha1", "signature", - "spki 0.7.3", + "spki", "tls_codec", ] diff --git a/Cargo.toml b/Cargo.toml index 540324a4a..114b5983d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -320,7 +320,7 @@ wasm-bindgen-futures = "0.4" web-sys = "0.3" webpki-roots = "1.0" which = "8" -x509-cert = "0.2.5" +x509-cert = "0.3.0" x509-parser = "0.18" xml = "1.3" writeable = "0.6" From 125f3ae323af8273df0af005d229cf2aa9c6545b Mon Sep 17 00:00:00 2001 From: Joshua Megnauth <48846352+joshuamegnauth54@users.noreply.github.com> Date: Thu, 16 Jul 2026 22:35:19 -0400 Subject: [PATCH 251/339] host_env: Don't truncate two byte wchar_t (#8296) Casting a u32 to a u16 would truncate the value. It's safer to use Wtf::encode_wide which already handles converting a CodePoint to a u16. I removed vec_into_bytes because it was only used in two places. The function was unsound for T but sound in the way RustPython used it (POD to POD, less strict alignment). AI disclosure: I linted this code with AI. I found this issue by accident while working on another patch in which I introduced a similar mistake. AI caught that mistake, so I linted the original code to cross-check it. I wrote the code myself in both instances. Assisted-by: Codex:gpt-5.4 --- crates/host_env/src/ctypes.rs | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/crates/host_env/src/ctypes.rs b/crates/host_env/src/ctypes.rs index 2dfc8cbe2..bbb3e4afe 100644 --- a/crates/host_env/src/ctypes.rs +++ b/crates/host_env/src/ctypes.rs @@ -440,7 +440,7 @@ pub fn read_pointer_from_buffer(buffer: &[u8]) -> usize { pub const WCHAR_SIZE: usize = core::mem::size_of::<WChar>(); #[inline] -pub fn wchar_from_bytes(bytes: &[u8]) -> Option<u32> { +pub const fn wchar_from_bytes(bytes: &[u8]) -> Option<u32> { if bytes.len() < WCHAR_SIZE { return None; } @@ -524,20 +524,17 @@ pub fn encode_wtf8_to_wchar_padded(s: &Wtf8, size: usize) -> Vec<u8> { } pub fn wchar_null_terminated_bytes(s: &Wtf8) -> Vec<u8> { - let wchars: Vec<WChar> = s - .code_points() - .map(|cp| cp.to_u32() as WChar) - .chain(core::iter::once(0)) - .collect(); - vec_into_bytes(wchars) -} - -pub fn vec_into_bytes<T>(vec: Vec<T>) -> Vec<u8> { - let len = vec.len() * core::mem::size_of::<T>(); - let cap = vec.capacity() * core::mem::size_of::<T>(); - let ptr = vec.as_ptr() as *mut u8; - core::mem::forget(vec); - unsafe { Vec::from_raw_parts(ptr, len, cap) } + if size_of::<WChar>() == 2 { + // We can't cast u32 to WChar because it would truncate the value on platforms where WChar + // is two bytes. Wtf8::encode_wide does all of the hard work for us, so all we have to do + // is split the bytes. + utf16z_bytes(s) + } else { + s.code_points() + .flat_map(|cp| (cp.to_u32() as WChar).to_ne_bytes()) + .chain((0 as WChar).to_ne_bytes()) + .collect() + } } pub enum IntegerValue { @@ -1108,7 +1105,10 @@ pub fn simple_storage_value_to_bytes_endian( } pub fn utf16z_bytes(s: &Wtf8) -> Vec<u8> { - vec_into_bytes::<u16>(s.encode_wide().chain(core::iter::once(0)).collect()) + s.encode_wide() + .flat_map(|cp| cp.to_ne_bytes()) + .chain(0u16.to_ne_bytes()) + .collect() } pub fn null_terminated_bytes(bytes: &[u8]) -> Vec<u8> { From abc35e5f8310c8f63b532a6b80dbbcb8e6edde8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EC=9D=80=EB=B9=88?= <rlaisqls@gmail.com> Date: Fri, 17 Jul 2026 11:51:36 +0900 Subject: [PATCH 252/339] weakref: treat explicit None callback as no callback (#8298) --- Lib/test/test_weakref.py | 1 - crates/vm/src/builtins/weakref.rs | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Lib/test/test_weakref.py b/Lib/test/test_weakref.py index 2e8e679c8..224130110 100644 --- a/Lib/test/test_weakref.py +++ b/Lib/test/test_weakref.py @@ -380,7 +380,6 @@ class ReferencesTestCase(TestBase): # was not honored, and was broken in different ways for # PyWeakref_NewRef() and PyWeakref_NewProxy(). (Two tests.) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_shared_ref_without_callback(self): self.check_shared_without_callback(weakref.ref) diff --git a/crates/vm/src/builtins/weakref.rs b/crates/vm/src/builtins/weakref.rs index 11e216847..9e88ffaa2 100644 --- a/crates/vm/src/builtins/weakref.rs +++ b/crates/vm/src/builtins/weakref.rs @@ -49,7 +49,7 @@ impl Constructor for PyWeak { let referent = positional .next() .ok_or_else(|| vm.new_type_error("__new__ expected at least 1 argument, got 0"))?; - let callback = positional.next(); + let callback = positional.next().filter(|callback| !vm.is_none(callback)); if let Some(_extra) = positional.next() { let got = positional.count() + 3; return Err( From 20cb866c67dd60819a3ea9919422b6d4f1b9972d Mon Sep 17 00:00:00 2001 From: Seonghun An <53287605+shAn-kor@users.noreply.github.com> Date: Sat, 18 Jul 2026 16:39:23 +0900 Subject: [PATCH 253/339] Validate TextIOWrapper chunk size (#8265) * Validate TextIOWrapper chunk size Match CPython for non-positive, oversized, and index-compatible values. Assisted-by: Codex:GPT-5 * Use explicit AssertionError in io snippet Assisted-by: Codex:GPT-5 * Report original type in chunk size overflow Assisted-by: Codex:GPT-5 * Chain io snippet assertion error Assisted-by: Codex:GPT-5 * Match CPython chunk size setter behavior Assisted-by: Codex:GPT-5 * Format io snippet assertion Assisted-by: Codex:GPT-5.6 * Match CPython type name truncation Assisted-by: Codex:GPT-5 * Format non-ASCII chunk size test Assisted-by: Codex:GPT-5 --- crates/vm/src/stdlib/_io.rs | 50 +++++++++---- extra_tests/snippets/stdlib_io.py | 113 ++++++++++++++++++++++++++++++ 2 files changed, 151 insertions(+), 12 deletions(-) diff --git a/crates/vm/src/stdlib/_io.rs b/crates/vm/src/stdlib/_io.rs index 6707a254c..c7bbbaf93 100644 --- a/crates/vm/src/stdlib/_io.rs +++ b/crates/vm/src/stdlib/_io.rs @@ -3206,19 +3206,45 @@ mod _io { } #[pygetset(setter, name = "_CHUNK_SIZE")] - fn set_chunksize( - &self, - chunk_size: PySetterValue<usize>, - vm: &VirtualMachine, - ) -> PyResult<()> { - let mut textio = self.lock(vm)?; - match chunk_size { - PySetterValue::Assign(chunk_size) => textio.chunk_size = chunk_size, - PySetterValue::Delete => Err(vm.new_attribute_error("cannot delete attribute"))?, + fn set_chunksize(&self, value: PySetterValue, vm: &VirtualMachine) -> PyResult<()> { + { + let textio = self.lock(vm)?; + if vm.is_none(&textio.buffer) { + return Err(vm.new_value_error("underlying buffer has been detached")); + } + } + + let chunk_size: isize = match value { + PySetterValue::Assign(object_value) => { + let integer = object_value.try_index(vm)?; + + integer.try_to_primitive::<isize>(vm).map_err(|_| { + let class = object_value.class(); + let type_name = class.name(); + let mut end = type_name.len().min(200); + while !type_name.is_char_boundary(end) { + end -= 1; + } + vm.new_value_error(format!( + "cannot fit '{}' into an index-sized integer", + &type_name[..end] + )) + })? + } + PySetterValue::Delete => { + return Err(vm.new_attribute_error("cannot delete attribute")); + } }; - // TODO: RUSTPYTHON - // Change chunk_size type, validate it manually and throws ValueError if invalid. - // https://github.com/python/cpython/blob/2e9da8e3522764d09f1d6054a2be567e91a30812/Modules/_io/textio.c#L3124-L3143 + + if chunk_size <= 0 { + return Err(vm.new_value_error("a strictly positive integer is required")); + } + + let chunk_size = usize::try_from(chunk_size) + .map_err(|_| vm.new_value_error("a strictly positive integer is required"))?; + + let mut textio = self.lock(vm)?; + textio.chunk_size = chunk_size; Ok(()) } diff --git a/extra_tests/snippets/stdlib_io.py b/extra_tests/snippets/stdlib_io.py index 93c083a90..f17eae5b1 100644 --- a/extra_tests/snippets/stdlib_io.py +++ b/extra_tests/snippets/stdlib_io.py @@ -84,3 +84,116 @@ textio = TextIOWrapper(raw, encoding="utf-8", write_through=True) raw.textio = textio with assert_raises(AttributeError): textio.writelines(["x"]) + +textio = TextIOWrapper(BytesIO()) + +for invalid_chunk_size in (0, -1, 2**100): + try: + textio._CHUNK_SIZE = invalid_chunk_size + except ValueError: + pass + else: + raise AssertionError(f"expected ValueError for {invalid_chunk_size!r}") + +for invalid_chunk_size in (1.5, "4"): + try: + textio._CHUNK_SIZE = invalid_chunk_size + except TypeError: + pass + else: + raise AssertionError(f"expected TypeError for {invalid_chunk_size!r}") + + +class ChunkSize: + def __index__(self): + return 16 + + +textio._CHUNK_SIZE = ChunkSize() +assert textio._CHUNK_SIZE == 16 + + +class OversizedChunkSize: + def __index__(self): + return 2**100 + + +try: + textio._CHUNK_SIZE = OversizedChunkSize() +except ValueError as error: + expected = "cannot fit 'OversizedChunkSize' into an index-sized integer" + if str(error) != expected: + raise AssertionError(f"unexpected error message: {error}") from error +else: + raise AssertionError("expected ValueError for oversized indexable object") + + +def expect_value_error(expected, operation): + try: + operation() + except ValueError as error: + if str(error) != expected: + raise AssertionError(f"unexpected error message: {error}") from error + else: + raise AssertionError(f"expected ValueError: {expected}") + + +class UninitializedChunkSize: + def __init__(self): + self.called = False + + def __index__(self): + self.called = True + return 16 + + +uninitialized_textio = TextIOWrapper.__new__(TextIOWrapper) +uninitialized_chunk_size = UninitializedChunkSize() +expect_value_error( + "I/O operation on uninitialized object", + lambda: setattr(uninitialized_textio, "_CHUNK_SIZE", uninitialized_chunk_size), +) + +if uninitialized_chunk_size.called: + raise AssertionError( + "__index__ should not be called for uninitialized TextIOWrapper" + ) + + +detached_textio = TextIOWrapper(BytesIO()) +detached_textio.detach() +expect_value_error( + "underlying buffer has been detached", + lambda: setattr(detached_textio, "_CHUNK_SIZE", 16), +) +expect_value_error( + "underlying buffer has been detached", + lambda: delattr(detached_textio, "_CHUNK_SIZE"), +) + + +long_type_name = "X" * 250 +LongNamedChunkSize = type( + long_type_name, + (), + {"__index__": lambda self: 2**100}, +) +expect_value_error( + f"cannot fit '{long_type_name[:200]}' into an index-sized integer", + lambda: setattr(textio, "_CHUNK_SIZE", LongNamedChunkSize()), +) + + +non_ascii_type_name = "é" * 250 +NonAsciiNamedChunkSize = type( + non_ascii_type_name, + (), + {"__index__": lambda self: 2**100}, +) +truncated_non_ascii_type_name = non_ascii_type_name.encode("utf-8")[:200].decode( + "utf-8" +) +expect_value_error( + f"cannot fit '{truncated_non_ascii_type_name}' into an index-sized integer", + lambda: setattr(textio, "_CHUNK_SIZE", NonAsciiNamedChunkSize()), +) From b052b16e6aa5ea805a36f3ce429784e0303965cf Mon Sep 17 00:00:00 2001 From: Leesoo Ahn <lsahn@ooseel.net> Date: Sat, 18 Jul 2026 16:42:12 +0900 Subject: [PATCH 254/339] Clean up deprecations (#8300) * vm: replace fetch_update() with try_update() fetch_update() in atomic namespace is in the deprecation stage. * host_env: replace libc::RLIM_NLIMITS with const RLIM_NLIMITS Define a new const, RLIM_NLIMITS instead of libc::RLIM_NLIMITS in order to clean up the deprecated const and to prevent breaking API where the const is still used. --- crates/host_env/src/resource.rs | 6 +++--- crates/vm/src/builtins/function.rs | 2 +- crates/vm/src/builtins/type.rs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crates/host_env/src/resource.rs b/crates/host_env/src/resource.rs index a0ba79b1b..fdf4e1e62 100644 --- a/crates/host_env/src/resource.rs +++ b/crates/host_env/src/resource.rs @@ -7,9 +7,6 @@ pub use libc::{ RLIMIT_NOFILE, RLIMIT_NPROC, RLIMIT_RSS, RLIMIT_STACK, c_long, rlim_t, rlimit, timeval, }; -#[cfg(target_os = "android")] -pub use libc::RLIM_NLIMITS; - #[cfg(any(target_os = "linux", target_os = "android", target_os = "emscripten"))] pub use libc::{RLIMIT_MSGQUEUE, RLIMIT_NICE, RLIMIT_RTPRIO, RLIMIT_SIGPENDING}; @@ -36,6 +33,9 @@ pub use libc::RUSAGE_THREAD; #[cfg(not(any(target_os = "windows", target_os = "redox")))] pub use libc::{RUSAGE_CHILDREN, RUSAGE_SELF}; +#[cfg(target_os = "android")] +pub const RLIM_NLIMITS: libc::c_int = 16; + #[derive(Debug, Clone, Copy)] pub struct RUsage { pub ru_utime: libc::timeval, diff --git a/crates/vm/src/builtins/function.rs b/crates/vm/src/builtins/function.rs index 47fda2994..af359f111 100644 --- a/crates/vm/src/builtins/function.rs +++ b/crates/vm/src/builtins/function.rs @@ -87,7 +87,7 @@ static FUNC_VERSION_COUNTER: AtomicU32 = AtomicU32::new(1); /// Once the counter wraps to 0, it stays at 0 permanently. fn next_func_version() -> u32 { FUNC_VERSION_COUNTER - .fetch_update(Relaxed, Relaxed, |v| (v != 0).then(|| v.wrapping_add(1))) + .try_update(Relaxed, Relaxed, |v| (v != 0).then(|| v.wrapping_add(1))) .unwrap_or(0) } diff --git a/crates/vm/src/builtins/type.rs b/crates/vm/src/builtins/type.rs index 3d9228b80..c27c6475f 100644 --- a/crates/vm/src/builtins/type.rs +++ b/crates/vm/src/builtins/type.rs @@ -680,7 +680,7 @@ impl PyType { let flags_bits = flags.bits(); let _ = self .abc_tpflags - .fetch_update(Ordering::AcqRel, Ordering::Acquire, |old| { + .try_update(Ordering::AcqRel, Ordering::Acquire, |old| { Some((old & !collection_bits) | flags_bits) }); self.modified(); From f74e7256a0b6d4f132e76af6dec52af0fa2f3870 Mon Sep 17 00:00:00 2001 From: OkJa <151524504+name-of-okja@users.noreply.github.com> Date: Sat, 18 Jul 2026 16:46:57 +0900 Subject: [PATCH 255/339] Implement pyexpat ordered_attributes (#8305) When `ordered_attributes` is set, report attributes to the StartElementHandler as a flat `[name, value, ...]` list matching CPython's my_StartElementHandler, instead of always passing a dict. `xml.etree.ElementTree` and `xml.dom.minidom` (via expatbuilder) both enable this flag and rely on the flat-list contract, so parsing any element with attributes previously failed: the dict made `_start` do integer indexing, raising KeyError which was silently swallowed by the handler invoker, leaving the tree empty ("missing toplevel element"). Reference (CPython 3.14): https://github.com/python/cpython/blob/3.14/Modules/pyexpat.c#L439-L443 Remove `@unittest.expectedFailure` from tests that now pass (23 in test_xml_etree, 15 in test_minidom, 1 in test_regrtest). Assisted-by: Claude:claude-opus-4-8 Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com> --- Lib/test/test_minidom.py | 15 --------------- Lib/test/test_regrtest.py | 1 - Lib/test/test_xml_etree.py | 23 ----------------------- crates/stdlib/src/pyexpat.rs | 36 ++++++++++++++++++++++++------------ 4 files changed, 24 insertions(+), 51 deletions(-) diff --git a/Lib/test/test_minidom.py b/Lib/test/test_minidom.py index 5a5404d10..c6b52ce33 100644 --- a/Lib/test/test_minidom.py +++ b/Lib/test/test_minidom.py @@ -553,7 +553,6 @@ class MinidomTest(unittest.TestCase): self.assertEqual(str(node), repr(node)) dom.unlink() - @unittest.expectedFailure # TODO: RUSTPYTHON def testWriteXML(self): str = '<?xml version="1.0" ?><a b="c"/>' dom = parseString(str) @@ -601,7 +600,6 @@ class MinidomTest(unittest.TestCase): 'lflf="&#10;&#10;" ' 'ws="&#9;&#10;&#13; "/>') - @unittest.expectedFailure # TODO: RUSTPYTHON def testAltNewline(self): str = '<?xml version="1.0" ?>\n<a b="c"/>\n' dom = parseString(str) @@ -705,7 +703,6 @@ class MinidomTest(unittest.TestCase): def testAttrListKeysNS(self): pass - @unittest.expectedFailure # TODO: RUSTPYTHON def testRemoveNamedItem(self): doc = parseString("<doc a=''/>") e = doc.documentElement @@ -715,7 +712,6 @@ class MinidomTest(unittest.TestCase): self.assertTrue(a1.isSameNode(a2)) self.assertRaises(xml.dom.NotFoundErr, attrs.removeNamedItem, "a") - @unittest.expectedFailure # TODO: RUSTPYTHON def testRemoveNamedItemNS(self): doc = parseString("<doc xmlns:a='http://xml.python.org/' a:b=''/>") e = doc.documentElement @@ -788,7 +784,6 @@ class MinidomTest(unittest.TestCase): root.setAttribute("added", "VALUE") return dom, clone - @unittest.expectedFailure # TODO: RUSTPYTHON def testCloneElementShallow(self): dom, clone = self._setupCloneElement(0) self.assertEqual(len(clone.childNodes), 0) @@ -940,11 +935,9 @@ class MinidomTest(unittest.TestCase): self.confirm(clone.specified, testName + ": cloned attribute must have specified == True") - @unittest.expectedFailure # TODO: RUSTPYTHON def testCloneAttributeShallow(self): self.check_clone_attribute(0, "testCloneAttributeShallow") - @unittest.expectedFailure # TODO: RUSTPYTHON def testCloneAttributeDeep(self): self.check_clone_attribute(1, "testCloneAttributeDeep") @@ -1336,7 +1329,6 @@ class MinidomTest(unittest.TestCase): self.assertRaises(xml.dom.WrongDocumentErr, doc2.renameNode, node, xml.dom.EMPTY_NAMESPACE, "foo") - @unittest.expectedFailure # TODO: RUSTPYTHON def testRenameAttribute(self): doc = parseString("<doc a='v'/>") elem = doc.documentElement @@ -1541,7 +1533,6 @@ class MinidomTest(unittest.TestCase): self.confirm(text is None and len(elem.childNodes) == 2) - @unittest.expectedFailure # TODO: RUSTPYTHON def testSchemaType(self): doc = parseString( "<!DOCTYPE doc [\n" @@ -1575,7 +1566,6 @@ class MinidomTest(unittest.TestCase): self.confirm(hasattr(t, "name") and t.namespace == xml.dom.EMPTY_NAMESPACE) - @unittest.expectedFailure # TODO: RUSTPYTHON def testSetIdAttribute(self): doc = parseString("<doc a1='v' a2='w'/>") e = doc.documentElement @@ -1607,7 +1597,6 @@ class MinidomTest(unittest.TestCase): self.confirm(e.isSameNode(doc.getElementById("w")) and a2.isId) - @unittest.expectedFailure # TODO: RUSTPYTHON def testSetIdAttributeNS(self): NS1 = "http://xml.python.org/ns1" NS2 = "http://xml.python.org/ns2" @@ -1644,7 +1633,6 @@ class MinidomTest(unittest.TestCase): self.confirm(e.isSameNode(doc.getElementById("w")) and a2.isId) - @unittest.expectedFailure # TODO: RUSTPYTHON def testSetIdAttributeNode(self): NS1 = "http://xml.python.org/ns1" NS2 = "http://xml.python.org/ns2" @@ -1766,7 +1754,6 @@ class MinidomTest(unittest.TestCase): pi = doc.createProcessingInstruction("y", "z") pi.nodeValue = "crash" - @unittest.expectedFailure # TODO: RUSTPYTHON def test_minidom_attribute_order(self): xml_str = '<?xml version="1.0" ?><curriculum status="public" company="example"/>' doc = parseString(xml_str) @@ -1774,13 +1761,11 @@ class MinidomTest(unittest.TestCase): doc.writexml(output) self.assertEqual(output.getvalue(), xml_str) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_toxml_with_attributes_ordered(self): xml_str = '<?xml version="1.0" ?><curriculum status="public" company="example"/>' doc = parseString(xml_str) self.assertEqual(doc.toxml(), xml_str) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_toprettyxml_with_attributes_ordered(self): xml_str = '<?xml version="1.0" ?><curriculum status="public" company="example"/>' doc = parseString(xml_str) diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py index 85db8e14c..cb9ae24cc 100644 --- a/Lib/test/test_regrtest.py +++ b/Lib/test/test_regrtest.py @@ -2355,7 +2355,6 @@ class ArgsTestCase(BaseTestCase): self.check_executed_tests(output, testname, stats=1, parallel=True) self.assertNotIn('SPAM SPAM SPAM', output) - @unittest.expectedFailure # TODO: RUSTPYTHON; TypeError: int() argument must be a string, a bytes-like object or a real number, not 'NoneType' def test_xml(self): code = textwrap.dedent(r""" import unittest diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py index 18a845fe2..2b0777c1d 100644 --- a/Lib/test/test_xml_etree.py +++ b/Lib/test/test_xml_etree.py @@ -392,7 +392,6 @@ class ElementTreeTest(unittest.TestCase): self.serialize_check(ET.XML("<tag><![CDATA[hello]]></tag>"), '<tag>hello</tag>') - @unittest.expectedFailure # TODO: RUSTPYTHON def test_file_init(self): stringfile = io.BytesIO(SAMPLE_XML.encode("utf-8")) tree = ET.ElementTree(file=stringfile) @@ -508,7 +507,6 @@ class ElementTreeTest(unittest.TestCase): elem[:] = tuple([subelem]) self.serialize_check(elem, '<tag><subtag key="value" /></tag>') - @unittest.expectedFailure # TODO: RUSTPYTHON def test_parsefile(self): # Test parsing from file. @@ -688,7 +686,6 @@ class ElementTreeTest(unittest.TestCase): parser2 = ET.XMLParser() self.assertIsInstance(parser2.target, ET.TreeBuilder) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_children(self): # Test Element children iteration @@ -1091,7 +1088,6 @@ class ElementTreeTest(unittest.TestCase): self.assertEqual(str(cm.exception), 'undefined entity &entity;: line 4, column 10') - @unittest.expectedFailure # TODO: RUSTPYTHON def test_namespace(self): # Test namespace issues. @@ -1335,7 +1331,6 @@ class ElementTreeTest(unittest.TestCase): class IterparseTest(unittest.TestCase): # Test iterparse interface. - @unittest.expectedFailure # TODO: RUSTPYTHON def test_basic(self): iterparse = ET.iterparse @@ -1361,7 +1356,6 @@ class IterparseTest(unittest.TestCase): ]) it.close() - @unittest.expectedFailure # TODO: RUSTPYTHON def test_external_file(self): with open(SIMPLE_XMLFILE, 'rb') as source: it = ET.iterparse(source) @@ -1374,7 +1368,6 @@ class IterparseTest(unittest.TestCase): ]) self.assertEqual(it.root.tag, 'root') - @unittest.expectedFailure # TODO: RUSTPYTHON def test_events(self): iterparse = ET.iterparse @@ -1475,7 +1468,6 @@ class IterparseTest(unittest.TestCase): with self.assertRaises(FileNotFoundError): ET.iterparse("nonexistent") - @unittest.expectedFailure # TODO: RUSTPYTHON def test_resource_warnings_not_exhausted(self): # Not exhausting the iterator still closes the underlying file (bpo-43292) it = ET.iterparse(SIMPLE_XMLFILE) @@ -1514,7 +1506,6 @@ class IterparseTest(unittest.TestCase): del it gc_collect() - @unittest.expectedFailure # TODO: RUSTPYTHON def test_close_not_exhausted(self): iterparse = ET.iterparse @@ -2041,7 +2032,6 @@ class XIncludeTest(unittest.TestCase): else: return None - @unittest.expectedFailure # TODO: RUSTPYTHON def test_xinclude_default(self): from xml.etree import ElementInclude doc = self.xinclude_loader('default.xml') @@ -2056,7 +2046,6 @@ class XIncludeTest(unittest.TestCase): '</root>\n' '</document>') - @unittest.expectedFailure # TODO: RUSTPYTHON def test_xinclude(self): from xml.etree import ElementInclude @@ -2121,7 +2110,6 @@ class XIncludeTest(unittest.TestCase): ' </ns0:include>\n' '</div>') # C5 - @unittest.expectedFailure # TODO: RUSTPYTHON def test_xinclude_repeated(self): from xml.etree import ElementInclude @@ -2129,7 +2117,6 @@ class XIncludeTest(unittest.TestCase): ElementInclude.include(document, self.xinclude_loader) self.assertEqual(1+4*2, len(document.findall(".//p"))) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_xinclude_failures(self): from xml.etree import ElementInclude @@ -2234,7 +2221,6 @@ class BugsTest(unittest.TestCase): elem.set("123", 123) check(elem) # attribute value - @unittest.expectedFailure # TODO: RUSTPYTHON def test_bug_xmltoolkit25(self): # typo in ElementTree.findtext @@ -2258,7 +2244,6 @@ class BugsTest(unittest.TestCase): ET.dump(tree) self.assertEqual(stdout.getvalue(), '<doc><table><tbody /></table></doc>\n') - @unittest.expectedFailure # TODO: RUSTPYTHON def test_bug_xmltoolkit39(self): # non-ascii element and attribute names doesn't work @@ -2345,7 +2330,6 @@ class BugsTest(unittest.TestCase): xmltoolkit63() self.assertEqual(sys.getrefcount(None), count) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_bug_200708_newline(self): # Preserve newlines in attributes. @@ -2461,7 +2445,6 @@ class BugsTest(unittest.TestCase): b"<?xml version='1.0' encoding='ascii'?>\n" b'<body>t&#227;g</body>') - @unittest.expectedFailure # TODO: RUSTPYTHON def test_issue6565(self): elem = ET.XML("<body><tag/></body>") self.assertEqual(summarize_list(elem), ['tag']) @@ -2533,7 +2516,6 @@ class BugsTest(unittest.TestCase): root = ET.XML(xml) self.assertEqual(root.get('b'), text.decode('utf-8')) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_expat224_utf8_bug(self): # bpo-31170: Expat 2.2.3 had a bug in its UTF-8 decoder. # Check that Expat 2.2.4 fixed the bug. @@ -3355,7 +3337,6 @@ class ElementTreeTypeTest(unittest.TestCase): class ElementFindTest(unittest.TestCase): - @unittest.expectedFailure # TODO: RUSTPYTHON def test_find_simple(self): e = ET.XML(SAMPLE_XML) self.assertEqual(e.find('tag').tag, 'tag') @@ -3379,7 +3360,6 @@ class ElementFindTest(unittest.TestCase): # Issue #16922 self.assertEqual(ET.XML('<tag><empty /></tag>').findtext('empty'), '') - @unittest.expectedFailure # TODO: RUSTPYTHON def test_find_xpath(self): LINEAR_XML = ''' <body> @@ -3402,7 +3382,6 @@ class ElementFindTest(unittest.TestCase): self.assertRaisesRegex(SyntaxError, 'XPath', e.find, './tag[last()-0]') self.assertRaisesRegex(SyntaxError, 'XPath', e.find, './tag[last()+1]') - @unittest.expectedFailure # TODO: RUSTPYTHON def test_findall(self): e = ET.XML(SAMPLE_XML) e[2] = ET.XML(SAMPLE_SECTION) @@ -3591,7 +3570,6 @@ class ElementFindTest(unittest.TestCase): with self.assertRaisesRegex(SyntaxError, 'cannot use absolute path'): e.findall('/tag') - @unittest.expectedFailure # TODO: RUSTPYTHON def test_find_through_ElementTree(self): e = ET.XML(SAMPLE_XML) self.assertEqual(ET.ElementTree(e).find('tag').tag, 'tag') @@ -4576,7 +4554,6 @@ class NoAcceleratorTest(unittest.TestCase): # -------------------------------------------------------------------- class BoolTest(unittest.TestCase): - @unittest.expectedFailure # TODO: RUSTPYTHON def test_warning(self): e = ET.fromstring('<a style="new"></a>') msg = ( diff --git a/crates/stdlib/src/pyexpat.rs b/crates/stdlib/src/pyexpat.rs index f690abade..9b55bbb22 100644 --- a/crates/stdlib/src/pyexpat.rs +++ b/crates/stdlib/src/pyexpat.rs @@ -43,7 +43,8 @@ macro_rules! create_bool_property { #[pymodule(name = "pyexpat")] mod _pyexpat { use crate::vm::{ - Context, Py, PyObjectRef, PyPayload, PyRef, PyResult, TryFromObject, VirtualMachine, + AsObject, Context, Py, PyObjectRef, PyPayload, PyRef, PyResult, TryFromObject, + VirtualMachine, builtins::{PyBytesRef, PyException, PyModule, PyStr, PyStrRef, PyType, PyUtf8StrRef}, extend_module, function::{ArgBytesLike, ArgPrimitiveIndex, Either, IntoFuncArgs, OptionalArg}, @@ -355,19 +356,30 @@ mod _pyexpat { XmlEvent::StartElement { name, attributes, .. } => { - let dict = vm.ctx.new_dict(); - for attribute in attributes { - let attr_name = self.make_name(&attribute.name); - dict.set_item( - attr_name.as_str(), - vm.ctx.new_str(attribute.value).into(), - vm, - ) - .unwrap(); - } + let ordered = self.ordered_attributes.read().is(&vm.ctx.true_value); + // Build the container. + let attrs: PyObjectRef = if ordered { + let mut items = Vec::with_capacity(attributes.len() * 2); + for attribute in attributes { + items.push(vm.ctx.new_str(self.make_name(&attribute.name)).into()); + items.push(vm.ctx.new_str(attribute.value).into()); + } + vm.ctx.new_list(items).into() + } else { + let dict = vm.ctx.new_dict(); + for attribute in attributes { + dict.set_item( + self.make_name(&attribute.name).as_str(), + vm.ctx.new_str(attribute.value).into(), + vm, + ) + .unwrap(); + } + dict.into() + }; let name_str = PyStr::from(self.make_name(&name)).into_ref(&vm.ctx); - invoke_handler(vm, &self.start_element, (name_str, dict)); + invoke_handler(vm, &self.start_element, (name_str, attrs)); } XmlEvent::EndElement { name, .. } => { let name_str = PyStr::from(self.make_name(&name)).into_ref(&vm.ctx); From 40664b4469e007f467a833464f43f0ba1dbcfd97 Mon Sep 17 00:00:00 2001 From: Bas Schoenmaeckers <7943856+bschoenmaeckers@users.noreply.github.com> Date: Sat, 18 Jul 2026 09:48:32 +0200 Subject: [PATCH 256/339] Update `.idea/vcs.xml` (#8308) --- .idea/vcs.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 9bb3f97be..82bc09117 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -10,4 +10,7 @@ </list> </option> </component> -</project> + <component name="VcsDirectoryMappings"> + <mapping directory="$PROJECT_DIR$" vcs="Git" /> + </component> +</project> \ No newline at end of file From 685445393dab3fcc099e65dfefa7b3aeba4c06bd Mon Sep 17 00:00:00 2001 From: sijun-yang <yangsijun5528@gmail.com> Date: Sat, 18 Jul 2026 16:49:20 +0900 Subject: [PATCH 257/339] Remove obsolete _symtable APIs (#8309) stdlib/_symtable.rs previously provided the public Symbol API. When 7f1fc3602 imported Lib/symtable.py, responsibility for the public Symbol implementation moved to Python, but the native implementation remained. Remove it along with the unused identifiers getter. Assisted-by: Codex:gpt-5.6-sol --- crates/vm/src/stdlib/_symtable.rs | 115 +----------------------------- 1 file changed, 1 insertion(+), 114 deletions(-) diff --git a/crates/vm/src/stdlib/_symtable.rs b/crates/vm/src/stdlib/_symtable.rs index 38d63208d..c4a4a7a20 100644 --- a/crates/vm/src/stdlib/_symtable.rs +++ b/crates/vm/src/stdlib/_symtable.rs @@ -9,9 +9,7 @@ mod _symtable { types::Representable, }; use alloc::fmt; - use rustpython_codegen::symboltable::{ - CompilerScope, Symbol, SymbolFlags, SymbolScope, SymbolTable, - }; + use rustpython_codegen::symboltable::{CompilerScope, SymbolFlags, SymbolScope, SymbolTable}; /// [CPython's `SCOPE_OFFSET`](https://github.com/python/cpython/blob/v3.14.6/Include/internal/pycore_symtable.h#L176) const SCOPE_OFFSET: i32 = 12; @@ -183,15 +181,6 @@ mod _symtable { self as *const Self as *const core::ffi::c_void as usize } - #[pygetset] - fn identifiers(&self, vm: &VirtualMachine) -> Vec<PyObjectRef> { - self.symtable - .symbols - .keys() - .map(|s| vm.ctx.new_str(s.as_str()).into()) - .collect() - } - #[pygetset] fn symbols(&self, vm: &VirtualMachine) -> PyDictRef { let dict = vm.ctx.new_dict(); @@ -220,106 +209,4 @@ mod _symtable { )) } } - - #[pyattr] - #[pyclass(name = "Symbol")] - #[derive(PyPayload)] - struct PySymbol { - symbol: Symbol, - namespaces: Vec<SymbolTable>, - is_top_scope: bool, - } - - impl fmt::Debug for PySymbol { - fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - write!(f, "Symbol()") - } - } - - #[pyclass] - impl PySymbol { - #[pymethod] - fn get_name(&self) -> String { - self.symbol.name.clone() - } - - #[pymethod] - const fn is_global(&self) -> bool { - self.symbol.is_global() || (self.is_top_scope && self.symbol.is_bound()) - } - - #[pymethod] - const fn is_declared_global(&self) -> bool { - matches!(self.symbol.scope, SymbolScope::GlobalExplicit) - } - - #[pymethod] - const fn is_local(&self) -> bool { - self.symbol.is_local() || (self.is_top_scope && self.symbol.is_bound()) - } - - #[pymethod] - const fn is_imported(&self) -> bool { - self.symbol.flags.contains(SymbolFlags::DEF_IMPORT) - } - - #[pymethod] - const fn is_nested(&self) -> bool { - // TODO - false - } - - #[pymethod] - const fn is_nonlocal(&self) -> bool { - self.symbol.flags.contains(SymbolFlags::DEF_NONLOCAL) - } - - #[pymethod] - const fn is_referenced(&self) -> bool { - self.symbol.flags.contains(SymbolFlags::USE) - } - - #[pymethod] - const fn is_assigned(&self) -> bool { - self.symbol.flags.contains(SymbolFlags::DEF_LOCAL) - } - - #[pymethod] - const fn is_parameter(&self) -> bool { - self.symbol.flags.contains(SymbolFlags::DEF_PARAM) - } - - #[pymethod] - const fn is_free(&self) -> bool { - matches!(self.symbol.scope, SymbolScope::Free) - } - - #[pymethod] - const fn is_namespace(&self) -> bool { - !self.namespaces.is_empty() - } - - #[pymethod] - const fn is_annotated(&self) -> bool { - self.symbol.flags.contains(SymbolFlags::DEF_ANNOT) - } - - #[pymethod] - fn get_namespaces(&self, vm: &VirtualMachine) -> Vec<PyObjectRef> { - self.namespaces - .iter() - .map(|table| to_py_symbol_table(table.clone()).into_pyobject(vm)) - .collect() - } - - #[pymethod] - fn get_namespace(&self, vm: &VirtualMachine) -> PyResult { - if self.namespaces.len() != 1 { - return Err(vm.new_value_error("namespace is bound to multiple namespaces")); - } - Ok(to_py_symbol_table(self.namespaces.first().unwrap().clone()) - .into_ref(&vm.ctx) - .into()) - } - } } From d26972e3bcfb1f9dbc8779a3ec07caa6bd94f58e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EC=9D=80=EB=B9=88?= <rlaisqls@gmail.com> Date: Sat, 18 Jul 2026 23:47:03 +0900 Subject: [PATCH 258/339] weakref: reuse proxy objects (#8307) * weakref: reuse callback-less proxy objects like CPython Make PyWeakProxy a #[repr(transparent)] view sharing PyWeak's payload (manual PyPayload with shared PAYLOAD_TYPE_ID + class check), so a proxy is the weakref-list node itself and add()'s reuse applies to it directly. Port CPython's insert_weakref/get_basic_refs slot discipline: genericref at head, generic proxy right after it, with callback/class re-verificationbefore reuse. Constructor moves to a slot_new override since reuse returns an existing object. Drops the hidden __weakproxy marker subclass and the proxy branch in PyWeakref_GetRef. Assisted-by: Claude Code:claude-opus-4-8 * weakref: always validate class in basic-proxy slot lookup * weakref: rustfmt find_generic_proxy_ptr * weakref: unify reuse check shape --- Lib/test/test_weakref.py | 2 - crates/capi/src/weakrefobject.rs | 2 - crates/vm/src/builtins/weakproxy.rs | 71 +++++------- crates/vm/src/object/core.rs | 172 ++++++++++++++++++---------- 4 files changed, 142 insertions(+), 105 deletions(-) diff --git a/Lib/test/test_weakref.py b/Lib/test/test_weakref.py index 224130110..3a3a5a7c3 100644 --- a/Lib/test/test_weakref.py +++ b/Lib/test/test_weakref.py @@ -289,7 +289,6 @@ class ReferencesTestCase(TestBase): self.assertEqual(weakref.getweakrefcount(o), 1, "wrong weak ref count for object after deleting proxy") - @unittest.expectedFailure # TODO: RUSTPYTHON def test_proxy_reuse(self): o = C() proxy1 = weakref.proxy(o) @@ -383,7 +382,6 @@ class ReferencesTestCase(TestBase): def test_shared_ref_without_callback(self): self.check_shared_without_callback(weakref.ref) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_shared_proxy_without_callback(self): self.check_shared_without_callback(weakref.proxy) diff --git a/crates/capi/src/weakrefobject.rs b/crates/capi/src/weakrefobject.rs index de095e5e5..ff4a8bcff 100644 --- a/crates/capi/src/weakrefobject.rs +++ b/crates/capi/src/weakrefobject.rs @@ -20,8 +20,6 @@ pub unsafe extern "C" fn PyWeakref_GetRef( let reference = unsafe { &*reference }; let upgraded = if let Some(weak) = reference.downcast_ref::<PyWeak>() { weak.upgrade() - } else if let Some(proxy) = reference.downcast_ref::<PyWeakProxy>() { - proxy.get_weak().upgrade() } else { return Err(vm.new_type_error("expected a weakref")); }; diff --git a/crates/vm/src/builtins/weakproxy.rs b/crates/vm/src/builtins/weakproxy.rs index 1bdd7721f..35871c07b 100644 --- a/crates/vm/src/builtins/weakproxy.rs +++ b/crates/vm/src/builtins/weakproxy.rs @@ -4,7 +4,7 @@ use crate::{ Context, Py, PyObject, PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine, atomic_func, class::PyClassImpl, common::hash::PyHash, - function::{OptionalArg, PyArithmeticValue, PyComparisonValue, PySetterValue}, + function::{FuncArgs, OptionalArg, PyArithmeticValue, PyComparisonValue, PySetterValue}, protocol::{PyIter, PyIterReturn, PyMappingMethods, PyNumberMethods, PySequenceMethods}, stdlib::builtins::reversed, types::{ @@ -13,13 +13,22 @@ use crate::{ }, }; -#[pyclass(module = false, name = "weakproxy", unhashable = true, traverse)] +#[pyclass(module = false, name = "weakproxy", unhashable = true)] #[derive(Debug)] -pub struct PyWeakProxy { - weak: PyRef<PyWeak>, -} +#[repr(transparent)] +pub struct PyWeakProxy(PyWeak); impl PyPayload for PyWeakProxy { + const PAYLOAD_TYPE_ID: core::any::TypeId = <PyWeak as PyPayload>::PAYLOAD_TYPE_ID; + + #[inline] + unsafe fn validate_downcastable_from(obj: &PyObject) -> bool { + <Self as ::rustpython_vm::class::PyClassDef>::BASICSIZE <= obj.class().slots.basicsize + && obj + .class() + .fast_issubclass(<Self as ::rustpython_vm::class::StaticType>::static_type()) + } + #[inline] fn class(ctx: &Context) -> &'static Py<PyType> { ctx.types.weakproxy_type @@ -37,52 +46,34 @@ pub struct WeakProxyNewArgs { impl Constructor for PyWeakProxy { type Args = WeakProxyNewArgs; - fn py_new( - _cls: &Py<PyType>, - Self::Args { referent, callback }: Self::Args, - vm: &VirtualMachine, - ) -> PyResult<Self> { - let weak = Self::new_weak(referent.as_ref(), callback.into_option(), vm)?; - // TODO: PyWeakProxy should use the same payload as PyWeak - Ok(Self { weak }) + fn slot_new(cls: PyTypeRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult { + let _ = cls; + let Self::Args { referent, callback } = args.bind(vm)?; + let callback = callback + .into_option() + .filter(|callback| !vm.is_none(callback)); + let proxy = Self::new_weakproxy(referent.as_ref(), callback, vm)?; + Ok(proxy.into()) } -} -crate::common::static_cell! { - static WEAK_SUBCLASS: PyTypeRef; + fn py_new(_cls: &Py<PyType>, _args: Self::Args, _vm: &VirtualMachine) -> PyResult<Self> { + unimplemented!("use slot_new") + } } impl PyWeakProxy { - fn new_weak( - referent: &PyObject, - callback: Option<PyObjectRef>, - vm: &VirtualMachine, - ) -> PyResult<PyRef<PyWeak>> { - // using an internal subclass as the class prevents us from getting the generic weakref, - // which would mess up the weakref count - let weak_cls = WEAK_SUBCLASS.get_or_init(|| { - vm.ctx.new_class( - None, - "__weakproxy", - vm.ctx.types.weakref_type.to_owned(), - super::PyWeak::make_slots(), - ) - }); - referent.downgrade_with_typ(callback, weak_cls.clone(), vm) - } - pub fn new_weakproxy( referent: &PyObject, callback: Option<PyObjectRef>, vm: &VirtualMachine, - ) -> PyResult<PyRef<Self>> { - let weak = Self::new_weak(referent, callback, vm)?; - Ok(Self { weak }.into_ref(&vm.ctx)) + ) -> PyResult<PyRef<PyWeak>> { + let typ = vm.ctx.types.weakproxy_type.to_owned(); + referent.downgrade_with_typ(callback, typ, vm) } #[must_use] - pub fn get_weak(&self) -> &PyRef<PyWeak> { - &self.weak + pub fn get_weak(&self) -> &PyWeak { + &self.0 } } @@ -99,7 +90,7 @@ impl PyWeakProxy { ))] impl PyWeakProxy { fn try_upgrade(&self, vm: &VirtualMachine) -> PyResult { - self.weak.upgrade().ok_or_else(|| new_reference_error(vm)) + self.0.upgrade().ok_or_else(|| new_reference_error(vm)) } #[pymethod] diff --git a/crates/vm/src/object/core.rs b/crates/vm/src/object/core.rs index 9fa236b87..228fe1290 100644 --- a/crates/vm/src/object/core.rs +++ b/crates/vm/src/object/core.rs @@ -582,6 +582,18 @@ unsafe fn unlink_weakref(wrl: &WeakRefList, node: NonNull<Py<PyWeak>>) { } } +// try_reuse_basic_ref +unsafe fn try_reuse_weakref(ptr: *mut Py<PyWeak>) -> Option<PyRef<PyWeak>> { + if ptr.is_null() { + return None; + } + let node = unsafe { &*ptr }; + node.0 + .ref_count + .safe_inc() + .then(|| unsafe { PyRef::from_raw(ptr) }) +} + impl WeakRefList { pub(super) fn new() -> Self { Self { @@ -596,22 +608,25 @@ impl WeakRefList { obj: &PyObject, cls: PyTypeRef, cls_is_weakref: bool, + cls_is_weakproxy: bool, callback: Option<PyObjectRef>, dict: Option<PyDictRef>, ) -> PyRef<PyWeak> { let is_generic = cls_is_weakref && callback.is_none(); + let is_generic_proxy = cls_is_weakproxy && callback.is_none(); // Try reuse under lock first (fast path, no allocation) { let _lock = weakref_lock::lock(obj as *const PyObject as usize); - if is_generic { - let generic_ptr = self.generic.load(Ordering::Relaxed); - if !generic_ptr.is_null() { - let generic = unsafe { &*generic_ptr }; - if generic.0.ref_count.safe_inc() { - return unsafe { PyRef::from_raw(generic_ptr) }; - } - } + let existing = if is_generic { + unsafe { try_reuse_weakref(self.generic.load(Ordering::Relaxed)) } + } else if is_generic_proxy { + unsafe { try_reuse_weakref(self.find_generic_proxy_ptr()) } + } else { + None + }; + if let Some(existing) = existing { + return existing; } } @@ -629,66 +644,100 @@ impl WeakRefList { // Re-acquire lock for linked list insertion let _lock = weakref_lock::lock(obj as *const PyObject as usize); - // Re-check: another thread may have inserted a generic ref while we - // were allocating outside the lock. If so, reuse it and drop ours. - if is_generic { - let generic_ptr = self.generic.load(Ordering::Relaxed); - if !generic_ptr.is_null() { - let generic = unsafe { &*generic_ptr }; - if generic.0.ref_count.safe_inc() { - // Nullify wr_object so drop_inner won't unlink an - // un-inserted node (which would corrupt the list head). - weak.wr_object.store(ptr::null_mut(), Ordering::Relaxed); - return unsafe { PyRef::from_raw(generic_ptr) }; - } - } + // Re-check: another thread may have inserted a generic ref/proxy + // while we were allocating outside the lock. If so, reuse it and + // drop ours. + let existing = if is_generic { + unsafe { try_reuse_weakref(self.generic.load(Ordering::Relaxed)) } + } else if is_generic_proxy { + unsafe { try_reuse_weakref(self.find_generic_proxy_ptr()) } + } else { + None + }; + if let Some(existing) = existing { + // Nullify wr_object so drop_inner won't unlink an + // un-inserted node (which would corrupt the list head). + weak.wr_object.store(ptr::null_mut(), Ordering::Relaxed); + return existing; } // Insert into linked list under stripe lock + // (insert_weakref: generic ref at head, generic proxy right after it) let node_ptr = NonNull::from(&*weak); - unsafe { - let mut ptrs = WeakLink::pointers(node_ptr); - if is_generic { - // Generic ref goes to head (insert_head for basic ref) - let old_head = self.head.load(Ordering::Relaxed); - ptrs.as_mut().set_next(NonNull::new(old_head)); - ptrs.as_mut().set_prev(None); - if let Some(old_head) = NonNull::new(old_head) { - WeakLink::pointers(old_head) - .as_mut() - .set_prev(Some(node_ptr)); - } - self.head.store(node_ptr.as_ptr(), Ordering::Relaxed); - self.generic.store(node_ptr.as_ptr(), Ordering::Relaxed); - } else { - // Non-generic refs go after generic ref (insert_after) - let generic_ptr = self.generic.load(Ordering::Relaxed); - if let Some(after) = NonNull::new(generic_ptr) { - let after_next = WeakLink::pointers(after).as_ref().get_next(); - ptrs.as_mut().set_prev(Some(after)); - ptrs.as_mut().set_next(after_next); - WeakLink::pointers(after).as_mut().set_next(Some(node_ptr)); - if let Some(next) = after_next { - WeakLink::pointers(next).as_mut().set_prev(Some(node_ptr)); - } - } else { - // No generic ref; insert at head - let old_head = self.head.load(Ordering::Relaxed); - ptrs.as_mut().set_next(NonNull::new(old_head)); - ptrs.as_mut().set_prev(None); - if let Some(old_head) = NonNull::new(old_head) { - WeakLink::pointers(old_head) - .as_mut() - .set_prev(Some(node_ptr)); - } - self.head.store(node_ptr.as_ptr(), Ordering::Relaxed); - } - } + let after = if is_generic { + None + } else if is_generic_proxy { + NonNull::new(self.generic.load(Ordering::Relaxed)) + } else { + NonNull::new(self.find_generic_proxy_ptr()) + .or_else(|| NonNull::new(self.generic.load(Ordering::Relaxed))) + }; + match after { + Some(after) => unsafe { self.insert_after(after, node_ptr) }, + None => unsafe { self.insert_at_head(node_ptr) }, + } + if is_generic { + self.generic.store(node_ptr.as_ptr(), Ordering::Relaxed); } weak } + unsafe fn insert_at_head(&self, node_ptr: NonNull<Py<PyWeak>>) { + unsafe { + let mut ptrs = WeakLink::pointers(node_ptr); + let old_head = self.head.load(Ordering::Relaxed); + ptrs.as_mut().set_next(NonNull::new(old_head)); + ptrs.as_mut().set_prev(None); + if let Some(old_head) = NonNull::new(old_head) { + WeakLink::pointers(old_head) + .as_mut() + .set_prev(Some(node_ptr)); + } + self.head.store(node_ptr.as_ptr(), Ordering::Relaxed); + } + } + + unsafe fn insert_after(&self, after: NonNull<Py<PyWeak>>, node_ptr: NonNull<Py<PyWeak>>) { + unsafe { + let mut ptrs = WeakLink::pointers(node_ptr); + let after_next = WeakLink::pointers(after).as_ref().get_next(); + ptrs.as_mut().set_prev(Some(after)); + ptrs.as_mut().set_next(after_next); + WeakLink::pointers(after).as_mut().set_next(Some(node_ptr)); + if let Some(next) = after_next { + WeakLink::pointers(next).as_mut().set_prev(Some(node_ptr)); + } + } + } + + // get_basic_refs + fn find_generic_proxy_ptr(&self) -> *mut Py<PyWeak> { + let generic_ptr = self.generic.load(Ordering::Relaxed); + let candidate_ptr = if let Some(generic_node) = NonNull::new(generic_ptr) { + unsafe { WeakLink::pointers(generic_node).as_ref().get_next() } + .map_or(ptr::null_mut(), |n| n.as_ptr()) + } else { + self.head.load(Ordering::Relaxed) + }; + match NonNull::new(candidate_ptr) { + Some(candidate) => { + let node = unsafe { candidate.as_ref() }; + let has_callback = unsafe { (&*node.0.payload.callback.get()).is_some() }; + // PyWeakref_CheckProxy: the basic-proxy slot is reserved for + // the canonical proxy type; subclasses and callback-less ref + // subclasses must not be mistaken for it. + let is_proxy = node.class().is(crate::builtins::PyWeakProxy::static_type()); + if has_callback || !is_proxy { + ptr::null_mut() + } else { + candidate_ptr + } + } + None => ptr::null_mut(), + } + } + /// Clear all weakrefs and call their callbacks. /// Called when the owner object is being dropped. // PyObject_ClearWeakRefs @@ -1445,7 +1494,7 @@ impl PyObject { typ: PyTypeRef, ) -> Option<PyRef<PyWeak>> { self.weak_ref_list() - .map(|wrl| wrl.add(self, typ, true, callback, None)) + .map(|wrl| wrl.add(self, typ, true, false, callback, None)) } pub(crate) fn downgrade_with_typ( @@ -1476,13 +1525,14 @@ impl PyObject { None }; let cls_is_weakref = typ.is(vm.ctx.types.weakref_type); + let cls_is_weakproxy = typ.is(vm.ctx.types.weakproxy_type); let wrl = self.weak_ref_list().ok_or_else(|| { vm.new_type_error(format!( "cannot create weak reference to '{}' object", self.class().name() )) })?; - Ok(wrl.add(self, typ, cls_is_weakref, callback, dict)) + Ok(wrl.add(self, typ, cls_is_weakref, cls_is_weakproxy, callback, dict)) } pub fn downgrade( From 729fdab88eefd32c21acc11b0d5b21d97b99f4d2 Mon Sep 17 00:00:00 2001 From: Leesoo Ahn <lsahn@ooseel.net> Date: Sun, 19 Jul 2026 13:32:46 +0900 Subject: [PATCH 259/339] interpreter: canonicalize when initializing search paths dynamically (#8299) Dual-Root Mismatch in RustPython: Unlike CPython, RustPython manages the standard library in two separate locations in the workspace: - Workspace 'Lib/': Contains the test suite ('Lib/test/...') and standard library files. - crates/pylib/Lib/: A helper directory used for packaging. 'crates/pylib/Lib' is a symlink pointing to the real workspace '../../Lib/'. Runtime Directory Discrepancy: - 'sys.path' contains 'crates/pylib/Lib' (the path to the symlink). - Thus, when 'test.support' is imported, its '__file__' is resolved relative to the symlink: '/opt/RustPython/crates/pylib/Lib/test/support/__init__.py'. - Consequently, 'STDLIB_DIR' resolves to the symlink root: '/opt/RustPython/crates/pylib/Lib'. - However, since 'test_program.py' is executed directly from the workspace, its 'pkg_dir' is: '/opt/RustPython/Lib/test/test_unittest/testmock'. - When 'os.path.relpath(pkg_dir, top_dir)' is called: --- os.path.relpath( "/opt/RustPython/Lib/test/test_unittest/testmock", "/opt/RustPython/crates/pylib/Lib" ) # Result: "../../../Lib/test/test_unittest/testmock" --- Because the relative path starts with '..', the assertion fails. Assisted-by: Gemini --- Lib/test/test_unittest/test_program.py | 1 - src/interpreter.rs | 18 +++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_unittest/test_program.py b/Lib/test/test_unittest/test_program.py index 26808dc00..8ed92373e 100644 --- a/Lib/test/test_unittest/test_program.py +++ b/Lib/test/test_unittest/test_program.py @@ -505,7 +505,6 @@ class TestCommandLineArgs(unittest.TestCase): self.assertEqual(program.testNamePatterns, ['*foo*', '*bar*', '*pat*']) - @unittest.expectedFailureIf(sys.platform != "win32", "TODO: RUSTPYTHON") def testSelectedTestNamesFunctionalTest(self): def run_unittest(args): # Use -E to ignore PYTHONSAFEPATH env var diff --git a/src/interpreter.rs b/src/interpreter.rs index 230192d1e..89e24c25b 100644 --- a/src/interpreter.rs +++ b/src/interpreter.rs @@ -57,7 +57,23 @@ fn setup_dynamic_stdlib(vm: &mut crate::VirtualMachine) { use rustpython_vm::common::rc::PyRc; let state = PyRc::get_mut(&mut vm.state).unwrap(); - let paths = collect_stdlib_paths(); + let paths: Vec<String> = collect_stdlib_paths() + .into_iter() + .map(|p| { + std::fs::canonicalize(&p) + .map(|canonical| { + let s = canonical.to_string_lossy(); + #[cfg(windows)] + { + if let Some(stripped) = s.strip_prefix(r"\\?\") { + return stripped.to_owned(); + } + } + s.into_owned() + }) + .unwrap_or(p) + }) + .collect(); // Set stdlib_dir to the first stdlib path if available if let Some(first_path) = paths.first() { From 267a7dbb75de2420f262230b72507208075d14b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EB=8F=99=EC=95=88?= <ioprt123@gmail.com> Date: Sun, 19 Jul 2026 13:50:13 +0900 Subject: [PATCH 260/339] Store StopIteration.value in a struct field instead of the instance dict (#8301) * Store StopIteration.value in a struct field like SystemExit * Unmark test_pydoc's test_member_descriptor * Use expect instead of unwrap in new_stop_iteration --- Lib/test/test_pydoc/test_pydoc.py | 1 - crates/vm/src/exceptions.rs | 74 ++++++++++++++++++++++++++----- crates/vm/src/vm/vm_new.rs | 12 ++--- 3 files changed, 67 insertions(+), 20 deletions(-) diff --git a/Lib/test/test_pydoc/test_pydoc.py b/Lib/test/test_pydoc/test_pydoc.py index 2a96ef4dd..5c9059614 100644 --- a/Lib/test/test_pydoc/test_pydoc.py +++ b/Lib/test/test_pydoc/test_pydoc.py @@ -1797,7 +1797,6 @@ cm(x) class method of test.test_pydoc.test_pydoc.X self.assertEqual(self._get_summary_line(Exception.args), "args") self.assertEqual(self._get_summary_line(memoryview.obj), "obj") - @unittest.expectedFailure # TODO: RUSTPYTHON @requires_docstrings def test_member_descriptor(self): # Currently these attributes are implemented as member descriptors diff --git a/crates/vm/src/exceptions.rs b/crates/vm/src/exceptions.rs index 1db10274e..f76a2ad62 100644 --- a/crates/vm/src/exceptions.rs +++ b/crates/vm/src/exceptions.rs @@ -965,9 +965,7 @@ impl ExceptionZoo { extend_exception!(PyException, ctx, excs.exception_type); - extend_exception!(PyStopIteration, ctx, excs.stop_iteration, { - "value" => ctx.none(), - }); + extend_exception!(PyStopIteration, ctx, excs.stop_iteration); extend_exception!(PyStopAsyncIteration, ctx, excs.stop_async_iteration); extend_exception!(PyArithmeticError, ctx, excs.arithmetic_error); @@ -1702,18 +1700,57 @@ pub(super) mod types { #[repr(transparent)] pub struct PyException(PyBaseException); - #[pyexception(name, base = PyException, ctx = "stop_iteration")] - #[derive(Debug)] - #[repr(transparent)] - pub struct PyStopIteration(PyException); + #[pyexception(name, base = PyException, ctx = "stop_iteration", traverse = "manual")] + #[repr(C)] + pub struct PyStopIteration { + base: PyException, + value: PyAtomicRef<Option<PyObject>>, + } - #[pyexception(with(Initializer))] - impl PyStopIteration {} + impl crate::class::PySubclass for PyStopIteration { + type Base = PyException; + fn as_base(&self) -> &Self::Base { + &self.base + } + } + + impl core::fmt::Debug for PyStopIteration { + fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { + f.debug_struct("PyStopIteration").finish_non_exhaustive() + } + } + + unsafe impl Traverse for PyStopIteration { + fn traverse(&self, tracer_fn: &mut TraverseFn<'_>) { + self.base.0.traverse(tracer_fn); + if let Some(obj) = self.value.deref() { + tracer_fn(obj); + } + } + } + + impl Constructor for PyStopIteration { + type Args = FuncArgs; + + fn py_new(_cls: &Py<PyType>, args: FuncArgs, vm: &VirtualMachine) -> PyResult<Self> { + let base_exception = PyBaseException::new(args.args, vm); + Ok(Self { + base: PyException(base_exception), + value: None.into(), + }) + } + } impl Initializer for PyStopIteration { type Args = FuncArgs; fn slot_init(zelf: PyObjectRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult<()> { - zelf.set_attr("value", vm.unwrap_or_none(args.args.first().cloned()), vm)?; + let value = match args.args.len() { + 0 => vm.ctx.none(), + _ => args.args[0].clone(), + }; + PyBaseException::slot_init(zelf.clone(), args, vm)?; + let exc: &Py<Self> = zelf.downcast_ref::<Self>().unwrap(); + exc.value.swap_to_temporary_refs(Some(value), vm); Ok(()) } @@ -1722,6 +1759,23 @@ pub(super) mod types { } } + #[pyexception(with(Constructor, Initializer))] + impl PyStopIteration { + #[pygetset] + fn value(&self) -> Option<PyObjectRef> { + self.value.to_owned() + } + + #[pygetset(setter)] + fn set_value(&self, setter_value: PySetterValue, vm: &VirtualMachine) { + let value = match setter_value { + PySetterValue::Assign(v) => Some(v), + PySetterValue::Delete => None, + }; + self.value.swap_to_temporary_refs(value, vm); + } + } + #[pyexception(name, base = PyException, ctx = "stop_async_iteration", impl)] #[derive(Debug)] #[repr(transparent)] diff --git a/crates/vm/src/vm/vm_new.rs b/crates/vm/src/vm/vm_new.rs index ae728aaba..857ecb33c 100644 --- a/crates/vm/src/vm/vm_new.rs +++ b/crates/vm/src/vm/vm_new.rs @@ -894,21 +894,15 @@ impl VirtualMachine { } pub fn new_stop_iteration(&self, value: Option<PyObjectRef>) -> PyBaseExceptionRef { - let dict = self.ctx.new_dict(); + let stop_iteration_error = self.ctx.exceptions.stop_iteration.to_owned(); let args = if let Some(value) = value { - // manually set `value` attribute like StopIteration.__init__ - dict.set_item("value", value.clone(), self) - .expect("dict.__setitem__ never fails"); vec![value] } else { Vec::new() }; + let exc = self.invoke_exception(stop_iteration_error, args); - PyRef::new_ref( - PyBaseException::new(args, self), - self.ctx.exceptions.stop_iteration.to_owned(), - Some(dict), - ) + exc.expect("StopIteration is a BaseException Subclass.") } fn new_downcast_error( From c7005c5d79691a4c87674bcf0ea5cc672d7477ab Mon Sep 17 00:00:00 2001 From: Leesoo Ahn <lsahn@ooseel.net> Date: Sun, 19 Jul 2026 13:51:53 +0900 Subject: [PATCH 261/339] stdlib: remove unused warning on sock_wait() (#8303) The function is used in 'feature = ssl'. However, the current codebase defines it without a conditional compilation expression and always be compiled. This commit removes the unused warning by adding a conditional compilation expression, '#[cfg(feature = "ssl")]'. --- crates/stdlib/src/socket.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/crates/stdlib/src/socket.rs b/crates/stdlib/src/socket.rs index 9cb197ab9..283aa4083 100644 --- a/crates/stdlib/src/socket.rs +++ b/crates/stdlib/src/socket.rs @@ -2444,6 +2444,7 @@ mod _socket { } /// returns Ok(true) on timeout + #[cfg(feature = "ssl")] pub(crate) fn sock_wait( sock: &Socket, wait_kind: SockWaitKind, From a218e4ce99dfda99c7c3e7afaaa124a9c470262b Mon Sep 17 00:00:00 2001 From: Jiseok CHOI <jiseok.dev@gmail.com> Date: Sun, 19 Jul 2026 13:56:02 +0900 Subject: [PATCH 262/339] sqlite3: fix isolation_level TypeError message to match CPython (#8313) Assisted-by: GitHub Copilot:claude-sonnet-4-6 --- Lib/test/test_sqlite3/test_regression.py | 1 - crates/stdlib/src/_sqlite3.rs | 31 +++++++++++++++++------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/Lib/test/test_sqlite3/test_regression.py b/Lib/test/test_sqlite3/test_regression.py index 2f59cf9ba..5560365fd 100644 --- a/Lib/test/test_sqlite3/test_regression.py +++ b/Lib/test/test_sqlite3/test_regression.py @@ -305,7 +305,6 @@ class RegressionTests(MemoryDatabaseMixin, unittest.TestCase): datetime.datetime(2012, 4, 4, 15, 6, 0, 123456), ]) - @unittest.expectedFailure # TODO: RUSTPYTHON; error message mismatch def test_invalid_isolation_level_type(self): # isolation level is a string, not an integer regex = "isolation_level must be str or None" diff --git a/crates/stdlib/src/_sqlite3.rs b/crates/stdlib/src/_sqlite3.rs index cbe9b85c6..f3eea603e 100644 --- a/crates/stdlib/src/_sqlite3.rs +++ b/crates/stdlib/src/_sqlite3.rs @@ -54,7 +54,7 @@ mod _sqlite3 { use rustpython_vm::{ __exports::paste, AsObject, Py, PyAtomicRef, PyObject, PyObjectRef, PyPayload, PyRef, PyResult, - TryFromBorrowedObject, VirtualMachine, atomic_func, + TryFromBorrowedObject, TryFromObject, VirtualMachine, atomic_func, builtins::{ PyBaseException, PyBaseExceptionRef, PyByteArray, PyBytes, PyDict, PyDictRef, PyFloat, PyInt, PyIntRef, PyModule, PySlice, PyStr, PyStrRef, PyTuple, PyTupleRef, PyType, @@ -330,6 +330,19 @@ mod _sqlite3 { } } + struct IsolationLevelArg(Option<PyStrRef>); + + impl TryFromObject for IsolationLevelArg { + fn try_from_object(vm: &VirtualMachine, obj: PyObjectRef) -> PyResult<Self> { + if vm.is_none(&obj) { + return Ok(Self(None)); + } + obj.downcast::<PyStr>() + .map(|s| Self(Some(s))) + .map_err(|_| vm.new_type_error("isolation_level must be str or None".to_owned())) + } + } + #[derive(FromArgs)] struct ConnectArgs { #[pyarg(any)] @@ -338,8 +351,8 @@ mod _sqlite3 { timeout: TimeoutSeconds, #[pyarg(any, default = 0)] detect_types: c_int, - #[pyarg(any, default = Some(vm.ctx.empty_str.to_owned()))] - isolation_level: Option<PyStrRef>, + #[pyarg(any, default = IsolationLevelArg(Some(vm.ctx.empty_str.to_owned())))] + isolation_level: IsolationLevelArg, #[pyarg(any, default = true)] check_same_thread: bool, #[pyarg(any, default = Connection::class(&vm.ctx).to_owned())] @@ -356,7 +369,7 @@ mod _sqlite3 { unsafe impl Traverse for ConnectArgs { fn traverse(&self, tracer_fn: &mut TraverseFn<'_>) { - self.isolation_level.traverse(tracer_fn); + self.isolation_level.0.traverse(tracer_fn); self.factory.traverse(tracer_fn); } } @@ -914,7 +927,7 @@ mod _sqlite3 { db: PyMutex::new(db), initialized: Radium::new(initialized), detect_types: Radium::new(args.detect_types), - isolation_level: PyAtomicRef::from(args.isolation_level), + isolation_level: PyAtomicRef::from(args.isolation_level.0), check_same_thread: Radium::new(args.check_same_thread), thread_ident: PyMutex::new(std::thread::current().id()), row_factory: PyAtomicRef::from(None), @@ -970,7 +983,7 @@ mod _sqlite3 { .store(check_same_thread, Ordering::Relaxed); *zelf.autocommit.lock() = autocommit; *zelf.thread_ident.lock() = std::thread::current().id(); - let _ = unsafe { zelf.isolation_level.swap(isolation_level) }; + let _ = unsafe { zelf.isolation_level.swap(isolation_level.0) }; let mut guard = zelf.db.lock(); *guard = Some(db); @@ -996,7 +1009,7 @@ mod _sqlite3 { let db = Sqlite::from(SqliteRaw::open(path.as_ptr(), args.uri, vm)?); let timeout = (args.timeout.to_secs_f64() * 1000.0) as c_int; db.busy_timeout(timeout); - if let Some(isolation_level) = &args.isolation_level { + if let Some(isolation_level) = &args.isolation_level.0 { begin_statement_ptr_from_isolation_level(isolation_level, vm)?; } Ok(db) @@ -1492,11 +1505,11 @@ mod _sqlite3 { #[pygetset(setter)] fn set_isolation_level( &self, - value: PySetterValue<Option<PyStrRef>>, + value: PySetterValue<IsolationLevelArg>, vm: &VirtualMachine, ) -> PyResult<()> { match value { - PySetterValue::Assign(value) => { + PySetterValue::Assign(IsolationLevelArg(value)) => { if let Some(val_str) = &value { begin_statement_ptr_from_isolation_level(val_str, vm)?; } From 270587e67038e24a03dc9b2f2809b12fb2a18083 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A1=B0=EC=A7=84=EB=AA=85?= <britzegs@gmail.com> Date: Sun, 19 Jul 2026 13:58:32 +0900 Subject: [PATCH 263/339] csv: quote embedded CR/LF under QUOTE_MINIMAL (#8315) * csv: quote embedded CR/LF under QUOTE_MINIMAL with custom lineterminator QUOTE_MINIMAL rows were serialized by csv-core, which only quotes bytes registered for the configured terminator, so fields containing '\r' or '\n' were left unquoted when the lineterminator was not CR/LF (e.g. '!' or '\0'). Route QUOTE_MINIMAL through a hand-written path that uses field_needs_quotes, which always treats '\r'/'\n' as needing quotes. A single empty field is quoted and an empty row emits only the terminator, matching CPython. QUOTE_ALL / QUOTE_NONNUMERIC still use csv-core. Assisted-by: Claude Code:claude-opus-4-8 * csv: unmark now-passing writer tests test_write_iterable and test_write_empty_fields pass with the QUOTE_MINIMAL writer fix (empty rows no longer emit an empty field). Assisted-by: Claude Code:claude-opus-4-8 --- Lib/test/test_csv.py | 2 -- crates/stdlib/src/csv.rs | 50 ++++++++++++++++++++++++++++++ extra_tests/snippets/stdlib_csv.py | 45 +++++++++++++++++++++++++++ 3 files changed, 95 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_csv.py b/Lib/test/test_csv.py index 13b68cc22..3e86af0f8 100644 --- a/Lib/test/test_csv.py +++ b/Lib/test/test_csv.py @@ -276,7 +276,6 @@ class Test_Csv(unittest.TestCase): f'1,2{lineterminator}' f'"\r","\n"{lineterminator}') - @unittest.expectedFailure # TODO: RUSTPYTHON def test_write_iterable(self): self._write_test(iter(['a', 1, 'p,q']), 'a,1,"p,q"') self._write_test(iter(['a', 1, None]), 'a,1,') @@ -319,7 +318,6 @@ class Test_Csv(unittest.TestCase): self.assertEqual(fileobj.read(), 'a\r\n""\r\n') - @unittest.expectedFailure # TODO: RUSTPYTHON def test_write_empty_fields(self): self._write_test((), '') self._write_test([''], '""') diff --git a/crates/stdlib/src/csv.rs b/crates/stdlib/src/csv.rs index 3fbafab8d..cb7cecff4 100644 --- a/crates/stdlib/src/csv.rs +++ b/crates/stdlib/src/csv.rs @@ -1380,6 +1380,55 @@ mod _csv { self.write.call((s,), vm) } + fn writerow_minimal(&self, row: PyObjectRef, vm: &VirtualMachine) -> PyResult { + let _state = self.state.lock(); + + let row: ArgIterable = ArgIterable::try_from_object(vm, row.clone()).map_err(|_e| { + new_csv_error( + vm, + format!("'{}' object is not iterable", row.class().name()), + ) + })?; + + let fields = row.iter(vm)?.collect::<PyResult<Vec<_>>>()?; + let single_field = fields.len() == 1; + let mut output = Vec::new(); + + for (index, field) in fields.into_iter().enumerate() { + if index > 0 { + output.push(self.dialect.delimiter); + } + + let stringified; + let data: &[u8] = match_class!(match field { + ref s @ PyStr => s.as_bytes(), + crate::builtins::PyNone => b"", + ref obj => { + stringified = obj.str(vm)?; + stringified.as_bytes() + } + }); + + // CPython quotes a QUOTE_MINIMAL field if it contains the + // delimiter, the quote character, '\r', '\n', or the line + // terminator, regardless of which line terminator is + // configured. A row with a single empty field is also quoted + // so that it is not read back as an empty line. + if field_needs_quotes(data, self.dialect) || (single_field && data.is_empty()) { + write_quoted_field(&mut output, data, self.dialect, vm)?; + } else { + output.extend_from_slice(data); + } + } + + write_lineterminator(&mut output, self.dialect.lineterminator); + + let s = core::str::from_utf8(&output) + .map_err(|_| vm.new_unicode_decode_error("csv not utf8"))?; + + self.write.call((s,), vm) + } + #[pymethod] fn writerow(&self, row: PyObjectRef, vm: &VirtualMachine) -> PyResult { match self.dialect.quoting { @@ -1387,6 +1436,7 @@ mod _csv { QuoteStyle::Strings | QuoteStyle::Notnull => { return self.writerow_quoted_strings(row, vm); } + QuoteStyle::Minimal => return self.writerow_minimal(row, vm), _ => {} } diff --git a/extra_tests/snippets/stdlib_csv.py b/extra_tests/snippets/stdlib_csv.py index dc2186d17..0664bfd8d 100644 --- a/extra_tests/snippets/stdlib_csv.py +++ b/extra_tests/snippets/stdlib_csv.py @@ -147,3 +147,48 @@ def test_quote_none_reader_skipinitialspace_escapechar(): test_quote_none_reader_skipinitialspace_escapechar() + + +def test_quote_minimal_writer_lineterminator(): + # https://github.com/RustPython/RustPython/issues/8302 + # QUOTE_MINIMAL must quote '\r' and '\n' regardless of the line terminator. + buf = io.StringIO() + writer = csv.writer(buf, lineterminator="!") + writer.writerow(["a", "b"]) + writer.writerow([1, 2]) + writer.writerow(["\r", "\n"]) + assert buf.getvalue() == 'a,b!1,2!"\r","\n"!' + + nul = io.StringIO() + csv.writer(nul, lineterminator="\0").writerow(["\r", "\n"]) + assert nul.getvalue() == '"\r","\n"\0' + + crlf = io.StringIO() + csv.writer(crlf, lineterminator="!").writerow(["\r\n"]) + assert crlf.getvalue() == '"\r\n"!' + + # the terminator character itself still triggers quoting + term = io.StringIO() + csv.writer(term, lineterminator="!").writerow(["a!b", "c"]) + assert term.getvalue() == '"a!b",c!' + + # default terminator behavior is unchanged + default = io.StringIO() + csv.writer(default).writerow(["\r", "\n"]) + assert default.getvalue() == '"\r","\n"\r\n' + + +test_quote_minimal_writer_lineterminator() + + +def test_quote_minimal_writer_empty_fields(): + buf = io.StringIO() + writer = csv.writer(buf) + writer.writerow([""]) + writer.writerow([None]) + writer.writerow([]) + writer.writerow(["", ""]) + assert buf.getvalue() == '""\r\n""\r\n\r\n,\r\n' + + +test_quote_minimal_writer_empty_fields() From 4e365a0b5d8579580a575460185a941b452bdb45 Mon Sep 17 00:00:00 2001 From: Jiwoo Ahn <ikwydls1314@gmail.com> Date: Sun, 19 Jul 2026 14:13:47 +0900 Subject: [PATCH 264/339] wasm: add stderr support (#8318) Assisted-by: Codex:gpt-5.5 Signed-off-by: Jiwoo Ahn <ikwydls1314@gmail.com> --- crates/wasm/Lib/asyncweb.py | 3 +- crates/wasm/README.md | 3 ++ crates/wasm/src/lib.rs | 3 ++ crates/wasm/src/vm_class.rs | 58 +++++++++++++++++++++++--------- crates/wasm/src/wasm_builtins.rs | 15 +++++---- wasm/demo/src/index.js | 1 + wasm/tests/test_exec_mode.py | 14 ++++++++ 7 files changed, 73 insertions(+), 24 deletions(-) diff --git a/crates/wasm/Lib/asyncweb.py b/crates/wasm/Lib/asyncweb.py index 40bd84349..f0e7983f7 100644 --- a/crates/wasm/Lib/asyncweb.py +++ b/crates/wasm/Lib/asyncweb.py @@ -64,8 +64,7 @@ async def _main_wrapper(coro): import traceback import sys - # TODO: sys.stderr on wasm - traceback.print_exc(file=sys.stdout) + traceback.print_exc(file=sys.stderr) def _resolve(prom): diff --git a/crates/wasm/README.md b/crates/wasm/README.md index 3a7550092..1878614be 100644 --- a/crates/wasm/README.md +++ b/crates/wasm/README.md @@ -34,6 +34,9 @@ pyEval(code, options?); - `stdout?`: `"console" | ((out: string) => void) | null`: A function to replace the native print function, and it will be `console.log` when giving `undefined` or "console", and it will be a dumb function when giving null. +- `stderr?`: `"console" | ((out: string) => void) | null`: A function to replace + `sys.stderr`, and it will be `console.error` when giving `undefined` or + "console". ## License diff --git a/crates/wasm/src/lib.rs b/crates/wasm/src/lib.rs index ae4e52f21..041cb864e 100644 --- a/crates/wasm/src/lib.rs +++ b/crates/wasm/src/lib.rs @@ -66,6 +66,7 @@ pub mod eval { }; vm.set_stdout(Reflect::get(&options, &"stdout".into())?)?; + vm.set_stderr(Reflect::get(&options, &"stderr".into())?)?; if let Some(js_vars) = js_vars { vm.add_to_scope("js_vars".into(), js_vars.into())?; @@ -93,6 +94,8 @@ pub mod eval { /// - `stdout?`: `"console" | ((out: string) => void) | null`: A function to replace the /// native print native print function, and it will be `console.log` when giving /// `undefined` or "console", and it will be a dumb function when giving null. + /// - `stderr?`: `"console" | ((out: string) => void) | null`: A function to replace + /// `sys.stderr`, and it will be `console.error` when giving `undefined` or "console". #[wasm_bindgen(js_name = pyEval)] pub fn eval_py(source: &str, options: Option<Object>) -> Result<JsValue, JsValue> { run_py(source, options, Mode::Eval) diff --git a/crates/wasm/src/vm_class.rs b/crates/wasm/src/vm_class.rs index cd0af10f6..5e09af0ee 100644 --- a/crates/wasm/src/vm_class.rs +++ b/crates/wasm/src/vm_class.rs @@ -249,31 +249,59 @@ impl WASMVirtualMachine { #[wasm_bindgen(js_name = setStdout)] pub fn set_stdout(&self, stdout: JsValue) -> Result<(), JsValue> { + self.set_stdstream( + "stdout", + "JSStdout", + stdout, + wasm_builtins::sys_stdout_write_console, + ) + } + + #[wasm_bindgen(js_name = setStderr)] + pub fn set_stderr(&self, stderr: JsValue) -> Result<(), JsValue> { + self.set_stdstream( + "stderr", + "JSStderr", + stderr, + wasm_builtins::sys_stderr_write_console, + ) + } + + fn set_stdstream( + &self, + attr: &'static str, + class_name: &'static str, + stream: JsValue, + console_write: fn(&str, &VirtualMachine) -> PyResult<()>, + ) -> Result<(), JsValue> { self.with_vm(|vm, _| { - fn error() -> JsValue { - TypeError::new("Unknown stdout option, please pass a function or 'console'").into() + fn error(attr: &str) -> JsValue { + TypeError::new(&format!( + "Unknown {attr} option, please pass a function or 'console'" + )) + .into() } - use wasm_builtins::make_stdout_object; - let stdout: PyObjectRef = if let Some(s) = stdout.as_string() { + use wasm_builtins::make_stdstream_object; + let stream: PyObjectRef = if let Some(s) = stream.as_string() { match s.as_str() { - "console" => make_stdout_object(vm, wasm_builtins::sys_stdout_write_console), - _ => return Err(error()), + "console" => make_stdstream_object(vm, class_name, console_write), + _ => return Err(error(attr)), } - } else if stdout.is_function() { - let func = js_sys::Function::from(stdout); - make_stdout_object(vm, move |data, vm| { + } else if stream.is_function() { + let func = js_sys::Function::from(stream); + make_stdstream_object(vm, class_name, move |data, vm| { func.call1(&JsValue::UNDEFINED, &data.into()) .map_err(|err| convert::js_py_typeerror(vm, err))?; Ok(()) }) - } else if stdout.is_null() { - make_stdout_object(vm, |_, _| Ok(())) - } else if stdout.is_undefined() { - make_stdout_object(vm, wasm_builtins::sys_stdout_write_console) + } else if stream.is_null() { + make_stdstream_object(vm, class_name, |_, _| Ok(())) + } else if stream.is_undefined() { + make_stdstream_object(vm, class_name, console_write) } else { - return Err(error()); + return Err(error(attr)); }; - vm.sys_module.set_attr("stdout", stdout, vm).unwrap(); + vm.sys_module.set_attr(attr, stream, vm).unwrap(); Ok(()) })? } diff --git a/crates/wasm/src/wasm_builtins.rs b/crates/wasm/src/wasm_builtins.rs index efbc03c39..ae2ffa63d 100644 --- a/crates/wasm/src/wasm_builtins.rs +++ b/crates/wasm/src/wasm_builtins.rs @@ -16,19 +16,20 @@ pub fn sys_stdout_write_console(data: &str, _vm: &VirtualMachine) -> PyResult<() Ok(()) } -pub fn make_stdout_object( +pub fn sys_stderr_write_console(data: &str, _vm: &VirtualMachine) -> PyResult<()> { + console::error_1(&data.into()); + Ok(()) +} + +pub fn make_stdstream_object( vm: &VirtualMachine, + name: &'static str, write_f: impl Fn(&str, &VirtualMachine) -> PyResult<()> + 'static, ) -> PyObjectRef { let ctx = &vm.ctx; // there's not really any point to storing this class so that there's a consistent type object, // we just want a half-decent repr() output - let cls = PyRef::leak(py_class!( - ctx, - "JSStdout", - vm.ctx.types.object_type.to_owned(), - {} - )); + let cls = PyRef::leak(py_class!(ctx, name, vm.ctx.types.object_type.to_owned(), {})); let write_method = vm.new_method( "write", cls, diff --git a/wasm/demo/src/index.js b/wasm/demo/src/index.js index 0b568fa1d..aeab8e716 100644 --- a/wasm/demo/src/index.js +++ b/wasm/demo/src/index.js @@ -159,6 +159,7 @@ function onReady() { terminalVM = rp.vmStore.init('term_vm'); terminalVM.setStdout((data) => readline.print(data)); + terminalVM.setStderr((data) => readline.print(data)); readPrompts().catch((err) => console.error(err)); // so that the test knows that we're ready diff --git a/wasm/tests/test_exec_mode.py b/wasm/tests/test_exec_mode.py index a2a55846f..28a0cea7c 100644 --- a/wasm/tests/test_exec_mode.py +++ b/wasm/tests/test_exec_mode.py @@ -19,3 +19,17 @@ def test_exec_single_mode(wdriver): """ ) assert stdout == "2\n4\n" + + +def test_exec_stderr_option(wdriver): + stderr = wdriver.execute_script( + """ + let output = ""; + save_output = function(text) { + output += text + }; + window.rp.pyExec('import sys; print("err", file=sys.stderr)', {stderr: save_output}); + return output; + """ + ) + assert stderr == "err\n" From c7d265e8dd1d6d36153d73152a370a6fe89ba63a Mon Sep 17 00:00:00 2001 From: "Jeong, YunWon" <69878+youknowone@users.noreply.github.com> Date: Mon, 20 Jul 2026 15:21:42 +0900 Subject: [PATCH 265/339] ctypes: fix Windows pip truststore (#8314) * ctypes: preserve result when errcheck returns args * ctypes: cover Windows pip truststore * capi: implement PyEval_SaveThread * capi: merge saved thread state into PyThreadState --- .github/workflows/ci.yaml | 12 +++++- crates/capi/src/pystate.rs | 40 ++++++++++++----- crates/stdlib/src/overlapped.rs | 3 +- crates/vm/src/stdlib/_ctypes/array.rs | 16 +++++++ crates/vm/src/stdlib/_ctypes/function.rs | 6 ++- crates/vm/src/vm/thread.rs | 55 ++++++++++++++++++++++++ extra_tests/snippets/stdlib_ctypes.py | 31 ++++++++++++- 7 files changed, 147 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1125c178b..d03735192 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -438,6 +438,17 @@ jobs: target/release/rustpython -m ensurepip target/release/rustpython -c "import pip" + - if: runner.os == 'Windows' + name: Check pip HTTPS with the Windows trust store + run: >- + target/release/rustpython -m pip download + --disable-pip-version-check + --no-cache-dir + --no-deps + --only-binary=:all: + --dest "$env:RUNNER_TEMP\rustpython-pip-smoke" + six + - if: runner.os != 'Windows' name: Check if pip inside venv is functional run: | @@ -829,4 +840,3 @@ jobs: - name: cargo doc run: cargo doc --locked - diff --git a/crates/capi/src/pystate.rs b/crates/capi/src/pystate.rs index 1a2f66de9..173c26088 100644 --- a/crates/capi/src/pystate.rs +++ b/crates/capi/src/pystate.rs @@ -2,9 +2,9 @@ use crate::get_main_interpreter; use crate::pylifecycle::request_vm_from_interpreter; use crate::util::FfiResult; use core::ffi::c_int; -use core::ptr; use rustpython_vm::vm::thread::{ - CurrentVmAttachState, attach_current_thread, release_current_thread, with_current_vm, + CurrentVmAttachState, SavedThreadState, attach_current_thread, release_current_thread, + restore_current_thread, save_current_thread, with_current_vm, }; use rustpython_vm::{Interpreter, VirtualMachine}; @@ -22,6 +22,7 @@ pub type PyInterpreterState = Interpreter; #[repr(C)] pub struct PyThreadState { pub interp: *mut PyInterpreterState, + vm: SavedThreadState, } /// Make sure this thread has a running vm attached. This only creates a new vm if we don't already @@ -47,11 +48,22 @@ pub extern "C" fn PyGILState_Release(state: PyGILState_STATE) { #[unsafe(no_mangle)] pub extern "C" fn PyEval_SaveThread() -> *mut PyThreadState { - ptr::null_mut() + let interp = PyInterpreterState_Get(); + let state = Box::new(PyThreadState { + interp, + vm: save_current_thread(), + }); + Box::into_raw(state) } #[unsafe(no_mangle)] -pub extern "C" fn PyEval_RestoreThread(_state: *mut PyThreadState) {} +pub unsafe extern "C" fn PyEval_RestoreThread(state: *mut PyThreadState) { + assert!(!state.is_null(), "PyEval_RestoreThread called with null"); + // SAFETY: PyEval_SaveThread returns this allocation and CPython's API + // requires callers to restore exactly that thread state once. + let state = unsafe { Box::from_raw(state) }; + restore_current_thread(state.vm); +} #[unsafe(no_mangle)] pub extern "C" fn PyInterpreterState_Get() -> *mut PyInterpreterState { @@ -81,7 +93,7 @@ mod tests { #[test] fn new_thread() { - Python::attach(|_py| { + Python::attach(|py| { with_current_vm(|_vm| { assert!( current_vm_is_set(), @@ -89,18 +101,24 @@ mod tests { ) }); - std::thread::spawn(move || { + let handle = std::thread::spawn(move || { Python::attach(|_py| { - with_current_vm(|_vm| { + with_current_vm(|vm| { assert!( current_vm_is_set(), "This thread did not have a vm attached" - ) + ); + vm.state.stop_the_world.stop_the_world(vm); + vm.state.stop_the_world.start_the_world(vm); }); }); - }) - .join() - .unwrap(); + }); + + py.detach(|| { + assert!(!current_vm_is_set()); + handle.join().unwrap(); + }); + assert!(current_vm_is_set()); }) } diff --git a/crates/stdlib/src/overlapped.rs b/crates/stdlib/src/overlapped.rs index 8610fadb3..86ac24e3a 100644 --- a/crates/stdlib/src/overlapped.rs +++ b/crates/stdlib/src/overlapped.rs @@ -1163,7 +1163,8 @@ mod _overlapped { #[pyfunction] fn GetQueuedCompletionStatus(port: isize, msecs: u32, vm: &VirtualMachine) -> PyResult { - match host_overlapped::get_queued_completion_status(port, msecs) + match vm + .allow_threads(|| host_overlapped::get_queued_completion_status(port, msecs)) .map_err(|err| set_from_windows_err(err.raw_os_error().unwrap_or(0) as u32, vm))? { host_overlapped::WaitResult::Timeout => Ok(vm.ctx.none()), diff --git a/crates/vm/src/stdlib/_ctypes/array.rs b/crates/vm/src/stdlib/_ctypes/array.rs index f7abc8345..a99fabc81 100644 --- a/crates/vm/src/stdlib/_ctypes/array.rs +++ b/crates/vm/src/stdlib/_ctypes/array.rs @@ -641,6 +641,14 @@ impl PyCArray { let (kept_alive, ptr) = super::base::ensure_z_null_terminated(bytes, vm); zelf.0.keep_alive(index, kept_alive); (ptr, Some(value.to_owned())) + } else if let Some(simple) = value.downcast_ref::<super::PyCSimple>() + && value.class().type_code(vm).as_deref() == Some("z") + { + let buffer = simple.0.buffer.read(); + ( + rustpython_host_env::ctypes::read_pointer_from_buffer(&buffer), + None, + ) } else if let Ok(int_val) = value.try_index(vm) { (int_val.as_bigint().to_usize().unwrap_or(0), None) } else { @@ -667,6 +675,14 @@ impl PyCArray { } else if let Some(s) = value.downcast_ref::<PyStr>() { let (holder, ptr) = super::base::str_to_wchar_bytes(s.as_wtf8(), vm); (ptr, Some(holder)) + } else if let Some(simple) = value.downcast_ref::<super::PyCSimple>() + && value.class().type_code(vm).as_deref() == Some("Z") + { + let buffer = simple.0.buffer.read(); + ( + rustpython_host_env::ctypes::read_pointer_from_buffer(&buffer), + None, + ) } else if let Ok(int_val) = value.try_index(vm) { (int_val.as_bigint().to_usize().unwrap_or(0), None) } else { diff --git a/crates/vm/src/stdlib/_ctypes/function.rs b/crates/vm/src/stdlib/_ctypes/function.rs index ebda71719..cf6551916 100644 --- a/crates/vm/src/stdlib/_ctypes/function.rs +++ b/crates/vm/src/stdlib/_ctypes/function.rs @@ -1554,7 +1554,11 @@ fn build_result( let args_tuple = PyTuple::new_ref(args.args.clone(), &vm.ctx); let func_obj = zelf.as_object().to_owned(); let result_obj = result.clone().unwrap_or_else(|| vm.ctx.none()); - result = Some(errcheck.call((result_obj, func_obj, args_tuple), vm)?); + let checked = errcheck.call((result_obj, func_obj, args_tuple.clone()), vm)?; + // Returning the original args tuple requests normal result processing. + if !checked.is(&args_tuple) { + result = Some(checked); + } } // Handle OUT parameter return values diff --git a/crates/vm/src/vm/thread.rs b/crates/vm/src/vm/thread.rs index 5009cb695..9948b936f 100644 --- a/crates/vm/src/vm/thread.rs +++ b/crates/vm/src/vm/thread.rs @@ -224,6 +224,61 @@ pub enum CurrentVmAttachState { Attached, } +/// State preserved while the current native thread is detached from its VM. +#[cfg(feature = "threading")] +pub struct SavedThreadState { + vm_stack: Vec<NonNull<VirtualMachine>>, + gilstate_vm: Option<Box<ThreadedVirtualMachine>>, +} + +/// Detach the current native thread and preserve its VM context for restoration. +#[cfg(feature = "threading")] +#[must_use = "the saved thread state must be restored"] +pub fn save_current_thread() -> SavedThreadState { + let vm_stack = VM_STACK.with(|vms| core::mem::take(&mut *vms.borrow_mut())); + assert!( + !vm_stack.is_empty(), + "save_current_thread() called without an attached VM" + ); + let gilstate_vm = GILSTATE_VM.with(|gilstate_vm| gilstate_vm.borrow_mut().take()); + detach_thread(); + SavedThreadState { + vm_stack, + gilstate_vm, + } +} + +/// Restore a VM context previously returned by [`save_current_thread`]. +#[cfg(feature = "threading")] +pub fn restore_current_thread(state: SavedThreadState) { + assert!( + !current_vm_is_set(), + "restore_current_thread() called with an attached VM" + ); + let SavedThreadState { + vm_stack, + gilstate_vm, + } = state; + let vm = vm_stack + .last() + .copied() + .expect("saved thread state has no VM"); + + GILSTATE_VM.with(|current| { + let mut current = current.borrow_mut(); + assert!( + current.is_none(), + "restore_current_thread() called with a GILState VM" + ); + *current = gilstate_vm; + }); + + // SAFETY: borrowed VMs remain alive for the dynamic save/restore scope, + // while an owned GILState VM was restored above before this dereference. + attach_thread(unsafe { vm.as_ref() }); + VM_STACK.with(|vms| *vms.borrow_mut() = vm_stack); +} + /// Attach the current native thread to a RustPython VM until /// `release_current_thread()` is called. #[cfg(feature = "threading")] diff --git a/extra_tests/snippets/stdlib_ctypes.py b/extra_tests/snippets/stdlib_ctypes.py index 0a5d1387a..7cd3fcf26 100644 --- a/extra_tests/snippets/stdlib_ctypes.py +++ b/extra_tests/snippets/stdlib_ctypes.py @@ -190,6 +190,10 @@ class c_char_p(_SimpleCData): _check_size(c_char_p, "P") +char_pointer = c_char_p(b"1.3.6.1.5.5.7.3.1") +char_pointer_array = (c_char_p * 1)(char_pointer) +assert char_pointer_array[0] == b"1.3.6.1.5.5.7.3.1" + class c_void_p(_SimpleCData): _type_ = "P" @@ -344,7 +348,9 @@ if _os.name == "posix": # print(libc.srand(i)) # print(test_byte_array) else: + import ctypes import os + from ctypes import wintypes libc = cdll.msvcrt libc.rand() @@ -356,6 +362,29 @@ else: # print("start printf") # libc.printf(test_byte_array) + kernel32 = ctypes.WinDLL("kernel32", use_last_error=True) + get_current_process = kernel32.GetCurrentProcess + get_current_process.argtypes = () + get_current_process.restype = ctypes.c_void_p + + def preserve_result(_result, _func, args): + return args + + get_current_process.errcheck = preserve_result + process_handle = get_current_process() + assert isinstance(process_handle, int) + + get_process_id = kernel32.GetProcessId + get_process_id.argtypes = (ctypes.c_void_p,) + get_process_id.restype = wintypes.DWORD + assert get_process_id(process_handle) == os.getpid() + + def replace_result(_result, _func, _args): + return "replacement" + + get_current_process.errcheck = replace_result + assert get_current_process() == "replacement" + # windows pip support def get_win_folder_via_ctypes(csidl_name: str) -> str: @@ -364,8 +393,6 @@ else: # Use 'CSIDL_PROFILE' (40) and append the default folder 'Downloads' instead. # https://learn.microsoft.com/en-us/windows/win32/shell/knownfolderid - import ctypes # noqa: PLC0415 - csidl_const = { "CSIDL_APPDATA": 26, "CSIDL_COMMON_APPDATA": 35, From 570258f6cbf43d542e374efa1162182a93e6337f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EA=B4=91=ED=9A=A8?= <87641474+widehyo1@users.noreply.github.com> Date: Mon, 20 Jul 2026 17:05:51 +0900 Subject: [PATCH 266/339] csv: reject reentrant reader advancement (#8324) * csv: reject reentrant reader advancement Snapshot the reader generation before calling the input iterator. If a nested call completes a record and advances the same reader, reject the outer call with csv.Error instead of continuing with stale parser state. Increment the generation on each successful record path, matching CPython's handling of the existing reentrant-reader regression. Enable that test by removing its expectedFailure marker. Assisted-by: Codex:gpt-5.6-sol * csv: invalidate outer reads after reentry Advance the reader generation immediately after the reentrancy check, before validating or parsing the returned input item. This invalidates the outer call even when a nested read later fails validation or parsing. Remove the per-return generation updates now that the common path advances it exactly once. Assisted-by: Codex:gpt-5.6-sol * csv: generation type conversion(usize to u64) On 32-bit targets (like WebAssembly, which RustPython supports), usize is 32-bit. Csv with over 32-bit rows can raise panic on these platform. type conversion from usize to u64. --- Lib/test/test_csv.py | 1 - crates/stdlib/src/csv.rs | 18 +++++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Lib/test/test_csv.py b/Lib/test/test_csv.py index 3e86af0f8..1108846f5 100644 --- a/Lib/test/test_csv.py +++ b/Lib/test/test_csv.py @@ -568,7 +568,6 @@ class Test_Csv(unittest.TestCase): self.assertEqual(row, rows[i]) - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: Error not raised def test_reader_reentrant_iterator(self): # gh-145105: re-entering the reader from the iterator must not crash. class ReentrantIter: diff --git a/crates/stdlib/src/csv.rs b/crates/stdlib/src/csv.rs index cb7cecff4..f4ccda554 100644 --- a/crates/stdlib/src/csv.rs +++ b/crates/stdlib/src/csv.rs @@ -411,6 +411,7 @@ mod _csv { skipinitialspace: options.get_skipinitialspace(), delimiter: options.get_delimiter(), line_num: 0, + generation: 0, }), dialect: options.result(vm)?, }) @@ -961,6 +962,7 @@ mod _csv { skipinitialspace: bool, delimiter: u8, line_num: u64, + generation: u64, } #[pyclass(no_attr, module = "_csv", name = "reader", traverse)] @@ -1057,8 +1059,18 @@ mod _csv { impl IterNext for Reader { fn next(zelf: &Py<Self>, vm: &VirtualMachine) -> PyResult<PyIterReturn> { - let string = raise_if_stop!(zelf.iter.next(vm)?); - let string = string.downcast::<PyStr>().map_err(|obj| { + let generation = zelf.state.lock().generation; + let string_obj = raise_if_stop!(zelf.iter.next(vm)?); + let mut state = zelf.state.lock(); + if state.generation != generation { + return Err(new_csv_error( + vm, + "iterator has already advanced the reader", + )); + } + state.generation += 1; + + let string = string_obj.downcast::<PyStr>().map_err(|obj| { new_csv_error( vm, format!( @@ -1071,7 +1083,6 @@ mod _csv { if input.is_empty() || input.starts_with(b"\n") { return Ok(PyIterReturn::Return(vm.ctx.new_list(vec![]).into())); } - let mut state = zelf.state.lock(); let ReadState { buffer, output_ends, @@ -1079,6 +1090,7 @@ mod _csv { skipinitialspace, delimiter, line_num, + generation: _, } = &mut *state; let mut input_offset = 0; From 12057b3a0365e55bffc4a7781d8acfd7d99a4e3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EB=8F=99=EC=95=88?= <ioprt123@gmail.com> Date: Mon, 20 Jul 2026 17:06:44 +0900 Subject: [PATCH 267/339] Take a borrow in invoke_exception instead of an owned type (#8327) --- crates/capi/src/pyerrors.rs | 5 +---- crates/vm/src/exception_group.rs | 7 ++----- crates/vm/src/exceptions.rs | 10 +++++----- crates/vm/src/stdlib/_ctypes/function.rs | 2 +- crates/vm/src/stdlib/_io.rs | 6 +++--- crates/vm/src/stdlib/_thread.rs | 2 +- crates/vm/src/stdlib/builtins.rs | 2 +- crates/vm/src/stdlib/sys.rs | 2 +- crates/vm/src/vm/mod.rs | 2 +- crates/vm/src/vm/vm_new.rs | 2 +- 10 files changed, 17 insertions(+), 23 deletions(-) diff --git a/crates/capi/src/pyerrors.rs b/crates/capi/src/pyerrors.rs index 55428ee76..25b76f333 100644 --- a/crates/capi/src/pyerrors.rs +++ b/crates/capi/src/pyerrors.rs @@ -147,10 +147,7 @@ pub unsafe extern "C" fn PyErr_SetString(exception: *mut PyObject, message: *con let exc_type = unsafe { &*exception }.try_downcast_ref::<PyType>(vm)?; let message = unsafe { message.try_as_str(vm) }?; - let exc = vm.invoke_exception( - exc_type.to_owned(), - vec![vm.ctx.new_str(message).into_object()], - )?; + let exc = vm.invoke_exception(exc_type, vec![vm.ctx.new_str(message).into_object()])?; Err(exc) }) diff --git a/crates/vm/src/exception_group.rs b/crates/vm/src/exception_group.rs index a2c76378a..c6d18cc65 100644 --- a/crates/vm/src/exception_group.rs +++ b/crates/vm/src/exception_group.rs @@ -71,11 +71,8 @@ pub(super) mod types { vm: &VirtualMachine, ) -> PyResult { let message = zelf.get_arg(0).unwrap_or_else(|| vm.ctx.new_str("").into()); - vm.invoke_exception( - vm.ctx.exceptions.base_exception_group.to_owned(), - vec![message, excs], - ) - .map(|e| e.into()) + vm.invoke_exception(vm.ctx.exceptions.base_exception_group, vec![message, excs]) + .map(|e| e.into()) } #[pymethod] diff --git a/crates/vm/src/exceptions.rs b/crates/vm/src/exceptions.rs index f76a2ad62..cd1eb1adb 100644 --- a/crates/vm/src/exceptions.rs +++ b/crates/vm/src/exceptions.rs @@ -353,11 +353,11 @@ impl VirtualMachine { pub fn invoke_exception( &self, - cls: PyTypeRef, + cls: &Py<PyType>, args: Vec<PyObjectRef>, ) -> PyResult<PyBaseExceptionRef> { // TODO: fast-path built-in exceptions by directly instantiating them? Is that really worth it? - let res = PyType::call(&cls, args.into_args(self), self)?; + let res = PyType::call(cls, args.into_args(self), self)?; res.downcast::<PyBaseException>().map_err(|obj| { self.new_type_error(format!( "calling {} should have returned an instance of BaseException, not {}", @@ -444,7 +444,7 @@ impl TryFromObject for ExceptionCtor { impl ExceptionCtor { pub fn instantiate(self, vm: &VirtualMachine) -> PyResult<PyBaseExceptionRef> { match self { - Self::Class(cls) => vm.invoke_exception(cls, vec![]), + Self::Class(cls) => vm.invoke_exception(&cls, vec![]), Self::Instance(exc) => Ok(exc), } } @@ -472,7 +472,7 @@ impl ExceptionCtor { exc @ PyBaseException => exc.args().to_vec(), obj => vec![obj], }); - vm.invoke_exception(cls, args) + vm.invoke_exception(&cls, args) } } } @@ -2101,7 +2101,7 @@ pub(super) mod types { .downcast_ref::<PyInt>() .and_then(|errno| errno.try_to_primitive::<i32>(vm).ok()) .and_then(|errno| super::errno_to_exc_type(errno, vm)) - .and_then(|typ| vm.invoke_exception(typ.to_owned(), args_vec).ok()) + .and_then(|typ| vm.invoke_exception(typ, args_vec).ok()) { return error.to_pyresult(vm); } diff --git a/crates/vm/src/stdlib/_ctypes/function.rs b/crates/vm/src/stdlib/_ctypes/function.rs index cf6551916..676ee5be8 100644 --- a/crates/vm/src/stdlib/_ctypes/function.rs +++ b/crates/vm/src/stdlib/_ctypes/function.rs @@ -1361,7 +1361,7 @@ fn check_hresult(hresult: i32, zelf: &Py<PyCFuncPtr>, vm: &VirtualMachine) -> Py .new_str(format!("HRESULT: 0x{:08X}", hresult as u32)) .into(); let details: PyObjectRef = vm.ctx.none(); - let exc = vm.invoke_exception(com_error_type, vec![text.clone(), details.clone()])?; + let exc = vm.invoke_exception(&com_error_type, vec![text.clone(), details.clone()])?; let _ = exc.as_object().set_attr("hresult", hresult_obj, vm); let _ = exc.as_object().set_attr("text", text, vm); let _ = exc.as_object().set_attr("details", details, vm); diff --git a/crates/vm/src/stdlib/_io.rs b/crates/vm/src/stdlib/_io.rs index c7bbbaf93..4cffb909f 100644 --- a/crates/vm/src/stdlib/_io.rs +++ b/crates/vm/src/stdlib/_io.rs @@ -943,7 +943,7 @@ mod _io { None => { // BlockingIOError(errno, msg, characters_written=0) return Err(vm.invoke_exception( - vm.ctx.exceptions.blocking_io_error.to_owned(), + vm.ctx.exceptions.blocking_io_error, vec![ vm.new_pyobj(EAGAIN), vm.new_pyobj("write could not complete without blocking"), @@ -1154,7 +1154,7 @@ mod _io { self.write_end += avail as Offset; self.pos += avail as Offset; return Err(vm.invoke_exception( - vm.ctx.exceptions.blocking_io_error.to_owned(), + vm.ctx.exceptions.blocking_io_error, vec![ vm.new_pyobj(EAGAIN), vm.new_pyobj("write could not complete without blocking"), @@ -1200,7 +1200,7 @@ mod _io { // BlockingIOError(errno, msg, characters_written) let chars_written = written + buffer_len; return Err(vm.invoke_exception( - vm.ctx.exceptions.blocking_io_error.to_owned(), + vm.ctx.exceptions.blocking_io_error, vec![ vm.new_pyobj(EAGAIN), vm.new_pyobj("write could not complete without blocking"), diff --git a/crates/vm/src/stdlib/_thread.rs b/crates/vm/src/stdlib/_thread.rs index 9caa15dbf..0079f15df 100644 --- a/crates/vm/src/stdlib/_thread.rs +++ b/crates/vm/src/stdlib/_thread.rs @@ -623,7 +623,7 @@ pub(crate) mod _thread { #[pyfunction] fn exit(vm: &VirtualMachine) -> PyResult { - Err(vm.invoke_exception(vm.ctx.exceptions.system_exit.to_owned(), vec![])?) + Err(vm.invoke_exception(vm.ctx.exceptions.system_exit, vec![])?) } thread_local!(static SENTINELS: RefCell<Vec<PyRef<Lock>>> = const { RefCell::new(Vec::new()) }); diff --git a/crates/vm/src/stdlib/builtins.rs b/crates/vm/src/stdlib/builtins.rs index 27f30158b..e329763fa 100644 --- a/crates/vm/src/stdlib/builtins.rs +++ b/crates/vm/src/stdlib/builtins.rs @@ -1041,7 +1041,7 @@ mod builtins { #[pyfunction] pub(super) fn exit(exit_code_arg: OptionalArg<PyObjectRef>, vm: &VirtualMachine) -> PyResult { let code = exit_code_arg.unwrap_or_else(|| vm.ctx.new_int(0).into()); - Err(vm.invoke_exception(vm.ctx.exceptions.system_exit.to_owned(), vec![code])?) + Err(vm.invoke_exception(vm.ctx.exceptions.system_exit, vec![code])?) } #[derive(Debug, Default, FromArgs)] diff --git a/crates/vm/src/stdlib/sys.rs b/crates/vm/src/stdlib/sys.rs index 31e102036..65917865d 100644 --- a/crates/vm/src/stdlib/sys.rs +++ b/crates/vm/src/stdlib/sys.rs @@ -776,7 +776,7 @@ pub mod sys { } else { vec![status] }; - let exc = vm.invoke_exception(vm.ctx.exceptions.system_exit.to_owned(), args)?; + let exc = vm.invoke_exception(vm.ctx.exceptions.system_exit, args)?; Err(exc) } diff --git a/crates/vm/src/vm/mod.rs b/crates/vm/src/vm/mod.rs index 0f2e6a463..28eb111a9 100644 --- a/crates/vm/src/vm/mod.rs +++ b/crates/vm/src/vm/mod.rs @@ -2161,7 +2161,7 @@ impl VirtualMachine { if self.state.finalizing.load(Ordering::Acquire) && !self.is_main_thread() { // once finalization starts, // non-main Python threads should stop running bytecode. - return Err(self.invoke_exception(self.ctx.exceptions.system_exit.to_owned(), vec![])?); + return Err(self.invoke_exception(self.ctx.exceptions.system_exit, vec![])?); } // Suspend this thread if stop-the-world is in progress diff --git a/crates/vm/src/vm/vm_new.rs b/crates/vm/src/vm/vm_new.rs index 857ecb33c..48909c1a4 100644 --- a/crates/vm/src/vm/vm_new.rs +++ b/crates/vm/src/vm/vm_new.rs @@ -894,7 +894,7 @@ impl VirtualMachine { } pub fn new_stop_iteration(&self, value: Option<PyObjectRef>) -> PyBaseExceptionRef { - let stop_iteration_error = self.ctx.exceptions.stop_iteration.to_owned(); + let stop_iteration_error = self.ctx.exceptions.stop_iteration; let args = if let Some(value) = value { vec![value] } else { From f4ef94c46431e983bcf576d004bf7e665051e609 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EA=B4=91=ED=9A=A8?= <87641474+widehyo1@users.noreply.github.com> Date: Mon, 20 Jul 2026 19:57:38 +0900 Subject: [PATCH 268/339] csv: handle empty fields with skipinitialspace (#8304) * csv: handle empty fields with skipinitialspace skipinitialspace preprocessed records by trimming both ends of every split field. Fields containing only spaces could therefore produce an invalid slice, while trailing spaces were removed even though CPython preserves them. Trim only field prefixes in the csv-core path and make the remaining all-space trimming helper return an empty slice safely. QUOTE_NOTNULL and QUOTE_STRINGS add another distinction: an unquoted empty field becomes None, but a quoted empty field remains an empty string. Both forms have identical decoded bytes, so extend the existing QUOTE_NONE custom reader into one shared path that records whether each field started quoted. Use that metadata only for the null conversion while retaining QUOTE_NONE escape behavior. Unmark Test_Csv.test_read_skipinitialspace now that its standard, QUOTE_NOTNULL, and QUOTE_STRINGS cases pass. This keeps the existing one-item reader lifecycle and does not add the larger strict or multiline parser state machine. Assisted-by: Codex:gpt-5-sol * csv: make skipinitialspace quote-aware The csv-core preprocessing path split each raw iterator item on every delimiter before trimming field prefixes. Delimiters inside quoted fields were therefore treated as separators, so spaces after them could be removed before csv-core parsed the record. Extract the quote, escape, delimiter, and field-start transitions from read_quote_record() into a small per-item scanner. Reuse its events in the skipinitialspace preprocessor and discard only InitialSpace events while copying all other source bytes unchanged. This keeps the custom quote-mode reader and preprocessing logic aligned without introducing persistent multiline or strict parser state. Remove the delimiter cache that was only needed by the old split-and-join path and add a regression for spaces following a delimiter inside a quoted field. Assisted-by: Codex:gpt-5-sol --- Lib/test/test_csv.py | 1 - crates/stdlib/src/csv.rs | 225 ++++++++++++++++++++--------- extra_tests/snippets/stdlib_csv.py | 8 + 3 files changed, 162 insertions(+), 72 deletions(-) diff --git a/Lib/test/test_csv.py b/Lib/test/test_csv.py index 1108846f5..379f4c9b7 100644 --- a/Lib/test/test_csv.py +++ b/Lib/test/test_csv.py @@ -471,7 +471,6 @@ class Test_Csv(unittest.TestCase): self._read_test(['1\\.5,\\.5,"\\.5"'], [[1.5, 0.5, ".5"]], quoting=csv.QUOTE_STRINGS, escapechar='\\') - @unittest.skip("TODO: RUSTPYTHON; slice index starts at 1 but ends at 0") def test_read_skipinitialspace(self): self._read_test(['no space, space, spaces,\ttab'], [['no space', 'space', 'spaces', '\ttab']], diff --git a/crates/stdlib/src/csv.rs b/crates/stdlib/src/csv.rs index f4ccda554..a5203e8a3 100644 --- a/crates/stdlib/src/csv.rs +++ b/crates/stdlib/src/csv.rs @@ -14,7 +14,7 @@ mod _csv { }; use alloc::fmt; use csv_core::Terminator; - use itertools::{self, Itertools}; + use itertools::Itertools; use parking_lot::Mutex; use rustpython_common::{lock::LazyLock, wtf8::Wtf8Buf}; use rustpython_vm::{match_class, sliceable::SliceableSequenceOp}; @@ -409,7 +409,6 @@ mod _csv { output_ends: vec![0; 16], reader: options.to_reader(), skipinitialspace: options.get_skipinitialspace(), - delimiter: options.get_delimiter(), line_num: 0, generation: 0, }), @@ -774,29 +773,6 @@ mod _csv { skipinitialspace } - fn get_delimiter(&self) -> u8 { - let mut delimiter = match &self.dialect { - DialectItem::Str(name) => { - let g = GLOBAL_HASHMAP.lock(); - if let Some(dialect) = g.get(name) { - dialect.delimiter - // RustPython todo - // todo! Perfecting the remaining attributes. - } else { - b',' - } - } - DialectItem::Obj(obj) => obj.delimiter, - _ => b',', - }; - - if let Some(attr) = self.delimiter { - delimiter = attr - } - - delimiter - } - fn get_lineterminator(&self) -> csv_core::Terminator { let mut lineterminator = match &self.dialect { DialectItem::Str(name) => { @@ -960,7 +936,6 @@ mod _csv { output_ends: Vec<usize>, reader: csv_core::Reader, skipinitialspace: bool, - delimiter: u8, line_num: u64, generation: u64, } @@ -996,60 +971,146 @@ mod _csv { impl SelfIter for Reader {} - fn read_quote_none_record( + enum QuoteScanEvent { + InitialSpace, + StartQuotedField, + EndQuotedField, + Escaped(Option<u8>), + DoubleQuote(u8), + Delimiter, + RecordTerminator, + Data(u8), + } + + struct QuoteScanState { + at_field_start: bool, + in_quoted_field: bool, + } + + impl QuoteScanState { + const fn new() -> Self { + Self { + at_field_start: true, + in_quoted_field: false, + } + } + + fn scan( + &mut self, + input: &[u8], + index: usize, + dialect: PyDialect, + unquoted_escape: bool, + ) -> (QuoteScanEvent, usize) { + let byte = input[index]; + + if (self.in_quoted_field || unquoted_escape) && dialect.escapechar == Some(byte) { + self.at_field_start = false; + return match input.get(index + 1).copied() { + Some(escaped) => (QuoteScanEvent::Escaped(Some(escaped)), 2), + None => (QuoteScanEvent::Escaped(None), 1), + }; + } + + if self.in_quoted_field { + if dialect.quotechar == Some(byte) { + if dialect.doublequote && input.get(index + 1) == Some(&byte) { + return (QuoteScanEvent::DoubleQuote(byte), 2); + } + self.in_quoted_field = false; + return (QuoteScanEvent::EndQuotedField, 1); + } + return (QuoteScanEvent::Data(byte), 1); + } + + if self.at_field_start && dialect.skipinitialspace && byte == b' ' { + return (QuoteScanEvent::InitialSpace, 1); + } + + if self.at_field_start + && dialect.quoting != QuoteStyle::None + && dialect.quotechar == Some(byte) + { + self.at_field_start = false; + self.in_quoted_field = true; + return (QuoteScanEvent::StartQuotedField, 1); + } + + if byte == dialect.delimiter { + self.at_field_start = true; + return (QuoteScanEvent::Delimiter, 1); + } + + self.at_field_start = false; + if matches!(byte, b'\r' | b'\n') { + (QuoteScanEvent::RecordTerminator, 1) + } else { + (QuoteScanEvent::Data(byte), 1) + } + } + } + + fn read_quote_record( input: &[u8], dialect: PyDialect, field_limit: isize, vm: &VirtualMachine, ) -> PyResult<Vec<PyObjectRef>> { - let mut fields = vec![Vec::new()]; - let mut escaped = false; - let mut after_delimiter = false; + // QUOTE_NOTNULL and QUOTE_STRINGS map empty unquoted fields to None, + // but preserve quoted empty fields as strings, so retain quote provenance. + let mut fields = vec![(Vec::new(), false)]; + let mut scan_state = QuoteScanState::new(); + let mut dangling_escape = false; + let mut index = 0; - for (index, &byte) in input.iter().enumerate() { - if escaped { - fields.last_mut().unwrap().push(byte); - escaped = false; - after_delimiter = false; - } else if dialect.skipinitialspace && after_delimiter && byte == b' ' { - continue; - } else if dialect.escapechar == Some(byte) { - escaped = true; - } else if byte == dialect.delimiter { - fields.push(Vec::new()); - after_delimiter = true; - } else if matches!(byte, b'\r' | b'\n') { - if !input[index..] - .iter() - .all(|&byte| matches!(byte, b'\r' | b'\n')) - { - return Err(new_csv_error( - vm, - concat!( - "new-line character seen in unquoted field", - " - do you need to open the file in universal-newline mode?" - ), - )); + while index < input.len() { + let (event, consumed) = scan_state.scan(input, index, dialect, true); + match event { + QuoteScanEvent::InitialSpace | QuoteScanEvent::EndQuotedField => {} + QuoteScanEvent::StartQuotedField => fields.last_mut().unwrap().1 = true, + QuoteScanEvent::Escaped(Some(byte)) | QuoteScanEvent::DoubleQuote(byte) => { + fields.last_mut().unwrap().0.push(byte); } - break; - } else { - fields.last_mut().unwrap().push(byte); - after_delimiter = false; + QuoteScanEvent::Escaped(None) => dangling_escape = true, + QuoteScanEvent::Delimiter => fields.push((Vec::new(), false)), + QuoteScanEvent::RecordTerminator => { + if !input[index..] + .iter() + .all(|&byte| matches!(byte, b'\r' | b'\n')) + { + return Err(new_csv_error( + vm, + concat!( + "new-line character seen in unquoted field", + " - do you need to open the file in universal-newline mode?" + ), + )); + } + break; + } + QuoteScanEvent::Data(byte) => fields.last_mut().unwrap().0.push(byte), } + index += consumed; } // CPython treats an escape character at the end of an iterator item // as escaping the implicit newline at the end of that item. - if escaped { - fields.last_mut().unwrap().push(b'\n'); + if dangling_escape { + fields.last_mut().unwrap().0.push(b'\n'); } fields .into_iter() - .map(|field| { + .map(|(field, was_quoted)| { if field.len() > field_limit as usize { return Err(new_csv_error(vm, "filed too long to read")); } + if matches!(dialect.quoting, QuoteStyle::Notnull | QuoteStyle::Strings) + && !was_quoted + && field.is_empty() + { + return Ok(vm.ctx.none()); + } let field = core::str::from_utf8(&field) .map_err(|_| vm.new_unicode_decode_error("csv not utf8"))?; Ok(vm.ctx.new_str(field).into()) @@ -1088,7 +1149,6 @@ mod _csv { output_ends, reader, skipinitialspace, - delimiter, line_num, generation: _, } = &mut *state; @@ -1098,26 +1158,49 @@ mod _csv { let mut output_ends_offset = 0; let field_limit = GLOBAL_FIELD_LIMIT.lock().to_owned(); - if zelf.dialect.quoting == QuoteStyle::None && zelf.dialect.escapechar.is_some() { - let out = read_quote_none_record(input, zelf.dialect, field_limit, vm)?; + let use_quote_record = matches!( + zelf.dialect.quoting, + QuoteStyle::Notnull | QuoteStyle::Strings + ) || (zelf.dialect.quoting == QuoteStyle::None + && zelf.dialect.escapechar.is_some()); + if use_quote_record { + let out = read_quote_record(input, zelf.dialect, field_limit, vm)?; *line_num += 1; return Ok(PyIterReturn::Return(vm.ctx.new_list(out).into())); } + #[inline] + fn trim_initial_spaces(input: &[u8], dialect: PyDialect) -> Vec<u8> { + let mut trimmed = Vec::with_capacity(input.len()); + let mut scan_state = QuoteScanState::new(); + let mut index = 0; + + // Delimiters inside quoted fields are data, so only skip spaces + // after delimiters encountered outside quotes. + while index < input.len() { + let (event, consumed) = scan_state.scan(input, index, dialect, false); + if !matches!(event, QuoteScanEvent::InitialSpace) { + trimmed.extend_from_slice(&input[index..index + consumed]); + } + index += consumed; + } + + trimmed + } + #[inline] fn trim_spaces(input: &[u8]) -> &[u8] { let trimmed_start = input.iter().position(|&x| x != b' ').unwrap_or(input.len()); let trimmed_end = input.iter().rposition(|&x| x != b' ').map_or(0, |i| i + 1); - &input[trimmed_start..trimmed_end] + if trimmed_start >= trimmed_end { + &input[input.len()..] + } else { + &input[trimmed_start..trimmed_end] + } } let input = if *skipinitialspace { - let t = input.split(|x| x == delimiter); - t.map(|x| { - let trimmed = trim_spaces(x); - String::from_utf8(trimmed.to_vec()).unwrap() - }) - .join(format!("{}", *delimiter as char).as_str()) + String::from_utf8(trim_initial_spaces(input, zelf.dialect)).unwrap() } else { String::from_utf8(input.to_vec()).unwrap() }; diff --git a/extra_tests/snippets/stdlib_csv.py b/extra_tests/snippets/stdlib_csv.py index 0664bfd8d..61b82459a 100644 --- a/extra_tests/snippets/stdlib_csv.py +++ b/extra_tests/snippets/stdlib_csv.py @@ -192,3 +192,11 @@ def test_quote_minimal_writer_empty_fields(): test_quote_minimal_writer_empty_fields() + + +def test_reader_skipinitialspace_preserves_quoted_spaces(): + reader = csv.reader(['a, "b, c", d'], skipinitialspace=True) + assert list(reader) == [["a", "b, c", "d"]] + + +test_reader_skipinitialspace_preserves_quoted_spaces() From 9ddf78149c5c7190a724f116c0298a64df35f0af Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Jul 2026 00:07:03 +0900 Subject: [PATCH 269/339] Bump https://github.com/rbubley/mirrors-prettier from v3.9.4 to 3.9.5 (#8331) Bumps [https://github.com/rbubley/mirrors-prettier](https://github.com/rbubley/mirrors-prettier) from v3.9.4 to 3.9.5. - [Commits](https://github.com/rbubley/mirrors-prettier/compare/v3.9.4...v3.9.5) --- updated-dependencies: - dependency-name: https://github.com/rbubley/mirrors-prettier dependency-version: 3.9.5 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index bc8046ab0..fbb7c2230 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -77,7 +77,7 @@ repos: priority: 0 - repo: https://github.com/rbubley/mirrors-prettier - rev: v3.9.4 + rev: v3.9.5 hooks: - id: prettier files: '^wasm/.*$' From 980ebd60e0b820e7b9ac0873c7ad0018ff516064 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Jul 2026 00:07:17 +0900 Subject: [PATCH 270/339] Bump https://github.com/astral-sh/ruff-pre-commit (#8332) Bumps [https://github.com/astral-sh/ruff-pre-commit](https://github.com/astral-sh/ruff-pre-commit) from v0.15.20 to 0.15.21. - [Release notes](https://github.com/astral-sh/ruff-pre-commit/releases) - [Commits](https://github.com/astral-sh/ruff-pre-commit/compare/v0.15.20...v0.15.21) --- updated-dependencies: - dependency-name: https://github.com/astral-sh/ruff-pre-commit dependency-version: 0.15.21 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index fbb7c2230..45fb5f47b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -10,7 +10,7 @@ repos: priority: 0 - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.15.20 + rev: v0.15.21 hooks: - id: ruff-format priority: 0 From d50071eaaa80ce505600d64b9499180f1fbb0571 Mon Sep 17 00:00:00 2001 From: Kwak Byoung Min <67214970+doma17@users.noreply.github.com> Date: Tue, 21 Jul 2026 00:30:10 +0900 Subject: [PATCH 271/339] bz2: return streaming output from BZ2Compressor.compress() (#8330) * bz2: return streaming output from BZ2Compressor.compress() Return output produced during compression instead of waiting for flush(). Constraint: Preserve encoder state without flushing the BZ2 stream Confidence: high Scope-risk: narrow Directive: Do not flush merely to retrieve partial output Tested: test_bz2; stdlib_bz2.py; prek run --all-files Assisted-by: Codex:gpt-5.6-sol * bz2: remove redundant streaming-output snippet --- Lib/test/test_bz2.py | 1 - crates/stdlib/src/bz2.rs | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Lib/test/test_bz2.py b/Lib/test/test_bz2.py index a7e152fb7..bcd4e033b 100644 --- a/Lib/test/test_bz2.py +++ b/Lib/test/test_bz2.py @@ -936,7 +936,6 @@ class BZ2DecompressorTest(BaseTest): with self.assertRaises(TypeError): pickle.dumps(BZ2Decompressor(), proto) - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: 0 != 100 def testDecompressorChunksMaxsize(self): bzd = BZ2Decompressor() max_length = 100 diff --git a/crates/stdlib/src/bz2.rs b/crates/stdlib/src/bz2.rs index 575f33c4b..fcde54057 100644 --- a/crates/stdlib/src/bz2.rs +++ b/crates/stdlib/src/bz2.rs @@ -17,6 +17,7 @@ mod _bz2 { }; use alloc::fmt; use bzip2::{Decompress, Status, write::BzEncoder}; + use core::mem; use rustpython_vm::convert::ToPyException; use std::io::Write; @@ -155,7 +156,6 @@ mod _bz2 { } } - // TODO: return partial results from compress() instead of returning everything in flush() #[pyclass(with(Constructor))] impl BZ2Compressor { #[pymethod] @@ -165,12 +165,12 @@ mod _bz2 { return Err(vm.new_value_error("Compressor has been flushed")); } - // let CompressorState { flushed, encoder } = &mut *state; let CompressorState { encoder, .. } = &mut *state; - - // TODO: handle Err - data.with_ref(|input_bytes| encoder.as_mut().unwrap().write_all(input_bytes).unwrap()); - Ok(vm.ctx.new_bytes(Vec::new())) + let encoder = encoder.as_mut().unwrap(); + data.with_ref(|input_bytes| encoder.write_all(input_bytes).unwrap()); + // BzEncoder writes its pending output at the start of the next write. + assert_eq!(encoder.write(&[]).unwrap(), 0); + Ok(vm.ctx.new_bytes(mem::take(encoder.get_mut()))) } #[pymethod] From 99dcf4d477ac2800e82d8129d67b3f518c053ac1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Jul 2026 00:30:20 +0900 Subject: [PATCH 272/339] Bump actions/setup-node from 6.4.0 to 7.0.0 (#8335) Bumps [actions/setup-node](https://github.com/actions/setup-node) from 6.4.0 to 7.0.0. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e...820762786026740c76f36085b0efc47a31fe5020) --- updated-dependencies: - dependency-name: actions/setup-node dependency-version: 7.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d03735192..d1aa26fed 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -690,7 +690,7 @@ jobs: - run: python -m pip install -r requirements.txt working-directory: ./wasm/tests - - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0 + - uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0 with: package-manager-cache: false diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cd66ae845..990322cc2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -114,7 +114,7 @@ jobs: - name: install wasm-pack run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh - - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0 + - uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0 with: package-manager-cache: false From 582e28a8620753d94632d5d8118e6cbed52c55a4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Jul 2026 01:36:02 +0900 Subject: [PATCH 273/339] Bump which from 8.0.4 to 8.0.5 (#8333) Bumps [which](https://github.com/harryfei/which-rs) from 8.0.4 to 8.0.5. - [Release notes](https://github.com/harryfei/which-rs/releases) - [Changelog](https://github.com/harryfei/which-rs/blob/master/CHANGELOG.md) - [Commits](https://github.com/harryfei/which-rs/compare/8.0.4...8.0.5) --- updated-dependencies: - dependency-name: which dependency-version: 8.0.5 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 51e915502..1b3a0c160 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4653,9 +4653,9 @@ dependencies = [ [[package]] name = "which" -version = "8.0.4" +version = "8.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48d7cd18d4acb58fb3cdfe9ea54e6cd96a4e7d4cc45c56338b236e82dad47248" +checksum = "8f3ef584124b911bcc3875c2f1472e80f24361ceb789bd1c62b3e9a3df9ff43c" dependencies = [ "libc", ] From 511cffd40689fb3bf5f1d95d5f858a6ec3092e2c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Jul 2026 01:36:12 +0900 Subject: [PATCH 274/339] Bump taiki-e/install-action from 2.82.9 to 2.83.2 (#8334) Bumps [taiki-e/install-action](https://github.com/taiki-e/install-action) from 2.82.9 to 2.83.2. - [Release notes](https://github.com/taiki-e/install-action/releases) - [Changelog](https://github.com/taiki-e/install-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/taiki-e/install-action/compare/4684b8405694ae9dd42c9f39ba901a70ae83f4a3...43aecc8d72668fbcfe75c31400bc4f890f1c5853) --- updated-dependencies: - dependency-name: taiki-e/install-action dependency-version: 2.83.2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/cron-ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cron-ci.yaml b/.github/workflows/cron-ci.yaml index 2839cf375..37af28a4e 100644 --- a/.github/workflows/cron-ci.yaml +++ b/.github/workflows/cron-ci.yaml @@ -33,7 +33,7 @@ jobs: - uses: dtolnay/rust-toolchain@stable - - uses: taiki-e/install-action@4684b8405694ae9dd42c9f39ba901a70ae83f4a3 # v2.82.9 + - uses: taiki-e/install-action@43aecc8d72668fbcfe75c31400bc4f890f1c5853 # v2.83.2 with: tool: cargo-llvm-cov From a271f693b56985128b91555d787ab7e7c5acc5a1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Jul 2026 01:36:21 +0900 Subject: [PATCH 275/339] Bump bitflags from 2.13.0 to 2.13.1 (#8336) Bumps [bitflags](https://github.com/bitflags/bitflags) from 2.13.0 to 2.13.1. - [Release notes](https://github.com/bitflags/bitflags/releases) - [Changelog](https://github.com/bitflags/bitflags/blob/main/CHANGELOG.md) - [Commits](https://github.com/bitflags/bitflags/compare/2.13.0...2.13.1) --- updated-dependencies: - dependency-name: bitflags dependency-version: 2.13.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1b3a0c160..e2b62be38 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -315,7 +315,7 @@ version = "0.71.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f58bf3d7db68cfbac37cfc485a8d711e87e064c3d0fe0435b92f7a407f9d6b3" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "cexpr", "clang-sys", "itertools 0.13.0", @@ -335,7 +335,7 @@ version = "0.72.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "cexpr", "clang-sys", "itertools 0.13.0", @@ -357,9 +357,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.13.0" +version = "2.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8" +checksum = "b588b76d00fde79687d7646a9b5bdf3cc0f655e0bbd080335a95d7e96f3587da" [[package]] name = "bitflagset" @@ -2266,7 +2266,7 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "cfg-if", "cfg_aliases", "libc", @@ -2279,7 +2279,7 @@ version = "0.31.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf20d2fde8ff38632c426f1165ed7436270b44f199fc55284c38276f9db47c3d" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "cfg-if", "cfg_aliases", "libc", @@ -2412,7 +2412,7 @@ version = "0.10.81" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77823a27f0babb03091cb9ed9ef80af3b39dbc82f97e8fa530374b7dafd87a45" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "cfg-if", "foreign-types", "libc", @@ -3011,7 +3011,7 @@ version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", ] [[package]] @@ -3165,7 +3165,7 @@ version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "errno", "libc", "linux-raw-sys", @@ -3294,7 +3294,7 @@ dependencies = [ name = "rustpython-capi" version = "0.5.0" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "itertools 0.15.0", "libc", "malachite-bigint", @@ -3309,7 +3309,7 @@ dependencies = [ name = "rustpython-codegen" version = "0.5.0" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "indexmap", "itertools 0.15.0", "log", @@ -3333,7 +3333,7 @@ name = "rustpython-common" version = "0.5.0" dependencies = [ "ascii", - "bitflags 2.13.0", + "bitflags 2.13.1", "getrandom 0.4.3", "itertools 0.15.0", "libc", @@ -3368,7 +3368,7 @@ dependencies = [ name = "rustpython-compiler-core" version = "0.5.0" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "bitflagset", "itertools 0.15.0", "lz4_flex", @@ -3421,7 +3421,7 @@ dependencies = [ name = "rustpython-host_env" version = "0.5.0" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "dns-lookup", "gethostname", "getrandom 0.4.3", @@ -3492,7 +3492,7 @@ version = "0.15.9" source = "git+https://github.com/RustPython/ruff.git?tag=0.15.19-rustpython#3c1ab2dd9987f190f3df94d28452ed5e65e106af" dependencies = [ "aho-corasick", - "bitflags 2.13.0", + "bitflags 2.13.1", "compact_str", "get-size2", "is-macro", @@ -3509,7 +3509,7 @@ name = "rustpython-ruff_python_parser" version = "0.15.9" source = "git+https://github.com/RustPython/ruff.git?tag=0.15.19-rustpython#3c1ab2dd9987f190f3df94d28452ed5e65e106af" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "bstr", "compact_str", "get-size2", @@ -3556,7 +3556,7 @@ dependencies = [ name = "rustpython-sre_engine" version = "0.5.0" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "criterion", "num_enum", "optional", @@ -3665,7 +3665,7 @@ name = "rustpython-vm" version = "0.5.0" dependencies = [ "ascii", - "bitflags 2.13.0", + "bitflags 2.13.1", "bstr", "chrono", "constant_time_eq", @@ -3759,7 +3759,7 @@ version = "18.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53f6a737db68eb1a8ccff86b584b2fc13eca6a7bb6f78ebc7c529547e3ab9684" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "cfg-if", "clipboard-win", "home", @@ -3841,7 +3841,7 @@ version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "core-foundation 0.10.1", "core-foundation-sys", "libc", @@ -4147,7 +4147,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a13f3d0daba03132c0aa9767f98351b3488edc2c100cda2d2ec2b04f3d8d3c8b" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "core-foundation 0.9.4", "system-configuration-sys", ] From 1ed9bb959a4f936a80faa23b62cd24d277bf9e42 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Jul 2026 01:36:31 +0900 Subject: [PATCH 276/339] Bump syn from 2.0.118 to 2.0.119 (#8337) Bumps [syn](https://github.com/dtolnay/syn) from 2.0.118 to 2.0.119. - [Release notes](https://github.com/dtolnay/syn/releases) - [Commits](https://github.com/dtolnay/syn/compare/2.0.118...2.0.119) --- updated-dependencies: - dependency-name: syn dependency-version: 2.0.119 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e2b62be38..a0af67e95 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4110,9 +4110,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.118" +version = "2.0.119" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ae57f904213ebb649ce6895b8a66c66f0203b9319718f69a5612a065b1422" +checksum = "872831b642d1a07999a962a351ed35b955ea2cfc8f3862091e2a240a84f17297" dependencies = [ "proc-macro2", "quote", From cd3469fd95ec6333a540baf24250319e16300afb Mon Sep 17 00:00:00 2001 From: Joshua Megnauth <48846352+joshuamegnauth54@users.noreply.github.com> Date: Wed, 22 Jul 2026 07:27:19 -0400 Subject: [PATCH 277/339] Fix building against new libc (#8343) --- crates/host_env/src/posix.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crates/host_env/src/posix.rs b/crates/host_env/src/posix.rs index 150df505c..e20accee7 100644 --- a/crates/host_env/src/posix.rs +++ b/crates/host_env/src/posix.rs @@ -1424,8 +1424,9 @@ fn build_posix_spawn_attrs( target_os = "hurd", ))] { + #[allow(clippy::useless_conversion)] flags.insert(nix::spawn::PosixSpawnFlags::from_bits_retain( - libc::POSIX_SPAWN_SETSID, + libc::POSIX_SPAWN_SETSID.into(), )); } #[cfg(not(any( From 455d22b353e68ddbeaf79c393c14eb83664552c4 Mon Sep 17 00:00:00 2001 From: Bas Schoenmaeckers <7943856+bschoenmaeckers@users.noreply.github.com> Date: Wed, 22 Jul 2026 13:28:51 +0200 Subject: [PATCH 278/339] Add more unicode functions to the c-api (#8272) * Add more unicode functions Review Add unicode decode functions Add more functions * Remove * Add helper --- crates/capi/src/unicodeobject.rs | 334 +++++++++++++++++++++++++++++-- crates/vm/src/builtins/str.rs | 8 +- 2 files changed, 321 insertions(+), 21 deletions(-) diff --git a/crates/capi/src/unicodeobject.rs b/crates/capi/src/unicodeobject.rs index 1a5e43c0e..00ab1dcb8 100644 --- a/crates/capi/src/unicodeobject.rs +++ b/crates/capi/src/unicodeobject.rs @@ -5,8 +5,10 @@ use core::ffi::{CStr, c_char, c_int}; use core::ptr::NonNull; use core::slice; use core::str; -use rustpython_vm::builtins::{PyStr, PyStrRef}; -use rustpython_vm::{PyObjectRef, PyResult, VirtualMachine}; +use rustpython_vm::builtins::{PyBytesRef, PyStr, PyStrRef, PyUtf8StrRef}; +use rustpython_vm::common::wtf8::{CodePoint, Wtf8Buf}; +use rustpython_vm::convert::ToPyObject; +use rustpython_vm::{AsObject, PyObjectRef, PyResult, VirtualMachine}; define_py_check!(fn PyUnicode_Check, types.str_type); define_py_check!(exact fn PyUnicode_CheckExact, types.str_type); @@ -37,6 +39,36 @@ pub unsafe extern "C" fn PyUnicode_FromStringAndSize( }) } +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyUnicode_FromString(s: *const c_char) -> *mut PyObject { + with_vm(|vm| { + let s = unsafe { s.try_as_str(vm)? }; + Ok(vm.ctx.new_str(s)) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyUnicode_FromObject(obj: *mut PyObject) -> *mut PyObject { + with_vm(|vm| { + Ok(unsafe { &*obj } + .try_downcast_ref::<PyStr>(vm)? + .as_object() + .str(vm)) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyUnicode_FromOrdinal(ordinal: c_int) -> *mut PyObject { + with_vm(|vm| { + let ordinal: u32 = ordinal + .try_into() + .map_err(|_| vm.new_value_error("ordinal not in range(0x110000)"))?; + let code_point = CodePoint::from_u32(ordinal) + .ok_or_else(|| vm.new_value_error("ordinal not in range(0x110000)"))?; + Ok(vm.ctx.new_str(Wtf8Buf::from_iter([code_point]))) + }) +} + #[unsafe(no_mangle)] pub unsafe extern "C" fn PyUnicode_AsUTF8AndSize( obj: *mut PyObject, @@ -61,6 +93,52 @@ pub unsafe extern "C" fn PyUnicode_AsUTF8AndSize( }) } +fn encode_unicode( + vm: &VirtualMachine, + unicode: *mut PyObject, + encoding: &str, + errors: Option<PyUtf8StrRef>, +) -> PyResult<PyBytesRef> { + let unicode = unsafe { &*unicode } + .try_downcast_ref::<PyStr>(vm)? + .to_owned(); + vm.state + .codec_registry + .encode_text(unicode, encoding, errors, vm) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyUnicode_AsASCIIString(unicode: *mut PyObject) -> *mut PyObject { + with_vm(|vm| encode_unicode(vm, unicode, "ascii", None)) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyUnicode_AsLatin1String(unicode: *mut PyObject) -> *mut PyObject { + with_vm(|vm| encode_unicode(vm, unicode, "latin-1", None)) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyUnicode_AsRawUnicodeEscapeString( + unicode: *mut PyObject, +) -> *mut PyObject { + with_vm(|vm| encode_unicode(vm, unicode, "raw-unicode-escape", None)) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyUnicode_AsUTF16String(unicode: *mut PyObject) -> *mut PyObject { + with_vm(|vm| encode_unicode(vm, unicode, "utf-16", None)) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyUnicode_AsUTF32String(unicode: *mut PyObject) -> *mut PyObject { + with_vm(|vm| encode_unicode(vm, unicode, "utf-32", None)) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyUnicode_AsUnicodeEscapeString(unicode: *mut PyObject) -> *mut PyObject { + with_vm(|vm| encode_unicode(vm, unicode, "unicode-escape", None)) +} + #[unsafe(no_mangle)] pub unsafe extern "C" fn PyUnicode_AsEncodedString( unicode: *mut PyObject, @@ -68,30 +146,102 @@ pub unsafe extern "C" fn PyUnicode_AsEncodedString( errors: *const c_char, ) -> *mut PyObject { with_vm(|vm| { - let unicode = unsafe { &*unicode } - .try_downcast_ref::<PyStr>(vm)? - .to_owned(); let encoding = unsafe { encoding.try_as_str_opt(vm) }?.unwrap_or("utf-8"); let errors = unsafe { errors.try_as_str_opt(vm) }?.map(|errors| vm.ctx.new_utf8_str(errors)); - vm.state - .codec_registry - .encode_text(unicode, encoding, errors, vm) + encode_unicode(vm, unicode, encoding, errors) }) } #[unsafe(no_mangle)] pub unsafe extern "C" fn PyUnicode_AsUTF8String(unicode: *mut PyObject) -> *mut PyObject { + with_vm(|vm| encode_unicode(vm, unicode, "utf-8", None)) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyUnicode_Decode( + s: *const c_char, + size: isize, + encoding: *const c_char, + errors: *const c_char, +) -> *mut PyObject { with_vm(|vm| { - let unicode = unsafe { &*unicode } - .try_downcast_ref::<PyStr>(vm)? - .to_owned(); + let size: usize = size + .try_into() + .map_err(|_| vm.new_system_error("size must be non-negative"))?; + + let bytes = if s.is_null() { + if size != 0 { + return Err(vm.new_system_error("decode called with null data and non-zero size")); + } + Vec::new() + } else { + unsafe { slice::from_raw_parts(s.cast::<u8>(), size) }.to_vec() + }; + + let encoding = unsafe { encoding.try_as_str_opt(vm)?.unwrap_or("utf-8") }; + let errors = + unsafe { errors.try_as_str_opt(vm) }?.map(|errors| vm.ctx.new_utf8_str(errors)); + vm.state .codec_registry - .encode_text(unicode, "utf-8", None, vm) + .decode_text(vm.ctx.new_bytes(bytes).into(), encoding, errors, vm) }) } +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyUnicode_DecodeASCII( + s: *const c_char, + size: isize, + errors: *const c_char, +) -> *mut PyObject { + unsafe { PyUnicode_Decode(s, size, c"ascii".as_ptr(), errors) } +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyUnicode_DecodeLatin1( + s: *const c_char, + size: isize, + errors: *const c_char, +) -> *mut PyObject { + unsafe { PyUnicode_Decode(s, size, c"latin-1".as_ptr(), errors) } +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyUnicode_DecodeRawUnicodeEscape( + s: *const c_char, + size: isize, + errors: *const c_char, +) -> *mut PyObject { + unsafe { PyUnicode_Decode(s, size, c"raw-unicode-escape".as_ptr(), errors) } +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyUnicode_DecodeUTF7( + s: *const c_char, + size: isize, + errors: *const c_char, +) -> *mut PyObject { + unsafe { PyUnicode_Decode(s, size, c"utf-7".as_ptr(), errors) } +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyUnicode_DecodeUTF8( + s: *const c_char, + size: isize, + errors: *const c_char, +) -> *mut PyObject { + unsafe { PyUnicode_Decode(s, size, c"utf-8".as_ptr(), errors) } +} +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyUnicode_DecodeUnicodeEscape( + s: *const c_char, + size: isize, + errors: *const c_char, +) -> *mut PyObject { + unsafe { PyUnicode_Decode(s, size, c"unicode-escape".as_ptr(), errors) } +} + #[unsafe(no_mangle)] pub unsafe extern "C" fn PyUnicode_DecodeFSDefaultAndSize( s: *const c_char, @@ -106,6 +256,89 @@ pub unsafe extern "C" fn PyUnicode_DecodeFSDefaultAndSize( }) } +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyUnicode_Concat( + left: *mut PyObject, + right: *mut PyObject, +) -> *mut PyObject { + with_vm(|vm| { + let left = unsafe { &*left }.try_downcast_ref::<PyStr>(vm)?; + let right = unsafe { &*right }.try_downcast_ref::<PyStr>(vm)?; + vm._add(left.as_object(), right.as_object()) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyUnicode_GetLength(unicode: *mut PyObject) -> isize { + with_vm(|vm| { + let unicode = unsafe { &*unicode }.try_downcast_ref::<PyStr>(vm)?; + Ok(unicode.char_len()) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyUnicode_GetDefaultEncoding() -> *const c_char { + c"utf-8".as_ptr() +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyUnicode_InternFromString(s: *const c_char) -> *mut PyObject { + with_vm(|vm| { + let s = unsafe { s.try_as_str(vm)? }; + Ok(vm.ctx.intern_str(s).to_owned()) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyUnicode_Compare(left: *mut PyObject, right: *mut PyObject) -> c_int { + with_vm(|vm| { + let left = unsafe { &*left }.try_downcast_ref::<PyStr>(vm)?; + let right = unsafe { &*right }.try_downcast_ref::<PyStr>(vm)?; + Ok(match left.as_wtf8().cmp(right.as_wtf8()) { + core::cmp::Ordering::Less => -1, + core::cmp::Ordering::Equal => 0, + core::cmp::Ordering::Greater => 1, + }) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyUnicode_CompareWithASCIIString( + left: *mut PyObject, + right: *const c_char, +) -> c_int { + with_vm(|vm| { + let left = unsafe { &*left }.try_downcast_ref::<PyStr>(vm)?; + let right = unsafe { right.try_as_str(vm)? }; + Ok(match left.as_wtf8().cmp(right.into()) { + core::cmp::Ordering::Less => -1, + core::cmp::Ordering::Equal => 0, + core::cmp::Ordering::Greater => 1, + }) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyUnicode_Equal(left: *mut PyObject, right: *mut PyObject) -> c_int { + with_vm(|vm| { + let left = unsafe { &*left }.try_downcast_ref::<PyStr>(vm)?; + let right = unsafe { &*right }.try_downcast_ref::<PyStr>(vm)?; + Ok(left.as_wtf8() == right.as_wtf8()) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyUnicode_EqualToUTF8( + unicode: *mut PyObject, + string: *const c_char, +) -> c_int { + with_vm(|vm| { + let unicode = unsafe { &*unicode }.try_downcast_ref::<PyStr>(vm)?; + let other = unsafe { string.try_as_str(vm)? }; + Ok(unicode.to_str().is_some_and(|s| s == other)) + }) +} + #[unsafe(no_mangle)] pub unsafe extern "C" fn PyUnicode_DecodeFSDefault(s: *const c_char) -> *mut PyObject { with_vm(|vm| { @@ -141,14 +374,11 @@ pub(crate) fn decode_fsdefault_and_size( #[unsafe(no_mangle)] pub unsafe extern "C" fn PyUnicode_EncodeFSDefault(unicode: *mut PyObject) -> *mut PyObject { with_vm(|vm| { - let unicode = unsafe { &*unicode } - .try_downcast_ref::<PyStr>(vm)? - .to_owned(); - vm.state.codec_registry.encode_text( + encode_unicode( + vm, unicode, vm.fs_encoding().as_str(), Some(vm.fs_encode_errors().to_owned()), - vm, ) }) } @@ -181,6 +411,76 @@ pub unsafe extern "C" fn PyUnicode_FromEncodedObject( }) } +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyUnicode_Contains( + container: *mut PyObject, + element: *mut PyObject, +) -> c_int { + with_vm(|vm| { + let container = unsafe { &*container }.try_downcast_ref::<PyStr>(vm)?; + let element = unsafe { &*element }.try_downcast_ref::<PyStr>(vm)?; + Ok(container.as_wtf8().contains(element.as_wtf8())) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyUnicode_Format( + format: *mut PyObject, + args: *mut PyObject, +) -> *mut PyObject { + with_vm(|vm| { + let format = unsafe { &*format }.try_downcast_ref::<PyStr>(vm)?; + let result = format.__mod__(unsafe { &*args }.to_owned(), vm)?; + Ok(result.to_pyobject(vm)) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyUnicode_IsIdentifier(s: *mut PyObject) -> c_int { + with_vm(|vm| { + let s = unsafe { &*s }.try_downcast_ref::<PyStr>(vm)?; + Ok(s.isidentifier()) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyUnicode_Partition( + s: *mut PyObject, + sep: *mut PyObject, +) -> *mut PyObject { + with_vm(|vm| { + let s = unsafe { &*s }.try_downcast_ref::<PyStr>(vm)?; + let sep = unsafe { &*sep }.try_downcast_ref::<PyStr>(vm)?; + s.partition(sep.to_owned(), vm) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyUnicode_RPartition( + s: *mut PyObject, + sep: *mut PyObject, +) -> *mut PyObject { + with_vm(|vm| { + let s = unsafe { &*s }.try_downcast_ref::<PyStr>(vm)?; + let sep = unsafe { &*sep }.try_downcast_ref::<PyStr>(vm)?; + s.rpartition(sep.to_owned(), vm) + }) +} + +#[unsafe(no_mangle)] +pub unsafe extern "C" fn PyUnicode_Translate( + str_obj: *mut PyObject, + table: *mut PyObject, + _errors: *const c_char, +) -> *mut PyObject { + with_vm(|vm| { + let str_obj = unsafe { &*str_obj }.try_downcast_ref::<PyStr>(vm)?; + Ok(str_obj + .translate(unsafe { &*table }.to_owned(), vm)? + .to_pyobject(vm)) + }) +} + #[unsafe(no_mangle)] pub unsafe extern "C" fn PyUnicode_InternInPlace(string: *mut *mut PyObject) { with_vm(|vm| { diff --git a/crates/vm/src/builtins/str.rs b/crates/vm/src/builtins/str.rs index bd5cd39dd..b1c2c4197 100644 --- a/crates/vm/src/builtins/str.rs +++ b/crates/vm/src/builtins/str.rs @@ -977,7 +977,7 @@ impl PyStr { !self.data.is_empty() && self.char_all(unicode::classify::is_decimal) } - fn __mod__(&self, values: PyObjectRef, vm: &VirtualMachine) -> PyResult<Wtf8Buf> { + pub fn __mod__(&self, values: PyObjectRef, vm: &VirtualMachine) -> PyResult<Wtf8Buf> { cformat_string(vm, self.as_wtf8(), values) } @@ -1192,7 +1192,7 @@ impl PyStr { } #[pymethod] - fn partition(&self, sep: PyStrRef, vm: &VirtualMachine) -> PyResult { + pub fn partition(&self, sep: PyStrRef, vm: &VirtualMachine) -> PyResult { let (front, has_mid, back) = self.as_wtf8().py_partition( sep.as_wtf8(), || self.as_wtf8().splitn(2, sep.as_wtf8()), @@ -1211,7 +1211,7 @@ impl PyStr { } #[pymethod] - fn rpartition(&self, sep: PyStrRef, vm: &VirtualMachine) -> PyResult { + pub fn rpartition(&self, sep: PyStrRef, vm: &VirtualMachine) -> PyResult { let (back, has_mid, front) = self.as_wtf8().py_partition( sep.as_wtf8(), || self.as_wtf8().rsplitn(2, sep.as_wtf8()), @@ -1344,7 +1344,7 @@ impl PyStr { // https://docs.python.org/3/library/stdtypes.html#str.translate #[pymethod] - fn translate(&self, table: PyObjectRef, vm: &VirtualMachine) -> PyResult<Wtf8Buf> { + pub fn translate(&self, table: PyObjectRef, vm: &VirtualMachine) -> PyResult<Wtf8Buf> { vm.get_method_or_type_error(table.clone(), identifier!(vm, __getitem__), || { format!("'{}' object is not subscriptable", table.class().name()) })?; From 79f7da3b472f22700422e7435c1c596c3e798141 Mon Sep 17 00:00:00 2001 From: Yubin Kim <80163835+devyubin@users.noreply.github.com> Date: Wed, 22 Jul 2026 20:31:31 +0900 Subject: [PATCH 279/339] bytes: support keyword arguments in hex() (#8312) * bytes: support keyword arguments in hex() * bytes: unmark test_memoryview_hex_separator --- Lib/test/test_bytes.py | 1 - Lib/test/test_memoryview.py | 1 - crates/vm/src/builtins/bytearray.rs | 16 ++++++---------- crates/vm/src/builtins/bytes.rs | 8 ++++---- crates/vm/src/builtins/memory.rs | 12 ++++-------- crates/vm/src/bytes_inner.rs | 8 ++++++++ 6 files changed, 22 insertions(+), 24 deletions(-) diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py index 70af9af46..7bddc0281 100644 --- a/Lib/test/test_bytes.py +++ b/Lib/test/test_bytes.py @@ -518,7 +518,6 @@ class BaseBytesTest: self.assertEqual(self.type2test(b"\x1a\x2b\x30").hex(), '1a2b30') self.assertEqual(memoryview(b"\x1a\x2b\x30").hex(), '1a2b30') - @unittest.expectedFailure # TODO: RUSTPYTHON; TypeError: Unexpected keyword argument sep def test_hex_separator_basics(self): three_bytes = self.type2test(b'\xb9\x01\xef') self.assertEqual(three_bytes.hex(), 'b901ef') diff --git a/Lib/test/test_memoryview.py b/Lib/test/test_memoryview.py index 7889fa88d..12e3504e4 100644 --- a/Lib/test/test_memoryview.py +++ b/Lib/test/test_memoryview.py @@ -664,7 +664,6 @@ class OtherTest(unittest.TestCase): m2 = m1[::-1] self.assertEqual(m2.hex(), '30' * 200000) - @unittest.expectedFailure # TODO: RUSTPYTHON; TypeError: Unexpected keyword argument sep def test_memoryview_hex_separator(self): x = bytes(range(97, 102)) m1 = memoryview(x) diff --git a/crates/vm/src/builtins/bytearray.rs b/crates/vm/src/builtins/bytearray.rs index 63b10552f..a649fe9d8 100644 --- a/crates/vm/src/builtins/bytearray.rs +++ b/crates/vm/src/builtins/bytearray.rs @@ -1,7 +1,7 @@ //! Implementation of the python bytearray object. use super::{ - PositionIterInternal, PyBytes, PyBytesRef, PyDictRef, PyGenericAlias, PyIntRef, PyStrRef, - PyTuple, PyTupleRef, PyType, PyTypeRef, iter::builtins_iter, + PositionIterInternal, PyBytes, PyDictRef, PyGenericAlias, PyIntRef, PyStrRef, PyTuple, + PyTupleRef, PyType, PyTypeRef, iter::builtins_iter, }; use crate::{ AsObject, Context, Py, PyObject, PyObjectRef, PyPayload, PyRef, PyResult, TryFromObject, @@ -10,8 +10,8 @@ use crate::{ atomic_func, byte::{bytes_from_object, value_from_object}, bytes_inner::{ - ByteInnerFindOptions, ByteInnerNewOptions, ByteInnerPaddingOptions, ByteInnerSplitOptions, - ByteInnerTranslateOptions, DecodeArgs, PyBytesInner, bytes_decode, + ByteInnerFindOptions, ByteInnerHexOptions, ByteInnerNewOptions, ByteInnerPaddingOptions, + ByteInnerSplitOptions, ByteInnerTranslateOptions, DecodeArgs, PyBytesInner, bytes_decode, }, class::PyClassImpl, common::{ @@ -321,12 +321,8 @@ impl PyByteArray { } #[pymethod] - fn hex( - &self, - sep: OptionalArg<Either<PyStrRef, PyBytesRef>>, - bytes_per_sep: OptionalArg<isize>, - vm: &VirtualMachine, - ) -> PyResult<String> { + fn hex(&self, options: ByteInnerHexOptions, vm: &VirtualMachine) -> PyResult<String> { + let ByteInnerHexOptions { sep, bytes_per_sep } = options; self.inner().hex(sep, bytes_per_sep, vm) } diff --git a/crates/vm/src/builtins/bytes.rs b/crates/vm/src/builtins/bytes.rs index f28e8ddbb..ca40b3d3b 100644 --- a/crates/vm/src/builtins/bytes.rs +++ b/crates/vm/src/builtins/bytes.rs @@ -9,8 +9,8 @@ use crate::{ anystr::{self, AnyStr}, atomic_func, bytes_inner::{ - ByteInnerFindOptions, ByteInnerNewOptions, ByteInnerPaddingOptions, ByteInnerSplitOptions, - ByteInnerTranslateOptions, DecodeArgs, PyBytesInner, bytes_decode, + ByteInnerFindOptions, ByteInnerHexOptions, ByteInnerNewOptions, ByteInnerPaddingOptions, + ByteInnerSplitOptions, ByteInnerTranslateOptions, DecodeArgs, PyBytesInner, bytes_decode, }, class::PyClassImpl, common::{hash::PyHash, lock::PyMutex}, @@ -318,10 +318,10 @@ impl PyBytes { #[pymethod] pub(crate) fn hex( &self, - sep: OptionalArg<Either<PyStrRef, PyBytesRef>>, - bytes_per_sep: OptionalArg<isize>, + options: ByteInnerHexOptions, vm: &VirtualMachine, ) -> PyResult<String> { + let ByteInnerHexOptions { sep, bytes_per_sep } = options; self.inner.hex(sep, bytes_per_sep, vm) } diff --git a/crates/vm/src/builtins/memory.rs b/crates/vm/src/builtins/memory.rs index f40350982..ee5a07128 100644 --- a/crates/vm/src/builtins/memory.rs +++ b/crates/vm/src/builtins/memory.rs @@ -1,13 +1,13 @@ use super::{ PositionIterInternal, PyBytes, PyBytesRef, PyGenericAlias, PyInt, PyListRef, PySlice, PyStr, - PyStrRef, PyTuple, PyTupleRef, PyType, PyTypeRef, PyUtf8StrRef, iter::builtins_iter, + PyTuple, PyTupleRef, PyType, PyTypeRef, PyUtf8StrRef, iter::builtins_iter, }; use crate::common::lock::LazyLock; use crate::{ AsObject, Context, Py, PyObject, PyObjectRef, PyPayload, PyRef, PyResult, TryFromBorrowedObject, TryFromObject, VirtualMachine, atomic_func, buffer::FormatSpec, - bytes_inner::bytes_to_hex, + bytes_inner::{ByteInnerHexOptions, bytes_to_hex}, class::PyClassImpl, common::{ borrow::{BorrowedValue, BorrowedValueMut}, @@ -739,12 +739,8 @@ impl PyMemoryView { } #[pymethod] - fn hex( - &self, - sep: OptionalArg<Either<PyStrRef, PyBytesRef>>, - bytes_per_sep: OptionalArg<isize>, - vm: &VirtualMachine, - ) -> PyResult<String> { + fn hex(&self, options: ByteInnerHexOptions, vm: &VirtualMachine) -> PyResult<String> { + let ByteInnerHexOptions { sep, bytes_per_sep } = options; self.try_not_released(vm)?; self.contiguous_or_collect(|x| bytes_to_hex(x, sep, bytes_per_sep, vm)) } diff --git a/crates/vm/src/bytes_inner.rs b/crates/vm/src/bytes_inner.rs index 9cfe4d760..51c659f58 100644 --- a/crates/vm/src/bytes_inner.rs +++ b/crates/vm/src/bytes_inner.rs @@ -1113,6 +1113,14 @@ pub(crate) fn bytes_decode( .decode_text(zelf, encoding, errors, vm) } +#[derive(FromArgs)] +pub(crate) struct ByteInnerHexOptions { + #[pyarg(any, optional)] + pub sep: OptionalArg<Either<PyStrRef, PyBytesRef>>, + #[pyarg(any, optional)] + pub bytes_per_sep: OptionalArg<isize>, +} + fn hex_impl_no_sep(bytes: &[u8]) -> String { let mut buf: Vec<u8> = vec![0; bytes.len() * 2]; hex::encode_to_slice(bytes, buf.as_mut_slice()).unwrap(); From a9dd9e52644e26e12d39677a54367e458d126ee3 Mon Sep 17 00:00:00 2001 From: cui fliter <imcusg@gmail.com> Date: Wed, 22 Jul 2026 19:32:39 +0800 Subject: [PATCH 280/339] Fix bytearray repr escaping for apostrophes (#8316) Signed-off-by: cuishuang <imcusg@gmail.com> --- Lib/test/test_bytes.py | 2 -- crates/vm/src/bytes_inner.rs | 57 +++++++++++++++++++++++++++++++----- 2 files changed, 49 insertions(+), 10 deletions(-) diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py index 7bddc0281..32a9ca7df 100644 --- a/Lib/test/test_bytes.py +++ b/Lib/test/test_bytes.py @@ -2101,7 +2101,6 @@ class AssortedBytesTest(unittest.TestCase): self.assertEqual(f(b"'\"'"), r"""b'\'"\''""") # '\'"\'' self.assertEqual(f(BytesSubclass(b"abc")), "b'abc'") - @unittest.expectedFailure # TODO: RUSTPYTHON def test_bytearray_repr(self, f=repr): self.assertEqual(f(bytearray()), "bytearray(b'')") self.assertEqual(f(bytearray(b'abc')), "bytearray(b'abc')") @@ -2123,7 +2122,6 @@ class AssortedBytesTest(unittest.TestCase): def test_bytes_str(self): self.test_bytes_repr(str) - @unittest.expectedFailure # TODO: RUSTPYTHON @check_bytes_warnings def test_bytearray_str(self): self.test_bytearray_repr(str) diff --git a/crates/vm/src/bytes_inner.rs b/crates/vm/src/bytes_inner.rs index 51c659f58..0bf6c1372 100644 --- a/crates/vm/src/bytes_inner.rs +++ b/crates/vm/src/bytes_inner.rs @@ -228,6 +228,31 @@ impl ByteInnerTranslateOptions { pub(crate) type ByteInnerSplitOptions = anystr::SplitArgs<PyBytesInner>; +fn bytearray_repr_char_len(ch: u8) -> usize { + match ch { + b'\'' | b'\\' | b'\t' | b'\r' | b'\n' => 2, + 0x20..=0x7e => 1, + _ => 4, // \xHH + } +} + +fn write_bytearray_repr_char(ch: u8, buf: &mut String) { + match ch { + b'\'' => buf.push_str(r#"\'"#), + b'\\' => buf.push_str(r#"\\"#), + b'\t' => buf.push_str(r#"\t"#), + b'\n' => buf.push_str(r#"\n"#), + b'\r' => buf.push_str(r#"\r"#), + 0x20..=0x7e => buf.push(ch as char), + ch => { + const HEX: &[u8; 16] = b"0123456789abcdef"; + buf.push_str(r#"\x"#); + buf.push(HEX[(ch >> 4) as usize] as char); + buf.push(HEX[(ch & 0x0f) as usize] as char); + } + } +} + impl PyBytesInner { #[inline] pub fn as_bytes(&self) -> &[u8] { @@ -251,17 +276,33 @@ impl PyBytesInner { } pub fn repr_with_name(&self, class_name: &str, vm: &VirtualMachine) -> PyResult<String> { - const DECORATION_LEN: isize = 2 + 3; // 2 for (), 3 for b"" => bytearray(b"") - let escape = crate::literal::escape::AsciiEscape::new_repr(&self.elements); - let len = escape - .layout() - .len - .and_then(|len| (len as isize).checked_add(DECORATION_LEN + class_name.len() as isize)) - .ok_or_else(|| Self::new_repr_overflow_error(vm))? as usize; + const DECORATION_LEN: usize = 2 + 3; // 2 for (), 3 for b"" => bytearray(b"") + let quote = if self.elements.contains(&b'\'') && !self.elements.contains(&b'"') { + '"' + } else { + '\'' + }; + let body_len = self + .elements + .iter() + .try_fold(0usize, |len, &ch| { + len.checked_add(bytearray_repr_char_len(ch)) + }) + .ok_or_else(|| Self::new_repr_overflow_error(vm))?; + let len = class_name + .len() + .checked_add(DECORATION_LEN) + .and_then(|len| len.checked_add(body_len)) + .ok_or_else(|| Self::new_repr_overflow_error(vm))?; let mut buf = String::with_capacity(len); buf.push_str(class_name); buf.push('('); - escape.bytes_repr().write(&mut buf).unwrap(); + buf.push('b'); + buf.push(quote); + for &ch in &self.elements { + write_bytearray_repr_char(ch, &mut buf); + } + buf.push(quote); buf.push(')'); debug_assert_eq!(buf.len(), len); Ok(buf) From 9c19f4efec006a56502750055ff99a62d0ef5691 Mon Sep 17 00:00:00 2001 From: Jeaeun Kim <109906379+kyokuping@users.noreply.github.com> Date: Wed, 22 Jul 2026 20:34:20 +0900 Subject: [PATCH 281/339] Fix thread UnraisableException object to be None (#8326) Assisted-by: Codex:gpt-5 --- Lib/test/test_thread.py | 1 - crates/vm/src/stdlib/_thread.rs | 30 +++++++++++++++++++----------- crates/vm/src/vm/mod.rs | 26 ++++++++++++++++---------- 3 files changed, 35 insertions(+), 22 deletions(-) diff --git a/Lib/test/test_thread.py b/Lib/test/test_thread.py index 22b19ee3d..ebb193eab 100644 --- a/Lib/test/test_thread.py +++ b/Lib/test/test_thread.py @@ -151,7 +151,6 @@ class ThreadRunningTests(BasicThreadTest): support.gc_collect() # For PyPy or other GCs. self.assertEqual(thread._count(), orig) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_unraisable_exception(self): def task(): started.release() diff --git a/crates/vm/src/stdlib/_thread.rs b/crates/vm/src/stdlib/_thread.rs index 0079f15df..91fec0a02 100644 --- a/crates/vm/src/stdlib/_thread.rs +++ b/crates/vm/src/stdlib/_thread.rs @@ -20,7 +20,10 @@ pub(crate) mod _thread { use crate::{ AsObject, Py, PyPayload, PyRef, PyResult, VirtualMachine, - builtins::{PyDictRef, PyIntRef, PyStr, PyTupleRef, PyType, PyTypeRef, PyUtf8StrRef}, + builtins::{ + PyBaseExceptionRef, PyDictRef, PyIntRef, PyStr, PyTupleRef, PyType, PyTypeRef, + PyUtf8StrRef, + }, common::wtf8::Wtf8Buf, frame::FrameRef, function::{ArgCallable, FuncArgs, KwArgs, OptionalArg, PySetterValue, TimeoutSeconds}, @@ -558,6 +561,19 @@ pub(crate) mod _thread { .map_err(|_err| vm.new_runtime_error("can't start new thread")) } + fn report_unraisable_thread_exception( + exc: PyBaseExceptionRef, + func: &ArgCallable, + vm: &VirtualMachine, + ) { + let msg = func + .as_ref() + .repr(vm) + .ok() + .map(|repr| format!("Exception ignored in thread started by {}", repr.as_wtf8())); + vm.run_unraisable(exc, msg, vm.ctx.none()); + } + fn run_thread(func: ArgCallable, args: FuncArgs, vm: &VirtualMachine) { // Increment thread count when thread actually starts executing vm.state.thread_count.fetch_add(1); @@ -572,11 +588,7 @@ pub(crate) mod _thread { if let Err(exc) = func.invoke(args, vm) && !exc.fast_isinstance(vm.ctx.exceptions.system_exit) { - vm.run_unraisable( - exc, - Some("Exception ignored in thread started by".to_owned()), - func.into(), - ); + report_unraisable_thread_exception(exc, &func, vm); } } for lock in SENTINELS.take() { @@ -1755,11 +1767,7 @@ pub(crate) mod _thread { if let Err(exc) = func.invoke((), vm) && !exc.fast_isinstance(vm.ctx.exceptions.system_exit) { - vm.run_unraisable( - exc, - Some("Exception ignored in thread started by".to_owned()), - func.into(), - ); + report_unraisable_thread_exception(exc, &func, vm); } } })) diff --git a/crates/vm/src/vm/mod.rs b/crates/vm/src/vm/mod.rs index 28eb111a9..3062ea07f 100644 --- a/crates/vm/src/vm/mod.rs +++ b/crates/vm/src/vm/mod.rs @@ -1296,18 +1296,24 @@ impl VirtualMachine { } }; - let msg_str = if let Some(msg) = msg { - format!("{msg}: ") + if self.is_none(object) { + if let Some(msg) = msg { + write_to_stderr(&format!("{msg}:\n"), &stderr, self); + } } else { - "Exception ignored in: ".to_owned() - }; - write_to_stderr(&msg_str, &stderr, self); + let msg_str = if let Some(msg) = msg { + format!("{msg}: ") + } else { + "Exception ignored in: ".to_owned() + }; + write_to_stderr(&msg_str, &stderr, self); - let repr_result = object.repr(self); - let repr_wtf8 = repr_result - .as_ref() - .map_or_else(|_| "<object repr failed>".as_ref(), |s| s.as_wtf8()); - write_to_stderr(&format!("{repr_wtf8}\n"), &stderr, self); + let repr_result = object.repr(self); + let repr_wtf8 = repr_result + .as_ref() + .map_or_else(|_| "<object repr failed>".as_ref(), |s| s.as_wtf8()); + write_to_stderr(&format!("{repr_wtf8}\n"), &stderr, self); + } // Write exception type and message let exc_type_name = e.class().name(); From 16917e0f2ab27679117e0204c396aee02ecc2d7c Mon Sep 17 00:00:00 2001 From: "Jeong, YunWon" <69878+youknowone@users.noreply.github.com> Date: Thu, 23 Jul 2026 16:18:09 +0900 Subject: [PATCH 282/339] Use dict keys-version stamps and entry-index hints in LOAD_ATTR/STORE_ATTR specializations (#8350) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Use dict keys-version stamps and entry-index hints in attr specializations Add a keys-version stamp to Dict: a globally unique u32 assigned lazily and reset on any key-set change (new key, deletion, clear). Value-only updates keep the stamp. - LoadAttrMethodWithValues / LoadAttrNondescriptorWithValues: cache the instance dict's stamp in the pointer cache and skip the shadow probe while the stamp matches. - LoadAttrWithHint: cache the entry index at specialization time; a hit is an identity check on the entry key instead of a hash probe, with self-refresh on miss. - StoreAttrWithHint / StoreAttrInstanceValue: replace values through the cached entry index via set_item_with_hint. Fixes youknowone#42 Assisted-by: Claude * Share keys-version stamps between dicts with identical layouts Derive the keys-version stamp from a shape — the ordered interned-key sequence of a hole-free dict — instead of always allocating a unique stamp. Dicts with identical layouts (instances of the same class built by the same __init__) now carry equal stamps, so a LOAD_ATTR cache entry populated by one instance skips the shadow probe for every instance sharing the layout. Shapes are held in a fixed-size lock-free table keyed by interned key addresses; dicts with holes, non-interned keys, or more than 32 keys fall back to dict-unique stamps. Assisted-by: Claude * Address clippy and review feedback for keys-version stamps - Use BuildHasher::hash_one for shape hashing (clippy manual_hash_one) - Fix set_item_with_hint doc: a refreshed hint is returned on any hint miss, not only when the hinted slot was vacant - Route both holey-dict instances through a single LOAD_ATTR cache site in the snippet test Assisted-by: Claude * Restore try_read_cached_descriptor doc comment to its function The doc block and #[inline] were left attached to store_attr_dict_hinted when it was inserted above try_read_cached_descriptor. Assisted-by: Claude * Specialize LoadAttrWithHint even when the entry index exceeds u16 hint_for_key returns None both for an absent key and for a present key whose entry index does not fit in u16, so very large instance dicts stopped specializing entirely. Use get_item_opt_refresh_hint to decide presence, degrading an unrepresentable hint to 0: the handler then keeps taking its full-probe fallback path. Assisted-by: Claude --- crates/compiler-core/src/bytecode.rs | 9 +- crates/vm/src/builtins/dict.rs | 57 +++++ crates/vm/src/dict_inner.rs | 245 +++++++++++++++++++++- crates/vm/src/frame.rs | 137 ++++++++---- extra_tests/snippets/vm_specialization.py | 142 +++++++++++++ 5 files changed, 550 insertions(+), 40 deletions(-) diff --git a/crates/compiler-core/src/bytecode.rs b/crates/compiler-core/src/bytecode.rs index c01f2f057..3a7eec439 100644 --- a/crates/compiler-core/src/bytecode.rs +++ b/crates/compiler-core/src/bytecode.rs @@ -776,12 +776,15 @@ impl CodeUnits { /// Store a pointer-sized value atomically in the pointer cache at `index`. /// /// Uses a single `AtomicUsize` store to prevent torn writes when - /// multiple threads specialize the same instruction concurrently. + /// multiple threads specialize the same instruction concurrently. The + /// tear-free width also makes this the right slot for non-pointer guard + /// values (e.g. dict keys-version stamps) that must never be observed + /// half-written. /// /// # Safety /// - `index` must be in bounds. - /// - `value` must be `0` or a valid `*const PyObject` encoded as `usize`. - /// - Callers must follow the cache invalidation/upgrade protocol: + /// - When the slot holds a `*const PyObject` encoded as `usize` (or `0`), + /// callers must follow the cache invalidation/upgrade protocol: /// invalidate the version guard before writing and publish the new /// version after writing. pub unsafe fn write_cache_ptr(&self, index: usize, value: usize) { diff --git a/crates/vm/src/builtins/dict.rs b/crates/vm/src/builtins/dict.rs index 06791410e..d14536eef 100644 --- a/crates/vm/src/builtins/dict.rs +++ b/crates/vm/src/builtins/dict.rs @@ -753,6 +753,63 @@ impl Py<PyDict> { } } + /// Lookup trying a cached entry index hint first. + /// + /// When the hint misses but the key is present, also returns a refreshed + /// hint (`None` when the hint hit or no hint is representable). + pub(crate) fn get_item_opt_refresh_hint<K: DictKey + ?Sized>( + &self, + key: &K, + hint: u16, + vm: &VirtualMachine, + ) -> PyResult<Option<(PyObjectRef, Option<u16>)>> { + if self.exact_dict(vm) { + if let Some(value) = self.entries.get_hint(vm, key, usize::from(hint))? { + return Ok(Some((value, None))); + } + self.entries.get_with_hint(vm, key) + } else { + Ok(self.get_item_opt(key, vm)?.map(|value| (value, None))) + } + } + + /// Store using a cached entry index hint for the value-replace fast path. + /// + /// On a hint miss, returns a refreshed hint for the key (`None` when the + /// hint hit or no hint is representable). + pub(crate) fn set_item_with_hint<K: DictKey + ?Sized>( + &self, + key: &K, + hint: u16, + value: PyObjectRef, + vm: &VirtualMachine, + ) -> PyResult<Option<u16>> { + if self.exact_dict(vm) { + self.entries + .insert_with_hint(vm, key, usize::from(hint), value) + } else { + self.as_object().set_item(key, value, vm)?; + Ok(None) + } + } + + /// Current keys-version stamp of the underlying storage (0 if unset). + pub(crate) fn keys_version(&self) -> u32 { + self.entries.keys_version() + } + + /// Current keys-version stamp, assigning one if none is set. + /// + /// Returns 0 for dict subclasses: their lookup can be overridden, so a + /// key-set attestation on the raw storage must never be cached for them. + pub(crate) fn assign_keys_version(&self, vm: &VirtualMachine) -> u32 { + if self.exact_dict(vm) { + self.entries.assign_keys_version() + } else { + 0 + } + } + pub fn get_item<K: DictKey + ?Sized>(&self, key: &K, vm: &VirtualMachine) -> PyResult { if self.exact_dict(vm) { self.inner_getitem(key, vm) diff --git a/crates/vm/src/dict_inner.rs b/crates/vm/src/dict_inner.rs index 8112bbe25..3b5f5617f 100644 --- a/crates/vm/src/dict_inner.rs +++ b/crates/vm/src/dict_inner.rs @@ -20,8 +20,8 @@ use alloc::fmt; use core::mem::size_of; use core::ops::ControlFlow; use core::sync::atomic::{ - AtomicU64, - Ordering::{Acquire, Release}, + AtomicU32, AtomicU64, + Ordering::{AcqRel, Acquire, Relaxed, Release}, }; use num_traits::ToPrimitive; @@ -40,6 +40,104 @@ type EntryIndex = usize; pub(crate) struct Dict<T = PyObjectRef> { inner: PyRwLock<DictInner<T>>, version: AtomicU64, + /// Keys-version stamp, assigned lazily by `assign_keys_version` and + /// reset to 0 whenever the key set changes. Value-only updates keep it. + /// + /// A nonzero stamp identifies either a *shape* — an exact hole-free + /// entry sequence of interned string keys, shared by every dict with + /// that layout — or, when no shape is derivable, this dict's key set + /// frozen at assignment time. Either way a stamp match guarantees the + /// entry layout is exactly the one the stamp was issued for, so entry + /// indexes cached against a stamp stay valid wherever the stamp matches. + keys_version: AtomicU32, +} + +/// Source of keys-version stamps. Allocated globally so a shape stamp and a +/// dict-unique stamp can never collide. +static KEYS_VERSION: AtomicU32 = AtomicU32::new(0); + +/// Allocate a new keys-version stamp. Returns 0 once the stamp space is +/// exhausted; stamps are only allocated on specialization, so exhaustion is +/// unrealistic in practice. +fn next_keys_version() -> u32 { + KEYS_VERSION + .fetch_update(Relaxed, Relaxed, |v| v.checked_add(1)) + .map_or(0, |v| v + 1) +} + +/// Largest key count eligible for a shared shape stamp. +const SHAPE_MAX_KEYS: usize = 32; +/// Shape registry slot count (power of two). +const SHAPE_TABLE_SIZE: usize = 1 << 12; +/// Linear-probe limit before giving up on registering a shape. +const SHAPE_MAX_PROBE: usize = 8; + +/// A registered shape: the ordered interned-key-pointer sequence of a +/// hole-free dict, plus the stamp shared by every dict with that layout. +/// Interned strings are never freed, so the addresses are stable identities. +struct ShapeData { + keys: Box<[usize]>, + stamp: u32, +} + +/// Lock-free registry mapping shapes to shared stamps. Fixed-size open +/// addressing; slots are installed with CAS and never removed, so a stamp +/// permanently means "exactly this entry sequence". Registered `ShapeData` +/// is intentionally leaked (bounded by the table size). Lock-free makes the +/// registry safe across fork() without reinitialization. +static SHAPE_TABLE: std::sync::LazyLock<Box<[core::sync::atomic::AtomicPtr<ShapeData>]>> = + std::sync::LazyLock::new(|| { + (0..SHAPE_TABLE_SIZE) + .map(|_| core::sync::atomic::AtomicPtr::new(core::ptr::null_mut())) + .collect() + }); + +fn shape_stamp(shape: &[usize]) -> Option<u32> { + use core::hash::BuildHasher; + use core::sync::atomic::AtomicPtr; + // The hasher seed must be process-stable so equal shapes always probe + // the same slots. + static SHAPE_HASHER: std::sync::LazyLock<rapidhash::quality::RandomState> = + std::sync::LazyLock::new(Default::default); + let hash = SHAPE_HASHER.hash_one(shape) as usize; + let mut candidate: *mut ShapeData = core::ptr::null_mut(); + let mut result = None; + for probe in 0..SHAPE_MAX_PROBE { + let slot: &AtomicPtr<ShapeData> = &SHAPE_TABLE[(hash + probe) & (SHAPE_TABLE_SIZE - 1)]; + let mut installed = slot.load(Acquire); + if installed.is_null() { + if candidate.is_null() { + let stamp = next_keys_version(); + if stamp == 0 { + break; + } + candidate = Box::into_raw(Box::new(ShapeData { + keys: shape.into(), + stamp, + })); + } + match slot.compare_exchange(core::ptr::null_mut(), candidate, AcqRel, Acquire) { + Ok(_) => { + // SAFETY: candidate was just leaked into the table. + result = Some(unsafe { (*candidate).stamp }); + candidate = core::ptr::null_mut(); + break; + } + Err(current) => installed = current, + } + } + // SAFETY: non-null slots reference leaked ShapeData, never freed. + let data = unsafe { &*installed }; + if *data.keys == *shape { + result = Some(data.stamp); + break; + } + } + if !candidate.is_null() { + // SAFETY: the candidate lost the race and was never shared. + drop(unsafe { Box::from_raw(candidate) }); + } + result } unsafe impl<T: Traverse> Traverse for Dict<T> { @@ -105,6 +203,7 @@ impl<T: Clone> Clone for Dict<T> { Self { inner: PyRwLock::new(self.inner.read().clone()), version: AtomicU64::new(0), + keys_version: AtomicU32::new(0), } } } @@ -119,6 +218,7 @@ impl<T> Default for Dict<T> { entries: Vec::new(), }), version: AtomicU64::new(0), + keys_version: AtomicU32::new(0), } } } @@ -272,6 +372,83 @@ impl<T: Clone> Dict<T> { self.version.fetch_add(1, Release); } + /// Current keys-version stamp, or 0 if none has been assigned since the + /// last key-set change. Equal nonzero stamps guarantee an unchanged key + /// set (values may differ). + pub(crate) fn keys_version(&self) -> u32 { + self.keys_version.load(Acquire) + } + + /// Return the current keys-version stamp, assigning one if none is set. + /// Returns 0 only if no stamp could be allocated. + /// + /// When the dict is hole-free and all keys are interned strings, the + /// stamp is the *shared shape stamp* for that exact key sequence, so + /// dicts with identical layouts (e.g. instances of the same class built + /// by the same `__init__`) carry equal stamps and one cached stamp or + /// entry index serves them all. Otherwise a dict-unique stamp is used. + /// + /// The shape inspection and the stamp install happen under the inner + /// read lock. Key-set changes reset the stamp under the write lock, so + /// an installed stamp always attests the layout it was derived from. + pub(crate) fn assign_keys_version(&self) -> u32 { + let version = self.keys_version.load(Acquire); + if version != 0 { + return version; + } + let inner = self.read(); + // Re-check under the lock: a concurrent assign may have won. + let version = self.keys_version.load(Acquire); + if version != 0 { + return version; + } + let new_version = Self::derive_shape_stamp(&inner).unwrap_or_else(next_keys_version); + if new_version == 0 { + return 0; + } + // Only install over 0 so an already-valid stamp is never replaced. + match self + .keys_version + .compare_exchange(0, new_version, AcqRel, Acquire) + { + Ok(_) => new_version, + Err(current) => current, + } + } + + /// Compute the shared shape stamp for the current layout, if it + /// qualifies: hole-free entries, bounded size, all keys interned strings. + fn derive_shape_stamp(inner: &DictInner<T>) -> Option<u32> { + if inner.entries.len() != inner.used || inner.used > SHAPE_MAX_KEYS { + return None; + } + let shape = inner + .entries + .iter() + .map(|entry| { + let key = &entry.as_ref()?.key; + key.is_interned() + .then(|| key.as_ref() as *const PyObject as usize) + }) + .collect::<Option<Vec<usize>>>()?; + shape_stamp(&shape) + } + + /// Reset the keys-version stamp on a key-set change (insert of a new + /// key, deletion, or clear). Value-only updates keep the stamp. + /// + /// Must be called while holding the write lock, *before* the key set is + /// modified: a lock-free stamp reader that still observes the old stamp + /// then provably ran before the change became visible, so acting on the + /// old key set is linearizable. A stamp assigned concurrently (between + /// this reset and the mutation) can only be trusted by a caller whose + /// subsequent probe serializes after the mutation through the inner + /// lock, which then reflects the new key set. Since stamps are never + /// reused, a cached stamp can never spuriously match again. + fn invalidate_keys_version(&self) { + self.keys_version.store(0, Release); + } + fn read(&self) -> PyRwLockReadGuard<'_, DictInner<T>> { self.inner.read() } @@ -320,6 +497,7 @@ impl<T: Clone> Dict<T> { // Dict was resized since lookup, retry continue; } + self.invalidate_keys_version(); inner.unchecked_push(index_index, hash, key.to_pyobject(vm), value, entry_index); self.bump_version(); break None; @@ -366,6 +544,62 @@ impl<T: Clone> Dict<T> { Ok(u16::try_from(index).ok()) } + /// Retrieve a key along with its entry index, for hint caching. + /// + /// Same as [`Self::get`], but on a hit also returns the entry index + /// usable as a `hint` for [`Self::get_hint`] (`None` if it doesn't fit). + pub(crate) fn get_with_hint<K: DictKey + ?Sized>( + &self, + vm: &VirtualMachine, + key: &K, + ) -> PyResult<Option<(T, Option<u16>)>> { + let hash = key.key_hash(vm)?; + let ret = loop { + let (entry, index_index) = self.lookup(vm, key, hash, None)?; + if let Some(index) = entry.index() { + let inner = self.read(); + if let Some(entry) = inner.get_entry_checked(index, index_index) { + // The dict was not changed since we did lookup + break Some((entry.value.clone(), u16::try_from(index).ok())); + } + // The dict was changed since we did lookup. Let's try again. + } else { + break None; + } + }; + Ok(ret) + } + + /// Replace the value at entry index `hint` if that entry's key is + /// identical to `key`, otherwise fall back to a full probing store. + /// + /// On a hint miss, returns a refreshed hint for the key (`None` when the + /// hint hit or no hint is representable). + pub(crate) fn insert_with_hint<K: DictKey + ?Sized>( + &self, + vm: &VirtualMachine, + key: &K, + hint: usize, + value: T, + ) -> PyResult<Option<u16>> { + let value = { + let mut inner = self.write(); + match inner.entries.get_mut(hint) { + Some(Some(entry)) if key.key_is(&entry.key) => { + let removed = core::mem::replace(&mut entry.value, value); + self.bump_version(); + drop(inner); + // defer dec RC until after the lock is released + drop(removed); + return Ok(None); + } + _ => value, + } + }; + self.insert(vm, key, value)?; + self.hint_for_key(vm, key) + } + /// Fast path lookup using a cached entry index (`hint`). /// /// Returns `None` if the hint is stale or the key no longer matches. @@ -433,6 +667,7 @@ impl<T: Clone> Dict<T> { pub(crate) fn clear(&self) { let _removed = { let mut inner = self.write(); + self.invalidate_keys_version(); inner.indices.clear(); inner.indices.resize(8, IndexEntry::FREE); inner.used = 0; @@ -521,6 +756,7 @@ impl<T: Clone> Dict<T> { if inner.indices.get(index_index) != Some(&entry) { continue; } + self.invalidate_keys_version(); inner.unchecked_push(index_index, hash, key.to_owned(), value, entry); self.bump_version(); break None; @@ -551,6 +787,7 @@ impl<T: Clone> Dict<T> { let value = default .take() .expect("default must only be computed on insertion")(); + self.invalidate_keys_version(); inner.unchecked_push( index_index, hash, @@ -594,6 +831,7 @@ impl<T: Clone> Dict<T> { .expect("default must only be computed on insertion")(); let key_obj = key.to_pyobject(vm); let ret = (key_obj.clone(), value.clone()); + self.invalidate_keys_version(); inner.unchecked_push(index_index, hash, key_obj, value, index_entry); self.bump_version(); return Ok(ret); @@ -787,6 +1025,7 @@ impl<T: Clone> Dict<T> { // The dict was changed since we did lookup. Let's try again. _ => return Ok(ControlFlow::Continue(())), } + self.invalidate_keys_version(); *unsafe { // index_index is result of lookup inner.indices.get_unchecked_mut(index_index) @@ -822,6 +1061,7 @@ impl<T: Clone> Dict<T> { break entry; } }; + self.invalidate_keys_version(); inner.used -= 1; *unsafe { // entry.index always refers valid index @@ -843,6 +1083,7 @@ impl<T: Clone> Dict<T> { /// This is used for circular reference resolution in GC. /// Requires &mut self to avoid lock contention. pub(crate) fn drain_entries(&mut self) -> impl Iterator<Item = (PyObjectRef, T)> + '_ { + self.keys_version.store(0, Release); let inner = self.inner.get_mut(); inner.used = 0; inner.filled = 0; diff --git a/crates/vm/src/frame.rs b/crates/vm/src/frame.rs index ae7f2c061..2743bf3d5 100644 --- a/crates/vm/src/frame.rs +++ b/crates/vm/src/frame.rs @@ -4430,18 +4430,11 @@ impl ExecutingFrame<'_> { let type_version = self.code.instructions.read_cache_u32(cache_base + 1); if type_version != 0 && owner.class().tp_version_tag.load(Acquire) == type_version { - // Check instance dict doesn't shadow the method - let shadowed = if let Some(dict) = owner.dict() { - match dict.get_item_opt(attr_name, vm) { - Ok(Some(_)) => true, - Ok(None) => false, - Err(_) => { - // Dict lookup error -> use safe path. - return self.load_attr_slow(vm, oparg); - } - } - } else { - false + // Check instance dict doesn't shadow the method. + let shadowed = match self.shadowing_instance_attr(cache_base, attr_name, vm) { + Ok(shadowed) => shadowed.is_some(), + // Dict lookup error -> use safe path. + Err(_) => return self.load_attr_slow(vm, oparg), }; if !shadowed @@ -4489,16 +4482,29 @@ impl ExecutingFrame<'_> { if type_version != 0 && owner.class().tp_version_tag.load(Acquire) == type_version && let Some(dict) = owner.dict() - && let Some(value) = dict.get_item_opt(attr_name, vm)? { - self.pop_value(); - if oparg.is_method() { - self.push_value(value); - self.push_value_opt(None); - } else { - self.push_value(value); + // Try the cached entry index first; a hit is an identity + // check on the entry key instead of a hash probe. + let hint = self.code.instructions.read_cache_u16(cache_base + 3); + if let Some((value, refreshed)) = + dict.get_item_opt_refresh_hint(attr_name, hint, vm)? + { + if let Some(new_hint) = refreshed { + unsafe { + self.code + .instructions + .write_cache_u16(cache_base + 3, new_hint); + } + } + self.pop_value(); + if oparg.is_method() { + self.push_value(value); + self.push_value_opt(None); + } else { + self.push_value(value); + } + return Ok(None); } - return Ok(None); } self.load_attr_slow(vm, oparg) @@ -4559,9 +4565,7 @@ impl ExecutingFrame<'_> { if type_version != 0 && owner.class().tp_version_tag.load(Acquire) == type_version { // Instance dict has priority — check if attr is shadowed - if let Some(dict) = owner.dict() - && let Some(value) = dict.get_item_opt(attr_name, vm)? - { + if let Some(value) = self.shadowing_instance_attr(cache_base, attr_name, vm)? { self.pop_value(); if oparg.is_method() { self.push_value(value); @@ -4725,7 +4729,10 @@ impl ExecutingFrame<'_> { { self.pop_value(); // owner let value = self.pop_value(); - dict.set_item(attr_name, value, vm)?; + // The key was absent at specialization time, but this + // very store inserts it; hint learning makes later + // executions replace by entry index. + self.store_attr_dict_hinted(&dict, attr_name, value, cache_base, vm)?; return Ok(None); } self.store_attr(vm, attr_idx) @@ -4744,7 +4751,7 @@ impl ExecutingFrame<'_> { { self.pop_value(); // owner let value = self.pop_value(); - dict.set_item(attr_name, value, vm)?; + self.store_attr_dict_hinted(&dict, attr_name, value, cache_base, vm)?; return Ok(None); } self.store_attr(vm, attr_idx) @@ -8055,6 +8062,61 @@ impl ExecutingFrame<'_> { Ok(None) } + /// Store an instance attribute through the cached entry index at + /// `cache_base + 3`, refreshing the cache when the hint missed. + fn store_attr_dict_hinted( + &mut self, + dict: &Py<PyDict>, + attr_name: &'static PyStrInterned, + value: PyObjectRef, + cache_base: usize, + vm: &VirtualMachine, + ) -> PyResult<()> { + let hint = self.code.instructions.read_cache_u16(cache_base + 3); + if let Some(new_hint) = dict.set_item_with_hint(attr_name, hint, value, vm)? { + unsafe { + self.code + .instructions + .write_cache_u16(cache_base + 3, new_hint); + } + } + Ok(()) + } + + /// Shadow check for method/nondescriptor loads: return the instance + /// attribute shadowing the cached class attr, or `None` if not shadowed. + /// + /// A keys-version stamp of the instance dict is kept in the pointer cache + /// at `cache_base + 3`. While the dict reports the same stamp, its key + /// set is unchanged since the name was last verified absent, so the probe + /// is skipped. On a verified-absent probe the current stamp is recorded + /// for the next execution. + fn shadowing_instance_attr( + &self, + cache_base: usize, + attr_name: &'static PyStrInterned, + vm: &VirtualMachine, + ) -> PyResult<Option<PyObjectRef>> { + let Some(dict) = self.top_value().dict() else { + return Ok(None); + }; + let stamp = self.code.instructions.read_cache_ptr(cache_base + 3); + if stamp != 0 && stamp == dict.keys_version() as usize { + return Ok(None); + } + // Take the stamp before probing so it attests the probed key set. + let stamp = dict.assign_keys_version(vm); + if let Some(value) = dict.get_item_opt(attr_name, vm)? { + return Ok(Some(value)); + } + unsafe { + self.code + .instructions + .write_cache_ptr(cache_base + 3, stamp as usize); + } + Ok(None) + } + /// Read a cached descriptor pointer and validate it against the expected /// type version, using a lock-free double-check pattern: /// 1. read pointer → incref (try_to_owned) @@ -8408,10 +8470,12 @@ impl ExecutingFrame<'_> { // attribute is missing on both the class and the current // instance, keep the generic opcode and just enter // cooldown instead of specializing a repeated miss path. - let has_instance_attr = if let Some(dict) = obj.dict() { - match dict.get_item_opt(attr_name, _vm) { - Ok(Some(_)) => true, - Ok(None) => false, + // A present attribute always specializes; when no entry + // index is representable the hint degrades to 0 and the + // handler simply keeps taking its full-probe fallback. + let instance_attr_hint = if let Some(dict) = obj.dict() { + match dict.get_item_opt_refresh_hint(attr_name, 0, _vm) { + Ok(present) => present.map(|(_, refreshed)| refreshed.unwrap_or(0)), Err(_) => { unsafe { self.code.instructions.write_adaptive_counter( @@ -8427,13 +8491,14 @@ impl ExecutingFrame<'_> { } } } else { - false + None }; - if has_instance_attr { + if let Some(hint) = instance_attr_hint { unsafe { self.code .instructions .write_cache_u32(cache_base + 1, type_version); + self.code.instructions.write_cache_u16(cache_base + 3, hint); } self.specialize_at(instr_idx, cache_base, Instruction::LoadAttrWithHint); } else { @@ -9951,9 +10016,8 @@ impl ExecutingFrame<'_> { } } } else if let Some(dict) = owner.dict() { - let use_hint = match dict.get_item_opt(attr_name, vm) { - Ok(Some(_)) => true, - Ok(None) => false, + let hint = match dict.hint_for_key(attr_name, vm) { + Ok(hint) => hint, Err(_) => { unsafe { self.code.instructions.write_adaptive_counter( @@ -9970,11 +10034,14 @@ impl ExecutingFrame<'_> { self.code .instructions .write_cache_u32(cache_base + 1, type_version); + self.code + .instructions + .write_cache_u16(cache_base + 3, hint.unwrap_or(0)); } self.specialize_at( instr_idx, cache_base, - if use_hint { + if hint.is_some() { Instruction::StoreAttrWithHint } else { Instruction::StoreAttrInstanceValue diff --git a/extra_tests/snippets/vm_specialization.py b/extra_tests/snippets/vm_specialization.py index 2c884cc2f..f2415b4b2 100644 --- a/extra_tests/snippets/vm_specialization.py +++ b/extra_tests/snippets/vm_specialization.py @@ -69,3 +69,145 @@ def check_latin1_subscr_singleton_after_warmup(): check_latin1_subscr_singleton_after_warmup() + + +## LOAD_ATTR_METHOD_WITH_VALUES: keys-version shadow check + + +class MethodHolder: + def m(self): + return "method" + + +def method_shadowed_after_specialization(): + obj = MethodHolder() + obj.pad = 1 + for _ in range(300): + assert obj.m() == "method" + # Shadowing after warmup must deopt the stamp-based shadow skip. + obj.m = lambda: "instance" + assert obj.m() == "instance" + del obj.m + assert obj.m() == "method" + obj.__dict__["m"] = lambda: "dict" + assert obj.m() == "dict" + del obj.__dict__["m"] + assert obj.m() == "method" + + +method_shadowed_after_specialization() + + +def method_with_value_only_updates(): + obj = MethodHolder() + obj.pad = 0 + for i in range(500): + obj.pad = i # value-only update keeps the keys-version stamp + assert obj.m() == "method" + + +method_with_value_only_updates() + + +## LOAD_ATTR_WITH_HINT / STORE_ATTR: entry-index hint invalidation + + +class Plain: + pass + + +def load_hint_survives_key_churn(): + obj = Plain() + obj.a = 1 + obj.b = 2 + obj.x = "first" + for _ in range(300): + assert obj.x == "first" + del obj.a + del obj.b + assert obj.x == "first" + del obj.x + try: + obj.x + except AttributeError: + pass + else: + raise AssertionError("expected AttributeError") + obj.x = "second" + assert obj.x == "second" + + +load_hint_survives_key_churn() + + +def store_hint_survives_dict_replacement(): + obj = Plain() + obj.v = 0 + for i in range(500): + obj.v = i + assert obj.v == i + obj.__dict__ = {"v": "fresh"} + for i in range(300): + obj.v = i + assert obj.v == i + obj.__dict__.clear() + obj.v = "back" + assert obj.v == "back" + + +store_hint_survives_dict_replacement() + + +## Shared shape stamps: same-layout instances share the shadow-check stamp + + +class ShapedCounter: + def __init__(self): + self.a = 1 + self.b = 2 + + def m(self): + return "method" + + +def shape_sharing_shadow_one_instance(): + objs = [ShapedCounter() for _ in range(30)] + for _ in range(300): + for o in objs: + assert o.m() == "method" + objs[13].m = lambda: "thirteen" + for i, o in enumerate(objs): + expected = "thirteen" if i == 13 else "method" + assert o.m() == expected + del objs[13].m + for o in objs: + assert o.m() == "method" + + +shape_sharing_shadow_one_instance() + + +def holey_dict_falls_back(): + class Holey: + def m(self): + return "g" + + def call_m(obj): + # single LOAD_ATTR cache site shared by both instances + return obj.m() + + g1, g2 = Holey(), Holey() + for o in (g1, g2): + o.x = 1 + o.y = 2 + o.z = 3 + del o.y # leaves a hole in the entries + for _ in range(300): + assert call_m(g1) == "g" + assert call_m(g2) == "g" + g2.m = lambda: "g2" + assert call_m(g1) == "g" + assert call_m(g2) == "g2" + + +holey_dict_falls_back() From 05564d97fabaedee16c83848440ac407dbc8fa90 Mon Sep 17 00:00:00 2001 From: Joshua Megnauth <48846352+joshuamegnauth54@users.noreply.github.com> Date: Thu, 23 Jul 2026 09:25:27 -0400 Subject: [PATCH 283/339] Unify nul errors (#8339) Part of #8245 to reduce the amount of work needed to review. I simplified the embedded nul errors by forwarding to the implementations in `vm::exceptions`. --- crates/stdlib/src/grp.rs | 2 +- crates/stdlib/src/multiprocessing.rs | 5 +-- crates/stdlib/src/openssl.rs | 8 ++--- crates/stdlib/src/ssl.rs | 5 +-- crates/vm/src/buffer.rs | 3 +- crates/vm/src/exceptions.rs | 49 ++++++++++++++++++++++++++-- crates/vm/src/function/fspath.rs | 2 +- crates/vm/src/stdlib/_codecs.rs | 8 ++--- crates/vm/src/stdlib/_io.rs | 8 ++--- crates/vm/src/stdlib/_winapi.rs | 4 +-- crates/vm/src/stdlib/nt.rs | 4 +-- crates/vm/src/stdlib/os.rs | 16 +++++---- crates/vm/src/stdlib/pwd.rs | 2 +- crates/vm/src/stdlib/time.rs | 11 +++---- crates/vm/src/stdlib/winsound.rs | 9 ++--- crates/vm/src/utils.rs | 4 +-- 16 files changed, 95 insertions(+), 45 deletions(-) diff --git a/crates/stdlib/src/grp.rs b/crates/stdlib/src/grp.rs index c2a231bef..7e3dd8ef3 100644 --- a/crates/stdlib/src/grp.rs +++ b/crates/stdlib/src/grp.rs @@ -63,7 +63,7 @@ mod grp { fn getgrnam(name: PyUtf8StrRef, vm: &VirtualMachine) -> PyResult<GroupData> { let gr_name = name.as_str(); if gr_name.contains('\0') { - return Err(exceptions::cstring_error(vm)); + return Err(exceptions::nul_char_error(vm)); } let group = host_grp::getgrnam(gr_name).map_err(|err| err.into_pyexception(vm))?; let group = group.ok_or_else(|| { diff --git a/crates/stdlib/src/multiprocessing.rs b/crates/stdlib/src/multiprocessing.rs index 1eee2ec04..9883219df 100644 --- a/crates/stdlib/src/multiprocessing.rs +++ b/crates/stdlib/src/multiprocessing.rs @@ -359,6 +359,7 @@ mod _multiprocessing { use rustpython_host_env::multiprocessing::{ self as host_multiprocessing, SemError, TryAcquireStatus, WaitStatus, }; + use rustpython_vm::exceptions; /// Error type for sem_timedwait operations #[cfg(target_vendor = "apple")] @@ -811,7 +812,7 @@ mod _multiprocessing { let (handle, name) = SemHandle::create(&args.name, value, args.unlink).map_err(|err| { if err == SemError::InvalidInput && args.name.contains('\0') { - vm.new_value_error("embedded null character") + exceptions::nul_char_error(vm) } else { os_error(vm, err) } @@ -835,7 +836,7 @@ mod _multiprocessing { fn sem_unlink(name: String, vm: &VirtualMachine) -> PyResult<()> { host_multiprocessing::sem_unlink(&name).map_err(|err| { if err == SemError::InvalidInput && name.contains('\0') { - vm.new_value_error("embedded null character") + exceptions::nul_char_error(vm) } else { os_error(vm, err) } diff --git a/crates/stdlib/src/openssl.rs b/crates/stdlib/src/openssl.rs index 3397fff8e..8b7d1de06 100644 --- a/crates/stdlib/src/openssl.rs +++ b/crates/stdlib/src/openssl.rs @@ -1041,7 +1041,7 @@ mod _ssl { fn set_ciphers(&self, cipherlist: PyStrRef, vm: &VirtualMachine) -> PyResult<()> { let ciphers: &str = cipherlist.as_ref(); if ciphers.contains('\0') { - return Err(exceptions::cstring_error(vm)); + return Err(exceptions::nul_char_error(vm)); } self.builder() .set_cipher_list(ciphers) @@ -1097,12 +1097,12 @@ mod _ssl { Either::A(s) => { let s: &str = s.as_ref(); if s.contains('\0') { - return Err(exceptions::cstring_error(vm)); + return Err(exceptions::nul_char_error(vm)); } s.to_cstring(vm)? } Either::B(b) => std::ffi::CString::new(b.borrow_buf().to_vec()) - .map_err(|_| exceptions::cstring_error(vm))?, + .map_err(|_| exceptions::nul_char_error(vm))?, }; // Find the NID for the curve name using OBJ_sn2nid @@ -2038,7 +2038,7 @@ mod _ssl { )); } if hostname_str.contains('\0') { - return Err(vm.new_type_error("embedded null character")); + return Err(exceptions::nul_char_type_error(vm)); } let ip = hostname_str.parse::<core::net::IpAddr>(); if ip.is_err() { diff --git a/crates/stdlib/src/ssl.rs b/crates/stdlib/src/ssl.rs index 7b7e2127f..5e6f35943 100644 --- a/crates/stdlib/src/ssl.rs +++ b/crates/stdlib/src/ssl.rs @@ -70,6 +70,7 @@ mod _ssl { sync::atomic::{AtomicUsize, Ordering}, time::Duration, }; + use rustpython_vm::exceptions; use std::{ collections::{HashMap, hash_map::DefaultHasher}, io::BufRead, @@ -392,7 +393,7 @@ mod _ssl { // SNI will not be sent for IP addresses if hostname.contains('\0') { - return Err(vm.new_type_error("embedded null character")); + return Err(exceptions::nul_char_type_error(vm)); } if hostname.len() > 253 { @@ -1869,7 +1870,7 @@ mod _ssl { // Check for NULL bytes if hostname.contains('\0') { - return Err(vm.new_type_error("embedded null character")); + return Err(exceptions::nul_char_error(vm)); } Some(hostname.to_string()) diff --git a/crates/vm/src/buffer.rs b/crates/vm/src/buffer.rs index 84c0ac17f..ae5ce6b00 100644 --- a/crates/vm/src/buffer.rs +++ b/crates/vm/src/buffer.rs @@ -3,6 +3,7 @@ use crate::{ builtins::{PyBaseExceptionRef, PyBytesRef, PyTuple, PyTupleRef, PyTypeRef}, common::{static_cell, str::wchar_t}, convert::ToPyObject, + exceptions, function::{ArgBytesLike, ArgIntoBool, ArgIntoFloat}, }; @@ -282,7 +283,7 @@ impl FormatCode { // Check for embedded null character if c == 0 { - return Err("embedded null character".to_owned()); + return Err(exceptions::NulError.to_string()); } // PEP3118: Handle extended format specifiers diff --git a/crates/vm/src/exceptions.rs b/crates/vm/src/exceptions.rs index cd1eb1adb..fe07a7e3c 100644 --- a/crates/vm/src/exceptions.rs +++ b/crates/vm/src/exceptions.rs @@ -15,6 +15,7 @@ use crate::{ suggestion::offer_suggestions, types::{Callable, Constructor, Initializer, Representable}, }; +use core::fmt::{self, Display, Formatter}; use crossbeam_utils::atomic::AtomicCell; use itertools::Itertools; #[cfg(feature = "host_env")] @@ -1188,20 +1189,62 @@ impl serde::Serialize for SerializeException<'_, '_> { } } -pub fn cstring_error(vm: &VirtualMachine) -> PyBaseExceptionRef { +#[derive(Debug)] +pub struct NulError; + +impl Display for NulError { + fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result { + write!(f, "embedded null character") + } +} + +pub fn nul_char_error(vm: &VirtualMachine) -> PyBaseExceptionRef { vm.new_value_error("embedded null character") } +pub fn nul_char_type_error(vm: &VirtualMachine) -> PyBaseExceptionRef { + vm.new_type_error("embedded null character") +} + +pub fn nul_byte_error(vm: &VirtualMachine) -> PyBaseExceptionRef { + vm.new_value_error("embedded null byte") +} + impl ToPyException for alloc::ffi::NulError { fn to_pyexception(&self, vm: &VirtualMachine) -> PyBaseExceptionRef { - cstring_error(vm) + nul_char_error(vm) + } +} + +impl ToPyException for alloc::ffi::FromVecWithNulError { + fn to_pyexception(&self, vm: &VirtualMachine) -> PyBaseExceptionRef { + nul_char_error(vm) + } +} + +impl ToPyException for core::ffi::FromBytesWithNulError { + fn to_pyexception(&self, vm: &VirtualMachine) -> PyBaseExceptionRef { + nul_char_error(vm) + } +} + +impl ToPyException for NulError { + fn to_pyexception(&self, vm: &VirtualMachine) -> PyBaseExceptionRef { + nul_char_error(vm) } } #[cfg(windows)] impl<C> ToPyException for widestring::error::ContainsNul<C> { fn to_pyexception(&self, vm: &VirtualMachine) -> PyBaseExceptionRef { - cstring_error(vm) + nul_char_error(vm) + } +} + +#[cfg(windows)] +impl ToPyException for widestring::error::MissingNulTerminator { + fn to_pyexception(&self, vm: &VirtualMachine) -> PyBaseExceptionRef { + vm.new_value_error(self.to_string()) } } diff --git a/crates/vm/src/function/fspath.rs b/crates/vm/src/function/fspath.rs index 5ec81ba63..053802285 100644 --- a/crates/vm/src/function/fspath.rs +++ b/crates/vm/src/function/fspath.rs @@ -40,7 +40,7 @@ impl FsPath { if !check_for_nul || memchr::memchr(b'\0', b).is_none() { Ok(()) } else { - Err(crate::exceptions::cstring_error(vm)) + Err(crate::exceptions::nul_char_error(vm)) } }; let match1 = |obj: PyObjectRef| { diff --git a/crates/vm/src/stdlib/_codecs.rs b/crates/vm/src/stdlib/_codecs.rs index a9402edc3..605235015 100644 --- a/crates/vm/src/stdlib/_codecs.rs +++ b/crates/vm/src/stdlib/_codecs.rs @@ -13,7 +13,7 @@ mod _codecs { AsObject, PyObjectRef, PyResult, VirtualMachine, builtins::{PyStrRef, PyUtf8StrRef}, codecs, - exceptions::cstring_error, + exceptions::nul_char_error, function::{ArgBytesLike, FuncArgs}, }; @@ -30,7 +30,7 @@ mod _codecs { #[pyfunction] fn lookup(encoding: PyUtf8StrRef, vm: &VirtualMachine) -> PyResult { if encoding.as_str().contains('\0') { - return Err(cstring_error(vm)); + return Err(nul_char_error(vm)); } vm.state .codec_registry @@ -106,7 +106,7 @@ mod _codecs { #[pyfunction] fn lookup_error(name: PyUtf8StrRef, vm: &VirtualMachine) -> PyResult { if name.as_str().contains('\0') { - return Err(cstring_error(vm)); + return Err(nul_char_error(vm)); } vm.state.codec_registry.lookup_error(name.as_str(), vm) } @@ -114,7 +114,7 @@ mod _codecs { #[pyfunction] fn _unregister_error(errors: PyUtf8StrRef, vm: &VirtualMachine) -> PyResult<bool> { if errors.as_str().contains('\0') { - return Err(cstring_error(vm)); + return Err(nul_char_error(vm)); } vm.state .codec_registry diff --git a/crates/vm/src/stdlib/_io.rs b/crates/vm/src/stdlib/_io.rs index 4cffb909f..eb2fa6cfc 100644 --- a/crates/vm/src/stdlib/_io.rs +++ b/crates/vm/src/stdlib/_io.rs @@ -132,7 +132,7 @@ mod _io { }, common::wtf8::{Wtf8, Wtf8Buf}, convert::ToPyObject, - exceptions::cstring_error, + exceptions::nul_char_error, function::{ ArgBytesLike, ArgIterable, ArgMemoryBuffer, ArgSize, Either, FsPath, FuncArgs, IntoFuncArgs, OptionalArg, OptionalOption, PySetterValue, @@ -2855,7 +2855,7 @@ mod _io { fn validate_errors(errors: &PyRef<PyUtf8Str>, vm: &VirtualMachine) -> PyResult<()> { if errors.as_str().contains('\0') { - return Err(cstring_error(vm)); + return Err(nul_char_error(vm)); } vm.state .codec_registry @@ -2896,7 +2896,7 @@ mod _io { }, Some(enc) => { if enc.as_str().contains('\0') { - return Err(cstring_error(vm)); + return Err(nul_char_error(vm)); } enc } @@ -2915,7 +2915,7 @@ mod _io { }, }; if encoding.as_str().contains('\0') { - return Err(cstring_error(vm)); + return Err(nul_char_error(vm)); } Ok(encoding) } diff --git a/crates/vm/src/stdlib/_winapi.rs b/crates/vm/src/stdlib/_winapi.rs index e1b86f2ef..0d54530d4 100644 --- a/crates/vm/src/stdlib/_winapi.rs +++ b/crates/vm/src/stdlib/_winapi.rs @@ -235,12 +235,12 @@ mod _winapi { if let Some(ref name) = args.name && name.as_bytes().contains(&0) { - return Err(crate::exceptions::cstring_error(vm)); + return Err(crate::exceptions::nul_char_error(vm)); } if let Some(ref cmd) = args.command_line && cmd.as_bytes().contains(&0) { - return Err(crate::exceptions::cstring_error(vm)); + return Err(crate::exceptions::nul_char_error(vm)); } let wcstring = |s: PyStrRef| s.as_wtf8().to_wide_cstring(); diff --git a/crates/vm/src/stdlib/nt.rs b/crates/vm/src/stdlib/nt.rs index 0d423541b..acc9f4ee6 100644 --- a/crates/vm/src/stdlib/nt.rs +++ b/crates/vm/src/stdlib/nt.rs @@ -9,7 +9,7 @@ pub(crate) mod module { Py, PyResult, TryFromObject, VirtualMachine, builtins::{PyBytes, PyDictRef, PyListRef, PyStr, PyStrRef, PyTupleRef}, convert::ToPyException, - exceptions::OSErrorBuilder, + exceptions::{self, OSErrorBuilder}, function::{ArgMapping, Either, OptionalArg}, host_env::{crt_fd, windows::ToWideString}, ospath::{OsPath, OsPathOrFd}, @@ -552,7 +552,7 @@ pub(crate) mod module { // Validate: no null characters in key or value if key_str.contains('\0') || value_str.contains('\0') { - return Err(vm.new_value_error("embedded null character")); + return Err(exceptions::nul_char_error(vm)); } // Validate: empty key or '=' in key after position 0 // (search from index 1 because on Windows starting '=' is allowed diff --git a/crates/vm/src/stdlib/os.rs b/crates/vm/src/stdlib/os.rs index 5772cc46f..f885fb1db 100644 --- a/crates/vm/src/stdlib/os.rs +++ b/crates/vm/src/stdlib/os.rs @@ -181,6 +181,8 @@ impl ToPyObject for crt_fd::Borrowed<'_> { #[pymodule(sub)] pub(super) mod _os { use super::{DirFd, DstDirFd, FollowSymlinks, RawMode, SrcDirFd, SupportFunc}; + #[cfg(not(windows))] + use crate::exceptions; use crate::host_env::fileutils::StatStruct; #[cfg(any(unix, windows))] use crate::utils::ToCString; @@ -531,7 +533,7 @@ pub(super) mod _os { let key = env_bytes_as_bytes(&key); let value = env_bytes_as_bytes(&value); if key.contains(&b'\0') || value.contains(&b'\0') { - return Err(vm.new_value_error("embedded null byte")); + return Err(exceptions::nul_byte_error(vm)); } if key.is_empty() || key.contains(&b'=') { return Err(vm.new_value_error("illegal environment variable name")); @@ -574,7 +576,7 @@ pub(super) mod _os { ) -> PyResult<()> { let key = env_bytes_as_bytes(&key); if key.contains(&b'\0') { - return Err(vm.new_value_error("embedded null byte")); + return Err(exceptions::nul_byte_error(vm)); } if key.is_empty() || key.contains(&b'=') { let x = vm.new_errno_error( @@ -817,7 +819,7 @@ pub(super) mod _os { FollowSymlinks(false), ) .map_err(|e| e.into_pyexception(vm))? - .ok_or_else(|| crate::exceptions::cstring_error(vm))?; + .ok_or_else(|| crate::exceptions::nul_char_error(vm))?; // On Windows, combine st_ino and st_ino_high into 128-bit value let ino: u128 = cfg_select! { windows => stat.st_ino as u128 | ((stat.st_ino_high as u128) << 64), @@ -1360,7 +1362,7 @@ pub(super) mod _os { ) -> PyResult { let stat = stat_inner(file.clone(), dir_fd, follow_symlinks) .map_err(|err| OSErrorBuilder::with_filename(&err, file, vm))? - .ok_or_else(|| crate::exceptions::cstring_error(vm))?; + .ok_or_else(|| crate::exceptions::nul_char_error(vm))?; Ok(StatResultData::from_stat(&stat, vm).to_pyobject(vm)) } @@ -1543,10 +1545,12 @@ pub(super) mod _os { #[cfg(unix)] { use std::os::unix::ffi::OsStrExt; + + use crate::convert::ToPyException; let src_cstr = alloc::ffi::CString::new(src.path.as_os_str().as_bytes()) - .map_err(|_| vm.new_value_error("embedded null byte"))?; + .map_err(|e| e.to_pyexception(vm))?; let dst_cstr = alloc::ffi::CString::new(dst.path.as_os_str().as_bytes()) - .map_err(|_| vm.new_value_error("embedded null byte"))?; + .map_err(|e| e.to_pyexception(vm))?; let follow = follow_symlinks.into_option().unwrap_or(true); if let Err(err) = diff --git a/crates/vm/src/stdlib/pwd.rs b/crates/vm/src/stdlib/pwd.rs index e2f987ce0..e181de240 100644 --- a/crates/vm/src/stdlib/pwd.rs +++ b/crates/vm/src/stdlib/pwd.rs @@ -52,7 +52,7 @@ mod pwd { fn getpwnam(name: PyUtf8StrRef, vm: &VirtualMachine) -> PyResult<PasswdData> { let pw_name = name.as_str(); if pw_name.contains('\0') { - return Err(exceptions::cstring_error(vm)); + return Err(exceptions::nul_char_error(vm)); } let user = host_pwd::getpwnam(name.as_str()); let user = user.ok_or_else(|| { diff --git a/crates/vm/src/stdlib/time.rs b/crates/vm/src/stdlib/time.rs index 5c77afb4f..05894cdc2 100644 --- a/crates/vm/src/stdlib/time.rs +++ b/crates/vm/src/stdlib/time.rs @@ -571,8 +571,8 @@ mod decl { for codepoint in format.as_wtf8().code_points() { if codepoint.to_u32() == 0 { if !ascii.is_empty() { - let part = host_time::strftime_ascii(&ascii, &tm) - .map_err(|_| vm.new_value_error("embedded null character"))?; + let part = + host_time::strftime_ascii(&ascii, &tm).map_err(|e| e.to_pyexception(vm))?; out.extend(part.chars()); ascii.clear(); } @@ -587,16 +587,15 @@ mod decl { } if !ascii.is_empty() { - let part = host_time::strftime_ascii(&ascii, &tm) - .map_err(|_| vm.new_value_error("embedded null character"))?; + let part = + host_time::strftime_ascii(&ascii, &tm).map_err(|e| e.to_pyexception(vm))?; out.extend(part.chars()); ascii.clear(); } out.push(codepoint); } if !ascii.is_empty() { - let part = host_time::strftime_ascii(&ascii, &tm) - .map_err(|_| vm.new_value_error("embedded null character"))?; + let part = host_time::strftime_ascii(&ascii, &tm).map_err(|e| e.to_pyexception(vm))?; out.extend(part.chars()); } Ok(out.to_pyobject(vm)) diff --git a/crates/vm/src/stdlib/winsound.rs b/crates/vm/src/stdlib/winsound.rs index 67d7c8a7f..95032ad89 100644 --- a/crates/vm/src/stdlib/winsound.rs +++ b/crates/vm/src/stdlib/winsound.rs @@ -6,7 +6,8 @@ pub(crate) use winsound::module_def; #[pymodule] mod winsound { use crate::builtins::{PyBaseExceptionRef, PyBytes, PyStr}; - use crate::convert::{IntoPyException, TryFromBorrowedObject}; + use crate::convert::{IntoPyException, ToPyException, TryFromBorrowedObject}; + use crate::exceptions; use crate::host_env::windows::ToWideString; use crate::protocol::PyBuffer; use crate::{AsObject, PyObjectRef, PyResult, VirtualMachine}; @@ -142,12 +143,12 @@ mod winsound { // Check for embedded null characters if path.as_bytes().contains(&0) { - return Err(vm.new_value_error("embedded null character")); + return Err(exceptions::nul_char_error(vm)); } let wide = path.to_wide_with_nul(); - let wide_cstr = widestring::WideCStr::from_slice_truncate(&wide) - .map_err(|_| vm.new_value_error("embedded null character"))?; + let wide_cstr = + widestring::WideCStr::from_slice_truncate(&wide).map_err(|e| e.to_pyexception(vm))?; play_sound(PlaySoundSource::Name(wide_cstr), flags).map_err(map_play_err(vm)) } diff --git a/crates/vm/src/utils.rs b/crates/vm/src/utils.rs index b5117ddd8..d23cbb689 100644 --- a/crates/vm/src/utils.rs +++ b/crates/vm/src/utils.rs @@ -4,7 +4,7 @@ use crate::{ PyObjectRef, PyResult, VirtualMachine, builtins::{PyStr, PyUtf8Str}, convert::{ToPyException, ToPyObject}, - exceptions::cstring_error, + exceptions::nul_char_error, }; pub fn hash_iter<'a, I: IntoIterator<Item = &'a PyObjectRef>>( @@ -26,7 +26,7 @@ pub trait ToCString: AsRef<Wtf8> { } fn ensure_no_nul(&self, vm: &VirtualMachine) -> PyResult<()> { if self.as_ref().as_bytes().contains(&b'\0') { - Err(cstring_error(vm)) + Err(nul_char_error(vm)) } else { Ok(()) } From 483b2125e849060c7d99cb71b985dd9189b5b694 Mon Sep 17 00:00:00 2001 From: Kwak Byoung Min <67214970+doma17@users.noreply.github.com> Date: Fri, 24 Jul 2026 01:00:17 +0900 Subject: [PATCH 284/339] Fix StringIO newline splitting and character positions (#8351) * Keep StringIO text operations CPython-compatible Constraint: email.feedparser depends on StringIO(newline='') recognizing CR, LF, and CRLF boundaries. Rejected: an email-specific parser workaround | StringIO is the shared root cause. Confidence: high Scope-risk: moderate Directive: Keep internal storage byte-based; convert only at StringIO API boundaries. Tested: prek run --all-files; test_memoryio; test_email; full workspace verification by contributor Assisted-by: Codex:gpt-5.6-sol * Run restored StringIO conformance tests Constraint: upstream StringIO tests already cover the repaired behavior. Rejected: new RustPython-only regression tests | existing CPython coverage is sufficient. Confidence: high Scope-risk: narrow Directive: Remove expected-failure markers only while the inherited tests pass. Tested: prek run --all-files; test_memoryio; test_email Assisted-by: Codex:gpt-5.6-sol * Keep StringIO newline handling consistent Constraint: StringIO must apply its newline mode consistently when constructing, writing, and reading text.\nRejected: a readline-only fix | it leaves CR and CRLF modes internally inconsistent.\nConfidence: high\nScope-risk: moderate\nDirective: Keep StringIO buffer contents valid WTF-8 before using unchecked views.\nTested: prek run --all-files; cargo clippy -p rustpython-vm -- -D warnings; test_memoryio; test_shlex; test_email; workspace excluding rustpython-capi; full workspace manually verified by contributor\nNot-tested: local rustpython-capi workspace test crashes with a pre-existing macOS SIGSEGV\nAssisted-by: Codex:gpt-5.6-sol --- Lib/test/test_email/test_email.py | 4 - Lib/test/test_memoryio.py | 52 ----------- Lib/test/test_shlex.py | 4 - crates/vm/src/stdlib/_io.rs | 149 ++++++++++++++++++++++++------ 4 files changed, 121 insertions(+), 88 deletions(-) diff --git a/Lib/test/test_email/test_email.py b/Lib/test/test_email/test_email.py index 49cdc9502..671bc487b 100644 --- a/Lib/test/test_email/test_email.py +++ b/Lib/test/test_email/test_email.py @@ -3812,7 +3812,6 @@ Do you like this message? -Me """) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_pushCR_LF(self): '''FeedParser BufferedSubFile.push() assumed it received complete line endings. A CR ending one push() followed by a LF starting @@ -3843,7 +3842,6 @@ Do you like this message? self.assertEqual(len(om), nt) self.assertEqual(''.join([il for il, n in imt]), ''.join(om)) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_push_random(self): from email.feedparser import BufferedSubFile, NeedMoreData @@ -3877,7 +3875,6 @@ class TestFeedParsers(TestEmailBase): self.assertEqual(msg['First'], 'val') self.assertEqual(msg['Second'], 'val') - @unittest.expectedFailure # TODO: RUSTPYTHON; Feedparser.feed -> Feedparser._input.push, Feedparser._call_parse -> Feedparser._parse does not keep _input state between calls def test_newlines(self): m = self.parse(['a:\nb:\rc:\r\nd:\n']) self.assertEqual(m.keys(), ['a', 'b', 'c', 'd']) @@ -3896,7 +3893,6 @@ class TestFeedParsers(TestEmailBase): m = self.parse(['a:\r', 'b:\x85', 'c:\n']) self.assertEqual(m.items(), [('a', ''), ('b', '\x85c:')]) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_long_lines(self): # Expected peak memory use on 32-bit platform: 6*N*M bytes. M, N = 1000, 20000 diff --git a/Lib/test/test_memoryio.py b/Lib/test/test_memoryio.py index f0c21e4ae..1683a71fc 100644 --- a/Lib/test/test_memoryio.py +++ b/Lib/test/test_memoryio.py @@ -940,7 +940,6 @@ class CStringIOTest(PyStringIOTest): # XXX: For the Python version of io.StringIO, this is highly # dependent on the encoding used for the underlying buffer. - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: 8 != 2 def test_widechar(self): buf = self.buftype("\U0002030a\U00020347") memio = self.ioclass(buf) @@ -965,7 +964,6 @@ class CStringIOTest(PyStringIOTest): memio.close() self.assertRaises(ValueError, memio.__getstate__) - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: ValueError not raised by __setstate__ def test_setstate(self): # This checks whether __setstate__ does proper input validation. memio = self.ioclass() @@ -1002,22 +1000,6 @@ class CStringIOTest(PyStringIOTest): memio2.write(MyStr("world")) self.assertEqual(memio2.getvalue(), "hello world") - @unittest.expectedFailure # TODO: RUSTPYTHON; + - def test_issue5265(self): - return super().test_issue5265() - - @unittest.expectedFailure # TODO: RUSTPYTHON; ? ++++ - def test_newline_empty(self): - return super().test_newline_empty() - - @unittest.expectedFailure # TODO: RUSTPYTHON; ? ^^^^^ - def test_newline_none(self): - return super().test_newline_none() - - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: OSError not raised by seek - def test_relative_seek(self): - return super().test_relative_seek() - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: ValueError not raised by writable def test_flags(self): return super().test_flags() @@ -1026,15 +1008,6 @@ class CStringIOTest(PyStringIOTest): def test_newlines_property(self): return super().test_newlines_property() - @unittest.expectedFailure # TODO: RUSTPYTHON; d - def test_newline_cr(self): - return super().test_newline_cr() - - @unittest.expectedFailure # TODO: RUSTPYTHON; d - def test_newline_crlf(self): - return super().test_newline_crlf() - - class CStringIOPickleTest(PyStringIOPickleTest): UnsupportedOperation = io.UnsupportedOperation @@ -1044,34 +1017,9 @@ class CStringIOPickleTest(PyStringIOPickleTest): def __init__(self, *args, **kwargs): pass - @unittest.expectedFailure # TODO: RUSTPYTHON; + - def test_issue5265(self): - return super().test_issue5265() - - @unittest.expectedFailure # TODO: RUSTPYTHON; ? ++++ - def test_newline_empty(self): - return super().test_newline_empty() - - @unittest.expectedFailure # TODO: RUSTPYTHON; ? ^^^^^ - def test_newline_none(self): - return super().test_newline_none() - - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: OSError not raised by seek - def test_relative_seek(self): - return super().test_relative_seek() - @unittest.expectedFailure # TODO: RUSTPYTHON; AttributeError: 'StringIO' object has no attribute 'newlines'. Did you mean: 'readlines'? def test_newlines_property(self): return super().test_newlines_property() - @unittest.expectedFailure # TODO: RUSTPYTHON; d - def test_newline_cr(self): - return super().test_newline_cr() - - @unittest.expectedFailure # TODO: RUSTPYTHON; d - def test_newline_crlf(self): - return super().test_newline_crlf() - - if __name__ == '__main__': unittest.main() diff --git a/Lib/test/test_shlex.py b/Lib/test/test_shlex.py index 7c41432b8..2a355abde 100644 --- a/Lib/test/test_shlex.py +++ b/Lib/test/test_shlex.py @@ -167,12 +167,10 @@ class ShlexTest(unittest.TestCase): with self.assertRaises(ValueError): shlex.split(None) - @unittest.expectedFailure # TODO: RUSTPYTHON; ValueError: Error Retrieving Value def testSplitPosix(self): """Test data splitting with posix parser""" self.splitTest(self.posix_data, comments=True) - @unittest.expectedFailure # TODO: RUSTPYTHON; ValueError: Error Retrieving Value def testCompat(self): """Test compatibility interface""" for i in range(len(self.data)): @@ -313,7 +311,6 @@ class ShlexTest(unittest.TestCase): s = shlex.shlex("'')abc", punctuation_chars=True) self.assertEqual(list(s), expected) - @unittest.expectedFailure # TODO: RUSTPYTHON; ValueError: Error Retrieving Value def testUnicodeHandling(self): """Test punctuation_chars and whitespace_split handle unicode.""" ss = "\u2119\u01b4\u2602\u210c\u00f8\u1f24" @@ -356,7 +353,6 @@ class ShlexTest(unittest.TestCase): joined = shlex.join(split_command) self.assertEqual(joined, command) - @unittest.expectedFailure # TODO: RUSTPYTHON; ValueError: Error Retrieving Value def testJoinRoundtrip(self): all_data = self.data + self.posix_data for command, *split_command in all_data: diff --git a/crates/vm/src/stdlib/_io.rs b/crates/vm/src/stdlib/_io.rs index eb2fa6cfc..854a46d8c 100644 --- a/crates/vm/src/stdlib/_io.rs +++ b/crates/vm/src/stdlib/_io.rs @@ -2371,10 +2371,10 @@ mod _io { match memchr::memchr(b'\r', remaining) { Some(p) => match remaining.get(p + 1) { Some(&ch_after_cr) => { - let pos_after = p + 2; if ch_after_cr == b'\n' { - break Ok(searched + pos_after); + break Ok(searched + p + 2); } + let pos_after = p + 1; searched += pos_after; remaining = &remaining[pos_after..]; continue; @@ -4380,6 +4380,7 @@ mod _io { struct StringIO { _base: _TextIOBase, buffer: PyRwLock<BufferedIO>, + newline: AtomicCell<Newlines>, closed: AtomicCell<bool>, } @@ -4388,10 +4389,8 @@ mod _io { #[pyarg(positional, optional)] object: OptionalOption<PyStrRef>, - // TODO: use this #[pyarg(any, default)] - #[allow(dead_code)] - newline: Newlines, + newline: OptionalOption<Newlines>, } impl Constructor for StringIO { @@ -4401,6 +4400,7 @@ mod _io { Ok(Self { _base: Default::default(), buffer: PyRwLock::new(BufferedIO::new(Cursor::new(Vec::new()))), + newline: AtomicCell::new(Newlines::Lf), closed: AtomicCell::new(false), }) } @@ -4409,16 +4409,21 @@ mod _io { impl Initializer for StringIO { type Args = StringIONewArgs; - #[allow(unused_variables)] fn init( zelf: PyRef<Self>, Self::Args { object, newline }: Self::Args, _vm: &VirtualMachine, ) -> PyResult<()> { - let raw_bytes = object - .flatten() - .map_or_else(Vec::new, |v| v.as_bytes().to_vec()); + let newline = match newline { + OptionalArg::Missing => Newlines::Lf, + OptionalArg::Present(None) => Newlines::Universal, + OptionalArg::Present(Some(newline)) => newline, + }; + let raw_bytes = object.flatten().map_or_else(Vec::new, |v| { + Self::translate_newlines(v.as_wtf8(), newline).into_bytes() + }); *zelf.buffer.write() = BufferedIO::new(Cursor::new(raw_bytes)); + zelf.newline.store(newline); Ok(()) } } @@ -4431,6 +4436,46 @@ mod _io { Err(io_closed_error(vm)) } } + + fn translate_newlines(data: &Wtf8, newline: Newlines) -> Wtf8Buf { + match newline { + Newlines::Universal => data + .replace("\r\n".as_ref(), "\n".as_ref()) + .replace("\r".as_ref(), "\n".as_ref()), + Newlines::Cr => data.replace("\n".as_ref(), "\r".as_ref()), + Newlines::Crlf => data.replace("\n".as_ref(), "\r\n".as_ref()), + Newlines::Passthrough | Newlines::Lf => data.to_owned(), + } + } + + fn text(bytes: &[u8]) -> &Wtf8 { + // SAFETY: StringIO is populated only from PyStr values, which are valid WTF-8. + unsafe { Wtf8::from_bytes_unchecked(bytes) } + } + + fn char_offset_to_byte(bytes: &[u8], char_offset: usize) -> usize { + let text = Self::text(bytes); + crate::common::str::codepoint_range_end(text, char_offset) + .unwrap_or_else(|| bytes.len() + (char_offset - text.code_points().count())) + } + + fn byte_offset_to_char(bytes: &[u8], byte_offset: usize) -> usize { + let content_len = bytes.len(); + let in_content = byte_offset.min(content_len); + Self::text(&bytes[..in_content]).code_points().count() + + byte_offset.saturating_sub(content_len) + } + + fn read_size(buffer: &BufferedIO, size: Option<usize>, newline: Option<Newlines>) -> usize { + let position = buffer.tell() as usize; + let bytes = buffer.cursor.get_ref().get(position..).unwrap_or_default(); + let size_end = size + .and_then(|size| crate::common::str::codepoint_range_end(Self::text(bytes), size)) + .unwrap_or(bytes.len()); + newline + .and_then(|newline| newline.find_newline(Self::text(&bytes[..size_end])).ok()) + .unwrap_or(size_end) + } } #[pyclass(flags(BASETYPE, HAS_DICT, HAS_WEAKREF), with(Constructor, Initializer))] @@ -4463,10 +4508,11 @@ mod _io { // write string to underlying vector #[pymethod] fn write(&self, data: PyStrRef, vm: &VirtualMachine) -> PyResult<u64> { - let bytes = data.as_bytes(); + let bytes = Self::translate_newlines(data.as_wtf8(), self.newline.load()).into_bytes(); self.buffer(vm)? - .write(bytes) - .ok_or_else(|| vm.new_type_error("Error Writing String")) + .write(&bytes) + .ok_or_else(|| vm.new_type_error("Error Writing String"))?; + Ok(data.char_len() as u64) } // return the entire contents of the underlying @@ -4484,9 +4530,36 @@ mod _io { how: OptionalArg<i32>, vm: &VirtualMachine, ) -> PyResult<u64> { - self.buffer(vm)? - .seek(seekfrom(vm, offset, how)?) - .map_err(|err| os_err(vm, err)) + let offset: isize = ArgSize::try_from_object(vm, offset)?.into(); + let how = how.unwrap_or(0); + let mut buffer = self.buffer(vm)?; + let char_offset = match how { + 0 if offset >= 0 => offset as usize, + 0 => return Err(vm.new_value_error(format!("negative seek position {offset}"))), + 1 | 2 if offset != 0 => { + let kind = if how == 1 { "cur" } else { "end" }; + return Err(vm.new_os_error(format!("can't do nonzero {kind}-relative seeks"))); + } + 1 | 2 => { + let byte_offset = if how == 1 { + buffer.tell() as usize + } else { + buffer.cursor.get_ref().len() + }; + Self::byte_offset_to_char(buffer.cursor.get_ref(), byte_offset) + } + _ => { + return Err( + vm.new_value_error(format!("invalid whence ({how}, should be 0, 1 or 2)")) + ); + } + }; + + let byte_offset = Self::char_offset_to_byte(buffer.cursor.get_ref(), char_offset); + buffer + .seek(SeekFrom::Start(byte_offset as u64)) + .map_err(|err| os_err(vm, err))?; + Ok(char_offset as u64) } // Read k bytes from the object and return. @@ -4494,7 +4567,9 @@ mod _io { // This also increments the stream position by the value of k #[pymethod] fn read(&self, size: OptionalSize, vm: &VirtualMachine) -> PyResult<Wtf8Buf> { - let data = self.buffer(vm)?.read(size.to_usize()).unwrap_or_default(); + let mut buffer = self.buffer(vm)?; + let size = Self::read_size(&buffer, size.to_usize(), None); + let data = buffer.read(Some(size)).unwrap_or_default(); let value = Wtf8Buf::from_bytes(data) .map_err(|_| vm.new_value_error("Error Retrieving Value"))?; @@ -4503,22 +4578,28 @@ mod _io { #[pymethod] fn tell(&self, vm: &VirtualMachine) -> PyResult<u64> { - Ok(self.buffer(vm)?.tell()) + let buffer = self.buffer(vm)?; + Ok(Self::byte_offset_to_char(buffer.cursor.get_ref(), buffer.tell() as usize) as u64) } #[pymethod] fn readline(&self, size: OptionalSize, vm: &VirtualMachine) -> PyResult<Wtf8Buf> { - // TODO size should correspond to the number of characters, at the moments its the number of - // bytes. - let input = self.buffer(vm)?.readline(size.to_usize(), vm)?; + let mut buffer = self.buffer(vm)?; + let size = Self::read_size(&buffer, size.to_usize(), Some(self.newline.load())); + let input = buffer.read(Some(size)).unwrap_or_default(); Wtf8Buf::from_bytes(input).map_err(|_| vm.new_value_error("Error Retrieving Value")) } #[pymethod] fn truncate(&self, pos: OptionalSize, vm: &VirtualMachine) -> PyResult<usize> { let mut buffer = self.buffer(vm)?; - let pos = pos.try_usize(vm)?; - Ok(buffer.truncate(pos)) + let pos = match pos.try_usize(vm)? { + Some(pos) => pos, + None => Self::byte_offset_to_char(buffer.cursor.get_ref(), buffer.tell() as usize), + }; + let byte_pos = Self::char_offset_to_byte(buffer.cursor.get_ref(), pos); + buffer.truncate(Some(byte_pos)); + Ok(pos) } #[pygetset] @@ -4531,7 +4612,7 @@ mod _io { let buffer = zelf.buffer(vm)?; let content = Wtf8Buf::from_bytes(buffer.getvalue()) .map_err(|_| vm.new_value_error("Error Retrieving Value"))?; - let pos = buffer.tell(); + let pos = Self::byte_offset_to_char(buffer.cursor.get_ref(), buffer.tell() as usize); drop(buffer); // Get __dict__ if it exists and is non-empty @@ -4540,11 +4621,18 @@ mod _io { _ => vm.ctx.none(), }; + let newline = match zelf.newline.load() { + Newlines::Universal => vm.ctx.none(), + Newlines::Passthrough => vm.ctx.new_str("").into(), + Newlines::Lf => vm.ctx.new_str("\n").into(), + Newlines::Cr => vm.ctx.new_str("\r").into(), + Newlines::Crlf => vm.ctx.new_str("\r\n").into(), + }; + // Return (content, newline, position, dict) - // TODO: store actual newline setting when it's implemented Ok(vm.ctx.new_tuple(vec![ vm.ctx.new_str(content).into(), - vm.ctx.new_str("\n").into(), + newline, vm.ctx.new_int(pos).into(), dict_obj, ])) @@ -4564,18 +4652,23 @@ mod _io { } let content: PyStrRef = state[0].clone().try_into_value(vm)?; - // state[1] is newline - TODO: use when newline handling is implemented - let pos: u64 = state[2].clone().try_into_value(vm)?; + let newline = Newlines::try_from_object(vm, state[1].clone())?; + let pos: isize = ArgSize::try_from_object(vm, state[2].clone())?.into(); + if pos < 0 { + return Err(vm.new_value_error("negative seek position")); + } let dict = &state[3]; // Set content and position let raw_bytes = content.as_bytes().to_vec(); let mut buffer = zelf.buffer.write(); *buffer = BufferedIO::new(Cursor::new(raw_bytes)); + let byte_pos = Self::char_offset_to_byte(buffer.cursor.get_ref(), pos as usize); buffer - .seek(SeekFrom::Start(pos)) + .seek(SeekFrom::Start(byte_pos as u64)) .map_err(|err| os_err(vm, err))?; drop(buffer); + zelf.newline.store(newline); // Set __dict__ if provided if !vm.is_none(dict) { From 04a203c955c81d6abb50e10ecb8f384bc7768dce Mon Sep 17 00:00:00 2001 From: Bas Schoenmaeckers <7943856+bschoenmaeckers@users.noreply.github.com> Date: Thu, 23 Jul 2026 19:43:31 +0200 Subject: [PATCH 285/339] Fix deadlock in c-api when a thread enters a stop_the_world (#8355) --- crates/capi/src/lib.rs | 7 ++++++- crates/capi/src/pylifecycle.rs | 8 +++++++- crates/capi/src/pystate.rs | 15 ++++++++------- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/crates/capi/src/lib.rs b/crates/capi/src/lib.rs index 374fd3301..2aff75fe1 100644 --- a/crates/capi/src/lib.rs +++ b/crates/capi/src/lib.rs @@ -1,7 +1,8 @@ #![allow(clippy::missing_safety_doc)] use crate::pyerrors::init_exception_statics; -use crate::pylifecycle::MAIN_INTERP; +use crate::pylifecycle::{MAIN_INTERP, MAIN_INTERP_PTR}; +use core::sync::atomic::Ordering; pub use rustpython_vm::PyObject; use rustpython_vm::{Context, Interpreter}; use std::sync::MutexGuard; @@ -61,4 +62,8 @@ pub fn init_main_interpreter(interpreter: Interpreter) { // Safety: Interpreter was not initialized before, so we can safely assume the statics are not used unsafe { init_exception_statics(&Context::genesis().exceptions) }; *interp = Some(interpreter); + MAIN_INTERP_PTR.store( + interp.as_ref().unwrap() as *const _ as *mut _, + Ordering::Release, + ); } diff --git a/crates/capi/src/pylifecycle.rs b/crates/capi/src/pylifecycle.rs index 534c97956..7255a0e34 100644 --- a/crates/capi/src/pylifecycle.rs +++ b/crates/capi/src/pylifecycle.rs @@ -3,6 +3,7 @@ use crate::pyerrors::init_exception_statics; use crate::pystate::ensure_thread_has_vm_attached; use alloc::ffi::CString; use core::ffi::{c_char, c_int, c_ulong}; +use core::sync::atomic::{AtomicPtr, Ordering}; use rustpython_vm::common::rc::PyRc; use rustpython_vm::stdlib::sys; use rustpython_vm::version::{MAJOR, MICRO, MINOR, RUSTPYTHON_BUILD_INFO, VERSION_HEX}; @@ -11,6 +12,7 @@ use rustpython_vm::{Context, Interpreter}; use std::sync::{LazyLock, Mutex}; pub(crate) static MAIN_INTERP: Mutex<Option<Interpreter>> = Mutex::new(None); +pub(crate) static MAIN_INTERP_PTR: AtomicPtr<Interpreter> = AtomicPtr::new(core::ptr::null_mut()); /// Request a thread local vm from the main interpreter pub(crate) fn request_vm_from_interpreter() -> ThreadedVirtualMachine { @@ -25,7 +27,7 @@ pub static Py_Version: c_ulong = VERSION_HEX as c_ulong; #[unsafe(no_mangle)] pub extern "C" fn Py_IsInitialized() -> c_int { - get_main_interpreter().is_some() as c_int + !MAIN_INTERP_PTR.load(Ordering::Acquire).is_null() as c_int } #[unsafe(no_mangle)] @@ -52,6 +54,10 @@ pub extern "C" fn Py_InitializeEx(_initsigs: c_int) { }) .build() .into(); + MAIN_INTERP_PTR.store( + interp.as_ref().unwrap() as *const _ as *mut _, + Ordering::Release, + ); drop(interp); ensure_thread_has_vm_attached(); } diff --git a/crates/capi/src/pystate.rs b/crates/capi/src/pystate.rs index 173c26088..865a11644 100644 --- a/crates/capi/src/pystate.rs +++ b/crates/capi/src/pystate.rs @@ -1,7 +1,7 @@ -use crate::get_main_interpreter; -use crate::pylifecycle::request_vm_from_interpreter; +use crate::pylifecycle::{MAIN_INTERP_PTR, request_vm_from_interpreter}; use crate::util::FfiResult; use core::ffi::c_int; +use core::sync::atomic::Ordering; use rustpython_vm::vm::thread::{ CurrentVmAttachState, SavedThreadState, attach_current_thread, release_current_thread, restore_current_thread, save_current_thread, with_current_vm, @@ -67,11 +67,12 @@ pub unsafe extern "C" fn PyEval_RestoreThread(state: *mut PyThreadState) { #[unsafe(no_mangle)] pub extern "C" fn PyInterpreterState_Get() -> *mut PyInterpreterState { - get_main_interpreter() - .as_ref() - .map(|interp| interp as *const PyInterpreterState) - .expect("PyInterpreterState_Get called but no main interpreter was found") - .cast_mut() + let ptr = MAIN_INTERP_PTR.load(Ordering::Acquire); + assert!( + !ptr.is_null(), + "PyInterpreterState_Get() called but the interpreter is not initialized" + ); + ptr } #[unsafe(no_mangle)] From 2082675d968b3f8011bf4dca44d1c1ac6bb1fa0f Mon Sep 17 00:00:00 2001 From: Jiseok CHOI <jiseok.dev@gmail.com> Date: Sat, 25 Jul 2026 19:54:59 +0900 Subject: [PATCH 286/339] sqlite3: fix closed connection error message to match CPython (#8362) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When a Connection is explicitly closed via con.close(), subsequent operations (cursor(), commit(), rollback(), create_function(), etc.) should raise ProgrammingError with 'Cannot operate on a closed database.' to match CPython behaviour. Previously, _db_lock() always returned 'Base Connection.__init__ not called.' when self.db was None, without distinguishing between a connection that was never initialised (subclass before __init__) and one that was initialised and then explicitly closed. Fix: inspect the initialized atomic flag — if True but db is None, the connection was closed; if False, it was never initialised. Assisted-by: GitHub Copilot:claude-sonnet-4-6 --- Lib/test/test_sqlite3/test_dbapi.py | 9 --------- crates/stdlib/src/_sqlite3.rs | 5 +++++ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Lib/test/test_sqlite3/test_dbapi.py b/Lib/test/test_sqlite3/test_dbapi.py index 68faf0a2a..9b6541484 100644 --- a/Lib/test/test_sqlite3/test_dbapi.py +++ b/Lib/test/test_sqlite3/test_dbapi.py @@ -1775,29 +1775,23 @@ class ClosedConTests(unittest.TestCase): self.cur = self.con.cursor() self.con.close() - @unittest.expectedFailure # TODO: RUSTPYTHON; error message differs for closed connection def test_closed_con_cursor(self): self.check(self.con.cursor) - @unittest.expectedFailure # TODO: RUSTPYTHON; error message differs for closed connection def test_closed_con_commit(self): self.check(self.con.commit) - @unittest.expectedFailure # TODO: RUSTPYTHON; error message differs for closed connection def test_closed_con_rollback(self): self.check(self.con.rollback) - @unittest.expectedFailure # TODO: RUSTPYTHON; error message differs for closed connection def test_closed_cur_execute(self): self.check(self.cur.execute, "select 4") - @unittest.expectedFailure # TODO: RUSTPYTHON; error message differs for closed connection def test_closed_create_function(self): def f(x): return 17 self.check(self.con.create_function, "foo", 1, f) - @unittest.expectedFailure # TODO: RUSTPYTHON; error message differs for closed connection def test_closed_create_aggregate(self): class Agg: def __init__(self): @@ -1808,19 +1802,16 @@ class ClosedConTests(unittest.TestCase): return 17 self.check(self.con.create_aggregate, "foo", 1, Agg) - @unittest.expectedFailure # TODO: RUSTPYTHON; error message differs for closed connection def test_closed_set_authorizer(self): def authorizer(*args): return sqlite.DENY self.check(self.con.set_authorizer, authorizer) - @unittest.expectedFailure # TODO: RUSTPYTHON; error message differs for closed connection def test_closed_set_progress_callback(self): def progress(): pass self.check(self.con.set_progress_handler, progress, 100) - @unittest.expectedFailure # TODO: RUSTPYTHON; error message differs for closed connection def test_closed_call(self): self.check(self.con) diff --git a/crates/stdlib/src/_sqlite3.rs b/crates/stdlib/src/_sqlite3.rs index f3eea603e..4e30f6204 100644 --- a/crates/stdlib/src/_sqlite3.rs +++ b/crates/stdlib/src/_sqlite3.rs @@ -1026,6 +1026,11 @@ mod _sqlite3 { Ok(PyMutexGuard::map(guard, |x| unsafe { x.as_mut().unwrap_unchecked() })) + } else if self.initialized.load(Ordering::Acquire) { + Err(new_programming_error( + vm, + "Cannot operate on a closed database.".to_owned(), + )) } else { Err(new_programming_error( vm, From 64352495d7b025c78764a1b7ef8ae6679c9e015f Mon Sep 17 00:00:00 2001 From: Jiseok CHOI <jiseok.dev@gmail.com> Date: Sat, 25 Jul 2026 19:55:36 +0900 Subject: [PATCH 287/339] sqlite3: allow Row construction with cursor having no description (#8364) Row(cursor, data) raised ValueError when cursor.description was None. CPython allows this case and returns an empty key list. - Use empty tuple when description is None instead of raising - Include the key name in the IndexError when a string key is not found Assisted-by: GitHub Copilot:claude-sonnet-4-6 --- Lib/test/test_sqlite3/test_dbapi.py | 1 - crates/stdlib/src/_sqlite3.rs | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_sqlite3/test_dbapi.py b/Lib/test/test_sqlite3/test_dbapi.py index 9b6541484..c7ea5b59e 100644 --- a/Lib/test/test_sqlite3/test_dbapi.py +++ b/Lib/test/test_sqlite3/test_dbapi.py @@ -2045,7 +2045,6 @@ class RowTests(unittest.TestCase): self.assertNotEqual(r1, r3) - @unittest.expectedFailure # TODO: RUSTPYTHON; Row with no description fails def test_row_no_description(self): cu = self.cx.cursor() self.assertIsNone(cu.description) diff --git a/crates/stdlib/src/_sqlite3.rs b/crates/stdlib/src/_sqlite3.rs index 4e30f6204..5f15b0cbc 100644 --- a/crates/stdlib/src/_sqlite3.rs +++ b/crates/stdlib/src/_sqlite3.rs @@ -2255,7 +2255,7 @@ mod _sqlite3 { return self.data.getitem_by_index(vm, i); } } - Err(vm.new_index_error("No item with that key")) + Err(vm.new_index_error(format!("No item with key '{}'", name.to_string_lossy()))) } else if let Some(slice) = needle.downcast_ref::<PySlice>() { let list = self.data.getitem_by_slice(vm, slice.to_saturated(vm)?)?; Ok(vm.ctx.new_tuple(list).into()) @@ -2277,7 +2277,7 @@ mod _sqlite3 { .inner(vm)? .description .clone() - .ok_or_else(|| vm.new_value_error("no description in Cursor"))?; + .unwrap_or_else(|| vm.ctx.empty_tuple.clone()); Ok(Self { data, description }) } From 4ea3fd46177a8f5922baff25d433456460ff1dc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EA=B4=91=ED=9A=A8?= <87641474+widehyo1@users.noreply.github.com> Date: Sat, 25 Jul 2026 19:58:05 +0900 Subject: [PATCH 288/339] ast: fix identifier interning (#8361) * Fix AST identifier interning Ensure parsed name and function identifier fields use interned strings, matching CPython behavior. Assisted-by: Codex:gpt-5.6-sol * Apply PEP 8 import ordering --- Lib/test/test_ast/test_ast.py | 3 --- crates/vm/src/stdlib/_ast/expression.rs | 3 ++- crates/vm/src/stdlib/_ast/statement.rs | 2 +- extra_tests/snippets/stdlib_ast.py | 20 ++++++++++++++++++++ 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/Lib/test/test_ast/test_ast.py b/Lib/test/test_ast/test_ast.py index 31fd62964..1450f440d 100644 --- a/Lib/test/test_ast/test_ast.py +++ b/Lib/test/test_ast/test_ast.py @@ -1331,7 +1331,6 @@ class CopyTests(unittest.TestCase): self.assertEqual(repl.x, 0) self.assertEqual(repl.y, y) - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: 'x' is not 'x' def test_replace_ignore_known_custom_instance_fields(self): node = ast.parse('x').body[0].value node.extra = extra = object() # add instance 'extra' field @@ -1401,7 +1400,6 @@ class CopyTests(unittest.TestCase): self.assertIs(node2.returns, None) self.assertEqual(node2.decorator_list, []) - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: "Name\.__replace__\ got\ an\ unexpected\ keyword\ argument\ 'extra'\." does not match "replace() does not support Name objects" def test_replace_reject_known_custom_instance_fields_commits(self): node = ast.parse('x').body[0].value node.extra = extra = object() # add instance 'extra' field @@ -1417,7 +1415,6 @@ class CopyTests(unittest.TestCase): self.assertIs(node.ctx, context) self.assertIs(node.extra, extra) - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: "Name\.__replace__\ got\ an\ unexpected\ keyword\ argument\ 'unknown'\." does not match "replace() does not support Name objects" def test_replace_reject_unknown_instance_fields(self): node = ast.parse('x').body[0].value context = node.ctx diff --git a/crates/vm/src/stdlib/_ast/expression.rs b/crates/vm/src/stdlib/_ast/expression.rs index 39f42652c..10bdf5266 100644 --- a/crates/vm/src/stdlib/_ast/expression.rs +++ b/crates/vm/src/stdlib/_ast/expression.rs @@ -1376,7 +1376,8 @@ impl Node for ast::ExprName { .into_ref_with_type(vm, pyast::NodeExprName::static_type().to_owned()) .unwrap(); let dict = node.as_object().dict().unwrap(); - dict.set_item("id", id.to_pyobject(vm), vm).unwrap(); + dict.set_item("id", id.ast_to_object(vm, source_file), vm) + .unwrap(); dict.set_item("ctx", ctx.ast_to_object(vm, source_file), vm) .unwrap(); node_add_location(&dict, range, vm, source_file); diff --git a/crates/vm/src/stdlib/_ast/statement.rs b/crates/vm/src/stdlib/_ast/statement.rs index ad3306fce..bf8b03476 100644 --- a/crates/vm/src/stdlib/_ast/statement.rs +++ b/crates/vm/src/stdlib/_ast/statement.rs @@ -409,7 +409,7 @@ impl Node for ast::StmtFunctionDef { let node = NodeAst.into_ref_with_type(vm, cls).unwrap(); let dict = node.as_object().dict().unwrap(); - dict.set_item("name", vm.ctx.new_str(name.as_str()).to_pyobject(vm), vm) + dict.set_item("name", name.ast_to_object(vm, source_file), vm) .unwrap(); dict.set_item("args", parameters.ast_to_object(vm, source_file), vm) .unwrap(); diff --git a/extra_tests/snippets/stdlib_ast.py b/extra_tests/snippets/stdlib_ast.py index 7b5c69df4..2dd227672 100644 --- a/extra_tests/snippets/stdlib_ast.py +++ b/extra_tests/snippets/stdlib_ast.py @@ -1,4 +1,5 @@ import ast +import copy print(ast) @@ -39,6 +40,25 @@ assert i.names[0].name == "a" assert i.names[0].asname is None +# Regression: parsed AST identifier fields are interned, matching CPython. +name_literal = "x" +name = ast.parse("x").body[0].value +assert name.id is name_literal + +name.extra = object() +replacement = copy.replace(name) +assert replacement.id is name.id +assert replacement.ctx is name.ctx +assert not hasattr(replacement, "extra") + +function_name = "f" +function = ast.parse("def f(): pass").body[0] +assert function.name is function_name + +async_function = ast.parse("async def f(): pass").body[0] +assert async_function.name is function_name + + # Regression test for issue #4862: # A cyclic AST fed to compile() used to overflow the Rust stack and SIGSEGV. # After the fix, the recursion guard in ast_from_object raises RecursionError, From 604934882de1d210fb7f8a45607f3c71c53a2687 Mon Sep 17 00:00:00 2001 From: Lee Dogeon <dev.moreal@gmail.com> Date: Sat, 25 Jul 2026 19:59:05 +0900 Subject: [PATCH 289/339] Fix float overflow in struct packing (#8360) Raise OverflowError when a finite f64 value overflows while being converted for the struct f format. Remove the expected-failure marker from the corresponding regression test. Assisted-by: Codex:gpt-5 --- Lib/test/test_struct.py | 1 - crates/vm/src/buffer.rs | 16 ++++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Lib/test/test_struct.py b/Lib/test/test_struct.py index f8d3a4be2..31d2e58b1 100644 --- a/Lib/test/test_struct.py +++ b/Lib/test/test_struct.py @@ -365,7 +365,6 @@ class StructTest(ComplexesAreIdenticalMixin, unittest.TestCase): (got,) = struct.unpack(code, got) self.assertEqual(got, expectedback) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_705836(self): # SF bug 705836. "<f" and ">f" had a severe rounding bug, where a carry # from the low-order discarded bits could propagate into the exponent diff --git a/crates/vm/src/buffer.rs b/crates/vm/src/buffer.rs index ae5ce6b00..dc3691b54 100644 --- a/crates/vm/src/buffer.rs +++ b/crates/vm/src/buffer.rs @@ -616,14 +616,22 @@ make_pack_prim_int!(usize); make_pack_prim_int!(isize); macro_rules! make_pack_float { - ($T:ty) => { + ($T:ty, $fmt:literal) => { impl Packable for $T { fn pack<E: ByteOrder>( vm: &VirtualMachine, arg: PyObjectRef, data: &mut [u8], ) -> PyResult<()> { - let f = ArgIntoFloat::try_from_object(vm, arg)?.into_float() as $T; + let f_64 = ArgIntoFloat::try_from_object(vm, arg)?.into_float(); + let f = f_64 as $T; + if f.is_infinite() != f_64.is_infinite() { + return Err(vm.new_overflow_error(concat!( + "float too large to pack with ", + $fmt, + " format" + ))); + } f.to_bits().pack_int::<E>(data); Ok(()) } @@ -636,8 +644,8 @@ macro_rules! make_pack_float { }; } -make_pack_float!(f32); -make_pack_float!(f64); +make_pack_float!(f32, "f"); +make_pack_float!(f64, "d"); impl Packable for f16 { fn pack<E: ByteOrder>(vm: &VirtualMachine, arg: PyObjectRef, data: &mut [u8]) -> PyResult<()> { From 77115b853bdc7461dddbfbeed20d14c8299fcc7e Mon Sep 17 00:00:00 2001 From: sijun-yang <yangsijun5528@gmail.com> Date: Sat, 25 Jul 2026 20:00:30 +0900 Subject: [PATCH 290/339] Fix b2a_qp CRLF boundary check (#8358) Assisted-by: Codex:gpt-5.6-sol --- crates/stdlib/src/binascii.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/stdlib/src/binascii.rs b/crates/stdlib/src/binascii.rs index 579a5081c..0cf005628 100644 --- a/crates/stdlib/src/binascii.rs +++ b/crates/stdlib/src/binascii.rs @@ -504,7 +504,7 @@ mod decl { } in_idx += 1; } - if buflen > 0 && in_idx < buflen && buf[in_idx - 1] == b'\r' { + if in_idx > 0 && in_idx < buflen && buf[in_idx - 1] == b'\r' { crlf = true; } From 9436ba50677f5dfcd942a15eb0fde6619d3a2978 Mon Sep 17 00:00:00 2001 From: lms0806 <ekfdmlzkf@gmail.com> Date: Sat, 25 Jul 2026 20:03:52 +0900 Subject: [PATCH 291/339] time: use C altzone when available (#8357) * time: use C altzone when available * Modified to also check TARGET_CC/CC_target. --- Cargo.lock | 1 + crates/host_env/Cargo.toml | 3 ++ crates/host_env/build.rs | 72 ++++++++++++++++++++++++++++++++++++ crates/host_env/src/time.rs | 22 ++++++++++- crates/vm/src/stdlib/time.rs | 3 +- 5 files changed, 98 insertions(+), 3 deletions(-) create mode 100644 crates/host_env/build.rs diff --git a/Cargo.lock b/Cargo.lock index a0af67e95..463a72984 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3422,6 +3422,7 @@ name = "rustpython-host_env" version = "0.5.0" dependencies = [ "bitflags 2.13.1", + "cc", "dns-lookup", "gethostname", "getrandom 0.4.3", diff --git a/crates/host_env/Cargo.toml b/crates/host_env/Cargo.toml index 3beda890b..07f7d0da6 100644 --- a/crates/host_env/Cargo.toml +++ b/crates/host_env/Cargo.toml @@ -84,5 +84,8 @@ windows-sys = { workspace = true, features = [ "Win32_UI_WindowsAndMessaging", ] } +[build-dependencies] +cc = "1" + [lints] workspace = true diff --git a/crates/host_env/build.rs b/crates/host_env/build.rs new file mode 100644 index 000000000..d04d48f16 --- /dev/null +++ b/crates/host_env/build.rs @@ -0,0 +1,72 @@ +//! Like CPython's `HAVE_ALTZONE`, it detects the presence of `altzone` in `time.h` at build time. + +#![allow( + clippy::disallowed_methods, + reason = "build scripts cannot use rustpython-host_env" +)] + +use std::{env, fs, path::PathBuf}; + +fn main() { + println!("cargo:rerun-if-changed=build.rs"); + println!("cargo:rustc-check-cfg=cfg(has_altzone)"); + + let target_env = env::var("CARGO_CFG_TARGET_ENV").unwrap_or_default(); + let target_arch = env::var("CARGO_CFG_TARGET_ARCH").unwrap_or_default(); + + if target_env == "msvc" || target_arch == "wasm32" { + return; + } + + let host = env::var("HOST").unwrap_or_default(); + let target = env::var("TARGET").unwrap_or_default(); + // cc::Build resolves CC_<target>, CC_<target_with_underscores>, TARGET_CC, then CC. + if host != target && !has_target_c_compiler(&target) { + return; + } + + if probe_altzone() { + println!("cargo:rustc-cfg=has_altzone"); + } +} + +/// Whether any compiler env var that `cc::Build` would consult for the target is set. +fn has_target_c_compiler(target: &str) -> bool { + let underscored = target.replace(['-', '.'], "_"); + env::var_os(format!("CC_{target}")).is_some() + || env::var_os(format!("CC_{underscored}")).is_some() + || env::var_os("TARGET_CC").is_some() + || env::var_os("CC").is_some() +} + +/// Check corresponding to `AC_TRY_COMPILE(... altzone ...)` in CPython's `configure`. +fn probe_altzone() -> bool { + let out_dir = PathBuf::from(env::var_os("OUT_DIR").expect("OUT_DIR")); + let src = out_dir.join("probe_altzone.c"); + let obj = out_dir.join("probe_altzone.o"); + + if fs::write( + &src, + "#include <time.h>\nint main(void) { return (int)altzone; }\n", + ) + .is_err() + { + return false; + } + + let Ok(compiler) = cc::Build::new().try_get_compiler() else { + return false; + }; + + let mut cmd = compiler.to_command(); + if compiler.is_like_msvc() { + cmd.arg("/c").arg(&src).arg(format!("/Fo{}", obj.display())); + } else { + cmd.arg("-c").arg(&src).arg("-o").arg(&obj); + } + + match cmd.output() { + Ok(output) => output.status.success(), + Err(_) => false, + } +} diff --git a/crates/host_env/src/time.rs b/crates/host_env/src/time.rs index 3e3227d78..dd97a9366 100644 --- a/crates/host_env/src/time.rs +++ b/crates/host_env/src/time.rs @@ -15,7 +15,7 @@ pub const SEC_TO_NS: i64 = SEC_TO_MS * MS_TO_NS; pub const NS_TO_MS: i64 = 1000 * 1000; pub const NS_TO_US: i64 = 1000; -/// Access to the C runtime's `tzset` / `timezone` / `daylight` / `tzname` +/// Access to the C runtime's `tzset` / `timezone` / `altzone` / `daylight` / `tzname` /// globals used by Python's `time` module. /// /// Not available under MSVC (which exposes these only via the @@ -28,6 +28,10 @@ pub mod tz { static c_daylight: core::ffi::c_int; #[link_name = "timezone"] static c_timezone: core::ffi::c_long; + // Set by `build.rs` when `time.h` exposes `altzone` (CPython `HAVE_ALTZONE`). + #[cfg(has_altzone)] + #[link_name = "altzone"] + static c_altzone: core::ffi::c_long; #[link_name = "tzname"] static c_tzname: [*const core::ffi::c_char; 2]; #[link_name = "tzset"] @@ -43,6 +47,22 @@ pub mod tz { unsafe { c_timezone } } + /// DST offset west of UTC in seconds, matching CPython's `time.altzone`. + /// + /// Uses the C `altzone` global when available; otherwise falls back to + /// `timezone - 3600` (same as CPython without `HAVE_ALTZONE`). + #[must_use] + pub fn altzone() -> core::ffi::c_long { + #[cfg(has_altzone)] + { + unsafe { c_altzone } + } + #[cfg(not(has_altzone))] + { + timezone() - 3600 + } + } + #[cfg(not(target_os = "freebsd"))] #[must_use] pub fn daylight() -> core::ffi::c_int { diff --git a/crates/vm/src/stdlib/time.rs b/crates/vm/src/stdlib/time.rs index 05894cdc2..aaac706bf 100644 --- a/crates/vm/src/stdlib/time.rs +++ b/crates/vm/src/stdlib/time.rs @@ -210,8 +210,7 @@ mod decl { #[cfg(not(target_arch = "wasm32"))] #[pyattr] fn altzone(_vm: &VirtualMachine) -> core::ffi::c_long { - // TODO: RUSTPYTHON; Add support for using the C altzone - crate::host_env::time::tz::timezone() - 3600 + crate::host_env::time::tz::altzone() } #[cfg(target_env = "msvc")] From 4d80a3320fe9d80b3730730d79460252c6f80a48 Mon Sep 17 00:00:00 2001 From: Bas Schoenmaeckers <7943856+bschoenmaeckers@users.noreply.github.com> Date: Sat, 25 Jul 2026 13:07:44 +0200 Subject: [PATCH 292/339] Fix some pyo3 testcase against the c-api (#8349) --- crates/capi/src/import.rs | 14 +++++++++++++- crates/capi/src/methodobject.rs | 14 ++++++++++++++ crates/capi/src/object.rs | 16 ++++++++++++++-- crates/capi/src/pycapsule.rs | 23 +++++++++++++++++++++++ crates/vm/src/builtins/capsule.rs | 3 +++ 5 files changed, 67 insertions(+), 3 deletions(-) diff --git a/crates/capi/src/import.rs b/crates/capi/src/import.rs index 3a8dae651..37a4bbf88 100644 --- a/crates/capi/src/import.rs +++ b/crates/capi/src/import.rs @@ -8,7 +8,11 @@ use rustpython_vm::import::import_code_obj; pub unsafe extern "C" fn PyImport_Import(name: *mut PyObject) -> *mut PyObject { with_vm(|vm| { let name = unsafe { (&*name).try_downcast_ref::<PyStr>(vm)? }; - vm.import(name, 0) + let _ = vm.import(name, 0)?; + + vm.sys_module + .get_attr(rustpython_vm::identifier!(vm, modules), vm)? + .get_item(name, vm) }) } @@ -74,4 +78,12 @@ mod tests { let _module = py.import("types").unwrap(); }) } + + #[test] + fn import_sub_module() { + Python::attach(|py| { + let module = py.import("collections.abc").unwrap(); + module.getattr("Sequence").unwrap(); + }) + } } diff --git a/crates/capi/src/methodobject.rs b/crates/capi/src/methodobject.rs index cc3676ef5..2be54ca89 100644 --- a/crates/capi/src/methodobject.rs +++ b/crates/capi/src/methodobject.rs @@ -53,6 +53,7 @@ pub(crate) fn build_method_def( let flags = PyMethodFlags::from_bits(ml.ml_flags as u32) .ok_or_else(|| vm.new_system_error("PyMethodDef contains unknown flags"))?; + let has_self = has_self && !flags.contains(PyMethodFlags::STATIC); let method = ml.ml_meth; @@ -359,4 +360,17 @@ mod tests { ); }) } + + #[test] + fn wrap_static_no_args_function() { + #[pyfunction()] + fn f() {} + + Python::attach(|py| { + let module = PyModule::new(py, "test_wrap_pyfunction_forms").unwrap(); + + let func = wrap_pyfunction!(f, &module).unwrap(); + func.call0().unwrap(); + }); + } } diff --git a/crates/capi/src/object.rs b/crates/capi/src/object.rs index eabfbef23..641dbe3ef 100644 --- a/crates/capi/src/object.rs +++ b/crates/capi/src/object.rs @@ -217,7 +217,7 @@ pub unsafe extern "C" fn PyObject_HasAttrWithError( with_vm(|vm| { let obj = unsafe { &*obj }; let name = unsafe { &*attr_name }.try_downcast_ref::<PyStr>(vm)?; - obj.has_attr(name, vm) + Ok(vm.get_attribute_opt(obj.to_owned(), name)?.is_some()) }) } @@ -272,7 +272,7 @@ pub unsafe extern "C" fn PyObject_HasAttrStringWithError( with_vm(|vm| { let obj = unsafe { &*obj }; let name = unsafe { attr_name.try_as_str(vm) }?; - obj.has_attr(name, vm) + Ok(vm.get_attribute_opt(obj.to_owned(), name)?.is_some()) }) } @@ -591,4 +591,16 @@ mod tests { assert!(dict.get_item("foo").is_ok()); }) } + + #[test] + fn hasattr() { + Python::attach(|py| { + let x = 5i32.into_pyobject(py).unwrap(); + assert!(x.is_instance_of::<PyInt>()); + + // spell-checker:ignore bbbbbbytes + assert!(x.hasattr("to_bytes").unwrap()); + assert!(!x.hasattr("bbbbbbytes").unwrap()); + }) + } } diff --git a/crates/capi/src/pycapsule.rs b/crates/capi/src/pycapsule.rs index b36dea3d9..f5b792eec 100644 --- a/crates/capi/src/pycapsule.rs +++ b/crates/capi/src/pycapsule.rs @@ -48,6 +48,11 @@ pub unsafe extern "C" fn PyCapsule_GetContext(capsule: *mut PyObject) -> *mut c_ let capsule = unsafe { &*capsule } .downcast_ref_if_exact::<PyCapsule>(vm) .ok_or_else(|| vm.new_value_error("Invalid capsule"))?; + + if capsule.pointer().is_null() { + return Err(vm.new_value_error("Capsule has null pointer")); + } + Ok(capsule.context()) }) } @@ -143,6 +148,7 @@ fn checked_capsule<'a>( #[cfg(test)] mod tests { + use pyo3::ffi; use pyo3::prelude::*; use pyo3::types::PyCapsule; @@ -156,4 +162,21 @@ mod tests { assert_eq!(unsafe { ptr.cast::<String>().as_ref() }, "Some data"); }) } + + #[test] + fn capsule_context_on_invalid_capsule() { + Python::attach(|py| { + let cap = PyCapsule::new_with_value(py, 123u32, c"name").unwrap(); + + // Invalidate the capsule + // SAFETY: intentionally breaking the capsule for testing + unsafe { + ffi::PyCapsule_SetPointer(cap.as_ptr(), core::ptr::null_mut()); + } + + // context() on invalid capsule should fail + let result = cap.context(); + assert!(result.is_err()); + }); + } } diff --git a/crates/vm/src/builtins/capsule.rs b/crates/vm/src/builtins/capsule.rs index 43efa0fb2..19260dba8 100644 --- a/crates/vm/src/builtins/capsule.rs +++ b/crates/vm/src/builtins/capsule.rs @@ -76,6 +76,9 @@ impl Representable for PyCapsule { impl Destructor for PyCapsule { fn del(zelf: &Py<Self>, _vm: &VirtualMachine) -> PyResult<()> { + if zelf.pointer().is_null() { + return Ok(()); + } if let Some(destructor) = zelf.destructor() { unsafe { destructor(zelf.as_object().as_raw().cast_mut()) }; } From c6bb4a8f52c1b8ea0180d03c733c9bfa047c5d20 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 25 Jul 2026 20:30:33 +0900 Subject: [PATCH 293/339] Bump fast-uri from 3.1.2 to 3.1.4 in /wasm/demo (#8365) Bumps [fast-uri](https://github.com/fastify/fast-uri) from 3.1.2 to 3.1.4. - [Release notes](https://github.com/fastify/fast-uri/releases) - [Commits](https://github.com/fastify/fast-uri/compare/v3.1.2...v3.1.4) --- updated-dependencies: - dependency-name: fast-uri dependency-version: 3.1.4 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- wasm/demo/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wasm/demo/package-lock.json b/wasm/demo/package-lock.json index d26170de8..e5ef3a707 100644 --- a/wasm/demo/package-lock.json +++ b/wasm/demo/package-lock.json @@ -2559,9 +2559,9 @@ "license": "MIT" }, "node_modules/fast-uri": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.2.tgz", - "integrity": "sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ==", + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.4.tgz", + "integrity": "sha512-8JnbkQ4juDyvYs4mgFGQqg4yCYtFDtUtmp2QIQq11ZZe5CFQ5wcqm1rqDgAh/QdMySuBnPzMUiJUNZG5N/AiQw==", "dev": true, "funding": [ { From 375051ddf819d4311606dc3f6ef518efeb2dbe42 Mon Sep 17 00:00:00 2001 From: Jiseok CHOI <jiseok.dev@gmail.com> Date: Sun, 26 Jul 2026 13:02:25 +0900 Subject: [PATCH 294/339] sqlite3: raise ProgrammingError when named param receives sequence (#8363) CPython raises ProgrammingError with "Binding N is a named parameter" when a query uses named placeholders (, , ) but the caller passes a sequence instead of a mapping. RustPython's bind_parameters_sequence() did not check whether each binding slot is a named parameter, so no error was raised. Fix: call sqlite3_bind_parameter_name() for each slot in bind_parameters_sequence(). If the first byte of the returned name is not '?' (i.e. it is a named placeholder), raise ProgrammingError before attempting to bind. Assisted-by: GitHub Copilot:claude-sonnet-4-6 --- .cspell.json | 1 + Lib/test/test_sqlite3/test_dbapi.py | 1 - crates/stdlib/src/_sqlite3.rs | 10 ++++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.cspell.json b/.cspell.json index ab3d229cf..21d401563 100644 --- a/.cspell.json +++ b/.cspell.json @@ -83,6 +83,7 @@ "opargs", "pointee", "pyc", + "qmark", "reborrow", "reborrows", "reparenting", diff --git a/Lib/test/test_sqlite3/test_dbapi.py b/Lib/test/test_sqlite3/test_dbapi.py index c7ea5b59e..68f8969a0 100644 --- a/Lib/test/test_sqlite3/test_dbapi.py +++ b/Lib/test/test_sqlite3/test_dbapi.py @@ -875,7 +875,6 @@ class CursorTests(unittest.TestCase): with self.assertRaises(ZeroDivisionError): self.cu.execute("select name from test where name=?", L()) - @unittest.expectedFailure # TODO: RUSTPYTHON; mixed named and positional parameters not validated def test_execute_named_param_and_sequence(self): dataset = ( ("select :a", (1,)), diff --git a/crates/stdlib/src/_sqlite3.rs b/crates/stdlib/src/_sqlite3.rs index 5f15b0cbc..58d8ad7b3 100644 --- a/crates/stdlib/src/_sqlite3.rs +++ b/crates/stdlib/src/_sqlite3.rs @@ -3208,6 +3208,16 @@ mod _sqlite3 { } for i in 1..=num_needed { + let name = unsafe { sqlite3_bind_parameter_name(self.st, i) }; + if !name.is_null() && unsafe { *name } != b'?' as libc::c_char { + let name_str = ptr_to_str(name, vm)?; + return Err(new_programming_error( + vm, + format!( + "Binding {i} ('{name_str}') is a named parameter, but you supplied a sequence which requires nameless (qmark) placeholders." + ), + )); + } let val = seq.get_item(i as isize - 1, vm)?; self.bind_parameter(i, &val, vm)?; } From f89b42e609064c698b31f79f9ccfa012cd9e760d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 26 Jul 2026 13:02:39 +0900 Subject: [PATCH 295/339] build(deps-dev): bump postcss from 8.5.10 to 8.5.23 in /wasm/demo (#8367) Bumps [postcss](https://github.com/postcss/postcss) from 8.5.10 to 8.5.23. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss/compare/8.5.10...8.5.23) --- updated-dependencies: - dependency-name: postcss dependency-version: 8.5.23 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- wasm/demo/package-lock.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/wasm/demo/package-lock.json b/wasm/demo/package-lock.json index e5ef3a707..43a56ca91 100644 --- a/wasm/demo/package-lock.json +++ b/wasm/demo/package-lock.json @@ -3704,9 +3704,9 @@ } }, "node_modules/nanoid": { - "version": "3.3.11", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz", - "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==", + "version": "3.3.16", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.16.tgz", + "integrity": "sha512-bzlKTyNJ7+LdGIIwy8ijFpIqEQIvafahV7eYykJ8Cvh42EdJeODoJ6gUJXpQJvej1BddH8OqTXZNE/KfbWAu8Q==", "dev": true, "funding": [ { @@ -4069,9 +4069,9 @@ } }, "node_modules/postcss": { - "version": "8.5.10", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.10.tgz", - "integrity": "sha512-pMMHxBOZKFU6HgAZ4eyGnwXF/EvPGGqUr0MnZ5+99485wwW41kW91A4LOGxSHhgugZmSChL5AlElNdwlNgcnLQ==", + "version": "8.5.23", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.23.tgz", + "integrity": "sha512-g50586zr4bZmwFiTlflMu8E0bDTb5I5gertgwAKmsdUlTQIhZtunzUlD1WSzwcVWPoAVpsrA6vlfCD7oXvRwgg==", "dev": true, "funding": [ { @@ -4089,7 +4089,7 @@ ], "license": "MIT", "dependencies": { - "nanoid": "^3.3.11", + "nanoid": "^3.3.16", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" }, From c25d98a0aab10c16c88392828b053cfadbc3ffe0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 26 Jul 2026 13:02:50 +0900 Subject: [PATCH 296/339] build(deps-dev): bump http-proxy-middleware in /wasm/demo (#8368) Bumps [http-proxy-middleware](https://github.com/chimurai/http-proxy-middleware) from 2.0.9 to 2.0.10. - [Release notes](https://github.com/chimurai/http-proxy-middleware/releases) - [Changelog](https://github.com/chimurai/http-proxy-middleware/blob/v2.0.10/CHANGELOG.md) - [Commits](https://github.com/chimurai/http-proxy-middleware/compare/v2.0.9...v2.0.10) --- updated-dependencies: - dependency-name: http-proxy-middleware dependency-version: 2.0.10 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- wasm/demo/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wasm/demo/package-lock.json b/wasm/demo/package-lock.json index 43a56ca91..59ce265c2 100644 --- a/wasm/demo/package-lock.json +++ b/wasm/demo/package-lock.json @@ -3026,9 +3026,9 @@ } }, "node_modules/http-proxy-middleware": { - "version": "2.0.9", - "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.9.tgz", - "integrity": "sha512-c1IyJYLYppU574+YI7R4QyX2ystMtVXZwIdzazUIPIJsHuWNd+mho2j+bKoHftndicGj9yh+xjd+l0yj7VeT1Q==", + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.10.tgz", + "integrity": "sha512-RKzRWNPxUZqbuk3BC5mGVJbBnWgr+diEnjJexIOytFbBzDy88Fbh/YvBr3DsNrl1jYAfjWfpATEv0NO35FDuPQ==", "dev": true, "license": "MIT", "dependencies": { From 3562c7ce7d3c6358f0de501c28827d2ee1356fcf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 26 Jul 2026 13:03:41 +0900 Subject: [PATCH 297/339] build(deps-dev): bump shell-quote from 1.8.4 to 1.10.0 in /wasm/demo (#8370) Bumps [shell-quote](https://github.com/ljharb/shell-quote) from 1.8.4 to 1.10.0. - [Changelog](https://github.com/ljharb/shell-quote/blob/main/CHANGELOG.md) - [Commits](https://github.com/ljharb/shell-quote/compare/v1.8.4...v1.10.0) --- updated-dependencies: - dependency-name: shell-quote dependency-version: 1.10.0 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- wasm/demo/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wasm/demo/package-lock.json b/wasm/demo/package-lock.json index 59ce265c2..a60d00560 100644 --- a/wasm/demo/package-lock.json +++ b/wasm/demo/package-lock.json @@ -4849,9 +4849,9 @@ } }, "node_modules/shell-quote": { - "version": "1.8.4", - "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.4.tgz", - "integrity": "sha512-VsC6n6vz1ihYYyZZwX7YZSF5l5x36ca17OC+a69h94YqB7X6XLwf+5MOgynYir2SLFUbl8gIYvBo8K8RoNQ6bQ==", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.10.0.tgz", + "integrity": "sha512-w1aiOKwKuRgtwAReIIj89puqg+I7GvX4IbLrvmhXbzQsj1+Zwi4VO3+fa6ZF91TWSjIxoEkKnMeHcLEODK5ZXA==", "dev": true, "license": "MIT", "engines": { From 45b9c2e1a38f743e6bd5ea71d51d76b546d3b95b Mon Sep 17 00:00:00 2001 From: Yubin Kim <80163835+devyubin@users.noreply.github.com> Date: Sun, 26 Jul 2026 13:14:50 +0900 Subject: [PATCH 298/339] Replace malformed unicode error helper calls with the _real variants (#8359) * Replace malformed unicode error helper calls with the _real variants new_unicode_decode_error / new_unicode_encode_error build the exception from a bare message without running the initializer, so the result has none of the five attributes a unicode error must carry and str() renders as an empty string. Convert the non-Windows call sites in csv, socket, getlogin and the fs-path decoders to the _real constructors, passing the source bytes/str and the failing offset from the captured Utf8Error. The Windows-gated sites (nt, mbcs/oem codecs) and the sites whose source object is not reachable (uname, array) are left for follow-ups. Assisted-by: Claude Code:claude-fable-5 * Report the full invalid UTF-8 span in the converted decode errors The conversions used valid_up_to() + 1 for the decode-error end offset, which under-reports multi-byte invalid sequences. Take the span from the Utf8Error instead: valid_up_to() + error_len(), or the input length for a truncated sequence (error_len() == None), matching CPython. Assisted-by: Claude Code:claude-opus-4-8 --- crates/stdlib/src/csv.rs | 35 ++++++++++++++++++++++--------- crates/stdlib/src/socket.rs | 36 ++++++++++++++++++++++++++++---- crates/vm/src/function/fspath.rs | 11 ++++++++-- crates/vm/src/stdlib/os.rs | 11 ++++++++-- crates/vm/src/stdlib/posix.rs | 14 +++++++++---- 5 files changed, 85 insertions(+), 22 deletions(-) diff --git a/crates/stdlib/src/csv.rs b/crates/stdlib/src/csv.rs index a5203e8a3..91717801b 100644 --- a/crates/stdlib/src/csv.rs +++ b/crates/stdlib/src/csv.rs @@ -60,6 +60,21 @@ mod _csv { vm.new_exception_msg(super::_csv::error(vm), msg.into()) } + fn new_not_utf8_error( + vm: &VirtualMachine, + bytes: &[u8], + err: core::str::Utf8Error, + ) -> PyBaseExceptionRef { + vm.new_unicode_decode_error_real( + vm.ctx.new_str("utf-8"), + vm.ctx.new_bytes(bytes.to_vec()), + err.valid_up_to(), + err.error_len() + .map_or(bytes.len(), |n| err.valid_up_to() + n), + vm.ctx.new_str("csv not utf8"), + ) + } + #[pyattr] #[pyclass(module = "csv", name = "Dialect")] #[derive(Debug, PyPayload, Clone, Copy)] @@ -1111,8 +1126,8 @@ mod _csv { { return Ok(vm.ctx.none()); } - let field = core::str::from_utf8(&field) - .map_err(|_| vm.new_unicode_decode_error("csv not utf8"))?; + let field = + core::str::from_utf8(&field).map_err(|e| new_not_utf8_error(vm, &field, e))?; Ok(vm.ctx.new_str(field).into()) }) .collect() @@ -1248,7 +1263,7 @@ mod _csv { prev_end = end; let s = core::str::from_utf8(&buffer[range.clone()]) // not sure if this is possible - the input was all strings - .map_err(|_e| vm.new_unicode_decode_error("csv not utf8"))?; + .map_err(|e| new_not_utf8_error(vm, &buffer[range.clone()], e))?; // TODO: RUSTPYTHON; Incomplete implementation if let QuoteStyle::Nonnumeric = zelf.dialect.quoting { @@ -1423,8 +1438,8 @@ mod _csv { } write_lineterminator(&mut output, self.dialect.lineterminator); - let s = core::str::from_utf8(&output) - .map_err(|_| vm.new_unicode_decode_error("csv not utf8"))?; + let s = + core::str::from_utf8(&output).map_err(|e| new_not_utf8_error(vm, &output, e))?; self.write.call((s,), vm) } @@ -1469,8 +1484,8 @@ mod _csv { write_lineterminator(&mut output, self.dialect.lineterminator); - let s = core::str::from_utf8(&output) - .map_err(|_| vm.new_unicode_decode_error("csv not utf8"))?; + let s = + core::str::from_utf8(&output).map_err(|e| new_not_utf8_error(vm, &output, e))?; self.write.call((s,), vm) } @@ -1518,8 +1533,8 @@ mod _csv { write_lineterminator(&mut output, self.dialect.lineterminator); - let s = core::str::from_utf8(&output) - .map_err(|_| vm.new_unicode_decode_error("csv not utf8"))?; + let s = + core::str::from_utf8(&output).map_err(|e| new_not_utf8_error(vm, &output, e))?; self.write.call((s,), vm) } @@ -1593,7 +1608,7 @@ mod _csv { } let s = core::str::from_utf8(&buffer[..buffer_offset]) - .map_err(|_| vm.new_unicode_decode_error("csv not utf8"))?; + .map_err(|e| new_not_utf8_error(vm, &buffer[..buffer_offset], e))?; self.write.call((s,), vm) } diff --git a/crates/stdlib/src/socket.rs b/crates/stdlib/src/socket.rs index 283aa4083..968399ca7 100644 --- a/crates/stdlib/src/socket.rs +++ b/crates/stdlib/src/socket.rs @@ -2612,8 +2612,15 @@ mod _socket { } Some(ArgStrOrBytesLike::Buf(b)) => { let bytes = b.borrow_buf(); - let host_str = core::str::from_utf8(&bytes) - .map_err(|_| vm.new_unicode_decode_error("host bytes is not utf8"))?; + let host_str = core::str::from_utf8(&bytes).map_err(|e| { + vm.new_unicode_decode_error_real( + vm.ctx.new_str("utf-8"), + vm.ctx.new_bytes(bytes.to_vec()), + e.valid_up_to(), + e.error_len().map_or(bytes.len(), |n| e.valid_up_to() + n), + vm.ctx.new_str("host bytes is not utf8"), + ) + })?; Some(host_str.to_owned()) } None => None, @@ -2627,14 +2634,35 @@ mod _socket { ArgStrOrBytesLike::Str(s) => { // For str, check for surrogates and raise UnicodeEncodeError if found s.to_str() - .ok_or_else(|| vm.new_unicode_encode_error("surrogates not allowed"))? + .ok_or_else(|| { + let start = s + .as_wtf8() + .code_points() + .position(|c| c.to_char().is_none()) + .unwrap(); + vm.new_unicode_encode_error_real( + vm.ctx.new_str("utf-8"), + (*s).clone(), + start, + start + 1, + vm.ctx.new_str("surrogates not allowed"), + ) + })? .to_owned() } ArgStrOrBytesLike::Buf(b) => { // For bytes, check if it's valid UTF-8 let bytes = b.borrow_buf(); core::str::from_utf8(&bytes) - .map_err(|_| vm.new_unicode_decode_error("port is not utf8"))? + .map_err(|e| { + vm.new_unicode_decode_error_real( + vm.ctx.new_str("utf-8"), + vm.ctx.new_bytes(bytes.to_vec()), + e.valid_up_to(), + e.error_len().map_or(bytes.len(), |n| e.valid_up_to() + n), + vm.ctx.new_str("port is not utf8"), + ) + })? .to_owned() } }; diff --git a/crates/vm/src/function/fspath.rs b/crates/vm/src/function/fspath.rs index 053802285..cd3cd2276 100644 --- a/crates/vm/src/function/fspath.rs +++ b/crates/vm/src/function/fspath.rs @@ -125,8 +125,15 @@ impl FsPath { } pub fn bytes_as_os_str<'a>(b: &'a [u8], vm: &VirtualMachine) -> PyResult<&'a std::ffi::OsStr> { - rustpython_host_env::os::bytes_as_os_str(b) - .map_err(|_| vm.new_unicode_decode_error("can't decode path for utf-8")) + rustpython_host_env::os::bytes_as_os_str(b).map_err(|e| { + vm.new_unicode_decode_error_real( + vm.ctx.new_str("utf-8"), + vm.ctx.new_bytes(b.to_vec()), + e.valid_up_to(), + e.error_len().map_or(b.len(), |n| e.valid_up_to() + n), + vm.ctx.new_str("can't decode path for utf-8"), + ) + }) } } diff --git a/crates/vm/src/stdlib/os.rs b/crates/vm/src/stdlib/os.rs index f885fb1db..73e4918cc 100644 --- a/crates/vm/src/stdlib/os.rs +++ b/crates/vm/src/stdlib/os.rs @@ -130,8 +130,15 @@ pub(super) struct FollowSymlinks( #[cfg(not(windows))] fn bytes_as_os_str<'a>(b: &'a [u8], vm: &VirtualMachine) -> PyResult<&'a std::ffi::OsStr> { - rustpython_host_env::os::bytes_as_os_str(b) - .map_err(|_| vm.new_unicode_decode_error("can't decode path for utf-8")) + rustpython_host_env::os::bytes_as_os_str(b).map_err(|e| { + vm.new_unicode_decode_error_real( + vm.ctx.new_str("utf-8"), + vm.ctx.new_bytes(b.to_vec()), + e.valid_up_to(), + e.error_len().map_or(b.len(), |n| e.valid_up_to() + n), + vm.ctx.new_str("can't decode path for utf-8"), + ) + }) } pub(crate) fn warn_if_bool_fd(obj: &PyObjectRef, vm: &VirtualMachine) -> PyResult<()> { diff --git a/crates/vm/src/stdlib/posix.rs b/crates/vm/src/stdlib/posix.rs index 80245aed0..c16da1ee7 100644 --- a/crates/vm/src/stdlib/posix.rs +++ b/crates/vm/src/stdlib/posix.rs @@ -1731,10 +1731,16 @@ pub mod module { let Some(login) = rustpython_host_env::posix::getlogin() else { return Err(vm.new_os_error("unable to determine login name")); }; - login - .to_str() - .map(|s| s.to_owned()) - .map_err(|e| vm.new_unicode_decode_error(format!("unable to decode login name: {e}"))) + login.to_str().map(|s| s.to_owned()).map_err(|e| { + vm.new_unicode_decode_error_real( + vm.ctx.new_str("utf-8"), + vm.ctx.new_bytes(login.as_bytes().to_vec()), + e.valid_up_to(), + e.error_len() + .map_or(login.as_bytes().len(), |n| e.valid_up_to() + n), + vm.ctx.new_str("unable to decode login name"), + ) + }) } // cfg from nix From 82a34ba16d245ded97d5257954e5e6e8b402e3c9 Mon Sep 17 00:00:00 2001 From: Sumi Jeong <125195487+sigmaith@users.noreply.github.com> Date: Sun, 26 Jul 2026 13:30:48 +0900 Subject: [PATCH 299/339] Implement termios.tcgetwinsize/tcsetwinsize (#8347) * Implement termios.tcgetwinsize/tcsetwinsize Adds ioctl(TIOCGWINSZ/TIOCSWINSZ) wrappers in host_env and the corresponding Python-facing functions in the termios stdlib module, removing the associated expectedFailure markers in test_termios.py. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01RbzcYLnX5tMfTM9BP7FDTT * Use ret < 0 convention for ioctl error checks in termios winsize POSIX ioctl only guarantees -1 on failure, not exactly 0 on success; matches the existing check_libc_neg convention used elsewhere in host_env (e.g. fcntl.rs, posix.rs::get_terminal_size). Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01RbzcYLnX5tMfTM9BP7FDTT * Reject non-sequence size in tcsetwinsize extract_elements_with also accepted dicts (treating keys as elements). Switch to try_sequence(), matching CPython's PySequence_Check, so only real sequences (tuple/list/etc.) are accepted. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01RbzcYLnX5tMfTM9BP7FDTT * Use `core::mem::zeroed` instead of `std::mem::zeroed` `std::mem` just re-exports `core::mem`, but clippy prefers importing from core when there's no OS dependency. This was breaking the wasm CI build. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01RbzcYLnX5tMfTM9BP7FDTT * Use try_index for tcsetwinsize row/col conversion CPython's PyLong_AsLong calls __index__ on non-int objects before converting, so downcast_ref::<PyInt> was stricter than CPython. try_index matches that behavior and is more concise. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01RbzcYLnX5tMfTM9BP7FDTT * Mark test_fork/test_spawn_doesnt_hang as expected failures Both were hidden by a skipIf on tty.tcgetwinsize, which now exists. Root cause: pty.fork() calls os.login_tty(), which isn't implemented, so the forked child crashes before the test body runs. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01RbzcYLnX5tMfTM9BP7FDTT * Use unittest.skip instead of expectedFailure for pty.fork() tests expectedFailure still runs the test body, so pty.fork()'s real fork() still happens and the child crashes on missing os.login_tty inside the parallel test runner's worker process, corrupting its JSON reporting channel ("worker bug"). skip prevents the method from running at all, avoiding that. Verified locally with -j 2. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01RbzcYLnX5tMfTM9BP7FDTT * Clarify skip reason for pty.fork() tests * Simplify tcgetwinsize/tcsetwinsize fd argument with Fildes destructuring * Explain why pty.fork() tests use skip instead of expectedFailure --------- Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com> --- Lib/test/test_pty.py | 10 ++++++++++ Lib/test/test_termios.py | 4 ---- crates/host_env/src/termios.rs | 24 ++++++++++++++++++++++++ crates/stdlib/src/termios.rs | 22 ++++++++++++++++++++++ 4 files changed, 56 insertions(+), 4 deletions(-) diff --git a/Lib/test/test_pty.py b/Lib/test/test_pty.py index 1126404fe..c68162c94 100644 --- a/Lib/test/test_pty.py +++ b/Lib/test/test_pty.py @@ -195,6 +195,11 @@ class PtyTest(unittest.TestCase): s2 = _readline(master_fd) self.assertEqual(b'For my pet fish, Eric.\n', normalize_output(s2)) + # skip (not expectedFailure) because the test still forks a real child + # process, which crashes on missing os.login_tty() inside the parallel + # test runner's worker process, corrupting its JSON reporting channel + # ("worker bug", reproducible under --slow-ci -j N; not under plain -m test). + @unittest.skip("TODO: RUSTPYTHON; pty.fork() calls os.login_tty(), which is not implemented") def test_fork(self): debug("calling pty.fork()") pid, master_fd = pty.fork() @@ -296,6 +301,11 @@ class PtyTest(unittest.TestCase): self.assertEqual(data, b"") + # skip (not expectedFailure) because the test still forks a real child + # process, which crashes on missing os.login_tty() inside the parallel + # test runner's worker process, corrupting its JSON reporting channel + # ("worker bug", reproducible under --slow-ci -j N; not under plain -m test). + @unittest.skip("TODO: RUSTPYTHON; pty.fork() calls os.login_tty(), which is not implemented") def test_spawn_doesnt_hang(self): # gh-140482: Do the test in a pty.fork() child to avoid messing # with the interactive test runner's terminal settings. diff --git a/Lib/test/test_termios.py b/Lib/test/test_termios.py index 216609719..1207855fa 100644 --- a/Lib/test/test_termios.py +++ b/Lib/test/test_termios.py @@ -221,7 +221,6 @@ class TestFunctions(unittest.TestCase): 'output was not resumed') self.assertEqual(os.read(rfd, 1024), b'def') - @unittest.expectedFailure # TODO: RUSTPYTHON; AttributeError: module 'termios' has no attribute 'tcgetwinsize' def test_tcgetwinsize(self): size = termios.tcgetwinsize(self.fd) self.assertIsInstance(size, tuple) @@ -230,7 +229,6 @@ class TestFunctions(unittest.TestCase): self.assertIsInstance(size[1], int) self.assertEqual(termios.tcgetwinsize(self.stream), size) - @unittest.expectedFailure # TODO: RUSTPYTHON; AttributeError: module 'termios' has no attribute 'tcgetwinsize' def test_tcgetwinsize_errors(self): self.assertRaisesTermiosError(errno.ENOTTY, termios.tcgetwinsize, self.bad_fd) self.assertRaises(ValueError, termios.tcgetwinsize, -1) @@ -238,14 +236,12 @@ class TestFunctions(unittest.TestCase): self.assertRaises(TypeError, termios.tcgetwinsize, object()) self.assertRaises(TypeError, termios.tcgetwinsize) - @unittest.expectedFailure # TODO: RUSTPYTHON; AttributeError: module 'termios' has no attribute 'tcgetwinsize' def test_tcsetwinsize(self): size = termios.tcgetwinsize(self.fd) termios.tcsetwinsize(self.fd, size) termios.tcsetwinsize(self.fd, list(size)) termios.tcsetwinsize(self.stream, size) - @unittest.expectedFailure # TODO: RUSTPYTHON; AttributeError: module 'termios' has no attribute 'tcgetwinsize' def test_tcsetwinsize_errors(self): size = termios.tcgetwinsize(self.fd) self.assertRaises(TypeError, termios.tcsetwinsize, self.fd, size[:-1]) diff --git a/crates/host_env/src/termios.rs b/crates/host_env/src/termios.rs index 0a96078be..612f68be9 100644 --- a/crates/host_env/src/termios.rs +++ b/crates/host_env/src/termios.rs @@ -165,3 +165,27 @@ pub fn tcflush(fd: i32, queue: i32) -> std::io::Result<()> { pub fn tcflow(fd: i32, action: i32) -> std::io::Result<()> { ::termios::tcflow(fd, action) } + +pub fn tcgetwinsize(fd: i32) -> std::io::Result<(u16, u16)> { + let mut size: libc::winsize = unsafe { core::mem::zeroed() }; + let ret = unsafe { libc::ioctl(fd, TIOCGWINSZ as _, &mut size) }; + if ret < 0 { + return Err(std::io::Error::last_os_error()); + } + Ok((size.ws_row, size.ws_col)) +} + +pub fn tcsetwinsize(fd: i32, row: u16, col: u16) -> std::io::Result<()> { + let mut size: libc::winsize = unsafe { core::mem::zeroed() }; + let ret = unsafe { libc::ioctl(fd, TIOCGWINSZ as _, &mut size) }; + if ret < 0 { + return Err(std::io::Error::last_os_error()); + } + size.ws_row = row; + size.ws_col = col; + let ret = unsafe { libc::ioctl(fd, TIOCSWINSZ as _, &size) }; + if ret < 0 { + return Err(std::io::Error::last_os_error()); + } + Ok(()) +} diff --git a/crates/stdlib/src/termios.rs b/crates/stdlib/src/termios.rs index 2207276f8..67d382aa5 100644 --- a/crates/stdlib/src/termios.rs +++ b/crates/stdlib/src/termios.rs @@ -268,6 +268,28 @@ mod termios { Ok(()) } + #[pyfunction] + fn tcgetwinsize(Fildes(fd): Fildes, vm: &VirtualMachine) -> PyResult<(u16, u16)> { + let size = host_termios::tcgetwinsize(fd).map_err(|e| termios_error(e, vm))?; + Ok(size) + } + + #[pyfunction] + fn tcsetwinsize(Fildes(fd): Fildes, size: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> { + let seq = size.try_sequence(vm)?; + if seq.length(vm)? != 2 { + return Err(vm.new_type_error("tcsetwinsize: size must be a 2 element sequence")); + } + let row = seq.get_item(0, vm)?; + let col = seq.get_item(1, vm)?; + + let row: u16 = row.try_index(vm)?.try_to_primitive(vm)?; + let col: u16 = col.try_index(vm)?.try_to_primitive(vm)?; + + host_termios::tcsetwinsize(fd, row, col).map_err(|e| termios_error(e, vm))?; + Ok(()) + } + fn termios_error(err: std::io::Error, vm: &VirtualMachine) -> PyBaseExceptionRef { vm.new_os_subtype_error( error_type(vm), From 02f3d4b6cd0594bfa4a2c5d28801763a09fd1b7b Mon Sep 17 00:00:00 2001 From: Jeaeun Kim <109906379+kyokuping@users.noreply.github.com> Date: Sun, 26 Jul 2026 13:47:35 +0900 Subject: [PATCH 300/339] _thread: initialize local subclasses per thread (#8353) Assisted-by: Codex:gpt-5.6 --- Lib/test/test_threading_local.py | 8 -- crates/vm/src/stdlib/_thread.rs | 147 +++++++++++++++++++++++++------ 2 files changed, 122 insertions(+), 33 deletions(-) diff --git a/Lib/test/test_threading_local.py b/Lib/test/test_threading_local.py index 0c805c5b0..17f031def 100644 --- a/Lib/test/test_threading_local.py +++ b/Lib/test/test_threading_local.py @@ -228,14 +228,6 @@ class BaseLocalTest: class ThreadLocalTest(unittest.TestCase, BaseLocalTest): _local = _thread._local - @unittest.expectedFailure # TODO: RUSTPYTHON - def test_cycle_collection(self): - return super().test_cycle_collection() - - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: TypeError not raised by _local - def test_arguments(self): - return super().test_arguments() - class PyThreadingLocalTest(unittest.TestCase, BaseLocalTest): _local = _threading_local.local diff --git a/crates/vm/src/stdlib/_thread.rs b/crates/vm/src/stdlib/_thread.rs index 91fec0a02..a1942adc7 100644 --- a/crates/vm/src/stdlib/_thread.rs +++ b/crates/vm/src/stdlib/_thread.rs @@ -24,9 +24,10 @@ pub(crate) mod _thread { PyBaseExceptionRef, PyDictRef, PyIntRef, PyStr, PyTupleRef, PyType, PyTypeRef, PyUtf8StrRef, }, - common::wtf8::Wtf8Buf, + common::{lock::PyMutex, wtf8::Wtf8Buf}, frame::FrameRef, function::{ArgCallable, FuncArgs, KwArgs, OptionalArg, PySetterValue, TimeoutSeconds}, + object::{Traverse, TraverseFn}, types::{Constructor, GetAttr, Representable, SetAttr}, }; @@ -619,11 +620,10 @@ pub(crate) mod _thread { /// Clean up thread-local data for the current thread. /// This triggers __del__ on objects stored in thread-local variables. fn cleanup_thread_local_data() { - // Take all guards - this will trigger LocalGuard::drop for each, - // which removes the thread's dict from each Local instance - LOCAL_GUARDS.with(|guards| { - guards.borrow_mut().clear(); - }); + // Move all guards out before dropping them. A local dict's __del__ may + // re-enter thread-local access and borrow LOCAL_GUARDS again. + let guards = LOCAL_GUARDS.take(); + drop(guards); } #[cfg(all(not(target_arch = "wasm32"), feature = "host_env"))] @@ -929,15 +929,36 @@ pub(crate) mod _thread { if let Some(local_data) = self.local.upgrade() { // Remove from map while holding the lock, but drop the value // outside the lock to prevent deadlock if __del__ accesses _local - let removed = local_data.data.lock().remove(&self.thread_id); + let removed = local_data.state.lock().dicts.remove(&self.thread_id); drop(removed); } } } + struct LocalState { + init_args: FuncArgs, + dicts: std::collections::HashMap<u64, PyDictRef>, + } + + unsafe impl Traverse for LocalState { + fn traverse(&self, tracer_fn: &mut TraverseFn<'_>) { + self.init_args.traverse(tracer_fn); + #[allow(clippy::iter_over_hash_type)] + for dict in self.dicts.values() { + dict.traverse(tracer_fn); + } + } + + fn clear(&mut self, out: &mut Vec<crate::PyObjectRef>) { + out.append(&mut self.init_args.args); + out.extend(self.init_args.kwargs.drain(..).map(|(_, value)| value)); + out.extend(self.dicts.drain().map(|(_, dict)| dict.into())); + } + } + // Shared data structure for Local struct LocalData { - data: parking_lot::Mutex<std::collections::HashMap<u64, PyDictRef>>, + state: PyMutex<LocalState>, } impl fmt::Debug for LocalData { @@ -947,37 +968,62 @@ pub(crate) mod _thread { } #[pyattr] - #[pyclass(module = "_thread", name = "_local")] + #[pyclass(module = "_thread", name = "_local", traverse = "manual")] #[derive(Debug, PyPayload)] struct Local { inner: Arc<LocalData>, } + unsafe impl Traverse for Local { + fn traverse(&self, tracer_fn: &mut TraverseFn<'_>) { + self.inner.state.traverse(tracer_fn); + } + + fn clear(&mut self, out: &mut Vec<crate::PyObjectRef>) { + if let Some(mut state) = self.inner.state.try_lock() { + state.clear(out); + } + } + } + #[pyclass(with(GetAttr, SetAttr), flags(BASETYPE))] impl Local { - fn l_dict(&self, vm: &VirtualMachine) -> PyDictRef { + fn custom_init(cls: &Py<PyType>, vm: &VirtualMachine) -> Option<crate::types::InitFunc> { + let cls_init = cls.slots.init.load()?; + let object_init = vm + .ctx + .types + .object_type + .slots + .init + .load() + .map(|init| init as usize); + (Some(cls_init as usize) != object_init).then_some(cls_init) + } + + fn create_dict(&self, vm: &VirtualMachine) -> (PyDictRef, bool) { let thread_id = current_thread_id(); // Fast path: check if dict exists under lock - let value = self.inner.data.lock().get(&thread_id).cloned(); + let value = self.inner.state.lock().dicts.get(&thread_id).cloned(); if let Some(dict) = value { - return dict; + return (dict, false); } // Slow path: allocate dict outside lock to reduce lock hold time let new_dict = vm.ctx.new_dict(); // Insert with double-check to handle races - let mut data = self.inner.data.lock(); + let mut state = self.inner.state.lock(); use std::collections::hash_map::Entry; - let (dict, need_guard) = match data.entry(thread_id) { + let (dict, need_guard) = match state.dicts.entry(thread_id) { Entry::Occupied(e) => (e.get().clone(), false), Entry::Vacant(e) => { e.insert(new_dict.clone()); (new_dict, true) } }; - drop(data); // Release lock before TLS access + drop(state); // Release lock before TLS access // Register cleanup guard only if we inserted a new entry if need_guard { @@ -990,29 +1036,80 @@ pub(crate) mod _thread { }); } - dict + (dict, need_guard) + } + + fn remove_current_dict(&self) { + let thread_id = current_thread_id(); + let guard = LOCAL_GUARDS.with(|guards| { + let mut guards = guards.borrow_mut(); + guards + .iter() + .rposition(|guard| { + guard.thread_id == thread_id + && guard.local.as_ptr() == Arc::as_ptr(&self.inner) + }) + .map(|position| guards.remove(position)) + }); + + if let Some(guard) = guard { + drop(guard); + } else { + let removed = self.inner.state.lock().dicts.remove(&thread_id); + drop(removed); + } + } + + fn l_dict(zelf: &Py<Self>, vm: &VirtualMachine) -> PyResult<PyDictRef> { + let (dict, created) = zelf.create_dict(vm); + if !created { + return Ok(dict); + } + + let Some(init) = Self::custom_init(zelf.class(), vm) else { + return Ok(dict); + }; + let init_args = zelf.inner.state.lock().init_args.clone(); + if let Err(err) = init(zelf.as_object().to_owned(), init_args, vm) { + zelf.remove_current_dict(); + return Err(err); + } + + Ok(dict) } #[pygetset(name = "__dict__")] - fn dict(zelf: PyRef<Self>, vm: &VirtualMachine) -> PyDictRef { - zelf.l_dict(vm) + fn dict(zelf: PyRef<Self>, vm: &VirtualMachine) -> PyResult<PyDictRef> { + Self::l_dict(&zelf, vm) } #[pyslot] - fn slot_new(cls: PyTypeRef, _args: FuncArgs, vm: &VirtualMachine) -> PyResult { - Self { + fn slot_new(cls: PyTypeRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult { + if !args.is_empty() && Self::custom_init(&cls, vm).is_none() { + return Err(vm.new_type_error("Initialization arguments are not supported")); + } + + let zelf = Self { inner: Arc::new(LocalData { - data: parking_lot::Mutex::new(std::collections::HashMap::new()), + state: PyMutex::new(LocalState { + init_args: args, + dicts: std::collections::HashMap::new(), + }), }), } - .into_ref_with_type(vm, cls) - .map(Into::into) + .into_ref_with_type(vm, cls)?; + + // type.__call__ invokes __init__ after __new__. Create this thread's + // dict first so assignments made by __init__ cannot recursively + // initialize the same local object. + zelf.create_dict(vm); + Ok(zelf.into()) } } impl GetAttr for Local { fn getattro(zelf: &Py<Self>, attr: &Py<PyStr>, vm: &VirtualMachine) -> PyResult { - let l_dict = zelf.l_dict(vm); + let l_dict = Self::l_dict(zelf, vm)?; if attr.as_bytes() == b"__dict__" { Ok(l_dict.into()) } else { @@ -1042,7 +1139,7 @@ pub(crate) mod _thread { zelf.class().name() ))) } else { - let dict = zelf.l_dict(vm); + let dict = Self::l_dict(zelf, vm)?; if let PySetterValue::Assign(value) = value { dict.set_item(attr, value, vm)?; } else { From 8ba361d43877f754af6c02daac979dd69720c4f0 Mon Sep 17 00:00:00 2001 From: sijun-yang <yangsijun5528@gmail.com> Date: Sun, 26 Jul 2026 13:49:19 +0900 Subject: [PATCH 301/339] Propagate method wrapper repr errors (#8371) Assisted-by: Codex:gpt-5.6-sol --- crates/vm/src/builtins/classmethod.rs | 2 +- crates/vm/src/builtins/staticmethod.rs | 2 +- extra_tests/snippets/syntax_class.py | 23 +++++++++++++++++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/crates/vm/src/builtins/classmethod.rs b/crates/vm/src/builtins/classmethod.rs index a6c69eb50..eb0e15ece 100644 --- a/crates/vm/src/builtins/classmethod.rs +++ b/crates/vm/src/builtins/classmethod.rs @@ -195,7 +195,7 @@ impl PyClassMethod { impl Representable for PyClassMethod { #[inline] fn repr_str(zelf: &Py<Self>, vm: &VirtualMachine) -> PyResult<String> { - let callable = zelf.callable.lock().repr(vm).unwrap(); + let callable = zelf.callable.lock().repr(vm)?; let class = Self::class(&vm.ctx); let repr = match ( diff --git a/crates/vm/src/builtins/staticmethod.rs b/crates/vm/src/builtins/staticmethod.rs index 1ab697a0a..addfe8a4e 100644 --- a/crates/vm/src/builtins/staticmethod.rs +++ b/crates/vm/src/builtins/staticmethod.rs @@ -179,7 +179,7 @@ impl Callable for PyStaticMethod { impl Representable for PyStaticMethod { fn repr_str(zelf: &Py<Self>, vm: &VirtualMachine) -> PyResult<String> { - let callable = zelf.callable.lock().repr(vm).unwrap(); + let callable = zelf.callable.lock().repr(vm)?; let class = Self::class(&vm.ctx); match ( diff --git a/extra_tests/snippets/syntax_class.py b/extra_tests/snippets/syntax_class.py index 4e80e7edf..4d1a99edf 100644 --- a/extra_tests/snippets/syntax_class.py +++ b/extra_tests/snippets/syntax_class.py @@ -163,6 +163,29 @@ assert T4.t1.__doc__ == "t1" cm = classmethod(lambda cls: cls) assert cm.__func__(int) is int + +class Callback: + def __init__(self, error): + self.error = error + + def __call__(self, *args, **kwargs): + pass + + def __repr__(self): + raise self.error + + +callback = Callback(RuntimeError("callback is unavailable")) + +with assert_raises(RuntimeError) as caught: + repr(staticmethod(callback)) +assert caught.exception is callback.error + +with assert_raises(RuntimeError) as caught: + repr(classmethod(callback)) +assert caught.exception is callback.error + + assert str(super(int, 5)) == "<super: <class 'int'>, <int object>>" class T5(int): From 6b554d96c78009949b62e01c1d033ae56b36f978 Mon Sep 17 00:00:00 2001 From: OkJa <151524504+name-of-okja@users.noreply.github.com> Date: Sun, 26 Jul 2026 14:31:34 +0900 Subject: [PATCH 302/339] Implement fractional grouping in format specs (#8373) Support the CPython 3.13+ format spec syntax that puts a grouping option after the precision, so `format(1234.56789, '.6,f')` gives '1234.567,890'. The integer and fractional parts group independently and may use different separators (`,.6_f` -> '1,234.567_890'), so the spec carries a separate `frac_grouping_option`. `parse_precision` now consumes the separator that follows the precision digits and rejects a `,`/`_` mix. A repeated separator is deliberately left in the spec so the trailing-text check reports it, which is how CPython arrives at a different message there. A dot followed by neither digits nor a separator now raises "Format specifier missing precision" rather than an unrelated error. Fraction digits group away from the decimal point, so the last group may be short, and any exponent or percent tail is left intact. The separators count toward the field width, so zero padding of the integer part reserves room for them. 'n' takes its separators from the locale and so cannot carry one. The complex locale path rewrites 'n' to 'g' before delegating, so it has to validate first; that also makes `format(1+2j, ',n')` fail as it does in CPython, which it previously did not. Reference (CPython 3.14), Python/formatter_unicode.c: - parsing: https://github.com/python/cpython/blob/3.14/Python/formatter_unicode.c#L257-L299 - 'n' rejection: https://github.com/python/cpython/blob/3.14/Python/formatter_unicode.c#L361-L367 - number split: https://github.com/python/cpython/blob/3.14/Python/formatter_unicode.c#L488-L516 - zero-pad width: https://github.com/python/cpython/blob/3.14/Python/formatter_unicode.c#L604-L606 Remove `@unittest.expectedFailure` from tests that now pass (2 in test_format, 1 in test_float). Assisted-by: Claude:claude-opus-5 Co-authored-by: Claude Opus 5 <noreply@anthropic.com> --- Lib/test/test_float.py | 1 - Lib/test/test_format.py | 2 - crates/common/src/format.rs | 222 ++++++++++++++++++++++++++++++++---- crates/vm/src/format.rs | 1 + 4 files changed, 201 insertions(+), 25 deletions(-) diff --git a/Lib/test/test_float.py b/Lib/test/test_float.py index a514111c1..609a7164f 100644 --- a/Lib/test/test_float.py +++ b/Lib/test/test_float.py @@ -725,7 +725,6 @@ class IEEEFormatTestCase(unittest.TestCase): class FormatTestCase(unittest.TestCase): - @unittest.expectedFailure # TODO: RUSTPYTHON; ValueError: Invalid format specifier def test_format(self): # these should be rewritten to use both format(x, spec) and # x.__format__(spec) diff --git a/Lib/test/test_format.py b/Lib/test/test_format.py index 6868c8717..f6452341e 100644 --- a/Lib/test/test_format.py +++ b/Lib/test/test_format.py @@ -515,7 +515,6 @@ class FormatTest(unittest.TestCase): with self.assertRaisesRegex(ValueError, error_msg): '{:__}'.format(1) - @unittest.expectedFailure # TODO: RUSTPYTHON; Wrong error message def test_with_a_commas_and_an_underscore_in_format_specifier(self): error_msg = re.escape("Cannot specify both ',' and '_'.") with self.assertRaisesRegex(ValueError, error_msg): @@ -523,7 +522,6 @@ class FormatTest(unittest.TestCase): with self.assertRaisesRegex(ValueError, error_msg): '{:.,_f}'.format(1.1) - @unittest.expectedFailure # TODO: RUSTPYTHON; Wrong error message def test_with_an_underscore_and_a_comma_in_format_specifier(self): error_msg = re.escape("Cannot specify both ',' and '_'.") with self.assertRaisesRegex(ValueError, error_msg): diff --git a/crates/common/src/format.rs b/crates/common/src/format.rs index 1f43335b7..4218dca7b 100644 --- a/crates/common/src/format.rs +++ b/crates/common/src/format.rs @@ -232,6 +232,7 @@ pub struct FormatSpec { width: Option<usize>, grouping_option: Option<FormatGrouping>, precision: Option<usize>, + frac_grouping_option: Option<FormatGrouping>, format_type: Option<FormatType>, } @@ -291,22 +292,49 @@ fn parse_zero(text: &Wtf8) -> (bool, &Wtf8) { } } -fn parse_precision(text: &Wtf8) -> Result<(Option<usize>, &Wtf8), FormatSpecError> { +fn parse_char(text: &Wtf8, expected: char) -> (bool, &Wtf8) { let mut chars = text.code_points(); - Ok(match chars.next().and_then(CodePoint::to_char) { - Some('.') => { - let (size, remaining) = parse_number(chars.as_wtf8())?; - if let Some(size) = size { - if size > i32::MAX as usize { - return Err(FormatSpecError::PrecisionTooBig); - } - (Some(size), remaining) - } else { - (None, text) - } + if chars.next().and_then(CodePoint::to_char) == Some(expected) { + (true, chars.as_wtf8()) + } else { + (false, text) + } +} + +fn parse_precision( + text: &Wtf8, +) -> Result<(Option<usize>, Option<FormatGrouping>, &Wtf8), FormatSpecError> { + let (dot, text) = parse_char(text, '.'); + if !dot { + return Ok((None, None, text)); + } + let (precision, text) = parse_number(text)?; + if let Some(precision) = precision + && precision > i32::MAX as usize + { + return Err(FormatSpecError::PrecisionTooBig); + } + let mut frac_grouping = None; + let (comma, text) = parse_char(text, ','); + if comma { + frac_grouping = Some(FormatGrouping::Comma); + } + let (underscore, text) = parse_char(text, '_'); + if underscore { + if frac_grouping.is_some() { + return Err(FormatSpecError::ExclusiveFormat(',', '_')); } - _ => (None, text), - }) + frac_grouping = Some(FormatGrouping::Underscore); + } + let (trailing_comma, _) = parse_char(text, ','); + if trailing_comma && frac_grouping == Some(FormatGrouping::Underscore) { + return Err(FormatSpecError::ExclusiveFormat(',', '_')); + } + // Not having a precision or underscore/comma after a dot is an error. + if precision.is_none() && frac_grouping.is_none() { + return Err(FormatSpecError::PrecisionMissing); + } + Ok((precision, frac_grouping, text)) } impl FormatSpec { @@ -331,7 +359,7 @@ impl FormatSpec { if let Some(grouping) = grouping_option { Self::validate_separator(grouping, text)?; } - let (precision, text) = parse_precision(text)?; + let (precision, frac_grouping_option, text) = parse_precision(text)?; let (format_type, text) = FormatType::parse(text); if !text.is_empty() { return Err(FormatSpecError::InvalidFormatSpecifier); @@ -351,6 +379,7 @@ impl FormatSpec { width, grouping_option, precision, + frac_grouping_option, format_type, }) } @@ -463,7 +492,14 @@ impl FormatSpec { Err(FormatSpecError::UnspecifiedFormat('_', ch)) } _ => Ok(()), + }?; + if let Some(grouping) = self.frac_grouping_option + && matches!(format_type, FormatType::Number(_)) + { + let ch = char::from(format_type); + return Err(FormatSpecError::UnspecifiedFormat(char::from(grouping), ch)); } + Ok(()) } const fn get_separator_interval(&self) -> usize { @@ -491,7 +527,9 @@ impl FormatSpec { let disp_digit_cnt = if self.fill == Some('0'.into()) && self.align == Some(FormatAlign::AfterSign) { - let width = self.width.unwrap_or(magnitude_len) as i32 - prefix.len() as i32; + let width = self.width.unwrap_or(magnitude_len) as i32 + - prefix.len() as i32 + - self.frac_separator_count(&magnitude_str) as i32; cmp::max(width, magnitude_len as i32) } else { magnitude_len as i32 @@ -502,6 +540,41 @@ impl FormatSpec { } } + fn frac_digit_span(&self, magnitude_str: &str) -> Option<(FormatGrouping, usize, usize)> { + let grouping = self.frac_grouping_option?; + let start = magnitude_str.find('.')? + 1; + let end = magnitude_str[start..] + .bytes() + .position(|b| !b.is_ascii_digit()) + .map_or(magnitude_str.len(), |offset| start + offset); + (start < end).then_some((grouping, start, end)) + } + + fn frac_separator_count(&self, magnitude_str: &str) -> usize { + match self.frac_digit_span(magnitude_str) { + Some((_, start, end)) => (end - start - 1) / self.get_separator_interval(), + None => 0, + } + } + + fn add_frac_separators(&self, magnitude_str: String) -> String { + let Some((grouping, start, end)) = self.frac_digit_span(&magnitude_str) else { + return magnitude_str; + }; + let inter = self.get_separator_interval(); + let sep = char::from(grouping); + let mut result = magnitude_str[..start].to_string(); + let mut frac = &magnitude_str[start..end]; + while frac.len() > inter { + result.push_str(&frac[..inter]); + result.push(sep); + frac = &frac[inter..]; + } + result.push_str(frac); + result.push_str(&magnitude_str[end..]); + result + } + /// Returns true if this format spec uses the locale-aware 'n' format type. #[must_use] pub fn has_locale_format(&self) -> bool { @@ -664,6 +737,7 @@ impl FormatSpec { num: &Complex64, locale: &LocaleInfo, ) -> Result<String, FormatSpecError> { + self.validate_format(FormatType::FixedPoint(Case::Lower))?; // Reuse format_complex_re_im with 'g' type to get the base formatted parts, // then apply locale grouping. This matches CPython's format_complex_internal: // 'n' → 'g', add_parens=0, skip_re=0. @@ -850,6 +924,7 @@ impl FormatSpec { } }; let magnitude_str = self.add_magnitude_separators(raw_magnitude_str?, sign_str); + let magnitude_str = self.add_frac_separators(magnitude_str); Ok( self.format_sign_and_align( &AsciiStr::new(&magnitude_str), @@ -1074,17 +1149,16 @@ impl FormatSpec { }, }, }?; - match &self.grouping_option { + let magnitude_str = match &self.grouping_option { Some(fg) => { let sep = char::from(fg); let inter = self.get_separator_interval().try_into().unwrap(); let len = magnitude_str.len() as i32; - let separated_magnitude = - Self::add_magnitude_separators_for_char(magnitude_str, inter, sep, len); - Ok(separated_magnitude) + Self::add_magnitude_separators_for_char(magnitude_str, inter, sep, len) } - None => Ok(magnitude_str), - } + None => magnitude_str, + }; + Ok(self.add_frac_separators(magnitude_str)) } fn format_sign_and_align<T>( @@ -1175,6 +1249,7 @@ impl Deref for AsciiStr<'_> { pub enum FormatSpecError { DecimalDigitsTooMany, PrecisionTooBig, + PrecisionMissing, InvalidFormatSpecifier, UnspecifiedFormat(char, char), ExclusiveFormat(char, char), @@ -1539,6 +1614,7 @@ mod tests { width: Some(33), grouping_option: None, precision: None, + frac_grouping_option: None, format_type: None, }); assert_eq!(FormatSpec::parse("33"), expected); @@ -1555,6 +1631,7 @@ mod tests { width: Some(33), grouping_option: None, precision: None, + frac_grouping_option: None, format_type: None, }); assert_eq!(FormatSpec::parse("<>33"), expected); @@ -1571,6 +1648,7 @@ mod tests { width: Some(23), grouping_option: Some(FormatGrouping::Comma), precision: Some(11), + frac_grouping_option: None, format_type: Some(FormatType::Binary), }); assert_eq!(FormatSpec::parse("<>-#23,.11b"), expected); @@ -1738,6 +1816,106 @@ mod tests { assert_eq!(fmt_float("06,%", f64::INFINITY), "00inf%"); } + #[test] + fn format_float_fractional_grouping() { + // Fraction digits group away from the decimal point, so the last group + // may be shorter than the interval. + assert_eq!(fmt_float(".6,f", 1234.56789), "1234.567,890"); + assert_eq!(fmt_float(".7,f", 1234.56789), "1234.567,890,0"); + assert_eq!(fmt_float(".4,f", 1.1), "1.100,0"); + assert_eq!(fmt_float(".3,f", 1.1), "1.100"); + assert_eq!(fmt_float(".6_f", 1234.56789), "1234.567_890"); + // Omitting the precision keeps the type's default. + assert_eq!(fmt_float(".,f", 1.1), "1.100,000"); + // The two parts are independent and may use different separators. + assert_eq!(fmt_float(",.6,f", 1234.56789), "1,234.567,890"); + assert_eq!(fmt_float(",.6_f", 1234.56789), "1,234.567_890"); + assert_eq!(fmt_float("_.6,f", 1234.56789), "1_234.567,890"); + } + + #[test] + fn format_float_fractional_grouping_never_touches_tail() { + // Only the digits between the point and any tail are groupable: the + // exponent and a trailing percent sign must stay intact. + assert_eq!(fmt_float(".6,e", 12345678900.0), "1.234,568e+10"); + assert_eq!(fmt_float(".6,E", 1234.5678), "1.234,568E+03"); + assert_eq!(fmt_float(".8,%", 1.2345e-05), "0.001,234,50%"); + // Values with no point have nothing to group. + assert_eq!(fmt_float(".6,f", f64::INFINITY), "inf"); + assert_eq!(fmt_float(".6,f", f64::NAN), "nan"); + assert_eq!(fmt_float(".0,f", 1234.56789), "1235"); + } + + #[test] + fn format_float_fractional_grouping_counts_toward_width() { + // Separators are inserted before padding, so they consume width. + assert_eq!(fmt_float("020.6,f", 1234.56789), "000000001234.567,890"); + assert_eq!(fmt_float("015.6,f", 1.5), "0000001.500,000"); + assert_eq!(fmt_float("<20.6,f", 1234.56789), "1234.567,890 "); + // Zero padding of the integer part must reserve room for them too. + assert_eq!(fmt_float("020,.6,f", 1234.56789), "0,000,001,234.567,890"); + assert_eq!(fmt_float("+020,.6_f", 1e-10), "+000,000,000.000_000"); + assert_eq!(fmt_float("= 015,.6,E", 1234.0), " 01.234,000E+03"); + assert_eq!(fmt_float("-015_._e", 1.1), "001.100_000e+00"); + } + + #[test] + fn format_parse_fractional_grouping_errors() { + // Mixing the two separators is rejected wherever it appears. + assert_eq!( + FormatSpec::parse(".,_f"), + Err(FormatSpecError::ExclusiveFormat(',', '_')) + ); + assert_eq!( + FormatSpec::parse("._,f"), + Err(FormatSpecError::ExclusiveFormat(',', '_')) + ); + // A repeated separator is left in the spec and rejected as a whole. + assert_eq!( + FormatSpec::parse(".,,f"), + Err(FormatSpecError::InvalidFormatSpecifier) + ); + assert_eq!( + FormatSpec::parse(".__f"), + Err(FormatSpecError::InvalidFormatSpecifier) + ); + // A dot needs either digits or a separator after it. + assert_eq!( + FormatSpec::parse("."), + Err(FormatSpecError::PrecisionMissing) + ); + assert_eq!( + FormatSpec::parse(".f"), + Err(FormatSpecError::PrecisionMissing) + ); + // 'n' draws its separators from the locale. + assert_eq!( + FormatSpec::parse(".6,n").unwrap().format_float(1234.5678), + Err(FormatSpecError::UnspecifiedFormat(',', 'n')) + ); + assert_eq!( + FormatSpec::parse("._n").unwrap().format_float(1234.5678), + Err(FormatSpecError::UnspecifiedFormat('_', 'n')) + ); + // The integer separator is reported first when both are present. + assert_eq!( + FormatSpec::parse("_.6,n").unwrap().format_float(1234.5678), + Err(FormatSpecError::UnspecifiedFormat('_', 'n')) + ); + // The complex locale path rewrites 'n' to 'g', so it must validate first. + let locale = LocaleInfo { + thousands_sep: ",".to_owned(), + decimal_point: ".".to_owned(), + grouping: vec![3, 0], + }; + assert_eq!( + FormatSpec::parse(".6,n") + .unwrap() + .format_complex_locale(&Complex64::new(1.0, 2.345678), &locale), + Err(FormatSpecError::UnspecifiedFormat(',', 'n')) + ); + } + #[test] fn format_float_empty_type_with_precision() { // Empty presentation type with a precision is repr-like: precision is diff --git a/crates/vm/src/format.rs b/crates/vm/src/format.rs index 7e18dd75d..2f4652dcc 100644 --- a/crates/vm/src/format.rs +++ b/crates/vm/src/format.rs @@ -48,6 +48,7 @@ impl IntoPyException for FormatSpecError { vm.new_value_error("Too many decimal digits in format string") } Self::PrecisionTooBig => vm.new_value_error("Precision too big"), + Self::PrecisionMissing => vm.new_value_error("Format specifier missing precision"), Self::InvalidFormatSpecifier => vm.new_value_error("Invalid format specifier"), Self::UnspecifiedFormat(c1, c2) => { let msg = format!("Cannot specify '{c1}' with '{c2}'."); From 9648f30605e63a81d91afa387e9f7e0a9e9e32e2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 26 Jul 2026 14:31:55 +0900 Subject: [PATCH 303/339] build(deps-dev): bump webpack-dev-server in /wasm/demo (#8374) Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 5.2.5 to 5.2.6. - [Release notes](https://github.com/webpack/webpack-dev-server/releases) - [Changelog](https://github.com/webpack/webpack-dev-server/blob/v5.2.6/CHANGELOG.md) - [Commits](https://github.com/webpack/webpack-dev-server/compare/v5.2.5...v5.2.6) --- updated-dependencies: - dependency-name: webpack-dev-server dependency-version: 5.2.6 dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- wasm/demo/package-lock.json | 10 +++++----- wasm/demo/package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/wasm/demo/package-lock.json b/wasm/demo/package-lock.json index a60d00560..9cfd625aa 100644 --- a/wasm/demo/package-lock.json +++ b/wasm/demo/package-lock.json @@ -24,7 +24,7 @@ "serve": "^14.2.6", "webpack": "^5.105.0", "webpack-cli": "^6.0.1", - "webpack-dev-server": "^5.2.5" + "webpack-dev-server": "^5.2.6" } }, "node_modules/@codemirror/autocomplete": { @@ -5691,9 +5691,9 @@ } }, "node_modules/webpack-dev-server": { - "version": "5.2.5", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-5.2.5.tgz", - "integrity": "sha512-4wZtCquSuv9CKX8oybo+mqxtxZqWz47uM1Ch94lxowBztOhWCbhqvRbfC/mODOwxgV2brY+JGZpHq58/SuVFYg==", + "version": "5.2.6", + "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-5.2.6.tgz", + "integrity": "sha512-HNLRmamRvVavZQ+avceZifmv8hmdUjg43t6MI4SqJDwFdW7RPQwH5vzGhDRZSX59SgfbeHhLnq3g+uooWo7pVw==", "dev": true, "license": "MIT", "dependencies": { @@ -5715,7 +5715,7 @@ "graceful-fs": "^4.2.6", "http-proxy-middleware": "^2.0.9", "ipaddr.js": "^2.1.0", - "launch-editor": "^2.6.1", + "launch-editor": "^2.14.1", "open": "^10.0.3", "p-retry": "^6.2.0", "schema-utils": "^4.2.0", diff --git a/wasm/demo/package.json b/wasm/demo/package.json index 04d7aa78c..2aa9e5867 100644 --- a/wasm/demo/package.json +++ b/wasm/demo/package.json @@ -19,7 +19,7 @@ "serve": "^14.2.6", "webpack": "^5.105.0", "webpack-cli": "^6.0.1", - "webpack-dev-server": "^5.2.5" + "webpack-dev-server": "^5.2.6" }, "scripts": { "dev": "webpack serve", From 71f2ffc28913a8788cfcf23816e655a1c16e460a Mon Sep 17 00:00:00 2001 From: Joshua Megnauth <48846352+joshuamegnauth54@users.noreply.github.com> Date: Mon, 27 Jul 2026 08:35:01 -0400 Subject: [PATCH 304/339] Use memchr consistently for NUL checks (#8372) `memchr` is used throughout RustPython for searching through bytes expediently. However, for NUL checks, it's scantily used. Instead, our NUL checks either use `contains` or `memchr`. I switched all of the `contains(b'\0')` I could find to using memchr instead. I marked the failure paths as cold to hint to LLVM that interior NULs are truly exceptional. This should help branch prediction a bit which is nice for string/bytes functions since they are likely called a lot. --- Cargo.lock | 1 + crates/host_env/Cargo.toml | 1 + crates/host_env/src/multiprocessing.rs | 19 +++++++------ crates/host_env/src/time.rs | 7 ++--- crates/host_env/src/winapi.rs | 25 ++++++++--------- crates/stdlib/src/grp.rs | 6 ++-- crates/stdlib/src/mmap.rs | 9 +++--- crates/stdlib/src/multiprocessing.rs | 4 +-- crates/stdlib/src/openssl.rs | 20 ++++++++------ crates/stdlib/src/ssl.rs | 25 ++++------------- crates/vm/src/builtins/bytes.rs | 10 ++++++- crates/vm/src/builtins/str.rs | 10 ++++++- crates/vm/src/bytes_inner.rs | 4 +-- crates/vm/src/function/fspath.rs | 18 ++++++------ crates/vm/src/ospath.rs | 2 ++ crates/vm/src/stdlib/_codecs.rs | 11 ++++++-- crates/vm/src/stdlib/_io.rs | 17 ++++++------ crates/vm/src/stdlib/nt.rs | 4 ++- crates/vm/src/stdlib/os.rs | 38 ++++++++++++++++---------- crates/vm/src/stdlib/pwd.rs | 10 ++++--- crates/vm/src/utils.rs | 8 ------ 21 files changed, 134 insertions(+), 115 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 463a72984..4f113adf0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3431,6 +3431,7 @@ dependencies = [ "libffi", "libloading 0.9.0", "mac_address", + "memchr", "memmap2 0.9.11", "nix 0.31.3", "num-traits", diff --git a/crates/host_env/Cargo.toml b/crates/host_env/Cargo.toml index 07f7d0da6..128afc592 100644 --- a/crates/host_env/Cargo.toml +++ b/crates/host_env/Cargo.toml @@ -51,6 +51,7 @@ libffi = { workspace = true, features = ["system"] } system-configuration = { workspace = true } [target.'cfg(windows)'.dependencies] +memchr.workspace = true junction = { workspace = true } schannel = { workspace = true } widestring = { workspace = true } diff --git a/crates/host_env/src/multiprocessing.rs b/crates/host_env/src/multiprocessing.rs index 0030245db..067a86307 100644 --- a/crates/host_env/src/multiprocessing.rs +++ b/crates/host_env/src/multiprocessing.rs @@ -32,12 +32,13 @@ pub enum SemError { AlreadyExists, NotFound, InvalidInput, + InteriorNul, Other(i32), } #[cfg(unix)] impl SemError { - fn from_errno(err: Errno) -> Self { + const fn from_errno(err: Errno) -> Self { match err { Errno::EAGAIN => Self::WouldBlock, Errno::ETIMEDOUT => Self::TimedOut, @@ -49,14 +50,14 @@ impl SemError { } } - pub fn raw_os_error(self) -> i32 { + pub const fn raw_os_error(self) -> i32 { match self { Self::WouldBlock => Errno::EAGAIN as i32, Self::TimedOut => Errno::ETIMEDOUT as i32, Self::Interrupted => Errno::EINTR as i32, Self::AlreadyExists => Errno::EEXIST as i32, Self::NotFound => Errno::ENOENT as i32, - Self::InvalidInput => Errno::EINVAL as i32, + Self::InvalidInput | Self::InteriorNul => Errno::EINVAL as i32, Self::Other(code) => code, } } @@ -119,7 +120,7 @@ impl SemHandle { value: u32, unlink: bool, ) -> Result<(Self, Option<String>), SemError> { - let cname = semaphore_name(name).map_err(|_| SemError::InvalidInput)?; + let cname = semaphore_name(name)?; let raw = unsafe { libc::sem_open(cname.as_ptr(), libc::O_CREAT | libc::O_EXCL, 0o600, value) }; if raw == libc::SEM_FAILED { @@ -141,7 +142,7 @@ impl SemHandle { } pub fn open_existing(name: &str) -> Result<Self, SemError> { - let cname = semaphore_name(name).map_err(|_| SemError::InvalidInput)?; + let cname = semaphore_name(name)?; let raw = unsafe { libc::sem_open(cname.as_ptr(), 0) }; if raw == libc::SEM_FAILED { Err(SemError::from_errno(Errno::last())) @@ -305,18 +306,18 @@ pub fn is_too_many_posts(err: u32) -> bool { } #[cfg(unix)] -pub fn semaphore_name(name: &str) -> Result<CString, alloc::ffi::NulError> { - let mut full = String::with_capacity(name.len() + 1); +pub fn semaphore_name(name: &str) -> Result<CString, SemError> { + let mut full = String::with_capacity(name.len() + 2); if !name.starts_with('/') { full.push('/'); } full.push_str(name); - CString::new(full) + CString::new(full).map_err(|_| SemError::InteriorNul) } #[cfg(unix)] pub fn sem_unlink(name: &str) -> Result<(), SemError> { - let cname = semaphore_name(name).map_err(|_| SemError::InvalidInput)?; + let cname = semaphore_name(name)?; let res = unsafe { libc::sem_unlink(cname.as_ptr()) }; if res < 0 { Err(SemError::from_errno(Errno::last())) diff --git a/crates/host_env/src/time.rs b/crates/host_env/src/time.rs index dd97a9366..451e48840 100644 --- a/crates/host_env/src/time.rs +++ b/crates/host_env/src/time.rs @@ -638,10 +638,9 @@ unsafe extern "C" { #[cfg(windows)] pub fn strftime_ascii(fmt: &str, tm: &libc::tm) -> Result<String, CheckedTmError> { - if fmt.contains('\0') { - return Err(CheckedTmError::EmbeddedNul); - } - let fmt_wide: Vec<u16> = fmt.encode_utf16().chain(core::iter::once(0)).collect(); + let fmt_wide = widestring::WideCString::from_str(fmt) + .map_err(|_| CheckedTmError::EmbeddedNul)? + .into_vec_with_nul(); let mut size = 1024usize; let max_scale = 256usize.saturating_mul(fmt.len().max(1)); loop { diff --git a/crates/host_env/src/winapi.rs b/crates/host_env/src/winapi.rs index 4e4536c35..af5391008 100644 --- a/crates/host_env/src/winapi.rs +++ b/crates/host_env/src/winapi.rs @@ -3,22 +3,20 @@ reason = "This module mirrors Win32 APIs with raw handle and pointer parameters." )] +use core::hint::cold_path; use std::{io, path::Path}; -use windows_sys::Win32::{ - Foundation::{HANDLE, HMODULE, WAIT_FAILED}, - System::Threading::PROCESS_INFORMATION, -}; use crate::windows::{CheckWin32Bool, CheckWin32Handle}; +use memchr::memchr; pub use windows_sys::Win32::{ Foundation::{ DUPLICATE_CLOSE_SOURCE, DUPLICATE_SAME_ACCESS, ERROR_ACCESS_DENIED, ERROR_ALREADY_EXISTS, ERROR_BROKEN_PIPE, ERROR_IO_PENDING, ERROR_MORE_DATA, ERROR_NETNAME_DELETED, ERROR_NO_DATA, ERROR_NO_SYSTEM_RESOURCES, ERROR_NOT_FOUND, ERROR_OPERATION_ABORTED, ERROR_PIPE_BUSY, ERROR_PIPE_CONNECTED, ERROR_PORT_UNREACHABLE, ERROR_PRIVILEGE_NOT_HELD, ERROR_SEM_TIMEOUT, - ERROR_SUCCESS, GENERIC_READ, GENERIC_WRITE, STILL_ACTIVE, WAIT_ABANDONED_0, WAIT_OBJECT_0, - WAIT_TIMEOUT, + ERROR_SUCCESS, GENERIC_READ, GENERIC_WRITE, HANDLE, HMODULE, STILL_ACTIVE, + WAIT_ABANDONED_0, WAIT_FAILED, WAIT_OBJECT_0, WAIT_TIMEOUT, }, Globalization::{ LCMAP_FULLWIDTH, LCMAP_HALFWIDTH, LCMAP_HIRAGANA, LCMAP_KATAKANA, LCMAP_LINGUISTIC_CASING, @@ -57,12 +55,12 @@ pub use windows_sys::Win32::{ ABOVE_NORMAL_PRIORITY_CLASS, BELOW_NORMAL_PRIORITY_CLASS, CREATE_BREAKAWAY_FROM_JOB, CREATE_DEFAULT_ERROR_MODE, CREATE_NEW_CONSOLE, CREATE_NEW_PROCESS_GROUP, CREATE_NO_WINDOW, DETACHED_PROCESS, HIGH_PRIORITY_CLASS, IDLE_PRIORITY_CLASS, - NORMAL_PRIORITY_CLASS, PROCESS_ALL_ACCESS, PROCESS_DUP_HANDLE, REALTIME_PRIORITY_CLASS, - STARTF_FORCEOFFFEEDBACK, STARTF_FORCEONFEEDBACK, STARTF_PREVENTPINNING, - STARTF_RUNFULLSCREEN, STARTF_TITLEISAPPID, STARTF_TITLEISLINKNAME, - STARTF_UNTRUSTEDSOURCE, STARTF_USECOUNTCHARS, STARTF_USEFILLATTRIBUTE, - STARTF_USEHOTKEY, STARTF_USEPOSITION, STARTF_USESHOWWINDOW, STARTF_USESIZE, - STARTF_USESTDHANDLES, + NORMAL_PRIORITY_CLASS, PROCESS_ALL_ACCESS, PROCESS_DUP_HANDLE, PROCESS_INFORMATION, + REALTIME_PRIORITY_CLASS, STARTF_FORCEOFFFEEDBACK, STARTF_FORCEONFEEDBACK, + STARTF_PREVENTPINNING, STARTF_RUNFULLSCREEN, STARTF_TITLEISAPPID, + STARTF_TITLEISLINKNAME, STARTF_UNTRUSTEDSOURCE, STARTF_USECOUNTCHARS, + STARTF_USEFILLATTRIBUTE, STARTF_USEHOTKEY, STARTF_USEPOSITION, STARTF_USESHOWWINDOW, + STARTF_USESIZE, STARTF_USESTDHANDLES, }, }, UI::WindowsAndMessaging::SW_HIDE, @@ -312,7 +310,8 @@ pub fn build_environment_block( let mut last_entry: HashMap<String, Vec<u16>> = HashMap::new(); for (key, value) in entries { - if key.contains('\0') || value.contains('\0') { + if memchr(b'\0', key.as_bytes()).is_some() || memchr(b'\0', value.as_bytes()).is_some() { + cold_path(); return Err(BuildEnvironmentBlockError::ContainsNul); } if key.is_empty() || key[1..].contains('=') { diff --git a/crates/stdlib/src/grp.rs b/crates/stdlib/src/grp.rs index 7e3dd8ef3..a237bd710 100644 --- a/crates/stdlib/src/grp.rs +++ b/crates/stdlib/src/grp.rs @@ -10,6 +10,7 @@ mod grp { exceptions, types::PyStructSequence, }; + use core::hint::cold_path; use rustpython_host_env::grp as host_grp; #[pystruct_sequence_data] @@ -61,10 +62,11 @@ mod grp { #[pyfunction] fn getgrnam(name: PyUtf8StrRef, vm: &VirtualMachine) -> PyResult<GroupData> { - let gr_name = name.as_str(); - if gr_name.contains('\0') { + if name.as_pystr().contains_nuls() { + cold_path(); return Err(exceptions::nul_char_error(vm)); } + let gr_name = name.as_str(); let group = host_grp::getgrnam(gr_name).map_err(|err| err.into_pyexception(vm))?; let group = group.ok_or_else(|| { vm.new_key_error( diff --git a/crates/stdlib/src/mmap.rs b/crates/stdlib/src/mmap.rs index dac24b053..2a07cf7d8 100644 --- a/crates/stdlib/src/mmap.rs +++ b/crates/stdlib/src/mmap.rs @@ -24,9 +24,9 @@ mod mmap { use core::ops::{Deref, DerefMut}; use crossbeam_utils::atomic::AtomicCell; use num_traits::Signed; - #[cfg(windows)] - use std::io; use std::io::Write; + #[cfg(windows)] + use {core::hint::cold_path, memchr::memchr, rustpython_vm::exceptions, std::io}; #[cfg(unix)] use rustpython_host_env::crt_fd; @@ -460,8 +460,9 @@ mod mmap { let s = obj .try_to_value::<String>(vm) .map_err(|_| vm.new_type_error("tagname must be a string or None"))?; - if s.contains('\0') { - return Err(vm.new_value_error("tagname must not contain null characters")); + if memchr(b'\0', s.as_bytes()).is_some() { + cold_path(); + return Err(exceptions::nul_char_error(vm)); } Some(s) } diff --git a/crates/stdlib/src/multiprocessing.rs b/crates/stdlib/src/multiprocessing.rs index 9883219df..c79af002b 100644 --- a/crates/stdlib/src/multiprocessing.rs +++ b/crates/stdlib/src/multiprocessing.rs @@ -811,7 +811,7 @@ mod _multiprocessing { let value = args.value as u32; let (handle, name) = SemHandle::create(&args.name, value, args.unlink).map_err(|err| { - if err == SemError::InvalidInput && args.name.contains('\0') { + if err == SemError::InteriorNul { exceptions::nul_char_error(vm) } else { os_error(vm, err) @@ -835,7 +835,7 @@ mod _multiprocessing { #[pyfunction] fn sem_unlink(name: String, vm: &VirtualMachine) -> PyResult<()> { host_multiprocessing::sem_unlink(&name).map_err(|err| { - if err == SemError::InvalidInput && name.contains('\0') { + if err == SemError::InteriorNul { exceptions::nul_char_error(vm) } else { os_error(vm, err) diff --git a/crates/stdlib/src/openssl.rs b/crates/stdlib/src/openssl.rs index 8b7d1de06..16ef8fdb1 100644 --- a/crates/stdlib/src/openssl.rs +++ b/crates/stdlib/src/openssl.rs @@ -53,6 +53,8 @@ fn probe() -> &'static ProbeResult { #[cfg(ossl111)] ossl111, #[cfg(windows)] windows))] mod _ssl { + use core::hint::cold_path; + use super::{bio, probe}; // Import error types and helpers used in this module (others are exposed via pymodule(with(...))) @@ -85,6 +87,7 @@ mod _ssl { }; use crossbeam_utils::atomic::AtomicCell; use foreign_types_shared::{ForeignType, ForeignTypeRef}; + use memchr::memchr; use openssl::{ asn1::{Asn1Object, Asn1ObjectRef}, error::ErrorStack, @@ -1039,12 +1042,13 @@ mod _ssl { #[pymethod] fn set_ciphers(&self, cipherlist: PyStrRef, vm: &VirtualMachine) -> PyResult<()> { - let ciphers: &str = cipherlist.as_ref(); - if ciphers.contains('\0') { + if cipherlist.contains_nuls() { + cold_path(); return Err(exceptions::nul_char_error(vm)); } + self.builder() - .set_cipher_list(ciphers) + .set_cipher_list(cipherlist.as_ref()) .map_err(|_| new_ssl_error(vm, "No cipher can be selected.")) } @@ -1096,9 +1100,6 @@ mod _ssl { let name_cstr = match name { Either::A(s) => { let s: &str = s.as_ref(); - if s.contains('\0') { - return Err(exceptions::nul_char_error(vm)); - } s.to_cstring(vm)? } Either::B(b) => std::ffi::CString::new(b.borrow_buf().to_vec()) @@ -2031,15 +2032,16 @@ mod _ssl { // Configure server hostname if let Some(hostname) = &server_hostname { + if hostname.contains_nuls() { + cold_path(); + return Err(exceptions::nul_char_type_error(vm)); + } let hostname_str: &str = hostname.as_ref(); if hostname_str.is_empty() || hostname_str.starts_with('.') { return Err(vm.new_value_error( "server_hostname cannot be an empty string or start with a leading dot.", )); } - if hostname_str.contains('\0') { - return Err(exceptions::nul_char_type_error(vm)); - } let ip = hostname_str.parse::<core::net::IpAddr>(); if ip.is_err() { ssl.set_hostname(hostname_str) diff --git a/crates/stdlib/src/ssl.rs b/crates/stdlib/src/ssl.rs index 5e6f35943..7e2b4c124 100644 --- a/crates/stdlib/src/ssl.rs +++ b/crates/stdlib/src/ssl.rs @@ -67,9 +67,11 @@ mod _ssl { use alloc::sync::Arc; use core::{ hash::{Hash, Hasher}, + hint::cold_path, sync::atomic::{AtomicUsize, Ordering}, time::Duration, }; + use memchr::memchr; use rustpython_vm::exceptions; use std::{ collections::{HashMap, hash_map::DefaultHasher}, @@ -392,7 +394,8 @@ mod _ssl { // IP addresses are allowed as server_hostname // SNI will not be sent for IP addresses - if hostname.contains('\0') { + if memchr(b'\0', hostname.as_bytes()).is_some() { + cold_path(); return Err(exceptions::nul_char_type_error(vm)); } @@ -1854,25 +1857,7 @@ mod _ssl { let hostname = match args.server_hostname.into_option().flatten() { Some(hostname_str) => { let hostname = hostname_str.as_str(); - - // Validate hostname - if hostname.is_empty() { - return Err(vm.new_value_error("server_hostname cannot be an empty string")); - } - - // Check if it starts with a dot - if hostname.starts_with('.') { - return Err(vm.new_value_error("server_hostname cannot start with a dot")); - } - - // IP addresses are allowed - // SNI will not be sent for IP addresses - - // Check for NULL bytes - if hostname.contains('\0') { - return Err(exceptions::nul_char_error(vm)); - } - + validate_hostname(hostname, vm)?; Some(hostname.to_string()) } None => None, diff --git a/crates/vm/src/builtins/bytes.rs b/crates/vm/src/builtins/bytes.rs index ca40b3d3b..d4c30a7e9 100644 --- a/crates/vm/src/builtins/bytes.rs +++ b/crates/vm/src/builtins/bytes.rs @@ -31,6 +31,7 @@ use crate::{ }; use bstr::ByteSlice; use core::{mem::size_of, ops::Deref}; +use memchr::memchr; #[pyclass(module = false, name = "bytes")] #[derive(Clone, Debug)] @@ -169,6 +170,13 @@ impl PyBytes { .map(|x| vm.ctx.new_bytes(x).into()), } } + + /// Check bytes for interior NULs. + #[inline] + #[must_use] + pub fn contains_nuls(&self) -> bool { + memchr(b'\0', self.as_bytes()).is_some() + } } impl PyRef<PyBytes> { @@ -218,7 +226,7 @@ impl PyBytes { #[inline] #[must_use] - pub fn as_bytes(&self) -> &[u8] { + pub const fn as_bytes(&self) -> &[u8] { self.inner.as_bytes() } diff --git a/crates/vm/src/builtins/str.rs b/crates/vm/src/builtins/str.rs index b1c2c4197..07325159a 100644 --- a/crates/vm/src/builtins/str.rs +++ b/crates/vm/src/builtins/str.rs @@ -37,6 +37,7 @@ use bstr::ByteSlice; use core::ffi::CStr; use core::{char, mem, ops::Range}; use itertools::Itertools; +use memchr::memchr; use num_traits::ToPrimitive; use rustpython_common::{ ascii, @@ -545,6 +546,13 @@ impl PyStr { } } + /// Check string bytes for interior NULs. + #[inline] + #[must_use] + pub fn contains_nuls(&self) -> bool { + memchr(b'\0', self.as_bytes()).is_some() + } + pub fn to_string_lossy(&self) -> Cow<'_, str> { self.to_str() .map_or_else(|| self.as_wtf8().to_string_lossy(), Cow::Borrowed) @@ -2150,7 +2158,7 @@ impl PyUtf8Str { impl Py<PyUtf8Str> { /// Upcast to PyStr. - pub fn as_pystr(&self) -> &Py<PyStr> { + pub const fn as_pystr(&self) -> &Py<PyStr> { unsafe { // Safety: PyUtf8Str is a wrapper around PyStr, so this cast is safe. &*(self as *const Self as *const Py<PyStr>) diff --git a/crates/vm/src/bytes_inner.rs b/crates/vm/src/bytes_inner.rs index 0bf6c1372..d144004d6 100644 --- a/crates/vm/src/bytes_inner.rs +++ b/crates/vm/src/bytes_inner.rs @@ -255,8 +255,8 @@ fn write_bytearray_repr_char(ch: u8, buf: &mut String) { impl PyBytesInner { #[inline] - pub fn as_bytes(&self) -> &[u8] { - &self.elements + pub const fn as_bytes(&self) -> &[u8] { + self.elements.as_slice() } fn new_repr_overflow_error(vm: &VirtualMachine) -> PyBaseExceptionRef { diff --git a/crates/vm/src/function/fspath.rs b/crates/vm/src/function/fspath.rs index cd3cd2276..50feef86d 100644 --- a/crates/vm/src/function/fspath.rs +++ b/crates/vm/src/function/fspath.rs @@ -6,6 +6,7 @@ use crate::{ protocol::PyBuffer, }; use alloc::borrow::Cow; +use core::hint::cold_path; use std::{ffi::OsStr, path::PathBuf}; /// Helper to implement os.fspath() @@ -36,21 +37,20 @@ impl FsPath { msg: &'static str, vm: &VirtualMachine, ) -> PyResult<Self> { - let check_nul = |b: &[u8]| { - if !check_for_nul || memchr::memchr(b'\0', b).is_none() { - Ok(()) - } else { - Err(crate::exceptions::nul_char_error(vm)) - } - }; let match1 = |obj: PyObjectRef| { let pathlike = match_class!(match obj { s @ PyStr => { - check_nul(s.as_bytes())?; + if check_for_nul && s.contains_nuls() { + cold_path(); + return Err(crate::exceptions::nul_char_error(vm)); + } Self::Str(s) } b @ PyBytes => { - check_nul(&b)?; + if check_for_nul && b.contains_nuls() { + cold_path(); + return Err(crate::exceptions::nul_char_error(vm)); + } Self::Bytes(b) } obj => return Ok(Err(obj)), diff --git a/crates/vm/src/ospath.rs b/crates/vm/src/ospath.rs index f2368a288..05f7b0611 100644 --- a/crates/vm/src/ospath.rs +++ b/crates/vm/src/ospath.rs @@ -7,6 +7,7 @@ use crate::{ convert::{IntoPyException, ToPyException, ToPyObject, TryFromObject}, function::FsPath, }; +use core::hint::cold_path; use std::path::{Path, PathBuf}; /// path_converter @@ -149,6 +150,7 @@ impl PathConverter { if self.non_strict || memchr::memchr(b'\0', b).is_none() { Ok(()) } else { + cold_path(); Err(vm.new_value_error(format!( "{}embedded null character in {}", self.error_prefix(), diff --git a/crates/vm/src/stdlib/_codecs.rs b/crates/vm/src/stdlib/_codecs.rs index 605235015..69d9e0e4f 100644 --- a/crates/vm/src/stdlib/_codecs.rs +++ b/crates/vm/src/stdlib/_codecs.rs @@ -6,6 +6,8 @@ use crate::common::static_cell::StaticCell; #[pymodule(with(#[cfg(windows)] _codecs_windows))] mod _codecs { + use core::hint::cold_path; + use crate::codecs::{ErrorsHandler, PyDecodeContext, PyEncodeContext}; use crate::common::encodings; use crate::common::wtf8::Wtf8Buf; @@ -29,7 +31,8 @@ mod _codecs { #[pyfunction] fn lookup(encoding: PyUtf8StrRef, vm: &VirtualMachine) -> PyResult { - if encoding.as_str().contains('\0') { + if encoding.as_pystr().contains_nuls() { + cold_path(); return Err(nul_char_error(vm)); } vm.state @@ -105,7 +108,8 @@ mod _codecs { #[pyfunction] fn lookup_error(name: PyUtf8StrRef, vm: &VirtualMachine) -> PyResult { - if name.as_str().contains('\0') { + if name.as_pystr().contains_nuls() { + cold_path(); return Err(nul_char_error(vm)); } vm.state.codec_registry.lookup_error(name.as_str(), vm) @@ -113,7 +117,8 @@ mod _codecs { #[pyfunction] fn _unregister_error(errors: PyUtf8StrRef, vm: &VirtualMachine) -> PyResult<bool> { - if errors.as_str().contains('\0') { + if errors.as_pystr().contains_nuls() { + cold_path(); return Err(nul_char_error(vm)); } vm.state diff --git a/crates/vm/src/stdlib/_io.rs b/crates/vm/src/stdlib/_io.rs index 854a46d8c..ce41a9428 100644 --- a/crates/vm/src/stdlib/_io.rs +++ b/crates/vm/src/stdlib/_io.rs @@ -150,6 +150,7 @@ mod _io { use alloc::borrow::Cow; use bstr::ByteSlice; use core::{ + hint::cold_path, ops::Range, sync::atomic::{AtomicBool, Ordering}, }; @@ -2854,7 +2855,8 @@ mod _io { } fn validate_errors(errors: &PyRef<PyUtf8Str>, vm: &VirtualMachine) -> PyResult<()> { - if errors.as_str().contains('\0') { + if errors.as_pystr().contains_nuls() { + cold_path(); return Err(nul_char_error(vm)); } vm.state @@ -2894,12 +2896,7 @@ mod _io { } Err(err) => return Err(err), }, - Some(enc) => { - if enc.as_str().contains('\0') { - return Err(nul_char_error(vm)); - } - enc - } + Some(enc) => enc, _ => match vm.import("locale", 0) { Ok(locale) => locale .get_attr("getencoding", vm)? @@ -2914,7 +2911,8 @@ mod _io { Err(err) => return Err(err), }, }; - if encoding.as_str().contains('\0') { + if encoding.as_pystr().contains_nuls() { + cold_path(); return Err(nul_char_error(vm)); } Ok(encoding) @@ -3067,7 +3065,8 @@ mod _io { let mut write_through = None; if let Some(enc) = args.encoding { - if enc.as_str().contains('\0') && enc.as_str().starts_with("locale") { + if enc.as_pystr().contains_nuls() && enc.as_str().starts_with("locale") { + cold_path(); return Err(vm.new_lookup_error(format!("unknown encoding: {enc}"))); } let resolved = Self::resolve_encoding(Some(enc), vm)?; diff --git a/crates/vm/src/stdlib/nt.rs b/crates/vm/src/stdlib/nt.rs index acc9f4ee6..31a08195c 100644 --- a/crates/vm/src/stdlib/nt.rs +++ b/crates/vm/src/stdlib/nt.rs @@ -15,6 +15,7 @@ pub(crate) mod module { ospath::{OsPath, OsPathOrFd}, stdlib::os::{_os, DirFd, SupportFunc, TargetIsDirectory}, }; + use core::hint::cold_path; use libc::intptr_t; use rustpython_common::wtf8::Wtf8Buf; use rustpython_host_env::nt as host_nt; @@ -551,7 +552,8 @@ pub(crate) mod module { let value_str = value.expect_str(); // Validate: no null characters in key or value - if key_str.contains('\0') || value_str.contains('\0') { + if key.contains_nuls() || value.contains_nuls() { + cold_path(); return Err(exceptions::nul_char_error(vm)); } // Validate: empty key or '=' in key after position 0 diff --git a/crates/vm/src/stdlib/os.rs b/crates/vm/src/stdlib/os.rs index 73e4918cc..a41e9990f 100644 --- a/crates/vm/src/stdlib/os.rs +++ b/crates/vm/src/stdlib/os.rs @@ -211,7 +211,7 @@ pub(super) mod _os { }; #[cfg(not(windows))] use core::marker::PhantomData; - use core::time::Duration; + use core::{hint::cold_path, time::Duration}; use crossbeam_utils::atomic::AtomicCell; use rustpython_common::wtf8::Wtf8Buf; #[cfg(windows)] @@ -487,10 +487,16 @@ pub(super) mod _os { } #[cfg(not(windows))] - fn env_bytes_as_bytes(obj: &crate::function::Either<PyStrRef, PyBytesRef>) -> &[u8] { + fn env_bytes_as_bytes_checked( + obj: &crate::function::Either<PyStrRef, PyBytesRef>, + ) -> Option<&[u8]> { match obj { - crate::function::Either::A(s) => s.as_bytes(), - crate::function::Either::B(b) => b.as_bytes(), + crate::function::Either::A(s) if !s.contains_nuls() => Some(s.as_bytes()), + crate::function::Either::B(b) if !b.contains_nuls() => Some(b.as_bytes()), + _ => { + cold_path(); + None + } } } @@ -515,9 +521,10 @@ pub(super) mod _os { // defining hidden environment variables. if key_str.is_empty() || key_str.get(1..).is_some_and(|s| s.contains('=')) - || key_str.contains('\0') - || value_str.contains('\0') + || key.contains_nuls() + || value.contains_nuls() { + cold_path(); return Err(vm.new_value_error("illegal environment variable name")); } let env_str = format!("{key_str}={value_str}"); @@ -537,11 +544,13 @@ pub(super) mod _os { value: crate::function::Either<PyStrRef, PyBytesRef>, vm: &VirtualMachine, ) -> PyResult<()> { - let key = env_bytes_as_bytes(&key); - let value = env_bytes_as_bytes(&value); - if key.contains(&b'\0') || value.contains(&b'\0') { + let (Some(key), Some(value)) = ( + env_bytes_as_bytes_checked(&key), + env_bytes_as_bytes_checked(&value), + ) else { + cold_path(); return Err(exceptions::nul_byte_error(vm)); - } + }; if key.is_empty() || key.contains(&b'=') { return Err(vm.new_value_error("illegal environment variable name")); } @@ -560,8 +569,9 @@ pub(super) mod _os { // defining hidden environment variables. if key_str.is_empty() || key_str.get(1..).is_some_and(|s| s.contains('=')) - || key_str.contains('\0') + || key.contains_nuls() { + cold_path(); return Err(vm.new_value_error("illegal environment variable name")); } // "key=" to unset (empty value removes the variable) @@ -581,10 +591,10 @@ pub(super) mod _os { key: crate::function::Either<PyStrRef, PyBytesRef>, vm: &VirtualMachine, ) -> PyResult<()> { - let key = env_bytes_as_bytes(&key); - if key.contains(&b'\0') { + let Some(key) = env_bytes_as_bytes_checked(&key) else { + cold_path(); return Err(exceptions::nul_byte_error(vm)); - } + }; if key.is_empty() || key.contains(&b'=') { let x = vm.new_errno_error( 22, diff --git a/crates/vm/src/stdlib/pwd.rs b/crates/vm/src/stdlib/pwd.rs index e181de240..cfd571e4c 100644 --- a/crates/vm/src/stdlib/pwd.rs +++ b/crates/vm/src/stdlib/pwd.rs @@ -11,6 +11,7 @@ mod pwd { exceptions, types::PyStructSequence, }; + use core::hint::cold_path; use rustpython_host_env::pwd as host_pwd; #[cfg(not(target_os = "android"))] @@ -50,15 +51,16 @@ mod pwd { #[pyfunction] fn getpwnam(name: PyUtf8StrRef, vm: &VirtualMachine) -> PyResult<PasswdData> { - let pw_name = name.as_str(); - if pw_name.contains('\0') { + if name.as_pystr().contains_nuls() { + cold_path(); return Err(exceptions::nul_char_error(vm)); } - let user = host_pwd::getpwnam(name.as_str()); + let name = name.as_str(); + let user = host_pwd::getpwnam(name); let user = user.ok_or_else(|| { vm.new_key_error( vm.ctx - .new_str(format!("getpwnam(): name not found: {pw_name}")) + .new_str(format!("getpwnam(): name not found: {name}")) .into(), ) })?; diff --git a/crates/vm/src/utils.rs b/crates/vm/src/utils.rs index d23cbb689..80402480c 100644 --- a/crates/vm/src/utils.rs +++ b/crates/vm/src/utils.rs @@ -4,7 +4,6 @@ use crate::{ PyObjectRef, PyResult, VirtualMachine, builtins::{PyStr, PyUtf8Str}, convert::{ToPyException, ToPyObject}, - exceptions::nul_char_error, }; pub fn hash_iter<'a, I: IntoIterator<Item = &'a PyObjectRef>>( @@ -24,13 +23,6 @@ pub trait ToCString: AsRef<Wtf8> { fn to_cstring(&self, vm: &VirtualMachine) -> PyResult<alloc::ffi::CString> { alloc::ffi::CString::new(self.as_ref().as_bytes()).map_err(|err| err.to_pyexception(vm)) } - fn ensure_no_nul(&self, vm: &VirtualMachine) -> PyResult<()> { - if self.as_ref().as_bytes().contains(&b'\0') { - Err(nul_char_error(vm)) - } else { - Ok(()) - } - } } impl ToCString for &str {} From dd7ee6dcc879230510e3bdf5a3f8ae22970fc7dd Mon Sep 17 00:00:00 2001 From: YujinBae <qodbwls70@naver.com> Date: Mon, 27 Jul 2026 21:36:27 +0900 Subject: [PATCH 305/339] dict iterator __reduce__ to resume from current position (#8384) * Fix dict iterator __reduce__ to resume from current position Pickling a partially-consumed dict / dict-view iterator restarted from the beginning because __reduce__ materialized every entry and ignored the iterator's position. Walk from the current position (mirroring next) so only the not-yet-yielded entries are captured, matching CPython, which reduces both directions to iter(remaining). Fixing the reverse iterator also uncovered two pre-existing bugs in reverse iteration itself, both from prev_entry saturating at 0: a hole just above index 0 made the entry at 0 yield twice, and deleting the first-inserted key made reversed() loop forever. prev_entry now returns the found entry's actual index and stops cleanly at index 0, and the reverse iterator/reduce detect exhaustion from that index. Verified against CPython 3.14 across all pickle protocols, dict states (including deletions), iterator kinds, and consumption counts. No regressions in test_dict, test_dictviews, test_ordered_dict, test_collections, test_userdict, test_iter, or test_copy. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * Apply cargo fmt to dict.rs imports Collapse the builtins import block left multi-line after removing the now-unused builtins_reversed import. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * Unmark TestSyncManagerTypes.test_dict as expectedFailure The dict iterator __reduce__ fix makes SyncManager dict proxies pickle correctly, so this test now passes under spawn and forkserver. Remove the stale expectedFailure marker that was causing an UNEXPECTED SUCCESS CI failure. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com> --- Lib/test/_test_multiprocessing.py | 1 - crates/vm/src/builtins/dict.rs | 48 +++++++++++++++++++------------ crates/vm/src/dict_inner.rs | 5 +++- 3 files changed, 34 insertions(+), 20 deletions(-) diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py index c3a980598..9cbe6dc64 100644 --- a/Lib/test/_test_multiprocessing.py +++ b/Lib/test/_test_multiprocessing.py @@ -6791,7 +6791,6 @@ class TestSyncManagerTypes(unittest.TestCase): obj.clear() case.assertEqual(len(obj), 0) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_dict(self): o = self.manager.dict() o['foo'] = 5 diff --git a/crates/vm/src/builtins/dict.rs b/crates/vm/src/builtins/dict.rs index d14536eef..af74a2591 100644 --- a/crates/vm/src/builtins/dict.rs +++ b/crates/vm/src/builtins/dict.rs @@ -7,11 +7,7 @@ use crate::object::{Traverse, TraverseFn}; use crate::{ AsObject, Context, Py, PyExact, PyObject, PyObjectRef, PyPayload, PyRef, PyRefExact, PyResult, TryFromObject, atomic_func, - builtins::{ - PyTuple, - iter::{builtins_iter, builtins_reversed}, - type_::PyAttributes, - }, + builtins::{PyTuple, iter::builtins_iter, type_::PyAttributes}, class::{PyClassDef, PyClassImpl}, common::ascii, dict_inner::{self, DictKey}, @@ -1118,10 +1114,17 @@ macro_rules! dict_view { let iter = builtins_iter(vm); let internal = self.internal.lock(); let entries = match &internal.status { - IterStatus::Active(dict) => dict - .into_iter() - .map(|(key, value)| ($result_fn)(vm, key, value)) - .collect::<Vec<_>>(), + IterStatus::Active(dict) => { + let mut position = internal.position; + let mut entries = Vec::new(); + while let Some((next_position, key, value)) = + dict.entries.next_entry(position) + { + entries.push(($result_fn)(vm, key, value)); + position = next_position; + } + entries + } IterStatus::Exhausted => vec![], }; vm.new_tuple((iter, (vm.ctx.new_list(entries),))) @@ -1184,14 +1187,23 @@ macro_rules! dict_view { #[pymethod] fn __reduce__(&self, vm: &VirtualMachine) -> PyTupleRef { - let iter = builtins_reversed(vm); + let iter = builtins_iter(vm); let internal = self.internal.lock(); - // TODO: entries must be reversed too let entries = match &internal.status { - IterStatus::Active(dict) => dict - .into_iter() - .map(|(key, value)| ($result_fn)(vm, key, value)) - .collect::<Vec<_>>(), + IterStatus::Active(dict) => { + let mut position = internal.position; + let mut entries = Vec::new(); + while let Some((found_index, key, value)) = + dict.entries.prev_entry(position) + { + entries.push(($result_fn)(vm, key, value)); + if found_index == 0 { + break; + } + position = found_index - 1; + } + entries + } IterStatus::Exhausted => vec![], }; vm.new_tuple((iter, (vm.ctx.new_list(entries),))) @@ -1218,11 +1230,11 @@ macro_rules! dict_view { ); } match dict.entries.prev_entry(internal.position) { - Some((position, key, value)) => { - if internal.position == position { + Some((found_index, key, value)) => { + if found_index == 0 { internal.status = IterStatus::Exhausted; } else { - internal.position = position; + internal.position = found_index - 1; } PyIterReturn::Return(($result_fn)(vm, key, value)) } diff --git a/crates/vm/src/dict_inner.rs b/crates/vm/src/dict_inner.rs index 3b5f5617f..cc26383d9 100644 --- a/crates/vm/src/dict_inner.rs +++ b/crates/vm/src/dict_inner.rs @@ -861,10 +861,13 @@ impl<T: Clone> Dict<T> { let inner = self.read(); loop { let entry = inner.entries.get(position)?; - position = position.saturating_sub(1); if let Some(entry) = entry { break Some((position, entry.key.clone(), entry.value.clone())); } + if position == 0 { + break None; + } + position -= 1; } } From 15e7b2027ea070cdf598d20f936cac90b045811c Mon Sep 17 00:00:00 2001 From: Chanho Lee <ibear6954@gmail.com> Date: Mon, 27 Jul 2026 21:42:19 +0900 Subject: [PATCH 306/339] Fix sqlite autocommit lifecycle (#8387) * fix: open disabled sqlite autocommit transactions Assisted-by: Codex:gpt-5.6-sol * fix: reopen disabled sqlite transactions after commit Assisted-by: Codex:gpt-5.6-sol * fix: reopen disabled sqlite transactions after rollback Assisted-by: Codex:gpt-5.6-sol * fix: roll back disabled sqlite connections on close Assisted-by: Codex:gpt-5.6-sol --- Lib/test/test_sqlite3/test_transactions.py | 4 -- crates/stdlib/src/_sqlite3.rs | 63 +++++++++++++++------- 2 files changed, 45 insertions(+), 22 deletions(-) diff --git a/Lib/test/test_sqlite3/test_transactions.py b/Lib/test/test_sqlite3/test_transactions.py index db58938b9..64a1621d4 100644 --- a/Lib/test/test_sqlite3/test_transactions.py +++ b/Lib/test/test_sqlite3/test_transactions.py @@ -395,7 +395,6 @@ class AutocommitAttribute(unittest.TestCase): with self.assertRaisesRegex(ValueError, msg): sqlite.connect(":memory:", autocommit=mode) - @unittest.expectedFailure # TODO: RUSTPYTHON; autocommit behavior differs def test_autocommit_disabled(self): expected = [ "SELECT 1", @@ -411,7 +410,6 @@ class AutocommitAttribute(unittest.TestCase): cx.commit() cx.rollback() - @unittest.expectedFailure # TODO: RUSTPYTHON; autocommit behavior differs def test_autocommit_disabled_implicit_rollback(self): expected = ["ROLLBACK"] with memory_database(autocommit=False) as cx: @@ -438,7 +436,6 @@ class AutocommitAttribute(unittest.TestCase): meth() # expect this to pass silently self.assertFalse(cx.in_transaction) - @unittest.expectedFailure # TODO: RUSTPYTHON; autocommit behavior differs def test_autocommit_disabled_then_enabled(self): expected = ["COMMIT"] with memory_database(autocommit=False) as cx: @@ -472,7 +469,6 @@ class AutocommitAttribute(unittest.TestCase): self.assertFalse(cx.in_transaction) self.assertFalse(cx.in_transaction) - @unittest.expectedFailure # TODO: RUSTPYTHON; autocommit behavior differs def test_autocommit_disabled_ctx_mgr(self): expected = ["COMMIT", "BEGIN"] with memory_database(autocommit=False) as cx: diff --git a/crates/stdlib/src/_sqlite3.rs b/crates/stdlib/src/_sqlite3.rs index 58d8ad7b3..e2b06adc4 100644 --- a/crates/stdlib/src/_sqlite3.rs +++ b/crates/stdlib/src/_sqlite3.rs @@ -963,7 +963,7 @@ mod _sqlite3 { zelf.reset_factories(vm); if was_initialized { - zelf.drop_db(); + zelf.drop_db(vm)?; } // Attempt to open the new database before mutating other state so failures leave @@ -994,8 +994,20 @@ mod _sqlite3 { #[pyclass(with(Constructor, Callable, Initializer), flags(BASETYPE, HAS_WEAKREF))] impl Connection { - fn drop_db(&self) { - self.db.lock().take(); + fn drop_db(&self, vm: &VirtualMachine) -> PyResult<()> { + let mut guard = self.db.lock(); + let rollback_result = if let Some(db) = guard.as_ref() + && *self.autocommit.lock() == AutocommitMode::Disabled + && !db.is_autocommit() + { + db._exec(b"ROLLBACK\0", vm) + } else { + Ok(()) + }; + let db = guard.take(); + drop(guard); + drop(db); + rollback_result } fn reset_factories(&self, vm: &VirtualMachine) { @@ -1012,6 +1024,9 @@ mod _sqlite3 { if let Some(isolation_level) = &args.isolation_level.0 { begin_statement_ptr_from_isolation_level(isolation_level, vm)?; } + if args.autocommit == AutocommitMode::Disabled { + db._exec(b"BEGIN\0", vm)?; + } Ok(db) } @@ -1108,8 +1123,7 @@ mod _sqlite3 { #[pymethod] fn close(&self, vm: &VirtualMachine) -> PyResult<()> { self.check_thread(vm)?; - self.drop_db(); - Ok(()) + self.drop_db(vm) } fn is_closed(&self) -> bool { @@ -1118,16 +1132,35 @@ mod _sqlite3 { #[pymethod] fn commit(&self, vm: &VirtualMachine) -> PyResult<()> { - self.db_lock(vm)?.implicit_commit(vm) + let db = self.db_lock(vm)?; + let mode = *self.autocommit.lock(); + match mode { + AutocommitMode::Legacy => db.implicit_commit(vm), + AutocommitMode::Enabled => Ok(()), + AutocommitMode::Disabled => { + db._exec(b"COMMIT\0", vm)?; + db._exec(b"BEGIN\0", vm) + } + } } #[pymethod] fn rollback(&self, vm: &VirtualMachine) -> PyResult<()> { let db = self.db_lock(vm)?; - if !db.is_autocommit() { - db._exec(b"ROLLBACK\0", vm) - } else { - Ok(()) + let mode = *self.autocommit.lock(); + match mode { + AutocommitMode::Legacy => { + if db.is_autocommit() { + Ok(()) + } else { + db._exec(b"ROLLBACK\0", vm) + } + } + AutocommitMode::Enabled => Ok(()), + AutocommitMode::Disabled => { + db._exec(b"ROLLBACK\0", vm)?; + db._exec(b"BEGIN\0", vm) + } } } @@ -1521,11 +1554,7 @@ mod _sqlite3 { // If setting isolation_level to None (auto-commit mode), commit any pending transaction if value.is_none() { - let db = self.db_lock(vm)?; - if !db.is_autocommit() { - // Keep the lock and call implicit_commit directly to avoid race conditions - db.implicit_commit(vm)?; - } + self.commit(vm)?; } let _ = unsafe { self.isolation_level.swap(value) }; Ok(()) @@ -1549,6 +1578,7 @@ mod _sqlite3 { fn set_autocommit(&self, val: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> { let mode = AutocommitMode::try_from_borrowed_object(vm, &val)?; let db = self.db_lock(vm)?; + *self.autocommit.lock() = mode; // Handle transaction state based on mode change match mode { @@ -1568,9 +1598,6 @@ mod _sqlite3 { // Legacy mode doesn't change transaction state } } - - drop(db); - *self.autocommit.lock() = mode; Ok(()) } From a0f4f6a0015e61c8e11586b68ff0368d522603bf Mon Sep 17 00:00:00 2001 From: Kwak Byoung Min <67214970+doma17@users.noreply.github.com> Date: Mon, 27 Jul 2026 21:43:15 +0900 Subject: [PATCH 307/339] Reject empty UU input before decoding (#8389) Constraint: Match CPython's a2b_uu empty-input behavior. Confidence: high Scope-risk: narrow Directive: Preserve decoding behavior for non-empty UU buffers. Tested: prek run --all-files; test_binascii; cargo fmt --check; cargo clippy -p rustpython-stdlib -- -D warnings; cargo test -p rustpython-stdlib; manual full-suite verification Assisted-by: Codex:gpt-5.6-sol --- Lib/test/test_binascii.py | 2 -- crates/stdlib/src/binascii.rs | 10 +++++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Lib/test/test_binascii.py b/Lib/test/test_binascii.py index cd8acb4c2..48631cece 100644 --- a/Lib/test/test_binascii.py +++ b/Lib/test/test_binascii.py @@ -222,7 +222,6 @@ class BinASCIITest(unittest.TestCase): assertInvalidLength(b'a' * (4 * 87 + 1)) assertInvalidLength(b'A\tB\nC ??DE') # only 5 valid characters - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: Error not raised by a2b_uu def test_uu(self): MAX_UU = 45 for backtick in (True, False): @@ -445,7 +444,6 @@ class BinASCIITest(unittest.TestCase): self.assertConversion(binary, converted, restored, quotetabs=quotetabs, istext=istext, header=header) - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: Error not raised by a2b_uu def test_empty_string(self): # A test for SF bug #1022953. Make sure SystemError is not raised. empty = self.type2test(b'') diff --git a/crates/stdlib/src/binascii.rs b/crates/stdlib/src/binascii.rs index 0cf005628..d0cdc2148 100644 --- a/crates/stdlib/src/binascii.rs +++ b/crates/stdlib/src/binascii.rs @@ -746,12 +746,12 @@ mod decl { #[pyfunction] fn a2b_uu(s: ArgAsciiBuffer, vm: &VirtualMachine) -> PyResult<Vec<u8>> { s.with_ref(|b| { + if b.is_empty() { + return Err(super::new_binascii_error("Missing length byte", vm)); + } + // First byte: binary data length (in bytes) - let length = if b.is_empty() { - ((-0x20i32) & 0x3fi32) as usize - } else { - ((b[0] - b' ') & 0x3f) as usize - }; + let length = ((b[0] - b' ') & 0x3f) as usize; // Allocate the buffer let mut res = Vec::<u8>::with_capacity(length); From 053355fe4e90ccf537bb611233f1141f329126dc Mon Sep 17 00:00:00 2001 From: "Jeong, YunWon" <69878+youknowone@users.noreply.github.com> Date: Tue, 28 Jul 2026 00:33:37 +0900 Subject: [PATCH 308/339] Update malachite dependencies to 0.10 (#8391) Assisted-by: Claude --- Cargo.lock | 16 ++++++++-------- Cargo.toml | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4f113adf0..700a75b20 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2113,9 +2113,9 @@ dependencies = [ [[package]] name = "malachite-base" -version = "0.9.2" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4f44099731f17094b07825c88ccb5fbd1bfa1f82fafff7daa33e8b8652db16e" +checksum = "c6b9d4679f346f85a8f466d0171478304dab8b0e944dd38086411ab5f6100a17" dependencies = [ "hashbrown 0.16.1", "itertools 0.14.0", @@ -2125,9 +2125,9 @@ dependencies = [ [[package]] name = "malachite-bigint" -version = "0.9.2" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc58206ba15e9c406e20c95c5f86efa07b12f94080945908e910b3a0faa23fef" +checksum = "5064cf3abe01ff3b80b0349936ebad6c52f7c793182d9c7992bf79ece18c0d22" dependencies = [ "malachite-base", "malachite-nz", @@ -2138,9 +2138,9 @@ dependencies = [ [[package]] name = "malachite-nz" -version = "0.9.2" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a137660cdba20f136c8a223125f08088adb4e0b72fbb8466f08c43e31cc0427d" +checksum = "8a6821ab988221c35d421ba16c4f8dca101efe5ae1cbfa9831f1fdb1596c755e" dependencies = [ "itertools 0.14.0", "libm", @@ -2150,9 +2150,9 @@ dependencies = [ [[package]] name = "malachite-q" -version = "0.9.2" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffcbeed95e34c0fcc3864ccd146e129cbbf7de1513d3afbcfb47c7674c82d94" +checksum = "3cf7894cd9617e43ef5d9824633f7dfc1bffd0298880dd668f20bdffb7a6e8ea" dependencies = [ "itertools 0.14.0", "libm", diff --git a/Cargo.toml b/Cargo.toml index 114b5983d..ac1e35c53 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -246,9 +246,9 @@ log = "0.4.30" lz4_flex = "0.13" nix = { version = "0.31", features = ["fs", "user", "process", "term", "time", "signal", "ioctl", "socket", "sched", "zerocopy", "dir", "hostname", "net", "poll"] } mac_address = "1.1.3" -malachite-bigint = "0.9.1" -malachite-q = "0.9.1" -malachite-base = "0.9.1" +malachite-bigint = "0.10.0" +malachite-q = "0.10.0" +malachite-base = "0.10.0" md-5 = "0.11" memchr = { version = "2.8.1", default-features = false, features = ["alloc"] } memmap2 = "0.9.10" From ee2ceb0494f7d0f9ea8f4f149f6c104b5b6fbaf1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Jul 2026 00:33:59 +0900 Subject: [PATCH 309/339] build(deps): bump actions/setup-python from 6.3.0 to 7.0.0 (#8392) Bumps [actions/setup-python](https://github.com/actions/setup-python) from 6.3.0 to 7.0.0. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/ece7cb06caefa5fff74198d8649806c4678c61a1...5fda3b95a4ea91299a34e894583c3862153e4b97) --- updated-dependencies: - dependency-name: actions/setup-python dependency-version: 7.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 6 +++--- .github/workflows/cron-ci.yaml | 6 +++--- .github/workflows/lib-deps-check.yaml | 2 +- .github/workflows/update-doc-db.yml | 2 +- .github/workflows/upgrade-pylib.lock.yml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d1aa26fed..e88cad1ea 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -343,7 +343,7 @@ jobs: # Windows runners randomly crashes, https://github.com/actions/cache/issues/1754 continue-on-error: true - - uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0 + - uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0 - name: Install macOS dependencies uses: ./.github/actions/install-macos-deps @@ -542,7 +542,7 @@ jobs: with: persist-credentials: false - - uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0 + - uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0 - uses: dtolnay/rust-toolchain@stable with: @@ -685,7 +685,7 @@ jobs: mkdir geckodriver tar -xzf geckodriver-v0.36.0-linux64.tar.gz -C geckodriver - - uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0 + - uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0 - run: python -m pip install -r requirements.txt working-directory: ./wasm/tests diff --git a/.github/workflows/cron-ci.yaml b/.github/workflows/cron-ci.yaml index 37af28a4e..43875f251 100644 --- a/.github/workflows/cron-ci.yaml +++ b/.github/workflows/cron-ci.yaml @@ -37,7 +37,7 @@ jobs: with: tool: cargo-llvm-cov - - uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0 + - uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0 - run: sudo apt-get update && sudo apt-get -y install lcov @@ -111,7 +111,7 @@ jobs: - uses: dtolnay/rust-toolchain@stable - - uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0 + - uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0 - name: build rustpython run: cargo build --release --verbose @@ -174,7 +174,7 @@ jobs: - uses: dtolnay/rust-toolchain@stable - - uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0 + - uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0 - run: cargo install cargo-criterion diff --git a/.github/workflows/lib-deps-check.yaml b/.github/workflows/lib-deps-check.yaml index 7461fa6a2..2808bf09f 100644 --- a/.github/workflows/lib-deps-check.yaml +++ b/.github/workflows/lib-deps-check.yaml @@ -98,7 +98,7 @@ jobs: - name: Setup Python if: steps.changed-files.outputs.modules != '' - uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0 + uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0 - name: Run deps check if: steps.changed-files.outputs.modules != '' diff --git a/.github/workflows/update-doc-db.yml b/.github/workflows/update-doc-db.yml index 0d9c37a32..6a31f43bc 100644 --- a/.github/workflows/update-doc-db.yml +++ b/.github/workflows/update-doc-db.yml @@ -36,7 +36,7 @@ jobs: sparse-checkout: | crates/doc - - uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0 + - uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0 with: python-version: ${{ inputs.python-version }} diff --git a/.github/workflows/upgrade-pylib.lock.yml b/.github/workflows/upgrade-pylib.lock.yml index 9790f37c5..2794e2400 100644 --- a/.github/workflows/upgrade-pylib.lock.yml +++ b/.github/workflows/upgrade-pylib.lock.yml @@ -107,7 +107,7 @@ jobs: with: persist-credentials: false - name: Setup Python - uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0 + uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0 with: python-version: '3.14' - name: Create gh-aw temp directory From 0a272f78b943f9477efa74e9c84f81c8b3d71843 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Jul 2026 00:34:09 +0900 Subject: [PATCH 310/339] build(deps): bump taiki-e/install-action from 2.83.2 to 2.84.0 (#8393) Bumps [taiki-e/install-action](https://github.com/taiki-e/install-action) from 2.83.2 to 2.84.0. - [Release notes](https://github.com/taiki-e/install-action/releases) - [Changelog](https://github.com/taiki-e/install-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/taiki-e/install-action/compare/43aecc8d72668fbcfe75c31400bc4f890f1c5853...a6b2e2dcd845ddd7f509ce4f3ed3d922b80cc5d9) --- updated-dependencies: - dependency-name: taiki-e/install-action dependency-version: 2.84.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/cron-ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cron-ci.yaml b/.github/workflows/cron-ci.yaml index 43875f251..447dd9bf2 100644 --- a/.github/workflows/cron-ci.yaml +++ b/.github/workflows/cron-ci.yaml @@ -33,7 +33,7 @@ jobs: - uses: dtolnay/rust-toolchain@stable - - uses: taiki-e/install-action@43aecc8d72668fbcfe75c31400bc4f890f1c5853 # v2.83.2 + - uses: taiki-e/install-action@a6b2e2dcd845ddd7f509ce4f3ed3d922b80cc5d9 # v2.84.0 with: tool: cargo-llvm-cov From a816a911ec1104c4313bce7c5cbbff62ccc70d7f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Jul 2026 00:34:24 +0900 Subject: [PATCH 311/339] build(deps): bump cargo-bins/cargo-binstall from 1.20.1 to 1.21.0 (#8394) Bumps [cargo-bins/cargo-binstall](https://github.com/cargo-bins/cargo-binstall) from 1.20.1 to 1.21.0. - [Release notes](https://github.com/cargo-bins/cargo-binstall/releases) - [Changelog](https://github.com/cargo-bins/cargo-binstall/blob/main/release-plz.toml) - [Commits](https://github.com/cargo-bins/cargo-binstall/compare/732870f031d2fb36309d0deaf36abcc704a7be65...ead08b90bd7b2e6d81963fb9cf0b7239f66d5db4) --- updated-dependencies: - dependency-name: cargo-bins/cargo-binstall dependency-version: 1.21.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e88cad1ea..1aaa71550 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -521,7 +521,7 @@ jobs: - uses: dtolnay/rust-toolchain@stable - - uses: cargo-bins/cargo-binstall@732870f031d2fb36309d0deaf36abcc704a7be65 # v1.20.1 + - uses: cargo-bins/cargo-binstall@ead08b90bd7b2e6d81963fb9cf0b7239f66d5db4 # v1.21.0 - name: cargo shear run: | From 2a0cd08c643912a1a65ae973611c3d4a37e322c5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Jul 2026 00:34:58 +0900 Subject: [PATCH 312/339] build(deps): bump actions/checkout from 7.0.0 to 7.0.1 (#8395) Bumps [actions/checkout](https://github.com/actions/checkout) from 7.0.0 to 7.0.1. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0...3d3c42e5aac5ba805825da76410c181273ba90b1) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: 7.0.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 24 +++++++++++------------ .github/workflows/cron-ci.yaml | 8 ++++---- .github/workflows/lib-deps-check.yaml | 4 ++-- .github/workflows/release.yml | 6 +++--- .github/workflows/update-caches.yml | 2 +- .github/workflows/update-doc-db.yml | 4 ++-- .github/workflows/update-libs-status.yaml | 4 ++-- .github/workflows/upgrade-pylib.lock.yml | 4 ++-- 8 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1aaa71550..a2498abf1 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -44,7 +44,7 @@ jobs: # Flag that is raised when any rust code is changed. rust_code: ${{ steps.check_rust_code.outputs.changed }} steps: - - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: fetch-depth: 0 persist-credentials: false @@ -88,7 +88,7 @@ jobs: os: [macos-latest, ubuntu-latest, windows-2025] fail-fast: false steps: - - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: persist-credentials: false @@ -204,7 +204,7 @@ jobs: target: x86_64-apple-darwin fail-fast: false steps: - - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: persist-credentials: false @@ -321,7 +321,7 @@ jobs: timeout: 50 fail-fast: false steps: - - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: persist-credentials: false @@ -477,7 +477,7 @@ jobs: - ubuntu-latest - windows-latest steps: - - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: persist-credentials: false @@ -515,7 +515,7 @@ jobs: needs.determine_changes.outputs.rust_code == 'true' || github.ref == 'refs/heads/main' steps: - - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: persist-credentials: false @@ -538,7 +538,7 @@ jobs: pull-requests: write security-events: write # for zizmor steps: - - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: persist-credentials: false @@ -578,7 +578,7 @@ jobs: echo "version=${version}" >> "$GITHUB_OUTPUT" - name: Clone CPython - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: repository: python/cpython path: cpython @@ -616,7 +616,7 @@ jobs: env: NIGHTLY_CHANNEL: nightly steps: - - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: persist-credentials: false @@ -651,7 +651,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 steps: - - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: persist-credentials: false @@ -766,7 +766,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 steps: - - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: persist-credentials: false @@ -818,7 +818,7 @@ jobs: name: cargo doc runs-on: ubuntu-latest steps: - - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: persist-credentials: false diff --git a/.github/workflows/cron-ci.yaml b/.github/workflows/cron-ci.yaml index 447dd9bf2..059604625 100644 --- a/.github/workflows/cron-ci.yaml +++ b/.github/workflows/cron-ci.yaml @@ -27,7 +27,7 @@ jobs: env: INSTA_WORKSPACE_ROOT: ${{ github.workspace }} steps: - - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: persist-credentials: false @@ -67,7 +67,7 @@ jobs: # Disable this scheduled job when running on a fork. if: ${{ github.repository == 'RustPython/RustPython' || github.event_name != 'schedule' }} steps: - - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: persist-credentials: true @@ -105,7 +105,7 @@ jobs: # Disable this scheduled job when running on a fork. if: ${{ github.repository == 'RustPython/RustPython' || github.event_name != 'schedule' }} steps: - - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: persist-credentials: true @@ -168,7 +168,7 @@ jobs: # Disable this scheduled job when running on a fork. if: ${{ github.repository == 'RustPython/RustPython' || github.event_name != 'schedule' }} steps: - - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: persist-credentials: true diff --git a/.github/workflows/lib-deps-check.yaml b/.github/workflows/lib-deps-check.yaml index 2808bf09f..a938c6ff0 100644 --- a/.github/workflows/lib-deps-check.yaml +++ b/.github/workflows/lib-deps-check.yaml @@ -18,7 +18,7 @@ jobs: timeout-minutes: 10 steps: - name: Checkout base branch - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: # Use base branch for scripts (security: don't run PR code with elevated permissions) ref: ${{ github.event.pull_request.base.ref }} @@ -41,7 +41,7 @@ jobs: echo "version=${version}" >> "$GITHUB_OUTPUT" - name: Checkout CPython - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: repository: python/cpython path: cpython diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 990322cc2..5957666de 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -52,7 +52,7 @@ jobs: # target: aarch64-pc-windows-msvc fail-fast: false steps: - - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: persist-credentials: false @@ -91,7 +91,7 @@ jobs: permissions: contents: read steps: - - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: persist-credentials: false @@ -156,7 +156,7 @@ jobs: permissions: contents: write # for creating a release steps: - - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: persist-credentials: false diff --git a/.github/workflows/update-caches.yml b/.github/workflows/update-caches.yml index de94f3f50..32c8e1a62 100644 --- a/.github/workflows/update-caches.yml +++ b/.github/workflows/update-caches.yml @@ -40,7 +40,7 @@ jobs: target: "" steps: - name: Checkout RustPython main branch - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: repository: RustPython/RustPython ref: main diff --git a/.github/workflows/update-doc-db.yml b/.github/workflows/update-doc-db.yml index 6a31f43bc..e9fa285ae 100644 --- a/.github/workflows/update-doc-db.yml +++ b/.github/workflows/update-doc-db.yml @@ -30,7 +30,7 @@ jobs: - windows-latest - macos-latest steps: - - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: persist-credentials: false sparse-checkout: | @@ -58,7 +58,7 @@ jobs: contents: write pull-requests: write steps: - - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: persist-credentials: true ref: ${{ inputs.base-ref }} diff --git a/.github/workflows/update-libs-status.yaml b/.github/workflows/update-libs-status.yaml index 846818e12..c1c656d20 100644 --- a/.github/workflows/update-libs-status.yaml +++ b/.github/workflows/update-libs-status.yaml @@ -21,7 +21,7 @@ jobs: if: ${{ github.repository == 'RustPython/RustPython' }} steps: - name: Clone RustPython - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: path: rustpython persist-credentials: false @@ -37,7 +37,7 @@ jobs: echo "version=${version}" >> "$GITHUB_OUTPUT" - name: Clone CPython - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: repository: python/cpython path: cpython diff --git a/.github/workflows/upgrade-pylib.lock.yml b/.github/workflows/upgrade-pylib.lock.yml index 2794e2400..e53d21f12 100644 --- a/.github/workflows/upgrade-pylib.lock.yml +++ b/.github/workflows/upgrade-pylib.lock.yml @@ -103,7 +103,7 @@ jobs: with: destination: /opt/gh-aw/actions - name: Checkout repository - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: persist-credentials: false - name: Setup Python @@ -1061,7 +1061,7 @@ jobs: path: /tmp/gh-aw/ - name: Checkout repository if: ((!cancelled()) && (needs.agent.result != 'skipped')) && (contains(needs.agent.outputs.output_types, 'create_pull_request')) - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: token: ${{ github.token }} persist-credentials: false From 571d7d91122b1c8f3a0ac6b6d2dd98d6376608f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Jul 2026 00:35:23 +0900 Subject: [PATCH 313/339] build(deps): bump thiserror in the thiserror group across 1 directory (#8396) Bumps the thiserror group with 1 update in the / directory: [thiserror](https://github.com/dtolnay/thiserror). Updates `thiserror` from 2.0.18 to 2.0.19 - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/2.0.18...2.0.19) --- updated-dependencies: - dependency-name: thiserror dependency-version: 2.0.19 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: thiserror ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 105 +++++++++++++++++++++++++++++------------------------ 1 file changed, 58 insertions(+), 47 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 700a75b20..1ccd819cc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -198,7 +198,7 @@ checksum = "3109e49b1e4909e9db6515a30c633684d68cdeaa252f215214cb4fa1a5bfee2c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", "synstructure", ] @@ -210,7 +210,7 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -233,7 +233,7 @@ dependencies = [ "manyhow", "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -249,7 +249,7 @@ dependencies = [ "proc-macro2", "quote", "quote-use", - "syn", + "syn 2.0.119", ] [[package]] @@ -326,7 +326,7 @@ dependencies = [ "regex", "rustc-hash", "shlex 1.3.0", - "syn", + "syn 2.0.119", ] [[package]] @@ -346,7 +346,7 @@ dependencies = [ "regex", "rustc-hash", "shlex 1.3.0", - "syn", + "syn 2.0.119", ] [[package]] @@ -1045,7 +1045,7 @@ dependencies = [ "defmt-parser", "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -1092,7 +1092,7 @@ checksum = "59600e2c2d636fde9b65e99cc6445ac770c63d3628195ff39932b8d6d7409903" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -1109,7 +1109,7 @@ checksum = "d08b3a0bcc0d079199cd476b2cae8435016ec11d1c0986c6901c5ac223041534" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -1153,7 +1153,7 @@ checksum = "1ac70aa55017e108007fbaf5aa0f54b021c98f92ff8af59d42eda9da96e3dd4f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -1288,7 +1288,7 @@ checksum = "7693d9dd1ec1c54f52195dfe255b627f7cec7da33b679cd56de949e662b3db10" dependencies = [ "flame", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -1378,7 +1378,7 @@ checksum = "f2b6d1e2f75c16bfbcd0f95d84f99858a6e2f885c2287d1f5c3a96e8444a34b4" dependencies = [ "attribute-derive", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -1770,7 +1770,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -1834,7 +1834,7 @@ checksum = "e165e897f662d428f3cd3828a919dbe067c2d42bb1031eede74ef9d27ecdedd2" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -1864,7 +1864,7 @@ dependencies = [ "quote", "rustc_version", "simd_cesu8", - "syn", + "syn 2.0.119", ] [[package]] @@ -1883,7 +1883,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264" dependencies = [ "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -2169,7 +2169,7 @@ dependencies = [ "manyhow-macros", "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -2367,7 +2367,7 @@ checksum = "680998035259dcfcafe653688bf2aa6d3e2dc05e98be6ab46afb089dc84f1df8" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -2428,7 +2428,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -2597,7 +2597,7 @@ dependencies = [ "phf_shared 0.14.0", "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -2695,7 +2695,7 @@ checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -2757,7 +2757,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" dependencies = [ "proc-macro2", - "syn", + "syn 2.0.119", ] [[package]] @@ -2846,7 +2846,7 @@ dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -2858,7 +2858,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -2889,7 +2889,7 @@ dependencies = [ "proc-macro-utils", "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -3042,7 +3042,7 @@ checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -3118,7 +3118,7 @@ dependencies = [ "pmutil", "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -3393,7 +3393,7 @@ version = "0.5.0" dependencies = [ "rustpython-compiler", "rustpython-derive-impl", - "syn", + "syn 2.0.119", ] [[package]] @@ -3405,7 +3405,7 @@ dependencies = [ "quote", "rustpython-compiler-core", "rustpython-doc", - "syn", + "syn 2.0.119", "syn-ext", "textwrap", ] @@ -3904,7 +3904,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -4101,7 +4101,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -4121,6 +4121,17 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53e9bae58849f64dfa4f5d5ae372c8341f7305f82a3868709269343628b659a3" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "syn-ext" version = "0.5.0" @@ -4129,7 +4140,7 @@ checksum = "b126de4ef6c2a628a68609dd00733766c3b015894698a438ebdf374933fc31d1" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -4140,7 +4151,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -4215,22 +4226,22 @@ checksum = "b0f7e269b48f0a7dd0146680fa24b50cc67fc0373f086a5b2f99bd084639b482" [[package]] name = "thiserror" -version = "2.0.18" +version = "2.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4" +checksum = "09a43598840e33d5b0331f38c5e30d13bb11c11210a4b58f0d9b18a5a5eefcd9" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "2.0.18" +version = "2.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" +checksum = "43cbfe0cf76104d42a574802844187e84a305e531ed54455f11fbde0f10541cd" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 3.0.3", ] [[package]] @@ -4343,7 +4354,7 @@ checksum = "2d2e76690929402faae40aebdda620a2c0e25dd6d3b9afe48867dfd95991f4bd" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -4590,7 +4601,7 @@ dependencies = [ "bumpalo", "proc-macro2", "quote", - "syn", + "syn 2.0.119", "wasm-bindgen-shared", ] @@ -4730,7 +4741,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -4741,7 +4752,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -5044,7 +5055,7 @@ checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", "synstructure", ] @@ -5065,7 +5076,7 @@ checksum = "4714fd92cf900833d49538023a9b3915155210801d1c1169eba513b2addefd71" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -5085,7 +5096,7 @@ checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", "synstructure", ] @@ -5106,7 +5117,7 @@ checksum = "3c50655cbb0fe3fc43170059e702f1ce5e19b84cec58dc87b037a09935c2f328" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] @@ -5141,7 +5152,7 @@ checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.119", ] [[package]] From e4dccd8c4028426e490cd5fe2b4d7f9d30da321b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Jul 2026 00:35:42 +0900 Subject: [PATCH 314/339] build(deps): bump github/gh-aw/actions/setup from 0.81.6 to 0.82.14 (#8398) Bumps [github/gh-aw/actions/setup](https://github.com/github/gh-aw) from 0.81.6 to 0.82.14. - [Release notes](https://github.com/github/gh-aw/releases) - [Changelog](https://github.com/github/gh-aw/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/gh-aw/compare/eed4304d8740f0593f2797276cb8299d228ffd9b...8b820ae1073f301991aaf2f307f7e271f618bb9f) --- updated-dependencies: - dependency-name: github/gh-aw/actions/setup dependency-version: 0.82.14 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/upgrade-pylib.lock.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/upgrade-pylib.lock.yml b/.github/workflows/upgrade-pylib.lock.yml index e53d21f12..31a7ac26f 100644 --- a/.github/workflows/upgrade-pylib.lock.yml +++ b/.github/workflows/upgrade-pylib.lock.yml @@ -58,7 +58,7 @@ jobs: comment_repo: "" steps: - name: Setup Scripts - uses: github/gh-aw/actions/setup@eed4304d8740f0593f2797276cb8299d228ffd9b # v0.81.6 + uses: github/gh-aw/actions/setup@8b820ae1073f301991aaf2f307f7e271f618bb9f # v0.82.14 with: destination: /opt/gh-aw/actions - name: Check workflow file timestamps @@ -99,7 +99,7 @@ jobs: secret_verification_result: ${{ steps.validate-secret.outputs.verification_result }} steps: - name: Setup Scripts - uses: github/gh-aw/actions/setup@eed4304d8740f0593f2797276cb8299d228ffd9b # v0.81.6 + uses: github/gh-aw/actions/setup@8b820ae1073f301991aaf2f307f7e271f618bb9f # v0.82.14 with: destination: /opt/gh-aw/actions - name: Checkout repository @@ -806,7 +806,7 @@ jobs: total_count: ${{ steps.missing_tool.outputs.total_count }} steps: - name: Setup Scripts - uses: github/gh-aw/actions/setup@eed4304d8740f0593f2797276cb8299d228ffd9b # v0.81.6 + uses: github/gh-aw/actions/setup@8b820ae1073f301991aaf2f307f7e271f618bb9f # v0.82.14 with: destination: /opt/gh-aw/actions - name: Download agent output artifact @@ -927,7 +927,7 @@ jobs: success: ${{ steps.parse_results.outputs.success }} steps: - name: Setup Scripts - uses: github/gh-aw/actions/setup@eed4304d8740f0593f2797276cb8299d228ffd9b # v0.81.6 + uses: github/gh-aw/actions/setup@8b820ae1073f301991aaf2f307f7e271f618bb9f # v0.82.14 with: destination: /opt/gh-aw/actions - name: Download agent artifacts @@ -1039,7 +1039,7 @@ jobs: process_safe_outputs_temporary_id_map: ${{ steps.process_safe_outputs.outputs.temporary_id_map }} steps: - name: Setup Scripts - uses: github/gh-aw/actions/setup@eed4304d8740f0593f2797276cb8299d228ffd9b # v0.81.6 + uses: github/gh-aw/actions/setup@8b820ae1073f301991aaf2f307f7e271f618bb9f # v0.82.14 with: destination: /opt/gh-aw/actions - name: Download agent output artifact From f78e57d89c837bf880889a94c2858e39a4021b7e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Jul 2026 00:36:13 +0900 Subject: [PATCH 315/339] build(deps): bump https://github.com/astral-sh/ruff-pre-commit (#8400) Bumps [https://github.com/astral-sh/ruff-pre-commit](https://github.com/astral-sh/ruff-pre-commit) from v0.15.21 to 0.15.22. - [Release notes](https://github.com/astral-sh/ruff-pre-commit/releases) - [Commits](https://github.com/astral-sh/ruff-pre-commit/compare/v0.15.21...v0.15.22) --- updated-dependencies: - dependency-name: https://github.com/astral-sh/ruff-pre-commit dependency-version: 0.15.22 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 45fb5f47b..80177744b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -10,7 +10,7 @@ repos: priority: 0 - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.15.21 + rev: v0.15.22 hooks: - id: ruff-format priority: 0 From 8c8caec52d09a8bfaf2c4125c2a17de8fc965944 Mon Sep 17 00:00:00 2001 From: "Jeong, YunWon" <69878+youknowone@users.noreply.github.com> Date: Tue, 28 Jul 2026 10:20:04 +0900 Subject: [PATCH 316/339] Fix SymbolUsge::Iter, os.rename, sre_engine (#8390) * Fix SymbolUsge::Iter * fix os.rename * fix sre * Re-export rename from crate::posix on Windows posix_windows.rs is mounted as the `posix` module on Windows, so `crate::posix_windows` does not resolve. Assisted-by: Claude * Apply rustfmt to sre_engine tests Assisted-by: Claude * Update test expectations for the sre and tokenize fixes - test_re: drop expectedFailure from test_word_boundaries, test_possessive_quantifiers and test_bug_gh101955 - test_inspect, test_pydoc: drop expectedFailure from the signature tests that now pass - test_pdb: drop expectedFailure from the two file-modification tests and +EXPECTED_FAILURE from the test_post_mortem_chained and test_pdb_asynctask doctests - test_unittest: mark test_autospec_on_bound_builtin_function as expectedFailure; inspect.signature() now succeeds on time.ctime because of its auto-generated __text_signature__ Assisted-by: Claude --- Lib/test/test_inspect/test_inspect.py | 2 - Lib/test/test_pdb.py | 6 +-- Lib/test/test_pydoc/test_pydoc.py | 1 - Lib/test/test_re.py | 3 -- .../test_unittest/testmock/testhelpers.py | 1 + crates/codegen/src/symboltable.rs | 9 +++- crates/host_env/src/os.rs | 21 ++++++++ crates/sre_engine/src/engine.rs | 28 ++++++++-- crates/sre_engine/tests/tests.rs | 54 ++++++++++++++++++- crates/stdlib/src/_tokenize.rs | 4 +- 10 files changed, 113 insertions(+), 16 deletions(-) diff --git a/Lib/test/test_inspect/test_inspect.py b/Lib/test/test_inspect/test_inspect.py index 37b3f2b1e..2d323300f 100644 --- a/Lib/test/test_inspect/test_inspect.py +++ b/Lib/test/test_inspect/test_inspect.py @@ -5987,7 +5987,6 @@ class TestSignaturePrivateHelpers(unittest.TestCase): self.assertEqual(computed_clean_signature, clean_signature) self.assertEqual(computed_self_parameter, self_parameter) - @unittest.expectedFailure # TODO: RUSTPYTHON; + (module, /, path, mode, *, dir_fd=None, effective_ids=False, follow_symlinks=True) def test_signature_strip_non_python_syntax(self): self._strip_non_python_syntax( "($module, /, path, mode, *, dir_fd=None, " + @@ -6318,7 +6317,6 @@ class TestSignatureDefinitions(unittest.TestCase): no_signature = {'ReferenceType', 'ref'} self._test_module_has_signatures(weakref, no_signature) - @unittest.expectedFailure # TODO: RUSTPYTHON; ValueError: <function TestSignatureDefinitions.test_python_function_override_signature.<locals>.func at 0xa4c07a580> builtin has invalid signature def test_python_function_override_signature(self): def func(*args, **kwargs): pass diff --git a/Lib/test/test_pdb.py b/Lib/test/test_pdb.py index cd1e88f54..5eea014cc 100644 --- a/Lib/test/test_pdb.py +++ b/Lib/test/test_pdb.py @@ -1290,7 +1290,7 @@ def test_post_mortem_chained(): ... except Exception as e: ... pdb._post_mortem(e, instance) - >>> with PdbTestInput([ # TODO: RUSTPYTHON # doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE +EXPECTED_FAILURE + >>> with PdbTestInput([ # TODO: RUSTPYTHON # doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE ... 'exceptions', ... 'exceptions 0', ... '$_exception', @@ -2133,7 +2133,7 @@ if not SKIP_CORO_TESTS: >>> def test_function(): ... asyncio.run(test(), loop_factory=asyncio.EventLoop) - >>> with PdbTestInput([ # TODO: RUSTPYTHON # doctest: +ELLIPSIS +EXPECTED_FAILURE + >>> with PdbTestInput([ # doctest: +ELLIPSIS ... '$_asynctask', ... 'continue', ... ]): @@ -4185,7 +4185,6 @@ def bœr(): self.assertTrue(any("__main__.py(4)<module>()" in l for l in stdout.splitlines()), stdout) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_file_modified_after_execution(self): script = """ print("hello") @@ -4259,7 +4258,6 @@ def bœr(): self.assertIn("WARNING:", stdout) self.assertIn("was edited", stdout) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_file_modified_after_execution_with_restart(self): script = """ import random diff --git a/Lib/test/test_pydoc/test_pydoc.py b/Lib/test/test_pydoc/test_pydoc.py index 5c9059614..d206e5a91 100644 --- a/Lib/test/test_pydoc/test_pydoc.py +++ b/Lib/test/test_pydoc/test_pydoc.py @@ -1708,7 +1708,6 @@ class TestDescriptions(unittest.TestCase): "classmeth(a, b=<x>) class method of " "_testcapi.DocStringUnrepresentableSignatureTest") - @unittest.expectedFailure # TODO: RUSTPYTHON def test_overridden_text_signature(self): class C: def meth(*args, **kwargs): diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py index 1c52eb0dc..1cfddb8e1 100644 --- a/Lib/test/test_re.py +++ b/Lib/test/test_re.py @@ -890,7 +890,6 @@ class ReTests(unittest.TestCase): self.checkPatternError(br'\N{LESS-THAN SIGN}', r'bad escape \N', 0) self.checkPatternError(br'[\N{LESS-THAN SIGN}]', r'bad escape \N', 1) - @unittest.expectedFailure # TODO: RUSTPYTHON; re.search(r"\B", "") now returns a match in CPython 3.14 def test_word_boundaries(self): # See http://bugs.python.org/issue10713 self.assertEqual(re.search(r"\b(abc)\b", "abc").group(1), "abc") @@ -2493,7 +2492,6 @@ class ReTests(unittest.TestCase): # With optimization -- 0.0003 seconds. self.assertLess(stopwatch.seconds, 0.1) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_possessive_quantifiers(self): """Test Possessive Quantifiers Test quantifiers of the form @+ for some repetition operator @, @@ -2647,7 +2645,6 @@ class ReTests(unittest.TestCase): self.assertEqual(re.match("(?>(?:ab?c){1,3})", "aca").span(), (0, 2)) self.assertEqual(re.match("(?:ab?c){1,3}+", "aca").span(), (0, 2)) - @unittest.expectedFailure # TODO: RUSTPYTHON; self.assertEqual(re.match('((x)|y|z){3}+', 'xyz').groups(), ('z', 'x'))\n AssertionError: Tuples differ: ('x', 'x') != ('z', 'x') def test_bug_gh101955(self): # Possessive quantifier with nested alternative with capture groups self.assertEqual(re.match('((x)|y|z)*+', 'xyz').groups(), ('z', 'x')) diff --git a/Lib/test/test_unittest/testmock/testhelpers.py b/Lib/test/test_unittest/testmock/testhelpers.py index bcae14c5b..6877e92cb 100644 --- a/Lib/test/test_unittest/testmock/testhelpers.py +++ b/Lib/test/test_unittest/testmock/testhelpers.py @@ -929,6 +929,7 @@ class SpecSignatureTest(unittest.TestCase): check_data_descriptor(foo.desc) + @unittest.expectedFailure # TODO: RUSTPYTHON; time.ctime has an auto-generated __text_signature__, so inspect.signature() succeeds instead of raising ValueError def test_autospec_on_bound_builtin_function(self): meth = types.MethodType(time.ctime, time.time()) self.assertIsInstance(meth(), str) diff --git a/crates/codegen/src/symboltable.rs b/crates/codegen/src/symboltable.rs index bafd065ef..a66410f90 100644 --- a/crates/codegen/src/symboltable.rs +++ b/crates/codegen/src/symboltable.rs @@ -3356,7 +3356,14 @@ impl SymbolTableBuilder { flags.insert(SymbolFlags::USE); } SymbolUsage::Iter => { - flags.insert(SymbolFlags::ITER | SymbolFlags::DEF_COMP_ITER); + // CPython symtable_add_def_helper() records an inlined + // comprehension target as a local definition as well as a + // comprehension iterator. Keep ITER as the internal + // re-assignment check marker; DEF_LOCAL is part of the public + // ste_symbols flags exposed by _symtable. + flags.insert( + SymbolFlags::DEF_LOCAL | SymbolFlags::ITER | SymbolFlags::DEF_COMP_ITER, + ); } SymbolUsage::TypeParam => { flags.insert(SymbolFlags::DEF_LOCAL | SymbolFlags::DEF_TYPE_PARAM); diff --git a/crates/host_env/src/os.rs b/crates/host_env/src/os.rs index e5868871e..01711687c 100644 --- a/crates/host_env/src/os.rs +++ b/crates/host_env/src/os.rs @@ -4,6 +4,10 @@ use crate::crt_fd; #[cfg(windows)] use crate::fs; +#[cfg(windows)] +pub use crate::posix::rename; +#[cfg(any(unix, target_os = "wasi"))] +pub use crate::posix_unix_like::rename; #[cfg(any(unix, windows))] use core::ffi::CStr; use core::str::Utf8Error; @@ -28,6 +32,23 @@ use { }, }; +#[cfg(not(any(unix, windows, target_os = "wasi")))] +pub fn rename( + from: impl AsRef<std::path::Path>, + from_fd: Option<crt_fd::Borrowed<'_>>, + to: impl AsRef<std::path::Path>, + to_fd: Option<crt_fd::Borrowed<'_>>, +) -> io::Result<()> { + if from_fd.is_none() && to_fd.is_none() { + std::fs::rename(from, to) + } else { + Err(io::Error::new( + io::ErrorKind::Unsupported, + "renameat is not available on this platform", + )) + } +} + /// Convert exit code to std::process::ExitCode /// /// On Windows, this supports the full u32 range including STATUS_CONTROL_C_EXIT (0xC000013A). diff --git a/crates/sre_engine/src/engine.rs b/crates/sre_engine/src/engine.rs index a91ea3455..a110a75d6 100644 --- a/crates/sre_engine/src/engine.rs +++ b/crates/sre_engine/src/engine.rs @@ -110,6 +110,21 @@ impl Marks { self.marks_stack.pop(); } + fn stack_depth(&self) -> usize { + self.marks_stack.len() + } + + fn discard_to(&mut self, depth: usize) { + self.marks_stack.truncate(depth); + } + + fn restore_to(&mut self, depth: usize) { + let (marks, last_index) = self.marks_stack[depth].clone(); + self.marks = marks; + self.last_index = last_index; + self.marks_stack.truncate(depth); + } + fn clear(&mut self) { self.last_index = -1; self.marks.clear(); @@ -144,6 +159,7 @@ impl State { jump: Jump::OpCode, repeat_ctx_id: usize::MAX, count: -1, + marks_stack_base: usize::MAX, }; _match(req, self, ctx) } @@ -165,6 +181,7 @@ impl State { jump: Jump::OpCode, repeat_ctx_id: usize::MAX, count: -1, + marks_stack_base: usize::MAX, }; if ctx.peek_code(&req, 0) == SreOpcode::INFO as u32 { @@ -483,6 +500,7 @@ fn _match<S: StrDrive>(req: &Request<'_, S>, state: &mut State, mut ctx: MatchCo } Jump::PossessiveRepeat2 => { if popped_result { + ctx.cursor = state.cursor; ctx.count += 1; ctx.jump = Jump::PossessiveRepeat1; continue 'context; @@ -495,6 +513,7 @@ fn _match<S: StrDrive>(req: &Request<'_, S>, state: &mut State, mut ctx: MatchCo if ((ctx.count as usize) < max_count || max_count == MAXREPEAT) && ctx.cursor.position != state.cursor.position { + ctx.marks_stack_base = state.marks.stack_depth(); state.marks.push(); ctx.cursor = state.cursor; let mut next = ctx.next_offset(4, Jump::PossessiveRepeat4); @@ -507,12 +526,12 @@ fn _match<S: StrDrive>(req: &Request<'_, S>, state: &mut State, mut ctx: MatchCo } Jump::PossessiveRepeat4 => { if popped_result { - state.marks.pop_discard(); + state.marks.discard_to(ctx.marks_stack_base); ctx.count += 1; ctx.jump = Jump::PossessiveRepeat3; continue 'context; } - state.marks.pop(); + state.marks.restore_to(ctx.marks_stack_base); state.cursor = ctx.cursor; ctx.skip_code_from(req, 1); ctx.skip_code(1); @@ -1057,6 +1076,7 @@ struct MatchContext { jump: Jump, repeat_ctx_id: usize, count: isize, + marks_stack_base: usize, } impl MatchContext { @@ -1147,7 +1167,9 @@ impl MatchContext { mut word_checker: F, ) -> bool { if self.at_beginning() && self.at_end(req) { - return false; + // Python 3.14 changed `\B` to match an empty input. Keep the + // boundary predicate false there, but its negation true. + return true; } let that = !self.at_beginning() && word_checker(self.back_peek_char::<S>()); let this = !self.at_end(req) && word_checker(self.peek_char::<S>()); diff --git a/crates/sre_engine/tests/tests.rs b/crates/sre_engine/tests/tests.rs index f1edb64cd..53f5225d4 100644 --- a/crates/sre_engine/tests/tests.rs +++ b/crates/sre_engine/tests/tests.rs @@ -2,6 +2,7 @@ #[cfg(test)] mod tests { use rustpython_sre_engine::{Request, State, StrDrive}; + use rustpython_wtf8::Wtf8Buf; struct Pattern { #[expect(unused, reason = "Needed for automated script")] @@ -44,7 +45,7 @@ mod tests { #[rustfmt::skip] let big_b = Pattern { pattern: "\\B", code: &[14, 4, 0, 0, 0, 6, 11, 1] }; // END GENERATED let (req, mut state) = big_b.state(""); - assert!(!state.search(req)); + assert!(state.search(req)); } #[test] @@ -169,6 +170,40 @@ mod tests { assert!(!state.py_match(&req)); } + #[test] + fn possessive_repeat_keeps_last_capture() { + use optional::Optioned; + + let single_code = &[17, 0, 24, 6, 0, 1, 16, 101, 1, 17, 1, 1]; + let req = Request::new("eeea", 3, usize::MAX, single_code, false); + let mut single_state = State::default(); + assert!(single_state.py_match(&req)); + assert_eq!( + single_state.marks.get(0), + (Optioned::some(3), Optioned::some(3)) + ); + + // (e?){2,4}+a: the fourth successful iteration is empty, so group 1 + // must retain its final empty span rather than the previous "e". + #[rustfmt::skip] let optional = Pattern { + pattern: "(e?){2,4}+a", + code: &[14, 4, 0, 1, 5, 28, 14, 2, 4, 17, 0, 24, 6, 0, 1, 16, 101, 1, 17, 1, 1, 16, 97, 1], + }; + let (req, mut state) = optional.state("eeea"); + assert!(state.py_match(&req)); + assert_eq!(state.marks.get(0), (Optioned::some(3), Optioned::some(3))); + + // ((x)|y|z){3}+: group 1 is the final "z"; group 2 retains "x". + #[rustfmt::skip] let alternation = Pattern { + pattern: "((x)|y|z){3}+", + code: &[14, 4, 0, 3, 3, 28, 28, 3, 3, 17, 0, 7, 9, 17, 2, 16, 120, 17, 3, 15, 12, 5, 16, 121, 15, 7, 5, 16, 122, 15, 2, 0, 17, 1, 1, 1], + }; + let (req, mut state) = alternation.state("xyz"); + assert!(state.py_match(&req)); + assert_eq!(state.marks.get(0), (Optioned::some(2), Optioned::some(3))); + assert_eq!(state.marks.get(1), (Optioned::some(0), Optioned::some(1))); + } + #[test] fn bug_20998() { // pattern p = re.compile('[a-c]+', re.I) @@ -181,6 +216,23 @@ mod tests { assert_eq!(state.cursor.position, 3); } + #[test] + fn ascii_ignore_keeps_nonascii_range_literal() { + // pattern p = re.compile(r'[\u0430-\u045f]', re.I | re.A) + // + // ASCII-only case folding must not discard an exact non-ASCII range: + // U+0450 lies in the compiled U+0430..U+045F interval. + #[rustfmt::skip] let p = Pattern { + pattern: "[\\u0430-\\u045f]", + code: &[14, 8, 4, 1, 1, 22, 1072, 1119, 0, 13, 5, 22, 1072, 1119, 0, 1], + }; + let (req, mut state) = p.state("\u{0450}"); + assert!(state.py_match(&req)); + let subject = Wtf8Buf::from("\u{0450}"); + let (req, mut state) = p.state(subject.as_ref()); + assert!(state.py_match(&req)); + } + #[test] fn bigcharset() { // pattern p = re.compile('[a-z]*', re.I) diff --git a/crates/stdlib/src/_tokenize.rs b/crates/stdlib/src/_tokenize.rs index 7106c5270..c071a2b62 100644 --- a/crates/stdlib/src/_tokenize.rs +++ b/crates/stdlib/src/_tokenize.rs @@ -237,7 +237,9 @@ mod _tokenize { } let raw_type = token_kind_value(kind); - let token_type = if extra_tokens && raw_type > TOKEN_DEDENT && raw_type < TOKEN_OP { + let token_type = if extra_tokens + && (kind == TokenKind::Unknown || (raw_type > TOKEN_DEDENT && raw_type < TOKEN_OP)) + { TOKEN_OP } else { raw_type From 7c6e7dc29e61600e5a059bca555438a2980a64ae Mon Sep 17 00:00:00 2001 From: Seonghun An <53287605+shAn-kor@users.noreply.github.com> Date: Wed, 29 Jul 2026 20:27:59 +0900 Subject: [PATCH 317/339] Fix zero padding for string format specs (#8407) * Fix zero padding for string format specs Assisted-by: Codex:gpt-5 * Add string alignment format regression test Assisted-by: Codex:gpt-5 --- Lib/test/test_str.py | 2 +- crates/common/src/format.rs | 49 +++++++++++++++++++++++++- crates/vm/src/format.rs | 3 ++ extra_tests/snippets/builtin_format.py | 8 +++++ 4 files changed, 60 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_str.py b/Lib/test/test_str.py index 513556428..2a3c36f2e 100644 --- a/Lib/test/test_str.py +++ b/Lib/test/test_str.py @@ -1070,7 +1070,7 @@ class StrTest(string_tests.StringLikeTest, '\U00100000'.ljust(3, '\U00010000') '\U00100000'.rjust(3, '\U00010000') - @unittest.expectedFailure # TODO: RUSTPYTHON; '{0:08s}'.format('result') misalign — '0' fill treated as numeric zero-pad for str type + @unittest.expectedFailure # TODO: RUSTPYTHON; '{0.}'.format() raises ValueError instead of IndexError def test_format(self): self.assertEqual(''.format(), '') self.assertEqual('a'.format(), 'a') diff --git a/crates/common/src/format.rs b/crates/common/src/format.rs index 4218dca7b..fa71b27c5 100644 --- a/crates/common/src/format.rs +++ b/crates/common/src/format.rs @@ -227,6 +227,7 @@ pub struct FormatSpec { conversion: Option<FormatConversion>, fill: Option<CodePoint>, align: Option<FormatAlign>, + align_specified: bool, sign: Option<FormatSign>, alternate_form: bool, width: Option<usize>, @@ -346,6 +347,7 @@ impl FormatSpec { // get_integer in CPython let (conversion, text) = FormatConversion::parse(text); let (mut fill, mut align, text) = parse_fill_and_align(text); + let align_specified = align.is_some(); let (sign, text) = FormatSign::parse(text); let (alternate_form, text) = parse_alternate_form(text); let (zero, text) = parse_zero(text); @@ -374,6 +376,7 @@ impl FormatSpec { conversion, fill, align, + align_specified, sign, alternate_form, width, @@ -1020,13 +1023,24 @@ impl FormatSpec { self.validate_format(FormatType::String)?; match self.format_type { Some(FormatType::String) | None => { + if self.align == Some(FormatAlign::AfterSign) && self.align_specified { + return Err(FormatSpecError::StringAlignmentFlag); + } // CPython parity: precision truncates BEFORE width pads. // `'{:3.2s}'.format('abc')` -> 'ab ' (truncate to 'ab', pad to 3). let truncated: String = match self.precision { Some(p) => s.deref().chars().take(p).collect(), None => s.deref().to_owned(), }; - Ok(self.format_sign_and_align(&truncated, "", FormatAlign::Left)) + let spec = Self { + align: if self.align == Some(FormatAlign::AfterSign) { + Some(FormatAlign::Left) + } else { + self.align + }, + ..*self + }; + Ok(spec.format_sign_and_align(&truncated, "", FormatAlign::Left)) } _ => { let ch = char::from(self.format_type.as_ref().unwrap()); @@ -1260,6 +1274,7 @@ pub enum FormatSpecError { CodeNotInRange, ZeroPadding, AlignmentFlag, + StringAlignmentFlag, NotImplemented(char, &'static str), } @@ -1609,6 +1624,7 @@ mod tests { conversion: None, fill: None, align: None, + align_specified: false, sign: None, alternate_form: false, width: Some(33), @@ -1626,6 +1642,7 @@ mod tests { conversion: None, fill: Some('<'.into()), align: Some(FormatAlign::Right), + align_specified: true, sign: None, alternate_form: false, width: Some(33), @@ -1643,6 +1660,7 @@ mod tests { conversion: None, fill: Some('<'.into()), align: Some(FormatAlign::Right), + align_specified: true, sign: Some(FormatSign::Minus), alternate_form: true, width: Some(23), @@ -1690,6 +1708,35 @@ mod tests { assert_eq!(format_bool("%", false), Ok("0.000000%".to_owned())); } + #[test] + fn format_string_zero_padding_uses_left_alignment() { + let spec = FormatSpec::parse("08s").unwrap(); + let value = "result".to_owned(); + + assert_eq!(spec.format_string(&value), Ok("result00".to_owned())); + } + + #[test] + fn format_string_explicit_after_sign_alignment_is_invalid() { + let spec = FormatSpec::parse("=8s").unwrap(); + let value = "result".to_owned(); + + assert_eq!( + spec.format_string(&value), + Err(FormatSpecError::StringAlignmentFlag) + ); + } + + #[test] + fn format_int_zero_padding_stays_after_sign() { + let spec = FormatSpec::parse("08").unwrap(); + + assert_eq!( + spec.format_int(&BigInt::from(-42)), + Ok("-0000042".to_owned()) + ); + } + #[test] fn format_int() { assert_eq!( diff --git a/crates/vm/src/format.rs b/crates/vm/src/format.rs index 2f4652dcc..80b906505 100644 --- a/crates/vm/src/format.rs +++ b/crates/vm/src/format.rs @@ -77,6 +77,9 @@ impl IntoPyException for FormatSpecError { Self::AlignmentFlag => { vm.new_value_error("'=' alignment flag is not allowed in complex format specifier") } + Self::StringAlignmentFlag => { + vm.new_value_error("'=' alignment not allowed in string format specifier") + } Self::NotImplemented(c, s) => { let msg = format!("Format code '{c}' for object of type '{s}' not implemented yet"); vm.new_value_error(msg) diff --git a/extra_tests/snippets/builtin_format.py b/extra_tests/snippets/builtin_format.py index 250d8ad6c..c2e2a8974 100644 --- a/extra_tests/snippets/builtin_format.py +++ b/extra_tests/snippets/builtin_format.py @@ -24,6 +24,14 @@ def test_zero_padding(): test_zero_padding() +try: + format("result", "=8s") +except ValueError as error: + if str(error) != "'=' alignment not allowed in string format specifier": + raise AssertionError(f"unexpected error message: {error}") from error +else: + raise AssertionError("expected ValueError for '=8s' string format specifier") + assert "{:,}".format(100) == "100" assert "{:,}".format(1024) == "1,024" assert "{:_}".format(65536) == "65_536" From a49e8f9b5fa037f6ebd06befe96e54e7b0b31c9f Mon Sep 17 00:00:00 2001 From: Kwak Byoung Min <67214970+doma17@users.noreply.github.com> Date: Wed, 29 Jul 2026 20:28:32 +0900 Subject: [PATCH 318/339] Add seekable() to mmap.mmap (#8405) * Allow mmap-backed readers to identify seek support mmap already supports seek() and tell(); expose seekable() to match CPython. Confidence: high Scope-risk: narrow Tested: test_mmap, stdlib_mmap snippet, clippy, prek, extra_tests Not-tested: full workspace test blocked by local rustpython-capi SIGSEGV Assisted-by: Codex:gpt-5.6-sol * Keep mmap regression test lint-clean CI ruff check removes the redundant blank line and treats the auto-fix as a failure. Constraint: CI runs prek with ruff check Confidence: high Scope-risk: narrow Tested: prek run --all-files; cargo run -- extra_tests/snippets/stdlib_mmap.py Assisted-by: Codex:gpt-5.6-sol * Keep mmap seekability method conventional The method is invoked at runtime through the Python wrapper, so const qualification provides no benefit. Constraint: Python methods execute at runtime Confidence: high Scope-risk: narrow Tested: prek run --all-files; cargo run -- extra_tests/snippets/stdlib_mmap.py Assisted-by: Codex:gpt-5.6-sol --- crates/stdlib/src/mmap.rs | 5 +++++ extra_tests/snippets/stdlib_mmap.py | 6 ++++++ 2 files changed, 11 insertions(+) create mode 100644 extra_tests/snippets/stdlib_mmap.py diff --git a/crates/stdlib/src/mmap.rs b/crates/stdlib/src/mmap.rs index 2a07cf7d8..312d35a4e 100644 --- a/crates/stdlib/src/mmap.rs +++ b/crates/stdlib/src/mmap.rs @@ -1141,6 +1141,11 @@ mod mmap { self.pos() } + #[pymethod] + fn seekable(&self) -> bool { + true + } + #[pymethod] fn write(&self, bytes: ArgBytesLike, vm: &VirtualMachine) -> PyResult<PyIntRef> { let pos = self.pos(); diff --git a/extra_tests/snippets/stdlib_mmap.py b/extra_tests/snippets/stdlib_mmap.py new file mode 100644 index 000000000..3a2b139a3 --- /dev/null +++ b/extra_tests/snippets/stdlib_mmap.py @@ -0,0 +1,6 @@ +import mmap + +mapped = mmap.mmap(-1, 1) +assert mapped.seekable() +mapped.close() +assert mapped.seekable() From bae642c1962eb941aee041fd60a3ec1381a78ea0 Mon Sep 17 00:00:00 2001 From: Joshua Megnauth <48846352+joshuamegnauth54@users.noreply.github.com> Date: Wed, 29 Jul 2026 07:32:09 -0400 Subject: [PATCH 319/339] host_env: Fix wcslen, leverage NonNull<T> more (#8386) `strlen` was both unused and unneeded. Rust's `CStr` handles the length for us without needing to call into `libc` manually or implementing our own version of `strlen`. Our `strlen` implemented a fallback that incremented and dereferenced a pointer to check for NUL. This is slower than what `libc` usually does. For example, `musl` operates on words instead of individual bytes. This implementation also caused UB if the caller passed in a null pointer. `wcslen` is similar. The currently implementation can cause UB for null pointers. It's also slow from the same reason mentioned above. Luckily, the widestring crate can handle this for us. The crate panics on null pointers, so using it was a good excuse to use NonNull in more places. --- crates/host_env/Cargo.toml | 2 +- crates/host_env/src/ctypes.rs | 76 +++++++------------- crates/host_env/src/wmi.rs | 96 +++++++++++++------------ crates/vm/src/stdlib/_ctypes/pointer.rs | 11 ++- 4 files changed, 80 insertions(+), 105 deletions(-) diff --git a/crates/host_env/Cargo.toml b/crates/host_env/Cargo.toml index 128afc592..e26fdeafe 100644 --- a/crates/host_env/Cargo.toml +++ b/crates/host_env/Cargo.toml @@ -17,6 +17,7 @@ libc = { workspace = true } num-traits = { workspace = true } parking_lot = { workspace = true } paste = { workspace = true } +widestring = { workspace = true } [target.'cfg(unix)'.dependencies] nix = { workspace = true } @@ -54,7 +55,6 @@ system-configuration = { workspace = true } memchr.workspace = true junction = { workspace = true } schannel = { workspace = true } -widestring = { workspace = true } windows-sys = { workspace = true, features = [ "Win32_Foundation", "Win32_Globalization", diff --git a/crates/host_env/src/ctypes.rs b/crates/host_env/src/ctypes.rs index bbb3e4afe..a038e7a6d 100644 --- a/crates/host_env/src/ctypes.rs +++ b/crates/host_env/src/ctypes.rs @@ -3,6 +3,7 @@ use core::ffi::{ CStr, c_char, c_double, c_float, c_int, c_long, c_longlong, c_schar, c_short, c_uchar, c_uint, c_ulong, c_ulonglong, c_ushort, c_void, }; +use core::ptr::NonNull; #[cfg(all( any( target_os = "linux", @@ -36,6 +37,7 @@ use rustpython_wtf8::Wtf8; use rustpython_wtf8::Wtf8Buf; #[cfg(any(unix, windows))] use std::{collections::HashMap, ffi::OsStr, sync::OnceLock}; +use widestring::WideCStr; #[cfg(all( any( @@ -392,33 +394,11 @@ pub fn dyld_shared_cache_contains_path(path: &str) -> Result<bool, alloc::ffi::N Ok(unsafe { _dyld_shared_cache_contains_path(c_path.as_ptr()) }) } -/// # Safety -/// -/// `ptr` must be valid to read until the first NUL byte. -pub unsafe fn strlen(ptr: *const c_char) -> usize { - #[cfg(any(unix, windows, target_os = "wasi"))] - { - unsafe { libc::strlen(ptr) } - } - #[cfg(not(any(unix, windows, target_os = "wasi")))] - { - let mut len = 0; - while unsafe { *ptr.add(len) } != 0 { - len += 1; - } - len - } -} - /// # Safety /// /// `ptr` must be valid to read until the first NUL wide character. -pub unsafe fn wcslen(ptr: *const WChar) -> usize { - let mut len = 0; - while unsafe { *ptr.add(len) } != 0 as WChar { - len += 1; - } - len +pub unsafe fn wcslen(ptr: NonNull<WChar>) -> usize { + unsafe { WideCStr::from_ptr_str(ptr.as_ptr().cast()).len() } } /// # Safety @@ -1309,10 +1289,10 @@ pub unsafe fn callback_arg_value(type_code: Option<&str>, ptr: *const c_void) -> } Some("Z") => { let wstr_ptr = unsafe { *(ptr as *const *const WChar) }; - if wstr_ptr.is_null() { - DecodedValue::None - } else { + if let Some(wstr_ptr) = NonNull::new(wstr_ptr.cast_mut()) { DecodedValue::String(unsafe { read_wide_string(wstr_ptr) }.to_string()) + } else { + DecodedValue::None } } Some("P") => DecodedValue::Pointer(unsafe { *(ptr as *const usize) }), @@ -2272,8 +2252,7 @@ pub unsafe fn borrowed_slice_as_mut(slice: &[u8]) -> &mut [u8] { pub fn wide_chars_to_wtf8(wchars: &[WChar]) -> Wtf8Buf { #[cfg(windows)] { - let wide: Vec<u16> = wchars.to_vec(); - Wtf8Buf::from_wide(&wide) + Wtf8Buf::from_wide(wchars) } #[cfg(not(windows))] { @@ -2292,10 +2271,10 @@ pub fn wide_chars_to_wtf8(wchars: &[WChar]) -> Wtf8Buf { /// # Safety /// /// `ptr` must be a valid NUL-terminated wide C string. -pub unsafe fn read_wide_string(ptr: *const WChar) -> Wtf8Buf { - let len = unsafe { wcslen(ptr) }; - let wchars = unsafe { core::slice::from_raw_parts(ptr, len) }; - wide_chars_to_wtf8(wchars) +pub unsafe fn read_wide_string(ptr: NonNull<WChar>) -> Wtf8Buf { + // SAFETY: WideCStr does not assume an encoding. + let wchars = unsafe { WideCStr::from_ptr_str(ptr.as_ptr().cast()) }; + Wtf8Buf::from_string(wchars.to_string_lossy()) } /// # Safety @@ -2313,18 +2292,15 @@ pub unsafe fn read_c_string_from_address(addr: usize) -> Option<Vec<u8>> { /// /// `addr` must either be zero or a valid NUL-terminated wide C string pointer. pub unsafe fn read_wide_string_from_address(addr: usize) -> Option<Wtf8Buf> { - if addr == 0 { - None - } else { - Some(unsafe { read_wide_string(addr as *const WChar) }) - } + let ptr = NonNull::new(addr as *mut WChar)?; + Some(unsafe { read_wide_string(ptr) }) } /// # Safety /// /// `ptr` must point to `len` readable wide characters. -pub unsafe fn read_wide_string_with_len(ptr: *const WChar, len: usize) -> Wtf8Buf { - let wchars = unsafe { core::slice::from_raw_parts(ptr, len) }; +pub unsafe fn read_wide_string_with_len(ptr: NonNull<WChar>, len: usize) -> Wtf8Buf { + let wchars = unsafe { core::slice::from_raw_parts(ptr.as_ptr(), len) }; wide_chars_to_wtf8(wchars) } @@ -2348,13 +2324,12 @@ pub fn string_at(ptr: usize, size: isize) -> Result<Vec<u8>, StringAtError> { } pub fn wstring_at(ptr: usize, size: isize) -> Result<Wtf8Buf, StringAtError> { - if ptr == 0 { + let Some(ptr) = NonNull::new(ptr as *mut WChar) else { return Err(StringAtError::NullPointer); - } - let w_ptr = ptr as *const WChar; + }; if size < 0 { // SAFETY: caller passed a non-null NUL-terminated wide string pointer. - return Ok(unsafe { read_wide_string(w_ptr) }); + return Ok(unsafe { read_wide_string(ptr) }); } let len = { let size_usize = size as usize; @@ -2364,7 +2339,7 @@ pub fn wstring_at(ptr: usize, size: isize) -> Result<Wtf8Buf, StringAtError> { size_usize }; // SAFETY: caller requested exactly `len` readable wide characters from non-null pointer. - Ok(unsafe { read_wide_string_with_len(w_ptr, len) }) + Ok(unsafe { read_wide_string_with_len(ptr, len) }) } /// # Safety @@ -2414,14 +2389,14 @@ pub unsafe fn read_pointer_char_slice( /// # Safety /// /// `start` must be valid to read `len` wide characters following `step`. -pub unsafe fn read_wide_string_strided(start: *const WChar, len: usize, step: isize) -> Wtf8Buf { +pub unsafe fn read_wide_string_strided(start: NonNull<WChar>, len: usize, step: isize) -> Wtf8Buf { if step == 1 { return unsafe { read_wide_string_with_len(start, len) }; } let mut wchars = Vec::with_capacity(len); let mut cur = start; for _ in 0..len { - wchars.push(unsafe { *cur }); + wchars.push(unsafe { cur.read() }); cur = unsafe { cur.offset(step) }; } wide_chars_to_wtf8(&wchars) @@ -2436,10 +2411,9 @@ pub unsafe fn read_pointer_wchar_slice( start: isize, len: usize, step: isize, -) -> Wtf8Buf { - let wchar_size = core::mem::size_of::<WChar>(); - let start_addr = (ptr_value as isize + start * wchar_size as isize) as *const WChar; - unsafe { read_wide_string_strided(start_addr, len, step) } +) -> Option<Wtf8Buf> { + let start_addr = unsafe { NonNull::new(ptr_value as *mut WChar)?.offset(start) }; + Some(unsafe { read_wide_string_strided(start_addr, len, step) }) } /// # Safety diff --git a/crates/host_env/src/wmi.rs b/crates/host_env/src/wmi.rs index a6d77f77e..592ffd1dc 100644 --- a/crates/host_env/src/wmi.rs +++ b/crates/host_env/src/wmi.rs @@ -6,7 +6,7 @@ #![allow(unsafe_op_in_unsafe_fn)] use core::ffi::c_void; -use core::ptr::{null, null_mut}; +use core::ptr::{NonNull, null, null_mut}; use windows_sys::Win32::Foundation::{ CloseHandle, ERROR_BROKEN_PIPE, ERROR_MORE_DATA, ERROR_NOT_ENOUGH_MEMORY, GetLastError, HANDLE, WAIT_OBJECT_0, WAIT_TIMEOUT, @@ -17,6 +17,8 @@ use windows_sys::Win32::System::Threading::{ CreateEventW, CreateThread, GetExitCodeThread, SetEvent, WaitForSingleObject, }; +use crate::ctypes::wcslen; + pub const BUFFER_SIZE: usize = 8192; pub enum ExecQueryError { @@ -238,7 +240,7 @@ unsafe fn object_end_enumeration(this: *mut c_void) -> HRESULT { method(this) } -fn hresult_from_win32(err: u32) -> HRESULT { +const fn hresult_from_win32(err: u32) -> HRESULT { if err == 0 { 0 } else { @@ -246,11 +248,11 @@ fn hresult_from_win32(err: u32) -> HRESULT { } } -fn succeeded(hr: HRESULT) -> bool { +const fn succeeded(hr: HRESULT) -> bool { hr >= 0 } -fn failed(hr: HRESULT) -> bool { +const fn failed(hr: HRESULT) -> bool { hr < 0 } @@ -258,14 +260,6 @@ fn wide_str(s: &str) -> Vec<u16> { s.encode_utf16().chain(core::iter::once(0)).collect() } -unsafe fn wcslen(s: *const u16) -> usize { - let mut len = 0; - while unsafe { *s.add(len) } != 0 { - len += 1; - } - len -} - unsafe fn wait_event(event: HANDLE, timeout: u32) -> u32 { match unsafe { WaitForSingleObject(event, timeout) } { WAIT_OBJECT_0 => 0, @@ -471,16 +465,25 @@ unsafe fn query_thread_impl(param: *mut c_void) -> u32 { } if succeeded(hr) && (flavor & WBEM_FLAVOR_MASK_ORIGIN) != WBEM_FLAVOR_ORIGIN_SYSTEM { + let Some(cb_str1) = NonNull::new(prop_name) + .map(|prop_name| (unsafe { wcslen(prop_name) } * 2) as u32) + else { + unsafe { + SysFreeString(prop_name); + } + break; + }; + let mut prop_str = [0u16; BUFFER_SIZE]; hr = unsafe { VariantToString(&prop_value, prop_str.as_mut_ptr(), BUFFER_SIZE as u32) }; + let cb_str2 = NonNull::new(prop_str.as_ptr().cast_mut()) + .map(|prop_str| (unsafe { wcslen(prop_str) } * 2) as u32) + .expect("prop_str is never null"); - if succeeded(hr) { - let cb_str1 = (unsafe { wcslen(prop_name) } * 2) as u32; - let cb_str2 = (unsafe { wcslen(prop_str.as_ptr()) } * 2) as u32; - - if unsafe { + if succeeded(hr) + && unsafe { WriteFile( write_pipe, prop_name as *const _, @@ -489,36 +492,35 @@ unsafe fn query_thread_impl(param: *mut c_void) -> u32 { null_mut(), ) } == 0 - || unsafe { - WriteFile( - write_pipe, - &eq_sign as *const u16 as *const _, - 2, - &mut written, - null_mut(), - ) - } == 0 - || unsafe { - WriteFile( - write_pipe, - prop_str.as_ptr() as *const _, - cb_str2, - &mut written, - null_mut(), - ) - } == 0 - || unsafe { - WriteFile( - write_pipe, - &null_sep as *const u16 as *const _, - 2, - &mut written, - null_mut(), - ) - } == 0 - { - hr = hresult_from_win32(unsafe { GetLastError() }); - } + || unsafe { + WriteFile( + write_pipe, + &eq_sign as *const u16 as *const _, + 2, + &mut written, + null_mut(), + ) + } == 0 + || unsafe { + WriteFile( + write_pipe, + prop_str.as_ptr() as *const _, + cb_str2, + &mut written, + null_mut(), + ) + } == 0 + || unsafe { + WriteFile( + write_pipe, + &null_sep as *const u16 as *const _, + 2, + &mut written, + null_mut(), + ) + } == 0 + { + hr = hresult_from_win32(unsafe { GetLastError() }); } unsafe { diff --git a/crates/vm/src/stdlib/_ctypes/pointer.rs b/crates/vm/src/stdlib/_ctypes/pointer.rs index 36d86282e..f522e6dfb 100644 --- a/crates/vm/src/stdlib/_ctypes/pointer.rs +++ b/crates/vm/src/stdlib/_ctypes/pointer.rs @@ -524,13 +524,12 @@ impl PyCPointer { // c_wchar → str if type_code.as_deref() == Some("u") { - if len == 0 { - return Ok(vm.ctx.new_str("").into()); + if len > 0 + && let Some(s) = unsafe { read_pointer_wchar_slice(ptr_value, start, len, step) } + { + return Ok(vm.ctx.new_str(s).into()); } - return Ok(vm - .ctx - .new_str(unsafe { read_pointer_wchar_slice(ptr_value, start, len, step) }) - .into()); + return Ok(vm.ctx.new_str("").into()); } // other types → list with Pointer_item for each From 71a406898c4b77e6ce70bfa54454bbf87367405a Mon Sep 17 00:00:00 2001 From: Jiwoo Ahn <ikwydls1314@gmail.com> Date: Wed, 29 Jul 2026 20:33:32 +0900 Subject: [PATCH 320/339] wasi: support monotonic / perf time (#8385) Assisted-by: Codex:GPT-5.6 Sol Signed-off-by: Jiwoo Ahn <ikwydls1314@gmail.com> --- .github/workflows/ci.yaml | 4 +- crates/host_env/src/time.rs | 23 ++++++- crates/vm/src/stdlib/time.rs | 23 +++++-- extra_tests/snippets/stdlib_time.py | 97 +++++++++++++++++++---------- 4 files changed, 107 insertions(+), 40 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a2498abf1..10541d1b6 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -801,7 +801,9 @@ jobs: - name: build rustpython run: cargo build --profile wasm-release --target wasm32-wasip1 --no-default-features --features freeze-stdlib,stdlib,stdio,importlib,host_env --verbose - name: run snippets - run: wasmer run --dir "$(pwd)" target/wasm32-wasip1/wasm-release/rustpython.wasm -- "$(pwd)/extra_tests/snippets/stdlib_random.py" + run: | + wasmer run --dir "$(pwd)" target/wasm32-wasip1/wasm-release/rustpython.wasm -- "$(pwd)/extra_tests/snippets/stdlib_random.py" + wasmer run --dir "$(pwd)" target/wasm32-wasip1/wasm-release/rustpython.wasm -- "$(pwd)/extra_tests/snippets/stdlib_time.py" - name: run cpython unittest run: wasmer run --dir "$(pwd)" target/wasm32-wasip1/wasm-release/rustpython.wasm -- "$(pwd)/Lib/test/test_int.py" diff --git a/crates/host_env/src/time.rs b/crates/host_env/src/time.rs index 451e48840..cc0b7d30c 100644 --- a/crates/host_env/src/time.rs +++ b/crates/host_env/src/time.rs @@ -227,11 +227,13 @@ pub fn process_times() -> std::io::Result<ProcessTimes> { }) } -#[cfg(unix)] -#[derive(Copy, Clone, Debug, Eq, PartialEq)] +#[cfg(any(unix, target_os = "wasi"))] +#[derive(Copy, Clone, Debug)] +// WASI libc represents clockid_t as an opaque pointer type without Eq or PartialEq. +#[cfg_attr(unix, derive(Eq, PartialEq))] pub struct ClockId(libc::clockid_t); -#[cfg(unix)] +#[cfg(any(unix, target_os = "wasi"))] impl ClockId { pub const fn from_raw(raw: libc::clockid_t) -> Self { Self(raw) @@ -259,6 +261,7 @@ impl ClockId { target_os = "solaris", target_os = "openbsd", target_os = "redox", + target_os = "wasi", )))] pub const CLOCK_THREAD_CPUTIME_ID: Self = Self(libc::CLOCK_THREAD_CPUTIME_ID); } @@ -275,6 +278,20 @@ pub fn clock_gettime(id: ClockId) -> std::io::Result<Duration> { .map_err(std::io::Error::from) } +#[cfg(target_os = "wasi")] +pub fn clock_gettime(id: ClockId) -> std::io::Result<Duration> { + let mut ts = core::mem::MaybeUninit::<libc::timespec>::uninit(); + + let ret = unsafe { libc::clock_gettime(id.as_raw(), ts.as_mut_ptr()) }; + if ret != 0 { + return Err(std::io::Error::last_os_error()); + } + + let ts = unsafe { ts.assume_init() }; + + Ok(Duration::new(ts.tv_sec as u64, ts.tv_nsec as u32)) +} + #[cfg(all(unix, not(target_os = "redox")))] pub fn clock_getres(id: ClockId) -> std::io::Result<Duration> { nix::time::clock_getres(nix_clock_id(id)) diff --git a/crates/vm/src/stdlib/time.rs b/crates/vm/src/stdlib/time.rs index aaac706bf..4c9fd70c4 100644 --- a/crates/vm/src/stdlib/time.rs +++ b/crates/vm/src/stdlib/time.rs @@ -31,6 +31,8 @@ mod decl { naive::{NaiveDate, NaiveDateTime, NaiveTime}, }; use core::time::Duration; + #[cfg(target_os = "wasi")] + use rustpython_host_env::time::ClockId; #[cfg(any(unix, windows))] use rustpython_host_env::time::asctime_from_tm; use rustpython_host_env::time::{self as host_time}; @@ -60,14 +62,27 @@ mod decl { #[pyattr] pub const _STRUCT_TM_ITEMS: usize = 11; - // TODO: implement proper monotonic time for wasm/wasi. - #[cfg(not(any(unix, windows)))] + #[cfg(target_os = "wasi")] + fn get_clock_time(id: ClockId, vm: &VirtualMachine) -> PyResult<Duration> { + host_time::clock_gettime(id).map_err(|err| vm.new_os_error(err.to_string())) + } + + #[cfg(target_os = "wasi")] + fn get_monotonic_time(vm: &VirtualMachine) -> PyResult<Duration> { + get_clock_time(ClockId::CLOCK_MONOTONIC, vm) + } + + #[cfg(target_os = "wasi")] + fn get_perf_time(vm: &VirtualMachine) -> PyResult<Duration> { + get_clock_time(ClockId::CLOCK_MONOTONIC, vm) + } + + #[cfg(not(any(unix, windows, target_os = "wasi")))] fn get_monotonic_time(vm: &VirtualMachine) -> PyResult<Duration> { duration_since_system_now(vm) } - // TODO: implement proper perf time for wasm/wasi. - #[cfg(not(any(unix, windows)))] + #[cfg(not(any(unix, windows, target_os = "wasi")))] fn get_perf_time(vm: &VirtualMachine) -> PyResult<Duration> { duration_since_system_now(vm) } diff --git a/extra_tests/snippets/stdlib_time.py b/extra_tests/snippets/stdlib_time.py index 1629443a9..68ceab895 100644 --- a/extra_tests/snippets/stdlib_time.py +++ b/extra_tests/snippets/stdlib_time.py @@ -1,3 +1,4 @@ +import sys import time x = time.gmtime(1000) @@ -11,41 +12,73 @@ s = time.strftime("%Y-%m-%d-%H-%M-%S", x) # print(s) assert s == "1970-01-01-00-16-40" -x2 = time.strptime(s, "%Y-%m-%d-%H-%M-%S") -assert x2.tm_min == 16 +if sys.platform != "wasi": + # _strptime depends on time.tzname, which is not available on WASI yet. + x2 = time.strptime(s, "%Y-%m-%d-%H-%M-%S") + assert x2.tm_min == 16 + + # TODO: WASI currently does not raise OverflowError for some out-of-range + # struct_time values in asctime() and strftime(). + # Re-enable this regression on WASI once the non-Unix time conversion path is fixed. + + # Regression test for RustPython issue #4938: + # struct_time field overflow should raise OverflowError (matching CPython), + # not TypeError. Covers mktime, asctime, and strftime. + I32_MAX_PLUS_1 = 2147483648 + overflow_cases = [ + (I32_MAX_PLUS_1, 1, 1, 0, 0, 0, 0, 0, 0), # i32 overflow in year + (2024, I32_MAX_PLUS_1, 1, 0, 0, 0, 0, 0, 0), # i32 overflow in month + (2024, 1, I32_MAX_PLUS_1, 0, 0, 0, 0, 0, 0), # i32 overflow in mday + (2024, 1, 1, 0, 0, I32_MAX_PLUS_1, 0, 0, 0), # i32 overflow in sec + (88888888888,) * 9, # multi-field i32 overflow + ] + + for case in overflow_cases: + for func_name, call in [ + ("mktime", lambda c=case: time.mktime(c)), + ("asctime", lambda c=case: time.asctime(c)), + ("strftime", lambda c=case: time.strftime("%Y", c)), + ]: + try: + call() + except OverflowError: + pass # expected, matches CPython + except TypeError as e: + raise AssertionError( + f"{func_name}({case}) raised TypeError (should be OverflowError): {e}" + ) from e + else: + raise AssertionError( + f"{func_name}({case}) did not raise — expected OverflowError" + ) s = time.asctime(x) -# print(s) assert s == "Thu Jan 1 00:16:40 1970" +# Monotonic and performance clocks should advance with elapsed time. +monotonic_before = time.monotonic() +monotonic_ns = time.monotonic_ns() +monotonic_after = time.monotonic() -# Regression test for RustPython issue #4938: -# struct_time field overflow should raise OverflowError (matching CPython), -# not TypeError. Covers mktime, asctime, and strftime. -I32_MAX_PLUS_1 = 2147483648 -overflow_cases = [ - (I32_MAX_PLUS_1, 1, 1, 0, 0, 0, 0, 0, 0), # i32 overflow in year - (2024, I32_MAX_PLUS_1, 1, 0, 0, 0, 0, 0, 0), # i32 overflow in month - (2024, 1, I32_MAX_PLUS_1, 0, 0, 0, 0, 0, 0), # i32 overflow in mday - (2024, 1, 1, 0, 0, I32_MAX_PLUS_1, 0, 0, 0), # i32 overflow in sec - (88888888888,) * 9, # multi-field i32 overflow -] +assert isinstance(monotonic_before, float) +assert isinstance(monotonic_ns, int) +assert monotonic_before <= monotonic_ns / 1_000_000_000 <= monotonic_after -for case in overflow_cases: - for func_name, call in [ - ("mktime", lambda c=case: time.mktime(c)), - ("asctime", lambda c=case: time.asctime(c)), - ("strftime", lambda c=case: time.strftime("%Y", c)), - ]: - try: - call() - except OverflowError: - pass # expected, matches CPython - except TypeError as e: - raise AssertionError( - f"{func_name}({case}) raised TypeError (should be OverflowError): {e}" - ) from e - else: - raise AssertionError( - f"{func_name}({case}) did not raise — expected OverflowError" - ) +perf_before = time.perf_counter() +perf_ns = time.perf_counter_ns() +perf_after = time.perf_counter() + +assert isinstance(perf_before, float) +assert isinstance(perf_ns, int) +assert perf_before <= perf_ns / 1_000_000_000 <= perf_after + +monotonic_start = time.monotonic() +perf_start = time.perf_counter() + +time.sleep(0.02) + +monotonic_elapsed = time.monotonic() - monotonic_start +perf_elapsed = time.perf_counter() - perf_start + +assert monotonic_elapsed >= 0.01 +assert perf_elapsed >= 0.01 From 4ef55ec022a062e00e281feaf07ef21843920a57 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Jul 2026 00:11:49 +0900 Subject: [PATCH 321/339] build(deps): bump libc from 0.2.186 to 0.2.189 (#8399) Bumps [libc](https://github.com/rust-lang/libc) from 0.2.186 to 0.2.189. - [Release notes](https://github.com/rust-lang/libc/releases) - [Changelog](https://github.com/rust-lang/libc/blob/0.2.189/CHANGELOG.md) - [Commits](https://github.com/rust-lang/libc/compare/0.2.186...0.2.189) --- updated-dependencies: - dependency-name: libc dependency-version: 0.2.189 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1ccd819cc..dda6b1d09 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1978,9 +1978,9 @@ checksum = "34b357333733e8260735ba5894eb928c02ecc69c78715f01a8019e7fa7f2db4c" [[package]] name = "libc" -version = "0.2.186" +version = "0.2.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" +checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2" [[package]] name = "libffi" From 11e6db9d9912d367f7b754db263681defd8c2590 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Jul 2026 00:12:09 +0900 Subject: [PATCH 322/339] build(deps): bump webpki-roots (#8397) Bumps the webpki-root group with 1 update in the / directory: [webpki-roots](https://github.com/rustls/webpki-roots). Updates `webpki-roots` from 1.0.8 to 1.0.9 - [Release notes](https://github.com/rustls/webpki-roots/releases) - [Commits](https://github.com/rustls/webpki-roots/compare/v/1.0.8...v/1.0.9) --- updated-dependencies: - dependency-name: webpki-roots dependency-version: 1.0.9 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: webpki-root ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dda6b1d09..0acd840c0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4657,9 +4657,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf85cb06032201fa7c6f829d7db5a7e5aa45bcc0655327713065f6f0576731bf" +checksum = "7dcd9d09a39985f5344844e66b0c530a33843579125f23e21e9f0f220850f22a" dependencies = [ "rustls-pki-types", ] From 071d54d44204a6f2041332b7cdc8458f2fafc7ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A1=B0=EC=A7=84=EB=AA=85?= <britzegs@gmail.com> Date: Thu, 30 Jul 2026 00:15:33 +0900 Subject: [PATCH 323/339] csv: support multi-character lineterminator in writer (#8328) * csv: support multi-character lineterminator in writer Store the dialect line terminator as an owned String instead of the single-byte csv_core::Terminator, dropping PyDialect's Copy derive. The manual writer paths emit the full terminator; the csv-core-backed QUOTE_ALL/QUOTE_NONNUMERIC paths emit a sentinel byte (preserving csv-core's quote/empty-record bookkeeping) and append the real terminator. field_needs_quotes/escape now quote a field containing any terminator byte. The reader ignores lineterminator and always uses CRLF, matching CPython and avoiding mid-UTF-8 record splits. * csv: unmark now-passing test_write_lineterminator * csv: address review feedback - Remove the redundant per-branch sentinel terminator setup in to_writer; the unconditional terminator call after the match is the single source. - Reword the empty-lineterminator errors to "must not be empty" (the constraint is non-empty, not single-character) on both entry points. - Promote the sentinel invariant check in writerow from debug_assert_eq! to assert_eq! so it also guards release builds. - Add a snippet case for a field containing a line-break byte to ensure the csv-core path drops only the trailing terminator. * csv: reject non-ASCII lineterminator The writer decides what to quote and escape by comparing raw bytes, so a non-ASCII terminator quoted a field that merely shared a UTF-8 lead byte, and QUOTE_NONE escaped individual bytes of the terminator and then failed to decode the record back to a string. Reject non-ASCII terminators, including lone surrogates, as csv.Error when the dialect is parsed, and leave code-point-wise handling to a follow-up (#8310). The non-string error message now matches CPython as well. --- Lib/test/test_csv.py | 1 - crates/stdlib/src/csv.rs | 223 ++++++++++++++++------------- extra_tests/snippets/stdlib_csv.py | 114 +++++++++++++++ 3 files changed, 238 insertions(+), 100 deletions(-) diff --git a/Lib/test/test_csv.py b/Lib/test/test_csv.py index 379f4c9b7..2b1de5d70 100644 --- a/Lib/test/test_csv.py +++ b/Lib/test/test_csv.py @@ -262,7 +262,6 @@ class Test_Csv(unittest.TestCase): self._write_test(['C\\', '6', '7', 'X"'], 'C\\\\,6,7,"X"""', escapechar='\\', quoting=csv.QUOTE_MINIMAL) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_write_lineterminator(self): for lineterminator in '\r\n', '\n', '\r', '!@#', '\0': with self.subTest(lineterminator=lineterminator): diff --git a/crates/stdlib/src/csv.rs b/crates/stdlib/src/csv.rs index 91717801b..cd065f634 100644 --- a/crates/stdlib/src/csv.rs +++ b/crates/stdlib/src/csv.rs @@ -77,18 +77,27 @@ mod _csv { #[pyattr] #[pyclass(module = "csv", name = "Dialect")] - #[derive(Debug, PyPayload, Clone, Copy)] + #[derive(Debug, PyPayload, Clone)] struct PyDialect { delimiter: u8, quotechar: Option<u8>, escapechar: Option<u8>, doublequote: bool, skipinitialspace: bool, - lineterminator: csv_core::Terminator, + lineterminator: String, quoting: QuoteStyle, strict: bool, } + /// Placeholder single-byte terminator for the csv-core writer paths + /// (`QUOTE_ALL` / `QUOTE_NONNUMERIC`). csv-core can only emit a single byte + /// for the record terminator, but its `terminator()` call also performs + /// essential bookkeeping — closing the final quote and emitting `""` for an + /// empty record — that must not be bypassed. So the writer emits this + /// sentinel byte, and `writerow` strips it and appends the real (possibly + /// multi-character) line terminator afterwards. + const CSV_CORE_TERMINATOR_SENTINEL: u8 = b'\n'; + impl Constructor for PyDialect { type Args = PyObjectRef; @@ -121,11 +130,7 @@ mod _csv { #[pygetset] fn lineterminator(&self, vm: &VirtualMachine) -> PyRef<PyStr> { - match self.lineterminator { - Terminator::CRLF => vm.ctx.new_str("\r\n".to_string()), - Terminator::Any(t) => vm.ctx.new_str(format!("{}", t as char)), - _ => unreachable!(), - } + vm.ctx.new_str(self.lineterminator.clone()) } #[pygetset] @@ -230,19 +235,42 @@ mod _csv { }) } - fn prase_lineterminator_from_obj(vm: &VirtualMachine, obj: &PyObject) -> PyResult<Terminator> { + /// Validate that a line terminator is ASCII and return it as a `str`. + /// + /// The writer's quoting and escaping predicates compare raw bytes, so a + /// non-ASCII terminator would either quote a field that merely shares a + /// UTF-8 lead byte or splice an escape character into the middle of a + /// multi-byte sequence. Reject those here. + /// + /// The ASCII check must come before any UTF-8 conversion so that lone + /// surrogates are reported as this `csv.Error` too. + /// + /// TODO: RUSTPYTHON; handle non-ASCII terminators code-point-wise as part + /// of full Unicode dialect support. + fn ascii_lineterminator<'a>(vm: &VirtualMachine, s: &'a PyStr) -> PyResult<&'a str> { + if !s.as_wtf8().is_ascii() { + return Err(new_csv_error( + vm, + r#""lineterminator" must be an ASCII string"#, + )); + } + // An ASCII string is always valid UTF-8. + s.to_str() + .ok_or_else(|| new_csv_error(vm, r#""lineterminator" must be a string"#)) + } + + fn prase_lineterminator_from_obj(vm: &VirtualMachine, obj: &PyObject) -> PyResult<String> { match_class!(match obj.get_attr("lineterminator", vm)? { s @ PyStr => { - Ok(if s.as_bytes().eq(b"\r\n") { - csv_core::Terminator::CRLF - } else if let Some(t) = s.as_bytes().first() { - // Due to limitations in the current implementation within csv_core - // the support for multiple characters in lineterminator is not complete. - // only capture the first character - csv_core::Terminator::Any(*t) - } else { - return Err(new_csv_error(vm, r#""lineterminator" must be a string"#)); - }) + // Store the full line terminator string. CPython accepts an + // arbitrary-length terminator; the manual writer paths emit it + // verbatim and the csv-core writer path appends it after a + // sentinel terminator (see `writerow`). + let value = ascii_lineterminator(vm, &s)?; + if value.is_empty() { + return Err(new_csv_error(vm, r#""lineterminator" must not be empty"#)); + } + Ok(value.to_owned()) } attr => { Err(vm.new_type_error(format!( @@ -344,7 +372,7 @@ mod _csv { let g = GLOBAL_HASHMAP.lock(); if let Some(dialect) = g.get(name.as_str()) { - return Ok(*dialect); + return Ok(dialect.clone()); } Err(new_csv_error(vm, "unknown dialect")) @@ -540,7 +568,7 @@ mod _csv { escapechar: Option<u8>, doublequote: Option<bool>, skipinitialspace: Option<bool>, - lineterminator: Option<csv_core::Terminator>, + lineterminator: Option<String>, quoting: Option<QuoteStyle>, strict: Option<bool>, } @@ -629,15 +657,22 @@ mod _csv { }; if let Some(lineterminator) = args.kwargs.swap_remove("lineterminator") { - res.lineterminator = Some(csv_core::Terminator::Any( - lineterminator - .try_to_value::<&str>(vm)? - .bytes() - .exactly_one() - .map_err(|_| { - vm.new_type_error(r#""lineterminator" must be a 1-character string"#) - })?, - )) + let s = lineterminator.downcast_ref::<PyStr>().ok_or_else(|| { + vm.new_type_error(format!( + r#""lineterminator" must be a string, not {}"#, + lineterminator.class().name() + )) + })?; + let value = ascii_lineterminator(vm, s)?; + // Preserve the previous behavior of rejecting an empty terminator + // (full validation parity is deferred to a follow-up). Any + // non-empty string, including multi-character ones, is stored. + if value.is_empty() { + return Err(vm + .new_type_error(r#""lineterminator" must not be empty"#) + .into()); + } + res.lineterminator = Some(value.to_owned()); }; if let Some(doublequote) = args.kwargs.swap_remove("doublequote") { @@ -717,7 +752,7 @@ mod _csv { } impl FormatOptions { - const fn update_py_dialect(&self, mut res: PyDialect) -> PyDialect { + fn update_py_dialect(&self, mut res: PyDialect) -> PyDialect { macro_rules! check_and_fill { ($res:ident, $e:ident) => {{ if let Some(t) = self.$e { @@ -741,7 +776,9 @@ mod _csv { }; check_and_fill!(res, quoting); - check_and_fill!(res, lineterminator); + if let Some(t) = &self.lineterminator { + res.lineterminator.clone_from(t); + }; check_and_fill!(res, strict); res } @@ -751,16 +788,16 @@ mod _csv { DialectItem::Str(name) => { let g = GLOBAL_HASHMAP.lock(); if let Some(dialect) = g.get(name) { - Ok(self.update_py_dialect(*dialect)) + Ok(self.update_py_dialect(dialect.clone())) } else { Err(new_csv_error(vm, format!("{name} is not registered."))) } // TODO: Maybe need to update the obj from HashMap } - DialectItem::Obj(o) => Ok(self.update_py_dialect(*o)), + DialectItem::Obj(o) => Ok(self.update_py_dialect(o.clone())), DialectItem::None => { let g = GLOBAL_HASHMAP.lock(); - let res = *g.get("excel").unwrap(); + let res = g.get("excel").unwrap().clone(); Ok(self.update_py_dialect(res)) } } @@ -788,27 +825,6 @@ mod _csv { skipinitialspace } - fn get_lineterminator(&self) -> csv_core::Terminator { - let mut lineterminator = match &self.dialect { - DialectItem::Str(name) => { - let g = GLOBAL_HASHMAP.lock(); - if let Some(dialect) = g.get(name) { - dialect.lineterminator - } else { - Terminator::CRLF - } - } - DialectItem::Obj(obj) => obj.lineterminator, - _ => Terminator::CRLF, - }; - - if let Some(attr) = self.lineterminator { - lineterminator = attr - } - - lineterminator - } - fn get_quoting(&self) -> QuoteStyle { let mut quoting = match &self.dialect { DialectItem::Str(name) => { @@ -832,11 +848,11 @@ mod _csv { fn to_reader(&self) -> csv_core::Reader { let dialect = match &self.dialect { - DialectItem::Str(name) => GLOBAL_HASHMAP.lock().get(name).copied(), - DialectItem::Obj(obj) => Some(*obj), + DialectItem::Str(name) => GLOBAL_HASHMAP.lock().get(name).cloned(), + DialectItem::Obj(obj) => Some(obj.clone()), DialectItem::None => { let g = GLOBAL_HASHMAP.lock(); - Some(*g.get("excel").unwrap()) + Some(g.get("excel").unwrap().clone()) } }; @@ -868,10 +884,6 @@ mod _csv { reader = reader.quoting(self.quoting != Some(QuoteStyle::None)); } - if let Some(t) = self.lineterminator { - reader = reader.terminator(t); - } - if let Some(t) = self.doublequote { reader = reader.double_quote(t); } @@ -880,7 +892,12 @@ mod _csv { reader = reader.escape(self.escapechar); } - reader = reader.terminator(self.lineterminator.unwrap_or(Terminator::CRLF)); + // CPython's reader ignores the dialect's `lineterminator` entirely and + // only recognizes `\r`, `\n`, and `\r\n` as record separators. Match + // that: always use CRLF mode. Feeding a multi-byte terminator's first + // byte here would otherwise split records mid-UTF-8 and raise a + // UnicodeDecodeError. + reader = reader.terminator(Terminator::CRLF); reader.build() } @@ -893,8 +910,7 @@ mod _csv { if let Some(dialect) = g.get(name) { let mut builder = builder .delimiter(dialect.delimiter) - .double_quote(dialect.doublequote) - .terminator(dialect.lineterminator); + .double_quote(dialect.doublequote); if let Some(t) = dialect.quotechar { builder = builder.quote(t); @@ -910,8 +926,7 @@ mod _csv { DialectItem::Obj(obj) => { let mut builder = builder .delimiter(obj.delimiter) - .double_quote(obj.doublequote) - .terminator(obj.lineterminator); + .double_quote(obj.doublequote); if let Some(t) = obj.quotechar { builder = builder.quote(t); @@ -934,7 +949,7 @@ mod _csv { writer = writer.double_quote(t); } - writer = writer.terminator(self.get_lineterminator()); + writer = writer.terminator(Terminator::Any(CSV_CORE_TERMINATOR_SENTINEL)); if let Some(e) = self.escapechar { writer = writer.escape(e); @@ -979,8 +994,8 @@ mod _csv { } #[pygetset] - const fn dialect(&self, _vm: &VirtualMachine) -> PyDialect { - self.dialect + fn dialect(&self, _vm: &VirtualMachine) -> PyDialect { + self.dialect.clone() } } @@ -1014,7 +1029,7 @@ mod _csv { &mut self, input: &[u8], index: usize, - dialect: PyDialect, + dialect: &PyDialect, unquoted_escape: bool, ) -> (QuoteScanEvent, usize) { let byte = input[index]; @@ -1067,7 +1082,7 @@ mod _csv { fn read_quote_record( input: &[u8], - dialect: PyDialect, + dialect: &PyDialect, field_limit: isize, vm: &VirtualMachine, ) -> PyResult<Vec<PyObjectRef>> { @@ -1179,13 +1194,13 @@ mod _csv { ) || (zelf.dialect.quoting == QuoteStyle::None && zelf.dialect.escapechar.is_some()); if use_quote_record { - let out = read_quote_record(input, zelf.dialect, field_limit, vm)?; + let out = read_quote_record(input, &zelf.dialect, field_limit, vm)?; *line_num += 1; return Ok(PyIterReturn::Return(vm.ctx.new_list(out).into())); } #[inline] - fn trim_initial_spaces(input: &[u8], dialect: PyDialect) -> Vec<u8> { + fn trim_initial_spaces(input: &[u8], dialect: &PyDialect) -> Vec<u8> { let mut trimmed = Vec::with_capacity(input.len()); let mut scan_state = QuoteScanState::new(); let mut index = 0; @@ -1215,7 +1230,7 @@ mod _csv { } let input = if *skipinitialspace { - String::from_utf8(trim_initial_spaces(input, zelf.dialect)).unwrap() + String::from_utf8(trim_initial_spaces(input, &zelf.dialect)).unwrap() } else { String::from_utf8(input.to_vec()).unwrap() }; @@ -1314,7 +1329,7 @@ mod _csv { fn write_quoted_field( output: &mut Vec<u8>, data: &[u8], - dialect: PyDialect, + dialect: &PyDialect, vm: &VirtualMachine, ) -> PyResult<()> { let quotechar = dialect @@ -1346,7 +1361,7 @@ mod _csv { fn write_unquoted_field( output: &mut Vec<u8>, data: &[u8], - dialect: PyDialect, + dialect: &PyDialect, vm: &VirtualMachine, ) -> PyResult<()> { for &byte in data { @@ -1361,36 +1376,38 @@ mod _csv { Ok(()) } - fn field_needs_quotes(data: &[u8], dialect: PyDialect) -> bool { + fn field_needs_quotes(data: &[u8], dialect: &PyDialect) -> bool { data.iter().any(|&byte| { byte == dialect.delimiter || dialect.quotechar == Some(byte) || matches!(byte, b'\r' | b'\n') - || matches!(dialect.lineterminator, Terminator::Any(t) if byte == t) + // CPython quotes a field containing any character of the line + // terminator. The terminator is ASCII-validated at parse time, so + // comparing raw bytes cannot match part of a multi-byte character. + // TODO: RUSTPYTHON; supporting non-ASCII terminators needs + // code-point-wise quoting and escaping as part of full + // Unicode dialect support. + || dialect.lineterminator.as_bytes().contains(&byte) }) } - fn field_needs_escape(byte: u8, dialect: PyDialect) -> bool { + fn field_needs_escape(byte: u8, dialect: &PyDialect) -> bool { byte == dialect.delimiter || dialect.quotechar == Some(byte) || dialect.escapechar == Some(byte) || matches!(byte, b'\r' | b'\n') - || matches!(dialect.lineterminator, Terminator::Any(t) if byte == t) + || dialect.lineterminator.as_bytes().contains(&byte) } - fn write_lineterminator(output: &mut Vec<u8>, terminator: Terminator) { - match terminator { - Terminator::CRLF => output.extend_from_slice(b"\r\n"), - Terminator::Any(byte) => output.push(byte), - _ => unreachable!(), - } + fn write_lineterminator(output: &mut Vec<u8>, terminator: &str) { + output.extend_from_slice(terminator.as_bytes()); } #[pyclass(flags(DISALLOW_INSTANTIATION))] impl Writer { #[pygetset(name = "dialect")] - const fn get_dialect(&self, _vm: &VirtualMachine) -> PyDialect { - self.dialect + fn get_dialect(&self, _vm: &VirtualMachine) -> PyDialect { + self.dialect.clone() } fn writerow_quoted_strings(&self, row: PyObjectRef, vm: &VirtualMachine) -> PyResult { @@ -1421,12 +1438,12 @@ mod _csv { }); let should_quote = match self.dialect.quoting { - QuoteStyle::Strings => is_str || field_needs_quotes(data, self.dialect), + QuoteStyle::Strings => is_str || field_needs_quotes(data, &self.dialect), QuoteStyle::Notnull => !is_none, _ => unreachable!(), }; if should_quote { - write_quoted_field(&mut output, data, self.dialect, vm)?; + write_quoted_field(&mut output, data, &self.dialect, vm)?; } else if single_field && data.is_empty() { return Err(new_csv_error( vm, @@ -1437,7 +1454,7 @@ mod _csv { } } - write_lineterminator(&mut output, self.dialect.lineterminator); + write_lineterminator(&mut output, &self.dialect.lineterminator); let s = core::str::from_utf8(&output).map_err(|e| new_not_utf8_error(vm, &output, e))?; self.write.call((s,), vm) @@ -1479,10 +1496,10 @@ mod _csv { )); } - write_unquoted_field(&mut output, data, self.dialect, vm)?; + write_unquoted_field(&mut output, data, &self.dialect, vm)?; } - write_lineterminator(&mut output, self.dialect.lineterminator); + write_lineterminator(&mut output, &self.dialect.lineterminator); let s = core::str::from_utf8(&output).map_err(|e| new_not_utf8_error(vm, &output, e))?; @@ -1524,14 +1541,14 @@ mod _csv { // terminator, regardless of which line terminator is // configured. A row with a single empty field is also quoted // so that it is not read back as an empty line. - if field_needs_quotes(data, self.dialect) || (single_field && data.is_empty()) { - write_quoted_field(&mut output, data, self.dialect, vm)?; + if field_needs_quotes(data, &self.dialect) || (single_field && data.is_empty()) { + write_quoted_field(&mut output, data, &self.dialect, vm)?; } else { output.extend_from_slice(data); } } - write_lineterminator(&mut output, self.dialect.lineterminator); + write_lineterminator(&mut output, &self.dialect.lineterminator); let s = core::str::from_utf8(&output).map_err(|e| new_not_utf8_error(vm, &output, e))?; @@ -1607,8 +1624,16 @@ mod _csv { handle_res!(writer.terminator(&mut buffer[buffer_offset..])); } - let s = core::str::from_utf8(&buffer[..buffer_offset]) - .map_err(|e| new_not_utf8_error(vm, &buffer[..buffer_offset], e))?; + // csv-core just emitted the single-byte sentinel terminator (after + // closing the final quote / emitting an empty record as needed). + // Drop that sentinel byte and append the real, possibly + // multi-character, line terminator. + assert_eq!(buffer[buffer_offset - 1], CSV_CORE_TERMINATOR_SENTINEL); + let mut output = buffer[..buffer_offset - 1].to_vec(); + output.extend_from_slice(self.dialect.lineterminator.as_bytes()); + + let s = + core::str::from_utf8(&output).map_err(|e| new_not_utf8_error(vm, &output, e))?; self.write.call((s,), vm) } diff --git a/extra_tests/snippets/stdlib_csv.py b/extra_tests/snippets/stdlib_csv.py index 61b82459a..418d383d8 100644 --- a/extra_tests/snippets/stdlib_csv.py +++ b/extra_tests/snippets/stdlib_csv.py @@ -1,5 +1,6 @@ import csv import io +import sys from testutils import assert_raises @@ -181,6 +182,119 @@ def test_quote_minimal_writer_lineterminator(): test_quote_minimal_writer_lineterminator() +def test_multichar_lineterminator(): + # https://github.com/RustPython/RustPython/issues/8322 + # The writer must store and emit a full multi-character line terminator. + for lineterminator in "\r\n", "\n", "\r", "!@#", "\0": + buf = io.StringIO() + writer = csv.writer(buf, lineterminator=lineterminator) + writer.writerow(["a", "b"]) + writer.writerow([1, 2]) + writer.writerow(["\r", "\n"]) + assert buf.getvalue() == ( + f'a,b{lineterminator}1,2{lineterminator}"\r","\n"{lineterminator}' + ), (lineterminator, buf.getvalue()) + + # A field is quoted when it contains any byte of the terminator (QUOTE_MINIMAL). + for field, expected in [ + ("a@b", '"a@b",x!@#'), + ("a!b", '"a!b",x!@#'), + ("a#b", '"a#b",x!@#'), + ("abc", "abc,x!@#"), + ]: + buf = io.StringIO() + csv.writer(buf, lineterminator="!@#").writerow([field, "x"]) + assert buf.getvalue() == expected, (field, buf.getvalue()) + + # The csv-core-backed QUOTE_ALL / QUOTE_NONNUMERIC paths emit the full + # terminator too, and keep the state machine correct across rows. + allq = io.StringIO() + writer = csv.writer(allq, lineterminator="!@#", quoting=csv.QUOTE_ALL) + writer.writerow(["a", "b"]) + writer.writerow(["c", "d"]) + assert allq.getvalue() == '"a","b"!@#"c","d"!@#', allq.getvalue() + + nonnum = io.StringIO() + csv.writer(nonnum, lineterminator="!@#", quoting=csv.QUOTE_NONNUMERIC).writerow( + ["a", 1] + ) + assert nonnum.getvalue() == '"a",1!@#', nonnum.getvalue() + + # A field that itself contains a line-break byte must be kept intact: the + # csv-core path drops only the trailing record terminator, not a byte from + # the field data. + embedded = io.StringIO() + csv.writer(embedded, lineterminator="!@#", quoting=csv.QUOTE_ALL).writerow( + ["x\ny", "z"] + ) + assert embedded.getvalue() == '"x\ny","z"!@#', embedded.getvalue() + + # QUOTE_NONE escapes any byte of the terminator. + none = io.StringIO() + csv.writer( + none, lineterminator="!@#", quoting=csv.QUOTE_NONE, escapechar="\\" + ).writerow(["a!b", "x"]) + assert none.getvalue() == "a\\!b,x!@#", none.getvalue() + + # register_dialect round-trips a multi-character terminator. + csv.register_dialect("multichar_lt", delimiter=",", lineterminator="!@#") + try: + reg = io.StringIO() + csv.writer(reg, dialect="multichar_lt").writerow(["a", "b"]) + assert reg.getvalue() == "a,b!@#", reg.getvalue() + finally: + csv.unregister_dialect("multichar_lt") + + # The dialect attribute reflects the full terminator. + assert ( + csv.writer(io.StringIO(), lineterminator="!@#").dialect.lineterminator == "!@#" + ) + + # The reader ignores lineterminator (like CPython) and only splits on \r\n. + assert list(csv.reader(io.StringIO("a,b!@#c,d!@#"), lineterminator="!@#")) == [ + ["a", "b!@#c", "d!@#"] + ] + + +test_multichar_lineterminator() + + +def test_reject_non_ascii_lineterminator(): + # CPython accepts non-ASCII line terminators; RustPython rejects them + # because the writer quotes and escapes byte by byte. Supporting them + # requires code-point-wise handling as part of full Unicode dialect support. + with assert_raises(csv.Error): + csv.writer(io.StringIO(), lineterminator="é") + + with assert_raises(csv.Error): + csv.writer(io.StringIO(), lineterminator="\x85") + + with assert_raises(csv.Error): + csv.writer(io.StringIO(), lineterminator="\ud800") + + with assert_raises(csv.Error): + csv.writer( + io.StringIO(), lineterminator="é", quoting=csv.QUOTE_NONE, escapechar="\\" + ) + + with assert_raises(csv.Error): + csv.register_dialect("non_ascii_lt", lineterminator="é") + + class NonAsciiDialect(csv.excel): + lineterminator = "é" + + with assert_raises(csv.Error): + NonAsciiDialect() + + buf = io.StringIO() + csv.writer(buf, lineterminator="!@#").writerow(["a", "b"]) + assert buf.getvalue() == "a,b!@#" + + +if sys.implementation.name == "rustpython": + test_reject_non_ascii_lineterminator() + + def test_quote_minimal_writer_empty_fields(): buf = io.StringIO() writer = csv.writer(buf) From c7a19f0eea76f6216dabe929ceecf4cf43cdc8a2 Mon Sep 17 00:00:00 2001 From: Dino <164735145+2jiyong@users.noreply.github.com> Date: Thu, 30 Jul 2026 07:53:35 +0900 Subject: [PATCH 324/339] dict: match CPython errors for invalid update sequence elements (#8338) * fix dict update type error * Use tuple for dictionary update sequence pairs * Propagate errors while adding dict update sequence notes * Match BaseException.add_note error message with CPython --- Lib/test/test_dict.py | 1 - crates/vm/src/builtins/dict.rs | 90 ++++++++++++++++++++++++++++------ crates/vm/src/exceptions.rs | 2 +- 3 files changed, 76 insertions(+), 17 deletions(-) diff --git a/Lib/test/test_dict.py b/Lib/test/test_dict.py index 79c975946..e2a73773c 100644 --- a/Lib/test/test_dict.py +++ b/Lib/test/test_dict.py @@ -275,7 +275,6 @@ class DictTest(unittest.TestCase): self.assertRaises(ValueError, {}.update, [(1, 2, 3)]) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_update_type_error(self): with self.assertRaises(TypeError) as cm: {}.update([object() for _ in range(3)]) diff --git a/crates/vm/src/builtins/dict.rs b/crates/vm/src/builtins/dict.rs index af74a2591..5db071e1d 100644 --- a/crates/vm/src/builtins/dict.rs +++ b/crates/vm/src/builtins/dict.rs @@ -7,7 +7,7 @@ use crate::object::{Traverse, TraverseFn}; use crate::{ AsObject, Context, Py, PyExact, PyObject, PyObjectRef, PyPayload, PyRef, PyRefExact, PyResult, TryFromObject, atomic_func, - builtins::{PyTuple, iter::builtins_iter, type_::PyAttributes}, + builtins::{PyList, PyTuple, iter::builtins_iter, type_::PyAttributes}, class::{PyClassDef, PyClassImpl}, common::ascii, dict_inner::{self, DictKey}, @@ -183,6 +183,76 @@ impl PyDict { self.merge_object_with_override(other, false, vm) } + fn add_update_sequence_note( + exc: PyBaseExceptionRef, + index: usize, + vm: &VirtualMachine, + ) -> PyBaseExceptionRef { + if !exc.fast_isinstance(vm.ctx.exceptions.type_error) { + return exc; + } + + let note = + format!("Cannot convert dictionary update sequence element #{index} to a sequence"); + match vm.call_method(exc.as_object(), "add_note", (vm.ctx.new_str(note),)) { + Ok(_) => exc, + Err(note_err) => { + note_err.set___context__(Some(exc)); + note_err + } + } + } + + fn update_sequence_pair_from_slice( + elements: &[PyObjectRef], + index: usize, + vm: &VirtualMachine, + ) -> PyResult<(PyObjectRef, PyObjectRef)> { + let [key, value] = elements else { + return Err(vm.new_value_error(format!( + "dictionary update sequence element #{index} has length {}; 2 is required", + elements.len() + ))); + }; + Ok((key.clone(), value.clone())) + } + + fn update_sequence_pair( + element: PyObjectRef, + index: usize, + vm: &VirtualMachine, + ) -> PyResult<(PyObjectRef, PyObjectRef)> { + let element = match element.downcast_exact::<PyList>(vm) { + Ok(list) => { + let elements = list.borrow_vec(); + return Self::update_sequence_pair_from_slice(&elements, index, vm); + } + Err(element) => element, + }; + let element = match element.downcast_exact::<PyTuple>(vm) { + Ok(tuple) => { + return Self::update_sequence_pair_from_slice(tuple.as_slice(), index, vm); + } + Err(element) => element, + }; + + let elements = (|| { + let elem_iter = element.get_iter(vm).map_err(|exc| { + if exc.fast_isinstance(vm.ctx.exceptions.type_error) { + vm.new_type_error("object is not iterable") + } else { + exc + } + })?; + elem_iter + .into_iter::<PyObjectRef>(vm)? + .collect::<PyResult<Vec<_>>>() + })() + .map_err(|exc| Self::add_update_sequence_note(exc, index, vm))?; + + Self::update_sequence_pair_from_slice(&elements, index, vm) + } + pub fn merge_from_seq2( &self, seq2: PyObjectRef, @@ -191,20 +261,10 @@ impl PyDict { ) -> PyResult<()> { let iter = seq2.get_iter(vm)?; let dict = &self.entries; - loop { - fn err(vm: &VirtualMachine) -> PyBaseExceptionRef { - vm.new_value_error("Iterator must have exactly two elements") - } - let element = match iter.next(vm)? { - PyIterReturn::Return(obj) => obj, - PyIterReturn::StopIteration(_) => break, - }; - let elem_iter = element.get_iter(vm)?; - let key = elem_iter.next(vm)?.into_result().map_err(|_| err(vm))?; - let value = elem_iter.next(vm)?.into_result().map_err(|_| err(vm))?; - if matches!(elem_iter.next(vm)?, PyIterReturn::Return(_)) { - return Err(err(vm)); - } + + for (index, element) in iter.iter_without_hint::<PyObjectRef>(vm)?.enumerate() { + let (key, value) = Self::update_sequence_pair(element?, index, vm)?; + if !override_existing && dict.contains(vm, &*key)? { continue; } diff --git a/crates/vm/src/exceptions.rs b/crates/vm/src/exceptions.rs index fe07a7e3c..7eaf8bafc 100644 --- a/crates/vm/src/exceptions.rs +++ b/crates/vm/src/exceptions.rs @@ -704,7 +704,7 @@ impl PyRef<PyBaseException> { let notes = notes .downcast::<PyList>() - .map_err(|_| vm.new_type_error("__notes__ must be a list"))?; + .map_err(|_| vm.new_type_error("Cannot add note: __notes__ is not a list"))?; notes.borrow_vec_mut().push(note.into()); Ok(()) From 33eb99af44db92ad0bd852120c85005003ef5aea Mon Sep 17 00:00:00 2001 From: Joshua Megnauth <48846352+joshuamegnauth54@users.noreply.github.com> Date: Thu, 30 Jul 2026 09:11:31 -0400 Subject: [PATCH 325/339] Fix some clippy lints for 1.99 (#8412) --- crates/common/src/format.rs | 3 +-- crates/compiler-core/src/bytecode.rs | 17 +++++++++++++---- crates/host_env/src/nt.rs | 4 +++- crates/stdlib/src/_testconsole.rs | 8 ++++---- crates/vm/src/builtins/interpolation.rs | 3 +-- crates/vm/src/dict_inner.rs | 2 +- crates/vm/src/stdlib/_sre.rs | 6 ++---- crates/vm/src/stdlib/sys/monitoring.rs | 10 +++++----- crates/vm/src/vm/mod.rs | 5 +---- crates/vm/src/vm/vm_object.rs | 3 +-- 10 files changed, 32 insertions(+), 29 deletions(-) diff --git a/crates/common/src/format.rs b/crates/common/src/format.rs index fa71b27c5..b4b25b273 100644 --- a/crates/common/src/format.rs +++ b/crates/common/src/format.rs @@ -1380,8 +1380,7 @@ impl FieldName { FieldType::Index(index) } else if first .as_str() - .ok() - .is_some_and(|s| s.bytes().all(|b| b.is_ascii_digit())) + .is_ok_and(|s| s.bytes().all(|b| b.is_ascii_digit())) { // All-digit segment whose value overflows usize itself. return Err(FormatParseError::TooManyDecimalDigits); diff --git a/crates/compiler-core/src/bytecode.rs b/crates/compiler-core/src/bytecode.rs index 3a7eec439..ba1639170 100644 --- a/crates/compiler-core/src/bytecode.rs +++ b/crates/compiler-core/src/bytecode.rs @@ -557,6 +557,14 @@ impl TryFrom<&[u8]> for CodeUnit { } } +impl TryFrom<[u8; 2]> for CodeUnit { + type Error = MarshalError; + + fn try_from(value: [u8; 2]) -> Result<Self, Self::Error> { + Ok(Self::new(value[0].try_into()?, value[1].into())) + } +} + pub struct CodeUnits { units: UnsafeCell<Box<[CodeUnit]>>, adaptive_counters: Box<[AtomicU16]>, @@ -610,12 +618,13 @@ impl TryFrom<&[u8]> for CodeUnits { type Error = MarshalError; fn try_from(value: &[u8]) -> Result<Self, Self::Error> { - if !value.len().is_multiple_of(2) { + let (chunks, []) = value.as_chunks::<2>() else { return Err(Self::Error::InvalidBytecode); - } + }; - let units = value - .chunks_exact(2) + let units = chunks + .iter() + .copied() .map(CodeUnit::try_from) .collect::<Result<Vec<_>, _>>()?; Ok(units.into()) diff --git a/crates/host_env/src/nt.rs b/crates/host_env/src/nt.rs index 4c77b30e6..780a75910 100644 --- a/crates/host_env/src/nt.rs +++ b/crates/host_env/src/nt.rs @@ -1333,7 +1333,9 @@ pub fn readlink(path: &Path) -> Result<OsString, ReadlinkError> { let path_slice = &buffer[path_start..path_end]; let mut wide_chars: Vec<u16> = path_slice - .chunks_exact(2) + .as_chunks::<2>() + .0 + .iter() .map(|chunk| u16::from_le_bytes([chunk[0], chunk[1]])) .collect(); diff --git a/crates/stdlib/src/_testconsole.rs b/crates/stdlib/src/_testconsole.rs index 78cba3b39..3b7aad171 100644 --- a/crates/stdlib/src/_testconsole.rs +++ b/crates/stdlib/src/_testconsole.rs @@ -17,11 +17,11 @@ mod _testconsole { let data = &*data; // Interpret as UTF-16-LE pairs - if !data.len().is_multiple_of(2) { + let (chunks, []) = data.as_chunks::<2>() else { return Err(vm.new_value_error("buffer must contain UTF-16-LE data (even length)")); - } - let wchars: Vec<u16> = data - .chunks_exact(2) + }; + let wchars: Vec<u16> = chunks + .iter() .map(|chunk| u16::from_le_bytes([chunk[0], chunk[1]])) .collect(); host_testconsole::write_console_input(fd, &wchars).map_err(|e| e.into_pyexception(vm)) diff --git a/crates/vm/src/builtins/interpolation.rs b/crates/vm/src/builtins/interpolation.rs index a865ff390..0ae1b3312 100644 --- a/crates/vm/src/builtins/interpolation.rs +++ b/crates/vm/src/builtins/interpolation.rs @@ -68,8 +68,7 @@ impl Constructor for PyInterpolation { .as_bytes() .iter() .exactly_one() - .ok() - .is_some_and(|s| matches!(*s, b's' | b'r' | b'a')); + .is_ok_and(|s| matches!(*s, b's' | b'r' | b'a')); if !has_flag { return Err(vm.new_value_error( "Interpolation() argument 'conversion' must be one of 's', 'a' or 'r'", diff --git a/crates/vm/src/dict_inner.rs b/crates/vm/src/dict_inner.rs index cc26383d9..3e75e6f27 100644 --- a/crates/vm/src/dict_inner.rs +++ b/crates/vm/src/dict_inner.rs @@ -61,7 +61,7 @@ static KEYS_VERSION: AtomicU32 = AtomicU32::new(0); /// unrealistic in practice. fn next_keys_version() -> u32 { KEYS_VERSION - .fetch_update(Relaxed, Relaxed, |v| v.checked_add(1)) + .try_update(Relaxed, Relaxed, |v| v.checked_add(1)) .map_or(0, |v| v + 1) } diff --git a/crates/vm/src/stdlib/_sre.rs b/crates/vm/src/stdlib/_sre.rs index c90ff4d4f..03382549b 100644 --- a/crates/vm/src/stdlib/_sre.rs +++ b/crates/vm/src/stdlib/_sre.rs @@ -146,11 +146,9 @@ mod _sre { let mut items = Vec::with_capacity(1); let v = template.borrow_vec(); let literal = v.first().ok_or_else(err)?.clone(); - let trunks = v[1..].chunks_exact(2); - - if !trunks.remainder().is_empty() { + let (trunks, []) = v[1..].as_chunks::<2>() else { return Err(err()); - } + }; for trunk in trunks { let index: usize = trunk[0] diff --git a/crates/vm/src/stdlib/sys/monitoring.rs b/crates/vm/src/stdlib/sys/monitoring.rs index 56a68cea6..f468a86b0 100644 --- a/crates/vm/src/stdlib/sys/monitoring.rs +++ b/crates/vm/src/stdlib/sys/monitoring.rs @@ -344,7 +344,7 @@ pub(crate) fn instrument_code(code: &PyCode, events: u32) { continue; } // Excluded: RESUME, END_FOR, CACHE (and their instrumented variants) - let base = op.to_base().map_or(op, |b| b); + let base = op.to_base().unwrap_or(op); if matches!( base, Instruction::Resume { .. } | Instruction::EndFor | Instruction::Cache @@ -387,7 +387,7 @@ pub(crate) fn instrument_code(code: &PyCode, events: u32) { .skip(first_traceable) { let op = unit.op; - let base = op.to_base().map_or(op, |b| b); + let base = op.to_base().unwrap_or(op); if matches!(base, Instruction::ExtendedArg) { continue; } @@ -425,7 +425,7 @@ pub(crate) fn instrument_code(code: &PyCode, events: u32) { let mut instr_idx = first_traceable; for unit in code.code.instructions[first_traceable..len].iter().copied() { let (op, arg) = arg_state.get(unit); - let base = op.to_base().map_or(op, |b| b); + let base = op.to_base().unwrap_or(op); if matches!(base, Instruction::ExtendedArg) || matches!(base, Instruction::Cache) { instr_idx += 1; @@ -460,7 +460,7 @@ pub(crate) fn instrument_code(code: &PyCode, events: u32) { && !no_loc_mask.get(target_idx).copied().unwrap_or(false) { let target_op = code.code.instructions[target_idx].op; - let target_base = target_op.to_base().map_or(target_op, |b| b); + let target_base = target_op.to_base().unwrap_or(target_op); // Skip synthetic cleanup targets. if matches!(target_base, Instruction::PopIter) { instr_idx += 1; @@ -483,7 +483,7 @@ pub(crate) fn instrument_code(code: &PyCode, events: u32) { && !no_loc_mask.get(target_idx).copied().unwrap_or(false) { let target_op = code.code.instructions[target_idx].op; - let target_base = target_op.to_base().map_or(target_op, |b| b); + let target_base = target_op.to_base().unwrap_or(target_op); if !matches!(target_base, Instruction::PopIter) && let Some((loc, _)) = line_locations.get(target_idx) && loc.line.get() > 0 diff --git a/crates/vm/src/vm/mod.rs b/crates/vm/src/vm/mod.rs index 3062ea07f..801b1297b 100644 --- a/crates/vm/src/vm/mod.rs +++ b/crates/vm/src/vm/mod.rs @@ -2092,10 +2092,7 @@ impl VirtualMachine { if exc.class().is(self.ctx.exceptions.attribute_error) { let exc = exc.as_object(); // Check if this exception was already augmented - let already_set = exc - .get_attr("name", self) - .ok() - .is_some_and(|v| !self.is_none(&v)); + let already_set = exc.get_attr("name", self).is_ok_and(|v| !self.is_none(&v)); if already_set { return; } diff --git a/crates/vm/src/vm/vm_object.rs b/crates/vm/src/vm/vm_object.rs index 8a7be140d..aa68f7f4d 100644 --- a/crates/vm/src/vm/vm_object.rs +++ b/crates/vm/src/vm/vm_object.rs @@ -47,8 +47,7 @@ impl VirtualMachine { /// Returns true if the file object's `closed` attribute is truthy. fn file_is_closed(&self, file: &PyObject) -> bool { file.get_attr("closed", self) - .ok() - .is_some_and(|v| v.try_to_bool(self).unwrap_or(false)) + .is_ok_and(|v| v.try_to_bool(self).unwrap_or_default()) } pub(crate) fn flush_std(&self) -> i32 { From 9e662661680a1b53678484f546bc7a7c0ff38df9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EA=B4=91=ED=9A=A8?= <87641474+widehyo1@users.noreply.github.com> Date: Thu, 30 Jul 2026 22:12:02 +0900 Subject: [PATCH 326/339] ast: match CPython argument validation order (#8414) Validate parameter annotations while converting ast.arguments, before merging positional and keyword-only defaults. This gives invalid annotation contexts precedence over default-list shape errors, as in CPython. Merge positional defaults before keyword-only defaults so an excess positional-default error also takes precedence over a keyword-only default length mismatch. Remove the expected-failure markers from the FunctionDef and Lambda AST validator tests that now pass. Assisted-by: Codex:gpt-5.6-sol --- Lib/test/test_ast/test_ast.py | 2 -- crates/vm/src/stdlib/_ast/parameter.rs | 34 +++++++++++++++++++++++++- crates/vm/src/stdlib/_ast/validate.rs | 5 +++- 3 files changed, 37 insertions(+), 4 deletions(-) diff --git a/Lib/test/test_ast/test_ast.py b/Lib/test/test_ast/test_ast.py index 1450f440d..a3ce57034 100644 --- a/Lib/test/test_ast/test_ast.py +++ b/Lib/test/test_ast/test_ast.py @@ -2055,7 +2055,6 @@ class ASTValidatorTests(unittest.TestCase): kw_defaults=[None, ast.Name("x", ast.Store())]), "must have Load context") - @unittest.expectedFailure # TODO: RUSTPYTHON; ValueError not raised def test_funcdef(self): a = ast.arguments([], [], None, [], [], None, []) f = ast.FunctionDef("x", a, [], [], None, None, []) @@ -2267,7 +2266,6 @@ class ASTValidatorTests(unittest.TestCase): u = ast.UnaryOp(ast.Not(), ast.Name("x", ast.Store())) self.expr(u, "must have Load context") - @unittest.expectedFailure # TODO: RUSTPYTHON; ValueError not raised def test_lambda(self): a = ast.arguments([], [], None, [], [], None, []) self.expr(ast.Lambda(a, ast.Name("x", ast.Store())), diff --git a/crates/vm/src/stdlib/_ast/parameter.rs b/crates/vm/src/stdlib/_ast/parameter.rs index 477ceeb62..1ce4973b4 100644 --- a/crates/vm/src/stdlib/_ast/parameter.rs +++ b/crates/vm/src/stdlib/_ast/parameter.rs @@ -88,14 +88,23 @@ impl Node for ast::Parameters { "arguments", )?; + validate_parameter_annotations( + vm, + &posonlyargs, + &args, + vararg.as_deref(), + &kwonlyargs, + kwarg.as_deref(), + )?; + let ParameterDefaults { runtime_defaults, defaults, _range: _, } = defaults; - let kwonlyargs = merge_keyword_parameter_defaults(vm, kwonlyargs, kw_defaults)?; let (posonlyargs, args) = merge_positional_parameter_defaults(vm, posonlyargs, args, defaults)?; + let kwonlyargs = merge_keyword_parameter_defaults(vm, kwonlyargs, kw_defaults)?; Ok(Self { node_index: Default::default(), @@ -114,6 +123,29 @@ impl Node for ast::Parameters { } } +fn validate_parameter_annotations( + vm: &VirtualMachine, + posonlyargs: &PositionalParameters, + args: &PositionalParameters, + vararg: Option<&ast::Parameter>, + kwonlyargs: &KeywordParameters, + kwarg: Option<&ast::Parameter>, +) -> PyResult<()> { + for parameter in posonlyargs.args.iter().chain(&args.args) { + super::validate::validate_parameter_annotation(vm, parameter)?; + } + if let Some(parameter) = vararg { + super::validate::validate_parameter_annotation(vm, parameter)?; + } + for parameter in &kwonlyargs.keywords { + super::validate::validate_parameter_annotation(vm, parameter)?; + } + if let Some(parameter) = kwarg { + super::validate::validate_parameter_annotation(vm, parameter)?; + } + Ok(()) +} + // product impl Node for ast::Parameter { fn ast_to_object(self, vm: &VirtualMachine, source_file: &SourceFile) -> PyObjectRef { diff --git a/crates/vm/src/stdlib/_ast/validate.rs b/crates/vm/src/stdlib/_ast/validate.rs index 081197d6b..e936c9d3f 100644 --- a/crates/vm/src/stdlib/_ast/validate.rs +++ b/crates/vm/src/stdlib/_ast/validate.rs @@ -56,7 +56,10 @@ fn validate_keywords(vm: &VirtualMachine, keywords: &[ast::Keyword]) -> PyResult Ok(()) } -fn validate_parameter_annotation(vm: &VirtualMachine, parameter: &ast::Parameter) -> PyResult<()> { +pub(super) fn validate_parameter_annotation( + vm: &VirtualMachine, + parameter: &ast::Parameter, +) -> PyResult<()> { if let Some(annotation) = &parameter.annotation { validate_expr(vm, annotation, ast::ExprContext::Load)?; } From 3dca6bbdf426b29a39a2e925bb03a95539b06099 Mon Sep 17 00:00:00 2001 From: Joshua Megnauth <48846352+joshuamegnauth54@users.noreply.github.com> Date: Thu, 30 Jul 2026 09:12:38 -0400 Subject: [PATCH 327/339] Fix x86_64-pc-windows-gnu build (#8411) A few functions were improperly gated to MSVC. Those functions call `windows-sys` so they're not MSVC. --- .github/actions/install-linux-deps/action.yml | 8 ++++++++ .github/workflows/ci.yaml | 5 +++++ crates/host_env/src/time.rs | 6 +++--- crates/vm/src/stdlib/time.rs | 2 +- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.github/actions/install-linux-deps/action.yml b/.github/actions/install-linux-deps/action.yml index 46ce74d50..c2f1b20f2 100644 --- a/.github/actions/install-linux-deps/action.yml +++ b/.github/actions/install-linux-deps/action.yml @@ -29,6 +29,10 @@ inputs: description: Install gcc-aarch64-linux-gnu (gcc-aarch64-linux-gnu) required: false default: "false" + gcc-mingw-w64-x86-64: + description: Install gcc-mingw-w64-x86-64 (gcc-mingw-w64-x86-64) + required: false + default: "false" clang: description: Install clang (clang) required: false @@ -44,6 +48,7 @@ runs: MUSL_TOOLS: ${{ inputs.musl-tools }} CLANG: ${{ inputs.clang }} GCC_AARCH64_LINUX_GNU: ${{ inputs.gcc-aarch64-linux-gnu }} + GCC_MINGW_W64_X86_64: ${{ inputs.gcc-mingw-w64-x86-64 }} run: | if ! sudo apt-get update; then echo "::warning::apt-get update failed; disabling nonessential Microsoft apt sources and retrying" @@ -68,6 +73,9 @@ runs: if [[ "$GCC_AARCH64_LINUX_GNU" == "true" ]]; then packages+=(gcc-aarch64-linux-gnu linux-libc-dev-arm64-cross libc6-dev-arm64-cross) fi + if [[ "$GCC_MINGW_W64_X86_64" == "true" ]]; then + packages+=(gcc-mingw-w64-x86-64) + fi if ((${#packages[@]})); then sudo apt-get install --no-install-recommends "${packages[@]}" diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 10541d1b6..7d0ab2e7c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -198,6 +198,10 @@ jobs: target: aarch64-unknown-linux-gnu dependencies: gcc-aarch64-linux-gnu: true + - os: ubuntu-latest + target: x86_64-pc-windows-gnu + dependencies: + gcc-mingw-w64-x86-64: true - os: macos-latest target: aarch64-apple-ios - os: macos-latest @@ -216,6 +220,7 @@ jobs: gcc-multilib: ${{ matrix.dependencies.gcc-multilib || false }} musl-tools: ${{ matrix.dependencies.musl-tools || false }} gcc-aarch64-linux-gnu: ${{ matrix.dependencies.gcc-aarch64-linux-gnu || false }} + gcc-mingw-w64-x86-64: ${{ matrix.dependencies.gcc-mingw-w64-x86-64 || false }} - name: Restore cache uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 diff --git a/crates/host_env/src/time.rs b/crates/host_env/src/time.rs index cc0b7d30c..19f320dad 100644 --- a/crates/host_env/src/time.rs +++ b/crates/host_env/src/time.rs @@ -334,7 +334,7 @@ pub fn gethrvtime_duration() -> Duration { Duration::from_nanos(unsafe { libc::gethrvtime() }) } -#[cfg(target_env = "msvc")] +#[cfg(windows)] #[cfg(not(target_arch = "wasm32"))] #[derive(Clone, Debug)] pub struct WindowsTimeZoneInfo { @@ -345,7 +345,7 @@ pub struct WindowsTimeZoneInfo { pub daylight_name: String, } -#[cfg(target_env = "msvc")] +#[cfg(windows)] #[cfg(not(target_arch = "wasm32"))] fn decode_tz_name(name: &[u16]) -> String { widestring::decode_utf16_lossy(name.iter().copied()) @@ -353,7 +353,7 @@ fn decode_tz_name(name: &[u16]) -> String { .collect() } -#[cfg(target_env = "msvc")] +#[cfg(windows)] #[cfg(not(target_arch = "wasm32"))] #[must_use] pub fn get_tz_info() -> WindowsTimeZoneInfo { diff --git a/crates/vm/src/stdlib/time.rs b/crates/vm/src/stdlib/time.rs index 4c9fd70c4..226432654 100644 --- a/crates/vm/src/stdlib/time.rs +++ b/crates/vm/src/stdlib/time.rs @@ -210,7 +210,7 @@ mod decl { Ok(get_perf_time(vm)?.as_nanos()) } - #[cfg(target_env = "msvc")] + #[cfg(windows)] #[cfg(not(target_arch = "wasm32"))] pub(super) fn get_tz_info() -> host_time::WindowsTimeZoneInfo { host_time::get_tz_info() From 6a7d0fd144fd9b50c2fb9bd954bcbf8a952e9ff3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B0=95=ED=9A=A8=EC=A2=85?= <phj2784@naver.com> Date: Thu, 30 Jul 2026 22:13:22 +0900 Subject: [PATCH 328/339] Allow lone-surrogate keyword keys in f(**d) (#8409) * Allow lone-surrogate keyword keys in f(**d) `f(**{'\udc81': 2})` raised `TypeError: keywords must be strings` even though the key is a valid `str`, because `KwArgs` stored keys as Rust `String` (strict UTF-8) and `collect_ex_args` narrowed each key to `PyUtf8Str` (valid UTF-8 required). CPython only checks that the key is a `str` (`Py_TPFLAGS_UNICODE_SUBCLASS`), never encoding validity. Change `KwArgs<T>`'s key type from `String` to `Wtf8Buf` (the WTF-8 storage `PyStr` already uses) and relax the keyword-key downcast from `PyUtf8Str` to `PyStr` in `collect_ex_args`, `from_vectorcall`/ `from_vectorcall_owned` (which previously panicked on surrogate keys), the `functools.partial` keyword merge, and the C-API `dict_to_kwargs`. `Wtf8Buf` borrows only as `Wtf8`, so inherent `get`/`contains_key`/ `swap_remove`/`shift_remove(&str)` on `KwArgs` restore the `&str` lookup interface `String: Borrow<str>` used to provide (via the zero-cost `Wtf8::new` cast), and a generic `FromIterator<(K: Into<Wtf8Buf>, T)>` keeps construction sites unchanged. WTF-8 awareness stays localized to `function/argument.rs`. Fixes #8228 Assisted-by: Claude Code:claude-opus-4-8 * Avoid cloning kwargs keys in _ast, borrow via as_ref instead `new_str` only needs a `&Wtf8`, so pass `key.as_ref()` rather than cloning the key into an owned `Wtf8Buf`. The key is reused afterwards (error message, `intern_str`), so a borrow is the right fit. Assisted-by: Claude Code:claude-opus-4-8 --- crates/capi/src/abstract_.rs | 4 +- crates/stdlib/src/_asyncio.rs | 8 +-- crates/vm/src/builtins/function.rs | 11 ++++- crates/vm/src/builtins/function/jit.rs | 3 ++ crates/vm/src/frame.rs | 6 ++- crates/vm/src/function/argument.rs | 60 +++++++++++++++++------ crates/vm/src/stdlib/_ast/python.rs | 13 ++--- crates/vm/src/stdlib/_ctypes/structure.rs | 9 ++-- crates/vm/src/stdlib/_ctypes/union.rs | 9 ++-- crates/vm/src/stdlib/_functools.rs | 5 +- crates/vm/src/stdlib/_operator.rs | 2 +- crates/vm/src/stdlib/_typing.rs | 4 +- crates/vm/src/types/structseq.rs | 3 +- crates/wasm/src/convert.rs | 13 +++-- 14 files changed, 102 insertions(+), 48 deletions(-) diff --git a/crates/capi/src/abstract_.rs b/crates/capi/src/abstract_.rs index 08b4e5400..fd6e966bd 100644 --- a/crates/capi/src/abstract_.rs +++ b/crates/capi/src/abstract_.rs @@ -25,9 +25,11 @@ fn dict_to_kwargs(vm: &VirtualMachine, dict: &Py<PyDict>) -> PyResult<KwArgs> { dict.items_vec() .into_iter() .map(|(key, value)| { + // `to_string()` would replace lone surrogates with U+FFFD; keep the + // raw WTF-8 so surrogate keys round-trip (issue #8228). let key = key .downcast_ref::<PyStr>() - .map(|s| s.to_string()) + .map(|s| s.as_wtf8().to_owned()) .ok_or_else(|| vm.new_type_error("keywords must be strings"))?; Ok((key, value)) }) diff --git a/crates/stdlib/src/_asyncio.rs b/crates/stdlib/src/_asyncio.rs index 0c74310ea..3146e39b7 100644 --- a/crates/stdlib/src/_asyncio.rs +++ b/crates/stdlib/src/_asyncio.rs @@ -566,7 +566,7 @@ pub(crate) mod _asyncio { let args = if let Some(ctx) = context { FuncArgs::new( vec![callback, future_arg], - KwArgs::new(core::iter::once(("context".to_owned(), ctx)).collect()), + KwArgs::new(core::iter::once((Wtf8Buf::from("context"), ctx)).collect()), ) } else { FuncArgs::new(vec![callback, future_arg], KwArgs::default()) @@ -1498,7 +1498,7 @@ pub(crate) mod _asyncio { let args = if let Some(ctx) = context { FuncArgs::new( vec![callback, task_arg], - KwArgs::new(core::iter::once(("context".to_owned(), ctx)).collect()), + KwArgs::new(core::iter::once((Wtf8Buf::from("context"), ctx)).collect()), ) } else { FuncArgs::new(vec![callback, task_arg], KwArgs::default()) @@ -1527,7 +1527,7 @@ pub(crate) mod _asyncio { let cancel_args = if let Some(ref m) = msg_value { FuncArgs::new( vec![], - KwArgs::new(core::iter::once(("msg".to_owned(), m.clone())).collect()), + KwArgs::new(core::iter::once((Wtf8Buf::from("msg"), m.clone())).collect()), ) } else { FuncArgs::new(vec![], KwArgs::default()) @@ -2213,7 +2213,7 @@ pub(crate) mod _asyncio { let cancel_args = if let Some(ref m) = cancel_msg { FuncArgs::new( vec![], - KwArgs::new(core::iter::once(("msg".to_owned(), m.clone())).collect()), + KwArgs::new(core::iter::once((Wtf8Buf::from("msg"), m.clone())).collect()), ) } else { FuncArgs::new(vec![], KwArgs::default()) diff --git a/crates/vm/src/builtins/function.rs b/crates/vm/src/builtins/function.rs index af359f111..43cc33a90 100644 --- a/crates/vm/src/builtins/function.rs +++ b/crates/vm/src/builtins/function.rs @@ -337,8 +337,13 @@ impl PyFunction { let mut posonly_passed_as_kwarg = Vec::new(); // Handle keyword arguments for (name, value) in func_args.kwargs { + // Parameter names are plain identifiers, so a non-UTF-8 (surrogate) key + // can never match one and just falls through to **kwargs / the error path. + let name_str = name.as_str().ok(); // Check if we have a parameter with this name: - if let Some(pos) = arg_pos(code.posonlyarg_count as usize..total_args, &name) { + if let Some(pos) = + name_str.and_then(|s| arg_pos(code.posonlyarg_count as usize..total_args, s)) + { let slot = &mut fastlocals[pos]; if slot.is_some() { return Err(vm.new_type_error(format!( @@ -350,7 +355,9 @@ impl PyFunction { *slot = Some(value); } else if let Some(kwargs) = kwargs.as_ref() { kwargs.set_item(&name, value, vm)?; - } else if arg_pos(0..code.posonlyarg_count as usize, &name).is_some() { + } else if name_str + .is_some_and(|s| arg_pos(0..code.posonlyarg_count as usize, s).is_some()) + { posonly_passed_as_kwarg.push(name); } else { return Err(vm.new_type_error(format!( diff --git a/crates/vm/src/builtins/function/jit.rs b/crates/vm/src/builtins/function/jit.rs index 8432bb536..96c1465d4 100644 --- a/crates/vm/src/builtins/function/jit.rs +++ b/crates/vm/src/builtins/function/jit.rs @@ -184,6 +184,9 @@ pub(crate) fn get_jit_args<'a>( for (name, value) in &func_args.kwargs { let arg_pos = |args: &[&PyStrInterned], name: &str| args.iter().position(|arg| arg.as_str() == name); + // Parameter names are plain identifiers, so a non-UTF-8 (surrogate) key + // can never match one. + let name = name.as_str().map_err(|_| ArgsError::NotAKeywordArg)?; if let Some(arg_idx) = arg_pos(arg_names.args, name) { if jit_args.is_set(arg_idx) { return Err(ArgsError::ArgPassedMultipleTimes); diff --git a/crates/vm/src/frame.rs b/crates/vm/src/frame.rs index 2743bf3d5..5df8b85e5 100644 --- a/crates/vm/src/frame.rs +++ b/crates/vm/src/frame.rs @@ -7112,11 +7112,13 @@ impl ExecutingFrame<'_> { let func_str = Self::object_function_str(callable, vm); Self::iterate_mapping_keys(vm, &kw_obj, &func_str, |key| { + // `PyStr`, not `PyUtf8Str`: CPython only checks that the key is a + // `str`, not that it is valid UTF-8, so surrogate keys are accepted. let key_str = key - .downcast_ref::<PyUtf8Str>() + .downcast_ref::<PyStr>() .ok_or_else(|| vm.new_type_error("keywords must be strings"))?; let value = kw_obj.get_item(&*key, vm)?; - kwargs.insert(key_str.as_str().to_owned(), value); + kwargs.insert(key_str.as_wtf8().to_owned(), value); Ok(()) })? }; diff --git a/crates/vm/src/function/argument.rs b/crates/vm/src/function/argument.rs index 88ef5581b..aabe484c2 100644 --- a/crates/vm/src/function/argument.rs +++ b/crates/vm/src/function/argument.rs @@ -1,6 +1,7 @@ use crate::{ AsObject, PyObjectRef, PyPayload, PyRef, PyResult, TryFromObject, VirtualMachine, builtins::{PyBaseExceptionRef, PyTupleRef, PyTypeRef}, + common::wtf8::{Wtf8, Wtf8Buf}, convert::ToPyObject, object::{Traverse, TraverseFn}, }; @@ -155,10 +156,12 @@ impl FuncArgs { .iter() .zip(&args[nargs..nargs + names.len()]) .map(|(name, val)| { + // `PyStr`, not `PyUtf8Str`: a surrogate key is a valid str and + // must survive as WTF-8 rather than panic. let key = name - .downcast_ref::<crate::builtins::PyUtf8Str>() + .downcast_ref::<crate::builtins::PyStr>() .expect("kwnames must be strings") - .as_str() + .as_wtf8() .to_owned(); (key, val.clone()) }) @@ -187,9 +190,9 @@ impl FuncArgs { .zip(args.drain(nargs..nargs + kw_count)) .map(|(name, val)| { let key = name - .downcast_ref::<crate::builtins::PyUtf8Str>() + .downcast_ref::<crate::builtins::PyStr>() .expect("kwnames must be strings") - .as_str() + .as_wtf8() .to_owned(); (key, val) }) @@ -268,7 +271,7 @@ impl FuncArgs { self.kwargs.swap_remove(name) } - pub fn remaining_keywords(&mut self) -> impl Iterator<Item = (String, PyObjectRef)> + '_ { + pub fn remaining_keywords(&mut self) -> impl Iterator<Item = (Wtf8Buf, PyObjectRef)> + '_ { self.kwargs.drain(..) } @@ -406,8 +409,12 @@ impl<T: TryFromObject> FromArgOptional for T { /// KwArgs is only for functions that accept arbitrary keyword arguments. For /// functions that accept only *specific* named arguments, a rust struct with /// an appropriate FromArgs implementation must be created. +// Keys are stored as `Wtf8Buf`, not `String`, so that a lone-surrogate keyword +// name coming through `f(**d)` is preserved instead of being rejected (see +// issue #8228). `PyStr` is WTF-8 backed, and CPython only requires that a +// keyword key be a `str`, not that it be valid UTF-8. #[derive(Clone, Debug)] -pub struct KwArgs<T = PyObjectRef>(IndexMap<String, T>); +pub struct KwArgs<T = PyObjectRef>(IndexMap<Wtf8Buf, T>); impl<T> Default for KwArgs<T> { fn default() -> Self { @@ -416,7 +423,7 @@ impl<T> Default for KwArgs<T> { } impl<T> Deref for KwArgs<T> { - type Target = IndexMap<String, T>; + type Target = IndexMap<Wtf8Buf, T>; fn deref(&self) -> &Self::Target { &self.0 @@ -440,24 +447,47 @@ where impl<T> KwArgs<T> { #[must_use] - pub const fn new(map: IndexMap<String, T>) -> Self { + pub const fn new(map: IndexMap<Wtf8Buf, T>) -> Self { Self(map) } + // `String` keys accepted `&str` lookups for free via `Borrow<str>`; `Wtf8Buf` + // borrows only as `Wtf8`, so these inherent methods restore the `&str` interface + // via the zero-cost `Wtf8::new` cast, keeping every call site unchanged. + #[must_use] + pub fn get(&self, name: &str) -> Option<&T> { + self.0.get(Wtf8::new(name)) + } + + #[must_use] + pub fn contains_key(&self, name: &str) -> bool { + self.0.contains_key(Wtf8::new(name)) + } + + pub fn swap_remove(&mut self, name: &str) -> Option<T> { + self.0.swap_remove(Wtf8::new(name)) + } + + pub fn shift_remove(&mut self, name: &str) -> Option<T> { + self.0.shift_remove(Wtf8::new(name)) + } + pub fn pop_kwarg(&mut self, name: &str) -> Option<T> { self.swap_remove(name) } } -impl<T> FromIterator<(String, T)> for KwArgs<T> { - fn from_iter<I: IntoIterator<Item = (String, T)>>(iter: I) -> Self { - Self(iter.into_iter().collect()) +// Accept any key that converts into `Wtf8Buf` (notably `String`), so existing +// call sites that build kwargs from string literals keep compiling unchanged. +impl<K: Into<Wtf8Buf>, T> FromIterator<(K, T)> for KwArgs<T> { + fn from_iter<I: IntoIterator<Item = (K, T)>>(iter: I) -> Self { + Self(iter.into_iter().map(|(k, v)| (k.into(), v)).collect()) } } impl<'a, T> IntoIterator for &'a KwArgs<T> { - type Item = (&'a String, &'a T); - type IntoIter = indexmap::map::Iter<'a, String, T>; + type Item = (&'a Wtf8Buf, &'a T); + type IntoIter = indexmap::map::Iter<'a, Wtf8Buf, T>; fn into_iter(self) -> Self::IntoIter { self.0.iter() @@ -465,8 +495,8 @@ impl<'a, T> IntoIterator for &'a KwArgs<T> { } impl<T> IntoIterator for KwArgs<T> { - type Item = (String, T); - type IntoIter = indexmap::map::IntoIter<String, T>; + type Item = (Wtf8Buf, T); + type IntoIter = indexmap::map::IntoIter<Wtf8Buf, T>; fn into_iter(self) -> Self::IntoIter { self.0.into_iter() diff --git a/crates/vm/src/stdlib/_ast/python.rs b/crates/vm/src/stdlib/_ast/python.rs index e7697e4cf..db92f20db 100644 --- a/crates/vm/src/stdlib/_ast/python.rs +++ b/crates/vm/src/stdlib/_ast/python.rs @@ -8,8 +8,9 @@ use super::{ pub(crate) mod _ast { use crate::{ AsObject, Context, Py, PyObject, PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine, - builtins::{PyDictRef, PySet, PyStr, PyTupleRef, PyType, PyTypeRef, PyUtf8Str}, + builtins::{PyDictRef, PySet, PyStr, PyTupleRef, PyType, PyTypeRef}, class::{PyClassImpl, StaticType}, + common::wtf8::Wtf8Buf, function::{ArgIterable, FuncArgs, KwArgs, PyMethodDef, PyMethodFlags}, stdlib::_ast::repr, types::{Constructor, Initializer}, @@ -229,7 +230,7 @@ pub(crate) mod _ast { ast_replace_set_update(&expecting, attributes.as_ref(), vm)?; for (key, _value) in &args.kwargs { - let key_obj: PyObjectRef = vm.ctx.new_str(key.as_str()).into(); + let key_obj: PyObjectRef = vm.ctx.new_str(key.as_ref()).into(); if !ast_replace_set_discard(&expecting, &key_obj, vm)? { return Err(vm.new_type_error(format!( "{}.__replace__ got an unexpected keyword argument '{}'.", @@ -290,11 +291,11 @@ pub(crate) mod _ast { .into_iter() .map(|(key, value)| { let key = key - .downcast::<PyUtf8Str>() + .downcast::<PyStr>() .map_err(|_| vm.new_type_error("keywords must be strings"))?; - Ok((key.as_str().to_owned(), value)) + Ok((key.as_wtf8().to_owned(), value)) }) - .collect::<PyResult<IndexMap<String, PyObjectRef>>>()?; + .collect::<PyResult<IndexMap<Wtf8Buf, PyObjectRef>>>()?; let result = type_obj.call(FuncArgs::new(vec![], KwArgs::new(kwargs)), vm)?; Ok(result) } @@ -418,7 +419,7 @@ pub(crate) mod _ast { ast_replace_set_discard(&remaining_fields, &name, vm)?; } for (key, value) in args.kwargs { - let key_obj: PyObjectRef = vm.ctx.new_str(key.as_str()).into(); + let key_obj: PyObjectRef = vm.ctx.new_str(key.as_ref()).into(); let contains = fields_seq.contains(&key_obj, vm)?; if contains { if !ast_replace_set_discard(&remaining_fields, &key_obj, vm)? { diff --git a/crates/vm/src/stdlib/_ctypes/structure.rs b/crates/vm/src/stdlib/_ctypes/structure.rs index 39bb8a574..34f53f52d 100644 --- a/crates/vm/src/stdlib/_ctypes/structure.rs +++ b/crates/vm/src/stdlib/_ctypes/structure.rs @@ -1,5 +1,6 @@ use super::base::{CDATA_BUFFER_METHODS, PyCData, PyCField, StgInfo, StgInfoFlags}; use crate::builtins::{PyList, PyStr, PyTuple, PyType, PyTypeRef, PyUtf8Str}; +use crate::common::wtf8::Wtf8Buf; use crate::convert::ToPyObject; use crate::function::{FuncArgs, OptionalArg, PySetterValue}; use crate::protocol::{BufferDescriptor, PyBuffer, PyNumberMethods}; @@ -712,7 +713,7 @@ impl PyCStructure { self_obj: &Py<Self>, type_obj: &Py<PyType>, args: &[PyObjectRef], - kwargs: &indexmap::IndexMap<String, PyObjectRef>, + kwargs: &indexmap::IndexMap<Wtf8Buf, PyObjectRef>, index: usize, vm: &VirtualMachine, ) -> PyResult<usize> { @@ -746,7 +747,7 @@ impl PyCStructure { && let Some(name) = tuple.first() && let Some(name_str) = name.downcast_ref::<PyUtf8Str>() { - let field_name = name_str.as_str().to_owned(); + let field_name = name_str.as_wtf8().to_owned(); // Check for duplicate in kwargs if kwargs.contains_key(&field_name) { return Err( @@ -784,9 +785,9 @@ impl Initializer for PyCStructure { } // 2. Process keyword arguments - for (key, value) in &args.kwargs { + for (key, value) in args.kwargs { zelf.as_object() - .set_attr(vm.ctx.intern_str(key.as_str()), value.clone(), vm)?; + .set_attr(vm.ctx.intern_str(key), value, vm)?; } Ok(()) diff --git a/crates/vm/src/stdlib/_ctypes/union.rs b/crates/vm/src/stdlib/_ctypes/union.rs index 8d37178d5..727ad0118 100644 --- a/crates/vm/src/stdlib/_ctypes/union.rs +++ b/crates/vm/src/stdlib/_ctypes/union.rs @@ -1,6 +1,7 @@ use super::base::{CDATA_BUFFER_METHODS, StgInfoFlags}; use super::{PyCData, PyCField, StgInfo}; use crate::builtins::{PyList, PyStr, PyTuple, PyType, PyTypeRef, PyUtf8Str}; +use crate::common::wtf8::Wtf8Buf; use crate::convert::ToPyObject; use crate::function::{ArgBytesLike, FuncArgs, OptionalArg, PySetterValue}; use crate::protocol::{BufferDescriptor, PyBuffer}; @@ -581,7 +582,7 @@ impl PyCUnion { self_obj: &Py<Self>, type_obj: &Py<PyType>, args: &[PyObjectRef], - kwargs: &indexmap::IndexMap<String, PyObjectRef>, + kwargs: &indexmap::IndexMap<Wtf8Buf, PyObjectRef>, index: usize, vm: &VirtualMachine, ) -> PyResult<usize> { @@ -617,7 +618,7 @@ impl PyCUnion { && let Some(name) = tuple.first() && let Some(name_str) = name.downcast_ref::<PyUtf8Str>() { - let field_name = name_str.as_str().to_owned(); + let field_name = name_str.as_wtf8().to_owned(); // Check for duplicate in kwargs if kwargs.contains_key(&field_name) { return Err( @@ -655,9 +656,9 @@ impl Initializer for PyCUnion { } // 2. Process keyword arguments - for (key, value) in &args.kwargs { + for (key, value) in args.kwargs { zelf.as_object() - .set_attr(vm.ctx.intern_str(key.as_str()), value.clone(), vm)?; + .set_attr(vm.ctx.intern_str(key), value, vm)?; } Ok(()) diff --git a/crates/vm/src/stdlib/_functools.rs b/crates/vm/src/stdlib/_functools.rs index 7c6914c2f..94b9565e7 100644 --- a/crates/vm/src/stdlib/_functools.rs +++ b/crates/vm/src/stdlib/_functools.rs @@ -373,7 +373,7 @@ mod _functools { // Add new keywords for (key, value) in args.kwargs { - final_keywords.set_item(vm.ctx.intern_str(key.as_str()), value, vm)?; + final_keywords.set_item(vm.ctx.intern_str(key), value, vm)?; } Ok(Self { @@ -436,10 +436,11 @@ mod _functools { // Add keywords from self.keywords for (key, value) in &*keywords { + // `expect_str()` would panic on surrogate keys; keep them as WTF-8. let key_str = key .downcast_ref::<crate::builtins::PyStr>() .ok_or_else(|| vm.new_type_error("keywords must be strings"))?; - final_kwargs.insert(key_str.expect_str().to_owned(), value); + final_kwargs.insert(key_str.as_wtf8().to_owned(), value); } // Add keywords from args.kwargs (these override self.keywords) diff --git a/crates/vm/src/stdlib/_operator.rs b/crates/vm/src/stdlib/_operator.rs index e4db04605..5e72ef03e 100644 --- a/crates/vm/src/stdlib/_operator.rs +++ b/crates/vm/src/stdlib/_operator.rs @@ -610,7 +610,7 @@ mod _operator { } for (key, value) in kwargs { result.push_str(", "); - result.push_str(key); + result.push_wtf8(key); result.push_char('='); result.push_wtf8(value.repr(vm)?.as_wtf8()); } diff --git a/crates/vm/src/stdlib/_typing.rs b/crates/vm/src/stdlib/_typing.rs index 45740f7eb..04b9208b3 100644 --- a/crates/vm/src/stdlib/_typing.rs +++ b/crates/vm/src/stdlib/_typing.rs @@ -353,9 +353,9 @@ pub(crate) mod decl { // typealias(name, value, *, type_params=()) // name and value are positional-or-keyword; type_params is keyword-only. - // Reject unexpected keyword arguments + // Reject unexpected keyword arguments. for key in args.kwargs.keys() { - if key != "name" && key != "value" && key != "type_params" { + if !matches!(key.as_str(), Ok("name" | "value" | "type_params")) { return Err(vm.new_type_error(format!( "typealias() got an unexpected keyword argument '{key}'" ))); diff --git a/crates/vm/src/types/structseq.rs b/crates/vm/src/types/structseq.rs index b7468d4a7..703cc79c1 100644 --- a/crates/vm/src/types/structseq.rs +++ b/crates/vm/src/types/structseq.rs @@ -1,4 +1,5 @@ use crate::common::lock::LazyLock; +use crate::common::wtf8::Wtf8; use crate::{ AsObject, Py, PyObject, PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine, atomic_func, builtins::{PyBaseExceptionRef, PyStr, PyStrRef, PyTuple, PyTupleRef, PyType, PyTypeRef}, @@ -276,7 +277,7 @@ pub trait PyStructSequence: StaticType + PyClassImpl + Sized + 'static { // Check for unexpected keyword arguments if !kwargs.is_empty() { - let names: Vec<&str> = kwargs.keys().map(|k| k.as_str()).collect(); + let names: Vec<&Wtf8> = kwargs.keys().map(|k| k.as_ref()).collect(); return Err(vm.new_type_error(format!("Got unexpected field name(s): {names:?}"))); } diff --git a/crates/wasm/src/convert.rs b/crates/wasm/src/convert.rs index 17ad5b629..3e07b27d4 100644 --- a/crates/wasm/src/convert.rs +++ b/crates/wasm/src/convert.rs @@ -119,9 +119,12 @@ pub fn py_to_js(vm: &VirtualMachine, py_obj: PyObjectRef) -> JsValue { if let Some(ref kwargs) = kwargs { for pair in object_entries(kwargs) { let (key, val) = pair?; - py_func_args - .kwargs - .insert(js_sys::JsString::from(key).into(), js_to_py(vm, val)); + py_func_args.kwargs.insert( + // JS strings coming in are UTF-16; go through Rust `String` + // (kwargs keys are now WTF-8, so convert String -> Wtf8Buf). + String::from(js_sys::JsString::from(key)).into(), + js_to_py(vm, val), + ); } } let result = py_obj.call(py_func_args, vm); @@ -229,7 +232,9 @@ pub fn js_to_py(vm: &VirtualMachine, js_val: JsValue) -> PyObjectRef { move |args: FuncArgs, vm: &VirtualMachine| -> PyResult { let this = Object::new(); for (k, v) in args.kwargs { - Reflect::set(&this, &k.into(), &py_to_js(vm, v)) + // WTF-8 -> JS string: lone surrogates in the key become U+FFFD + // (wasm-bindgen only accepts Rust `String`); acceptable at this boundary. + Reflect::set(&this, &k.to_string().into(), &py_to_js(vm, v)) .expect("property to be settable"); } let js_args = args From cdf006cfa1b387e22a03bbf8ce3c1ed1e8b6651f Mon Sep 17 00:00:00 2001 From: "Jeong, YunWon" <69878+youknowone@users.noreply.github.com> Date: Sat, 1 Aug 2026 00:59:41 +0900 Subject: [PATCH 329/339] Split InterpreterFrame from FrameObject for stack-allocated execution (#8354) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add LightFrame for unobserved Python-to-Python calls Allocate a lightweight LightFrame header on the DataStack instead of a full Frame PyObject for specialized exact-args call paths. The frame is materialized lazily only when observed (sys._getframe, traceback, tracing). Key changes: - LightFrame struct with borrowed pointers and no refcount overhead - FrameSource enum (Heavy/Light) replacing the object field on ExecutingFrame - CURRENT_LIGHT_FRAME TLS for the light frame chain - Interleaved heavy/light frame walking in frame_at_offset_vm and current_thread_frame_vm - invoke_light_slots on PyFunction for the fast call path Call overhead reduced from ~92ns to ~58ns (~37% reduction). fib(28) improved from ~152ms to ~111ms (~27% reduction). Assisted-by: Claude * Streamline with_frame: inline recursion check, skip tracing dispatch - Inline check_recursive_call instead of wrapping in with_recursion closure - Amortize C stack overflow check to every 64th call depth - Skip dispatch_traced_frame when use_tracing is false (hot path) - Add recursion_depth_increment/decrement helpers Assisted-by: Claude * Address review findings for LightFrame correctness - Fix materialize_light_frame previous pointer: use payload pointer (&**frame) instead of Py<Frame> pointer, matching the chain convention - Fix predecessor ref management: use retained_back instead of mem::forget to keep materialized predecessors alive - Fix materialized ref reclaim: use FrameRef::from_raw to drop the leaked keeper ref without double-incrementing - Use PyAtomic<u32> for LightFrame.lasti instead of AtomicU32, removing the unsound cast on non-threading targets - Add amortized C stack overflow check to light frame path - Add scopeguard to light frame execution for panic safety - Remove unnecessary Send/Sync impls from LightFrame - Make check_c_stack_overflow pub(crate) for light frame path access Assisted-by: Claude * Fix CI failures: cspell, stale materialized state, f_back chain gaps - Fix cspell: 'amortised' → 'amortized' - Sync lasti, prev_line, and fastlocals when re-observing a materialized light frame, fixing stale f_locals/f_lineno in test_inspect and others - In with_frame, materialize any active light frame as the heavy frame's predecessor and store it in retained_back, so f_back and inspect.stack see the correct interleaved order (H_new → L_mat → H_old) - Guard invoke_light_slots on NEWLOCALS | OPTIMIZED code flags Assisted-by: Claude * Unify frame chain: replace dual-chain with single FrameChainPtr Replace the dual-chain frame management (CURRENT_FRAME AtomicPtr<Frame> + CURRENT_LIGHT_FRAME Cell<*const LightFrame>) with a single unified chain using FrameChainPtr, a tagged pointer where bit 0 distinguishes heavy (*const Frame) from light (*const LightFrame) entries. Changes: - Add FrameChainPtr type with tagged pointer encoding - Change LightFrame: replace previous_light + saved_current_frame with single previous: FrameChainPtr field - Change InterpreterFrame.previous from AtomicPtr<Frame> to PyAtomic<usize> - Change CURRENT_FRAME TLS from AtomicPtr<Frame> to AtomicUsize - Remove CURRENT_LIGHT_FRAME TLS entirely - Simplify all chain walkers (frame_at_offset, frame_at_offset_vm, find_owned_chain_frame, for_each_current_frame, current_thread_frame) - Remove light-frame materialization block from with_frame - Update f_back to dispatch on FrameChainPtr tags - Update faulthandler and gc_state to walk unified chain - Adaptive C stack check: every call in debug, every 16th in release Assisted-by: Claude * Fix light frame materialization: current_frame, f_back, and GC tracking - current_frame() now uses current_thread_frame_vm() to materialize light frames, fixing super()/compile()/exec() when called from light frame context - materialize_light_frame stores retained_back for heavy predecessors too, so f_back resolves after the caller returns - Escaped materialized frames (traceback, sys._getframe) are GC-tracked at cleanup so reference cycles are collectible - Restore pre-existing @expectedFailure markers for test_frame proxy tests Assisted-by: Claude * Limit light frame materialization to super() only current_frame() returns heavy-only again to avoid unnecessary materialization that extends object lifetimes. super() init uses current_thread_frame_vm() directly since it must inspect the light frame's code and freevars to find __class__. Assisted-by: Claude * Fix remaining CI failures: C stack check, GC tracking threshold, expectedFailure - Check C stack overflow every call in light frame path (not every 16th) to prevent stack overflow on CI workers with smaller stacks - Fix GC tracking threshold: escaped materialized frame detection uses strong_count > 1 (was > 2, missed frames referenced only by traceback in the result) - current_frame() materializes light frames so warnings, compile(), and other callers see the correct frame - Mark test_futures2 PyFutureTests.test_task_exc_handler_correct_context as expectedFailure (pre-existing on main: PyTask __del__ timing) Assisted-by: Claude * Avoid materialization in hot paths: add light-frame-aware accessors current_frame() stays heavy-only to avoid costly materialization on every call. Instead, add current_globals(), current_code(), and current_builtins() that read directly from light frame raw pointers without creating frame PyObjects. Callers migrated: - PyFunction::new: current_builtins() for fallback builtins lookup - compile()/eval(): current_code() for future feature flags - type.__new__: current_globals() for __module__ detection - typevar/typing: current_globals() for caller module name - _io: current_code() for source path check - super(): current_thread_frame_vm() for __class__ cell access - warnings.warn: current_thread_frame_vm() for stack level walk - import: current_globals() for module resolution Assisted-by: Claude * Fix current_locals() to include light frames current_locals() must materialize light frames so locals() builtin returns the correct scope. This fixes test_zipimport doctest and other tests that rely on locals() in light frame context. Assisted-by: Claude * Fix clippy, profile tracing, resume_gen_frame, and faulthandler issues - Fix clippy: collapsible_if in materialize_light_frame, map_unwrap_or in import - Fix profile breakage: use current_thread_frame_vm in trace_event_inner to materialize light frames, preventing frame identity mismatch when profiling is enabled inside a light frame (e.g. profile.Profile.runctx) - Disable light frames inside trace/profile callbacks (tracing_is_suppressed) - Fix resume_gen_frame: skip light frames in previous chain to avoid dangling pointers after generator suspend - Fix faulthandler: emit '<no Python frame>' when chain has only light frames Assisted-by: Claude * Fix materialized frame refcount: transfer localsplus ownership on exit Remove @expectedFailure from test_futures2: the underlying issue was that materialized light frames cloned localsplus values (refcount +1 each), keeping objects alive until the next GC cycle collection. Fix: after run_light_frame returns, transfer ownership of localsplus values from the light frame to the materialized frame, replacing the clones. This eliminates the extra refcount, allowing objects to be GC'd immediately when their last reference is dropped. Also stabilize materialized frame's localsplus on the heap in sync_materialized_on_exit before GC tracking — the data-stack backing will be popped imminently. Assisted-by: Claude * Fix rustfmt, increase stack margin, address review comments - Fix rustfmt formatting issues (lint CI failure) - Increase STACK_MARGIN_BYTES from 2048 to 3072 words to prevent C stack overflow in deep recursion tests on macOS CI (test_functools SIGSEGV) - Skip dispatch_traced_frame when use_tracing is false (review comment) - Fix post-fork top_frame initialization: walk past light frames to find nearest heavy frame (review comment) Assisted-by: Claude * Remove redundant test override in test_futures2 The override only called super() without any marker, making it a no-op that prek flags as a redundant test patch. Assisted-by: Claude * Fix test_pdb and test_functools CI failures - Revert with_frame dispatch_traced_frame skip: tracing can be enabled mid-execution (pdb.set_trace), so Return events must always be checked. This fixes 3 test_pdb doctest failures across all platforms. - Check C stack overflow on every with_frame call instead of every 64th: the previous sampling approach missed overflows between checks when native stack frames are large (invoke_light_slots + lru_cache recursion). - Add #[inline(never)] to invoke_light_slots to prevent the optimizer from merging its stack frame into callers. - Add early C stack check before DataStack allocation in invoke_light_slots. Assisted-by: Claude * Rename Frame to FrameObject, FrameRef to FrameObjectRef Prepare for _PyInterpreterFrame/PyFrameObject separation by renaming the PyObject-backed frame type to FrameObject. Python-visible name ("frame") is unchanged. Assisted-by: Claude * Remove Deref<Target = InterpreterFrame> from FrameObject Replace implicit field access through Deref with explicit iframe()/iframe_ref()/iframe_mut() calls. This decouples FrameObject from InterpreterFrame field layout, enabling independent modification of InterpreterFrame in future commits. Assisted-by: Claude * Move InterpreterFrame identity fields to raw pointers InterpreterFrame's code/globals/builtins/func_obj fields are now borrowed raw pointers instead of owned PyRef/PyObjectRef. Ownership of these references is anchored in FrameObject's new owned_code, owned_globals, owned_builtins, owned_func_obj fields. This aligns InterpreterFrame's layout with LightFrame's existing raw-pointer pattern, enabling future DataStack-based allocation without PyObject heap allocation. - Add code()/globals()/builtins()/func_obj() accessor methods - Add FrameObject::new_ref() for combined create+allocate+patch - Update ExecutingFrame to use &Py<PyCode> / &Py<PyDict> / &PyObject - Update monitoring.rs functions to take &Py<PyCode> instead of &PyRef<PyCode> - Add Send+Sync impls for InterpreterFrame (raw pointers are !Send by default) Assisted-by: Claude * Remove LightFrame, FrameChainPtr, and dual-frame-type infrastructure Delete LightFrame struct, FrameChainPtr tagged pointer, FrameSource enum, and all supporting functions: materialize_light_frame, sync_light_to_materialized, transfer_localsplus_to_materialized, sync_materialized_on_exit, run_light_frame, invoke_light_slots body, LocalsPlus::from_datastack_raw. All call paths now use a single frame type (FrameObject wrapping InterpreterFrame). The frame chain is a simple *const FrameObject linked list through InterpreterFrame.previous. invoke_light_slots delegates to invoke_exact_args_slots. ExecutingFrame.frame_source replaced with ExecutingFrame.frame. Frame chain walking simplified throughout (no more light/heavy dispatch). Net: -724 lines of dual-frame-type complexity. Assisted-by: Claude * Clean up invoke_light_slots and _vm function variants - Replace invoke_light_slots calls with invoke_exact_args_slots - Delete the invoke_light_slots delegate method - Replace current_thread_frame_vm/frame_at_offset_vm with their non-_vm equivalents (no more light frame materialization needed) - Remove stale light-frame comment in callable.rs Assisted-by: Claude * Fix CI lint issues - Move github context expressions from run blocks to env blocks (zizmor/template-injection) - Add workflow-level permissions: {} to lib-deps-check.yaml - Suppress zizmor excessive-permissions for lib-deps-check.yaml (pull_request_target is required for PR comments) - Apply rustfmt formatting Assisted-by: Claude * Stack-allocate InterpreterFrame for non-generator function calls - Extract InterpreterFrame::new() from FrameObject::new() - Change frame chain from *const FrameObject to *const InterpreterFrame - Add InterpreterFrame.materialized field for lazy FrameObject creation - Add vm.with_iframe()/run_frame_fast() for stack-allocated frame execution - Move ExecutingFrame.frame to iframe: *const InterpreterFrame - Implement lazy materialize() for on-demand FrameObject creation - Update invoke_with_locals/invoke_prepared_exact_args to skip heap allocation - Update frame chain walking in faulthandler, gc_state, builtins/frame - super() reads InterpreterFrame directly without materialization Assisted-by: Claude * Remove unnecessary refcount and atomic ops from fast call path - Use raw pointer for func_obj instead of cloning PyObjectRef (saves 2 atomic RMW) - Skip owner AcqRel swap for stack-allocated frames (always Thread-owned) Assisted-by: Claude * Change trace field to Option<PyObjectRef>, remove vm from InterpreterFrame::new - trace: PyMutex<PyObjectRef> -> PyMutex<Option<PyObjectRef>> - Eliminates vm.ctx.none() refcount inc/dec per frame init - Remove vm parameter from InterpreterFrame::new() (no longer needed) - f_trace getter returns None when trace is unset - f_trace setter stores None instead of the None singleton Assisted-by: Claude * Store current frame pointer on VirtualMachine for fast lookup - Add current_frame_ptr Cell<usize> field to VirtualMachine - Hot path (with_iframe) reads/writes vm.current_frame_ptr instead of TLS - TLS CURRENT_FRAME still maintained for signal-safe traceback walking - Use set_current_frame_nosave() to skip cross-thread top_frame update - super(), frame_at_offset, current_thread_frame_materialize use vm Cell Assisted-by: Claude * Apply rustfmt Assisted-by: Claude * Fix clippy use_self warnings, add inline hints for hot path Assisted-by: Claude * Remove code refcount clone from fast call path Defer code.to_owned() to the generator/coroutine path only. On the fast path, use &Py<PyCode> directly — the code object is alive via the PyFunction on the caller's stack. Assisted-by: Claude * Remove VM current_frame_ptr Cell (fix SIGSEGV in threading builds) The Cell<usize> on VirtualMachine could desynchronize from the TLS CURRENT_FRAME in nested VM scenarios (enter_vm called with different VMs on the same thread). Revert to TLS-only frame chain management. Keep set_current_frame_nosave() for the stack-frame fast path: it skips cross-thread top_frame publication but still does the TLS swap. Fix clippy not_unsafe_ptr_arg_deref in set_current_frame. Fix unnecessary Result wrapper in make_generator_or_coro. Assisted-by: Claude * Fix CI failures: GC frame assertion, faulthandler Radium import, dead code warning - Fix SIGSEGV in threading builds: GC debug assertion walked frame chain via top_frame, which is not updated by set_current_frame_nosave used by stack-allocated iframes. Walk CURRENT_FRAME TLS chain instead. - Add InterpreterFrame::get_lasti() accessor, remove direct Radium import from faulthandler.rs (fixes unused import warning). - Add cfg_attr allow(dead_code) for from_payload_ptr without threading (fixes WASM build warning). Assisted-by: Claude * Fix materialized frame: copy localsplus, clear stale previous pointers - materialize_slow: copy fastlocals snapshot to heap instead of empty localsplus (fixes index-out-of-bounds panic in locals()/f_locals) - materialize_slow: set previous to null (stack iframes become dangling) - with_frame/resume_gen_frame: clear iframe.previous on pop (prevents dangling pointers to freed stack iframes) - f_back: walk TLS CURRENT_FRAME chain instead of top_frame for cross-thread lookup (top_frame is stale for stack-allocated iframes) - check_locals_access: match materialized frames by comparing the Py<FrameObject> address stored in the stack iframe's materialized field Assisted-by: Claude * Fix Windows clippy: gate unix-only imports and variables FrameObject, Py imports and top_iframe variable are only used in unix+threading cfg blocks. Gate them properly for non-unix builds. Assisted-by: Claude * Fall back to FrameObject when tracing; fix cross-thread frame access - invoke_with_locals: fall back to heap-allocated FrameObject path when use_tracing is active, so trace/profile callbacks fire correctly. This fixes test_trace, test_bdb, test_monitoring regressions. - set_current_frame: publish top_iframe alongside top_frame in ThreadSlot so cross-thread readers (sys._current_frames) can materialize stack-allocated frames from other threads under stop-the-world. - get_all_current_frames: use TLS CURRENT_FRAME for current thread, fall back to top_iframe materialization for other threads. - Use set_current_frame (not nosave) in with_iframe for proper cross-thread visibility. Assisted-by: Claude * Apply rustfmt Assisted-by: Claude * Fix Windows: gate unix-only top_iframe_ptr variable Assisted-by: Claude * Fix frame chain: f_back, retained_back, owner, faulthandler - Set materialized frame owner to FrameObject (not Thread) so frame.clear() works on traceback frames - Fix f_back for materialized frames: walk TLS chain to find source iframe and materialize its previous frame - Fix faulthandler dump_traceback to use dump_live_frames (reads live lasti from stack iframes instead of stale materialized copies) - Add retained_back propagation in with_frame cleanup: when a frame escapes, materialize caller and mark it escaped for chain propagation - Fix release_datastack_frame: don't overwrite retained_back if already set by with_frame cleanup Assisted-by: Claude * Apply rustfmt Assisted-by: Claude * Refine with_frame retained_back: use frame_obj instead of materialize Avoid materializing caller frames in with_frame cleanup to prevent creating localsplus snapshots that keep extra refcounts. Only use existing FrameObjects (frame_obj) for retained_back. Also keep previous pointer alive in release_datastack_frame since the caller is still executing at that point. Assisted-by: Claude * Fix f_lineno: use Cell<u32> for prev_line, update on every instruction prev_line was only updated when tracing was active, causing f_lineno to return stale values when observed mid-CALL (e.g. from warnings.warn or sys._getframe). Changed prev_line from u32 to Cell<u32> for interior mutability so it can be read safely while ExecutingFrame holds a shared reference, and update it on every instruction so f_lineno always returns the correct line. Assisted-by: Claude * Fix f_lineno for materialized frames: read live prev_line from TLS chain Materialized FrameObjects have a snapshot of prev_line from materialize time. When f_lineno is called on a materialized frame that is still executing (its source iframe is on the TLS chain), walk the TLS chain to find the source iframe and read its live prev_line. This fixes lineno tracking in warnings, gettext, and other modules that read frame line numbers during function calls. Also fixed the pointer comparison: use from_payload_ptr to convert FrameObject payload address to Py<FrameObject> address for matching against the materialized field. Assisted-by: Claude * Sync live frame state for materialized frames - Add find_live_source_iframe() to walk TLS chain and find the live source InterpreterFrame for a materialized FrameObject - f_lasti: read live lasti from source iframe when available - f_lineno: use read_volatile for live prev_line from source iframe - sync_visible_locals_to_mapping: read live localsplus from source iframe - framelocalsproxy_getval: read live localsplus from source iframe - with_iframe cleanup: sync localsplus, prev_line, lasti to materialized FrameObject when the frame returns - sync_fastlocals_from: new LocalsPlus method to update fastlocals Fixes test_inspect (stale f_locals, stale lineno in positions), test_listcomps (stale iteration variable in locals()). Assisted-by: Claude * Fix retained_back: use materialize_chain and strong_count check - Add materialize_chain() that creates a lightweight FrameObject with empty localsplus for f_back chain building only. This avoids cloning local variables which would create extra refcounts (fixes test_memoryview). - with_frame cleanup: use strong_count > 1 instead of escaped flag to determine if retained_back is needed, ensuring chain propagation. - with_iframe cleanup: use materialize_chain for retained_back to avoid extra refcounts from localsplus snapshots. Fixes test_memoryview (refcount from retained_back chain) and test_traceback.test_extract_stack (f_back chain depth). Assisted-by: Claude * Fix cross-thread f_back chain for sys._current_frames/exceptions - get_all_current_frames: materialize entire frame chain and link retained_back during stop-the-world for other threads - f_back: use stop-the-world to safely materialize cross-thread frame chains on unix when prev iframe is on another thread - f_back: check frame_obj() before STW for fast path Fixes test_sys.test_current_frames and test_sys.test_current_exceptions. Assisted-by: Claude * Fix monitoring LINE events and faulthandler thread dump - Skip all instrumented opcodes in bytecode loop prev_line update to avoid defeating InstrumentedLine de-duplication - Add prev_line update in execute_instrumented for non-RESUME/non-LINE instrumented opcodes - update_events_mask: walk TLS iframe chain to re-instrument all frames including stack-allocated ones (fixes missing LINE events for inline frames already past RESUME) - faulthandler: use top_iframe fallback for stack-allocated frames in dump_all_threads and watchdog_thread - faulthandler: use dump_live_frames for current thread dump Fixes test_monitoring LINE/CALL tests, test_faulthandler thread dumps. Assisted-by: Claude * Fix clippy: remove duplicate Radium import, use previous() helper Assisted-by: Claude * Fix materialized frame issues: GC tracking, live locals, f_trace propagation - Track materialized FrameObjects in GC so cycle collection works (fixes __del__ not called at exit for exception traceback cycles) - materialize_chain returns owned PyRef without temporary_refs to avoid defeating GC cycle detection from non-GC-tracked storage - framelocalsproxy_setval writes to live source iframe when available (fixes f_locals proxy writes not affecting executing frame) - f_lineno uses lasti-based line for non-executing frames instead of prev_line (fixes PEP 626 wrong line after exception unwind) - f_trace/f_trace_lines/f_trace_opcodes setters propagate to live source iframe (fixes pdb set_trace not working through materialized frames) - frame.clear() checks find_live_source_iframe to reject clearing a frame that is backed by a live stack-allocated iframe - Fix clippy warnings and unused imports in faulthandler - Remove unsafe top_iframe access from faulthandler watchdog thread Assisted-by: Claude * Fix faulthandler crashes, GC tracking timing, and test_generators - Use top_iframe instead of top_frame for frame chain walking in faulthandler (dump_all_threads and watchdog), avoiding stale or GC-cleared FrameObject pointer dereference - Defer GC tracking of materialized FrameObjects to with_iframe cleanup (after set_current_frame restores old chain), preventing premature collection while temporary_refs still holds the only ref - Add FrameObject::try_iframe() for safe access to potentially GC-cleared frames - Remove expectedFailure for test_exhausted_generator_frame_cycle (now passes with GC tracking fix) - Add 'noalias' to cspell dictionary Assisted-by: Claude * Fix Windows frame dump and remove dead code - Publish top_iframe on all platforms (not just unix) so Windows faulthandler and sys._current_frames can see stack-allocated frames - Use top_iframe instead of frames Mutex in Windows faulthandler dump and watchdog paths - Use top_iframe in non-unix get_all_current_frames for sys._current_frames - Remove unused dump_traceback_thread_chain (replaced by top_iframe walk) - Mark test_pdb_await_support as expected failure Assisted-by: Claude * Fix ThreadSlot init on all platforms, skip test_pdb_await_support - Add top_iframe to ThreadSlot initializer in init_thread_slot_if_needed (fixes wasm32, Windows compile errors) - Skip test_pdb_await_support on RustPython (async pdb exception callback receives None exc argument) Assisted-by: Claude * Remove dead faulthandler code (dump_frame_from_ref, dump_traceback_thread_frames, try_iframe) These functions are no longer called after switching all frame chain walking to use top_iframe directly. Assisted-by: Claude * Fix Windows sys._current_frames: materialize full frame chain The non-unix get_all_current_frames path was only materializing the top iframe without linking retained_back, so f_back chain walking could not find deeper frames like f123() in test_sys tests. Replicate the full chain materialization from the unix path. Assisted-by: Claude * Use STW-based cross-thread f_back on all platforms Replace the non-unix frames-mutex fallback with the same stop-the-world iframe chain materialization used on unix. Fixes test_current_exceptions on Windows where stack-allocated iframes were not found in the FrameObject-only frames list. Assisted-by: Claude * Fix set_f_lineno to write to live iframe, use STW for cross-thread access - set_f_lineno: write lasti/pending_stack_pops to the live source iframe instead of the materialized copy so debugger jumps take effect on stack-allocated frames - f_back cross-thread: enter STW before dereferencing the prev pointer to prevent use-after-free if the owning thread returns - get_all_current_frames (non-unix): add STW protection when walking cross-thread iframe chains, matching the unix path Assisted-by: Claude * Guard current_location() against lasti==0, always capture retained_back - current_location(): return first_line_number instead of panicking when lasti is 0 (before first instruction executes) - with_frame retained_back: materialize the caller iframe when needed so f_back always resolves for escaped FrameObjects Assisted-by: Claude * Fix format, revert eager retained_back materialization Remove double blank line in frame.rs (lint failure). Revert with_frame retained_back to only use already-materialized caller FrameObjects — eagerly materializing the caller added refcounts on local variables, preventing timely deallocation and causing test_io, test_memoryview, and test_futures failures. Assisted-by: Claude * Remove rustpython-unicode-isolation-issue.md from gitignore Assisted-by: Claude * Remove test_pdb_await_support skip: async pdb now works correctly Assisted-by: Claude * Fix STOP_ITERATION monitoring: wrap value in StopIteration instance fire_stop_iteration was passing the raw iterator return value to callbacks, but the STOP_ITERATION event callback signature expects a StopIteration exception instance. Wrap non-StopIteration values in a new StopIteration(value), matching PyMonitoring_FireStopIterationEvent. This fixes test_pdb_await_support where bdb's exception_callback received None instead of a StopIteration instance. Assisted-by: Claude --- .cspell.dict/rust-more.txt | 1 + .github/workflows/cron-ci.yaml | 12 +- .github/workflows/lib-deps-check.yaml | 17 +- .github/zizmor.yml | 5 + .gitignore | 2 +- Lib/test/test_generators.py | 1 - crates/capi/src/ceval.rs | 18 +- crates/capi/src/pyframe.rs | 4 +- crates/stdlib/src/faulthandler.rs | 237 ++-- crates/vm/src/builtins/asyncgenerator.rs | 11 +- crates/vm/src/builtins/coroutine.rs | 8 +- crates/vm/src/builtins/frame.rs | 342 +++-- crates/vm/src/builtins/frame_locals_proxy.rs | 8 +- crates/vm/src/builtins/function.rs | 238 +++- crates/vm/src/builtins/generator.rs | 8 +- crates/vm/src/builtins/super.rs | 33 +- crates/vm/src/builtins/traceback.rs | 17 +- crates/vm/src/builtins/type.rs | 11 +- crates/vm/src/coroutine.rs | 20 +- crates/vm/src/exceptions.rs | 4 +- crates/vm/src/frame.rs | 1302 +++++++++++++----- crates/vm/src/gc_state.rs | 39 +- crates/vm/src/import.rs | 4 +- crates/vm/src/object/core.rs | 3 +- crates/vm/src/object/ext.rs | 8 +- crates/vm/src/object/payload.rs | 2 +- crates/vm/src/protocol/callable.rs | 6 +- crates/vm/src/stdlib/_io.rs | 4 +- crates/vm/src/stdlib/_thread.rs | 107 +- crates/vm/src/stdlib/_typing.rs | 5 +- crates/vm/src/stdlib/builtins.rs | 10 +- crates/vm/src/stdlib/sys.rs | 10 +- crates/vm/src/stdlib/sys/monitoring.rs | 90 +- crates/vm/src/stdlib/typevar.rs | 11 +- crates/vm/src/suggestion.rs | 12 +- crates/vm/src/types/zoo.rs | 2 +- crates/vm/src/vm/mod.rs | 360 +++-- crates/vm/src/vm/thread.rs | 125 +- crates/vm/src/warn.rs | 26 +- 39 files changed, 2167 insertions(+), 956 deletions(-) diff --git a/.cspell.dict/rust-more.txt b/.cspell.dict/rust-more.txt index c4457723c..b53639c3b 100644 --- a/.cspell.dict/rust-more.txt +++ b/.cspell.dict/rust-more.txt @@ -50,6 +50,7 @@ modpow msvc muldiv nanos +noalias nonoverlapping objclass peekable diff --git a/.github/workflows/cron-ci.yaml b/.github/workflows/cron-ci.yaml index 059604625..c6eebbdf8 100644 --- a/.github/workflows/cron-ci.yaml +++ b/.github/workflows/cron-ci.yaml @@ -85,7 +85,6 @@ jobs: if: ${{ github.event_name != 'pull_request' }} env: SSHKEY: ${{ secrets.ACTIONS_TESTS_DATA_DEPLOY_KEY }} - GITHUB_ACTOR: ${{ github.actor }} run: | echo "$SSHKEY" >~/github_key chmod 600 ~/github_key @@ -95,7 +94,7 @@ jobs: cd website cp ../extra_tests/cpython_tests_results.json ./_data/regrtests_results.json git add ./_data/regrtests_results.json - if git -c user.name="Github Actions" -c user.email="actions@github.com" commit -m "Update regression test results" --author="$GITHUB_ACTOR"; then + if git -c user.name="Github Actions" -c user.email="actions@github.com" commit -m "Update regression test results"; then git push fi @@ -127,7 +126,6 @@ jobs: if: ${{ github.event_name != 'pull_request' }} env: SSHKEY: ${{ secrets.ACTIONS_TESTS_DATA_DEPLOY_KEY }} - GITHUB_ACTOR: ${{ github.actor }} run: | echo "$SSHKEY" >~/github_key chmod 600 ~/github_key @@ -158,7 +156,7 @@ jobs: } EOF git add -A - if git -c user.name="Github Actions" -c user.email="actions@github.com" commit -m "Update what is left results" --author="$GITHUB_ACTOR"; then + if git -c user.name="Github Actions" -c user.email="actions@github.com" commit -m "Update what is left results"; then git push fi @@ -204,6 +202,8 @@ jobs: if: ${{ github.event_name != 'pull_request' }} env: SSHKEY: ${{ secrets.ACTIONS_TESTS_DATA_DEPLOY_KEY }} + COMMIT_SHA: ${{ github.sha }} + REF_NAME: ${{ github.ref_name }} run: | echo "$SSHKEY" >~/github_key chmod 600 ~/github_key @@ -215,8 +215,8 @@ jobs: cp -r ../target/criterion ./assets/criterion printf '{\n "generated_at": "%s",\n "rustpython_commit": "%s",\n "rustpython_ref": "%s"\n}\n' \ "$(date -u +%Y-%m-%dT%H:%M:%SZ)" \ - "${{ github.sha }}" \ - "${{ github.ref_name }}" > ./_data/criterion-metadata.json + "$COMMIT_SHA" \ + "$REF_NAME" > ./_data/criterion-metadata.json git add ./assets/criterion ./_data/criterion-metadata.json if git -c user.name="Github Actions" -c user.email="actions@github.com" commit -m "Update benchmark results"; then git push diff --git a/.github/workflows/lib-deps-check.yaml b/.github/workflows/lib-deps-check.yaml index a938c6ff0..6f147542e 100644 --- a/.github/workflows/lib-deps-check.yaml +++ b/.github/workflows/lib-deps-check.yaml @@ -6,6 +6,8 @@ on: paths: - "Lib/**" +permissions: {} + concurrency: group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.event.pull_request.number }} cancel-in-progress: true @@ -26,13 +28,17 @@ jobs: persist-credentials: false - name: Fetch PR head + env: + PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }} run: | - git fetch origin ${{ github.event.pull_request.head.sha }} + git fetch origin "$PR_HEAD_SHA" - name: Checkout PR Lib files + env: + PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }} run: | # Checkout only Lib/ directory from PR head for accurate comparison - git checkout ${{ github.event.pull_request.head.sha }} -- Lib/ + git checkout "$PR_HEAD_SHA" -- Lib/ - name: Get target CPython version id: cpython-version @@ -51,14 +57,17 @@ jobs: - name: Get changed Lib files id: all-changed-files + env: + PR_BASE_SHA: ${{ github.event.pull_request.base.sha }} + PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }} run: | # Get the list of changed files under Lib/ { echo 'changed<<EOF' - git diff --name-only ${{ github.event.pull_request.base.sha }} ${{ github.event.pull_request.head.sha }} -- 'Lib/*.py' 'Lib/**/*.py' + git diff --name-only "$PR_BASE_SHA" "$PR_HEAD_SHA" -- 'Lib/*.py' 'Lib/**/*.py' - echo 'EOF' + echo 'EOF' } >> "$GITHUB_OUTPUT" - name: Parse changed files diff --git a/.github/zizmor.yml b/.github/zizmor.yml index f22f76b70..33ac61c64 100644 --- a/.github/zizmor.yml +++ b/.github/zizmor.yml @@ -1,4 +1,9 @@ rules: + excessive-permissions: + ignore: + # pull_request_target is needed to post PR comments with pull-requests: write. + # Workflow-level permissions: {} restricts defaults; only the job has write access. + - lib-deps-check.yaml:3 unpinned-uses: config: policies: diff --git a/.gitignore b/.gitignore index 92fc399bf..cb8548877 100644 --- a/.gitignore +++ b/.gitignore @@ -29,5 +29,5 @@ Lib/site-packages/* Lib/test/data/* !Lib/test/data/README cpython/ -.claude/scheduled_tasks.lock +.claude/ docs/superpowers/ \ No newline at end of file diff --git a/Lib/test/test_generators.py b/Lib/test/test_generators.py index b3826f422..07c1decb4 100644 --- a/Lib/test/test_generators.py +++ b/Lib/test/test_generators.py @@ -134,7 +134,6 @@ class FinalizationTest(unittest.TestCase): self.assertEqual(len(resurrected), 1) self.assertIsInstance(resurrected[0].gi_code, types.CodeType) - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: <frame object at 0xb4000073269f09e0> is not None def test_exhausted_generator_frame_cycle(self): def g(): yield diff --git a/crates/capi/src/ceval.rs b/crates/capi/src/ceval.rs index 366cb0071..7de5b3cf6 100644 --- a/crates/capi/src/ceval.rs +++ b/crates/capi/src/ceval.rs @@ -58,7 +58,7 @@ pub extern "C" fn PyEval_GetBuiltins() -> *mut PyObject { with_vm(|vm| { vm.current_frame().map_or_else( || vm.builtins.as_object().as_raw(), - |frame| frame.builtins.as_object().as_raw(), + |frame| frame.iframe().builtins().as_raw(), ) }) } @@ -78,7 +78,7 @@ pub extern "C" fn PyEval_GetFrameBuiltins() -> *mut PyObject { with_vm(|vm| { vm.current_frame().map_or_else( || vm.builtins.as_object().to_owned(), - |frame| frame.builtins.as_object().to_owned(), + |frame| frame.iframe().builtins().to_owned(), ) }) } @@ -87,7 +87,15 @@ pub extern "C" fn PyEval_GetFrameBuiltins() -> *mut PyObject { pub extern "C" fn PyEval_GetFrameGlobals() -> *mut PyObject { with_vm(|vm| { vm.current_frame() - .map(|frame| frame.globals.as_object().to_owned().into_raw().as_ptr()) + .map(|frame| { + frame + .iframe() + .globals() + .as_object() + .to_owned() + .into_raw() + .as_ptr() + }) .unwrap_or_default() }) } @@ -107,7 +115,7 @@ pub extern "C" fn PyEval_GetFrameLocals() -> *mut PyObject { pub extern "C" fn PyEval_GetGlobals() -> *mut PyObject { with_vm(|vm| { vm.current_frame() - .map(|frame| frame.globals.as_object().as_raw()) + .map(|frame| frame.iframe().globals().as_object().as_raw()) .unwrap_or_default() }) } @@ -119,7 +127,7 @@ pub extern "C" fn PyEval_GetLocals() -> *mut PyObject { return Ok(core::ptr::null_mut()); }; let _ = frame.locals(vm)?; - Ok(frame.locals.as_object(vm).as_raw().cast_mut()) + Ok(frame.iframe().locals.as_object(vm).as_raw().cast_mut()) }) } diff --git a/crates/capi/src/pyframe.rs b/crates/capi/src/pyframe.rs index 5c9ad3717..611cf79b0 100644 --- a/crates/capi/src/pyframe.rs +++ b/crates/capi/src/pyframe.rs @@ -2,9 +2,9 @@ use crate::pystate::with_vm; use core::ffi::c_int; use rustpython_vm::Py; use rustpython_vm::builtins::PyCode; -use rustpython_vm::frame::Frame; +use rustpython_vm::frame::FrameObject; -pub type PyFrameObject = Py<Frame>; +pub type PyFrameObject = Py<FrameObject>; pub type PyCodeObject = Py<PyCode>; #[unsafe(no_mangle)] diff --git a/crates/stdlib/src/faulthandler.rs b/crates/stdlib/src/faulthandler.rs index 900d66b76..6edd023f1 100644 --- a/crates/stdlib/src/faulthandler.rs +++ b/crates/stdlib/src/faulthandler.rs @@ -3,8 +3,6 @@ pub(crate) use decl::module_def; #[allow(static_mut_refs)] // TODO: group code only with static mut refs #[pymodule(name = "faulthandler")] mod decl { - #[cfg(any(unix, windows))] - use crate::vm::frame::Frame; use crate::vm::{ PyObjectRef, PyResult, VirtualMachine, function::{ArgIntoFloat, OptionalArg}, @@ -119,43 +117,45 @@ mod decl { } /// Dump the current thread's live frame chain to fd (signal-safe). - /// Walks the `Frame.previous` pointer chain starting from the - /// thread-local current frame pointer. + /// Walks the InterpreterFrame chain directly. #[cfg(any(unix, windows))] fn dump_live_frames(fd: i32) { const MAX_FRAME_DEPTH: usize = 100; - let mut frame_ptr = crate::vm::vm::thread::get_current_frame(); - if frame_ptr.is_null() { + let mut cur = crate::vm::vm::thread::get_current_frame(); + if cur.is_null() { puts(fd, " <no Python frame>\n"); return; } let mut depth = 0; - while !frame_ptr.is_null() && depth < MAX_FRAME_DEPTH { - let frame = unsafe { &*frame_ptr }; - dump_frame_from_raw(fd, frame); - frame_ptr = frame.previous_frame(); + while !cur.is_null() && depth < MAX_FRAME_DEPTH { + let iframe = unsafe { &*cur }; + dump_iframe(fd, iframe); depth += 1; + cur = iframe.previous(); } - if depth >= MAX_FRAME_DEPTH && !frame_ptr.is_null() { + if depth == 0 { + puts(fd, " <no Python frame>\n"); + } else if depth >= MAX_FRAME_DEPTH && !cur.is_null() { puts(fd, " ...\n"); } } - /// Dump a single frame's info to fd (signal-safe), reading live data. + /// Dump a single InterpreterFrame's info to fd (signal-safe). #[cfg(any(unix, windows))] - fn dump_frame_from_raw(fd: i32, frame: &Frame) { - let filename = frame.code.source_path().as_str(); - let funcname = frame.code.obj_name.as_str(); - let lasti = frame.lasti(); + fn dump_iframe(fd: i32, iframe: &rustpython_vm::frame::InterpreterFrame) { + let code = iframe.code(); + let filename = code.source_path().as_str(); + let funcname = code.obj_name.as_str(); + let lasti = iframe.get_lasti(); let lineno = if lasti == 0 { - frame.code.first_line_number.map_or(1, |n| n.get()) as u32 + code.first_line_number.map_or(1, |n| n.get()) as u32 } else { let idx = (lasti as usize).saturating_sub(1); - if idx < frame.code.locations.len() { - frame.code.locations[idx].0.line.get() as u32 + if idx < code.locations.len() { + code.locations[idx].0.line.get() as u32 } else { - frame.code.first_line_number.map_or(0, |n| n.get()) as u32 + code.first_line_number.map_or(0, |n| n.get()) as u32 } }; @@ -218,77 +218,6 @@ mod decl { } } - /// Write a frame's info to an fd using signal-safe I/O. - #[cfg(any(unix, windows))] - fn dump_frame_from_ref(fd: i32, frame: &crate::vm::Py<Frame>) { - let funcname = frame.code.obj_name.as_str(); - let filename = frame.code.source_path().as_str(); - let lineno = if frame.lasti() == 0 { - frame.code.first_line_number.map_or(1, |n| n.get()) as u32 - } else { - frame.current_location().line.get() as u32 - }; - - puts(fd, " File \""); - dump_ascii(fd, filename); - puts(fd, "\", line "); - dump_decimal(fd, lineno as usize); - puts(fd, " in "); - dump_ascii(fd, funcname); - puts(fd, "\n"); - } - - /// Dump traceback for a thread given its frame stack (for cross-thread dumping). - /// # Safety - /// Each `FramePtr` must point to a live frame (caller holds the Mutex). - #[cfg(all(windows, feature = "threading"))] - fn dump_traceback_thread_frames( - fd: i32, - thread_id: u64, - is_current: bool, - frames: &[rustpython_vm::vm::FramePtr], - ) { - write_thread_id(fd, thread_id, is_current); - - if frames.is_empty() { - puts(fd, " <no Python frame>\n"); - } else { - for fp in frames.iter().rev() { - // SAFETY: caller holds the Mutex, so the owning thread can't pop. - dump_frame_from_ref(fd, unsafe { fp.as_ref() }); - } - } - } - - /// Dump a thread's traceback by walking its published top frame down the - /// `previous` chain (most recent first). Signal-safe: only atomic pointer - /// loads, no locks. Callers guarantee frame liveness — under stop-the-world - /// for `faulthandler.dump_traceback`, or best-effort for the watchdog (like - /// `_Py_DumpTracebackThreads`, which walks lock-free while other threads - /// may still run). - #[cfg(all(unix, feature = "threading"))] - fn dump_traceback_thread_chain(fd: i32, thread_id: u64, is_current: bool, top: *const Frame) { - const MAX_FRAME_DEPTH: usize = 100; - write_thread_id(fd, thread_id, is_current); - - if top.is_null() { - puts(fd, " <no Python frame>\n"); - return; - } - let mut frame_ptr = top; - let mut depth = 0; - while !frame_ptr.is_null() && depth < MAX_FRAME_DEPTH { - // SAFETY: the frame is alive per the caller's liveness guarantee. - let frame = unsafe { &*frame_ptr }; - dump_frame_from_raw(fd, frame); - frame_ptr = frame.previous_frame(); - depth += 1; - } - if depth >= MAX_FRAME_DEPTH && !frame_ptr.is_null() { - puts(fd, " ...\n"); - } - } - #[derive(FromArgs)] struct DumpTracebackArgs { #[pyarg(any, default)] @@ -307,9 +236,7 @@ mod decl { dump_all_threads(fd, vm); } else { puts(fd, "Stack (most recent call first):\n"); - crate::vm::frame::for_each_current_frame(|frame| { - dump_frame_from_ref(fd, frame); - }); + dump_live_frames(fd); } } @@ -344,21 +271,35 @@ mod decl { if tid == current_tid { continue; } - let top = slot.top_frame.load(Ordering::Relaxed) as *const Frame; - dump_traceback_thread_chain(fd, tid, false, top); + // Under STW, all other threads are suspended so their + // stack-allocated iframes are stable. Walk via top_iframe + // which covers both FrameObject and stack-allocated paths. + let iframe_ptr = slot.top_iframe.load(Ordering::Relaxed) + as *const rustpython_vm::frame::InterpreterFrame; + write_thread_id(fd, tid, false); + if iframe_ptr.is_null() { + puts(fd, " <no Python frame>\n"); + } else { + let mut cur = iframe_ptr; + let mut depth = 0; + while !cur.is_null() && depth < 100 { + let iframe = unsafe { &*cur }; + dump_iframe(fd, iframe); + depth += 1; + cur = iframe.previous(); + } + if depth >= 100 && !cur.is_null() { + puts(fd, " ...\n"); + } + } puts(fd, "\n"); } } - // Now dump current thread from its live frame chain. + // Now dump current thread from its live frame chain + // (includes stack-allocated iframes without FrameObject). write_thread_id(fd, current_tid, true); - if crate::vm::vm::thread::get_current_frame().is_null() { - puts(fd, " <no Python frame>\n"); - } else { - crate::vm::frame::for_each_current_frame(|frame| { - dump_frame_from_ref(fd, frame); - }); - } + dump_live_frames(fd); } #[cfg(all(not(unix), feature = "threading"))] @@ -366,7 +307,8 @@ mod decl { let current_tid = rustpython_vm::stdlib::_thread::get_ident(); let registry = vm.state.thread_frames.lock(); - // First dump non-current threads, then current thread last + // Dump non-current threads using top_iframe, which includes + // both FrameObject and stack-allocated frames. #[expect( clippy::iter_over_hash_type, reason = "Iteration order doesn't matter here" @@ -376,29 +318,38 @@ mod decl { continue; } - let frames_guard = slot.frames.lock(); - dump_traceback_thread_frames(fd, tid, false, &frames_guard); + let iframe_ptr = slot.top_iframe.load(core::sync::atomic::Ordering::Relaxed) + as *const rustpython_vm::frame::InterpreterFrame; + write_thread_id(fd, tid, false); + if iframe_ptr.is_null() { + puts(fd, " <no Python frame>\n"); + } else { + let mut cur = iframe_ptr; + let mut depth = 0; + while !cur.is_null() && depth < 100 { + let iframe = unsafe { &*cur }; + dump_iframe(fd, iframe); + depth += 1; + cur = iframe.previous(); + } + if depth >= 100 && !cur.is_null() { + puts(fd, " ...\n"); + } + } puts(fd, "\n"); } - // Now dump current thread from its live frame chain. + // Now dump current thread from its live frame chain + // (includes stack-allocated iframes without FrameObject). write_thread_id(fd, current_tid, true); - if crate::vm::vm::thread::get_current_frame().is_null() { - puts(fd, " <no Python frame>\n"); - } else { - crate::vm::frame::for_each_current_frame(|frame| { - dump_frame_from_ref(fd, frame); - }); - } + dump_live_frames(fd); } #[cfg(not(feature = "threading"))] { let _ = vm; write_thread_id(fd, current_thread_id(), true); - crate::vm::frame::for_each_current_frame(|frame| { - dump_frame_from_ref(fd, frame); - }); + dump_live_frames(fd); } } @@ -724,18 +675,56 @@ mod decl { // the VM, so it cannot stop-the-world. Walk each // published top frame lock-free and best-effort, like // the faulthandler watchdog thread. + // Walk via top_iframe for all threads. The watchdog + // cannot stop-the-world, so this is best-effort + // (like CPython's _Py_DumpTracebackThreads). Stack + // frames are still alive because the target thread + // is executing (inside a blocking call). for (tid, slot) in &thread_frame_slots { - let top = slot - .top_frame + let iframe_ptr = slot + .top_iframe .load(core::sync::atomic::Ordering::Relaxed) - as *const Frame; - dump_traceback_thread_chain(fd, *tid, false, top); + as *const rustpython_vm::frame::InterpreterFrame; + write_thread_id(fd, *tid, false); + if iframe_ptr.is_null() { + puts(fd, " <no Python frame>\n"); + } else { + let mut cur = iframe_ptr; + let mut depth = 0; + while !cur.is_null() && depth < 100 { + let iframe = unsafe { &*cur }; + dump_iframe(fd, iframe); + depth += 1; + cur = iframe.previous(); + } + if depth >= 100 && !cur.is_null() { + puts(fd, " ...\n"); + } + } } } all(not(unix), feature = "threading") => { for (tid, slot) in &thread_frame_slots { - let frames = slot.frames.lock(); - dump_traceback_thread_frames(fd, *tid, false, &frames); + let iframe_ptr = slot + .top_iframe + .load(core::sync::atomic::Ordering::Relaxed) + as *const rustpython_vm::frame::InterpreterFrame; + write_thread_id(fd, *tid, false); + if iframe_ptr.is_null() { + puts(fd, " <no Python frame>\n"); + } else { + let mut cur = iframe_ptr; + let mut depth = 0; + while !cur.is_null() && depth < 100 { + let iframe = unsafe { &*cur }; + dump_iframe(fd, iframe); + depth += 1; + cur = iframe.previous(); + } + if depth >= 100 && !cur.is_null() { + puts(fd, " ...\n"); + } + } } } _ => { diff --git a/crates/vm/src/builtins/asyncgenerator.rs b/crates/vm/src/builtins/asyncgenerator.rs index dea40062a..b53e59d58 100644 --- a/crates/vm/src/builtins/asyncgenerator.rs +++ b/crates/vm/src/builtins/asyncgenerator.rs @@ -5,7 +5,7 @@ use crate::{ class::PyClassImpl, common::lock::PyMutex, coroutine::{Coro, warn_deprecated_throw_signature}, - frame::FrameRef, + frame::FrameObjectRef, function::OptionalArg, object::{Traverse, TraverseFn}, protocol::PyIterReturn, @@ -50,7 +50,7 @@ impl PyAsyncGen { } #[must_use] - pub fn new(frame: FrameRef, name: PyStrRef, qualname: PyStrRef) -> Self { + pub fn new(frame: FrameObjectRef, name: PyStrRef, qualname: PyStrRef) -> Self { Self { inner: Coro::new(frame, name, qualname), running_async: AtomicCell::new(false), @@ -127,7 +127,7 @@ impl PyAsyncGen { self.inner.frame().yield_from_target() } #[pygetset] - fn ag_frame(&self, _vm: &VirtualMachine) -> Option<FrameRef> { + fn ag_frame(&self, _vm: &VirtualMachine) -> Option<FrameObjectRef> { if self.inner.closed() { None } else { @@ -140,7 +140,7 @@ impl PyAsyncGen { } #[pygetset] fn ag_code(&self, _vm: &VirtualMachine) -> PyRef<PyCode> { - self.inner.frame().code.clone() + self.inner.frame().iframe().code().to_owned() } #[pyclassmethod] @@ -688,7 +688,8 @@ impl PyAnextAwaitable { && generator .as_coro() .frame() - .code + .iframe() + .code() .flags .contains(crate::bytecode::CodeFlags::ITERABLE_COROUTINE) { diff --git a/crates/vm/src/builtins/coroutine.rs b/crates/vm/src/builtins/coroutine.rs index 1780370b4..d472f1a0b 100644 --- a/crates/vm/src/builtins/coroutine.rs +++ b/crates/vm/src/builtins/coroutine.rs @@ -3,7 +3,7 @@ use crate::{ AsObject, Context, Py, PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine, class::PyClassImpl, coroutine::{Coro, warn_deprecated_throw_signature}, - frame::FrameRef, + frame::FrameObjectRef, function::OptionalArg, object::{Traverse, TraverseFn}, protocol::PyIterReturn, @@ -41,7 +41,7 @@ impl PyCoroutine { } #[must_use] - pub fn new(frame: FrameRef, name: PyStrRef, qualname: PyStrRef) -> Self { + pub fn new(frame: FrameObjectRef, name: PyStrRef, qualname: PyStrRef) -> Self { Self { inner: Coro::new(frame, name, qualname), } @@ -80,7 +80,7 @@ impl PyCoroutine { self.inner.frame().yield_from_target() } #[pygetset] - fn cr_frame(&self, _vm: &VirtualMachine) -> Option<FrameRef> { + fn cr_frame(&self, _vm: &VirtualMachine) -> Option<FrameObjectRef> { if self.inner.closed() { None } else { @@ -93,7 +93,7 @@ impl PyCoroutine { } #[pygetset] fn cr_code(&self, _vm: &VirtualMachine) -> PyRef<PyCode> { - self.inner.frame().code.clone() + self.inner.frame().iframe().code().to_owned() } // TODO: coroutine origin tracking: // https://docs.python.org/3/library/sys.html#sys.set_coroutine_origin_tracking_depth diff --git a/crates/vm/src/builtins/frame.rs b/crates/vm/src/builtins/frame.rs index 710d23b7c..70ff99979 100644 --- a/crates/vm/src/builtins/frame.rs +++ b/crates/vm/src/builtins/frame.rs @@ -6,11 +6,14 @@ use super::{PyCode, PyDictRef, PyIntRef, PyStrRef}; use crate::{ Context, Py, PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine, class::PyClassImpl, - frame::{Frame, FrameOwner, FrameRef}, + frame::{FrameObject, FrameObjectRef, FrameOwner}, function::PySetterValue, types::Representable, }; +use core::sync::atomic::Ordering::Relaxed; use num_traits::Zero; +#[allow(unused_imports)] +use rustpython_common::atomic::Radium; use rustpython_compiler_core::bytecode::{self, Constant, Instruction, StackEffect}; use stack_analysis::*; @@ -426,10 +429,10 @@ pub(crate) mod stack_analysis { } pub(crate) fn init(context: &'static Context) { - Frame::extend_class(context, context.types.frame_type); + FrameObject::extend_class(context, context.types.frame_type); } -impl Representable for Frame { +impl Representable for FrameObject { #[inline] fn repr(_zelf: &Py<Self>, vm: &VirtualMachine) -> PyResult<PyStrRef> { const REPR: &str = "<frame object at .. >"; @@ -442,38 +445,86 @@ impl Representable for Frame { } } +impl FrameObject { + /// Find the live source InterpreterFrame on the TLS chain for a + /// materialized FrameObject. Returns the raw pointer if found, or null + /// if this FrameObject has no live source (already returned or not + /// currently executing on this thread). + pub(crate) fn find_live_source_iframe(&self) -> *const crate::frame::InterpreterFrame { + let self_py_ptr = unsafe { Py::<Self>::from_payload_ptr(self) } as usize; + let mut cur = crate::vm::thread::get_current_frame(); + while !cur.is_null() { + let materialized = unsafe { (*cur).materialized.load(Relaxed) }; + if materialized == self_py_ptr { + return cur; + } + cur = unsafe { &*cur }.previous(); + } + core::ptr::null() + } +} + #[pyclass(flags(DISALLOW_INSTANTIATION), with(Py))] -impl Frame { +impl FrameObject { #[pygetset] fn f_globals(&self) -> PyDictRef { - self.globals.clone() + self.iframe().globals().to_owned() } #[pygetset] fn f_builtins(&self) -> PyObjectRef { - self.builtins.clone() + self.iframe().builtins().to_owned() } #[pygetset] pub fn f_code(&self) -> PyRef<PyCode> { - self.code.clone() + self.iframe().code().to_owned() } #[pygetset] fn f_lasti(&self) -> u32 { - // Return byte offset (each instruction is 2 bytes) for compatibility - self.lasti() * 2 + // Return byte offset (each instruction is 2 bytes) for compatibility. + // For materialized frames, read live lasti from the source iframe on + // the TLS chain so f_lasti reflects the current execution position. + let live = self.find_live_source_iframe(); + let val = if !live.is_null() { + unsafe { (*live).lasti.load(Relaxed) } + } else { + self.lasti() + }; + val * 2 } #[pygetset] pub fn f_lineno(&self) -> usize { // If lasti is 0, execution hasn't started yet - use first line number - // Similar to PyCode_Addr2Line which returns co_firstlineno for addr_q < 0 if self.lasti() == 0 { - self.code.first_line_number.map_or(1, |n| n.get()) - } else { - self.current_location().line.get() + return self + .iframe() + .code() + .first_line_number + .map_or(1, |n| n.get()); } + // For executing frames (on the TLS chain), use prev_line which is + // updated at each bytecode instruction *before* the instruction + // runs. This gives the correct line even when observed mid-CALL + // (where lasti has already advanced past the CALL instruction). + let live = self.find_live_source_iframe(); + if !live.is_null() { + // Read live prev_line. Use read_volatile to bypass LLVM noalias + // on the &mut InterpreterFrame borrow in with_iframe. + let prev = unsafe { + let field_ptr = core::ptr::addr_of!((*live).prev_line); + core::ptr::read_volatile(field_ptr as *const u32) + }; + if prev > 0 { + return prev as usize; + } + } + // For returned frames, use lasti-based location lookup. This is + // correct for exception tracebacks where prev_line may have been + // updated by cleanup instructions after the exception. + self.current_location().line.get() } #[pygetset(setter)] @@ -492,7 +543,11 @@ impl Frame { } }; - let first_line = self.code.first_line_number.map_or(1, |n| n.get() as i32); + let first_line = self + .iframe() + .code() + .first_line_number + .map_or(1, |n| n.get() as i32); if l_new_lineno < first_line { return Err(vm.new_value_error(format!( @@ -500,7 +555,7 @@ impl Frame { ))); } - let py_code: &PyCode = &self.code; + let py_code: &PyCode = self.iframe().code(); let code = &py_code.code; let lines = mark_lines(code); @@ -513,13 +568,19 @@ impl Frame { } let stacks = mark_stacks(code); - let len = self.code.instructions.len(); + let len = self.iframe().code().instructions.len(); // lasti points past the current instruction (already incremented). // stacks[lasti - 1] gives the stack state before executing the // instruction that triggered this trace event, which is the current - // evaluation stack. - let current_lasti = self.lasti() as usize; + // evaluation stack. Read from the live iframe when available so the + // value reflects the actual execution position. + let live = self.find_live_source_iframe(); + let current_lasti = if !live.is_null() { + (unsafe { (*live).lasti.load(Relaxed) }) as usize + } else { + self.lasti() as usize + }; let start_idx = current_lasti.saturating_sub(1); let start_stack = if start_idx < stacks.len() { stacks[start_idx] @@ -567,36 +628,61 @@ impl Frame { } } - // Store the pending unwind for the execution loop to perform. - // We cannot pop stack entries here because the execution loop - // holds the state mutex, and trying to lock it again would deadlock. - self.set_pending_stack_pops(pop_count as u32); - self.set_pending_unwind_from_stack(start_stack); - - // Set lasti to best_addr. The executor will read lasti and execute - // the instruction at that index next. - self.set_lasti(best_addr as u32); + // Store the pending unwind and new lasti. When this frame is backed + // by a live stack-allocated iframe, write to the live iframe so the + // execution loop picks up the jump target. Reuse `live` from above. + let target = if !live.is_null() { + unsafe { &*live } + } else { + self.iframe() + }; + target.pending_stack_pops.store(pop_count as u32, Relaxed); + target.pending_unwind_from_stack.store(start_stack, Relaxed); + target.lasti.store(best_addr as u32, Relaxed); Ok(()) } #[pygetset] - fn f_trace(&self) -> PyObjectRef { - let boxed = self.trace.lock(); - boxed.clone() + fn f_trace(&self, vm: &VirtualMachine) -> PyObjectRef { + // Read from live source iframe if available. + let live = self.find_live_source_iframe(); + let trace = if !live.is_null() { + unsafe { &*live }.trace.lock().clone() + } else { + self.iframe().trace.lock().clone() + }; + trace.unwrap_or_else(|| vm.ctx.none()) } #[pygetset(setter)] fn set_f_trace(&self, value: PySetterValue, vm: &VirtualMachine) { - let mut storage = self.trace.lock(); - *storage = value.unwrap_or_none(vm); + let trace = match value { + PySetterValue::Assign(v) => { + if vm.is_none(&v) { + None + } else { + Some(v) + } + } + PySetterValue::Delete => None, + }; + // Set on the materialized FrameObject. + (*self.iframe().trace.lock()).clone_from(&trace); + // Also propagate to the live source iframe if this is a + // materialized copy of a stack-allocated frame, so pdb's + // f_trace assignment takes effect on the executing frame. + let live = self.find_live_source_iframe(); + if !live.is_null() { + *unsafe { &*live }.trace.lock() = trace; + } } #[expect(clippy::unnecessary_wraps, reason = "Needs to comply with a signature")] #[pymember(type = "bool")] fn f_trace_lines(vm: &VirtualMachine, zelf: PyObjectRef) -> PyResult { - let zelf: FrameRef = zelf.downcast().unwrap_or_else(|_| unreachable!()); + let zelf: FrameObjectRef = zelf.downcast().unwrap_or_else(|_| unreachable!()); - let boxed = zelf.trace_lines.lock(); + let boxed = zelf.iframe().trace_lines.lock(); Ok(vm.ctx.new_bool(*boxed).into()) } @@ -608,14 +694,19 @@ impl Frame { ) -> PyResult<()> { match value { PySetterValue::Assign(value) => { - let zelf: FrameRef = zelf.downcast().unwrap_or_else(|_| unreachable!()); + let zelf: FrameObjectRef = zelf.downcast().unwrap_or_else(|_| unreachable!()); let value: PyIntRef = value .downcast() .map_err(|_| vm.new_type_error("attribute value type must be bool"))?; - let mut trace_lines = zelf.trace_lines.lock(); - *trace_lines = !value.as_bigint().is_zero(); + let val = !value.as_bigint().is_zero(); + *zelf.iframe().trace_lines.lock() = val; + // Propagate to live source iframe. + let live = zelf.find_live_source_iframe(); + if !live.is_null() { + *unsafe { &*live }.trace_lines.lock() = val; + } Ok(()) } @@ -626,8 +717,8 @@ impl Frame { #[expect(clippy::unnecessary_wraps, reason = "Needs to comply with a signature")] #[pymember(type = "bool")] fn f_trace_opcodes(vm: &VirtualMachine, zelf: PyObjectRef) -> PyResult { - let zelf: FrameRef = zelf.downcast().unwrap_or_else(|_| unreachable!()); - let trace_opcodes = zelf.trace_opcodes.lock(); + let zelf: FrameObjectRef = zelf.downcast().unwrap_or_else(|_| unreachable!()); + let trace_opcodes = zelf.iframe().trace_opcodes.lock(); Ok(vm.ctx.new_bool(*trace_opcodes).into()) } @@ -639,14 +730,19 @@ impl Frame { ) -> PyResult<()> { match value { PySetterValue::Assign(value) => { - let zelf: FrameRef = zelf.downcast().unwrap_or_else(|_| unreachable!()); + let zelf: FrameObjectRef = zelf.downcast().unwrap_or_else(|_| unreachable!()); let value: PyIntRef = value .downcast() .map_err(|_| vm.new_type_error("attribute value type must be bool"))?; - let mut trace_opcodes = zelf.trace_opcodes.lock(); - *trace_opcodes = !value.as_bigint().is_zero(); + let val = !value.as_bigint().is_zero(); + *zelf.iframe().trace_opcodes.lock() = val; + // Propagate to live source iframe. + let live = zelf.find_live_source_iframe(); + if !live.is_null() { + *unsafe { &*live }.trace_opcodes.lock() = val; + } // TODO: Implement the equivalent of _PyEval_SetOpcodeTrace() @@ -658,11 +754,15 @@ impl Frame { } #[pyclass] -impl Py<Frame> { +impl Py<FrameObject> { #[pymethod] // = frame_clear_impl fn clear(&self, vm: &VirtualMachine) -> PyResult<()> { - let owner = FrameOwner::from_i8(self.owner.load(core::sync::atomic::Ordering::Acquire)); + let owner = FrameOwner::from_i8( + self.iframe() + .owner + .load(core::sync::atomic::Ordering::Acquire), + ); match owner { FrameOwner::Generator => { // Generator frame: check if suspended (lasti > 0 means @@ -677,12 +777,16 @@ impl Py<Frame> { return Err(vm.new_runtime_error("cannot clear an executing frame")); } FrameOwner::FrameObject => { - // Detached frame: safe to clear. + // Check if this materialized frame is backed by a live + // stack-allocated iframe — if so, the frame is executing. + if !self.find_live_source_iframe().is_null() { + return Err(vm.new_runtime_error("cannot clear an executing frame")); + } } } // Clear fastlocals - // SAFETY: Frame is not executing (detached or stopped). + // SAFETY: FrameObject is not executing (detached or stopped). { let fastlocals = unsafe { self.fastlocals_mut() }; for slot in fastlocals.iter_mut() { @@ -694,10 +798,10 @@ impl Py<Frame> { self.clear_stack_and_cells(); // Clear temporary refs - self.temporary_refs.lock().clear(); - self.f_locals_hidden_overlay.lock().take(); - self.f_extra_locals.lock().take(); - self.retained_back.lock().take(); + self.iframe().temporary_refs.lock().clear(); + self.iframe().f_locals_hidden_overlay.lock().take(); + self.iframe().f_extra_locals.lock().take(); + self.iframe().retained_back.lock().take(); Ok(()) } @@ -707,7 +811,12 @@ impl Py<Frame> { // Optimized (function) frames expose a live write-through // FrameLocalsProxy; class/module/exec frames expose their namespace // mapping directly. - if self.code.flags.contains(bytecode::CodeFlags::OPTIMIZED) { + if self + .iframe() + .code() + .flags + .contains(bytecode::CodeFlags::OPTIMIZED) + { self.check_locals_access(vm)?; self.mark_escaped(); let proxy = crate::builtins::FrameLocalsProxy::new(self.to_owned()); @@ -719,85 +828,98 @@ impl Py<Frame> { #[pygetset] fn f_generator(&self) -> Option<PyObjectRef> { - self.generator.to_owned() + self.iframe().generator.to_owned() } #[pygetset] - pub fn f_back(&self, vm: &VirtualMachine) -> Option<PyRef<Frame>> { - #[cfg(not(feature = "threading"))] - let _ = vm; - let previous = self.previous_frame(); - if previous.is_null() { - return None; + pub fn f_back(&self, #[allow(unused)] vm: &VirtualMachine) -> Option<PyRef<FrameObject>> { + let mut prev = self.previous_iframe(); + + // For materialized frames (previous == 0), find the source iframe on + // the TLS chain and use its `previous` instead. + if prev.is_null() { + // materialized stores `*const Py<FrameObject>` as usize. + // `self` is `&Py<FrameObject>` — compare addresses directly. + let self_py_ptr = self as *const Self as usize; + let mut cur = crate::vm::thread::get_current_frame(); + while !cur.is_null() { + let materialized = unsafe { (*cur).materialized.load(Relaxed) }; + if materialized == self_py_ptr { + // Found the source iframe — use its previous + prev = unsafe { (*cur).previous() }; + break; + } + cur = unsafe { (*cur).previous() }; + } + if prev.is_null() { + // Check retained_back for frames whose callers have returned + let retained = self.iframe().retained_back.lock().clone(); + if let Some(frame) = retained { + frame.mark_escaped(); + return Some(frame); + } + return None; + } } - // Look for the caller on the current thread's signal-safe frame chain. - // Finding it there proves it is still live on this thread. - if let Some(frame) = crate::frame::find_owned_chain_frame(previous) { - frame.mark_escaped(); - return Some(frame); + // Walk the TLS chain to find the prev iframe and materialize it. + // This handles both heap-allocated FrameObjects and stack-allocated + // iframes that haven't been observed yet. + { + let mut cur = crate::vm::thread::get_current_frame(); + while !cur.is_null() { + if core::ptr::eq(cur, prev) { + let iframe_ref = unsafe { &*cur }; + let fo = iframe_ref.materialize(vm); + fo.mark_escaped(); + return Some(fo.to_owned()); + } + cur = unsafe { (*cur).previous() }; + } } - // The caller already returned and left the live chain, but this frame - // escaped and retained a strong reference to it at release time. - let retained = self.retained_back.lock().clone(); + // The caller already returned — check retained_back + let retained = self.iframe().retained_back.lock().clone(); if let Some(frame) = retained { frame.mark_escaped(); return Some(frame); } - // The caller lives on another thread. unix: park every thread under - // stop-the-world so their frame chains are quiescent and alive, then - // walk each published top frame down its `previous` chain looking for - // the caller. Request stop-the-world before the registry lock. - #[cfg(all(unix, feature = "threading"))] + // The caller lives on another thread. Use stop-the-world to + // safely materialize the cross-thread frame chain. + #[cfg(feature = "threading")] { - use core::sync::atomic::Ordering; + // Enter STW before dereferencing `prev` — the owning thread may + // return and free the stack-allocated iframe at any time. vm.state.stop_the_world.stop_the_world(vm); scopeguard::defer! { vm.state.stop_the_world.start_the_world(vm); } - let registry = vm.state.thread_frames.lock(); - #[expect( - clippy::iter_over_hash_type, - reason = "Iteration order doesn't matter here" - )] - for slot in registry.values() { - let mut cur = slot.top_frame.load(Ordering::Relaxed) as *const Frame; - while !cur.is_null() { - if core::ptr::eq(cur, previous) { - // SAFETY: world stopped -> this frame is alive on its - // owning thread's parked call stack. - let f = unsafe { &*Self::from_payload_ptr(cur) }; - f.mark_escaped(); - return Some(f.to_owned()); + let prev_ref = unsafe { &*prev }; + // Fast path: already materialized. + if let Some(fo) = prev_ref.frame_obj() { + fo.mark_escaped(); + return Some(fo.to_owned()); + } + // Slow path: materialize the entire chain and link retained_back. + let mut cur = prev; + let mut child_fo: Option<crate::PyRef<crate::frame::FrameObject>> = None; + while !cur.is_null() { + let iframe = unsafe { &*cur }; + let fo = iframe.materialize(vm).to_owned(); + if let Some(child) = child_fo.take() { + let mut guard = child.iframe().retained_back.lock(); + if guard.is_none() { + *guard = Some(fo.clone()); } - // SAFETY: chain frames on a parked thread are alive. - cur = unsafe { (*cur).previous_frame() }; - } - } - } - - #[cfg(all(not(unix), feature = "threading"))] - { - let registry = vm.state.thread_frames.lock(); - #[expect( - clippy::iter_over_hash_type, - reason = "Iteration order doesn't matter here" - )] - for slot in registry.values() { - let frames = slot.frames.lock(); - // SAFETY: the owning thread can't pop while we hold the Mutex, - // so FramePtr is valid for the duration of the lock. - if let Some(frame) = frames.iter().find_map(|fp| { - let f = unsafe { fp.as_ref() }; - let ptr: *const Frame = &**f; - core::ptr::eq(ptr, previous).then(|| f.to_owned()) - }) { - frame.mark_escaped(); - return Some(frame); } + child_fo = Some(fo); + cur = iframe.previous(); } + let fo = prev_ref.materialize(vm); + fo.mark_escaped(); + return Some(fo.to_owned()); } + #[allow(unreachable_code)] None } } diff --git a/crates/vm/src/builtins/frame_locals_proxy.rs b/crates/vm/src/builtins/frame_locals_proxy.rs index fbbc7f5d9..eaba0bca6 100644 --- a/crates/vm/src/builtins/frame_locals_proxy.rs +++ b/crates/vm/src/builtins/frame_locals_proxy.rs @@ -7,7 +7,7 @@ use crate::{ AsObject, Context, Py, PyObject, PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine, atomic_func, class::PyClassImpl, - frame::FrameRef, + frame::FrameObjectRef, function::{FuncArgs, OptionalArg, PyArithmeticValue, PyComparisonValue}, object::{Traverse, TraverseFn}, protocol::{PyMappingMethods, PyNumberMethods, PySequenceMethods}, @@ -23,7 +23,7 @@ use rustpython_common::wtf8::Wtf8Buf; #[pyclass(module = false, name = "FrameLocalsProxy", traverse = "manual")] #[derive(Debug)] pub struct FrameLocalsProxy { - frame: FrameRef, + frame: FrameObjectRef, } unsafe impl Traverse for FrameLocalsProxy { @@ -40,7 +40,7 @@ impl PyPayload for FrameLocalsProxy { } impl FrameLocalsProxy { - pub(crate) fn new(frame: FrameRef) -> Self { + pub(crate) fn new(frame: FrameObjectRef) -> Self { Self { frame } } @@ -67,7 +67,7 @@ impl Constructor for FrameLocalsProxy { args.len() ))); } - let frame: FrameRef = args + let frame: FrameObjectRef = args .pop() .unwrap() .downcast() diff --git a/crates/vm/src/builtins/function.rs b/crates/vm/src/builtins/function.rs index 43cc33a90..39195202a 100644 --- a/crates/vm/src/builtins/function.rs +++ b/crates/vm/src/builtins/function.rs @@ -14,7 +14,7 @@ use crate::{ bytecode, class::PyClassImpl, common::wtf8::{Wtf8Buf, wtf8_concat}, - frame::{Frame, FrameRef}, + frame::{FrameObject, FrameObjectRef}, function::{FuncArgs, OptionalArg, PyComparisonValue, PySetterValue}, scope::Scope, types::{ @@ -182,11 +182,7 @@ impl PyFunction { let module = vm.unwrap_or_none(globals.get_item_opt(identifier!(vm, __name__), vm)?); let builtins = globals.get_item("__builtins__", vm).unwrap_or_else(|_| { // If not in globals, inherit from current execution context - if let Some(frame) = vm.current_frame() { - frame.builtins.clone() - } else { - vm.builtins.dict().into() - } + crate::frame::current_builtins().unwrap_or_else(|| vm.builtins.dict().into()) }); // If builtins is a module, use its __dict__ instead let builtins = if let Some(module) = builtins.downcast_ref::<PyModule>() { @@ -228,7 +224,28 @@ impl PyFunction { fn fill_locals_from_args( &self, - frame: &Frame, + frame: &FrameObject, + func_args: FuncArgs, + vm: &VirtualMachine, + ) -> PyResult<()> { + // SAFETY: FrameObject was just created and not yet executing. + let fastlocals = unsafe { frame.fastlocals_mut() }; + self.fill_locals_from_args_inner(fastlocals, func_args, vm) + } + + fn fill_locals_from_args_iframe( + &self, + iframe: &mut crate::frame::InterpreterFrame, + func_args: FuncArgs, + vm: &VirtualMachine, + ) -> PyResult<()> { + let fastlocals = iframe.localsplus.fastlocals_mut(); + self.fill_locals_from_args_inner(fastlocals, func_args, vm) + } + + fn fill_locals_from_args_inner( + &self, + fastlocals: &mut [Option<PyObjectRef>], func_args: FuncArgs, vm: &VirtualMachine, ) -> PyResult<()> { @@ -236,16 +253,6 @@ impl PyFunction { let nargs = func_args.args.len(); let n_expected_args = code.arg_count as usize; let total_args = code.arg_count as usize + code.kwonlyarg_count as usize; - // let arg_names = self.code.arg_names(); - - // This parses the arguments from args and kwargs into - // the proper variables keeping into account default values - // and star-args and kwargs. - // See also: PyEval_EvalCodeWithName in cpython: - // https://github.com/python/cpython/blob/main/Python/ceval.c#L3681 - - // SAFETY: Frame was just created and not yet executing. - let fastlocals = unsafe { frame.fastlocals_mut() }; let mut args_iter = func_args.args.into_iter(); @@ -564,69 +571,114 @@ impl Py<PyFunction> { } } - let code: PyRef<PyCode> = (*self.code).to_owned(); - - let locals = if code.flags.contains(bytecode::CodeFlags::NEWLOCALS) { - None - } else if let Some(locals) = locals { - Some(locals) - } else { - Some(ArgMapping::from_dict_exact(self.globals.clone())) - }; + let code = &*self.code; let is_gen = code.flags.contains(bytecode::CodeFlags::GENERATOR); let is_coro = code.flags.contains(bytecode::CodeFlags::COROUTINE); let is_async_gen = code.flags.contains(bytecode::CodeFlags::ASYNC_GENERATOR); - let use_datastack = !(is_gen || is_coro || is_async_gen); - // Construct frame: - let frame = Frame::new( - code, - Scope::new(locals, self.globals.clone()), - self.builtins.clone(), - self.closure.as_ref().map_or(&[], |c| c.as_slice()), - Some(self.to_owned().into()), - use_datastack, - vm, - ) - .into_ref(&vm.ctx); + let needs_heap_frame = is_gen || is_coro || is_async_gen || vm.use_tracing.get(); - self.fill_locals_from_args(&frame, func_args, vm)?; - if use_datastack { - let result = vm.run_frame(frame.clone()); - // Release data stack memory after frame execution completes. - crate::frame::release_datastack_frame(&frame, vm); - result - } else { - let obj = if is_async_gen { - PyAsyncGen::new(frame.clone(), self.__name__(), self.__qualname__()) - .into_pyobject(vm) - } else if is_gen { - PyGenerator::new(frame.clone(), self.__name__(), self.__qualname__()) - .into_pyobject(vm) + if needs_heap_frame { + // Heap-allocate FrameObject for generators/coroutines (lifetime + // exceeds call stack) or when tracing is active (trace callbacks + // need a FrameObject). + let code_owned: PyRef<PyCode> = code.to_owned(); + let locals = if code.flags.contains(bytecode::CodeFlags::NEWLOCALS) { + None + } else if let Some(locals) = locals { + Some(locals) } else { - PyCoroutine::new(frame.clone(), self.__name__(), self.__qualname__()) - .into_pyobject(vm) + Some(ArgMapping::from_dict_exact(self.globals.clone())) }; - // Generator/coroutine frames outlive this call and can join a - // reference cycle through their owning generator, so they must - // participate in the GC. They were created untracked - // (NEW_REF_UNTRACKED); track them now, before the back-reference - // is installed. Their localsplus is heap-backed by construction - // (use_datastack == false), so a collector never reads data-stack - // storage when it traverses them. - debug_assert!( - !frame.localsplus_is_datastack_backed(), - "generator frame is data-stack-backed" + let use_datastack = !is_gen && !is_coro && !is_async_gen; + let frame = FrameObject::new_ref( + code_owned, + Scope::new(locals, self.globals.clone()), + self.builtins.clone(), + self.closure.as_ref().map_or(&[], |c| c.as_slice()), + Some(self.to_owned().into()), + use_datastack, + vm, ); - // SAFETY: the frame is alive (held by `frame`) and untracked. - unsafe { - crate::gc_state::gc_state() - .track_object(core::ptr::NonNull::from(frame.as_object())); + self.fill_locals_from_args(&frame, func_args, vm)?; + if is_gen || is_coro || is_async_gen { + return Ok(self.make_generator_or_coro(frame, vm)); } - frame.set_generator(&obj); - Ok(obj) + // Tracing active: use heap frame with full trace support. + let result = vm.run_frame(frame.clone()); + unsafe { + if let Some(base) = frame.iframe_mut().localsplus.release_datastack() { + vm.datastack_pop(base); + } + } + return result; } + + // Fast path: stack-allocated InterpreterFrame, no FrameObject. + // No refcount inc for code — it's alive via self.code for the call duration. + let nlocalsplus = code.localspluskinds.len(); + let max_stackdepth = code.max_stackdepth as usize; + let localsplus = + crate::frame::LocalsPlus::new_on_datastack(nlocalsplus, max_stackdepth, vm); + + let locals = if code.flags.contains(bytecode::CodeFlags::NEWLOCALS) { + crate::frame::FrameLocals::lazy() + } else if let Some(locals) = locals { + crate::frame::FrameLocals::with_locals(locals) + } else { + crate::frame::FrameLocals::with_locals(crate::function::ArgMapping::from_dict_exact( + self.globals.clone(), + )) + }; + + // Use self.as_object() as raw pointer — no refcount inc/dec. + // The function is alive on the caller's stack for the call duration. + let mut iframe = crate::frame::InterpreterFrame::new( + &self.code, + &self.globals, + &self.builtins, + Some(self.as_object()), + localsplus, + locals, + self.closure.as_ref().map_or(&[], |c| c.as_slice()), + crate::frame::FrameOwner::Thread, + ); + let result = self + .fill_locals_from_args_iframe(&mut iframe, func_args, vm) + .and_then(|()| vm.run_frame_fast(&mut iframe)); + // Release data stack memory — must happen on both success and error. + unsafe { + if let Some(base) = iframe.localsplus.release_datastack() { + vm.datastack_pop(base); + } + } + result + } + + /// Create generator, coroutine, or async generator from a FrameObject. + fn make_generator_or_coro(&self, frame: FrameObjectRef, vm: &VirtualMachine) -> PyObjectRef { + let code = frame.iframe().code(); + let is_async_gen = code.flags.contains(bytecode::CodeFlags::ASYNC_GENERATOR); + let is_gen = code.flags.contains(bytecode::CodeFlags::GENERATOR); + + let obj = if is_async_gen { + PyAsyncGen::new(frame.clone(), self.__name__(), self.__qualname__()).into_pyobject(vm) + } else if is_gen { + PyGenerator::new(frame.clone(), self.__name__(), self.__qualname__()).into_pyobject(vm) + } else { + PyCoroutine::new(frame.clone(), self.__name__(), self.__qualname__()).into_pyobject(vm) + }; + debug_assert!( + !frame.localsplus_is_datastack_backed(), + "generator frame is data-stack-backed" + ); + // SAFETY: the frame is alive (held by `frame`) and untracked. + unsafe { + crate::gc_state::gc_state().track_object(core::ptr::NonNull::from(frame.as_object())); + } + frame.set_generator(&obj); + obj } #[inline(always)] @@ -696,7 +748,7 @@ impl Py<PyFunction> { &self, args: impl ExactSizeIterator<Item = PyObjectRef>, vm: &VirtualMachine, - ) -> FrameRef { + ) -> FrameObjectRef { let code: PyRef<PyCode> = (*self.code).to_owned(); debug_assert_eq!(args.len(), code.arg_count as usize); @@ -719,7 +771,7 @@ impl Py<PyFunction> { Some(ArgMapping::from_dict_exact(self.globals.clone())) }; - let frame = Frame::new( + let frame = FrameObject::new_ref( code, Scope::new(locals, self.globals.clone()), self.builtins.clone(), @@ -727,8 +779,7 @@ impl Py<PyFunction> { Some(self.to_owned().into()), true, // Exact-args fast path is only used for non-gen/coro functions. vm, - ) - .into_ref(&vm.ctx); + ); { let fastlocals = unsafe { frame.fastlocals_mut() }; @@ -745,10 +796,45 @@ impl Py<PyFunction> { args: impl ExactSizeIterator<Item = PyObjectRef>, vm: &VirtualMachine, ) -> PyResult { - let frame = self.prepare_exact_args_frame(args, vm); + let code = &*self.code; + let nlocalsplus = code.localspluskinds.len(); + let max_stackdepth = code.max_stackdepth as usize; + let localsplus = + crate::frame::LocalsPlus::new_on_datastack(nlocalsplus, max_stackdepth, vm); - let result = vm.run_frame(frame.clone()); - crate::frame::release_datastack_frame(&frame, vm); + let locals = if code.flags.contains(bytecode::CodeFlags::NEWLOCALS) { + crate::frame::FrameLocals::lazy() + } else { + crate::frame::FrameLocals::with_locals(ArgMapping::from_dict_exact( + self.globals.clone(), + )) + }; + + let mut iframe = crate::frame::InterpreterFrame::new( + code, + &self.globals, + &self.builtins, + Some(self.as_object()), + localsplus, + locals, + self.closure.as_ref().map_or(&[], |c| c.as_slice()), + crate::frame::FrameOwner::Thread, + ); + + // Fill arguments directly into fastlocals + { + let fastlocals = iframe.localsplus.fastlocals_mut(); + for (slot, arg) in fastlocals.iter_mut().zip(args) { + *slot = Some(arg); + } + } + + let result = vm.run_frame_fast(&mut iframe); + unsafe { + if let Some(base) = iframe.localsplus.release_datastack() { + vm.datastack_pop(base); + } + } result } diff --git a/crates/vm/src/builtins/generator.rs b/crates/vm/src/builtins/generator.rs index 6b16917e3..52db3c952 100644 --- a/crates/vm/src/builtins/generator.rs +++ b/crates/vm/src/builtins/generator.rs @@ -7,7 +7,7 @@ use crate::{ AsObject, Context, Py, PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine, class::PyClassImpl, coroutine::{Coro, warn_deprecated_throw_signature}, - frame::FrameRef, + frame::FrameObjectRef, function::OptionalArg, object::{Traverse, TraverseFn}, protocol::PyIterReturn, @@ -43,7 +43,7 @@ impl PyGenerator { } #[must_use] - pub fn new(frame: FrameRef, name: PyStrRef, qualname: PyStrRef) -> Self { + pub fn new(frame: FrameObjectRef, name: PyStrRef, qualname: PyStrRef) -> Self { Self { inner: Coro::new(frame, name, qualname), } @@ -70,7 +70,7 @@ impl PyGenerator { } #[pygetset] - fn gi_frame(&self, _vm: &VirtualMachine) -> Option<FrameRef> { + fn gi_frame(&self, _vm: &VirtualMachine) -> Option<FrameObjectRef> { if self.inner.closed() { None } else { @@ -85,7 +85,7 @@ impl PyGenerator { #[pygetset] fn gi_code(&self, _vm: &VirtualMachine) -> PyRef<PyCode> { - self.inner.frame().code.clone() + self.inner.frame().iframe().code().to_owned() } #[pygetset] diff --git a/crates/vm/src/builtins/super.rs b/crates/vm/src/builtins/super.rs index 620363966..f71bf51a6 100644 --- a/crates/vm/src/builtins/super.rs +++ b/crates/vm/src/builtins/super.rs @@ -79,22 +79,27 @@ impl Initializer for PySuper { let (typ, obj) = if let OptionalArg::Present(ty) = py_type { (ty, py_obj.unwrap_or_none(vm)) } else { - let frame = vm - .current_frame() - .ok_or_else(|| vm.new_runtime_error("super(): no current frame"))?; + // Access the InterpreterFrame directly — no need to materialize + // a FrameObject just to read code/locals. + let iframe_ptr = crate::vm::thread::get_current_frame(); + if iframe_ptr.is_null() { + return Err(vm.new_runtime_error("super(): no current frame")); + } + let iframe = unsafe { &*iframe_ptr }; + let code = iframe.code(); - if frame.code.arg_count == 0 { + if code.arg_count == 0 { return Err(vm.new_runtime_error("super(): no arguments")); } - // SAFETY: Frame is current and not concurrently mutated. + // SAFETY: InterpreterFrame is current and not concurrently mutated. use rustpython_compiler_core::bytecode::CO_FAST_CELL; - let obj = unsafe { frame.fastlocals() }[0] + let fastlocals = iframe.localsplus.fastlocals(); + let obj = fastlocals[0] .clone() .and_then(|val| { // If slot 0 is a merged cell (LOCAL|CELL), extract value from cell - if frame - .code + if code .localspluskinds .first() .is_some_and(|&k| k & CO_FAST_CELL != 0) @@ -108,13 +113,15 @@ impl Initializer for PySuper { let mut typ = None; // Search for __class__ in freevars using localspluskinds - let nlocalsplus = frame.code.localspluskinds.len(); - let nfrees = frame.code.freevars.len(); + let nlocalsplus = code.localspluskinds.len(); + let nfrees = code.freevars.len(); let free_start = nlocalsplus - nfrees; - for (i, var) in frame.code.freevars.iter().enumerate() { + for (i, var) in code.freevars.iter().enumerate() { if var.as_bytes() == b"__class__" { - let class = frame - .get_cell_contents(free_start + i) + let class = fastlocals[free_start + i] + .as_ref() + .and_then(|v| v.downcast_ref::<PyCell>()) + .and_then(|c| c.get()) .ok_or_else(|| vm.new_runtime_error("super(): empty __class__ cell"))?; typ = Some(class.downcast().map_err(|o| { vm.new_type_error(format!( diff --git a/crates/vm/src/builtins/traceback.rs b/crates/vm/src/builtins/traceback.rs index b31de874b..0e93768dc 100644 --- a/crates/vm/src/builtins/traceback.rs +++ b/crates/vm/src/builtins/traceback.rs @@ -1,7 +1,7 @@ use super::{PyList, PyType}; use crate::{ AsObject, Context, Py, PyPayload, PyRef, PyResult, VirtualMachine, class::PyClassImpl, - frame::FrameRef, function::PySetterValue, types::Constructor, + frame::FrameObjectRef, function::PySetterValue, types::Constructor, }; use rustpython_common::lock::PyMutex; use rustpython_compiler_core::OneIndexed; @@ -10,7 +10,7 @@ use rustpython_compiler_core::OneIndexed; #[derive(Debug)] pub struct PyTraceback { pub next: PyMutex<Option<PyTracebackRef>>, - pub frame: FrameRef, + pub frame: FrameObjectRef, #[pytraverse(skip)] pub lasti: u32, #[pytraverse(skip)] @@ -31,7 +31,7 @@ impl PyTraceback { #[must_use] pub const fn new( next: Option<PyRef<Self>>, - frame: FrameRef, + frame: FrameObjectRef, lasti: u32, lineno: OneIndexed, ) -> Self { @@ -44,7 +44,7 @@ impl PyTraceback { } #[pygetset] - fn tb_frame(&self) -> FrameRef { + fn tb_frame(&self) -> FrameObjectRef { self.frame.clone() } @@ -104,7 +104,7 @@ impl PyTraceback { } impl Constructor for PyTraceback { - type Args = (Option<PyRef<Self>>, FrameRef, u32, usize); + type Args = (Option<PyRef<Self>>, FrameObjectRef, u32, usize); fn py_new(_cls: &Py<PyType>, args: Self::Args, vm: &VirtualMachine) -> PyResult<Self> { let (next, frame, lasti, lineno) = args; @@ -130,9 +130,12 @@ impl serde::Serialize for PyTraceback { use serde::ser::SerializeStruct; let mut struc = s.serialize_struct("PyTraceback", 3)?; - struc.serialize_field("name", self.frame.code.obj_name.as_str())?; + struc.serialize_field("name", self.frame.iframe().code().obj_name.as_str())?; struc.serialize_field("lineno", &self.lineno.get())?; - struc.serialize_field("filename", self.frame.code.source_path().as_str())?; + struc.serialize_field( + "filename", + self.frame.iframe().code().source_path().as_str(), + )?; struc.end() } } diff --git a/crates/vm/src/builtins/type.rs b/crates/vm/src/builtins/type.rs index c27c6475f..0ccfe155d 100644 --- a/crates/vm/src/builtins/type.rs +++ b/crates/vm/src/builtins/type.rs @@ -1513,7 +1513,7 @@ impl PyType { // temporary refs so they never see a dangling pointer. let keep_alive = |type_ref: PyTypeRef, retired: &mut Vec<PyObjectRef>| { if let Some(frame) = vm.current_frame() { - frame.temporary_refs.lock().push(type_ref.into()); + frame.iframe().temporary_refs.lock().push(type_ref.into()); } else { retired.push(type_ref.into()); } @@ -2183,14 +2183,11 @@ impl Constructor for PyType { *f = PyStaticMethod::from(f.clone()).into_pyobject(vm); } - if let Some(current_frame) = vm.current_frame() { + if let Some(globals) = crate::frame::current_globals() { let entry = attributes.entry(identifier!(vm, __module__)); if matches!(entry, Entry::Vacant(_)) { - let module_name = vm.unwrap_or_none( - current_frame - .globals - .get_item_opt(identifier!(vm, __name__), vm)?, - ); + let module_name = + vm.unwrap_or_none(globals.get_item_opt(identifier!(vm, __name__), vm)?); entry.or_insert(module_name); } } diff --git a/crates/vm/src/coroutine.rs b/crates/vm/src/coroutine.rs index 844887f85..c7252c66d 100644 --- a/crates/vm/src/coroutine.rs +++ b/crates/vm/src/coroutine.rs @@ -3,7 +3,7 @@ use crate::{ builtins::PyStrRef, common::lock::PyMutex, exceptions::types::PyBaseException, - frame::{ExecutionResult, Frame, FrameOwner, FrameRef}, + frame::{ExecutionResult, FrameObject, FrameObjectRef, FrameOwner}, function::OptionalArg, object::{PyAtomicRef, Traverse, TraverseFn}, protocol::PyIterReturn, @@ -29,7 +29,7 @@ impl ExecutionResult { #[derive(Debug)] pub struct Coro { - frame: FrameRef, + frame: FrameObjectRef, pub closed: AtomicCell<bool>, // TODO: https://github.com/RustPython/RustPython/pull/3183#discussion_r720560652 running: AtomicCell<bool>, // code @@ -62,7 +62,7 @@ fn gen_name(jen: &PyObject, vm: &VirtualMachine) -> &'static str { } impl Coro { - pub fn new(frame: FrameRef, name: PyStrRef, qualname: PyStrRef) -> Self { + pub fn new(frame: FrameObjectRef, name: PyStrRef, qualname: PyStrRef) -> Self { Self { frame, closed: AtomicCell::new(false), @@ -94,8 +94,8 @@ impl Coro { match res { Ok(ExecutionResult::Return(_)) | Err(_) => { self.closed.store(true); - // Frame is no longer suspended; allow frame.clear() to succeed. - self.frame.owner.store( + // FrameObject is no longer suspended; allow frame.clear() to succeed. + self.frame.iframe().owner.store( FrameOwner::FrameObject as i8, core::sync::atomic::Ordering::Release, ); @@ -114,7 +114,7 @@ impl Coro { func: F, ) -> (PyResult<ExecutionResult>, bool) where - F: FnOnce(&Py<Frame>) -> PyResult<ExecutionResult>, + F: FnOnce(&Py<FrameObject>) -> PyResult<ExecutionResult>, { if self.running.compare_exchange(false, true).is_err() { return ( @@ -290,7 +290,7 @@ impl Coro { self.closed.load() } - pub fn frame(&self) -> FrameRef { + pub fn frame(&self) -> FrameObjectRef { self.frame.clone() } @@ -337,7 +337,8 @@ pub(crate) fn get_awaitable_iter(obj: PyObjectRef, vm: &VirtualMachine) -> PyRes || obj.downcast_ref::<PyGenerator>().is_some_and(|g| { g.as_coro() .frame() - .code + .iframe() + .code() .flags .contains(crate::bytecode::CodeFlags::ITERABLE_COROUTINE) }) @@ -352,7 +353,8 @@ pub(crate) fn get_awaitable_iter(obj: PyObjectRef, vm: &VirtualMachine) -> PyRes || result.downcast_ref::<PyGenerator>().is_some_and(|g| { g.as_coro() .frame() - .code + .iframe() + .code() .flags .contains(crate::bytecode::CodeFlags::ITERABLE_COROUTINE) }) diff --git a/crates/vm/src/exceptions.rs b/crates/vm/src/exceptions.rs index 7eaf8bafc..4facffee1 100644 --- a/crates/vm/src/exceptions.rs +++ b/crates/vm/src/exceptions.rs @@ -401,13 +401,13 @@ fn write_traceback_entry<W: Write>( output: &mut W, tb_entry: &Py<PyTraceback>, ) -> Result<(), W::Error> { - let filename = tb_entry.frame.code.source_path().as_str(); + let filename = tb_entry.frame.iframe().code().source_path().as_str(); writeln!( output, r##" File "{}", line {}, in {}"##, filename.trim_start_matches(r"\\?\"), tb_entry.lineno, - tb_entry.frame.code.obj_name + tb_entry.frame.iframe().code().obj_name )?; #[cfg(feature = "host_env")] diff --git a/crates/vm/src/frame.rs b/crates/vm/src/frame.rs index 5df8b85e5..5c21ad29c 100644 --- a/crates/vm/src/frame.rs +++ b/crates/vm/src/frame.rs @@ -38,7 +38,6 @@ use bstr::ByteSlice; use core::cell::UnsafeCell; use core::ptr::NonNull; use core::sync::atomic; -use core::sync::atomic::AtomicPtr; use core::sync::atomic::Ordering::{Acquire, Relaxed}; use itertools::Itertools; use malachite_bigint::BigInt; @@ -48,72 +47,152 @@ use rustpython_common::{ lock::{OnceCell, PyMutex}, wtf8::{Wtf8, Wtf8Buf, wtf8_concat}, }; -use rustpython_compiler_core::SourceLocation; +use rustpython_compiler_core::{OneIndexed, SourceLocation}; -pub type FrameRef = PyRef<Frame>; +pub type FrameObjectRef = PyRef<FrameObject>; -/// Recover an owned reference to a live chain frame, or `None` for null. +// -- Frame chain utilities -- +// The frame chain is a singly-linked list of `*const InterpreterFrame` stored +// as `usize` values in `InterpreterFrame.previous` and the TLS +// `CURRENT_FRAME`. Null (0) marks the end. +// Each InterpreterFrame has a `materialized` pointer that is non-null when +// a FrameObject wraps it (always the case today; stack-allocated frames will +// leave it null until observed). + +/// Recover an owned reference to the FrameObject that wraps the given +/// InterpreterFrame, or `None` if null or not materialized. /// /// # Safety -/// A non-null `frame` must reference a frame that is live on the current -/// thread's execution chain, so the object outlives this call. -unsafe fn owned_chain_frame(frame: *const Frame) -> Option<FrameRef> { - if frame.is_null() { +/// A non-null `iframe` must reference a live InterpreterFrame on the current +/// thread's execution chain. +unsafe fn owned_chain_frame(iframe: *const InterpreterFrame) -> Option<FrameObjectRef> { + if iframe.is_null() { return None; } - // SAFETY: caller guarantees the frame is live; from_payload_ptr recovers - // the enclosing object from the payload address. - let py = unsafe { &*Py::<Frame>::from_payload_ptr(frame) }; - Some(py.to_owned()) + let iframe_ref = unsafe { &*iframe }; + let fo = iframe_ref.frame_obj()?; + Some(fo.to_owned()) } /// The current thread's topmost frame object, if any. #[must_use] -pub fn current_thread_frame() -> Option<FrameRef> { - // SAFETY: the chain top executes on this thread, hence is alive. - unsafe { owned_chain_frame(crate::vm::thread::get_current_frame()) } +pub fn current_thread_frame() -> Option<FrameObjectRef> { + let ptr = crate::vm::thread::get_current_frame(); + unsafe { owned_chain_frame(ptr) } +} + +/// Get the current thread's topmost InterpreterFrame pointer. +#[must_use] +pub fn current_thread_iframe() -> *const InterpreterFrame { + crate::vm::thread::get_current_frame() +} + +/// The current thread's topmost frame object, materializing if necessary. +/// Unlike `current_thread_frame()`, this always returns `Some` if there is +/// an active frame, even if it's stack-allocated and hasn't been observed yet. +/// Uses `vm.current_frame` Cell for fast lookup (no TLS). +#[must_use] +pub fn current_thread_frame_materialize(vm: &VirtualMachine) -> Option<FrameObjectRef> { + let ptr = crate::vm::thread::get_current_frame(); + if ptr.is_null() { + return None; + } + let iframe = unsafe { &*ptr }; + Some(iframe.materialize(vm).to_owned()) +} + +/// Read the globals dict from the topmost frame on this thread's chain. +/// Returns `None` if the chain is empty. +#[must_use] +pub fn current_globals() -> Option<PyDictRef> { + let ptr = crate::vm::thread::get_current_frame(); + if ptr.is_null() { + return None; + } + Some(unsafe { (*ptr).globals().to_owned() }) +} + +/// Read the code object from the topmost frame on this thread's chain. +/// Returns `None` if the chain is empty. +#[must_use] +pub fn current_code() -> Option<PyRef<PyCode>> { + let ptr = crate::vm::thread::get_current_frame(); + if ptr.is_null() { + return None; + } + Some(unsafe { (*ptr).code().to_owned() }) +} + +/// Read the builtins object from the topmost frame on this thread's chain. +#[must_use] +pub fn current_builtins() -> Option<PyObjectRef> { + let ptr = crate::vm::thread::get_current_frame(); + if ptr.is_null() { + return None; + } + Some(unsafe { (*ptr).builtins().to_owned() }) } /// The frame `offset` positions below the current thread's top frame (offset 0 /// is the top), or `None` if the stack is not that deep. +/// Materializes the FrameObject on demand for stack-allocated frames. #[must_use] -pub fn frame_at_offset(offset: usize) -> Option<FrameRef> { - let mut cur = crate::vm::thread::get_current_frame(); - for _ in 0..offset { - if cur.is_null() { - return None; - } - // SAFETY: chain frames are alive on the current thread's stack. - cur = unsafe { (*cur).previous_frame() }; - } - // SAFETY: same as above. - unsafe { owned_chain_frame(cur) } -} - -/// If `target` is a frame on the current thread's chain, return an owned -/// reference to it; otherwise `None`. Presence on the chain proves liveness. -#[must_use] -pub fn find_owned_chain_frame(target: *const Frame) -> Option<FrameRef> { +pub fn frame_at_offset(offset: usize, vm: &VirtualMachine) -> Option<FrameObjectRef> { let mut cur = crate::vm::thread::get_current_frame(); + let mut remaining = offset; while !cur.is_null() { - if core::ptr::eq(cur, target) { - // SAFETY: a frame on the current thread's chain is alive. - return unsafe { owned_chain_frame(cur) }; + if remaining == 0 { + let iframe = unsafe { &*cur }; + return Some(iframe.materialize(vm).to_owned()); } - // SAFETY: chain frames are alive on the current thread's stack. - cur = unsafe { (*cur).previous_frame() }; + remaining -= 1; + cur = unsafe { (*cur).previous.load(Relaxed) as *const InterpreterFrame }; } None } -/// Invoke `f` for each frame on the current thread's chain, from the topmost -/// frame down to the bottom. -pub fn for_each_current_frame(mut f: impl FnMut(&Py<Frame>)) { +/// If a FrameObject wrapping `target` InterpreterFrame is on the current +/// thread's chain, return an owned reference to it; otherwise `None`. +#[must_use] +pub fn find_owned_chain_frame_by_iframe(target: *const InterpreterFrame) -> Option<FrameObjectRef> { let mut cur = crate::vm::thread::get_current_frame(); while !cur.is_null() { - // SAFETY: chain frames are alive on the current thread's stack. - f(unsafe { &*Py::<Frame>::from_payload_ptr(cur) }); - cur = unsafe { (*cur).previous_frame() }; + if core::ptr::eq(cur, target) { + return unsafe { owned_chain_frame(cur) }; + } + cur = unsafe { (*cur).previous.load(Relaxed) as *const InterpreterFrame }; + } + None +} + +/// If `target` FrameObject is on the current thread's chain, return an +/// owned reference to it; otherwise `None`. Presence on the chain proves liveness. +#[must_use] +pub fn find_owned_chain_frame(target: *const FrameObject) -> Option<FrameObjectRef> { + let mut cur = crate::vm::thread::get_current_frame(); + while !cur.is_null() { + let iframe_ref = unsafe { &*cur }; + if let Some(fo) = iframe_ref.frame_obj() { + let fo_payload: *const FrameObject = &**fo; + if core::ptr::eq(fo_payload, target) { + return Some(fo.to_owned()); + } + } + cur = iframe_ref.previous.load(Relaxed) as *const InterpreterFrame; + } + None +} + +/// Invoke `f` for each frame on the current thread's chain, from the +/// topmost frame down to the bottom. +pub fn for_each_current_frame(mut f: impl FnMut(&Py<FrameObject>)) { + let mut cur = crate::vm::thread::get_current_frame(); + while !cur.is_null() { + let iframe_ref = unsafe { &*cur }; + if let Some(fo) = iframe_ref.frame_obj() { + f(fo); + } + cur = iframe_ref.previous.load(Relaxed) as *const InterpreterFrame; } } @@ -157,7 +236,7 @@ impl FrameOwner { /// Lock-free mutable storage for frame-internal data. /// /// # Safety -/// Frame execution is single-threaded: only one thread at a time executes +/// FrameObject execution is single-threaded: only one thread at a time executes /// a given frame (enforced by the owner field and generator running flag). /// External readers (e.g. `f_locals`) are on the same thread as execution /// (trace callback) or the frame is not executing. @@ -182,7 +261,7 @@ impl<T> FrameUnsafeCell<T> { } } -// SAFETY: Frame execution is single-threaded. See FrameUnsafeCell doc. +// SAFETY: FrameObject execution is single-threaded. See FrameUnsafeCell doc. #[cfg(feature = "threading")] unsafe impl<T: Send> Send for FrameUnsafeCell<T> {} #[cfg(feature = "threading")] @@ -216,7 +295,7 @@ enum LocalsPlusData { } // SAFETY: DataStack variant points to thread-local DataStack memory. -// Frame execution is single-threaded (enforced by owner field). +// FrameObject execution is single-threaded (enforced by owner field). #[cfg(feature = "threading")] unsafe impl Send for LocalsPlusData {} #[cfg(feature = "threading")] @@ -247,7 +326,11 @@ impl LocalsPlus { /// When the frame finishes, the caller must migrate data to the heap with /// `materialize_localsplus()` (or drop it in place with /// `release_localsplus()`), then `datastack_pop()` to free the memory. - fn new_on_datastack(nlocalsplus: usize, stacksize: usize, vm: &VirtualMachine) -> Self { + pub(crate) fn new_on_datastack( + nlocalsplus: usize, + stacksize: usize, + vm: &VirtualMachine, + ) -> Self { let capacity = nlocalsplus .checked_add(stacksize) .expect("LocalsPlus capacity overflow"); @@ -288,7 +371,7 @@ impl LocalsPlus { /// /// Only valid when the values can never be observed again (the enclosing /// frame is uniquely referenced): the locals are gone afterwards. - fn release_datastack(&mut self) -> Option<*mut u8> { + pub(crate) fn release_datastack(&mut self) -> Option<*mut u8> { let LocalsPlusData::DataStack { ptr, .. } = &self.data else { return None; }; @@ -304,6 +387,50 @@ impl LocalsPlus { Some(base) } + /// Create a new heap-backed LocalsPlus that is a clone of the + /// fastlocals portion of this one. Stack slots are NOT copied + /// (stack_top = 0, stacksize = 0). + /// + /// # Safety + /// The caller must ensure that `self.fastlocals()` is a valid slice + /// (backing storage is alive, not concurrently mutated). + pub(crate) unsafe fn snapshot_to_heap(&self) -> Self { + let n = self.nlocalsplus as usize; + let src = self.fastlocals(); + let mut data = vec![0usize; n]; + // Clone each Option<PyObjectRef> into the heap buffer. + for (i, slot) in src.iter().enumerate() { + if let Some(obj) = slot { + let cloned: Option<PyObjectRef> = Some(obj.clone()); + // SAFETY: Option<PyObjectRef> has the same layout as usize. + data[i] = unsafe { core::mem::transmute_copy(&cloned) }; + core::mem::forget(cloned); + } + } + Self { + data: LocalsPlusData::Heap(data.into_boxed_slice()), + nlocalsplus: self.nlocalsplus, + stack_top: 0, + } + } + + /// Update fastlocals in `self` from `src`. For each slot, drops the old + /// value and clones the new one. `self` must be heap-backed. + /// + /// # Safety + /// Both `self` and `src` must have valid backing storage, and the caller + /// must ensure no concurrent mutable access. + pub(crate) unsafe fn sync_fastlocals_from(&mut self, src: &Self) { + let n = core::cmp::min(self.nlocalsplus as usize, src.nlocalsplus as usize); + let dst = self.fastlocals_mut(); + let source = src.fastlocals(); + for i in 0..n { + let old = dst[i].take(); + dst[i].clone_from(&source[i]); + drop(old); + } + } + /// Drop all contained values without freeing the backing storage. fn drop_values(&mut self) { self.stack_clear(); @@ -360,7 +487,7 @@ impl LocalsPlus { /// Immutable access to fastlocals as `Option<PyObjectRef>` slice. #[inline(always)] - fn fastlocals(&self) -> &[Option<PyObjectRef>] { + pub(crate) fn fastlocals(&self) -> &[Option<PyObjectRef>] { let data = self.data_as_slice(); let ptr = data.as_ptr() as *const Option<PyObjectRef>; unsafe { core::slice::from_raw_parts(ptr, self.nlocalsplus as usize) } @@ -368,7 +495,7 @@ impl LocalsPlus { /// Mutable access to fastlocals as `Option<PyObjectRef>` slice. #[inline(always)] - fn fastlocals_mut(&mut self) -> &mut [Option<PyObjectRef>] { + pub(crate) fn fastlocals_mut(&mut self) -> &mut [Option<PyObjectRef>] { let nlocalsplus = self.nlocalsplus as usize; let data = self.data_as_mut_slice(); let ptr = data.as_mut_ptr() as *mut Option<PyObjectRef>; @@ -593,7 +720,7 @@ pub struct FrameLocals { impl FrameLocals { /// Create with an already-initialized locals mapping (non-NEWLOCALS frames). - fn with_locals(locals: ArgMapping) -> Self { + pub(crate) fn with_locals(locals: ArgMapping) -> Self { let cell = OnceCell::new(); let _ = cell.set(locals); Self { inner: cell } @@ -601,7 +728,7 @@ impl FrameLocals { /// Create an empty lazy locals (for NEWLOCALS frames). /// The dict will be created on first access. - fn lazy() -> Self { + pub(crate) fn lazy() -> Self { Self { inner: OnceCell::new(), } @@ -668,38 +795,43 @@ unsafe impl Traverse for FrameLocals { /// Lightweight execution frame. Not a PyObject. /// Analogous to CPython's `_PyInterpreterFrame`. /// -/// Currently always embedded inside a `Frame` PyObject via `FrameUnsafeCell`. -/// In future PRs this will be usable independently for normal function calls -/// (allocated on the Rust stack + DataStack), eliminating PyObject overhead. +/// The four "identity" fields (`code`, `globals`, `builtins`, `func_obj`) +/// are borrowed raw pointers — refcounts are maintained by the owner +/// (FrameObject's owned fields, or the PyFunction on the caller's stack +/// in the DataStack path). +#[repr(C)] pub struct InterpreterFrame { - pub code: PyRef<PyCode>, - pub func_obj: Option<PyObjectRef>, + // Borrowed pointers — owned by FrameObject or by PyFunction on caller's stack. + pub(crate) code: *const Py<PyCode>, + pub(crate) func_obj: *const PyObject, // nullable + pub(crate) globals: *const Py<PyDict>, + pub(crate) builtins: *const PyObject, /// Unified storage for local variables and evaluation stack. pub(crate) localsplus: LocalsPlus, pub locals: FrameLocals, - pub globals: PyDictRef, - pub builtins: PyObjectRef, /// index of last instruction ran pub lasti: PyAtomic<u32>, - /// tracer function for this frame (usually is None) - pub trace: PyMutex<PyObjectRef>, + /// Per-frame tracer function. `None` means no per-frame trace is set + /// (equivalent to `f_trace = None` in Python). This avoids a refcounted + /// None clone on every frame init. + pub trace: PyMutex<Option<PyObjectRef>>, /// Previous line number for LINE event suppression. - pub(crate) prev_line: u32, + pub(crate) prev_line: core::cell::Cell<u32>, // member pub trace_lines: PyMutex<bool>, pub trace_opcodes: PyMutex<bool>, pub temporary_refs: PyMutex<Vec<PyObjectRef>>, /// Back-reference to owning generator/coroutine/async generator. - /// Borrowed reference (not ref-counted) to avoid Generator↔Frame cycle. + /// Borrowed reference (not ref-counted) to avoid Generator↔FrameObject cycle. /// Cleared by the generator's Drop impl. pub generator: PyAtomicBorrow, - /// Previous frame in the call chain for signal-safe traceback walking. - /// Mirrors `_PyInterpreterFrame.previous`. - pub(crate) previous: AtomicPtr<Frame>, + /// Linked-list pointer to the previous frame in the call chain. + /// Stores a `*const FrameObject` as `usize`. + pub(crate) previous: PyAtomic<usize>, /// Who owns this frame. Mirrors `_PyInterpreterFrame.owner`. /// Used by `frame.clear()` to reject clearing an executing frame, /// even when called from a different thread. @@ -717,7 +849,7 @@ pub struct InterpreterFrame { /// Strong reference to the caller frame, captured when this frame escapes /// its execution so `f_back` still resolves after the caller returns and /// leaves the live frame chain. - pub(crate) retained_back: PyMutex<Option<FrameRef>>, + pub(crate) retained_back: PyMutex<Option<FrameObjectRef>>, /// Number of stack entries to pop after set_f_lineno returns to the /// execution loop. set_f_lineno cannot pop directly because the /// execution loop holds the state mutex. @@ -726,19 +858,344 @@ pub struct InterpreterFrame { /// Used together with `pending_stack_pops` to identify Except entries /// that need special exception-state handling. pub(crate) pending_unwind_from_stack: PyAtomic<i64>, + /// Pointer to the owning `Py<FrameObject>`, or null for stack-allocated + /// frames that have not been materialized yet. + /// Stored as `usize` for `PyAtomic` compatibility. + pub(crate) materialized: PyAtomic<usize>, +} + +// Raw pointers make InterpreterFrame !Send+!Sync by default. +// SAFETY: The pointers reference heap-resident PyObjects whose lifetimes +// are managed by the owning FrameObject (or PyFunction). Frame execution +// is single-threaded (enforced by the owner field). +#[cfg(feature = "threading")] +unsafe impl Send for InterpreterFrame {} +#[cfg(feature = "threading")] +unsafe impl Sync for InterpreterFrame {} + +impl InterpreterFrame { + /// Construct a new InterpreterFrame with raw pointers set from the given references. + /// + /// The caller must ensure that the pointed-to objects outlive this frame. + /// For FrameObject-owned frames, `init_iframe_ptrs` patches the pointers + /// after heap allocation; the pointers passed here are then overwritten. + /// For stack-allocated frames (future), the pointers remain valid for the + /// frame's lifetime on the native stack. + #[allow(clippy::too_many_arguments)] + pub(crate) fn new( + code: &Py<PyCode>, + globals: &Py<PyDict>, + builtins: &PyObject, + func_obj: Option<&PyObject>, + localsplus: LocalsPlus, + locals: FrameLocals, + closure: &[PyCellRef], + owner: FrameOwner, + ) -> Self { + let mut localsplus = localsplus; + let nlocalsplus = code.localspluskinds.len(); + + // Pre-copy closure cells into free var slots so that locals() works + // even before COPY_FREE_VARS runs (e.g. coroutine before first send). + // COPY_FREE_VARS will overwrite these on first execution. + { + let nfrees = code.freevars.len(); + if nfrees > 0 { + let freevar_start = nlocalsplus - nfrees; + let fastlocals = localsplus.fastlocals_mut(); + for (i, cell) in closure.iter().enumerate() { + fastlocals[freevar_start + i] = Some(cell.clone().into()); + } + } + } + + // For generators/coroutines, initialize prev_line to the def line + // so that preamble instructions (RETURN_GENERATOR, POP_TOP) don't + // fire spurious LINE events. + let prev_line = if code.flags.intersects( + bytecode::CodeFlags::GENERATOR + | bytecode::CodeFlags::COROUTINE + | bytecode::CodeFlags::ASYNC_GENERATOR, + ) { + code.first_line_number.map_or(0, |line| line.get() as u32) + } else { + 0 + }; + + Self { + code: code as *const Py<PyCode>, + func_obj: match func_obj { + Some(obj) => obj as *const PyObject, + None => core::ptr::null(), + }, + globals: globals as *const Py<PyDict>, + builtins: builtins as *const PyObject, + localsplus, + locals, + lasti: Radium::new(0), + prev_line: core::cell::Cell::new(prev_line), + trace: PyMutex::new(None), + trace_lines: PyMutex::new(true), + trace_opcodes: PyMutex::new(false), + temporary_refs: PyMutex::new(vec![]), + generator: PyAtomicBorrow::new(), + previous: Radium::new(0), + owner: atomic::AtomicI8::new(owner as i8), + f_locals_hidden_overlay: PyMutex::new(None), + f_extra_locals: PyMutex::new(None), + escaped: atomic::AtomicBool::new(false), + retained_back: PyMutex::new(None), + pending_stack_pops: Default::default(), + pending_unwind_from_stack: Default::default(), + materialized: Radium::new(0), + } + } + + /// Get the last instruction index. + #[inline(always)] + pub fn get_lasti(&self) -> u32 { + self.lasti.load(Relaxed) + } + + /// Get the previous InterpreterFrame in the chain, or null. + #[inline(always)] + pub fn previous(&self) -> *const Self { + self.previous.load(Relaxed) as *const Self + } + + /// Get the owning FrameObject, if this frame has been materialized. + #[inline(always)] + pub(crate) fn frame_obj(&self) -> Option<&Py<FrameObject>> { + let ptr = self.materialized.load(Relaxed); + if ptr == 0 { + None + } else { + Some(unsafe { &*(ptr as *const Py<FrameObject>) }) + } + } + + /// Materialize a FrameObject for this InterpreterFrame on demand. + /// If already materialized, returns the existing one. + /// The created FrameObject shares the raw pointers with this frame. + #[cold] + #[inline(never)] + pub(crate) fn materialize(&self, vm: &VirtualMachine) -> &Py<FrameObject> { + if let Some(fo) = self.frame_obj() { + return fo; + } + self.materialize_slow(vm) + } + + /// Create a lightweight FrameObject with empty localsplus, suitable for + /// f_back chain building (retained_back). Unlike `materialize`, this does + /// NOT store into `temporary_refs` or set the `materialized` pointer, so + /// the returned FrameObject is only kept alive by the caller's `PyRef`. + /// This prevents non-GC-tracked `temporary_refs` on a stack-allocated + /// iframe from defeating cycle collection. + #[cold] + #[inline(never)] + pub(crate) fn materialize_chain(&self, vm: &VirtualMachine) -> FrameObjectRef { + if let Some(fo) = self.frame_obj() { + return fo.to_owned(); + } + self.materialize_slow_chain(vm) + } + + #[cold] + fn materialize_slow(&self, vm: &VirtualMachine) -> &Py<FrameObject> { + // Create a full FrameObject with its own InterpreterFrame copy. + // The FrameObject owns references to the same objects (code, globals, etc). + let code: PyRef<PyCode> = self.code().to_owned(); + let globals: PyDictRef = self.globals().to_owned(); + let builtins: PyObjectRef = self.builtins().to_owned(); + let func_obj: Option<PyObjectRef> = self.func_obj().map(|o| o.to_owned()); + + // Copy localsplus from the stack frame so materialized frames have + // usable fastlocals (for locals(), f_locals, tracebacks, etc). + let localsplus = unsafe { self.localsplus.snapshot_to_heap() }; + + // Copy the locals mapping if it exists. + let locals = match self.locals.get() { + Some(mapping) => FrameLocals::with_locals(mapping.clone()), + None => FrameLocals::lazy(), + }; + + // Build a fresh InterpreterFrame inside the FrameObject. + // Its raw pointers will be patched by init_iframe_ptrs. + let inner_iframe = Self { + code: core::ptr::null(), + func_obj: core::ptr::null(), + globals: core::ptr::null(), + builtins: core::ptr::null(), + localsplus, + locals, + lasti: Radium::new(self.lasti.load(Relaxed)), + prev_line: core::cell::Cell::new(self.prev_line.get()), + trace: PyMutex::new(None), + trace_lines: PyMutex::new(true), + trace_opcodes: PyMutex::new(false), + temporary_refs: PyMutex::new(vec![]), + generator: PyAtomicBorrow::new(), + // Do NOT copy previous — it may point to stack-allocated frames + // that become dangling after their call returns. The f_back chain + // is resolved through the TLS CURRENT_FRAME chain instead. + previous: Radium::new(0), + // Materialized frame is a detached snapshot — always FrameObject-owned. + // If we copied Thread from the source iframe, frame.clear() would + // reject the frame with "cannot clear an executing frame". + owner: atomic::AtomicI8::new(FrameOwner::FrameObject as i8), + f_locals_hidden_overlay: PyMutex::new(None), + f_extra_locals: PyMutex::new(None), + escaped: atomic::AtomicBool::new(true), + retained_back: PyMutex::new(None), + pending_stack_pops: Default::default(), + pending_unwind_from_stack: Default::default(), + materialized: Radium::new(0), + }; + + let frame_obj = FrameObject { + owned_code: Some(code), + owned_globals: Some(globals), + owned_builtins: Some(builtins), + owned_func_obj: func_obj, + iframe: FrameUnsafeCell::new(Some(inner_iframe)), + }; + let frame_ref = frame_obj.into_ref(&vm.ctx); + FrameObject::init_iframe_ptrs(&frame_ref); + // Set the inner iframe's materialized pointer to self + unsafe { + frame_ref + .iframe_mut() + .materialized + .store(&*frame_ref as *const Py<FrameObject> as usize, Relaxed); + } + + // Store the materialized pointer on this stack frame. + let fo_ptr = &*frame_ref as *const Py<FrameObject> as usize; + self.materialized.store(fo_ptr, Relaxed); + + // Keep the FrameObject alive by storing it in temporary_refs. + // GC tracking is deferred to with_iframe cleanup, where the frame + // is no longer executing and temporary_refs is cleared — at that + // point the FrameObject is self-sustaining and GC can safely + // traverse and collect it. + self.temporary_refs.lock().push(frame_ref.clone().into()); + + // SAFETY: the pointer we stored above remains valid because + // temporary_refs holds a strong reference. + unsafe { &*(fo_ptr as *const Py<FrameObject>) } + } + + /// Like `materialize_slow` but with empty localsplus to avoid extra + /// refcounts on local variables. Only suitable for f_back chain building. + /// Returns an owned `PyRef` without storing into `temporary_refs` or + /// setting the `materialized` pointer, so GC can still detect cycles. + #[cold] + fn materialize_slow_chain(&self, vm: &VirtualMachine) -> FrameObjectRef { + let code: PyRef<PyCode> = self.code().to_owned(); + let globals: PyDictRef = self.globals().to_owned(); + let builtins: PyObjectRef = self.builtins().to_owned(); + let func_obj: Option<PyObjectRef> = self.func_obj().map(|o| o.to_owned()); + + // Empty localsplus — reads go through find_live_source_iframe. + let nlocalsplus = code.localspluskinds.len() as u32; + let localsplus = LocalsPlus { + data: LocalsPlusData::Heap(vec![0usize; nlocalsplus as usize].into_boxed_slice()), + nlocalsplus, + stack_top: 0, + }; + + let locals = match self.locals.get() { + Some(mapping) => FrameLocals::with_locals(mapping.clone()), + None => FrameLocals::lazy(), + }; + + let inner_iframe = Self { + code: core::ptr::null(), + func_obj: core::ptr::null(), + globals: core::ptr::null(), + builtins: core::ptr::null(), + localsplus, + locals, + lasti: Radium::new(self.lasti.load(Relaxed)), + prev_line: core::cell::Cell::new(self.prev_line.get()), + trace: PyMutex::new(None), + trace_lines: PyMutex::new(true), + trace_opcodes: PyMutex::new(false), + temporary_refs: PyMutex::new(vec![]), + generator: PyAtomicBorrow::new(), + previous: Radium::new(0), + owner: atomic::AtomicI8::new(FrameOwner::FrameObject as i8), + f_locals_hidden_overlay: PyMutex::new(None), + f_extra_locals: PyMutex::new(None), + escaped: atomic::AtomicBool::new(true), + retained_back: PyMutex::new(None), + pending_stack_pops: Default::default(), + pending_unwind_from_stack: Default::default(), + materialized: Radium::new(0), + }; + + let frame_obj = FrameObject { + owned_code: Some(code), + owned_globals: Some(globals), + owned_builtins: Some(builtins), + owned_func_obj: func_obj, + iframe: FrameUnsafeCell::new(Some(inner_iframe)), + }; + let frame_ref = frame_obj.into_ref(&vm.ctx); + FrameObject::init_iframe_ptrs(&frame_ref); + + frame_ref + } + + /// Borrowed code object. + #[inline(always)] + pub fn code(&self) -> &Py<PyCode> { + unsafe { &*self.code } + } + + /// Borrowed globals dict. + #[inline(always)] + pub fn globals(&self) -> &Py<PyDict> { + unsafe { &*self.globals } + } + + /// Borrowed builtins object. + #[inline(always)] + pub fn builtins(&self) -> &PyObject { + unsafe { &*self.builtins } + } + + /// Borrowed function object, or None if not set. + #[inline(always)] + pub fn func_obj(&self) -> Option<&PyObject> { + if self.func_obj.is_null() { + None + } else { + Some(unsafe { &*self.func_obj }) + } + } } /// Python-visible frame object. Currently always wraps an `InterpreterFrame`. /// Analogous to CPython's `PyFrameObject`. #[pyclass(module = false, name = "frame", traverse = "manual")] -pub struct Frame { +pub struct FrameObject { + // Owned references — keep the pointed-to objects alive for InterpreterFrame's + // raw pointers. Wrapped in Option so Traverse::clear can release them, + // allowing GC cycle collection to reclaim referenced objects. + pub(crate) owned_code: Option<PyRef<PyCode>>, + pub(crate) owned_globals: Option<PyDictRef>, + pub(crate) owned_builtins: Option<PyObjectRef>, + pub(crate) owned_func_obj: Option<PyObjectRef>, + /// Always `Some` while the frame is reachable from Python. Emptied only /// by `Traverse::clear` during deallocation, leaving a trivially-droppable /// husk that the freelist can cache. pub(crate) iframe: FrameUnsafeCell<Option<InterpreterFrame>>, } -impl Frame { +impl FrameObject { /// Shared access to the embedded interpreter frame. /// /// # Safety @@ -746,7 +1203,7 @@ impl Frame { /// and that the frame has not been cleared (i.e. it is still reachable /// from Python; `Traverse::clear` only runs during deallocation). #[inline(always)] - unsafe fn iframe_ref(&self) -> &InterpreterFrame { + pub(crate) unsafe fn iframe_ref(&self) -> &InterpreterFrame { let opt = unsafe { &*self.iframe.get() }; #[cfg(debug_assertions)] if opt.is_none() { @@ -763,7 +1220,7 @@ impl Frame { /// the frame has not been cleared. #[inline(always)] #[allow(clippy::mut_from_ref)] - unsafe fn iframe_mut(&self) -> &mut InterpreterFrame { + pub(crate) unsafe fn iframe_mut(&self) -> &mut InterpreterFrame { let opt = unsafe { &mut *self.iframe.get() }; #[cfg(debug_assertions)] if opt.is_none() { @@ -772,6 +1229,18 @@ impl Frame { // SAFETY: iframe is always Some while the frame is reachable (see above). unsafe { opt.as_mut().unwrap_unchecked() } } + + /// Shared access to the embedded interpreter frame. Safe to call on any + /// reachable FrameObject: immutable fields and atomic/mutex fields are + /// always safe to access. + #[inline(always)] + pub fn iframe(&self) -> &InterpreterFrame { + // SAFETY: FrameObject is always reachable from Python when this is + // called. Immutable fields and atomic/mutex fields provide their own + // synchronization. Mutable fields (localsplus, prev_line) are only + // mutated during single-threaded execution via with_exec. + unsafe { self.iframe_ref() } + } } /// Out-of-line panic for the debug-only cleared-frame check, keeping the @@ -783,31 +1252,19 @@ fn cleared_frame_access() -> ! { panic!("frame accessed after clear"); } -impl core::ops::Deref for Frame { - type Target = InterpreterFrame; - /// Transparent access to InterpreterFrame fields. - /// - /// # Safety argument - /// Immutable fields (code, globals, builtins, func_obj, locals) are safe - /// to access at any time. Atomic/mutex fields (lasti, trace, owner, etc.) - /// provide their own synchronization. Mutable fields (localsplus, prev_line) - /// are only mutated during single-threaded execution via `with_exec`. - #[inline(always)] - fn deref(&self) -> &InterpreterFrame { - unsafe { self.iframe_ref() } - } -} +// NOTE: Deref<Target = InterpreterFrame> removed to decouple FrameObject +// from InterpreterFrame field layout. Access through iframe_ref()/iframe_mut(). thread_local! { /// Free list of dead frame objects for reuse. Entries are cleared husks /// (`iframe == None`) whose child references were already released. - /// PyInner<Frame> is fixed-size (localsplus storage is out-of-line), + /// PyInner<FrameObject> is fixed-size (localsplus storage is out-of-line), /// so a single bucket suffices. - static FRAME_FREELIST: core::cell::Cell<crate::object::FreeList<Frame>> = + static FRAME_FREELIST: core::cell::Cell<crate::object::FreeList<FrameObject>> = const { core::cell::Cell::new(crate::object::FreeList::new()) }; } -impl PyPayload for Frame { +impl PyPayload for FrameObject { const MAX_FREELIST: usize = 200; const HAS_FREELIST: bool = true; // Ordinary call frames are created untracked and only enter the GC when @@ -851,37 +1308,21 @@ impl PyPayload for Frame { } } -unsafe impl Traverse for Frame { +unsafe impl Traverse for FrameObject { fn traverse(&self, tracer_fn: &mut TraverseFn<'_>) { - // SAFETY: this traversal reads the frame's live interpreter state - // (`localsplus`), which the owning thread mutates without - // synchronization while executing bytecode. It is only sound when no - // other thread is executing this frame: in threading builds the - // collector stops the world around the traversal phases, and in - // single-threaded builds there is no other thread. A cleared frame - // (iframe == None) has no children to visit. - // - // Invariant (load-bearing for the untracked-frame optimization): every - // reference *to* a frame is recorded as a graph edge by - // `PyRef<Frame>::traverse` — no other type's `traverse` recurses into a - // frame's payload. So the collector reads a frame's `localsplus` only - // when the frame is itself a tracked candidate. Tracked datastack - // frames are tracked only at `release_datastack_frame`, after they stop - // executing and their localsplus is materialized onto the heap; tracked - // generator frames are heap-backed by construction and their execution - // is stopped-the-world. Hence a running, data-stack-resident frame is - // never traversed by a concurrent collector. If a future change makes - // some type's `traverse` recurse into a frame payload, this invariant - // (and the debug asserts at the track sites) breaks. + // Visit the owned reference anchors on FrameObject. + // After clear(), these are None. + self.owned_code.traverse(tracer_fn); + self.owned_func_obj.traverse(tracer_fn); + self.owned_globals.traverse(tracer_fn); + self.owned_builtins.traverse(tracer_fn); + + // Visit interior references in the InterpreterFrame. let Some(iframe) = (unsafe { &*self.iframe.get() }) else { return; }; - iframe.code.traverse(tracer_fn); - iframe.func_obj.traverse(tracer_fn); iframe.localsplus.traverse(tracer_fn); iframe.locals.traverse(tracer_fn); - iframe.globals.traverse(tracer_fn); - iframe.builtins.traverse(tracer_fn); iframe.trace.traverse(tracer_fn); iframe.temporary_refs.traverse(tracer_fn); iframe.f_locals_hidden_overlay.traverse(tracer_fn); @@ -890,14 +1331,14 @@ unsafe impl Traverse for Frame { } fn clear(&mut self, _out: &mut Vec<PyObjectRef>) { - // Drop the interpreter frame in place instead of extracting children - // into `_out`: pushing ~10 refs per frame would grow the buffer, a - // heap allocation on the hot dealloc path. Direct drops release the - // same references under the same recursion protection (trashcan in - // dealloc, deferred-drop context in cycle collection) as the payload - // drop did before the freelist existed. The payload is left as a - // trivially-droppable husk for the freelist. + // Drop the interpreter frame and owned reference anchors so GC + // cycle collection can reclaim the referenced objects. The payload + // is left as a trivially-droppable husk for the freelist. drop(self.iframe.get_mut().take()); + self.owned_code.take(); + self.owned_globals.take(); + self.owned_builtins.take(); + self.owned_func_obj.take(); } } @@ -910,7 +1351,7 @@ pub enum ExecutionResult { /// A valid execution result, or an exception type FrameResult = PyResult<Option<ExecutionResult>>; -impl Frame { +impl FrameObject { pub(crate) fn new( code: PyRef<PyCode>, scope: Scope, @@ -922,73 +1363,76 @@ impl Frame { ) -> Self { let nlocalsplus = code.localspluskinds.len(); let max_stackdepth = code.max_stackdepth as usize; - let mut localsplus = if use_datastack { + let localsplus = if use_datastack { LocalsPlus::new_on_datastack(nlocalsplus, max_stackdepth, vm) } else { LocalsPlus::new(nlocalsplus, max_stackdepth) }; - // Pre-copy closure cells into free var slots so that locals() works - // even before COPY_FREE_VARS runs (e.g. coroutine before first send). - // COPY_FREE_VARS will overwrite these on first execution. - { - let nfrees = code.freevars.len(); - if nfrees > 0 { - let freevar_start = nlocalsplus - nfrees; - let fastlocals = localsplus.fastlocals_mut(); - for (i, cell) in closure.iter().enumerate() { - fastlocals[freevar_start + i] = Some(cell.clone().into()); - } - } - } - - // For generators/coroutines, initialize prev_line to the def line - // so that preamble instructions (RETURN_GENERATOR, POP_TOP) don't - // fire spurious LINE events. - let prev_line = if code.flags.intersects( - bytecode::CodeFlags::GENERATOR - | bytecode::CodeFlags::COROUTINE - | bytecode::CodeFlags::ASYNC_GENERATOR, - ) { - code.first_line_number.map_or(0, |line| line.get() as u32) - } else { - 0 + let locals = match scope.locals { + Some(locals) => FrameLocals::with_locals(locals), + None if code.flags.contains(bytecode::CodeFlags::NEWLOCALS) => FrameLocals::lazy(), + None => FrameLocals::with_locals(ArgMapping::from_dict_exact(scope.globals.clone())), }; - let iframe = InterpreterFrame { + // Build the InterpreterFrame using the constructor. + // Pointers are initially set from owned fields' references but will be + // dangling after the FrameObject moves into heap allocation — they get + // patched by `init_iframe_ptrs` after `into_ref`. + let iframe = InterpreterFrame::new( + &code, + &scope.globals, + &builtins, + func_obj.as_deref(), localsplus, - locals: match scope.locals { - Some(locals) => FrameLocals::with_locals(locals), - None if code.flags.contains(bytecode::CodeFlags::NEWLOCALS) => FrameLocals::lazy(), - None => { - FrameLocals::with_locals(ArgMapping::from_dict_exact(scope.globals.clone())) - } - }, - globals: scope.globals, - builtins, - code, - func_obj, - lasti: Radium::new(0), - prev_line, - trace: PyMutex::new(vm.ctx.none()), - trace_lines: PyMutex::new(true), - trace_opcodes: PyMutex::new(false), - temporary_refs: PyMutex::new(vec![]), - generator: PyAtomicBorrow::new(), - previous: AtomicPtr::new(core::ptr::null_mut()), - owner: atomic::AtomicI8::new(FrameOwner::FrameObject as i8), - f_locals_hidden_overlay: PyMutex::new(None), - f_extra_locals: PyMutex::new(None), - escaped: atomic::AtomicBool::new(false), - retained_back: PyMutex::new(None), - pending_stack_pops: Default::default(), - pending_unwind_from_stack: Default::default(), - }; + locals, + closure, + FrameOwner::FrameObject, + ); Self { + owned_code: Some(code), + owned_globals: Some(scope.globals), + owned_builtins: Some(builtins), + owned_func_obj: func_obj, iframe: FrameUnsafeCell::new(Some(iframe)), } } + /// Patch the InterpreterFrame's raw pointers to point at this + /// FrameObject's owned fields. Must be called once after the + /// FrameObject is allocated on the heap (i.e. after `into_ref`). + fn init_iframe_ptrs(self_: &Py<Self>) { + let iframe = unsafe { self_.iframe_mut() }; + iframe.code = &**self_.owned_code.as_ref().unwrap() as *const Py<PyCode>; + iframe.globals = &**self_.owned_globals.as_ref().unwrap() as *const Py<PyDict>; + iframe.builtins = &**self_.owned_builtins.as_ref().unwrap() as *const PyObject; + iframe.func_obj = match &self_.owned_func_obj { + Some(obj) => &**obj as *const PyObject, + None => core::ptr::null(), + }; + // Link the InterpreterFrame back to its owning FrameObject. + iframe + .materialized + .store(self_ as *const Py<Self> as usize, Relaxed); + } + + /// Create a new FrameObject, allocate it on the heap, and patch + /// the InterpreterFrame's raw pointers. Returns an owned reference. + pub(crate) fn new_ref( + code: PyRef<PyCode>, + scope: Scope, + builtins: PyObjectRef, + closure: &[PyCellRef], + func_obj: Option<PyObjectRef>, + use_datastack: bool, + vm: &VirtualMachine, + ) -> FrameObjectRef { + let frame = Self::new(code, scope, builtins, closure, func_obj, use_datastack, vm) + .into_ref(&vm.ctx); + Self::init_iframe_ptrs(&frame); + frame + } + /// Access fastlocals immutably. /// /// # Safety @@ -1056,31 +1500,21 @@ impl Frame { /// Releases references held by the frame, matching _PyFrame_ClearLocals. pub(crate) fn clear_locals_and_stack(&self) { self.clear_stack_and_cells(); - // SAFETY: Frame is not executing (generator closed). + // SAFETY: FrameObject is not executing (generator closed). let fastlocals = unsafe { self.iframe_mut().localsplus.fastlocals_mut() }; for slot in fastlocals.iter_mut() { *slot = None; } - self.f_locals_hidden_overlay.lock().take(); - self.f_extra_locals.lock().take(); - } - - /// Get cell contents by localsplus index. - pub(crate) fn get_cell_contents(&self, localsplus_idx: usize) -> Option<PyObjectRef> { - // SAFETY: Frame not executing; no concurrent mutation. - let fastlocals = unsafe { self.iframe_ref().localsplus.fastlocals() }; - fastlocals - .get(localsplus_idx) - .and_then(|slot| slot.as_ref()) - .and_then(|obj| obj.downcast_ref::<PyCell>()) - .and_then(|cell| cell.get()) + self.iframe().f_locals_hidden_overlay.lock().take(); + self.iframe().f_extra_locals.lock().take(); } /// Store a borrowed back-reference to the owning generator/coroutine. /// The caller must ensure the generator outlives the frame. pub fn set_generator(&self, generator: &PyObject) { - self.generator.store(generator); - self.owner + self.iframe().generator.store(generator); + self.iframe() + .owner .store(FrameOwner::Generator as i8, atomic::Ordering::Release); } @@ -1101,51 +1535,68 @@ impl Frame { } pub fn current_location(&self) -> SourceLocation { - self.code.locations[self.lasti() as usize - 1].0 + let lasti = self.lasti() as usize; + if lasti == 0 { + return SourceLocation { + line: self + .iframe() + .code() + .first_line_number + .unwrap_or(OneIndexed::MIN), + character_offset: OneIndexed::from_zero_indexed(0), + }; + } + self.iframe().code().locations[lasti - 1].0 } - /// Get the previous frame pointer for signal-safe traceback walking. + /// Get the previous InterpreterFrame in the chain. + /// Returns null if the frame has been cleared (GC deallocation). + pub fn previous_iframe(&self) -> *const InterpreterFrame { + // Use raw access instead of iframe() to avoid panicking on cleared frames. + let iframe_opt = unsafe { &*self.iframe.get() }; + match iframe_opt.as_ref() { + Some(iframe) => { + iframe.previous.load(atomic::Ordering::Relaxed) as *const InterpreterFrame + } + None => core::ptr::null(), + } + } + + /// Get the previous FrameObject in the chain, if any. + /// Walks through the chain to find the next materialized frame. pub fn previous_frame(&self) -> *const Self { - self.previous.load(atomic::Ordering::Relaxed) + let mut cur = self.previous_iframe(); + while !cur.is_null() { + let iframe = unsafe { &*cur }; + if let Some(fo) = iframe.frame_obj() { + return &**fo as *const Self; + } + cur = iframe.previous.load(atomic::Ordering::Relaxed) as *const InterpreterFrame; + } + core::ptr::null() } /// Record that a durable Python-level reference to this frame escaped. pub(crate) fn mark_escaped(&self) { - self.escaped.store(true, atomic::Ordering::Release); + self.iframe().escaped.store(true, atomic::Ordering::Release); } /// Whether a durable reference to this frame has escaped. pub(crate) fn has_escaped(&self) -> bool { - self.escaped.load(atomic::Ordering::Acquire) + self.iframe().escaped.load(atomic::Ordering::Acquire) } pub fn lasti(&self) -> u32 { - self.lasti.load(Relaxed) + self.iframe().lasti.load(Relaxed) } pub fn set_lasti(&self, val: u32) { - self.lasti.store(val, Relaxed); - } - - pub(crate) fn pending_stack_pops(&self) -> u32 { - self.pending_stack_pops.load(Relaxed) - } - - pub(crate) fn set_pending_stack_pops(&self, val: u32) { - self.pending_stack_pops.store(val, Relaxed); - } - - pub(crate) fn pending_unwind_from_stack(&self) -> i64 { - self.pending_unwind_from_stack.load(Relaxed) - } - - pub(crate) fn set_pending_unwind_from_stack(&self, val: i64) { - self.pending_unwind_from_stack.store(val, Relaxed); + self.iframe().lasti.store(val, Relaxed); } fn has_active_hidden_locals(&self) -> bool { use rustpython_compiler_core::bytecode::{CO_FAST_CELL, CO_FAST_FREE, CO_FAST_HIDDEN}; - let code = &**self.code; + let code = self.iframe().code(); let fastlocals = unsafe { self.iframe_ref().localsplus.fastlocals() }; let is_optimized = code.flags.contains(bytecode::CodeFlags::OPTIMIZED); !is_optimized @@ -1177,8 +1628,16 @@ impl Frame { }; // SAFETY: Either the frame is not executing (caller checked owner), // or we're in a trace callback on the same thread that's executing. - let code = &**self.code; - let fastlocals = unsafe { self.iframe_ref().localsplus.fastlocals() }; + let code = self.iframe().code(); + // If this FrameObject has a live source iframe on the TLS chain, read + // its localsplus for up-to-date values (the materialized copy is a + // stale snapshot from materialize time). + let live = self.find_live_source_iframe(); + let fastlocals = if !live.is_null() { + unsafe { (*live).localsplus.fastlocals() } + } else { + unsafe { self.iframe_ref().localsplus.fastlocals() } + }; // Iterate through all localsplus slots using localspluskinds let nlocalsplus = code.localspluskinds.len(); @@ -1281,16 +1740,26 @@ impl Frame { /// builtin, trace callbacks) is fine: the frame sits on the current /// thread's frame chain and is at a bytecode boundary. pub(crate) fn check_locals_access(&self, vm: &VirtualMachine) -> PyResult<()> { - let owner = FrameOwner::from_i8(self.owner.load(atomic::Ordering::Acquire)); + let owner = FrameOwner::from_i8(self.iframe().owner.load(atomic::Ordering::Acquire)); if owner != FrameOwner::Thread { return Ok(()); } + let self_iframe = self.iframe() as *const InterpreterFrame; + // Get the Py<FrameObject> address from &FrameObject (payload). + // materialized stores a *const Py<FrameObject>. + let self_py_ptr = unsafe { Py::<Self>::from_payload_ptr(self) } as usize; let mut cur = crate::vm::thread::get_current_frame(); while !cur.is_null() { - if core::ptr::eq(cur, self) { + if core::ptr::eq(cur, self_iframe) { return Ok(()); } - cur = unsafe { (*cur).previous_frame() }; + // Also match if this FrameObject is the materialized version + // of a stack-allocated frame in the chain. + let materialized = unsafe { (*cur).materialized.load(Relaxed) }; + if materialized == self_py_ptr { + return Ok(()); + } + cur = unsafe { (*cur).previous.load(Relaxed) as *const InterpreterFrame }; } Err(vm.new_runtime_error( "cannot access frame locals while the frame is executing in another thread", @@ -1300,12 +1769,12 @@ impl Frame { pub fn f_locals_mapping(&self, vm: &VirtualMachine) -> PyResult<ArgMapping> { self.check_locals_access(vm)?; if !self.has_active_hidden_locals() { - self.f_locals_hidden_overlay.lock().take(); + self.iframe().f_locals_hidden_overlay.lock().take(); return self.locals(vm); } let overlay_dict = { - let mut overlay = self.f_locals_hidden_overlay.lock(); + let mut overlay = self.iframe().f_locals_hidden_overlay.lock(); match overlay.as_ref() { Some(dict) => dict.clone(), None => { @@ -1329,8 +1798,8 @@ impl Frame { self.sync_visible_locals_to_mapping(overlay.mapping(), vm)?; overlay } else { - self.sync_visible_locals_to_mapping(self.locals.mapping(vm), vm)?; - self.locals.clone_mapping(vm) + self.sync_visible_locals_to_mapping(self.iframe().locals.mapping(vm), vm)?; + self.iframe().locals.clone_mapping(vm) }; self.fold_extra_locals(&mapping, vm)?; Ok(mapping) @@ -1339,7 +1808,7 @@ impl Frame { /// Copy the frame's extra-locals side storage (proxy keys that are not /// fast locals) into `mapping`. No-op when nothing was ever stored. fn fold_extra_locals(&self, mapping: &ArgMapping, vm: &VirtualMachine) -> PyResult<()> { - let extra = self.f_extra_locals.lock().clone(); + let extra = self.iframe().f_extra_locals.lock().clone(); if let Some(extra) = extra { for (key, value) in &extra { mapping.mapping().ass_subscript(&key, Some(value), vm)?; @@ -1354,9 +1823,21 @@ impl Frame { use rustpython_compiler_core::bytecode::{CO_FAST_CELL, CO_FAST_FREE}; // SAFETY: callers first pass through `check_locals_access`, so the // frame is not executing on another thread. - let fastlocals = unsafe { self.iframe_ref().localsplus.fastlocals() }; + // Use live source iframe if available for up-to-date values. + let live = self.find_live_source_iframe(); + let fastlocals = if !live.is_null() { + unsafe { (*live).localsplus.fastlocals() } + } else { + unsafe { self.iframe_ref().localsplus.fastlocals() } + }; let obj = fastlocals.get(i)?.as_ref()?; - let kind = self.code.localspluskinds.get(i).copied().unwrap_or(0); + let kind = self + .iframe() + .code() + .localspluskinds + .get(i) + .copied() + .unwrap_or(0); if kind & (CO_FAST_CELL | CO_FAST_FREE) != 0 { if let Some(cell) = obj.downcast_ref::<PyCell>() { cell.get() @@ -1372,9 +1853,22 @@ impl Frame { /// the slot holds one so closures keep sharing the same cell. fn framelocalsproxy_setval(&self, i: usize, value: PyObjectRef) { use rustpython_compiler_core::bytecode::{CO_FAST_CELL, CO_FAST_FREE}; - let kind = self.code.localspluskinds.get(i).copied().unwrap_or(0); + let kind = self + .iframe() + .code() + .localspluskinds + .get(i) + .copied() + .unwrap_or(0); // SAFETY: callers first pass through `check_locals_access`. - let fastlocals = unsafe { self.iframe_mut().localsplus.fastlocals_mut() }; + // Use live source iframe if available so writes reach the + // executing frame's actual local variables. + let live = self.find_live_source_iframe(); + let fastlocals = if !live.is_null() { + unsafe { &mut *live.cast_mut() }.localsplus.fastlocals_mut() + } else { + unsafe { self.iframe_mut().localsplus.fastlocals_mut() } + }; if kind & (CO_FAST_CELL | CO_FAST_FREE) != 0 && let Some(obj) = fastlocals[i].as_ref() && let Some(cell) = obj.downcast_ref::<PyCell>() @@ -1398,8 +1892,8 @@ impl Frame { use rustpython_compiler_core::bytecode::CO_FAST_HIDDEN; // The proxy hashes the key first; an unhashable key raises TypeError. key.hash(vm)?; - for (i, &kind) in self.code.localspluskinds.iter().enumerate() { - let name = localsplus_name(&self.code, i); + for (i, &kind) in self.iframe().code().localspluskinds.iter().enumerate() { + let name = localsplus_name(self.iframe().code(), i); if !name .as_object() .rich_compare_bool(key, PyComparisonOp::Eq, vm)? @@ -1440,7 +1934,7 @@ impl Frame { { return Ok(value); } - let extra = self.f_extra_locals.lock().clone(); + let extra = self.iframe().f_extra_locals.lock().clone(); if let Some(extra) = extra && let Some(value) = extra.get_item_opt(&*key, vm)? { @@ -1459,7 +1953,7 @@ impl Frame { if self.framelocalsproxy_getkeyindex(&key, true, vm)?.is_some() { return Ok(true); } - let extra = self.f_extra_locals.lock().clone(); + let extra = self.iframe().f_extra_locals.lock().clone(); if let Some(extra) = extra { return Ok(extra.get_item_opt(&*key, vm)?.is_some()); } @@ -1497,7 +1991,7 @@ impl Frame { { return Err(vm.new_value_error("cannot remove local variables from FrameLocalsProxy")); } - let extra = self.f_extra_locals.lock().clone(); + let extra = self.iframe().f_extra_locals.lock().clone(); if let Some(extra) = extra && extra.get_item_opt(&*key, vm)?.is_some() { @@ -1520,7 +2014,7 @@ impl Frame { { return Err(vm.new_value_error("cannot remove local variables from FrameLocalsProxy")); } - let extra = self.f_extra_locals.lock().clone(); + let extra = self.iframe().f_extra_locals.lock().clone(); if let Some(extra) = extra && let Some(value) = extra.pop_item(&*key, vm)? { @@ -1547,42 +2041,55 @@ impl Frame { } fn extra_locals_get_or_create(&self, vm: &VirtualMachine) -> PyDictRef { - let mut extra = self.f_extra_locals.lock(); + let mut extra = self.iframe().f_extra_locals.lock(); extra.get_or_insert_with(|| vm.ctx.new_dict()).clone() } } -impl Py<Frame> { +impl Py<FrameObject> { #[inline(always)] fn with_exec<R>(&self, vm: &VirtualMachine, f: impl FnOnce(ExecutingFrame<'_>) -> R) -> R { - // SAFETY: Frame execution is single-threaded. Only one thread at a time + // SAFETY: FrameObject execution is single-threaded. Only one thread at a time // executes a given frame (enforced by the owner field and generator // running flag). Same safety argument as FastLocals (UnsafeCell). let iframe = unsafe { self.iframe_mut() }; + // Dereference the raw pointers before taking mutable borrows + // to localsplus/prev_line. The raw pointers point to FrameObject's + // owned fields, not into InterpreterFrame, so there is no aliasing. + let code: &Py<PyCode> = unsafe { &*iframe.code }; + let globals: &Py<PyDict> = unsafe { &*iframe.globals }; + let builtins: &PyObject = unsafe { &*iframe.builtins }; + let func_obj: Option<&PyObject> = if iframe.func_obj.is_null() { + None + } else { + Some(unsafe { &*iframe.func_obj }) + }; + let builtins_dict = if globals.class().is(vm.ctx.types.dict_type) { + builtins + .downcast_ref_if_exact::<PyDict>(vm) + // SAFETY: downcast_ref_if_exact already verified exact type + .map(|d| unsafe { PyExact::ref_unchecked(d) }) + } else { + None + }; + let iframe_ptr = iframe as *const InterpreterFrame; let exec = ExecutingFrame { - code: &iframe.code, + code, localsplus: &mut iframe.localsplus, locals: &iframe.locals, - globals: &iframe.globals, - builtins: &iframe.builtins, - builtins_dict: if iframe.globals.class().is(vm.ctx.types.dict_type) { - iframe - .builtins - .downcast_ref_if_exact::<PyDict>(vm) - // SAFETY: downcast_ref_if_exact already verified exact type - .map(|d| unsafe { PyExact::ref_unchecked(d) }) - } else { - None - }, + globals, + builtins, + builtins_dict, lasti: &iframe.lasti, - object: self, - prev_line: &mut iframe.prev_line, + iframe: iframe_ptr, + func_obj, + prev_line: &iframe.prev_line, monitoring_mask: 0, }; f(exec) } - // #[cfg_attr(feature = "flame-it", flame("Frame"))] + // #[cfg_attr(feature = "flame-it", flame("FrameObject"))] pub fn run(&self, vm: &VirtualMachine) -> PyResult<ExecutionResult> { self.with_exec(vm, |mut exec| exec.run(vm)) } @@ -1613,22 +2120,32 @@ impl Py<Frame> { pub fn yield_from_target(&self) -> Option<PyObjectRef> { // If the frame is currently executing (owned by thread), it has no // yield-from target to report. - let owner = FrameOwner::from_i8(self.owner.load(atomic::Ordering::Acquire)); + let owner = FrameOwner::from_i8(self.iframe().owner.load(atomic::Ordering::Acquire)); if owner == FrameOwner::Thread { return None; } - // SAFETY: Frame is not executing, so UnsafeCell access is safe. + // SAFETY: FrameObject is not executing, so UnsafeCell access is safe. let iframe = unsafe { self.iframe_mut() }; + let code: &Py<PyCode> = unsafe { &*iframe.code }; + let globals: &Py<PyDict> = unsafe { &*iframe.globals }; + let builtins: &PyObject = unsafe { &*iframe.builtins }; + let func_obj: Option<&PyObject> = if iframe.func_obj.is_null() { + None + } else { + Some(unsafe { &*iframe.func_obj }) + }; + let iframe_ptr = iframe as *const InterpreterFrame; let exec = ExecutingFrame { - code: &iframe.code, + code, localsplus: &mut iframe.localsplus, locals: &iframe.locals, - globals: &iframe.globals, - builtins: &iframe.builtins, + globals, + builtins, builtins_dict: None, lasti: &iframe.lasti, - object: self, - prev_line: &mut iframe.prev_line, + iframe: iframe_ptr, + func_obj, + prev_line: &iframe.prev_line, monitoring_mask: 0, }; exec.yield_from_target().map(PyObject::to_owned) @@ -1641,7 +2158,7 @@ impl Py<Frame> { filename.find(b"importlib").is_some() && filename.find(b"_bootstrap").is_some() } - pub fn next_external_frame(&self, vm: &VirtualMachine) -> Option<FrameRef> { + pub fn next_external_frame(&self, vm: &VirtualMachine) -> Option<FrameObjectRef> { let mut frame = self.f_back(vm); while let Some(ref f) = frame { if !f.is_internal_frame() { @@ -1653,22 +2170,71 @@ impl Py<Frame> { } } +/// Execute an InterpreterFrame's bytecode directly, without a FrameObject. +/// +/// # Safety +/// The InterpreterFrame's raw pointers (code, globals, builtins, func_obj) +/// must be valid for the duration of this call. +#[inline(always)] +pub(crate) fn run_iframe( + iframe: &mut InterpreterFrame, + vm: &VirtualMachine, +) -> PyResult<ExecutionResult> { + let code: &Py<PyCode> = unsafe { &*iframe.code }; + let globals: &Py<PyDict> = unsafe { &*iframe.globals }; + let builtins: &PyObject = unsafe { &*iframe.builtins }; + let func_obj: Option<&PyObject> = if iframe.func_obj.is_null() { + None + } else { + Some(unsafe { &*iframe.func_obj }) + }; + let builtins_dict = if globals.class().is(vm.ctx.types.dict_type) { + builtins + .downcast_ref_if_exact::<PyDict>(vm) + .map(|d| unsafe { PyExact::ref_unchecked(d) }) + } else { + None + }; + let iframe_ptr = iframe as *const InterpreterFrame; + let mut exec = ExecutingFrame { + code, + localsplus: &mut iframe.localsplus, + locals: &iframe.locals, + globals, + builtins, + builtins_dict, + lasti: &iframe.lasti, + iframe: iframe_ptr, + func_obj, + prev_line: &mut iframe.prev_line, + monitoring_mask: 0, + }; + exec.run(vm) +} + /// An executing frame; borrows mutable frame-internal data for the duration /// of bytecode execution. -struct ExecutingFrame<'a> { - code: &'a PyRef<PyCode>, +pub(crate) struct ExecutingFrame<'a> { + code: &'a Py<PyCode>, localsplus: &'a mut LocalsPlus, locals: &'a FrameLocals, - globals: &'a PyDictRef, - builtins: &'a PyObjectRef, + globals: &'a Py<PyDict>, + builtins: &'a PyObject, /// Cached downcast of builtins to PyDict for fast LOAD_GLOBAL. /// Only set when both globals and builtins are exact dict types (not /// subclasses), so that `__missing__` / `__getitem__` overrides are /// not bypassed. builtins_dict: Option<&'a PyExact<PyDict>>, - object: &'a Py<Frame>, + /// Raw pointer to the underlying InterpreterFrame. Used to access the + /// materialized FrameObject (via `frame_obj()`) and frame-level fields + /// like trace, pending_stack_pops, etc. Stored as a raw pointer because + /// mutable borrows to `localsplus` and `prev_line` are also held. + /// All accesses through this pointer use atomic/mutex operations. + iframe: *const InterpreterFrame, + /// Borrowed function object that created this frame (if any). + func_obj: Option<&'a PyObject>, lasti: &'a PyAtomic<u32>, - prev_line: &'a mut u32, + prev_line: &'a core::cell::Cell<u32>, /// Cached monitoring events mask. Reloaded at Resume instruction only, monitoring_mask: u32, } @@ -1757,7 +2323,7 @@ fn localsplus_name(code: &PyCode, idx: usize) -> &'static PyStrInterned { /// heap copy. Otherwise (the frame escaped through a traceback, /// `sys._getframe`, a trace callback, ...) the values are copied to the heap /// first so they stay readable through the escaped reference. -pub(crate) fn release_datastack_frame(frame: &Py<Frame>, vm: &VirtualMachine) { +pub(crate) fn release_datastack_frame(frame: &Py<FrameObject>, vm: &VirtualMachine) { let frame_obj = frame.as_object(); // Uniqueness argument: at this point the frame is already out of // the thread-frames registry and the current-frame chain @@ -1805,8 +2371,17 @@ pub(crate) fn release_datastack_frame(frame: &Py<Frame>, vm: &VirtualMachine) { // the caller returns and leaves the live frame chain. The caller is still // executing here (this frame is unwinding back into it), so its payload // pointer is live. - // SAFETY: `previous` points at the live caller on this thread's stack. - *frame.retained_back.lock() = unsafe { owned_chain_frame(frame.previous_frame()) }; + { + let mut guard = frame.iframe().retained_back.lock(); + if guard.is_none() { + let prev = frame.previous_iframe(); + *guard = unsafe { owned_chain_frame(prev) }; + } + } + // Note: previous is NOT cleared here. retained_back captures the + // caller reference, and previous may be read again by f_back or + // frame chain walkers (the pointer is live as long as the caller + // is still executing, which it is at this point). // Invariant: a tracked frame must always have heap-backed localsplus // (proven here for escaped datastack frames and by construction for // generator frames, which are born heap-backed). A stop-the-world @@ -2017,7 +2592,54 @@ impl fmt::Debug for ExecutingFrame<'_> { } } +/// Run bytecode in a light frame context. +#[allow(clippy::too_many_arguments)] impl ExecutingFrame<'_> { + /// Get the underlying InterpreterFrame. + #[inline(always)] + fn iframe(&self) -> &InterpreterFrame { + // SAFETY: the iframe pointer is valid for the lifetime of the ExecutingFrame. + unsafe { &*self.iframe } + } + + /// Get the frame object. Materializes a FrameObject on demand if this + /// is a stack-allocated frame that hasn't been observed yet. + #[cold] + #[inline(never)] + fn frame_object(&self, vm: &VirtualMachine) -> FrameObjectRef { + self.iframe().materialize(vm).to_owned() + } + + /// Whether this frame has a per-frame trace function set. + #[inline] + fn trace_is_set(&self, _vm: &VirtualMachine) -> bool { + self.iframe().trace.lock().is_some() + } + + /// Access the frame's trace_opcodes lock. + #[inline] + fn trace_opcodes_is_set(&self) -> bool { + *self.iframe().trace_opcodes.lock() + } + + /// Get pending_stack_pops from the frame. + #[inline] + fn pending_stack_pops(&self) -> u32 { + self.iframe().pending_stack_pops.load(Relaxed) + } + + /// Get pending_unwind_from_stack from the frame. + #[inline] + fn pending_unwind_from_stack(&self) -> i64 { + self.iframe().pending_unwind_from_stack.load(Relaxed) + } + + /// Set pending_stack_pops on the frame. + #[inline] + fn set_pending_stack_pops(&self, val: u32) { + self.iframe().pending_stack_pops.store(val, Relaxed); + } + /// Run `__init__` for the tp_new specialization. `args` holds the /// `__init__` args with slot 0 left empty; it is filled with `new_obj` /// here. Enforces the `__init__() should return None` contract and @@ -2108,7 +2730,7 @@ impl ExecutingFrame<'_> { /// Matches `_PyEval_MonitorRaise` → `PY_MONITORING_EVENT_RAISE` → /// `sys_trace_exception_func` in legacy_tracing.c. fn fire_exception_trace(&self, exc: &PyBaseExceptionRef, vm: &VirtualMachine) -> PyResult<()> { - if vm.use_tracing.get() && !vm.is_none(&self.object.trace.lock()) { + if vm.use_tracing.get() && self.trace_is_set(vm) { let exc_type: PyObjectRef = exc.class().to_owned().into(); let exc_value: PyObjectRef = exc.clone().into(); let exc_tb: PyObjectRef = exc @@ -2122,7 +2744,7 @@ impl ExecutingFrame<'_> { fn run(&mut self, vm: &VirtualMachine) -> PyResult<ExecutionResult> { flame_guard!(format!( - "Frame::run({obj_name})", + "FrameObject::run({obj_name})", obj_name = self.code.obj_name )); // Execute until return or exception: @@ -2140,26 +2762,26 @@ impl ExecutingFrame<'_> { // (frames entered before sys.settrace() have trace=None). // Skip RESUME – it should not generate user-visible line events. if vm.use_tracing.get() - && !vm.is_none(&self.object.trace.lock()) + && self.trace_is_set(vm) && !matches!( self.code.instructions.read_op(idx), Instruction::Resume { .. } | Instruction::InstrumentedResume ) && let Some((loc, _)) = self.code.locations.get(idx) - && loc.line.get() as u32 != *self.prev_line + && loc.line.get() as u32 != self.prev_line.get() { - *self.prev_line = loc.line.get() as u32; + self.prev_line.set(loc.line.get() as u32); vm.trace_event(crate::protocol::TraceEvent::Line, None)?; // Trace callback may have changed lasti via set_f_lineno. // Re-read and restart the loop from the new position. if self.lasti() != (idx as u32 + 1) { // set_f_lineno defers stack unwinding because we hold // the state mutex. Perform it now. - let pops = self.object.pending_stack_pops(); + let pops = self.pending_stack_pops(); if pops > 0 { - let from_stack = self.object.pending_unwind_from_stack(); + let from_stack = self.pending_unwind_from_stack(); self.unwind_stack_for_lineno(pops as usize, from_stack, vm); - self.object.set_pending_stack_pops(0); + self.set_pending_stack_pops(0); } arg_state.reset(); continue; @@ -2170,22 +2792,30 @@ impl ExecutingFrame<'_> { let mut do_extend_arg = false; let caches = op.cache_entries(); - // Update prev_line only when tracing or monitoring is active. - // When neither is enabled, prev_line is stale but unused. - if vm.use_tracing.get() { - if !matches!( - op.into(), - Opcode::Resume | Opcode::ExtendedArg | Opcode::InstrumentedLine - ) && let Some((loc, _)) = self.code.locations.get(idx) - { - *self.prev_line = loc.line.get() as u32; - } + // Always update prev_line so f_lineno returns the correct line + // even when the frame is observed mid-call (e.g. sys._getframe, + // warnings.warn). The lookup is a simple array index, so the + // cost is negligible. + // Update prev_line for f_lineno. Skip RESUME, ExtendedArg, + // and InstrumentedLine (it manages prev_line in its own handler; + // updating here first would defeat LINE de-duplication). + // Other instrumented opcodes update prev_line via + // execute_instrumented. + if !matches!( + op.into(), + Opcode::Resume | Opcode::ExtendedArg | Opcode::InstrumentedLine + ) && !op.is_instrumented() + && let Some((loc, _)) = self.code.locations.get(idx) + { + self.prev_line.set(loc.line.get() as u32); + } + if vm.use_tracing.get() { // Fire 'opcode' trace event for sys.settrace when f_trace_opcodes // is set. Skip RESUME and ExtendedArg // (_Py_call_instrumentation_instruction). - if !vm.is_none(&self.object.trace.lock()) - && *self.object.trace_opcodes.lock() + if self.trace_is_set(vm) + && self.trace_opcodes_is_set() && !matches!( op.into(), Opcode::Resume | Opcode::InstrumentedResume | Opcode::ExtendedArg @@ -2208,7 +2838,7 @@ impl ExecutingFrame<'_> { let next = exception.__traceback__(); let new_traceback = PyTraceback::new( next, - frame.object.to_owned(), + frame.frame_object(vm), idx as u32 * 2, loc.line, ); @@ -2277,7 +2907,7 @@ impl ExecutingFrame<'_> { let new_traceback = PyTraceback::new( next, - frame.object.to_owned(), + frame.frame_object(vm), idx as u32 * 2, loc.line, ); @@ -2388,7 +3018,9 @@ impl ExecutingFrame<'_> { // The traceback was created with the correct lasti when exception // was first raised, but frame.lasti may have changed during cleanup if let Some(tb) = exception.__traceback__() - && core::ptr::eq::<Py<Frame>>(&*tb.frame, self.object) + && self.iframe().frame_obj().is_some_and(|fo| { + core::ptr::eq::<Py<FrameObject>>(&*tb.frame, fo) + }) { // This traceback entry is for this frame - restore its lasti // tb.lasti is in bytes (idx * 2), convert back to instruction index @@ -2477,12 +3109,8 @@ impl ExecutingFrame<'_> { if idx < self.code.locations.len() { let (loc, _end_loc) = self.code.locations[idx]; let next = err.__traceback__(); - let new_traceback = PyTraceback::new( - next, - self.object.to_owned(), - idx as u32 * 2, - loc.line, - ); + let new_traceback = + PyTraceback::new(next, self.frame_object(vm), idx as u32 * 2, loc.line); err.set_traceback_typed(Some(new_traceback.into_ref(&vm.ctx))); } @@ -2490,7 +3118,7 @@ impl ExecutingFrame<'_> { vm.contextualize_exception(&err); return match self.unwind_blocks(vm, UnwindReason::Raising { exception: err }) { Ok(None) => { - *self.prev_line = 0; + self.prev_line.set(0); self.run(vm) } Ok(Some(result)) => Ok(result), @@ -2524,7 +3152,7 @@ impl ExecutingFrame<'_> { let next = err.__traceback__(); let new_traceback = PyTraceback::new( next, - self.object.to_owned(), + self.frame_object(vm), idx as u32 * 2, loc.line, ); @@ -2535,7 +3163,7 @@ impl ExecutingFrame<'_> { vm.contextualize_exception(&err); match self.unwind_blocks(vm, UnwindReason::Raising { exception: err }) { Ok(None) => { - *self.prev_line = 0; + self.prev_line.set(0); self.run(vm) } Ok(Some(result)) => Ok(result), @@ -2566,7 +3194,7 @@ impl ExecutingFrame<'_> { let (loc, _end_loc) = self.code.locations[idx]; let next = exception.__traceback__(); let new_traceback = - PyTraceback::new(next, self.object.to_owned(), idx as u32 * 2, loc.line); + PyTraceback::new(next, self.frame_object(vm), idx as u32 * 2, loc.line); exception.set_traceback_typed(Some(new_traceback.into_ref(&vm.ctx))); } @@ -2609,7 +3237,7 @@ impl ExecutingFrame<'_> { // Reset prev_line so that the first instruction in the handler // fires a LINE event. In CPython, gen_send_ex re-enters the // eval loop which reinitializes its local prev_instr tracker. - *self.prev_line = 0; + self.prev_line.set(0); self.run(vm) } Ok(Some(result)) => Ok(result), @@ -2673,7 +3301,7 @@ impl ExecutingFrame<'_> { vm: &VirtualMachine, ) -> FrameResult { flame_guard!(format!( - "Frame::execute_instruction({instruction:?} {arg:?})" + "FrameObject::execute_instruction({instruction:?} {arg:?})" )); #[cfg(feature = "vm-tracing-logging")] @@ -2930,9 +3558,7 @@ impl ExecutingFrame<'_> { let n = n.get(arg) as usize; if n > 0 { let closure = self - .object .func_obj - .as_ref() .and_then(|f| f.downcast_ref::<PyFunction>()) .and_then(|f| f.closure.as_ref()); let nlocalsplus = self.code.localspluskinds.len(); @@ -3899,7 +4525,7 @@ impl ExecutingFrame<'_> { // Python preserves exception tracebacks even after the exception is no longer // the "current exception". This is important for code that catches an exception, // stores it, and later inspects its traceback. - // Reference cycles (Exception → Traceback → Frame → locals) are handled by + // Reference cycles (Exception → Traceback → FrameObject → locals) are handled by // Python's garbage collector which can detect and break cycles. Ok(None) @@ -4240,7 +4866,7 @@ impl ExecutingFrame<'_> { Ok(None) } PyIterReturn::StopIteration(value) => { - if vm.use_tracing.get() && !vm.is_none(&self.object.trace.lock()) { + if vm.use_tracing.get() && self.trace_is_set(vm) { let stop_exc = vm.new_stop_iteration(value.clone()); self.fire_exception_trace(&stop_exc, vm)?; } @@ -4277,7 +4903,7 @@ impl ExecutingFrame<'_> { return Ok(None); } PyIterReturn::StopIteration(value) => { - if vm.use_tracing.get() && !vm.is_none(&self.object.trace.lock()) { + if vm.use_tracing.get() && self.trace_is_set(vm) { let stop_exc = vm.new_stop_iteration(value.clone()); self.fire_exception_trace(&stop_exc, vm)?; } @@ -4295,7 +4921,7 @@ impl ExecutingFrame<'_> { Ok(None) } PyIterReturn::StopIteration(value) => { - if vm.use_tracing.get() && !vm.is_none(&self.object.trace.lock()) { + if vm.use_tracing.get() && self.trace_is_set(vm) { let stop_exc = vm.new_stop_iteration(value.clone()); self.fire_exception_trace(&stop_exc, vm)?; } @@ -6299,7 +6925,7 @@ impl ExecutingFrame<'_> { self.push_value(value); } Ok(PyIterReturn::StopIteration(value)) => { - if vm.use_tracing.get() && !vm.is_none(&self.object.trace.lock()) { + if vm.use_tracing.get() && self.trace_is_set(vm) { let stop_exc = vm.new_stop_iteration(value); self.fire_exception_trace(&stop_exc, vm)?; } @@ -6387,6 +7013,20 @@ impl ExecutingFrame<'_> { instruction.is_instrumented(), "execute_instrumented called with non-instrumented opcode {instruction:?}" ); + // Update prev_line for f_lineno. The main bytecode loop skips + // instrumented opcodes to avoid interfering with LINE event + // de-duplication in InstrumentedLine. Update here instead, except + // for RESUME (prev_line must stay 0 for the first LINE event) and + // InstrumentedLine (manages prev_line in its own handler). + if !matches!( + instruction, + Instruction::InstrumentedResume | Instruction::InstrumentedLine + ) { + let idx = self.lasti() as usize - 1; + if let Some((loc, _)) = self.code.locations.get(idx) { + self.prev_line.set(loc.line.get() as u32); + } + } self.monitoring_mask = vm.state.monitoring_events.load(); match instruction { Instruction::InstrumentedResume => { @@ -6689,8 +7329,8 @@ impl ExecutingFrame<'_> { // Fire LINE event only if line changed if let Some((loc, _)) = self.code.locations.get(idx) { let line = loc.line.get() as u32; - if line != *self.prev_line && line > 0 { - *self.prev_line = line; + if line != self.prev_line.get() && line > 0 { + self.prev_line.set(line); monitoring::fire_line(vm, self.code, offset, line)?; } } @@ -6700,6 +7340,12 @@ impl ExecutingFrame<'_> { monitoring::fire_instruction(vm, self.code, offset)?; } + // Update prev_line for f_lineno since the bytecode loop's + // update skips all instrumented opcodes. + if let Some((loc, _)) = self.code.locations.get(idx) { + self.prev_line.set(loc.line.get() as u32); + } + // Re-dispatch to the real original opcode let original_op = Instruction::try_from(real_op_byte) .expect("invalid opcode in side-table chain"); @@ -6781,7 +7427,7 @@ impl ExecutingFrame<'_> { if let Some(builtins_dict) = self.builtins_dict { // Fast path: both globals and builtins are exact dicts // SAFETY: builtins_dict is only set when globals is also exact dict - let globals_exact = unsafe { PyExact::ref_unchecked(self.globals.as_ref()) }; + let globals_exact = unsafe { PyExact::ref_unchecked(self.globals) }; globals_exact .get_chain_exact(builtins_dict, name, vm)? .ok_or_else(|| { @@ -6802,7 +7448,7 @@ impl ExecutingFrame<'_> { } } - #[cfg_attr(feature = "flame-it", flame("Frame"))] + #[cfg_attr(feature = "flame-it", flame("FrameObject"))] fn import(&mut self, vm: &VirtualMachine, module_name: Option<&Py<PyStr>>) -> PyResult<()> { let module_name = module_name.unwrap_or(vm.ctx.empty_str); let top = self.pop_value(); @@ -6818,7 +7464,7 @@ impl ExecutingFrame<'_> { Ok(()) } - #[cfg_attr(feature = "flame-it", flame("Frame"))] + #[cfg_attr(feature = "flame-it", flame("FrameObject"))] fn import_from(&mut self, vm: &VirtualMachine, idx: bytecode::NameIdx) -> PyResult { let module = self.top_value(); let name = self.code.names[idx as usize]; @@ -6920,7 +7566,7 @@ impl ExecutingFrame<'_> { Err(err) } - #[cfg_attr(feature = "flame-it", flame("Frame"))] + #[cfg_attr(feature = "flame-it", flame("FrameObject"))] fn import_star(&mut self, vm: &VirtualMachine) -> PyResult<()> { let module = self.pop_value(); @@ -6973,7 +7619,7 @@ impl ExecutingFrame<'_> { /// The reason for unwinding gives a hint on what to do when /// unwinding a block. /// Optionally returns an exception. - #[cfg_attr(feature = "flame-it", flame("Frame"))] + #[cfg_attr(feature = "flame-it", flame("FrameObject"))] fn unwind_blocks(&mut self, vm: &VirtualMachine, reason: UnwindReason) -> FrameResult { // use exception table for exception handling match reason { @@ -7580,7 +8226,7 @@ impl ExecutingFrame<'_> { self.push_value(vm.ctx.new_int(value).into()); return Ok(true); } - if vm.use_tracing.get() && !vm.is_none(&self.object.trace.lock()) { + if vm.use_tracing.get() && self.trace_is_set(vm) { let stop_exc = vm.new_stop_iteration(None); self.fire_exception_trace(&stop_exc, vm)?; } @@ -7599,7 +8245,7 @@ impl ExecutingFrame<'_> { Ok(PyIterReturn::StopIteration(value)) => { // Fire 'exception' trace event for StopIteration, matching // FOR_ITER's inline call to _PyEval_MonitorRaise. - if vm.use_tracing.get() && !vm.is_none(&self.object.trace.lock()) { + if vm.use_tracing.get() && self.trace_is_set(vm) { let stop_exc = vm.new_stop_iteration(value); self.fire_exception_trace(&stop_exc, vm)?; } @@ -7634,7 +8280,7 @@ impl ExecutingFrame<'_> { .expect("Stack value should be code object"); // Create function with minimal attributes - let func_obj = PyFunction::new(code_obj, self.globals.clone(), vm)?.into_pyobject(vm); + let func_obj = PyFunction::new(code_obj, self.globals.to_owned(), vm)?.into_pyobject(vm); self.push_value(func_obj); Ok(None) @@ -7669,7 +8315,7 @@ impl ExecutingFrame<'_> { Ok(None) } - #[cfg_attr(feature = "flame-it", flame("Frame"))] + #[cfg_attr(feature = "flame-it", flame("FrameObject"))] fn execute_bin_op(&mut self, vm: &VirtualMachine, op: bytecode::BinaryOperator) -> FrameResult { let b_ref = &self.pop_value(); let a_ref = &self.pop_value(); @@ -8023,7 +8669,7 @@ impl ExecutingFrame<'_> { Ok(!self._in(vm, needle, haystack)?) } - #[cfg_attr(feature = "flame-it", flame("Frame"))] + #[cfg_attr(feature = "flame-it", flame("FrameObject"))] fn execute_compare(&mut self, vm: &VirtualMachine, arg: bytecode::OpArg) -> FrameResult { let op = bytecode::ComparisonOperator::try_from(u32::from(arg)) .unwrap_or(bytecode::ComparisonOperator::Equal); @@ -10404,12 +11050,12 @@ impl ExecutingFrame<'_> { } } -impl fmt::Debug for Frame { +impl fmt::Debug for FrameObject { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { // SAFETY: Debug is best-effort; concurrent mutation is unlikely // and would only affect debug output. let Some(iframe) = (unsafe { &*self.iframe.get() }) else { - return f.write_str("Frame Object { cleared }"); + return f.write_str("FrameObject Object { cleared }"); }; let stack_str = iframe @@ -10433,9 +11079,9 @@ impl fmt::Debug for Frame { // TODO: fix this up write!( f, - "Frame Object {{ \n Stack:{}\n Locals initialized:{}\n}}", + "FrameObject Object {{ \n Stack:{}\n Locals initialized:{}\n}}", stack_str, - self.locals.get().is_some() + self.iframe().locals.get().is_some() ) } } diff --git a/crates/vm/src/gc_state.rs b/crates/vm/src/gc_state.rs index ebae58f96..5843dfe24 100644 --- a/crates/vm/src/gc_state.rs +++ b/crates/vm/src/gc_state.rs @@ -633,33 +633,26 @@ impl GcState { // classified reachable. A running frame appearing in `unreachable` // would mean the reachability analysis observed its interpreter state // as garbage — the exact hazard the barrier exists to prevent. + // Verify no running frame is classified unreachable. + // Walk the TLS frame chain (CURRENT_FRAME) instead of top_frame, + // because stack-allocated frames update only CURRENT_FRAME (via + // set_current_frame_nosave), not top_frame. #[cfg(all(unix, feature = "threading", debug_assertions))] if stw.stopped { let unreachable_set: HashSet<GcPtr> = unreachable.iter().copied().collect(); - crate::vm::thread::try_with_current_vm(|vm| { - let registry = vm.state.thread_frames.lock(); - #[expect( - clippy::iter_over_hash_type, - reason = "assertion over every registered thread slot" - )] - for slot in registry.values() { - let mut cur = slot.top_frame.load(core::sync::atomic::Ordering::Relaxed) - as *const crate::frame::Frame; - while !cur.is_null() { - // SAFETY: frames on a thread's active call stack are - // alive, and the world is stopped so none can be popped. - let obj = - unsafe { &*crate::Py::<crate::frame::Frame>::from_payload_ptr(cur) } - .as_object(); - let ptr = GcPtr(NonNull::from(obj)); - debug_assert!( - !unreachable_set.contains(&ptr), - "running frame {obj:p} classified unreachable during GC" - ); - cur = unsafe { (*cur).previous_frame() }; - } + let mut cur = crate::vm::thread::get_current_frame(); + while !cur.is_null() { + let iframe = unsafe { &*cur }; + if let Some(fo) = iframe.frame_obj() { + let obj = fo.as_object(); + let ptr = GcPtr(NonNull::from(obj)); + debug_assert!( + !unreachable_set.contains(&ptr), + "running frame {obj:p} classified unreachable during GC" + ); } - }); + cur = iframe.previous(); + } } if debug.contains(GcDebugFlags::STATS) { diff --git a/crates/vm/src/import.rs b/crates/vm/src/import.rs index f7cc03d99..eb07c76a2 100644 --- a/crates/vm/src/import.rs +++ b/crates/vm/src/import.rs @@ -221,12 +221,12 @@ fn remove_importlib_frames_inner( return (None, false); }; - let file_name = traceback.frame.code.source_path().as_str(); + let file_name = traceback.frame.iframe().code().source_path().as_str(); let (inner_tb, mut now_in_importlib) = remove_importlib_frames_inner(vm, traceback.next.lock().clone(), always_trim); if file_name == "_frozen_importlib" || file_name == "_frozen_importlib_external" { - if traceback.frame.code.obj_name.as_str() == "_call_with_frames_removed" { + if traceback.frame.iframe().code().obj_name.as_str() == "_call_with_frames_removed" { now_in_importlib = true; } if always_trim || now_in_importlib { diff --git a/crates/vm/src/object/core.rs b/crates/vm/src/object/core.rs index 228fe1290..0ee7a062e 100644 --- a/crates/vm/src/object/core.rs +++ b/crates/vm/src/object/core.rs @@ -211,7 +211,7 @@ pub(super) unsafe fn default_dealloc<T: PyPayload>(obj: *mut PyObject) { } // Extract child references to break circular refs (tp_clear), then drop - // them. Some payloads (e.g. Frame) drop children in place inside clear_fn + // them. Some payloads (e.g. FrameObject) drop children in place inside clear_fn // instead of extracting them, so user code (`__del__`) may run here. let mut edges = Vec::new(); if let Some(clear_fn) = vtable.clear { @@ -2191,6 +2191,7 @@ impl<T: PyPayload> Py<T> { /// obtained by dereferencing a `Py<T>`), and the object must outlive the /// returned pointer's use. #[inline] + #[cfg_attr(not(feature = "threading"), allow(dead_code))] pub(crate) unsafe fn from_payload_ptr(payload: *const T) -> *const Self { let offset = core::mem::offset_of!(PyInner<T>, payload); // `Py<T>` is a newtype over `PyInner<T>`, so their addresses coincide. diff --git a/crates/vm/src/object/ext.rs b/crates/vm/src/object/ext.rs index e576ac2c1..c4732d1cb 100644 --- a/crates/vm/src/object/ext.rs +++ b/crates/vm/src/object/ext.rs @@ -333,7 +333,7 @@ impl<T: PyPayload> PyAtomicRef<T> { pub fn swap_to_temporary_refs(&self, pyref: PyRef<T>, vm: &VirtualMachine) { let old = unsafe { self.swap(pyref) }; if let Some(frame) = vm.current_frame() { - frame.temporary_refs.lock().push(old.into()); + frame.iframe().temporary_refs.lock().push(old.into()); } } } @@ -409,7 +409,7 @@ impl<T: PyPayload> PyAtomicRef<Option<T>> { return; }; if let Some(frame) = vm.current_frame() { - frame.temporary_refs.lock().push(old.into()); + frame.iframe().temporary_refs.lock().push(old.into()); } } } @@ -452,7 +452,7 @@ impl PyAtomicRef<PyObject> { pub fn swap_to_temporary_refs(&self, obj: PyObjectRef, vm: &VirtualMachine) { let old = unsafe { self.swap(obj) }; if let Some(frame) = vm.current_frame() { - frame.temporary_refs.lock().push(old); + frame.iframe().temporary_refs.lock().push(old); } } } @@ -499,7 +499,7 @@ impl PyAtomicRef<Option<PyObject>> { return; }; if let Some(frame) = vm.current_frame() { - frame.temporary_refs.lock().push(old); + frame.iframe().temporary_refs.lock().push(old); } } } diff --git a/crates/vm/src/object/payload.rs b/crates/vm/src/object/payload.rs index b6590239e..261b27821 100644 --- a/crates/vm/src/object/payload.rs +++ b/crates/vm/src/object/payload.rs @@ -51,7 +51,7 @@ pub trait PyPayload: MaybeTraverse + PyThreadingConstraint + Sized + 'static { /// Whether `PyRef::new_ref` skips auto-tracking this type in the GC even /// when it would otherwise qualify (has traverse, dict, or heap type). /// Such objects are created untracked and must be tracked explicitly if - /// and when they can become part of a reference cycle. Used by `Frame`, + /// and when they can become part of a reference cycle. Used by `FrameObject`, /// which is created untracked and tracked lazily only on escape. const NEW_REF_UNTRACKED: bool = false; diff --git a/crates/vm/src/protocol/callable.rs b/crates/vm/src/protocol/callable.rs index 70e0a54dc..9e80c5b2c 100644 --- a/crates/vm/src/protocol/callable.rs +++ b/crates/vm/src/protocol/callable.rs @@ -228,12 +228,12 @@ impl VirtualMachine { let is_profile_event = event.is_profile_event(); let is_opcode_event = event.is_opcode_event(); - let Some(frame_ref) = self.current_frame() else { + let Some(frame_ref) = crate::frame::current_thread_frame_materialize(self) else { return Ok(None); }; // Opcode events are only dispatched when f_trace_opcodes is set. - if is_opcode_event && !*frame_ref.trace_opcodes.lock() { + if is_opcode_event && !*frame_ref.iframe().trace_opcodes.lock() { return Ok(None); } @@ -261,7 +261,7 @@ impl VirtualMachine { // trace_trampoline behavior: clear per-frame f_trace // and propagate the error. if let Some(frame_ref) = self.current_frame() { - *frame_ref.trace.lock() = self.ctx.none(); + *frame_ref.iframe().trace.lock() = None; } return Err(e); } diff --git a/crates/vm/src/stdlib/_io.rs b/crates/vm/src/stdlib/_io.rs index ce41a9428..43a869fbe 100644 --- a/crates/vm/src/stdlib/_io.rs +++ b/crates/vm/src/stdlib/_io.rs @@ -5393,10 +5393,10 @@ mod _io { if vm.state.config.settings.warn_default_encoding { let mut stacklevel = stacklevel.unwrap_or(2); if stacklevel > 1 - && let Some(frame) = vm.current_frame() + && let Some(code) = crate::frame::current_code() && let Some(stdlib_dir) = vm.state.config.paths.stdlib_dir.as_deref() { - let path = frame.code.source_path().as_str(); + let path = code.source_path().as_str(); if !path.starts_with(stdlib_dir) { stacklevel = stacklevel.saturating_sub(1); } diff --git a/crates/vm/src/stdlib/_thread.rs b/crates/vm/src/stdlib/_thread.rs index a1942adc7..e9d75dc02 100644 --- a/crates/vm/src/stdlib/_thread.rs +++ b/crates/vm/src/stdlib/_thread.rs @@ -25,7 +25,7 @@ pub(crate) mod _thread { PyUtf8StrRef, }, common::{lock::PyMutex, wtf8::Wtf8Buf}, - frame::FrameRef, + frame::FrameObjectRef, function::{ArgCallable, FuncArgs, KwArgs, OptionalArg, PySetterValue, TimeoutSeconds}, object::{Traverse, TraverseFn}, types::{Constructor, GetAttr, Representable, SetAttr}, @@ -1161,44 +1161,117 @@ pub(crate) mod _thread { pub(crate) use crate::vm::thread::CurrentFrameSlot; /// Get all threads' current (top) frames. Used by sys._current_frames(). - pub(crate) fn get_all_current_frames(vm: &VirtualMachine) -> Vec<(u64, FrameRef)> { + pub(crate) fn get_all_current_frames(vm: &VirtualMachine) -> Vec<(u64, FrameObjectRef)> { // unix: read each thread's published top frame under stop-the-world so // the owning thread is parked at a safepoint and cannot pop or free the // frame while we take a strong reference. Request stop-the-world before // the registry lock to avoid deadlocking a thread parking mid-registry. + // + // For the current thread, use TLS CURRENT_FRAME directly because + // stack-allocated frames only update TLS (not top_frame). #[cfg(unix)] { use core::sync::atomic::Ordering; + let current_ident = get_ident(); vm.state.stop_the_world.stop_the_world(vm); scopeguard::defer! { vm.state.stop_the_world.start_the_world(vm); } let registry = vm.state.thread_frames.lock(); registry .iter() .filter_map(|(id, slot)| { - let top = slot.top_frame.load(Ordering::Relaxed); - core::ptr::NonNull::new(top).map(|p| { - // SAFETY: world stopped -> the owning thread is parked - // and cannot pop or free this frame; it is alive on - // that thread's call stack. - let py = - unsafe { &*Py::<crate::frame::Frame>::from_payload_ptr(p.as_ptr()) }; - (*id, py.to_owned()) - }) + if *id == current_ident { + // Current thread: materialize from TLS chain + crate::frame::current_thread_frame_materialize(vm).map(|frame| (*id, frame)) + } else { + // Other threads: try top_frame first (FrameObject), + // fall back to top_iframe (may be a stack-allocated frame). + let top = slot.top_frame.load(Ordering::Relaxed); + if let Some(p) = core::ptr::NonNull::new(top) { + let py = unsafe { + &*Py::<crate::frame::FrameObject>::from_payload_ptr(p.as_ptr()) + }; + Some((*id, py.to_owned())) + } else { + // Stack-allocated frame: materialize from top_iframe. + // SAFETY: world stopped -> owning thread is parked. + let iframe_ptr = slot.top_iframe.load(Ordering::Relaxed) + as *const crate::frame::InterpreterFrame; + if !iframe_ptr.is_null() { + // Materialize the entire frame chain and link + // retained_back so f_back works after STW ends. + let mut cur = iframe_ptr; + let mut child_fo: Option<crate::PyRef<crate::frame::FrameObject>> = + None; + while !cur.is_null() { + let iframe = unsafe { &*cur }; + let fo = iframe.materialize(vm).to_owned(); + if let Some(child) = child_fo.take() { + let mut guard = child.iframe().retained_back.lock(); + if guard.is_none() { + *guard = Some(fo.clone()); + } + } + child_fo = Some(fo); + cur = iframe.previous(); + } + let iframe = unsafe { &*iframe_ptr }; + let fo = iframe.materialize(vm); + Some((*id, fo.to_owned())) + } else { + None + } + } + } }) .collect() } #[cfg(not(unix))] { + use core::sync::atomic::Ordering; + let current_ident = get_ident(); + vm.state.stop_the_world.stop_the_world(vm); + scopeguard::defer! { vm.state.stop_the_world.start_the_world(vm); } let registry = vm.state.thread_frames.lock(); registry .iter() .filter_map(|(id, slot)| { - let frames = slot.frames.lock(); - // SAFETY: the owning thread can't pop while we hold the Mutex, - // so the FramePtr is valid for the duration of the lock. - frames - .last() - .map(|fp| (*id, unsafe { fp.as_ref() }.to_owned())) + if *id == current_ident { + // Current thread: materialize from TLS chain + crate::frame::current_thread_frame_materialize(vm).map(|frame| (*id, frame)) + } else { + // Other threads: use top_iframe to include + // stack-allocated frames. Materialize the entire + // chain and link retained_back so f_back works. + // SAFETY: world stopped -> owning thread is parked. + let iframe_ptr = slot.top_iframe.load(Ordering::Relaxed) + as *const crate::frame::InterpreterFrame; + if !iframe_ptr.is_null() { + let mut cur = iframe_ptr; + let mut child_fo: Option<crate::PyRef<crate::frame::FrameObject>> = + None; + while !cur.is_null() { + let iframe = unsafe { &*cur }; + let fo = iframe.materialize(vm).to_owned(); + if let Some(child) = child_fo.take() { + let mut guard = child.iframe().retained_back.lock(); + if guard.is_none() { + *guard = Some(fo.clone()); + } + } + child_fo = Some(fo); + cur = iframe.previous(); + } + let iframe = unsafe { &*iframe_ptr }; + let fo = iframe.materialize(vm); + Some((*id, fo.to_owned())) + } else { + // Fall back to frames stack for FrameObject-only path + let frames = slot.frames.lock(); + frames + .last() + .map(|fp| (*id, unsafe { fp.as_ref() }.to_owned())) + } + } }) .collect() } diff --git a/crates/vm/src/stdlib/_typing.rs b/crates/vm/src/stdlib/_typing.rs index 04b9208b3..0214c3cc5 100644 --- a/crates/vm/src/stdlib/_typing.rs +++ b/crates/vm/src/stdlib/_typing.rs @@ -417,9 +417,8 @@ pub(crate) mod decl { }; // Get caller's module name from frame globals, like typevar.rs caller() - let module = vm - .current_frame() - .and_then(|f| f.globals.get_item("__name__", vm).ok()); + let module = + crate::frame::current_globals().and_then(|g| g.get_item("__name__", vm).ok()); Ok(Self::new_eager(name, type_params, value, module)) } diff --git a/crates/vm/src/stdlib/builtins.rs b/crates/vm/src/stdlib/builtins.rs index e329763fa..7817d6ecb 100644 --- a/crates/vm/src/stdlib/builtins.rs +++ b/crates/vm/src/stdlib/builtins.rs @@ -126,12 +126,12 @@ mod builtins { fn merge_compile_future_features( flags: i32, dont_inherit: bool, - vm: &VirtualMachine, + _vm: &VirtualMachine, ) -> bytecode::CodeFlags { let mut future_features = compile_future_features_from_flags(flags); - if !dont_inherit && let Some(frame) = vm.current_frame() { + if !dont_inherit && let Some(code) = crate::frame::current_code() { future_features |= bytecode::CodeFlags::from_bits_truncate( - frame.code.flags.bits() & compile_future_feature_mask().bits(), + code.flags.bits() & compile_future_feature_mask().bits(), ); } future_features @@ -649,9 +649,9 @@ mod builtins { Either::A(string) => { let source = string.as_str(); let mut opts = vm.compile_opts(); - if let Some(frame) = vm.current_frame() { + if let Some(code) = crate::frame::current_code() { opts.future_features = bytecode::CodeFlags::from_bits_truncate( - frame.code.flags.bits() & compile_future_feature_mask().bits(), + code.flags.bits() & compile_future_feature_mask().bits(), ); } vm.compile_with_opts(source, mode, "<string>", opts) diff --git a/crates/vm/src/stdlib/sys.rs b/crates/vm/src/stdlib/sys.rs index 65917865d..8f264d7a7 100644 --- a/crates/vm/src/stdlib/sys.rs +++ b/crates/vm/src/stdlib/sys.rs @@ -44,7 +44,7 @@ pub mod sys { hash::{PyHash, PyUHash}, }, convert::ToPyObject, - frame::FrameRef, + frame::FrameObjectRef, function::{FuncArgs, KwArgs, OptionalArg, PosArgs}, stdlib::{_warnings::warn, builtins}, types::PyStructSequence, @@ -968,9 +968,9 @@ pub mod sys { } #[pyfunction] - fn _getframe(offset: OptionalArg<usize>, vm: &VirtualMachine) -> PyResult<FrameRef> { + fn _getframe(offset: OptionalArg<usize>, vm: &VirtualMachine) -> PyResult<FrameObjectRef> { let offset = offset.into_option().unwrap_or(0); - let frame_ref = crate::frame::frame_at_offset(offset) + let frame_ref = crate::frame::frame_at_offset(offset, vm) .ok_or_else(|| vm.new_value_error("call stack is not deep enough"))?; frame_ref.mark_escaped(); @@ -992,8 +992,8 @@ pub mod sys { } // Get the frame at the specified depth - let func_obj = match crate::frame::frame_at_offset(depth) { - Some(frame) => frame.func_obj.clone(), + let func_obj = match crate::frame::frame_at_offset(depth, vm) { + Some(frame) => frame.iframe().func_obj().map(|o| o.to_owned()), None => return Ok(vm.ctx.none()), }; diff --git a/crates/vm/src/stdlib/sys/monitoring.rs b/crates/vm/src/stdlib/sys/monitoring.rs index f468a86b0..7e47185bb 100644 --- a/crates/vm/src/stdlib/sys/monitoring.rs +++ b/crates/vm/src/stdlib/sys/monitoring.rs @@ -1,5 +1,5 @@ use crate::{ - AsObject, PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine, + AsObject, Py, PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine, builtins::{PyCode, PyDictRef, PyNamespace, PyUtf8StrRef, code::CoMonitoringData}, function::FuncArgs, }; @@ -528,16 +528,23 @@ fn update_events_mask(vm: &VirtualMachine, state: &MonitoringState) { // Each code object gets only the events that apply to it (global + its // own local events), preventing e.g. INSTRUCTION from being applied to // unrelated code objects. - crate::frame::for_each_current_frame(|frame| { - let code = &frame.code; - let code_ver = code.instrumentation_version.load(Ordering::Acquire); - if code_ver != new_ver { - let code_events = state.events_for_code(code.get_id()); - instrument_code(code, code_events); - code.instrumentation_version - .store(new_ver, Ordering::Release); + // Re-instrument all frames on the current thread's stack, including + // stack-allocated iframes (with_iframe path) that have no FrameObject. + { + let mut cur = crate::vm::thread::get_current_frame(); + while !cur.is_null() { + let iframe_ref = unsafe { &*cur }; + let code = iframe_ref.code(); + let code_ver = code.instrumentation_version.load(Ordering::Acquire); + if code_ver != new_ver { + let code_events = state.events_for_code(code.get_id()); + instrument_code(code, code_events); + code.instrumentation_version + .store(new_ver, Ordering::Release); + } + cur = iframe_ref.previous(); } - }); + } } fn use_tool_id(tool_id: i32, name: &str, vm: &VirtualMachine) -> PyResult<()> { @@ -740,7 +747,7 @@ thread_local! { fn fire( vm: &VirtualMachine, event: u32, - code: &PyRef<PyCode>, + code: &Py<PyCode>, offset: u32, cb_extra: &[PyObjectRef], ) -> PyResult<()> { @@ -788,7 +795,7 @@ fn fire( } let mut args_vec = Vec::with_capacity(1 + cb_extra.len()); - args_vec.push(code.clone().into()); + args_vec.push(code.to_owned().into()); args_vec.extend_from_slice(cb_extra); let args = FuncArgs::from(args_vec); @@ -823,11 +830,7 @@ fn fire( // Public dispatch functions (called from frame.rs) -pub(crate) fn fire_py_start( - vm: &VirtualMachine, - code: &PyRef<PyCode>, - offset: u32, -) -> PyResult<()> { +pub(crate) fn fire_py_start(vm: &VirtualMachine, code: &Py<PyCode>, offset: u32) -> PyResult<()> { fire( vm, EVENT_PY_START, @@ -837,11 +840,7 @@ pub(crate) fn fire_py_start( ) } -pub(crate) fn fire_py_resume( - vm: &VirtualMachine, - code: &PyRef<PyCode>, - offset: u32, -) -> PyResult<()> { +pub(crate) fn fire_py_resume(vm: &VirtualMachine, code: &Py<PyCode>, offset: u32) -> PyResult<()> { fire( vm, EVENT_PY_RESUME, @@ -853,7 +852,7 @@ pub(crate) fn fire_py_resume( pub(crate) fn fire_py_return( vm: &VirtualMachine, - code: &PyRef<PyCode>, + code: &Py<PyCode>, offset: u32, retval: &PyObjectRef, ) -> PyResult<()> { @@ -868,7 +867,7 @@ pub(crate) fn fire_py_return( pub(crate) fn fire_py_yield( vm: &VirtualMachine, - code: &PyRef<PyCode>, + code: &Py<PyCode>, offset: u32, retval: &PyObjectRef, ) -> PyResult<()> { @@ -883,7 +882,7 @@ pub(crate) fn fire_py_yield( pub(crate) fn fire_call( vm: &VirtualMachine, - code: &PyRef<PyCode>, + code: &Py<PyCode>, offset: u32, callable: &PyObjectRef, arg0: PyObjectRef, @@ -899,7 +898,7 @@ pub(crate) fn fire_call( pub(crate) fn fire_c_return( vm: &VirtualMachine, - code: &PyRef<PyCode>, + code: &Py<PyCode>, offset: u32, callable: &PyObjectRef, arg0: PyObjectRef, @@ -915,7 +914,7 @@ pub(crate) fn fire_c_return( pub(crate) fn fire_c_raise( vm: &VirtualMachine, - code: &PyRef<PyCode>, + code: &Py<PyCode>, offset: u32, callable: &PyObjectRef, arg0: PyObjectRef, @@ -931,7 +930,7 @@ pub(crate) fn fire_c_raise( pub(crate) fn fire_line( vm: &VirtualMachine, - code: &PyRef<PyCode>, + code: &Py<PyCode>, offset: u32, line: u32, ) -> PyResult<()> { @@ -940,7 +939,7 @@ pub(crate) fn fire_line( pub(crate) fn fire_instruction( vm: &VirtualMachine, - code: &PyRef<PyCode>, + code: &Py<PyCode>, offset: u32, ) -> PyResult<()> { fire( @@ -954,7 +953,7 @@ pub(crate) fn fire_instruction( pub(crate) fn fire_raise( vm: &VirtualMachine, - code: &PyRef<PyCode>, + code: &Py<PyCode>, offset: u32, exception: &PyObjectRef, ) -> PyResult<()> { @@ -971,7 +970,7 @@ pub(crate) fn fire_raise( /// preventing duplicate events from chained cleanup handlers. pub(crate) fn fire_reraise( vm: &VirtualMachine, - code: &PyRef<PyCode>, + code: &Py<PyCode>, offset: u32, exception: &PyObjectRef, ) -> PyResult<()> { @@ -994,7 +993,7 @@ pub(crate) fn fire_reraise( pub(crate) fn fire_exception_handled( vm: &VirtualMachine, - code: &PyRef<PyCode>, + code: &Py<PyCode>, offset: u32, exception: &PyObjectRef, ) -> PyResult<()> { @@ -1010,7 +1009,7 @@ pub(crate) fn fire_exception_handled( pub(crate) fn fire_py_unwind( vm: &VirtualMachine, - code: &PyRef<PyCode>, + code: &Py<PyCode>, offset: u32, exception: &PyObjectRef, ) -> PyResult<()> { @@ -1026,7 +1025,7 @@ pub(crate) fn fire_py_unwind( pub(crate) fn fire_py_throw( vm: &VirtualMachine, - code: &PyRef<PyCode>, + code: &Py<PyCode>, offset: u32, exception: &PyObjectRef, ) -> PyResult<()> { @@ -1039,24 +1038,35 @@ pub(crate) fn fire_py_throw( ) } +/// If `value` is already a `StopIteration`, pass it directly; otherwise wrap +/// it in a new `StopIteration(value)` — matching `PyMonitoring_FireStopIterationEvent`. pub(crate) fn fire_stop_iteration( vm: &VirtualMachine, - code: &PyRef<PyCode>, + code: &Py<PyCode>, offset: u32, - exception: &PyObjectRef, + value: &PyObjectRef, ) -> PyResult<()> { + let exc: PyObjectRef = if value.fast_isinstance(vm.ctx.exceptions.stop_iteration) { + value.clone() + } else { + vm.ctx + .exceptions + .stop_iteration + .as_object() + .call(vec![value.clone()], vm)? + }; fire( vm, EVENT_STOP_ITERATION, code, offset, - &[vm.ctx.new_int(offset).into(), exception.clone()], + &[vm.ctx.new_int(offset).into(), exc], ) } pub(crate) fn fire_jump( vm: &VirtualMachine, - code: &PyRef<PyCode>, + code: &Py<PyCode>, offset: u32, destination: u32, ) -> PyResult<()> { @@ -1074,7 +1084,7 @@ pub(crate) fn fire_jump( pub(crate) fn fire_branch_left( vm: &VirtualMachine, - code: &PyRef<PyCode>, + code: &Py<PyCode>, offset: u32, destination: u32, ) -> PyResult<()> { @@ -1092,7 +1102,7 @@ pub(crate) fn fire_branch_left( pub(crate) fn fire_branch_right( vm: &VirtualMachine, - code: &PyRef<PyCode>, + code: &Py<PyCode>, offset: u32, destination: u32, ) -> PyResult<()> { diff --git a/crates/vm/src/stdlib/typevar.rs b/crates/vm/src/stdlib/typevar.rs index da018b552..3e2581406 100644 --- a/crates/vm/src/stdlib/typevar.rs +++ b/crates/vm/src/stdlib/typevar.rs @@ -47,20 +47,17 @@ pub(crate) mod typevar { /// /// Note: CPython's implementation (in typevarobject.c) gets the module from the /// frame's function object using PyFunction_GetModule(f->f_funcobj). However, - /// RustPython's Frame doesn't store a reference to the function object, so we + /// RustPython's FrameObject doesn't store a reference to the function object, so we /// get the module name from the frame's globals dictionary instead. fn caller(vm: &VirtualMachine) -> Option<PyObjectRef> { - let frame = vm.current_frame()?; - - // In RustPython, we get the module name from frame's globals - // This is similar to CPython's sys._getframe().f_globals.get('__name__') - frame.globals.get_item("__name__", vm).ok() + let globals = crate::frame::current_globals()?; + globals.get_item("__name__", vm).ok() } /// Set __module__ attribute for an object based on the caller's module. /// This follows CPython's behavior for TypeVar and similar objects. fn set_module_from_caller(obj: &PyObject, vm: &VirtualMachine) -> PyResult<()> { - // Note: CPython gets module from frame->f_funcobj, but RustPython's Frame + // Note: CPython gets module from frame->f_funcobj, but RustPython's FrameObject // architecture is different - we use globals['__name__'] instead let module_value: PyObjectRef = if let Some(module_name) = caller(vm) { // Special handling for certain module names diff --git a/crates/vm/src/suggestion.rs b/crates/vm/src/suggestion.rs index 69ce8f5f6..57323ebea 100644 --- a/crates/vm/src/suggestion.rs +++ b/crates/vm/src/suggestion.rs @@ -71,17 +71,23 @@ pub fn offer_suggestions(exc: &Py<PyBaseException>, vm: &VirtualMachine) -> Opti let tb = exc.__traceback__()?; let tb = tb.iter().last().unwrap_or(tb); - let varnames = tb.frame.code.clone().co_varnames(vm); + let varnames = tb.frame.iframe().code().to_owned().co_varnames(vm); if let Some(suggestions) = calculate_suggestions(varnames.iter(), &name) { return Some(suggestions); }; - let globals: Vec<_> = tb.frame.globals.as_object().try_to_value(vm).ok()?; + let globals: Vec<_> = tb + .frame + .iframe() + .globals() + .as_object() + .try_to_value(vm) + .ok()?; if let Some(suggestions) = calculate_suggestions(globals.iter(), &name) { return Some(suggestions); }; - let builtins: Vec<_> = tb.frame.builtins.try_to_value(vm).ok()?; + let builtins: Vec<_> = tb.frame.iframe().builtins().try_to_value(vm).ok()?; calculate_suggestions(builtins.iter(), &name) } else if exc.class().fast_issubclass(vm.ctx.exceptions.import_error) { let mod_name = exc.as_object().get_attr("name", vm).ok()?; diff --git a/crates/vm/src/types/zoo.rs b/crates/vm/src/types/zoo.rs index 64807fc09..c8667050b 100644 --- a/crates/vm/src/types/zoo.rs +++ b/crates/vm/src/types/zoo.rs @@ -178,7 +178,7 @@ impl TypeZoo { dict_itemiterator_type: dict::PyDictItemIterator::init_builtin_type(), dict_reverseitemiterator_type: dict::PyDictReverseItemIterator::init_builtin_type(), ellipsis_type: slice::PyEllipsis::init_builtin_type(), - frame_type: crate::frame::Frame::init_builtin_type(), + frame_type: crate::frame::FrameObject::init_builtin_type(), frame_locals_proxy_type: frame_locals_proxy::FrameLocalsProxy::init_builtin_type(), function_type: function::PyFunction::init_builtin_type(), generator_type: generator::PyGenerator::init_builtin_type(), diff --git a/crates/vm/src/vm/mod.rs b/crates/vm/src/vm/mod.rs index 801b1297b..a9091f895 100644 --- a/crates/vm/src/vm/mod.rs +++ b/crates/vm/src/vm/mod.rs @@ -33,7 +33,7 @@ use crate::{ common::{hash::HashSecret, lock::PyMutex, rc::PyRc}, convert::ToPyObject, exceptions::types::PyBaseException, - frame::{ExecutionResult, Frame, FrameRef}, + frame::{ExecutionResult, FrameObject, FrameObjectRef}, frozen::FrozenModule, function::{ArgMapping, FuncArgs, PySetterValue}, import, @@ -111,23 +111,23 @@ pub struct VirtualMachine { /// Non-owning frame pointer for the non-unix threading frames stack. /// The pointed-to frame is kept alive by the caller of with_frame/resume_gen_frame. /// Unix threading builds publish the top frame through `ThreadSlot::top_frame` -/// and walk the rest via `Frame::previous`, so they do not use this type. +/// and walk the rest via `FrameObject::previous`, so they do not use this type. #[cfg(all(not(unix), feature = "threading"))] #[derive(Copy, Clone)] -pub struct FramePtr(NonNull<Py<Frame>>); +pub struct FramePtr(NonNull<Py<FrameObject>>); #[cfg(all(not(unix), feature = "threading"))] impl FramePtr { /// # Safety /// The pointed-to frame must still be alive. #[must_use] - pub unsafe fn as_ref(&self) -> &Py<Frame> { + pub unsafe fn as_ref(&self) -> &Py<FrameObject> { unsafe { self.0.as_ref() } } } // SAFETY: FramePtr is only stored in a thread's shared frame stack -// (`ThreadSlot::frames`) while the corresponding FrameRef is alive on that +// (`ThreadSlot::frames`) while the corresponding FrameObjectRef is alive on that // thread's call stack; readers dereference it under the slot mutex. #[cfg(all(not(unix), feature = "threading"))] unsafe impl Send for FramePtr {} @@ -1332,7 +1332,16 @@ impl VirtualMachine { } #[inline(always)] - pub fn run_frame(&self, frame: FrameRef) -> PyResult { + /// Run a stack-allocated InterpreterFrame without heap allocation. + /// This is the fast path for regular (non-generator) function calls. + pub fn run_frame_fast(&self, iframe: &mut crate::frame::InterpreterFrame) -> PyResult { + match self.with_iframe(iframe, |iframe| crate::frame::run_iframe(iframe, self))? { + ExecutionResult::Return(value) => Ok(value), + _ => panic!("Got unexpected result from function"), + } + } + + pub fn run_frame(&self, frame: FrameObjectRef) -> PyResult { // Only ordinary (datastack) call frames reach `run_frame`; generator // and coroutine frames are resumed through `resume_gen_frame`. A // datastack frame is created untracked and is tracked lazily only when @@ -1580,8 +1589,10 @@ impl VirtualMachine { /// The margin is doubled for debug/sanitized builds because frame /// evaluation consumes more native stack in those configurations. #[cfg_attr(any(miri, target_env = "musl"), allow(dead_code))] + // 2× CPython's _PY_STACK_MARGIN_BYTES to account for both heavy and + // light frame native stack usage per recursion step. const STACK_MARGIN_BYTES: usize = - (if cfg!(debug_assertions) { 16384 } else { 2048 }) * core::mem::size_of::<usize>(); + (if cfg!(debug_assertions) { 16384 } else { 4096 }) * core::mem::size_of::<usize>(); /// Get the stack boundaries using platform-specific APIs. /// Returns (base, top) where base is the lowest address and top is the highest. @@ -1667,7 +1678,7 @@ impl VirtualMachine { /// single native frame can exceed the margin and step past it. #[cfg(all(not(miri), not(target_env = "musl")))] #[inline(always)] - fn check_c_stack_overflow(&self) -> bool { + pub(crate) fn check_c_stack_overflow(&self) -> bool { let current_sp = psm::stack_pointer() as usize; let soft_limit = self.c_stack_soft_limit.get(); current_sp < soft_limit @@ -1677,7 +1688,7 @@ impl VirtualMachine { /// the probe during stdlib bootstrap. #[cfg(any(miri, target_env = "musl"))] #[inline(always)] - fn check_c_stack_overflow(&self) -> bool { + pub(crate) fn check_c_stack_overflow(&self) -> bool { false } @@ -1697,68 +1708,230 @@ impl VirtualMachine { f() } - pub fn with_frame<R, F: FnOnce(FrameRef) -> PyResult<R>>( + pub fn with_frame<R, F: FnOnce(FrameObjectRef) -> PyResult<R>>( &self, - frame: FrameRef, + frame: FrameObjectRef, f: F, ) -> PyResult<R> { - self.with_recursion("", || { - // SAFETY: `frame` (FrameRef) stays alive for the entire closure scope, - // keeping the FramePtr valid. We pass a clone to `f` so that `f` - // consuming its FrameRef doesn't invalidate our pointer. - // Publish the frame for sys._current_frames() and faulthandler. - // On unix, set_current_frame below publishes the top frame into the - // thread slot; only non-unix builds maintain the mutex-guarded Vec. - #[cfg(all(not(unix), feature = "threading"))] - crate::vm::thread::push_thread_frame(FramePtr(NonNull::from(&*frame))); - // Link frame into the signal-safe frame chain (previous pointer). - // This chain is the single source for the current thread's frame - // stack (current_frame, sys._getframe, f_back, monitoring). - let old_frame = crate::vm::thread::set_current_frame((&**frame) as *const Frame); - frame.previous.store( - old_frame as *mut Frame, - core::sync::atomic::Ordering::Relaxed, - ); - // Normal frame calls share the caller's exc_info slot so that - // callees can see the caller's handled exception via sys.exc_info(). - // Save the current value to restore on exit — this prevents - // exc_info pollution from frames with unbalanced - // PUSH_EXC_INFO/POP_EXCEPT (e.g., exception escaping an except block - // whose cleanup entry is missing from the exception table). - // A callee whose bytecode never mutates the slot cannot pollute it, - // so the save/restore is skipped for it. - let save_exc = frame.code.has_exc_handling; - let saved_exc = if save_exc { - self.current_exception() - } else { - None - }; - let old_owner = frame.owner.swap( - crate::frame::FrameOwner::Thread as i8, - core::sync::atomic::Ordering::AcqRel, - ); + self.check_recursive_call("")?; - // Ensure cleanup on panic: restore owner, exc_info, and frame chain. - scopeguard::defer! { - frame.owner.store(old_owner, core::sync::atomic::Ordering::Release); - if save_exc { - self.restore_exception(saved_exc); + // Check the native C stack periodically. The sampling interval + // (every 8th call) balances overhead against the risk of missing + // an overflow between checks, especially when light and heavy + // frames alternate (each recursion step uses different native + // stack amounts). + let depth = self.recursion_depth.get(); + if depth & 7 == 0 && self.check_c_stack_overflow() { + return Err(self.new_recursion_error(String::new())); + } + + self.recursion_depth.update(|d| d + 1); + // Decrement on all exit paths (including panic between here and + // the explicit decrement at the bottom). + let _depth_guard = scopeguard::guard((), |()| { + self.recursion_depth.update(|d| d.saturating_sub(1)) + }); + + #[cfg(all(not(unix), feature = "threading"))] + crate::vm::thread::push_thread_frame(FramePtr(NonNull::from(&*frame))); + let iframe = frame.iframe() as *const crate::frame::InterpreterFrame; + let old_chain = crate::vm::thread::set_current_frame(iframe); + { + #[allow(unused_imports)] + use rustpython_common::atomic::Radium; + frame + .iframe() + .previous + .store(old_chain as usize, core::sync::atomic::Ordering::Relaxed); + } + let save_exc = frame.iframe().code().has_exc_handling; + let saved_exc = if save_exc { + self.current_exception() + } else { + None + }; + let old_owner = frame.iframe().owner.swap( + crate::frame::FrameOwner::Thread as i8, + core::sync::atomic::Ordering::AcqRel, + ); + + let result = self.dispatch_traced_frame(&frame, |frame| f(frame.to_owned())); + + // Capture f_back before clearing previous so code holding a + // reference to this FrameObject can walk the chain after return. + if !old_chain.is_null() { + let strong = frame.as_object().strong_count(); + // Only set retained_back if someone else holds a reference (escaped) + // AND the caller already has a FrameObject. Materializing the caller + // here would add refcounts on its local variables, preventing timely + // __del__ / ResourceWarning on dealloc. If the caller hasn't been + // materialized, f_back will resolve via the TLS chain while the + // caller is still executing, or return None after it returns. + if strong > 1 { + let mut guard = frame.iframe().retained_back.lock(); + if guard.is_none() { + let prev_iframe = unsafe { &*old_chain }; + if let Some(fo) = prev_iframe.frame_obj() { + *guard = Some(fo.to_owned()); + } } - crate::vm::thread::set_current_frame(old_frame); - #[cfg(all(not(unix), feature = "threading"))] - crate::vm::thread::pop_thread_frame(); } + } - self.dispatch_traced_frame(&frame, |frame| f(frame.to_owned())) - }) + frame + .iframe() + .owner + .store(old_owner, core::sync::atomic::Ordering::Release); + if save_exc { + self.restore_exception(saved_exc); + } + // Clear previous before popping — it may point to a stack-allocated + // iframe that will be freed when the caller's with_iframe exits. + { + #[allow(unused_imports)] + use rustpython_common::atomic::Radium; + frame + .iframe() + .previous + .store(0, core::sync::atomic::Ordering::Relaxed); + } + let _ = crate::vm::thread::set_current_frame(old_chain); + #[cfg(all(not(unix), feature = "threading"))] + crate::vm::thread::pop_thread_frame(); + // Disarm the panic guard — normal decrement. + scopeguard::ScopeGuard::into_inner(_depth_guard); + self.recursion_depth.update(|d| d - 1); + + result } - /// Frame execution for generator/coroutine resume. + /// Execute a stack-allocated InterpreterFrame without heap-allocating + /// a FrameObject. This is the fast path for regular function calls. + /// The frame is pushed onto the chain as a `*const InterpreterFrame`. + #[inline(always)] + pub fn with_iframe<R>( + &self, + iframe: &mut crate::frame::InterpreterFrame, + f: impl FnOnce(&mut crate::frame::InterpreterFrame) -> PyResult<R>, + ) -> PyResult<R> { + self.check_recursive_call("")?; + + let depth = self.recursion_depth.get(); + if depth & 7 == 0 && self.check_c_stack_overflow() { + return Err(self.new_recursion_error(String::new())); + } + + self.recursion_depth.update(|d| d + 1); + + let iframe_ptr = iframe as *const crate::frame::InterpreterFrame; + let old_chain = crate::vm::thread::set_current_frame(iframe_ptr); + { + #[allow(unused_imports)] + use rustpython_common::atomic::Radium; + iframe + .previous + .store(old_chain as usize, core::sync::atomic::Ordering::Relaxed); + } + let save_exc = iframe.code().has_exc_handling; + let saved_exc = if save_exc { + self.current_exception() + } else { + None + }; + + let result = f(iframe); + + // If this iframe was materialized, capture f_back so that code + // holding a reference to the FrameObject (e.g. sys._getframe() + // return value, traceback frames) can walk the chain after return. + // + // Read materialized through the raw TLS pointer instead of the + // &mut iframe reference. During f(iframe), bytecode can + // materialize the frame via the TLS chain (a raw pointer alias); + // the &mut borrow lets LLVM assume no aliased writes, which can + // cause the store to be invisible through `iframe.materialized`. + { + // Use read_volatile through the original raw pointer to bypass + // LLVM's noalias assumptions on the &mut iframe borrow. + let mat_ptr = unsafe { + let field_ptr = core::ptr::addr_of!((*iframe_ptr).materialized); + core::ptr::read_volatile(field_ptr as *const usize) + }; + if mat_ptr != 0 { + let fo = unsafe { &*(mat_ptr as *const crate::Py<crate::frame::FrameObject>) }; + // Sync localsplus, prev_line, lasti from the live iframe to + // the materialized FrameObject so f_locals, f_lineno, f_lasti + // reflect the final state after execution. + unsafe { + let live_iframe = &*iframe_ptr; + fo.iframe_mut() + .localsplus + .sync_fastlocals_from(&live_iframe.localsplus); + fo.iframe_mut().prev_line.set(live_iframe.prev_line.get()); + #[allow(unused_imports)] + use rustpython_common::atomic::Radium; + fo.iframe_mut().lasti.store( + live_iframe + .lasti + .load(core::sync::atomic::Ordering::Relaxed), + core::sync::atomic::Ordering::Relaxed, + ); + } + if !old_chain.is_null() { + let prev_iframe = unsafe { &*old_chain }; + // Use materialize_chain to avoid cloning localsplus, which + // would create extra refcounts on local variables. The + // lightweight frame has empty localsplus; live values are + // read through find_live_source_iframe when needed. + let back_fo = prev_iframe.materialize_chain(self); + *fo.iframe().retained_back.lock() = Some(back_fo); + } + // Set owner to FrameObject since this frame is no longer + // executing on a thread. + fo.iframe().owner.store( + crate::frame::FrameOwner::FrameObject as i8, + core::sync::atomic::Ordering::Release, + ); + } + } + + if save_exc { + self.restore_exception(saved_exc); + } + // Restore the frame chain BEFORE clearing temporary_refs, so + // top_frame no longer points at the materialized FrameObject + // when its last strong reference is released. + let _ = crate::vm::thread::set_current_frame(old_chain); + self.recursion_depth.update(|d| d - 1); + + // Now that the frame is off the chain, track the materialized + // FrameObject in the GC and release temporary_refs so cycle + // collection can detect and reclaim reference cycles. + { + let mat_ptr = unsafe { + let field_ptr = core::ptr::addr_of!((*iframe_ptr).materialized); + core::ptr::read_volatile(field_ptr as *const usize) + }; + if mat_ptr != 0 { + let fo = unsafe { &*(mat_ptr as *const crate::Py<crate::frame::FrameObject>) }; + unsafe { + crate::gc_state::gc_state() + .track_object(core::ptr::NonNull::from(fo.as_object())); + let live_iframe = &*iframe_ptr; + live_iframe.temporary_refs.lock().clear(); + } + } + } + + result + } + + /// FrameObject execution for generator/coroutine resume. /// Pushes a new exc_info slot (gi_exc_state) onto the chain, /// linking the generator's saved handled-exception. - pub fn resume_gen_frame<R, F: FnOnce(&Py<Frame>) -> PyResult<R>>( + pub fn resume_gen_frame<R, F: FnOnce(&Py<FrameObject>) -> PyResult<R>>( &self, - frame: &FrameRef, + frame: &FrameObjectRef, exc: Option<PyBaseExceptionRef>, f: F, ) -> PyResult<R> { @@ -1768,19 +1941,22 @@ impl VirtualMachine { } self.recursion_depth.update(|d| d + 1); - // SAFETY: frame (&FrameRef) stays alive for the duration, so NonNull is valid until pop. + // SAFETY: frame (&FrameObjectRef) stays alive for the duration, so NonNull is valid until pop. #[cfg(all(not(unix), feature = "threading"))] crate::vm::thread::push_thread_frame(FramePtr(NonNull::from(&**frame))); - let old_frame = crate::vm::thread::set_current_frame((&***frame) as *const Frame); - frame.previous.store( - old_frame as *mut Frame, - core::sync::atomic::Ordering::Relaxed, - ); + let iframe = frame.iframe() as *const crate::frame::InterpreterFrame; + let old_chain = crate::vm::thread::set_current_frame(iframe); + { + #[allow(unused_imports)] + use rustpython_common::atomic::Radium; + frame + .iframe() + .previous + .store(old_chain as usize, core::sync::atomic::Ordering::Relaxed); + } // Push generator's exc_info slot onto the chain - // (gi_exc_state.previous_item = tstate->exc_info; - // tstate->exc_info = &gi_exc_state;) self.push_exception(exc); - let old_owner = frame.owner.swap( + let old_owner = frame.iframe().owner.swap( crate::frame::FrameOwner::Thread as i8, core::sync::atomic::Ordering::AcqRel, ); @@ -1788,9 +1964,16 @@ impl VirtualMachine { // Ensure cleanup on panic: restore owner, pop exc_info slot, frame chain, // frames Vec, and recursion depth. scopeguard::defer! { - frame.owner.store(old_owner, core::sync::atomic::Ordering::Release); + frame.iframe().owner.store(old_owner, core::sync::atomic::Ordering::Release); self.pop_exception(); - crate::vm::thread::set_current_frame(old_frame); + // Clear previous before popping — it may point to a stack-allocated + // iframe that will be freed when the caller's with_iframe exits. + { + #[allow(unused_imports)] + use rustpython_common::atomic::Radium; + frame.iframe().previous.store(0, core::sync::atomic::Ordering::Relaxed); + } + let _ = crate::vm::thread::set_current_frame(old_chain); #[cfg(all(not(unix), feature = "threading"))] crate::vm::thread::pop_thread_frame(); @@ -1809,9 +1992,9 @@ impl VirtualMachine { /// - Fire `TraceEvent::Return` on both normal return **and** exception /// unwind (`PY_UNWIND` → `PyTrace_RETURN` with `arg = None`). /// Propagate any trace-function error, replacing the original exception. - fn dispatch_traced_frame<R, F: FnOnce(&Py<Frame>) -> PyResult<R>>( + fn dispatch_traced_frame<R, F: FnOnce(&Py<FrameObject>) -> PyResult<R>>( &self, - frame: &Py<Frame>, + frame: &Py<FrameObject>, f: F, ) -> PyResult<R> { use crate::protocol::TraceEvent; @@ -1819,7 +2002,7 @@ impl VirtualMachine { // Fire 'call' trace event. current_frame() now returns the callee. let trace_result = self.trace_event(TraceEvent::Call, None)?; if let Some(local_trace) = trace_result { - *frame.trace.lock() = local_trace; + *frame.iframe().trace.lock() = Some(local_trace); } let result = f(frame); @@ -1828,7 +2011,7 @@ impl VirtualMachine { // PY_UNWIND fires PyTrace_RETURN with arg=None — so we fire for // both Ok and Err, matching `call_trace_protected` behavior. if self.use_tracing.get() - && (!self.is_none(&frame.trace.lock()) || !self.is_none(&self.profile_func.borrow())) + && (frame.iframe().trace.lock().is_some() || !self.is_none(&self.profile_func.borrow())) { let ret_result = self.trace_event(TraceEvent::Return, None); // call_trace_protected: if trace function raises, its error @@ -1880,21 +2063,23 @@ impl VirtualMachine { } } - pub fn current_frame(&self) -> Option<FrameRef> { - crate::frame::current_thread_frame() + pub fn current_frame(&self) -> Option<FrameObjectRef> { + crate::frame::current_thread_frame_materialize(self) } pub fn current_locals(&self) -> PyResult<ArgMapping> { - self.current_frame() + // Must include light frames so locals() returns the correct scope. + crate::frame::current_thread_frame_materialize(self) .expect("called current_locals but no frames on the stack") .locals(self) } pub fn current_globals(&self) -> PyDictRef { - self.current_frame() - .expect("called current_globals but no frames on the stack") - .globals - .clone() + let ptr = crate::vm::thread::get_current_frame(); + if !ptr.is_null() { + return unsafe { (*ptr).globals().to_owned() }; + } + crate::frame::current_globals().expect("called current_globals but no frames on the stack") } pub fn try_class(&self, module: &'static str, class: &'static str) -> PyResult<PyTypeRef> { @@ -1953,11 +2138,14 @@ impl VirtualMachine { .get_attr(identifier!(self, __import__), self) .map_err(|_| self.new_import_error("__import__ not found", module.to_owned()))?; - let (locals, globals) = if let Some(frame) = self.current_frame() { - ( - Some(frame.locals.clone_mapping(self)), - Some(frame.globals.clone()), - ) + let (locals, globals) = if let Some(globals) = crate::frame::current_globals() { + // Locals fallback: use the heavy frame if available, otherwise + // use globals as locals (light frame locals are on the data stack). + let locals_mapping = self.current_frame().map_or_else( + || ArgMapping::from_dict_exact(globals.clone()), + |f| f.iframe().locals.clone_mapping(self), + ); + (Some(locals_mapping), Some(globals)) } else { (None, None) }; diff --git a/crates/vm/src/vm/thread.rs b/crates/vm/src/vm/thread.rs index 9948b936f..1520b2cd8 100644 --- a/crates/vm/src/vm/thread.rs +++ b/crates/vm/src/vm/thread.rs @@ -5,12 +5,21 @@ use crate::builtins::PyBaseExceptionRef; #[cfg(feature = "threading")] use alloc::sync::Arc; -use crate::frame::Frame; +#[cfg(all(unix, feature = "threading"))] +use crate::frame::FrameObject; +use crate::frame::InterpreterFrame; +#[cfg(all(unix, feature = "threading"))] +use crate::{AsObject, Py, PyObject, VirtualMachine}; +#[cfg(all(not(unix), feature = "threading"))] use crate::{AsObject, PyObject, VirtualMachine}; +#[cfg(not(feature = "threading"))] +use crate::{AsObject, PyObject, VirtualMachine}; +#[cfg(all(unix, feature = "threading"))] +use core::sync::atomic::AtomicPtr; use core::{ cell::{Cell, RefCell}, ptr::NonNull, - sync::atomic::{AtomicPtr, Ordering}, + sync::atomic::{AtomicUsize, Ordering}, }; use itertools::Itertools; use std::thread_local; @@ -38,9 +47,13 @@ pub struct ThreadSlot { /// thread at a safepoint and supplies the happens-before edge, so the /// pointer and the frames it reaches are quiescent and alive at read time. #[cfg(unix)] - pub top_frame: AtomicPtr<Frame>, + pub top_frame: AtomicPtr<FrameObject>, + /// Raw InterpreterFrame pointer, published alongside top_frame so + /// cross-thread readers (sys._current_frames) can materialize + /// stack-allocated frames that have no FrameObject. + pub top_iframe: AtomicUsize, /// Raw frame pointers, valid while the owning thread's call stack is active. - /// Readers must hold the Mutex and convert to FrameRef inside the lock. + /// Readers must hold the Mutex and convert to FrameObjectRef inside the lock. /// Used on non-unix threading builds, which have no stop-the-world. #[cfg(not(unix))] pub frames: parking_lot::Mutex<Vec<FramePtr>>, @@ -82,12 +95,11 @@ thread_local! { static CURRENT_THREAD_SLOT: RefCell<Option<CurrentFrameSlot>> = const { RefCell::new(None) }; /// Current top frame for signal-safe traceback walking. - /// Mirrors `PyThreadState.current_frame`. Read by faulthandler's signal - /// handler to dump tracebacks without accessing RefCell or locks. - /// Uses AtomicPtr for async-signal-safety (signal handlers may read this - /// while the owning thread is writing). - pub(crate) static CURRENT_FRAME: AtomicPtr<Frame> = - const { AtomicPtr::new(core::ptr::null_mut()) }; + /// Stores a `*const InterpreterFrame` as `usize`. + /// Read by faulthandler's signal handler to dump tracebacks without + /// accessing RefCell or locks. Uses AtomicUsize for async-signal-safety. + pub(crate) static CURRENT_FRAME: AtomicUsize = + const { AtomicUsize::new(0) }; /// Cached pointer to this thread's `ThreadSlot::top_frame`, so the hot /// push/pop path can publish the top frame with a single relaxed store and @@ -95,7 +107,7 @@ thread_local! { /// initialized; the `Arc<ThreadSlot>` in `CURRENT_THREAD_SLOT` keeps the /// pointee alive until `cleanup_current_thread_frames` clears this. #[cfg(all(unix, feature = "threading"))] - static CURRENT_TOP_FRAME_SLOT: Cell<*const AtomicPtr<Frame>> = + static CURRENT_TOP_FRAME_SLOT: Cell<*const AtomicPtr<FrameObject>> = const { Cell::new(core::ptr::null()) }; } @@ -339,6 +351,7 @@ fn init_thread_slot_if_needed(vm: &VirtualMachine) { let new_slot = Arc::new(ThreadSlot { #[cfg(unix)] top_frame: AtomicPtr::new(core::ptr::null_mut()), + top_iframe: AtomicUsize::new(0), #[cfg(not(unix))] frames: parking_lot::Mutex::new(Vec::new()), exception: crate::PyAtomicRef::from(None::<PyBaseExceptionRef>), @@ -670,28 +683,56 @@ pub fn pop_thread_frame() { }); } -/// Set the current thread's top frame pointer for signal-safe traceback walking. -/// Returns the previous frame pointer so it can be restored on pop. -pub fn set_current_frame(frame: *const Frame) -> *const Frame { - // Publish the top frame for cross-thread readers. The relaxed store is - // ordered by stop-the-world at read time (see `ThreadSlot::top_frame`). - #[cfg(all(unix, feature = "threading"))] +/// Set the current thread's top InterpreterFrame pointer. +/// Returns the previous pointer so it can be restored on pop. +#[must_use] +#[allow(clippy::not_unsafe_ptr_arg_deref)] +pub fn set_current_frame(frame: *const InterpreterFrame) -> *const InterpreterFrame { + // Publish the top frame for cross-thread readers (faulthandler, + // sys._current_frames). + #[cfg(feature = "threading")] { - let slot_top = CURRENT_TOP_FRAME_SLOT.with(Cell::get); - if !slot_top.is_null() { - // SAFETY: points to this thread's `ThreadSlot::top_frame`, kept - // alive by the Arc in `CURRENT_THREAD_SLOT` for the thread's life. - unsafe { (*slot_top).store(frame as *mut Frame, Ordering::Relaxed) }; - } + CURRENT_THREAD_SLOT.with(|slot| { + if let Some(s) = slot.borrow().as_ref() { + if !frame.is_null() { + #[cfg(unix)] + { + let frame_obj = unsafe { (*frame).frame_obj() }; + let fo_ptr = match frame_obj { + Some(py) => { + py as *const Py<FrameObject> as *const FrameObject + as *mut FrameObject + } + None => core::ptr::null_mut(), + }; + s.top_frame.store(fo_ptr, Ordering::Relaxed); + } + s.top_iframe.store(frame as usize, Ordering::Relaxed); + } else { + #[cfg(unix)] + s.top_frame.store(core::ptr::null_mut(), Ordering::Relaxed); + s.top_iframe.store(0, Ordering::Relaxed); + } + } + }); } - CURRENT_FRAME.with(|c| c.swap(frame as *mut Frame, Ordering::Relaxed) as *const Frame) + CURRENT_FRAME.with(|c| c.swap(frame as usize, Ordering::Relaxed)) as *const InterpreterFrame } -/// Get the current thread's top frame pointer. +/// Lightweight version that only writes to TLS CURRENT_FRAME, returning +/// the previous value. Does not update cross-thread top_frame (that's +/// updated by `set_current_frame` for FrameObject-based calls). +#[inline(always)] +#[must_use] +pub fn set_current_frame_nosave(frame: *const InterpreterFrame) -> *const InterpreterFrame { + CURRENT_FRAME.with(|c| c.swap(frame as usize, Ordering::Relaxed)) as *const InterpreterFrame +} + +/// Get the current thread's top InterpreterFrame pointer. /// Used by faulthandler's signal handler to start traceback walking. #[must_use] -pub fn get_current_frame() -> *const Frame { - CURRENT_FRAME.with(|c| c.load(Ordering::Relaxed) as *const Frame) +pub fn get_current_frame() -> *const InterpreterFrame { + CURRENT_FRAME.with(|c| c.load(Ordering::Relaxed)) as *const InterpreterFrame } /// Update the current thread's exception slot atomically (no locks). @@ -784,18 +825,36 @@ pub fn reinit_frame_slot_after_fork(vm: &VirtualMachine) { let mut cur = get_current_frame(); while !cur.is_null() { // SAFETY: the forking thread's chain frames are alive. - let py = unsafe { crate::Py::<Frame>::from_payload_ptr(cur) }; - current_frames.push(FramePtr(unsafe { NonNull::new_unchecked(py as *mut _) })); - cur = unsafe { (*cur).previous_frame() }; + let iframe = unsafe { &*cur }; + if let Some(fo) = iframe.frame_obj() { + current_frames.push(FramePtr(unsafe { + NonNull::new_unchecked(fo as *const _ as *mut _) + })); + } + cur = iframe.previous.load(Ordering::Relaxed) as *const InterpreterFrame; } current_frames.reverse(); current_frames }; + #[cfg(unix)] + let top_fo_ptr = { + let top_iframe = get_current_frame(); + if top_iframe.is_null() { + core::ptr::null_mut() + } else { + match unsafe { (*top_iframe).frame_obj() } { + Some(fo) => fo as *const Py<FrameObject> as *const FrameObject as *mut FrameObject, + None => core::ptr::null_mut(), + } + } + }; + let top_iframe_ptr = get_current_frame() as usize; let new_slot = Arc::new(ThreadSlot { - // The surviving child thread keeps executing its current frame chain, - // whose top is the signal-safe `get_current_frame()`. + // The surviving child thread keeps executing its current frame chain. + // Only publish heavy frames for signal safety. #[cfg(unix)] - top_frame: AtomicPtr::new(get_current_frame() as *mut Frame), + top_frame: AtomicPtr::new(top_fo_ptr), + top_iframe: AtomicUsize::new(top_iframe_ptr), #[cfg(not(unix))] frames: parking_lot::Mutex::new(current_frames), exception: crate::PyAtomicRef::from(vm.topmost_exception()), diff --git a/crates/vm/src/warn.rs b/crates/vm/src/warn.rs index 6500e8de0..d5729858d 100644 --- a/crates/vm/src/warn.rs +++ b/crates/vm/src/warn.rs @@ -513,7 +513,7 @@ fn show_warning( } /// Check if a frame's filename starts with any of the given prefixes. -fn is_filename_to_skip(frame: &crate::frame::Frame, prefixes: &PyTupleRef) -> bool { +fn is_filename_to_skip(frame: &crate::frame::FrameObject, prefixes: &PyTupleRef) -> bool { let filename = frame.f_code().co_filename(); let filename_bytes = filename.as_bytes(); prefixes.iter().any(|prefix| { @@ -523,15 +523,15 @@ fn is_filename_to_skip(frame: &crate::frame::Frame, prefixes: &PyTupleRef) -> bo }) } -/// Like Frame::next_external_frame but also skips frames matching prefixes. +/// Like FrameObject::next_external_frame but also skips frames matching prefixes. fn next_external_frame_with_skip( - frame: &crate::frame::FrameRef, + frame: &crate::frame::FrameObjectRef, skip_file_prefixes: Option<&PyTupleRef>, vm: &VirtualMachine, -) -> Option<crate::frame::FrameRef> { +) -> Option<crate::frame::FrameObjectRef> { let mut f = frame.f_back(vm); loop { - let current: crate::frame::FrameRef = f.take()?; + let current: crate::frame::FrameObjectRef = f.take()?; if current.is_internal_frame() || skip_file_prefixes.is_some_and(|p| is_filename_to_skip(&current, p)) { @@ -549,7 +549,9 @@ fn setup_context( skip_file_prefixes: Option<&PyTupleRef>, vm: &VirtualMachine, ) -> PyResult<(PyStrRef, usize, Option<PyObjectRef>, PyObjectRef)> { - let mut f = vm.current_frame(); + // Materialize the topmost frame (including light frames) so stack + // level counting is correct across the full Python frame chain. + let mut f = crate::frame::current_thread_frame_materialize(vm); // Stack level comparisons to Python code is off by one as there is no // warnings-related stack level to avoid. @@ -576,10 +578,18 @@ fn setup_context( } let (globals, filename, lineno) = if let Some(f) = f { - (f.globals.clone(), f.code.source_path(), f.f_lineno()) + ( + f.iframe().globals().to_owned(), + f.iframe().code().source_path(), + f.f_lineno(), + ) } else if let Some(frame) = vm.current_frame() { // We have a frame but it wasn't found during stack walking - (frame.globals.clone(), vm.ctx.intern_str("<sys>"), 1) + ( + frame.iframe().globals().to_owned(), + vm.ctx.intern_str("<sys>"), + 1, + ) } else { // No frames on the stack - use sys.__dict__ (interp->sysdict) let globals = vm From 8771b0a382f7dca221579d7adf5bf342e98cb467 Mon Sep 17 00:00:00 2001 From: Jeaeun Kim <109906379+kyokuping@users.noreply.github.com> Date: Sat, 1 Aug 2026 11:28:00 +0900 Subject: [PATCH 330/339] fix(ssl): make Certificate immutable and non-instantiable (#8417) Assisted-by: Codex:gpt-5.6-sol --- Lib/test/test_ssl.py | 1 - crates/stdlib/src/openssl/cert.rs | 5 ++++- crates/stdlib/src/ssl.rs | 5 ++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index 4808da82f..aa1fdb8fb 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -415,7 +415,6 @@ class BasicSocketTests(unittest.TestCase): value = getattr(ssl, name) self.assertGreaterEqual(value, 0, f"ssl.{name}") - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: TypeError not raised by Certificate def test_ssl_types(self): ssl_types = [ _ssl._SSLContext, diff --git a/crates/stdlib/src/openssl/cert.rs b/crates/stdlib/src/openssl/cert.rs index 7704e51f0..4e42c50f6 100644 --- a/crates/stdlib/src/openssl/cert.rs +++ b/crates/stdlib/src/openssl/cert.rs @@ -67,7 +67,10 @@ pub(crate) mod ssl_cert { } } - #[pyclass(with(Comparable, Hashable, Representable))] + #[pyclass( + flags(IMMUTABLETYPE, DISALLOW_INSTANTIATION), + with(Comparable, Hashable, Representable) + )] impl PySSLCertificate { #[pymethod] fn public_bytes( diff --git a/crates/stdlib/src/ssl.rs b/crates/stdlib/src/ssl.rs index 7e2b4c124..9387df945 100644 --- a/crates/stdlib/src/ssl.rs +++ b/crates/stdlib/src/ssl.rs @@ -5040,7 +5040,10 @@ mod _ssl { } } - #[pyclass(with(Comparable, Hashable, Representable))] + #[pyclass( + flags(IMMUTABLETYPE, DISALLOW_INSTANTIATION), + with(Comparable, Hashable, Representable) + )] impl PySSLCertificate { #[pymethod] fn public_bytes( From cb6ffff36b0e0ec232da150222cfa84d3d500ae0 Mon Sep 17 00:00:00 2001 From: Jeaeun Kim <109906379+kyokuping@users.noreply.github.com> Date: Sat, 1 Aug 2026 11:28:26 +0900 Subject: [PATCH 331/339] fix(ssl): emit missing deprecation warnings (#8418) Assisted-by: Codex:gpt-5.6-sol --- Lib/test/test_ssl.py | 1 - crates/stdlib/src/openssl.rs | 69 ++++++++++++++++++++++++++++++------ crates/stdlib/src/ssl.rs | 40 +++++++++++++++++---- 3 files changed, 93 insertions(+), 17 deletions(-) diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index aa1fdb8fb..5b0c90e4d 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -650,7 +650,6 @@ class BasicSocketTests(unittest.TestCase): with test_wrap_socket(s) as ss: self.assertEqual(timeout, ss.gettimeout()) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_openssl111_deprecations(self): options = [ ssl.OP_NO_TLSv1, diff --git a/crates/stdlib/src/openssl.rs b/crates/stdlib/src/openssl.rs index 16ef8fdb1..fe4a5298d 100644 --- a/crates/stdlib/src/openssl.rs +++ b/crates/stdlib/src/openssl.rs @@ -81,6 +81,7 @@ mod _ssl { ArgBytesLike, ArgMemoryBuffer, ArgStrOrBytesLike, Either, FsPath, OptionalArg, PyComparisonValue, }, + stdlib::_warnings, types::{Comparable, Constructor, PyComparisonOp}, utils::ToCString, }, @@ -914,16 +915,24 @@ mod _ssl { ) -> PyResult<Self> { let proto = SslVersion::try_from(proto_version) .map_err(|_| vm.new_value_error("invalid protocol version"))?; - let method = match proto { + let (method, deprecated_protocol) = match proto { // SslVersion::Ssl3 => unsafe { ssl::SslMethod::from_ptr(sys::SSLv3_method()) }, - SslVersion::Tls => ssl::SslMethod::tls(), - SslVersion::Tls1 => ssl::SslMethod::tls(), - SslVersion::Tls1_1 => ssl::SslMethod::tls(), - SslVersion::Tls1_2 => ssl::SslMethod::tls(), - SslVersion::TlsClient => ssl::SslMethod::tls_client(), - SslVersion::TlsServer => ssl::SslMethod::tls_server(), + SslVersion::Tls => (ssl::SslMethod::tls(), Some("PROTOCOL_TLS")), + SslVersion::Tls1 => (ssl::SslMethod::tls(), Some("PROTOCOL_TLSv1")), + SslVersion::Tls1_1 => (ssl::SslMethod::tls(), Some("PROTOCOL_TLSv1_1")), + SslVersion::Tls1_2 => (ssl::SslMethod::tls(), Some("PROTOCOL_TLSv1_2")), + SslVersion::TlsClient => (ssl::SslMethod::tls_client(), None), + SslVersion::TlsServer => (ssl::SslMethod::tls_server(), None), _ => return Err(vm.new_value_error("invalid protocol version")), }; + if let Some(protocol_name) = deprecated_protocol { + _warnings::warn( + vm.ctx.exceptions.deprecation_warning, + format!("ssl.{protocol_name} is deprecated"), + 2, + vm, + )?; + } let mut builder = SslContextBuilder::new(method).map_err(|e| convert_openssl_error(vm, e))?; @@ -1012,6 +1021,24 @@ mod _ssl { #[pyclass(flags(BASETYPE, IMMUTABLETYPE), with(Constructor))] impl PySslContext { + fn warn_deprecated_tls_version(version: i32, vm: &VirtualMachine) -> PyResult<()> { + let version_name = match version { + PROTO_SSLv3 => Some("SSLv3"), + PROTO_TLSv1 => Some("TLSv1"), + PROTO_TLSv1_1 => Some("TLSv1_1"), + _ => None, + }; + if let Some(version_name) = version_name { + _warnings::warn( + vm.ctx.exceptions.deprecation_warning, + format!("ssl.TLSVersion.{version_name} is deprecated"), + 2, + vm, + )?; + } + Ok(()) + } + fn builder(&self) -> PyRwLockWriteGuard<'_, SslContextBuilder> { self.ctx.write() } @@ -1133,14 +1160,32 @@ mod _ssl { return Err(vm.new_value_error("invalid options value")); } let new_opts = new_opts as core::ffi::c_ulong; - let mut ctx = self.builder(); - // Get current options - let current = ctx.options().bits() as core::ffi::c_ulong; + let current = { + let ctx = self.ctx(); + unsafe { sys::SSL_CTX_get_options(ctx.as_ptr()) } + }; // Calculate options to clear and set let clear = current & !new_opts; let set = !current & new_opts; + let opt_no = sys::SSL_OP_NO_SSLv2 + | sys::SSL_OP_NO_SSLv3 + | sys::SSL_OP_NO_TLSv1 + | sys::SSL_OP_NO_TLSv1_1 + | sys::SSL_OP_NO_TLSv1_2; + #[cfg(ossl111)] + let opt_no = opt_no | sys::SSL_OP_NO_TLSv1_3; + if (set & opt_no) != 0 { + _warnings::warn( + vm.ctx.exceptions.deprecation_warning, + "ssl.OP_NO_SSL*/ssl.OP_NO_TLS* options are deprecated".to_owned(), + 2, + vm, + )?; + } + + let mut ctx = self.builder(); // Clear options first (using raw FFI since openssl crate doesn't expose clear_options) if clear != 0 { unsafe { @@ -1247,6 +1292,8 @@ mod _ssl { } #[pygetset(setter)] fn set_minimum_version(&self, value: i32, vm: &VirtualMachine) -> PyResult<()> { + Self::warn_deprecated_tls_version(value, vm)?; + // Handle special values let proto_version = match value { -2 => { @@ -1281,6 +1328,8 @@ mod _ssl { } #[pygetset(setter)] fn set_maximum_version(&self, value: i32, vm: &VirtualMachine) -> PyResult<()> { + Self::warn_deprecated_tls_version(value, vm)?; + // Handle special values let proto_version = match value { -1 => { diff --git a/crates/stdlib/src/ssl.rs b/crates/stdlib/src/ssl.rs index 9387df945..7c4257877 100644 --- a/crates/stdlib/src/ssl.rs +++ b/crates/stdlib/src/ssl.rs @@ -881,6 +881,24 @@ mod _ssl { #[pyclass(with(Constructor, Representable), flags(BASETYPE))] impl PySSLContext { + fn warn_deprecated_tls_version(version: i32, vm: &VirtualMachine) -> PyResult<()> { + let version_name = match version { + PROTO_SSLv3 => Some("SSLv3"), + PROTO_TLSv1 => Some("TLSv1"), + PROTO_TLSv1_1 => Some("TLSv1_1"), + _ => None, + }; + if let Some(version_name) = version_name { + _warnings::warn( + vm.ctx.exceptions.deprecation_warning, + format!("ssl.TLSVersion.{version_name} is deprecated"), + 2, + vm, + )?; + } + Ok(()) + } + // Helper method to convert DER certificate bytes to Python dict fn cert_der_to_dict(&self, vm: &VirtualMachine, cert_der: &[u8]) -> PyResult<PyObjectRef> { cert::cert_der_to_dict_helper(vm, cert_der) @@ -1024,6 +1042,8 @@ mod _ssl { { return Err(vm.new_value_error(format!("invalid protocol version: {value}"))); } + Self::warn_deprecated_tls_version(value, vm)?; + // Convert special values to rustls actual supported versions // MINIMUM_SUPPORTED (-2) -> 0 (auto-negotiate) // MAXIMUM_SUPPORTED (-1) -> MAXIMUM_VERSION (TLSv1.3) @@ -1055,6 +1075,8 @@ mod _ssl { { return Err(vm.new_value_error(format!("invalid protocol version: {value}"))); } + Self::warn_deprecated_tls_version(value, vm)?; + // Convert special values to rustls actual supported versions // MAXIMUM_SUPPORTED (-1) -> 0 (auto-negotiate) // MINIMUM_SUPPORTED (-2) -> MINIMUM_VERSION (TLSv1.2) @@ -2214,12 +2236,10 @@ mod _ssl { ) -> PyResult<Self> { let crypto_ext = CryptoExt::get_ext(); - // Validate protocol - match protocol { - PROTOCOL_TLS | PROTOCOL_TLS_CLIENT | PROTOCOL_TLS_SERVER | PROTOCOL_TLSv1_2 - | PROTOCOL_TLSv1_3 => { - // Valid protocols - } + let deprecated_protocol = match protocol { + PROTOCOL_TLS => Some("PROTOCOL_TLS"), + PROTOCOL_TLSv1_2 => Some("PROTOCOL_TLSv1_2"), + PROTOCOL_TLS_CLIENT | PROTOCOL_TLS_SERVER | PROTOCOL_TLSv1_3 => None, PROTOCOL_TLSv1 | PROTOCOL_TLSv1_1 => { return Err(vm.new_value_error( "TLS 1.0 and 1.1 are not supported by rustls for security reasons", @@ -2228,6 +2248,14 @@ mod _ssl { _ => { return Err(vm.new_value_error(format!("invalid protocol version: {protocol}"))); } + }; + if let Some(protocol_name) = deprecated_protocol { + _warnings::warn( + vm.ctx.exceptions.deprecation_warning, + format!("ssl.{protocol_name} is deprecated"), + 2, + vm, + )?; } // Set default options From 4d890b33db3e1573fbb4c500abc44c13c55b7242 Mon Sep 17 00:00:00 2001 From: Chanho Lee <ibear6954@gmail.com> Date: Sat, 1 Aug 2026 11:28:59 +0900 Subject: [PATCH 332/339] Fix sqlite autocommit cursor transactions (#8419) Assisted-by: Codex:gpt-5.6-sol --- Lib/test/test_sqlite3/test_transactions.py | 2 -- crates/stdlib/src/_sqlite3.rs | 12 +++++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Lib/test/test_sqlite3/test_transactions.py b/Lib/test/test_sqlite3/test_transactions.py index 64a1621d4..d777af0ff 100644 --- a/Lib/test/test_sqlite3/test_transactions.py +++ b/Lib/test/test_sqlite3/test_transactions.py @@ -488,7 +488,6 @@ class AutocommitAttribute(unittest.TestCase): self.assertTrue(cx.in_transaction) self.assertFalse(cx.in_transaction) - @unittest.expectedFailure # TODO: RUSTPYTHON; autocommit behavior differs def test_autocommit_enabled_executescript(self): expected = ["BEGIN", "SELECT 1"] with memory_database(autocommit=True) as cx: @@ -498,7 +497,6 @@ class AutocommitAttribute(unittest.TestCase): cx.executescript("SELECT 1") self.assertTrue(cx.in_transaction) - @unittest.expectedFailure # TODO: RUSTPYTHON; autocommit behavior differs def test_autocommit_disabled_executescript(self): expected = ["SELECT 1"] with memory_database(autocommit=False) as cx: diff --git a/crates/stdlib/src/_sqlite3.rs b/crates/stdlib/src/_sqlite3.rs index e2b06adc4..5348cc1f5 100644 --- a/crates/stdlib/src/_sqlite3.rs +++ b/crates/stdlib/src/_sqlite3.rs @@ -1761,11 +1761,11 @@ mod _sqlite3 { let db = zelf.connection.db_lock(vm)?; - // Start implicit transaction for DML statements unless in autocommit mode + // Only legacy transaction control starts implicit DML transactions. if stmt.is_dml && db.is_autocommit() && zelf.connection.isolation_level.deref().is_some() - && *zelf.connection.autocommit.lock() != AutocommitMode::Enabled + && *zelf.connection.autocommit.lock() == AutocommitMode::Legacy { db.begin_transaction( zelf.connection @@ -1855,11 +1855,11 @@ mod _sqlite3 { let db = zelf.connection.db_lock(vm)?; - // Start implicit transaction for DML statements unless in autocommit mode + // Only legacy transaction control starts implicit DML transactions. if stmt.is_dml && db.is_autocommit() && zelf.connection.isolation_level.deref().is_some() - && *zelf.connection.autocommit.lock() != AutocommitMode::Enabled + && *zelf.connection.autocommit.lock() == AutocommitMode::Legacy { db.begin_transaction( zelf.connection @@ -1909,7 +1909,9 @@ mod _sqlite3 { db.sql_limit(script.byte_len(), vm)?; - db.implicit_commit(vm)?; + if *zelf.connection.autocommit.lock() == AutocommitMode::Legacy { + db.implicit_commit(vm)?; + } let script = script.to_cstring(vm)?; let mut ptr = script.as_ptr(); From beff2b02acd482eaf9b89610918609d696845fd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EA=B4=91=ED=9A=A8?= <87641474+widehyo1@users.noreply.github.com> Date: Sat, 1 Aug 2026 11:35:37 +0900 Subject: [PATCH 333/339] csv: port CPython reader state machine (#8381) * csv: port CPython reader state machine Replace the csv-core reader and per-item quote scanner with one Rust implementation of CPython's nine-state reader parser. Keep parser state across iterator items and distinguish virtual item boundaries from true iterator exhaustion. Centralize field completion so quote provenance, empty-field None conversion, float conversion, strict parsing, field limits, blank rows, and escaped or quoted newlines share one path. Apply the existing reentrant-iterator generation check to every iterator item consumed by a record. Also accept empty ASCII line terminators like CPython, report a missing csv-core writer sentinel as _csv.Error instead of panicking, and name the FSM entry point process_parser_input. Remove the expected-failure markers from the eleven reader tests that now pass. Assisted-by: Codex:gpt-5.6-sol * csv: test CRLF boundaries with custom lineterminator --- .cspell.json | 1 + Lib/test/test_csv.py | 11 - crates/stdlib/src/csv.rs | 664 +++++++++++++---------------- extra_tests/snippets/stdlib_csv.py | 30 ++ 4 files changed, 321 insertions(+), 385 deletions(-) diff --git a/.cspell.json b/.cspell.json index 21d401563..2889a5184 100644 --- a/.cspell.json +++ b/.cspell.json @@ -59,6 +59,7 @@ "alnum", "csock", "coro", + "Crnl", "dedentations", "dedents", "deduped", diff --git a/Lib/test/test_csv.py b/Lib/test/test_csv.py index 2b1de5d70..65093dc70 100644 --- a/Lib/test/test_csv.py +++ b/Lib/test/test_csv.py @@ -371,7 +371,6 @@ class Test_Csv(unittest.TestCase): result = list(reader) self.assertEqual(result, expect) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_read_oddinputs(self): self._read_test([], []) self._read_test([''], [[]]) @@ -382,7 +381,6 @@ class Test_Csv(unittest.TestCase): self.assertRaises(csv.Error, self._read_test, [b'abc'], None) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_read_eol(self): self._read_test(['a,b', 'c,d'], [['a','b'], ['c','d']]) self._read_test(['a,b\n', 'c,d\n'], [['a','b'], ['c','d']]) @@ -397,7 +395,6 @@ class Test_Csv(unittest.TestCase): with self.assertRaisesRegex(csv.Error, errmsg): next(csv.reader(['a,b\r\nc,d'])) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_read_eof(self): self._read_test(['a,"'], [['a', '']]) self._read_test(['"a'], [['a']]) @@ -407,7 +404,6 @@ class Test_Csv(unittest.TestCase): self.assertRaises(csv.Error, self._read_test, ['^'], [], escapechar='^', strict=True) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_read_nul(self): self._read_test(['\0'], [['\0']]) self._read_test(['a,\0b,c'], [['a', '\0b', 'c']]) @@ -420,7 +416,6 @@ class Test_Csv(unittest.TestCase): self._read_test(['a;b;c'], [['a', 'b', 'c']], delimiter=';') self._read_test(['a\0b\0c'], [['a', 'b', 'c']], delimiter='\0') - @unittest.expectedFailure # TODO: RUSTPYTHON def test_read_escape(self): self._read_test(['a,\\b,c'], [['a', 'b', 'c']], escapechar='\\') self._read_test(['a,b\\,c'], [['a', 'b,c']], escapechar='\\') @@ -433,7 +428,6 @@ class Test_Csv(unittest.TestCase): self._read_test(['a,\\b,c'], [['a', '\\b', 'c']], escapechar=None) self._read_test(['a,\\b,c'], [['a', '\\b', 'c']]) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_read_quoting(self): self._read_test(['1,",3,",5'], [['1', ',3,', '5']]) self._read_test(['1,",3,",5'], [['1', '"', '3', '"', '5']], @@ -484,7 +478,6 @@ class Test_Csv(unittest.TestCase): [[None, None, None]], skipinitialspace=True, quoting=csv.QUOTE_STRINGS) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_read_space_delimiter(self): self._read_test(['a b', ' a ', ' ', ''], [['a', '', '', 'b'], ['', '', 'a', '', ''], ['', '', ''], []], @@ -524,7 +517,6 @@ class Test_Csv(unittest.TestCase): self.assertRaises(StopIteration, next, r) self.assertEqual(r.line_num, 3) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_roundtrip_quoteed_newlines(self): rows = [ ['\na', 'b\nc', 'd\n'], @@ -543,7 +535,6 @@ class Test_Csv(unittest.TestCase): for i, row in enumerate(csv.reader(fileobj)): self.assertEqual(row, rows[i]) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_roundtrip_escaped_unquoted_newlines(self): rows = [ ['\na', 'b\nc', 'd\n'], @@ -807,7 +798,6 @@ class TestDialectExcel(TestCsvBase): '"I see," said the blind man', 'as he picked up his hammer and saw']]) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_quoted_nl(self): input = '''\ 1,2,3,"""I see,"" @@ -1078,7 +1068,6 @@ class TestDictFields(unittest.TestCase): "s1": 'abc', "s2": 'def'}) - @unittest.expectedFailure # TODO: RUSTPYTHON def test_read_with_blanks(self): reader = csv.DictReader(["1,2,abc,4,5,6\r\n","\r\n", "1,2,abc,4,5,6\r\n"], diff --git a/crates/stdlib/src/csv.rs b/crates/stdlib/src/csv.rs index cd065f634..4271d9af6 100644 --- a/crates/stdlib/src/csv.rs +++ b/crates/stdlib/src/csv.rs @@ -9,8 +9,7 @@ mod _csv { builtins::{PyBaseExceptionRef, PyInt, PyNone, PyStr, PyType, PyTypeRef, PyUtf8StrRef}, function::{ArgIterable, ArgumentError, FromArgs, FuncArgs, OptionalArg}, protocol::{PyIter, PyIterReturn}, - raise_if_stop, - types::{Constructor, IterNext, Iterable, SelfIter}, + types::{Callable, Constructor, IterNext, Iterable, SelfIter}, }; use alloc::fmt; use csv_core::Terminator; @@ -267,9 +266,6 @@ mod _csv { // verbatim and the csv-core writer path appends it after a // sentinel terminator (see `writerow`). let value = ascii_lineterminator(vm, &s)?; - if value.is_empty() { - return Err(new_csv_error(vm, r#""lineterminator" must not be empty"#)); - } Ok(value.to_owned()) } attr => { @@ -448,10 +444,6 @@ mod _csv { Ok(Reader { iter, state: PyMutex::new(ReadState { - buffer: vec![0; 1024], - output_ends: vec![0; 16], - reader: options.to_reader(), - skipinitialspace: options.get_skipinitialspace(), line_num: 0, generation: 0, }), @@ -664,14 +656,6 @@ mod _csv { )) })?; let value = ascii_lineterminator(vm, s)?; - // Preserve the previous behavior of rejecting an empty terminator - // (full validation parity is deferred to a follow-up). Any - // non-empty string, including multi-character ones, is stored. - if value.is_empty() { - return Err(vm - .new_type_error(r#""lineterminator" must not be empty"#) - .into()); - } res.lineterminator = Some(value.to_owned()); }; @@ -803,28 +787,6 @@ mod _csv { } } - fn get_skipinitialspace(&self) -> bool { - let mut skipinitialspace = match &self.dialect { - DialectItem::Str(name) => { - let g = GLOBAL_HASHMAP.lock(); - if let Some(dialect) = g.get(name) { - dialect.skipinitialspace - // TODO: RUSTPYTHON; Perfecting the remaining attributes. - } else { - false - } - } - DialectItem::Obj(obj) => obj.skipinitialspace, - _ => false, - }; - - if let Some(attr) = self.skipinitialspace { - skipinitialspace = attr - } - - skipinitialspace - } - fn get_quoting(&self) -> QuoteStyle { let mut quoting = match &self.dialect { DialectItem::Str(name) => { @@ -846,62 +808,6 @@ mod _csv { quoting } - fn to_reader(&self) -> csv_core::Reader { - let dialect = match &self.dialect { - DialectItem::Str(name) => GLOBAL_HASHMAP.lock().get(name).cloned(), - DialectItem::Obj(obj) => Some(obj.clone()), - DialectItem::None => { - let g = GLOBAL_HASHMAP.lock(); - Some(g.get("excel").unwrap().clone()) - } - }; - - let mut builder = csv_core::ReaderBuilder::new(); - let mut reader = if let Some(dialect) = dialect { - let mut builder = builder - .delimiter(dialect.delimiter) - .double_quote(dialect.doublequote) - .escape(dialect.escapechar); - if let Some(quotechar) = dialect.quotechar { - builder = builder.quote(quotechar); - } - builder - } else { - &mut builder - }; - - if let Some(t) = self.delimiter { - reader = reader.delimiter(t); - } - - if let Some(t) = self.quotechar { - reader = if let Some(u) = t { - reader.quote(u) - } else { - reader.quoting(false) - } - } else { - reader = reader.quoting(self.quoting != Some(QuoteStyle::None)); - } - - if let Some(t) = self.doublequote { - reader = reader.double_quote(t); - } - - if self.escapechar.is_some() { - reader = reader.escape(self.escapechar); - } - - // CPython's reader ignores the dialect's `lineterminator` entirely and - // only recognizes `\r`, `\n`, and `\r\n` as record separators. Match - // that: always use CRLF mode. Feeding a multi-byte terminator's first - // byte here would otherwise split records mid-UTF-8 and raise a - // UnicodeDecodeError. - reader = reader.terminator(Terminator::CRLF); - - reader.build() - } - fn to_writer(&self) -> csv_core::Writer { let mut builder = csv_core::WriterBuilder::new(); let mut writer = match &self.dialect { @@ -962,10 +868,6 @@ mod _csv { } struct ReadState { - buffer: Vec<u8>, - output_ends: Vec<usize>, - reader: csv_core::Reader, - skipinitialspace: bool, line_num: u64, generation: u64, } @@ -1001,307 +903,318 @@ mod _csv { impl SelfIter for Reader {} - enum QuoteScanEvent { - InitialSpace, - StartQuotedField, - EndQuotedField, - Escaped(Option<u8>), - DoubleQuote(u8), - Delimiter, - RecordTerminator, - Data(u8), + #[derive(Clone, Copy, Debug, PartialEq, Eq)] + enum ParserState { + StartRecord, + StartField, + EscapedChar, + InField, + InQuotedField, + EscapeInQuotedField, + QuoteInQuotedField, + EatCrnl, + AfterEscapedCrnl, } - struct QuoteScanState { - at_field_start: bool, - in_quoted_field: bool, + #[derive(Clone, Copy, Debug, PartialEq, Eq)] + enum ParserInput { + Byte(u8), + Eol, } - impl QuoteScanState { - const fn new() -> Self { - Self { - at_field_start: true, - in_quoted_field: false, - } - } + const EOL: ParserInput = ParserInput::Eol; - fn scan( - &mut self, - input: &[u8], - index: usize, - dialect: &PyDialect, - unquoted_escape: bool, - ) -> (QuoteScanEvent, usize) { - let byte = input[index]; - - if (self.in_quoted_field || unquoted_escape) && dialect.escapechar == Some(byte) { - self.at_field_start = false; - return match input.get(index + 1).copied() { - Some(escaped) => (QuoteScanEvent::Escaped(Some(escaped)), 2), - None => (QuoteScanEvent::Escaped(None), 1), - }; - } - - if self.in_quoted_field { - if dialect.quotechar == Some(byte) { - if dialect.doublequote && input.get(index + 1) == Some(&byte) { - return (QuoteScanEvent::DoubleQuote(byte), 2); - } - self.in_quoted_field = false; - return (QuoteScanEvent::EndQuotedField, 1); - } - return (QuoteScanEvent::Data(byte), 1); - } - - if self.at_field_start && dialect.skipinitialspace && byte == b' ' { - return (QuoteScanEvent::InitialSpace, 1); - } - - if self.at_field_start - && dialect.quoting != QuoteStyle::None - && dialect.quotechar == Some(byte) - { - self.at_field_start = false; - self.in_quoted_field = true; - return (QuoteScanEvent::StartQuotedField, 1); - } - - if byte == dialect.delimiter { - self.at_field_start = true; - return (QuoteScanEvent::Delimiter, 1); - } - - self.at_field_start = false; - if matches!(byte, b'\r' | b'\n') { - (QuoteScanEvent::RecordTerminator, 1) - } else { - (QuoteScanEvent::Data(byte), 1) - } - } - } - - fn read_quote_record( - input: &[u8], - dialect: &PyDialect, + struct CsvParser { + state: ParserState, + fields: Vec<PyObjectRef>, + field: Vec<u8>, + unquoted_field: bool, field_limit: isize, - vm: &VirtualMachine, - ) -> PyResult<Vec<PyObjectRef>> { - // QUOTE_NOTNULL and QUOTE_STRINGS map empty unquoted fields to None, - // but preserve quoted empty fields as strings, so retain quote provenance. - let mut fields = vec![(Vec::new(), false)]; - let mut scan_state = QuoteScanState::new(); - let mut dangling_escape = false; - let mut index = 0; + } - while index < input.len() { - let (event, consumed) = scan_state.scan(input, index, dialect, true); - match event { - QuoteScanEvent::InitialSpace | QuoteScanEvent::EndQuotedField => {} - QuoteScanEvent::StartQuotedField => fields.last_mut().unwrap().1 = true, - QuoteScanEvent::Escaped(Some(byte)) | QuoteScanEvent::DoubleQuote(byte) => { - fields.last_mut().unwrap().0.push(byte); + impl CsvParser { + fn new(field_limit: isize) -> Self { + Self { + state: ParserState::StartRecord, + fields: Vec::new(), + field: Vec::new(), + unquoted_field: false, + field_limit, + } + } + + fn into_result(self, vm: &VirtualMachine) -> PyIterReturn { + PyIterReturn::Return(vm.ctx.new_list(self.fields).into()) + } + + fn add_byte(&mut self, byte: u8, vm: &VirtualMachine) -> PyResult<()> { + if self.field_limit < 0 || self.field.len() >= self.field_limit as usize { + return Err(new_csv_error( + vm, + format!("field larger than field limit ({})", self.field_limit), + )); + } + self.field.push(byte); + Ok(()) + } + + fn save_field(&mut self, quoting: QuoteStyle, vm: &VirtualMachine) -> PyResult<()> { + let field = if self.unquoted_field + && self.field.is_empty() + && matches!(quoting, QuoteStyle::Notnull | QuoteStyle::Strings) + { + vm.ctx.none() + } else { + let value = core::str::from_utf8(&self.field) + .map_err(|e| new_not_utf8_error(vm, &self.field, e))?; + let field: PyObjectRef = vm.ctx.new_str(value).into(); + if self.unquoted_field + && !self.field.is_empty() + && matches!(quoting, QuoteStyle::Nonnumeric | QuoteStyle::Strings) + { + PyType::call(vm.ctx.types.float_type, vec![field].into(), vm)? + } else { + field } - QuoteScanEvent::Escaped(None) => dangling_escape = true, - QuoteScanEvent::Delimiter => fields.push((Vec::new(), false)), - QuoteScanEvent::RecordTerminator => { - if !input[index..] - .iter() - .all(|&byte| matches!(byte, b'\r' | b'\n')) + }; + self.fields.push(field); + self.field.clear(); + Ok(()) + } + + fn process_parser_input( + &mut self, + input: ParserInput, + dialect: &PyDialect, + vm: &VirtualMachine, + ) -> PyResult<()> { + match self.state { + ParserState::StartRecord => match input { + ParserInput::Eol => {} + ParserInput::Byte(b'\r' | b'\n') => self.state = ParserState::EatCrnl, + _ => { + self.state = ParserState::StartField; + return self.process_parser_input(input, dialect, vm); + } + }, + ParserState::StartField => { + self.unquoted_field = true; + match input { + ParserInput::Eol | ParserInput::Byte(b'\r' | b'\n') => { + self.save_field(dialect.quoting, vm)?; + self.state = state_after_record_end(input); + } + ParserInput::Byte(byte) + if dialect.quoting != QuoteStyle::None + && dialect.quotechar == Some(byte) => + { + self.unquoted_field = false; + self.state = ParserState::InQuotedField; + } + ParserInput::Byte(byte) if dialect.escapechar == Some(byte) => { + self.state = ParserState::EscapedChar; + } + ParserInput::Byte(b' ') if dialect.skipinitialspace => {} + ParserInput::Byte(byte) if byte == dialect.delimiter => { + self.save_field(dialect.quoting, vm)?; + } + ParserInput::Byte(byte) => { + self.add_byte(byte, vm)?; + self.state = ParserState::InField; + } + } + } + ParserState::EscapedChar => match input { + ParserInput::Byte(byte @ (b'\r' | b'\n')) => { + self.add_byte(byte, vm)?; + self.state = ParserState::AfterEscapedCrnl; + } + ParserInput::Eol => { + self.add_byte(b'\n', vm)?; + self.state = ParserState::InField; + } + ParserInput::Byte(byte) => { + self.add_byte(byte, vm)?; + self.state = ParserState::InField; + } + }, + ParserState::AfterEscapedCrnl => { + if input != ParserInput::Eol { + self.state = ParserState::InField; + return self.process_parser_input(input, dialect, vm); + } + } + ParserState::InField => match input { + ParserInput::Eol | ParserInput::Byte(b'\r' | b'\n') => { + self.save_field(dialect.quoting, vm)?; + self.state = state_after_record_end(input); + } + ParserInput::Byte(byte) if dialect.escapechar == Some(byte) => { + self.state = ParserState::EscapedChar; + } + ParserInput::Byte(byte) if byte == dialect.delimiter => { + self.save_field(dialect.quoting, vm)?; + self.state = ParserState::StartField; + } + ParserInput::Byte(byte) => self.add_byte(byte, vm)?, + }, + ParserState::InQuotedField => match input { + ParserInput::Eol => {} + ParserInput::Byte(byte) if dialect.escapechar == Some(byte) => { + self.state = ParserState::EscapeInQuotedField; + } + ParserInput::Byte(byte) + if dialect.quoting != QuoteStyle::None + && dialect.quotechar == Some(byte) => { + self.state = if dialect.doublequote { + ParserState::QuoteInQuotedField + } else { + ParserState::InField + }; + } + ParserInput::Byte(byte) => self.add_byte(byte, vm)?, + }, + ParserState::EscapeInQuotedField => { + let byte = match input { + ParserInput::Eol => b'\n', + ParserInput::Byte(byte) => byte, + }; + self.add_byte(byte, vm)?; + self.state = ParserState::InQuotedField; + } + ParserState::QuoteInQuotedField => match input { + ParserInput::Byte(byte) + if dialect.quoting != QuoteStyle::None + && dialect.quotechar == Some(byte) => + { + self.add_byte(byte, vm)?; + self.state = ParserState::InQuotedField; + } + ParserInput::Byte(byte) if byte == dialect.delimiter => { + self.save_field(dialect.quoting, vm)?; + self.state = ParserState::StartField; + } + ParserInput::Eol | ParserInput::Byte(b'\r' | b'\n') => { + self.save_field(dialect.quoting, vm)?; + self.state = state_after_record_end(input); + } + ParserInput::Byte(byte) if !dialect.strict => { + self.add_byte(byte, vm)?; + self.state = ParserState::InField; + } + ParserInput::Byte(_) => { return Err(new_csv_error( vm, - concat!( - "new-line character seen in unquoted field", - " - do you need to open the file in universal-newline mode?" + format!( + "'{}' expected after '{}'", + dialect.delimiter as char, + dialect.quotechar.unwrap_or_default() as char, ), )); } - break; - } - QuoteScanEvent::Data(byte) => fields.last_mut().unwrap().0.push(byte), + }, + ParserState::EatCrnl => match input { + ParserInput::Byte(b'\r' | b'\n') => {} + ParserInput::Eol => self.state = ParserState::StartRecord, + ParserInput::Byte(_) => { + return Err(new_csv_error( + vm, + concat!( + "new-line character seen in unquoted field - ", + "do you need to open the file with newline=''?" + ), + )); + } + }, } - index += consumed; + Ok(()) } + } - // CPython treats an escape character at the end of an iterator item - // as escaping the implicit newline at the end of that item. - if dangling_escape { - fields.last_mut().unwrap().0.push(b'\n'); + fn state_after_record_end(input: ParserInput) -> ParserState { + if input == ParserInput::Eol { + ParserState::StartRecord + } else { + ParserState::EatCrnl } + } - fields - .into_iter() - .map(|(field, was_quoted)| { - if field.len() > field_limit as usize { - return Err(new_csv_error(vm, "filed too long to read")); - } - if matches!(dialect.quoting, QuoteStyle::Notnull | QuoteStyle::Strings) - && !was_quoted - && field.is_empty() - { - return Ok(vm.ctx.none()); - } - let field = - core::str::from_utf8(&field).map_err(|e| new_not_utf8_error(vm, &field, e))?; - Ok(vm.ctx.new_str(field).into()) - }) - .collect() + fn next_input_item(zelf: &Py<Reader>, vm: &VirtualMachine) -> PyResult<PyIterReturn> { + let generation = zelf.state.lock().generation; + // Advancing user code may re-enter this reader, so do not hold its lock here. + let result = zelf.iter.next(vm)?; + let mut state = zelf.state.lock(); + if state.generation != generation { + return Err(new_csv_error( + vm, + "iterator has already advanced the reader", + )); + } + if matches!(result, PyIterReturn::Return(_)) { + state.generation += 1; + } + Ok(result) + } + + fn finish_at_true_eof( + mut parser: CsvParser, + dialect: &PyDialect, + vm: &VirtualMachine, + ) -> PyResult<PyIterReturn> { + let has_unfinished_record = + !parser.field.is_empty() || parser.state == ParserState::InQuotedField; + if !has_unfinished_record { + return Ok(PyIterReturn::StopIteration(None)); + } + if dialect.strict { + return Err(new_csv_error(vm, "unexpected end of data")); + } + parser.save_field(dialect.quoting, vm)?; + Ok(parser.into_result(vm)) } impl IterNext for Reader { fn next(zelf: &Py<Self>, vm: &VirtualMachine) -> PyResult<PyIterReturn> { - let generation = zelf.state.lock().generation; - let string_obj = raise_if_stop!(zelf.iter.next(vm)?); - let mut state = zelf.state.lock(); - if state.generation != generation { - return Err(new_csv_error( - vm, - "iterator has already advanced the reader", - )); - } - state.generation += 1; - - let string = string_obj.downcast::<PyStr>().map_err(|obj| { - new_csv_error( - vm, - format!( - "iterator should return strings, not {} (the file should be opened in text mode)", - obj.class().name() - ), - ) - })?; - let input = string.as_bytes(); - if input.is_empty() || input.starts_with(b"\n") { - return Ok(PyIterReturn::Return(vm.ctx.new_list(vec![]).into())); - } - let ReadState { - buffer, - output_ends, - reader, - skipinitialspace, - line_num, - generation: _, - } = &mut *state; - - let mut input_offset = 0; - let mut output_offset = 0; - let mut output_ends_offset = 0; - let field_limit = GLOBAL_FIELD_LIMIT.lock().to_owned(); - - let use_quote_record = matches!( - zelf.dialect.quoting, - QuoteStyle::Notnull | QuoteStyle::Strings - ) || (zelf.dialect.quoting == QuoteStyle::None - && zelf.dialect.escapechar.is_some()); - if use_quote_record { - let out = read_quote_record(input, &zelf.dialect, field_limit, vm)?; - *line_num += 1; - return Ok(PyIterReturn::Return(vm.ctx.new_list(out).into())); - } - - #[inline] - fn trim_initial_spaces(input: &[u8], dialect: &PyDialect) -> Vec<u8> { - let mut trimmed = Vec::with_capacity(input.len()); - let mut scan_state = QuoteScanState::new(); - let mut index = 0; - - // Delimiters inside quoted fields are data, so only skip spaces - // after delimiters encountered outside quotes. - while index < input.len() { - let (event, consumed) = scan_state.scan(input, index, dialect, false); - if !matches!(event, QuoteScanEvent::InitialSpace) { - trimmed.extend_from_slice(&input[index..index + consumed]); - } - index += consumed; - } - - trimmed - } - - #[inline] - fn trim_spaces(input: &[u8]) -> &[u8] { - let trimmed_start = input.iter().position(|&x| x != b' ').unwrap_or(input.len()); - let trimmed_end = input.iter().rposition(|&x| x != b' ').map_or(0, |i| i + 1); - if trimmed_start >= trimmed_end { - &input[input.len()..] - } else { - &input[trimmed_start..trimmed_end] - } - } - - let input = if *skipinitialspace { - String::from_utf8(trim_initial_spaces(input, &zelf.dialect)).unwrap() - } else { - String::from_utf8(input.to_vec()).unwrap() - }; + let mut parser = CsvParser::new(*GLOBAL_FIELD_LIMIT.lock()); loop { - let (res, n_read, n_written, n_ends) = reader.read_record( - &input.as_bytes()[input_offset..], - &mut buffer[output_offset..], - &mut output_ends[output_ends_offset..], - ); - input_offset += n_read; - output_offset += n_written; - output_ends_offset += n_ends; - match res { - csv_core::ReadRecordResult::InputEmpty => {} - csv_core::ReadRecordResult::OutputFull => resize_buf(buffer), - csv_core::ReadRecordResult::OutputEndsFull => resize_buf(output_ends), - csv_core::ReadRecordResult::Record => break, - csv_core::ReadRecordResult::End => { - return Ok(PyIterReturn::StopIteration(None)); + match next_input_item(zelf, vm)? { + PyIterReturn::Return(obj) => { + let string = obj.downcast::<PyStr>().map_err(|obj| { + new_csv_error( + vm, + format!( + concat!( + "iterator should return strings, not {} ", + "(the file should be opened in text mode)" + ), + obj.class().name() + ), + ) + })?; + + zelf.state.lock().line_num += 1; + parser.field_limit = *GLOBAL_FIELD_LIMIT.lock(); + for &byte in string.as_bytes() { + parser.process_parser_input( + ParserInput::Byte(byte), + &zelf.dialect, + vm, + )?; + } + + // Virtual EOL marks an iterator-item boundary, not true EOF. + parser.process_parser_input(EOL, &zelf.dialect, vm)?; + if parser.state == ParserState::StartRecord { + return Ok(parser.into_result(vm)); + } + } + PyIterReturn::StopIteration(_) => { + return finish_at_true_eof(parser, &zelf.dialect, vm); } } } - - let rest = &input.as_bytes()[input_offset..]; - if !rest.iter().all(|&c| matches!(c, b'\r' | b'\n')) { - return Err(new_csv_error( - vm, - concat!( - "new-line character seen in unquoted field", - " - do you need to open the file in universal-newline mode?" - ), - )); - } - - let mut prev_end = 0; - let out: Vec<PyObjectRef> = output_ends[..output_ends_offset] - .iter() - .map(|&end| { - let range = prev_end..end; - if range.len() > field_limit as usize { - return Err(new_csv_error(vm, "filed too long to read")); - } - - prev_end = end; - let s = core::str::from_utf8(&buffer[range.clone()]) - // not sure if this is possible - the input was all strings - .map_err(|e| new_not_utf8_error(vm, &buffer[range.clone()], e))?; - - // TODO: RUSTPYTHON; Incomplete implementation - if let QuoteStyle::Nonnumeric = zelf.dialect.quoting { - if let Ok(t) = String::from_utf8(trim_spaces(&buffer[range]).to_vec()) - .unwrap() - .parse::<i64>() - { - Ok(vm.ctx.new_int(t).into()) - } else { - Ok(vm.ctx.new_str(s).into()) - } - } else { - Ok(vm.ctx.new_str(s).into()) - } - }) - .collect::<Result<_, _>>()?; - // Removes the last null item before the line terminator, if there is a separator before the line terminator, - // todo! - // if out.last().unwrap().length(vm).unwrap() == 0 { - // out.pop(); - // } - *line_num += 1; - Ok(PyIterReturn::Return(vm.ctx.new_list(out).into())) } } @@ -1628,8 +1541,11 @@ mod _csv { // closing the final quote / emitting an empty record as needed). // Drop that sentinel byte and append the real, possibly // multi-character, line terminator. - assert_eq!(buffer[buffer_offset - 1], CSV_CORE_TERMINATOR_SENTINEL); - let mut output = buffer[..buffer_offset - 1].to_vec(); + let emitted = &buffer[..buffer_offset]; + let body = emitted + .strip_suffix(&[CSV_CORE_TERMINATOR_SENTINEL]) + .ok_or_else(|| new_csv_error(vm, "internal error: missing record terminator"))?; + let mut output = body.to_vec(); output.extend_from_slice(self.dialect.lineterminator.as_bytes()); let s = diff --git a/extra_tests/snippets/stdlib_csv.py b/extra_tests/snippets/stdlib_csv.py index 418d383d8..2221832b5 100644 --- a/extra_tests/snippets/stdlib_csv.py +++ b/extra_tests/snippets/stdlib_csv.py @@ -254,6 +254,10 @@ def test_multichar_lineterminator(): assert list(csv.reader(io.StringIO("a,b!@#c,d!@#"), lineterminator="!@#")) == [ ["a", "b!@#c", "d!@#"] ] + assert list(csv.reader(io.StringIO("a,b\r\nc,d\r\n"), lineterminator="!@#")) == [ + ["a", "b"], + ["c", "d"], + ] test_multichar_lineterminator() @@ -295,6 +299,32 @@ if sys.implementation.name == "rustpython": test_reject_non_ascii_lineterminator() +def test_empty_lineterminator(): + class EmptyLineTerminator(csv.excel): + lineterminator = "" + + keyword = io.StringIO() + csv.writer(keyword, lineterminator="").writerows([["a", "b"], ["c", "d"]]) + assert keyword.getvalue() == "a,bc,d" + + dialect = io.StringIO() + csv.writer(dialect, dialect=EmptyLineTerminator).writerows([["a", "b"], ["c", "d"]]) + assert dialect.getvalue() == "a,bc,d" + + source = "a,b\r\nc,d\n" + assert list(csv.reader(io.StringIO(source), lineterminator="")) == [ + ["a", "b"], + ["c", "d"], + ] + assert list(csv.reader(io.StringIO(source), dialect=EmptyLineTerminator)) == [ + ["a", "b"], + ["c", "d"], + ] + + +test_empty_lineterminator() + + def test_quote_minimal_writer_empty_fields(): buf = io.StringIO() writer = csv.writer(buf) From 1457bd726dacd727c6bba1baf6559652b01456da Mon Sep 17 00:00:00 2001 From: Yubin Kim <80163835+devyubin@users.noreply.github.com> Date: Sat, 1 Aug 2026 14:38:58 +0900 Subject: [PATCH 334/339] Bind method descriptor when __get__ owner is omitted (#8404) `method_descriptor.__get__(obj)` raised a TypeError when the owner (the optional second argument) was omitted, because the METHOD-flag branch required the owner to be a type. Match CPython: a missing owner binds to `obj`, while a non-type owner still raises "needs a type, not ...". Assisted-by: Claude Code:claude-opus-4-8 --- Lib/test/test_types.py | 1 - crates/vm/src/builtins/descriptor.rs | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_types.py b/Lib/test/test_types.py index 63bc0803e..2b48e6789 100644 --- a/Lib/test/test_types.py +++ b/Lib/test/test_types.py @@ -660,7 +660,6 @@ class TypesTests(unittest.TestCase): self.assertIsInstance(int.from_bytes, types.BuiltinMethodType) self.assertIsInstance(int.__new__, types.BuiltinMethodType) - @unittest.expectedFailure # TODO: RUSTPYTHON; TypeError: descriptor 'read' needs a type, not 'StringIO', as arg 2 def test_method_descriptor_crash(self): # gh-132747: The default __get__() implementation in C was unable # to handle a second argument of None when called from Python diff --git a/crates/vm/src/builtins/descriptor.rs b/crates/vm/src/builtins/descriptor.rs index 537c2e39c..5c0662e9f 100644 --- a/crates/vm/src/builtins/descriptor.rs +++ b/crates/vm/src/builtins/descriptor.rs @@ -79,7 +79,10 @@ impl GetDescriptor for PyMethodDescriptor { let bound = match obj { Some(obj) => { if descr.method.flags.contains(PyMethodFlags::METHOD) { - if cls.is_some_and(|c| c.fast_isinstance(vm.ctx.types.type_type)) { + if cls + .as_ref() + .is_none_or(|c| c.fast_isinstance(vm.ctx.types.type_type)) + { obj } else { return Err(vm.new_type_error(format!( From 457e195001ac65af8ac95f154a9d9be936dc49dc Mon Sep 17 00:00:00 2001 From: Hanjeong Lee <rosy0111@naver.com> Date: Sat, 1 Aug 2026 18:05:23 +0900 Subject: [PATCH 335/339] docs: drop stale crate paths from AGENTS.md (#8425) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The "Repository Structure" section listed pre-`crates/` paths (`vm/`, `compiler/`, `derive/`, etc.) that no longer exist; `CONTRIBUTING.md` already documents the current layout under "Code organization". Replace the stale list with a link to that section. Also generalized the title and intro from "GitHub Copilot Instructions" to "AI Agent Instructions" — the file was already renamed from `.github/copilot-instructions.md` to `AGENTS.md` in #6813 to follow the cross-vendor AGENTS.md standard (https://agents.md/), but the title text was never updated to match. Assisted-by: Claude Code:claude-sonnet-5 --- AGENTS.md | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index c89b2a4d3..72a22471f 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -1,6 +1,6 @@ -# GitHub Copilot Instructions for RustPython +# AI Agent Instructions for RustPython -This document provides guidelines for working with GitHub Copilot when contributing to the RustPython project. +This document provides guidelines for AI coding agents (GitHub Copilot, Claude Code, Gemini, etc.) contributing to the RustPython project. ## Project Overview @@ -13,22 +13,7 @@ RustPython is a Python 3 interpreter written in Rust, implementing Python 3.14.0 ## Repository Structure -- `src/` - Top-level code for the RustPython binary -- `vm/` - The Python virtual machine implementation - - `builtins/` - Python built-in types and functions - - `stdlib/` - Essential standard library modules implemented in Rust, required to run the Python core -- `compiler/` - Python compiler components - - `parser/` - Parser for converting Python source to AST - - `core/` - Bytecode representation in Rust structures - - `codegen/` - AST to bytecode compiler -- `Lib/` - CPython's standard library in Python (copied from CPython). **IMPORTANT**: Do not edit this directory directly; The only allowed operation is copying files from CPython. -- `derive/` - Rust macros for RustPython -- `common/` - Common utilities -- `extra_tests/` - Integration tests and snippets -- `stdlib/` - Non-essential Python standard library modules implemented in Rust (useful but not required for core functionality) -- `wasm/` - WebAssembly support -- `jit/` - Experimental JIT compiler implementation -- `pylib/` - Python standard library packaging (do not modify this directory directly - its contents are generated automatically) +See the "Code organization" section in [CONTRIBUTING.md](CONTRIBUTING.md#code-organization) for the current directory layout. ## AI Agent Rules From ae068ffb239bd58c540b1e28403d06bd4b1c6913 Mon Sep 17 00:00:00 2001 From: Hanjeong Lee <rosy0111@naver.com> Date: Sat, 1 Aug 2026 18:05:42 +0900 Subject: [PATCH 336/339] docs: fix AGENTS.md's broken DEVELOPMENT.md references (#8426) DEVELOPMENT.md was renamed to CONTRIBUTING.md in #7914, but AGENTS.md wasn't updated. Repoint the two links with a clear target (Linux/macOS testing section, development guide). Drop the "CPython Version Upgrade Checklist" reference under venvlauncher, which never pointed to real content in any revision of DEVELOPMENT.md. Related to #8356. Assisted-by: Claude Code:claude-sonnet-5 --- AGENTS.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index 72a22471f..2478a8649 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -250,12 +250,10 @@ cargo run --features jit ### Linux Build and Debug on macOS -See the "Testing on Linux from macOS" section in [DEVELOPMENT.md](DEVELOPMENT.md#testing-on-linux-from-macos). +See the "Testing on Linux from macOS" section in [CONTRIBUTING.md](CONTRIBUTING.md#testing-on-linux-from-macos). ### Building venvlauncher (Windows) -See DEVELOPMENT.md "CPython Version Upgrade Checklist" section. - **IMPORTANT**: All 4 venvlauncher binaries use the same source code. Do NOT add multiple `[[bin]]` entries to Cargo.toml. Build once and copy with different names. ## Test Code Modification Rules @@ -286,7 +284,7 @@ If you modify any file under `.github/workflows/`, the change must pass a [zizmo ## Documentation - Check the [architecture document](/architecture/architecture.md) for a high-level overview -- Read the [development guide](/DEVELOPMENT.md) for detailed setup instructions +- Read the [development guide](/CONTRIBUTING.md) for detailed setup instructions - Generate documentation with `cargo doc --no-deps --all` - Online documentation is available at [docs.rs/rustpython](https://docs.rs/rustpython/) - [How to update test files](https://github.com/RustPython/RustPython/wiki/How-to-update-test-files#checkout-cpython-source-code-initial-setup) — guide for syncing test cases from upstream CPython into the `Lib/` directory From 3a6b7d61873e4a1e1c758cde110aaa05d1a6749a Mon Sep 17 00:00:00 2001 From: Hanjeong Lee <rosy0111@naver.com> Date: Sat, 1 Aug 2026 20:17:49 +0900 Subject: [PATCH 337/339] docs: match CONTRIBUTING.md's test command to what CI runs (#8427) `cargo test --workspace ...` segfaults on rustpython-capi when run from the workspace root; it needs its own config that only applies inside crates/capi. CI already excludes it from the workspace run and tests it separately. Document both. Closes #8415 Assisted-by: Claude Code:claude-sonnet-5 --- CONTRIBUTING.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 58954486e..637ecf099 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -89,7 +89,15 @@ $ pytest -v Rust unit tests can be run with `cargo`: ```shell -$ cargo test --workspace --exclude rustpython_wasm --exclude rustpython-venvlauncher +$ cargo test --workspace --exclude rustpython_wasm --exclude rustpython-venvlauncher --exclude rustpython-capi +``` + +`rustpython-capi` needs to be tested from inside its own directory, since it has a +separate `cargo` config that only applies there: + +```shell +$ cd crates/capi +$ cargo test ``` Python unit tests can be run by compiling RustPython and running the test module: From 8c241d86bcad9dba5c394960af2d8b947b595b90 Mon Sep 17 00:00:00 2001 From: Jeaeun Kim <109906379+kyokuping@users.noreply.github.com> Date: Sun, 2 Aug 2026 00:25:43 +0900 Subject: [PATCH 338/339] fix(socket): use object repr in deallocation warnings (#8422) Assisted-by: Codex:gpt-5.6-sol --- Lib/test/test_ssl.py | 1 - crates/stdlib/src/socket.rs | 22 +++++----------------- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index 5b0c90e4d..107aec7e6 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -754,7 +754,6 @@ class BasicSocketTests(unittest.TestCase): with test_wrap_socket(s, server_side=True, certfile=CERTFILE) as ss: self.assertIsNone(ss.get_channel_binding("tls-unique")) - @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: "<ssl.SSLSocket fd=3, family=2, type=1, proto=0, laddr=('0.0.0.0', 0)>" not found in "unclosed <socket.socket fd=3, family=2, type=1, proto=0, laddr=('0.0.0.0', 0)>" def test_dealloc_warn(self): ss = test_wrap_socket(socket.socket(socket.AF_INET)) r = repr(ss) diff --git a/crates/stdlib/src/socket.rs b/crates/stdlib/src/socket.rs index 968399ca7..4f85374b1 100644 --- a/crates/stdlib/src/socket.rs +++ b/crates/stdlib/src/socket.rs @@ -1378,23 +1378,11 @@ mod _socket { fn del(zelf: &Py<Self>, vm: &VirtualMachine) -> PyResult<()> { // Emit ResourceWarning if socket is still open if zelf.sock.read().is_some() { - let laddr = if let Ok(sock) = zelf.sock() - && let Ok(addr) = sock.local_addr() - && let Ok(repr) = get_addr_tuple(&addr, vm).repr(vm) - { - format!(", laddr={}", repr.as_wtf8()) - } else { - String::new() - }; - - let msg = format!( - "unclosed <socket.socket fd={}, family={}, type={}, proto={}{}>", - zelf.fileno(), - zelf.family.load(), - zelf.kind.load(), - zelf.proto.load(), - laddr - ); + let repr = zelf + .as_object() + .repr(vm) + .unwrap_or_else(|_| vm.ctx.new_str("<socket>")); + let msg = format!("unclosed {}", repr.as_wtf8()); let _ = crate::vm::warn::warn( vm.ctx.new_str(msg).into(), Some(vm.ctx.exceptions.resource_warning.to_owned()), From e13bd1d9a6206d3839395ac6d87a114dbfc0d426 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EB=8F=99=EC=95=88?= <ioprt123@gmail.com> Date: Sun, 2 Aug 2026 16:07:18 +0900 Subject: [PATCH 339/339] Replace rust-timsort with an in-tree powersort (#8421) * Add powersort implementation for list sorting Add crates/vm/src/sorting.rs implementing Tim Peters' timsort with powersort's merge-ordering policy (CPython 3.11+): run detection, binary insertion for short runs, galloping merge (merge_lo/merge_hi), and power-based merge ordering (powerloop). Comparison is passed in as a fallible `is_lt` closure, so the algorithm stays generic over the element type and free of interpreter details. Not yet wired into list.sort(); replaces rust-timsort in a follow-up. * Use powersort for list.sort() and drop rust-timsort Wire list sorting through crate::sorting::timsort and remove the rust-timsort dependency. Fixes the O(N^2) behavior on random input (1M random floats: ~16min -> ~0.8s), now within ~4x of CPython. * Fix usize underflow in merge_hi Succeed path * Fix clippy warnings and formatting in sorting.rs * Drop redundant test_ prefixes in sorting tests * Restore buffered elements when a comparison fails mid-merge * Copy one run-A element per gallop round in merge_lo --- Cargo.lock | 7 - Cargo.toml | 1 - crates/vm/Cargo.toml | 1 - crates/vm/src/builtins/list.rs | 18 +- crates/vm/src/lib.rs | 1 + crates/vm/src/sorting.rs | 738 +++++++++++++++++++++++++++++++++ 6 files changed, 749 insertions(+), 17 deletions(-) create mode 100644 crates/vm/src/sorting.rs diff --git a/Cargo.lock b/Cargo.lock index 0acd840c0..5b9870a0b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3716,7 +3716,6 @@ dependencies = [ "strum_macros", "thin-vec", "thiserror", - "timsort", "wasm-bindgen", "widestring", ] @@ -4285,12 +4284,6 @@ dependencies = [ "time-core", ] -[[package]] -name = "timsort" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "639ce8ef6d2ba56be0383a94dd13b92138d58de44c62618303bb798fa92bdc00" - [[package]] name = "tinystr" version = "0.8.3" diff --git a/Cargo.toml b/Cargo.toml index ac1e35c53..6bb22e36f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -305,7 +305,6 @@ textwrap = { version = "0.16.2", default-features = false } termios = "0.3.3" thiserror = "2.0" thin-vec = "0.2.14" -timsort = "0.1.2" tk-sys = { git = "https://github.com/arihant2math/tkinter.git", tag = "v0.2.0" } icu_casemap = "2" icu_locale = "2" diff --git a/crates/vm/Cargo.toml b/crates/vm/Cargo.toml index ca92b9dfd..6601fb03d 100644 --- a/crates/vm/Cargo.toml +++ b/crates/vm/Cargo.toml @@ -80,7 +80,6 @@ half = { workspace = true } psm = { workspace = true } optional = { workspace = true } result-like = { workspace = true } -timsort = { workspace = true } [target.'cfg(unix)'.dependencies] exitcode = { workspace = true } diff --git a/crates/vm/src/builtins/list.rs b/crates/vm/src/builtins/list.rs index 2bdbaf63c..8a426685a 100644 --- a/crates/vm/src/builtins/list.rs +++ b/crates/vm/src/builtins/list.rs @@ -18,6 +18,7 @@ use crate::{ recursion::ReprGuard, sequence::{MutObjectSequenceOp, OptionalRangeArgs, SequenceExt, SequenceMutExt}, sliceable::{SequenceIndex, SliceableSequenceMutOp, SliceableSequenceOp}, + sorting::timsort, types::{ AsMapping, AsSequence, Comparable, Constructor, Initializer, IterNext, Iterable, PyComparisonOp, Representable, SelfIter, @@ -641,14 +642,15 @@ fn do_sort( reverse: bool, ) -> PyResult<()> { // CPython uses __lt__ for all comparisons in sort. - // try_sort_by_gt expects is_gt(a, b) = true when a should come AFTER b. - let cmp = |a: &PyObjectRef, b: &PyObjectRef| { + // `timsort` expects is_lt(a, b) = true when a must be placed BEFORE b. + // For reverse=True, swapping the operands yields a descending order that is + // still stable in the original relative order, matching CPython's + // reverse-sort-reverse approach. + let mut is_lt = |a: &PyObjectRef, b: &PyObjectRef| { if reverse { - // Descending: a comes after b when a < b - a.rich_compare_bool(b, PyComparisonOp::Lt, vm) - } else { - // Ascending: a comes after b when b < a b.rich_compare_bool(a, PyComparisonOp::Lt, vm) + } else { + a.rich_compare_bool(b, PyComparisonOp::Lt, vm) } }; @@ -657,10 +659,10 @@ fn do_sort( .iter() .map(|x| Ok((x.clone(), key_func.call((x.clone(),), vm)?))) .collect::<Result<Vec<_>, _>>()?; - timsort::try_sort_by_gt(&mut items, |a, b| cmp(&a.1, &b.1))?; + timsort(&mut items, &mut |a, b| is_lt(&a.1, &b.1))?; *values = items.into_iter().map(|(val, _)| val).collect(); } else { - timsort::try_sort_by_gt(values, cmp)?; + timsort(values, &mut is_lt)?; } Ok(()) diff --git a/crates/vm/src/lib.rs b/crates/vm/src/lib.rs index c353f8dfc..df67c9797 100644 --- a/crates/vm/src/lib.rs +++ b/crates/vm/src/lib.rs @@ -92,6 +92,7 @@ pub mod scope; pub mod sequence; pub mod signal; pub mod sliceable; +pub mod sorting; pub mod stdlib; pub mod suggestion; pub mod types; diff --git a/crates/vm/src/sorting.rs b/crates/vm/src/sorting.rs new file mode 100644 index 000000000..5f61d6624 --- /dev/null +++ b/crates/vm/src/sorting.rs @@ -0,0 +1,738 @@ +// TODO: MERGESTATE_TEMP_SIZE unused — buf is a dynamic Vec, not a fixed stack array. +const MIN_GALLOP: usize = 7; +const MAX_MINRUN: usize = 64; + +enum LoBreakout { + Succeed, + CopyB, +} + +enum HiBreakout { + Succeed, + CopyA, +} + +#[derive(Clone, Copy)] +struct Run { + base: usize, + len: usize, + power: u32, +} + +struct MergeState<T> { + buf: Vec<T>, + min_gallop: usize, + pending: Vec<Run>, +} + +impl<T: Clone> MergeState<T> { + fn merge_lo<E, F>( + &mut self, + values: &mut [T], + is_lt: &mut F, + start_a: usize, + mut len_a: usize, + start_b: usize, + mut len_b: usize, + ) -> Result<(), E> + where + F: FnMut(&T, &T) -> Result<bool, E>, + { + debug_assert!(len_a > 0); + debug_assert!(len_b > 0); + debug_assert!(start_a + len_a == start_b); + + self.buf.clear(); + self.buf + .extend_from_slice(&values[start_a..start_a + len_a]); + + let mut cursor_a = 0; + let mut cursor_b = start_b; + let mut dest = start_a; + + values[dest] = values[cursor_b].clone(); + dest += 1; + cursor_b += 1; + len_b -= 1; + + if len_b == 0 { + values[dest..dest + len_a].clone_from_slice(&self.buf[cursor_a..cursor_a + len_a]); + return Ok(()); + } + if len_a == 1 { + copy_within_clone(values, cursor_b, dest, len_b); + values[dest + len_b] = self.buf[cursor_a].clone(); + return Ok(()); + } + + let mut min_gallop = self.min_gallop; + + let breakout: Result<LoBreakout, E> = 'merging: loop { + let mut a_count = 0; + let mut b_count = 0; + + loop { + let b_wins = match is_lt(&values[cursor_b], &self.buf[cursor_a]) { + Ok(v) => v, + Err(e) => break 'merging Err(e), + }; + if b_wins { + values[dest] = values[cursor_b].clone(); + dest += 1; + cursor_b += 1; + len_b -= 1; + b_count += 1; + a_count = 0; + if len_b == 0 { + break 'merging Ok(LoBreakout::Succeed); + } + if b_count >= min_gallop { + break; + } + } else { + values[dest] = self.buf[cursor_a].clone(); + dest += 1; + cursor_a += 1; + len_a -= 1; + a_count += 1; + b_count = 0; + if len_a == 1 { + break 'merging Ok(LoBreakout::CopyB); + } + if a_count >= min_gallop { + break; + } + } + } + + min_gallop += 1; + loop { + if min_gallop > 1 { + min_gallop -= 1; + } + self.min_gallop = min_gallop; + let mut k = + match gallop_right(&self.buf, is_lt, &values[cursor_b], cursor_a, len_a, 0) { + Ok(k) => k, + Err(e) => break 'merging Err(e), + }; + a_count = k; + if k > 0 { + values[dest..dest + k].clone_from_slice(&self.buf[cursor_a..cursor_a + k]); + dest += k; + cursor_a += k; + len_a -= k; + if len_a == 1 { + break 'merging Ok(LoBreakout::CopyB); + } + if len_a == 0 { + break 'merging Ok(LoBreakout::Succeed); + } + } + values[dest] = values[cursor_b].clone(); + dest += 1; + cursor_b += 1; + len_b -= 1; + if len_b == 0 { + break 'merging Ok(LoBreakout::Succeed); + } + k = match gallop_left(values, is_lt, &self.buf[cursor_a], cursor_b, len_b, 0) { + Ok(k) => k, + Err(e) => break 'merging Err(e), + }; + b_count = k; + if k > 0 { + copy_within_clone(values, cursor_b, dest, k); + dest += k; + cursor_b += k; + len_b -= k; + if len_b == 0 { + break 'merging Ok(LoBreakout::Succeed); + } + } + values[dest] = self.buf[cursor_a].clone(); + dest += 1; + cursor_a += 1; + len_a -= 1; + if len_a == 1 { + break 'merging Ok(LoBreakout::CopyB); + } + if a_count < MIN_GALLOP && b_count < MIN_GALLOP { + break; + } + } + + min_gallop += 1; + self.min_gallop = min_gallop; + }; + + match breakout { + Ok(LoBreakout::CopyB) => { + copy_within_clone(values, cursor_b, dest, len_b); + values[dest + len_b] = self.buf[cursor_a].clone(); + Ok(()) + } + other => { + if len_a > 0 { + values[dest..dest + len_a] + .clone_from_slice(&self.buf[cursor_a..cursor_a + len_a]); + } + other.map(|_| ()) + } + } + } + + fn merge_hi<E, F>( + &mut self, + values: &mut [T], + is_lt: &mut F, + start_a: usize, + mut len_a: usize, + start_b: usize, + mut len_b: usize, + ) -> Result<(), E> + where + F: FnMut(&T, &T) -> Result<bool, E>, + { + debug_assert!(len_a > 0); + debug_assert!(len_b > 0); + debug_assert!(start_a + len_a == start_b); + + self.buf.clear(); + self.buf + .extend_from_slice(&values[start_b..start_b + len_b]); + + let mut dest = start_b + len_b - 1; + let mut cursor_a = start_a + len_a - 1; + let mut cursor_b = len_b - 1; + + values[dest] = values[cursor_a].clone(); + dest -= 1; + cursor_a -= 1; + len_a -= 1; + + if len_a == 0 { + values[(dest - len_b + 1)..=dest].clone_from_slice(&self.buf[0..len_b]); + return Ok(()); + } + if len_b == 1 { + let src = cursor_a + 1 - len_a; + let dst = dest + 1 - len_a; + copy_within_clone(values, src, dst, len_a); + values[dst - 1] = self.buf[cursor_b].clone(); + return Ok(()); + } + + let mut min_gallop = self.min_gallop; + let breakout: Result<HiBreakout, E> = 'merging: loop { + let mut a_count = 0; + let mut b_count = 0; + + loop { + let b_wins = match is_lt(&self.buf[cursor_b], &values[cursor_a]) { + Ok(v) => v, + Err(e) => break 'merging Err(e), + }; + if b_wins { + values[dest] = values[cursor_a].clone(); + dest -= 1; + len_a -= 1; + + if len_a == 0 { + break 'merging Ok(HiBreakout::Succeed); + } + + cursor_a -= 1; + a_count += 1; + b_count = 0; + + if a_count >= min_gallop { + break; + } + } else { + values[dest] = self.buf[cursor_b].clone(); + dest -= 1; + cursor_b -= 1; + len_b -= 1; + b_count += 1; + a_count = 0; + if len_b == 1 { + break 'merging Ok(HiBreakout::CopyA); + } + if b_count >= min_gallop { + break; + } + } + } + + min_gallop += 1; + loop { + if min_gallop > 1 { + min_gallop -= 1; + } + self.min_gallop = min_gallop; + let mut k = match gallop_right( + values, + is_lt, + &self.buf[cursor_b], + start_a, + len_a, + len_a - 1, + ) { + Ok(k) => k, + Err(e) => break 'merging Err(e), + }; + k = len_a - k; + a_count = k; + if k > 0 { + copy_within_clone(values, cursor_a + 1 - k, dest + 1 - k, k); + dest -= k; + len_a -= k; + if len_a == 0 { + break 'merging Ok(HiBreakout::Succeed); + } + cursor_a -= k; + } + values[dest] = self.buf[cursor_b].clone(); + dest -= 1; + cursor_b -= 1; + len_b -= 1; + if len_b == 1 { + break 'merging Ok(HiBreakout::CopyA); + } + k = match gallop_left(&self.buf, is_lt, &values[cursor_a], 0, len_b, len_b - 1) { + Ok(k) => k, + Err(e) => break 'merging Err(e), + }; + k = len_b - k; + b_count = k; + if k > 0 { + values[dest + 1 - k..=dest] + .clone_from_slice(&self.buf[cursor_b + 1 - k..=cursor_b]); + dest -= k; + len_b -= k; + + if len_b == 0 { + break 'merging Ok(HiBreakout::Succeed); + } + cursor_b -= k; + + if len_b == 1 { + break 'merging Ok(HiBreakout::CopyA); + } + } + values[dest] = values[cursor_a].clone(); + dest -= 1; + len_a -= 1; + + if len_a == 0 { + break 'merging Ok(HiBreakout::Succeed); + } + + cursor_a -= 1; + + if a_count < MIN_GALLOP && b_count < MIN_GALLOP { + break; + } + } + min_gallop += 1; + self.min_gallop = min_gallop; + }; + + match breakout { + Ok(HiBreakout::CopyA) => { + let src = cursor_a + 1 - len_a; + let dst = dest + 1 - len_a; + copy_within_clone(values, src, dst, len_a); + values[dst - 1] = self.buf[cursor_b].clone(); + Ok(()) + } + other => { + if len_b > 0 { + values[(dest + 1) - len_b..=dest].clone_from_slice(&self.buf[0..len_b]); + } + other.map(|_| ()) + } + } + } + + fn merge_at<E, F>(&mut self, values: &mut [T], is_lt: &mut F, i: usize) -> Result<(), E> + where + F: FnMut(&T, &T) -> Result<bool, E>, + { + debug_assert!(self.pending.len() >= 2); + debug_assert!(i == self.pending.len() - 2 || i == self.pending.len() - 3); + + let mut start_a = self.pending[i].base; + let mut len_a = self.pending[i].len; + let start_b = self.pending[i + 1].base; + let mut len_b = self.pending[i + 1].len; + + debug_assert!(len_a > 0); + debug_assert!(len_b > 0); + debug_assert!(start_a + len_a == start_b); + + self.pending[i].len = len_a + len_b; + self.pending.remove(i + 1); + + let k = gallop_right(values, is_lt, &values[start_b], start_a, len_a, 0)?; + start_a += k; + len_a -= k; + + if len_a == 0 { + return Ok(()); + } + + len_b = gallop_left( + values, + is_lt, + &values[start_a + len_a - 1], + start_b, + len_b, + len_b - 1, + )?; + + if len_b == 0 { + return Ok(()); + } + + if len_a <= len_b { + self.merge_lo(values, is_lt, start_a, len_a, start_b, len_b)?; + } else { + self.merge_hi(values, is_lt, start_a, len_a, start_b, len_b)?; + } + Ok(()) + } + + fn found_new_run<E, F>( + &mut self, + new_run_len: usize, + values: &mut [T], + is_lt: &mut F, + ) -> Result<(), E> + where + F: FnMut(&T, &T) -> Result<bool, E>, + { + if !self.pending.is_empty() { + let last = self.pending.len() - 1; + let s1 = self.pending[last].base; + let n1 = self.pending[last].len; + let power = powerloop(s1, n1, new_run_len, values.len()); + + while self.pending.len() > 1 && self.pending[self.pending.len() - 2].power > power { + self.merge_at(values, is_lt, self.pending.len() - 2)?; + } + + debug_assert!( + self.pending.len() < 2 || self.pending[self.pending.len() - 2].power < power + ); + let last = self.pending.len() - 1; + self.pending[last].power = power; + } + Ok(()) + } + + fn push_run(&mut self, base: usize, len: usize) { + self.pending.push(Run { + base, + len, + power: 0, + }) + } + + fn merge_force_collapse<E, F>(&mut self, values: &mut [T], is_lt: &mut F) -> Result<(), E> + where + F: FnMut(&T, &T) -> Result<bool, E>, + { + while self.pending.len() > 1 { + let mut n = self.pending.len() - 2; + if n > 0 && self.pending[n - 1].len < self.pending[n + 1].len { + n -= 1; + } + self.merge_at(values, is_lt, n)?; + } + Ok(()) + } +} + +fn binary_insertion_sort<T, E, F>(values: &mut [T], is_lt: &mut F, start: usize) -> Result<(), E> +where + F: FnMut(&T, &T) -> Result<bool, E>, +{ + for i in start..values.len() { + let mut l = 0; + let mut r = i; + + while l < r { + let m = (l + r) / 2; + if is_lt(&values[i], &values[m])? { + r = m; + } else { + l = m + 1; + } + } + values[l..=i].rotate_right(1); + } + Ok(()) +} + +fn copy_within_clone<T: Clone>(values: &mut [T], src: usize, dest: usize, n: usize) { + if dest <= src { + for k in 0..n { + values[dest + k] = values[src + k].clone(); + } + } else { + for k in (0..n).rev() { + values[dest + k] = values[src + k].clone(); + } + } +} + +fn count_run<T, E, F>(values: &[T], is_lt: &mut F) -> Result<(usize, bool), E> +where + F: FnMut(&T, &T) -> Result<bool, E>, +{ + let n = values.len(); + if n == 1 { + return Ok((1, false)); + } + let mut i = 2; + let descending = is_lt(&values[1], &values[0])?; + if descending { + while i < n && is_lt(&values[i], &values[i - 1])? { + i += 1; + } + } else { + while i < n && !is_lt(&values[i], &values[i - 1])? { + i += 1; + } + } + Ok((i, descending)) +} + +fn gallop_left<T, E, F>( + values: &[T], + is_lt: &mut F, + key: &T, + base: usize, + len: usize, + hint: usize, +) -> Result<usize, E> +where + F: FnMut(&T, &T) -> Result<bool, E>, +{ + debug_assert!(hint < len); + let mut lastofs: isize = 0; + let mut ofs: isize = 1; + let hint_i = hint as isize; + let len_i = len as isize; + + if is_lt(&values[base + hint], key)? { + let maxofs = len_i - hint_i; + while ofs < maxofs && is_lt(&values[base + hint + ofs as usize], key)? { + lastofs = ofs; + ofs = (ofs * 2) + 1; + } + if ofs > maxofs { + ofs = maxofs; + } + lastofs += hint_i; + ofs += hint_i; + } else { + let maxofs = hint_i + 1; + while ofs < maxofs && !is_lt(&values[base + (hint_i - ofs) as usize], key)? { + lastofs = ofs; + ofs = (ofs * 2) + 1; + } + if ofs > maxofs { + ofs = maxofs; + } + (lastofs, ofs) = (hint_i - ofs, hint_i - lastofs); + } + lastofs += 1; + while lastofs < ofs { + let m = lastofs + ((ofs - lastofs) / 2); + if is_lt(&values[base + m as usize], key)? { + lastofs = m + 1; + } else { + ofs = m; + } + } + Ok(ofs as usize) +} + +fn gallop_right<T, E, F>( + values: &[T], + is_lt: &mut F, + key: &T, + base: usize, + len: usize, + hint: usize, +) -> Result<usize, E> +where + F: FnMut(&T, &T) -> Result<bool, E>, +{ + debug_assert!(hint < len); + let mut lastofs: isize = 0; + let mut ofs: isize = 1; + let hint_i = hint as isize; + let len_i = len as isize; + + if is_lt(key, &values[base + hint])? { + let maxofs = hint_i + 1; + while ofs < maxofs && is_lt(key, &values[base + (hint_i - ofs) as usize])? { + lastofs = ofs; + ofs = (ofs * 2) + 1; + } + if ofs > maxofs { + ofs = maxofs; + } + (lastofs, ofs) = (hint_i - ofs, hint_i - lastofs); + } else { + let maxofs = len_i - hint_i; + while ofs < maxofs && !is_lt(key, &values[base + hint + ofs as usize])? { + lastofs = ofs; + ofs = (ofs * 2) + 1; + } + if ofs > maxofs { + ofs = maxofs; + } + lastofs += hint_i; + ofs += hint_i; + } + lastofs += 1; + while lastofs < ofs { + let m = lastofs + ((ofs - lastofs) / 2); + if is_lt(key, &values[base + m as usize])? { + ofs = m; + } else { + lastofs = m + 1; + } + } + Ok(ofs as usize) +} + +// TODO: consider CPython 3.12+'s incremental minrun (mr_current/mr_e/mr_mask) +// for a more precise minrun; current bit-shift version is the classic one. +fn merge_compute_minrun(mut n: usize) -> usize { + let mut r = 0; + while n >= MAX_MINRUN { + r |= n & 1; + n >>= 1; + } + n + r +} + +fn powerloop(s1: usize, n1: usize, n2: usize, n: usize) -> u32 { + let mut result: u32 = 0; + let mut a = 2 * s1 + n1; + let mut b = a + n1 + n2; + + loop { + result += 1; + if a >= n { + debug_assert!(b >= a); + a -= n; + b -= n; + } else if b >= n { + break; + } + debug_assert!(a < b && b < n); + a <<= 1; + b <<= 1; + } + result +} + +/// Stable adaptive mergesort (Tim Peters' timsort with powersort's +/// merge-ordering policy, matching CPython 3.11+). `is_lt` provides comparison. +pub(crate) fn timsort<T, E, F>(values: &mut [T], is_lt: &mut F) -> Result<(), E> +where + T: Clone, + F: FnMut(&T, &T) -> Result<bool, E>, +{ + let n = values.len(); + let mut ms = MergeState { + buf: Vec::new(), + min_gallop: MIN_GALLOP, + pending: Vec::new(), + }; + + if n < 2 { + return Ok(()); + } + + if n < MAX_MINRUN { + let (l, desc) = count_run(values, is_lt)?; + if desc { + values[0..l].reverse(); + } + binary_insertion_sort(values, is_lt, l)?; + return Ok(()); + } + + let minrun = merge_compute_minrun(n); + let mut lo = 0; + + while lo < n { + let (mut l, desc) = count_run(&values[lo..n], is_lt)?; + if desc { + values[lo..lo + l].reverse(); + } + if l < minrun { + let force = minrun.min(n - lo); + binary_insertion_sort(&mut values[lo..lo + force], is_lt, l)?; + l = force; + } + ms.found_new_run(l, values, is_lt)?; + ms.push_run(lo, l); + lo += l; + } + ms.merge_force_collapse(values, is_lt)?; + debug_assert!(ms.pending.len() == 1 && ms.pending[0].len == n); + Ok(()) +} + +#[cfg(test)] +mod tests { + use super::*; + + fn sort(mut v: Vec<i32>) -> Vec<i32> { + timsort(&mut v, &mut |a: &i32, b: &i32| Ok::<bool, ()>(a < b)).unwrap(); + v + } + + #[test] + fn basic_examples() { + assert_eq!(sort(vec![3, 1, 2]), vec![1, 2, 3]); + assert_eq!(sort(Vec::<i32>::new()), Vec::<i32>::new()); + assert_eq!(sort(vec![1]), vec![1]); + assert_eq!(sort(vec![2, 1]), vec![1, 2]); + } + + #[test] + fn five_elements_forwards_and_backwards() { + assert_eq!(sort(vec![1, 2, 3, 4, 5]), vec![1, 2, 3, 4, 5]); + assert_eq!(sort(vec![5, 4, 3, 2, 1]), vec![1, 2, 3, 4, 5]); + } + + #[test] + fn six_elements_with_duplicates() { + assert_eq!(sort(vec![3, 1, 3, 1, 2, 2]), vec![1, 1, 2, 2, 3, 3]); + } + + #[test] + fn one_thousand_elements() { + let v: Vec<i32> = (0..1000).rev().collect(); // 999..0 + let sorted: Vec<i32> = (0..1000).collect(); + assert_eq!(sort(v), sorted); + } + + #[test] + fn pseudorandom_collection() { + let v: Vec<i32> = (0..500).map(|i| (i * 7919) % 500).collect(); + let mut expected = v.clone(); + expected.sort(); + assert_eq!(sort(v), expected); + } +}